diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java
index bb0c50f..13a699b 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java
@@ -12,6 +12,7 @@
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.IGeneralApprovalService;
+import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
@@ -19,6 +20,7 @@
 import org.springframework.web.bind.annotation.RequestBody;
 
 import javax.validation.Valid;
+import java.util.List;
 import java.util.Objects;
 
 /**
@@ -117,4 +119,17 @@
         }
         return baseApprovalService.failUpdate(request);
     }
+
+    public List<O> exportList(@RequestBody @Valid R request) throws Exception {
+        List<O> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = baseApprovalService.listExportByIds(request.getIds());
+        } else {
+            list = baseApprovalService.listExport(request);
+        }
+        for (O record : list) {
+            DictCodeUtils.convertDictCodeToName(record);
+        }
+        return list;
+    }
 }

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java
index bb0c50f..13a699b 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java
@@ -12,6 +12,7 @@
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.IGeneralApprovalService;
+import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
@@ -19,6 +20,7 @@
 import org.springframework.web.bind.annotation.RequestBody;
 
 import javax.validation.Valid;
+import java.util.List;
 import java.util.Objects;
 
 /**
@@ -117,4 +119,17 @@
         }
         return baseApprovalService.failUpdate(request);
     }
+
+    public List<O> exportList(@RequestBody @Valid R request) throws Exception {
+        List<O> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = baseApprovalService.listExportByIds(request.getIds());
+        } else {
+            list = baseApprovalService.listExport(request);
+        }
+        for (O record : list) {
+            DictCodeUtils.convertDictCodeToName(record);
+        }
+        return list;
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java
index 8a90961..d775831 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java
@@ -5,6 +5,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.business.certificate.CertificateChangeApplyApprovalListRequest;
 import com.casic.missiles.dto.business.certificate.CertificateChangeApplySaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessCertificateChangeApply;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
@@ -20,6 +21,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -48,4 +50,12 @@
         }
         return changeApplyService.saveChangeApply(request);
     }
+
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody CertificateChangeApplyApprovalListRequest request) throws Exception {
+        List<BizBusinessCertificateChangeApply> list = super.exportList(request);
+        super.exportExcel(BizBusinessCertificateChangeApply.class, list, ExportEnum.CERTIFICATE_CHANGE_APPLY.getSheetName());
+    }
+
 }

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java
index bb0c50f..13a699b 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java
@@ -12,6 +12,7 @@
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.IGeneralApprovalService;
+import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
@@ -19,6 +20,7 @@
 import org.springframework.web.bind.annotation.RequestBody;
 
 import javax.validation.Valid;
+import java.util.List;
 import java.util.Objects;
 
 /**
@@ -117,4 +119,17 @@
         }
         return baseApprovalService.failUpdate(request);
     }
+
+    public List<O> exportList(@RequestBody @Valid R request) throws Exception {
+        List<O> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = baseApprovalService.listExportByIds(request.getIds());
+        } else {
+            list = baseApprovalService.listExport(request);
+        }
+        for (O record : list) {
+            DictCodeUtils.convertDictCodeToName(record);
+        }
+        return list;
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java
index 8a90961..d775831 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java
@@ -5,6 +5,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.business.certificate.CertificateChangeApplyApprovalListRequest;
 import com.casic.missiles.dto.business.certificate.CertificateChangeApplySaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessCertificateChangeApply;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
@@ -20,6 +21,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -48,4 +50,12 @@
         }
         return changeApplyService.saveChangeApply(request);
     }
+
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody CertificateChangeApplyApprovalListRequest request) throws Exception {
+        List<BizBusinessCertificateChangeApply> list = super.exportList(request);
+        super.exportExcel(BizBusinessCertificateChangeApply.class, list, ExportEnum.CERTIFICATE_CHANGE_APPLY.getSheetName());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java
index 5fc4b07..af8230e 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java
@@ -9,6 +9,7 @@
 import com.casic.missiles.dto.business.certificate.CertificatePrintApprovalListRequest;
 import com.casic.missiles.dto.business.certificate.CertificatePrintListResponse;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.enums.business.CertificatePrintStatusEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessCertificatePrintLog;
@@ -18,10 +19,16 @@
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.io.IOException;
+import java.util.List;
 import java.util.Objects;
 
 /**
@@ -98,4 +105,16 @@
         });
         return certificatePrintService.certificatePrintLog(idDTO.getId());
     }
+
+    @ApiOperation("证书打印审批导出")
+    @PostMapping("/listExport")
+    public void exportList(@RequestBody CertificatePrintApprovalListRequest request) throws IOException {
+        List<CertificatePrintListResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = certificatePrintService.listByIds(request.getIds());
+        } else {
+            list = certificatePrintService.list(request);
+        }
+        super.exportExcel(CertificatePrintListResponse.class, list, ExportEnum.CERTIFICATE_PRINT.getSheetName());
+    }
 }

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java
index bb0c50f..13a699b 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java
@@ -12,6 +12,7 @@
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.IGeneralApprovalService;
+import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
@@ -19,6 +20,7 @@
 import org.springframework.web.bind.annotation.RequestBody;
 
 import javax.validation.Valid;
+import java.util.List;
 import java.util.Objects;
 
 /**
@@ -117,4 +119,17 @@
         }
         return baseApprovalService.failUpdate(request);
     }
+
+    public List<O> exportList(@RequestBody @Valid R request) throws Exception {
+        List<O> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = baseApprovalService.listExportByIds(request.getIds());
+        } else {
+            list = baseApprovalService.listExport(request);
+        }
+        for (O record : list) {
+            DictCodeUtils.convertDictCodeToName(record);
+        }
+        return list;
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java
index 8a90961..d775831 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java
@@ -5,6 +5,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.business.certificate.CertificateChangeApplyApprovalListRequest;
 import com.casic.missiles.dto.business.certificate.CertificateChangeApplySaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessCertificateChangeApply;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
@@ -20,6 +21,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -48,4 +50,12 @@
         }
         return changeApplyService.saveChangeApply(request);
     }
+
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody CertificateChangeApplyApprovalListRequest request) throws Exception {
+        List<BizBusinessCertificateChangeApply> list = super.exportList(request);
+        super.exportExcel(BizBusinessCertificateChangeApply.class, list, ExportEnum.CERTIFICATE_CHANGE_APPLY.getSheetName());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java
index 5fc4b07..af8230e 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java
@@ -9,6 +9,7 @@
 import com.casic.missiles.dto.business.certificate.CertificatePrintApprovalListRequest;
 import com.casic.missiles.dto.business.certificate.CertificatePrintListResponse;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.enums.business.CertificatePrintStatusEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessCertificatePrintLog;
@@ -18,10 +19,16 @@
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.io.IOException;
+import java.util.List;
 import java.util.Objects;
 
 /**
@@ -98,4 +105,16 @@
         });
         return certificatePrintService.certificatePrintLog(idDTO.getId());
     }
+
+    @ApiOperation("证书打印审批导出")
+    @PostMapping("/listExport")
+    public void exportList(@RequestBody CertificatePrintApprovalListRequest request) throws IOException {
+        List<CertificatePrintListResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = certificatePrintService.listByIds(request.getIds());
+        } else {
+            list = certificatePrintService.list(request);
+        }
+        super.exportExcel(CertificatePrintListResponse.class, list, ExportEnum.CERTIFICATE_PRINT.getSheetName());
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java
index 63b06dc..6b2efd5 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java
@@ -6,6 +6,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.business.certificate.CertificateReportApprovalListRequest;
 import com.casic.missiles.dto.business.certificate.CertificateReportSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessCertificateReport;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
@@ -21,6 +22,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -50,7 +52,7 @@
         return certificateReportService.saveCertificateReport(request);
     }
 
-    @ApiOperation("证书审批详情（基本信息）")
+    @ApiOperation("详情（基本信息）")
     @PostMapping("/detail")
     public ReturnDTO<BizBusinessCertificateReport> detail(@RequestBody @Valid BaseDetailRequest request, BindingResult bindingResult) throws Exception {
         if(bindingResult.hasErrors()){
@@ -59,4 +61,11 @@
         return certificateReportService.detail(request);
     }
 
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody CertificateReportApprovalListRequest request) throws Exception {
+        List<BizBusinessCertificateReport> list = super.exportList(request);
+        super.exportExcel(BizBusinessCertificateReport.class, list, ExportEnum.CERTIFICATE_REPORT.getSheetName());
+    }
+
 }

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java
index bb0c50f..13a699b 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java
@@ -12,6 +12,7 @@
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.IGeneralApprovalService;
+import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
@@ -19,6 +20,7 @@
 import org.springframework.web.bind.annotation.RequestBody;
 
 import javax.validation.Valid;
+import java.util.List;
 import java.util.Objects;
 
 /**
@@ -117,4 +119,17 @@
         }
         return baseApprovalService.failUpdate(request);
     }
+
+    public List<O> exportList(@RequestBody @Valid R request) throws Exception {
+        List<O> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = baseApprovalService.listExportByIds(request.getIds());
+        } else {
+            list = baseApprovalService.listExport(request);
+        }
+        for (O record : list) {
+            DictCodeUtils.convertDictCodeToName(record);
+        }
+        return list;
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java
index 8a90961..d775831 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java
@@ -5,6 +5,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.business.certificate.CertificateChangeApplyApprovalListRequest;
 import com.casic.missiles.dto.business.certificate.CertificateChangeApplySaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessCertificateChangeApply;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
@@ -20,6 +21,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -48,4 +50,12 @@
         }
         return changeApplyService.saveChangeApply(request);
     }
+
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody CertificateChangeApplyApprovalListRequest request) throws Exception {
+        List<BizBusinessCertificateChangeApply> list = super.exportList(request);
+        super.exportExcel(BizBusinessCertificateChangeApply.class, list, ExportEnum.CERTIFICATE_CHANGE_APPLY.getSheetName());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java
index 5fc4b07..af8230e 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java
@@ -9,6 +9,7 @@
 import com.casic.missiles.dto.business.certificate.CertificatePrintApprovalListRequest;
 import com.casic.missiles.dto.business.certificate.CertificatePrintListResponse;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.enums.business.CertificatePrintStatusEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessCertificatePrintLog;
@@ -18,10 +19,16 @@
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.io.IOException;
+import java.util.List;
 import java.util.Objects;
 
 /**
@@ -98,4 +105,16 @@
         });
         return certificatePrintService.certificatePrintLog(idDTO.getId());
     }
+
+    @ApiOperation("证书打印审批导出")
+    @PostMapping("/listExport")
+    public void exportList(@RequestBody CertificatePrintApprovalListRequest request) throws IOException {
+        List<CertificatePrintListResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = certificatePrintService.listByIds(request.getIds());
+        } else {
+            list = certificatePrintService.list(request);
+        }
+        super.exportExcel(CertificatePrintListResponse.class, list, ExportEnum.CERTIFICATE_PRINT.getSheetName());
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java
index 63b06dc..6b2efd5 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java
@@ -6,6 +6,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.business.certificate.CertificateReportApprovalListRequest;
 import com.casic.missiles.dto.business.certificate.CertificateReportSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessCertificateReport;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
@@ -21,6 +22,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -50,7 +52,7 @@
         return certificateReportService.saveCertificateReport(request);
     }
 
-    @ApiOperation("证书审批详情（基本信息）")
+    @ApiOperation("详情（基本信息）")
     @PostMapping("/detail")
     public ReturnDTO<BizBusinessCertificateReport> detail(@RequestBody @Valid BaseDetailRequest request, BindingResult bindingResult) throws Exception {
         if(bindingResult.hasErrors()){
@@ -59,4 +61,11 @@
         return certificateReportService.detail(request);
     }
 
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody CertificateReportApprovalListRequest request) throws Exception {
+        List<BizBusinessCertificateReport> list = super.exportList(request);
+        super.exportExcel(BizBusinessCertificateReport.class, list, ExportEnum.CERTIFICATE_REPORT.getSheetName());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java
index 46b26bd..57c0809 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java
@@ -10,20 +10,21 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.business.identify.IdentifyListRequest;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessIdentifyInfo;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.business.IBizBusinessIdentifyInfoService;
+import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import javax.validation.Valid;
+import java.util.List;
 import java.util.Objects;
 
 /**
@@ -57,16 +58,13 @@
         return identifyInfoService.addIdentify(identifyInfo);
     }
 
-    @ApiOperation("标识打印更新")
+    @ApiOperation("标识打印更新（更新打印时间）")
     @PostMapping("/update")
-    public ReturnDTO updateIdentify(@RequestBody @Valid BizBusinessIdentifyInfo identifyInfo, BindingResult bindingResult) {
-        Assert.isFalse(Objects.isNull(identifyInfo.getId()), () -> {
+    public ReturnDTO updateIdentify(@RequestBody @Valid IdDTO idDTO) {
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        Assert.isFalse(bindingResult.hasErrors(), () -> {
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        });
-        return identifyInfoService.updateIdentify(identifyInfo);
+        return identifyInfoService.updateIdentify(idDTO.getId());
     }
 
     @ApiOperation("标识打印删除")
@@ -77,4 +75,37 @@
         });
         return identifyInfoService.deleteIdentify(idDTO.getId());
     }
+
+    @ApiOperation("标识打印导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody @Valid IdentifyListRequest request, BindingResult bindingResult) throws Exception {
+        if (bindingResult.hasErrors()) {
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        List<BizBusinessIdentifyInfo> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = identifyInfoService.listByIds(request.getIds());
+        } else {
+            list = identifyInfoService.list(request);
+        }
+        for (BizBusinessIdentifyInfo record : list) {
+            DictCodeUtils.convertDictCodeToName(record);
+        }
+        super.exportExcel(BizBusinessIdentifyInfo.class, list, ExportEnum.IDENTIFY_EXPORT.getSheetName());
+    }
+
+
+    // TODO: 2023/8/23 查询设备信息，4个底部按钮查设备（按钮的作用就是前端用来调不同接口、用来区分中间即将展示的标识），前端弹窗选设备，在确定保存时前端根据底部按钮判断传入设备类型deviceType字典code
+    // TODO: 2023/8/23 接口：查受检设备（第1个按钮），查设备台账（后3个按钮同一接口），查询之后前端根据标志类型的不同加到中间页面时进行判断（按产品给的对应表）
+    // TODO: 2023/8/23 提供二维码接口，前端在加到中间页面时调用一下
+
+    @ApiOperation("设备二维码")
+    @PostMapping("/equipment/qrCode")
+    public ReturnDTO<String> equipmentQrCode(@RequestBody @Valid IdDTO idDTO) {
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return identifyInfoService.equipmentQrCode(idDTO.getId());
+    }
+
 }

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java
index bb0c50f..13a699b 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java
@@ -12,6 +12,7 @@
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.IGeneralApprovalService;
+import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
@@ -19,6 +20,7 @@
 import org.springframework.web.bind.annotation.RequestBody;
 
 import javax.validation.Valid;
+import java.util.List;
 import java.util.Objects;
 
 /**
@@ -117,4 +119,17 @@
         }
         return baseApprovalService.failUpdate(request);
     }
+
+    public List<O> exportList(@RequestBody @Valid R request) throws Exception {
+        List<O> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = baseApprovalService.listExportByIds(request.getIds());
+        } else {
+            list = baseApprovalService.listExport(request);
+        }
+        for (O record : list) {
+            DictCodeUtils.convertDictCodeToName(record);
+        }
+        return list;
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java
index 8a90961..d775831 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java
@@ -5,6 +5,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.business.certificate.CertificateChangeApplyApprovalListRequest;
 import com.casic.missiles.dto.business.certificate.CertificateChangeApplySaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessCertificateChangeApply;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
@@ -20,6 +21,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -48,4 +50,12 @@
         }
         return changeApplyService.saveChangeApply(request);
     }
+
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody CertificateChangeApplyApprovalListRequest request) throws Exception {
+        List<BizBusinessCertificateChangeApply> list = super.exportList(request);
+        super.exportExcel(BizBusinessCertificateChangeApply.class, list, ExportEnum.CERTIFICATE_CHANGE_APPLY.getSheetName());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java
index 5fc4b07..af8230e 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java
@@ -9,6 +9,7 @@
 import com.casic.missiles.dto.business.certificate.CertificatePrintApprovalListRequest;
 import com.casic.missiles.dto.business.certificate.CertificatePrintListResponse;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.enums.business.CertificatePrintStatusEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessCertificatePrintLog;
@@ -18,10 +19,16 @@
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.io.IOException;
+import java.util.List;
 import java.util.Objects;
 
 /**
@@ -98,4 +105,16 @@
         });
         return certificatePrintService.certificatePrintLog(idDTO.getId());
     }
+
+    @ApiOperation("证书打印审批导出")
+    @PostMapping("/listExport")
+    public void exportList(@RequestBody CertificatePrintApprovalListRequest request) throws IOException {
+        List<CertificatePrintListResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = certificatePrintService.listByIds(request.getIds());
+        } else {
+            list = certificatePrintService.list(request);
+        }
+        super.exportExcel(CertificatePrintListResponse.class, list, ExportEnum.CERTIFICATE_PRINT.getSheetName());
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java
index 63b06dc..6b2efd5 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java
@@ -6,6 +6,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.business.certificate.CertificateReportApprovalListRequest;
 import com.casic.missiles.dto.business.certificate.CertificateReportSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessCertificateReport;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
@@ -21,6 +22,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -50,7 +52,7 @@
         return certificateReportService.saveCertificateReport(request);
     }
 
-    @ApiOperation("证书审批详情（基本信息）")
+    @ApiOperation("详情（基本信息）")
     @PostMapping("/detail")
     public ReturnDTO<BizBusinessCertificateReport> detail(@RequestBody @Valid BaseDetailRequest request, BindingResult bindingResult) throws Exception {
         if(bindingResult.hasErrors()){
@@ -59,4 +61,11 @@
         return certificateReportService.detail(request);
     }
 
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody CertificateReportApprovalListRequest request) throws Exception {
+        List<BizBusinessCertificateReport> list = super.exportList(request);
+        super.exportExcel(BizBusinessCertificateReport.class, list, ExportEnum.CERTIFICATE_REPORT.getSheetName());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java
index 46b26bd..57c0809 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java
@@ -10,20 +10,21 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.business.identify.IdentifyListRequest;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessIdentifyInfo;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.business.IBizBusinessIdentifyInfoService;
+import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import javax.validation.Valid;
+import java.util.List;
 import java.util.Objects;
 
 /**
@@ -57,16 +58,13 @@
         return identifyInfoService.addIdentify(identifyInfo);
     }
 
-    @ApiOperation("标识打印更新")
+    @ApiOperation("标识打印更新（更新打印时间）")
     @PostMapping("/update")
-    public ReturnDTO updateIdentify(@RequestBody @Valid BizBusinessIdentifyInfo identifyInfo, BindingResult bindingResult) {
-        Assert.isFalse(Objects.isNull(identifyInfo.getId()), () -> {
+    public ReturnDTO updateIdentify(@RequestBody @Valid IdDTO idDTO) {
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        Assert.isFalse(bindingResult.hasErrors(), () -> {
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        });
-        return identifyInfoService.updateIdentify(identifyInfo);
+        return identifyInfoService.updateIdentify(idDTO.getId());
     }
 
     @ApiOperation("标识打印删除")
@@ -77,4 +75,37 @@
         });
         return identifyInfoService.deleteIdentify(idDTO.getId());
     }
+
+    @ApiOperation("标识打印导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody @Valid IdentifyListRequest request, BindingResult bindingResult) throws Exception {
+        if (bindingResult.hasErrors()) {
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        List<BizBusinessIdentifyInfo> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = identifyInfoService.listByIds(request.getIds());
+        } else {
+            list = identifyInfoService.list(request);
+        }
+        for (BizBusinessIdentifyInfo record : list) {
+            DictCodeUtils.convertDictCodeToName(record);
+        }
+        super.exportExcel(BizBusinessIdentifyInfo.class, list, ExportEnum.IDENTIFY_EXPORT.getSheetName());
+    }
+
+
+    // TODO: 2023/8/23 查询设备信息，4个底部按钮查设备（按钮的作用就是前端用来调不同接口、用来区分中间即将展示的标识），前端弹窗选设备，在确定保存时前端根据底部按钮判断传入设备类型deviceType字典code
+    // TODO: 2023/8/23 接口：查受检设备（第1个按钮），查设备台账（后3个按钮同一接口），查询之后前端根据标志类型的不同加到中间页面时进行判断（按产品给的对应表）
+    // TODO: 2023/8/23 提供二维码接口，前端在加到中间页面时调用一下
+
+    @ApiOperation("设备二维码")
+    @PostMapping("/equipment/qrCode")
+    public ReturnDTO<String> equipmentQrCode(@RequestBody @Valid IdDTO idDTO) {
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return identifyInfoService.equipmentQrCode(idDTO.getId());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java
index 707be6e..7e0453d 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java
@@ -117,7 +117,7 @@
     }
 
     @ApiOperation("任务单导出")
-    @PostMapping("/export")
+    @PostMapping("/listExport")
     public void orderExport(@RequestBody @Valid OrderListRequest request, HttpServletResponse response) {
         businessOrderService.orderExport(request, response);
     }

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java
index bb0c50f..13a699b 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java
@@ -12,6 +12,7 @@
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.IGeneralApprovalService;
+import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
@@ -19,6 +20,7 @@
 import org.springframework.web.bind.annotation.RequestBody;
 
 import javax.validation.Valid;
+import java.util.List;
 import java.util.Objects;
 
 /**
@@ -117,4 +119,17 @@
         }
         return baseApprovalService.failUpdate(request);
     }
+
+    public List<O> exportList(@RequestBody @Valid R request) throws Exception {
+        List<O> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = baseApprovalService.listExportByIds(request.getIds());
+        } else {
+            list = baseApprovalService.listExport(request);
+        }
+        for (O record : list) {
+            DictCodeUtils.convertDictCodeToName(record);
+        }
+        return list;
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java
index 8a90961..d775831 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java
@@ -5,6 +5,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.business.certificate.CertificateChangeApplyApprovalListRequest;
 import com.casic.missiles.dto.business.certificate.CertificateChangeApplySaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessCertificateChangeApply;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
@@ -20,6 +21,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -48,4 +50,12 @@
         }
         return changeApplyService.saveChangeApply(request);
     }
+
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody CertificateChangeApplyApprovalListRequest request) throws Exception {
+        List<BizBusinessCertificateChangeApply> list = super.exportList(request);
+        super.exportExcel(BizBusinessCertificateChangeApply.class, list, ExportEnum.CERTIFICATE_CHANGE_APPLY.getSheetName());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java
index 5fc4b07..af8230e 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java
@@ -9,6 +9,7 @@
 import com.casic.missiles.dto.business.certificate.CertificatePrintApprovalListRequest;
 import com.casic.missiles.dto.business.certificate.CertificatePrintListResponse;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.enums.business.CertificatePrintStatusEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessCertificatePrintLog;
@@ -18,10 +19,16 @@
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.io.IOException;
+import java.util.List;
 import java.util.Objects;
 
 /**
@@ -98,4 +105,16 @@
         });
         return certificatePrintService.certificatePrintLog(idDTO.getId());
     }
+
+    @ApiOperation("证书打印审批导出")
+    @PostMapping("/listExport")
+    public void exportList(@RequestBody CertificatePrintApprovalListRequest request) throws IOException {
+        List<CertificatePrintListResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = certificatePrintService.listByIds(request.getIds());
+        } else {
+            list = certificatePrintService.list(request);
+        }
+        super.exportExcel(CertificatePrintListResponse.class, list, ExportEnum.CERTIFICATE_PRINT.getSheetName());
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java
index 63b06dc..6b2efd5 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java
@@ -6,6 +6,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.business.certificate.CertificateReportApprovalListRequest;
 import com.casic.missiles.dto.business.certificate.CertificateReportSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessCertificateReport;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
@@ -21,6 +22,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -50,7 +52,7 @@
         return certificateReportService.saveCertificateReport(request);
     }
 
-    @ApiOperation("证书审批详情（基本信息）")
+    @ApiOperation("详情（基本信息）")
     @PostMapping("/detail")
     public ReturnDTO<BizBusinessCertificateReport> detail(@RequestBody @Valid BaseDetailRequest request, BindingResult bindingResult) throws Exception {
         if(bindingResult.hasErrors()){
@@ -59,4 +61,11 @@
         return certificateReportService.detail(request);
     }
 
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody CertificateReportApprovalListRequest request) throws Exception {
+        List<BizBusinessCertificateReport> list = super.exportList(request);
+        super.exportExcel(BizBusinessCertificateReport.class, list, ExportEnum.CERTIFICATE_REPORT.getSheetName());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java
index 46b26bd..57c0809 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java
@@ -10,20 +10,21 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.business.identify.IdentifyListRequest;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessIdentifyInfo;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.business.IBizBusinessIdentifyInfoService;
+import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import javax.validation.Valid;
+import java.util.List;
 import java.util.Objects;
 
 /**
@@ -57,16 +58,13 @@
         return identifyInfoService.addIdentify(identifyInfo);
     }
 
-    @ApiOperation("标识打印更新")
+    @ApiOperation("标识打印更新（更新打印时间）")
     @PostMapping("/update")
-    public ReturnDTO updateIdentify(@RequestBody @Valid BizBusinessIdentifyInfo identifyInfo, BindingResult bindingResult) {
-        Assert.isFalse(Objects.isNull(identifyInfo.getId()), () -> {
+    public ReturnDTO updateIdentify(@RequestBody @Valid IdDTO idDTO) {
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        Assert.isFalse(bindingResult.hasErrors(), () -> {
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        });
-        return identifyInfoService.updateIdentify(identifyInfo);
+        return identifyInfoService.updateIdentify(idDTO.getId());
     }
 
     @ApiOperation("标识打印删除")
@@ -77,4 +75,37 @@
         });
         return identifyInfoService.deleteIdentify(idDTO.getId());
     }
+
+    @ApiOperation("标识打印导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody @Valid IdentifyListRequest request, BindingResult bindingResult) throws Exception {
+        if (bindingResult.hasErrors()) {
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        List<BizBusinessIdentifyInfo> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = identifyInfoService.listByIds(request.getIds());
+        } else {
+            list = identifyInfoService.list(request);
+        }
+        for (BizBusinessIdentifyInfo record : list) {
+            DictCodeUtils.convertDictCodeToName(record);
+        }
+        super.exportExcel(BizBusinessIdentifyInfo.class, list, ExportEnum.IDENTIFY_EXPORT.getSheetName());
+    }
+
+
+    // TODO: 2023/8/23 查询设备信息，4个底部按钮查设备（按钮的作用就是前端用来调不同接口、用来区分中间即将展示的标识），前端弹窗选设备，在确定保存时前端根据底部按钮判断传入设备类型deviceType字典code
+    // TODO: 2023/8/23 接口：查受检设备（第1个按钮），查设备台账（后3个按钮同一接口），查询之后前端根据标志类型的不同加到中间页面时进行判断（按产品给的对应表）
+    // TODO: 2023/8/23 提供二维码接口，前端在加到中间页面时调用一下
+
+    @ApiOperation("设备二维码")
+    @PostMapping("/equipment/qrCode")
+    public ReturnDTO<String> equipmentQrCode(@RequestBody @Valid IdDTO idDTO) {
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return identifyInfoService.equipmentQrCode(idDTO.getId());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java
index 707be6e..7e0453d 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java
@@ -117,7 +117,7 @@
     }
 
     @ApiOperation("任务单导出")
-    @PostMapping("/export")
+    @PostMapping("/listExport")
     public void orderExport(@RequestBody @Valid OrderListRequest request, HttpServletResponse response) {
         businessOrderService.orderExport(request, response);
     }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java
index 529a6ce..51432be 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java
@@ -1,9 +1,28 @@
 package com.casic.missiles.controller.business;
 
+import com.casic.missiles.controller.GeneralApprovalController;
+import com.casic.missiles.dto.BaseApprovalSubmitRequest;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.business.outsource.OutsourceAssessApprovalListRequest;
+import com.casic.missiles.dto.business.outsource.OutsourceAssessSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
+import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.model.business.BizBusinessOutsourceAssess;
+import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
+import com.casic.missiles.service.IGeneralApprovalService;
+import com.casic.missiles.service.business.IBizBusinessOutsourceAssessService;
 import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.BindingResult;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.validation.Valid;
+import java.util.List;
+
 /**
  * <p>
  * 计量检定业务-分包管理-测试、校准或检定工作分包评审表 前端控制器
@@ -15,6 +34,27 @@
 @Api(tags = "分包管理-测试、校准或检定工作分包评审表")
 @RestController
 @RequestMapping("/business/outsource/assess")
-public class BizBusinessOutsourceAssessController {
+public class BizBusinessOutsourceAssessController extends GeneralApprovalController<BizBusinessOutsourceAssess, BizBusinessOutsourceAssess, OutsourceAssessApprovalListRequest, BaseApprovalSubmitRequest> {
+    @Autowired
+    private IBizBusinessOutsourceAssessService outsourceAssessService;
 
+    public BizBusinessOutsourceAssessController(IGeneralApprovalService<BizBusinessOutsourceAssess, BizBusinessOutsourceAssess, OutsourceAssessApprovalListRequest, BaseApprovalSubmitRequest> baseApprovalService) {
+        super(baseApprovalService);
+    }
+
+    @ApiOperation("草稿箱-保存")
+    @PostMapping("/save")
+    public ReturnDTO<OutsourceAssessSaveResponse> saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceAssess request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        return outsourceAssessService.saveOutsourceAssess(request);
+    }
+
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception {
+        List<BizBusinessOutsourceAssess> list = super.exportList(request);
+        super.exportExcel(BizBusinessOutsourceAssess.class, list, ExportEnum.OUTSOURCE_ASSESS.getSheetName());
+    }
 }

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java
index bb0c50f..13a699b 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java
@@ -12,6 +12,7 @@
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.IGeneralApprovalService;
+import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
@@ -19,6 +20,7 @@
 import org.springframework.web.bind.annotation.RequestBody;
 
 import javax.validation.Valid;
+import java.util.List;
 import java.util.Objects;
 
 /**
@@ -117,4 +119,17 @@
         }
         return baseApprovalService.failUpdate(request);
     }
+
+    public List<O> exportList(@RequestBody @Valid R request) throws Exception {
+        List<O> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = baseApprovalService.listExportByIds(request.getIds());
+        } else {
+            list = baseApprovalService.listExport(request);
+        }
+        for (O record : list) {
+            DictCodeUtils.convertDictCodeToName(record);
+        }
+        return list;
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java
index 8a90961..d775831 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java
@@ -5,6 +5,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.business.certificate.CertificateChangeApplyApprovalListRequest;
 import com.casic.missiles.dto.business.certificate.CertificateChangeApplySaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessCertificateChangeApply;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
@@ -20,6 +21,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -48,4 +50,12 @@
         }
         return changeApplyService.saveChangeApply(request);
     }
+
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody CertificateChangeApplyApprovalListRequest request) throws Exception {
+        List<BizBusinessCertificateChangeApply> list = super.exportList(request);
+        super.exportExcel(BizBusinessCertificateChangeApply.class, list, ExportEnum.CERTIFICATE_CHANGE_APPLY.getSheetName());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java
index 5fc4b07..af8230e 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java
@@ -9,6 +9,7 @@
 import com.casic.missiles.dto.business.certificate.CertificatePrintApprovalListRequest;
 import com.casic.missiles.dto.business.certificate.CertificatePrintListResponse;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.enums.business.CertificatePrintStatusEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessCertificatePrintLog;
@@ -18,10 +19,16 @@
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.io.IOException;
+import java.util.List;
 import java.util.Objects;
 
 /**
@@ -98,4 +105,16 @@
         });
         return certificatePrintService.certificatePrintLog(idDTO.getId());
     }
+
+    @ApiOperation("证书打印审批导出")
+    @PostMapping("/listExport")
+    public void exportList(@RequestBody CertificatePrintApprovalListRequest request) throws IOException {
+        List<CertificatePrintListResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = certificatePrintService.listByIds(request.getIds());
+        } else {
+            list = certificatePrintService.list(request);
+        }
+        super.exportExcel(CertificatePrintListResponse.class, list, ExportEnum.CERTIFICATE_PRINT.getSheetName());
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java
index 63b06dc..6b2efd5 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java
@@ -6,6 +6,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.business.certificate.CertificateReportApprovalListRequest;
 import com.casic.missiles.dto.business.certificate.CertificateReportSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessCertificateReport;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
@@ -21,6 +22,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -50,7 +52,7 @@
         return certificateReportService.saveCertificateReport(request);
     }
 
-    @ApiOperation("证书审批详情（基本信息）")
+    @ApiOperation("详情（基本信息）")
     @PostMapping("/detail")
     public ReturnDTO<BizBusinessCertificateReport> detail(@RequestBody @Valid BaseDetailRequest request, BindingResult bindingResult) throws Exception {
         if(bindingResult.hasErrors()){
@@ -59,4 +61,11 @@
         return certificateReportService.detail(request);
     }
 
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody CertificateReportApprovalListRequest request) throws Exception {
+        List<BizBusinessCertificateReport> list = super.exportList(request);
+        super.exportExcel(BizBusinessCertificateReport.class, list, ExportEnum.CERTIFICATE_REPORT.getSheetName());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java
index 46b26bd..57c0809 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java
@@ -10,20 +10,21 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.business.identify.IdentifyListRequest;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessIdentifyInfo;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.business.IBizBusinessIdentifyInfoService;
+import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import javax.validation.Valid;
+import java.util.List;
 import java.util.Objects;
 
 /**
@@ -57,16 +58,13 @@
         return identifyInfoService.addIdentify(identifyInfo);
     }
 
-    @ApiOperation("标识打印更新")
+    @ApiOperation("标识打印更新（更新打印时间）")
     @PostMapping("/update")
-    public ReturnDTO updateIdentify(@RequestBody @Valid BizBusinessIdentifyInfo identifyInfo, BindingResult bindingResult) {
-        Assert.isFalse(Objects.isNull(identifyInfo.getId()), () -> {
+    public ReturnDTO updateIdentify(@RequestBody @Valid IdDTO idDTO) {
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        Assert.isFalse(bindingResult.hasErrors(), () -> {
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        });
-        return identifyInfoService.updateIdentify(identifyInfo);
+        return identifyInfoService.updateIdentify(idDTO.getId());
     }
 
     @ApiOperation("标识打印删除")
@@ -77,4 +75,37 @@
         });
         return identifyInfoService.deleteIdentify(idDTO.getId());
     }
+
+    @ApiOperation("标识打印导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody @Valid IdentifyListRequest request, BindingResult bindingResult) throws Exception {
+        if (bindingResult.hasErrors()) {
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        List<BizBusinessIdentifyInfo> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = identifyInfoService.listByIds(request.getIds());
+        } else {
+            list = identifyInfoService.list(request);
+        }
+        for (BizBusinessIdentifyInfo record : list) {
+            DictCodeUtils.convertDictCodeToName(record);
+        }
+        super.exportExcel(BizBusinessIdentifyInfo.class, list, ExportEnum.IDENTIFY_EXPORT.getSheetName());
+    }
+
+
+    // TODO: 2023/8/23 查询设备信息，4个底部按钮查设备（按钮的作用就是前端用来调不同接口、用来区分中间即将展示的标识），前端弹窗选设备，在确定保存时前端根据底部按钮判断传入设备类型deviceType字典code
+    // TODO: 2023/8/23 接口：查受检设备（第1个按钮），查设备台账（后3个按钮同一接口），查询之后前端根据标志类型的不同加到中间页面时进行判断（按产品给的对应表）
+    // TODO: 2023/8/23 提供二维码接口，前端在加到中间页面时调用一下
+
+    @ApiOperation("设备二维码")
+    @PostMapping("/equipment/qrCode")
+    public ReturnDTO<String> equipmentQrCode(@RequestBody @Valid IdDTO idDTO) {
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return identifyInfoService.equipmentQrCode(idDTO.getId());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java
index 707be6e..7e0453d 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java
@@ -117,7 +117,7 @@
     }
 
     @ApiOperation("任务单导出")
-    @PostMapping("/export")
+    @PostMapping("/listExport")
     public void orderExport(@RequestBody @Valid OrderListRequest request, HttpServletResponse response) {
         businessOrderService.orderExport(request, response);
     }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java
index 529a6ce..51432be 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java
@@ -1,9 +1,28 @@
 package com.casic.missiles.controller.business;
 
+import com.casic.missiles.controller.GeneralApprovalController;
+import com.casic.missiles.dto.BaseApprovalSubmitRequest;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.business.outsource.OutsourceAssessApprovalListRequest;
+import com.casic.missiles.dto.business.outsource.OutsourceAssessSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
+import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.model.business.BizBusinessOutsourceAssess;
+import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
+import com.casic.missiles.service.IGeneralApprovalService;
+import com.casic.missiles.service.business.IBizBusinessOutsourceAssessService;
 import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.BindingResult;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.validation.Valid;
+import java.util.List;
+
 /**
  * <p>
  * 计量检定业务-分包管理-测试、校准或检定工作分包评审表 前端控制器
@@ -15,6 +34,27 @@
 @Api(tags = "分包管理-测试、校准或检定工作分包评审表")
 @RestController
 @RequestMapping("/business/outsource/assess")
-public class BizBusinessOutsourceAssessController {
+public class BizBusinessOutsourceAssessController extends GeneralApprovalController<BizBusinessOutsourceAssess, BizBusinessOutsourceAssess, OutsourceAssessApprovalListRequest, BaseApprovalSubmitRequest> {
+    @Autowired
+    private IBizBusinessOutsourceAssessService outsourceAssessService;
 
+    public BizBusinessOutsourceAssessController(IGeneralApprovalService<BizBusinessOutsourceAssess, BizBusinessOutsourceAssess, OutsourceAssessApprovalListRequest, BaseApprovalSubmitRequest> baseApprovalService) {
+        super(baseApprovalService);
+    }
+
+    @ApiOperation("草稿箱-保存")
+    @PostMapping("/save")
+    public ReturnDTO<OutsourceAssessSaveResponse> saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceAssess request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        return outsourceAssessService.saveOutsourceAssess(request);
+    }
+
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception {
+        List<BizBusinessOutsourceAssess> list = super.exportList(request);
+        super.exportExcel(BizBusinessOutsourceAssess.class, list, ExportEnum.OUTSOURCE_ASSESS.getSheetName());
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java
new file mode 100644
index 0000000..9adef18
--- /dev/null
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java
@@ -0,0 +1,60 @@
+package com.casic.missiles.controller.business;
+
+import com.casic.missiles.controller.GeneralApprovalController;
+import com.casic.missiles.dto.BaseApprovalSubmitRequest;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.business.outsource.OutsourceProtocolApprovalListRequest;
+import com.casic.missiles.dto.business.outsource.OutsourceProtocolSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
+import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.model.business.BizBusinessOutsourceProtocol;
+import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
+import com.casic.missiles.service.IGeneralApprovalService;
+import com.casic.missiles.service.business.IBizBusinessOutsourceProtocolService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.BindingResult;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.validation.Valid;
+import java.util.List;
+
+/**
+ * <p>
+ * 计量检定业务-分包管理-测试、校准或检定工作分包协议书 前端控制器
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-08-24
+ */
+@Api(tags = "分包管理-测试、校准或检定工作分包协议书")
+@RestController
+@RequestMapping("/business/outsource/protocol")
+public class BizBusinessOutsourceProtocolController extends GeneralApprovalController<BizBusinessOutsourceProtocol, BizBusinessOutsourceProtocol, OutsourceProtocolApprovalListRequest, BaseApprovalSubmitRequest> {
+    @Autowired
+    private IBizBusinessOutsourceProtocolService outsourceProtocolService;
+
+    public BizBusinessOutsourceProtocolController(IGeneralApprovalService<BizBusinessOutsourceProtocol, BizBusinessOutsourceProtocol, OutsourceProtocolApprovalListRequest, BaseApprovalSubmitRequest> baseApprovalService) {
+        super(baseApprovalService);
+    }
+
+    @ApiOperation("草稿箱-保存")
+    @PostMapping("/save")
+    public ReturnDTO<OutsourceProtocolSaveResponse> saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceProtocol request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        return outsourceProtocolService.saveOutsourceProtocol(request);
+    }
+
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody OutsourceProtocolApprovalListRequest request) throws Exception {
+        List<BizBusinessOutsourceProtocol> list = super.exportList(request);
+        super.exportExcel(BizBusinessOutsourceProtocol.class, list, ExportEnum.OUTSOURCE_PROTOCOL.getSheetName());
+    }
+}

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java
index bb0c50f..13a699b 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java
@@ -12,6 +12,7 @@
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.IGeneralApprovalService;
+import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
@@ -19,6 +20,7 @@
 import org.springframework.web.bind.annotation.RequestBody;
 
 import javax.validation.Valid;
+import java.util.List;
 import java.util.Objects;
 
 /**
@@ -117,4 +119,17 @@
         }
         return baseApprovalService.failUpdate(request);
     }
+
+    public List<O> exportList(@RequestBody @Valid R request) throws Exception {
+        List<O> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = baseApprovalService.listExportByIds(request.getIds());
+        } else {
+            list = baseApprovalService.listExport(request);
+        }
+        for (O record : list) {
+            DictCodeUtils.convertDictCodeToName(record);
+        }
+        return list;
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java
index 8a90961..d775831 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java
@@ -5,6 +5,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.business.certificate.CertificateChangeApplyApprovalListRequest;
 import com.casic.missiles.dto.business.certificate.CertificateChangeApplySaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessCertificateChangeApply;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
@@ -20,6 +21,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -48,4 +50,12 @@
         }
         return changeApplyService.saveChangeApply(request);
     }
+
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody CertificateChangeApplyApprovalListRequest request) throws Exception {
+        List<BizBusinessCertificateChangeApply> list = super.exportList(request);
+        super.exportExcel(BizBusinessCertificateChangeApply.class, list, ExportEnum.CERTIFICATE_CHANGE_APPLY.getSheetName());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java
index 5fc4b07..af8230e 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java
@@ -9,6 +9,7 @@
 import com.casic.missiles.dto.business.certificate.CertificatePrintApprovalListRequest;
 import com.casic.missiles.dto.business.certificate.CertificatePrintListResponse;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.enums.business.CertificatePrintStatusEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessCertificatePrintLog;
@@ -18,10 +19,16 @@
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.io.IOException;
+import java.util.List;
 import java.util.Objects;
 
 /**
@@ -98,4 +105,16 @@
         });
         return certificatePrintService.certificatePrintLog(idDTO.getId());
     }
+
+    @ApiOperation("证书打印审批导出")
+    @PostMapping("/listExport")
+    public void exportList(@RequestBody CertificatePrintApprovalListRequest request) throws IOException {
+        List<CertificatePrintListResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = certificatePrintService.listByIds(request.getIds());
+        } else {
+            list = certificatePrintService.list(request);
+        }
+        super.exportExcel(CertificatePrintListResponse.class, list, ExportEnum.CERTIFICATE_PRINT.getSheetName());
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java
index 63b06dc..6b2efd5 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java
@@ -6,6 +6,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.business.certificate.CertificateReportApprovalListRequest;
 import com.casic.missiles.dto.business.certificate.CertificateReportSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessCertificateReport;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
@@ -21,6 +22,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -50,7 +52,7 @@
         return certificateReportService.saveCertificateReport(request);
     }
 
-    @ApiOperation("证书审批详情（基本信息）")
+    @ApiOperation("详情（基本信息）")
     @PostMapping("/detail")
     public ReturnDTO<BizBusinessCertificateReport> detail(@RequestBody @Valid BaseDetailRequest request, BindingResult bindingResult) throws Exception {
         if(bindingResult.hasErrors()){
@@ -59,4 +61,11 @@
         return certificateReportService.detail(request);
     }
 
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody CertificateReportApprovalListRequest request) throws Exception {
+        List<BizBusinessCertificateReport> list = super.exportList(request);
+        super.exportExcel(BizBusinessCertificateReport.class, list, ExportEnum.CERTIFICATE_REPORT.getSheetName());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java
index 46b26bd..57c0809 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java
@@ -10,20 +10,21 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.business.identify.IdentifyListRequest;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessIdentifyInfo;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.business.IBizBusinessIdentifyInfoService;
+import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import javax.validation.Valid;
+import java.util.List;
 import java.util.Objects;
 
 /**
@@ -57,16 +58,13 @@
         return identifyInfoService.addIdentify(identifyInfo);
     }
 
-    @ApiOperation("标识打印更新")
+    @ApiOperation("标识打印更新（更新打印时间）")
     @PostMapping("/update")
-    public ReturnDTO updateIdentify(@RequestBody @Valid BizBusinessIdentifyInfo identifyInfo, BindingResult bindingResult) {
-        Assert.isFalse(Objects.isNull(identifyInfo.getId()), () -> {
+    public ReturnDTO updateIdentify(@RequestBody @Valid IdDTO idDTO) {
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        Assert.isFalse(bindingResult.hasErrors(), () -> {
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        });
-        return identifyInfoService.updateIdentify(identifyInfo);
+        return identifyInfoService.updateIdentify(idDTO.getId());
     }
 
     @ApiOperation("标识打印删除")
@@ -77,4 +75,37 @@
         });
         return identifyInfoService.deleteIdentify(idDTO.getId());
     }
+
+    @ApiOperation("标识打印导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody @Valid IdentifyListRequest request, BindingResult bindingResult) throws Exception {
+        if (bindingResult.hasErrors()) {
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        List<BizBusinessIdentifyInfo> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = identifyInfoService.listByIds(request.getIds());
+        } else {
+            list = identifyInfoService.list(request);
+        }
+        for (BizBusinessIdentifyInfo record : list) {
+            DictCodeUtils.convertDictCodeToName(record);
+        }
+        super.exportExcel(BizBusinessIdentifyInfo.class, list, ExportEnum.IDENTIFY_EXPORT.getSheetName());
+    }
+
+
+    // TODO: 2023/8/23 查询设备信息，4个底部按钮查设备（按钮的作用就是前端用来调不同接口、用来区分中间即将展示的标识），前端弹窗选设备，在确定保存时前端根据底部按钮判断传入设备类型deviceType字典code
+    // TODO: 2023/8/23 接口：查受检设备（第1个按钮），查设备台账（后3个按钮同一接口），查询之后前端根据标志类型的不同加到中间页面时进行判断（按产品给的对应表）
+    // TODO: 2023/8/23 提供二维码接口，前端在加到中间页面时调用一下
+
+    @ApiOperation("设备二维码")
+    @PostMapping("/equipment/qrCode")
+    public ReturnDTO<String> equipmentQrCode(@RequestBody @Valid IdDTO idDTO) {
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return identifyInfoService.equipmentQrCode(idDTO.getId());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java
index 707be6e..7e0453d 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java
@@ -117,7 +117,7 @@
     }
 
     @ApiOperation("任务单导出")
-    @PostMapping("/export")
+    @PostMapping("/listExport")
     public void orderExport(@RequestBody @Valid OrderListRequest request, HttpServletResponse response) {
         businessOrderService.orderExport(request, response);
     }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java
index 529a6ce..51432be 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java
@@ -1,9 +1,28 @@
 package com.casic.missiles.controller.business;
 
+import com.casic.missiles.controller.GeneralApprovalController;
+import com.casic.missiles.dto.BaseApprovalSubmitRequest;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.business.outsource.OutsourceAssessApprovalListRequest;
+import com.casic.missiles.dto.business.outsource.OutsourceAssessSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
+import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.model.business.BizBusinessOutsourceAssess;
+import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
+import com.casic.missiles.service.IGeneralApprovalService;
+import com.casic.missiles.service.business.IBizBusinessOutsourceAssessService;
 import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.BindingResult;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.validation.Valid;
+import java.util.List;
+
 /**
  * <p>
  * 计量检定业务-分包管理-测试、校准或检定工作分包评审表 前端控制器
@@ -15,6 +34,27 @@
 @Api(tags = "分包管理-测试、校准或检定工作分包评审表")
 @RestController
 @RequestMapping("/business/outsource/assess")
-public class BizBusinessOutsourceAssessController {
+public class BizBusinessOutsourceAssessController extends GeneralApprovalController<BizBusinessOutsourceAssess, BizBusinessOutsourceAssess, OutsourceAssessApprovalListRequest, BaseApprovalSubmitRequest> {
+    @Autowired
+    private IBizBusinessOutsourceAssessService outsourceAssessService;
 
+    public BizBusinessOutsourceAssessController(IGeneralApprovalService<BizBusinessOutsourceAssess, BizBusinessOutsourceAssess, OutsourceAssessApprovalListRequest, BaseApprovalSubmitRequest> baseApprovalService) {
+        super(baseApprovalService);
+    }
+
+    @ApiOperation("草稿箱-保存")
+    @PostMapping("/save")
+    public ReturnDTO<OutsourceAssessSaveResponse> saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceAssess request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        return outsourceAssessService.saveOutsourceAssess(request);
+    }
+
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception {
+        List<BizBusinessOutsourceAssess> list = super.exportList(request);
+        super.exportExcel(BizBusinessOutsourceAssess.class, list, ExportEnum.OUTSOURCE_ASSESS.getSheetName());
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java
new file mode 100644
index 0000000..9adef18
--- /dev/null
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java
@@ -0,0 +1,60 @@
+package com.casic.missiles.controller.business;
+
+import com.casic.missiles.controller.GeneralApprovalController;
+import com.casic.missiles.dto.BaseApprovalSubmitRequest;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.business.outsource.OutsourceProtocolApprovalListRequest;
+import com.casic.missiles.dto.business.outsource.OutsourceProtocolSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
+import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.model.business.BizBusinessOutsourceProtocol;
+import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
+import com.casic.missiles.service.IGeneralApprovalService;
+import com.casic.missiles.service.business.IBizBusinessOutsourceProtocolService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.BindingResult;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.validation.Valid;
+import java.util.List;
+
+/**
+ * <p>
+ * 计量检定业务-分包管理-测试、校准或检定工作分包协议书 前端控制器
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-08-24
+ */
+@Api(tags = "分包管理-测试、校准或检定工作分包协议书")
+@RestController
+@RequestMapping("/business/outsource/protocol")
+public class BizBusinessOutsourceProtocolController extends GeneralApprovalController<BizBusinessOutsourceProtocol, BizBusinessOutsourceProtocol, OutsourceProtocolApprovalListRequest, BaseApprovalSubmitRequest> {
+    @Autowired
+    private IBizBusinessOutsourceProtocolService outsourceProtocolService;
+
+    public BizBusinessOutsourceProtocolController(IGeneralApprovalService<BizBusinessOutsourceProtocol, BizBusinessOutsourceProtocol, OutsourceProtocolApprovalListRequest, BaseApprovalSubmitRequest> baseApprovalService) {
+        super(baseApprovalService);
+    }
+
+    @ApiOperation("草稿箱-保存")
+    @PostMapping("/save")
+    public ReturnDTO<OutsourceProtocolSaveResponse> saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceProtocol request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        return outsourceProtocolService.saveOutsourceProtocol(request);
+    }
+
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody OutsourceProtocolApprovalListRequest request) throws Exception {
+        List<BizBusinessOutsourceProtocol> list = super.exportList(request);
+        super.exportExcel(BizBusinessOutsourceProtocol.class, list, ExportEnum.OUTSOURCE_PROTOCOL.getSheetName());
+    }
+}
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java
index 097f645..f0f0943 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java
@@ -17,7 +17,6 @@
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.IGeneralApprovalService;
 import com.casic.missiles.service.business.IBizBusinessOutsourcerInfoService;
-import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -71,19 +70,8 @@
 
     @ApiOperation("分包方导出")
     @PostMapping("/listExport")
-    public void export(@RequestBody @Valid OutsourcerInfoApprovalListRequest request, BindingResult bindingResult) throws Exception {
-        if (bindingResult.hasErrors()) {
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        }
-        List<BizBusinessOutsourcerInfo> list;
-        if (!CollectionUtils.isEmpty(request.getIds())) {
-            list = outsourcerInfoService.listByIds(request.getIds());
-        } else {
-            list = outsourcerInfoService.list(request);
-        }
-        for (BizBusinessOutsourcerInfo record : list) {
-            DictCodeUtils.convertDictCodeToName(record);
-        }
+    public void export(@RequestBody OutsourcerInfoApprovalListRequest request) throws Exception {
+        List<BizBusinessOutsourcerInfo> list = super.exportList(request);
         super.exportExcel(BizBusinessOutsourcerInfo.class, list, ExportEnum.OUTSOURCER_EXPORT.getSheetName());
     }
 

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java
index bb0c50f..13a699b 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java
@@ -12,6 +12,7 @@
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.IGeneralApprovalService;
+import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
@@ -19,6 +20,7 @@
 import org.springframework.web.bind.annotation.RequestBody;
 
 import javax.validation.Valid;
+import java.util.List;
 import java.util.Objects;
 
 /**
@@ -117,4 +119,17 @@
         }
         return baseApprovalService.failUpdate(request);
     }
+
+    public List<O> exportList(@RequestBody @Valid R request) throws Exception {
+        List<O> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = baseApprovalService.listExportByIds(request.getIds());
+        } else {
+            list = baseApprovalService.listExport(request);
+        }
+        for (O record : list) {
+            DictCodeUtils.convertDictCodeToName(record);
+        }
+        return list;
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java
index 8a90961..d775831 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java
@@ -5,6 +5,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.business.certificate.CertificateChangeApplyApprovalListRequest;
 import com.casic.missiles.dto.business.certificate.CertificateChangeApplySaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessCertificateChangeApply;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
@@ -20,6 +21,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -48,4 +50,12 @@
         }
         return changeApplyService.saveChangeApply(request);
     }
+
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody CertificateChangeApplyApprovalListRequest request) throws Exception {
+        List<BizBusinessCertificateChangeApply> list = super.exportList(request);
+        super.exportExcel(BizBusinessCertificateChangeApply.class, list, ExportEnum.CERTIFICATE_CHANGE_APPLY.getSheetName());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java
index 5fc4b07..af8230e 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java
@@ -9,6 +9,7 @@
 import com.casic.missiles.dto.business.certificate.CertificatePrintApprovalListRequest;
 import com.casic.missiles.dto.business.certificate.CertificatePrintListResponse;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.enums.business.CertificatePrintStatusEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessCertificatePrintLog;
@@ -18,10 +19,16 @@
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.io.IOException;
+import java.util.List;
 import java.util.Objects;
 
 /**
@@ -98,4 +105,16 @@
         });
         return certificatePrintService.certificatePrintLog(idDTO.getId());
     }
+
+    @ApiOperation("证书打印审批导出")
+    @PostMapping("/listExport")
+    public void exportList(@RequestBody CertificatePrintApprovalListRequest request) throws IOException {
+        List<CertificatePrintListResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = certificatePrintService.listByIds(request.getIds());
+        } else {
+            list = certificatePrintService.list(request);
+        }
+        super.exportExcel(CertificatePrintListResponse.class, list, ExportEnum.CERTIFICATE_PRINT.getSheetName());
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java
index 63b06dc..6b2efd5 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java
@@ -6,6 +6,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.business.certificate.CertificateReportApprovalListRequest;
 import com.casic.missiles.dto.business.certificate.CertificateReportSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessCertificateReport;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
@@ -21,6 +22,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -50,7 +52,7 @@
         return certificateReportService.saveCertificateReport(request);
     }
 
-    @ApiOperation("证书审批详情（基本信息）")
+    @ApiOperation("详情（基本信息）")
     @PostMapping("/detail")
     public ReturnDTO<BizBusinessCertificateReport> detail(@RequestBody @Valid BaseDetailRequest request, BindingResult bindingResult) throws Exception {
         if(bindingResult.hasErrors()){
@@ -59,4 +61,11 @@
         return certificateReportService.detail(request);
     }
 
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody CertificateReportApprovalListRequest request) throws Exception {
+        List<BizBusinessCertificateReport> list = super.exportList(request);
+        super.exportExcel(BizBusinessCertificateReport.class, list, ExportEnum.CERTIFICATE_REPORT.getSheetName());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java
index 46b26bd..57c0809 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java
@@ -10,20 +10,21 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.business.identify.IdentifyListRequest;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessIdentifyInfo;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.business.IBizBusinessIdentifyInfoService;
+import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import javax.validation.Valid;
+import java.util.List;
 import java.util.Objects;
 
 /**
@@ -57,16 +58,13 @@
         return identifyInfoService.addIdentify(identifyInfo);
     }
 
-    @ApiOperation("标识打印更新")
+    @ApiOperation("标识打印更新（更新打印时间）")
     @PostMapping("/update")
-    public ReturnDTO updateIdentify(@RequestBody @Valid BizBusinessIdentifyInfo identifyInfo, BindingResult bindingResult) {
-        Assert.isFalse(Objects.isNull(identifyInfo.getId()), () -> {
+    public ReturnDTO updateIdentify(@RequestBody @Valid IdDTO idDTO) {
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        Assert.isFalse(bindingResult.hasErrors(), () -> {
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        });
-        return identifyInfoService.updateIdentify(identifyInfo);
+        return identifyInfoService.updateIdentify(idDTO.getId());
     }
 
     @ApiOperation("标识打印删除")
@@ -77,4 +75,37 @@
         });
         return identifyInfoService.deleteIdentify(idDTO.getId());
     }
+
+    @ApiOperation("标识打印导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody @Valid IdentifyListRequest request, BindingResult bindingResult) throws Exception {
+        if (bindingResult.hasErrors()) {
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        List<BizBusinessIdentifyInfo> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = identifyInfoService.listByIds(request.getIds());
+        } else {
+            list = identifyInfoService.list(request);
+        }
+        for (BizBusinessIdentifyInfo record : list) {
+            DictCodeUtils.convertDictCodeToName(record);
+        }
+        super.exportExcel(BizBusinessIdentifyInfo.class, list, ExportEnum.IDENTIFY_EXPORT.getSheetName());
+    }
+
+
+    // TODO: 2023/8/23 查询设备信息，4个底部按钮查设备（按钮的作用就是前端用来调不同接口、用来区分中间即将展示的标识），前端弹窗选设备，在确定保存时前端根据底部按钮判断传入设备类型deviceType字典code
+    // TODO: 2023/8/23 接口：查受检设备（第1个按钮），查设备台账（后3个按钮同一接口），查询之后前端根据标志类型的不同加到中间页面时进行判断（按产品给的对应表）
+    // TODO: 2023/8/23 提供二维码接口，前端在加到中间页面时调用一下
+
+    @ApiOperation("设备二维码")
+    @PostMapping("/equipment/qrCode")
+    public ReturnDTO<String> equipmentQrCode(@RequestBody @Valid IdDTO idDTO) {
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return identifyInfoService.equipmentQrCode(idDTO.getId());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java
index 707be6e..7e0453d 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java
@@ -117,7 +117,7 @@
     }
 
     @ApiOperation("任务单导出")
-    @PostMapping("/export")
+    @PostMapping("/listExport")
     public void orderExport(@RequestBody @Valid OrderListRequest request, HttpServletResponse response) {
         businessOrderService.orderExport(request, response);
     }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java
index 529a6ce..51432be 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java
@@ -1,9 +1,28 @@
 package com.casic.missiles.controller.business;
 
+import com.casic.missiles.controller.GeneralApprovalController;
+import com.casic.missiles.dto.BaseApprovalSubmitRequest;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.business.outsource.OutsourceAssessApprovalListRequest;
+import com.casic.missiles.dto.business.outsource.OutsourceAssessSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
+import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.model.business.BizBusinessOutsourceAssess;
+import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
+import com.casic.missiles.service.IGeneralApprovalService;
+import com.casic.missiles.service.business.IBizBusinessOutsourceAssessService;
 import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.BindingResult;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.validation.Valid;
+import java.util.List;
+
 /**
  * <p>
  * 计量检定业务-分包管理-测试、校准或检定工作分包评审表 前端控制器
@@ -15,6 +34,27 @@
 @Api(tags = "分包管理-测试、校准或检定工作分包评审表")
 @RestController
 @RequestMapping("/business/outsource/assess")
-public class BizBusinessOutsourceAssessController {
+public class BizBusinessOutsourceAssessController extends GeneralApprovalController<BizBusinessOutsourceAssess, BizBusinessOutsourceAssess, OutsourceAssessApprovalListRequest, BaseApprovalSubmitRequest> {
+    @Autowired
+    private IBizBusinessOutsourceAssessService outsourceAssessService;
 
+    public BizBusinessOutsourceAssessController(IGeneralApprovalService<BizBusinessOutsourceAssess, BizBusinessOutsourceAssess, OutsourceAssessApprovalListRequest, BaseApprovalSubmitRequest> baseApprovalService) {
+        super(baseApprovalService);
+    }
+
+    @ApiOperation("草稿箱-保存")
+    @PostMapping("/save")
+    public ReturnDTO<OutsourceAssessSaveResponse> saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceAssess request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        return outsourceAssessService.saveOutsourceAssess(request);
+    }
+
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception {
+        List<BizBusinessOutsourceAssess> list = super.exportList(request);
+        super.exportExcel(BizBusinessOutsourceAssess.class, list, ExportEnum.OUTSOURCE_ASSESS.getSheetName());
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java
new file mode 100644
index 0000000..9adef18
--- /dev/null
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java
@@ -0,0 +1,60 @@
+package com.casic.missiles.controller.business;
+
+import com.casic.missiles.controller.GeneralApprovalController;
+import com.casic.missiles.dto.BaseApprovalSubmitRequest;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.business.outsource.OutsourceProtocolApprovalListRequest;
+import com.casic.missiles.dto.business.outsource.OutsourceProtocolSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
+import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.model.business.BizBusinessOutsourceProtocol;
+import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
+import com.casic.missiles.service.IGeneralApprovalService;
+import com.casic.missiles.service.business.IBizBusinessOutsourceProtocolService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.BindingResult;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.validation.Valid;
+import java.util.List;
+
+/**
+ * <p>
+ * 计量检定业务-分包管理-测试、校准或检定工作分包协议书 前端控制器
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-08-24
+ */
+@Api(tags = "分包管理-测试、校准或检定工作分包协议书")
+@RestController
+@RequestMapping("/business/outsource/protocol")
+public class BizBusinessOutsourceProtocolController extends GeneralApprovalController<BizBusinessOutsourceProtocol, BizBusinessOutsourceProtocol, OutsourceProtocolApprovalListRequest, BaseApprovalSubmitRequest> {
+    @Autowired
+    private IBizBusinessOutsourceProtocolService outsourceProtocolService;
+
+    public BizBusinessOutsourceProtocolController(IGeneralApprovalService<BizBusinessOutsourceProtocol, BizBusinessOutsourceProtocol, OutsourceProtocolApprovalListRequest, BaseApprovalSubmitRequest> baseApprovalService) {
+        super(baseApprovalService);
+    }
+
+    @ApiOperation("草稿箱-保存")
+    @PostMapping("/save")
+    public ReturnDTO<OutsourceProtocolSaveResponse> saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceProtocol request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        return outsourceProtocolService.saveOutsourceProtocol(request);
+    }
+
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody OutsourceProtocolApprovalListRequest request) throws Exception {
+        List<BizBusinessOutsourceProtocol> list = super.exportList(request);
+        super.exportExcel(BizBusinessOutsourceProtocol.class, list, ExportEnum.OUTSOURCE_PROTOCOL.getSheetName());
+    }
+}
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java
index 097f645..f0f0943 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java
@@ -17,7 +17,6 @@
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.IGeneralApprovalService;
 import com.casic.missiles.service.business.IBizBusinessOutsourcerInfoService;
-import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -71,19 +70,8 @@
 
     @ApiOperation("分包方导出")
     @PostMapping("/listExport")
-    public void export(@RequestBody @Valid OutsourcerInfoApprovalListRequest request, BindingResult bindingResult) throws Exception {
-        if (bindingResult.hasErrors()) {
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        }
-        List<BizBusinessOutsourcerInfo> list;
-        if (!CollectionUtils.isEmpty(request.getIds())) {
-            list = outsourcerInfoService.listByIds(request.getIds());
-        } else {
-            list = outsourcerInfoService.list(request);
-        }
-        for (BizBusinessOutsourcerInfo record : list) {
-            DictCodeUtils.convertDictCodeToName(record);
-        }
+    public void export(@RequestBody OutsourcerInfoApprovalListRequest request) throws Exception {
+        List<BizBusinessOutsourcerInfo> list = super.exportList(request);
         super.exportExcel(BizBusinessOutsourcerInfo.class, list, ExportEnum.OUTSOURCER_EXPORT.getSheetName());
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java
index c2cbf9f..0410918 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java
@@ -17,11 +17,9 @@
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.IGeneralApprovalService;
 import com.casic.missiles.service.business.IBizBusinessSiteExecutiveInfoService;
-import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -60,7 +58,7 @@
         return siteExecutiveInfoService.saveSiteExecutiveInfo(siteExecutiveInfo);
     }
 
-    @ApiOperation("现场检测详情")
+    @ApiOperation("详情")
     @PostMapping("/detail")
     public ReturnDTO<SiteExecutiveDetailResponse> siteExecutiveDetail(@RequestBody @Valid IdDTO idDTO) throws Exception {
         Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
@@ -69,21 +67,10 @@
         return ReturnUtil.success(siteExecutiveInfoService.detail(idDTO.getId()));
     }
 
-    @ApiOperation("现场检测导出")
+    @ApiOperation("导出")
     @PostMapping("/listExport")
-    public void export(@RequestBody @Valid SiteExecutiveApprovalListRequest request, BindingResult bindingResult) throws Exception {
-        if (bindingResult.hasErrors()) {
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        }
-        List<SiteExecutiveApprovalListResponse> list;
-        if (!CollectionUtils.isEmpty(request.getIds())) {
-            list = siteExecutiveInfoService.listInfoByIds(request.getIds());
-        } else {
-            list = siteExecutiveInfoService.listInfo(request);
-        }
-        for (SiteExecutiveApprovalListResponse record : list) {
-            DictCodeUtils.convertDictCodeToName(record);
-        }
+    public void export(@RequestBody SiteExecutiveApprovalListRequest request) throws Exception {
+        List<SiteExecutiveApprovalListResponse> list = super.exportList(request);
         super.exportExcel(SiteExecutiveApprovalListResponse.class, list, ExportEnum.SITE_EXECUTIVE_EXPORT.getSheetName());
     }
 }

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java
index bb0c50f..13a699b 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java
@@ -12,6 +12,7 @@
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.IGeneralApprovalService;
+import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
@@ -19,6 +20,7 @@
 import org.springframework.web.bind.annotation.RequestBody;
 
 import javax.validation.Valid;
+import java.util.List;
 import java.util.Objects;
 
 /**
@@ -117,4 +119,17 @@
         }
         return baseApprovalService.failUpdate(request);
     }
+
+    public List<O> exportList(@RequestBody @Valid R request) throws Exception {
+        List<O> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = baseApprovalService.listExportByIds(request.getIds());
+        } else {
+            list = baseApprovalService.listExport(request);
+        }
+        for (O record : list) {
+            DictCodeUtils.convertDictCodeToName(record);
+        }
+        return list;
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java
index 8a90961..d775831 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java
@@ -5,6 +5,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.business.certificate.CertificateChangeApplyApprovalListRequest;
 import com.casic.missiles.dto.business.certificate.CertificateChangeApplySaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessCertificateChangeApply;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
@@ -20,6 +21,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -48,4 +50,12 @@
         }
         return changeApplyService.saveChangeApply(request);
     }
+
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody CertificateChangeApplyApprovalListRequest request) throws Exception {
+        List<BizBusinessCertificateChangeApply> list = super.exportList(request);
+        super.exportExcel(BizBusinessCertificateChangeApply.class, list, ExportEnum.CERTIFICATE_CHANGE_APPLY.getSheetName());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java
index 5fc4b07..af8230e 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java
@@ -9,6 +9,7 @@
 import com.casic.missiles.dto.business.certificate.CertificatePrintApprovalListRequest;
 import com.casic.missiles.dto.business.certificate.CertificatePrintListResponse;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.enums.business.CertificatePrintStatusEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessCertificatePrintLog;
@@ -18,10 +19,16 @@
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.io.IOException;
+import java.util.List;
 import java.util.Objects;
 
 /**
@@ -98,4 +105,16 @@
         });
         return certificatePrintService.certificatePrintLog(idDTO.getId());
     }
+
+    @ApiOperation("证书打印审批导出")
+    @PostMapping("/listExport")
+    public void exportList(@RequestBody CertificatePrintApprovalListRequest request) throws IOException {
+        List<CertificatePrintListResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = certificatePrintService.listByIds(request.getIds());
+        } else {
+            list = certificatePrintService.list(request);
+        }
+        super.exportExcel(CertificatePrintListResponse.class, list, ExportEnum.CERTIFICATE_PRINT.getSheetName());
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java
index 63b06dc..6b2efd5 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java
@@ -6,6 +6,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.business.certificate.CertificateReportApprovalListRequest;
 import com.casic.missiles.dto.business.certificate.CertificateReportSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessCertificateReport;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
@@ -21,6 +22,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -50,7 +52,7 @@
         return certificateReportService.saveCertificateReport(request);
     }
 
-    @ApiOperation("证书审批详情（基本信息）")
+    @ApiOperation("详情（基本信息）")
     @PostMapping("/detail")
     public ReturnDTO<BizBusinessCertificateReport> detail(@RequestBody @Valid BaseDetailRequest request, BindingResult bindingResult) throws Exception {
         if(bindingResult.hasErrors()){
@@ -59,4 +61,11 @@
         return certificateReportService.detail(request);
     }
 
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody CertificateReportApprovalListRequest request) throws Exception {
+        List<BizBusinessCertificateReport> list = super.exportList(request);
+        super.exportExcel(BizBusinessCertificateReport.class, list, ExportEnum.CERTIFICATE_REPORT.getSheetName());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java
index 46b26bd..57c0809 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java
@@ -10,20 +10,21 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.business.identify.IdentifyListRequest;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessIdentifyInfo;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.business.IBizBusinessIdentifyInfoService;
+import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import javax.validation.Valid;
+import java.util.List;
 import java.util.Objects;
 
 /**
@@ -57,16 +58,13 @@
         return identifyInfoService.addIdentify(identifyInfo);
     }
 
-    @ApiOperation("标识打印更新")
+    @ApiOperation("标识打印更新（更新打印时间）")
     @PostMapping("/update")
-    public ReturnDTO updateIdentify(@RequestBody @Valid BizBusinessIdentifyInfo identifyInfo, BindingResult bindingResult) {
-        Assert.isFalse(Objects.isNull(identifyInfo.getId()), () -> {
+    public ReturnDTO updateIdentify(@RequestBody @Valid IdDTO idDTO) {
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        Assert.isFalse(bindingResult.hasErrors(), () -> {
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        });
-        return identifyInfoService.updateIdentify(identifyInfo);
+        return identifyInfoService.updateIdentify(idDTO.getId());
     }
 
     @ApiOperation("标识打印删除")
@@ -77,4 +75,37 @@
         });
         return identifyInfoService.deleteIdentify(idDTO.getId());
     }
+
+    @ApiOperation("标识打印导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody @Valid IdentifyListRequest request, BindingResult bindingResult) throws Exception {
+        if (bindingResult.hasErrors()) {
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        List<BizBusinessIdentifyInfo> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = identifyInfoService.listByIds(request.getIds());
+        } else {
+            list = identifyInfoService.list(request);
+        }
+        for (BizBusinessIdentifyInfo record : list) {
+            DictCodeUtils.convertDictCodeToName(record);
+        }
+        super.exportExcel(BizBusinessIdentifyInfo.class, list, ExportEnum.IDENTIFY_EXPORT.getSheetName());
+    }
+
+
+    // TODO: 2023/8/23 查询设备信息，4个底部按钮查设备（按钮的作用就是前端用来调不同接口、用来区分中间即将展示的标识），前端弹窗选设备，在确定保存时前端根据底部按钮判断传入设备类型deviceType字典code
+    // TODO: 2023/8/23 接口：查受检设备（第1个按钮），查设备台账（后3个按钮同一接口），查询之后前端根据标志类型的不同加到中间页面时进行判断（按产品给的对应表）
+    // TODO: 2023/8/23 提供二维码接口，前端在加到中间页面时调用一下
+
+    @ApiOperation("设备二维码")
+    @PostMapping("/equipment/qrCode")
+    public ReturnDTO<String> equipmentQrCode(@RequestBody @Valid IdDTO idDTO) {
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return identifyInfoService.equipmentQrCode(idDTO.getId());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java
index 707be6e..7e0453d 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java
@@ -117,7 +117,7 @@
     }
 
     @ApiOperation("任务单导出")
-    @PostMapping("/export")
+    @PostMapping("/listExport")
     public void orderExport(@RequestBody @Valid OrderListRequest request, HttpServletResponse response) {
         businessOrderService.orderExport(request, response);
     }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java
index 529a6ce..51432be 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java
@@ -1,9 +1,28 @@
 package com.casic.missiles.controller.business;
 
+import com.casic.missiles.controller.GeneralApprovalController;
+import com.casic.missiles.dto.BaseApprovalSubmitRequest;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.business.outsource.OutsourceAssessApprovalListRequest;
+import com.casic.missiles.dto.business.outsource.OutsourceAssessSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
+import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.model.business.BizBusinessOutsourceAssess;
+import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
+import com.casic.missiles.service.IGeneralApprovalService;
+import com.casic.missiles.service.business.IBizBusinessOutsourceAssessService;
 import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.BindingResult;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.validation.Valid;
+import java.util.List;
+
 /**
  * <p>
  * 计量检定业务-分包管理-测试、校准或检定工作分包评审表 前端控制器
@@ -15,6 +34,27 @@
 @Api(tags = "分包管理-测试、校准或检定工作分包评审表")
 @RestController
 @RequestMapping("/business/outsource/assess")
-public class BizBusinessOutsourceAssessController {
+public class BizBusinessOutsourceAssessController extends GeneralApprovalController<BizBusinessOutsourceAssess, BizBusinessOutsourceAssess, OutsourceAssessApprovalListRequest, BaseApprovalSubmitRequest> {
+    @Autowired
+    private IBizBusinessOutsourceAssessService outsourceAssessService;
 
+    public BizBusinessOutsourceAssessController(IGeneralApprovalService<BizBusinessOutsourceAssess, BizBusinessOutsourceAssess, OutsourceAssessApprovalListRequest, BaseApprovalSubmitRequest> baseApprovalService) {
+        super(baseApprovalService);
+    }
+
+    @ApiOperation("草稿箱-保存")
+    @PostMapping("/save")
+    public ReturnDTO<OutsourceAssessSaveResponse> saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceAssess request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        return outsourceAssessService.saveOutsourceAssess(request);
+    }
+
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception {
+        List<BizBusinessOutsourceAssess> list = super.exportList(request);
+        super.exportExcel(BizBusinessOutsourceAssess.class, list, ExportEnum.OUTSOURCE_ASSESS.getSheetName());
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java
new file mode 100644
index 0000000..9adef18
--- /dev/null
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java
@@ -0,0 +1,60 @@
+package com.casic.missiles.controller.business;
+
+import com.casic.missiles.controller.GeneralApprovalController;
+import com.casic.missiles.dto.BaseApprovalSubmitRequest;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.business.outsource.OutsourceProtocolApprovalListRequest;
+import com.casic.missiles.dto.business.outsource.OutsourceProtocolSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
+import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.model.business.BizBusinessOutsourceProtocol;
+import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
+import com.casic.missiles.service.IGeneralApprovalService;
+import com.casic.missiles.service.business.IBizBusinessOutsourceProtocolService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.BindingResult;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.validation.Valid;
+import java.util.List;
+
+/**
+ * <p>
+ * 计量检定业务-分包管理-测试、校准或检定工作分包协议书 前端控制器
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-08-24
+ */
+@Api(tags = "分包管理-测试、校准或检定工作分包协议书")
+@RestController
+@RequestMapping("/business/outsource/protocol")
+public class BizBusinessOutsourceProtocolController extends GeneralApprovalController<BizBusinessOutsourceProtocol, BizBusinessOutsourceProtocol, OutsourceProtocolApprovalListRequest, BaseApprovalSubmitRequest> {
+    @Autowired
+    private IBizBusinessOutsourceProtocolService outsourceProtocolService;
+
+    public BizBusinessOutsourceProtocolController(IGeneralApprovalService<BizBusinessOutsourceProtocol, BizBusinessOutsourceProtocol, OutsourceProtocolApprovalListRequest, BaseApprovalSubmitRequest> baseApprovalService) {
+        super(baseApprovalService);
+    }
+
+    @ApiOperation("草稿箱-保存")
+    @PostMapping("/save")
+    public ReturnDTO<OutsourceProtocolSaveResponse> saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceProtocol request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        return outsourceProtocolService.saveOutsourceProtocol(request);
+    }
+
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody OutsourceProtocolApprovalListRequest request) throws Exception {
+        List<BizBusinessOutsourceProtocol> list = super.exportList(request);
+        super.exportExcel(BizBusinessOutsourceProtocol.class, list, ExportEnum.OUTSOURCE_PROTOCOL.getSheetName());
+    }
+}
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java
index 097f645..f0f0943 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java
@@ -17,7 +17,6 @@
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.IGeneralApprovalService;
 import com.casic.missiles.service.business.IBizBusinessOutsourcerInfoService;
-import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -71,19 +70,8 @@
 
     @ApiOperation("分包方导出")
     @PostMapping("/listExport")
-    public void export(@RequestBody @Valid OutsourcerInfoApprovalListRequest request, BindingResult bindingResult) throws Exception {
-        if (bindingResult.hasErrors()) {
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        }
-        List<BizBusinessOutsourcerInfo> list;
-        if (!CollectionUtils.isEmpty(request.getIds())) {
-            list = outsourcerInfoService.listByIds(request.getIds());
-        } else {
-            list = outsourcerInfoService.list(request);
-        }
-        for (BizBusinessOutsourcerInfo record : list) {
-            DictCodeUtils.convertDictCodeToName(record);
-        }
+    public void export(@RequestBody OutsourcerInfoApprovalListRequest request) throws Exception {
+        List<BizBusinessOutsourcerInfo> list = super.exportList(request);
         super.exportExcel(BizBusinessOutsourcerInfo.class, list, ExportEnum.OUTSOURCER_EXPORT.getSheetName());
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java
index c2cbf9f..0410918 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java
@@ -17,11 +17,9 @@
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.IGeneralApprovalService;
 import com.casic.missiles.service.business.IBizBusinessSiteExecutiveInfoService;
-import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -60,7 +58,7 @@
         return siteExecutiveInfoService.saveSiteExecutiveInfo(siteExecutiveInfo);
     }
 
-    @ApiOperation("现场检测详情")
+    @ApiOperation("详情")
     @PostMapping("/detail")
     public ReturnDTO<SiteExecutiveDetailResponse> siteExecutiveDetail(@RequestBody @Valid IdDTO idDTO) throws Exception {
         Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
@@ -69,21 +67,10 @@
         return ReturnUtil.success(siteExecutiveInfoService.detail(idDTO.getId()));
     }
 
-    @ApiOperation("现场检测导出")
+    @ApiOperation("导出")
     @PostMapping("/listExport")
-    public void export(@RequestBody @Valid SiteExecutiveApprovalListRequest request, BindingResult bindingResult) throws Exception {
-        if (bindingResult.hasErrors()) {
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        }
-        List<SiteExecutiveApprovalListResponse> list;
-        if (!CollectionUtils.isEmpty(request.getIds())) {
-            list = siteExecutiveInfoService.listInfoByIds(request.getIds());
-        } else {
-            list = siteExecutiveInfoService.listInfo(request);
-        }
-        for (SiteExecutiveApprovalListResponse record : list) {
-            DictCodeUtils.convertDictCodeToName(record);
-        }
+    public void export(@RequestBody SiteExecutiveApprovalListRequest request) throws Exception {
+        List<SiteExecutiveApprovalListResponse> list = super.exportList(request);
         super.exportExcel(SiteExecutiveApprovalListResponse.class, list, ExportEnum.SITE_EXECUTIVE_EXPORT.getSheetName());
     }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
index 7e793cd..a92e209 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
@@ -55,7 +55,7 @@
 
     @ApiOperation("设备收发列表导出")
     @PostMapping("/export")
-    public void exportList(@RequestBody @Valid SampleDispatchListRequest request) throws IOException {
+    public void exportList(@RequestBody SampleDispatchListRequest request) throws IOException {
         List<SampleDispatchListResponse> list;
         if (!CollectionUtils.isEmpty(request.getIds())) {
             list = dispatchService.listByIds(request.getIds());

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java
index bb0c50f..13a699b 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java
@@ -12,6 +12,7 @@
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.IGeneralApprovalService;
+import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
@@ -19,6 +20,7 @@
 import org.springframework.web.bind.annotation.RequestBody;
 
 import javax.validation.Valid;
+import java.util.List;
 import java.util.Objects;
 
 /**
@@ -117,4 +119,17 @@
         }
         return baseApprovalService.failUpdate(request);
     }
+
+    public List<O> exportList(@RequestBody @Valid R request) throws Exception {
+        List<O> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = baseApprovalService.listExportByIds(request.getIds());
+        } else {
+            list = baseApprovalService.listExport(request);
+        }
+        for (O record : list) {
+            DictCodeUtils.convertDictCodeToName(record);
+        }
+        return list;
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java
index 8a90961..d775831 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java
@@ -5,6 +5,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.business.certificate.CertificateChangeApplyApprovalListRequest;
 import com.casic.missiles.dto.business.certificate.CertificateChangeApplySaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessCertificateChangeApply;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
@@ -20,6 +21,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -48,4 +50,12 @@
         }
         return changeApplyService.saveChangeApply(request);
     }
+
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody CertificateChangeApplyApprovalListRequest request) throws Exception {
+        List<BizBusinessCertificateChangeApply> list = super.exportList(request);
+        super.exportExcel(BizBusinessCertificateChangeApply.class, list, ExportEnum.CERTIFICATE_CHANGE_APPLY.getSheetName());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java
index 5fc4b07..af8230e 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java
@@ -9,6 +9,7 @@
 import com.casic.missiles.dto.business.certificate.CertificatePrintApprovalListRequest;
 import com.casic.missiles.dto.business.certificate.CertificatePrintListResponse;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.enums.business.CertificatePrintStatusEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessCertificatePrintLog;
@@ -18,10 +19,16 @@
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.io.IOException;
+import java.util.List;
 import java.util.Objects;
 
 /**
@@ -98,4 +105,16 @@
         });
         return certificatePrintService.certificatePrintLog(idDTO.getId());
     }
+
+    @ApiOperation("证书打印审批导出")
+    @PostMapping("/listExport")
+    public void exportList(@RequestBody CertificatePrintApprovalListRequest request) throws IOException {
+        List<CertificatePrintListResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = certificatePrintService.listByIds(request.getIds());
+        } else {
+            list = certificatePrintService.list(request);
+        }
+        super.exportExcel(CertificatePrintListResponse.class, list, ExportEnum.CERTIFICATE_PRINT.getSheetName());
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java
index 63b06dc..6b2efd5 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java
@@ -6,6 +6,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.business.certificate.CertificateReportApprovalListRequest;
 import com.casic.missiles.dto.business.certificate.CertificateReportSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessCertificateReport;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
@@ -21,6 +22,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -50,7 +52,7 @@
         return certificateReportService.saveCertificateReport(request);
     }
 
-    @ApiOperation("证书审批详情（基本信息）")
+    @ApiOperation("详情（基本信息）")
     @PostMapping("/detail")
     public ReturnDTO<BizBusinessCertificateReport> detail(@RequestBody @Valid BaseDetailRequest request, BindingResult bindingResult) throws Exception {
         if(bindingResult.hasErrors()){
@@ -59,4 +61,11 @@
         return certificateReportService.detail(request);
     }
 
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody CertificateReportApprovalListRequest request) throws Exception {
+        List<BizBusinessCertificateReport> list = super.exportList(request);
+        super.exportExcel(BizBusinessCertificateReport.class, list, ExportEnum.CERTIFICATE_REPORT.getSheetName());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java
index 46b26bd..57c0809 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java
@@ -10,20 +10,21 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.business.identify.IdentifyListRequest;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessIdentifyInfo;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.business.IBizBusinessIdentifyInfoService;
+import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import javax.validation.Valid;
+import java.util.List;
 import java.util.Objects;
 
 /**
@@ -57,16 +58,13 @@
         return identifyInfoService.addIdentify(identifyInfo);
     }
 
-    @ApiOperation("标识打印更新")
+    @ApiOperation("标识打印更新（更新打印时间）")
     @PostMapping("/update")
-    public ReturnDTO updateIdentify(@RequestBody @Valid BizBusinessIdentifyInfo identifyInfo, BindingResult bindingResult) {
-        Assert.isFalse(Objects.isNull(identifyInfo.getId()), () -> {
+    public ReturnDTO updateIdentify(@RequestBody @Valid IdDTO idDTO) {
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        Assert.isFalse(bindingResult.hasErrors(), () -> {
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        });
-        return identifyInfoService.updateIdentify(identifyInfo);
+        return identifyInfoService.updateIdentify(idDTO.getId());
     }
 
     @ApiOperation("标识打印删除")
@@ -77,4 +75,37 @@
         });
         return identifyInfoService.deleteIdentify(idDTO.getId());
     }
+
+    @ApiOperation("标识打印导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody @Valid IdentifyListRequest request, BindingResult bindingResult) throws Exception {
+        if (bindingResult.hasErrors()) {
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        List<BizBusinessIdentifyInfo> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = identifyInfoService.listByIds(request.getIds());
+        } else {
+            list = identifyInfoService.list(request);
+        }
+        for (BizBusinessIdentifyInfo record : list) {
+            DictCodeUtils.convertDictCodeToName(record);
+        }
+        super.exportExcel(BizBusinessIdentifyInfo.class, list, ExportEnum.IDENTIFY_EXPORT.getSheetName());
+    }
+
+
+    // TODO: 2023/8/23 查询设备信息，4个底部按钮查设备（按钮的作用就是前端用来调不同接口、用来区分中间即将展示的标识），前端弹窗选设备，在确定保存时前端根据底部按钮判断传入设备类型deviceType字典code
+    // TODO: 2023/8/23 接口：查受检设备（第1个按钮），查设备台账（后3个按钮同一接口），查询之后前端根据标志类型的不同加到中间页面时进行判断（按产品给的对应表）
+    // TODO: 2023/8/23 提供二维码接口，前端在加到中间页面时调用一下
+
+    @ApiOperation("设备二维码")
+    @PostMapping("/equipment/qrCode")
+    public ReturnDTO<String> equipmentQrCode(@RequestBody @Valid IdDTO idDTO) {
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return identifyInfoService.equipmentQrCode(idDTO.getId());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java
index 707be6e..7e0453d 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java
@@ -117,7 +117,7 @@
     }
 
     @ApiOperation("任务单导出")
-    @PostMapping("/export")
+    @PostMapping("/listExport")
     public void orderExport(@RequestBody @Valid OrderListRequest request, HttpServletResponse response) {
         businessOrderService.orderExport(request, response);
     }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java
index 529a6ce..51432be 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java
@@ -1,9 +1,28 @@
 package com.casic.missiles.controller.business;
 
+import com.casic.missiles.controller.GeneralApprovalController;
+import com.casic.missiles.dto.BaseApprovalSubmitRequest;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.business.outsource.OutsourceAssessApprovalListRequest;
+import com.casic.missiles.dto.business.outsource.OutsourceAssessSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
+import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.model.business.BizBusinessOutsourceAssess;
+import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
+import com.casic.missiles.service.IGeneralApprovalService;
+import com.casic.missiles.service.business.IBizBusinessOutsourceAssessService;
 import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.BindingResult;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.validation.Valid;
+import java.util.List;
+
 /**
  * <p>
  * 计量检定业务-分包管理-测试、校准或检定工作分包评审表 前端控制器
@@ -15,6 +34,27 @@
 @Api(tags = "分包管理-测试、校准或检定工作分包评审表")
 @RestController
 @RequestMapping("/business/outsource/assess")
-public class BizBusinessOutsourceAssessController {
+public class BizBusinessOutsourceAssessController extends GeneralApprovalController<BizBusinessOutsourceAssess, BizBusinessOutsourceAssess, OutsourceAssessApprovalListRequest, BaseApprovalSubmitRequest> {
+    @Autowired
+    private IBizBusinessOutsourceAssessService outsourceAssessService;
 
+    public BizBusinessOutsourceAssessController(IGeneralApprovalService<BizBusinessOutsourceAssess, BizBusinessOutsourceAssess, OutsourceAssessApprovalListRequest, BaseApprovalSubmitRequest> baseApprovalService) {
+        super(baseApprovalService);
+    }
+
+    @ApiOperation("草稿箱-保存")
+    @PostMapping("/save")
+    public ReturnDTO<OutsourceAssessSaveResponse> saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceAssess request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        return outsourceAssessService.saveOutsourceAssess(request);
+    }
+
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception {
+        List<BizBusinessOutsourceAssess> list = super.exportList(request);
+        super.exportExcel(BizBusinessOutsourceAssess.class, list, ExportEnum.OUTSOURCE_ASSESS.getSheetName());
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java
new file mode 100644
index 0000000..9adef18
--- /dev/null
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java
@@ -0,0 +1,60 @@
+package com.casic.missiles.controller.business;
+
+import com.casic.missiles.controller.GeneralApprovalController;
+import com.casic.missiles.dto.BaseApprovalSubmitRequest;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.business.outsource.OutsourceProtocolApprovalListRequest;
+import com.casic.missiles.dto.business.outsource.OutsourceProtocolSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
+import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.model.business.BizBusinessOutsourceProtocol;
+import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
+import com.casic.missiles.service.IGeneralApprovalService;
+import com.casic.missiles.service.business.IBizBusinessOutsourceProtocolService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.BindingResult;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.validation.Valid;
+import java.util.List;
+
+/**
+ * <p>
+ * 计量检定业务-分包管理-测试、校准或检定工作分包协议书 前端控制器
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-08-24
+ */
+@Api(tags = "分包管理-测试、校准或检定工作分包协议书")
+@RestController
+@RequestMapping("/business/outsource/protocol")
+public class BizBusinessOutsourceProtocolController extends GeneralApprovalController<BizBusinessOutsourceProtocol, BizBusinessOutsourceProtocol, OutsourceProtocolApprovalListRequest, BaseApprovalSubmitRequest> {
+    @Autowired
+    private IBizBusinessOutsourceProtocolService outsourceProtocolService;
+
+    public BizBusinessOutsourceProtocolController(IGeneralApprovalService<BizBusinessOutsourceProtocol, BizBusinessOutsourceProtocol, OutsourceProtocolApprovalListRequest, BaseApprovalSubmitRequest> baseApprovalService) {
+        super(baseApprovalService);
+    }
+
+    @ApiOperation("草稿箱-保存")
+    @PostMapping("/save")
+    public ReturnDTO<OutsourceProtocolSaveResponse> saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceProtocol request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        return outsourceProtocolService.saveOutsourceProtocol(request);
+    }
+
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody OutsourceProtocolApprovalListRequest request) throws Exception {
+        List<BizBusinessOutsourceProtocol> list = super.exportList(request);
+        super.exportExcel(BizBusinessOutsourceProtocol.class, list, ExportEnum.OUTSOURCE_PROTOCOL.getSheetName());
+    }
+}
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java
index 097f645..f0f0943 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java
@@ -17,7 +17,6 @@
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.IGeneralApprovalService;
 import com.casic.missiles.service.business.IBizBusinessOutsourcerInfoService;
-import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -71,19 +70,8 @@
 
     @ApiOperation("分包方导出")
     @PostMapping("/listExport")
-    public void export(@RequestBody @Valid OutsourcerInfoApprovalListRequest request, BindingResult bindingResult) throws Exception {
-        if (bindingResult.hasErrors()) {
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        }
-        List<BizBusinessOutsourcerInfo> list;
-        if (!CollectionUtils.isEmpty(request.getIds())) {
-            list = outsourcerInfoService.listByIds(request.getIds());
-        } else {
-            list = outsourcerInfoService.list(request);
-        }
-        for (BizBusinessOutsourcerInfo record : list) {
-            DictCodeUtils.convertDictCodeToName(record);
-        }
+    public void export(@RequestBody OutsourcerInfoApprovalListRequest request) throws Exception {
+        List<BizBusinessOutsourcerInfo> list = super.exportList(request);
         super.exportExcel(BizBusinessOutsourcerInfo.class, list, ExportEnum.OUTSOURCER_EXPORT.getSheetName());
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java
index c2cbf9f..0410918 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java
@@ -17,11 +17,9 @@
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.IGeneralApprovalService;
 import com.casic.missiles.service.business.IBizBusinessSiteExecutiveInfoService;
-import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -60,7 +58,7 @@
         return siteExecutiveInfoService.saveSiteExecutiveInfo(siteExecutiveInfo);
     }
 
-    @ApiOperation("现场检测详情")
+    @ApiOperation("详情")
     @PostMapping("/detail")
     public ReturnDTO<SiteExecutiveDetailResponse> siteExecutiveDetail(@RequestBody @Valid IdDTO idDTO) throws Exception {
         Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
@@ -69,21 +67,10 @@
         return ReturnUtil.success(siteExecutiveInfoService.detail(idDTO.getId()));
     }
 
-    @ApiOperation("现场检测导出")
+    @ApiOperation("导出")
     @PostMapping("/listExport")
-    public void export(@RequestBody @Valid SiteExecutiveApprovalListRequest request, BindingResult bindingResult) throws Exception {
-        if (bindingResult.hasErrors()) {
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        }
-        List<SiteExecutiveApprovalListResponse> list;
-        if (!CollectionUtils.isEmpty(request.getIds())) {
-            list = siteExecutiveInfoService.listInfoByIds(request.getIds());
-        } else {
-            list = siteExecutiveInfoService.listInfo(request);
-        }
-        for (SiteExecutiveApprovalListResponse record : list) {
-            DictCodeUtils.convertDictCodeToName(record);
-        }
+    public void export(@RequestBody SiteExecutiveApprovalListRequest request) throws Exception {
+        List<SiteExecutiveApprovalListResponse> list = super.exportList(request);
         super.exportExcel(SiteExecutiveApprovalListResponse.class, list, ExportEnum.SITE_EXECUTIVE_EXPORT.getSheetName());
     }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
index 7e793cd..a92e209 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
@@ -55,7 +55,7 @@
 
     @ApiOperation("设备收发列表导出")
     @PostMapping("/export")
-    public void exportList(@RequestBody @Valid SampleDispatchListRequest request) throws IOException {
+    public void exportList(@RequestBody SampleDispatchListRequest request) throws IOException {
         List<SampleDispatchListResponse> list;
         if (!CollectionUtils.isEmpty(request.getIds())) {
             list = dispatchService.listByIds(request.getIds());
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java
index cdc77fc..d120fd4 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java
@@ -7,6 +7,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.business.labExecutive.*;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.business.IBusinessLabExecutiveInfoService;
@@ -14,6 +15,7 @@
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.*;
 
@@ -32,7 +34,7 @@
     @Autowired
     private IBusinessLabExecutiveInfoService labExecutiveInfoService;
 
-    @ApiOperation("实验室检测-部门检测-查询各状态列表（待检测、检测中、检测完）")
+    @ApiOperation("实验室任务-查询各状态列表（待检测、检测中、检测完）")
     @PostMapping("/deptExecutive/List")
     public ReturnDTO<PageInfoBT<SampleLabExecutiveListResponse>> queryDeptExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
@@ -43,10 +45,19 @@
         return ReturnUtil.success(super.packForBT(labExecutiveInfoService.deptLabExecutiveListPage(page, labExecutiveListRequest)));
     }
 
-    /**
-     * 实验室检测-我的检测-查询各状态列表（待检测、检测中、检测完）
-     */
-    @ApiOperation("实验室检测-我的检测-查询各状态列表（待检测、检测中、检测完）")
+    @ApiOperation("实验室任务导出")
+    @PostMapping("/deptExecutive/export")
+    public void deptExportList(@RequestBody @Valid SampleLabExecutiveListRequest request) throws Exception {
+        List<SampleLabExecutiveListResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = labExecutiveInfoService.deptLabExecutiveListByIds(request.getMeasureStatus(), request.getIds());
+        } else {
+            list = labExecutiveInfoService.deptLabExecutiveList(request);
+        }
+        super.exportExcel(SampleLabExecutiveListResponse.class, list, ExportEnum.DEPT_EXECUTIVE_TASK.getSheetName());
+    }
+
+    @ApiOperation("我的任务-查询各状态列表（待检测、检测中、检测完）")
     @PostMapping("/myExecutive/list")
     public ReturnDTO<PageInfoBT<SampleLabExecutiveListResponse>> queryMyExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
@@ -57,19 +68,25 @@
         return ReturnUtil.success(super.packForBT(labExecutiveInfoService.myLabExecutiveListPage(page, labExecutiveListRequest)));
     }
 
-    /**
-     * 实验室检测-我的检测-查询各状态样品数量（待检测、检测中、检测完）
-     */
-    @ApiOperation("实验室检测-我的检测-查询各状态样品数量（待检测、检测中、检测完）")
+    @ApiOperation("我的任务导出")
+    @PostMapping("/myExecutive/export")
+    public void exportList(@RequestBody @Valid SampleLabExecutiveListRequest request) throws Exception {
+        List<SampleLabExecutiveListResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = labExecutiveInfoService.myLabExecutiveListByIds(request.getMeasureStatus(), request.getIds());
+        } else {
+            list = labExecutiveInfoService.myLabExecutiveList(request);
+        }
+        super.exportExcel(SampleLabExecutiveListResponse.class, list, ExportEnum.MY_EXECUTIVE_TASK.getSheetName());
+    }
+
+    @ApiOperation("我的任务-查询各状态样品数量（待检测、检测中、检测完）")
     @GetMapping("/myExecutive/amount")
     public ReturnDTO<List<SampleAmountResponse>> queryMyExecutiveAmount() {
         return ReturnUtil.success(labExecutiveInfoService.myExecutiveAmount());
     }
 
-    /**
-     * 实验室检测-部门检测-分配（分配给具体人员）
-     */
-    @ApiOperation("实验室检测-部门检测-分配按钮（分配给具体人员）")
+    @ApiOperation("实验室任务-分配按钮（分配给具体人员）")
     @PostMapping("/deptExecutive/allocate")
     public ReturnDTO allocateStaff(@RequestBody @Valid SampleAllocateRequest sampleAllocateRequest, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -78,10 +95,7 @@
         return labExecutiveInfoService.allocateStaff(sampleAllocateRequest);
     }
 
-    /**
-     * 实验室检测-我的检测-检定人扫描收入（待检测->检测中）
-     */
-    @ApiOperation("实验室检测-我的检测-检定人扫描收入（待检测->检测中）")
+    @ApiOperation("我的任务-检定人扫描收入（待检测->检测中）")
     @PostMapping("/myExecutive/receive")
     public ReturnDTO sampleReceive(@RequestBody @Valid List<SampleOperateRequest> requestList, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -90,10 +104,7 @@
         return labExecutiveInfoService.sampleReceive(requestList);
     }
 
-    /**
-     * 实验室检测-负责人/检定人扫描检完（检测中->检测完）
-     */
-    @ApiOperation("实验室检测-负责人/检定人扫描检完（检测中->检测完）")
+    @ApiOperation("实验室任务-负责人/检定人扫描检完（检测中->检测完）")
     @PostMapping("/myExecutive/complete")
     public ReturnDTO sampleExecutiveComplete(@RequestBody @Valid List<SampleOperateRequest> requestList, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -102,10 +113,7 @@
         return labExecutiveInfoService.sampleExecutiveComplete(requestList);
     }
 
-    /**
-     * 实验室检测-部门检测/我的检测 编辑（只能修改应出具证书）
-     */
-    @ApiOperation("实验室检测-部门检测/我的检测 编辑（只能修改应出具证书）")
+    @ApiOperation("实验室任务/我的任务 编辑（只能修改应出具证书）")
     @PostMapping("/executive/update")
     public ReturnDTO updateExecutive(@RequestBody @Valid UpdateExecutiveRequest request, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -114,10 +122,7 @@
         return labExecutiveInfoService.updateExecutive(request);
     }
 
-    /**
-     * 实验室检测-部门检测/我的检测 详情
-     */
-    @ApiOperation("实验室检测-部门检测/我的检测 详情")
+    @ApiOperation("实验室任务/我的任务 详情")
     @PostMapping("/executive/detail")
     public ReturnDTO<ExecutiveDetailResponse> executiveDetail(@RequestBody @Valid ExecutiveDetailRequest request, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
@@ -131,7 +136,7 @@
      * 退回后会将下一个要执行的实验室检测状态更新为待分配，将后面的实验室顺序变更为连续（都进行减1）
      * 最后一个检测的实验室退回，等分发员再增加实验室或设备收发中的已收入直接手动点击完成
      */
-    @ApiOperation("实验室检测-部门检测/我的检测 退回（待检测/检测中->退回）")
+    @ApiOperation("实验室任务/我的任务 退回（待检测/检测中->退回）")
     @PostMapping("/executive/sendBack")
     public ReturnDTO executiveSendBack(@RequestBody @Valid ExecutiveSendBackRequest request, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -140,9 +145,6 @@
         return labExecutiveInfoService.sampleExecutiveSendBack(request);
     }
 
-    /**
-     * 分发员编辑实验室检测列表
-     */
     @ApiOperation("分发员编辑实验室检测列表")
     @PostMapping("/handOut/updateList")
     public ReturnDTO updateExecutiveList(@RequestBody @Valid UpdateExecutiveListRequest request, BindingResult bindingResult) {

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java
index bb0c50f..13a699b 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java
@@ -12,6 +12,7 @@
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.IGeneralApprovalService;
+import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
@@ -19,6 +20,7 @@
 import org.springframework.web.bind.annotation.RequestBody;
 
 import javax.validation.Valid;
+import java.util.List;
 import java.util.Objects;
 
 /**
@@ -117,4 +119,17 @@
         }
         return baseApprovalService.failUpdate(request);
     }
+
+    public List<O> exportList(@RequestBody @Valid R request) throws Exception {
+        List<O> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = baseApprovalService.listExportByIds(request.getIds());
+        } else {
+            list = baseApprovalService.listExport(request);
+        }
+        for (O record : list) {
+            DictCodeUtils.convertDictCodeToName(record);
+        }
+        return list;
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java
index 8a90961..d775831 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java
@@ -5,6 +5,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.business.certificate.CertificateChangeApplyApprovalListRequest;
 import com.casic.missiles.dto.business.certificate.CertificateChangeApplySaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessCertificateChangeApply;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
@@ -20,6 +21,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -48,4 +50,12 @@
         }
         return changeApplyService.saveChangeApply(request);
     }
+
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody CertificateChangeApplyApprovalListRequest request) throws Exception {
+        List<BizBusinessCertificateChangeApply> list = super.exportList(request);
+        super.exportExcel(BizBusinessCertificateChangeApply.class, list, ExportEnum.CERTIFICATE_CHANGE_APPLY.getSheetName());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java
index 5fc4b07..af8230e 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java
@@ -9,6 +9,7 @@
 import com.casic.missiles.dto.business.certificate.CertificatePrintApprovalListRequest;
 import com.casic.missiles.dto.business.certificate.CertificatePrintListResponse;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.enums.business.CertificatePrintStatusEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessCertificatePrintLog;
@@ -18,10 +19,16 @@
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.io.IOException;
+import java.util.List;
 import java.util.Objects;
 
 /**
@@ -98,4 +105,16 @@
         });
         return certificatePrintService.certificatePrintLog(idDTO.getId());
     }
+
+    @ApiOperation("证书打印审批导出")
+    @PostMapping("/listExport")
+    public void exportList(@RequestBody CertificatePrintApprovalListRequest request) throws IOException {
+        List<CertificatePrintListResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = certificatePrintService.listByIds(request.getIds());
+        } else {
+            list = certificatePrintService.list(request);
+        }
+        super.exportExcel(CertificatePrintListResponse.class, list, ExportEnum.CERTIFICATE_PRINT.getSheetName());
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java
index 63b06dc..6b2efd5 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java
@@ -6,6 +6,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.business.certificate.CertificateReportApprovalListRequest;
 import com.casic.missiles.dto.business.certificate.CertificateReportSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessCertificateReport;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
@@ -21,6 +22,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -50,7 +52,7 @@
         return certificateReportService.saveCertificateReport(request);
     }
 
-    @ApiOperation("证书审批详情（基本信息）")
+    @ApiOperation("详情（基本信息）")
     @PostMapping("/detail")
     public ReturnDTO<BizBusinessCertificateReport> detail(@RequestBody @Valid BaseDetailRequest request, BindingResult bindingResult) throws Exception {
         if(bindingResult.hasErrors()){
@@ -59,4 +61,11 @@
         return certificateReportService.detail(request);
     }
 
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody CertificateReportApprovalListRequest request) throws Exception {
+        List<BizBusinessCertificateReport> list = super.exportList(request);
+        super.exportExcel(BizBusinessCertificateReport.class, list, ExportEnum.CERTIFICATE_REPORT.getSheetName());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java
index 46b26bd..57c0809 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java
@@ -10,20 +10,21 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.business.identify.IdentifyListRequest;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessIdentifyInfo;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.business.IBizBusinessIdentifyInfoService;
+import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import javax.validation.Valid;
+import java.util.List;
 import java.util.Objects;
 
 /**
@@ -57,16 +58,13 @@
         return identifyInfoService.addIdentify(identifyInfo);
     }
 
-    @ApiOperation("标识打印更新")
+    @ApiOperation("标识打印更新（更新打印时间）")
     @PostMapping("/update")
-    public ReturnDTO updateIdentify(@RequestBody @Valid BizBusinessIdentifyInfo identifyInfo, BindingResult bindingResult) {
-        Assert.isFalse(Objects.isNull(identifyInfo.getId()), () -> {
+    public ReturnDTO updateIdentify(@RequestBody @Valid IdDTO idDTO) {
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        Assert.isFalse(bindingResult.hasErrors(), () -> {
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        });
-        return identifyInfoService.updateIdentify(identifyInfo);
+        return identifyInfoService.updateIdentify(idDTO.getId());
     }
 
     @ApiOperation("标识打印删除")
@@ -77,4 +75,37 @@
         });
         return identifyInfoService.deleteIdentify(idDTO.getId());
     }
+
+    @ApiOperation("标识打印导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody @Valid IdentifyListRequest request, BindingResult bindingResult) throws Exception {
+        if (bindingResult.hasErrors()) {
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        List<BizBusinessIdentifyInfo> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = identifyInfoService.listByIds(request.getIds());
+        } else {
+            list = identifyInfoService.list(request);
+        }
+        for (BizBusinessIdentifyInfo record : list) {
+            DictCodeUtils.convertDictCodeToName(record);
+        }
+        super.exportExcel(BizBusinessIdentifyInfo.class, list, ExportEnum.IDENTIFY_EXPORT.getSheetName());
+    }
+
+
+    // TODO: 2023/8/23 查询设备信息，4个底部按钮查设备（按钮的作用就是前端用来调不同接口、用来区分中间即将展示的标识），前端弹窗选设备，在确定保存时前端根据底部按钮判断传入设备类型deviceType字典code
+    // TODO: 2023/8/23 接口：查受检设备（第1个按钮），查设备台账（后3个按钮同一接口），查询之后前端根据标志类型的不同加到中间页面时进行判断（按产品给的对应表）
+    // TODO: 2023/8/23 提供二维码接口，前端在加到中间页面时调用一下
+
+    @ApiOperation("设备二维码")
+    @PostMapping("/equipment/qrCode")
+    public ReturnDTO<String> equipmentQrCode(@RequestBody @Valid IdDTO idDTO) {
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return identifyInfoService.equipmentQrCode(idDTO.getId());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java
index 707be6e..7e0453d 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java
@@ -117,7 +117,7 @@
     }
 
     @ApiOperation("任务单导出")
-    @PostMapping("/export")
+    @PostMapping("/listExport")
     public void orderExport(@RequestBody @Valid OrderListRequest request, HttpServletResponse response) {
         businessOrderService.orderExport(request, response);
     }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java
index 529a6ce..51432be 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java
@@ -1,9 +1,28 @@
 package com.casic.missiles.controller.business;
 
+import com.casic.missiles.controller.GeneralApprovalController;
+import com.casic.missiles.dto.BaseApprovalSubmitRequest;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.business.outsource.OutsourceAssessApprovalListRequest;
+import com.casic.missiles.dto.business.outsource.OutsourceAssessSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
+import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.model.business.BizBusinessOutsourceAssess;
+import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
+import com.casic.missiles.service.IGeneralApprovalService;
+import com.casic.missiles.service.business.IBizBusinessOutsourceAssessService;
 import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.BindingResult;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.validation.Valid;
+import java.util.List;
+
 /**
  * <p>
  * 计量检定业务-分包管理-测试、校准或检定工作分包评审表 前端控制器
@@ -15,6 +34,27 @@
 @Api(tags = "分包管理-测试、校准或检定工作分包评审表")
 @RestController
 @RequestMapping("/business/outsource/assess")
-public class BizBusinessOutsourceAssessController {
+public class BizBusinessOutsourceAssessController extends GeneralApprovalController<BizBusinessOutsourceAssess, BizBusinessOutsourceAssess, OutsourceAssessApprovalListRequest, BaseApprovalSubmitRequest> {
+    @Autowired
+    private IBizBusinessOutsourceAssessService outsourceAssessService;
 
+    public BizBusinessOutsourceAssessController(IGeneralApprovalService<BizBusinessOutsourceAssess, BizBusinessOutsourceAssess, OutsourceAssessApprovalListRequest, BaseApprovalSubmitRequest> baseApprovalService) {
+        super(baseApprovalService);
+    }
+
+    @ApiOperation("草稿箱-保存")
+    @PostMapping("/save")
+    public ReturnDTO<OutsourceAssessSaveResponse> saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceAssess request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        return outsourceAssessService.saveOutsourceAssess(request);
+    }
+
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception {
+        List<BizBusinessOutsourceAssess> list = super.exportList(request);
+        super.exportExcel(BizBusinessOutsourceAssess.class, list, ExportEnum.OUTSOURCE_ASSESS.getSheetName());
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java
new file mode 100644
index 0000000..9adef18
--- /dev/null
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java
@@ -0,0 +1,60 @@
+package com.casic.missiles.controller.business;
+
+import com.casic.missiles.controller.GeneralApprovalController;
+import com.casic.missiles.dto.BaseApprovalSubmitRequest;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.business.outsource.OutsourceProtocolApprovalListRequest;
+import com.casic.missiles.dto.business.outsource.OutsourceProtocolSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
+import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.model.business.BizBusinessOutsourceProtocol;
+import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
+import com.casic.missiles.service.IGeneralApprovalService;
+import com.casic.missiles.service.business.IBizBusinessOutsourceProtocolService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.BindingResult;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.validation.Valid;
+import java.util.List;
+
+/**
+ * <p>
+ * 计量检定业务-分包管理-测试、校准或检定工作分包协议书 前端控制器
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-08-24
+ */
+@Api(tags = "分包管理-测试、校准或检定工作分包协议书")
+@RestController
+@RequestMapping("/business/outsource/protocol")
+public class BizBusinessOutsourceProtocolController extends GeneralApprovalController<BizBusinessOutsourceProtocol, BizBusinessOutsourceProtocol, OutsourceProtocolApprovalListRequest, BaseApprovalSubmitRequest> {
+    @Autowired
+    private IBizBusinessOutsourceProtocolService outsourceProtocolService;
+
+    public BizBusinessOutsourceProtocolController(IGeneralApprovalService<BizBusinessOutsourceProtocol, BizBusinessOutsourceProtocol, OutsourceProtocolApprovalListRequest, BaseApprovalSubmitRequest> baseApprovalService) {
+        super(baseApprovalService);
+    }
+
+    @ApiOperation("草稿箱-保存")
+    @PostMapping("/save")
+    public ReturnDTO<OutsourceProtocolSaveResponse> saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceProtocol request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        return outsourceProtocolService.saveOutsourceProtocol(request);
+    }
+
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody OutsourceProtocolApprovalListRequest request) throws Exception {
+        List<BizBusinessOutsourceProtocol> list = super.exportList(request);
+        super.exportExcel(BizBusinessOutsourceProtocol.class, list, ExportEnum.OUTSOURCE_PROTOCOL.getSheetName());
+    }
+}
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java
index 097f645..f0f0943 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java
@@ -17,7 +17,6 @@
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.IGeneralApprovalService;
 import com.casic.missiles.service.business.IBizBusinessOutsourcerInfoService;
-import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -71,19 +70,8 @@
 
     @ApiOperation("分包方导出")
     @PostMapping("/listExport")
-    public void export(@RequestBody @Valid OutsourcerInfoApprovalListRequest request, BindingResult bindingResult) throws Exception {
-        if (bindingResult.hasErrors()) {
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        }
-        List<BizBusinessOutsourcerInfo> list;
-        if (!CollectionUtils.isEmpty(request.getIds())) {
-            list = outsourcerInfoService.listByIds(request.getIds());
-        } else {
-            list = outsourcerInfoService.list(request);
-        }
-        for (BizBusinessOutsourcerInfo record : list) {
-            DictCodeUtils.convertDictCodeToName(record);
-        }
+    public void export(@RequestBody OutsourcerInfoApprovalListRequest request) throws Exception {
+        List<BizBusinessOutsourcerInfo> list = super.exportList(request);
         super.exportExcel(BizBusinessOutsourcerInfo.class, list, ExportEnum.OUTSOURCER_EXPORT.getSheetName());
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java
index c2cbf9f..0410918 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java
@@ -17,11 +17,9 @@
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.IGeneralApprovalService;
 import com.casic.missiles.service.business.IBizBusinessSiteExecutiveInfoService;
-import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -60,7 +58,7 @@
         return siteExecutiveInfoService.saveSiteExecutiveInfo(siteExecutiveInfo);
     }
 
-    @ApiOperation("现场检测详情")
+    @ApiOperation("详情")
     @PostMapping("/detail")
     public ReturnDTO<SiteExecutiveDetailResponse> siteExecutiveDetail(@RequestBody @Valid IdDTO idDTO) throws Exception {
         Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
@@ -69,21 +67,10 @@
         return ReturnUtil.success(siteExecutiveInfoService.detail(idDTO.getId()));
     }
 
-    @ApiOperation("现场检测导出")
+    @ApiOperation("导出")
     @PostMapping("/listExport")
-    public void export(@RequestBody @Valid SiteExecutiveApprovalListRequest request, BindingResult bindingResult) throws Exception {
-        if (bindingResult.hasErrors()) {
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        }
-        List<SiteExecutiveApprovalListResponse> list;
-        if (!CollectionUtils.isEmpty(request.getIds())) {
-            list = siteExecutiveInfoService.listInfoByIds(request.getIds());
-        } else {
-            list = siteExecutiveInfoService.listInfo(request);
-        }
-        for (SiteExecutiveApprovalListResponse record : list) {
-            DictCodeUtils.convertDictCodeToName(record);
-        }
+    public void export(@RequestBody SiteExecutiveApprovalListRequest request) throws Exception {
+        List<SiteExecutiveApprovalListResponse> list = super.exportList(request);
         super.exportExcel(SiteExecutiveApprovalListResponse.class, list, ExportEnum.SITE_EXECUTIVE_EXPORT.getSheetName());
     }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
index 7e793cd..a92e209 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
@@ -55,7 +55,7 @@
 
     @ApiOperation("设备收发列表导出")
     @PostMapping("/export")
-    public void exportList(@RequestBody @Valid SampleDispatchListRequest request) throws IOException {
+    public void exportList(@RequestBody SampleDispatchListRequest request) throws IOException {
         List<SampleDispatchListResponse> list;
         if (!CollectionUtils.isEmpty(request.getIds())) {
             list = dispatchService.listByIds(request.getIds());
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java
index cdc77fc..d120fd4 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java
@@ -7,6 +7,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.business.labExecutive.*;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.business.IBusinessLabExecutiveInfoService;
@@ -14,6 +15,7 @@
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.*;
 
@@ -32,7 +34,7 @@
     @Autowired
     private IBusinessLabExecutiveInfoService labExecutiveInfoService;
 
-    @ApiOperation("实验室检测-部门检测-查询各状态列表（待检测、检测中、检测完）")
+    @ApiOperation("实验室任务-查询各状态列表（待检测、检测中、检测完）")
     @PostMapping("/deptExecutive/List")
     public ReturnDTO<PageInfoBT<SampleLabExecutiveListResponse>> queryDeptExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
@@ -43,10 +45,19 @@
         return ReturnUtil.success(super.packForBT(labExecutiveInfoService.deptLabExecutiveListPage(page, labExecutiveListRequest)));
     }
 
-    /**
-     * 实验室检测-我的检测-查询各状态列表（待检测、检测中、检测完）
-     */
-    @ApiOperation("实验室检测-我的检测-查询各状态列表（待检测、检测中、检测完）")
+    @ApiOperation("实验室任务导出")
+    @PostMapping("/deptExecutive/export")
+    public void deptExportList(@RequestBody @Valid SampleLabExecutiveListRequest request) throws Exception {
+        List<SampleLabExecutiveListResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = labExecutiveInfoService.deptLabExecutiveListByIds(request.getMeasureStatus(), request.getIds());
+        } else {
+            list = labExecutiveInfoService.deptLabExecutiveList(request);
+        }
+        super.exportExcel(SampleLabExecutiveListResponse.class, list, ExportEnum.DEPT_EXECUTIVE_TASK.getSheetName());
+    }
+
+    @ApiOperation("我的任务-查询各状态列表（待检测、检测中、检测完）")
     @PostMapping("/myExecutive/list")
     public ReturnDTO<PageInfoBT<SampleLabExecutiveListResponse>> queryMyExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
@@ -57,19 +68,25 @@
         return ReturnUtil.success(super.packForBT(labExecutiveInfoService.myLabExecutiveListPage(page, labExecutiveListRequest)));
     }
 
-    /**
-     * 实验室检测-我的检测-查询各状态样品数量（待检测、检测中、检测完）
-     */
-    @ApiOperation("实验室检测-我的检测-查询各状态样品数量（待检测、检测中、检测完）")
+    @ApiOperation("我的任务导出")
+    @PostMapping("/myExecutive/export")
+    public void exportList(@RequestBody @Valid SampleLabExecutiveListRequest request) throws Exception {
+        List<SampleLabExecutiveListResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = labExecutiveInfoService.myLabExecutiveListByIds(request.getMeasureStatus(), request.getIds());
+        } else {
+            list = labExecutiveInfoService.myLabExecutiveList(request);
+        }
+        super.exportExcel(SampleLabExecutiveListResponse.class, list, ExportEnum.MY_EXECUTIVE_TASK.getSheetName());
+    }
+
+    @ApiOperation("我的任务-查询各状态样品数量（待检测、检测中、检测完）")
     @GetMapping("/myExecutive/amount")
     public ReturnDTO<List<SampleAmountResponse>> queryMyExecutiveAmount() {
         return ReturnUtil.success(labExecutiveInfoService.myExecutiveAmount());
     }
 
-    /**
-     * 实验室检测-部门检测-分配（分配给具体人员）
-     */
-    @ApiOperation("实验室检测-部门检测-分配按钮（分配给具体人员）")
+    @ApiOperation("实验室任务-分配按钮（分配给具体人员）")
     @PostMapping("/deptExecutive/allocate")
     public ReturnDTO allocateStaff(@RequestBody @Valid SampleAllocateRequest sampleAllocateRequest, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -78,10 +95,7 @@
         return labExecutiveInfoService.allocateStaff(sampleAllocateRequest);
     }
 
-    /**
-     * 实验室检测-我的检测-检定人扫描收入（待检测->检测中）
-     */
-    @ApiOperation("实验室检测-我的检测-检定人扫描收入（待检测->检测中）")
+    @ApiOperation("我的任务-检定人扫描收入（待检测->检测中）")
     @PostMapping("/myExecutive/receive")
     public ReturnDTO sampleReceive(@RequestBody @Valid List<SampleOperateRequest> requestList, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -90,10 +104,7 @@
         return labExecutiveInfoService.sampleReceive(requestList);
     }
 
-    /**
-     * 实验室检测-负责人/检定人扫描检完（检测中->检测完）
-     */
-    @ApiOperation("实验室检测-负责人/检定人扫描检完（检测中->检测完）")
+    @ApiOperation("实验室任务-负责人/检定人扫描检完（检测中->检测完）")
     @PostMapping("/myExecutive/complete")
     public ReturnDTO sampleExecutiveComplete(@RequestBody @Valid List<SampleOperateRequest> requestList, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -102,10 +113,7 @@
         return labExecutiveInfoService.sampleExecutiveComplete(requestList);
     }
 
-    /**
-     * 实验室检测-部门检测/我的检测 编辑（只能修改应出具证书）
-     */
-    @ApiOperation("实验室检测-部门检测/我的检测 编辑（只能修改应出具证书）")
+    @ApiOperation("实验室任务/我的任务 编辑（只能修改应出具证书）")
     @PostMapping("/executive/update")
     public ReturnDTO updateExecutive(@RequestBody @Valid UpdateExecutiveRequest request, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -114,10 +122,7 @@
         return labExecutiveInfoService.updateExecutive(request);
     }
 
-    /**
-     * 实验室检测-部门检测/我的检测 详情
-     */
-    @ApiOperation("实验室检测-部门检测/我的检测 详情")
+    @ApiOperation("实验室任务/我的任务 详情")
     @PostMapping("/executive/detail")
     public ReturnDTO<ExecutiveDetailResponse> executiveDetail(@RequestBody @Valid ExecutiveDetailRequest request, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
@@ -131,7 +136,7 @@
      * 退回后会将下一个要执行的实验室检测状态更新为待分配，将后面的实验室顺序变更为连续（都进行减1）
      * 最后一个检测的实验室退回，等分发员再增加实验室或设备收发中的已收入直接手动点击完成
      */
-    @ApiOperation("实验室检测-部门检测/我的检测 退回（待检测/检测中->退回）")
+    @ApiOperation("实验室任务/我的任务 退回（待检测/检测中->退回）")
     @PostMapping("/executive/sendBack")
     public ReturnDTO executiveSendBack(@RequestBody @Valid ExecutiveSendBackRequest request, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -140,9 +145,6 @@
         return labExecutiveInfoService.sampleExecutiveSendBack(request);
     }
 
-    /**
-     * 分发员编辑实验室检测列表
-     */
     @ApiOperation("分发员编辑实验室检测列表")
     @PostMapping("/handOut/updateList")
     public ReturnDTO updateExecutiveList(@RequestBody @Valid UpdateExecutiveListRequest request, BindingResult bindingResult) {
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java
index 48a67ed..0c04f31 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java
@@ -10,6 +10,7 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.resource.customer.CustomerApprovalListRequest;
 import com.casic.missiles.dto.resource.customer.CustomerSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceCustomerInfo;
@@ -26,6 +27,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -55,6 +57,13 @@
         return customerInfoService.saveCustomerInfo(request);
     }
 
+    @ApiOperation("委托方名录导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody CustomerApprovalListRequest request) throws Exception {
+        List<BizResourceCustomerInfo> list = super.exportList(request);
+        super.exportExcel(BizResourceCustomerInfo.class, list, ExportEnum.CUSTOMER_INFO.getSheetName());
+    }
+
     @ApiOperation("委托方人员列表（分页）")
     @PostMapping("/person/listPage")
     public ReturnDTO<PageInfoBT<BizResourceCustomerStaff>> personListPage(@RequestBody IdDTO idDto) {

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java
index bb0c50f..13a699b 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java
@@ -12,6 +12,7 @@
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.IGeneralApprovalService;
+import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
@@ -19,6 +20,7 @@
 import org.springframework.web.bind.annotation.RequestBody;
 
 import javax.validation.Valid;
+import java.util.List;
 import java.util.Objects;
 
 /**
@@ -117,4 +119,17 @@
         }
         return baseApprovalService.failUpdate(request);
     }
+
+    public List<O> exportList(@RequestBody @Valid R request) throws Exception {
+        List<O> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = baseApprovalService.listExportByIds(request.getIds());
+        } else {
+            list = baseApprovalService.listExport(request);
+        }
+        for (O record : list) {
+            DictCodeUtils.convertDictCodeToName(record);
+        }
+        return list;
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java
index 8a90961..d775831 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java
@@ -5,6 +5,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.business.certificate.CertificateChangeApplyApprovalListRequest;
 import com.casic.missiles.dto.business.certificate.CertificateChangeApplySaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessCertificateChangeApply;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
@@ -20,6 +21,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -48,4 +50,12 @@
         }
         return changeApplyService.saveChangeApply(request);
     }
+
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody CertificateChangeApplyApprovalListRequest request) throws Exception {
+        List<BizBusinessCertificateChangeApply> list = super.exportList(request);
+        super.exportExcel(BizBusinessCertificateChangeApply.class, list, ExportEnum.CERTIFICATE_CHANGE_APPLY.getSheetName());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java
index 5fc4b07..af8230e 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java
@@ -9,6 +9,7 @@
 import com.casic.missiles.dto.business.certificate.CertificatePrintApprovalListRequest;
 import com.casic.missiles.dto.business.certificate.CertificatePrintListResponse;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.enums.business.CertificatePrintStatusEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessCertificatePrintLog;
@@ -18,10 +19,16 @@
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.io.IOException;
+import java.util.List;
 import java.util.Objects;
 
 /**
@@ -98,4 +105,16 @@
         });
         return certificatePrintService.certificatePrintLog(idDTO.getId());
     }
+
+    @ApiOperation("证书打印审批导出")
+    @PostMapping("/listExport")
+    public void exportList(@RequestBody CertificatePrintApprovalListRequest request) throws IOException {
+        List<CertificatePrintListResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = certificatePrintService.listByIds(request.getIds());
+        } else {
+            list = certificatePrintService.list(request);
+        }
+        super.exportExcel(CertificatePrintListResponse.class, list, ExportEnum.CERTIFICATE_PRINT.getSheetName());
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java
index 63b06dc..6b2efd5 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java
@@ -6,6 +6,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.business.certificate.CertificateReportApprovalListRequest;
 import com.casic.missiles.dto.business.certificate.CertificateReportSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessCertificateReport;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
@@ -21,6 +22,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -50,7 +52,7 @@
         return certificateReportService.saveCertificateReport(request);
     }
 
-    @ApiOperation("证书审批详情（基本信息）")
+    @ApiOperation("详情（基本信息）")
     @PostMapping("/detail")
     public ReturnDTO<BizBusinessCertificateReport> detail(@RequestBody @Valid BaseDetailRequest request, BindingResult bindingResult) throws Exception {
         if(bindingResult.hasErrors()){
@@ -59,4 +61,11 @@
         return certificateReportService.detail(request);
     }
 
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody CertificateReportApprovalListRequest request) throws Exception {
+        List<BizBusinessCertificateReport> list = super.exportList(request);
+        super.exportExcel(BizBusinessCertificateReport.class, list, ExportEnum.CERTIFICATE_REPORT.getSheetName());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java
index 46b26bd..57c0809 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java
@@ -10,20 +10,21 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.business.identify.IdentifyListRequest;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessIdentifyInfo;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.business.IBizBusinessIdentifyInfoService;
+import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import javax.validation.Valid;
+import java.util.List;
 import java.util.Objects;
 
 /**
@@ -57,16 +58,13 @@
         return identifyInfoService.addIdentify(identifyInfo);
     }
 
-    @ApiOperation("标识打印更新")
+    @ApiOperation("标识打印更新（更新打印时间）")
     @PostMapping("/update")
-    public ReturnDTO updateIdentify(@RequestBody @Valid BizBusinessIdentifyInfo identifyInfo, BindingResult bindingResult) {
-        Assert.isFalse(Objects.isNull(identifyInfo.getId()), () -> {
+    public ReturnDTO updateIdentify(@RequestBody @Valid IdDTO idDTO) {
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        Assert.isFalse(bindingResult.hasErrors(), () -> {
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        });
-        return identifyInfoService.updateIdentify(identifyInfo);
+        return identifyInfoService.updateIdentify(idDTO.getId());
     }
 
     @ApiOperation("标识打印删除")
@@ -77,4 +75,37 @@
         });
         return identifyInfoService.deleteIdentify(idDTO.getId());
     }
+
+    @ApiOperation("标识打印导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody @Valid IdentifyListRequest request, BindingResult bindingResult) throws Exception {
+        if (bindingResult.hasErrors()) {
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        List<BizBusinessIdentifyInfo> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = identifyInfoService.listByIds(request.getIds());
+        } else {
+            list = identifyInfoService.list(request);
+        }
+        for (BizBusinessIdentifyInfo record : list) {
+            DictCodeUtils.convertDictCodeToName(record);
+        }
+        super.exportExcel(BizBusinessIdentifyInfo.class, list, ExportEnum.IDENTIFY_EXPORT.getSheetName());
+    }
+
+
+    // TODO: 2023/8/23 查询设备信息，4个底部按钮查设备（按钮的作用就是前端用来调不同接口、用来区分中间即将展示的标识），前端弹窗选设备，在确定保存时前端根据底部按钮判断传入设备类型deviceType字典code
+    // TODO: 2023/8/23 接口：查受检设备（第1个按钮），查设备台账（后3个按钮同一接口），查询之后前端根据标志类型的不同加到中间页面时进行判断（按产品给的对应表）
+    // TODO: 2023/8/23 提供二维码接口，前端在加到中间页面时调用一下
+
+    @ApiOperation("设备二维码")
+    @PostMapping("/equipment/qrCode")
+    public ReturnDTO<String> equipmentQrCode(@RequestBody @Valid IdDTO idDTO) {
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return identifyInfoService.equipmentQrCode(idDTO.getId());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java
index 707be6e..7e0453d 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java
@@ -117,7 +117,7 @@
     }
 
     @ApiOperation("任务单导出")
-    @PostMapping("/export")
+    @PostMapping("/listExport")
     public void orderExport(@RequestBody @Valid OrderListRequest request, HttpServletResponse response) {
         businessOrderService.orderExport(request, response);
     }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java
index 529a6ce..51432be 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java
@@ -1,9 +1,28 @@
 package com.casic.missiles.controller.business;
 
+import com.casic.missiles.controller.GeneralApprovalController;
+import com.casic.missiles.dto.BaseApprovalSubmitRequest;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.business.outsource.OutsourceAssessApprovalListRequest;
+import com.casic.missiles.dto.business.outsource.OutsourceAssessSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
+import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.model.business.BizBusinessOutsourceAssess;
+import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
+import com.casic.missiles.service.IGeneralApprovalService;
+import com.casic.missiles.service.business.IBizBusinessOutsourceAssessService;
 import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.BindingResult;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.validation.Valid;
+import java.util.List;
+
 /**
  * <p>
  * 计量检定业务-分包管理-测试、校准或检定工作分包评审表 前端控制器
@@ -15,6 +34,27 @@
 @Api(tags = "分包管理-测试、校准或检定工作分包评审表")
 @RestController
 @RequestMapping("/business/outsource/assess")
-public class BizBusinessOutsourceAssessController {
+public class BizBusinessOutsourceAssessController extends GeneralApprovalController<BizBusinessOutsourceAssess, BizBusinessOutsourceAssess, OutsourceAssessApprovalListRequest, BaseApprovalSubmitRequest> {
+    @Autowired
+    private IBizBusinessOutsourceAssessService outsourceAssessService;
 
+    public BizBusinessOutsourceAssessController(IGeneralApprovalService<BizBusinessOutsourceAssess, BizBusinessOutsourceAssess, OutsourceAssessApprovalListRequest, BaseApprovalSubmitRequest> baseApprovalService) {
+        super(baseApprovalService);
+    }
+
+    @ApiOperation("草稿箱-保存")
+    @PostMapping("/save")
+    public ReturnDTO<OutsourceAssessSaveResponse> saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceAssess request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        return outsourceAssessService.saveOutsourceAssess(request);
+    }
+
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception {
+        List<BizBusinessOutsourceAssess> list = super.exportList(request);
+        super.exportExcel(BizBusinessOutsourceAssess.class, list, ExportEnum.OUTSOURCE_ASSESS.getSheetName());
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java
new file mode 100644
index 0000000..9adef18
--- /dev/null
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java
@@ -0,0 +1,60 @@
+package com.casic.missiles.controller.business;
+
+import com.casic.missiles.controller.GeneralApprovalController;
+import com.casic.missiles.dto.BaseApprovalSubmitRequest;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.business.outsource.OutsourceProtocolApprovalListRequest;
+import com.casic.missiles.dto.business.outsource.OutsourceProtocolSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
+import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.model.business.BizBusinessOutsourceProtocol;
+import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
+import com.casic.missiles.service.IGeneralApprovalService;
+import com.casic.missiles.service.business.IBizBusinessOutsourceProtocolService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.BindingResult;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.validation.Valid;
+import java.util.List;
+
+/**
+ * <p>
+ * 计量检定业务-分包管理-测试、校准或检定工作分包协议书 前端控制器
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-08-24
+ */
+@Api(tags = "分包管理-测试、校准或检定工作分包协议书")
+@RestController
+@RequestMapping("/business/outsource/protocol")
+public class BizBusinessOutsourceProtocolController extends GeneralApprovalController<BizBusinessOutsourceProtocol, BizBusinessOutsourceProtocol, OutsourceProtocolApprovalListRequest, BaseApprovalSubmitRequest> {
+    @Autowired
+    private IBizBusinessOutsourceProtocolService outsourceProtocolService;
+
+    public BizBusinessOutsourceProtocolController(IGeneralApprovalService<BizBusinessOutsourceProtocol, BizBusinessOutsourceProtocol, OutsourceProtocolApprovalListRequest, BaseApprovalSubmitRequest> baseApprovalService) {
+        super(baseApprovalService);
+    }
+
+    @ApiOperation("草稿箱-保存")
+    @PostMapping("/save")
+    public ReturnDTO<OutsourceProtocolSaveResponse> saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceProtocol request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        return outsourceProtocolService.saveOutsourceProtocol(request);
+    }
+
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody OutsourceProtocolApprovalListRequest request) throws Exception {
+        List<BizBusinessOutsourceProtocol> list = super.exportList(request);
+        super.exportExcel(BizBusinessOutsourceProtocol.class, list, ExportEnum.OUTSOURCE_PROTOCOL.getSheetName());
+    }
+}
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java
index 097f645..f0f0943 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java
@@ -17,7 +17,6 @@
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.IGeneralApprovalService;
 import com.casic.missiles.service.business.IBizBusinessOutsourcerInfoService;
-import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -71,19 +70,8 @@
 
     @ApiOperation("分包方导出")
     @PostMapping("/listExport")
-    public void export(@RequestBody @Valid OutsourcerInfoApprovalListRequest request, BindingResult bindingResult) throws Exception {
-        if (bindingResult.hasErrors()) {
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        }
-        List<BizBusinessOutsourcerInfo> list;
-        if (!CollectionUtils.isEmpty(request.getIds())) {
-            list = outsourcerInfoService.listByIds(request.getIds());
-        } else {
-            list = outsourcerInfoService.list(request);
-        }
-        for (BizBusinessOutsourcerInfo record : list) {
-            DictCodeUtils.convertDictCodeToName(record);
-        }
+    public void export(@RequestBody OutsourcerInfoApprovalListRequest request) throws Exception {
+        List<BizBusinessOutsourcerInfo> list = super.exportList(request);
         super.exportExcel(BizBusinessOutsourcerInfo.class, list, ExportEnum.OUTSOURCER_EXPORT.getSheetName());
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java
index c2cbf9f..0410918 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java
@@ -17,11 +17,9 @@
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.IGeneralApprovalService;
 import com.casic.missiles.service.business.IBizBusinessSiteExecutiveInfoService;
-import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -60,7 +58,7 @@
         return siteExecutiveInfoService.saveSiteExecutiveInfo(siteExecutiveInfo);
     }
 
-    @ApiOperation("现场检测详情")
+    @ApiOperation("详情")
     @PostMapping("/detail")
     public ReturnDTO<SiteExecutiveDetailResponse> siteExecutiveDetail(@RequestBody @Valid IdDTO idDTO) throws Exception {
         Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
@@ -69,21 +67,10 @@
         return ReturnUtil.success(siteExecutiveInfoService.detail(idDTO.getId()));
     }
 
-    @ApiOperation("现场检测导出")
+    @ApiOperation("导出")
     @PostMapping("/listExport")
-    public void export(@RequestBody @Valid SiteExecutiveApprovalListRequest request, BindingResult bindingResult) throws Exception {
-        if (bindingResult.hasErrors()) {
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        }
-        List<SiteExecutiveApprovalListResponse> list;
-        if (!CollectionUtils.isEmpty(request.getIds())) {
-            list = siteExecutiveInfoService.listInfoByIds(request.getIds());
-        } else {
-            list = siteExecutiveInfoService.listInfo(request);
-        }
-        for (SiteExecutiveApprovalListResponse record : list) {
-            DictCodeUtils.convertDictCodeToName(record);
-        }
+    public void export(@RequestBody SiteExecutiveApprovalListRequest request) throws Exception {
+        List<SiteExecutiveApprovalListResponse> list = super.exportList(request);
         super.exportExcel(SiteExecutiveApprovalListResponse.class, list, ExportEnum.SITE_EXECUTIVE_EXPORT.getSheetName());
     }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
index 7e793cd..a92e209 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
@@ -55,7 +55,7 @@
 
     @ApiOperation("设备收发列表导出")
     @PostMapping("/export")
-    public void exportList(@RequestBody @Valid SampleDispatchListRequest request) throws IOException {
+    public void exportList(@RequestBody SampleDispatchListRequest request) throws IOException {
         List<SampleDispatchListResponse> list;
         if (!CollectionUtils.isEmpty(request.getIds())) {
             list = dispatchService.listByIds(request.getIds());
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java
index cdc77fc..d120fd4 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java
@@ -7,6 +7,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.business.labExecutive.*;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.business.IBusinessLabExecutiveInfoService;
@@ -14,6 +15,7 @@
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.*;
 
@@ -32,7 +34,7 @@
     @Autowired
     private IBusinessLabExecutiveInfoService labExecutiveInfoService;
 
-    @ApiOperation("实验室检测-部门检测-查询各状态列表（待检测、检测中、检测完）")
+    @ApiOperation("实验室任务-查询各状态列表（待检测、检测中、检测完）")
     @PostMapping("/deptExecutive/List")
     public ReturnDTO<PageInfoBT<SampleLabExecutiveListResponse>> queryDeptExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
@@ -43,10 +45,19 @@
         return ReturnUtil.success(super.packForBT(labExecutiveInfoService.deptLabExecutiveListPage(page, labExecutiveListRequest)));
     }
 
-    /**
-     * 实验室检测-我的检测-查询各状态列表（待检测、检测中、检测完）
-     */
-    @ApiOperation("实验室检测-我的检测-查询各状态列表（待检测、检测中、检测完）")
+    @ApiOperation("实验室任务导出")
+    @PostMapping("/deptExecutive/export")
+    public void deptExportList(@RequestBody @Valid SampleLabExecutiveListRequest request) throws Exception {
+        List<SampleLabExecutiveListResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = labExecutiveInfoService.deptLabExecutiveListByIds(request.getMeasureStatus(), request.getIds());
+        } else {
+            list = labExecutiveInfoService.deptLabExecutiveList(request);
+        }
+        super.exportExcel(SampleLabExecutiveListResponse.class, list, ExportEnum.DEPT_EXECUTIVE_TASK.getSheetName());
+    }
+
+    @ApiOperation("我的任务-查询各状态列表（待检测、检测中、检测完）")
     @PostMapping("/myExecutive/list")
     public ReturnDTO<PageInfoBT<SampleLabExecutiveListResponse>> queryMyExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
@@ -57,19 +68,25 @@
         return ReturnUtil.success(super.packForBT(labExecutiveInfoService.myLabExecutiveListPage(page, labExecutiveListRequest)));
     }
 
-    /**
-     * 实验室检测-我的检测-查询各状态样品数量（待检测、检测中、检测完）
-     */
-    @ApiOperation("实验室检测-我的检测-查询各状态样品数量（待检测、检测中、检测完）")
+    @ApiOperation("我的任务导出")
+    @PostMapping("/myExecutive/export")
+    public void exportList(@RequestBody @Valid SampleLabExecutiveListRequest request) throws Exception {
+        List<SampleLabExecutiveListResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = labExecutiveInfoService.myLabExecutiveListByIds(request.getMeasureStatus(), request.getIds());
+        } else {
+            list = labExecutiveInfoService.myLabExecutiveList(request);
+        }
+        super.exportExcel(SampleLabExecutiveListResponse.class, list, ExportEnum.MY_EXECUTIVE_TASK.getSheetName());
+    }
+
+    @ApiOperation("我的任务-查询各状态样品数量（待检测、检测中、检测完）")
     @GetMapping("/myExecutive/amount")
     public ReturnDTO<List<SampleAmountResponse>> queryMyExecutiveAmount() {
         return ReturnUtil.success(labExecutiveInfoService.myExecutiveAmount());
     }
 
-    /**
-     * 实验室检测-部门检测-分配（分配给具体人员）
-     */
-    @ApiOperation("实验室检测-部门检测-分配按钮（分配给具体人员）")
+    @ApiOperation("实验室任务-分配按钮（分配给具体人员）")
     @PostMapping("/deptExecutive/allocate")
     public ReturnDTO allocateStaff(@RequestBody @Valid SampleAllocateRequest sampleAllocateRequest, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -78,10 +95,7 @@
         return labExecutiveInfoService.allocateStaff(sampleAllocateRequest);
     }
 
-    /**
-     * 实验室检测-我的检测-检定人扫描收入（待检测->检测中）
-     */
-    @ApiOperation("实验室检测-我的检测-检定人扫描收入（待检测->检测中）")
+    @ApiOperation("我的任务-检定人扫描收入（待检测->检测中）")
     @PostMapping("/myExecutive/receive")
     public ReturnDTO sampleReceive(@RequestBody @Valid List<SampleOperateRequest> requestList, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -90,10 +104,7 @@
         return labExecutiveInfoService.sampleReceive(requestList);
     }
 
-    /**
-     * 实验室检测-负责人/检定人扫描检完（检测中->检测完）
-     */
-    @ApiOperation("实验室检测-负责人/检定人扫描检完（检测中->检测完）")
+    @ApiOperation("实验室任务-负责人/检定人扫描检完（检测中->检测完）")
     @PostMapping("/myExecutive/complete")
     public ReturnDTO sampleExecutiveComplete(@RequestBody @Valid List<SampleOperateRequest> requestList, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -102,10 +113,7 @@
         return labExecutiveInfoService.sampleExecutiveComplete(requestList);
     }
 
-    /**
-     * 实验室检测-部门检测/我的检测 编辑（只能修改应出具证书）
-     */
-    @ApiOperation("实验室检测-部门检测/我的检测 编辑（只能修改应出具证书）")
+    @ApiOperation("实验室任务/我的任务 编辑（只能修改应出具证书）")
     @PostMapping("/executive/update")
     public ReturnDTO updateExecutive(@RequestBody @Valid UpdateExecutiveRequest request, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -114,10 +122,7 @@
         return labExecutiveInfoService.updateExecutive(request);
     }
 
-    /**
-     * 实验室检测-部门检测/我的检测 详情
-     */
-    @ApiOperation("实验室检测-部门检测/我的检测 详情")
+    @ApiOperation("实验室任务/我的任务 详情")
     @PostMapping("/executive/detail")
     public ReturnDTO<ExecutiveDetailResponse> executiveDetail(@RequestBody @Valid ExecutiveDetailRequest request, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
@@ -131,7 +136,7 @@
      * 退回后会将下一个要执行的实验室检测状态更新为待分配，将后面的实验室顺序变更为连续（都进行减1）
      * 最后一个检测的实验室退回，等分发员再增加实验室或设备收发中的已收入直接手动点击完成
      */
-    @ApiOperation("实验室检测-部门检测/我的检测 退回（待检测/检测中->退回）")
+    @ApiOperation("实验室任务/我的任务 退回（待检测/检测中->退回）")
     @PostMapping("/executive/sendBack")
     public ReturnDTO executiveSendBack(@RequestBody @Valid ExecutiveSendBackRequest request, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -140,9 +145,6 @@
         return labExecutiveInfoService.sampleExecutiveSendBack(request);
     }
 
-    /**
-     * 分发员编辑实验室检测列表
-     */
     @ApiOperation("分发员编辑实验室检测列表")
     @PostMapping("/handOut/updateList")
     public ReturnDTO updateExecutiveList(@RequestBody @Valid UpdateExecutiveListRequest request, BindingResult bindingResult) {
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java
index 48a67ed..0c04f31 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java
@@ -10,6 +10,7 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.resource.customer.CustomerApprovalListRequest;
 import com.casic.missiles.dto.resource.customer.CustomerSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceCustomerInfo;
@@ -26,6 +27,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -55,6 +57,13 @@
         return customerInfoService.saveCustomerInfo(request);
     }
 
+    @ApiOperation("委托方名录导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody CustomerApprovalListRequest request) throws Exception {
+        List<BizResourceCustomerInfo> list = super.exportList(request);
+        super.exportExcel(BizResourceCustomerInfo.class, list, ExportEnum.CUSTOMER_INFO.getSheetName());
+    }
+
     @ApiOperation("委托方人员列表（分页）")
     @PostMapping("/person/listPage")
     public ReturnDTO<PageInfoBT<BizResourceCustomerStaff>> personListPage(@RequestBody IdDTO idDto) {
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
index 972ed4b..6418ea5 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
@@ -5,6 +5,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.resource.customer.SuggestFormApprovalListRequest;
 import com.casic.missiles.dto.resource.customer.SuggestFormSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceCustomerSuggestForm;
@@ -20,6 +21,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -50,4 +52,11 @@
         return suggestFormService.saveSuggestForm(request);
     }
 
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody SuggestFormApprovalListRequest request) throws Exception {
+        List<BizResourceCustomerSuggestForm> list = super.exportList(request);
+        super.exportExcel(BizResourceCustomerSuggestForm.class, list, ExportEnum.CUSTOMER_SUGGEST_FORM.getSheetName());
+    }
+
 }

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java
index bb0c50f..13a699b 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java
@@ -12,6 +12,7 @@
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.IGeneralApprovalService;
+import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
@@ -19,6 +20,7 @@
 import org.springframework.web.bind.annotation.RequestBody;
 
 import javax.validation.Valid;
+import java.util.List;
 import java.util.Objects;
 
 /**
@@ -117,4 +119,17 @@
         }
         return baseApprovalService.failUpdate(request);
     }
+
+    public List<O> exportList(@RequestBody @Valid R request) throws Exception {
+        List<O> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = baseApprovalService.listExportByIds(request.getIds());
+        } else {
+            list = baseApprovalService.listExport(request);
+        }
+        for (O record : list) {
+            DictCodeUtils.convertDictCodeToName(record);
+        }
+        return list;
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java
index 8a90961..d775831 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java
@@ -5,6 +5,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.business.certificate.CertificateChangeApplyApprovalListRequest;
 import com.casic.missiles.dto.business.certificate.CertificateChangeApplySaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessCertificateChangeApply;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
@@ -20,6 +21,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -48,4 +50,12 @@
         }
         return changeApplyService.saveChangeApply(request);
     }
+
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody CertificateChangeApplyApprovalListRequest request) throws Exception {
+        List<BizBusinessCertificateChangeApply> list = super.exportList(request);
+        super.exportExcel(BizBusinessCertificateChangeApply.class, list, ExportEnum.CERTIFICATE_CHANGE_APPLY.getSheetName());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java
index 5fc4b07..af8230e 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java
@@ -9,6 +9,7 @@
 import com.casic.missiles.dto.business.certificate.CertificatePrintApprovalListRequest;
 import com.casic.missiles.dto.business.certificate.CertificatePrintListResponse;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.enums.business.CertificatePrintStatusEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessCertificatePrintLog;
@@ -18,10 +19,16 @@
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.io.IOException;
+import java.util.List;
 import java.util.Objects;
 
 /**
@@ -98,4 +105,16 @@
         });
         return certificatePrintService.certificatePrintLog(idDTO.getId());
     }
+
+    @ApiOperation("证书打印审批导出")
+    @PostMapping("/listExport")
+    public void exportList(@RequestBody CertificatePrintApprovalListRequest request) throws IOException {
+        List<CertificatePrintListResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = certificatePrintService.listByIds(request.getIds());
+        } else {
+            list = certificatePrintService.list(request);
+        }
+        super.exportExcel(CertificatePrintListResponse.class, list, ExportEnum.CERTIFICATE_PRINT.getSheetName());
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java
index 63b06dc..6b2efd5 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java
@@ -6,6 +6,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.business.certificate.CertificateReportApprovalListRequest;
 import com.casic.missiles.dto.business.certificate.CertificateReportSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessCertificateReport;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
@@ -21,6 +22,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -50,7 +52,7 @@
         return certificateReportService.saveCertificateReport(request);
     }
 
-    @ApiOperation("证书审批详情（基本信息）")
+    @ApiOperation("详情（基本信息）")
     @PostMapping("/detail")
     public ReturnDTO<BizBusinessCertificateReport> detail(@RequestBody @Valid BaseDetailRequest request, BindingResult bindingResult) throws Exception {
         if(bindingResult.hasErrors()){
@@ -59,4 +61,11 @@
         return certificateReportService.detail(request);
     }
 
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody CertificateReportApprovalListRequest request) throws Exception {
+        List<BizBusinessCertificateReport> list = super.exportList(request);
+        super.exportExcel(BizBusinessCertificateReport.class, list, ExportEnum.CERTIFICATE_REPORT.getSheetName());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java
index 46b26bd..57c0809 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java
@@ -10,20 +10,21 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.business.identify.IdentifyListRequest;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessIdentifyInfo;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.business.IBizBusinessIdentifyInfoService;
+import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import javax.validation.Valid;
+import java.util.List;
 import java.util.Objects;
 
 /**
@@ -57,16 +58,13 @@
         return identifyInfoService.addIdentify(identifyInfo);
     }
 
-    @ApiOperation("标识打印更新")
+    @ApiOperation("标识打印更新（更新打印时间）")
     @PostMapping("/update")
-    public ReturnDTO updateIdentify(@RequestBody @Valid BizBusinessIdentifyInfo identifyInfo, BindingResult bindingResult) {
-        Assert.isFalse(Objects.isNull(identifyInfo.getId()), () -> {
+    public ReturnDTO updateIdentify(@RequestBody @Valid IdDTO idDTO) {
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        Assert.isFalse(bindingResult.hasErrors(), () -> {
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        });
-        return identifyInfoService.updateIdentify(identifyInfo);
+        return identifyInfoService.updateIdentify(idDTO.getId());
     }
 
     @ApiOperation("标识打印删除")
@@ -77,4 +75,37 @@
         });
         return identifyInfoService.deleteIdentify(idDTO.getId());
     }
+
+    @ApiOperation("标识打印导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody @Valid IdentifyListRequest request, BindingResult bindingResult) throws Exception {
+        if (bindingResult.hasErrors()) {
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        List<BizBusinessIdentifyInfo> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = identifyInfoService.listByIds(request.getIds());
+        } else {
+            list = identifyInfoService.list(request);
+        }
+        for (BizBusinessIdentifyInfo record : list) {
+            DictCodeUtils.convertDictCodeToName(record);
+        }
+        super.exportExcel(BizBusinessIdentifyInfo.class, list, ExportEnum.IDENTIFY_EXPORT.getSheetName());
+    }
+
+
+    // TODO: 2023/8/23 查询设备信息，4个底部按钮查设备（按钮的作用就是前端用来调不同接口、用来区分中间即将展示的标识），前端弹窗选设备，在确定保存时前端根据底部按钮判断传入设备类型deviceType字典code
+    // TODO: 2023/8/23 接口：查受检设备（第1个按钮），查设备台账（后3个按钮同一接口），查询之后前端根据标志类型的不同加到中间页面时进行判断（按产品给的对应表）
+    // TODO: 2023/8/23 提供二维码接口，前端在加到中间页面时调用一下
+
+    @ApiOperation("设备二维码")
+    @PostMapping("/equipment/qrCode")
+    public ReturnDTO<String> equipmentQrCode(@RequestBody @Valid IdDTO idDTO) {
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return identifyInfoService.equipmentQrCode(idDTO.getId());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java
index 707be6e..7e0453d 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java
@@ -117,7 +117,7 @@
     }
 
     @ApiOperation("任务单导出")
-    @PostMapping("/export")
+    @PostMapping("/listExport")
     public void orderExport(@RequestBody @Valid OrderListRequest request, HttpServletResponse response) {
         businessOrderService.orderExport(request, response);
     }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java
index 529a6ce..51432be 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java
@@ -1,9 +1,28 @@
 package com.casic.missiles.controller.business;
 
+import com.casic.missiles.controller.GeneralApprovalController;
+import com.casic.missiles.dto.BaseApprovalSubmitRequest;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.business.outsource.OutsourceAssessApprovalListRequest;
+import com.casic.missiles.dto.business.outsource.OutsourceAssessSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
+import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.model.business.BizBusinessOutsourceAssess;
+import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
+import com.casic.missiles.service.IGeneralApprovalService;
+import com.casic.missiles.service.business.IBizBusinessOutsourceAssessService;
 import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.BindingResult;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.validation.Valid;
+import java.util.List;
+
 /**
  * <p>
  * 计量检定业务-分包管理-测试、校准或检定工作分包评审表 前端控制器
@@ -15,6 +34,27 @@
 @Api(tags = "分包管理-测试、校准或检定工作分包评审表")
 @RestController
 @RequestMapping("/business/outsource/assess")
-public class BizBusinessOutsourceAssessController {
+public class BizBusinessOutsourceAssessController extends GeneralApprovalController<BizBusinessOutsourceAssess, BizBusinessOutsourceAssess, OutsourceAssessApprovalListRequest, BaseApprovalSubmitRequest> {
+    @Autowired
+    private IBizBusinessOutsourceAssessService outsourceAssessService;
 
+    public BizBusinessOutsourceAssessController(IGeneralApprovalService<BizBusinessOutsourceAssess, BizBusinessOutsourceAssess, OutsourceAssessApprovalListRequest, BaseApprovalSubmitRequest> baseApprovalService) {
+        super(baseApprovalService);
+    }
+
+    @ApiOperation("草稿箱-保存")
+    @PostMapping("/save")
+    public ReturnDTO<OutsourceAssessSaveResponse> saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceAssess request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        return outsourceAssessService.saveOutsourceAssess(request);
+    }
+
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception {
+        List<BizBusinessOutsourceAssess> list = super.exportList(request);
+        super.exportExcel(BizBusinessOutsourceAssess.class, list, ExportEnum.OUTSOURCE_ASSESS.getSheetName());
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java
new file mode 100644
index 0000000..9adef18
--- /dev/null
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java
@@ -0,0 +1,60 @@
+package com.casic.missiles.controller.business;
+
+import com.casic.missiles.controller.GeneralApprovalController;
+import com.casic.missiles.dto.BaseApprovalSubmitRequest;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.business.outsource.OutsourceProtocolApprovalListRequest;
+import com.casic.missiles.dto.business.outsource.OutsourceProtocolSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
+import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.model.business.BizBusinessOutsourceProtocol;
+import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
+import com.casic.missiles.service.IGeneralApprovalService;
+import com.casic.missiles.service.business.IBizBusinessOutsourceProtocolService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.BindingResult;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.validation.Valid;
+import java.util.List;
+
+/**
+ * <p>
+ * 计量检定业务-分包管理-测试、校准或检定工作分包协议书 前端控制器
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-08-24
+ */
+@Api(tags = "分包管理-测试、校准或检定工作分包协议书")
+@RestController
+@RequestMapping("/business/outsource/protocol")
+public class BizBusinessOutsourceProtocolController extends GeneralApprovalController<BizBusinessOutsourceProtocol, BizBusinessOutsourceProtocol, OutsourceProtocolApprovalListRequest, BaseApprovalSubmitRequest> {
+    @Autowired
+    private IBizBusinessOutsourceProtocolService outsourceProtocolService;
+
+    public BizBusinessOutsourceProtocolController(IGeneralApprovalService<BizBusinessOutsourceProtocol, BizBusinessOutsourceProtocol, OutsourceProtocolApprovalListRequest, BaseApprovalSubmitRequest> baseApprovalService) {
+        super(baseApprovalService);
+    }
+
+    @ApiOperation("草稿箱-保存")
+    @PostMapping("/save")
+    public ReturnDTO<OutsourceProtocolSaveResponse> saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceProtocol request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        return outsourceProtocolService.saveOutsourceProtocol(request);
+    }
+
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody OutsourceProtocolApprovalListRequest request) throws Exception {
+        List<BizBusinessOutsourceProtocol> list = super.exportList(request);
+        super.exportExcel(BizBusinessOutsourceProtocol.class, list, ExportEnum.OUTSOURCE_PROTOCOL.getSheetName());
+    }
+}
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java
index 097f645..f0f0943 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java
@@ -17,7 +17,6 @@
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.IGeneralApprovalService;
 import com.casic.missiles.service.business.IBizBusinessOutsourcerInfoService;
-import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -71,19 +70,8 @@
 
     @ApiOperation("分包方导出")
     @PostMapping("/listExport")
-    public void export(@RequestBody @Valid OutsourcerInfoApprovalListRequest request, BindingResult bindingResult) throws Exception {
-        if (bindingResult.hasErrors()) {
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        }
-        List<BizBusinessOutsourcerInfo> list;
-        if (!CollectionUtils.isEmpty(request.getIds())) {
-            list = outsourcerInfoService.listByIds(request.getIds());
-        } else {
-            list = outsourcerInfoService.list(request);
-        }
-        for (BizBusinessOutsourcerInfo record : list) {
-            DictCodeUtils.convertDictCodeToName(record);
-        }
+    public void export(@RequestBody OutsourcerInfoApprovalListRequest request) throws Exception {
+        List<BizBusinessOutsourcerInfo> list = super.exportList(request);
         super.exportExcel(BizBusinessOutsourcerInfo.class, list, ExportEnum.OUTSOURCER_EXPORT.getSheetName());
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java
index c2cbf9f..0410918 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java
@@ -17,11 +17,9 @@
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.IGeneralApprovalService;
 import com.casic.missiles.service.business.IBizBusinessSiteExecutiveInfoService;
-import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -60,7 +58,7 @@
         return siteExecutiveInfoService.saveSiteExecutiveInfo(siteExecutiveInfo);
     }
 
-    @ApiOperation("现场检测详情")
+    @ApiOperation("详情")
     @PostMapping("/detail")
     public ReturnDTO<SiteExecutiveDetailResponse> siteExecutiveDetail(@RequestBody @Valid IdDTO idDTO) throws Exception {
         Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
@@ -69,21 +67,10 @@
         return ReturnUtil.success(siteExecutiveInfoService.detail(idDTO.getId()));
     }
 
-    @ApiOperation("现场检测导出")
+    @ApiOperation("导出")
     @PostMapping("/listExport")
-    public void export(@RequestBody @Valid SiteExecutiveApprovalListRequest request, BindingResult bindingResult) throws Exception {
-        if (bindingResult.hasErrors()) {
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        }
-        List<SiteExecutiveApprovalListResponse> list;
-        if (!CollectionUtils.isEmpty(request.getIds())) {
-            list = siteExecutiveInfoService.listInfoByIds(request.getIds());
-        } else {
-            list = siteExecutiveInfoService.listInfo(request);
-        }
-        for (SiteExecutiveApprovalListResponse record : list) {
-            DictCodeUtils.convertDictCodeToName(record);
-        }
+    public void export(@RequestBody SiteExecutiveApprovalListRequest request) throws Exception {
+        List<SiteExecutiveApprovalListResponse> list = super.exportList(request);
         super.exportExcel(SiteExecutiveApprovalListResponse.class, list, ExportEnum.SITE_EXECUTIVE_EXPORT.getSheetName());
     }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
index 7e793cd..a92e209 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
@@ -55,7 +55,7 @@
 
     @ApiOperation("设备收发列表导出")
     @PostMapping("/export")
-    public void exportList(@RequestBody @Valid SampleDispatchListRequest request) throws IOException {
+    public void exportList(@RequestBody SampleDispatchListRequest request) throws IOException {
         List<SampleDispatchListResponse> list;
         if (!CollectionUtils.isEmpty(request.getIds())) {
             list = dispatchService.listByIds(request.getIds());
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java
index cdc77fc..d120fd4 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java
@@ -7,6 +7,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.business.labExecutive.*;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.business.IBusinessLabExecutiveInfoService;
@@ -14,6 +15,7 @@
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.*;
 
@@ -32,7 +34,7 @@
     @Autowired
     private IBusinessLabExecutiveInfoService labExecutiveInfoService;
 
-    @ApiOperation("实验室检测-部门检测-查询各状态列表（待检测、检测中、检测完）")
+    @ApiOperation("实验室任务-查询各状态列表（待检测、检测中、检测完）")
     @PostMapping("/deptExecutive/List")
     public ReturnDTO<PageInfoBT<SampleLabExecutiveListResponse>> queryDeptExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
@@ -43,10 +45,19 @@
         return ReturnUtil.success(super.packForBT(labExecutiveInfoService.deptLabExecutiveListPage(page, labExecutiveListRequest)));
     }
 
-    /**
-     * 实验室检测-我的检测-查询各状态列表（待检测、检测中、检测完）
-     */
-    @ApiOperation("实验室检测-我的检测-查询各状态列表（待检测、检测中、检测完）")
+    @ApiOperation("实验室任务导出")
+    @PostMapping("/deptExecutive/export")
+    public void deptExportList(@RequestBody @Valid SampleLabExecutiveListRequest request) throws Exception {
+        List<SampleLabExecutiveListResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = labExecutiveInfoService.deptLabExecutiveListByIds(request.getMeasureStatus(), request.getIds());
+        } else {
+            list = labExecutiveInfoService.deptLabExecutiveList(request);
+        }
+        super.exportExcel(SampleLabExecutiveListResponse.class, list, ExportEnum.DEPT_EXECUTIVE_TASK.getSheetName());
+    }
+
+    @ApiOperation("我的任务-查询各状态列表（待检测、检测中、检测完）")
     @PostMapping("/myExecutive/list")
     public ReturnDTO<PageInfoBT<SampleLabExecutiveListResponse>> queryMyExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
@@ -57,19 +68,25 @@
         return ReturnUtil.success(super.packForBT(labExecutiveInfoService.myLabExecutiveListPage(page, labExecutiveListRequest)));
     }
 
-    /**
-     * 实验室检测-我的检测-查询各状态样品数量（待检测、检测中、检测完）
-     */
-    @ApiOperation("实验室检测-我的检测-查询各状态样品数量（待检测、检测中、检测完）")
+    @ApiOperation("我的任务导出")
+    @PostMapping("/myExecutive/export")
+    public void exportList(@RequestBody @Valid SampleLabExecutiveListRequest request) throws Exception {
+        List<SampleLabExecutiveListResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = labExecutiveInfoService.myLabExecutiveListByIds(request.getMeasureStatus(), request.getIds());
+        } else {
+            list = labExecutiveInfoService.myLabExecutiveList(request);
+        }
+        super.exportExcel(SampleLabExecutiveListResponse.class, list, ExportEnum.MY_EXECUTIVE_TASK.getSheetName());
+    }
+
+    @ApiOperation("我的任务-查询各状态样品数量（待检测、检测中、检测完）")
     @GetMapping("/myExecutive/amount")
     public ReturnDTO<List<SampleAmountResponse>> queryMyExecutiveAmount() {
         return ReturnUtil.success(labExecutiveInfoService.myExecutiveAmount());
     }
 
-    /**
-     * 实验室检测-部门检测-分配（分配给具体人员）
-     */
-    @ApiOperation("实验室检测-部门检测-分配按钮（分配给具体人员）")
+    @ApiOperation("实验室任务-分配按钮（分配给具体人员）")
     @PostMapping("/deptExecutive/allocate")
     public ReturnDTO allocateStaff(@RequestBody @Valid SampleAllocateRequest sampleAllocateRequest, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -78,10 +95,7 @@
         return labExecutiveInfoService.allocateStaff(sampleAllocateRequest);
     }
 
-    /**
-     * 实验室检测-我的检测-检定人扫描收入（待检测->检测中）
-     */
-    @ApiOperation("实验室检测-我的检测-检定人扫描收入（待检测->检测中）")
+    @ApiOperation("我的任务-检定人扫描收入（待检测->检测中）")
     @PostMapping("/myExecutive/receive")
     public ReturnDTO sampleReceive(@RequestBody @Valid List<SampleOperateRequest> requestList, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -90,10 +104,7 @@
         return labExecutiveInfoService.sampleReceive(requestList);
     }
 
-    /**
-     * 实验室检测-负责人/检定人扫描检完（检测中->检测完）
-     */
-    @ApiOperation("实验室检测-负责人/检定人扫描检完（检测中->检测完）")
+    @ApiOperation("实验室任务-负责人/检定人扫描检完（检测中->检测完）")
     @PostMapping("/myExecutive/complete")
     public ReturnDTO sampleExecutiveComplete(@RequestBody @Valid List<SampleOperateRequest> requestList, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -102,10 +113,7 @@
         return labExecutiveInfoService.sampleExecutiveComplete(requestList);
     }
 
-    /**
-     * 实验室检测-部门检测/我的检测 编辑（只能修改应出具证书）
-     */
-    @ApiOperation("实验室检测-部门检测/我的检测 编辑（只能修改应出具证书）")
+    @ApiOperation("实验室任务/我的任务 编辑（只能修改应出具证书）")
     @PostMapping("/executive/update")
     public ReturnDTO updateExecutive(@RequestBody @Valid UpdateExecutiveRequest request, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -114,10 +122,7 @@
         return labExecutiveInfoService.updateExecutive(request);
     }
 
-    /**
-     * 实验室检测-部门检测/我的检测 详情
-     */
-    @ApiOperation("实验室检测-部门检测/我的检测 详情")
+    @ApiOperation("实验室任务/我的任务 详情")
     @PostMapping("/executive/detail")
     public ReturnDTO<ExecutiveDetailResponse> executiveDetail(@RequestBody @Valid ExecutiveDetailRequest request, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
@@ -131,7 +136,7 @@
      * 退回后会将下一个要执行的实验室检测状态更新为待分配，将后面的实验室顺序变更为连续（都进行减1）
      * 最后一个检测的实验室退回，等分发员再增加实验室或设备收发中的已收入直接手动点击完成
      */
-    @ApiOperation("实验室检测-部门检测/我的检测 退回（待检测/检测中->退回）")
+    @ApiOperation("实验室任务/我的任务 退回（待检测/检测中->退回）")
     @PostMapping("/executive/sendBack")
     public ReturnDTO executiveSendBack(@RequestBody @Valid ExecutiveSendBackRequest request, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -140,9 +145,6 @@
         return labExecutiveInfoService.sampleExecutiveSendBack(request);
     }
 
-    /**
-     * 分发员编辑实验室检测列表
-     */
     @ApiOperation("分发员编辑实验室检测列表")
     @PostMapping("/handOut/updateList")
     public ReturnDTO updateExecutiveList(@RequestBody @Valid UpdateExecutiveListRequest request, BindingResult bindingResult) {
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java
index 48a67ed..0c04f31 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java
@@ -10,6 +10,7 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.resource.customer.CustomerApprovalListRequest;
 import com.casic.missiles.dto.resource.customer.CustomerSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceCustomerInfo;
@@ -26,6 +27,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -55,6 +57,13 @@
         return customerInfoService.saveCustomerInfo(request);
     }
 
+    @ApiOperation("委托方名录导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody CustomerApprovalListRequest request) throws Exception {
+        List<BizResourceCustomerInfo> list = super.exportList(request);
+        super.exportExcel(BizResourceCustomerInfo.class, list, ExportEnum.CUSTOMER_INFO.getSheetName());
+    }
+
     @ApiOperation("委托方人员列表（分页）")
     @PostMapping("/person/listPage")
     public ReturnDTO<PageInfoBT<BizResourceCustomerStaff>> personListPage(@RequestBody IdDTO idDto) {
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
index 972ed4b..6418ea5 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
@@ -5,6 +5,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.resource.customer.SuggestFormApprovalListRequest;
 import com.casic.missiles.dto.resource.customer.SuggestFormSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceCustomerSuggestForm;
@@ -20,6 +21,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -50,4 +52,11 @@
         return suggestFormService.saveSuggestForm(request);
     }
 
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody SuggestFormApprovalListRequest request) throws Exception {
+        List<BizResourceCustomerSuggestForm> list = super.exportList(request);
+        super.exportExcel(BizResourceCustomerSuggestForm.class, list, ExportEnum.CUSTOMER_SUGGEST_FORM.getSheetName());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java
index 1934d1a..9e07eab 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java
@@ -15,12 +15,16 @@
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.resource.IEnvEnvironmentRecordConfigService;
 import com.casic.missiles.service.resource.IEnvEnvironmentRecordDataService;
+import com.casic.missiles.service.resource.IEnvLocationInfoService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
 import java.util.List;
@@ -39,6 +43,8 @@
     private IEnvEnvironmentRecordDataService environmentRecordDataService;
     @Autowired
     private IEnvEnvironmentRecordConfigService environmentRecordConfigService;
+    @Autowired
+    private IEnvLocationInfoService locationInfoService;
 
     @ApiOperation("环境记录单数据列表/详情")
     @PostMapping("/data/listPage")
@@ -95,4 +101,11 @@
         });
         return environmentRecordConfigService.deleteEnvironmentRecordConfig(idDTO.getId());
     }
+
+    @ApiOperation("地点列表")
+    @PostMapping("/location/listPage")
+    public ReturnDTO<PageInfoBT<LocationListResponse>> locationListPage(@RequestBody @Valid LocationListRequest request) {
+        Page<LocationListResponse> page = PageFactory.defaultPage();
+        return ReturnUtil.success(super.packForBT(locationInfoService.listPage(page, request)));
+    }
 }

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java
index bb0c50f..13a699b 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java
@@ -12,6 +12,7 @@
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.IGeneralApprovalService;
+import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
@@ -19,6 +20,7 @@
 import org.springframework.web.bind.annotation.RequestBody;
 
 import javax.validation.Valid;
+import java.util.List;
 import java.util.Objects;
 
 /**
@@ -117,4 +119,17 @@
         }
         return baseApprovalService.failUpdate(request);
     }
+
+    public List<O> exportList(@RequestBody @Valid R request) throws Exception {
+        List<O> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = baseApprovalService.listExportByIds(request.getIds());
+        } else {
+            list = baseApprovalService.listExport(request);
+        }
+        for (O record : list) {
+            DictCodeUtils.convertDictCodeToName(record);
+        }
+        return list;
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java
index 8a90961..d775831 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java
@@ -5,6 +5,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.business.certificate.CertificateChangeApplyApprovalListRequest;
 import com.casic.missiles.dto.business.certificate.CertificateChangeApplySaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessCertificateChangeApply;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
@@ -20,6 +21,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -48,4 +50,12 @@
         }
         return changeApplyService.saveChangeApply(request);
     }
+
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody CertificateChangeApplyApprovalListRequest request) throws Exception {
+        List<BizBusinessCertificateChangeApply> list = super.exportList(request);
+        super.exportExcel(BizBusinessCertificateChangeApply.class, list, ExportEnum.CERTIFICATE_CHANGE_APPLY.getSheetName());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java
index 5fc4b07..af8230e 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java
@@ -9,6 +9,7 @@
 import com.casic.missiles.dto.business.certificate.CertificatePrintApprovalListRequest;
 import com.casic.missiles.dto.business.certificate.CertificatePrintListResponse;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.enums.business.CertificatePrintStatusEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessCertificatePrintLog;
@@ -18,10 +19,16 @@
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.io.IOException;
+import java.util.List;
 import java.util.Objects;
 
 /**
@@ -98,4 +105,16 @@
         });
         return certificatePrintService.certificatePrintLog(idDTO.getId());
     }
+
+    @ApiOperation("证书打印审批导出")
+    @PostMapping("/listExport")
+    public void exportList(@RequestBody CertificatePrintApprovalListRequest request) throws IOException {
+        List<CertificatePrintListResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = certificatePrintService.listByIds(request.getIds());
+        } else {
+            list = certificatePrintService.list(request);
+        }
+        super.exportExcel(CertificatePrintListResponse.class, list, ExportEnum.CERTIFICATE_PRINT.getSheetName());
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java
index 63b06dc..6b2efd5 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java
@@ -6,6 +6,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.business.certificate.CertificateReportApprovalListRequest;
 import com.casic.missiles.dto.business.certificate.CertificateReportSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessCertificateReport;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
@@ -21,6 +22,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -50,7 +52,7 @@
         return certificateReportService.saveCertificateReport(request);
     }
 
-    @ApiOperation("证书审批详情（基本信息）")
+    @ApiOperation("详情（基本信息）")
     @PostMapping("/detail")
     public ReturnDTO<BizBusinessCertificateReport> detail(@RequestBody @Valid BaseDetailRequest request, BindingResult bindingResult) throws Exception {
         if(bindingResult.hasErrors()){
@@ -59,4 +61,11 @@
         return certificateReportService.detail(request);
     }
 
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody CertificateReportApprovalListRequest request) throws Exception {
+        List<BizBusinessCertificateReport> list = super.exportList(request);
+        super.exportExcel(BizBusinessCertificateReport.class, list, ExportEnum.CERTIFICATE_REPORT.getSheetName());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java
index 46b26bd..57c0809 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java
@@ -10,20 +10,21 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.business.identify.IdentifyListRequest;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessIdentifyInfo;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.business.IBizBusinessIdentifyInfoService;
+import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import javax.validation.Valid;
+import java.util.List;
 import java.util.Objects;
 
 /**
@@ -57,16 +58,13 @@
         return identifyInfoService.addIdentify(identifyInfo);
     }
 
-    @ApiOperation("标识打印更新")
+    @ApiOperation("标识打印更新（更新打印时间）")
     @PostMapping("/update")
-    public ReturnDTO updateIdentify(@RequestBody @Valid BizBusinessIdentifyInfo identifyInfo, BindingResult bindingResult) {
-        Assert.isFalse(Objects.isNull(identifyInfo.getId()), () -> {
+    public ReturnDTO updateIdentify(@RequestBody @Valid IdDTO idDTO) {
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        Assert.isFalse(bindingResult.hasErrors(), () -> {
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        });
-        return identifyInfoService.updateIdentify(identifyInfo);
+        return identifyInfoService.updateIdentify(idDTO.getId());
     }
 
     @ApiOperation("标识打印删除")
@@ -77,4 +75,37 @@
         });
         return identifyInfoService.deleteIdentify(idDTO.getId());
     }
+
+    @ApiOperation("标识打印导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody @Valid IdentifyListRequest request, BindingResult bindingResult) throws Exception {
+        if (bindingResult.hasErrors()) {
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        List<BizBusinessIdentifyInfo> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = identifyInfoService.listByIds(request.getIds());
+        } else {
+            list = identifyInfoService.list(request);
+        }
+        for (BizBusinessIdentifyInfo record : list) {
+            DictCodeUtils.convertDictCodeToName(record);
+        }
+        super.exportExcel(BizBusinessIdentifyInfo.class, list, ExportEnum.IDENTIFY_EXPORT.getSheetName());
+    }
+
+
+    // TODO: 2023/8/23 查询设备信息，4个底部按钮查设备（按钮的作用就是前端用来调不同接口、用来区分中间即将展示的标识），前端弹窗选设备，在确定保存时前端根据底部按钮判断传入设备类型deviceType字典code
+    // TODO: 2023/8/23 接口：查受检设备（第1个按钮），查设备台账（后3个按钮同一接口），查询之后前端根据标志类型的不同加到中间页面时进行判断（按产品给的对应表）
+    // TODO: 2023/8/23 提供二维码接口，前端在加到中间页面时调用一下
+
+    @ApiOperation("设备二维码")
+    @PostMapping("/equipment/qrCode")
+    public ReturnDTO<String> equipmentQrCode(@RequestBody @Valid IdDTO idDTO) {
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return identifyInfoService.equipmentQrCode(idDTO.getId());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java
index 707be6e..7e0453d 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java
@@ -117,7 +117,7 @@
     }
 
     @ApiOperation("任务单导出")
-    @PostMapping("/export")
+    @PostMapping("/listExport")
     public void orderExport(@RequestBody @Valid OrderListRequest request, HttpServletResponse response) {
         businessOrderService.orderExport(request, response);
     }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java
index 529a6ce..51432be 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java
@@ -1,9 +1,28 @@
 package com.casic.missiles.controller.business;
 
+import com.casic.missiles.controller.GeneralApprovalController;
+import com.casic.missiles.dto.BaseApprovalSubmitRequest;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.business.outsource.OutsourceAssessApprovalListRequest;
+import com.casic.missiles.dto.business.outsource.OutsourceAssessSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
+import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.model.business.BizBusinessOutsourceAssess;
+import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
+import com.casic.missiles.service.IGeneralApprovalService;
+import com.casic.missiles.service.business.IBizBusinessOutsourceAssessService;
 import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.BindingResult;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.validation.Valid;
+import java.util.List;
+
 /**
  * <p>
  * 计量检定业务-分包管理-测试、校准或检定工作分包评审表 前端控制器
@@ -15,6 +34,27 @@
 @Api(tags = "分包管理-测试、校准或检定工作分包评审表")
 @RestController
 @RequestMapping("/business/outsource/assess")
-public class BizBusinessOutsourceAssessController {
+public class BizBusinessOutsourceAssessController extends GeneralApprovalController<BizBusinessOutsourceAssess, BizBusinessOutsourceAssess, OutsourceAssessApprovalListRequest, BaseApprovalSubmitRequest> {
+    @Autowired
+    private IBizBusinessOutsourceAssessService outsourceAssessService;
 
+    public BizBusinessOutsourceAssessController(IGeneralApprovalService<BizBusinessOutsourceAssess, BizBusinessOutsourceAssess, OutsourceAssessApprovalListRequest, BaseApprovalSubmitRequest> baseApprovalService) {
+        super(baseApprovalService);
+    }
+
+    @ApiOperation("草稿箱-保存")
+    @PostMapping("/save")
+    public ReturnDTO<OutsourceAssessSaveResponse> saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceAssess request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        return outsourceAssessService.saveOutsourceAssess(request);
+    }
+
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception {
+        List<BizBusinessOutsourceAssess> list = super.exportList(request);
+        super.exportExcel(BizBusinessOutsourceAssess.class, list, ExportEnum.OUTSOURCE_ASSESS.getSheetName());
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java
new file mode 100644
index 0000000..9adef18
--- /dev/null
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java
@@ -0,0 +1,60 @@
+package com.casic.missiles.controller.business;
+
+import com.casic.missiles.controller.GeneralApprovalController;
+import com.casic.missiles.dto.BaseApprovalSubmitRequest;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.business.outsource.OutsourceProtocolApprovalListRequest;
+import com.casic.missiles.dto.business.outsource.OutsourceProtocolSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
+import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.model.business.BizBusinessOutsourceProtocol;
+import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
+import com.casic.missiles.service.IGeneralApprovalService;
+import com.casic.missiles.service.business.IBizBusinessOutsourceProtocolService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.BindingResult;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.validation.Valid;
+import java.util.List;
+
+/**
+ * <p>
+ * 计量检定业务-分包管理-测试、校准或检定工作分包协议书 前端控制器
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-08-24
+ */
+@Api(tags = "分包管理-测试、校准或检定工作分包协议书")
+@RestController
+@RequestMapping("/business/outsource/protocol")
+public class BizBusinessOutsourceProtocolController extends GeneralApprovalController<BizBusinessOutsourceProtocol, BizBusinessOutsourceProtocol, OutsourceProtocolApprovalListRequest, BaseApprovalSubmitRequest> {
+    @Autowired
+    private IBizBusinessOutsourceProtocolService outsourceProtocolService;
+
+    public BizBusinessOutsourceProtocolController(IGeneralApprovalService<BizBusinessOutsourceProtocol, BizBusinessOutsourceProtocol, OutsourceProtocolApprovalListRequest, BaseApprovalSubmitRequest> baseApprovalService) {
+        super(baseApprovalService);
+    }
+
+    @ApiOperation("草稿箱-保存")
+    @PostMapping("/save")
+    public ReturnDTO<OutsourceProtocolSaveResponse> saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceProtocol request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        return outsourceProtocolService.saveOutsourceProtocol(request);
+    }
+
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody OutsourceProtocolApprovalListRequest request) throws Exception {
+        List<BizBusinessOutsourceProtocol> list = super.exportList(request);
+        super.exportExcel(BizBusinessOutsourceProtocol.class, list, ExportEnum.OUTSOURCE_PROTOCOL.getSheetName());
+    }
+}
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java
index 097f645..f0f0943 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java
@@ -17,7 +17,6 @@
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.IGeneralApprovalService;
 import com.casic.missiles.service.business.IBizBusinessOutsourcerInfoService;
-import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -71,19 +70,8 @@
 
     @ApiOperation("分包方导出")
     @PostMapping("/listExport")
-    public void export(@RequestBody @Valid OutsourcerInfoApprovalListRequest request, BindingResult bindingResult) throws Exception {
-        if (bindingResult.hasErrors()) {
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        }
-        List<BizBusinessOutsourcerInfo> list;
-        if (!CollectionUtils.isEmpty(request.getIds())) {
-            list = outsourcerInfoService.listByIds(request.getIds());
-        } else {
-            list = outsourcerInfoService.list(request);
-        }
-        for (BizBusinessOutsourcerInfo record : list) {
-            DictCodeUtils.convertDictCodeToName(record);
-        }
+    public void export(@RequestBody OutsourcerInfoApprovalListRequest request) throws Exception {
+        List<BizBusinessOutsourcerInfo> list = super.exportList(request);
         super.exportExcel(BizBusinessOutsourcerInfo.class, list, ExportEnum.OUTSOURCER_EXPORT.getSheetName());
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java
index c2cbf9f..0410918 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java
@@ -17,11 +17,9 @@
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.IGeneralApprovalService;
 import com.casic.missiles.service.business.IBizBusinessSiteExecutiveInfoService;
-import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -60,7 +58,7 @@
         return siteExecutiveInfoService.saveSiteExecutiveInfo(siteExecutiveInfo);
     }
 
-    @ApiOperation("现场检测详情")
+    @ApiOperation("详情")
     @PostMapping("/detail")
     public ReturnDTO<SiteExecutiveDetailResponse> siteExecutiveDetail(@RequestBody @Valid IdDTO idDTO) throws Exception {
         Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
@@ -69,21 +67,10 @@
         return ReturnUtil.success(siteExecutiveInfoService.detail(idDTO.getId()));
     }
 
-    @ApiOperation("现场检测导出")
+    @ApiOperation("导出")
     @PostMapping("/listExport")
-    public void export(@RequestBody @Valid SiteExecutiveApprovalListRequest request, BindingResult bindingResult) throws Exception {
-        if (bindingResult.hasErrors()) {
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        }
-        List<SiteExecutiveApprovalListResponse> list;
-        if (!CollectionUtils.isEmpty(request.getIds())) {
-            list = siteExecutiveInfoService.listInfoByIds(request.getIds());
-        } else {
-            list = siteExecutiveInfoService.listInfo(request);
-        }
-        for (SiteExecutiveApprovalListResponse record : list) {
-            DictCodeUtils.convertDictCodeToName(record);
-        }
+    public void export(@RequestBody SiteExecutiveApprovalListRequest request) throws Exception {
+        List<SiteExecutiveApprovalListResponse> list = super.exportList(request);
         super.exportExcel(SiteExecutiveApprovalListResponse.class, list, ExportEnum.SITE_EXECUTIVE_EXPORT.getSheetName());
     }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
index 7e793cd..a92e209 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
@@ -55,7 +55,7 @@
 
     @ApiOperation("设备收发列表导出")
     @PostMapping("/export")
-    public void exportList(@RequestBody @Valid SampleDispatchListRequest request) throws IOException {
+    public void exportList(@RequestBody SampleDispatchListRequest request) throws IOException {
         List<SampleDispatchListResponse> list;
         if (!CollectionUtils.isEmpty(request.getIds())) {
             list = dispatchService.listByIds(request.getIds());
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java
index cdc77fc..d120fd4 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java
@@ -7,6 +7,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.business.labExecutive.*;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.business.IBusinessLabExecutiveInfoService;
@@ -14,6 +15,7 @@
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.*;
 
@@ -32,7 +34,7 @@
     @Autowired
     private IBusinessLabExecutiveInfoService labExecutiveInfoService;
 
-    @ApiOperation("实验室检测-部门检测-查询各状态列表（待检测、检测中、检测完）")
+    @ApiOperation("实验室任务-查询各状态列表（待检测、检测中、检测完）")
     @PostMapping("/deptExecutive/List")
     public ReturnDTO<PageInfoBT<SampleLabExecutiveListResponse>> queryDeptExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
@@ -43,10 +45,19 @@
         return ReturnUtil.success(super.packForBT(labExecutiveInfoService.deptLabExecutiveListPage(page, labExecutiveListRequest)));
     }
 
-    /**
-     * 实验室检测-我的检测-查询各状态列表（待检测、检测中、检测完）
-     */
-    @ApiOperation("实验室检测-我的检测-查询各状态列表（待检测、检测中、检测完）")
+    @ApiOperation("实验室任务导出")
+    @PostMapping("/deptExecutive/export")
+    public void deptExportList(@RequestBody @Valid SampleLabExecutiveListRequest request) throws Exception {
+        List<SampleLabExecutiveListResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = labExecutiveInfoService.deptLabExecutiveListByIds(request.getMeasureStatus(), request.getIds());
+        } else {
+            list = labExecutiveInfoService.deptLabExecutiveList(request);
+        }
+        super.exportExcel(SampleLabExecutiveListResponse.class, list, ExportEnum.DEPT_EXECUTIVE_TASK.getSheetName());
+    }
+
+    @ApiOperation("我的任务-查询各状态列表（待检测、检测中、检测完）")
     @PostMapping("/myExecutive/list")
     public ReturnDTO<PageInfoBT<SampleLabExecutiveListResponse>> queryMyExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
@@ -57,19 +68,25 @@
         return ReturnUtil.success(super.packForBT(labExecutiveInfoService.myLabExecutiveListPage(page, labExecutiveListRequest)));
     }
 
-    /**
-     * 实验室检测-我的检测-查询各状态样品数量（待检测、检测中、检测完）
-     */
-    @ApiOperation("实验室检测-我的检测-查询各状态样品数量（待检测、检测中、检测完）")
+    @ApiOperation("我的任务导出")
+    @PostMapping("/myExecutive/export")
+    public void exportList(@RequestBody @Valid SampleLabExecutiveListRequest request) throws Exception {
+        List<SampleLabExecutiveListResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = labExecutiveInfoService.myLabExecutiveListByIds(request.getMeasureStatus(), request.getIds());
+        } else {
+            list = labExecutiveInfoService.myLabExecutiveList(request);
+        }
+        super.exportExcel(SampleLabExecutiveListResponse.class, list, ExportEnum.MY_EXECUTIVE_TASK.getSheetName());
+    }
+
+    @ApiOperation("我的任务-查询各状态样品数量（待检测、检测中、检测完）")
     @GetMapping("/myExecutive/amount")
     public ReturnDTO<List<SampleAmountResponse>> queryMyExecutiveAmount() {
         return ReturnUtil.success(labExecutiveInfoService.myExecutiveAmount());
     }
 
-    /**
-     * 实验室检测-部门检测-分配（分配给具体人员）
-     */
-    @ApiOperation("实验室检测-部门检测-分配按钮（分配给具体人员）")
+    @ApiOperation("实验室任务-分配按钮（分配给具体人员）")
     @PostMapping("/deptExecutive/allocate")
     public ReturnDTO allocateStaff(@RequestBody @Valid SampleAllocateRequest sampleAllocateRequest, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -78,10 +95,7 @@
         return labExecutiveInfoService.allocateStaff(sampleAllocateRequest);
     }
 
-    /**
-     * 实验室检测-我的检测-检定人扫描收入（待检测->检测中）
-     */
-    @ApiOperation("实验室检测-我的检测-检定人扫描收入（待检测->检测中）")
+    @ApiOperation("我的任务-检定人扫描收入（待检测->检测中）")
     @PostMapping("/myExecutive/receive")
     public ReturnDTO sampleReceive(@RequestBody @Valid List<SampleOperateRequest> requestList, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -90,10 +104,7 @@
         return labExecutiveInfoService.sampleReceive(requestList);
     }
 
-    /**
-     * 实验室检测-负责人/检定人扫描检完（检测中->检测完）
-     */
-    @ApiOperation("实验室检测-负责人/检定人扫描检完（检测中->检测完）")
+    @ApiOperation("实验室任务-负责人/检定人扫描检完（检测中->检测完）")
     @PostMapping("/myExecutive/complete")
     public ReturnDTO sampleExecutiveComplete(@RequestBody @Valid List<SampleOperateRequest> requestList, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -102,10 +113,7 @@
         return labExecutiveInfoService.sampleExecutiveComplete(requestList);
     }
 
-    /**
-     * 实验室检测-部门检测/我的检测 编辑（只能修改应出具证书）
-     */
-    @ApiOperation("实验室检测-部门检测/我的检测 编辑（只能修改应出具证书）")
+    @ApiOperation("实验室任务/我的任务 编辑（只能修改应出具证书）")
     @PostMapping("/executive/update")
     public ReturnDTO updateExecutive(@RequestBody @Valid UpdateExecutiveRequest request, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -114,10 +122,7 @@
         return labExecutiveInfoService.updateExecutive(request);
     }
 
-    /**
-     * 实验室检测-部门检测/我的检测 详情
-     */
-    @ApiOperation("实验室检测-部门检测/我的检测 详情")
+    @ApiOperation("实验室任务/我的任务 详情")
     @PostMapping("/executive/detail")
     public ReturnDTO<ExecutiveDetailResponse> executiveDetail(@RequestBody @Valid ExecutiveDetailRequest request, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
@@ -131,7 +136,7 @@
      * 退回后会将下一个要执行的实验室检测状态更新为待分配，将后面的实验室顺序变更为连续（都进行减1）
      * 最后一个检测的实验室退回，等分发员再增加实验室或设备收发中的已收入直接手动点击完成
      */
-    @ApiOperation("实验室检测-部门检测/我的检测 退回（待检测/检测中->退回）")
+    @ApiOperation("实验室任务/我的任务 退回（待检测/检测中->退回）")
     @PostMapping("/executive/sendBack")
     public ReturnDTO executiveSendBack(@RequestBody @Valid ExecutiveSendBackRequest request, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -140,9 +145,6 @@
         return labExecutiveInfoService.sampleExecutiveSendBack(request);
     }
 
-    /**
-     * 分发员编辑实验室检测列表
-     */
     @ApiOperation("分发员编辑实验室检测列表")
     @PostMapping("/handOut/updateList")
     public ReturnDTO updateExecutiveList(@RequestBody @Valid UpdateExecutiveListRequest request, BindingResult bindingResult) {
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java
index 48a67ed..0c04f31 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java
@@ -10,6 +10,7 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.resource.customer.CustomerApprovalListRequest;
 import com.casic.missiles.dto.resource.customer.CustomerSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceCustomerInfo;
@@ -26,6 +27,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -55,6 +57,13 @@
         return customerInfoService.saveCustomerInfo(request);
     }
 
+    @ApiOperation("委托方名录导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody CustomerApprovalListRequest request) throws Exception {
+        List<BizResourceCustomerInfo> list = super.exportList(request);
+        super.exportExcel(BizResourceCustomerInfo.class, list, ExportEnum.CUSTOMER_INFO.getSheetName());
+    }
+
     @ApiOperation("委托方人员列表（分页）")
     @PostMapping("/person/listPage")
     public ReturnDTO<PageInfoBT<BizResourceCustomerStaff>> personListPage(@RequestBody IdDTO idDto) {
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
index 972ed4b..6418ea5 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
@@ -5,6 +5,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.resource.customer.SuggestFormApprovalListRequest;
 import com.casic.missiles.dto.resource.customer.SuggestFormSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceCustomerSuggestForm;
@@ -20,6 +21,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -50,4 +52,11 @@
         return suggestFormService.saveSuggestForm(request);
     }
 
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody SuggestFormApprovalListRequest request) throws Exception {
+        List<BizResourceCustomerSuggestForm> list = super.exportList(request);
+        super.exportExcel(BizResourceCustomerSuggestForm.class, list, ExportEnum.CUSTOMER_SUGGEST_FORM.getSheetName());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java
index 1934d1a..9e07eab 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java
@@ -15,12 +15,16 @@
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.resource.IEnvEnvironmentRecordConfigService;
 import com.casic.missiles.service.resource.IEnvEnvironmentRecordDataService;
+import com.casic.missiles.service.resource.IEnvLocationInfoService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
 import java.util.List;
@@ -39,6 +43,8 @@
     private IEnvEnvironmentRecordDataService environmentRecordDataService;
     @Autowired
     private IEnvEnvironmentRecordConfigService environmentRecordConfigService;
+    @Autowired
+    private IEnvLocationInfoService locationInfoService;
 
     @ApiOperation("环境记录单数据列表/详情")
     @PostMapping("/data/listPage")
@@ -95,4 +101,11 @@
         });
         return environmentRecordConfigService.deleteEnvironmentRecordConfig(idDTO.getId());
     }
+
+    @ApiOperation("地点列表")
+    @PostMapping("/location/listPage")
+    public ReturnDTO<PageInfoBT<LocationListResponse>> locationListPage(@RequestBody @Valid LocationListRequest request) {
+        Page<LocationListResponse> page = PageFactory.defaultPage();
+        return ReturnUtil.success(super.packForBT(locationInfoService.listPage(page, request)));
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java
index 82efe3f..e9561fa 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java
@@ -10,6 +10,7 @@
 import com.casic.missiles.dto.resource.seal.SealLogListRequest;
 import com.casic.missiles.dto.resource.seal.SealNoteApprovalListRequest;
 import com.casic.missiles.dto.resource.seal.SealNoteSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceSealUseLog;
@@ -27,6 +28,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -58,6 +60,13 @@
         return sealUseNoteService.saveSeal(request);
     }
 
+    @ApiOperation("印章使用登记导出（列表和导出中去掉经办人和监印人）")
+    @PostMapping("/listExport")
+    public void export(@RequestBody SealNoteApprovalListRequest request) throws Exception {
+        List<BizResourceSealUseNote> list = super.exportList(request);
+        super.exportExcel(BizResourceSealUseNote.class, list, ExportEnum.SEAL_NOTE.getSheetName());
+    }
+
     // TODO: 2023/7/28 印章使用日志：系统中使用印章时插入数据库
 
     @ApiOperation("印章使用日志列表（分页）")

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java
index bb0c50f..13a699b 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java
@@ -12,6 +12,7 @@
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.IGeneralApprovalService;
+import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
@@ -19,6 +20,7 @@
 import org.springframework.web.bind.annotation.RequestBody;
 
 import javax.validation.Valid;
+import java.util.List;
 import java.util.Objects;
 
 /**
@@ -117,4 +119,17 @@
         }
         return baseApprovalService.failUpdate(request);
     }
+
+    public List<O> exportList(@RequestBody @Valid R request) throws Exception {
+        List<O> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = baseApprovalService.listExportByIds(request.getIds());
+        } else {
+            list = baseApprovalService.listExport(request);
+        }
+        for (O record : list) {
+            DictCodeUtils.convertDictCodeToName(record);
+        }
+        return list;
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java
index 8a90961..d775831 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java
@@ -5,6 +5,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.business.certificate.CertificateChangeApplyApprovalListRequest;
 import com.casic.missiles.dto.business.certificate.CertificateChangeApplySaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessCertificateChangeApply;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
@@ -20,6 +21,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -48,4 +50,12 @@
         }
         return changeApplyService.saveChangeApply(request);
     }
+
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody CertificateChangeApplyApprovalListRequest request) throws Exception {
+        List<BizBusinessCertificateChangeApply> list = super.exportList(request);
+        super.exportExcel(BizBusinessCertificateChangeApply.class, list, ExportEnum.CERTIFICATE_CHANGE_APPLY.getSheetName());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java
index 5fc4b07..af8230e 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java
@@ -9,6 +9,7 @@
 import com.casic.missiles.dto.business.certificate.CertificatePrintApprovalListRequest;
 import com.casic.missiles.dto.business.certificate.CertificatePrintListResponse;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.enums.business.CertificatePrintStatusEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessCertificatePrintLog;
@@ -18,10 +19,16 @@
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.io.IOException;
+import java.util.List;
 import java.util.Objects;
 
 /**
@@ -98,4 +105,16 @@
         });
         return certificatePrintService.certificatePrintLog(idDTO.getId());
     }
+
+    @ApiOperation("证书打印审批导出")
+    @PostMapping("/listExport")
+    public void exportList(@RequestBody CertificatePrintApprovalListRequest request) throws IOException {
+        List<CertificatePrintListResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = certificatePrintService.listByIds(request.getIds());
+        } else {
+            list = certificatePrintService.list(request);
+        }
+        super.exportExcel(CertificatePrintListResponse.class, list, ExportEnum.CERTIFICATE_PRINT.getSheetName());
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java
index 63b06dc..6b2efd5 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java
@@ -6,6 +6,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.business.certificate.CertificateReportApprovalListRequest;
 import com.casic.missiles.dto.business.certificate.CertificateReportSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessCertificateReport;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
@@ -21,6 +22,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -50,7 +52,7 @@
         return certificateReportService.saveCertificateReport(request);
     }
 
-    @ApiOperation("证书审批详情（基本信息）")
+    @ApiOperation("详情（基本信息）")
     @PostMapping("/detail")
     public ReturnDTO<BizBusinessCertificateReport> detail(@RequestBody @Valid BaseDetailRequest request, BindingResult bindingResult) throws Exception {
         if(bindingResult.hasErrors()){
@@ -59,4 +61,11 @@
         return certificateReportService.detail(request);
     }
 
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody CertificateReportApprovalListRequest request) throws Exception {
+        List<BizBusinessCertificateReport> list = super.exportList(request);
+        super.exportExcel(BizBusinessCertificateReport.class, list, ExportEnum.CERTIFICATE_REPORT.getSheetName());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java
index 46b26bd..57c0809 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java
@@ -10,20 +10,21 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.business.identify.IdentifyListRequest;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessIdentifyInfo;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.business.IBizBusinessIdentifyInfoService;
+import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import javax.validation.Valid;
+import java.util.List;
 import java.util.Objects;
 
 /**
@@ -57,16 +58,13 @@
         return identifyInfoService.addIdentify(identifyInfo);
     }
 
-    @ApiOperation("标识打印更新")
+    @ApiOperation("标识打印更新（更新打印时间）")
     @PostMapping("/update")
-    public ReturnDTO updateIdentify(@RequestBody @Valid BizBusinessIdentifyInfo identifyInfo, BindingResult bindingResult) {
-        Assert.isFalse(Objects.isNull(identifyInfo.getId()), () -> {
+    public ReturnDTO updateIdentify(@RequestBody @Valid IdDTO idDTO) {
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        Assert.isFalse(bindingResult.hasErrors(), () -> {
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        });
-        return identifyInfoService.updateIdentify(identifyInfo);
+        return identifyInfoService.updateIdentify(idDTO.getId());
     }
 
     @ApiOperation("标识打印删除")
@@ -77,4 +75,37 @@
         });
         return identifyInfoService.deleteIdentify(idDTO.getId());
     }
+
+    @ApiOperation("标识打印导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody @Valid IdentifyListRequest request, BindingResult bindingResult) throws Exception {
+        if (bindingResult.hasErrors()) {
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        List<BizBusinessIdentifyInfo> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = identifyInfoService.listByIds(request.getIds());
+        } else {
+            list = identifyInfoService.list(request);
+        }
+        for (BizBusinessIdentifyInfo record : list) {
+            DictCodeUtils.convertDictCodeToName(record);
+        }
+        super.exportExcel(BizBusinessIdentifyInfo.class, list, ExportEnum.IDENTIFY_EXPORT.getSheetName());
+    }
+
+
+    // TODO: 2023/8/23 查询设备信息，4个底部按钮查设备（按钮的作用就是前端用来调不同接口、用来区分中间即将展示的标识），前端弹窗选设备，在确定保存时前端根据底部按钮判断传入设备类型deviceType字典code
+    // TODO: 2023/8/23 接口：查受检设备（第1个按钮），查设备台账（后3个按钮同一接口），查询之后前端根据标志类型的不同加到中间页面时进行判断（按产品给的对应表）
+    // TODO: 2023/8/23 提供二维码接口，前端在加到中间页面时调用一下
+
+    @ApiOperation("设备二维码")
+    @PostMapping("/equipment/qrCode")
+    public ReturnDTO<String> equipmentQrCode(@RequestBody @Valid IdDTO idDTO) {
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return identifyInfoService.equipmentQrCode(idDTO.getId());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java
index 707be6e..7e0453d 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java
@@ -117,7 +117,7 @@
     }
 
     @ApiOperation("任务单导出")
-    @PostMapping("/export")
+    @PostMapping("/listExport")
     public void orderExport(@RequestBody @Valid OrderListRequest request, HttpServletResponse response) {
         businessOrderService.orderExport(request, response);
     }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java
index 529a6ce..51432be 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java
@@ -1,9 +1,28 @@
 package com.casic.missiles.controller.business;
 
+import com.casic.missiles.controller.GeneralApprovalController;
+import com.casic.missiles.dto.BaseApprovalSubmitRequest;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.business.outsource.OutsourceAssessApprovalListRequest;
+import com.casic.missiles.dto.business.outsource.OutsourceAssessSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
+import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.model.business.BizBusinessOutsourceAssess;
+import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
+import com.casic.missiles.service.IGeneralApprovalService;
+import com.casic.missiles.service.business.IBizBusinessOutsourceAssessService;
 import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.BindingResult;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.validation.Valid;
+import java.util.List;
+
 /**
  * <p>
  * 计量检定业务-分包管理-测试、校准或检定工作分包评审表 前端控制器
@@ -15,6 +34,27 @@
 @Api(tags = "分包管理-测试、校准或检定工作分包评审表")
 @RestController
 @RequestMapping("/business/outsource/assess")
-public class BizBusinessOutsourceAssessController {
+public class BizBusinessOutsourceAssessController extends GeneralApprovalController<BizBusinessOutsourceAssess, BizBusinessOutsourceAssess, OutsourceAssessApprovalListRequest, BaseApprovalSubmitRequest> {
+    @Autowired
+    private IBizBusinessOutsourceAssessService outsourceAssessService;
 
+    public BizBusinessOutsourceAssessController(IGeneralApprovalService<BizBusinessOutsourceAssess, BizBusinessOutsourceAssess, OutsourceAssessApprovalListRequest, BaseApprovalSubmitRequest> baseApprovalService) {
+        super(baseApprovalService);
+    }
+
+    @ApiOperation("草稿箱-保存")
+    @PostMapping("/save")
+    public ReturnDTO<OutsourceAssessSaveResponse> saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceAssess request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        return outsourceAssessService.saveOutsourceAssess(request);
+    }
+
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception {
+        List<BizBusinessOutsourceAssess> list = super.exportList(request);
+        super.exportExcel(BizBusinessOutsourceAssess.class, list, ExportEnum.OUTSOURCE_ASSESS.getSheetName());
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java
new file mode 100644
index 0000000..9adef18
--- /dev/null
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java
@@ -0,0 +1,60 @@
+package com.casic.missiles.controller.business;
+
+import com.casic.missiles.controller.GeneralApprovalController;
+import com.casic.missiles.dto.BaseApprovalSubmitRequest;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.business.outsource.OutsourceProtocolApprovalListRequest;
+import com.casic.missiles.dto.business.outsource.OutsourceProtocolSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
+import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.model.business.BizBusinessOutsourceProtocol;
+import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
+import com.casic.missiles.service.IGeneralApprovalService;
+import com.casic.missiles.service.business.IBizBusinessOutsourceProtocolService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.BindingResult;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.validation.Valid;
+import java.util.List;
+
+/**
+ * <p>
+ * 计量检定业务-分包管理-测试、校准或检定工作分包协议书 前端控制器
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-08-24
+ */
+@Api(tags = "分包管理-测试、校准或检定工作分包协议书")
+@RestController
+@RequestMapping("/business/outsource/protocol")
+public class BizBusinessOutsourceProtocolController extends GeneralApprovalController<BizBusinessOutsourceProtocol, BizBusinessOutsourceProtocol, OutsourceProtocolApprovalListRequest, BaseApprovalSubmitRequest> {
+    @Autowired
+    private IBizBusinessOutsourceProtocolService outsourceProtocolService;
+
+    public BizBusinessOutsourceProtocolController(IGeneralApprovalService<BizBusinessOutsourceProtocol, BizBusinessOutsourceProtocol, OutsourceProtocolApprovalListRequest, BaseApprovalSubmitRequest> baseApprovalService) {
+        super(baseApprovalService);
+    }
+
+    @ApiOperation("草稿箱-保存")
+    @PostMapping("/save")
+    public ReturnDTO<OutsourceProtocolSaveResponse> saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceProtocol request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        return outsourceProtocolService.saveOutsourceProtocol(request);
+    }
+
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody OutsourceProtocolApprovalListRequest request) throws Exception {
+        List<BizBusinessOutsourceProtocol> list = super.exportList(request);
+        super.exportExcel(BizBusinessOutsourceProtocol.class, list, ExportEnum.OUTSOURCE_PROTOCOL.getSheetName());
+    }
+}
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java
index 097f645..f0f0943 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java
@@ -17,7 +17,6 @@
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.IGeneralApprovalService;
 import com.casic.missiles.service.business.IBizBusinessOutsourcerInfoService;
-import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -71,19 +70,8 @@
 
     @ApiOperation("分包方导出")
     @PostMapping("/listExport")
-    public void export(@RequestBody @Valid OutsourcerInfoApprovalListRequest request, BindingResult bindingResult) throws Exception {
-        if (bindingResult.hasErrors()) {
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        }
-        List<BizBusinessOutsourcerInfo> list;
-        if (!CollectionUtils.isEmpty(request.getIds())) {
-            list = outsourcerInfoService.listByIds(request.getIds());
-        } else {
-            list = outsourcerInfoService.list(request);
-        }
-        for (BizBusinessOutsourcerInfo record : list) {
-            DictCodeUtils.convertDictCodeToName(record);
-        }
+    public void export(@RequestBody OutsourcerInfoApprovalListRequest request) throws Exception {
+        List<BizBusinessOutsourcerInfo> list = super.exportList(request);
         super.exportExcel(BizBusinessOutsourcerInfo.class, list, ExportEnum.OUTSOURCER_EXPORT.getSheetName());
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java
index c2cbf9f..0410918 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java
@@ -17,11 +17,9 @@
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.IGeneralApprovalService;
 import com.casic.missiles.service.business.IBizBusinessSiteExecutiveInfoService;
-import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -60,7 +58,7 @@
         return siteExecutiveInfoService.saveSiteExecutiveInfo(siteExecutiveInfo);
     }
 
-    @ApiOperation("现场检测详情")
+    @ApiOperation("详情")
     @PostMapping("/detail")
     public ReturnDTO<SiteExecutiveDetailResponse> siteExecutiveDetail(@RequestBody @Valid IdDTO idDTO) throws Exception {
         Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
@@ -69,21 +67,10 @@
         return ReturnUtil.success(siteExecutiveInfoService.detail(idDTO.getId()));
     }
 
-    @ApiOperation("现场检测导出")
+    @ApiOperation("导出")
     @PostMapping("/listExport")
-    public void export(@RequestBody @Valid SiteExecutiveApprovalListRequest request, BindingResult bindingResult) throws Exception {
-        if (bindingResult.hasErrors()) {
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        }
-        List<SiteExecutiveApprovalListResponse> list;
-        if (!CollectionUtils.isEmpty(request.getIds())) {
-            list = siteExecutiveInfoService.listInfoByIds(request.getIds());
-        } else {
-            list = siteExecutiveInfoService.listInfo(request);
-        }
-        for (SiteExecutiveApprovalListResponse record : list) {
-            DictCodeUtils.convertDictCodeToName(record);
-        }
+    public void export(@RequestBody SiteExecutiveApprovalListRequest request) throws Exception {
+        List<SiteExecutiveApprovalListResponse> list = super.exportList(request);
         super.exportExcel(SiteExecutiveApprovalListResponse.class, list, ExportEnum.SITE_EXECUTIVE_EXPORT.getSheetName());
     }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
index 7e793cd..a92e209 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
@@ -55,7 +55,7 @@
 
     @ApiOperation("设备收发列表导出")
     @PostMapping("/export")
-    public void exportList(@RequestBody @Valid SampleDispatchListRequest request) throws IOException {
+    public void exportList(@RequestBody SampleDispatchListRequest request) throws IOException {
         List<SampleDispatchListResponse> list;
         if (!CollectionUtils.isEmpty(request.getIds())) {
             list = dispatchService.listByIds(request.getIds());
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java
index cdc77fc..d120fd4 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java
@@ -7,6 +7,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.business.labExecutive.*;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.business.IBusinessLabExecutiveInfoService;
@@ -14,6 +15,7 @@
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.*;
 
@@ -32,7 +34,7 @@
     @Autowired
     private IBusinessLabExecutiveInfoService labExecutiveInfoService;
 
-    @ApiOperation("实验室检测-部门检测-查询各状态列表（待检测、检测中、检测完）")
+    @ApiOperation("实验室任务-查询各状态列表（待检测、检测中、检测完）")
     @PostMapping("/deptExecutive/List")
     public ReturnDTO<PageInfoBT<SampleLabExecutiveListResponse>> queryDeptExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
@@ -43,10 +45,19 @@
         return ReturnUtil.success(super.packForBT(labExecutiveInfoService.deptLabExecutiveListPage(page, labExecutiveListRequest)));
     }
 
-    /**
-     * 实验室检测-我的检测-查询各状态列表（待检测、检测中、检测完）
-     */
-    @ApiOperation("实验室检测-我的检测-查询各状态列表（待检测、检测中、检测完）")
+    @ApiOperation("实验室任务导出")
+    @PostMapping("/deptExecutive/export")
+    public void deptExportList(@RequestBody @Valid SampleLabExecutiveListRequest request) throws Exception {
+        List<SampleLabExecutiveListResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = labExecutiveInfoService.deptLabExecutiveListByIds(request.getMeasureStatus(), request.getIds());
+        } else {
+            list = labExecutiveInfoService.deptLabExecutiveList(request);
+        }
+        super.exportExcel(SampleLabExecutiveListResponse.class, list, ExportEnum.DEPT_EXECUTIVE_TASK.getSheetName());
+    }
+
+    @ApiOperation("我的任务-查询各状态列表（待检测、检测中、检测完）")
     @PostMapping("/myExecutive/list")
     public ReturnDTO<PageInfoBT<SampleLabExecutiveListResponse>> queryMyExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
@@ -57,19 +68,25 @@
         return ReturnUtil.success(super.packForBT(labExecutiveInfoService.myLabExecutiveListPage(page, labExecutiveListRequest)));
     }
 
-    /**
-     * 实验室检测-我的检测-查询各状态样品数量（待检测、检测中、检测完）
-     */
-    @ApiOperation("实验室检测-我的检测-查询各状态样品数量（待检测、检测中、检测完）")
+    @ApiOperation("我的任务导出")
+    @PostMapping("/myExecutive/export")
+    public void exportList(@RequestBody @Valid SampleLabExecutiveListRequest request) throws Exception {
+        List<SampleLabExecutiveListResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = labExecutiveInfoService.myLabExecutiveListByIds(request.getMeasureStatus(), request.getIds());
+        } else {
+            list = labExecutiveInfoService.myLabExecutiveList(request);
+        }
+        super.exportExcel(SampleLabExecutiveListResponse.class, list, ExportEnum.MY_EXECUTIVE_TASK.getSheetName());
+    }
+
+    @ApiOperation("我的任务-查询各状态样品数量（待检测、检测中、检测完）")
     @GetMapping("/myExecutive/amount")
     public ReturnDTO<List<SampleAmountResponse>> queryMyExecutiveAmount() {
         return ReturnUtil.success(labExecutiveInfoService.myExecutiveAmount());
     }
 
-    /**
-     * 实验室检测-部门检测-分配（分配给具体人员）
-     */
-    @ApiOperation("实验室检测-部门检测-分配按钮（分配给具体人员）")
+    @ApiOperation("实验室任务-分配按钮（分配给具体人员）")
     @PostMapping("/deptExecutive/allocate")
     public ReturnDTO allocateStaff(@RequestBody @Valid SampleAllocateRequest sampleAllocateRequest, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -78,10 +95,7 @@
         return labExecutiveInfoService.allocateStaff(sampleAllocateRequest);
     }
 
-    /**
-     * 实验室检测-我的检测-检定人扫描收入（待检测->检测中）
-     */
-    @ApiOperation("实验室检测-我的检测-检定人扫描收入（待检测->检测中）")
+    @ApiOperation("我的任务-检定人扫描收入（待检测->检测中）")
     @PostMapping("/myExecutive/receive")
     public ReturnDTO sampleReceive(@RequestBody @Valid List<SampleOperateRequest> requestList, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -90,10 +104,7 @@
         return labExecutiveInfoService.sampleReceive(requestList);
     }
 
-    /**
-     * 实验室检测-负责人/检定人扫描检完（检测中->检测完）
-     */
-    @ApiOperation("实验室检测-负责人/检定人扫描检完（检测中->检测完）")
+    @ApiOperation("实验室任务-负责人/检定人扫描检完（检测中->检测完）")
     @PostMapping("/myExecutive/complete")
     public ReturnDTO sampleExecutiveComplete(@RequestBody @Valid List<SampleOperateRequest> requestList, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -102,10 +113,7 @@
         return labExecutiveInfoService.sampleExecutiveComplete(requestList);
     }
 
-    /**
-     * 实验室检测-部门检测/我的检测 编辑（只能修改应出具证书）
-     */
-    @ApiOperation("实验室检测-部门检测/我的检测 编辑（只能修改应出具证书）")
+    @ApiOperation("实验室任务/我的任务 编辑（只能修改应出具证书）")
     @PostMapping("/executive/update")
     public ReturnDTO updateExecutive(@RequestBody @Valid UpdateExecutiveRequest request, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -114,10 +122,7 @@
         return labExecutiveInfoService.updateExecutive(request);
     }
 
-    /**
-     * 实验室检测-部门检测/我的检测 详情
-     */
-    @ApiOperation("实验室检测-部门检测/我的检测 详情")
+    @ApiOperation("实验室任务/我的任务 详情")
     @PostMapping("/executive/detail")
     public ReturnDTO<ExecutiveDetailResponse> executiveDetail(@RequestBody @Valid ExecutiveDetailRequest request, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
@@ -131,7 +136,7 @@
      * 退回后会将下一个要执行的实验室检测状态更新为待分配，将后面的实验室顺序变更为连续（都进行减1）
      * 最后一个检测的实验室退回，等分发员再增加实验室或设备收发中的已收入直接手动点击完成
      */
-    @ApiOperation("实验室检测-部门检测/我的检测 退回（待检测/检测中->退回）")
+    @ApiOperation("实验室任务/我的任务 退回（待检测/检测中->退回）")
     @PostMapping("/executive/sendBack")
     public ReturnDTO executiveSendBack(@RequestBody @Valid ExecutiveSendBackRequest request, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -140,9 +145,6 @@
         return labExecutiveInfoService.sampleExecutiveSendBack(request);
     }
 
-    /**
-     * 分发员编辑实验室检测列表
-     */
     @ApiOperation("分发员编辑实验室检测列表")
     @PostMapping("/handOut/updateList")
     public ReturnDTO updateExecutiveList(@RequestBody @Valid UpdateExecutiveListRequest request, BindingResult bindingResult) {
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java
index 48a67ed..0c04f31 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java
@@ -10,6 +10,7 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.resource.customer.CustomerApprovalListRequest;
 import com.casic.missiles.dto.resource.customer.CustomerSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceCustomerInfo;
@@ -26,6 +27,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -55,6 +57,13 @@
         return customerInfoService.saveCustomerInfo(request);
     }
 
+    @ApiOperation("委托方名录导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody CustomerApprovalListRequest request) throws Exception {
+        List<BizResourceCustomerInfo> list = super.exportList(request);
+        super.exportExcel(BizResourceCustomerInfo.class, list, ExportEnum.CUSTOMER_INFO.getSheetName());
+    }
+
     @ApiOperation("委托方人员列表（分页）")
     @PostMapping("/person/listPage")
     public ReturnDTO<PageInfoBT<BizResourceCustomerStaff>> personListPage(@RequestBody IdDTO idDto) {
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
index 972ed4b..6418ea5 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
@@ -5,6 +5,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.resource.customer.SuggestFormApprovalListRequest;
 import com.casic.missiles.dto.resource.customer.SuggestFormSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceCustomerSuggestForm;
@@ -20,6 +21,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -50,4 +52,11 @@
         return suggestFormService.saveSuggestForm(request);
     }
 
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody SuggestFormApprovalListRequest request) throws Exception {
+        List<BizResourceCustomerSuggestForm> list = super.exportList(request);
+        super.exportExcel(BizResourceCustomerSuggestForm.class, list, ExportEnum.CUSTOMER_SUGGEST_FORM.getSheetName());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java
index 1934d1a..9e07eab 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java
@@ -15,12 +15,16 @@
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.resource.IEnvEnvironmentRecordConfigService;
 import com.casic.missiles.service.resource.IEnvEnvironmentRecordDataService;
+import com.casic.missiles.service.resource.IEnvLocationInfoService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
 import java.util.List;
@@ -39,6 +43,8 @@
     private IEnvEnvironmentRecordDataService environmentRecordDataService;
     @Autowired
     private IEnvEnvironmentRecordConfigService environmentRecordConfigService;
+    @Autowired
+    private IEnvLocationInfoService locationInfoService;
 
     @ApiOperation("环境记录单数据列表/详情")
     @PostMapping("/data/listPage")
@@ -95,4 +101,11 @@
         });
         return environmentRecordConfigService.deleteEnvironmentRecordConfig(idDTO.getId());
     }
+
+    @ApiOperation("地点列表")
+    @PostMapping("/location/listPage")
+    public ReturnDTO<PageInfoBT<LocationListResponse>> locationListPage(@RequestBody @Valid LocationListRequest request) {
+        Page<LocationListResponse> page = PageFactory.defaultPage();
+        return ReturnUtil.success(super.packForBT(locationInfoService.listPage(page, request)));
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java
index 82efe3f..e9561fa 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java
@@ -10,6 +10,7 @@
 import com.casic.missiles.dto.resource.seal.SealLogListRequest;
 import com.casic.missiles.dto.resource.seal.SealNoteApprovalListRequest;
 import com.casic.missiles.dto.resource.seal.SealNoteSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceSealUseLog;
@@ -27,6 +28,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -58,6 +60,13 @@
         return sealUseNoteService.saveSeal(request);
     }
 
+    @ApiOperation("印章使用登记导出（列表和导出中去掉经办人和监印人）")
+    @PostMapping("/listExport")
+    public void export(@RequestBody SealNoteApprovalListRequest request) throws Exception {
+        List<BizResourceSealUseNote> list = super.exportList(request);
+        super.exportExcel(BizResourceSealUseNote.class, list, ExportEnum.SEAL_NOTE.getSheetName());
+    }
+
     // TODO: 2023/7/28 印章使用日志：系统中使用印章时插入数据库
 
     @ApiOperation("印章使用日志列表（分页）")
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java
index 9b674fc..06b6521 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java
@@ -9,16 +9,20 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.resource.staff.StaffCertRequest;
 import com.casic.missiles.dto.resource.staff.StaffCertResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.service.resource.IBizResourceStaffInfoService;
 import com.casic.missiles.service.resource.IBizResourceStaffVerifierService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.List;
+
 /**
  * @Description:
  * @Author: wangpeng
@@ -41,9 +45,21 @@
         return ReturnUtil.success(super.packForBT(responsePage));
     }
 
+    @ApiOperation("证书逾期提醒导出")
+    @PostMapping("/listExport")
+    public void exportList(@RequestBody StaffCertRequest request) throws Exception {
+        List<StaffCertResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = staffInfoService.certListByIds(request.getIds());
+        } else {
+            list = staffInfoService.certList(request);
+        }
+        super.exportExcel(StaffCertResponse.class, list, ExportEnum.STAFF_CERTIFICATE_EXPIRE.getSheetName());
+    }
+
     @ApiOperation("证书逾期提醒")
     @PostMapping("/expirationReminder")
-    public ReturnDTO expirationReminder(@RequestBody IdDTO idDto) {
-        return verifierService.expirationReminder(idDto);
+    public ReturnDTO expirationReminder(@RequestBody IdDTO idDTO) {
+        return verifierService.expirationReminder(idDTO);
     }
 }

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java
index bb0c50f..13a699b 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java
@@ -12,6 +12,7 @@
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.IGeneralApprovalService;
+import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
@@ -19,6 +20,7 @@
 import org.springframework.web.bind.annotation.RequestBody;
 
 import javax.validation.Valid;
+import java.util.List;
 import java.util.Objects;
 
 /**
@@ -117,4 +119,17 @@
         }
         return baseApprovalService.failUpdate(request);
     }
+
+    public List<O> exportList(@RequestBody @Valid R request) throws Exception {
+        List<O> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = baseApprovalService.listExportByIds(request.getIds());
+        } else {
+            list = baseApprovalService.listExport(request);
+        }
+        for (O record : list) {
+            DictCodeUtils.convertDictCodeToName(record);
+        }
+        return list;
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java
index 8a90961..d775831 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java
@@ -5,6 +5,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.business.certificate.CertificateChangeApplyApprovalListRequest;
 import com.casic.missiles.dto.business.certificate.CertificateChangeApplySaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessCertificateChangeApply;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
@@ -20,6 +21,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -48,4 +50,12 @@
         }
         return changeApplyService.saveChangeApply(request);
     }
+
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody CertificateChangeApplyApprovalListRequest request) throws Exception {
+        List<BizBusinessCertificateChangeApply> list = super.exportList(request);
+        super.exportExcel(BizBusinessCertificateChangeApply.class, list, ExportEnum.CERTIFICATE_CHANGE_APPLY.getSheetName());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java
index 5fc4b07..af8230e 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java
@@ -9,6 +9,7 @@
 import com.casic.missiles.dto.business.certificate.CertificatePrintApprovalListRequest;
 import com.casic.missiles.dto.business.certificate.CertificatePrintListResponse;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.enums.business.CertificatePrintStatusEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessCertificatePrintLog;
@@ -18,10 +19,16 @@
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.io.IOException;
+import java.util.List;
 import java.util.Objects;
 
 /**
@@ -98,4 +105,16 @@
         });
         return certificatePrintService.certificatePrintLog(idDTO.getId());
     }
+
+    @ApiOperation("证书打印审批导出")
+    @PostMapping("/listExport")
+    public void exportList(@RequestBody CertificatePrintApprovalListRequest request) throws IOException {
+        List<CertificatePrintListResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = certificatePrintService.listByIds(request.getIds());
+        } else {
+            list = certificatePrintService.list(request);
+        }
+        super.exportExcel(CertificatePrintListResponse.class, list, ExportEnum.CERTIFICATE_PRINT.getSheetName());
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java
index 63b06dc..6b2efd5 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java
@@ -6,6 +6,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.business.certificate.CertificateReportApprovalListRequest;
 import com.casic.missiles.dto.business.certificate.CertificateReportSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessCertificateReport;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
@@ -21,6 +22,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -50,7 +52,7 @@
         return certificateReportService.saveCertificateReport(request);
     }
 
-    @ApiOperation("证书审批详情（基本信息）")
+    @ApiOperation("详情（基本信息）")
     @PostMapping("/detail")
     public ReturnDTO<BizBusinessCertificateReport> detail(@RequestBody @Valid BaseDetailRequest request, BindingResult bindingResult) throws Exception {
         if(bindingResult.hasErrors()){
@@ -59,4 +61,11 @@
         return certificateReportService.detail(request);
     }
 
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody CertificateReportApprovalListRequest request) throws Exception {
+        List<BizBusinessCertificateReport> list = super.exportList(request);
+        super.exportExcel(BizBusinessCertificateReport.class, list, ExportEnum.CERTIFICATE_REPORT.getSheetName());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java
index 46b26bd..57c0809 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java
@@ -10,20 +10,21 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.business.identify.IdentifyListRequest;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessIdentifyInfo;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.business.IBizBusinessIdentifyInfoService;
+import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import javax.validation.Valid;
+import java.util.List;
 import java.util.Objects;
 
 /**
@@ -57,16 +58,13 @@
         return identifyInfoService.addIdentify(identifyInfo);
     }
 
-    @ApiOperation("标识打印更新")
+    @ApiOperation("标识打印更新（更新打印时间）")
     @PostMapping("/update")
-    public ReturnDTO updateIdentify(@RequestBody @Valid BizBusinessIdentifyInfo identifyInfo, BindingResult bindingResult) {
-        Assert.isFalse(Objects.isNull(identifyInfo.getId()), () -> {
+    public ReturnDTO updateIdentify(@RequestBody @Valid IdDTO idDTO) {
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        Assert.isFalse(bindingResult.hasErrors(), () -> {
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        });
-        return identifyInfoService.updateIdentify(identifyInfo);
+        return identifyInfoService.updateIdentify(idDTO.getId());
     }
 
     @ApiOperation("标识打印删除")
@@ -77,4 +75,37 @@
         });
         return identifyInfoService.deleteIdentify(idDTO.getId());
     }
+
+    @ApiOperation("标识打印导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody @Valid IdentifyListRequest request, BindingResult bindingResult) throws Exception {
+        if (bindingResult.hasErrors()) {
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        List<BizBusinessIdentifyInfo> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = identifyInfoService.listByIds(request.getIds());
+        } else {
+            list = identifyInfoService.list(request);
+        }
+        for (BizBusinessIdentifyInfo record : list) {
+            DictCodeUtils.convertDictCodeToName(record);
+        }
+        super.exportExcel(BizBusinessIdentifyInfo.class, list, ExportEnum.IDENTIFY_EXPORT.getSheetName());
+    }
+
+
+    // TODO: 2023/8/23 查询设备信息，4个底部按钮查设备（按钮的作用就是前端用来调不同接口、用来区分中间即将展示的标识），前端弹窗选设备，在确定保存时前端根据底部按钮判断传入设备类型deviceType字典code
+    // TODO: 2023/8/23 接口：查受检设备（第1个按钮），查设备台账（后3个按钮同一接口），查询之后前端根据标志类型的不同加到中间页面时进行判断（按产品给的对应表）
+    // TODO: 2023/8/23 提供二维码接口，前端在加到中间页面时调用一下
+
+    @ApiOperation("设备二维码")
+    @PostMapping("/equipment/qrCode")
+    public ReturnDTO<String> equipmentQrCode(@RequestBody @Valid IdDTO idDTO) {
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return identifyInfoService.equipmentQrCode(idDTO.getId());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java
index 707be6e..7e0453d 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java
@@ -117,7 +117,7 @@
     }
 
     @ApiOperation("任务单导出")
-    @PostMapping("/export")
+    @PostMapping("/listExport")
     public void orderExport(@RequestBody @Valid OrderListRequest request, HttpServletResponse response) {
         businessOrderService.orderExport(request, response);
     }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java
index 529a6ce..51432be 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java
@@ -1,9 +1,28 @@
 package com.casic.missiles.controller.business;
 
+import com.casic.missiles.controller.GeneralApprovalController;
+import com.casic.missiles.dto.BaseApprovalSubmitRequest;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.business.outsource.OutsourceAssessApprovalListRequest;
+import com.casic.missiles.dto.business.outsource.OutsourceAssessSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
+import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.model.business.BizBusinessOutsourceAssess;
+import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
+import com.casic.missiles.service.IGeneralApprovalService;
+import com.casic.missiles.service.business.IBizBusinessOutsourceAssessService;
 import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.BindingResult;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.validation.Valid;
+import java.util.List;
+
 /**
  * <p>
  * 计量检定业务-分包管理-测试、校准或检定工作分包评审表 前端控制器
@@ -15,6 +34,27 @@
 @Api(tags = "分包管理-测试、校准或检定工作分包评审表")
 @RestController
 @RequestMapping("/business/outsource/assess")
-public class BizBusinessOutsourceAssessController {
+public class BizBusinessOutsourceAssessController extends GeneralApprovalController<BizBusinessOutsourceAssess, BizBusinessOutsourceAssess, OutsourceAssessApprovalListRequest, BaseApprovalSubmitRequest> {
+    @Autowired
+    private IBizBusinessOutsourceAssessService outsourceAssessService;
 
+    public BizBusinessOutsourceAssessController(IGeneralApprovalService<BizBusinessOutsourceAssess, BizBusinessOutsourceAssess, OutsourceAssessApprovalListRequest, BaseApprovalSubmitRequest> baseApprovalService) {
+        super(baseApprovalService);
+    }
+
+    @ApiOperation("草稿箱-保存")
+    @PostMapping("/save")
+    public ReturnDTO<OutsourceAssessSaveResponse> saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceAssess request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        return outsourceAssessService.saveOutsourceAssess(request);
+    }
+
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception {
+        List<BizBusinessOutsourceAssess> list = super.exportList(request);
+        super.exportExcel(BizBusinessOutsourceAssess.class, list, ExportEnum.OUTSOURCE_ASSESS.getSheetName());
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java
new file mode 100644
index 0000000..9adef18
--- /dev/null
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java
@@ -0,0 +1,60 @@
+package com.casic.missiles.controller.business;
+
+import com.casic.missiles.controller.GeneralApprovalController;
+import com.casic.missiles.dto.BaseApprovalSubmitRequest;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.business.outsource.OutsourceProtocolApprovalListRequest;
+import com.casic.missiles.dto.business.outsource.OutsourceProtocolSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
+import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.model.business.BizBusinessOutsourceProtocol;
+import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
+import com.casic.missiles.service.IGeneralApprovalService;
+import com.casic.missiles.service.business.IBizBusinessOutsourceProtocolService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.BindingResult;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.validation.Valid;
+import java.util.List;
+
+/**
+ * <p>
+ * 计量检定业务-分包管理-测试、校准或检定工作分包协议书 前端控制器
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-08-24
+ */
+@Api(tags = "分包管理-测试、校准或检定工作分包协议书")
+@RestController
+@RequestMapping("/business/outsource/protocol")
+public class BizBusinessOutsourceProtocolController extends GeneralApprovalController<BizBusinessOutsourceProtocol, BizBusinessOutsourceProtocol, OutsourceProtocolApprovalListRequest, BaseApprovalSubmitRequest> {
+    @Autowired
+    private IBizBusinessOutsourceProtocolService outsourceProtocolService;
+
+    public BizBusinessOutsourceProtocolController(IGeneralApprovalService<BizBusinessOutsourceProtocol, BizBusinessOutsourceProtocol, OutsourceProtocolApprovalListRequest, BaseApprovalSubmitRequest> baseApprovalService) {
+        super(baseApprovalService);
+    }
+
+    @ApiOperation("草稿箱-保存")
+    @PostMapping("/save")
+    public ReturnDTO<OutsourceProtocolSaveResponse> saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceProtocol request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        return outsourceProtocolService.saveOutsourceProtocol(request);
+    }
+
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody OutsourceProtocolApprovalListRequest request) throws Exception {
+        List<BizBusinessOutsourceProtocol> list = super.exportList(request);
+        super.exportExcel(BizBusinessOutsourceProtocol.class, list, ExportEnum.OUTSOURCE_PROTOCOL.getSheetName());
+    }
+}
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java
index 097f645..f0f0943 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java
@@ -17,7 +17,6 @@
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.IGeneralApprovalService;
 import com.casic.missiles.service.business.IBizBusinessOutsourcerInfoService;
-import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -71,19 +70,8 @@
 
     @ApiOperation("分包方导出")
     @PostMapping("/listExport")
-    public void export(@RequestBody @Valid OutsourcerInfoApprovalListRequest request, BindingResult bindingResult) throws Exception {
-        if (bindingResult.hasErrors()) {
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        }
-        List<BizBusinessOutsourcerInfo> list;
-        if (!CollectionUtils.isEmpty(request.getIds())) {
-            list = outsourcerInfoService.listByIds(request.getIds());
-        } else {
-            list = outsourcerInfoService.list(request);
-        }
-        for (BizBusinessOutsourcerInfo record : list) {
-            DictCodeUtils.convertDictCodeToName(record);
-        }
+    public void export(@RequestBody OutsourcerInfoApprovalListRequest request) throws Exception {
+        List<BizBusinessOutsourcerInfo> list = super.exportList(request);
         super.exportExcel(BizBusinessOutsourcerInfo.class, list, ExportEnum.OUTSOURCER_EXPORT.getSheetName());
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java
index c2cbf9f..0410918 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java
@@ -17,11 +17,9 @@
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.IGeneralApprovalService;
 import com.casic.missiles.service.business.IBizBusinessSiteExecutiveInfoService;
-import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -60,7 +58,7 @@
         return siteExecutiveInfoService.saveSiteExecutiveInfo(siteExecutiveInfo);
     }
 
-    @ApiOperation("现场检测详情")
+    @ApiOperation("详情")
     @PostMapping("/detail")
     public ReturnDTO<SiteExecutiveDetailResponse> siteExecutiveDetail(@RequestBody @Valid IdDTO idDTO) throws Exception {
         Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
@@ -69,21 +67,10 @@
         return ReturnUtil.success(siteExecutiveInfoService.detail(idDTO.getId()));
     }
 
-    @ApiOperation("现场检测导出")
+    @ApiOperation("导出")
     @PostMapping("/listExport")
-    public void export(@RequestBody @Valid SiteExecutiveApprovalListRequest request, BindingResult bindingResult) throws Exception {
-        if (bindingResult.hasErrors()) {
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        }
-        List<SiteExecutiveApprovalListResponse> list;
-        if (!CollectionUtils.isEmpty(request.getIds())) {
-            list = siteExecutiveInfoService.listInfoByIds(request.getIds());
-        } else {
-            list = siteExecutiveInfoService.listInfo(request);
-        }
-        for (SiteExecutiveApprovalListResponse record : list) {
-            DictCodeUtils.convertDictCodeToName(record);
-        }
+    public void export(@RequestBody SiteExecutiveApprovalListRequest request) throws Exception {
+        List<SiteExecutiveApprovalListResponse> list = super.exportList(request);
         super.exportExcel(SiteExecutiveApprovalListResponse.class, list, ExportEnum.SITE_EXECUTIVE_EXPORT.getSheetName());
     }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
index 7e793cd..a92e209 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
@@ -55,7 +55,7 @@
 
     @ApiOperation("设备收发列表导出")
     @PostMapping("/export")
-    public void exportList(@RequestBody @Valid SampleDispatchListRequest request) throws IOException {
+    public void exportList(@RequestBody SampleDispatchListRequest request) throws IOException {
         List<SampleDispatchListResponse> list;
         if (!CollectionUtils.isEmpty(request.getIds())) {
             list = dispatchService.listByIds(request.getIds());
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java
index cdc77fc..d120fd4 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java
@@ -7,6 +7,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.business.labExecutive.*;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.business.IBusinessLabExecutiveInfoService;
@@ -14,6 +15,7 @@
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.*;
 
@@ -32,7 +34,7 @@
     @Autowired
     private IBusinessLabExecutiveInfoService labExecutiveInfoService;
 
-    @ApiOperation("实验室检测-部门检测-查询各状态列表（待检测、检测中、检测完）")
+    @ApiOperation("实验室任务-查询各状态列表（待检测、检测中、检测完）")
     @PostMapping("/deptExecutive/List")
     public ReturnDTO<PageInfoBT<SampleLabExecutiveListResponse>> queryDeptExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
@@ -43,10 +45,19 @@
         return ReturnUtil.success(super.packForBT(labExecutiveInfoService.deptLabExecutiveListPage(page, labExecutiveListRequest)));
     }
 
-    /**
-     * 实验室检测-我的检测-查询各状态列表（待检测、检测中、检测完）
-     */
-    @ApiOperation("实验室检测-我的检测-查询各状态列表（待检测、检测中、检测完）")
+    @ApiOperation("实验室任务导出")
+    @PostMapping("/deptExecutive/export")
+    public void deptExportList(@RequestBody @Valid SampleLabExecutiveListRequest request) throws Exception {
+        List<SampleLabExecutiveListResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = labExecutiveInfoService.deptLabExecutiveListByIds(request.getMeasureStatus(), request.getIds());
+        } else {
+            list = labExecutiveInfoService.deptLabExecutiveList(request);
+        }
+        super.exportExcel(SampleLabExecutiveListResponse.class, list, ExportEnum.DEPT_EXECUTIVE_TASK.getSheetName());
+    }
+
+    @ApiOperation("我的任务-查询各状态列表（待检测、检测中、检测完）")
     @PostMapping("/myExecutive/list")
     public ReturnDTO<PageInfoBT<SampleLabExecutiveListResponse>> queryMyExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
@@ -57,19 +68,25 @@
         return ReturnUtil.success(super.packForBT(labExecutiveInfoService.myLabExecutiveListPage(page, labExecutiveListRequest)));
     }
 
-    /**
-     * 实验室检测-我的检测-查询各状态样品数量（待检测、检测中、检测完）
-     */
-    @ApiOperation("实验室检测-我的检测-查询各状态样品数量（待检测、检测中、检测完）")
+    @ApiOperation("我的任务导出")
+    @PostMapping("/myExecutive/export")
+    public void exportList(@RequestBody @Valid SampleLabExecutiveListRequest request) throws Exception {
+        List<SampleLabExecutiveListResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = labExecutiveInfoService.myLabExecutiveListByIds(request.getMeasureStatus(), request.getIds());
+        } else {
+            list = labExecutiveInfoService.myLabExecutiveList(request);
+        }
+        super.exportExcel(SampleLabExecutiveListResponse.class, list, ExportEnum.MY_EXECUTIVE_TASK.getSheetName());
+    }
+
+    @ApiOperation("我的任务-查询各状态样品数量（待检测、检测中、检测完）")
     @GetMapping("/myExecutive/amount")
     public ReturnDTO<List<SampleAmountResponse>> queryMyExecutiveAmount() {
         return ReturnUtil.success(labExecutiveInfoService.myExecutiveAmount());
     }
 
-    /**
-     * 实验室检测-部门检测-分配（分配给具体人员）
-     */
-    @ApiOperation("实验室检测-部门检测-分配按钮（分配给具体人员）")
+    @ApiOperation("实验室任务-分配按钮（分配给具体人员）")
     @PostMapping("/deptExecutive/allocate")
     public ReturnDTO allocateStaff(@RequestBody @Valid SampleAllocateRequest sampleAllocateRequest, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -78,10 +95,7 @@
         return labExecutiveInfoService.allocateStaff(sampleAllocateRequest);
     }
 
-    /**
-     * 实验室检测-我的检测-检定人扫描收入（待检测->检测中）
-     */
-    @ApiOperation("实验室检测-我的检测-检定人扫描收入（待检测->检测中）")
+    @ApiOperation("我的任务-检定人扫描收入（待检测->检测中）")
     @PostMapping("/myExecutive/receive")
     public ReturnDTO sampleReceive(@RequestBody @Valid List<SampleOperateRequest> requestList, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -90,10 +104,7 @@
         return labExecutiveInfoService.sampleReceive(requestList);
     }
 
-    /**
-     * 实验室检测-负责人/检定人扫描检完（检测中->检测完）
-     */
-    @ApiOperation("实验室检测-负责人/检定人扫描检完（检测中->检测完）")
+    @ApiOperation("实验室任务-负责人/检定人扫描检完（检测中->检测完）")
     @PostMapping("/myExecutive/complete")
     public ReturnDTO sampleExecutiveComplete(@RequestBody @Valid List<SampleOperateRequest> requestList, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -102,10 +113,7 @@
         return labExecutiveInfoService.sampleExecutiveComplete(requestList);
     }
 
-    /**
-     * 实验室检测-部门检测/我的检测 编辑（只能修改应出具证书）
-     */
-    @ApiOperation("实验室检测-部门检测/我的检测 编辑（只能修改应出具证书）")
+    @ApiOperation("实验室任务/我的任务 编辑（只能修改应出具证书）")
     @PostMapping("/executive/update")
     public ReturnDTO updateExecutive(@RequestBody @Valid UpdateExecutiveRequest request, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -114,10 +122,7 @@
         return labExecutiveInfoService.updateExecutive(request);
     }
 
-    /**
-     * 实验室检测-部门检测/我的检测 详情
-     */
-    @ApiOperation("实验室检测-部门检测/我的检测 详情")
+    @ApiOperation("实验室任务/我的任务 详情")
     @PostMapping("/executive/detail")
     public ReturnDTO<ExecutiveDetailResponse> executiveDetail(@RequestBody @Valid ExecutiveDetailRequest request, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
@@ -131,7 +136,7 @@
      * 退回后会将下一个要执行的实验室检测状态更新为待分配，将后面的实验室顺序变更为连续（都进行减1）
      * 最后一个检测的实验室退回，等分发员再增加实验室或设备收发中的已收入直接手动点击完成
      */
-    @ApiOperation("实验室检测-部门检测/我的检测 退回（待检测/检测中->退回）")
+    @ApiOperation("实验室任务/我的任务 退回（待检测/检测中->退回）")
     @PostMapping("/executive/sendBack")
     public ReturnDTO executiveSendBack(@RequestBody @Valid ExecutiveSendBackRequest request, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -140,9 +145,6 @@
         return labExecutiveInfoService.sampleExecutiveSendBack(request);
     }
 
-    /**
-     * 分发员编辑实验室检测列表
-     */
     @ApiOperation("分发员编辑实验室检测列表")
     @PostMapping("/handOut/updateList")
     public ReturnDTO updateExecutiveList(@RequestBody @Valid UpdateExecutiveListRequest request, BindingResult bindingResult) {
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java
index 48a67ed..0c04f31 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java
@@ -10,6 +10,7 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.resource.customer.CustomerApprovalListRequest;
 import com.casic.missiles.dto.resource.customer.CustomerSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceCustomerInfo;
@@ -26,6 +27,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -55,6 +57,13 @@
         return customerInfoService.saveCustomerInfo(request);
     }
 
+    @ApiOperation("委托方名录导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody CustomerApprovalListRequest request) throws Exception {
+        List<BizResourceCustomerInfo> list = super.exportList(request);
+        super.exportExcel(BizResourceCustomerInfo.class, list, ExportEnum.CUSTOMER_INFO.getSheetName());
+    }
+
     @ApiOperation("委托方人员列表（分页）")
     @PostMapping("/person/listPage")
     public ReturnDTO<PageInfoBT<BizResourceCustomerStaff>> personListPage(@RequestBody IdDTO idDto) {
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
index 972ed4b..6418ea5 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
@@ -5,6 +5,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.resource.customer.SuggestFormApprovalListRequest;
 import com.casic.missiles.dto.resource.customer.SuggestFormSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceCustomerSuggestForm;
@@ -20,6 +21,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -50,4 +52,11 @@
         return suggestFormService.saveSuggestForm(request);
     }
 
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody SuggestFormApprovalListRequest request) throws Exception {
+        List<BizResourceCustomerSuggestForm> list = super.exportList(request);
+        super.exportExcel(BizResourceCustomerSuggestForm.class, list, ExportEnum.CUSTOMER_SUGGEST_FORM.getSheetName());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java
index 1934d1a..9e07eab 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java
@@ -15,12 +15,16 @@
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.resource.IEnvEnvironmentRecordConfigService;
 import com.casic.missiles.service.resource.IEnvEnvironmentRecordDataService;
+import com.casic.missiles.service.resource.IEnvLocationInfoService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
 import java.util.List;
@@ -39,6 +43,8 @@
     private IEnvEnvironmentRecordDataService environmentRecordDataService;
     @Autowired
     private IEnvEnvironmentRecordConfigService environmentRecordConfigService;
+    @Autowired
+    private IEnvLocationInfoService locationInfoService;
 
     @ApiOperation("环境记录单数据列表/详情")
     @PostMapping("/data/listPage")
@@ -95,4 +101,11 @@
         });
         return environmentRecordConfigService.deleteEnvironmentRecordConfig(idDTO.getId());
     }
+
+    @ApiOperation("地点列表")
+    @PostMapping("/location/listPage")
+    public ReturnDTO<PageInfoBT<LocationListResponse>> locationListPage(@RequestBody @Valid LocationListRequest request) {
+        Page<LocationListResponse> page = PageFactory.defaultPage();
+        return ReturnUtil.success(super.packForBT(locationInfoService.listPage(page, request)));
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java
index 82efe3f..e9561fa 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java
@@ -10,6 +10,7 @@
 import com.casic.missiles.dto.resource.seal.SealLogListRequest;
 import com.casic.missiles.dto.resource.seal.SealNoteApprovalListRequest;
 import com.casic.missiles.dto.resource.seal.SealNoteSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceSealUseLog;
@@ -27,6 +28,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -58,6 +60,13 @@
         return sealUseNoteService.saveSeal(request);
     }
 
+    @ApiOperation("印章使用登记导出（列表和导出中去掉经办人和监印人）")
+    @PostMapping("/listExport")
+    public void export(@RequestBody SealNoteApprovalListRequest request) throws Exception {
+        List<BizResourceSealUseNote> list = super.exportList(request);
+        super.exportExcel(BizResourceSealUseNote.class, list, ExportEnum.SEAL_NOTE.getSheetName());
+    }
+
     // TODO: 2023/7/28 印章使用日志：系统中使用印章时插入数据库
 
     @ApiOperation("印章使用日志列表（分页）")
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java
index 9b674fc..06b6521 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java
@@ -9,16 +9,20 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.resource.staff.StaffCertRequest;
 import com.casic.missiles.dto.resource.staff.StaffCertResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.service.resource.IBizResourceStaffInfoService;
 import com.casic.missiles.service.resource.IBizResourceStaffVerifierService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.List;
+
 /**
  * @Description:
  * @Author: wangpeng
@@ -41,9 +45,21 @@
         return ReturnUtil.success(super.packForBT(responsePage));
     }
 
+    @ApiOperation("证书逾期提醒导出")
+    @PostMapping("/listExport")
+    public void exportList(@RequestBody StaffCertRequest request) throws Exception {
+        List<StaffCertResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = staffInfoService.certListByIds(request.getIds());
+        } else {
+            list = staffInfoService.certList(request);
+        }
+        super.exportExcel(StaffCertResponse.class, list, ExportEnum.STAFF_CERTIFICATE_EXPIRE.getSheetName());
+    }
+
     @ApiOperation("证书逾期提醒")
     @PostMapping("/expirationReminder")
-    public ReturnDTO expirationReminder(@RequestBody IdDTO idDto) {
-        return verifierService.expirationReminder(idDto);
+    public ReturnDTO expirationReminder(@RequestBody IdDTO idDTO) {
+        return verifierService.expirationReminder(idDTO);
     }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java
index 3b251ad..a6e7850 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java
@@ -12,6 +12,7 @@
 import com.casic.missiles.dto.resource.staff.StaffListRequest;
 import com.casic.missiles.dto.resource.staff.TrainListRequest;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.*;
@@ -22,7 +23,10 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
 import java.util.List;
@@ -52,8 +56,19 @@
             throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
         }
         Page<BizResourceStaffInfo> page = PageFactory.defaultPage();
-        Page<BizResourceStaffInfo> responsePage = staffInfoService.listPage(page, request);
-        return ReturnUtil.success(super.packForBT(responsePage));
+        return ReturnUtil.success(super.packForBT(staffInfoService.listPage(page, request)));
+    }
+
+    @ApiOperation("人员登记导出")
+    @PostMapping("/listExport")
+    public void exportList(@RequestBody StaffListRequest request) throws Exception {
+        List<BizResourceStaffInfo> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = staffInfoService.listByIds(request.getIds());
+        } else {
+            list = staffInfoService.list(request);
+        }
+        super.exportExcel(BizResourceStaffInfo.class, list, ExportEnum.STAFF_INFO.getSheetName());
     }
 
     @ApiOperation("人员登记详情基础信息")
@@ -85,9 +100,9 @@
 
     @ApiOperation("科研教育列表（分页）")
     @PostMapping("/education/listPage")
-    public ReturnDTO<PageInfoBT<BizResourceStaffEducation>> educationListPage(@RequestBody IdDTO idDto) {
+    public ReturnDTO<PageInfoBT<BizResourceStaffEducation>> educationListPage(@RequestBody IdDTO idDTO) {
         Page<BizResourceStaffEducation> page = PageFactory.defaultPage();
-        Page<BizResourceStaffEducation> responsePage = staffInfoService.educationListPage(page, idDto);
+        Page<BizResourceStaffEducation> responsePage = staffInfoService.educationListPage(page, idDTO);
         return ReturnUtil.success(super.packForBT(responsePage));
     }
 

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java
index bb0c50f..13a699b 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java
@@ -12,6 +12,7 @@
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.IGeneralApprovalService;
+import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
@@ -19,6 +20,7 @@
 import org.springframework.web.bind.annotation.RequestBody;
 
 import javax.validation.Valid;
+import java.util.List;
 import java.util.Objects;
 
 /**
@@ -117,4 +119,17 @@
         }
         return baseApprovalService.failUpdate(request);
     }
+
+    public List<O> exportList(@RequestBody @Valid R request) throws Exception {
+        List<O> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = baseApprovalService.listExportByIds(request.getIds());
+        } else {
+            list = baseApprovalService.listExport(request);
+        }
+        for (O record : list) {
+            DictCodeUtils.convertDictCodeToName(record);
+        }
+        return list;
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java
index 8a90961..d775831 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java
@@ -5,6 +5,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.business.certificate.CertificateChangeApplyApprovalListRequest;
 import com.casic.missiles.dto.business.certificate.CertificateChangeApplySaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessCertificateChangeApply;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
@@ -20,6 +21,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -48,4 +50,12 @@
         }
         return changeApplyService.saveChangeApply(request);
     }
+
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody CertificateChangeApplyApprovalListRequest request) throws Exception {
+        List<BizBusinessCertificateChangeApply> list = super.exportList(request);
+        super.exportExcel(BizBusinessCertificateChangeApply.class, list, ExportEnum.CERTIFICATE_CHANGE_APPLY.getSheetName());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java
index 5fc4b07..af8230e 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java
@@ -9,6 +9,7 @@
 import com.casic.missiles.dto.business.certificate.CertificatePrintApprovalListRequest;
 import com.casic.missiles.dto.business.certificate.CertificatePrintListResponse;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.enums.business.CertificatePrintStatusEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessCertificatePrintLog;
@@ -18,10 +19,16 @@
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.io.IOException;
+import java.util.List;
 import java.util.Objects;
 
 /**
@@ -98,4 +105,16 @@
         });
         return certificatePrintService.certificatePrintLog(idDTO.getId());
     }
+
+    @ApiOperation("证书打印审批导出")
+    @PostMapping("/listExport")
+    public void exportList(@RequestBody CertificatePrintApprovalListRequest request) throws IOException {
+        List<CertificatePrintListResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = certificatePrintService.listByIds(request.getIds());
+        } else {
+            list = certificatePrintService.list(request);
+        }
+        super.exportExcel(CertificatePrintListResponse.class, list, ExportEnum.CERTIFICATE_PRINT.getSheetName());
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java
index 63b06dc..6b2efd5 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java
@@ -6,6 +6,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.business.certificate.CertificateReportApprovalListRequest;
 import com.casic.missiles.dto.business.certificate.CertificateReportSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessCertificateReport;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
@@ -21,6 +22,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -50,7 +52,7 @@
         return certificateReportService.saveCertificateReport(request);
     }
 
-    @ApiOperation("证书审批详情（基本信息）")
+    @ApiOperation("详情（基本信息）")
     @PostMapping("/detail")
     public ReturnDTO<BizBusinessCertificateReport> detail(@RequestBody @Valid BaseDetailRequest request, BindingResult bindingResult) throws Exception {
         if(bindingResult.hasErrors()){
@@ -59,4 +61,11 @@
         return certificateReportService.detail(request);
     }
 
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody CertificateReportApprovalListRequest request) throws Exception {
+        List<BizBusinessCertificateReport> list = super.exportList(request);
+        super.exportExcel(BizBusinessCertificateReport.class, list, ExportEnum.CERTIFICATE_REPORT.getSheetName());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java
index 46b26bd..57c0809 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java
@@ -10,20 +10,21 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.business.identify.IdentifyListRequest;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessIdentifyInfo;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.business.IBizBusinessIdentifyInfoService;
+import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import javax.validation.Valid;
+import java.util.List;
 import java.util.Objects;
 
 /**
@@ -57,16 +58,13 @@
         return identifyInfoService.addIdentify(identifyInfo);
     }
 
-    @ApiOperation("标识打印更新")
+    @ApiOperation("标识打印更新（更新打印时间）")
     @PostMapping("/update")
-    public ReturnDTO updateIdentify(@RequestBody @Valid BizBusinessIdentifyInfo identifyInfo, BindingResult bindingResult) {
-        Assert.isFalse(Objects.isNull(identifyInfo.getId()), () -> {
+    public ReturnDTO updateIdentify(@RequestBody @Valid IdDTO idDTO) {
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        Assert.isFalse(bindingResult.hasErrors(), () -> {
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        });
-        return identifyInfoService.updateIdentify(identifyInfo);
+        return identifyInfoService.updateIdentify(idDTO.getId());
     }
 
     @ApiOperation("标识打印删除")
@@ -77,4 +75,37 @@
         });
         return identifyInfoService.deleteIdentify(idDTO.getId());
     }
+
+    @ApiOperation("标识打印导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody @Valid IdentifyListRequest request, BindingResult bindingResult) throws Exception {
+        if (bindingResult.hasErrors()) {
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        List<BizBusinessIdentifyInfo> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = identifyInfoService.listByIds(request.getIds());
+        } else {
+            list = identifyInfoService.list(request);
+        }
+        for (BizBusinessIdentifyInfo record : list) {
+            DictCodeUtils.convertDictCodeToName(record);
+        }
+        super.exportExcel(BizBusinessIdentifyInfo.class, list, ExportEnum.IDENTIFY_EXPORT.getSheetName());
+    }
+
+
+    // TODO: 2023/8/23 查询设备信息，4个底部按钮查设备（按钮的作用就是前端用来调不同接口、用来区分中间即将展示的标识），前端弹窗选设备，在确定保存时前端根据底部按钮判断传入设备类型deviceType字典code
+    // TODO: 2023/8/23 接口：查受检设备（第1个按钮），查设备台账（后3个按钮同一接口），查询之后前端根据标志类型的不同加到中间页面时进行判断（按产品给的对应表）
+    // TODO: 2023/8/23 提供二维码接口，前端在加到中间页面时调用一下
+
+    @ApiOperation("设备二维码")
+    @PostMapping("/equipment/qrCode")
+    public ReturnDTO<String> equipmentQrCode(@RequestBody @Valid IdDTO idDTO) {
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return identifyInfoService.equipmentQrCode(idDTO.getId());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java
index 707be6e..7e0453d 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java
@@ -117,7 +117,7 @@
     }
 
     @ApiOperation("任务单导出")
-    @PostMapping("/export")
+    @PostMapping("/listExport")
     public void orderExport(@RequestBody @Valid OrderListRequest request, HttpServletResponse response) {
         businessOrderService.orderExport(request, response);
     }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java
index 529a6ce..51432be 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java
@@ -1,9 +1,28 @@
 package com.casic.missiles.controller.business;
 
+import com.casic.missiles.controller.GeneralApprovalController;
+import com.casic.missiles.dto.BaseApprovalSubmitRequest;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.business.outsource.OutsourceAssessApprovalListRequest;
+import com.casic.missiles.dto.business.outsource.OutsourceAssessSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
+import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.model.business.BizBusinessOutsourceAssess;
+import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
+import com.casic.missiles.service.IGeneralApprovalService;
+import com.casic.missiles.service.business.IBizBusinessOutsourceAssessService;
 import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.BindingResult;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.validation.Valid;
+import java.util.List;
+
 /**
  * <p>
  * 计量检定业务-分包管理-测试、校准或检定工作分包评审表 前端控制器
@@ -15,6 +34,27 @@
 @Api(tags = "分包管理-测试、校准或检定工作分包评审表")
 @RestController
 @RequestMapping("/business/outsource/assess")
-public class BizBusinessOutsourceAssessController {
+public class BizBusinessOutsourceAssessController extends GeneralApprovalController<BizBusinessOutsourceAssess, BizBusinessOutsourceAssess, OutsourceAssessApprovalListRequest, BaseApprovalSubmitRequest> {
+    @Autowired
+    private IBizBusinessOutsourceAssessService outsourceAssessService;
 
+    public BizBusinessOutsourceAssessController(IGeneralApprovalService<BizBusinessOutsourceAssess, BizBusinessOutsourceAssess, OutsourceAssessApprovalListRequest, BaseApprovalSubmitRequest> baseApprovalService) {
+        super(baseApprovalService);
+    }
+
+    @ApiOperation("草稿箱-保存")
+    @PostMapping("/save")
+    public ReturnDTO<OutsourceAssessSaveResponse> saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceAssess request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        return outsourceAssessService.saveOutsourceAssess(request);
+    }
+
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception {
+        List<BizBusinessOutsourceAssess> list = super.exportList(request);
+        super.exportExcel(BizBusinessOutsourceAssess.class, list, ExportEnum.OUTSOURCE_ASSESS.getSheetName());
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java
new file mode 100644
index 0000000..9adef18
--- /dev/null
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java
@@ -0,0 +1,60 @@
+package com.casic.missiles.controller.business;
+
+import com.casic.missiles.controller.GeneralApprovalController;
+import com.casic.missiles.dto.BaseApprovalSubmitRequest;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.business.outsource.OutsourceProtocolApprovalListRequest;
+import com.casic.missiles.dto.business.outsource.OutsourceProtocolSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
+import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.model.business.BizBusinessOutsourceProtocol;
+import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
+import com.casic.missiles.service.IGeneralApprovalService;
+import com.casic.missiles.service.business.IBizBusinessOutsourceProtocolService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.BindingResult;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.validation.Valid;
+import java.util.List;
+
+/**
+ * <p>
+ * 计量检定业务-分包管理-测试、校准或检定工作分包协议书 前端控制器
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-08-24
+ */
+@Api(tags = "分包管理-测试、校准或检定工作分包协议书")
+@RestController
+@RequestMapping("/business/outsource/protocol")
+public class BizBusinessOutsourceProtocolController extends GeneralApprovalController<BizBusinessOutsourceProtocol, BizBusinessOutsourceProtocol, OutsourceProtocolApprovalListRequest, BaseApprovalSubmitRequest> {
+    @Autowired
+    private IBizBusinessOutsourceProtocolService outsourceProtocolService;
+
+    public BizBusinessOutsourceProtocolController(IGeneralApprovalService<BizBusinessOutsourceProtocol, BizBusinessOutsourceProtocol, OutsourceProtocolApprovalListRequest, BaseApprovalSubmitRequest> baseApprovalService) {
+        super(baseApprovalService);
+    }
+
+    @ApiOperation("草稿箱-保存")
+    @PostMapping("/save")
+    public ReturnDTO<OutsourceProtocolSaveResponse> saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceProtocol request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        return outsourceProtocolService.saveOutsourceProtocol(request);
+    }
+
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody OutsourceProtocolApprovalListRequest request) throws Exception {
+        List<BizBusinessOutsourceProtocol> list = super.exportList(request);
+        super.exportExcel(BizBusinessOutsourceProtocol.class, list, ExportEnum.OUTSOURCE_PROTOCOL.getSheetName());
+    }
+}
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java
index 097f645..f0f0943 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java
@@ -17,7 +17,6 @@
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.IGeneralApprovalService;
 import com.casic.missiles.service.business.IBizBusinessOutsourcerInfoService;
-import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -71,19 +70,8 @@
 
     @ApiOperation("分包方导出")
     @PostMapping("/listExport")
-    public void export(@RequestBody @Valid OutsourcerInfoApprovalListRequest request, BindingResult bindingResult) throws Exception {
-        if (bindingResult.hasErrors()) {
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        }
-        List<BizBusinessOutsourcerInfo> list;
-        if (!CollectionUtils.isEmpty(request.getIds())) {
-            list = outsourcerInfoService.listByIds(request.getIds());
-        } else {
-            list = outsourcerInfoService.list(request);
-        }
-        for (BizBusinessOutsourcerInfo record : list) {
-            DictCodeUtils.convertDictCodeToName(record);
-        }
+    public void export(@RequestBody OutsourcerInfoApprovalListRequest request) throws Exception {
+        List<BizBusinessOutsourcerInfo> list = super.exportList(request);
         super.exportExcel(BizBusinessOutsourcerInfo.class, list, ExportEnum.OUTSOURCER_EXPORT.getSheetName());
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java
index c2cbf9f..0410918 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java
@@ -17,11 +17,9 @@
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.IGeneralApprovalService;
 import com.casic.missiles.service.business.IBizBusinessSiteExecutiveInfoService;
-import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -60,7 +58,7 @@
         return siteExecutiveInfoService.saveSiteExecutiveInfo(siteExecutiveInfo);
     }
 
-    @ApiOperation("现场检测详情")
+    @ApiOperation("详情")
     @PostMapping("/detail")
     public ReturnDTO<SiteExecutiveDetailResponse> siteExecutiveDetail(@RequestBody @Valid IdDTO idDTO) throws Exception {
         Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
@@ -69,21 +67,10 @@
         return ReturnUtil.success(siteExecutiveInfoService.detail(idDTO.getId()));
     }
 
-    @ApiOperation("现场检测导出")
+    @ApiOperation("导出")
     @PostMapping("/listExport")
-    public void export(@RequestBody @Valid SiteExecutiveApprovalListRequest request, BindingResult bindingResult) throws Exception {
-        if (bindingResult.hasErrors()) {
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        }
-        List<SiteExecutiveApprovalListResponse> list;
-        if (!CollectionUtils.isEmpty(request.getIds())) {
-            list = siteExecutiveInfoService.listInfoByIds(request.getIds());
-        } else {
-            list = siteExecutiveInfoService.listInfo(request);
-        }
-        for (SiteExecutiveApprovalListResponse record : list) {
-            DictCodeUtils.convertDictCodeToName(record);
-        }
+    public void export(@RequestBody SiteExecutiveApprovalListRequest request) throws Exception {
+        List<SiteExecutiveApprovalListResponse> list = super.exportList(request);
         super.exportExcel(SiteExecutiveApprovalListResponse.class, list, ExportEnum.SITE_EXECUTIVE_EXPORT.getSheetName());
     }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
index 7e793cd..a92e209 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
@@ -55,7 +55,7 @@
 
     @ApiOperation("设备收发列表导出")
     @PostMapping("/export")
-    public void exportList(@RequestBody @Valid SampleDispatchListRequest request) throws IOException {
+    public void exportList(@RequestBody SampleDispatchListRequest request) throws IOException {
         List<SampleDispatchListResponse> list;
         if (!CollectionUtils.isEmpty(request.getIds())) {
             list = dispatchService.listByIds(request.getIds());
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java
index cdc77fc..d120fd4 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java
@@ -7,6 +7,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.business.labExecutive.*;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.business.IBusinessLabExecutiveInfoService;
@@ -14,6 +15,7 @@
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.*;
 
@@ -32,7 +34,7 @@
     @Autowired
     private IBusinessLabExecutiveInfoService labExecutiveInfoService;
 
-    @ApiOperation("实验室检测-部门检测-查询各状态列表（待检测、检测中、检测完）")
+    @ApiOperation("实验室任务-查询各状态列表（待检测、检测中、检测完）")
     @PostMapping("/deptExecutive/List")
     public ReturnDTO<PageInfoBT<SampleLabExecutiveListResponse>> queryDeptExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
@@ -43,10 +45,19 @@
         return ReturnUtil.success(super.packForBT(labExecutiveInfoService.deptLabExecutiveListPage(page, labExecutiveListRequest)));
     }
 
-    /**
-     * 实验室检测-我的检测-查询各状态列表（待检测、检测中、检测完）
-     */
-    @ApiOperation("实验室检测-我的检测-查询各状态列表（待检测、检测中、检测完）")
+    @ApiOperation("实验室任务导出")
+    @PostMapping("/deptExecutive/export")
+    public void deptExportList(@RequestBody @Valid SampleLabExecutiveListRequest request) throws Exception {
+        List<SampleLabExecutiveListResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = labExecutiveInfoService.deptLabExecutiveListByIds(request.getMeasureStatus(), request.getIds());
+        } else {
+            list = labExecutiveInfoService.deptLabExecutiveList(request);
+        }
+        super.exportExcel(SampleLabExecutiveListResponse.class, list, ExportEnum.DEPT_EXECUTIVE_TASK.getSheetName());
+    }
+
+    @ApiOperation("我的任务-查询各状态列表（待检测、检测中、检测完）")
     @PostMapping("/myExecutive/list")
     public ReturnDTO<PageInfoBT<SampleLabExecutiveListResponse>> queryMyExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
@@ -57,19 +68,25 @@
         return ReturnUtil.success(super.packForBT(labExecutiveInfoService.myLabExecutiveListPage(page, labExecutiveListRequest)));
     }
 
-    /**
-     * 实验室检测-我的检测-查询各状态样品数量（待检测、检测中、检测完）
-     */
-    @ApiOperation("实验室检测-我的检测-查询各状态样品数量（待检测、检测中、检测完）")
+    @ApiOperation("我的任务导出")
+    @PostMapping("/myExecutive/export")
+    public void exportList(@RequestBody @Valid SampleLabExecutiveListRequest request) throws Exception {
+        List<SampleLabExecutiveListResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = labExecutiveInfoService.myLabExecutiveListByIds(request.getMeasureStatus(), request.getIds());
+        } else {
+            list = labExecutiveInfoService.myLabExecutiveList(request);
+        }
+        super.exportExcel(SampleLabExecutiveListResponse.class, list, ExportEnum.MY_EXECUTIVE_TASK.getSheetName());
+    }
+
+    @ApiOperation("我的任务-查询各状态样品数量（待检测、检测中、检测完）")
     @GetMapping("/myExecutive/amount")
     public ReturnDTO<List<SampleAmountResponse>> queryMyExecutiveAmount() {
         return ReturnUtil.success(labExecutiveInfoService.myExecutiveAmount());
     }
 
-    /**
-     * 实验室检测-部门检测-分配（分配给具体人员）
-     */
-    @ApiOperation("实验室检测-部门检测-分配按钮（分配给具体人员）")
+    @ApiOperation("实验室任务-分配按钮（分配给具体人员）")
     @PostMapping("/deptExecutive/allocate")
     public ReturnDTO allocateStaff(@RequestBody @Valid SampleAllocateRequest sampleAllocateRequest, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -78,10 +95,7 @@
         return labExecutiveInfoService.allocateStaff(sampleAllocateRequest);
     }
 
-    /**
-     * 实验室检测-我的检测-检定人扫描收入（待检测->检测中）
-     */
-    @ApiOperation("实验室检测-我的检测-检定人扫描收入（待检测->检测中）")
+    @ApiOperation("我的任务-检定人扫描收入（待检测->检测中）")
     @PostMapping("/myExecutive/receive")
     public ReturnDTO sampleReceive(@RequestBody @Valid List<SampleOperateRequest> requestList, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -90,10 +104,7 @@
         return labExecutiveInfoService.sampleReceive(requestList);
     }
 
-    /**
-     * 实验室检测-负责人/检定人扫描检完（检测中->检测完）
-     */
-    @ApiOperation("实验室检测-负责人/检定人扫描检完（检测中->检测完）")
+    @ApiOperation("实验室任务-负责人/检定人扫描检完（检测中->检测完）")
     @PostMapping("/myExecutive/complete")
     public ReturnDTO sampleExecutiveComplete(@RequestBody @Valid List<SampleOperateRequest> requestList, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -102,10 +113,7 @@
         return labExecutiveInfoService.sampleExecutiveComplete(requestList);
     }
 
-    /**
-     * 实验室检测-部门检测/我的检测 编辑（只能修改应出具证书）
-     */
-    @ApiOperation("实验室检测-部门检测/我的检测 编辑（只能修改应出具证书）")
+    @ApiOperation("实验室任务/我的任务 编辑（只能修改应出具证书）")
     @PostMapping("/executive/update")
     public ReturnDTO updateExecutive(@RequestBody @Valid UpdateExecutiveRequest request, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -114,10 +122,7 @@
         return labExecutiveInfoService.updateExecutive(request);
     }
 
-    /**
-     * 实验室检测-部门检测/我的检测 详情
-     */
-    @ApiOperation("实验室检测-部门检测/我的检测 详情")
+    @ApiOperation("实验室任务/我的任务 详情")
     @PostMapping("/executive/detail")
     public ReturnDTO<ExecutiveDetailResponse> executiveDetail(@RequestBody @Valid ExecutiveDetailRequest request, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
@@ -131,7 +136,7 @@
      * 退回后会将下一个要执行的实验室检测状态更新为待分配，将后面的实验室顺序变更为连续（都进行减1）
      * 最后一个检测的实验室退回，等分发员再增加实验室或设备收发中的已收入直接手动点击完成
      */
-    @ApiOperation("实验室检测-部门检测/我的检测 退回（待检测/检测中->退回）")
+    @ApiOperation("实验室任务/我的任务 退回（待检测/检测中->退回）")
     @PostMapping("/executive/sendBack")
     public ReturnDTO executiveSendBack(@RequestBody @Valid ExecutiveSendBackRequest request, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -140,9 +145,6 @@
         return labExecutiveInfoService.sampleExecutiveSendBack(request);
     }
 
-    /**
-     * 分发员编辑实验室检测列表
-     */
     @ApiOperation("分发员编辑实验室检测列表")
     @PostMapping("/handOut/updateList")
     public ReturnDTO updateExecutiveList(@RequestBody @Valid UpdateExecutiveListRequest request, BindingResult bindingResult) {
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java
index 48a67ed..0c04f31 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java
@@ -10,6 +10,7 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.resource.customer.CustomerApprovalListRequest;
 import com.casic.missiles.dto.resource.customer.CustomerSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceCustomerInfo;
@@ -26,6 +27,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -55,6 +57,13 @@
         return customerInfoService.saveCustomerInfo(request);
     }
 
+    @ApiOperation("委托方名录导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody CustomerApprovalListRequest request) throws Exception {
+        List<BizResourceCustomerInfo> list = super.exportList(request);
+        super.exportExcel(BizResourceCustomerInfo.class, list, ExportEnum.CUSTOMER_INFO.getSheetName());
+    }
+
     @ApiOperation("委托方人员列表（分页）")
     @PostMapping("/person/listPage")
     public ReturnDTO<PageInfoBT<BizResourceCustomerStaff>> personListPage(@RequestBody IdDTO idDto) {
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
index 972ed4b..6418ea5 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
@@ -5,6 +5,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.resource.customer.SuggestFormApprovalListRequest;
 import com.casic.missiles.dto.resource.customer.SuggestFormSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceCustomerSuggestForm;
@@ -20,6 +21,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -50,4 +52,11 @@
         return suggestFormService.saveSuggestForm(request);
     }
 
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody SuggestFormApprovalListRequest request) throws Exception {
+        List<BizResourceCustomerSuggestForm> list = super.exportList(request);
+        super.exportExcel(BizResourceCustomerSuggestForm.class, list, ExportEnum.CUSTOMER_SUGGEST_FORM.getSheetName());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java
index 1934d1a..9e07eab 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java
@@ -15,12 +15,16 @@
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.resource.IEnvEnvironmentRecordConfigService;
 import com.casic.missiles.service.resource.IEnvEnvironmentRecordDataService;
+import com.casic.missiles.service.resource.IEnvLocationInfoService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
 import java.util.List;
@@ -39,6 +43,8 @@
     private IEnvEnvironmentRecordDataService environmentRecordDataService;
     @Autowired
     private IEnvEnvironmentRecordConfigService environmentRecordConfigService;
+    @Autowired
+    private IEnvLocationInfoService locationInfoService;
 
     @ApiOperation("环境记录单数据列表/详情")
     @PostMapping("/data/listPage")
@@ -95,4 +101,11 @@
         });
         return environmentRecordConfigService.deleteEnvironmentRecordConfig(idDTO.getId());
     }
+
+    @ApiOperation("地点列表")
+    @PostMapping("/location/listPage")
+    public ReturnDTO<PageInfoBT<LocationListResponse>> locationListPage(@RequestBody @Valid LocationListRequest request) {
+        Page<LocationListResponse> page = PageFactory.defaultPage();
+        return ReturnUtil.success(super.packForBT(locationInfoService.listPage(page, request)));
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java
index 82efe3f..e9561fa 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java
@@ -10,6 +10,7 @@
 import com.casic.missiles.dto.resource.seal.SealLogListRequest;
 import com.casic.missiles.dto.resource.seal.SealNoteApprovalListRequest;
 import com.casic.missiles.dto.resource.seal.SealNoteSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceSealUseLog;
@@ -27,6 +28,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -58,6 +60,13 @@
         return sealUseNoteService.saveSeal(request);
     }
 
+    @ApiOperation("印章使用登记导出（列表和导出中去掉经办人和监印人）")
+    @PostMapping("/listExport")
+    public void export(@RequestBody SealNoteApprovalListRequest request) throws Exception {
+        List<BizResourceSealUseNote> list = super.exportList(request);
+        super.exportExcel(BizResourceSealUseNote.class, list, ExportEnum.SEAL_NOTE.getSheetName());
+    }
+
     // TODO: 2023/7/28 印章使用日志：系统中使用印章时插入数据库
 
     @ApiOperation("印章使用日志列表（分页）")
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java
index 9b674fc..06b6521 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java
@@ -9,16 +9,20 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.resource.staff.StaffCertRequest;
 import com.casic.missiles.dto.resource.staff.StaffCertResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.service.resource.IBizResourceStaffInfoService;
 import com.casic.missiles.service.resource.IBizResourceStaffVerifierService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.List;
+
 /**
  * @Description:
  * @Author: wangpeng
@@ -41,9 +45,21 @@
         return ReturnUtil.success(super.packForBT(responsePage));
     }
 
+    @ApiOperation("证书逾期提醒导出")
+    @PostMapping("/listExport")
+    public void exportList(@RequestBody StaffCertRequest request) throws Exception {
+        List<StaffCertResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = staffInfoService.certListByIds(request.getIds());
+        } else {
+            list = staffInfoService.certList(request);
+        }
+        super.exportExcel(StaffCertResponse.class, list, ExportEnum.STAFF_CERTIFICATE_EXPIRE.getSheetName());
+    }
+
     @ApiOperation("证书逾期提醒")
     @PostMapping("/expirationReminder")
-    public ReturnDTO expirationReminder(@RequestBody IdDTO idDto) {
-        return verifierService.expirationReminder(idDto);
+    public ReturnDTO expirationReminder(@RequestBody IdDTO idDTO) {
+        return verifierService.expirationReminder(idDTO);
     }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java
index 3b251ad..a6e7850 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java
@@ -12,6 +12,7 @@
 import com.casic.missiles.dto.resource.staff.StaffListRequest;
 import com.casic.missiles.dto.resource.staff.TrainListRequest;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.*;
@@ -22,7 +23,10 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
 import java.util.List;
@@ -52,8 +56,19 @@
             throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
         }
         Page<BizResourceStaffInfo> page = PageFactory.defaultPage();
-        Page<BizResourceStaffInfo> responsePage = staffInfoService.listPage(page, request);
-        return ReturnUtil.success(super.packForBT(responsePage));
+        return ReturnUtil.success(super.packForBT(staffInfoService.listPage(page, request)));
+    }
+
+    @ApiOperation("人员登记导出")
+    @PostMapping("/listExport")
+    public void exportList(@RequestBody StaffListRequest request) throws Exception {
+        List<BizResourceStaffInfo> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = staffInfoService.listByIds(request.getIds());
+        } else {
+            list = staffInfoService.list(request);
+        }
+        super.exportExcel(BizResourceStaffInfo.class, list, ExportEnum.STAFF_INFO.getSheetName());
     }
 
     @ApiOperation("人员登记详情基础信息")
@@ -85,9 +100,9 @@
 
     @ApiOperation("科研教育列表（分页）")
     @PostMapping("/education/listPage")
-    public ReturnDTO<PageInfoBT<BizResourceStaffEducation>> educationListPage(@RequestBody IdDTO idDto) {
+    public ReturnDTO<PageInfoBT<BizResourceStaffEducation>> educationListPage(@RequestBody IdDTO idDTO) {
         Page<BizResourceStaffEducation> page = PageFactory.defaultPage();
-        Page<BizResourceStaffEducation> responsePage = staffInfoService.educationListPage(page, idDto);
+        Page<BizResourceStaffEducation> responsePage = staffInfoService.educationListPage(page, idDTO);
         return ReturnUtil.success(super.packForBT(responsePage));
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java
index af6aa86..d85d84a 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java
@@ -9,6 +9,7 @@
 import com.casic.missiles.dto.resource.outsideService.SupplierApprovalListRequest;
 import com.casic.missiles.dto.resource.outsideService.SupplierSaveResponse;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceSupplierAbility;
@@ -67,6 +68,13 @@
         return ReturnUtil.success(supplierInfoService.detail(idDTO.getId()));
     }
 
+    @ApiOperation("合格供方导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody SupplierApprovalListRequest request) throws Exception {
+        List<BizResourceSupplierInfo> list = super.exportList(request);
+        super.exportExcel(BizResourceSupplierInfo.class, list, ExportEnum.SUPPLIER_INFO.getSheetName());
+    }
+
     @ApiOperation("供方人员列表（分页）")
     @PostMapping("/person/listPage")
     public ReturnDTO<PageInfoBT<BizResourceSupplierPerson>> personListPage(@RequestBody IdDTO idDTO) {

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java
index bb0c50f..13a699b 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java
@@ -12,6 +12,7 @@
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.IGeneralApprovalService;
+import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
@@ -19,6 +20,7 @@
 import org.springframework.web.bind.annotation.RequestBody;
 
 import javax.validation.Valid;
+import java.util.List;
 import java.util.Objects;
 
 /**
@@ -117,4 +119,17 @@
         }
         return baseApprovalService.failUpdate(request);
     }
+
+    public List<O> exportList(@RequestBody @Valid R request) throws Exception {
+        List<O> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = baseApprovalService.listExportByIds(request.getIds());
+        } else {
+            list = baseApprovalService.listExport(request);
+        }
+        for (O record : list) {
+            DictCodeUtils.convertDictCodeToName(record);
+        }
+        return list;
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java
index 8a90961..d775831 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java
@@ -5,6 +5,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.business.certificate.CertificateChangeApplyApprovalListRequest;
 import com.casic.missiles.dto.business.certificate.CertificateChangeApplySaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessCertificateChangeApply;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
@@ -20,6 +21,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -48,4 +50,12 @@
         }
         return changeApplyService.saveChangeApply(request);
     }
+
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody CertificateChangeApplyApprovalListRequest request) throws Exception {
+        List<BizBusinessCertificateChangeApply> list = super.exportList(request);
+        super.exportExcel(BizBusinessCertificateChangeApply.class, list, ExportEnum.CERTIFICATE_CHANGE_APPLY.getSheetName());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java
index 5fc4b07..af8230e 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java
@@ -9,6 +9,7 @@
 import com.casic.missiles.dto.business.certificate.CertificatePrintApprovalListRequest;
 import com.casic.missiles.dto.business.certificate.CertificatePrintListResponse;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.enums.business.CertificatePrintStatusEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessCertificatePrintLog;
@@ -18,10 +19,16 @@
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.io.IOException;
+import java.util.List;
 import java.util.Objects;
 
 /**
@@ -98,4 +105,16 @@
         });
         return certificatePrintService.certificatePrintLog(idDTO.getId());
     }
+
+    @ApiOperation("证书打印审批导出")
+    @PostMapping("/listExport")
+    public void exportList(@RequestBody CertificatePrintApprovalListRequest request) throws IOException {
+        List<CertificatePrintListResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = certificatePrintService.listByIds(request.getIds());
+        } else {
+            list = certificatePrintService.list(request);
+        }
+        super.exportExcel(CertificatePrintListResponse.class, list, ExportEnum.CERTIFICATE_PRINT.getSheetName());
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java
index 63b06dc..6b2efd5 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java
@@ -6,6 +6,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.business.certificate.CertificateReportApprovalListRequest;
 import com.casic.missiles.dto.business.certificate.CertificateReportSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessCertificateReport;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
@@ -21,6 +22,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -50,7 +52,7 @@
         return certificateReportService.saveCertificateReport(request);
     }
 
-    @ApiOperation("证书审批详情（基本信息）")
+    @ApiOperation("详情（基本信息）")
     @PostMapping("/detail")
     public ReturnDTO<BizBusinessCertificateReport> detail(@RequestBody @Valid BaseDetailRequest request, BindingResult bindingResult) throws Exception {
         if(bindingResult.hasErrors()){
@@ -59,4 +61,11 @@
         return certificateReportService.detail(request);
     }
 
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody CertificateReportApprovalListRequest request) throws Exception {
+        List<BizBusinessCertificateReport> list = super.exportList(request);
+        super.exportExcel(BizBusinessCertificateReport.class, list, ExportEnum.CERTIFICATE_REPORT.getSheetName());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java
index 46b26bd..57c0809 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java
@@ -10,20 +10,21 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.business.identify.IdentifyListRequest;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessIdentifyInfo;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.business.IBizBusinessIdentifyInfoService;
+import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import javax.validation.Valid;
+import java.util.List;
 import java.util.Objects;
 
 /**
@@ -57,16 +58,13 @@
         return identifyInfoService.addIdentify(identifyInfo);
     }
 
-    @ApiOperation("标识打印更新")
+    @ApiOperation("标识打印更新（更新打印时间）")
     @PostMapping("/update")
-    public ReturnDTO updateIdentify(@RequestBody @Valid BizBusinessIdentifyInfo identifyInfo, BindingResult bindingResult) {
-        Assert.isFalse(Objects.isNull(identifyInfo.getId()), () -> {
+    public ReturnDTO updateIdentify(@RequestBody @Valid IdDTO idDTO) {
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        Assert.isFalse(bindingResult.hasErrors(), () -> {
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        });
-        return identifyInfoService.updateIdentify(identifyInfo);
+        return identifyInfoService.updateIdentify(idDTO.getId());
     }
 
     @ApiOperation("标识打印删除")
@@ -77,4 +75,37 @@
         });
         return identifyInfoService.deleteIdentify(idDTO.getId());
     }
+
+    @ApiOperation("标识打印导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody @Valid IdentifyListRequest request, BindingResult bindingResult) throws Exception {
+        if (bindingResult.hasErrors()) {
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        List<BizBusinessIdentifyInfo> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = identifyInfoService.listByIds(request.getIds());
+        } else {
+            list = identifyInfoService.list(request);
+        }
+        for (BizBusinessIdentifyInfo record : list) {
+            DictCodeUtils.convertDictCodeToName(record);
+        }
+        super.exportExcel(BizBusinessIdentifyInfo.class, list, ExportEnum.IDENTIFY_EXPORT.getSheetName());
+    }
+
+
+    // TODO: 2023/8/23 查询设备信息，4个底部按钮查设备（按钮的作用就是前端用来调不同接口、用来区分中间即将展示的标识），前端弹窗选设备，在确定保存时前端根据底部按钮判断传入设备类型deviceType字典code
+    // TODO: 2023/8/23 接口：查受检设备（第1个按钮），查设备台账（后3个按钮同一接口），查询之后前端根据标志类型的不同加到中间页面时进行判断（按产品给的对应表）
+    // TODO: 2023/8/23 提供二维码接口，前端在加到中间页面时调用一下
+
+    @ApiOperation("设备二维码")
+    @PostMapping("/equipment/qrCode")
+    public ReturnDTO<String> equipmentQrCode(@RequestBody @Valid IdDTO idDTO) {
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return identifyInfoService.equipmentQrCode(idDTO.getId());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java
index 707be6e..7e0453d 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java
@@ -117,7 +117,7 @@
     }
 
     @ApiOperation("任务单导出")
-    @PostMapping("/export")
+    @PostMapping("/listExport")
     public void orderExport(@RequestBody @Valid OrderListRequest request, HttpServletResponse response) {
         businessOrderService.orderExport(request, response);
     }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java
index 529a6ce..51432be 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java
@@ -1,9 +1,28 @@
 package com.casic.missiles.controller.business;
 
+import com.casic.missiles.controller.GeneralApprovalController;
+import com.casic.missiles.dto.BaseApprovalSubmitRequest;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.business.outsource.OutsourceAssessApprovalListRequest;
+import com.casic.missiles.dto.business.outsource.OutsourceAssessSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
+import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.model.business.BizBusinessOutsourceAssess;
+import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
+import com.casic.missiles.service.IGeneralApprovalService;
+import com.casic.missiles.service.business.IBizBusinessOutsourceAssessService;
 import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.BindingResult;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.validation.Valid;
+import java.util.List;
+
 /**
  * <p>
  * 计量检定业务-分包管理-测试、校准或检定工作分包评审表 前端控制器
@@ -15,6 +34,27 @@
 @Api(tags = "分包管理-测试、校准或检定工作分包评审表")
 @RestController
 @RequestMapping("/business/outsource/assess")
-public class BizBusinessOutsourceAssessController {
+public class BizBusinessOutsourceAssessController extends GeneralApprovalController<BizBusinessOutsourceAssess, BizBusinessOutsourceAssess, OutsourceAssessApprovalListRequest, BaseApprovalSubmitRequest> {
+    @Autowired
+    private IBizBusinessOutsourceAssessService outsourceAssessService;
 
+    public BizBusinessOutsourceAssessController(IGeneralApprovalService<BizBusinessOutsourceAssess, BizBusinessOutsourceAssess, OutsourceAssessApprovalListRequest, BaseApprovalSubmitRequest> baseApprovalService) {
+        super(baseApprovalService);
+    }
+
+    @ApiOperation("草稿箱-保存")
+    @PostMapping("/save")
+    public ReturnDTO<OutsourceAssessSaveResponse> saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceAssess request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        return outsourceAssessService.saveOutsourceAssess(request);
+    }
+
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception {
+        List<BizBusinessOutsourceAssess> list = super.exportList(request);
+        super.exportExcel(BizBusinessOutsourceAssess.class, list, ExportEnum.OUTSOURCE_ASSESS.getSheetName());
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java
new file mode 100644
index 0000000..9adef18
--- /dev/null
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java
@@ -0,0 +1,60 @@
+package com.casic.missiles.controller.business;
+
+import com.casic.missiles.controller.GeneralApprovalController;
+import com.casic.missiles.dto.BaseApprovalSubmitRequest;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.business.outsource.OutsourceProtocolApprovalListRequest;
+import com.casic.missiles.dto.business.outsource.OutsourceProtocolSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
+import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.model.business.BizBusinessOutsourceProtocol;
+import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
+import com.casic.missiles.service.IGeneralApprovalService;
+import com.casic.missiles.service.business.IBizBusinessOutsourceProtocolService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.BindingResult;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.validation.Valid;
+import java.util.List;
+
+/**
+ * <p>
+ * 计量检定业务-分包管理-测试、校准或检定工作分包协议书 前端控制器
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-08-24
+ */
+@Api(tags = "分包管理-测试、校准或检定工作分包协议书")
+@RestController
+@RequestMapping("/business/outsource/protocol")
+public class BizBusinessOutsourceProtocolController extends GeneralApprovalController<BizBusinessOutsourceProtocol, BizBusinessOutsourceProtocol, OutsourceProtocolApprovalListRequest, BaseApprovalSubmitRequest> {
+    @Autowired
+    private IBizBusinessOutsourceProtocolService outsourceProtocolService;
+
+    public BizBusinessOutsourceProtocolController(IGeneralApprovalService<BizBusinessOutsourceProtocol, BizBusinessOutsourceProtocol, OutsourceProtocolApprovalListRequest, BaseApprovalSubmitRequest> baseApprovalService) {
+        super(baseApprovalService);
+    }
+
+    @ApiOperation("草稿箱-保存")
+    @PostMapping("/save")
+    public ReturnDTO<OutsourceProtocolSaveResponse> saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceProtocol request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        return outsourceProtocolService.saveOutsourceProtocol(request);
+    }
+
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody OutsourceProtocolApprovalListRequest request) throws Exception {
+        List<BizBusinessOutsourceProtocol> list = super.exportList(request);
+        super.exportExcel(BizBusinessOutsourceProtocol.class, list, ExportEnum.OUTSOURCE_PROTOCOL.getSheetName());
+    }
+}
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java
index 097f645..f0f0943 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java
@@ -17,7 +17,6 @@
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.IGeneralApprovalService;
 import com.casic.missiles.service.business.IBizBusinessOutsourcerInfoService;
-import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -71,19 +70,8 @@
 
     @ApiOperation("分包方导出")
     @PostMapping("/listExport")
-    public void export(@RequestBody @Valid OutsourcerInfoApprovalListRequest request, BindingResult bindingResult) throws Exception {
-        if (bindingResult.hasErrors()) {
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        }
-        List<BizBusinessOutsourcerInfo> list;
-        if (!CollectionUtils.isEmpty(request.getIds())) {
-            list = outsourcerInfoService.listByIds(request.getIds());
-        } else {
-            list = outsourcerInfoService.list(request);
-        }
-        for (BizBusinessOutsourcerInfo record : list) {
-            DictCodeUtils.convertDictCodeToName(record);
-        }
+    public void export(@RequestBody OutsourcerInfoApprovalListRequest request) throws Exception {
+        List<BizBusinessOutsourcerInfo> list = super.exportList(request);
         super.exportExcel(BizBusinessOutsourcerInfo.class, list, ExportEnum.OUTSOURCER_EXPORT.getSheetName());
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java
index c2cbf9f..0410918 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java
@@ -17,11 +17,9 @@
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.IGeneralApprovalService;
 import com.casic.missiles.service.business.IBizBusinessSiteExecutiveInfoService;
-import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -60,7 +58,7 @@
         return siteExecutiveInfoService.saveSiteExecutiveInfo(siteExecutiveInfo);
     }
 
-    @ApiOperation("现场检测详情")
+    @ApiOperation("详情")
     @PostMapping("/detail")
     public ReturnDTO<SiteExecutiveDetailResponse> siteExecutiveDetail(@RequestBody @Valid IdDTO idDTO) throws Exception {
         Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
@@ -69,21 +67,10 @@
         return ReturnUtil.success(siteExecutiveInfoService.detail(idDTO.getId()));
     }
 
-    @ApiOperation("现场检测导出")
+    @ApiOperation("导出")
     @PostMapping("/listExport")
-    public void export(@RequestBody @Valid SiteExecutiveApprovalListRequest request, BindingResult bindingResult) throws Exception {
-        if (bindingResult.hasErrors()) {
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        }
-        List<SiteExecutiveApprovalListResponse> list;
-        if (!CollectionUtils.isEmpty(request.getIds())) {
-            list = siteExecutiveInfoService.listInfoByIds(request.getIds());
-        } else {
-            list = siteExecutiveInfoService.listInfo(request);
-        }
-        for (SiteExecutiveApprovalListResponse record : list) {
-            DictCodeUtils.convertDictCodeToName(record);
-        }
+    public void export(@RequestBody SiteExecutiveApprovalListRequest request) throws Exception {
+        List<SiteExecutiveApprovalListResponse> list = super.exportList(request);
         super.exportExcel(SiteExecutiveApprovalListResponse.class, list, ExportEnum.SITE_EXECUTIVE_EXPORT.getSheetName());
     }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
index 7e793cd..a92e209 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
@@ -55,7 +55,7 @@
 
     @ApiOperation("设备收发列表导出")
     @PostMapping("/export")
-    public void exportList(@RequestBody @Valid SampleDispatchListRequest request) throws IOException {
+    public void exportList(@RequestBody SampleDispatchListRequest request) throws IOException {
         List<SampleDispatchListResponse> list;
         if (!CollectionUtils.isEmpty(request.getIds())) {
             list = dispatchService.listByIds(request.getIds());
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java
index cdc77fc..d120fd4 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java
@@ -7,6 +7,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.business.labExecutive.*;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.business.IBusinessLabExecutiveInfoService;
@@ -14,6 +15,7 @@
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.*;
 
@@ -32,7 +34,7 @@
     @Autowired
     private IBusinessLabExecutiveInfoService labExecutiveInfoService;
 
-    @ApiOperation("实验室检测-部门检测-查询各状态列表（待检测、检测中、检测完）")
+    @ApiOperation("实验室任务-查询各状态列表（待检测、检测中、检测完）")
     @PostMapping("/deptExecutive/List")
     public ReturnDTO<PageInfoBT<SampleLabExecutiveListResponse>> queryDeptExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
@@ -43,10 +45,19 @@
         return ReturnUtil.success(super.packForBT(labExecutiveInfoService.deptLabExecutiveListPage(page, labExecutiveListRequest)));
     }
 
-    /**
-     * 实验室检测-我的检测-查询各状态列表（待检测、检测中、检测完）
-     */
-    @ApiOperation("实验室检测-我的检测-查询各状态列表（待检测、检测中、检测完）")
+    @ApiOperation("实验室任务导出")
+    @PostMapping("/deptExecutive/export")
+    public void deptExportList(@RequestBody @Valid SampleLabExecutiveListRequest request) throws Exception {
+        List<SampleLabExecutiveListResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = labExecutiveInfoService.deptLabExecutiveListByIds(request.getMeasureStatus(), request.getIds());
+        } else {
+            list = labExecutiveInfoService.deptLabExecutiveList(request);
+        }
+        super.exportExcel(SampleLabExecutiveListResponse.class, list, ExportEnum.DEPT_EXECUTIVE_TASK.getSheetName());
+    }
+
+    @ApiOperation("我的任务-查询各状态列表（待检测、检测中、检测完）")
     @PostMapping("/myExecutive/list")
     public ReturnDTO<PageInfoBT<SampleLabExecutiveListResponse>> queryMyExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
@@ -57,19 +68,25 @@
         return ReturnUtil.success(super.packForBT(labExecutiveInfoService.myLabExecutiveListPage(page, labExecutiveListRequest)));
     }
 
-    /**
-     * 实验室检测-我的检测-查询各状态样品数量（待检测、检测中、检测完）
-     */
-    @ApiOperation("实验室检测-我的检测-查询各状态样品数量（待检测、检测中、检测完）")
+    @ApiOperation("我的任务导出")
+    @PostMapping("/myExecutive/export")
+    public void exportList(@RequestBody @Valid SampleLabExecutiveListRequest request) throws Exception {
+        List<SampleLabExecutiveListResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = labExecutiveInfoService.myLabExecutiveListByIds(request.getMeasureStatus(), request.getIds());
+        } else {
+            list = labExecutiveInfoService.myLabExecutiveList(request);
+        }
+        super.exportExcel(SampleLabExecutiveListResponse.class, list, ExportEnum.MY_EXECUTIVE_TASK.getSheetName());
+    }
+
+    @ApiOperation("我的任务-查询各状态样品数量（待检测、检测中、检测完）")
     @GetMapping("/myExecutive/amount")
     public ReturnDTO<List<SampleAmountResponse>> queryMyExecutiveAmount() {
         return ReturnUtil.success(labExecutiveInfoService.myExecutiveAmount());
     }
 
-    /**
-     * 实验室检测-部门检测-分配（分配给具体人员）
-     */
-    @ApiOperation("实验室检测-部门检测-分配按钮（分配给具体人员）")
+    @ApiOperation("实验室任务-分配按钮（分配给具体人员）")
     @PostMapping("/deptExecutive/allocate")
     public ReturnDTO allocateStaff(@RequestBody @Valid SampleAllocateRequest sampleAllocateRequest, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -78,10 +95,7 @@
         return labExecutiveInfoService.allocateStaff(sampleAllocateRequest);
     }
 
-    /**
-     * 实验室检测-我的检测-检定人扫描收入（待检测->检测中）
-     */
-    @ApiOperation("实验室检测-我的检测-检定人扫描收入（待检测->检测中）")
+    @ApiOperation("我的任务-检定人扫描收入（待检测->检测中）")
     @PostMapping("/myExecutive/receive")
     public ReturnDTO sampleReceive(@RequestBody @Valid List<SampleOperateRequest> requestList, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -90,10 +104,7 @@
         return labExecutiveInfoService.sampleReceive(requestList);
     }
 
-    /**
-     * 实验室检测-负责人/检定人扫描检完（检测中->检测完）
-     */
-    @ApiOperation("实验室检测-负责人/检定人扫描检完（检测中->检测完）")
+    @ApiOperation("实验室任务-负责人/检定人扫描检完（检测中->检测完）")
     @PostMapping("/myExecutive/complete")
     public ReturnDTO sampleExecutiveComplete(@RequestBody @Valid List<SampleOperateRequest> requestList, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -102,10 +113,7 @@
         return labExecutiveInfoService.sampleExecutiveComplete(requestList);
     }
 
-    /**
-     * 实验室检测-部门检测/我的检测 编辑（只能修改应出具证书）
-     */
-    @ApiOperation("实验室检测-部门检测/我的检测 编辑（只能修改应出具证书）")
+    @ApiOperation("实验室任务/我的任务 编辑（只能修改应出具证书）")
     @PostMapping("/executive/update")
     public ReturnDTO updateExecutive(@RequestBody @Valid UpdateExecutiveRequest request, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -114,10 +122,7 @@
         return labExecutiveInfoService.updateExecutive(request);
     }
 
-    /**
-     * 实验室检测-部门检测/我的检测 详情
-     */
-    @ApiOperation("实验室检测-部门检测/我的检测 详情")
+    @ApiOperation("实验室任务/我的任务 详情")
     @PostMapping("/executive/detail")
     public ReturnDTO<ExecutiveDetailResponse> executiveDetail(@RequestBody @Valid ExecutiveDetailRequest request, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
@@ -131,7 +136,7 @@
      * 退回后会将下一个要执行的实验室检测状态更新为待分配，将后面的实验室顺序变更为连续（都进行减1）
      * 最后一个检测的实验室退回，等分发员再增加实验室或设备收发中的已收入直接手动点击完成
      */
-    @ApiOperation("实验室检测-部门检测/我的检测 退回（待检测/检测中->退回）")
+    @ApiOperation("实验室任务/我的任务 退回（待检测/检测中->退回）")
     @PostMapping("/executive/sendBack")
     public ReturnDTO executiveSendBack(@RequestBody @Valid ExecutiveSendBackRequest request, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -140,9 +145,6 @@
         return labExecutiveInfoService.sampleExecutiveSendBack(request);
     }
 
-    /**
-     * 分发员编辑实验室检测列表
-     */
     @ApiOperation("分发员编辑实验室检测列表")
     @PostMapping("/handOut/updateList")
     public ReturnDTO updateExecutiveList(@RequestBody @Valid UpdateExecutiveListRequest request, BindingResult bindingResult) {
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java
index 48a67ed..0c04f31 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java
@@ -10,6 +10,7 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.resource.customer.CustomerApprovalListRequest;
 import com.casic.missiles.dto.resource.customer.CustomerSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceCustomerInfo;
@@ -26,6 +27,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -55,6 +57,13 @@
         return customerInfoService.saveCustomerInfo(request);
     }
 
+    @ApiOperation("委托方名录导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody CustomerApprovalListRequest request) throws Exception {
+        List<BizResourceCustomerInfo> list = super.exportList(request);
+        super.exportExcel(BizResourceCustomerInfo.class, list, ExportEnum.CUSTOMER_INFO.getSheetName());
+    }
+
     @ApiOperation("委托方人员列表（分页）")
     @PostMapping("/person/listPage")
     public ReturnDTO<PageInfoBT<BizResourceCustomerStaff>> personListPage(@RequestBody IdDTO idDto) {
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
index 972ed4b..6418ea5 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
@@ -5,6 +5,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.resource.customer.SuggestFormApprovalListRequest;
 import com.casic.missiles.dto.resource.customer.SuggestFormSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceCustomerSuggestForm;
@@ -20,6 +21,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -50,4 +52,11 @@
         return suggestFormService.saveSuggestForm(request);
     }
 
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody SuggestFormApprovalListRequest request) throws Exception {
+        List<BizResourceCustomerSuggestForm> list = super.exportList(request);
+        super.exportExcel(BizResourceCustomerSuggestForm.class, list, ExportEnum.CUSTOMER_SUGGEST_FORM.getSheetName());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java
index 1934d1a..9e07eab 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java
@@ -15,12 +15,16 @@
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.resource.IEnvEnvironmentRecordConfigService;
 import com.casic.missiles.service.resource.IEnvEnvironmentRecordDataService;
+import com.casic.missiles.service.resource.IEnvLocationInfoService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
 import java.util.List;
@@ -39,6 +43,8 @@
     private IEnvEnvironmentRecordDataService environmentRecordDataService;
     @Autowired
     private IEnvEnvironmentRecordConfigService environmentRecordConfigService;
+    @Autowired
+    private IEnvLocationInfoService locationInfoService;
 
     @ApiOperation("环境记录单数据列表/详情")
     @PostMapping("/data/listPage")
@@ -95,4 +101,11 @@
         });
         return environmentRecordConfigService.deleteEnvironmentRecordConfig(idDTO.getId());
     }
+
+    @ApiOperation("地点列表")
+    @PostMapping("/location/listPage")
+    public ReturnDTO<PageInfoBT<LocationListResponse>> locationListPage(@RequestBody @Valid LocationListRequest request) {
+        Page<LocationListResponse> page = PageFactory.defaultPage();
+        return ReturnUtil.success(super.packForBT(locationInfoService.listPage(page, request)));
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java
index 82efe3f..e9561fa 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java
@@ -10,6 +10,7 @@
 import com.casic.missiles.dto.resource.seal.SealLogListRequest;
 import com.casic.missiles.dto.resource.seal.SealNoteApprovalListRequest;
 import com.casic.missiles.dto.resource.seal.SealNoteSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceSealUseLog;
@@ -27,6 +28,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -58,6 +60,13 @@
         return sealUseNoteService.saveSeal(request);
     }
 
+    @ApiOperation("印章使用登记导出（列表和导出中去掉经办人和监印人）")
+    @PostMapping("/listExport")
+    public void export(@RequestBody SealNoteApprovalListRequest request) throws Exception {
+        List<BizResourceSealUseNote> list = super.exportList(request);
+        super.exportExcel(BizResourceSealUseNote.class, list, ExportEnum.SEAL_NOTE.getSheetName());
+    }
+
     // TODO: 2023/7/28 印章使用日志：系统中使用印章时插入数据库
 
     @ApiOperation("印章使用日志列表（分页）")
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java
index 9b674fc..06b6521 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java
@@ -9,16 +9,20 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.resource.staff.StaffCertRequest;
 import com.casic.missiles.dto.resource.staff.StaffCertResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.service.resource.IBizResourceStaffInfoService;
 import com.casic.missiles.service.resource.IBizResourceStaffVerifierService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.List;
+
 /**
  * @Description:
  * @Author: wangpeng
@@ -41,9 +45,21 @@
         return ReturnUtil.success(super.packForBT(responsePage));
     }
 
+    @ApiOperation("证书逾期提醒导出")
+    @PostMapping("/listExport")
+    public void exportList(@RequestBody StaffCertRequest request) throws Exception {
+        List<StaffCertResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = staffInfoService.certListByIds(request.getIds());
+        } else {
+            list = staffInfoService.certList(request);
+        }
+        super.exportExcel(StaffCertResponse.class, list, ExportEnum.STAFF_CERTIFICATE_EXPIRE.getSheetName());
+    }
+
     @ApiOperation("证书逾期提醒")
     @PostMapping("/expirationReminder")
-    public ReturnDTO expirationReminder(@RequestBody IdDTO idDto) {
-        return verifierService.expirationReminder(idDto);
+    public ReturnDTO expirationReminder(@RequestBody IdDTO idDTO) {
+        return verifierService.expirationReminder(idDTO);
     }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java
index 3b251ad..a6e7850 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java
@@ -12,6 +12,7 @@
 import com.casic.missiles.dto.resource.staff.StaffListRequest;
 import com.casic.missiles.dto.resource.staff.TrainListRequest;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.*;
@@ -22,7 +23,10 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
 import java.util.List;
@@ -52,8 +56,19 @@
             throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
         }
         Page<BizResourceStaffInfo> page = PageFactory.defaultPage();
-        Page<BizResourceStaffInfo> responsePage = staffInfoService.listPage(page, request);
-        return ReturnUtil.success(super.packForBT(responsePage));
+        return ReturnUtil.success(super.packForBT(staffInfoService.listPage(page, request)));
+    }
+
+    @ApiOperation("人员登记导出")
+    @PostMapping("/listExport")
+    public void exportList(@RequestBody StaffListRequest request) throws Exception {
+        List<BizResourceStaffInfo> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = staffInfoService.listByIds(request.getIds());
+        } else {
+            list = staffInfoService.list(request);
+        }
+        super.exportExcel(BizResourceStaffInfo.class, list, ExportEnum.STAFF_INFO.getSheetName());
     }
 
     @ApiOperation("人员登记详情基础信息")
@@ -85,9 +100,9 @@
 
     @ApiOperation("科研教育列表（分页）")
     @PostMapping("/education/listPage")
-    public ReturnDTO<PageInfoBT<BizResourceStaffEducation>> educationListPage(@RequestBody IdDTO idDto) {
+    public ReturnDTO<PageInfoBT<BizResourceStaffEducation>> educationListPage(@RequestBody IdDTO idDTO) {
         Page<BizResourceStaffEducation> page = PageFactory.defaultPage();
-        Page<BizResourceStaffEducation> responsePage = staffInfoService.educationListPage(page, idDto);
+        Page<BizResourceStaffEducation> responsePage = staffInfoService.educationListPage(page, idDTO);
         return ReturnUtil.success(super.packForBT(responsePage));
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java
index af6aa86..d85d84a 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java
@@ -9,6 +9,7 @@
 import com.casic.missiles.dto.resource.outsideService.SupplierApprovalListRequest;
 import com.casic.missiles.dto.resource.outsideService.SupplierSaveResponse;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceSupplierAbility;
@@ -67,6 +68,13 @@
         return ReturnUtil.success(supplierInfoService.detail(idDTO.getId()));
     }
 
+    @ApiOperation("合格供方导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody SupplierApprovalListRequest request) throws Exception {
+        List<BizResourceSupplierInfo> list = super.exportList(request);
+        super.exportExcel(BizResourceSupplierInfo.class, list, ExportEnum.SUPPLIER_INFO.getSheetName());
+    }
+
     @ApiOperation("供方人员列表（分页）")
     @PostMapping("/person/listPage")
     public ReturnDTO<PageInfoBT<BizResourceSupplierPerson>> personListPage(@RequestBody IdDTO idDTO) {
diff --git a/casic-metering-api/src/main/resources/config/application.yml b/casic-metering-api/src/main/resources/config/application.yml
index 350db5f..ecff521 100644
--- a/casic-metering-api/src/main/resources/config/application.yml
+++ b/casic-metering-api/src/main/resources/config/application.yml
@@ -126,7 +126,7 @@
     #作者
     author: wangpeng
     #待生成对象表名
-    table-name: biz_equipment_technical_target_approval,biz_equipment_attachment_approval,biz_equipment_checkpoint_approval
+    table-name: biz_business_outsource_protocol
 
 reminder:
   #节点--common模块config包 ReminderNodeConfig配置

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java
index bb0c50f..13a699b 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java
@@ -12,6 +12,7 @@
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.IGeneralApprovalService;
+import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
@@ -19,6 +20,7 @@
 import org.springframework.web.bind.annotation.RequestBody;
 
 import javax.validation.Valid;
+import java.util.List;
 import java.util.Objects;
 
 /**
@@ -117,4 +119,17 @@
         }
         return baseApprovalService.failUpdate(request);
     }
+
+    public List<O> exportList(@RequestBody @Valid R request) throws Exception {
+        List<O> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = baseApprovalService.listExportByIds(request.getIds());
+        } else {
+            list = baseApprovalService.listExport(request);
+        }
+        for (O record : list) {
+            DictCodeUtils.convertDictCodeToName(record);
+        }
+        return list;
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java
index 8a90961..d775831 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java
@@ -5,6 +5,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.business.certificate.CertificateChangeApplyApprovalListRequest;
 import com.casic.missiles.dto.business.certificate.CertificateChangeApplySaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessCertificateChangeApply;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
@@ -20,6 +21,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -48,4 +50,12 @@
         }
         return changeApplyService.saveChangeApply(request);
     }
+
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody CertificateChangeApplyApprovalListRequest request) throws Exception {
+        List<BizBusinessCertificateChangeApply> list = super.exportList(request);
+        super.exportExcel(BizBusinessCertificateChangeApply.class, list, ExportEnum.CERTIFICATE_CHANGE_APPLY.getSheetName());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java
index 5fc4b07..af8230e 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java
@@ -9,6 +9,7 @@
 import com.casic.missiles.dto.business.certificate.CertificatePrintApprovalListRequest;
 import com.casic.missiles.dto.business.certificate.CertificatePrintListResponse;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.enums.business.CertificatePrintStatusEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessCertificatePrintLog;
@@ -18,10 +19,16 @@
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.io.IOException;
+import java.util.List;
 import java.util.Objects;
 
 /**
@@ -98,4 +105,16 @@
         });
         return certificatePrintService.certificatePrintLog(idDTO.getId());
     }
+
+    @ApiOperation("证书打印审批导出")
+    @PostMapping("/listExport")
+    public void exportList(@RequestBody CertificatePrintApprovalListRequest request) throws IOException {
+        List<CertificatePrintListResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = certificatePrintService.listByIds(request.getIds());
+        } else {
+            list = certificatePrintService.list(request);
+        }
+        super.exportExcel(CertificatePrintListResponse.class, list, ExportEnum.CERTIFICATE_PRINT.getSheetName());
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java
index 63b06dc..6b2efd5 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java
@@ -6,6 +6,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.business.certificate.CertificateReportApprovalListRequest;
 import com.casic.missiles.dto.business.certificate.CertificateReportSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessCertificateReport;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
@@ -21,6 +22,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -50,7 +52,7 @@
         return certificateReportService.saveCertificateReport(request);
     }
 
-    @ApiOperation("证书审批详情（基本信息）")
+    @ApiOperation("详情（基本信息）")
     @PostMapping("/detail")
     public ReturnDTO<BizBusinessCertificateReport> detail(@RequestBody @Valid BaseDetailRequest request, BindingResult bindingResult) throws Exception {
         if(bindingResult.hasErrors()){
@@ -59,4 +61,11 @@
         return certificateReportService.detail(request);
     }
 
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody CertificateReportApprovalListRequest request) throws Exception {
+        List<BizBusinessCertificateReport> list = super.exportList(request);
+        super.exportExcel(BizBusinessCertificateReport.class, list, ExportEnum.CERTIFICATE_REPORT.getSheetName());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java
index 46b26bd..57c0809 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java
@@ -10,20 +10,21 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.business.identify.IdentifyListRequest;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessIdentifyInfo;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.business.IBizBusinessIdentifyInfoService;
+import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import javax.validation.Valid;
+import java.util.List;
 import java.util.Objects;
 
 /**
@@ -57,16 +58,13 @@
         return identifyInfoService.addIdentify(identifyInfo);
     }
 
-    @ApiOperation("标识打印更新")
+    @ApiOperation("标识打印更新（更新打印时间）")
     @PostMapping("/update")
-    public ReturnDTO updateIdentify(@RequestBody @Valid BizBusinessIdentifyInfo identifyInfo, BindingResult bindingResult) {
-        Assert.isFalse(Objects.isNull(identifyInfo.getId()), () -> {
+    public ReturnDTO updateIdentify(@RequestBody @Valid IdDTO idDTO) {
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        Assert.isFalse(bindingResult.hasErrors(), () -> {
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        });
-        return identifyInfoService.updateIdentify(identifyInfo);
+        return identifyInfoService.updateIdentify(idDTO.getId());
     }
 
     @ApiOperation("标识打印删除")
@@ -77,4 +75,37 @@
         });
         return identifyInfoService.deleteIdentify(idDTO.getId());
     }
+
+    @ApiOperation("标识打印导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody @Valid IdentifyListRequest request, BindingResult bindingResult) throws Exception {
+        if (bindingResult.hasErrors()) {
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        List<BizBusinessIdentifyInfo> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = identifyInfoService.listByIds(request.getIds());
+        } else {
+            list = identifyInfoService.list(request);
+        }
+        for (BizBusinessIdentifyInfo record : list) {
+            DictCodeUtils.convertDictCodeToName(record);
+        }
+        super.exportExcel(BizBusinessIdentifyInfo.class, list, ExportEnum.IDENTIFY_EXPORT.getSheetName());
+    }
+
+
+    // TODO: 2023/8/23 查询设备信息，4个底部按钮查设备（按钮的作用就是前端用来调不同接口、用来区分中间即将展示的标识），前端弹窗选设备，在确定保存时前端根据底部按钮判断传入设备类型deviceType字典code
+    // TODO: 2023/8/23 接口：查受检设备（第1个按钮），查设备台账（后3个按钮同一接口），查询之后前端根据标志类型的不同加到中间页面时进行判断（按产品给的对应表）
+    // TODO: 2023/8/23 提供二维码接口，前端在加到中间页面时调用一下
+
+    @ApiOperation("设备二维码")
+    @PostMapping("/equipment/qrCode")
+    public ReturnDTO<String> equipmentQrCode(@RequestBody @Valid IdDTO idDTO) {
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return identifyInfoService.equipmentQrCode(idDTO.getId());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java
index 707be6e..7e0453d 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java
@@ -117,7 +117,7 @@
     }
 
     @ApiOperation("任务单导出")
-    @PostMapping("/export")
+    @PostMapping("/listExport")
     public void orderExport(@RequestBody @Valid OrderListRequest request, HttpServletResponse response) {
         businessOrderService.orderExport(request, response);
     }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java
index 529a6ce..51432be 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java
@@ -1,9 +1,28 @@
 package com.casic.missiles.controller.business;
 
+import com.casic.missiles.controller.GeneralApprovalController;
+import com.casic.missiles.dto.BaseApprovalSubmitRequest;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.business.outsource.OutsourceAssessApprovalListRequest;
+import com.casic.missiles.dto.business.outsource.OutsourceAssessSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
+import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.model.business.BizBusinessOutsourceAssess;
+import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
+import com.casic.missiles.service.IGeneralApprovalService;
+import com.casic.missiles.service.business.IBizBusinessOutsourceAssessService;
 import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.BindingResult;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.validation.Valid;
+import java.util.List;
+
 /**
  * <p>
  * 计量检定业务-分包管理-测试、校准或检定工作分包评审表 前端控制器
@@ -15,6 +34,27 @@
 @Api(tags = "分包管理-测试、校准或检定工作分包评审表")
 @RestController
 @RequestMapping("/business/outsource/assess")
-public class BizBusinessOutsourceAssessController {
+public class BizBusinessOutsourceAssessController extends GeneralApprovalController<BizBusinessOutsourceAssess, BizBusinessOutsourceAssess, OutsourceAssessApprovalListRequest, BaseApprovalSubmitRequest> {
+    @Autowired
+    private IBizBusinessOutsourceAssessService outsourceAssessService;
 
+    public BizBusinessOutsourceAssessController(IGeneralApprovalService<BizBusinessOutsourceAssess, BizBusinessOutsourceAssess, OutsourceAssessApprovalListRequest, BaseApprovalSubmitRequest> baseApprovalService) {
+        super(baseApprovalService);
+    }
+
+    @ApiOperation("草稿箱-保存")
+    @PostMapping("/save")
+    public ReturnDTO<OutsourceAssessSaveResponse> saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceAssess request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        return outsourceAssessService.saveOutsourceAssess(request);
+    }
+
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception {
+        List<BizBusinessOutsourceAssess> list = super.exportList(request);
+        super.exportExcel(BizBusinessOutsourceAssess.class, list, ExportEnum.OUTSOURCE_ASSESS.getSheetName());
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java
new file mode 100644
index 0000000..9adef18
--- /dev/null
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java
@@ -0,0 +1,60 @@
+package com.casic.missiles.controller.business;
+
+import com.casic.missiles.controller.GeneralApprovalController;
+import com.casic.missiles.dto.BaseApprovalSubmitRequest;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.business.outsource.OutsourceProtocolApprovalListRequest;
+import com.casic.missiles.dto.business.outsource.OutsourceProtocolSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
+import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.model.business.BizBusinessOutsourceProtocol;
+import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
+import com.casic.missiles.service.IGeneralApprovalService;
+import com.casic.missiles.service.business.IBizBusinessOutsourceProtocolService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.BindingResult;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.validation.Valid;
+import java.util.List;
+
+/**
+ * <p>
+ * 计量检定业务-分包管理-测试、校准或检定工作分包协议书 前端控制器
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-08-24
+ */
+@Api(tags = "分包管理-测试、校准或检定工作分包协议书")
+@RestController
+@RequestMapping("/business/outsource/protocol")
+public class BizBusinessOutsourceProtocolController extends GeneralApprovalController<BizBusinessOutsourceProtocol, BizBusinessOutsourceProtocol, OutsourceProtocolApprovalListRequest, BaseApprovalSubmitRequest> {
+    @Autowired
+    private IBizBusinessOutsourceProtocolService outsourceProtocolService;
+
+    public BizBusinessOutsourceProtocolController(IGeneralApprovalService<BizBusinessOutsourceProtocol, BizBusinessOutsourceProtocol, OutsourceProtocolApprovalListRequest, BaseApprovalSubmitRequest> baseApprovalService) {
+        super(baseApprovalService);
+    }
+
+    @ApiOperation("草稿箱-保存")
+    @PostMapping("/save")
+    public ReturnDTO<OutsourceProtocolSaveResponse> saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceProtocol request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        return outsourceProtocolService.saveOutsourceProtocol(request);
+    }
+
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody OutsourceProtocolApprovalListRequest request) throws Exception {
+        List<BizBusinessOutsourceProtocol> list = super.exportList(request);
+        super.exportExcel(BizBusinessOutsourceProtocol.class, list, ExportEnum.OUTSOURCE_PROTOCOL.getSheetName());
+    }
+}
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java
index 097f645..f0f0943 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java
@@ -17,7 +17,6 @@
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.IGeneralApprovalService;
 import com.casic.missiles.service.business.IBizBusinessOutsourcerInfoService;
-import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -71,19 +70,8 @@
 
     @ApiOperation("分包方导出")
     @PostMapping("/listExport")
-    public void export(@RequestBody @Valid OutsourcerInfoApprovalListRequest request, BindingResult bindingResult) throws Exception {
-        if (bindingResult.hasErrors()) {
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        }
-        List<BizBusinessOutsourcerInfo> list;
-        if (!CollectionUtils.isEmpty(request.getIds())) {
-            list = outsourcerInfoService.listByIds(request.getIds());
-        } else {
-            list = outsourcerInfoService.list(request);
-        }
-        for (BizBusinessOutsourcerInfo record : list) {
-            DictCodeUtils.convertDictCodeToName(record);
-        }
+    public void export(@RequestBody OutsourcerInfoApprovalListRequest request) throws Exception {
+        List<BizBusinessOutsourcerInfo> list = super.exportList(request);
         super.exportExcel(BizBusinessOutsourcerInfo.class, list, ExportEnum.OUTSOURCER_EXPORT.getSheetName());
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java
index c2cbf9f..0410918 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java
@@ -17,11 +17,9 @@
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.IGeneralApprovalService;
 import com.casic.missiles.service.business.IBizBusinessSiteExecutiveInfoService;
-import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -60,7 +58,7 @@
         return siteExecutiveInfoService.saveSiteExecutiveInfo(siteExecutiveInfo);
     }
 
-    @ApiOperation("现场检测详情")
+    @ApiOperation("详情")
     @PostMapping("/detail")
     public ReturnDTO<SiteExecutiveDetailResponse> siteExecutiveDetail(@RequestBody @Valid IdDTO idDTO) throws Exception {
         Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
@@ -69,21 +67,10 @@
         return ReturnUtil.success(siteExecutiveInfoService.detail(idDTO.getId()));
     }
 
-    @ApiOperation("现场检测导出")
+    @ApiOperation("导出")
     @PostMapping("/listExport")
-    public void export(@RequestBody @Valid SiteExecutiveApprovalListRequest request, BindingResult bindingResult) throws Exception {
-        if (bindingResult.hasErrors()) {
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        }
-        List<SiteExecutiveApprovalListResponse> list;
-        if (!CollectionUtils.isEmpty(request.getIds())) {
-            list = siteExecutiveInfoService.listInfoByIds(request.getIds());
-        } else {
-            list = siteExecutiveInfoService.listInfo(request);
-        }
-        for (SiteExecutiveApprovalListResponse record : list) {
-            DictCodeUtils.convertDictCodeToName(record);
-        }
+    public void export(@RequestBody SiteExecutiveApprovalListRequest request) throws Exception {
+        List<SiteExecutiveApprovalListResponse> list = super.exportList(request);
         super.exportExcel(SiteExecutiveApprovalListResponse.class, list, ExportEnum.SITE_EXECUTIVE_EXPORT.getSheetName());
     }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
index 7e793cd..a92e209 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
@@ -55,7 +55,7 @@
 
     @ApiOperation("设备收发列表导出")
     @PostMapping("/export")
-    public void exportList(@RequestBody @Valid SampleDispatchListRequest request) throws IOException {
+    public void exportList(@RequestBody SampleDispatchListRequest request) throws IOException {
         List<SampleDispatchListResponse> list;
         if (!CollectionUtils.isEmpty(request.getIds())) {
             list = dispatchService.listByIds(request.getIds());
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java
index cdc77fc..d120fd4 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java
@@ -7,6 +7,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.business.labExecutive.*;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.business.IBusinessLabExecutiveInfoService;
@@ -14,6 +15,7 @@
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.*;
 
@@ -32,7 +34,7 @@
     @Autowired
     private IBusinessLabExecutiveInfoService labExecutiveInfoService;
 
-    @ApiOperation("实验室检测-部门检测-查询各状态列表（待检测、检测中、检测完）")
+    @ApiOperation("实验室任务-查询各状态列表（待检测、检测中、检测完）")
     @PostMapping("/deptExecutive/List")
     public ReturnDTO<PageInfoBT<SampleLabExecutiveListResponse>> queryDeptExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
@@ -43,10 +45,19 @@
         return ReturnUtil.success(super.packForBT(labExecutiveInfoService.deptLabExecutiveListPage(page, labExecutiveListRequest)));
     }
 
-    /**
-     * 实验室检测-我的检测-查询各状态列表（待检测、检测中、检测完）
-     */
-    @ApiOperation("实验室检测-我的检测-查询各状态列表（待检测、检测中、检测完）")
+    @ApiOperation("实验室任务导出")
+    @PostMapping("/deptExecutive/export")
+    public void deptExportList(@RequestBody @Valid SampleLabExecutiveListRequest request) throws Exception {
+        List<SampleLabExecutiveListResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = labExecutiveInfoService.deptLabExecutiveListByIds(request.getMeasureStatus(), request.getIds());
+        } else {
+            list = labExecutiveInfoService.deptLabExecutiveList(request);
+        }
+        super.exportExcel(SampleLabExecutiveListResponse.class, list, ExportEnum.DEPT_EXECUTIVE_TASK.getSheetName());
+    }
+
+    @ApiOperation("我的任务-查询各状态列表（待检测、检测中、检测完）")
     @PostMapping("/myExecutive/list")
     public ReturnDTO<PageInfoBT<SampleLabExecutiveListResponse>> queryMyExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
@@ -57,19 +68,25 @@
         return ReturnUtil.success(super.packForBT(labExecutiveInfoService.myLabExecutiveListPage(page, labExecutiveListRequest)));
     }
 
-    /**
-     * 实验室检测-我的检测-查询各状态样品数量（待检测、检测中、检测完）
-     */
-    @ApiOperation("实验室检测-我的检测-查询各状态样品数量（待检测、检测中、检测完）")
+    @ApiOperation("我的任务导出")
+    @PostMapping("/myExecutive/export")
+    public void exportList(@RequestBody @Valid SampleLabExecutiveListRequest request) throws Exception {
+        List<SampleLabExecutiveListResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = labExecutiveInfoService.myLabExecutiveListByIds(request.getMeasureStatus(), request.getIds());
+        } else {
+            list = labExecutiveInfoService.myLabExecutiveList(request);
+        }
+        super.exportExcel(SampleLabExecutiveListResponse.class, list, ExportEnum.MY_EXECUTIVE_TASK.getSheetName());
+    }
+
+    @ApiOperation("我的任务-查询各状态样品数量（待检测、检测中、检测完）")
     @GetMapping("/myExecutive/amount")
     public ReturnDTO<List<SampleAmountResponse>> queryMyExecutiveAmount() {
         return ReturnUtil.success(labExecutiveInfoService.myExecutiveAmount());
     }
 
-    /**
-     * 实验室检测-部门检测-分配（分配给具体人员）
-     */
-    @ApiOperation("实验室检测-部门检测-分配按钮（分配给具体人员）")
+    @ApiOperation("实验室任务-分配按钮（分配给具体人员）")
     @PostMapping("/deptExecutive/allocate")
     public ReturnDTO allocateStaff(@RequestBody @Valid SampleAllocateRequest sampleAllocateRequest, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -78,10 +95,7 @@
         return labExecutiveInfoService.allocateStaff(sampleAllocateRequest);
     }
 
-    /**
-     * 实验室检测-我的检测-检定人扫描收入（待检测->检测中）
-     */
-    @ApiOperation("实验室检测-我的检测-检定人扫描收入（待检测->检测中）")
+    @ApiOperation("我的任务-检定人扫描收入（待检测->检测中）")
     @PostMapping("/myExecutive/receive")
     public ReturnDTO sampleReceive(@RequestBody @Valid List<SampleOperateRequest> requestList, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -90,10 +104,7 @@
         return labExecutiveInfoService.sampleReceive(requestList);
     }
 
-    /**
-     * 实验室检测-负责人/检定人扫描检完（检测中->检测完）
-     */
-    @ApiOperation("实验室检测-负责人/检定人扫描检完（检测中->检测完）")
+    @ApiOperation("实验室任务-负责人/检定人扫描检完（检测中->检测完）")
     @PostMapping("/myExecutive/complete")
     public ReturnDTO sampleExecutiveComplete(@RequestBody @Valid List<SampleOperateRequest> requestList, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -102,10 +113,7 @@
         return labExecutiveInfoService.sampleExecutiveComplete(requestList);
     }
 
-    /**
-     * 实验室检测-部门检测/我的检测 编辑（只能修改应出具证书）
-     */
-    @ApiOperation("实验室检测-部门检测/我的检测 编辑（只能修改应出具证书）")
+    @ApiOperation("实验室任务/我的任务 编辑（只能修改应出具证书）")
     @PostMapping("/executive/update")
     public ReturnDTO updateExecutive(@RequestBody @Valid UpdateExecutiveRequest request, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -114,10 +122,7 @@
         return labExecutiveInfoService.updateExecutive(request);
     }
 
-    /**
-     * 实验室检测-部门检测/我的检测 详情
-     */
-    @ApiOperation("实验室检测-部门检测/我的检测 详情")
+    @ApiOperation("实验室任务/我的任务 详情")
     @PostMapping("/executive/detail")
     public ReturnDTO<ExecutiveDetailResponse> executiveDetail(@RequestBody @Valid ExecutiveDetailRequest request, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
@@ -131,7 +136,7 @@
      * 退回后会将下一个要执行的实验室检测状态更新为待分配，将后面的实验室顺序变更为连续（都进行减1）
      * 最后一个检测的实验室退回，等分发员再增加实验室或设备收发中的已收入直接手动点击完成
      */
-    @ApiOperation("实验室检测-部门检测/我的检测 退回（待检测/检测中->退回）")
+    @ApiOperation("实验室任务/我的任务 退回（待检测/检测中->退回）")
     @PostMapping("/executive/sendBack")
     public ReturnDTO executiveSendBack(@RequestBody @Valid ExecutiveSendBackRequest request, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -140,9 +145,6 @@
         return labExecutiveInfoService.sampleExecutiveSendBack(request);
     }
 
-    /**
-     * 分发员编辑实验室检测列表
-     */
     @ApiOperation("分发员编辑实验室检测列表")
     @PostMapping("/handOut/updateList")
     public ReturnDTO updateExecutiveList(@RequestBody @Valid UpdateExecutiveListRequest request, BindingResult bindingResult) {
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java
index 48a67ed..0c04f31 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java
@@ -10,6 +10,7 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.resource.customer.CustomerApprovalListRequest;
 import com.casic.missiles.dto.resource.customer.CustomerSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceCustomerInfo;
@@ -26,6 +27,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -55,6 +57,13 @@
         return customerInfoService.saveCustomerInfo(request);
     }
 
+    @ApiOperation("委托方名录导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody CustomerApprovalListRequest request) throws Exception {
+        List<BizResourceCustomerInfo> list = super.exportList(request);
+        super.exportExcel(BizResourceCustomerInfo.class, list, ExportEnum.CUSTOMER_INFO.getSheetName());
+    }
+
     @ApiOperation("委托方人员列表（分页）")
     @PostMapping("/person/listPage")
     public ReturnDTO<PageInfoBT<BizResourceCustomerStaff>> personListPage(@RequestBody IdDTO idDto) {
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
index 972ed4b..6418ea5 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
@@ -5,6 +5,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.resource.customer.SuggestFormApprovalListRequest;
 import com.casic.missiles.dto.resource.customer.SuggestFormSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceCustomerSuggestForm;
@@ -20,6 +21,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -50,4 +52,11 @@
         return suggestFormService.saveSuggestForm(request);
     }
 
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody SuggestFormApprovalListRequest request) throws Exception {
+        List<BizResourceCustomerSuggestForm> list = super.exportList(request);
+        super.exportExcel(BizResourceCustomerSuggestForm.class, list, ExportEnum.CUSTOMER_SUGGEST_FORM.getSheetName());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java
index 1934d1a..9e07eab 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java
@@ -15,12 +15,16 @@
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.resource.IEnvEnvironmentRecordConfigService;
 import com.casic.missiles.service.resource.IEnvEnvironmentRecordDataService;
+import com.casic.missiles.service.resource.IEnvLocationInfoService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
 import java.util.List;
@@ -39,6 +43,8 @@
     private IEnvEnvironmentRecordDataService environmentRecordDataService;
     @Autowired
     private IEnvEnvironmentRecordConfigService environmentRecordConfigService;
+    @Autowired
+    private IEnvLocationInfoService locationInfoService;
 
     @ApiOperation("环境记录单数据列表/详情")
     @PostMapping("/data/listPage")
@@ -95,4 +101,11 @@
         });
         return environmentRecordConfigService.deleteEnvironmentRecordConfig(idDTO.getId());
     }
+
+    @ApiOperation("地点列表")
+    @PostMapping("/location/listPage")
+    public ReturnDTO<PageInfoBT<LocationListResponse>> locationListPage(@RequestBody @Valid LocationListRequest request) {
+        Page<LocationListResponse> page = PageFactory.defaultPage();
+        return ReturnUtil.success(super.packForBT(locationInfoService.listPage(page, request)));
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java
index 82efe3f..e9561fa 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java
@@ -10,6 +10,7 @@
 import com.casic.missiles.dto.resource.seal.SealLogListRequest;
 import com.casic.missiles.dto.resource.seal.SealNoteApprovalListRequest;
 import com.casic.missiles.dto.resource.seal.SealNoteSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceSealUseLog;
@@ -27,6 +28,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -58,6 +60,13 @@
         return sealUseNoteService.saveSeal(request);
     }
 
+    @ApiOperation("印章使用登记导出（列表和导出中去掉经办人和监印人）")
+    @PostMapping("/listExport")
+    public void export(@RequestBody SealNoteApprovalListRequest request) throws Exception {
+        List<BizResourceSealUseNote> list = super.exportList(request);
+        super.exportExcel(BizResourceSealUseNote.class, list, ExportEnum.SEAL_NOTE.getSheetName());
+    }
+
     // TODO: 2023/7/28 印章使用日志：系统中使用印章时插入数据库
 
     @ApiOperation("印章使用日志列表（分页）")
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java
index 9b674fc..06b6521 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java
@@ -9,16 +9,20 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.resource.staff.StaffCertRequest;
 import com.casic.missiles.dto.resource.staff.StaffCertResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.service.resource.IBizResourceStaffInfoService;
 import com.casic.missiles.service.resource.IBizResourceStaffVerifierService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.List;
+
 /**
  * @Description:
  * @Author: wangpeng
@@ -41,9 +45,21 @@
         return ReturnUtil.success(super.packForBT(responsePage));
     }
 
+    @ApiOperation("证书逾期提醒导出")
+    @PostMapping("/listExport")
+    public void exportList(@RequestBody StaffCertRequest request) throws Exception {
+        List<StaffCertResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = staffInfoService.certListByIds(request.getIds());
+        } else {
+            list = staffInfoService.certList(request);
+        }
+        super.exportExcel(StaffCertResponse.class, list, ExportEnum.STAFF_CERTIFICATE_EXPIRE.getSheetName());
+    }
+
     @ApiOperation("证书逾期提醒")
     @PostMapping("/expirationReminder")
-    public ReturnDTO expirationReminder(@RequestBody IdDTO idDto) {
-        return verifierService.expirationReminder(idDto);
+    public ReturnDTO expirationReminder(@RequestBody IdDTO idDTO) {
+        return verifierService.expirationReminder(idDTO);
     }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java
index 3b251ad..a6e7850 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java
@@ -12,6 +12,7 @@
 import com.casic.missiles.dto.resource.staff.StaffListRequest;
 import com.casic.missiles.dto.resource.staff.TrainListRequest;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.*;
@@ -22,7 +23,10 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
 import java.util.List;
@@ -52,8 +56,19 @@
             throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
         }
         Page<BizResourceStaffInfo> page = PageFactory.defaultPage();
-        Page<BizResourceStaffInfo> responsePage = staffInfoService.listPage(page, request);
-        return ReturnUtil.success(super.packForBT(responsePage));
+        return ReturnUtil.success(super.packForBT(staffInfoService.listPage(page, request)));
+    }
+
+    @ApiOperation("人员登记导出")
+    @PostMapping("/listExport")
+    public void exportList(@RequestBody StaffListRequest request) throws Exception {
+        List<BizResourceStaffInfo> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = staffInfoService.listByIds(request.getIds());
+        } else {
+            list = staffInfoService.list(request);
+        }
+        super.exportExcel(BizResourceStaffInfo.class, list, ExportEnum.STAFF_INFO.getSheetName());
     }
 
     @ApiOperation("人员登记详情基础信息")
@@ -85,9 +100,9 @@
 
     @ApiOperation("科研教育列表（分页）")
     @PostMapping("/education/listPage")
-    public ReturnDTO<PageInfoBT<BizResourceStaffEducation>> educationListPage(@RequestBody IdDTO idDto) {
+    public ReturnDTO<PageInfoBT<BizResourceStaffEducation>> educationListPage(@RequestBody IdDTO idDTO) {
         Page<BizResourceStaffEducation> page = PageFactory.defaultPage();
-        Page<BizResourceStaffEducation> responsePage = staffInfoService.educationListPage(page, idDto);
+        Page<BizResourceStaffEducation> responsePage = staffInfoService.educationListPage(page, idDTO);
         return ReturnUtil.success(super.packForBT(responsePage));
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java
index af6aa86..d85d84a 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java
@@ -9,6 +9,7 @@
 import com.casic.missiles.dto.resource.outsideService.SupplierApprovalListRequest;
 import com.casic.missiles.dto.resource.outsideService.SupplierSaveResponse;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceSupplierAbility;
@@ -67,6 +68,13 @@
         return ReturnUtil.success(supplierInfoService.detail(idDTO.getId()));
     }
 
+    @ApiOperation("合格供方导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody SupplierApprovalListRequest request) throws Exception {
+        List<BizResourceSupplierInfo> list = super.exportList(request);
+        super.exportExcel(BizResourceSupplierInfo.class, list, ExportEnum.SUPPLIER_INFO.getSheetName());
+    }
+
     @ApiOperation("供方人员列表（分页）")
     @PostMapping("/person/listPage")
     public ReturnDTO<PageInfoBT<BizResourceSupplierPerson>> personListPage(@RequestBody IdDTO idDTO) {
diff --git a/casic-metering-api/src/main/resources/config/application.yml b/casic-metering-api/src/main/resources/config/application.yml
index 350db5f..ecff521 100644
--- a/casic-metering-api/src/main/resources/config/application.yml
+++ b/casic-metering-api/src/main/resources/config/application.yml
@@ -126,7 +126,7 @@
     #作者
     author: wangpeng
     #待生成对象表名
-    table-name: biz_equipment_technical_target_approval,biz_equipment_attachment_approval,biz_equipment_checkpoint_approval
+    table-name: biz_business_outsource_protocol
 
 reminder:
   #节点--common模块config包 ReminderNodeConfig配置
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
index 4a19e4e..d47d552 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
@@ -53,6 +53,7 @@
     SUGGEST_FORM_SAVE_FAILED(2509, "委托方意见登记表保存至草稿箱失败"),
     EXAMINE_FORM_SAVE_FAILED(2510, "要求、委托书及合同评审表保存至草稿箱失败"),
     CUSTOMER_EXIST_SAVE_FAILED(2511, "该委托方已存在，请重新选择"),
+    DUPLICATE_LOCATION_NO(2512, "地点编号已存在"),
 
     /**
      * 计量检定业务模块
@@ -68,6 +69,8 @@
     COMPLETE_SAMPLE_NOT_EXIST(2609, "检测中不存在扫描收入的样品"),
     CANNOT_CHANGE_MEASURE_INFO(2610, "无法更改非当前登录用户的检测信息"),
     NON_EXIST_ORDER_OR_SAMPLE(2611, "不存在该委托单或该委托单下的样品"),
+    OUTSOURCE_ACCESS_SAVE_FAILED(2612, "测试、校准或检定工作分包评审表保存至草稿箱失败"),
+    OUTSOURCE_PROTOCOL_SAVE_FAILED(2613, "测试、校准或检定工作分包协议书保存至草稿箱失败"),
 
     /**
      * 历史遗留备用

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java
index bb0c50f..13a699b 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java
@@ -12,6 +12,7 @@
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.IGeneralApprovalService;
+import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
@@ -19,6 +20,7 @@
 import org.springframework.web.bind.annotation.RequestBody;
 
 import javax.validation.Valid;
+import java.util.List;
 import java.util.Objects;
 
 /**
@@ -117,4 +119,17 @@
         }
         return baseApprovalService.failUpdate(request);
     }
+
+    public List<O> exportList(@RequestBody @Valid R request) throws Exception {
+        List<O> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = baseApprovalService.listExportByIds(request.getIds());
+        } else {
+            list = baseApprovalService.listExport(request);
+        }
+        for (O record : list) {
+            DictCodeUtils.convertDictCodeToName(record);
+        }
+        return list;
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java
index 8a90961..d775831 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java
@@ -5,6 +5,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.business.certificate.CertificateChangeApplyApprovalListRequest;
 import com.casic.missiles.dto.business.certificate.CertificateChangeApplySaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessCertificateChangeApply;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
@@ -20,6 +21,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -48,4 +50,12 @@
         }
         return changeApplyService.saveChangeApply(request);
     }
+
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody CertificateChangeApplyApprovalListRequest request) throws Exception {
+        List<BizBusinessCertificateChangeApply> list = super.exportList(request);
+        super.exportExcel(BizBusinessCertificateChangeApply.class, list, ExportEnum.CERTIFICATE_CHANGE_APPLY.getSheetName());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java
index 5fc4b07..af8230e 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java
@@ -9,6 +9,7 @@
 import com.casic.missiles.dto.business.certificate.CertificatePrintApprovalListRequest;
 import com.casic.missiles.dto.business.certificate.CertificatePrintListResponse;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.enums.business.CertificatePrintStatusEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessCertificatePrintLog;
@@ -18,10 +19,16 @@
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.io.IOException;
+import java.util.List;
 import java.util.Objects;
 
 /**
@@ -98,4 +105,16 @@
         });
         return certificatePrintService.certificatePrintLog(idDTO.getId());
     }
+
+    @ApiOperation("证书打印审批导出")
+    @PostMapping("/listExport")
+    public void exportList(@RequestBody CertificatePrintApprovalListRequest request) throws IOException {
+        List<CertificatePrintListResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = certificatePrintService.listByIds(request.getIds());
+        } else {
+            list = certificatePrintService.list(request);
+        }
+        super.exportExcel(CertificatePrintListResponse.class, list, ExportEnum.CERTIFICATE_PRINT.getSheetName());
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java
index 63b06dc..6b2efd5 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java
@@ -6,6 +6,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.business.certificate.CertificateReportApprovalListRequest;
 import com.casic.missiles.dto.business.certificate.CertificateReportSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessCertificateReport;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
@@ -21,6 +22,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -50,7 +52,7 @@
         return certificateReportService.saveCertificateReport(request);
     }
 
-    @ApiOperation("证书审批详情（基本信息）")
+    @ApiOperation("详情（基本信息）")
     @PostMapping("/detail")
     public ReturnDTO<BizBusinessCertificateReport> detail(@RequestBody @Valid BaseDetailRequest request, BindingResult bindingResult) throws Exception {
         if(bindingResult.hasErrors()){
@@ -59,4 +61,11 @@
         return certificateReportService.detail(request);
     }
 
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody CertificateReportApprovalListRequest request) throws Exception {
+        List<BizBusinessCertificateReport> list = super.exportList(request);
+        super.exportExcel(BizBusinessCertificateReport.class, list, ExportEnum.CERTIFICATE_REPORT.getSheetName());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java
index 46b26bd..57c0809 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java
@@ -10,20 +10,21 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.business.identify.IdentifyListRequest;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessIdentifyInfo;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.business.IBizBusinessIdentifyInfoService;
+import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import javax.validation.Valid;
+import java.util.List;
 import java.util.Objects;
 
 /**
@@ -57,16 +58,13 @@
         return identifyInfoService.addIdentify(identifyInfo);
     }
 
-    @ApiOperation("标识打印更新")
+    @ApiOperation("标识打印更新（更新打印时间）")
     @PostMapping("/update")
-    public ReturnDTO updateIdentify(@RequestBody @Valid BizBusinessIdentifyInfo identifyInfo, BindingResult bindingResult) {
-        Assert.isFalse(Objects.isNull(identifyInfo.getId()), () -> {
+    public ReturnDTO updateIdentify(@RequestBody @Valid IdDTO idDTO) {
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        Assert.isFalse(bindingResult.hasErrors(), () -> {
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        });
-        return identifyInfoService.updateIdentify(identifyInfo);
+        return identifyInfoService.updateIdentify(idDTO.getId());
     }
 
     @ApiOperation("标识打印删除")
@@ -77,4 +75,37 @@
         });
         return identifyInfoService.deleteIdentify(idDTO.getId());
     }
+
+    @ApiOperation("标识打印导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody @Valid IdentifyListRequest request, BindingResult bindingResult) throws Exception {
+        if (bindingResult.hasErrors()) {
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        List<BizBusinessIdentifyInfo> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = identifyInfoService.listByIds(request.getIds());
+        } else {
+            list = identifyInfoService.list(request);
+        }
+        for (BizBusinessIdentifyInfo record : list) {
+            DictCodeUtils.convertDictCodeToName(record);
+        }
+        super.exportExcel(BizBusinessIdentifyInfo.class, list, ExportEnum.IDENTIFY_EXPORT.getSheetName());
+    }
+
+
+    // TODO: 2023/8/23 查询设备信息，4个底部按钮查设备（按钮的作用就是前端用来调不同接口、用来区分中间即将展示的标识），前端弹窗选设备，在确定保存时前端根据底部按钮判断传入设备类型deviceType字典code
+    // TODO: 2023/8/23 接口：查受检设备（第1个按钮），查设备台账（后3个按钮同一接口），查询之后前端根据标志类型的不同加到中间页面时进行判断（按产品给的对应表）
+    // TODO: 2023/8/23 提供二维码接口，前端在加到中间页面时调用一下
+
+    @ApiOperation("设备二维码")
+    @PostMapping("/equipment/qrCode")
+    public ReturnDTO<String> equipmentQrCode(@RequestBody @Valid IdDTO idDTO) {
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return identifyInfoService.equipmentQrCode(idDTO.getId());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java
index 707be6e..7e0453d 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java
@@ -117,7 +117,7 @@
     }
 
     @ApiOperation("任务单导出")
-    @PostMapping("/export")
+    @PostMapping("/listExport")
     public void orderExport(@RequestBody @Valid OrderListRequest request, HttpServletResponse response) {
         businessOrderService.orderExport(request, response);
     }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java
index 529a6ce..51432be 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java
@@ -1,9 +1,28 @@
 package com.casic.missiles.controller.business;
 
+import com.casic.missiles.controller.GeneralApprovalController;
+import com.casic.missiles.dto.BaseApprovalSubmitRequest;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.business.outsource.OutsourceAssessApprovalListRequest;
+import com.casic.missiles.dto.business.outsource.OutsourceAssessSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
+import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.model.business.BizBusinessOutsourceAssess;
+import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
+import com.casic.missiles.service.IGeneralApprovalService;
+import com.casic.missiles.service.business.IBizBusinessOutsourceAssessService;
 import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.BindingResult;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.validation.Valid;
+import java.util.List;
+
 /**
  * <p>
  * 计量检定业务-分包管理-测试、校准或检定工作分包评审表 前端控制器
@@ -15,6 +34,27 @@
 @Api(tags = "分包管理-测试、校准或检定工作分包评审表")
 @RestController
 @RequestMapping("/business/outsource/assess")
-public class BizBusinessOutsourceAssessController {
+public class BizBusinessOutsourceAssessController extends GeneralApprovalController<BizBusinessOutsourceAssess, BizBusinessOutsourceAssess, OutsourceAssessApprovalListRequest, BaseApprovalSubmitRequest> {
+    @Autowired
+    private IBizBusinessOutsourceAssessService outsourceAssessService;
 
+    public BizBusinessOutsourceAssessController(IGeneralApprovalService<BizBusinessOutsourceAssess, BizBusinessOutsourceAssess, OutsourceAssessApprovalListRequest, BaseApprovalSubmitRequest> baseApprovalService) {
+        super(baseApprovalService);
+    }
+
+    @ApiOperation("草稿箱-保存")
+    @PostMapping("/save")
+    public ReturnDTO<OutsourceAssessSaveResponse> saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceAssess request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        return outsourceAssessService.saveOutsourceAssess(request);
+    }
+
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception {
+        List<BizBusinessOutsourceAssess> list = super.exportList(request);
+        super.exportExcel(BizBusinessOutsourceAssess.class, list, ExportEnum.OUTSOURCE_ASSESS.getSheetName());
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java
new file mode 100644
index 0000000..9adef18
--- /dev/null
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java
@@ -0,0 +1,60 @@
+package com.casic.missiles.controller.business;
+
+import com.casic.missiles.controller.GeneralApprovalController;
+import com.casic.missiles.dto.BaseApprovalSubmitRequest;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.business.outsource.OutsourceProtocolApprovalListRequest;
+import com.casic.missiles.dto.business.outsource.OutsourceProtocolSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
+import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.model.business.BizBusinessOutsourceProtocol;
+import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
+import com.casic.missiles.service.IGeneralApprovalService;
+import com.casic.missiles.service.business.IBizBusinessOutsourceProtocolService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.BindingResult;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.validation.Valid;
+import java.util.List;
+
+/**
+ * <p>
+ * 计量检定业务-分包管理-测试、校准或检定工作分包协议书 前端控制器
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-08-24
+ */
+@Api(tags = "分包管理-测试、校准或检定工作分包协议书")
+@RestController
+@RequestMapping("/business/outsource/protocol")
+public class BizBusinessOutsourceProtocolController extends GeneralApprovalController<BizBusinessOutsourceProtocol, BizBusinessOutsourceProtocol, OutsourceProtocolApprovalListRequest, BaseApprovalSubmitRequest> {
+    @Autowired
+    private IBizBusinessOutsourceProtocolService outsourceProtocolService;
+
+    public BizBusinessOutsourceProtocolController(IGeneralApprovalService<BizBusinessOutsourceProtocol, BizBusinessOutsourceProtocol, OutsourceProtocolApprovalListRequest, BaseApprovalSubmitRequest> baseApprovalService) {
+        super(baseApprovalService);
+    }
+
+    @ApiOperation("草稿箱-保存")
+    @PostMapping("/save")
+    public ReturnDTO<OutsourceProtocolSaveResponse> saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceProtocol request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        return outsourceProtocolService.saveOutsourceProtocol(request);
+    }
+
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody OutsourceProtocolApprovalListRequest request) throws Exception {
+        List<BizBusinessOutsourceProtocol> list = super.exportList(request);
+        super.exportExcel(BizBusinessOutsourceProtocol.class, list, ExportEnum.OUTSOURCE_PROTOCOL.getSheetName());
+    }
+}
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java
index 097f645..f0f0943 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java
@@ -17,7 +17,6 @@
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.IGeneralApprovalService;
 import com.casic.missiles.service.business.IBizBusinessOutsourcerInfoService;
-import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -71,19 +70,8 @@
 
     @ApiOperation("分包方导出")
     @PostMapping("/listExport")
-    public void export(@RequestBody @Valid OutsourcerInfoApprovalListRequest request, BindingResult bindingResult) throws Exception {
-        if (bindingResult.hasErrors()) {
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        }
-        List<BizBusinessOutsourcerInfo> list;
-        if (!CollectionUtils.isEmpty(request.getIds())) {
-            list = outsourcerInfoService.listByIds(request.getIds());
-        } else {
-            list = outsourcerInfoService.list(request);
-        }
-        for (BizBusinessOutsourcerInfo record : list) {
-            DictCodeUtils.convertDictCodeToName(record);
-        }
+    public void export(@RequestBody OutsourcerInfoApprovalListRequest request) throws Exception {
+        List<BizBusinessOutsourcerInfo> list = super.exportList(request);
         super.exportExcel(BizBusinessOutsourcerInfo.class, list, ExportEnum.OUTSOURCER_EXPORT.getSheetName());
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java
index c2cbf9f..0410918 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java
@@ -17,11 +17,9 @@
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.IGeneralApprovalService;
 import com.casic.missiles.service.business.IBizBusinessSiteExecutiveInfoService;
-import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -60,7 +58,7 @@
         return siteExecutiveInfoService.saveSiteExecutiveInfo(siteExecutiveInfo);
     }
 
-    @ApiOperation("现场检测详情")
+    @ApiOperation("详情")
     @PostMapping("/detail")
     public ReturnDTO<SiteExecutiveDetailResponse> siteExecutiveDetail(@RequestBody @Valid IdDTO idDTO) throws Exception {
         Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
@@ -69,21 +67,10 @@
         return ReturnUtil.success(siteExecutiveInfoService.detail(idDTO.getId()));
     }
 
-    @ApiOperation("现场检测导出")
+    @ApiOperation("导出")
     @PostMapping("/listExport")
-    public void export(@RequestBody @Valid SiteExecutiveApprovalListRequest request, BindingResult bindingResult) throws Exception {
-        if (bindingResult.hasErrors()) {
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        }
-        List<SiteExecutiveApprovalListResponse> list;
-        if (!CollectionUtils.isEmpty(request.getIds())) {
-            list = siteExecutiveInfoService.listInfoByIds(request.getIds());
-        } else {
-            list = siteExecutiveInfoService.listInfo(request);
-        }
-        for (SiteExecutiveApprovalListResponse record : list) {
-            DictCodeUtils.convertDictCodeToName(record);
-        }
+    public void export(@RequestBody SiteExecutiveApprovalListRequest request) throws Exception {
+        List<SiteExecutiveApprovalListResponse> list = super.exportList(request);
         super.exportExcel(SiteExecutiveApprovalListResponse.class, list, ExportEnum.SITE_EXECUTIVE_EXPORT.getSheetName());
     }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
index 7e793cd..a92e209 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
@@ -55,7 +55,7 @@
 
     @ApiOperation("设备收发列表导出")
     @PostMapping("/export")
-    public void exportList(@RequestBody @Valid SampleDispatchListRequest request) throws IOException {
+    public void exportList(@RequestBody SampleDispatchListRequest request) throws IOException {
         List<SampleDispatchListResponse> list;
         if (!CollectionUtils.isEmpty(request.getIds())) {
             list = dispatchService.listByIds(request.getIds());
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java
index cdc77fc..d120fd4 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java
@@ -7,6 +7,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.business.labExecutive.*;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.business.IBusinessLabExecutiveInfoService;
@@ -14,6 +15,7 @@
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.*;
 
@@ -32,7 +34,7 @@
     @Autowired
     private IBusinessLabExecutiveInfoService labExecutiveInfoService;
 
-    @ApiOperation("实验室检测-部门检测-查询各状态列表（待检测、检测中、检测完）")
+    @ApiOperation("实验室任务-查询各状态列表（待检测、检测中、检测完）")
     @PostMapping("/deptExecutive/List")
     public ReturnDTO<PageInfoBT<SampleLabExecutiveListResponse>> queryDeptExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
@@ -43,10 +45,19 @@
         return ReturnUtil.success(super.packForBT(labExecutiveInfoService.deptLabExecutiveListPage(page, labExecutiveListRequest)));
     }
 
-    /**
-     * 实验室检测-我的检测-查询各状态列表（待检测、检测中、检测完）
-     */
-    @ApiOperation("实验室检测-我的检测-查询各状态列表（待检测、检测中、检测完）")
+    @ApiOperation("实验室任务导出")
+    @PostMapping("/deptExecutive/export")
+    public void deptExportList(@RequestBody @Valid SampleLabExecutiveListRequest request) throws Exception {
+        List<SampleLabExecutiveListResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = labExecutiveInfoService.deptLabExecutiveListByIds(request.getMeasureStatus(), request.getIds());
+        } else {
+            list = labExecutiveInfoService.deptLabExecutiveList(request);
+        }
+        super.exportExcel(SampleLabExecutiveListResponse.class, list, ExportEnum.DEPT_EXECUTIVE_TASK.getSheetName());
+    }
+
+    @ApiOperation("我的任务-查询各状态列表（待检测、检测中、检测完）")
     @PostMapping("/myExecutive/list")
     public ReturnDTO<PageInfoBT<SampleLabExecutiveListResponse>> queryMyExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
@@ -57,19 +68,25 @@
         return ReturnUtil.success(super.packForBT(labExecutiveInfoService.myLabExecutiveListPage(page, labExecutiveListRequest)));
     }
 
-    /**
-     * 实验室检测-我的检测-查询各状态样品数量（待检测、检测中、检测完）
-     */
-    @ApiOperation("实验室检测-我的检测-查询各状态样品数量（待检测、检测中、检测完）")
+    @ApiOperation("我的任务导出")
+    @PostMapping("/myExecutive/export")
+    public void exportList(@RequestBody @Valid SampleLabExecutiveListRequest request) throws Exception {
+        List<SampleLabExecutiveListResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = labExecutiveInfoService.myLabExecutiveListByIds(request.getMeasureStatus(), request.getIds());
+        } else {
+            list = labExecutiveInfoService.myLabExecutiveList(request);
+        }
+        super.exportExcel(SampleLabExecutiveListResponse.class, list, ExportEnum.MY_EXECUTIVE_TASK.getSheetName());
+    }
+
+    @ApiOperation("我的任务-查询各状态样品数量（待检测、检测中、检测完）")
     @GetMapping("/myExecutive/amount")
     public ReturnDTO<List<SampleAmountResponse>> queryMyExecutiveAmount() {
         return ReturnUtil.success(labExecutiveInfoService.myExecutiveAmount());
     }
 
-    /**
-     * 实验室检测-部门检测-分配（分配给具体人员）
-     */
-    @ApiOperation("实验室检测-部门检测-分配按钮（分配给具体人员）")
+    @ApiOperation("实验室任务-分配按钮（分配给具体人员）")
     @PostMapping("/deptExecutive/allocate")
     public ReturnDTO allocateStaff(@RequestBody @Valid SampleAllocateRequest sampleAllocateRequest, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -78,10 +95,7 @@
         return labExecutiveInfoService.allocateStaff(sampleAllocateRequest);
     }
 
-    /**
-     * 实验室检测-我的检测-检定人扫描收入（待检测->检测中）
-     */
-    @ApiOperation("实验室检测-我的检测-检定人扫描收入（待检测->检测中）")
+    @ApiOperation("我的任务-检定人扫描收入（待检测->检测中）")
     @PostMapping("/myExecutive/receive")
     public ReturnDTO sampleReceive(@RequestBody @Valid List<SampleOperateRequest> requestList, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -90,10 +104,7 @@
         return labExecutiveInfoService.sampleReceive(requestList);
     }
 
-    /**
-     * 实验室检测-负责人/检定人扫描检完（检测中->检测完）
-     */
-    @ApiOperation("实验室检测-负责人/检定人扫描检完（检测中->检测完）")
+    @ApiOperation("实验室任务-负责人/检定人扫描检完（检测中->检测完）")
     @PostMapping("/myExecutive/complete")
     public ReturnDTO sampleExecutiveComplete(@RequestBody @Valid List<SampleOperateRequest> requestList, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -102,10 +113,7 @@
         return labExecutiveInfoService.sampleExecutiveComplete(requestList);
     }
 
-    /**
-     * 实验室检测-部门检测/我的检测 编辑（只能修改应出具证书）
-     */
-    @ApiOperation("实验室检测-部门检测/我的检测 编辑（只能修改应出具证书）")
+    @ApiOperation("实验室任务/我的任务 编辑（只能修改应出具证书）")
     @PostMapping("/executive/update")
     public ReturnDTO updateExecutive(@RequestBody @Valid UpdateExecutiveRequest request, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -114,10 +122,7 @@
         return labExecutiveInfoService.updateExecutive(request);
     }
 
-    /**
-     * 实验室检测-部门检测/我的检测 详情
-     */
-    @ApiOperation("实验室检测-部门检测/我的检测 详情")
+    @ApiOperation("实验室任务/我的任务 详情")
     @PostMapping("/executive/detail")
     public ReturnDTO<ExecutiveDetailResponse> executiveDetail(@RequestBody @Valid ExecutiveDetailRequest request, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
@@ -131,7 +136,7 @@
      * 退回后会将下一个要执行的实验室检测状态更新为待分配，将后面的实验室顺序变更为连续（都进行减1）
      * 最后一个检测的实验室退回，等分发员再增加实验室或设备收发中的已收入直接手动点击完成
      */
-    @ApiOperation("实验室检测-部门检测/我的检测 退回（待检测/检测中->退回）")
+    @ApiOperation("实验室任务/我的任务 退回（待检测/检测中->退回）")
     @PostMapping("/executive/sendBack")
     public ReturnDTO executiveSendBack(@RequestBody @Valid ExecutiveSendBackRequest request, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -140,9 +145,6 @@
         return labExecutiveInfoService.sampleExecutiveSendBack(request);
     }
 
-    /**
-     * 分发员编辑实验室检测列表
-     */
     @ApiOperation("分发员编辑实验室检测列表")
     @PostMapping("/handOut/updateList")
     public ReturnDTO updateExecutiveList(@RequestBody @Valid UpdateExecutiveListRequest request, BindingResult bindingResult) {
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java
index 48a67ed..0c04f31 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java
@@ -10,6 +10,7 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.resource.customer.CustomerApprovalListRequest;
 import com.casic.missiles.dto.resource.customer.CustomerSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceCustomerInfo;
@@ -26,6 +27,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -55,6 +57,13 @@
         return customerInfoService.saveCustomerInfo(request);
     }
 
+    @ApiOperation("委托方名录导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody CustomerApprovalListRequest request) throws Exception {
+        List<BizResourceCustomerInfo> list = super.exportList(request);
+        super.exportExcel(BizResourceCustomerInfo.class, list, ExportEnum.CUSTOMER_INFO.getSheetName());
+    }
+
     @ApiOperation("委托方人员列表（分页）")
     @PostMapping("/person/listPage")
     public ReturnDTO<PageInfoBT<BizResourceCustomerStaff>> personListPage(@RequestBody IdDTO idDto) {
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
index 972ed4b..6418ea5 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
@@ -5,6 +5,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.resource.customer.SuggestFormApprovalListRequest;
 import com.casic.missiles.dto.resource.customer.SuggestFormSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceCustomerSuggestForm;
@@ -20,6 +21,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -50,4 +52,11 @@
         return suggestFormService.saveSuggestForm(request);
     }
 
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody SuggestFormApprovalListRequest request) throws Exception {
+        List<BizResourceCustomerSuggestForm> list = super.exportList(request);
+        super.exportExcel(BizResourceCustomerSuggestForm.class, list, ExportEnum.CUSTOMER_SUGGEST_FORM.getSheetName());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java
index 1934d1a..9e07eab 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java
@@ -15,12 +15,16 @@
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.resource.IEnvEnvironmentRecordConfigService;
 import com.casic.missiles.service.resource.IEnvEnvironmentRecordDataService;
+import com.casic.missiles.service.resource.IEnvLocationInfoService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
 import java.util.List;
@@ -39,6 +43,8 @@
     private IEnvEnvironmentRecordDataService environmentRecordDataService;
     @Autowired
     private IEnvEnvironmentRecordConfigService environmentRecordConfigService;
+    @Autowired
+    private IEnvLocationInfoService locationInfoService;
 
     @ApiOperation("环境记录单数据列表/详情")
     @PostMapping("/data/listPage")
@@ -95,4 +101,11 @@
         });
         return environmentRecordConfigService.deleteEnvironmentRecordConfig(idDTO.getId());
     }
+
+    @ApiOperation("地点列表")
+    @PostMapping("/location/listPage")
+    public ReturnDTO<PageInfoBT<LocationListResponse>> locationListPage(@RequestBody @Valid LocationListRequest request) {
+        Page<LocationListResponse> page = PageFactory.defaultPage();
+        return ReturnUtil.success(super.packForBT(locationInfoService.listPage(page, request)));
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java
index 82efe3f..e9561fa 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java
@@ -10,6 +10,7 @@
 import com.casic.missiles.dto.resource.seal.SealLogListRequest;
 import com.casic.missiles.dto.resource.seal.SealNoteApprovalListRequest;
 import com.casic.missiles.dto.resource.seal.SealNoteSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceSealUseLog;
@@ -27,6 +28,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -58,6 +60,13 @@
         return sealUseNoteService.saveSeal(request);
     }
 
+    @ApiOperation("印章使用登记导出（列表和导出中去掉经办人和监印人）")
+    @PostMapping("/listExport")
+    public void export(@RequestBody SealNoteApprovalListRequest request) throws Exception {
+        List<BizResourceSealUseNote> list = super.exportList(request);
+        super.exportExcel(BizResourceSealUseNote.class, list, ExportEnum.SEAL_NOTE.getSheetName());
+    }
+
     // TODO: 2023/7/28 印章使用日志：系统中使用印章时插入数据库
 
     @ApiOperation("印章使用日志列表（分页）")
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java
index 9b674fc..06b6521 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java
@@ -9,16 +9,20 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.resource.staff.StaffCertRequest;
 import com.casic.missiles.dto.resource.staff.StaffCertResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.service.resource.IBizResourceStaffInfoService;
 import com.casic.missiles.service.resource.IBizResourceStaffVerifierService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.List;
+
 /**
  * @Description:
  * @Author: wangpeng
@@ -41,9 +45,21 @@
         return ReturnUtil.success(super.packForBT(responsePage));
     }
 
+    @ApiOperation("证书逾期提醒导出")
+    @PostMapping("/listExport")
+    public void exportList(@RequestBody StaffCertRequest request) throws Exception {
+        List<StaffCertResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = staffInfoService.certListByIds(request.getIds());
+        } else {
+            list = staffInfoService.certList(request);
+        }
+        super.exportExcel(StaffCertResponse.class, list, ExportEnum.STAFF_CERTIFICATE_EXPIRE.getSheetName());
+    }
+
     @ApiOperation("证书逾期提醒")
     @PostMapping("/expirationReminder")
-    public ReturnDTO expirationReminder(@RequestBody IdDTO idDto) {
-        return verifierService.expirationReminder(idDto);
+    public ReturnDTO expirationReminder(@RequestBody IdDTO idDTO) {
+        return verifierService.expirationReminder(idDTO);
     }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java
index 3b251ad..a6e7850 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java
@@ -12,6 +12,7 @@
 import com.casic.missiles.dto.resource.staff.StaffListRequest;
 import com.casic.missiles.dto.resource.staff.TrainListRequest;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.*;
@@ -22,7 +23,10 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
 import java.util.List;
@@ -52,8 +56,19 @@
             throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
         }
         Page<BizResourceStaffInfo> page = PageFactory.defaultPage();
-        Page<BizResourceStaffInfo> responsePage = staffInfoService.listPage(page, request);
-        return ReturnUtil.success(super.packForBT(responsePage));
+        return ReturnUtil.success(super.packForBT(staffInfoService.listPage(page, request)));
+    }
+
+    @ApiOperation("人员登记导出")
+    @PostMapping("/listExport")
+    public void exportList(@RequestBody StaffListRequest request) throws Exception {
+        List<BizResourceStaffInfo> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = staffInfoService.listByIds(request.getIds());
+        } else {
+            list = staffInfoService.list(request);
+        }
+        super.exportExcel(BizResourceStaffInfo.class, list, ExportEnum.STAFF_INFO.getSheetName());
     }
 
     @ApiOperation("人员登记详情基础信息")
@@ -85,9 +100,9 @@
 
     @ApiOperation("科研教育列表（分页）")
     @PostMapping("/education/listPage")
-    public ReturnDTO<PageInfoBT<BizResourceStaffEducation>> educationListPage(@RequestBody IdDTO idDto) {
+    public ReturnDTO<PageInfoBT<BizResourceStaffEducation>> educationListPage(@RequestBody IdDTO idDTO) {
         Page<BizResourceStaffEducation> page = PageFactory.defaultPage();
-        Page<BizResourceStaffEducation> responsePage = staffInfoService.educationListPage(page, idDto);
+        Page<BizResourceStaffEducation> responsePage = staffInfoService.educationListPage(page, idDTO);
         return ReturnUtil.success(super.packForBT(responsePage));
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java
index af6aa86..d85d84a 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java
@@ -9,6 +9,7 @@
 import com.casic.missiles.dto.resource.outsideService.SupplierApprovalListRequest;
 import com.casic.missiles.dto.resource.outsideService.SupplierSaveResponse;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceSupplierAbility;
@@ -67,6 +68,13 @@
         return ReturnUtil.success(supplierInfoService.detail(idDTO.getId()));
     }
 
+    @ApiOperation("合格供方导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody SupplierApprovalListRequest request) throws Exception {
+        List<BizResourceSupplierInfo> list = super.exportList(request);
+        super.exportExcel(BizResourceSupplierInfo.class, list, ExportEnum.SUPPLIER_INFO.getSheetName());
+    }
+
     @ApiOperation("供方人员列表（分页）")
     @PostMapping("/person/listPage")
     public ReturnDTO<PageInfoBT<BizResourceSupplierPerson>> personListPage(@RequestBody IdDTO idDTO) {
diff --git a/casic-metering-api/src/main/resources/config/application.yml b/casic-metering-api/src/main/resources/config/application.yml
index 350db5f..ecff521 100644
--- a/casic-metering-api/src/main/resources/config/application.yml
+++ b/casic-metering-api/src/main/resources/config/application.yml
@@ -126,7 +126,7 @@
     #作者
     author: wangpeng
     #待生成对象表名
-    table-name: biz_equipment_technical_target_approval,biz_equipment_attachment_approval,biz_equipment_checkpoint_approval
+    table-name: biz_business_outsource_protocol
 
 reminder:
   #节点--common模块config包 ReminderNodeConfig配置
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
index 4a19e4e..d47d552 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
@@ -53,6 +53,7 @@
     SUGGEST_FORM_SAVE_FAILED(2509, "委托方意见登记表保存至草稿箱失败"),
     EXAMINE_FORM_SAVE_FAILED(2510, "要求、委托书及合同评审表保存至草稿箱失败"),
     CUSTOMER_EXIST_SAVE_FAILED(2511, "该委托方已存在，请重新选择"),
+    DUPLICATE_LOCATION_NO(2512, "地点编号已存在"),
 
     /**
      * 计量检定业务模块
@@ -68,6 +69,8 @@
     COMPLETE_SAMPLE_NOT_EXIST(2609, "检测中不存在扫描收入的样品"),
     CANNOT_CHANGE_MEASURE_INFO(2610, "无法更改非当前登录用户的检测信息"),
     NON_EXIST_ORDER_OR_SAMPLE(2611, "不存在该委托单或该委托单下的样品"),
+    OUTSOURCE_ACCESS_SAVE_FAILED(2612, "测试、校准或检定工作分包评审表保存至草稿箱失败"),
+    OUTSOURCE_PROTOCOL_SAVE_FAILED(2613, "测试、校准或检定工作分包协议书保存至草稿箱失败"),
 
     /**
      * 历史遗留备用
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
index 5089ad1..81a406b 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
@@ -10,54 +10,38 @@
     /**
      * 资源管理
      */
-    ENVIRONMENT_DATA_EXPORT("environmentData", "environmentData", "环境记录单数据"),
+    ENVIRONMENT_DATA_EXPORT("environmentData", "环境记录单数据", "环境记录单数据"),
+    STAFF_INFO("staffInfo", "人员登记", "人员登记"),
+    STAFF_CERTIFICATE_EXPIRE("certificateExpire", "证书逾期提醒", "证书逾期提醒"),
+    SUPPLIER_INFO("supplierInfo", "合格供方名录", "合格供方名录"),
+    CUSTOMER_INFO("customerInfo", "委托方名录", "委托方名录"),
+    CUSTOMER_SUGGEST_FORM("customerSuggestForm", "委托方意见登记表", "委托方意见登记表"),
+    SEAL_NOTE("sealNote", "印章使用登记", "印章使用登记"),
 
-    FILE_EXPORT("meterFileData", "meterFileData", "计量文件信息"),
-    TRAIN_PLAN_EXPORT("trainPlanData", "trainPlanData", "培训计划"),
-    TRAIN_LOG_EXPORT("trainLogData", "trainLogData", "培训记录"),
-    METER_ORGANIZE_EXPORT("meterOrganizeData", "meterOrganizeData", "计量组织"),
-    TRACE_SUPPLIER_EXPORT("traceSupplierData", "traceSupplierData", "溯源供方"),
-    SIGN_EXPORT("signData", "signData", "签名/签章"),
-    TEMPLATE_EXPORT("templateData", "templateData", "原始记录模板/证书报告模板"),
-    FIXED_ASSETS("meterFixedAssets", "meterFixedAssets", "固定资产"),
-    METER_EQUIPMENT("meterEquipment", "meterEquipment", "测量设备"),
-    CALIBRATION_TEST_EQUIPMENT("calibrationTestEquipment", "calibrationTestEquipment", "校准检定设备"),
-    MEASURE_ACCOUNT("measureAccount", "measureAccount", "测量工装"),
-    STANDARD_SUPPORT_EQUIPMENT("standardSupportEquipment", "standardSupportEquipment", "标准配套设备"),
-    STANDARD_EQUIPMENT("standardEquipment", "standardEquipment", "标准装置"),
-    FLOW_DEF_EXPORT("flowDefData", "flowDefData", "流程定义"),
-    STAFF_CERTIFICATE("certificate", "certificate", "计量人员证书"),
-    CHECK_INFO("checkInfo", "checkInfo", "设备管理点检测"),
-    EQUIPMENT_APPLY("equipmentApply", "equipmentApply", "设备借用"),
-    STANDARD_EQUIPMENT_REMIND("equipmentApplyRemind", "equipmentApplyRemind", "标准装置到期提醒"),
-    METER_PRICE("meterPrice", "meterPrice", "价格库"),
-    METER_STAFF("meterStaff", "meterStaff", "计量人员"),
-    STANDARD_EQUIPMENT_APPLY("standardEquipmentApply", "standardEquipmentApply", "标准装置申请"),
-    STATE_MANAGE_APPLY("stateManage", "stateManage", "状态管理"),
-    METER_ACCEPTANCE_CHECK("acceptanceCheck", "acceptanceCheck", "设备检修保养验收单"),
-    CUSTOMER_EXPORT("customerData", "customerData", "客户信息"),
-    ORDER_EXPORT("orderData", "orderData", "委托书信息"),
-    SAMPLE_EXPORT("sampleData", "sampleData", "样本信息"),
-    EXCHANGE_DATA("exchangeData", "exchangeData", "设备交接单"),
-    DISPATCH_DATA("dispatchData", "dispatchData", "设备收发"),
-    ENVIRONMENT_DATA("environmentData", "environmentData", "环境记录单"),
-    ORIGIN_DATA("originData", "originData", "原始记录"),
-    CERTIFICATE_REPORT("certificateReport", "certificateReport", "证书报告"),
-    ADVICE_EXPORT("adviceData", "adviceData", "客户反馈"),
-    HANDOUT_EXPORT("handoutData", "handoutData", "任务分发列表"),
-    OUTSOURCER_EXPORT("outsourcerData", "outsourcerData", "分包方"),
-    SITE_EXECUTIVE_EXPORT("siteExecutiveData", "siteExecutiveData", "现场测试、校准或检定"),
-    CERTIFICATE_PRINT_EXPORT("certificatePrintData", "certificatePrintData", "证书打印"),
-    DOWNLOAD_TEMPLATE("downloadTemplate", "downloadTemplate", "页面配置"),
-    OUTSOURCER_CERTIFICATE_EXPORT("outsourceCertificateData", "outsourceCertificateData", "分包证书"),
-    SETTLEMENT_INFO_EXPORT("settlementInfoData", "settlementInfoData", "业务结算"),
-    EQUIPMENT_REMIND("equipmentRemind", "equipmentRemind", "设备到期提醒"),
-    AGREEMENT_INFO_EXPORT("agreementInfoData", "agreementInfoData", "合同"),
-    WORK_STATISTICS_EXPORT("workStatisticsData", "workStatisticsData", "实时工作统计"),
-    DEPT_OUTPUT_EXPORT("deptOutputData", "deptOutputData", "部门产值分析"),
-    WORKLOAD_EXPORT("workloadData", "workloadData", "业务工作量分析"),
-    DEPT_COMPREHENSIVE_EXPORT("deptComprehensiveData", "deptComprehensiveData", "部门综合分析"),
-    ENVIRONMENTAL_RECORD("environmentalRecordData", "environmentalRecordData", "现场环境记录");
+    /**
+     * 计量检定业务
+     */
+    OUTSOURCER_EXPORT("outsourcerData", "分包方名录", "分包方名录"),
+    IDENTIFY_EXPORT("identifyData", "计量标识", "计量标识"),
+    ORDER_EXPORT("orderData", "任务单", "任务单"),
+    DISPATCH_DATA("dispatchData", "设备收发", "设备收发"),
+    HANDOUT_EXPORT("handoutData", "任务分发", "任务分发"),
+    SITE_EXECUTIVE_EXPORT("siteExecutiveData", "现场测试、校准或检定", "现场测试、校准或检定"),
+    CERTIFICATE_REPORT("certificateReport", "证书审批", "证书审批"),
+    CERTIFICATE_CHANGE_APPLY("certificateChangeApply", "证书报告补充或更换申请单", "证书报告补充或更换申请单"),
+    CERTIFICATE_PRINT("certificatePrintData", "证书打印审批", "证书打印审批"),
+    DEPT_EXECUTIVE_TASK("deptExecutiveTaskData", "实验室任务", "实验室任务"),
+    MY_EXECUTIVE_TASK("myExecutiveTaskData", "我的任务", "我的任务"),
+    OUTSOURCE_ASSESS("outsourceAssess", "测试、校准或检定工作分包评审表", "测试、校准或检定工作分包评审表"),
+    OUTSOURCE_PROTOCOL("outsourceProtocol", "测试、校准或检定工作分包协议书", "测试、校准或检定工作分包协议书"),
+
+    /**
+     * 系统管理
+     */
+    SIGN_EXPORT("signData", "签名", "签名"),
+    TEMPLATE_EXPORT("templateData", "文件模板", "文件模板"),
+    FLOW_DEF_EXPORT("flowDefData", "流程定义", "流程定义"),
+    DOWNLOAD_TEMPLATE("downloadTemplate", "流程定义", "页面配置");
 
     ExportEnum(String fileName, String sheetName, String description) {
         this.fileName = fileName;

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java
index bb0c50f..13a699b 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java
@@ -12,6 +12,7 @@
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.IGeneralApprovalService;
+import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
@@ -19,6 +20,7 @@
 import org.springframework.web.bind.annotation.RequestBody;
 
 import javax.validation.Valid;
+import java.util.List;
 import java.util.Objects;
 
 /**
@@ -117,4 +119,17 @@
         }
         return baseApprovalService.failUpdate(request);
     }
+
+    public List<O> exportList(@RequestBody @Valid R request) throws Exception {
+        List<O> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = baseApprovalService.listExportByIds(request.getIds());
+        } else {
+            list = baseApprovalService.listExport(request);
+        }
+        for (O record : list) {
+            DictCodeUtils.convertDictCodeToName(record);
+        }
+        return list;
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java
index 8a90961..d775831 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java
@@ -5,6 +5,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.business.certificate.CertificateChangeApplyApprovalListRequest;
 import com.casic.missiles.dto.business.certificate.CertificateChangeApplySaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessCertificateChangeApply;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
@@ -20,6 +21,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -48,4 +50,12 @@
         }
         return changeApplyService.saveChangeApply(request);
     }
+
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody CertificateChangeApplyApprovalListRequest request) throws Exception {
+        List<BizBusinessCertificateChangeApply> list = super.exportList(request);
+        super.exportExcel(BizBusinessCertificateChangeApply.class, list, ExportEnum.CERTIFICATE_CHANGE_APPLY.getSheetName());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java
index 5fc4b07..af8230e 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java
@@ -9,6 +9,7 @@
 import com.casic.missiles.dto.business.certificate.CertificatePrintApprovalListRequest;
 import com.casic.missiles.dto.business.certificate.CertificatePrintListResponse;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.enums.business.CertificatePrintStatusEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessCertificatePrintLog;
@@ -18,10 +19,16 @@
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.io.IOException;
+import java.util.List;
 import java.util.Objects;
 
 /**
@@ -98,4 +105,16 @@
         });
         return certificatePrintService.certificatePrintLog(idDTO.getId());
     }
+
+    @ApiOperation("证书打印审批导出")
+    @PostMapping("/listExport")
+    public void exportList(@RequestBody CertificatePrintApprovalListRequest request) throws IOException {
+        List<CertificatePrintListResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = certificatePrintService.listByIds(request.getIds());
+        } else {
+            list = certificatePrintService.list(request);
+        }
+        super.exportExcel(CertificatePrintListResponse.class, list, ExportEnum.CERTIFICATE_PRINT.getSheetName());
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java
index 63b06dc..6b2efd5 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java
@@ -6,6 +6,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.business.certificate.CertificateReportApprovalListRequest;
 import com.casic.missiles.dto.business.certificate.CertificateReportSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessCertificateReport;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
@@ -21,6 +22,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -50,7 +52,7 @@
         return certificateReportService.saveCertificateReport(request);
     }
 
-    @ApiOperation("证书审批详情（基本信息）")
+    @ApiOperation("详情（基本信息）")
     @PostMapping("/detail")
     public ReturnDTO<BizBusinessCertificateReport> detail(@RequestBody @Valid BaseDetailRequest request, BindingResult bindingResult) throws Exception {
         if(bindingResult.hasErrors()){
@@ -59,4 +61,11 @@
         return certificateReportService.detail(request);
     }
 
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody CertificateReportApprovalListRequest request) throws Exception {
+        List<BizBusinessCertificateReport> list = super.exportList(request);
+        super.exportExcel(BizBusinessCertificateReport.class, list, ExportEnum.CERTIFICATE_REPORT.getSheetName());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java
index 46b26bd..57c0809 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java
@@ -10,20 +10,21 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.business.identify.IdentifyListRequest;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessIdentifyInfo;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.business.IBizBusinessIdentifyInfoService;
+import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import javax.validation.Valid;
+import java.util.List;
 import java.util.Objects;
 
 /**
@@ -57,16 +58,13 @@
         return identifyInfoService.addIdentify(identifyInfo);
     }
 
-    @ApiOperation("标识打印更新")
+    @ApiOperation("标识打印更新（更新打印时间）")
     @PostMapping("/update")
-    public ReturnDTO updateIdentify(@RequestBody @Valid BizBusinessIdentifyInfo identifyInfo, BindingResult bindingResult) {
-        Assert.isFalse(Objects.isNull(identifyInfo.getId()), () -> {
+    public ReturnDTO updateIdentify(@RequestBody @Valid IdDTO idDTO) {
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        Assert.isFalse(bindingResult.hasErrors(), () -> {
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        });
-        return identifyInfoService.updateIdentify(identifyInfo);
+        return identifyInfoService.updateIdentify(idDTO.getId());
     }
 
     @ApiOperation("标识打印删除")
@@ -77,4 +75,37 @@
         });
         return identifyInfoService.deleteIdentify(idDTO.getId());
     }
+
+    @ApiOperation("标识打印导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody @Valid IdentifyListRequest request, BindingResult bindingResult) throws Exception {
+        if (bindingResult.hasErrors()) {
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        List<BizBusinessIdentifyInfo> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = identifyInfoService.listByIds(request.getIds());
+        } else {
+            list = identifyInfoService.list(request);
+        }
+        for (BizBusinessIdentifyInfo record : list) {
+            DictCodeUtils.convertDictCodeToName(record);
+        }
+        super.exportExcel(BizBusinessIdentifyInfo.class, list, ExportEnum.IDENTIFY_EXPORT.getSheetName());
+    }
+
+
+    // TODO: 2023/8/23 查询设备信息，4个底部按钮查设备（按钮的作用就是前端用来调不同接口、用来区分中间即将展示的标识），前端弹窗选设备，在确定保存时前端根据底部按钮判断传入设备类型deviceType字典code
+    // TODO: 2023/8/23 接口：查受检设备（第1个按钮），查设备台账（后3个按钮同一接口），查询之后前端根据标志类型的不同加到中间页面时进行判断（按产品给的对应表）
+    // TODO: 2023/8/23 提供二维码接口，前端在加到中间页面时调用一下
+
+    @ApiOperation("设备二维码")
+    @PostMapping("/equipment/qrCode")
+    public ReturnDTO<String> equipmentQrCode(@RequestBody @Valid IdDTO idDTO) {
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return identifyInfoService.equipmentQrCode(idDTO.getId());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java
index 707be6e..7e0453d 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java
@@ -117,7 +117,7 @@
     }
 
     @ApiOperation("任务单导出")
-    @PostMapping("/export")
+    @PostMapping("/listExport")
     public void orderExport(@RequestBody @Valid OrderListRequest request, HttpServletResponse response) {
         businessOrderService.orderExport(request, response);
     }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java
index 529a6ce..51432be 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java
@@ -1,9 +1,28 @@
 package com.casic.missiles.controller.business;
 
+import com.casic.missiles.controller.GeneralApprovalController;
+import com.casic.missiles.dto.BaseApprovalSubmitRequest;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.business.outsource.OutsourceAssessApprovalListRequest;
+import com.casic.missiles.dto.business.outsource.OutsourceAssessSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
+import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.model.business.BizBusinessOutsourceAssess;
+import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
+import com.casic.missiles.service.IGeneralApprovalService;
+import com.casic.missiles.service.business.IBizBusinessOutsourceAssessService;
 import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.BindingResult;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.validation.Valid;
+import java.util.List;
+
 /**
  * <p>
  * 计量检定业务-分包管理-测试、校准或检定工作分包评审表 前端控制器
@@ -15,6 +34,27 @@
 @Api(tags = "分包管理-测试、校准或检定工作分包评审表")
 @RestController
 @RequestMapping("/business/outsource/assess")
-public class BizBusinessOutsourceAssessController {
+public class BizBusinessOutsourceAssessController extends GeneralApprovalController<BizBusinessOutsourceAssess, BizBusinessOutsourceAssess, OutsourceAssessApprovalListRequest, BaseApprovalSubmitRequest> {
+    @Autowired
+    private IBizBusinessOutsourceAssessService outsourceAssessService;
 
+    public BizBusinessOutsourceAssessController(IGeneralApprovalService<BizBusinessOutsourceAssess, BizBusinessOutsourceAssess, OutsourceAssessApprovalListRequest, BaseApprovalSubmitRequest> baseApprovalService) {
+        super(baseApprovalService);
+    }
+
+    @ApiOperation("草稿箱-保存")
+    @PostMapping("/save")
+    public ReturnDTO<OutsourceAssessSaveResponse> saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceAssess request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        return outsourceAssessService.saveOutsourceAssess(request);
+    }
+
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception {
+        List<BizBusinessOutsourceAssess> list = super.exportList(request);
+        super.exportExcel(BizBusinessOutsourceAssess.class, list, ExportEnum.OUTSOURCE_ASSESS.getSheetName());
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java
new file mode 100644
index 0000000..9adef18
--- /dev/null
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java
@@ -0,0 +1,60 @@
+package com.casic.missiles.controller.business;
+
+import com.casic.missiles.controller.GeneralApprovalController;
+import com.casic.missiles.dto.BaseApprovalSubmitRequest;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.business.outsource.OutsourceProtocolApprovalListRequest;
+import com.casic.missiles.dto.business.outsource.OutsourceProtocolSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
+import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.model.business.BizBusinessOutsourceProtocol;
+import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
+import com.casic.missiles.service.IGeneralApprovalService;
+import com.casic.missiles.service.business.IBizBusinessOutsourceProtocolService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.BindingResult;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.validation.Valid;
+import java.util.List;
+
+/**
+ * <p>
+ * 计量检定业务-分包管理-测试、校准或检定工作分包协议书 前端控制器
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-08-24
+ */
+@Api(tags = "分包管理-测试、校准或检定工作分包协议书")
+@RestController
+@RequestMapping("/business/outsource/protocol")
+public class BizBusinessOutsourceProtocolController extends GeneralApprovalController<BizBusinessOutsourceProtocol, BizBusinessOutsourceProtocol, OutsourceProtocolApprovalListRequest, BaseApprovalSubmitRequest> {
+    @Autowired
+    private IBizBusinessOutsourceProtocolService outsourceProtocolService;
+
+    public BizBusinessOutsourceProtocolController(IGeneralApprovalService<BizBusinessOutsourceProtocol, BizBusinessOutsourceProtocol, OutsourceProtocolApprovalListRequest, BaseApprovalSubmitRequest> baseApprovalService) {
+        super(baseApprovalService);
+    }
+
+    @ApiOperation("草稿箱-保存")
+    @PostMapping("/save")
+    public ReturnDTO<OutsourceProtocolSaveResponse> saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceProtocol request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        return outsourceProtocolService.saveOutsourceProtocol(request);
+    }
+
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody OutsourceProtocolApprovalListRequest request) throws Exception {
+        List<BizBusinessOutsourceProtocol> list = super.exportList(request);
+        super.exportExcel(BizBusinessOutsourceProtocol.class, list, ExportEnum.OUTSOURCE_PROTOCOL.getSheetName());
+    }
+}
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java
index 097f645..f0f0943 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java
@@ -17,7 +17,6 @@
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.IGeneralApprovalService;
 import com.casic.missiles.service.business.IBizBusinessOutsourcerInfoService;
-import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -71,19 +70,8 @@
 
     @ApiOperation("分包方导出")
     @PostMapping("/listExport")
-    public void export(@RequestBody @Valid OutsourcerInfoApprovalListRequest request, BindingResult bindingResult) throws Exception {
-        if (bindingResult.hasErrors()) {
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        }
-        List<BizBusinessOutsourcerInfo> list;
-        if (!CollectionUtils.isEmpty(request.getIds())) {
-            list = outsourcerInfoService.listByIds(request.getIds());
-        } else {
-            list = outsourcerInfoService.list(request);
-        }
-        for (BizBusinessOutsourcerInfo record : list) {
-            DictCodeUtils.convertDictCodeToName(record);
-        }
+    public void export(@RequestBody OutsourcerInfoApprovalListRequest request) throws Exception {
+        List<BizBusinessOutsourcerInfo> list = super.exportList(request);
         super.exportExcel(BizBusinessOutsourcerInfo.class, list, ExportEnum.OUTSOURCER_EXPORT.getSheetName());
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java
index c2cbf9f..0410918 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java
@@ -17,11 +17,9 @@
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.IGeneralApprovalService;
 import com.casic.missiles.service.business.IBizBusinessSiteExecutiveInfoService;
-import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -60,7 +58,7 @@
         return siteExecutiveInfoService.saveSiteExecutiveInfo(siteExecutiveInfo);
     }
 
-    @ApiOperation("现场检测详情")
+    @ApiOperation("详情")
     @PostMapping("/detail")
     public ReturnDTO<SiteExecutiveDetailResponse> siteExecutiveDetail(@RequestBody @Valid IdDTO idDTO) throws Exception {
         Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
@@ -69,21 +67,10 @@
         return ReturnUtil.success(siteExecutiveInfoService.detail(idDTO.getId()));
     }
 
-    @ApiOperation("现场检测导出")
+    @ApiOperation("导出")
     @PostMapping("/listExport")
-    public void export(@RequestBody @Valid SiteExecutiveApprovalListRequest request, BindingResult bindingResult) throws Exception {
-        if (bindingResult.hasErrors()) {
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        }
-        List<SiteExecutiveApprovalListResponse> list;
-        if (!CollectionUtils.isEmpty(request.getIds())) {
-            list = siteExecutiveInfoService.listInfoByIds(request.getIds());
-        } else {
-            list = siteExecutiveInfoService.listInfo(request);
-        }
-        for (SiteExecutiveApprovalListResponse record : list) {
-            DictCodeUtils.convertDictCodeToName(record);
-        }
+    public void export(@RequestBody SiteExecutiveApprovalListRequest request) throws Exception {
+        List<SiteExecutiveApprovalListResponse> list = super.exportList(request);
         super.exportExcel(SiteExecutiveApprovalListResponse.class, list, ExportEnum.SITE_EXECUTIVE_EXPORT.getSheetName());
     }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
index 7e793cd..a92e209 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
@@ -55,7 +55,7 @@
 
     @ApiOperation("设备收发列表导出")
     @PostMapping("/export")
-    public void exportList(@RequestBody @Valid SampleDispatchListRequest request) throws IOException {
+    public void exportList(@RequestBody SampleDispatchListRequest request) throws IOException {
         List<SampleDispatchListResponse> list;
         if (!CollectionUtils.isEmpty(request.getIds())) {
             list = dispatchService.listByIds(request.getIds());
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java
index cdc77fc..d120fd4 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java
@@ -7,6 +7,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.business.labExecutive.*;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.business.IBusinessLabExecutiveInfoService;
@@ -14,6 +15,7 @@
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.*;
 
@@ -32,7 +34,7 @@
     @Autowired
     private IBusinessLabExecutiveInfoService labExecutiveInfoService;
 
-    @ApiOperation("实验室检测-部门检测-查询各状态列表（待检测、检测中、检测完）")
+    @ApiOperation("实验室任务-查询各状态列表（待检测、检测中、检测完）")
     @PostMapping("/deptExecutive/List")
     public ReturnDTO<PageInfoBT<SampleLabExecutiveListResponse>> queryDeptExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
@@ -43,10 +45,19 @@
         return ReturnUtil.success(super.packForBT(labExecutiveInfoService.deptLabExecutiveListPage(page, labExecutiveListRequest)));
     }
 
-    /**
-     * 实验室检测-我的检测-查询各状态列表（待检测、检测中、检测完）
-     */
-    @ApiOperation("实验室检测-我的检测-查询各状态列表（待检测、检测中、检测完）")
+    @ApiOperation("实验室任务导出")
+    @PostMapping("/deptExecutive/export")
+    public void deptExportList(@RequestBody @Valid SampleLabExecutiveListRequest request) throws Exception {
+        List<SampleLabExecutiveListResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = labExecutiveInfoService.deptLabExecutiveListByIds(request.getMeasureStatus(), request.getIds());
+        } else {
+            list = labExecutiveInfoService.deptLabExecutiveList(request);
+        }
+        super.exportExcel(SampleLabExecutiveListResponse.class, list, ExportEnum.DEPT_EXECUTIVE_TASK.getSheetName());
+    }
+
+    @ApiOperation("我的任务-查询各状态列表（待检测、检测中、检测完）")
     @PostMapping("/myExecutive/list")
     public ReturnDTO<PageInfoBT<SampleLabExecutiveListResponse>> queryMyExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
@@ -57,19 +68,25 @@
         return ReturnUtil.success(super.packForBT(labExecutiveInfoService.myLabExecutiveListPage(page, labExecutiveListRequest)));
     }
 
-    /**
-     * 实验室检测-我的检测-查询各状态样品数量（待检测、检测中、检测完）
-     */
-    @ApiOperation("实验室检测-我的检测-查询各状态样品数量（待检测、检测中、检测完）")
+    @ApiOperation("我的任务导出")
+    @PostMapping("/myExecutive/export")
+    public void exportList(@RequestBody @Valid SampleLabExecutiveListRequest request) throws Exception {
+        List<SampleLabExecutiveListResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = labExecutiveInfoService.myLabExecutiveListByIds(request.getMeasureStatus(), request.getIds());
+        } else {
+            list = labExecutiveInfoService.myLabExecutiveList(request);
+        }
+        super.exportExcel(SampleLabExecutiveListResponse.class, list, ExportEnum.MY_EXECUTIVE_TASK.getSheetName());
+    }
+
+    @ApiOperation("我的任务-查询各状态样品数量（待检测、检测中、检测完）")
     @GetMapping("/myExecutive/amount")
     public ReturnDTO<List<SampleAmountResponse>> queryMyExecutiveAmount() {
         return ReturnUtil.success(labExecutiveInfoService.myExecutiveAmount());
     }
 
-    /**
-     * 实验室检测-部门检测-分配（分配给具体人员）
-     */
-    @ApiOperation("实验室检测-部门检测-分配按钮（分配给具体人员）")
+    @ApiOperation("实验室任务-分配按钮（分配给具体人员）")
     @PostMapping("/deptExecutive/allocate")
     public ReturnDTO allocateStaff(@RequestBody @Valid SampleAllocateRequest sampleAllocateRequest, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -78,10 +95,7 @@
         return labExecutiveInfoService.allocateStaff(sampleAllocateRequest);
     }
 
-    /**
-     * 实验室检测-我的检测-检定人扫描收入（待检测->检测中）
-     */
-    @ApiOperation("实验室检测-我的检测-检定人扫描收入（待检测->检测中）")
+    @ApiOperation("我的任务-检定人扫描收入（待检测->检测中）")
     @PostMapping("/myExecutive/receive")
     public ReturnDTO sampleReceive(@RequestBody @Valid List<SampleOperateRequest> requestList, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -90,10 +104,7 @@
         return labExecutiveInfoService.sampleReceive(requestList);
     }
 
-    /**
-     * 实验室检测-负责人/检定人扫描检完（检测中->检测完）
-     */
-    @ApiOperation("实验室检测-负责人/检定人扫描检完（检测中->检测完）")
+    @ApiOperation("实验室任务-负责人/检定人扫描检完（检测中->检测完）")
     @PostMapping("/myExecutive/complete")
     public ReturnDTO sampleExecutiveComplete(@RequestBody @Valid List<SampleOperateRequest> requestList, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -102,10 +113,7 @@
         return labExecutiveInfoService.sampleExecutiveComplete(requestList);
     }
 
-    /**
-     * 实验室检测-部门检测/我的检测 编辑（只能修改应出具证书）
-     */
-    @ApiOperation("实验室检测-部门检测/我的检测 编辑（只能修改应出具证书）")
+    @ApiOperation("实验室任务/我的任务 编辑（只能修改应出具证书）")
     @PostMapping("/executive/update")
     public ReturnDTO updateExecutive(@RequestBody @Valid UpdateExecutiveRequest request, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -114,10 +122,7 @@
         return labExecutiveInfoService.updateExecutive(request);
     }
 
-    /**
-     * 实验室检测-部门检测/我的检测 详情
-     */
-    @ApiOperation("实验室检测-部门检测/我的检测 详情")
+    @ApiOperation("实验室任务/我的任务 详情")
     @PostMapping("/executive/detail")
     public ReturnDTO<ExecutiveDetailResponse> executiveDetail(@RequestBody @Valid ExecutiveDetailRequest request, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
@@ -131,7 +136,7 @@
      * 退回后会将下一个要执行的实验室检测状态更新为待分配，将后面的实验室顺序变更为连续（都进行减1）
      * 最后一个检测的实验室退回，等分发员再增加实验室或设备收发中的已收入直接手动点击完成
      */
-    @ApiOperation("实验室检测-部门检测/我的检测 退回（待检测/检测中->退回）")
+    @ApiOperation("实验室任务/我的任务 退回（待检测/检测中->退回）")
     @PostMapping("/executive/sendBack")
     public ReturnDTO executiveSendBack(@RequestBody @Valid ExecutiveSendBackRequest request, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -140,9 +145,6 @@
         return labExecutiveInfoService.sampleExecutiveSendBack(request);
     }
 
-    /**
-     * 分发员编辑实验室检测列表
-     */
     @ApiOperation("分发员编辑实验室检测列表")
     @PostMapping("/handOut/updateList")
     public ReturnDTO updateExecutiveList(@RequestBody @Valid UpdateExecutiveListRequest request, BindingResult bindingResult) {
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java
index 48a67ed..0c04f31 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java
@@ -10,6 +10,7 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.resource.customer.CustomerApprovalListRequest;
 import com.casic.missiles.dto.resource.customer.CustomerSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceCustomerInfo;
@@ -26,6 +27,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -55,6 +57,13 @@
         return customerInfoService.saveCustomerInfo(request);
     }
 
+    @ApiOperation("委托方名录导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody CustomerApprovalListRequest request) throws Exception {
+        List<BizResourceCustomerInfo> list = super.exportList(request);
+        super.exportExcel(BizResourceCustomerInfo.class, list, ExportEnum.CUSTOMER_INFO.getSheetName());
+    }
+
     @ApiOperation("委托方人员列表（分页）")
     @PostMapping("/person/listPage")
     public ReturnDTO<PageInfoBT<BizResourceCustomerStaff>> personListPage(@RequestBody IdDTO idDto) {
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
index 972ed4b..6418ea5 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
@@ -5,6 +5,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.resource.customer.SuggestFormApprovalListRequest;
 import com.casic.missiles.dto.resource.customer.SuggestFormSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceCustomerSuggestForm;
@@ -20,6 +21,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -50,4 +52,11 @@
         return suggestFormService.saveSuggestForm(request);
     }
 
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody SuggestFormApprovalListRequest request) throws Exception {
+        List<BizResourceCustomerSuggestForm> list = super.exportList(request);
+        super.exportExcel(BizResourceCustomerSuggestForm.class, list, ExportEnum.CUSTOMER_SUGGEST_FORM.getSheetName());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java
index 1934d1a..9e07eab 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java
@@ -15,12 +15,16 @@
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.resource.IEnvEnvironmentRecordConfigService;
 import com.casic.missiles.service.resource.IEnvEnvironmentRecordDataService;
+import com.casic.missiles.service.resource.IEnvLocationInfoService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
 import java.util.List;
@@ -39,6 +43,8 @@
     private IEnvEnvironmentRecordDataService environmentRecordDataService;
     @Autowired
     private IEnvEnvironmentRecordConfigService environmentRecordConfigService;
+    @Autowired
+    private IEnvLocationInfoService locationInfoService;
 
     @ApiOperation("环境记录单数据列表/详情")
     @PostMapping("/data/listPage")
@@ -95,4 +101,11 @@
         });
         return environmentRecordConfigService.deleteEnvironmentRecordConfig(idDTO.getId());
     }
+
+    @ApiOperation("地点列表")
+    @PostMapping("/location/listPage")
+    public ReturnDTO<PageInfoBT<LocationListResponse>> locationListPage(@RequestBody @Valid LocationListRequest request) {
+        Page<LocationListResponse> page = PageFactory.defaultPage();
+        return ReturnUtil.success(super.packForBT(locationInfoService.listPage(page, request)));
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java
index 82efe3f..e9561fa 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java
@@ -10,6 +10,7 @@
 import com.casic.missiles.dto.resource.seal.SealLogListRequest;
 import com.casic.missiles.dto.resource.seal.SealNoteApprovalListRequest;
 import com.casic.missiles.dto.resource.seal.SealNoteSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceSealUseLog;
@@ -27,6 +28,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -58,6 +60,13 @@
         return sealUseNoteService.saveSeal(request);
     }
 
+    @ApiOperation("印章使用登记导出（列表和导出中去掉经办人和监印人）")
+    @PostMapping("/listExport")
+    public void export(@RequestBody SealNoteApprovalListRequest request) throws Exception {
+        List<BizResourceSealUseNote> list = super.exportList(request);
+        super.exportExcel(BizResourceSealUseNote.class, list, ExportEnum.SEAL_NOTE.getSheetName());
+    }
+
     // TODO: 2023/7/28 印章使用日志：系统中使用印章时插入数据库
 
     @ApiOperation("印章使用日志列表（分页）")
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java
index 9b674fc..06b6521 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java
@@ -9,16 +9,20 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.resource.staff.StaffCertRequest;
 import com.casic.missiles.dto.resource.staff.StaffCertResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.service.resource.IBizResourceStaffInfoService;
 import com.casic.missiles.service.resource.IBizResourceStaffVerifierService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.List;
+
 /**
  * @Description:
  * @Author: wangpeng
@@ -41,9 +45,21 @@
         return ReturnUtil.success(super.packForBT(responsePage));
     }
 
+    @ApiOperation("证书逾期提醒导出")
+    @PostMapping("/listExport")
+    public void exportList(@RequestBody StaffCertRequest request) throws Exception {
+        List<StaffCertResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = staffInfoService.certListByIds(request.getIds());
+        } else {
+            list = staffInfoService.certList(request);
+        }
+        super.exportExcel(StaffCertResponse.class, list, ExportEnum.STAFF_CERTIFICATE_EXPIRE.getSheetName());
+    }
+
     @ApiOperation("证书逾期提醒")
     @PostMapping("/expirationReminder")
-    public ReturnDTO expirationReminder(@RequestBody IdDTO idDto) {
-        return verifierService.expirationReminder(idDto);
+    public ReturnDTO expirationReminder(@RequestBody IdDTO idDTO) {
+        return verifierService.expirationReminder(idDTO);
     }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java
index 3b251ad..a6e7850 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java
@@ -12,6 +12,7 @@
 import com.casic.missiles.dto.resource.staff.StaffListRequest;
 import com.casic.missiles.dto.resource.staff.TrainListRequest;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.*;
@@ -22,7 +23,10 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
 import java.util.List;
@@ -52,8 +56,19 @@
             throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
         }
         Page<BizResourceStaffInfo> page = PageFactory.defaultPage();
-        Page<BizResourceStaffInfo> responsePage = staffInfoService.listPage(page, request);
-        return ReturnUtil.success(super.packForBT(responsePage));
+        return ReturnUtil.success(super.packForBT(staffInfoService.listPage(page, request)));
+    }
+
+    @ApiOperation("人员登记导出")
+    @PostMapping("/listExport")
+    public void exportList(@RequestBody StaffListRequest request) throws Exception {
+        List<BizResourceStaffInfo> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = staffInfoService.listByIds(request.getIds());
+        } else {
+            list = staffInfoService.list(request);
+        }
+        super.exportExcel(BizResourceStaffInfo.class, list, ExportEnum.STAFF_INFO.getSheetName());
     }
 
     @ApiOperation("人员登记详情基础信息")
@@ -85,9 +100,9 @@
 
     @ApiOperation("科研教育列表（分页）")
     @PostMapping("/education/listPage")
-    public ReturnDTO<PageInfoBT<BizResourceStaffEducation>> educationListPage(@RequestBody IdDTO idDto) {
+    public ReturnDTO<PageInfoBT<BizResourceStaffEducation>> educationListPage(@RequestBody IdDTO idDTO) {
         Page<BizResourceStaffEducation> page = PageFactory.defaultPage();
-        Page<BizResourceStaffEducation> responsePage = staffInfoService.educationListPage(page, idDto);
+        Page<BizResourceStaffEducation> responsePage = staffInfoService.educationListPage(page, idDTO);
         return ReturnUtil.success(super.packForBT(responsePage));
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java
index af6aa86..d85d84a 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java
@@ -9,6 +9,7 @@
 import com.casic.missiles.dto.resource.outsideService.SupplierApprovalListRequest;
 import com.casic.missiles.dto.resource.outsideService.SupplierSaveResponse;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceSupplierAbility;
@@ -67,6 +68,13 @@
         return ReturnUtil.success(supplierInfoService.detail(idDTO.getId()));
     }
 
+    @ApiOperation("合格供方导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody SupplierApprovalListRequest request) throws Exception {
+        List<BizResourceSupplierInfo> list = super.exportList(request);
+        super.exportExcel(BizResourceSupplierInfo.class, list, ExportEnum.SUPPLIER_INFO.getSheetName());
+    }
+
     @ApiOperation("供方人员列表（分页）")
     @PostMapping("/person/listPage")
     public ReturnDTO<PageInfoBT<BizResourceSupplierPerson>> personListPage(@RequestBody IdDTO idDTO) {
diff --git a/casic-metering-api/src/main/resources/config/application.yml b/casic-metering-api/src/main/resources/config/application.yml
index 350db5f..ecff521 100644
--- a/casic-metering-api/src/main/resources/config/application.yml
+++ b/casic-metering-api/src/main/resources/config/application.yml
@@ -126,7 +126,7 @@
     #作者
     author: wangpeng
     #待生成对象表名
-    table-name: biz_equipment_technical_target_approval,biz_equipment_attachment_approval,biz_equipment_checkpoint_approval
+    table-name: biz_business_outsource_protocol
 
 reminder:
   #节点--common模块config包 ReminderNodeConfig配置
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
index 4a19e4e..d47d552 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
@@ -53,6 +53,7 @@
     SUGGEST_FORM_SAVE_FAILED(2509, "委托方意见登记表保存至草稿箱失败"),
     EXAMINE_FORM_SAVE_FAILED(2510, "要求、委托书及合同评审表保存至草稿箱失败"),
     CUSTOMER_EXIST_SAVE_FAILED(2511, "该委托方已存在，请重新选择"),
+    DUPLICATE_LOCATION_NO(2512, "地点编号已存在"),
 
     /**
      * 计量检定业务模块
@@ -68,6 +69,8 @@
     COMPLETE_SAMPLE_NOT_EXIST(2609, "检测中不存在扫描收入的样品"),
     CANNOT_CHANGE_MEASURE_INFO(2610, "无法更改非当前登录用户的检测信息"),
     NON_EXIST_ORDER_OR_SAMPLE(2611, "不存在该委托单或该委托单下的样品"),
+    OUTSOURCE_ACCESS_SAVE_FAILED(2612, "测试、校准或检定工作分包评审表保存至草稿箱失败"),
+    OUTSOURCE_PROTOCOL_SAVE_FAILED(2613, "测试、校准或检定工作分包协议书保存至草稿箱失败"),
 
     /**
      * 历史遗留备用
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
index 5089ad1..81a406b 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
@@ -10,54 +10,38 @@
     /**
      * 资源管理
      */
-    ENVIRONMENT_DATA_EXPORT("environmentData", "environmentData", "环境记录单数据"),
+    ENVIRONMENT_DATA_EXPORT("environmentData", "环境记录单数据", "环境记录单数据"),
+    STAFF_INFO("staffInfo", "人员登记", "人员登记"),
+    STAFF_CERTIFICATE_EXPIRE("certificateExpire", "证书逾期提醒", "证书逾期提醒"),
+    SUPPLIER_INFO("supplierInfo", "合格供方名录", "合格供方名录"),
+    CUSTOMER_INFO("customerInfo", "委托方名录", "委托方名录"),
+    CUSTOMER_SUGGEST_FORM("customerSuggestForm", "委托方意见登记表", "委托方意见登记表"),
+    SEAL_NOTE("sealNote", "印章使用登记", "印章使用登记"),
 
-    FILE_EXPORT("meterFileData", "meterFileData", "计量文件信息"),
-    TRAIN_PLAN_EXPORT("trainPlanData", "trainPlanData", "培训计划"),
-    TRAIN_LOG_EXPORT("trainLogData", "trainLogData", "培训记录"),
-    METER_ORGANIZE_EXPORT("meterOrganizeData", "meterOrganizeData", "计量组织"),
-    TRACE_SUPPLIER_EXPORT("traceSupplierData", "traceSupplierData", "溯源供方"),
-    SIGN_EXPORT("signData", "signData", "签名/签章"),
-    TEMPLATE_EXPORT("templateData", "templateData", "原始记录模板/证书报告模板"),
-    FIXED_ASSETS("meterFixedAssets", "meterFixedAssets", "固定资产"),
-    METER_EQUIPMENT("meterEquipment", "meterEquipment", "测量设备"),
-    CALIBRATION_TEST_EQUIPMENT("calibrationTestEquipment", "calibrationTestEquipment", "校准检定设备"),
-    MEASURE_ACCOUNT("measureAccount", "measureAccount", "测量工装"),
-    STANDARD_SUPPORT_EQUIPMENT("standardSupportEquipment", "standardSupportEquipment", "标准配套设备"),
-    STANDARD_EQUIPMENT("standardEquipment", "standardEquipment", "标准装置"),
-    FLOW_DEF_EXPORT("flowDefData", "flowDefData", "流程定义"),
-    STAFF_CERTIFICATE("certificate", "certificate", "计量人员证书"),
-    CHECK_INFO("checkInfo", "checkInfo", "设备管理点检测"),
-    EQUIPMENT_APPLY("equipmentApply", "equipmentApply", "设备借用"),
-    STANDARD_EQUIPMENT_REMIND("equipmentApplyRemind", "equipmentApplyRemind", "标准装置到期提醒"),
-    METER_PRICE("meterPrice", "meterPrice", "价格库"),
-    METER_STAFF("meterStaff", "meterStaff", "计量人员"),
-    STANDARD_EQUIPMENT_APPLY("standardEquipmentApply", "standardEquipmentApply", "标准装置申请"),
-    STATE_MANAGE_APPLY("stateManage", "stateManage", "状态管理"),
-    METER_ACCEPTANCE_CHECK("acceptanceCheck", "acceptanceCheck", "设备检修保养验收单"),
-    CUSTOMER_EXPORT("customerData", "customerData", "客户信息"),
-    ORDER_EXPORT("orderData", "orderData", "委托书信息"),
-    SAMPLE_EXPORT("sampleData", "sampleData", "样本信息"),
-    EXCHANGE_DATA("exchangeData", "exchangeData", "设备交接单"),
-    DISPATCH_DATA("dispatchData", "dispatchData", "设备收发"),
-    ENVIRONMENT_DATA("environmentData", "environmentData", "环境记录单"),
-    ORIGIN_DATA("originData", "originData", "原始记录"),
-    CERTIFICATE_REPORT("certificateReport", "certificateReport", "证书报告"),
-    ADVICE_EXPORT("adviceData", "adviceData", "客户反馈"),
-    HANDOUT_EXPORT("handoutData", "handoutData", "任务分发列表"),
-    OUTSOURCER_EXPORT("outsourcerData", "outsourcerData", "分包方"),
-    SITE_EXECUTIVE_EXPORT("siteExecutiveData", "siteExecutiveData", "现场测试、校准或检定"),
-    CERTIFICATE_PRINT_EXPORT("certificatePrintData", "certificatePrintData", "证书打印"),
-    DOWNLOAD_TEMPLATE("downloadTemplate", "downloadTemplate", "页面配置"),
-    OUTSOURCER_CERTIFICATE_EXPORT("outsourceCertificateData", "outsourceCertificateData", "分包证书"),
-    SETTLEMENT_INFO_EXPORT("settlementInfoData", "settlementInfoData", "业务结算"),
-    EQUIPMENT_REMIND("equipmentRemind", "equipmentRemind", "设备到期提醒"),
-    AGREEMENT_INFO_EXPORT("agreementInfoData", "agreementInfoData", "合同"),
-    WORK_STATISTICS_EXPORT("workStatisticsData", "workStatisticsData", "实时工作统计"),
-    DEPT_OUTPUT_EXPORT("deptOutputData", "deptOutputData", "部门产值分析"),
-    WORKLOAD_EXPORT("workloadData", "workloadData", "业务工作量分析"),
-    DEPT_COMPREHENSIVE_EXPORT("deptComprehensiveData", "deptComprehensiveData", "部门综合分析"),
-    ENVIRONMENTAL_RECORD("environmentalRecordData", "environmentalRecordData", "现场环境记录");
+    /**
+     * 计量检定业务
+     */
+    OUTSOURCER_EXPORT("outsourcerData", "分包方名录", "分包方名录"),
+    IDENTIFY_EXPORT("identifyData", "计量标识", "计量标识"),
+    ORDER_EXPORT("orderData", "任务单", "任务单"),
+    DISPATCH_DATA("dispatchData", "设备收发", "设备收发"),
+    HANDOUT_EXPORT("handoutData", "任务分发", "任务分发"),
+    SITE_EXECUTIVE_EXPORT("siteExecutiveData", "现场测试、校准或检定", "现场测试、校准或检定"),
+    CERTIFICATE_REPORT("certificateReport", "证书审批", "证书审批"),
+    CERTIFICATE_CHANGE_APPLY("certificateChangeApply", "证书报告补充或更换申请单", "证书报告补充或更换申请单"),
+    CERTIFICATE_PRINT("certificatePrintData", "证书打印审批", "证书打印审批"),
+    DEPT_EXECUTIVE_TASK("deptExecutiveTaskData", "实验室任务", "实验室任务"),
+    MY_EXECUTIVE_TASK("myExecutiveTaskData", "我的任务", "我的任务"),
+    OUTSOURCE_ASSESS("outsourceAssess", "测试、校准或检定工作分包评审表", "测试、校准或检定工作分包评审表"),
+    OUTSOURCE_PROTOCOL("outsourceProtocol", "测试、校准或检定工作分包协议书", "测试、校准或检定工作分包协议书"),
+
+    /**
+     * 系统管理
+     */
+    SIGN_EXPORT("signData", "签名", "签名"),
+    TEMPLATE_EXPORT("templateData", "文件模板", "文件模板"),
+    FLOW_DEF_EXPORT("flowDefData", "流程定义", "流程定义"),
+    DOWNLOAD_TEMPLATE("downloadTemplate", "流程定义", "页面配置");
 
     ExportEnum(String fileName, String sheetName, String description) {
         this.fileName = fileName;
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateRecordTypeCodeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateRecordTypeCodeEnum.java
index 31d913c..a963522 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateRecordTypeCodeEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateRecordTypeCodeEnum.java
@@ -46,4 +46,14 @@
     String SITE_EXECUTIVE_APPROVAL = "01";
     //《现场测试、校准或检定工作记录表》
     String SITE_EXECUTIVE_LOG = "02";
+
+    //测试、校准或检定工作分包协议书
+    String OUTSOURCE_PROTOCOL = "01";
+    //测试、校准或检定工作分包评审表
+    String OUTSOURCE_ACCESS = "02";
+    //测试、校准或检定工作分包通知书
+    String OUTSOURCE_NOTICE = "03";
+    //测试、校准或检定工作分包方名录
+    String OUTSOURCE_INFO = "04";
+
 }

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java
index bb0c50f..13a699b 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java
@@ -12,6 +12,7 @@
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.IGeneralApprovalService;
+import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
@@ -19,6 +20,7 @@
 import org.springframework.web.bind.annotation.RequestBody;
 
 import javax.validation.Valid;
+import java.util.List;
 import java.util.Objects;
 
 /**
@@ -117,4 +119,17 @@
         }
         return baseApprovalService.failUpdate(request);
     }
+
+    public List<O> exportList(@RequestBody @Valid R request) throws Exception {
+        List<O> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = baseApprovalService.listExportByIds(request.getIds());
+        } else {
+            list = baseApprovalService.listExport(request);
+        }
+        for (O record : list) {
+            DictCodeUtils.convertDictCodeToName(record);
+        }
+        return list;
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java
index 8a90961..d775831 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java
@@ -5,6 +5,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.business.certificate.CertificateChangeApplyApprovalListRequest;
 import com.casic.missiles.dto.business.certificate.CertificateChangeApplySaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessCertificateChangeApply;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
@@ -20,6 +21,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -48,4 +50,12 @@
         }
         return changeApplyService.saveChangeApply(request);
     }
+
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody CertificateChangeApplyApprovalListRequest request) throws Exception {
+        List<BizBusinessCertificateChangeApply> list = super.exportList(request);
+        super.exportExcel(BizBusinessCertificateChangeApply.class, list, ExportEnum.CERTIFICATE_CHANGE_APPLY.getSheetName());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java
index 5fc4b07..af8230e 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java
@@ -9,6 +9,7 @@
 import com.casic.missiles.dto.business.certificate.CertificatePrintApprovalListRequest;
 import com.casic.missiles.dto.business.certificate.CertificatePrintListResponse;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.enums.business.CertificatePrintStatusEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessCertificatePrintLog;
@@ -18,10 +19,16 @@
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.io.IOException;
+import java.util.List;
 import java.util.Objects;
 
 /**
@@ -98,4 +105,16 @@
         });
         return certificatePrintService.certificatePrintLog(idDTO.getId());
     }
+
+    @ApiOperation("证书打印审批导出")
+    @PostMapping("/listExport")
+    public void exportList(@RequestBody CertificatePrintApprovalListRequest request) throws IOException {
+        List<CertificatePrintListResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = certificatePrintService.listByIds(request.getIds());
+        } else {
+            list = certificatePrintService.list(request);
+        }
+        super.exportExcel(CertificatePrintListResponse.class, list, ExportEnum.CERTIFICATE_PRINT.getSheetName());
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java
index 63b06dc..6b2efd5 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java
@@ -6,6 +6,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.business.certificate.CertificateReportApprovalListRequest;
 import com.casic.missiles.dto.business.certificate.CertificateReportSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessCertificateReport;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
@@ -21,6 +22,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -50,7 +52,7 @@
         return certificateReportService.saveCertificateReport(request);
     }
 
-    @ApiOperation("证书审批详情（基本信息）")
+    @ApiOperation("详情（基本信息）")
     @PostMapping("/detail")
     public ReturnDTO<BizBusinessCertificateReport> detail(@RequestBody @Valid BaseDetailRequest request, BindingResult bindingResult) throws Exception {
         if(bindingResult.hasErrors()){
@@ -59,4 +61,11 @@
         return certificateReportService.detail(request);
     }
 
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody CertificateReportApprovalListRequest request) throws Exception {
+        List<BizBusinessCertificateReport> list = super.exportList(request);
+        super.exportExcel(BizBusinessCertificateReport.class, list, ExportEnum.CERTIFICATE_REPORT.getSheetName());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java
index 46b26bd..57c0809 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java
@@ -10,20 +10,21 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.business.identify.IdentifyListRequest;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessIdentifyInfo;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.business.IBizBusinessIdentifyInfoService;
+import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import javax.validation.Valid;
+import java.util.List;
 import java.util.Objects;
 
 /**
@@ -57,16 +58,13 @@
         return identifyInfoService.addIdentify(identifyInfo);
     }
 
-    @ApiOperation("标识打印更新")
+    @ApiOperation("标识打印更新（更新打印时间）")
     @PostMapping("/update")
-    public ReturnDTO updateIdentify(@RequestBody @Valid BizBusinessIdentifyInfo identifyInfo, BindingResult bindingResult) {
-        Assert.isFalse(Objects.isNull(identifyInfo.getId()), () -> {
+    public ReturnDTO updateIdentify(@RequestBody @Valid IdDTO idDTO) {
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        Assert.isFalse(bindingResult.hasErrors(), () -> {
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        });
-        return identifyInfoService.updateIdentify(identifyInfo);
+        return identifyInfoService.updateIdentify(idDTO.getId());
     }
 
     @ApiOperation("标识打印删除")
@@ -77,4 +75,37 @@
         });
         return identifyInfoService.deleteIdentify(idDTO.getId());
     }
+
+    @ApiOperation("标识打印导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody @Valid IdentifyListRequest request, BindingResult bindingResult) throws Exception {
+        if (bindingResult.hasErrors()) {
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        List<BizBusinessIdentifyInfo> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = identifyInfoService.listByIds(request.getIds());
+        } else {
+            list = identifyInfoService.list(request);
+        }
+        for (BizBusinessIdentifyInfo record : list) {
+            DictCodeUtils.convertDictCodeToName(record);
+        }
+        super.exportExcel(BizBusinessIdentifyInfo.class, list, ExportEnum.IDENTIFY_EXPORT.getSheetName());
+    }
+
+
+    // TODO: 2023/8/23 查询设备信息，4个底部按钮查设备（按钮的作用就是前端用来调不同接口、用来区分中间即将展示的标识），前端弹窗选设备，在确定保存时前端根据底部按钮判断传入设备类型deviceType字典code
+    // TODO: 2023/8/23 接口：查受检设备（第1个按钮），查设备台账（后3个按钮同一接口），查询之后前端根据标志类型的不同加到中间页面时进行判断（按产品给的对应表）
+    // TODO: 2023/8/23 提供二维码接口，前端在加到中间页面时调用一下
+
+    @ApiOperation("设备二维码")
+    @PostMapping("/equipment/qrCode")
+    public ReturnDTO<String> equipmentQrCode(@RequestBody @Valid IdDTO idDTO) {
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return identifyInfoService.equipmentQrCode(idDTO.getId());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java
index 707be6e..7e0453d 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java
@@ -117,7 +117,7 @@
     }
 
     @ApiOperation("任务单导出")
-    @PostMapping("/export")
+    @PostMapping("/listExport")
     public void orderExport(@RequestBody @Valid OrderListRequest request, HttpServletResponse response) {
         businessOrderService.orderExport(request, response);
     }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java
index 529a6ce..51432be 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java
@@ -1,9 +1,28 @@
 package com.casic.missiles.controller.business;
 
+import com.casic.missiles.controller.GeneralApprovalController;
+import com.casic.missiles.dto.BaseApprovalSubmitRequest;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.business.outsource.OutsourceAssessApprovalListRequest;
+import com.casic.missiles.dto.business.outsource.OutsourceAssessSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
+import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.model.business.BizBusinessOutsourceAssess;
+import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
+import com.casic.missiles.service.IGeneralApprovalService;
+import com.casic.missiles.service.business.IBizBusinessOutsourceAssessService;
 import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.BindingResult;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.validation.Valid;
+import java.util.List;
+
 /**
  * <p>
  * 计量检定业务-分包管理-测试、校准或检定工作分包评审表 前端控制器
@@ -15,6 +34,27 @@
 @Api(tags = "分包管理-测试、校准或检定工作分包评审表")
 @RestController
 @RequestMapping("/business/outsource/assess")
-public class BizBusinessOutsourceAssessController {
+public class BizBusinessOutsourceAssessController extends GeneralApprovalController<BizBusinessOutsourceAssess, BizBusinessOutsourceAssess, OutsourceAssessApprovalListRequest, BaseApprovalSubmitRequest> {
+    @Autowired
+    private IBizBusinessOutsourceAssessService outsourceAssessService;
 
+    public BizBusinessOutsourceAssessController(IGeneralApprovalService<BizBusinessOutsourceAssess, BizBusinessOutsourceAssess, OutsourceAssessApprovalListRequest, BaseApprovalSubmitRequest> baseApprovalService) {
+        super(baseApprovalService);
+    }
+
+    @ApiOperation("草稿箱-保存")
+    @PostMapping("/save")
+    public ReturnDTO<OutsourceAssessSaveResponse> saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceAssess request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        return outsourceAssessService.saveOutsourceAssess(request);
+    }
+
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception {
+        List<BizBusinessOutsourceAssess> list = super.exportList(request);
+        super.exportExcel(BizBusinessOutsourceAssess.class, list, ExportEnum.OUTSOURCE_ASSESS.getSheetName());
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java
new file mode 100644
index 0000000..9adef18
--- /dev/null
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java
@@ -0,0 +1,60 @@
+package com.casic.missiles.controller.business;
+
+import com.casic.missiles.controller.GeneralApprovalController;
+import com.casic.missiles.dto.BaseApprovalSubmitRequest;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.business.outsource.OutsourceProtocolApprovalListRequest;
+import com.casic.missiles.dto.business.outsource.OutsourceProtocolSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
+import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.model.business.BizBusinessOutsourceProtocol;
+import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
+import com.casic.missiles.service.IGeneralApprovalService;
+import com.casic.missiles.service.business.IBizBusinessOutsourceProtocolService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.BindingResult;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.validation.Valid;
+import java.util.List;
+
+/**
+ * <p>
+ * 计量检定业务-分包管理-测试、校准或检定工作分包协议书 前端控制器
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-08-24
+ */
+@Api(tags = "分包管理-测试、校准或检定工作分包协议书")
+@RestController
+@RequestMapping("/business/outsource/protocol")
+public class BizBusinessOutsourceProtocolController extends GeneralApprovalController<BizBusinessOutsourceProtocol, BizBusinessOutsourceProtocol, OutsourceProtocolApprovalListRequest, BaseApprovalSubmitRequest> {
+    @Autowired
+    private IBizBusinessOutsourceProtocolService outsourceProtocolService;
+
+    public BizBusinessOutsourceProtocolController(IGeneralApprovalService<BizBusinessOutsourceProtocol, BizBusinessOutsourceProtocol, OutsourceProtocolApprovalListRequest, BaseApprovalSubmitRequest> baseApprovalService) {
+        super(baseApprovalService);
+    }
+
+    @ApiOperation("草稿箱-保存")
+    @PostMapping("/save")
+    public ReturnDTO<OutsourceProtocolSaveResponse> saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceProtocol request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        return outsourceProtocolService.saveOutsourceProtocol(request);
+    }
+
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody OutsourceProtocolApprovalListRequest request) throws Exception {
+        List<BizBusinessOutsourceProtocol> list = super.exportList(request);
+        super.exportExcel(BizBusinessOutsourceProtocol.class, list, ExportEnum.OUTSOURCE_PROTOCOL.getSheetName());
+    }
+}
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java
index 097f645..f0f0943 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java
@@ -17,7 +17,6 @@
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.IGeneralApprovalService;
 import com.casic.missiles.service.business.IBizBusinessOutsourcerInfoService;
-import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -71,19 +70,8 @@
 
     @ApiOperation("分包方导出")
     @PostMapping("/listExport")
-    public void export(@RequestBody @Valid OutsourcerInfoApprovalListRequest request, BindingResult bindingResult) throws Exception {
-        if (bindingResult.hasErrors()) {
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        }
-        List<BizBusinessOutsourcerInfo> list;
-        if (!CollectionUtils.isEmpty(request.getIds())) {
-            list = outsourcerInfoService.listByIds(request.getIds());
-        } else {
-            list = outsourcerInfoService.list(request);
-        }
-        for (BizBusinessOutsourcerInfo record : list) {
-            DictCodeUtils.convertDictCodeToName(record);
-        }
+    public void export(@RequestBody OutsourcerInfoApprovalListRequest request) throws Exception {
+        List<BizBusinessOutsourcerInfo> list = super.exportList(request);
         super.exportExcel(BizBusinessOutsourcerInfo.class, list, ExportEnum.OUTSOURCER_EXPORT.getSheetName());
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java
index c2cbf9f..0410918 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java
@@ -17,11 +17,9 @@
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.IGeneralApprovalService;
 import com.casic.missiles.service.business.IBizBusinessSiteExecutiveInfoService;
-import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -60,7 +58,7 @@
         return siteExecutiveInfoService.saveSiteExecutiveInfo(siteExecutiveInfo);
     }
 
-    @ApiOperation("现场检测详情")
+    @ApiOperation("详情")
     @PostMapping("/detail")
     public ReturnDTO<SiteExecutiveDetailResponse> siteExecutiveDetail(@RequestBody @Valid IdDTO idDTO) throws Exception {
         Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
@@ -69,21 +67,10 @@
         return ReturnUtil.success(siteExecutiveInfoService.detail(idDTO.getId()));
     }
 
-    @ApiOperation("现场检测导出")
+    @ApiOperation("导出")
     @PostMapping("/listExport")
-    public void export(@RequestBody @Valid SiteExecutiveApprovalListRequest request, BindingResult bindingResult) throws Exception {
-        if (bindingResult.hasErrors()) {
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        }
-        List<SiteExecutiveApprovalListResponse> list;
-        if (!CollectionUtils.isEmpty(request.getIds())) {
-            list = siteExecutiveInfoService.listInfoByIds(request.getIds());
-        } else {
-            list = siteExecutiveInfoService.listInfo(request);
-        }
-        for (SiteExecutiveApprovalListResponse record : list) {
-            DictCodeUtils.convertDictCodeToName(record);
-        }
+    public void export(@RequestBody SiteExecutiveApprovalListRequest request) throws Exception {
+        List<SiteExecutiveApprovalListResponse> list = super.exportList(request);
         super.exportExcel(SiteExecutiveApprovalListResponse.class, list, ExportEnum.SITE_EXECUTIVE_EXPORT.getSheetName());
     }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
index 7e793cd..a92e209 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
@@ -55,7 +55,7 @@
 
     @ApiOperation("设备收发列表导出")
     @PostMapping("/export")
-    public void exportList(@RequestBody @Valid SampleDispatchListRequest request) throws IOException {
+    public void exportList(@RequestBody SampleDispatchListRequest request) throws IOException {
         List<SampleDispatchListResponse> list;
         if (!CollectionUtils.isEmpty(request.getIds())) {
             list = dispatchService.listByIds(request.getIds());
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java
index cdc77fc..d120fd4 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java
@@ -7,6 +7,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.business.labExecutive.*;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.business.IBusinessLabExecutiveInfoService;
@@ -14,6 +15,7 @@
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.*;
 
@@ -32,7 +34,7 @@
     @Autowired
     private IBusinessLabExecutiveInfoService labExecutiveInfoService;
 
-    @ApiOperation("实验室检测-部门检测-查询各状态列表（待检测、检测中、检测完）")
+    @ApiOperation("实验室任务-查询各状态列表（待检测、检测中、检测完）")
     @PostMapping("/deptExecutive/List")
     public ReturnDTO<PageInfoBT<SampleLabExecutiveListResponse>> queryDeptExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
@@ -43,10 +45,19 @@
         return ReturnUtil.success(super.packForBT(labExecutiveInfoService.deptLabExecutiveListPage(page, labExecutiveListRequest)));
     }
 
-    /**
-     * 实验室检测-我的检测-查询各状态列表（待检测、检测中、检测完）
-     */
-    @ApiOperation("实验室检测-我的检测-查询各状态列表（待检测、检测中、检测完）")
+    @ApiOperation("实验室任务导出")
+    @PostMapping("/deptExecutive/export")
+    public void deptExportList(@RequestBody @Valid SampleLabExecutiveListRequest request) throws Exception {
+        List<SampleLabExecutiveListResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = labExecutiveInfoService.deptLabExecutiveListByIds(request.getMeasureStatus(), request.getIds());
+        } else {
+            list = labExecutiveInfoService.deptLabExecutiveList(request);
+        }
+        super.exportExcel(SampleLabExecutiveListResponse.class, list, ExportEnum.DEPT_EXECUTIVE_TASK.getSheetName());
+    }
+
+    @ApiOperation("我的任务-查询各状态列表（待检测、检测中、检测完）")
     @PostMapping("/myExecutive/list")
     public ReturnDTO<PageInfoBT<SampleLabExecutiveListResponse>> queryMyExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
@@ -57,19 +68,25 @@
         return ReturnUtil.success(super.packForBT(labExecutiveInfoService.myLabExecutiveListPage(page, labExecutiveListRequest)));
     }
 
-    /**
-     * 实验室检测-我的检测-查询各状态样品数量（待检测、检测中、检测完）
-     */
-    @ApiOperation("实验室检测-我的检测-查询各状态样品数量（待检测、检测中、检测完）")
+    @ApiOperation("我的任务导出")
+    @PostMapping("/myExecutive/export")
+    public void exportList(@RequestBody @Valid SampleLabExecutiveListRequest request) throws Exception {
+        List<SampleLabExecutiveListResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = labExecutiveInfoService.myLabExecutiveListByIds(request.getMeasureStatus(), request.getIds());
+        } else {
+            list = labExecutiveInfoService.myLabExecutiveList(request);
+        }
+        super.exportExcel(SampleLabExecutiveListResponse.class, list, ExportEnum.MY_EXECUTIVE_TASK.getSheetName());
+    }
+
+    @ApiOperation("我的任务-查询各状态样品数量（待检测、检测中、检测完）")
     @GetMapping("/myExecutive/amount")
     public ReturnDTO<List<SampleAmountResponse>> queryMyExecutiveAmount() {
         return ReturnUtil.success(labExecutiveInfoService.myExecutiveAmount());
     }
 
-    /**
-     * 实验室检测-部门检测-分配（分配给具体人员）
-     */
-    @ApiOperation("实验室检测-部门检测-分配按钮（分配给具体人员）")
+    @ApiOperation("实验室任务-分配按钮（分配给具体人员）")
     @PostMapping("/deptExecutive/allocate")
     public ReturnDTO allocateStaff(@RequestBody @Valid SampleAllocateRequest sampleAllocateRequest, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -78,10 +95,7 @@
         return labExecutiveInfoService.allocateStaff(sampleAllocateRequest);
     }
 
-    /**
-     * 实验室检测-我的检测-检定人扫描收入（待检测->检测中）
-     */
-    @ApiOperation("实验室检测-我的检测-检定人扫描收入（待检测->检测中）")
+    @ApiOperation("我的任务-检定人扫描收入（待检测->检测中）")
     @PostMapping("/myExecutive/receive")
     public ReturnDTO sampleReceive(@RequestBody @Valid List<SampleOperateRequest> requestList, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -90,10 +104,7 @@
         return labExecutiveInfoService.sampleReceive(requestList);
     }
 
-    /**
-     * 实验室检测-负责人/检定人扫描检完（检测中->检测完）
-     */
-    @ApiOperation("实验室检测-负责人/检定人扫描检完（检测中->检测完）")
+    @ApiOperation("实验室任务-负责人/检定人扫描检完（检测中->检测完）")
     @PostMapping("/myExecutive/complete")
     public ReturnDTO sampleExecutiveComplete(@RequestBody @Valid List<SampleOperateRequest> requestList, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -102,10 +113,7 @@
         return labExecutiveInfoService.sampleExecutiveComplete(requestList);
     }
 
-    /**
-     * 实验室检测-部门检测/我的检测 编辑（只能修改应出具证书）
-     */
-    @ApiOperation("实验室检测-部门检测/我的检测 编辑（只能修改应出具证书）")
+    @ApiOperation("实验室任务/我的任务 编辑（只能修改应出具证书）")
     @PostMapping("/executive/update")
     public ReturnDTO updateExecutive(@RequestBody @Valid UpdateExecutiveRequest request, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -114,10 +122,7 @@
         return labExecutiveInfoService.updateExecutive(request);
     }
 
-    /**
-     * 实验室检测-部门检测/我的检测 详情
-     */
-    @ApiOperation("实验室检测-部门检测/我的检测 详情")
+    @ApiOperation("实验室任务/我的任务 详情")
     @PostMapping("/executive/detail")
     public ReturnDTO<ExecutiveDetailResponse> executiveDetail(@RequestBody @Valid ExecutiveDetailRequest request, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
@@ -131,7 +136,7 @@
      * 退回后会将下一个要执行的实验室检测状态更新为待分配，将后面的实验室顺序变更为连续（都进行减1）
      * 最后一个检测的实验室退回，等分发员再增加实验室或设备收发中的已收入直接手动点击完成
      */
-    @ApiOperation("实验室检测-部门检测/我的检测 退回（待检测/检测中->退回）")
+    @ApiOperation("实验室任务/我的任务 退回（待检测/检测中->退回）")
     @PostMapping("/executive/sendBack")
     public ReturnDTO executiveSendBack(@RequestBody @Valid ExecutiveSendBackRequest request, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -140,9 +145,6 @@
         return labExecutiveInfoService.sampleExecutiveSendBack(request);
     }
 
-    /**
-     * 分发员编辑实验室检测列表
-     */
     @ApiOperation("分发员编辑实验室检测列表")
     @PostMapping("/handOut/updateList")
     public ReturnDTO updateExecutiveList(@RequestBody @Valid UpdateExecutiveListRequest request, BindingResult bindingResult) {
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java
index 48a67ed..0c04f31 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java
@@ -10,6 +10,7 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.resource.customer.CustomerApprovalListRequest;
 import com.casic.missiles.dto.resource.customer.CustomerSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceCustomerInfo;
@@ -26,6 +27,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -55,6 +57,13 @@
         return customerInfoService.saveCustomerInfo(request);
     }
 
+    @ApiOperation("委托方名录导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody CustomerApprovalListRequest request) throws Exception {
+        List<BizResourceCustomerInfo> list = super.exportList(request);
+        super.exportExcel(BizResourceCustomerInfo.class, list, ExportEnum.CUSTOMER_INFO.getSheetName());
+    }
+
     @ApiOperation("委托方人员列表（分页）")
     @PostMapping("/person/listPage")
     public ReturnDTO<PageInfoBT<BizResourceCustomerStaff>> personListPage(@RequestBody IdDTO idDto) {
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
index 972ed4b..6418ea5 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
@@ -5,6 +5,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.resource.customer.SuggestFormApprovalListRequest;
 import com.casic.missiles.dto.resource.customer.SuggestFormSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceCustomerSuggestForm;
@@ -20,6 +21,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -50,4 +52,11 @@
         return suggestFormService.saveSuggestForm(request);
     }
 
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody SuggestFormApprovalListRequest request) throws Exception {
+        List<BizResourceCustomerSuggestForm> list = super.exportList(request);
+        super.exportExcel(BizResourceCustomerSuggestForm.class, list, ExportEnum.CUSTOMER_SUGGEST_FORM.getSheetName());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java
index 1934d1a..9e07eab 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java
@@ -15,12 +15,16 @@
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.resource.IEnvEnvironmentRecordConfigService;
 import com.casic.missiles.service.resource.IEnvEnvironmentRecordDataService;
+import com.casic.missiles.service.resource.IEnvLocationInfoService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
 import java.util.List;
@@ -39,6 +43,8 @@
     private IEnvEnvironmentRecordDataService environmentRecordDataService;
     @Autowired
     private IEnvEnvironmentRecordConfigService environmentRecordConfigService;
+    @Autowired
+    private IEnvLocationInfoService locationInfoService;
 
     @ApiOperation("环境记录单数据列表/详情")
     @PostMapping("/data/listPage")
@@ -95,4 +101,11 @@
         });
         return environmentRecordConfigService.deleteEnvironmentRecordConfig(idDTO.getId());
     }
+
+    @ApiOperation("地点列表")
+    @PostMapping("/location/listPage")
+    public ReturnDTO<PageInfoBT<LocationListResponse>> locationListPage(@RequestBody @Valid LocationListRequest request) {
+        Page<LocationListResponse> page = PageFactory.defaultPage();
+        return ReturnUtil.success(super.packForBT(locationInfoService.listPage(page, request)));
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java
index 82efe3f..e9561fa 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java
@@ -10,6 +10,7 @@
 import com.casic.missiles.dto.resource.seal.SealLogListRequest;
 import com.casic.missiles.dto.resource.seal.SealNoteApprovalListRequest;
 import com.casic.missiles.dto.resource.seal.SealNoteSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceSealUseLog;
@@ -27,6 +28,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -58,6 +60,13 @@
         return sealUseNoteService.saveSeal(request);
     }
 
+    @ApiOperation("印章使用登记导出（列表和导出中去掉经办人和监印人）")
+    @PostMapping("/listExport")
+    public void export(@RequestBody SealNoteApprovalListRequest request) throws Exception {
+        List<BizResourceSealUseNote> list = super.exportList(request);
+        super.exportExcel(BizResourceSealUseNote.class, list, ExportEnum.SEAL_NOTE.getSheetName());
+    }
+
     // TODO: 2023/7/28 印章使用日志：系统中使用印章时插入数据库
 
     @ApiOperation("印章使用日志列表（分页）")
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java
index 9b674fc..06b6521 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java
@@ -9,16 +9,20 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.resource.staff.StaffCertRequest;
 import com.casic.missiles.dto.resource.staff.StaffCertResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.service.resource.IBizResourceStaffInfoService;
 import com.casic.missiles.service.resource.IBizResourceStaffVerifierService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.List;
+
 /**
  * @Description:
  * @Author: wangpeng
@@ -41,9 +45,21 @@
         return ReturnUtil.success(super.packForBT(responsePage));
     }
 
+    @ApiOperation("证书逾期提醒导出")
+    @PostMapping("/listExport")
+    public void exportList(@RequestBody StaffCertRequest request) throws Exception {
+        List<StaffCertResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = staffInfoService.certListByIds(request.getIds());
+        } else {
+            list = staffInfoService.certList(request);
+        }
+        super.exportExcel(StaffCertResponse.class, list, ExportEnum.STAFF_CERTIFICATE_EXPIRE.getSheetName());
+    }
+
     @ApiOperation("证书逾期提醒")
     @PostMapping("/expirationReminder")
-    public ReturnDTO expirationReminder(@RequestBody IdDTO idDto) {
-        return verifierService.expirationReminder(idDto);
+    public ReturnDTO expirationReminder(@RequestBody IdDTO idDTO) {
+        return verifierService.expirationReminder(idDTO);
     }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java
index 3b251ad..a6e7850 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java
@@ -12,6 +12,7 @@
 import com.casic.missiles.dto.resource.staff.StaffListRequest;
 import com.casic.missiles.dto.resource.staff.TrainListRequest;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.*;
@@ -22,7 +23,10 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
 import java.util.List;
@@ -52,8 +56,19 @@
             throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
         }
         Page<BizResourceStaffInfo> page = PageFactory.defaultPage();
-        Page<BizResourceStaffInfo> responsePage = staffInfoService.listPage(page, request);
-        return ReturnUtil.success(super.packForBT(responsePage));
+        return ReturnUtil.success(super.packForBT(staffInfoService.listPage(page, request)));
+    }
+
+    @ApiOperation("人员登记导出")
+    @PostMapping("/listExport")
+    public void exportList(@RequestBody StaffListRequest request) throws Exception {
+        List<BizResourceStaffInfo> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = staffInfoService.listByIds(request.getIds());
+        } else {
+            list = staffInfoService.list(request);
+        }
+        super.exportExcel(BizResourceStaffInfo.class, list, ExportEnum.STAFF_INFO.getSheetName());
     }
 
     @ApiOperation("人员登记详情基础信息")
@@ -85,9 +100,9 @@
 
     @ApiOperation("科研教育列表（分页）")
     @PostMapping("/education/listPage")
-    public ReturnDTO<PageInfoBT<BizResourceStaffEducation>> educationListPage(@RequestBody IdDTO idDto) {
+    public ReturnDTO<PageInfoBT<BizResourceStaffEducation>> educationListPage(@RequestBody IdDTO idDTO) {
         Page<BizResourceStaffEducation> page = PageFactory.defaultPage();
-        Page<BizResourceStaffEducation> responsePage = staffInfoService.educationListPage(page, idDto);
+        Page<BizResourceStaffEducation> responsePage = staffInfoService.educationListPage(page, idDTO);
         return ReturnUtil.success(super.packForBT(responsePage));
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java
index af6aa86..d85d84a 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java
@@ -9,6 +9,7 @@
 import com.casic.missiles.dto.resource.outsideService.SupplierApprovalListRequest;
 import com.casic.missiles.dto.resource.outsideService.SupplierSaveResponse;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceSupplierAbility;
@@ -67,6 +68,13 @@
         return ReturnUtil.success(supplierInfoService.detail(idDTO.getId()));
     }
 
+    @ApiOperation("合格供方导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody SupplierApprovalListRequest request) throws Exception {
+        List<BizResourceSupplierInfo> list = super.exportList(request);
+        super.exportExcel(BizResourceSupplierInfo.class, list, ExportEnum.SUPPLIER_INFO.getSheetName());
+    }
+
     @ApiOperation("供方人员列表（分页）")
     @PostMapping("/person/listPage")
     public ReturnDTO<PageInfoBT<BizResourceSupplierPerson>> personListPage(@RequestBody IdDTO idDTO) {
diff --git a/casic-metering-api/src/main/resources/config/application.yml b/casic-metering-api/src/main/resources/config/application.yml
index 350db5f..ecff521 100644
--- a/casic-metering-api/src/main/resources/config/application.yml
+++ b/casic-metering-api/src/main/resources/config/application.yml
@@ -126,7 +126,7 @@
     #作者
     author: wangpeng
     #待生成对象表名
-    table-name: biz_equipment_technical_target_approval,biz_equipment_attachment_approval,biz_equipment_checkpoint_approval
+    table-name: biz_business_outsource_protocol
 
 reminder:
   #节点--common模块config包 ReminderNodeConfig配置
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
index 4a19e4e..d47d552 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
@@ -53,6 +53,7 @@
     SUGGEST_FORM_SAVE_FAILED(2509, "委托方意见登记表保存至草稿箱失败"),
     EXAMINE_FORM_SAVE_FAILED(2510, "要求、委托书及合同评审表保存至草稿箱失败"),
     CUSTOMER_EXIST_SAVE_FAILED(2511, "该委托方已存在，请重新选择"),
+    DUPLICATE_LOCATION_NO(2512, "地点编号已存在"),
 
     /**
      * 计量检定业务模块
@@ -68,6 +69,8 @@
     COMPLETE_SAMPLE_NOT_EXIST(2609, "检测中不存在扫描收入的样品"),
     CANNOT_CHANGE_MEASURE_INFO(2610, "无法更改非当前登录用户的检测信息"),
     NON_EXIST_ORDER_OR_SAMPLE(2611, "不存在该委托单或该委托单下的样品"),
+    OUTSOURCE_ACCESS_SAVE_FAILED(2612, "测试、校准或检定工作分包评审表保存至草稿箱失败"),
+    OUTSOURCE_PROTOCOL_SAVE_FAILED(2613, "测试、校准或检定工作分包协议书保存至草稿箱失败"),
 
     /**
      * 历史遗留备用
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
index 5089ad1..81a406b 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
@@ -10,54 +10,38 @@
     /**
      * 资源管理
      */
-    ENVIRONMENT_DATA_EXPORT("environmentData", "environmentData", "环境记录单数据"),
+    ENVIRONMENT_DATA_EXPORT("environmentData", "环境记录单数据", "环境记录单数据"),
+    STAFF_INFO("staffInfo", "人员登记", "人员登记"),
+    STAFF_CERTIFICATE_EXPIRE("certificateExpire", "证书逾期提醒", "证书逾期提醒"),
+    SUPPLIER_INFO("supplierInfo", "合格供方名录", "合格供方名录"),
+    CUSTOMER_INFO("customerInfo", "委托方名录", "委托方名录"),
+    CUSTOMER_SUGGEST_FORM("customerSuggestForm", "委托方意见登记表", "委托方意见登记表"),
+    SEAL_NOTE("sealNote", "印章使用登记", "印章使用登记"),
 
-    FILE_EXPORT("meterFileData", "meterFileData", "计量文件信息"),
-    TRAIN_PLAN_EXPORT("trainPlanData", "trainPlanData", "培训计划"),
-    TRAIN_LOG_EXPORT("trainLogData", "trainLogData", "培训记录"),
-    METER_ORGANIZE_EXPORT("meterOrganizeData", "meterOrganizeData", "计量组织"),
-    TRACE_SUPPLIER_EXPORT("traceSupplierData", "traceSupplierData", "溯源供方"),
-    SIGN_EXPORT("signData", "signData", "签名/签章"),
-    TEMPLATE_EXPORT("templateData", "templateData", "原始记录模板/证书报告模板"),
-    FIXED_ASSETS("meterFixedAssets", "meterFixedAssets", "固定资产"),
-    METER_EQUIPMENT("meterEquipment", "meterEquipment", "测量设备"),
-    CALIBRATION_TEST_EQUIPMENT("calibrationTestEquipment", "calibrationTestEquipment", "校准检定设备"),
-    MEASURE_ACCOUNT("measureAccount", "measureAccount", "测量工装"),
-    STANDARD_SUPPORT_EQUIPMENT("standardSupportEquipment", "standardSupportEquipment", "标准配套设备"),
-    STANDARD_EQUIPMENT("standardEquipment", "standardEquipment", "标准装置"),
-    FLOW_DEF_EXPORT("flowDefData", "flowDefData", "流程定义"),
-    STAFF_CERTIFICATE("certificate", "certificate", "计量人员证书"),
-    CHECK_INFO("checkInfo", "checkInfo", "设备管理点检测"),
-    EQUIPMENT_APPLY("equipmentApply", "equipmentApply", "设备借用"),
-    STANDARD_EQUIPMENT_REMIND("equipmentApplyRemind", "equipmentApplyRemind", "标准装置到期提醒"),
-    METER_PRICE("meterPrice", "meterPrice", "价格库"),
-    METER_STAFF("meterStaff", "meterStaff", "计量人员"),
-    STANDARD_EQUIPMENT_APPLY("standardEquipmentApply", "standardEquipmentApply", "标准装置申请"),
-    STATE_MANAGE_APPLY("stateManage", "stateManage", "状态管理"),
-    METER_ACCEPTANCE_CHECK("acceptanceCheck", "acceptanceCheck", "设备检修保养验收单"),
-    CUSTOMER_EXPORT("customerData", "customerData", "客户信息"),
-    ORDER_EXPORT("orderData", "orderData", "委托书信息"),
-    SAMPLE_EXPORT("sampleData", "sampleData", "样本信息"),
-    EXCHANGE_DATA("exchangeData", "exchangeData", "设备交接单"),
-    DISPATCH_DATA("dispatchData", "dispatchData", "设备收发"),
-    ENVIRONMENT_DATA("environmentData", "environmentData", "环境记录单"),
-    ORIGIN_DATA("originData", "originData", "原始记录"),
-    CERTIFICATE_REPORT("certificateReport", "certificateReport", "证书报告"),
-    ADVICE_EXPORT("adviceData", "adviceData", "客户反馈"),
-    HANDOUT_EXPORT("handoutData", "handoutData", "任务分发列表"),
-    OUTSOURCER_EXPORT("outsourcerData", "outsourcerData", "分包方"),
-    SITE_EXECUTIVE_EXPORT("siteExecutiveData", "siteExecutiveData", "现场测试、校准或检定"),
-    CERTIFICATE_PRINT_EXPORT("certificatePrintData", "certificatePrintData", "证书打印"),
-    DOWNLOAD_TEMPLATE("downloadTemplate", "downloadTemplate", "页面配置"),
-    OUTSOURCER_CERTIFICATE_EXPORT("outsourceCertificateData", "outsourceCertificateData", "分包证书"),
-    SETTLEMENT_INFO_EXPORT("settlementInfoData", "settlementInfoData", "业务结算"),
-    EQUIPMENT_REMIND("equipmentRemind", "equipmentRemind", "设备到期提醒"),
-    AGREEMENT_INFO_EXPORT("agreementInfoData", "agreementInfoData", "合同"),
-    WORK_STATISTICS_EXPORT("workStatisticsData", "workStatisticsData", "实时工作统计"),
-    DEPT_OUTPUT_EXPORT("deptOutputData", "deptOutputData", "部门产值分析"),
-    WORKLOAD_EXPORT("workloadData", "workloadData", "业务工作量分析"),
-    DEPT_COMPREHENSIVE_EXPORT("deptComprehensiveData", "deptComprehensiveData", "部门综合分析"),
-    ENVIRONMENTAL_RECORD("environmentalRecordData", "environmentalRecordData", "现场环境记录");
+    /**
+     * 计量检定业务
+     */
+    OUTSOURCER_EXPORT("outsourcerData", "分包方名录", "分包方名录"),
+    IDENTIFY_EXPORT("identifyData", "计量标识", "计量标识"),
+    ORDER_EXPORT("orderData", "任务单", "任务单"),
+    DISPATCH_DATA("dispatchData", "设备收发", "设备收发"),
+    HANDOUT_EXPORT("handoutData", "任务分发", "任务分发"),
+    SITE_EXECUTIVE_EXPORT("siteExecutiveData", "现场测试、校准或检定", "现场测试、校准或检定"),
+    CERTIFICATE_REPORT("certificateReport", "证书审批", "证书审批"),
+    CERTIFICATE_CHANGE_APPLY("certificateChangeApply", "证书报告补充或更换申请单", "证书报告补充或更换申请单"),
+    CERTIFICATE_PRINT("certificatePrintData", "证书打印审批", "证书打印审批"),
+    DEPT_EXECUTIVE_TASK("deptExecutiveTaskData", "实验室任务", "实验室任务"),
+    MY_EXECUTIVE_TASK("myExecutiveTaskData", "我的任务", "我的任务"),
+    OUTSOURCE_ASSESS("outsourceAssess", "测试、校准或检定工作分包评审表", "测试、校准或检定工作分包评审表"),
+    OUTSOURCE_PROTOCOL("outsourceProtocol", "测试、校准或检定工作分包协议书", "测试、校准或检定工作分包协议书"),
+
+    /**
+     * 系统管理
+     */
+    SIGN_EXPORT("signData", "签名", "签名"),
+    TEMPLATE_EXPORT("templateData", "文件模板", "文件模板"),
+    FLOW_DEF_EXPORT("flowDefData", "流程定义", "流程定义"),
+    DOWNLOAD_TEMPLATE("downloadTemplate", "流程定义", "页面配置");
 
     ExportEnum(String fileName, String sheetName, String description) {
         this.fileName = fileName;
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateRecordTypeCodeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateRecordTypeCodeEnum.java
index 31d913c..a963522 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateRecordTypeCodeEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateRecordTypeCodeEnum.java
@@ -46,4 +46,14 @@
     String SITE_EXECUTIVE_APPROVAL = "01";
     //《现场测试、校准或检定工作记录表》
     String SITE_EXECUTIVE_LOG = "02";
+
+    //测试、校准或检定工作分包协议书
+    String OUTSOURCE_PROTOCOL = "01";
+    //测试、校准或检定工作分包评审表
+    String OUTSOURCE_ACCESS = "02";
+    //测试、校准或检定工作分包通知书
+    String OUTSOURCE_NOTICE = "03";
+    //测试、校准或检定工作分包方名录
+    String OUTSOURCE_INFO = "04";
+
 }
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
index 24b8635..f78bd53 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
@@ -15,6 +15,10 @@
     String CERTIFICATE_CHANGE_APPLY_BEAN_NAME = "certificateChangeApplyBean";
     //现场测试、校准或检定
     String SITE_EXECUTIVE_BEAN_NAME = "siteExecutiveBean";
+    //测试、校准或检定工作分包评审表
+    String OUTSOURCE_ASSESS_BEAN_NAME = "outsourceAssessBean";
+    //测试、校准或检定工作分包协议书
+    String OUTSOURCE_PROTOCOL_BEAN_NAME = "outsourceProtocolBean";
 
     /*********************************设备与装置************************************/
     //设备台账

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java
index bb0c50f..13a699b 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java
@@ -12,6 +12,7 @@
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.IGeneralApprovalService;
+import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
@@ -19,6 +20,7 @@
 import org.springframework.web.bind.annotation.RequestBody;
 
 import javax.validation.Valid;
+import java.util.List;
 import java.util.Objects;
 
 /**
@@ -117,4 +119,17 @@
         }
         return baseApprovalService.failUpdate(request);
     }
+
+    public List<O> exportList(@RequestBody @Valid R request) throws Exception {
+        List<O> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = baseApprovalService.listExportByIds(request.getIds());
+        } else {
+            list = baseApprovalService.listExport(request);
+        }
+        for (O record : list) {
+            DictCodeUtils.convertDictCodeToName(record);
+        }
+        return list;
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java
index 8a90961..d775831 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java
@@ -5,6 +5,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.business.certificate.CertificateChangeApplyApprovalListRequest;
 import com.casic.missiles.dto.business.certificate.CertificateChangeApplySaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessCertificateChangeApply;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
@@ -20,6 +21,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -48,4 +50,12 @@
         }
         return changeApplyService.saveChangeApply(request);
     }
+
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody CertificateChangeApplyApprovalListRequest request) throws Exception {
+        List<BizBusinessCertificateChangeApply> list = super.exportList(request);
+        super.exportExcel(BizBusinessCertificateChangeApply.class, list, ExportEnum.CERTIFICATE_CHANGE_APPLY.getSheetName());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java
index 5fc4b07..af8230e 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java
@@ -9,6 +9,7 @@
 import com.casic.missiles.dto.business.certificate.CertificatePrintApprovalListRequest;
 import com.casic.missiles.dto.business.certificate.CertificatePrintListResponse;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.enums.business.CertificatePrintStatusEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessCertificatePrintLog;
@@ -18,10 +19,16 @@
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.io.IOException;
+import java.util.List;
 import java.util.Objects;
 
 /**
@@ -98,4 +105,16 @@
         });
         return certificatePrintService.certificatePrintLog(idDTO.getId());
     }
+
+    @ApiOperation("证书打印审批导出")
+    @PostMapping("/listExport")
+    public void exportList(@RequestBody CertificatePrintApprovalListRequest request) throws IOException {
+        List<CertificatePrintListResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = certificatePrintService.listByIds(request.getIds());
+        } else {
+            list = certificatePrintService.list(request);
+        }
+        super.exportExcel(CertificatePrintListResponse.class, list, ExportEnum.CERTIFICATE_PRINT.getSheetName());
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java
index 63b06dc..6b2efd5 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java
@@ -6,6 +6,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.business.certificate.CertificateReportApprovalListRequest;
 import com.casic.missiles.dto.business.certificate.CertificateReportSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessCertificateReport;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
@@ -21,6 +22,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -50,7 +52,7 @@
         return certificateReportService.saveCertificateReport(request);
     }
 
-    @ApiOperation("证书审批详情（基本信息）")
+    @ApiOperation("详情（基本信息）")
     @PostMapping("/detail")
     public ReturnDTO<BizBusinessCertificateReport> detail(@RequestBody @Valid BaseDetailRequest request, BindingResult bindingResult) throws Exception {
         if(bindingResult.hasErrors()){
@@ -59,4 +61,11 @@
         return certificateReportService.detail(request);
     }
 
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody CertificateReportApprovalListRequest request) throws Exception {
+        List<BizBusinessCertificateReport> list = super.exportList(request);
+        super.exportExcel(BizBusinessCertificateReport.class, list, ExportEnum.CERTIFICATE_REPORT.getSheetName());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java
index 46b26bd..57c0809 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java
@@ -10,20 +10,21 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.business.identify.IdentifyListRequest;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessIdentifyInfo;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.business.IBizBusinessIdentifyInfoService;
+import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import javax.validation.Valid;
+import java.util.List;
 import java.util.Objects;
 
 /**
@@ -57,16 +58,13 @@
         return identifyInfoService.addIdentify(identifyInfo);
     }
 
-    @ApiOperation("标识打印更新")
+    @ApiOperation("标识打印更新（更新打印时间）")
     @PostMapping("/update")
-    public ReturnDTO updateIdentify(@RequestBody @Valid BizBusinessIdentifyInfo identifyInfo, BindingResult bindingResult) {
-        Assert.isFalse(Objects.isNull(identifyInfo.getId()), () -> {
+    public ReturnDTO updateIdentify(@RequestBody @Valid IdDTO idDTO) {
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        Assert.isFalse(bindingResult.hasErrors(), () -> {
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        });
-        return identifyInfoService.updateIdentify(identifyInfo);
+        return identifyInfoService.updateIdentify(idDTO.getId());
     }
 
     @ApiOperation("标识打印删除")
@@ -77,4 +75,37 @@
         });
         return identifyInfoService.deleteIdentify(idDTO.getId());
     }
+
+    @ApiOperation("标识打印导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody @Valid IdentifyListRequest request, BindingResult bindingResult) throws Exception {
+        if (bindingResult.hasErrors()) {
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        List<BizBusinessIdentifyInfo> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = identifyInfoService.listByIds(request.getIds());
+        } else {
+            list = identifyInfoService.list(request);
+        }
+        for (BizBusinessIdentifyInfo record : list) {
+            DictCodeUtils.convertDictCodeToName(record);
+        }
+        super.exportExcel(BizBusinessIdentifyInfo.class, list, ExportEnum.IDENTIFY_EXPORT.getSheetName());
+    }
+
+
+    // TODO: 2023/8/23 查询设备信息，4个底部按钮查设备（按钮的作用就是前端用来调不同接口、用来区分中间即将展示的标识），前端弹窗选设备，在确定保存时前端根据底部按钮判断传入设备类型deviceType字典code
+    // TODO: 2023/8/23 接口：查受检设备（第1个按钮），查设备台账（后3个按钮同一接口），查询之后前端根据标志类型的不同加到中间页面时进行判断（按产品给的对应表）
+    // TODO: 2023/8/23 提供二维码接口，前端在加到中间页面时调用一下
+
+    @ApiOperation("设备二维码")
+    @PostMapping("/equipment/qrCode")
+    public ReturnDTO<String> equipmentQrCode(@RequestBody @Valid IdDTO idDTO) {
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return identifyInfoService.equipmentQrCode(idDTO.getId());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java
index 707be6e..7e0453d 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java
@@ -117,7 +117,7 @@
     }
 
     @ApiOperation("任务单导出")
-    @PostMapping("/export")
+    @PostMapping("/listExport")
     public void orderExport(@RequestBody @Valid OrderListRequest request, HttpServletResponse response) {
         businessOrderService.orderExport(request, response);
     }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java
index 529a6ce..51432be 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java
@@ -1,9 +1,28 @@
 package com.casic.missiles.controller.business;
 
+import com.casic.missiles.controller.GeneralApprovalController;
+import com.casic.missiles.dto.BaseApprovalSubmitRequest;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.business.outsource.OutsourceAssessApprovalListRequest;
+import com.casic.missiles.dto.business.outsource.OutsourceAssessSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
+import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.model.business.BizBusinessOutsourceAssess;
+import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
+import com.casic.missiles.service.IGeneralApprovalService;
+import com.casic.missiles.service.business.IBizBusinessOutsourceAssessService;
 import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.BindingResult;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.validation.Valid;
+import java.util.List;
+
 /**
  * <p>
  * 计量检定业务-分包管理-测试、校准或检定工作分包评审表 前端控制器
@@ -15,6 +34,27 @@
 @Api(tags = "分包管理-测试、校准或检定工作分包评审表")
 @RestController
 @RequestMapping("/business/outsource/assess")
-public class BizBusinessOutsourceAssessController {
+public class BizBusinessOutsourceAssessController extends GeneralApprovalController<BizBusinessOutsourceAssess, BizBusinessOutsourceAssess, OutsourceAssessApprovalListRequest, BaseApprovalSubmitRequest> {
+    @Autowired
+    private IBizBusinessOutsourceAssessService outsourceAssessService;
 
+    public BizBusinessOutsourceAssessController(IGeneralApprovalService<BizBusinessOutsourceAssess, BizBusinessOutsourceAssess, OutsourceAssessApprovalListRequest, BaseApprovalSubmitRequest> baseApprovalService) {
+        super(baseApprovalService);
+    }
+
+    @ApiOperation("草稿箱-保存")
+    @PostMapping("/save")
+    public ReturnDTO<OutsourceAssessSaveResponse> saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceAssess request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        return outsourceAssessService.saveOutsourceAssess(request);
+    }
+
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception {
+        List<BizBusinessOutsourceAssess> list = super.exportList(request);
+        super.exportExcel(BizBusinessOutsourceAssess.class, list, ExportEnum.OUTSOURCE_ASSESS.getSheetName());
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java
new file mode 100644
index 0000000..9adef18
--- /dev/null
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java
@@ -0,0 +1,60 @@
+package com.casic.missiles.controller.business;
+
+import com.casic.missiles.controller.GeneralApprovalController;
+import com.casic.missiles.dto.BaseApprovalSubmitRequest;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.business.outsource.OutsourceProtocolApprovalListRequest;
+import com.casic.missiles.dto.business.outsource.OutsourceProtocolSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
+import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.model.business.BizBusinessOutsourceProtocol;
+import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
+import com.casic.missiles.service.IGeneralApprovalService;
+import com.casic.missiles.service.business.IBizBusinessOutsourceProtocolService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.BindingResult;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.validation.Valid;
+import java.util.List;
+
+/**
+ * <p>
+ * 计量检定业务-分包管理-测试、校准或检定工作分包协议书 前端控制器
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-08-24
+ */
+@Api(tags = "分包管理-测试、校准或检定工作分包协议书")
+@RestController
+@RequestMapping("/business/outsource/protocol")
+public class BizBusinessOutsourceProtocolController extends GeneralApprovalController<BizBusinessOutsourceProtocol, BizBusinessOutsourceProtocol, OutsourceProtocolApprovalListRequest, BaseApprovalSubmitRequest> {
+    @Autowired
+    private IBizBusinessOutsourceProtocolService outsourceProtocolService;
+
+    public BizBusinessOutsourceProtocolController(IGeneralApprovalService<BizBusinessOutsourceProtocol, BizBusinessOutsourceProtocol, OutsourceProtocolApprovalListRequest, BaseApprovalSubmitRequest> baseApprovalService) {
+        super(baseApprovalService);
+    }
+
+    @ApiOperation("草稿箱-保存")
+    @PostMapping("/save")
+    public ReturnDTO<OutsourceProtocolSaveResponse> saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceProtocol request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        return outsourceProtocolService.saveOutsourceProtocol(request);
+    }
+
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody OutsourceProtocolApprovalListRequest request) throws Exception {
+        List<BizBusinessOutsourceProtocol> list = super.exportList(request);
+        super.exportExcel(BizBusinessOutsourceProtocol.class, list, ExportEnum.OUTSOURCE_PROTOCOL.getSheetName());
+    }
+}
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java
index 097f645..f0f0943 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java
@@ -17,7 +17,6 @@
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.IGeneralApprovalService;
 import com.casic.missiles.service.business.IBizBusinessOutsourcerInfoService;
-import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -71,19 +70,8 @@
 
     @ApiOperation("分包方导出")
     @PostMapping("/listExport")
-    public void export(@RequestBody @Valid OutsourcerInfoApprovalListRequest request, BindingResult bindingResult) throws Exception {
-        if (bindingResult.hasErrors()) {
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        }
-        List<BizBusinessOutsourcerInfo> list;
-        if (!CollectionUtils.isEmpty(request.getIds())) {
-            list = outsourcerInfoService.listByIds(request.getIds());
-        } else {
-            list = outsourcerInfoService.list(request);
-        }
-        for (BizBusinessOutsourcerInfo record : list) {
-            DictCodeUtils.convertDictCodeToName(record);
-        }
+    public void export(@RequestBody OutsourcerInfoApprovalListRequest request) throws Exception {
+        List<BizBusinessOutsourcerInfo> list = super.exportList(request);
         super.exportExcel(BizBusinessOutsourcerInfo.class, list, ExportEnum.OUTSOURCER_EXPORT.getSheetName());
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java
index c2cbf9f..0410918 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java
@@ -17,11 +17,9 @@
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.IGeneralApprovalService;
 import com.casic.missiles.service.business.IBizBusinessSiteExecutiveInfoService;
-import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -60,7 +58,7 @@
         return siteExecutiveInfoService.saveSiteExecutiveInfo(siteExecutiveInfo);
     }
 
-    @ApiOperation("现场检测详情")
+    @ApiOperation("详情")
     @PostMapping("/detail")
     public ReturnDTO<SiteExecutiveDetailResponse> siteExecutiveDetail(@RequestBody @Valid IdDTO idDTO) throws Exception {
         Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
@@ -69,21 +67,10 @@
         return ReturnUtil.success(siteExecutiveInfoService.detail(idDTO.getId()));
     }
 
-    @ApiOperation("现场检测导出")
+    @ApiOperation("导出")
     @PostMapping("/listExport")
-    public void export(@RequestBody @Valid SiteExecutiveApprovalListRequest request, BindingResult bindingResult) throws Exception {
-        if (bindingResult.hasErrors()) {
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        }
-        List<SiteExecutiveApprovalListResponse> list;
-        if (!CollectionUtils.isEmpty(request.getIds())) {
-            list = siteExecutiveInfoService.listInfoByIds(request.getIds());
-        } else {
-            list = siteExecutiveInfoService.listInfo(request);
-        }
-        for (SiteExecutiveApprovalListResponse record : list) {
-            DictCodeUtils.convertDictCodeToName(record);
-        }
+    public void export(@RequestBody SiteExecutiveApprovalListRequest request) throws Exception {
+        List<SiteExecutiveApprovalListResponse> list = super.exportList(request);
         super.exportExcel(SiteExecutiveApprovalListResponse.class, list, ExportEnum.SITE_EXECUTIVE_EXPORT.getSheetName());
     }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
index 7e793cd..a92e209 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
@@ -55,7 +55,7 @@
 
     @ApiOperation("设备收发列表导出")
     @PostMapping("/export")
-    public void exportList(@RequestBody @Valid SampleDispatchListRequest request) throws IOException {
+    public void exportList(@RequestBody SampleDispatchListRequest request) throws IOException {
         List<SampleDispatchListResponse> list;
         if (!CollectionUtils.isEmpty(request.getIds())) {
             list = dispatchService.listByIds(request.getIds());
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java
index cdc77fc..d120fd4 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java
@@ -7,6 +7,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.business.labExecutive.*;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.business.IBusinessLabExecutiveInfoService;
@@ -14,6 +15,7 @@
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.*;
 
@@ -32,7 +34,7 @@
     @Autowired
     private IBusinessLabExecutiveInfoService labExecutiveInfoService;
 
-    @ApiOperation("实验室检测-部门检测-查询各状态列表（待检测、检测中、检测完）")
+    @ApiOperation("实验室任务-查询各状态列表（待检测、检测中、检测完）")
     @PostMapping("/deptExecutive/List")
     public ReturnDTO<PageInfoBT<SampleLabExecutiveListResponse>> queryDeptExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
@@ -43,10 +45,19 @@
         return ReturnUtil.success(super.packForBT(labExecutiveInfoService.deptLabExecutiveListPage(page, labExecutiveListRequest)));
     }
 
-    /**
-     * 实验室检测-我的检测-查询各状态列表（待检测、检测中、检测完）
-     */
-    @ApiOperation("实验室检测-我的检测-查询各状态列表（待检测、检测中、检测完）")
+    @ApiOperation("实验室任务导出")
+    @PostMapping("/deptExecutive/export")
+    public void deptExportList(@RequestBody @Valid SampleLabExecutiveListRequest request) throws Exception {
+        List<SampleLabExecutiveListResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = labExecutiveInfoService.deptLabExecutiveListByIds(request.getMeasureStatus(), request.getIds());
+        } else {
+            list = labExecutiveInfoService.deptLabExecutiveList(request);
+        }
+        super.exportExcel(SampleLabExecutiveListResponse.class, list, ExportEnum.DEPT_EXECUTIVE_TASK.getSheetName());
+    }
+
+    @ApiOperation("我的任务-查询各状态列表（待检测、检测中、检测完）")
     @PostMapping("/myExecutive/list")
     public ReturnDTO<PageInfoBT<SampleLabExecutiveListResponse>> queryMyExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
@@ -57,19 +68,25 @@
         return ReturnUtil.success(super.packForBT(labExecutiveInfoService.myLabExecutiveListPage(page, labExecutiveListRequest)));
     }
 
-    /**
-     * 实验室检测-我的检测-查询各状态样品数量（待检测、检测中、检测完）
-     */
-    @ApiOperation("实验室检测-我的检测-查询各状态样品数量（待检测、检测中、检测完）")
+    @ApiOperation("我的任务导出")
+    @PostMapping("/myExecutive/export")
+    public void exportList(@RequestBody @Valid SampleLabExecutiveListRequest request) throws Exception {
+        List<SampleLabExecutiveListResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = labExecutiveInfoService.myLabExecutiveListByIds(request.getMeasureStatus(), request.getIds());
+        } else {
+            list = labExecutiveInfoService.myLabExecutiveList(request);
+        }
+        super.exportExcel(SampleLabExecutiveListResponse.class, list, ExportEnum.MY_EXECUTIVE_TASK.getSheetName());
+    }
+
+    @ApiOperation("我的任务-查询各状态样品数量（待检测、检测中、检测完）")
     @GetMapping("/myExecutive/amount")
     public ReturnDTO<List<SampleAmountResponse>> queryMyExecutiveAmount() {
         return ReturnUtil.success(labExecutiveInfoService.myExecutiveAmount());
     }
 
-    /**
-     * 实验室检测-部门检测-分配（分配给具体人员）
-     */
-    @ApiOperation("实验室检测-部门检测-分配按钮（分配给具体人员）")
+    @ApiOperation("实验室任务-分配按钮（分配给具体人员）")
     @PostMapping("/deptExecutive/allocate")
     public ReturnDTO allocateStaff(@RequestBody @Valid SampleAllocateRequest sampleAllocateRequest, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -78,10 +95,7 @@
         return labExecutiveInfoService.allocateStaff(sampleAllocateRequest);
     }
 
-    /**
-     * 实验室检测-我的检测-检定人扫描收入（待检测->检测中）
-     */
-    @ApiOperation("实验室检测-我的检测-检定人扫描收入（待检测->检测中）")
+    @ApiOperation("我的任务-检定人扫描收入（待检测->检测中）")
     @PostMapping("/myExecutive/receive")
     public ReturnDTO sampleReceive(@RequestBody @Valid List<SampleOperateRequest> requestList, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -90,10 +104,7 @@
         return labExecutiveInfoService.sampleReceive(requestList);
     }
 
-    /**
-     * 实验室检测-负责人/检定人扫描检完（检测中->检测完）
-     */
-    @ApiOperation("实验室检测-负责人/检定人扫描检完（检测中->检测完）")
+    @ApiOperation("实验室任务-负责人/检定人扫描检完（检测中->检测完）")
     @PostMapping("/myExecutive/complete")
     public ReturnDTO sampleExecutiveComplete(@RequestBody @Valid List<SampleOperateRequest> requestList, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -102,10 +113,7 @@
         return labExecutiveInfoService.sampleExecutiveComplete(requestList);
     }
 
-    /**
-     * 实验室检测-部门检测/我的检测 编辑（只能修改应出具证书）
-     */
-    @ApiOperation("实验室检测-部门检测/我的检测 编辑（只能修改应出具证书）")
+    @ApiOperation("实验室任务/我的任务 编辑（只能修改应出具证书）")
     @PostMapping("/executive/update")
     public ReturnDTO updateExecutive(@RequestBody @Valid UpdateExecutiveRequest request, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -114,10 +122,7 @@
         return labExecutiveInfoService.updateExecutive(request);
     }
 
-    /**
-     * 实验室检测-部门检测/我的检测 详情
-     */
-    @ApiOperation("实验室检测-部门检测/我的检测 详情")
+    @ApiOperation("实验室任务/我的任务 详情")
     @PostMapping("/executive/detail")
     public ReturnDTO<ExecutiveDetailResponse> executiveDetail(@RequestBody @Valid ExecutiveDetailRequest request, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
@@ -131,7 +136,7 @@
      * 退回后会将下一个要执行的实验室检测状态更新为待分配，将后面的实验室顺序变更为连续（都进行减1）
      * 最后一个检测的实验室退回，等分发员再增加实验室或设备收发中的已收入直接手动点击完成
      */
-    @ApiOperation("实验室检测-部门检测/我的检测 退回（待检测/检测中->退回）")
+    @ApiOperation("实验室任务/我的任务 退回（待检测/检测中->退回）")
     @PostMapping("/executive/sendBack")
     public ReturnDTO executiveSendBack(@RequestBody @Valid ExecutiveSendBackRequest request, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -140,9 +145,6 @@
         return labExecutiveInfoService.sampleExecutiveSendBack(request);
     }
 
-    /**
-     * 分发员编辑实验室检测列表
-     */
     @ApiOperation("分发员编辑实验室检测列表")
     @PostMapping("/handOut/updateList")
     public ReturnDTO updateExecutiveList(@RequestBody @Valid UpdateExecutiveListRequest request, BindingResult bindingResult) {
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java
index 48a67ed..0c04f31 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java
@@ -10,6 +10,7 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.resource.customer.CustomerApprovalListRequest;
 import com.casic.missiles.dto.resource.customer.CustomerSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceCustomerInfo;
@@ -26,6 +27,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -55,6 +57,13 @@
         return customerInfoService.saveCustomerInfo(request);
     }
 
+    @ApiOperation("委托方名录导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody CustomerApprovalListRequest request) throws Exception {
+        List<BizResourceCustomerInfo> list = super.exportList(request);
+        super.exportExcel(BizResourceCustomerInfo.class, list, ExportEnum.CUSTOMER_INFO.getSheetName());
+    }
+
     @ApiOperation("委托方人员列表（分页）")
     @PostMapping("/person/listPage")
     public ReturnDTO<PageInfoBT<BizResourceCustomerStaff>> personListPage(@RequestBody IdDTO idDto) {
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
index 972ed4b..6418ea5 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
@@ -5,6 +5,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.resource.customer.SuggestFormApprovalListRequest;
 import com.casic.missiles.dto.resource.customer.SuggestFormSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceCustomerSuggestForm;
@@ -20,6 +21,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -50,4 +52,11 @@
         return suggestFormService.saveSuggestForm(request);
     }
 
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody SuggestFormApprovalListRequest request) throws Exception {
+        List<BizResourceCustomerSuggestForm> list = super.exportList(request);
+        super.exportExcel(BizResourceCustomerSuggestForm.class, list, ExportEnum.CUSTOMER_SUGGEST_FORM.getSheetName());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java
index 1934d1a..9e07eab 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java
@@ -15,12 +15,16 @@
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.resource.IEnvEnvironmentRecordConfigService;
 import com.casic.missiles.service.resource.IEnvEnvironmentRecordDataService;
+import com.casic.missiles.service.resource.IEnvLocationInfoService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
 import java.util.List;
@@ -39,6 +43,8 @@
     private IEnvEnvironmentRecordDataService environmentRecordDataService;
     @Autowired
     private IEnvEnvironmentRecordConfigService environmentRecordConfigService;
+    @Autowired
+    private IEnvLocationInfoService locationInfoService;
 
     @ApiOperation("环境记录单数据列表/详情")
     @PostMapping("/data/listPage")
@@ -95,4 +101,11 @@
         });
         return environmentRecordConfigService.deleteEnvironmentRecordConfig(idDTO.getId());
     }
+
+    @ApiOperation("地点列表")
+    @PostMapping("/location/listPage")
+    public ReturnDTO<PageInfoBT<LocationListResponse>> locationListPage(@RequestBody @Valid LocationListRequest request) {
+        Page<LocationListResponse> page = PageFactory.defaultPage();
+        return ReturnUtil.success(super.packForBT(locationInfoService.listPage(page, request)));
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java
index 82efe3f..e9561fa 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java
@@ -10,6 +10,7 @@
 import com.casic.missiles.dto.resource.seal.SealLogListRequest;
 import com.casic.missiles.dto.resource.seal.SealNoteApprovalListRequest;
 import com.casic.missiles.dto.resource.seal.SealNoteSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceSealUseLog;
@@ -27,6 +28,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -58,6 +60,13 @@
         return sealUseNoteService.saveSeal(request);
     }
 
+    @ApiOperation("印章使用登记导出（列表和导出中去掉经办人和监印人）")
+    @PostMapping("/listExport")
+    public void export(@RequestBody SealNoteApprovalListRequest request) throws Exception {
+        List<BizResourceSealUseNote> list = super.exportList(request);
+        super.exportExcel(BizResourceSealUseNote.class, list, ExportEnum.SEAL_NOTE.getSheetName());
+    }
+
     // TODO: 2023/7/28 印章使用日志：系统中使用印章时插入数据库
 
     @ApiOperation("印章使用日志列表（分页）")
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java
index 9b674fc..06b6521 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java
@@ -9,16 +9,20 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.resource.staff.StaffCertRequest;
 import com.casic.missiles.dto.resource.staff.StaffCertResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.service.resource.IBizResourceStaffInfoService;
 import com.casic.missiles.service.resource.IBizResourceStaffVerifierService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.List;
+
 /**
  * @Description:
  * @Author: wangpeng
@@ -41,9 +45,21 @@
         return ReturnUtil.success(super.packForBT(responsePage));
     }
 
+    @ApiOperation("证书逾期提醒导出")
+    @PostMapping("/listExport")
+    public void exportList(@RequestBody StaffCertRequest request) throws Exception {
+        List<StaffCertResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = staffInfoService.certListByIds(request.getIds());
+        } else {
+            list = staffInfoService.certList(request);
+        }
+        super.exportExcel(StaffCertResponse.class, list, ExportEnum.STAFF_CERTIFICATE_EXPIRE.getSheetName());
+    }
+
     @ApiOperation("证书逾期提醒")
     @PostMapping("/expirationReminder")
-    public ReturnDTO expirationReminder(@RequestBody IdDTO idDto) {
-        return verifierService.expirationReminder(idDto);
+    public ReturnDTO expirationReminder(@RequestBody IdDTO idDTO) {
+        return verifierService.expirationReminder(idDTO);
     }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java
index 3b251ad..a6e7850 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java
@@ -12,6 +12,7 @@
 import com.casic.missiles.dto.resource.staff.StaffListRequest;
 import com.casic.missiles.dto.resource.staff.TrainListRequest;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.*;
@@ -22,7 +23,10 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
 import java.util.List;
@@ -52,8 +56,19 @@
             throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
         }
         Page<BizResourceStaffInfo> page = PageFactory.defaultPage();
-        Page<BizResourceStaffInfo> responsePage = staffInfoService.listPage(page, request);
-        return ReturnUtil.success(super.packForBT(responsePage));
+        return ReturnUtil.success(super.packForBT(staffInfoService.listPage(page, request)));
+    }
+
+    @ApiOperation("人员登记导出")
+    @PostMapping("/listExport")
+    public void exportList(@RequestBody StaffListRequest request) throws Exception {
+        List<BizResourceStaffInfo> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = staffInfoService.listByIds(request.getIds());
+        } else {
+            list = staffInfoService.list(request);
+        }
+        super.exportExcel(BizResourceStaffInfo.class, list, ExportEnum.STAFF_INFO.getSheetName());
     }
 
     @ApiOperation("人员登记详情基础信息")
@@ -85,9 +100,9 @@
 
     @ApiOperation("科研教育列表（分页）")
     @PostMapping("/education/listPage")
-    public ReturnDTO<PageInfoBT<BizResourceStaffEducation>> educationListPage(@RequestBody IdDTO idDto) {
+    public ReturnDTO<PageInfoBT<BizResourceStaffEducation>> educationListPage(@RequestBody IdDTO idDTO) {
         Page<BizResourceStaffEducation> page = PageFactory.defaultPage();
-        Page<BizResourceStaffEducation> responsePage = staffInfoService.educationListPage(page, idDto);
+        Page<BizResourceStaffEducation> responsePage = staffInfoService.educationListPage(page, idDTO);
         return ReturnUtil.success(super.packForBT(responsePage));
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java
index af6aa86..d85d84a 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java
@@ -9,6 +9,7 @@
 import com.casic.missiles.dto.resource.outsideService.SupplierApprovalListRequest;
 import com.casic.missiles.dto.resource.outsideService.SupplierSaveResponse;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceSupplierAbility;
@@ -67,6 +68,13 @@
         return ReturnUtil.success(supplierInfoService.detail(idDTO.getId()));
     }
 
+    @ApiOperation("合格供方导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody SupplierApprovalListRequest request) throws Exception {
+        List<BizResourceSupplierInfo> list = super.exportList(request);
+        super.exportExcel(BizResourceSupplierInfo.class, list, ExportEnum.SUPPLIER_INFO.getSheetName());
+    }
+
     @ApiOperation("供方人员列表（分页）")
     @PostMapping("/person/listPage")
     public ReturnDTO<PageInfoBT<BizResourceSupplierPerson>> personListPage(@RequestBody IdDTO idDTO) {
diff --git a/casic-metering-api/src/main/resources/config/application.yml b/casic-metering-api/src/main/resources/config/application.yml
index 350db5f..ecff521 100644
--- a/casic-metering-api/src/main/resources/config/application.yml
+++ b/casic-metering-api/src/main/resources/config/application.yml
@@ -126,7 +126,7 @@
     #作者
     author: wangpeng
     #待生成对象表名
-    table-name: biz_equipment_technical_target_approval,biz_equipment_attachment_approval,biz_equipment_checkpoint_approval
+    table-name: biz_business_outsource_protocol
 
 reminder:
   #节点--common模块config包 ReminderNodeConfig配置
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
index 4a19e4e..d47d552 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
@@ -53,6 +53,7 @@
     SUGGEST_FORM_SAVE_FAILED(2509, "委托方意见登记表保存至草稿箱失败"),
     EXAMINE_FORM_SAVE_FAILED(2510, "要求、委托书及合同评审表保存至草稿箱失败"),
     CUSTOMER_EXIST_SAVE_FAILED(2511, "该委托方已存在，请重新选择"),
+    DUPLICATE_LOCATION_NO(2512, "地点编号已存在"),
 
     /**
      * 计量检定业务模块
@@ -68,6 +69,8 @@
     COMPLETE_SAMPLE_NOT_EXIST(2609, "检测中不存在扫描收入的样品"),
     CANNOT_CHANGE_MEASURE_INFO(2610, "无法更改非当前登录用户的检测信息"),
     NON_EXIST_ORDER_OR_SAMPLE(2611, "不存在该委托单或该委托单下的样品"),
+    OUTSOURCE_ACCESS_SAVE_FAILED(2612, "测试、校准或检定工作分包评审表保存至草稿箱失败"),
+    OUTSOURCE_PROTOCOL_SAVE_FAILED(2613, "测试、校准或检定工作分包协议书保存至草稿箱失败"),
 
     /**
      * 历史遗留备用
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
index 5089ad1..81a406b 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
@@ -10,54 +10,38 @@
     /**
      * 资源管理
      */
-    ENVIRONMENT_DATA_EXPORT("environmentData", "environmentData", "环境记录单数据"),
+    ENVIRONMENT_DATA_EXPORT("environmentData", "环境记录单数据", "环境记录单数据"),
+    STAFF_INFO("staffInfo", "人员登记", "人员登记"),
+    STAFF_CERTIFICATE_EXPIRE("certificateExpire", "证书逾期提醒", "证书逾期提醒"),
+    SUPPLIER_INFO("supplierInfo", "合格供方名录", "合格供方名录"),
+    CUSTOMER_INFO("customerInfo", "委托方名录", "委托方名录"),
+    CUSTOMER_SUGGEST_FORM("customerSuggestForm", "委托方意见登记表", "委托方意见登记表"),
+    SEAL_NOTE("sealNote", "印章使用登记", "印章使用登记"),
 
-    FILE_EXPORT("meterFileData", "meterFileData", "计量文件信息"),
-    TRAIN_PLAN_EXPORT("trainPlanData", "trainPlanData", "培训计划"),
-    TRAIN_LOG_EXPORT("trainLogData", "trainLogData", "培训记录"),
-    METER_ORGANIZE_EXPORT("meterOrganizeData", "meterOrganizeData", "计量组织"),
-    TRACE_SUPPLIER_EXPORT("traceSupplierData", "traceSupplierData", "溯源供方"),
-    SIGN_EXPORT("signData", "signData", "签名/签章"),
-    TEMPLATE_EXPORT("templateData", "templateData", "原始记录模板/证书报告模板"),
-    FIXED_ASSETS("meterFixedAssets", "meterFixedAssets", "固定资产"),
-    METER_EQUIPMENT("meterEquipment", "meterEquipment", "测量设备"),
-    CALIBRATION_TEST_EQUIPMENT("calibrationTestEquipment", "calibrationTestEquipment", "校准检定设备"),
-    MEASURE_ACCOUNT("measureAccount", "measureAccount", "测量工装"),
-    STANDARD_SUPPORT_EQUIPMENT("standardSupportEquipment", "standardSupportEquipment", "标准配套设备"),
-    STANDARD_EQUIPMENT("standardEquipment", "standardEquipment", "标准装置"),
-    FLOW_DEF_EXPORT("flowDefData", "flowDefData", "流程定义"),
-    STAFF_CERTIFICATE("certificate", "certificate", "计量人员证书"),
-    CHECK_INFO("checkInfo", "checkInfo", "设备管理点检测"),
-    EQUIPMENT_APPLY("equipmentApply", "equipmentApply", "设备借用"),
-    STANDARD_EQUIPMENT_REMIND("equipmentApplyRemind", "equipmentApplyRemind", "标准装置到期提醒"),
-    METER_PRICE("meterPrice", "meterPrice", "价格库"),
-    METER_STAFF("meterStaff", "meterStaff", "计量人员"),
-    STANDARD_EQUIPMENT_APPLY("standardEquipmentApply", "standardEquipmentApply", "标准装置申请"),
-    STATE_MANAGE_APPLY("stateManage", "stateManage", "状态管理"),
-    METER_ACCEPTANCE_CHECK("acceptanceCheck", "acceptanceCheck", "设备检修保养验收单"),
-    CUSTOMER_EXPORT("customerData", "customerData", "客户信息"),
-    ORDER_EXPORT("orderData", "orderData", "委托书信息"),
-    SAMPLE_EXPORT("sampleData", "sampleData", "样本信息"),
-    EXCHANGE_DATA("exchangeData", "exchangeData", "设备交接单"),
-    DISPATCH_DATA("dispatchData", "dispatchData", "设备收发"),
-    ENVIRONMENT_DATA("environmentData", "environmentData", "环境记录单"),
-    ORIGIN_DATA("originData", "originData", "原始记录"),
-    CERTIFICATE_REPORT("certificateReport", "certificateReport", "证书报告"),
-    ADVICE_EXPORT("adviceData", "adviceData", "客户反馈"),
-    HANDOUT_EXPORT("handoutData", "handoutData", "任务分发列表"),
-    OUTSOURCER_EXPORT("outsourcerData", "outsourcerData", "分包方"),
-    SITE_EXECUTIVE_EXPORT("siteExecutiveData", "siteExecutiveData", "现场测试、校准或检定"),
-    CERTIFICATE_PRINT_EXPORT("certificatePrintData", "certificatePrintData", "证书打印"),
-    DOWNLOAD_TEMPLATE("downloadTemplate", "downloadTemplate", "页面配置"),
-    OUTSOURCER_CERTIFICATE_EXPORT("outsourceCertificateData", "outsourceCertificateData", "分包证书"),
-    SETTLEMENT_INFO_EXPORT("settlementInfoData", "settlementInfoData", "业务结算"),
-    EQUIPMENT_REMIND("equipmentRemind", "equipmentRemind", "设备到期提醒"),
-    AGREEMENT_INFO_EXPORT("agreementInfoData", "agreementInfoData", "合同"),
-    WORK_STATISTICS_EXPORT("workStatisticsData", "workStatisticsData", "实时工作统计"),
-    DEPT_OUTPUT_EXPORT("deptOutputData", "deptOutputData", "部门产值分析"),
-    WORKLOAD_EXPORT("workloadData", "workloadData", "业务工作量分析"),
-    DEPT_COMPREHENSIVE_EXPORT("deptComprehensiveData", "deptComprehensiveData", "部门综合分析"),
-    ENVIRONMENTAL_RECORD("environmentalRecordData", "environmentalRecordData", "现场环境记录");
+    /**
+     * 计量检定业务
+     */
+    OUTSOURCER_EXPORT("outsourcerData", "分包方名录", "分包方名录"),
+    IDENTIFY_EXPORT("identifyData", "计量标识", "计量标识"),
+    ORDER_EXPORT("orderData", "任务单", "任务单"),
+    DISPATCH_DATA("dispatchData", "设备收发", "设备收发"),
+    HANDOUT_EXPORT("handoutData", "任务分发", "任务分发"),
+    SITE_EXECUTIVE_EXPORT("siteExecutiveData", "现场测试、校准或检定", "现场测试、校准或检定"),
+    CERTIFICATE_REPORT("certificateReport", "证书审批", "证书审批"),
+    CERTIFICATE_CHANGE_APPLY("certificateChangeApply", "证书报告补充或更换申请单", "证书报告补充或更换申请单"),
+    CERTIFICATE_PRINT("certificatePrintData", "证书打印审批", "证书打印审批"),
+    DEPT_EXECUTIVE_TASK("deptExecutiveTaskData", "实验室任务", "实验室任务"),
+    MY_EXECUTIVE_TASK("myExecutiveTaskData", "我的任务", "我的任务"),
+    OUTSOURCE_ASSESS("outsourceAssess", "测试、校准或检定工作分包评审表", "测试、校准或检定工作分包评审表"),
+    OUTSOURCE_PROTOCOL("outsourceProtocol", "测试、校准或检定工作分包协议书", "测试、校准或检定工作分包协议书"),
+
+    /**
+     * 系统管理
+     */
+    SIGN_EXPORT("signData", "签名", "签名"),
+    TEMPLATE_EXPORT("templateData", "文件模板", "文件模板"),
+    FLOW_DEF_EXPORT("flowDefData", "流程定义", "流程定义"),
+    DOWNLOAD_TEMPLATE("downloadTemplate", "流程定义", "页面配置");
 
     ExportEnum(String fileName, String sheetName, String description) {
         this.fileName = fileName;
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateRecordTypeCodeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateRecordTypeCodeEnum.java
index 31d913c..a963522 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateRecordTypeCodeEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateRecordTypeCodeEnum.java
@@ -46,4 +46,14 @@
     String SITE_EXECUTIVE_APPROVAL = "01";
     //《现场测试、校准或检定工作记录表》
     String SITE_EXECUTIVE_LOG = "02";
+
+    //测试、校准或检定工作分包协议书
+    String OUTSOURCE_PROTOCOL = "01";
+    //测试、校准或检定工作分包评审表
+    String OUTSOURCE_ACCESS = "02";
+    //测试、校准或检定工作分包通知书
+    String OUTSOURCE_NOTICE = "03";
+    //测试、校准或检定工作分包方名录
+    String OUTSOURCE_INFO = "04";
+
 }
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
index 24b8635..f78bd53 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
@@ -15,6 +15,10 @@
     String CERTIFICATE_CHANGE_APPLY_BEAN_NAME = "certificateChangeApplyBean";
     //现场测试、校准或检定
     String SITE_EXECUTIVE_BEAN_NAME = "siteExecutiveBean";
+    //测试、校准或检定工作分包评审表
+    String OUTSOURCE_ASSESS_BEAN_NAME = "outsourceAssessBean";
+    //测试、校准或检定工作分包协议书
+    String OUTSOURCE_PROTOCOL_BEAN_NAME = "outsourceProtocolBean";
 
     /*********************************设备与装置************************************/
     //设备台账
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 b21c661..6b86fd1 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
@@ -18,6 +18,8 @@
     OUTSOURCER_APPROVAL(OUTSOURCER_BEAN_NAME, ""),
     CERTIFICATE_CHANGE_APPROVAL(CERTIFICATE_CHANGE_APPLY_BEAN_NAME, ""),
     SITE_EXECUTIVE_APPROVAL(SITE_EXECUTIVE_BEAN_NAME, ""),
+    OUTSOURCE_ASSESS_APPROVAL(OUTSOURCE_ASSESS_BEAN_NAME, ""),
+    OUTSOURCE_PROTOCOL_APPROVAL(OUTSOURCE_PROTOCOL_BEAN_NAME, ""),
 
     ACTION_STATUS_MAP(new HashMap<String, AwareActionStatusEnum>() {
         {
@@ -47,6 +49,10 @@
             put(ApplyFromIdEnum.CERTIFICATE_CHANGE_APPROVAL.getCode(), CERTIFICATE_CHANGE_APPROVAL);
             //现场测试、校准或检定审批
             put(ApplyFromIdEnum.SITE_EXECUTIVE_APPROVAL.getCode(), SITE_EXECUTIVE_APPROVAL);
+            //测试、校准或检定工作分包评审表
+            put(ApplyFromIdEnum.OUTSOURCE_ASSESS_APPROVAL.getCode(), OUTSOURCE_ASSESS_APPROVAL);
+            //测试、校准或检定工作分包协议书
+            put(ApplyFromIdEnum.OUTSOURCE_PROTOCOL_APPROVAL.getCode(), OUTSOURCE_PROTOCOL_APPROVAL);
         }
     });
     String actionBeanName;

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java
index bb0c50f..13a699b 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java
@@ -12,6 +12,7 @@
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.IGeneralApprovalService;
+import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
@@ -19,6 +20,7 @@
 import org.springframework.web.bind.annotation.RequestBody;
 
 import javax.validation.Valid;
+import java.util.List;
 import java.util.Objects;
 
 /**
@@ -117,4 +119,17 @@
         }
         return baseApprovalService.failUpdate(request);
     }
+
+    public List<O> exportList(@RequestBody @Valid R request) throws Exception {
+        List<O> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = baseApprovalService.listExportByIds(request.getIds());
+        } else {
+            list = baseApprovalService.listExport(request);
+        }
+        for (O record : list) {
+            DictCodeUtils.convertDictCodeToName(record);
+        }
+        return list;
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java
index 8a90961..d775831 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java
@@ -5,6 +5,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.business.certificate.CertificateChangeApplyApprovalListRequest;
 import com.casic.missiles.dto.business.certificate.CertificateChangeApplySaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessCertificateChangeApply;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
@@ -20,6 +21,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -48,4 +50,12 @@
         }
         return changeApplyService.saveChangeApply(request);
     }
+
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody CertificateChangeApplyApprovalListRequest request) throws Exception {
+        List<BizBusinessCertificateChangeApply> list = super.exportList(request);
+        super.exportExcel(BizBusinessCertificateChangeApply.class, list, ExportEnum.CERTIFICATE_CHANGE_APPLY.getSheetName());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java
index 5fc4b07..af8230e 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java
@@ -9,6 +9,7 @@
 import com.casic.missiles.dto.business.certificate.CertificatePrintApprovalListRequest;
 import com.casic.missiles.dto.business.certificate.CertificatePrintListResponse;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.enums.business.CertificatePrintStatusEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessCertificatePrintLog;
@@ -18,10 +19,16 @@
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.io.IOException;
+import java.util.List;
 import java.util.Objects;
 
 /**
@@ -98,4 +105,16 @@
         });
         return certificatePrintService.certificatePrintLog(idDTO.getId());
     }
+
+    @ApiOperation("证书打印审批导出")
+    @PostMapping("/listExport")
+    public void exportList(@RequestBody CertificatePrintApprovalListRequest request) throws IOException {
+        List<CertificatePrintListResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = certificatePrintService.listByIds(request.getIds());
+        } else {
+            list = certificatePrintService.list(request);
+        }
+        super.exportExcel(CertificatePrintListResponse.class, list, ExportEnum.CERTIFICATE_PRINT.getSheetName());
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java
index 63b06dc..6b2efd5 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java
@@ -6,6 +6,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.business.certificate.CertificateReportApprovalListRequest;
 import com.casic.missiles.dto.business.certificate.CertificateReportSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessCertificateReport;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
@@ -21,6 +22,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -50,7 +52,7 @@
         return certificateReportService.saveCertificateReport(request);
     }
 
-    @ApiOperation("证书审批详情（基本信息）")
+    @ApiOperation("详情（基本信息）")
     @PostMapping("/detail")
     public ReturnDTO<BizBusinessCertificateReport> detail(@RequestBody @Valid BaseDetailRequest request, BindingResult bindingResult) throws Exception {
         if(bindingResult.hasErrors()){
@@ -59,4 +61,11 @@
         return certificateReportService.detail(request);
     }
 
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody CertificateReportApprovalListRequest request) throws Exception {
+        List<BizBusinessCertificateReport> list = super.exportList(request);
+        super.exportExcel(BizBusinessCertificateReport.class, list, ExportEnum.CERTIFICATE_REPORT.getSheetName());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java
index 46b26bd..57c0809 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java
@@ -10,20 +10,21 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.business.identify.IdentifyListRequest;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessIdentifyInfo;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.business.IBizBusinessIdentifyInfoService;
+import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import javax.validation.Valid;
+import java.util.List;
 import java.util.Objects;
 
 /**
@@ -57,16 +58,13 @@
         return identifyInfoService.addIdentify(identifyInfo);
     }
 
-    @ApiOperation("标识打印更新")
+    @ApiOperation("标识打印更新（更新打印时间）")
     @PostMapping("/update")
-    public ReturnDTO updateIdentify(@RequestBody @Valid BizBusinessIdentifyInfo identifyInfo, BindingResult bindingResult) {
-        Assert.isFalse(Objects.isNull(identifyInfo.getId()), () -> {
+    public ReturnDTO updateIdentify(@RequestBody @Valid IdDTO idDTO) {
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        Assert.isFalse(bindingResult.hasErrors(), () -> {
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        });
-        return identifyInfoService.updateIdentify(identifyInfo);
+        return identifyInfoService.updateIdentify(idDTO.getId());
     }
 
     @ApiOperation("标识打印删除")
@@ -77,4 +75,37 @@
         });
         return identifyInfoService.deleteIdentify(idDTO.getId());
     }
+
+    @ApiOperation("标识打印导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody @Valid IdentifyListRequest request, BindingResult bindingResult) throws Exception {
+        if (bindingResult.hasErrors()) {
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        List<BizBusinessIdentifyInfo> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = identifyInfoService.listByIds(request.getIds());
+        } else {
+            list = identifyInfoService.list(request);
+        }
+        for (BizBusinessIdentifyInfo record : list) {
+            DictCodeUtils.convertDictCodeToName(record);
+        }
+        super.exportExcel(BizBusinessIdentifyInfo.class, list, ExportEnum.IDENTIFY_EXPORT.getSheetName());
+    }
+
+
+    // TODO: 2023/8/23 查询设备信息，4个底部按钮查设备（按钮的作用就是前端用来调不同接口、用来区分中间即将展示的标识），前端弹窗选设备，在确定保存时前端根据底部按钮判断传入设备类型deviceType字典code
+    // TODO: 2023/8/23 接口：查受检设备（第1个按钮），查设备台账（后3个按钮同一接口），查询之后前端根据标志类型的不同加到中间页面时进行判断（按产品给的对应表）
+    // TODO: 2023/8/23 提供二维码接口，前端在加到中间页面时调用一下
+
+    @ApiOperation("设备二维码")
+    @PostMapping("/equipment/qrCode")
+    public ReturnDTO<String> equipmentQrCode(@RequestBody @Valid IdDTO idDTO) {
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return identifyInfoService.equipmentQrCode(idDTO.getId());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java
index 707be6e..7e0453d 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java
@@ -117,7 +117,7 @@
     }
 
     @ApiOperation("任务单导出")
-    @PostMapping("/export")
+    @PostMapping("/listExport")
     public void orderExport(@RequestBody @Valid OrderListRequest request, HttpServletResponse response) {
         businessOrderService.orderExport(request, response);
     }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java
index 529a6ce..51432be 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java
@@ -1,9 +1,28 @@
 package com.casic.missiles.controller.business;
 
+import com.casic.missiles.controller.GeneralApprovalController;
+import com.casic.missiles.dto.BaseApprovalSubmitRequest;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.business.outsource.OutsourceAssessApprovalListRequest;
+import com.casic.missiles.dto.business.outsource.OutsourceAssessSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
+import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.model.business.BizBusinessOutsourceAssess;
+import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
+import com.casic.missiles.service.IGeneralApprovalService;
+import com.casic.missiles.service.business.IBizBusinessOutsourceAssessService;
 import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.BindingResult;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.validation.Valid;
+import java.util.List;
+
 /**
  * <p>
  * 计量检定业务-分包管理-测试、校准或检定工作分包评审表 前端控制器
@@ -15,6 +34,27 @@
 @Api(tags = "分包管理-测试、校准或检定工作分包评审表")
 @RestController
 @RequestMapping("/business/outsource/assess")
-public class BizBusinessOutsourceAssessController {
+public class BizBusinessOutsourceAssessController extends GeneralApprovalController<BizBusinessOutsourceAssess, BizBusinessOutsourceAssess, OutsourceAssessApprovalListRequest, BaseApprovalSubmitRequest> {
+    @Autowired
+    private IBizBusinessOutsourceAssessService outsourceAssessService;
 
+    public BizBusinessOutsourceAssessController(IGeneralApprovalService<BizBusinessOutsourceAssess, BizBusinessOutsourceAssess, OutsourceAssessApprovalListRequest, BaseApprovalSubmitRequest> baseApprovalService) {
+        super(baseApprovalService);
+    }
+
+    @ApiOperation("草稿箱-保存")
+    @PostMapping("/save")
+    public ReturnDTO<OutsourceAssessSaveResponse> saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceAssess request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        return outsourceAssessService.saveOutsourceAssess(request);
+    }
+
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception {
+        List<BizBusinessOutsourceAssess> list = super.exportList(request);
+        super.exportExcel(BizBusinessOutsourceAssess.class, list, ExportEnum.OUTSOURCE_ASSESS.getSheetName());
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java
new file mode 100644
index 0000000..9adef18
--- /dev/null
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java
@@ -0,0 +1,60 @@
+package com.casic.missiles.controller.business;
+
+import com.casic.missiles.controller.GeneralApprovalController;
+import com.casic.missiles.dto.BaseApprovalSubmitRequest;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.business.outsource.OutsourceProtocolApprovalListRequest;
+import com.casic.missiles.dto.business.outsource.OutsourceProtocolSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
+import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.model.business.BizBusinessOutsourceProtocol;
+import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
+import com.casic.missiles.service.IGeneralApprovalService;
+import com.casic.missiles.service.business.IBizBusinessOutsourceProtocolService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.BindingResult;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.validation.Valid;
+import java.util.List;
+
+/**
+ * <p>
+ * 计量检定业务-分包管理-测试、校准或检定工作分包协议书 前端控制器
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-08-24
+ */
+@Api(tags = "分包管理-测试、校准或检定工作分包协议书")
+@RestController
+@RequestMapping("/business/outsource/protocol")
+public class BizBusinessOutsourceProtocolController extends GeneralApprovalController<BizBusinessOutsourceProtocol, BizBusinessOutsourceProtocol, OutsourceProtocolApprovalListRequest, BaseApprovalSubmitRequest> {
+    @Autowired
+    private IBizBusinessOutsourceProtocolService outsourceProtocolService;
+
+    public BizBusinessOutsourceProtocolController(IGeneralApprovalService<BizBusinessOutsourceProtocol, BizBusinessOutsourceProtocol, OutsourceProtocolApprovalListRequest, BaseApprovalSubmitRequest> baseApprovalService) {
+        super(baseApprovalService);
+    }
+
+    @ApiOperation("草稿箱-保存")
+    @PostMapping("/save")
+    public ReturnDTO<OutsourceProtocolSaveResponse> saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceProtocol request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        return outsourceProtocolService.saveOutsourceProtocol(request);
+    }
+
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody OutsourceProtocolApprovalListRequest request) throws Exception {
+        List<BizBusinessOutsourceProtocol> list = super.exportList(request);
+        super.exportExcel(BizBusinessOutsourceProtocol.class, list, ExportEnum.OUTSOURCE_PROTOCOL.getSheetName());
+    }
+}
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java
index 097f645..f0f0943 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java
@@ -17,7 +17,6 @@
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.IGeneralApprovalService;
 import com.casic.missiles.service.business.IBizBusinessOutsourcerInfoService;
-import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -71,19 +70,8 @@
 
     @ApiOperation("分包方导出")
     @PostMapping("/listExport")
-    public void export(@RequestBody @Valid OutsourcerInfoApprovalListRequest request, BindingResult bindingResult) throws Exception {
-        if (bindingResult.hasErrors()) {
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        }
-        List<BizBusinessOutsourcerInfo> list;
-        if (!CollectionUtils.isEmpty(request.getIds())) {
-            list = outsourcerInfoService.listByIds(request.getIds());
-        } else {
-            list = outsourcerInfoService.list(request);
-        }
-        for (BizBusinessOutsourcerInfo record : list) {
-            DictCodeUtils.convertDictCodeToName(record);
-        }
+    public void export(@RequestBody OutsourcerInfoApprovalListRequest request) throws Exception {
+        List<BizBusinessOutsourcerInfo> list = super.exportList(request);
         super.exportExcel(BizBusinessOutsourcerInfo.class, list, ExportEnum.OUTSOURCER_EXPORT.getSheetName());
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java
index c2cbf9f..0410918 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java
@@ -17,11 +17,9 @@
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.IGeneralApprovalService;
 import com.casic.missiles.service.business.IBizBusinessSiteExecutiveInfoService;
-import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -60,7 +58,7 @@
         return siteExecutiveInfoService.saveSiteExecutiveInfo(siteExecutiveInfo);
     }
 
-    @ApiOperation("现场检测详情")
+    @ApiOperation("详情")
     @PostMapping("/detail")
     public ReturnDTO<SiteExecutiveDetailResponse> siteExecutiveDetail(@RequestBody @Valid IdDTO idDTO) throws Exception {
         Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
@@ -69,21 +67,10 @@
         return ReturnUtil.success(siteExecutiveInfoService.detail(idDTO.getId()));
     }
 
-    @ApiOperation("现场检测导出")
+    @ApiOperation("导出")
     @PostMapping("/listExport")
-    public void export(@RequestBody @Valid SiteExecutiveApprovalListRequest request, BindingResult bindingResult) throws Exception {
-        if (bindingResult.hasErrors()) {
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        }
-        List<SiteExecutiveApprovalListResponse> list;
-        if (!CollectionUtils.isEmpty(request.getIds())) {
-            list = siteExecutiveInfoService.listInfoByIds(request.getIds());
-        } else {
-            list = siteExecutiveInfoService.listInfo(request);
-        }
-        for (SiteExecutiveApprovalListResponse record : list) {
-            DictCodeUtils.convertDictCodeToName(record);
-        }
+    public void export(@RequestBody SiteExecutiveApprovalListRequest request) throws Exception {
+        List<SiteExecutiveApprovalListResponse> list = super.exportList(request);
         super.exportExcel(SiteExecutiveApprovalListResponse.class, list, ExportEnum.SITE_EXECUTIVE_EXPORT.getSheetName());
     }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
index 7e793cd..a92e209 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
@@ -55,7 +55,7 @@
 
     @ApiOperation("设备收发列表导出")
     @PostMapping("/export")
-    public void exportList(@RequestBody @Valid SampleDispatchListRequest request) throws IOException {
+    public void exportList(@RequestBody SampleDispatchListRequest request) throws IOException {
         List<SampleDispatchListResponse> list;
         if (!CollectionUtils.isEmpty(request.getIds())) {
             list = dispatchService.listByIds(request.getIds());
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java
index cdc77fc..d120fd4 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java
@@ -7,6 +7,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.business.labExecutive.*;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.business.IBusinessLabExecutiveInfoService;
@@ -14,6 +15,7 @@
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.*;
 
@@ -32,7 +34,7 @@
     @Autowired
     private IBusinessLabExecutiveInfoService labExecutiveInfoService;
 
-    @ApiOperation("实验室检测-部门检测-查询各状态列表（待检测、检测中、检测完）")
+    @ApiOperation("实验室任务-查询各状态列表（待检测、检测中、检测完）")
     @PostMapping("/deptExecutive/List")
     public ReturnDTO<PageInfoBT<SampleLabExecutiveListResponse>> queryDeptExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
@@ -43,10 +45,19 @@
         return ReturnUtil.success(super.packForBT(labExecutiveInfoService.deptLabExecutiveListPage(page, labExecutiveListRequest)));
     }
 
-    /**
-     * 实验室检测-我的检测-查询各状态列表（待检测、检测中、检测完）
-     */
-    @ApiOperation("实验室检测-我的检测-查询各状态列表（待检测、检测中、检测完）")
+    @ApiOperation("实验室任务导出")
+    @PostMapping("/deptExecutive/export")
+    public void deptExportList(@RequestBody @Valid SampleLabExecutiveListRequest request) throws Exception {
+        List<SampleLabExecutiveListResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = labExecutiveInfoService.deptLabExecutiveListByIds(request.getMeasureStatus(), request.getIds());
+        } else {
+            list = labExecutiveInfoService.deptLabExecutiveList(request);
+        }
+        super.exportExcel(SampleLabExecutiveListResponse.class, list, ExportEnum.DEPT_EXECUTIVE_TASK.getSheetName());
+    }
+
+    @ApiOperation("我的任务-查询各状态列表（待检测、检测中、检测完）")
     @PostMapping("/myExecutive/list")
     public ReturnDTO<PageInfoBT<SampleLabExecutiveListResponse>> queryMyExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
@@ -57,19 +68,25 @@
         return ReturnUtil.success(super.packForBT(labExecutiveInfoService.myLabExecutiveListPage(page, labExecutiveListRequest)));
     }
 
-    /**
-     * 实验室检测-我的检测-查询各状态样品数量（待检测、检测中、检测完）
-     */
-    @ApiOperation("实验室检测-我的检测-查询各状态样品数量（待检测、检测中、检测完）")
+    @ApiOperation("我的任务导出")
+    @PostMapping("/myExecutive/export")
+    public void exportList(@RequestBody @Valid SampleLabExecutiveListRequest request) throws Exception {
+        List<SampleLabExecutiveListResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = labExecutiveInfoService.myLabExecutiveListByIds(request.getMeasureStatus(), request.getIds());
+        } else {
+            list = labExecutiveInfoService.myLabExecutiveList(request);
+        }
+        super.exportExcel(SampleLabExecutiveListResponse.class, list, ExportEnum.MY_EXECUTIVE_TASK.getSheetName());
+    }
+
+    @ApiOperation("我的任务-查询各状态样品数量（待检测、检测中、检测完）")
     @GetMapping("/myExecutive/amount")
     public ReturnDTO<List<SampleAmountResponse>> queryMyExecutiveAmount() {
         return ReturnUtil.success(labExecutiveInfoService.myExecutiveAmount());
     }
 
-    /**
-     * 实验室检测-部门检测-分配（分配给具体人员）
-     */
-    @ApiOperation("实验室检测-部门检测-分配按钮（分配给具体人员）")
+    @ApiOperation("实验室任务-分配按钮（分配给具体人员）")
     @PostMapping("/deptExecutive/allocate")
     public ReturnDTO allocateStaff(@RequestBody @Valid SampleAllocateRequest sampleAllocateRequest, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -78,10 +95,7 @@
         return labExecutiveInfoService.allocateStaff(sampleAllocateRequest);
     }
 
-    /**
-     * 实验室检测-我的检测-检定人扫描收入（待检测->检测中）
-     */
-    @ApiOperation("实验室检测-我的检测-检定人扫描收入（待检测->检测中）")
+    @ApiOperation("我的任务-检定人扫描收入（待检测->检测中）")
     @PostMapping("/myExecutive/receive")
     public ReturnDTO sampleReceive(@RequestBody @Valid List<SampleOperateRequest> requestList, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -90,10 +104,7 @@
         return labExecutiveInfoService.sampleReceive(requestList);
     }
 
-    /**
-     * 实验室检测-负责人/检定人扫描检完（检测中->检测完）
-     */
-    @ApiOperation("实验室检测-负责人/检定人扫描检完（检测中->检测完）")
+    @ApiOperation("实验室任务-负责人/检定人扫描检完（检测中->检测完）")
     @PostMapping("/myExecutive/complete")
     public ReturnDTO sampleExecutiveComplete(@RequestBody @Valid List<SampleOperateRequest> requestList, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -102,10 +113,7 @@
         return labExecutiveInfoService.sampleExecutiveComplete(requestList);
     }
 
-    /**
-     * 实验室检测-部门检测/我的检测 编辑（只能修改应出具证书）
-     */
-    @ApiOperation("实验室检测-部门检测/我的检测 编辑（只能修改应出具证书）")
+    @ApiOperation("实验室任务/我的任务 编辑（只能修改应出具证书）")
     @PostMapping("/executive/update")
     public ReturnDTO updateExecutive(@RequestBody @Valid UpdateExecutiveRequest request, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -114,10 +122,7 @@
         return labExecutiveInfoService.updateExecutive(request);
     }
 
-    /**
-     * 实验室检测-部门检测/我的检测 详情
-     */
-    @ApiOperation("实验室检测-部门检测/我的检测 详情")
+    @ApiOperation("实验室任务/我的任务 详情")
     @PostMapping("/executive/detail")
     public ReturnDTO<ExecutiveDetailResponse> executiveDetail(@RequestBody @Valid ExecutiveDetailRequest request, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
@@ -131,7 +136,7 @@
      * 退回后会将下一个要执行的实验室检测状态更新为待分配，将后面的实验室顺序变更为连续（都进行减1）
      * 最后一个检测的实验室退回，等分发员再增加实验室或设备收发中的已收入直接手动点击完成
      */
-    @ApiOperation("实验室检测-部门检测/我的检测 退回（待检测/检测中->退回）")
+    @ApiOperation("实验室任务/我的任务 退回（待检测/检测中->退回）")
     @PostMapping("/executive/sendBack")
     public ReturnDTO executiveSendBack(@RequestBody @Valid ExecutiveSendBackRequest request, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -140,9 +145,6 @@
         return labExecutiveInfoService.sampleExecutiveSendBack(request);
     }
 
-    /**
-     * 分发员编辑实验室检测列表
-     */
     @ApiOperation("分发员编辑实验室检测列表")
     @PostMapping("/handOut/updateList")
     public ReturnDTO updateExecutiveList(@RequestBody @Valid UpdateExecutiveListRequest request, BindingResult bindingResult) {
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java
index 48a67ed..0c04f31 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java
@@ -10,6 +10,7 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.resource.customer.CustomerApprovalListRequest;
 import com.casic.missiles.dto.resource.customer.CustomerSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceCustomerInfo;
@@ -26,6 +27,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -55,6 +57,13 @@
         return customerInfoService.saveCustomerInfo(request);
     }
 
+    @ApiOperation("委托方名录导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody CustomerApprovalListRequest request) throws Exception {
+        List<BizResourceCustomerInfo> list = super.exportList(request);
+        super.exportExcel(BizResourceCustomerInfo.class, list, ExportEnum.CUSTOMER_INFO.getSheetName());
+    }
+
     @ApiOperation("委托方人员列表（分页）")
     @PostMapping("/person/listPage")
     public ReturnDTO<PageInfoBT<BizResourceCustomerStaff>> personListPage(@RequestBody IdDTO idDto) {
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
index 972ed4b..6418ea5 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
@@ -5,6 +5,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.resource.customer.SuggestFormApprovalListRequest;
 import com.casic.missiles.dto.resource.customer.SuggestFormSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceCustomerSuggestForm;
@@ -20,6 +21,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -50,4 +52,11 @@
         return suggestFormService.saveSuggestForm(request);
     }
 
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody SuggestFormApprovalListRequest request) throws Exception {
+        List<BizResourceCustomerSuggestForm> list = super.exportList(request);
+        super.exportExcel(BizResourceCustomerSuggestForm.class, list, ExportEnum.CUSTOMER_SUGGEST_FORM.getSheetName());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java
index 1934d1a..9e07eab 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java
@@ -15,12 +15,16 @@
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.resource.IEnvEnvironmentRecordConfigService;
 import com.casic.missiles.service.resource.IEnvEnvironmentRecordDataService;
+import com.casic.missiles.service.resource.IEnvLocationInfoService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
 import java.util.List;
@@ -39,6 +43,8 @@
     private IEnvEnvironmentRecordDataService environmentRecordDataService;
     @Autowired
     private IEnvEnvironmentRecordConfigService environmentRecordConfigService;
+    @Autowired
+    private IEnvLocationInfoService locationInfoService;
 
     @ApiOperation("环境记录单数据列表/详情")
     @PostMapping("/data/listPage")
@@ -95,4 +101,11 @@
         });
         return environmentRecordConfigService.deleteEnvironmentRecordConfig(idDTO.getId());
     }
+
+    @ApiOperation("地点列表")
+    @PostMapping("/location/listPage")
+    public ReturnDTO<PageInfoBT<LocationListResponse>> locationListPage(@RequestBody @Valid LocationListRequest request) {
+        Page<LocationListResponse> page = PageFactory.defaultPage();
+        return ReturnUtil.success(super.packForBT(locationInfoService.listPage(page, request)));
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java
index 82efe3f..e9561fa 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java
@@ -10,6 +10,7 @@
 import com.casic.missiles.dto.resource.seal.SealLogListRequest;
 import com.casic.missiles.dto.resource.seal.SealNoteApprovalListRequest;
 import com.casic.missiles.dto.resource.seal.SealNoteSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceSealUseLog;
@@ -27,6 +28,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -58,6 +60,13 @@
         return sealUseNoteService.saveSeal(request);
     }
 
+    @ApiOperation("印章使用登记导出（列表和导出中去掉经办人和监印人）")
+    @PostMapping("/listExport")
+    public void export(@RequestBody SealNoteApprovalListRequest request) throws Exception {
+        List<BizResourceSealUseNote> list = super.exportList(request);
+        super.exportExcel(BizResourceSealUseNote.class, list, ExportEnum.SEAL_NOTE.getSheetName());
+    }
+
     // TODO: 2023/7/28 印章使用日志：系统中使用印章时插入数据库
 
     @ApiOperation("印章使用日志列表（分页）")
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java
index 9b674fc..06b6521 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java
@@ -9,16 +9,20 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.resource.staff.StaffCertRequest;
 import com.casic.missiles.dto.resource.staff.StaffCertResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.service.resource.IBizResourceStaffInfoService;
 import com.casic.missiles.service.resource.IBizResourceStaffVerifierService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.List;
+
 /**
  * @Description:
  * @Author: wangpeng
@@ -41,9 +45,21 @@
         return ReturnUtil.success(super.packForBT(responsePage));
     }
 
+    @ApiOperation("证书逾期提醒导出")
+    @PostMapping("/listExport")
+    public void exportList(@RequestBody StaffCertRequest request) throws Exception {
+        List<StaffCertResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = staffInfoService.certListByIds(request.getIds());
+        } else {
+            list = staffInfoService.certList(request);
+        }
+        super.exportExcel(StaffCertResponse.class, list, ExportEnum.STAFF_CERTIFICATE_EXPIRE.getSheetName());
+    }
+
     @ApiOperation("证书逾期提醒")
     @PostMapping("/expirationReminder")
-    public ReturnDTO expirationReminder(@RequestBody IdDTO idDto) {
-        return verifierService.expirationReminder(idDto);
+    public ReturnDTO expirationReminder(@RequestBody IdDTO idDTO) {
+        return verifierService.expirationReminder(idDTO);
     }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java
index 3b251ad..a6e7850 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java
@@ -12,6 +12,7 @@
 import com.casic.missiles.dto.resource.staff.StaffListRequest;
 import com.casic.missiles.dto.resource.staff.TrainListRequest;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.*;
@@ -22,7 +23,10 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
 import java.util.List;
@@ -52,8 +56,19 @@
             throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
         }
         Page<BizResourceStaffInfo> page = PageFactory.defaultPage();
-        Page<BizResourceStaffInfo> responsePage = staffInfoService.listPage(page, request);
-        return ReturnUtil.success(super.packForBT(responsePage));
+        return ReturnUtil.success(super.packForBT(staffInfoService.listPage(page, request)));
+    }
+
+    @ApiOperation("人员登记导出")
+    @PostMapping("/listExport")
+    public void exportList(@RequestBody StaffListRequest request) throws Exception {
+        List<BizResourceStaffInfo> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = staffInfoService.listByIds(request.getIds());
+        } else {
+            list = staffInfoService.list(request);
+        }
+        super.exportExcel(BizResourceStaffInfo.class, list, ExportEnum.STAFF_INFO.getSheetName());
     }
 
     @ApiOperation("人员登记详情基础信息")
@@ -85,9 +100,9 @@
 
     @ApiOperation("科研教育列表（分页）")
     @PostMapping("/education/listPage")
-    public ReturnDTO<PageInfoBT<BizResourceStaffEducation>> educationListPage(@RequestBody IdDTO idDto) {
+    public ReturnDTO<PageInfoBT<BizResourceStaffEducation>> educationListPage(@RequestBody IdDTO idDTO) {
         Page<BizResourceStaffEducation> page = PageFactory.defaultPage();
-        Page<BizResourceStaffEducation> responsePage = staffInfoService.educationListPage(page, idDto);
+        Page<BizResourceStaffEducation> responsePage = staffInfoService.educationListPage(page, idDTO);
         return ReturnUtil.success(super.packForBT(responsePage));
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java
index af6aa86..d85d84a 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java
@@ -9,6 +9,7 @@
 import com.casic.missiles.dto.resource.outsideService.SupplierApprovalListRequest;
 import com.casic.missiles.dto.resource.outsideService.SupplierSaveResponse;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceSupplierAbility;
@@ -67,6 +68,13 @@
         return ReturnUtil.success(supplierInfoService.detail(idDTO.getId()));
     }
 
+    @ApiOperation("合格供方导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody SupplierApprovalListRequest request) throws Exception {
+        List<BizResourceSupplierInfo> list = super.exportList(request);
+        super.exportExcel(BizResourceSupplierInfo.class, list, ExportEnum.SUPPLIER_INFO.getSheetName());
+    }
+
     @ApiOperation("供方人员列表（分页）")
     @PostMapping("/person/listPage")
     public ReturnDTO<PageInfoBT<BizResourceSupplierPerson>> personListPage(@RequestBody IdDTO idDTO) {
diff --git a/casic-metering-api/src/main/resources/config/application.yml b/casic-metering-api/src/main/resources/config/application.yml
index 350db5f..ecff521 100644
--- a/casic-metering-api/src/main/resources/config/application.yml
+++ b/casic-metering-api/src/main/resources/config/application.yml
@@ -126,7 +126,7 @@
     #作者
     author: wangpeng
     #待生成对象表名
-    table-name: biz_equipment_technical_target_approval,biz_equipment_attachment_approval,biz_equipment_checkpoint_approval
+    table-name: biz_business_outsource_protocol
 
 reminder:
   #节点--common模块config包 ReminderNodeConfig配置
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
index 4a19e4e..d47d552 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
@@ -53,6 +53,7 @@
     SUGGEST_FORM_SAVE_FAILED(2509, "委托方意见登记表保存至草稿箱失败"),
     EXAMINE_FORM_SAVE_FAILED(2510, "要求、委托书及合同评审表保存至草稿箱失败"),
     CUSTOMER_EXIST_SAVE_FAILED(2511, "该委托方已存在，请重新选择"),
+    DUPLICATE_LOCATION_NO(2512, "地点编号已存在"),
 
     /**
      * 计量检定业务模块
@@ -68,6 +69,8 @@
     COMPLETE_SAMPLE_NOT_EXIST(2609, "检测中不存在扫描收入的样品"),
     CANNOT_CHANGE_MEASURE_INFO(2610, "无法更改非当前登录用户的检测信息"),
     NON_EXIST_ORDER_OR_SAMPLE(2611, "不存在该委托单或该委托单下的样品"),
+    OUTSOURCE_ACCESS_SAVE_FAILED(2612, "测试、校准或检定工作分包评审表保存至草稿箱失败"),
+    OUTSOURCE_PROTOCOL_SAVE_FAILED(2613, "测试、校准或检定工作分包协议书保存至草稿箱失败"),
 
     /**
      * 历史遗留备用
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
index 5089ad1..81a406b 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
@@ -10,54 +10,38 @@
     /**
      * 资源管理
      */
-    ENVIRONMENT_DATA_EXPORT("environmentData", "environmentData", "环境记录单数据"),
+    ENVIRONMENT_DATA_EXPORT("environmentData", "环境记录单数据", "环境记录单数据"),
+    STAFF_INFO("staffInfo", "人员登记", "人员登记"),
+    STAFF_CERTIFICATE_EXPIRE("certificateExpire", "证书逾期提醒", "证书逾期提醒"),
+    SUPPLIER_INFO("supplierInfo", "合格供方名录", "合格供方名录"),
+    CUSTOMER_INFO("customerInfo", "委托方名录", "委托方名录"),
+    CUSTOMER_SUGGEST_FORM("customerSuggestForm", "委托方意见登记表", "委托方意见登记表"),
+    SEAL_NOTE("sealNote", "印章使用登记", "印章使用登记"),
 
-    FILE_EXPORT("meterFileData", "meterFileData", "计量文件信息"),
-    TRAIN_PLAN_EXPORT("trainPlanData", "trainPlanData", "培训计划"),
-    TRAIN_LOG_EXPORT("trainLogData", "trainLogData", "培训记录"),
-    METER_ORGANIZE_EXPORT("meterOrganizeData", "meterOrganizeData", "计量组织"),
-    TRACE_SUPPLIER_EXPORT("traceSupplierData", "traceSupplierData", "溯源供方"),
-    SIGN_EXPORT("signData", "signData", "签名/签章"),
-    TEMPLATE_EXPORT("templateData", "templateData", "原始记录模板/证书报告模板"),
-    FIXED_ASSETS("meterFixedAssets", "meterFixedAssets", "固定资产"),
-    METER_EQUIPMENT("meterEquipment", "meterEquipment", "测量设备"),
-    CALIBRATION_TEST_EQUIPMENT("calibrationTestEquipment", "calibrationTestEquipment", "校准检定设备"),
-    MEASURE_ACCOUNT("measureAccount", "measureAccount", "测量工装"),
-    STANDARD_SUPPORT_EQUIPMENT("standardSupportEquipment", "standardSupportEquipment", "标准配套设备"),
-    STANDARD_EQUIPMENT("standardEquipment", "standardEquipment", "标准装置"),
-    FLOW_DEF_EXPORT("flowDefData", "flowDefData", "流程定义"),
-    STAFF_CERTIFICATE("certificate", "certificate", "计量人员证书"),
-    CHECK_INFO("checkInfo", "checkInfo", "设备管理点检测"),
-    EQUIPMENT_APPLY("equipmentApply", "equipmentApply", "设备借用"),
-    STANDARD_EQUIPMENT_REMIND("equipmentApplyRemind", "equipmentApplyRemind", "标准装置到期提醒"),
-    METER_PRICE("meterPrice", "meterPrice", "价格库"),
-    METER_STAFF("meterStaff", "meterStaff", "计量人员"),
-    STANDARD_EQUIPMENT_APPLY("standardEquipmentApply", "standardEquipmentApply", "标准装置申请"),
-    STATE_MANAGE_APPLY("stateManage", "stateManage", "状态管理"),
-    METER_ACCEPTANCE_CHECK("acceptanceCheck", "acceptanceCheck", "设备检修保养验收单"),
-    CUSTOMER_EXPORT("customerData", "customerData", "客户信息"),
-    ORDER_EXPORT("orderData", "orderData", "委托书信息"),
-    SAMPLE_EXPORT("sampleData", "sampleData", "样本信息"),
-    EXCHANGE_DATA("exchangeData", "exchangeData", "设备交接单"),
-    DISPATCH_DATA("dispatchData", "dispatchData", "设备收发"),
-    ENVIRONMENT_DATA("environmentData", "environmentData", "环境记录单"),
-    ORIGIN_DATA("originData", "originData", "原始记录"),
-    CERTIFICATE_REPORT("certificateReport", "certificateReport", "证书报告"),
-    ADVICE_EXPORT("adviceData", "adviceData", "客户反馈"),
-    HANDOUT_EXPORT("handoutData", "handoutData", "任务分发列表"),
-    OUTSOURCER_EXPORT("outsourcerData", "outsourcerData", "分包方"),
-    SITE_EXECUTIVE_EXPORT("siteExecutiveData", "siteExecutiveData", "现场测试、校准或检定"),
-    CERTIFICATE_PRINT_EXPORT("certificatePrintData", "certificatePrintData", "证书打印"),
-    DOWNLOAD_TEMPLATE("downloadTemplate", "downloadTemplate", "页面配置"),
-    OUTSOURCER_CERTIFICATE_EXPORT("outsourceCertificateData", "outsourceCertificateData", "分包证书"),
-    SETTLEMENT_INFO_EXPORT("settlementInfoData", "settlementInfoData", "业务结算"),
-    EQUIPMENT_REMIND("equipmentRemind", "equipmentRemind", "设备到期提醒"),
-    AGREEMENT_INFO_EXPORT("agreementInfoData", "agreementInfoData", "合同"),
-    WORK_STATISTICS_EXPORT("workStatisticsData", "workStatisticsData", "实时工作统计"),
-    DEPT_OUTPUT_EXPORT("deptOutputData", "deptOutputData", "部门产值分析"),
-    WORKLOAD_EXPORT("workloadData", "workloadData", "业务工作量分析"),
-    DEPT_COMPREHENSIVE_EXPORT("deptComprehensiveData", "deptComprehensiveData", "部门综合分析"),
-    ENVIRONMENTAL_RECORD("environmentalRecordData", "environmentalRecordData", "现场环境记录");
+    /**
+     * 计量检定业务
+     */
+    OUTSOURCER_EXPORT("outsourcerData", "分包方名录", "分包方名录"),
+    IDENTIFY_EXPORT("identifyData", "计量标识", "计量标识"),
+    ORDER_EXPORT("orderData", "任务单", "任务单"),
+    DISPATCH_DATA("dispatchData", "设备收发", "设备收发"),
+    HANDOUT_EXPORT("handoutData", "任务分发", "任务分发"),
+    SITE_EXECUTIVE_EXPORT("siteExecutiveData", "现场测试、校准或检定", "现场测试、校准或检定"),
+    CERTIFICATE_REPORT("certificateReport", "证书审批", "证书审批"),
+    CERTIFICATE_CHANGE_APPLY("certificateChangeApply", "证书报告补充或更换申请单", "证书报告补充或更换申请单"),
+    CERTIFICATE_PRINT("certificatePrintData", "证书打印审批", "证书打印审批"),
+    DEPT_EXECUTIVE_TASK("deptExecutiveTaskData", "实验室任务", "实验室任务"),
+    MY_EXECUTIVE_TASK("myExecutiveTaskData", "我的任务", "我的任务"),
+    OUTSOURCE_ASSESS("outsourceAssess", "测试、校准或检定工作分包评审表", "测试、校准或检定工作分包评审表"),
+    OUTSOURCE_PROTOCOL("outsourceProtocol", "测试、校准或检定工作分包协议书", "测试、校准或检定工作分包协议书"),
+
+    /**
+     * 系统管理
+     */
+    SIGN_EXPORT("signData", "签名", "签名"),
+    TEMPLATE_EXPORT("templateData", "文件模板", "文件模板"),
+    FLOW_DEF_EXPORT("flowDefData", "流程定义", "流程定义"),
+    DOWNLOAD_TEMPLATE("downloadTemplate", "流程定义", "页面配置");
 
     ExportEnum(String fileName, String sheetName, String description) {
         this.fileName = fileName;
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateRecordTypeCodeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateRecordTypeCodeEnum.java
index 31d913c..a963522 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateRecordTypeCodeEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateRecordTypeCodeEnum.java
@@ -46,4 +46,14 @@
     String SITE_EXECUTIVE_APPROVAL = "01";
     //《现场测试、校准或检定工作记录表》
     String SITE_EXECUTIVE_LOG = "02";
+
+    //测试、校准或检定工作分包协议书
+    String OUTSOURCE_PROTOCOL = "01";
+    //测试、校准或检定工作分包评审表
+    String OUTSOURCE_ACCESS = "02";
+    //测试、校准或检定工作分包通知书
+    String OUTSOURCE_NOTICE = "03";
+    //测试、校准或检定工作分包方名录
+    String OUTSOURCE_INFO = "04";
+
 }
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
index 24b8635..f78bd53 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
@@ -15,6 +15,10 @@
     String CERTIFICATE_CHANGE_APPLY_BEAN_NAME = "certificateChangeApplyBean";
     //现场测试、校准或检定
     String SITE_EXECUTIVE_BEAN_NAME = "siteExecutiveBean";
+    //测试、校准或检定工作分包评审表
+    String OUTSOURCE_ASSESS_BEAN_NAME = "outsourceAssessBean";
+    //测试、校准或检定工作分包协议书
+    String OUTSOURCE_PROTOCOL_BEAN_NAME = "outsourceProtocolBean";
 
     /*********************************设备与装置************************************/
     //设备台账
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 b21c661..6b86fd1 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
@@ -18,6 +18,8 @@
     OUTSOURCER_APPROVAL(OUTSOURCER_BEAN_NAME, ""),
     CERTIFICATE_CHANGE_APPROVAL(CERTIFICATE_CHANGE_APPLY_BEAN_NAME, ""),
     SITE_EXECUTIVE_APPROVAL(SITE_EXECUTIVE_BEAN_NAME, ""),
+    OUTSOURCE_ASSESS_APPROVAL(OUTSOURCE_ASSESS_BEAN_NAME, ""),
+    OUTSOURCE_PROTOCOL_APPROVAL(OUTSOURCE_PROTOCOL_BEAN_NAME, ""),
 
     ACTION_STATUS_MAP(new HashMap<String, AwareActionStatusEnum>() {
         {
@@ -47,6 +49,10 @@
             put(ApplyFromIdEnum.CERTIFICATE_CHANGE_APPROVAL.getCode(), CERTIFICATE_CHANGE_APPROVAL);
             //现场测试、校准或检定审批
             put(ApplyFromIdEnum.SITE_EXECUTIVE_APPROVAL.getCode(), SITE_EXECUTIVE_APPROVAL);
+            //测试、校准或检定工作分包评审表
+            put(ApplyFromIdEnum.OUTSOURCE_ASSESS_APPROVAL.getCode(), OUTSOURCE_ASSESS_APPROVAL);
+            //测试、校准或检定工作分包协议书
+            put(ApplyFromIdEnum.OUTSOURCE_PROTOCOL_APPROVAL.getCode(), OUTSOURCE_PROTOCOL_APPROVAL);
         }
     });
     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 934405e..c7410bd 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
@@ -9,6 +9,8 @@
     CERTIFICATE_CHANGE_APPROVAL("jljdywzsbchghsqd", MessageSourceModuleEnum.BUSINESS.getCode(), "证书/报告补充或更换申请单"),
     OUTSOURCER_APPROVAL("jljdywcsjzhgfbfml", MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定合格分包方名录"),
     SITE_EXECUTIVE_APPROVAL("jljdywxccsjzsp", MessageSourceModuleEnum.BUSINESS.getCode(), "现场测试、校准或检定审批"),
+    OUTSOURCE_ASSESS_APPROVAL("jljdywcsjzfbpsb", MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包评审表"),
+    OUTSOURCE_PROTOCOL_APPROVAL("jljdywcsjzfbxys", MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包协议书"),
 
 
     /*******************************************设备与装置*********************************************/

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java
index bb0c50f..13a699b 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java
@@ -12,6 +12,7 @@
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.IGeneralApprovalService;
+import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
@@ -19,6 +20,7 @@
 import org.springframework.web.bind.annotation.RequestBody;
 
 import javax.validation.Valid;
+import java.util.List;
 import java.util.Objects;
 
 /**
@@ -117,4 +119,17 @@
         }
         return baseApprovalService.failUpdate(request);
     }
+
+    public List<O> exportList(@RequestBody @Valid R request) throws Exception {
+        List<O> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = baseApprovalService.listExportByIds(request.getIds());
+        } else {
+            list = baseApprovalService.listExport(request);
+        }
+        for (O record : list) {
+            DictCodeUtils.convertDictCodeToName(record);
+        }
+        return list;
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java
index 8a90961..d775831 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java
@@ -5,6 +5,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.business.certificate.CertificateChangeApplyApprovalListRequest;
 import com.casic.missiles.dto.business.certificate.CertificateChangeApplySaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessCertificateChangeApply;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
@@ -20,6 +21,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -48,4 +50,12 @@
         }
         return changeApplyService.saveChangeApply(request);
     }
+
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody CertificateChangeApplyApprovalListRequest request) throws Exception {
+        List<BizBusinessCertificateChangeApply> list = super.exportList(request);
+        super.exportExcel(BizBusinessCertificateChangeApply.class, list, ExportEnum.CERTIFICATE_CHANGE_APPLY.getSheetName());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java
index 5fc4b07..af8230e 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java
@@ -9,6 +9,7 @@
 import com.casic.missiles.dto.business.certificate.CertificatePrintApprovalListRequest;
 import com.casic.missiles.dto.business.certificate.CertificatePrintListResponse;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.enums.business.CertificatePrintStatusEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessCertificatePrintLog;
@@ -18,10 +19,16 @@
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.io.IOException;
+import java.util.List;
 import java.util.Objects;
 
 /**
@@ -98,4 +105,16 @@
         });
         return certificatePrintService.certificatePrintLog(idDTO.getId());
     }
+
+    @ApiOperation("证书打印审批导出")
+    @PostMapping("/listExport")
+    public void exportList(@RequestBody CertificatePrintApprovalListRequest request) throws IOException {
+        List<CertificatePrintListResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = certificatePrintService.listByIds(request.getIds());
+        } else {
+            list = certificatePrintService.list(request);
+        }
+        super.exportExcel(CertificatePrintListResponse.class, list, ExportEnum.CERTIFICATE_PRINT.getSheetName());
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java
index 63b06dc..6b2efd5 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java
@@ -6,6 +6,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.business.certificate.CertificateReportApprovalListRequest;
 import com.casic.missiles.dto.business.certificate.CertificateReportSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessCertificateReport;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
@@ -21,6 +22,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -50,7 +52,7 @@
         return certificateReportService.saveCertificateReport(request);
     }
 
-    @ApiOperation("证书审批详情（基本信息）")
+    @ApiOperation("详情（基本信息）")
     @PostMapping("/detail")
     public ReturnDTO<BizBusinessCertificateReport> detail(@RequestBody @Valid BaseDetailRequest request, BindingResult bindingResult) throws Exception {
         if(bindingResult.hasErrors()){
@@ -59,4 +61,11 @@
         return certificateReportService.detail(request);
     }
 
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody CertificateReportApprovalListRequest request) throws Exception {
+        List<BizBusinessCertificateReport> list = super.exportList(request);
+        super.exportExcel(BizBusinessCertificateReport.class, list, ExportEnum.CERTIFICATE_REPORT.getSheetName());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java
index 46b26bd..57c0809 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java
@@ -10,20 +10,21 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.business.identify.IdentifyListRequest;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessIdentifyInfo;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.business.IBizBusinessIdentifyInfoService;
+import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import javax.validation.Valid;
+import java.util.List;
 import java.util.Objects;
 
 /**
@@ -57,16 +58,13 @@
         return identifyInfoService.addIdentify(identifyInfo);
     }
 
-    @ApiOperation("标识打印更新")
+    @ApiOperation("标识打印更新（更新打印时间）")
     @PostMapping("/update")
-    public ReturnDTO updateIdentify(@RequestBody @Valid BizBusinessIdentifyInfo identifyInfo, BindingResult bindingResult) {
-        Assert.isFalse(Objects.isNull(identifyInfo.getId()), () -> {
+    public ReturnDTO updateIdentify(@RequestBody @Valid IdDTO idDTO) {
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        Assert.isFalse(bindingResult.hasErrors(), () -> {
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        });
-        return identifyInfoService.updateIdentify(identifyInfo);
+        return identifyInfoService.updateIdentify(idDTO.getId());
     }
 
     @ApiOperation("标识打印删除")
@@ -77,4 +75,37 @@
         });
         return identifyInfoService.deleteIdentify(idDTO.getId());
     }
+
+    @ApiOperation("标识打印导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody @Valid IdentifyListRequest request, BindingResult bindingResult) throws Exception {
+        if (bindingResult.hasErrors()) {
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        List<BizBusinessIdentifyInfo> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = identifyInfoService.listByIds(request.getIds());
+        } else {
+            list = identifyInfoService.list(request);
+        }
+        for (BizBusinessIdentifyInfo record : list) {
+            DictCodeUtils.convertDictCodeToName(record);
+        }
+        super.exportExcel(BizBusinessIdentifyInfo.class, list, ExportEnum.IDENTIFY_EXPORT.getSheetName());
+    }
+
+
+    // TODO: 2023/8/23 查询设备信息，4个底部按钮查设备（按钮的作用就是前端用来调不同接口、用来区分中间即将展示的标识），前端弹窗选设备，在确定保存时前端根据底部按钮判断传入设备类型deviceType字典code
+    // TODO: 2023/8/23 接口：查受检设备（第1个按钮），查设备台账（后3个按钮同一接口），查询之后前端根据标志类型的不同加到中间页面时进行判断（按产品给的对应表）
+    // TODO: 2023/8/23 提供二维码接口，前端在加到中间页面时调用一下
+
+    @ApiOperation("设备二维码")
+    @PostMapping("/equipment/qrCode")
+    public ReturnDTO<String> equipmentQrCode(@RequestBody @Valid IdDTO idDTO) {
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return identifyInfoService.equipmentQrCode(idDTO.getId());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java
index 707be6e..7e0453d 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java
@@ -117,7 +117,7 @@
     }
 
     @ApiOperation("任务单导出")
-    @PostMapping("/export")
+    @PostMapping("/listExport")
     public void orderExport(@RequestBody @Valid OrderListRequest request, HttpServletResponse response) {
         businessOrderService.orderExport(request, response);
     }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java
index 529a6ce..51432be 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java
@@ -1,9 +1,28 @@
 package com.casic.missiles.controller.business;
 
+import com.casic.missiles.controller.GeneralApprovalController;
+import com.casic.missiles.dto.BaseApprovalSubmitRequest;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.business.outsource.OutsourceAssessApprovalListRequest;
+import com.casic.missiles.dto.business.outsource.OutsourceAssessSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
+import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.model.business.BizBusinessOutsourceAssess;
+import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
+import com.casic.missiles.service.IGeneralApprovalService;
+import com.casic.missiles.service.business.IBizBusinessOutsourceAssessService;
 import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.BindingResult;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.validation.Valid;
+import java.util.List;
+
 /**
  * <p>
  * 计量检定业务-分包管理-测试、校准或检定工作分包评审表 前端控制器
@@ -15,6 +34,27 @@
 @Api(tags = "分包管理-测试、校准或检定工作分包评审表")
 @RestController
 @RequestMapping("/business/outsource/assess")
-public class BizBusinessOutsourceAssessController {
+public class BizBusinessOutsourceAssessController extends GeneralApprovalController<BizBusinessOutsourceAssess, BizBusinessOutsourceAssess, OutsourceAssessApprovalListRequest, BaseApprovalSubmitRequest> {
+    @Autowired
+    private IBizBusinessOutsourceAssessService outsourceAssessService;
 
+    public BizBusinessOutsourceAssessController(IGeneralApprovalService<BizBusinessOutsourceAssess, BizBusinessOutsourceAssess, OutsourceAssessApprovalListRequest, BaseApprovalSubmitRequest> baseApprovalService) {
+        super(baseApprovalService);
+    }
+
+    @ApiOperation("草稿箱-保存")
+    @PostMapping("/save")
+    public ReturnDTO<OutsourceAssessSaveResponse> saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceAssess request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        return outsourceAssessService.saveOutsourceAssess(request);
+    }
+
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception {
+        List<BizBusinessOutsourceAssess> list = super.exportList(request);
+        super.exportExcel(BizBusinessOutsourceAssess.class, list, ExportEnum.OUTSOURCE_ASSESS.getSheetName());
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java
new file mode 100644
index 0000000..9adef18
--- /dev/null
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java
@@ -0,0 +1,60 @@
+package com.casic.missiles.controller.business;
+
+import com.casic.missiles.controller.GeneralApprovalController;
+import com.casic.missiles.dto.BaseApprovalSubmitRequest;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.business.outsource.OutsourceProtocolApprovalListRequest;
+import com.casic.missiles.dto.business.outsource.OutsourceProtocolSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
+import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.model.business.BizBusinessOutsourceProtocol;
+import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
+import com.casic.missiles.service.IGeneralApprovalService;
+import com.casic.missiles.service.business.IBizBusinessOutsourceProtocolService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.BindingResult;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.validation.Valid;
+import java.util.List;
+
+/**
+ * <p>
+ * 计量检定业务-分包管理-测试、校准或检定工作分包协议书 前端控制器
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-08-24
+ */
+@Api(tags = "分包管理-测试、校准或检定工作分包协议书")
+@RestController
+@RequestMapping("/business/outsource/protocol")
+public class BizBusinessOutsourceProtocolController extends GeneralApprovalController<BizBusinessOutsourceProtocol, BizBusinessOutsourceProtocol, OutsourceProtocolApprovalListRequest, BaseApprovalSubmitRequest> {
+    @Autowired
+    private IBizBusinessOutsourceProtocolService outsourceProtocolService;
+
+    public BizBusinessOutsourceProtocolController(IGeneralApprovalService<BizBusinessOutsourceProtocol, BizBusinessOutsourceProtocol, OutsourceProtocolApprovalListRequest, BaseApprovalSubmitRequest> baseApprovalService) {
+        super(baseApprovalService);
+    }
+
+    @ApiOperation("草稿箱-保存")
+    @PostMapping("/save")
+    public ReturnDTO<OutsourceProtocolSaveResponse> saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceProtocol request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        return outsourceProtocolService.saveOutsourceProtocol(request);
+    }
+
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody OutsourceProtocolApprovalListRequest request) throws Exception {
+        List<BizBusinessOutsourceProtocol> list = super.exportList(request);
+        super.exportExcel(BizBusinessOutsourceProtocol.class, list, ExportEnum.OUTSOURCE_PROTOCOL.getSheetName());
+    }
+}
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java
index 097f645..f0f0943 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java
@@ -17,7 +17,6 @@
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.IGeneralApprovalService;
 import com.casic.missiles.service.business.IBizBusinessOutsourcerInfoService;
-import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -71,19 +70,8 @@
 
     @ApiOperation("分包方导出")
     @PostMapping("/listExport")
-    public void export(@RequestBody @Valid OutsourcerInfoApprovalListRequest request, BindingResult bindingResult) throws Exception {
-        if (bindingResult.hasErrors()) {
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        }
-        List<BizBusinessOutsourcerInfo> list;
-        if (!CollectionUtils.isEmpty(request.getIds())) {
-            list = outsourcerInfoService.listByIds(request.getIds());
-        } else {
-            list = outsourcerInfoService.list(request);
-        }
-        for (BizBusinessOutsourcerInfo record : list) {
-            DictCodeUtils.convertDictCodeToName(record);
-        }
+    public void export(@RequestBody OutsourcerInfoApprovalListRequest request) throws Exception {
+        List<BizBusinessOutsourcerInfo> list = super.exportList(request);
         super.exportExcel(BizBusinessOutsourcerInfo.class, list, ExportEnum.OUTSOURCER_EXPORT.getSheetName());
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java
index c2cbf9f..0410918 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java
@@ -17,11 +17,9 @@
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.IGeneralApprovalService;
 import com.casic.missiles.service.business.IBizBusinessSiteExecutiveInfoService;
-import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -60,7 +58,7 @@
         return siteExecutiveInfoService.saveSiteExecutiveInfo(siteExecutiveInfo);
     }
 
-    @ApiOperation("现场检测详情")
+    @ApiOperation("详情")
     @PostMapping("/detail")
     public ReturnDTO<SiteExecutiveDetailResponse> siteExecutiveDetail(@RequestBody @Valid IdDTO idDTO) throws Exception {
         Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
@@ -69,21 +67,10 @@
         return ReturnUtil.success(siteExecutiveInfoService.detail(idDTO.getId()));
     }
 
-    @ApiOperation("现场检测导出")
+    @ApiOperation("导出")
     @PostMapping("/listExport")
-    public void export(@RequestBody @Valid SiteExecutiveApprovalListRequest request, BindingResult bindingResult) throws Exception {
-        if (bindingResult.hasErrors()) {
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        }
-        List<SiteExecutiveApprovalListResponse> list;
-        if (!CollectionUtils.isEmpty(request.getIds())) {
-            list = siteExecutiveInfoService.listInfoByIds(request.getIds());
-        } else {
-            list = siteExecutiveInfoService.listInfo(request);
-        }
-        for (SiteExecutiveApprovalListResponse record : list) {
-            DictCodeUtils.convertDictCodeToName(record);
-        }
+    public void export(@RequestBody SiteExecutiveApprovalListRequest request) throws Exception {
+        List<SiteExecutiveApprovalListResponse> list = super.exportList(request);
         super.exportExcel(SiteExecutiveApprovalListResponse.class, list, ExportEnum.SITE_EXECUTIVE_EXPORT.getSheetName());
     }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
index 7e793cd..a92e209 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
@@ -55,7 +55,7 @@
 
     @ApiOperation("设备收发列表导出")
     @PostMapping("/export")
-    public void exportList(@RequestBody @Valid SampleDispatchListRequest request) throws IOException {
+    public void exportList(@RequestBody SampleDispatchListRequest request) throws IOException {
         List<SampleDispatchListResponse> list;
         if (!CollectionUtils.isEmpty(request.getIds())) {
             list = dispatchService.listByIds(request.getIds());
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java
index cdc77fc..d120fd4 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java
@@ -7,6 +7,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.business.labExecutive.*;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.business.IBusinessLabExecutiveInfoService;
@@ -14,6 +15,7 @@
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.*;
 
@@ -32,7 +34,7 @@
     @Autowired
     private IBusinessLabExecutiveInfoService labExecutiveInfoService;
 
-    @ApiOperation("实验室检测-部门检测-查询各状态列表（待检测、检测中、检测完）")
+    @ApiOperation("实验室任务-查询各状态列表（待检测、检测中、检测完）")
     @PostMapping("/deptExecutive/List")
     public ReturnDTO<PageInfoBT<SampleLabExecutiveListResponse>> queryDeptExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
@@ -43,10 +45,19 @@
         return ReturnUtil.success(super.packForBT(labExecutiveInfoService.deptLabExecutiveListPage(page, labExecutiveListRequest)));
     }
 
-    /**
-     * 实验室检测-我的检测-查询各状态列表（待检测、检测中、检测完）
-     */
-    @ApiOperation("实验室检测-我的检测-查询各状态列表（待检测、检测中、检测完）")
+    @ApiOperation("实验室任务导出")
+    @PostMapping("/deptExecutive/export")
+    public void deptExportList(@RequestBody @Valid SampleLabExecutiveListRequest request) throws Exception {
+        List<SampleLabExecutiveListResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = labExecutiveInfoService.deptLabExecutiveListByIds(request.getMeasureStatus(), request.getIds());
+        } else {
+            list = labExecutiveInfoService.deptLabExecutiveList(request);
+        }
+        super.exportExcel(SampleLabExecutiveListResponse.class, list, ExportEnum.DEPT_EXECUTIVE_TASK.getSheetName());
+    }
+
+    @ApiOperation("我的任务-查询各状态列表（待检测、检测中、检测完）")
     @PostMapping("/myExecutive/list")
     public ReturnDTO<PageInfoBT<SampleLabExecutiveListResponse>> queryMyExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
@@ -57,19 +68,25 @@
         return ReturnUtil.success(super.packForBT(labExecutiveInfoService.myLabExecutiveListPage(page, labExecutiveListRequest)));
     }
 
-    /**
-     * 实验室检测-我的检测-查询各状态样品数量（待检测、检测中、检测完）
-     */
-    @ApiOperation("实验室检测-我的检测-查询各状态样品数量（待检测、检测中、检测完）")
+    @ApiOperation("我的任务导出")
+    @PostMapping("/myExecutive/export")
+    public void exportList(@RequestBody @Valid SampleLabExecutiveListRequest request) throws Exception {
+        List<SampleLabExecutiveListResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = labExecutiveInfoService.myLabExecutiveListByIds(request.getMeasureStatus(), request.getIds());
+        } else {
+            list = labExecutiveInfoService.myLabExecutiveList(request);
+        }
+        super.exportExcel(SampleLabExecutiveListResponse.class, list, ExportEnum.MY_EXECUTIVE_TASK.getSheetName());
+    }
+
+    @ApiOperation("我的任务-查询各状态样品数量（待检测、检测中、检测完）")
     @GetMapping("/myExecutive/amount")
     public ReturnDTO<List<SampleAmountResponse>> queryMyExecutiveAmount() {
         return ReturnUtil.success(labExecutiveInfoService.myExecutiveAmount());
     }
 
-    /**
-     * 实验室检测-部门检测-分配（分配给具体人员）
-     */
-    @ApiOperation("实验室检测-部门检测-分配按钮（分配给具体人员）")
+    @ApiOperation("实验室任务-分配按钮（分配给具体人员）")
     @PostMapping("/deptExecutive/allocate")
     public ReturnDTO allocateStaff(@RequestBody @Valid SampleAllocateRequest sampleAllocateRequest, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -78,10 +95,7 @@
         return labExecutiveInfoService.allocateStaff(sampleAllocateRequest);
     }
 
-    /**
-     * 实验室检测-我的检测-检定人扫描收入（待检测->检测中）
-     */
-    @ApiOperation("实验室检测-我的检测-检定人扫描收入（待检测->检测中）")
+    @ApiOperation("我的任务-检定人扫描收入（待检测->检测中）")
     @PostMapping("/myExecutive/receive")
     public ReturnDTO sampleReceive(@RequestBody @Valid List<SampleOperateRequest> requestList, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -90,10 +104,7 @@
         return labExecutiveInfoService.sampleReceive(requestList);
     }
 
-    /**
-     * 实验室检测-负责人/检定人扫描检完（检测中->检测完）
-     */
-    @ApiOperation("实验室检测-负责人/检定人扫描检完（检测中->检测完）")
+    @ApiOperation("实验室任务-负责人/检定人扫描检完（检测中->检测完）")
     @PostMapping("/myExecutive/complete")
     public ReturnDTO sampleExecutiveComplete(@RequestBody @Valid List<SampleOperateRequest> requestList, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -102,10 +113,7 @@
         return labExecutiveInfoService.sampleExecutiveComplete(requestList);
     }
 
-    /**
-     * 实验室检测-部门检测/我的检测 编辑（只能修改应出具证书）
-     */
-    @ApiOperation("实验室检测-部门检测/我的检测 编辑（只能修改应出具证书）")
+    @ApiOperation("实验室任务/我的任务 编辑（只能修改应出具证书）")
     @PostMapping("/executive/update")
     public ReturnDTO updateExecutive(@RequestBody @Valid UpdateExecutiveRequest request, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -114,10 +122,7 @@
         return labExecutiveInfoService.updateExecutive(request);
     }
 
-    /**
-     * 实验室检测-部门检测/我的检测 详情
-     */
-    @ApiOperation("实验室检测-部门检测/我的检测 详情")
+    @ApiOperation("实验室任务/我的任务 详情")
     @PostMapping("/executive/detail")
     public ReturnDTO<ExecutiveDetailResponse> executiveDetail(@RequestBody @Valid ExecutiveDetailRequest request, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
@@ -131,7 +136,7 @@
      * 退回后会将下一个要执行的实验室检测状态更新为待分配，将后面的实验室顺序变更为连续（都进行减1）
      * 最后一个检测的实验室退回，等分发员再增加实验室或设备收发中的已收入直接手动点击完成
      */
-    @ApiOperation("实验室检测-部门检测/我的检测 退回（待检测/检测中->退回）")
+    @ApiOperation("实验室任务/我的任务 退回（待检测/检测中->退回）")
     @PostMapping("/executive/sendBack")
     public ReturnDTO executiveSendBack(@RequestBody @Valid ExecutiveSendBackRequest request, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -140,9 +145,6 @@
         return labExecutiveInfoService.sampleExecutiveSendBack(request);
     }
 
-    /**
-     * 分发员编辑实验室检测列表
-     */
     @ApiOperation("分发员编辑实验室检测列表")
     @PostMapping("/handOut/updateList")
     public ReturnDTO updateExecutiveList(@RequestBody @Valid UpdateExecutiveListRequest request, BindingResult bindingResult) {
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java
index 48a67ed..0c04f31 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java
@@ -10,6 +10,7 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.resource.customer.CustomerApprovalListRequest;
 import com.casic.missiles.dto.resource.customer.CustomerSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceCustomerInfo;
@@ -26,6 +27,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -55,6 +57,13 @@
         return customerInfoService.saveCustomerInfo(request);
     }
 
+    @ApiOperation("委托方名录导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody CustomerApprovalListRequest request) throws Exception {
+        List<BizResourceCustomerInfo> list = super.exportList(request);
+        super.exportExcel(BizResourceCustomerInfo.class, list, ExportEnum.CUSTOMER_INFO.getSheetName());
+    }
+
     @ApiOperation("委托方人员列表（分页）")
     @PostMapping("/person/listPage")
     public ReturnDTO<PageInfoBT<BizResourceCustomerStaff>> personListPage(@RequestBody IdDTO idDto) {
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
index 972ed4b..6418ea5 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
@@ -5,6 +5,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.resource.customer.SuggestFormApprovalListRequest;
 import com.casic.missiles.dto.resource.customer.SuggestFormSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceCustomerSuggestForm;
@@ -20,6 +21,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -50,4 +52,11 @@
         return suggestFormService.saveSuggestForm(request);
     }
 
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody SuggestFormApprovalListRequest request) throws Exception {
+        List<BizResourceCustomerSuggestForm> list = super.exportList(request);
+        super.exportExcel(BizResourceCustomerSuggestForm.class, list, ExportEnum.CUSTOMER_SUGGEST_FORM.getSheetName());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java
index 1934d1a..9e07eab 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java
@@ -15,12 +15,16 @@
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.resource.IEnvEnvironmentRecordConfigService;
 import com.casic.missiles.service.resource.IEnvEnvironmentRecordDataService;
+import com.casic.missiles.service.resource.IEnvLocationInfoService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
 import java.util.List;
@@ -39,6 +43,8 @@
     private IEnvEnvironmentRecordDataService environmentRecordDataService;
     @Autowired
     private IEnvEnvironmentRecordConfigService environmentRecordConfigService;
+    @Autowired
+    private IEnvLocationInfoService locationInfoService;
 
     @ApiOperation("环境记录单数据列表/详情")
     @PostMapping("/data/listPage")
@@ -95,4 +101,11 @@
         });
         return environmentRecordConfigService.deleteEnvironmentRecordConfig(idDTO.getId());
     }
+
+    @ApiOperation("地点列表")
+    @PostMapping("/location/listPage")
+    public ReturnDTO<PageInfoBT<LocationListResponse>> locationListPage(@RequestBody @Valid LocationListRequest request) {
+        Page<LocationListResponse> page = PageFactory.defaultPage();
+        return ReturnUtil.success(super.packForBT(locationInfoService.listPage(page, request)));
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java
index 82efe3f..e9561fa 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java
@@ -10,6 +10,7 @@
 import com.casic.missiles.dto.resource.seal.SealLogListRequest;
 import com.casic.missiles.dto.resource.seal.SealNoteApprovalListRequest;
 import com.casic.missiles.dto.resource.seal.SealNoteSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceSealUseLog;
@@ -27,6 +28,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -58,6 +60,13 @@
         return sealUseNoteService.saveSeal(request);
     }
 
+    @ApiOperation("印章使用登记导出（列表和导出中去掉经办人和监印人）")
+    @PostMapping("/listExport")
+    public void export(@RequestBody SealNoteApprovalListRequest request) throws Exception {
+        List<BizResourceSealUseNote> list = super.exportList(request);
+        super.exportExcel(BizResourceSealUseNote.class, list, ExportEnum.SEAL_NOTE.getSheetName());
+    }
+
     // TODO: 2023/7/28 印章使用日志：系统中使用印章时插入数据库
 
     @ApiOperation("印章使用日志列表（分页）")
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java
index 9b674fc..06b6521 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java
@@ -9,16 +9,20 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.resource.staff.StaffCertRequest;
 import com.casic.missiles.dto.resource.staff.StaffCertResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.service.resource.IBizResourceStaffInfoService;
 import com.casic.missiles.service.resource.IBizResourceStaffVerifierService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.List;
+
 /**
  * @Description:
  * @Author: wangpeng
@@ -41,9 +45,21 @@
         return ReturnUtil.success(super.packForBT(responsePage));
     }
 
+    @ApiOperation("证书逾期提醒导出")
+    @PostMapping("/listExport")
+    public void exportList(@RequestBody StaffCertRequest request) throws Exception {
+        List<StaffCertResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = staffInfoService.certListByIds(request.getIds());
+        } else {
+            list = staffInfoService.certList(request);
+        }
+        super.exportExcel(StaffCertResponse.class, list, ExportEnum.STAFF_CERTIFICATE_EXPIRE.getSheetName());
+    }
+
     @ApiOperation("证书逾期提醒")
     @PostMapping("/expirationReminder")
-    public ReturnDTO expirationReminder(@RequestBody IdDTO idDto) {
-        return verifierService.expirationReminder(idDto);
+    public ReturnDTO expirationReminder(@RequestBody IdDTO idDTO) {
+        return verifierService.expirationReminder(idDTO);
     }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java
index 3b251ad..a6e7850 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java
@@ -12,6 +12,7 @@
 import com.casic.missiles.dto.resource.staff.StaffListRequest;
 import com.casic.missiles.dto.resource.staff.TrainListRequest;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.*;
@@ -22,7 +23,10 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
 import java.util.List;
@@ -52,8 +56,19 @@
             throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
         }
         Page<BizResourceStaffInfo> page = PageFactory.defaultPage();
-        Page<BizResourceStaffInfo> responsePage = staffInfoService.listPage(page, request);
-        return ReturnUtil.success(super.packForBT(responsePage));
+        return ReturnUtil.success(super.packForBT(staffInfoService.listPage(page, request)));
+    }
+
+    @ApiOperation("人员登记导出")
+    @PostMapping("/listExport")
+    public void exportList(@RequestBody StaffListRequest request) throws Exception {
+        List<BizResourceStaffInfo> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = staffInfoService.listByIds(request.getIds());
+        } else {
+            list = staffInfoService.list(request);
+        }
+        super.exportExcel(BizResourceStaffInfo.class, list, ExportEnum.STAFF_INFO.getSheetName());
     }
 
     @ApiOperation("人员登记详情基础信息")
@@ -85,9 +100,9 @@
 
     @ApiOperation("科研教育列表（分页）")
     @PostMapping("/education/listPage")
-    public ReturnDTO<PageInfoBT<BizResourceStaffEducation>> educationListPage(@RequestBody IdDTO idDto) {
+    public ReturnDTO<PageInfoBT<BizResourceStaffEducation>> educationListPage(@RequestBody IdDTO idDTO) {
         Page<BizResourceStaffEducation> page = PageFactory.defaultPage();
-        Page<BizResourceStaffEducation> responsePage = staffInfoService.educationListPage(page, idDto);
+        Page<BizResourceStaffEducation> responsePage = staffInfoService.educationListPage(page, idDTO);
         return ReturnUtil.success(super.packForBT(responsePage));
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java
index af6aa86..d85d84a 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java
@@ -9,6 +9,7 @@
 import com.casic.missiles.dto.resource.outsideService.SupplierApprovalListRequest;
 import com.casic.missiles.dto.resource.outsideService.SupplierSaveResponse;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceSupplierAbility;
@@ -67,6 +68,13 @@
         return ReturnUtil.success(supplierInfoService.detail(idDTO.getId()));
     }
 
+    @ApiOperation("合格供方导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody SupplierApprovalListRequest request) throws Exception {
+        List<BizResourceSupplierInfo> list = super.exportList(request);
+        super.exportExcel(BizResourceSupplierInfo.class, list, ExportEnum.SUPPLIER_INFO.getSheetName());
+    }
+
     @ApiOperation("供方人员列表（分页）")
     @PostMapping("/person/listPage")
     public ReturnDTO<PageInfoBT<BizResourceSupplierPerson>> personListPage(@RequestBody IdDTO idDTO) {
diff --git a/casic-metering-api/src/main/resources/config/application.yml b/casic-metering-api/src/main/resources/config/application.yml
index 350db5f..ecff521 100644
--- a/casic-metering-api/src/main/resources/config/application.yml
+++ b/casic-metering-api/src/main/resources/config/application.yml
@@ -126,7 +126,7 @@
     #作者
     author: wangpeng
     #待生成对象表名
-    table-name: biz_equipment_technical_target_approval,biz_equipment_attachment_approval,biz_equipment_checkpoint_approval
+    table-name: biz_business_outsource_protocol
 
 reminder:
   #节点--common模块config包 ReminderNodeConfig配置
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
index 4a19e4e..d47d552 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
@@ -53,6 +53,7 @@
     SUGGEST_FORM_SAVE_FAILED(2509, "委托方意见登记表保存至草稿箱失败"),
     EXAMINE_FORM_SAVE_FAILED(2510, "要求、委托书及合同评审表保存至草稿箱失败"),
     CUSTOMER_EXIST_SAVE_FAILED(2511, "该委托方已存在，请重新选择"),
+    DUPLICATE_LOCATION_NO(2512, "地点编号已存在"),
 
     /**
      * 计量检定业务模块
@@ -68,6 +69,8 @@
     COMPLETE_SAMPLE_NOT_EXIST(2609, "检测中不存在扫描收入的样品"),
     CANNOT_CHANGE_MEASURE_INFO(2610, "无法更改非当前登录用户的检测信息"),
     NON_EXIST_ORDER_OR_SAMPLE(2611, "不存在该委托单或该委托单下的样品"),
+    OUTSOURCE_ACCESS_SAVE_FAILED(2612, "测试、校准或检定工作分包评审表保存至草稿箱失败"),
+    OUTSOURCE_PROTOCOL_SAVE_FAILED(2613, "测试、校准或检定工作分包协议书保存至草稿箱失败"),
 
     /**
      * 历史遗留备用
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
index 5089ad1..81a406b 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
@@ -10,54 +10,38 @@
     /**
      * 资源管理
      */
-    ENVIRONMENT_DATA_EXPORT("environmentData", "environmentData", "环境记录单数据"),
+    ENVIRONMENT_DATA_EXPORT("environmentData", "环境记录单数据", "环境记录单数据"),
+    STAFF_INFO("staffInfo", "人员登记", "人员登记"),
+    STAFF_CERTIFICATE_EXPIRE("certificateExpire", "证书逾期提醒", "证书逾期提醒"),
+    SUPPLIER_INFO("supplierInfo", "合格供方名录", "合格供方名录"),
+    CUSTOMER_INFO("customerInfo", "委托方名录", "委托方名录"),
+    CUSTOMER_SUGGEST_FORM("customerSuggestForm", "委托方意见登记表", "委托方意见登记表"),
+    SEAL_NOTE("sealNote", "印章使用登记", "印章使用登记"),
 
-    FILE_EXPORT("meterFileData", "meterFileData", "计量文件信息"),
-    TRAIN_PLAN_EXPORT("trainPlanData", "trainPlanData", "培训计划"),
-    TRAIN_LOG_EXPORT("trainLogData", "trainLogData", "培训记录"),
-    METER_ORGANIZE_EXPORT("meterOrganizeData", "meterOrganizeData", "计量组织"),
-    TRACE_SUPPLIER_EXPORT("traceSupplierData", "traceSupplierData", "溯源供方"),
-    SIGN_EXPORT("signData", "signData", "签名/签章"),
-    TEMPLATE_EXPORT("templateData", "templateData", "原始记录模板/证书报告模板"),
-    FIXED_ASSETS("meterFixedAssets", "meterFixedAssets", "固定资产"),
-    METER_EQUIPMENT("meterEquipment", "meterEquipment", "测量设备"),
-    CALIBRATION_TEST_EQUIPMENT("calibrationTestEquipment", "calibrationTestEquipment", "校准检定设备"),
-    MEASURE_ACCOUNT("measureAccount", "measureAccount", "测量工装"),
-    STANDARD_SUPPORT_EQUIPMENT("standardSupportEquipment", "standardSupportEquipment", "标准配套设备"),
-    STANDARD_EQUIPMENT("standardEquipment", "standardEquipment", "标准装置"),
-    FLOW_DEF_EXPORT("flowDefData", "flowDefData", "流程定义"),
-    STAFF_CERTIFICATE("certificate", "certificate", "计量人员证书"),
-    CHECK_INFO("checkInfo", "checkInfo", "设备管理点检测"),
-    EQUIPMENT_APPLY("equipmentApply", "equipmentApply", "设备借用"),
-    STANDARD_EQUIPMENT_REMIND("equipmentApplyRemind", "equipmentApplyRemind", "标准装置到期提醒"),
-    METER_PRICE("meterPrice", "meterPrice", "价格库"),
-    METER_STAFF("meterStaff", "meterStaff", "计量人员"),
-    STANDARD_EQUIPMENT_APPLY("standardEquipmentApply", "standardEquipmentApply", "标准装置申请"),
-    STATE_MANAGE_APPLY("stateManage", "stateManage", "状态管理"),
-    METER_ACCEPTANCE_CHECK("acceptanceCheck", "acceptanceCheck", "设备检修保养验收单"),
-    CUSTOMER_EXPORT("customerData", "customerData", "客户信息"),
-    ORDER_EXPORT("orderData", "orderData", "委托书信息"),
-    SAMPLE_EXPORT("sampleData", "sampleData", "样本信息"),
-    EXCHANGE_DATA("exchangeData", "exchangeData", "设备交接单"),
-    DISPATCH_DATA("dispatchData", "dispatchData", "设备收发"),
-    ENVIRONMENT_DATA("environmentData", "environmentData", "环境记录单"),
-    ORIGIN_DATA("originData", "originData", "原始记录"),
-    CERTIFICATE_REPORT("certificateReport", "certificateReport", "证书报告"),
-    ADVICE_EXPORT("adviceData", "adviceData", "客户反馈"),
-    HANDOUT_EXPORT("handoutData", "handoutData", "任务分发列表"),
-    OUTSOURCER_EXPORT("outsourcerData", "outsourcerData", "分包方"),
-    SITE_EXECUTIVE_EXPORT("siteExecutiveData", "siteExecutiveData", "现场测试、校准或检定"),
-    CERTIFICATE_PRINT_EXPORT("certificatePrintData", "certificatePrintData", "证书打印"),
-    DOWNLOAD_TEMPLATE("downloadTemplate", "downloadTemplate", "页面配置"),
-    OUTSOURCER_CERTIFICATE_EXPORT("outsourceCertificateData", "outsourceCertificateData", "分包证书"),
-    SETTLEMENT_INFO_EXPORT("settlementInfoData", "settlementInfoData", "业务结算"),
-    EQUIPMENT_REMIND("equipmentRemind", "equipmentRemind", "设备到期提醒"),
-    AGREEMENT_INFO_EXPORT("agreementInfoData", "agreementInfoData", "合同"),
-    WORK_STATISTICS_EXPORT("workStatisticsData", "workStatisticsData", "实时工作统计"),
-    DEPT_OUTPUT_EXPORT("deptOutputData", "deptOutputData", "部门产值分析"),
-    WORKLOAD_EXPORT("workloadData", "workloadData", "业务工作量分析"),
-    DEPT_COMPREHENSIVE_EXPORT("deptComprehensiveData", "deptComprehensiveData", "部门综合分析"),
-    ENVIRONMENTAL_RECORD("environmentalRecordData", "environmentalRecordData", "现场环境记录");
+    /**
+     * 计量检定业务
+     */
+    OUTSOURCER_EXPORT("outsourcerData", "分包方名录", "分包方名录"),
+    IDENTIFY_EXPORT("identifyData", "计量标识", "计量标识"),
+    ORDER_EXPORT("orderData", "任务单", "任务单"),
+    DISPATCH_DATA("dispatchData", "设备收发", "设备收发"),
+    HANDOUT_EXPORT("handoutData", "任务分发", "任务分发"),
+    SITE_EXECUTIVE_EXPORT("siteExecutiveData", "现场测试、校准或检定", "现场测试、校准或检定"),
+    CERTIFICATE_REPORT("certificateReport", "证书审批", "证书审批"),
+    CERTIFICATE_CHANGE_APPLY("certificateChangeApply", "证书报告补充或更换申请单", "证书报告补充或更换申请单"),
+    CERTIFICATE_PRINT("certificatePrintData", "证书打印审批", "证书打印审批"),
+    DEPT_EXECUTIVE_TASK("deptExecutiveTaskData", "实验室任务", "实验室任务"),
+    MY_EXECUTIVE_TASK("myExecutiveTaskData", "我的任务", "我的任务"),
+    OUTSOURCE_ASSESS("outsourceAssess", "测试、校准或检定工作分包评审表", "测试、校准或检定工作分包评审表"),
+    OUTSOURCE_PROTOCOL("outsourceProtocol", "测试、校准或检定工作分包协议书", "测试、校准或检定工作分包协议书"),
+
+    /**
+     * 系统管理
+     */
+    SIGN_EXPORT("signData", "签名", "签名"),
+    TEMPLATE_EXPORT("templateData", "文件模板", "文件模板"),
+    FLOW_DEF_EXPORT("flowDefData", "流程定义", "流程定义"),
+    DOWNLOAD_TEMPLATE("downloadTemplate", "流程定义", "页面配置");
 
     ExportEnum(String fileName, String sheetName, String description) {
         this.fileName = fileName;
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateRecordTypeCodeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateRecordTypeCodeEnum.java
index 31d913c..a963522 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateRecordTypeCodeEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateRecordTypeCodeEnum.java
@@ -46,4 +46,14 @@
     String SITE_EXECUTIVE_APPROVAL = "01";
     //《现场测试、校准或检定工作记录表》
     String SITE_EXECUTIVE_LOG = "02";
+
+    //测试、校准或检定工作分包协议书
+    String OUTSOURCE_PROTOCOL = "01";
+    //测试、校准或检定工作分包评审表
+    String OUTSOURCE_ACCESS = "02";
+    //测试、校准或检定工作分包通知书
+    String OUTSOURCE_NOTICE = "03";
+    //测试、校准或检定工作分包方名录
+    String OUTSOURCE_INFO = "04";
+
 }
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
index 24b8635..f78bd53 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
@@ -15,6 +15,10 @@
     String CERTIFICATE_CHANGE_APPLY_BEAN_NAME = "certificateChangeApplyBean";
     //现场测试、校准或检定
     String SITE_EXECUTIVE_BEAN_NAME = "siteExecutiveBean";
+    //测试、校准或检定工作分包评审表
+    String OUTSOURCE_ASSESS_BEAN_NAME = "outsourceAssessBean";
+    //测试、校准或检定工作分包协议书
+    String OUTSOURCE_PROTOCOL_BEAN_NAME = "outsourceProtocolBean";
 
     /*********************************设备与装置************************************/
     //设备台账
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 b21c661..6b86fd1 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
@@ -18,6 +18,8 @@
     OUTSOURCER_APPROVAL(OUTSOURCER_BEAN_NAME, ""),
     CERTIFICATE_CHANGE_APPROVAL(CERTIFICATE_CHANGE_APPLY_BEAN_NAME, ""),
     SITE_EXECUTIVE_APPROVAL(SITE_EXECUTIVE_BEAN_NAME, ""),
+    OUTSOURCE_ASSESS_APPROVAL(OUTSOURCE_ASSESS_BEAN_NAME, ""),
+    OUTSOURCE_PROTOCOL_APPROVAL(OUTSOURCE_PROTOCOL_BEAN_NAME, ""),
 
     ACTION_STATUS_MAP(new HashMap<String, AwareActionStatusEnum>() {
         {
@@ -47,6 +49,10 @@
             put(ApplyFromIdEnum.CERTIFICATE_CHANGE_APPROVAL.getCode(), CERTIFICATE_CHANGE_APPROVAL);
             //现场测试、校准或检定审批
             put(ApplyFromIdEnum.SITE_EXECUTIVE_APPROVAL.getCode(), SITE_EXECUTIVE_APPROVAL);
+            //测试、校准或检定工作分包评审表
+            put(ApplyFromIdEnum.OUTSOURCE_ASSESS_APPROVAL.getCode(), OUTSOURCE_ASSESS_APPROVAL);
+            //测试、校准或检定工作分包协议书
+            put(ApplyFromIdEnum.OUTSOURCE_PROTOCOL_APPROVAL.getCode(), OUTSOURCE_PROTOCOL_APPROVAL);
         }
     });
     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 934405e..c7410bd 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
@@ -9,6 +9,8 @@
     CERTIFICATE_CHANGE_APPROVAL("jljdywzsbchghsqd", MessageSourceModuleEnum.BUSINESS.getCode(), "证书/报告补充或更换申请单"),
     OUTSOURCER_APPROVAL("jljdywcsjzhgfbfml", MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定合格分包方名录"),
     SITE_EXECUTIVE_APPROVAL("jljdywxccsjzsp", MessageSourceModuleEnum.BUSINESS.getCode(), "现场测试、校准或检定审批"),
+    OUTSOURCE_ASSESS_APPROVAL("jljdywcsjzfbpsb", MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包评审表"),
+    OUTSOURCE_PROTOCOL_APPROVAL("jljdywcsjzfbxys", MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包协议书"),
 
 
     /*******************************************设备与装置*********************************************/
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/GeneralApprovalMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/GeneralApprovalMapper.java
index 4fb7344..0c9d6ae 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/GeneralApprovalMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/GeneralApprovalMapper.java
@@ -17,8 +17,4 @@
 
     Page<O> selectBatchForApprovalList(Page<O> page, @Param("request") R request, @Param("businessKeys") List<String> businessKeys);
 
-//    Page<O> selectListPage(Page<O> page, @Param("request") R request);
-
-//    Long selectMaxNo();
-
 }

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java
index bb0c50f..13a699b 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java
@@ -12,6 +12,7 @@
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.IGeneralApprovalService;
+import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
@@ -19,6 +20,7 @@
 import org.springframework.web.bind.annotation.RequestBody;
 
 import javax.validation.Valid;
+import java.util.List;
 import java.util.Objects;
 
 /**
@@ -117,4 +119,17 @@
         }
         return baseApprovalService.failUpdate(request);
     }
+
+    public List<O> exportList(@RequestBody @Valid R request) throws Exception {
+        List<O> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = baseApprovalService.listExportByIds(request.getIds());
+        } else {
+            list = baseApprovalService.listExport(request);
+        }
+        for (O record : list) {
+            DictCodeUtils.convertDictCodeToName(record);
+        }
+        return list;
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java
index 8a90961..d775831 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java
@@ -5,6 +5,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.business.certificate.CertificateChangeApplyApprovalListRequest;
 import com.casic.missiles.dto.business.certificate.CertificateChangeApplySaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessCertificateChangeApply;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
@@ -20,6 +21,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -48,4 +50,12 @@
         }
         return changeApplyService.saveChangeApply(request);
     }
+
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody CertificateChangeApplyApprovalListRequest request) throws Exception {
+        List<BizBusinessCertificateChangeApply> list = super.exportList(request);
+        super.exportExcel(BizBusinessCertificateChangeApply.class, list, ExportEnum.CERTIFICATE_CHANGE_APPLY.getSheetName());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java
index 5fc4b07..af8230e 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java
@@ -9,6 +9,7 @@
 import com.casic.missiles.dto.business.certificate.CertificatePrintApprovalListRequest;
 import com.casic.missiles.dto.business.certificate.CertificatePrintListResponse;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.enums.business.CertificatePrintStatusEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessCertificatePrintLog;
@@ -18,10 +19,16 @@
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.io.IOException;
+import java.util.List;
 import java.util.Objects;
 
 /**
@@ -98,4 +105,16 @@
         });
         return certificatePrintService.certificatePrintLog(idDTO.getId());
     }
+
+    @ApiOperation("证书打印审批导出")
+    @PostMapping("/listExport")
+    public void exportList(@RequestBody CertificatePrintApprovalListRequest request) throws IOException {
+        List<CertificatePrintListResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = certificatePrintService.listByIds(request.getIds());
+        } else {
+            list = certificatePrintService.list(request);
+        }
+        super.exportExcel(CertificatePrintListResponse.class, list, ExportEnum.CERTIFICATE_PRINT.getSheetName());
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java
index 63b06dc..6b2efd5 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java
@@ -6,6 +6,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.business.certificate.CertificateReportApprovalListRequest;
 import com.casic.missiles.dto.business.certificate.CertificateReportSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessCertificateReport;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
@@ -21,6 +22,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -50,7 +52,7 @@
         return certificateReportService.saveCertificateReport(request);
     }
 
-    @ApiOperation("证书审批详情（基本信息）")
+    @ApiOperation("详情（基本信息）")
     @PostMapping("/detail")
     public ReturnDTO<BizBusinessCertificateReport> detail(@RequestBody @Valid BaseDetailRequest request, BindingResult bindingResult) throws Exception {
         if(bindingResult.hasErrors()){
@@ -59,4 +61,11 @@
         return certificateReportService.detail(request);
     }
 
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody CertificateReportApprovalListRequest request) throws Exception {
+        List<BizBusinessCertificateReport> list = super.exportList(request);
+        super.exportExcel(BizBusinessCertificateReport.class, list, ExportEnum.CERTIFICATE_REPORT.getSheetName());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java
index 46b26bd..57c0809 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java
@@ -10,20 +10,21 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.business.identify.IdentifyListRequest;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessIdentifyInfo;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.business.IBizBusinessIdentifyInfoService;
+import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import javax.validation.Valid;
+import java.util.List;
 import java.util.Objects;
 
 /**
@@ -57,16 +58,13 @@
         return identifyInfoService.addIdentify(identifyInfo);
     }
 
-    @ApiOperation("标识打印更新")
+    @ApiOperation("标识打印更新（更新打印时间）")
     @PostMapping("/update")
-    public ReturnDTO updateIdentify(@RequestBody @Valid BizBusinessIdentifyInfo identifyInfo, BindingResult bindingResult) {
-        Assert.isFalse(Objects.isNull(identifyInfo.getId()), () -> {
+    public ReturnDTO updateIdentify(@RequestBody @Valid IdDTO idDTO) {
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        Assert.isFalse(bindingResult.hasErrors(), () -> {
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        });
-        return identifyInfoService.updateIdentify(identifyInfo);
+        return identifyInfoService.updateIdentify(idDTO.getId());
     }
 
     @ApiOperation("标识打印删除")
@@ -77,4 +75,37 @@
         });
         return identifyInfoService.deleteIdentify(idDTO.getId());
     }
+
+    @ApiOperation("标识打印导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody @Valid IdentifyListRequest request, BindingResult bindingResult) throws Exception {
+        if (bindingResult.hasErrors()) {
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        List<BizBusinessIdentifyInfo> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = identifyInfoService.listByIds(request.getIds());
+        } else {
+            list = identifyInfoService.list(request);
+        }
+        for (BizBusinessIdentifyInfo record : list) {
+            DictCodeUtils.convertDictCodeToName(record);
+        }
+        super.exportExcel(BizBusinessIdentifyInfo.class, list, ExportEnum.IDENTIFY_EXPORT.getSheetName());
+    }
+
+
+    // TODO: 2023/8/23 查询设备信息，4个底部按钮查设备（按钮的作用就是前端用来调不同接口、用来区分中间即将展示的标识），前端弹窗选设备，在确定保存时前端根据底部按钮判断传入设备类型deviceType字典code
+    // TODO: 2023/8/23 接口：查受检设备（第1个按钮），查设备台账（后3个按钮同一接口），查询之后前端根据标志类型的不同加到中间页面时进行判断（按产品给的对应表）
+    // TODO: 2023/8/23 提供二维码接口，前端在加到中间页面时调用一下
+
+    @ApiOperation("设备二维码")
+    @PostMapping("/equipment/qrCode")
+    public ReturnDTO<String> equipmentQrCode(@RequestBody @Valid IdDTO idDTO) {
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return identifyInfoService.equipmentQrCode(idDTO.getId());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java
index 707be6e..7e0453d 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java
@@ -117,7 +117,7 @@
     }
 
     @ApiOperation("任务单导出")
-    @PostMapping("/export")
+    @PostMapping("/listExport")
     public void orderExport(@RequestBody @Valid OrderListRequest request, HttpServletResponse response) {
         businessOrderService.orderExport(request, response);
     }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java
index 529a6ce..51432be 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java
@@ -1,9 +1,28 @@
 package com.casic.missiles.controller.business;
 
+import com.casic.missiles.controller.GeneralApprovalController;
+import com.casic.missiles.dto.BaseApprovalSubmitRequest;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.business.outsource.OutsourceAssessApprovalListRequest;
+import com.casic.missiles.dto.business.outsource.OutsourceAssessSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
+import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.model.business.BizBusinessOutsourceAssess;
+import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
+import com.casic.missiles.service.IGeneralApprovalService;
+import com.casic.missiles.service.business.IBizBusinessOutsourceAssessService;
 import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.BindingResult;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.validation.Valid;
+import java.util.List;
+
 /**
  * <p>
  * 计量检定业务-分包管理-测试、校准或检定工作分包评审表 前端控制器
@@ -15,6 +34,27 @@
 @Api(tags = "分包管理-测试、校准或检定工作分包评审表")
 @RestController
 @RequestMapping("/business/outsource/assess")
-public class BizBusinessOutsourceAssessController {
+public class BizBusinessOutsourceAssessController extends GeneralApprovalController<BizBusinessOutsourceAssess, BizBusinessOutsourceAssess, OutsourceAssessApprovalListRequest, BaseApprovalSubmitRequest> {
+    @Autowired
+    private IBizBusinessOutsourceAssessService outsourceAssessService;
 
+    public BizBusinessOutsourceAssessController(IGeneralApprovalService<BizBusinessOutsourceAssess, BizBusinessOutsourceAssess, OutsourceAssessApprovalListRequest, BaseApprovalSubmitRequest> baseApprovalService) {
+        super(baseApprovalService);
+    }
+
+    @ApiOperation("草稿箱-保存")
+    @PostMapping("/save")
+    public ReturnDTO<OutsourceAssessSaveResponse> saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceAssess request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        return outsourceAssessService.saveOutsourceAssess(request);
+    }
+
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception {
+        List<BizBusinessOutsourceAssess> list = super.exportList(request);
+        super.exportExcel(BizBusinessOutsourceAssess.class, list, ExportEnum.OUTSOURCE_ASSESS.getSheetName());
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java
new file mode 100644
index 0000000..9adef18
--- /dev/null
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java
@@ -0,0 +1,60 @@
+package com.casic.missiles.controller.business;
+
+import com.casic.missiles.controller.GeneralApprovalController;
+import com.casic.missiles.dto.BaseApprovalSubmitRequest;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.business.outsource.OutsourceProtocolApprovalListRequest;
+import com.casic.missiles.dto.business.outsource.OutsourceProtocolSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
+import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.model.business.BizBusinessOutsourceProtocol;
+import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
+import com.casic.missiles.service.IGeneralApprovalService;
+import com.casic.missiles.service.business.IBizBusinessOutsourceProtocolService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.BindingResult;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.validation.Valid;
+import java.util.List;
+
+/**
+ * <p>
+ * 计量检定业务-分包管理-测试、校准或检定工作分包协议书 前端控制器
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-08-24
+ */
+@Api(tags = "分包管理-测试、校准或检定工作分包协议书")
+@RestController
+@RequestMapping("/business/outsource/protocol")
+public class BizBusinessOutsourceProtocolController extends GeneralApprovalController<BizBusinessOutsourceProtocol, BizBusinessOutsourceProtocol, OutsourceProtocolApprovalListRequest, BaseApprovalSubmitRequest> {
+    @Autowired
+    private IBizBusinessOutsourceProtocolService outsourceProtocolService;
+
+    public BizBusinessOutsourceProtocolController(IGeneralApprovalService<BizBusinessOutsourceProtocol, BizBusinessOutsourceProtocol, OutsourceProtocolApprovalListRequest, BaseApprovalSubmitRequest> baseApprovalService) {
+        super(baseApprovalService);
+    }
+
+    @ApiOperation("草稿箱-保存")
+    @PostMapping("/save")
+    public ReturnDTO<OutsourceProtocolSaveResponse> saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceProtocol request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        return outsourceProtocolService.saveOutsourceProtocol(request);
+    }
+
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody OutsourceProtocolApprovalListRequest request) throws Exception {
+        List<BizBusinessOutsourceProtocol> list = super.exportList(request);
+        super.exportExcel(BizBusinessOutsourceProtocol.class, list, ExportEnum.OUTSOURCE_PROTOCOL.getSheetName());
+    }
+}
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java
index 097f645..f0f0943 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java
@@ -17,7 +17,6 @@
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.IGeneralApprovalService;
 import com.casic.missiles.service.business.IBizBusinessOutsourcerInfoService;
-import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -71,19 +70,8 @@
 
     @ApiOperation("分包方导出")
     @PostMapping("/listExport")
-    public void export(@RequestBody @Valid OutsourcerInfoApprovalListRequest request, BindingResult bindingResult) throws Exception {
-        if (bindingResult.hasErrors()) {
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        }
-        List<BizBusinessOutsourcerInfo> list;
-        if (!CollectionUtils.isEmpty(request.getIds())) {
-            list = outsourcerInfoService.listByIds(request.getIds());
-        } else {
-            list = outsourcerInfoService.list(request);
-        }
-        for (BizBusinessOutsourcerInfo record : list) {
-            DictCodeUtils.convertDictCodeToName(record);
-        }
+    public void export(@RequestBody OutsourcerInfoApprovalListRequest request) throws Exception {
+        List<BizBusinessOutsourcerInfo> list = super.exportList(request);
         super.exportExcel(BizBusinessOutsourcerInfo.class, list, ExportEnum.OUTSOURCER_EXPORT.getSheetName());
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java
index c2cbf9f..0410918 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java
@@ -17,11 +17,9 @@
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.IGeneralApprovalService;
 import com.casic.missiles.service.business.IBizBusinessSiteExecutiveInfoService;
-import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -60,7 +58,7 @@
         return siteExecutiveInfoService.saveSiteExecutiveInfo(siteExecutiveInfo);
     }
 
-    @ApiOperation("现场检测详情")
+    @ApiOperation("详情")
     @PostMapping("/detail")
     public ReturnDTO<SiteExecutiveDetailResponse> siteExecutiveDetail(@RequestBody @Valid IdDTO idDTO) throws Exception {
         Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
@@ -69,21 +67,10 @@
         return ReturnUtil.success(siteExecutiveInfoService.detail(idDTO.getId()));
     }
 
-    @ApiOperation("现场检测导出")
+    @ApiOperation("导出")
     @PostMapping("/listExport")
-    public void export(@RequestBody @Valid SiteExecutiveApprovalListRequest request, BindingResult bindingResult) throws Exception {
-        if (bindingResult.hasErrors()) {
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        }
-        List<SiteExecutiveApprovalListResponse> list;
-        if (!CollectionUtils.isEmpty(request.getIds())) {
-            list = siteExecutiveInfoService.listInfoByIds(request.getIds());
-        } else {
-            list = siteExecutiveInfoService.listInfo(request);
-        }
-        for (SiteExecutiveApprovalListResponse record : list) {
-            DictCodeUtils.convertDictCodeToName(record);
-        }
+    public void export(@RequestBody SiteExecutiveApprovalListRequest request) throws Exception {
+        List<SiteExecutiveApprovalListResponse> list = super.exportList(request);
         super.exportExcel(SiteExecutiveApprovalListResponse.class, list, ExportEnum.SITE_EXECUTIVE_EXPORT.getSheetName());
     }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
index 7e793cd..a92e209 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
@@ -55,7 +55,7 @@
 
     @ApiOperation("设备收发列表导出")
     @PostMapping("/export")
-    public void exportList(@RequestBody @Valid SampleDispatchListRequest request) throws IOException {
+    public void exportList(@RequestBody SampleDispatchListRequest request) throws IOException {
         List<SampleDispatchListResponse> list;
         if (!CollectionUtils.isEmpty(request.getIds())) {
             list = dispatchService.listByIds(request.getIds());
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java
index cdc77fc..d120fd4 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java
@@ -7,6 +7,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.business.labExecutive.*;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.business.IBusinessLabExecutiveInfoService;
@@ -14,6 +15,7 @@
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.*;
 
@@ -32,7 +34,7 @@
     @Autowired
     private IBusinessLabExecutiveInfoService labExecutiveInfoService;
 
-    @ApiOperation("实验室检测-部门检测-查询各状态列表（待检测、检测中、检测完）")
+    @ApiOperation("实验室任务-查询各状态列表（待检测、检测中、检测完）")
     @PostMapping("/deptExecutive/List")
     public ReturnDTO<PageInfoBT<SampleLabExecutiveListResponse>> queryDeptExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
@@ -43,10 +45,19 @@
         return ReturnUtil.success(super.packForBT(labExecutiveInfoService.deptLabExecutiveListPage(page, labExecutiveListRequest)));
     }
 
-    /**
-     * 实验室检测-我的检测-查询各状态列表（待检测、检测中、检测完）
-     */
-    @ApiOperation("实验室检测-我的检测-查询各状态列表（待检测、检测中、检测完）")
+    @ApiOperation("实验室任务导出")
+    @PostMapping("/deptExecutive/export")
+    public void deptExportList(@RequestBody @Valid SampleLabExecutiveListRequest request) throws Exception {
+        List<SampleLabExecutiveListResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = labExecutiveInfoService.deptLabExecutiveListByIds(request.getMeasureStatus(), request.getIds());
+        } else {
+            list = labExecutiveInfoService.deptLabExecutiveList(request);
+        }
+        super.exportExcel(SampleLabExecutiveListResponse.class, list, ExportEnum.DEPT_EXECUTIVE_TASK.getSheetName());
+    }
+
+    @ApiOperation("我的任务-查询各状态列表（待检测、检测中、检测完）")
     @PostMapping("/myExecutive/list")
     public ReturnDTO<PageInfoBT<SampleLabExecutiveListResponse>> queryMyExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
@@ -57,19 +68,25 @@
         return ReturnUtil.success(super.packForBT(labExecutiveInfoService.myLabExecutiveListPage(page, labExecutiveListRequest)));
     }
 
-    /**
-     * 实验室检测-我的检测-查询各状态样品数量（待检测、检测中、检测完）
-     */
-    @ApiOperation("实验室检测-我的检测-查询各状态样品数量（待检测、检测中、检测完）")
+    @ApiOperation("我的任务导出")
+    @PostMapping("/myExecutive/export")
+    public void exportList(@RequestBody @Valid SampleLabExecutiveListRequest request) throws Exception {
+        List<SampleLabExecutiveListResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = labExecutiveInfoService.myLabExecutiveListByIds(request.getMeasureStatus(), request.getIds());
+        } else {
+            list = labExecutiveInfoService.myLabExecutiveList(request);
+        }
+        super.exportExcel(SampleLabExecutiveListResponse.class, list, ExportEnum.MY_EXECUTIVE_TASK.getSheetName());
+    }
+
+    @ApiOperation("我的任务-查询各状态样品数量（待检测、检测中、检测完）")
     @GetMapping("/myExecutive/amount")
     public ReturnDTO<List<SampleAmountResponse>> queryMyExecutiveAmount() {
         return ReturnUtil.success(labExecutiveInfoService.myExecutiveAmount());
     }
 
-    /**
-     * 实验室检测-部门检测-分配（分配给具体人员）
-     */
-    @ApiOperation("实验室检测-部门检测-分配按钮（分配给具体人员）")
+    @ApiOperation("实验室任务-分配按钮（分配给具体人员）")
     @PostMapping("/deptExecutive/allocate")
     public ReturnDTO allocateStaff(@RequestBody @Valid SampleAllocateRequest sampleAllocateRequest, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -78,10 +95,7 @@
         return labExecutiveInfoService.allocateStaff(sampleAllocateRequest);
     }
 
-    /**
-     * 实验室检测-我的检测-检定人扫描收入（待检测->检测中）
-     */
-    @ApiOperation("实验室检测-我的检测-检定人扫描收入（待检测->检测中）")
+    @ApiOperation("我的任务-检定人扫描收入（待检测->检测中）")
     @PostMapping("/myExecutive/receive")
     public ReturnDTO sampleReceive(@RequestBody @Valid List<SampleOperateRequest> requestList, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -90,10 +104,7 @@
         return labExecutiveInfoService.sampleReceive(requestList);
     }
 
-    /**
-     * 实验室检测-负责人/检定人扫描检完（检测中->检测完）
-     */
-    @ApiOperation("实验室检测-负责人/检定人扫描检完（检测中->检测完）")
+    @ApiOperation("实验室任务-负责人/检定人扫描检完（检测中->检测完）")
     @PostMapping("/myExecutive/complete")
     public ReturnDTO sampleExecutiveComplete(@RequestBody @Valid List<SampleOperateRequest> requestList, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -102,10 +113,7 @@
         return labExecutiveInfoService.sampleExecutiveComplete(requestList);
     }
 
-    /**
-     * 实验室检测-部门检测/我的检测 编辑（只能修改应出具证书）
-     */
-    @ApiOperation("实验室检测-部门检测/我的检测 编辑（只能修改应出具证书）")
+    @ApiOperation("实验室任务/我的任务 编辑（只能修改应出具证书）")
     @PostMapping("/executive/update")
     public ReturnDTO updateExecutive(@RequestBody @Valid UpdateExecutiveRequest request, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -114,10 +122,7 @@
         return labExecutiveInfoService.updateExecutive(request);
     }
 
-    /**
-     * 实验室检测-部门检测/我的检测 详情
-     */
-    @ApiOperation("实验室检测-部门检测/我的检测 详情")
+    @ApiOperation("实验室任务/我的任务 详情")
     @PostMapping("/executive/detail")
     public ReturnDTO<ExecutiveDetailResponse> executiveDetail(@RequestBody @Valid ExecutiveDetailRequest request, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
@@ -131,7 +136,7 @@
      * 退回后会将下一个要执行的实验室检测状态更新为待分配，将后面的实验室顺序变更为连续（都进行减1）
      * 最后一个检测的实验室退回，等分发员再增加实验室或设备收发中的已收入直接手动点击完成
      */
-    @ApiOperation("实验室检测-部门检测/我的检测 退回（待检测/检测中->退回）")
+    @ApiOperation("实验室任务/我的任务 退回（待检测/检测中->退回）")
     @PostMapping("/executive/sendBack")
     public ReturnDTO executiveSendBack(@RequestBody @Valid ExecutiveSendBackRequest request, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -140,9 +145,6 @@
         return labExecutiveInfoService.sampleExecutiveSendBack(request);
     }
 
-    /**
-     * 分发员编辑实验室检测列表
-     */
     @ApiOperation("分发员编辑实验室检测列表")
     @PostMapping("/handOut/updateList")
     public ReturnDTO updateExecutiveList(@RequestBody @Valid UpdateExecutiveListRequest request, BindingResult bindingResult) {
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java
index 48a67ed..0c04f31 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java
@@ -10,6 +10,7 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.resource.customer.CustomerApprovalListRequest;
 import com.casic.missiles.dto.resource.customer.CustomerSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceCustomerInfo;
@@ -26,6 +27,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -55,6 +57,13 @@
         return customerInfoService.saveCustomerInfo(request);
     }
 
+    @ApiOperation("委托方名录导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody CustomerApprovalListRequest request) throws Exception {
+        List<BizResourceCustomerInfo> list = super.exportList(request);
+        super.exportExcel(BizResourceCustomerInfo.class, list, ExportEnum.CUSTOMER_INFO.getSheetName());
+    }
+
     @ApiOperation("委托方人员列表（分页）")
     @PostMapping("/person/listPage")
     public ReturnDTO<PageInfoBT<BizResourceCustomerStaff>> personListPage(@RequestBody IdDTO idDto) {
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
index 972ed4b..6418ea5 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
@@ -5,6 +5,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.resource.customer.SuggestFormApprovalListRequest;
 import com.casic.missiles.dto.resource.customer.SuggestFormSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceCustomerSuggestForm;
@@ -20,6 +21,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -50,4 +52,11 @@
         return suggestFormService.saveSuggestForm(request);
     }
 
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody SuggestFormApprovalListRequest request) throws Exception {
+        List<BizResourceCustomerSuggestForm> list = super.exportList(request);
+        super.exportExcel(BizResourceCustomerSuggestForm.class, list, ExportEnum.CUSTOMER_SUGGEST_FORM.getSheetName());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java
index 1934d1a..9e07eab 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java
@@ -15,12 +15,16 @@
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.resource.IEnvEnvironmentRecordConfigService;
 import com.casic.missiles.service.resource.IEnvEnvironmentRecordDataService;
+import com.casic.missiles.service.resource.IEnvLocationInfoService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
 import java.util.List;
@@ -39,6 +43,8 @@
     private IEnvEnvironmentRecordDataService environmentRecordDataService;
     @Autowired
     private IEnvEnvironmentRecordConfigService environmentRecordConfigService;
+    @Autowired
+    private IEnvLocationInfoService locationInfoService;
 
     @ApiOperation("环境记录单数据列表/详情")
     @PostMapping("/data/listPage")
@@ -95,4 +101,11 @@
         });
         return environmentRecordConfigService.deleteEnvironmentRecordConfig(idDTO.getId());
     }
+
+    @ApiOperation("地点列表")
+    @PostMapping("/location/listPage")
+    public ReturnDTO<PageInfoBT<LocationListResponse>> locationListPage(@RequestBody @Valid LocationListRequest request) {
+        Page<LocationListResponse> page = PageFactory.defaultPage();
+        return ReturnUtil.success(super.packForBT(locationInfoService.listPage(page, request)));
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java
index 82efe3f..e9561fa 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java
@@ -10,6 +10,7 @@
 import com.casic.missiles.dto.resource.seal.SealLogListRequest;
 import com.casic.missiles.dto.resource.seal.SealNoteApprovalListRequest;
 import com.casic.missiles.dto.resource.seal.SealNoteSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceSealUseLog;
@@ -27,6 +28,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -58,6 +60,13 @@
         return sealUseNoteService.saveSeal(request);
     }
 
+    @ApiOperation("印章使用登记导出（列表和导出中去掉经办人和监印人）")
+    @PostMapping("/listExport")
+    public void export(@RequestBody SealNoteApprovalListRequest request) throws Exception {
+        List<BizResourceSealUseNote> list = super.exportList(request);
+        super.exportExcel(BizResourceSealUseNote.class, list, ExportEnum.SEAL_NOTE.getSheetName());
+    }
+
     // TODO: 2023/7/28 印章使用日志：系统中使用印章时插入数据库
 
     @ApiOperation("印章使用日志列表（分页）")
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java
index 9b674fc..06b6521 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java
@@ -9,16 +9,20 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.resource.staff.StaffCertRequest;
 import com.casic.missiles.dto.resource.staff.StaffCertResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.service.resource.IBizResourceStaffInfoService;
 import com.casic.missiles.service.resource.IBizResourceStaffVerifierService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.List;
+
 /**
  * @Description:
  * @Author: wangpeng
@@ -41,9 +45,21 @@
         return ReturnUtil.success(super.packForBT(responsePage));
     }
 
+    @ApiOperation("证书逾期提醒导出")
+    @PostMapping("/listExport")
+    public void exportList(@RequestBody StaffCertRequest request) throws Exception {
+        List<StaffCertResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = staffInfoService.certListByIds(request.getIds());
+        } else {
+            list = staffInfoService.certList(request);
+        }
+        super.exportExcel(StaffCertResponse.class, list, ExportEnum.STAFF_CERTIFICATE_EXPIRE.getSheetName());
+    }
+
     @ApiOperation("证书逾期提醒")
     @PostMapping("/expirationReminder")
-    public ReturnDTO expirationReminder(@RequestBody IdDTO idDto) {
-        return verifierService.expirationReminder(idDto);
+    public ReturnDTO expirationReminder(@RequestBody IdDTO idDTO) {
+        return verifierService.expirationReminder(idDTO);
     }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java
index 3b251ad..a6e7850 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java
@@ -12,6 +12,7 @@
 import com.casic.missiles.dto.resource.staff.StaffListRequest;
 import com.casic.missiles.dto.resource.staff.TrainListRequest;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.*;
@@ -22,7 +23,10 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
 import java.util.List;
@@ -52,8 +56,19 @@
             throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
         }
         Page<BizResourceStaffInfo> page = PageFactory.defaultPage();
-        Page<BizResourceStaffInfo> responsePage = staffInfoService.listPage(page, request);
-        return ReturnUtil.success(super.packForBT(responsePage));
+        return ReturnUtil.success(super.packForBT(staffInfoService.listPage(page, request)));
+    }
+
+    @ApiOperation("人员登记导出")
+    @PostMapping("/listExport")
+    public void exportList(@RequestBody StaffListRequest request) throws Exception {
+        List<BizResourceStaffInfo> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = staffInfoService.listByIds(request.getIds());
+        } else {
+            list = staffInfoService.list(request);
+        }
+        super.exportExcel(BizResourceStaffInfo.class, list, ExportEnum.STAFF_INFO.getSheetName());
     }
 
     @ApiOperation("人员登记详情基础信息")
@@ -85,9 +100,9 @@
 
     @ApiOperation("科研教育列表（分页）")
     @PostMapping("/education/listPage")
-    public ReturnDTO<PageInfoBT<BizResourceStaffEducation>> educationListPage(@RequestBody IdDTO idDto) {
+    public ReturnDTO<PageInfoBT<BizResourceStaffEducation>> educationListPage(@RequestBody IdDTO idDTO) {
         Page<BizResourceStaffEducation> page = PageFactory.defaultPage();
-        Page<BizResourceStaffEducation> responsePage = staffInfoService.educationListPage(page, idDto);
+        Page<BizResourceStaffEducation> responsePage = staffInfoService.educationListPage(page, idDTO);
         return ReturnUtil.success(super.packForBT(responsePage));
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java
index af6aa86..d85d84a 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java
@@ -9,6 +9,7 @@
 import com.casic.missiles.dto.resource.outsideService.SupplierApprovalListRequest;
 import com.casic.missiles.dto.resource.outsideService.SupplierSaveResponse;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceSupplierAbility;
@@ -67,6 +68,13 @@
         return ReturnUtil.success(supplierInfoService.detail(idDTO.getId()));
     }
 
+    @ApiOperation("合格供方导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody SupplierApprovalListRequest request) throws Exception {
+        List<BizResourceSupplierInfo> list = super.exportList(request);
+        super.exportExcel(BizResourceSupplierInfo.class, list, ExportEnum.SUPPLIER_INFO.getSheetName());
+    }
+
     @ApiOperation("供方人员列表（分页）")
     @PostMapping("/person/listPage")
     public ReturnDTO<PageInfoBT<BizResourceSupplierPerson>> personListPage(@RequestBody IdDTO idDTO) {
diff --git a/casic-metering-api/src/main/resources/config/application.yml b/casic-metering-api/src/main/resources/config/application.yml
index 350db5f..ecff521 100644
--- a/casic-metering-api/src/main/resources/config/application.yml
+++ b/casic-metering-api/src/main/resources/config/application.yml
@@ -126,7 +126,7 @@
     #作者
     author: wangpeng
     #待生成对象表名
-    table-name: biz_equipment_technical_target_approval,biz_equipment_attachment_approval,biz_equipment_checkpoint_approval
+    table-name: biz_business_outsource_protocol
 
 reminder:
   #节点--common模块config包 ReminderNodeConfig配置
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
index 4a19e4e..d47d552 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
@@ -53,6 +53,7 @@
     SUGGEST_FORM_SAVE_FAILED(2509, "委托方意见登记表保存至草稿箱失败"),
     EXAMINE_FORM_SAVE_FAILED(2510, "要求、委托书及合同评审表保存至草稿箱失败"),
     CUSTOMER_EXIST_SAVE_FAILED(2511, "该委托方已存在，请重新选择"),
+    DUPLICATE_LOCATION_NO(2512, "地点编号已存在"),
 
     /**
      * 计量检定业务模块
@@ -68,6 +69,8 @@
     COMPLETE_SAMPLE_NOT_EXIST(2609, "检测中不存在扫描收入的样品"),
     CANNOT_CHANGE_MEASURE_INFO(2610, "无法更改非当前登录用户的检测信息"),
     NON_EXIST_ORDER_OR_SAMPLE(2611, "不存在该委托单或该委托单下的样品"),
+    OUTSOURCE_ACCESS_SAVE_FAILED(2612, "测试、校准或检定工作分包评审表保存至草稿箱失败"),
+    OUTSOURCE_PROTOCOL_SAVE_FAILED(2613, "测试、校准或检定工作分包协议书保存至草稿箱失败"),
 
     /**
      * 历史遗留备用
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
index 5089ad1..81a406b 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
@@ -10,54 +10,38 @@
     /**
      * 资源管理
      */
-    ENVIRONMENT_DATA_EXPORT("environmentData", "environmentData", "环境记录单数据"),
+    ENVIRONMENT_DATA_EXPORT("environmentData", "环境记录单数据", "环境记录单数据"),
+    STAFF_INFO("staffInfo", "人员登记", "人员登记"),
+    STAFF_CERTIFICATE_EXPIRE("certificateExpire", "证书逾期提醒", "证书逾期提醒"),
+    SUPPLIER_INFO("supplierInfo", "合格供方名录", "合格供方名录"),
+    CUSTOMER_INFO("customerInfo", "委托方名录", "委托方名录"),
+    CUSTOMER_SUGGEST_FORM("customerSuggestForm", "委托方意见登记表", "委托方意见登记表"),
+    SEAL_NOTE("sealNote", "印章使用登记", "印章使用登记"),
 
-    FILE_EXPORT("meterFileData", "meterFileData", "计量文件信息"),
-    TRAIN_PLAN_EXPORT("trainPlanData", "trainPlanData", "培训计划"),
-    TRAIN_LOG_EXPORT("trainLogData", "trainLogData", "培训记录"),
-    METER_ORGANIZE_EXPORT("meterOrganizeData", "meterOrganizeData", "计量组织"),
-    TRACE_SUPPLIER_EXPORT("traceSupplierData", "traceSupplierData", "溯源供方"),
-    SIGN_EXPORT("signData", "signData", "签名/签章"),
-    TEMPLATE_EXPORT("templateData", "templateData", "原始记录模板/证书报告模板"),
-    FIXED_ASSETS("meterFixedAssets", "meterFixedAssets", "固定资产"),
-    METER_EQUIPMENT("meterEquipment", "meterEquipment", "测量设备"),
-    CALIBRATION_TEST_EQUIPMENT("calibrationTestEquipment", "calibrationTestEquipment", "校准检定设备"),
-    MEASURE_ACCOUNT("measureAccount", "measureAccount", "测量工装"),
-    STANDARD_SUPPORT_EQUIPMENT("standardSupportEquipment", "standardSupportEquipment", "标准配套设备"),
-    STANDARD_EQUIPMENT("standardEquipment", "standardEquipment", "标准装置"),
-    FLOW_DEF_EXPORT("flowDefData", "flowDefData", "流程定义"),
-    STAFF_CERTIFICATE("certificate", "certificate", "计量人员证书"),
-    CHECK_INFO("checkInfo", "checkInfo", "设备管理点检测"),
-    EQUIPMENT_APPLY("equipmentApply", "equipmentApply", "设备借用"),
-    STANDARD_EQUIPMENT_REMIND("equipmentApplyRemind", "equipmentApplyRemind", "标准装置到期提醒"),
-    METER_PRICE("meterPrice", "meterPrice", "价格库"),
-    METER_STAFF("meterStaff", "meterStaff", "计量人员"),
-    STANDARD_EQUIPMENT_APPLY("standardEquipmentApply", "standardEquipmentApply", "标准装置申请"),
-    STATE_MANAGE_APPLY("stateManage", "stateManage", "状态管理"),
-    METER_ACCEPTANCE_CHECK("acceptanceCheck", "acceptanceCheck", "设备检修保养验收单"),
-    CUSTOMER_EXPORT("customerData", "customerData", "客户信息"),
-    ORDER_EXPORT("orderData", "orderData", "委托书信息"),
-    SAMPLE_EXPORT("sampleData", "sampleData", "样本信息"),
-    EXCHANGE_DATA("exchangeData", "exchangeData", "设备交接单"),
-    DISPATCH_DATA("dispatchData", "dispatchData", "设备收发"),
-    ENVIRONMENT_DATA("environmentData", "environmentData", "环境记录单"),
-    ORIGIN_DATA("originData", "originData", "原始记录"),
-    CERTIFICATE_REPORT("certificateReport", "certificateReport", "证书报告"),
-    ADVICE_EXPORT("adviceData", "adviceData", "客户反馈"),
-    HANDOUT_EXPORT("handoutData", "handoutData", "任务分发列表"),
-    OUTSOURCER_EXPORT("outsourcerData", "outsourcerData", "分包方"),
-    SITE_EXECUTIVE_EXPORT("siteExecutiveData", "siteExecutiveData", "现场测试、校准或检定"),
-    CERTIFICATE_PRINT_EXPORT("certificatePrintData", "certificatePrintData", "证书打印"),
-    DOWNLOAD_TEMPLATE("downloadTemplate", "downloadTemplate", "页面配置"),
-    OUTSOURCER_CERTIFICATE_EXPORT("outsourceCertificateData", "outsourceCertificateData", "分包证书"),
-    SETTLEMENT_INFO_EXPORT("settlementInfoData", "settlementInfoData", "业务结算"),
-    EQUIPMENT_REMIND("equipmentRemind", "equipmentRemind", "设备到期提醒"),
-    AGREEMENT_INFO_EXPORT("agreementInfoData", "agreementInfoData", "合同"),
-    WORK_STATISTICS_EXPORT("workStatisticsData", "workStatisticsData", "实时工作统计"),
-    DEPT_OUTPUT_EXPORT("deptOutputData", "deptOutputData", "部门产值分析"),
-    WORKLOAD_EXPORT("workloadData", "workloadData", "业务工作量分析"),
-    DEPT_COMPREHENSIVE_EXPORT("deptComprehensiveData", "deptComprehensiveData", "部门综合分析"),
-    ENVIRONMENTAL_RECORD("environmentalRecordData", "environmentalRecordData", "现场环境记录");
+    /**
+     * 计量检定业务
+     */
+    OUTSOURCER_EXPORT("outsourcerData", "分包方名录", "分包方名录"),
+    IDENTIFY_EXPORT("identifyData", "计量标识", "计量标识"),
+    ORDER_EXPORT("orderData", "任务单", "任务单"),
+    DISPATCH_DATA("dispatchData", "设备收发", "设备收发"),
+    HANDOUT_EXPORT("handoutData", "任务分发", "任务分发"),
+    SITE_EXECUTIVE_EXPORT("siteExecutiveData", "现场测试、校准或检定", "现场测试、校准或检定"),
+    CERTIFICATE_REPORT("certificateReport", "证书审批", "证书审批"),
+    CERTIFICATE_CHANGE_APPLY("certificateChangeApply", "证书报告补充或更换申请单", "证书报告补充或更换申请单"),
+    CERTIFICATE_PRINT("certificatePrintData", "证书打印审批", "证书打印审批"),
+    DEPT_EXECUTIVE_TASK("deptExecutiveTaskData", "实验室任务", "实验室任务"),
+    MY_EXECUTIVE_TASK("myExecutiveTaskData", "我的任务", "我的任务"),
+    OUTSOURCE_ASSESS("outsourceAssess", "测试、校准或检定工作分包评审表", "测试、校准或检定工作分包评审表"),
+    OUTSOURCE_PROTOCOL("outsourceProtocol", "测试、校准或检定工作分包协议书", "测试、校准或检定工作分包协议书"),
+
+    /**
+     * 系统管理
+     */
+    SIGN_EXPORT("signData", "签名", "签名"),
+    TEMPLATE_EXPORT("templateData", "文件模板", "文件模板"),
+    FLOW_DEF_EXPORT("flowDefData", "流程定义", "流程定义"),
+    DOWNLOAD_TEMPLATE("downloadTemplate", "流程定义", "页面配置");
 
     ExportEnum(String fileName, String sheetName, String description) {
         this.fileName = fileName;
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateRecordTypeCodeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateRecordTypeCodeEnum.java
index 31d913c..a963522 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateRecordTypeCodeEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateRecordTypeCodeEnum.java
@@ -46,4 +46,14 @@
     String SITE_EXECUTIVE_APPROVAL = "01";
     //《现场测试、校准或检定工作记录表》
     String SITE_EXECUTIVE_LOG = "02";
+
+    //测试、校准或检定工作分包协议书
+    String OUTSOURCE_PROTOCOL = "01";
+    //测试、校准或检定工作分包评审表
+    String OUTSOURCE_ACCESS = "02";
+    //测试、校准或检定工作分包通知书
+    String OUTSOURCE_NOTICE = "03";
+    //测试、校准或检定工作分包方名录
+    String OUTSOURCE_INFO = "04";
+
 }
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
index 24b8635..f78bd53 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
@@ -15,6 +15,10 @@
     String CERTIFICATE_CHANGE_APPLY_BEAN_NAME = "certificateChangeApplyBean";
     //现场测试、校准或检定
     String SITE_EXECUTIVE_BEAN_NAME = "siteExecutiveBean";
+    //测试、校准或检定工作分包评审表
+    String OUTSOURCE_ASSESS_BEAN_NAME = "outsourceAssessBean";
+    //测试、校准或检定工作分包协议书
+    String OUTSOURCE_PROTOCOL_BEAN_NAME = "outsourceProtocolBean";
 
     /*********************************设备与装置************************************/
     //设备台账
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 b21c661..6b86fd1 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
@@ -18,6 +18,8 @@
     OUTSOURCER_APPROVAL(OUTSOURCER_BEAN_NAME, ""),
     CERTIFICATE_CHANGE_APPROVAL(CERTIFICATE_CHANGE_APPLY_BEAN_NAME, ""),
     SITE_EXECUTIVE_APPROVAL(SITE_EXECUTIVE_BEAN_NAME, ""),
+    OUTSOURCE_ASSESS_APPROVAL(OUTSOURCE_ASSESS_BEAN_NAME, ""),
+    OUTSOURCE_PROTOCOL_APPROVAL(OUTSOURCE_PROTOCOL_BEAN_NAME, ""),
 
     ACTION_STATUS_MAP(new HashMap<String, AwareActionStatusEnum>() {
         {
@@ -47,6 +49,10 @@
             put(ApplyFromIdEnum.CERTIFICATE_CHANGE_APPROVAL.getCode(), CERTIFICATE_CHANGE_APPROVAL);
             //现场测试、校准或检定审批
             put(ApplyFromIdEnum.SITE_EXECUTIVE_APPROVAL.getCode(), SITE_EXECUTIVE_APPROVAL);
+            //测试、校准或检定工作分包评审表
+            put(ApplyFromIdEnum.OUTSOURCE_ASSESS_APPROVAL.getCode(), OUTSOURCE_ASSESS_APPROVAL);
+            //测试、校准或检定工作分包协议书
+            put(ApplyFromIdEnum.OUTSOURCE_PROTOCOL_APPROVAL.getCode(), OUTSOURCE_PROTOCOL_APPROVAL);
         }
     });
     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 934405e..c7410bd 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
@@ -9,6 +9,8 @@
     CERTIFICATE_CHANGE_APPROVAL("jljdywzsbchghsqd", MessageSourceModuleEnum.BUSINESS.getCode(), "证书/报告补充或更换申请单"),
     OUTSOURCER_APPROVAL("jljdywcsjzhgfbfml", MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定合格分包方名录"),
     SITE_EXECUTIVE_APPROVAL("jljdywxccsjzsp", MessageSourceModuleEnum.BUSINESS.getCode(), "现场测试、校准或检定审批"),
+    OUTSOURCE_ASSESS_APPROVAL("jljdywcsjzfbpsb", MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包评审表"),
+    OUTSOURCE_PROTOCOL_APPROVAL("jljdywcsjzfbxys", MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包协议书"),
 
 
     /*******************************************设备与装置*********************************************/
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/GeneralApprovalMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/GeneralApprovalMapper.java
index 4fb7344..0c9d6ae 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/GeneralApprovalMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/GeneralApprovalMapper.java
@@ -17,8 +17,4 @@
 
     Page<O> selectBatchForApprovalList(Page<O> page, @Param("request") R request, @Param("businessKeys") List<String> businessKeys);
 
-//    Page<O> selectListPage(Page<O> page, @Param("request") R request);
-
-//    Long selectMaxNo();
-
 }
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceAssessMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceAssessMapper.java
index 7867bb8..ba59009 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceAssessMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceAssessMapper.java
@@ -1,7 +1,12 @@
 package com.casic.missiles.mapper.business;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.business.outsource.OutsourceAssessApprovalListRequest;
+import com.casic.missiles.mapper.GeneralApprovalMapper;
 import com.casic.missiles.model.business.BizBusinessOutsourceAssess;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * <p>
@@ -11,6 +16,10 @@
  * @author wangpeng
  * @since 2023-08-16
  */
-public interface BizBusinessOutsourceAssessMapper extends BaseMapper<BizBusinessOutsourceAssess> {
+public interface BizBusinessOutsourceAssessMapper extends GeneralApprovalMapper<BizBusinessOutsourceAssess, BizBusinessOutsourceAssess, OutsourceAssessApprovalListRequest> {
+
+    Page<BizBusinessOutsourceAssess> selectBatchForApprovalList(Page<BizBusinessOutsourceAssess> page, @Param("request") OutsourceAssessApprovalListRequest request, @Param("businessKeys") List<String> businessKeys);
+
+    Long selectMaxProjectNo();
 
 }

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java
index bb0c50f..13a699b 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java
@@ -12,6 +12,7 @@
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.IGeneralApprovalService;
+import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
@@ -19,6 +20,7 @@
 import org.springframework.web.bind.annotation.RequestBody;
 
 import javax.validation.Valid;
+import java.util.List;
 import java.util.Objects;
 
 /**
@@ -117,4 +119,17 @@
         }
         return baseApprovalService.failUpdate(request);
     }
+
+    public List<O> exportList(@RequestBody @Valid R request) throws Exception {
+        List<O> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = baseApprovalService.listExportByIds(request.getIds());
+        } else {
+            list = baseApprovalService.listExport(request);
+        }
+        for (O record : list) {
+            DictCodeUtils.convertDictCodeToName(record);
+        }
+        return list;
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java
index 8a90961..d775831 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java
@@ -5,6 +5,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.business.certificate.CertificateChangeApplyApprovalListRequest;
 import com.casic.missiles.dto.business.certificate.CertificateChangeApplySaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessCertificateChangeApply;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
@@ -20,6 +21,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -48,4 +50,12 @@
         }
         return changeApplyService.saveChangeApply(request);
     }
+
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody CertificateChangeApplyApprovalListRequest request) throws Exception {
+        List<BizBusinessCertificateChangeApply> list = super.exportList(request);
+        super.exportExcel(BizBusinessCertificateChangeApply.class, list, ExportEnum.CERTIFICATE_CHANGE_APPLY.getSheetName());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java
index 5fc4b07..af8230e 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java
@@ -9,6 +9,7 @@
 import com.casic.missiles.dto.business.certificate.CertificatePrintApprovalListRequest;
 import com.casic.missiles.dto.business.certificate.CertificatePrintListResponse;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.enums.business.CertificatePrintStatusEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessCertificatePrintLog;
@@ -18,10 +19,16 @@
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.io.IOException;
+import java.util.List;
 import java.util.Objects;
 
 /**
@@ -98,4 +105,16 @@
         });
         return certificatePrintService.certificatePrintLog(idDTO.getId());
     }
+
+    @ApiOperation("证书打印审批导出")
+    @PostMapping("/listExport")
+    public void exportList(@RequestBody CertificatePrintApprovalListRequest request) throws IOException {
+        List<CertificatePrintListResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = certificatePrintService.listByIds(request.getIds());
+        } else {
+            list = certificatePrintService.list(request);
+        }
+        super.exportExcel(CertificatePrintListResponse.class, list, ExportEnum.CERTIFICATE_PRINT.getSheetName());
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java
index 63b06dc..6b2efd5 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java
@@ -6,6 +6,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.business.certificate.CertificateReportApprovalListRequest;
 import com.casic.missiles.dto.business.certificate.CertificateReportSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessCertificateReport;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
@@ -21,6 +22,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -50,7 +52,7 @@
         return certificateReportService.saveCertificateReport(request);
     }
 
-    @ApiOperation("证书审批详情（基本信息）")
+    @ApiOperation("详情（基本信息）")
     @PostMapping("/detail")
     public ReturnDTO<BizBusinessCertificateReport> detail(@RequestBody @Valid BaseDetailRequest request, BindingResult bindingResult) throws Exception {
         if(bindingResult.hasErrors()){
@@ -59,4 +61,11 @@
         return certificateReportService.detail(request);
     }
 
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody CertificateReportApprovalListRequest request) throws Exception {
+        List<BizBusinessCertificateReport> list = super.exportList(request);
+        super.exportExcel(BizBusinessCertificateReport.class, list, ExportEnum.CERTIFICATE_REPORT.getSheetName());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java
index 46b26bd..57c0809 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java
@@ -10,20 +10,21 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.business.identify.IdentifyListRequest;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessIdentifyInfo;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.business.IBizBusinessIdentifyInfoService;
+import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import javax.validation.Valid;
+import java.util.List;
 import java.util.Objects;
 
 /**
@@ -57,16 +58,13 @@
         return identifyInfoService.addIdentify(identifyInfo);
     }
 
-    @ApiOperation("标识打印更新")
+    @ApiOperation("标识打印更新（更新打印时间）")
     @PostMapping("/update")
-    public ReturnDTO updateIdentify(@RequestBody @Valid BizBusinessIdentifyInfo identifyInfo, BindingResult bindingResult) {
-        Assert.isFalse(Objects.isNull(identifyInfo.getId()), () -> {
+    public ReturnDTO updateIdentify(@RequestBody @Valid IdDTO idDTO) {
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        Assert.isFalse(bindingResult.hasErrors(), () -> {
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        });
-        return identifyInfoService.updateIdentify(identifyInfo);
+        return identifyInfoService.updateIdentify(idDTO.getId());
     }
 
     @ApiOperation("标识打印删除")
@@ -77,4 +75,37 @@
         });
         return identifyInfoService.deleteIdentify(idDTO.getId());
     }
+
+    @ApiOperation("标识打印导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody @Valid IdentifyListRequest request, BindingResult bindingResult) throws Exception {
+        if (bindingResult.hasErrors()) {
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        List<BizBusinessIdentifyInfo> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = identifyInfoService.listByIds(request.getIds());
+        } else {
+            list = identifyInfoService.list(request);
+        }
+        for (BizBusinessIdentifyInfo record : list) {
+            DictCodeUtils.convertDictCodeToName(record);
+        }
+        super.exportExcel(BizBusinessIdentifyInfo.class, list, ExportEnum.IDENTIFY_EXPORT.getSheetName());
+    }
+
+
+    // TODO: 2023/8/23 查询设备信息，4个底部按钮查设备（按钮的作用就是前端用来调不同接口、用来区分中间即将展示的标识），前端弹窗选设备，在确定保存时前端根据底部按钮判断传入设备类型deviceType字典code
+    // TODO: 2023/8/23 接口：查受检设备（第1个按钮），查设备台账（后3个按钮同一接口），查询之后前端根据标志类型的不同加到中间页面时进行判断（按产品给的对应表）
+    // TODO: 2023/8/23 提供二维码接口，前端在加到中间页面时调用一下
+
+    @ApiOperation("设备二维码")
+    @PostMapping("/equipment/qrCode")
+    public ReturnDTO<String> equipmentQrCode(@RequestBody @Valid IdDTO idDTO) {
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return identifyInfoService.equipmentQrCode(idDTO.getId());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java
index 707be6e..7e0453d 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java
@@ -117,7 +117,7 @@
     }
 
     @ApiOperation("任务单导出")
-    @PostMapping("/export")
+    @PostMapping("/listExport")
     public void orderExport(@RequestBody @Valid OrderListRequest request, HttpServletResponse response) {
         businessOrderService.orderExport(request, response);
     }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java
index 529a6ce..51432be 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java
@@ -1,9 +1,28 @@
 package com.casic.missiles.controller.business;
 
+import com.casic.missiles.controller.GeneralApprovalController;
+import com.casic.missiles.dto.BaseApprovalSubmitRequest;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.business.outsource.OutsourceAssessApprovalListRequest;
+import com.casic.missiles.dto.business.outsource.OutsourceAssessSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
+import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.model.business.BizBusinessOutsourceAssess;
+import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
+import com.casic.missiles.service.IGeneralApprovalService;
+import com.casic.missiles.service.business.IBizBusinessOutsourceAssessService;
 import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.BindingResult;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.validation.Valid;
+import java.util.List;
+
 /**
  * <p>
  * 计量检定业务-分包管理-测试、校准或检定工作分包评审表 前端控制器
@@ -15,6 +34,27 @@
 @Api(tags = "分包管理-测试、校准或检定工作分包评审表")
 @RestController
 @RequestMapping("/business/outsource/assess")
-public class BizBusinessOutsourceAssessController {
+public class BizBusinessOutsourceAssessController extends GeneralApprovalController<BizBusinessOutsourceAssess, BizBusinessOutsourceAssess, OutsourceAssessApprovalListRequest, BaseApprovalSubmitRequest> {
+    @Autowired
+    private IBizBusinessOutsourceAssessService outsourceAssessService;
 
+    public BizBusinessOutsourceAssessController(IGeneralApprovalService<BizBusinessOutsourceAssess, BizBusinessOutsourceAssess, OutsourceAssessApprovalListRequest, BaseApprovalSubmitRequest> baseApprovalService) {
+        super(baseApprovalService);
+    }
+
+    @ApiOperation("草稿箱-保存")
+    @PostMapping("/save")
+    public ReturnDTO<OutsourceAssessSaveResponse> saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceAssess request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        return outsourceAssessService.saveOutsourceAssess(request);
+    }
+
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception {
+        List<BizBusinessOutsourceAssess> list = super.exportList(request);
+        super.exportExcel(BizBusinessOutsourceAssess.class, list, ExportEnum.OUTSOURCE_ASSESS.getSheetName());
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java
new file mode 100644
index 0000000..9adef18
--- /dev/null
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java
@@ -0,0 +1,60 @@
+package com.casic.missiles.controller.business;
+
+import com.casic.missiles.controller.GeneralApprovalController;
+import com.casic.missiles.dto.BaseApprovalSubmitRequest;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.business.outsource.OutsourceProtocolApprovalListRequest;
+import com.casic.missiles.dto.business.outsource.OutsourceProtocolSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
+import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.model.business.BizBusinessOutsourceProtocol;
+import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
+import com.casic.missiles.service.IGeneralApprovalService;
+import com.casic.missiles.service.business.IBizBusinessOutsourceProtocolService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.BindingResult;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.validation.Valid;
+import java.util.List;
+
+/**
+ * <p>
+ * 计量检定业务-分包管理-测试、校准或检定工作分包协议书 前端控制器
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-08-24
+ */
+@Api(tags = "分包管理-测试、校准或检定工作分包协议书")
+@RestController
+@RequestMapping("/business/outsource/protocol")
+public class BizBusinessOutsourceProtocolController extends GeneralApprovalController<BizBusinessOutsourceProtocol, BizBusinessOutsourceProtocol, OutsourceProtocolApprovalListRequest, BaseApprovalSubmitRequest> {
+    @Autowired
+    private IBizBusinessOutsourceProtocolService outsourceProtocolService;
+
+    public BizBusinessOutsourceProtocolController(IGeneralApprovalService<BizBusinessOutsourceProtocol, BizBusinessOutsourceProtocol, OutsourceProtocolApprovalListRequest, BaseApprovalSubmitRequest> baseApprovalService) {
+        super(baseApprovalService);
+    }
+
+    @ApiOperation("草稿箱-保存")
+    @PostMapping("/save")
+    public ReturnDTO<OutsourceProtocolSaveResponse> saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceProtocol request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        return outsourceProtocolService.saveOutsourceProtocol(request);
+    }
+
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody OutsourceProtocolApprovalListRequest request) throws Exception {
+        List<BizBusinessOutsourceProtocol> list = super.exportList(request);
+        super.exportExcel(BizBusinessOutsourceProtocol.class, list, ExportEnum.OUTSOURCE_PROTOCOL.getSheetName());
+    }
+}
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java
index 097f645..f0f0943 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java
@@ -17,7 +17,6 @@
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.IGeneralApprovalService;
 import com.casic.missiles.service.business.IBizBusinessOutsourcerInfoService;
-import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -71,19 +70,8 @@
 
     @ApiOperation("分包方导出")
     @PostMapping("/listExport")
-    public void export(@RequestBody @Valid OutsourcerInfoApprovalListRequest request, BindingResult bindingResult) throws Exception {
-        if (bindingResult.hasErrors()) {
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        }
-        List<BizBusinessOutsourcerInfo> list;
-        if (!CollectionUtils.isEmpty(request.getIds())) {
-            list = outsourcerInfoService.listByIds(request.getIds());
-        } else {
-            list = outsourcerInfoService.list(request);
-        }
-        for (BizBusinessOutsourcerInfo record : list) {
-            DictCodeUtils.convertDictCodeToName(record);
-        }
+    public void export(@RequestBody OutsourcerInfoApprovalListRequest request) throws Exception {
+        List<BizBusinessOutsourcerInfo> list = super.exportList(request);
         super.exportExcel(BizBusinessOutsourcerInfo.class, list, ExportEnum.OUTSOURCER_EXPORT.getSheetName());
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java
index c2cbf9f..0410918 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java
@@ -17,11 +17,9 @@
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.IGeneralApprovalService;
 import com.casic.missiles.service.business.IBizBusinessSiteExecutiveInfoService;
-import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -60,7 +58,7 @@
         return siteExecutiveInfoService.saveSiteExecutiveInfo(siteExecutiveInfo);
     }
 
-    @ApiOperation("现场检测详情")
+    @ApiOperation("详情")
     @PostMapping("/detail")
     public ReturnDTO<SiteExecutiveDetailResponse> siteExecutiveDetail(@RequestBody @Valid IdDTO idDTO) throws Exception {
         Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
@@ -69,21 +67,10 @@
         return ReturnUtil.success(siteExecutiveInfoService.detail(idDTO.getId()));
     }
 
-    @ApiOperation("现场检测导出")
+    @ApiOperation("导出")
     @PostMapping("/listExport")
-    public void export(@RequestBody @Valid SiteExecutiveApprovalListRequest request, BindingResult bindingResult) throws Exception {
-        if (bindingResult.hasErrors()) {
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        }
-        List<SiteExecutiveApprovalListResponse> list;
-        if (!CollectionUtils.isEmpty(request.getIds())) {
-            list = siteExecutiveInfoService.listInfoByIds(request.getIds());
-        } else {
-            list = siteExecutiveInfoService.listInfo(request);
-        }
-        for (SiteExecutiveApprovalListResponse record : list) {
-            DictCodeUtils.convertDictCodeToName(record);
-        }
+    public void export(@RequestBody SiteExecutiveApprovalListRequest request) throws Exception {
+        List<SiteExecutiveApprovalListResponse> list = super.exportList(request);
         super.exportExcel(SiteExecutiveApprovalListResponse.class, list, ExportEnum.SITE_EXECUTIVE_EXPORT.getSheetName());
     }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
index 7e793cd..a92e209 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
@@ -55,7 +55,7 @@
 
     @ApiOperation("设备收发列表导出")
     @PostMapping("/export")
-    public void exportList(@RequestBody @Valid SampleDispatchListRequest request) throws IOException {
+    public void exportList(@RequestBody SampleDispatchListRequest request) throws IOException {
         List<SampleDispatchListResponse> list;
         if (!CollectionUtils.isEmpty(request.getIds())) {
             list = dispatchService.listByIds(request.getIds());
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java
index cdc77fc..d120fd4 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java
@@ -7,6 +7,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.business.labExecutive.*;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.business.IBusinessLabExecutiveInfoService;
@@ -14,6 +15,7 @@
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.*;
 
@@ -32,7 +34,7 @@
     @Autowired
     private IBusinessLabExecutiveInfoService labExecutiveInfoService;
 
-    @ApiOperation("实验室检测-部门检测-查询各状态列表（待检测、检测中、检测完）")
+    @ApiOperation("实验室任务-查询各状态列表（待检测、检测中、检测完）")
     @PostMapping("/deptExecutive/List")
     public ReturnDTO<PageInfoBT<SampleLabExecutiveListResponse>> queryDeptExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
@@ -43,10 +45,19 @@
         return ReturnUtil.success(super.packForBT(labExecutiveInfoService.deptLabExecutiveListPage(page, labExecutiveListRequest)));
     }
 
-    /**
-     * 实验室检测-我的检测-查询各状态列表（待检测、检测中、检测完）
-     */
-    @ApiOperation("实验室检测-我的检测-查询各状态列表（待检测、检测中、检测完）")
+    @ApiOperation("实验室任务导出")
+    @PostMapping("/deptExecutive/export")
+    public void deptExportList(@RequestBody @Valid SampleLabExecutiveListRequest request) throws Exception {
+        List<SampleLabExecutiveListResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = labExecutiveInfoService.deptLabExecutiveListByIds(request.getMeasureStatus(), request.getIds());
+        } else {
+            list = labExecutiveInfoService.deptLabExecutiveList(request);
+        }
+        super.exportExcel(SampleLabExecutiveListResponse.class, list, ExportEnum.DEPT_EXECUTIVE_TASK.getSheetName());
+    }
+
+    @ApiOperation("我的任务-查询各状态列表（待检测、检测中、检测完）")
     @PostMapping("/myExecutive/list")
     public ReturnDTO<PageInfoBT<SampleLabExecutiveListResponse>> queryMyExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
@@ -57,19 +68,25 @@
         return ReturnUtil.success(super.packForBT(labExecutiveInfoService.myLabExecutiveListPage(page, labExecutiveListRequest)));
     }
 
-    /**
-     * 实验室检测-我的检测-查询各状态样品数量（待检测、检测中、检测完）
-     */
-    @ApiOperation("实验室检测-我的检测-查询各状态样品数量（待检测、检测中、检测完）")
+    @ApiOperation("我的任务导出")
+    @PostMapping("/myExecutive/export")
+    public void exportList(@RequestBody @Valid SampleLabExecutiveListRequest request) throws Exception {
+        List<SampleLabExecutiveListResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = labExecutiveInfoService.myLabExecutiveListByIds(request.getMeasureStatus(), request.getIds());
+        } else {
+            list = labExecutiveInfoService.myLabExecutiveList(request);
+        }
+        super.exportExcel(SampleLabExecutiveListResponse.class, list, ExportEnum.MY_EXECUTIVE_TASK.getSheetName());
+    }
+
+    @ApiOperation("我的任务-查询各状态样品数量（待检测、检测中、检测完）")
     @GetMapping("/myExecutive/amount")
     public ReturnDTO<List<SampleAmountResponse>> queryMyExecutiveAmount() {
         return ReturnUtil.success(labExecutiveInfoService.myExecutiveAmount());
     }
 
-    /**
-     * 实验室检测-部门检测-分配（分配给具体人员）
-     */
-    @ApiOperation("实验室检测-部门检测-分配按钮（分配给具体人员）")
+    @ApiOperation("实验室任务-分配按钮（分配给具体人员）")
     @PostMapping("/deptExecutive/allocate")
     public ReturnDTO allocateStaff(@RequestBody @Valid SampleAllocateRequest sampleAllocateRequest, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -78,10 +95,7 @@
         return labExecutiveInfoService.allocateStaff(sampleAllocateRequest);
     }
 
-    /**
-     * 实验室检测-我的检测-检定人扫描收入（待检测->检测中）
-     */
-    @ApiOperation("实验室检测-我的检测-检定人扫描收入（待检测->检测中）")
+    @ApiOperation("我的任务-检定人扫描收入（待检测->检测中）")
     @PostMapping("/myExecutive/receive")
     public ReturnDTO sampleReceive(@RequestBody @Valid List<SampleOperateRequest> requestList, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -90,10 +104,7 @@
         return labExecutiveInfoService.sampleReceive(requestList);
     }
 
-    /**
-     * 实验室检测-负责人/检定人扫描检完（检测中->检测完）
-     */
-    @ApiOperation("实验室检测-负责人/检定人扫描检完（检测中->检测完）")
+    @ApiOperation("实验室任务-负责人/检定人扫描检完（检测中->检测完）")
     @PostMapping("/myExecutive/complete")
     public ReturnDTO sampleExecutiveComplete(@RequestBody @Valid List<SampleOperateRequest> requestList, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -102,10 +113,7 @@
         return labExecutiveInfoService.sampleExecutiveComplete(requestList);
     }
 
-    /**
-     * 实验室检测-部门检测/我的检测 编辑（只能修改应出具证书）
-     */
-    @ApiOperation("实验室检测-部门检测/我的检测 编辑（只能修改应出具证书）")
+    @ApiOperation("实验室任务/我的任务 编辑（只能修改应出具证书）")
     @PostMapping("/executive/update")
     public ReturnDTO updateExecutive(@RequestBody @Valid UpdateExecutiveRequest request, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -114,10 +122,7 @@
         return labExecutiveInfoService.updateExecutive(request);
     }
 
-    /**
-     * 实验室检测-部门检测/我的检测 详情
-     */
-    @ApiOperation("实验室检测-部门检测/我的检测 详情")
+    @ApiOperation("实验室任务/我的任务 详情")
     @PostMapping("/executive/detail")
     public ReturnDTO<ExecutiveDetailResponse> executiveDetail(@RequestBody @Valid ExecutiveDetailRequest request, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
@@ -131,7 +136,7 @@
      * 退回后会将下一个要执行的实验室检测状态更新为待分配，将后面的实验室顺序变更为连续（都进行减1）
      * 最后一个检测的实验室退回，等分发员再增加实验室或设备收发中的已收入直接手动点击完成
      */
-    @ApiOperation("实验室检测-部门检测/我的检测 退回（待检测/检测中->退回）")
+    @ApiOperation("实验室任务/我的任务 退回（待检测/检测中->退回）")
     @PostMapping("/executive/sendBack")
     public ReturnDTO executiveSendBack(@RequestBody @Valid ExecutiveSendBackRequest request, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -140,9 +145,6 @@
         return labExecutiveInfoService.sampleExecutiveSendBack(request);
     }
 
-    /**
-     * 分发员编辑实验室检测列表
-     */
     @ApiOperation("分发员编辑实验室检测列表")
     @PostMapping("/handOut/updateList")
     public ReturnDTO updateExecutiveList(@RequestBody @Valid UpdateExecutiveListRequest request, BindingResult bindingResult) {
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java
index 48a67ed..0c04f31 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java
@@ -10,6 +10,7 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.resource.customer.CustomerApprovalListRequest;
 import com.casic.missiles.dto.resource.customer.CustomerSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceCustomerInfo;
@@ -26,6 +27,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -55,6 +57,13 @@
         return customerInfoService.saveCustomerInfo(request);
     }
 
+    @ApiOperation("委托方名录导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody CustomerApprovalListRequest request) throws Exception {
+        List<BizResourceCustomerInfo> list = super.exportList(request);
+        super.exportExcel(BizResourceCustomerInfo.class, list, ExportEnum.CUSTOMER_INFO.getSheetName());
+    }
+
     @ApiOperation("委托方人员列表（分页）")
     @PostMapping("/person/listPage")
     public ReturnDTO<PageInfoBT<BizResourceCustomerStaff>> personListPage(@RequestBody IdDTO idDto) {
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
index 972ed4b..6418ea5 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
@@ -5,6 +5,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.resource.customer.SuggestFormApprovalListRequest;
 import com.casic.missiles.dto.resource.customer.SuggestFormSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceCustomerSuggestForm;
@@ -20,6 +21,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -50,4 +52,11 @@
         return suggestFormService.saveSuggestForm(request);
     }
 
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody SuggestFormApprovalListRequest request) throws Exception {
+        List<BizResourceCustomerSuggestForm> list = super.exportList(request);
+        super.exportExcel(BizResourceCustomerSuggestForm.class, list, ExportEnum.CUSTOMER_SUGGEST_FORM.getSheetName());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java
index 1934d1a..9e07eab 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java
@@ -15,12 +15,16 @@
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.resource.IEnvEnvironmentRecordConfigService;
 import com.casic.missiles.service.resource.IEnvEnvironmentRecordDataService;
+import com.casic.missiles.service.resource.IEnvLocationInfoService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
 import java.util.List;
@@ -39,6 +43,8 @@
     private IEnvEnvironmentRecordDataService environmentRecordDataService;
     @Autowired
     private IEnvEnvironmentRecordConfigService environmentRecordConfigService;
+    @Autowired
+    private IEnvLocationInfoService locationInfoService;
 
     @ApiOperation("环境记录单数据列表/详情")
     @PostMapping("/data/listPage")
@@ -95,4 +101,11 @@
         });
         return environmentRecordConfigService.deleteEnvironmentRecordConfig(idDTO.getId());
     }
+
+    @ApiOperation("地点列表")
+    @PostMapping("/location/listPage")
+    public ReturnDTO<PageInfoBT<LocationListResponse>> locationListPage(@RequestBody @Valid LocationListRequest request) {
+        Page<LocationListResponse> page = PageFactory.defaultPage();
+        return ReturnUtil.success(super.packForBT(locationInfoService.listPage(page, request)));
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java
index 82efe3f..e9561fa 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java
@@ -10,6 +10,7 @@
 import com.casic.missiles.dto.resource.seal.SealLogListRequest;
 import com.casic.missiles.dto.resource.seal.SealNoteApprovalListRequest;
 import com.casic.missiles.dto.resource.seal.SealNoteSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceSealUseLog;
@@ -27,6 +28,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -58,6 +60,13 @@
         return sealUseNoteService.saveSeal(request);
     }
 
+    @ApiOperation("印章使用登记导出（列表和导出中去掉经办人和监印人）")
+    @PostMapping("/listExport")
+    public void export(@RequestBody SealNoteApprovalListRequest request) throws Exception {
+        List<BizResourceSealUseNote> list = super.exportList(request);
+        super.exportExcel(BizResourceSealUseNote.class, list, ExportEnum.SEAL_NOTE.getSheetName());
+    }
+
     // TODO: 2023/7/28 印章使用日志：系统中使用印章时插入数据库
 
     @ApiOperation("印章使用日志列表（分页）")
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java
index 9b674fc..06b6521 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java
@@ -9,16 +9,20 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.resource.staff.StaffCertRequest;
 import com.casic.missiles.dto.resource.staff.StaffCertResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.service.resource.IBizResourceStaffInfoService;
 import com.casic.missiles.service.resource.IBizResourceStaffVerifierService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.List;
+
 /**
  * @Description:
  * @Author: wangpeng
@@ -41,9 +45,21 @@
         return ReturnUtil.success(super.packForBT(responsePage));
     }
 
+    @ApiOperation("证书逾期提醒导出")
+    @PostMapping("/listExport")
+    public void exportList(@RequestBody StaffCertRequest request) throws Exception {
+        List<StaffCertResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = staffInfoService.certListByIds(request.getIds());
+        } else {
+            list = staffInfoService.certList(request);
+        }
+        super.exportExcel(StaffCertResponse.class, list, ExportEnum.STAFF_CERTIFICATE_EXPIRE.getSheetName());
+    }
+
     @ApiOperation("证书逾期提醒")
     @PostMapping("/expirationReminder")
-    public ReturnDTO expirationReminder(@RequestBody IdDTO idDto) {
-        return verifierService.expirationReminder(idDto);
+    public ReturnDTO expirationReminder(@RequestBody IdDTO idDTO) {
+        return verifierService.expirationReminder(idDTO);
     }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java
index 3b251ad..a6e7850 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java
@@ -12,6 +12,7 @@
 import com.casic.missiles.dto.resource.staff.StaffListRequest;
 import com.casic.missiles.dto.resource.staff.TrainListRequest;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.*;
@@ -22,7 +23,10 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
 import java.util.List;
@@ -52,8 +56,19 @@
             throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
         }
         Page<BizResourceStaffInfo> page = PageFactory.defaultPage();
-        Page<BizResourceStaffInfo> responsePage = staffInfoService.listPage(page, request);
-        return ReturnUtil.success(super.packForBT(responsePage));
+        return ReturnUtil.success(super.packForBT(staffInfoService.listPage(page, request)));
+    }
+
+    @ApiOperation("人员登记导出")
+    @PostMapping("/listExport")
+    public void exportList(@RequestBody StaffListRequest request) throws Exception {
+        List<BizResourceStaffInfo> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = staffInfoService.listByIds(request.getIds());
+        } else {
+            list = staffInfoService.list(request);
+        }
+        super.exportExcel(BizResourceStaffInfo.class, list, ExportEnum.STAFF_INFO.getSheetName());
     }
 
     @ApiOperation("人员登记详情基础信息")
@@ -85,9 +100,9 @@
 
     @ApiOperation("科研教育列表（分页）")
     @PostMapping("/education/listPage")
-    public ReturnDTO<PageInfoBT<BizResourceStaffEducation>> educationListPage(@RequestBody IdDTO idDto) {
+    public ReturnDTO<PageInfoBT<BizResourceStaffEducation>> educationListPage(@RequestBody IdDTO idDTO) {
         Page<BizResourceStaffEducation> page = PageFactory.defaultPage();
-        Page<BizResourceStaffEducation> responsePage = staffInfoService.educationListPage(page, idDto);
+        Page<BizResourceStaffEducation> responsePage = staffInfoService.educationListPage(page, idDTO);
         return ReturnUtil.success(super.packForBT(responsePage));
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java
index af6aa86..d85d84a 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java
@@ -9,6 +9,7 @@
 import com.casic.missiles.dto.resource.outsideService.SupplierApprovalListRequest;
 import com.casic.missiles.dto.resource.outsideService.SupplierSaveResponse;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceSupplierAbility;
@@ -67,6 +68,13 @@
         return ReturnUtil.success(supplierInfoService.detail(idDTO.getId()));
     }
 
+    @ApiOperation("合格供方导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody SupplierApprovalListRequest request) throws Exception {
+        List<BizResourceSupplierInfo> list = super.exportList(request);
+        super.exportExcel(BizResourceSupplierInfo.class, list, ExportEnum.SUPPLIER_INFO.getSheetName());
+    }
+
     @ApiOperation("供方人员列表（分页）")
     @PostMapping("/person/listPage")
     public ReturnDTO<PageInfoBT<BizResourceSupplierPerson>> personListPage(@RequestBody IdDTO idDTO) {
diff --git a/casic-metering-api/src/main/resources/config/application.yml b/casic-metering-api/src/main/resources/config/application.yml
index 350db5f..ecff521 100644
--- a/casic-metering-api/src/main/resources/config/application.yml
+++ b/casic-metering-api/src/main/resources/config/application.yml
@@ -126,7 +126,7 @@
     #作者
     author: wangpeng
     #待生成对象表名
-    table-name: biz_equipment_technical_target_approval,biz_equipment_attachment_approval,biz_equipment_checkpoint_approval
+    table-name: biz_business_outsource_protocol
 
 reminder:
   #节点--common模块config包 ReminderNodeConfig配置
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
index 4a19e4e..d47d552 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
@@ -53,6 +53,7 @@
     SUGGEST_FORM_SAVE_FAILED(2509, "委托方意见登记表保存至草稿箱失败"),
     EXAMINE_FORM_SAVE_FAILED(2510, "要求、委托书及合同评审表保存至草稿箱失败"),
     CUSTOMER_EXIST_SAVE_FAILED(2511, "该委托方已存在，请重新选择"),
+    DUPLICATE_LOCATION_NO(2512, "地点编号已存在"),
 
     /**
      * 计量检定业务模块
@@ -68,6 +69,8 @@
     COMPLETE_SAMPLE_NOT_EXIST(2609, "检测中不存在扫描收入的样品"),
     CANNOT_CHANGE_MEASURE_INFO(2610, "无法更改非当前登录用户的检测信息"),
     NON_EXIST_ORDER_OR_SAMPLE(2611, "不存在该委托单或该委托单下的样品"),
+    OUTSOURCE_ACCESS_SAVE_FAILED(2612, "测试、校准或检定工作分包评审表保存至草稿箱失败"),
+    OUTSOURCE_PROTOCOL_SAVE_FAILED(2613, "测试、校准或检定工作分包协议书保存至草稿箱失败"),
 
     /**
      * 历史遗留备用
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
index 5089ad1..81a406b 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
@@ -10,54 +10,38 @@
     /**
      * 资源管理
      */
-    ENVIRONMENT_DATA_EXPORT("environmentData", "environmentData", "环境记录单数据"),
+    ENVIRONMENT_DATA_EXPORT("environmentData", "环境记录单数据", "环境记录单数据"),
+    STAFF_INFO("staffInfo", "人员登记", "人员登记"),
+    STAFF_CERTIFICATE_EXPIRE("certificateExpire", "证书逾期提醒", "证书逾期提醒"),
+    SUPPLIER_INFO("supplierInfo", "合格供方名录", "合格供方名录"),
+    CUSTOMER_INFO("customerInfo", "委托方名录", "委托方名录"),
+    CUSTOMER_SUGGEST_FORM("customerSuggestForm", "委托方意见登记表", "委托方意见登记表"),
+    SEAL_NOTE("sealNote", "印章使用登记", "印章使用登记"),
 
-    FILE_EXPORT("meterFileData", "meterFileData", "计量文件信息"),
-    TRAIN_PLAN_EXPORT("trainPlanData", "trainPlanData", "培训计划"),
-    TRAIN_LOG_EXPORT("trainLogData", "trainLogData", "培训记录"),
-    METER_ORGANIZE_EXPORT("meterOrganizeData", "meterOrganizeData", "计量组织"),
-    TRACE_SUPPLIER_EXPORT("traceSupplierData", "traceSupplierData", "溯源供方"),
-    SIGN_EXPORT("signData", "signData", "签名/签章"),
-    TEMPLATE_EXPORT("templateData", "templateData", "原始记录模板/证书报告模板"),
-    FIXED_ASSETS("meterFixedAssets", "meterFixedAssets", "固定资产"),
-    METER_EQUIPMENT("meterEquipment", "meterEquipment", "测量设备"),
-    CALIBRATION_TEST_EQUIPMENT("calibrationTestEquipment", "calibrationTestEquipment", "校准检定设备"),
-    MEASURE_ACCOUNT("measureAccount", "measureAccount", "测量工装"),
-    STANDARD_SUPPORT_EQUIPMENT("standardSupportEquipment", "standardSupportEquipment", "标准配套设备"),
-    STANDARD_EQUIPMENT("standardEquipment", "standardEquipment", "标准装置"),
-    FLOW_DEF_EXPORT("flowDefData", "flowDefData", "流程定义"),
-    STAFF_CERTIFICATE("certificate", "certificate", "计量人员证书"),
-    CHECK_INFO("checkInfo", "checkInfo", "设备管理点检测"),
-    EQUIPMENT_APPLY("equipmentApply", "equipmentApply", "设备借用"),
-    STANDARD_EQUIPMENT_REMIND("equipmentApplyRemind", "equipmentApplyRemind", "标准装置到期提醒"),
-    METER_PRICE("meterPrice", "meterPrice", "价格库"),
-    METER_STAFF("meterStaff", "meterStaff", "计量人员"),
-    STANDARD_EQUIPMENT_APPLY("standardEquipmentApply", "standardEquipmentApply", "标准装置申请"),
-    STATE_MANAGE_APPLY("stateManage", "stateManage", "状态管理"),
-    METER_ACCEPTANCE_CHECK("acceptanceCheck", "acceptanceCheck", "设备检修保养验收单"),
-    CUSTOMER_EXPORT("customerData", "customerData", "客户信息"),
-    ORDER_EXPORT("orderData", "orderData", "委托书信息"),
-    SAMPLE_EXPORT("sampleData", "sampleData", "样本信息"),
-    EXCHANGE_DATA("exchangeData", "exchangeData", "设备交接单"),
-    DISPATCH_DATA("dispatchData", "dispatchData", "设备收发"),
-    ENVIRONMENT_DATA("environmentData", "environmentData", "环境记录单"),
-    ORIGIN_DATA("originData", "originData", "原始记录"),
-    CERTIFICATE_REPORT("certificateReport", "certificateReport", "证书报告"),
-    ADVICE_EXPORT("adviceData", "adviceData", "客户反馈"),
-    HANDOUT_EXPORT("handoutData", "handoutData", "任务分发列表"),
-    OUTSOURCER_EXPORT("outsourcerData", "outsourcerData", "分包方"),
-    SITE_EXECUTIVE_EXPORT("siteExecutiveData", "siteExecutiveData", "现场测试、校准或检定"),
-    CERTIFICATE_PRINT_EXPORT("certificatePrintData", "certificatePrintData", "证书打印"),
-    DOWNLOAD_TEMPLATE("downloadTemplate", "downloadTemplate", "页面配置"),
-    OUTSOURCER_CERTIFICATE_EXPORT("outsourceCertificateData", "outsourceCertificateData", "分包证书"),
-    SETTLEMENT_INFO_EXPORT("settlementInfoData", "settlementInfoData", "业务结算"),
-    EQUIPMENT_REMIND("equipmentRemind", "equipmentRemind", "设备到期提醒"),
-    AGREEMENT_INFO_EXPORT("agreementInfoData", "agreementInfoData", "合同"),
-    WORK_STATISTICS_EXPORT("workStatisticsData", "workStatisticsData", "实时工作统计"),
-    DEPT_OUTPUT_EXPORT("deptOutputData", "deptOutputData", "部门产值分析"),
-    WORKLOAD_EXPORT("workloadData", "workloadData", "业务工作量分析"),
-    DEPT_COMPREHENSIVE_EXPORT("deptComprehensiveData", "deptComprehensiveData", "部门综合分析"),
-    ENVIRONMENTAL_RECORD("environmentalRecordData", "environmentalRecordData", "现场环境记录");
+    /**
+     * 计量检定业务
+     */
+    OUTSOURCER_EXPORT("outsourcerData", "分包方名录", "分包方名录"),
+    IDENTIFY_EXPORT("identifyData", "计量标识", "计量标识"),
+    ORDER_EXPORT("orderData", "任务单", "任务单"),
+    DISPATCH_DATA("dispatchData", "设备收发", "设备收发"),
+    HANDOUT_EXPORT("handoutData", "任务分发", "任务分发"),
+    SITE_EXECUTIVE_EXPORT("siteExecutiveData", "现场测试、校准或检定", "现场测试、校准或检定"),
+    CERTIFICATE_REPORT("certificateReport", "证书审批", "证书审批"),
+    CERTIFICATE_CHANGE_APPLY("certificateChangeApply", "证书报告补充或更换申请单", "证书报告补充或更换申请单"),
+    CERTIFICATE_PRINT("certificatePrintData", "证书打印审批", "证书打印审批"),
+    DEPT_EXECUTIVE_TASK("deptExecutiveTaskData", "实验室任务", "实验室任务"),
+    MY_EXECUTIVE_TASK("myExecutiveTaskData", "我的任务", "我的任务"),
+    OUTSOURCE_ASSESS("outsourceAssess", "测试、校准或检定工作分包评审表", "测试、校准或检定工作分包评审表"),
+    OUTSOURCE_PROTOCOL("outsourceProtocol", "测试、校准或检定工作分包协议书", "测试、校准或检定工作分包协议书"),
+
+    /**
+     * 系统管理
+     */
+    SIGN_EXPORT("signData", "签名", "签名"),
+    TEMPLATE_EXPORT("templateData", "文件模板", "文件模板"),
+    FLOW_DEF_EXPORT("flowDefData", "流程定义", "流程定义"),
+    DOWNLOAD_TEMPLATE("downloadTemplate", "流程定义", "页面配置");
 
     ExportEnum(String fileName, String sheetName, String description) {
         this.fileName = fileName;
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateRecordTypeCodeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateRecordTypeCodeEnum.java
index 31d913c..a963522 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateRecordTypeCodeEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateRecordTypeCodeEnum.java
@@ -46,4 +46,14 @@
     String SITE_EXECUTIVE_APPROVAL = "01";
     //《现场测试、校准或检定工作记录表》
     String SITE_EXECUTIVE_LOG = "02";
+
+    //测试、校准或检定工作分包协议书
+    String OUTSOURCE_PROTOCOL = "01";
+    //测试、校准或检定工作分包评审表
+    String OUTSOURCE_ACCESS = "02";
+    //测试、校准或检定工作分包通知书
+    String OUTSOURCE_NOTICE = "03";
+    //测试、校准或检定工作分包方名录
+    String OUTSOURCE_INFO = "04";
+
 }
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
index 24b8635..f78bd53 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
@@ -15,6 +15,10 @@
     String CERTIFICATE_CHANGE_APPLY_BEAN_NAME = "certificateChangeApplyBean";
     //现场测试、校准或检定
     String SITE_EXECUTIVE_BEAN_NAME = "siteExecutiveBean";
+    //测试、校准或检定工作分包评审表
+    String OUTSOURCE_ASSESS_BEAN_NAME = "outsourceAssessBean";
+    //测试、校准或检定工作分包协议书
+    String OUTSOURCE_PROTOCOL_BEAN_NAME = "outsourceProtocolBean";
 
     /*********************************设备与装置************************************/
     //设备台账
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 b21c661..6b86fd1 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
@@ -18,6 +18,8 @@
     OUTSOURCER_APPROVAL(OUTSOURCER_BEAN_NAME, ""),
     CERTIFICATE_CHANGE_APPROVAL(CERTIFICATE_CHANGE_APPLY_BEAN_NAME, ""),
     SITE_EXECUTIVE_APPROVAL(SITE_EXECUTIVE_BEAN_NAME, ""),
+    OUTSOURCE_ASSESS_APPROVAL(OUTSOURCE_ASSESS_BEAN_NAME, ""),
+    OUTSOURCE_PROTOCOL_APPROVAL(OUTSOURCE_PROTOCOL_BEAN_NAME, ""),
 
     ACTION_STATUS_MAP(new HashMap<String, AwareActionStatusEnum>() {
         {
@@ -47,6 +49,10 @@
             put(ApplyFromIdEnum.CERTIFICATE_CHANGE_APPROVAL.getCode(), CERTIFICATE_CHANGE_APPROVAL);
             //现场测试、校准或检定审批
             put(ApplyFromIdEnum.SITE_EXECUTIVE_APPROVAL.getCode(), SITE_EXECUTIVE_APPROVAL);
+            //测试、校准或检定工作分包评审表
+            put(ApplyFromIdEnum.OUTSOURCE_ASSESS_APPROVAL.getCode(), OUTSOURCE_ASSESS_APPROVAL);
+            //测试、校准或检定工作分包协议书
+            put(ApplyFromIdEnum.OUTSOURCE_PROTOCOL_APPROVAL.getCode(), OUTSOURCE_PROTOCOL_APPROVAL);
         }
     });
     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 934405e..c7410bd 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
@@ -9,6 +9,8 @@
     CERTIFICATE_CHANGE_APPROVAL("jljdywzsbchghsqd", MessageSourceModuleEnum.BUSINESS.getCode(), "证书/报告补充或更换申请单"),
     OUTSOURCER_APPROVAL("jljdywcsjzhgfbfml", MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定合格分包方名录"),
     SITE_EXECUTIVE_APPROVAL("jljdywxccsjzsp", MessageSourceModuleEnum.BUSINESS.getCode(), "现场测试、校准或检定审批"),
+    OUTSOURCE_ASSESS_APPROVAL("jljdywcsjzfbpsb", MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包评审表"),
+    OUTSOURCE_PROTOCOL_APPROVAL("jljdywcsjzfbxys", MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包协议书"),
 
 
     /*******************************************设备与装置*********************************************/
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/GeneralApprovalMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/GeneralApprovalMapper.java
index 4fb7344..0c9d6ae 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/GeneralApprovalMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/GeneralApprovalMapper.java
@@ -17,8 +17,4 @@
 
     Page<O> selectBatchForApprovalList(Page<O> page, @Param("request") R request, @Param("businessKeys") List<String> businessKeys);
 
-//    Page<O> selectListPage(Page<O> page, @Param("request") R request);
-
-//    Long selectMaxNo();
-
 }
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceAssessMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceAssessMapper.java
index 7867bb8..ba59009 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceAssessMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceAssessMapper.java
@@ -1,7 +1,12 @@
 package com.casic.missiles.mapper.business;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.business.outsource.OutsourceAssessApprovalListRequest;
+import com.casic.missiles.mapper.GeneralApprovalMapper;
 import com.casic.missiles.model.business.BizBusinessOutsourceAssess;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * <p>
@@ -11,6 +16,10 @@
  * @author wangpeng
  * @since 2023-08-16
  */
-public interface BizBusinessOutsourceAssessMapper extends BaseMapper<BizBusinessOutsourceAssess> {
+public interface BizBusinessOutsourceAssessMapper extends GeneralApprovalMapper<BizBusinessOutsourceAssess, BizBusinessOutsourceAssess, OutsourceAssessApprovalListRequest> {
+
+    Page<BizBusinessOutsourceAssess> selectBatchForApprovalList(Page<BizBusinessOutsourceAssess> page, @Param("request") OutsourceAssessApprovalListRequest request, @Param("businessKeys") List<String> businessKeys);
+
+    Long selectMaxProjectNo();
 
 }
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceProtocolMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceProtocolMapper.java
new file mode 100644
index 0000000..e6aba35
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceProtocolMapper.java
@@ -0,0 +1,24 @@
+package com.casic.missiles.mapper.business;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.business.outsource.OutsourceProtocolApprovalListRequest;
+import com.casic.missiles.mapper.GeneralApprovalMapper;
+import com.casic.missiles.model.business.BizBusinessOutsourceProtocol;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 计量检定业务-分包管理-测试、校准或检定工作分包协议书 Mapper 接口
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-08-24
+ */
+public interface BizBusinessOutsourceProtocolMapper extends GeneralApprovalMapper<BizBusinessOutsourceProtocol, BizBusinessOutsourceProtocol, OutsourceProtocolApprovalListRequest> {
+
+    Page<BizBusinessOutsourceProtocol> selectBatchForApprovalList(Page<BizBusinessOutsourceProtocol> page, @Param("request") OutsourceProtocolApprovalListRequest request, @Param("businessKeys") List<String> businessKeys);
+
+    Long selectMaxProtocolNo();
+}

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java
index bb0c50f..13a699b 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java
@@ -12,6 +12,7 @@
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.IGeneralApprovalService;
+import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
@@ -19,6 +20,7 @@
 import org.springframework.web.bind.annotation.RequestBody;
 
 import javax.validation.Valid;
+import java.util.List;
 import java.util.Objects;
 
 /**
@@ -117,4 +119,17 @@
         }
         return baseApprovalService.failUpdate(request);
     }
+
+    public List<O> exportList(@RequestBody @Valid R request) throws Exception {
+        List<O> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = baseApprovalService.listExportByIds(request.getIds());
+        } else {
+            list = baseApprovalService.listExport(request);
+        }
+        for (O record : list) {
+            DictCodeUtils.convertDictCodeToName(record);
+        }
+        return list;
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java
index 8a90961..d775831 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java
@@ -5,6 +5,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.business.certificate.CertificateChangeApplyApprovalListRequest;
 import com.casic.missiles.dto.business.certificate.CertificateChangeApplySaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessCertificateChangeApply;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
@@ -20,6 +21,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -48,4 +50,12 @@
         }
         return changeApplyService.saveChangeApply(request);
     }
+
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody CertificateChangeApplyApprovalListRequest request) throws Exception {
+        List<BizBusinessCertificateChangeApply> list = super.exportList(request);
+        super.exportExcel(BizBusinessCertificateChangeApply.class, list, ExportEnum.CERTIFICATE_CHANGE_APPLY.getSheetName());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java
index 5fc4b07..af8230e 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java
@@ -9,6 +9,7 @@
 import com.casic.missiles.dto.business.certificate.CertificatePrintApprovalListRequest;
 import com.casic.missiles.dto.business.certificate.CertificatePrintListResponse;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.enums.business.CertificatePrintStatusEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessCertificatePrintLog;
@@ -18,10 +19,16 @@
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.io.IOException;
+import java.util.List;
 import java.util.Objects;
 
 /**
@@ -98,4 +105,16 @@
         });
         return certificatePrintService.certificatePrintLog(idDTO.getId());
     }
+
+    @ApiOperation("证书打印审批导出")
+    @PostMapping("/listExport")
+    public void exportList(@RequestBody CertificatePrintApprovalListRequest request) throws IOException {
+        List<CertificatePrintListResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = certificatePrintService.listByIds(request.getIds());
+        } else {
+            list = certificatePrintService.list(request);
+        }
+        super.exportExcel(CertificatePrintListResponse.class, list, ExportEnum.CERTIFICATE_PRINT.getSheetName());
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java
index 63b06dc..6b2efd5 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java
@@ -6,6 +6,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.business.certificate.CertificateReportApprovalListRequest;
 import com.casic.missiles.dto.business.certificate.CertificateReportSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessCertificateReport;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
@@ -21,6 +22,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -50,7 +52,7 @@
         return certificateReportService.saveCertificateReport(request);
     }
 
-    @ApiOperation("证书审批详情（基本信息）")
+    @ApiOperation("详情（基本信息）")
     @PostMapping("/detail")
     public ReturnDTO<BizBusinessCertificateReport> detail(@RequestBody @Valid BaseDetailRequest request, BindingResult bindingResult) throws Exception {
         if(bindingResult.hasErrors()){
@@ -59,4 +61,11 @@
         return certificateReportService.detail(request);
     }
 
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody CertificateReportApprovalListRequest request) throws Exception {
+        List<BizBusinessCertificateReport> list = super.exportList(request);
+        super.exportExcel(BizBusinessCertificateReport.class, list, ExportEnum.CERTIFICATE_REPORT.getSheetName());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java
index 46b26bd..57c0809 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java
@@ -10,20 +10,21 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.business.identify.IdentifyListRequest;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessIdentifyInfo;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.business.IBizBusinessIdentifyInfoService;
+import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import javax.validation.Valid;
+import java.util.List;
 import java.util.Objects;
 
 /**
@@ -57,16 +58,13 @@
         return identifyInfoService.addIdentify(identifyInfo);
     }
 
-    @ApiOperation("标识打印更新")
+    @ApiOperation("标识打印更新（更新打印时间）")
     @PostMapping("/update")
-    public ReturnDTO updateIdentify(@RequestBody @Valid BizBusinessIdentifyInfo identifyInfo, BindingResult bindingResult) {
-        Assert.isFalse(Objects.isNull(identifyInfo.getId()), () -> {
+    public ReturnDTO updateIdentify(@RequestBody @Valid IdDTO idDTO) {
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        Assert.isFalse(bindingResult.hasErrors(), () -> {
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        });
-        return identifyInfoService.updateIdentify(identifyInfo);
+        return identifyInfoService.updateIdentify(idDTO.getId());
     }
 
     @ApiOperation("标识打印删除")
@@ -77,4 +75,37 @@
         });
         return identifyInfoService.deleteIdentify(idDTO.getId());
     }
+
+    @ApiOperation("标识打印导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody @Valid IdentifyListRequest request, BindingResult bindingResult) throws Exception {
+        if (bindingResult.hasErrors()) {
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        List<BizBusinessIdentifyInfo> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = identifyInfoService.listByIds(request.getIds());
+        } else {
+            list = identifyInfoService.list(request);
+        }
+        for (BizBusinessIdentifyInfo record : list) {
+            DictCodeUtils.convertDictCodeToName(record);
+        }
+        super.exportExcel(BizBusinessIdentifyInfo.class, list, ExportEnum.IDENTIFY_EXPORT.getSheetName());
+    }
+
+
+    // TODO: 2023/8/23 查询设备信息，4个底部按钮查设备（按钮的作用就是前端用来调不同接口、用来区分中间即将展示的标识），前端弹窗选设备，在确定保存时前端根据底部按钮判断传入设备类型deviceType字典code
+    // TODO: 2023/8/23 接口：查受检设备（第1个按钮），查设备台账（后3个按钮同一接口），查询之后前端根据标志类型的不同加到中间页面时进行判断（按产品给的对应表）
+    // TODO: 2023/8/23 提供二维码接口，前端在加到中间页面时调用一下
+
+    @ApiOperation("设备二维码")
+    @PostMapping("/equipment/qrCode")
+    public ReturnDTO<String> equipmentQrCode(@RequestBody @Valid IdDTO idDTO) {
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return identifyInfoService.equipmentQrCode(idDTO.getId());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java
index 707be6e..7e0453d 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java
@@ -117,7 +117,7 @@
     }
 
     @ApiOperation("任务单导出")
-    @PostMapping("/export")
+    @PostMapping("/listExport")
     public void orderExport(@RequestBody @Valid OrderListRequest request, HttpServletResponse response) {
         businessOrderService.orderExport(request, response);
     }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java
index 529a6ce..51432be 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java
@@ -1,9 +1,28 @@
 package com.casic.missiles.controller.business;
 
+import com.casic.missiles.controller.GeneralApprovalController;
+import com.casic.missiles.dto.BaseApprovalSubmitRequest;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.business.outsource.OutsourceAssessApprovalListRequest;
+import com.casic.missiles.dto.business.outsource.OutsourceAssessSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
+import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.model.business.BizBusinessOutsourceAssess;
+import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
+import com.casic.missiles.service.IGeneralApprovalService;
+import com.casic.missiles.service.business.IBizBusinessOutsourceAssessService;
 import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.BindingResult;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.validation.Valid;
+import java.util.List;
+
 /**
  * <p>
  * 计量检定业务-分包管理-测试、校准或检定工作分包评审表 前端控制器
@@ -15,6 +34,27 @@
 @Api(tags = "分包管理-测试、校准或检定工作分包评审表")
 @RestController
 @RequestMapping("/business/outsource/assess")
-public class BizBusinessOutsourceAssessController {
+public class BizBusinessOutsourceAssessController extends GeneralApprovalController<BizBusinessOutsourceAssess, BizBusinessOutsourceAssess, OutsourceAssessApprovalListRequest, BaseApprovalSubmitRequest> {
+    @Autowired
+    private IBizBusinessOutsourceAssessService outsourceAssessService;
 
+    public BizBusinessOutsourceAssessController(IGeneralApprovalService<BizBusinessOutsourceAssess, BizBusinessOutsourceAssess, OutsourceAssessApprovalListRequest, BaseApprovalSubmitRequest> baseApprovalService) {
+        super(baseApprovalService);
+    }
+
+    @ApiOperation("草稿箱-保存")
+    @PostMapping("/save")
+    public ReturnDTO<OutsourceAssessSaveResponse> saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceAssess request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        return outsourceAssessService.saveOutsourceAssess(request);
+    }
+
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception {
+        List<BizBusinessOutsourceAssess> list = super.exportList(request);
+        super.exportExcel(BizBusinessOutsourceAssess.class, list, ExportEnum.OUTSOURCE_ASSESS.getSheetName());
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java
new file mode 100644
index 0000000..9adef18
--- /dev/null
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java
@@ -0,0 +1,60 @@
+package com.casic.missiles.controller.business;
+
+import com.casic.missiles.controller.GeneralApprovalController;
+import com.casic.missiles.dto.BaseApprovalSubmitRequest;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.business.outsource.OutsourceProtocolApprovalListRequest;
+import com.casic.missiles.dto.business.outsource.OutsourceProtocolSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
+import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.model.business.BizBusinessOutsourceProtocol;
+import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
+import com.casic.missiles.service.IGeneralApprovalService;
+import com.casic.missiles.service.business.IBizBusinessOutsourceProtocolService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.BindingResult;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.validation.Valid;
+import java.util.List;
+
+/**
+ * <p>
+ * 计量检定业务-分包管理-测试、校准或检定工作分包协议书 前端控制器
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-08-24
+ */
+@Api(tags = "分包管理-测试、校准或检定工作分包协议书")
+@RestController
+@RequestMapping("/business/outsource/protocol")
+public class BizBusinessOutsourceProtocolController extends GeneralApprovalController<BizBusinessOutsourceProtocol, BizBusinessOutsourceProtocol, OutsourceProtocolApprovalListRequest, BaseApprovalSubmitRequest> {
+    @Autowired
+    private IBizBusinessOutsourceProtocolService outsourceProtocolService;
+
+    public BizBusinessOutsourceProtocolController(IGeneralApprovalService<BizBusinessOutsourceProtocol, BizBusinessOutsourceProtocol, OutsourceProtocolApprovalListRequest, BaseApprovalSubmitRequest> baseApprovalService) {
+        super(baseApprovalService);
+    }
+
+    @ApiOperation("草稿箱-保存")
+    @PostMapping("/save")
+    public ReturnDTO<OutsourceProtocolSaveResponse> saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceProtocol request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        return outsourceProtocolService.saveOutsourceProtocol(request);
+    }
+
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody OutsourceProtocolApprovalListRequest request) throws Exception {
+        List<BizBusinessOutsourceProtocol> list = super.exportList(request);
+        super.exportExcel(BizBusinessOutsourceProtocol.class, list, ExportEnum.OUTSOURCE_PROTOCOL.getSheetName());
+    }
+}
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java
index 097f645..f0f0943 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java
@@ -17,7 +17,6 @@
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.IGeneralApprovalService;
 import com.casic.missiles.service.business.IBizBusinessOutsourcerInfoService;
-import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -71,19 +70,8 @@
 
     @ApiOperation("分包方导出")
     @PostMapping("/listExport")
-    public void export(@RequestBody @Valid OutsourcerInfoApprovalListRequest request, BindingResult bindingResult) throws Exception {
-        if (bindingResult.hasErrors()) {
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        }
-        List<BizBusinessOutsourcerInfo> list;
-        if (!CollectionUtils.isEmpty(request.getIds())) {
-            list = outsourcerInfoService.listByIds(request.getIds());
-        } else {
-            list = outsourcerInfoService.list(request);
-        }
-        for (BizBusinessOutsourcerInfo record : list) {
-            DictCodeUtils.convertDictCodeToName(record);
-        }
+    public void export(@RequestBody OutsourcerInfoApprovalListRequest request) throws Exception {
+        List<BizBusinessOutsourcerInfo> list = super.exportList(request);
         super.exportExcel(BizBusinessOutsourcerInfo.class, list, ExportEnum.OUTSOURCER_EXPORT.getSheetName());
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java
index c2cbf9f..0410918 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java
@@ -17,11 +17,9 @@
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.IGeneralApprovalService;
 import com.casic.missiles.service.business.IBizBusinessSiteExecutiveInfoService;
-import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -60,7 +58,7 @@
         return siteExecutiveInfoService.saveSiteExecutiveInfo(siteExecutiveInfo);
     }
 
-    @ApiOperation("现场检测详情")
+    @ApiOperation("详情")
     @PostMapping("/detail")
     public ReturnDTO<SiteExecutiveDetailResponse> siteExecutiveDetail(@RequestBody @Valid IdDTO idDTO) throws Exception {
         Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
@@ -69,21 +67,10 @@
         return ReturnUtil.success(siteExecutiveInfoService.detail(idDTO.getId()));
     }
 
-    @ApiOperation("现场检测导出")
+    @ApiOperation("导出")
     @PostMapping("/listExport")
-    public void export(@RequestBody @Valid SiteExecutiveApprovalListRequest request, BindingResult bindingResult) throws Exception {
-        if (bindingResult.hasErrors()) {
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        }
-        List<SiteExecutiveApprovalListResponse> list;
-        if (!CollectionUtils.isEmpty(request.getIds())) {
-            list = siteExecutiveInfoService.listInfoByIds(request.getIds());
-        } else {
-            list = siteExecutiveInfoService.listInfo(request);
-        }
-        for (SiteExecutiveApprovalListResponse record : list) {
-            DictCodeUtils.convertDictCodeToName(record);
-        }
+    public void export(@RequestBody SiteExecutiveApprovalListRequest request) throws Exception {
+        List<SiteExecutiveApprovalListResponse> list = super.exportList(request);
         super.exportExcel(SiteExecutiveApprovalListResponse.class, list, ExportEnum.SITE_EXECUTIVE_EXPORT.getSheetName());
     }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
index 7e793cd..a92e209 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
@@ -55,7 +55,7 @@
 
     @ApiOperation("设备收发列表导出")
     @PostMapping("/export")
-    public void exportList(@RequestBody @Valid SampleDispatchListRequest request) throws IOException {
+    public void exportList(@RequestBody SampleDispatchListRequest request) throws IOException {
         List<SampleDispatchListResponse> list;
         if (!CollectionUtils.isEmpty(request.getIds())) {
             list = dispatchService.listByIds(request.getIds());
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java
index cdc77fc..d120fd4 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java
@@ -7,6 +7,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.business.labExecutive.*;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.business.IBusinessLabExecutiveInfoService;
@@ -14,6 +15,7 @@
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.*;
 
@@ -32,7 +34,7 @@
     @Autowired
     private IBusinessLabExecutiveInfoService labExecutiveInfoService;
 
-    @ApiOperation("实验室检测-部门检测-查询各状态列表（待检测、检测中、检测完）")
+    @ApiOperation("实验室任务-查询各状态列表（待检测、检测中、检测完）")
     @PostMapping("/deptExecutive/List")
     public ReturnDTO<PageInfoBT<SampleLabExecutiveListResponse>> queryDeptExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
@@ -43,10 +45,19 @@
         return ReturnUtil.success(super.packForBT(labExecutiveInfoService.deptLabExecutiveListPage(page, labExecutiveListRequest)));
     }
 
-    /**
-     * 实验室检测-我的检测-查询各状态列表（待检测、检测中、检测完）
-     */
-    @ApiOperation("实验室检测-我的检测-查询各状态列表（待检测、检测中、检测完）")
+    @ApiOperation("实验室任务导出")
+    @PostMapping("/deptExecutive/export")
+    public void deptExportList(@RequestBody @Valid SampleLabExecutiveListRequest request) throws Exception {
+        List<SampleLabExecutiveListResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = labExecutiveInfoService.deptLabExecutiveListByIds(request.getMeasureStatus(), request.getIds());
+        } else {
+            list = labExecutiveInfoService.deptLabExecutiveList(request);
+        }
+        super.exportExcel(SampleLabExecutiveListResponse.class, list, ExportEnum.DEPT_EXECUTIVE_TASK.getSheetName());
+    }
+
+    @ApiOperation("我的任务-查询各状态列表（待检测、检测中、检测完）")
     @PostMapping("/myExecutive/list")
     public ReturnDTO<PageInfoBT<SampleLabExecutiveListResponse>> queryMyExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
@@ -57,19 +68,25 @@
         return ReturnUtil.success(super.packForBT(labExecutiveInfoService.myLabExecutiveListPage(page, labExecutiveListRequest)));
     }
 
-    /**
-     * 实验室检测-我的检测-查询各状态样品数量（待检测、检测中、检测完）
-     */
-    @ApiOperation("实验室检测-我的检测-查询各状态样品数量（待检测、检测中、检测完）")
+    @ApiOperation("我的任务导出")
+    @PostMapping("/myExecutive/export")
+    public void exportList(@RequestBody @Valid SampleLabExecutiveListRequest request) throws Exception {
+        List<SampleLabExecutiveListResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = labExecutiveInfoService.myLabExecutiveListByIds(request.getMeasureStatus(), request.getIds());
+        } else {
+            list = labExecutiveInfoService.myLabExecutiveList(request);
+        }
+        super.exportExcel(SampleLabExecutiveListResponse.class, list, ExportEnum.MY_EXECUTIVE_TASK.getSheetName());
+    }
+
+    @ApiOperation("我的任务-查询各状态样品数量（待检测、检测中、检测完）")
     @GetMapping("/myExecutive/amount")
     public ReturnDTO<List<SampleAmountResponse>> queryMyExecutiveAmount() {
         return ReturnUtil.success(labExecutiveInfoService.myExecutiveAmount());
     }
 
-    /**
-     * 实验室检测-部门检测-分配（分配给具体人员）
-     */
-    @ApiOperation("实验室检测-部门检测-分配按钮（分配给具体人员）")
+    @ApiOperation("实验室任务-分配按钮（分配给具体人员）")
     @PostMapping("/deptExecutive/allocate")
     public ReturnDTO allocateStaff(@RequestBody @Valid SampleAllocateRequest sampleAllocateRequest, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -78,10 +95,7 @@
         return labExecutiveInfoService.allocateStaff(sampleAllocateRequest);
     }
 
-    /**
-     * 实验室检测-我的检测-检定人扫描收入（待检测->检测中）
-     */
-    @ApiOperation("实验室检测-我的检测-检定人扫描收入（待检测->检测中）")
+    @ApiOperation("我的任务-检定人扫描收入（待检测->检测中）")
     @PostMapping("/myExecutive/receive")
     public ReturnDTO sampleReceive(@RequestBody @Valid List<SampleOperateRequest> requestList, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -90,10 +104,7 @@
         return labExecutiveInfoService.sampleReceive(requestList);
     }
 
-    /**
-     * 实验室检测-负责人/检定人扫描检完（检测中->检测完）
-     */
-    @ApiOperation("实验室检测-负责人/检定人扫描检完（检测中->检测完）")
+    @ApiOperation("实验室任务-负责人/检定人扫描检完（检测中->检测完）")
     @PostMapping("/myExecutive/complete")
     public ReturnDTO sampleExecutiveComplete(@RequestBody @Valid List<SampleOperateRequest> requestList, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -102,10 +113,7 @@
         return labExecutiveInfoService.sampleExecutiveComplete(requestList);
     }
 
-    /**
-     * 实验室检测-部门检测/我的检测 编辑（只能修改应出具证书）
-     */
-    @ApiOperation("实验室检测-部门检测/我的检测 编辑（只能修改应出具证书）")
+    @ApiOperation("实验室任务/我的任务 编辑（只能修改应出具证书）")
     @PostMapping("/executive/update")
     public ReturnDTO updateExecutive(@RequestBody @Valid UpdateExecutiveRequest request, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -114,10 +122,7 @@
         return labExecutiveInfoService.updateExecutive(request);
     }
 
-    /**
-     * 实验室检测-部门检测/我的检测 详情
-     */
-    @ApiOperation("实验室检测-部门检测/我的检测 详情")
+    @ApiOperation("实验室任务/我的任务 详情")
     @PostMapping("/executive/detail")
     public ReturnDTO<ExecutiveDetailResponse> executiveDetail(@RequestBody @Valid ExecutiveDetailRequest request, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
@@ -131,7 +136,7 @@
      * 退回后会将下一个要执行的实验室检测状态更新为待分配，将后面的实验室顺序变更为连续（都进行减1）
      * 最后一个检测的实验室退回，等分发员再增加实验室或设备收发中的已收入直接手动点击完成
      */
-    @ApiOperation("实验室检测-部门检测/我的检测 退回（待检测/检测中->退回）")
+    @ApiOperation("实验室任务/我的任务 退回（待检测/检测中->退回）")
     @PostMapping("/executive/sendBack")
     public ReturnDTO executiveSendBack(@RequestBody @Valid ExecutiveSendBackRequest request, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -140,9 +145,6 @@
         return labExecutiveInfoService.sampleExecutiveSendBack(request);
     }
 
-    /**
-     * 分发员编辑实验室检测列表
-     */
     @ApiOperation("分发员编辑实验室检测列表")
     @PostMapping("/handOut/updateList")
     public ReturnDTO updateExecutiveList(@RequestBody @Valid UpdateExecutiveListRequest request, BindingResult bindingResult) {
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java
index 48a67ed..0c04f31 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java
@@ -10,6 +10,7 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.resource.customer.CustomerApprovalListRequest;
 import com.casic.missiles.dto.resource.customer.CustomerSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceCustomerInfo;
@@ -26,6 +27,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -55,6 +57,13 @@
         return customerInfoService.saveCustomerInfo(request);
     }
 
+    @ApiOperation("委托方名录导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody CustomerApprovalListRequest request) throws Exception {
+        List<BizResourceCustomerInfo> list = super.exportList(request);
+        super.exportExcel(BizResourceCustomerInfo.class, list, ExportEnum.CUSTOMER_INFO.getSheetName());
+    }
+
     @ApiOperation("委托方人员列表（分页）")
     @PostMapping("/person/listPage")
     public ReturnDTO<PageInfoBT<BizResourceCustomerStaff>> personListPage(@RequestBody IdDTO idDto) {
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
index 972ed4b..6418ea5 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
@@ -5,6 +5,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.resource.customer.SuggestFormApprovalListRequest;
 import com.casic.missiles.dto.resource.customer.SuggestFormSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceCustomerSuggestForm;
@@ -20,6 +21,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -50,4 +52,11 @@
         return suggestFormService.saveSuggestForm(request);
     }
 
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody SuggestFormApprovalListRequest request) throws Exception {
+        List<BizResourceCustomerSuggestForm> list = super.exportList(request);
+        super.exportExcel(BizResourceCustomerSuggestForm.class, list, ExportEnum.CUSTOMER_SUGGEST_FORM.getSheetName());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java
index 1934d1a..9e07eab 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java
@@ -15,12 +15,16 @@
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.resource.IEnvEnvironmentRecordConfigService;
 import com.casic.missiles.service.resource.IEnvEnvironmentRecordDataService;
+import com.casic.missiles.service.resource.IEnvLocationInfoService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
 import java.util.List;
@@ -39,6 +43,8 @@
     private IEnvEnvironmentRecordDataService environmentRecordDataService;
     @Autowired
     private IEnvEnvironmentRecordConfigService environmentRecordConfigService;
+    @Autowired
+    private IEnvLocationInfoService locationInfoService;
 
     @ApiOperation("环境记录单数据列表/详情")
     @PostMapping("/data/listPage")
@@ -95,4 +101,11 @@
         });
         return environmentRecordConfigService.deleteEnvironmentRecordConfig(idDTO.getId());
     }
+
+    @ApiOperation("地点列表")
+    @PostMapping("/location/listPage")
+    public ReturnDTO<PageInfoBT<LocationListResponse>> locationListPage(@RequestBody @Valid LocationListRequest request) {
+        Page<LocationListResponse> page = PageFactory.defaultPage();
+        return ReturnUtil.success(super.packForBT(locationInfoService.listPage(page, request)));
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java
index 82efe3f..e9561fa 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java
@@ -10,6 +10,7 @@
 import com.casic.missiles.dto.resource.seal.SealLogListRequest;
 import com.casic.missiles.dto.resource.seal.SealNoteApprovalListRequest;
 import com.casic.missiles.dto.resource.seal.SealNoteSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceSealUseLog;
@@ -27,6 +28,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -58,6 +60,13 @@
         return sealUseNoteService.saveSeal(request);
     }
 
+    @ApiOperation("印章使用登记导出（列表和导出中去掉经办人和监印人）")
+    @PostMapping("/listExport")
+    public void export(@RequestBody SealNoteApprovalListRequest request) throws Exception {
+        List<BizResourceSealUseNote> list = super.exportList(request);
+        super.exportExcel(BizResourceSealUseNote.class, list, ExportEnum.SEAL_NOTE.getSheetName());
+    }
+
     // TODO: 2023/7/28 印章使用日志：系统中使用印章时插入数据库
 
     @ApiOperation("印章使用日志列表（分页）")
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java
index 9b674fc..06b6521 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java
@@ -9,16 +9,20 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.resource.staff.StaffCertRequest;
 import com.casic.missiles.dto.resource.staff.StaffCertResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.service.resource.IBizResourceStaffInfoService;
 import com.casic.missiles.service.resource.IBizResourceStaffVerifierService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.List;
+
 /**
  * @Description:
  * @Author: wangpeng
@@ -41,9 +45,21 @@
         return ReturnUtil.success(super.packForBT(responsePage));
     }
 
+    @ApiOperation("证书逾期提醒导出")
+    @PostMapping("/listExport")
+    public void exportList(@RequestBody StaffCertRequest request) throws Exception {
+        List<StaffCertResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = staffInfoService.certListByIds(request.getIds());
+        } else {
+            list = staffInfoService.certList(request);
+        }
+        super.exportExcel(StaffCertResponse.class, list, ExportEnum.STAFF_CERTIFICATE_EXPIRE.getSheetName());
+    }
+
     @ApiOperation("证书逾期提醒")
     @PostMapping("/expirationReminder")
-    public ReturnDTO expirationReminder(@RequestBody IdDTO idDto) {
-        return verifierService.expirationReminder(idDto);
+    public ReturnDTO expirationReminder(@RequestBody IdDTO idDTO) {
+        return verifierService.expirationReminder(idDTO);
     }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java
index 3b251ad..a6e7850 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java
@@ -12,6 +12,7 @@
 import com.casic.missiles.dto.resource.staff.StaffListRequest;
 import com.casic.missiles.dto.resource.staff.TrainListRequest;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.*;
@@ -22,7 +23,10 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
 import java.util.List;
@@ -52,8 +56,19 @@
             throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
         }
         Page<BizResourceStaffInfo> page = PageFactory.defaultPage();
-        Page<BizResourceStaffInfo> responsePage = staffInfoService.listPage(page, request);
-        return ReturnUtil.success(super.packForBT(responsePage));
+        return ReturnUtil.success(super.packForBT(staffInfoService.listPage(page, request)));
+    }
+
+    @ApiOperation("人员登记导出")
+    @PostMapping("/listExport")
+    public void exportList(@RequestBody StaffListRequest request) throws Exception {
+        List<BizResourceStaffInfo> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = staffInfoService.listByIds(request.getIds());
+        } else {
+            list = staffInfoService.list(request);
+        }
+        super.exportExcel(BizResourceStaffInfo.class, list, ExportEnum.STAFF_INFO.getSheetName());
     }
 
     @ApiOperation("人员登记详情基础信息")
@@ -85,9 +100,9 @@
 
     @ApiOperation("科研教育列表（分页）")
     @PostMapping("/education/listPage")
-    public ReturnDTO<PageInfoBT<BizResourceStaffEducation>> educationListPage(@RequestBody IdDTO idDto) {
+    public ReturnDTO<PageInfoBT<BizResourceStaffEducation>> educationListPage(@RequestBody IdDTO idDTO) {
         Page<BizResourceStaffEducation> page = PageFactory.defaultPage();
-        Page<BizResourceStaffEducation> responsePage = staffInfoService.educationListPage(page, idDto);
+        Page<BizResourceStaffEducation> responsePage = staffInfoService.educationListPage(page, idDTO);
         return ReturnUtil.success(super.packForBT(responsePage));
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java
index af6aa86..d85d84a 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java
@@ -9,6 +9,7 @@
 import com.casic.missiles.dto.resource.outsideService.SupplierApprovalListRequest;
 import com.casic.missiles.dto.resource.outsideService.SupplierSaveResponse;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceSupplierAbility;
@@ -67,6 +68,13 @@
         return ReturnUtil.success(supplierInfoService.detail(idDTO.getId()));
     }
 
+    @ApiOperation("合格供方导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody SupplierApprovalListRequest request) throws Exception {
+        List<BizResourceSupplierInfo> list = super.exportList(request);
+        super.exportExcel(BizResourceSupplierInfo.class, list, ExportEnum.SUPPLIER_INFO.getSheetName());
+    }
+
     @ApiOperation("供方人员列表（分页）")
     @PostMapping("/person/listPage")
     public ReturnDTO<PageInfoBT<BizResourceSupplierPerson>> personListPage(@RequestBody IdDTO idDTO) {
diff --git a/casic-metering-api/src/main/resources/config/application.yml b/casic-metering-api/src/main/resources/config/application.yml
index 350db5f..ecff521 100644
--- a/casic-metering-api/src/main/resources/config/application.yml
+++ b/casic-metering-api/src/main/resources/config/application.yml
@@ -126,7 +126,7 @@
     #作者
     author: wangpeng
     #待生成对象表名
-    table-name: biz_equipment_technical_target_approval,biz_equipment_attachment_approval,biz_equipment_checkpoint_approval
+    table-name: biz_business_outsource_protocol
 
 reminder:
   #节点--common模块config包 ReminderNodeConfig配置
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
index 4a19e4e..d47d552 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
@@ -53,6 +53,7 @@
     SUGGEST_FORM_SAVE_FAILED(2509, "委托方意见登记表保存至草稿箱失败"),
     EXAMINE_FORM_SAVE_FAILED(2510, "要求、委托书及合同评审表保存至草稿箱失败"),
     CUSTOMER_EXIST_SAVE_FAILED(2511, "该委托方已存在，请重新选择"),
+    DUPLICATE_LOCATION_NO(2512, "地点编号已存在"),
 
     /**
      * 计量检定业务模块
@@ -68,6 +69,8 @@
     COMPLETE_SAMPLE_NOT_EXIST(2609, "检测中不存在扫描收入的样品"),
     CANNOT_CHANGE_MEASURE_INFO(2610, "无法更改非当前登录用户的检测信息"),
     NON_EXIST_ORDER_OR_SAMPLE(2611, "不存在该委托单或该委托单下的样品"),
+    OUTSOURCE_ACCESS_SAVE_FAILED(2612, "测试、校准或检定工作分包评审表保存至草稿箱失败"),
+    OUTSOURCE_PROTOCOL_SAVE_FAILED(2613, "测试、校准或检定工作分包协议书保存至草稿箱失败"),
 
     /**
      * 历史遗留备用
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
index 5089ad1..81a406b 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
@@ -10,54 +10,38 @@
     /**
      * 资源管理
      */
-    ENVIRONMENT_DATA_EXPORT("environmentData", "environmentData", "环境记录单数据"),
+    ENVIRONMENT_DATA_EXPORT("environmentData", "环境记录单数据", "环境记录单数据"),
+    STAFF_INFO("staffInfo", "人员登记", "人员登记"),
+    STAFF_CERTIFICATE_EXPIRE("certificateExpire", "证书逾期提醒", "证书逾期提醒"),
+    SUPPLIER_INFO("supplierInfo", "合格供方名录", "合格供方名录"),
+    CUSTOMER_INFO("customerInfo", "委托方名录", "委托方名录"),
+    CUSTOMER_SUGGEST_FORM("customerSuggestForm", "委托方意见登记表", "委托方意见登记表"),
+    SEAL_NOTE("sealNote", "印章使用登记", "印章使用登记"),
 
-    FILE_EXPORT("meterFileData", "meterFileData", "计量文件信息"),
-    TRAIN_PLAN_EXPORT("trainPlanData", "trainPlanData", "培训计划"),
-    TRAIN_LOG_EXPORT("trainLogData", "trainLogData", "培训记录"),
-    METER_ORGANIZE_EXPORT("meterOrganizeData", "meterOrganizeData", "计量组织"),
-    TRACE_SUPPLIER_EXPORT("traceSupplierData", "traceSupplierData", "溯源供方"),
-    SIGN_EXPORT("signData", "signData", "签名/签章"),
-    TEMPLATE_EXPORT("templateData", "templateData", "原始记录模板/证书报告模板"),
-    FIXED_ASSETS("meterFixedAssets", "meterFixedAssets", "固定资产"),
-    METER_EQUIPMENT("meterEquipment", "meterEquipment", "测量设备"),
-    CALIBRATION_TEST_EQUIPMENT("calibrationTestEquipment", "calibrationTestEquipment", "校准检定设备"),
-    MEASURE_ACCOUNT("measureAccount", "measureAccount", "测量工装"),
-    STANDARD_SUPPORT_EQUIPMENT("standardSupportEquipment", "standardSupportEquipment", "标准配套设备"),
-    STANDARD_EQUIPMENT("standardEquipment", "standardEquipment", "标准装置"),
-    FLOW_DEF_EXPORT("flowDefData", "flowDefData", "流程定义"),
-    STAFF_CERTIFICATE("certificate", "certificate", "计量人员证书"),
-    CHECK_INFO("checkInfo", "checkInfo", "设备管理点检测"),
-    EQUIPMENT_APPLY("equipmentApply", "equipmentApply", "设备借用"),
-    STANDARD_EQUIPMENT_REMIND("equipmentApplyRemind", "equipmentApplyRemind", "标准装置到期提醒"),
-    METER_PRICE("meterPrice", "meterPrice", "价格库"),
-    METER_STAFF("meterStaff", "meterStaff", "计量人员"),
-    STANDARD_EQUIPMENT_APPLY("standardEquipmentApply", "standardEquipmentApply", "标准装置申请"),
-    STATE_MANAGE_APPLY("stateManage", "stateManage", "状态管理"),
-    METER_ACCEPTANCE_CHECK("acceptanceCheck", "acceptanceCheck", "设备检修保养验收单"),
-    CUSTOMER_EXPORT("customerData", "customerData", "客户信息"),
-    ORDER_EXPORT("orderData", "orderData", "委托书信息"),
-    SAMPLE_EXPORT("sampleData", "sampleData", "样本信息"),
-    EXCHANGE_DATA("exchangeData", "exchangeData", "设备交接单"),
-    DISPATCH_DATA("dispatchData", "dispatchData", "设备收发"),
-    ENVIRONMENT_DATA("environmentData", "environmentData", "环境记录单"),
-    ORIGIN_DATA("originData", "originData", "原始记录"),
-    CERTIFICATE_REPORT("certificateReport", "certificateReport", "证书报告"),
-    ADVICE_EXPORT("adviceData", "adviceData", "客户反馈"),
-    HANDOUT_EXPORT("handoutData", "handoutData", "任务分发列表"),
-    OUTSOURCER_EXPORT("outsourcerData", "outsourcerData", "分包方"),
-    SITE_EXECUTIVE_EXPORT("siteExecutiveData", "siteExecutiveData", "现场测试、校准或检定"),
-    CERTIFICATE_PRINT_EXPORT("certificatePrintData", "certificatePrintData", "证书打印"),
-    DOWNLOAD_TEMPLATE("downloadTemplate", "downloadTemplate", "页面配置"),
-    OUTSOURCER_CERTIFICATE_EXPORT("outsourceCertificateData", "outsourceCertificateData", "分包证书"),
-    SETTLEMENT_INFO_EXPORT("settlementInfoData", "settlementInfoData", "业务结算"),
-    EQUIPMENT_REMIND("equipmentRemind", "equipmentRemind", "设备到期提醒"),
-    AGREEMENT_INFO_EXPORT("agreementInfoData", "agreementInfoData", "合同"),
-    WORK_STATISTICS_EXPORT("workStatisticsData", "workStatisticsData", "实时工作统计"),
-    DEPT_OUTPUT_EXPORT("deptOutputData", "deptOutputData", "部门产值分析"),
-    WORKLOAD_EXPORT("workloadData", "workloadData", "业务工作量分析"),
-    DEPT_COMPREHENSIVE_EXPORT("deptComprehensiveData", "deptComprehensiveData", "部门综合分析"),
-    ENVIRONMENTAL_RECORD("environmentalRecordData", "environmentalRecordData", "现场环境记录");
+    /**
+     * 计量检定业务
+     */
+    OUTSOURCER_EXPORT("outsourcerData", "分包方名录", "分包方名录"),
+    IDENTIFY_EXPORT("identifyData", "计量标识", "计量标识"),
+    ORDER_EXPORT("orderData", "任务单", "任务单"),
+    DISPATCH_DATA("dispatchData", "设备收发", "设备收发"),
+    HANDOUT_EXPORT("handoutData", "任务分发", "任务分发"),
+    SITE_EXECUTIVE_EXPORT("siteExecutiveData", "现场测试、校准或检定", "现场测试、校准或检定"),
+    CERTIFICATE_REPORT("certificateReport", "证书审批", "证书审批"),
+    CERTIFICATE_CHANGE_APPLY("certificateChangeApply", "证书报告补充或更换申请单", "证书报告补充或更换申请单"),
+    CERTIFICATE_PRINT("certificatePrintData", "证书打印审批", "证书打印审批"),
+    DEPT_EXECUTIVE_TASK("deptExecutiveTaskData", "实验室任务", "实验室任务"),
+    MY_EXECUTIVE_TASK("myExecutiveTaskData", "我的任务", "我的任务"),
+    OUTSOURCE_ASSESS("outsourceAssess", "测试、校准或检定工作分包评审表", "测试、校准或检定工作分包评审表"),
+    OUTSOURCE_PROTOCOL("outsourceProtocol", "测试、校准或检定工作分包协议书", "测试、校准或检定工作分包协议书"),
+
+    /**
+     * 系统管理
+     */
+    SIGN_EXPORT("signData", "签名", "签名"),
+    TEMPLATE_EXPORT("templateData", "文件模板", "文件模板"),
+    FLOW_DEF_EXPORT("flowDefData", "流程定义", "流程定义"),
+    DOWNLOAD_TEMPLATE("downloadTemplate", "流程定义", "页面配置");
 
     ExportEnum(String fileName, String sheetName, String description) {
         this.fileName = fileName;
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateRecordTypeCodeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateRecordTypeCodeEnum.java
index 31d913c..a963522 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateRecordTypeCodeEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateRecordTypeCodeEnum.java
@@ -46,4 +46,14 @@
     String SITE_EXECUTIVE_APPROVAL = "01";
     //《现场测试、校准或检定工作记录表》
     String SITE_EXECUTIVE_LOG = "02";
+
+    //测试、校准或检定工作分包协议书
+    String OUTSOURCE_PROTOCOL = "01";
+    //测试、校准或检定工作分包评审表
+    String OUTSOURCE_ACCESS = "02";
+    //测试、校准或检定工作分包通知书
+    String OUTSOURCE_NOTICE = "03";
+    //测试、校准或检定工作分包方名录
+    String OUTSOURCE_INFO = "04";
+
 }
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
index 24b8635..f78bd53 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
@@ -15,6 +15,10 @@
     String CERTIFICATE_CHANGE_APPLY_BEAN_NAME = "certificateChangeApplyBean";
     //现场测试、校准或检定
     String SITE_EXECUTIVE_BEAN_NAME = "siteExecutiveBean";
+    //测试、校准或检定工作分包评审表
+    String OUTSOURCE_ASSESS_BEAN_NAME = "outsourceAssessBean";
+    //测试、校准或检定工作分包协议书
+    String OUTSOURCE_PROTOCOL_BEAN_NAME = "outsourceProtocolBean";
 
     /*********************************设备与装置************************************/
     //设备台账
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 b21c661..6b86fd1 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
@@ -18,6 +18,8 @@
     OUTSOURCER_APPROVAL(OUTSOURCER_BEAN_NAME, ""),
     CERTIFICATE_CHANGE_APPROVAL(CERTIFICATE_CHANGE_APPLY_BEAN_NAME, ""),
     SITE_EXECUTIVE_APPROVAL(SITE_EXECUTIVE_BEAN_NAME, ""),
+    OUTSOURCE_ASSESS_APPROVAL(OUTSOURCE_ASSESS_BEAN_NAME, ""),
+    OUTSOURCE_PROTOCOL_APPROVAL(OUTSOURCE_PROTOCOL_BEAN_NAME, ""),
 
     ACTION_STATUS_MAP(new HashMap<String, AwareActionStatusEnum>() {
         {
@@ -47,6 +49,10 @@
             put(ApplyFromIdEnum.CERTIFICATE_CHANGE_APPROVAL.getCode(), CERTIFICATE_CHANGE_APPROVAL);
             //现场测试、校准或检定审批
             put(ApplyFromIdEnum.SITE_EXECUTIVE_APPROVAL.getCode(), SITE_EXECUTIVE_APPROVAL);
+            //测试、校准或检定工作分包评审表
+            put(ApplyFromIdEnum.OUTSOURCE_ASSESS_APPROVAL.getCode(), OUTSOURCE_ASSESS_APPROVAL);
+            //测试、校准或检定工作分包协议书
+            put(ApplyFromIdEnum.OUTSOURCE_PROTOCOL_APPROVAL.getCode(), OUTSOURCE_PROTOCOL_APPROVAL);
         }
     });
     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 934405e..c7410bd 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
@@ -9,6 +9,8 @@
     CERTIFICATE_CHANGE_APPROVAL("jljdywzsbchghsqd", MessageSourceModuleEnum.BUSINESS.getCode(), "证书/报告补充或更换申请单"),
     OUTSOURCER_APPROVAL("jljdywcsjzhgfbfml", MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定合格分包方名录"),
     SITE_EXECUTIVE_APPROVAL("jljdywxccsjzsp", MessageSourceModuleEnum.BUSINESS.getCode(), "现场测试、校准或检定审批"),
+    OUTSOURCE_ASSESS_APPROVAL("jljdywcsjzfbpsb", MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包评审表"),
+    OUTSOURCE_PROTOCOL_APPROVAL("jljdywcsjzfbxys", MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包协议书"),
 
 
     /*******************************************设备与装置*********************************************/
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/GeneralApprovalMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/GeneralApprovalMapper.java
index 4fb7344..0c9d6ae 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/GeneralApprovalMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/GeneralApprovalMapper.java
@@ -17,8 +17,4 @@
 
     Page<O> selectBatchForApprovalList(Page<O> page, @Param("request") R request, @Param("businessKeys") List<String> businessKeys);
 
-//    Page<O> selectListPage(Page<O> page, @Param("request") R request);
-
-//    Long selectMaxNo();
-
 }
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceAssessMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceAssessMapper.java
index 7867bb8..ba59009 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceAssessMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceAssessMapper.java
@@ -1,7 +1,12 @@
 package com.casic.missiles.mapper.business;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.business.outsource.OutsourceAssessApprovalListRequest;
+import com.casic.missiles.mapper.GeneralApprovalMapper;
 import com.casic.missiles.model.business.BizBusinessOutsourceAssess;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * <p>
@@ -11,6 +16,10 @@
  * @author wangpeng
  * @since 2023-08-16
  */
-public interface BizBusinessOutsourceAssessMapper extends BaseMapper<BizBusinessOutsourceAssess> {
+public interface BizBusinessOutsourceAssessMapper extends GeneralApprovalMapper<BizBusinessOutsourceAssess, BizBusinessOutsourceAssess, OutsourceAssessApprovalListRequest> {
+
+    Page<BizBusinessOutsourceAssess> selectBatchForApprovalList(Page<BizBusinessOutsourceAssess> page, @Param("request") OutsourceAssessApprovalListRequest request, @Param("businessKeys") List<String> businessKeys);
+
+    Long selectMaxProjectNo();
 
 }
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceProtocolMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceProtocolMapper.java
new file mode 100644
index 0000000..e6aba35
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceProtocolMapper.java
@@ -0,0 +1,24 @@
+package com.casic.missiles.mapper.business;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.business.outsource.OutsourceProtocolApprovalListRequest;
+import com.casic.missiles.mapper.GeneralApprovalMapper;
+import com.casic.missiles.model.business.BizBusinessOutsourceProtocol;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 计量检定业务-分包管理-测试、校准或检定工作分包协议书 Mapper 接口
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-08-24
+ */
+public interface BizBusinessOutsourceProtocolMapper extends GeneralApprovalMapper<BizBusinessOutsourceProtocol, BizBusinessOutsourceProtocol, OutsourceProtocolApprovalListRequest> {
+
+    Page<BizBusinessOutsourceProtocol> selectBatchForApprovalList(Page<BizBusinessOutsourceProtocol> page, @Param("request") OutsourceProtocolApprovalListRequest request, @Param("businessKeys") List<String> businessKeys);
+
+    Long selectMaxProtocolNo();
+}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/EnvLocationInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/EnvLocationInfoMapper.java
new file mode 100644
index 0000000..49eff87
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/EnvLocationInfoMapper.java
@@ -0,0 +1,21 @@
+package com.casic.missiles.mapper.resource;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.resource.environment.LocationListRequest;
+import com.casic.missiles.dto.resource.environment.LocationListResponse;
+import com.casic.missiles.model.resource.EnvLocationInfo;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * <p>
+ * 实验室环境监控系统-设备表 Mapper 接口
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-06-07
+ */
+public interface EnvLocationInfoMapper extends BaseMapper<EnvLocationInfo> {
+
+    Page<LocationListResponse> selectLocationListPage(Page<LocationListResponse> page, @Param("request") LocationListRequest request);
+}

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java
index bb0c50f..13a699b 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java
@@ -12,6 +12,7 @@
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.IGeneralApprovalService;
+import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
@@ -19,6 +20,7 @@
 import org.springframework.web.bind.annotation.RequestBody;
 
 import javax.validation.Valid;
+import java.util.List;
 import java.util.Objects;
 
 /**
@@ -117,4 +119,17 @@
         }
         return baseApprovalService.failUpdate(request);
     }
+
+    public List<O> exportList(@RequestBody @Valid R request) throws Exception {
+        List<O> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = baseApprovalService.listExportByIds(request.getIds());
+        } else {
+            list = baseApprovalService.listExport(request);
+        }
+        for (O record : list) {
+            DictCodeUtils.convertDictCodeToName(record);
+        }
+        return list;
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java
index 8a90961..d775831 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java
@@ -5,6 +5,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.business.certificate.CertificateChangeApplyApprovalListRequest;
 import com.casic.missiles.dto.business.certificate.CertificateChangeApplySaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessCertificateChangeApply;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
@@ -20,6 +21,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -48,4 +50,12 @@
         }
         return changeApplyService.saveChangeApply(request);
     }
+
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody CertificateChangeApplyApprovalListRequest request) throws Exception {
+        List<BizBusinessCertificateChangeApply> list = super.exportList(request);
+        super.exportExcel(BizBusinessCertificateChangeApply.class, list, ExportEnum.CERTIFICATE_CHANGE_APPLY.getSheetName());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java
index 5fc4b07..af8230e 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java
@@ -9,6 +9,7 @@
 import com.casic.missiles.dto.business.certificate.CertificatePrintApprovalListRequest;
 import com.casic.missiles.dto.business.certificate.CertificatePrintListResponse;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.enums.business.CertificatePrintStatusEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessCertificatePrintLog;
@@ -18,10 +19,16 @@
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.io.IOException;
+import java.util.List;
 import java.util.Objects;
 
 /**
@@ -98,4 +105,16 @@
         });
         return certificatePrintService.certificatePrintLog(idDTO.getId());
     }
+
+    @ApiOperation("证书打印审批导出")
+    @PostMapping("/listExport")
+    public void exportList(@RequestBody CertificatePrintApprovalListRequest request) throws IOException {
+        List<CertificatePrintListResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = certificatePrintService.listByIds(request.getIds());
+        } else {
+            list = certificatePrintService.list(request);
+        }
+        super.exportExcel(CertificatePrintListResponse.class, list, ExportEnum.CERTIFICATE_PRINT.getSheetName());
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java
index 63b06dc..6b2efd5 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java
@@ -6,6 +6,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.business.certificate.CertificateReportApprovalListRequest;
 import com.casic.missiles.dto.business.certificate.CertificateReportSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessCertificateReport;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
@@ -21,6 +22,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -50,7 +52,7 @@
         return certificateReportService.saveCertificateReport(request);
     }
 
-    @ApiOperation("证书审批详情（基本信息）")
+    @ApiOperation("详情（基本信息）")
     @PostMapping("/detail")
     public ReturnDTO<BizBusinessCertificateReport> detail(@RequestBody @Valid BaseDetailRequest request, BindingResult bindingResult) throws Exception {
         if(bindingResult.hasErrors()){
@@ -59,4 +61,11 @@
         return certificateReportService.detail(request);
     }
 
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody CertificateReportApprovalListRequest request) throws Exception {
+        List<BizBusinessCertificateReport> list = super.exportList(request);
+        super.exportExcel(BizBusinessCertificateReport.class, list, ExportEnum.CERTIFICATE_REPORT.getSheetName());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java
index 46b26bd..57c0809 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java
@@ -10,20 +10,21 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.business.identify.IdentifyListRequest;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessIdentifyInfo;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.business.IBizBusinessIdentifyInfoService;
+import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import javax.validation.Valid;
+import java.util.List;
 import java.util.Objects;
 
 /**
@@ -57,16 +58,13 @@
         return identifyInfoService.addIdentify(identifyInfo);
     }
 
-    @ApiOperation("标识打印更新")
+    @ApiOperation("标识打印更新（更新打印时间）")
     @PostMapping("/update")
-    public ReturnDTO updateIdentify(@RequestBody @Valid BizBusinessIdentifyInfo identifyInfo, BindingResult bindingResult) {
-        Assert.isFalse(Objects.isNull(identifyInfo.getId()), () -> {
+    public ReturnDTO updateIdentify(@RequestBody @Valid IdDTO idDTO) {
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        Assert.isFalse(bindingResult.hasErrors(), () -> {
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        });
-        return identifyInfoService.updateIdentify(identifyInfo);
+        return identifyInfoService.updateIdentify(idDTO.getId());
     }
 
     @ApiOperation("标识打印删除")
@@ -77,4 +75,37 @@
         });
         return identifyInfoService.deleteIdentify(idDTO.getId());
     }
+
+    @ApiOperation("标识打印导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody @Valid IdentifyListRequest request, BindingResult bindingResult) throws Exception {
+        if (bindingResult.hasErrors()) {
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        List<BizBusinessIdentifyInfo> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = identifyInfoService.listByIds(request.getIds());
+        } else {
+            list = identifyInfoService.list(request);
+        }
+        for (BizBusinessIdentifyInfo record : list) {
+            DictCodeUtils.convertDictCodeToName(record);
+        }
+        super.exportExcel(BizBusinessIdentifyInfo.class, list, ExportEnum.IDENTIFY_EXPORT.getSheetName());
+    }
+
+
+    // TODO: 2023/8/23 查询设备信息，4个底部按钮查设备（按钮的作用就是前端用来调不同接口、用来区分中间即将展示的标识），前端弹窗选设备，在确定保存时前端根据底部按钮判断传入设备类型deviceType字典code
+    // TODO: 2023/8/23 接口：查受检设备（第1个按钮），查设备台账（后3个按钮同一接口），查询之后前端根据标志类型的不同加到中间页面时进行判断（按产品给的对应表）
+    // TODO: 2023/8/23 提供二维码接口，前端在加到中间页面时调用一下
+
+    @ApiOperation("设备二维码")
+    @PostMapping("/equipment/qrCode")
+    public ReturnDTO<String> equipmentQrCode(@RequestBody @Valid IdDTO idDTO) {
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return identifyInfoService.equipmentQrCode(idDTO.getId());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java
index 707be6e..7e0453d 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java
@@ -117,7 +117,7 @@
     }
 
     @ApiOperation("任务单导出")
-    @PostMapping("/export")
+    @PostMapping("/listExport")
     public void orderExport(@RequestBody @Valid OrderListRequest request, HttpServletResponse response) {
         businessOrderService.orderExport(request, response);
     }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java
index 529a6ce..51432be 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java
@@ -1,9 +1,28 @@
 package com.casic.missiles.controller.business;
 
+import com.casic.missiles.controller.GeneralApprovalController;
+import com.casic.missiles.dto.BaseApprovalSubmitRequest;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.business.outsource.OutsourceAssessApprovalListRequest;
+import com.casic.missiles.dto.business.outsource.OutsourceAssessSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
+import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.model.business.BizBusinessOutsourceAssess;
+import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
+import com.casic.missiles.service.IGeneralApprovalService;
+import com.casic.missiles.service.business.IBizBusinessOutsourceAssessService;
 import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.BindingResult;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.validation.Valid;
+import java.util.List;
+
 /**
  * <p>
  * 计量检定业务-分包管理-测试、校准或检定工作分包评审表 前端控制器
@@ -15,6 +34,27 @@
 @Api(tags = "分包管理-测试、校准或检定工作分包评审表")
 @RestController
 @RequestMapping("/business/outsource/assess")
-public class BizBusinessOutsourceAssessController {
+public class BizBusinessOutsourceAssessController extends GeneralApprovalController<BizBusinessOutsourceAssess, BizBusinessOutsourceAssess, OutsourceAssessApprovalListRequest, BaseApprovalSubmitRequest> {
+    @Autowired
+    private IBizBusinessOutsourceAssessService outsourceAssessService;
 
+    public BizBusinessOutsourceAssessController(IGeneralApprovalService<BizBusinessOutsourceAssess, BizBusinessOutsourceAssess, OutsourceAssessApprovalListRequest, BaseApprovalSubmitRequest> baseApprovalService) {
+        super(baseApprovalService);
+    }
+
+    @ApiOperation("草稿箱-保存")
+    @PostMapping("/save")
+    public ReturnDTO<OutsourceAssessSaveResponse> saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceAssess request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        return outsourceAssessService.saveOutsourceAssess(request);
+    }
+
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception {
+        List<BizBusinessOutsourceAssess> list = super.exportList(request);
+        super.exportExcel(BizBusinessOutsourceAssess.class, list, ExportEnum.OUTSOURCE_ASSESS.getSheetName());
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java
new file mode 100644
index 0000000..9adef18
--- /dev/null
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java
@@ -0,0 +1,60 @@
+package com.casic.missiles.controller.business;
+
+import com.casic.missiles.controller.GeneralApprovalController;
+import com.casic.missiles.dto.BaseApprovalSubmitRequest;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.business.outsource.OutsourceProtocolApprovalListRequest;
+import com.casic.missiles.dto.business.outsource.OutsourceProtocolSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
+import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.model.business.BizBusinessOutsourceProtocol;
+import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
+import com.casic.missiles.service.IGeneralApprovalService;
+import com.casic.missiles.service.business.IBizBusinessOutsourceProtocolService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.BindingResult;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.validation.Valid;
+import java.util.List;
+
+/**
+ * <p>
+ * 计量检定业务-分包管理-测试、校准或检定工作分包协议书 前端控制器
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-08-24
+ */
+@Api(tags = "分包管理-测试、校准或检定工作分包协议书")
+@RestController
+@RequestMapping("/business/outsource/protocol")
+public class BizBusinessOutsourceProtocolController extends GeneralApprovalController<BizBusinessOutsourceProtocol, BizBusinessOutsourceProtocol, OutsourceProtocolApprovalListRequest, BaseApprovalSubmitRequest> {
+    @Autowired
+    private IBizBusinessOutsourceProtocolService outsourceProtocolService;
+
+    public BizBusinessOutsourceProtocolController(IGeneralApprovalService<BizBusinessOutsourceProtocol, BizBusinessOutsourceProtocol, OutsourceProtocolApprovalListRequest, BaseApprovalSubmitRequest> baseApprovalService) {
+        super(baseApprovalService);
+    }
+
+    @ApiOperation("草稿箱-保存")
+    @PostMapping("/save")
+    public ReturnDTO<OutsourceProtocolSaveResponse> saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceProtocol request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        return outsourceProtocolService.saveOutsourceProtocol(request);
+    }
+
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody OutsourceProtocolApprovalListRequest request) throws Exception {
+        List<BizBusinessOutsourceProtocol> list = super.exportList(request);
+        super.exportExcel(BizBusinessOutsourceProtocol.class, list, ExportEnum.OUTSOURCE_PROTOCOL.getSheetName());
+    }
+}
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java
index 097f645..f0f0943 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java
@@ -17,7 +17,6 @@
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.IGeneralApprovalService;
 import com.casic.missiles.service.business.IBizBusinessOutsourcerInfoService;
-import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -71,19 +70,8 @@
 
     @ApiOperation("分包方导出")
     @PostMapping("/listExport")
-    public void export(@RequestBody @Valid OutsourcerInfoApprovalListRequest request, BindingResult bindingResult) throws Exception {
-        if (bindingResult.hasErrors()) {
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        }
-        List<BizBusinessOutsourcerInfo> list;
-        if (!CollectionUtils.isEmpty(request.getIds())) {
-            list = outsourcerInfoService.listByIds(request.getIds());
-        } else {
-            list = outsourcerInfoService.list(request);
-        }
-        for (BizBusinessOutsourcerInfo record : list) {
-            DictCodeUtils.convertDictCodeToName(record);
-        }
+    public void export(@RequestBody OutsourcerInfoApprovalListRequest request) throws Exception {
+        List<BizBusinessOutsourcerInfo> list = super.exportList(request);
         super.exportExcel(BizBusinessOutsourcerInfo.class, list, ExportEnum.OUTSOURCER_EXPORT.getSheetName());
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java
index c2cbf9f..0410918 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java
@@ -17,11 +17,9 @@
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.IGeneralApprovalService;
 import com.casic.missiles.service.business.IBizBusinessSiteExecutiveInfoService;
-import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -60,7 +58,7 @@
         return siteExecutiveInfoService.saveSiteExecutiveInfo(siteExecutiveInfo);
     }
 
-    @ApiOperation("现场检测详情")
+    @ApiOperation("详情")
     @PostMapping("/detail")
     public ReturnDTO<SiteExecutiveDetailResponse> siteExecutiveDetail(@RequestBody @Valid IdDTO idDTO) throws Exception {
         Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
@@ -69,21 +67,10 @@
         return ReturnUtil.success(siteExecutiveInfoService.detail(idDTO.getId()));
     }
 
-    @ApiOperation("现场检测导出")
+    @ApiOperation("导出")
     @PostMapping("/listExport")
-    public void export(@RequestBody @Valid SiteExecutiveApprovalListRequest request, BindingResult bindingResult) throws Exception {
-        if (bindingResult.hasErrors()) {
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        }
-        List<SiteExecutiveApprovalListResponse> list;
-        if (!CollectionUtils.isEmpty(request.getIds())) {
-            list = siteExecutiveInfoService.listInfoByIds(request.getIds());
-        } else {
-            list = siteExecutiveInfoService.listInfo(request);
-        }
-        for (SiteExecutiveApprovalListResponse record : list) {
-            DictCodeUtils.convertDictCodeToName(record);
-        }
+    public void export(@RequestBody SiteExecutiveApprovalListRequest request) throws Exception {
+        List<SiteExecutiveApprovalListResponse> list = super.exportList(request);
         super.exportExcel(SiteExecutiveApprovalListResponse.class, list, ExportEnum.SITE_EXECUTIVE_EXPORT.getSheetName());
     }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
index 7e793cd..a92e209 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
@@ -55,7 +55,7 @@
 
     @ApiOperation("设备收发列表导出")
     @PostMapping("/export")
-    public void exportList(@RequestBody @Valid SampleDispatchListRequest request) throws IOException {
+    public void exportList(@RequestBody SampleDispatchListRequest request) throws IOException {
         List<SampleDispatchListResponse> list;
         if (!CollectionUtils.isEmpty(request.getIds())) {
             list = dispatchService.listByIds(request.getIds());
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java
index cdc77fc..d120fd4 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java
@@ -7,6 +7,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.business.labExecutive.*;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.business.IBusinessLabExecutiveInfoService;
@@ -14,6 +15,7 @@
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.*;
 
@@ -32,7 +34,7 @@
     @Autowired
     private IBusinessLabExecutiveInfoService labExecutiveInfoService;
 
-    @ApiOperation("实验室检测-部门检测-查询各状态列表（待检测、检测中、检测完）")
+    @ApiOperation("实验室任务-查询各状态列表（待检测、检测中、检测完）")
     @PostMapping("/deptExecutive/List")
     public ReturnDTO<PageInfoBT<SampleLabExecutiveListResponse>> queryDeptExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
@@ -43,10 +45,19 @@
         return ReturnUtil.success(super.packForBT(labExecutiveInfoService.deptLabExecutiveListPage(page, labExecutiveListRequest)));
     }
 
-    /**
-     * 实验室检测-我的检测-查询各状态列表（待检测、检测中、检测完）
-     */
-    @ApiOperation("实验室检测-我的检测-查询各状态列表（待检测、检测中、检测完）")
+    @ApiOperation("实验室任务导出")
+    @PostMapping("/deptExecutive/export")
+    public void deptExportList(@RequestBody @Valid SampleLabExecutiveListRequest request) throws Exception {
+        List<SampleLabExecutiveListResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = labExecutiveInfoService.deptLabExecutiveListByIds(request.getMeasureStatus(), request.getIds());
+        } else {
+            list = labExecutiveInfoService.deptLabExecutiveList(request);
+        }
+        super.exportExcel(SampleLabExecutiveListResponse.class, list, ExportEnum.DEPT_EXECUTIVE_TASK.getSheetName());
+    }
+
+    @ApiOperation("我的任务-查询各状态列表（待检测、检测中、检测完）")
     @PostMapping("/myExecutive/list")
     public ReturnDTO<PageInfoBT<SampleLabExecutiveListResponse>> queryMyExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
@@ -57,19 +68,25 @@
         return ReturnUtil.success(super.packForBT(labExecutiveInfoService.myLabExecutiveListPage(page, labExecutiveListRequest)));
     }
 
-    /**
-     * 实验室检测-我的检测-查询各状态样品数量（待检测、检测中、检测完）
-     */
-    @ApiOperation("实验室检测-我的检测-查询各状态样品数量（待检测、检测中、检测完）")
+    @ApiOperation("我的任务导出")
+    @PostMapping("/myExecutive/export")
+    public void exportList(@RequestBody @Valid SampleLabExecutiveListRequest request) throws Exception {
+        List<SampleLabExecutiveListResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = labExecutiveInfoService.myLabExecutiveListByIds(request.getMeasureStatus(), request.getIds());
+        } else {
+            list = labExecutiveInfoService.myLabExecutiveList(request);
+        }
+        super.exportExcel(SampleLabExecutiveListResponse.class, list, ExportEnum.MY_EXECUTIVE_TASK.getSheetName());
+    }
+
+    @ApiOperation("我的任务-查询各状态样品数量（待检测、检测中、检测完）")
     @GetMapping("/myExecutive/amount")
     public ReturnDTO<List<SampleAmountResponse>> queryMyExecutiveAmount() {
         return ReturnUtil.success(labExecutiveInfoService.myExecutiveAmount());
     }
 
-    /**
-     * 实验室检测-部门检测-分配（分配给具体人员）
-     */
-    @ApiOperation("实验室检测-部门检测-分配按钮（分配给具体人员）")
+    @ApiOperation("实验室任务-分配按钮（分配给具体人员）")
     @PostMapping("/deptExecutive/allocate")
     public ReturnDTO allocateStaff(@RequestBody @Valid SampleAllocateRequest sampleAllocateRequest, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -78,10 +95,7 @@
         return labExecutiveInfoService.allocateStaff(sampleAllocateRequest);
     }
 
-    /**
-     * 实验室检测-我的检测-检定人扫描收入（待检测->检测中）
-     */
-    @ApiOperation("实验室检测-我的检测-检定人扫描收入（待检测->检测中）")
+    @ApiOperation("我的任务-检定人扫描收入（待检测->检测中）")
     @PostMapping("/myExecutive/receive")
     public ReturnDTO sampleReceive(@RequestBody @Valid List<SampleOperateRequest> requestList, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -90,10 +104,7 @@
         return labExecutiveInfoService.sampleReceive(requestList);
     }
 
-    /**
-     * 实验室检测-负责人/检定人扫描检完（检测中->检测完）
-     */
-    @ApiOperation("实验室检测-负责人/检定人扫描检完（检测中->检测完）")
+    @ApiOperation("实验室任务-负责人/检定人扫描检完（检测中->检测完）")
     @PostMapping("/myExecutive/complete")
     public ReturnDTO sampleExecutiveComplete(@RequestBody @Valid List<SampleOperateRequest> requestList, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -102,10 +113,7 @@
         return labExecutiveInfoService.sampleExecutiveComplete(requestList);
     }
 
-    /**
-     * 实验室检测-部门检测/我的检测 编辑（只能修改应出具证书）
-     */
-    @ApiOperation("实验室检测-部门检测/我的检测 编辑（只能修改应出具证书）")
+    @ApiOperation("实验室任务/我的任务 编辑（只能修改应出具证书）")
     @PostMapping("/executive/update")
     public ReturnDTO updateExecutive(@RequestBody @Valid UpdateExecutiveRequest request, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -114,10 +122,7 @@
         return labExecutiveInfoService.updateExecutive(request);
     }
 
-    /**
-     * 实验室检测-部门检测/我的检测 详情
-     */
-    @ApiOperation("实验室检测-部门检测/我的检测 详情")
+    @ApiOperation("实验室任务/我的任务 详情")
     @PostMapping("/executive/detail")
     public ReturnDTO<ExecutiveDetailResponse> executiveDetail(@RequestBody @Valid ExecutiveDetailRequest request, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
@@ -131,7 +136,7 @@
      * 退回后会将下一个要执行的实验室检测状态更新为待分配，将后面的实验室顺序变更为连续（都进行减1）
      * 最后一个检测的实验室退回，等分发员再增加实验室或设备收发中的已收入直接手动点击完成
      */
-    @ApiOperation("实验室检测-部门检测/我的检测 退回（待检测/检测中->退回）")
+    @ApiOperation("实验室任务/我的任务 退回（待检测/检测中->退回）")
     @PostMapping("/executive/sendBack")
     public ReturnDTO executiveSendBack(@RequestBody @Valid ExecutiveSendBackRequest request, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -140,9 +145,6 @@
         return labExecutiveInfoService.sampleExecutiveSendBack(request);
     }
 
-    /**
-     * 分发员编辑实验室检测列表
-     */
     @ApiOperation("分发员编辑实验室检测列表")
     @PostMapping("/handOut/updateList")
     public ReturnDTO updateExecutiveList(@RequestBody @Valid UpdateExecutiveListRequest request, BindingResult bindingResult) {
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java
index 48a67ed..0c04f31 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java
@@ -10,6 +10,7 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.resource.customer.CustomerApprovalListRequest;
 import com.casic.missiles.dto.resource.customer.CustomerSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceCustomerInfo;
@@ -26,6 +27,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -55,6 +57,13 @@
         return customerInfoService.saveCustomerInfo(request);
     }
 
+    @ApiOperation("委托方名录导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody CustomerApprovalListRequest request) throws Exception {
+        List<BizResourceCustomerInfo> list = super.exportList(request);
+        super.exportExcel(BizResourceCustomerInfo.class, list, ExportEnum.CUSTOMER_INFO.getSheetName());
+    }
+
     @ApiOperation("委托方人员列表（分页）")
     @PostMapping("/person/listPage")
     public ReturnDTO<PageInfoBT<BizResourceCustomerStaff>> personListPage(@RequestBody IdDTO idDto) {
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
index 972ed4b..6418ea5 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
@@ -5,6 +5,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.resource.customer.SuggestFormApprovalListRequest;
 import com.casic.missiles.dto.resource.customer.SuggestFormSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceCustomerSuggestForm;
@@ -20,6 +21,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -50,4 +52,11 @@
         return suggestFormService.saveSuggestForm(request);
     }
 
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody SuggestFormApprovalListRequest request) throws Exception {
+        List<BizResourceCustomerSuggestForm> list = super.exportList(request);
+        super.exportExcel(BizResourceCustomerSuggestForm.class, list, ExportEnum.CUSTOMER_SUGGEST_FORM.getSheetName());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java
index 1934d1a..9e07eab 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java
@@ -15,12 +15,16 @@
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.resource.IEnvEnvironmentRecordConfigService;
 import com.casic.missiles.service.resource.IEnvEnvironmentRecordDataService;
+import com.casic.missiles.service.resource.IEnvLocationInfoService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
 import java.util.List;
@@ -39,6 +43,8 @@
     private IEnvEnvironmentRecordDataService environmentRecordDataService;
     @Autowired
     private IEnvEnvironmentRecordConfigService environmentRecordConfigService;
+    @Autowired
+    private IEnvLocationInfoService locationInfoService;
 
     @ApiOperation("环境记录单数据列表/详情")
     @PostMapping("/data/listPage")
@@ -95,4 +101,11 @@
         });
         return environmentRecordConfigService.deleteEnvironmentRecordConfig(idDTO.getId());
     }
+
+    @ApiOperation("地点列表")
+    @PostMapping("/location/listPage")
+    public ReturnDTO<PageInfoBT<LocationListResponse>> locationListPage(@RequestBody @Valid LocationListRequest request) {
+        Page<LocationListResponse> page = PageFactory.defaultPage();
+        return ReturnUtil.success(super.packForBT(locationInfoService.listPage(page, request)));
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java
index 82efe3f..e9561fa 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java
@@ -10,6 +10,7 @@
 import com.casic.missiles.dto.resource.seal.SealLogListRequest;
 import com.casic.missiles.dto.resource.seal.SealNoteApprovalListRequest;
 import com.casic.missiles.dto.resource.seal.SealNoteSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceSealUseLog;
@@ -27,6 +28,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -58,6 +60,13 @@
         return sealUseNoteService.saveSeal(request);
     }
 
+    @ApiOperation("印章使用登记导出（列表和导出中去掉经办人和监印人）")
+    @PostMapping("/listExport")
+    public void export(@RequestBody SealNoteApprovalListRequest request) throws Exception {
+        List<BizResourceSealUseNote> list = super.exportList(request);
+        super.exportExcel(BizResourceSealUseNote.class, list, ExportEnum.SEAL_NOTE.getSheetName());
+    }
+
     // TODO: 2023/7/28 印章使用日志：系统中使用印章时插入数据库
 
     @ApiOperation("印章使用日志列表（分页）")
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java
index 9b674fc..06b6521 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java
@@ -9,16 +9,20 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.resource.staff.StaffCertRequest;
 import com.casic.missiles.dto.resource.staff.StaffCertResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.service.resource.IBizResourceStaffInfoService;
 import com.casic.missiles.service.resource.IBizResourceStaffVerifierService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.List;
+
 /**
  * @Description:
  * @Author: wangpeng
@@ -41,9 +45,21 @@
         return ReturnUtil.success(super.packForBT(responsePage));
     }
 
+    @ApiOperation("证书逾期提醒导出")
+    @PostMapping("/listExport")
+    public void exportList(@RequestBody StaffCertRequest request) throws Exception {
+        List<StaffCertResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = staffInfoService.certListByIds(request.getIds());
+        } else {
+            list = staffInfoService.certList(request);
+        }
+        super.exportExcel(StaffCertResponse.class, list, ExportEnum.STAFF_CERTIFICATE_EXPIRE.getSheetName());
+    }
+
     @ApiOperation("证书逾期提醒")
     @PostMapping("/expirationReminder")
-    public ReturnDTO expirationReminder(@RequestBody IdDTO idDto) {
-        return verifierService.expirationReminder(idDto);
+    public ReturnDTO expirationReminder(@RequestBody IdDTO idDTO) {
+        return verifierService.expirationReminder(idDTO);
     }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java
index 3b251ad..a6e7850 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java
@@ -12,6 +12,7 @@
 import com.casic.missiles.dto.resource.staff.StaffListRequest;
 import com.casic.missiles.dto.resource.staff.TrainListRequest;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.*;
@@ -22,7 +23,10 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
 import java.util.List;
@@ -52,8 +56,19 @@
             throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
         }
         Page<BizResourceStaffInfo> page = PageFactory.defaultPage();
-        Page<BizResourceStaffInfo> responsePage = staffInfoService.listPage(page, request);
-        return ReturnUtil.success(super.packForBT(responsePage));
+        return ReturnUtil.success(super.packForBT(staffInfoService.listPage(page, request)));
+    }
+
+    @ApiOperation("人员登记导出")
+    @PostMapping("/listExport")
+    public void exportList(@RequestBody StaffListRequest request) throws Exception {
+        List<BizResourceStaffInfo> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = staffInfoService.listByIds(request.getIds());
+        } else {
+            list = staffInfoService.list(request);
+        }
+        super.exportExcel(BizResourceStaffInfo.class, list, ExportEnum.STAFF_INFO.getSheetName());
     }
 
     @ApiOperation("人员登记详情基础信息")
@@ -85,9 +100,9 @@
 
     @ApiOperation("科研教育列表（分页）")
     @PostMapping("/education/listPage")
-    public ReturnDTO<PageInfoBT<BizResourceStaffEducation>> educationListPage(@RequestBody IdDTO idDto) {
+    public ReturnDTO<PageInfoBT<BizResourceStaffEducation>> educationListPage(@RequestBody IdDTO idDTO) {
         Page<BizResourceStaffEducation> page = PageFactory.defaultPage();
-        Page<BizResourceStaffEducation> responsePage = staffInfoService.educationListPage(page, idDto);
+        Page<BizResourceStaffEducation> responsePage = staffInfoService.educationListPage(page, idDTO);
         return ReturnUtil.success(super.packForBT(responsePage));
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java
index af6aa86..d85d84a 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java
@@ -9,6 +9,7 @@
 import com.casic.missiles.dto.resource.outsideService.SupplierApprovalListRequest;
 import com.casic.missiles.dto.resource.outsideService.SupplierSaveResponse;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceSupplierAbility;
@@ -67,6 +68,13 @@
         return ReturnUtil.success(supplierInfoService.detail(idDTO.getId()));
     }
 
+    @ApiOperation("合格供方导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody SupplierApprovalListRequest request) throws Exception {
+        List<BizResourceSupplierInfo> list = super.exportList(request);
+        super.exportExcel(BizResourceSupplierInfo.class, list, ExportEnum.SUPPLIER_INFO.getSheetName());
+    }
+
     @ApiOperation("供方人员列表（分页）")
     @PostMapping("/person/listPage")
     public ReturnDTO<PageInfoBT<BizResourceSupplierPerson>> personListPage(@RequestBody IdDTO idDTO) {
diff --git a/casic-metering-api/src/main/resources/config/application.yml b/casic-metering-api/src/main/resources/config/application.yml
index 350db5f..ecff521 100644
--- a/casic-metering-api/src/main/resources/config/application.yml
+++ b/casic-metering-api/src/main/resources/config/application.yml
@@ -126,7 +126,7 @@
     #作者
     author: wangpeng
     #待生成对象表名
-    table-name: biz_equipment_technical_target_approval,biz_equipment_attachment_approval,biz_equipment_checkpoint_approval
+    table-name: biz_business_outsource_protocol
 
 reminder:
   #节点--common模块config包 ReminderNodeConfig配置
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
index 4a19e4e..d47d552 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
@@ -53,6 +53,7 @@
     SUGGEST_FORM_SAVE_FAILED(2509, "委托方意见登记表保存至草稿箱失败"),
     EXAMINE_FORM_SAVE_FAILED(2510, "要求、委托书及合同评审表保存至草稿箱失败"),
     CUSTOMER_EXIST_SAVE_FAILED(2511, "该委托方已存在，请重新选择"),
+    DUPLICATE_LOCATION_NO(2512, "地点编号已存在"),
 
     /**
      * 计量检定业务模块
@@ -68,6 +69,8 @@
     COMPLETE_SAMPLE_NOT_EXIST(2609, "检测中不存在扫描收入的样品"),
     CANNOT_CHANGE_MEASURE_INFO(2610, "无法更改非当前登录用户的检测信息"),
     NON_EXIST_ORDER_OR_SAMPLE(2611, "不存在该委托单或该委托单下的样品"),
+    OUTSOURCE_ACCESS_SAVE_FAILED(2612, "测试、校准或检定工作分包评审表保存至草稿箱失败"),
+    OUTSOURCE_PROTOCOL_SAVE_FAILED(2613, "测试、校准或检定工作分包协议书保存至草稿箱失败"),
 
     /**
      * 历史遗留备用
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
index 5089ad1..81a406b 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
@@ -10,54 +10,38 @@
     /**
      * 资源管理
      */
-    ENVIRONMENT_DATA_EXPORT("environmentData", "environmentData", "环境记录单数据"),
+    ENVIRONMENT_DATA_EXPORT("environmentData", "环境记录单数据", "环境记录单数据"),
+    STAFF_INFO("staffInfo", "人员登记", "人员登记"),
+    STAFF_CERTIFICATE_EXPIRE("certificateExpire", "证书逾期提醒", "证书逾期提醒"),
+    SUPPLIER_INFO("supplierInfo", "合格供方名录", "合格供方名录"),
+    CUSTOMER_INFO("customerInfo", "委托方名录", "委托方名录"),
+    CUSTOMER_SUGGEST_FORM("customerSuggestForm", "委托方意见登记表", "委托方意见登记表"),
+    SEAL_NOTE("sealNote", "印章使用登记", "印章使用登记"),
 
-    FILE_EXPORT("meterFileData", "meterFileData", "计量文件信息"),
-    TRAIN_PLAN_EXPORT("trainPlanData", "trainPlanData", "培训计划"),
-    TRAIN_LOG_EXPORT("trainLogData", "trainLogData", "培训记录"),
-    METER_ORGANIZE_EXPORT("meterOrganizeData", "meterOrganizeData", "计量组织"),
-    TRACE_SUPPLIER_EXPORT("traceSupplierData", "traceSupplierData", "溯源供方"),
-    SIGN_EXPORT("signData", "signData", "签名/签章"),
-    TEMPLATE_EXPORT("templateData", "templateData", "原始记录模板/证书报告模板"),
-    FIXED_ASSETS("meterFixedAssets", "meterFixedAssets", "固定资产"),
-    METER_EQUIPMENT("meterEquipment", "meterEquipment", "测量设备"),
-    CALIBRATION_TEST_EQUIPMENT("calibrationTestEquipment", "calibrationTestEquipment", "校准检定设备"),
-    MEASURE_ACCOUNT("measureAccount", "measureAccount", "测量工装"),
-    STANDARD_SUPPORT_EQUIPMENT("standardSupportEquipment", "standardSupportEquipment", "标准配套设备"),
-    STANDARD_EQUIPMENT("standardEquipment", "standardEquipment", "标准装置"),
-    FLOW_DEF_EXPORT("flowDefData", "flowDefData", "流程定义"),
-    STAFF_CERTIFICATE("certificate", "certificate", "计量人员证书"),
-    CHECK_INFO("checkInfo", "checkInfo", "设备管理点检测"),
-    EQUIPMENT_APPLY("equipmentApply", "equipmentApply", "设备借用"),
-    STANDARD_EQUIPMENT_REMIND("equipmentApplyRemind", "equipmentApplyRemind", "标准装置到期提醒"),
-    METER_PRICE("meterPrice", "meterPrice", "价格库"),
-    METER_STAFF("meterStaff", "meterStaff", "计量人员"),
-    STANDARD_EQUIPMENT_APPLY("standardEquipmentApply", "standardEquipmentApply", "标准装置申请"),
-    STATE_MANAGE_APPLY("stateManage", "stateManage", "状态管理"),
-    METER_ACCEPTANCE_CHECK("acceptanceCheck", "acceptanceCheck", "设备检修保养验收单"),
-    CUSTOMER_EXPORT("customerData", "customerData", "客户信息"),
-    ORDER_EXPORT("orderData", "orderData", "委托书信息"),
-    SAMPLE_EXPORT("sampleData", "sampleData", "样本信息"),
-    EXCHANGE_DATA("exchangeData", "exchangeData", "设备交接单"),
-    DISPATCH_DATA("dispatchData", "dispatchData", "设备收发"),
-    ENVIRONMENT_DATA("environmentData", "environmentData", "环境记录单"),
-    ORIGIN_DATA("originData", "originData", "原始记录"),
-    CERTIFICATE_REPORT("certificateReport", "certificateReport", "证书报告"),
-    ADVICE_EXPORT("adviceData", "adviceData", "客户反馈"),
-    HANDOUT_EXPORT("handoutData", "handoutData", "任务分发列表"),
-    OUTSOURCER_EXPORT("outsourcerData", "outsourcerData", "分包方"),
-    SITE_EXECUTIVE_EXPORT("siteExecutiveData", "siteExecutiveData", "现场测试、校准或检定"),
-    CERTIFICATE_PRINT_EXPORT("certificatePrintData", "certificatePrintData", "证书打印"),
-    DOWNLOAD_TEMPLATE("downloadTemplate", "downloadTemplate", "页面配置"),
-    OUTSOURCER_CERTIFICATE_EXPORT("outsourceCertificateData", "outsourceCertificateData", "分包证书"),
-    SETTLEMENT_INFO_EXPORT("settlementInfoData", "settlementInfoData", "业务结算"),
-    EQUIPMENT_REMIND("equipmentRemind", "equipmentRemind", "设备到期提醒"),
-    AGREEMENT_INFO_EXPORT("agreementInfoData", "agreementInfoData", "合同"),
-    WORK_STATISTICS_EXPORT("workStatisticsData", "workStatisticsData", "实时工作统计"),
-    DEPT_OUTPUT_EXPORT("deptOutputData", "deptOutputData", "部门产值分析"),
-    WORKLOAD_EXPORT("workloadData", "workloadData", "业务工作量分析"),
-    DEPT_COMPREHENSIVE_EXPORT("deptComprehensiveData", "deptComprehensiveData", "部门综合分析"),
-    ENVIRONMENTAL_RECORD("environmentalRecordData", "environmentalRecordData", "现场环境记录");
+    /**
+     * 计量检定业务
+     */
+    OUTSOURCER_EXPORT("outsourcerData", "分包方名录", "分包方名录"),
+    IDENTIFY_EXPORT("identifyData", "计量标识", "计量标识"),
+    ORDER_EXPORT("orderData", "任务单", "任务单"),
+    DISPATCH_DATA("dispatchData", "设备收发", "设备收发"),
+    HANDOUT_EXPORT("handoutData", "任务分发", "任务分发"),
+    SITE_EXECUTIVE_EXPORT("siteExecutiveData", "现场测试、校准或检定", "现场测试、校准或检定"),
+    CERTIFICATE_REPORT("certificateReport", "证书审批", "证书审批"),
+    CERTIFICATE_CHANGE_APPLY("certificateChangeApply", "证书报告补充或更换申请单", "证书报告补充或更换申请单"),
+    CERTIFICATE_PRINT("certificatePrintData", "证书打印审批", "证书打印审批"),
+    DEPT_EXECUTIVE_TASK("deptExecutiveTaskData", "实验室任务", "实验室任务"),
+    MY_EXECUTIVE_TASK("myExecutiveTaskData", "我的任务", "我的任务"),
+    OUTSOURCE_ASSESS("outsourceAssess", "测试、校准或检定工作分包评审表", "测试、校准或检定工作分包评审表"),
+    OUTSOURCE_PROTOCOL("outsourceProtocol", "测试、校准或检定工作分包协议书", "测试、校准或检定工作分包协议书"),
+
+    /**
+     * 系统管理
+     */
+    SIGN_EXPORT("signData", "签名", "签名"),
+    TEMPLATE_EXPORT("templateData", "文件模板", "文件模板"),
+    FLOW_DEF_EXPORT("flowDefData", "流程定义", "流程定义"),
+    DOWNLOAD_TEMPLATE("downloadTemplate", "流程定义", "页面配置");
 
     ExportEnum(String fileName, String sheetName, String description) {
         this.fileName = fileName;
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateRecordTypeCodeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateRecordTypeCodeEnum.java
index 31d913c..a963522 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateRecordTypeCodeEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateRecordTypeCodeEnum.java
@@ -46,4 +46,14 @@
     String SITE_EXECUTIVE_APPROVAL = "01";
     //《现场测试、校准或检定工作记录表》
     String SITE_EXECUTIVE_LOG = "02";
+
+    //测试、校准或检定工作分包协议书
+    String OUTSOURCE_PROTOCOL = "01";
+    //测试、校准或检定工作分包评审表
+    String OUTSOURCE_ACCESS = "02";
+    //测试、校准或检定工作分包通知书
+    String OUTSOURCE_NOTICE = "03";
+    //测试、校准或检定工作分包方名录
+    String OUTSOURCE_INFO = "04";
+
 }
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
index 24b8635..f78bd53 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
@@ -15,6 +15,10 @@
     String CERTIFICATE_CHANGE_APPLY_BEAN_NAME = "certificateChangeApplyBean";
     //现场测试、校准或检定
     String SITE_EXECUTIVE_BEAN_NAME = "siteExecutiveBean";
+    //测试、校准或检定工作分包评审表
+    String OUTSOURCE_ASSESS_BEAN_NAME = "outsourceAssessBean";
+    //测试、校准或检定工作分包协议书
+    String OUTSOURCE_PROTOCOL_BEAN_NAME = "outsourceProtocolBean";
 
     /*********************************设备与装置************************************/
     //设备台账
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 b21c661..6b86fd1 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
@@ -18,6 +18,8 @@
     OUTSOURCER_APPROVAL(OUTSOURCER_BEAN_NAME, ""),
     CERTIFICATE_CHANGE_APPROVAL(CERTIFICATE_CHANGE_APPLY_BEAN_NAME, ""),
     SITE_EXECUTIVE_APPROVAL(SITE_EXECUTIVE_BEAN_NAME, ""),
+    OUTSOURCE_ASSESS_APPROVAL(OUTSOURCE_ASSESS_BEAN_NAME, ""),
+    OUTSOURCE_PROTOCOL_APPROVAL(OUTSOURCE_PROTOCOL_BEAN_NAME, ""),
 
     ACTION_STATUS_MAP(new HashMap<String, AwareActionStatusEnum>() {
         {
@@ -47,6 +49,10 @@
             put(ApplyFromIdEnum.CERTIFICATE_CHANGE_APPROVAL.getCode(), CERTIFICATE_CHANGE_APPROVAL);
             //现场测试、校准或检定审批
             put(ApplyFromIdEnum.SITE_EXECUTIVE_APPROVAL.getCode(), SITE_EXECUTIVE_APPROVAL);
+            //测试、校准或检定工作分包评审表
+            put(ApplyFromIdEnum.OUTSOURCE_ASSESS_APPROVAL.getCode(), OUTSOURCE_ASSESS_APPROVAL);
+            //测试、校准或检定工作分包协议书
+            put(ApplyFromIdEnum.OUTSOURCE_PROTOCOL_APPROVAL.getCode(), OUTSOURCE_PROTOCOL_APPROVAL);
         }
     });
     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 934405e..c7410bd 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
@@ -9,6 +9,8 @@
     CERTIFICATE_CHANGE_APPROVAL("jljdywzsbchghsqd", MessageSourceModuleEnum.BUSINESS.getCode(), "证书/报告补充或更换申请单"),
     OUTSOURCER_APPROVAL("jljdywcsjzhgfbfml", MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定合格分包方名录"),
     SITE_EXECUTIVE_APPROVAL("jljdywxccsjzsp", MessageSourceModuleEnum.BUSINESS.getCode(), "现场测试、校准或检定审批"),
+    OUTSOURCE_ASSESS_APPROVAL("jljdywcsjzfbpsb", MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包评审表"),
+    OUTSOURCE_PROTOCOL_APPROVAL("jljdywcsjzfbxys", MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包协议书"),
 
 
     /*******************************************设备与装置*********************************************/
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/GeneralApprovalMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/GeneralApprovalMapper.java
index 4fb7344..0c9d6ae 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/GeneralApprovalMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/GeneralApprovalMapper.java
@@ -17,8 +17,4 @@
 
     Page<O> selectBatchForApprovalList(Page<O> page, @Param("request") R request, @Param("businessKeys") List<String> businessKeys);
 
-//    Page<O> selectListPage(Page<O> page, @Param("request") R request);
-
-//    Long selectMaxNo();
-
 }
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceAssessMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceAssessMapper.java
index 7867bb8..ba59009 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceAssessMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceAssessMapper.java
@@ -1,7 +1,12 @@
 package com.casic.missiles.mapper.business;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.business.outsource.OutsourceAssessApprovalListRequest;
+import com.casic.missiles.mapper.GeneralApprovalMapper;
 import com.casic.missiles.model.business.BizBusinessOutsourceAssess;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * <p>
@@ -11,6 +16,10 @@
  * @author wangpeng
  * @since 2023-08-16
  */
-public interface BizBusinessOutsourceAssessMapper extends BaseMapper<BizBusinessOutsourceAssess> {
+public interface BizBusinessOutsourceAssessMapper extends GeneralApprovalMapper<BizBusinessOutsourceAssess, BizBusinessOutsourceAssess, OutsourceAssessApprovalListRequest> {
+
+    Page<BizBusinessOutsourceAssess> selectBatchForApprovalList(Page<BizBusinessOutsourceAssess> page, @Param("request") OutsourceAssessApprovalListRequest request, @Param("businessKeys") List<String> businessKeys);
+
+    Long selectMaxProjectNo();
 
 }
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceProtocolMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceProtocolMapper.java
new file mode 100644
index 0000000..e6aba35
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceProtocolMapper.java
@@ -0,0 +1,24 @@
+package com.casic.missiles.mapper.business;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.business.outsource.OutsourceProtocolApprovalListRequest;
+import com.casic.missiles.mapper.GeneralApprovalMapper;
+import com.casic.missiles.model.business.BizBusinessOutsourceProtocol;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 计量检定业务-分包管理-测试、校准或检定工作分包协议书 Mapper 接口
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-08-24
+ */
+public interface BizBusinessOutsourceProtocolMapper extends GeneralApprovalMapper<BizBusinessOutsourceProtocol, BizBusinessOutsourceProtocol, OutsourceProtocolApprovalListRequest> {
+
+    Page<BizBusinessOutsourceProtocol> selectBatchForApprovalList(Page<BizBusinessOutsourceProtocol> page, @Param("request") OutsourceProtocolApprovalListRequest request, @Param("businessKeys") List<String> businessKeys);
+
+    Long selectMaxProtocolNo();
+}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/EnvLocationInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/EnvLocationInfoMapper.java
new file mode 100644
index 0000000..49eff87
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/EnvLocationInfoMapper.java
@@ -0,0 +1,21 @@
+package com.casic.missiles.mapper.resource;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.resource.environment.LocationListRequest;
+import com.casic.missiles.dto.resource.environment.LocationListResponse;
+import com.casic.missiles.model.resource.EnvLocationInfo;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * <p>
+ * 实验室环境监控系统-设备表 Mapper 接口
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-06-07
+ */
+public interface EnvLocationInfoMapper extends BaseMapper<EnvLocationInfo> {
+
+    Page<LocationListResponse> selectLocationListPage(Page<LocationListResponse> page, @Param("request") LocationListRequest request);
+}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java
index de124db..85ed0f7 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java
@@ -1,7 +1,9 @@
 package com.casic.missiles.mapper.system;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.dto.system.SignDetailResponse;
+import com.casic.missiles.dto.system.SignListRequest;
 import com.casic.missiles.model.system.SystemSign;
 import org.apache.ibatis.annotations.Param;
 
@@ -22,4 +24,8 @@
     SignDetailResponse selectSignDetailById(Long id);
 
     List<SystemSign> selectUsableSignList(@Param("userId") Long userId);
+
+    Page<SystemSign> selectSignListPage(Page<SystemSign> page, @Param("request") SignListRequest request);
+
+    List<SystemSign> selectSignList(@Param("request") SignListRequest request);
 }

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java
index bb0c50f..13a699b 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java
@@ -12,6 +12,7 @@
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.IGeneralApprovalService;
+import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
@@ -19,6 +20,7 @@
 import org.springframework.web.bind.annotation.RequestBody;
 
 import javax.validation.Valid;
+import java.util.List;
 import java.util.Objects;
 
 /**
@@ -117,4 +119,17 @@
         }
         return baseApprovalService.failUpdate(request);
     }
+
+    public List<O> exportList(@RequestBody @Valid R request) throws Exception {
+        List<O> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = baseApprovalService.listExportByIds(request.getIds());
+        } else {
+            list = baseApprovalService.listExport(request);
+        }
+        for (O record : list) {
+            DictCodeUtils.convertDictCodeToName(record);
+        }
+        return list;
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java
index 8a90961..d775831 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java
@@ -5,6 +5,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.business.certificate.CertificateChangeApplyApprovalListRequest;
 import com.casic.missiles.dto.business.certificate.CertificateChangeApplySaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessCertificateChangeApply;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
@@ -20,6 +21,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -48,4 +50,12 @@
         }
         return changeApplyService.saveChangeApply(request);
     }
+
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody CertificateChangeApplyApprovalListRequest request) throws Exception {
+        List<BizBusinessCertificateChangeApply> list = super.exportList(request);
+        super.exportExcel(BizBusinessCertificateChangeApply.class, list, ExportEnum.CERTIFICATE_CHANGE_APPLY.getSheetName());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java
index 5fc4b07..af8230e 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java
@@ -9,6 +9,7 @@
 import com.casic.missiles.dto.business.certificate.CertificatePrintApprovalListRequest;
 import com.casic.missiles.dto.business.certificate.CertificatePrintListResponse;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.enums.business.CertificatePrintStatusEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessCertificatePrintLog;
@@ -18,10 +19,16 @@
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.io.IOException;
+import java.util.List;
 import java.util.Objects;
 
 /**
@@ -98,4 +105,16 @@
         });
         return certificatePrintService.certificatePrintLog(idDTO.getId());
     }
+
+    @ApiOperation("证书打印审批导出")
+    @PostMapping("/listExport")
+    public void exportList(@RequestBody CertificatePrintApprovalListRequest request) throws IOException {
+        List<CertificatePrintListResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = certificatePrintService.listByIds(request.getIds());
+        } else {
+            list = certificatePrintService.list(request);
+        }
+        super.exportExcel(CertificatePrintListResponse.class, list, ExportEnum.CERTIFICATE_PRINT.getSheetName());
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java
index 63b06dc..6b2efd5 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java
@@ -6,6 +6,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.business.certificate.CertificateReportApprovalListRequest;
 import com.casic.missiles.dto.business.certificate.CertificateReportSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessCertificateReport;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
@@ -21,6 +22,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -50,7 +52,7 @@
         return certificateReportService.saveCertificateReport(request);
     }
 
-    @ApiOperation("证书审批详情（基本信息）")
+    @ApiOperation("详情（基本信息）")
     @PostMapping("/detail")
     public ReturnDTO<BizBusinessCertificateReport> detail(@RequestBody @Valid BaseDetailRequest request, BindingResult bindingResult) throws Exception {
         if(bindingResult.hasErrors()){
@@ -59,4 +61,11 @@
         return certificateReportService.detail(request);
     }
 
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody CertificateReportApprovalListRequest request) throws Exception {
+        List<BizBusinessCertificateReport> list = super.exportList(request);
+        super.exportExcel(BizBusinessCertificateReport.class, list, ExportEnum.CERTIFICATE_REPORT.getSheetName());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java
index 46b26bd..57c0809 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java
@@ -10,20 +10,21 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.business.identify.IdentifyListRequest;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessIdentifyInfo;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.business.IBizBusinessIdentifyInfoService;
+import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import javax.validation.Valid;
+import java.util.List;
 import java.util.Objects;
 
 /**
@@ -57,16 +58,13 @@
         return identifyInfoService.addIdentify(identifyInfo);
     }
 
-    @ApiOperation("标识打印更新")
+    @ApiOperation("标识打印更新（更新打印时间）")
     @PostMapping("/update")
-    public ReturnDTO updateIdentify(@RequestBody @Valid BizBusinessIdentifyInfo identifyInfo, BindingResult bindingResult) {
-        Assert.isFalse(Objects.isNull(identifyInfo.getId()), () -> {
+    public ReturnDTO updateIdentify(@RequestBody @Valid IdDTO idDTO) {
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        Assert.isFalse(bindingResult.hasErrors(), () -> {
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        });
-        return identifyInfoService.updateIdentify(identifyInfo);
+        return identifyInfoService.updateIdentify(idDTO.getId());
     }
 
     @ApiOperation("标识打印删除")
@@ -77,4 +75,37 @@
         });
         return identifyInfoService.deleteIdentify(idDTO.getId());
     }
+
+    @ApiOperation("标识打印导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody @Valid IdentifyListRequest request, BindingResult bindingResult) throws Exception {
+        if (bindingResult.hasErrors()) {
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        List<BizBusinessIdentifyInfo> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = identifyInfoService.listByIds(request.getIds());
+        } else {
+            list = identifyInfoService.list(request);
+        }
+        for (BizBusinessIdentifyInfo record : list) {
+            DictCodeUtils.convertDictCodeToName(record);
+        }
+        super.exportExcel(BizBusinessIdentifyInfo.class, list, ExportEnum.IDENTIFY_EXPORT.getSheetName());
+    }
+
+
+    // TODO: 2023/8/23 查询设备信息，4个底部按钮查设备（按钮的作用就是前端用来调不同接口、用来区分中间即将展示的标识），前端弹窗选设备，在确定保存时前端根据底部按钮判断传入设备类型deviceType字典code
+    // TODO: 2023/8/23 接口：查受检设备（第1个按钮），查设备台账（后3个按钮同一接口），查询之后前端根据标志类型的不同加到中间页面时进行判断（按产品给的对应表）
+    // TODO: 2023/8/23 提供二维码接口，前端在加到中间页面时调用一下
+
+    @ApiOperation("设备二维码")
+    @PostMapping("/equipment/qrCode")
+    public ReturnDTO<String> equipmentQrCode(@RequestBody @Valid IdDTO idDTO) {
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return identifyInfoService.equipmentQrCode(idDTO.getId());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java
index 707be6e..7e0453d 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java
@@ -117,7 +117,7 @@
     }
 
     @ApiOperation("任务单导出")
-    @PostMapping("/export")
+    @PostMapping("/listExport")
     public void orderExport(@RequestBody @Valid OrderListRequest request, HttpServletResponse response) {
         businessOrderService.orderExport(request, response);
     }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java
index 529a6ce..51432be 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java
@@ -1,9 +1,28 @@
 package com.casic.missiles.controller.business;
 
+import com.casic.missiles.controller.GeneralApprovalController;
+import com.casic.missiles.dto.BaseApprovalSubmitRequest;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.business.outsource.OutsourceAssessApprovalListRequest;
+import com.casic.missiles.dto.business.outsource.OutsourceAssessSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
+import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.model.business.BizBusinessOutsourceAssess;
+import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
+import com.casic.missiles.service.IGeneralApprovalService;
+import com.casic.missiles.service.business.IBizBusinessOutsourceAssessService;
 import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.BindingResult;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.validation.Valid;
+import java.util.List;
+
 /**
  * <p>
  * 计量检定业务-分包管理-测试、校准或检定工作分包评审表 前端控制器
@@ -15,6 +34,27 @@
 @Api(tags = "分包管理-测试、校准或检定工作分包评审表")
 @RestController
 @RequestMapping("/business/outsource/assess")
-public class BizBusinessOutsourceAssessController {
+public class BizBusinessOutsourceAssessController extends GeneralApprovalController<BizBusinessOutsourceAssess, BizBusinessOutsourceAssess, OutsourceAssessApprovalListRequest, BaseApprovalSubmitRequest> {
+    @Autowired
+    private IBizBusinessOutsourceAssessService outsourceAssessService;
 
+    public BizBusinessOutsourceAssessController(IGeneralApprovalService<BizBusinessOutsourceAssess, BizBusinessOutsourceAssess, OutsourceAssessApprovalListRequest, BaseApprovalSubmitRequest> baseApprovalService) {
+        super(baseApprovalService);
+    }
+
+    @ApiOperation("草稿箱-保存")
+    @PostMapping("/save")
+    public ReturnDTO<OutsourceAssessSaveResponse> saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceAssess request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        return outsourceAssessService.saveOutsourceAssess(request);
+    }
+
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception {
+        List<BizBusinessOutsourceAssess> list = super.exportList(request);
+        super.exportExcel(BizBusinessOutsourceAssess.class, list, ExportEnum.OUTSOURCE_ASSESS.getSheetName());
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java
new file mode 100644
index 0000000..9adef18
--- /dev/null
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java
@@ -0,0 +1,60 @@
+package com.casic.missiles.controller.business;
+
+import com.casic.missiles.controller.GeneralApprovalController;
+import com.casic.missiles.dto.BaseApprovalSubmitRequest;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.business.outsource.OutsourceProtocolApprovalListRequest;
+import com.casic.missiles.dto.business.outsource.OutsourceProtocolSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
+import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.model.business.BizBusinessOutsourceProtocol;
+import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
+import com.casic.missiles.service.IGeneralApprovalService;
+import com.casic.missiles.service.business.IBizBusinessOutsourceProtocolService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.BindingResult;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.validation.Valid;
+import java.util.List;
+
+/**
+ * <p>
+ * 计量检定业务-分包管理-测试、校准或检定工作分包协议书 前端控制器
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-08-24
+ */
+@Api(tags = "分包管理-测试、校准或检定工作分包协议书")
+@RestController
+@RequestMapping("/business/outsource/protocol")
+public class BizBusinessOutsourceProtocolController extends GeneralApprovalController<BizBusinessOutsourceProtocol, BizBusinessOutsourceProtocol, OutsourceProtocolApprovalListRequest, BaseApprovalSubmitRequest> {
+    @Autowired
+    private IBizBusinessOutsourceProtocolService outsourceProtocolService;
+
+    public BizBusinessOutsourceProtocolController(IGeneralApprovalService<BizBusinessOutsourceProtocol, BizBusinessOutsourceProtocol, OutsourceProtocolApprovalListRequest, BaseApprovalSubmitRequest> baseApprovalService) {
+        super(baseApprovalService);
+    }
+
+    @ApiOperation("草稿箱-保存")
+    @PostMapping("/save")
+    public ReturnDTO<OutsourceProtocolSaveResponse> saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceProtocol request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        return outsourceProtocolService.saveOutsourceProtocol(request);
+    }
+
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody OutsourceProtocolApprovalListRequest request) throws Exception {
+        List<BizBusinessOutsourceProtocol> list = super.exportList(request);
+        super.exportExcel(BizBusinessOutsourceProtocol.class, list, ExportEnum.OUTSOURCE_PROTOCOL.getSheetName());
+    }
+}
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java
index 097f645..f0f0943 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java
@@ -17,7 +17,6 @@
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.IGeneralApprovalService;
 import com.casic.missiles.service.business.IBizBusinessOutsourcerInfoService;
-import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -71,19 +70,8 @@
 
     @ApiOperation("分包方导出")
     @PostMapping("/listExport")
-    public void export(@RequestBody @Valid OutsourcerInfoApprovalListRequest request, BindingResult bindingResult) throws Exception {
-        if (bindingResult.hasErrors()) {
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        }
-        List<BizBusinessOutsourcerInfo> list;
-        if (!CollectionUtils.isEmpty(request.getIds())) {
-            list = outsourcerInfoService.listByIds(request.getIds());
-        } else {
-            list = outsourcerInfoService.list(request);
-        }
-        for (BizBusinessOutsourcerInfo record : list) {
-            DictCodeUtils.convertDictCodeToName(record);
-        }
+    public void export(@RequestBody OutsourcerInfoApprovalListRequest request) throws Exception {
+        List<BizBusinessOutsourcerInfo> list = super.exportList(request);
         super.exportExcel(BizBusinessOutsourcerInfo.class, list, ExportEnum.OUTSOURCER_EXPORT.getSheetName());
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java
index c2cbf9f..0410918 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java
@@ -17,11 +17,9 @@
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.IGeneralApprovalService;
 import com.casic.missiles.service.business.IBizBusinessSiteExecutiveInfoService;
-import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -60,7 +58,7 @@
         return siteExecutiveInfoService.saveSiteExecutiveInfo(siteExecutiveInfo);
     }
 
-    @ApiOperation("现场检测详情")
+    @ApiOperation("详情")
     @PostMapping("/detail")
     public ReturnDTO<SiteExecutiveDetailResponse> siteExecutiveDetail(@RequestBody @Valid IdDTO idDTO) throws Exception {
         Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
@@ -69,21 +67,10 @@
         return ReturnUtil.success(siteExecutiveInfoService.detail(idDTO.getId()));
     }
 
-    @ApiOperation("现场检测导出")
+    @ApiOperation("导出")
     @PostMapping("/listExport")
-    public void export(@RequestBody @Valid SiteExecutiveApprovalListRequest request, BindingResult bindingResult) throws Exception {
-        if (bindingResult.hasErrors()) {
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        }
-        List<SiteExecutiveApprovalListResponse> list;
-        if (!CollectionUtils.isEmpty(request.getIds())) {
-            list = siteExecutiveInfoService.listInfoByIds(request.getIds());
-        } else {
-            list = siteExecutiveInfoService.listInfo(request);
-        }
-        for (SiteExecutiveApprovalListResponse record : list) {
-            DictCodeUtils.convertDictCodeToName(record);
-        }
+    public void export(@RequestBody SiteExecutiveApprovalListRequest request) throws Exception {
+        List<SiteExecutiveApprovalListResponse> list = super.exportList(request);
         super.exportExcel(SiteExecutiveApprovalListResponse.class, list, ExportEnum.SITE_EXECUTIVE_EXPORT.getSheetName());
     }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
index 7e793cd..a92e209 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
@@ -55,7 +55,7 @@
 
     @ApiOperation("设备收发列表导出")
     @PostMapping("/export")
-    public void exportList(@RequestBody @Valid SampleDispatchListRequest request) throws IOException {
+    public void exportList(@RequestBody SampleDispatchListRequest request) throws IOException {
         List<SampleDispatchListResponse> list;
         if (!CollectionUtils.isEmpty(request.getIds())) {
             list = dispatchService.listByIds(request.getIds());
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java
index cdc77fc..d120fd4 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java
@@ -7,6 +7,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.business.labExecutive.*;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.business.IBusinessLabExecutiveInfoService;
@@ -14,6 +15,7 @@
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.*;
 
@@ -32,7 +34,7 @@
     @Autowired
     private IBusinessLabExecutiveInfoService labExecutiveInfoService;
 
-    @ApiOperation("实验室检测-部门检测-查询各状态列表（待检测、检测中、检测完）")
+    @ApiOperation("实验室任务-查询各状态列表（待检测、检测中、检测完）")
     @PostMapping("/deptExecutive/List")
     public ReturnDTO<PageInfoBT<SampleLabExecutiveListResponse>> queryDeptExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
@@ -43,10 +45,19 @@
         return ReturnUtil.success(super.packForBT(labExecutiveInfoService.deptLabExecutiveListPage(page, labExecutiveListRequest)));
     }
 
-    /**
-     * 实验室检测-我的检测-查询各状态列表（待检测、检测中、检测完）
-     */
-    @ApiOperation("实验室检测-我的检测-查询各状态列表（待检测、检测中、检测完）")
+    @ApiOperation("实验室任务导出")
+    @PostMapping("/deptExecutive/export")
+    public void deptExportList(@RequestBody @Valid SampleLabExecutiveListRequest request) throws Exception {
+        List<SampleLabExecutiveListResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = labExecutiveInfoService.deptLabExecutiveListByIds(request.getMeasureStatus(), request.getIds());
+        } else {
+            list = labExecutiveInfoService.deptLabExecutiveList(request);
+        }
+        super.exportExcel(SampleLabExecutiveListResponse.class, list, ExportEnum.DEPT_EXECUTIVE_TASK.getSheetName());
+    }
+
+    @ApiOperation("我的任务-查询各状态列表（待检测、检测中、检测完）")
     @PostMapping("/myExecutive/list")
     public ReturnDTO<PageInfoBT<SampleLabExecutiveListResponse>> queryMyExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
@@ -57,19 +68,25 @@
         return ReturnUtil.success(super.packForBT(labExecutiveInfoService.myLabExecutiveListPage(page, labExecutiveListRequest)));
     }
 
-    /**
-     * 实验室检测-我的检测-查询各状态样品数量（待检测、检测中、检测完）
-     */
-    @ApiOperation("实验室检测-我的检测-查询各状态样品数量（待检测、检测中、检测完）")
+    @ApiOperation("我的任务导出")
+    @PostMapping("/myExecutive/export")
+    public void exportList(@RequestBody @Valid SampleLabExecutiveListRequest request) throws Exception {
+        List<SampleLabExecutiveListResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = labExecutiveInfoService.myLabExecutiveListByIds(request.getMeasureStatus(), request.getIds());
+        } else {
+            list = labExecutiveInfoService.myLabExecutiveList(request);
+        }
+        super.exportExcel(SampleLabExecutiveListResponse.class, list, ExportEnum.MY_EXECUTIVE_TASK.getSheetName());
+    }
+
+    @ApiOperation("我的任务-查询各状态样品数量（待检测、检测中、检测完）")
     @GetMapping("/myExecutive/amount")
     public ReturnDTO<List<SampleAmountResponse>> queryMyExecutiveAmount() {
         return ReturnUtil.success(labExecutiveInfoService.myExecutiveAmount());
     }
 
-    /**
-     * 实验室检测-部门检测-分配（分配给具体人员）
-     */
-    @ApiOperation("实验室检测-部门检测-分配按钮（分配给具体人员）")
+    @ApiOperation("实验室任务-分配按钮（分配给具体人员）")
     @PostMapping("/deptExecutive/allocate")
     public ReturnDTO allocateStaff(@RequestBody @Valid SampleAllocateRequest sampleAllocateRequest, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -78,10 +95,7 @@
         return labExecutiveInfoService.allocateStaff(sampleAllocateRequest);
     }
 
-    /**
-     * 实验室检测-我的检测-检定人扫描收入（待检测->检测中）
-     */
-    @ApiOperation("实验室检测-我的检测-检定人扫描收入（待检测->检测中）")
+    @ApiOperation("我的任务-检定人扫描收入（待检测->检测中）")
     @PostMapping("/myExecutive/receive")
     public ReturnDTO sampleReceive(@RequestBody @Valid List<SampleOperateRequest> requestList, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -90,10 +104,7 @@
         return labExecutiveInfoService.sampleReceive(requestList);
     }
 
-    /**
-     * 实验室检测-负责人/检定人扫描检完（检测中->检测完）
-     */
-    @ApiOperation("实验室检测-负责人/检定人扫描检完（检测中->检测完）")
+    @ApiOperation("实验室任务-负责人/检定人扫描检完（检测中->检测完）")
     @PostMapping("/myExecutive/complete")
     public ReturnDTO sampleExecutiveComplete(@RequestBody @Valid List<SampleOperateRequest> requestList, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -102,10 +113,7 @@
         return labExecutiveInfoService.sampleExecutiveComplete(requestList);
     }
 
-    /**
-     * 实验室检测-部门检测/我的检测 编辑（只能修改应出具证书）
-     */
-    @ApiOperation("实验室检测-部门检测/我的检测 编辑（只能修改应出具证书）")
+    @ApiOperation("实验室任务/我的任务 编辑（只能修改应出具证书）")
     @PostMapping("/executive/update")
     public ReturnDTO updateExecutive(@RequestBody @Valid UpdateExecutiveRequest request, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -114,10 +122,7 @@
         return labExecutiveInfoService.updateExecutive(request);
     }
 
-    /**
-     * 实验室检测-部门检测/我的检测 详情
-     */
-    @ApiOperation("实验室检测-部门检测/我的检测 详情")
+    @ApiOperation("实验室任务/我的任务 详情")
     @PostMapping("/executive/detail")
     public ReturnDTO<ExecutiveDetailResponse> executiveDetail(@RequestBody @Valid ExecutiveDetailRequest request, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
@@ -131,7 +136,7 @@
      * 退回后会将下一个要执行的实验室检测状态更新为待分配，将后面的实验室顺序变更为连续（都进行减1）
      * 最后一个检测的实验室退回，等分发员再增加实验室或设备收发中的已收入直接手动点击完成
      */
-    @ApiOperation("实验室检测-部门检测/我的检测 退回（待检测/检测中->退回）")
+    @ApiOperation("实验室任务/我的任务 退回（待检测/检测中->退回）")
     @PostMapping("/executive/sendBack")
     public ReturnDTO executiveSendBack(@RequestBody @Valid ExecutiveSendBackRequest request, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -140,9 +145,6 @@
         return labExecutiveInfoService.sampleExecutiveSendBack(request);
     }
 
-    /**
-     * 分发员编辑实验室检测列表
-     */
     @ApiOperation("分发员编辑实验室检测列表")
     @PostMapping("/handOut/updateList")
     public ReturnDTO updateExecutiveList(@RequestBody @Valid UpdateExecutiveListRequest request, BindingResult bindingResult) {
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java
index 48a67ed..0c04f31 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java
@@ -10,6 +10,7 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.resource.customer.CustomerApprovalListRequest;
 import com.casic.missiles.dto.resource.customer.CustomerSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceCustomerInfo;
@@ -26,6 +27,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -55,6 +57,13 @@
         return customerInfoService.saveCustomerInfo(request);
     }
 
+    @ApiOperation("委托方名录导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody CustomerApprovalListRequest request) throws Exception {
+        List<BizResourceCustomerInfo> list = super.exportList(request);
+        super.exportExcel(BizResourceCustomerInfo.class, list, ExportEnum.CUSTOMER_INFO.getSheetName());
+    }
+
     @ApiOperation("委托方人员列表（分页）")
     @PostMapping("/person/listPage")
     public ReturnDTO<PageInfoBT<BizResourceCustomerStaff>> personListPage(@RequestBody IdDTO idDto) {
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
index 972ed4b..6418ea5 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
@@ -5,6 +5,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.resource.customer.SuggestFormApprovalListRequest;
 import com.casic.missiles.dto.resource.customer.SuggestFormSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceCustomerSuggestForm;
@@ -20,6 +21,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -50,4 +52,11 @@
         return suggestFormService.saveSuggestForm(request);
     }
 
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody SuggestFormApprovalListRequest request) throws Exception {
+        List<BizResourceCustomerSuggestForm> list = super.exportList(request);
+        super.exportExcel(BizResourceCustomerSuggestForm.class, list, ExportEnum.CUSTOMER_SUGGEST_FORM.getSheetName());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java
index 1934d1a..9e07eab 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java
@@ -15,12 +15,16 @@
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.resource.IEnvEnvironmentRecordConfigService;
 import com.casic.missiles.service.resource.IEnvEnvironmentRecordDataService;
+import com.casic.missiles.service.resource.IEnvLocationInfoService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
 import java.util.List;
@@ -39,6 +43,8 @@
     private IEnvEnvironmentRecordDataService environmentRecordDataService;
     @Autowired
     private IEnvEnvironmentRecordConfigService environmentRecordConfigService;
+    @Autowired
+    private IEnvLocationInfoService locationInfoService;
 
     @ApiOperation("环境记录单数据列表/详情")
     @PostMapping("/data/listPage")
@@ -95,4 +101,11 @@
         });
         return environmentRecordConfigService.deleteEnvironmentRecordConfig(idDTO.getId());
     }
+
+    @ApiOperation("地点列表")
+    @PostMapping("/location/listPage")
+    public ReturnDTO<PageInfoBT<LocationListResponse>> locationListPage(@RequestBody @Valid LocationListRequest request) {
+        Page<LocationListResponse> page = PageFactory.defaultPage();
+        return ReturnUtil.success(super.packForBT(locationInfoService.listPage(page, request)));
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java
index 82efe3f..e9561fa 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java
@@ -10,6 +10,7 @@
 import com.casic.missiles.dto.resource.seal.SealLogListRequest;
 import com.casic.missiles.dto.resource.seal.SealNoteApprovalListRequest;
 import com.casic.missiles.dto.resource.seal.SealNoteSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceSealUseLog;
@@ -27,6 +28,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -58,6 +60,13 @@
         return sealUseNoteService.saveSeal(request);
     }
 
+    @ApiOperation("印章使用登记导出（列表和导出中去掉经办人和监印人）")
+    @PostMapping("/listExport")
+    public void export(@RequestBody SealNoteApprovalListRequest request) throws Exception {
+        List<BizResourceSealUseNote> list = super.exportList(request);
+        super.exportExcel(BizResourceSealUseNote.class, list, ExportEnum.SEAL_NOTE.getSheetName());
+    }
+
     // TODO: 2023/7/28 印章使用日志：系统中使用印章时插入数据库
 
     @ApiOperation("印章使用日志列表（分页）")
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java
index 9b674fc..06b6521 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java
@@ -9,16 +9,20 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.resource.staff.StaffCertRequest;
 import com.casic.missiles.dto.resource.staff.StaffCertResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.service.resource.IBizResourceStaffInfoService;
 import com.casic.missiles.service.resource.IBizResourceStaffVerifierService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.List;
+
 /**
  * @Description:
  * @Author: wangpeng
@@ -41,9 +45,21 @@
         return ReturnUtil.success(super.packForBT(responsePage));
     }
 
+    @ApiOperation("证书逾期提醒导出")
+    @PostMapping("/listExport")
+    public void exportList(@RequestBody StaffCertRequest request) throws Exception {
+        List<StaffCertResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = staffInfoService.certListByIds(request.getIds());
+        } else {
+            list = staffInfoService.certList(request);
+        }
+        super.exportExcel(StaffCertResponse.class, list, ExportEnum.STAFF_CERTIFICATE_EXPIRE.getSheetName());
+    }
+
     @ApiOperation("证书逾期提醒")
     @PostMapping("/expirationReminder")
-    public ReturnDTO expirationReminder(@RequestBody IdDTO idDto) {
-        return verifierService.expirationReminder(idDto);
+    public ReturnDTO expirationReminder(@RequestBody IdDTO idDTO) {
+        return verifierService.expirationReminder(idDTO);
     }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java
index 3b251ad..a6e7850 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java
@@ -12,6 +12,7 @@
 import com.casic.missiles.dto.resource.staff.StaffListRequest;
 import com.casic.missiles.dto.resource.staff.TrainListRequest;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.*;
@@ -22,7 +23,10 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
 import java.util.List;
@@ -52,8 +56,19 @@
             throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
         }
         Page<BizResourceStaffInfo> page = PageFactory.defaultPage();
-        Page<BizResourceStaffInfo> responsePage = staffInfoService.listPage(page, request);
-        return ReturnUtil.success(super.packForBT(responsePage));
+        return ReturnUtil.success(super.packForBT(staffInfoService.listPage(page, request)));
+    }
+
+    @ApiOperation("人员登记导出")
+    @PostMapping("/listExport")
+    public void exportList(@RequestBody StaffListRequest request) throws Exception {
+        List<BizResourceStaffInfo> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = staffInfoService.listByIds(request.getIds());
+        } else {
+            list = staffInfoService.list(request);
+        }
+        super.exportExcel(BizResourceStaffInfo.class, list, ExportEnum.STAFF_INFO.getSheetName());
     }
 
     @ApiOperation("人员登记详情基础信息")
@@ -85,9 +100,9 @@
 
     @ApiOperation("科研教育列表（分页）")
     @PostMapping("/education/listPage")
-    public ReturnDTO<PageInfoBT<BizResourceStaffEducation>> educationListPage(@RequestBody IdDTO idDto) {
+    public ReturnDTO<PageInfoBT<BizResourceStaffEducation>> educationListPage(@RequestBody IdDTO idDTO) {
         Page<BizResourceStaffEducation> page = PageFactory.defaultPage();
-        Page<BizResourceStaffEducation> responsePage = staffInfoService.educationListPage(page, idDto);
+        Page<BizResourceStaffEducation> responsePage = staffInfoService.educationListPage(page, idDTO);
         return ReturnUtil.success(super.packForBT(responsePage));
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java
index af6aa86..d85d84a 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java
@@ -9,6 +9,7 @@
 import com.casic.missiles.dto.resource.outsideService.SupplierApprovalListRequest;
 import com.casic.missiles.dto.resource.outsideService.SupplierSaveResponse;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceSupplierAbility;
@@ -67,6 +68,13 @@
         return ReturnUtil.success(supplierInfoService.detail(idDTO.getId()));
     }
 
+    @ApiOperation("合格供方导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody SupplierApprovalListRequest request) throws Exception {
+        List<BizResourceSupplierInfo> list = super.exportList(request);
+        super.exportExcel(BizResourceSupplierInfo.class, list, ExportEnum.SUPPLIER_INFO.getSheetName());
+    }
+
     @ApiOperation("供方人员列表（分页）")
     @PostMapping("/person/listPage")
     public ReturnDTO<PageInfoBT<BizResourceSupplierPerson>> personListPage(@RequestBody IdDTO idDTO) {
diff --git a/casic-metering-api/src/main/resources/config/application.yml b/casic-metering-api/src/main/resources/config/application.yml
index 350db5f..ecff521 100644
--- a/casic-metering-api/src/main/resources/config/application.yml
+++ b/casic-metering-api/src/main/resources/config/application.yml
@@ -126,7 +126,7 @@
     #作者
     author: wangpeng
     #待生成对象表名
-    table-name: biz_equipment_technical_target_approval,biz_equipment_attachment_approval,biz_equipment_checkpoint_approval
+    table-name: biz_business_outsource_protocol
 
 reminder:
   #节点--common模块config包 ReminderNodeConfig配置
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
index 4a19e4e..d47d552 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
@@ -53,6 +53,7 @@
     SUGGEST_FORM_SAVE_FAILED(2509, "委托方意见登记表保存至草稿箱失败"),
     EXAMINE_FORM_SAVE_FAILED(2510, "要求、委托书及合同评审表保存至草稿箱失败"),
     CUSTOMER_EXIST_SAVE_FAILED(2511, "该委托方已存在，请重新选择"),
+    DUPLICATE_LOCATION_NO(2512, "地点编号已存在"),
 
     /**
      * 计量检定业务模块
@@ -68,6 +69,8 @@
     COMPLETE_SAMPLE_NOT_EXIST(2609, "检测中不存在扫描收入的样品"),
     CANNOT_CHANGE_MEASURE_INFO(2610, "无法更改非当前登录用户的检测信息"),
     NON_EXIST_ORDER_OR_SAMPLE(2611, "不存在该委托单或该委托单下的样品"),
+    OUTSOURCE_ACCESS_SAVE_FAILED(2612, "测试、校准或检定工作分包评审表保存至草稿箱失败"),
+    OUTSOURCE_PROTOCOL_SAVE_FAILED(2613, "测试、校准或检定工作分包协议书保存至草稿箱失败"),
 
     /**
      * 历史遗留备用
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
index 5089ad1..81a406b 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
@@ -10,54 +10,38 @@
     /**
      * 资源管理
      */
-    ENVIRONMENT_DATA_EXPORT("environmentData", "environmentData", "环境记录单数据"),
+    ENVIRONMENT_DATA_EXPORT("environmentData", "环境记录单数据", "环境记录单数据"),
+    STAFF_INFO("staffInfo", "人员登记", "人员登记"),
+    STAFF_CERTIFICATE_EXPIRE("certificateExpire", "证书逾期提醒", "证书逾期提醒"),
+    SUPPLIER_INFO("supplierInfo", "合格供方名录", "合格供方名录"),
+    CUSTOMER_INFO("customerInfo", "委托方名录", "委托方名录"),
+    CUSTOMER_SUGGEST_FORM("customerSuggestForm", "委托方意见登记表", "委托方意见登记表"),
+    SEAL_NOTE("sealNote", "印章使用登记", "印章使用登记"),
 
-    FILE_EXPORT("meterFileData", "meterFileData", "计量文件信息"),
-    TRAIN_PLAN_EXPORT("trainPlanData", "trainPlanData", "培训计划"),
-    TRAIN_LOG_EXPORT("trainLogData", "trainLogData", "培训记录"),
-    METER_ORGANIZE_EXPORT("meterOrganizeData", "meterOrganizeData", "计量组织"),
-    TRACE_SUPPLIER_EXPORT("traceSupplierData", "traceSupplierData", "溯源供方"),
-    SIGN_EXPORT("signData", "signData", "签名/签章"),
-    TEMPLATE_EXPORT("templateData", "templateData", "原始记录模板/证书报告模板"),
-    FIXED_ASSETS("meterFixedAssets", "meterFixedAssets", "固定资产"),
-    METER_EQUIPMENT("meterEquipment", "meterEquipment", "测量设备"),
-    CALIBRATION_TEST_EQUIPMENT("calibrationTestEquipment", "calibrationTestEquipment", "校准检定设备"),
-    MEASURE_ACCOUNT("measureAccount", "measureAccount", "测量工装"),
-    STANDARD_SUPPORT_EQUIPMENT("standardSupportEquipment", "standardSupportEquipment", "标准配套设备"),
-    STANDARD_EQUIPMENT("standardEquipment", "standardEquipment", "标准装置"),
-    FLOW_DEF_EXPORT("flowDefData", "flowDefData", "流程定义"),
-    STAFF_CERTIFICATE("certificate", "certificate", "计量人员证书"),
-    CHECK_INFO("checkInfo", "checkInfo", "设备管理点检测"),
-    EQUIPMENT_APPLY("equipmentApply", "equipmentApply", "设备借用"),
-    STANDARD_EQUIPMENT_REMIND("equipmentApplyRemind", "equipmentApplyRemind", "标准装置到期提醒"),
-    METER_PRICE("meterPrice", "meterPrice", "价格库"),
-    METER_STAFF("meterStaff", "meterStaff", "计量人员"),
-    STANDARD_EQUIPMENT_APPLY("standardEquipmentApply", "standardEquipmentApply", "标准装置申请"),
-    STATE_MANAGE_APPLY("stateManage", "stateManage", "状态管理"),
-    METER_ACCEPTANCE_CHECK("acceptanceCheck", "acceptanceCheck", "设备检修保养验收单"),
-    CUSTOMER_EXPORT("customerData", "customerData", "客户信息"),
-    ORDER_EXPORT("orderData", "orderData", "委托书信息"),
-    SAMPLE_EXPORT("sampleData", "sampleData", "样本信息"),
-    EXCHANGE_DATA("exchangeData", "exchangeData", "设备交接单"),
-    DISPATCH_DATA("dispatchData", "dispatchData", "设备收发"),
-    ENVIRONMENT_DATA("environmentData", "environmentData", "环境记录单"),
-    ORIGIN_DATA("originData", "originData", "原始记录"),
-    CERTIFICATE_REPORT("certificateReport", "certificateReport", "证书报告"),
-    ADVICE_EXPORT("adviceData", "adviceData", "客户反馈"),
-    HANDOUT_EXPORT("handoutData", "handoutData", "任务分发列表"),
-    OUTSOURCER_EXPORT("outsourcerData", "outsourcerData", "分包方"),
-    SITE_EXECUTIVE_EXPORT("siteExecutiveData", "siteExecutiveData", "现场测试、校准或检定"),
-    CERTIFICATE_PRINT_EXPORT("certificatePrintData", "certificatePrintData", "证书打印"),
-    DOWNLOAD_TEMPLATE("downloadTemplate", "downloadTemplate", "页面配置"),
-    OUTSOURCER_CERTIFICATE_EXPORT("outsourceCertificateData", "outsourceCertificateData", "分包证书"),
-    SETTLEMENT_INFO_EXPORT("settlementInfoData", "settlementInfoData", "业务结算"),
-    EQUIPMENT_REMIND("equipmentRemind", "equipmentRemind", "设备到期提醒"),
-    AGREEMENT_INFO_EXPORT("agreementInfoData", "agreementInfoData", "合同"),
-    WORK_STATISTICS_EXPORT("workStatisticsData", "workStatisticsData", "实时工作统计"),
-    DEPT_OUTPUT_EXPORT("deptOutputData", "deptOutputData", "部门产值分析"),
-    WORKLOAD_EXPORT("workloadData", "workloadData", "业务工作量分析"),
-    DEPT_COMPREHENSIVE_EXPORT("deptComprehensiveData", "deptComprehensiveData", "部门综合分析"),
-    ENVIRONMENTAL_RECORD("environmentalRecordData", "environmentalRecordData", "现场环境记录");
+    /**
+     * 计量检定业务
+     */
+    OUTSOURCER_EXPORT("outsourcerData", "分包方名录", "分包方名录"),
+    IDENTIFY_EXPORT("identifyData", "计量标识", "计量标识"),
+    ORDER_EXPORT("orderData", "任务单", "任务单"),
+    DISPATCH_DATA("dispatchData", "设备收发", "设备收发"),
+    HANDOUT_EXPORT("handoutData", "任务分发", "任务分发"),
+    SITE_EXECUTIVE_EXPORT("siteExecutiveData", "现场测试、校准或检定", "现场测试、校准或检定"),
+    CERTIFICATE_REPORT("certificateReport", "证书审批", "证书审批"),
+    CERTIFICATE_CHANGE_APPLY("certificateChangeApply", "证书报告补充或更换申请单", "证书报告补充或更换申请单"),
+    CERTIFICATE_PRINT("certificatePrintData", "证书打印审批", "证书打印审批"),
+    DEPT_EXECUTIVE_TASK("deptExecutiveTaskData", "实验室任务", "实验室任务"),
+    MY_EXECUTIVE_TASK("myExecutiveTaskData", "我的任务", "我的任务"),
+    OUTSOURCE_ASSESS("outsourceAssess", "测试、校准或检定工作分包评审表", "测试、校准或检定工作分包评审表"),
+    OUTSOURCE_PROTOCOL("outsourceProtocol", "测试、校准或检定工作分包协议书", "测试、校准或检定工作分包协议书"),
+
+    /**
+     * 系统管理
+     */
+    SIGN_EXPORT("signData", "签名", "签名"),
+    TEMPLATE_EXPORT("templateData", "文件模板", "文件模板"),
+    FLOW_DEF_EXPORT("flowDefData", "流程定义", "流程定义"),
+    DOWNLOAD_TEMPLATE("downloadTemplate", "流程定义", "页面配置");
 
     ExportEnum(String fileName, String sheetName, String description) {
         this.fileName = fileName;
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateRecordTypeCodeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateRecordTypeCodeEnum.java
index 31d913c..a963522 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateRecordTypeCodeEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateRecordTypeCodeEnum.java
@@ -46,4 +46,14 @@
     String SITE_EXECUTIVE_APPROVAL = "01";
     //《现场测试、校准或检定工作记录表》
     String SITE_EXECUTIVE_LOG = "02";
+
+    //测试、校准或检定工作分包协议书
+    String OUTSOURCE_PROTOCOL = "01";
+    //测试、校准或检定工作分包评审表
+    String OUTSOURCE_ACCESS = "02";
+    //测试、校准或检定工作分包通知书
+    String OUTSOURCE_NOTICE = "03";
+    //测试、校准或检定工作分包方名录
+    String OUTSOURCE_INFO = "04";
+
 }
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
index 24b8635..f78bd53 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
@@ -15,6 +15,10 @@
     String CERTIFICATE_CHANGE_APPLY_BEAN_NAME = "certificateChangeApplyBean";
     //现场测试、校准或检定
     String SITE_EXECUTIVE_BEAN_NAME = "siteExecutiveBean";
+    //测试、校准或检定工作分包评审表
+    String OUTSOURCE_ASSESS_BEAN_NAME = "outsourceAssessBean";
+    //测试、校准或检定工作分包协议书
+    String OUTSOURCE_PROTOCOL_BEAN_NAME = "outsourceProtocolBean";
 
     /*********************************设备与装置************************************/
     //设备台账
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 b21c661..6b86fd1 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
@@ -18,6 +18,8 @@
     OUTSOURCER_APPROVAL(OUTSOURCER_BEAN_NAME, ""),
     CERTIFICATE_CHANGE_APPROVAL(CERTIFICATE_CHANGE_APPLY_BEAN_NAME, ""),
     SITE_EXECUTIVE_APPROVAL(SITE_EXECUTIVE_BEAN_NAME, ""),
+    OUTSOURCE_ASSESS_APPROVAL(OUTSOURCE_ASSESS_BEAN_NAME, ""),
+    OUTSOURCE_PROTOCOL_APPROVAL(OUTSOURCE_PROTOCOL_BEAN_NAME, ""),
 
     ACTION_STATUS_MAP(new HashMap<String, AwareActionStatusEnum>() {
         {
@@ -47,6 +49,10 @@
             put(ApplyFromIdEnum.CERTIFICATE_CHANGE_APPROVAL.getCode(), CERTIFICATE_CHANGE_APPROVAL);
             //现场测试、校准或检定审批
             put(ApplyFromIdEnum.SITE_EXECUTIVE_APPROVAL.getCode(), SITE_EXECUTIVE_APPROVAL);
+            //测试、校准或检定工作分包评审表
+            put(ApplyFromIdEnum.OUTSOURCE_ASSESS_APPROVAL.getCode(), OUTSOURCE_ASSESS_APPROVAL);
+            //测试、校准或检定工作分包协议书
+            put(ApplyFromIdEnum.OUTSOURCE_PROTOCOL_APPROVAL.getCode(), OUTSOURCE_PROTOCOL_APPROVAL);
         }
     });
     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 934405e..c7410bd 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
@@ -9,6 +9,8 @@
     CERTIFICATE_CHANGE_APPROVAL("jljdywzsbchghsqd", MessageSourceModuleEnum.BUSINESS.getCode(), "证书/报告补充或更换申请单"),
     OUTSOURCER_APPROVAL("jljdywcsjzhgfbfml", MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定合格分包方名录"),
     SITE_EXECUTIVE_APPROVAL("jljdywxccsjzsp", MessageSourceModuleEnum.BUSINESS.getCode(), "现场测试、校准或检定审批"),
+    OUTSOURCE_ASSESS_APPROVAL("jljdywcsjzfbpsb", MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包评审表"),
+    OUTSOURCE_PROTOCOL_APPROVAL("jljdywcsjzfbxys", MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包协议书"),
 
 
     /*******************************************设备与装置*********************************************/
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/GeneralApprovalMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/GeneralApprovalMapper.java
index 4fb7344..0c9d6ae 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/GeneralApprovalMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/GeneralApprovalMapper.java
@@ -17,8 +17,4 @@
 
     Page<O> selectBatchForApprovalList(Page<O> page, @Param("request") R request, @Param("businessKeys") List<String> businessKeys);
 
-//    Page<O> selectListPage(Page<O> page, @Param("request") R request);
-
-//    Long selectMaxNo();
-
 }
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceAssessMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceAssessMapper.java
index 7867bb8..ba59009 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceAssessMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceAssessMapper.java
@@ -1,7 +1,12 @@
 package com.casic.missiles.mapper.business;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.business.outsource.OutsourceAssessApprovalListRequest;
+import com.casic.missiles.mapper.GeneralApprovalMapper;
 import com.casic.missiles.model.business.BizBusinessOutsourceAssess;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * <p>
@@ -11,6 +16,10 @@
  * @author wangpeng
  * @since 2023-08-16
  */
-public interface BizBusinessOutsourceAssessMapper extends BaseMapper<BizBusinessOutsourceAssess> {
+public interface BizBusinessOutsourceAssessMapper extends GeneralApprovalMapper<BizBusinessOutsourceAssess, BizBusinessOutsourceAssess, OutsourceAssessApprovalListRequest> {
+
+    Page<BizBusinessOutsourceAssess> selectBatchForApprovalList(Page<BizBusinessOutsourceAssess> page, @Param("request") OutsourceAssessApprovalListRequest request, @Param("businessKeys") List<String> businessKeys);
+
+    Long selectMaxProjectNo();
 
 }
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceProtocolMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceProtocolMapper.java
new file mode 100644
index 0000000..e6aba35
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceProtocolMapper.java
@@ -0,0 +1,24 @@
+package com.casic.missiles.mapper.business;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.business.outsource.OutsourceProtocolApprovalListRequest;
+import com.casic.missiles.mapper.GeneralApprovalMapper;
+import com.casic.missiles.model.business.BizBusinessOutsourceProtocol;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 计量检定业务-分包管理-测试、校准或检定工作分包协议书 Mapper 接口
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-08-24
+ */
+public interface BizBusinessOutsourceProtocolMapper extends GeneralApprovalMapper<BizBusinessOutsourceProtocol, BizBusinessOutsourceProtocol, OutsourceProtocolApprovalListRequest> {
+
+    Page<BizBusinessOutsourceProtocol> selectBatchForApprovalList(Page<BizBusinessOutsourceProtocol> page, @Param("request") OutsourceProtocolApprovalListRequest request, @Param("businessKeys") List<String> businessKeys);
+
+    Long selectMaxProtocolNo();
+}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/EnvLocationInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/EnvLocationInfoMapper.java
new file mode 100644
index 0000000..49eff87
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/EnvLocationInfoMapper.java
@@ -0,0 +1,21 @@
+package com.casic.missiles.mapper.resource;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.resource.environment.LocationListRequest;
+import com.casic.missiles.dto.resource.environment.LocationListResponse;
+import com.casic.missiles.model.resource.EnvLocationInfo;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * <p>
+ * 实验室环境监控系统-设备表 Mapper 接口
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-06-07
+ */
+public interface EnvLocationInfoMapper extends BaseMapper<EnvLocationInfo> {
+
+    Page<LocationListResponse> selectLocationListPage(Page<LocationListResponse> page, @Param("request") LocationListRequest request);
+}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java
index de124db..85ed0f7 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java
@@ -1,7 +1,9 @@
 package com.casic.missiles.mapper.system;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.dto.system.SignDetailResponse;
+import com.casic.missiles.dto.system.SignListRequest;
 import com.casic.missiles.model.system.SystemSign;
 import org.apache.ibatis.annotations.Param;
 
@@ -22,4 +24,8 @@
     SignDetailResponse selectSignDetailById(Long id);
 
     List<SystemSign> selectUsableSignList(@Param("userId") Long userId);
+
+    Page<SystemSign> selectSignListPage(Page<SystemSign> page, @Param("request") SignListRequest request);
+
+    List<SystemSign> selectSignList(@Param("request") SignListRequest request);
 }
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateChangeApplyMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateChangeApplyMapper.xml
index d798447..c496092 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateChangeApplyMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateChangeApplyMapper.xml
@@ -30,31 +30,31 @@
         SELECT *
         FROM biz_business_certificate_change_apply
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.changeApplyNo != null and request.changeApplyNo !=''">
+        <if test="request != null and request.changeApplyNo != null and request.changeApplyNo !=''">
             and change_apply_no like concat('%',#{request.changeApplyNo},'%')
         </if>
-        <if test="request.changeReportNo != null and request.changeReportNo !=''">
+        <if test="request != null and request.changeReportNo != null and request.changeReportNo !=''">
             and change_report_no like concat('%',#{request.changeReportNo},'%')
         </if>
-        <if test="request.changeReportName != null and request.changeReportName !=''">
+        <if test="request != null and request.changeReportName != null and request.changeReportName !=''">
             and change_report_name like concat('%',#{request.changeReportName},'%')
         </if>
-        <if test="request.changeType != null and request.changeType !=''">
+        <if test="request != null and request.changeType != null and request.changeType !=''">
             and change_type = #{request.changeType}
         </if>
-        <if test="request.createUserName != null and request.createUserName !=''">
+        <if test="request != null and request.createUserName != null and request.createUserName !=''">
             and create_user_name like concat('%',#{request.createUserName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java
index bb0c50f..13a699b 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java
@@ -12,6 +12,7 @@
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.IGeneralApprovalService;
+import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
@@ -19,6 +20,7 @@
 import org.springframework.web.bind.annotation.RequestBody;
 
 import javax.validation.Valid;
+import java.util.List;
 import java.util.Objects;
 
 /**
@@ -117,4 +119,17 @@
         }
         return baseApprovalService.failUpdate(request);
     }
+
+    public List<O> exportList(@RequestBody @Valid R request) throws Exception {
+        List<O> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = baseApprovalService.listExportByIds(request.getIds());
+        } else {
+            list = baseApprovalService.listExport(request);
+        }
+        for (O record : list) {
+            DictCodeUtils.convertDictCodeToName(record);
+        }
+        return list;
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java
index 8a90961..d775831 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java
@@ -5,6 +5,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.business.certificate.CertificateChangeApplyApprovalListRequest;
 import com.casic.missiles.dto.business.certificate.CertificateChangeApplySaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessCertificateChangeApply;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
@@ -20,6 +21,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -48,4 +50,12 @@
         }
         return changeApplyService.saveChangeApply(request);
     }
+
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody CertificateChangeApplyApprovalListRequest request) throws Exception {
+        List<BizBusinessCertificateChangeApply> list = super.exportList(request);
+        super.exportExcel(BizBusinessCertificateChangeApply.class, list, ExportEnum.CERTIFICATE_CHANGE_APPLY.getSheetName());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java
index 5fc4b07..af8230e 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java
@@ -9,6 +9,7 @@
 import com.casic.missiles.dto.business.certificate.CertificatePrintApprovalListRequest;
 import com.casic.missiles.dto.business.certificate.CertificatePrintListResponse;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.enums.business.CertificatePrintStatusEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessCertificatePrintLog;
@@ -18,10 +19,16 @@
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.io.IOException;
+import java.util.List;
 import java.util.Objects;
 
 /**
@@ -98,4 +105,16 @@
         });
         return certificatePrintService.certificatePrintLog(idDTO.getId());
     }
+
+    @ApiOperation("证书打印审批导出")
+    @PostMapping("/listExport")
+    public void exportList(@RequestBody CertificatePrintApprovalListRequest request) throws IOException {
+        List<CertificatePrintListResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = certificatePrintService.listByIds(request.getIds());
+        } else {
+            list = certificatePrintService.list(request);
+        }
+        super.exportExcel(CertificatePrintListResponse.class, list, ExportEnum.CERTIFICATE_PRINT.getSheetName());
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java
index 63b06dc..6b2efd5 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java
@@ -6,6 +6,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.business.certificate.CertificateReportApprovalListRequest;
 import com.casic.missiles.dto.business.certificate.CertificateReportSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessCertificateReport;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
@@ -21,6 +22,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -50,7 +52,7 @@
         return certificateReportService.saveCertificateReport(request);
     }
 
-    @ApiOperation("证书审批详情（基本信息）")
+    @ApiOperation("详情（基本信息）")
     @PostMapping("/detail")
     public ReturnDTO<BizBusinessCertificateReport> detail(@RequestBody @Valid BaseDetailRequest request, BindingResult bindingResult) throws Exception {
         if(bindingResult.hasErrors()){
@@ -59,4 +61,11 @@
         return certificateReportService.detail(request);
     }
 
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody CertificateReportApprovalListRequest request) throws Exception {
+        List<BizBusinessCertificateReport> list = super.exportList(request);
+        super.exportExcel(BizBusinessCertificateReport.class, list, ExportEnum.CERTIFICATE_REPORT.getSheetName());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java
index 46b26bd..57c0809 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java
@@ -10,20 +10,21 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.business.identify.IdentifyListRequest;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessIdentifyInfo;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.business.IBizBusinessIdentifyInfoService;
+import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import javax.validation.Valid;
+import java.util.List;
 import java.util.Objects;
 
 /**
@@ -57,16 +58,13 @@
         return identifyInfoService.addIdentify(identifyInfo);
     }
 
-    @ApiOperation("标识打印更新")
+    @ApiOperation("标识打印更新（更新打印时间）")
     @PostMapping("/update")
-    public ReturnDTO updateIdentify(@RequestBody @Valid BizBusinessIdentifyInfo identifyInfo, BindingResult bindingResult) {
-        Assert.isFalse(Objects.isNull(identifyInfo.getId()), () -> {
+    public ReturnDTO updateIdentify(@RequestBody @Valid IdDTO idDTO) {
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        Assert.isFalse(bindingResult.hasErrors(), () -> {
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        });
-        return identifyInfoService.updateIdentify(identifyInfo);
+        return identifyInfoService.updateIdentify(idDTO.getId());
     }
 
     @ApiOperation("标识打印删除")
@@ -77,4 +75,37 @@
         });
         return identifyInfoService.deleteIdentify(idDTO.getId());
     }
+
+    @ApiOperation("标识打印导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody @Valid IdentifyListRequest request, BindingResult bindingResult) throws Exception {
+        if (bindingResult.hasErrors()) {
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        List<BizBusinessIdentifyInfo> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = identifyInfoService.listByIds(request.getIds());
+        } else {
+            list = identifyInfoService.list(request);
+        }
+        for (BizBusinessIdentifyInfo record : list) {
+            DictCodeUtils.convertDictCodeToName(record);
+        }
+        super.exportExcel(BizBusinessIdentifyInfo.class, list, ExportEnum.IDENTIFY_EXPORT.getSheetName());
+    }
+
+
+    // TODO: 2023/8/23 查询设备信息，4个底部按钮查设备（按钮的作用就是前端用来调不同接口、用来区分中间即将展示的标识），前端弹窗选设备，在确定保存时前端根据底部按钮判断传入设备类型deviceType字典code
+    // TODO: 2023/8/23 接口：查受检设备（第1个按钮），查设备台账（后3个按钮同一接口），查询之后前端根据标志类型的不同加到中间页面时进行判断（按产品给的对应表）
+    // TODO: 2023/8/23 提供二维码接口，前端在加到中间页面时调用一下
+
+    @ApiOperation("设备二维码")
+    @PostMapping("/equipment/qrCode")
+    public ReturnDTO<String> equipmentQrCode(@RequestBody @Valid IdDTO idDTO) {
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return identifyInfoService.equipmentQrCode(idDTO.getId());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java
index 707be6e..7e0453d 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java
@@ -117,7 +117,7 @@
     }
 
     @ApiOperation("任务单导出")
-    @PostMapping("/export")
+    @PostMapping("/listExport")
     public void orderExport(@RequestBody @Valid OrderListRequest request, HttpServletResponse response) {
         businessOrderService.orderExport(request, response);
     }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java
index 529a6ce..51432be 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java
@@ -1,9 +1,28 @@
 package com.casic.missiles.controller.business;
 
+import com.casic.missiles.controller.GeneralApprovalController;
+import com.casic.missiles.dto.BaseApprovalSubmitRequest;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.business.outsource.OutsourceAssessApprovalListRequest;
+import com.casic.missiles.dto.business.outsource.OutsourceAssessSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
+import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.model.business.BizBusinessOutsourceAssess;
+import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
+import com.casic.missiles.service.IGeneralApprovalService;
+import com.casic.missiles.service.business.IBizBusinessOutsourceAssessService;
 import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.BindingResult;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.validation.Valid;
+import java.util.List;
+
 /**
  * <p>
  * 计量检定业务-分包管理-测试、校准或检定工作分包评审表 前端控制器
@@ -15,6 +34,27 @@
 @Api(tags = "分包管理-测试、校准或检定工作分包评审表")
 @RestController
 @RequestMapping("/business/outsource/assess")
-public class BizBusinessOutsourceAssessController {
+public class BizBusinessOutsourceAssessController extends GeneralApprovalController<BizBusinessOutsourceAssess, BizBusinessOutsourceAssess, OutsourceAssessApprovalListRequest, BaseApprovalSubmitRequest> {
+    @Autowired
+    private IBizBusinessOutsourceAssessService outsourceAssessService;
 
+    public BizBusinessOutsourceAssessController(IGeneralApprovalService<BizBusinessOutsourceAssess, BizBusinessOutsourceAssess, OutsourceAssessApprovalListRequest, BaseApprovalSubmitRequest> baseApprovalService) {
+        super(baseApprovalService);
+    }
+
+    @ApiOperation("草稿箱-保存")
+    @PostMapping("/save")
+    public ReturnDTO<OutsourceAssessSaveResponse> saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceAssess request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        return outsourceAssessService.saveOutsourceAssess(request);
+    }
+
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception {
+        List<BizBusinessOutsourceAssess> list = super.exportList(request);
+        super.exportExcel(BizBusinessOutsourceAssess.class, list, ExportEnum.OUTSOURCE_ASSESS.getSheetName());
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java
new file mode 100644
index 0000000..9adef18
--- /dev/null
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java
@@ -0,0 +1,60 @@
+package com.casic.missiles.controller.business;
+
+import com.casic.missiles.controller.GeneralApprovalController;
+import com.casic.missiles.dto.BaseApprovalSubmitRequest;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.business.outsource.OutsourceProtocolApprovalListRequest;
+import com.casic.missiles.dto.business.outsource.OutsourceProtocolSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
+import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.model.business.BizBusinessOutsourceProtocol;
+import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
+import com.casic.missiles.service.IGeneralApprovalService;
+import com.casic.missiles.service.business.IBizBusinessOutsourceProtocolService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.BindingResult;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.validation.Valid;
+import java.util.List;
+
+/**
+ * <p>
+ * 计量检定业务-分包管理-测试、校准或检定工作分包协议书 前端控制器
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-08-24
+ */
+@Api(tags = "分包管理-测试、校准或检定工作分包协议书")
+@RestController
+@RequestMapping("/business/outsource/protocol")
+public class BizBusinessOutsourceProtocolController extends GeneralApprovalController<BizBusinessOutsourceProtocol, BizBusinessOutsourceProtocol, OutsourceProtocolApprovalListRequest, BaseApprovalSubmitRequest> {
+    @Autowired
+    private IBizBusinessOutsourceProtocolService outsourceProtocolService;
+
+    public BizBusinessOutsourceProtocolController(IGeneralApprovalService<BizBusinessOutsourceProtocol, BizBusinessOutsourceProtocol, OutsourceProtocolApprovalListRequest, BaseApprovalSubmitRequest> baseApprovalService) {
+        super(baseApprovalService);
+    }
+
+    @ApiOperation("草稿箱-保存")
+    @PostMapping("/save")
+    public ReturnDTO<OutsourceProtocolSaveResponse> saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceProtocol request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        return outsourceProtocolService.saveOutsourceProtocol(request);
+    }
+
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody OutsourceProtocolApprovalListRequest request) throws Exception {
+        List<BizBusinessOutsourceProtocol> list = super.exportList(request);
+        super.exportExcel(BizBusinessOutsourceProtocol.class, list, ExportEnum.OUTSOURCE_PROTOCOL.getSheetName());
+    }
+}
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java
index 097f645..f0f0943 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java
@@ -17,7 +17,6 @@
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.IGeneralApprovalService;
 import com.casic.missiles.service.business.IBizBusinessOutsourcerInfoService;
-import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -71,19 +70,8 @@
 
     @ApiOperation("分包方导出")
     @PostMapping("/listExport")
-    public void export(@RequestBody @Valid OutsourcerInfoApprovalListRequest request, BindingResult bindingResult) throws Exception {
-        if (bindingResult.hasErrors()) {
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        }
-        List<BizBusinessOutsourcerInfo> list;
-        if (!CollectionUtils.isEmpty(request.getIds())) {
-            list = outsourcerInfoService.listByIds(request.getIds());
-        } else {
-            list = outsourcerInfoService.list(request);
-        }
-        for (BizBusinessOutsourcerInfo record : list) {
-            DictCodeUtils.convertDictCodeToName(record);
-        }
+    public void export(@RequestBody OutsourcerInfoApprovalListRequest request) throws Exception {
+        List<BizBusinessOutsourcerInfo> list = super.exportList(request);
         super.exportExcel(BizBusinessOutsourcerInfo.class, list, ExportEnum.OUTSOURCER_EXPORT.getSheetName());
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java
index c2cbf9f..0410918 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java
@@ -17,11 +17,9 @@
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.IGeneralApprovalService;
 import com.casic.missiles.service.business.IBizBusinessSiteExecutiveInfoService;
-import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -60,7 +58,7 @@
         return siteExecutiveInfoService.saveSiteExecutiveInfo(siteExecutiveInfo);
     }
 
-    @ApiOperation("现场检测详情")
+    @ApiOperation("详情")
     @PostMapping("/detail")
     public ReturnDTO<SiteExecutiveDetailResponse> siteExecutiveDetail(@RequestBody @Valid IdDTO idDTO) throws Exception {
         Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
@@ -69,21 +67,10 @@
         return ReturnUtil.success(siteExecutiveInfoService.detail(idDTO.getId()));
     }
 
-    @ApiOperation("现场检测导出")
+    @ApiOperation("导出")
     @PostMapping("/listExport")
-    public void export(@RequestBody @Valid SiteExecutiveApprovalListRequest request, BindingResult bindingResult) throws Exception {
-        if (bindingResult.hasErrors()) {
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        }
-        List<SiteExecutiveApprovalListResponse> list;
-        if (!CollectionUtils.isEmpty(request.getIds())) {
-            list = siteExecutiveInfoService.listInfoByIds(request.getIds());
-        } else {
-            list = siteExecutiveInfoService.listInfo(request);
-        }
-        for (SiteExecutiveApprovalListResponse record : list) {
-            DictCodeUtils.convertDictCodeToName(record);
-        }
+    public void export(@RequestBody SiteExecutiveApprovalListRequest request) throws Exception {
+        List<SiteExecutiveApprovalListResponse> list = super.exportList(request);
         super.exportExcel(SiteExecutiveApprovalListResponse.class, list, ExportEnum.SITE_EXECUTIVE_EXPORT.getSheetName());
     }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
index 7e793cd..a92e209 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
@@ -55,7 +55,7 @@
 
     @ApiOperation("设备收发列表导出")
     @PostMapping("/export")
-    public void exportList(@RequestBody @Valid SampleDispatchListRequest request) throws IOException {
+    public void exportList(@RequestBody SampleDispatchListRequest request) throws IOException {
         List<SampleDispatchListResponse> list;
         if (!CollectionUtils.isEmpty(request.getIds())) {
             list = dispatchService.listByIds(request.getIds());
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java
index cdc77fc..d120fd4 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java
@@ -7,6 +7,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.business.labExecutive.*;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.business.IBusinessLabExecutiveInfoService;
@@ -14,6 +15,7 @@
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.*;
 
@@ -32,7 +34,7 @@
     @Autowired
     private IBusinessLabExecutiveInfoService labExecutiveInfoService;
 
-    @ApiOperation("实验室检测-部门检测-查询各状态列表（待检测、检测中、检测完）")
+    @ApiOperation("实验室任务-查询各状态列表（待检测、检测中、检测完）")
     @PostMapping("/deptExecutive/List")
     public ReturnDTO<PageInfoBT<SampleLabExecutiveListResponse>> queryDeptExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
@@ -43,10 +45,19 @@
         return ReturnUtil.success(super.packForBT(labExecutiveInfoService.deptLabExecutiveListPage(page, labExecutiveListRequest)));
     }
 
-    /**
-     * 实验室检测-我的检测-查询各状态列表（待检测、检测中、检测完）
-     */
-    @ApiOperation("实验室检测-我的检测-查询各状态列表（待检测、检测中、检测完）")
+    @ApiOperation("实验室任务导出")
+    @PostMapping("/deptExecutive/export")
+    public void deptExportList(@RequestBody @Valid SampleLabExecutiveListRequest request) throws Exception {
+        List<SampleLabExecutiveListResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = labExecutiveInfoService.deptLabExecutiveListByIds(request.getMeasureStatus(), request.getIds());
+        } else {
+            list = labExecutiveInfoService.deptLabExecutiveList(request);
+        }
+        super.exportExcel(SampleLabExecutiveListResponse.class, list, ExportEnum.DEPT_EXECUTIVE_TASK.getSheetName());
+    }
+
+    @ApiOperation("我的任务-查询各状态列表（待检测、检测中、检测完）")
     @PostMapping("/myExecutive/list")
     public ReturnDTO<PageInfoBT<SampleLabExecutiveListResponse>> queryMyExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
@@ -57,19 +68,25 @@
         return ReturnUtil.success(super.packForBT(labExecutiveInfoService.myLabExecutiveListPage(page, labExecutiveListRequest)));
     }
 
-    /**
-     * 实验室检测-我的检测-查询各状态样品数量（待检测、检测中、检测完）
-     */
-    @ApiOperation("实验室检测-我的检测-查询各状态样品数量（待检测、检测中、检测完）")
+    @ApiOperation("我的任务导出")
+    @PostMapping("/myExecutive/export")
+    public void exportList(@RequestBody @Valid SampleLabExecutiveListRequest request) throws Exception {
+        List<SampleLabExecutiveListResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = labExecutiveInfoService.myLabExecutiveListByIds(request.getMeasureStatus(), request.getIds());
+        } else {
+            list = labExecutiveInfoService.myLabExecutiveList(request);
+        }
+        super.exportExcel(SampleLabExecutiveListResponse.class, list, ExportEnum.MY_EXECUTIVE_TASK.getSheetName());
+    }
+
+    @ApiOperation("我的任务-查询各状态样品数量（待检测、检测中、检测完）")
     @GetMapping("/myExecutive/amount")
     public ReturnDTO<List<SampleAmountResponse>> queryMyExecutiveAmount() {
         return ReturnUtil.success(labExecutiveInfoService.myExecutiveAmount());
     }
 
-    /**
-     * 实验室检测-部门检测-分配（分配给具体人员）
-     */
-    @ApiOperation("实验室检测-部门检测-分配按钮（分配给具体人员）")
+    @ApiOperation("实验室任务-分配按钮（分配给具体人员）")
     @PostMapping("/deptExecutive/allocate")
     public ReturnDTO allocateStaff(@RequestBody @Valid SampleAllocateRequest sampleAllocateRequest, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -78,10 +95,7 @@
         return labExecutiveInfoService.allocateStaff(sampleAllocateRequest);
     }
 
-    /**
-     * 实验室检测-我的检测-检定人扫描收入（待检测->检测中）
-     */
-    @ApiOperation("实验室检测-我的检测-检定人扫描收入（待检测->检测中）")
+    @ApiOperation("我的任务-检定人扫描收入（待检测->检测中）")
     @PostMapping("/myExecutive/receive")
     public ReturnDTO sampleReceive(@RequestBody @Valid List<SampleOperateRequest> requestList, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -90,10 +104,7 @@
         return labExecutiveInfoService.sampleReceive(requestList);
     }
 
-    /**
-     * 实验室检测-负责人/检定人扫描检完（检测中->检测完）
-     */
-    @ApiOperation("实验室检测-负责人/检定人扫描检完（检测中->检测完）")
+    @ApiOperation("实验室任务-负责人/检定人扫描检完（检测中->检测完）")
     @PostMapping("/myExecutive/complete")
     public ReturnDTO sampleExecutiveComplete(@RequestBody @Valid List<SampleOperateRequest> requestList, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -102,10 +113,7 @@
         return labExecutiveInfoService.sampleExecutiveComplete(requestList);
     }
 
-    /**
-     * 实验室检测-部门检测/我的检测 编辑（只能修改应出具证书）
-     */
-    @ApiOperation("实验室检测-部门检测/我的检测 编辑（只能修改应出具证书）")
+    @ApiOperation("实验室任务/我的任务 编辑（只能修改应出具证书）")
     @PostMapping("/executive/update")
     public ReturnDTO updateExecutive(@RequestBody @Valid UpdateExecutiveRequest request, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -114,10 +122,7 @@
         return labExecutiveInfoService.updateExecutive(request);
     }
 
-    /**
-     * 实验室检测-部门检测/我的检测 详情
-     */
-    @ApiOperation("实验室检测-部门检测/我的检测 详情")
+    @ApiOperation("实验室任务/我的任务 详情")
     @PostMapping("/executive/detail")
     public ReturnDTO<ExecutiveDetailResponse> executiveDetail(@RequestBody @Valid ExecutiveDetailRequest request, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
@@ -131,7 +136,7 @@
      * 退回后会将下一个要执行的实验室检测状态更新为待分配，将后面的实验室顺序变更为连续（都进行减1）
      * 最后一个检测的实验室退回，等分发员再增加实验室或设备收发中的已收入直接手动点击完成
      */
-    @ApiOperation("实验室检测-部门检测/我的检测 退回（待检测/检测中->退回）")
+    @ApiOperation("实验室任务/我的任务 退回（待检测/检测中->退回）")
     @PostMapping("/executive/sendBack")
     public ReturnDTO executiveSendBack(@RequestBody @Valid ExecutiveSendBackRequest request, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -140,9 +145,6 @@
         return labExecutiveInfoService.sampleExecutiveSendBack(request);
     }
 
-    /**
-     * 分发员编辑实验室检测列表
-     */
     @ApiOperation("分发员编辑实验室检测列表")
     @PostMapping("/handOut/updateList")
     public ReturnDTO updateExecutiveList(@RequestBody @Valid UpdateExecutiveListRequest request, BindingResult bindingResult) {
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java
index 48a67ed..0c04f31 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java
@@ -10,6 +10,7 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.resource.customer.CustomerApprovalListRequest;
 import com.casic.missiles.dto.resource.customer.CustomerSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceCustomerInfo;
@@ -26,6 +27,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -55,6 +57,13 @@
         return customerInfoService.saveCustomerInfo(request);
     }
 
+    @ApiOperation("委托方名录导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody CustomerApprovalListRequest request) throws Exception {
+        List<BizResourceCustomerInfo> list = super.exportList(request);
+        super.exportExcel(BizResourceCustomerInfo.class, list, ExportEnum.CUSTOMER_INFO.getSheetName());
+    }
+
     @ApiOperation("委托方人员列表（分页）")
     @PostMapping("/person/listPage")
     public ReturnDTO<PageInfoBT<BizResourceCustomerStaff>> personListPage(@RequestBody IdDTO idDto) {
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
index 972ed4b..6418ea5 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
@@ -5,6 +5,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.resource.customer.SuggestFormApprovalListRequest;
 import com.casic.missiles.dto.resource.customer.SuggestFormSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceCustomerSuggestForm;
@@ -20,6 +21,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -50,4 +52,11 @@
         return suggestFormService.saveSuggestForm(request);
     }
 
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody SuggestFormApprovalListRequest request) throws Exception {
+        List<BizResourceCustomerSuggestForm> list = super.exportList(request);
+        super.exportExcel(BizResourceCustomerSuggestForm.class, list, ExportEnum.CUSTOMER_SUGGEST_FORM.getSheetName());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java
index 1934d1a..9e07eab 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java
@@ -15,12 +15,16 @@
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.resource.IEnvEnvironmentRecordConfigService;
 import com.casic.missiles.service.resource.IEnvEnvironmentRecordDataService;
+import com.casic.missiles.service.resource.IEnvLocationInfoService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
 import java.util.List;
@@ -39,6 +43,8 @@
     private IEnvEnvironmentRecordDataService environmentRecordDataService;
     @Autowired
     private IEnvEnvironmentRecordConfigService environmentRecordConfigService;
+    @Autowired
+    private IEnvLocationInfoService locationInfoService;
 
     @ApiOperation("环境记录单数据列表/详情")
     @PostMapping("/data/listPage")
@@ -95,4 +101,11 @@
         });
         return environmentRecordConfigService.deleteEnvironmentRecordConfig(idDTO.getId());
     }
+
+    @ApiOperation("地点列表")
+    @PostMapping("/location/listPage")
+    public ReturnDTO<PageInfoBT<LocationListResponse>> locationListPage(@RequestBody @Valid LocationListRequest request) {
+        Page<LocationListResponse> page = PageFactory.defaultPage();
+        return ReturnUtil.success(super.packForBT(locationInfoService.listPage(page, request)));
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java
index 82efe3f..e9561fa 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java
@@ -10,6 +10,7 @@
 import com.casic.missiles.dto.resource.seal.SealLogListRequest;
 import com.casic.missiles.dto.resource.seal.SealNoteApprovalListRequest;
 import com.casic.missiles.dto.resource.seal.SealNoteSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceSealUseLog;
@@ -27,6 +28,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -58,6 +60,13 @@
         return sealUseNoteService.saveSeal(request);
     }
 
+    @ApiOperation("印章使用登记导出（列表和导出中去掉经办人和监印人）")
+    @PostMapping("/listExport")
+    public void export(@RequestBody SealNoteApprovalListRequest request) throws Exception {
+        List<BizResourceSealUseNote> list = super.exportList(request);
+        super.exportExcel(BizResourceSealUseNote.class, list, ExportEnum.SEAL_NOTE.getSheetName());
+    }
+
     // TODO: 2023/7/28 印章使用日志：系统中使用印章时插入数据库
 
     @ApiOperation("印章使用日志列表（分页）")
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java
index 9b674fc..06b6521 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java
@@ -9,16 +9,20 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.resource.staff.StaffCertRequest;
 import com.casic.missiles.dto.resource.staff.StaffCertResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.service.resource.IBizResourceStaffInfoService;
 import com.casic.missiles.service.resource.IBizResourceStaffVerifierService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.List;
+
 /**
  * @Description:
  * @Author: wangpeng
@@ -41,9 +45,21 @@
         return ReturnUtil.success(super.packForBT(responsePage));
     }
 
+    @ApiOperation("证书逾期提醒导出")
+    @PostMapping("/listExport")
+    public void exportList(@RequestBody StaffCertRequest request) throws Exception {
+        List<StaffCertResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = staffInfoService.certListByIds(request.getIds());
+        } else {
+            list = staffInfoService.certList(request);
+        }
+        super.exportExcel(StaffCertResponse.class, list, ExportEnum.STAFF_CERTIFICATE_EXPIRE.getSheetName());
+    }
+
     @ApiOperation("证书逾期提醒")
     @PostMapping("/expirationReminder")
-    public ReturnDTO expirationReminder(@RequestBody IdDTO idDto) {
-        return verifierService.expirationReminder(idDto);
+    public ReturnDTO expirationReminder(@RequestBody IdDTO idDTO) {
+        return verifierService.expirationReminder(idDTO);
     }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java
index 3b251ad..a6e7850 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java
@@ -12,6 +12,7 @@
 import com.casic.missiles.dto.resource.staff.StaffListRequest;
 import com.casic.missiles.dto.resource.staff.TrainListRequest;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.*;
@@ -22,7 +23,10 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
 import java.util.List;
@@ -52,8 +56,19 @@
             throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
         }
         Page<BizResourceStaffInfo> page = PageFactory.defaultPage();
-        Page<BizResourceStaffInfo> responsePage = staffInfoService.listPage(page, request);
-        return ReturnUtil.success(super.packForBT(responsePage));
+        return ReturnUtil.success(super.packForBT(staffInfoService.listPage(page, request)));
+    }
+
+    @ApiOperation("人员登记导出")
+    @PostMapping("/listExport")
+    public void exportList(@RequestBody StaffListRequest request) throws Exception {
+        List<BizResourceStaffInfo> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = staffInfoService.listByIds(request.getIds());
+        } else {
+            list = staffInfoService.list(request);
+        }
+        super.exportExcel(BizResourceStaffInfo.class, list, ExportEnum.STAFF_INFO.getSheetName());
     }
 
     @ApiOperation("人员登记详情基础信息")
@@ -85,9 +100,9 @@
 
     @ApiOperation("科研教育列表（分页）")
     @PostMapping("/education/listPage")
-    public ReturnDTO<PageInfoBT<BizResourceStaffEducation>> educationListPage(@RequestBody IdDTO idDto) {
+    public ReturnDTO<PageInfoBT<BizResourceStaffEducation>> educationListPage(@RequestBody IdDTO idDTO) {
         Page<BizResourceStaffEducation> page = PageFactory.defaultPage();
-        Page<BizResourceStaffEducation> responsePage = staffInfoService.educationListPage(page, idDto);
+        Page<BizResourceStaffEducation> responsePage = staffInfoService.educationListPage(page, idDTO);
         return ReturnUtil.success(super.packForBT(responsePage));
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java
index af6aa86..d85d84a 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java
@@ -9,6 +9,7 @@
 import com.casic.missiles.dto.resource.outsideService.SupplierApprovalListRequest;
 import com.casic.missiles.dto.resource.outsideService.SupplierSaveResponse;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceSupplierAbility;
@@ -67,6 +68,13 @@
         return ReturnUtil.success(supplierInfoService.detail(idDTO.getId()));
     }
 
+    @ApiOperation("合格供方导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody SupplierApprovalListRequest request) throws Exception {
+        List<BizResourceSupplierInfo> list = super.exportList(request);
+        super.exportExcel(BizResourceSupplierInfo.class, list, ExportEnum.SUPPLIER_INFO.getSheetName());
+    }
+
     @ApiOperation("供方人员列表（分页）")
     @PostMapping("/person/listPage")
     public ReturnDTO<PageInfoBT<BizResourceSupplierPerson>> personListPage(@RequestBody IdDTO idDTO) {
diff --git a/casic-metering-api/src/main/resources/config/application.yml b/casic-metering-api/src/main/resources/config/application.yml
index 350db5f..ecff521 100644
--- a/casic-metering-api/src/main/resources/config/application.yml
+++ b/casic-metering-api/src/main/resources/config/application.yml
@@ -126,7 +126,7 @@
     #作者
     author: wangpeng
     #待生成对象表名
-    table-name: biz_equipment_technical_target_approval,biz_equipment_attachment_approval,biz_equipment_checkpoint_approval
+    table-name: biz_business_outsource_protocol
 
 reminder:
   #节点--common模块config包 ReminderNodeConfig配置
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
index 4a19e4e..d47d552 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
@@ -53,6 +53,7 @@
     SUGGEST_FORM_SAVE_FAILED(2509, "委托方意见登记表保存至草稿箱失败"),
     EXAMINE_FORM_SAVE_FAILED(2510, "要求、委托书及合同评审表保存至草稿箱失败"),
     CUSTOMER_EXIST_SAVE_FAILED(2511, "该委托方已存在，请重新选择"),
+    DUPLICATE_LOCATION_NO(2512, "地点编号已存在"),
 
     /**
      * 计量检定业务模块
@@ -68,6 +69,8 @@
     COMPLETE_SAMPLE_NOT_EXIST(2609, "检测中不存在扫描收入的样品"),
     CANNOT_CHANGE_MEASURE_INFO(2610, "无法更改非当前登录用户的检测信息"),
     NON_EXIST_ORDER_OR_SAMPLE(2611, "不存在该委托单或该委托单下的样品"),
+    OUTSOURCE_ACCESS_SAVE_FAILED(2612, "测试、校准或检定工作分包评审表保存至草稿箱失败"),
+    OUTSOURCE_PROTOCOL_SAVE_FAILED(2613, "测试、校准或检定工作分包协议书保存至草稿箱失败"),
 
     /**
      * 历史遗留备用
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
index 5089ad1..81a406b 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
@@ -10,54 +10,38 @@
     /**
      * 资源管理
      */
-    ENVIRONMENT_DATA_EXPORT("environmentData", "environmentData", "环境记录单数据"),
+    ENVIRONMENT_DATA_EXPORT("environmentData", "环境记录单数据", "环境记录单数据"),
+    STAFF_INFO("staffInfo", "人员登记", "人员登记"),
+    STAFF_CERTIFICATE_EXPIRE("certificateExpire", "证书逾期提醒", "证书逾期提醒"),
+    SUPPLIER_INFO("supplierInfo", "合格供方名录", "合格供方名录"),
+    CUSTOMER_INFO("customerInfo", "委托方名录", "委托方名录"),
+    CUSTOMER_SUGGEST_FORM("customerSuggestForm", "委托方意见登记表", "委托方意见登记表"),
+    SEAL_NOTE("sealNote", "印章使用登记", "印章使用登记"),
 
-    FILE_EXPORT("meterFileData", "meterFileData", "计量文件信息"),
-    TRAIN_PLAN_EXPORT("trainPlanData", "trainPlanData", "培训计划"),
-    TRAIN_LOG_EXPORT("trainLogData", "trainLogData", "培训记录"),
-    METER_ORGANIZE_EXPORT("meterOrganizeData", "meterOrganizeData", "计量组织"),
-    TRACE_SUPPLIER_EXPORT("traceSupplierData", "traceSupplierData", "溯源供方"),
-    SIGN_EXPORT("signData", "signData", "签名/签章"),
-    TEMPLATE_EXPORT("templateData", "templateData", "原始记录模板/证书报告模板"),
-    FIXED_ASSETS("meterFixedAssets", "meterFixedAssets", "固定资产"),
-    METER_EQUIPMENT("meterEquipment", "meterEquipment", "测量设备"),
-    CALIBRATION_TEST_EQUIPMENT("calibrationTestEquipment", "calibrationTestEquipment", "校准检定设备"),
-    MEASURE_ACCOUNT("measureAccount", "measureAccount", "测量工装"),
-    STANDARD_SUPPORT_EQUIPMENT("standardSupportEquipment", "standardSupportEquipment", "标准配套设备"),
-    STANDARD_EQUIPMENT("standardEquipment", "standardEquipment", "标准装置"),
-    FLOW_DEF_EXPORT("flowDefData", "flowDefData", "流程定义"),
-    STAFF_CERTIFICATE("certificate", "certificate", "计量人员证书"),
-    CHECK_INFO("checkInfo", "checkInfo", "设备管理点检测"),
-    EQUIPMENT_APPLY("equipmentApply", "equipmentApply", "设备借用"),
-    STANDARD_EQUIPMENT_REMIND("equipmentApplyRemind", "equipmentApplyRemind", "标准装置到期提醒"),
-    METER_PRICE("meterPrice", "meterPrice", "价格库"),
-    METER_STAFF("meterStaff", "meterStaff", "计量人员"),
-    STANDARD_EQUIPMENT_APPLY("standardEquipmentApply", "standardEquipmentApply", "标准装置申请"),
-    STATE_MANAGE_APPLY("stateManage", "stateManage", "状态管理"),
-    METER_ACCEPTANCE_CHECK("acceptanceCheck", "acceptanceCheck", "设备检修保养验收单"),
-    CUSTOMER_EXPORT("customerData", "customerData", "客户信息"),
-    ORDER_EXPORT("orderData", "orderData", "委托书信息"),
-    SAMPLE_EXPORT("sampleData", "sampleData", "样本信息"),
-    EXCHANGE_DATA("exchangeData", "exchangeData", "设备交接单"),
-    DISPATCH_DATA("dispatchData", "dispatchData", "设备收发"),
-    ENVIRONMENT_DATA("environmentData", "environmentData", "环境记录单"),
-    ORIGIN_DATA("originData", "originData", "原始记录"),
-    CERTIFICATE_REPORT("certificateReport", "certificateReport", "证书报告"),
-    ADVICE_EXPORT("adviceData", "adviceData", "客户反馈"),
-    HANDOUT_EXPORT("handoutData", "handoutData", "任务分发列表"),
-    OUTSOURCER_EXPORT("outsourcerData", "outsourcerData", "分包方"),
-    SITE_EXECUTIVE_EXPORT("siteExecutiveData", "siteExecutiveData", "现场测试、校准或检定"),
-    CERTIFICATE_PRINT_EXPORT("certificatePrintData", "certificatePrintData", "证书打印"),
-    DOWNLOAD_TEMPLATE("downloadTemplate", "downloadTemplate", "页面配置"),
-    OUTSOURCER_CERTIFICATE_EXPORT("outsourceCertificateData", "outsourceCertificateData", "分包证书"),
-    SETTLEMENT_INFO_EXPORT("settlementInfoData", "settlementInfoData", "业务结算"),
-    EQUIPMENT_REMIND("equipmentRemind", "equipmentRemind", "设备到期提醒"),
-    AGREEMENT_INFO_EXPORT("agreementInfoData", "agreementInfoData", "合同"),
-    WORK_STATISTICS_EXPORT("workStatisticsData", "workStatisticsData", "实时工作统计"),
-    DEPT_OUTPUT_EXPORT("deptOutputData", "deptOutputData", "部门产值分析"),
-    WORKLOAD_EXPORT("workloadData", "workloadData", "业务工作量分析"),
-    DEPT_COMPREHENSIVE_EXPORT("deptComprehensiveData", "deptComprehensiveData", "部门综合分析"),
-    ENVIRONMENTAL_RECORD("environmentalRecordData", "environmentalRecordData", "现场环境记录");
+    /**
+     * 计量检定业务
+     */
+    OUTSOURCER_EXPORT("outsourcerData", "分包方名录", "分包方名录"),
+    IDENTIFY_EXPORT("identifyData", "计量标识", "计量标识"),
+    ORDER_EXPORT("orderData", "任务单", "任务单"),
+    DISPATCH_DATA("dispatchData", "设备收发", "设备收发"),
+    HANDOUT_EXPORT("handoutData", "任务分发", "任务分发"),
+    SITE_EXECUTIVE_EXPORT("siteExecutiveData", "现场测试、校准或检定", "现场测试、校准或检定"),
+    CERTIFICATE_REPORT("certificateReport", "证书审批", "证书审批"),
+    CERTIFICATE_CHANGE_APPLY("certificateChangeApply", "证书报告补充或更换申请单", "证书报告补充或更换申请单"),
+    CERTIFICATE_PRINT("certificatePrintData", "证书打印审批", "证书打印审批"),
+    DEPT_EXECUTIVE_TASK("deptExecutiveTaskData", "实验室任务", "实验室任务"),
+    MY_EXECUTIVE_TASK("myExecutiveTaskData", "我的任务", "我的任务"),
+    OUTSOURCE_ASSESS("outsourceAssess", "测试、校准或检定工作分包评审表", "测试、校准或检定工作分包评审表"),
+    OUTSOURCE_PROTOCOL("outsourceProtocol", "测试、校准或检定工作分包协议书", "测试、校准或检定工作分包协议书"),
+
+    /**
+     * 系统管理
+     */
+    SIGN_EXPORT("signData", "签名", "签名"),
+    TEMPLATE_EXPORT("templateData", "文件模板", "文件模板"),
+    FLOW_DEF_EXPORT("flowDefData", "流程定义", "流程定义"),
+    DOWNLOAD_TEMPLATE("downloadTemplate", "流程定义", "页面配置");
 
     ExportEnum(String fileName, String sheetName, String description) {
         this.fileName = fileName;
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateRecordTypeCodeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateRecordTypeCodeEnum.java
index 31d913c..a963522 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateRecordTypeCodeEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateRecordTypeCodeEnum.java
@@ -46,4 +46,14 @@
     String SITE_EXECUTIVE_APPROVAL = "01";
     //《现场测试、校准或检定工作记录表》
     String SITE_EXECUTIVE_LOG = "02";
+
+    //测试、校准或检定工作分包协议书
+    String OUTSOURCE_PROTOCOL = "01";
+    //测试、校准或检定工作分包评审表
+    String OUTSOURCE_ACCESS = "02";
+    //测试、校准或检定工作分包通知书
+    String OUTSOURCE_NOTICE = "03";
+    //测试、校准或检定工作分包方名录
+    String OUTSOURCE_INFO = "04";
+
 }
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
index 24b8635..f78bd53 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
@@ -15,6 +15,10 @@
     String CERTIFICATE_CHANGE_APPLY_BEAN_NAME = "certificateChangeApplyBean";
     //现场测试、校准或检定
     String SITE_EXECUTIVE_BEAN_NAME = "siteExecutiveBean";
+    //测试、校准或检定工作分包评审表
+    String OUTSOURCE_ASSESS_BEAN_NAME = "outsourceAssessBean";
+    //测试、校准或检定工作分包协议书
+    String OUTSOURCE_PROTOCOL_BEAN_NAME = "outsourceProtocolBean";
 
     /*********************************设备与装置************************************/
     //设备台账
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 b21c661..6b86fd1 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
@@ -18,6 +18,8 @@
     OUTSOURCER_APPROVAL(OUTSOURCER_BEAN_NAME, ""),
     CERTIFICATE_CHANGE_APPROVAL(CERTIFICATE_CHANGE_APPLY_BEAN_NAME, ""),
     SITE_EXECUTIVE_APPROVAL(SITE_EXECUTIVE_BEAN_NAME, ""),
+    OUTSOURCE_ASSESS_APPROVAL(OUTSOURCE_ASSESS_BEAN_NAME, ""),
+    OUTSOURCE_PROTOCOL_APPROVAL(OUTSOURCE_PROTOCOL_BEAN_NAME, ""),
 
     ACTION_STATUS_MAP(new HashMap<String, AwareActionStatusEnum>() {
         {
@@ -47,6 +49,10 @@
             put(ApplyFromIdEnum.CERTIFICATE_CHANGE_APPROVAL.getCode(), CERTIFICATE_CHANGE_APPROVAL);
             //现场测试、校准或检定审批
             put(ApplyFromIdEnum.SITE_EXECUTIVE_APPROVAL.getCode(), SITE_EXECUTIVE_APPROVAL);
+            //测试、校准或检定工作分包评审表
+            put(ApplyFromIdEnum.OUTSOURCE_ASSESS_APPROVAL.getCode(), OUTSOURCE_ASSESS_APPROVAL);
+            //测试、校准或检定工作分包协议书
+            put(ApplyFromIdEnum.OUTSOURCE_PROTOCOL_APPROVAL.getCode(), OUTSOURCE_PROTOCOL_APPROVAL);
         }
     });
     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 934405e..c7410bd 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
@@ -9,6 +9,8 @@
     CERTIFICATE_CHANGE_APPROVAL("jljdywzsbchghsqd", MessageSourceModuleEnum.BUSINESS.getCode(), "证书/报告补充或更换申请单"),
     OUTSOURCER_APPROVAL("jljdywcsjzhgfbfml", MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定合格分包方名录"),
     SITE_EXECUTIVE_APPROVAL("jljdywxccsjzsp", MessageSourceModuleEnum.BUSINESS.getCode(), "现场测试、校准或检定审批"),
+    OUTSOURCE_ASSESS_APPROVAL("jljdywcsjzfbpsb", MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包评审表"),
+    OUTSOURCE_PROTOCOL_APPROVAL("jljdywcsjzfbxys", MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包协议书"),
 
 
     /*******************************************设备与装置*********************************************/
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/GeneralApprovalMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/GeneralApprovalMapper.java
index 4fb7344..0c9d6ae 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/GeneralApprovalMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/GeneralApprovalMapper.java
@@ -17,8 +17,4 @@
 
     Page<O> selectBatchForApprovalList(Page<O> page, @Param("request") R request, @Param("businessKeys") List<String> businessKeys);
 
-//    Page<O> selectListPage(Page<O> page, @Param("request") R request);
-
-//    Long selectMaxNo();
-
 }
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceAssessMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceAssessMapper.java
index 7867bb8..ba59009 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceAssessMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceAssessMapper.java
@@ -1,7 +1,12 @@
 package com.casic.missiles.mapper.business;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.business.outsource.OutsourceAssessApprovalListRequest;
+import com.casic.missiles.mapper.GeneralApprovalMapper;
 import com.casic.missiles.model.business.BizBusinessOutsourceAssess;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * <p>
@@ -11,6 +16,10 @@
  * @author wangpeng
  * @since 2023-08-16
  */
-public interface BizBusinessOutsourceAssessMapper extends BaseMapper<BizBusinessOutsourceAssess> {
+public interface BizBusinessOutsourceAssessMapper extends GeneralApprovalMapper<BizBusinessOutsourceAssess, BizBusinessOutsourceAssess, OutsourceAssessApprovalListRequest> {
+
+    Page<BizBusinessOutsourceAssess> selectBatchForApprovalList(Page<BizBusinessOutsourceAssess> page, @Param("request") OutsourceAssessApprovalListRequest request, @Param("businessKeys") List<String> businessKeys);
+
+    Long selectMaxProjectNo();
 
 }
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceProtocolMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceProtocolMapper.java
new file mode 100644
index 0000000..e6aba35
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceProtocolMapper.java
@@ -0,0 +1,24 @@
+package com.casic.missiles.mapper.business;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.business.outsource.OutsourceProtocolApprovalListRequest;
+import com.casic.missiles.mapper.GeneralApprovalMapper;
+import com.casic.missiles.model.business.BizBusinessOutsourceProtocol;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 计量检定业务-分包管理-测试、校准或检定工作分包协议书 Mapper 接口
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-08-24
+ */
+public interface BizBusinessOutsourceProtocolMapper extends GeneralApprovalMapper<BizBusinessOutsourceProtocol, BizBusinessOutsourceProtocol, OutsourceProtocolApprovalListRequest> {
+
+    Page<BizBusinessOutsourceProtocol> selectBatchForApprovalList(Page<BizBusinessOutsourceProtocol> page, @Param("request") OutsourceProtocolApprovalListRequest request, @Param("businessKeys") List<String> businessKeys);
+
+    Long selectMaxProtocolNo();
+}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/EnvLocationInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/EnvLocationInfoMapper.java
new file mode 100644
index 0000000..49eff87
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/EnvLocationInfoMapper.java
@@ -0,0 +1,21 @@
+package com.casic.missiles.mapper.resource;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.resource.environment.LocationListRequest;
+import com.casic.missiles.dto.resource.environment.LocationListResponse;
+import com.casic.missiles.model.resource.EnvLocationInfo;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * <p>
+ * 实验室环境监控系统-设备表 Mapper 接口
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-06-07
+ */
+public interface EnvLocationInfoMapper extends BaseMapper<EnvLocationInfo> {
+
+    Page<LocationListResponse> selectLocationListPage(Page<LocationListResponse> page, @Param("request") LocationListRequest request);
+}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java
index de124db..85ed0f7 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java
@@ -1,7 +1,9 @@
 package com.casic.missiles.mapper.system;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.dto.system.SignDetailResponse;
+import com.casic.missiles.dto.system.SignListRequest;
 import com.casic.missiles.model.system.SystemSign;
 import org.apache.ibatis.annotations.Param;
 
@@ -22,4 +24,8 @@
     SignDetailResponse selectSignDetailById(Long id);
 
     List<SystemSign> selectUsableSignList(@Param("userId") Long userId);
+
+    Page<SystemSign> selectSignListPage(Page<SystemSign> page, @Param("request") SignListRequest request);
+
+    List<SystemSign> selectSignList(@Param("request") SignListRequest request);
 }
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateChangeApplyMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateChangeApplyMapper.xml
index d798447..c496092 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateChangeApplyMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateChangeApplyMapper.xml
@@ -30,31 +30,31 @@
         SELECT *
         FROM biz_business_certificate_change_apply
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.changeApplyNo != null and request.changeApplyNo !=''">
+        <if test="request != null and request.changeApplyNo != null and request.changeApplyNo !=''">
             and change_apply_no like concat('%',#{request.changeApplyNo},'%')
         </if>
-        <if test="request.changeReportNo != null and request.changeReportNo !=''">
+        <if test="request != null and request.changeReportNo != null and request.changeReportNo !=''">
             and change_report_no like concat('%',#{request.changeReportNo},'%')
         </if>
-        <if test="request.changeReportName != null and request.changeReportName !=''">
+        <if test="request != null and request.changeReportName != null and request.changeReportName !=''">
             and change_report_name like concat('%',#{request.changeReportName},'%')
         </if>
-        <if test="request.changeType != null and request.changeType !=''">
+        <if test="request != null and request.changeType != null and request.changeType !=''">
             and change_type = #{request.changeType}
         </if>
-        <if test="request.createUserName != null and request.createUserName !=''">
+        <if test="request != null and request.createUserName != null and request.createUserName !=''">
             and create_user_name like concat('%',#{request.createUserName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificatePrintMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificatePrintMapper.xml
index b66cd99..49c0ac8 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificatePrintMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificatePrintMapper.xml
@@ -31,34 +31,34 @@
         LEFT JOIN biz_business_order_sample_relation bosr ON (bosr.order_id = bcr.order_id AND bosr.sample_id = bcr.sample_id)
         LEFT JOIN biz_business_order_info boi ON boi.id = bosr.order_id
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and bcp.approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.printStatus != null and request.printStatus !=''">
+        <if test="request != null and request.printStatus != null and request.printStatus !=''">
             and print_status = #{request.printStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and bcp.create_user_id = #{request.createUserId}
         </if>
-        <if test="request.certificateReportNo != null and request.certificateReportNo !=''">
+        <if test="request != null and request.certificateReportNo != null and request.certificateReportNo !=''">
             and bcr.certificate_report_no like concat('%',#{request.certificateReportNo},'%')
         </if>
-        <if test="request.certificateReportName != null and request.certificateReportName !=''">
+        <if test="request != null and request.certificateReportName != null and request.certificateReportName !=''">
             and bcr.certificate_report_name like concat('%',#{request.certificateReportName},'%')
         </if>
-        <if test="request.customerName != null and request.customerName !=''">
+        <if test="request != null and request.customerName != null and request.customerName !=''">
             and boi.customer_name like concat('%',#{request.customerName},'%')
         </if>
-        <if test="request.sampleNo != null and request.sampleNo !=''">
+        <if test="request != null and request.sampleNo != null and request.sampleNo !=''">
             and bosr.sample_no like concat('%',#{request.sampleNo},'%')
         </if>
-        <if test="request.sampleName != null and request.sampleName !=''">
+        <if test="request != null and request.sampleName != null and request.sampleName !=''">
             and bosr.sample_name like concat('%',#{request.sampleName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and bcp.create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and bcp.create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java
index bb0c50f..13a699b 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java
@@ -12,6 +12,7 @@
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.IGeneralApprovalService;
+import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
@@ -19,6 +20,7 @@
 import org.springframework.web.bind.annotation.RequestBody;
 
 import javax.validation.Valid;
+import java.util.List;
 import java.util.Objects;
 
 /**
@@ -117,4 +119,17 @@
         }
         return baseApprovalService.failUpdate(request);
     }
+
+    public List<O> exportList(@RequestBody @Valid R request) throws Exception {
+        List<O> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = baseApprovalService.listExportByIds(request.getIds());
+        } else {
+            list = baseApprovalService.listExport(request);
+        }
+        for (O record : list) {
+            DictCodeUtils.convertDictCodeToName(record);
+        }
+        return list;
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java
index 8a90961..d775831 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java
@@ -5,6 +5,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.business.certificate.CertificateChangeApplyApprovalListRequest;
 import com.casic.missiles.dto.business.certificate.CertificateChangeApplySaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessCertificateChangeApply;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
@@ -20,6 +21,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -48,4 +50,12 @@
         }
         return changeApplyService.saveChangeApply(request);
     }
+
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody CertificateChangeApplyApprovalListRequest request) throws Exception {
+        List<BizBusinessCertificateChangeApply> list = super.exportList(request);
+        super.exportExcel(BizBusinessCertificateChangeApply.class, list, ExportEnum.CERTIFICATE_CHANGE_APPLY.getSheetName());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java
index 5fc4b07..af8230e 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java
@@ -9,6 +9,7 @@
 import com.casic.missiles.dto.business.certificate.CertificatePrintApprovalListRequest;
 import com.casic.missiles.dto.business.certificate.CertificatePrintListResponse;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.enums.business.CertificatePrintStatusEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessCertificatePrintLog;
@@ -18,10 +19,16 @@
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.io.IOException;
+import java.util.List;
 import java.util.Objects;
 
 /**
@@ -98,4 +105,16 @@
         });
         return certificatePrintService.certificatePrintLog(idDTO.getId());
     }
+
+    @ApiOperation("证书打印审批导出")
+    @PostMapping("/listExport")
+    public void exportList(@RequestBody CertificatePrintApprovalListRequest request) throws IOException {
+        List<CertificatePrintListResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = certificatePrintService.listByIds(request.getIds());
+        } else {
+            list = certificatePrintService.list(request);
+        }
+        super.exportExcel(CertificatePrintListResponse.class, list, ExportEnum.CERTIFICATE_PRINT.getSheetName());
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java
index 63b06dc..6b2efd5 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java
@@ -6,6 +6,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.business.certificate.CertificateReportApprovalListRequest;
 import com.casic.missiles.dto.business.certificate.CertificateReportSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessCertificateReport;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
@@ -21,6 +22,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -50,7 +52,7 @@
         return certificateReportService.saveCertificateReport(request);
     }
 
-    @ApiOperation("证书审批详情（基本信息）")
+    @ApiOperation("详情（基本信息）")
     @PostMapping("/detail")
     public ReturnDTO<BizBusinessCertificateReport> detail(@RequestBody @Valid BaseDetailRequest request, BindingResult bindingResult) throws Exception {
         if(bindingResult.hasErrors()){
@@ -59,4 +61,11 @@
         return certificateReportService.detail(request);
     }
 
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody CertificateReportApprovalListRequest request) throws Exception {
+        List<BizBusinessCertificateReport> list = super.exportList(request);
+        super.exportExcel(BizBusinessCertificateReport.class, list, ExportEnum.CERTIFICATE_REPORT.getSheetName());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java
index 46b26bd..57c0809 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java
@@ -10,20 +10,21 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.business.identify.IdentifyListRequest;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessIdentifyInfo;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.business.IBizBusinessIdentifyInfoService;
+import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import javax.validation.Valid;
+import java.util.List;
 import java.util.Objects;
 
 /**
@@ -57,16 +58,13 @@
         return identifyInfoService.addIdentify(identifyInfo);
     }
 
-    @ApiOperation("标识打印更新")
+    @ApiOperation("标识打印更新（更新打印时间）")
     @PostMapping("/update")
-    public ReturnDTO updateIdentify(@RequestBody @Valid BizBusinessIdentifyInfo identifyInfo, BindingResult bindingResult) {
-        Assert.isFalse(Objects.isNull(identifyInfo.getId()), () -> {
+    public ReturnDTO updateIdentify(@RequestBody @Valid IdDTO idDTO) {
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        Assert.isFalse(bindingResult.hasErrors(), () -> {
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        });
-        return identifyInfoService.updateIdentify(identifyInfo);
+        return identifyInfoService.updateIdentify(idDTO.getId());
     }
 
     @ApiOperation("标识打印删除")
@@ -77,4 +75,37 @@
         });
         return identifyInfoService.deleteIdentify(idDTO.getId());
     }
+
+    @ApiOperation("标识打印导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody @Valid IdentifyListRequest request, BindingResult bindingResult) throws Exception {
+        if (bindingResult.hasErrors()) {
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        List<BizBusinessIdentifyInfo> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = identifyInfoService.listByIds(request.getIds());
+        } else {
+            list = identifyInfoService.list(request);
+        }
+        for (BizBusinessIdentifyInfo record : list) {
+            DictCodeUtils.convertDictCodeToName(record);
+        }
+        super.exportExcel(BizBusinessIdentifyInfo.class, list, ExportEnum.IDENTIFY_EXPORT.getSheetName());
+    }
+
+
+    // TODO: 2023/8/23 查询设备信息，4个底部按钮查设备（按钮的作用就是前端用来调不同接口、用来区分中间即将展示的标识），前端弹窗选设备，在确定保存时前端根据底部按钮判断传入设备类型deviceType字典code
+    // TODO: 2023/8/23 接口：查受检设备（第1个按钮），查设备台账（后3个按钮同一接口），查询之后前端根据标志类型的不同加到中间页面时进行判断（按产品给的对应表）
+    // TODO: 2023/8/23 提供二维码接口，前端在加到中间页面时调用一下
+
+    @ApiOperation("设备二维码")
+    @PostMapping("/equipment/qrCode")
+    public ReturnDTO<String> equipmentQrCode(@RequestBody @Valid IdDTO idDTO) {
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return identifyInfoService.equipmentQrCode(idDTO.getId());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java
index 707be6e..7e0453d 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java
@@ -117,7 +117,7 @@
     }
 
     @ApiOperation("任务单导出")
-    @PostMapping("/export")
+    @PostMapping("/listExport")
     public void orderExport(@RequestBody @Valid OrderListRequest request, HttpServletResponse response) {
         businessOrderService.orderExport(request, response);
     }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java
index 529a6ce..51432be 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java
@@ -1,9 +1,28 @@
 package com.casic.missiles.controller.business;
 
+import com.casic.missiles.controller.GeneralApprovalController;
+import com.casic.missiles.dto.BaseApprovalSubmitRequest;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.business.outsource.OutsourceAssessApprovalListRequest;
+import com.casic.missiles.dto.business.outsource.OutsourceAssessSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
+import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.model.business.BizBusinessOutsourceAssess;
+import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
+import com.casic.missiles.service.IGeneralApprovalService;
+import com.casic.missiles.service.business.IBizBusinessOutsourceAssessService;
 import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.BindingResult;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.validation.Valid;
+import java.util.List;
+
 /**
  * <p>
  * 计量检定业务-分包管理-测试、校准或检定工作分包评审表 前端控制器
@@ -15,6 +34,27 @@
 @Api(tags = "分包管理-测试、校准或检定工作分包评审表")
 @RestController
 @RequestMapping("/business/outsource/assess")
-public class BizBusinessOutsourceAssessController {
+public class BizBusinessOutsourceAssessController extends GeneralApprovalController<BizBusinessOutsourceAssess, BizBusinessOutsourceAssess, OutsourceAssessApprovalListRequest, BaseApprovalSubmitRequest> {
+    @Autowired
+    private IBizBusinessOutsourceAssessService outsourceAssessService;
 
+    public BizBusinessOutsourceAssessController(IGeneralApprovalService<BizBusinessOutsourceAssess, BizBusinessOutsourceAssess, OutsourceAssessApprovalListRequest, BaseApprovalSubmitRequest> baseApprovalService) {
+        super(baseApprovalService);
+    }
+
+    @ApiOperation("草稿箱-保存")
+    @PostMapping("/save")
+    public ReturnDTO<OutsourceAssessSaveResponse> saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceAssess request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        return outsourceAssessService.saveOutsourceAssess(request);
+    }
+
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception {
+        List<BizBusinessOutsourceAssess> list = super.exportList(request);
+        super.exportExcel(BizBusinessOutsourceAssess.class, list, ExportEnum.OUTSOURCE_ASSESS.getSheetName());
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java
new file mode 100644
index 0000000..9adef18
--- /dev/null
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java
@@ -0,0 +1,60 @@
+package com.casic.missiles.controller.business;
+
+import com.casic.missiles.controller.GeneralApprovalController;
+import com.casic.missiles.dto.BaseApprovalSubmitRequest;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.business.outsource.OutsourceProtocolApprovalListRequest;
+import com.casic.missiles.dto.business.outsource.OutsourceProtocolSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
+import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.model.business.BizBusinessOutsourceProtocol;
+import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
+import com.casic.missiles.service.IGeneralApprovalService;
+import com.casic.missiles.service.business.IBizBusinessOutsourceProtocolService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.BindingResult;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.validation.Valid;
+import java.util.List;
+
+/**
+ * <p>
+ * 计量检定业务-分包管理-测试、校准或检定工作分包协议书 前端控制器
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-08-24
+ */
+@Api(tags = "分包管理-测试、校准或检定工作分包协议书")
+@RestController
+@RequestMapping("/business/outsource/protocol")
+public class BizBusinessOutsourceProtocolController extends GeneralApprovalController<BizBusinessOutsourceProtocol, BizBusinessOutsourceProtocol, OutsourceProtocolApprovalListRequest, BaseApprovalSubmitRequest> {
+    @Autowired
+    private IBizBusinessOutsourceProtocolService outsourceProtocolService;
+
+    public BizBusinessOutsourceProtocolController(IGeneralApprovalService<BizBusinessOutsourceProtocol, BizBusinessOutsourceProtocol, OutsourceProtocolApprovalListRequest, BaseApprovalSubmitRequest> baseApprovalService) {
+        super(baseApprovalService);
+    }
+
+    @ApiOperation("草稿箱-保存")
+    @PostMapping("/save")
+    public ReturnDTO<OutsourceProtocolSaveResponse> saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceProtocol request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        return outsourceProtocolService.saveOutsourceProtocol(request);
+    }
+
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody OutsourceProtocolApprovalListRequest request) throws Exception {
+        List<BizBusinessOutsourceProtocol> list = super.exportList(request);
+        super.exportExcel(BizBusinessOutsourceProtocol.class, list, ExportEnum.OUTSOURCE_PROTOCOL.getSheetName());
+    }
+}
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java
index 097f645..f0f0943 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java
@@ -17,7 +17,6 @@
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.IGeneralApprovalService;
 import com.casic.missiles.service.business.IBizBusinessOutsourcerInfoService;
-import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -71,19 +70,8 @@
 
     @ApiOperation("分包方导出")
     @PostMapping("/listExport")
-    public void export(@RequestBody @Valid OutsourcerInfoApprovalListRequest request, BindingResult bindingResult) throws Exception {
-        if (bindingResult.hasErrors()) {
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        }
-        List<BizBusinessOutsourcerInfo> list;
-        if (!CollectionUtils.isEmpty(request.getIds())) {
-            list = outsourcerInfoService.listByIds(request.getIds());
-        } else {
-            list = outsourcerInfoService.list(request);
-        }
-        for (BizBusinessOutsourcerInfo record : list) {
-            DictCodeUtils.convertDictCodeToName(record);
-        }
+    public void export(@RequestBody OutsourcerInfoApprovalListRequest request) throws Exception {
+        List<BizBusinessOutsourcerInfo> list = super.exportList(request);
         super.exportExcel(BizBusinessOutsourcerInfo.class, list, ExportEnum.OUTSOURCER_EXPORT.getSheetName());
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java
index c2cbf9f..0410918 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java
@@ -17,11 +17,9 @@
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.IGeneralApprovalService;
 import com.casic.missiles.service.business.IBizBusinessSiteExecutiveInfoService;
-import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -60,7 +58,7 @@
         return siteExecutiveInfoService.saveSiteExecutiveInfo(siteExecutiveInfo);
     }
 
-    @ApiOperation("现场检测详情")
+    @ApiOperation("详情")
     @PostMapping("/detail")
     public ReturnDTO<SiteExecutiveDetailResponse> siteExecutiveDetail(@RequestBody @Valid IdDTO idDTO) throws Exception {
         Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
@@ -69,21 +67,10 @@
         return ReturnUtil.success(siteExecutiveInfoService.detail(idDTO.getId()));
     }
 
-    @ApiOperation("现场检测导出")
+    @ApiOperation("导出")
     @PostMapping("/listExport")
-    public void export(@RequestBody @Valid SiteExecutiveApprovalListRequest request, BindingResult bindingResult) throws Exception {
-        if (bindingResult.hasErrors()) {
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        }
-        List<SiteExecutiveApprovalListResponse> list;
-        if (!CollectionUtils.isEmpty(request.getIds())) {
-            list = siteExecutiveInfoService.listInfoByIds(request.getIds());
-        } else {
-            list = siteExecutiveInfoService.listInfo(request);
-        }
-        for (SiteExecutiveApprovalListResponse record : list) {
-            DictCodeUtils.convertDictCodeToName(record);
-        }
+    public void export(@RequestBody SiteExecutiveApprovalListRequest request) throws Exception {
+        List<SiteExecutiveApprovalListResponse> list = super.exportList(request);
         super.exportExcel(SiteExecutiveApprovalListResponse.class, list, ExportEnum.SITE_EXECUTIVE_EXPORT.getSheetName());
     }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
index 7e793cd..a92e209 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
@@ -55,7 +55,7 @@
 
     @ApiOperation("设备收发列表导出")
     @PostMapping("/export")
-    public void exportList(@RequestBody @Valid SampleDispatchListRequest request) throws IOException {
+    public void exportList(@RequestBody SampleDispatchListRequest request) throws IOException {
         List<SampleDispatchListResponse> list;
         if (!CollectionUtils.isEmpty(request.getIds())) {
             list = dispatchService.listByIds(request.getIds());
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java
index cdc77fc..d120fd4 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java
@@ -7,6 +7,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.business.labExecutive.*;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.business.IBusinessLabExecutiveInfoService;
@@ -14,6 +15,7 @@
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.*;
 
@@ -32,7 +34,7 @@
     @Autowired
     private IBusinessLabExecutiveInfoService labExecutiveInfoService;
 
-    @ApiOperation("实验室检测-部门检测-查询各状态列表（待检测、检测中、检测完）")
+    @ApiOperation("实验室任务-查询各状态列表（待检测、检测中、检测完）")
     @PostMapping("/deptExecutive/List")
     public ReturnDTO<PageInfoBT<SampleLabExecutiveListResponse>> queryDeptExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
@@ -43,10 +45,19 @@
         return ReturnUtil.success(super.packForBT(labExecutiveInfoService.deptLabExecutiveListPage(page, labExecutiveListRequest)));
     }
 
-    /**
-     * 实验室检测-我的检测-查询各状态列表（待检测、检测中、检测完）
-     */
-    @ApiOperation("实验室检测-我的检测-查询各状态列表（待检测、检测中、检测完）")
+    @ApiOperation("实验室任务导出")
+    @PostMapping("/deptExecutive/export")
+    public void deptExportList(@RequestBody @Valid SampleLabExecutiveListRequest request) throws Exception {
+        List<SampleLabExecutiveListResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = labExecutiveInfoService.deptLabExecutiveListByIds(request.getMeasureStatus(), request.getIds());
+        } else {
+            list = labExecutiveInfoService.deptLabExecutiveList(request);
+        }
+        super.exportExcel(SampleLabExecutiveListResponse.class, list, ExportEnum.DEPT_EXECUTIVE_TASK.getSheetName());
+    }
+
+    @ApiOperation("我的任务-查询各状态列表（待检测、检测中、检测完）")
     @PostMapping("/myExecutive/list")
     public ReturnDTO<PageInfoBT<SampleLabExecutiveListResponse>> queryMyExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
@@ -57,19 +68,25 @@
         return ReturnUtil.success(super.packForBT(labExecutiveInfoService.myLabExecutiveListPage(page, labExecutiveListRequest)));
     }
 
-    /**
-     * 实验室检测-我的检测-查询各状态样品数量（待检测、检测中、检测完）
-     */
-    @ApiOperation("实验室检测-我的检测-查询各状态样品数量（待检测、检测中、检测完）")
+    @ApiOperation("我的任务导出")
+    @PostMapping("/myExecutive/export")
+    public void exportList(@RequestBody @Valid SampleLabExecutiveListRequest request) throws Exception {
+        List<SampleLabExecutiveListResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = labExecutiveInfoService.myLabExecutiveListByIds(request.getMeasureStatus(), request.getIds());
+        } else {
+            list = labExecutiveInfoService.myLabExecutiveList(request);
+        }
+        super.exportExcel(SampleLabExecutiveListResponse.class, list, ExportEnum.MY_EXECUTIVE_TASK.getSheetName());
+    }
+
+    @ApiOperation("我的任务-查询各状态样品数量（待检测、检测中、检测完）")
     @GetMapping("/myExecutive/amount")
     public ReturnDTO<List<SampleAmountResponse>> queryMyExecutiveAmount() {
         return ReturnUtil.success(labExecutiveInfoService.myExecutiveAmount());
     }
 
-    /**
-     * 实验室检测-部门检测-分配（分配给具体人员）
-     */
-    @ApiOperation("实验室检测-部门检测-分配按钮（分配给具体人员）")
+    @ApiOperation("实验室任务-分配按钮（分配给具体人员）")
     @PostMapping("/deptExecutive/allocate")
     public ReturnDTO allocateStaff(@RequestBody @Valid SampleAllocateRequest sampleAllocateRequest, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -78,10 +95,7 @@
         return labExecutiveInfoService.allocateStaff(sampleAllocateRequest);
     }
 
-    /**
-     * 实验室检测-我的检测-检定人扫描收入（待检测->检测中）
-     */
-    @ApiOperation("实验室检测-我的检测-检定人扫描收入（待检测->检测中）")
+    @ApiOperation("我的任务-检定人扫描收入（待检测->检测中）")
     @PostMapping("/myExecutive/receive")
     public ReturnDTO sampleReceive(@RequestBody @Valid List<SampleOperateRequest> requestList, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -90,10 +104,7 @@
         return labExecutiveInfoService.sampleReceive(requestList);
     }
 
-    /**
-     * 实验室检测-负责人/检定人扫描检完（检测中->检测完）
-     */
-    @ApiOperation("实验室检测-负责人/检定人扫描检完（检测中->检测完）")
+    @ApiOperation("实验室任务-负责人/检定人扫描检完（检测中->检测完）")
     @PostMapping("/myExecutive/complete")
     public ReturnDTO sampleExecutiveComplete(@RequestBody @Valid List<SampleOperateRequest> requestList, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -102,10 +113,7 @@
         return labExecutiveInfoService.sampleExecutiveComplete(requestList);
     }
 
-    /**
-     * 实验室检测-部门检测/我的检测 编辑（只能修改应出具证书）
-     */
-    @ApiOperation("实验室检测-部门检测/我的检测 编辑（只能修改应出具证书）")
+    @ApiOperation("实验室任务/我的任务 编辑（只能修改应出具证书）")
     @PostMapping("/executive/update")
     public ReturnDTO updateExecutive(@RequestBody @Valid UpdateExecutiveRequest request, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -114,10 +122,7 @@
         return labExecutiveInfoService.updateExecutive(request);
     }
 
-    /**
-     * 实验室检测-部门检测/我的检测 详情
-     */
-    @ApiOperation("实验室检测-部门检测/我的检测 详情")
+    @ApiOperation("实验室任务/我的任务 详情")
     @PostMapping("/executive/detail")
     public ReturnDTO<ExecutiveDetailResponse> executiveDetail(@RequestBody @Valid ExecutiveDetailRequest request, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
@@ -131,7 +136,7 @@
      * 退回后会将下一个要执行的实验室检测状态更新为待分配，将后面的实验室顺序变更为连续（都进行减1）
      * 最后一个检测的实验室退回，等分发员再增加实验室或设备收发中的已收入直接手动点击完成
      */
-    @ApiOperation("实验室检测-部门检测/我的检测 退回（待检测/检测中->退回）")
+    @ApiOperation("实验室任务/我的任务 退回（待检测/检测中->退回）")
     @PostMapping("/executive/sendBack")
     public ReturnDTO executiveSendBack(@RequestBody @Valid ExecutiveSendBackRequest request, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -140,9 +145,6 @@
         return labExecutiveInfoService.sampleExecutiveSendBack(request);
     }
 
-    /**
-     * 分发员编辑实验室检测列表
-     */
     @ApiOperation("分发员编辑实验室检测列表")
     @PostMapping("/handOut/updateList")
     public ReturnDTO updateExecutiveList(@RequestBody @Valid UpdateExecutiveListRequest request, BindingResult bindingResult) {
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java
index 48a67ed..0c04f31 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java
@@ -10,6 +10,7 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.resource.customer.CustomerApprovalListRequest;
 import com.casic.missiles.dto.resource.customer.CustomerSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceCustomerInfo;
@@ -26,6 +27,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -55,6 +57,13 @@
         return customerInfoService.saveCustomerInfo(request);
     }
 
+    @ApiOperation("委托方名录导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody CustomerApprovalListRequest request) throws Exception {
+        List<BizResourceCustomerInfo> list = super.exportList(request);
+        super.exportExcel(BizResourceCustomerInfo.class, list, ExportEnum.CUSTOMER_INFO.getSheetName());
+    }
+
     @ApiOperation("委托方人员列表（分页）")
     @PostMapping("/person/listPage")
     public ReturnDTO<PageInfoBT<BizResourceCustomerStaff>> personListPage(@RequestBody IdDTO idDto) {
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
index 972ed4b..6418ea5 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
@@ -5,6 +5,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.resource.customer.SuggestFormApprovalListRequest;
 import com.casic.missiles.dto.resource.customer.SuggestFormSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceCustomerSuggestForm;
@@ -20,6 +21,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -50,4 +52,11 @@
         return suggestFormService.saveSuggestForm(request);
     }
 
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody SuggestFormApprovalListRequest request) throws Exception {
+        List<BizResourceCustomerSuggestForm> list = super.exportList(request);
+        super.exportExcel(BizResourceCustomerSuggestForm.class, list, ExportEnum.CUSTOMER_SUGGEST_FORM.getSheetName());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java
index 1934d1a..9e07eab 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java
@@ -15,12 +15,16 @@
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.resource.IEnvEnvironmentRecordConfigService;
 import com.casic.missiles.service.resource.IEnvEnvironmentRecordDataService;
+import com.casic.missiles.service.resource.IEnvLocationInfoService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
 import java.util.List;
@@ -39,6 +43,8 @@
     private IEnvEnvironmentRecordDataService environmentRecordDataService;
     @Autowired
     private IEnvEnvironmentRecordConfigService environmentRecordConfigService;
+    @Autowired
+    private IEnvLocationInfoService locationInfoService;
 
     @ApiOperation("环境记录单数据列表/详情")
     @PostMapping("/data/listPage")
@@ -95,4 +101,11 @@
         });
         return environmentRecordConfigService.deleteEnvironmentRecordConfig(idDTO.getId());
     }
+
+    @ApiOperation("地点列表")
+    @PostMapping("/location/listPage")
+    public ReturnDTO<PageInfoBT<LocationListResponse>> locationListPage(@RequestBody @Valid LocationListRequest request) {
+        Page<LocationListResponse> page = PageFactory.defaultPage();
+        return ReturnUtil.success(super.packForBT(locationInfoService.listPage(page, request)));
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java
index 82efe3f..e9561fa 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java
@@ -10,6 +10,7 @@
 import com.casic.missiles.dto.resource.seal.SealLogListRequest;
 import com.casic.missiles.dto.resource.seal.SealNoteApprovalListRequest;
 import com.casic.missiles.dto.resource.seal.SealNoteSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceSealUseLog;
@@ -27,6 +28,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -58,6 +60,13 @@
         return sealUseNoteService.saveSeal(request);
     }
 
+    @ApiOperation("印章使用登记导出（列表和导出中去掉经办人和监印人）")
+    @PostMapping("/listExport")
+    public void export(@RequestBody SealNoteApprovalListRequest request) throws Exception {
+        List<BizResourceSealUseNote> list = super.exportList(request);
+        super.exportExcel(BizResourceSealUseNote.class, list, ExportEnum.SEAL_NOTE.getSheetName());
+    }
+
     // TODO: 2023/7/28 印章使用日志：系统中使用印章时插入数据库
 
     @ApiOperation("印章使用日志列表（分页）")
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java
index 9b674fc..06b6521 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java
@@ -9,16 +9,20 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.resource.staff.StaffCertRequest;
 import com.casic.missiles.dto.resource.staff.StaffCertResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.service.resource.IBizResourceStaffInfoService;
 import com.casic.missiles.service.resource.IBizResourceStaffVerifierService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.List;
+
 /**
  * @Description:
  * @Author: wangpeng
@@ -41,9 +45,21 @@
         return ReturnUtil.success(super.packForBT(responsePage));
     }
 
+    @ApiOperation("证书逾期提醒导出")
+    @PostMapping("/listExport")
+    public void exportList(@RequestBody StaffCertRequest request) throws Exception {
+        List<StaffCertResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = staffInfoService.certListByIds(request.getIds());
+        } else {
+            list = staffInfoService.certList(request);
+        }
+        super.exportExcel(StaffCertResponse.class, list, ExportEnum.STAFF_CERTIFICATE_EXPIRE.getSheetName());
+    }
+
     @ApiOperation("证书逾期提醒")
     @PostMapping("/expirationReminder")
-    public ReturnDTO expirationReminder(@RequestBody IdDTO idDto) {
-        return verifierService.expirationReminder(idDto);
+    public ReturnDTO expirationReminder(@RequestBody IdDTO idDTO) {
+        return verifierService.expirationReminder(idDTO);
     }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java
index 3b251ad..a6e7850 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java
@@ -12,6 +12,7 @@
 import com.casic.missiles.dto.resource.staff.StaffListRequest;
 import com.casic.missiles.dto.resource.staff.TrainListRequest;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.*;
@@ -22,7 +23,10 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
 import java.util.List;
@@ -52,8 +56,19 @@
             throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
         }
         Page<BizResourceStaffInfo> page = PageFactory.defaultPage();
-        Page<BizResourceStaffInfo> responsePage = staffInfoService.listPage(page, request);
-        return ReturnUtil.success(super.packForBT(responsePage));
+        return ReturnUtil.success(super.packForBT(staffInfoService.listPage(page, request)));
+    }
+
+    @ApiOperation("人员登记导出")
+    @PostMapping("/listExport")
+    public void exportList(@RequestBody StaffListRequest request) throws Exception {
+        List<BizResourceStaffInfo> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = staffInfoService.listByIds(request.getIds());
+        } else {
+            list = staffInfoService.list(request);
+        }
+        super.exportExcel(BizResourceStaffInfo.class, list, ExportEnum.STAFF_INFO.getSheetName());
     }
 
     @ApiOperation("人员登记详情基础信息")
@@ -85,9 +100,9 @@
 
     @ApiOperation("科研教育列表（分页）")
     @PostMapping("/education/listPage")
-    public ReturnDTO<PageInfoBT<BizResourceStaffEducation>> educationListPage(@RequestBody IdDTO idDto) {
+    public ReturnDTO<PageInfoBT<BizResourceStaffEducation>> educationListPage(@RequestBody IdDTO idDTO) {
         Page<BizResourceStaffEducation> page = PageFactory.defaultPage();
-        Page<BizResourceStaffEducation> responsePage = staffInfoService.educationListPage(page, idDto);
+        Page<BizResourceStaffEducation> responsePage = staffInfoService.educationListPage(page, idDTO);
         return ReturnUtil.success(super.packForBT(responsePage));
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java
index af6aa86..d85d84a 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java
@@ -9,6 +9,7 @@
 import com.casic.missiles.dto.resource.outsideService.SupplierApprovalListRequest;
 import com.casic.missiles.dto.resource.outsideService.SupplierSaveResponse;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceSupplierAbility;
@@ -67,6 +68,13 @@
         return ReturnUtil.success(supplierInfoService.detail(idDTO.getId()));
     }
 
+    @ApiOperation("合格供方导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody SupplierApprovalListRequest request) throws Exception {
+        List<BizResourceSupplierInfo> list = super.exportList(request);
+        super.exportExcel(BizResourceSupplierInfo.class, list, ExportEnum.SUPPLIER_INFO.getSheetName());
+    }
+
     @ApiOperation("供方人员列表（分页）")
     @PostMapping("/person/listPage")
     public ReturnDTO<PageInfoBT<BizResourceSupplierPerson>> personListPage(@RequestBody IdDTO idDTO) {
diff --git a/casic-metering-api/src/main/resources/config/application.yml b/casic-metering-api/src/main/resources/config/application.yml
index 350db5f..ecff521 100644
--- a/casic-metering-api/src/main/resources/config/application.yml
+++ b/casic-metering-api/src/main/resources/config/application.yml
@@ -126,7 +126,7 @@
     #作者
     author: wangpeng
     #待生成对象表名
-    table-name: biz_equipment_technical_target_approval,biz_equipment_attachment_approval,biz_equipment_checkpoint_approval
+    table-name: biz_business_outsource_protocol
 
 reminder:
   #节点--common模块config包 ReminderNodeConfig配置
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
index 4a19e4e..d47d552 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
@@ -53,6 +53,7 @@
     SUGGEST_FORM_SAVE_FAILED(2509, "委托方意见登记表保存至草稿箱失败"),
     EXAMINE_FORM_SAVE_FAILED(2510, "要求、委托书及合同评审表保存至草稿箱失败"),
     CUSTOMER_EXIST_SAVE_FAILED(2511, "该委托方已存在，请重新选择"),
+    DUPLICATE_LOCATION_NO(2512, "地点编号已存在"),
 
     /**
      * 计量检定业务模块
@@ -68,6 +69,8 @@
     COMPLETE_SAMPLE_NOT_EXIST(2609, "检测中不存在扫描收入的样品"),
     CANNOT_CHANGE_MEASURE_INFO(2610, "无法更改非当前登录用户的检测信息"),
     NON_EXIST_ORDER_OR_SAMPLE(2611, "不存在该委托单或该委托单下的样品"),
+    OUTSOURCE_ACCESS_SAVE_FAILED(2612, "测试、校准或检定工作分包评审表保存至草稿箱失败"),
+    OUTSOURCE_PROTOCOL_SAVE_FAILED(2613, "测试、校准或检定工作分包协议书保存至草稿箱失败"),
 
     /**
      * 历史遗留备用
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
index 5089ad1..81a406b 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
@@ -10,54 +10,38 @@
     /**
      * 资源管理
      */
-    ENVIRONMENT_DATA_EXPORT("environmentData", "environmentData", "环境记录单数据"),
+    ENVIRONMENT_DATA_EXPORT("environmentData", "环境记录单数据", "环境记录单数据"),
+    STAFF_INFO("staffInfo", "人员登记", "人员登记"),
+    STAFF_CERTIFICATE_EXPIRE("certificateExpire", "证书逾期提醒", "证书逾期提醒"),
+    SUPPLIER_INFO("supplierInfo", "合格供方名录", "合格供方名录"),
+    CUSTOMER_INFO("customerInfo", "委托方名录", "委托方名录"),
+    CUSTOMER_SUGGEST_FORM("customerSuggestForm", "委托方意见登记表", "委托方意见登记表"),
+    SEAL_NOTE("sealNote", "印章使用登记", "印章使用登记"),
 
-    FILE_EXPORT("meterFileData", "meterFileData", "计量文件信息"),
-    TRAIN_PLAN_EXPORT("trainPlanData", "trainPlanData", "培训计划"),
-    TRAIN_LOG_EXPORT("trainLogData", "trainLogData", "培训记录"),
-    METER_ORGANIZE_EXPORT("meterOrganizeData", "meterOrganizeData", "计量组织"),
-    TRACE_SUPPLIER_EXPORT("traceSupplierData", "traceSupplierData", "溯源供方"),
-    SIGN_EXPORT("signData", "signData", "签名/签章"),
-    TEMPLATE_EXPORT("templateData", "templateData", "原始记录模板/证书报告模板"),
-    FIXED_ASSETS("meterFixedAssets", "meterFixedAssets", "固定资产"),
-    METER_EQUIPMENT("meterEquipment", "meterEquipment", "测量设备"),
-    CALIBRATION_TEST_EQUIPMENT("calibrationTestEquipment", "calibrationTestEquipment", "校准检定设备"),
-    MEASURE_ACCOUNT("measureAccount", "measureAccount", "测量工装"),
-    STANDARD_SUPPORT_EQUIPMENT("standardSupportEquipment", "standardSupportEquipment", "标准配套设备"),
-    STANDARD_EQUIPMENT("standardEquipment", "standardEquipment", "标准装置"),
-    FLOW_DEF_EXPORT("flowDefData", "flowDefData", "流程定义"),
-    STAFF_CERTIFICATE("certificate", "certificate", "计量人员证书"),
-    CHECK_INFO("checkInfo", "checkInfo", "设备管理点检测"),
-    EQUIPMENT_APPLY("equipmentApply", "equipmentApply", "设备借用"),
-    STANDARD_EQUIPMENT_REMIND("equipmentApplyRemind", "equipmentApplyRemind", "标准装置到期提醒"),
-    METER_PRICE("meterPrice", "meterPrice", "价格库"),
-    METER_STAFF("meterStaff", "meterStaff", "计量人员"),
-    STANDARD_EQUIPMENT_APPLY("standardEquipmentApply", "standardEquipmentApply", "标准装置申请"),
-    STATE_MANAGE_APPLY("stateManage", "stateManage", "状态管理"),
-    METER_ACCEPTANCE_CHECK("acceptanceCheck", "acceptanceCheck", "设备检修保养验收单"),
-    CUSTOMER_EXPORT("customerData", "customerData", "客户信息"),
-    ORDER_EXPORT("orderData", "orderData", "委托书信息"),
-    SAMPLE_EXPORT("sampleData", "sampleData", "样本信息"),
-    EXCHANGE_DATA("exchangeData", "exchangeData", "设备交接单"),
-    DISPATCH_DATA("dispatchData", "dispatchData", "设备收发"),
-    ENVIRONMENT_DATA("environmentData", "environmentData", "环境记录单"),
-    ORIGIN_DATA("originData", "originData", "原始记录"),
-    CERTIFICATE_REPORT("certificateReport", "certificateReport", "证书报告"),
-    ADVICE_EXPORT("adviceData", "adviceData", "客户反馈"),
-    HANDOUT_EXPORT("handoutData", "handoutData", "任务分发列表"),
-    OUTSOURCER_EXPORT("outsourcerData", "outsourcerData", "分包方"),
-    SITE_EXECUTIVE_EXPORT("siteExecutiveData", "siteExecutiveData", "现场测试、校准或检定"),
-    CERTIFICATE_PRINT_EXPORT("certificatePrintData", "certificatePrintData", "证书打印"),
-    DOWNLOAD_TEMPLATE("downloadTemplate", "downloadTemplate", "页面配置"),
-    OUTSOURCER_CERTIFICATE_EXPORT("outsourceCertificateData", "outsourceCertificateData", "分包证书"),
-    SETTLEMENT_INFO_EXPORT("settlementInfoData", "settlementInfoData", "业务结算"),
-    EQUIPMENT_REMIND("equipmentRemind", "equipmentRemind", "设备到期提醒"),
-    AGREEMENT_INFO_EXPORT("agreementInfoData", "agreementInfoData", "合同"),
-    WORK_STATISTICS_EXPORT("workStatisticsData", "workStatisticsData", "实时工作统计"),
-    DEPT_OUTPUT_EXPORT("deptOutputData", "deptOutputData", "部门产值分析"),
-    WORKLOAD_EXPORT("workloadData", "workloadData", "业务工作量分析"),
-    DEPT_COMPREHENSIVE_EXPORT("deptComprehensiveData", "deptComprehensiveData", "部门综合分析"),
-    ENVIRONMENTAL_RECORD("environmentalRecordData", "environmentalRecordData", "现场环境记录");
+    /**
+     * 计量检定业务
+     */
+    OUTSOURCER_EXPORT("outsourcerData", "分包方名录", "分包方名录"),
+    IDENTIFY_EXPORT("identifyData", "计量标识", "计量标识"),
+    ORDER_EXPORT("orderData", "任务单", "任务单"),
+    DISPATCH_DATA("dispatchData", "设备收发", "设备收发"),
+    HANDOUT_EXPORT("handoutData", "任务分发", "任务分发"),
+    SITE_EXECUTIVE_EXPORT("siteExecutiveData", "现场测试、校准或检定", "现场测试、校准或检定"),
+    CERTIFICATE_REPORT("certificateReport", "证书审批", "证书审批"),
+    CERTIFICATE_CHANGE_APPLY("certificateChangeApply", "证书报告补充或更换申请单", "证书报告补充或更换申请单"),
+    CERTIFICATE_PRINT("certificatePrintData", "证书打印审批", "证书打印审批"),
+    DEPT_EXECUTIVE_TASK("deptExecutiveTaskData", "实验室任务", "实验室任务"),
+    MY_EXECUTIVE_TASK("myExecutiveTaskData", "我的任务", "我的任务"),
+    OUTSOURCE_ASSESS("outsourceAssess", "测试、校准或检定工作分包评审表", "测试、校准或检定工作分包评审表"),
+    OUTSOURCE_PROTOCOL("outsourceProtocol", "测试、校准或检定工作分包协议书", "测试、校准或检定工作分包协议书"),
+
+    /**
+     * 系统管理
+     */
+    SIGN_EXPORT("signData", "签名", "签名"),
+    TEMPLATE_EXPORT("templateData", "文件模板", "文件模板"),
+    FLOW_DEF_EXPORT("flowDefData", "流程定义", "流程定义"),
+    DOWNLOAD_TEMPLATE("downloadTemplate", "流程定义", "页面配置");
 
     ExportEnum(String fileName, String sheetName, String description) {
         this.fileName = fileName;
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateRecordTypeCodeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateRecordTypeCodeEnum.java
index 31d913c..a963522 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateRecordTypeCodeEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateRecordTypeCodeEnum.java
@@ -46,4 +46,14 @@
     String SITE_EXECUTIVE_APPROVAL = "01";
     //《现场测试、校准或检定工作记录表》
     String SITE_EXECUTIVE_LOG = "02";
+
+    //测试、校准或检定工作分包协议书
+    String OUTSOURCE_PROTOCOL = "01";
+    //测试、校准或检定工作分包评审表
+    String OUTSOURCE_ACCESS = "02";
+    //测试、校准或检定工作分包通知书
+    String OUTSOURCE_NOTICE = "03";
+    //测试、校准或检定工作分包方名录
+    String OUTSOURCE_INFO = "04";
+
 }
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
index 24b8635..f78bd53 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
@@ -15,6 +15,10 @@
     String CERTIFICATE_CHANGE_APPLY_BEAN_NAME = "certificateChangeApplyBean";
     //现场测试、校准或检定
     String SITE_EXECUTIVE_BEAN_NAME = "siteExecutiveBean";
+    //测试、校准或检定工作分包评审表
+    String OUTSOURCE_ASSESS_BEAN_NAME = "outsourceAssessBean";
+    //测试、校准或检定工作分包协议书
+    String OUTSOURCE_PROTOCOL_BEAN_NAME = "outsourceProtocolBean";
 
     /*********************************设备与装置************************************/
     //设备台账
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 b21c661..6b86fd1 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
@@ -18,6 +18,8 @@
     OUTSOURCER_APPROVAL(OUTSOURCER_BEAN_NAME, ""),
     CERTIFICATE_CHANGE_APPROVAL(CERTIFICATE_CHANGE_APPLY_BEAN_NAME, ""),
     SITE_EXECUTIVE_APPROVAL(SITE_EXECUTIVE_BEAN_NAME, ""),
+    OUTSOURCE_ASSESS_APPROVAL(OUTSOURCE_ASSESS_BEAN_NAME, ""),
+    OUTSOURCE_PROTOCOL_APPROVAL(OUTSOURCE_PROTOCOL_BEAN_NAME, ""),
 
     ACTION_STATUS_MAP(new HashMap<String, AwareActionStatusEnum>() {
         {
@@ -47,6 +49,10 @@
             put(ApplyFromIdEnum.CERTIFICATE_CHANGE_APPROVAL.getCode(), CERTIFICATE_CHANGE_APPROVAL);
             //现场测试、校准或检定审批
             put(ApplyFromIdEnum.SITE_EXECUTIVE_APPROVAL.getCode(), SITE_EXECUTIVE_APPROVAL);
+            //测试、校准或检定工作分包评审表
+            put(ApplyFromIdEnum.OUTSOURCE_ASSESS_APPROVAL.getCode(), OUTSOURCE_ASSESS_APPROVAL);
+            //测试、校准或检定工作分包协议书
+            put(ApplyFromIdEnum.OUTSOURCE_PROTOCOL_APPROVAL.getCode(), OUTSOURCE_PROTOCOL_APPROVAL);
         }
     });
     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 934405e..c7410bd 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
@@ -9,6 +9,8 @@
     CERTIFICATE_CHANGE_APPROVAL("jljdywzsbchghsqd", MessageSourceModuleEnum.BUSINESS.getCode(), "证书/报告补充或更换申请单"),
     OUTSOURCER_APPROVAL("jljdywcsjzhgfbfml", MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定合格分包方名录"),
     SITE_EXECUTIVE_APPROVAL("jljdywxccsjzsp", MessageSourceModuleEnum.BUSINESS.getCode(), "现场测试、校准或检定审批"),
+    OUTSOURCE_ASSESS_APPROVAL("jljdywcsjzfbpsb", MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包评审表"),
+    OUTSOURCE_PROTOCOL_APPROVAL("jljdywcsjzfbxys", MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包协议书"),
 
 
     /*******************************************设备与装置*********************************************/
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/GeneralApprovalMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/GeneralApprovalMapper.java
index 4fb7344..0c9d6ae 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/GeneralApprovalMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/GeneralApprovalMapper.java
@@ -17,8 +17,4 @@
 
     Page<O> selectBatchForApprovalList(Page<O> page, @Param("request") R request, @Param("businessKeys") List<String> businessKeys);
 
-//    Page<O> selectListPage(Page<O> page, @Param("request") R request);
-
-//    Long selectMaxNo();
-
 }
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceAssessMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceAssessMapper.java
index 7867bb8..ba59009 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceAssessMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceAssessMapper.java
@@ -1,7 +1,12 @@
 package com.casic.missiles.mapper.business;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.business.outsource.OutsourceAssessApprovalListRequest;
+import com.casic.missiles.mapper.GeneralApprovalMapper;
 import com.casic.missiles.model.business.BizBusinessOutsourceAssess;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * <p>
@@ -11,6 +16,10 @@
  * @author wangpeng
  * @since 2023-08-16
  */
-public interface BizBusinessOutsourceAssessMapper extends BaseMapper<BizBusinessOutsourceAssess> {
+public interface BizBusinessOutsourceAssessMapper extends GeneralApprovalMapper<BizBusinessOutsourceAssess, BizBusinessOutsourceAssess, OutsourceAssessApprovalListRequest> {
+
+    Page<BizBusinessOutsourceAssess> selectBatchForApprovalList(Page<BizBusinessOutsourceAssess> page, @Param("request") OutsourceAssessApprovalListRequest request, @Param("businessKeys") List<String> businessKeys);
+
+    Long selectMaxProjectNo();
 
 }
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceProtocolMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceProtocolMapper.java
new file mode 100644
index 0000000..e6aba35
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceProtocolMapper.java
@@ -0,0 +1,24 @@
+package com.casic.missiles.mapper.business;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.business.outsource.OutsourceProtocolApprovalListRequest;
+import com.casic.missiles.mapper.GeneralApprovalMapper;
+import com.casic.missiles.model.business.BizBusinessOutsourceProtocol;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 计量检定业务-分包管理-测试、校准或检定工作分包协议书 Mapper 接口
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-08-24
+ */
+public interface BizBusinessOutsourceProtocolMapper extends GeneralApprovalMapper<BizBusinessOutsourceProtocol, BizBusinessOutsourceProtocol, OutsourceProtocolApprovalListRequest> {
+
+    Page<BizBusinessOutsourceProtocol> selectBatchForApprovalList(Page<BizBusinessOutsourceProtocol> page, @Param("request") OutsourceProtocolApprovalListRequest request, @Param("businessKeys") List<String> businessKeys);
+
+    Long selectMaxProtocolNo();
+}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/EnvLocationInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/EnvLocationInfoMapper.java
new file mode 100644
index 0000000..49eff87
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/EnvLocationInfoMapper.java
@@ -0,0 +1,21 @@
+package com.casic.missiles.mapper.resource;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.resource.environment.LocationListRequest;
+import com.casic.missiles.dto.resource.environment.LocationListResponse;
+import com.casic.missiles.model.resource.EnvLocationInfo;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * <p>
+ * 实验室环境监控系统-设备表 Mapper 接口
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-06-07
+ */
+public interface EnvLocationInfoMapper extends BaseMapper<EnvLocationInfo> {
+
+    Page<LocationListResponse> selectLocationListPage(Page<LocationListResponse> page, @Param("request") LocationListRequest request);
+}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java
index de124db..85ed0f7 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java
@@ -1,7 +1,9 @@
 package com.casic.missiles.mapper.system;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.dto.system.SignDetailResponse;
+import com.casic.missiles.dto.system.SignListRequest;
 import com.casic.missiles.model.system.SystemSign;
 import org.apache.ibatis.annotations.Param;
 
@@ -22,4 +24,8 @@
     SignDetailResponse selectSignDetailById(Long id);
 
     List<SystemSign> selectUsableSignList(@Param("userId") Long userId);
+
+    Page<SystemSign> selectSignListPage(Page<SystemSign> page, @Param("request") SignListRequest request);
+
+    List<SystemSign> selectSignList(@Param("request") SignListRequest request);
 }
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateChangeApplyMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateChangeApplyMapper.xml
index d798447..c496092 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateChangeApplyMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateChangeApplyMapper.xml
@@ -30,31 +30,31 @@
         SELECT *
         FROM biz_business_certificate_change_apply
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.changeApplyNo != null and request.changeApplyNo !=''">
+        <if test="request != null and request.changeApplyNo != null and request.changeApplyNo !=''">
             and change_apply_no like concat('%',#{request.changeApplyNo},'%')
         </if>
-        <if test="request.changeReportNo != null and request.changeReportNo !=''">
+        <if test="request != null and request.changeReportNo != null and request.changeReportNo !=''">
             and change_report_no like concat('%',#{request.changeReportNo},'%')
         </if>
-        <if test="request.changeReportName != null and request.changeReportName !=''">
+        <if test="request != null and request.changeReportName != null and request.changeReportName !=''">
             and change_report_name like concat('%',#{request.changeReportName},'%')
         </if>
-        <if test="request.changeType != null and request.changeType !=''">
+        <if test="request != null and request.changeType != null and request.changeType !=''">
             and change_type = #{request.changeType}
         </if>
-        <if test="request.createUserName != null and request.createUserName !=''">
+        <if test="request != null and request.createUserName != null and request.createUserName !=''">
             and create_user_name like concat('%',#{request.createUserName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificatePrintMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificatePrintMapper.xml
index b66cd99..49c0ac8 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificatePrintMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificatePrintMapper.xml
@@ -31,34 +31,34 @@
         LEFT JOIN biz_business_order_sample_relation bosr ON (bosr.order_id = bcr.order_id AND bosr.sample_id = bcr.sample_id)
         LEFT JOIN biz_business_order_info boi ON boi.id = bosr.order_id
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and bcp.approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.printStatus != null and request.printStatus !=''">
+        <if test="request != null and request.printStatus != null and request.printStatus !=''">
             and print_status = #{request.printStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and bcp.create_user_id = #{request.createUserId}
         </if>
-        <if test="request.certificateReportNo != null and request.certificateReportNo !=''">
+        <if test="request != null and request.certificateReportNo != null and request.certificateReportNo !=''">
             and bcr.certificate_report_no like concat('%',#{request.certificateReportNo},'%')
         </if>
-        <if test="request.certificateReportName != null and request.certificateReportName !=''">
+        <if test="request != null and request.certificateReportName != null and request.certificateReportName !=''">
             and bcr.certificate_report_name like concat('%',#{request.certificateReportName},'%')
         </if>
-        <if test="request.customerName != null and request.customerName !=''">
+        <if test="request != null and request.customerName != null and request.customerName !=''">
             and boi.customer_name like concat('%',#{request.customerName},'%')
         </if>
-        <if test="request.sampleNo != null and request.sampleNo !=''">
+        <if test="request != null and request.sampleNo != null and request.sampleNo !=''">
             and bosr.sample_no like concat('%',#{request.sampleNo},'%')
         </if>
-        <if test="request.sampleName != null and request.sampleName !=''">
+        <if test="request != null and request.sampleName != null and request.sampleName !=''">
             and bosr.sample_name like concat('%',#{request.sampleName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and bcp.create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and bcp.create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml
index b366034..767695d 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml
@@ -46,33 +46,37 @@
         SELECT bcr.*, bosr.sample_no, bosr.sample_name, bosr.sample_model, rsi.staff_name
         FROM biz_business_certificate_report bcr
         LEFT JOIN biz_business_order_sample_relation bosr ON (bosr.order_id = bcr.order_id AND bosr.sample_id = bcr.sample_id)
+        LEFT JOIN biz_business_order_info boi ON boi.id = bcr.order_id
         LEFT JOIN biz_resource_staff_info rsi ON rsi.id = bcr.measure_person_id
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and bcr.approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and bcr.create_user_id = #{request.createUserId}
         </if>
-        <if test="request.certificateReportNo != null and request.certificateReportNo !=''">
+        <if test="request != null and request.customerId != null and request.customerId !=''">
+            and boi.customer_id = #{request.customerId}
+        </if>
+        <if test="request != null and request.certificateReportNo != null and request.certificateReportNo !=''">
             and bcr.certificate_report_no like concat('%',#{request.certificateReportNo},'%')
         </if>
-        <if test="request.certificateReportName != null and request.certificateReportName !=''">
+        <if test="request != null and request.certificateReportName != null and request.certificateReportName !=''">
             and bcr.certificate_report_name like concat('%',#{request.certificateReportName},'%')
         </if>
-        <if test="request.sampleNo != null and request.sampleNo !=''">
+        <if test="request != null and request.sampleNo != null and request.sampleNo !=''">
             and bosr.sample_no like concat('%',#{request.sampleNo},'%')
         </if>
-        <if test="request.measureCategory != null and request.measureCategory !=''">
+        <if test="request != null and request.measureCategory != null and request.measureCategory !=''">
             and bcr.measure_category = #{request.measureCategory}
         </if>
-        <if test="request.measurePerson != null and request.measurePerson !=''">
+        <if test="request != null and request.measurePerson != null and request.measurePerson !=''">
             and rsi.staff_name like concat('%',#{request.measurePerson},'%')
         </if>
-        <if test="request.calibrationTimeStart != null and request.calibrationTimeStart !=''">
+        <if test="request != null and request.calibrationTimeStart != null and request.calibrationTimeStart !=''">
             and bcr.calibration_time &gt;= #{request.calibrationTimeStart}
         </if>
-        <if test="request.calibrationTimeEnd != null and request.calibrationTimeEnd !=''">
+        <if test="request != null and request.calibrationTimeEnd != null and request.calibrationTimeEnd !=''">
             and bcr.calibration_time &lt;= #{request.calibrationTimeEnd}
         </if>
         <if test="businessKeys != null">

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java
index bb0c50f..13a699b 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java
@@ -12,6 +12,7 @@
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.IGeneralApprovalService;
+import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
@@ -19,6 +20,7 @@
 import org.springframework.web.bind.annotation.RequestBody;
 
 import javax.validation.Valid;
+import java.util.List;
 import java.util.Objects;
 
 /**
@@ -117,4 +119,17 @@
         }
         return baseApprovalService.failUpdate(request);
     }
+
+    public List<O> exportList(@RequestBody @Valid R request) throws Exception {
+        List<O> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = baseApprovalService.listExportByIds(request.getIds());
+        } else {
+            list = baseApprovalService.listExport(request);
+        }
+        for (O record : list) {
+            DictCodeUtils.convertDictCodeToName(record);
+        }
+        return list;
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java
index 8a90961..d775831 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java
@@ -5,6 +5,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.business.certificate.CertificateChangeApplyApprovalListRequest;
 import com.casic.missiles.dto.business.certificate.CertificateChangeApplySaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessCertificateChangeApply;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
@@ -20,6 +21,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -48,4 +50,12 @@
         }
         return changeApplyService.saveChangeApply(request);
     }
+
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody CertificateChangeApplyApprovalListRequest request) throws Exception {
+        List<BizBusinessCertificateChangeApply> list = super.exportList(request);
+        super.exportExcel(BizBusinessCertificateChangeApply.class, list, ExportEnum.CERTIFICATE_CHANGE_APPLY.getSheetName());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java
index 5fc4b07..af8230e 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java
@@ -9,6 +9,7 @@
 import com.casic.missiles.dto.business.certificate.CertificatePrintApprovalListRequest;
 import com.casic.missiles.dto.business.certificate.CertificatePrintListResponse;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.enums.business.CertificatePrintStatusEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessCertificatePrintLog;
@@ -18,10 +19,16 @@
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.io.IOException;
+import java.util.List;
 import java.util.Objects;
 
 /**
@@ -98,4 +105,16 @@
         });
         return certificatePrintService.certificatePrintLog(idDTO.getId());
     }
+
+    @ApiOperation("证书打印审批导出")
+    @PostMapping("/listExport")
+    public void exportList(@RequestBody CertificatePrintApprovalListRequest request) throws IOException {
+        List<CertificatePrintListResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = certificatePrintService.listByIds(request.getIds());
+        } else {
+            list = certificatePrintService.list(request);
+        }
+        super.exportExcel(CertificatePrintListResponse.class, list, ExportEnum.CERTIFICATE_PRINT.getSheetName());
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java
index 63b06dc..6b2efd5 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java
@@ -6,6 +6,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.business.certificate.CertificateReportApprovalListRequest;
 import com.casic.missiles.dto.business.certificate.CertificateReportSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessCertificateReport;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
@@ -21,6 +22,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -50,7 +52,7 @@
         return certificateReportService.saveCertificateReport(request);
     }
 
-    @ApiOperation("证书审批详情（基本信息）")
+    @ApiOperation("详情（基本信息）")
     @PostMapping("/detail")
     public ReturnDTO<BizBusinessCertificateReport> detail(@RequestBody @Valid BaseDetailRequest request, BindingResult bindingResult) throws Exception {
         if(bindingResult.hasErrors()){
@@ -59,4 +61,11 @@
         return certificateReportService.detail(request);
     }
 
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody CertificateReportApprovalListRequest request) throws Exception {
+        List<BizBusinessCertificateReport> list = super.exportList(request);
+        super.exportExcel(BizBusinessCertificateReport.class, list, ExportEnum.CERTIFICATE_REPORT.getSheetName());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java
index 46b26bd..57c0809 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java
@@ -10,20 +10,21 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.business.identify.IdentifyListRequest;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessIdentifyInfo;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.business.IBizBusinessIdentifyInfoService;
+import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import javax.validation.Valid;
+import java.util.List;
 import java.util.Objects;
 
 /**
@@ -57,16 +58,13 @@
         return identifyInfoService.addIdentify(identifyInfo);
     }
 
-    @ApiOperation("标识打印更新")
+    @ApiOperation("标识打印更新（更新打印时间）")
     @PostMapping("/update")
-    public ReturnDTO updateIdentify(@RequestBody @Valid BizBusinessIdentifyInfo identifyInfo, BindingResult bindingResult) {
-        Assert.isFalse(Objects.isNull(identifyInfo.getId()), () -> {
+    public ReturnDTO updateIdentify(@RequestBody @Valid IdDTO idDTO) {
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        Assert.isFalse(bindingResult.hasErrors(), () -> {
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        });
-        return identifyInfoService.updateIdentify(identifyInfo);
+        return identifyInfoService.updateIdentify(idDTO.getId());
     }
 
     @ApiOperation("标识打印删除")
@@ -77,4 +75,37 @@
         });
         return identifyInfoService.deleteIdentify(idDTO.getId());
     }
+
+    @ApiOperation("标识打印导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody @Valid IdentifyListRequest request, BindingResult bindingResult) throws Exception {
+        if (bindingResult.hasErrors()) {
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        List<BizBusinessIdentifyInfo> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = identifyInfoService.listByIds(request.getIds());
+        } else {
+            list = identifyInfoService.list(request);
+        }
+        for (BizBusinessIdentifyInfo record : list) {
+            DictCodeUtils.convertDictCodeToName(record);
+        }
+        super.exportExcel(BizBusinessIdentifyInfo.class, list, ExportEnum.IDENTIFY_EXPORT.getSheetName());
+    }
+
+
+    // TODO: 2023/8/23 查询设备信息，4个底部按钮查设备（按钮的作用就是前端用来调不同接口、用来区分中间即将展示的标识），前端弹窗选设备，在确定保存时前端根据底部按钮判断传入设备类型deviceType字典code
+    // TODO: 2023/8/23 接口：查受检设备（第1个按钮），查设备台账（后3个按钮同一接口），查询之后前端根据标志类型的不同加到中间页面时进行判断（按产品给的对应表）
+    // TODO: 2023/8/23 提供二维码接口，前端在加到中间页面时调用一下
+
+    @ApiOperation("设备二维码")
+    @PostMapping("/equipment/qrCode")
+    public ReturnDTO<String> equipmentQrCode(@RequestBody @Valid IdDTO idDTO) {
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return identifyInfoService.equipmentQrCode(idDTO.getId());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java
index 707be6e..7e0453d 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java
@@ -117,7 +117,7 @@
     }
 
     @ApiOperation("任务单导出")
-    @PostMapping("/export")
+    @PostMapping("/listExport")
     public void orderExport(@RequestBody @Valid OrderListRequest request, HttpServletResponse response) {
         businessOrderService.orderExport(request, response);
     }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java
index 529a6ce..51432be 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java
@@ -1,9 +1,28 @@
 package com.casic.missiles.controller.business;
 
+import com.casic.missiles.controller.GeneralApprovalController;
+import com.casic.missiles.dto.BaseApprovalSubmitRequest;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.business.outsource.OutsourceAssessApprovalListRequest;
+import com.casic.missiles.dto.business.outsource.OutsourceAssessSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
+import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.model.business.BizBusinessOutsourceAssess;
+import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
+import com.casic.missiles.service.IGeneralApprovalService;
+import com.casic.missiles.service.business.IBizBusinessOutsourceAssessService;
 import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.BindingResult;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.validation.Valid;
+import java.util.List;
+
 /**
  * <p>
  * 计量检定业务-分包管理-测试、校准或检定工作分包评审表 前端控制器
@@ -15,6 +34,27 @@
 @Api(tags = "分包管理-测试、校准或检定工作分包评审表")
 @RestController
 @RequestMapping("/business/outsource/assess")
-public class BizBusinessOutsourceAssessController {
+public class BizBusinessOutsourceAssessController extends GeneralApprovalController<BizBusinessOutsourceAssess, BizBusinessOutsourceAssess, OutsourceAssessApprovalListRequest, BaseApprovalSubmitRequest> {
+    @Autowired
+    private IBizBusinessOutsourceAssessService outsourceAssessService;
 
+    public BizBusinessOutsourceAssessController(IGeneralApprovalService<BizBusinessOutsourceAssess, BizBusinessOutsourceAssess, OutsourceAssessApprovalListRequest, BaseApprovalSubmitRequest> baseApprovalService) {
+        super(baseApprovalService);
+    }
+
+    @ApiOperation("草稿箱-保存")
+    @PostMapping("/save")
+    public ReturnDTO<OutsourceAssessSaveResponse> saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceAssess request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        return outsourceAssessService.saveOutsourceAssess(request);
+    }
+
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception {
+        List<BizBusinessOutsourceAssess> list = super.exportList(request);
+        super.exportExcel(BizBusinessOutsourceAssess.class, list, ExportEnum.OUTSOURCE_ASSESS.getSheetName());
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java
new file mode 100644
index 0000000..9adef18
--- /dev/null
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java
@@ -0,0 +1,60 @@
+package com.casic.missiles.controller.business;
+
+import com.casic.missiles.controller.GeneralApprovalController;
+import com.casic.missiles.dto.BaseApprovalSubmitRequest;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.business.outsource.OutsourceProtocolApprovalListRequest;
+import com.casic.missiles.dto.business.outsource.OutsourceProtocolSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
+import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.model.business.BizBusinessOutsourceProtocol;
+import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
+import com.casic.missiles.service.IGeneralApprovalService;
+import com.casic.missiles.service.business.IBizBusinessOutsourceProtocolService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.BindingResult;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.validation.Valid;
+import java.util.List;
+
+/**
+ * <p>
+ * 计量检定业务-分包管理-测试、校准或检定工作分包协议书 前端控制器
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-08-24
+ */
+@Api(tags = "分包管理-测试、校准或检定工作分包协议书")
+@RestController
+@RequestMapping("/business/outsource/protocol")
+public class BizBusinessOutsourceProtocolController extends GeneralApprovalController<BizBusinessOutsourceProtocol, BizBusinessOutsourceProtocol, OutsourceProtocolApprovalListRequest, BaseApprovalSubmitRequest> {
+    @Autowired
+    private IBizBusinessOutsourceProtocolService outsourceProtocolService;
+
+    public BizBusinessOutsourceProtocolController(IGeneralApprovalService<BizBusinessOutsourceProtocol, BizBusinessOutsourceProtocol, OutsourceProtocolApprovalListRequest, BaseApprovalSubmitRequest> baseApprovalService) {
+        super(baseApprovalService);
+    }
+
+    @ApiOperation("草稿箱-保存")
+    @PostMapping("/save")
+    public ReturnDTO<OutsourceProtocolSaveResponse> saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceProtocol request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        return outsourceProtocolService.saveOutsourceProtocol(request);
+    }
+
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody OutsourceProtocolApprovalListRequest request) throws Exception {
+        List<BizBusinessOutsourceProtocol> list = super.exportList(request);
+        super.exportExcel(BizBusinessOutsourceProtocol.class, list, ExportEnum.OUTSOURCE_PROTOCOL.getSheetName());
+    }
+}
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java
index 097f645..f0f0943 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java
@@ -17,7 +17,6 @@
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.IGeneralApprovalService;
 import com.casic.missiles.service.business.IBizBusinessOutsourcerInfoService;
-import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -71,19 +70,8 @@
 
     @ApiOperation("分包方导出")
     @PostMapping("/listExport")
-    public void export(@RequestBody @Valid OutsourcerInfoApprovalListRequest request, BindingResult bindingResult) throws Exception {
-        if (bindingResult.hasErrors()) {
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        }
-        List<BizBusinessOutsourcerInfo> list;
-        if (!CollectionUtils.isEmpty(request.getIds())) {
-            list = outsourcerInfoService.listByIds(request.getIds());
-        } else {
-            list = outsourcerInfoService.list(request);
-        }
-        for (BizBusinessOutsourcerInfo record : list) {
-            DictCodeUtils.convertDictCodeToName(record);
-        }
+    public void export(@RequestBody OutsourcerInfoApprovalListRequest request) throws Exception {
+        List<BizBusinessOutsourcerInfo> list = super.exportList(request);
         super.exportExcel(BizBusinessOutsourcerInfo.class, list, ExportEnum.OUTSOURCER_EXPORT.getSheetName());
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java
index c2cbf9f..0410918 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java
@@ -17,11 +17,9 @@
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.IGeneralApprovalService;
 import com.casic.missiles.service.business.IBizBusinessSiteExecutiveInfoService;
-import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -60,7 +58,7 @@
         return siteExecutiveInfoService.saveSiteExecutiveInfo(siteExecutiveInfo);
     }
 
-    @ApiOperation("现场检测详情")
+    @ApiOperation("详情")
     @PostMapping("/detail")
     public ReturnDTO<SiteExecutiveDetailResponse> siteExecutiveDetail(@RequestBody @Valid IdDTO idDTO) throws Exception {
         Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
@@ -69,21 +67,10 @@
         return ReturnUtil.success(siteExecutiveInfoService.detail(idDTO.getId()));
     }
 
-    @ApiOperation("现场检测导出")
+    @ApiOperation("导出")
     @PostMapping("/listExport")
-    public void export(@RequestBody @Valid SiteExecutiveApprovalListRequest request, BindingResult bindingResult) throws Exception {
-        if (bindingResult.hasErrors()) {
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        }
-        List<SiteExecutiveApprovalListResponse> list;
-        if (!CollectionUtils.isEmpty(request.getIds())) {
-            list = siteExecutiveInfoService.listInfoByIds(request.getIds());
-        } else {
-            list = siteExecutiveInfoService.listInfo(request);
-        }
-        for (SiteExecutiveApprovalListResponse record : list) {
-            DictCodeUtils.convertDictCodeToName(record);
-        }
+    public void export(@RequestBody SiteExecutiveApprovalListRequest request) throws Exception {
+        List<SiteExecutiveApprovalListResponse> list = super.exportList(request);
         super.exportExcel(SiteExecutiveApprovalListResponse.class, list, ExportEnum.SITE_EXECUTIVE_EXPORT.getSheetName());
     }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
index 7e793cd..a92e209 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
@@ -55,7 +55,7 @@
 
     @ApiOperation("设备收发列表导出")
     @PostMapping("/export")
-    public void exportList(@RequestBody @Valid SampleDispatchListRequest request) throws IOException {
+    public void exportList(@RequestBody SampleDispatchListRequest request) throws IOException {
         List<SampleDispatchListResponse> list;
         if (!CollectionUtils.isEmpty(request.getIds())) {
             list = dispatchService.listByIds(request.getIds());
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java
index cdc77fc..d120fd4 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java
@@ -7,6 +7,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.business.labExecutive.*;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.business.IBusinessLabExecutiveInfoService;
@@ -14,6 +15,7 @@
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.*;
 
@@ -32,7 +34,7 @@
     @Autowired
     private IBusinessLabExecutiveInfoService labExecutiveInfoService;
 
-    @ApiOperation("实验室检测-部门检测-查询各状态列表（待检测、检测中、检测完）")
+    @ApiOperation("实验室任务-查询各状态列表（待检测、检测中、检测完）")
     @PostMapping("/deptExecutive/List")
     public ReturnDTO<PageInfoBT<SampleLabExecutiveListResponse>> queryDeptExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
@@ -43,10 +45,19 @@
         return ReturnUtil.success(super.packForBT(labExecutiveInfoService.deptLabExecutiveListPage(page, labExecutiveListRequest)));
     }
 
-    /**
-     * 实验室检测-我的检测-查询各状态列表（待检测、检测中、检测完）
-     */
-    @ApiOperation("实验室检测-我的检测-查询各状态列表（待检测、检测中、检测完）")
+    @ApiOperation("实验室任务导出")
+    @PostMapping("/deptExecutive/export")
+    public void deptExportList(@RequestBody @Valid SampleLabExecutiveListRequest request) throws Exception {
+        List<SampleLabExecutiveListResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = labExecutiveInfoService.deptLabExecutiveListByIds(request.getMeasureStatus(), request.getIds());
+        } else {
+            list = labExecutiveInfoService.deptLabExecutiveList(request);
+        }
+        super.exportExcel(SampleLabExecutiveListResponse.class, list, ExportEnum.DEPT_EXECUTIVE_TASK.getSheetName());
+    }
+
+    @ApiOperation("我的任务-查询各状态列表（待检测、检测中、检测完）")
     @PostMapping("/myExecutive/list")
     public ReturnDTO<PageInfoBT<SampleLabExecutiveListResponse>> queryMyExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
@@ -57,19 +68,25 @@
         return ReturnUtil.success(super.packForBT(labExecutiveInfoService.myLabExecutiveListPage(page, labExecutiveListRequest)));
     }
 
-    /**
-     * 实验室检测-我的检测-查询各状态样品数量（待检测、检测中、检测完）
-     */
-    @ApiOperation("实验室检测-我的检测-查询各状态样品数量（待检测、检测中、检测完）")
+    @ApiOperation("我的任务导出")
+    @PostMapping("/myExecutive/export")
+    public void exportList(@RequestBody @Valid SampleLabExecutiveListRequest request) throws Exception {
+        List<SampleLabExecutiveListResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = labExecutiveInfoService.myLabExecutiveListByIds(request.getMeasureStatus(), request.getIds());
+        } else {
+            list = labExecutiveInfoService.myLabExecutiveList(request);
+        }
+        super.exportExcel(SampleLabExecutiveListResponse.class, list, ExportEnum.MY_EXECUTIVE_TASK.getSheetName());
+    }
+
+    @ApiOperation("我的任务-查询各状态样品数量（待检测、检测中、检测完）")
     @GetMapping("/myExecutive/amount")
     public ReturnDTO<List<SampleAmountResponse>> queryMyExecutiveAmount() {
         return ReturnUtil.success(labExecutiveInfoService.myExecutiveAmount());
     }
 
-    /**
-     * 实验室检测-部门检测-分配（分配给具体人员）
-     */
-    @ApiOperation("实验室检测-部门检测-分配按钮（分配给具体人员）")
+    @ApiOperation("实验室任务-分配按钮（分配给具体人员）")
     @PostMapping("/deptExecutive/allocate")
     public ReturnDTO allocateStaff(@RequestBody @Valid SampleAllocateRequest sampleAllocateRequest, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -78,10 +95,7 @@
         return labExecutiveInfoService.allocateStaff(sampleAllocateRequest);
     }
 
-    /**
-     * 实验室检测-我的检测-检定人扫描收入（待检测->检测中）
-     */
-    @ApiOperation("实验室检测-我的检测-检定人扫描收入（待检测->检测中）")
+    @ApiOperation("我的任务-检定人扫描收入（待检测->检测中）")
     @PostMapping("/myExecutive/receive")
     public ReturnDTO sampleReceive(@RequestBody @Valid List<SampleOperateRequest> requestList, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -90,10 +104,7 @@
         return labExecutiveInfoService.sampleReceive(requestList);
     }
 
-    /**
-     * 实验室检测-负责人/检定人扫描检完（检测中->检测完）
-     */
-    @ApiOperation("实验室检测-负责人/检定人扫描检完（检测中->检测完）")
+    @ApiOperation("实验室任务-负责人/检定人扫描检完（检测中->检测完）")
     @PostMapping("/myExecutive/complete")
     public ReturnDTO sampleExecutiveComplete(@RequestBody @Valid List<SampleOperateRequest> requestList, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -102,10 +113,7 @@
         return labExecutiveInfoService.sampleExecutiveComplete(requestList);
     }
 
-    /**
-     * 实验室检测-部门检测/我的检测 编辑（只能修改应出具证书）
-     */
-    @ApiOperation("实验室检测-部门检测/我的检测 编辑（只能修改应出具证书）")
+    @ApiOperation("实验室任务/我的任务 编辑（只能修改应出具证书）")
     @PostMapping("/executive/update")
     public ReturnDTO updateExecutive(@RequestBody @Valid UpdateExecutiveRequest request, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -114,10 +122,7 @@
         return labExecutiveInfoService.updateExecutive(request);
     }
 
-    /**
-     * 实验室检测-部门检测/我的检测 详情
-     */
-    @ApiOperation("实验室检测-部门检测/我的检测 详情")
+    @ApiOperation("实验室任务/我的任务 详情")
     @PostMapping("/executive/detail")
     public ReturnDTO<ExecutiveDetailResponse> executiveDetail(@RequestBody @Valid ExecutiveDetailRequest request, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
@@ -131,7 +136,7 @@
      * 退回后会将下一个要执行的实验室检测状态更新为待分配，将后面的实验室顺序变更为连续（都进行减1）
      * 最后一个检测的实验室退回，等分发员再增加实验室或设备收发中的已收入直接手动点击完成
      */
-    @ApiOperation("实验室检测-部门检测/我的检测 退回（待检测/检测中->退回）")
+    @ApiOperation("实验室任务/我的任务 退回（待检测/检测中->退回）")
     @PostMapping("/executive/sendBack")
     public ReturnDTO executiveSendBack(@RequestBody @Valid ExecutiveSendBackRequest request, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -140,9 +145,6 @@
         return labExecutiveInfoService.sampleExecutiveSendBack(request);
     }
 
-    /**
-     * 分发员编辑实验室检测列表
-     */
     @ApiOperation("分发员编辑实验室检测列表")
     @PostMapping("/handOut/updateList")
     public ReturnDTO updateExecutiveList(@RequestBody @Valid UpdateExecutiveListRequest request, BindingResult bindingResult) {
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java
index 48a67ed..0c04f31 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java
@@ -10,6 +10,7 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.resource.customer.CustomerApprovalListRequest;
 import com.casic.missiles.dto.resource.customer.CustomerSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceCustomerInfo;
@@ -26,6 +27,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -55,6 +57,13 @@
         return customerInfoService.saveCustomerInfo(request);
     }
 
+    @ApiOperation("委托方名录导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody CustomerApprovalListRequest request) throws Exception {
+        List<BizResourceCustomerInfo> list = super.exportList(request);
+        super.exportExcel(BizResourceCustomerInfo.class, list, ExportEnum.CUSTOMER_INFO.getSheetName());
+    }
+
     @ApiOperation("委托方人员列表（分页）")
     @PostMapping("/person/listPage")
     public ReturnDTO<PageInfoBT<BizResourceCustomerStaff>> personListPage(@RequestBody IdDTO idDto) {
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
index 972ed4b..6418ea5 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
@@ -5,6 +5,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.resource.customer.SuggestFormApprovalListRequest;
 import com.casic.missiles.dto.resource.customer.SuggestFormSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceCustomerSuggestForm;
@@ -20,6 +21,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -50,4 +52,11 @@
         return suggestFormService.saveSuggestForm(request);
     }
 
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody SuggestFormApprovalListRequest request) throws Exception {
+        List<BizResourceCustomerSuggestForm> list = super.exportList(request);
+        super.exportExcel(BizResourceCustomerSuggestForm.class, list, ExportEnum.CUSTOMER_SUGGEST_FORM.getSheetName());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java
index 1934d1a..9e07eab 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java
@@ -15,12 +15,16 @@
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.resource.IEnvEnvironmentRecordConfigService;
 import com.casic.missiles.service.resource.IEnvEnvironmentRecordDataService;
+import com.casic.missiles.service.resource.IEnvLocationInfoService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
 import java.util.List;
@@ -39,6 +43,8 @@
     private IEnvEnvironmentRecordDataService environmentRecordDataService;
     @Autowired
     private IEnvEnvironmentRecordConfigService environmentRecordConfigService;
+    @Autowired
+    private IEnvLocationInfoService locationInfoService;
 
     @ApiOperation("环境记录单数据列表/详情")
     @PostMapping("/data/listPage")
@@ -95,4 +101,11 @@
         });
         return environmentRecordConfigService.deleteEnvironmentRecordConfig(idDTO.getId());
     }
+
+    @ApiOperation("地点列表")
+    @PostMapping("/location/listPage")
+    public ReturnDTO<PageInfoBT<LocationListResponse>> locationListPage(@RequestBody @Valid LocationListRequest request) {
+        Page<LocationListResponse> page = PageFactory.defaultPage();
+        return ReturnUtil.success(super.packForBT(locationInfoService.listPage(page, request)));
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java
index 82efe3f..e9561fa 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java
@@ -10,6 +10,7 @@
 import com.casic.missiles.dto.resource.seal.SealLogListRequest;
 import com.casic.missiles.dto.resource.seal.SealNoteApprovalListRequest;
 import com.casic.missiles.dto.resource.seal.SealNoteSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceSealUseLog;
@@ -27,6 +28,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -58,6 +60,13 @@
         return sealUseNoteService.saveSeal(request);
     }
 
+    @ApiOperation("印章使用登记导出（列表和导出中去掉经办人和监印人）")
+    @PostMapping("/listExport")
+    public void export(@RequestBody SealNoteApprovalListRequest request) throws Exception {
+        List<BizResourceSealUseNote> list = super.exportList(request);
+        super.exportExcel(BizResourceSealUseNote.class, list, ExportEnum.SEAL_NOTE.getSheetName());
+    }
+
     // TODO: 2023/7/28 印章使用日志：系统中使用印章时插入数据库
 
     @ApiOperation("印章使用日志列表（分页）")
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java
index 9b674fc..06b6521 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java
@@ -9,16 +9,20 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.resource.staff.StaffCertRequest;
 import com.casic.missiles.dto.resource.staff.StaffCertResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.service.resource.IBizResourceStaffInfoService;
 import com.casic.missiles.service.resource.IBizResourceStaffVerifierService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.List;
+
 /**
  * @Description:
  * @Author: wangpeng
@@ -41,9 +45,21 @@
         return ReturnUtil.success(super.packForBT(responsePage));
     }
 
+    @ApiOperation("证书逾期提醒导出")
+    @PostMapping("/listExport")
+    public void exportList(@RequestBody StaffCertRequest request) throws Exception {
+        List<StaffCertResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = staffInfoService.certListByIds(request.getIds());
+        } else {
+            list = staffInfoService.certList(request);
+        }
+        super.exportExcel(StaffCertResponse.class, list, ExportEnum.STAFF_CERTIFICATE_EXPIRE.getSheetName());
+    }
+
     @ApiOperation("证书逾期提醒")
     @PostMapping("/expirationReminder")
-    public ReturnDTO expirationReminder(@RequestBody IdDTO idDto) {
-        return verifierService.expirationReminder(idDto);
+    public ReturnDTO expirationReminder(@RequestBody IdDTO idDTO) {
+        return verifierService.expirationReminder(idDTO);
     }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java
index 3b251ad..a6e7850 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java
@@ -12,6 +12,7 @@
 import com.casic.missiles.dto.resource.staff.StaffListRequest;
 import com.casic.missiles.dto.resource.staff.TrainListRequest;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.*;
@@ -22,7 +23,10 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
 import java.util.List;
@@ -52,8 +56,19 @@
             throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
         }
         Page<BizResourceStaffInfo> page = PageFactory.defaultPage();
-        Page<BizResourceStaffInfo> responsePage = staffInfoService.listPage(page, request);
-        return ReturnUtil.success(super.packForBT(responsePage));
+        return ReturnUtil.success(super.packForBT(staffInfoService.listPage(page, request)));
+    }
+
+    @ApiOperation("人员登记导出")
+    @PostMapping("/listExport")
+    public void exportList(@RequestBody StaffListRequest request) throws Exception {
+        List<BizResourceStaffInfo> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = staffInfoService.listByIds(request.getIds());
+        } else {
+            list = staffInfoService.list(request);
+        }
+        super.exportExcel(BizResourceStaffInfo.class, list, ExportEnum.STAFF_INFO.getSheetName());
     }
 
     @ApiOperation("人员登记详情基础信息")
@@ -85,9 +100,9 @@
 
     @ApiOperation("科研教育列表（分页）")
     @PostMapping("/education/listPage")
-    public ReturnDTO<PageInfoBT<BizResourceStaffEducation>> educationListPage(@RequestBody IdDTO idDto) {
+    public ReturnDTO<PageInfoBT<BizResourceStaffEducation>> educationListPage(@RequestBody IdDTO idDTO) {
         Page<BizResourceStaffEducation> page = PageFactory.defaultPage();
-        Page<BizResourceStaffEducation> responsePage = staffInfoService.educationListPage(page, idDto);
+        Page<BizResourceStaffEducation> responsePage = staffInfoService.educationListPage(page, idDTO);
         return ReturnUtil.success(super.packForBT(responsePage));
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java
index af6aa86..d85d84a 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java
@@ -9,6 +9,7 @@
 import com.casic.missiles.dto.resource.outsideService.SupplierApprovalListRequest;
 import com.casic.missiles.dto.resource.outsideService.SupplierSaveResponse;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceSupplierAbility;
@@ -67,6 +68,13 @@
         return ReturnUtil.success(supplierInfoService.detail(idDTO.getId()));
     }
 
+    @ApiOperation("合格供方导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody SupplierApprovalListRequest request) throws Exception {
+        List<BizResourceSupplierInfo> list = super.exportList(request);
+        super.exportExcel(BizResourceSupplierInfo.class, list, ExportEnum.SUPPLIER_INFO.getSheetName());
+    }
+
     @ApiOperation("供方人员列表（分页）")
     @PostMapping("/person/listPage")
     public ReturnDTO<PageInfoBT<BizResourceSupplierPerson>> personListPage(@RequestBody IdDTO idDTO) {
diff --git a/casic-metering-api/src/main/resources/config/application.yml b/casic-metering-api/src/main/resources/config/application.yml
index 350db5f..ecff521 100644
--- a/casic-metering-api/src/main/resources/config/application.yml
+++ b/casic-metering-api/src/main/resources/config/application.yml
@@ -126,7 +126,7 @@
     #作者
     author: wangpeng
     #待生成对象表名
-    table-name: biz_equipment_technical_target_approval,biz_equipment_attachment_approval,biz_equipment_checkpoint_approval
+    table-name: biz_business_outsource_protocol
 
 reminder:
   #节点--common模块config包 ReminderNodeConfig配置
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
index 4a19e4e..d47d552 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
@@ -53,6 +53,7 @@
     SUGGEST_FORM_SAVE_FAILED(2509, "委托方意见登记表保存至草稿箱失败"),
     EXAMINE_FORM_SAVE_FAILED(2510, "要求、委托书及合同评审表保存至草稿箱失败"),
     CUSTOMER_EXIST_SAVE_FAILED(2511, "该委托方已存在，请重新选择"),
+    DUPLICATE_LOCATION_NO(2512, "地点编号已存在"),
 
     /**
      * 计量检定业务模块
@@ -68,6 +69,8 @@
     COMPLETE_SAMPLE_NOT_EXIST(2609, "检测中不存在扫描收入的样品"),
     CANNOT_CHANGE_MEASURE_INFO(2610, "无法更改非当前登录用户的检测信息"),
     NON_EXIST_ORDER_OR_SAMPLE(2611, "不存在该委托单或该委托单下的样品"),
+    OUTSOURCE_ACCESS_SAVE_FAILED(2612, "测试、校准或检定工作分包评审表保存至草稿箱失败"),
+    OUTSOURCE_PROTOCOL_SAVE_FAILED(2613, "测试、校准或检定工作分包协议书保存至草稿箱失败"),
 
     /**
      * 历史遗留备用
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
index 5089ad1..81a406b 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
@@ -10,54 +10,38 @@
     /**
      * 资源管理
      */
-    ENVIRONMENT_DATA_EXPORT("environmentData", "environmentData", "环境记录单数据"),
+    ENVIRONMENT_DATA_EXPORT("environmentData", "环境记录单数据", "环境记录单数据"),
+    STAFF_INFO("staffInfo", "人员登记", "人员登记"),
+    STAFF_CERTIFICATE_EXPIRE("certificateExpire", "证书逾期提醒", "证书逾期提醒"),
+    SUPPLIER_INFO("supplierInfo", "合格供方名录", "合格供方名录"),
+    CUSTOMER_INFO("customerInfo", "委托方名录", "委托方名录"),
+    CUSTOMER_SUGGEST_FORM("customerSuggestForm", "委托方意见登记表", "委托方意见登记表"),
+    SEAL_NOTE("sealNote", "印章使用登记", "印章使用登记"),
 
-    FILE_EXPORT("meterFileData", "meterFileData", "计量文件信息"),
-    TRAIN_PLAN_EXPORT("trainPlanData", "trainPlanData", "培训计划"),
-    TRAIN_LOG_EXPORT("trainLogData", "trainLogData", "培训记录"),
-    METER_ORGANIZE_EXPORT("meterOrganizeData", "meterOrganizeData", "计量组织"),
-    TRACE_SUPPLIER_EXPORT("traceSupplierData", "traceSupplierData", "溯源供方"),
-    SIGN_EXPORT("signData", "signData", "签名/签章"),
-    TEMPLATE_EXPORT("templateData", "templateData", "原始记录模板/证书报告模板"),
-    FIXED_ASSETS("meterFixedAssets", "meterFixedAssets", "固定资产"),
-    METER_EQUIPMENT("meterEquipment", "meterEquipment", "测量设备"),
-    CALIBRATION_TEST_EQUIPMENT("calibrationTestEquipment", "calibrationTestEquipment", "校准检定设备"),
-    MEASURE_ACCOUNT("measureAccount", "measureAccount", "测量工装"),
-    STANDARD_SUPPORT_EQUIPMENT("standardSupportEquipment", "standardSupportEquipment", "标准配套设备"),
-    STANDARD_EQUIPMENT("standardEquipment", "standardEquipment", "标准装置"),
-    FLOW_DEF_EXPORT("flowDefData", "flowDefData", "流程定义"),
-    STAFF_CERTIFICATE("certificate", "certificate", "计量人员证书"),
-    CHECK_INFO("checkInfo", "checkInfo", "设备管理点检测"),
-    EQUIPMENT_APPLY("equipmentApply", "equipmentApply", "设备借用"),
-    STANDARD_EQUIPMENT_REMIND("equipmentApplyRemind", "equipmentApplyRemind", "标准装置到期提醒"),
-    METER_PRICE("meterPrice", "meterPrice", "价格库"),
-    METER_STAFF("meterStaff", "meterStaff", "计量人员"),
-    STANDARD_EQUIPMENT_APPLY("standardEquipmentApply", "standardEquipmentApply", "标准装置申请"),
-    STATE_MANAGE_APPLY("stateManage", "stateManage", "状态管理"),
-    METER_ACCEPTANCE_CHECK("acceptanceCheck", "acceptanceCheck", "设备检修保养验收单"),
-    CUSTOMER_EXPORT("customerData", "customerData", "客户信息"),
-    ORDER_EXPORT("orderData", "orderData", "委托书信息"),
-    SAMPLE_EXPORT("sampleData", "sampleData", "样本信息"),
-    EXCHANGE_DATA("exchangeData", "exchangeData", "设备交接单"),
-    DISPATCH_DATA("dispatchData", "dispatchData", "设备收发"),
-    ENVIRONMENT_DATA("environmentData", "environmentData", "环境记录单"),
-    ORIGIN_DATA("originData", "originData", "原始记录"),
-    CERTIFICATE_REPORT("certificateReport", "certificateReport", "证书报告"),
-    ADVICE_EXPORT("adviceData", "adviceData", "客户反馈"),
-    HANDOUT_EXPORT("handoutData", "handoutData", "任务分发列表"),
-    OUTSOURCER_EXPORT("outsourcerData", "outsourcerData", "分包方"),
-    SITE_EXECUTIVE_EXPORT("siteExecutiveData", "siteExecutiveData", "现场测试、校准或检定"),
-    CERTIFICATE_PRINT_EXPORT("certificatePrintData", "certificatePrintData", "证书打印"),
-    DOWNLOAD_TEMPLATE("downloadTemplate", "downloadTemplate", "页面配置"),
-    OUTSOURCER_CERTIFICATE_EXPORT("outsourceCertificateData", "outsourceCertificateData", "分包证书"),
-    SETTLEMENT_INFO_EXPORT("settlementInfoData", "settlementInfoData", "业务结算"),
-    EQUIPMENT_REMIND("equipmentRemind", "equipmentRemind", "设备到期提醒"),
-    AGREEMENT_INFO_EXPORT("agreementInfoData", "agreementInfoData", "合同"),
-    WORK_STATISTICS_EXPORT("workStatisticsData", "workStatisticsData", "实时工作统计"),
-    DEPT_OUTPUT_EXPORT("deptOutputData", "deptOutputData", "部门产值分析"),
-    WORKLOAD_EXPORT("workloadData", "workloadData", "业务工作量分析"),
-    DEPT_COMPREHENSIVE_EXPORT("deptComprehensiveData", "deptComprehensiveData", "部门综合分析"),
-    ENVIRONMENTAL_RECORD("environmentalRecordData", "environmentalRecordData", "现场环境记录");
+    /**
+     * 计量检定业务
+     */
+    OUTSOURCER_EXPORT("outsourcerData", "分包方名录", "分包方名录"),
+    IDENTIFY_EXPORT("identifyData", "计量标识", "计量标识"),
+    ORDER_EXPORT("orderData", "任务单", "任务单"),
+    DISPATCH_DATA("dispatchData", "设备收发", "设备收发"),
+    HANDOUT_EXPORT("handoutData", "任务分发", "任务分发"),
+    SITE_EXECUTIVE_EXPORT("siteExecutiveData", "现场测试、校准或检定", "现场测试、校准或检定"),
+    CERTIFICATE_REPORT("certificateReport", "证书审批", "证书审批"),
+    CERTIFICATE_CHANGE_APPLY("certificateChangeApply", "证书报告补充或更换申请单", "证书报告补充或更换申请单"),
+    CERTIFICATE_PRINT("certificatePrintData", "证书打印审批", "证书打印审批"),
+    DEPT_EXECUTIVE_TASK("deptExecutiveTaskData", "实验室任务", "实验室任务"),
+    MY_EXECUTIVE_TASK("myExecutiveTaskData", "我的任务", "我的任务"),
+    OUTSOURCE_ASSESS("outsourceAssess", "测试、校准或检定工作分包评审表", "测试、校准或检定工作分包评审表"),
+    OUTSOURCE_PROTOCOL("outsourceProtocol", "测试、校准或检定工作分包协议书", "测试、校准或检定工作分包协议书"),
+
+    /**
+     * 系统管理
+     */
+    SIGN_EXPORT("signData", "签名", "签名"),
+    TEMPLATE_EXPORT("templateData", "文件模板", "文件模板"),
+    FLOW_DEF_EXPORT("flowDefData", "流程定义", "流程定义"),
+    DOWNLOAD_TEMPLATE("downloadTemplate", "流程定义", "页面配置");
 
     ExportEnum(String fileName, String sheetName, String description) {
         this.fileName = fileName;
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateRecordTypeCodeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateRecordTypeCodeEnum.java
index 31d913c..a963522 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateRecordTypeCodeEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateRecordTypeCodeEnum.java
@@ -46,4 +46,14 @@
     String SITE_EXECUTIVE_APPROVAL = "01";
     //《现场测试、校准或检定工作记录表》
     String SITE_EXECUTIVE_LOG = "02";
+
+    //测试、校准或检定工作分包协议书
+    String OUTSOURCE_PROTOCOL = "01";
+    //测试、校准或检定工作分包评审表
+    String OUTSOURCE_ACCESS = "02";
+    //测试、校准或检定工作分包通知书
+    String OUTSOURCE_NOTICE = "03";
+    //测试、校准或检定工作分包方名录
+    String OUTSOURCE_INFO = "04";
+
 }
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
index 24b8635..f78bd53 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
@@ -15,6 +15,10 @@
     String CERTIFICATE_CHANGE_APPLY_BEAN_NAME = "certificateChangeApplyBean";
     //现场测试、校准或检定
     String SITE_EXECUTIVE_BEAN_NAME = "siteExecutiveBean";
+    //测试、校准或检定工作分包评审表
+    String OUTSOURCE_ASSESS_BEAN_NAME = "outsourceAssessBean";
+    //测试、校准或检定工作分包协议书
+    String OUTSOURCE_PROTOCOL_BEAN_NAME = "outsourceProtocolBean";
 
     /*********************************设备与装置************************************/
     //设备台账
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 b21c661..6b86fd1 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
@@ -18,6 +18,8 @@
     OUTSOURCER_APPROVAL(OUTSOURCER_BEAN_NAME, ""),
     CERTIFICATE_CHANGE_APPROVAL(CERTIFICATE_CHANGE_APPLY_BEAN_NAME, ""),
     SITE_EXECUTIVE_APPROVAL(SITE_EXECUTIVE_BEAN_NAME, ""),
+    OUTSOURCE_ASSESS_APPROVAL(OUTSOURCE_ASSESS_BEAN_NAME, ""),
+    OUTSOURCE_PROTOCOL_APPROVAL(OUTSOURCE_PROTOCOL_BEAN_NAME, ""),
 
     ACTION_STATUS_MAP(new HashMap<String, AwareActionStatusEnum>() {
         {
@@ -47,6 +49,10 @@
             put(ApplyFromIdEnum.CERTIFICATE_CHANGE_APPROVAL.getCode(), CERTIFICATE_CHANGE_APPROVAL);
             //现场测试、校准或检定审批
             put(ApplyFromIdEnum.SITE_EXECUTIVE_APPROVAL.getCode(), SITE_EXECUTIVE_APPROVAL);
+            //测试、校准或检定工作分包评审表
+            put(ApplyFromIdEnum.OUTSOURCE_ASSESS_APPROVAL.getCode(), OUTSOURCE_ASSESS_APPROVAL);
+            //测试、校准或检定工作分包协议书
+            put(ApplyFromIdEnum.OUTSOURCE_PROTOCOL_APPROVAL.getCode(), OUTSOURCE_PROTOCOL_APPROVAL);
         }
     });
     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 934405e..c7410bd 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
@@ -9,6 +9,8 @@
     CERTIFICATE_CHANGE_APPROVAL("jljdywzsbchghsqd", MessageSourceModuleEnum.BUSINESS.getCode(), "证书/报告补充或更换申请单"),
     OUTSOURCER_APPROVAL("jljdywcsjzhgfbfml", MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定合格分包方名录"),
     SITE_EXECUTIVE_APPROVAL("jljdywxccsjzsp", MessageSourceModuleEnum.BUSINESS.getCode(), "现场测试、校准或检定审批"),
+    OUTSOURCE_ASSESS_APPROVAL("jljdywcsjzfbpsb", MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包评审表"),
+    OUTSOURCE_PROTOCOL_APPROVAL("jljdywcsjzfbxys", MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包协议书"),
 
 
     /*******************************************设备与装置*********************************************/
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/GeneralApprovalMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/GeneralApprovalMapper.java
index 4fb7344..0c9d6ae 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/GeneralApprovalMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/GeneralApprovalMapper.java
@@ -17,8 +17,4 @@
 
     Page<O> selectBatchForApprovalList(Page<O> page, @Param("request") R request, @Param("businessKeys") List<String> businessKeys);
 
-//    Page<O> selectListPage(Page<O> page, @Param("request") R request);
-
-//    Long selectMaxNo();
-
 }
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceAssessMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceAssessMapper.java
index 7867bb8..ba59009 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceAssessMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceAssessMapper.java
@@ -1,7 +1,12 @@
 package com.casic.missiles.mapper.business;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.business.outsource.OutsourceAssessApprovalListRequest;
+import com.casic.missiles.mapper.GeneralApprovalMapper;
 import com.casic.missiles.model.business.BizBusinessOutsourceAssess;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * <p>
@@ -11,6 +16,10 @@
  * @author wangpeng
  * @since 2023-08-16
  */
-public interface BizBusinessOutsourceAssessMapper extends BaseMapper<BizBusinessOutsourceAssess> {
+public interface BizBusinessOutsourceAssessMapper extends GeneralApprovalMapper<BizBusinessOutsourceAssess, BizBusinessOutsourceAssess, OutsourceAssessApprovalListRequest> {
+
+    Page<BizBusinessOutsourceAssess> selectBatchForApprovalList(Page<BizBusinessOutsourceAssess> page, @Param("request") OutsourceAssessApprovalListRequest request, @Param("businessKeys") List<String> businessKeys);
+
+    Long selectMaxProjectNo();
 
 }
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceProtocolMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceProtocolMapper.java
new file mode 100644
index 0000000..e6aba35
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceProtocolMapper.java
@@ -0,0 +1,24 @@
+package com.casic.missiles.mapper.business;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.business.outsource.OutsourceProtocolApprovalListRequest;
+import com.casic.missiles.mapper.GeneralApprovalMapper;
+import com.casic.missiles.model.business.BizBusinessOutsourceProtocol;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 计量检定业务-分包管理-测试、校准或检定工作分包协议书 Mapper 接口
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-08-24
+ */
+public interface BizBusinessOutsourceProtocolMapper extends GeneralApprovalMapper<BizBusinessOutsourceProtocol, BizBusinessOutsourceProtocol, OutsourceProtocolApprovalListRequest> {
+
+    Page<BizBusinessOutsourceProtocol> selectBatchForApprovalList(Page<BizBusinessOutsourceProtocol> page, @Param("request") OutsourceProtocolApprovalListRequest request, @Param("businessKeys") List<String> businessKeys);
+
+    Long selectMaxProtocolNo();
+}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/EnvLocationInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/EnvLocationInfoMapper.java
new file mode 100644
index 0000000..49eff87
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/EnvLocationInfoMapper.java
@@ -0,0 +1,21 @@
+package com.casic.missiles.mapper.resource;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.resource.environment.LocationListRequest;
+import com.casic.missiles.dto.resource.environment.LocationListResponse;
+import com.casic.missiles.model.resource.EnvLocationInfo;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * <p>
+ * 实验室环境监控系统-设备表 Mapper 接口
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-06-07
+ */
+public interface EnvLocationInfoMapper extends BaseMapper<EnvLocationInfo> {
+
+    Page<LocationListResponse> selectLocationListPage(Page<LocationListResponse> page, @Param("request") LocationListRequest request);
+}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java
index de124db..85ed0f7 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java
@@ -1,7 +1,9 @@
 package com.casic.missiles.mapper.system;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.dto.system.SignDetailResponse;
+import com.casic.missiles.dto.system.SignListRequest;
 import com.casic.missiles.model.system.SystemSign;
 import org.apache.ibatis.annotations.Param;
 
@@ -22,4 +24,8 @@
     SignDetailResponse selectSignDetailById(Long id);
 
     List<SystemSign> selectUsableSignList(@Param("userId") Long userId);
+
+    Page<SystemSign> selectSignListPage(Page<SystemSign> page, @Param("request") SignListRequest request);
+
+    List<SystemSign> selectSignList(@Param("request") SignListRequest request);
 }
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateChangeApplyMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateChangeApplyMapper.xml
index d798447..c496092 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateChangeApplyMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateChangeApplyMapper.xml
@@ -30,31 +30,31 @@
         SELECT *
         FROM biz_business_certificate_change_apply
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.changeApplyNo != null and request.changeApplyNo !=''">
+        <if test="request != null and request.changeApplyNo != null and request.changeApplyNo !=''">
             and change_apply_no like concat('%',#{request.changeApplyNo},'%')
         </if>
-        <if test="request.changeReportNo != null and request.changeReportNo !=''">
+        <if test="request != null and request.changeReportNo != null and request.changeReportNo !=''">
             and change_report_no like concat('%',#{request.changeReportNo},'%')
         </if>
-        <if test="request.changeReportName != null and request.changeReportName !=''">
+        <if test="request != null and request.changeReportName != null and request.changeReportName !=''">
             and change_report_name like concat('%',#{request.changeReportName},'%')
         </if>
-        <if test="request.changeType != null and request.changeType !=''">
+        <if test="request != null and request.changeType != null and request.changeType !=''">
             and change_type = #{request.changeType}
         </if>
-        <if test="request.createUserName != null and request.createUserName !=''">
+        <if test="request != null and request.createUserName != null and request.createUserName !=''">
             and create_user_name like concat('%',#{request.createUserName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificatePrintMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificatePrintMapper.xml
index b66cd99..49c0ac8 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificatePrintMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificatePrintMapper.xml
@@ -31,34 +31,34 @@
         LEFT JOIN biz_business_order_sample_relation bosr ON (bosr.order_id = bcr.order_id AND bosr.sample_id = bcr.sample_id)
         LEFT JOIN biz_business_order_info boi ON boi.id = bosr.order_id
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and bcp.approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.printStatus != null and request.printStatus !=''">
+        <if test="request != null and request.printStatus != null and request.printStatus !=''">
             and print_status = #{request.printStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and bcp.create_user_id = #{request.createUserId}
         </if>
-        <if test="request.certificateReportNo != null and request.certificateReportNo !=''">
+        <if test="request != null and request.certificateReportNo != null and request.certificateReportNo !=''">
             and bcr.certificate_report_no like concat('%',#{request.certificateReportNo},'%')
         </if>
-        <if test="request.certificateReportName != null and request.certificateReportName !=''">
+        <if test="request != null and request.certificateReportName != null and request.certificateReportName !=''">
             and bcr.certificate_report_name like concat('%',#{request.certificateReportName},'%')
         </if>
-        <if test="request.customerName != null and request.customerName !=''">
+        <if test="request != null and request.customerName != null and request.customerName !=''">
             and boi.customer_name like concat('%',#{request.customerName},'%')
         </if>
-        <if test="request.sampleNo != null and request.sampleNo !=''">
+        <if test="request != null and request.sampleNo != null and request.sampleNo !=''">
             and bosr.sample_no like concat('%',#{request.sampleNo},'%')
         </if>
-        <if test="request.sampleName != null and request.sampleName !=''">
+        <if test="request != null and request.sampleName != null and request.sampleName !=''">
             and bosr.sample_name like concat('%',#{request.sampleName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and bcp.create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and bcp.create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml
index b366034..767695d 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml
@@ -46,33 +46,37 @@
         SELECT bcr.*, bosr.sample_no, bosr.sample_name, bosr.sample_model, rsi.staff_name
         FROM biz_business_certificate_report bcr
         LEFT JOIN biz_business_order_sample_relation bosr ON (bosr.order_id = bcr.order_id AND bosr.sample_id = bcr.sample_id)
+        LEFT JOIN biz_business_order_info boi ON boi.id = bcr.order_id
         LEFT JOIN biz_resource_staff_info rsi ON rsi.id = bcr.measure_person_id
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and bcr.approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and bcr.create_user_id = #{request.createUserId}
         </if>
-        <if test="request.certificateReportNo != null and request.certificateReportNo !=''">
+        <if test="request != null and request.customerId != null and request.customerId !=''">
+            and boi.customer_id = #{request.customerId}
+        </if>
+        <if test="request != null and request.certificateReportNo != null and request.certificateReportNo !=''">
             and bcr.certificate_report_no like concat('%',#{request.certificateReportNo},'%')
         </if>
-        <if test="request.certificateReportName != null and request.certificateReportName !=''">
+        <if test="request != null and request.certificateReportName != null and request.certificateReportName !=''">
             and bcr.certificate_report_name like concat('%',#{request.certificateReportName},'%')
         </if>
-        <if test="request.sampleNo != null and request.sampleNo !=''">
+        <if test="request != null and request.sampleNo != null and request.sampleNo !=''">
             and bosr.sample_no like concat('%',#{request.sampleNo},'%')
         </if>
-        <if test="request.measureCategory != null and request.measureCategory !=''">
+        <if test="request != null and request.measureCategory != null and request.measureCategory !=''">
             and bcr.measure_category = #{request.measureCategory}
         </if>
-        <if test="request.measurePerson != null and request.measurePerson !=''">
+        <if test="request != null and request.measurePerson != null and request.measurePerson !=''">
             and rsi.staff_name like concat('%',#{request.measurePerson},'%')
         </if>
-        <if test="request.calibrationTimeStart != null and request.calibrationTimeStart !=''">
+        <if test="request != null and request.calibrationTimeStart != null and request.calibrationTimeStart !=''">
             and bcr.calibration_time &gt;= #{request.calibrationTimeStart}
         </if>
-        <if test="request.calibrationTimeEnd != null and request.calibrationTimeEnd !=''">
+        <if test="request != null and request.calibrationTimeEnd != null and request.calibrationTimeEnd !=''">
             and bcr.calibration_time &lt;= #{request.calibrationTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceAssessMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceAssessMapper.xml
index d0fcf8b..c22c101 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceAssessMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceAssessMapper.xml
@@ -7,6 +7,8 @@
         <id column="id" property="id" />
         <result column="project_no" property="projectNo" />
         <result column="project_name" property="projectName" />
+        <result column="lab_code" property="labCode" />
+        <result column="group_code" property="groupCode" />
         <result column="applicant_id" property="applicantId" />
         <result column="applicant_name" property="applicantName" />
         <result column="applicant_time" property="applicantTime" />
@@ -31,7 +33,45 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, project_no, project_name, applicant_id, applicant_name, applicant_time, minio_file_name, remark, create_user_id, create_user_name, outsourcer_id, pre_start_time, pre_end_time, outsource_reason, pre_cost, approval_status, process_id, approve_situation, traceability, test_method, technique_ability, create_time, update_time
+        id, project_no, project_name, lab_code, group_code, applicant_id, applicant_name, applicant_time, minio_file_name, remark, create_user_id, create_user_name, outsourcer_id, pre_start_time, pre_end_time, outsource_reason, pre_cost, approval_status, process_id, approve_situation, traceability, test_method, technique_ability, create_time, update_time
     </sql>
 
+    <select id="selectMaxProjectNo" resultType="java.lang.Long">
+        SELECT IFNULL(max(RIGHT(project_no, 3)), 0) from biz_business_outsource_assess
+    </select>
+
+    <select id="selectBatchForApprovalList" resultMap="BaseResultMap">
+        SELECT bboa.*, bboi.outsourcer_name, bboi.director
+        FROM biz_business_outsource_assess bboa
+        LEFT JOIN biz_business_outsourcer_info bboi ON bboa.outsourcer_id = bboi.id
+        WHERE 1=1
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
+            and bboa.approval_status = #{request.approvalStatus}
+        </if>
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
+            and bboa.create_user_id = #{request.createUserId}
+        </if>
+        <if test="request != null and request.projectNo != null and request.projectNo !=''">
+            and bboa.project_no like concat('%',#{request.projectNo},'%')
+        </if>
+        <if test="request != null and request.outsourcerName != null and request.outsourcerName !=''">
+            and bboi.outsourcer_name like concat('%',#{request.outsourcerName},'%')
+        </if>
+        <if test="request != null and request.applicantName != null and request.applicantName !=''">
+            and bboa.applicant_name like concat('%',#{request.applicantName},'%')
+        </if>
+        <if test="request != null and request.applicantTimeStart != null and request.applicantTimeStart !=''">
+            and bboa.applicant_time &gt;= #{request.applicantTimeStart}
+        </if>
+        <if test="request != null and request.applicantTimeEnd != null and request.applicantTimeEnd !=''">
+            and bboa.applicant_time &lt;= #{request.applicantTimeEnd}
+        </if>
+        <if test="businessKeys != null">
+            and bboa.id in
+            <foreach collection="businessKeys" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
+        ORDER BY bboa.create_time DESC
+    </select>
 </mapper>

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java
index bb0c50f..13a699b 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java
@@ -12,6 +12,7 @@
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.IGeneralApprovalService;
+import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
@@ -19,6 +20,7 @@
 import org.springframework.web.bind.annotation.RequestBody;
 
 import javax.validation.Valid;
+import java.util.List;
 import java.util.Objects;
 
 /**
@@ -117,4 +119,17 @@
         }
         return baseApprovalService.failUpdate(request);
     }
+
+    public List<O> exportList(@RequestBody @Valid R request) throws Exception {
+        List<O> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = baseApprovalService.listExportByIds(request.getIds());
+        } else {
+            list = baseApprovalService.listExport(request);
+        }
+        for (O record : list) {
+            DictCodeUtils.convertDictCodeToName(record);
+        }
+        return list;
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java
index 8a90961..d775831 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java
@@ -5,6 +5,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.business.certificate.CertificateChangeApplyApprovalListRequest;
 import com.casic.missiles.dto.business.certificate.CertificateChangeApplySaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessCertificateChangeApply;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
@@ -20,6 +21,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -48,4 +50,12 @@
         }
         return changeApplyService.saveChangeApply(request);
     }
+
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody CertificateChangeApplyApprovalListRequest request) throws Exception {
+        List<BizBusinessCertificateChangeApply> list = super.exportList(request);
+        super.exportExcel(BizBusinessCertificateChangeApply.class, list, ExportEnum.CERTIFICATE_CHANGE_APPLY.getSheetName());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java
index 5fc4b07..af8230e 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java
@@ -9,6 +9,7 @@
 import com.casic.missiles.dto.business.certificate.CertificatePrintApprovalListRequest;
 import com.casic.missiles.dto.business.certificate.CertificatePrintListResponse;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.enums.business.CertificatePrintStatusEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessCertificatePrintLog;
@@ -18,10 +19,16 @@
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.io.IOException;
+import java.util.List;
 import java.util.Objects;
 
 /**
@@ -98,4 +105,16 @@
         });
         return certificatePrintService.certificatePrintLog(idDTO.getId());
     }
+
+    @ApiOperation("证书打印审批导出")
+    @PostMapping("/listExport")
+    public void exportList(@RequestBody CertificatePrintApprovalListRequest request) throws IOException {
+        List<CertificatePrintListResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = certificatePrintService.listByIds(request.getIds());
+        } else {
+            list = certificatePrintService.list(request);
+        }
+        super.exportExcel(CertificatePrintListResponse.class, list, ExportEnum.CERTIFICATE_PRINT.getSheetName());
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java
index 63b06dc..6b2efd5 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java
@@ -6,6 +6,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.business.certificate.CertificateReportApprovalListRequest;
 import com.casic.missiles.dto.business.certificate.CertificateReportSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessCertificateReport;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
@@ -21,6 +22,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -50,7 +52,7 @@
         return certificateReportService.saveCertificateReport(request);
     }
 
-    @ApiOperation("证书审批详情（基本信息）")
+    @ApiOperation("详情（基本信息）")
     @PostMapping("/detail")
     public ReturnDTO<BizBusinessCertificateReport> detail(@RequestBody @Valid BaseDetailRequest request, BindingResult bindingResult) throws Exception {
         if(bindingResult.hasErrors()){
@@ -59,4 +61,11 @@
         return certificateReportService.detail(request);
     }
 
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody CertificateReportApprovalListRequest request) throws Exception {
+        List<BizBusinessCertificateReport> list = super.exportList(request);
+        super.exportExcel(BizBusinessCertificateReport.class, list, ExportEnum.CERTIFICATE_REPORT.getSheetName());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java
index 46b26bd..57c0809 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java
@@ -10,20 +10,21 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.business.identify.IdentifyListRequest;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessIdentifyInfo;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.business.IBizBusinessIdentifyInfoService;
+import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import javax.validation.Valid;
+import java.util.List;
 import java.util.Objects;
 
 /**
@@ -57,16 +58,13 @@
         return identifyInfoService.addIdentify(identifyInfo);
     }
 
-    @ApiOperation("标识打印更新")
+    @ApiOperation("标识打印更新（更新打印时间）")
     @PostMapping("/update")
-    public ReturnDTO updateIdentify(@RequestBody @Valid BizBusinessIdentifyInfo identifyInfo, BindingResult bindingResult) {
-        Assert.isFalse(Objects.isNull(identifyInfo.getId()), () -> {
+    public ReturnDTO updateIdentify(@RequestBody @Valid IdDTO idDTO) {
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        Assert.isFalse(bindingResult.hasErrors(), () -> {
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        });
-        return identifyInfoService.updateIdentify(identifyInfo);
+        return identifyInfoService.updateIdentify(idDTO.getId());
     }
 
     @ApiOperation("标识打印删除")
@@ -77,4 +75,37 @@
         });
         return identifyInfoService.deleteIdentify(idDTO.getId());
     }
+
+    @ApiOperation("标识打印导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody @Valid IdentifyListRequest request, BindingResult bindingResult) throws Exception {
+        if (bindingResult.hasErrors()) {
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        List<BizBusinessIdentifyInfo> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = identifyInfoService.listByIds(request.getIds());
+        } else {
+            list = identifyInfoService.list(request);
+        }
+        for (BizBusinessIdentifyInfo record : list) {
+            DictCodeUtils.convertDictCodeToName(record);
+        }
+        super.exportExcel(BizBusinessIdentifyInfo.class, list, ExportEnum.IDENTIFY_EXPORT.getSheetName());
+    }
+
+
+    // TODO: 2023/8/23 查询设备信息，4个底部按钮查设备（按钮的作用就是前端用来调不同接口、用来区分中间即将展示的标识），前端弹窗选设备，在确定保存时前端根据底部按钮判断传入设备类型deviceType字典code
+    // TODO: 2023/8/23 接口：查受检设备（第1个按钮），查设备台账（后3个按钮同一接口），查询之后前端根据标志类型的不同加到中间页面时进行判断（按产品给的对应表）
+    // TODO: 2023/8/23 提供二维码接口，前端在加到中间页面时调用一下
+
+    @ApiOperation("设备二维码")
+    @PostMapping("/equipment/qrCode")
+    public ReturnDTO<String> equipmentQrCode(@RequestBody @Valid IdDTO idDTO) {
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return identifyInfoService.equipmentQrCode(idDTO.getId());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java
index 707be6e..7e0453d 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java
@@ -117,7 +117,7 @@
     }
 
     @ApiOperation("任务单导出")
-    @PostMapping("/export")
+    @PostMapping("/listExport")
     public void orderExport(@RequestBody @Valid OrderListRequest request, HttpServletResponse response) {
         businessOrderService.orderExport(request, response);
     }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java
index 529a6ce..51432be 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java
@@ -1,9 +1,28 @@
 package com.casic.missiles.controller.business;
 
+import com.casic.missiles.controller.GeneralApprovalController;
+import com.casic.missiles.dto.BaseApprovalSubmitRequest;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.business.outsource.OutsourceAssessApprovalListRequest;
+import com.casic.missiles.dto.business.outsource.OutsourceAssessSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
+import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.model.business.BizBusinessOutsourceAssess;
+import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
+import com.casic.missiles.service.IGeneralApprovalService;
+import com.casic.missiles.service.business.IBizBusinessOutsourceAssessService;
 import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.BindingResult;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.validation.Valid;
+import java.util.List;
+
 /**
  * <p>
  * 计量检定业务-分包管理-测试、校准或检定工作分包评审表 前端控制器
@@ -15,6 +34,27 @@
 @Api(tags = "分包管理-测试、校准或检定工作分包评审表")
 @RestController
 @RequestMapping("/business/outsource/assess")
-public class BizBusinessOutsourceAssessController {
+public class BizBusinessOutsourceAssessController extends GeneralApprovalController<BizBusinessOutsourceAssess, BizBusinessOutsourceAssess, OutsourceAssessApprovalListRequest, BaseApprovalSubmitRequest> {
+    @Autowired
+    private IBizBusinessOutsourceAssessService outsourceAssessService;
 
+    public BizBusinessOutsourceAssessController(IGeneralApprovalService<BizBusinessOutsourceAssess, BizBusinessOutsourceAssess, OutsourceAssessApprovalListRequest, BaseApprovalSubmitRequest> baseApprovalService) {
+        super(baseApprovalService);
+    }
+
+    @ApiOperation("草稿箱-保存")
+    @PostMapping("/save")
+    public ReturnDTO<OutsourceAssessSaveResponse> saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceAssess request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        return outsourceAssessService.saveOutsourceAssess(request);
+    }
+
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception {
+        List<BizBusinessOutsourceAssess> list = super.exportList(request);
+        super.exportExcel(BizBusinessOutsourceAssess.class, list, ExportEnum.OUTSOURCE_ASSESS.getSheetName());
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java
new file mode 100644
index 0000000..9adef18
--- /dev/null
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java
@@ -0,0 +1,60 @@
+package com.casic.missiles.controller.business;
+
+import com.casic.missiles.controller.GeneralApprovalController;
+import com.casic.missiles.dto.BaseApprovalSubmitRequest;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.business.outsource.OutsourceProtocolApprovalListRequest;
+import com.casic.missiles.dto.business.outsource.OutsourceProtocolSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
+import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.model.business.BizBusinessOutsourceProtocol;
+import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
+import com.casic.missiles.service.IGeneralApprovalService;
+import com.casic.missiles.service.business.IBizBusinessOutsourceProtocolService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.BindingResult;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.validation.Valid;
+import java.util.List;
+
+/**
+ * <p>
+ * 计量检定业务-分包管理-测试、校准或检定工作分包协议书 前端控制器
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-08-24
+ */
+@Api(tags = "分包管理-测试、校准或检定工作分包协议书")
+@RestController
+@RequestMapping("/business/outsource/protocol")
+public class BizBusinessOutsourceProtocolController extends GeneralApprovalController<BizBusinessOutsourceProtocol, BizBusinessOutsourceProtocol, OutsourceProtocolApprovalListRequest, BaseApprovalSubmitRequest> {
+    @Autowired
+    private IBizBusinessOutsourceProtocolService outsourceProtocolService;
+
+    public BizBusinessOutsourceProtocolController(IGeneralApprovalService<BizBusinessOutsourceProtocol, BizBusinessOutsourceProtocol, OutsourceProtocolApprovalListRequest, BaseApprovalSubmitRequest> baseApprovalService) {
+        super(baseApprovalService);
+    }
+
+    @ApiOperation("草稿箱-保存")
+    @PostMapping("/save")
+    public ReturnDTO<OutsourceProtocolSaveResponse> saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceProtocol request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        return outsourceProtocolService.saveOutsourceProtocol(request);
+    }
+
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody OutsourceProtocolApprovalListRequest request) throws Exception {
+        List<BizBusinessOutsourceProtocol> list = super.exportList(request);
+        super.exportExcel(BizBusinessOutsourceProtocol.class, list, ExportEnum.OUTSOURCE_PROTOCOL.getSheetName());
+    }
+}
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java
index 097f645..f0f0943 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java
@@ -17,7 +17,6 @@
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.IGeneralApprovalService;
 import com.casic.missiles.service.business.IBizBusinessOutsourcerInfoService;
-import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -71,19 +70,8 @@
 
     @ApiOperation("分包方导出")
     @PostMapping("/listExport")
-    public void export(@RequestBody @Valid OutsourcerInfoApprovalListRequest request, BindingResult bindingResult) throws Exception {
-        if (bindingResult.hasErrors()) {
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        }
-        List<BizBusinessOutsourcerInfo> list;
-        if (!CollectionUtils.isEmpty(request.getIds())) {
-            list = outsourcerInfoService.listByIds(request.getIds());
-        } else {
-            list = outsourcerInfoService.list(request);
-        }
-        for (BizBusinessOutsourcerInfo record : list) {
-            DictCodeUtils.convertDictCodeToName(record);
-        }
+    public void export(@RequestBody OutsourcerInfoApprovalListRequest request) throws Exception {
+        List<BizBusinessOutsourcerInfo> list = super.exportList(request);
         super.exportExcel(BizBusinessOutsourcerInfo.class, list, ExportEnum.OUTSOURCER_EXPORT.getSheetName());
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java
index c2cbf9f..0410918 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java
@@ -17,11 +17,9 @@
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.IGeneralApprovalService;
 import com.casic.missiles.service.business.IBizBusinessSiteExecutiveInfoService;
-import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -60,7 +58,7 @@
         return siteExecutiveInfoService.saveSiteExecutiveInfo(siteExecutiveInfo);
     }
 
-    @ApiOperation("现场检测详情")
+    @ApiOperation("详情")
     @PostMapping("/detail")
     public ReturnDTO<SiteExecutiveDetailResponse> siteExecutiveDetail(@RequestBody @Valid IdDTO idDTO) throws Exception {
         Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
@@ -69,21 +67,10 @@
         return ReturnUtil.success(siteExecutiveInfoService.detail(idDTO.getId()));
     }
 
-    @ApiOperation("现场检测导出")
+    @ApiOperation("导出")
     @PostMapping("/listExport")
-    public void export(@RequestBody @Valid SiteExecutiveApprovalListRequest request, BindingResult bindingResult) throws Exception {
-        if (bindingResult.hasErrors()) {
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        }
-        List<SiteExecutiveApprovalListResponse> list;
-        if (!CollectionUtils.isEmpty(request.getIds())) {
-            list = siteExecutiveInfoService.listInfoByIds(request.getIds());
-        } else {
-            list = siteExecutiveInfoService.listInfo(request);
-        }
-        for (SiteExecutiveApprovalListResponse record : list) {
-            DictCodeUtils.convertDictCodeToName(record);
-        }
+    public void export(@RequestBody SiteExecutiveApprovalListRequest request) throws Exception {
+        List<SiteExecutiveApprovalListResponse> list = super.exportList(request);
         super.exportExcel(SiteExecutiveApprovalListResponse.class, list, ExportEnum.SITE_EXECUTIVE_EXPORT.getSheetName());
     }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
index 7e793cd..a92e209 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
@@ -55,7 +55,7 @@
 
     @ApiOperation("设备收发列表导出")
     @PostMapping("/export")
-    public void exportList(@RequestBody @Valid SampleDispatchListRequest request) throws IOException {
+    public void exportList(@RequestBody SampleDispatchListRequest request) throws IOException {
         List<SampleDispatchListResponse> list;
         if (!CollectionUtils.isEmpty(request.getIds())) {
             list = dispatchService.listByIds(request.getIds());
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java
index cdc77fc..d120fd4 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java
@@ -7,6 +7,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.business.labExecutive.*;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.business.IBusinessLabExecutiveInfoService;
@@ -14,6 +15,7 @@
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.*;
 
@@ -32,7 +34,7 @@
     @Autowired
     private IBusinessLabExecutiveInfoService labExecutiveInfoService;
 
-    @ApiOperation("实验室检测-部门检测-查询各状态列表（待检测、检测中、检测完）")
+    @ApiOperation("实验室任务-查询各状态列表（待检测、检测中、检测完）")
     @PostMapping("/deptExecutive/List")
     public ReturnDTO<PageInfoBT<SampleLabExecutiveListResponse>> queryDeptExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
@@ -43,10 +45,19 @@
         return ReturnUtil.success(super.packForBT(labExecutiveInfoService.deptLabExecutiveListPage(page, labExecutiveListRequest)));
     }
 
-    /**
-     * 实验室检测-我的检测-查询各状态列表（待检测、检测中、检测完）
-     */
-    @ApiOperation("实验室检测-我的检测-查询各状态列表（待检测、检测中、检测完）")
+    @ApiOperation("实验室任务导出")
+    @PostMapping("/deptExecutive/export")
+    public void deptExportList(@RequestBody @Valid SampleLabExecutiveListRequest request) throws Exception {
+        List<SampleLabExecutiveListResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = labExecutiveInfoService.deptLabExecutiveListByIds(request.getMeasureStatus(), request.getIds());
+        } else {
+            list = labExecutiveInfoService.deptLabExecutiveList(request);
+        }
+        super.exportExcel(SampleLabExecutiveListResponse.class, list, ExportEnum.DEPT_EXECUTIVE_TASK.getSheetName());
+    }
+
+    @ApiOperation("我的任务-查询各状态列表（待检测、检测中、检测完）")
     @PostMapping("/myExecutive/list")
     public ReturnDTO<PageInfoBT<SampleLabExecutiveListResponse>> queryMyExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
@@ -57,19 +68,25 @@
         return ReturnUtil.success(super.packForBT(labExecutiveInfoService.myLabExecutiveListPage(page, labExecutiveListRequest)));
     }
 
-    /**
-     * 实验室检测-我的检测-查询各状态样品数量（待检测、检测中、检测完）
-     */
-    @ApiOperation("实验室检测-我的检测-查询各状态样品数量（待检测、检测中、检测完）")
+    @ApiOperation("我的任务导出")
+    @PostMapping("/myExecutive/export")
+    public void exportList(@RequestBody @Valid SampleLabExecutiveListRequest request) throws Exception {
+        List<SampleLabExecutiveListResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = labExecutiveInfoService.myLabExecutiveListByIds(request.getMeasureStatus(), request.getIds());
+        } else {
+            list = labExecutiveInfoService.myLabExecutiveList(request);
+        }
+        super.exportExcel(SampleLabExecutiveListResponse.class, list, ExportEnum.MY_EXECUTIVE_TASK.getSheetName());
+    }
+
+    @ApiOperation("我的任务-查询各状态样品数量（待检测、检测中、检测完）")
     @GetMapping("/myExecutive/amount")
     public ReturnDTO<List<SampleAmountResponse>> queryMyExecutiveAmount() {
         return ReturnUtil.success(labExecutiveInfoService.myExecutiveAmount());
     }
 
-    /**
-     * 实验室检测-部门检测-分配（分配给具体人员）
-     */
-    @ApiOperation("实验室检测-部门检测-分配按钮（分配给具体人员）")
+    @ApiOperation("实验室任务-分配按钮（分配给具体人员）")
     @PostMapping("/deptExecutive/allocate")
     public ReturnDTO allocateStaff(@RequestBody @Valid SampleAllocateRequest sampleAllocateRequest, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -78,10 +95,7 @@
         return labExecutiveInfoService.allocateStaff(sampleAllocateRequest);
     }
 
-    /**
-     * 实验室检测-我的检测-检定人扫描收入（待检测->检测中）
-     */
-    @ApiOperation("实验室检测-我的检测-检定人扫描收入（待检测->检测中）")
+    @ApiOperation("我的任务-检定人扫描收入（待检测->检测中）")
     @PostMapping("/myExecutive/receive")
     public ReturnDTO sampleReceive(@RequestBody @Valid List<SampleOperateRequest> requestList, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -90,10 +104,7 @@
         return labExecutiveInfoService.sampleReceive(requestList);
     }
 
-    /**
-     * 实验室检测-负责人/检定人扫描检完（检测中->检测完）
-     */
-    @ApiOperation("实验室检测-负责人/检定人扫描检完（检测中->检测完）")
+    @ApiOperation("实验室任务-负责人/检定人扫描检完（检测中->检测完）")
     @PostMapping("/myExecutive/complete")
     public ReturnDTO sampleExecutiveComplete(@RequestBody @Valid List<SampleOperateRequest> requestList, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -102,10 +113,7 @@
         return labExecutiveInfoService.sampleExecutiveComplete(requestList);
     }
 
-    /**
-     * 实验室检测-部门检测/我的检测 编辑（只能修改应出具证书）
-     */
-    @ApiOperation("实验室检测-部门检测/我的检测 编辑（只能修改应出具证书）")
+    @ApiOperation("实验室任务/我的任务 编辑（只能修改应出具证书）")
     @PostMapping("/executive/update")
     public ReturnDTO updateExecutive(@RequestBody @Valid UpdateExecutiveRequest request, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -114,10 +122,7 @@
         return labExecutiveInfoService.updateExecutive(request);
     }
 
-    /**
-     * 实验室检测-部门检测/我的检测 详情
-     */
-    @ApiOperation("实验室检测-部门检测/我的检测 详情")
+    @ApiOperation("实验室任务/我的任务 详情")
     @PostMapping("/executive/detail")
     public ReturnDTO<ExecutiveDetailResponse> executiveDetail(@RequestBody @Valid ExecutiveDetailRequest request, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
@@ -131,7 +136,7 @@
      * 退回后会将下一个要执行的实验室检测状态更新为待分配，将后面的实验室顺序变更为连续（都进行减1）
      * 最后一个检测的实验室退回，等分发员再增加实验室或设备收发中的已收入直接手动点击完成
      */
-    @ApiOperation("实验室检测-部门检测/我的检测 退回（待检测/检测中->退回）")
+    @ApiOperation("实验室任务/我的任务 退回（待检测/检测中->退回）")
     @PostMapping("/executive/sendBack")
     public ReturnDTO executiveSendBack(@RequestBody @Valid ExecutiveSendBackRequest request, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -140,9 +145,6 @@
         return labExecutiveInfoService.sampleExecutiveSendBack(request);
     }
 
-    /**
-     * 分发员编辑实验室检测列表
-     */
     @ApiOperation("分发员编辑实验室检测列表")
     @PostMapping("/handOut/updateList")
     public ReturnDTO updateExecutiveList(@RequestBody @Valid UpdateExecutiveListRequest request, BindingResult bindingResult) {
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java
index 48a67ed..0c04f31 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java
@@ -10,6 +10,7 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.resource.customer.CustomerApprovalListRequest;
 import com.casic.missiles.dto.resource.customer.CustomerSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceCustomerInfo;
@@ -26,6 +27,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -55,6 +57,13 @@
         return customerInfoService.saveCustomerInfo(request);
     }
 
+    @ApiOperation("委托方名录导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody CustomerApprovalListRequest request) throws Exception {
+        List<BizResourceCustomerInfo> list = super.exportList(request);
+        super.exportExcel(BizResourceCustomerInfo.class, list, ExportEnum.CUSTOMER_INFO.getSheetName());
+    }
+
     @ApiOperation("委托方人员列表（分页）")
     @PostMapping("/person/listPage")
     public ReturnDTO<PageInfoBT<BizResourceCustomerStaff>> personListPage(@RequestBody IdDTO idDto) {
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
index 972ed4b..6418ea5 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
@@ -5,6 +5,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.resource.customer.SuggestFormApprovalListRequest;
 import com.casic.missiles.dto.resource.customer.SuggestFormSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceCustomerSuggestForm;
@@ -20,6 +21,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -50,4 +52,11 @@
         return suggestFormService.saveSuggestForm(request);
     }
 
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody SuggestFormApprovalListRequest request) throws Exception {
+        List<BizResourceCustomerSuggestForm> list = super.exportList(request);
+        super.exportExcel(BizResourceCustomerSuggestForm.class, list, ExportEnum.CUSTOMER_SUGGEST_FORM.getSheetName());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java
index 1934d1a..9e07eab 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java
@@ -15,12 +15,16 @@
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.resource.IEnvEnvironmentRecordConfigService;
 import com.casic.missiles.service.resource.IEnvEnvironmentRecordDataService;
+import com.casic.missiles.service.resource.IEnvLocationInfoService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
 import java.util.List;
@@ -39,6 +43,8 @@
     private IEnvEnvironmentRecordDataService environmentRecordDataService;
     @Autowired
     private IEnvEnvironmentRecordConfigService environmentRecordConfigService;
+    @Autowired
+    private IEnvLocationInfoService locationInfoService;
 
     @ApiOperation("环境记录单数据列表/详情")
     @PostMapping("/data/listPage")
@@ -95,4 +101,11 @@
         });
         return environmentRecordConfigService.deleteEnvironmentRecordConfig(idDTO.getId());
     }
+
+    @ApiOperation("地点列表")
+    @PostMapping("/location/listPage")
+    public ReturnDTO<PageInfoBT<LocationListResponse>> locationListPage(@RequestBody @Valid LocationListRequest request) {
+        Page<LocationListResponse> page = PageFactory.defaultPage();
+        return ReturnUtil.success(super.packForBT(locationInfoService.listPage(page, request)));
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java
index 82efe3f..e9561fa 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java
@@ -10,6 +10,7 @@
 import com.casic.missiles.dto.resource.seal.SealLogListRequest;
 import com.casic.missiles.dto.resource.seal.SealNoteApprovalListRequest;
 import com.casic.missiles.dto.resource.seal.SealNoteSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceSealUseLog;
@@ -27,6 +28,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -58,6 +60,13 @@
         return sealUseNoteService.saveSeal(request);
     }
 
+    @ApiOperation("印章使用登记导出（列表和导出中去掉经办人和监印人）")
+    @PostMapping("/listExport")
+    public void export(@RequestBody SealNoteApprovalListRequest request) throws Exception {
+        List<BizResourceSealUseNote> list = super.exportList(request);
+        super.exportExcel(BizResourceSealUseNote.class, list, ExportEnum.SEAL_NOTE.getSheetName());
+    }
+
     // TODO: 2023/7/28 印章使用日志：系统中使用印章时插入数据库
 
     @ApiOperation("印章使用日志列表（分页）")
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java
index 9b674fc..06b6521 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java
@@ -9,16 +9,20 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.resource.staff.StaffCertRequest;
 import com.casic.missiles.dto.resource.staff.StaffCertResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.service.resource.IBizResourceStaffInfoService;
 import com.casic.missiles.service.resource.IBizResourceStaffVerifierService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.List;
+
 /**
  * @Description:
  * @Author: wangpeng
@@ -41,9 +45,21 @@
         return ReturnUtil.success(super.packForBT(responsePage));
     }
 
+    @ApiOperation("证书逾期提醒导出")
+    @PostMapping("/listExport")
+    public void exportList(@RequestBody StaffCertRequest request) throws Exception {
+        List<StaffCertResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = staffInfoService.certListByIds(request.getIds());
+        } else {
+            list = staffInfoService.certList(request);
+        }
+        super.exportExcel(StaffCertResponse.class, list, ExportEnum.STAFF_CERTIFICATE_EXPIRE.getSheetName());
+    }
+
     @ApiOperation("证书逾期提醒")
     @PostMapping("/expirationReminder")
-    public ReturnDTO expirationReminder(@RequestBody IdDTO idDto) {
-        return verifierService.expirationReminder(idDto);
+    public ReturnDTO expirationReminder(@RequestBody IdDTO idDTO) {
+        return verifierService.expirationReminder(idDTO);
     }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java
index 3b251ad..a6e7850 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java
@@ -12,6 +12,7 @@
 import com.casic.missiles.dto.resource.staff.StaffListRequest;
 import com.casic.missiles.dto.resource.staff.TrainListRequest;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.*;
@@ -22,7 +23,10 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
 import java.util.List;
@@ -52,8 +56,19 @@
             throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
         }
         Page<BizResourceStaffInfo> page = PageFactory.defaultPage();
-        Page<BizResourceStaffInfo> responsePage = staffInfoService.listPage(page, request);
-        return ReturnUtil.success(super.packForBT(responsePage));
+        return ReturnUtil.success(super.packForBT(staffInfoService.listPage(page, request)));
+    }
+
+    @ApiOperation("人员登记导出")
+    @PostMapping("/listExport")
+    public void exportList(@RequestBody StaffListRequest request) throws Exception {
+        List<BizResourceStaffInfo> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = staffInfoService.listByIds(request.getIds());
+        } else {
+            list = staffInfoService.list(request);
+        }
+        super.exportExcel(BizResourceStaffInfo.class, list, ExportEnum.STAFF_INFO.getSheetName());
     }
 
     @ApiOperation("人员登记详情基础信息")
@@ -85,9 +100,9 @@
 
     @ApiOperation("科研教育列表（分页）")
     @PostMapping("/education/listPage")
-    public ReturnDTO<PageInfoBT<BizResourceStaffEducation>> educationListPage(@RequestBody IdDTO idDto) {
+    public ReturnDTO<PageInfoBT<BizResourceStaffEducation>> educationListPage(@RequestBody IdDTO idDTO) {
         Page<BizResourceStaffEducation> page = PageFactory.defaultPage();
-        Page<BizResourceStaffEducation> responsePage = staffInfoService.educationListPage(page, idDto);
+        Page<BizResourceStaffEducation> responsePage = staffInfoService.educationListPage(page, idDTO);
         return ReturnUtil.success(super.packForBT(responsePage));
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java
index af6aa86..d85d84a 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java
@@ -9,6 +9,7 @@
 import com.casic.missiles.dto.resource.outsideService.SupplierApprovalListRequest;
 import com.casic.missiles.dto.resource.outsideService.SupplierSaveResponse;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceSupplierAbility;
@@ -67,6 +68,13 @@
         return ReturnUtil.success(supplierInfoService.detail(idDTO.getId()));
     }
 
+    @ApiOperation("合格供方导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody SupplierApprovalListRequest request) throws Exception {
+        List<BizResourceSupplierInfo> list = super.exportList(request);
+        super.exportExcel(BizResourceSupplierInfo.class, list, ExportEnum.SUPPLIER_INFO.getSheetName());
+    }
+
     @ApiOperation("供方人员列表（分页）")
     @PostMapping("/person/listPage")
     public ReturnDTO<PageInfoBT<BizResourceSupplierPerson>> personListPage(@RequestBody IdDTO idDTO) {
diff --git a/casic-metering-api/src/main/resources/config/application.yml b/casic-metering-api/src/main/resources/config/application.yml
index 350db5f..ecff521 100644
--- a/casic-metering-api/src/main/resources/config/application.yml
+++ b/casic-metering-api/src/main/resources/config/application.yml
@@ -126,7 +126,7 @@
     #作者
     author: wangpeng
     #待生成对象表名
-    table-name: biz_equipment_technical_target_approval,biz_equipment_attachment_approval,biz_equipment_checkpoint_approval
+    table-name: biz_business_outsource_protocol
 
 reminder:
   #节点--common模块config包 ReminderNodeConfig配置
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
index 4a19e4e..d47d552 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
@@ -53,6 +53,7 @@
     SUGGEST_FORM_SAVE_FAILED(2509, "委托方意见登记表保存至草稿箱失败"),
     EXAMINE_FORM_SAVE_FAILED(2510, "要求、委托书及合同评审表保存至草稿箱失败"),
     CUSTOMER_EXIST_SAVE_FAILED(2511, "该委托方已存在，请重新选择"),
+    DUPLICATE_LOCATION_NO(2512, "地点编号已存在"),
 
     /**
      * 计量检定业务模块
@@ -68,6 +69,8 @@
     COMPLETE_SAMPLE_NOT_EXIST(2609, "检测中不存在扫描收入的样品"),
     CANNOT_CHANGE_MEASURE_INFO(2610, "无法更改非当前登录用户的检测信息"),
     NON_EXIST_ORDER_OR_SAMPLE(2611, "不存在该委托单或该委托单下的样品"),
+    OUTSOURCE_ACCESS_SAVE_FAILED(2612, "测试、校准或检定工作分包评审表保存至草稿箱失败"),
+    OUTSOURCE_PROTOCOL_SAVE_FAILED(2613, "测试、校准或检定工作分包协议书保存至草稿箱失败"),
 
     /**
      * 历史遗留备用
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
index 5089ad1..81a406b 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
@@ -10,54 +10,38 @@
     /**
      * 资源管理
      */
-    ENVIRONMENT_DATA_EXPORT("environmentData", "environmentData", "环境记录单数据"),
+    ENVIRONMENT_DATA_EXPORT("environmentData", "环境记录单数据", "环境记录单数据"),
+    STAFF_INFO("staffInfo", "人员登记", "人员登记"),
+    STAFF_CERTIFICATE_EXPIRE("certificateExpire", "证书逾期提醒", "证书逾期提醒"),
+    SUPPLIER_INFO("supplierInfo", "合格供方名录", "合格供方名录"),
+    CUSTOMER_INFO("customerInfo", "委托方名录", "委托方名录"),
+    CUSTOMER_SUGGEST_FORM("customerSuggestForm", "委托方意见登记表", "委托方意见登记表"),
+    SEAL_NOTE("sealNote", "印章使用登记", "印章使用登记"),
 
-    FILE_EXPORT("meterFileData", "meterFileData", "计量文件信息"),
-    TRAIN_PLAN_EXPORT("trainPlanData", "trainPlanData", "培训计划"),
-    TRAIN_LOG_EXPORT("trainLogData", "trainLogData", "培训记录"),
-    METER_ORGANIZE_EXPORT("meterOrganizeData", "meterOrganizeData", "计量组织"),
-    TRACE_SUPPLIER_EXPORT("traceSupplierData", "traceSupplierData", "溯源供方"),
-    SIGN_EXPORT("signData", "signData", "签名/签章"),
-    TEMPLATE_EXPORT("templateData", "templateData", "原始记录模板/证书报告模板"),
-    FIXED_ASSETS("meterFixedAssets", "meterFixedAssets", "固定资产"),
-    METER_EQUIPMENT("meterEquipment", "meterEquipment", "测量设备"),
-    CALIBRATION_TEST_EQUIPMENT("calibrationTestEquipment", "calibrationTestEquipment", "校准检定设备"),
-    MEASURE_ACCOUNT("measureAccount", "measureAccount", "测量工装"),
-    STANDARD_SUPPORT_EQUIPMENT("standardSupportEquipment", "standardSupportEquipment", "标准配套设备"),
-    STANDARD_EQUIPMENT("standardEquipment", "standardEquipment", "标准装置"),
-    FLOW_DEF_EXPORT("flowDefData", "flowDefData", "流程定义"),
-    STAFF_CERTIFICATE("certificate", "certificate", "计量人员证书"),
-    CHECK_INFO("checkInfo", "checkInfo", "设备管理点检测"),
-    EQUIPMENT_APPLY("equipmentApply", "equipmentApply", "设备借用"),
-    STANDARD_EQUIPMENT_REMIND("equipmentApplyRemind", "equipmentApplyRemind", "标准装置到期提醒"),
-    METER_PRICE("meterPrice", "meterPrice", "价格库"),
-    METER_STAFF("meterStaff", "meterStaff", "计量人员"),
-    STANDARD_EQUIPMENT_APPLY("standardEquipmentApply", "standardEquipmentApply", "标准装置申请"),
-    STATE_MANAGE_APPLY("stateManage", "stateManage", "状态管理"),
-    METER_ACCEPTANCE_CHECK("acceptanceCheck", "acceptanceCheck", "设备检修保养验收单"),
-    CUSTOMER_EXPORT("customerData", "customerData", "客户信息"),
-    ORDER_EXPORT("orderData", "orderData", "委托书信息"),
-    SAMPLE_EXPORT("sampleData", "sampleData", "样本信息"),
-    EXCHANGE_DATA("exchangeData", "exchangeData", "设备交接单"),
-    DISPATCH_DATA("dispatchData", "dispatchData", "设备收发"),
-    ENVIRONMENT_DATA("environmentData", "environmentData", "环境记录单"),
-    ORIGIN_DATA("originData", "originData", "原始记录"),
-    CERTIFICATE_REPORT("certificateReport", "certificateReport", "证书报告"),
-    ADVICE_EXPORT("adviceData", "adviceData", "客户反馈"),
-    HANDOUT_EXPORT("handoutData", "handoutData", "任务分发列表"),
-    OUTSOURCER_EXPORT("outsourcerData", "outsourcerData", "分包方"),
-    SITE_EXECUTIVE_EXPORT("siteExecutiveData", "siteExecutiveData", "现场测试、校准或检定"),
-    CERTIFICATE_PRINT_EXPORT("certificatePrintData", "certificatePrintData", "证书打印"),
-    DOWNLOAD_TEMPLATE("downloadTemplate", "downloadTemplate", "页面配置"),
-    OUTSOURCER_CERTIFICATE_EXPORT("outsourceCertificateData", "outsourceCertificateData", "分包证书"),
-    SETTLEMENT_INFO_EXPORT("settlementInfoData", "settlementInfoData", "业务结算"),
-    EQUIPMENT_REMIND("equipmentRemind", "equipmentRemind", "设备到期提醒"),
-    AGREEMENT_INFO_EXPORT("agreementInfoData", "agreementInfoData", "合同"),
-    WORK_STATISTICS_EXPORT("workStatisticsData", "workStatisticsData", "实时工作统计"),
-    DEPT_OUTPUT_EXPORT("deptOutputData", "deptOutputData", "部门产值分析"),
-    WORKLOAD_EXPORT("workloadData", "workloadData", "业务工作量分析"),
-    DEPT_COMPREHENSIVE_EXPORT("deptComprehensiveData", "deptComprehensiveData", "部门综合分析"),
-    ENVIRONMENTAL_RECORD("environmentalRecordData", "environmentalRecordData", "现场环境记录");
+    /**
+     * 计量检定业务
+     */
+    OUTSOURCER_EXPORT("outsourcerData", "分包方名录", "分包方名录"),
+    IDENTIFY_EXPORT("identifyData", "计量标识", "计量标识"),
+    ORDER_EXPORT("orderData", "任务单", "任务单"),
+    DISPATCH_DATA("dispatchData", "设备收发", "设备收发"),
+    HANDOUT_EXPORT("handoutData", "任务分发", "任务分发"),
+    SITE_EXECUTIVE_EXPORT("siteExecutiveData", "现场测试、校准或检定", "现场测试、校准或检定"),
+    CERTIFICATE_REPORT("certificateReport", "证书审批", "证书审批"),
+    CERTIFICATE_CHANGE_APPLY("certificateChangeApply", "证书报告补充或更换申请单", "证书报告补充或更换申请单"),
+    CERTIFICATE_PRINT("certificatePrintData", "证书打印审批", "证书打印审批"),
+    DEPT_EXECUTIVE_TASK("deptExecutiveTaskData", "实验室任务", "实验室任务"),
+    MY_EXECUTIVE_TASK("myExecutiveTaskData", "我的任务", "我的任务"),
+    OUTSOURCE_ASSESS("outsourceAssess", "测试、校准或检定工作分包评审表", "测试、校准或检定工作分包评审表"),
+    OUTSOURCE_PROTOCOL("outsourceProtocol", "测试、校准或检定工作分包协议书", "测试、校准或检定工作分包协议书"),
+
+    /**
+     * 系统管理
+     */
+    SIGN_EXPORT("signData", "签名", "签名"),
+    TEMPLATE_EXPORT("templateData", "文件模板", "文件模板"),
+    FLOW_DEF_EXPORT("flowDefData", "流程定义", "流程定义"),
+    DOWNLOAD_TEMPLATE("downloadTemplate", "流程定义", "页面配置");
 
     ExportEnum(String fileName, String sheetName, String description) {
         this.fileName = fileName;
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateRecordTypeCodeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateRecordTypeCodeEnum.java
index 31d913c..a963522 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateRecordTypeCodeEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateRecordTypeCodeEnum.java
@@ -46,4 +46,14 @@
     String SITE_EXECUTIVE_APPROVAL = "01";
     //《现场测试、校准或检定工作记录表》
     String SITE_EXECUTIVE_LOG = "02";
+
+    //测试、校准或检定工作分包协议书
+    String OUTSOURCE_PROTOCOL = "01";
+    //测试、校准或检定工作分包评审表
+    String OUTSOURCE_ACCESS = "02";
+    //测试、校准或检定工作分包通知书
+    String OUTSOURCE_NOTICE = "03";
+    //测试、校准或检定工作分包方名录
+    String OUTSOURCE_INFO = "04";
+
 }
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
index 24b8635..f78bd53 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
@@ -15,6 +15,10 @@
     String CERTIFICATE_CHANGE_APPLY_BEAN_NAME = "certificateChangeApplyBean";
     //现场测试、校准或检定
     String SITE_EXECUTIVE_BEAN_NAME = "siteExecutiveBean";
+    //测试、校准或检定工作分包评审表
+    String OUTSOURCE_ASSESS_BEAN_NAME = "outsourceAssessBean";
+    //测试、校准或检定工作分包协议书
+    String OUTSOURCE_PROTOCOL_BEAN_NAME = "outsourceProtocolBean";
 
     /*********************************设备与装置************************************/
     //设备台账
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 b21c661..6b86fd1 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
@@ -18,6 +18,8 @@
     OUTSOURCER_APPROVAL(OUTSOURCER_BEAN_NAME, ""),
     CERTIFICATE_CHANGE_APPROVAL(CERTIFICATE_CHANGE_APPLY_BEAN_NAME, ""),
     SITE_EXECUTIVE_APPROVAL(SITE_EXECUTIVE_BEAN_NAME, ""),
+    OUTSOURCE_ASSESS_APPROVAL(OUTSOURCE_ASSESS_BEAN_NAME, ""),
+    OUTSOURCE_PROTOCOL_APPROVAL(OUTSOURCE_PROTOCOL_BEAN_NAME, ""),
 
     ACTION_STATUS_MAP(new HashMap<String, AwareActionStatusEnum>() {
         {
@@ -47,6 +49,10 @@
             put(ApplyFromIdEnum.CERTIFICATE_CHANGE_APPROVAL.getCode(), CERTIFICATE_CHANGE_APPROVAL);
             //现场测试、校准或检定审批
             put(ApplyFromIdEnum.SITE_EXECUTIVE_APPROVAL.getCode(), SITE_EXECUTIVE_APPROVAL);
+            //测试、校准或检定工作分包评审表
+            put(ApplyFromIdEnum.OUTSOURCE_ASSESS_APPROVAL.getCode(), OUTSOURCE_ASSESS_APPROVAL);
+            //测试、校准或检定工作分包协议书
+            put(ApplyFromIdEnum.OUTSOURCE_PROTOCOL_APPROVAL.getCode(), OUTSOURCE_PROTOCOL_APPROVAL);
         }
     });
     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 934405e..c7410bd 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
@@ -9,6 +9,8 @@
     CERTIFICATE_CHANGE_APPROVAL("jljdywzsbchghsqd", MessageSourceModuleEnum.BUSINESS.getCode(), "证书/报告补充或更换申请单"),
     OUTSOURCER_APPROVAL("jljdywcsjzhgfbfml", MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定合格分包方名录"),
     SITE_EXECUTIVE_APPROVAL("jljdywxccsjzsp", MessageSourceModuleEnum.BUSINESS.getCode(), "现场测试、校准或检定审批"),
+    OUTSOURCE_ASSESS_APPROVAL("jljdywcsjzfbpsb", MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包评审表"),
+    OUTSOURCE_PROTOCOL_APPROVAL("jljdywcsjzfbxys", MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包协议书"),
 
 
     /*******************************************设备与装置*********************************************/
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/GeneralApprovalMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/GeneralApprovalMapper.java
index 4fb7344..0c9d6ae 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/GeneralApprovalMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/GeneralApprovalMapper.java
@@ -17,8 +17,4 @@
 
     Page<O> selectBatchForApprovalList(Page<O> page, @Param("request") R request, @Param("businessKeys") List<String> businessKeys);
 
-//    Page<O> selectListPage(Page<O> page, @Param("request") R request);
-
-//    Long selectMaxNo();
-
 }
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceAssessMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceAssessMapper.java
index 7867bb8..ba59009 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceAssessMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceAssessMapper.java
@@ -1,7 +1,12 @@
 package com.casic.missiles.mapper.business;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.business.outsource.OutsourceAssessApprovalListRequest;
+import com.casic.missiles.mapper.GeneralApprovalMapper;
 import com.casic.missiles.model.business.BizBusinessOutsourceAssess;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * <p>
@@ -11,6 +16,10 @@
  * @author wangpeng
  * @since 2023-08-16
  */
-public interface BizBusinessOutsourceAssessMapper extends BaseMapper<BizBusinessOutsourceAssess> {
+public interface BizBusinessOutsourceAssessMapper extends GeneralApprovalMapper<BizBusinessOutsourceAssess, BizBusinessOutsourceAssess, OutsourceAssessApprovalListRequest> {
+
+    Page<BizBusinessOutsourceAssess> selectBatchForApprovalList(Page<BizBusinessOutsourceAssess> page, @Param("request") OutsourceAssessApprovalListRequest request, @Param("businessKeys") List<String> businessKeys);
+
+    Long selectMaxProjectNo();
 
 }
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceProtocolMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceProtocolMapper.java
new file mode 100644
index 0000000..e6aba35
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceProtocolMapper.java
@@ -0,0 +1,24 @@
+package com.casic.missiles.mapper.business;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.business.outsource.OutsourceProtocolApprovalListRequest;
+import com.casic.missiles.mapper.GeneralApprovalMapper;
+import com.casic.missiles.model.business.BizBusinessOutsourceProtocol;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 计量检定业务-分包管理-测试、校准或检定工作分包协议书 Mapper 接口
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-08-24
+ */
+public interface BizBusinessOutsourceProtocolMapper extends GeneralApprovalMapper<BizBusinessOutsourceProtocol, BizBusinessOutsourceProtocol, OutsourceProtocolApprovalListRequest> {
+
+    Page<BizBusinessOutsourceProtocol> selectBatchForApprovalList(Page<BizBusinessOutsourceProtocol> page, @Param("request") OutsourceProtocolApprovalListRequest request, @Param("businessKeys") List<String> businessKeys);
+
+    Long selectMaxProtocolNo();
+}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/EnvLocationInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/EnvLocationInfoMapper.java
new file mode 100644
index 0000000..49eff87
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/EnvLocationInfoMapper.java
@@ -0,0 +1,21 @@
+package com.casic.missiles.mapper.resource;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.resource.environment.LocationListRequest;
+import com.casic.missiles.dto.resource.environment.LocationListResponse;
+import com.casic.missiles.model.resource.EnvLocationInfo;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * <p>
+ * 实验室环境监控系统-设备表 Mapper 接口
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-06-07
+ */
+public interface EnvLocationInfoMapper extends BaseMapper<EnvLocationInfo> {
+
+    Page<LocationListResponse> selectLocationListPage(Page<LocationListResponse> page, @Param("request") LocationListRequest request);
+}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java
index de124db..85ed0f7 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java
@@ -1,7 +1,9 @@
 package com.casic.missiles.mapper.system;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.dto.system.SignDetailResponse;
+import com.casic.missiles.dto.system.SignListRequest;
 import com.casic.missiles.model.system.SystemSign;
 import org.apache.ibatis.annotations.Param;
 
@@ -22,4 +24,8 @@
     SignDetailResponse selectSignDetailById(Long id);
 
     List<SystemSign> selectUsableSignList(@Param("userId") Long userId);
+
+    Page<SystemSign> selectSignListPage(Page<SystemSign> page, @Param("request") SignListRequest request);
+
+    List<SystemSign> selectSignList(@Param("request") SignListRequest request);
 }
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateChangeApplyMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateChangeApplyMapper.xml
index d798447..c496092 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateChangeApplyMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateChangeApplyMapper.xml
@@ -30,31 +30,31 @@
         SELECT *
         FROM biz_business_certificate_change_apply
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.changeApplyNo != null and request.changeApplyNo !=''">
+        <if test="request != null and request.changeApplyNo != null and request.changeApplyNo !=''">
             and change_apply_no like concat('%',#{request.changeApplyNo},'%')
         </if>
-        <if test="request.changeReportNo != null and request.changeReportNo !=''">
+        <if test="request != null and request.changeReportNo != null and request.changeReportNo !=''">
             and change_report_no like concat('%',#{request.changeReportNo},'%')
         </if>
-        <if test="request.changeReportName != null and request.changeReportName !=''">
+        <if test="request != null and request.changeReportName != null and request.changeReportName !=''">
             and change_report_name like concat('%',#{request.changeReportName},'%')
         </if>
-        <if test="request.changeType != null and request.changeType !=''">
+        <if test="request != null and request.changeType != null and request.changeType !=''">
             and change_type = #{request.changeType}
         </if>
-        <if test="request.createUserName != null and request.createUserName !=''">
+        <if test="request != null and request.createUserName != null and request.createUserName !=''">
             and create_user_name like concat('%',#{request.createUserName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificatePrintMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificatePrintMapper.xml
index b66cd99..49c0ac8 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificatePrintMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificatePrintMapper.xml
@@ -31,34 +31,34 @@
         LEFT JOIN biz_business_order_sample_relation bosr ON (bosr.order_id = bcr.order_id AND bosr.sample_id = bcr.sample_id)
         LEFT JOIN biz_business_order_info boi ON boi.id = bosr.order_id
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and bcp.approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.printStatus != null and request.printStatus !=''">
+        <if test="request != null and request.printStatus != null and request.printStatus !=''">
             and print_status = #{request.printStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and bcp.create_user_id = #{request.createUserId}
         </if>
-        <if test="request.certificateReportNo != null and request.certificateReportNo !=''">
+        <if test="request != null and request.certificateReportNo != null and request.certificateReportNo !=''">
             and bcr.certificate_report_no like concat('%',#{request.certificateReportNo},'%')
         </if>
-        <if test="request.certificateReportName != null and request.certificateReportName !=''">
+        <if test="request != null and request.certificateReportName != null and request.certificateReportName !=''">
             and bcr.certificate_report_name like concat('%',#{request.certificateReportName},'%')
         </if>
-        <if test="request.customerName != null and request.customerName !=''">
+        <if test="request != null and request.customerName != null and request.customerName !=''">
             and boi.customer_name like concat('%',#{request.customerName},'%')
         </if>
-        <if test="request.sampleNo != null and request.sampleNo !=''">
+        <if test="request != null and request.sampleNo != null and request.sampleNo !=''">
             and bosr.sample_no like concat('%',#{request.sampleNo},'%')
         </if>
-        <if test="request.sampleName != null and request.sampleName !=''">
+        <if test="request != null and request.sampleName != null and request.sampleName !=''">
             and bosr.sample_name like concat('%',#{request.sampleName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and bcp.create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and bcp.create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml
index b366034..767695d 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml
@@ -46,33 +46,37 @@
         SELECT bcr.*, bosr.sample_no, bosr.sample_name, bosr.sample_model, rsi.staff_name
         FROM biz_business_certificate_report bcr
         LEFT JOIN biz_business_order_sample_relation bosr ON (bosr.order_id = bcr.order_id AND bosr.sample_id = bcr.sample_id)
+        LEFT JOIN biz_business_order_info boi ON boi.id = bcr.order_id
         LEFT JOIN biz_resource_staff_info rsi ON rsi.id = bcr.measure_person_id
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and bcr.approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and bcr.create_user_id = #{request.createUserId}
         </if>
-        <if test="request.certificateReportNo != null and request.certificateReportNo !=''">
+        <if test="request != null and request.customerId != null and request.customerId !=''">
+            and boi.customer_id = #{request.customerId}
+        </if>
+        <if test="request != null and request.certificateReportNo != null and request.certificateReportNo !=''">
             and bcr.certificate_report_no like concat('%',#{request.certificateReportNo},'%')
         </if>
-        <if test="request.certificateReportName != null and request.certificateReportName !=''">
+        <if test="request != null and request.certificateReportName != null and request.certificateReportName !=''">
             and bcr.certificate_report_name like concat('%',#{request.certificateReportName},'%')
         </if>
-        <if test="request.sampleNo != null and request.sampleNo !=''">
+        <if test="request != null and request.sampleNo != null and request.sampleNo !=''">
             and bosr.sample_no like concat('%',#{request.sampleNo},'%')
         </if>
-        <if test="request.measureCategory != null and request.measureCategory !=''">
+        <if test="request != null and request.measureCategory != null and request.measureCategory !=''">
             and bcr.measure_category = #{request.measureCategory}
         </if>
-        <if test="request.measurePerson != null and request.measurePerson !=''">
+        <if test="request != null and request.measurePerson != null and request.measurePerson !=''">
             and rsi.staff_name like concat('%',#{request.measurePerson},'%')
         </if>
-        <if test="request.calibrationTimeStart != null and request.calibrationTimeStart !=''">
+        <if test="request != null and request.calibrationTimeStart != null and request.calibrationTimeStart !=''">
             and bcr.calibration_time &gt;= #{request.calibrationTimeStart}
         </if>
-        <if test="request.calibrationTimeEnd != null and request.calibrationTimeEnd !=''">
+        <if test="request != null and request.calibrationTimeEnd != null and request.calibrationTimeEnd !=''">
             and bcr.calibration_time &lt;= #{request.calibrationTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceAssessMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceAssessMapper.xml
index d0fcf8b..c22c101 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceAssessMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceAssessMapper.xml
@@ -7,6 +7,8 @@
         <id column="id" property="id" />
         <result column="project_no" property="projectNo" />
         <result column="project_name" property="projectName" />
+        <result column="lab_code" property="labCode" />
+        <result column="group_code" property="groupCode" />
         <result column="applicant_id" property="applicantId" />
         <result column="applicant_name" property="applicantName" />
         <result column="applicant_time" property="applicantTime" />
@@ -31,7 +33,45 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, project_no, project_name, applicant_id, applicant_name, applicant_time, minio_file_name, remark, create_user_id, create_user_name, outsourcer_id, pre_start_time, pre_end_time, outsource_reason, pre_cost, approval_status, process_id, approve_situation, traceability, test_method, technique_ability, create_time, update_time
+        id, project_no, project_name, lab_code, group_code, applicant_id, applicant_name, applicant_time, minio_file_name, remark, create_user_id, create_user_name, outsourcer_id, pre_start_time, pre_end_time, outsource_reason, pre_cost, approval_status, process_id, approve_situation, traceability, test_method, technique_ability, create_time, update_time
     </sql>
 
+    <select id="selectMaxProjectNo" resultType="java.lang.Long">
+        SELECT IFNULL(max(RIGHT(project_no, 3)), 0) from biz_business_outsource_assess
+    </select>
+
+    <select id="selectBatchForApprovalList" resultMap="BaseResultMap">
+        SELECT bboa.*, bboi.outsourcer_name, bboi.director
+        FROM biz_business_outsource_assess bboa
+        LEFT JOIN biz_business_outsourcer_info bboi ON bboa.outsourcer_id = bboi.id
+        WHERE 1=1
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
+            and bboa.approval_status = #{request.approvalStatus}
+        </if>
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
+            and bboa.create_user_id = #{request.createUserId}
+        </if>
+        <if test="request != null and request.projectNo != null and request.projectNo !=''">
+            and bboa.project_no like concat('%',#{request.projectNo},'%')
+        </if>
+        <if test="request != null and request.outsourcerName != null and request.outsourcerName !=''">
+            and bboi.outsourcer_name like concat('%',#{request.outsourcerName},'%')
+        </if>
+        <if test="request != null and request.applicantName != null and request.applicantName !=''">
+            and bboa.applicant_name like concat('%',#{request.applicantName},'%')
+        </if>
+        <if test="request != null and request.applicantTimeStart != null and request.applicantTimeStart !=''">
+            and bboa.applicant_time &gt;= #{request.applicantTimeStart}
+        </if>
+        <if test="request != null and request.applicantTimeEnd != null and request.applicantTimeEnd !=''">
+            and bboa.applicant_time &lt;= #{request.applicantTimeEnd}
+        </if>
+        <if test="businessKeys != null">
+            and bboa.id in
+            <foreach collection="businessKeys" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
+        ORDER BY bboa.create_time DESC
+    </select>
 </mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceProtocolMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceProtocolMapper.xml
new file mode 100644
index 0000000..b7b2149
--- /dev/null
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceProtocolMapper.xml
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.mapper.business.BizBusinessOutsourceProtocolMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.business.BizBusinessOutsourceProtocol">
+        <id column="id" property="id" />
+        <result column="protocol_no" property="protocolNo" />
+        <result column="project_name" property="projectName" />
+        <result column="lab_code" property="labCode" />
+        <result column="group_code" property="groupCode" />
+        <result column="outsourcer_id" property="outsourcerId" />
+        <result column="remark" property="remark" />
+        <result column="outsource_no" property="outsourceNo" />
+        <result column="outsource_name" property="outsourceName" />
+        <result column="contacts" property="contacts" />
+        <result column="mobile" property="mobile" />
+        <result column="address" property="address" />
+        <result column="require_date" property="requireDate" />
+        <result column="outsource_cost" property="outsourceCost" />
+        <result column="director" property="director" />
+        <result column="item" property="item" />
+        <result column="requires" property="requires" />
+        <result column="create_user_id" property="createUserId" />
+        <result column="create_user_name" property="createUserName" />
+        <result column="approval_status" property="approvalStatus" />
+        <result column="process_id" property="processId" />
+        <result column="create_time" property="createTime" />
+        <result column="update_time" property="updateTime" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, protocol_no, project_name, lab_code, group_code, outsourcer_id, remark, outsource_no, outsource_name, contacts, mobile, address, require_date, outsource_cost, director, item, requires, create_user_id, create_user_name, approval_status, process_id, create_time, update_time
+    </sql>
+
+    <select id="selectMaxProtocolNo" resultType="java.lang.Long">
+        SELECT IFNULL(max(RIGHT(protocol_no, 3)), 0) from biz_business_outsource_protocol
+    </select>
+
+    <select id="selectBatchForApprovalList" resultMap="BaseResultMap">
+        SELECT *
+        FROM biz_business_outsource_protocol
+        WHERE 1=1
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
+            and approval_status = #{request.approvalStatus}
+        </if>
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
+            and create_user_id = #{request.createUserId}
+        </if>
+        <if test="request != null and request.protocolNo != null and request.protocolNo !=''">
+            and protocol_no like concat('%',#{request.protocolNo},'%')
+        </if>
+        <if test="request != null and request.outsourcerName != null and request.outsourcerName !=''">
+            and outsourcer_name like concat('%',#{request.outsourcerName},'%')
+        </if>
+        <if test="request != null and request.applicantName != null and request.applicantName !=''">
+            and create_user_name like concat('%',#{request.applicantName},'%')
+        </if>
+        <if test="request != null and request.applicantTimeStart != null and request.applicantTimeStart !=''">
+            and create_time &gt;= #{request.applicantTimeStart}
+        </if>
+        <if test="request != null and request.applicantTimeEnd != null and request.applicantTimeEnd !=''">
+            and create_time &lt;= #{request.applicantTimeEnd}
+        </if>
+        <if test="businessKeys != null">
+            and id in
+            <foreach collection="businessKeys" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
+        ORDER BY create_time DESC
+    </select>
+</mapper>

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java
index bb0c50f..13a699b 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java
@@ -12,6 +12,7 @@
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.IGeneralApprovalService;
+import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
@@ -19,6 +20,7 @@
 import org.springframework.web.bind.annotation.RequestBody;
 
 import javax.validation.Valid;
+import java.util.List;
 import java.util.Objects;
 
 /**
@@ -117,4 +119,17 @@
         }
         return baseApprovalService.failUpdate(request);
     }
+
+    public List<O> exportList(@RequestBody @Valid R request) throws Exception {
+        List<O> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = baseApprovalService.listExportByIds(request.getIds());
+        } else {
+            list = baseApprovalService.listExport(request);
+        }
+        for (O record : list) {
+            DictCodeUtils.convertDictCodeToName(record);
+        }
+        return list;
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java
index 8a90961..d775831 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java
@@ -5,6 +5,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.business.certificate.CertificateChangeApplyApprovalListRequest;
 import com.casic.missiles.dto.business.certificate.CertificateChangeApplySaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessCertificateChangeApply;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
@@ -20,6 +21,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -48,4 +50,12 @@
         }
         return changeApplyService.saveChangeApply(request);
     }
+
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody CertificateChangeApplyApprovalListRequest request) throws Exception {
+        List<BizBusinessCertificateChangeApply> list = super.exportList(request);
+        super.exportExcel(BizBusinessCertificateChangeApply.class, list, ExportEnum.CERTIFICATE_CHANGE_APPLY.getSheetName());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java
index 5fc4b07..af8230e 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java
@@ -9,6 +9,7 @@
 import com.casic.missiles.dto.business.certificate.CertificatePrintApprovalListRequest;
 import com.casic.missiles.dto.business.certificate.CertificatePrintListResponse;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.enums.business.CertificatePrintStatusEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessCertificatePrintLog;
@@ -18,10 +19,16 @@
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.io.IOException;
+import java.util.List;
 import java.util.Objects;
 
 /**
@@ -98,4 +105,16 @@
         });
         return certificatePrintService.certificatePrintLog(idDTO.getId());
     }
+
+    @ApiOperation("证书打印审批导出")
+    @PostMapping("/listExport")
+    public void exportList(@RequestBody CertificatePrintApprovalListRequest request) throws IOException {
+        List<CertificatePrintListResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = certificatePrintService.listByIds(request.getIds());
+        } else {
+            list = certificatePrintService.list(request);
+        }
+        super.exportExcel(CertificatePrintListResponse.class, list, ExportEnum.CERTIFICATE_PRINT.getSheetName());
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java
index 63b06dc..6b2efd5 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java
@@ -6,6 +6,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.business.certificate.CertificateReportApprovalListRequest;
 import com.casic.missiles.dto.business.certificate.CertificateReportSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessCertificateReport;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
@@ -21,6 +22,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -50,7 +52,7 @@
         return certificateReportService.saveCertificateReport(request);
     }
 
-    @ApiOperation("证书审批详情（基本信息）")
+    @ApiOperation("详情（基本信息）")
     @PostMapping("/detail")
     public ReturnDTO<BizBusinessCertificateReport> detail(@RequestBody @Valid BaseDetailRequest request, BindingResult bindingResult) throws Exception {
         if(bindingResult.hasErrors()){
@@ -59,4 +61,11 @@
         return certificateReportService.detail(request);
     }
 
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody CertificateReportApprovalListRequest request) throws Exception {
+        List<BizBusinessCertificateReport> list = super.exportList(request);
+        super.exportExcel(BizBusinessCertificateReport.class, list, ExportEnum.CERTIFICATE_REPORT.getSheetName());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java
index 46b26bd..57c0809 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java
@@ -10,20 +10,21 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.business.identify.IdentifyListRequest;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessIdentifyInfo;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.business.IBizBusinessIdentifyInfoService;
+import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import javax.validation.Valid;
+import java.util.List;
 import java.util.Objects;
 
 /**
@@ -57,16 +58,13 @@
         return identifyInfoService.addIdentify(identifyInfo);
     }
 
-    @ApiOperation("标识打印更新")
+    @ApiOperation("标识打印更新（更新打印时间）")
     @PostMapping("/update")
-    public ReturnDTO updateIdentify(@RequestBody @Valid BizBusinessIdentifyInfo identifyInfo, BindingResult bindingResult) {
-        Assert.isFalse(Objects.isNull(identifyInfo.getId()), () -> {
+    public ReturnDTO updateIdentify(@RequestBody @Valid IdDTO idDTO) {
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        Assert.isFalse(bindingResult.hasErrors(), () -> {
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        });
-        return identifyInfoService.updateIdentify(identifyInfo);
+        return identifyInfoService.updateIdentify(idDTO.getId());
     }
 
     @ApiOperation("标识打印删除")
@@ -77,4 +75,37 @@
         });
         return identifyInfoService.deleteIdentify(idDTO.getId());
     }
+
+    @ApiOperation("标识打印导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody @Valid IdentifyListRequest request, BindingResult bindingResult) throws Exception {
+        if (bindingResult.hasErrors()) {
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        List<BizBusinessIdentifyInfo> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = identifyInfoService.listByIds(request.getIds());
+        } else {
+            list = identifyInfoService.list(request);
+        }
+        for (BizBusinessIdentifyInfo record : list) {
+            DictCodeUtils.convertDictCodeToName(record);
+        }
+        super.exportExcel(BizBusinessIdentifyInfo.class, list, ExportEnum.IDENTIFY_EXPORT.getSheetName());
+    }
+
+
+    // TODO: 2023/8/23 查询设备信息，4个底部按钮查设备（按钮的作用就是前端用来调不同接口、用来区分中间即将展示的标识），前端弹窗选设备，在确定保存时前端根据底部按钮判断传入设备类型deviceType字典code
+    // TODO: 2023/8/23 接口：查受检设备（第1个按钮），查设备台账（后3个按钮同一接口），查询之后前端根据标志类型的不同加到中间页面时进行判断（按产品给的对应表）
+    // TODO: 2023/8/23 提供二维码接口，前端在加到中间页面时调用一下
+
+    @ApiOperation("设备二维码")
+    @PostMapping("/equipment/qrCode")
+    public ReturnDTO<String> equipmentQrCode(@RequestBody @Valid IdDTO idDTO) {
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return identifyInfoService.equipmentQrCode(idDTO.getId());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java
index 707be6e..7e0453d 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java
@@ -117,7 +117,7 @@
     }
 
     @ApiOperation("任务单导出")
-    @PostMapping("/export")
+    @PostMapping("/listExport")
     public void orderExport(@RequestBody @Valid OrderListRequest request, HttpServletResponse response) {
         businessOrderService.orderExport(request, response);
     }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java
index 529a6ce..51432be 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java
@@ -1,9 +1,28 @@
 package com.casic.missiles.controller.business;
 
+import com.casic.missiles.controller.GeneralApprovalController;
+import com.casic.missiles.dto.BaseApprovalSubmitRequest;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.business.outsource.OutsourceAssessApprovalListRequest;
+import com.casic.missiles.dto.business.outsource.OutsourceAssessSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
+import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.model.business.BizBusinessOutsourceAssess;
+import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
+import com.casic.missiles.service.IGeneralApprovalService;
+import com.casic.missiles.service.business.IBizBusinessOutsourceAssessService;
 import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.BindingResult;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.validation.Valid;
+import java.util.List;
+
 /**
  * <p>
  * 计量检定业务-分包管理-测试、校准或检定工作分包评审表 前端控制器
@@ -15,6 +34,27 @@
 @Api(tags = "分包管理-测试、校准或检定工作分包评审表")
 @RestController
 @RequestMapping("/business/outsource/assess")
-public class BizBusinessOutsourceAssessController {
+public class BizBusinessOutsourceAssessController extends GeneralApprovalController<BizBusinessOutsourceAssess, BizBusinessOutsourceAssess, OutsourceAssessApprovalListRequest, BaseApprovalSubmitRequest> {
+    @Autowired
+    private IBizBusinessOutsourceAssessService outsourceAssessService;
 
+    public BizBusinessOutsourceAssessController(IGeneralApprovalService<BizBusinessOutsourceAssess, BizBusinessOutsourceAssess, OutsourceAssessApprovalListRequest, BaseApprovalSubmitRequest> baseApprovalService) {
+        super(baseApprovalService);
+    }
+
+    @ApiOperation("草稿箱-保存")
+    @PostMapping("/save")
+    public ReturnDTO<OutsourceAssessSaveResponse> saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceAssess request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        return outsourceAssessService.saveOutsourceAssess(request);
+    }
+
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception {
+        List<BizBusinessOutsourceAssess> list = super.exportList(request);
+        super.exportExcel(BizBusinessOutsourceAssess.class, list, ExportEnum.OUTSOURCE_ASSESS.getSheetName());
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java
new file mode 100644
index 0000000..9adef18
--- /dev/null
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java
@@ -0,0 +1,60 @@
+package com.casic.missiles.controller.business;
+
+import com.casic.missiles.controller.GeneralApprovalController;
+import com.casic.missiles.dto.BaseApprovalSubmitRequest;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.business.outsource.OutsourceProtocolApprovalListRequest;
+import com.casic.missiles.dto.business.outsource.OutsourceProtocolSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
+import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.model.business.BizBusinessOutsourceProtocol;
+import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
+import com.casic.missiles.service.IGeneralApprovalService;
+import com.casic.missiles.service.business.IBizBusinessOutsourceProtocolService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.BindingResult;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.validation.Valid;
+import java.util.List;
+
+/**
+ * <p>
+ * 计量检定业务-分包管理-测试、校准或检定工作分包协议书 前端控制器
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-08-24
+ */
+@Api(tags = "分包管理-测试、校准或检定工作分包协议书")
+@RestController
+@RequestMapping("/business/outsource/protocol")
+public class BizBusinessOutsourceProtocolController extends GeneralApprovalController<BizBusinessOutsourceProtocol, BizBusinessOutsourceProtocol, OutsourceProtocolApprovalListRequest, BaseApprovalSubmitRequest> {
+    @Autowired
+    private IBizBusinessOutsourceProtocolService outsourceProtocolService;
+
+    public BizBusinessOutsourceProtocolController(IGeneralApprovalService<BizBusinessOutsourceProtocol, BizBusinessOutsourceProtocol, OutsourceProtocolApprovalListRequest, BaseApprovalSubmitRequest> baseApprovalService) {
+        super(baseApprovalService);
+    }
+
+    @ApiOperation("草稿箱-保存")
+    @PostMapping("/save")
+    public ReturnDTO<OutsourceProtocolSaveResponse> saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceProtocol request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        return outsourceProtocolService.saveOutsourceProtocol(request);
+    }
+
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody OutsourceProtocolApprovalListRequest request) throws Exception {
+        List<BizBusinessOutsourceProtocol> list = super.exportList(request);
+        super.exportExcel(BizBusinessOutsourceProtocol.class, list, ExportEnum.OUTSOURCE_PROTOCOL.getSheetName());
+    }
+}
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java
index 097f645..f0f0943 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java
@@ -17,7 +17,6 @@
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.IGeneralApprovalService;
 import com.casic.missiles.service.business.IBizBusinessOutsourcerInfoService;
-import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -71,19 +70,8 @@
 
     @ApiOperation("分包方导出")
     @PostMapping("/listExport")
-    public void export(@RequestBody @Valid OutsourcerInfoApprovalListRequest request, BindingResult bindingResult) throws Exception {
-        if (bindingResult.hasErrors()) {
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        }
-        List<BizBusinessOutsourcerInfo> list;
-        if (!CollectionUtils.isEmpty(request.getIds())) {
-            list = outsourcerInfoService.listByIds(request.getIds());
-        } else {
-            list = outsourcerInfoService.list(request);
-        }
-        for (BizBusinessOutsourcerInfo record : list) {
-            DictCodeUtils.convertDictCodeToName(record);
-        }
+    public void export(@RequestBody OutsourcerInfoApprovalListRequest request) throws Exception {
+        List<BizBusinessOutsourcerInfo> list = super.exportList(request);
         super.exportExcel(BizBusinessOutsourcerInfo.class, list, ExportEnum.OUTSOURCER_EXPORT.getSheetName());
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java
index c2cbf9f..0410918 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java
@@ -17,11 +17,9 @@
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.IGeneralApprovalService;
 import com.casic.missiles.service.business.IBizBusinessSiteExecutiveInfoService;
-import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -60,7 +58,7 @@
         return siteExecutiveInfoService.saveSiteExecutiveInfo(siteExecutiveInfo);
     }
 
-    @ApiOperation("现场检测详情")
+    @ApiOperation("详情")
     @PostMapping("/detail")
     public ReturnDTO<SiteExecutiveDetailResponse> siteExecutiveDetail(@RequestBody @Valid IdDTO idDTO) throws Exception {
         Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
@@ -69,21 +67,10 @@
         return ReturnUtil.success(siteExecutiveInfoService.detail(idDTO.getId()));
     }
 
-    @ApiOperation("现场检测导出")
+    @ApiOperation("导出")
     @PostMapping("/listExport")
-    public void export(@RequestBody @Valid SiteExecutiveApprovalListRequest request, BindingResult bindingResult) throws Exception {
-        if (bindingResult.hasErrors()) {
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        }
-        List<SiteExecutiveApprovalListResponse> list;
-        if (!CollectionUtils.isEmpty(request.getIds())) {
-            list = siteExecutiveInfoService.listInfoByIds(request.getIds());
-        } else {
-            list = siteExecutiveInfoService.listInfo(request);
-        }
-        for (SiteExecutiveApprovalListResponse record : list) {
-            DictCodeUtils.convertDictCodeToName(record);
-        }
+    public void export(@RequestBody SiteExecutiveApprovalListRequest request) throws Exception {
+        List<SiteExecutiveApprovalListResponse> list = super.exportList(request);
         super.exportExcel(SiteExecutiveApprovalListResponse.class, list, ExportEnum.SITE_EXECUTIVE_EXPORT.getSheetName());
     }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
index 7e793cd..a92e209 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
@@ -55,7 +55,7 @@
 
     @ApiOperation("设备收发列表导出")
     @PostMapping("/export")
-    public void exportList(@RequestBody @Valid SampleDispatchListRequest request) throws IOException {
+    public void exportList(@RequestBody SampleDispatchListRequest request) throws IOException {
         List<SampleDispatchListResponse> list;
         if (!CollectionUtils.isEmpty(request.getIds())) {
             list = dispatchService.listByIds(request.getIds());
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java
index cdc77fc..d120fd4 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java
@@ -7,6 +7,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.business.labExecutive.*;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.business.IBusinessLabExecutiveInfoService;
@@ -14,6 +15,7 @@
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.*;
 
@@ -32,7 +34,7 @@
     @Autowired
     private IBusinessLabExecutiveInfoService labExecutiveInfoService;
 
-    @ApiOperation("实验室检测-部门检测-查询各状态列表（待检测、检测中、检测完）")
+    @ApiOperation("实验室任务-查询各状态列表（待检测、检测中、检测完）")
     @PostMapping("/deptExecutive/List")
     public ReturnDTO<PageInfoBT<SampleLabExecutiveListResponse>> queryDeptExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
@@ -43,10 +45,19 @@
         return ReturnUtil.success(super.packForBT(labExecutiveInfoService.deptLabExecutiveListPage(page, labExecutiveListRequest)));
     }
 
-    /**
-     * 实验室检测-我的检测-查询各状态列表（待检测、检测中、检测完）
-     */
-    @ApiOperation("实验室检测-我的检测-查询各状态列表（待检测、检测中、检测完）")
+    @ApiOperation("实验室任务导出")
+    @PostMapping("/deptExecutive/export")
+    public void deptExportList(@RequestBody @Valid SampleLabExecutiveListRequest request) throws Exception {
+        List<SampleLabExecutiveListResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = labExecutiveInfoService.deptLabExecutiveListByIds(request.getMeasureStatus(), request.getIds());
+        } else {
+            list = labExecutiveInfoService.deptLabExecutiveList(request);
+        }
+        super.exportExcel(SampleLabExecutiveListResponse.class, list, ExportEnum.DEPT_EXECUTIVE_TASK.getSheetName());
+    }
+
+    @ApiOperation("我的任务-查询各状态列表（待检测、检测中、检测完）")
     @PostMapping("/myExecutive/list")
     public ReturnDTO<PageInfoBT<SampleLabExecutiveListResponse>> queryMyExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
@@ -57,19 +68,25 @@
         return ReturnUtil.success(super.packForBT(labExecutiveInfoService.myLabExecutiveListPage(page, labExecutiveListRequest)));
     }
 
-    /**
-     * 实验室检测-我的检测-查询各状态样品数量（待检测、检测中、检测完）
-     */
-    @ApiOperation("实验室检测-我的检测-查询各状态样品数量（待检测、检测中、检测完）")
+    @ApiOperation("我的任务导出")
+    @PostMapping("/myExecutive/export")
+    public void exportList(@RequestBody @Valid SampleLabExecutiveListRequest request) throws Exception {
+        List<SampleLabExecutiveListResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = labExecutiveInfoService.myLabExecutiveListByIds(request.getMeasureStatus(), request.getIds());
+        } else {
+            list = labExecutiveInfoService.myLabExecutiveList(request);
+        }
+        super.exportExcel(SampleLabExecutiveListResponse.class, list, ExportEnum.MY_EXECUTIVE_TASK.getSheetName());
+    }
+
+    @ApiOperation("我的任务-查询各状态样品数量（待检测、检测中、检测完）")
     @GetMapping("/myExecutive/amount")
     public ReturnDTO<List<SampleAmountResponse>> queryMyExecutiveAmount() {
         return ReturnUtil.success(labExecutiveInfoService.myExecutiveAmount());
     }
 
-    /**
-     * 实验室检测-部门检测-分配（分配给具体人员）
-     */
-    @ApiOperation("实验室检测-部门检测-分配按钮（分配给具体人员）")
+    @ApiOperation("实验室任务-分配按钮（分配给具体人员）")
     @PostMapping("/deptExecutive/allocate")
     public ReturnDTO allocateStaff(@RequestBody @Valid SampleAllocateRequest sampleAllocateRequest, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -78,10 +95,7 @@
         return labExecutiveInfoService.allocateStaff(sampleAllocateRequest);
     }
 
-    /**
-     * 实验室检测-我的检测-检定人扫描收入（待检测->检测中）
-     */
-    @ApiOperation("实验室检测-我的检测-检定人扫描收入（待检测->检测中）")
+    @ApiOperation("我的任务-检定人扫描收入（待检测->检测中）")
     @PostMapping("/myExecutive/receive")
     public ReturnDTO sampleReceive(@RequestBody @Valid List<SampleOperateRequest> requestList, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -90,10 +104,7 @@
         return labExecutiveInfoService.sampleReceive(requestList);
     }
 
-    /**
-     * 实验室检测-负责人/检定人扫描检完（检测中->检测完）
-     */
-    @ApiOperation("实验室检测-负责人/检定人扫描检完（检测中->检测完）")
+    @ApiOperation("实验室任务-负责人/检定人扫描检完（检测中->检测完）")
     @PostMapping("/myExecutive/complete")
     public ReturnDTO sampleExecutiveComplete(@RequestBody @Valid List<SampleOperateRequest> requestList, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -102,10 +113,7 @@
         return labExecutiveInfoService.sampleExecutiveComplete(requestList);
     }
 
-    /**
-     * 实验室检测-部门检测/我的检测 编辑（只能修改应出具证书）
-     */
-    @ApiOperation("实验室检测-部门检测/我的检测 编辑（只能修改应出具证书）")
+    @ApiOperation("实验室任务/我的任务 编辑（只能修改应出具证书）")
     @PostMapping("/executive/update")
     public ReturnDTO updateExecutive(@RequestBody @Valid UpdateExecutiveRequest request, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -114,10 +122,7 @@
         return labExecutiveInfoService.updateExecutive(request);
     }
 
-    /**
-     * 实验室检测-部门检测/我的检测 详情
-     */
-    @ApiOperation("实验室检测-部门检测/我的检测 详情")
+    @ApiOperation("实验室任务/我的任务 详情")
     @PostMapping("/executive/detail")
     public ReturnDTO<ExecutiveDetailResponse> executiveDetail(@RequestBody @Valid ExecutiveDetailRequest request, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
@@ -131,7 +136,7 @@
      * 退回后会将下一个要执行的实验室检测状态更新为待分配，将后面的实验室顺序变更为连续（都进行减1）
      * 最后一个检测的实验室退回，等分发员再增加实验室或设备收发中的已收入直接手动点击完成
      */
-    @ApiOperation("实验室检测-部门检测/我的检测 退回（待检测/检测中->退回）")
+    @ApiOperation("实验室任务/我的任务 退回（待检测/检测中->退回）")
     @PostMapping("/executive/sendBack")
     public ReturnDTO executiveSendBack(@RequestBody @Valid ExecutiveSendBackRequest request, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -140,9 +145,6 @@
         return labExecutiveInfoService.sampleExecutiveSendBack(request);
     }
 
-    /**
-     * 分发员编辑实验室检测列表
-     */
     @ApiOperation("分发员编辑实验室检测列表")
     @PostMapping("/handOut/updateList")
     public ReturnDTO updateExecutiveList(@RequestBody @Valid UpdateExecutiveListRequest request, BindingResult bindingResult) {
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java
index 48a67ed..0c04f31 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java
@@ -10,6 +10,7 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.resource.customer.CustomerApprovalListRequest;
 import com.casic.missiles.dto.resource.customer.CustomerSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceCustomerInfo;
@@ -26,6 +27,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -55,6 +57,13 @@
         return customerInfoService.saveCustomerInfo(request);
     }
 
+    @ApiOperation("委托方名录导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody CustomerApprovalListRequest request) throws Exception {
+        List<BizResourceCustomerInfo> list = super.exportList(request);
+        super.exportExcel(BizResourceCustomerInfo.class, list, ExportEnum.CUSTOMER_INFO.getSheetName());
+    }
+
     @ApiOperation("委托方人员列表（分页）")
     @PostMapping("/person/listPage")
     public ReturnDTO<PageInfoBT<BizResourceCustomerStaff>> personListPage(@RequestBody IdDTO idDto) {
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
index 972ed4b..6418ea5 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
@@ -5,6 +5,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.resource.customer.SuggestFormApprovalListRequest;
 import com.casic.missiles.dto.resource.customer.SuggestFormSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceCustomerSuggestForm;
@@ -20,6 +21,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -50,4 +52,11 @@
         return suggestFormService.saveSuggestForm(request);
     }
 
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody SuggestFormApprovalListRequest request) throws Exception {
+        List<BizResourceCustomerSuggestForm> list = super.exportList(request);
+        super.exportExcel(BizResourceCustomerSuggestForm.class, list, ExportEnum.CUSTOMER_SUGGEST_FORM.getSheetName());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java
index 1934d1a..9e07eab 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java
@@ -15,12 +15,16 @@
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.resource.IEnvEnvironmentRecordConfigService;
 import com.casic.missiles.service.resource.IEnvEnvironmentRecordDataService;
+import com.casic.missiles.service.resource.IEnvLocationInfoService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
 import java.util.List;
@@ -39,6 +43,8 @@
     private IEnvEnvironmentRecordDataService environmentRecordDataService;
     @Autowired
     private IEnvEnvironmentRecordConfigService environmentRecordConfigService;
+    @Autowired
+    private IEnvLocationInfoService locationInfoService;
 
     @ApiOperation("环境记录单数据列表/详情")
     @PostMapping("/data/listPage")
@@ -95,4 +101,11 @@
         });
         return environmentRecordConfigService.deleteEnvironmentRecordConfig(idDTO.getId());
     }
+
+    @ApiOperation("地点列表")
+    @PostMapping("/location/listPage")
+    public ReturnDTO<PageInfoBT<LocationListResponse>> locationListPage(@RequestBody @Valid LocationListRequest request) {
+        Page<LocationListResponse> page = PageFactory.defaultPage();
+        return ReturnUtil.success(super.packForBT(locationInfoService.listPage(page, request)));
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java
index 82efe3f..e9561fa 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java
@@ -10,6 +10,7 @@
 import com.casic.missiles.dto.resource.seal.SealLogListRequest;
 import com.casic.missiles.dto.resource.seal.SealNoteApprovalListRequest;
 import com.casic.missiles.dto.resource.seal.SealNoteSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceSealUseLog;
@@ -27,6 +28,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -58,6 +60,13 @@
         return sealUseNoteService.saveSeal(request);
     }
 
+    @ApiOperation("印章使用登记导出（列表和导出中去掉经办人和监印人）")
+    @PostMapping("/listExport")
+    public void export(@RequestBody SealNoteApprovalListRequest request) throws Exception {
+        List<BizResourceSealUseNote> list = super.exportList(request);
+        super.exportExcel(BizResourceSealUseNote.class, list, ExportEnum.SEAL_NOTE.getSheetName());
+    }
+
     // TODO: 2023/7/28 印章使用日志：系统中使用印章时插入数据库
 
     @ApiOperation("印章使用日志列表（分页）")
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java
index 9b674fc..06b6521 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java
@@ -9,16 +9,20 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.resource.staff.StaffCertRequest;
 import com.casic.missiles.dto.resource.staff.StaffCertResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.service.resource.IBizResourceStaffInfoService;
 import com.casic.missiles.service.resource.IBizResourceStaffVerifierService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.List;
+
 /**
  * @Description:
  * @Author: wangpeng
@@ -41,9 +45,21 @@
         return ReturnUtil.success(super.packForBT(responsePage));
     }
 
+    @ApiOperation("证书逾期提醒导出")
+    @PostMapping("/listExport")
+    public void exportList(@RequestBody StaffCertRequest request) throws Exception {
+        List<StaffCertResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = staffInfoService.certListByIds(request.getIds());
+        } else {
+            list = staffInfoService.certList(request);
+        }
+        super.exportExcel(StaffCertResponse.class, list, ExportEnum.STAFF_CERTIFICATE_EXPIRE.getSheetName());
+    }
+
     @ApiOperation("证书逾期提醒")
     @PostMapping("/expirationReminder")
-    public ReturnDTO expirationReminder(@RequestBody IdDTO idDto) {
-        return verifierService.expirationReminder(idDto);
+    public ReturnDTO expirationReminder(@RequestBody IdDTO idDTO) {
+        return verifierService.expirationReminder(idDTO);
     }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java
index 3b251ad..a6e7850 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java
@@ -12,6 +12,7 @@
 import com.casic.missiles.dto.resource.staff.StaffListRequest;
 import com.casic.missiles.dto.resource.staff.TrainListRequest;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.*;
@@ -22,7 +23,10 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
 import java.util.List;
@@ -52,8 +56,19 @@
             throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
         }
         Page<BizResourceStaffInfo> page = PageFactory.defaultPage();
-        Page<BizResourceStaffInfo> responsePage = staffInfoService.listPage(page, request);
-        return ReturnUtil.success(super.packForBT(responsePage));
+        return ReturnUtil.success(super.packForBT(staffInfoService.listPage(page, request)));
+    }
+
+    @ApiOperation("人员登记导出")
+    @PostMapping("/listExport")
+    public void exportList(@RequestBody StaffListRequest request) throws Exception {
+        List<BizResourceStaffInfo> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = staffInfoService.listByIds(request.getIds());
+        } else {
+            list = staffInfoService.list(request);
+        }
+        super.exportExcel(BizResourceStaffInfo.class, list, ExportEnum.STAFF_INFO.getSheetName());
     }
 
     @ApiOperation("人员登记详情基础信息")
@@ -85,9 +100,9 @@
 
     @ApiOperation("科研教育列表（分页）")
     @PostMapping("/education/listPage")
-    public ReturnDTO<PageInfoBT<BizResourceStaffEducation>> educationListPage(@RequestBody IdDTO idDto) {
+    public ReturnDTO<PageInfoBT<BizResourceStaffEducation>> educationListPage(@RequestBody IdDTO idDTO) {
         Page<BizResourceStaffEducation> page = PageFactory.defaultPage();
-        Page<BizResourceStaffEducation> responsePage = staffInfoService.educationListPage(page, idDto);
+        Page<BizResourceStaffEducation> responsePage = staffInfoService.educationListPage(page, idDTO);
         return ReturnUtil.success(super.packForBT(responsePage));
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java
index af6aa86..d85d84a 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java
@@ -9,6 +9,7 @@
 import com.casic.missiles.dto.resource.outsideService.SupplierApprovalListRequest;
 import com.casic.missiles.dto.resource.outsideService.SupplierSaveResponse;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceSupplierAbility;
@@ -67,6 +68,13 @@
         return ReturnUtil.success(supplierInfoService.detail(idDTO.getId()));
     }
 
+    @ApiOperation("合格供方导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody SupplierApprovalListRequest request) throws Exception {
+        List<BizResourceSupplierInfo> list = super.exportList(request);
+        super.exportExcel(BizResourceSupplierInfo.class, list, ExportEnum.SUPPLIER_INFO.getSheetName());
+    }
+
     @ApiOperation("供方人员列表（分页）")
     @PostMapping("/person/listPage")
     public ReturnDTO<PageInfoBT<BizResourceSupplierPerson>> personListPage(@RequestBody IdDTO idDTO) {
diff --git a/casic-metering-api/src/main/resources/config/application.yml b/casic-metering-api/src/main/resources/config/application.yml
index 350db5f..ecff521 100644
--- a/casic-metering-api/src/main/resources/config/application.yml
+++ b/casic-metering-api/src/main/resources/config/application.yml
@@ -126,7 +126,7 @@
     #作者
     author: wangpeng
     #待生成对象表名
-    table-name: biz_equipment_technical_target_approval,biz_equipment_attachment_approval,biz_equipment_checkpoint_approval
+    table-name: biz_business_outsource_protocol
 
 reminder:
   #节点--common模块config包 ReminderNodeConfig配置
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
index 4a19e4e..d47d552 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
@@ -53,6 +53,7 @@
     SUGGEST_FORM_SAVE_FAILED(2509, "委托方意见登记表保存至草稿箱失败"),
     EXAMINE_FORM_SAVE_FAILED(2510, "要求、委托书及合同评审表保存至草稿箱失败"),
     CUSTOMER_EXIST_SAVE_FAILED(2511, "该委托方已存在，请重新选择"),
+    DUPLICATE_LOCATION_NO(2512, "地点编号已存在"),
 
     /**
      * 计量检定业务模块
@@ -68,6 +69,8 @@
     COMPLETE_SAMPLE_NOT_EXIST(2609, "检测中不存在扫描收入的样品"),
     CANNOT_CHANGE_MEASURE_INFO(2610, "无法更改非当前登录用户的检测信息"),
     NON_EXIST_ORDER_OR_SAMPLE(2611, "不存在该委托单或该委托单下的样品"),
+    OUTSOURCE_ACCESS_SAVE_FAILED(2612, "测试、校准或检定工作分包评审表保存至草稿箱失败"),
+    OUTSOURCE_PROTOCOL_SAVE_FAILED(2613, "测试、校准或检定工作分包协议书保存至草稿箱失败"),
 
     /**
      * 历史遗留备用
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
index 5089ad1..81a406b 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
@@ -10,54 +10,38 @@
     /**
      * 资源管理
      */
-    ENVIRONMENT_DATA_EXPORT("environmentData", "environmentData", "环境记录单数据"),
+    ENVIRONMENT_DATA_EXPORT("environmentData", "环境记录单数据", "环境记录单数据"),
+    STAFF_INFO("staffInfo", "人员登记", "人员登记"),
+    STAFF_CERTIFICATE_EXPIRE("certificateExpire", "证书逾期提醒", "证书逾期提醒"),
+    SUPPLIER_INFO("supplierInfo", "合格供方名录", "合格供方名录"),
+    CUSTOMER_INFO("customerInfo", "委托方名录", "委托方名录"),
+    CUSTOMER_SUGGEST_FORM("customerSuggestForm", "委托方意见登记表", "委托方意见登记表"),
+    SEAL_NOTE("sealNote", "印章使用登记", "印章使用登记"),
 
-    FILE_EXPORT("meterFileData", "meterFileData", "计量文件信息"),
-    TRAIN_PLAN_EXPORT("trainPlanData", "trainPlanData", "培训计划"),
-    TRAIN_LOG_EXPORT("trainLogData", "trainLogData", "培训记录"),
-    METER_ORGANIZE_EXPORT("meterOrganizeData", "meterOrganizeData", "计量组织"),
-    TRACE_SUPPLIER_EXPORT("traceSupplierData", "traceSupplierData", "溯源供方"),
-    SIGN_EXPORT("signData", "signData", "签名/签章"),
-    TEMPLATE_EXPORT("templateData", "templateData", "原始记录模板/证书报告模板"),
-    FIXED_ASSETS("meterFixedAssets", "meterFixedAssets", "固定资产"),
-    METER_EQUIPMENT("meterEquipment", "meterEquipment", "测量设备"),
-    CALIBRATION_TEST_EQUIPMENT("calibrationTestEquipment", "calibrationTestEquipment", "校准检定设备"),
-    MEASURE_ACCOUNT("measureAccount", "measureAccount", "测量工装"),
-    STANDARD_SUPPORT_EQUIPMENT("standardSupportEquipment", "standardSupportEquipment", "标准配套设备"),
-    STANDARD_EQUIPMENT("standardEquipment", "standardEquipment", "标准装置"),
-    FLOW_DEF_EXPORT("flowDefData", "flowDefData", "流程定义"),
-    STAFF_CERTIFICATE("certificate", "certificate", "计量人员证书"),
-    CHECK_INFO("checkInfo", "checkInfo", "设备管理点检测"),
-    EQUIPMENT_APPLY("equipmentApply", "equipmentApply", "设备借用"),
-    STANDARD_EQUIPMENT_REMIND("equipmentApplyRemind", "equipmentApplyRemind", "标准装置到期提醒"),
-    METER_PRICE("meterPrice", "meterPrice", "价格库"),
-    METER_STAFF("meterStaff", "meterStaff", "计量人员"),
-    STANDARD_EQUIPMENT_APPLY("standardEquipmentApply", "standardEquipmentApply", "标准装置申请"),
-    STATE_MANAGE_APPLY("stateManage", "stateManage", "状态管理"),
-    METER_ACCEPTANCE_CHECK("acceptanceCheck", "acceptanceCheck", "设备检修保养验收单"),
-    CUSTOMER_EXPORT("customerData", "customerData", "客户信息"),
-    ORDER_EXPORT("orderData", "orderData", "委托书信息"),
-    SAMPLE_EXPORT("sampleData", "sampleData", "样本信息"),
-    EXCHANGE_DATA("exchangeData", "exchangeData", "设备交接单"),
-    DISPATCH_DATA("dispatchData", "dispatchData", "设备收发"),
-    ENVIRONMENT_DATA("environmentData", "environmentData", "环境记录单"),
-    ORIGIN_DATA("originData", "originData", "原始记录"),
-    CERTIFICATE_REPORT("certificateReport", "certificateReport", "证书报告"),
-    ADVICE_EXPORT("adviceData", "adviceData", "客户反馈"),
-    HANDOUT_EXPORT("handoutData", "handoutData", "任务分发列表"),
-    OUTSOURCER_EXPORT("outsourcerData", "outsourcerData", "分包方"),
-    SITE_EXECUTIVE_EXPORT("siteExecutiveData", "siteExecutiveData", "现场测试、校准或检定"),
-    CERTIFICATE_PRINT_EXPORT("certificatePrintData", "certificatePrintData", "证书打印"),
-    DOWNLOAD_TEMPLATE("downloadTemplate", "downloadTemplate", "页面配置"),
-    OUTSOURCER_CERTIFICATE_EXPORT("outsourceCertificateData", "outsourceCertificateData", "分包证书"),
-    SETTLEMENT_INFO_EXPORT("settlementInfoData", "settlementInfoData", "业务结算"),
-    EQUIPMENT_REMIND("equipmentRemind", "equipmentRemind", "设备到期提醒"),
-    AGREEMENT_INFO_EXPORT("agreementInfoData", "agreementInfoData", "合同"),
-    WORK_STATISTICS_EXPORT("workStatisticsData", "workStatisticsData", "实时工作统计"),
-    DEPT_OUTPUT_EXPORT("deptOutputData", "deptOutputData", "部门产值分析"),
-    WORKLOAD_EXPORT("workloadData", "workloadData", "业务工作量分析"),
-    DEPT_COMPREHENSIVE_EXPORT("deptComprehensiveData", "deptComprehensiveData", "部门综合分析"),
-    ENVIRONMENTAL_RECORD("environmentalRecordData", "environmentalRecordData", "现场环境记录");
+    /**
+     * 计量检定业务
+     */
+    OUTSOURCER_EXPORT("outsourcerData", "分包方名录", "分包方名录"),
+    IDENTIFY_EXPORT("identifyData", "计量标识", "计量标识"),
+    ORDER_EXPORT("orderData", "任务单", "任务单"),
+    DISPATCH_DATA("dispatchData", "设备收发", "设备收发"),
+    HANDOUT_EXPORT("handoutData", "任务分发", "任务分发"),
+    SITE_EXECUTIVE_EXPORT("siteExecutiveData", "现场测试、校准或检定", "现场测试、校准或检定"),
+    CERTIFICATE_REPORT("certificateReport", "证书审批", "证书审批"),
+    CERTIFICATE_CHANGE_APPLY("certificateChangeApply", "证书报告补充或更换申请单", "证书报告补充或更换申请单"),
+    CERTIFICATE_PRINT("certificatePrintData", "证书打印审批", "证书打印审批"),
+    DEPT_EXECUTIVE_TASK("deptExecutiveTaskData", "实验室任务", "实验室任务"),
+    MY_EXECUTIVE_TASK("myExecutiveTaskData", "我的任务", "我的任务"),
+    OUTSOURCE_ASSESS("outsourceAssess", "测试、校准或检定工作分包评审表", "测试、校准或检定工作分包评审表"),
+    OUTSOURCE_PROTOCOL("outsourceProtocol", "测试、校准或检定工作分包协议书", "测试、校准或检定工作分包协议书"),
+
+    /**
+     * 系统管理
+     */
+    SIGN_EXPORT("signData", "签名", "签名"),
+    TEMPLATE_EXPORT("templateData", "文件模板", "文件模板"),
+    FLOW_DEF_EXPORT("flowDefData", "流程定义", "流程定义"),
+    DOWNLOAD_TEMPLATE("downloadTemplate", "流程定义", "页面配置");
 
     ExportEnum(String fileName, String sheetName, String description) {
         this.fileName = fileName;
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateRecordTypeCodeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateRecordTypeCodeEnum.java
index 31d913c..a963522 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateRecordTypeCodeEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateRecordTypeCodeEnum.java
@@ -46,4 +46,14 @@
     String SITE_EXECUTIVE_APPROVAL = "01";
     //《现场测试、校准或检定工作记录表》
     String SITE_EXECUTIVE_LOG = "02";
+
+    //测试、校准或检定工作分包协议书
+    String OUTSOURCE_PROTOCOL = "01";
+    //测试、校准或检定工作分包评审表
+    String OUTSOURCE_ACCESS = "02";
+    //测试、校准或检定工作分包通知书
+    String OUTSOURCE_NOTICE = "03";
+    //测试、校准或检定工作分包方名录
+    String OUTSOURCE_INFO = "04";
+
 }
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
index 24b8635..f78bd53 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
@@ -15,6 +15,10 @@
     String CERTIFICATE_CHANGE_APPLY_BEAN_NAME = "certificateChangeApplyBean";
     //现场测试、校准或检定
     String SITE_EXECUTIVE_BEAN_NAME = "siteExecutiveBean";
+    //测试、校准或检定工作分包评审表
+    String OUTSOURCE_ASSESS_BEAN_NAME = "outsourceAssessBean";
+    //测试、校准或检定工作分包协议书
+    String OUTSOURCE_PROTOCOL_BEAN_NAME = "outsourceProtocolBean";
 
     /*********************************设备与装置************************************/
     //设备台账
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 b21c661..6b86fd1 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
@@ -18,6 +18,8 @@
     OUTSOURCER_APPROVAL(OUTSOURCER_BEAN_NAME, ""),
     CERTIFICATE_CHANGE_APPROVAL(CERTIFICATE_CHANGE_APPLY_BEAN_NAME, ""),
     SITE_EXECUTIVE_APPROVAL(SITE_EXECUTIVE_BEAN_NAME, ""),
+    OUTSOURCE_ASSESS_APPROVAL(OUTSOURCE_ASSESS_BEAN_NAME, ""),
+    OUTSOURCE_PROTOCOL_APPROVAL(OUTSOURCE_PROTOCOL_BEAN_NAME, ""),
 
     ACTION_STATUS_MAP(new HashMap<String, AwareActionStatusEnum>() {
         {
@@ -47,6 +49,10 @@
             put(ApplyFromIdEnum.CERTIFICATE_CHANGE_APPROVAL.getCode(), CERTIFICATE_CHANGE_APPROVAL);
             //现场测试、校准或检定审批
             put(ApplyFromIdEnum.SITE_EXECUTIVE_APPROVAL.getCode(), SITE_EXECUTIVE_APPROVAL);
+            //测试、校准或检定工作分包评审表
+            put(ApplyFromIdEnum.OUTSOURCE_ASSESS_APPROVAL.getCode(), OUTSOURCE_ASSESS_APPROVAL);
+            //测试、校准或检定工作分包协议书
+            put(ApplyFromIdEnum.OUTSOURCE_PROTOCOL_APPROVAL.getCode(), OUTSOURCE_PROTOCOL_APPROVAL);
         }
     });
     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 934405e..c7410bd 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
@@ -9,6 +9,8 @@
     CERTIFICATE_CHANGE_APPROVAL("jljdywzsbchghsqd", MessageSourceModuleEnum.BUSINESS.getCode(), "证书/报告补充或更换申请单"),
     OUTSOURCER_APPROVAL("jljdywcsjzhgfbfml", MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定合格分包方名录"),
     SITE_EXECUTIVE_APPROVAL("jljdywxccsjzsp", MessageSourceModuleEnum.BUSINESS.getCode(), "现场测试、校准或检定审批"),
+    OUTSOURCE_ASSESS_APPROVAL("jljdywcsjzfbpsb", MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包评审表"),
+    OUTSOURCE_PROTOCOL_APPROVAL("jljdywcsjzfbxys", MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包协议书"),
 
 
     /*******************************************设备与装置*********************************************/
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/GeneralApprovalMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/GeneralApprovalMapper.java
index 4fb7344..0c9d6ae 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/GeneralApprovalMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/GeneralApprovalMapper.java
@@ -17,8 +17,4 @@
 
     Page<O> selectBatchForApprovalList(Page<O> page, @Param("request") R request, @Param("businessKeys") List<String> businessKeys);
 
-//    Page<O> selectListPage(Page<O> page, @Param("request") R request);
-
-//    Long selectMaxNo();
-
 }
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceAssessMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceAssessMapper.java
index 7867bb8..ba59009 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceAssessMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceAssessMapper.java
@@ -1,7 +1,12 @@
 package com.casic.missiles.mapper.business;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.business.outsource.OutsourceAssessApprovalListRequest;
+import com.casic.missiles.mapper.GeneralApprovalMapper;
 import com.casic.missiles.model.business.BizBusinessOutsourceAssess;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * <p>
@@ -11,6 +16,10 @@
  * @author wangpeng
  * @since 2023-08-16
  */
-public interface BizBusinessOutsourceAssessMapper extends BaseMapper<BizBusinessOutsourceAssess> {
+public interface BizBusinessOutsourceAssessMapper extends GeneralApprovalMapper<BizBusinessOutsourceAssess, BizBusinessOutsourceAssess, OutsourceAssessApprovalListRequest> {
+
+    Page<BizBusinessOutsourceAssess> selectBatchForApprovalList(Page<BizBusinessOutsourceAssess> page, @Param("request") OutsourceAssessApprovalListRequest request, @Param("businessKeys") List<String> businessKeys);
+
+    Long selectMaxProjectNo();
 
 }
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceProtocolMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceProtocolMapper.java
new file mode 100644
index 0000000..e6aba35
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceProtocolMapper.java
@@ -0,0 +1,24 @@
+package com.casic.missiles.mapper.business;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.business.outsource.OutsourceProtocolApprovalListRequest;
+import com.casic.missiles.mapper.GeneralApprovalMapper;
+import com.casic.missiles.model.business.BizBusinessOutsourceProtocol;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 计量检定业务-分包管理-测试、校准或检定工作分包协议书 Mapper 接口
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-08-24
+ */
+public interface BizBusinessOutsourceProtocolMapper extends GeneralApprovalMapper<BizBusinessOutsourceProtocol, BizBusinessOutsourceProtocol, OutsourceProtocolApprovalListRequest> {
+
+    Page<BizBusinessOutsourceProtocol> selectBatchForApprovalList(Page<BizBusinessOutsourceProtocol> page, @Param("request") OutsourceProtocolApprovalListRequest request, @Param("businessKeys") List<String> businessKeys);
+
+    Long selectMaxProtocolNo();
+}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/EnvLocationInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/EnvLocationInfoMapper.java
new file mode 100644
index 0000000..49eff87
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/EnvLocationInfoMapper.java
@@ -0,0 +1,21 @@
+package com.casic.missiles.mapper.resource;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.resource.environment.LocationListRequest;
+import com.casic.missiles.dto.resource.environment.LocationListResponse;
+import com.casic.missiles.model.resource.EnvLocationInfo;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * <p>
+ * 实验室环境监控系统-设备表 Mapper 接口
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-06-07
+ */
+public interface EnvLocationInfoMapper extends BaseMapper<EnvLocationInfo> {
+
+    Page<LocationListResponse> selectLocationListPage(Page<LocationListResponse> page, @Param("request") LocationListRequest request);
+}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java
index de124db..85ed0f7 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java
@@ -1,7 +1,9 @@
 package com.casic.missiles.mapper.system;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.dto.system.SignDetailResponse;
+import com.casic.missiles.dto.system.SignListRequest;
 import com.casic.missiles.model.system.SystemSign;
 import org.apache.ibatis.annotations.Param;
 
@@ -22,4 +24,8 @@
     SignDetailResponse selectSignDetailById(Long id);
 
     List<SystemSign> selectUsableSignList(@Param("userId") Long userId);
+
+    Page<SystemSign> selectSignListPage(Page<SystemSign> page, @Param("request") SignListRequest request);
+
+    List<SystemSign> selectSignList(@Param("request") SignListRequest request);
 }
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateChangeApplyMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateChangeApplyMapper.xml
index d798447..c496092 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateChangeApplyMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateChangeApplyMapper.xml
@@ -30,31 +30,31 @@
         SELECT *
         FROM biz_business_certificate_change_apply
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.changeApplyNo != null and request.changeApplyNo !=''">
+        <if test="request != null and request.changeApplyNo != null and request.changeApplyNo !=''">
             and change_apply_no like concat('%',#{request.changeApplyNo},'%')
         </if>
-        <if test="request.changeReportNo != null and request.changeReportNo !=''">
+        <if test="request != null and request.changeReportNo != null and request.changeReportNo !=''">
             and change_report_no like concat('%',#{request.changeReportNo},'%')
         </if>
-        <if test="request.changeReportName != null and request.changeReportName !=''">
+        <if test="request != null and request.changeReportName != null and request.changeReportName !=''">
             and change_report_name like concat('%',#{request.changeReportName},'%')
         </if>
-        <if test="request.changeType != null and request.changeType !=''">
+        <if test="request != null and request.changeType != null and request.changeType !=''">
             and change_type = #{request.changeType}
         </if>
-        <if test="request.createUserName != null and request.createUserName !=''">
+        <if test="request != null and request.createUserName != null and request.createUserName !=''">
             and create_user_name like concat('%',#{request.createUserName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificatePrintMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificatePrintMapper.xml
index b66cd99..49c0ac8 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificatePrintMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificatePrintMapper.xml
@@ -31,34 +31,34 @@
         LEFT JOIN biz_business_order_sample_relation bosr ON (bosr.order_id = bcr.order_id AND bosr.sample_id = bcr.sample_id)
         LEFT JOIN biz_business_order_info boi ON boi.id = bosr.order_id
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and bcp.approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.printStatus != null and request.printStatus !=''">
+        <if test="request != null and request.printStatus != null and request.printStatus !=''">
             and print_status = #{request.printStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and bcp.create_user_id = #{request.createUserId}
         </if>
-        <if test="request.certificateReportNo != null and request.certificateReportNo !=''">
+        <if test="request != null and request.certificateReportNo != null and request.certificateReportNo !=''">
             and bcr.certificate_report_no like concat('%',#{request.certificateReportNo},'%')
         </if>
-        <if test="request.certificateReportName != null and request.certificateReportName !=''">
+        <if test="request != null and request.certificateReportName != null and request.certificateReportName !=''">
             and bcr.certificate_report_name like concat('%',#{request.certificateReportName},'%')
         </if>
-        <if test="request.customerName != null and request.customerName !=''">
+        <if test="request != null and request.customerName != null and request.customerName !=''">
             and boi.customer_name like concat('%',#{request.customerName},'%')
         </if>
-        <if test="request.sampleNo != null and request.sampleNo !=''">
+        <if test="request != null and request.sampleNo != null and request.sampleNo !=''">
             and bosr.sample_no like concat('%',#{request.sampleNo},'%')
         </if>
-        <if test="request.sampleName != null and request.sampleName !=''">
+        <if test="request != null and request.sampleName != null and request.sampleName !=''">
             and bosr.sample_name like concat('%',#{request.sampleName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and bcp.create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and bcp.create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml
index b366034..767695d 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml
@@ -46,33 +46,37 @@
         SELECT bcr.*, bosr.sample_no, bosr.sample_name, bosr.sample_model, rsi.staff_name
         FROM biz_business_certificate_report bcr
         LEFT JOIN biz_business_order_sample_relation bosr ON (bosr.order_id = bcr.order_id AND bosr.sample_id = bcr.sample_id)
+        LEFT JOIN biz_business_order_info boi ON boi.id = bcr.order_id
         LEFT JOIN biz_resource_staff_info rsi ON rsi.id = bcr.measure_person_id
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and bcr.approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and bcr.create_user_id = #{request.createUserId}
         </if>
-        <if test="request.certificateReportNo != null and request.certificateReportNo !=''">
+        <if test="request != null and request.customerId != null and request.customerId !=''">
+            and boi.customer_id = #{request.customerId}
+        </if>
+        <if test="request != null and request.certificateReportNo != null and request.certificateReportNo !=''">
             and bcr.certificate_report_no like concat('%',#{request.certificateReportNo},'%')
         </if>
-        <if test="request.certificateReportName != null and request.certificateReportName !=''">
+        <if test="request != null and request.certificateReportName != null and request.certificateReportName !=''">
             and bcr.certificate_report_name like concat('%',#{request.certificateReportName},'%')
         </if>
-        <if test="request.sampleNo != null and request.sampleNo !=''">
+        <if test="request != null and request.sampleNo != null and request.sampleNo !=''">
             and bosr.sample_no like concat('%',#{request.sampleNo},'%')
         </if>
-        <if test="request.measureCategory != null and request.measureCategory !=''">
+        <if test="request != null and request.measureCategory != null and request.measureCategory !=''">
             and bcr.measure_category = #{request.measureCategory}
         </if>
-        <if test="request.measurePerson != null and request.measurePerson !=''">
+        <if test="request != null and request.measurePerson != null and request.measurePerson !=''">
             and rsi.staff_name like concat('%',#{request.measurePerson},'%')
         </if>
-        <if test="request.calibrationTimeStart != null and request.calibrationTimeStart !=''">
+        <if test="request != null and request.calibrationTimeStart != null and request.calibrationTimeStart !=''">
             and bcr.calibration_time &gt;= #{request.calibrationTimeStart}
         </if>
-        <if test="request.calibrationTimeEnd != null and request.calibrationTimeEnd !=''">
+        <if test="request != null and request.calibrationTimeEnd != null and request.calibrationTimeEnd !=''">
             and bcr.calibration_time &lt;= #{request.calibrationTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceAssessMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceAssessMapper.xml
index d0fcf8b..c22c101 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceAssessMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceAssessMapper.xml
@@ -7,6 +7,8 @@
         <id column="id" property="id" />
         <result column="project_no" property="projectNo" />
         <result column="project_name" property="projectName" />
+        <result column="lab_code" property="labCode" />
+        <result column="group_code" property="groupCode" />
         <result column="applicant_id" property="applicantId" />
         <result column="applicant_name" property="applicantName" />
         <result column="applicant_time" property="applicantTime" />
@@ -31,7 +33,45 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, project_no, project_name, applicant_id, applicant_name, applicant_time, minio_file_name, remark, create_user_id, create_user_name, outsourcer_id, pre_start_time, pre_end_time, outsource_reason, pre_cost, approval_status, process_id, approve_situation, traceability, test_method, technique_ability, create_time, update_time
+        id, project_no, project_name, lab_code, group_code, applicant_id, applicant_name, applicant_time, minio_file_name, remark, create_user_id, create_user_name, outsourcer_id, pre_start_time, pre_end_time, outsource_reason, pre_cost, approval_status, process_id, approve_situation, traceability, test_method, technique_ability, create_time, update_time
     </sql>
 
+    <select id="selectMaxProjectNo" resultType="java.lang.Long">
+        SELECT IFNULL(max(RIGHT(project_no, 3)), 0) from biz_business_outsource_assess
+    </select>
+
+    <select id="selectBatchForApprovalList" resultMap="BaseResultMap">
+        SELECT bboa.*, bboi.outsourcer_name, bboi.director
+        FROM biz_business_outsource_assess bboa
+        LEFT JOIN biz_business_outsourcer_info bboi ON bboa.outsourcer_id = bboi.id
+        WHERE 1=1
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
+            and bboa.approval_status = #{request.approvalStatus}
+        </if>
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
+            and bboa.create_user_id = #{request.createUserId}
+        </if>
+        <if test="request != null and request.projectNo != null and request.projectNo !=''">
+            and bboa.project_no like concat('%',#{request.projectNo},'%')
+        </if>
+        <if test="request != null and request.outsourcerName != null and request.outsourcerName !=''">
+            and bboi.outsourcer_name like concat('%',#{request.outsourcerName},'%')
+        </if>
+        <if test="request != null and request.applicantName != null and request.applicantName !=''">
+            and bboa.applicant_name like concat('%',#{request.applicantName},'%')
+        </if>
+        <if test="request != null and request.applicantTimeStart != null and request.applicantTimeStart !=''">
+            and bboa.applicant_time &gt;= #{request.applicantTimeStart}
+        </if>
+        <if test="request != null and request.applicantTimeEnd != null and request.applicantTimeEnd !=''">
+            and bboa.applicant_time &lt;= #{request.applicantTimeEnd}
+        </if>
+        <if test="businessKeys != null">
+            and bboa.id in
+            <foreach collection="businessKeys" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
+        ORDER BY bboa.create_time DESC
+    </select>
 </mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceProtocolMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceProtocolMapper.xml
new file mode 100644
index 0000000..b7b2149
--- /dev/null
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceProtocolMapper.xml
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.mapper.business.BizBusinessOutsourceProtocolMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.business.BizBusinessOutsourceProtocol">
+        <id column="id" property="id" />
+        <result column="protocol_no" property="protocolNo" />
+        <result column="project_name" property="projectName" />
+        <result column="lab_code" property="labCode" />
+        <result column="group_code" property="groupCode" />
+        <result column="outsourcer_id" property="outsourcerId" />
+        <result column="remark" property="remark" />
+        <result column="outsource_no" property="outsourceNo" />
+        <result column="outsource_name" property="outsourceName" />
+        <result column="contacts" property="contacts" />
+        <result column="mobile" property="mobile" />
+        <result column="address" property="address" />
+        <result column="require_date" property="requireDate" />
+        <result column="outsource_cost" property="outsourceCost" />
+        <result column="director" property="director" />
+        <result column="item" property="item" />
+        <result column="requires" property="requires" />
+        <result column="create_user_id" property="createUserId" />
+        <result column="create_user_name" property="createUserName" />
+        <result column="approval_status" property="approvalStatus" />
+        <result column="process_id" property="processId" />
+        <result column="create_time" property="createTime" />
+        <result column="update_time" property="updateTime" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, protocol_no, project_name, lab_code, group_code, outsourcer_id, remark, outsource_no, outsource_name, contacts, mobile, address, require_date, outsource_cost, director, item, requires, create_user_id, create_user_name, approval_status, process_id, create_time, update_time
+    </sql>
+
+    <select id="selectMaxProtocolNo" resultType="java.lang.Long">
+        SELECT IFNULL(max(RIGHT(protocol_no, 3)), 0) from biz_business_outsource_protocol
+    </select>
+
+    <select id="selectBatchForApprovalList" resultMap="BaseResultMap">
+        SELECT *
+        FROM biz_business_outsource_protocol
+        WHERE 1=1
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
+            and approval_status = #{request.approvalStatus}
+        </if>
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
+            and create_user_id = #{request.createUserId}
+        </if>
+        <if test="request != null and request.protocolNo != null and request.protocolNo !=''">
+            and protocol_no like concat('%',#{request.protocolNo},'%')
+        </if>
+        <if test="request != null and request.outsourcerName != null and request.outsourcerName !=''">
+            and outsourcer_name like concat('%',#{request.outsourcerName},'%')
+        </if>
+        <if test="request != null and request.applicantName != null and request.applicantName !=''">
+            and create_user_name like concat('%',#{request.applicantName},'%')
+        </if>
+        <if test="request != null and request.applicantTimeStart != null and request.applicantTimeStart !=''">
+            and create_time &gt;= #{request.applicantTimeStart}
+        </if>
+        <if test="request != null and request.applicantTimeEnd != null and request.applicantTimeEnd !=''">
+            and create_time &lt;= #{request.applicantTimeEnd}
+        </if>
+        <if test="businessKeys != null">
+            and id in
+            <foreach collection="businessKeys" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
+        ORDER BY create_time DESC
+    </select>
+</mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourcerInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourcerInfoMapper.xml
index 510a80b..3049b54 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourcerInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourcerInfoMapper.xml
@@ -7,6 +7,8 @@
         <id column="id" property="id" />
         <result column="outsourcer_no" property="outsourcerNo" />
         <result column="outsourcer_name" property="outsourcerName" />
+        <result column="lab_code" property="labCode" />
+        <result column="group_code" property="groupCode" />
         <result column="outsourcer_brief_name" property="outsourcerBriefName" />
         <result column="outsourcer_size" property="outsourcerSize" />
         <result column="business_size" property="businessSize" />
@@ -55,32 +57,32 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, outsourcer_no, outsourcer_name, outsourcer_brief_name, outsourcer_size, business_size, grade, evaluation, tax_number, bank_account, bank_name, bank_account_number, postal_code, director, phone, fax, mobile, email, website, address_country, address_province, address_city, address_area, full_address, address_country_name, address_province_name, address_city_name, address_area_name, invoice_country, invoice_province, invoice_city, invoice_area, invoice_full_address, invoice_country_name, invoice_province_name, invoice_city_name, invoice_area_name, business_scope, business_content, minio_file_name, approval_status, process_id, remark, create_user_id, create_user_name, create_time, update_time
+        id, outsourcer_no, outsourcer_name, lab_code, group_code, outsourcer_brief_name, outsourcer_size, business_size, grade, evaluation, tax_number, bank_account, bank_name, bank_account_number, postal_code, director, phone, fax, mobile, email, website, address_country, address_province, address_city, address_area, full_address, address_country_name, address_province_name, address_city_name, address_area_name, invoice_country, invoice_province, invoice_city, invoice_area, invoice_full_address, invoice_country_name, invoice_province_name, invoice_city_name, invoice_area_name, business_scope, business_content, minio_file_name, approval_status, process_id, remark, create_user_id, create_user_name, create_time, update_time
     </sql>
 
     <select id="selectBatchForApprovalList" resultMap="BaseResultMap">
         SELECT *
         FROM biz_business_outsourcer_info
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.outsourcerNo != null and request.outsourcerNo !=''">
+        <if test="request != null and request.outsourcerNo != null and request.outsourcerNo !=''">
             and outsourcer_no like concat('%',#{request.outsourcerNo},'%')
         </if>
-        <if test="request.outsourcerName != null and request.outsourcerName !=''">
+        <if test="request != null and request.outsourcerName != null and request.outsourcerName !=''">
             and outsourcer_name like concat('%',#{request.outsourcerName},'%')
         </if>
-        <if test="request.director != null and request.director !=''">
+        <if test="request != null and request.director != null and request.director !=''">
             and director like concat('%',#{request.director},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
@@ -93,6 +95,6 @@
     </select>
 
     <select id="selectMaxNo" resultType="java.lang.Long">
-        SELECT IFNULL(max(RIGHT(outsourcer_no, 12)), 0) from biz_business_outsourcer_info
+        SELECT IFNULL(max(RIGHT(outsourcer_no, 3)), 0) from biz_business_outsourcer_info
     </select>
 </mapper>

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java
index bb0c50f..13a699b 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java
@@ -12,6 +12,7 @@
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.IGeneralApprovalService;
+import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
@@ -19,6 +20,7 @@
 import org.springframework.web.bind.annotation.RequestBody;
 
 import javax.validation.Valid;
+import java.util.List;
 import java.util.Objects;
 
 /**
@@ -117,4 +119,17 @@
         }
         return baseApprovalService.failUpdate(request);
     }
+
+    public List<O> exportList(@RequestBody @Valid R request) throws Exception {
+        List<O> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = baseApprovalService.listExportByIds(request.getIds());
+        } else {
+            list = baseApprovalService.listExport(request);
+        }
+        for (O record : list) {
+            DictCodeUtils.convertDictCodeToName(record);
+        }
+        return list;
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java
index 8a90961..d775831 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java
@@ -5,6 +5,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.business.certificate.CertificateChangeApplyApprovalListRequest;
 import com.casic.missiles.dto.business.certificate.CertificateChangeApplySaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessCertificateChangeApply;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
@@ -20,6 +21,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -48,4 +50,12 @@
         }
         return changeApplyService.saveChangeApply(request);
     }
+
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody CertificateChangeApplyApprovalListRequest request) throws Exception {
+        List<BizBusinessCertificateChangeApply> list = super.exportList(request);
+        super.exportExcel(BizBusinessCertificateChangeApply.class, list, ExportEnum.CERTIFICATE_CHANGE_APPLY.getSheetName());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java
index 5fc4b07..af8230e 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java
@@ -9,6 +9,7 @@
 import com.casic.missiles.dto.business.certificate.CertificatePrintApprovalListRequest;
 import com.casic.missiles.dto.business.certificate.CertificatePrintListResponse;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.enums.business.CertificatePrintStatusEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessCertificatePrintLog;
@@ -18,10 +19,16 @@
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.io.IOException;
+import java.util.List;
 import java.util.Objects;
 
 /**
@@ -98,4 +105,16 @@
         });
         return certificatePrintService.certificatePrintLog(idDTO.getId());
     }
+
+    @ApiOperation("证书打印审批导出")
+    @PostMapping("/listExport")
+    public void exportList(@RequestBody CertificatePrintApprovalListRequest request) throws IOException {
+        List<CertificatePrintListResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = certificatePrintService.listByIds(request.getIds());
+        } else {
+            list = certificatePrintService.list(request);
+        }
+        super.exportExcel(CertificatePrintListResponse.class, list, ExportEnum.CERTIFICATE_PRINT.getSheetName());
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java
index 63b06dc..6b2efd5 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java
@@ -6,6 +6,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.business.certificate.CertificateReportApprovalListRequest;
 import com.casic.missiles.dto.business.certificate.CertificateReportSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessCertificateReport;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
@@ -21,6 +22,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -50,7 +52,7 @@
         return certificateReportService.saveCertificateReport(request);
     }
 
-    @ApiOperation("证书审批详情（基本信息）")
+    @ApiOperation("详情（基本信息）")
     @PostMapping("/detail")
     public ReturnDTO<BizBusinessCertificateReport> detail(@RequestBody @Valid BaseDetailRequest request, BindingResult bindingResult) throws Exception {
         if(bindingResult.hasErrors()){
@@ -59,4 +61,11 @@
         return certificateReportService.detail(request);
     }
 
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody CertificateReportApprovalListRequest request) throws Exception {
+        List<BizBusinessCertificateReport> list = super.exportList(request);
+        super.exportExcel(BizBusinessCertificateReport.class, list, ExportEnum.CERTIFICATE_REPORT.getSheetName());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java
index 46b26bd..57c0809 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java
@@ -10,20 +10,21 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.business.identify.IdentifyListRequest;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessIdentifyInfo;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.business.IBizBusinessIdentifyInfoService;
+import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import javax.validation.Valid;
+import java.util.List;
 import java.util.Objects;
 
 /**
@@ -57,16 +58,13 @@
         return identifyInfoService.addIdentify(identifyInfo);
     }
 
-    @ApiOperation("标识打印更新")
+    @ApiOperation("标识打印更新（更新打印时间）")
     @PostMapping("/update")
-    public ReturnDTO updateIdentify(@RequestBody @Valid BizBusinessIdentifyInfo identifyInfo, BindingResult bindingResult) {
-        Assert.isFalse(Objects.isNull(identifyInfo.getId()), () -> {
+    public ReturnDTO updateIdentify(@RequestBody @Valid IdDTO idDTO) {
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        Assert.isFalse(bindingResult.hasErrors(), () -> {
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        });
-        return identifyInfoService.updateIdentify(identifyInfo);
+        return identifyInfoService.updateIdentify(idDTO.getId());
     }
 
     @ApiOperation("标识打印删除")
@@ -77,4 +75,37 @@
         });
         return identifyInfoService.deleteIdentify(idDTO.getId());
     }
+
+    @ApiOperation("标识打印导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody @Valid IdentifyListRequest request, BindingResult bindingResult) throws Exception {
+        if (bindingResult.hasErrors()) {
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        List<BizBusinessIdentifyInfo> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = identifyInfoService.listByIds(request.getIds());
+        } else {
+            list = identifyInfoService.list(request);
+        }
+        for (BizBusinessIdentifyInfo record : list) {
+            DictCodeUtils.convertDictCodeToName(record);
+        }
+        super.exportExcel(BizBusinessIdentifyInfo.class, list, ExportEnum.IDENTIFY_EXPORT.getSheetName());
+    }
+
+
+    // TODO: 2023/8/23 查询设备信息，4个底部按钮查设备（按钮的作用就是前端用来调不同接口、用来区分中间即将展示的标识），前端弹窗选设备，在确定保存时前端根据底部按钮判断传入设备类型deviceType字典code
+    // TODO: 2023/8/23 接口：查受检设备（第1个按钮），查设备台账（后3个按钮同一接口），查询之后前端根据标志类型的不同加到中间页面时进行判断（按产品给的对应表）
+    // TODO: 2023/8/23 提供二维码接口，前端在加到中间页面时调用一下
+
+    @ApiOperation("设备二维码")
+    @PostMapping("/equipment/qrCode")
+    public ReturnDTO<String> equipmentQrCode(@RequestBody @Valid IdDTO idDTO) {
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return identifyInfoService.equipmentQrCode(idDTO.getId());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java
index 707be6e..7e0453d 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java
@@ -117,7 +117,7 @@
     }
 
     @ApiOperation("任务单导出")
-    @PostMapping("/export")
+    @PostMapping("/listExport")
     public void orderExport(@RequestBody @Valid OrderListRequest request, HttpServletResponse response) {
         businessOrderService.orderExport(request, response);
     }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java
index 529a6ce..51432be 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java
@@ -1,9 +1,28 @@
 package com.casic.missiles.controller.business;
 
+import com.casic.missiles.controller.GeneralApprovalController;
+import com.casic.missiles.dto.BaseApprovalSubmitRequest;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.business.outsource.OutsourceAssessApprovalListRequest;
+import com.casic.missiles.dto.business.outsource.OutsourceAssessSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
+import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.model.business.BizBusinessOutsourceAssess;
+import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
+import com.casic.missiles.service.IGeneralApprovalService;
+import com.casic.missiles.service.business.IBizBusinessOutsourceAssessService;
 import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.BindingResult;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.validation.Valid;
+import java.util.List;
+
 /**
  * <p>
  * 计量检定业务-分包管理-测试、校准或检定工作分包评审表 前端控制器
@@ -15,6 +34,27 @@
 @Api(tags = "分包管理-测试、校准或检定工作分包评审表")
 @RestController
 @RequestMapping("/business/outsource/assess")
-public class BizBusinessOutsourceAssessController {
+public class BizBusinessOutsourceAssessController extends GeneralApprovalController<BizBusinessOutsourceAssess, BizBusinessOutsourceAssess, OutsourceAssessApprovalListRequest, BaseApprovalSubmitRequest> {
+    @Autowired
+    private IBizBusinessOutsourceAssessService outsourceAssessService;
 
+    public BizBusinessOutsourceAssessController(IGeneralApprovalService<BizBusinessOutsourceAssess, BizBusinessOutsourceAssess, OutsourceAssessApprovalListRequest, BaseApprovalSubmitRequest> baseApprovalService) {
+        super(baseApprovalService);
+    }
+
+    @ApiOperation("草稿箱-保存")
+    @PostMapping("/save")
+    public ReturnDTO<OutsourceAssessSaveResponse> saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceAssess request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        return outsourceAssessService.saveOutsourceAssess(request);
+    }
+
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception {
+        List<BizBusinessOutsourceAssess> list = super.exportList(request);
+        super.exportExcel(BizBusinessOutsourceAssess.class, list, ExportEnum.OUTSOURCE_ASSESS.getSheetName());
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java
new file mode 100644
index 0000000..9adef18
--- /dev/null
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java
@@ -0,0 +1,60 @@
+package com.casic.missiles.controller.business;
+
+import com.casic.missiles.controller.GeneralApprovalController;
+import com.casic.missiles.dto.BaseApprovalSubmitRequest;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.business.outsource.OutsourceProtocolApprovalListRequest;
+import com.casic.missiles.dto.business.outsource.OutsourceProtocolSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
+import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.model.business.BizBusinessOutsourceProtocol;
+import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
+import com.casic.missiles.service.IGeneralApprovalService;
+import com.casic.missiles.service.business.IBizBusinessOutsourceProtocolService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.BindingResult;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.validation.Valid;
+import java.util.List;
+
+/**
+ * <p>
+ * 计量检定业务-分包管理-测试、校准或检定工作分包协议书 前端控制器
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-08-24
+ */
+@Api(tags = "分包管理-测试、校准或检定工作分包协议书")
+@RestController
+@RequestMapping("/business/outsource/protocol")
+public class BizBusinessOutsourceProtocolController extends GeneralApprovalController<BizBusinessOutsourceProtocol, BizBusinessOutsourceProtocol, OutsourceProtocolApprovalListRequest, BaseApprovalSubmitRequest> {
+    @Autowired
+    private IBizBusinessOutsourceProtocolService outsourceProtocolService;
+
+    public BizBusinessOutsourceProtocolController(IGeneralApprovalService<BizBusinessOutsourceProtocol, BizBusinessOutsourceProtocol, OutsourceProtocolApprovalListRequest, BaseApprovalSubmitRequest> baseApprovalService) {
+        super(baseApprovalService);
+    }
+
+    @ApiOperation("草稿箱-保存")
+    @PostMapping("/save")
+    public ReturnDTO<OutsourceProtocolSaveResponse> saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceProtocol request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        return outsourceProtocolService.saveOutsourceProtocol(request);
+    }
+
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody OutsourceProtocolApprovalListRequest request) throws Exception {
+        List<BizBusinessOutsourceProtocol> list = super.exportList(request);
+        super.exportExcel(BizBusinessOutsourceProtocol.class, list, ExportEnum.OUTSOURCE_PROTOCOL.getSheetName());
+    }
+}
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java
index 097f645..f0f0943 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java
@@ -17,7 +17,6 @@
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.IGeneralApprovalService;
 import com.casic.missiles.service.business.IBizBusinessOutsourcerInfoService;
-import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -71,19 +70,8 @@
 
     @ApiOperation("分包方导出")
     @PostMapping("/listExport")
-    public void export(@RequestBody @Valid OutsourcerInfoApprovalListRequest request, BindingResult bindingResult) throws Exception {
-        if (bindingResult.hasErrors()) {
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        }
-        List<BizBusinessOutsourcerInfo> list;
-        if (!CollectionUtils.isEmpty(request.getIds())) {
-            list = outsourcerInfoService.listByIds(request.getIds());
-        } else {
-            list = outsourcerInfoService.list(request);
-        }
-        for (BizBusinessOutsourcerInfo record : list) {
-            DictCodeUtils.convertDictCodeToName(record);
-        }
+    public void export(@RequestBody OutsourcerInfoApprovalListRequest request) throws Exception {
+        List<BizBusinessOutsourcerInfo> list = super.exportList(request);
         super.exportExcel(BizBusinessOutsourcerInfo.class, list, ExportEnum.OUTSOURCER_EXPORT.getSheetName());
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java
index c2cbf9f..0410918 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java
@@ -17,11 +17,9 @@
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.IGeneralApprovalService;
 import com.casic.missiles.service.business.IBizBusinessSiteExecutiveInfoService;
-import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -60,7 +58,7 @@
         return siteExecutiveInfoService.saveSiteExecutiveInfo(siteExecutiveInfo);
     }
 
-    @ApiOperation("现场检测详情")
+    @ApiOperation("详情")
     @PostMapping("/detail")
     public ReturnDTO<SiteExecutiveDetailResponse> siteExecutiveDetail(@RequestBody @Valid IdDTO idDTO) throws Exception {
         Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
@@ -69,21 +67,10 @@
         return ReturnUtil.success(siteExecutiveInfoService.detail(idDTO.getId()));
     }
 
-    @ApiOperation("现场检测导出")
+    @ApiOperation("导出")
     @PostMapping("/listExport")
-    public void export(@RequestBody @Valid SiteExecutiveApprovalListRequest request, BindingResult bindingResult) throws Exception {
-        if (bindingResult.hasErrors()) {
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        }
-        List<SiteExecutiveApprovalListResponse> list;
-        if (!CollectionUtils.isEmpty(request.getIds())) {
-            list = siteExecutiveInfoService.listInfoByIds(request.getIds());
-        } else {
-            list = siteExecutiveInfoService.listInfo(request);
-        }
-        for (SiteExecutiveApprovalListResponse record : list) {
-            DictCodeUtils.convertDictCodeToName(record);
-        }
+    public void export(@RequestBody SiteExecutiveApprovalListRequest request) throws Exception {
+        List<SiteExecutiveApprovalListResponse> list = super.exportList(request);
         super.exportExcel(SiteExecutiveApprovalListResponse.class, list, ExportEnum.SITE_EXECUTIVE_EXPORT.getSheetName());
     }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
index 7e793cd..a92e209 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
@@ -55,7 +55,7 @@
 
     @ApiOperation("设备收发列表导出")
     @PostMapping("/export")
-    public void exportList(@RequestBody @Valid SampleDispatchListRequest request) throws IOException {
+    public void exportList(@RequestBody SampleDispatchListRequest request) throws IOException {
         List<SampleDispatchListResponse> list;
         if (!CollectionUtils.isEmpty(request.getIds())) {
             list = dispatchService.listByIds(request.getIds());
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java
index cdc77fc..d120fd4 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java
@@ -7,6 +7,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.business.labExecutive.*;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.business.IBusinessLabExecutiveInfoService;
@@ -14,6 +15,7 @@
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.*;
 
@@ -32,7 +34,7 @@
     @Autowired
     private IBusinessLabExecutiveInfoService labExecutiveInfoService;
 
-    @ApiOperation("实验室检测-部门检测-查询各状态列表（待检测、检测中、检测完）")
+    @ApiOperation("实验室任务-查询各状态列表（待检测、检测中、检测完）")
     @PostMapping("/deptExecutive/List")
     public ReturnDTO<PageInfoBT<SampleLabExecutiveListResponse>> queryDeptExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
@@ -43,10 +45,19 @@
         return ReturnUtil.success(super.packForBT(labExecutiveInfoService.deptLabExecutiveListPage(page, labExecutiveListRequest)));
     }
 
-    /**
-     * 实验室检测-我的检测-查询各状态列表（待检测、检测中、检测完）
-     */
-    @ApiOperation("实验室检测-我的检测-查询各状态列表（待检测、检测中、检测完）")
+    @ApiOperation("实验室任务导出")
+    @PostMapping("/deptExecutive/export")
+    public void deptExportList(@RequestBody @Valid SampleLabExecutiveListRequest request) throws Exception {
+        List<SampleLabExecutiveListResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = labExecutiveInfoService.deptLabExecutiveListByIds(request.getMeasureStatus(), request.getIds());
+        } else {
+            list = labExecutiveInfoService.deptLabExecutiveList(request);
+        }
+        super.exportExcel(SampleLabExecutiveListResponse.class, list, ExportEnum.DEPT_EXECUTIVE_TASK.getSheetName());
+    }
+
+    @ApiOperation("我的任务-查询各状态列表（待检测、检测中、检测完）")
     @PostMapping("/myExecutive/list")
     public ReturnDTO<PageInfoBT<SampleLabExecutiveListResponse>> queryMyExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
@@ -57,19 +68,25 @@
         return ReturnUtil.success(super.packForBT(labExecutiveInfoService.myLabExecutiveListPage(page, labExecutiveListRequest)));
     }
 
-    /**
-     * 实验室检测-我的检测-查询各状态样品数量（待检测、检测中、检测完）
-     */
-    @ApiOperation("实验室检测-我的检测-查询各状态样品数量（待检测、检测中、检测完）")
+    @ApiOperation("我的任务导出")
+    @PostMapping("/myExecutive/export")
+    public void exportList(@RequestBody @Valid SampleLabExecutiveListRequest request) throws Exception {
+        List<SampleLabExecutiveListResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = labExecutiveInfoService.myLabExecutiveListByIds(request.getMeasureStatus(), request.getIds());
+        } else {
+            list = labExecutiveInfoService.myLabExecutiveList(request);
+        }
+        super.exportExcel(SampleLabExecutiveListResponse.class, list, ExportEnum.MY_EXECUTIVE_TASK.getSheetName());
+    }
+
+    @ApiOperation("我的任务-查询各状态样品数量（待检测、检测中、检测完）")
     @GetMapping("/myExecutive/amount")
     public ReturnDTO<List<SampleAmountResponse>> queryMyExecutiveAmount() {
         return ReturnUtil.success(labExecutiveInfoService.myExecutiveAmount());
     }
 
-    /**
-     * 实验室检测-部门检测-分配（分配给具体人员）
-     */
-    @ApiOperation("实验室检测-部门检测-分配按钮（分配给具体人员）")
+    @ApiOperation("实验室任务-分配按钮（分配给具体人员）")
     @PostMapping("/deptExecutive/allocate")
     public ReturnDTO allocateStaff(@RequestBody @Valid SampleAllocateRequest sampleAllocateRequest, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -78,10 +95,7 @@
         return labExecutiveInfoService.allocateStaff(sampleAllocateRequest);
     }
 
-    /**
-     * 实验室检测-我的检测-检定人扫描收入（待检测->检测中）
-     */
-    @ApiOperation("实验室检测-我的检测-检定人扫描收入（待检测->检测中）")
+    @ApiOperation("我的任务-检定人扫描收入（待检测->检测中）")
     @PostMapping("/myExecutive/receive")
     public ReturnDTO sampleReceive(@RequestBody @Valid List<SampleOperateRequest> requestList, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -90,10 +104,7 @@
         return labExecutiveInfoService.sampleReceive(requestList);
     }
 
-    /**
-     * 实验室检测-负责人/检定人扫描检完（检测中->检测完）
-     */
-    @ApiOperation("实验室检测-负责人/检定人扫描检完（检测中->检测完）")
+    @ApiOperation("实验室任务-负责人/检定人扫描检完（检测中->检测完）")
     @PostMapping("/myExecutive/complete")
     public ReturnDTO sampleExecutiveComplete(@RequestBody @Valid List<SampleOperateRequest> requestList, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -102,10 +113,7 @@
         return labExecutiveInfoService.sampleExecutiveComplete(requestList);
     }
 
-    /**
-     * 实验室检测-部门检测/我的检测 编辑（只能修改应出具证书）
-     */
-    @ApiOperation("实验室检测-部门检测/我的检测 编辑（只能修改应出具证书）")
+    @ApiOperation("实验室任务/我的任务 编辑（只能修改应出具证书）")
     @PostMapping("/executive/update")
     public ReturnDTO updateExecutive(@RequestBody @Valid UpdateExecutiveRequest request, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -114,10 +122,7 @@
         return labExecutiveInfoService.updateExecutive(request);
     }
 
-    /**
-     * 实验室检测-部门检测/我的检测 详情
-     */
-    @ApiOperation("实验室检测-部门检测/我的检测 详情")
+    @ApiOperation("实验室任务/我的任务 详情")
     @PostMapping("/executive/detail")
     public ReturnDTO<ExecutiveDetailResponse> executiveDetail(@RequestBody @Valid ExecutiveDetailRequest request, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
@@ -131,7 +136,7 @@
      * 退回后会将下一个要执行的实验室检测状态更新为待分配，将后面的实验室顺序变更为连续（都进行减1）
      * 最后一个检测的实验室退回，等分发员再增加实验室或设备收发中的已收入直接手动点击完成
      */
-    @ApiOperation("实验室检测-部门检测/我的检测 退回（待检测/检测中->退回）")
+    @ApiOperation("实验室任务/我的任务 退回（待检测/检测中->退回）")
     @PostMapping("/executive/sendBack")
     public ReturnDTO executiveSendBack(@RequestBody @Valid ExecutiveSendBackRequest request, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -140,9 +145,6 @@
         return labExecutiveInfoService.sampleExecutiveSendBack(request);
     }
 
-    /**
-     * 分发员编辑实验室检测列表
-     */
     @ApiOperation("分发员编辑实验室检测列表")
     @PostMapping("/handOut/updateList")
     public ReturnDTO updateExecutiveList(@RequestBody @Valid UpdateExecutiveListRequest request, BindingResult bindingResult) {
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java
index 48a67ed..0c04f31 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java
@@ -10,6 +10,7 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.resource.customer.CustomerApprovalListRequest;
 import com.casic.missiles.dto.resource.customer.CustomerSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceCustomerInfo;
@@ -26,6 +27,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -55,6 +57,13 @@
         return customerInfoService.saveCustomerInfo(request);
     }
 
+    @ApiOperation("委托方名录导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody CustomerApprovalListRequest request) throws Exception {
+        List<BizResourceCustomerInfo> list = super.exportList(request);
+        super.exportExcel(BizResourceCustomerInfo.class, list, ExportEnum.CUSTOMER_INFO.getSheetName());
+    }
+
     @ApiOperation("委托方人员列表（分页）")
     @PostMapping("/person/listPage")
     public ReturnDTO<PageInfoBT<BizResourceCustomerStaff>> personListPage(@RequestBody IdDTO idDto) {
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
index 972ed4b..6418ea5 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
@@ -5,6 +5,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.resource.customer.SuggestFormApprovalListRequest;
 import com.casic.missiles.dto.resource.customer.SuggestFormSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceCustomerSuggestForm;
@@ -20,6 +21,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -50,4 +52,11 @@
         return suggestFormService.saveSuggestForm(request);
     }
 
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody SuggestFormApprovalListRequest request) throws Exception {
+        List<BizResourceCustomerSuggestForm> list = super.exportList(request);
+        super.exportExcel(BizResourceCustomerSuggestForm.class, list, ExportEnum.CUSTOMER_SUGGEST_FORM.getSheetName());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java
index 1934d1a..9e07eab 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java
@@ -15,12 +15,16 @@
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.resource.IEnvEnvironmentRecordConfigService;
 import com.casic.missiles.service.resource.IEnvEnvironmentRecordDataService;
+import com.casic.missiles.service.resource.IEnvLocationInfoService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
 import java.util.List;
@@ -39,6 +43,8 @@
     private IEnvEnvironmentRecordDataService environmentRecordDataService;
     @Autowired
     private IEnvEnvironmentRecordConfigService environmentRecordConfigService;
+    @Autowired
+    private IEnvLocationInfoService locationInfoService;
 
     @ApiOperation("环境记录单数据列表/详情")
     @PostMapping("/data/listPage")
@@ -95,4 +101,11 @@
         });
         return environmentRecordConfigService.deleteEnvironmentRecordConfig(idDTO.getId());
     }
+
+    @ApiOperation("地点列表")
+    @PostMapping("/location/listPage")
+    public ReturnDTO<PageInfoBT<LocationListResponse>> locationListPage(@RequestBody @Valid LocationListRequest request) {
+        Page<LocationListResponse> page = PageFactory.defaultPage();
+        return ReturnUtil.success(super.packForBT(locationInfoService.listPage(page, request)));
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java
index 82efe3f..e9561fa 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java
@@ -10,6 +10,7 @@
 import com.casic.missiles.dto.resource.seal.SealLogListRequest;
 import com.casic.missiles.dto.resource.seal.SealNoteApprovalListRequest;
 import com.casic.missiles.dto.resource.seal.SealNoteSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceSealUseLog;
@@ -27,6 +28,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -58,6 +60,13 @@
         return sealUseNoteService.saveSeal(request);
     }
 
+    @ApiOperation("印章使用登记导出（列表和导出中去掉经办人和监印人）")
+    @PostMapping("/listExport")
+    public void export(@RequestBody SealNoteApprovalListRequest request) throws Exception {
+        List<BizResourceSealUseNote> list = super.exportList(request);
+        super.exportExcel(BizResourceSealUseNote.class, list, ExportEnum.SEAL_NOTE.getSheetName());
+    }
+
     // TODO: 2023/7/28 印章使用日志：系统中使用印章时插入数据库
 
     @ApiOperation("印章使用日志列表（分页）")
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java
index 9b674fc..06b6521 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java
@@ -9,16 +9,20 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.resource.staff.StaffCertRequest;
 import com.casic.missiles.dto.resource.staff.StaffCertResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.service.resource.IBizResourceStaffInfoService;
 import com.casic.missiles.service.resource.IBizResourceStaffVerifierService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.List;
+
 /**
  * @Description:
  * @Author: wangpeng
@@ -41,9 +45,21 @@
         return ReturnUtil.success(super.packForBT(responsePage));
     }
 
+    @ApiOperation("证书逾期提醒导出")
+    @PostMapping("/listExport")
+    public void exportList(@RequestBody StaffCertRequest request) throws Exception {
+        List<StaffCertResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = staffInfoService.certListByIds(request.getIds());
+        } else {
+            list = staffInfoService.certList(request);
+        }
+        super.exportExcel(StaffCertResponse.class, list, ExportEnum.STAFF_CERTIFICATE_EXPIRE.getSheetName());
+    }
+
     @ApiOperation("证书逾期提醒")
     @PostMapping("/expirationReminder")
-    public ReturnDTO expirationReminder(@RequestBody IdDTO idDto) {
-        return verifierService.expirationReminder(idDto);
+    public ReturnDTO expirationReminder(@RequestBody IdDTO idDTO) {
+        return verifierService.expirationReminder(idDTO);
     }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java
index 3b251ad..a6e7850 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java
@@ -12,6 +12,7 @@
 import com.casic.missiles.dto.resource.staff.StaffListRequest;
 import com.casic.missiles.dto.resource.staff.TrainListRequest;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.*;
@@ -22,7 +23,10 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
 import java.util.List;
@@ -52,8 +56,19 @@
             throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
         }
         Page<BizResourceStaffInfo> page = PageFactory.defaultPage();
-        Page<BizResourceStaffInfo> responsePage = staffInfoService.listPage(page, request);
-        return ReturnUtil.success(super.packForBT(responsePage));
+        return ReturnUtil.success(super.packForBT(staffInfoService.listPage(page, request)));
+    }
+
+    @ApiOperation("人员登记导出")
+    @PostMapping("/listExport")
+    public void exportList(@RequestBody StaffListRequest request) throws Exception {
+        List<BizResourceStaffInfo> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = staffInfoService.listByIds(request.getIds());
+        } else {
+            list = staffInfoService.list(request);
+        }
+        super.exportExcel(BizResourceStaffInfo.class, list, ExportEnum.STAFF_INFO.getSheetName());
     }
 
     @ApiOperation("人员登记详情基础信息")
@@ -85,9 +100,9 @@
 
     @ApiOperation("科研教育列表（分页）")
     @PostMapping("/education/listPage")
-    public ReturnDTO<PageInfoBT<BizResourceStaffEducation>> educationListPage(@RequestBody IdDTO idDto) {
+    public ReturnDTO<PageInfoBT<BizResourceStaffEducation>> educationListPage(@RequestBody IdDTO idDTO) {
         Page<BizResourceStaffEducation> page = PageFactory.defaultPage();
-        Page<BizResourceStaffEducation> responsePage = staffInfoService.educationListPage(page, idDto);
+        Page<BizResourceStaffEducation> responsePage = staffInfoService.educationListPage(page, idDTO);
         return ReturnUtil.success(super.packForBT(responsePage));
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java
index af6aa86..d85d84a 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java
@@ -9,6 +9,7 @@
 import com.casic.missiles.dto.resource.outsideService.SupplierApprovalListRequest;
 import com.casic.missiles.dto.resource.outsideService.SupplierSaveResponse;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceSupplierAbility;
@@ -67,6 +68,13 @@
         return ReturnUtil.success(supplierInfoService.detail(idDTO.getId()));
     }
 
+    @ApiOperation("合格供方导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody SupplierApprovalListRequest request) throws Exception {
+        List<BizResourceSupplierInfo> list = super.exportList(request);
+        super.exportExcel(BizResourceSupplierInfo.class, list, ExportEnum.SUPPLIER_INFO.getSheetName());
+    }
+
     @ApiOperation("供方人员列表（分页）")
     @PostMapping("/person/listPage")
     public ReturnDTO<PageInfoBT<BizResourceSupplierPerson>> personListPage(@RequestBody IdDTO idDTO) {
diff --git a/casic-metering-api/src/main/resources/config/application.yml b/casic-metering-api/src/main/resources/config/application.yml
index 350db5f..ecff521 100644
--- a/casic-metering-api/src/main/resources/config/application.yml
+++ b/casic-metering-api/src/main/resources/config/application.yml
@@ -126,7 +126,7 @@
     #作者
     author: wangpeng
     #待生成对象表名
-    table-name: biz_equipment_technical_target_approval,biz_equipment_attachment_approval,biz_equipment_checkpoint_approval
+    table-name: biz_business_outsource_protocol
 
 reminder:
   #节点--common模块config包 ReminderNodeConfig配置
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
index 4a19e4e..d47d552 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
@@ -53,6 +53,7 @@
     SUGGEST_FORM_SAVE_FAILED(2509, "委托方意见登记表保存至草稿箱失败"),
     EXAMINE_FORM_SAVE_FAILED(2510, "要求、委托书及合同评审表保存至草稿箱失败"),
     CUSTOMER_EXIST_SAVE_FAILED(2511, "该委托方已存在，请重新选择"),
+    DUPLICATE_LOCATION_NO(2512, "地点编号已存在"),
 
     /**
      * 计量检定业务模块
@@ -68,6 +69,8 @@
     COMPLETE_SAMPLE_NOT_EXIST(2609, "检测中不存在扫描收入的样品"),
     CANNOT_CHANGE_MEASURE_INFO(2610, "无法更改非当前登录用户的检测信息"),
     NON_EXIST_ORDER_OR_SAMPLE(2611, "不存在该委托单或该委托单下的样品"),
+    OUTSOURCE_ACCESS_SAVE_FAILED(2612, "测试、校准或检定工作分包评审表保存至草稿箱失败"),
+    OUTSOURCE_PROTOCOL_SAVE_FAILED(2613, "测试、校准或检定工作分包协议书保存至草稿箱失败"),
 
     /**
      * 历史遗留备用
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
index 5089ad1..81a406b 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
@@ -10,54 +10,38 @@
     /**
      * 资源管理
      */
-    ENVIRONMENT_DATA_EXPORT("environmentData", "environmentData", "环境记录单数据"),
+    ENVIRONMENT_DATA_EXPORT("environmentData", "环境记录单数据", "环境记录单数据"),
+    STAFF_INFO("staffInfo", "人员登记", "人员登记"),
+    STAFF_CERTIFICATE_EXPIRE("certificateExpire", "证书逾期提醒", "证书逾期提醒"),
+    SUPPLIER_INFO("supplierInfo", "合格供方名录", "合格供方名录"),
+    CUSTOMER_INFO("customerInfo", "委托方名录", "委托方名录"),
+    CUSTOMER_SUGGEST_FORM("customerSuggestForm", "委托方意见登记表", "委托方意见登记表"),
+    SEAL_NOTE("sealNote", "印章使用登记", "印章使用登记"),
 
-    FILE_EXPORT("meterFileData", "meterFileData", "计量文件信息"),
-    TRAIN_PLAN_EXPORT("trainPlanData", "trainPlanData", "培训计划"),
-    TRAIN_LOG_EXPORT("trainLogData", "trainLogData", "培训记录"),
-    METER_ORGANIZE_EXPORT("meterOrganizeData", "meterOrganizeData", "计量组织"),
-    TRACE_SUPPLIER_EXPORT("traceSupplierData", "traceSupplierData", "溯源供方"),
-    SIGN_EXPORT("signData", "signData", "签名/签章"),
-    TEMPLATE_EXPORT("templateData", "templateData", "原始记录模板/证书报告模板"),
-    FIXED_ASSETS("meterFixedAssets", "meterFixedAssets", "固定资产"),
-    METER_EQUIPMENT("meterEquipment", "meterEquipment", "测量设备"),
-    CALIBRATION_TEST_EQUIPMENT("calibrationTestEquipment", "calibrationTestEquipment", "校准检定设备"),
-    MEASURE_ACCOUNT("measureAccount", "measureAccount", "测量工装"),
-    STANDARD_SUPPORT_EQUIPMENT("standardSupportEquipment", "standardSupportEquipment", "标准配套设备"),
-    STANDARD_EQUIPMENT("standardEquipment", "standardEquipment", "标准装置"),
-    FLOW_DEF_EXPORT("flowDefData", "flowDefData", "流程定义"),
-    STAFF_CERTIFICATE("certificate", "certificate", "计量人员证书"),
-    CHECK_INFO("checkInfo", "checkInfo", "设备管理点检测"),
-    EQUIPMENT_APPLY("equipmentApply", "equipmentApply", "设备借用"),
-    STANDARD_EQUIPMENT_REMIND("equipmentApplyRemind", "equipmentApplyRemind", "标准装置到期提醒"),
-    METER_PRICE("meterPrice", "meterPrice", "价格库"),
-    METER_STAFF("meterStaff", "meterStaff", "计量人员"),
-    STANDARD_EQUIPMENT_APPLY("standardEquipmentApply", "standardEquipmentApply", "标准装置申请"),
-    STATE_MANAGE_APPLY("stateManage", "stateManage", "状态管理"),
-    METER_ACCEPTANCE_CHECK("acceptanceCheck", "acceptanceCheck", "设备检修保养验收单"),
-    CUSTOMER_EXPORT("customerData", "customerData", "客户信息"),
-    ORDER_EXPORT("orderData", "orderData", "委托书信息"),
-    SAMPLE_EXPORT("sampleData", "sampleData", "样本信息"),
-    EXCHANGE_DATA("exchangeData", "exchangeData", "设备交接单"),
-    DISPATCH_DATA("dispatchData", "dispatchData", "设备收发"),
-    ENVIRONMENT_DATA("environmentData", "environmentData", "环境记录单"),
-    ORIGIN_DATA("originData", "originData", "原始记录"),
-    CERTIFICATE_REPORT("certificateReport", "certificateReport", "证书报告"),
-    ADVICE_EXPORT("adviceData", "adviceData", "客户反馈"),
-    HANDOUT_EXPORT("handoutData", "handoutData", "任务分发列表"),
-    OUTSOURCER_EXPORT("outsourcerData", "outsourcerData", "分包方"),
-    SITE_EXECUTIVE_EXPORT("siteExecutiveData", "siteExecutiveData", "现场测试、校准或检定"),
-    CERTIFICATE_PRINT_EXPORT("certificatePrintData", "certificatePrintData", "证书打印"),
-    DOWNLOAD_TEMPLATE("downloadTemplate", "downloadTemplate", "页面配置"),
-    OUTSOURCER_CERTIFICATE_EXPORT("outsourceCertificateData", "outsourceCertificateData", "分包证书"),
-    SETTLEMENT_INFO_EXPORT("settlementInfoData", "settlementInfoData", "业务结算"),
-    EQUIPMENT_REMIND("equipmentRemind", "equipmentRemind", "设备到期提醒"),
-    AGREEMENT_INFO_EXPORT("agreementInfoData", "agreementInfoData", "合同"),
-    WORK_STATISTICS_EXPORT("workStatisticsData", "workStatisticsData", "实时工作统计"),
-    DEPT_OUTPUT_EXPORT("deptOutputData", "deptOutputData", "部门产值分析"),
-    WORKLOAD_EXPORT("workloadData", "workloadData", "业务工作量分析"),
-    DEPT_COMPREHENSIVE_EXPORT("deptComprehensiveData", "deptComprehensiveData", "部门综合分析"),
-    ENVIRONMENTAL_RECORD("environmentalRecordData", "environmentalRecordData", "现场环境记录");
+    /**
+     * 计量检定业务
+     */
+    OUTSOURCER_EXPORT("outsourcerData", "分包方名录", "分包方名录"),
+    IDENTIFY_EXPORT("identifyData", "计量标识", "计量标识"),
+    ORDER_EXPORT("orderData", "任务单", "任务单"),
+    DISPATCH_DATA("dispatchData", "设备收发", "设备收发"),
+    HANDOUT_EXPORT("handoutData", "任务分发", "任务分发"),
+    SITE_EXECUTIVE_EXPORT("siteExecutiveData", "现场测试、校准或检定", "现场测试、校准或检定"),
+    CERTIFICATE_REPORT("certificateReport", "证书审批", "证书审批"),
+    CERTIFICATE_CHANGE_APPLY("certificateChangeApply", "证书报告补充或更换申请单", "证书报告补充或更换申请单"),
+    CERTIFICATE_PRINT("certificatePrintData", "证书打印审批", "证书打印审批"),
+    DEPT_EXECUTIVE_TASK("deptExecutiveTaskData", "实验室任务", "实验室任务"),
+    MY_EXECUTIVE_TASK("myExecutiveTaskData", "我的任务", "我的任务"),
+    OUTSOURCE_ASSESS("outsourceAssess", "测试、校准或检定工作分包评审表", "测试、校准或检定工作分包评审表"),
+    OUTSOURCE_PROTOCOL("outsourceProtocol", "测试、校准或检定工作分包协议书", "测试、校准或检定工作分包协议书"),
+
+    /**
+     * 系统管理
+     */
+    SIGN_EXPORT("signData", "签名", "签名"),
+    TEMPLATE_EXPORT("templateData", "文件模板", "文件模板"),
+    FLOW_DEF_EXPORT("flowDefData", "流程定义", "流程定义"),
+    DOWNLOAD_TEMPLATE("downloadTemplate", "流程定义", "页面配置");
 
     ExportEnum(String fileName, String sheetName, String description) {
         this.fileName = fileName;
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateRecordTypeCodeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateRecordTypeCodeEnum.java
index 31d913c..a963522 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateRecordTypeCodeEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateRecordTypeCodeEnum.java
@@ -46,4 +46,14 @@
     String SITE_EXECUTIVE_APPROVAL = "01";
     //《现场测试、校准或检定工作记录表》
     String SITE_EXECUTIVE_LOG = "02";
+
+    //测试、校准或检定工作分包协议书
+    String OUTSOURCE_PROTOCOL = "01";
+    //测试、校准或检定工作分包评审表
+    String OUTSOURCE_ACCESS = "02";
+    //测试、校准或检定工作分包通知书
+    String OUTSOURCE_NOTICE = "03";
+    //测试、校准或检定工作分包方名录
+    String OUTSOURCE_INFO = "04";
+
 }
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
index 24b8635..f78bd53 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
@@ -15,6 +15,10 @@
     String CERTIFICATE_CHANGE_APPLY_BEAN_NAME = "certificateChangeApplyBean";
     //现场测试、校准或检定
     String SITE_EXECUTIVE_BEAN_NAME = "siteExecutiveBean";
+    //测试、校准或检定工作分包评审表
+    String OUTSOURCE_ASSESS_BEAN_NAME = "outsourceAssessBean";
+    //测试、校准或检定工作分包协议书
+    String OUTSOURCE_PROTOCOL_BEAN_NAME = "outsourceProtocolBean";
 
     /*********************************设备与装置************************************/
     //设备台账
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 b21c661..6b86fd1 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
@@ -18,6 +18,8 @@
     OUTSOURCER_APPROVAL(OUTSOURCER_BEAN_NAME, ""),
     CERTIFICATE_CHANGE_APPROVAL(CERTIFICATE_CHANGE_APPLY_BEAN_NAME, ""),
     SITE_EXECUTIVE_APPROVAL(SITE_EXECUTIVE_BEAN_NAME, ""),
+    OUTSOURCE_ASSESS_APPROVAL(OUTSOURCE_ASSESS_BEAN_NAME, ""),
+    OUTSOURCE_PROTOCOL_APPROVAL(OUTSOURCE_PROTOCOL_BEAN_NAME, ""),
 
     ACTION_STATUS_MAP(new HashMap<String, AwareActionStatusEnum>() {
         {
@@ -47,6 +49,10 @@
             put(ApplyFromIdEnum.CERTIFICATE_CHANGE_APPROVAL.getCode(), CERTIFICATE_CHANGE_APPROVAL);
             //现场测试、校准或检定审批
             put(ApplyFromIdEnum.SITE_EXECUTIVE_APPROVAL.getCode(), SITE_EXECUTIVE_APPROVAL);
+            //测试、校准或检定工作分包评审表
+            put(ApplyFromIdEnum.OUTSOURCE_ASSESS_APPROVAL.getCode(), OUTSOURCE_ASSESS_APPROVAL);
+            //测试、校准或检定工作分包协议书
+            put(ApplyFromIdEnum.OUTSOURCE_PROTOCOL_APPROVAL.getCode(), OUTSOURCE_PROTOCOL_APPROVAL);
         }
     });
     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 934405e..c7410bd 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
@@ -9,6 +9,8 @@
     CERTIFICATE_CHANGE_APPROVAL("jljdywzsbchghsqd", MessageSourceModuleEnum.BUSINESS.getCode(), "证书/报告补充或更换申请单"),
     OUTSOURCER_APPROVAL("jljdywcsjzhgfbfml", MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定合格分包方名录"),
     SITE_EXECUTIVE_APPROVAL("jljdywxccsjzsp", MessageSourceModuleEnum.BUSINESS.getCode(), "现场测试、校准或检定审批"),
+    OUTSOURCE_ASSESS_APPROVAL("jljdywcsjzfbpsb", MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包评审表"),
+    OUTSOURCE_PROTOCOL_APPROVAL("jljdywcsjzfbxys", MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包协议书"),
 
 
     /*******************************************设备与装置*********************************************/
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/GeneralApprovalMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/GeneralApprovalMapper.java
index 4fb7344..0c9d6ae 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/GeneralApprovalMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/GeneralApprovalMapper.java
@@ -17,8 +17,4 @@
 
     Page<O> selectBatchForApprovalList(Page<O> page, @Param("request") R request, @Param("businessKeys") List<String> businessKeys);
 
-//    Page<O> selectListPage(Page<O> page, @Param("request") R request);
-
-//    Long selectMaxNo();
-
 }
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceAssessMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceAssessMapper.java
index 7867bb8..ba59009 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceAssessMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceAssessMapper.java
@@ -1,7 +1,12 @@
 package com.casic.missiles.mapper.business;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.business.outsource.OutsourceAssessApprovalListRequest;
+import com.casic.missiles.mapper.GeneralApprovalMapper;
 import com.casic.missiles.model.business.BizBusinessOutsourceAssess;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * <p>
@@ -11,6 +16,10 @@
  * @author wangpeng
  * @since 2023-08-16
  */
-public interface BizBusinessOutsourceAssessMapper extends BaseMapper<BizBusinessOutsourceAssess> {
+public interface BizBusinessOutsourceAssessMapper extends GeneralApprovalMapper<BizBusinessOutsourceAssess, BizBusinessOutsourceAssess, OutsourceAssessApprovalListRequest> {
+
+    Page<BizBusinessOutsourceAssess> selectBatchForApprovalList(Page<BizBusinessOutsourceAssess> page, @Param("request") OutsourceAssessApprovalListRequest request, @Param("businessKeys") List<String> businessKeys);
+
+    Long selectMaxProjectNo();
 
 }
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceProtocolMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceProtocolMapper.java
new file mode 100644
index 0000000..e6aba35
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceProtocolMapper.java
@@ -0,0 +1,24 @@
+package com.casic.missiles.mapper.business;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.business.outsource.OutsourceProtocolApprovalListRequest;
+import com.casic.missiles.mapper.GeneralApprovalMapper;
+import com.casic.missiles.model.business.BizBusinessOutsourceProtocol;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 计量检定业务-分包管理-测试、校准或检定工作分包协议书 Mapper 接口
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-08-24
+ */
+public interface BizBusinessOutsourceProtocolMapper extends GeneralApprovalMapper<BizBusinessOutsourceProtocol, BizBusinessOutsourceProtocol, OutsourceProtocolApprovalListRequest> {
+
+    Page<BizBusinessOutsourceProtocol> selectBatchForApprovalList(Page<BizBusinessOutsourceProtocol> page, @Param("request") OutsourceProtocolApprovalListRequest request, @Param("businessKeys") List<String> businessKeys);
+
+    Long selectMaxProtocolNo();
+}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/EnvLocationInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/EnvLocationInfoMapper.java
new file mode 100644
index 0000000..49eff87
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/EnvLocationInfoMapper.java
@@ -0,0 +1,21 @@
+package com.casic.missiles.mapper.resource;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.resource.environment.LocationListRequest;
+import com.casic.missiles.dto.resource.environment.LocationListResponse;
+import com.casic.missiles.model.resource.EnvLocationInfo;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * <p>
+ * 实验室环境监控系统-设备表 Mapper 接口
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-06-07
+ */
+public interface EnvLocationInfoMapper extends BaseMapper<EnvLocationInfo> {
+
+    Page<LocationListResponse> selectLocationListPage(Page<LocationListResponse> page, @Param("request") LocationListRequest request);
+}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java
index de124db..85ed0f7 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java
@@ -1,7 +1,9 @@
 package com.casic.missiles.mapper.system;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.dto.system.SignDetailResponse;
+import com.casic.missiles.dto.system.SignListRequest;
 import com.casic.missiles.model.system.SystemSign;
 import org.apache.ibatis.annotations.Param;
 
@@ -22,4 +24,8 @@
     SignDetailResponse selectSignDetailById(Long id);
 
     List<SystemSign> selectUsableSignList(@Param("userId") Long userId);
+
+    Page<SystemSign> selectSignListPage(Page<SystemSign> page, @Param("request") SignListRequest request);
+
+    List<SystemSign> selectSignList(@Param("request") SignListRequest request);
 }
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateChangeApplyMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateChangeApplyMapper.xml
index d798447..c496092 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateChangeApplyMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateChangeApplyMapper.xml
@@ -30,31 +30,31 @@
         SELECT *
         FROM biz_business_certificate_change_apply
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.changeApplyNo != null and request.changeApplyNo !=''">
+        <if test="request != null and request.changeApplyNo != null and request.changeApplyNo !=''">
             and change_apply_no like concat('%',#{request.changeApplyNo},'%')
         </if>
-        <if test="request.changeReportNo != null and request.changeReportNo !=''">
+        <if test="request != null and request.changeReportNo != null and request.changeReportNo !=''">
             and change_report_no like concat('%',#{request.changeReportNo},'%')
         </if>
-        <if test="request.changeReportName != null and request.changeReportName !=''">
+        <if test="request != null and request.changeReportName != null and request.changeReportName !=''">
             and change_report_name like concat('%',#{request.changeReportName},'%')
         </if>
-        <if test="request.changeType != null and request.changeType !=''">
+        <if test="request != null and request.changeType != null and request.changeType !=''">
             and change_type = #{request.changeType}
         </if>
-        <if test="request.createUserName != null and request.createUserName !=''">
+        <if test="request != null and request.createUserName != null and request.createUserName !=''">
             and create_user_name like concat('%',#{request.createUserName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificatePrintMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificatePrintMapper.xml
index b66cd99..49c0ac8 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificatePrintMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificatePrintMapper.xml
@@ -31,34 +31,34 @@
         LEFT JOIN biz_business_order_sample_relation bosr ON (bosr.order_id = bcr.order_id AND bosr.sample_id = bcr.sample_id)
         LEFT JOIN biz_business_order_info boi ON boi.id = bosr.order_id
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and bcp.approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.printStatus != null and request.printStatus !=''">
+        <if test="request != null and request.printStatus != null and request.printStatus !=''">
             and print_status = #{request.printStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and bcp.create_user_id = #{request.createUserId}
         </if>
-        <if test="request.certificateReportNo != null and request.certificateReportNo !=''">
+        <if test="request != null and request.certificateReportNo != null and request.certificateReportNo !=''">
             and bcr.certificate_report_no like concat('%',#{request.certificateReportNo},'%')
         </if>
-        <if test="request.certificateReportName != null and request.certificateReportName !=''">
+        <if test="request != null and request.certificateReportName != null and request.certificateReportName !=''">
             and bcr.certificate_report_name like concat('%',#{request.certificateReportName},'%')
         </if>
-        <if test="request.customerName != null and request.customerName !=''">
+        <if test="request != null and request.customerName != null and request.customerName !=''">
             and boi.customer_name like concat('%',#{request.customerName},'%')
         </if>
-        <if test="request.sampleNo != null and request.sampleNo !=''">
+        <if test="request != null and request.sampleNo != null and request.sampleNo !=''">
             and bosr.sample_no like concat('%',#{request.sampleNo},'%')
         </if>
-        <if test="request.sampleName != null and request.sampleName !=''">
+        <if test="request != null and request.sampleName != null and request.sampleName !=''">
             and bosr.sample_name like concat('%',#{request.sampleName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and bcp.create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and bcp.create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml
index b366034..767695d 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml
@@ -46,33 +46,37 @@
         SELECT bcr.*, bosr.sample_no, bosr.sample_name, bosr.sample_model, rsi.staff_name
         FROM biz_business_certificate_report bcr
         LEFT JOIN biz_business_order_sample_relation bosr ON (bosr.order_id = bcr.order_id AND bosr.sample_id = bcr.sample_id)
+        LEFT JOIN biz_business_order_info boi ON boi.id = bcr.order_id
         LEFT JOIN biz_resource_staff_info rsi ON rsi.id = bcr.measure_person_id
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and bcr.approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and bcr.create_user_id = #{request.createUserId}
         </if>
-        <if test="request.certificateReportNo != null and request.certificateReportNo !=''">
+        <if test="request != null and request.customerId != null and request.customerId !=''">
+            and boi.customer_id = #{request.customerId}
+        </if>
+        <if test="request != null and request.certificateReportNo != null and request.certificateReportNo !=''">
             and bcr.certificate_report_no like concat('%',#{request.certificateReportNo},'%')
         </if>
-        <if test="request.certificateReportName != null and request.certificateReportName !=''">
+        <if test="request != null and request.certificateReportName != null and request.certificateReportName !=''">
             and bcr.certificate_report_name like concat('%',#{request.certificateReportName},'%')
         </if>
-        <if test="request.sampleNo != null and request.sampleNo !=''">
+        <if test="request != null and request.sampleNo != null and request.sampleNo !=''">
             and bosr.sample_no like concat('%',#{request.sampleNo},'%')
         </if>
-        <if test="request.measureCategory != null and request.measureCategory !=''">
+        <if test="request != null and request.measureCategory != null and request.measureCategory !=''">
             and bcr.measure_category = #{request.measureCategory}
         </if>
-        <if test="request.measurePerson != null and request.measurePerson !=''">
+        <if test="request != null and request.measurePerson != null and request.measurePerson !=''">
             and rsi.staff_name like concat('%',#{request.measurePerson},'%')
         </if>
-        <if test="request.calibrationTimeStart != null and request.calibrationTimeStart !=''">
+        <if test="request != null and request.calibrationTimeStart != null and request.calibrationTimeStart !=''">
             and bcr.calibration_time &gt;= #{request.calibrationTimeStart}
         </if>
-        <if test="request.calibrationTimeEnd != null and request.calibrationTimeEnd !=''">
+        <if test="request != null and request.calibrationTimeEnd != null and request.calibrationTimeEnd !=''">
             and bcr.calibration_time &lt;= #{request.calibrationTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceAssessMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceAssessMapper.xml
index d0fcf8b..c22c101 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceAssessMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceAssessMapper.xml
@@ -7,6 +7,8 @@
         <id column="id" property="id" />
         <result column="project_no" property="projectNo" />
         <result column="project_name" property="projectName" />
+        <result column="lab_code" property="labCode" />
+        <result column="group_code" property="groupCode" />
         <result column="applicant_id" property="applicantId" />
         <result column="applicant_name" property="applicantName" />
         <result column="applicant_time" property="applicantTime" />
@@ -31,7 +33,45 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, project_no, project_name, applicant_id, applicant_name, applicant_time, minio_file_name, remark, create_user_id, create_user_name, outsourcer_id, pre_start_time, pre_end_time, outsource_reason, pre_cost, approval_status, process_id, approve_situation, traceability, test_method, technique_ability, create_time, update_time
+        id, project_no, project_name, lab_code, group_code, applicant_id, applicant_name, applicant_time, minio_file_name, remark, create_user_id, create_user_name, outsourcer_id, pre_start_time, pre_end_time, outsource_reason, pre_cost, approval_status, process_id, approve_situation, traceability, test_method, technique_ability, create_time, update_time
     </sql>
 
+    <select id="selectMaxProjectNo" resultType="java.lang.Long">
+        SELECT IFNULL(max(RIGHT(project_no, 3)), 0) from biz_business_outsource_assess
+    </select>
+
+    <select id="selectBatchForApprovalList" resultMap="BaseResultMap">
+        SELECT bboa.*, bboi.outsourcer_name, bboi.director
+        FROM biz_business_outsource_assess bboa
+        LEFT JOIN biz_business_outsourcer_info bboi ON bboa.outsourcer_id = bboi.id
+        WHERE 1=1
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
+            and bboa.approval_status = #{request.approvalStatus}
+        </if>
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
+            and bboa.create_user_id = #{request.createUserId}
+        </if>
+        <if test="request != null and request.projectNo != null and request.projectNo !=''">
+            and bboa.project_no like concat('%',#{request.projectNo},'%')
+        </if>
+        <if test="request != null and request.outsourcerName != null and request.outsourcerName !=''">
+            and bboi.outsourcer_name like concat('%',#{request.outsourcerName},'%')
+        </if>
+        <if test="request != null and request.applicantName != null and request.applicantName !=''">
+            and bboa.applicant_name like concat('%',#{request.applicantName},'%')
+        </if>
+        <if test="request != null and request.applicantTimeStart != null and request.applicantTimeStart !=''">
+            and bboa.applicant_time &gt;= #{request.applicantTimeStart}
+        </if>
+        <if test="request != null and request.applicantTimeEnd != null and request.applicantTimeEnd !=''">
+            and bboa.applicant_time &lt;= #{request.applicantTimeEnd}
+        </if>
+        <if test="businessKeys != null">
+            and bboa.id in
+            <foreach collection="businessKeys" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
+        ORDER BY bboa.create_time DESC
+    </select>
 </mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceProtocolMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceProtocolMapper.xml
new file mode 100644
index 0000000..b7b2149
--- /dev/null
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceProtocolMapper.xml
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.mapper.business.BizBusinessOutsourceProtocolMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.business.BizBusinessOutsourceProtocol">
+        <id column="id" property="id" />
+        <result column="protocol_no" property="protocolNo" />
+        <result column="project_name" property="projectName" />
+        <result column="lab_code" property="labCode" />
+        <result column="group_code" property="groupCode" />
+        <result column="outsourcer_id" property="outsourcerId" />
+        <result column="remark" property="remark" />
+        <result column="outsource_no" property="outsourceNo" />
+        <result column="outsource_name" property="outsourceName" />
+        <result column="contacts" property="contacts" />
+        <result column="mobile" property="mobile" />
+        <result column="address" property="address" />
+        <result column="require_date" property="requireDate" />
+        <result column="outsource_cost" property="outsourceCost" />
+        <result column="director" property="director" />
+        <result column="item" property="item" />
+        <result column="requires" property="requires" />
+        <result column="create_user_id" property="createUserId" />
+        <result column="create_user_name" property="createUserName" />
+        <result column="approval_status" property="approvalStatus" />
+        <result column="process_id" property="processId" />
+        <result column="create_time" property="createTime" />
+        <result column="update_time" property="updateTime" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, protocol_no, project_name, lab_code, group_code, outsourcer_id, remark, outsource_no, outsource_name, contacts, mobile, address, require_date, outsource_cost, director, item, requires, create_user_id, create_user_name, approval_status, process_id, create_time, update_time
+    </sql>
+
+    <select id="selectMaxProtocolNo" resultType="java.lang.Long">
+        SELECT IFNULL(max(RIGHT(protocol_no, 3)), 0) from biz_business_outsource_protocol
+    </select>
+
+    <select id="selectBatchForApprovalList" resultMap="BaseResultMap">
+        SELECT *
+        FROM biz_business_outsource_protocol
+        WHERE 1=1
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
+            and approval_status = #{request.approvalStatus}
+        </if>
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
+            and create_user_id = #{request.createUserId}
+        </if>
+        <if test="request != null and request.protocolNo != null and request.protocolNo !=''">
+            and protocol_no like concat('%',#{request.protocolNo},'%')
+        </if>
+        <if test="request != null and request.outsourcerName != null and request.outsourcerName !=''">
+            and outsourcer_name like concat('%',#{request.outsourcerName},'%')
+        </if>
+        <if test="request != null and request.applicantName != null and request.applicantName !=''">
+            and create_user_name like concat('%',#{request.applicantName},'%')
+        </if>
+        <if test="request != null and request.applicantTimeStart != null and request.applicantTimeStart !=''">
+            and create_time &gt;= #{request.applicantTimeStart}
+        </if>
+        <if test="request != null and request.applicantTimeEnd != null and request.applicantTimeEnd !=''">
+            and create_time &lt;= #{request.applicantTimeEnd}
+        </if>
+        <if test="businessKeys != null">
+            and id in
+            <foreach collection="businessKeys" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
+        ORDER BY create_time DESC
+    </select>
+</mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourcerInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourcerInfoMapper.xml
index 510a80b..3049b54 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourcerInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourcerInfoMapper.xml
@@ -7,6 +7,8 @@
         <id column="id" property="id" />
         <result column="outsourcer_no" property="outsourcerNo" />
         <result column="outsourcer_name" property="outsourcerName" />
+        <result column="lab_code" property="labCode" />
+        <result column="group_code" property="groupCode" />
         <result column="outsourcer_brief_name" property="outsourcerBriefName" />
         <result column="outsourcer_size" property="outsourcerSize" />
         <result column="business_size" property="businessSize" />
@@ -55,32 +57,32 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, outsourcer_no, outsourcer_name, outsourcer_brief_name, outsourcer_size, business_size, grade, evaluation, tax_number, bank_account, bank_name, bank_account_number, postal_code, director, phone, fax, mobile, email, website, address_country, address_province, address_city, address_area, full_address, address_country_name, address_province_name, address_city_name, address_area_name, invoice_country, invoice_province, invoice_city, invoice_area, invoice_full_address, invoice_country_name, invoice_province_name, invoice_city_name, invoice_area_name, business_scope, business_content, minio_file_name, approval_status, process_id, remark, create_user_id, create_user_name, create_time, update_time
+        id, outsourcer_no, outsourcer_name, lab_code, group_code, outsourcer_brief_name, outsourcer_size, business_size, grade, evaluation, tax_number, bank_account, bank_name, bank_account_number, postal_code, director, phone, fax, mobile, email, website, address_country, address_province, address_city, address_area, full_address, address_country_name, address_province_name, address_city_name, address_area_name, invoice_country, invoice_province, invoice_city, invoice_area, invoice_full_address, invoice_country_name, invoice_province_name, invoice_city_name, invoice_area_name, business_scope, business_content, minio_file_name, approval_status, process_id, remark, create_user_id, create_user_name, create_time, update_time
     </sql>
 
     <select id="selectBatchForApprovalList" resultMap="BaseResultMap">
         SELECT *
         FROM biz_business_outsourcer_info
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.outsourcerNo != null and request.outsourcerNo !=''">
+        <if test="request != null and request.outsourcerNo != null and request.outsourcerNo !=''">
             and outsourcer_no like concat('%',#{request.outsourcerNo},'%')
         </if>
-        <if test="request.outsourcerName != null and request.outsourcerName !=''">
+        <if test="request != null and request.outsourcerName != null and request.outsourcerName !=''">
             and outsourcer_name like concat('%',#{request.outsourcerName},'%')
         </if>
-        <if test="request.director != null and request.director !=''">
+        <if test="request != null and request.director != null and request.director !=''">
             and director like concat('%',#{request.director},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
@@ -93,6 +95,6 @@
     </select>
 
     <select id="selectMaxNo" resultType="java.lang.Long">
-        SELECT IFNULL(max(RIGHT(outsourcer_no, 12)), 0) from biz_business_outsourcer_info
+        SELECT IFNULL(max(RIGHT(outsourcer_no, 3)), 0) from biz_business_outsourcer_info
     </select>
 </mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessSiteExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessSiteExecutiveInfoMapper.xml
index 135c5d0..3c5ae79 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessSiteExecutiveInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessSiteExecutiveInfoMapper.xml
@@ -38,25 +38,25 @@
         FROM biz_business_site_executive_info bsei
         LEFT JOIN biz_resource_customer_info rci ON bsei.customer_id = rci.id
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and bsei.approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and bsei.create_user_id = #{request.createUserId}
         </if>
-        <if test="request.siteExecutiveNo != null and request.siteExecutiveNo !=''">
+        <if test="request != null and request.siteExecutiveNo != null and request.siteExecutiveNo !=''">
             and bsei.site_executive_no like concat('%',#{request.siteExecutiveNo},'%')
         </if>
-        <if test="request.customerName != null and request.customerName !=''">
+        <if test="request != null and request.customerName != null and request.customerName !=''">
             and rci.outsourcer_name like concat('%',#{request.customerName},'%')
         </if>
-        <if test="request.applyName != null and request.applyName !=''">
+        <if test="request != null and request.applyName != null and request.applyName !=''">
             and bsei.apply_name like concat('%',#{request.applyName},'%')
         </if>
-        <if test="request.applyTimeStart != null and request.applyTimeStart !=''">
+        <if test="request != null and request.applyTimeStart != null and request.applyTimeStart !=''">
             and bsei.apply_time &gt;= #{request.applyTimeStart}
         </if>
-        <if test="request.applyTimeEnd != null and request.applyTimeEnd !=''">
+        <if test="request != null and request.applyTimeEnd != null and request.applyTimeEnd !=''">
             and bsei.apply_time &lt;= #{request.applyTimeEnd}
         </if>
         <if test="businessKeys != null">

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java
index bb0c50f..13a699b 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java
@@ -12,6 +12,7 @@
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.IGeneralApprovalService;
+import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
@@ -19,6 +20,7 @@
 import org.springframework.web.bind.annotation.RequestBody;
 
 import javax.validation.Valid;
+import java.util.List;
 import java.util.Objects;
 
 /**
@@ -117,4 +119,17 @@
         }
         return baseApprovalService.failUpdate(request);
     }
+
+    public List<O> exportList(@RequestBody @Valid R request) throws Exception {
+        List<O> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = baseApprovalService.listExportByIds(request.getIds());
+        } else {
+            list = baseApprovalService.listExport(request);
+        }
+        for (O record : list) {
+            DictCodeUtils.convertDictCodeToName(record);
+        }
+        return list;
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java
index 8a90961..d775831 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java
@@ -5,6 +5,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.business.certificate.CertificateChangeApplyApprovalListRequest;
 import com.casic.missiles.dto.business.certificate.CertificateChangeApplySaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessCertificateChangeApply;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
@@ -20,6 +21,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -48,4 +50,12 @@
         }
         return changeApplyService.saveChangeApply(request);
     }
+
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody CertificateChangeApplyApprovalListRequest request) throws Exception {
+        List<BizBusinessCertificateChangeApply> list = super.exportList(request);
+        super.exportExcel(BizBusinessCertificateChangeApply.class, list, ExportEnum.CERTIFICATE_CHANGE_APPLY.getSheetName());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java
index 5fc4b07..af8230e 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java
@@ -9,6 +9,7 @@
 import com.casic.missiles.dto.business.certificate.CertificatePrintApprovalListRequest;
 import com.casic.missiles.dto.business.certificate.CertificatePrintListResponse;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.enums.business.CertificatePrintStatusEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessCertificatePrintLog;
@@ -18,10 +19,16 @@
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.io.IOException;
+import java.util.List;
 import java.util.Objects;
 
 /**
@@ -98,4 +105,16 @@
         });
         return certificatePrintService.certificatePrintLog(idDTO.getId());
     }
+
+    @ApiOperation("证书打印审批导出")
+    @PostMapping("/listExport")
+    public void exportList(@RequestBody CertificatePrintApprovalListRequest request) throws IOException {
+        List<CertificatePrintListResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = certificatePrintService.listByIds(request.getIds());
+        } else {
+            list = certificatePrintService.list(request);
+        }
+        super.exportExcel(CertificatePrintListResponse.class, list, ExportEnum.CERTIFICATE_PRINT.getSheetName());
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java
index 63b06dc..6b2efd5 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java
@@ -6,6 +6,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.business.certificate.CertificateReportApprovalListRequest;
 import com.casic.missiles.dto.business.certificate.CertificateReportSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessCertificateReport;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
@@ -21,6 +22,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -50,7 +52,7 @@
         return certificateReportService.saveCertificateReport(request);
     }
 
-    @ApiOperation("证书审批详情（基本信息）")
+    @ApiOperation("详情（基本信息）")
     @PostMapping("/detail")
     public ReturnDTO<BizBusinessCertificateReport> detail(@RequestBody @Valid BaseDetailRequest request, BindingResult bindingResult) throws Exception {
         if(bindingResult.hasErrors()){
@@ -59,4 +61,11 @@
         return certificateReportService.detail(request);
     }
 
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody CertificateReportApprovalListRequest request) throws Exception {
+        List<BizBusinessCertificateReport> list = super.exportList(request);
+        super.exportExcel(BizBusinessCertificateReport.class, list, ExportEnum.CERTIFICATE_REPORT.getSheetName());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java
index 46b26bd..57c0809 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java
@@ -10,20 +10,21 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.business.identify.IdentifyListRequest;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessIdentifyInfo;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.business.IBizBusinessIdentifyInfoService;
+import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import javax.validation.Valid;
+import java.util.List;
 import java.util.Objects;
 
 /**
@@ -57,16 +58,13 @@
         return identifyInfoService.addIdentify(identifyInfo);
     }
 
-    @ApiOperation("标识打印更新")
+    @ApiOperation("标识打印更新（更新打印时间）")
     @PostMapping("/update")
-    public ReturnDTO updateIdentify(@RequestBody @Valid BizBusinessIdentifyInfo identifyInfo, BindingResult bindingResult) {
-        Assert.isFalse(Objects.isNull(identifyInfo.getId()), () -> {
+    public ReturnDTO updateIdentify(@RequestBody @Valid IdDTO idDTO) {
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        Assert.isFalse(bindingResult.hasErrors(), () -> {
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        });
-        return identifyInfoService.updateIdentify(identifyInfo);
+        return identifyInfoService.updateIdentify(idDTO.getId());
     }
 
     @ApiOperation("标识打印删除")
@@ -77,4 +75,37 @@
         });
         return identifyInfoService.deleteIdentify(idDTO.getId());
     }
+
+    @ApiOperation("标识打印导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody @Valid IdentifyListRequest request, BindingResult bindingResult) throws Exception {
+        if (bindingResult.hasErrors()) {
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        List<BizBusinessIdentifyInfo> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = identifyInfoService.listByIds(request.getIds());
+        } else {
+            list = identifyInfoService.list(request);
+        }
+        for (BizBusinessIdentifyInfo record : list) {
+            DictCodeUtils.convertDictCodeToName(record);
+        }
+        super.exportExcel(BizBusinessIdentifyInfo.class, list, ExportEnum.IDENTIFY_EXPORT.getSheetName());
+    }
+
+
+    // TODO: 2023/8/23 查询设备信息，4个底部按钮查设备（按钮的作用就是前端用来调不同接口、用来区分中间即将展示的标识），前端弹窗选设备，在确定保存时前端根据底部按钮判断传入设备类型deviceType字典code
+    // TODO: 2023/8/23 接口：查受检设备（第1个按钮），查设备台账（后3个按钮同一接口），查询之后前端根据标志类型的不同加到中间页面时进行判断（按产品给的对应表）
+    // TODO: 2023/8/23 提供二维码接口，前端在加到中间页面时调用一下
+
+    @ApiOperation("设备二维码")
+    @PostMapping("/equipment/qrCode")
+    public ReturnDTO<String> equipmentQrCode(@RequestBody @Valid IdDTO idDTO) {
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return identifyInfoService.equipmentQrCode(idDTO.getId());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java
index 707be6e..7e0453d 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java
@@ -117,7 +117,7 @@
     }
 
     @ApiOperation("任务单导出")
-    @PostMapping("/export")
+    @PostMapping("/listExport")
     public void orderExport(@RequestBody @Valid OrderListRequest request, HttpServletResponse response) {
         businessOrderService.orderExport(request, response);
     }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java
index 529a6ce..51432be 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java
@@ -1,9 +1,28 @@
 package com.casic.missiles.controller.business;
 
+import com.casic.missiles.controller.GeneralApprovalController;
+import com.casic.missiles.dto.BaseApprovalSubmitRequest;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.business.outsource.OutsourceAssessApprovalListRequest;
+import com.casic.missiles.dto.business.outsource.OutsourceAssessSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
+import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.model.business.BizBusinessOutsourceAssess;
+import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
+import com.casic.missiles.service.IGeneralApprovalService;
+import com.casic.missiles.service.business.IBizBusinessOutsourceAssessService;
 import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.BindingResult;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.validation.Valid;
+import java.util.List;
+
 /**
  * <p>
  * 计量检定业务-分包管理-测试、校准或检定工作分包评审表 前端控制器
@@ -15,6 +34,27 @@
 @Api(tags = "分包管理-测试、校准或检定工作分包评审表")
 @RestController
 @RequestMapping("/business/outsource/assess")
-public class BizBusinessOutsourceAssessController {
+public class BizBusinessOutsourceAssessController extends GeneralApprovalController<BizBusinessOutsourceAssess, BizBusinessOutsourceAssess, OutsourceAssessApprovalListRequest, BaseApprovalSubmitRequest> {
+    @Autowired
+    private IBizBusinessOutsourceAssessService outsourceAssessService;
 
+    public BizBusinessOutsourceAssessController(IGeneralApprovalService<BizBusinessOutsourceAssess, BizBusinessOutsourceAssess, OutsourceAssessApprovalListRequest, BaseApprovalSubmitRequest> baseApprovalService) {
+        super(baseApprovalService);
+    }
+
+    @ApiOperation("草稿箱-保存")
+    @PostMapping("/save")
+    public ReturnDTO<OutsourceAssessSaveResponse> saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceAssess request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        return outsourceAssessService.saveOutsourceAssess(request);
+    }
+
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception {
+        List<BizBusinessOutsourceAssess> list = super.exportList(request);
+        super.exportExcel(BizBusinessOutsourceAssess.class, list, ExportEnum.OUTSOURCE_ASSESS.getSheetName());
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java
new file mode 100644
index 0000000..9adef18
--- /dev/null
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java
@@ -0,0 +1,60 @@
+package com.casic.missiles.controller.business;
+
+import com.casic.missiles.controller.GeneralApprovalController;
+import com.casic.missiles.dto.BaseApprovalSubmitRequest;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.business.outsource.OutsourceProtocolApprovalListRequest;
+import com.casic.missiles.dto.business.outsource.OutsourceProtocolSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
+import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.model.business.BizBusinessOutsourceProtocol;
+import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
+import com.casic.missiles.service.IGeneralApprovalService;
+import com.casic.missiles.service.business.IBizBusinessOutsourceProtocolService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.BindingResult;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.validation.Valid;
+import java.util.List;
+
+/**
+ * <p>
+ * 计量检定业务-分包管理-测试、校准或检定工作分包协议书 前端控制器
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-08-24
+ */
+@Api(tags = "分包管理-测试、校准或检定工作分包协议书")
+@RestController
+@RequestMapping("/business/outsource/protocol")
+public class BizBusinessOutsourceProtocolController extends GeneralApprovalController<BizBusinessOutsourceProtocol, BizBusinessOutsourceProtocol, OutsourceProtocolApprovalListRequest, BaseApprovalSubmitRequest> {
+    @Autowired
+    private IBizBusinessOutsourceProtocolService outsourceProtocolService;
+
+    public BizBusinessOutsourceProtocolController(IGeneralApprovalService<BizBusinessOutsourceProtocol, BizBusinessOutsourceProtocol, OutsourceProtocolApprovalListRequest, BaseApprovalSubmitRequest> baseApprovalService) {
+        super(baseApprovalService);
+    }
+
+    @ApiOperation("草稿箱-保存")
+    @PostMapping("/save")
+    public ReturnDTO<OutsourceProtocolSaveResponse> saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceProtocol request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        return outsourceProtocolService.saveOutsourceProtocol(request);
+    }
+
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody OutsourceProtocolApprovalListRequest request) throws Exception {
+        List<BizBusinessOutsourceProtocol> list = super.exportList(request);
+        super.exportExcel(BizBusinessOutsourceProtocol.class, list, ExportEnum.OUTSOURCE_PROTOCOL.getSheetName());
+    }
+}
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java
index 097f645..f0f0943 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java
@@ -17,7 +17,6 @@
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.IGeneralApprovalService;
 import com.casic.missiles.service.business.IBizBusinessOutsourcerInfoService;
-import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -71,19 +70,8 @@
 
     @ApiOperation("分包方导出")
     @PostMapping("/listExport")
-    public void export(@RequestBody @Valid OutsourcerInfoApprovalListRequest request, BindingResult bindingResult) throws Exception {
-        if (bindingResult.hasErrors()) {
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        }
-        List<BizBusinessOutsourcerInfo> list;
-        if (!CollectionUtils.isEmpty(request.getIds())) {
-            list = outsourcerInfoService.listByIds(request.getIds());
-        } else {
-            list = outsourcerInfoService.list(request);
-        }
-        for (BizBusinessOutsourcerInfo record : list) {
-            DictCodeUtils.convertDictCodeToName(record);
-        }
+    public void export(@RequestBody OutsourcerInfoApprovalListRequest request) throws Exception {
+        List<BizBusinessOutsourcerInfo> list = super.exportList(request);
         super.exportExcel(BizBusinessOutsourcerInfo.class, list, ExportEnum.OUTSOURCER_EXPORT.getSheetName());
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java
index c2cbf9f..0410918 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java
@@ -17,11 +17,9 @@
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.IGeneralApprovalService;
 import com.casic.missiles.service.business.IBizBusinessSiteExecutiveInfoService;
-import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -60,7 +58,7 @@
         return siteExecutiveInfoService.saveSiteExecutiveInfo(siteExecutiveInfo);
     }
 
-    @ApiOperation("现场检测详情")
+    @ApiOperation("详情")
     @PostMapping("/detail")
     public ReturnDTO<SiteExecutiveDetailResponse> siteExecutiveDetail(@RequestBody @Valid IdDTO idDTO) throws Exception {
         Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
@@ -69,21 +67,10 @@
         return ReturnUtil.success(siteExecutiveInfoService.detail(idDTO.getId()));
     }
 
-    @ApiOperation("现场检测导出")
+    @ApiOperation("导出")
     @PostMapping("/listExport")
-    public void export(@RequestBody @Valid SiteExecutiveApprovalListRequest request, BindingResult bindingResult) throws Exception {
-        if (bindingResult.hasErrors()) {
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        }
-        List<SiteExecutiveApprovalListResponse> list;
-        if (!CollectionUtils.isEmpty(request.getIds())) {
-            list = siteExecutiveInfoService.listInfoByIds(request.getIds());
-        } else {
-            list = siteExecutiveInfoService.listInfo(request);
-        }
-        for (SiteExecutiveApprovalListResponse record : list) {
-            DictCodeUtils.convertDictCodeToName(record);
-        }
+    public void export(@RequestBody SiteExecutiveApprovalListRequest request) throws Exception {
+        List<SiteExecutiveApprovalListResponse> list = super.exportList(request);
         super.exportExcel(SiteExecutiveApprovalListResponse.class, list, ExportEnum.SITE_EXECUTIVE_EXPORT.getSheetName());
     }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
index 7e793cd..a92e209 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
@@ -55,7 +55,7 @@
 
     @ApiOperation("设备收发列表导出")
     @PostMapping("/export")
-    public void exportList(@RequestBody @Valid SampleDispatchListRequest request) throws IOException {
+    public void exportList(@RequestBody SampleDispatchListRequest request) throws IOException {
         List<SampleDispatchListResponse> list;
         if (!CollectionUtils.isEmpty(request.getIds())) {
             list = dispatchService.listByIds(request.getIds());
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java
index cdc77fc..d120fd4 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java
@@ -7,6 +7,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.business.labExecutive.*;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.business.IBusinessLabExecutiveInfoService;
@@ -14,6 +15,7 @@
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.*;
 
@@ -32,7 +34,7 @@
     @Autowired
     private IBusinessLabExecutiveInfoService labExecutiveInfoService;
 
-    @ApiOperation("实验室检测-部门检测-查询各状态列表（待检测、检测中、检测完）")
+    @ApiOperation("实验室任务-查询各状态列表（待检测、检测中、检测完）")
     @PostMapping("/deptExecutive/List")
     public ReturnDTO<PageInfoBT<SampleLabExecutiveListResponse>> queryDeptExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
@@ -43,10 +45,19 @@
         return ReturnUtil.success(super.packForBT(labExecutiveInfoService.deptLabExecutiveListPage(page, labExecutiveListRequest)));
     }
 
-    /**
-     * 实验室检测-我的检测-查询各状态列表（待检测、检测中、检测完）
-     */
-    @ApiOperation("实验室检测-我的检测-查询各状态列表（待检测、检测中、检测完）")
+    @ApiOperation("实验室任务导出")
+    @PostMapping("/deptExecutive/export")
+    public void deptExportList(@RequestBody @Valid SampleLabExecutiveListRequest request) throws Exception {
+        List<SampleLabExecutiveListResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = labExecutiveInfoService.deptLabExecutiveListByIds(request.getMeasureStatus(), request.getIds());
+        } else {
+            list = labExecutiveInfoService.deptLabExecutiveList(request);
+        }
+        super.exportExcel(SampleLabExecutiveListResponse.class, list, ExportEnum.DEPT_EXECUTIVE_TASK.getSheetName());
+    }
+
+    @ApiOperation("我的任务-查询各状态列表（待检测、检测中、检测完）")
     @PostMapping("/myExecutive/list")
     public ReturnDTO<PageInfoBT<SampleLabExecutiveListResponse>> queryMyExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
@@ -57,19 +68,25 @@
         return ReturnUtil.success(super.packForBT(labExecutiveInfoService.myLabExecutiveListPage(page, labExecutiveListRequest)));
     }
 
-    /**
-     * 实验室检测-我的检测-查询各状态样品数量（待检测、检测中、检测完）
-     */
-    @ApiOperation("实验室检测-我的检测-查询各状态样品数量（待检测、检测中、检测完）")
+    @ApiOperation("我的任务导出")
+    @PostMapping("/myExecutive/export")
+    public void exportList(@RequestBody @Valid SampleLabExecutiveListRequest request) throws Exception {
+        List<SampleLabExecutiveListResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = labExecutiveInfoService.myLabExecutiveListByIds(request.getMeasureStatus(), request.getIds());
+        } else {
+            list = labExecutiveInfoService.myLabExecutiveList(request);
+        }
+        super.exportExcel(SampleLabExecutiveListResponse.class, list, ExportEnum.MY_EXECUTIVE_TASK.getSheetName());
+    }
+
+    @ApiOperation("我的任务-查询各状态样品数量（待检测、检测中、检测完）")
     @GetMapping("/myExecutive/amount")
     public ReturnDTO<List<SampleAmountResponse>> queryMyExecutiveAmount() {
         return ReturnUtil.success(labExecutiveInfoService.myExecutiveAmount());
     }
 
-    /**
-     * 实验室检测-部门检测-分配（分配给具体人员）
-     */
-    @ApiOperation("实验室检测-部门检测-分配按钮（分配给具体人员）")
+    @ApiOperation("实验室任务-分配按钮（分配给具体人员）")
     @PostMapping("/deptExecutive/allocate")
     public ReturnDTO allocateStaff(@RequestBody @Valid SampleAllocateRequest sampleAllocateRequest, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -78,10 +95,7 @@
         return labExecutiveInfoService.allocateStaff(sampleAllocateRequest);
     }
 
-    /**
-     * 实验室检测-我的检测-检定人扫描收入（待检测->检测中）
-     */
-    @ApiOperation("实验室检测-我的检测-检定人扫描收入（待检测->检测中）")
+    @ApiOperation("我的任务-检定人扫描收入（待检测->检测中）")
     @PostMapping("/myExecutive/receive")
     public ReturnDTO sampleReceive(@RequestBody @Valid List<SampleOperateRequest> requestList, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -90,10 +104,7 @@
         return labExecutiveInfoService.sampleReceive(requestList);
     }
 
-    /**
-     * 实验室检测-负责人/检定人扫描检完（检测中->检测完）
-     */
-    @ApiOperation("实验室检测-负责人/检定人扫描检完（检测中->检测完）")
+    @ApiOperation("实验室任务-负责人/检定人扫描检完（检测中->检测完）")
     @PostMapping("/myExecutive/complete")
     public ReturnDTO sampleExecutiveComplete(@RequestBody @Valid List<SampleOperateRequest> requestList, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -102,10 +113,7 @@
         return labExecutiveInfoService.sampleExecutiveComplete(requestList);
     }
 
-    /**
-     * 实验室检测-部门检测/我的检测 编辑（只能修改应出具证书）
-     */
-    @ApiOperation("实验室检测-部门检测/我的检测 编辑（只能修改应出具证书）")
+    @ApiOperation("实验室任务/我的任务 编辑（只能修改应出具证书）")
     @PostMapping("/executive/update")
     public ReturnDTO updateExecutive(@RequestBody @Valid UpdateExecutiveRequest request, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -114,10 +122,7 @@
         return labExecutiveInfoService.updateExecutive(request);
     }
 
-    /**
-     * 实验室检测-部门检测/我的检测 详情
-     */
-    @ApiOperation("实验室检测-部门检测/我的检测 详情")
+    @ApiOperation("实验室任务/我的任务 详情")
     @PostMapping("/executive/detail")
     public ReturnDTO<ExecutiveDetailResponse> executiveDetail(@RequestBody @Valid ExecutiveDetailRequest request, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
@@ -131,7 +136,7 @@
      * 退回后会将下一个要执行的实验室检测状态更新为待分配，将后面的实验室顺序变更为连续（都进行减1）
      * 最后一个检测的实验室退回，等分发员再增加实验室或设备收发中的已收入直接手动点击完成
      */
-    @ApiOperation("实验室检测-部门检测/我的检测 退回（待检测/检测中->退回）")
+    @ApiOperation("实验室任务/我的任务 退回（待检测/检测中->退回）")
     @PostMapping("/executive/sendBack")
     public ReturnDTO executiveSendBack(@RequestBody @Valid ExecutiveSendBackRequest request, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -140,9 +145,6 @@
         return labExecutiveInfoService.sampleExecutiveSendBack(request);
     }
 
-    /**
-     * 分发员编辑实验室检测列表
-     */
     @ApiOperation("分发员编辑实验室检测列表")
     @PostMapping("/handOut/updateList")
     public ReturnDTO updateExecutiveList(@RequestBody @Valid UpdateExecutiveListRequest request, BindingResult bindingResult) {
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java
index 48a67ed..0c04f31 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java
@@ -10,6 +10,7 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.resource.customer.CustomerApprovalListRequest;
 import com.casic.missiles.dto.resource.customer.CustomerSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceCustomerInfo;
@@ -26,6 +27,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -55,6 +57,13 @@
         return customerInfoService.saveCustomerInfo(request);
     }
 
+    @ApiOperation("委托方名录导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody CustomerApprovalListRequest request) throws Exception {
+        List<BizResourceCustomerInfo> list = super.exportList(request);
+        super.exportExcel(BizResourceCustomerInfo.class, list, ExportEnum.CUSTOMER_INFO.getSheetName());
+    }
+
     @ApiOperation("委托方人员列表（分页）")
     @PostMapping("/person/listPage")
     public ReturnDTO<PageInfoBT<BizResourceCustomerStaff>> personListPage(@RequestBody IdDTO idDto) {
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
index 972ed4b..6418ea5 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
@@ -5,6 +5,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.resource.customer.SuggestFormApprovalListRequest;
 import com.casic.missiles.dto.resource.customer.SuggestFormSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceCustomerSuggestForm;
@@ -20,6 +21,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -50,4 +52,11 @@
         return suggestFormService.saveSuggestForm(request);
     }
 
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody SuggestFormApprovalListRequest request) throws Exception {
+        List<BizResourceCustomerSuggestForm> list = super.exportList(request);
+        super.exportExcel(BizResourceCustomerSuggestForm.class, list, ExportEnum.CUSTOMER_SUGGEST_FORM.getSheetName());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java
index 1934d1a..9e07eab 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java
@@ -15,12 +15,16 @@
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.resource.IEnvEnvironmentRecordConfigService;
 import com.casic.missiles.service.resource.IEnvEnvironmentRecordDataService;
+import com.casic.missiles.service.resource.IEnvLocationInfoService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
 import java.util.List;
@@ -39,6 +43,8 @@
     private IEnvEnvironmentRecordDataService environmentRecordDataService;
     @Autowired
     private IEnvEnvironmentRecordConfigService environmentRecordConfigService;
+    @Autowired
+    private IEnvLocationInfoService locationInfoService;
 
     @ApiOperation("环境记录单数据列表/详情")
     @PostMapping("/data/listPage")
@@ -95,4 +101,11 @@
         });
         return environmentRecordConfigService.deleteEnvironmentRecordConfig(idDTO.getId());
     }
+
+    @ApiOperation("地点列表")
+    @PostMapping("/location/listPage")
+    public ReturnDTO<PageInfoBT<LocationListResponse>> locationListPage(@RequestBody @Valid LocationListRequest request) {
+        Page<LocationListResponse> page = PageFactory.defaultPage();
+        return ReturnUtil.success(super.packForBT(locationInfoService.listPage(page, request)));
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java
index 82efe3f..e9561fa 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java
@@ -10,6 +10,7 @@
 import com.casic.missiles.dto.resource.seal.SealLogListRequest;
 import com.casic.missiles.dto.resource.seal.SealNoteApprovalListRequest;
 import com.casic.missiles.dto.resource.seal.SealNoteSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceSealUseLog;
@@ -27,6 +28,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -58,6 +60,13 @@
         return sealUseNoteService.saveSeal(request);
     }
 
+    @ApiOperation("印章使用登记导出（列表和导出中去掉经办人和监印人）")
+    @PostMapping("/listExport")
+    public void export(@RequestBody SealNoteApprovalListRequest request) throws Exception {
+        List<BizResourceSealUseNote> list = super.exportList(request);
+        super.exportExcel(BizResourceSealUseNote.class, list, ExportEnum.SEAL_NOTE.getSheetName());
+    }
+
     // TODO: 2023/7/28 印章使用日志：系统中使用印章时插入数据库
 
     @ApiOperation("印章使用日志列表（分页）")
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java
index 9b674fc..06b6521 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java
@@ -9,16 +9,20 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.resource.staff.StaffCertRequest;
 import com.casic.missiles.dto.resource.staff.StaffCertResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.service.resource.IBizResourceStaffInfoService;
 import com.casic.missiles.service.resource.IBizResourceStaffVerifierService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.List;
+
 /**
  * @Description:
  * @Author: wangpeng
@@ -41,9 +45,21 @@
         return ReturnUtil.success(super.packForBT(responsePage));
     }
 
+    @ApiOperation("证书逾期提醒导出")
+    @PostMapping("/listExport")
+    public void exportList(@RequestBody StaffCertRequest request) throws Exception {
+        List<StaffCertResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = staffInfoService.certListByIds(request.getIds());
+        } else {
+            list = staffInfoService.certList(request);
+        }
+        super.exportExcel(StaffCertResponse.class, list, ExportEnum.STAFF_CERTIFICATE_EXPIRE.getSheetName());
+    }
+
     @ApiOperation("证书逾期提醒")
     @PostMapping("/expirationReminder")
-    public ReturnDTO expirationReminder(@RequestBody IdDTO idDto) {
-        return verifierService.expirationReminder(idDto);
+    public ReturnDTO expirationReminder(@RequestBody IdDTO idDTO) {
+        return verifierService.expirationReminder(idDTO);
     }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java
index 3b251ad..a6e7850 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java
@@ -12,6 +12,7 @@
 import com.casic.missiles.dto.resource.staff.StaffListRequest;
 import com.casic.missiles.dto.resource.staff.TrainListRequest;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.*;
@@ -22,7 +23,10 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
 import java.util.List;
@@ -52,8 +56,19 @@
             throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
         }
         Page<BizResourceStaffInfo> page = PageFactory.defaultPage();
-        Page<BizResourceStaffInfo> responsePage = staffInfoService.listPage(page, request);
-        return ReturnUtil.success(super.packForBT(responsePage));
+        return ReturnUtil.success(super.packForBT(staffInfoService.listPage(page, request)));
+    }
+
+    @ApiOperation("人员登记导出")
+    @PostMapping("/listExport")
+    public void exportList(@RequestBody StaffListRequest request) throws Exception {
+        List<BizResourceStaffInfo> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = staffInfoService.listByIds(request.getIds());
+        } else {
+            list = staffInfoService.list(request);
+        }
+        super.exportExcel(BizResourceStaffInfo.class, list, ExportEnum.STAFF_INFO.getSheetName());
     }
 
     @ApiOperation("人员登记详情基础信息")
@@ -85,9 +100,9 @@
 
     @ApiOperation("科研教育列表（分页）")
     @PostMapping("/education/listPage")
-    public ReturnDTO<PageInfoBT<BizResourceStaffEducation>> educationListPage(@RequestBody IdDTO idDto) {
+    public ReturnDTO<PageInfoBT<BizResourceStaffEducation>> educationListPage(@RequestBody IdDTO idDTO) {
         Page<BizResourceStaffEducation> page = PageFactory.defaultPage();
-        Page<BizResourceStaffEducation> responsePage = staffInfoService.educationListPage(page, idDto);
+        Page<BizResourceStaffEducation> responsePage = staffInfoService.educationListPage(page, idDTO);
         return ReturnUtil.success(super.packForBT(responsePage));
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java
index af6aa86..d85d84a 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java
@@ -9,6 +9,7 @@
 import com.casic.missiles.dto.resource.outsideService.SupplierApprovalListRequest;
 import com.casic.missiles.dto.resource.outsideService.SupplierSaveResponse;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceSupplierAbility;
@@ -67,6 +68,13 @@
         return ReturnUtil.success(supplierInfoService.detail(idDTO.getId()));
     }
 
+    @ApiOperation("合格供方导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody SupplierApprovalListRequest request) throws Exception {
+        List<BizResourceSupplierInfo> list = super.exportList(request);
+        super.exportExcel(BizResourceSupplierInfo.class, list, ExportEnum.SUPPLIER_INFO.getSheetName());
+    }
+
     @ApiOperation("供方人员列表（分页）")
     @PostMapping("/person/listPage")
     public ReturnDTO<PageInfoBT<BizResourceSupplierPerson>> personListPage(@RequestBody IdDTO idDTO) {
diff --git a/casic-metering-api/src/main/resources/config/application.yml b/casic-metering-api/src/main/resources/config/application.yml
index 350db5f..ecff521 100644
--- a/casic-metering-api/src/main/resources/config/application.yml
+++ b/casic-metering-api/src/main/resources/config/application.yml
@@ -126,7 +126,7 @@
     #作者
     author: wangpeng
     #待生成对象表名
-    table-name: biz_equipment_technical_target_approval,biz_equipment_attachment_approval,biz_equipment_checkpoint_approval
+    table-name: biz_business_outsource_protocol
 
 reminder:
   #节点--common模块config包 ReminderNodeConfig配置
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
index 4a19e4e..d47d552 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
@@ -53,6 +53,7 @@
     SUGGEST_FORM_SAVE_FAILED(2509, "委托方意见登记表保存至草稿箱失败"),
     EXAMINE_FORM_SAVE_FAILED(2510, "要求、委托书及合同评审表保存至草稿箱失败"),
     CUSTOMER_EXIST_SAVE_FAILED(2511, "该委托方已存在，请重新选择"),
+    DUPLICATE_LOCATION_NO(2512, "地点编号已存在"),
 
     /**
      * 计量检定业务模块
@@ -68,6 +69,8 @@
     COMPLETE_SAMPLE_NOT_EXIST(2609, "检测中不存在扫描收入的样品"),
     CANNOT_CHANGE_MEASURE_INFO(2610, "无法更改非当前登录用户的检测信息"),
     NON_EXIST_ORDER_OR_SAMPLE(2611, "不存在该委托单或该委托单下的样品"),
+    OUTSOURCE_ACCESS_SAVE_FAILED(2612, "测试、校准或检定工作分包评审表保存至草稿箱失败"),
+    OUTSOURCE_PROTOCOL_SAVE_FAILED(2613, "测试、校准或检定工作分包协议书保存至草稿箱失败"),
 
     /**
      * 历史遗留备用
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
index 5089ad1..81a406b 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
@@ -10,54 +10,38 @@
     /**
      * 资源管理
      */
-    ENVIRONMENT_DATA_EXPORT("environmentData", "environmentData", "环境记录单数据"),
+    ENVIRONMENT_DATA_EXPORT("environmentData", "环境记录单数据", "环境记录单数据"),
+    STAFF_INFO("staffInfo", "人员登记", "人员登记"),
+    STAFF_CERTIFICATE_EXPIRE("certificateExpire", "证书逾期提醒", "证书逾期提醒"),
+    SUPPLIER_INFO("supplierInfo", "合格供方名录", "合格供方名录"),
+    CUSTOMER_INFO("customerInfo", "委托方名录", "委托方名录"),
+    CUSTOMER_SUGGEST_FORM("customerSuggestForm", "委托方意见登记表", "委托方意见登记表"),
+    SEAL_NOTE("sealNote", "印章使用登记", "印章使用登记"),
 
-    FILE_EXPORT("meterFileData", "meterFileData", "计量文件信息"),
-    TRAIN_PLAN_EXPORT("trainPlanData", "trainPlanData", "培训计划"),
-    TRAIN_LOG_EXPORT("trainLogData", "trainLogData", "培训记录"),
-    METER_ORGANIZE_EXPORT("meterOrganizeData", "meterOrganizeData", "计量组织"),
-    TRACE_SUPPLIER_EXPORT("traceSupplierData", "traceSupplierData", "溯源供方"),
-    SIGN_EXPORT("signData", "signData", "签名/签章"),
-    TEMPLATE_EXPORT("templateData", "templateData", "原始记录模板/证书报告模板"),
-    FIXED_ASSETS("meterFixedAssets", "meterFixedAssets", "固定资产"),
-    METER_EQUIPMENT("meterEquipment", "meterEquipment", "测量设备"),
-    CALIBRATION_TEST_EQUIPMENT("calibrationTestEquipment", "calibrationTestEquipment", "校准检定设备"),
-    MEASURE_ACCOUNT("measureAccount", "measureAccount", "测量工装"),
-    STANDARD_SUPPORT_EQUIPMENT("standardSupportEquipment", "standardSupportEquipment", "标准配套设备"),
-    STANDARD_EQUIPMENT("standardEquipment", "standardEquipment", "标准装置"),
-    FLOW_DEF_EXPORT("flowDefData", "flowDefData", "流程定义"),
-    STAFF_CERTIFICATE("certificate", "certificate", "计量人员证书"),
-    CHECK_INFO("checkInfo", "checkInfo", "设备管理点检测"),
-    EQUIPMENT_APPLY("equipmentApply", "equipmentApply", "设备借用"),
-    STANDARD_EQUIPMENT_REMIND("equipmentApplyRemind", "equipmentApplyRemind", "标准装置到期提醒"),
-    METER_PRICE("meterPrice", "meterPrice", "价格库"),
-    METER_STAFF("meterStaff", "meterStaff", "计量人员"),
-    STANDARD_EQUIPMENT_APPLY("standardEquipmentApply", "standardEquipmentApply", "标准装置申请"),
-    STATE_MANAGE_APPLY("stateManage", "stateManage", "状态管理"),
-    METER_ACCEPTANCE_CHECK("acceptanceCheck", "acceptanceCheck", "设备检修保养验收单"),
-    CUSTOMER_EXPORT("customerData", "customerData", "客户信息"),
-    ORDER_EXPORT("orderData", "orderData", "委托书信息"),
-    SAMPLE_EXPORT("sampleData", "sampleData", "样本信息"),
-    EXCHANGE_DATA("exchangeData", "exchangeData", "设备交接单"),
-    DISPATCH_DATA("dispatchData", "dispatchData", "设备收发"),
-    ENVIRONMENT_DATA("environmentData", "environmentData", "环境记录单"),
-    ORIGIN_DATA("originData", "originData", "原始记录"),
-    CERTIFICATE_REPORT("certificateReport", "certificateReport", "证书报告"),
-    ADVICE_EXPORT("adviceData", "adviceData", "客户反馈"),
-    HANDOUT_EXPORT("handoutData", "handoutData", "任务分发列表"),
-    OUTSOURCER_EXPORT("outsourcerData", "outsourcerData", "分包方"),
-    SITE_EXECUTIVE_EXPORT("siteExecutiveData", "siteExecutiveData", "现场测试、校准或检定"),
-    CERTIFICATE_PRINT_EXPORT("certificatePrintData", "certificatePrintData", "证书打印"),
-    DOWNLOAD_TEMPLATE("downloadTemplate", "downloadTemplate", "页面配置"),
-    OUTSOURCER_CERTIFICATE_EXPORT("outsourceCertificateData", "outsourceCertificateData", "分包证书"),
-    SETTLEMENT_INFO_EXPORT("settlementInfoData", "settlementInfoData", "业务结算"),
-    EQUIPMENT_REMIND("equipmentRemind", "equipmentRemind", "设备到期提醒"),
-    AGREEMENT_INFO_EXPORT("agreementInfoData", "agreementInfoData", "合同"),
-    WORK_STATISTICS_EXPORT("workStatisticsData", "workStatisticsData", "实时工作统计"),
-    DEPT_OUTPUT_EXPORT("deptOutputData", "deptOutputData", "部门产值分析"),
-    WORKLOAD_EXPORT("workloadData", "workloadData", "业务工作量分析"),
-    DEPT_COMPREHENSIVE_EXPORT("deptComprehensiveData", "deptComprehensiveData", "部门综合分析"),
-    ENVIRONMENTAL_RECORD("environmentalRecordData", "environmentalRecordData", "现场环境记录");
+    /**
+     * 计量检定业务
+     */
+    OUTSOURCER_EXPORT("outsourcerData", "分包方名录", "分包方名录"),
+    IDENTIFY_EXPORT("identifyData", "计量标识", "计量标识"),
+    ORDER_EXPORT("orderData", "任务单", "任务单"),
+    DISPATCH_DATA("dispatchData", "设备收发", "设备收发"),
+    HANDOUT_EXPORT("handoutData", "任务分发", "任务分发"),
+    SITE_EXECUTIVE_EXPORT("siteExecutiveData", "现场测试、校准或检定", "现场测试、校准或检定"),
+    CERTIFICATE_REPORT("certificateReport", "证书审批", "证书审批"),
+    CERTIFICATE_CHANGE_APPLY("certificateChangeApply", "证书报告补充或更换申请单", "证书报告补充或更换申请单"),
+    CERTIFICATE_PRINT("certificatePrintData", "证书打印审批", "证书打印审批"),
+    DEPT_EXECUTIVE_TASK("deptExecutiveTaskData", "实验室任务", "实验室任务"),
+    MY_EXECUTIVE_TASK("myExecutiveTaskData", "我的任务", "我的任务"),
+    OUTSOURCE_ASSESS("outsourceAssess", "测试、校准或检定工作分包评审表", "测试、校准或检定工作分包评审表"),
+    OUTSOURCE_PROTOCOL("outsourceProtocol", "测试、校准或检定工作分包协议书", "测试、校准或检定工作分包协议书"),
+
+    /**
+     * 系统管理
+     */
+    SIGN_EXPORT("signData", "签名", "签名"),
+    TEMPLATE_EXPORT("templateData", "文件模板", "文件模板"),
+    FLOW_DEF_EXPORT("flowDefData", "流程定义", "流程定义"),
+    DOWNLOAD_TEMPLATE("downloadTemplate", "流程定义", "页面配置");
 
     ExportEnum(String fileName, String sheetName, String description) {
         this.fileName = fileName;
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateRecordTypeCodeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateRecordTypeCodeEnum.java
index 31d913c..a963522 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateRecordTypeCodeEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateRecordTypeCodeEnum.java
@@ -46,4 +46,14 @@
     String SITE_EXECUTIVE_APPROVAL = "01";
     //《现场测试、校准或检定工作记录表》
     String SITE_EXECUTIVE_LOG = "02";
+
+    //测试、校准或检定工作分包协议书
+    String OUTSOURCE_PROTOCOL = "01";
+    //测试、校准或检定工作分包评审表
+    String OUTSOURCE_ACCESS = "02";
+    //测试、校准或检定工作分包通知书
+    String OUTSOURCE_NOTICE = "03";
+    //测试、校准或检定工作分包方名录
+    String OUTSOURCE_INFO = "04";
+
 }
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
index 24b8635..f78bd53 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
@@ -15,6 +15,10 @@
     String CERTIFICATE_CHANGE_APPLY_BEAN_NAME = "certificateChangeApplyBean";
     //现场测试、校准或检定
     String SITE_EXECUTIVE_BEAN_NAME = "siteExecutiveBean";
+    //测试、校准或检定工作分包评审表
+    String OUTSOURCE_ASSESS_BEAN_NAME = "outsourceAssessBean";
+    //测试、校准或检定工作分包协议书
+    String OUTSOURCE_PROTOCOL_BEAN_NAME = "outsourceProtocolBean";
 
     /*********************************设备与装置************************************/
     //设备台账
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 b21c661..6b86fd1 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
@@ -18,6 +18,8 @@
     OUTSOURCER_APPROVAL(OUTSOURCER_BEAN_NAME, ""),
     CERTIFICATE_CHANGE_APPROVAL(CERTIFICATE_CHANGE_APPLY_BEAN_NAME, ""),
     SITE_EXECUTIVE_APPROVAL(SITE_EXECUTIVE_BEAN_NAME, ""),
+    OUTSOURCE_ASSESS_APPROVAL(OUTSOURCE_ASSESS_BEAN_NAME, ""),
+    OUTSOURCE_PROTOCOL_APPROVAL(OUTSOURCE_PROTOCOL_BEAN_NAME, ""),
 
     ACTION_STATUS_MAP(new HashMap<String, AwareActionStatusEnum>() {
         {
@@ -47,6 +49,10 @@
             put(ApplyFromIdEnum.CERTIFICATE_CHANGE_APPROVAL.getCode(), CERTIFICATE_CHANGE_APPROVAL);
             //现场测试、校准或检定审批
             put(ApplyFromIdEnum.SITE_EXECUTIVE_APPROVAL.getCode(), SITE_EXECUTIVE_APPROVAL);
+            //测试、校准或检定工作分包评审表
+            put(ApplyFromIdEnum.OUTSOURCE_ASSESS_APPROVAL.getCode(), OUTSOURCE_ASSESS_APPROVAL);
+            //测试、校准或检定工作分包协议书
+            put(ApplyFromIdEnum.OUTSOURCE_PROTOCOL_APPROVAL.getCode(), OUTSOURCE_PROTOCOL_APPROVAL);
         }
     });
     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 934405e..c7410bd 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
@@ -9,6 +9,8 @@
     CERTIFICATE_CHANGE_APPROVAL("jljdywzsbchghsqd", MessageSourceModuleEnum.BUSINESS.getCode(), "证书/报告补充或更换申请单"),
     OUTSOURCER_APPROVAL("jljdywcsjzhgfbfml", MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定合格分包方名录"),
     SITE_EXECUTIVE_APPROVAL("jljdywxccsjzsp", MessageSourceModuleEnum.BUSINESS.getCode(), "现场测试、校准或检定审批"),
+    OUTSOURCE_ASSESS_APPROVAL("jljdywcsjzfbpsb", MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包评审表"),
+    OUTSOURCE_PROTOCOL_APPROVAL("jljdywcsjzfbxys", MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包协议书"),
 
 
     /*******************************************设备与装置*********************************************/
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/GeneralApprovalMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/GeneralApprovalMapper.java
index 4fb7344..0c9d6ae 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/GeneralApprovalMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/GeneralApprovalMapper.java
@@ -17,8 +17,4 @@
 
     Page<O> selectBatchForApprovalList(Page<O> page, @Param("request") R request, @Param("businessKeys") List<String> businessKeys);
 
-//    Page<O> selectListPage(Page<O> page, @Param("request") R request);
-
-//    Long selectMaxNo();
-
 }
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceAssessMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceAssessMapper.java
index 7867bb8..ba59009 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceAssessMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceAssessMapper.java
@@ -1,7 +1,12 @@
 package com.casic.missiles.mapper.business;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.business.outsource.OutsourceAssessApprovalListRequest;
+import com.casic.missiles.mapper.GeneralApprovalMapper;
 import com.casic.missiles.model.business.BizBusinessOutsourceAssess;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * <p>
@@ -11,6 +16,10 @@
  * @author wangpeng
  * @since 2023-08-16
  */
-public interface BizBusinessOutsourceAssessMapper extends BaseMapper<BizBusinessOutsourceAssess> {
+public interface BizBusinessOutsourceAssessMapper extends GeneralApprovalMapper<BizBusinessOutsourceAssess, BizBusinessOutsourceAssess, OutsourceAssessApprovalListRequest> {
+
+    Page<BizBusinessOutsourceAssess> selectBatchForApprovalList(Page<BizBusinessOutsourceAssess> page, @Param("request") OutsourceAssessApprovalListRequest request, @Param("businessKeys") List<String> businessKeys);
+
+    Long selectMaxProjectNo();
 
 }
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceProtocolMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceProtocolMapper.java
new file mode 100644
index 0000000..e6aba35
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceProtocolMapper.java
@@ -0,0 +1,24 @@
+package com.casic.missiles.mapper.business;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.business.outsource.OutsourceProtocolApprovalListRequest;
+import com.casic.missiles.mapper.GeneralApprovalMapper;
+import com.casic.missiles.model.business.BizBusinessOutsourceProtocol;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 计量检定业务-分包管理-测试、校准或检定工作分包协议书 Mapper 接口
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-08-24
+ */
+public interface BizBusinessOutsourceProtocolMapper extends GeneralApprovalMapper<BizBusinessOutsourceProtocol, BizBusinessOutsourceProtocol, OutsourceProtocolApprovalListRequest> {
+
+    Page<BizBusinessOutsourceProtocol> selectBatchForApprovalList(Page<BizBusinessOutsourceProtocol> page, @Param("request") OutsourceProtocolApprovalListRequest request, @Param("businessKeys") List<String> businessKeys);
+
+    Long selectMaxProtocolNo();
+}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/EnvLocationInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/EnvLocationInfoMapper.java
new file mode 100644
index 0000000..49eff87
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/EnvLocationInfoMapper.java
@@ -0,0 +1,21 @@
+package com.casic.missiles.mapper.resource;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.resource.environment.LocationListRequest;
+import com.casic.missiles.dto.resource.environment.LocationListResponse;
+import com.casic.missiles.model.resource.EnvLocationInfo;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * <p>
+ * 实验室环境监控系统-设备表 Mapper 接口
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-06-07
+ */
+public interface EnvLocationInfoMapper extends BaseMapper<EnvLocationInfo> {
+
+    Page<LocationListResponse> selectLocationListPage(Page<LocationListResponse> page, @Param("request") LocationListRequest request);
+}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java
index de124db..85ed0f7 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java
@@ -1,7 +1,9 @@
 package com.casic.missiles.mapper.system;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.dto.system.SignDetailResponse;
+import com.casic.missiles.dto.system.SignListRequest;
 import com.casic.missiles.model.system.SystemSign;
 import org.apache.ibatis.annotations.Param;
 
@@ -22,4 +24,8 @@
     SignDetailResponse selectSignDetailById(Long id);
 
     List<SystemSign> selectUsableSignList(@Param("userId") Long userId);
+
+    Page<SystemSign> selectSignListPage(Page<SystemSign> page, @Param("request") SignListRequest request);
+
+    List<SystemSign> selectSignList(@Param("request") SignListRequest request);
 }
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateChangeApplyMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateChangeApplyMapper.xml
index d798447..c496092 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateChangeApplyMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateChangeApplyMapper.xml
@@ -30,31 +30,31 @@
         SELECT *
         FROM biz_business_certificate_change_apply
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.changeApplyNo != null and request.changeApplyNo !=''">
+        <if test="request != null and request.changeApplyNo != null and request.changeApplyNo !=''">
             and change_apply_no like concat('%',#{request.changeApplyNo},'%')
         </if>
-        <if test="request.changeReportNo != null and request.changeReportNo !=''">
+        <if test="request != null and request.changeReportNo != null and request.changeReportNo !=''">
             and change_report_no like concat('%',#{request.changeReportNo},'%')
         </if>
-        <if test="request.changeReportName != null and request.changeReportName !=''">
+        <if test="request != null and request.changeReportName != null and request.changeReportName !=''">
             and change_report_name like concat('%',#{request.changeReportName},'%')
         </if>
-        <if test="request.changeType != null and request.changeType !=''">
+        <if test="request != null and request.changeType != null and request.changeType !=''">
             and change_type = #{request.changeType}
         </if>
-        <if test="request.createUserName != null and request.createUserName !=''">
+        <if test="request != null and request.createUserName != null and request.createUserName !=''">
             and create_user_name like concat('%',#{request.createUserName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificatePrintMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificatePrintMapper.xml
index b66cd99..49c0ac8 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificatePrintMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificatePrintMapper.xml
@@ -31,34 +31,34 @@
         LEFT JOIN biz_business_order_sample_relation bosr ON (bosr.order_id = bcr.order_id AND bosr.sample_id = bcr.sample_id)
         LEFT JOIN biz_business_order_info boi ON boi.id = bosr.order_id
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and bcp.approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.printStatus != null and request.printStatus !=''">
+        <if test="request != null and request.printStatus != null and request.printStatus !=''">
             and print_status = #{request.printStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and bcp.create_user_id = #{request.createUserId}
         </if>
-        <if test="request.certificateReportNo != null and request.certificateReportNo !=''">
+        <if test="request != null and request.certificateReportNo != null and request.certificateReportNo !=''">
             and bcr.certificate_report_no like concat('%',#{request.certificateReportNo},'%')
         </if>
-        <if test="request.certificateReportName != null and request.certificateReportName !=''">
+        <if test="request != null and request.certificateReportName != null and request.certificateReportName !=''">
             and bcr.certificate_report_name like concat('%',#{request.certificateReportName},'%')
         </if>
-        <if test="request.customerName != null and request.customerName !=''">
+        <if test="request != null and request.customerName != null and request.customerName !=''">
             and boi.customer_name like concat('%',#{request.customerName},'%')
         </if>
-        <if test="request.sampleNo != null and request.sampleNo !=''">
+        <if test="request != null and request.sampleNo != null and request.sampleNo !=''">
             and bosr.sample_no like concat('%',#{request.sampleNo},'%')
         </if>
-        <if test="request.sampleName != null and request.sampleName !=''">
+        <if test="request != null and request.sampleName != null and request.sampleName !=''">
             and bosr.sample_name like concat('%',#{request.sampleName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and bcp.create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and bcp.create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml
index b366034..767695d 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml
@@ -46,33 +46,37 @@
         SELECT bcr.*, bosr.sample_no, bosr.sample_name, bosr.sample_model, rsi.staff_name
         FROM biz_business_certificate_report bcr
         LEFT JOIN biz_business_order_sample_relation bosr ON (bosr.order_id = bcr.order_id AND bosr.sample_id = bcr.sample_id)
+        LEFT JOIN biz_business_order_info boi ON boi.id = bcr.order_id
         LEFT JOIN biz_resource_staff_info rsi ON rsi.id = bcr.measure_person_id
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and bcr.approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and bcr.create_user_id = #{request.createUserId}
         </if>
-        <if test="request.certificateReportNo != null and request.certificateReportNo !=''">
+        <if test="request != null and request.customerId != null and request.customerId !=''">
+            and boi.customer_id = #{request.customerId}
+        </if>
+        <if test="request != null and request.certificateReportNo != null and request.certificateReportNo !=''">
             and bcr.certificate_report_no like concat('%',#{request.certificateReportNo},'%')
         </if>
-        <if test="request.certificateReportName != null and request.certificateReportName !=''">
+        <if test="request != null and request.certificateReportName != null and request.certificateReportName !=''">
             and bcr.certificate_report_name like concat('%',#{request.certificateReportName},'%')
         </if>
-        <if test="request.sampleNo != null and request.sampleNo !=''">
+        <if test="request != null and request.sampleNo != null and request.sampleNo !=''">
             and bosr.sample_no like concat('%',#{request.sampleNo},'%')
         </if>
-        <if test="request.measureCategory != null and request.measureCategory !=''">
+        <if test="request != null and request.measureCategory != null and request.measureCategory !=''">
             and bcr.measure_category = #{request.measureCategory}
         </if>
-        <if test="request.measurePerson != null and request.measurePerson !=''">
+        <if test="request != null and request.measurePerson != null and request.measurePerson !=''">
             and rsi.staff_name like concat('%',#{request.measurePerson},'%')
         </if>
-        <if test="request.calibrationTimeStart != null and request.calibrationTimeStart !=''">
+        <if test="request != null and request.calibrationTimeStart != null and request.calibrationTimeStart !=''">
             and bcr.calibration_time &gt;= #{request.calibrationTimeStart}
         </if>
-        <if test="request.calibrationTimeEnd != null and request.calibrationTimeEnd !=''">
+        <if test="request != null and request.calibrationTimeEnd != null and request.calibrationTimeEnd !=''">
             and bcr.calibration_time &lt;= #{request.calibrationTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceAssessMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceAssessMapper.xml
index d0fcf8b..c22c101 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceAssessMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceAssessMapper.xml
@@ -7,6 +7,8 @@
         <id column="id" property="id" />
         <result column="project_no" property="projectNo" />
         <result column="project_name" property="projectName" />
+        <result column="lab_code" property="labCode" />
+        <result column="group_code" property="groupCode" />
         <result column="applicant_id" property="applicantId" />
         <result column="applicant_name" property="applicantName" />
         <result column="applicant_time" property="applicantTime" />
@@ -31,7 +33,45 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, project_no, project_name, applicant_id, applicant_name, applicant_time, minio_file_name, remark, create_user_id, create_user_name, outsourcer_id, pre_start_time, pre_end_time, outsource_reason, pre_cost, approval_status, process_id, approve_situation, traceability, test_method, technique_ability, create_time, update_time
+        id, project_no, project_name, lab_code, group_code, applicant_id, applicant_name, applicant_time, minio_file_name, remark, create_user_id, create_user_name, outsourcer_id, pre_start_time, pre_end_time, outsource_reason, pre_cost, approval_status, process_id, approve_situation, traceability, test_method, technique_ability, create_time, update_time
     </sql>
 
+    <select id="selectMaxProjectNo" resultType="java.lang.Long">
+        SELECT IFNULL(max(RIGHT(project_no, 3)), 0) from biz_business_outsource_assess
+    </select>
+
+    <select id="selectBatchForApprovalList" resultMap="BaseResultMap">
+        SELECT bboa.*, bboi.outsourcer_name, bboi.director
+        FROM biz_business_outsource_assess bboa
+        LEFT JOIN biz_business_outsourcer_info bboi ON bboa.outsourcer_id = bboi.id
+        WHERE 1=1
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
+            and bboa.approval_status = #{request.approvalStatus}
+        </if>
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
+            and bboa.create_user_id = #{request.createUserId}
+        </if>
+        <if test="request != null and request.projectNo != null and request.projectNo !=''">
+            and bboa.project_no like concat('%',#{request.projectNo},'%')
+        </if>
+        <if test="request != null and request.outsourcerName != null and request.outsourcerName !=''">
+            and bboi.outsourcer_name like concat('%',#{request.outsourcerName},'%')
+        </if>
+        <if test="request != null and request.applicantName != null and request.applicantName !=''">
+            and bboa.applicant_name like concat('%',#{request.applicantName},'%')
+        </if>
+        <if test="request != null and request.applicantTimeStart != null and request.applicantTimeStart !=''">
+            and bboa.applicant_time &gt;= #{request.applicantTimeStart}
+        </if>
+        <if test="request != null and request.applicantTimeEnd != null and request.applicantTimeEnd !=''">
+            and bboa.applicant_time &lt;= #{request.applicantTimeEnd}
+        </if>
+        <if test="businessKeys != null">
+            and bboa.id in
+            <foreach collection="businessKeys" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
+        ORDER BY bboa.create_time DESC
+    </select>
 </mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceProtocolMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceProtocolMapper.xml
new file mode 100644
index 0000000..b7b2149
--- /dev/null
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceProtocolMapper.xml
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.mapper.business.BizBusinessOutsourceProtocolMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.business.BizBusinessOutsourceProtocol">
+        <id column="id" property="id" />
+        <result column="protocol_no" property="protocolNo" />
+        <result column="project_name" property="projectName" />
+        <result column="lab_code" property="labCode" />
+        <result column="group_code" property="groupCode" />
+        <result column="outsourcer_id" property="outsourcerId" />
+        <result column="remark" property="remark" />
+        <result column="outsource_no" property="outsourceNo" />
+        <result column="outsource_name" property="outsourceName" />
+        <result column="contacts" property="contacts" />
+        <result column="mobile" property="mobile" />
+        <result column="address" property="address" />
+        <result column="require_date" property="requireDate" />
+        <result column="outsource_cost" property="outsourceCost" />
+        <result column="director" property="director" />
+        <result column="item" property="item" />
+        <result column="requires" property="requires" />
+        <result column="create_user_id" property="createUserId" />
+        <result column="create_user_name" property="createUserName" />
+        <result column="approval_status" property="approvalStatus" />
+        <result column="process_id" property="processId" />
+        <result column="create_time" property="createTime" />
+        <result column="update_time" property="updateTime" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, protocol_no, project_name, lab_code, group_code, outsourcer_id, remark, outsource_no, outsource_name, contacts, mobile, address, require_date, outsource_cost, director, item, requires, create_user_id, create_user_name, approval_status, process_id, create_time, update_time
+    </sql>
+
+    <select id="selectMaxProtocolNo" resultType="java.lang.Long">
+        SELECT IFNULL(max(RIGHT(protocol_no, 3)), 0) from biz_business_outsource_protocol
+    </select>
+
+    <select id="selectBatchForApprovalList" resultMap="BaseResultMap">
+        SELECT *
+        FROM biz_business_outsource_protocol
+        WHERE 1=1
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
+            and approval_status = #{request.approvalStatus}
+        </if>
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
+            and create_user_id = #{request.createUserId}
+        </if>
+        <if test="request != null and request.protocolNo != null and request.protocolNo !=''">
+            and protocol_no like concat('%',#{request.protocolNo},'%')
+        </if>
+        <if test="request != null and request.outsourcerName != null and request.outsourcerName !=''">
+            and outsourcer_name like concat('%',#{request.outsourcerName},'%')
+        </if>
+        <if test="request != null and request.applicantName != null and request.applicantName !=''">
+            and create_user_name like concat('%',#{request.applicantName},'%')
+        </if>
+        <if test="request != null and request.applicantTimeStart != null and request.applicantTimeStart !=''">
+            and create_time &gt;= #{request.applicantTimeStart}
+        </if>
+        <if test="request != null and request.applicantTimeEnd != null and request.applicantTimeEnd !=''">
+            and create_time &lt;= #{request.applicantTimeEnd}
+        </if>
+        <if test="businessKeys != null">
+            and id in
+            <foreach collection="businessKeys" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
+        ORDER BY create_time DESC
+    </select>
+</mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourcerInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourcerInfoMapper.xml
index 510a80b..3049b54 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourcerInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourcerInfoMapper.xml
@@ -7,6 +7,8 @@
         <id column="id" property="id" />
         <result column="outsourcer_no" property="outsourcerNo" />
         <result column="outsourcer_name" property="outsourcerName" />
+        <result column="lab_code" property="labCode" />
+        <result column="group_code" property="groupCode" />
         <result column="outsourcer_brief_name" property="outsourcerBriefName" />
         <result column="outsourcer_size" property="outsourcerSize" />
         <result column="business_size" property="businessSize" />
@@ -55,32 +57,32 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, outsourcer_no, outsourcer_name, outsourcer_brief_name, outsourcer_size, business_size, grade, evaluation, tax_number, bank_account, bank_name, bank_account_number, postal_code, director, phone, fax, mobile, email, website, address_country, address_province, address_city, address_area, full_address, address_country_name, address_province_name, address_city_name, address_area_name, invoice_country, invoice_province, invoice_city, invoice_area, invoice_full_address, invoice_country_name, invoice_province_name, invoice_city_name, invoice_area_name, business_scope, business_content, minio_file_name, approval_status, process_id, remark, create_user_id, create_user_name, create_time, update_time
+        id, outsourcer_no, outsourcer_name, lab_code, group_code, outsourcer_brief_name, outsourcer_size, business_size, grade, evaluation, tax_number, bank_account, bank_name, bank_account_number, postal_code, director, phone, fax, mobile, email, website, address_country, address_province, address_city, address_area, full_address, address_country_name, address_province_name, address_city_name, address_area_name, invoice_country, invoice_province, invoice_city, invoice_area, invoice_full_address, invoice_country_name, invoice_province_name, invoice_city_name, invoice_area_name, business_scope, business_content, minio_file_name, approval_status, process_id, remark, create_user_id, create_user_name, create_time, update_time
     </sql>
 
     <select id="selectBatchForApprovalList" resultMap="BaseResultMap">
         SELECT *
         FROM biz_business_outsourcer_info
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.outsourcerNo != null and request.outsourcerNo !=''">
+        <if test="request != null and request.outsourcerNo != null and request.outsourcerNo !=''">
             and outsourcer_no like concat('%',#{request.outsourcerNo},'%')
         </if>
-        <if test="request.outsourcerName != null and request.outsourcerName !=''">
+        <if test="request != null and request.outsourcerName != null and request.outsourcerName !=''">
             and outsourcer_name like concat('%',#{request.outsourcerName},'%')
         </if>
-        <if test="request.director != null and request.director !=''">
+        <if test="request != null and request.director != null and request.director !=''">
             and director like concat('%',#{request.director},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
@@ -93,6 +95,6 @@
     </select>
 
     <select id="selectMaxNo" resultType="java.lang.Long">
-        SELECT IFNULL(max(RIGHT(outsourcer_no, 12)), 0) from biz_business_outsourcer_info
+        SELECT IFNULL(max(RIGHT(outsourcer_no, 3)), 0) from biz_business_outsourcer_info
     </select>
 </mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessSiteExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessSiteExecutiveInfoMapper.xml
index 135c5d0..3c5ae79 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessSiteExecutiveInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessSiteExecutiveInfoMapper.xml
@@ -38,25 +38,25 @@
         FROM biz_business_site_executive_info bsei
         LEFT JOIN biz_resource_customer_info rci ON bsei.customer_id = rci.id
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and bsei.approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and bsei.create_user_id = #{request.createUserId}
         </if>
-        <if test="request.siteExecutiveNo != null and request.siteExecutiveNo !=''">
+        <if test="request != null and request.siteExecutiveNo != null and request.siteExecutiveNo !=''">
             and bsei.site_executive_no like concat('%',#{request.siteExecutiveNo},'%')
         </if>
-        <if test="request.customerName != null and request.customerName !=''">
+        <if test="request != null and request.customerName != null and request.customerName !=''">
             and rci.outsourcer_name like concat('%',#{request.customerName},'%')
         </if>
-        <if test="request.applyName != null and request.applyName !=''">
+        <if test="request != null and request.applyName != null and request.applyName !=''">
             and bsei.apply_name like concat('%',#{request.applyName},'%')
         </if>
-        <if test="request.applyTimeStart != null and request.applyTimeStart !=''">
+        <if test="request != null and request.applyTimeStart != null and request.applyTimeStart !=''">
             and bsei.apply_time &gt;= #{request.applyTimeStart}
         </if>
-        <if test="request.applyTimeEnd != null and request.applyTimeEnd !=''">
+        <if test="request != null and request.applyTimeEnd != null and request.applyTimeEnd !=''">
             and bsei.apply_time &lt;= #{request.applyTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml
index 84d9e2a..6bd38a9 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml
@@ -105,6 +105,12 @@
         <if test="request.isUrgent != null and request.isUrgent !=''">
             AND bo.is_urgent = #{request.isUrgent}
         </if>
+        <if test="request.ids != null">
+            and blei.id in
+            <foreach collection="request.ids" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
         ORDER BY blei.update_time DESC
     </select>
 
@@ -137,6 +143,12 @@
         <if test="request.isUrgent != null and request.isUrgent !=''">
             AND bo.is_urgent = #{request.isUrgent}
         </if>
+        <if test="request.ids != null">
+            and blei.id in
+            <foreach collection="request.ids" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
         ORDER BY blei.update_time DESC
     </select>
 

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java
index bb0c50f..13a699b 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java
@@ -12,6 +12,7 @@
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.IGeneralApprovalService;
+import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
@@ -19,6 +20,7 @@
 import org.springframework.web.bind.annotation.RequestBody;
 
 import javax.validation.Valid;
+import java.util.List;
 import java.util.Objects;
 
 /**
@@ -117,4 +119,17 @@
         }
         return baseApprovalService.failUpdate(request);
     }
+
+    public List<O> exportList(@RequestBody @Valid R request) throws Exception {
+        List<O> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = baseApprovalService.listExportByIds(request.getIds());
+        } else {
+            list = baseApprovalService.listExport(request);
+        }
+        for (O record : list) {
+            DictCodeUtils.convertDictCodeToName(record);
+        }
+        return list;
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java
index 8a90961..d775831 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java
@@ -5,6 +5,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.business.certificate.CertificateChangeApplyApprovalListRequest;
 import com.casic.missiles.dto.business.certificate.CertificateChangeApplySaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessCertificateChangeApply;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
@@ -20,6 +21,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -48,4 +50,12 @@
         }
         return changeApplyService.saveChangeApply(request);
     }
+
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody CertificateChangeApplyApprovalListRequest request) throws Exception {
+        List<BizBusinessCertificateChangeApply> list = super.exportList(request);
+        super.exportExcel(BizBusinessCertificateChangeApply.class, list, ExportEnum.CERTIFICATE_CHANGE_APPLY.getSheetName());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java
index 5fc4b07..af8230e 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java
@@ -9,6 +9,7 @@
 import com.casic.missiles.dto.business.certificate.CertificatePrintApprovalListRequest;
 import com.casic.missiles.dto.business.certificate.CertificatePrintListResponse;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.enums.business.CertificatePrintStatusEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessCertificatePrintLog;
@@ -18,10 +19,16 @@
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.io.IOException;
+import java.util.List;
 import java.util.Objects;
 
 /**
@@ -98,4 +105,16 @@
         });
         return certificatePrintService.certificatePrintLog(idDTO.getId());
     }
+
+    @ApiOperation("证书打印审批导出")
+    @PostMapping("/listExport")
+    public void exportList(@RequestBody CertificatePrintApprovalListRequest request) throws IOException {
+        List<CertificatePrintListResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = certificatePrintService.listByIds(request.getIds());
+        } else {
+            list = certificatePrintService.list(request);
+        }
+        super.exportExcel(CertificatePrintListResponse.class, list, ExportEnum.CERTIFICATE_PRINT.getSheetName());
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java
index 63b06dc..6b2efd5 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java
@@ -6,6 +6,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.business.certificate.CertificateReportApprovalListRequest;
 import com.casic.missiles.dto.business.certificate.CertificateReportSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessCertificateReport;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
@@ -21,6 +22,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -50,7 +52,7 @@
         return certificateReportService.saveCertificateReport(request);
     }
 
-    @ApiOperation("证书审批详情（基本信息）")
+    @ApiOperation("详情（基本信息）")
     @PostMapping("/detail")
     public ReturnDTO<BizBusinessCertificateReport> detail(@RequestBody @Valid BaseDetailRequest request, BindingResult bindingResult) throws Exception {
         if(bindingResult.hasErrors()){
@@ -59,4 +61,11 @@
         return certificateReportService.detail(request);
     }
 
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody CertificateReportApprovalListRequest request) throws Exception {
+        List<BizBusinessCertificateReport> list = super.exportList(request);
+        super.exportExcel(BizBusinessCertificateReport.class, list, ExportEnum.CERTIFICATE_REPORT.getSheetName());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java
index 46b26bd..57c0809 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java
@@ -10,20 +10,21 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.business.identify.IdentifyListRequest;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessIdentifyInfo;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.business.IBizBusinessIdentifyInfoService;
+import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import javax.validation.Valid;
+import java.util.List;
 import java.util.Objects;
 
 /**
@@ -57,16 +58,13 @@
         return identifyInfoService.addIdentify(identifyInfo);
     }
 
-    @ApiOperation("标识打印更新")
+    @ApiOperation("标识打印更新（更新打印时间）")
     @PostMapping("/update")
-    public ReturnDTO updateIdentify(@RequestBody @Valid BizBusinessIdentifyInfo identifyInfo, BindingResult bindingResult) {
-        Assert.isFalse(Objects.isNull(identifyInfo.getId()), () -> {
+    public ReturnDTO updateIdentify(@RequestBody @Valid IdDTO idDTO) {
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        Assert.isFalse(bindingResult.hasErrors(), () -> {
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        });
-        return identifyInfoService.updateIdentify(identifyInfo);
+        return identifyInfoService.updateIdentify(idDTO.getId());
     }
 
     @ApiOperation("标识打印删除")
@@ -77,4 +75,37 @@
         });
         return identifyInfoService.deleteIdentify(idDTO.getId());
     }
+
+    @ApiOperation("标识打印导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody @Valid IdentifyListRequest request, BindingResult bindingResult) throws Exception {
+        if (bindingResult.hasErrors()) {
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        List<BizBusinessIdentifyInfo> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = identifyInfoService.listByIds(request.getIds());
+        } else {
+            list = identifyInfoService.list(request);
+        }
+        for (BizBusinessIdentifyInfo record : list) {
+            DictCodeUtils.convertDictCodeToName(record);
+        }
+        super.exportExcel(BizBusinessIdentifyInfo.class, list, ExportEnum.IDENTIFY_EXPORT.getSheetName());
+    }
+
+
+    // TODO: 2023/8/23 查询设备信息，4个底部按钮查设备（按钮的作用就是前端用来调不同接口、用来区分中间即将展示的标识），前端弹窗选设备，在确定保存时前端根据底部按钮判断传入设备类型deviceType字典code
+    // TODO: 2023/8/23 接口：查受检设备（第1个按钮），查设备台账（后3个按钮同一接口），查询之后前端根据标志类型的不同加到中间页面时进行判断（按产品给的对应表）
+    // TODO: 2023/8/23 提供二维码接口，前端在加到中间页面时调用一下
+
+    @ApiOperation("设备二维码")
+    @PostMapping("/equipment/qrCode")
+    public ReturnDTO<String> equipmentQrCode(@RequestBody @Valid IdDTO idDTO) {
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return identifyInfoService.equipmentQrCode(idDTO.getId());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java
index 707be6e..7e0453d 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java
@@ -117,7 +117,7 @@
     }
 
     @ApiOperation("任务单导出")
-    @PostMapping("/export")
+    @PostMapping("/listExport")
     public void orderExport(@RequestBody @Valid OrderListRequest request, HttpServletResponse response) {
         businessOrderService.orderExport(request, response);
     }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java
index 529a6ce..51432be 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java
@@ -1,9 +1,28 @@
 package com.casic.missiles.controller.business;
 
+import com.casic.missiles.controller.GeneralApprovalController;
+import com.casic.missiles.dto.BaseApprovalSubmitRequest;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.business.outsource.OutsourceAssessApprovalListRequest;
+import com.casic.missiles.dto.business.outsource.OutsourceAssessSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
+import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.model.business.BizBusinessOutsourceAssess;
+import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
+import com.casic.missiles.service.IGeneralApprovalService;
+import com.casic.missiles.service.business.IBizBusinessOutsourceAssessService;
 import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.BindingResult;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.validation.Valid;
+import java.util.List;
+
 /**
  * <p>
  * 计量检定业务-分包管理-测试、校准或检定工作分包评审表 前端控制器
@@ -15,6 +34,27 @@
 @Api(tags = "分包管理-测试、校准或检定工作分包评审表")
 @RestController
 @RequestMapping("/business/outsource/assess")
-public class BizBusinessOutsourceAssessController {
+public class BizBusinessOutsourceAssessController extends GeneralApprovalController<BizBusinessOutsourceAssess, BizBusinessOutsourceAssess, OutsourceAssessApprovalListRequest, BaseApprovalSubmitRequest> {
+    @Autowired
+    private IBizBusinessOutsourceAssessService outsourceAssessService;
 
+    public BizBusinessOutsourceAssessController(IGeneralApprovalService<BizBusinessOutsourceAssess, BizBusinessOutsourceAssess, OutsourceAssessApprovalListRequest, BaseApprovalSubmitRequest> baseApprovalService) {
+        super(baseApprovalService);
+    }
+
+    @ApiOperation("草稿箱-保存")
+    @PostMapping("/save")
+    public ReturnDTO<OutsourceAssessSaveResponse> saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceAssess request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        return outsourceAssessService.saveOutsourceAssess(request);
+    }
+
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception {
+        List<BizBusinessOutsourceAssess> list = super.exportList(request);
+        super.exportExcel(BizBusinessOutsourceAssess.class, list, ExportEnum.OUTSOURCE_ASSESS.getSheetName());
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java
new file mode 100644
index 0000000..9adef18
--- /dev/null
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java
@@ -0,0 +1,60 @@
+package com.casic.missiles.controller.business;
+
+import com.casic.missiles.controller.GeneralApprovalController;
+import com.casic.missiles.dto.BaseApprovalSubmitRequest;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.business.outsource.OutsourceProtocolApprovalListRequest;
+import com.casic.missiles.dto.business.outsource.OutsourceProtocolSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
+import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.model.business.BizBusinessOutsourceProtocol;
+import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
+import com.casic.missiles.service.IGeneralApprovalService;
+import com.casic.missiles.service.business.IBizBusinessOutsourceProtocolService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.BindingResult;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.validation.Valid;
+import java.util.List;
+
+/**
+ * <p>
+ * 计量检定业务-分包管理-测试、校准或检定工作分包协议书 前端控制器
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-08-24
+ */
+@Api(tags = "分包管理-测试、校准或检定工作分包协议书")
+@RestController
+@RequestMapping("/business/outsource/protocol")
+public class BizBusinessOutsourceProtocolController extends GeneralApprovalController<BizBusinessOutsourceProtocol, BizBusinessOutsourceProtocol, OutsourceProtocolApprovalListRequest, BaseApprovalSubmitRequest> {
+    @Autowired
+    private IBizBusinessOutsourceProtocolService outsourceProtocolService;
+
+    public BizBusinessOutsourceProtocolController(IGeneralApprovalService<BizBusinessOutsourceProtocol, BizBusinessOutsourceProtocol, OutsourceProtocolApprovalListRequest, BaseApprovalSubmitRequest> baseApprovalService) {
+        super(baseApprovalService);
+    }
+
+    @ApiOperation("草稿箱-保存")
+    @PostMapping("/save")
+    public ReturnDTO<OutsourceProtocolSaveResponse> saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceProtocol request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        return outsourceProtocolService.saveOutsourceProtocol(request);
+    }
+
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody OutsourceProtocolApprovalListRequest request) throws Exception {
+        List<BizBusinessOutsourceProtocol> list = super.exportList(request);
+        super.exportExcel(BizBusinessOutsourceProtocol.class, list, ExportEnum.OUTSOURCE_PROTOCOL.getSheetName());
+    }
+}
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java
index 097f645..f0f0943 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java
@@ -17,7 +17,6 @@
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.IGeneralApprovalService;
 import com.casic.missiles.service.business.IBizBusinessOutsourcerInfoService;
-import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -71,19 +70,8 @@
 
     @ApiOperation("分包方导出")
     @PostMapping("/listExport")
-    public void export(@RequestBody @Valid OutsourcerInfoApprovalListRequest request, BindingResult bindingResult) throws Exception {
-        if (bindingResult.hasErrors()) {
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        }
-        List<BizBusinessOutsourcerInfo> list;
-        if (!CollectionUtils.isEmpty(request.getIds())) {
-            list = outsourcerInfoService.listByIds(request.getIds());
-        } else {
-            list = outsourcerInfoService.list(request);
-        }
-        for (BizBusinessOutsourcerInfo record : list) {
-            DictCodeUtils.convertDictCodeToName(record);
-        }
+    public void export(@RequestBody OutsourcerInfoApprovalListRequest request) throws Exception {
+        List<BizBusinessOutsourcerInfo> list = super.exportList(request);
         super.exportExcel(BizBusinessOutsourcerInfo.class, list, ExportEnum.OUTSOURCER_EXPORT.getSheetName());
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java
index c2cbf9f..0410918 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java
@@ -17,11 +17,9 @@
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.IGeneralApprovalService;
 import com.casic.missiles.service.business.IBizBusinessSiteExecutiveInfoService;
-import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -60,7 +58,7 @@
         return siteExecutiveInfoService.saveSiteExecutiveInfo(siteExecutiveInfo);
     }
 
-    @ApiOperation("现场检测详情")
+    @ApiOperation("详情")
     @PostMapping("/detail")
     public ReturnDTO<SiteExecutiveDetailResponse> siteExecutiveDetail(@RequestBody @Valid IdDTO idDTO) throws Exception {
         Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
@@ -69,21 +67,10 @@
         return ReturnUtil.success(siteExecutiveInfoService.detail(idDTO.getId()));
     }
 
-    @ApiOperation("现场检测导出")
+    @ApiOperation("导出")
     @PostMapping("/listExport")
-    public void export(@RequestBody @Valid SiteExecutiveApprovalListRequest request, BindingResult bindingResult) throws Exception {
-        if (bindingResult.hasErrors()) {
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        }
-        List<SiteExecutiveApprovalListResponse> list;
-        if (!CollectionUtils.isEmpty(request.getIds())) {
-            list = siteExecutiveInfoService.listInfoByIds(request.getIds());
-        } else {
-            list = siteExecutiveInfoService.listInfo(request);
-        }
-        for (SiteExecutiveApprovalListResponse record : list) {
-            DictCodeUtils.convertDictCodeToName(record);
-        }
+    public void export(@RequestBody SiteExecutiveApprovalListRequest request) throws Exception {
+        List<SiteExecutiveApprovalListResponse> list = super.exportList(request);
         super.exportExcel(SiteExecutiveApprovalListResponse.class, list, ExportEnum.SITE_EXECUTIVE_EXPORT.getSheetName());
     }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
index 7e793cd..a92e209 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
@@ -55,7 +55,7 @@
 
     @ApiOperation("设备收发列表导出")
     @PostMapping("/export")
-    public void exportList(@RequestBody @Valid SampleDispatchListRequest request) throws IOException {
+    public void exportList(@RequestBody SampleDispatchListRequest request) throws IOException {
         List<SampleDispatchListResponse> list;
         if (!CollectionUtils.isEmpty(request.getIds())) {
             list = dispatchService.listByIds(request.getIds());
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java
index cdc77fc..d120fd4 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java
@@ -7,6 +7,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.business.labExecutive.*;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.business.IBusinessLabExecutiveInfoService;
@@ -14,6 +15,7 @@
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.*;
 
@@ -32,7 +34,7 @@
     @Autowired
     private IBusinessLabExecutiveInfoService labExecutiveInfoService;
 
-    @ApiOperation("实验室检测-部门检测-查询各状态列表（待检测、检测中、检测完）")
+    @ApiOperation("实验室任务-查询各状态列表（待检测、检测中、检测完）")
     @PostMapping("/deptExecutive/List")
     public ReturnDTO<PageInfoBT<SampleLabExecutiveListResponse>> queryDeptExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
@@ -43,10 +45,19 @@
         return ReturnUtil.success(super.packForBT(labExecutiveInfoService.deptLabExecutiveListPage(page, labExecutiveListRequest)));
     }
 
-    /**
-     * 实验室检测-我的检测-查询各状态列表（待检测、检测中、检测完）
-     */
-    @ApiOperation("实验室检测-我的检测-查询各状态列表（待检测、检测中、检测完）")
+    @ApiOperation("实验室任务导出")
+    @PostMapping("/deptExecutive/export")
+    public void deptExportList(@RequestBody @Valid SampleLabExecutiveListRequest request) throws Exception {
+        List<SampleLabExecutiveListResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = labExecutiveInfoService.deptLabExecutiveListByIds(request.getMeasureStatus(), request.getIds());
+        } else {
+            list = labExecutiveInfoService.deptLabExecutiveList(request);
+        }
+        super.exportExcel(SampleLabExecutiveListResponse.class, list, ExportEnum.DEPT_EXECUTIVE_TASK.getSheetName());
+    }
+
+    @ApiOperation("我的任务-查询各状态列表（待检测、检测中、检测完）")
     @PostMapping("/myExecutive/list")
     public ReturnDTO<PageInfoBT<SampleLabExecutiveListResponse>> queryMyExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
@@ -57,19 +68,25 @@
         return ReturnUtil.success(super.packForBT(labExecutiveInfoService.myLabExecutiveListPage(page, labExecutiveListRequest)));
     }
 
-    /**
-     * 实验室检测-我的检测-查询各状态样品数量（待检测、检测中、检测完）
-     */
-    @ApiOperation("实验室检测-我的检测-查询各状态样品数量（待检测、检测中、检测完）")
+    @ApiOperation("我的任务导出")
+    @PostMapping("/myExecutive/export")
+    public void exportList(@RequestBody @Valid SampleLabExecutiveListRequest request) throws Exception {
+        List<SampleLabExecutiveListResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = labExecutiveInfoService.myLabExecutiveListByIds(request.getMeasureStatus(), request.getIds());
+        } else {
+            list = labExecutiveInfoService.myLabExecutiveList(request);
+        }
+        super.exportExcel(SampleLabExecutiveListResponse.class, list, ExportEnum.MY_EXECUTIVE_TASK.getSheetName());
+    }
+
+    @ApiOperation("我的任务-查询各状态样品数量（待检测、检测中、检测完）")
     @GetMapping("/myExecutive/amount")
     public ReturnDTO<List<SampleAmountResponse>> queryMyExecutiveAmount() {
         return ReturnUtil.success(labExecutiveInfoService.myExecutiveAmount());
     }
 
-    /**
-     * 实验室检测-部门检测-分配（分配给具体人员）
-     */
-    @ApiOperation("实验室检测-部门检测-分配按钮（分配给具体人员）")
+    @ApiOperation("实验室任务-分配按钮（分配给具体人员）")
     @PostMapping("/deptExecutive/allocate")
     public ReturnDTO allocateStaff(@RequestBody @Valid SampleAllocateRequest sampleAllocateRequest, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -78,10 +95,7 @@
         return labExecutiveInfoService.allocateStaff(sampleAllocateRequest);
     }
 
-    /**
-     * 实验室检测-我的检测-检定人扫描收入（待检测->检测中）
-     */
-    @ApiOperation("实验室检测-我的检测-检定人扫描收入（待检测->检测中）")
+    @ApiOperation("我的任务-检定人扫描收入（待检测->检测中）")
     @PostMapping("/myExecutive/receive")
     public ReturnDTO sampleReceive(@RequestBody @Valid List<SampleOperateRequest> requestList, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -90,10 +104,7 @@
         return labExecutiveInfoService.sampleReceive(requestList);
     }
 
-    /**
-     * 实验室检测-负责人/检定人扫描检完（检测中->检测完）
-     */
-    @ApiOperation("实验室检测-负责人/检定人扫描检完（检测中->检测完）")
+    @ApiOperation("实验室任务-负责人/检定人扫描检完（检测中->检测完）")
     @PostMapping("/myExecutive/complete")
     public ReturnDTO sampleExecutiveComplete(@RequestBody @Valid List<SampleOperateRequest> requestList, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -102,10 +113,7 @@
         return labExecutiveInfoService.sampleExecutiveComplete(requestList);
     }
 
-    /**
-     * 实验室检测-部门检测/我的检测 编辑（只能修改应出具证书）
-     */
-    @ApiOperation("实验室检测-部门检测/我的检测 编辑（只能修改应出具证书）")
+    @ApiOperation("实验室任务/我的任务 编辑（只能修改应出具证书）")
     @PostMapping("/executive/update")
     public ReturnDTO updateExecutive(@RequestBody @Valid UpdateExecutiveRequest request, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -114,10 +122,7 @@
         return labExecutiveInfoService.updateExecutive(request);
     }
 
-    /**
-     * 实验室检测-部门检测/我的检测 详情
-     */
-    @ApiOperation("实验室检测-部门检测/我的检测 详情")
+    @ApiOperation("实验室任务/我的任务 详情")
     @PostMapping("/executive/detail")
     public ReturnDTO<ExecutiveDetailResponse> executiveDetail(@RequestBody @Valid ExecutiveDetailRequest request, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
@@ -131,7 +136,7 @@
      * 退回后会将下一个要执行的实验室检测状态更新为待分配，将后面的实验室顺序变更为连续（都进行减1）
      * 最后一个检测的实验室退回，等分发员再增加实验室或设备收发中的已收入直接手动点击完成
      */
-    @ApiOperation("实验室检测-部门检测/我的检测 退回（待检测/检测中->退回）")
+    @ApiOperation("实验室任务/我的任务 退回（待检测/检测中->退回）")
     @PostMapping("/executive/sendBack")
     public ReturnDTO executiveSendBack(@RequestBody @Valid ExecutiveSendBackRequest request, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -140,9 +145,6 @@
         return labExecutiveInfoService.sampleExecutiveSendBack(request);
     }
 
-    /**
-     * 分发员编辑实验室检测列表
-     */
     @ApiOperation("分发员编辑实验室检测列表")
     @PostMapping("/handOut/updateList")
     public ReturnDTO updateExecutiveList(@RequestBody @Valid UpdateExecutiveListRequest request, BindingResult bindingResult) {
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java
index 48a67ed..0c04f31 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java
@@ -10,6 +10,7 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.resource.customer.CustomerApprovalListRequest;
 import com.casic.missiles.dto.resource.customer.CustomerSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceCustomerInfo;
@@ -26,6 +27,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -55,6 +57,13 @@
         return customerInfoService.saveCustomerInfo(request);
     }
 
+    @ApiOperation("委托方名录导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody CustomerApprovalListRequest request) throws Exception {
+        List<BizResourceCustomerInfo> list = super.exportList(request);
+        super.exportExcel(BizResourceCustomerInfo.class, list, ExportEnum.CUSTOMER_INFO.getSheetName());
+    }
+
     @ApiOperation("委托方人员列表（分页）")
     @PostMapping("/person/listPage")
     public ReturnDTO<PageInfoBT<BizResourceCustomerStaff>> personListPage(@RequestBody IdDTO idDto) {
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
index 972ed4b..6418ea5 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
@@ -5,6 +5,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.resource.customer.SuggestFormApprovalListRequest;
 import com.casic.missiles.dto.resource.customer.SuggestFormSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceCustomerSuggestForm;
@@ -20,6 +21,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -50,4 +52,11 @@
         return suggestFormService.saveSuggestForm(request);
     }
 
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody SuggestFormApprovalListRequest request) throws Exception {
+        List<BizResourceCustomerSuggestForm> list = super.exportList(request);
+        super.exportExcel(BizResourceCustomerSuggestForm.class, list, ExportEnum.CUSTOMER_SUGGEST_FORM.getSheetName());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java
index 1934d1a..9e07eab 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java
@@ -15,12 +15,16 @@
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.resource.IEnvEnvironmentRecordConfigService;
 import com.casic.missiles.service.resource.IEnvEnvironmentRecordDataService;
+import com.casic.missiles.service.resource.IEnvLocationInfoService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
 import java.util.List;
@@ -39,6 +43,8 @@
     private IEnvEnvironmentRecordDataService environmentRecordDataService;
     @Autowired
     private IEnvEnvironmentRecordConfigService environmentRecordConfigService;
+    @Autowired
+    private IEnvLocationInfoService locationInfoService;
 
     @ApiOperation("环境记录单数据列表/详情")
     @PostMapping("/data/listPage")
@@ -95,4 +101,11 @@
         });
         return environmentRecordConfigService.deleteEnvironmentRecordConfig(idDTO.getId());
     }
+
+    @ApiOperation("地点列表")
+    @PostMapping("/location/listPage")
+    public ReturnDTO<PageInfoBT<LocationListResponse>> locationListPage(@RequestBody @Valid LocationListRequest request) {
+        Page<LocationListResponse> page = PageFactory.defaultPage();
+        return ReturnUtil.success(super.packForBT(locationInfoService.listPage(page, request)));
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java
index 82efe3f..e9561fa 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java
@@ -10,6 +10,7 @@
 import com.casic.missiles.dto.resource.seal.SealLogListRequest;
 import com.casic.missiles.dto.resource.seal.SealNoteApprovalListRequest;
 import com.casic.missiles.dto.resource.seal.SealNoteSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceSealUseLog;
@@ -27,6 +28,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -58,6 +60,13 @@
         return sealUseNoteService.saveSeal(request);
     }
 
+    @ApiOperation("印章使用登记导出（列表和导出中去掉经办人和监印人）")
+    @PostMapping("/listExport")
+    public void export(@RequestBody SealNoteApprovalListRequest request) throws Exception {
+        List<BizResourceSealUseNote> list = super.exportList(request);
+        super.exportExcel(BizResourceSealUseNote.class, list, ExportEnum.SEAL_NOTE.getSheetName());
+    }
+
     // TODO: 2023/7/28 印章使用日志：系统中使用印章时插入数据库
 
     @ApiOperation("印章使用日志列表（分页）")
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java
index 9b674fc..06b6521 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java
@@ -9,16 +9,20 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.resource.staff.StaffCertRequest;
 import com.casic.missiles.dto.resource.staff.StaffCertResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.service.resource.IBizResourceStaffInfoService;
 import com.casic.missiles.service.resource.IBizResourceStaffVerifierService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.List;
+
 /**
  * @Description:
  * @Author: wangpeng
@@ -41,9 +45,21 @@
         return ReturnUtil.success(super.packForBT(responsePage));
     }
 
+    @ApiOperation("证书逾期提醒导出")
+    @PostMapping("/listExport")
+    public void exportList(@RequestBody StaffCertRequest request) throws Exception {
+        List<StaffCertResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = staffInfoService.certListByIds(request.getIds());
+        } else {
+            list = staffInfoService.certList(request);
+        }
+        super.exportExcel(StaffCertResponse.class, list, ExportEnum.STAFF_CERTIFICATE_EXPIRE.getSheetName());
+    }
+
     @ApiOperation("证书逾期提醒")
     @PostMapping("/expirationReminder")
-    public ReturnDTO expirationReminder(@RequestBody IdDTO idDto) {
-        return verifierService.expirationReminder(idDto);
+    public ReturnDTO expirationReminder(@RequestBody IdDTO idDTO) {
+        return verifierService.expirationReminder(idDTO);
     }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java
index 3b251ad..a6e7850 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java
@@ -12,6 +12,7 @@
 import com.casic.missiles.dto.resource.staff.StaffListRequest;
 import com.casic.missiles.dto.resource.staff.TrainListRequest;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.*;
@@ -22,7 +23,10 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
 import java.util.List;
@@ -52,8 +56,19 @@
             throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
         }
         Page<BizResourceStaffInfo> page = PageFactory.defaultPage();
-        Page<BizResourceStaffInfo> responsePage = staffInfoService.listPage(page, request);
-        return ReturnUtil.success(super.packForBT(responsePage));
+        return ReturnUtil.success(super.packForBT(staffInfoService.listPage(page, request)));
+    }
+
+    @ApiOperation("人员登记导出")
+    @PostMapping("/listExport")
+    public void exportList(@RequestBody StaffListRequest request) throws Exception {
+        List<BizResourceStaffInfo> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = staffInfoService.listByIds(request.getIds());
+        } else {
+            list = staffInfoService.list(request);
+        }
+        super.exportExcel(BizResourceStaffInfo.class, list, ExportEnum.STAFF_INFO.getSheetName());
     }
 
     @ApiOperation("人员登记详情基础信息")
@@ -85,9 +100,9 @@
 
     @ApiOperation("科研教育列表（分页）")
     @PostMapping("/education/listPage")
-    public ReturnDTO<PageInfoBT<BizResourceStaffEducation>> educationListPage(@RequestBody IdDTO idDto) {
+    public ReturnDTO<PageInfoBT<BizResourceStaffEducation>> educationListPage(@RequestBody IdDTO idDTO) {
         Page<BizResourceStaffEducation> page = PageFactory.defaultPage();
-        Page<BizResourceStaffEducation> responsePage = staffInfoService.educationListPage(page, idDto);
+        Page<BizResourceStaffEducation> responsePage = staffInfoService.educationListPage(page, idDTO);
         return ReturnUtil.success(super.packForBT(responsePage));
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java
index af6aa86..d85d84a 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java
@@ -9,6 +9,7 @@
 import com.casic.missiles.dto.resource.outsideService.SupplierApprovalListRequest;
 import com.casic.missiles.dto.resource.outsideService.SupplierSaveResponse;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceSupplierAbility;
@@ -67,6 +68,13 @@
         return ReturnUtil.success(supplierInfoService.detail(idDTO.getId()));
     }
 
+    @ApiOperation("合格供方导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody SupplierApprovalListRequest request) throws Exception {
+        List<BizResourceSupplierInfo> list = super.exportList(request);
+        super.exportExcel(BizResourceSupplierInfo.class, list, ExportEnum.SUPPLIER_INFO.getSheetName());
+    }
+
     @ApiOperation("供方人员列表（分页）")
     @PostMapping("/person/listPage")
     public ReturnDTO<PageInfoBT<BizResourceSupplierPerson>> personListPage(@RequestBody IdDTO idDTO) {
diff --git a/casic-metering-api/src/main/resources/config/application.yml b/casic-metering-api/src/main/resources/config/application.yml
index 350db5f..ecff521 100644
--- a/casic-metering-api/src/main/resources/config/application.yml
+++ b/casic-metering-api/src/main/resources/config/application.yml
@@ -126,7 +126,7 @@
     #作者
     author: wangpeng
     #待生成对象表名
-    table-name: biz_equipment_technical_target_approval,biz_equipment_attachment_approval,biz_equipment_checkpoint_approval
+    table-name: biz_business_outsource_protocol
 
 reminder:
   #节点--common模块config包 ReminderNodeConfig配置
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
index 4a19e4e..d47d552 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
@@ -53,6 +53,7 @@
     SUGGEST_FORM_SAVE_FAILED(2509, "委托方意见登记表保存至草稿箱失败"),
     EXAMINE_FORM_SAVE_FAILED(2510, "要求、委托书及合同评审表保存至草稿箱失败"),
     CUSTOMER_EXIST_SAVE_FAILED(2511, "该委托方已存在，请重新选择"),
+    DUPLICATE_LOCATION_NO(2512, "地点编号已存在"),
 
     /**
      * 计量检定业务模块
@@ -68,6 +69,8 @@
     COMPLETE_SAMPLE_NOT_EXIST(2609, "检测中不存在扫描收入的样品"),
     CANNOT_CHANGE_MEASURE_INFO(2610, "无法更改非当前登录用户的检测信息"),
     NON_EXIST_ORDER_OR_SAMPLE(2611, "不存在该委托单或该委托单下的样品"),
+    OUTSOURCE_ACCESS_SAVE_FAILED(2612, "测试、校准或检定工作分包评审表保存至草稿箱失败"),
+    OUTSOURCE_PROTOCOL_SAVE_FAILED(2613, "测试、校准或检定工作分包协议书保存至草稿箱失败"),
 
     /**
      * 历史遗留备用
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
index 5089ad1..81a406b 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
@@ -10,54 +10,38 @@
     /**
      * 资源管理
      */
-    ENVIRONMENT_DATA_EXPORT("environmentData", "environmentData", "环境记录单数据"),
+    ENVIRONMENT_DATA_EXPORT("environmentData", "环境记录单数据", "环境记录单数据"),
+    STAFF_INFO("staffInfo", "人员登记", "人员登记"),
+    STAFF_CERTIFICATE_EXPIRE("certificateExpire", "证书逾期提醒", "证书逾期提醒"),
+    SUPPLIER_INFO("supplierInfo", "合格供方名录", "合格供方名录"),
+    CUSTOMER_INFO("customerInfo", "委托方名录", "委托方名录"),
+    CUSTOMER_SUGGEST_FORM("customerSuggestForm", "委托方意见登记表", "委托方意见登记表"),
+    SEAL_NOTE("sealNote", "印章使用登记", "印章使用登记"),
 
-    FILE_EXPORT("meterFileData", "meterFileData", "计量文件信息"),
-    TRAIN_PLAN_EXPORT("trainPlanData", "trainPlanData", "培训计划"),
-    TRAIN_LOG_EXPORT("trainLogData", "trainLogData", "培训记录"),
-    METER_ORGANIZE_EXPORT("meterOrganizeData", "meterOrganizeData", "计量组织"),
-    TRACE_SUPPLIER_EXPORT("traceSupplierData", "traceSupplierData", "溯源供方"),
-    SIGN_EXPORT("signData", "signData", "签名/签章"),
-    TEMPLATE_EXPORT("templateData", "templateData", "原始记录模板/证书报告模板"),
-    FIXED_ASSETS("meterFixedAssets", "meterFixedAssets", "固定资产"),
-    METER_EQUIPMENT("meterEquipment", "meterEquipment", "测量设备"),
-    CALIBRATION_TEST_EQUIPMENT("calibrationTestEquipment", "calibrationTestEquipment", "校准检定设备"),
-    MEASURE_ACCOUNT("measureAccount", "measureAccount", "测量工装"),
-    STANDARD_SUPPORT_EQUIPMENT("standardSupportEquipment", "standardSupportEquipment", "标准配套设备"),
-    STANDARD_EQUIPMENT("standardEquipment", "standardEquipment", "标准装置"),
-    FLOW_DEF_EXPORT("flowDefData", "flowDefData", "流程定义"),
-    STAFF_CERTIFICATE("certificate", "certificate", "计量人员证书"),
-    CHECK_INFO("checkInfo", "checkInfo", "设备管理点检测"),
-    EQUIPMENT_APPLY("equipmentApply", "equipmentApply", "设备借用"),
-    STANDARD_EQUIPMENT_REMIND("equipmentApplyRemind", "equipmentApplyRemind", "标准装置到期提醒"),
-    METER_PRICE("meterPrice", "meterPrice", "价格库"),
-    METER_STAFF("meterStaff", "meterStaff", "计量人员"),
-    STANDARD_EQUIPMENT_APPLY("standardEquipmentApply", "standardEquipmentApply", "标准装置申请"),
-    STATE_MANAGE_APPLY("stateManage", "stateManage", "状态管理"),
-    METER_ACCEPTANCE_CHECK("acceptanceCheck", "acceptanceCheck", "设备检修保养验收单"),
-    CUSTOMER_EXPORT("customerData", "customerData", "客户信息"),
-    ORDER_EXPORT("orderData", "orderData", "委托书信息"),
-    SAMPLE_EXPORT("sampleData", "sampleData", "样本信息"),
-    EXCHANGE_DATA("exchangeData", "exchangeData", "设备交接单"),
-    DISPATCH_DATA("dispatchData", "dispatchData", "设备收发"),
-    ENVIRONMENT_DATA("environmentData", "environmentData", "环境记录单"),
-    ORIGIN_DATA("originData", "originData", "原始记录"),
-    CERTIFICATE_REPORT("certificateReport", "certificateReport", "证书报告"),
-    ADVICE_EXPORT("adviceData", "adviceData", "客户反馈"),
-    HANDOUT_EXPORT("handoutData", "handoutData", "任务分发列表"),
-    OUTSOURCER_EXPORT("outsourcerData", "outsourcerData", "分包方"),
-    SITE_EXECUTIVE_EXPORT("siteExecutiveData", "siteExecutiveData", "现场测试、校准或检定"),
-    CERTIFICATE_PRINT_EXPORT("certificatePrintData", "certificatePrintData", "证书打印"),
-    DOWNLOAD_TEMPLATE("downloadTemplate", "downloadTemplate", "页面配置"),
-    OUTSOURCER_CERTIFICATE_EXPORT("outsourceCertificateData", "outsourceCertificateData", "分包证书"),
-    SETTLEMENT_INFO_EXPORT("settlementInfoData", "settlementInfoData", "业务结算"),
-    EQUIPMENT_REMIND("equipmentRemind", "equipmentRemind", "设备到期提醒"),
-    AGREEMENT_INFO_EXPORT("agreementInfoData", "agreementInfoData", "合同"),
-    WORK_STATISTICS_EXPORT("workStatisticsData", "workStatisticsData", "实时工作统计"),
-    DEPT_OUTPUT_EXPORT("deptOutputData", "deptOutputData", "部门产值分析"),
-    WORKLOAD_EXPORT("workloadData", "workloadData", "业务工作量分析"),
-    DEPT_COMPREHENSIVE_EXPORT("deptComprehensiveData", "deptComprehensiveData", "部门综合分析"),
-    ENVIRONMENTAL_RECORD("environmentalRecordData", "environmentalRecordData", "现场环境记录");
+    /**
+     * 计量检定业务
+     */
+    OUTSOURCER_EXPORT("outsourcerData", "分包方名录", "分包方名录"),
+    IDENTIFY_EXPORT("identifyData", "计量标识", "计量标识"),
+    ORDER_EXPORT("orderData", "任务单", "任务单"),
+    DISPATCH_DATA("dispatchData", "设备收发", "设备收发"),
+    HANDOUT_EXPORT("handoutData", "任务分发", "任务分发"),
+    SITE_EXECUTIVE_EXPORT("siteExecutiveData", "现场测试、校准或检定", "现场测试、校准或检定"),
+    CERTIFICATE_REPORT("certificateReport", "证书审批", "证书审批"),
+    CERTIFICATE_CHANGE_APPLY("certificateChangeApply", "证书报告补充或更换申请单", "证书报告补充或更换申请单"),
+    CERTIFICATE_PRINT("certificatePrintData", "证书打印审批", "证书打印审批"),
+    DEPT_EXECUTIVE_TASK("deptExecutiveTaskData", "实验室任务", "实验室任务"),
+    MY_EXECUTIVE_TASK("myExecutiveTaskData", "我的任务", "我的任务"),
+    OUTSOURCE_ASSESS("outsourceAssess", "测试、校准或检定工作分包评审表", "测试、校准或检定工作分包评审表"),
+    OUTSOURCE_PROTOCOL("outsourceProtocol", "测试、校准或检定工作分包协议书", "测试、校准或检定工作分包协议书"),
+
+    /**
+     * 系统管理
+     */
+    SIGN_EXPORT("signData", "签名", "签名"),
+    TEMPLATE_EXPORT("templateData", "文件模板", "文件模板"),
+    FLOW_DEF_EXPORT("flowDefData", "流程定义", "流程定义"),
+    DOWNLOAD_TEMPLATE("downloadTemplate", "流程定义", "页面配置");
 
     ExportEnum(String fileName, String sheetName, String description) {
         this.fileName = fileName;
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateRecordTypeCodeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateRecordTypeCodeEnum.java
index 31d913c..a963522 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateRecordTypeCodeEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateRecordTypeCodeEnum.java
@@ -46,4 +46,14 @@
     String SITE_EXECUTIVE_APPROVAL = "01";
     //《现场测试、校准或检定工作记录表》
     String SITE_EXECUTIVE_LOG = "02";
+
+    //测试、校准或检定工作分包协议书
+    String OUTSOURCE_PROTOCOL = "01";
+    //测试、校准或检定工作分包评审表
+    String OUTSOURCE_ACCESS = "02";
+    //测试、校准或检定工作分包通知书
+    String OUTSOURCE_NOTICE = "03";
+    //测试、校准或检定工作分包方名录
+    String OUTSOURCE_INFO = "04";
+
 }
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
index 24b8635..f78bd53 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
@@ -15,6 +15,10 @@
     String CERTIFICATE_CHANGE_APPLY_BEAN_NAME = "certificateChangeApplyBean";
     //现场测试、校准或检定
     String SITE_EXECUTIVE_BEAN_NAME = "siteExecutiveBean";
+    //测试、校准或检定工作分包评审表
+    String OUTSOURCE_ASSESS_BEAN_NAME = "outsourceAssessBean";
+    //测试、校准或检定工作分包协议书
+    String OUTSOURCE_PROTOCOL_BEAN_NAME = "outsourceProtocolBean";
 
     /*********************************设备与装置************************************/
     //设备台账
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 b21c661..6b86fd1 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
@@ -18,6 +18,8 @@
     OUTSOURCER_APPROVAL(OUTSOURCER_BEAN_NAME, ""),
     CERTIFICATE_CHANGE_APPROVAL(CERTIFICATE_CHANGE_APPLY_BEAN_NAME, ""),
     SITE_EXECUTIVE_APPROVAL(SITE_EXECUTIVE_BEAN_NAME, ""),
+    OUTSOURCE_ASSESS_APPROVAL(OUTSOURCE_ASSESS_BEAN_NAME, ""),
+    OUTSOURCE_PROTOCOL_APPROVAL(OUTSOURCE_PROTOCOL_BEAN_NAME, ""),
 
     ACTION_STATUS_MAP(new HashMap<String, AwareActionStatusEnum>() {
         {
@@ -47,6 +49,10 @@
             put(ApplyFromIdEnum.CERTIFICATE_CHANGE_APPROVAL.getCode(), CERTIFICATE_CHANGE_APPROVAL);
             //现场测试、校准或检定审批
             put(ApplyFromIdEnum.SITE_EXECUTIVE_APPROVAL.getCode(), SITE_EXECUTIVE_APPROVAL);
+            //测试、校准或检定工作分包评审表
+            put(ApplyFromIdEnum.OUTSOURCE_ASSESS_APPROVAL.getCode(), OUTSOURCE_ASSESS_APPROVAL);
+            //测试、校准或检定工作分包协议书
+            put(ApplyFromIdEnum.OUTSOURCE_PROTOCOL_APPROVAL.getCode(), OUTSOURCE_PROTOCOL_APPROVAL);
         }
     });
     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 934405e..c7410bd 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
@@ -9,6 +9,8 @@
     CERTIFICATE_CHANGE_APPROVAL("jljdywzsbchghsqd", MessageSourceModuleEnum.BUSINESS.getCode(), "证书/报告补充或更换申请单"),
     OUTSOURCER_APPROVAL("jljdywcsjzhgfbfml", MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定合格分包方名录"),
     SITE_EXECUTIVE_APPROVAL("jljdywxccsjzsp", MessageSourceModuleEnum.BUSINESS.getCode(), "现场测试、校准或检定审批"),
+    OUTSOURCE_ASSESS_APPROVAL("jljdywcsjzfbpsb", MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包评审表"),
+    OUTSOURCE_PROTOCOL_APPROVAL("jljdywcsjzfbxys", MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包协议书"),
 
 
     /*******************************************设备与装置*********************************************/
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/GeneralApprovalMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/GeneralApprovalMapper.java
index 4fb7344..0c9d6ae 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/GeneralApprovalMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/GeneralApprovalMapper.java
@@ -17,8 +17,4 @@
 
     Page<O> selectBatchForApprovalList(Page<O> page, @Param("request") R request, @Param("businessKeys") List<String> businessKeys);
 
-//    Page<O> selectListPage(Page<O> page, @Param("request") R request);
-
-//    Long selectMaxNo();
-
 }
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceAssessMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceAssessMapper.java
index 7867bb8..ba59009 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceAssessMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceAssessMapper.java
@@ -1,7 +1,12 @@
 package com.casic.missiles.mapper.business;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.business.outsource.OutsourceAssessApprovalListRequest;
+import com.casic.missiles.mapper.GeneralApprovalMapper;
 import com.casic.missiles.model.business.BizBusinessOutsourceAssess;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * <p>
@@ -11,6 +16,10 @@
  * @author wangpeng
  * @since 2023-08-16
  */
-public interface BizBusinessOutsourceAssessMapper extends BaseMapper<BizBusinessOutsourceAssess> {
+public interface BizBusinessOutsourceAssessMapper extends GeneralApprovalMapper<BizBusinessOutsourceAssess, BizBusinessOutsourceAssess, OutsourceAssessApprovalListRequest> {
+
+    Page<BizBusinessOutsourceAssess> selectBatchForApprovalList(Page<BizBusinessOutsourceAssess> page, @Param("request") OutsourceAssessApprovalListRequest request, @Param("businessKeys") List<String> businessKeys);
+
+    Long selectMaxProjectNo();
 
 }
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceProtocolMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceProtocolMapper.java
new file mode 100644
index 0000000..e6aba35
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceProtocolMapper.java
@@ -0,0 +1,24 @@
+package com.casic.missiles.mapper.business;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.business.outsource.OutsourceProtocolApprovalListRequest;
+import com.casic.missiles.mapper.GeneralApprovalMapper;
+import com.casic.missiles.model.business.BizBusinessOutsourceProtocol;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 计量检定业务-分包管理-测试、校准或检定工作分包协议书 Mapper 接口
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-08-24
+ */
+public interface BizBusinessOutsourceProtocolMapper extends GeneralApprovalMapper<BizBusinessOutsourceProtocol, BizBusinessOutsourceProtocol, OutsourceProtocolApprovalListRequest> {
+
+    Page<BizBusinessOutsourceProtocol> selectBatchForApprovalList(Page<BizBusinessOutsourceProtocol> page, @Param("request") OutsourceProtocolApprovalListRequest request, @Param("businessKeys") List<String> businessKeys);
+
+    Long selectMaxProtocolNo();
+}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/EnvLocationInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/EnvLocationInfoMapper.java
new file mode 100644
index 0000000..49eff87
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/EnvLocationInfoMapper.java
@@ -0,0 +1,21 @@
+package com.casic.missiles.mapper.resource;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.resource.environment.LocationListRequest;
+import com.casic.missiles.dto.resource.environment.LocationListResponse;
+import com.casic.missiles.model.resource.EnvLocationInfo;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * <p>
+ * 实验室环境监控系统-设备表 Mapper 接口
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-06-07
+ */
+public interface EnvLocationInfoMapper extends BaseMapper<EnvLocationInfo> {
+
+    Page<LocationListResponse> selectLocationListPage(Page<LocationListResponse> page, @Param("request") LocationListRequest request);
+}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java
index de124db..85ed0f7 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java
@@ -1,7 +1,9 @@
 package com.casic.missiles.mapper.system;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.dto.system.SignDetailResponse;
+import com.casic.missiles.dto.system.SignListRequest;
 import com.casic.missiles.model.system.SystemSign;
 import org.apache.ibatis.annotations.Param;
 
@@ -22,4 +24,8 @@
     SignDetailResponse selectSignDetailById(Long id);
 
     List<SystemSign> selectUsableSignList(@Param("userId") Long userId);
+
+    Page<SystemSign> selectSignListPage(Page<SystemSign> page, @Param("request") SignListRequest request);
+
+    List<SystemSign> selectSignList(@Param("request") SignListRequest request);
 }
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateChangeApplyMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateChangeApplyMapper.xml
index d798447..c496092 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateChangeApplyMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateChangeApplyMapper.xml
@@ -30,31 +30,31 @@
         SELECT *
         FROM biz_business_certificate_change_apply
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.changeApplyNo != null and request.changeApplyNo !=''">
+        <if test="request != null and request.changeApplyNo != null and request.changeApplyNo !=''">
             and change_apply_no like concat('%',#{request.changeApplyNo},'%')
         </if>
-        <if test="request.changeReportNo != null and request.changeReportNo !=''">
+        <if test="request != null and request.changeReportNo != null and request.changeReportNo !=''">
             and change_report_no like concat('%',#{request.changeReportNo},'%')
         </if>
-        <if test="request.changeReportName != null and request.changeReportName !=''">
+        <if test="request != null and request.changeReportName != null and request.changeReportName !=''">
             and change_report_name like concat('%',#{request.changeReportName},'%')
         </if>
-        <if test="request.changeType != null and request.changeType !=''">
+        <if test="request != null and request.changeType != null and request.changeType !=''">
             and change_type = #{request.changeType}
         </if>
-        <if test="request.createUserName != null and request.createUserName !=''">
+        <if test="request != null and request.createUserName != null and request.createUserName !=''">
             and create_user_name like concat('%',#{request.createUserName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificatePrintMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificatePrintMapper.xml
index b66cd99..49c0ac8 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificatePrintMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificatePrintMapper.xml
@@ -31,34 +31,34 @@
         LEFT JOIN biz_business_order_sample_relation bosr ON (bosr.order_id = bcr.order_id AND bosr.sample_id = bcr.sample_id)
         LEFT JOIN biz_business_order_info boi ON boi.id = bosr.order_id
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and bcp.approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.printStatus != null and request.printStatus !=''">
+        <if test="request != null and request.printStatus != null and request.printStatus !=''">
             and print_status = #{request.printStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and bcp.create_user_id = #{request.createUserId}
         </if>
-        <if test="request.certificateReportNo != null and request.certificateReportNo !=''">
+        <if test="request != null and request.certificateReportNo != null and request.certificateReportNo !=''">
             and bcr.certificate_report_no like concat('%',#{request.certificateReportNo},'%')
         </if>
-        <if test="request.certificateReportName != null and request.certificateReportName !=''">
+        <if test="request != null and request.certificateReportName != null and request.certificateReportName !=''">
             and bcr.certificate_report_name like concat('%',#{request.certificateReportName},'%')
         </if>
-        <if test="request.customerName != null and request.customerName !=''">
+        <if test="request != null and request.customerName != null and request.customerName !=''">
             and boi.customer_name like concat('%',#{request.customerName},'%')
         </if>
-        <if test="request.sampleNo != null and request.sampleNo !=''">
+        <if test="request != null and request.sampleNo != null and request.sampleNo !=''">
             and bosr.sample_no like concat('%',#{request.sampleNo},'%')
         </if>
-        <if test="request.sampleName != null and request.sampleName !=''">
+        <if test="request != null and request.sampleName != null and request.sampleName !=''">
             and bosr.sample_name like concat('%',#{request.sampleName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and bcp.create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and bcp.create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml
index b366034..767695d 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml
@@ -46,33 +46,37 @@
         SELECT bcr.*, bosr.sample_no, bosr.sample_name, bosr.sample_model, rsi.staff_name
         FROM biz_business_certificate_report bcr
         LEFT JOIN biz_business_order_sample_relation bosr ON (bosr.order_id = bcr.order_id AND bosr.sample_id = bcr.sample_id)
+        LEFT JOIN biz_business_order_info boi ON boi.id = bcr.order_id
         LEFT JOIN biz_resource_staff_info rsi ON rsi.id = bcr.measure_person_id
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and bcr.approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and bcr.create_user_id = #{request.createUserId}
         </if>
-        <if test="request.certificateReportNo != null and request.certificateReportNo !=''">
+        <if test="request != null and request.customerId != null and request.customerId !=''">
+            and boi.customer_id = #{request.customerId}
+        </if>
+        <if test="request != null and request.certificateReportNo != null and request.certificateReportNo !=''">
             and bcr.certificate_report_no like concat('%',#{request.certificateReportNo},'%')
         </if>
-        <if test="request.certificateReportName != null and request.certificateReportName !=''">
+        <if test="request != null and request.certificateReportName != null and request.certificateReportName !=''">
             and bcr.certificate_report_name like concat('%',#{request.certificateReportName},'%')
         </if>
-        <if test="request.sampleNo != null and request.sampleNo !=''">
+        <if test="request != null and request.sampleNo != null and request.sampleNo !=''">
             and bosr.sample_no like concat('%',#{request.sampleNo},'%')
         </if>
-        <if test="request.measureCategory != null and request.measureCategory !=''">
+        <if test="request != null and request.measureCategory != null and request.measureCategory !=''">
             and bcr.measure_category = #{request.measureCategory}
         </if>
-        <if test="request.measurePerson != null and request.measurePerson !=''">
+        <if test="request != null and request.measurePerson != null and request.measurePerson !=''">
             and rsi.staff_name like concat('%',#{request.measurePerson},'%')
         </if>
-        <if test="request.calibrationTimeStart != null and request.calibrationTimeStart !=''">
+        <if test="request != null and request.calibrationTimeStart != null and request.calibrationTimeStart !=''">
             and bcr.calibration_time &gt;= #{request.calibrationTimeStart}
         </if>
-        <if test="request.calibrationTimeEnd != null and request.calibrationTimeEnd !=''">
+        <if test="request != null and request.calibrationTimeEnd != null and request.calibrationTimeEnd !=''">
             and bcr.calibration_time &lt;= #{request.calibrationTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceAssessMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceAssessMapper.xml
index d0fcf8b..c22c101 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceAssessMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceAssessMapper.xml
@@ -7,6 +7,8 @@
         <id column="id" property="id" />
         <result column="project_no" property="projectNo" />
         <result column="project_name" property="projectName" />
+        <result column="lab_code" property="labCode" />
+        <result column="group_code" property="groupCode" />
         <result column="applicant_id" property="applicantId" />
         <result column="applicant_name" property="applicantName" />
         <result column="applicant_time" property="applicantTime" />
@@ -31,7 +33,45 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, project_no, project_name, applicant_id, applicant_name, applicant_time, minio_file_name, remark, create_user_id, create_user_name, outsourcer_id, pre_start_time, pre_end_time, outsource_reason, pre_cost, approval_status, process_id, approve_situation, traceability, test_method, technique_ability, create_time, update_time
+        id, project_no, project_name, lab_code, group_code, applicant_id, applicant_name, applicant_time, minio_file_name, remark, create_user_id, create_user_name, outsourcer_id, pre_start_time, pre_end_time, outsource_reason, pre_cost, approval_status, process_id, approve_situation, traceability, test_method, technique_ability, create_time, update_time
     </sql>
 
+    <select id="selectMaxProjectNo" resultType="java.lang.Long">
+        SELECT IFNULL(max(RIGHT(project_no, 3)), 0) from biz_business_outsource_assess
+    </select>
+
+    <select id="selectBatchForApprovalList" resultMap="BaseResultMap">
+        SELECT bboa.*, bboi.outsourcer_name, bboi.director
+        FROM biz_business_outsource_assess bboa
+        LEFT JOIN biz_business_outsourcer_info bboi ON bboa.outsourcer_id = bboi.id
+        WHERE 1=1
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
+            and bboa.approval_status = #{request.approvalStatus}
+        </if>
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
+            and bboa.create_user_id = #{request.createUserId}
+        </if>
+        <if test="request != null and request.projectNo != null and request.projectNo !=''">
+            and bboa.project_no like concat('%',#{request.projectNo},'%')
+        </if>
+        <if test="request != null and request.outsourcerName != null and request.outsourcerName !=''">
+            and bboi.outsourcer_name like concat('%',#{request.outsourcerName},'%')
+        </if>
+        <if test="request != null and request.applicantName != null and request.applicantName !=''">
+            and bboa.applicant_name like concat('%',#{request.applicantName},'%')
+        </if>
+        <if test="request != null and request.applicantTimeStart != null and request.applicantTimeStart !=''">
+            and bboa.applicant_time &gt;= #{request.applicantTimeStart}
+        </if>
+        <if test="request != null and request.applicantTimeEnd != null and request.applicantTimeEnd !=''">
+            and bboa.applicant_time &lt;= #{request.applicantTimeEnd}
+        </if>
+        <if test="businessKeys != null">
+            and bboa.id in
+            <foreach collection="businessKeys" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
+        ORDER BY bboa.create_time DESC
+    </select>
 </mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceProtocolMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceProtocolMapper.xml
new file mode 100644
index 0000000..b7b2149
--- /dev/null
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceProtocolMapper.xml
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.mapper.business.BizBusinessOutsourceProtocolMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.business.BizBusinessOutsourceProtocol">
+        <id column="id" property="id" />
+        <result column="protocol_no" property="protocolNo" />
+        <result column="project_name" property="projectName" />
+        <result column="lab_code" property="labCode" />
+        <result column="group_code" property="groupCode" />
+        <result column="outsourcer_id" property="outsourcerId" />
+        <result column="remark" property="remark" />
+        <result column="outsource_no" property="outsourceNo" />
+        <result column="outsource_name" property="outsourceName" />
+        <result column="contacts" property="contacts" />
+        <result column="mobile" property="mobile" />
+        <result column="address" property="address" />
+        <result column="require_date" property="requireDate" />
+        <result column="outsource_cost" property="outsourceCost" />
+        <result column="director" property="director" />
+        <result column="item" property="item" />
+        <result column="requires" property="requires" />
+        <result column="create_user_id" property="createUserId" />
+        <result column="create_user_name" property="createUserName" />
+        <result column="approval_status" property="approvalStatus" />
+        <result column="process_id" property="processId" />
+        <result column="create_time" property="createTime" />
+        <result column="update_time" property="updateTime" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, protocol_no, project_name, lab_code, group_code, outsourcer_id, remark, outsource_no, outsource_name, contacts, mobile, address, require_date, outsource_cost, director, item, requires, create_user_id, create_user_name, approval_status, process_id, create_time, update_time
+    </sql>
+
+    <select id="selectMaxProtocolNo" resultType="java.lang.Long">
+        SELECT IFNULL(max(RIGHT(protocol_no, 3)), 0) from biz_business_outsource_protocol
+    </select>
+
+    <select id="selectBatchForApprovalList" resultMap="BaseResultMap">
+        SELECT *
+        FROM biz_business_outsource_protocol
+        WHERE 1=1
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
+            and approval_status = #{request.approvalStatus}
+        </if>
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
+            and create_user_id = #{request.createUserId}
+        </if>
+        <if test="request != null and request.protocolNo != null and request.protocolNo !=''">
+            and protocol_no like concat('%',#{request.protocolNo},'%')
+        </if>
+        <if test="request != null and request.outsourcerName != null and request.outsourcerName !=''">
+            and outsourcer_name like concat('%',#{request.outsourcerName},'%')
+        </if>
+        <if test="request != null and request.applicantName != null and request.applicantName !=''">
+            and create_user_name like concat('%',#{request.applicantName},'%')
+        </if>
+        <if test="request != null and request.applicantTimeStart != null and request.applicantTimeStart !=''">
+            and create_time &gt;= #{request.applicantTimeStart}
+        </if>
+        <if test="request != null and request.applicantTimeEnd != null and request.applicantTimeEnd !=''">
+            and create_time &lt;= #{request.applicantTimeEnd}
+        </if>
+        <if test="businessKeys != null">
+            and id in
+            <foreach collection="businessKeys" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
+        ORDER BY create_time DESC
+    </select>
+</mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourcerInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourcerInfoMapper.xml
index 510a80b..3049b54 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourcerInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourcerInfoMapper.xml
@@ -7,6 +7,8 @@
         <id column="id" property="id" />
         <result column="outsourcer_no" property="outsourcerNo" />
         <result column="outsourcer_name" property="outsourcerName" />
+        <result column="lab_code" property="labCode" />
+        <result column="group_code" property="groupCode" />
         <result column="outsourcer_brief_name" property="outsourcerBriefName" />
         <result column="outsourcer_size" property="outsourcerSize" />
         <result column="business_size" property="businessSize" />
@@ -55,32 +57,32 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, outsourcer_no, outsourcer_name, outsourcer_brief_name, outsourcer_size, business_size, grade, evaluation, tax_number, bank_account, bank_name, bank_account_number, postal_code, director, phone, fax, mobile, email, website, address_country, address_province, address_city, address_area, full_address, address_country_name, address_province_name, address_city_name, address_area_name, invoice_country, invoice_province, invoice_city, invoice_area, invoice_full_address, invoice_country_name, invoice_province_name, invoice_city_name, invoice_area_name, business_scope, business_content, minio_file_name, approval_status, process_id, remark, create_user_id, create_user_name, create_time, update_time
+        id, outsourcer_no, outsourcer_name, lab_code, group_code, outsourcer_brief_name, outsourcer_size, business_size, grade, evaluation, tax_number, bank_account, bank_name, bank_account_number, postal_code, director, phone, fax, mobile, email, website, address_country, address_province, address_city, address_area, full_address, address_country_name, address_province_name, address_city_name, address_area_name, invoice_country, invoice_province, invoice_city, invoice_area, invoice_full_address, invoice_country_name, invoice_province_name, invoice_city_name, invoice_area_name, business_scope, business_content, minio_file_name, approval_status, process_id, remark, create_user_id, create_user_name, create_time, update_time
     </sql>
 
     <select id="selectBatchForApprovalList" resultMap="BaseResultMap">
         SELECT *
         FROM biz_business_outsourcer_info
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.outsourcerNo != null and request.outsourcerNo !=''">
+        <if test="request != null and request.outsourcerNo != null and request.outsourcerNo !=''">
             and outsourcer_no like concat('%',#{request.outsourcerNo},'%')
         </if>
-        <if test="request.outsourcerName != null and request.outsourcerName !=''">
+        <if test="request != null and request.outsourcerName != null and request.outsourcerName !=''">
             and outsourcer_name like concat('%',#{request.outsourcerName},'%')
         </if>
-        <if test="request.director != null and request.director !=''">
+        <if test="request != null and request.director != null and request.director !=''">
             and director like concat('%',#{request.director},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
@@ -93,6 +95,6 @@
     </select>
 
     <select id="selectMaxNo" resultType="java.lang.Long">
-        SELECT IFNULL(max(RIGHT(outsourcer_no, 12)), 0) from biz_business_outsourcer_info
+        SELECT IFNULL(max(RIGHT(outsourcer_no, 3)), 0) from biz_business_outsourcer_info
     </select>
 </mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessSiteExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessSiteExecutiveInfoMapper.xml
index 135c5d0..3c5ae79 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessSiteExecutiveInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessSiteExecutiveInfoMapper.xml
@@ -38,25 +38,25 @@
         FROM biz_business_site_executive_info bsei
         LEFT JOIN biz_resource_customer_info rci ON bsei.customer_id = rci.id
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and bsei.approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and bsei.create_user_id = #{request.createUserId}
         </if>
-        <if test="request.siteExecutiveNo != null and request.siteExecutiveNo !=''">
+        <if test="request != null and request.siteExecutiveNo != null and request.siteExecutiveNo !=''">
             and bsei.site_executive_no like concat('%',#{request.siteExecutiveNo},'%')
         </if>
-        <if test="request.customerName != null and request.customerName !=''">
+        <if test="request != null and request.customerName != null and request.customerName !=''">
             and rci.outsourcer_name like concat('%',#{request.customerName},'%')
         </if>
-        <if test="request.applyName != null and request.applyName !=''">
+        <if test="request != null and request.applyName != null and request.applyName !=''">
             and bsei.apply_name like concat('%',#{request.applyName},'%')
         </if>
-        <if test="request.applyTimeStart != null and request.applyTimeStart !=''">
+        <if test="request != null and request.applyTimeStart != null and request.applyTimeStart !=''">
             and bsei.apply_time &gt;= #{request.applyTimeStart}
         </if>
-        <if test="request.applyTimeEnd != null and request.applyTimeEnd !=''">
+        <if test="request != null and request.applyTimeEnd != null and request.applyTimeEnd !=''">
             and bsei.apply_time &lt;= #{request.applyTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml
index 84d9e2a..6bd38a9 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml
@@ -105,6 +105,12 @@
         <if test="request.isUrgent != null and request.isUrgent !=''">
             AND bo.is_urgent = #{request.isUrgent}
         </if>
+        <if test="request.ids != null">
+            and blei.id in
+            <foreach collection="request.ids" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
         ORDER BY blei.update_time DESC
     </select>
 
@@ -137,6 +143,12 @@
         <if test="request.isUrgent != null and request.isUrgent !=''">
             AND bo.is_urgent = #{request.isUrgent}
         </if>
+        <if test="request.ids != null">
+            and blei.id in
+            <foreach collection="request.ids" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
         ORDER BY blei.update_time DESC
     </select>
 
diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardInfoMapper.xml
index 1a5551b..2ed8d17 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardInfoMapper.xml
@@ -45,12 +45,6 @@
         FROM biz_equipment_standard_info besi
         LEFT JOIN biz_equipment_standard_technology_relation bestr ON besi.standard_no = bestr.standard_no
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
-            and besi.approval_status = #{request.approvalStatus}
-        </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
-            and besi.create_user_id = #{request.createUserId}
-        </if>
         <if test="request.standardName != null and request.standardName !=''">
             and besi.standard_name like concat('%',#{request.standardName},'%')
         </if>

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java
index bb0c50f..13a699b 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java
@@ -12,6 +12,7 @@
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.IGeneralApprovalService;
+import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
@@ -19,6 +20,7 @@
 import org.springframework.web.bind.annotation.RequestBody;
 
 import javax.validation.Valid;
+import java.util.List;
 import java.util.Objects;
 
 /**
@@ -117,4 +119,17 @@
         }
         return baseApprovalService.failUpdate(request);
     }
+
+    public List<O> exportList(@RequestBody @Valid R request) throws Exception {
+        List<O> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = baseApprovalService.listExportByIds(request.getIds());
+        } else {
+            list = baseApprovalService.listExport(request);
+        }
+        for (O record : list) {
+            DictCodeUtils.convertDictCodeToName(record);
+        }
+        return list;
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java
index 8a90961..d775831 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java
@@ -5,6 +5,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.business.certificate.CertificateChangeApplyApprovalListRequest;
 import com.casic.missiles.dto.business.certificate.CertificateChangeApplySaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessCertificateChangeApply;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
@@ -20,6 +21,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -48,4 +50,12 @@
         }
         return changeApplyService.saveChangeApply(request);
     }
+
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody CertificateChangeApplyApprovalListRequest request) throws Exception {
+        List<BizBusinessCertificateChangeApply> list = super.exportList(request);
+        super.exportExcel(BizBusinessCertificateChangeApply.class, list, ExportEnum.CERTIFICATE_CHANGE_APPLY.getSheetName());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java
index 5fc4b07..af8230e 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java
@@ -9,6 +9,7 @@
 import com.casic.missiles.dto.business.certificate.CertificatePrintApprovalListRequest;
 import com.casic.missiles.dto.business.certificate.CertificatePrintListResponse;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.enums.business.CertificatePrintStatusEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessCertificatePrintLog;
@@ -18,10 +19,16 @@
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.io.IOException;
+import java.util.List;
 import java.util.Objects;
 
 /**
@@ -98,4 +105,16 @@
         });
         return certificatePrintService.certificatePrintLog(idDTO.getId());
     }
+
+    @ApiOperation("证书打印审批导出")
+    @PostMapping("/listExport")
+    public void exportList(@RequestBody CertificatePrintApprovalListRequest request) throws IOException {
+        List<CertificatePrintListResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = certificatePrintService.listByIds(request.getIds());
+        } else {
+            list = certificatePrintService.list(request);
+        }
+        super.exportExcel(CertificatePrintListResponse.class, list, ExportEnum.CERTIFICATE_PRINT.getSheetName());
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java
index 63b06dc..6b2efd5 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java
@@ -6,6 +6,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.business.certificate.CertificateReportApprovalListRequest;
 import com.casic.missiles.dto.business.certificate.CertificateReportSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessCertificateReport;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
@@ -21,6 +22,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -50,7 +52,7 @@
         return certificateReportService.saveCertificateReport(request);
     }
 
-    @ApiOperation("证书审批详情（基本信息）")
+    @ApiOperation("详情（基本信息）")
     @PostMapping("/detail")
     public ReturnDTO<BizBusinessCertificateReport> detail(@RequestBody @Valid BaseDetailRequest request, BindingResult bindingResult) throws Exception {
         if(bindingResult.hasErrors()){
@@ -59,4 +61,11 @@
         return certificateReportService.detail(request);
     }
 
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody CertificateReportApprovalListRequest request) throws Exception {
+        List<BizBusinessCertificateReport> list = super.exportList(request);
+        super.exportExcel(BizBusinessCertificateReport.class, list, ExportEnum.CERTIFICATE_REPORT.getSheetName());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java
index 46b26bd..57c0809 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java
@@ -10,20 +10,21 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.business.identify.IdentifyListRequest;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessIdentifyInfo;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.business.IBizBusinessIdentifyInfoService;
+import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import javax.validation.Valid;
+import java.util.List;
 import java.util.Objects;
 
 /**
@@ -57,16 +58,13 @@
         return identifyInfoService.addIdentify(identifyInfo);
     }
 
-    @ApiOperation("标识打印更新")
+    @ApiOperation("标识打印更新（更新打印时间）")
     @PostMapping("/update")
-    public ReturnDTO updateIdentify(@RequestBody @Valid BizBusinessIdentifyInfo identifyInfo, BindingResult bindingResult) {
-        Assert.isFalse(Objects.isNull(identifyInfo.getId()), () -> {
+    public ReturnDTO updateIdentify(@RequestBody @Valid IdDTO idDTO) {
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        Assert.isFalse(bindingResult.hasErrors(), () -> {
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        });
-        return identifyInfoService.updateIdentify(identifyInfo);
+        return identifyInfoService.updateIdentify(idDTO.getId());
     }
 
     @ApiOperation("标识打印删除")
@@ -77,4 +75,37 @@
         });
         return identifyInfoService.deleteIdentify(idDTO.getId());
     }
+
+    @ApiOperation("标识打印导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody @Valid IdentifyListRequest request, BindingResult bindingResult) throws Exception {
+        if (bindingResult.hasErrors()) {
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        List<BizBusinessIdentifyInfo> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = identifyInfoService.listByIds(request.getIds());
+        } else {
+            list = identifyInfoService.list(request);
+        }
+        for (BizBusinessIdentifyInfo record : list) {
+            DictCodeUtils.convertDictCodeToName(record);
+        }
+        super.exportExcel(BizBusinessIdentifyInfo.class, list, ExportEnum.IDENTIFY_EXPORT.getSheetName());
+    }
+
+
+    // TODO: 2023/8/23 查询设备信息，4个底部按钮查设备（按钮的作用就是前端用来调不同接口、用来区分中间即将展示的标识），前端弹窗选设备，在确定保存时前端根据底部按钮判断传入设备类型deviceType字典code
+    // TODO: 2023/8/23 接口：查受检设备（第1个按钮），查设备台账（后3个按钮同一接口），查询之后前端根据标志类型的不同加到中间页面时进行判断（按产品给的对应表）
+    // TODO: 2023/8/23 提供二维码接口，前端在加到中间页面时调用一下
+
+    @ApiOperation("设备二维码")
+    @PostMapping("/equipment/qrCode")
+    public ReturnDTO<String> equipmentQrCode(@RequestBody @Valid IdDTO idDTO) {
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return identifyInfoService.equipmentQrCode(idDTO.getId());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java
index 707be6e..7e0453d 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java
@@ -117,7 +117,7 @@
     }
 
     @ApiOperation("任务单导出")
-    @PostMapping("/export")
+    @PostMapping("/listExport")
     public void orderExport(@RequestBody @Valid OrderListRequest request, HttpServletResponse response) {
         businessOrderService.orderExport(request, response);
     }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java
index 529a6ce..51432be 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java
@@ -1,9 +1,28 @@
 package com.casic.missiles.controller.business;
 
+import com.casic.missiles.controller.GeneralApprovalController;
+import com.casic.missiles.dto.BaseApprovalSubmitRequest;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.business.outsource.OutsourceAssessApprovalListRequest;
+import com.casic.missiles.dto.business.outsource.OutsourceAssessSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
+import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.model.business.BizBusinessOutsourceAssess;
+import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
+import com.casic.missiles.service.IGeneralApprovalService;
+import com.casic.missiles.service.business.IBizBusinessOutsourceAssessService;
 import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.BindingResult;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.validation.Valid;
+import java.util.List;
+
 /**
  * <p>
  * 计量检定业务-分包管理-测试、校准或检定工作分包评审表 前端控制器
@@ -15,6 +34,27 @@
 @Api(tags = "分包管理-测试、校准或检定工作分包评审表")
 @RestController
 @RequestMapping("/business/outsource/assess")
-public class BizBusinessOutsourceAssessController {
+public class BizBusinessOutsourceAssessController extends GeneralApprovalController<BizBusinessOutsourceAssess, BizBusinessOutsourceAssess, OutsourceAssessApprovalListRequest, BaseApprovalSubmitRequest> {
+    @Autowired
+    private IBizBusinessOutsourceAssessService outsourceAssessService;
 
+    public BizBusinessOutsourceAssessController(IGeneralApprovalService<BizBusinessOutsourceAssess, BizBusinessOutsourceAssess, OutsourceAssessApprovalListRequest, BaseApprovalSubmitRequest> baseApprovalService) {
+        super(baseApprovalService);
+    }
+
+    @ApiOperation("草稿箱-保存")
+    @PostMapping("/save")
+    public ReturnDTO<OutsourceAssessSaveResponse> saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceAssess request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        return outsourceAssessService.saveOutsourceAssess(request);
+    }
+
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception {
+        List<BizBusinessOutsourceAssess> list = super.exportList(request);
+        super.exportExcel(BizBusinessOutsourceAssess.class, list, ExportEnum.OUTSOURCE_ASSESS.getSheetName());
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java
new file mode 100644
index 0000000..9adef18
--- /dev/null
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java
@@ -0,0 +1,60 @@
+package com.casic.missiles.controller.business;
+
+import com.casic.missiles.controller.GeneralApprovalController;
+import com.casic.missiles.dto.BaseApprovalSubmitRequest;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.business.outsource.OutsourceProtocolApprovalListRequest;
+import com.casic.missiles.dto.business.outsource.OutsourceProtocolSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
+import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.model.business.BizBusinessOutsourceProtocol;
+import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
+import com.casic.missiles.service.IGeneralApprovalService;
+import com.casic.missiles.service.business.IBizBusinessOutsourceProtocolService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.BindingResult;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.validation.Valid;
+import java.util.List;
+
+/**
+ * <p>
+ * 计量检定业务-分包管理-测试、校准或检定工作分包协议书 前端控制器
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-08-24
+ */
+@Api(tags = "分包管理-测试、校准或检定工作分包协议书")
+@RestController
+@RequestMapping("/business/outsource/protocol")
+public class BizBusinessOutsourceProtocolController extends GeneralApprovalController<BizBusinessOutsourceProtocol, BizBusinessOutsourceProtocol, OutsourceProtocolApprovalListRequest, BaseApprovalSubmitRequest> {
+    @Autowired
+    private IBizBusinessOutsourceProtocolService outsourceProtocolService;
+
+    public BizBusinessOutsourceProtocolController(IGeneralApprovalService<BizBusinessOutsourceProtocol, BizBusinessOutsourceProtocol, OutsourceProtocolApprovalListRequest, BaseApprovalSubmitRequest> baseApprovalService) {
+        super(baseApprovalService);
+    }
+
+    @ApiOperation("草稿箱-保存")
+    @PostMapping("/save")
+    public ReturnDTO<OutsourceProtocolSaveResponse> saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceProtocol request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        return outsourceProtocolService.saveOutsourceProtocol(request);
+    }
+
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody OutsourceProtocolApprovalListRequest request) throws Exception {
+        List<BizBusinessOutsourceProtocol> list = super.exportList(request);
+        super.exportExcel(BizBusinessOutsourceProtocol.class, list, ExportEnum.OUTSOURCE_PROTOCOL.getSheetName());
+    }
+}
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java
index 097f645..f0f0943 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java
@@ -17,7 +17,6 @@
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.IGeneralApprovalService;
 import com.casic.missiles.service.business.IBizBusinessOutsourcerInfoService;
-import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -71,19 +70,8 @@
 
     @ApiOperation("分包方导出")
     @PostMapping("/listExport")
-    public void export(@RequestBody @Valid OutsourcerInfoApprovalListRequest request, BindingResult bindingResult) throws Exception {
-        if (bindingResult.hasErrors()) {
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        }
-        List<BizBusinessOutsourcerInfo> list;
-        if (!CollectionUtils.isEmpty(request.getIds())) {
-            list = outsourcerInfoService.listByIds(request.getIds());
-        } else {
-            list = outsourcerInfoService.list(request);
-        }
-        for (BizBusinessOutsourcerInfo record : list) {
-            DictCodeUtils.convertDictCodeToName(record);
-        }
+    public void export(@RequestBody OutsourcerInfoApprovalListRequest request) throws Exception {
+        List<BizBusinessOutsourcerInfo> list = super.exportList(request);
         super.exportExcel(BizBusinessOutsourcerInfo.class, list, ExportEnum.OUTSOURCER_EXPORT.getSheetName());
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java
index c2cbf9f..0410918 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java
@@ -17,11 +17,9 @@
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.IGeneralApprovalService;
 import com.casic.missiles.service.business.IBizBusinessSiteExecutiveInfoService;
-import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -60,7 +58,7 @@
         return siteExecutiveInfoService.saveSiteExecutiveInfo(siteExecutiveInfo);
     }
 
-    @ApiOperation("现场检测详情")
+    @ApiOperation("详情")
     @PostMapping("/detail")
     public ReturnDTO<SiteExecutiveDetailResponse> siteExecutiveDetail(@RequestBody @Valid IdDTO idDTO) throws Exception {
         Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
@@ -69,21 +67,10 @@
         return ReturnUtil.success(siteExecutiveInfoService.detail(idDTO.getId()));
     }
 
-    @ApiOperation("现场检测导出")
+    @ApiOperation("导出")
     @PostMapping("/listExport")
-    public void export(@RequestBody @Valid SiteExecutiveApprovalListRequest request, BindingResult bindingResult) throws Exception {
-        if (bindingResult.hasErrors()) {
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        }
-        List<SiteExecutiveApprovalListResponse> list;
-        if (!CollectionUtils.isEmpty(request.getIds())) {
-            list = siteExecutiveInfoService.listInfoByIds(request.getIds());
-        } else {
-            list = siteExecutiveInfoService.listInfo(request);
-        }
-        for (SiteExecutiveApprovalListResponse record : list) {
-            DictCodeUtils.convertDictCodeToName(record);
-        }
+    public void export(@RequestBody SiteExecutiveApprovalListRequest request) throws Exception {
+        List<SiteExecutiveApprovalListResponse> list = super.exportList(request);
         super.exportExcel(SiteExecutiveApprovalListResponse.class, list, ExportEnum.SITE_EXECUTIVE_EXPORT.getSheetName());
     }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
index 7e793cd..a92e209 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
@@ -55,7 +55,7 @@
 
     @ApiOperation("设备收发列表导出")
     @PostMapping("/export")
-    public void exportList(@RequestBody @Valid SampleDispatchListRequest request) throws IOException {
+    public void exportList(@RequestBody SampleDispatchListRequest request) throws IOException {
         List<SampleDispatchListResponse> list;
         if (!CollectionUtils.isEmpty(request.getIds())) {
             list = dispatchService.listByIds(request.getIds());
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java
index cdc77fc..d120fd4 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java
@@ -7,6 +7,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.business.labExecutive.*;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.business.IBusinessLabExecutiveInfoService;
@@ -14,6 +15,7 @@
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.*;
 
@@ -32,7 +34,7 @@
     @Autowired
     private IBusinessLabExecutiveInfoService labExecutiveInfoService;
 
-    @ApiOperation("实验室检测-部门检测-查询各状态列表（待检测、检测中、检测完）")
+    @ApiOperation("实验室任务-查询各状态列表（待检测、检测中、检测完）")
     @PostMapping("/deptExecutive/List")
     public ReturnDTO<PageInfoBT<SampleLabExecutiveListResponse>> queryDeptExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
@@ -43,10 +45,19 @@
         return ReturnUtil.success(super.packForBT(labExecutiveInfoService.deptLabExecutiveListPage(page, labExecutiveListRequest)));
     }
 
-    /**
-     * 实验室检测-我的检测-查询各状态列表（待检测、检测中、检测完）
-     */
-    @ApiOperation("实验室检测-我的检测-查询各状态列表（待检测、检测中、检测完）")
+    @ApiOperation("实验室任务导出")
+    @PostMapping("/deptExecutive/export")
+    public void deptExportList(@RequestBody @Valid SampleLabExecutiveListRequest request) throws Exception {
+        List<SampleLabExecutiveListResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = labExecutiveInfoService.deptLabExecutiveListByIds(request.getMeasureStatus(), request.getIds());
+        } else {
+            list = labExecutiveInfoService.deptLabExecutiveList(request);
+        }
+        super.exportExcel(SampleLabExecutiveListResponse.class, list, ExportEnum.DEPT_EXECUTIVE_TASK.getSheetName());
+    }
+
+    @ApiOperation("我的任务-查询各状态列表（待检测、检测中、检测完）")
     @PostMapping("/myExecutive/list")
     public ReturnDTO<PageInfoBT<SampleLabExecutiveListResponse>> queryMyExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
@@ -57,19 +68,25 @@
         return ReturnUtil.success(super.packForBT(labExecutiveInfoService.myLabExecutiveListPage(page, labExecutiveListRequest)));
     }
 
-    /**
-     * 实验室检测-我的检测-查询各状态样品数量（待检测、检测中、检测完）
-     */
-    @ApiOperation("实验室检测-我的检测-查询各状态样品数量（待检测、检测中、检测完）")
+    @ApiOperation("我的任务导出")
+    @PostMapping("/myExecutive/export")
+    public void exportList(@RequestBody @Valid SampleLabExecutiveListRequest request) throws Exception {
+        List<SampleLabExecutiveListResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = labExecutiveInfoService.myLabExecutiveListByIds(request.getMeasureStatus(), request.getIds());
+        } else {
+            list = labExecutiveInfoService.myLabExecutiveList(request);
+        }
+        super.exportExcel(SampleLabExecutiveListResponse.class, list, ExportEnum.MY_EXECUTIVE_TASK.getSheetName());
+    }
+
+    @ApiOperation("我的任务-查询各状态样品数量（待检测、检测中、检测完）")
     @GetMapping("/myExecutive/amount")
     public ReturnDTO<List<SampleAmountResponse>> queryMyExecutiveAmount() {
         return ReturnUtil.success(labExecutiveInfoService.myExecutiveAmount());
     }
 
-    /**
-     * 实验室检测-部门检测-分配（分配给具体人员）
-     */
-    @ApiOperation("实验室检测-部门检测-分配按钮（分配给具体人员）")
+    @ApiOperation("实验室任务-分配按钮（分配给具体人员）")
     @PostMapping("/deptExecutive/allocate")
     public ReturnDTO allocateStaff(@RequestBody @Valid SampleAllocateRequest sampleAllocateRequest, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -78,10 +95,7 @@
         return labExecutiveInfoService.allocateStaff(sampleAllocateRequest);
     }
 
-    /**
-     * 实验室检测-我的检测-检定人扫描收入（待检测->检测中）
-     */
-    @ApiOperation("实验室检测-我的检测-检定人扫描收入（待检测->检测中）")
+    @ApiOperation("我的任务-检定人扫描收入（待检测->检测中）")
     @PostMapping("/myExecutive/receive")
     public ReturnDTO sampleReceive(@RequestBody @Valid List<SampleOperateRequest> requestList, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -90,10 +104,7 @@
         return labExecutiveInfoService.sampleReceive(requestList);
     }
 
-    /**
-     * 实验室检测-负责人/检定人扫描检完（检测中->检测完）
-     */
-    @ApiOperation("实验室检测-负责人/检定人扫描检完（检测中->检测完）")
+    @ApiOperation("实验室任务-负责人/检定人扫描检完（检测中->检测完）")
     @PostMapping("/myExecutive/complete")
     public ReturnDTO sampleExecutiveComplete(@RequestBody @Valid List<SampleOperateRequest> requestList, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -102,10 +113,7 @@
         return labExecutiveInfoService.sampleExecutiveComplete(requestList);
     }
 
-    /**
-     * 实验室检测-部门检测/我的检测 编辑（只能修改应出具证书）
-     */
-    @ApiOperation("实验室检测-部门检测/我的检测 编辑（只能修改应出具证书）")
+    @ApiOperation("实验室任务/我的任务 编辑（只能修改应出具证书）")
     @PostMapping("/executive/update")
     public ReturnDTO updateExecutive(@RequestBody @Valid UpdateExecutiveRequest request, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -114,10 +122,7 @@
         return labExecutiveInfoService.updateExecutive(request);
     }
 
-    /**
-     * 实验室检测-部门检测/我的检测 详情
-     */
-    @ApiOperation("实验室检测-部门检测/我的检测 详情")
+    @ApiOperation("实验室任务/我的任务 详情")
     @PostMapping("/executive/detail")
     public ReturnDTO<ExecutiveDetailResponse> executiveDetail(@RequestBody @Valid ExecutiveDetailRequest request, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
@@ -131,7 +136,7 @@
      * 退回后会将下一个要执行的实验室检测状态更新为待分配，将后面的实验室顺序变更为连续（都进行减1）
      * 最后一个检测的实验室退回，等分发员再增加实验室或设备收发中的已收入直接手动点击完成
      */
-    @ApiOperation("实验室检测-部门检测/我的检测 退回（待检测/检测中->退回）")
+    @ApiOperation("实验室任务/我的任务 退回（待检测/检测中->退回）")
     @PostMapping("/executive/sendBack")
     public ReturnDTO executiveSendBack(@RequestBody @Valid ExecutiveSendBackRequest request, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -140,9 +145,6 @@
         return labExecutiveInfoService.sampleExecutiveSendBack(request);
     }
 
-    /**
-     * 分发员编辑实验室检测列表
-     */
     @ApiOperation("分发员编辑实验室检测列表")
     @PostMapping("/handOut/updateList")
     public ReturnDTO updateExecutiveList(@RequestBody @Valid UpdateExecutiveListRequest request, BindingResult bindingResult) {
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java
index 48a67ed..0c04f31 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java
@@ -10,6 +10,7 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.resource.customer.CustomerApprovalListRequest;
 import com.casic.missiles.dto.resource.customer.CustomerSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceCustomerInfo;
@@ -26,6 +27,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -55,6 +57,13 @@
         return customerInfoService.saveCustomerInfo(request);
     }
 
+    @ApiOperation("委托方名录导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody CustomerApprovalListRequest request) throws Exception {
+        List<BizResourceCustomerInfo> list = super.exportList(request);
+        super.exportExcel(BizResourceCustomerInfo.class, list, ExportEnum.CUSTOMER_INFO.getSheetName());
+    }
+
     @ApiOperation("委托方人员列表（分页）")
     @PostMapping("/person/listPage")
     public ReturnDTO<PageInfoBT<BizResourceCustomerStaff>> personListPage(@RequestBody IdDTO idDto) {
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
index 972ed4b..6418ea5 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
@@ -5,6 +5,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.resource.customer.SuggestFormApprovalListRequest;
 import com.casic.missiles.dto.resource.customer.SuggestFormSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceCustomerSuggestForm;
@@ -20,6 +21,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -50,4 +52,11 @@
         return suggestFormService.saveSuggestForm(request);
     }
 
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody SuggestFormApprovalListRequest request) throws Exception {
+        List<BizResourceCustomerSuggestForm> list = super.exportList(request);
+        super.exportExcel(BizResourceCustomerSuggestForm.class, list, ExportEnum.CUSTOMER_SUGGEST_FORM.getSheetName());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java
index 1934d1a..9e07eab 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java
@@ -15,12 +15,16 @@
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.resource.IEnvEnvironmentRecordConfigService;
 import com.casic.missiles.service.resource.IEnvEnvironmentRecordDataService;
+import com.casic.missiles.service.resource.IEnvLocationInfoService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
 import java.util.List;
@@ -39,6 +43,8 @@
     private IEnvEnvironmentRecordDataService environmentRecordDataService;
     @Autowired
     private IEnvEnvironmentRecordConfigService environmentRecordConfigService;
+    @Autowired
+    private IEnvLocationInfoService locationInfoService;
 
     @ApiOperation("环境记录单数据列表/详情")
     @PostMapping("/data/listPage")
@@ -95,4 +101,11 @@
         });
         return environmentRecordConfigService.deleteEnvironmentRecordConfig(idDTO.getId());
     }
+
+    @ApiOperation("地点列表")
+    @PostMapping("/location/listPage")
+    public ReturnDTO<PageInfoBT<LocationListResponse>> locationListPage(@RequestBody @Valid LocationListRequest request) {
+        Page<LocationListResponse> page = PageFactory.defaultPage();
+        return ReturnUtil.success(super.packForBT(locationInfoService.listPage(page, request)));
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java
index 82efe3f..e9561fa 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java
@@ -10,6 +10,7 @@
 import com.casic.missiles.dto.resource.seal.SealLogListRequest;
 import com.casic.missiles.dto.resource.seal.SealNoteApprovalListRequest;
 import com.casic.missiles.dto.resource.seal.SealNoteSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceSealUseLog;
@@ -27,6 +28,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -58,6 +60,13 @@
         return sealUseNoteService.saveSeal(request);
     }
 
+    @ApiOperation("印章使用登记导出（列表和导出中去掉经办人和监印人）")
+    @PostMapping("/listExport")
+    public void export(@RequestBody SealNoteApprovalListRequest request) throws Exception {
+        List<BizResourceSealUseNote> list = super.exportList(request);
+        super.exportExcel(BizResourceSealUseNote.class, list, ExportEnum.SEAL_NOTE.getSheetName());
+    }
+
     // TODO: 2023/7/28 印章使用日志：系统中使用印章时插入数据库
 
     @ApiOperation("印章使用日志列表（分页）")
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java
index 9b674fc..06b6521 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java
@@ -9,16 +9,20 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.resource.staff.StaffCertRequest;
 import com.casic.missiles.dto.resource.staff.StaffCertResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.service.resource.IBizResourceStaffInfoService;
 import com.casic.missiles.service.resource.IBizResourceStaffVerifierService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.List;
+
 /**
  * @Description:
  * @Author: wangpeng
@@ -41,9 +45,21 @@
         return ReturnUtil.success(super.packForBT(responsePage));
     }
 
+    @ApiOperation("证书逾期提醒导出")
+    @PostMapping("/listExport")
+    public void exportList(@RequestBody StaffCertRequest request) throws Exception {
+        List<StaffCertResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = staffInfoService.certListByIds(request.getIds());
+        } else {
+            list = staffInfoService.certList(request);
+        }
+        super.exportExcel(StaffCertResponse.class, list, ExportEnum.STAFF_CERTIFICATE_EXPIRE.getSheetName());
+    }
+
     @ApiOperation("证书逾期提醒")
     @PostMapping("/expirationReminder")
-    public ReturnDTO expirationReminder(@RequestBody IdDTO idDto) {
-        return verifierService.expirationReminder(idDto);
+    public ReturnDTO expirationReminder(@RequestBody IdDTO idDTO) {
+        return verifierService.expirationReminder(idDTO);
     }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java
index 3b251ad..a6e7850 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java
@@ -12,6 +12,7 @@
 import com.casic.missiles.dto.resource.staff.StaffListRequest;
 import com.casic.missiles.dto.resource.staff.TrainListRequest;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.*;
@@ -22,7 +23,10 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
 import java.util.List;
@@ -52,8 +56,19 @@
             throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
         }
         Page<BizResourceStaffInfo> page = PageFactory.defaultPage();
-        Page<BizResourceStaffInfo> responsePage = staffInfoService.listPage(page, request);
-        return ReturnUtil.success(super.packForBT(responsePage));
+        return ReturnUtil.success(super.packForBT(staffInfoService.listPage(page, request)));
+    }
+
+    @ApiOperation("人员登记导出")
+    @PostMapping("/listExport")
+    public void exportList(@RequestBody StaffListRequest request) throws Exception {
+        List<BizResourceStaffInfo> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = staffInfoService.listByIds(request.getIds());
+        } else {
+            list = staffInfoService.list(request);
+        }
+        super.exportExcel(BizResourceStaffInfo.class, list, ExportEnum.STAFF_INFO.getSheetName());
     }
 
     @ApiOperation("人员登记详情基础信息")
@@ -85,9 +100,9 @@
 
     @ApiOperation("科研教育列表（分页）")
     @PostMapping("/education/listPage")
-    public ReturnDTO<PageInfoBT<BizResourceStaffEducation>> educationListPage(@RequestBody IdDTO idDto) {
+    public ReturnDTO<PageInfoBT<BizResourceStaffEducation>> educationListPage(@RequestBody IdDTO idDTO) {
         Page<BizResourceStaffEducation> page = PageFactory.defaultPage();
-        Page<BizResourceStaffEducation> responsePage = staffInfoService.educationListPage(page, idDto);
+        Page<BizResourceStaffEducation> responsePage = staffInfoService.educationListPage(page, idDTO);
         return ReturnUtil.success(super.packForBT(responsePage));
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java
index af6aa86..d85d84a 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java
@@ -9,6 +9,7 @@
 import com.casic.missiles.dto.resource.outsideService.SupplierApprovalListRequest;
 import com.casic.missiles.dto.resource.outsideService.SupplierSaveResponse;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceSupplierAbility;
@@ -67,6 +68,13 @@
         return ReturnUtil.success(supplierInfoService.detail(idDTO.getId()));
     }
 
+    @ApiOperation("合格供方导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody SupplierApprovalListRequest request) throws Exception {
+        List<BizResourceSupplierInfo> list = super.exportList(request);
+        super.exportExcel(BizResourceSupplierInfo.class, list, ExportEnum.SUPPLIER_INFO.getSheetName());
+    }
+
     @ApiOperation("供方人员列表（分页）")
     @PostMapping("/person/listPage")
     public ReturnDTO<PageInfoBT<BizResourceSupplierPerson>> personListPage(@RequestBody IdDTO idDTO) {
diff --git a/casic-metering-api/src/main/resources/config/application.yml b/casic-metering-api/src/main/resources/config/application.yml
index 350db5f..ecff521 100644
--- a/casic-metering-api/src/main/resources/config/application.yml
+++ b/casic-metering-api/src/main/resources/config/application.yml
@@ -126,7 +126,7 @@
     #作者
     author: wangpeng
     #待生成对象表名
-    table-name: biz_equipment_technical_target_approval,biz_equipment_attachment_approval,biz_equipment_checkpoint_approval
+    table-name: biz_business_outsource_protocol
 
 reminder:
   #节点--common模块config包 ReminderNodeConfig配置
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
index 4a19e4e..d47d552 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
@@ -53,6 +53,7 @@
     SUGGEST_FORM_SAVE_FAILED(2509, "委托方意见登记表保存至草稿箱失败"),
     EXAMINE_FORM_SAVE_FAILED(2510, "要求、委托书及合同评审表保存至草稿箱失败"),
     CUSTOMER_EXIST_SAVE_FAILED(2511, "该委托方已存在，请重新选择"),
+    DUPLICATE_LOCATION_NO(2512, "地点编号已存在"),
 
     /**
      * 计量检定业务模块
@@ -68,6 +69,8 @@
     COMPLETE_SAMPLE_NOT_EXIST(2609, "检测中不存在扫描收入的样品"),
     CANNOT_CHANGE_MEASURE_INFO(2610, "无法更改非当前登录用户的检测信息"),
     NON_EXIST_ORDER_OR_SAMPLE(2611, "不存在该委托单或该委托单下的样品"),
+    OUTSOURCE_ACCESS_SAVE_FAILED(2612, "测试、校准或检定工作分包评审表保存至草稿箱失败"),
+    OUTSOURCE_PROTOCOL_SAVE_FAILED(2613, "测试、校准或检定工作分包协议书保存至草稿箱失败"),
 
     /**
      * 历史遗留备用
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
index 5089ad1..81a406b 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
@@ -10,54 +10,38 @@
     /**
      * 资源管理
      */
-    ENVIRONMENT_DATA_EXPORT("environmentData", "environmentData", "环境记录单数据"),
+    ENVIRONMENT_DATA_EXPORT("environmentData", "环境记录单数据", "环境记录单数据"),
+    STAFF_INFO("staffInfo", "人员登记", "人员登记"),
+    STAFF_CERTIFICATE_EXPIRE("certificateExpire", "证书逾期提醒", "证书逾期提醒"),
+    SUPPLIER_INFO("supplierInfo", "合格供方名录", "合格供方名录"),
+    CUSTOMER_INFO("customerInfo", "委托方名录", "委托方名录"),
+    CUSTOMER_SUGGEST_FORM("customerSuggestForm", "委托方意见登记表", "委托方意见登记表"),
+    SEAL_NOTE("sealNote", "印章使用登记", "印章使用登记"),
 
-    FILE_EXPORT("meterFileData", "meterFileData", "计量文件信息"),
-    TRAIN_PLAN_EXPORT("trainPlanData", "trainPlanData", "培训计划"),
-    TRAIN_LOG_EXPORT("trainLogData", "trainLogData", "培训记录"),
-    METER_ORGANIZE_EXPORT("meterOrganizeData", "meterOrganizeData", "计量组织"),
-    TRACE_SUPPLIER_EXPORT("traceSupplierData", "traceSupplierData", "溯源供方"),
-    SIGN_EXPORT("signData", "signData", "签名/签章"),
-    TEMPLATE_EXPORT("templateData", "templateData", "原始记录模板/证书报告模板"),
-    FIXED_ASSETS("meterFixedAssets", "meterFixedAssets", "固定资产"),
-    METER_EQUIPMENT("meterEquipment", "meterEquipment", "测量设备"),
-    CALIBRATION_TEST_EQUIPMENT("calibrationTestEquipment", "calibrationTestEquipment", "校准检定设备"),
-    MEASURE_ACCOUNT("measureAccount", "measureAccount", "测量工装"),
-    STANDARD_SUPPORT_EQUIPMENT("standardSupportEquipment", "standardSupportEquipment", "标准配套设备"),
-    STANDARD_EQUIPMENT("standardEquipment", "standardEquipment", "标准装置"),
-    FLOW_DEF_EXPORT("flowDefData", "flowDefData", "流程定义"),
-    STAFF_CERTIFICATE("certificate", "certificate", "计量人员证书"),
-    CHECK_INFO("checkInfo", "checkInfo", "设备管理点检测"),
-    EQUIPMENT_APPLY("equipmentApply", "equipmentApply", "设备借用"),
-    STANDARD_EQUIPMENT_REMIND("equipmentApplyRemind", "equipmentApplyRemind", "标准装置到期提醒"),
-    METER_PRICE("meterPrice", "meterPrice", "价格库"),
-    METER_STAFF("meterStaff", "meterStaff", "计量人员"),
-    STANDARD_EQUIPMENT_APPLY("standardEquipmentApply", "standardEquipmentApply", "标准装置申请"),
-    STATE_MANAGE_APPLY("stateManage", "stateManage", "状态管理"),
-    METER_ACCEPTANCE_CHECK("acceptanceCheck", "acceptanceCheck", "设备检修保养验收单"),
-    CUSTOMER_EXPORT("customerData", "customerData", "客户信息"),
-    ORDER_EXPORT("orderData", "orderData", "委托书信息"),
-    SAMPLE_EXPORT("sampleData", "sampleData", "样本信息"),
-    EXCHANGE_DATA("exchangeData", "exchangeData", "设备交接单"),
-    DISPATCH_DATA("dispatchData", "dispatchData", "设备收发"),
-    ENVIRONMENT_DATA("environmentData", "environmentData", "环境记录单"),
-    ORIGIN_DATA("originData", "originData", "原始记录"),
-    CERTIFICATE_REPORT("certificateReport", "certificateReport", "证书报告"),
-    ADVICE_EXPORT("adviceData", "adviceData", "客户反馈"),
-    HANDOUT_EXPORT("handoutData", "handoutData", "任务分发列表"),
-    OUTSOURCER_EXPORT("outsourcerData", "outsourcerData", "分包方"),
-    SITE_EXECUTIVE_EXPORT("siteExecutiveData", "siteExecutiveData", "现场测试、校准或检定"),
-    CERTIFICATE_PRINT_EXPORT("certificatePrintData", "certificatePrintData", "证书打印"),
-    DOWNLOAD_TEMPLATE("downloadTemplate", "downloadTemplate", "页面配置"),
-    OUTSOURCER_CERTIFICATE_EXPORT("outsourceCertificateData", "outsourceCertificateData", "分包证书"),
-    SETTLEMENT_INFO_EXPORT("settlementInfoData", "settlementInfoData", "业务结算"),
-    EQUIPMENT_REMIND("equipmentRemind", "equipmentRemind", "设备到期提醒"),
-    AGREEMENT_INFO_EXPORT("agreementInfoData", "agreementInfoData", "合同"),
-    WORK_STATISTICS_EXPORT("workStatisticsData", "workStatisticsData", "实时工作统计"),
-    DEPT_OUTPUT_EXPORT("deptOutputData", "deptOutputData", "部门产值分析"),
-    WORKLOAD_EXPORT("workloadData", "workloadData", "业务工作量分析"),
-    DEPT_COMPREHENSIVE_EXPORT("deptComprehensiveData", "deptComprehensiveData", "部门综合分析"),
-    ENVIRONMENTAL_RECORD("environmentalRecordData", "environmentalRecordData", "现场环境记录");
+    /**
+     * 计量检定业务
+     */
+    OUTSOURCER_EXPORT("outsourcerData", "分包方名录", "分包方名录"),
+    IDENTIFY_EXPORT("identifyData", "计量标识", "计量标识"),
+    ORDER_EXPORT("orderData", "任务单", "任务单"),
+    DISPATCH_DATA("dispatchData", "设备收发", "设备收发"),
+    HANDOUT_EXPORT("handoutData", "任务分发", "任务分发"),
+    SITE_EXECUTIVE_EXPORT("siteExecutiveData", "现场测试、校准或检定", "现场测试、校准或检定"),
+    CERTIFICATE_REPORT("certificateReport", "证书审批", "证书审批"),
+    CERTIFICATE_CHANGE_APPLY("certificateChangeApply", "证书报告补充或更换申请单", "证书报告补充或更换申请单"),
+    CERTIFICATE_PRINT("certificatePrintData", "证书打印审批", "证书打印审批"),
+    DEPT_EXECUTIVE_TASK("deptExecutiveTaskData", "实验室任务", "实验室任务"),
+    MY_EXECUTIVE_TASK("myExecutiveTaskData", "我的任务", "我的任务"),
+    OUTSOURCE_ASSESS("outsourceAssess", "测试、校准或检定工作分包评审表", "测试、校准或检定工作分包评审表"),
+    OUTSOURCE_PROTOCOL("outsourceProtocol", "测试、校准或检定工作分包协议书", "测试、校准或检定工作分包协议书"),
+
+    /**
+     * 系统管理
+     */
+    SIGN_EXPORT("signData", "签名", "签名"),
+    TEMPLATE_EXPORT("templateData", "文件模板", "文件模板"),
+    FLOW_DEF_EXPORT("flowDefData", "流程定义", "流程定义"),
+    DOWNLOAD_TEMPLATE("downloadTemplate", "流程定义", "页面配置");
 
     ExportEnum(String fileName, String sheetName, String description) {
         this.fileName = fileName;
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateRecordTypeCodeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateRecordTypeCodeEnum.java
index 31d913c..a963522 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateRecordTypeCodeEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateRecordTypeCodeEnum.java
@@ -46,4 +46,14 @@
     String SITE_EXECUTIVE_APPROVAL = "01";
     //《现场测试、校准或检定工作记录表》
     String SITE_EXECUTIVE_LOG = "02";
+
+    //测试、校准或检定工作分包协议书
+    String OUTSOURCE_PROTOCOL = "01";
+    //测试、校准或检定工作分包评审表
+    String OUTSOURCE_ACCESS = "02";
+    //测试、校准或检定工作分包通知书
+    String OUTSOURCE_NOTICE = "03";
+    //测试、校准或检定工作分包方名录
+    String OUTSOURCE_INFO = "04";
+
 }
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
index 24b8635..f78bd53 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
@@ -15,6 +15,10 @@
     String CERTIFICATE_CHANGE_APPLY_BEAN_NAME = "certificateChangeApplyBean";
     //现场测试、校准或检定
     String SITE_EXECUTIVE_BEAN_NAME = "siteExecutiveBean";
+    //测试、校准或检定工作分包评审表
+    String OUTSOURCE_ASSESS_BEAN_NAME = "outsourceAssessBean";
+    //测试、校准或检定工作分包协议书
+    String OUTSOURCE_PROTOCOL_BEAN_NAME = "outsourceProtocolBean";
 
     /*********************************设备与装置************************************/
     //设备台账
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 b21c661..6b86fd1 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
@@ -18,6 +18,8 @@
     OUTSOURCER_APPROVAL(OUTSOURCER_BEAN_NAME, ""),
     CERTIFICATE_CHANGE_APPROVAL(CERTIFICATE_CHANGE_APPLY_BEAN_NAME, ""),
     SITE_EXECUTIVE_APPROVAL(SITE_EXECUTIVE_BEAN_NAME, ""),
+    OUTSOURCE_ASSESS_APPROVAL(OUTSOURCE_ASSESS_BEAN_NAME, ""),
+    OUTSOURCE_PROTOCOL_APPROVAL(OUTSOURCE_PROTOCOL_BEAN_NAME, ""),
 
     ACTION_STATUS_MAP(new HashMap<String, AwareActionStatusEnum>() {
         {
@@ -47,6 +49,10 @@
             put(ApplyFromIdEnum.CERTIFICATE_CHANGE_APPROVAL.getCode(), CERTIFICATE_CHANGE_APPROVAL);
             //现场测试、校准或检定审批
             put(ApplyFromIdEnum.SITE_EXECUTIVE_APPROVAL.getCode(), SITE_EXECUTIVE_APPROVAL);
+            //测试、校准或检定工作分包评审表
+            put(ApplyFromIdEnum.OUTSOURCE_ASSESS_APPROVAL.getCode(), OUTSOURCE_ASSESS_APPROVAL);
+            //测试、校准或检定工作分包协议书
+            put(ApplyFromIdEnum.OUTSOURCE_PROTOCOL_APPROVAL.getCode(), OUTSOURCE_PROTOCOL_APPROVAL);
         }
     });
     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 934405e..c7410bd 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
@@ -9,6 +9,8 @@
     CERTIFICATE_CHANGE_APPROVAL("jljdywzsbchghsqd", MessageSourceModuleEnum.BUSINESS.getCode(), "证书/报告补充或更换申请单"),
     OUTSOURCER_APPROVAL("jljdywcsjzhgfbfml", MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定合格分包方名录"),
     SITE_EXECUTIVE_APPROVAL("jljdywxccsjzsp", MessageSourceModuleEnum.BUSINESS.getCode(), "现场测试、校准或检定审批"),
+    OUTSOURCE_ASSESS_APPROVAL("jljdywcsjzfbpsb", MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包评审表"),
+    OUTSOURCE_PROTOCOL_APPROVAL("jljdywcsjzfbxys", MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包协议书"),
 
 
     /*******************************************设备与装置*********************************************/
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/GeneralApprovalMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/GeneralApprovalMapper.java
index 4fb7344..0c9d6ae 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/GeneralApprovalMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/GeneralApprovalMapper.java
@@ -17,8 +17,4 @@
 
     Page<O> selectBatchForApprovalList(Page<O> page, @Param("request") R request, @Param("businessKeys") List<String> businessKeys);
 
-//    Page<O> selectListPage(Page<O> page, @Param("request") R request);
-
-//    Long selectMaxNo();
-
 }
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceAssessMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceAssessMapper.java
index 7867bb8..ba59009 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceAssessMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceAssessMapper.java
@@ -1,7 +1,12 @@
 package com.casic.missiles.mapper.business;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.business.outsource.OutsourceAssessApprovalListRequest;
+import com.casic.missiles.mapper.GeneralApprovalMapper;
 import com.casic.missiles.model.business.BizBusinessOutsourceAssess;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * <p>
@@ -11,6 +16,10 @@
  * @author wangpeng
  * @since 2023-08-16
  */
-public interface BizBusinessOutsourceAssessMapper extends BaseMapper<BizBusinessOutsourceAssess> {
+public interface BizBusinessOutsourceAssessMapper extends GeneralApprovalMapper<BizBusinessOutsourceAssess, BizBusinessOutsourceAssess, OutsourceAssessApprovalListRequest> {
+
+    Page<BizBusinessOutsourceAssess> selectBatchForApprovalList(Page<BizBusinessOutsourceAssess> page, @Param("request") OutsourceAssessApprovalListRequest request, @Param("businessKeys") List<String> businessKeys);
+
+    Long selectMaxProjectNo();
 
 }
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceProtocolMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceProtocolMapper.java
new file mode 100644
index 0000000..e6aba35
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceProtocolMapper.java
@@ -0,0 +1,24 @@
+package com.casic.missiles.mapper.business;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.business.outsource.OutsourceProtocolApprovalListRequest;
+import com.casic.missiles.mapper.GeneralApprovalMapper;
+import com.casic.missiles.model.business.BizBusinessOutsourceProtocol;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 计量检定业务-分包管理-测试、校准或检定工作分包协议书 Mapper 接口
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-08-24
+ */
+public interface BizBusinessOutsourceProtocolMapper extends GeneralApprovalMapper<BizBusinessOutsourceProtocol, BizBusinessOutsourceProtocol, OutsourceProtocolApprovalListRequest> {
+
+    Page<BizBusinessOutsourceProtocol> selectBatchForApprovalList(Page<BizBusinessOutsourceProtocol> page, @Param("request") OutsourceProtocolApprovalListRequest request, @Param("businessKeys") List<String> businessKeys);
+
+    Long selectMaxProtocolNo();
+}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/EnvLocationInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/EnvLocationInfoMapper.java
new file mode 100644
index 0000000..49eff87
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/EnvLocationInfoMapper.java
@@ -0,0 +1,21 @@
+package com.casic.missiles.mapper.resource;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.resource.environment.LocationListRequest;
+import com.casic.missiles.dto.resource.environment.LocationListResponse;
+import com.casic.missiles.model.resource.EnvLocationInfo;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * <p>
+ * 实验室环境监控系统-设备表 Mapper 接口
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-06-07
+ */
+public interface EnvLocationInfoMapper extends BaseMapper<EnvLocationInfo> {
+
+    Page<LocationListResponse> selectLocationListPage(Page<LocationListResponse> page, @Param("request") LocationListRequest request);
+}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java
index de124db..85ed0f7 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java
@@ -1,7 +1,9 @@
 package com.casic.missiles.mapper.system;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.dto.system.SignDetailResponse;
+import com.casic.missiles.dto.system.SignListRequest;
 import com.casic.missiles.model.system.SystemSign;
 import org.apache.ibatis.annotations.Param;
 
@@ -22,4 +24,8 @@
     SignDetailResponse selectSignDetailById(Long id);
 
     List<SystemSign> selectUsableSignList(@Param("userId") Long userId);
+
+    Page<SystemSign> selectSignListPage(Page<SystemSign> page, @Param("request") SignListRequest request);
+
+    List<SystemSign> selectSignList(@Param("request") SignListRequest request);
 }
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateChangeApplyMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateChangeApplyMapper.xml
index d798447..c496092 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateChangeApplyMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateChangeApplyMapper.xml
@@ -30,31 +30,31 @@
         SELECT *
         FROM biz_business_certificate_change_apply
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.changeApplyNo != null and request.changeApplyNo !=''">
+        <if test="request != null and request.changeApplyNo != null and request.changeApplyNo !=''">
             and change_apply_no like concat('%',#{request.changeApplyNo},'%')
         </if>
-        <if test="request.changeReportNo != null and request.changeReportNo !=''">
+        <if test="request != null and request.changeReportNo != null and request.changeReportNo !=''">
             and change_report_no like concat('%',#{request.changeReportNo},'%')
         </if>
-        <if test="request.changeReportName != null and request.changeReportName !=''">
+        <if test="request != null and request.changeReportName != null and request.changeReportName !=''">
             and change_report_name like concat('%',#{request.changeReportName},'%')
         </if>
-        <if test="request.changeType != null and request.changeType !=''">
+        <if test="request != null and request.changeType != null and request.changeType !=''">
             and change_type = #{request.changeType}
         </if>
-        <if test="request.createUserName != null and request.createUserName !=''">
+        <if test="request != null and request.createUserName != null and request.createUserName !=''">
             and create_user_name like concat('%',#{request.createUserName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificatePrintMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificatePrintMapper.xml
index b66cd99..49c0ac8 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificatePrintMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificatePrintMapper.xml
@@ -31,34 +31,34 @@
         LEFT JOIN biz_business_order_sample_relation bosr ON (bosr.order_id = bcr.order_id AND bosr.sample_id = bcr.sample_id)
         LEFT JOIN biz_business_order_info boi ON boi.id = bosr.order_id
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and bcp.approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.printStatus != null and request.printStatus !=''">
+        <if test="request != null and request.printStatus != null and request.printStatus !=''">
             and print_status = #{request.printStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and bcp.create_user_id = #{request.createUserId}
         </if>
-        <if test="request.certificateReportNo != null and request.certificateReportNo !=''">
+        <if test="request != null and request.certificateReportNo != null and request.certificateReportNo !=''">
             and bcr.certificate_report_no like concat('%',#{request.certificateReportNo},'%')
         </if>
-        <if test="request.certificateReportName != null and request.certificateReportName !=''">
+        <if test="request != null and request.certificateReportName != null and request.certificateReportName !=''">
             and bcr.certificate_report_name like concat('%',#{request.certificateReportName},'%')
         </if>
-        <if test="request.customerName != null and request.customerName !=''">
+        <if test="request != null and request.customerName != null and request.customerName !=''">
             and boi.customer_name like concat('%',#{request.customerName},'%')
         </if>
-        <if test="request.sampleNo != null and request.sampleNo !=''">
+        <if test="request != null and request.sampleNo != null and request.sampleNo !=''">
             and bosr.sample_no like concat('%',#{request.sampleNo},'%')
         </if>
-        <if test="request.sampleName != null and request.sampleName !=''">
+        <if test="request != null and request.sampleName != null and request.sampleName !=''">
             and bosr.sample_name like concat('%',#{request.sampleName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and bcp.create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and bcp.create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml
index b366034..767695d 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml
@@ -46,33 +46,37 @@
         SELECT bcr.*, bosr.sample_no, bosr.sample_name, bosr.sample_model, rsi.staff_name
         FROM biz_business_certificate_report bcr
         LEFT JOIN biz_business_order_sample_relation bosr ON (bosr.order_id = bcr.order_id AND bosr.sample_id = bcr.sample_id)
+        LEFT JOIN biz_business_order_info boi ON boi.id = bcr.order_id
         LEFT JOIN biz_resource_staff_info rsi ON rsi.id = bcr.measure_person_id
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and bcr.approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and bcr.create_user_id = #{request.createUserId}
         </if>
-        <if test="request.certificateReportNo != null and request.certificateReportNo !=''">
+        <if test="request != null and request.customerId != null and request.customerId !=''">
+            and boi.customer_id = #{request.customerId}
+        </if>
+        <if test="request != null and request.certificateReportNo != null and request.certificateReportNo !=''">
             and bcr.certificate_report_no like concat('%',#{request.certificateReportNo},'%')
         </if>
-        <if test="request.certificateReportName != null and request.certificateReportName !=''">
+        <if test="request != null and request.certificateReportName != null and request.certificateReportName !=''">
             and bcr.certificate_report_name like concat('%',#{request.certificateReportName},'%')
         </if>
-        <if test="request.sampleNo != null and request.sampleNo !=''">
+        <if test="request != null and request.sampleNo != null and request.sampleNo !=''">
             and bosr.sample_no like concat('%',#{request.sampleNo},'%')
         </if>
-        <if test="request.measureCategory != null and request.measureCategory !=''">
+        <if test="request != null and request.measureCategory != null and request.measureCategory !=''">
             and bcr.measure_category = #{request.measureCategory}
         </if>
-        <if test="request.measurePerson != null and request.measurePerson !=''">
+        <if test="request != null and request.measurePerson != null and request.measurePerson !=''">
             and rsi.staff_name like concat('%',#{request.measurePerson},'%')
         </if>
-        <if test="request.calibrationTimeStart != null and request.calibrationTimeStart !=''">
+        <if test="request != null and request.calibrationTimeStart != null and request.calibrationTimeStart !=''">
             and bcr.calibration_time &gt;= #{request.calibrationTimeStart}
         </if>
-        <if test="request.calibrationTimeEnd != null and request.calibrationTimeEnd !=''">
+        <if test="request != null and request.calibrationTimeEnd != null and request.calibrationTimeEnd !=''">
             and bcr.calibration_time &lt;= #{request.calibrationTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceAssessMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceAssessMapper.xml
index d0fcf8b..c22c101 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceAssessMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceAssessMapper.xml
@@ -7,6 +7,8 @@
         <id column="id" property="id" />
         <result column="project_no" property="projectNo" />
         <result column="project_name" property="projectName" />
+        <result column="lab_code" property="labCode" />
+        <result column="group_code" property="groupCode" />
         <result column="applicant_id" property="applicantId" />
         <result column="applicant_name" property="applicantName" />
         <result column="applicant_time" property="applicantTime" />
@@ -31,7 +33,45 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, project_no, project_name, applicant_id, applicant_name, applicant_time, minio_file_name, remark, create_user_id, create_user_name, outsourcer_id, pre_start_time, pre_end_time, outsource_reason, pre_cost, approval_status, process_id, approve_situation, traceability, test_method, technique_ability, create_time, update_time
+        id, project_no, project_name, lab_code, group_code, applicant_id, applicant_name, applicant_time, minio_file_name, remark, create_user_id, create_user_name, outsourcer_id, pre_start_time, pre_end_time, outsource_reason, pre_cost, approval_status, process_id, approve_situation, traceability, test_method, technique_ability, create_time, update_time
     </sql>
 
+    <select id="selectMaxProjectNo" resultType="java.lang.Long">
+        SELECT IFNULL(max(RIGHT(project_no, 3)), 0) from biz_business_outsource_assess
+    </select>
+
+    <select id="selectBatchForApprovalList" resultMap="BaseResultMap">
+        SELECT bboa.*, bboi.outsourcer_name, bboi.director
+        FROM biz_business_outsource_assess bboa
+        LEFT JOIN biz_business_outsourcer_info bboi ON bboa.outsourcer_id = bboi.id
+        WHERE 1=1
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
+            and bboa.approval_status = #{request.approvalStatus}
+        </if>
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
+            and bboa.create_user_id = #{request.createUserId}
+        </if>
+        <if test="request != null and request.projectNo != null and request.projectNo !=''">
+            and bboa.project_no like concat('%',#{request.projectNo},'%')
+        </if>
+        <if test="request != null and request.outsourcerName != null and request.outsourcerName !=''">
+            and bboi.outsourcer_name like concat('%',#{request.outsourcerName},'%')
+        </if>
+        <if test="request != null and request.applicantName != null and request.applicantName !=''">
+            and bboa.applicant_name like concat('%',#{request.applicantName},'%')
+        </if>
+        <if test="request != null and request.applicantTimeStart != null and request.applicantTimeStart !=''">
+            and bboa.applicant_time &gt;= #{request.applicantTimeStart}
+        </if>
+        <if test="request != null and request.applicantTimeEnd != null and request.applicantTimeEnd !=''">
+            and bboa.applicant_time &lt;= #{request.applicantTimeEnd}
+        </if>
+        <if test="businessKeys != null">
+            and bboa.id in
+            <foreach collection="businessKeys" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
+        ORDER BY bboa.create_time DESC
+    </select>
 </mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceProtocolMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceProtocolMapper.xml
new file mode 100644
index 0000000..b7b2149
--- /dev/null
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceProtocolMapper.xml
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.mapper.business.BizBusinessOutsourceProtocolMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.business.BizBusinessOutsourceProtocol">
+        <id column="id" property="id" />
+        <result column="protocol_no" property="protocolNo" />
+        <result column="project_name" property="projectName" />
+        <result column="lab_code" property="labCode" />
+        <result column="group_code" property="groupCode" />
+        <result column="outsourcer_id" property="outsourcerId" />
+        <result column="remark" property="remark" />
+        <result column="outsource_no" property="outsourceNo" />
+        <result column="outsource_name" property="outsourceName" />
+        <result column="contacts" property="contacts" />
+        <result column="mobile" property="mobile" />
+        <result column="address" property="address" />
+        <result column="require_date" property="requireDate" />
+        <result column="outsource_cost" property="outsourceCost" />
+        <result column="director" property="director" />
+        <result column="item" property="item" />
+        <result column="requires" property="requires" />
+        <result column="create_user_id" property="createUserId" />
+        <result column="create_user_name" property="createUserName" />
+        <result column="approval_status" property="approvalStatus" />
+        <result column="process_id" property="processId" />
+        <result column="create_time" property="createTime" />
+        <result column="update_time" property="updateTime" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, protocol_no, project_name, lab_code, group_code, outsourcer_id, remark, outsource_no, outsource_name, contacts, mobile, address, require_date, outsource_cost, director, item, requires, create_user_id, create_user_name, approval_status, process_id, create_time, update_time
+    </sql>
+
+    <select id="selectMaxProtocolNo" resultType="java.lang.Long">
+        SELECT IFNULL(max(RIGHT(protocol_no, 3)), 0) from biz_business_outsource_protocol
+    </select>
+
+    <select id="selectBatchForApprovalList" resultMap="BaseResultMap">
+        SELECT *
+        FROM biz_business_outsource_protocol
+        WHERE 1=1
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
+            and approval_status = #{request.approvalStatus}
+        </if>
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
+            and create_user_id = #{request.createUserId}
+        </if>
+        <if test="request != null and request.protocolNo != null and request.protocolNo !=''">
+            and protocol_no like concat('%',#{request.protocolNo},'%')
+        </if>
+        <if test="request != null and request.outsourcerName != null and request.outsourcerName !=''">
+            and outsourcer_name like concat('%',#{request.outsourcerName},'%')
+        </if>
+        <if test="request != null and request.applicantName != null and request.applicantName !=''">
+            and create_user_name like concat('%',#{request.applicantName},'%')
+        </if>
+        <if test="request != null and request.applicantTimeStart != null and request.applicantTimeStart !=''">
+            and create_time &gt;= #{request.applicantTimeStart}
+        </if>
+        <if test="request != null and request.applicantTimeEnd != null and request.applicantTimeEnd !=''">
+            and create_time &lt;= #{request.applicantTimeEnd}
+        </if>
+        <if test="businessKeys != null">
+            and id in
+            <foreach collection="businessKeys" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
+        ORDER BY create_time DESC
+    </select>
+</mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourcerInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourcerInfoMapper.xml
index 510a80b..3049b54 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourcerInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourcerInfoMapper.xml
@@ -7,6 +7,8 @@
         <id column="id" property="id" />
         <result column="outsourcer_no" property="outsourcerNo" />
         <result column="outsourcer_name" property="outsourcerName" />
+        <result column="lab_code" property="labCode" />
+        <result column="group_code" property="groupCode" />
         <result column="outsourcer_brief_name" property="outsourcerBriefName" />
         <result column="outsourcer_size" property="outsourcerSize" />
         <result column="business_size" property="businessSize" />
@@ -55,32 +57,32 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, outsourcer_no, outsourcer_name, outsourcer_brief_name, outsourcer_size, business_size, grade, evaluation, tax_number, bank_account, bank_name, bank_account_number, postal_code, director, phone, fax, mobile, email, website, address_country, address_province, address_city, address_area, full_address, address_country_name, address_province_name, address_city_name, address_area_name, invoice_country, invoice_province, invoice_city, invoice_area, invoice_full_address, invoice_country_name, invoice_province_name, invoice_city_name, invoice_area_name, business_scope, business_content, minio_file_name, approval_status, process_id, remark, create_user_id, create_user_name, create_time, update_time
+        id, outsourcer_no, outsourcer_name, lab_code, group_code, outsourcer_brief_name, outsourcer_size, business_size, grade, evaluation, tax_number, bank_account, bank_name, bank_account_number, postal_code, director, phone, fax, mobile, email, website, address_country, address_province, address_city, address_area, full_address, address_country_name, address_province_name, address_city_name, address_area_name, invoice_country, invoice_province, invoice_city, invoice_area, invoice_full_address, invoice_country_name, invoice_province_name, invoice_city_name, invoice_area_name, business_scope, business_content, minio_file_name, approval_status, process_id, remark, create_user_id, create_user_name, create_time, update_time
     </sql>
 
     <select id="selectBatchForApprovalList" resultMap="BaseResultMap">
         SELECT *
         FROM biz_business_outsourcer_info
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.outsourcerNo != null and request.outsourcerNo !=''">
+        <if test="request != null and request.outsourcerNo != null and request.outsourcerNo !=''">
             and outsourcer_no like concat('%',#{request.outsourcerNo},'%')
         </if>
-        <if test="request.outsourcerName != null and request.outsourcerName !=''">
+        <if test="request != null and request.outsourcerName != null and request.outsourcerName !=''">
             and outsourcer_name like concat('%',#{request.outsourcerName},'%')
         </if>
-        <if test="request.director != null and request.director !=''">
+        <if test="request != null and request.director != null and request.director !=''">
             and director like concat('%',#{request.director},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
@@ -93,6 +95,6 @@
     </select>
 
     <select id="selectMaxNo" resultType="java.lang.Long">
-        SELECT IFNULL(max(RIGHT(outsourcer_no, 12)), 0) from biz_business_outsourcer_info
+        SELECT IFNULL(max(RIGHT(outsourcer_no, 3)), 0) from biz_business_outsourcer_info
     </select>
 </mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessSiteExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessSiteExecutiveInfoMapper.xml
index 135c5d0..3c5ae79 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessSiteExecutiveInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessSiteExecutiveInfoMapper.xml
@@ -38,25 +38,25 @@
         FROM biz_business_site_executive_info bsei
         LEFT JOIN biz_resource_customer_info rci ON bsei.customer_id = rci.id
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and bsei.approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and bsei.create_user_id = #{request.createUserId}
         </if>
-        <if test="request.siteExecutiveNo != null and request.siteExecutiveNo !=''">
+        <if test="request != null and request.siteExecutiveNo != null and request.siteExecutiveNo !=''">
             and bsei.site_executive_no like concat('%',#{request.siteExecutiveNo},'%')
         </if>
-        <if test="request.customerName != null and request.customerName !=''">
+        <if test="request != null and request.customerName != null and request.customerName !=''">
             and rci.outsourcer_name like concat('%',#{request.customerName},'%')
         </if>
-        <if test="request.applyName != null and request.applyName !=''">
+        <if test="request != null and request.applyName != null and request.applyName !=''">
             and bsei.apply_name like concat('%',#{request.applyName},'%')
         </if>
-        <if test="request.applyTimeStart != null and request.applyTimeStart !=''">
+        <if test="request != null and request.applyTimeStart != null and request.applyTimeStart !=''">
             and bsei.apply_time &gt;= #{request.applyTimeStart}
         </if>
-        <if test="request.applyTimeEnd != null and request.applyTimeEnd !=''">
+        <if test="request != null and request.applyTimeEnd != null and request.applyTimeEnd !=''">
             and bsei.apply_time &lt;= #{request.applyTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml
index 84d9e2a..6bd38a9 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml
@@ -105,6 +105,12 @@
         <if test="request.isUrgent != null and request.isUrgent !=''">
             AND bo.is_urgent = #{request.isUrgent}
         </if>
+        <if test="request.ids != null">
+            and blei.id in
+            <foreach collection="request.ids" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
         ORDER BY blei.update_time DESC
     </select>
 
@@ -137,6 +143,12 @@
         <if test="request.isUrgent != null and request.isUrgent !=''">
             AND bo.is_urgent = #{request.isUrgent}
         </if>
+        <if test="request.ids != null">
+            and blei.id in
+            <foreach collection="request.ids" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
         ORDER BY blei.update_time DESC
     </select>
 
diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardInfoMapper.xml
index 1a5551b..2ed8d17 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardInfoMapper.xml
@@ -45,12 +45,6 @@
         FROM biz_equipment_standard_info besi
         LEFT JOIN biz_equipment_standard_technology_relation bestr ON besi.standard_no = bestr.standard_no
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
-            and besi.approval_status = #{request.approvalStatus}
-        </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
-            and besi.create_user_id = #{request.createUserId}
-        </if>
         <if test="request.standardName != null and request.standardName !=''">
             and besi.standard_name like concat('%',#{request.standardName},'%')
         </if>
diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardTechnologyRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardTechnologyRelationMapper.xml
index fc7e16c..cd03c8c 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardTechnologyRelationMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardTechnologyRelationMapper.xml
@@ -6,6 +6,7 @@
     <resultMap id="BaseResultMap" type="com.casic.missiles.model.equipment.BizEquipmentStandardTechnologyRelation">
         <id column="id" property="id" />
         <result column="technology_file_id" property="technologyFileId" />
+        <result column="technology_file_no" property="technologyFileNo" />
         <result column="technology_file_name" property="technologyFileName" />
         <result column="standard_id" property="standardId" />
         <result column="standard_no" property="standardNo" />
@@ -14,7 +15,7 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, technology_file_id, technology_file_name, standard_id, remark
+        id, technology_file_id, technology_file_no, technology_file_name, standard_id, remark
     </sql>
 
 </mapper>

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java
index bb0c50f..13a699b 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java
@@ -12,6 +12,7 @@
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.IGeneralApprovalService;
+import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
@@ -19,6 +20,7 @@
 import org.springframework.web.bind.annotation.RequestBody;
 
 import javax.validation.Valid;
+import java.util.List;
 import java.util.Objects;
 
 /**
@@ -117,4 +119,17 @@
         }
         return baseApprovalService.failUpdate(request);
     }
+
+    public List<O> exportList(@RequestBody @Valid R request) throws Exception {
+        List<O> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = baseApprovalService.listExportByIds(request.getIds());
+        } else {
+            list = baseApprovalService.listExport(request);
+        }
+        for (O record : list) {
+            DictCodeUtils.convertDictCodeToName(record);
+        }
+        return list;
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java
index 8a90961..d775831 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java
@@ -5,6 +5,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.business.certificate.CertificateChangeApplyApprovalListRequest;
 import com.casic.missiles.dto.business.certificate.CertificateChangeApplySaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessCertificateChangeApply;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
@@ -20,6 +21,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -48,4 +50,12 @@
         }
         return changeApplyService.saveChangeApply(request);
     }
+
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody CertificateChangeApplyApprovalListRequest request) throws Exception {
+        List<BizBusinessCertificateChangeApply> list = super.exportList(request);
+        super.exportExcel(BizBusinessCertificateChangeApply.class, list, ExportEnum.CERTIFICATE_CHANGE_APPLY.getSheetName());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java
index 5fc4b07..af8230e 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java
@@ -9,6 +9,7 @@
 import com.casic.missiles.dto.business.certificate.CertificatePrintApprovalListRequest;
 import com.casic.missiles.dto.business.certificate.CertificatePrintListResponse;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.enums.business.CertificatePrintStatusEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessCertificatePrintLog;
@@ -18,10 +19,16 @@
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.io.IOException;
+import java.util.List;
 import java.util.Objects;
 
 /**
@@ -98,4 +105,16 @@
         });
         return certificatePrintService.certificatePrintLog(idDTO.getId());
     }
+
+    @ApiOperation("证书打印审批导出")
+    @PostMapping("/listExport")
+    public void exportList(@RequestBody CertificatePrintApprovalListRequest request) throws IOException {
+        List<CertificatePrintListResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = certificatePrintService.listByIds(request.getIds());
+        } else {
+            list = certificatePrintService.list(request);
+        }
+        super.exportExcel(CertificatePrintListResponse.class, list, ExportEnum.CERTIFICATE_PRINT.getSheetName());
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java
index 63b06dc..6b2efd5 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java
@@ -6,6 +6,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.business.certificate.CertificateReportApprovalListRequest;
 import com.casic.missiles.dto.business.certificate.CertificateReportSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessCertificateReport;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
@@ -21,6 +22,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -50,7 +52,7 @@
         return certificateReportService.saveCertificateReport(request);
     }
 
-    @ApiOperation("证书审批详情（基本信息）")
+    @ApiOperation("详情（基本信息）")
     @PostMapping("/detail")
     public ReturnDTO<BizBusinessCertificateReport> detail(@RequestBody @Valid BaseDetailRequest request, BindingResult bindingResult) throws Exception {
         if(bindingResult.hasErrors()){
@@ -59,4 +61,11 @@
         return certificateReportService.detail(request);
     }
 
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody CertificateReportApprovalListRequest request) throws Exception {
+        List<BizBusinessCertificateReport> list = super.exportList(request);
+        super.exportExcel(BizBusinessCertificateReport.class, list, ExportEnum.CERTIFICATE_REPORT.getSheetName());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java
index 46b26bd..57c0809 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java
@@ -10,20 +10,21 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.business.identify.IdentifyListRequest;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessIdentifyInfo;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.business.IBizBusinessIdentifyInfoService;
+import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import javax.validation.Valid;
+import java.util.List;
 import java.util.Objects;
 
 /**
@@ -57,16 +58,13 @@
         return identifyInfoService.addIdentify(identifyInfo);
     }
 
-    @ApiOperation("标识打印更新")
+    @ApiOperation("标识打印更新（更新打印时间）")
     @PostMapping("/update")
-    public ReturnDTO updateIdentify(@RequestBody @Valid BizBusinessIdentifyInfo identifyInfo, BindingResult bindingResult) {
-        Assert.isFalse(Objects.isNull(identifyInfo.getId()), () -> {
+    public ReturnDTO updateIdentify(@RequestBody @Valid IdDTO idDTO) {
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        Assert.isFalse(bindingResult.hasErrors(), () -> {
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        });
-        return identifyInfoService.updateIdentify(identifyInfo);
+        return identifyInfoService.updateIdentify(idDTO.getId());
     }
 
     @ApiOperation("标识打印删除")
@@ -77,4 +75,37 @@
         });
         return identifyInfoService.deleteIdentify(idDTO.getId());
     }
+
+    @ApiOperation("标识打印导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody @Valid IdentifyListRequest request, BindingResult bindingResult) throws Exception {
+        if (bindingResult.hasErrors()) {
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        List<BizBusinessIdentifyInfo> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = identifyInfoService.listByIds(request.getIds());
+        } else {
+            list = identifyInfoService.list(request);
+        }
+        for (BizBusinessIdentifyInfo record : list) {
+            DictCodeUtils.convertDictCodeToName(record);
+        }
+        super.exportExcel(BizBusinessIdentifyInfo.class, list, ExportEnum.IDENTIFY_EXPORT.getSheetName());
+    }
+
+
+    // TODO: 2023/8/23 查询设备信息，4个底部按钮查设备（按钮的作用就是前端用来调不同接口、用来区分中间即将展示的标识），前端弹窗选设备，在确定保存时前端根据底部按钮判断传入设备类型deviceType字典code
+    // TODO: 2023/8/23 接口：查受检设备（第1个按钮），查设备台账（后3个按钮同一接口），查询之后前端根据标志类型的不同加到中间页面时进行判断（按产品给的对应表）
+    // TODO: 2023/8/23 提供二维码接口，前端在加到中间页面时调用一下
+
+    @ApiOperation("设备二维码")
+    @PostMapping("/equipment/qrCode")
+    public ReturnDTO<String> equipmentQrCode(@RequestBody @Valid IdDTO idDTO) {
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return identifyInfoService.equipmentQrCode(idDTO.getId());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java
index 707be6e..7e0453d 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java
@@ -117,7 +117,7 @@
     }
 
     @ApiOperation("任务单导出")
-    @PostMapping("/export")
+    @PostMapping("/listExport")
     public void orderExport(@RequestBody @Valid OrderListRequest request, HttpServletResponse response) {
         businessOrderService.orderExport(request, response);
     }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java
index 529a6ce..51432be 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java
@@ -1,9 +1,28 @@
 package com.casic.missiles.controller.business;
 
+import com.casic.missiles.controller.GeneralApprovalController;
+import com.casic.missiles.dto.BaseApprovalSubmitRequest;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.business.outsource.OutsourceAssessApprovalListRequest;
+import com.casic.missiles.dto.business.outsource.OutsourceAssessSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
+import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.model.business.BizBusinessOutsourceAssess;
+import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
+import com.casic.missiles.service.IGeneralApprovalService;
+import com.casic.missiles.service.business.IBizBusinessOutsourceAssessService;
 import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.BindingResult;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.validation.Valid;
+import java.util.List;
+
 /**
  * <p>
  * 计量检定业务-分包管理-测试、校准或检定工作分包评审表 前端控制器
@@ -15,6 +34,27 @@
 @Api(tags = "分包管理-测试、校准或检定工作分包评审表")
 @RestController
 @RequestMapping("/business/outsource/assess")
-public class BizBusinessOutsourceAssessController {
+public class BizBusinessOutsourceAssessController extends GeneralApprovalController<BizBusinessOutsourceAssess, BizBusinessOutsourceAssess, OutsourceAssessApprovalListRequest, BaseApprovalSubmitRequest> {
+    @Autowired
+    private IBizBusinessOutsourceAssessService outsourceAssessService;
 
+    public BizBusinessOutsourceAssessController(IGeneralApprovalService<BizBusinessOutsourceAssess, BizBusinessOutsourceAssess, OutsourceAssessApprovalListRequest, BaseApprovalSubmitRequest> baseApprovalService) {
+        super(baseApprovalService);
+    }
+
+    @ApiOperation("草稿箱-保存")
+    @PostMapping("/save")
+    public ReturnDTO<OutsourceAssessSaveResponse> saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceAssess request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        return outsourceAssessService.saveOutsourceAssess(request);
+    }
+
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception {
+        List<BizBusinessOutsourceAssess> list = super.exportList(request);
+        super.exportExcel(BizBusinessOutsourceAssess.class, list, ExportEnum.OUTSOURCE_ASSESS.getSheetName());
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java
new file mode 100644
index 0000000..9adef18
--- /dev/null
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java
@@ -0,0 +1,60 @@
+package com.casic.missiles.controller.business;
+
+import com.casic.missiles.controller.GeneralApprovalController;
+import com.casic.missiles.dto.BaseApprovalSubmitRequest;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.business.outsource.OutsourceProtocolApprovalListRequest;
+import com.casic.missiles.dto.business.outsource.OutsourceProtocolSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
+import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.model.business.BizBusinessOutsourceProtocol;
+import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
+import com.casic.missiles.service.IGeneralApprovalService;
+import com.casic.missiles.service.business.IBizBusinessOutsourceProtocolService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.BindingResult;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.validation.Valid;
+import java.util.List;
+
+/**
+ * <p>
+ * 计量检定业务-分包管理-测试、校准或检定工作分包协议书 前端控制器
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-08-24
+ */
+@Api(tags = "分包管理-测试、校准或检定工作分包协议书")
+@RestController
+@RequestMapping("/business/outsource/protocol")
+public class BizBusinessOutsourceProtocolController extends GeneralApprovalController<BizBusinessOutsourceProtocol, BizBusinessOutsourceProtocol, OutsourceProtocolApprovalListRequest, BaseApprovalSubmitRequest> {
+    @Autowired
+    private IBizBusinessOutsourceProtocolService outsourceProtocolService;
+
+    public BizBusinessOutsourceProtocolController(IGeneralApprovalService<BizBusinessOutsourceProtocol, BizBusinessOutsourceProtocol, OutsourceProtocolApprovalListRequest, BaseApprovalSubmitRequest> baseApprovalService) {
+        super(baseApprovalService);
+    }
+
+    @ApiOperation("草稿箱-保存")
+    @PostMapping("/save")
+    public ReturnDTO<OutsourceProtocolSaveResponse> saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceProtocol request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        return outsourceProtocolService.saveOutsourceProtocol(request);
+    }
+
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody OutsourceProtocolApprovalListRequest request) throws Exception {
+        List<BizBusinessOutsourceProtocol> list = super.exportList(request);
+        super.exportExcel(BizBusinessOutsourceProtocol.class, list, ExportEnum.OUTSOURCE_PROTOCOL.getSheetName());
+    }
+}
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java
index 097f645..f0f0943 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java
@@ -17,7 +17,6 @@
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.IGeneralApprovalService;
 import com.casic.missiles.service.business.IBizBusinessOutsourcerInfoService;
-import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -71,19 +70,8 @@
 
     @ApiOperation("分包方导出")
     @PostMapping("/listExport")
-    public void export(@RequestBody @Valid OutsourcerInfoApprovalListRequest request, BindingResult bindingResult) throws Exception {
-        if (bindingResult.hasErrors()) {
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        }
-        List<BizBusinessOutsourcerInfo> list;
-        if (!CollectionUtils.isEmpty(request.getIds())) {
-            list = outsourcerInfoService.listByIds(request.getIds());
-        } else {
-            list = outsourcerInfoService.list(request);
-        }
-        for (BizBusinessOutsourcerInfo record : list) {
-            DictCodeUtils.convertDictCodeToName(record);
-        }
+    public void export(@RequestBody OutsourcerInfoApprovalListRequest request) throws Exception {
+        List<BizBusinessOutsourcerInfo> list = super.exportList(request);
         super.exportExcel(BizBusinessOutsourcerInfo.class, list, ExportEnum.OUTSOURCER_EXPORT.getSheetName());
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java
index c2cbf9f..0410918 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java
@@ -17,11 +17,9 @@
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.IGeneralApprovalService;
 import com.casic.missiles.service.business.IBizBusinessSiteExecutiveInfoService;
-import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -60,7 +58,7 @@
         return siteExecutiveInfoService.saveSiteExecutiveInfo(siteExecutiveInfo);
     }
 
-    @ApiOperation("现场检测详情")
+    @ApiOperation("详情")
     @PostMapping("/detail")
     public ReturnDTO<SiteExecutiveDetailResponse> siteExecutiveDetail(@RequestBody @Valid IdDTO idDTO) throws Exception {
         Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
@@ -69,21 +67,10 @@
         return ReturnUtil.success(siteExecutiveInfoService.detail(idDTO.getId()));
     }
 
-    @ApiOperation("现场检测导出")
+    @ApiOperation("导出")
     @PostMapping("/listExport")
-    public void export(@RequestBody @Valid SiteExecutiveApprovalListRequest request, BindingResult bindingResult) throws Exception {
-        if (bindingResult.hasErrors()) {
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        }
-        List<SiteExecutiveApprovalListResponse> list;
-        if (!CollectionUtils.isEmpty(request.getIds())) {
-            list = siteExecutiveInfoService.listInfoByIds(request.getIds());
-        } else {
-            list = siteExecutiveInfoService.listInfo(request);
-        }
-        for (SiteExecutiveApprovalListResponse record : list) {
-            DictCodeUtils.convertDictCodeToName(record);
-        }
+    public void export(@RequestBody SiteExecutiveApprovalListRequest request) throws Exception {
+        List<SiteExecutiveApprovalListResponse> list = super.exportList(request);
         super.exportExcel(SiteExecutiveApprovalListResponse.class, list, ExportEnum.SITE_EXECUTIVE_EXPORT.getSheetName());
     }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
index 7e793cd..a92e209 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
@@ -55,7 +55,7 @@
 
     @ApiOperation("设备收发列表导出")
     @PostMapping("/export")
-    public void exportList(@RequestBody @Valid SampleDispatchListRequest request) throws IOException {
+    public void exportList(@RequestBody SampleDispatchListRequest request) throws IOException {
         List<SampleDispatchListResponse> list;
         if (!CollectionUtils.isEmpty(request.getIds())) {
             list = dispatchService.listByIds(request.getIds());
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java
index cdc77fc..d120fd4 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java
@@ -7,6 +7,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.business.labExecutive.*;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.business.IBusinessLabExecutiveInfoService;
@@ -14,6 +15,7 @@
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.*;
 
@@ -32,7 +34,7 @@
     @Autowired
     private IBusinessLabExecutiveInfoService labExecutiveInfoService;
 
-    @ApiOperation("实验室检测-部门检测-查询各状态列表（待检测、检测中、检测完）")
+    @ApiOperation("实验室任务-查询各状态列表（待检测、检测中、检测完）")
     @PostMapping("/deptExecutive/List")
     public ReturnDTO<PageInfoBT<SampleLabExecutiveListResponse>> queryDeptExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
@@ -43,10 +45,19 @@
         return ReturnUtil.success(super.packForBT(labExecutiveInfoService.deptLabExecutiveListPage(page, labExecutiveListRequest)));
     }
 
-    /**
-     * 实验室检测-我的检测-查询各状态列表（待检测、检测中、检测完）
-     */
-    @ApiOperation("实验室检测-我的检测-查询各状态列表（待检测、检测中、检测完）")
+    @ApiOperation("实验室任务导出")
+    @PostMapping("/deptExecutive/export")
+    public void deptExportList(@RequestBody @Valid SampleLabExecutiveListRequest request) throws Exception {
+        List<SampleLabExecutiveListResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = labExecutiveInfoService.deptLabExecutiveListByIds(request.getMeasureStatus(), request.getIds());
+        } else {
+            list = labExecutiveInfoService.deptLabExecutiveList(request);
+        }
+        super.exportExcel(SampleLabExecutiveListResponse.class, list, ExportEnum.DEPT_EXECUTIVE_TASK.getSheetName());
+    }
+
+    @ApiOperation("我的任务-查询各状态列表（待检测、检测中、检测完）")
     @PostMapping("/myExecutive/list")
     public ReturnDTO<PageInfoBT<SampleLabExecutiveListResponse>> queryMyExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
@@ -57,19 +68,25 @@
         return ReturnUtil.success(super.packForBT(labExecutiveInfoService.myLabExecutiveListPage(page, labExecutiveListRequest)));
     }
 
-    /**
-     * 实验室检测-我的检测-查询各状态样品数量（待检测、检测中、检测完）
-     */
-    @ApiOperation("实验室检测-我的检测-查询各状态样品数量（待检测、检测中、检测完）")
+    @ApiOperation("我的任务导出")
+    @PostMapping("/myExecutive/export")
+    public void exportList(@RequestBody @Valid SampleLabExecutiveListRequest request) throws Exception {
+        List<SampleLabExecutiveListResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = labExecutiveInfoService.myLabExecutiveListByIds(request.getMeasureStatus(), request.getIds());
+        } else {
+            list = labExecutiveInfoService.myLabExecutiveList(request);
+        }
+        super.exportExcel(SampleLabExecutiveListResponse.class, list, ExportEnum.MY_EXECUTIVE_TASK.getSheetName());
+    }
+
+    @ApiOperation("我的任务-查询各状态样品数量（待检测、检测中、检测完）")
     @GetMapping("/myExecutive/amount")
     public ReturnDTO<List<SampleAmountResponse>> queryMyExecutiveAmount() {
         return ReturnUtil.success(labExecutiveInfoService.myExecutiveAmount());
     }
 
-    /**
-     * 实验室检测-部门检测-分配（分配给具体人员）
-     */
-    @ApiOperation("实验室检测-部门检测-分配按钮（分配给具体人员）")
+    @ApiOperation("实验室任务-分配按钮（分配给具体人员）")
     @PostMapping("/deptExecutive/allocate")
     public ReturnDTO allocateStaff(@RequestBody @Valid SampleAllocateRequest sampleAllocateRequest, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -78,10 +95,7 @@
         return labExecutiveInfoService.allocateStaff(sampleAllocateRequest);
     }
 
-    /**
-     * 实验室检测-我的检测-检定人扫描收入（待检测->检测中）
-     */
-    @ApiOperation("实验室检测-我的检测-检定人扫描收入（待检测->检测中）")
+    @ApiOperation("我的任务-检定人扫描收入（待检测->检测中）")
     @PostMapping("/myExecutive/receive")
     public ReturnDTO sampleReceive(@RequestBody @Valid List<SampleOperateRequest> requestList, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -90,10 +104,7 @@
         return labExecutiveInfoService.sampleReceive(requestList);
     }
 
-    /**
-     * 实验室检测-负责人/检定人扫描检完（检测中->检测完）
-     */
-    @ApiOperation("实验室检测-负责人/检定人扫描检完（检测中->检测完）")
+    @ApiOperation("实验室任务-负责人/检定人扫描检完（检测中->检测完）")
     @PostMapping("/myExecutive/complete")
     public ReturnDTO sampleExecutiveComplete(@RequestBody @Valid List<SampleOperateRequest> requestList, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -102,10 +113,7 @@
         return labExecutiveInfoService.sampleExecutiveComplete(requestList);
     }
 
-    /**
-     * 实验室检测-部门检测/我的检测 编辑（只能修改应出具证书）
-     */
-    @ApiOperation("实验室检测-部门检测/我的检测 编辑（只能修改应出具证书）")
+    @ApiOperation("实验室任务/我的任务 编辑（只能修改应出具证书）")
     @PostMapping("/executive/update")
     public ReturnDTO updateExecutive(@RequestBody @Valid UpdateExecutiveRequest request, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -114,10 +122,7 @@
         return labExecutiveInfoService.updateExecutive(request);
     }
 
-    /**
-     * 实验室检测-部门检测/我的检测 详情
-     */
-    @ApiOperation("实验室检测-部门检测/我的检测 详情")
+    @ApiOperation("实验室任务/我的任务 详情")
     @PostMapping("/executive/detail")
     public ReturnDTO<ExecutiveDetailResponse> executiveDetail(@RequestBody @Valid ExecutiveDetailRequest request, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
@@ -131,7 +136,7 @@
      * 退回后会将下一个要执行的实验室检测状态更新为待分配，将后面的实验室顺序变更为连续（都进行减1）
      * 最后一个检测的实验室退回，等分发员再增加实验室或设备收发中的已收入直接手动点击完成
      */
-    @ApiOperation("实验室检测-部门检测/我的检测 退回（待检测/检测中->退回）")
+    @ApiOperation("实验室任务/我的任务 退回（待检测/检测中->退回）")
     @PostMapping("/executive/sendBack")
     public ReturnDTO executiveSendBack(@RequestBody @Valid ExecutiveSendBackRequest request, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -140,9 +145,6 @@
         return labExecutiveInfoService.sampleExecutiveSendBack(request);
     }
 
-    /**
-     * 分发员编辑实验室检测列表
-     */
     @ApiOperation("分发员编辑实验室检测列表")
     @PostMapping("/handOut/updateList")
     public ReturnDTO updateExecutiveList(@RequestBody @Valid UpdateExecutiveListRequest request, BindingResult bindingResult) {
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java
index 48a67ed..0c04f31 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java
@@ -10,6 +10,7 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.resource.customer.CustomerApprovalListRequest;
 import com.casic.missiles.dto.resource.customer.CustomerSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceCustomerInfo;
@@ -26,6 +27,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -55,6 +57,13 @@
         return customerInfoService.saveCustomerInfo(request);
     }
 
+    @ApiOperation("委托方名录导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody CustomerApprovalListRequest request) throws Exception {
+        List<BizResourceCustomerInfo> list = super.exportList(request);
+        super.exportExcel(BizResourceCustomerInfo.class, list, ExportEnum.CUSTOMER_INFO.getSheetName());
+    }
+
     @ApiOperation("委托方人员列表（分页）")
     @PostMapping("/person/listPage")
     public ReturnDTO<PageInfoBT<BizResourceCustomerStaff>> personListPage(@RequestBody IdDTO idDto) {
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
index 972ed4b..6418ea5 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
@@ -5,6 +5,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.resource.customer.SuggestFormApprovalListRequest;
 import com.casic.missiles.dto.resource.customer.SuggestFormSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceCustomerSuggestForm;
@@ -20,6 +21,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -50,4 +52,11 @@
         return suggestFormService.saveSuggestForm(request);
     }
 
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody SuggestFormApprovalListRequest request) throws Exception {
+        List<BizResourceCustomerSuggestForm> list = super.exportList(request);
+        super.exportExcel(BizResourceCustomerSuggestForm.class, list, ExportEnum.CUSTOMER_SUGGEST_FORM.getSheetName());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java
index 1934d1a..9e07eab 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java
@@ -15,12 +15,16 @@
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.resource.IEnvEnvironmentRecordConfigService;
 import com.casic.missiles.service.resource.IEnvEnvironmentRecordDataService;
+import com.casic.missiles.service.resource.IEnvLocationInfoService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
 import java.util.List;
@@ -39,6 +43,8 @@
     private IEnvEnvironmentRecordDataService environmentRecordDataService;
     @Autowired
     private IEnvEnvironmentRecordConfigService environmentRecordConfigService;
+    @Autowired
+    private IEnvLocationInfoService locationInfoService;
 
     @ApiOperation("环境记录单数据列表/详情")
     @PostMapping("/data/listPage")
@@ -95,4 +101,11 @@
         });
         return environmentRecordConfigService.deleteEnvironmentRecordConfig(idDTO.getId());
     }
+
+    @ApiOperation("地点列表")
+    @PostMapping("/location/listPage")
+    public ReturnDTO<PageInfoBT<LocationListResponse>> locationListPage(@RequestBody @Valid LocationListRequest request) {
+        Page<LocationListResponse> page = PageFactory.defaultPage();
+        return ReturnUtil.success(super.packForBT(locationInfoService.listPage(page, request)));
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java
index 82efe3f..e9561fa 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java
@@ -10,6 +10,7 @@
 import com.casic.missiles.dto.resource.seal.SealLogListRequest;
 import com.casic.missiles.dto.resource.seal.SealNoteApprovalListRequest;
 import com.casic.missiles.dto.resource.seal.SealNoteSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceSealUseLog;
@@ -27,6 +28,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -58,6 +60,13 @@
         return sealUseNoteService.saveSeal(request);
     }
 
+    @ApiOperation("印章使用登记导出（列表和导出中去掉经办人和监印人）")
+    @PostMapping("/listExport")
+    public void export(@RequestBody SealNoteApprovalListRequest request) throws Exception {
+        List<BizResourceSealUseNote> list = super.exportList(request);
+        super.exportExcel(BizResourceSealUseNote.class, list, ExportEnum.SEAL_NOTE.getSheetName());
+    }
+
     // TODO: 2023/7/28 印章使用日志：系统中使用印章时插入数据库
 
     @ApiOperation("印章使用日志列表（分页）")
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java
index 9b674fc..06b6521 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java
@@ -9,16 +9,20 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.resource.staff.StaffCertRequest;
 import com.casic.missiles.dto.resource.staff.StaffCertResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.service.resource.IBizResourceStaffInfoService;
 import com.casic.missiles.service.resource.IBizResourceStaffVerifierService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.List;
+
 /**
  * @Description:
  * @Author: wangpeng
@@ -41,9 +45,21 @@
         return ReturnUtil.success(super.packForBT(responsePage));
     }
 
+    @ApiOperation("证书逾期提醒导出")
+    @PostMapping("/listExport")
+    public void exportList(@RequestBody StaffCertRequest request) throws Exception {
+        List<StaffCertResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = staffInfoService.certListByIds(request.getIds());
+        } else {
+            list = staffInfoService.certList(request);
+        }
+        super.exportExcel(StaffCertResponse.class, list, ExportEnum.STAFF_CERTIFICATE_EXPIRE.getSheetName());
+    }
+
     @ApiOperation("证书逾期提醒")
     @PostMapping("/expirationReminder")
-    public ReturnDTO expirationReminder(@RequestBody IdDTO idDto) {
-        return verifierService.expirationReminder(idDto);
+    public ReturnDTO expirationReminder(@RequestBody IdDTO idDTO) {
+        return verifierService.expirationReminder(idDTO);
     }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java
index 3b251ad..a6e7850 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java
@@ -12,6 +12,7 @@
 import com.casic.missiles.dto.resource.staff.StaffListRequest;
 import com.casic.missiles.dto.resource.staff.TrainListRequest;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.*;
@@ -22,7 +23,10 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
 import java.util.List;
@@ -52,8 +56,19 @@
             throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
         }
         Page<BizResourceStaffInfo> page = PageFactory.defaultPage();
-        Page<BizResourceStaffInfo> responsePage = staffInfoService.listPage(page, request);
-        return ReturnUtil.success(super.packForBT(responsePage));
+        return ReturnUtil.success(super.packForBT(staffInfoService.listPage(page, request)));
+    }
+
+    @ApiOperation("人员登记导出")
+    @PostMapping("/listExport")
+    public void exportList(@RequestBody StaffListRequest request) throws Exception {
+        List<BizResourceStaffInfo> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = staffInfoService.listByIds(request.getIds());
+        } else {
+            list = staffInfoService.list(request);
+        }
+        super.exportExcel(BizResourceStaffInfo.class, list, ExportEnum.STAFF_INFO.getSheetName());
     }
 
     @ApiOperation("人员登记详情基础信息")
@@ -85,9 +100,9 @@
 
     @ApiOperation("科研教育列表（分页）")
     @PostMapping("/education/listPage")
-    public ReturnDTO<PageInfoBT<BizResourceStaffEducation>> educationListPage(@RequestBody IdDTO idDto) {
+    public ReturnDTO<PageInfoBT<BizResourceStaffEducation>> educationListPage(@RequestBody IdDTO idDTO) {
         Page<BizResourceStaffEducation> page = PageFactory.defaultPage();
-        Page<BizResourceStaffEducation> responsePage = staffInfoService.educationListPage(page, idDto);
+        Page<BizResourceStaffEducation> responsePage = staffInfoService.educationListPage(page, idDTO);
         return ReturnUtil.success(super.packForBT(responsePage));
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java
index af6aa86..d85d84a 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java
@@ -9,6 +9,7 @@
 import com.casic.missiles.dto.resource.outsideService.SupplierApprovalListRequest;
 import com.casic.missiles.dto.resource.outsideService.SupplierSaveResponse;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceSupplierAbility;
@@ -67,6 +68,13 @@
         return ReturnUtil.success(supplierInfoService.detail(idDTO.getId()));
     }
 
+    @ApiOperation("合格供方导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody SupplierApprovalListRequest request) throws Exception {
+        List<BizResourceSupplierInfo> list = super.exportList(request);
+        super.exportExcel(BizResourceSupplierInfo.class, list, ExportEnum.SUPPLIER_INFO.getSheetName());
+    }
+
     @ApiOperation("供方人员列表（分页）")
     @PostMapping("/person/listPage")
     public ReturnDTO<PageInfoBT<BizResourceSupplierPerson>> personListPage(@RequestBody IdDTO idDTO) {
diff --git a/casic-metering-api/src/main/resources/config/application.yml b/casic-metering-api/src/main/resources/config/application.yml
index 350db5f..ecff521 100644
--- a/casic-metering-api/src/main/resources/config/application.yml
+++ b/casic-metering-api/src/main/resources/config/application.yml
@@ -126,7 +126,7 @@
     #作者
     author: wangpeng
     #待生成对象表名
-    table-name: biz_equipment_technical_target_approval,biz_equipment_attachment_approval,biz_equipment_checkpoint_approval
+    table-name: biz_business_outsource_protocol
 
 reminder:
   #节点--common模块config包 ReminderNodeConfig配置
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
index 4a19e4e..d47d552 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
@@ -53,6 +53,7 @@
     SUGGEST_FORM_SAVE_FAILED(2509, "委托方意见登记表保存至草稿箱失败"),
     EXAMINE_FORM_SAVE_FAILED(2510, "要求、委托书及合同评审表保存至草稿箱失败"),
     CUSTOMER_EXIST_SAVE_FAILED(2511, "该委托方已存在，请重新选择"),
+    DUPLICATE_LOCATION_NO(2512, "地点编号已存在"),
 
     /**
      * 计量检定业务模块
@@ -68,6 +69,8 @@
     COMPLETE_SAMPLE_NOT_EXIST(2609, "检测中不存在扫描收入的样品"),
     CANNOT_CHANGE_MEASURE_INFO(2610, "无法更改非当前登录用户的检测信息"),
     NON_EXIST_ORDER_OR_SAMPLE(2611, "不存在该委托单或该委托单下的样品"),
+    OUTSOURCE_ACCESS_SAVE_FAILED(2612, "测试、校准或检定工作分包评审表保存至草稿箱失败"),
+    OUTSOURCE_PROTOCOL_SAVE_FAILED(2613, "测试、校准或检定工作分包协议书保存至草稿箱失败"),
 
     /**
      * 历史遗留备用
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
index 5089ad1..81a406b 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
@@ -10,54 +10,38 @@
     /**
      * 资源管理
      */
-    ENVIRONMENT_DATA_EXPORT("environmentData", "environmentData", "环境记录单数据"),
+    ENVIRONMENT_DATA_EXPORT("environmentData", "环境记录单数据", "环境记录单数据"),
+    STAFF_INFO("staffInfo", "人员登记", "人员登记"),
+    STAFF_CERTIFICATE_EXPIRE("certificateExpire", "证书逾期提醒", "证书逾期提醒"),
+    SUPPLIER_INFO("supplierInfo", "合格供方名录", "合格供方名录"),
+    CUSTOMER_INFO("customerInfo", "委托方名录", "委托方名录"),
+    CUSTOMER_SUGGEST_FORM("customerSuggestForm", "委托方意见登记表", "委托方意见登记表"),
+    SEAL_NOTE("sealNote", "印章使用登记", "印章使用登记"),
 
-    FILE_EXPORT("meterFileData", "meterFileData", "计量文件信息"),
-    TRAIN_PLAN_EXPORT("trainPlanData", "trainPlanData", "培训计划"),
-    TRAIN_LOG_EXPORT("trainLogData", "trainLogData", "培训记录"),
-    METER_ORGANIZE_EXPORT("meterOrganizeData", "meterOrganizeData", "计量组织"),
-    TRACE_SUPPLIER_EXPORT("traceSupplierData", "traceSupplierData", "溯源供方"),
-    SIGN_EXPORT("signData", "signData", "签名/签章"),
-    TEMPLATE_EXPORT("templateData", "templateData", "原始记录模板/证书报告模板"),
-    FIXED_ASSETS("meterFixedAssets", "meterFixedAssets", "固定资产"),
-    METER_EQUIPMENT("meterEquipment", "meterEquipment", "测量设备"),
-    CALIBRATION_TEST_EQUIPMENT("calibrationTestEquipment", "calibrationTestEquipment", "校准检定设备"),
-    MEASURE_ACCOUNT("measureAccount", "measureAccount", "测量工装"),
-    STANDARD_SUPPORT_EQUIPMENT("standardSupportEquipment", "standardSupportEquipment", "标准配套设备"),
-    STANDARD_EQUIPMENT("standardEquipment", "standardEquipment", "标准装置"),
-    FLOW_DEF_EXPORT("flowDefData", "flowDefData", "流程定义"),
-    STAFF_CERTIFICATE("certificate", "certificate", "计量人员证书"),
-    CHECK_INFO("checkInfo", "checkInfo", "设备管理点检测"),
-    EQUIPMENT_APPLY("equipmentApply", "equipmentApply", "设备借用"),
-    STANDARD_EQUIPMENT_REMIND("equipmentApplyRemind", "equipmentApplyRemind", "标准装置到期提醒"),
-    METER_PRICE("meterPrice", "meterPrice", "价格库"),
-    METER_STAFF("meterStaff", "meterStaff", "计量人员"),
-    STANDARD_EQUIPMENT_APPLY("standardEquipmentApply", "standardEquipmentApply", "标准装置申请"),
-    STATE_MANAGE_APPLY("stateManage", "stateManage", "状态管理"),
-    METER_ACCEPTANCE_CHECK("acceptanceCheck", "acceptanceCheck", "设备检修保养验收单"),
-    CUSTOMER_EXPORT("customerData", "customerData", "客户信息"),
-    ORDER_EXPORT("orderData", "orderData", "委托书信息"),
-    SAMPLE_EXPORT("sampleData", "sampleData", "样本信息"),
-    EXCHANGE_DATA("exchangeData", "exchangeData", "设备交接单"),
-    DISPATCH_DATA("dispatchData", "dispatchData", "设备收发"),
-    ENVIRONMENT_DATA("environmentData", "environmentData", "环境记录单"),
-    ORIGIN_DATA("originData", "originData", "原始记录"),
-    CERTIFICATE_REPORT("certificateReport", "certificateReport", "证书报告"),
-    ADVICE_EXPORT("adviceData", "adviceData", "客户反馈"),
-    HANDOUT_EXPORT("handoutData", "handoutData", "任务分发列表"),
-    OUTSOURCER_EXPORT("outsourcerData", "outsourcerData", "分包方"),
-    SITE_EXECUTIVE_EXPORT("siteExecutiveData", "siteExecutiveData", "现场测试、校准或检定"),
-    CERTIFICATE_PRINT_EXPORT("certificatePrintData", "certificatePrintData", "证书打印"),
-    DOWNLOAD_TEMPLATE("downloadTemplate", "downloadTemplate", "页面配置"),
-    OUTSOURCER_CERTIFICATE_EXPORT("outsourceCertificateData", "outsourceCertificateData", "分包证书"),
-    SETTLEMENT_INFO_EXPORT("settlementInfoData", "settlementInfoData", "业务结算"),
-    EQUIPMENT_REMIND("equipmentRemind", "equipmentRemind", "设备到期提醒"),
-    AGREEMENT_INFO_EXPORT("agreementInfoData", "agreementInfoData", "合同"),
-    WORK_STATISTICS_EXPORT("workStatisticsData", "workStatisticsData", "实时工作统计"),
-    DEPT_OUTPUT_EXPORT("deptOutputData", "deptOutputData", "部门产值分析"),
-    WORKLOAD_EXPORT("workloadData", "workloadData", "业务工作量分析"),
-    DEPT_COMPREHENSIVE_EXPORT("deptComprehensiveData", "deptComprehensiveData", "部门综合分析"),
-    ENVIRONMENTAL_RECORD("environmentalRecordData", "environmentalRecordData", "现场环境记录");
+    /**
+     * 计量检定业务
+     */
+    OUTSOURCER_EXPORT("outsourcerData", "分包方名录", "分包方名录"),
+    IDENTIFY_EXPORT("identifyData", "计量标识", "计量标识"),
+    ORDER_EXPORT("orderData", "任务单", "任务单"),
+    DISPATCH_DATA("dispatchData", "设备收发", "设备收发"),
+    HANDOUT_EXPORT("handoutData", "任务分发", "任务分发"),
+    SITE_EXECUTIVE_EXPORT("siteExecutiveData", "现场测试、校准或检定", "现场测试、校准或检定"),
+    CERTIFICATE_REPORT("certificateReport", "证书审批", "证书审批"),
+    CERTIFICATE_CHANGE_APPLY("certificateChangeApply", "证书报告补充或更换申请单", "证书报告补充或更换申请单"),
+    CERTIFICATE_PRINT("certificatePrintData", "证书打印审批", "证书打印审批"),
+    DEPT_EXECUTIVE_TASK("deptExecutiveTaskData", "实验室任务", "实验室任务"),
+    MY_EXECUTIVE_TASK("myExecutiveTaskData", "我的任务", "我的任务"),
+    OUTSOURCE_ASSESS("outsourceAssess", "测试、校准或检定工作分包评审表", "测试、校准或检定工作分包评审表"),
+    OUTSOURCE_PROTOCOL("outsourceProtocol", "测试、校准或检定工作分包协议书", "测试、校准或检定工作分包协议书"),
+
+    /**
+     * 系统管理
+     */
+    SIGN_EXPORT("signData", "签名", "签名"),
+    TEMPLATE_EXPORT("templateData", "文件模板", "文件模板"),
+    FLOW_DEF_EXPORT("flowDefData", "流程定义", "流程定义"),
+    DOWNLOAD_TEMPLATE("downloadTemplate", "流程定义", "页面配置");
 
     ExportEnum(String fileName, String sheetName, String description) {
         this.fileName = fileName;
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateRecordTypeCodeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateRecordTypeCodeEnum.java
index 31d913c..a963522 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateRecordTypeCodeEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateRecordTypeCodeEnum.java
@@ -46,4 +46,14 @@
     String SITE_EXECUTIVE_APPROVAL = "01";
     //《现场测试、校准或检定工作记录表》
     String SITE_EXECUTIVE_LOG = "02";
+
+    //测试、校准或检定工作分包协议书
+    String OUTSOURCE_PROTOCOL = "01";
+    //测试、校准或检定工作分包评审表
+    String OUTSOURCE_ACCESS = "02";
+    //测试、校准或检定工作分包通知书
+    String OUTSOURCE_NOTICE = "03";
+    //测试、校准或检定工作分包方名录
+    String OUTSOURCE_INFO = "04";
+
 }
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
index 24b8635..f78bd53 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
@@ -15,6 +15,10 @@
     String CERTIFICATE_CHANGE_APPLY_BEAN_NAME = "certificateChangeApplyBean";
     //现场测试、校准或检定
     String SITE_EXECUTIVE_BEAN_NAME = "siteExecutiveBean";
+    //测试、校准或检定工作分包评审表
+    String OUTSOURCE_ASSESS_BEAN_NAME = "outsourceAssessBean";
+    //测试、校准或检定工作分包协议书
+    String OUTSOURCE_PROTOCOL_BEAN_NAME = "outsourceProtocolBean";
 
     /*********************************设备与装置************************************/
     //设备台账
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 b21c661..6b86fd1 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
@@ -18,6 +18,8 @@
     OUTSOURCER_APPROVAL(OUTSOURCER_BEAN_NAME, ""),
     CERTIFICATE_CHANGE_APPROVAL(CERTIFICATE_CHANGE_APPLY_BEAN_NAME, ""),
     SITE_EXECUTIVE_APPROVAL(SITE_EXECUTIVE_BEAN_NAME, ""),
+    OUTSOURCE_ASSESS_APPROVAL(OUTSOURCE_ASSESS_BEAN_NAME, ""),
+    OUTSOURCE_PROTOCOL_APPROVAL(OUTSOURCE_PROTOCOL_BEAN_NAME, ""),
 
     ACTION_STATUS_MAP(new HashMap<String, AwareActionStatusEnum>() {
         {
@@ -47,6 +49,10 @@
             put(ApplyFromIdEnum.CERTIFICATE_CHANGE_APPROVAL.getCode(), CERTIFICATE_CHANGE_APPROVAL);
             //现场测试、校准或检定审批
             put(ApplyFromIdEnum.SITE_EXECUTIVE_APPROVAL.getCode(), SITE_EXECUTIVE_APPROVAL);
+            //测试、校准或检定工作分包评审表
+            put(ApplyFromIdEnum.OUTSOURCE_ASSESS_APPROVAL.getCode(), OUTSOURCE_ASSESS_APPROVAL);
+            //测试、校准或检定工作分包协议书
+            put(ApplyFromIdEnum.OUTSOURCE_PROTOCOL_APPROVAL.getCode(), OUTSOURCE_PROTOCOL_APPROVAL);
         }
     });
     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 934405e..c7410bd 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
@@ -9,6 +9,8 @@
     CERTIFICATE_CHANGE_APPROVAL("jljdywzsbchghsqd", MessageSourceModuleEnum.BUSINESS.getCode(), "证书/报告补充或更换申请单"),
     OUTSOURCER_APPROVAL("jljdywcsjzhgfbfml", MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定合格分包方名录"),
     SITE_EXECUTIVE_APPROVAL("jljdywxccsjzsp", MessageSourceModuleEnum.BUSINESS.getCode(), "现场测试、校准或检定审批"),
+    OUTSOURCE_ASSESS_APPROVAL("jljdywcsjzfbpsb", MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包评审表"),
+    OUTSOURCE_PROTOCOL_APPROVAL("jljdywcsjzfbxys", MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包协议书"),
 
 
     /*******************************************设备与装置*********************************************/
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/GeneralApprovalMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/GeneralApprovalMapper.java
index 4fb7344..0c9d6ae 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/GeneralApprovalMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/GeneralApprovalMapper.java
@@ -17,8 +17,4 @@
 
     Page<O> selectBatchForApprovalList(Page<O> page, @Param("request") R request, @Param("businessKeys") List<String> businessKeys);
 
-//    Page<O> selectListPage(Page<O> page, @Param("request") R request);
-
-//    Long selectMaxNo();
-
 }
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceAssessMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceAssessMapper.java
index 7867bb8..ba59009 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceAssessMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceAssessMapper.java
@@ -1,7 +1,12 @@
 package com.casic.missiles.mapper.business;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.business.outsource.OutsourceAssessApprovalListRequest;
+import com.casic.missiles.mapper.GeneralApprovalMapper;
 import com.casic.missiles.model.business.BizBusinessOutsourceAssess;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * <p>
@@ -11,6 +16,10 @@
  * @author wangpeng
  * @since 2023-08-16
  */
-public interface BizBusinessOutsourceAssessMapper extends BaseMapper<BizBusinessOutsourceAssess> {
+public interface BizBusinessOutsourceAssessMapper extends GeneralApprovalMapper<BizBusinessOutsourceAssess, BizBusinessOutsourceAssess, OutsourceAssessApprovalListRequest> {
+
+    Page<BizBusinessOutsourceAssess> selectBatchForApprovalList(Page<BizBusinessOutsourceAssess> page, @Param("request") OutsourceAssessApprovalListRequest request, @Param("businessKeys") List<String> businessKeys);
+
+    Long selectMaxProjectNo();
 
 }
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceProtocolMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceProtocolMapper.java
new file mode 100644
index 0000000..e6aba35
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceProtocolMapper.java
@@ -0,0 +1,24 @@
+package com.casic.missiles.mapper.business;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.business.outsource.OutsourceProtocolApprovalListRequest;
+import com.casic.missiles.mapper.GeneralApprovalMapper;
+import com.casic.missiles.model.business.BizBusinessOutsourceProtocol;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 计量检定业务-分包管理-测试、校准或检定工作分包协议书 Mapper 接口
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-08-24
+ */
+public interface BizBusinessOutsourceProtocolMapper extends GeneralApprovalMapper<BizBusinessOutsourceProtocol, BizBusinessOutsourceProtocol, OutsourceProtocolApprovalListRequest> {
+
+    Page<BizBusinessOutsourceProtocol> selectBatchForApprovalList(Page<BizBusinessOutsourceProtocol> page, @Param("request") OutsourceProtocolApprovalListRequest request, @Param("businessKeys") List<String> businessKeys);
+
+    Long selectMaxProtocolNo();
+}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/EnvLocationInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/EnvLocationInfoMapper.java
new file mode 100644
index 0000000..49eff87
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/EnvLocationInfoMapper.java
@@ -0,0 +1,21 @@
+package com.casic.missiles.mapper.resource;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.resource.environment.LocationListRequest;
+import com.casic.missiles.dto.resource.environment.LocationListResponse;
+import com.casic.missiles.model.resource.EnvLocationInfo;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * <p>
+ * 实验室环境监控系统-设备表 Mapper 接口
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-06-07
+ */
+public interface EnvLocationInfoMapper extends BaseMapper<EnvLocationInfo> {
+
+    Page<LocationListResponse> selectLocationListPage(Page<LocationListResponse> page, @Param("request") LocationListRequest request);
+}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java
index de124db..85ed0f7 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java
@@ -1,7 +1,9 @@
 package com.casic.missiles.mapper.system;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.dto.system.SignDetailResponse;
+import com.casic.missiles.dto.system.SignListRequest;
 import com.casic.missiles.model.system.SystemSign;
 import org.apache.ibatis.annotations.Param;
 
@@ -22,4 +24,8 @@
     SignDetailResponse selectSignDetailById(Long id);
 
     List<SystemSign> selectUsableSignList(@Param("userId") Long userId);
+
+    Page<SystemSign> selectSignListPage(Page<SystemSign> page, @Param("request") SignListRequest request);
+
+    List<SystemSign> selectSignList(@Param("request") SignListRequest request);
 }
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateChangeApplyMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateChangeApplyMapper.xml
index d798447..c496092 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateChangeApplyMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateChangeApplyMapper.xml
@@ -30,31 +30,31 @@
         SELECT *
         FROM biz_business_certificate_change_apply
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.changeApplyNo != null and request.changeApplyNo !=''">
+        <if test="request != null and request.changeApplyNo != null and request.changeApplyNo !=''">
             and change_apply_no like concat('%',#{request.changeApplyNo},'%')
         </if>
-        <if test="request.changeReportNo != null and request.changeReportNo !=''">
+        <if test="request != null and request.changeReportNo != null and request.changeReportNo !=''">
             and change_report_no like concat('%',#{request.changeReportNo},'%')
         </if>
-        <if test="request.changeReportName != null and request.changeReportName !=''">
+        <if test="request != null and request.changeReportName != null and request.changeReportName !=''">
             and change_report_name like concat('%',#{request.changeReportName},'%')
         </if>
-        <if test="request.changeType != null and request.changeType !=''">
+        <if test="request != null and request.changeType != null and request.changeType !=''">
             and change_type = #{request.changeType}
         </if>
-        <if test="request.createUserName != null and request.createUserName !=''">
+        <if test="request != null and request.createUserName != null and request.createUserName !=''">
             and create_user_name like concat('%',#{request.createUserName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificatePrintMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificatePrintMapper.xml
index b66cd99..49c0ac8 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificatePrintMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificatePrintMapper.xml
@@ -31,34 +31,34 @@
         LEFT JOIN biz_business_order_sample_relation bosr ON (bosr.order_id = bcr.order_id AND bosr.sample_id = bcr.sample_id)
         LEFT JOIN biz_business_order_info boi ON boi.id = bosr.order_id
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and bcp.approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.printStatus != null and request.printStatus !=''">
+        <if test="request != null and request.printStatus != null and request.printStatus !=''">
             and print_status = #{request.printStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and bcp.create_user_id = #{request.createUserId}
         </if>
-        <if test="request.certificateReportNo != null and request.certificateReportNo !=''">
+        <if test="request != null and request.certificateReportNo != null and request.certificateReportNo !=''">
             and bcr.certificate_report_no like concat('%',#{request.certificateReportNo},'%')
         </if>
-        <if test="request.certificateReportName != null and request.certificateReportName !=''">
+        <if test="request != null and request.certificateReportName != null and request.certificateReportName !=''">
             and bcr.certificate_report_name like concat('%',#{request.certificateReportName},'%')
         </if>
-        <if test="request.customerName != null and request.customerName !=''">
+        <if test="request != null and request.customerName != null and request.customerName !=''">
             and boi.customer_name like concat('%',#{request.customerName},'%')
         </if>
-        <if test="request.sampleNo != null and request.sampleNo !=''">
+        <if test="request != null and request.sampleNo != null and request.sampleNo !=''">
             and bosr.sample_no like concat('%',#{request.sampleNo},'%')
         </if>
-        <if test="request.sampleName != null and request.sampleName !=''">
+        <if test="request != null and request.sampleName != null and request.sampleName !=''">
             and bosr.sample_name like concat('%',#{request.sampleName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and bcp.create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and bcp.create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml
index b366034..767695d 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml
@@ -46,33 +46,37 @@
         SELECT bcr.*, bosr.sample_no, bosr.sample_name, bosr.sample_model, rsi.staff_name
         FROM biz_business_certificate_report bcr
         LEFT JOIN biz_business_order_sample_relation bosr ON (bosr.order_id = bcr.order_id AND bosr.sample_id = bcr.sample_id)
+        LEFT JOIN biz_business_order_info boi ON boi.id = bcr.order_id
         LEFT JOIN biz_resource_staff_info rsi ON rsi.id = bcr.measure_person_id
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and bcr.approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and bcr.create_user_id = #{request.createUserId}
         </if>
-        <if test="request.certificateReportNo != null and request.certificateReportNo !=''">
+        <if test="request != null and request.customerId != null and request.customerId !=''">
+            and boi.customer_id = #{request.customerId}
+        </if>
+        <if test="request != null and request.certificateReportNo != null and request.certificateReportNo !=''">
             and bcr.certificate_report_no like concat('%',#{request.certificateReportNo},'%')
         </if>
-        <if test="request.certificateReportName != null and request.certificateReportName !=''">
+        <if test="request != null and request.certificateReportName != null and request.certificateReportName !=''">
             and bcr.certificate_report_name like concat('%',#{request.certificateReportName},'%')
         </if>
-        <if test="request.sampleNo != null and request.sampleNo !=''">
+        <if test="request != null and request.sampleNo != null and request.sampleNo !=''">
             and bosr.sample_no like concat('%',#{request.sampleNo},'%')
         </if>
-        <if test="request.measureCategory != null and request.measureCategory !=''">
+        <if test="request != null and request.measureCategory != null and request.measureCategory !=''">
             and bcr.measure_category = #{request.measureCategory}
         </if>
-        <if test="request.measurePerson != null and request.measurePerson !=''">
+        <if test="request != null and request.measurePerson != null and request.measurePerson !=''">
             and rsi.staff_name like concat('%',#{request.measurePerson},'%')
         </if>
-        <if test="request.calibrationTimeStart != null and request.calibrationTimeStart !=''">
+        <if test="request != null and request.calibrationTimeStart != null and request.calibrationTimeStart !=''">
             and bcr.calibration_time &gt;= #{request.calibrationTimeStart}
         </if>
-        <if test="request.calibrationTimeEnd != null and request.calibrationTimeEnd !=''">
+        <if test="request != null and request.calibrationTimeEnd != null and request.calibrationTimeEnd !=''">
             and bcr.calibration_time &lt;= #{request.calibrationTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceAssessMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceAssessMapper.xml
index d0fcf8b..c22c101 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceAssessMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceAssessMapper.xml
@@ -7,6 +7,8 @@
         <id column="id" property="id" />
         <result column="project_no" property="projectNo" />
         <result column="project_name" property="projectName" />
+        <result column="lab_code" property="labCode" />
+        <result column="group_code" property="groupCode" />
         <result column="applicant_id" property="applicantId" />
         <result column="applicant_name" property="applicantName" />
         <result column="applicant_time" property="applicantTime" />
@@ -31,7 +33,45 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, project_no, project_name, applicant_id, applicant_name, applicant_time, minio_file_name, remark, create_user_id, create_user_name, outsourcer_id, pre_start_time, pre_end_time, outsource_reason, pre_cost, approval_status, process_id, approve_situation, traceability, test_method, technique_ability, create_time, update_time
+        id, project_no, project_name, lab_code, group_code, applicant_id, applicant_name, applicant_time, minio_file_name, remark, create_user_id, create_user_name, outsourcer_id, pre_start_time, pre_end_time, outsource_reason, pre_cost, approval_status, process_id, approve_situation, traceability, test_method, technique_ability, create_time, update_time
     </sql>
 
+    <select id="selectMaxProjectNo" resultType="java.lang.Long">
+        SELECT IFNULL(max(RIGHT(project_no, 3)), 0) from biz_business_outsource_assess
+    </select>
+
+    <select id="selectBatchForApprovalList" resultMap="BaseResultMap">
+        SELECT bboa.*, bboi.outsourcer_name, bboi.director
+        FROM biz_business_outsource_assess bboa
+        LEFT JOIN biz_business_outsourcer_info bboi ON bboa.outsourcer_id = bboi.id
+        WHERE 1=1
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
+            and bboa.approval_status = #{request.approvalStatus}
+        </if>
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
+            and bboa.create_user_id = #{request.createUserId}
+        </if>
+        <if test="request != null and request.projectNo != null and request.projectNo !=''">
+            and bboa.project_no like concat('%',#{request.projectNo},'%')
+        </if>
+        <if test="request != null and request.outsourcerName != null and request.outsourcerName !=''">
+            and bboi.outsourcer_name like concat('%',#{request.outsourcerName},'%')
+        </if>
+        <if test="request != null and request.applicantName != null and request.applicantName !=''">
+            and bboa.applicant_name like concat('%',#{request.applicantName},'%')
+        </if>
+        <if test="request != null and request.applicantTimeStart != null and request.applicantTimeStart !=''">
+            and bboa.applicant_time &gt;= #{request.applicantTimeStart}
+        </if>
+        <if test="request != null and request.applicantTimeEnd != null and request.applicantTimeEnd !=''">
+            and bboa.applicant_time &lt;= #{request.applicantTimeEnd}
+        </if>
+        <if test="businessKeys != null">
+            and bboa.id in
+            <foreach collection="businessKeys" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
+        ORDER BY bboa.create_time DESC
+    </select>
 </mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceProtocolMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceProtocolMapper.xml
new file mode 100644
index 0000000..b7b2149
--- /dev/null
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceProtocolMapper.xml
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.mapper.business.BizBusinessOutsourceProtocolMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.business.BizBusinessOutsourceProtocol">
+        <id column="id" property="id" />
+        <result column="protocol_no" property="protocolNo" />
+        <result column="project_name" property="projectName" />
+        <result column="lab_code" property="labCode" />
+        <result column="group_code" property="groupCode" />
+        <result column="outsourcer_id" property="outsourcerId" />
+        <result column="remark" property="remark" />
+        <result column="outsource_no" property="outsourceNo" />
+        <result column="outsource_name" property="outsourceName" />
+        <result column="contacts" property="contacts" />
+        <result column="mobile" property="mobile" />
+        <result column="address" property="address" />
+        <result column="require_date" property="requireDate" />
+        <result column="outsource_cost" property="outsourceCost" />
+        <result column="director" property="director" />
+        <result column="item" property="item" />
+        <result column="requires" property="requires" />
+        <result column="create_user_id" property="createUserId" />
+        <result column="create_user_name" property="createUserName" />
+        <result column="approval_status" property="approvalStatus" />
+        <result column="process_id" property="processId" />
+        <result column="create_time" property="createTime" />
+        <result column="update_time" property="updateTime" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, protocol_no, project_name, lab_code, group_code, outsourcer_id, remark, outsource_no, outsource_name, contacts, mobile, address, require_date, outsource_cost, director, item, requires, create_user_id, create_user_name, approval_status, process_id, create_time, update_time
+    </sql>
+
+    <select id="selectMaxProtocolNo" resultType="java.lang.Long">
+        SELECT IFNULL(max(RIGHT(protocol_no, 3)), 0) from biz_business_outsource_protocol
+    </select>
+
+    <select id="selectBatchForApprovalList" resultMap="BaseResultMap">
+        SELECT *
+        FROM biz_business_outsource_protocol
+        WHERE 1=1
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
+            and approval_status = #{request.approvalStatus}
+        </if>
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
+            and create_user_id = #{request.createUserId}
+        </if>
+        <if test="request != null and request.protocolNo != null and request.protocolNo !=''">
+            and protocol_no like concat('%',#{request.protocolNo},'%')
+        </if>
+        <if test="request != null and request.outsourcerName != null and request.outsourcerName !=''">
+            and outsourcer_name like concat('%',#{request.outsourcerName},'%')
+        </if>
+        <if test="request != null and request.applicantName != null and request.applicantName !=''">
+            and create_user_name like concat('%',#{request.applicantName},'%')
+        </if>
+        <if test="request != null and request.applicantTimeStart != null and request.applicantTimeStart !=''">
+            and create_time &gt;= #{request.applicantTimeStart}
+        </if>
+        <if test="request != null and request.applicantTimeEnd != null and request.applicantTimeEnd !=''">
+            and create_time &lt;= #{request.applicantTimeEnd}
+        </if>
+        <if test="businessKeys != null">
+            and id in
+            <foreach collection="businessKeys" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
+        ORDER BY create_time DESC
+    </select>
+</mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourcerInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourcerInfoMapper.xml
index 510a80b..3049b54 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourcerInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourcerInfoMapper.xml
@@ -7,6 +7,8 @@
         <id column="id" property="id" />
         <result column="outsourcer_no" property="outsourcerNo" />
         <result column="outsourcer_name" property="outsourcerName" />
+        <result column="lab_code" property="labCode" />
+        <result column="group_code" property="groupCode" />
         <result column="outsourcer_brief_name" property="outsourcerBriefName" />
         <result column="outsourcer_size" property="outsourcerSize" />
         <result column="business_size" property="businessSize" />
@@ -55,32 +57,32 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, outsourcer_no, outsourcer_name, outsourcer_brief_name, outsourcer_size, business_size, grade, evaluation, tax_number, bank_account, bank_name, bank_account_number, postal_code, director, phone, fax, mobile, email, website, address_country, address_province, address_city, address_area, full_address, address_country_name, address_province_name, address_city_name, address_area_name, invoice_country, invoice_province, invoice_city, invoice_area, invoice_full_address, invoice_country_name, invoice_province_name, invoice_city_name, invoice_area_name, business_scope, business_content, minio_file_name, approval_status, process_id, remark, create_user_id, create_user_name, create_time, update_time
+        id, outsourcer_no, outsourcer_name, lab_code, group_code, outsourcer_brief_name, outsourcer_size, business_size, grade, evaluation, tax_number, bank_account, bank_name, bank_account_number, postal_code, director, phone, fax, mobile, email, website, address_country, address_province, address_city, address_area, full_address, address_country_name, address_province_name, address_city_name, address_area_name, invoice_country, invoice_province, invoice_city, invoice_area, invoice_full_address, invoice_country_name, invoice_province_name, invoice_city_name, invoice_area_name, business_scope, business_content, minio_file_name, approval_status, process_id, remark, create_user_id, create_user_name, create_time, update_time
     </sql>
 
     <select id="selectBatchForApprovalList" resultMap="BaseResultMap">
         SELECT *
         FROM biz_business_outsourcer_info
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.outsourcerNo != null and request.outsourcerNo !=''">
+        <if test="request != null and request.outsourcerNo != null and request.outsourcerNo !=''">
             and outsourcer_no like concat('%',#{request.outsourcerNo},'%')
         </if>
-        <if test="request.outsourcerName != null and request.outsourcerName !=''">
+        <if test="request != null and request.outsourcerName != null and request.outsourcerName !=''">
             and outsourcer_name like concat('%',#{request.outsourcerName},'%')
         </if>
-        <if test="request.director != null and request.director !=''">
+        <if test="request != null and request.director != null and request.director !=''">
             and director like concat('%',#{request.director},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
@@ -93,6 +95,6 @@
     </select>
 
     <select id="selectMaxNo" resultType="java.lang.Long">
-        SELECT IFNULL(max(RIGHT(outsourcer_no, 12)), 0) from biz_business_outsourcer_info
+        SELECT IFNULL(max(RIGHT(outsourcer_no, 3)), 0) from biz_business_outsourcer_info
     </select>
 </mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessSiteExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessSiteExecutiveInfoMapper.xml
index 135c5d0..3c5ae79 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessSiteExecutiveInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessSiteExecutiveInfoMapper.xml
@@ -38,25 +38,25 @@
         FROM biz_business_site_executive_info bsei
         LEFT JOIN biz_resource_customer_info rci ON bsei.customer_id = rci.id
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and bsei.approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and bsei.create_user_id = #{request.createUserId}
         </if>
-        <if test="request.siteExecutiveNo != null and request.siteExecutiveNo !=''">
+        <if test="request != null and request.siteExecutiveNo != null and request.siteExecutiveNo !=''">
             and bsei.site_executive_no like concat('%',#{request.siteExecutiveNo},'%')
         </if>
-        <if test="request.customerName != null and request.customerName !=''">
+        <if test="request != null and request.customerName != null and request.customerName !=''">
             and rci.outsourcer_name like concat('%',#{request.customerName},'%')
         </if>
-        <if test="request.applyName != null and request.applyName !=''">
+        <if test="request != null and request.applyName != null and request.applyName !=''">
             and bsei.apply_name like concat('%',#{request.applyName},'%')
         </if>
-        <if test="request.applyTimeStart != null and request.applyTimeStart !=''">
+        <if test="request != null and request.applyTimeStart != null and request.applyTimeStart !=''">
             and bsei.apply_time &gt;= #{request.applyTimeStart}
         </if>
-        <if test="request.applyTimeEnd != null and request.applyTimeEnd !=''">
+        <if test="request != null and request.applyTimeEnd != null and request.applyTimeEnd !=''">
             and bsei.apply_time &lt;= #{request.applyTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml
index 84d9e2a..6bd38a9 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml
@@ -105,6 +105,12 @@
         <if test="request.isUrgent != null and request.isUrgent !=''">
             AND bo.is_urgent = #{request.isUrgent}
         </if>
+        <if test="request.ids != null">
+            and blei.id in
+            <foreach collection="request.ids" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
         ORDER BY blei.update_time DESC
     </select>
 
@@ -137,6 +143,12 @@
         <if test="request.isUrgent != null and request.isUrgent !=''">
             AND bo.is_urgent = #{request.isUrgent}
         </if>
+        <if test="request.ids != null">
+            and blei.id in
+            <foreach collection="request.ids" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
         ORDER BY blei.update_time DESC
     </select>
 
diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardInfoMapper.xml
index 1a5551b..2ed8d17 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardInfoMapper.xml
@@ -45,12 +45,6 @@
         FROM biz_equipment_standard_info besi
         LEFT JOIN biz_equipment_standard_technology_relation bestr ON besi.standard_no = bestr.standard_no
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
-            and besi.approval_status = #{request.approvalStatus}
-        </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
-            and besi.create_user_id = #{request.createUserId}
-        </if>
         <if test="request.standardName != null and request.standardName !=''">
             and besi.standard_name like concat('%',#{request.standardName},'%')
         </if>
diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardTechnologyRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardTechnologyRelationMapper.xml
index fc7e16c..cd03c8c 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardTechnologyRelationMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardTechnologyRelationMapper.xml
@@ -6,6 +6,7 @@
     <resultMap id="BaseResultMap" type="com.casic.missiles.model.equipment.BizEquipmentStandardTechnologyRelation">
         <id column="id" property="id" />
         <result column="technology_file_id" property="technologyFileId" />
+        <result column="technology_file_no" property="technologyFileNo" />
         <result column="technology_file_name" property="technologyFileName" />
         <result column="standard_id" property="standardId" />
         <result column="standard_no" property="standardNo" />
@@ -14,7 +15,7 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, technology_file_id, technology_file_name, standard_id, remark
+        id, technology_file_id, technology_file_no, technology_file_name, standard_id, remark
     </sql>
 
 </mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceAuthorizeOrderMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceAuthorizeOrderMapper.xml
index ac5176c..554fe65 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceAuthorizeOrderMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceAuthorizeOrderMapper.xml
@@ -32,22 +32,22 @@
         SELECT *
         FROM biz_resource_authorize_order
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.orderNo != null and request.orderNo !=''">
+        <if test="request != null and request.orderNo != null and request.orderNo !=''">
             and order_no like concat('%',#{request.orderNo},'%')
         </if>
-        <if test="request.createUserName != null and request.createUserName !=''">
+        <if test="request != null and request.createUserName != null and request.createUserName !=''">
             and create_user_name like concat('%',#{request.createUserName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java
index bb0c50f..13a699b 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java
@@ -12,6 +12,7 @@
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.IGeneralApprovalService;
+import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
@@ -19,6 +20,7 @@
 import org.springframework.web.bind.annotation.RequestBody;
 
 import javax.validation.Valid;
+import java.util.List;
 import java.util.Objects;
 
 /**
@@ -117,4 +119,17 @@
         }
         return baseApprovalService.failUpdate(request);
     }
+
+    public List<O> exportList(@RequestBody @Valid R request) throws Exception {
+        List<O> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = baseApprovalService.listExportByIds(request.getIds());
+        } else {
+            list = baseApprovalService.listExport(request);
+        }
+        for (O record : list) {
+            DictCodeUtils.convertDictCodeToName(record);
+        }
+        return list;
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java
index 8a90961..d775831 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java
@@ -5,6 +5,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.business.certificate.CertificateChangeApplyApprovalListRequest;
 import com.casic.missiles.dto.business.certificate.CertificateChangeApplySaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessCertificateChangeApply;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
@@ -20,6 +21,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -48,4 +50,12 @@
         }
         return changeApplyService.saveChangeApply(request);
     }
+
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody CertificateChangeApplyApprovalListRequest request) throws Exception {
+        List<BizBusinessCertificateChangeApply> list = super.exportList(request);
+        super.exportExcel(BizBusinessCertificateChangeApply.class, list, ExportEnum.CERTIFICATE_CHANGE_APPLY.getSheetName());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java
index 5fc4b07..af8230e 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java
@@ -9,6 +9,7 @@
 import com.casic.missiles.dto.business.certificate.CertificatePrintApprovalListRequest;
 import com.casic.missiles.dto.business.certificate.CertificatePrintListResponse;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.enums.business.CertificatePrintStatusEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessCertificatePrintLog;
@@ -18,10 +19,16 @@
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.io.IOException;
+import java.util.List;
 import java.util.Objects;
 
 /**
@@ -98,4 +105,16 @@
         });
         return certificatePrintService.certificatePrintLog(idDTO.getId());
     }
+
+    @ApiOperation("证书打印审批导出")
+    @PostMapping("/listExport")
+    public void exportList(@RequestBody CertificatePrintApprovalListRequest request) throws IOException {
+        List<CertificatePrintListResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = certificatePrintService.listByIds(request.getIds());
+        } else {
+            list = certificatePrintService.list(request);
+        }
+        super.exportExcel(CertificatePrintListResponse.class, list, ExportEnum.CERTIFICATE_PRINT.getSheetName());
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java
index 63b06dc..6b2efd5 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java
@@ -6,6 +6,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.business.certificate.CertificateReportApprovalListRequest;
 import com.casic.missiles.dto.business.certificate.CertificateReportSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessCertificateReport;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
@@ -21,6 +22,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -50,7 +52,7 @@
         return certificateReportService.saveCertificateReport(request);
     }
 
-    @ApiOperation("证书审批详情（基本信息）")
+    @ApiOperation("详情（基本信息）")
     @PostMapping("/detail")
     public ReturnDTO<BizBusinessCertificateReport> detail(@RequestBody @Valid BaseDetailRequest request, BindingResult bindingResult) throws Exception {
         if(bindingResult.hasErrors()){
@@ -59,4 +61,11 @@
         return certificateReportService.detail(request);
     }
 
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody CertificateReportApprovalListRequest request) throws Exception {
+        List<BizBusinessCertificateReport> list = super.exportList(request);
+        super.exportExcel(BizBusinessCertificateReport.class, list, ExportEnum.CERTIFICATE_REPORT.getSheetName());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java
index 46b26bd..57c0809 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java
@@ -10,20 +10,21 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.business.identify.IdentifyListRequest;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessIdentifyInfo;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.business.IBizBusinessIdentifyInfoService;
+import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import javax.validation.Valid;
+import java.util.List;
 import java.util.Objects;
 
 /**
@@ -57,16 +58,13 @@
         return identifyInfoService.addIdentify(identifyInfo);
     }
 
-    @ApiOperation("标识打印更新")
+    @ApiOperation("标识打印更新（更新打印时间）")
     @PostMapping("/update")
-    public ReturnDTO updateIdentify(@RequestBody @Valid BizBusinessIdentifyInfo identifyInfo, BindingResult bindingResult) {
-        Assert.isFalse(Objects.isNull(identifyInfo.getId()), () -> {
+    public ReturnDTO updateIdentify(@RequestBody @Valid IdDTO idDTO) {
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        Assert.isFalse(bindingResult.hasErrors(), () -> {
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        });
-        return identifyInfoService.updateIdentify(identifyInfo);
+        return identifyInfoService.updateIdentify(idDTO.getId());
     }
 
     @ApiOperation("标识打印删除")
@@ -77,4 +75,37 @@
         });
         return identifyInfoService.deleteIdentify(idDTO.getId());
     }
+
+    @ApiOperation("标识打印导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody @Valid IdentifyListRequest request, BindingResult bindingResult) throws Exception {
+        if (bindingResult.hasErrors()) {
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        List<BizBusinessIdentifyInfo> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = identifyInfoService.listByIds(request.getIds());
+        } else {
+            list = identifyInfoService.list(request);
+        }
+        for (BizBusinessIdentifyInfo record : list) {
+            DictCodeUtils.convertDictCodeToName(record);
+        }
+        super.exportExcel(BizBusinessIdentifyInfo.class, list, ExportEnum.IDENTIFY_EXPORT.getSheetName());
+    }
+
+
+    // TODO: 2023/8/23 查询设备信息，4个底部按钮查设备（按钮的作用就是前端用来调不同接口、用来区分中间即将展示的标识），前端弹窗选设备，在确定保存时前端根据底部按钮判断传入设备类型deviceType字典code
+    // TODO: 2023/8/23 接口：查受检设备（第1个按钮），查设备台账（后3个按钮同一接口），查询之后前端根据标志类型的不同加到中间页面时进行判断（按产品给的对应表）
+    // TODO: 2023/8/23 提供二维码接口，前端在加到中间页面时调用一下
+
+    @ApiOperation("设备二维码")
+    @PostMapping("/equipment/qrCode")
+    public ReturnDTO<String> equipmentQrCode(@RequestBody @Valid IdDTO idDTO) {
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return identifyInfoService.equipmentQrCode(idDTO.getId());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java
index 707be6e..7e0453d 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java
@@ -117,7 +117,7 @@
     }
 
     @ApiOperation("任务单导出")
-    @PostMapping("/export")
+    @PostMapping("/listExport")
     public void orderExport(@RequestBody @Valid OrderListRequest request, HttpServletResponse response) {
         businessOrderService.orderExport(request, response);
     }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java
index 529a6ce..51432be 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java
@@ -1,9 +1,28 @@
 package com.casic.missiles.controller.business;
 
+import com.casic.missiles.controller.GeneralApprovalController;
+import com.casic.missiles.dto.BaseApprovalSubmitRequest;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.business.outsource.OutsourceAssessApprovalListRequest;
+import com.casic.missiles.dto.business.outsource.OutsourceAssessSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
+import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.model.business.BizBusinessOutsourceAssess;
+import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
+import com.casic.missiles.service.IGeneralApprovalService;
+import com.casic.missiles.service.business.IBizBusinessOutsourceAssessService;
 import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.BindingResult;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.validation.Valid;
+import java.util.List;
+
 /**
  * <p>
  * 计量检定业务-分包管理-测试、校准或检定工作分包评审表 前端控制器
@@ -15,6 +34,27 @@
 @Api(tags = "分包管理-测试、校准或检定工作分包评审表")
 @RestController
 @RequestMapping("/business/outsource/assess")
-public class BizBusinessOutsourceAssessController {
+public class BizBusinessOutsourceAssessController extends GeneralApprovalController<BizBusinessOutsourceAssess, BizBusinessOutsourceAssess, OutsourceAssessApprovalListRequest, BaseApprovalSubmitRequest> {
+    @Autowired
+    private IBizBusinessOutsourceAssessService outsourceAssessService;
 
+    public BizBusinessOutsourceAssessController(IGeneralApprovalService<BizBusinessOutsourceAssess, BizBusinessOutsourceAssess, OutsourceAssessApprovalListRequest, BaseApprovalSubmitRequest> baseApprovalService) {
+        super(baseApprovalService);
+    }
+
+    @ApiOperation("草稿箱-保存")
+    @PostMapping("/save")
+    public ReturnDTO<OutsourceAssessSaveResponse> saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceAssess request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        return outsourceAssessService.saveOutsourceAssess(request);
+    }
+
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception {
+        List<BizBusinessOutsourceAssess> list = super.exportList(request);
+        super.exportExcel(BizBusinessOutsourceAssess.class, list, ExportEnum.OUTSOURCE_ASSESS.getSheetName());
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java
new file mode 100644
index 0000000..9adef18
--- /dev/null
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java
@@ -0,0 +1,60 @@
+package com.casic.missiles.controller.business;
+
+import com.casic.missiles.controller.GeneralApprovalController;
+import com.casic.missiles.dto.BaseApprovalSubmitRequest;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.business.outsource.OutsourceProtocolApprovalListRequest;
+import com.casic.missiles.dto.business.outsource.OutsourceProtocolSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
+import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.model.business.BizBusinessOutsourceProtocol;
+import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
+import com.casic.missiles.service.IGeneralApprovalService;
+import com.casic.missiles.service.business.IBizBusinessOutsourceProtocolService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.BindingResult;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.validation.Valid;
+import java.util.List;
+
+/**
+ * <p>
+ * 计量检定业务-分包管理-测试、校准或检定工作分包协议书 前端控制器
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-08-24
+ */
+@Api(tags = "分包管理-测试、校准或检定工作分包协议书")
+@RestController
+@RequestMapping("/business/outsource/protocol")
+public class BizBusinessOutsourceProtocolController extends GeneralApprovalController<BizBusinessOutsourceProtocol, BizBusinessOutsourceProtocol, OutsourceProtocolApprovalListRequest, BaseApprovalSubmitRequest> {
+    @Autowired
+    private IBizBusinessOutsourceProtocolService outsourceProtocolService;
+
+    public BizBusinessOutsourceProtocolController(IGeneralApprovalService<BizBusinessOutsourceProtocol, BizBusinessOutsourceProtocol, OutsourceProtocolApprovalListRequest, BaseApprovalSubmitRequest> baseApprovalService) {
+        super(baseApprovalService);
+    }
+
+    @ApiOperation("草稿箱-保存")
+    @PostMapping("/save")
+    public ReturnDTO<OutsourceProtocolSaveResponse> saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceProtocol request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        return outsourceProtocolService.saveOutsourceProtocol(request);
+    }
+
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody OutsourceProtocolApprovalListRequest request) throws Exception {
+        List<BizBusinessOutsourceProtocol> list = super.exportList(request);
+        super.exportExcel(BizBusinessOutsourceProtocol.class, list, ExportEnum.OUTSOURCE_PROTOCOL.getSheetName());
+    }
+}
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java
index 097f645..f0f0943 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java
@@ -17,7 +17,6 @@
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.IGeneralApprovalService;
 import com.casic.missiles.service.business.IBizBusinessOutsourcerInfoService;
-import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -71,19 +70,8 @@
 
     @ApiOperation("分包方导出")
     @PostMapping("/listExport")
-    public void export(@RequestBody @Valid OutsourcerInfoApprovalListRequest request, BindingResult bindingResult) throws Exception {
-        if (bindingResult.hasErrors()) {
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        }
-        List<BizBusinessOutsourcerInfo> list;
-        if (!CollectionUtils.isEmpty(request.getIds())) {
-            list = outsourcerInfoService.listByIds(request.getIds());
-        } else {
-            list = outsourcerInfoService.list(request);
-        }
-        for (BizBusinessOutsourcerInfo record : list) {
-            DictCodeUtils.convertDictCodeToName(record);
-        }
+    public void export(@RequestBody OutsourcerInfoApprovalListRequest request) throws Exception {
+        List<BizBusinessOutsourcerInfo> list = super.exportList(request);
         super.exportExcel(BizBusinessOutsourcerInfo.class, list, ExportEnum.OUTSOURCER_EXPORT.getSheetName());
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java
index c2cbf9f..0410918 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java
@@ -17,11 +17,9 @@
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.IGeneralApprovalService;
 import com.casic.missiles.service.business.IBizBusinessSiteExecutiveInfoService;
-import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -60,7 +58,7 @@
         return siteExecutiveInfoService.saveSiteExecutiveInfo(siteExecutiveInfo);
     }
 
-    @ApiOperation("现场检测详情")
+    @ApiOperation("详情")
     @PostMapping("/detail")
     public ReturnDTO<SiteExecutiveDetailResponse> siteExecutiveDetail(@RequestBody @Valid IdDTO idDTO) throws Exception {
         Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
@@ -69,21 +67,10 @@
         return ReturnUtil.success(siteExecutiveInfoService.detail(idDTO.getId()));
     }
 
-    @ApiOperation("现场检测导出")
+    @ApiOperation("导出")
     @PostMapping("/listExport")
-    public void export(@RequestBody @Valid SiteExecutiveApprovalListRequest request, BindingResult bindingResult) throws Exception {
-        if (bindingResult.hasErrors()) {
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        }
-        List<SiteExecutiveApprovalListResponse> list;
-        if (!CollectionUtils.isEmpty(request.getIds())) {
-            list = siteExecutiveInfoService.listInfoByIds(request.getIds());
-        } else {
-            list = siteExecutiveInfoService.listInfo(request);
-        }
-        for (SiteExecutiveApprovalListResponse record : list) {
-            DictCodeUtils.convertDictCodeToName(record);
-        }
+    public void export(@RequestBody SiteExecutiveApprovalListRequest request) throws Exception {
+        List<SiteExecutiveApprovalListResponse> list = super.exportList(request);
         super.exportExcel(SiteExecutiveApprovalListResponse.class, list, ExportEnum.SITE_EXECUTIVE_EXPORT.getSheetName());
     }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
index 7e793cd..a92e209 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
@@ -55,7 +55,7 @@
 
     @ApiOperation("设备收发列表导出")
     @PostMapping("/export")
-    public void exportList(@RequestBody @Valid SampleDispatchListRequest request) throws IOException {
+    public void exportList(@RequestBody SampleDispatchListRequest request) throws IOException {
         List<SampleDispatchListResponse> list;
         if (!CollectionUtils.isEmpty(request.getIds())) {
             list = dispatchService.listByIds(request.getIds());
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java
index cdc77fc..d120fd4 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java
@@ -7,6 +7,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.business.labExecutive.*;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.business.IBusinessLabExecutiveInfoService;
@@ -14,6 +15,7 @@
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.*;
 
@@ -32,7 +34,7 @@
     @Autowired
     private IBusinessLabExecutiveInfoService labExecutiveInfoService;
 
-    @ApiOperation("实验室检测-部门检测-查询各状态列表（待检测、检测中、检测完）")
+    @ApiOperation("实验室任务-查询各状态列表（待检测、检测中、检测完）")
     @PostMapping("/deptExecutive/List")
     public ReturnDTO<PageInfoBT<SampleLabExecutiveListResponse>> queryDeptExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
@@ -43,10 +45,19 @@
         return ReturnUtil.success(super.packForBT(labExecutiveInfoService.deptLabExecutiveListPage(page, labExecutiveListRequest)));
     }
 
-    /**
-     * 实验室检测-我的检测-查询各状态列表（待检测、检测中、检测完）
-     */
-    @ApiOperation("实验室检测-我的检测-查询各状态列表（待检测、检测中、检测完）")
+    @ApiOperation("实验室任务导出")
+    @PostMapping("/deptExecutive/export")
+    public void deptExportList(@RequestBody @Valid SampleLabExecutiveListRequest request) throws Exception {
+        List<SampleLabExecutiveListResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = labExecutiveInfoService.deptLabExecutiveListByIds(request.getMeasureStatus(), request.getIds());
+        } else {
+            list = labExecutiveInfoService.deptLabExecutiveList(request);
+        }
+        super.exportExcel(SampleLabExecutiveListResponse.class, list, ExportEnum.DEPT_EXECUTIVE_TASK.getSheetName());
+    }
+
+    @ApiOperation("我的任务-查询各状态列表（待检测、检测中、检测完）")
     @PostMapping("/myExecutive/list")
     public ReturnDTO<PageInfoBT<SampleLabExecutiveListResponse>> queryMyExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
@@ -57,19 +68,25 @@
         return ReturnUtil.success(super.packForBT(labExecutiveInfoService.myLabExecutiveListPage(page, labExecutiveListRequest)));
     }
 
-    /**
-     * 实验室检测-我的检测-查询各状态样品数量（待检测、检测中、检测完）
-     */
-    @ApiOperation("实验室检测-我的检测-查询各状态样品数量（待检测、检测中、检测完）")
+    @ApiOperation("我的任务导出")
+    @PostMapping("/myExecutive/export")
+    public void exportList(@RequestBody @Valid SampleLabExecutiveListRequest request) throws Exception {
+        List<SampleLabExecutiveListResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = labExecutiveInfoService.myLabExecutiveListByIds(request.getMeasureStatus(), request.getIds());
+        } else {
+            list = labExecutiveInfoService.myLabExecutiveList(request);
+        }
+        super.exportExcel(SampleLabExecutiveListResponse.class, list, ExportEnum.MY_EXECUTIVE_TASK.getSheetName());
+    }
+
+    @ApiOperation("我的任务-查询各状态样品数量（待检测、检测中、检测完）")
     @GetMapping("/myExecutive/amount")
     public ReturnDTO<List<SampleAmountResponse>> queryMyExecutiveAmount() {
         return ReturnUtil.success(labExecutiveInfoService.myExecutiveAmount());
     }
 
-    /**
-     * 实验室检测-部门检测-分配（分配给具体人员）
-     */
-    @ApiOperation("实验室检测-部门检测-分配按钮（分配给具体人员）")
+    @ApiOperation("实验室任务-分配按钮（分配给具体人员）")
     @PostMapping("/deptExecutive/allocate")
     public ReturnDTO allocateStaff(@RequestBody @Valid SampleAllocateRequest sampleAllocateRequest, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -78,10 +95,7 @@
         return labExecutiveInfoService.allocateStaff(sampleAllocateRequest);
     }
 
-    /**
-     * 实验室检测-我的检测-检定人扫描收入（待检测->检测中）
-     */
-    @ApiOperation("实验室检测-我的检测-检定人扫描收入（待检测->检测中）")
+    @ApiOperation("我的任务-检定人扫描收入（待检测->检测中）")
     @PostMapping("/myExecutive/receive")
     public ReturnDTO sampleReceive(@RequestBody @Valid List<SampleOperateRequest> requestList, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -90,10 +104,7 @@
         return labExecutiveInfoService.sampleReceive(requestList);
     }
 
-    /**
-     * 实验室检测-负责人/检定人扫描检完（检测中->检测完）
-     */
-    @ApiOperation("实验室检测-负责人/检定人扫描检完（检测中->检测完）")
+    @ApiOperation("实验室任务-负责人/检定人扫描检完（检测中->检测完）")
     @PostMapping("/myExecutive/complete")
     public ReturnDTO sampleExecutiveComplete(@RequestBody @Valid List<SampleOperateRequest> requestList, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -102,10 +113,7 @@
         return labExecutiveInfoService.sampleExecutiveComplete(requestList);
     }
 
-    /**
-     * 实验室检测-部门检测/我的检测 编辑（只能修改应出具证书）
-     */
-    @ApiOperation("实验室检测-部门检测/我的检测 编辑（只能修改应出具证书）")
+    @ApiOperation("实验室任务/我的任务 编辑（只能修改应出具证书）")
     @PostMapping("/executive/update")
     public ReturnDTO updateExecutive(@RequestBody @Valid UpdateExecutiveRequest request, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -114,10 +122,7 @@
         return labExecutiveInfoService.updateExecutive(request);
     }
 
-    /**
-     * 实验室检测-部门检测/我的检测 详情
-     */
-    @ApiOperation("实验室检测-部门检测/我的检测 详情")
+    @ApiOperation("实验室任务/我的任务 详情")
     @PostMapping("/executive/detail")
     public ReturnDTO<ExecutiveDetailResponse> executiveDetail(@RequestBody @Valid ExecutiveDetailRequest request, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
@@ -131,7 +136,7 @@
      * 退回后会将下一个要执行的实验室检测状态更新为待分配，将后面的实验室顺序变更为连续（都进行减1）
      * 最后一个检测的实验室退回，等分发员再增加实验室或设备收发中的已收入直接手动点击完成
      */
-    @ApiOperation("实验室检测-部门检测/我的检测 退回（待检测/检测中->退回）")
+    @ApiOperation("实验室任务/我的任务 退回（待检测/检测中->退回）")
     @PostMapping("/executive/sendBack")
     public ReturnDTO executiveSendBack(@RequestBody @Valid ExecutiveSendBackRequest request, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -140,9 +145,6 @@
         return labExecutiveInfoService.sampleExecutiveSendBack(request);
     }
 
-    /**
-     * 分发员编辑实验室检测列表
-     */
     @ApiOperation("分发员编辑实验室检测列表")
     @PostMapping("/handOut/updateList")
     public ReturnDTO updateExecutiveList(@RequestBody @Valid UpdateExecutiveListRequest request, BindingResult bindingResult) {
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java
index 48a67ed..0c04f31 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java
@@ -10,6 +10,7 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.resource.customer.CustomerApprovalListRequest;
 import com.casic.missiles.dto.resource.customer.CustomerSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceCustomerInfo;
@@ -26,6 +27,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -55,6 +57,13 @@
         return customerInfoService.saveCustomerInfo(request);
     }
 
+    @ApiOperation("委托方名录导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody CustomerApprovalListRequest request) throws Exception {
+        List<BizResourceCustomerInfo> list = super.exportList(request);
+        super.exportExcel(BizResourceCustomerInfo.class, list, ExportEnum.CUSTOMER_INFO.getSheetName());
+    }
+
     @ApiOperation("委托方人员列表（分页）")
     @PostMapping("/person/listPage")
     public ReturnDTO<PageInfoBT<BizResourceCustomerStaff>> personListPage(@RequestBody IdDTO idDto) {
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
index 972ed4b..6418ea5 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
@@ -5,6 +5,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.resource.customer.SuggestFormApprovalListRequest;
 import com.casic.missiles.dto.resource.customer.SuggestFormSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceCustomerSuggestForm;
@@ -20,6 +21,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -50,4 +52,11 @@
         return suggestFormService.saveSuggestForm(request);
     }
 
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody SuggestFormApprovalListRequest request) throws Exception {
+        List<BizResourceCustomerSuggestForm> list = super.exportList(request);
+        super.exportExcel(BizResourceCustomerSuggestForm.class, list, ExportEnum.CUSTOMER_SUGGEST_FORM.getSheetName());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java
index 1934d1a..9e07eab 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java
@@ -15,12 +15,16 @@
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.resource.IEnvEnvironmentRecordConfigService;
 import com.casic.missiles.service.resource.IEnvEnvironmentRecordDataService;
+import com.casic.missiles.service.resource.IEnvLocationInfoService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
 import java.util.List;
@@ -39,6 +43,8 @@
     private IEnvEnvironmentRecordDataService environmentRecordDataService;
     @Autowired
     private IEnvEnvironmentRecordConfigService environmentRecordConfigService;
+    @Autowired
+    private IEnvLocationInfoService locationInfoService;
 
     @ApiOperation("环境记录单数据列表/详情")
     @PostMapping("/data/listPage")
@@ -95,4 +101,11 @@
         });
         return environmentRecordConfigService.deleteEnvironmentRecordConfig(idDTO.getId());
     }
+
+    @ApiOperation("地点列表")
+    @PostMapping("/location/listPage")
+    public ReturnDTO<PageInfoBT<LocationListResponse>> locationListPage(@RequestBody @Valid LocationListRequest request) {
+        Page<LocationListResponse> page = PageFactory.defaultPage();
+        return ReturnUtil.success(super.packForBT(locationInfoService.listPage(page, request)));
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java
index 82efe3f..e9561fa 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java
@@ -10,6 +10,7 @@
 import com.casic.missiles.dto.resource.seal.SealLogListRequest;
 import com.casic.missiles.dto.resource.seal.SealNoteApprovalListRequest;
 import com.casic.missiles.dto.resource.seal.SealNoteSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceSealUseLog;
@@ -27,6 +28,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -58,6 +60,13 @@
         return sealUseNoteService.saveSeal(request);
     }
 
+    @ApiOperation("印章使用登记导出（列表和导出中去掉经办人和监印人）")
+    @PostMapping("/listExport")
+    public void export(@RequestBody SealNoteApprovalListRequest request) throws Exception {
+        List<BizResourceSealUseNote> list = super.exportList(request);
+        super.exportExcel(BizResourceSealUseNote.class, list, ExportEnum.SEAL_NOTE.getSheetName());
+    }
+
     // TODO: 2023/7/28 印章使用日志：系统中使用印章时插入数据库
 
     @ApiOperation("印章使用日志列表（分页）")
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java
index 9b674fc..06b6521 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java
@@ -9,16 +9,20 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.resource.staff.StaffCertRequest;
 import com.casic.missiles.dto.resource.staff.StaffCertResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.service.resource.IBizResourceStaffInfoService;
 import com.casic.missiles.service.resource.IBizResourceStaffVerifierService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.List;
+
 /**
  * @Description:
  * @Author: wangpeng
@@ -41,9 +45,21 @@
         return ReturnUtil.success(super.packForBT(responsePage));
     }
 
+    @ApiOperation("证书逾期提醒导出")
+    @PostMapping("/listExport")
+    public void exportList(@RequestBody StaffCertRequest request) throws Exception {
+        List<StaffCertResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = staffInfoService.certListByIds(request.getIds());
+        } else {
+            list = staffInfoService.certList(request);
+        }
+        super.exportExcel(StaffCertResponse.class, list, ExportEnum.STAFF_CERTIFICATE_EXPIRE.getSheetName());
+    }
+
     @ApiOperation("证书逾期提醒")
     @PostMapping("/expirationReminder")
-    public ReturnDTO expirationReminder(@RequestBody IdDTO idDto) {
-        return verifierService.expirationReminder(idDto);
+    public ReturnDTO expirationReminder(@RequestBody IdDTO idDTO) {
+        return verifierService.expirationReminder(idDTO);
     }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java
index 3b251ad..a6e7850 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java
@@ -12,6 +12,7 @@
 import com.casic.missiles.dto.resource.staff.StaffListRequest;
 import com.casic.missiles.dto.resource.staff.TrainListRequest;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.*;
@@ -22,7 +23,10 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
 import java.util.List;
@@ -52,8 +56,19 @@
             throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
         }
         Page<BizResourceStaffInfo> page = PageFactory.defaultPage();
-        Page<BizResourceStaffInfo> responsePage = staffInfoService.listPage(page, request);
-        return ReturnUtil.success(super.packForBT(responsePage));
+        return ReturnUtil.success(super.packForBT(staffInfoService.listPage(page, request)));
+    }
+
+    @ApiOperation("人员登记导出")
+    @PostMapping("/listExport")
+    public void exportList(@RequestBody StaffListRequest request) throws Exception {
+        List<BizResourceStaffInfo> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = staffInfoService.listByIds(request.getIds());
+        } else {
+            list = staffInfoService.list(request);
+        }
+        super.exportExcel(BizResourceStaffInfo.class, list, ExportEnum.STAFF_INFO.getSheetName());
     }
 
     @ApiOperation("人员登记详情基础信息")
@@ -85,9 +100,9 @@
 
     @ApiOperation("科研教育列表（分页）")
     @PostMapping("/education/listPage")
-    public ReturnDTO<PageInfoBT<BizResourceStaffEducation>> educationListPage(@RequestBody IdDTO idDto) {
+    public ReturnDTO<PageInfoBT<BizResourceStaffEducation>> educationListPage(@RequestBody IdDTO idDTO) {
         Page<BizResourceStaffEducation> page = PageFactory.defaultPage();
-        Page<BizResourceStaffEducation> responsePage = staffInfoService.educationListPage(page, idDto);
+        Page<BizResourceStaffEducation> responsePage = staffInfoService.educationListPage(page, idDTO);
         return ReturnUtil.success(super.packForBT(responsePage));
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java
index af6aa86..d85d84a 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java
@@ -9,6 +9,7 @@
 import com.casic.missiles.dto.resource.outsideService.SupplierApprovalListRequest;
 import com.casic.missiles.dto.resource.outsideService.SupplierSaveResponse;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceSupplierAbility;
@@ -67,6 +68,13 @@
         return ReturnUtil.success(supplierInfoService.detail(idDTO.getId()));
     }
 
+    @ApiOperation("合格供方导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody SupplierApprovalListRequest request) throws Exception {
+        List<BizResourceSupplierInfo> list = super.exportList(request);
+        super.exportExcel(BizResourceSupplierInfo.class, list, ExportEnum.SUPPLIER_INFO.getSheetName());
+    }
+
     @ApiOperation("供方人员列表（分页）")
     @PostMapping("/person/listPage")
     public ReturnDTO<PageInfoBT<BizResourceSupplierPerson>> personListPage(@RequestBody IdDTO idDTO) {
diff --git a/casic-metering-api/src/main/resources/config/application.yml b/casic-metering-api/src/main/resources/config/application.yml
index 350db5f..ecff521 100644
--- a/casic-metering-api/src/main/resources/config/application.yml
+++ b/casic-metering-api/src/main/resources/config/application.yml
@@ -126,7 +126,7 @@
     #作者
     author: wangpeng
     #待生成对象表名
-    table-name: biz_equipment_technical_target_approval,biz_equipment_attachment_approval,biz_equipment_checkpoint_approval
+    table-name: biz_business_outsource_protocol
 
 reminder:
   #节点--common模块config包 ReminderNodeConfig配置
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
index 4a19e4e..d47d552 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
@@ -53,6 +53,7 @@
     SUGGEST_FORM_SAVE_FAILED(2509, "委托方意见登记表保存至草稿箱失败"),
     EXAMINE_FORM_SAVE_FAILED(2510, "要求、委托书及合同评审表保存至草稿箱失败"),
     CUSTOMER_EXIST_SAVE_FAILED(2511, "该委托方已存在，请重新选择"),
+    DUPLICATE_LOCATION_NO(2512, "地点编号已存在"),
 
     /**
      * 计量检定业务模块
@@ -68,6 +69,8 @@
     COMPLETE_SAMPLE_NOT_EXIST(2609, "检测中不存在扫描收入的样品"),
     CANNOT_CHANGE_MEASURE_INFO(2610, "无法更改非当前登录用户的检测信息"),
     NON_EXIST_ORDER_OR_SAMPLE(2611, "不存在该委托单或该委托单下的样品"),
+    OUTSOURCE_ACCESS_SAVE_FAILED(2612, "测试、校准或检定工作分包评审表保存至草稿箱失败"),
+    OUTSOURCE_PROTOCOL_SAVE_FAILED(2613, "测试、校准或检定工作分包协议书保存至草稿箱失败"),
 
     /**
      * 历史遗留备用
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
index 5089ad1..81a406b 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
@@ -10,54 +10,38 @@
     /**
      * 资源管理
      */
-    ENVIRONMENT_DATA_EXPORT("environmentData", "environmentData", "环境记录单数据"),
+    ENVIRONMENT_DATA_EXPORT("environmentData", "环境记录单数据", "环境记录单数据"),
+    STAFF_INFO("staffInfo", "人员登记", "人员登记"),
+    STAFF_CERTIFICATE_EXPIRE("certificateExpire", "证书逾期提醒", "证书逾期提醒"),
+    SUPPLIER_INFO("supplierInfo", "合格供方名录", "合格供方名录"),
+    CUSTOMER_INFO("customerInfo", "委托方名录", "委托方名录"),
+    CUSTOMER_SUGGEST_FORM("customerSuggestForm", "委托方意见登记表", "委托方意见登记表"),
+    SEAL_NOTE("sealNote", "印章使用登记", "印章使用登记"),
 
-    FILE_EXPORT("meterFileData", "meterFileData", "计量文件信息"),
-    TRAIN_PLAN_EXPORT("trainPlanData", "trainPlanData", "培训计划"),
-    TRAIN_LOG_EXPORT("trainLogData", "trainLogData", "培训记录"),
-    METER_ORGANIZE_EXPORT("meterOrganizeData", "meterOrganizeData", "计量组织"),
-    TRACE_SUPPLIER_EXPORT("traceSupplierData", "traceSupplierData", "溯源供方"),
-    SIGN_EXPORT("signData", "signData", "签名/签章"),
-    TEMPLATE_EXPORT("templateData", "templateData", "原始记录模板/证书报告模板"),
-    FIXED_ASSETS("meterFixedAssets", "meterFixedAssets", "固定资产"),
-    METER_EQUIPMENT("meterEquipment", "meterEquipment", "测量设备"),
-    CALIBRATION_TEST_EQUIPMENT("calibrationTestEquipment", "calibrationTestEquipment", "校准检定设备"),
-    MEASURE_ACCOUNT("measureAccount", "measureAccount", "测量工装"),
-    STANDARD_SUPPORT_EQUIPMENT("standardSupportEquipment", "standardSupportEquipment", "标准配套设备"),
-    STANDARD_EQUIPMENT("standardEquipment", "standardEquipment", "标准装置"),
-    FLOW_DEF_EXPORT("flowDefData", "flowDefData", "流程定义"),
-    STAFF_CERTIFICATE("certificate", "certificate", "计量人员证书"),
-    CHECK_INFO("checkInfo", "checkInfo", "设备管理点检测"),
-    EQUIPMENT_APPLY("equipmentApply", "equipmentApply", "设备借用"),
-    STANDARD_EQUIPMENT_REMIND("equipmentApplyRemind", "equipmentApplyRemind", "标准装置到期提醒"),
-    METER_PRICE("meterPrice", "meterPrice", "价格库"),
-    METER_STAFF("meterStaff", "meterStaff", "计量人员"),
-    STANDARD_EQUIPMENT_APPLY("standardEquipmentApply", "standardEquipmentApply", "标准装置申请"),
-    STATE_MANAGE_APPLY("stateManage", "stateManage", "状态管理"),
-    METER_ACCEPTANCE_CHECK("acceptanceCheck", "acceptanceCheck", "设备检修保养验收单"),
-    CUSTOMER_EXPORT("customerData", "customerData", "客户信息"),
-    ORDER_EXPORT("orderData", "orderData", "委托书信息"),
-    SAMPLE_EXPORT("sampleData", "sampleData", "样本信息"),
-    EXCHANGE_DATA("exchangeData", "exchangeData", "设备交接单"),
-    DISPATCH_DATA("dispatchData", "dispatchData", "设备收发"),
-    ENVIRONMENT_DATA("environmentData", "environmentData", "环境记录单"),
-    ORIGIN_DATA("originData", "originData", "原始记录"),
-    CERTIFICATE_REPORT("certificateReport", "certificateReport", "证书报告"),
-    ADVICE_EXPORT("adviceData", "adviceData", "客户反馈"),
-    HANDOUT_EXPORT("handoutData", "handoutData", "任务分发列表"),
-    OUTSOURCER_EXPORT("outsourcerData", "outsourcerData", "分包方"),
-    SITE_EXECUTIVE_EXPORT("siteExecutiveData", "siteExecutiveData", "现场测试、校准或检定"),
-    CERTIFICATE_PRINT_EXPORT("certificatePrintData", "certificatePrintData", "证书打印"),
-    DOWNLOAD_TEMPLATE("downloadTemplate", "downloadTemplate", "页面配置"),
-    OUTSOURCER_CERTIFICATE_EXPORT("outsourceCertificateData", "outsourceCertificateData", "分包证书"),
-    SETTLEMENT_INFO_EXPORT("settlementInfoData", "settlementInfoData", "业务结算"),
-    EQUIPMENT_REMIND("equipmentRemind", "equipmentRemind", "设备到期提醒"),
-    AGREEMENT_INFO_EXPORT("agreementInfoData", "agreementInfoData", "合同"),
-    WORK_STATISTICS_EXPORT("workStatisticsData", "workStatisticsData", "实时工作统计"),
-    DEPT_OUTPUT_EXPORT("deptOutputData", "deptOutputData", "部门产值分析"),
-    WORKLOAD_EXPORT("workloadData", "workloadData", "业务工作量分析"),
-    DEPT_COMPREHENSIVE_EXPORT("deptComprehensiveData", "deptComprehensiveData", "部门综合分析"),
-    ENVIRONMENTAL_RECORD("environmentalRecordData", "environmentalRecordData", "现场环境记录");
+    /**
+     * 计量检定业务
+     */
+    OUTSOURCER_EXPORT("outsourcerData", "分包方名录", "分包方名录"),
+    IDENTIFY_EXPORT("identifyData", "计量标识", "计量标识"),
+    ORDER_EXPORT("orderData", "任务单", "任务单"),
+    DISPATCH_DATA("dispatchData", "设备收发", "设备收发"),
+    HANDOUT_EXPORT("handoutData", "任务分发", "任务分发"),
+    SITE_EXECUTIVE_EXPORT("siteExecutiveData", "现场测试、校准或检定", "现场测试、校准或检定"),
+    CERTIFICATE_REPORT("certificateReport", "证书审批", "证书审批"),
+    CERTIFICATE_CHANGE_APPLY("certificateChangeApply", "证书报告补充或更换申请单", "证书报告补充或更换申请单"),
+    CERTIFICATE_PRINT("certificatePrintData", "证书打印审批", "证书打印审批"),
+    DEPT_EXECUTIVE_TASK("deptExecutiveTaskData", "实验室任务", "实验室任务"),
+    MY_EXECUTIVE_TASK("myExecutiveTaskData", "我的任务", "我的任务"),
+    OUTSOURCE_ASSESS("outsourceAssess", "测试、校准或检定工作分包评审表", "测试、校准或检定工作分包评审表"),
+    OUTSOURCE_PROTOCOL("outsourceProtocol", "测试、校准或检定工作分包协议书", "测试、校准或检定工作分包协议书"),
+
+    /**
+     * 系统管理
+     */
+    SIGN_EXPORT("signData", "签名", "签名"),
+    TEMPLATE_EXPORT("templateData", "文件模板", "文件模板"),
+    FLOW_DEF_EXPORT("flowDefData", "流程定义", "流程定义"),
+    DOWNLOAD_TEMPLATE("downloadTemplate", "流程定义", "页面配置");
 
     ExportEnum(String fileName, String sheetName, String description) {
         this.fileName = fileName;
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateRecordTypeCodeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateRecordTypeCodeEnum.java
index 31d913c..a963522 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateRecordTypeCodeEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateRecordTypeCodeEnum.java
@@ -46,4 +46,14 @@
     String SITE_EXECUTIVE_APPROVAL = "01";
     //《现场测试、校准或检定工作记录表》
     String SITE_EXECUTIVE_LOG = "02";
+
+    //测试、校准或检定工作分包协议书
+    String OUTSOURCE_PROTOCOL = "01";
+    //测试、校准或检定工作分包评审表
+    String OUTSOURCE_ACCESS = "02";
+    //测试、校准或检定工作分包通知书
+    String OUTSOURCE_NOTICE = "03";
+    //测试、校准或检定工作分包方名录
+    String OUTSOURCE_INFO = "04";
+
 }
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
index 24b8635..f78bd53 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
@@ -15,6 +15,10 @@
     String CERTIFICATE_CHANGE_APPLY_BEAN_NAME = "certificateChangeApplyBean";
     //现场测试、校准或检定
     String SITE_EXECUTIVE_BEAN_NAME = "siteExecutiveBean";
+    //测试、校准或检定工作分包评审表
+    String OUTSOURCE_ASSESS_BEAN_NAME = "outsourceAssessBean";
+    //测试、校准或检定工作分包协议书
+    String OUTSOURCE_PROTOCOL_BEAN_NAME = "outsourceProtocolBean";
 
     /*********************************设备与装置************************************/
     //设备台账
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 b21c661..6b86fd1 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
@@ -18,6 +18,8 @@
     OUTSOURCER_APPROVAL(OUTSOURCER_BEAN_NAME, ""),
     CERTIFICATE_CHANGE_APPROVAL(CERTIFICATE_CHANGE_APPLY_BEAN_NAME, ""),
     SITE_EXECUTIVE_APPROVAL(SITE_EXECUTIVE_BEAN_NAME, ""),
+    OUTSOURCE_ASSESS_APPROVAL(OUTSOURCE_ASSESS_BEAN_NAME, ""),
+    OUTSOURCE_PROTOCOL_APPROVAL(OUTSOURCE_PROTOCOL_BEAN_NAME, ""),
 
     ACTION_STATUS_MAP(new HashMap<String, AwareActionStatusEnum>() {
         {
@@ -47,6 +49,10 @@
             put(ApplyFromIdEnum.CERTIFICATE_CHANGE_APPROVAL.getCode(), CERTIFICATE_CHANGE_APPROVAL);
             //现场测试、校准或检定审批
             put(ApplyFromIdEnum.SITE_EXECUTIVE_APPROVAL.getCode(), SITE_EXECUTIVE_APPROVAL);
+            //测试、校准或检定工作分包评审表
+            put(ApplyFromIdEnum.OUTSOURCE_ASSESS_APPROVAL.getCode(), OUTSOURCE_ASSESS_APPROVAL);
+            //测试、校准或检定工作分包协议书
+            put(ApplyFromIdEnum.OUTSOURCE_PROTOCOL_APPROVAL.getCode(), OUTSOURCE_PROTOCOL_APPROVAL);
         }
     });
     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 934405e..c7410bd 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
@@ -9,6 +9,8 @@
     CERTIFICATE_CHANGE_APPROVAL("jljdywzsbchghsqd", MessageSourceModuleEnum.BUSINESS.getCode(), "证书/报告补充或更换申请单"),
     OUTSOURCER_APPROVAL("jljdywcsjzhgfbfml", MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定合格分包方名录"),
     SITE_EXECUTIVE_APPROVAL("jljdywxccsjzsp", MessageSourceModuleEnum.BUSINESS.getCode(), "现场测试、校准或检定审批"),
+    OUTSOURCE_ASSESS_APPROVAL("jljdywcsjzfbpsb", MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包评审表"),
+    OUTSOURCE_PROTOCOL_APPROVAL("jljdywcsjzfbxys", MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包协议书"),
 
 
     /*******************************************设备与装置*********************************************/
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/GeneralApprovalMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/GeneralApprovalMapper.java
index 4fb7344..0c9d6ae 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/GeneralApprovalMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/GeneralApprovalMapper.java
@@ -17,8 +17,4 @@
 
     Page<O> selectBatchForApprovalList(Page<O> page, @Param("request") R request, @Param("businessKeys") List<String> businessKeys);
 
-//    Page<O> selectListPage(Page<O> page, @Param("request") R request);
-
-//    Long selectMaxNo();
-
 }
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceAssessMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceAssessMapper.java
index 7867bb8..ba59009 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceAssessMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceAssessMapper.java
@@ -1,7 +1,12 @@
 package com.casic.missiles.mapper.business;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.business.outsource.OutsourceAssessApprovalListRequest;
+import com.casic.missiles.mapper.GeneralApprovalMapper;
 import com.casic.missiles.model.business.BizBusinessOutsourceAssess;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * <p>
@@ -11,6 +16,10 @@
  * @author wangpeng
  * @since 2023-08-16
  */
-public interface BizBusinessOutsourceAssessMapper extends BaseMapper<BizBusinessOutsourceAssess> {
+public interface BizBusinessOutsourceAssessMapper extends GeneralApprovalMapper<BizBusinessOutsourceAssess, BizBusinessOutsourceAssess, OutsourceAssessApprovalListRequest> {
+
+    Page<BizBusinessOutsourceAssess> selectBatchForApprovalList(Page<BizBusinessOutsourceAssess> page, @Param("request") OutsourceAssessApprovalListRequest request, @Param("businessKeys") List<String> businessKeys);
+
+    Long selectMaxProjectNo();
 
 }
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceProtocolMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceProtocolMapper.java
new file mode 100644
index 0000000..e6aba35
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceProtocolMapper.java
@@ -0,0 +1,24 @@
+package com.casic.missiles.mapper.business;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.business.outsource.OutsourceProtocolApprovalListRequest;
+import com.casic.missiles.mapper.GeneralApprovalMapper;
+import com.casic.missiles.model.business.BizBusinessOutsourceProtocol;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 计量检定业务-分包管理-测试、校准或检定工作分包协议书 Mapper 接口
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-08-24
+ */
+public interface BizBusinessOutsourceProtocolMapper extends GeneralApprovalMapper<BizBusinessOutsourceProtocol, BizBusinessOutsourceProtocol, OutsourceProtocolApprovalListRequest> {
+
+    Page<BizBusinessOutsourceProtocol> selectBatchForApprovalList(Page<BizBusinessOutsourceProtocol> page, @Param("request") OutsourceProtocolApprovalListRequest request, @Param("businessKeys") List<String> businessKeys);
+
+    Long selectMaxProtocolNo();
+}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/EnvLocationInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/EnvLocationInfoMapper.java
new file mode 100644
index 0000000..49eff87
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/EnvLocationInfoMapper.java
@@ -0,0 +1,21 @@
+package com.casic.missiles.mapper.resource;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.resource.environment.LocationListRequest;
+import com.casic.missiles.dto.resource.environment.LocationListResponse;
+import com.casic.missiles.model.resource.EnvLocationInfo;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * <p>
+ * 实验室环境监控系统-设备表 Mapper 接口
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-06-07
+ */
+public interface EnvLocationInfoMapper extends BaseMapper<EnvLocationInfo> {
+
+    Page<LocationListResponse> selectLocationListPage(Page<LocationListResponse> page, @Param("request") LocationListRequest request);
+}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java
index de124db..85ed0f7 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java
@@ -1,7 +1,9 @@
 package com.casic.missiles.mapper.system;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.dto.system.SignDetailResponse;
+import com.casic.missiles.dto.system.SignListRequest;
 import com.casic.missiles.model.system.SystemSign;
 import org.apache.ibatis.annotations.Param;
 
@@ -22,4 +24,8 @@
     SignDetailResponse selectSignDetailById(Long id);
 
     List<SystemSign> selectUsableSignList(@Param("userId") Long userId);
+
+    Page<SystemSign> selectSignListPage(Page<SystemSign> page, @Param("request") SignListRequest request);
+
+    List<SystemSign> selectSignList(@Param("request") SignListRequest request);
 }
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateChangeApplyMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateChangeApplyMapper.xml
index d798447..c496092 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateChangeApplyMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateChangeApplyMapper.xml
@@ -30,31 +30,31 @@
         SELECT *
         FROM biz_business_certificate_change_apply
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.changeApplyNo != null and request.changeApplyNo !=''">
+        <if test="request != null and request.changeApplyNo != null and request.changeApplyNo !=''">
             and change_apply_no like concat('%',#{request.changeApplyNo},'%')
         </if>
-        <if test="request.changeReportNo != null and request.changeReportNo !=''">
+        <if test="request != null and request.changeReportNo != null and request.changeReportNo !=''">
             and change_report_no like concat('%',#{request.changeReportNo},'%')
         </if>
-        <if test="request.changeReportName != null and request.changeReportName !=''">
+        <if test="request != null and request.changeReportName != null and request.changeReportName !=''">
             and change_report_name like concat('%',#{request.changeReportName},'%')
         </if>
-        <if test="request.changeType != null and request.changeType !=''">
+        <if test="request != null and request.changeType != null and request.changeType !=''">
             and change_type = #{request.changeType}
         </if>
-        <if test="request.createUserName != null and request.createUserName !=''">
+        <if test="request != null and request.createUserName != null and request.createUserName !=''">
             and create_user_name like concat('%',#{request.createUserName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificatePrintMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificatePrintMapper.xml
index b66cd99..49c0ac8 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificatePrintMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificatePrintMapper.xml
@@ -31,34 +31,34 @@
         LEFT JOIN biz_business_order_sample_relation bosr ON (bosr.order_id = bcr.order_id AND bosr.sample_id = bcr.sample_id)
         LEFT JOIN biz_business_order_info boi ON boi.id = bosr.order_id
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and bcp.approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.printStatus != null and request.printStatus !=''">
+        <if test="request != null and request.printStatus != null and request.printStatus !=''">
             and print_status = #{request.printStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and bcp.create_user_id = #{request.createUserId}
         </if>
-        <if test="request.certificateReportNo != null and request.certificateReportNo !=''">
+        <if test="request != null and request.certificateReportNo != null and request.certificateReportNo !=''">
             and bcr.certificate_report_no like concat('%',#{request.certificateReportNo},'%')
         </if>
-        <if test="request.certificateReportName != null and request.certificateReportName !=''">
+        <if test="request != null and request.certificateReportName != null and request.certificateReportName !=''">
             and bcr.certificate_report_name like concat('%',#{request.certificateReportName},'%')
         </if>
-        <if test="request.customerName != null and request.customerName !=''">
+        <if test="request != null and request.customerName != null and request.customerName !=''">
             and boi.customer_name like concat('%',#{request.customerName},'%')
         </if>
-        <if test="request.sampleNo != null and request.sampleNo !=''">
+        <if test="request != null and request.sampleNo != null and request.sampleNo !=''">
             and bosr.sample_no like concat('%',#{request.sampleNo},'%')
         </if>
-        <if test="request.sampleName != null and request.sampleName !=''">
+        <if test="request != null and request.sampleName != null and request.sampleName !=''">
             and bosr.sample_name like concat('%',#{request.sampleName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and bcp.create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and bcp.create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml
index b366034..767695d 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml
@@ -46,33 +46,37 @@
         SELECT bcr.*, bosr.sample_no, bosr.sample_name, bosr.sample_model, rsi.staff_name
         FROM biz_business_certificate_report bcr
         LEFT JOIN biz_business_order_sample_relation bosr ON (bosr.order_id = bcr.order_id AND bosr.sample_id = bcr.sample_id)
+        LEFT JOIN biz_business_order_info boi ON boi.id = bcr.order_id
         LEFT JOIN biz_resource_staff_info rsi ON rsi.id = bcr.measure_person_id
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and bcr.approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and bcr.create_user_id = #{request.createUserId}
         </if>
-        <if test="request.certificateReportNo != null and request.certificateReportNo !=''">
+        <if test="request != null and request.customerId != null and request.customerId !=''">
+            and boi.customer_id = #{request.customerId}
+        </if>
+        <if test="request != null and request.certificateReportNo != null and request.certificateReportNo !=''">
             and bcr.certificate_report_no like concat('%',#{request.certificateReportNo},'%')
         </if>
-        <if test="request.certificateReportName != null and request.certificateReportName !=''">
+        <if test="request != null and request.certificateReportName != null and request.certificateReportName !=''">
             and bcr.certificate_report_name like concat('%',#{request.certificateReportName},'%')
         </if>
-        <if test="request.sampleNo != null and request.sampleNo !=''">
+        <if test="request != null and request.sampleNo != null and request.sampleNo !=''">
             and bosr.sample_no like concat('%',#{request.sampleNo},'%')
         </if>
-        <if test="request.measureCategory != null and request.measureCategory !=''">
+        <if test="request != null and request.measureCategory != null and request.measureCategory !=''">
             and bcr.measure_category = #{request.measureCategory}
         </if>
-        <if test="request.measurePerson != null and request.measurePerson !=''">
+        <if test="request != null and request.measurePerson != null and request.measurePerson !=''">
             and rsi.staff_name like concat('%',#{request.measurePerson},'%')
         </if>
-        <if test="request.calibrationTimeStart != null and request.calibrationTimeStart !=''">
+        <if test="request != null and request.calibrationTimeStart != null and request.calibrationTimeStart !=''">
             and bcr.calibration_time &gt;= #{request.calibrationTimeStart}
         </if>
-        <if test="request.calibrationTimeEnd != null and request.calibrationTimeEnd !=''">
+        <if test="request != null and request.calibrationTimeEnd != null and request.calibrationTimeEnd !=''">
             and bcr.calibration_time &lt;= #{request.calibrationTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceAssessMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceAssessMapper.xml
index d0fcf8b..c22c101 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceAssessMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceAssessMapper.xml
@@ -7,6 +7,8 @@
         <id column="id" property="id" />
         <result column="project_no" property="projectNo" />
         <result column="project_name" property="projectName" />
+        <result column="lab_code" property="labCode" />
+        <result column="group_code" property="groupCode" />
         <result column="applicant_id" property="applicantId" />
         <result column="applicant_name" property="applicantName" />
         <result column="applicant_time" property="applicantTime" />
@@ -31,7 +33,45 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, project_no, project_name, applicant_id, applicant_name, applicant_time, minio_file_name, remark, create_user_id, create_user_name, outsourcer_id, pre_start_time, pre_end_time, outsource_reason, pre_cost, approval_status, process_id, approve_situation, traceability, test_method, technique_ability, create_time, update_time
+        id, project_no, project_name, lab_code, group_code, applicant_id, applicant_name, applicant_time, minio_file_name, remark, create_user_id, create_user_name, outsourcer_id, pre_start_time, pre_end_time, outsource_reason, pre_cost, approval_status, process_id, approve_situation, traceability, test_method, technique_ability, create_time, update_time
     </sql>
 
+    <select id="selectMaxProjectNo" resultType="java.lang.Long">
+        SELECT IFNULL(max(RIGHT(project_no, 3)), 0) from biz_business_outsource_assess
+    </select>
+
+    <select id="selectBatchForApprovalList" resultMap="BaseResultMap">
+        SELECT bboa.*, bboi.outsourcer_name, bboi.director
+        FROM biz_business_outsource_assess bboa
+        LEFT JOIN biz_business_outsourcer_info bboi ON bboa.outsourcer_id = bboi.id
+        WHERE 1=1
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
+            and bboa.approval_status = #{request.approvalStatus}
+        </if>
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
+            and bboa.create_user_id = #{request.createUserId}
+        </if>
+        <if test="request != null and request.projectNo != null and request.projectNo !=''">
+            and bboa.project_no like concat('%',#{request.projectNo},'%')
+        </if>
+        <if test="request != null and request.outsourcerName != null and request.outsourcerName !=''">
+            and bboi.outsourcer_name like concat('%',#{request.outsourcerName},'%')
+        </if>
+        <if test="request != null and request.applicantName != null and request.applicantName !=''">
+            and bboa.applicant_name like concat('%',#{request.applicantName},'%')
+        </if>
+        <if test="request != null and request.applicantTimeStart != null and request.applicantTimeStart !=''">
+            and bboa.applicant_time &gt;= #{request.applicantTimeStart}
+        </if>
+        <if test="request != null and request.applicantTimeEnd != null and request.applicantTimeEnd !=''">
+            and bboa.applicant_time &lt;= #{request.applicantTimeEnd}
+        </if>
+        <if test="businessKeys != null">
+            and bboa.id in
+            <foreach collection="businessKeys" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
+        ORDER BY bboa.create_time DESC
+    </select>
 </mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceProtocolMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceProtocolMapper.xml
new file mode 100644
index 0000000..b7b2149
--- /dev/null
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceProtocolMapper.xml
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.mapper.business.BizBusinessOutsourceProtocolMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.business.BizBusinessOutsourceProtocol">
+        <id column="id" property="id" />
+        <result column="protocol_no" property="protocolNo" />
+        <result column="project_name" property="projectName" />
+        <result column="lab_code" property="labCode" />
+        <result column="group_code" property="groupCode" />
+        <result column="outsourcer_id" property="outsourcerId" />
+        <result column="remark" property="remark" />
+        <result column="outsource_no" property="outsourceNo" />
+        <result column="outsource_name" property="outsourceName" />
+        <result column="contacts" property="contacts" />
+        <result column="mobile" property="mobile" />
+        <result column="address" property="address" />
+        <result column="require_date" property="requireDate" />
+        <result column="outsource_cost" property="outsourceCost" />
+        <result column="director" property="director" />
+        <result column="item" property="item" />
+        <result column="requires" property="requires" />
+        <result column="create_user_id" property="createUserId" />
+        <result column="create_user_name" property="createUserName" />
+        <result column="approval_status" property="approvalStatus" />
+        <result column="process_id" property="processId" />
+        <result column="create_time" property="createTime" />
+        <result column="update_time" property="updateTime" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, protocol_no, project_name, lab_code, group_code, outsourcer_id, remark, outsource_no, outsource_name, contacts, mobile, address, require_date, outsource_cost, director, item, requires, create_user_id, create_user_name, approval_status, process_id, create_time, update_time
+    </sql>
+
+    <select id="selectMaxProtocolNo" resultType="java.lang.Long">
+        SELECT IFNULL(max(RIGHT(protocol_no, 3)), 0) from biz_business_outsource_protocol
+    </select>
+
+    <select id="selectBatchForApprovalList" resultMap="BaseResultMap">
+        SELECT *
+        FROM biz_business_outsource_protocol
+        WHERE 1=1
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
+            and approval_status = #{request.approvalStatus}
+        </if>
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
+            and create_user_id = #{request.createUserId}
+        </if>
+        <if test="request != null and request.protocolNo != null and request.protocolNo !=''">
+            and protocol_no like concat('%',#{request.protocolNo},'%')
+        </if>
+        <if test="request != null and request.outsourcerName != null and request.outsourcerName !=''">
+            and outsourcer_name like concat('%',#{request.outsourcerName},'%')
+        </if>
+        <if test="request != null and request.applicantName != null and request.applicantName !=''">
+            and create_user_name like concat('%',#{request.applicantName},'%')
+        </if>
+        <if test="request != null and request.applicantTimeStart != null and request.applicantTimeStart !=''">
+            and create_time &gt;= #{request.applicantTimeStart}
+        </if>
+        <if test="request != null and request.applicantTimeEnd != null and request.applicantTimeEnd !=''">
+            and create_time &lt;= #{request.applicantTimeEnd}
+        </if>
+        <if test="businessKeys != null">
+            and id in
+            <foreach collection="businessKeys" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
+        ORDER BY create_time DESC
+    </select>
+</mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourcerInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourcerInfoMapper.xml
index 510a80b..3049b54 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourcerInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourcerInfoMapper.xml
@@ -7,6 +7,8 @@
         <id column="id" property="id" />
         <result column="outsourcer_no" property="outsourcerNo" />
         <result column="outsourcer_name" property="outsourcerName" />
+        <result column="lab_code" property="labCode" />
+        <result column="group_code" property="groupCode" />
         <result column="outsourcer_brief_name" property="outsourcerBriefName" />
         <result column="outsourcer_size" property="outsourcerSize" />
         <result column="business_size" property="businessSize" />
@@ -55,32 +57,32 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, outsourcer_no, outsourcer_name, outsourcer_brief_name, outsourcer_size, business_size, grade, evaluation, tax_number, bank_account, bank_name, bank_account_number, postal_code, director, phone, fax, mobile, email, website, address_country, address_province, address_city, address_area, full_address, address_country_name, address_province_name, address_city_name, address_area_name, invoice_country, invoice_province, invoice_city, invoice_area, invoice_full_address, invoice_country_name, invoice_province_name, invoice_city_name, invoice_area_name, business_scope, business_content, minio_file_name, approval_status, process_id, remark, create_user_id, create_user_name, create_time, update_time
+        id, outsourcer_no, outsourcer_name, lab_code, group_code, outsourcer_brief_name, outsourcer_size, business_size, grade, evaluation, tax_number, bank_account, bank_name, bank_account_number, postal_code, director, phone, fax, mobile, email, website, address_country, address_province, address_city, address_area, full_address, address_country_name, address_province_name, address_city_name, address_area_name, invoice_country, invoice_province, invoice_city, invoice_area, invoice_full_address, invoice_country_name, invoice_province_name, invoice_city_name, invoice_area_name, business_scope, business_content, minio_file_name, approval_status, process_id, remark, create_user_id, create_user_name, create_time, update_time
     </sql>
 
     <select id="selectBatchForApprovalList" resultMap="BaseResultMap">
         SELECT *
         FROM biz_business_outsourcer_info
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.outsourcerNo != null and request.outsourcerNo !=''">
+        <if test="request != null and request.outsourcerNo != null and request.outsourcerNo !=''">
             and outsourcer_no like concat('%',#{request.outsourcerNo},'%')
         </if>
-        <if test="request.outsourcerName != null and request.outsourcerName !=''">
+        <if test="request != null and request.outsourcerName != null and request.outsourcerName !=''">
             and outsourcer_name like concat('%',#{request.outsourcerName},'%')
         </if>
-        <if test="request.director != null and request.director !=''">
+        <if test="request != null and request.director != null and request.director !=''">
             and director like concat('%',#{request.director},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
@@ -93,6 +95,6 @@
     </select>
 
     <select id="selectMaxNo" resultType="java.lang.Long">
-        SELECT IFNULL(max(RIGHT(outsourcer_no, 12)), 0) from biz_business_outsourcer_info
+        SELECT IFNULL(max(RIGHT(outsourcer_no, 3)), 0) from biz_business_outsourcer_info
     </select>
 </mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessSiteExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessSiteExecutiveInfoMapper.xml
index 135c5d0..3c5ae79 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessSiteExecutiveInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessSiteExecutiveInfoMapper.xml
@@ -38,25 +38,25 @@
         FROM biz_business_site_executive_info bsei
         LEFT JOIN biz_resource_customer_info rci ON bsei.customer_id = rci.id
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and bsei.approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and bsei.create_user_id = #{request.createUserId}
         </if>
-        <if test="request.siteExecutiveNo != null and request.siteExecutiveNo !=''">
+        <if test="request != null and request.siteExecutiveNo != null and request.siteExecutiveNo !=''">
             and bsei.site_executive_no like concat('%',#{request.siteExecutiveNo},'%')
         </if>
-        <if test="request.customerName != null and request.customerName !=''">
+        <if test="request != null and request.customerName != null and request.customerName !=''">
             and rci.outsourcer_name like concat('%',#{request.customerName},'%')
         </if>
-        <if test="request.applyName != null and request.applyName !=''">
+        <if test="request != null and request.applyName != null and request.applyName !=''">
             and bsei.apply_name like concat('%',#{request.applyName},'%')
         </if>
-        <if test="request.applyTimeStart != null and request.applyTimeStart !=''">
+        <if test="request != null and request.applyTimeStart != null and request.applyTimeStart !=''">
             and bsei.apply_time &gt;= #{request.applyTimeStart}
         </if>
-        <if test="request.applyTimeEnd != null and request.applyTimeEnd !=''">
+        <if test="request != null and request.applyTimeEnd != null and request.applyTimeEnd !=''">
             and bsei.apply_time &lt;= #{request.applyTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml
index 84d9e2a..6bd38a9 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml
@@ -105,6 +105,12 @@
         <if test="request.isUrgent != null and request.isUrgent !=''">
             AND bo.is_urgent = #{request.isUrgent}
         </if>
+        <if test="request.ids != null">
+            and blei.id in
+            <foreach collection="request.ids" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
         ORDER BY blei.update_time DESC
     </select>
 
@@ -137,6 +143,12 @@
         <if test="request.isUrgent != null and request.isUrgent !=''">
             AND bo.is_urgent = #{request.isUrgent}
         </if>
+        <if test="request.ids != null">
+            and blei.id in
+            <foreach collection="request.ids" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
         ORDER BY blei.update_time DESC
     </select>
 
diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardInfoMapper.xml
index 1a5551b..2ed8d17 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardInfoMapper.xml
@@ -45,12 +45,6 @@
         FROM biz_equipment_standard_info besi
         LEFT JOIN biz_equipment_standard_technology_relation bestr ON besi.standard_no = bestr.standard_no
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
-            and besi.approval_status = #{request.approvalStatus}
-        </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
-            and besi.create_user_id = #{request.createUserId}
-        </if>
         <if test="request.standardName != null and request.standardName !=''">
             and besi.standard_name like concat('%',#{request.standardName},'%')
         </if>
diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardTechnologyRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardTechnologyRelationMapper.xml
index fc7e16c..cd03c8c 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardTechnologyRelationMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardTechnologyRelationMapper.xml
@@ -6,6 +6,7 @@
     <resultMap id="BaseResultMap" type="com.casic.missiles.model.equipment.BizEquipmentStandardTechnologyRelation">
         <id column="id" property="id" />
         <result column="technology_file_id" property="technologyFileId" />
+        <result column="technology_file_no" property="technologyFileNo" />
         <result column="technology_file_name" property="technologyFileName" />
         <result column="standard_id" property="standardId" />
         <result column="standard_no" property="standardNo" />
@@ -14,7 +15,7 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, technology_file_id, technology_file_name, standard_id, remark
+        id, technology_file_id, technology_file_no, technology_file_name, standard_id, remark
     </sql>
 
 </mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceAuthorizeOrderMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceAuthorizeOrderMapper.xml
index ac5176c..554fe65 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceAuthorizeOrderMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceAuthorizeOrderMapper.xml
@@ -32,22 +32,22 @@
         SELECT *
         FROM biz_resource_authorize_order
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.orderNo != null and request.orderNo !=''">
+        <if test="request != null and request.orderNo != null and request.orderNo !=''">
             and order_no like concat('%',#{request.orderNo},'%')
         </if>
-        <if test="request.createUserName != null and request.createUserName !=''">
+        <if test="request != null and request.createUserName != null and request.createUserName !=''">
             and create_user_name like concat('%',#{request.createUserName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerExamineFormMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerExamineFormMapper.xml
index ab242f6..af7f98f 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerExamineFormMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerExamineFormMapper.xml
@@ -41,28 +41,28 @@
         SELECT *
         FROM biz_resource_customer_examine_form
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.formNo != null and request.formNo !=''">
+        <if test="request != null and request.formNo != null and request.formNo !=''">
             and form_no like concat('%',#{request.formNo},'%')
         </if>
-        <if test="request.labCode != null and request.labCode !=''">
+        <if test="request != null and request.labCode != null and request.labCode !=''">
             and lab_code like concat('%',#{request.labCode},'%')
         </if>
-        <if test="request.groupCode != null and request.groupCode !=''">
+        <if test="request != null and request.groupCode != null and request.groupCode !=''">
             and group_code like concat('%',#{request.groupCode},'%')
         </if>
-        <if test="request.createUserName != null and request.createUserName !=''">
+        <if test="request != null and request.createUserName != null and request.createUserName !=''">
             and create_user_name like concat('%',#{request.createUserName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java
index bb0c50f..13a699b 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java
@@ -12,6 +12,7 @@
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.IGeneralApprovalService;
+import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
@@ -19,6 +20,7 @@
 import org.springframework.web.bind.annotation.RequestBody;
 
 import javax.validation.Valid;
+import java.util.List;
 import java.util.Objects;
 
 /**
@@ -117,4 +119,17 @@
         }
         return baseApprovalService.failUpdate(request);
     }
+
+    public List<O> exportList(@RequestBody @Valid R request) throws Exception {
+        List<O> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = baseApprovalService.listExportByIds(request.getIds());
+        } else {
+            list = baseApprovalService.listExport(request);
+        }
+        for (O record : list) {
+            DictCodeUtils.convertDictCodeToName(record);
+        }
+        return list;
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java
index 8a90961..d775831 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java
@@ -5,6 +5,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.business.certificate.CertificateChangeApplyApprovalListRequest;
 import com.casic.missiles.dto.business.certificate.CertificateChangeApplySaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessCertificateChangeApply;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
@@ -20,6 +21,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -48,4 +50,12 @@
         }
         return changeApplyService.saveChangeApply(request);
     }
+
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody CertificateChangeApplyApprovalListRequest request) throws Exception {
+        List<BizBusinessCertificateChangeApply> list = super.exportList(request);
+        super.exportExcel(BizBusinessCertificateChangeApply.class, list, ExportEnum.CERTIFICATE_CHANGE_APPLY.getSheetName());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java
index 5fc4b07..af8230e 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java
@@ -9,6 +9,7 @@
 import com.casic.missiles.dto.business.certificate.CertificatePrintApprovalListRequest;
 import com.casic.missiles.dto.business.certificate.CertificatePrintListResponse;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.enums.business.CertificatePrintStatusEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessCertificatePrintLog;
@@ -18,10 +19,16 @@
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.io.IOException;
+import java.util.List;
 import java.util.Objects;
 
 /**
@@ -98,4 +105,16 @@
         });
         return certificatePrintService.certificatePrintLog(idDTO.getId());
     }
+
+    @ApiOperation("证书打印审批导出")
+    @PostMapping("/listExport")
+    public void exportList(@RequestBody CertificatePrintApprovalListRequest request) throws IOException {
+        List<CertificatePrintListResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = certificatePrintService.listByIds(request.getIds());
+        } else {
+            list = certificatePrintService.list(request);
+        }
+        super.exportExcel(CertificatePrintListResponse.class, list, ExportEnum.CERTIFICATE_PRINT.getSheetName());
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java
index 63b06dc..6b2efd5 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java
@@ -6,6 +6,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.business.certificate.CertificateReportApprovalListRequest;
 import com.casic.missiles.dto.business.certificate.CertificateReportSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessCertificateReport;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
@@ -21,6 +22,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -50,7 +52,7 @@
         return certificateReportService.saveCertificateReport(request);
     }
 
-    @ApiOperation("证书审批详情（基本信息）")
+    @ApiOperation("详情（基本信息）")
     @PostMapping("/detail")
     public ReturnDTO<BizBusinessCertificateReport> detail(@RequestBody @Valid BaseDetailRequest request, BindingResult bindingResult) throws Exception {
         if(bindingResult.hasErrors()){
@@ -59,4 +61,11 @@
         return certificateReportService.detail(request);
     }
 
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody CertificateReportApprovalListRequest request) throws Exception {
+        List<BizBusinessCertificateReport> list = super.exportList(request);
+        super.exportExcel(BizBusinessCertificateReport.class, list, ExportEnum.CERTIFICATE_REPORT.getSheetName());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java
index 46b26bd..57c0809 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java
@@ -10,20 +10,21 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.business.identify.IdentifyListRequest;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessIdentifyInfo;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.business.IBizBusinessIdentifyInfoService;
+import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import javax.validation.Valid;
+import java.util.List;
 import java.util.Objects;
 
 /**
@@ -57,16 +58,13 @@
         return identifyInfoService.addIdentify(identifyInfo);
     }
 
-    @ApiOperation("标识打印更新")
+    @ApiOperation("标识打印更新（更新打印时间）")
     @PostMapping("/update")
-    public ReturnDTO updateIdentify(@RequestBody @Valid BizBusinessIdentifyInfo identifyInfo, BindingResult bindingResult) {
-        Assert.isFalse(Objects.isNull(identifyInfo.getId()), () -> {
+    public ReturnDTO updateIdentify(@RequestBody @Valid IdDTO idDTO) {
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        Assert.isFalse(bindingResult.hasErrors(), () -> {
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        });
-        return identifyInfoService.updateIdentify(identifyInfo);
+        return identifyInfoService.updateIdentify(idDTO.getId());
     }
 
     @ApiOperation("标识打印删除")
@@ -77,4 +75,37 @@
         });
         return identifyInfoService.deleteIdentify(idDTO.getId());
     }
+
+    @ApiOperation("标识打印导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody @Valid IdentifyListRequest request, BindingResult bindingResult) throws Exception {
+        if (bindingResult.hasErrors()) {
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        List<BizBusinessIdentifyInfo> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = identifyInfoService.listByIds(request.getIds());
+        } else {
+            list = identifyInfoService.list(request);
+        }
+        for (BizBusinessIdentifyInfo record : list) {
+            DictCodeUtils.convertDictCodeToName(record);
+        }
+        super.exportExcel(BizBusinessIdentifyInfo.class, list, ExportEnum.IDENTIFY_EXPORT.getSheetName());
+    }
+
+
+    // TODO: 2023/8/23 查询设备信息，4个底部按钮查设备（按钮的作用就是前端用来调不同接口、用来区分中间即将展示的标识），前端弹窗选设备，在确定保存时前端根据底部按钮判断传入设备类型deviceType字典code
+    // TODO: 2023/8/23 接口：查受检设备（第1个按钮），查设备台账（后3个按钮同一接口），查询之后前端根据标志类型的不同加到中间页面时进行判断（按产品给的对应表）
+    // TODO: 2023/8/23 提供二维码接口，前端在加到中间页面时调用一下
+
+    @ApiOperation("设备二维码")
+    @PostMapping("/equipment/qrCode")
+    public ReturnDTO<String> equipmentQrCode(@RequestBody @Valid IdDTO idDTO) {
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return identifyInfoService.equipmentQrCode(idDTO.getId());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java
index 707be6e..7e0453d 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java
@@ -117,7 +117,7 @@
     }
 
     @ApiOperation("任务单导出")
-    @PostMapping("/export")
+    @PostMapping("/listExport")
     public void orderExport(@RequestBody @Valid OrderListRequest request, HttpServletResponse response) {
         businessOrderService.orderExport(request, response);
     }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java
index 529a6ce..51432be 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java
@@ -1,9 +1,28 @@
 package com.casic.missiles.controller.business;
 
+import com.casic.missiles.controller.GeneralApprovalController;
+import com.casic.missiles.dto.BaseApprovalSubmitRequest;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.business.outsource.OutsourceAssessApprovalListRequest;
+import com.casic.missiles.dto.business.outsource.OutsourceAssessSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
+import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.model.business.BizBusinessOutsourceAssess;
+import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
+import com.casic.missiles.service.IGeneralApprovalService;
+import com.casic.missiles.service.business.IBizBusinessOutsourceAssessService;
 import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.BindingResult;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.validation.Valid;
+import java.util.List;
+
 /**
  * <p>
  * 计量检定业务-分包管理-测试、校准或检定工作分包评审表 前端控制器
@@ -15,6 +34,27 @@
 @Api(tags = "分包管理-测试、校准或检定工作分包评审表")
 @RestController
 @RequestMapping("/business/outsource/assess")
-public class BizBusinessOutsourceAssessController {
+public class BizBusinessOutsourceAssessController extends GeneralApprovalController<BizBusinessOutsourceAssess, BizBusinessOutsourceAssess, OutsourceAssessApprovalListRequest, BaseApprovalSubmitRequest> {
+    @Autowired
+    private IBizBusinessOutsourceAssessService outsourceAssessService;
 
+    public BizBusinessOutsourceAssessController(IGeneralApprovalService<BizBusinessOutsourceAssess, BizBusinessOutsourceAssess, OutsourceAssessApprovalListRequest, BaseApprovalSubmitRequest> baseApprovalService) {
+        super(baseApprovalService);
+    }
+
+    @ApiOperation("草稿箱-保存")
+    @PostMapping("/save")
+    public ReturnDTO<OutsourceAssessSaveResponse> saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceAssess request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        return outsourceAssessService.saveOutsourceAssess(request);
+    }
+
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception {
+        List<BizBusinessOutsourceAssess> list = super.exportList(request);
+        super.exportExcel(BizBusinessOutsourceAssess.class, list, ExportEnum.OUTSOURCE_ASSESS.getSheetName());
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java
new file mode 100644
index 0000000..9adef18
--- /dev/null
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java
@@ -0,0 +1,60 @@
+package com.casic.missiles.controller.business;
+
+import com.casic.missiles.controller.GeneralApprovalController;
+import com.casic.missiles.dto.BaseApprovalSubmitRequest;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.business.outsource.OutsourceProtocolApprovalListRequest;
+import com.casic.missiles.dto.business.outsource.OutsourceProtocolSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
+import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.model.business.BizBusinessOutsourceProtocol;
+import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
+import com.casic.missiles.service.IGeneralApprovalService;
+import com.casic.missiles.service.business.IBizBusinessOutsourceProtocolService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.BindingResult;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.validation.Valid;
+import java.util.List;
+
+/**
+ * <p>
+ * 计量检定业务-分包管理-测试、校准或检定工作分包协议书 前端控制器
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-08-24
+ */
+@Api(tags = "分包管理-测试、校准或检定工作分包协议书")
+@RestController
+@RequestMapping("/business/outsource/protocol")
+public class BizBusinessOutsourceProtocolController extends GeneralApprovalController<BizBusinessOutsourceProtocol, BizBusinessOutsourceProtocol, OutsourceProtocolApprovalListRequest, BaseApprovalSubmitRequest> {
+    @Autowired
+    private IBizBusinessOutsourceProtocolService outsourceProtocolService;
+
+    public BizBusinessOutsourceProtocolController(IGeneralApprovalService<BizBusinessOutsourceProtocol, BizBusinessOutsourceProtocol, OutsourceProtocolApprovalListRequest, BaseApprovalSubmitRequest> baseApprovalService) {
+        super(baseApprovalService);
+    }
+
+    @ApiOperation("草稿箱-保存")
+    @PostMapping("/save")
+    public ReturnDTO<OutsourceProtocolSaveResponse> saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceProtocol request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        return outsourceProtocolService.saveOutsourceProtocol(request);
+    }
+
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody OutsourceProtocolApprovalListRequest request) throws Exception {
+        List<BizBusinessOutsourceProtocol> list = super.exportList(request);
+        super.exportExcel(BizBusinessOutsourceProtocol.class, list, ExportEnum.OUTSOURCE_PROTOCOL.getSheetName());
+    }
+}
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java
index 097f645..f0f0943 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java
@@ -17,7 +17,6 @@
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.IGeneralApprovalService;
 import com.casic.missiles.service.business.IBizBusinessOutsourcerInfoService;
-import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -71,19 +70,8 @@
 
     @ApiOperation("分包方导出")
     @PostMapping("/listExport")
-    public void export(@RequestBody @Valid OutsourcerInfoApprovalListRequest request, BindingResult bindingResult) throws Exception {
-        if (bindingResult.hasErrors()) {
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        }
-        List<BizBusinessOutsourcerInfo> list;
-        if (!CollectionUtils.isEmpty(request.getIds())) {
-            list = outsourcerInfoService.listByIds(request.getIds());
-        } else {
-            list = outsourcerInfoService.list(request);
-        }
-        for (BizBusinessOutsourcerInfo record : list) {
-            DictCodeUtils.convertDictCodeToName(record);
-        }
+    public void export(@RequestBody OutsourcerInfoApprovalListRequest request) throws Exception {
+        List<BizBusinessOutsourcerInfo> list = super.exportList(request);
         super.exportExcel(BizBusinessOutsourcerInfo.class, list, ExportEnum.OUTSOURCER_EXPORT.getSheetName());
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java
index c2cbf9f..0410918 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java
@@ -17,11 +17,9 @@
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.IGeneralApprovalService;
 import com.casic.missiles.service.business.IBizBusinessSiteExecutiveInfoService;
-import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -60,7 +58,7 @@
         return siteExecutiveInfoService.saveSiteExecutiveInfo(siteExecutiveInfo);
     }
 
-    @ApiOperation("现场检测详情")
+    @ApiOperation("详情")
     @PostMapping("/detail")
     public ReturnDTO<SiteExecutiveDetailResponse> siteExecutiveDetail(@RequestBody @Valid IdDTO idDTO) throws Exception {
         Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
@@ -69,21 +67,10 @@
         return ReturnUtil.success(siteExecutiveInfoService.detail(idDTO.getId()));
     }
 
-    @ApiOperation("现场检测导出")
+    @ApiOperation("导出")
     @PostMapping("/listExport")
-    public void export(@RequestBody @Valid SiteExecutiveApprovalListRequest request, BindingResult bindingResult) throws Exception {
-        if (bindingResult.hasErrors()) {
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        }
-        List<SiteExecutiveApprovalListResponse> list;
-        if (!CollectionUtils.isEmpty(request.getIds())) {
-            list = siteExecutiveInfoService.listInfoByIds(request.getIds());
-        } else {
-            list = siteExecutiveInfoService.listInfo(request);
-        }
-        for (SiteExecutiveApprovalListResponse record : list) {
-            DictCodeUtils.convertDictCodeToName(record);
-        }
+    public void export(@RequestBody SiteExecutiveApprovalListRequest request) throws Exception {
+        List<SiteExecutiveApprovalListResponse> list = super.exportList(request);
         super.exportExcel(SiteExecutiveApprovalListResponse.class, list, ExportEnum.SITE_EXECUTIVE_EXPORT.getSheetName());
     }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
index 7e793cd..a92e209 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
@@ -55,7 +55,7 @@
 
     @ApiOperation("设备收发列表导出")
     @PostMapping("/export")
-    public void exportList(@RequestBody @Valid SampleDispatchListRequest request) throws IOException {
+    public void exportList(@RequestBody SampleDispatchListRequest request) throws IOException {
         List<SampleDispatchListResponse> list;
         if (!CollectionUtils.isEmpty(request.getIds())) {
             list = dispatchService.listByIds(request.getIds());
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java
index cdc77fc..d120fd4 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java
@@ -7,6 +7,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.business.labExecutive.*;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.business.IBusinessLabExecutiveInfoService;
@@ -14,6 +15,7 @@
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.*;
 
@@ -32,7 +34,7 @@
     @Autowired
     private IBusinessLabExecutiveInfoService labExecutiveInfoService;
 
-    @ApiOperation("实验室检测-部门检测-查询各状态列表（待检测、检测中、检测完）")
+    @ApiOperation("实验室任务-查询各状态列表（待检测、检测中、检测完）")
     @PostMapping("/deptExecutive/List")
     public ReturnDTO<PageInfoBT<SampleLabExecutiveListResponse>> queryDeptExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
@@ -43,10 +45,19 @@
         return ReturnUtil.success(super.packForBT(labExecutiveInfoService.deptLabExecutiveListPage(page, labExecutiveListRequest)));
     }
 
-    /**
-     * 实验室检测-我的检测-查询各状态列表（待检测、检测中、检测完）
-     */
-    @ApiOperation("实验室检测-我的检测-查询各状态列表（待检测、检测中、检测完）")
+    @ApiOperation("实验室任务导出")
+    @PostMapping("/deptExecutive/export")
+    public void deptExportList(@RequestBody @Valid SampleLabExecutiveListRequest request) throws Exception {
+        List<SampleLabExecutiveListResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = labExecutiveInfoService.deptLabExecutiveListByIds(request.getMeasureStatus(), request.getIds());
+        } else {
+            list = labExecutiveInfoService.deptLabExecutiveList(request);
+        }
+        super.exportExcel(SampleLabExecutiveListResponse.class, list, ExportEnum.DEPT_EXECUTIVE_TASK.getSheetName());
+    }
+
+    @ApiOperation("我的任务-查询各状态列表（待检测、检测中、检测完）")
     @PostMapping("/myExecutive/list")
     public ReturnDTO<PageInfoBT<SampleLabExecutiveListResponse>> queryMyExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
@@ -57,19 +68,25 @@
         return ReturnUtil.success(super.packForBT(labExecutiveInfoService.myLabExecutiveListPage(page, labExecutiveListRequest)));
     }
 
-    /**
-     * 实验室检测-我的检测-查询各状态样品数量（待检测、检测中、检测完）
-     */
-    @ApiOperation("实验室检测-我的检测-查询各状态样品数量（待检测、检测中、检测完）")
+    @ApiOperation("我的任务导出")
+    @PostMapping("/myExecutive/export")
+    public void exportList(@RequestBody @Valid SampleLabExecutiveListRequest request) throws Exception {
+        List<SampleLabExecutiveListResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = labExecutiveInfoService.myLabExecutiveListByIds(request.getMeasureStatus(), request.getIds());
+        } else {
+            list = labExecutiveInfoService.myLabExecutiveList(request);
+        }
+        super.exportExcel(SampleLabExecutiveListResponse.class, list, ExportEnum.MY_EXECUTIVE_TASK.getSheetName());
+    }
+
+    @ApiOperation("我的任务-查询各状态样品数量（待检测、检测中、检测完）")
     @GetMapping("/myExecutive/amount")
     public ReturnDTO<List<SampleAmountResponse>> queryMyExecutiveAmount() {
         return ReturnUtil.success(labExecutiveInfoService.myExecutiveAmount());
     }
 
-    /**
-     * 实验室检测-部门检测-分配（分配给具体人员）
-     */
-    @ApiOperation("实验室检测-部门检测-分配按钮（分配给具体人员）")
+    @ApiOperation("实验室任务-分配按钮（分配给具体人员）")
     @PostMapping("/deptExecutive/allocate")
     public ReturnDTO allocateStaff(@RequestBody @Valid SampleAllocateRequest sampleAllocateRequest, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -78,10 +95,7 @@
         return labExecutiveInfoService.allocateStaff(sampleAllocateRequest);
     }
 
-    /**
-     * 实验室检测-我的检测-检定人扫描收入（待检测->检测中）
-     */
-    @ApiOperation("实验室检测-我的检测-检定人扫描收入（待检测->检测中）")
+    @ApiOperation("我的任务-检定人扫描收入（待检测->检测中）")
     @PostMapping("/myExecutive/receive")
     public ReturnDTO sampleReceive(@RequestBody @Valid List<SampleOperateRequest> requestList, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -90,10 +104,7 @@
         return labExecutiveInfoService.sampleReceive(requestList);
     }
 
-    /**
-     * 实验室检测-负责人/检定人扫描检完（检测中->检测完）
-     */
-    @ApiOperation("实验室检测-负责人/检定人扫描检完（检测中->检测完）")
+    @ApiOperation("实验室任务-负责人/检定人扫描检完（检测中->检测完）")
     @PostMapping("/myExecutive/complete")
     public ReturnDTO sampleExecutiveComplete(@RequestBody @Valid List<SampleOperateRequest> requestList, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -102,10 +113,7 @@
         return labExecutiveInfoService.sampleExecutiveComplete(requestList);
     }
 
-    /**
-     * 实验室检测-部门检测/我的检测 编辑（只能修改应出具证书）
-     */
-    @ApiOperation("实验室检测-部门检测/我的检测 编辑（只能修改应出具证书）")
+    @ApiOperation("实验室任务/我的任务 编辑（只能修改应出具证书）")
     @PostMapping("/executive/update")
     public ReturnDTO updateExecutive(@RequestBody @Valid UpdateExecutiveRequest request, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -114,10 +122,7 @@
         return labExecutiveInfoService.updateExecutive(request);
     }
 
-    /**
-     * 实验室检测-部门检测/我的检测 详情
-     */
-    @ApiOperation("实验室检测-部门检测/我的检测 详情")
+    @ApiOperation("实验室任务/我的任务 详情")
     @PostMapping("/executive/detail")
     public ReturnDTO<ExecutiveDetailResponse> executiveDetail(@RequestBody @Valid ExecutiveDetailRequest request, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
@@ -131,7 +136,7 @@
      * 退回后会将下一个要执行的实验室检测状态更新为待分配，将后面的实验室顺序变更为连续（都进行减1）
      * 最后一个检测的实验室退回，等分发员再增加实验室或设备收发中的已收入直接手动点击完成
      */
-    @ApiOperation("实验室检测-部门检测/我的检测 退回（待检测/检测中->退回）")
+    @ApiOperation("实验室任务/我的任务 退回（待检测/检测中->退回）")
     @PostMapping("/executive/sendBack")
     public ReturnDTO executiveSendBack(@RequestBody @Valid ExecutiveSendBackRequest request, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -140,9 +145,6 @@
         return labExecutiveInfoService.sampleExecutiveSendBack(request);
     }
 
-    /**
-     * 分发员编辑实验室检测列表
-     */
     @ApiOperation("分发员编辑实验室检测列表")
     @PostMapping("/handOut/updateList")
     public ReturnDTO updateExecutiveList(@RequestBody @Valid UpdateExecutiveListRequest request, BindingResult bindingResult) {
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java
index 48a67ed..0c04f31 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java
@@ -10,6 +10,7 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.resource.customer.CustomerApprovalListRequest;
 import com.casic.missiles.dto.resource.customer.CustomerSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceCustomerInfo;
@@ -26,6 +27,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -55,6 +57,13 @@
         return customerInfoService.saveCustomerInfo(request);
     }
 
+    @ApiOperation("委托方名录导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody CustomerApprovalListRequest request) throws Exception {
+        List<BizResourceCustomerInfo> list = super.exportList(request);
+        super.exportExcel(BizResourceCustomerInfo.class, list, ExportEnum.CUSTOMER_INFO.getSheetName());
+    }
+
     @ApiOperation("委托方人员列表（分页）")
     @PostMapping("/person/listPage")
     public ReturnDTO<PageInfoBT<BizResourceCustomerStaff>> personListPage(@RequestBody IdDTO idDto) {
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
index 972ed4b..6418ea5 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
@@ -5,6 +5,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.resource.customer.SuggestFormApprovalListRequest;
 import com.casic.missiles.dto.resource.customer.SuggestFormSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceCustomerSuggestForm;
@@ -20,6 +21,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -50,4 +52,11 @@
         return suggestFormService.saveSuggestForm(request);
     }
 
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody SuggestFormApprovalListRequest request) throws Exception {
+        List<BizResourceCustomerSuggestForm> list = super.exportList(request);
+        super.exportExcel(BizResourceCustomerSuggestForm.class, list, ExportEnum.CUSTOMER_SUGGEST_FORM.getSheetName());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java
index 1934d1a..9e07eab 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java
@@ -15,12 +15,16 @@
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.resource.IEnvEnvironmentRecordConfigService;
 import com.casic.missiles.service.resource.IEnvEnvironmentRecordDataService;
+import com.casic.missiles.service.resource.IEnvLocationInfoService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
 import java.util.List;
@@ -39,6 +43,8 @@
     private IEnvEnvironmentRecordDataService environmentRecordDataService;
     @Autowired
     private IEnvEnvironmentRecordConfigService environmentRecordConfigService;
+    @Autowired
+    private IEnvLocationInfoService locationInfoService;
 
     @ApiOperation("环境记录单数据列表/详情")
     @PostMapping("/data/listPage")
@@ -95,4 +101,11 @@
         });
         return environmentRecordConfigService.deleteEnvironmentRecordConfig(idDTO.getId());
     }
+
+    @ApiOperation("地点列表")
+    @PostMapping("/location/listPage")
+    public ReturnDTO<PageInfoBT<LocationListResponse>> locationListPage(@RequestBody @Valid LocationListRequest request) {
+        Page<LocationListResponse> page = PageFactory.defaultPage();
+        return ReturnUtil.success(super.packForBT(locationInfoService.listPage(page, request)));
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java
index 82efe3f..e9561fa 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java
@@ -10,6 +10,7 @@
 import com.casic.missiles.dto.resource.seal.SealLogListRequest;
 import com.casic.missiles.dto.resource.seal.SealNoteApprovalListRequest;
 import com.casic.missiles.dto.resource.seal.SealNoteSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceSealUseLog;
@@ -27,6 +28,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -58,6 +60,13 @@
         return sealUseNoteService.saveSeal(request);
     }
 
+    @ApiOperation("印章使用登记导出（列表和导出中去掉经办人和监印人）")
+    @PostMapping("/listExport")
+    public void export(@RequestBody SealNoteApprovalListRequest request) throws Exception {
+        List<BizResourceSealUseNote> list = super.exportList(request);
+        super.exportExcel(BizResourceSealUseNote.class, list, ExportEnum.SEAL_NOTE.getSheetName());
+    }
+
     // TODO: 2023/7/28 印章使用日志：系统中使用印章时插入数据库
 
     @ApiOperation("印章使用日志列表（分页）")
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java
index 9b674fc..06b6521 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java
@@ -9,16 +9,20 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.resource.staff.StaffCertRequest;
 import com.casic.missiles.dto.resource.staff.StaffCertResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.service.resource.IBizResourceStaffInfoService;
 import com.casic.missiles.service.resource.IBizResourceStaffVerifierService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.List;
+
 /**
  * @Description:
  * @Author: wangpeng
@@ -41,9 +45,21 @@
         return ReturnUtil.success(super.packForBT(responsePage));
     }
 
+    @ApiOperation("证书逾期提醒导出")
+    @PostMapping("/listExport")
+    public void exportList(@RequestBody StaffCertRequest request) throws Exception {
+        List<StaffCertResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = staffInfoService.certListByIds(request.getIds());
+        } else {
+            list = staffInfoService.certList(request);
+        }
+        super.exportExcel(StaffCertResponse.class, list, ExportEnum.STAFF_CERTIFICATE_EXPIRE.getSheetName());
+    }
+
     @ApiOperation("证书逾期提醒")
     @PostMapping("/expirationReminder")
-    public ReturnDTO expirationReminder(@RequestBody IdDTO idDto) {
-        return verifierService.expirationReminder(idDto);
+    public ReturnDTO expirationReminder(@RequestBody IdDTO idDTO) {
+        return verifierService.expirationReminder(idDTO);
     }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java
index 3b251ad..a6e7850 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java
@@ -12,6 +12,7 @@
 import com.casic.missiles.dto.resource.staff.StaffListRequest;
 import com.casic.missiles.dto.resource.staff.TrainListRequest;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.*;
@@ -22,7 +23,10 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
 import java.util.List;
@@ -52,8 +56,19 @@
             throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
         }
         Page<BizResourceStaffInfo> page = PageFactory.defaultPage();
-        Page<BizResourceStaffInfo> responsePage = staffInfoService.listPage(page, request);
-        return ReturnUtil.success(super.packForBT(responsePage));
+        return ReturnUtil.success(super.packForBT(staffInfoService.listPage(page, request)));
+    }
+
+    @ApiOperation("人员登记导出")
+    @PostMapping("/listExport")
+    public void exportList(@RequestBody StaffListRequest request) throws Exception {
+        List<BizResourceStaffInfo> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = staffInfoService.listByIds(request.getIds());
+        } else {
+            list = staffInfoService.list(request);
+        }
+        super.exportExcel(BizResourceStaffInfo.class, list, ExportEnum.STAFF_INFO.getSheetName());
     }
 
     @ApiOperation("人员登记详情基础信息")
@@ -85,9 +100,9 @@
 
     @ApiOperation("科研教育列表（分页）")
     @PostMapping("/education/listPage")
-    public ReturnDTO<PageInfoBT<BizResourceStaffEducation>> educationListPage(@RequestBody IdDTO idDto) {
+    public ReturnDTO<PageInfoBT<BizResourceStaffEducation>> educationListPage(@RequestBody IdDTO idDTO) {
         Page<BizResourceStaffEducation> page = PageFactory.defaultPage();
-        Page<BizResourceStaffEducation> responsePage = staffInfoService.educationListPage(page, idDto);
+        Page<BizResourceStaffEducation> responsePage = staffInfoService.educationListPage(page, idDTO);
         return ReturnUtil.success(super.packForBT(responsePage));
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java
index af6aa86..d85d84a 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java
@@ -9,6 +9,7 @@
 import com.casic.missiles.dto.resource.outsideService.SupplierApprovalListRequest;
 import com.casic.missiles.dto.resource.outsideService.SupplierSaveResponse;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceSupplierAbility;
@@ -67,6 +68,13 @@
         return ReturnUtil.success(supplierInfoService.detail(idDTO.getId()));
     }
 
+    @ApiOperation("合格供方导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody SupplierApprovalListRequest request) throws Exception {
+        List<BizResourceSupplierInfo> list = super.exportList(request);
+        super.exportExcel(BizResourceSupplierInfo.class, list, ExportEnum.SUPPLIER_INFO.getSheetName());
+    }
+
     @ApiOperation("供方人员列表（分页）")
     @PostMapping("/person/listPage")
     public ReturnDTO<PageInfoBT<BizResourceSupplierPerson>> personListPage(@RequestBody IdDTO idDTO) {
diff --git a/casic-metering-api/src/main/resources/config/application.yml b/casic-metering-api/src/main/resources/config/application.yml
index 350db5f..ecff521 100644
--- a/casic-metering-api/src/main/resources/config/application.yml
+++ b/casic-metering-api/src/main/resources/config/application.yml
@@ -126,7 +126,7 @@
     #作者
     author: wangpeng
     #待生成对象表名
-    table-name: biz_equipment_technical_target_approval,biz_equipment_attachment_approval,biz_equipment_checkpoint_approval
+    table-name: biz_business_outsource_protocol
 
 reminder:
   #节点--common模块config包 ReminderNodeConfig配置
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
index 4a19e4e..d47d552 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
@@ -53,6 +53,7 @@
     SUGGEST_FORM_SAVE_FAILED(2509, "委托方意见登记表保存至草稿箱失败"),
     EXAMINE_FORM_SAVE_FAILED(2510, "要求、委托书及合同评审表保存至草稿箱失败"),
     CUSTOMER_EXIST_SAVE_FAILED(2511, "该委托方已存在，请重新选择"),
+    DUPLICATE_LOCATION_NO(2512, "地点编号已存在"),
 
     /**
      * 计量检定业务模块
@@ -68,6 +69,8 @@
     COMPLETE_SAMPLE_NOT_EXIST(2609, "检测中不存在扫描收入的样品"),
     CANNOT_CHANGE_MEASURE_INFO(2610, "无法更改非当前登录用户的检测信息"),
     NON_EXIST_ORDER_OR_SAMPLE(2611, "不存在该委托单或该委托单下的样品"),
+    OUTSOURCE_ACCESS_SAVE_FAILED(2612, "测试、校准或检定工作分包评审表保存至草稿箱失败"),
+    OUTSOURCE_PROTOCOL_SAVE_FAILED(2613, "测试、校准或检定工作分包协议书保存至草稿箱失败"),
 
     /**
      * 历史遗留备用
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
index 5089ad1..81a406b 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
@@ -10,54 +10,38 @@
     /**
      * 资源管理
      */
-    ENVIRONMENT_DATA_EXPORT("environmentData", "environmentData", "环境记录单数据"),
+    ENVIRONMENT_DATA_EXPORT("environmentData", "环境记录单数据", "环境记录单数据"),
+    STAFF_INFO("staffInfo", "人员登记", "人员登记"),
+    STAFF_CERTIFICATE_EXPIRE("certificateExpire", "证书逾期提醒", "证书逾期提醒"),
+    SUPPLIER_INFO("supplierInfo", "合格供方名录", "合格供方名录"),
+    CUSTOMER_INFO("customerInfo", "委托方名录", "委托方名录"),
+    CUSTOMER_SUGGEST_FORM("customerSuggestForm", "委托方意见登记表", "委托方意见登记表"),
+    SEAL_NOTE("sealNote", "印章使用登记", "印章使用登记"),
 
-    FILE_EXPORT("meterFileData", "meterFileData", "计量文件信息"),
-    TRAIN_PLAN_EXPORT("trainPlanData", "trainPlanData", "培训计划"),
-    TRAIN_LOG_EXPORT("trainLogData", "trainLogData", "培训记录"),
-    METER_ORGANIZE_EXPORT("meterOrganizeData", "meterOrganizeData", "计量组织"),
-    TRACE_SUPPLIER_EXPORT("traceSupplierData", "traceSupplierData", "溯源供方"),
-    SIGN_EXPORT("signData", "signData", "签名/签章"),
-    TEMPLATE_EXPORT("templateData", "templateData", "原始记录模板/证书报告模板"),
-    FIXED_ASSETS("meterFixedAssets", "meterFixedAssets", "固定资产"),
-    METER_EQUIPMENT("meterEquipment", "meterEquipment", "测量设备"),
-    CALIBRATION_TEST_EQUIPMENT("calibrationTestEquipment", "calibrationTestEquipment", "校准检定设备"),
-    MEASURE_ACCOUNT("measureAccount", "measureAccount", "测量工装"),
-    STANDARD_SUPPORT_EQUIPMENT("standardSupportEquipment", "standardSupportEquipment", "标准配套设备"),
-    STANDARD_EQUIPMENT("standardEquipment", "standardEquipment", "标准装置"),
-    FLOW_DEF_EXPORT("flowDefData", "flowDefData", "流程定义"),
-    STAFF_CERTIFICATE("certificate", "certificate", "计量人员证书"),
-    CHECK_INFO("checkInfo", "checkInfo", "设备管理点检测"),
-    EQUIPMENT_APPLY("equipmentApply", "equipmentApply", "设备借用"),
-    STANDARD_EQUIPMENT_REMIND("equipmentApplyRemind", "equipmentApplyRemind", "标准装置到期提醒"),
-    METER_PRICE("meterPrice", "meterPrice", "价格库"),
-    METER_STAFF("meterStaff", "meterStaff", "计量人员"),
-    STANDARD_EQUIPMENT_APPLY("standardEquipmentApply", "standardEquipmentApply", "标准装置申请"),
-    STATE_MANAGE_APPLY("stateManage", "stateManage", "状态管理"),
-    METER_ACCEPTANCE_CHECK("acceptanceCheck", "acceptanceCheck", "设备检修保养验收单"),
-    CUSTOMER_EXPORT("customerData", "customerData", "客户信息"),
-    ORDER_EXPORT("orderData", "orderData", "委托书信息"),
-    SAMPLE_EXPORT("sampleData", "sampleData", "样本信息"),
-    EXCHANGE_DATA("exchangeData", "exchangeData", "设备交接单"),
-    DISPATCH_DATA("dispatchData", "dispatchData", "设备收发"),
-    ENVIRONMENT_DATA("environmentData", "environmentData", "环境记录单"),
-    ORIGIN_DATA("originData", "originData", "原始记录"),
-    CERTIFICATE_REPORT("certificateReport", "certificateReport", "证书报告"),
-    ADVICE_EXPORT("adviceData", "adviceData", "客户反馈"),
-    HANDOUT_EXPORT("handoutData", "handoutData", "任务分发列表"),
-    OUTSOURCER_EXPORT("outsourcerData", "outsourcerData", "分包方"),
-    SITE_EXECUTIVE_EXPORT("siteExecutiveData", "siteExecutiveData", "现场测试、校准或检定"),
-    CERTIFICATE_PRINT_EXPORT("certificatePrintData", "certificatePrintData", "证书打印"),
-    DOWNLOAD_TEMPLATE("downloadTemplate", "downloadTemplate", "页面配置"),
-    OUTSOURCER_CERTIFICATE_EXPORT("outsourceCertificateData", "outsourceCertificateData", "分包证书"),
-    SETTLEMENT_INFO_EXPORT("settlementInfoData", "settlementInfoData", "业务结算"),
-    EQUIPMENT_REMIND("equipmentRemind", "equipmentRemind", "设备到期提醒"),
-    AGREEMENT_INFO_EXPORT("agreementInfoData", "agreementInfoData", "合同"),
-    WORK_STATISTICS_EXPORT("workStatisticsData", "workStatisticsData", "实时工作统计"),
-    DEPT_OUTPUT_EXPORT("deptOutputData", "deptOutputData", "部门产值分析"),
-    WORKLOAD_EXPORT("workloadData", "workloadData", "业务工作量分析"),
-    DEPT_COMPREHENSIVE_EXPORT("deptComprehensiveData", "deptComprehensiveData", "部门综合分析"),
-    ENVIRONMENTAL_RECORD("environmentalRecordData", "environmentalRecordData", "现场环境记录");
+    /**
+     * 计量检定业务
+     */
+    OUTSOURCER_EXPORT("outsourcerData", "分包方名录", "分包方名录"),
+    IDENTIFY_EXPORT("identifyData", "计量标识", "计量标识"),
+    ORDER_EXPORT("orderData", "任务单", "任务单"),
+    DISPATCH_DATA("dispatchData", "设备收发", "设备收发"),
+    HANDOUT_EXPORT("handoutData", "任务分发", "任务分发"),
+    SITE_EXECUTIVE_EXPORT("siteExecutiveData", "现场测试、校准或检定", "现场测试、校准或检定"),
+    CERTIFICATE_REPORT("certificateReport", "证书审批", "证书审批"),
+    CERTIFICATE_CHANGE_APPLY("certificateChangeApply", "证书报告补充或更换申请单", "证书报告补充或更换申请单"),
+    CERTIFICATE_PRINT("certificatePrintData", "证书打印审批", "证书打印审批"),
+    DEPT_EXECUTIVE_TASK("deptExecutiveTaskData", "实验室任务", "实验室任务"),
+    MY_EXECUTIVE_TASK("myExecutiveTaskData", "我的任务", "我的任务"),
+    OUTSOURCE_ASSESS("outsourceAssess", "测试、校准或检定工作分包评审表", "测试、校准或检定工作分包评审表"),
+    OUTSOURCE_PROTOCOL("outsourceProtocol", "测试、校准或检定工作分包协议书", "测试、校准或检定工作分包协议书"),
+
+    /**
+     * 系统管理
+     */
+    SIGN_EXPORT("signData", "签名", "签名"),
+    TEMPLATE_EXPORT("templateData", "文件模板", "文件模板"),
+    FLOW_DEF_EXPORT("flowDefData", "流程定义", "流程定义"),
+    DOWNLOAD_TEMPLATE("downloadTemplate", "流程定义", "页面配置");
 
     ExportEnum(String fileName, String sheetName, String description) {
         this.fileName = fileName;
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateRecordTypeCodeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateRecordTypeCodeEnum.java
index 31d913c..a963522 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateRecordTypeCodeEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateRecordTypeCodeEnum.java
@@ -46,4 +46,14 @@
     String SITE_EXECUTIVE_APPROVAL = "01";
     //《现场测试、校准或检定工作记录表》
     String SITE_EXECUTIVE_LOG = "02";
+
+    //测试、校准或检定工作分包协议书
+    String OUTSOURCE_PROTOCOL = "01";
+    //测试、校准或检定工作分包评审表
+    String OUTSOURCE_ACCESS = "02";
+    //测试、校准或检定工作分包通知书
+    String OUTSOURCE_NOTICE = "03";
+    //测试、校准或检定工作分包方名录
+    String OUTSOURCE_INFO = "04";
+
 }
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
index 24b8635..f78bd53 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
@@ -15,6 +15,10 @@
     String CERTIFICATE_CHANGE_APPLY_BEAN_NAME = "certificateChangeApplyBean";
     //现场测试、校准或检定
     String SITE_EXECUTIVE_BEAN_NAME = "siteExecutiveBean";
+    //测试、校准或检定工作分包评审表
+    String OUTSOURCE_ASSESS_BEAN_NAME = "outsourceAssessBean";
+    //测试、校准或检定工作分包协议书
+    String OUTSOURCE_PROTOCOL_BEAN_NAME = "outsourceProtocolBean";
 
     /*********************************设备与装置************************************/
     //设备台账
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 b21c661..6b86fd1 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
@@ -18,6 +18,8 @@
     OUTSOURCER_APPROVAL(OUTSOURCER_BEAN_NAME, ""),
     CERTIFICATE_CHANGE_APPROVAL(CERTIFICATE_CHANGE_APPLY_BEAN_NAME, ""),
     SITE_EXECUTIVE_APPROVAL(SITE_EXECUTIVE_BEAN_NAME, ""),
+    OUTSOURCE_ASSESS_APPROVAL(OUTSOURCE_ASSESS_BEAN_NAME, ""),
+    OUTSOURCE_PROTOCOL_APPROVAL(OUTSOURCE_PROTOCOL_BEAN_NAME, ""),
 
     ACTION_STATUS_MAP(new HashMap<String, AwareActionStatusEnum>() {
         {
@@ -47,6 +49,10 @@
             put(ApplyFromIdEnum.CERTIFICATE_CHANGE_APPROVAL.getCode(), CERTIFICATE_CHANGE_APPROVAL);
             //现场测试、校准或检定审批
             put(ApplyFromIdEnum.SITE_EXECUTIVE_APPROVAL.getCode(), SITE_EXECUTIVE_APPROVAL);
+            //测试、校准或检定工作分包评审表
+            put(ApplyFromIdEnum.OUTSOURCE_ASSESS_APPROVAL.getCode(), OUTSOURCE_ASSESS_APPROVAL);
+            //测试、校准或检定工作分包协议书
+            put(ApplyFromIdEnum.OUTSOURCE_PROTOCOL_APPROVAL.getCode(), OUTSOURCE_PROTOCOL_APPROVAL);
         }
     });
     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 934405e..c7410bd 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
@@ -9,6 +9,8 @@
     CERTIFICATE_CHANGE_APPROVAL("jljdywzsbchghsqd", MessageSourceModuleEnum.BUSINESS.getCode(), "证书/报告补充或更换申请单"),
     OUTSOURCER_APPROVAL("jljdywcsjzhgfbfml", MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定合格分包方名录"),
     SITE_EXECUTIVE_APPROVAL("jljdywxccsjzsp", MessageSourceModuleEnum.BUSINESS.getCode(), "现场测试、校准或检定审批"),
+    OUTSOURCE_ASSESS_APPROVAL("jljdywcsjzfbpsb", MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包评审表"),
+    OUTSOURCE_PROTOCOL_APPROVAL("jljdywcsjzfbxys", MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包协议书"),
 
 
     /*******************************************设备与装置*********************************************/
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/GeneralApprovalMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/GeneralApprovalMapper.java
index 4fb7344..0c9d6ae 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/GeneralApprovalMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/GeneralApprovalMapper.java
@@ -17,8 +17,4 @@
 
     Page<O> selectBatchForApprovalList(Page<O> page, @Param("request") R request, @Param("businessKeys") List<String> businessKeys);
 
-//    Page<O> selectListPage(Page<O> page, @Param("request") R request);
-
-//    Long selectMaxNo();
-
 }
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceAssessMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceAssessMapper.java
index 7867bb8..ba59009 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceAssessMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceAssessMapper.java
@@ -1,7 +1,12 @@
 package com.casic.missiles.mapper.business;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.business.outsource.OutsourceAssessApprovalListRequest;
+import com.casic.missiles.mapper.GeneralApprovalMapper;
 import com.casic.missiles.model.business.BizBusinessOutsourceAssess;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * <p>
@@ -11,6 +16,10 @@
  * @author wangpeng
  * @since 2023-08-16
  */
-public interface BizBusinessOutsourceAssessMapper extends BaseMapper<BizBusinessOutsourceAssess> {
+public interface BizBusinessOutsourceAssessMapper extends GeneralApprovalMapper<BizBusinessOutsourceAssess, BizBusinessOutsourceAssess, OutsourceAssessApprovalListRequest> {
+
+    Page<BizBusinessOutsourceAssess> selectBatchForApprovalList(Page<BizBusinessOutsourceAssess> page, @Param("request") OutsourceAssessApprovalListRequest request, @Param("businessKeys") List<String> businessKeys);
+
+    Long selectMaxProjectNo();
 
 }
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceProtocolMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceProtocolMapper.java
new file mode 100644
index 0000000..e6aba35
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceProtocolMapper.java
@@ -0,0 +1,24 @@
+package com.casic.missiles.mapper.business;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.business.outsource.OutsourceProtocolApprovalListRequest;
+import com.casic.missiles.mapper.GeneralApprovalMapper;
+import com.casic.missiles.model.business.BizBusinessOutsourceProtocol;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 计量检定业务-分包管理-测试、校准或检定工作分包协议书 Mapper 接口
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-08-24
+ */
+public interface BizBusinessOutsourceProtocolMapper extends GeneralApprovalMapper<BizBusinessOutsourceProtocol, BizBusinessOutsourceProtocol, OutsourceProtocolApprovalListRequest> {
+
+    Page<BizBusinessOutsourceProtocol> selectBatchForApprovalList(Page<BizBusinessOutsourceProtocol> page, @Param("request") OutsourceProtocolApprovalListRequest request, @Param("businessKeys") List<String> businessKeys);
+
+    Long selectMaxProtocolNo();
+}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/EnvLocationInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/EnvLocationInfoMapper.java
new file mode 100644
index 0000000..49eff87
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/EnvLocationInfoMapper.java
@@ -0,0 +1,21 @@
+package com.casic.missiles.mapper.resource;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.resource.environment.LocationListRequest;
+import com.casic.missiles.dto.resource.environment.LocationListResponse;
+import com.casic.missiles.model.resource.EnvLocationInfo;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * <p>
+ * 实验室环境监控系统-设备表 Mapper 接口
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-06-07
+ */
+public interface EnvLocationInfoMapper extends BaseMapper<EnvLocationInfo> {
+
+    Page<LocationListResponse> selectLocationListPage(Page<LocationListResponse> page, @Param("request") LocationListRequest request);
+}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java
index de124db..85ed0f7 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java
@@ -1,7 +1,9 @@
 package com.casic.missiles.mapper.system;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.dto.system.SignDetailResponse;
+import com.casic.missiles.dto.system.SignListRequest;
 import com.casic.missiles.model.system.SystemSign;
 import org.apache.ibatis.annotations.Param;
 
@@ -22,4 +24,8 @@
     SignDetailResponse selectSignDetailById(Long id);
 
     List<SystemSign> selectUsableSignList(@Param("userId") Long userId);
+
+    Page<SystemSign> selectSignListPage(Page<SystemSign> page, @Param("request") SignListRequest request);
+
+    List<SystemSign> selectSignList(@Param("request") SignListRequest request);
 }
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateChangeApplyMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateChangeApplyMapper.xml
index d798447..c496092 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateChangeApplyMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateChangeApplyMapper.xml
@@ -30,31 +30,31 @@
         SELECT *
         FROM biz_business_certificate_change_apply
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.changeApplyNo != null and request.changeApplyNo !=''">
+        <if test="request != null and request.changeApplyNo != null and request.changeApplyNo !=''">
             and change_apply_no like concat('%',#{request.changeApplyNo},'%')
         </if>
-        <if test="request.changeReportNo != null and request.changeReportNo !=''">
+        <if test="request != null and request.changeReportNo != null and request.changeReportNo !=''">
             and change_report_no like concat('%',#{request.changeReportNo},'%')
         </if>
-        <if test="request.changeReportName != null and request.changeReportName !=''">
+        <if test="request != null and request.changeReportName != null and request.changeReportName !=''">
             and change_report_name like concat('%',#{request.changeReportName},'%')
         </if>
-        <if test="request.changeType != null and request.changeType !=''">
+        <if test="request != null and request.changeType != null and request.changeType !=''">
             and change_type = #{request.changeType}
         </if>
-        <if test="request.createUserName != null and request.createUserName !=''">
+        <if test="request != null and request.createUserName != null and request.createUserName !=''">
             and create_user_name like concat('%',#{request.createUserName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificatePrintMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificatePrintMapper.xml
index b66cd99..49c0ac8 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificatePrintMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificatePrintMapper.xml
@@ -31,34 +31,34 @@
         LEFT JOIN biz_business_order_sample_relation bosr ON (bosr.order_id = bcr.order_id AND bosr.sample_id = bcr.sample_id)
         LEFT JOIN biz_business_order_info boi ON boi.id = bosr.order_id
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and bcp.approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.printStatus != null and request.printStatus !=''">
+        <if test="request != null and request.printStatus != null and request.printStatus !=''">
             and print_status = #{request.printStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and bcp.create_user_id = #{request.createUserId}
         </if>
-        <if test="request.certificateReportNo != null and request.certificateReportNo !=''">
+        <if test="request != null and request.certificateReportNo != null and request.certificateReportNo !=''">
             and bcr.certificate_report_no like concat('%',#{request.certificateReportNo},'%')
         </if>
-        <if test="request.certificateReportName != null and request.certificateReportName !=''">
+        <if test="request != null and request.certificateReportName != null and request.certificateReportName !=''">
             and bcr.certificate_report_name like concat('%',#{request.certificateReportName},'%')
         </if>
-        <if test="request.customerName != null and request.customerName !=''">
+        <if test="request != null and request.customerName != null and request.customerName !=''">
             and boi.customer_name like concat('%',#{request.customerName},'%')
         </if>
-        <if test="request.sampleNo != null and request.sampleNo !=''">
+        <if test="request != null and request.sampleNo != null and request.sampleNo !=''">
             and bosr.sample_no like concat('%',#{request.sampleNo},'%')
         </if>
-        <if test="request.sampleName != null and request.sampleName !=''">
+        <if test="request != null and request.sampleName != null and request.sampleName !=''">
             and bosr.sample_name like concat('%',#{request.sampleName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and bcp.create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and bcp.create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml
index b366034..767695d 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml
@@ -46,33 +46,37 @@
         SELECT bcr.*, bosr.sample_no, bosr.sample_name, bosr.sample_model, rsi.staff_name
         FROM biz_business_certificate_report bcr
         LEFT JOIN biz_business_order_sample_relation bosr ON (bosr.order_id = bcr.order_id AND bosr.sample_id = bcr.sample_id)
+        LEFT JOIN biz_business_order_info boi ON boi.id = bcr.order_id
         LEFT JOIN biz_resource_staff_info rsi ON rsi.id = bcr.measure_person_id
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and bcr.approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and bcr.create_user_id = #{request.createUserId}
         </if>
-        <if test="request.certificateReportNo != null and request.certificateReportNo !=''">
+        <if test="request != null and request.customerId != null and request.customerId !=''">
+            and boi.customer_id = #{request.customerId}
+        </if>
+        <if test="request != null and request.certificateReportNo != null and request.certificateReportNo !=''">
             and bcr.certificate_report_no like concat('%',#{request.certificateReportNo},'%')
         </if>
-        <if test="request.certificateReportName != null and request.certificateReportName !=''">
+        <if test="request != null and request.certificateReportName != null and request.certificateReportName !=''">
             and bcr.certificate_report_name like concat('%',#{request.certificateReportName},'%')
         </if>
-        <if test="request.sampleNo != null and request.sampleNo !=''">
+        <if test="request != null and request.sampleNo != null and request.sampleNo !=''">
             and bosr.sample_no like concat('%',#{request.sampleNo},'%')
         </if>
-        <if test="request.measureCategory != null and request.measureCategory !=''">
+        <if test="request != null and request.measureCategory != null and request.measureCategory !=''">
             and bcr.measure_category = #{request.measureCategory}
         </if>
-        <if test="request.measurePerson != null and request.measurePerson !=''">
+        <if test="request != null and request.measurePerson != null and request.measurePerson !=''">
             and rsi.staff_name like concat('%',#{request.measurePerson},'%')
         </if>
-        <if test="request.calibrationTimeStart != null and request.calibrationTimeStart !=''">
+        <if test="request != null and request.calibrationTimeStart != null and request.calibrationTimeStart !=''">
             and bcr.calibration_time &gt;= #{request.calibrationTimeStart}
         </if>
-        <if test="request.calibrationTimeEnd != null and request.calibrationTimeEnd !=''">
+        <if test="request != null and request.calibrationTimeEnd != null and request.calibrationTimeEnd !=''">
             and bcr.calibration_time &lt;= #{request.calibrationTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceAssessMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceAssessMapper.xml
index d0fcf8b..c22c101 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceAssessMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceAssessMapper.xml
@@ -7,6 +7,8 @@
         <id column="id" property="id" />
         <result column="project_no" property="projectNo" />
         <result column="project_name" property="projectName" />
+        <result column="lab_code" property="labCode" />
+        <result column="group_code" property="groupCode" />
         <result column="applicant_id" property="applicantId" />
         <result column="applicant_name" property="applicantName" />
         <result column="applicant_time" property="applicantTime" />
@@ -31,7 +33,45 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, project_no, project_name, applicant_id, applicant_name, applicant_time, minio_file_name, remark, create_user_id, create_user_name, outsourcer_id, pre_start_time, pre_end_time, outsource_reason, pre_cost, approval_status, process_id, approve_situation, traceability, test_method, technique_ability, create_time, update_time
+        id, project_no, project_name, lab_code, group_code, applicant_id, applicant_name, applicant_time, minio_file_name, remark, create_user_id, create_user_name, outsourcer_id, pre_start_time, pre_end_time, outsource_reason, pre_cost, approval_status, process_id, approve_situation, traceability, test_method, technique_ability, create_time, update_time
     </sql>
 
+    <select id="selectMaxProjectNo" resultType="java.lang.Long">
+        SELECT IFNULL(max(RIGHT(project_no, 3)), 0) from biz_business_outsource_assess
+    </select>
+
+    <select id="selectBatchForApprovalList" resultMap="BaseResultMap">
+        SELECT bboa.*, bboi.outsourcer_name, bboi.director
+        FROM biz_business_outsource_assess bboa
+        LEFT JOIN biz_business_outsourcer_info bboi ON bboa.outsourcer_id = bboi.id
+        WHERE 1=1
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
+            and bboa.approval_status = #{request.approvalStatus}
+        </if>
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
+            and bboa.create_user_id = #{request.createUserId}
+        </if>
+        <if test="request != null and request.projectNo != null and request.projectNo !=''">
+            and bboa.project_no like concat('%',#{request.projectNo},'%')
+        </if>
+        <if test="request != null and request.outsourcerName != null and request.outsourcerName !=''">
+            and bboi.outsourcer_name like concat('%',#{request.outsourcerName},'%')
+        </if>
+        <if test="request != null and request.applicantName != null and request.applicantName !=''">
+            and bboa.applicant_name like concat('%',#{request.applicantName},'%')
+        </if>
+        <if test="request != null and request.applicantTimeStart != null and request.applicantTimeStart !=''">
+            and bboa.applicant_time &gt;= #{request.applicantTimeStart}
+        </if>
+        <if test="request != null and request.applicantTimeEnd != null and request.applicantTimeEnd !=''">
+            and bboa.applicant_time &lt;= #{request.applicantTimeEnd}
+        </if>
+        <if test="businessKeys != null">
+            and bboa.id in
+            <foreach collection="businessKeys" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
+        ORDER BY bboa.create_time DESC
+    </select>
 </mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceProtocolMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceProtocolMapper.xml
new file mode 100644
index 0000000..b7b2149
--- /dev/null
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceProtocolMapper.xml
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.mapper.business.BizBusinessOutsourceProtocolMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.business.BizBusinessOutsourceProtocol">
+        <id column="id" property="id" />
+        <result column="protocol_no" property="protocolNo" />
+        <result column="project_name" property="projectName" />
+        <result column="lab_code" property="labCode" />
+        <result column="group_code" property="groupCode" />
+        <result column="outsourcer_id" property="outsourcerId" />
+        <result column="remark" property="remark" />
+        <result column="outsource_no" property="outsourceNo" />
+        <result column="outsource_name" property="outsourceName" />
+        <result column="contacts" property="contacts" />
+        <result column="mobile" property="mobile" />
+        <result column="address" property="address" />
+        <result column="require_date" property="requireDate" />
+        <result column="outsource_cost" property="outsourceCost" />
+        <result column="director" property="director" />
+        <result column="item" property="item" />
+        <result column="requires" property="requires" />
+        <result column="create_user_id" property="createUserId" />
+        <result column="create_user_name" property="createUserName" />
+        <result column="approval_status" property="approvalStatus" />
+        <result column="process_id" property="processId" />
+        <result column="create_time" property="createTime" />
+        <result column="update_time" property="updateTime" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, protocol_no, project_name, lab_code, group_code, outsourcer_id, remark, outsource_no, outsource_name, contacts, mobile, address, require_date, outsource_cost, director, item, requires, create_user_id, create_user_name, approval_status, process_id, create_time, update_time
+    </sql>
+
+    <select id="selectMaxProtocolNo" resultType="java.lang.Long">
+        SELECT IFNULL(max(RIGHT(protocol_no, 3)), 0) from biz_business_outsource_protocol
+    </select>
+
+    <select id="selectBatchForApprovalList" resultMap="BaseResultMap">
+        SELECT *
+        FROM biz_business_outsource_protocol
+        WHERE 1=1
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
+            and approval_status = #{request.approvalStatus}
+        </if>
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
+            and create_user_id = #{request.createUserId}
+        </if>
+        <if test="request != null and request.protocolNo != null and request.protocolNo !=''">
+            and protocol_no like concat('%',#{request.protocolNo},'%')
+        </if>
+        <if test="request != null and request.outsourcerName != null and request.outsourcerName !=''">
+            and outsourcer_name like concat('%',#{request.outsourcerName},'%')
+        </if>
+        <if test="request != null and request.applicantName != null and request.applicantName !=''">
+            and create_user_name like concat('%',#{request.applicantName},'%')
+        </if>
+        <if test="request != null and request.applicantTimeStart != null and request.applicantTimeStart !=''">
+            and create_time &gt;= #{request.applicantTimeStart}
+        </if>
+        <if test="request != null and request.applicantTimeEnd != null and request.applicantTimeEnd !=''">
+            and create_time &lt;= #{request.applicantTimeEnd}
+        </if>
+        <if test="businessKeys != null">
+            and id in
+            <foreach collection="businessKeys" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
+        ORDER BY create_time DESC
+    </select>
+</mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourcerInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourcerInfoMapper.xml
index 510a80b..3049b54 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourcerInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourcerInfoMapper.xml
@@ -7,6 +7,8 @@
         <id column="id" property="id" />
         <result column="outsourcer_no" property="outsourcerNo" />
         <result column="outsourcer_name" property="outsourcerName" />
+        <result column="lab_code" property="labCode" />
+        <result column="group_code" property="groupCode" />
         <result column="outsourcer_brief_name" property="outsourcerBriefName" />
         <result column="outsourcer_size" property="outsourcerSize" />
         <result column="business_size" property="businessSize" />
@@ -55,32 +57,32 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, outsourcer_no, outsourcer_name, outsourcer_brief_name, outsourcer_size, business_size, grade, evaluation, tax_number, bank_account, bank_name, bank_account_number, postal_code, director, phone, fax, mobile, email, website, address_country, address_province, address_city, address_area, full_address, address_country_name, address_province_name, address_city_name, address_area_name, invoice_country, invoice_province, invoice_city, invoice_area, invoice_full_address, invoice_country_name, invoice_province_name, invoice_city_name, invoice_area_name, business_scope, business_content, minio_file_name, approval_status, process_id, remark, create_user_id, create_user_name, create_time, update_time
+        id, outsourcer_no, outsourcer_name, lab_code, group_code, outsourcer_brief_name, outsourcer_size, business_size, grade, evaluation, tax_number, bank_account, bank_name, bank_account_number, postal_code, director, phone, fax, mobile, email, website, address_country, address_province, address_city, address_area, full_address, address_country_name, address_province_name, address_city_name, address_area_name, invoice_country, invoice_province, invoice_city, invoice_area, invoice_full_address, invoice_country_name, invoice_province_name, invoice_city_name, invoice_area_name, business_scope, business_content, minio_file_name, approval_status, process_id, remark, create_user_id, create_user_name, create_time, update_time
     </sql>
 
     <select id="selectBatchForApprovalList" resultMap="BaseResultMap">
         SELECT *
         FROM biz_business_outsourcer_info
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.outsourcerNo != null and request.outsourcerNo !=''">
+        <if test="request != null and request.outsourcerNo != null and request.outsourcerNo !=''">
             and outsourcer_no like concat('%',#{request.outsourcerNo},'%')
         </if>
-        <if test="request.outsourcerName != null and request.outsourcerName !=''">
+        <if test="request != null and request.outsourcerName != null and request.outsourcerName !=''">
             and outsourcer_name like concat('%',#{request.outsourcerName},'%')
         </if>
-        <if test="request.director != null and request.director !=''">
+        <if test="request != null and request.director != null and request.director !=''">
             and director like concat('%',#{request.director},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
@@ -93,6 +95,6 @@
     </select>
 
     <select id="selectMaxNo" resultType="java.lang.Long">
-        SELECT IFNULL(max(RIGHT(outsourcer_no, 12)), 0) from biz_business_outsourcer_info
+        SELECT IFNULL(max(RIGHT(outsourcer_no, 3)), 0) from biz_business_outsourcer_info
     </select>
 </mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessSiteExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessSiteExecutiveInfoMapper.xml
index 135c5d0..3c5ae79 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessSiteExecutiveInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessSiteExecutiveInfoMapper.xml
@@ -38,25 +38,25 @@
         FROM biz_business_site_executive_info bsei
         LEFT JOIN biz_resource_customer_info rci ON bsei.customer_id = rci.id
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and bsei.approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and bsei.create_user_id = #{request.createUserId}
         </if>
-        <if test="request.siteExecutiveNo != null and request.siteExecutiveNo !=''">
+        <if test="request != null and request.siteExecutiveNo != null and request.siteExecutiveNo !=''">
             and bsei.site_executive_no like concat('%',#{request.siteExecutiveNo},'%')
         </if>
-        <if test="request.customerName != null and request.customerName !=''">
+        <if test="request != null and request.customerName != null and request.customerName !=''">
             and rci.outsourcer_name like concat('%',#{request.customerName},'%')
         </if>
-        <if test="request.applyName != null and request.applyName !=''">
+        <if test="request != null and request.applyName != null and request.applyName !=''">
             and bsei.apply_name like concat('%',#{request.applyName},'%')
         </if>
-        <if test="request.applyTimeStart != null and request.applyTimeStart !=''">
+        <if test="request != null and request.applyTimeStart != null and request.applyTimeStart !=''">
             and bsei.apply_time &gt;= #{request.applyTimeStart}
         </if>
-        <if test="request.applyTimeEnd != null and request.applyTimeEnd !=''">
+        <if test="request != null and request.applyTimeEnd != null and request.applyTimeEnd !=''">
             and bsei.apply_time &lt;= #{request.applyTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml
index 84d9e2a..6bd38a9 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml
@@ -105,6 +105,12 @@
         <if test="request.isUrgent != null and request.isUrgent !=''">
             AND bo.is_urgent = #{request.isUrgent}
         </if>
+        <if test="request.ids != null">
+            and blei.id in
+            <foreach collection="request.ids" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
         ORDER BY blei.update_time DESC
     </select>
 
@@ -137,6 +143,12 @@
         <if test="request.isUrgent != null and request.isUrgent !=''">
             AND bo.is_urgent = #{request.isUrgent}
         </if>
+        <if test="request.ids != null">
+            and blei.id in
+            <foreach collection="request.ids" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
         ORDER BY blei.update_time DESC
     </select>
 
diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardInfoMapper.xml
index 1a5551b..2ed8d17 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardInfoMapper.xml
@@ -45,12 +45,6 @@
         FROM biz_equipment_standard_info besi
         LEFT JOIN biz_equipment_standard_technology_relation bestr ON besi.standard_no = bestr.standard_no
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
-            and besi.approval_status = #{request.approvalStatus}
-        </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
-            and besi.create_user_id = #{request.createUserId}
-        </if>
         <if test="request.standardName != null and request.standardName !=''">
             and besi.standard_name like concat('%',#{request.standardName},'%')
         </if>
diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardTechnologyRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardTechnologyRelationMapper.xml
index fc7e16c..cd03c8c 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardTechnologyRelationMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardTechnologyRelationMapper.xml
@@ -6,6 +6,7 @@
     <resultMap id="BaseResultMap" type="com.casic.missiles.model.equipment.BizEquipmentStandardTechnologyRelation">
         <id column="id" property="id" />
         <result column="technology_file_id" property="technologyFileId" />
+        <result column="technology_file_no" property="technologyFileNo" />
         <result column="technology_file_name" property="technologyFileName" />
         <result column="standard_id" property="standardId" />
         <result column="standard_no" property="standardNo" />
@@ -14,7 +15,7 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, technology_file_id, technology_file_name, standard_id, remark
+        id, technology_file_id, technology_file_no, technology_file_name, standard_id, remark
     </sql>
 
 </mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceAuthorizeOrderMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceAuthorizeOrderMapper.xml
index ac5176c..554fe65 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceAuthorizeOrderMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceAuthorizeOrderMapper.xml
@@ -32,22 +32,22 @@
         SELECT *
         FROM biz_resource_authorize_order
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.orderNo != null and request.orderNo !=''">
+        <if test="request != null and request.orderNo != null and request.orderNo !=''">
             and order_no like concat('%',#{request.orderNo},'%')
         </if>
-        <if test="request.createUserName != null and request.createUserName !=''">
+        <if test="request != null and request.createUserName != null and request.createUserName !=''">
             and create_user_name like concat('%',#{request.createUserName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerExamineFormMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerExamineFormMapper.xml
index ab242f6..af7f98f 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerExamineFormMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerExamineFormMapper.xml
@@ -41,28 +41,28 @@
         SELECT *
         FROM biz_resource_customer_examine_form
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.formNo != null and request.formNo !=''">
+        <if test="request != null and request.formNo != null and request.formNo !=''">
             and form_no like concat('%',#{request.formNo},'%')
         </if>
-        <if test="request.labCode != null and request.labCode !=''">
+        <if test="request != null and request.labCode != null and request.labCode !=''">
             and lab_code like concat('%',#{request.labCode},'%')
         </if>
-        <if test="request.groupCode != null and request.groupCode !=''">
+        <if test="request != null and request.groupCode != null and request.groupCode !=''">
             and group_code like concat('%',#{request.groupCode},'%')
         </if>
-        <if test="request.createUserName != null and request.createUserName !=''">
+        <if test="request != null and request.createUserName != null and request.createUserName !=''">
             and create_user_name like concat('%',#{request.createUserName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerInfoMapper.xml
index fa8ffbc..06a2798 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerInfoMapper.xml
@@ -33,25 +33,25 @@
         SELECT *
         FROM biz_resource_customer_info
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.customerNo != null and request.customerNo !=''">
+        <if test="request != null and request.customerNo != null and request.customerNo !=''">
             and customer_no like concat('%',#{request.customerNo},'%')
         </if>
-        <if test="request.customerName != null and request.customerName !=''">
+        <if test="request != null and request.customerName != null and request.customerName !=''">
             and customer_name like concat('%',#{request.customerName},'%')
         </if>
-        <if test="request.contacts != null and request.contacts !=''">
+        <if test="request != null and request.contacts != null and request.contacts !=''">
             and contacts like concat('%',#{request.contacts},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java
index bb0c50f..13a699b 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java
@@ -12,6 +12,7 @@
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.IGeneralApprovalService;
+import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
@@ -19,6 +20,7 @@
 import org.springframework.web.bind.annotation.RequestBody;
 
 import javax.validation.Valid;
+import java.util.List;
 import java.util.Objects;
 
 /**
@@ -117,4 +119,17 @@
         }
         return baseApprovalService.failUpdate(request);
     }
+
+    public List<O> exportList(@RequestBody @Valid R request) throws Exception {
+        List<O> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = baseApprovalService.listExportByIds(request.getIds());
+        } else {
+            list = baseApprovalService.listExport(request);
+        }
+        for (O record : list) {
+            DictCodeUtils.convertDictCodeToName(record);
+        }
+        return list;
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java
index 8a90961..d775831 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java
@@ -5,6 +5,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.business.certificate.CertificateChangeApplyApprovalListRequest;
 import com.casic.missiles.dto.business.certificate.CertificateChangeApplySaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessCertificateChangeApply;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
@@ -20,6 +21,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -48,4 +50,12 @@
         }
         return changeApplyService.saveChangeApply(request);
     }
+
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody CertificateChangeApplyApprovalListRequest request) throws Exception {
+        List<BizBusinessCertificateChangeApply> list = super.exportList(request);
+        super.exportExcel(BizBusinessCertificateChangeApply.class, list, ExportEnum.CERTIFICATE_CHANGE_APPLY.getSheetName());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java
index 5fc4b07..af8230e 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java
@@ -9,6 +9,7 @@
 import com.casic.missiles.dto.business.certificate.CertificatePrintApprovalListRequest;
 import com.casic.missiles.dto.business.certificate.CertificatePrintListResponse;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.enums.business.CertificatePrintStatusEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessCertificatePrintLog;
@@ -18,10 +19,16 @@
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.io.IOException;
+import java.util.List;
 import java.util.Objects;
 
 /**
@@ -98,4 +105,16 @@
         });
         return certificatePrintService.certificatePrintLog(idDTO.getId());
     }
+
+    @ApiOperation("证书打印审批导出")
+    @PostMapping("/listExport")
+    public void exportList(@RequestBody CertificatePrintApprovalListRequest request) throws IOException {
+        List<CertificatePrintListResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = certificatePrintService.listByIds(request.getIds());
+        } else {
+            list = certificatePrintService.list(request);
+        }
+        super.exportExcel(CertificatePrintListResponse.class, list, ExportEnum.CERTIFICATE_PRINT.getSheetName());
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java
index 63b06dc..6b2efd5 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java
@@ -6,6 +6,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.business.certificate.CertificateReportApprovalListRequest;
 import com.casic.missiles.dto.business.certificate.CertificateReportSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessCertificateReport;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
@@ -21,6 +22,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -50,7 +52,7 @@
         return certificateReportService.saveCertificateReport(request);
     }
 
-    @ApiOperation("证书审批详情（基本信息）")
+    @ApiOperation("详情（基本信息）")
     @PostMapping("/detail")
     public ReturnDTO<BizBusinessCertificateReport> detail(@RequestBody @Valid BaseDetailRequest request, BindingResult bindingResult) throws Exception {
         if(bindingResult.hasErrors()){
@@ -59,4 +61,11 @@
         return certificateReportService.detail(request);
     }
 
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody CertificateReportApprovalListRequest request) throws Exception {
+        List<BizBusinessCertificateReport> list = super.exportList(request);
+        super.exportExcel(BizBusinessCertificateReport.class, list, ExportEnum.CERTIFICATE_REPORT.getSheetName());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java
index 46b26bd..57c0809 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java
@@ -10,20 +10,21 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.business.identify.IdentifyListRequest;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessIdentifyInfo;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.business.IBizBusinessIdentifyInfoService;
+import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import javax.validation.Valid;
+import java.util.List;
 import java.util.Objects;
 
 /**
@@ -57,16 +58,13 @@
         return identifyInfoService.addIdentify(identifyInfo);
     }
 
-    @ApiOperation("标识打印更新")
+    @ApiOperation("标识打印更新（更新打印时间）")
     @PostMapping("/update")
-    public ReturnDTO updateIdentify(@RequestBody @Valid BizBusinessIdentifyInfo identifyInfo, BindingResult bindingResult) {
-        Assert.isFalse(Objects.isNull(identifyInfo.getId()), () -> {
+    public ReturnDTO updateIdentify(@RequestBody @Valid IdDTO idDTO) {
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        Assert.isFalse(bindingResult.hasErrors(), () -> {
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        });
-        return identifyInfoService.updateIdentify(identifyInfo);
+        return identifyInfoService.updateIdentify(idDTO.getId());
     }
 
     @ApiOperation("标识打印删除")
@@ -77,4 +75,37 @@
         });
         return identifyInfoService.deleteIdentify(idDTO.getId());
     }
+
+    @ApiOperation("标识打印导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody @Valid IdentifyListRequest request, BindingResult bindingResult) throws Exception {
+        if (bindingResult.hasErrors()) {
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        List<BizBusinessIdentifyInfo> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = identifyInfoService.listByIds(request.getIds());
+        } else {
+            list = identifyInfoService.list(request);
+        }
+        for (BizBusinessIdentifyInfo record : list) {
+            DictCodeUtils.convertDictCodeToName(record);
+        }
+        super.exportExcel(BizBusinessIdentifyInfo.class, list, ExportEnum.IDENTIFY_EXPORT.getSheetName());
+    }
+
+
+    // TODO: 2023/8/23 查询设备信息，4个底部按钮查设备（按钮的作用就是前端用来调不同接口、用来区分中间即将展示的标识），前端弹窗选设备，在确定保存时前端根据底部按钮判断传入设备类型deviceType字典code
+    // TODO: 2023/8/23 接口：查受检设备（第1个按钮），查设备台账（后3个按钮同一接口），查询之后前端根据标志类型的不同加到中间页面时进行判断（按产品给的对应表）
+    // TODO: 2023/8/23 提供二维码接口，前端在加到中间页面时调用一下
+
+    @ApiOperation("设备二维码")
+    @PostMapping("/equipment/qrCode")
+    public ReturnDTO<String> equipmentQrCode(@RequestBody @Valid IdDTO idDTO) {
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return identifyInfoService.equipmentQrCode(idDTO.getId());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java
index 707be6e..7e0453d 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java
@@ -117,7 +117,7 @@
     }
 
     @ApiOperation("任务单导出")
-    @PostMapping("/export")
+    @PostMapping("/listExport")
     public void orderExport(@RequestBody @Valid OrderListRequest request, HttpServletResponse response) {
         businessOrderService.orderExport(request, response);
     }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java
index 529a6ce..51432be 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java
@@ -1,9 +1,28 @@
 package com.casic.missiles.controller.business;
 
+import com.casic.missiles.controller.GeneralApprovalController;
+import com.casic.missiles.dto.BaseApprovalSubmitRequest;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.business.outsource.OutsourceAssessApprovalListRequest;
+import com.casic.missiles.dto.business.outsource.OutsourceAssessSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
+import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.model.business.BizBusinessOutsourceAssess;
+import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
+import com.casic.missiles.service.IGeneralApprovalService;
+import com.casic.missiles.service.business.IBizBusinessOutsourceAssessService;
 import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.BindingResult;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.validation.Valid;
+import java.util.List;
+
 /**
  * <p>
  * 计量检定业务-分包管理-测试、校准或检定工作分包评审表 前端控制器
@@ -15,6 +34,27 @@
 @Api(tags = "分包管理-测试、校准或检定工作分包评审表")
 @RestController
 @RequestMapping("/business/outsource/assess")
-public class BizBusinessOutsourceAssessController {
+public class BizBusinessOutsourceAssessController extends GeneralApprovalController<BizBusinessOutsourceAssess, BizBusinessOutsourceAssess, OutsourceAssessApprovalListRequest, BaseApprovalSubmitRequest> {
+    @Autowired
+    private IBizBusinessOutsourceAssessService outsourceAssessService;
 
+    public BizBusinessOutsourceAssessController(IGeneralApprovalService<BizBusinessOutsourceAssess, BizBusinessOutsourceAssess, OutsourceAssessApprovalListRequest, BaseApprovalSubmitRequest> baseApprovalService) {
+        super(baseApprovalService);
+    }
+
+    @ApiOperation("草稿箱-保存")
+    @PostMapping("/save")
+    public ReturnDTO<OutsourceAssessSaveResponse> saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceAssess request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        return outsourceAssessService.saveOutsourceAssess(request);
+    }
+
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception {
+        List<BizBusinessOutsourceAssess> list = super.exportList(request);
+        super.exportExcel(BizBusinessOutsourceAssess.class, list, ExportEnum.OUTSOURCE_ASSESS.getSheetName());
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java
new file mode 100644
index 0000000..9adef18
--- /dev/null
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java
@@ -0,0 +1,60 @@
+package com.casic.missiles.controller.business;
+
+import com.casic.missiles.controller.GeneralApprovalController;
+import com.casic.missiles.dto.BaseApprovalSubmitRequest;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.business.outsource.OutsourceProtocolApprovalListRequest;
+import com.casic.missiles.dto.business.outsource.OutsourceProtocolSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
+import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.model.business.BizBusinessOutsourceProtocol;
+import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
+import com.casic.missiles.service.IGeneralApprovalService;
+import com.casic.missiles.service.business.IBizBusinessOutsourceProtocolService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.BindingResult;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.validation.Valid;
+import java.util.List;
+
+/**
+ * <p>
+ * 计量检定业务-分包管理-测试、校准或检定工作分包协议书 前端控制器
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-08-24
+ */
+@Api(tags = "分包管理-测试、校准或检定工作分包协议书")
+@RestController
+@RequestMapping("/business/outsource/protocol")
+public class BizBusinessOutsourceProtocolController extends GeneralApprovalController<BizBusinessOutsourceProtocol, BizBusinessOutsourceProtocol, OutsourceProtocolApprovalListRequest, BaseApprovalSubmitRequest> {
+    @Autowired
+    private IBizBusinessOutsourceProtocolService outsourceProtocolService;
+
+    public BizBusinessOutsourceProtocolController(IGeneralApprovalService<BizBusinessOutsourceProtocol, BizBusinessOutsourceProtocol, OutsourceProtocolApprovalListRequest, BaseApprovalSubmitRequest> baseApprovalService) {
+        super(baseApprovalService);
+    }
+
+    @ApiOperation("草稿箱-保存")
+    @PostMapping("/save")
+    public ReturnDTO<OutsourceProtocolSaveResponse> saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceProtocol request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        return outsourceProtocolService.saveOutsourceProtocol(request);
+    }
+
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody OutsourceProtocolApprovalListRequest request) throws Exception {
+        List<BizBusinessOutsourceProtocol> list = super.exportList(request);
+        super.exportExcel(BizBusinessOutsourceProtocol.class, list, ExportEnum.OUTSOURCE_PROTOCOL.getSheetName());
+    }
+}
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java
index 097f645..f0f0943 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java
@@ -17,7 +17,6 @@
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.IGeneralApprovalService;
 import com.casic.missiles.service.business.IBizBusinessOutsourcerInfoService;
-import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -71,19 +70,8 @@
 
     @ApiOperation("分包方导出")
     @PostMapping("/listExport")
-    public void export(@RequestBody @Valid OutsourcerInfoApprovalListRequest request, BindingResult bindingResult) throws Exception {
-        if (bindingResult.hasErrors()) {
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        }
-        List<BizBusinessOutsourcerInfo> list;
-        if (!CollectionUtils.isEmpty(request.getIds())) {
-            list = outsourcerInfoService.listByIds(request.getIds());
-        } else {
-            list = outsourcerInfoService.list(request);
-        }
-        for (BizBusinessOutsourcerInfo record : list) {
-            DictCodeUtils.convertDictCodeToName(record);
-        }
+    public void export(@RequestBody OutsourcerInfoApprovalListRequest request) throws Exception {
+        List<BizBusinessOutsourcerInfo> list = super.exportList(request);
         super.exportExcel(BizBusinessOutsourcerInfo.class, list, ExportEnum.OUTSOURCER_EXPORT.getSheetName());
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java
index c2cbf9f..0410918 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java
@@ -17,11 +17,9 @@
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.IGeneralApprovalService;
 import com.casic.missiles.service.business.IBizBusinessSiteExecutiveInfoService;
-import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -60,7 +58,7 @@
         return siteExecutiveInfoService.saveSiteExecutiveInfo(siteExecutiveInfo);
     }
 
-    @ApiOperation("现场检测详情")
+    @ApiOperation("详情")
     @PostMapping("/detail")
     public ReturnDTO<SiteExecutiveDetailResponse> siteExecutiveDetail(@RequestBody @Valid IdDTO idDTO) throws Exception {
         Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
@@ -69,21 +67,10 @@
         return ReturnUtil.success(siteExecutiveInfoService.detail(idDTO.getId()));
     }
 
-    @ApiOperation("现场检测导出")
+    @ApiOperation("导出")
     @PostMapping("/listExport")
-    public void export(@RequestBody @Valid SiteExecutiveApprovalListRequest request, BindingResult bindingResult) throws Exception {
-        if (bindingResult.hasErrors()) {
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        }
-        List<SiteExecutiveApprovalListResponse> list;
-        if (!CollectionUtils.isEmpty(request.getIds())) {
-            list = siteExecutiveInfoService.listInfoByIds(request.getIds());
-        } else {
-            list = siteExecutiveInfoService.listInfo(request);
-        }
-        for (SiteExecutiveApprovalListResponse record : list) {
-            DictCodeUtils.convertDictCodeToName(record);
-        }
+    public void export(@RequestBody SiteExecutiveApprovalListRequest request) throws Exception {
+        List<SiteExecutiveApprovalListResponse> list = super.exportList(request);
         super.exportExcel(SiteExecutiveApprovalListResponse.class, list, ExportEnum.SITE_EXECUTIVE_EXPORT.getSheetName());
     }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
index 7e793cd..a92e209 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
@@ -55,7 +55,7 @@
 
     @ApiOperation("设备收发列表导出")
     @PostMapping("/export")
-    public void exportList(@RequestBody @Valid SampleDispatchListRequest request) throws IOException {
+    public void exportList(@RequestBody SampleDispatchListRequest request) throws IOException {
         List<SampleDispatchListResponse> list;
         if (!CollectionUtils.isEmpty(request.getIds())) {
             list = dispatchService.listByIds(request.getIds());
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java
index cdc77fc..d120fd4 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java
@@ -7,6 +7,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.business.labExecutive.*;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.business.IBusinessLabExecutiveInfoService;
@@ -14,6 +15,7 @@
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.*;
 
@@ -32,7 +34,7 @@
     @Autowired
     private IBusinessLabExecutiveInfoService labExecutiveInfoService;
 
-    @ApiOperation("实验室检测-部门检测-查询各状态列表（待检测、检测中、检测完）")
+    @ApiOperation("实验室任务-查询各状态列表（待检测、检测中、检测完）")
     @PostMapping("/deptExecutive/List")
     public ReturnDTO<PageInfoBT<SampleLabExecutiveListResponse>> queryDeptExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
@@ -43,10 +45,19 @@
         return ReturnUtil.success(super.packForBT(labExecutiveInfoService.deptLabExecutiveListPage(page, labExecutiveListRequest)));
     }
 
-    /**
-     * 实验室检测-我的检测-查询各状态列表（待检测、检测中、检测完）
-     */
-    @ApiOperation("实验室检测-我的检测-查询各状态列表（待检测、检测中、检测完）")
+    @ApiOperation("实验室任务导出")
+    @PostMapping("/deptExecutive/export")
+    public void deptExportList(@RequestBody @Valid SampleLabExecutiveListRequest request) throws Exception {
+        List<SampleLabExecutiveListResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = labExecutiveInfoService.deptLabExecutiveListByIds(request.getMeasureStatus(), request.getIds());
+        } else {
+            list = labExecutiveInfoService.deptLabExecutiveList(request);
+        }
+        super.exportExcel(SampleLabExecutiveListResponse.class, list, ExportEnum.DEPT_EXECUTIVE_TASK.getSheetName());
+    }
+
+    @ApiOperation("我的任务-查询各状态列表（待检测、检测中、检测完）")
     @PostMapping("/myExecutive/list")
     public ReturnDTO<PageInfoBT<SampleLabExecutiveListResponse>> queryMyExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
@@ -57,19 +68,25 @@
         return ReturnUtil.success(super.packForBT(labExecutiveInfoService.myLabExecutiveListPage(page, labExecutiveListRequest)));
     }
 
-    /**
-     * 实验室检测-我的检测-查询各状态样品数量（待检测、检测中、检测完）
-     */
-    @ApiOperation("实验室检测-我的检测-查询各状态样品数量（待检测、检测中、检测完）")
+    @ApiOperation("我的任务导出")
+    @PostMapping("/myExecutive/export")
+    public void exportList(@RequestBody @Valid SampleLabExecutiveListRequest request) throws Exception {
+        List<SampleLabExecutiveListResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = labExecutiveInfoService.myLabExecutiveListByIds(request.getMeasureStatus(), request.getIds());
+        } else {
+            list = labExecutiveInfoService.myLabExecutiveList(request);
+        }
+        super.exportExcel(SampleLabExecutiveListResponse.class, list, ExportEnum.MY_EXECUTIVE_TASK.getSheetName());
+    }
+
+    @ApiOperation("我的任务-查询各状态样品数量（待检测、检测中、检测完）")
     @GetMapping("/myExecutive/amount")
     public ReturnDTO<List<SampleAmountResponse>> queryMyExecutiveAmount() {
         return ReturnUtil.success(labExecutiveInfoService.myExecutiveAmount());
     }
 
-    /**
-     * 实验室检测-部门检测-分配（分配给具体人员）
-     */
-    @ApiOperation("实验室检测-部门检测-分配按钮（分配给具体人员）")
+    @ApiOperation("实验室任务-分配按钮（分配给具体人员）")
     @PostMapping("/deptExecutive/allocate")
     public ReturnDTO allocateStaff(@RequestBody @Valid SampleAllocateRequest sampleAllocateRequest, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -78,10 +95,7 @@
         return labExecutiveInfoService.allocateStaff(sampleAllocateRequest);
     }
 
-    /**
-     * 实验室检测-我的检测-检定人扫描收入（待检测->检测中）
-     */
-    @ApiOperation("实验室检测-我的检测-检定人扫描收入（待检测->检测中）")
+    @ApiOperation("我的任务-检定人扫描收入（待检测->检测中）")
     @PostMapping("/myExecutive/receive")
     public ReturnDTO sampleReceive(@RequestBody @Valid List<SampleOperateRequest> requestList, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -90,10 +104,7 @@
         return labExecutiveInfoService.sampleReceive(requestList);
     }
 
-    /**
-     * 实验室检测-负责人/检定人扫描检完（检测中->检测完）
-     */
-    @ApiOperation("实验室检测-负责人/检定人扫描检完（检测中->检测完）")
+    @ApiOperation("实验室任务-负责人/检定人扫描检完（检测中->检测完）")
     @PostMapping("/myExecutive/complete")
     public ReturnDTO sampleExecutiveComplete(@RequestBody @Valid List<SampleOperateRequest> requestList, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -102,10 +113,7 @@
         return labExecutiveInfoService.sampleExecutiveComplete(requestList);
     }
 
-    /**
-     * 实验室检测-部门检测/我的检测 编辑（只能修改应出具证书）
-     */
-    @ApiOperation("实验室检测-部门检测/我的检测 编辑（只能修改应出具证书）")
+    @ApiOperation("实验室任务/我的任务 编辑（只能修改应出具证书）")
     @PostMapping("/executive/update")
     public ReturnDTO updateExecutive(@RequestBody @Valid UpdateExecutiveRequest request, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -114,10 +122,7 @@
         return labExecutiveInfoService.updateExecutive(request);
     }
 
-    /**
-     * 实验室检测-部门检测/我的检测 详情
-     */
-    @ApiOperation("实验室检测-部门检测/我的检测 详情")
+    @ApiOperation("实验室任务/我的任务 详情")
     @PostMapping("/executive/detail")
     public ReturnDTO<ExecutiveDetailResponse> executiveDetail(@RequestBody @Valid ExecutiveDetailRequest request, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
@@ -131,7 +136,7 @@
      * 退回后会将下一个要执行的实验室检测状态更新为待分配，将后面的实验室顺序变更为连续（都进行减1）
      * 最后一个检测的实验室退回，等分发员再增加实验室或设备收发中的已收入直接手动点击完成
      */
-    @ApiOperation("实验室检测-部门检测/我的检测 退回（待检测/检测中->退回）")
+    @ApiOperation("实验室任务/我的任务 退回（待检测/检测中->退回）")
     @PostMapping("/executive/sendBack")
     public ReturnDTO executiveSendBack(@RequestBody @Valid ExecutiveSendBackRequest request, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -140,9 +145,6 @@
         return labExecutiveInfoService.sampleExecutiveSendBack(request);
     }
 
-    /**
-     * 分发员编辑实验室检测列表
-     */
     @ApiOperation("分发员编辑实验室检测列表")
     @PostMapping("/handOut/updateList")
     public ReturnDTO updateExecutiveList(@RequestBody @Valid UpdateExecutiveListRequest request, BindingResult bindingResult) {
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java
index 48a67ed..0c04f31 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java
@@ -10,6 +10,7 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.resource.customer.CustomerApprovalListRequest;
 import com.casic.missiles.dto.resource.customer.CustomerSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceCustomerInfo;
@@ -26,6 +27,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -55,6 +57,13 @@
         return customerInfoService.saveCustomerInfo(request);
     }
 
+    @ApiOperation("委托方名录导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody CustomerApprovalListRequest request) throws Exception {
+        List<BizResourceCustomerInfo> list = super.exportList(request);
+        super.exportExcel(BizResourceCustomerInfo.class, list, ExportEnum.CUSTOMER_INFO.getSheetName());
+    }
+
     @ApiOperation("委托方人员列表（分页）")
     @PostMapping("/person/listPage")
     public ReturnDTO<PageInfoBT<BizResourceCustomerStaff>> personListPage(@RequestBody IdDTO idDto) {
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
index 972ed4b..6418ea5 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
@@ -5,6 +5,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.resource.customer.SuggestFormApprovalListRequest;
 import com.casic.missiles.dto.resource.customer.SuggestFormSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceCustomerSuggestForm;
@@ -20,6 +21,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -50,4 +52,11 @@
         return suggestFormService.saveSuggestForm(request);
     }
 
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody SuggestFormApprovalListRequest request) throws Exception {
+        List<BizResourceCustomerSuggestForm> list = super.exportList(request);
+        super.exportExcel(BizResourceCustomerSuggestForm.class, list, ExportEnum.CUSTOMER_SUGGEST_FORM.getSheetName());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java
index 1934d1a..9e07eab 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java
@@ -15,12 +15,16 @@
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.resource.IEnvEnvironmentRecordConfigService;
 import com.casic.missiles.service.resource.IEnvEnvironmentRecordDataService;
+import com.casic.missiles.service.resource.IEnvLocationInfoService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
 import java.util.List;
@@ -39,6 +43,8 @@
     private IEnvEnvironmentRecordDataService environmentRecordDataService;
     @Autowired
     private IEnvEnvironmentRecordConfigService environmentRecordConfigService;
+    @Autowired
+    private IEnvLocationInfoService locationInfoService;
 
     @ApiOperation("环境记录单数据列表/详情")
     @PostMapping("/data/listPage")
@@ -95,4 +101,11 @@
         });
         return environmentRecordConfigService.deleteEnvironmentRecordConfig(idDTO.getId());
     }
+
+    @ApiOperation("地点列表")
+    @PostMapping("/location/listPage")
+    public ReturnDTO<PageInfoBT<LocationListResponse>> locationListPage(@RequestBody @Valid LocationListRequest request) {
+        Page<LocationListResponse> page = PageFactory.defaultPage();
+        return ReturnUtil.success(super.packForBT(locationInfoService.listPage(page, request)));
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java
index 82efe3f..e9561fa 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java
@@ -10,6 +10,7 @@
 import com.casic.missiles.dto.resource.seal.SealLogListRequest;
 import com.casic.missiles.dto.resource.seal.SealNoteApprovalListRequest;
 import com.casic.missiles.dto.resource.seal.SealNoteSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceSealUseLog;
@@ -27,6 +28,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -58,6 +60,13 @@
         return sealUseNoteService.saveSeal(request);
     }
 
+    @ApiOperation("印章使用登记导出（列表和导出中去掉经办人和监印人）")
+    @PostMapping("/listExport")
+    public void export(@RequestBody SealNoteApprovalListRequest request) throws Exception {
+        List<BizResourceSealUseNote> list = super.exportList(request);
+        super.exportExcel(BizResourceSealUseNote.class, list, ExportEnum.SEAL_NOTE.getSheetName());
+    }
+
     // TODO: 2023/7/28 印章使用日志：系统中使用印章时插入数据库
 
     @ApiOperation("印章使用日志列表（分页）")
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java
index 9b674fc..06b6521 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java
@@ -9,16 +9,20 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.resource.staff.StaffCertRequest;
 import com.casic.missiles.dto.resource.staff.StaffCertResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.service.resource.IBizResourceStaffInfoService;
 import com.casic.missiles.service.resource.IBizResourceStaffVerifierService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.List;
+
 /**
  * @Description:
  * @Author: wangpeng
@@ -41,9 +45,21 @@
         return ReturnUtil.success(super.packForBT(responsePage));
     }
 
+    @ApiOperation("证书逾期提醒导出")
+    @PostMapping("/listExport")
+    public void exportList(@RequestBody StaffCertRequest request) throws Exception {
+        List<StaffCertResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = staffInfoService.certListByIds(request.getIds());
+        } else {
+            list = staffInfoService.certList(request);
+        }
+        super.exportExcel(StaffCertResponse.class, list, ExportEnum.STAFF_CERTIFICATE_EXPIRE.getSheetName());
+    }
+
     @ApiOperation("证书逾期提醒")
     @PostMapping("/expirationReminder")
-    public ReturnDTO expirationReminder(@RequestBody IdDTO idDto) {
-        return verifierService.expirationReminder(idDto);
+    public ReturnDTO expirationReminder(@RequestBody IdDTO idDTO) {
+        return verifierService.expirationReminder(idDTO);
     }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java
index 3b251ad..a6e7850 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java
@@ -12,6 +12,7 @@
 import com.casic.missiles.dto.resource.staff.StaffListRequest;
 import com.casic.missiles.dto.resource.staff.TrainListRequest;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.*;
@@ -22,7 +23,10 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
 import java.util.List;
@@ -52,8 +56,19 @@
             throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
         }
         Page<BizResourceStaffInfo> page = PageFactory.defaultPage();
-        Page<BizResourceStaffInfo> responsePage = staffInfoService.listPage(page, request);
-        return ReturnUtil.success(super.packForBT(responsePage));
+        return ReturnUtil.success(super.packForBT(staffInfoService.listPage(page, request)));
+    }
+
+    @ApiOperation("人员登记导出")
+    @PostMapping("/listExport")
+    public void exportList(@RequestBody StaffListRequest request) throws Exception {
+        List<BizResourceStaffInfo> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = staffInfoService.listByIds(request.getIds());
+        } else {
+            list = staffInfoService.list(request);
+        }
+        super.exportExcel(BizResourceStaffInfo.class, list, ExportEnum.STAFF_INFO.getSheetName());
     }
 
     @ApiOperation("人员登记详情基础信息")
@@ -85,9 +100,9 @@
 
     @ApiOperation("科研教育列表（分页）")
     @PostMapping("/education/listPage")
-    public ReturnDTO<PageInfoBT<BizResourceStaffEducation>> educationListPage(@RequestBody IdDTO idDto) {
+    public ReturnDTO<PageInfoBT<BizResourceStaffEducation>> educationListPage(@RequestBody IdDTO idDTO) {
         Page<BizResourceStaffEducation> page = PageFactory.defaultPage();
-        Page<BizResourceStaffEducation> responsePage = staffInfoService.educationListPage(page, idDto);
+        Page<BizResourceStaffEducation> responsePage = staffInfoService.educationListPage(page, idDTO);
         return ReturnUtil.success(super.packForBT(responsePage));
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java
index af6aa86..d85d84a 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java
@@ -9,6 +9,7 @@
 import com.casic.missiles.dto.resource.outsideService.SupplierApprovalListRequest;
 import com.casic.missiles.dto.resource.outsideService.SupplierSaveResponse;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceSupplierAbility;
@@ -67,6 +68,13 @@
         return ReturnUtil.success(supplierInfoService.detail(idDTO.getId()));
     }
 
+    @ApiOperation("合格供方导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody SupplierApprovalListRequest request) throws Exception {
+        List<BizResourceSupplierInfo> list = super.exportList(request);
+        super.exportExcel(BizResourceSupplierInfo.class, list, ExportEnum.SUPPLIER_INFO.getSheetName());
+    }
+
     @ApiOperation("供方人员列表（分页）")
     @PostMapping("/person/listPage")
     public ReturnDTO<PageInfoBT<BizResourceSupplierPerson>> personListPage(@RequestBody IdDTO idDTO) {
diff --git a/casic-metering-api/src/main/resources/config/application.yml b/casic-metering-api/src/main/resources/config/application.yml
index 350db5f..ecff521 100644
--- a/casic-metering-api/src/main/resources/config/application.yml
+++ b/casic-metering-api/src/main/resources/config/application.yml
@@ -126,7 +126,7 @@
     #作者
     author: wangpeng
     #待生成对象表名
-    table-name: biz_equipment_technical_target_approval,biz_equipment_attachment_approval,biz_equipment_checkpoint_approval
+    table-name: biz_business_outsource_protocol
 
 reminder:
   #节点--common模块config包 ReminderNodeConfig配置
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
index 4a19e4e..d47d552 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
@@ -53,6 +53,7 @@
     SUGGEST_FORM_SAVE_FAILED(2509, "委托方意见登记表保存至草稿箱失败"),
     EXAMINE_FORM_SAVE_FAILED(2510, "要求、委托书及合同评审表保存至草稿箱失败"),
     CUSTOMER_EXIST_SAVE_FAILED(2511, "该委托方已存在，请重新选择"),
+    DUPLICATE_LOCATION_NO(2512, "地点编号已存在"),
 
     /**
      * 计量检定业务模块
@@ -68,6 +69,8 @@
     COMPLETE_SAMPLE_NOT_EXIST(2609, "检测中不存在扫描收入的样品"),
     CANNOT_CHANGE_MEASURE_INFO(2610, "无法更改非当前登录用户的检测信息"),
     NON_EXIST_ORDER_OR_SAMPLE(2611, "不存在该委托单或该委托单下的样品"),
+    OUTSOURCE_ACCESS_SAVE_FAILED(2612, "测试、校准或检定工作分包评审表保存至草稿箱失败"),
+    OUTSOURCE_PROTOCOL_SAVE_FAILED(2613, "测试、校准或检定工作分包协议书保存至草稿箱失败"),
 
     /**
      * 历史遗留备用
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
index 5089ad1..81a406b 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
@@ -10,54 +10,38 @@
     /**
      * 资源管理
      */
-    ENVIRONMENT_DATA_EXPORT("environmentData", "environmentData", "环境记录单数据"),
+    ENVIRONMENT_DATA_EXPORT("environmentData", "环境记录单数据", "环境记录单数据"),
+    STAFF_INFO("staffInfo", "人员登记", "人员登记"),
+    STAFF_CERTIFICATE_EXPIRE("certificateExpire", "证书逾期提醒", "证书逾期提醒"),
+    SUPPLIER_INFO("supplierInfo", "合格供方名录", "合格供方名录"),
+    CUSTOMER_INFO("customerInfo", "委托方名录", "委托方名录"),
+    CUSTOMER_SUGGEST_FORM("customerSuggestForm", "委托方意见登记表", "委托方意见登记表"),
+    SEAL_NOTE("sealNote", "印章使用登记", "印章使用登记"),
 
-    FILE_EXPORT("meterFileData", "meterFileData", "计量文件信息"),
-    TRAIN_PLAN_EXPORT("trainPlanData", "trainPlanData", "培训计划"),
-    TRAIN_LOG_EXPORT("trainLogData", "trainLogData", "培训记录"),
-    METER_ORGANIZE_EXPORT("meterOrganizeData", "meterOrganizeData", "计量组织"),
-    TRACE_SUPPLIER_EXPORT("traceSupplierData", "traceSupplierData", "溯源供方"),
-    SIGN_EXPORT("signData", "signData", "签名/签章"),
-    TEMPLATE_EXPORT("templateData", "templateData", "原始记录模板/证书报告模板"),
-    FIXED_ASSETS("meterFixedAssets", "meterFixedAssets", "固定资产"),
-    METER_EQUIPMENT("meterEquipment", "meterEquipment", "测量设备"),
-    CALIBRATION_TEST_EQUIPMENT("calibrationTestEquipment", "calibrationTestEquipment", "校准检定设备"),
-    MEASURE_ACCOUNT("measureAccount", "measureAccount", "测量工装"),
-    STANDARD_SUPPORT_EQUIPMENT("standardSupportEquipment", "standardSupportEquipment", "标准配套设备"),
-    STANDARD_EQUIPMENT("standardEquipment", "standardEquipment", "标准装置"),
-    FLOW_DEF_EXPORT("flowDefData", "flowDefData", "流程定义"),
-    STAFF_CERTIFICATE("certificate", "certificate", "计量人员证书"),
-    CHECK_INFO("checkInfo", "checkInfo", "设备管理点检测"),
-    EQUIPMENT_APPLY("equipmentApply", "equipmentApply", "设备借用"),
-    STANDARD_EQUIPMENT_REMIND("equipmentApplyRemind", "equipmentApplyRemind", "标准装置到期提醒"),
-    METER_PRICE("meterPrice", "meterPrice", "价格库"),
-    METER_STAFF("meterStaff", "meterStaff", "计量人员"),
-    STANDARD_EQUIPMENT_APPLY("standardEquipmentApply", "standardEquipmentApply", "标准装置申请"),
-    STATE_MANAGE_APPLY("stateManage", "stateManage", "状态管理"),
-    METER_ACCEPTANCE_CHECK("acceptanceCheck", "acceptanceCheck", "设备检修保养验收单"),
-    CUSTOMER_EXPORT("customerData", "customerData", "客户信息"),
-    ORDER_EXPORT("orderData", "orderData", "委托书信息"),
-    SAMPLE_EXPORT("sampleData", "sampleData", "样本信息"),
-    EXCHANGE_DATA("exchangeData", "exchangeData", "设备交接单"),
-    DISPATCH_DATA("dispatchData", "dispatchData", "设备收发"),
-    ENVIRONMENT_DATA("environmentData", "environmentData", "环境记录单"),
-    ORIGIN_DATA("originData", "originData", "原始记录"),
-    CERTIFICATE_REPORT("certificateReport", "certificateReport", "证书报告"),
-    ADVICE_EXPORT("adviceData", "adviceData", "客户反馈"),
-    HANDOUT_EXPORT("handoutData", "handoutData", "任务分发列表"),
-    OUTSOURCER_EXPORT("outsourcerData", "outsourcerData", "分包方"),
-    SITE_EXECUTIVE_EXPORT("siteExecutiveData", "siteExecutiveData", "现场测试、校准或检定"),
-    CERTIFICATE_PRINT_EXPORT("certificatePrintData", "certificatePrintData", "证书打印"),
-    DOWNLOAD_TEMPLATE("downloadTemplate", "downloadTemplate", "页面配置"),
-    OUTSOURCER_CERTIFICATE_EXPORT("outsourceCertificateData", "outsourceCertificateData", "分包证书"),
-    SETTLEMENT_INFO_EXPORT("settlementInfoData", "settlementInfoData", "业务结算"),
-    EQUIPMENT_REMIND("equipmentRemind", "equipmentRemind", "设备到期提醒"),
-    AGREEMENT_INFO_EXPORT("agreementInfoData", "agreementInfoData", "合同"),
-    WORK_STATISTICS_EXPORT("workStatisticsData", "workStatisticsData", "实时工作统计"),
-    DEPT_OUTPUT_EXPORT("deptOutputData", "deptOutputData", "部门产值分析"),
-    WORKLOAD_EXPORT("workloadData", "workloadData", "业务工作量分析"),
-    DEPT_COMPREHENSIVE_EXPORT("deptComprehensiveData", "deptComprehensiveData", "部门综合分析"),
-    ENVIRONMENTAL_RECORD("environmentalRecordData", "environmentalRecordData", "现场环境记录");
+    /**
+     * 计量检定业务
+     */
+    OUTSOURCER_EXPORT("outsourcerData", "分包方名录", "分包方名录"),
+    IDENTIFY_EXPORT("identifyData", "计量标识", "计量标识"),
+    ORDER_EXPORT("orderData", "任务单", "任务单"),
+    DISPATCH_DATA("dispatchData", "设备收发", "设备收发"),
+    HANDOUT_EXPORT("handoutData", "任务分发", "任务分发"),
+    SITE_EXECUTIVE_EXPORT("siteExecutiveData", "现场测试、校准或检定", "现场测试、校准或检定"),
+    CERTIFICATE_REPORT("certificateReport", "证书审批", "证书审批"),
+    CERTIFICATE_CHANGE_APPLY("certificateChangeApply", "证书报告补充或更换申请单", "证书报告补充或更换申请单"),
+    CERTIFICATE_PRINT("certificatePrintData", "证书打印审批", "证书打印审批"),
+    DEPT_EXECUTIVE_TASK("deptExecutiveTaskData", "实验室任务", "实验室任务"),
+    MY_EXECUTIVE_TASK("myExecutiveTaskData", "我的任务", "我的任务"),
+    OUTSOURCE_ASSESS("outsourceAssess", "测试、校准或检定工作分包评审表", "测试、校准或检定工作分包评审表"),
+    OUTSOURCE_PROTOCOL("outsourceProtocol", "测试、校准或检定工作分包协议书", "测试、校准或检定工作分包协议书"),
+
+    /**
+     * 系统管理
+     */
+    SIGN_EXPORT("signData", "签名", "签名"),
+    TEMPLATE_EXPORT("templateData", "文件模板", "文件模板"),
+    FLOW_DEF_EXPORT("flowDefData", "流程定义", "流程定义"),
+    DOWNLOAD_TEMPLATE("downloadTemplate", "流程定义", "页面配置");
 
     ExportEnum(String fileName, String sheetName, String description) {
         this.fileName = fileName;
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateRecordTypeCodeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateRecordTypeCodeEnum.java
index 31d913c..a963522 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateRecordTypeCodeEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateRecordTypeCodeEnum.java
@@ -46,4 +46,14 @@
     String SITE_EXECUTIVE_APPROVAL = "01";
     //《现场测试、校准或检定工作记录表》
     String SITE_EXECUTIVE_LOG = "02";
+
+    //测试、校准或检定工作分包协议书
+    String OUTSOURCE_PROTOCOL = "01";
+    //测试、校准或检定工作分包评审表
+    String OUTSOURCE_ACCESS = "02";
+    //测试、校准或检定工作分包通知书
+    String OUTSOURCE_NOTICE = "03";
+    //测试、校准或检定工作分包方名录
+    String OUTSOURCE_INFO = "04";
+
 }
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
index 24b8635..f78bd53 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
@@ -15,6 +15,10 @@
     String CERTIFICATE_CHANGE_APPLY_BEAN_NAME = "certificateChangeApplyBean";
     //现场测试、校准或检定
     String SITE_EXECUTIVE_BEAN_NAME = "siteExecutiveBean";
+    //测试、校准或检定工作分包评审表
+    String OUTSOURCE_ASSESS_BEAN_NAME = "outsourceAssessBean";
+    //测试、校准或检定工作分包协议书
+    String OUTSOURCE_PROTOCOL_BEAN_NAME = "outsourceProtocolBean";
 
     /*********************************设备与装置************************************/
     //设备台账
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 b21c661..6b86fd1 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
@@ -18,6 +18,8 @@
     OUTSOURCER_APPROVAL(OUTSOURCER_BEAN_NAME, ""),
     CERTIFICATE_CHANGE_APPROVAL(CERTIFICATE_CHANGE_APPLY_BEAN_NAME, ""),
     SITE_EXECUTIVE_APPROVAL(SITE_EXECUTIVE_BEAN_NAME, ""),
+    OUTSOURCE_ASSESS_APPROVAL(OUTSOURCE_ASSESS_BEAN_NAME, ""),
+    OUTSOURCE_PROTOCOL_APPROVAL(OUTSOURCE_PROTOCOL_BEAN_NAME, ""),
 
     ACTION_STATUS_MAP(new HashMap<String, AwareActionStatusEnum>() {
         {
@@ -47,6 +49,10 @@
             put(ApplyFromIdEnum.CERTIFICATE_CHANGE_APPROVAL.getCode(), CERTIFICATE_CHANGE_APPROVAL);
             //现场测试、校准或检定审批
             put(ApplyFromIdEnum.SITE_EXECUTIVE_APPROVAL.getCode(), SITE_EXECUTIVE_APPROVAL);
+            //测试、校准或检定工作分包评审表
+            put(ApplyFromIdEnum.OUTSOURCE_ASSESS_APPROVAL.getCode(), OUTSOURCE_ASSESS_APPROVAL);
+            //测试、校准或检定工作分包协议书
+            put(ApplyFromIdEnum.OUTSOURCE_PROTOCOL_APPROVAL.getCode(), OUTSOURCE_PROTOCOL_APPROVAL);
         }
     });
     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 934405e..c7410bd 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
@@ -9,6 +9,8 @@
     CERTIFICATE_CHANGE_APPROVAL("jljdywzsbchghsqd", MessageSourceModuleEnum.BUSINESS.getCode(), "证书/报告补充或更换申请单"),
     OUTSOURCER_APPROVAL("jljdywcsjzhgfbfml", MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定合格分包方名录"),
     SITE_EXECUTIVE_APPROVAL("jljdywxccsjzsp", MessageSourceModuleEnum.BUSINESS.getCode(), "现场测试、校准或检定审批"),
+    OUTSOURCE_ASSESS_APPROVAL("jljdywcsjzfbpsb", MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包评审表"),
+    OUTSOURCE_PROTOCOL_APPROVAL("jljdywcsjzfbxys", MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包协议书"),
 
 
     /*******************************************设备与装置*********************************************/
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/GeneralApprovalMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/GeneralApprovalMapper.java
index 4fb7344..0c9d6ae 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/GeneralApprovalMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/GeneralApprovalMapper.java
@@ -17,8 +17,4 @@
 
     Page<O> selectBatchForApprovalList(Page<O> page, @Param("request") R request, @Param("businessKeys") List<String> businessKeys);
 
-//    Page<O> selectListPage(Page<O> page, @Param("request") R request);
-
-//    Long selectMaxNo();
-
 }
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceAssessMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceAssessMapper.java
index 7867bb8..ba59009 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceAssessMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceAssessMapper.java
@@ -1,7 +1,12 @@
 package com.casic.missiles.mapper.business;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.business.outsource.OutsourceAssessApprovalListRequest;
+import com.casic.missiles.mapper.GeneralApprovalMapper;
 import com.casic.missiles.model.business.BizBusinessOutsourceAssess;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * <p>
@@ -11,6 +16,10 @@
  * @author wangpeng
  * @since 2023-08-16
  */
-public interface BizBusinessOutsourceAssessMapper extends BaseMapper<BizBusinessOutsourceAssess> {
+public interface BizBusinessOutsourceAssessMapper extends GeneralApprovalMapper<BizBusinessOutsourceAssess, BizBusinessOutsourceAssess, OutsourceAssessApprovalListRequest> {
+
+    Page<BizBusinessOutsourceAssess> selectBatchForApprovalList(Page<BizBusinessOutsourceAssess> page, @Param("request") OutsourceAssessApprovalListRequest request, @Param("businessKeys") List<String> businessKeys);
+
+    Long selectMaxProjectNo();
 
 }
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceProtocolMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceProtocolMapper.java
new file mode 100644
index 0000000..e6aba35
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceProtocolMapper.java
@@ -0,0 +1,24 @@
+package com.casic.missiles.mapper.business;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.business.outsource.OutsourceProtocolApprovalListRequest;
+import com.casic.missiles.mapper.GeneralApprovalMapper;
+import com.casic.missiles.model.business.BizBusinessOutsourceProtocol;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 计量检定业务-分包管理-测试、校准或检定工作分包协议书 Mapper 接口
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-08-24
+ */
+public interface BizBusinessOutsourceProtocolMapper extends GeneralApprovalMapper<BizBusinessOutsourceProtocol, BizBusinessOutsourceProtocol, OutsourceProtocolApprovalListRequest> {
+
+    Page<BizBusinessOutsourceProtocol> selectBatchForApprovalList(Page<BizBusinessOutsourceProtocol> page, @Param("request") OutsourceProtocolApprovalListRequest request, @Param("businessKeys") List<String> businessKeys);
+
+    Long selectMaxProtocolNo();
+}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/EnvLocationInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/EnvLocationInfoMapper.java
new file mode 100644
index 0000000..49eff87
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/EnvLocationInfoMapper.java
@@ -0,0 +1,21 @@
+package com.casic.missiles.mapper.resource;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.resource.environment.LocationListRequest;
+import com.casic.missiles.dto.resource.environment.LocationListResponse;
+import com.casic.missiles.model.resource.EnvLocationInfo;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * <p>
+ * 实验室环境监控系统-设备表 Mapper 接口
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-06-07
+ */
+public interface EnvLocationInfoMapper extends BaseMapper<EnvLocationInfo> {
+
+    Page<LocationListResponse> selectLocationListPage(Page<LocationListResponse> page, @Param("request") LocationListRequest request);
+}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java
index de124db..85ed0f7 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java
@@ -1,7 +1,9 @@
 package com.casic.missiles.mapper.system;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.dto.system.SignDetailResponse;
+import com.casic.missiles.dto.system.SignListRequest;
 import com.casic.missiles.model.system.SystemSign;
 import org.apache.ibatis.annotations.Param;
 
@@ -22,4 +24,8 @@
     SignDetailResponse selectSignDetailById(Long id);
 
     List<SystemSign> selectUsableSignList(@Param("userId") Long userId);
+
+    Page<SystemSign> selectSignListPage(Page<SystemSign> page, @Param("request") SignListRequest request);
+
+    List<SystemSign> selectSignList(@Param("request") SignListRequest request);
 }
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateChangeApplyMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateChangeApplyMapper.xml
index d798447..c496092 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateChangeApplyMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateChangeApplyMapper.xml
@@ -30,31 +30,31 @@
         SELECT *
         FROM biz_business_certificate_change_apply
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.changeApplyNo != null and request.changeApplyNo !=''">
+        <if test="request != null and request.changeApplyNo != null and request.changeApplyNo !=''">
             and change_apply_no like concat('%',#{request.changeApplyNo},'%')
         </if>
-        <if test="request.changeReportNo != null and request.changeReportNo !=''">
+        <if test="request != null and request.changeReportNo != null and request.changeReportNo !=''">
             and change_report_no like concat('%',#{request.changeReportNo},'%')
         </if>
-        <if test="request.changeReportName != null and request.changeReportName !=''">
+        <if test="request != null and request.changeReportName != null and request.changeReportName !=''">
             and change_report_name like concat('%',#{request.changeReportName},'%')
         </if>
-        <if test="request.changeType != null and request.changeType !=''">
+        <if test="request != null and request.changeType != null and request.changeType !=''">
             and change_type = #{request.changeType}
         </if>
-        <if test="request.createUserName != null and request.createUserName !=''">
+        <if test="request != null and request.createUserName != null and request.createUserName !=''">
             and create_user_name like concat('%',#{request.createUserName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificatePrintMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificatePrintMapper.xml
index b66cd99..49c0ac8 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificatePrintMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificatePrintMapper.xml
@@ -31,34 +31,34 @@
         LEFT JOIN biz_business_order_sample_relation bosr ON (bosr.order_id = bcr.order_id AND bosr.sample_id = bcr.sample_id)
         LEFT JOIN biz_business_order_info boi ON boi.id = bosr.order_id
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and bcp.approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.printStatus != null and request.printStatus !=''">
+        <if test="request != null and request.printStatus != null and request.printStatus !=''">
             and print_status = #{request.printStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and bcp.create_user_id = #{request.createUserId}
         </if>
-        <if test="request.certificateReportNo != null and request.certificateReportNo !=''">
+        <if test="request != null and request.certificateReportNo != null and request.certificateReportNo !=''">
             and bcr.certificate_report_no like concat('%',#{request.certificateReportNo},'%')
         </if>
-        <if test="request.certificateReportName != null and request.certificateReportName !=''">
+        <if test="request != null and request.certificateReportName != null and request.certificateReportName !=''">
             and bcr.certificate_report_name like concat('%',#{request.certificateReportName},'%')
         </if>
-        <if test="request.customerName != null and request.customerName !=''">
+        <if test="request != null and request.customerName != null and request.customerName !=''">
             and boi.customer_name like concat('%',#{request.customerName},'%')
         </if>
-        <if test="request.sampleNo != null and request.sampleNo !=''">
+        <if test="request != null and request.sampleNo != null and request.sampleNo !=''">
             and bosr.sample_no like concat('%',#{request.sampleNo},'%')
         </if>
-        <if test="request.sampleName != null and request.sampleName !=''">
+        <if test="request != null and request.sampleName != null and request.sampleName !=''">
             and bosr.sample_name like concat('%',#{request.sampleName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and bcp.create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and bcp.create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml
index b366034..767695d 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml
@@ -46,33 +46,37 @@
         SELECT bcr.*, bosr.sample_no, bosr.sample_name, bosr.sample_model, rsi.staff_name
         FROM biz_business_certificate_report bcr
         LEFT JOIN biz_business_order_sample_relation bosr ON (bosr.order_id = bcr.order_id AND bosr.sample_id = bcr.sample_id)
+        LEFT JOIN biz_business_order_info boi ON boi.id = bcr.order_id
         LEFT JOIN biz_resource_staff_info rsi ON rsi.id = bcr.measure_person_id
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and bcr.approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and bcr.create_user_id = #{request.createUserId}
         </if>
-        <if test="request.certificateReportNo != null and request.certificateReportNo !=''">
+        <if test="request != null and request.customerId != null and request.customerId !=''">
+            and boi.customer_id = #{request.customerId}
+        </if>
+        <if test="request != null and request.certificateReportNo != null and request.certificateReportNo !=''">
             and bcr.certificate_report_no like concat('%',#{request.certificateReportNo},'%')
         </if>
-        <if test="request.certificateReportName != null and request.certificateReportName !=''">
+        <if test="request != null and request.certificateReportName != null and request.certificateReportName !=''">
             and bcr.certificate_report_name like concat('%',#{request.certificateReportName},'%')
         </if>
-        <if test="request.sampleNo != null and request.sampleNo !=''">
+        <if test="request != null and request.sampleNo != null and request.sampleNo !=''">
             and bosr.sample_no like concat('%',#{request.sampleNo},'%')
         </if>
-        <if test="request.measureCategory != null and request.measureCategory !=''">
+        <if test="request != null and request.measureCategory != null and request.measureCategory !=''">
             and bcr.measure_category = #{request.measureCategory}
         </if>
-        <if test="request.measurePerson != null and request.measurePerson !=''">
+        <if test="request != null and request.measurePerson != null and request.measurePerson !=''">
             and rsi.staff_name like concat('%',#{request.measurePerson},'%')
         </if>
-        <if test="request.calibrationTimeStart != null and request.calibrationTimeStart !=''">
+        <if test="request != null and request.calibrationTimeStart != null and request.calibrationTimeStart !=''">
             and bcr.calibration_time &gt;= #{request.calibrationTimeStart}
         </if>
-        <if test="request.calibrationTimeEnd != null and request.calibrationTimeEnd !=''">
+        <if test="request != null and request.calibrationTimeEnd != null and request.calibrationTimeEnd !=''">
             and bcr.calibration_time &lt;= #{request.calibrationTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceAssessMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceAssessMapper.xml
index d0fcf8b..c22c101 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceAssessMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceAssessMapper.xml
@@ -7,6 +7,8 @@
         <id column="id" property="id" />
         <result column="project_no" property="projectNo" />
         <result column="project_name" property="projectName" />
+        <result column="lab_code" property="labCode" />
+        <result column="group_code" property="groupCode" />
         <result column="applicant_id" property="applicantId" />
         <result column="applicant_name" property="applicantName" />
         <result column="applicant_time" property="applicantTime" />
@@ -31,7 +33,45 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, project_no, project_name, applicant_id, applicant_name, applicant_time, minio_file_name, remark, create_user_id, create_user_name, outsourcer_id, pre_start_time, pre_end_time, outsource_reason, pre_cost, approval_status, process_id, approve_situation, traceability, test_method, technique_ability, create_time, update_time
+        id, project_no, project_name, lab_code, group_code, applicant_id, applicant_name, applicant_time, minio_file_name, remark, create_user_id, create_user_name, outsourcer_id, pre_start_time, pre_end_time, outsource_reason, pre_cost, approval_status, process_id, approve_situation, traceability, test_method, technique_ability, create_time, update_time
     </sql>
 
+    <select id="selectMaxProjectNo" resultType="java.lang.Long">
+        SELECT IFNULL(max(RIGHT(project_no, 3)), 0) from biz_business_outsource_assess
+    </select>
+
+    <select id="selectBatchForApprovalList" resultMap="BaseResultMap">
+        SELECT bboa.*, bboi.outsourcer_name, bboi.director
+        FROM biz_business_outsource_assess bboa
+        LEFT JOIN biz_business_outsourcer_info bboi ON bboa.outsourcer_id = bboi.id
+        WHERE 1=1
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
+            and bboa.approval_status = #{request.approvalStatus}
+        </if>
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
+            and bboa.create_user_id = #{request.createUserId}
+        </if>
+        <if test="request != null and request.projectNo != null and request.projectNo !=''">
+            and bboa.project_no like concat('%',#{request.projectNo},'%')
+        </if>
+        <if test="request != null and request.outsourcerName != null and request.outsourcerName !=''">
+            and bboi.outsourcer_name like concat('%',#{request.outsourcerName},'%')
+        </if>
+        <if test="request != null and request.applicantName != null and request.applicantName !=''">
+            and bboa.applicant_name like concat('%',#{request.applicantName},'%')
+        </if>
+        <if test="request != null and request.applicantTimeStart != null and request.applicantTimeStart !=''">
+            and bboa.applicant_time &gt;= #{request.applicantTimeStart}
+        </if>
+        <if test="request != null and request.applicantTimeEnd != null and request.applicantTimeEnd !=''">
+            and bboa.applicant_time &lt;= #{request.applicantTimeEnd}
+        </if>
+        <if test="businessKeys != null">
+            and bboa.id in
+            <foreach collection="businessKeys" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
+        ORDER BY bboa.create_time DESC
+    </select>
 </mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceProtocolMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceProtocolMapper.xml
new file mode 100644
index 0000000..b7b2149
--- /dev/null
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceProtocolMapper.xml
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.mapper.business.BizBusinessOutsourceProtocolMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.business.BizBusinessOutsourceProtocol">
+        <id column="id" property="id" />
+        <result column="protocol_no" property="protocolNo" />
+        <result column="project_name" property="projectName" />
+        <result column="lab_code" property="labCode" />
+        <result column="group_code" property="groupCode" />
+        <result column="outsourcer_id" property="outsourcerId" />
+        <result column="remark" property="remark" />
+        <result column="outsource_no" property="outsourceNo" />
+        <result column="outsource_name" property="outsourceName" />
+        <result column="contacts" property="contacts" />
+        <result column="mobile" property="mobile" />
+        <result column="address" property="address" />
+        <result column="require_date" property="requireDate" />
+        <result column="outsource_cost" property="outsourceCost" />
+        <result column="director" property="director" />
+        <result column="item" property="item" />
+        <result column="requires" property="requires" />
+        <result column="create_user_id" property="createUserId" />
+        <result column="create_user_name" property="createUserName" />
+        <result column="approval_status" property="approvalStatus" />
+        <result column="process_id" property="processId" />
+        <result column="create_time" property="createTime" />
+        <result column="update_time" property="updateTime" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, protocol_no, project_name, lab_code, group_code, outsourcer_id, remark, outsource_no, outsource_name, contacts, mobile, address, require_date, outsource_cost, director, item, requires, create_user_id, create_user_name, approval_status, process_id, create_time, update_time
+    </sql>
+
+    <select id="selectMaxProtocolNo" resultType="java.lang.Long">
+        SELECT IFNULL(max(RIGHT(protocol_no, 3)), 0) from biz_business_outsource_protocol
+    </select>
+
+    <select id="selectBatchForApprovalList" resultMap="BaseResultMap">
+        SELECT *
+        FROM biz_business_outsource_protocol
+        WHERE 1=1
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
+            and approval_status = #{request.approvalStatus}
+        </if>
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
+            and create_user_id = #{request.createUserId}
+        </if>
+        <if test="request != null and request.protocolNo != null and request.protocolNo !=''">
+            and protocol_no like concat('%',#{request.protocolNo},'%')
+        </if>
+        <if test="request != null and request.outsourcerName != null and request.outsourcerName !=''">
+            and outsourcer_name like concat('%',#{request.outsourcerName},'%')
+        </if>
+        <if test="request != null and request.applicantName != null and request.applicantName !=''">
+            and create_user_name like concat('%',#{request.applicantName},'%')
+        </if>
+        <if test="request != null and request.applicantTimeStart != null and request.applicantTimeStart !=''">
+            and create_time &gt;= #{request.applicantTimeStart}
+        </if>
+        <if test="request != null and request.applicantTimeEnd != null and request.applicantTimeEnd !=''">
+            and create_time &lt;= #{request.applicantTimeEnd}
+        </if>
+        <if test="businessKeys != null">
+            and id in
+            <foreach collection="businessKeys" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
+        ORDER BY create_time DESC
+    </select>
+</mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourcerInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourcerInfoMapper.xml
index 510a80b..3049b54 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourcerInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourcerInfoMapper.xml
@@ -7,6 +7,8 @@
         <id column="id" property="id" />
         <result column="outsourcer_no" property="outsourcerNo" />
         <result column="outsourcer_name" property="outsourcerName" />
+        <result column="lab_code" property="labCode" />
+        <result column="group_code" property="groupCode" />
         <result column="outsourcer_brief_name" property="outsourcerBriefName" />
         <result column="outsourcer_size" property="outsourcerSize" />
         <result column="business_size" property="businessSize" />
@@ -55,32 +57,32 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, outsourcer_no, outsourcer_name, outsourcer_brief_name, outsourcer_size, business_size, grade, evaluation, tax_number, bank_account, bank_name, bank_account_number, postal_code, director, phone, fax, mobile, email, website, address_country, address_province, address_city, address_area, full_address, address_country_name, address_province_name, address_city_name, address_area_name, invoice_country, invoice_province, invoice_city, invoice_area, invoice_full_address, invoice_country_name, invoice_province_name, invoice_city_name, invoice_area_name, business_scope, business_content, minio_file_name, approval_status, process_id, remark, create_user_id, create_user_name, create_time, update_time
+        id, outsourcer_no, outsourcer_name, lab_code, group_code, outsourcer_brief_name, outsourcer_size, business_size, grade, evaluation, tax_number, bank_account, bank_name, bank_account_number, postal_code, director, phone, fax, mobile, email, website, address_country, address_province, address_city, address_area, full_address, address_country_name, address_province_name, address_city_name, address_area_name, invoice_country, invoice_province, invoice_city, invoice_area, invoice_full_address, invoice_country_name, invoice_province_name, invoice_city_name, invoice_area_name, business_scope, business_content, minio_file_name, approval_status, process_id, remark, create_user_id, create_user_name, create_time, update_time
     </sql>
 
     <select id="selectBatchForApprovalList" resultMap="BaseResultMap">
         SELECT *
         FROM biz_business_outsourcer_info
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.outsourcerNo != null and request.outsourcerNo !=''">
+        <if test="request != null and request.outsourcerNo != null and request.outsourcerNo !=''">
             and outsourcer_no like concat('%',#{request.outsourcerNo},'%')
         </if>
-        <if test="request.outsourcerName != null and request.outsourcerName !=''">
+        <if test="request != null and request.outsourcerName != null and request.outsourcerName !=''">
             and outsourcer_name like concat('%',#{request.outsourcerName},'%')
         </if>
-        <if test="request.director != null and request.director !=''">
+        <if test="request != null and request.director != null and request.director !=''">
             and director like concat('%',#{request.director},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
@@ -93,6 +95,6 @@
     </select>
 
     <select id="selectMaxNo" resultType="java.lang.Long">
-        SELECT IFNULL(max(RIGHT(outsourcer_no, 12)), 0) from biz_business_outsourcer_info
+        SELECT IFNULL(max(RIGHT(outsourcer_no, 3)), 0) from biz_business_outsourcer_info
     </select>
 </mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessSiteExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessSiteExecutiveInfoMapper.xml
index 135c5d0..3c5ae79 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessSiteExecutiveInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessSiteExecutiveInfoMapper.xml
@@ -38,25 +38,25 @@
         FROM biz_business_site_executive_info bsei
         LEFT JOIN biz_resource_customer_info rci ON bsei.customer_id = rci.id
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and bsei.approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and bsei.create_user_id = #{request.createUserId}
         </if>
-        <if test="request.siteExecutiveNo != null and request.siteExecutiveNo !=''">
+        <if test="request != null and request.siteExecutiveNo != null and request.siteExecutiveNo !=''">
             and bsei.site_executive_no like concat('%',#{request.siteExecutiveNo},'%')
         </if>
-        <if test="request.customerName != null and request.customerName !=''">
+        <if test="request != null and request.customerName != null and request.customerName !=''">
             and rci.outsourcer_name like concat('%',#{request.customerName},'%')
         </if>
-        <if test="request.applyName != null and request.applyName !=''">
+        <if test="request != null and request.applyName != null and request.applyName !=''">
             and bsei.apply_name like concat('%',#{request.applyName},'%')
         </if>
-        <if test="request.applyTimeStart != null and request.applyTimeStart !=''">
+        <if test="request != null and request.applyTimeStart != null and request.applyTimeStart !=''">
             and bsei.apply_time &gt;= #{request.applyTimeStart}
         </if>
-        <if test="request.applyTimeEnd != null and request.applyTimeEnd !=''">
+        <if test="request != null and request.applyTimeEnd != null and request.applyTimeEnd !=''">
             and bsei.apply_time &lt;= #{request.applyTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml
index 84d9e2a..6bd38a9 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml
@@ -105,6 +105,12 @@
         <if test="request.isUrgent != null and request.isUrgent !=''">
             AND bo.is_urgent = #{request.isUrgent}
         </if>
+        <if test="request.ids != null">
+            and blei.id in
+            <foreach collection="request.ids" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
         ORDER BY blei.update_time DESC
     </select>
 
@@ -137,6 +143,12 @@
         <if test="request.isUrgent != null and request.isUrgent !=''">
             AND bo.is_urgent = #{request.isUrgent}
         </if>
+        <if test="request.ids != null">
+            and blei.id in
+            <foreach collection="request.ids" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
         ORDER BY blei.update_time DESC
     </select>
 
diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardInfoMapper.xml
index 1a5551b..2ed8d17 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardInfoMapper.xml
@@ -45,12 +45,6 @@
         FROM biz_equipment_standard_info besi
         LEFT JOIN biz_equipment_standard_technology_relation bestr ON besi.standard_no = bestr.standard_no
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
-            and besi.approval_status = #{request.approvalStatus}
-        </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
-            and besi.create_user_id = #{request.createUserId}
-        </if>
         <if test="request.standardName != null and request.standardName !=''">
             and besi.standard_name like concat('%',#{request.standardName},'%')
         </if>
diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardTechnologyRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardTechnologyRelationMapper.xml
index fc7e16c..cd03c8c 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardTechnologyRelationMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardTechnologyRelationMapper.xml
@@ -6,6 +6,7 @@
     <resultMap id="BaseResultMap" type="com.casic.missiles.model.equipment.BizEquipmentStandardTechnologyRelation">
         <id column="id" property="id" />
         <result column="technology_file_id" property="technologyFileId" />
+        <result column="technology_file_no" property="technologyFileNo" />
         <result column="technology_file_name" property="technologyFileName" />
         <result column="standard_id" property="standardId" />
         <result column="standard_no" property="standardNo" />
@@ -14,7 +15,7 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, technology_file_id, technology_file_name, standard_id, remark
+        id, technology_file_id, technology_file_no, technology_file_name, standard_id, remark
     </sql>
 
 </mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceAuthorizeOrderMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceAuthorizeOrderMapper.xml
index ac5176c..554fe65 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceAuthorizeOrderMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceAuthorizeOrderMapper.xml
@@ -32,22 +32,22 @@
         SELECT *
         FROM biz_resource_authorize_order
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.orderNo != null and request.orderNo !=''">
+        <if test="request != null and request.orderNo != null and request.orderNo !=''">
             and order_no like concat('%',#{request.orderNo},'%')
         </if>
-        <if test="request.createUserName != null and request.createUserName !=''">
+        <if test="request != null and request.createUserName != null and request.createUserName !=''">
             and create_user_name like concat('%',#{request.createUserName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerExamineFormMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerExamineFormMapper.xml
index ab242f6..af7f98f 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerExamineFormMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerExamineFormMapper.xml
@@ -41,28 +41,28 @@
         SELECT *
         FROM biz_resource_customer_examine_form
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.formNo != null and request.formNo !=''">
+        <if test="request != null and request.formNo != null and request.formNo !=''">
             and form_no like concat('%',#{request.formNo},'%')
         </if>
-        <if test="request.labCode != null and request.labCode !=''">
+        <if test="request != null and request.labCode != null and request.labCode !=''">
             and lab_code like concat('%',#{request.labCode},'%')
         </if>
-        <if test="request.groupCode != null and request.groupCode !=''">
+        <if test="request != null and request.groupCode != null and request.groupCode !=''">
             and group_code like concat('%',#{request.groupCode},'%')
         </if>
-        <if test="request.createUserName != null and request.createUserName !=''">
+        <if test="request != null and request.createUserName != null and request.createUserName !=''">
             and create_user_name like concat('%',#{request.createUserName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerInfoMapper.xml
index fa8ffbc..06a2798 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerInfoMapper.xml
@@ -33,25 +33,25 @@
         SELECT *
         FROM biz_resource_customer_info
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.customerNo != null and request.customerNo !=''">
+        <if test="request != null and request.customerNo != null and request.customerNo !=''">
             and customer_no like concat('%',#{request.customerNo},'%')
         </if>
-        <if test="request.customerName != null and request.customerName !=''">
+        <if test="request != null and request.customerName != null and request.customerName !=''">
             and customer_name like concat('%',#{request.customerName},'%')
         </if>
-        <if test="request.contacts != null and request.contacts !=''">
+        <if test="request != null and request.contacts != null and request.contacts !=''">
             and contacts like concat('%',#{request.contacts},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerSuggestFormMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerSuggestFormMapper.xml
index 28f5bb2..1806662 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerSuggestFormMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerSuggestFormMapper.xml
@@ -33,28 +33,28 @@
         SELECT *
         FROM biz_resource_customer_suggest_form
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.formNo != null and request.formNo !=''">
+        <if test="request != null and request.formNo != null and request.formNo !=''">
             and form_no like concat('%',#{request.formNo},'%')
         </if>
-        <if test="request.customerName != null and request.customerName !=''">
+        <if test="request != null and request.customerName != null and request.customerName !=''">
             and customer_name like concat('%',#{request.customerName},'%')
         </if>
-        <if test="request.customerDeptName != null and request.customerDeptName !=''">
+        <if test="request != null and request.customerDeptName != null and request.customerDeptName !=''">
             and customer_dept_name like concat('%',#{request.customerDeptName},'%')
         </if>
-        <if test="request.createUserName != null and request.createUserName !=''">
+        <if test="request != null and request.createUserName != null and request.createUserName !=''">
             and create_user_name like concat('%',#{request.createUserName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java
index bb0c50f..13a699b 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java
@@ -12,6 +12,7 @@
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.IGeneralApprovalService;
+import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
@@ -19,6 +20,7 @@
 import org.springframework.web.bind.annotation.RequestBody;
 
 import javax.validation.Valid;
+import java.util.List;
 import java.util.Objects;
 
 /**
@@ -117,4 +119,17 @@
         }
         return baseApprovalService.failUpdate(request);
     }
+
+    public List<O> exportList(@RequestBody @Valid R request) throws Exception {
+        List<O> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = baseApprovalService.listExportByIds(request.getIds());
+        } else {
+            list = baseApprovalService.listExport(request);
+        }
+        for (O record : list) {
+            DictCodeUtils.convertDictCodeToName(record);
+        }
+        return list;
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java
index 8a90961..d775831 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java
@@ -5,6 +5,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.business.certificate.CertificateChangeApplyApprovalListRequest;
 import com.casic.missiles.dto.business.certificate.CertificateChangeApplySaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessCertificateChangeApply;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
@@ -20,6 +21,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -48,4 +50,12 @@
         }
         return changeApplyService.saveChangeApply(request);
     }
+
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody CertificateChangeApplyApprovalListRequest request) throws Exception {
+        List<BizBusinessCertificateChangeApply> list = super.exportList(request);
+        super.exportExcel(BizBusinessCertificateChangeApply.class, list, ExportEnum.CERTIFICATE_CHANGE_APPLY.getSheetName());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java
index 5fc4b07..af8230e 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java
@@ -9,6 +9,7 @@
 import com.casic.missiles.dto.business.certificate.CertificatePrintApprovalListRequest;
 import com.casic.missiles.dto.business.certificate.CertificatePrintListResponse;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.enums.business.CertificatePrintStatusEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessCertificatePrintLog;
@@ -18,10 +19,16 @@
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.io.IOException;
+import java.util.List;
 import java.util.Objects;
 
 /**
@@ -98,4 +105,16 @@
         });
         return certificatePrintService.certificatePrintLog(idDTO.getId());
     }
+
+    @ApiOperation("证书打印审批导出")
+    @PostMapping("/listExport")
+    public void exportList(@RequestBody CertificatePrintApprovalListRequest request) throws IOException {
+        List<CertificatePrintListResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = certificatePrintService.listByIds(request.getIds());
+        } else {
+            list = certificatePrintService.list(request);
+        }
+        super.exportExcel(CertificatePrintListResponse.class, list, ExportEnum.CERTIFICATE_PRINT.getSheetName());
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java
index 63b06dc..6b2efd5 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java
@@ -6,6 +6,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.business.certificate.CertificateReportApprovalListRequest;
 import com.casic.missiles.dto.business.certificate.CertificateReportSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessCertificateReport;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
@@ -21,6 +22,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -50,7 +52,7 @@
         return certificateReportService.saveCertificateReport(request);
     }
 
-    @ApiOperation("证书审批详情（基本信息）")
+    @ApiOperation("详情（基本信息）")
     @PostMapping("/detail")
     public ReturnDTO<BizBusinessCertificateReport> detail(@RequestBody @Valid BaseDetailRequest request, BindingResult bindingResult) throws Exception {
         if(bindingResult.hasErrors()){
@@ -59,4 +61,11 @@
         return certificateReportService.detail(request);
     }
 
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody CertificateReportApprovalListRequest request) throws Exception {
+        List<BizBusinessCertificateReport> list = super.exportList(request);
+        super.exportExcel(BizBusinessCertificateReport.class, list, ExportEnum.CERTIFICATE_REPORT.getSheetName());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java
index 46b26bd..57c0809 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java
@@ -10,20 +10,21 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.business.identify.IdentifyListRequest;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessIdentifyInfo;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.business.IBizBusinessIdentifyInfoService;
+import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import javax.validation.Valid;
+import java.util.List;
 import java.util.Objects;
 
 /**
@@ -57,16 +58,13 @@
         return identifyInfoService.addIdentify(identifyInfo);
     }
 
-    @ApiOperation("标识打印更新")
+    @ApiOperation("标识打印更新（更新打印时间）")
     @PostMapping("/update")
-    public ReturnDTO updateIdentify(@RequestBody @Valid BizBusinessIdentifyInfo identifyInfo, BindingResult bindingResult) {
-        Assert.isFalse(Objects.isNull(identifyInfo.getId()), () -> {
+    public ReturnDTO updateIdentify(@RequestBody @Valid IdDTO idDTO) {
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        Assert.isFalse(bindingResult.hasErrors(), () -> {
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        });
-        return identifyInfoService.updateIdentify(identifyInfo);
+        return identifyInfoService.updateIdentify(idDTO.getId());
     }
 
     @ApiOperation("标识打印删除")
@@ -77,4 +75,37 @@
         });
         return identifyInfoService.deleteIdentify(idDTO.getId());
     }
+
+    @ApiOperation("标识打印导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody @Valid IdentifyListRequest request, BindingResult bindingResult) throws Exception {
+        if (bindingResult.hasErrors()) {
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        List<BizBusinessIdentifyInfo> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = identifyInfoService.listByIds(request.getIds());
+        } else {
+            list = identifyInfoService.list(request);
+        }
+        for (BizBusinessIdentifyInfo record : list) {
+            DictCodeUtils.convertDictCodeToName(record);
+        }
+        super.exportExcel(BizBusinessIdentifyInfo.class, list, ExportEnum.IDENTIFY_EXPORT.getSheetName());
+    }
+
+
+    // TODO: 2023/8/23 查询设备信息，4个底部按钮查设备（按钮的作用就是前端用来调不同接口、用来区分中间即将展示的标识），前端弹窗选设备，在确定保存时前端根据底部按钮判断传入设备类型deviceType字典code
+    // TODO: 2023/8/23 接口：查受检设备（第1个按钮），查设备台账（后3个按钮同一接口），查询之后前端根据标志类型的不同加到中间页面时进行判断（按产品给的对应表）
+    // TODO: 2023/8/23 提供二维码接口，前端在加到中间页面时调用一下
+
+    @ApiOperation("设备二维码")
+    @PostMapping("/equipment/qrCode")
+    public ReturnDTO<String> equipmentQrCode(@RequestBody @Valid IdDTO idDTO) {
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return identifyInfoService.equipmentQrCode(idDTO.getId());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java
index 707be6e..7e0453d 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java
@@ -117,7 +117,7 @@
     }
 
     @ApiOperation("任务单导出")
-    @PostMapping("/export")
+    @PostMapping("/listExport")
     public void orderExport(@RequestBody @Valid OrderListRequest request, HttpServletResponse response) {
         businessOrderService.orderExport(request, response);
     }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java
index 529a6ce..51432be 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java
@@ -1,9 +1,28 @@
 package com.casic.missiles.controller.business;
 
+import com.casic.missiles.controller.GeneralApprovalController;
+import com.casic.missiles.dto.BaseApprovalSubmitRequest;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.business.outsource.OutsourceAssessApprovalListRequest;
+import com.casic.missiles.dto.business.outsource.OutsourceAssessSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
+import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.model.business.BizBusinessOutsourceAssess;
+import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
+import com.casic.missiles.service.IGeneralApprovalService;
+import com.casic.missiles.service.business.IBizBusinessOutsourceAssessService;
 import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.BindingResult;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.validation.Valid;
+import java.util.List;
+
 /**
  * <p>
  * 计量检定业务-分包管理-测试、校准或检定工作分包评审表 前端控制器
@@ -15,6 +34,27 @@
 @Api(tags = "分包管理-测试、校准或检定工作分包评审表")
 @RestController
 @RequestMapping("/business/outsource/assess")
-public class BizBusinessOutsourceAssessController {
+public class BizBusinessOutsourceAssessController extends GeneralApprovalController<BizBusinessOutsourceAssess, BizBusinessOutsourceAssess, OutsourceAssessApprovalListRequest, BaseApprovalSubmitRequest> {
+    @Autowired
+    private IBizBusinessOutsourceAssessService outsourceAssessService;
 
+    public BizBusinessOutsourceAssessController(IGeneralApprovalService<BizBusinessOutsourceAssess, BizBusinessOutsourceAssess, OutsourceAssessApprovalListRequest, BaseApprovalSubmitRequest> baseApprovalService) {
+        super(baseApprovalService);
+    }
+
+    @ApiOperation("草稿箱-保存")
+    @PostMapping("/save")
+    public ReturnDTO<OutsourceAssessSaveResponse> saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceAssess request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        return outsourceAssessService.saveOutsourceAssess(request);
+    }
+
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception {
+        List<BizBusinessOutsourceAssess> list = super.exportList(request);
+        super.exportExcel(BizBusinessOutsourceAssess.class, list, ExportEnum.OUTSOURCE_ASSESS.getSheetName());
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java
new file mode 100644
index 0000000..9adef18
--- /dev/null
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java
@@ -0,0 +1,60 @@
+package com.casic.missiles.controller.business;
+
+import com.casic.missiles.controller.GeneralApprovalController;
+import com.casic.missiles.dto.BaseApprovalSubmitRequest;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.business.outsource.OutsourceProtocolApprovalListRequest;
+import com.casic.missiles.dto.business.outsource.OutsourceProtocolSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
+import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.model.business.BizBusinessOutsourceProtocol;
+import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
+import com.casic.missiles.service.IGeneralApprovalService;
+import com.casic.missiles.service.business.IBizBusinessOutsourceProtocolService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.BindingResult;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.validation.Valid;
+import java.util.List;
+
+/**
+ * <p>
+ * 计量检定业务-分包管理-测试、校准或检定工作分包协议书 前端控制器
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-08-24
+ */
+@Api(tags = "分包管理-测试、校准或检定工作分包协议书")
+@RestController
+@RequestMapping("/business/outsource/protocol")
+public class BizBusinessOutsourceProtocolController extends GeneralApprovalController<BizBusinessOutsourceProtocol, BizBusinessOutsourceProtocol, OutsourceProtocolApprovalListRequest, BaseApprovalSubmitRequest> {
+    @Autowired
+    private IBizBusinessOutsourceProtocolService outsourceProtocolService;
+
+    public BizBusinessOutsourceProtocolController(IGeneralApprovalService<BizBusinessOutsourceProtocol, BizBusinessOutsourceProtocol, OutsourceProtocolApprovalListRequest, BaseApprovalSubmitRequest> baseApprovalService) {
+        super(baseApprovalService);
+    }
+
+    @ApiOperation("草稿箱-保存")
+    @PostMapping("/save")
+    public ReturnDTO<OutsourceProtocolSaveResponse> saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceProtocol request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        return outsourceProtocolService.saveOutsourceProtocol(request);
+    }
+
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody OutsourceProtocolApprovalListRequest request) throws Exception {
+        List<BizBusinessOutsourceProtocol> list = super.exportList(request);
+        super.exportExcel(BizBusinessOutsourceProtocol.class, list, ExportEnum.OUTSOURCE_PROTOCOL.getSheetName());
+    }
+}
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java
index 097f645..f0f0943 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java
@@ -17,7 +17,6 @@
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.IGeneralApprovalService;
 import com.casic.missiles.service.business.IBizBusinessOutsourcerInfoService;
-import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -71,19 +70,8 @@
 
     @ApiOperation("分包方导出")
     @PostMapping("/listExport")
-    public void export(@RequestBody @Valid OutsourcerInfoApprovalListRequest request, BindingResult bindingResult) throws Exception {
-        if (bindingResult.hasErrors()) {
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        }
-        List<BizBusinessOutsourcerInfo> list;
-        if (!CollectionUtils.isEmpty(request.getIds())) {
-            list = outsourcerInfoService.listByIds(request.getIds());
-        } else {
-            list = outsourcerInfoService.list(request);
-        }
-        for (BizBusinessOutsourcerInfo record : list) {
-            DictCodeUtils.convertDictCodeToName(record);
-        }
+    public void export(@RequestBody OutsourcerInfoApprovalListRequest request) throws Exception {
+        List<BizBusinessOutsourcerInfo> list = super.exportList(request);
         super.exportExcel(BizBusinessOutsourcerInfo.class, list, ExportEnum.OUTSOURCER_EXPORT.getSheetName());
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java
index c2cbf9f..0410918 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java
@@ -17,11 +17,9 @@
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.IGeneralApprovalService;
 import com.casic.missiles.service.business.IBizBusinessSiteExecutiveInfoService;
-import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -60,7 +58,7 @@
         return siteExecutiveInfoService.saveSiteExecutiveInfo(siteExecutiveInfo);
     }
 
-    @ApiOperation("现场检测详情")
+    @ApiOperation("详情")
     @PostMapping("/detail")
     public ReturnDTO<SiteExecutiveDetailResponse> siteExecutiveDetail(@RequestBody @Valid IdDTO idDTO) throws Exception {
         Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
@@ -69,21 +67,10 @@
         return ReturnUtil.success(siteExecutiveInfoService.detail(idDTO.getId()));
     }
 
-    @ApiOperation("现场检测导出")
+    @ApiOperation("导出")
     @PostMapping("/listExport")
-    public void export(@RequestBody @Valid SiteExecutiveApprovalListRequest request, BindingResult bindingResult) throws Exception {
-        if (bindingResult.hasErrors()) {
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        }
-        List<SiteExecutiveApprovalListResponse> list;
-        if (!CollectionUtils.isEmpty(request.getIds())) {
-            list = siteExecutiveInfoService.listInfoByIds(request.getIds());
-        } else {
-            list = siteExecutiveInfoService.listInfo(request);
-        }
-        for (SiteExecutiveApprovalListResponse record : list) {
-            DictCodeUtils.convertDictCodeToName(record);
-        }
+    public void export(@RequestBody SiteExecutiveApprovalListRequest request) throws Exception {
+        List<SiteExecutiveApprovalListResponse> list = super.exportList(request);
         super.exportExcel(SiteExecutiveApprovalListResponse.class, list, ExportEnum.SITE_EXECUTIVE_EXPORT.getSheetName());
     }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
index 7e793cd..a92e209 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
@@ -55,7 +55,7 @@
 
     @ApiOperation("设备收发列表导出")
     @PostMapping("/export")
-    public void exportList(@RequestBody @Valid SampleDispatchListRequest request) throws IOException {
+    public void exportList(@RequestBody SampleDispatchListRequest request) throws IOException {
         List<SampleDispatchListResponse> list;
         if (!CollectionUtils.isEmpty(request.getIds())) {
             list = dispatchService.listByIds(request.getIds());
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java
index cdc77fc..d120fd4 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java
@@ -7,6 +7,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.business.labExecutive.*;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.business.IBusinessLabExecutiveInfoService;
@@ -14,6 +15,7 @@
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.*;
 
@@ -32,7 +34,7 @@
     @Autowired
     private IBusinessLabExecutiveInfoService labExecutiveInfoService;
 
-    @ApiOperation("实验室检测-部门检测-查询各状态列表（待检测、检测中、检测完）")
+    @ApiOperation("实验室任务-查询各状态列表（待检测、检测中、检测完）")
     @PostMapping("/deptExecutive/List")
     public ReturnDTO<PageInfoBT<SampleLabExecutiveListResponse>> queryDeptExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
@@ -43,10 +45,19 @@
         return ReturnUtil.success(super.packForBT(labExecutiveInfoService.deptLabExecutiveListPage(page, labExecutiveListRequest)));
     }
 
-    /**
-     * 实验室检测-我的检测-查询各状态列表（待检测、检测中、检测完）
-     */
-    @ApiOperation("实验室检测-我的检测-查询各状态列表（待检测、检测中、检测完）")
+    @ApiOperation("实验室任务导出")
+    @PostMapping("/deptExecutive/export")
+    public void deptExportList(@RequestBody @Valid SampleLabExecutiveListRequest request) throws Exception {
+        List<SampleLabExecutiveListResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = labExecutiveInfoService.deptLabExecutiveListByIds(request.getMeasureStatus(), request.getIds());
+        } else {
+            list = labExecutiveInfoService.deptLabExecutiveList(request);
+        }
+        super.exportExcel(SampleLabExecutiveListResponse.class, list, ExportEnum.DEPT_EXECUTIVE_TASK.getSheetName());
+    }
+
+    @ApiOperation("我的任务-查询各状态列表（待检测、检测中、检测完）")
     @PostMapping("/myExecutive/list")
     public ReturnDTO<PageInfoBT<SampleLabExecutiveListResponse>> queryMyExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
@@ -57,19 +68,25 @@
         return ReturnUtil.success(super.packForBT(labExecutiveInfoService.myLabExecutiveListPage(page, labExecutiveListRequest)));
     }
 
-    /**
-     * 实验室检测-我的检测-查询各状态样品数量（待检测、检测中、检测完）
-     */
-    @ApiOperation("实验室检测-我的检测-查询各状态样品数量（待检测、检测中、检测完）")
+    @ApiOperation("我的任务导出")
+    @PostMapping("/myExecutive/export")
+    public void exportList(@RequestBody @Valid SampleLabExecutiveListRequest request) throws Exception {
+        List<SampleLabExecutiveListResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = labExecutiveInfoService.myLabExecutiveListByIds(request.getMeasureStatus(), request.getIds());
+        } else {
+            list = labExecutiveInfoService.myLabExecutiveList(request);
+        }
+        super.exportExcel(SampleLabExecutiveListResponse.class, list, ExportEnum.MY_EXECUTIVE_TASK.getSheetName());
+    }
+
+    @ApiOperation("我的任务-查询各状态样品数量（待检测、检测中、检测完）")
     @GetMapping("/myExecutive/amount")
     public ReturnDTO<List<SampleAmountResponse>> queryMyExecutiveAmount() {
         return ReturnUtil.success(labExecutiveInfoService.myExecutiveAmount());
     }
 
-    /**
-     * 实验室检测-部门检测-分配（分配给具体人员）
-     */
-    @ApiOperation("实验室检测-部门检测-分配按钮（分配给具体人员）")
+    @ApiOperation("实验室任务-分配按钮（分配给具体人员）")
     @PostMapping("/deptExecutive/allocate")
     public ReturnDTO allocateStaff(@RequestBody @Valid SampleAllocateRequest sampleAllocateRequest, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -78,10 +95,7 @@
         return labExecutiveInfoService.allocateStaff(sampleAllocateRequest);
     }
 
-    /**
-     * 实验室检测-我的检测-检定人扫描收入（待检测->检测中）
-     */
-    @ApiOperation("实验室检测-我的检测-检定人扫描收入（待检测->检测中）")
+    @ApiOperation("我的任务-检定人扫描收入（待检测->检测中）")
     @PostMapping("/myExecutive/receive")
     public ReturnDTO sampleReceive(@RequestBody @Valid List<SampleOperateRequest> requestList, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -90,10 +104,7 @@
         return labExecutiveInfoService.sampleReceive(requestList);
     }
 
-    /**
-     * 实验室检测-负责人/检定人扫描检完（检测中->检测完）
-     */
-    @ApiOperation("实验室检测-负责人/检定人扫描检完（检测中->检测完）")
+    @ApiOperation("实验室任务-负责人/检定人扫描检完（检测中->检测完）")
     @PostMapping("/myExecutive/complete")
     public ReturnDTO sampleExecutiveComplete(@RequestBody @Valid List<SampleOperateRequest> requestList, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -102,10 +113,7 @@
         return labExecutiveInfoService.sampleExecutiveComplete(requestList);
     }
 
-    /**
-     * 实验室检测-部门检测/我的检测 编辑（只能修改应出具证书）
-     */
-    @ApiOperation("实验室检测-部门检测/我的检测 编辑（只能修改应出具证书）")
+    @ApiOperation("实验室任务/我的任务 编辑（只能修改应出具证书）")
     @PostMapping("/executive/update")
     public ReturnDTO updateExecutive(@RequestBody @Valid UpdateExecutiveRequest request, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -114,10 +122,7 @@
         return labExecutiveInfoService.updateExecutive(request);
     }
 
-    /**
-     * 实验室检测-部门检测/我的检测 详情
-     */
-    @ApiOperation("实验室检测-部门检测/我的检测 详情")
+    @ApiOperation("实验室任务/我的任务 详情")
     @PostMapping("/executive/detail")
     public ReturnDTO<ExecutiveDetailResponse> executiveDetail(@RequestBody @Valid ExecutiveDetailRequest request, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
@@ -131,7 +136,7 @@
      * 退回后会将下一个要执行的实验室检测状态更新为待分配，将后面的实验室顺序变更为连续（都进行减1）
      * 最后一个检测的实验室退回，等分发员再增加实验室或设备收发中的已收入直接手动点击完成
      */
-    @ApiOperation("实验室检测-部门检测/我的检测 退回（待检测/检测中->退回）")
+    @ApiOperation("实验室任务/我的任务 退回（待检测/检测中->退回）")
     @PostMapping("/executive/sendBack")
     public ReturnDTO executiveSendBack(@RequestBody @Valid ExecutiveSendBackRequest request, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -140,9 +145,6 @@
         return labExecutiveInfoService.sampleExecutiveSendBack(request);
     }
 
-    /**
-     * 分发员编辑实验室检测列表
-     */
     @ApiOperation("分发员编辑实验室检测列表")
     @PostMapping("/handOut/updateList")
     public ReturnDTO updateExecutiveList(@RequestBody @Valid UpdateExecutiveListRequest request, BindingResult bindingResult) {
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java
index 48a67ed..0c04f31 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java
@@ -10,6 +10,7 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.resource.customer.CustomerApprovalListRequest;
 import com.casic.missiles.dto.resource.customer.CustomerSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceCustomerInfo;
@@ -26,6 +27,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -55,6 +57,13 @@
         return customerInfoService.saveCustomerInfo(request);
     }
 
+    @ApiOperation("委托方名录导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody CustomerApprovalListRequest request) throws Exception {
+        List<BizResourceCustomerInfo> list = super.exportList(request);
+        super.exportExcel(BizResourceCustomerInfo.class, list, ExportEnum.CUSTOMER_INFO.getSheetName());
+    }
+
     @ApiOperation("委托方人员列表（分页）")
     @PostMapping("/person/listPage")
     public ReturnDTO<PageInfoBT<BizResourceCustomerStaff>> personListPage(@RequestBody IdDTO idDto) {
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
index 972ed4b..6418ea5 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
@@ -5,6 +5,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.resource.customer.SuggestFormApprovalListRequest;
 import com.casic.missiles.dto.resource.customer.SuggestFormSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceCustomerSuggestForm;
@@ -20,6 +21,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -50,4 +52,11 @@
         return suggestFormService.saveSuggestForm(request);
     }
 
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody SuggestFormApprovalListRequest request) throws Exception {
+        List<BizResourceCustomerSuggestForm> list = super.exportList(request);
+        super.exportExcel(BizResourceCustomerSuggestForm.class, list, ExportEnum.CUSTOMER_SUGGEST_FORM.getSheetName());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java
index 1934d1a..9e07eab 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java
@@ -15,12 +15,16 @@
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.resource.IEnvEnvironmentRecordConfigService;
 import com.casic.missiles.service.resource.IEnvEnvironmentRecordDataService;
+import com.casic.missiles.service.resource.IEnvLocationInfoService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
 import java.util.List;
@@ -39,6 +43,8 @@
     private IEnvEnvironmentRecordDataService environmentRecordDataService;
     @Autowired
     private IEnvEnvironmentRecordConfigService environmentRecordConfigService;
+    @Autowired
+    private IEnvLocationInfoService locationInfoService;
 
     @ApiOperation("环境记录单数据列表/详情")
     @PostMapping("/data/listPage")
@@ -95,4 +101,11 @@
         });
         return environmentRecordConfigService.deleteEnvironmentRecordConfig(idDTO.getId());
     }
+
+    @ApiOperation("地点列表")
+    @PostMapping("/location/listPage")
+    public ReturnDTO<PageInfoBT<LocationListResponse>> locationListPage(@RequestBody @Valid LocationListRequest request) {
+        Page<LocationListResponse> page = PageFactory.defaultPage();
+        return ReturnUtil.success(super.packForBT(locationInfoService.listPage(page, request)));
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java
index 82efe3f..e9561fa 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java
@@ -10,6 +10,7 @@
 import com.casic.missiles.dto.resource.seal.SealLogListRequest;
 import com.casic.missiles.dto.resource.seal.SealNoteApprovalListRequest;
 import com.casic.missiles.dto.resource.seal.SealNoteSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceSealUseLog;
@@ -27,6 +28,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -58,6 +60,13 @@
         return sealUseNoteService.saveSeal(request);
     }
 
+    @ApiOperation("印章使用登记导出（列表和导出中去掉经办人和监印人）")
+    @PostMapping("/listExport")
+    public void export(@RequestBody SealNoteApprovalListRequest request) throws Exception {
+        List<BizResourceSealUseNote> list = super.exportList(request);
+        super.exportExcel(BizResourceSealUseNote.class, list, ExportEnum.SEAL_NOTE.getSheetName());
+    }
+
     // TODO: 2023/7/28 印章使用日志：系统中使用印章时插入数据库
 
     @ApiOperation("印章使用日志列表（分页）")
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java
index 9b674fc..06b6521 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java
@@ -9,16 +9,20 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.resource.staff.StaffCertRequest;
 import com.casic.missiles.dto.resource.staff.StaffCertResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.service.resource.IBizResourceStaffInfoService;
 import com.casic.missiles.service.resource.IBizResourceStaffVerifierService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.List;
+
 /**
  * @Description:
  * @Author: wangpeng
@@ -41,9 +45,21 @@
         return ReturnUtil.success(super.packForBT(responsePage));
     }
 
+    @ApiOperation("证书逾期提醒导出")
+    @PostMapping("/listExport")
+    public void exportList(@RequestBody StaffCertRequest request) throws Exception {
+        List<StaffCertResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = staffInfoService.certListByIds(request.getIds());
+        } else {
+            list = staffInfoService.certList(request);
+        }
+        super.exportExcel(StaffCertResponse.class, list, ExportEnum.STAFF_CERTIFICATE_EXPIRE.getSheetName());
+    }
+
     @ApiOperation("证书逾期提醒")
     @PostMapping("/expirationReminder")
-    public ReturnDTO expirationReminder(@RequestBody IdDTO idDto) {
-        return verifierService.expirationReminder(idDto);
+    public ReturnDTO expirationReminder(@RequestBody IdDTO idDTO) {
+        return verifierService.expirationReminder(idDTO);
     }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java
index 3b251ad..a6e7850 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java
@@ -12,6 +12,7 @@
 import com.casic.missiles.dto.resource.staff.StaffListRequest;
 import com.casic.missiles.dto.resource.staff.TrainListRequest;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.*;
@@ -22,7 +23,10 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
 import java.util.List;
@@ -52,8 +56,19 @@
             throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
         }
         Page<BizResourceStaffInfo> page = PageFactory.defaultPage();
-        Page<BizResourceStaffInfo> responsePage = staffInfoService.listPage(page, request);
-        return ReturnUtil.success(super.packForBT(responsePage));
+        return ReturnUtil.success(super.packForBT(staffInfoService.listPage(page, request)));
+    }
+
+    @ApiOperation("人员登记导出")
+    @PostMapping("/listExport")
+    public void exportList(@RequestBody StaffListRequest request) throws Exception {
+        List<BizResourceStaffInfo> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = staffInfoService.listByIds(request.getIds());
+        } else {
+            list = staffInfoService.list(request);
+        }
+        super.exportExcel(BizResourceStaffInfo.class, list, ExportEnum.STAFF_INFO.getSheetName());
     }
 
     @ApiOperation("人员登记详情基础信息")
@@ -85,9 +100,9 @@
 
     @ApiOperation("科研教育列表（分页）")
     @PostMapping("/education/listPage")
-    public ReturnDTO<PageInfoBT<BizResourceStaffEducation>> educationListPage(@RequestBody IdDTO idDto) {
+    public ReturnDTO<PageInfoBT<BizResourceStaffEducation>> educationListPage(@RequestBody IdDTO idDTO) {
         Page<BizResourceStaffEducation> page = PageFactory.defaultPage();
-        Page<BizResourceStaffEducation> responsePage = staffInfoService.educationListPage(page, idDto);
+        Page<BizResourceStaffEducation> responsePage = staffInfoService.educationListPage(page, idDTO);
         return ReturnUtil.success(super.packForBT(responsePage));
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java
index af6aa86..d85d84a 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java
@@ -9,6 +9,7 @@
 import com.casic.missiles.dto.resource.outsideService.SupplierApprovalListRequest;
 import com.casic.missiles.dto.resource.outsideService.SupplierSaveResponse;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceSupplierAbility;
@@ -67,6 +68,13 @@
         return ReturnUtil.success(supplierInfoService.detail(idDTO.getId()));
     }
 
+    @ApiOperation("合格供方导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody SupplierApprovalListRequest request) throws Exception {
+        List<BizResourceSupplierInfo> list = super.exportList(request);
+        super.exportExcel(BizResourceSupplierInfo.class, list, ExportEnum.SUPPLIER_INFO.getSheetName());
+    }
+
     @ApiOperation("供方人员列表（分页）")
     @PostMapping("/person/listPage")
     public ReturnDTO<PageInfoBT<BizResourceSupplierPerson>> personListPage(@RequestBody IdDTO idDTO) {
diff --git a/casic-metering-api/src/main/resources/config/application.yml b/casic-metering-api/src/main/resources/config/application.yml
index 350db5f..ecff521 100644
--- a/casic-metering-api/src/main/resources/config/application.yml
+++ b/casic-metering-api/src/main/resources/config/application.yml
@@ -126,7 +126,7 @@
     #作者
     author: wangpeng
     #待生成对象表名
-    table-name: biz_equipment_technical_target_approval,biz_equipment_attachment_approval,biz_equipment_checkpoint_approval
+    table-name: biz_business_outsource_protocol
 
 reminder:
   #节点--common模块config包 ReminderNodeConfig配置
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
index 4a19e4e..d47d552 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
@@ -53,6 +53,7 @@
     SUGGEST_FORM_SAVE_FAILED(2509, "委托方意见登记表保存至草稿箱失败"),
     EXAMINE_FORM_SAVE_FAILED(2510, "要求、委托书及合同评审表保存至草稿箱失败"),
     CUSTOMER_EXIST_SAVE_FAILED(2511, "该委托方已存在，请重新选择"),
+    DUPLICATE_LOCATION_NO(2512, "地点编号已存在"),
 
     /**
      * 计量检定业务模块
@@ -68,6 +69,8 @@
     COMPLETE_SAMPLE_NOT_EXIST(2609, "检测中不存在扫描收入的样品"),
     CANNOT_CHANGE_MEASURE_INFO(2610, "无法更改非当前登录用户的检测信息"),
     NON_EXIST_ORDER_OR_SAMPLE(2611, "不存在该委托单或该委托单下的样品"),
+    OUTSOURCE_ACCESS_SAVE_FAILED(2612, "测试、校准或检定工作分包评审表保存至草稿箱失败"),
+    OUTSOURCE_PROTOCOL_SAVE_FAILED(2613, "测试、校准或检定工作分包协议书保存至草稿箱失败"),
 
     /**
      * 历史遗留备用
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
index 5089ad1..81a406b 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
@@ -10,54 +10,38 @@
     /**
      * 资源管理
      */
-    ENVIRONMENT_DATA_EXPORT("environmentData", "environmentData", "环境记录单数据"),
+    ENVIRONMENT_DATA_EXPORT("environmentData", "环境记录单数据", "环境记录单数据"),
+    STAFF_INFO("staffInfo", "人员登记", "人员登记"),
+    STAFF_CERTIFICATE_EXPIRE("certificateExpire", "证书逾期提醒", "证书逾期提醒"),
+    SUPPLIER_INFO("supplierInfo", "合格供方名录", "合格供方名录"),
+    CUSTOMER_INFO("customerInfo", "委托方名录", "委托方名录"),
+    CUSTOMER_SUGGEST_FORM("customerSuggestForm", "委托方意见登记表", "委托方意见登记表"),
+    SEAL_NOTE("sealNote", "印章使用登记", "印章使用登记"),
 
-    FILE_EXPORT("meterFileData", "meterFileData", "计量文件信息"),
-    TRAIN_PLAN_EXPORT("trainPlanData", "trainPlanData", "培训计划"),
-    TRAIN_LOG_EXPORT("trainLogData", "trainLogData", "培训记录"),
-    METER_ORGANIZE_EXPORT("meterOrganizeData", "meterOrganizeData", "计量组织"),
-    TRACE_SUPPLIER_EXPORT("traceSupplierData", "traceSupplierData", "溯源供方"),
-    SIGN_EXPORT("signData", "signData", "签名/签章"),
-    TEMPLATE_EXPORT("templateData", "templateData", "原始记录模板/证书报告模板"),
-    FIXED_ASSETS("meterFixedAssets", "meterFixedAssets", "固定资产"),
-    METER_EQUIPMENT("meterEquipment", "meterEquipment", "测量设备"),
-    CALIBRATION_TEST_EQUIPMENT("calibrationTestEquipment", "calibrationTestEquipment", "校准检定设备"),
-    MEASURE_ACCOUNT("measureAccount", "measureAccount", "测量工装"),
-    STANDARD_SUPPORT_EQUIPMENT("standardSupportEquipment", "standardSupportEquipment", "标准配套设备"),
-    STANDARD_EQUIPMENT("standardEquipment", "standardEquipment", "标准装置"),
-    FLOW_DEF_EXPORT("flowDefData", "flowDefData", "流程定义"),
-    STAFF_CERTIFICATE("certificate", "certificate", "计量人员证书"),
-    CHECK_INFO("checkInfo", "checkInfo", "设备管理点检测"),
-    EQUIPMENT_APPLY("equipmentApply", "equipmentApply", "设备借用"),
-    STANDARD_EQUIPMENT_REMIND("equipmentApplyRemind", "equipmentApplyRemind", "标准装置到期提醒"),
-    METER_PRICE("meterPrice", "meterPrice", "价格库"),
-    METER_STAFF("meterStaff", "meterStaff", "计量人员"),
-    STANDARD_EQUIPMENT_APPLY("standardEquipmentApply", "standardEquipmentApply", "标准装置申请"),
-    STATE_MANAGE_APPLY("stateManage", "stateManage", "状态管理"),
-    METER_ACCEPTANCE_CHECK("acceptanceCheck", "acceptanceCheck", "设备检修保养验收单"),
-    CUSTOMER_EXPORT("customerData", "customerData", "客户信息"),
-    ORDER_EXPORT("orderData", "orderData", "委托书信息"),
-    SAMPLE_EXPORT("sampleData", "sampleData", "样本信息"),
-    EXCHANGE_DATA("exchangeData", "exchangeData", "设备交接单"),
-    DISPATCH_DATA("dispatchData", "dispatchData", "设备收发"),
-    ENVIRONMENT_DATA("environmentData", "environmentData", "环境记录单"),
-    ORIGIN_DATA("originData", "originData", "原始记录"),
-    CERTIFICATE_REPORT("certificateReport", "certificateReport", "证书报告"),
-    ADVICE_EXPORT("adviceData", "adviceData", "客户反馈"),
-    HANDOUT_EXPORT("handoutData", "handoutData", "任务分发列表"),
-    OUTSOURCER_EXPORT("outsourcerData", "outsourcerData", "分包方"),
-    SITE_EXECUTIVE_EXPORT("siteExecutiveData", "siteExecutiveData", "现场测试、校准或检定"),
-    CERTIFICATE_PRINT_EXPORT("certificatePrintData", "certificatePrintData", "证书打印"),
-    DOWNLOAD_TEMPLATE("downloadTemplate", "downloadTemplate", "页面配置"),
-    OUTSOURCER_CERTIFICATE_EXPORT("outsourceCertificateData", "outsourceCertificateData", "分包证书"),
-    SETTLEMENT_INFO_EXPORT("settlementInfoData", "settlementInfoData", "业务结算"),
-    EQUIPMENT_REMIND("equipmentRemind", "equipmentRemind", "设备到期提醒"),
-    AGREEMENT_INFO_EXPORT("agreementInfoData", "agreementInfoData", "合同"),
-    WORK_STATISTICS_EXPORT("workStatisticsData", "workStatisticsData", "实时工作统计"),
-    DEPT_OUTPUT_EXPORT("deptOutputData", "deptOutputData", "部门产值分析"),
-    WORKLOAD_EXPORT("workloadData", "workloadData", "业务工作量分析"),
-    DEPT_COMPREHENSIVE_EXPORT("deptComprehensiveData", "deptComprehensiveData", "部门综合分析"),
-    ENVIRONMENTAL_RECORD("environmentalRecordData", "environmentalRecordData", "现场环境记录");
+    /**
+     * 计量检定业务
+     */
+    OUTSOURCER_EXPORT("outsourcerData", "分包方名录", "分包方名录"),
+    IDENTIFY_EXPORT("identifyData", "计量标识", "计量标识"),
+    ORDER_EXPORT("orderData", "任务单", "任务单"),
+    DISPATCH_DATA("dispatchData", "设备收发", "设备收发"),
+    HANDOUT_EXPORT("handoutData", "任务分发", "任务分发"),
+    SITE_EXECUTIVE_EXPORT("siteExecutiveData", "现场测试、校准或检定", "现场测试、校准或检定"),
+    CERTIFICATE_REPORT("certificateReport", "证书审批", "证书审批"),
+    CERTIFICATE_CHANGE_APPLY("certificateChangeApply", "证书报告补充或更换申请单", "证书报告补充或更换申请单"),
+    CERTIFICATE_PRINT("certificatePrintData", "证书打印审批", "证书打印审批"),
+    DEPT_EXECUTIVE_TASK("deptExecutiveTaskData", "实验室任务", "实验室任务"),
+    MY_EXECUTIVE_TASK("myExecutiveTaskData", "我的任务", "我的任务"),
+    OUTSOURCE_ASSESS("outsourceAssess", "测试、校准或检定工作分包评审表", "测试、校准或检定工作分包评审表"),
+    OUTSOURCE_PROTOCOL("outsourceProtocol", "测试、校准或检定工作分包协议书", "测试、校准或检定工作分包协议书"),
+
+    /**
+     * 系统管理
+     */
+    SIGN_EXPORT("signData", "签名", "签名"),
+    TEMPLATE_EXPORT("templateData", "文件模板", "文件模板"),
+    FLOW_DEF_EXPORT("flowDefData", "流程定义", "流程定义"),
+    DOWNLOAD_TEMPLATE("downloadTemplate", "流程定义", "页面配置");
 
     ExportEnum(String fileName, String sheetName, String description) {
         this.fileName = fileName;
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateRecordTypeCodeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateRecordTypeCodeEnum.java
index 31d913c..a963522 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateRecordTypeCodeEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateRecordTypeCodeEnum.java
@@ -46,4 +46,14 @@
     String SITE_EXECUTIVE_APPROVAL = "01";
     //《现场测试、校准或检定工作记录表》
     String SITE_EXECUTIVE_LOG = "02";
+
+    //测试、校准或检定工作分包协议书
+    String OUTSOURCE_PROTOCOL = "01";
+    //测试、校准或检定工作分包评审表
+    String OUTSOURCE_ACCESS = "02";
+    //测试、校准或检定工作分包通知书
+    String OUTSOURCE_NOTICE = "03";
+    //测试、校准或检定工作分包方名录
+    String OUTSOURCE_INFO = "04";
+
 }
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
index 24b8635..f78bd53 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
@@ -15,6 +15,10 @@
     String CERTIFICATE_CHANGE_APPLY_BEAN_NAME = "certificateChangeApplyBean";
     //现场测试、校准或检定
     String SITE_EXECUTIVE_BEAN_NAME = "siteExecutiveBean";
+    //测试、校准或检定工作分包评审表
+    String OUTSOURCE_ASSESS_BEAN_NAME = "outsourceAssessBean";
+    //测试、校准或检定工作分包协议书
+    String OUTSOURCE_PROTOCOL_BEAN_NAME = "outsourceProtocolBean";
 
     /*********************************设备与装置************************************/
     //设备台账
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 b21c661..6b86fd1 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
@@ -18,6 +18,8 @@
     OUTSOURCER_APPROVAL(OUTSOURCER_BEAN_NAME, ""),
     CERTIFICATE_CHANGE_APPROVAL(CERTIFICATE_CHANGE_APPLY_BEAN_NAME, ""),
     SITE_EXECUTIVE_APPROVAL(SITE_EXECUTIVE_BEAN_NAME, ""),
+    OUTSOURCE_ASSESS_APPROVAL(OUTSOURCE_ASSESS_BEAN_NAME, ""),
+    OUTSOURCE_PROTOCOL_APPROVAL(OUTSOURCE_PROTOCOL_BEAN_NAME, ""),
 
     ACTION_STATUS_MAP(new HashMap<String, AwareActionStatusEnum>() {
         {
@@ -47,6 +49,10 @@
             put(ApplyFromIdEnum.CERTIFICATE_CHANGE_APPROVAL.getCode(), CERTIFICATE_CHANGE_APPROVAL);
             //现场测试、校准或检定审批
             put(ApplyFromIdEnum.SITE_EXECUTIVE_APPROVAL.getCode(), SITE_EXECUTIVE_APPROVAL);
+            //测试、校准或检定工作分包评审表
+            put(ApplyFromIdEnum.OUTSOURCE_ASSESS_APPROVAL.getCode(), OUTSOURCE_ASSESS_APPROVAL);
+            //测试、校准或检定工作分包协议书
+            put(ApplyFromIdEnum.OUTSOURCE_PROTOCOL_APPROVAL.getCode(), OUTSOURCE_PROTOCOL_APPROVAL);
         }
     });
     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 934405e..c7410bd 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
@@ -9,6 +9,8 @@
     CERTIFICATE_CHANGE_APPROVAL("jljdywzsbchghsqd", MessageSourceModuleEnum.BUSINESS.getCode(), "证书/报告补充或更换申请单"),
     OUTSOURCER_APPROVAL("jljdywcsjzhgfbfml", MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定合格分包方名录"),
     SITE_EXECUTIVE_APPROVAL("jljdywxccsjzsp", MessageSourceModuleEnum.BUSINESS.getCode(), "现场测试、校准或检定审批"),
+    OUTSOURCE_ASSESS_APPROVAL("jljdywcsjzfbpsb", MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包评审表"),
+    OUTSOURCE_PROTOCOL_APPROVAL("jljdywcsjzfbxys", MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包协议书"),
 
 
     /*******************************************设备与装置*********************************************/
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/GeneralApprovalMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/GeneralApprovalMapper.java
index 4fb7344..0c9d6ae 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/GeneralApprovalMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/GeneralApprovalMapper.java
@@ -17,8 +17,4 @@
 
     Page<O> selectBatchForApprovalList(Page<O> page, @Param("request") R request, @Param("businessKeys") List<String> businessKeys);
 
-//    Page<O> selectListPage(Page<O> page, @Param("request") R request);
-
-//    Long selectMaxNo();
-
 }
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceAssessMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceAssessMapper.java
index 7867bb8..ba59009 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceAssessMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceAssessMapper.java
@@ -1,7 +1,12 @@
 package com.casic.missiles.mapper.business;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.business.outsource.OutsourceAssessApprovalListRequest;
+import com.casic.missiles.mapper.GeneralApprovalMapper;
 import com.casic.missiles.model.business.BizBusinessOutsourceAssess;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * <p>
@@ -11,6 +16,10 @@
  * @author wangpeng
  * @since 2023-08-16
  */
-public interface BizBusinessOutsourceAssessMapper extends BaseMapper<BizBusinessOutsourceAssess> {
+public interface BizBusinessOutsourceAssessMapper extends GeneralApprovalMapper<BizBusinessOutsourceAssess, BizBusinessOutsourceAssess, OutsourceAssessApprovalListRequest> {
+
+    Page<BizBusinessOutsourceAssess> selectBatchForApprovalList(Page<BizBusinessOutsourceAssess> page, @Param("request") OutsourceAssessApprovalListRequest request, @Param("businessKeys") List<String> businessKeys);
+
+    Long selectMaxProjectNo();
 
 }
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceProtocolMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceProtocolMapper.java
new file mode 100644
index 0000000..e6aba35
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceProtocolMapper.java
@@ -0,0 +1,24 @@
+package com.casic.missiles.mapper.business;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.business.outsource.OutsourceProtocolApprovalListRequest;
+import com.casic.missiles.mapper.GeneralApprovalMapper;
+import com.casic.missiles.model.business.BizBusinessOutsourceProtocol;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 计量检定业务-分包管理-测试、校准或检定工作分包协议书 Mapper 接口
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-08-24
+ */
+public interface BizBusinessOutsourceProtocolMapper extends GeneralApprovalMapper<BizBusinessOutsourceProtocol, BizBusinessOutsourceProtocol, OutsourceProtocolApprovalListRequest> {
+
+    Page<BizBusinessOutsourceProtocol> selectBatchForApprovalList(Page<BizBusinessOutsourceProtocol> page, @Param("request") OutsourceProtocolApprovalListRequest request, @Param("businessKeys") List<String> businessKeys);
+
+    Long selectMaxProtocolNo();
+}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/EnvLocationInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/EnvLocationInfoMapper.java
new file mode 100644
index 0000000..49eff87
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/EnvLocationInfoMapper.java
@@ -0,0 +1,21 @@
+package com.casic.missiles.mapper.resource;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.resource.environment.LocationListRequest;
+import com.casic.missiles.dto.resource.environment.LocationListResponse;
+import com.casic.missiles.model.resource.EnvLocationInfo;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * <p>
+ * 实验室环境监控系统-设备表 Mapper 接口
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-06-07
+ */
+public interface EnvLocationInfoMapper extends BaseMapper<EnvLocationInfo> {
+
+    Page<LocationListResponse> selectLocationListPage(Page<LocationListResponse> page, @Param("request") LocationListRequest request);
+}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java
index de124db..85ed0f7 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java
@@ -1,7 +1,9 @@
 package com.casic.missiles.mapper.system;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.dto.system.SignDetailResponse;
+import com.casic.missiles.dto.system.SignListRequest;
 import com.casic.missiles.model.system.SystemSign;
 import org.apache.ibatis.annotations.Param;
 
@@ -22,4 +24,8 @@
     SignDetailResponse selectSignDetailById(Long id);
 
     List<SystemSign> selectUsableSignList(@Param("userId") Long userId);
+
+    Page<SystemSign> selectSignListPage(Page<SystemSign> page, @Param("request") SignListRequest request);
+
+    List<SystemSign> selectSignList(@Param("request") SignListRequest request);
 }
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateChangeApplyMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateChangeApplyMapper.xml
index d798447..c496092 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateChangeApplyMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateChangeApplyMapper.xml
@@ -30,31 +30,31 @@
         SELECT *
         FROM biz_business_certificate_change_apply
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.changeApplyNo != null and request.changeApplyNo !=''">
+        <if test="request != null and request.changeApplyNo != null and request.changeApplyNo !=''">
             and change_apply_no like concat('%',#{request.changeApplyNo},'%')
         </if>
-        <if test="request.changeReportNo != null and request.changeReportNo !=''">
+        <if test="request != null and request.changeReportNo != null and request.changeReportNo !=''">
             and change_report_no like concat('%',#{request.changeReportNo},'%')
         </if>
-        <if test="request.changeReportName != null and request.changeReportName !=''">
+        <if test="request != null and request.changeReportName != null and request.changeReportName !=''">
             and change_report_name like concat('%',#{request.changeReportName},'%')
         </if>
-        <if test="request.changeType != null and request.changeType !=''">
+        <if test="request != null and request.changeType != null and request.changeType !=''">
             and change_type = #{request.changeType}
         </if>
-        <if test="request.createUserName != null and request.createUserName !=''">
+        <if test="request != null and request.createUserName != null and request.createUserName !=''">
             and create_user_name like concat('%',#{request.createUserName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificatePrintMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificatePrintMapper.xml
index b66cd99..49c0ac8 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificatePrintMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificatePrintMapper.xml
@@ -31,34 +31,34 @@
         LEFT JOIN biz_business_order_sample_relation bosr ON (bosr.order_id = bcr.order_id AND bosr.sample_id = bcr.sample_id)
         LEFT JOIN biz_business_order_info boi ON boi.id = bosr.order_id
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and bcp.approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.printStatus != null and request.printStatus !=''">
+        <if test="request != null and request.printStatus != null and request.printStatus !=''">
             and print_status = #{request.printStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and bcp.create_user_id = #{request.createUserId}
         </if>
-        <if test="request.certificateReportNo != null and request.certificateReportNo !=''">
+        <if test="request != null and request.certificateReportNo != null and request.certificateReportNo !=''">
             and bcr.certificate_report_no like concat('%',#{request.certificateReportNo},'%')
         </if>
-        <if test="request.certificateReportName != null and request.certificateReportName !=''">
+        <if test="request != null and request.certificateReportName != null and request.certificateReportName !=''">
             and bcr.certificate_report_name like concat('%',#{request.certificateReportName},'%')
         </if>
-        <if test="request.customerName != null and request.customerName !=''">
+        <if test="request != null and request.customerName != null and request.customerName !=''">
             and boi.customer_name like concat('%',#{request.customerName},'%')
         </if>
-        <if test="request.sampleNo != null and request.sampleNo !=''">
+        <if test="request != null and request.sampleNo != null and request.sampleNo !=''">
             and bosr.sample_no like concat('%',#{request.sampleNo},'%')
         </if>
-        <if test="request.sampleName != null and request.sampleName !=''">
+        <if test="request != null and request.sampleName != null and request.sampleName !=''">
             and bosr.sample_name like concat('%',#{request.sampleName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and bcp.create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and bcp.create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml
index b366034..767695d 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml
@@ -46,33 +46,37 @@
         SELECT bcr.*, bosr.sample_no, bosr.sample_name, bosr.sample_model, rsi.staff_name
         FROM biz_business_certificate_report bcr
         LEFT JOIN biz_business_order_sample_relation bosr ON (bosr.order_id = bcr.order_id AND bosr.sample_id = bcr.sample_id)
+        LEFT JOIN biz_business_order_info boi ON boi.id = bcr.order_id
         LEFT JOIN biz_resource_staff_info rsi ON rsi.id = bcr.measure_person_id
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and bcr.approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and bcr.create_user_id = #{request.createUserId}
         </if>
-        <if test="request.certificateReportNo != null and request.certificateReportNo !=''">
+        <if test="request != null and request.customerId != null and request.customerId !=''">
+            and boi.customer_id = #{request.customerId}
+        </if>
+        <if test="request != null and request.certificateReportNo != null and request.certificateReportNo !=''">
             and bcr.certificate_report_no like concat('%',#{request.certificateReportNo},'%')
         </if>
-        <if test="request.certificateReportName != null and request.certificateReportName !=''">
+        <if test="request != null and request.certificateReportName != null and request.certificateReportName !=''">
             and bcr.certificate_report_name like concat('%',#{request.certificateReportName},'%')
         </if>
-        <if test="request.sampleNo != null and request.sampleNo !=''">
+        <if test="request != null and request.sampleNo != null and request.sampleNo !=''">
             and bosr.sample_no like concat('%',#{request.sampleNo},'%')
         </if>
-        <if test="request.measureCategory != null and request.measureCategory !=''">
+        <if test="request != null and request.measureCategory != null and request.measureCategory !=''">
             and bcr.measure_category = #{request.measureCategory}
         </if>
-        <if test="request.measurePerson != null and request.measurePerson !=''">
+        <if test="request != null and request.measurePerson != null and request.measurePerson !=''">
             and rsi.staff_name like concat('%',#{request.measurePerson},'%')
         </if>
-        <if test="request.calibrationTimeStart != null and request.calibrationTimeStart !=''">
+        <if test="request != null and request.calibrationTimeStart != null and request.calibrationTimeStart !=''">
             and bcr.calibration_time &gt;= #{request.calibrationTimeStart}
         </if>
-        <if test="request.calibrationTimeEnd != null and request.calibrationTimeEnd !=''">
+        <if test="request != null and request.calibrationTimeEnd != null and request.calibrationTimeEnd !=''">
             and bcr.calibration_time &lt;= #{request.calibrationTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceAssessMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceAssessMapper.xml
index d0fcf8b..c22c101 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceAssessMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceAssessMapper.xml
@@ -7,6 +7,8 @@
         <id column="id" property="id" />
         <result column="project_no" property="projectNo" />
         <result column="project_name" property="projectName" />
+        <result column="lab_code" property="labCode" />
+        <result column="group_code" property="groupCode" />
         <result column="applicant_id" property="applicantId" />
         <result column="applicant_name" property="applicantName" />
         <result column="applicant_time" property="applicantTime" />
@@ -31,7 +33,45 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, project_no, project_name, applicant_id, applicant_name, applicant_time, minio_file_name, remark, create_user_id, create_user_name, outsourcer_id, pre_start_time, pre_end_time, outsource_reason, pre_cost, approval_status, process_id, approve_situation, traceability, test_method, technique_ability, create_time, update_time
+        id, project_no, project_name, lab_code, group_code, applicant_id, applicant_name, applicant_time, minio_file_name, remark, create_user_id, create_user_name, outsourcer_id, pre_start_time, pre_end_time, outsource_reason, pre_cost, approval_status, process_id, approve_situation, traceability, test_method, technique_ability, create_time, update_time
     </sql>
 
+    <select id="selectMaxProjectNo" resultType="java.lang.Long">
+        SELECT IFNULL(max(RIGHT(project_no, 3)), 0) from biz_business_outsource_assess
+    </select>
+
+    <select id="selectBatchForApprovalList" resultMap="BaseResultMap">
+        SELECT bboa.*, bboi.outsourcer_name, bboi.director
+        FROM biz_business_outsource_assess bboa
+        LEFT JOIN biz_business_outsourcer_info bboi ON bboa.outsourcer_id = bboi.id
+        WHERE 1=1
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
+            and bboa.approval_status = #{request.approvalStatus}
+        </if>
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
+            and bboa.create_user_id = #{request.createUserId}
+        </if>
+        <if test="request != null and request.projectNo != null and request.projectNo !=''">
+            and bboa.project_no like concat('%',#{request.projectNo},'%')
+        </if>
+        <if test="request != null and request.outsourcerName != null and request.outsourcerName !=''">
+            and bboi.outsourcer_name like concat('%',#{request.outsourcerName},'%')
+        </if>
+        <if test="request != null and request.applicantName != null and request.applicantName !=''">
+            and bboa.applicant_name like concat('%',#{request.applicantName},'%')
+        </if>
+        <if test="request != null and request.applicantTimeStart != null and request.applicantTimeStart !=''">
+            and bboa.applicant_time &gt;= #{request.applicantTimeStart}
+        </if>
+        <if test="request != null and request.applicantTimeEnd != null and request.applicantTimeEnd !=''">
+            and bboa.applicant_time &lt;= #{request.applicantTimeEnd}
+        </if>
+        <if test="businessKeys != null">
+            and bboa.id in
+            <foreach collection="businessKeys" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
+        ORDER BY bboa.create_time DESC
+    </select>
 </mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceProtocolMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceProtocolMapper.xml
new file mode 100644
index 0000000..b7b2149
--- /dev/null
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceProtocolMapper.xml
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.mapper.business.BizBusinessOutsourceProtocolMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.business.BizBusinessOutsourceProtocol">
+        <id column="id" property="id" />
+        <result column="protocol_no" property="protocolNo" />
+        <result column="project_name" property="projectName" />
+        <result column="lab_code" property="labCode" />
+        <result column="group_code" property="groupCode" />
+        <result column="outsourcer_id" property="outsourcerId" />
+        <result column="remark" property="remark" />
+        <result column="outsource_no" property="outsourceNo" />
+        <result column="outsource_name" property="outsourceName" />
+        <result column="contacts" property="contacts" />
+        <result column="mobile" property="mobile" />
+        <result column="address" property="address" />
+        <result column="require_date" property="requireDate" />
+        <result column="outsource_cost" property="outsourceCost" />
+        <result column="director" property="director" />
+        <result column="item" property="item" />
+        <result column="requires" property="requires" />
+        <result column="create_user_id" property="createUserId" />
+        <result column="create_user_name" property="createUserName" />
+        <result column="approval_status" property="approvalStatus" />
+        <result column="process_id" property="processId" />
+        <result column="create_time" property="createTime" />
+        <result column="update_time" property="updateTime" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, protocol_no, project_name, lab_code, group_code, outsourcer_id, remark, outsource_no, outsource_name, contacts, mobile, address, require_date, outsource_cost, director, item, requires, create_user_id, create_user_name, approval_status, process_id, create_time, update_time
+    </sql>
+
+    <select id="selectMaxProtocolNo" resultType="java.lang.Long">
+        SELECT IFNULL(max(RIGHT(protocol_no, 3)), 0) from biz_business_outsource_protocol
+    </select>
+
+    <select id="selectBatchForApprovalList" resultMap="BaseResultMap">
+        SELECT *
+        FROM biz_business_outsource_protocol
+        WHERE 1=1
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
+            and approval_status = #{request.approvalStatus}
+        </if>
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
+            and create_user_id = #{request.createUserId}
+        </if>
+        <if test="request != null and request.protocolNo != null and request.protocolNo !=''">
+            and protocol_no like concat('%',#{request.protocolNo},'%')
+        </if>
+        <if test="request != null and request.outsourcerName != null and request.outsourcerName !=''">
+            and outsourcer_name like concat('%',#{request.outsourcerName},'%')
+        </if>
+        <if test="request != null and request.applicantName != null and request.applicantName !=''">
+            and create_user_name like concat('%',#{request.applicantName},'%')
+        </if>
+        <if test="request != null and request.applicantTimeStart != null and request.applicantTimeStart !=''">
+            and create_time &gt;= #{request.applicantTimeStart}
+        </if>
+        <if test="request != null and request.applicantTimeEnd != null and request.applicantTimeEnd !=''">
+            and create_time &lt;= #{request.applicantTimeEnd}
+        </if>
+        <if test="businessKeys != null">
+            and id in
+            <foreach collection="businessKeys" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
+        ORDER BY create_time DESC
+    </select>
+</mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourcerInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourcerInfoMapper.xml
index 510a80b..3049b54 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourcerInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourcerInfoMapper.xml
@@ -7,6 +7,8 @@
         <id column="id" property="id" />
         <result column="outsourcer_no" property="outsourcerNo" />
         <result column="outsourcer_name" property="outsourcerName" />
+        <result column="lab_code" property="labCode" />
+        <result column="group_code" property="groupCode" />
         <result column="outsourcer_brief_name" property="outsourcerBriefName" />
         <result column="outsourcer_size" property="outsourcerSize" />
         <result column="business_size" property="businessSize" />
@@ -55,32 +57,32 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, outsourcer_no, outsourcer_name, outsourcer_brief_name, outsourcer_size, business_size, grade, evaluation, tax_number, bank_account, bank_name, bank_account_number, postal_code, director, phone, fax, mobile, email, website, address_country, address_province, address_city, address_area, full_address, address_country_name, address_province_name, address_city_name, address_area_name, invoice_country, invoice_province, invoice_city, invoice_area, invoice_full_address, invoice_country_name, invoice_province_name, invoice_city_name, invoice_area_name, business_scope, business_content, minio_file_name, approval_status, process_id, remark, create_user_id, create_user_name, create_time, update_time
+        id, outsourcer_no, outsourcer_name, lab_code, group_code, outsourcer_brief_name, outsourcer_size, business_size, grade, evaluation, tax_number, bank_account, bank_name, bank_account_number, postal_code, director, phone, fax, mobile, email, website, address_country, address_province, address_city, address_area, full_address, address_country_name, address_province_name, address_city_name, address_area_name, invoice_country, invoice_province, invoice_city, invoice_area, invoice_full_address, invoice_country_name, invoice_province_name, invoice_city_name, invoice_area_name, business_scope, business_content, minio_file_name, approval_status, process_id, remark, create_user_id, create_user_name, create_time, update_time
     </sql>
 
     <select id="selectBatchForApprovalList" resultMap="BaseResultMap">
         SELECT *
         FROM biz_business_outsourcer_info
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.outsourcerNo != null and request.outsourcerNo !=''">
+        <if test="request != null and request.outsourcerNo != null and request.outsourcerNo !=''">
             and outsourcer_no like concat('%',#{request.outsourcerNo},'%')
         </if>
-        <if test="request.outsourcerName != null and request.outsourcerName !=''">
+        <if test="request != null and request.outsourcerName != null and request.outsourcerName !=''">
             and outsourcer_name like concat('%',#{request.outsourcerName},'%')
         </if>
-        <if test="request.director != null and request.director !=''">
+        <if test="request != null and request.director != null and request.director !=''">
             and director like concat('%',#{request.director},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
@@ -93,6 +95,6 @@
     </select>
 
     <select id="selectMaxNo" resultType="java.lang.Long">
-        SELECT IFNULL(max(RIGHT(outsourcer_no, 12)), 0) from biz_business_outsourcer_info
+        SELECT IFNULL(max(RIGHT(outsourcer_no, 3)), 0) from biz_business_outsourcer_info
     </select>
 </mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessSiteExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessSiteExecutiveInfoMapper.xml
index 135c5d0..3c5ae79 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessSiteExecutiveInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessSiteExecutiveInfoMapper.xml
@@ -38,25 +38,25 @@
         FROM biz_business_site_executive_info bsei
         LEFT JOIN biz_resource_customer_info rci ON bsei.customer_id = rci.id
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and bsei.approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and bsei.create_user_id = #{request.createUserId}
         </if>
-        <if test="request.siteExecutiveNo != null and request.siteExecutiveNo !=''">
+        <if test="request != null and request.siteExecutiveNo != null and request.siteExecutiveNo !=''">
             and bsei.site_executive_no like concat('%',#{request.siteExecutiveNo},'%')
         </if>
-        <if test="request.customerName != null and request.customerName !=''">
+        <if test="request != null and request.customerName != null and request.customerName !=''">
             and rci.outsourcer_name like concat('%',#{request.customerName},'%')
         </if>
-        <if test="request.applyName != null and request.applyName !=''">
+        <if test="request != null and request.applyName != null and request.applyName !=''">
             and bsei.apply_name like concat('%',#{request.applyName},'%')
         </if>
-        <if test="request.applyTimeStart != null and request.applyTimeStart !=''">
+        <if test="request != null and request.applyTimeStart != null and request.applyTimeStart !=''">
             and bsei.apply_time &gt;= #{request.applyTimeStart}
         </if>
-        <if test="request.applyTimeEnd != null and request.applyTimeEnd !=''">
+        <if test="request != null and request.applyTimeEnd != null and request.applyTimeEnd !=''">
             and bsei.apply_time &lt;= #{request.applyTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml
index 84d9e2a..6bd38a9 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml
@@ -105,6 +105,12 @@
         <if test="request.isUrgent != null and request.isUrgent !=''">
             AND bo.is_urgent = #{request.isUrgent}
         </if>
+        <if test="request.ids != null">
+            and blei.id in
+            <foreach collection="request.ids" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
         ORDER BY blei.update_time DESC
     </select>
 
@@ -137,6 +143,12 @@
         <if test="request.isUrgent != null and request.isUrgent !=''">
             AND bo.is_urgent = #{request.isUrgent}
         </if>
+        <if test="request.ids != null">
+            and blei.id in
+            <foreach collection="request.ids" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
         ORDER BY blei.update_time DESC
     </select>
 
diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardInfoMapper.xml
index 1a5551b..2ed8d17 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardInfoMapper.xml
@@ -45,12 +45,6 @@
         FROM biz_equipment_standard_info besi
         LEFT JOIN biz_equipment_standard_technology_relation bestr ON besi.standard_no = bestr.standard_no
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
-            and besi.approval_status = #{request.approvalStatus}
-        </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
-            and besi.create_user_id = #{request.createUserId}
-        </if>
         <if test="request.standardName != null and request.standardName !=''">
             and besi.standard_name like concat('%',#{request.standardName},'%')
         </if>
diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardTechnologyRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardTechnologyRelationMapper.xml
index fc7e16c..cd03c8c 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardTechnologyRelationMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardTechnologyRelationMapper.xml
@@ -6,6 +6,7 @@
     <resultMap id="BaseResultMap" type="com.casic.missiles.model.equipment.BizEquipmentStandardTechnologyRelation">
         <id column="id" property="id" />
         <result column="technology_file_id" property="technologyFileId" />
+        <result column="technology_file_no" property="technologyFileNo" />
         <result column="technology_file_name" property="technologyFileName" />
         <result column="standard_id" property="standardId" />
         <result column="standard_no" property="standardNo" />
@@ -14,7 +15,7 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, technology_file_id, technology_file_name, standard_id, remark
+        id, technology_file_id, technology_file_no, technology_file_name, standard_id, remark
     </sql>
 
 </mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceAuthorizeOrderMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceAuthorizeOrderMapper.xml
index ac5176c..554fe65 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceAuthorizeOrderMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceAuthorizeOrderMapper.xml
@@ -32,22 +32,22 @@
         SELECT *
         FROM biz_resource_authorize_order
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.orderNo != null and request.orderNo !=''">
+        <if test="request != null and request.orderNo != null and request.orderNo !=''">
             and order_no like concat('%',#{request.orderNo},'%')
         </if>
-        <if test="request.createUserName != null and request.createUserName !=''">
+        <if test="request != null and request.createUserName != null and request.createUserName !=''">
             and create_user_name like concat('%',#{request.createUserName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerExamineFormMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerExamineFormMapper.xml
index ab242f6..af7f98f 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerExamineFormMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerExamineFormMapper.xml
@@ -41,28 +41,28 @@
         SELECT *
         FROM biz_resource_customer_examine_form
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.formNo != null and request.formNo !=''">
+        <if test="request != null and request.formNo != null and request.formNo !=''">
             and form_no like concat('%',#{request.formNo},'%')
         </if>
-        <if test="request.labCode != null and request.labCode !=''">
+        <if test="request != null and request.labCode != null and request.labCode !=''">
             and lab_code like concat('%',#{request.labCode},'%')
         </if>
-        <if test="request.groupCode != null and request.groupCode !=''">
+        <if test="request != null and request.groupCode != null and request.groupCode !=''">
             and group_code like concat('%',#{request.groupCode},'%')
         </if>
-        <if test="request.createUserName != null and request.createUserName !=''">
+        <if test="request != null and request.createUserName != null and request.createUserName !=''">
             and create_user_name like concat('%',#{request.createUserName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerInfoMapper.xml
index fa8ffbc..06a2798 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerInfoMapper.xml
@@ -33,25 +33,25 @@
         SELECT *
         FROM biz_resource_customer_info
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.customerNo != null and request.customerNo !=''">
+        <if test="request != null and request.customerNo != null and request.customerNo !=''">
             and customer_no like concat('%',#{request.customerNo},'%')
         </if>
-        <if test="request.customerName != null and request.customerName !=''">
+        <if test="request != null and request.customerName != null and request.customerName !=''">
             and customer_name like concat('%',#{request.customerName},'%')
         </if>
-        <if test="request.contacts != null and request.contacts !=''">
+        <if test="request != null and request.contacts != null and request.contacts !=''">
             and contacts like concat('%',#{request.contacts},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerSuggestFormMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerSuggestFormMapper.xml
index 28f5bb2..1806662 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerSuggestFormMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerSuggestFormMapper.xml
@@ -33,28 +33,28 @@
         SELECT *
         FROM biz_resource_customer_suggest_form
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.formNo != null and request.formNo !=''">
+        <if test="request != null and request.formNo != null and request.formNo !=''">
             and form_no like concat('%',#{request.formNo},'%')
         </if>
-        <if test="request.customerName != null and request.customerName !=''">
+        <if test="request != null and request.customerName != null and request.customerName !=''">
             and customer_name like concat('%',#{request.customerName},'%')
         </if>
-        <if test="request.customerDeptName != null and request.customerDeptName !=''">
+        <if test="request != null and request.customerDeptName != null and request.customerDeptName !=''">
             and customer_dept_name like concat('%',#{request.customerDeptName},'%')
         </if>
-        <if test="request.createUserName != null and request.createUserName !=''">
+        <if test="request != null and request.createUserName != null and request.createUserName !=''">
             and create_user_name like concat('%',#{request.createUserName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSealUseNoteMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSealUseNoteMapper.xml
index ab37bc1..b02bb33 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSealUseNoteMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSealUseNoteMapper.xml
@@ -29,32 +29,32 @@
     </sql>
 
     <select id="selectBatchForApprovalList" resultMap="BaseResultMap">
-        SELECT *
+        SELECT brsun.*, brsi.seal_name, brsi.seal_type, brsi.approver_name
         FROM biz_resource_seal_use_note brsun
         JOIN biz_resource_seal_info brsi ON brsun.seal_id = brsi.id
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and brsun.approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and brsun.create_user_id = #{request.createUserId}
         </if>
-        <if test="request.sealName != null and request.sealName !=''">
+        <if test="request != null and request.sealName != null and request.sealName !=''">
             and brsi.seal_name like concat('%',#{request.sealName},'%')
         </if>
-        <if test="request.sealType != null and request.sealType !=''">
+        <if test="request != null and request.sealType != null and request.sealType !=''">
             and brsi.seal_type = #{request.sealType}
         </if>
-        <if test="request.applyDeptName != null and request.applyDeptName !=''">
+        <if test="request != null and request.applyDeptName != null and request.applyDeptName !=''">
             and brsun.apply_dept_name like concat('%',#{request.applyDeptName},'%')
         </if>
-        <if test="request.applyUserName != null and request.applyUserName !=''">
+        <if test="request != null and request.applyUserName != null and request.applyUserName !=''">
             and brsun.apply_user_name like concat('%',#{request.applyUserName},'%')
         </if>
-        <if test="request.applyTimeStart != null and request.applyTimeStart !=''">
+        <if test="request != null and request.applyTimeStart != null and request.applyTimeStart !=''">
             and brsun.apply_time &gt;= #{request.applyTimeStart}
         </if>
-        <if test="request.applyTimeEnd != null and request.applyTimeEnd !=''">
+        <if test="request != null and request.applyTimeEnd != null and request.applyTimeEnd !=''">
             and brsun.apply_time &lt;= #{request.applyTimeEnd}
         </if>
         <if test="businessKeys != null">

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java
index bb0c50f..13a699b 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java
@@ -12,6 +12,7 @@
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.IGeneralApprovalService;
+import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
@@ -19,6 +20,7 @@
 import org.springframework.web.bind.annotation.RequestBody;
 
 import javax.validation.Valid;
+import java.util.List;
 import java.util.Objects;
 
 /**
@@ -117,4 +119,17 @@
         }
         return baseApprovalService.failUpdate(request);
     }
+
+    public List<O> exportList(@RequestBody @Valid R request) throws Exception {
+        List<O> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = baseApprovalService.listExportByIds(request.getIds());
+        } else {
+            list = baseApprovalService.listExport(request);
+        }
+        for (O record : list) {
+            DictCodeUtils.convertDictCodeToName(record);
+        }
+        return list;
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java
index 8a90961..d775831 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java
@@ -5,6 +5,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.business.certificate.CertificateChangeApplyApprovalListRequest;
 import com.casic.missiles.dto.business.certificate.CertificateChangeApplySaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessCertificateChangeApply;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
@@ -20,6 +21,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -48,4 +50,12 @@
         }
         return changeApplyService.saveChangeApply(request);
     }
+
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody CertificateChangeApplyApprovalListRequest request) throws Exception {
+        List<BizBusinessCertificateChangeApply> list = super.exportList(request);
+        super.exportExcel(BizBusinessCertificateChangeApply.class, list, ExportEnum.CERTIFICATE_CHANGE_APPLY.getSheetName());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java
index 5fc4b07..af8230e 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java
@@ -9,6 +9,7 @@
 import com.casic.missiles.dto.business.certificate.CertificatePrintApprovalListRequest;
 import com.casic.missiles.dto.business.certificate.CertificatePrintListResponse;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.enums.business.CertificatePrintStatusEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessCertificatePrintLog;
@@ -18,10 +19,16 @@
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.io.IOException;
+import java.util.List;
 import java.util.Objects;
 
 /**
@@ -98,4 +105,16 @@
         });
         return certificatePrintService.certificatePrintLog(idDTO.getId());
     }
+
+    @ApiOperation("证书打印审批导出")
+    @PostMapping("/listExport")
+    public void exportList(@RequestBody CertificatePrintApprovalListRequest request) throws IOException {
+        List<CertificatePrintListResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = certificatePrintService.listByIds(request.getIds());
+        } else {
+            list = certificatePrintService.list(request);
+        }
+        super.exportExcel(CertificatePrintListResponse.class, list, ExportEnum.CERTIFICATE_PRINT.getSheetName());
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java
index 63b06dc..6b2efd5 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java
@@ -6,6 +6,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.business.certificate.CertificateReportApprovalListRequest;
 import com.casic.missiles.dto.business.certificate.CertificateReportSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessCertificateReport;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
@@ -21,6 +22,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -50,7 +52,7 @@
         return certificateReportService.saveCertificateReport(request);
     }
 
-    @ApiOperation("证书审批详情（基本信息）")
+    @ApiOperation("详情（基本信息）")
     @PostMapping("/detail")
     public ReturnDTO<BizBusinessCertificateReport> detail(@RequestBody @Valid BaseDetailRequest request, BindingResult bindingResult) throws Exception {
         if(bindingResult.hasErrors()){
@@ -59,4 +61,11 @@
         return certificateReportService.detail(request);
     }
 
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody CertificateReportApprovalListRequest request) throws Exception {
+        List<BizBusinessCertificateReport> list = super.exportList(request);
+        super.exportExcel(BizBusinessCertificateReport.class, list, ExportEnum.CERTIFICATE_REPORT.getSheetName());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java
index 46b26bd..57c0809 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java
@@ -10,20 +10,21 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.business.identify.IdentifyListRequest;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessIdentifyInfo;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.business.IBizBusinessIdentifyInfoService;
+import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import javax.validation.Valid;
+import java.util.List;
 import java.util.Objects;
 
 /**
@@ -57,16 +58,13 @@
         return identifyInfoService.addIdentify(identifyInfo);
     }
 
-    @ApiOperation("标识打印更新")
+    @ApiOperation("标识打印更新（更新打印时间）")
     @PostMapping("/update")
-    public ReturnDTO updateIdentify(@RequestBody @Valid BizBusinessIdentifyInfo identifyInfo, BindingResult bindingResult) {
-        Assert.isFalse(Objects.isNull(identifyInfo.getId()), () -> {
+    public ReturnDTO updateIdentify(@RequestBody @Valid IdDTO idDTO) {
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        Assert.isFalse(bindingResult.hasErrors(), () -> {
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        });
-        return identifyInfoService.updateIdentify(identifyInfo);
+        return identifyInfoService.updateIdentify(idDTO.getId());
     }
 
     @ApiOperation("标识打印删除")
@@ -77,4 +75,37 @@
         });
         return identifyInfoService.deleteIdentify(idDTO.getId());
     }
+
+    @ApiOperation("标识打印导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody @Valid IdentifyListRequest request, BindingResult bindingResult) throws Exception {
+        if (bindingResult.hasErrors()) {
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        List<BizBusinessIdentifyInfo> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = identifyInfoService.listByIds(request.getIds());
+        } else {
+            list = identifyInfoService.list(request);
+        }
+        for (BizBusinessIdentifyInfo record : list) {
+            DictCodeUtils.convertDictCodeToName(record);
+        }
+        super.exportExcel(BizBusinessIdentifyInfo.class, list, ExportEnum.IDENTIFY_EXPORT.getSheetName());
+    }
+
+
+    // TODO: 2023/8/23 查询设备信息，4个底部按钮查设备（按钮的作用就是前端用来调不同接口、用来区分中间即将展示的标识），前端弹窗选设备，在确定保存时前端根据底部按钮判断传入设备类型deviceType字典code
+    // TODO: 2023/8/23 接口：查受检设备（第1个按钮），查设备台账（后3个按钮同一接口），查询之后前端根据标志类型的不同加到中间页面时进行判断（按产品给的对应表）
+    // TODO: 2023/8/23 提供二维码接口，前端在加到中间页面时调用一下
+
+    @ApiOperation("设备二维码")
+    @PostMapping("/equipment/qrCode")
+    public ReturnDTO<String> equipmentQrCode(@RequestBody @Valid IdDTO idDTO) {
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return identifyInfoService.equipmentQrCode(idDTO.getId());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java
index 707be6e..7e0453d 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java
@@ -117,7 +117,7 @@
     }
 
     @ApiOperation("任务单导出")
-    @PostMapping("/export")
+    @PostMapping("/listExport")
     public void orderExport(@RequestBody @Valid OrderListRequest request, HttpServletResponse response) {
         businessOrderService.orderExport(request, response);
     }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java
index 529a6ce..51432be 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java
@@ -1,9 +1,28 @@
 package com.casic.missiles.controller.business;
 
+import com.casic.missiles.controller.GeneralApprovalController;
+import com.casic.missiles.dto.BaseApprovalSubmitRequest;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.business.outsource.OutsourceAssessApprovalListRequest;
+import com.casic.missiles.dto.business.outsource.OutsourceAssessSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
+import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.model.business.BizBusinessOutsourceAssess;
+import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
+import com.casic.missiles.service.IGeneralApprovalService;
+import com.casic.missiles.service.business.IBizBusinessOutsourceAssessService;
 import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.BindingResult;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.validation.Valid;
+import java.util.List;
+
 /**
  * <p>
  * 计量检定业务-分包管理-测试、校准或检定工作分包评审表 前端控制器
@@ -15,6 +34,27 @@
 @Api(tags = "分包管理-测试、校准或检定工作分包评审表")
 @RestController
 @RequestMapping("/business/outsource/assess")
-public class BizBusinessOutsourceAssessController {
+public class BizBusinessOutsourceAssessController extends GeneralApprovalController<BizBusinessOutsourceAssess, BizBusinessOutsourceAssess, OutsourceAssessApprovalListRequest, BaseApprovalSubmitRequest> {
+    @Autowired
+    private IBizBusinessOutsourceAssessService outsourceAssessService;
 
+    public BizBusinessOutsourceAssessController(IGeneralApprovalService<BizBusinessOutsourceAssess, BizBusinessOutsourceAssess, OutsourceAssessApprovalListRequest, BaseApprovalSubmitRequest> baseApprovalService) {
+        super(baseApprovalService);
+    }
+
+    @ApiOperation("草稿箱-保存")
+    @PostMapping("/save")
+    public ReturnDTO<OutsourceAssessSaveResponse> saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceAssess request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        return outsourceAssessService.saveOutsourceAssess(request);
+    }
+
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception {
+        List<BizBusinessOutsourceAssess> list = super.exportList(request);
+        super.exportExcel(BizBusinessOutsourceAssess.class, list, ExportEnum.OUTSOURCE_ASSESS.getSheetName());
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java
new file mode 100644
index 0000000..9adef18
--- /dev/null
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java
@@ -0,0 +1,60 @@
+package com.casic.missiles.controller.business;
+
+import com.casic.missiles.controller.GeneralApprovalController;
+import com.casic.missiles.dto.BaseApprovalSubmitRequest;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.business.outsource.OutsourceProtocolApprovalListRequest;
+import com.casic.missiles.dto.business.outsource.OutsourceProtocolSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
+import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.model.business.BizBusinessOutsourceProtocol;
+import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
+import com.casic.missiles.service.IGeneralApprovalService;
+import com.casic.missiles.service.business.IBizBusinessOutsourceProtocolService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.BindingResult;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.validation.Valid;
+import java.util.List;
+
+/**
+ * <p>
+ * 计量检定业务-分包管理-测试、校准或检定工作分包协议书 前端控制器
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-08-24
+ */
+@Api(tags = "分包管理-测试、校准或检定工作分包协议书")
+@RestController
+@RequestMapping("/business/outsource/protocol")
+public class BizBusinessOutsourceProtocolController extends GeneralApprovalController<BizBusinessOutsourceProtocol, BizBusinessOutsourceProtocol, OutsourceProtocolApprovalListRequest, BaseApprovalSubmitRequest> {
+    @Autowired
+    private IBizBusinessOutsourceProtocolService outsourceProtocolService;
+
+    public BizBusinessOutsourceProtocolController(IGeneralApprovalService<BizBusinessOutsourceProtocol, BizBusinessOutsourceProtocol, OutsourceProtocolApprovalListRequest, BaseApprovalSubmitRequest> baseApprovalService) {
+        super(baseApprovalService);
+    }
+
+    @ApiOperation("草稿箱-保存")
+    @PostMapping("/save")
+    public ReturnDTO<OutsourceProtocolSaveResponse> saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceProtocol request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        return outsourceProtocolService.saveOutsourceProtocol(request);
+    }
+
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody OutsourceProtocolApprovalListRequest request) throws Exception {
+        List<BizBusinessOutsourceProtocol> list = super.exportList(request);
+        super.exportExcel(BizBusinessOutsourceProtocol.class, list, ExportEnum.OUTSOURCE_PROTOCOL.getSheetName());
+    }
+}
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java
index 097f645..f0f0943 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java
@@ -17,7 +17,6 @@
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.IGeneralApprovalService;
 import com.casic.missiles.service.business.IBizBusinessOutsourcerInfoService;
-import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -71,19 +70,8 @@
 
     @ApiOperation("分包方导出")
     @PostMapping("/listExport")
-    public void export(@RequestBody @Valid OutsourcerInfoApprovalListRequest request, BindingResult bindingResult) throws Exception {
-        if (bindingResult.hasErrors()) {
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        }
-        List<BizBusinessOutsourcerInfo> list;
-        if (!CollectionUtils.isEmpty(request.getIds())) {
-            list = outsourcerInfoService.listByIds(request.getIds());
-        } else {
-            list = outsourcerInfoService.list(request);
-        }
-        for (BizBusinessOutsourcerInfo record : list) {
-            DictCodeUtils.convertDictCodeToName(record);
-        }
+    public void export(@RequestBody OutsourcerInfoApprovalListRequest request) throws Exception {
+        List<BizBusinessOutsourcerInfo> list = super.exportList(request);
         super.exportExcel(BizBusinessOutsourcerInfo.class, list, ExportEnum.OUTSOURCER_EXPORT.getSheetName());
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java
index c2cbf9f..0410918 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java
@@ -17,11 +17,9 @@
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.IGeneralApprovalService;
 import com.casic.missiles.service.business.IBizBusinessSiteExecutiveInfoService;
-import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -60,7 +58,7 @@
         return siteExecutiveInfoService.saveSiteExecutiveInfo(siteExecutiveInfo);
     }
 
-    @ApiOperation("现场检测详情")
+    @ApiOperation("详情")
     @PostMapping("/detail")
     public ReturnDTO<SiteExecutiveDetailResponse> siteExecutiveDetail(@RequestBody @Valid IdDTO idDTO) throws Exception {
         Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
@@ -69,21 +67,10 @@
         return ReturnUtil.success(siteExecutiveInfoService.detail(idDTO.getId()));
     }
 
-    @ApiOperation("现场检测导出")
+    @ApiOperation("导出")
     @PostMapping("/listExport")
-    public void export(@RequestBody @Valid SiteExecutiveApprovalListRequest request, BindingResult bindingResult) throws Exception {
-        if (bindingResult.hasErrors()) {
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        }
-        List<SiteExecutiveApprovalListResponse> list;
-        if (!CollectionUtils.isEmpty(request.getIds())) {
-            list = siteExecutiveInfoService.listInfoByIds(request.getIds());
-        } else {
-            list = siteExecutiveInfoService.listInfo(request);
-        }
-        for (SiteExecutiveApprovalListResponse record : list) {
-            DictCodeUtils.convertDictCodeToName(record);
-        }
+    public void export(@RequestBody SiteExecutiveApprovalListRequest request) throws Exception {
+        List<SiteExecutiveApprovalListResponse> list = super.exportList(request);
         super.exportExcel(SiteExecutiveApprovalListResponse.class, list, ExportEnum.SITE_EXECUTIVE_EXPORT.getSheetName());
     }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
index 7e793cd..a92e209 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
@@ -55,7 +55,7 @@
 
     @ApiOperation("设备收发列表导出")
     @PostMapping("/export")
-    public void exportList(@RequestBody @Valid SampleDispatchListRequest request) throws IOException {
+    public void exportList(@RequestBody SampleDispatchListRequest request) throws IOException {
         List<SampleDispatchListResponse> list;
         if (!CollectionUtils.isEmpty(request.getIds())) {
             list = dispatchService.listByIds(request.getIds());
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java
index cdc77fc..d120fd4 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java
@@ -7,6 +7,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.business.labExecutive.*;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.business.IBusinessLabExecutiveInfoService;
@@ -14,6 +15,7 @@
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.*;
 
@@ -32,7 +34,7 @@
     @Autowired
     private IBusinessLabExecutiveInfoService labExecutiveInfoService;
 
-    @ApiOperation("实验室检测-部门检测-查询各状态列表（待检测、检测中、检测完）")
+    @ApiOperation("实验室任务-查询各状态列表（待检测、检测中、检测完）")
     @PostMapping("/deptExecutive/List")
     public ReturnDTO<PageInfoBT<SampleLabExecutiveListResponse>> queryDeptExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
@@ -43,10 +45,19 @@
         return ReturnUtil.success(super.packForBT(labExecutiveInfoService.deptLabExecutiveListPage(page, labExecutiveListRequest)));
     }
 
-    /**
-     * 实验室检测-我的检测-查询各状态列表（待检测、检测中、检测完）
-     */
-    @ApiOperation("实验室检测-我的检测-查询各状态列表（待检测、检测中、检测完）")
+    @ApiOperation("实验室任务导出")
+    @PostMapping("/deptExecutive/export")
+    public void deptExportList(@RequestBody @Valid SampleLabExecutiveListRequest request) throws Exception {
+        List<SampleLabExecutiveListResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = labExecutiveInfoService.deptLabExecutiveListByIds(request.getMeasureStatus(), request.getIds());
+        } else {
+            list = labExecutiveInfoService.deptLabExecutiveList(request);
+        }
+        super.exportExcel(SampleLabExecutiveListResponse.class, list, ExportEnum.DEPT_EXECUTIVE_TASK.getSheetName());
+    }
+
+    @ApiOperation("我的任务-查询各状态列表（待检测、检测中、检测完）")
     @PostMapping("/myExecutive/list")
     public ReturnDTO<PageInfoBT<SampleLabExecutiveListResponse>> queryMyExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
@@ -57,19 +68,25 @@
         return ReturnUtil.success(super.packForBT(labExecutiveInfoService.myLabExecutiveListPage(page, labExecutiveListRequest)));
     }
 
-    /**
-     * 实验室检测-我的检测-查询各状态样品数量（待检测、检测中、检测完）
-     */
-    @ApiOperation("实验室检测-我的检测-查询各状态样品数量（待检测、检测中、检测完）")
+    @ApiOperation("我的任务导出")
+    @PostMapping("/myExecutive/export")
+    public void exportList(@RequestBody @Valid SampleLabExecutiveListRequest request) throws Exception {
+        List<SampleLabExecutiveListResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = labExecutiveInfoService.myLabExecutiveListByIds(request.getMeasureStatus(), request.getIds());
+        } else {
+            list = labExecutiveInfoService.myLabExecutiveList(request);
+        }
+        super.exportExcel(SampleLabExecutiveListResponse.class, list, ExportEnum.MY_EXECUTIVE_TASK.getSheetName());
+    }
+
+    @ApiOperation("我的任务-查询各状态样品数量（待检测、检测中、检测完）")
     @GetMapping("/myExecutive/amount")
     public ReturnDTO<List<SampleAmountResponse>> queryMyExecutiveAmount() {
         return ReturnUtil.success(labExecutiveInfoService.myExecutiveAmount());
     }
 
-    /**
-     * 实验室检测-部门检测-分配（分配给具体人员）
-     */
-    @ApiOperation("实验室检测-部门检测-分配按钮（分配给具体人员）")
+    @ApiOperation("实验室任务-分配按钮（分配给具体人员）")
     @PostMapping("/deptExecutive/allocate")
     public ReturnDTO allocateStaff(@RequestBody @Valid SampleAllocateRequest sampleAllocateRequest, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -78,10 +95,7 @@
         return labExecutiveInfoService.allocateStaff(sampleAllocateRequest);
     }
 
-    /**
-     * 实验室检测-我的检测-检定人扫描收入（待检测->检测中）
-     */
-    @ApiOperation("实验室检测-我的检测-检定人扫描收入（待检测->检测中）")
+    @ApiOperation("我的任务-检定人扫描收入（待检测->检测中）")
     @PostMapping("/myExecutive/receive")
     public ReturnDTO sampleReceive(@RequestBody @Valid List<SampleOperateRequest> requestList, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -90,10 +104,7 @@
         return labExecutiveInfoService.sampleReceive(requestList);
     }
 
-    /**
-     * 实验室检测-负责人/检定人扫描检完（检测中->检测完）
-     */
-    @ApiOperation("实验室检测-负责人/检定人扫描检完（检测中->检测完）")
+    @ApiOperation("实验室任务-负责人/检定人扫描检完（检测中->检测完）")
     @PostMapping("/myExecutive/complete")
     public ReturnDTO sampleExecutiveComplete(@RequestBody @Valid List<SampleOperateRequest> requestList, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -102,10 +113,7 @@
         return labExecutiveInfoService.sampleExecutiveComplete(requestList);
     }
 
-    /**
-     * 实验室检测-部门检测/我的检测 编辑（只能修改应出具证书）
-     */
-    @ApiOperation("实验室检测-部门检测/我的检测 编辑（只能修改应出具证书）")
+    @ApiOperation("实验室任务/我的任务 编辑（只能修改应出具证书）")
     @PostMapping("/executive/update")
     public ReturnDTO updateExecutive(@RequestBody @Valid UpdateExecutiveRequest request, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -114,10 +122,7 @@
         return labExecutiveInfoService.updateExecutive(request);
     }
 
-    /**
-     * 实验室检测-部门检测/我的检测 详情
-     */
-    @ApiOperation("实验室检测-部门检测/我的检测 详情")
+    @ApiOperation("实验室任务/我的任务 详情")
     @PostMapping("/executive/detail")
     public ReturnDTO<ExecutiveDetailResponse> executiveDetail(@RequestBody @Valid ExecutiveDetailRequest request, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
@@ -131,7 +136,7 @@
      * 退回后会将下一个要执行的实验室检测状态更新为待分配，将后面的实验室顺序变更为连续（都进行减1）
      * 最后一个检测的实验室退回，等分发员再增加实验室或设备收发中的已收入直接手动点击完成
      */
-    @ApiOperation("实验室检测-部门检测/我的检测 退回（待检测/检测中->退回）")
+    @ApiOperation("实验室任务/我的任务 退回（待检测/检测中->退回）")
     @PostMapping("/executive/sendBack")
     public ReturnDTO executiveSendBack(@RequestBody @Valid ExecutiveSendBackRequest request, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -140,9 +145,6 @@
         return labExecutiveInfoService.sampleExecutiveSendBack(request);
     }
 
-    /**
-     * 分发员编辑实验室检测列表
-     */
     @ApiOperation("分发员编辑实验室检测列表")
     @PostMapping("/handOut/updateList")
     public ReturnDTO updateExecutiveList(@RequestBody @Valid UpdateExecutiveListRequest request, BindingResult bindingResult) {
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java
index 48a67ed..0c04f31 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java
@@ -10,6 +10,7 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.resource.customer.CustomerApprovalListRequest;
 import com.casic.missiles.dto.resource.customer.CustomerSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceCustomerInfo;
@@ -26,6 +27,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -55,6 +57,13 @@
         return customerInfoService.saveCustomerInfo(request);
     }
 
+    @ApiOperation("委托方名录导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody CustomerApprovalListRequest request) throws Exception {
+        List<BizResourceCustomerInfo> list = super.exportList(request);
+        super.exportExcel(BizResourceCustomerInfo.class, list, ExportEnum.CUSTOMER_INFO.getSheetName());
+    }
+
     @ApiOperation("委托方人员列表（分页）")
     @PostMapping("/person/listPage")
     public ReturnDTO<PageInfoBT<BizResourceCustomerStaff>> personListPage(@RequestBody IdDTO idDto) {
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
index 972ed4b..6418ea5 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
@@ -5,6 +5,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.resource.customer.SuggestFormApprovalListRequest;
 import com.casic.missiles.dto.resource.customer.SuggestFormSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceCustomerSuggestForm;
@@ -20,6 +21,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -50,4 +52,11 @@
         return suggestFormService.saveSuggestForm(request);
     }
 
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody SuggestFormApprovalListRequest request) throws Exception {
+        List<BizResourceCustomerSuggestForm> list = super.exportList(request);
+        super.exportExcel(BizResourceCustomerSuggestForm.class, list, ExportEnum.CUSTOMER_SUGGEST_FORM.getSheetName());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java
index 1934d1a..9e07eab 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java
@@ -15,12 +15,16 @@
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.resource.IEnvEnvironmentRecordConfigService;
 import com.casic.missiles.service.resource.IEnvEnvironmentRecordDataService;
+import com.casic.missiles.service.resource.IEnvLocationInfoService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
 import java.util.List;
@@ -39,6 +43,8 @@
     private IEnvEnvironmentRecordDataService environmentRecordDataService;
     @Autowired
     private IEnvEnvironmentRecordConfigService environmentRecordConfigService;
+    @Autowired
+    private IEnvLocationInfoService locationInfoService;
 
     @ApiOperation("环境记录单数据列表/详情")
     @PostMapping("/data/listPage")
@@ -95,4 +101,11 @@
         });
         return environmentRecordConfigService.deleteEnvironmentRecordConfig(idDTO.getId());
     }
+
+    @ApiOperation("地点列表")
+    @PostMapping("/location/listPage")
+    public ReturnDTO<PageInfoBT<LocationListResponse>> locationListPage(@RequestBody @Valid LocationListRequest request) {
+        Page<LocationListResponse> page = PageFactory.defaultPage();
+        return ReturnUtil.success(super.packForBT(locationInfoService.listPage(page, request)));
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java
index 82efe3f..e9561fa 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java
@@ -10,6 +10,7 @@
 import com.casic.missiles.dto.resource.seal.SealLogListRequest;
 import com.casic.missiles.dto.resource.seal.SealNoteApprovalListRequest;
 import com.casic.missiles.dto.resource.seal.SealNoteSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceSealUseLog;
@@ -27,6 +28,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -58,6 +60,13 @@
         return sealUseNoteService.saveSeal(request);
     }
 
+    @ApiOperation("印章使用登记导出（列表和导出中去掉经办人和监印人）")
+    @PostMapping("/listExport")
+    public void export(@RequestBody SealNoteApprovalListRequest request) throws Exception {
+        List<BizResourceSealUseNote> list = super.exportList(request);
+        super.exportExcel(BizResourceSealUseNote.class, list, ExportEnum.SEAL_NOTE.getSheetName());
+    }
+
     // TODO: 2023/7/28 印章使用日志：系统中使用印章时插入数据库
 
     @ApiOperation("印章使用日志列表（分页）")
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java
index 9b674fc..06b6521 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java
@@ -9,16 +9,20 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.resource.staff.StaffCertRequest;
 import com.casic.missiles.dto.resource.staff.StaffCertResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.service.resource.IBizResourceStaffInfoService;
 import com.casic.missiles.service.resource.IBizResourceStaffVerifierService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.List;
+
 /**
  * @Description:
  * @Author: wangpeng
@@ -41,9 +45,21 @@
         return ReturnUtil.success(super.packForBT(responsePage));
     }
 
+    @ApiOperation("证书逾期提醒导出")
+    @PostMapping("/listExport")
+    public void exportList(@RequestBody StaffCertRequest request) throws Exception {
+        List<StaffCertResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = staffInfoService.certListByIds(request.getIds());
+        } else {
+            list = staffInfoService.certList(request);
+        }
+        super.exportExcel(StaffCertResponse.class, list, ExportEnum.STAFF_CERTIFICATE_EXPIRE.getSheetName());
+    }
+
     @ApiOperation("证书逾期提醒")
     @PostMapping("/expirationReminder")
-    public ReturnDTO expirationReminder(@RequestBody IdDTO idDto) {
-        return verifierService.expirationReminder(idDto);
+    public ReturnDTO expirationReminder(@RequestBody IdDTO idDTO) {
+        return verifierService.expirationReminder(idDTO);
     }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java
index 3b251ad..a6e7850 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java
@@ -12,6 +12,7 @@
 import com.casic.missiles.dto.resource.staff.StaffListRequest;
 import com.casic.missiles.dto.resource.staff.TrainListRequest;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.*;
@@ -22,7 +23,10 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
 import java.util.List;
@@ -52,8 +56,19 @@
             throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
         }
         Page<BizResourceStaffInfo> page = PageFactory.defaultPage();
-        Page<BizResourceStaffInfo> responsePage = staffInfoService.listPage(page, request);
-        return ReturnUtil.success(super.packForBT(responsePage));
+        return ReturnUtil.success(super.packForBT(staffInfoService.listPage(page, request)));
+    }
+
+    @ApiOperation("人员登记导出")
+    @PostMapping("/listExport")
+    public void exportList(@RequestBody StaffListRequest request) throws Exception {
+        List<BizResourceStaffInfo> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = staffInfoService.listByIds(request.getIds());
+        } else {
+            list = staffInfoService.list(request);
+        }
+        super.exportExcel(BizResourceStaffInfo.class, list, ExportEnum.STAFF_INFO.getSheetName());
     }
 
     @ApiOperation("人员登记详情基础信息")
@@ -85,9 +100,9 @@
 
     @ApiOperation("科研教育列表（分页）")
     @PostMapping("/education/listPage")
-    public ReturnDTO<PageInfoBT<BizResourceStaffEducation>> educationListPage(@RequestBody IdDTO idDto) {
+    public ReturnDTO<PageInfoBT<BizResourceStaffEducation>> educationListPage(@RequestBody IdDTO idDTO) {
         Page<BizResourceStaffEducation> page = PageFactory.defaultPage();
-        Page<BizResourceStaffEducation> responsePage = staffInfoService.educationListPage(page, idDto);
+        Page<BizResourceStaffEducation> responsePage = staffInfoService.educationListPage(page, idDTO);
         return ReturnUtil.success(super.packForBT(responsePage));
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java
index af6aa86..d85d84a 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java
@@ -9,6 +9,7 @@
 import com.casic.missiles.dto.resource.outsideService.SupplierApprovalListRequest;
 import com.casic.missiles.dto.resource.outsideService.SupplierSaveResponse;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceSupplierAbility;
@@ -67,6 +68,13 @@
         return ReturnUtil.success(supplierInfoService.detail(idDTO.getId()));
     }
 
+    @ApiOperation("合格供方导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody SupplierApprovalListRequest request) throws Exception {
+        List<BizResourceSupplierInfo> list = super.exportList(request);
+        super.exportExcel(BizResourceSupplierInfo.class, list, ExportEnum.SUPPLIER_INFO.getSheetName());
+    }
+
     @ApiOperation("供方人员列表（分页）")
     @PostMapping("/person/listPage")
     public ReturnDTO<PageInfoBT<BizResourceSupplierPerson>> personListPage(@RequestBody IdDTO idDTO) {
diff --git a/casic-metering-api/src/main/resources/config/application.yml b/casic-metering-api/src/main/resources/config/application.yml
index 350db5f..ecff521 100644
--- a/casic-metering-api/src/main/resources/config/application.yml
+++ b/casic-metering-api/src/main/resources/config/application.yml
@@ -126,7 +126,7 @@
     #作者
     author: wangpeng
     #待生成对象表名
-    table-name: biz_equipment_technical_target_approval,biz_equipment_attachment_approval,biz_equipment_checkpoint_approval
+    table-name: biz_business_outsource_protocol
 
 reminder:
   #节点--common模块config包 ReminderNodeConfig配置
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
index 4a19e4e..d47d552 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
@@ -53,6 +53,7 @@
     SUGGEST_FORM_SAVE_FAILED(2509, "委托方意见登记表保存至草稿箱失败"),
     EXAMINE_FORM_SAVE_FAILED(2510, "要求、委托书及合同评审表保存至草稿箱失败"),
     CUSTOMER_EXIST_SAVE_FAILED(2511, "该委托方已存在，请重新选择"),
+    DUPLICATE_LOCATION_NO(2512, "地点编号已存在"),
 
     /**
      * 计量检定业务模块
@@ -68,6 +69,8 @@
     COMPLETE_SAMPLE_NOT_EXIST(2609, "检测中不存在扫描收入的样品"),
     CANNOT_CHANGE_MEASURE_INFO(2610, "无法更改非当前登录用户的检测信息"),
     NON_EXIST_ORDER_OR_SAMPLE(2611, "不存在该委托单或该委托单下的样品"),
+    OUTSOURCE_ACCESS_SAVE_FAILED(2612, "测试、校准或检定工作分包评审表保存至草稿箱失败"),
+    OUTSOURCE_PROTOCOL_SAVE_FAILED(2613, "测试、校准或检定工作分包协议书保存至草稿箱失败"),
 
     /**
      * 历史遗留备用
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
index 5089ad1..81a406b 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
@@ -10,54 +10,38 @@
     /**
      * 资源管理
      */
-    ENVIRONMENT_DATA_EXPORT("environmentData", "environmentData", "环境记录单数据"),
+    ENVIRONMENT_DATA_EXPORT("environmentData", "环境记录单数据", "环境记录单数据"),
+    STAFF_INFO("staffInfo", "人员登记", "人员登记"),
+    STAFF_CERTIFICATE_EXPIRE("certificateExpire", "证书逾期提醒", "证书逾期提醒"),
+    SUPPLIER_INFO("supplierInfo", "合格供方名录", "合格供方名录"),
+    CUSTOMER_INFO("customerInfo", "委托方名录", "委托方名录"),
+    CUSTOMER_SUGGEST_FORM("customerSuggestForm", "委托方意见登记表", "委托方意见登记表"),
+    SEAL_NOTE("sealNote", "印章使用登记", "印章使用登记"),
 
-    FILE_EXPORT("meterFileData", "meterFileData", "计量文件信息"),
-    TRAIN_PLAN_EXPORT("trainPlanData", "trainPlanData", "培训计划"),
-    TRAIN_LOG_EXPORT("trainLogData", "trainLogData", "培训记录"),
-    METER_ORGANIZE_EXPORT("meterOrganizeData", "meterOrganizeData", "计量组织"),
-    TRACE_SUPPLIER_EXPORT("traceSupplierData", "traceSupplierData", "溯源供方"),
-    SIGN_EXPORT("signData", "signData", "签名/签章"),
-    TEMPLATE_EXPORT("templateData", "templateData", "原始记录模板/证书报告模板"),
-    FIXED_ASSETS("meterFixedAssets", "meterFixedAssets", "固定资产"),
-    METER_EQUIPMENT("meterEquipment", "meterEquipment", "测量设备"),
-    CALIBRATION_TEST_EQUIPMENT("calibrationTestEquipment", "calibrationTestEquipment", "校准检定设备"),
-    MEASURE_ACCOUNT("measureAccount", "measureAccount", "测量工装"),
-    STANDARD_SUPPORT_EQUIPMENT("standardSupportEquipment", "standardSupportEquipment", "标准配套设备"),
-    STANDARD_EQUIPMENT("standardEquipment", "standardEquipment", "标准装置"),
-    FLOW_DEF_EXPORT("flowDefData", "flowDefData", "流程定义"),
-    STAFF_CERTIFICATE("certificate", "certificate", "计量人员证书"),
-    CHECK_INFO("checkInfo", "checkInfo", "设备管理点检测"),
-    EQUIPMENT_APPLY("equipmentApply", "equipmentApply", "设备借用"),
-    STANDARD_EQUIPMENT_REMIND("equipmentApplyRemind", "equipmentApplyRemind", "标准装置到期提醒"),
-    METER_PRICE("meterPrice", "meterPrice", "价格库"),
-    METER_STAFF("meterStaff", "meterStaff", "计量人员"),
-    STANDARD_EQUIPMENT_APPLY("standardEquipmentApply", "standardEquipmentApply", "标准装置申请"),
-    STATE_MANAGE_APPLY("stateManage", "stateManage", "状态管理"),
-    METER_ACCEPTANCE_CHECK("acceptanceCheck", "acceptanceCheck", "设备检修保养验收单"),
-    CUSTOMER_EXPORT("customerData", "customerData", "客户信息"),
-    ORDER_EXPORT("orderData", "orderData", "委托书信息"),
-    SAMPLE_EXPORT("sampleData", "sampleData", "样本信息"),
-    EXCHANGE_DATA("exchangeData", "exchangeData", "设备交接单"),
-    DISPATCH_DATA("dispatchData", "dispatchData", "设备收发"),
-    ENVIRONMENT_DATA("environmentData", "environmentData", "环境记录单"),
-    ORIGIN_DATA("originData", "originData", "原始记录"),
-    CERTIFICATE_REPORT("certificateReport", "certificateReport", "证书报告"),
-    ADVICE_EXPORT("adviceData", "adviceData", "客户反馈"),
-    HANDOUT_EXPORT("handoutData", "handoutData", "任务分发列表"),
-    OUTSOURCER_EXPORT("outsourcerData", "outsourcerData", "分包方"),
-    SITE_EXECUTIVE_EXPORT("siteExecutiveData", "siteExecutiveData", "现场测试、校准或检定"),
-    CERTIFICATE_PRINT_EXPORT("certificatePrintData", "certificatePrintData", "证书打印"),
-    DOWNLOAD_TEMPLATE("downloadTemplate", "downloadTemplate", "页面配置"),
-    OUTSOURCER_CERTIFICATE_EXPORT("outsourceCertificateData", "outsourceCertificateData", "分包证书"),
-    SETTLEMENT_INFO_EXPORT("settlementInfoData", "settlementInfoData", "业务结算"),
-    EQUIPMENT_REMIND("equipmentRemind", "equipmentRemind", "设备到期提醒"),
-    AGREEMENT_INFO_EXPORT("agreementInfoData", "agreementInfoData", "合同"),
-    WORK_STATISTICS_EXPORT("workStatisticsData", "workStatisticsData", "实时工作统计"),
-    DEPT_OUTPUT_EXPORT("deptOutputData", "deptOutputData", "部门产值分析"),
-    WORKLOAD_EXPORT("workloadData", "workloadData", "业务工作量分析"),
-    DEPT_COMPREHENSIVE_EXPORT("deptComprehensiveData", "deptComprehensiveData", "部门综合分析"),
-    ENVIRONMENTAL_RECORD("environmentalRecordData", "environmentalRecordData", "现场环境记录");
+    /**
+     * 计量检定业务
+     */
+    OUTSOURCER_EXPORT("outsourcerData", "分包方名录", "分包方名录"),
+    IDENTIFY_EXPORT("identifyData", "计量标识", "计量标识"),
+    ORDER_EXPORT("orderData", "任务单", "任务单"),
+    DISPATCH_DATA("dispatchData", "设备收发", "设备收发"),
+    HANDOUT_EXPORT("handoutData", "任务分发", "任务分发"),
+    SITE_EXECUTIVE_EXPORT("siteExecutiveData", "现场测试、校准或检定", "现场测试、校准或检定"),
+    CERTIFICATE_REPORT("certificateReport", "证书审批", "证书审批"),
+    CERTIFICATE_CHANGE_APPLY("certificateChangeApply", "证书报告补充或更换申请单", "证书报告补充或更换申请单"),
+    CERTIFICATE_PRINT("certificatePrintData", "证书打印审批", "证书打印审批"),
+    DEPT_EXECUTIVE_TASK("deptExecutiveTaskData", "实验室任务", "实验室任务"),
+    MY_EXECUTIVE_TASK("myExecutiveTaskData", "我的任务", "我的任务"),
+    OUTSOURCE_ASSESS("outsourceAssess", "测试、校准或检定工作分包评审表", "测试、校准或检定工作分包评审表"),
+    OUTSOURCE_PROTOCOL("outsourceProtocol", "测试、校准或检定工作分包协议书", "测试、校准或检定工作分包协议书"),
+
+    /**
+     * 系统管理
+     */
+    SIGN_EXPORT("signData", "签名", "签名"),
+    TEMPLATE_EXPORT("templateData", "文件模板", "文件模板"),
+    FLOW_DEF_EXPORT("flowDefData", "流程定义", "流程定义"),
+    DOWNLOAD_TEMPLATE("downloadTemplate", "流程定义", "页面配置");
 
     ExportEnum(String fileName, String sheetName, String description) {
         this.fileName = fileName;
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateRecordTypeCodeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateRecordTypeCodeEnum.java
index 31d913c..a963522 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateRecordTypeCodeEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateRecordTypeCodeEnum.java
@@ -46,4 +46,14 @@
     String SITE_EXECUTIVE_APPROVAL = "01";
     //《现场测试、校准或检定工作记录表》
     String SITE_EXECUTIVE_LOG = "02";
+
+    //测试、校准或检定工作分包协议书
+    String OUTSOURCE_PROTOCOL = "01";
+    //测试、校准或检定工作分包评审表
+    String OUTSOURCE_ACCESS = "02";
+    //测试、校准或检定工作分包通知书
+    String OUTSOURCE_NOTICE = "03";
+    //测试、校准或检定工作分包方名录
+    String OUTSOURCE_INFO = "04";
+
 }
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
index 24b8635..f78bd53 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
@@ -15,6 +15,10 @@
     String CERTIFICATE_CHANGE_APPLY_BEAN_NAME = "certificateChangeApplyBean";
     //现场测试、校准或检定
     String SITE_EXECUTIVE_BEAN_NAME = "siteExecutiveBean";
+    //测试、校准或检定工作分包评审表
+    String OUTSOURCE_ASSESS_BEAN_NAME = "outsourceAssessBean";
+    //测试、校准或检定工作分包协议书
+    String OUTSOURCE_PROTOCOL_BEAN_NAME = "outsourceProtocolBean";
 
     /*********************************设备与装置************************************/
     //设备台账
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 b21c661..6b86fd1 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
@@ -18,6 +18,8 @@
     OUTSOURCER_APPROVAL(OUTSOURCER_BEAN_NAME, ""),
     CERTIFICATE_CHANGE_APPROVAL(CERTIFICATE_CHANGE_APPLY_BEAN_NAME, ""),
     SITE_EXECUTIVE_APPROVAL(SITE_EXECUTIVE_BEAN_NAME, ""),
+    OUTSOURCE_ASSESS_APPROVAL(OUTSOURCE_ASSESS_BEAN_NAME, ""),
+    OUTSOURCE_PROTOCOL_APPROVAL(OUTSOURCE_PROTOCOL_BEAN_NAME, ""),
 
     ACTION_STATUS_MAP(new HashMap<String, AwareActionStatusEnum>() {
         {
@@ -47,6 +49,10 @@
             put(ApplyFromIdEnum.CERTIFICATE_CHANGE_APPROVAL.getCode(), CERTIFICATE_CHANGE_APPROVAL);
             //现场测试、校准或检定审批
             put(ApplyFromIdEnum.SITE_EXECUTIVE_APPROVAL.getCode(), SITE_EXECUTIVE_APPROVAL);
+            //测试、校准或检定工作分包评审表
+            put(ApplyFromIdEnum.OUTSOURCE_ASSESS_APPROVAL.getCode(), OUTSOURCE_ASSESS_APPROVAL);
+            //测试、校准或检定工作分包协议书
+            put(ApplyFromIdEnum.OUTSOURCE_PROTOCOL_APPROVAL.getCode(), OUTSOURCE_PROTOCOL_APPROVAL);
         }
     });
     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 934405e..c7410bd 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
@@ -9,6 +9,8 @@
     CERTIFICATE_CHANGE_APPROVAL("jljdywzsbchghsqd", MessageSourceModuleEnum.BUSINESS.getCode(), "证书/报告补充或更换申请单"),
     OUTSOURCER_APPROVAL("jljdywcsjzhgfbfml", MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定合格分包方名录"),
     SITE_EXECUTIVE_APPROVAL("jljdywxccsjzsp", MessageSourceModuleEnum.BUSINESS.getCode(), "现场测试、校准或检定审批"),
+    OUTSOURCE_ASSESS_APPROVAL("jljdywcsjzfbpsb", MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包评审表"),
+    OUTSOURCE_PROTOCOL_APPROVAL("jljdywcsjzfbxys", MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包协议书"),
 
 
     /*******************************************设备与装置*********************************************/
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/GeneralApprovalMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/GeneralApprovalMapper.java
index 4fb7344..0c9d6ae 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/GeneralApprovalMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/GeneralApprovalMapper.java
@@ -17,8 +17,4 @@
 
     Page<O> selectBatchForApprovalList(Page<O> page, @Param("request") R request, @Param("businessKeys") List<String> businessKeys);
 
-//    Page<O> selectListPage(Page<O> page, @Param("request") R request);
-
-//    Long selectMaxNo();
-
 }
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceAssessMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceAssessMapper.java
index 7867bb8..ba59009 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceAssessMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceAssessMapper.java
@@ -1,7 +1,12 @@
 package com.casic.missiles.mapper.business;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.business.outsource.OutsourceAssessApprovalListRequest;
+import com.casic.missiles.mapper.GeneralApprovalMapper;
 import com.casic.missiles.model.business.BizBusinessOutsourceAssess;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * <p>
@@ -11,6 +16,10 @@
  * @author wangpeng
  * @since 2023-08-16
  */
-public interface BizBusinessOutsourceAssessMapper extends BaseMapper<BizBusinessOutsourceAssess> {
+public interface BizBusinessOutsourceAssessMapper extends GeneralApprovalMapper<BizBusinessOutsourceAssess, BizBusinessOutsourceAssess, OutsourceAssessApprovalListRequest> {
+
+    Page<BizBusinessOutsourceAssess> selectBatchForApprovalList(Page<BizBusinessOutsourceAssess> page, @Param("request") OutsourceAssessApprovalListRequest request, @Param("businessKeys") List<String> businessKeys);
+
+    Long selectMaxProjectNo();
 
 }
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceProtocolMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceProtocolMapper.java
new file mode 100644
index 0000000..e6aba35
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceProtocolMapper.java
@@ -0,0 +1,24 @@
+package com.casic.missiles.mapper.business;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.business.outsource.OutsourceProtocolApprovalListRequest;
+import com.casic.missiles.mapper.GeneralApprovalMapper;
+import com.casic.missiles.model.business.BizBusinessOutsourceProtocol;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 计量检定业务-分包管理-测试、校准或检定工作分包协议书 Mapper 接口
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-08-24
+ */
+public interface BizBusinessOutsourceProtocolMapper extends GeneralApprovalMapper<BizBusinessOutsourceProtocol, BizBusinessOutsourceProtocol, OutsourceProtocolApprovalListRequest> {
+
+    Page<BizBusinessOutsourceProtocol> selectBatchForApprovalList(Page<BizBusinessOutsourceProtocol> page, @Param("request") OutsourceProtocolApprovalListRequest request, @Param("businessKeys") List<String> businessKeys);
+
+    Long selectMaxProtocolNo();
+}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/EnvLocationInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/EnvLocationInfoMapper.java
new file mode 100644
index 0000000..49eff87
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/EnvLocationInfoMapper.java
@@ -0,0 +1,21 @@
+package com.casic.missiles.mapper.resource;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.resource.environment.LocationListRequest;
+import com.casic.missiles.dto.resource.environment.LocationListResponse;
+import com.casic.missiles.model.resource.EnvLocationInfo;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * <p>
+ * 实验室环境监控系统-设备表 Mapper 接口
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-06-07
+ */
+public interface EnvLocationInfoMapper extends BaseMapper<EnvLocationInfo> {
+
+    Page<LocationListResponse> selectLocationListPage(Page<LocationListResponse> page, @Param("request") LocationListRequest request);
+}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java
index de124db..85ed0f7 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java
@@ -1,7 +1,9 @@
 package com.casic.missiles.mapper.system;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.dto.system.SignDetailResponse;
+import com.casic.missiles.dto.system.SignListRequest;
 import com.casic.missiles.model.system.SystemSign;
 import org.apache.ibatis.annotations.Param;
 
@@ -22,4 +24,8 @@
     SignDetailResponse selectSignDetailById(Long id);
 
     List<SystemSign> selectUsableSignList(@Param("userId") Long userId);
+
+    Page<SystemSign> selectSignListPage(Page<SystemSign> page, @Param("request") SignListRequest request);
+
+    List<SystemSign> selectSignList(@Param("request") SignListRequest request);
 }
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateChangeApplyMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateChangeApplyMapper.xml
index d798447..c496092 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateChangeApplyMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateChangeApplyMapper.xml
@@ -30,31 +30,31 @@
         SELECT *
         FROM biz_business_certificate_change_apply
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.changeApplyNo != null and request.changeApplyNo !=''">
+        <if test="request != null and request.changeApplyNo != null and request.changeApplyNo !=''">
             and change_apply_no like concat('%',#{request.changeApplyNo},'%')
         </if>
-        <if test="request.changeReportNo != null and request.changeReportNo !=''">
+        <if test="request != null and request.changeReportNo != null and request.changeReportNo !=''">
             and change_report_no like concat('%',#{request.changeReportNo},'%')
         </if>
-        <if test="request.changeReportName != null and request.changeReportName !=''">
+        <if test="request != null and request.changeReportName != null and request.changeReportName !=''">
             and change_report_name like concat('%',#{request.changeReportName},'%')
         </if>
-        <if test="request.changeType != null and request.changeType !=''">
+        <if test="request != null and request.changeType != null and request.changeType !=''">
             and change_type = #{request.changeType}
         </if>
-        <if test="request.createUserName != null and request.createUserName !=''">
+        <if test="request != null and request.createUserName != null and request.createUserName !=''">
             and create_user_name like concat('%',#{request.createUserName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificatePrintMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificatePrintMapper.xml
index b66cd99..49c0ac8 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificatePrintMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificatePrintMapper.xml
@@ -31,34 +31,34 @@
         LEFT JOIN biz_business_order_sample_relation bosr ON (bosr.order_id = bcr.order_id AND bosr.sample_id = bcr.sample_id)
         LEFT JOIN biz_business_order_info boi ON boi.id = bosr.order_id
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and bcp.approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.printStatus != null and request.printStatus !=''">
+        <if test="request != null and request.printStatus != null and request.printStatus !=''">
             and print_status = #{request.printStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and bcp.create_user_id = #{request.createUserId}
         </if>
-        <if test="request.certificateReportNo != null and request.certificateReportNo !=''">
+        <if test="request != null and request.certificateReportNo != null and request.certificateReportNo !=''">
             and bcr.certificate_report_no like concat('%',#{request.certificateReportNo},'%')
         </if>
-        <if test="request.certificateReportName != null and request.certificateReportName !=''">
+        <if test="request != null and request.certificateReportName != null and request.certificateReportName !=''">
             and bcr.certificate_report_name like concat('%',#{request.certificateReportName},'%')
         </if>
-        <if test="request.customerName != null and request.customerName !=''">
+        <if test="request != null and request.customerName != null and request.customerName !=''">
             and boi.customer_name like concat('%',#{request.customerName},'%')
         </if>
-        <if test="request.sampleNo != null and request.sampleNo !=''">
+        <if test="request != null and request.sampleNo != null and request.sampleNo !=''">
             and bosr.sample_no like concat('%',#{request.sampleNo},'%')
         </if>
-        <if test="request.sampleName != null and request.sampleName !=''">
+        <if test="request != null and request.sampleName != null and request.sampleName !=''">
             and bosr.sample_name like concat('%',#{request.sampleName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and bcp.create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and bcp.create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml
index b366034..767695d 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml
@@ -46,33 +46,37 @@
         SELECT bcr.*, bosr.sample_no, bosr.sample_name, bosr.sample_model, rsi.staff_name
         FROM biz_business_certificate_report bcr
         LEFT JOIN biz_business_order_sample_relation bosr ON (bosr.order_id = bcr.order_id AND bosr.sample_id = bcr.sample_id)
+        LEFT JOIN biz_business_order_info boi ON boi.id = bcr.order_id
         LEFT JOIN biz_resource_staff_info rsi ON rsi.id = bcr.measure_person_id
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and bcr.approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and bcr.create_user_id = #{request.createUserId}
         </if>
-        <if test="request.certificateReportNo != null and request.certificateReportNo !=''">
+        <if test="request != null and request.customerId != null and request.customerId !=''">
+            and boi.customer_id = #{request.customerId}
+        </if>
+        <if test="request != null and request.certificateReportNo != null and request.certificateReportNo !=''">
             and bcr.certificate_report_no like concat('%',#{request.certificateReportNo},'%')
         </if>
-        <if test="request.certificateReportName != null and request.certificateReportName !=''">
+        <if test="request != null and request.certificateReportName != null and request.certificateReportName !=''">
             and bcr.certificate_report_name like concat('%',#{request.certificateReportName},'%')
         </if>
-        <if test="request.sampleNo != null and request.sampleNo !=''">
+        <if test="request != null and request.sampleNo != null and request.sampleNo !=''">
             and bosr.sample_no like concat('%',#{request.sampleNo},'%')
         </if>
-        <if test="request.measureCategory != null and request.measureCategory !=''">
+        <if test="request != null and request.measureCategory != null and request.measureCategory !=''">
             and bcr.measure_category = #{request.measureCategory}
         </if>
-        <if test="request.measurePerson != null and request.measurePerson !=''">
+        <if test="request != null and request.measurePerson != null and request.measurePerson !=''">
             and rsi.staff_name like concat('%',#{request.measurePerson},'%')
         </if>
-        <if test="request.calibrationTimeStart != null and request.calibrationTimeStart !=''">
+        <if test="request != null and request.calibrationTimeStart != null and request.calibrationTimeStart !=''">
             and bcr.calibration_time &gt;= #{request.calibrationTimeStart}
         </if>
-        <if test="request.calibrationTimeEnd != null and request.calibrationTimeEnd !=''">
+        <if test="request != null and request.calibrationTimeEnd != null and request.calibrationTimeEnd !=''">
             and bcr.calibration_time &lt;= #{request.calibrationTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceAssessMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceAssessMapper.xml
index d0fcf8b..c22c101 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceAssessMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceAssessMapper.xml
@@ -7,6 +7,8 @@
         <id column="id" property="id" />
         <result column="project_no" property="projectNo" />
         <result column="project_name" property="projectName" />
+        <result column="lab_code" property="labCode" />
+        <result column="group_code" property="groupCode" />
         <result column="applicant_id" property="applicantId" />
         <result column="applicant_name" property="applicantName" />
         <result column="applicant_time" property="applicantTime" />
@@ -31,7 +33,45 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, project_no, project_name, applicant_id, applicant_name, applicant_time, minio_file_name, remark, create_user_id, create_user_name, outsourcer_id, pre_start_time, pre_end_time, outsource_reason, pre_cost, approval_status, process_id, approve_situation, traceability, test_method, technique_ability, create_time, update_time
+        id, project_no, project_name, lab_code, group_code, applicant_id, applicant_name, applicant_time, minio_file_name, remark, create_user_id, create_user_name, outsourcer_id, pre_start_time, pre_end_time, outsource_reason, pre_cost, approval_status, process_id, approve_situation, traceability, test_method, technique_ability, create_time, update_time
     </sql>
 
+    <select id="selectMaxProjectNo" resultType="java.lang.Long">
+        SELECT IFNULL(max(RIGHT(project_no, 3)), 0) from biz_business_outsource_assess
+    </select>
+
+    <select id="selectBatchForApprovalList" resultMap="BaseResultMap">
+        SELECT bboa.*, bboi.outsourcer_name, bboi.director
+        FROM biz_business_outsource_assess bboa
+        LEFT JOIN biz_business_outsourcer_info bboi ON bboa.outsourcer_id = bboi.id
+        WHERE 1=1
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
+            and bboa.approval_status = #{request.approvalStatus}
+        </if>
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
+            and bboa.create_user_id = #{request.createUserId}
+        </if>
+        <if test="request != null and request.projectNo != null and request.projectNo !=''">
+            and bboa.project_no like concat('%',#{request.projectNo},'%')
+        </if>
+        <if test="request != null and request.outsourcerName != null and request.outsourcerName !=''">
+            and bboi.outsourcer_name like concat('%',#{request.outsourcerName},'%')
+        </if>
+        <if test="request != null and request.applicantName != null and request.applicantName !=''">
+            and bboa.applicant_name like concat('%',#{request.applicantName},'%')
+        </if>
+        <if test="request != null and request.applicantTimeStart != null and request.applicantTimeStart !=''">
+            and bboa.applicant_time &gt;= #{request.applicantTimeStart}
+        </if>
+        <if test="request != null and request.applicantTimeEnd != null and request.applicantTimeEnd !=''">
+            and bboa.applicant_time &lt;= #{request.applicantTimeEnd}
+        </if>
+        <if test="businessKeys != null">
+            and bboa.id in
+            <foreach collection="businessKeys" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
+        ORDER BY bboa.create_time DESC
+    </select>
 </mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceProtocolMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceProtocolMapper.xml
new file mode 100644
index 0000000..b7b2149
--- /dev/null
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceProtocolMapper.xml
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.mapper.business.BizBusinessOutsourceProtocolMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.business.BizBusinessOutsourceProtocol">
+        <id column="id" property="id" />
+        <result column="protocol_no" property="protocolNo" />
+        <result column="project_name" property="projectName" />
+        <result column="lab_code" property="labCode" />
+        <result column="group_code" property="groupCode" />
+        <result column="outsourcer_id" property="outsourcerId" />
+        <result column="remark" property="remark" />
+        <result column="outsource_no" property="outsourceNo" />
+        <result column="outsource_name" property="outsourceName" />
+        <result column="contacts" property="contacts" />
+        <result column="mobile" property="mobile" />
+        <result column="address" property="address" />
+        <result column="require_date" property="requireDate" />
+        <result column="outsource_cost" property="outsourceCost" />
+        <result column="director" property="director" />
+        <result column="item" property="item" />
+        <result column="requires" property="requires" />
+        <result column="create_user_id" property="createUserId" />
+        <result column="create_user_name" property="createUserName" />
+        <result column="approval_status" property="approvalStatus" />
+        <result column="process_id" property="processId" />
+        <result column="create_time" property="createTime" />
+        <result column="update_time" property="updateTime" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, protocol_no, project_name, lab_code, group_code, outsourcer_id, remark, outsource_no, outsource_name, contacts, mobile, address, require_date, outsource_cost, director, item, requires, create_user_id, create_user_name, approval_status, process_id, create_time, update_time
+    </sql>
+
+    <select id="selectMaxProtocolNo" resultType="java.lang.Long">
+        SELECT IFNULL(max(RIGHT(protocol_no, 3)), 0) from biz_business_outsource_protocol
+    </select>
+
+    <select id="selectBatchForApprovalList" resultMap="BaseResultMap">
+        SELECT *
+        FROM biz_business_outsource_protocol
+        WHERE 1=1
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
+            and approval_status = #{request.approvalStatus}
+        </if>
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
+            and create_user_id = #{request.createUserId}
+        </if>
+        <if test="request != null and request.protocolNo != null and request.protocolNo !=''">
+            and protocol_no like concat('%',#{request.protocolNo},'%')
+        </if>
+        <if test="request != null and request.outsourcerName != null and request.outsourcerName !=''">
+            and outsourcer_name like concat('%',#{request.outsourcerName},'%')
+        </if>
+        <if test="request != null and request.applicantName != null and request.applicantName !=''">
+            and create_user_name like concat('%',#{request.applicantName},'%')
+        </if>
+        <if test="request != null and request.applicantTimeStart != null and request.applicantTimeStart !=''">
+            and create_time &gt;= #{request.applicantTimeStart}
+        </if>
+        <if test="request != null and request.applicantTimeEnd != null and request.applicantTimeEnd !=''">
+            and create_time &lt;= #{request.applicantTimeEnd}
+        </if>
+        <if test="businessKeys != null">
+            and id in
+            <foreach collection="businessKeys" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
+        ORDER BY create_time DESC
+    </select>
+</mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourcerInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourcerInfoMapper.xml
index 510a80b..3049b54 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourcerInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourcerInfoMapper.xml
@@ -7,6 +7,8 @@
         <id column="id" property="id" />
         <result column="outsourcer_no" property="outsourcerNo" />
         <result column="outsourcer_name" property="outsourcerName" />
+        <result column="lab_code" property="labCode" />
+        <result column="group_code" property="groupCode" />
         <result column="outsourcer_brief_name" property="outsourcerBriefName" />
         <result column="outsourcer_size" property="outsourcerSize" />
         <result column="business_size" property="businessSize" />
@@ -55,32 +57,32 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, outsourcer_no, outsourcer_name, outsourcer_brief_name, outsourcer_size, business_size, grade, evaluation, tax_number, bank_account, bank_name, bank_account_number, postal_code, director, phone, fax, mobile, email, website, address_country, address_province, address_city, address_area, full_address, address_country_name, address_province_name, address_city_name, address_area_name, invoice_country, invoice_province, invoice_city, invoice_area, invoice_full_address, invoice_country_name, invoice_province_name, invoice_city_name, invoice_area_name, business_scope, business_content, minio_file_name, approval_status, process_id, remark, create_user_id, create_user_name, create_time, update_time
+        id, outsourcer_no, outsourcer_name, lab_code, group_code, outsourcer_brief_name, outsourcer_size, business_size, grade, evaluation, tax_number, bank_account, bank_name, bank_account_number, postal_code, director, phone, fax, mobile, email, website, address_country, address_province, address_city, address_area, full_address, address_country_name, address_province_name, address_city_name, address_area_name, invoice_country, invoice_province, invoice_city, invoice_area, invoice_full_address, invoice_country_name, invoice_province_name, invoice_city_name, invoice_area_name, business_scope, business_content, minio_file_name, approval_status, process_id, remark, create_user_id, create_user_name, create_time, update_time
     </sql>
 
     <select id="selectBatchForApprovalList" resultMap="BaseResultMap">
         SELECT *
         FROM biz_business_outsourcer_info
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.outsourcerNo != null and request.outsourcerNo !=''">
+        <if test="request != null and request.outsourcerNo != null and request.outsourcerNo !=''">
             and outsourcer_no like concat('%',#{request.outsourcerNo},'%')
         </if>
-        <if test="request.outsourcerName != null and request.outsourcerName !=''">
+        <if test="request != null and request.outsourcerName != null and request.outsourcerName !=''">
             and outsourcer_name like concat('%',#{request.outsourcerName},'%')
         </if>
-        <if test="request.director != null and request.director !=''">
+        <if test="request != null and request.director != null and request.director !=''">
             and director like concat('%',#{request.director},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
@@ -93,6 +95,6 @@
     </select>
 
     <select id="selectMaxNo" resultType="java.lang.Long">
-        SELECT IFNULL(max(RIGHT(outsourcer_no, 12)), 0) from biz_business_outsourcer_info
+        SELECT IFNULL(max(RIGHT(outsourcer_no, 3)), 0) from biz_business_outsourcer_info
     </select>
 </mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessSiteExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessSiteExecutiveInfoMapper.xml
index 135c5d0..3c5ae79 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessSiteExecutiveInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessSiteExecutiveInfoMapper.xml
@@ -38,25 +38,25 @@
         FROM biz_business_site_executive_info bsei
         LEFT JOIN biz_resource_customer_info rci ON bsei.customer_id = rci.id
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and bsei.approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and bsei.create_user_id = #{request.createUserId}
         </if>
-        <if test="request.siteExecutiveNo != null and request.siteExecutiveNo !=''">
+        <if test="request != null and request.siteExecutiveNo != null and request.siteExecutiveNo !=''">
             and bsei.site_executive_no like concat('%',#{request.siteExecutiveNo},'%')
         </if>
-        <if test="request.customerName != null and request.customerName !=''">
+        <if test="request != null and request.customerName != null and request.customerName !=''">
             and rci.outsourcer_name like concat('%',#{request.customerName},'%')
         </if>
-        <if test="request.applyName != null and request.applyName !=''">
+        <if test="request != null and request.applyName != null and request.applyName !=''">
             and bsei.apply_name like concat('%',#{request.applyName},'%')
         </if>
-        <if test="request.applyTimeStart != null and request.applyTimeStart !=''">
+        <if test="request != null and request.applyTimeStart != null and request.applyTimeStart !=''">
             and bsei.apply_time &gt;= #{request.applyTimeStart}
         </if>
-        <if test="request.applyTimeEnd != null and request.applyTimeEnd !=''">
+        <if test="request != null and request.applyTimeEnd != null and request.applyTimeEnd !=''">
             and bsei.apply_time &lt;= #{request.applyTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml
index 84d9e2a..6bd38a9 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml
@@ -105,6 +105,12 @@
         <if test="request.isUrgent != null and request.isUrgent !=''">
             AND bo.is_urgent = #{request.isUrgent}
         </if>
+        <if test="request.ids != null">
+            and blei.id in
+            <foreach collection="request.ids" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
         ORDER BY blei.update_time DESC
     </select>
 
@@ -137,6 +143,12 @@
         <if test="request.isUrgent != null and request.isUrgent !=''">
             AND bo.is_urgent = #{request.isUrgent}
         </if>
+        <if test="request.ids != null">
+            and blei.id in
+            <foreach collection="request.ids" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
         ORDER BY blei.update_time DESC
     </select>
 
diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardInfoMapper.xml
index 1a5551b..2ed8d17 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardInfoMapper.xml
@@ -45,12 +45,6 @@
         FROM biz_equipment_standard_info besi
         LEFT JOIN biz_equipment_standard_technology_relation bestr ON besi.standard_no = bestr.standard_no
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
-            and besi.approval_status = #{request.approvalStatus}
-        </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
-            and besi.create_user_id = #{request.createUserId}
-        </if>
         <if test="request.standardName != null and request.standardName !=''">
             and besi.standard_name like concat('%',#{request.standardName},'%')
         </if>
diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardTechnologyRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardTechnologyRelationMapper.xml
index fc7e16c..cd03c8c 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardTechnologyRelationMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardTechnologyRelationMapper.xml
@@ -6,6 +6,7 @@
     <resultMap id="BaseResultMap" type="com.casic.missiles.model.equipment.BizEquipmentStandardTechnologyRelation">
         <id column="id" property="id" />
         <result column="technology_file_id" property="technologyFileId" />
+        <result column="technology_file_no" property="technologyFileNo" />
         <result column="technology_file_name" property="technologyFileName" />
         <result column="standard_id" property="standardId" />
         <result column="standard_no" property="standardNo" />
@@ -14,7 +15,7 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, technology_file_id, technology_file_name, standard_id, remark
+        id, technology_file_id, technology_file_no, technology_file_name, standard_id, remark
     </sql>
 
 </mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceAuthorizeOrderMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceAuthorizeOrderMapper.xml
index ac5176c..554fe65 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceAuthorizeOrderMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceAuthorizeOrderMapper.xml
@@ -32,22 +32,22 @@
         SELECT *
         FROM biz_resource_authorize_order
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.orderNo != null and request.orderNo !=''">
+        <if test="request != null and request.orderNo != null and request.orderNo !=''">
             and order_no like concat('%',#{request.orderNo},'%')
         </if>
-        <if test="request.createUserName != null and request.createUserName !=''">
+        <if test="request != null and request.createUserName != null and request.createUserName !=''">
             and create_user_name like concat('%',#{request.createUserName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerExamineFormMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerExamineFormMapper.xml
index ab242f6..af7f98f 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerExamineFormMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerExamineFormMapper.xml
@@ -41,28 +41,28 @@
         SELECT *
         FROM biz_resource_customer_examine_form
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.formNo != null and request.formNo !=''">
+        <if test="request != null and request.formNo != null and request.formNo !=''">
             and form_no like concat('%',#{request.formNo},'%')
         </if>
-        <if test="request.labCode != null and request.labCode !=''">
+        <if test="request != null and request.labCode != null and request.labCode !=''">
             and lab_code like concat('%',#{request.labCode},'%')
         </if>
-        <if test="request.groupCode != null and request.groupCode !=''">
+        <if test="request != null and request.groupCode != null and request.groupCode !=''">
             and group_code like concat('%',#{request.groupCode},'%')
         </if>
-        <if test="request.createUserName != null and request.createUserName !=''">
+        <if test="request != null and request.createUserName != null and request.createUserName !=''">
             and create_user_name like concat('%',#{request.createUserName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerInfoMapper.xml
index fa8ffbc..06a2798 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerInfoMapper.xml
@@ -33,25 +33,25 @@
         SELECT *
         FROM biz_resource_customer_info
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.customerNo != null and request.customerNo !=''">
+        <if test="request != null and request.customerNo != null and request.customerNo !=''">
             and customer_no like concat('%',#{request.customerNo},'%')
         </if>
-        <if test="request.customerName != null and request.customerName !=''">
+        <if test="request != null and request.customerName != null and request.customerName !=''">
             and customer_name like concat('%',#{request.customerName},'%')
         </if>
-        <if test="request.contacts != null and request.contacts !=''">
+        <if test="request != null and request.contacts != null and request.contacts !=''">
             and contacts like concat('%',#{request.contacts},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerSuggestFormMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerSuggestFormMapper.xml
index 28f5bb2..1806662 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerSuggestFormMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerSuggestFormMapper.xml
@@ -33,28 +33,28 @@
         SELECT *
         FROM biz_resource_customer_suggest_form
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.formNo != null and request.formNo !=''">
+        <if test="request != null and request.formNo != null and request.formNo !=''">
             and form_no like concat('%',#{request.formNo},'%')
         </if>
-        <if test="request.customerName != null and request.customerName !=''">
+        <if test="request != null and request.customerName != null and request.customerName !=''">
             and customer_name like concat('%',#{request.customerName},'%')
         </if>
-        <if test="request.customerDeptName != null and request.customerDeptName !=''">
+        <if test="request != null and request.customerDeptName != null and request.customerDeptName !=''">
             and customer_dept_name like concat('%',#{request.customerDeptName},'%')
         </if>
-        <if test="request.createUserName != null and request.createUserName !=''">
+        <if test="request != null and request.createUserName != null and request.createUserName !=''">
             and create_user_name like concat('%',#{request.createUserName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSealUseNoteMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSealUseNoteMapper.xml
index ab37bc1..b02bb33 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSealUseNoteMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSealUseNoteMapper.xml
@@ -29,32 +29,32 @@
     </sql>
 
     <select id="selectBatchForApprovalList" resultMap="BaseResultMap">
-        SELECT *
+        SELECT brsun.*, brsi.seal_name, brsi.seal_type, brsi.approver_name
         FROM biz_resource_seal_use_note brsun
         JOIN biz_resource_seal_info brsi ON brsun.seal_id = brsi.id
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and brsun.approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and brsun.create_user_id = #{request.createUserId}
         </if>
-        <if test="request.sealName != null and request.sealName !=''">
+        <if test="request != null and request.sealName != null and request.sealName !=''">
             and brsi.seal_name like concat('%',#{request.sealName},'%')
         </if>
-        <if test="request.sealType != null and request.sealType !=''">
+        <if test="request != null and request.sealType != null and request.sealType !=''">
             and brsi.seal_type = #{request.sealType}
         </if>
-        <if test="request.applyDeptName != null and request.applyDeptName !=''">
+        <if test="request != null and request.applyDeptName != null and request.applyDeptName !=''">
             and brsun.apply_dept_name like concat('%',#{request.applyDeptName},'%')
         </if>
-        <if test="request.applyUserName != null and request.applyUserName !=''">
+        <if test="request != null and request.applyUserName != null and request.applyUserName !=''">
             and brsun.apply_user_name like concat('%',#{request.applyUserName},'%')
         </if>
-        <if test="request.applyTimeStart != null and request.applyTimeStart !=''">
+        <if test="request != null and request.applyTimeStart != null and request.applyTimeStart !=''">
             and brsun.apply_time &gt;= #{request.applyTimeStart}
         </if>
-        <if test="request.applyTimeEnd != null and request.applyTimeEnd !=''">
+        <if test="request != null and request.applyTimeEnd != null and request.applyTimeEnd !=''">
             and brsun.apply_time &lt;= #{request.applyTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml
index 119bf7d..4f8392a 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml
@@ -31,6 +31,12 @@
         <if test="request.deptName != null and request.deptName !=''">
             and brsi.dept_name like concat('%',#{request.deptName},'%')
         </if>
+        <if test="request.ids != null">
+            and brsv.id in
+            <foreach collection="request.ids" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
         ORDER BY brsv.grant_date DESC
     </select>
 

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java
index bb0c50f..13a699b 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java
@@ -12,6 +12,7 @@
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.IGeneralApprovalService;
+import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
@@ -19,6 +20,7 @@
 import org.springframework.web.bind.annotation.RequestBody;
 
 import javax.validation.Valid;
+import java.util.List;
 import java.util.Objects;
 
 /**
@@ -117,4 +119,17 @@
         }
         return baseApprovalService.failUpdate(request);
     }
+
+    public List<O> exportList(@RequestBody @Valid R request) throws Exception {
+        List<O> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = baseApprovalService.listExportByIds(request.getIds());
+        } else {
+            list = baseApprovalService.listExport(request);
+        }
+        for (O record : list) {
+            DictCodeUtils.convertDictCodeToName(record);
+        }
+        return list;
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java
index 8a90961..d775831 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java
@@ -5,6 +5,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.business.certificate.CertificateChangeApplyApprovalListRequest;
 import com.casic.missiles.dto.business.certificate.CertificateChangeApplySaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessCertificateChangeApply;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
@@ -20,6 +21,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -48,4 +50,12 @@
         }
         return changeApplyService.saveChangeApply(request);
     }
+
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody CertificateChangeApplyApprovalListRequest request) throws Exception {
+        List<BizBusinessCertificateChangeApply> list = super.exportList(request);
+        super.exportExcel(BizBusinessCertificateChangeApply.class, list, ExportEnum.CERTIFICATE_CHANGE_APPLY.getSheetName());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java
index 5fc4b07..af8230e 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java
@@ -9,6 +9,7 @@
 import com.casic.missiles.dto.business.certificate.CertificatePrintApprovalListRequest;
 import com.casic.missiles.dto.business.certificate.CertificatePrintListResponse;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.enums.business.CertificatePrintStatusEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessCertificatePrintLog;
@@ -18,10 +19,16 @@
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.io.IOException;
+import java.util.List;
 import java.util.Objects;
 
 /**
@@ -98,4 +105,16 @@
         });
         return certificatePrintService.certificatePrintLog(idDTO.getId());
     }
+
+    @ApiOperation("证书打印审批导出")
+    @PostMapping("/listExport")
+    public void exportList(@RequestBody CertificatePrintApprovalListRequest request) throws IOException {
+        List<CertificatePrintListResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = certificatePrintService.listByIds(request.getIds());
+        } else {
+            list = certificatePrintService.list(request);
+        }
+        super.exportExcel(CertificatePrintListResponse.class, list, ExportEnum.CERTIFICATE_PRINT.getSheetName());
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java
index 63b06dc..6b2efd5 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java
@@ -6,6 +6,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.business.certificate.CertificateReportApprovalListRequest;
 import com.casic.missiles.dto.business.certificate.CertificateReportSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessCertificateReport;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
@@ -21,6 +22,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -50,7 +52,7 @@
         return certificateReportService.saveCertificateReport(request);
     }
 
-    @ApiOperation("证书审批详情（基本信息）")
+    @ApiOperation("详情（基本信息）")
     @PostMapping("/detail")
     public ReturnDTO<BizBusinessCertificateReport> detail(@RequestBody @Valid BaseDetailRequest request, BindingResult bindingResult) throws Exception {
         if(bindingResult.hasErrors()){
@@ -59,4 +61,11 @@
         return certificateReportService.detail(request);
     }
 
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody CertificateReportApprovalListRequest request) throws Exception {
+        List<BizBusinessCertificateReport> list = super.exportList(request);
+        super.exportExcel(BizBusinessCertificateReport.class, list, ExportEnum.CERTIFICATE_REPORT.getSheetName());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java
index 46b26bd..57c0809 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java
@@ -10,20 +10,21 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.business.identify.IdentifyListRequest;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessIdentifyInfo;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.business.IBizBusinessIdentifyInfoService;
+import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import javax.validation.Valid;
+import java.util.List;
 import java.util.Objects;
 
 /**
@@ -57,16 +58,13 @@
         return identifyInfoService.addIdentify(identifyInfo);
     }
 
-    @ApiOperation("标识打印更新")
+    @ApiOperation("标识打印更新（更新打印时间）")
     @PostMapping("/update")
-    public ReturnDTO updateIdentify(@RequestBody @Valid BizBusinessIdentifyInfo identifyInfo, BindingResult bindingResult) {
-        Assert.isFalse(Objects.isNull(identifyInfo.getId()), () -> {
+    public ReturnDTO updateIdentify(@RequestBody @Valid IdDTO idDTO) {
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        Assert.isFalse(bindingResult.hasErrors(), () -> {
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        });
-        return identifyInfoService.updateIdentify(identifyInfo);
+        return identifyInfoService.updateIdentify(idDTO.getId());
     }
 
     @ApiOperation("标识打印删除")
@@ -77,4 +75,37 @@
         });
         return identifyInfoService.deleteIdentify(idDTO.getId());
     }
+
+    @ApiOperation("标识打印导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody @Valid IdentifyListRequest request, BindingResult bindingResult) throws Exception {
+        if (bindingResult.hasErrors()) {
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        List<BizBusinessIdentifyInfo> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = identifyInfoService.listByIds(request.getIds());
+        } else {
+            list = identifyInfoService.list(request);
+        }
+        for (BizBusinessIdentifyInfo record : list) {
+            DictCodeUtils.convertDictCodeToName(record);
+        }
+        super.exportExcel(BizBusinessIdentifyInfo.class, list, ExportEnum.IDENTIFY_EXPORT.getSheetName());
+    }
+
+
+    // TODO: 2023/8/23 查询设备信息，4个底部按钮查设备（按钮的作用就是前端用来调不同接口、用来区分中间即将展示的标识），前端弹窗选设备，在确定保存时前端根据底部按钮判断传入设备类型deviceType字典code
+    // TODO: 2023/8/23 接口：查受检设备（第1个按钮），查设备台账（后3个按钮同一接口），查询之后前端根据标志类型的不同加到中间页面时进行判断（按产品给的对应表）
+    // TODO: 2023/8/23 提供二维码接口，前端在加到中间页面时调用一下
+
+    @ApiOperation("设备二维码")
+    @PostMapping("/equipment/qrCode")
+    public ReturnDTO<String> equipmentQrCode(@RequestBody @Valid IdDTO idDTO) {
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return identifyInfoService.equipmentQrCode(idDTO.getId());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java
index 707be6e..7e0453d 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java
@@ -117,7 +117,7 @@
     }
 
     @ApiOperation("任务单导出")
-    @PostMapping("/export")
+    @PostMapping("/listExport")
     public void orderExport(@RequestBody @Valid OrderListRequest request, HttpServletResponse response) {
         businessOrderService.orderExport(request, response);
     }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java
index 529a6ce..51432be 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java
@@ -1,9 +1,28 @@
 package com.casic.missiles.controller.business;
 
+import com.casic.missiles.controller.GeneralApprovalController;
+import com.casic.missiles.dto.BaseApprovalSubmitRequest;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.business.outsource.OutsourceAssessApprovalListRequest;
+import com.casic.missiles.dto.business.outsource.OutsourceAssessSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
+import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.model.business.BizBusinessOutsourceAssess;
+import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
+import com.casic.missiles.service.IGeneralApprovalService;
+import com.casic.missiles.service.business.IBizBusinessOutsourceAssessService;
 import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.BindingResult;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.validation.Valid;
+import java.util.List;
+
 /**
  * <p>
  * 计量检定业务-分包管理-测试、校准或检定工作分包评审表 前端控制器
@@ -15,6 +34,27 @@
 @Api(tags = "分包管理-测试、校准或检定工作分包评审表")
 @RestController
 @RequestMapping("/business/outsource/assess")
-public class BizBusinessOutsourceAssessController {
+public class BizBusinessOutsourceAssessController extends GeneralApprovalController<BizBusinessOutsourceAssess, BizBusinessOutsourceAssess, OutsourceAssessApprovalListRequest, BaseApprovalSubmitRequest> {
+    @Autowired
+    private IBizBusinessOutsourceAssessService outsourceAssessService;
 
+    public BizBusinessOutsourceAssessController(IGeneralApprovalService<BizBusinessOutsourceAssess, BizBusinessOutsourceAssess, OutsourceAssessApprovalListRequest, BaseApprovalSubmitRequest> baseApprovalService) {
+        super(baseApprovalService);
+    }
+
+    @ApiOperation("草稿箱-保存")
+    @PostMapping("/save")
+    public ReturnDTO<OutsourceAssessSaveResponse> saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceAssess request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        return outsourceAssessService.saveOutsourceAssess(request);
+    }
+
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception {
+        List<BizBusinessOutsourceAssess> list = super.exportList(request);
+        super.exportExcel(BizBusinessOutsourceAssess.class, list, ExportEnum.OUTSOURCE_ASSESS.getSheetName());
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java
new file mode 100644
index 0000000..9adef18
--- /dev/null
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java
@@ -0,0 +1,60 @@
+package com.casic.missiles.controller.business;
+
+import com.casic.missiles.controller.GeneralApprovalController;
+import com.casic.missiles.dto.BaseApprovalSubmitRequest;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.business.outsource.OutsourceProtocolApprovalListRequest;
+import com.casic.missiles.dto.business.outsource.OutsourceProtocolSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
+import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.model.business.BizBusinessOutsourceProtocol;
+import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
+import com.casic.missiles.service.IGeneralApprovalService;
+import com.casic.missiles.service.business.IBizBusinessOutsourceProtocolService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.BindingResult;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.validation.Valid;
+import java.util.List;
+
+/**
+ * <p>
+ * 计量检定业务-分包管理-测试、校准或检定工作分包协议书 前端控制器
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-08-24
+ */
+@Api(tags = "分包管理-测试、校准或检定工作分包协议书")
+@RestController
+@RequestMapping("/business/outsource/protocol")
+public class BizBusinessOutsourceProtocolController extends GeneralApprovalController<BizBusinessOutsourceProtocol, BizBusinessOutsourceProtocol, OutsourceProtocolApprovalListRequest, BaseApprovalSubmitRequest> {
+    @Autowired
+    private IBizBusinessOutsourceProtocolService outsourceProtocolService;
+
+    public BizBusinessOutsourceProtocolController(IGeneralApprovalService<BizBusinessOutsourceProtocol, BizBusinessOutsourceProtocol, OutsourceProtocolApprovalListRequest, BaseApprovalSubmitRequest> baseApprovalService) {
+        super(baseApprovalService);
+    }
+
+    @ApiOperation("草稿箱-保存")
+    @PostMapping("/save")
+    public ReturnDTO<OutsourceProtocolSaveResponse> saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceProtocol request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        return outsourceProtocolService.saveOutsourceProtocol(request);
+    }
+
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody OutsourceProtocolApprovalListRequest request) throws Exception {
+        List<BizBusinessOutsourceProtocol> list = super.exportList(request);
+        super.exportExcel(BizBusinessOutsourceProtocol.class, list, ExportEnum.OUTSOURCE_PROTOCOL.getSheetName());
+    }
+}
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java
index 097f645..f0f0943 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java
@@ -17,7 +17,6 @@
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.IGeneralApprovalService;
 import com.casic.missiles.service.business.IBizBusinessOutsourcerInfoService;
-import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -71,19 +70,8 @@
 
     @ApiOperation("分包方导出")
     @PostMapping("/listExport")
-    public void export(@RequestBody @Valid OutsourcerInfoApprovalListRequest request, BindingResult bindingResult) throws Exception {
-        if (bindingResult.hasErrors()) {
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        }
-        List<BizBusinessOutsourcerInfo> list;
-        if (!CollectionUtils.isEmpty(request.getIds())) {
-            list = outsourcerInfoService.listByIds(request.getIds());
-        } else {
-            list = outsourcerInfoService.list(request);
-        }
-        for (BizBusinessOutsourcerInfo record : list) {
-            DictCodeUtils.convertDictCodeToName(record);
-        }
+    public void export(@RequestBody OutsourcerInfoApprovalListRequest request) throws Exception {
+        List<BizBusinessOutsourcerInfo> list = super.exportList(request);
         super.exportExcel(BizBusinessOutsourcerInfo.class, list, ExportEnum.OUTSOURCER_EXPORT.getSheetName());
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java
index c2cbf9f..0410918 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java
@@ -17,11 +17,9 @@
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.IGeneralApprovalService;
 import com.casic.missiles.service.business.IBizBusinessSiteExecutiveInfoService;
-import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -60,7 +58,7 @@
         return siteExecutiveInfoService.saveSiteExecutiveInfo(siteExecutiveInfo);
     }
 
-    @ApiOperation("现场检测详情")
+    @ApiOperation("详情")
     @PostMapping("/detail")
     public ReturnDTO<SiteExecutiveDetailResponse> siteExecutiveDetail(@RequestBody @Valid IdDTO idDTO) throws Exception {
         Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
@@ -69,21 +67,10 @@
         return ReturnUtil.success(siteExecutiveInfoService.detail(idDTO.getId()));
     }
 
-    @ApiOperation("现场检测导出")
+    @ApiOperation("导出")
     @PostMapping("/listExport")
-    public void export(@RequestBody @Valid SiteExecutiveApprovalListRequest request, BindingResult bindingResult) throws Exception {
-        if (bindingResult.hasErrors()) {
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        }
-        List<SiteExecutiveApprovalListResponse> list;
-        if (!CollectionUtils.isEmpty(request.getIds())) {
-            list = siteExecutiveInfoService.listInfoByIds(request.getIds());
-        } else {
-            list = siteExecutiveInfoService.listInfo(request);
-        }
-        for (SiteExecutiveApprovalListResponse record : list) {
-            DictCodeUtils.convertDictCodeToName(record);
-        }
+    public void export(@RequestBody SiteExecutiveApprovalListRequest request) throws Exception {
+        List<SiteExecutiveApprovalListResponse> list = super.exportList(request);
         super.exportExcel(SiteExecutiveApprovalListResponse.class, list, ExportEnum.SITE_EXECUTIVE_EXPORT.getSheetName());
     }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
index 7e793cd..a92e209 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
@@ -55,7 +55,7 @@
 
     @ApiOperation("设备收发列表导出")
     @PostMapping("/export")
-    public void exportList(@RequestBody @Valid SampleDispatchListRequest request) throws IOException {
+    public void exportList(@RequestBody SampleDispatchListRequest request) throws IOException {
         List<SampleDispatchListResponse> list;
         if (!CollectionUtils.isEmpty(request.getIds())) {
             list = dispatchService.listByIds(request.getIds());
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java
index cdc77fc..d120fd4 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java
@@ -7,6 +7,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.business.labExecutive.*;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.business.IBusinessLabExecutiveInfoService;
@@ -14,6 +15,7 @@
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.*;
 
@@ -32,7 +34,7 @@
     @Autowired
     private IBusinessLabExecutiveInfoService labExecutiveInfoService;
 
-    @ApiOperation("实验室检测-部门检测-查询各状态列表（待检测、检测中、检测完）")
+    @ApiOperation("实验室任务-查询各状态列表（待检测、检测中、检测完）")
     @PostMapping("/deptExecutive/List")
     public ReturnDTO<PageInfoBT<SampleLabExecutiveListResponse>> queryDeptExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
@@ -43,10 +45,19 @@
         return ReturnUtil.success(super.packForBT(labExecutiveInfoService.deptLabExecutiveListPage(page, labExecutiveListRequest)));
     }
 
-    /**
-     * 实验室检测-我的检测-查询各状态列表（待检测、检测中、检测完）
-     */
-    @ApiOperation("实验室检测-我的检测-查询各状态列表（待检测、检测中、检测完）")
+    @ApiOperation("实验室任务导出")
+    @PostMapping("/deptExecutive/export")
+    public void deptExportList(@RequestBody @Valid SampleLabExecutiveListRequest request) throws Exception {
+        List<SampleLabExecutiveListResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = labExecutiveInfoService.deptLabExecutiveListByIds(request.getMeasureStatus(), request.getIds());
+        } else {
+            list = labExecutiveInfoService.deptLabExecutiveList(request);
+        }
+        super.exportExcel(SampleLabExecutiveListResponse.class, list, ExportEnum.DEPT_EXECUTIVE_TASK.getSheetName());
+    }
+
+    @ApiOperation("我的任务-查询各状态列表（待检测、检测中、检测完）")
     @PostMapping("/myExecutive/list")
     public ReturnDTO<PageInfoBT<SampleLabExecutiveListResponse>> queryMyExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
@@ -57,19 +68,25 @@
         return ReturnUtil.success(super.packForBT(labExecutiveInfoService.myLabExecutiveListPage(page, labExecutiveListRequest)));
     }
 
-    /**
-     * 实验室检测-我的检测-查询各状态样品数量（待检测、检测中、检测完）
-     */
-    @ApiOperation("实验室检测-我的检测-查询各状态样品数量（待检测、检测中、检测完）")
+    @ApiOperation("我的任务导出")
+    @PostMapping("/myExecutive/export")
+    public void exportList(@RequestBody @Valid SampleLabExecutiveListRequest request) throws Exception {
+        List<SampleLabExecutiveListResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = labExecutiveInfoService.myLabExecutiveListByIds(request.getMeasureStatus(), request.getIds());
+        } else {
+            list = labExecutiveInfoService.myLabExecutiveList(request);
+        }
+        super.exportExcel(SampleLabExecutiveListResponse.class, list, ExportEnum.MY_EXECUTIVE_TASK.getSheetName());
+    }
+
+    @ApiOperation("我的任务-查询各状态样品数量（待检测、检测中、检测完）")
     @GetMapping("/myExecutive/amount")
     public ReturnDTO<List<SampleAmountResponse>> queryMyExecutiveAmount() {
         return ReturnUtil.success(labExecutiveInfoService.myExecutiveAmount());
     }
 
-    /**
-     * 实验室检测-部门检测-分配（分配给具体人员）
-     */
-    @ApiOperation("实验室检测-部门检测-分配按钮（分配给具体人员）")
+    @ApiOperation("实验室任务-分配按钮（分配给具体人员）")
     @PostMapping("/deptExecutive/allocate")
     public ReturnDTO allocateStaff(@RequestBody @Valid SampleAllocateRequest sampleAllocateRequest, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -78,10 +95,7 @@
         return labExecutiveInfoService.allocateStaff(sampleAllocateRequest);
     }
 
-    /**
-     * 实验室检测-我的检测-检定人扫描收入（待检测->检测中）
-     */
-    @ApiOperation("实验室检测-我的检测-检定人扫描收入（待检测->检测中）")
+    @ApiOperation("我的任务-检定人扫描收入（待检测->检测中）")
     @PostMapping("/myExecutive/receive")
     public ReturnDTO sampleReceive(@RequestBody @Valid List<SampleOperateRequest> requestList, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -90,10 +104,7 @@
         return labExecutiveInfoService.sampleReceive(requestList);
     }
 
-    /**
-     * 实验室检测-负责人/检定人扫描检完（检测中->检测完）
-     */
-    @ApiOperation("实验室检测-负责人/检定人扫描检完（检测中->检测完）")
+    @ApiOperation("实验室任务-负责人/检定人扫描检完（检测中->检测完）")
     @PostMapping("/myExecutive/complete")
     public ReturnDTO sampleExecutiveComplete(@RequestBody @Valid List<SampleOperateRequest> requestList, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -102,10 +113,7 @@
         return labExecutiveInfoService.sampleExecutiveComplete(requestList);
     }
 
-    /**
-     * 实验室检测-部门检测/我的检测 编辑（只能修改应出具证书）
-     */
-    @ApiOperation("实验室检测-部门检测/我的检测 编辑（只能修改应出具证书）")
+    @ApiOperation("实验室任务/我的任务 编辑（只能修改应出具证书）")
     @PostMapping("/executive/update")
     public ReturnDTO updateExecutive(@RequestBody @Valid UpdateExecutiveRequest request, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -114,10 +122,7 @@
         return labExecutiveInfoService.updateExecutive(request);
     }
 
-    /**
-     * 实验室检测-部门检测/我的检测 详情
-     */
-    @ApiOperation("实验室检测-部门检测/我的检测 详情")
+    @ApiOperation("实验室任务/我的任务 详情")
     @PostMapping("/executive/detail")
     public ReturnDTO<ExecutiveDetailResponse> executiveDetail(@RequestBody @Valid ExecutiveDetailRequest request, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
@@ -131,7 +136,7 @@
      * 退回后会将下一个要执行的实验室检测状态更新为待分配，将后面的实验室顺序变更为连续（都进行减1）
      * 最后一个检测的实验室退回，等分发员再增加实验室或设备收发中的已收入直接手动点击完成
      */
-    @ApiOperation("实验室检测-部门检测/我的检测 退回（待检测/检测中->退回）")
+    @ApiOperation("实验室任务/我的任务 退回（待检测/检测中->退回）")
     @PostMapping("/executive/sendBack")
     public ReturnDTO executiveSendBack(@RequestBody @Valid ExecutiveSendBackRequest request, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -140,9 +145,6 @@
         return labExecutiveInfoService.sampleExecutiveSendBack(request);
     }
 
-    /**
-     * 分发员编辑实验室检测列表
-     */
     @ApiOperation("分发员编辑实验室检测列表")
     @PostMapping("/handOut/updateList")
     public ReturnDTO updateExecutiveList(@RequestBody @Valid UpdateExecutiveListRequest request, BindingResult bindingResult) {
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java
index 48a67ed..0c04f31 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java
@@ -10,6 +10,7 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.resource.customer.CustomerApprovalListRequest;
 import com.casic.missiles.dto.resource.customer.CustomerSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceCustomerInfo;
@@ -26,6 +27,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -55,6 +57,13 @@
         return customerInfoService.saveCustomerInfo(request);
     }
 
+    @ApiOperation("委托方名录导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody CustomerApprovalListRequest request) throws Exception {
+        List<BizResourceCustomerInfo> list = super.exportList(request);
+        super.exportExcel(BizResourceCustomerInfo.class, list, ExportEnum.CUSTOMER_INFO.getSheetName());
+    }
+
     @ApiOperation("委托方人员列表（分页）")
     @PostMapping("/person/listPage")
     public ReturnDTO<PageInfoBT<BizResourceCustomerStaff>> personListPage(@RequestBody IdDTO idDto) {
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
index 972ed4b..6418ea5 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
@@ -5,6 +5,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.resource.customer.SuggestFormApprovalListRequest;
 import com.casic.missiles.dto.resource.customer.SuggestFormSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceCustomerSuggestForm;
@@ -20,6 +21,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -50,4 +52,11 @@
         return suggestFormService.saveSuggestForm(request);
     }
 
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody SuggestFormApprovalListRequest request) throws Exception {
+        List<BizResourceCustomerSuggestForm> list = super.exportList(request);
+        super.exportExcel(BizResourceCustomerSuggestForm.class, list, ExportEnum.CUSTOMER_SUGGEST_FORM.getSheetName());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java
index 1934d1a..9e07eab 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java
@@ -15,12 +15,16 @@
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.resource.IEnvEnvironmentRecordConfigService;
 import com.casic.missiles.service.resource.IEnvEnvironmentRecordDataService;
+import com.casic.missiles.service.resource.IEnvLocationInfoService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
 import java.util.List;
@@ -39,6 +43,8 @@
     private IEnvEnvironmentRecordDataService environmentRecordDataService;
     @Autowired
     private IEnvEnvironmentRecordConfigService environmentRecordConfigService;
+    @Autowired
+    private IEnvLocationInfoService locationInfoService;
 
     @ApiOperation("环境记录单数据列表/详情")
     @PostMapping("/data/listPage")
@@ -95,4 +101,11 @@
         });
         return environmentRecordConfigService.deleteEnvironmentRecordConfig(idDTO.getId());
     }
+
+    @ApiOperation("地点列表")
+    @PostMapping("/location/listPage")
+    public ReturnDTO<PageInfoBT<LocationListResponse>> locationListPage(@RequestBody @Valid LocationListRequest request) {
+        Page<LocationListResponse> page = PageFactory.defaultPage();
+        return ReturnUtil.success(super.packForBT(locationInfoService.listPage(page, request)));
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java
index 82efe3f..e9561fa 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java
@@ -10,6 +10,7 @@
 import com.casic.missiles.dto.resource.seal.SealLogListRequest;
 import com.casic.missiles.dto.resource.seal.SealNoteApprovalListRequest;
 import com.casic.missiles.dto.resource.seal.SealNoteSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceSealUseLog;
@@ -27,6 +28,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -58,6 +60,13 @@
         return sealUseNoteService.saveSeal(request);
     }
 
+    @ApiOperation("印章使用登记导出（列表和导出中去掉经办人和监印人）")
+    @PostMapping("/listExport")
+    public void export(@RequestBody SealNoteApprovalListRequest request) throws Exception {
+        List<BizResourceSealUseNote> list = super.exportList(request);
+        super.exportExcel(BizResourceSealUseNote.class, list, ExportEnum.SEAL_NOTE.getSheetName());
+    }
+
     // TODO: 2023/7/28 印章使用日志：系统中使用印章时插入数据库
 
     @ApiOperation("印章使用日志列表（分页）")
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java
index 9b674fc..06b6521 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java
@@ -9,16 +9,20 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.resource.staff.StaffCertRequest;
 import com.casic.missiles.dto.resource.staff.StaffCertResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.service.resource.IBizResourceStaffInfoService;
 import com.casic.missiles.service.resource.IBizResourceStaffVerifierService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.List;
+
 /**
  * @Description:
  * @Author: wangpeng
@@ -41,9 +45,21 @@
         return ReturnUtil.success(super.packForBT(responsePage));
     }
 
+    @ApiOperation("证书逾期提醒导出")
+    @PostMapping("/listExport")
+    public void exportList(@RequestBody StaffCertRequest request) throws Exception {
+        List<StaffCertResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = staffInfoService.certListByIds(request.getIds());
+        } else {
+            list = staffInfoService.certList(request);
+        }
+        super.exportExcel(StaffCertResponse.class, list, ExportEnum.STAFF_CERTIFICATE_EXPIRE.getSheetName());
+    }
+
     @ApiOperation("证书逾期提醒")
     @PostMapping("/expirationReminder")
-    public ReturnDTO expirationReminder(@RequestBody IdDTO idDto) {
-        return verifierService.expirationReminder(idDto);
+    public ReturnDTO expirationReminder(@RequestBody IdDTO idDTO) {
+        return verifierService.expirationReminder(idDTO);
     }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java
index 3b251ad..a6e7850 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java
@@ -12,6 +12,7 @@
 import com.casic.missiles.dto.resource.staff.StaffListRequest;
 import com.casic.missiles.dto.resource.staff.TrainListRequest;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.*;
@@ -22,7 +23,10 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
 import java.util.List;
@@ -52,8 +56,19 @@
             throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
         }
         Page<BizResourceStaffInfo> page = PageFactory.defaultPage();
-        Page<BizResourceStaffInfo> responsePage = staffInfoService.listPage(page, request);
-        return ReturnUtil.success(super.packForBT(responsePage));
+        return ReturnUtil.success(super.packForBT(staffInfoService.listPage(page, request)));
+    }
+
+    @ApiOperation("人员登记导出")
+    @PostMapping("/listExport")
+    public void exportList(@RequestBody StaffListRequest request) throws Exception {
+        List<BizResourceStaffInfo> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = staffInfoService.listByIds(request.getIds());
+        } else {
+            list = staffInfoService.list(request);
+        }
+        super.exportExcel(BizResourceStaffInfo.class, list, ExportEnum.STAFF_INFO.getSheetName());
     }
 
     @ApiOperation("人员登记详情基础信息")
@@ -85,9 +100,9 @@
 
     @ApiOperation("科研教育列表（分页）")
     @PostMapping("/education/listPage")
-    public ReturnDTO<PageInfoBT<BizResourceStaffEducation>> educationListPage(@RequestBody IdDTO idDto) {
+    public ReturnDTO<PageInfoBT<BizResourceStaffEducation>> educationListPage(@RequestBody IdDTO idDTO) {
         Page<BizResourceStaffEducation> page = PageFactory.defaultPage();
-        Page<BizResourceStaffEducation> responsePage = staffInfoService.educationListPage(page, idDto);
+        Page<BizResourceStaffEducation> responsePage = staffInfoService.educationListPage(page, idDTO);
         return ReturnUtil.success(super.packForBT(responsePage));
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java
index af6aa86..d85d84a 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java
@@ -9,6 +9,7 @@
 import com.casic.missiles.dto.resource.outsideService.SupplierApprovalListRequest;
 import com.casic.missiles.dto.resource.outsideService.SupplierSaveResponse;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceSupplierAbility;
@@ -67,6 +68,13 @@
         return ReturnUtil.success(supplierInfoService.detail(idDTO.getId()));
     }
 
+    @ApiOperation("合格供方导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody SupplierApprovalListRequest request) throws Exception {
+        List<BizResourceSupplierInfo> list = super.exportList(request);
+        super.exportExcel(BizResourceSupplierInfo.class, list, ExportEnum.SUPPLIER_INFO.getSheetName());
+    }
+
     @ApiOperation("供方人员列表（分页）")
     @PostMapping("/person/listPage")
     public ReturnDTO<PageInfoBT<BizResourceSupplierPerson>> personListPage(@RequestBody IdDTO idDTO) {
diff --git a/casic-metering-api/src/main/resources/config/application.yml b/casic-metering-api/src/main/resources/config/application.yml
index 350db5f..ecff521 100644
--- a/casic-metering-api/src/main/resources/config/application.yml
+++ b/casic-metering-api/src/main/resources/config/application.yml
@@ -126,7 +126,7 @@
     #作者
     author: wangpeng
     #待生成对象表名
-    table-name: biz_equipment_technical_target_approval,biz_equipment_attachment_approval,biz_equipment_checkpoint_approval
+    table-name: biz_business_outsource_protocol
 
 reminder:
   #节点--common模块config包 ReminderNodeConfig配置
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
index 4a19e4e..d47d552 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
@@ -53,6 +53,7 @@
     SUGGEST_FORM_SAVE_FAILED(2509, "委托方意见登记表保存至草稿箱失败"),
     EXAMINE_FORM_SAVE_FAILED(2510, "要求、委托书及合同评审表保存至草稿箱失败"),
     CUSTOMER_EXIST_SAVE_FAILED(2511, "该委托方已存在，请重新选择"),
+    DUPLICATE_LOCATION_NO(2512, "地点编号已存在"),
 
     /**
      * 计量检定业务模块
@@ -68,6 +69,8 @@
     COMPLETE_SAMPLE_NOT_EXIST(2609, "检测中不存在扫描收入的样品"),
     CANNOT_CHANGE_MEASURE_INFO(2610, "无法更改非当前登录用户的检测信息"),
     NON_EXIST_ORDER_OR_SAMPLE(2611, "不存在该委托单或该委托单下的样品"),
+    OUTSOURCE_ACCESS_SAVE_FAILED(2612, "测试、校准或检定工作分包评审表保存至草稿箱失败"),
+    OUTSOURCE_PROTOCOL_SAVE_FAILED(2613, "测试、校准或检定工作分包协议书保存至草稿箱失败"),
 
     /**
      * 历史遗留备用
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
index 5089ad1..81a406b 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
@@ -10,54 +10,38 @@
     /**
      * 资源管理
      */
-    ENVIRONMENT_DATA_EXPORT("environmentData", "environmentData", "环境记录单数据"),
+    ENVIRONMENT_DATA_EXPORT("environmentData", "环境记录单数据", "环境记录单数据"),
+    STAFF_INFO("staffInfo", "人员登记", "人员登记"),
+    STAFF_CERTIFICATE_EXPIRE("certificateExpire", "证书逾期提醒", "证书逾期提醒"),
+    SUPPLIER_INFO("supplierInfo", "合格供方名录", "合格供方名录"),
+    CUSTOMER_INFO("customerInfo", "委托方名录", "委托方名录"),
+    CUSTOMER_SUGGEST_FORM("customerSuggestForm", "委托方意见登记表", "委托方意见登记表"),
+    SEAL_NOTE("sealNote", "印章使用登记", "印章使用登记"),
 
-    FILE_EXPORT("meterFileData", "meterFileData", "计量文件信息"),
-    TRAIN_PLAN_EXPORT("trainPlanData", "trainPlanData", "培训计划"),
-    TRAIN_LOG_EXPORT("trainLogData", "trainLogData", "培训记录"),
-    METER_ORGANIZE_EXPORT("meterOrganizeData", "meterOrganizeData", "计量组织"),
-    TRACE_SUPPLIER_EXPORT("traceSupplierData", "traceSupplierData", "溯源供方"),
-    SIGN_EXPORT("signData", "signData", "签名/签章"),
-    TEMPLATE_EXPORT("templateData", "templateData", "原始记录模板/证书报告模板"),
-    FIXED_ASSETS("meterFixedAssets", "meterFixedAssets", "固定资产"),
-    METER_EQUIPMENT("meterEquipment", "meterEquipment", "测量设备"),
-    CALIBRATION_TEST_EQUIPMENT("calibrationTestEquipment", "calibrationTestEquipment", "校准检定设备"),
-    MEASURE_ACCOUNT("measureAccount", "measureAccount", "测量工装"),
-    STANDARD_SUPPORT_EQUIPMENT("standardSupportEquipment", "standardSupportEquipment", "标准配套设备"),
-    STANDARD_EQUIPMENT("standardEquipment", "standardEquipment", "标准装置"),
-    FLOW_DEF_EXPORT("flowDefData", "flowDefData", "流程定义"),
-    STAFF_CERTIFICATE("certificate", "certificate", "计量人员证书"),
-    CHECK_INFO("checkInfo", "checkInfo", "设备管理点检测"),
-    EQUIPMENT_APPLY("equipmentApply", "equipmentApply", "设备借用"),
-    STANDARD_EQUIPMENT_REMIND("equipmentApplyRemind", "equipmentApplyRemind", "标准装置到期提醒"),
-    METER_PRICE("meterPrice", "meterPrice", "价格库"),
-    METER_STAFF("meterStaff", "meterStaff", "计量人员"),
-    STANDARD_EQUIPMENT_APPLY("standardEquipmentApply", "standardEquipmentApply", "标准装置申请"),
-    STATE_MANAGE_APPLY("stateManage", "stateManage", "状态管理"),
-    METER_ACCEPTANCE_CHECK("acceptanceCheck", "acceptanceCheck", "设备检修保养验收单"),
-    CUSTOMER_EXPORT("customerData", "customerData", "客户信息"),
-    ORDER_EXPORT("orderData", "orderData", "委托书信息"),
-    SAMPLE_EXPORT("sampleData", "sampleData", "样本信息"),
-    EXCHANGE_DATA("exchangeData", "exchangeData", "设备交接单"),
-    DISPATCH_DATA("dispatchData", "dispatchData", "设备收发"),
-    ENVIRONMENT_DATA("environmentData", "environmentData", "环境记录单"),
-    ORIGIN_DATA("originData", "originData", "原始记录"),
-    CERTIFICATE_REPORT("certificateReport", "certificateReport", "证书报告"),
-    ADVICE_EXPORT("adviceData", "adviceData", "客户反馈"),
-    HANDOUT_EXPORT("handoutData", "handoutData", "任务分发列表"),
-    OUTSOURCER_EXPORT("outsourcerData", "outsourcerData", "分包方"),
-    SITE_EXECUTIVE_EXPORT("siteExecutiveData", "siteExecutiveData", "现场测试、校准或检定"),
-    CERTIFICATE_PRINT_EXPORT("certificatePrintData", "certificatePrintData", "证书打印"),
-    DOWNLOAD_TEMPLATE("downloadTemplate", "downloadTemplate", "页面配置"),
-    OUTSOURCER_CERTIFICATE_EXPORT("outsourceCertificateData", "outsourceCertificateData", "分包证书"),
-    SETTLEMENT_INFO_EXPORT("settlementInfoData", "settlementInfoData", "业务结算"),
-    EQUIPMENT_REMIND("equipmentRemind", "equipmentRemind", "设备到期提醒"),
-    AGREEMENT_INFO_EXPORT("agreementInfoData", "agreementInfoData", "合同"),
-    WORK_STATISTICS_EXPORT("workStatisticsData", "workStatisticsData", "实时工作统计"),
-    DEPT_OUTPUT_EXPORT("deptOutputData", "deptOutputData", "部门产值分析"),
-    WORKLOAD_EXPORT("workloadData", "workloadData", "业务工作量分析"),
-    DEPT_COMPREHENSIVE_EXPORT("deptComprehensiveData", "deptComprehensiveData", "部门综合分析"),
-    ENVIRONMENTAL_RECORD("environmentalRecordData", "environmentalRecordData", "现场环境记录");
+    /**
+     * 计量检定业务
+     */
+    OUTSOURCER_EXPORT("outsourcerData", "分包方名录", "分包方名录"),
+    IDENTIFY_EXPORT("identifyData", "计量标识", "计量标识"),
+    ORDER_EXPORT("orderData", "任务单", "任务单"),
+    DISPATCH_DATA("dispatchData", "设备收发", "设备收发"),
+    HANDOUT_EXPORT("handoutData", "任务分发", "任务分发"),
+    SITE_EXECUTIVE_EXPORT("siteExecutiveData", "现场测试、校准或检定", "现场测试、校准或检定"),
+    CERTIFICATE_REPORT("certificateReport", "证书审批", "证书审批"),
+    CERTIFICATE_CHANGE_APPLY("certificateChangeApply", "证书报告补充或更换申请单", "证书报告补充或更换申请单"),
+    CERTIFICATE_PRINT("certificatePrintData", "证书打印审批", "证书打印审批"),
+    DEPT_EXECUTIVE_TASK("deptExecutiveTaskData", "实验室任务", "实验室任务"),
+    MY_EXECUTIVE_TASK("myExecutiveTaskData", "我的任务", "我的任务"),
+    OUTSOURCE_ASSESS("outsourceAssess", "测试、校准或检定工作分包评审表", "测试、校准或检定工作分包评审表"),
+    OUTSOURCE_PROTOCOL("outsourceProtocol", "测试、校准或检定工作分包协议书", "测试、校准或检定工作分包协议书"),
+
+    /**
+     * 系统管理
+     */
+    SIGN_EXPORT("signData", "签名", "签名"),
+    TEMPLATE_EXPORT("templateData", "文件模板", "文件模板"),
+    FLOW_DEF_EXPORT("flowDefData", "流程定义", "流程定义"),
+    DOWNLOAD_TEMPLATE("downloadTemplate", "流程定义", "页面配置");
 
     ExportEnum(String fileName, String sheetName, String description) {
         this.fileName = fileName;
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateRecordTypeCodeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateRecordTypeCodeEnum.java
index 31d913c..a963522 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateRecordTypeCodeEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateRecordTypeCodeEnum.java
@@ -46,4 +46,14 @@
     String SITE_EXECUTIVE_APPROVAL = "01";
     //《现场测试、校准或检定工作记录表》
     String SITE_EXECUTIVE_LOG = "02";
+
+    //测试、校准或检定工作分包协议书
+    String OUTSOURCE_PROTOCOL = "01";
+    //测试、校准或检定工作分包评审表
+    String OUTSOURCE_ACCESS = "02";
+    //测试、校准或检定工作分包通知书
+    String OUTSOURCE_NOTICE = "03";
+    //测试、校准或检定工作分包方名录
+    String OUTSOURCE_INFO = "04";
+
 }
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
index 24b8635..f78bd53 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
@@ -15,6 +15,10 @@
     String CERTIFICATE_CHANGE_APPLY_BEAN_NAME = "certificateChangeApplyBean";
     //现场测试、校准或检定
     String SITE_EXECUTIVE_BEAN_NAME = "siteExecutiveBean";
+    //测试、校准或检定工作分包评审表
+    String OUTSOURCE_ASSESS_BEAN_NAME = "outsourceAssessBean";
+    //测试、校准或检定工作分包协议书
+    String OUTSOURCE_PROTOCOL_BEAN_NAME = "outsourceProtocolBean";
 
     /*********************************设备与装置************************************/
     //设备台账
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 b21c661..6b86fd1 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
@@ -18,6 +18,8 @@
     OUTSOURCER_APPROVAL(OUTSOURCER_BEAN_NAME, ""),
     CERTIFICATE_CHANGE_APPROVAL(CERTIFICATE_CHANGE_APPLY_BEAN_NAME, ""),
     SITE_EXECUTIVE_APPROVAL(SITE_EXECUTIVE_BEAN_NAME, ""),
+    OUTSOURCE_ASSESS_APPROVAL(OUTSOURCE_ASSESS_BEAN_NAME, ""),
+    OUTSOURCE_PROTOCOL_APPROVAL(OUTSOURCE_PROTOCOL_BEAN_NAME, ""),
 
     ACTION_STATUS_MAP(new HashMap<String, AwareActionStatusEnum>() {
         {
@@ -47,6 +49,10 @@
             put(ApplyFromIdEnum.CERTIFICATE_CHANGE_APPROVAL.getCode(), CERTIFICATE_CHANGE_APPROVAL);
             //现场测试、校准或检定审批
             put(ApplyFromIdEnum.SITE_EXECUTIVE_APPROVAL.getCode(), SITE_EXECUTIVE_APPROVAL);
+            //测试、校准或检定工作分包评审表
+            put(ApplyFromIdEnum.OUTSOURCE_ASSESS_APPROVAL.getCode(), OUTSOURCE_ASSESS_APPROVAL);
+            //测试、校准或检定工作分包协议书
+            put(ApplyFromIdEnum.OUTSOURCE_PROTOCOL_APPROVAL.getCode(), OUTSOURCE_PROTOCOL_APPROVAL);
         }
     });
     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 934405e..c7410bd 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
@@ -9,6 +9,8 @@
     CERTIFICATE_CHANGE_APPROVAL("jljdywzsbchghsqd", MessageSourceModuleEnum.BUSINESS.getCode(), "证书/报告补充或更换申请单"),
     OUTSOURCER_APPROVAL("jljdywcsjzhgfbfml", MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定合格分包方名录"),
     SITE_EXECUTIVE_APPROVAL("jljdywxccsjzsp", MessageSourceModuleEnum.BUSINESS.getCode(), "现场测试、校准或检定审批"),
+    OUTSOURCE_ASSESS_APPROVAL("jljdywcsjzfbpsb", MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包评审表"),
+    OUTSOURCE_PROTOCOL_APPROVAL("jljdywcsjzfbxys", MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包协议书"),
 
 
     /*******************************************设备与装置*********************************************/
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/GeneralApprovalMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/GeneralApprovalMapper.java
index 4fb7344..0c9d6ae 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/GeneralApprovalMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/GeneralApprovalMapper.java
@@ -17,8 +17,4 @@
 
     Page<O> selectBatchForApprovalList(Page<O> page, @Param("request") R request, @Param("businessKeys") List<String> businessKeys);
 
-//    Page<O> selectListPage(Page<O> page, @Param("request") R request);
-
-//    Long selectMaxNo();
-
 }
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceAssessMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceAssessMapper.java
index 7867bb8..ba59009 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceAssessMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceAssessMapper.java
@@ -1,7 +1,12 @@
 package com.casic.missiles.mapper.business;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.business.outsource.OutsourceAssessApprovalListRequest;
+import com.casic.missiles.mapper.GeneralApprovalMapper;
 import com.casic.missiles.model.business.BizBusinessOutsourceAssess;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * <p>
@@ -11,6 +16,10 @@
  * @author wangpeng
  * @since 2023-08-16
  */
-public interface BizBusinessOutsourceAssessMapper extends BaseMapper<BizBusinessOutsourceAssess> {
+public interface BizBusinessOutsourceAssessMapper extends GeneralApprovalMapper<BizBusinessOutsourceAssess, BizBusinessOutsourceAssess, OutsourceAssessApprovalListRequest> {
+
+    Page<BizBusinessOutsourceAssess> selectBatchForApprovalList(Page<BizBusinessOutsourceAssess> page, @Param("request") OutsourceAssessApprovalListRequest request, @Param("businessKeys") List<String> businessKeys);
+
+    Long selectMaxProjectNo();
 
 }
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceProtocolMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceProtocolMapper.java
new file mode 100644
index 0000000..e6aba35
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceProtocolMapper.java
@@ -0,0 +1,24 @@
+package com.casic.missiles.mapper.business;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.business.outsource.OutsourceProtocolApprovalListRequest;
+import com.casic.missiles.mapper.GeneralApprovalMapper;
+import com.casic.missiles.model.business.BizBusinessOutsourceProtocol;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 计量检定业务-分包管理-测试、校准或检定工作分包协议书 Mapper 接口
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-08-24
+ */
+public interface BizBusinessOutsourceProtocolMapper extends GeneralApprovalMapper<BizBusinessOutsourceProtocol, BizBusinessOutsourceProtocol, OutsourceProtocolApprovalListRequest> {
+
+    Page<BizBusinessOutsourceProtocol> selectBatchForApprovalList(Page<BizBusinessOutsourceProtocol> page, @Param("request") OutsourceProtocolApprovalListRequest request, @Param("businessKeys") List<String> businessKeys);
+
+    Long selectMaxProtocolNo();
+}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/EnvLocationInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/EnvLocationInfoMapper.java
new file mode 100644
index 0000000..49eff87
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/EnvLocationInfoMapper.java
@@ -0,0 +1,21 @@
+package com.casic.missiles.mapper.resource;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.resource.environment.LocationListRequest;
+import com.casic.missiles.dto.resource.environment.LocationListResponse;
+import com.casic.missiles.model.resource.EnvLocationInfo;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * <p>
+ * 实验室环境监控系统-设备表 Mapper 接口
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-06-07
+ */
+public interface EnvLocationInfoMapper extends BaseMapper<EnvLocationInfo> {
+
+    Page<LocationListResponse> selectLocationListPage(Page<LocationListResponse> page, @Param("request") LocationListRequest request);
+}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java
index de124db..85ed0f7 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java
@@ -1,7 +1,9 @@
 package com.casic.missiles.mapper.system;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.dto.system.SignDetailResponse;
+import com.casic.missiles.dto.system.SignListRequest;
 import com.casic.missiles.model.system.SystemSign;
 import org.apache.ibatis.annotations.Param;
 
@@ -22,4 +24,8 @@
     SignDetailResponse selectSignDetailById(Long id);
 
     List<SystemSign> selectUsableSignList(@Param("userId") Long userId);
+
+    Page<SystemSign> selectSignListPage(Page<SystemSign> page, @Param("request") SignListRequest request);
+
+    List<SystemSign> selectSignList(@Param("request") SignListRequest request);
 }
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateChangeApplyMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateChangeApplyMapper.xml
index d798447..c496092 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateChangeApplyMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateChangeApplyMapper.xml
@@ -30,31 +30,31 @@
         SELECT *
         FROM biz_business_certificate_change_apply
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.changeApplyNo != null and request.changeApplyNo !=''">
+        <if test="request != null and request.changeApplyNo != null and request.changeApplyNo !=''">
             and change_apply_no like concat('%',#{request.changeApplyNo},'%')
         </if>
-        <if test="request.changeReportNo != null and request.changeReportNo !=''">
+        <if test="request != null and request.changeReportNo != null and request.changeReportNo !=''">
             and change_report_no like concat('%',#{request.changeReportNo},'%')
         </if>
-        <if test="request.changeReportName != null and request.changeReportName !=''">
+        <if test="request != null and request.changeReportName != null and request.changeReportName !=''">
             and change_report_name like concat('%',#{request.changeReportName},'%')
         </if>
-        <if test="request.changeType != null and request.changeType !=''">
+        <if test="request != null and request.changeType != null and request.changeType !=''">
             and change_type = #{request.changeType}
         </if>
-        <if test="request.createUserName != null and request.createUserName !=''">
+        <if test="request != null and request.createUserName != null and request.createUserName !=''">
             and create_user_name like concat('%',#{request.createUserName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificatePrintMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificatePrintMapper.xml
index b66cd99..49c0ac8 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificatePrintMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificatePrintMapper.xml
@@ -31,34 +31,34 @@
         LEFT JOIN biz_business_order_sample_relation bosr ON (bosr.order_id = bcr.order_id AND bosr.sample_id = bcr.sample_id)
         LEFT JOIN biz_business_order_info boi ON boi.id = bosr.order_id
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and bcp.approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.printStatus != null and request.printStatus !=''">
+        <if test="request != null and request.printStatus != null and request.printStatus !=''">
             and print_status = #{request.printStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and bcp.create_user_id = #{request.createUserId}
         </if>
-        <if test="request.certificateReportNo != null and request.certificateReportNo !=''">
+        <if test="request != null and request.certificateReportNo != null and request.certificateReportNo !=''">
             and bcr.certificate_report_no like concat('%',#{request.certificateReportNo},'%')
         </if>
-        <if test="request.certificateReportName != null and request.certificateReportName !=''">
+        <if test="request != null and request.certificateReportName != null and request.certificateReportName !=''">
             and bcr.certificate_report_name like concat('%',#{request.certificateReportName},'%')
         </if>
-        <if test="request.customerName != null and request.customerName !=''">
+        <if test="request != null and request.customerName != null and request.customerName !=''">
             and boi.customer_name like concat('%',#{request.customerName},'%')
         </if>
-        <if test="request.sampleNo != null and request.sampleNo !=''">
+        <if test="request != null and request.sampleNo != null and request.sampleNo !=''">
             and bosr.sample_no like concat('%',#{request.sampleNo},'%')
         </if>
-        <if test="request.sampleName != null and request.sampleName !=''">
+        <if test="request != null and request.sampleName != null and request.sampleName !=''">
             and bosr.sample_name like concat('%',#{request.sampleName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and bcp.create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and bcp.create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml
index b366034..767695d 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml
@@ -46,33 +46,37 @@
         SELECT bcr.*, bosr.sample_no, bosr.sample_name, bosr.sample_model, rsi.staff_name
         FROM biz_business_certificate_report bcr
         LEFT JOIN biz_business_order_sample_relation bosr ON (bosr.order_id = bcr.order_id AND bosr.sample_id = bcr.sample_id)
+        LEFT JOIN biz_business_order_info boi ON boi.id = bcr.order_id
         LEFT JOIN biz_resource_staff_info rsi ON rsi.id = bcr.measure_person_id
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and bcr.approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and bcr.create_user_id = #{request.createUserId}
         </if>
-        <if test="request.certificateReportNo != null and request.certificateReportNo !=''">
+        <if test="request != null and request.customerId != null and request.customerId !=''">
+            and boi.customer_id = #{request.customerId}
+        </if>
+        <if test="request != null and request.certificateReportNo != null and request.certificateReportNo !=''">
             and bcr.certificate_report_no like concat('%',#{request.certificateReportNo},'%')
         </if>
-        <if test="request.certificateReportName != null and request.certificateReportName !=''">
+        <if test="request != null and request.certificateReportName != null and request.certificateReportName !=''">
             and bcr.certificate_report_name like concat('%',#{request.certificateReportName},'%')
         </if>
-        <if test="request.sampleNo != null and request.sampleNo !=''">
+        <if test="request != null and request.sampleNo != null and request.sampleNo !=''">
             and bosr.sample_no like concat('%',#{request.sampleNo},'%')
         </if>
-        <if test="request.measureCategory != null and request.measureCategory !=''">
+        <if test="request != null and request.measureCategory != null and request.measureCategory !=''">
             and bcr.measure_category = #{request.measureCategory}
         </if>
-        <if test="request.measurePerson != null and request.measurePerson !=''">
+        <if test="request != null and request.measurePerson != null and request.measurePerson !=''">
             and rsi.staff_name like concat('%',#{request.measurePerson},'%')
         </if>
-        <if test="request.calibrationTimeStart != null and request.calibrationTimeStart !=''">
+        <if test="request != null and request.calibrationTimeStart != null and request.calibrationTimeStart !=''">
             and bcr.calibration_time &gt;= #{request.calibrationTimeStart}
         </if>
-        <if test="request.calibrationTimeEnd != null and request.calibrationTimeEnd !=''">
+        <if test="request != null and request.calibrationTimeEnd != null and request.calibrationTimeEnd !=''">
             and bcr.calibration_time &lt;= #{request.calibrationTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceAssessMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceAssessMapper.xml
index d0fcf8b..c22c101 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceAssessMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceAssessMapper.xml
@@ -7,6 +7,8 @@
         <id column="id" property="id" />
         <result column="project_no" property="projectNo" />
         <result column="project_name" property="projectName" />
+        <result column="lab_code" property="labCode" />
+        <result column="group_code" property="groupCode" />
         <result column="applicant_id" property="applicantId" />
         <result column="applicant_name" property="applicantName" />
         <result column="applicant_time" property="applicantTime" />
@@ -31,7 +33,45 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, project_no, project_name, applicant_id, applicant_name, applicant_time, minio_file_name, remark, create_user_id, create_user_name, outsourcer_id, pre_start_time, pre_end_time, outsource_reason, pre_cost, approval_status, process_id, approve_situation, traceability, test_method, technique_ability, create_time, update_time
+        id, project_no, project_name, lab_code, group_code, applicant_id, applicant_name, applicant_time, minio_file_name, remark, create_user_id, create_user_name, outsourcer_id, pre_start_time, pre_end_time, outsource_reason, pre_cost, approval_status, process_id, approve_situation, traceability, test_method, technique_ability, create_time, update_time
     </sql>
 
+    <select id="selectMaxProjectNo" resultType="java.lang.Long">
+        SELECT IFNULL(max(RIGHT(project_no, 3)), 0) from biz_business_outsource_assess
+    </select>
+
+    <select id="selectBatchForApprovalList" resultMap="BaseResultMap">
+        SELECT bboa.*, bboi.outsourcer_name, bboi.director
+        FROM biz_business_outsource_assess bboa
+        LEFT JOIN biz_business_outsourcer_info bboi ON bboa.outsourcer_id = bboi.id
+        WHERE 1=1
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
+            and bboa.approval_status = #{request.approvalStatus}
+        </if>
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
+            and bboa.create_user_id = #{request.createUserId}
+        </if>
+        <if test="request != null and request.projectNo != null and request.projectNo !=''">
+            and bboa.project_no like concat('%',#{request.projectNo},'%')
+        </if>
+        <if test="request != null and request.outsourcerName != null and request.outsourcerName !=''">
+            and bboi.outsourcer_name like concat('%',#{request.outsourcerName},'%')
+        </if>
+        <if test="request != null and request.applicantName != null and request.applicantName !=''">
+            and bboa.applicant_name like concat('%',#{request.applicantName},'%')
+        </if>
+        <if test="request != null and request.applicantTimeStart != null and request.applicantTimeStart !=''">
+            and bboa.applicant_time &gt;= #{request.applicantTimeStart}
+        </if>
+        <if test="request != null and request.applicantTimeEnd != null and request.applicantTimeEnd !=''">
+            and bboa.applicant_time &lt;= #{request.applicantTimeEnd}
+        </if>
+        <if test="businessKeys != null">
+            and bboa.id in
+            <foreach collection="businessKeys" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
+        ORDER BY bboa.create_time DESC
+    </select>
 </mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceProtocolMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceProtocolMapper.xml
new file mode 100644
index 0000000..b7b2149
--- /dev/null
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceProtocolMapper.xml
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.mapper.business.BizBusinessOutsourceProtocolMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.business.BizBusinessOutsourceProtocol">
+        <id column="id" property="id" />
+        <result column="protocol_no" property="protocolNo" />
+        <result column="project_name" property="projectName" />
+        <result column="lab_code" property="labCode" />
+        <result column="group_code" property="groupCode" />
+        <result column="outsourcer_id" property="outsourcerId" />
+        <result column="remark" property="remark" />
+        <result column="outsource_no" property="outsourceNo" />
+        <result column="outsource_name" property="outsourceName" />
+        <result column="contacts" property="contacts" />
+        <result column="mobile" property="mobile" />
+        <result column="address" property="address" />
+        <result column="require_date" property="requireDate" />
+        <result column="outsource_cost" property="outsourceCost" />
+        <result column="director" property="director" />
+        <result column="item" property="item" />
+        <result column="requires" property="requires" />
+        <result column="create_user_id" property="createUserId" />
+        <result column="create_user_name" property="createUserName" />
+        <result column="approval_status" property="approvalStatus" />
+        <result column="process_id" property="processId" />
+        <result column="create_time" property="createTime" />
+        <result column="update_time" property="updateTime" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, protocol_no, project_name, lab_code, group_code, outsourcer_id, remark, outsource_no, outsource_name, contacts, mobile, address, require_date, outsource_cost, director, item, requires, create_user_id, create_user_name, approval_status, process_id, create_time, update_time
+    </sql>
+
+    <select id="selectMaxProtocolNo" resultType="java.lang.Long">
+        SELECT IFNULL(max(RIGHT(protocol_no, 3)), 0) from biz_business_outsource_protocol
+    </select>
+
+    <select id="selectBatchForApprovalList" resultMap="BaseResultMap">
+        SELECT *
+        FROM biz_business_outsource_protocol
+        WHERE 1=1
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
+            and approval_status = #{request.approvalStatus}
+        </if>
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
+            and create_user_id = #{request.createUserId}
+        </if>
+        <if test="request != null and request.protocolNo != null and request.protocolNo !=''">
+            and protocol_no like concat('%',#{request.protocolNo},'%')
+        </if>
+        <if test="request != null and request.outsourcerName != null and request.outsourcerName !=''">
+            and outsourcer_name like concat('%',#{request.outsourcerName},'%')
+        </if>
+        <if test="request != null and request.applicantName != null and request.applicantName !=''">
+            and create_user_name like concat('%',#{request.applicantName},'%')
+        </if>
+        <if test="request != null and request.applicantTimeStart != null and request.applicantTimeStart !=''">
+            and create_time &gt;= #{request.applicantTimeStart}
+        </if>
+        <if test="request != null and request.applicantTimeEnd != null and request.applicantTimeEnd !=''">
+            and create_time &lt;= #{request.applicantTimeEnd}
+        </if>
+        <if test="businessKeys != null">
+            and id in
+            <foreach collection="businessKeys" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
+        ORDER BY create_time DESC
+    </select>
+</mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourcerInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourcerInfoMapper.xml
index 510a80b..3049b54 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourcerInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourcerInfoMapper.xml
@@ -7,6 +7,8 @@
         <id column="id" property="id" />
         <result column="outsourcer_no" property="outsourcerNo" />
         <result column="outsourcer_name" property="outsourcerName" />
+        <result column="lab_code" property="labCode" />
+        <result column="group_code" property="groupCode" />
         <result column="outsourcer_brief_name" property="outsourcerBriefName" />
         <result column="outsourcer_size" property="outsourcerSize" />
         <result column="business_size" property="businessSize" />
@@ -55,32 +57,32 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, outsourcer_no, outsourcer_name, outsourcer_brief_name, outsourcer_size, business_size, grade, evaluation, tax_number, bank_account, bank_name, bank_account_number, postal_code, director, phone, fax, mobile, email, website, address_country, address_province, address_city, address_area, full_address, address_country_name, address_province_name, address_city_name, address_area_name, invoice_country, invoice_province, invoice_city, invoice_area, invoice_full_address, invoice_country_name, invoice_province_name, invoice_city_name, invoice_area_name, business_scope, business_content, minio_file_name, approval_status, process_id, remark, create_user_id, create_user_name, create_time, update_time
+        id, outsourcer_no, outsourcer_name, lab_code, group_code, outsourcer_brief_name, outsourcer_size, business_size, grade, evaluation, tax_number, bank_account, bank_name, bank_account_number, postal_code, director, phone, fax, mobile, email, website, address_country, address_province, address_city, address_area, full_address, address_country_name, address_province_name, address_city_name, address_area_name, invoice_country, invoice_province, invoice_city, invoice_area, invoice_full_address, invoice_country_name, invoice_province_name, invoice_city_name, invoice_area_name, business_scope, business_content, minio_file_name, approval_status, process_id, remark, create_user_id, create_user_name, create_time, update_time
     </sql>
 
     <select id="selectBatchForApprovalList" resultMap="BaseResultMap">
         SELECT *
         FROM biz_business_outsourcer_info
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.outsourcerNo != null and request.outsourcerNo !=''">
+        <if test="request != null and request.outsourcerNo != null and request.outsourcerNo !=''">
             and outsourcer_no like concat('%',#{request.outsourcerNo},'%')
         </if>
-        <if test="request.outsourcerName != null and request.outsourcerName !=''">
+        <if test="request != null and request.outsourcerName != null and request.outsourcerName !=''">
             and outsourcer_name like concat('%',#{request.outsourcerName},'%')
         </if>
-        <if test="request.director != null and request.director !=''">
+        <if test="request != null and request.director != null and request.director !=''">
             and director like concat('%',#{request.director},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
@@ -93,6 +95,6 @@
     </select>
 
     <select id="selectMaxNo" resultType="java.lang.Long">
-        SELECT IFNULL(max(RIGHT(outsourcer_no, 12)), 0) from biz_business_outsourcer_info
+        SELECT IFNULL(max(RIGHT(outsourcer_no, 3)), 0) from biz_business_outsourcer_info
     </select>
 </mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessSiteExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessSiteExecutiveInfoMapper.xml
index 135c5d0..3c5ae79 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessSiteExecutiveInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessSiteExecutiveInfoMapper.xml
@@ -38,25 +38,25 @@
         FROM biz_business_site_executive_info bsei
         LEFT JOIN biz_resource_customer_info rci ON bsei.customer_id = rci.id
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and bsei.approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and bsei.create_user_id = #{request.createUserId}
         </if>
-        <if test="request.siteExecutiveNo != null and request.siteExecutiveNo !=''">
+        <if test="request != null and request.siteExecutiveNo != null and request.siteExecutiveNo !=''">
             and bsei.site_executive_no like concat('%',#{request.siteExecutiveNo},'%')
         </if>
-        <if test="request.customerName != null and request.customerName !=''">
+        <if test="request != null and request.customerName != null and request.customerName !=''">
             and rci.outsourcer_name like concat('%',#{request.customerName},'%')
         </if>
-        <if test="request.applyName != null and request.applyName !=''">
+        <if test="request != null and request.applyName != null and request.applyName !=''">
             and bsei.apply_name like concat('%',#{request.applyName},'%')
         </if>
-        <if test="request.applyTimeStart != null and request.applyTimeStart !=''">
+        <if test="request != null and request.applyTimeStart != null and request.applyTimeStart !=''">
             and bsei.apply_time &gt;= #{request.applyTimeStart}
         </if>
-        <if test="request.applyTimeEnd != null and request.applyTimeEnd !=''">
+        <if test="request != null and request.applyTimeEnd != null and request.applyTimeEnd !=''">
             and bsei.apply_time &lt;= #{request.applyTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml
index 84d9e2a..6bd38a9 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml
@@ -105,6 +105,12 @@
         <if test="request.isUrgent != null and request.isUrgent !=''">
             AND bo.is_urgent = #{request.isUrgent}
         </if>
+        <if test="request.ids != null">
+            and blei.id in
+            <foreach collection="request.ids" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
         ORDER BY blei.update_time DESC
     </select>
 
@@ -137,6 +143,12 @@
         <if test="request.isUrgent != null and request.isUrgent !=''">
             AND bo.is_urgent = #{request.isUrgent}
         </if>
+        <if test="request.ids != null">
+            and blei.id in
+            <foreach collection="request.ids" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
         ORDER BY blei.update_time DESC
     </select>
 
diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardInfoMapper.xml
index 1a5551b..2ed8d17 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardInfoMapper.xml
@@ -45,12 +45,6 @@
         FROM biz_equipment_standard_info besi
         LEFT JOIN biz_equipment_standard_technology_relation bestr ON besi.standard_no = bestr.standard_no
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
-            and besi.approval_status = #{request.approvalStatus}
-        </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
-            and besi.create_user_id = #{request.createUserId}
-        </if>
         <if test="request.standardName != null and request.standardName !=''">
             and besi.standard_name like concat('%',#{request.standardName},'%')
         </if>
diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardTechnologyRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardTechnologyRelationMapper.xml
index fc7e16c..cd03c8c 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardTechnologyRelationMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardTechnologyRelationMapper.xml
@@ -6,6 +6,7 @@
     <resultMap id="BaseResultMap" type="com.casic.missiles.model.equipment.BizEquipmentStandardTechnologyRelation">
         <id column="id" property="id" />
         <result column="technology_file_id" property="technologyFileId" />
+        <result column="technology_file_no" property="technologyFileNo" />
         <result column="technology_file_name" property="technologyFileName" />
         <result column="standard_id" property="standardId" />
         <result column="standard_no" property="standardNo" />
@@ -14,7 +15,7 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, technology_file_id, technology_file_name, standard_id, remark
+        id, technology_file_id, technology_file_no, technology_file_name, standard_id, remark
     </sql>
 
 </mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceAuthorizeOrderMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceAuthorizeOrderMapper.xml
index ac5176c..554fe65 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceAuthorizeOrderMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceAuthorizeOrderMapper.xml
@@ -32,22 +32,22 @@
         SELECT *
         FROM biz_resource_authorize_order
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.orderNo != null and request.orderNo !=''">
+        <if test="request != null and request.orderNo != null and request.orderNo !=''">
             and order_no like concat('%',#{request.orderNo},'%')
         </if>
-        <if test="request.createUserName != null and request.createUserName !=''">
+        <if test="request != null and request.createUserName != null and request.createUserName !=''">
             and create_user_name like concat('%',#{request.createUserName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerExamineFormMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerExamineFormMapper.xml
index ab242f6..af7f98f 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerExamineFormMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerExamineFormMapper.xml
@@ -41,28 +41,28 @@
         SELECT *
         FROM biz_resource_customer_examine_form
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.formNo != null and request.formNo !=''">
+        <if test="request != null and request.formNo != null and request.formNo !=''">
             and form_no like concat('%',#{request.formNo},'%')
         </if>
-        <if test="request.labCode != null and request.labCode !=''">
+        <if test="request != null and request.labCode != null and request.labCode !=''">
             and lab_code like concat('%',#{request.labCode},'%')
         </if>
-        <if test="request.groupCode != null and request.groupCode !=''">
+        <if test="request != null and request.groupCode != null and request.groupCode !=''">
             and group_code like concat('%',#{request.groupCode},'%')
         </if>
-        <if test="request.createUserName != null and request.createUserName !=''">
+        <if test="request != null and request.createUserName != null and request.createUserName !=''">
             and create_user_name like concat('%',#{request.createUserName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerInfoMapper.xml
index fa8ffbc..06a2798 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerInfoMapper.xml
@@ -33,25 +33,25 @@
         SELECT *
         FROM biz_resource_customer_info
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.customerNo != null and request.customerNo !=''">
+        <if test="request != null and request.customerNo != null and request.customerNo !=''">
             and customer_no like concat('%',#{request.customerNo},'%')
         </if>
-        <if test="request.customerName != null and request.customerName !=''">
+        <if test="request != null and request.customerName != null and request.customerName !=''">
             and customer_name like concat('%',#{request.customerName},'%')
         </if>
-        <if test="request.contacts != null and request.contacts !=''">
+        <if test="request != null and request.contacts != null and request.contacts !=''">
             and contacts like concat('%',#{request.contacts},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerSuggestFormMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerSuggestFormMapper.xml
index 28f5bb2..1806662 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerSuggestFormMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerSuggestFormMapper.xml
@@ -33,28 +33,28 @@
         SELECT *
         FROM biz_resource_customer_suggest_form
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.formNo != null and request.formNo !=''">
+        <if test="request != null and request.formNo != null and request.formNo !=''">
             and form_no like concat('%',#{request.formNo},'%')
         </if>
-        <if test="request.customerName != null and request.customerName !=''">
+        <if test="request != null and request.customerName != null and request.customerName !=''">
             and customer_name like concat('%',#{request.customerName},'%')
         </if>
-        <if test="request.customerDeptName != null and request.customerDeptName !=''">
+        <if test="request != null and request.customerDeptName != null and request.customerDeptName !=''">
             and customer_dept_name like concat('%',#{request.customerDeptName},'%')
         </if>
-        <if test="request.createUserName != null and request.createUserName !=''">
+        <if test="request != null and request.createUserName != null and request.createUserName !=''">
             and create_user_name like concat('%',#{request.createUserName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSealUseNoteMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSealUseNoteMapper.xml
index ab37bc1..b02bb33 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSealUseNoteMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSealUseNoteMapper.xml
@@ -29,32 +29,32 @@
     </sql>
 
     <select id="selectBatchForApprovalList" resultMap="BaseResultMap">
-        SELECT *
+        SELECT brsun.*, brsi.seal_name, brsi.seal_type, brsi.approver_name
         FROM biz_resource_seal_use_note brsun
         JOIN biz_resource_seal_info brsi ON brsun.seal_id = brsi.id
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and brsun.approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and brsun.create_user_id = #{request.createUserId}
         </if>
-        <if test="request.sealName != null and request.sealName !=''">
+        <if test="request != null and request.sealName != null and request.sealName !=''">
             and brsi.seal_name like concat('%',#{request.sealName},'%')
         </if>
-        <if test="request.sealType != null and request.sealType !=''">
+        <if test="request != null and request.sealType != null and request.sealType !=''">
             and brsi.seal_type = #{request.sealType}
         </if>
-        <if test="request.applyDeptName != null and request.applyDeptName !=''">
+        <if test="request != null and request.applyDeptName != null and request.applyDeptName !=''">
             and brsun.apply_dept_name like concat('%',#{request.applyDeptName},'%')
         </if>
-        <if test="request.applyUserName != null and request.applyUserName !=''">
+        <if test="request != null and request.applyUserName != null and request.applyUserName !=''">
             and brsun.apply_user_name like concat('%',#{request.applyUserName},'%')
         </if>
-        <if test="request.applyTimeStart != null and request.applyTimeStart !=''">
+        <if test="request != null and request.applyTimeStart != null and request.applyTimeStart !=''">
             and brsun.apply_time &gt;= #{request.applyTimeStart}
         </if>
-        <if test="request.applyTimeEnd != null and request.applyTimeEnd !=''">
+        <if test="request != null and request.applyTimeEnd != null and request.applyTimeEnd !=''">
             and brsun.apply_time &lt;= #{request.applyTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml
index 119bf7d..4f8392a 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml
@@ -31,6 +31,12 @@
         <if test="request.deptName != null and request.deptName !=''">
             and brsi.dept_name like concat('%',#{request.deptName},'%')
         </if>
+        <if test="request.ids != null">
+            and brsv.id in
+            <foreach collection="request.ids" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
         ORDER BY brsv.grant_date DESC
     </select>
 
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSupplierInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSupplierInfoMapper.xml
index fe8d399..e8ce7ef 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSupplierInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSupplierInfoMapper.xml
@@ -48,28 +48,28 @@
         SELECT *
         FROM biz_resource_supplier_info
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.supplierNo != null and request.supplierNo !=''">
+        <if test="request != null and request.supplierNo != null and request.supplierNo !=''">
             and supplier_no like concat('%',#{request.supplierNo},'%')
         </if>
-        <if test="request.supplierName != null and request.supplierName !=''">
+        <if test="request != null and request.supplierName != null and request.supplierName !=''">
             and supplier_name like concat('%',#{request.supplierName},'%')
         </if>
-        <if test="request.director != null and request.director !=''">
+        <if test="request != null and request.director != null and request.director !=''">
             and director like concat('%',#{request.director},'%')
         </if>
-        <if test="request.supplierType != null and request.supplierType !=''">
+        <if test="request != null and request.supplierType != null and request.supplierType !=''">
             and supplier_type = #{request.supplierType}
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java
index bb0c50f..13a699b 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java
@@ -12,6 +12,7 @@
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.IGeneralApprovalService;
+import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
@@ -19,6 +20,7 @@
 import org.springframework.web.bind.annotation.RequestBody;
 
 import javax.validation.Valid;
+import java.util.List;
 import java.util.Objects;
 
 /**
@@ -117,4 +119,17 @@
         }
         return baseApprovalService.failUpdate(request);
     }
+
+    public List<O> exportList(@RequestBody @Valid R request) throws Exception {
+        List<O> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = baseApprovalService.listExportByIds(request.getIds());
+        } else {
+            list = baseApprovalService.listExport(request);
+        }
+        for (O record : list) {
+            DictCodeUtils.convertDictCodeToName(record);
+        }
+        return list;
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java
index 8a90961..d775831 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java
@@ -5,6 +5,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.business.certificate.CertificateChangeApplyApprovalListRequest;
 import com.casic.missiles.dto.business.certificate.CertificateChangeApplySaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessCertificateChangeApply;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
@@ -20,6 +21,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -48,4 +50,12 @@
         }
         return changeApplyService.saveChangeApply(request);
     }
+
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody CertificateChangeApplyApprovalListRequest request) throws Exception {
+        List<BizBusinessCertificateChangeApply> list = super.exportList(request);
+        super.exportExcel(BizBusinessCertificateChangeApply.class, list, ExportEnum.CERTIFICATE_CHANGE_APPLY.getSheetName());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java
index 5fc4b07..af8230e 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java
@@ -9,6 +9,7 @@
 import com.casic.missiles.dto.business.certificate.CertificatePrintApprovalListRequest;
 import com.casic.missiles.dto.business.certificate.CertificatePrintListResponse;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.enums.business.CertificatePrintStatusEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessCertificatePrintLog;
@@ -18,10 +19,16 @@
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.io.IOException;
+import java.util.List;
 import java.util.Objects;
 
 /**
@@ -98,4 +105,16 @@
         });
         return certificatePrintService.certificatePrintLog(idDTO.getId());
     }
+
+    @ApiOperation("证书打印审批导出")
+    @PostMapping("/listExport")
+    public void exportList(@RequestBody CertificatePrintApprovalListRequest request) throws IOException {
+        List<CertificatePrintListResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = certificatePrintService.listByIds(request.getIds());
+        } else {
+            list = certificatePrintService.list(request);
+        }
+        super.exportExcel(CertificatePrintListResponse.class, list, ExportEnum.CERTIFICATE_PRINT.getSheetName());
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java
index 63b06dc..6b2efd5 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java
@@ -6,6 +6,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.business.certificate.CertificateReportApprovalListRequest;
 import com.casic.missiles.dto.business.certificate.CertificateReportSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessCertificateReport;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
@@ -21,6 +22,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -50,7 +52,7 @@
         return certificateReportService.saveCertificateReport(request);
     }
 
-    @ApiOperation("证书审批详情（基本信息）")
+    @ApiOperation("详情（基本信息）")
     @PostMapping("/detail")
     public ReturnDTO<BizBusinessCertificateReport> detail(@RequestBody @Valid BaseDetailRequest request, BindingResult bindingResult) throws Exception {
         if(bindingResult.hasErrors()){
@@ -59,4 +61,11 @@
         return certificateReportService.detail(request);
     }
 
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody CertificateReportApprovalListRequest request) throws Exception {
+        List<BizBusinessCertificateReport> list = super.exportList(request);
+        super.exportExcel(BizBusinessCertificateReport.class, list, ExportEnum.CERTIFICATE_REPORT.getSheetName());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java
index 46b26bd..57c0809 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java
@@ -10,20 +10,21 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.business.identify.IdentifyListRequest;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessIdentifyInfo;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.business.IBizBusinessIdentifyInfoService;
+import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import javax.validation.Valid;
+import java.util.List;
 import java.util.Objects;
 
 /**
@@ -57,16 +58,13 @@
         return identifyInfoService.addIdentify(identifyInfo);
     }
 
-    @ApiOperation("标识打印更新")
+    @ApiOperation("标识打印更新（更新打印时间）")
     @PostMapping("/update")
-    public ReturnDTO updateIdentify(@RequestBody @Valid BizBusinessIdentifyInfo identifyInfo, BindingResult bindingResult) {
-        Assert.isFalse(Objects.isNull(identifyInfo.getId()), () -> {
+    public ReturnDTO updateIdentify(@RequestBody @Valid IdDTO idDTO) {
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        Assert.isFalse(bindingResult.hasErrors(), () -> {
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        });
-        return identifyInfoService.updateIdentify(identifyInfo);
+        return identifyInfoService.updateIdentify(idDTO.getId());
     }
 
     @ApiOperation("标识打印删除")
@@ -77,4 +75,37 @@
         });
         return identifyInfoService.deleteIdentify(idDTO.getId());
     }
+
+    @ApiOperation("标识打印导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody @Valid IdentifyListRequest request, BindingResult bindingResult) throws Exception {
+        if (bindingResult.hasErrors()) {
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        List<BizBusinessIdentifyInfo> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = identifyInfoService.listByIds(request.getIds());
+        } else {
+            list = identifyInfoService.list(request);
+        }
+        for (BizBusinessIdentifyInfo record : list) {
+            DictCodeUtils.convertDictCodeToName(record);
+        }
+        super.exportExcel(BizBusinessIdentifyInfo.class, list, ExportEnum.IDENTIFY_EXPORT.getSheetName());
+    }
+
+
+    // TODO: 2023/8/23 查询设备信息，4个底部按钮查设备（按钮的作用就是前端用来调不同接口、用来区分中间即将展示的标识），前端弹窗选设备，在确定保存时前端根据底部按钮判断传入设备类型deviceType字典code
+    // TODO: 2023/8/23 接口：查受检设备（第1个按钮），查设备台账（后3个按钮同一接口），查询之后前端根据标志类型的不同加到中间页面时进行判断（按产品给的对应表）
+    // TODO: 2023/8/23 提供二维码接口，前端在加到中间页面时调用一下
+
+    @ApiOperation("设备二维码")
+    @PostMapping("/equipment/qrCode")
+    public ReturnDTO<String> equipmentQrCode(@RequestBody @Valid IdDTO idDTO) {
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return identifyInfoService.equipmentQrCode(idDTO.getId());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java
index 707be6e..7e0453d 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java
@@ -117,7 +117,7 @@
     }
 
     @ApiOperation("任务单导出")
-    @PostMapping("/export")
+    @PostMapping("/listExport")
     public void orderExport(@RequestBody @Valid OrderListRequest request, HttpServletResponse response) {
         businessOrderService.orderExport(request, response);
     }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java
index 529a6ce..51432be 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java
@@ -1,9 +1,28 @@
 package com.casic.missiles.controller.business;
 
+import com.casic.missiles.controller.GeneralApprovalController;
+import com.casic.missiles.dto.BaseApprovalSubmitRequest;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.business.outsource.OutsourceAssessApprovalListRequest;
+import com.casic.missiles.dto.business.outsource.OutsourceAssessSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
+import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.model.business.BizBusinessOutsourceAssess;
+import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
+import com.casic.missiles.service.IGeneralApprovalService;
+import com.casic.missiles.service.business.IBizBusinessOutsourceAssessService;
 import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.BindingResult;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.validation.Valid;
+import java.util.List;
+
 /**
  * <p>
  * 计量检定业务-分包管理-测试、校准或检定工作分包评审表 前端控制器
@@ -15,6 +34,27 @@
 @Api(tags = "分包管理-测试、校准或检定工作分包评审表")
 @RestController
 @RequestMapping("/business/outsource/assess")
-public class BizBusinessOutsourceAssessController {
+public class BizBusinessOutsourceAssessController extends GeneralApprovalController<BizBusinessOutsourceAssess, BizBusinessOutsourceAssess, OutsourceAssessApprovalListRequest, BaseApprovalSubmitRequest> {
+    @Autowired
+    private IBizBusinessOutsourceAssessService outsourceAssessService;
 
+    public BizBusinessOutsourceAssessController(IGeneralApprovalService<BizBusinessOutsourceAssess, BizBusinessOutsourceAssess, OutsourceAssessApprovalListRequest, BaseApprovalSubmitRequest> baseApprovalService) {
+        super(baseApprovalService);
+    }
+
+    @ApiOperation("草稿箱-保存")
+    @PostMapping("/save")
+    public ReturnDTO<OutsourceAssessSaveResponse> saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceAssess request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        return outsourceAssessService.saveOutsourceAssess(request);
+    }
+
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception {
+        List<BizBusinessOutsourceAssess> list = super.exportList(request);
+        super.exportExcel(BizBusinessOutsourceAssess.class, list, ExportEnum.OUTSOURCE_ASSESS.getSheetName());
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java
new file mode 100644
index 0000000..9adef18
--- /dev/null
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java
@@ -0,0 +1,60 @@
+package com.casic.missiles.controller.business;
+
+import com.casic.missiles.controller.GeneralApprovalController;
+import com.casic.missiles.dto.BaseApprovalSubmitRequest;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.business.outsource.OutsourceProtocolApprovalListRequest;
+import com.casic.missiles.dto.business.outsource.OutsourceProtocolSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
+import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.model.business.BizBusinessOutsourceProtocol;
+import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
+import com.casic.missiles.service.IGeneralApprovalService;
+import com.casic.missiles.service.business.IBizBusinessOutsourceProtocolService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.BindingResult;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.validation.Valid;
+import java.util.List;
+
+/**
+ * <p>
+ * 计量检定业务-分包管理-测试、校准或检定工作分包协议书 前端控制器
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-08-24
+ */
+@Api(tags = "分包管理-测试、校准或检定工作分包协议书")
+@RestController
+@RequestMapping("/business/outsource/protocol")
+public class BizBusinessOutsourceProtocolController extends GeneralApprovalController<BizBusinessOutsourceProtocol, BizBusinessOutsourceProtocol, OutsourceProtocolApprovalListRequest, BaseApprovalSubmitRequest> {
+    @Autowired
+    private IBizBusinessOutsourceProtocolService outsourceProtocolService;
+
+    public BizBusinessOutsourceProtocolController(IGeneralApprovalService<BizBusinessOutsourceProtocol, BizBusinessOutsourceProtocol, OutsourceProtocolApprovalListRequest, BaseApprovalSubmitRequest> baseApprovalService) {
+        super(baseApprovalService);
+    }
+
+    @ApiOperation("草稿箱-保存")
+    @PostMapping("/save")
+    public ReturnDTO<OutsourceProtocolSaveResponse> saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceProtocol request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        return outsourceProtocolService.saveOutsourceProtocol(request);
+    }
+
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody OutsourceProtocolApprovalListRequest request) throws Exception {
+        List<BizBusinessOutsourceProtocol> list = super.exportList(request);
+        super.exportExcel(BizBusinessOutsourceProtocol.class, list, ExportEnum.OUTSOURCE_PROTOCOL.getSheetName());
+    }
+}
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java
index 097f645..f0f0943 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java
@@ -17,7 +17,6 @@
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.IGeneralApprovalService;
 import com.casic.missiles.service.business.IBizBusinessOutsourcerInfoService;
-import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -71,19 +70,8 @@
 
     @ApiOperation("分包方导出")
     @PostMapping("/listExport")
-    public void export(@RequestBody @Valid OutsourcerInfoApprovalListRequest request, BindingResult bindingResult) throws Exception {
-        if (bindingResult.hasErrors()) {
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        }
-        List<BizBusinessOutsourcerInfo> list;
-        if (!CollectionUtils.isEmpty(request.getIds())) {
-            list = outsourcerInfoService.listByIds(request.getIds());
-        } else {
-            list = outsourcerInfoService.list(request);
-        }
-        for (BizBusinessOutsourcerInfo record : list) {
-            DictCodeUtils.convertDictCodeToName(record);
-        }
+    public void export(@RequestBody OutsourcerInfoApprovalListRequest request) throws Exception {
+        List<BizBusinessOutsourcerInfo> list = super.exportList(request);
         super.exportExcel(BizBusinessOutsourcerInfo.class, list, ExportEnum.OUTSOURCER_EXPORT.getSheetName());
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java
index c2cbf9f..0410918 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java
@@ -17,11 +17,9 @@
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.IGeneralApprovalService;
 import com.casic.missiles.service.business.IBizBusinessSiteExecutiveInfoService;
-import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -60,7 +58,7 @@
         return siteExecutiveInfoService.saveSiteExecutiveInfo(siteExecutiveInfo);
     }
 
-    @ApiOperation("现场检测详情")
+    @ApiOperation("详情")
     @PostMapping("/detail")
     public ReturnDTO<SiteExecutiveDetailResponse> siteExecutiveDetail(@RequestBody @Valid IdDTO idDTO) throws Exception {
         Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
@@ -69,21 +67,10 @@
         return ReturnUtil.success(siteExecutiveInfoService.detail(idDTO.getId()));
     }
 
-    @ApiOperation("现场检测导出")
+    @ApiOperation("导出")
     @PostMapping("/listExport")
-    public void export(@RequestBody @Valid SiteExecutiveApprovalListRequest request, BindingResult bindingResult) throws Exception {
-        if (bindingResult.hasErrors()) {
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        }
-        List<SiteExecutiveApprovalListResponse> list;
-        if (!CollectionUtils.isEmpty(request.getIds())) {
-            list = siteExecutiveInfoService.listInfoByIds(request.getIds());
-        } else {
-            list = siteExecutiveInfoService.listInfo(request);
-        }
-        for (SiteExecutiveApprovalListResponse record : list) {
-            DictCodeUtils.convertDictCodeToName(record);
-        }
+    public void export(@RequestBody SiteExecutiveApprovalListRequest request) throws Exception {
+        List<SiteExecutiveApprovalListResponse> list = super.exportList(request);
         super.exportExcel(SiteExecutiveApprovalListResponse.class, list, ExportEnum.SITE_EXECUTIVE_EXPORT.getSheetName());
     }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
index 7e793cd..a92e209 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
@@ -55,7 +55,7 @@
 
     @ApiOperation("设备收发列表导出")
     @PostMapping("/export")
-    public void exportList(@RequestBody @Valid SampleDispatchListRequest request) throws IOException {
+    public void exportList(@RequestBody SampleDispatchListRequest request) throws IOException {
         List<SampleDispatchListResponse> list;
         if (!CollectionUtils.isEmpty(request.getIds())) {
             list = dispatchService.listByIds(request.getIds());
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java
index cdc77fc..d120fd4 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java
@@ -7,6 +7,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.business.labExecutive.*;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.business.IBusinessLabExecutiveInfoService;
@@ -14,6 +15,7 @@
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.*;
 
@@ -32,7 +34,7 @@
     @Autowired
     private IBusinessLabExecutiveInfoService labExecutiveInfoService;
 
-    @ApiOperation("实验室检测-部门检测-查询各状态列表（待检测、检测中、检测完）")
+    @ApiOperation("实验室任务-查询各状态列表（待检测、检测中、检测完）")
     @PostMapping("/deptExecutive/List")
     public ReturnDTO<PageInfoBT<SampleLabExecutiveListResponse>> queryDeptExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
@@ -43,10 +45,19 @@
         return ReturnUtil.success(super.packForBT(labExecutiveInfoService.deptLabExecutiveListPage(page, labExecutiveListRequest)));
     }
 
-    /**
-     * 实验室检测-我的检测-查询各状态列表（待检测、检测中、检测完）
-     */
-    @ApiOperation("实验室检测-我的检测-查询各状态列表（待检测、检测中、检测完）")
+    @ApiOperation("实验室任务导出")
+    @PostMapping("/deptExecutive/export")
+    public void deptExportList(@RequestBody @Valid SampleLabExecutiveListRequest request) throws Exception {
+        List<SampleLabExecutiveListResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = labExecutiveInfoService.deptLabExecutiveListByIds(request.getMeasureStatus(), request.getIds());
+        } else {
+            list = labExecutiveInfoService.deptLabExecutiveList(request);
+        }
+        super.exportExcel(SampleLabExecutiveListResponse.class, list, ExportEnum.DEPT_EXECUTIVE_TASK.getSheetName());
+    }
+
+    @ApiOperation("我的任务-查询各状态列表（待检测、检测中、检测完）")
     @PostMapping("/myExecutive/list")
     public ReturnDTO<PageInfoBT<SampleLabExecutiveListResponse>> queryMyExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
@@ -57,19 +68,25 @@
         return ReturnUtil.success(super.packForBT(labExecutiveInfoService.myLabExecutiveListPage(page, labExecutiveListRequest)));
     }
 
-    /**
-     * 实验室检测-我的检测-查询各状态样品数量（待检测、检测中、检测完）
-     */
-    @ApiOperation("实验室检测-我的检测-查询各状态样品数量（待检测、检测中、检测完）")
+    @ApiOperation("我的任务导出")
+    @PostMapping("/myExecutive/export")
+    public void exportList(@RequestBody @Valid SampleLabExecutiveListRequest request) throws Exception {
+        List<SampleLabExecutiveListResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = labExecutiveInfoService.myLabExecutiveListByIds(request.getMeasureStatus(), request.getIds());
+        } else {
+            list = labExecutiveInfoService.myLabExecutiveList(request);
+        }
+        super.exportExcel(SampleLabExecutiveListResponse.class, list, ExportEnum.MY_EXECUTIVE_TASK.getSheetName());
+    }
+
+    @ApiOperation("我的任务-查询各状态样品数量（待检测、检测中、检测完）")
     @GetMapping("/myExecutive/amount")
     public ReturnDTO<List<SampleAmountResponse>> queryMyExecutiveAmount() {
         return ReturnUtil.success(labExecutiveInfoService.myExecutiveAmount());
     }
 
-    /**
-     * 实验室检测-部门检测-分配（分配给具体人员）
-     */
-    @ApiOperation("实验室检测-部门检测-分配按钮（分配给具体人员）")
+    @ApiOperation("实验室任务-分配按钮（分配给具体人员）")
     @PostMapping("/deptExecutive/allocate")
     public ReturnDTO allocateStaff(@RequestBody @Valid SampleAllocateRequest sampleAllocateRequest, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -78,10 +95,7 @@
         return labExecutiveInfoService.allocateStaff(sampleAllocateRequest);
     }
 
-    /**
-     * 实验室检测-我的检测-检定人扫描收入（待检测->检测中）
-     */
-    @ApiOperation("实验室检测-我的检测-检定人扫描收入（待检测->检测中）")
+    @ApiOperation("我的任务-检定人扫描收入（待检测->检测中）")
     @PostMapping("/myExecutive/receive")
     public ReturnDTO sampleReceive(@RequestBody @Valid List<SampleOperateRequest> requestList, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -90,10 +104,7 @@
         return labExecutiveInfoService.sampleReceive(requestList);
     }
 
-    /**
-     * 实验室检测-负责人/检定人扫描检完（检测中->检测完）
-     */
-    @ApiOperation("实验室检测-负责人/检定人扫描检完（检测中->检测完）")
+    @ApiOperation("实验室任务-负责人/检定人扫描检完（检测中->检测完）")
     @PostMapping("/myExecutive/complete")
     public ReturnDTO sampleExecutiveComplete(@RequestBody @Valid List<SampleOperateRequest> requestList, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -102,10 +113,7 @@
         return labExecutiveInfoService.sampleExecutiveComplete(requestList);
     }
 
-    /**
-     * 实验室检测-部门检测/我的检测 编辑（只能修改应出具证书）
-     */
-    @ApiOperation("实验室检测-部门检测/我的检测 编辑（只能修改应出具证书）")
+    @ApiOperation("实验室任务/我的任务 编辑（只能修改应出具证书）")
     @PostMapping("/executive/update")
     public ReturnDTO updateExecutive(@RequestBody @Valid UpdateExecutiveRequest request, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -114,10 +122,7 @@
         return labExecutiveInfoService.updateExecutive(request);
     }
 
-    /**
-     * 实验室检测-部门检测/我的检测 详情
-     */
-    @ApiOperation("实验室检测-部门检测/我的检测 详情")
+    @ApiOperation("实验室任务/我的任务 详情")
     @PostMapping("/executive/detail")
     public ReturnDTO<ExecutiveDetailResponse> executiveDetail(@RequestBody @Valid ExecutiveDetailRequest request, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
@@ -131,7 +136,7 @@
      * 退回后会将下一个要执行的实验室检测状态更新为待分配，将后面的实验室顺序变更为连续（都进行减1）
      * 最后一个检测的实验室退回，等分发员再增加实验室或设备收发中的已收入直接手动点击完成
      */
-    @ApiOperation("实验室检测-部门检测/我的检测 退回（待检测/检测中->退回）")
+    @ApiOperation("实验室任务/我的任务 退回（待检测/检测中->退回）")
     @PostMapping("/executive/sendBack")
     public ReturnDTO executiveSendBack(@RequestBody @Valid ExecutiveSendBackRequest request, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -140,9 +145,6 @@
         return labExecutiveInfoService.sampleExecutiveSendBack(request);
     }
 
-    /**
-     * 分发员编辑实验室检测列表
-     */
     @ApiOperation("分发员编辑实验室检测列表")
     @PostMapping("/handOut/updateList")
     public ReturnDTO updateExecutiveList(@RequestBody @Valid UpdateExecutiveListRequest request, BindingResult bindingResult) {
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java
index 48a67ed..0c04f31 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java
@@ -10,6 +10,7 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.resource.customer.CustomerApprovalListRequest;
 import com.casic.missiles.dto.resource.customer.CustomerSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceCustomerInfo;
@@ -26,6 +27,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -55,6 +57,13 @@
         return customerInfoService.saveCustomerInfo(request);
     }
 
+    @ApiOperation("委托方名录导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody CustomerApprovalListRequest request) throws Exception {
+        List<BizResourceCustomerInfo> list = super.exportList(request);
+        super.exportExcel(BizResourceCustomerInfo.class, list, ExportEnum.CUSTOMER_INFO.getSheetName());
+    }
+
     @ApiOperation("委托方人员列表（分页）")
     @PostMapping("/person/listPage")
     public ReturnDTO<PageInfoBT<BizResourceCustomerStaff>> personListPage(@RequestBody IdDTO idDto) {
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
index 972ed4b..6418ea5 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
@@ -5,6 +5,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.resource.customer.SuggestFormApprovalListRequest;
 import com.casic.missiles.dto.resource.customer.SuggestFormSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceCustomerSuggestForm;
@@ -20,6 +21,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -50,4 +52,11 @@
         return suggestFormService.saveSuggestForm(request);
     }
 
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody SuggestFormApprovalListRequest request) throws Exception {
+        List<BizResourceCustomerSuggestForm> list = super.exportList(request);
+        super.exportExcel(BizResourceCustomerSuggestForm.class, list, ExportEnum.CUSTOMER_SUGGEST_FORM.getSheetName());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java
index 1934d1a..9e07eab 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java
@@ -15,12 +15,16 @@
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.resource.IEnvEnvironmentRecordConfigService;
 import com.casic.missiles.service.resource.IEnvEnvironmentRecordDataService;
+import com.casic.missiles.service.resource.IEnvLocationInfoService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
 import java.util.List;
@@ -39,6 +43,8 @@
     private IEnvEnvironmentRecordDataService environmentRecordDataService;
     @Autowired
     private IEnvEnvironmentRecordConfigService environmentRecordConfigService;
+    @Autowired
+    private IEnvLocationInfoService locationInfoService;
 
     @ApiOperation("环境记录单数据列表/详情")
     @PostMapping("/data/listPage")
@@ -95,4 +101,11 @@
         });
         return environmentRecordConfigService.deleteEnvironmentRecordConfig(idDTO.getId());
     }
+
+    @ApiOperation("地点列表")
+    @PostMapping("/location/listPage")
+    public ReturnDTO<PageInfoBT<LocationListResponse>> locationListPage(@RequestBody @Valid LocationListRequest request) {
+        Page<LocationListResponse> page = PageFactory.defaultPage();
+        return ReturnUtil.success(super.packForBT(locationInfoService.listPage(page, request)));
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java
index 82efe3f..e9561fa 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java
@@ -10,6 +10,7 @@
 import com.casic.missiles.dto.resource.seal.SealLogListRequest;
 import com.casic.missiles.dto.resource.seal.SealNoteApprovalListRequest;
 import com.casic.missiles.dto.resource.seal.SealNoteSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceSealUseLog;
@@ -27,6 +28,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -58,6 +60,13 @@
         return sealUseNoteService.saveSeal(request);
     }
 
+    @ApiOperation("印章使用登记导出（列表和导出中去掉经办人和监印人）")
+    @PostMapping("/listExport")
+    public void export(@RequestBody SealNoteApprovalListRequest request) throws Exception {
+        List<BizResourceSealUseNote> list = super.exportList(request);
+        super.exportExcel(BizResourceSealUseNote.class, list, ExportEnum.SEAL_NOTE.getSheetName());
+    }
+
     // TODO: 2023/7/28 印章使用日志：系统中使用印章时插入数据库
 
     @ApiOperation("印章使用日志列表（分页）")
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java
index 9b674fc..06b6521 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java
@@ -9,16 +9,20 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.resource.staff.StaffCertRequest;
 import com.casic.missiles.dto.resource.staff.StaffCertResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.service.resource.IBizResourceStaffInfoService;
 import com.casic.missiles.service.resource.IBizResourceStaffVerifierService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.List;
+
 /**
  * @Description:
  * @Author: wangpeng
@@ -41,9 +45,21 @@
         return ReturnUtil.success(super.packForBT(responsePage));
     }
 
+    @ApiOperation("证书逾期提醒导出")
+    @PostMapping("/listExport")
+    public void exportList(@RequestBody StaffCertRequest request) throws Exception {
+        List<StaffCertResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = staffInfoService.certListByIds(request.getIds());
+        } else {
+            list = staffInfoService.certList(request);
+        }
+        super.exportExcel(StaffCertResponse.class, list, ExportEnum.STAFF_CERTIFICATE_EXPIRE.getSheetName());
+    }
+
     @ApiOperation("证书逾期提醒")
     @PostMapping("/expirationReminder")
-    public ReturnDTO expirationReminder(@RequestBody IdDTO idDto) {
-        return verifierService.expirationReminder(idDto);
+    public ReturnDTO expirationReminder(@RequestBody IdDTO idDTO) {
+        return verifierService.expirationReminder(idDTO);
     }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java
index 3b251ad..a6e7850 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java
@@ -12,6 +12,7 @@
 import com.casic.missiles.dto.resource.staff.StaffListRequest;
 import com.casic.missiles.dto.resource.staff.TrainListRequest;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.*;
@@ -22,7 +23,10 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
 import java.util.List;
@@ -52,8 +56,19 @@
             throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
         }
         Page<BizResourceStaffInfo> page = PageFactory.defaultPage();
-        Page<BizResourceStaffInfo> responsePage = staffInfoService.listPage(page, request);
-        return ReturnUtil.success(super.packForBT(responsePage));
+        return ReturnUtil.success(super.packForBT(staffInfoService.listPage(page, request)));
+    }
+
+    @ApiOperation("人员登记导出")
+    @PostMapping("/listExport")
+    public void exportList(@RequestBody StaffListRequest request) throws Exception {
+        List<BizResourceStaffInfo> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = staffInfoService.listByIds(request.getIds());
+        } else {
+            list = staffInfoService.list(request);
+        }
+        super.exportExcel(BizResourceStaffInfo.class, list, ExportEnum.STAFF_INFO.getSheetName());
     }
 
     @ApiOperation("人员登记详情基础信息")
@@ -85,9 +100,9 @@
 
     @ApiOperation("科研教育列表（分页）")
     @PostMapping("/education/listPage")
-    public ReturnDTO<PageInfoBT<BizResourceStaffEducation>> educationListPage(@RequestBody IdDTO idDto) {
+    public ReturnDTO<PageInfoBT<BizResourceStaffEducation>> educationListPage(@RequestBody IdDTO idDTO) {
         Page<BizResourceStaffEducation> page = PageFactory.defaultPage();
-        Page<BizResourceStaffEducation> responsePage = staffInfoService.educationListPage(page, idDto);
+        Page<BizResourceStaffEducation> responsePage = staffInfoService.educationListPage(page, idDTO);
         return ReturnUtil.success(super.packForBT(responsePage));
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java
index af6aa86..d85d84a 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java
@@ -9,6 +9,7 @@
 import com.casic.missiles.dto.resource.outsideService.SupplierApprovalListRequest;
 import com.casic.missiles.dto.resource.outsideService.SupplierSaveResponse;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceSupplierAbility;
@@ -67,6 +68,13 @@
         return ReturnUtil.success(supplierInfoService.detail(idDTO.getId()));
     }
 
+    @ApiOperation("合格供方导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody SupplierApprovalListRequest request) throws Exception {
+        List<BizResourceSupplierInfo> list = super.exportList(request);
+        super.exportExcel(BizResourceSupplierInfo.class, list, ExportEnum.SUPPLIER_INFO.getSheetName());
+    }
+
     @ApiOperation("供方人员列表（分页）")
     @PostMapping("/person/listPage")
     public ReturnDTO<PageInfoBT<BizResourceSupplierPerson>> personListPage(@RequestBody IdDTO idDTO) {
diff --git a/casic-metering-api/src/main/resources/config/application.yml b/casic-metering-api/src/main/resources/config/application.yml
index 350db5f..ecff521 100644
--- a/casic-metering-api/src/main/resources/config/application.yml
+++ b/casic-metering-api/src/main/resources/config/application.yml
@@ -126,7 +126,7 @@
     #作者
     author: wangpeng
     #待生成对象表名
-    table-name: biz_equipment_technical_target_approval,biz_equipment_attachment_approval,biz_equipment_checkpoint_approval
+    table-name: biz_business_outsource_protocol
 
 reminder:
   #节点--common模块config包 ReminderNodeConfig配置
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
index 4a19e4e..d47d552 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
@@ -53,6 +53,7 @@
     SUGGEST_FORM_SAVE_FAILED(2509, "委托方意见登记表保存至草稿箱失败"),
     EXAMINE_FORM_SAVE_FAILED(2510, "要求、委托书及合同评审表保存至草稿箱失败"),
     CUSTOMER_EXIST_SAVE_FAILED(2511, "该委托方已存在，请重新选择"),
+    DUPLICATE_LOCATION_NO(2512, "地点编号已存在"),
 
     /**
      * 计量检定业务模块
@@ -68,6 +69,8 @@
     COMPLETE_SAMPLE_NOT_EXIST(2609, "检测中不存在扫描收入的样品"),
     CANNOT_CHANGE_MEASURE_INFO(2610, "无法更改非当前登录用户的检测信息"),
     NON_EXIST_ORDER_OR_SAMPLE(2611, "不存在该委托单或该委托单下的样品"),
+    OUTSOURCE_ACCESS_SAVE_FAILED(2612, "测试、校准或检定工作分包评审表保存至草稿箱失败"),
+    OUTSOURCE_PROTOCOL_SAVE_FAILED(2613, "测试、校准或检定工作分包协议书保存至草稿箱失败"),
 
     /**
      * 历史遗留备用
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
index 5089ad1..81a406b 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
@@ -10,54 +10,38 @@
     /**
      * 资源管理
      */
-    ENVIRONMENT_DATA_EXPORT("environmentData", "environmentData", "环境记录单数据"),
+    ENVIRONMENT_DATA_EXPORT("environmentData", "环境记录单数据", "环境记录单数据"),
+    STAFF_INFO("staffInfo", "人员登记", "人员登记"),
+    STAFF_CERTIFICATE_EXPIRE("certificateExpire", "证书逾期提醒", "证书逾期提醒"),
+    SUPPLIER_INFO("supplierInfo", "合格供方名录", "合格供方名录"),
+    CUSTOMER_INFO("customerInfo", "委托方名录", "委托方名录"),
+    CUSTOMER_SUGGEST_FORM("customerSuggestForm", "委托方意见登记表", "委托方意见登记表"),
+    SEAL_NOTE("sealNote", "印章使用登记", "印章使用登记"),
 
-    FILE_EXPORT("meterFileData", "meterFileData", "计量文件信息"),
-    TRAIN_PLAN_EXPORT("trainPlanData", "trainPlanData", "培训计划"),
-    TRAIN_LOG_EXPORT("trainLogData", "trainLogData", "培训记录"),
-    METER_ORGANIZE_EXPORT("meterOrganizeData", "meterOrganizeData", "计量组织"),
-    TRACE_SUPPLIER_EXPORT("traceSupplierData", "traceSupplierData", "溯源供方"),
-    SIGN_EXPORT("signData", "signData", "签名/签章"),
-    TEMPLATE_EXPORT("templateData", "templateData", "原始记录模板/证书报告模板"),
-    FIXED_ASSETS("meterFixedAssets", "meterFixedAssets", "固定资产"),
-    METER_EQUIPMENT("meterEquipment", "meterEquipment", "测量设备"),
-    CALIBRATION_TEST_EQUIPMENT("calibrationTestEquipment", "calibrationTestEquipment", "校准检定设备"),
-    MEASURE_ACCOUNT("measureAccount", "measureAccount", "测量工装"),
-    STANDARD_SUPPORT_EQUIPMENT("standardSupportEquipment", "standardSupportEquipment", "标准配套设备"),
-    STANDARD_EQUIPMENT("standardEquipment", "standardEquipment", "标准装置"),
-    FLOW_DEF_EXPORT("flowDefData", "flowDefData", "流程定义"),
-    STAFF_CERTIFICATE("certificate", "certificate", "计量人员证书"),
-    CHECK_INFO("checkInfo", "checkInfo", "设备管理点检测"),
-    EQUIPMENT_APPLY("equipmentApply", "equipmentApply", "设备借用"),
-    STANDARD_EQUIPMENT_REMIND("equipmentApplyRemind", "equipmentApplyRemind", "标准装置到期提醒"),
-    METER_PRICE("meterPrice", "meterPrice", "价格库"),
-    METER_STAFF("meterStaff", "meterStaff", "计量人员"),
-    STANDARD_EQUIPMENT_APPLY("standardEquipmentApply", "standardEquipmentApply", "标准装置申请"),
-    STATE_MANAGE_APPLY("stateManage", "stateManage", "状态管理"),
-    METER_ACCEPTANCE_CHECK("acceptanceCheck", "acceptanceCheck", "设备检修保养验收单"),
-    CUSTOMER_EXPORT("customerData", "customerData", "客户信息"),
-    ORDER_EXPORT("orderData", "orderData", "委托书信息"),
-    SAMPLE_EXPORT("sampleData", "sampleData", "样本信息"),
-    EXCHANGE_DATA("exchangeData", "exchangeData", "设备交接单"),
-    DISPATCH_DATA("dispatchData", "dispatchData", "设备收发"),
-    ENVIRONMENT_DATA("environmentData", "environmentData", "环境记录单"),
-    ORIGIN_DATA("originData", "originData", "原始记录"),
-    CERTIFICATE_REPORT("certificateReport", "certificateReport", "证书报告"),
-    ADVICE_EXPORT("adviceData", "adviceData", "客户反馈"),
-    HANDOUT_EXPORT("handoutData", "handoutData", "任务分发列表"),
-    OUTSOURCER_EXPORT("outsourcerData", "outsourcerData", "分包方"),
-    SITE_EXECUTIVE_EXPORT("siteExecutiveData", "siteExecutiveData", "现场测试、校准或检定"),
-    CERTIFICATE_PRINT_EXPORT("certificatePrintData", "certificatePrintData", "证书打印"),
-    DOWNLOAD_TEMPLATE("downloadTemplate", "downloadTemplate", "页面配置"),
-    OUTSOURCER_CERTIFICATE_EXPORT("outsourceCertificateData", "outsourceCertificateData", "分包证书"),
-    SETTLEMENT_INFO_EXPORT("settlementInfoData", "settlementInfoData", "业务结算"),
-    EQUIPMENT_REMIND("equipmentRemind", "equipmentRemind", "设备到期提醒"),
-    AGREEMENT_INFO_EXPORT("agreementInfoData", "agreementInfoData", "合同"),
-    WORK_STATISTICS_EXPORT("workStatisticsData", "workStatisticsData", "实时工作统计"),
-    DEPT_OUTPUT_EXPORT("deptOutputData", "deptOutputData", "部门产值分析"),
-    WORKLOAD_EXPORT("workloadData", "workloadData", "业务工作量分析"),
-    DEPT_COMPREHENSIVE_EXPORT("deptComprehensiveData", "deptComprehensiveData", "部门综合分析"),
-    ENVIRONMENTAL_RECORD("environmentalRecordData", "environmentalRecordData", "现场环境记录");
+    /**
+     * 计量检定业务
+     */
+    OUTSOURCER_EXPORT("outsourcerData", "分包方名录", "分包方名录"),
+    IDENTIFY_EXPORT("identifyData", "计量标识", "计量标识"),
+    ORDER_EXPORT("orderData", "任务单", "任务单"),
+    DISPATCH_DATA("dispatchData", "设备收发", "设备收发"),
+    HANDOUT_EXPORT("handoutData", "任务分发", "任务分发"),
+    SITE_EXECUTIVE_EXPORT("siteExecutiveData", "现场测试、校准或检定", "现场测试、校准或检定"),
+    CERTIFICATE_REPORT("certificateReport", "证书审批", "证书审批"),
+    CERTIFICATE_CHANGE_APPLY("certificateChangeApply", "证书报告补充或更换申请单", "证书报告补充或更换申请单"),
+    CERTIFICATE_PRINT("certificatePrintData", "证书打印审批", "证书打印审批"),
+    DEPT_EXECUTIVE_TASK("deptExecutiveTaskData", "实验室任务", "实验室任务"),
+    MY_EXECUTIVE_TASK("myExecutiveTaskData", "我的任务", "我的任务"),
+    OUTSOURCE_ASSESS("outsourceAssess", "测试、校准或检定工作分包评审表", "测试、校准或检定工作分包评审表"),
+    OUTSOURCE_PROTOCOL("outsourceProtocol", "测试、校准或检定工作分包协议书", "测试、校准或检定工作分包协议书"),
+
+    /**
+     * 系统管理
+     */
+    SIGN_EXPORT("signData", "签名", "签名"),
+    TEMPLATE_EXPORT("templateData", "文件模板", "文件模板"),
+    FLOW_DEF_EXPORT("flowDefData", "流程定义", "流程定义"),
+    DOWNLOAD_TEMPLATE("downloadTemplate", "流程定义", "页面配置");
 
     ExportEnum(String fileName, String sheetName, String description) {
         this.fileName = fileName;
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateRecordTypeCodeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateRecordTypeCodeEnum.java
index 31d913c..a963522 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateRecordTypeCodeEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateRecordTypeCodeEnum.java
@@ -46,4 +46,14 @@
     String SITE_EXECUTIVE_APPROVAL = "01";
     //《现场测试、校准或检定工作记录表》
     String SITE_EXECUTIVE_LOG = "02";
+
+    //测试、校准或检定工作分包协议书
+    String OUTSOURCE_PROTOCOL = "01";
+    //测试、校准或检定工作分包评审表
+    String OUTSOURCE_ACCESS = "02";
+    //测试、校准或检定工作分包通知书
+    String OUTSOURCE_NOTICE = "03";
+    //测试、校准或检定工作分包方名录
+    String OUTSOURCE_INFO = "04";
+
 }
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
index 24b8635..f78bd53 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
@@ -15,6 +15,10 @@
     String CERTIFICATE_CHANGE_APPLY_BEAN_NAME = "certificateChangeApplyBean";
     //现场测试、校准或检定
     String SITE_EXECUTIVE_BEAN_NAME = "siteExecutiveBean";
+    //测试、校准或检定工作分包评审表
+    String OUTSOURCE_ASSESS_BEAN_NAME = "outsourceAssessBean";
+    //测试、校准或检定工作分包协议书
+    String OUTSOURCE_PROTOCOL_BEAN_NAME = "outsourceProtocolBean";
 
     /*********************************设备与装置************************************/
     //设备台账
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 b21c661..6b86fd1 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
@@ -18,6 +18,8 @@
     OUTSOURCER_APPROVAL(OUTSOURCER_BEAN_NAME, ""),
     CERTIFICATE_CHANGE_APPROVAL(CERTIFICATE_CHANGE_APPLY_BEAN_NAME, ""),
     SITE_EXECUTIVE_APPROVAL(SITE_EXECUTIVE_BEAN_NAME, ""),
+    OUTSOURCE_ASSESS_APPROVAL(OUTSOURCE_ASSESS_BEAN_NAME, ""),
+    OUTSOURCE_PROTOCOL_APPROVAL(OUTSOURCE_PROTOCOL_BEAN_NAME, ""),
 
     ACTION_STATUS_MAP(new HashMap<String, AwareActionStatusEnum>() {
         {
@@ -47,6 +49,10 @@
             put(ApplyFromIdEnum.CERTIFICATE_CHANGE_APPROVAL.getCode(), CERTIFICATE_CHANGE_APPROVAL);
             //现场测试、校准或检定审批
             put(ApplyFromIdEnum.SITE_EXECUTIVE_APPROVAL.getCode(), SITE_EXECUTIVE_APPROVAL);
+            //测试、校准或检定工作分包评审表
+            put(ApplyFromIdEnum.OUTSOURCE_ASSESS_APPROVAL.getCode(), OUTSOURCE_ASSESS_APPROVAL);
+            //测试、校准或检定工作分包协议书
+            put(ApplyFromIdEnum.OUTSOURCE_PROTOCOL_APPROVAL.getCode(), OUTSOURCE_PROTOCOL_APPROVAL);
         }
     });
     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 934405e..c7410bd 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
@@ -9,6 +9,8 @@
     CERTIFICATE_CHANGE_APPROVAL("jljdywzsbchghsqd", MessageSourceModuleEnum.BUSINESS.getCode(), "证书/报告补充或更换申请单"),
     OUTSOURCER_APPROVAL("jljdywcsjzhgfbfml", MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定合格分包方名录"),
     SITE_EXECUTIVE_APPROVAL("jljdywxccsjzsp", MessageSourceModuleEnum.BUSINESS.getCode(), "现场测试、校准或检定审批"),
+    OUTSOURCE_ASSESS_APPROVAL("jljdywcsjzfbpsb", MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包评审表"),
+    OUTSOURCE_PROTOCOL_APPROVAL("jljdywcsjzfbxys", MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包协议书"),
 
 
     /*******************************************设备与装置*********************************************/
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/GeneralApprovalMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/GeneralApprovalMapper.java
index 4fb7344..0c9d6ae 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/GeneralApprovalMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/GeneralApprovalMapper.java
@@ -17,8 +17,4 @@
 
     Page<O> selectBatchForApprovalList(Page<O> page, @Param("request") R request, @Param("businessKeys") List<String> businessKeys);
 
-//    Page<O> selectListPage(Page<O> page, @Param("request") R request);
-
-//    Long selectMaxNo();
-
 }
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceAssessMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceAssessMapper.java
index 7867bb8..ba59009 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceAssessMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceAssessMapper.java
@@ -1,7 +1,12 @@
 package com.casic.missiles.mapper.business;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.business.outsource.OutsourceAssessApprovalListRequest;
+import com.casic.missiles.mapper.GeneralApprovalMapper;
 import com.casic.missiles.model.business.BizBusinessOutsourceAssess;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * <p>
@@ -11,6 +16,10 @@
  * @author wangpeng
  * @since 2023-08-16
  */
-public interface BizBusinessOutsourceAssessMapper extends BaseMapper<BizBusinessOutsourceAssess> {
+public interface BizBusinessOutsourceAssessMapper extends GeneralApprovalMapper<BizBusinessOutsourceAssess, BizBusinessOutsourceAssess, OutsourceAssessApprovalListRequest> {
+
+    Page<BizBusinessOutsourceAssess> selectBatchForApprovalList(Page<BizBusinessOutsourceAssess> page, @Param("request") OutsourceAssessApprovalListRequest request, @Param("businessKeys") List<String> businessKeys);
+
+    Long selectMaxProjectNo();
 
 }
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceProtocolMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceProtocolMapper.java
new file mode 100644
index 0000000..e6aba35
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceProtocolMapper.java
@@ -0,0 +1,24 @@
+package com.casic.missiles.mapper.business;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.business.outsource.OutsourceProtocolApprovalListRequest;
+import com.casic.missiles.mapper.GeneralApprovalMapper;
+import com.casic.missiles.model.business.BizBusinessOutsourceProtocol;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 计量检定业务-分包管理-测试、校准或检定工作分包协议书 Mapper 接口
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-08-24
+ */
+public interface BizBusinessOutsourceProtocolMapper extends GeneralApprovalMapper<BizBusinessOutsourceProtocol, BizBusinessOutsourceProtocol, OutsourceProtocolApprovalListRequest> {
+
+    Page<BizBusinessOutsourceProtocol> selectBatchForApprovalList(Page<BizBusinessOutsourceProtocol> page, @Param("request") OutsourceProtocolApprovalListRequest request, @Param("businessKeys") List<String> businessKeys);
+
+    Long selectMaxProtocolNo();
+}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/EnvLocationInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/EnvLocationInfoMapper.java
new file mode 100644
index 0000000..49eff87
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/EnvLocationInfoMapper.java
@@ -0,0 +1,21 @@
+package com.casic.missiles.mapper.resource;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.resource.environment.LocationListRequest;
+import com.casic.missiles.dto.resource.environment.LocationListResponse;
+import com.casic.missiles.model.resource.EnvLocationInfo;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * <p>
+ * 实验室环境监控系统-设备表 Mapper 接口
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-06-07
+ */
+public interface EnvLocationInfoMapper extends BaseMapper<EnvLocationInfo> {
+
+    Page<LocationListResponse> selectLocationListPage(Page<LocationListResponse> page, @Param("request") LocationListRequest request);
+}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java
index de124db..85ed0f7 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java
@@ -1,7 +1,9 @@
 package com.casic.missiles.mapper.system;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.dto.system.SignDetailResponse;
+import com.casic.missiles.dto.system.SignListRequest;
 import com.casic.missiles.model.system.SystemSign;
 import org.apache.ibatis.annotations.Param;
 
@@ -22,4 +24,8 @@
     SignDetailResponse selectSignDetailById(Long id);
 
     List<SystemSign> selectUsableSignList(@Param("userId") Long userId);
+
+    Page<SystemSign> selectSignListPage(Page<SystemSign> page, @Param("request") SignListRequest request);
+
+    List<SystemSign> selectSignList(@Param("request") SignListRequest request);
 }
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateChangeApplyMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateChangeApplyMapper.xml
index d798447..c496092 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateChangeApplyMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateChangeApplyMapper.xml
@@ -30,31 +30,31 @@
         SELECT *
         FROM biz_business_certificate_change_apply
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.changeApplyNo != null and request.changeApplyNo !=''">
+        <if test="request != null and request.changeApplyNo != null and request.changeApplyNo !=''">
             and change_apply_no like concat('%',#{request.changeApplyNo},'%')
         </if>
-        <if test="request.changeReportNo != null and request.changeReportNo !=''">
+        <if test="request != null and request.changeReportNo != null and request.changeReportNo !=''">
             and change_report_no like concat('%',#{request.changeReportNo},'%')
         </if>
-        <if test="request.changeReportName != null and request.changeReportName !=''">
+        <if test="request != null and request.changeReportName != null and request.changeReportName !=''">
             and change_report_name like concat('%',#{request.changeReportName},'%')
         </if>
-        <if test="request.changeType != null and request.changeType !=''">
+        <if test="request != null and request.changeType != null and request.changeType !=''">
             and change_type = #{request.changeType}
         </if>
-        <if test="request.createUserName != null and request.createUserName !=''">
+        <if test="request != null and request.createUserName != null and request.createUserName !=''">
             and create_user_name like concat('%',#{request.createUserName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificatePrintMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificatePrintMapper.xml
index b66cd99..49c0ac8 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificatePrintMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificatePrintMapper.xml
@@ -31,34 +31,34 @@
         LEFT JOIN biz_business_order_sample_relation bosr ON (bosr.order_id = bcr.order_id AND bosr.sample_id = bcr.sample_id)
         LEFT JOIN biz_business_order_info boi ON boi.id = bosr.order_id
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and bcp.approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.printStatus != null and request.printStatus !=''">
+        <if test="request != null and request.printStatus != null and request.printStatus !=''">
             and print_status = #{request.printStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and bcp.create_user_id = #{request.createUserId}
         </if>
-        <if test="request.certificateReportNo != null and request.certificateReportNo !=''">
+        <if test="request != null and request.certificateReportNo != null and request.certificateReportNo !=''">
             and bcr.certificate_report_no like concat('%',#{request.certificateReportNo},'%')
         </if>
-        <if test="request.certificateReportName != null and request.certificateReportName !=''">
+        <if test="request != null and request.certificateReportName != null and request.certificateReportName !=''">
             and bcr.certificate_report_name like concat('%',#{request.certificateReportName},'%')
         </if>
-        <if test="request.customerName != null and request.customerName !=''">
+        <if test="request != null and request.customerName != null and request.customerName !=''">
             and boi.customer_name like concat('%',#{request.customerName},'%')
         </if>
-        <if test="request.sampleNo != null and request.sampleNo !=''">
+        <if test="request != null and request.sampleNo != null and request.sampleNo !=''">
             and bosr.sample_no like concat('%',#{request.sampleNo},'%')
         </if>
-        <if test="request.sampleName != null and request.sampleName !=''">
+        <if test="request != null and request.sampleName != null and request.sampleName !=''">
             and bosr.sample_name like concat('%',#{request.sampleName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and bcp.create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and bcp.create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml
index b366034..767695d 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml
@@ -46,33 +46,37 @@
         SELECT bcr.*, bosr.sample_no, bosr.sample_name, bosr.sample_model, rsi.staff_name
         FROM biz_business_certificate_report bcr
         LEFT JOIN biz_business_order_sample_relation bosr ON (bosr.order_id = bcr.order_id AND bosr.sample_id = bcr.sample_id)
+        LEFT JOIN biz_business_order_info boi ON boi.id = bcr.order_id
         LEFT JOIN biz_resource_staff_info rsi ON rsi.id = bcr.measure_person_id
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and bcr.approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and bcr.create_user_id = #{request.createUserId}
         </if>
-        <if test="request.certificateReportNo != null and request.certificateReportNo !=''">
+        <if test="request != null and request.customerId != null and request.customerId !=''">
+            and boi.customer_id = #{request.customerId}
+        </if>
+        <if test="request != null and request.certificateReportNo != null and request.certificateReportNo !=''">
             and bcr.certificate_report_no like concat('%',#{request.certificateReportNo},'%')
         </if>
-        <if test="request.certificateReportName != null and request.certificateReportName !=''">
+        <if test="request != null and request.certificateReportName != null and request.certificateReportName !=''">
             and bcr.certificate_report_name like concat('%',#{request.certificateReportName},'%')
         </if>
-        <if test="request.sampleNo != null and request.sampleNo !=''">
+        <if test="request != null and request.sampleNo != null and request.sampleNo !=''">
             and bosr.sample_no like concat('%',#{request.sampleNo},'%')
         </if>
-        <if test="request.measureCategory != null and request.measureCategory !=''">
+        <if test="request != null and request.measureCategory != null and request.measureCategory !=''">
             and bcr.measure_category = #{request.measureCategory}
         </if>
-        <if test="request.measurePerson != null and request.measurePerson !=''">
+        <if test="request != null and request.measurePerson != null and request.measurePerson !=''">
             and rsi.staff_name like concat('%',#{request.measurePerson},'%')
         </if>
-        <if test="request.calibrationTimeStart != null and request.calibrationTimeStart !=''">
+        <if test="request != null and request.calibrationTimeStart != null and request.calibrationTimeStart !=''">
             and bcr.calibration_time &gt;= #{request.calibrationTimeStart}
         </if>
-        <if test="request.calibrationTimeEnd != null and request.calibrationTimeEnd !=''">
+        <if test="request != null and request.calibrationTimeEnd != null and request.calibrationTimeEnd !=''">
             and bcr.calibration_time &lt;= #{request.calibrationTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceAssessMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceAssessMapper.xml
index d0fcf8b..c22c101 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceAssessMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceAssessMapper.xml
@@ -7,6 +7,8 @@
         <id column="id" property="id" />
         <result column="project_no" property="projectNo" />
         <result column="project_name" property="projectName" />
+        <result column="lab_code" property="labCode" />
+        <result column="group_code" property="groupCode" />
         <result column="applicant_id" property="applicantId" />
         <result column="applicant_name" property="applicantName" />
         <result column="applicant_time" property="applicantTime" />
@@ -31,7 +33,45 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, project_no, project_name, applicant_id, applicant_name, applicant_time, minio_file_name, remark, create_user_id, create_user_name, outsourcer_id, pre_start_time, pre_end_time, outsource_reason, pre_cost, approval_status, process_id, approve_situation, traceability, test_method, technique_ability, create_time, update_time
+        id, project_no, project_name, lab_code, group_code, applicant_id, applicant_name, applicant_time, minio_file_name, remark, create_user_id, create_user_name, outsourcer_id, pre_start_time, pre_end_time, outsource_reason, pre_cost, approval_status, process_id, approve_situation, traceability, test_method, technique_ability, create_time, update_time
     </sql>
 
+    <select id="selectMaxProjectNo" resultType="java.lang.Long">
+        SELECT IFNULL(max(RIGHT(project_no, 3)), 0) from biz_business_outsource_assess
+    </select>
+
+    <select id="selectBatchForApprovalList" resultMap="BaseResultMap">
+        SELECT bboa.*, bboi.outsourcer_name, bboi.director
+        FROM biz_business_outsource_assess bboa
+        LEFT JOIN biz_business_outsourcer_info bboi ON bboa.outsourcer_id = bboi.id
+        WHERE 1=1
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
+            and bboa.approval_status = #{request.approvalStatus}
+        </if>
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
+            and bboa.create_user_id = #{request.createUserId}
+        </if>
+        <if test="request != null and request.projectNo != null and request.projectNo !=''">
+            and bboa.project_no like concat('%',#{request.projectNo},'%')
+        </if>
+        <if test="request != null and request.outsourcerName != null and request.outsourcerName !=''">
+            and bboi.outsourcer_name like concat('%',#{request.outsourcerName},'%')
+        </if>
+        <if test="request != null and request.applicantName != null and request.applicantName !=''">
+            and bboa.applicant_name like concat('%',#{request.applicantName},'%')
+        </if>
+        <if test="request != null and request.applicantTimeStart != null and request.applicantTimeStart !=''">
+            and bboa.applicant_time &gt;= #{request.applicantTimeStart}
+        </if>
+        <if test="request != null and request.applicantTimeEnd != null and request.applicantTimeEnd !=''">
+            and bboa.applicant_time &lt;= #{request.applicantTimeEnd}
+        </if>
+        <if test="businessKeys != null">
+            and bboa.id in
+            <foreach collection="businessKeys" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
+        ORDER BY bboa.create_time DESC
+    </select>
 </mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceProtocolMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceProtocolMapper.xml
new file mode 100644
index 0000000..b7b2149
--- /dev/null
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceProtocolMapper.xml
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.mapper.business.BizBusinessOutsourceProtocolMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.business.BizBusinessOutsourceProtocol">
+        <id column="id" property="id" />
+        <result column="protocol_no" property="protocolNo" />
+        <result column="project_name" property="projectName" />
+        <result column="lab_code" property="labCode" />
+        <result column="group_code" property="groupCode" />
+        <result column="outsourcer_id" property="outsourcerId" />
+        <result column="remark" property="remark" />
+        <result column="outsource_no" property="outsourceNo" />
+        <result column="outsource_name" property="outsourceName" />
+        <result column="contacts" property="contacts" />
+        <result column="mobile" property="mobile" />
+        <result column="address" property="address" />
+        <result column="require_date" property="requireDate" />
+        <result column="outsource_cost" property="outsourceCost" />
+        <result column="director" property="director" />
+        <result column="item" property="item" />
+        <result column="requires" property="requires" />
+        <result column="create_user_id" property="createUserId" />
+        <result column="create_user_name" property="createUserName" />
+        <result column="approval_status" property="approvalStatus" />
+        <result column="process_id" property="processId" />
+        <result column="create_time" property="createTime" />
+        <result column="update_time" property="updateTime" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, protocol_no, project_name, lab_code, group_code, outsourcer_id, remark, outsource_no, outsource_name, contacts, mobile, address, require_date, outsource_cost, director, item, requires, create_user_id, create_user_name, approval_status, process_id, create_time, update_time
+    </sql>
+
+    <select id="selectMaxProtocolNo" resultType="java.lang.Long">
+        SELECT IFNULL(max(RIGHT(protocol_no, 3)), 0) from biz_business_outsource_protocol
+    </select>
+
+    <select id="selectBatchForApprovalList" resultMap="BaseResultMap">
+        SELECT *
+        FROM biz_business_outsource_protocol
+        WHERE 1=1
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
+            and approval_status = #{request.approvalStatus}
+        </if>
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
+            and create_user_id = #{request.createUserId}
+        </if>
+        <if test="request != null and request.protocolNo != null and request.protocolNo !=''">
+            and protocol_no like concat('%',#{request.protocolNo},'%')
+        </if>
+        <if test="request != null and request.outsourcerName != null and request.outsourcerName !=''">
+            and outsourcer_name like concat('%',#{request.outsourcerName},'%')
+        </if>
+        <if test="request != null and request.applicantName != null and request.applicantName !=''">
+            and create_user_name like concat('%',#{request.applicantName},'%')
+        </if>
+        <if test="request != null and request.applicantTimeStart != null and request.applicantTimeStart !=''">
+            and create_time &gt;= #{request.applicantTimeStart}
+        </if>
+        <if test="request != null and request.applicantTimeEnd != null and request.applicantTimeEnd !=''">
+            and create_time &lt;= #{request.applicantTimeEnd}
+        </if>
+        <if test="businessKeys != null">
+            and id in
+            <foreach collection="businessKeys" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
+        ORDER BY create_time DESC
+    </select>
+</mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourcerInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourcerInfoMapper.xml
index 510a80b..3049b54 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourcerInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourcerInfoMapper.xml
@@ -7,6 +7,8 @@
         <id column="id" property="id" />
         <result column="outsourcer_no" property="outsourcerNo" />
         <result column="outsourcer_name" property="outsourcerName" />
+        <result column="lab_code" property="labCode" />
+        <result column="group_code" property="groupCode" />
         <result column="outsourcer_brief_name" property="outsourcerBriefName" />
         <result column="outsourcer_size" property="outsourcerSize" />
         <result column="business_size" property="businessSize" />
@@ -55,32 +57,32 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, outsourcer_no, outsourcer_name, outsourcer_brief_name, outsourcer_size, business_size, grade, evaluation, tax_number, bank_account, bank_name, bank_account_number, postal_code, director, phone, fax, mobile, email, website, address_country, address_province, address_city, address_area, full_address, address_country_name, address_province_name, address_city_name, address_area_name, invoice_country, invoice_province, invoice_city, invoice_area, invoice_full_address, invoice_country_name, invoice_province_name, invoice_city_name, invoice_area_name, business_scope, business_content, minio_file_name, approval_status, process_id, remark, create_user_id, create_user_name, create_time, update_time
+        id, outsourcer_no, outsourcer_name, lab_code, group_code, outsourcer_brief_name, outsourcer_size, business_size, grade, evaluation, tax_number, bank_account, bank_name, bank_account_number, postal_code, director, phone, fax, mobile, email, website, address_country, address_province, address_city, address_area, full_address, address_country_name, address_province_name, address_city_name, address_area_name, invoice_country, invoice_province, invoice_city, invoice_area, invoice_full_address, invoice_country_name, invoice_province_name, invoice_city_name, invoice_area_name, business_scope, business_content, minio_file_name, approval_status, process_id, remark, create_user_id, create_user_name, create_time, update_time
     </sql>
 
     <select id="selectBatchForApprovalList" resultMap="BaseResultMap">
         SELECT *
         FROM biz_business_outsourcer_info
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.outsourcerNo != null and request.outsourcerNo !=''">
+        <if test="request != null and request.outsourcerNo != null and request.outsourcerNo !=''">
             and outsourcer_no like concat('%',#{request.outsourcerNo},'%')
         </if>
-        <if test="request.outsourcerName != null and request.outsourcerName !=''">
+        <if test="request != null and request.outsourcerName != null and request.outsourcerName !=''">
             and outsourcer_name like concat('%',#{request.outsourcerName},'%')
         </if>
-        <if test="request.director != null and request.director !=''">
+        <if test="request != null and request.director != null and request.director !=''">
             and director like concat('%',#{request.director},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
@@ -93,6 +95,6 @@
     </select>
 
     <select id="selectMaxNo" resultType="java.lang.Long">
-        SELECT IFNULL(max(RIGHT(outsourcer_no, 12)), 0) from biz_business_outsourcer_info
+        SELECT IFNULL(max(RIGHT(outsourcer_no, 3)), 0) from biz_business_outsourcer_info
     </select>
 </mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessSiteExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessSiteExecutiveInfoMapper.xml
index 135c5d0..3c5ae79 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessSiteExecutiveInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessSiteExecutiveInfoMapper.xml
@@ -38,25 +38,25 @@
         FROM biz_business_site_executive_info bsei
         LEFT JOIN biz_resource_customer_info rci ON bsei.customer_id = rci.id
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and bsei.approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and bsei.create_user_id = #{request.createUserId}
         </if>
-        <if test="request.siteExecutiveNo != null and request.siteExecutiveNo !=''">
+        <if test="request != null and request.siteExecutiveNo != null and request.siteExecutiveNo !=''">
             and bsei.site_executive_no like concat('%',#{request.siteExecutiveNo},'%')
         </if>
-        <if test="request.customerName != null and request.customerName !=''">
+        <if test="request != null and request.customerName != null and request.customerName !=''">
             and rci.outsourcer_name like concat('%',#{request.customerName},'%')
         </if>
-        <if test="request.applyName != null and request.applyName !=''">
+        <if test="request != null and request.applyName != null and request.applyName !=''">
             and bsei.apply_name like concat('%',#{request.applyName},'%')
         </if>
-        <if test="request.applyTimeStart != null and request.applyTimeStart !=''">
+        <if test="request != null and request.applyTimeStart != null and request.applyTimeStart !=''">
             and bsei.apply_time &gt;= #{request.applyTimeStart}
         </if>
-        <if test="request.applyTimeEnd != null and request.applyTimeEnd !=''">
+        <if test="request != null and request.applyTimeEnd != null and request.applyTimeEnd !=''">
             and bsei.apply_time &lt;= #{request.applyTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml
index 84d9e2a..6bd38a9 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml
@@ -105,6 +105,12 @@
         <if test="request.isUrgent != null and request.isUrgent !=''">
             AND bo.is_urgent = #{request.isUrgent}
         </if>
+        <if test="request.ids != null">
+            and blei.id in
+            <foreach collection="request.ids" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
         ORDER BY blei.update_time DESC
     </select>
 
@@ -137,6 +143,12 @@
         <if test="request.isUrgent != null and request.isUrgent !=''">
             AND bo.is_urgent = #{request.isUrgent}
         </if>
+        <if test="request.ids != null">
+            and blei.id in
+            <foreach collection="request.ids" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
         ORDER BY blei.update_time DESC
     </select>
 
diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardInfoMapper.xml
index 1a5551b..2ed8d17 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardInfoMapper.xml
@@ -45,12 +45,6 @@
         FROM biz_equipment_standard_info besi
         LEFT JOIN biz_equipment_standard_technology_relation bestr ON besi.standard_no = bestr.standard_no
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
-            and besi.approval_status = #{request.approvalStatus}
-        </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
-            and besi.create_user_id = #{request.createUserId}
-        </if>
         <if test="request.standardName != null and request.standardName !=''">
             and besi.standard_name like concat('%',#{request.standardName},'%')
         </if>
diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardTechnologyRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardTechnologyRelationMapper.xml
index fc7e16c..cd03c8c 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardTechnologyRelationMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardTechnologyRelationMapper.xml
@@ -6,6 +6,7 @@
     <resultMap id="BaseResultMap" type="com.casic.missiles.model.equipment.BizEquipmentStandardTechnologyRelation">
         <id column="id" property="id" />
         <result column="technology_file_id" property="technologyFileId" />
+        <result column="technology_file_no" property="technologyFileNo" />
         <result column="technology_file_name" property="technologyFileName" />
         <result column="standard_id" property="standardId" />
         <result column="standard_no" property="standardNo" />
@@ -14,7 +15,7 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, technology_file_id, technology_file_name, standard_id, remark
+        id, technology_file_id, technology_file_no, technology_file_name, standard_id, remark
     </sql>
 
 </mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceAuthorizeOrderMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceAuthorizeOrderMapper.xml
index ac5176c..554fe65 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceAuthorizeOrderMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceAuthorizeOrderMapper.xml
@@ -32,22 +32,22 @@
         SELECT *
         FROM biz_resource_authorize_order
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.orderNo != null and request.orderNo !=''">
+        <if test="request != null and request.orderNo != null and request.orderNo !=''">
             and order_no like concat('%',#{request.orderNo},'%')
         </if>
-        <if test="request.createUserName != null and request.createUserName !=''">
+        <if test="request != null and request.createUserName != null and request.createUserName !=''">
             and create_user_name like concat('%',#{request.createUserName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerExamineFormMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerExamineFormMapper.xml
index ab242f6..af7f98f 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerExamineFormMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerExamineFormMapper.xml
@@ -41,28 +41,28 @@
         SELECT *
         FROM biz_resource_customer_examine_form
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.formNo != null and request.formNo !=''">
+        <if test="request != null and request.formNo != null and request.formNo !=''">
             and form_no like concat('%',#{request.formNo},'%')
         </if>
-        <if test="request.labCode != null and request.labCode !=''">
+        <if test="request != null and request.labCode != null and request.labCode !=''">
             and lab_code like concat('%',#{request.labCode},'%')
         </if>
-        <if test="request.groupCode != null and request.groupCode !=''">
+        <if test="request != null and request.groupCode != null and request.groupCode !=''">
             and group_code like concat('%',#{request.groupCode},'%')
         </if>
-        <if test="request.createUserName != null and request.createUserName !=''">
+        <if test="request != null and request.createUserName != null and request.createUserName !=''">
             and create_user_name like concat('%',#{request.createUserName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerInfoMapper.xml
index fa8ffbc..06a2798 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerInfoMapper.xml
@@ -33,25 +33,25 @@
         SELECT *
         FROM biz_resource_customer_info
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.customerNo != null and request.customerNo !=''">
+        <if test="request != null and request.customerNo != null and request.customerNo !=''">
             and customer_no like concat('%',#{request.customerNo},'%')
         </if>
-        <if test="request.customerName != null and request.customerName !=''">
+        <if test="request != null and request.customerName != null and request.customerName !=''">
             and customer_name like concat('%',#{request.customerName},'%')
         </if>
-        <if test="request.contacts != null and request.contacts !=''">
+        <if test="request != null and request.contacts != null and request.contacts !=''">
             and contacts like concat('%',#{request.contacts},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerSuggestFormMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerSuggestFormMapper.xml
index 28f5bb2..1806662 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerSuggestFormMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerSuggestFormMapper.xml
@@ -33,28 +33,28 @@
         SELECT *
         FROM biz_resource_customer_suggest_form
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.formNo != null and request.formNo !=''">
+        <if test="request != null and request.formNo != null and request.formNo !=''">
             and form_no like concat('%',#{request.formNo},'%')
         </if>
-        <if test="request.customerName != null and request.customerName !=''">
+        <if test="request != null and request.customerName != null and request.customerName !=''">
             and customer_name like concat('%',#{request.customerName},'%')
         </if>
-        <if test="request.customerDeptName != null and request.customerDeptName !=''">
+        <if test="request != null and request.customerDeptName != null and request.customerDeptName !=''">
             and customer_dept_name like concat('%',#{request.customerDeptName},'%')
         </if>
-        <if test="request.createUserName != null and request.createUserName !=''">
+        <if test="request != null and request.createUserName != null and request.createUserName !=''">
             and create_user_name like concat('%',#{request.createUserName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSealUseNoteMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSealUseNoteMapper.xml
index ab37bc1..b02bb33 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSealUseNoteMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSealUseNoteMapper.xml
@@ -29,32 +29,32 @@
     </sql>
 
     <select id="selectBatchForApprovalList" resultMap="BaseResultMap">
-        SELECT *
+        SELECT brsun.*, brsi.seal_name, brsi.seal_type, brsi.approver_name
         FROM biz_resource_seal_use_note brsun
         JOIN biz_resource_seal_info brsi ON brsun.seal_id = brsi.id
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and brsun.approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and brsun.create_user_id = #{request.createUserId}
         </if>
-        <if test="request.sealName != null and request.sealName !=''">
+        <if test="request != null and request.sealName != null and request.sealName !=''">
             and brsi.seal_name like concat('%',#{request.sealName},'%')
         </if>
-        <if test="request.sealType != null and request.sealType !=''">
+        <if test="request != null and request.sealType != null and request.sealType !=''">
             and brsi.seal_type = #{request.sealType}
         </if>
-        <if test="request.applyDeptName != null and request.applyDeptName !=''">
+        <if test="request != null and request.applyDeptName != null and request.applyDeptName !=''">
             and brsun.apply_dept_name like concat('%',#{request.applyDeptName},'%')
         </if>
-        <if test="request.applyUserName != null and request.applyUserName !=''">
+        <if test="request != null and request.applyUserName != null and request.applyUserName !=''">
             and brsun.apply_user_name like concat('%',#{request.applyUserName},'%')
         </if>
-        <if test="request.applyTimeStart != null and request.applyTimeStart !=''">
+        <if test="request != null and request.applyTimeStart != null and request.applyTimeStart !=''">
             and brsun.apply_time &gt;= #{request.applyTimeStart}
         </if>
-        <if test="request.applyTimeEnd != null and request.applyTimeEnd !=''">
+        <if test="request != null and request.applyTimeEnd != null and request.applyTimeEnd !=''">
             and brsun.apply_time &lt;= #{request.applyTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml
index 119bf7d..4f8392a 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml
@@ -31,6 +31,12 @@
         <if test="request.deptName != null and request.deptName !=''">
             and brsi.dept_name like concat('%',#{request.deptName},'%')
         </if>
+        <if test="request.ids != null">
+            and brsv.id in
+            <foreach collection="request.ids" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
         ORDER BY brsv.grant_date DESC
     </select>
 
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSupplierInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSupplierInfoMapper.xml
index fe8d399..e8ce7ef 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSupplierInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSupplierInfoMapper.xml
@@ -48,28 +48,28 @@
         SELECT *
         FROM biz_resource_supplier_info
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.supplierNo != null and request.supplierNo !=''">
+        <if test="request != null and request.supplierNo != null and request.supplierNo !=''">
             and supplier_no like concat('%',#{request.supplierNo},'%')
         </if>
-        <if test="request.supplierName != null and request.supplierName !=''">
+        <if test="request != null and request.supplierName != null and request.supplierName !=''">
             and supplier_name like concat('%',#{request.supplierName},'%')
         </if>
-        <if test="request.director != null and request.director !=''">
+        <if test="request != null and request.director != null and request.director !=''">
             and director like concat('%',#{request.director},'%')
         </if>
-        <if test="request.supplierType != null and request.supplierType !=''">
+        <if test="request != null and request.supplierType != null and request.supplierType !=''">
             and supplier_type = #{request.supplierType}
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/EnvLocationInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/EnvLocationInfoMapper.xml
new file mode 100644
index 0000000..68bcf10
--- /dev/null
+++ b/casic-metering-dao/src/main/resources/mapper/resource/EnvLocationInfoMapper.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.mapper.resource.EnvLocationInfoMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.resource.EnvLocationInfo">
+        <id column="id" property="id" />
+        <result column="location_no" property="locationNo" />
+        <result column="location_name" property="locationName" />
+        <result column="location_position" property="locationPosition" />
+        <result column="create_user_id" property="createUserId" />
+        <result column="create_user" property="createUser" />
+        <result column="create_time" property="createTime" />
+        <result column="update_time" property="updateTime" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, location_no, location_name, location_position, create_user_id, create_user, create_time, update_time
+    </sql>
+
+    <select id="selectLocationListPage" resultType="com.casic.missiles.dto.resource.environment.LocationListResponse">
+        SELECT *
+        FROM env_location_info
+        WHERE 1=1
+        <if test="request.locationNo != null and request.locationNo !=''">
+            AND location_no LIKE concat('%',#{request.locationNo},'%')
+        </if>
+        <if test="request.locationName != null and request.locationName !=''">
+            AND location_name LIKE concat('%',#{request.locationName},'%')
+        </if>
+        ORDER BY create_time DESC
+    </select>
+
+</mapper>

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java
index bb0c50f..13a699b 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java
@@ -12,6 +12,7 @@
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.IGeneralApprovalService;
+import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
@@ -19,6 +20,7 @@
 import org.springframework.web.bind.annotation.RequestBody;
 
 import javax.validation.Valid;
+import java.util.List;
 import java.util.Objects;
 
 /**
@@ -117,4 +119,17 @@
         }
         return baseApprovalService.failUpdate(request);
     }
+
+    public List<O> exportList(@RequestBody @Valid R request) throws Exception {
+        List<O> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = baseApprovalService.listExportByIds(request.getIds());
+        } else {
+            list = baseApprovalService.listExport(request);
+        }
+        for (O record : list) {
+            DictCodeUtils.convertDictCodeToName(record);
+        }
+        return list;
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java
index 8a90961..d775831 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java
@@ -5,6 +5,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.business.certificate.CertificateChangeApplyApprovalListRequest;
 import com.casic.missiles.dto.business.certificate.CertificateChangeApplySaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessCertificateChangeApply;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
@@ -20,6 +21,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -48,4 +50,12 @@
         }
         return changeApplyService.saveChangeApply(request);
     }
+
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody CertificateChangeApplyApprovalListRequest request) throws Exception {
+        List<BizBusinessCertificateChangeApply> list = super.exportList(request);
+        super.exportExcel(BizBusinessCertificateChangeApply.class, list, ExportEnum.CERTIFICATE_CHANGE_APPLY.getSheetName());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java
index 5fc4b07..af8230e 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java
@@ -9,6 +9,7 @@
 import com.casic.missiles.dto.business.certificate.CertificatePrintApprovalListRequest;
 import com.casic.missiles.dto.business.certificate.CertificatePrintListResponse;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.enums.business.CertificatePrintStatusEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessCertificatePrintLog;
@@ -18,10 +19,16 @@
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.io.IOException;
+import java.util.List;
 import java.util.Objects;
 
 /**
@@ -98,4 +105,16 @@
         });
         return certificatePrintService.certificatePrintLog(idDTO.getId());
     }
+
+    @ApiOperation("证书打印审批导出")
+    @PostMapping("/listExport")
+    public void exportList(@RequestBody CertificatePrintApprovalListRequest request) throws IOException {
+        List<CertificatePrintListResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = certificatePrintService.listByIds(request.getIds());
+        } else {
+            list = certificatePrintService.list(request);
+        }
+        super.exportExcel(CertificatePrintListResponse.class, list, ExportEnum.CERTIFICATE_PRINT.getSheetName());
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java
index 63b06dc..6b2efd5 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java
@@ -6,6 +6,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.business.certificate.CertificateReportApprovalListRequest;
 import com.casic.missiles.dto.business.certificate.CertificateReportSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessCertificateReport;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
@@ -21,6 +22,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -50,7 +52,7 @@
         return certificateReportService.saveCertificateReport(request);
     }
 
-    @ApiOperation("证书审批详情（基本信息）")
+    @ApiOperation("详情（基本信息）")
     @PostMapping("/detail")
     public ReturnDTO<BizBusinessCertificateReport> detail(@RequestBody @Valid BaseDetailRequest request, BindingResult bindingResult) throws Exception {
         if(bindingResult.hasErrors()){
@@ -59,4 +61,11 @@
         return certificateReportService.detail(request);
     }
 
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody CertificateReportApprovalListRequest request) throws Exception {
+        List<BizBusinessCertificateReport> list = super.exportList(request);
+        super.exportExcel(BizBusinessCertificateReport.class, list, ExportEnum.CERTIFICATE_REPORT.getSheetName());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java
index 46b26bd..57c0809 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java
@@ -10,20 +10,21 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.business.identify.IdentifyListRequest;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessIdentifyInfo;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.business.IBizBusinessIdentifyInfoService;
+import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import javax.validation.Valid;
+import java.util.List;
 import java.util.Objects;
 
 /**
@@ -57,16 +58,13 @@
         return identifyInfoService.addIdentify(identifyInfo);
     }
 
-    @ApiOperation("标识打印更新")
+    @ApiOperation("标识打印更新（更新打印时间）")
     @PostMapping("/update")
-    public ReturnDTO updateIdentify(@RequestBody @Valid BizBusinessIdentifyInfo identifyInfo, BindingResult bindingResult) {
-        Assert.isFalse(Objects.isNull(identifyInfo.getId()), () -> {
+    public ReturnDTO updateIdentify(@RequestBody @Valid IdDTO idDTO) {
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        Assert.isFalse(bindingResult.hasErrors(), () -> {
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        });
-        return identifyInfoService.updateIdentify(identifyInfo);
+        return identifyInfoService.updateIdentify(idDTO.getId());
     }
 
     @ApiOperation("标识打印删除")
@@ -77,4 +75,37 @@
         });
         return identifyInfoService.deleteIdentify(idDTO.getId());
     }
+
+    @ApiOperation("标识打印导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody @Valid IdentifyListRequest request, BindingResult bindingResult) throws Exception {
+        if (bindingResult.hasErrors()) {
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        List<BizBusinessIdentifyInfo> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = identifyInfoService.listByIds(request.getIds());
+        } else {
+            list = identifyInfoService.list(request);
+        }
+        for (BizBusinessIdentifyInfo record : list) {
+            DictCodeUtils.convertDictCodeToName(record);
+        }
+        super.exportExcel(BizBusinessIdentifyInfo.class, list, ExportEnum.IDENTIFY_EXPORT.getSheetName());
+    }
+
+
+    // TODO: 2023/8/23 查询设备信息，4个底部按钮查设备（按钮的作用就是前端用来调不同接口、用来区分中间即将展示的标识），前端弹窗选设备，在确定保存时前端根据底部按钮判断传入设备类型deviceType字典code
+    // TODO: 2023/8/23 接口：查受检设备（第1个按钮），查设备台账（后3个按钮同一接口），查询之后前端根据标志类型的不同加到中间页面时进行判断（按产品给的对应表）
+    // TODO: 2023/8/23 提供二维码接口，前端在加到中间页面时调用一下
+
+    @ApiOperation("设备二维码")
+    @PostMapping("/equipment/qrCode")
+    public ReturnDTO<String> equipmentQrCode(@RequestBody @Valid IdDTO idDTO) {
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return identifyInfoService.equipmentQrCode(idDTO.getId());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java
index 707be6e..7e0453d 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java
@@ -117,7 +117,7 @@
     }
 
     @ApiOperation("任务单导出")
-    @PostMapping("/export")
+    @PostMapping("/listExport")
     public void orderExport(@RequestBody @Valid OrderListRequest request, HttpServletResponse response) {
         businessOrderService.orderExport(request, response);
     }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java
index 529a6ce..51432be 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java
@@ -1,9 +1,28 @@
 package com.casic.missiles.controller.business;
 
+import com.casic.missiles.controller.GeneralApprovalController;
+import com.casic.missiles.dto.BaseApprovalSubmitRequest;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.business.outsource.OutsourceAssessApprovalListRequest;
+import com.casic.missiles.dto.business.outsource.OutsourceAssessSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
+import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.model.business.BizBusinessOutsourceAssess;
+import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
+import com.casic.missiles.service.IGeneralApprovalService;
+import com.casic.missiles.service.business.IBizBusinessOutsourceAssessService;
 import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.BindingResult;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.validation.Valid;
+import java.util.List;
+
 /**
  * <p>
  * 计量检定业务-分包管理-测试、校准或检定工作分包评审表 前端控制器
@@ -15,6 +34,27 @@
 @Api(tags = "分包管理-测试、校准或检定工作分包评审表")
 @RestController
 @RequestMapping("/business/outsource/assess")
-public class BizBusinessOutsourceAssessController {
+public class BizBusinessOutsourceAssessController extends GeneralApprovalController<BizBusinessOutsourceAssess, BizBusinessOutsourceAssess, OutsourceAssessApprovalListRequest, BaseApprovalSubmitRequest> {
+    @Autowired
+    private IBizBusinessOutsourceAssessService outsourceAssessService;
 
+    public BizBusinessOutsourceAssessController(IGeneralApprovalService<BizBusinessOutsourceAssess, BizBusinessOutsourceAssess, OutsourceAssessApprovalListRequest, BaseApprovalSubmitRequest> baseApprovalService) {
+        super(baseApprovalService);
+    }
+
+    @ApiOperation("草稿箱-保存")
+    @PostMapping("/save")
+    public ReturnDTO<OutsourceAssessSaveResponse> saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceAssess request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        return outsourceAssessService.saveOutsourceAssess(request);
+    }
+
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception {
+        List<BizBusinessOutsourceAssess> list = super.exportList(request);
+        super.exportExcel(BizBusinessOutsourceAssess.class, list, ExportEnum.OUTSOURCE_ASSESS.getSheetName());
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java
new file mode 100644
index 0000000..9adef18
--- /dev/null
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java
@@ -0,0 +1,60 @@
+package com.casic.missiles.controller.business;
+
+import com.casic.missiles.controller.GeneralApprovalController;
+import com.casic.missiles.dto.BaseApprovalSubmitRequest;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.business.outsource.OutsourceProtocolApprovalListRequest;
+import com.casic.missiles.dto.business.outsource.OutsourceProtocolSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
+import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.model.business.BizBusinessOutsourceProtocol;
+import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
+import com.casic.missiles.service.IGeneralApprovalService;
+import com.casic.missiles.service.business.IBizBusinessOutsourceProtocolService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.BindingResult;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.validation.Valid;
+import java.util.List;
+
+/**
+ * <p>
+ * 计量检定业务-分包管理-测试、校准或检定工作分包协议书 前端控制器
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-08-24
+ */
+@Api(tags = "分包管理-测试、校准或检定工作分包协议书")
+@RestController
+@RequestMapping("/business/outsource/protocol")
+public class BizBusinessOutsourceProtocolController extends GeneralApprovalController<BizBusinessOutsourceProtocol, BizBusinessOutsourceProtocol, OutsourceProtocolApprovalListRequest, BaseApprovalSubmitRequest> {
+    @Autowired
+    private IBizBusinessOutsourceProtocolService outsourceProtocolService;
+
+    public BizBusinessOutsourceProtocolController(IGeneralApprovalService<BizBusinessOutsourceProtocol, BizBusinessOutsourceProtocol, OutsourceProtocolApprovalListRequest, BaseApprovalSubmitRequest> baseApprovalService) {
+        super(baseApprovalService);
+    }
+
+    @ApiOperation("草稿箱-保存")
+    @PostMapping("/save")
+    public ReturnDTO<OutsourceProtocolSaveResponse> saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceProtocol request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        return outsourceProtocolService.saveOutsourceProtocol(request);
+    }
+
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody OutsourceProtocolApprovalListRequest request) throws Exception {
+        List<BizBusinessOutsourceProtocol> list = super.exportList(request);
+        super.exportExcel(BizBusinessOutsourceProtocol.class, list, ExportEnum.OUTSOURCE_PROTOCOL.getSheetName());
+    }
+}
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java
index 097f645..f0f0943 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java
@@ -17,7 +17,6 @@
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.IGeneralApprovalService;
 import com.casic.missiles.service.business.IBizBusinessOutsourcerInfoService;
-import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -71,19 +70,8 @@
 
     @ApiOperation("分包方导出")
     @PostMapping("/listExport")
-    public void export(@RequestBody @Valid OutsourcerInfoApprovalListRequest request, BindingResult bindingResult) throws Exception {
-        if (bindingResult.hasErrors()) {
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        }
-        List<BizBusinessOutsourcerInfo> list;
-        if (!CollectionUtils.isEmpty(request.getIds())) {
-            list = outsourcerInfoService.listByIds(request.getIds());
-        } else {
-            list = outsourcerInfoService.list(request);
-        }
-        for (BizBusinessOutsourcerInfo record : list) {
-            DictCodeUtils.convertDictCodeToName(record);
-        }
+    public void export(@RequestBody OutsourcerInfoApprovalListRequest request) throws Exception {
+        List<BizBusinessOutsourcerInfo> list = super.exportList(request);
         super.exportExcel(BizBusinessOutsourcerInfo.class, list, ExportEnum.OUTSOURCER_EXPORT.getSheetName());
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java
index c2cbf9f..0410918 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java
@@ -17,11 +17,9 @@
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.IGeneralApprovalService;
 import com.casic.missiles.service.business.IBizBusinessSiteExecutiveInfoService;
-import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -60,7 +58,7 @@
         return siteExecutiveInfoService.saveSiteExecutiveInfo(siteExecutiveInfo);
     }
 
-    @ApiOperation("现场检测详情")
+    @ApiOperation("详情")
     @PostMapping("/detail")
     public ReturnDTO<SiteExecutiveDetailResponse> siteExecutiveDetail(@RequestBody @Valid IdDTO idDTO) throws Exception {
         Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
@@ -69,21 +67,10 @@
         return ReturnUtil.success(siteExecutiveInfoService.detail(idDTO.getId()));
     }
 
-    @ApiOperation("现场检测导出")
+    @ApiOperation("导出")
     @PostMapping("/listExport")
-    public void export(@RequestBody @Valid SiteExecutiveApprovalListRequest request, BindingResult bindingResult) throws Exception {
-        if (bindingResult.hasErrors()) {
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        }
-        List<SiteExecutiveApprovalListResponse> list;
-        if (!CollectionUtils.isEmpty(request.getIds())) {
-            list = siteExecutiveInfoService.listInfoByIds(request.getIds());
-        } else {
-            list = siteExecutiveInfoService.listInfo(request);
-        }
-        for (SiteExecutiveApprovalListResponse record : list) {
-            DictCodeUtils.convertDictCodeToName(record);
-        }
+    public void export(@RequestBody SiteExecutiveApprovalListRequest request) throws Exception {
+        List<SiteExecutiveApprovalListResponse> list = super.exportList(request);
         super.exportExcel(SiteExecutiveApprovalListResponse.class, list, ExportEnum.SITE_EXECUTIVE_EXPORT.getSheetName());
     }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
index 7e793cd..a92e209 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
@@ -55,7 +55,7 @@
 
     @ApiOperation("设备收发列表导出")
     @PostMapping("/export")
-    public void exportList(@RequestBody @Valid SampleDispatchListRequest request) throws IOException {
+    public void exportList(@RequestBody SampleDispatchListRequest request) throws IOException {
         List<SampleDispatchListResponse> list;
         if (!CollectionUtils.isEmpty(request.getIds())) {
             list = dispatchService.listByIds(request.getIds());
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java
index cdc77fc..d120fd4 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java
@@ -7,6 +7,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.business.labExecutive.*;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.business.IBusinessLabExecutiveInfoService;
@@ -14,6 +15,7 @@
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.*;
 
@@ -32,7 +34,7 @@
     @Autowired
     private IBusinessLabExecutiveInfoService labExecutiveInfoService;
 
-    @ApiOperation("实验室检测-部门检测-查询各状态列表（待检测、检测中、检测完）")
+    @ApiOperation("实验室任务-查询各状态列表（待检测、检测中、检测完）")
     @PostMapping("/deptExecutive/List")
     public ReturnDTO<PageInfoBT<SampleLabExecutiveListResponse>> queryDeptExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
@@ -43,10 +45,19 @@
         return ReturnUtil.success(super.packForBT(labExecutiveInfoService.deptLabExecutiveListPage(page, labExecutiveListRequest)));
     }
 
-    /**
-     * 实验室检测-我的检测-查询各状态列表（待检测、检测中、检测完）
-     */
-    @ApiOperation("实验室检测-我的检测-查询各状态列表（待检测、检测中、检测完）")
+    @ApiOperation("实验室任务导出")
+    @PostMapping("/deptExecutive/export")
+    public void deptExportList(@RequestBody @Valid SampleLabExecutiveListRequest request) throws Exception {
+        List<SampleLabExecutiveListResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = labExecutiveInfoService.deptLabExecutiveListByIds(request.getMeasureStatus(), request.getIds());
+        } else {
+            list = labExecutiveInfoService.deptLabExecutiveList(request);
+        }
+        super.exportExcel(SampleLabExecutiveListResponse.class, list, ExportEnum.DEPT_EXECUTIVE_TASK.getSheetName());
+    }
+
+    @ApiOperation("我的任务-查询各状态列表（待检测、检测中、检测完）")
     @PostMapping("/myExecutive/list")
     public ReturnDTO<PageInfoBT<SampleLabExecutiveListResponse>> queryMyExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
@@ -57,19 +68,25 @@
         return ReturnUtil.success(super.packForBT(labExecutiveInfoService.myLabExecutiveListPage(page, labExecutiveListRequest)));
     }
 
-    /**
-     * 实验室检测-我的检测-查询各状态样品数量（待检测、检测中、检测完）
-     */
-    @ApiOperation("实验室检测-我的检测-查询各状态样品数量（待检测、检测中、检测完）")
+    @ApiOperation("我的任务导出")
+    @PostMapping("/myExecutive/export")
+    public void exportList(@RequestBody @Valid SampleLabExecutiveListRequest request) throws Exception {
+        List<SampleLabExecutiveListResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = labExecutiveInfoService.myLabExecutiveListByIds(request.getMeasureStatus(), request.getIds());
+        } else {
+            list = labExecutiveInfoService.myLabExecutiveList(request);
+        }
+        super.exportExcel(SampleLabExecutiveListResponse.class, list, ExportEnum.MY_EXECUTIVE_TASK.getSheetName());
+    }
+
+    @ApiOperation("我的任务-查询各状态样品数量（待检测、检测中、检测完）")
     @GetMapping("/myExecutive/amount")
     public ReturnDTO<List<SampleAmountResponse>> queryMyExecutiveAmount() {
         return ReturnUtil.success(labExecutiveInfoService.myExecutiveAmount());
     }
 
-    /**
-     * 实验室检测-部门检测-分配（分配给具体人员）
-     */
-    @ApiOperation("实验室检测-部门检测-分配按钮（分配给具体人员）")
+    @ApiOperation("实验室任务-分配按钮（分配给具体人员）")
     @PostMapping("/deptExecutive/allocate")
     public ReturnDTO allocateStaff(@RequestBody @Valid SampleAllocateRequest sampleAllocateRequest, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -78,10 +95,7 @@
         return labExecutiveInfoService.allocateStaff(sampleAllocateRequest);
     }
 
-    /**
-     * 实验室检测-我的检测-检定人扫描收入（待检测->检测中）
-     */
-    @ApiOperation("实验室检测-我的检测-检定人扫描收入（待检测->检测中）")
+    @ApiOperation("我的任务-检定人扫描收入（待检测->检测中）")
     @PostMapping("/myExecutive/receive")
     public ReturnDTO sampleReceive(@RequestBody @Valid List<SampleOperateRequest> requestList, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -90,10 +104,7 @@
         return labExecutiveInfoService.sampleReceive(requestList);
     }
 
-    /**
-     * 实验室检测-负责人/检定人扫描检完（检测中->检测完）
-     */
-    @ApiOperation("实验室检测-负责人/检定人扫描检完（检测中->检测完）")
+    @ApiOperation("实验室任务-负责人/检定人扫描检完（检测中->检测完）")
     @PostMapping("/myExecutive/complete")
     public ReturnDTO sampleExecutiveComplete(@RequestBody @Valid List<SampleOperateRequest> requestList, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -102,10 +113,7 @@
         return labExecutiveInfoService.sampleExecutiveComplete(requestList);
     }
 
-    /**
-     * 实验室检测-部门检测/我的检测 编辑（只能修改应出具证书）
-     */
-    @ApiOperation("实验室检测-部门检测/我的检测 编辑（只能修改应出具证书）")
+    @ApiOperation("实验室任务/我的任务 编辑（只能修改应出具证书）")
     @PostMapping("/executive/update")
     public ReturnDTO updateExecutive(@RequestBody @Valid UpdateExecutiveRequest request, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -114,10 +122,7 @@
         return labExecutiveInfoService.updateExecutive(request);
     }
 
-    /**
-     * 实验室检测-部门检测/我的检测 详情
-     */
-    @ApiOperation("实验室检测-部门检测/我的检测 详情")
+    @ApiOperation("实验室任务/我的任务 详情")
     @PostMapping("/executive/detail")
     public ReturnDTO<ExecutiveDetailResponse> executiveDetail(@RequestBody @Valid ExecutiveDetailRequest request, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
@@ -131,7 +136,7 @@
      * 退回后会将下一个要执行的实验室检测状态更新为待分配，将后面的实验室顺序变更为连续（都进行减1）
      * 最后一个检测的实验室退回，等分发员再增加实验室或设备收发中的已收入直接手动点击完成
      */
-    @ApiOperation("实验室检测-部门检测/我的检测 退回（待检测/检测中->退回）")
+    @ApiOperation("实验室任务/我的任务 退回（待检测/检测中->退回）")
     @PostMapping("/executive/sendBack")
     public ReturnDTO executiveSendBack(@RequestBody @Valid ExecutiveSendBackRequest request, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -140,9 +145,6 @@
         return labExecutiveInfoService.sampleExecutiveSendBack(request);
     }
 
-    /**
-     * 分发员编辑实验室检测列表
-     */
     @ApiOperation("分发员编辑实验室检测列表")
     @PostMapping("/handOut/updateList")
     public ReturnDTO updateExecutiveList(@RequestBody @Valid UpdateExecutiveListRequest request, BindingResult bindingResult) {
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java
index 48a67ed..0c04f31 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java
@@ -10,6 +10,7 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.resource.customer.CustomerApprovalListRequest;
 import com.casic.missiles.dto.resource.customer.CustomerSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceCustomerInfo;
@@ -26,6 +27,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -55,6 +57,13 @@
         return customerInfoService.saveCustomerInfo(request);
     }
 
+    @ApiOperation("委托方名录导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody CustomerApprovalListRequest request) throws Exception {
+        List<BizResourceCustomerInfo> list = super.exportList(request);
+        super.exportExcel(BizResourceCustomerInfo.class, list, ExportEnum.CUSTOMER_INFO.getSheetName());
+    }
+
     @ApiOperation("委托方人员列表（分页）")
     @PostMapping("/person/listPage")
     public ReturnDTO<PageInfoBT<BizResourceCustomerStaff>> personListPage(@RequestBody IdDTO idDto) {
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
index 972ed4b..6418ea5 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
@@ -5,6 +5,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.resource.customer.SuggestFormApprovalListRequest;
 import com.casic.missiles.dto.resource.customer.SuggestFormSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceCustomerSuggestForm;
@@ -20,6 +21,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -50,4 +52,11 @@
         return suggestFormService.saveSuggestForm(request);
     }
 
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody SuggestFormApprovalListRequest request) throws Exception {
+        List<BizResourceCustomerSuggestForm> list = super.exportList(request);
+        super.exportExcel(BizResourceCustomerSuggestForm.class, list, ExportEnum.CUSTOMER_SUGGEST_FORM.getSheetName());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java
index 1934d1a..9e07eab 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java
@@ -15,12 +15,16 @@
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.resource.IEnvEnvironmentRecordConfigService;
 import com.casic.missiles.service.resource.IEnvEnvironmentRecordDataService;
+import com.casic.missiles.service.resource.IEnvLocationInfoService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
 import java.util.List;
@@ -39,6 +43,8 @@
     private IEnvEnvironmentRecordDataService environmentRecordDataService;
     @Autowired
     private IEnvEnvironmentRecordConfigService environmentRecordConfigService;
+    @Autowired
+    private IEnvLocationInfoService locationInfoService;
 
     @ApiOperation("环境记录单数据列表/详情")
     @PostMapping("/data/listPage")
@@ -95,4 +101,11 @@
         });
         return environmentRecordConfigService.deleteEnvironmentRecordConfig(idDTO.getId());
     }
+
+    @ApiOperation("地点列表")
+    @PostMapping("/location/listPage")
+    public ReturnDTO<PageInfoBT<LocationListResponse>> locationListPage(@RequestBody @Valid LocationListRequest request) {
+        Page<LocationListResponse> page = PageFactory.defaultPage();
+        return ReturnUtil.success(super.packForBT(locationInfoService.listPage(page, request)));
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java
index 82efe3f..e9561fa 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java
@@ -10,6 +10,7 @@
 import com.casic.missiles.dto.resource.seal.SealLogListRequest;
 import com.casic.missiles.dto.resource.seal.SealNoteApprovalListRequest;
 import com.casic.missiles.dto.resource.seal.SealNoteSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceSealUseLog;
@@ -27,6 +28,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -58,6 +60,13 @@
         return sealUseNoteService.saveSeal(request);
     }
 
+    @ApiOperation("印章使用登记导出（列表和导出中去掉经办人和监印人）")
+    @PostMapping("/listExport")
+    public void export(@RequestBody SealNoteApprovalListRequest request) throws Exception {
+        List<BizResourceSealUseNote> list = super.exportList(request);
+        super.exportExcel(BizResourceSealUseNote.class, list, ExportEnum.SEAL_NOTE.getSheetName());
+    }
+
     // TODO: 2023/7/28 印章使用日志：系统中使用印章时插入数据库
 
     @ApiOperation("印章使用日志列表（分页）")
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java
index 9b674fc..06b6521 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java
@@ -9,16 +9,20 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.resource.staff.StaffCertRequest;
 import com.casic.missiles.dto.resource.staff.StaffCertResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.service.resource.IBizResourceStaffInfoService;
 import com.casic.missiles.service.resource.IBizResourceStaffVerifierService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.List;
+
 /**
  * @Description:
  * @Author: wangpeng
@@ -41,9 +45,21 @@
         return ReturnUtil.success(super.packForBT(responsePage));
     }
 
+    @ApiOperation("证书逾期提醒导出")
+    @PostMapping("/listExport")
+    public void exportList(@RequestBody StaffCertRequest request) throws Exception {
+        List<StaffCertResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = staffInfoService.certListByIds(request.getIds());
+        } else {
+            list = staffInfoService.certList(request);
+        }
+        super.exportExcel(StaffCertResponse.class, list, ExportEnum.STAFF_CERTIFICATE_EXPIRE.getSheetName());
+    }
+
     @ApiOperation("证书逾期提醒")
     @PostMapping("/expirationReminder")
-    public ReturnDTO expirationReminder(@RequestBody IdDTO idDto) {
-        return verifierService.expirationReminder(idDto);
+    public ReturnDTO expirationReminder(@RequestBody IdDTO idDTO) {
+        return verifierService.expirationReminder(idDTO);
     }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java
index 3b251ad..a6e7850 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java
@@ -12,6 +12,7 @@
 import com.casic.missiles.dto.resource.staff.StaffListRequest;
 import com.casic.missiles.dto.resource.staff.TrainListRequest;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.*;
@@ -22,7 +23,10 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
 import java.util.List;
@@ -52,8 +56,19 @@
             throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
         }
         Page<BizResourceStaffInfo> page = PageFactory.defaultPage();
-        Page<BizResourceStaffInfo> responsePage = staffInfoService.listPage(page, request);
-        return ReturnUtil.success(super.packForBT(responsePage));
+        return ReturnUtil.success(super.packForBT(staffInfoService.listPage(page, request)));
+    }
+
+    @ApiOperation("人员登记导出")
+    @PostMapping("/listExport")
+    public void exportList(@RequestBody StaffListRequest request) throws Exception {
+        List<BizResourceStaffInfo> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = staffInfoService.listByIds(request.getIds());
+        } else {
+            list = staffInfoService.list(request);
+        }
+        super.exportExcel(BizResourceStaffInfo.class, list, ExportEnum.STAFF_INFO.getSheetName());
     }
 
     @ApiOperation("人员登记详情基础信息")
@@ -85,9 +100,9 @@
 
     @ApiOperation("科研教育列表（分页）")
     @PostMapping("/education/listPage")
-    public ReturnDTO<PageInfoBT<BizResourceStaffEducation>> educationListPage(@RequestBody IdDTO idDto) {
+    public ReturnDTO<PageInfoBT<BizResourceStaffEducation>> educationListPage(@RequestBody IdDTO idDTO) {
         Page<BizResourceStaffEducation> page = PageFactory.defaultPage();
-        Page<BizResourceStaffEducation> responsePage = staffInfoService.educationListPage(page, idDto);
+        Page<BizResourceStaffEducation> responsePage = staffInfoService.educationListPage(page, idDTO);
         return ReturnUtil.success(super.packForBT(responsePage));
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java
index af6aa86..d85d84a 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java
@@ -9,6 +9,7 @@
 import com.casic.missiles.dto.resource.outsideService.SupplierApprovalListRequest;
 import com.casic.missiles.dto.resource.outsideService.SupplierSaveResponse;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceSupplierAbility;
@@ -67,6 +68,13 @@
         return ReturnUtil.success(supplierInfoService.detail(idDTO.getId()));
     }
 
+    @ApiOperation("合格供方导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody SupplierApprovalListRequest request) throws Exception {
+        List<BizResourceSupplierInfo> list = super.exportList(request);
+        super.exportExcel(BizResourceSupplierInfo.class, list, ExportEnum.SUPPLIER_INFO.getSheetName());
+    }
+
     @ApiOperation("供方人员列表（分页）")
     @PostMapping("/person/listPage")
     public ReturnDTO<PageInfoBT<BizResourceSupplierPerson>> personListPage(@RequestBody IdDTO idDTO) {
diff --git a/casic-metering-api/src/main/resources/config/application.yml b/casic-metering-api/src/main/resources/config/application.yml
index 350db5f..ecff521 100644
--- a/casic-metering-api/src/main/resources/config/application.yml
+++ b/casic-metering-api/src/main/resources/config/application.yml
@@ -126,7 +126,7 @@
     #作者
     author: wangpeng
     #待生成对象表名
-    table-name: biz_equipment_technical_target_approval,biz_equipment_attachment_approval,biz_equipment_checkpoint_approval
+    table-name: biz_business_outsource_protocol
 
 reminder:
   #节点--common模块config包 ReminderNodeConfig配置
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
index 4a19e4e..d47d552 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
@@ -53,6 +53,7 @@
     SUGGEST_FORM_SAVE_FAILED(2509, "委托方意见登记表保存至草稿箱失败"),
     EXAMINE_FORM_SAVE_FAILED(2510, "要求、委托书及合同评审表保存至草稿箱失败"),
     CUSTOMER_EXIST_SAVE_FAILED(2511, "该委托方已存在，请重新选择"),
+    DUPLICATE_LOCATION_NO(2512, "地点编号已存在"),
 
     /**
      * 计量检定业务模块
@@ -68,6 +69,8 @@
     COMPLETE_SAMPLE_NOT_EXIST(2609, "检测中不存在扫描收入的样品"),
     CANNOT_CHANGE_MEASURE_INFO(2610, "无法更改非当前登录用户的检测信息"),
     NON_EXIST_ORDER_OR_SAMPLE(2611, "不存在该委托单或该委托单下的样品"),
+    OUTSOURCE_ACCESS_SAVE_FAILED(2612, "测试、校准或检定工作分包评审表保存至草稿箱失败"),
+    OUTSOURCE_PROTOCOL_SAVE_FAILED(2613, "测试、校准或检定工作分包协议书保存至草稿箱失败"),
 
     /**
      * 历史遗留备用
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
index 5089ad1..81a406b 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
@@ -10,54 +10,38 @@
     /**
      * 资源管理
      */
-    ENVIRONMENT_DATA_EXPORT("environmentData", "environmentData", "环境记录单数据"),
+    ENVIRONMENT_DATA_EXPORT("environmentData", "环境记录单数据", "环境记录单数据"),
+    STAFF_INFO("staffInfo", "人员登记", "人员登记"),
+    STAFF_CERTIFICATE_EXPIRE("certificateExpire", "证书逾期提醒", "证书逾期提醒"),
+    SUPPLIER_INFO("supplierInfo", "合格供方名录", "合格供方名录"),
+    CUSTOMER_INFO("customerInfo", "委托方名录", "委托方名录"),
+    CUSTOMER_SUGGEST_FORM("customerSuggestForm", "委托方意见登记表", "委托方意见登记表"),
+    SEAL_NOTE("sealNote", "印章使用登记", "印章使用登记"),
 
-    FILE_EXPORT("meterFileData", "meterFileData", "计量文件信息"),
-    TRAIN_PLAN_EXPORT("trainPlanData", "trainPlanData", "培训计划"),
-    TRAIN_LOG_EXPORT("trainLogData", "trainLogData", "培训记录"),
-    METER_ORGANIZE_EXPORT("meterOrganizeData", "meterOrganizeData", "计量组织"),
-    TRACE_SUPPLIER_EXPORT("traceSupplierData", "traceSupplierData", "溯源供方"),
-    SIGN_EXPORT("signData", "signData", "签名/签章"),
-    TEMPLATE_EXPORT("templateData", "templateData", "原始记录模板/证书报告模板"),
-    FIXED_ASSETS("meterFixedAssets", "meterFixedAssets", "固定资产"),
-    METER_EQUIPMENT("meterEquipment", "meterEquipment", "测量设备"),
-    CALIBRATION_TEST_EQUIPMENT("calibrationTestEquipment", "calibrationTestEquipment", "校准检定设备"),
-    MEASURE_ACCOUNT("measureAccount", "measureAccount", "测量工装"),
-    STANDARD_SUPPORT_EQUIPMENT("standardSupportEquipment", "standardSupportEquipment", "标准配套设备"),
-    STANDARD_EQUIPMENT("standardEquipment", "standardEquipment", "标准装置"),
-    FLOW_DEF_EXPORT("flowDefData", "flowDefData", "流程定义"),
-    STAFF_CERTIFICATE("certificate", "certificate", "计量人员证书"),
-    CHECK_INFO("checkInfo", "checkInfo", "设备管理点检测"),
-    EQUIPMENT_APPLY("equipmentApply", "equipmentApply", "设备借用"),
-    STANDARD_EQUIPMENT_REMIND("equipmentApplyRemind", "equipmentApplyRemind", "标准装置到期提醒"),
-    METER_PRICE("meterPrice", "meterPrice", "价格库"),
-    METER_STAFF("meterStaff", "meterStaff", "计量人员"),
-    STANDARD_EQUIPMENT_APPLY("standardEquipmentApply", "standardEquipmentApply", "标准装置申请"),
-    STATE_MANAGE_APPLY("stateManage", "stateManage", "状态管理"),
-    METER_ACCEPTANCE_CHECK("acceptanceCheck", "acceptanceCheck", "设备检修保养验收单"),
-    CUSTOMER_EXPORT("customerData", "customerData", "客户信息"),
-    ORDER_EXPORT("orderData", "orderData", "委托书信息"),
-    SAMPLE_EXPORT("sampleData", "sampleData", "样本信息"),
-    EXCHANGE_DATA("exchangeData", "exchangeData", "设备交接单"),
-    DISPATCH_DATA("dispatchData", "dispatchData", "设备收发"),
-    ENVIRONMENT_DATA("environmentData", "environmentData", "环境记录单"),
-    ORIGIN_DATA("originData", "originData", "原始记录"),
-    CERTIFICATE_REPORT("certificateReport", "certificateReport", "证书报告"),
-    ADVICE_EXPORT("adviceData", "adviceData", "客户反馈"),
-    HANDOUT_EXPORT("handoutData", "handoutData", "任务分发列表"),
-    OUTSOURCER_EXPORT("outsourcerData", "outsourcerData", "分包方"),
-    SITE_EXECUTIVE_EXPORT("siteExecutiveData", "siteExecutiveData", "现场测试、校准或检定"),
-    CERTIFICATE_PRINT_EXPORT("certificatePrintData", "certificatePrintData", "证书打印"),
-    DOWNLOAD_TEMPLATE("downloadTemplate", "downloadTemplate", "页面配置"),
-    OUTSOURCER_CERTIFICATE_EXPORT("outsourceCertificateData", "outsourceCertificateData", "分包证书"),
-    SETTLEMENT_INFO_EXPORT("settlementInfoData", "settlementInfoData", "业务结算"),
-    EQUIPMENT_REMIND("equipmentRemind", "equipmentRemind", "设备到期提醒"),
-    AGREEMENT_INFO_EXPORT("agreementInfoData", "agreementInfoData", "合同"),
-    WORK_STATISTICS_EXPORT("workStatisticsData", "workStatisticsData", "实时工作统计"),
-    DEPT_OUTPUT_EXPORT("deptOutputData", "deptOutputData", "部门产值分析"),
-    WORKLOAD_EXPORT("workloadData", "workloadData", "业务工作量分析"),
-    DEPT_COMPREHENSIVE_EXPORT("deptComprehensiveData", "deptComprehensiveData", "部门综合分析"),
-    ENVIRONMENTAL_RECORD("environmentalRecordData", "environmentalRecordData", "现场环境记录");
+    /**
+     * 计量检定业务
+     */
+    OUTSOURCER_EXPORT("outsourcerData", "分包方名录", "分包方名录"),
+    IDENTIFY_EXPORT("identifyData", "计量标识", "计量标识"),
+    ORDER_EXPORT("orderData", "任务单", "任务单"),
+    DISPATCH_DATA("dispatchData", "设备收发", "设备收发"),
+    HANDOUT_EXPORT("handoutData", "任务分发", "任务分发"),
+    SITE_EXECUTIVE_EXPORT("siteExecutiveData", "现场测试、校准或检定", "现场测试、校准或检定"),
+    CERTIFICATE_REPORT("certificateReport", "证书审批", "证书审批"),
+    CERTIFICATE_CHANGE_APPLY("certificateChangeApply", "证书报告补充或更换申请单", "证书报告补充或更换申请单"),
+    CERTIFICATE_PRINT("certificatePrintData", "证书打印审批", "证书打印审批"),
+    DEPT_EXECUTIVE_TASK("deptExecutiveTaskData", "实验室任务", "实验室任务"),
+    MY_EXECUTIVE_TASK("myExecutiveTaskData", "我的任务", "我的任务"),
+    OUTSOURCE_ASSESS("outsourceAssess", "测试、校准或检定工作分包评审表", "测试、校准或检定工作分包评审表"),
+    OUTSOURCE_PROTOCOL("outsourceProtocol", "测试、校准或检定工作分包协议书", "测试、校准或检定工作分包协议书"),
+
+    /**
+     * 系统管理
+     */
+    SIGN_EXPORT("signData", "签名", "签名"),
+    TEMPLATE_EXPORT("templateData", "文件模板", "文件模板"),
+    FLOW_DEF_EXPORT("flowDefData", "流程定义", "流程定义"),
+    DOWNLOAD_TEMPLATE("downloadTemplate", "流程定义", "页面配置");
 
     ExportEnum(String fileName, String sheetName, String description) {
         this.fileName = fileName;
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateRecordTypeCodeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateRecordTypeCodeEnum.java
index 31d913c..a963522 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateRecordTypeCodeEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateRecordTypeCodeEnum.java
@@ -46,4 +46,14 @@
     String SITE_EXECUTIVE_APPROVAL = "01";
     //《现场测试、校准或检定工作记录表》
     String SITE_EXECUTIVE_LOG = "02";
+
+    //测试、校准或检定工作分包协议书
+    String OUTSOURCE_PROTOCOL = "01";
+    //测试、校准或检定工作分包评审表
+    String OUTSOURCE_ACCESS = "02";
+    //测试、校准或检定工作分包通知书
+    String OUTSOURCE_NOTICE = "03";
+    //测试、校准或检定工作分包方名录
+    String OUTSOURCE_INFO = "04";
+
 }
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
index 24b8635..f78bd53 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
@@ -15,6 +15,10 @@
     String CERTIFICATE_CHANGE_APPLY_BEAN_NAME = "certificateChangeApplyBean";
     //现场测试、校准或检定
     String SITE_EXECUTIVE_BEAN_NAME = "siteExecutiveBean";
+    //测试、校准或检定工作分包评审表
+    String OUTSOURCE_ASSESS_BEAN_NAME = "outsourceAssessBean";
+    //测试、校准或检定工作分包协议书
+    String OUTSOURCE_PROTOCOL_BEAN_NAME = "outsourceProtocolBean";
 
     /*********************************设备与装置************************************/
     //设备台账
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 b21c661..6b86fd1 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
@@ -18,6 +18,8 @@
     OUTSOURCER_APPROVAL(OUTSOURCER_BEAN_NAME, ""),
     CERTIFICATE_CHANGE_APPROVAL(CERTIFICATE_CHANGE_APPLY_BEAN_NAME, ""),
     SITE_EXECUTIVE_APPROVAL(SITE_EXECUTIVE_BEAN_NAME, ""),
+    OUTSOURCE_ASSESS_APPROVAL(OUTSOURCE_ASSESS_BEAN_NAME, ""),
+    OUTSOURCE_PROTOCOL_APPROVAL(OUTSOURCE_PROTOCOL_BEAN_NAME, ""),
 
     ACTION_STATUS_MAP(new HashMap<String, AwareActionStatusEnum>() {
         {
@@ -47,6 +49,10 @@
             put(ApplyFromIdEnum.CERTIFICATE_CHANGE_APPROVAL.getCode(), CERTIFICATE_CHANGE_APPROVAL);
             //现场测试、校准或检定审批
             put(ApplyFromIdEnum.SITE_EXECUTIVE_APPROVAL.getCode(), SITE_EXECUTIVE_APPROVAL);
+            //测试、校准或检定工作分包评审表
+            put(ApplyFromIdEnum.OUTSOURCE_ASSESS_APPROVAL.getCode(), OUTSOURCE_ASSESS_APPROVAL);
+            //测试、校准或检定工作分包协议书
+            put(ApplyFromIdEnum.OUTSOURCE_PROTOCOL_APPROVAL.getCode(), OUTSOURCE_PROTOCOL_APPROVAL);
         }
     });
     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 934405e..c7410bd 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
@@ -9,6 +9,8 @@
     CERTIFICATE_CHANGE_APPROVAL("jljdywzsbchghsqd", MessageSourceModuleEnum.BUSINESS.getCode(), "证书/报告补充或更换申请单"),
     OUTSOURCER_APPROVAL("jljdywcsjzhgfbfml", MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定合格分包方名录"),
     SITE_EXECUTIVE_APPROVAL("jljdywxccsjzsp", MessageSourceModuleEnum.BUSINESS.getCode(), "现场测试、校准或检定审批"),
+    OUTSOURCE_ASSESS_APPROVAL("jljdywcsjzfbpsb", MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包评审表"),
+    OUTSOURCE_PROTOCOL_APPROVAL("jljdywcsjzfbxys", MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包协议书"),
 
 
     /*******************************************设备与装置*********************************************/
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/GeneralApprovalMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/GeneralApprovalMapper.java
index 4fb7344..0c9d6ae 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/GeneralApprovalMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/GeneralApprovalMapper.java
@@ -17,8 +17,4 @@
 
     Page<O> selectBatchForApprovalList(Page<O> page, @Param("request") R request, @Param("businessKeys") List<String> businessKeys);
 
-//    Page<O> selectListPage(Page<O> page, @Param("request") R request);
-
-//    Long selectMaxNo();
-
 }
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceAssessMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceAssessMapper.java
index 7867bb8..ba59009 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceAssessMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceAssessMapper.java
@@ -1,7 +1,12 @@
 package com.casic.missiles.mapper.business;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.business.outsource.OutsourceAssessApprovalListRequest;
+import com.casic.missiles.mapper.GeneralApprovalMapper;
 import com.casic.missiles.model.business.BizBusinessOutsourceAssess;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * <p>
@@ -11,6 +16,10 @@
  * @author wangpeng
  * @since 2023-08-16
  */
-public interface BizBusinessOutsourceAssessMapper extends BaseMapper<BizBusinessOutsourceAssess> {
+public interface BizBusinessOutsourceAssessMapper extends GeneralApprovalMapper<BizBusinessOutsourceAssess, BizBusinessOutsourceAssess, OutsourceAssessApprovalListRequest> {
+
+    Page<BizBusinessOutsourceAssess> selectBatchForApprovalList(Page<BizBusinessOutsourceAssess> page, @Param("request") OutsourceAssessApprovalListRequest request, @Param("businessKeys") List<String> businessKeys);
+
+    Long selectMaxProjectNo();
 
 }
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceProtocolMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceProtocolMapper.java
new file mode 100644
index 0000000..e6aba35
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceProtocolMapper.java
@@ -0,0 +1,24 @@
+package com.casic.missiles.mapper.business;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.business.outsource.OutsourceProtocolApprovalListRequest;
+import com.casic.missiles.mapper.GeneralApprovalMapper;
+import com.casic.missiles.model.business.BizBusinessOutsourceProtocol;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 计量检定业务-分包管理-测试、校准或检定工作分包协议书 Mapper 接口
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-08-24
+ */
+public interface BizBusinessOutsourceProtocolMapper extends GeneralApprovalMapper<BizBusinessOutsourceProtocol, BizBusinessOutsourceProtocol, OutsourceProtocolApprovalListRequest> {
+
+    Page<BizBusinessOutsourceProtocol> selectBatchForApprovalList(Page<BizBusinessOutsourceProtocol> page, @Param("request") OutsourceProtocolApprovalListRequest request, @Param("businessKeys") List<String> businessKeys);
+
+    Long selectMaxProtocolNo();
+}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/EnvLocationInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/EnvLocationInfoMapper.java
new file mode 100644
index 0000000..49eff87
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/EnvLocationInfoMapper.java
@@ -0,0 +1,21 @@
+package com.casic.missiles.mapper.resource;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.resource.environment.LocationListRequest;
+import com.casic.missiles.dto.resource.environment.LocationListResponse;
+import com.casic.missiles.model.resource.EnvLocationInfo;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * <p>
+ * 实验室环境监控系统-设备表 Mapper 接口
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-06-07
+ */
+public interface EnvLocationInfoMapper extends BaseMapper<EnvLocationInfo> {
+
+    Page<LocationListResponse> selectLocationListPage(Page<LocationListResponse> page, @Param("request") LocationListRequest request);
+}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java
index de124db..85ed0f7 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java
@@ -1,7 +1,9 @@
 package com.casic.missiles.mapper.system;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.dto.system.SignDetailResponse;
+import com.casic.missiles.dto.system.SignListRequest;
 import com.casic.missiles.model.system.SystemSign;
 import org.apache.ibatis.annotations.Param;
 
@@ -22,4 +24,8 @@
     SignDetailResponse selectSignDetailById(Long id);
 
     List<SystemSign> selectUsableSignList(@Param("userId") Long userId);
+
+    Page<SystemSign> selectSignListPage(Page<SystemSign> page, @Param("request") SignListRequest request);
+
+    List<SystemSign> selectSignList(@Param("request") SignListRequest request);
 }
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateChangeApplyMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateChangeApplyMapper.xml
index d798447..c496092 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateChangeApplyMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateChangeApplyMapper.xml
@@ -30,31 +30,31 @@
         SELECT *
         FROM biz_business_certificate_change_apply
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.changeApplyNo != null and request.changeApplyNo !=''">
+        <if test="request != null and request.changeApplyNo != null and request.changeApplyNo !=''">
             and change_apply_no like concat('%',#{request.changeApplyNo},'%')
         </if>
-        <if test="request.changeReportNo != null and request.changeReportNo !=''">
+        <if test="request != null and request.changeReportNo != null and request.changeReportNo !=''">
             and change_report_no like concat('%',#{request.changeReportNo},'%')
         </if>
-        <if test="request.changeReportName != null and request.changeReportName !=''">
+        <if test="request != null and request.changeReportName != null and request.changeReportName !=''">
             and change_report_name like concat('%',#{request.changeReportName},'%')
         </if>
-        <if test="request.changeType != null and request.changeType !=''">
+        <if test="request != null and request.changeType != null and request.changeType !=''">
             and change_type = #{request.changeType}
         </if>
-        <if test="request.createUserName != null and request.createUserName !=''">
+        <if test="request != null and request.createUserName != null and request.createUserName !=''">
             and create_user_name like concat('%',#{request.createUserName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificatePrintMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificatePrintMapper.xml
index b66cd99..49c0ac8 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificatePrintMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificatePrintMapper.xml
@@ -31,34 +31,34 @@
         LEFT JOIN biz_business_order_sample_relation bosr ON (bosr.order_id = bcr.order_id AND bosr.sample_id = bcr.sample_id)
         LEFT JOIN biz_business_order_info boi ON boi.id = bosr.order_id
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and bcp.approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.printStatus != null and request.printStatus !=''">
+        <if test="request != null and request.printStatus != null and request.printStatus !=''">
             and print_status = #{request.printStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and bcp.create_user_id = #{request.createUserId}
         </if>
-        <if test="request.certificateReportNo != null and request.certificateReportNo !=''">
+        <if test="request != null and request.certificateReportNo != null and request.certificateReportNo !=''">
             and bcr.certificate_report_no like concat('%',#{request.certificateReportNo},'%')
         </if>
-        <if test="request.certificateReportName != null and request.certificateReportName !=''">
+        <if test="request != null and request.certificateReportName != null and request.certificateReportName !=''">
             and bcr.certificate_report_name like concat('%',#{request.certificateReportName},'%')
         </if>
-        <if test="request.customerName != null and request.customerName !=''">
+        <if test="request != null and request.customerName != null and request.customerName !=''">
             and boi.customer_name like concat('%',#{request.customerName},'%')
         </if>
-        <if test="request.sampleNo != null and request.sampleNo !=''">
+        <if test="request != null and request.sampleNo != null and request.sampleNo !=''">
             and bosr.sample_no like concat('%',#{request.sampleNo},'%')
         </if>
-        <if test="request.sampleName != null and request.sampleName !=''">
+        <if test="request != null and request.sampleName != null and request.sampleName !=''">
             and bosr.sample_name like concat('%',#{request.sampleName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and bcp.create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and bcp.create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml
index b366034..767695d 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml
@@ -46,33 +46,37 @@
         SELECT bcr.*, bosr.sample_no, bosr.sample_name, bosr.sample_model, rsi.staff_name
         FROM biz_business_certificate_report bcr
         LEFT JOIN biz_business_order_sample_relation bosr ON (bosr.order_id = bcr.order_id AND bosr.sample_id = bcr.sample_id)
+        LEFT JOIN biz_business_order_info boi ON boi.id = bcr.order_id
         LEFT JOIN biz_resource_staff_info rsi ON rsi.id = bcr.measure_person_id
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and bcr.approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and bcr.create_user_id = #{request.createUserId}
         </if>
-        <if test="request.certificateReportNo != null and request.certificateReportNo !=''">
+        <if test="request != null and request.customerId != null and request.customerId !=''">
+            and boi.customer_id = #{request.customerId}
+        </if>
+        <if test="request != null and request.certificateReportNo != null and request.certificateReportNo !=''">
             and bcr.certificate_report_no like concat('%',#{request.certificateReportNo},'%')
         </if>
-        <if test="request.certificateReportName != null and request.certificateReportName !=''">
+        <if test="request != null and request.certificateReportName != null and request.certificateReportName !=''">
             and bcr.certificate_report_name like concat('%',#{request.certificateReportName},'%')
         </if>
-        <if test="request.sampleNo != null and request.sampleNo !=''">
+        <if test="request != null and request.sampleNo != null and request.sampleNo !=''">
             and bosr.sample_no like concat('%',#{request.sampleNo},'%')
         </if>
-        <if test="request.measureCategory != null and request.measureCategory !=''">
+        <if test="request != null and request.measureCategory != null and request.measureCategory !=''">
             and bcr.measure_category = #{request.measureCategory}
         </if>
-        <if test="request.measurePerson != null and request.measurePerson !=''">
+        <if test="request != null and request.measurePerson != null and request.measurePerson !=''">
             and rsi.staff_name like concat('%',#{request.measurePerson},'%')
         </if>
-        <if test="request.calibrationTimeStart != null and request.calibrationTimeStart !=''">
+        <if test="request != null and request.calibrationTimeStart != null and request.calibrationTimeStart !=''">
             and bcr.calibration_time &gt;= #{request.calibrationTimeStart}
         </if>
-        <if test="request.calibrationTimeEnd != null and request.calibrationTimeEnd !=''">
+        <if test="request != null and request.calibrationTimeEnd != null and request.calibrationTimeEnd !=''">
             and bcr.calibration_time &lt;= #{request.calibrationTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceAssessMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceAssessMapper.xml
index d0fcf8b..c22c101 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceAssessMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceAssessMapper.xml
@@ -7,6 +7,8 @@
         <id column="id" property="id" />
         <result column="project_no" property="projectNo" />
         <result column="project_name" property="projectName" />
+        <result column="lab_code" property="labCode" />
+        <result column="group_code" property="groupCode" />
         <result column="applicant_id" property="applicantId" />
         <result column="applicant_name" property="applicantName" />
         <result column="applicant_time" property="applicantTime" />
@@ -31,7 +33,45 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, project_no, project_name, applicant_id, applicant_name, applicant_time, minio_file_name, remark, create_user_id, create_user_name, outsourcer_id, pre_start_time, pre_end_time, outsource_reason, pre_cost, approval_status, process_id, approve_situation, traceability, test_method, technique_ability, create_time, update_time
+        id, project_no, project_name, lab_code, group_code, applicant_id, applicant_name, applicant_time, minio_file_name, remark, create_user_id, create_user_name, outsourcer_id, pre_start_time, pre_end_time, outsource_reason, pre_cost, approval_status, process_id, approve_situation, traceability, test_method, technique_ability, create_time, update_time
     </sql>
 
+    <select id="selectMaxProjectNo" resultType="java.lang.Long">
+        SELECT IFNULL(max(RIGHT(project_no, 3)), 0) from biz_business_outsource_assess
+    </select>
+
+    <select id="selectBatchForApprovalList" resultMap="BaseResultMap">
+        SELECT bboa.*, bboi.outsourcer_name, bboi.director
+        FROM biz_business_outsource_assess bboa
+        LEFT JOIN biz_business_outsourcer_info bboi ON bboa.outsourcer_id = bboi.id
+        WHERE 1=1
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
+            and bboa.approval_status = #{request.approvalStatus}
+        </if>
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
+            and bboa.create_user_id = #{request.createUserId}
+        </if>
+        <if test="request != null and request.projectNo != null and request.projectNo !=''">
+            and bboa.project_no like concat('%',#{request.projectNo},'%')
+        </if>
+        <if test="request != null and request.outsourcerName != null and request.outsourcerName !=''">
+            and bboi.outsourcer_name like concat('%',#{request.outsourcerName},'%')
+        </if>
+        <if test="request != null and request.applicantName != null and request.applicantName !=''">
+            and bboa.applicant_name like concat('%',#{request.applicantName},'%')
+        </if>
+        <if test="request != null and request.applicantTimeStart != null and request.applicantTimeStart !=''">
+            and bboa.applicant_time &gt;= #{request.applicantTimeStart}
+        </if>
+        <if test="request != null and request.applicantTimeEnd != null and request.applicantTimeEnd !=''">
+            and bboa.applicant_time &lt;= #{request.applicantTimeEnd}
+        </if>
+        <if test="businessKeys != null">
+            and bboa.id in
+            <foreach collection="businessKeys" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
+        ORDER BY bboa.create_time DESC
+    </select>
 </mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceProtocolMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceProtocolMapper.xml
new file mode 100644
index 0000000..b7b2149
--- /dev/null
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceProtocolMapper.xml
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.mapper.business.BizBusinessOutsourceProtocolMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.business.BizBusinessOutsourceProtocol">
+        <id column="id" property="id" />
+        <result column="protocol_no" property="protocolNo" />
+        <result column="project_name" property="projectName" />
+        <result column="lab_code" property="labCode" />
+        <result column="group_code" property="groupCode" />
+        <result column="outsourcer_id" property="outsourcerId" />
+        <result column="remark" property="remark" />
+        <result column="outsource_no" property="outsourceNo" />
+        <result column="outsource_name" property="outsourceName" />
+        <result column="contacts" property="contacts" />
+        <result column="mobile" property="mobile" />
+        <result column="address" property="address" />
+        <result column="require_date" property="requireDate" />
+        <result column="outsource_cost" property="outsourceCost" />
+        <result column="director" property="director" />
+        <result column="item" property="item" />
+        <result column="requires" property="requires" />
+        <result column="create_user_id" property="createUserId" />
+        <result column="create_user_name" property="createUserName" />
+        <result column="approval_status" property="approvalStatus" />
+        <result column="process_id" property="processId" />
+        <result column="create_time" property="createTime" />
+        <result column="update_time" property="updateTime" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, protocol_no, project_name, lab_code, group_code, outsourcer_id, remark, outsource_no, outsource_name, contacts, mobile, address, require_date, outsource_cost, director, item, requires, create_user_id, create_user_name, approval_status, process_id, create_time, update_time
+    </sql>
+
+    <select id="selectMaxProtocolNo" resultType="java.lang.Long">
+        SELECT IFNULL(max(RIGHT(protocol_no, 3)), 0) from biz_business_outsource_protocol
+    </select>
+
+    <select id="selectBatchForApprovalList" resultMap="BaseResultMap">
+        SELECT *
+        FROM biz_business_outsource_protocol
+        WHERE 1=1
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
+            and approval_status = #{request.approvalStatus}
+        </if>
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
+            and create_user_id = #{request.createUserId}
+        </if>
+        <if test="request != null and request.protocolNo != null and request.protocolNo !=''">
+            and protocol_no like concat('%',#{request.protocolNo},'%')
+        </if>
+        <if test="request != null and request.outsourcerName != null and request.outsourcerName !=''">
+            and outsourcer_name like concat('%',#{request.outsourcerName},'%')
+        </if>
+        <if test="request != null and request.applicantName != null and request.applicantName !=''">
+            and create_user_name like concat('%',#{request.applicantName},'%')
+        </if>
+        <if test="request != null and request.applicantTimeStart != null and request.applicantTimeStart !=''">
+            and create_time &gt;= #{request.applicantTimeStart}
+        </if>
+        <if test="request != null and request.applicantTimeEnd != null and request.applicantTimeEnd !=''">
+            and create_time &lt;= #{request.applicantTimeEnd}
+        </if>
+        <if test="businessKeys != null">
+            and id in
+            <foreach collection="businessKeys" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
+        ORDER BY create_time DESC
+    </select>
+</mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourcerInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourcerInfoMapper.xml
index 510a80b..3049b54 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourcerInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourcerInfoMapper.xml
@@ -7,6 +7,8 @@
         <id column="id" property="id" />
         <result column="outsourcer_no" property="outsourcerNo" />
         <result column="outsourcer_name" property="outsourcerName" />
+        <result column="lab_code" property="labCode" />
+        <result column="group_code" property="groupCode" />
         <result column="outsourcer_brief_name" property="outsourcerBriefName" />
         <result column="outsourcer_size" property="outsourcerSize" />
         <result column="business_size" property="businessSize" />
@@ -55,32 +57,32 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, outsourcer_no, outsourcer_name, outsourcer_brief_name, outsourcer_size, business_size, grade, evaluation, tax_number, bank_account, bank_name, bank_account_number, postal_code, director, phone, fax, mobile, email, website, address_country, address_province, address_city, address_area, full_address, address_country_name, address_province_name, address_city_name, address_area_name, invoice_country, invoice_province, invoice_city, invoice_area, invoice_full_address, invoice_country_name, invoice_province_name, invoice_city_name, invoice_area_name, business_scope, business_content, minio_file_name, approval_status, process_id, remark, create_user_id, create_user_name, create_time, update_time
+        id, outsourcer_no, outsourcer_name, lab_code, group_code, outsourcer_brief_name, outsourcer_size, business_size, grade, evaluation, tax_number, bank_account, bank_name, bank_account_number, postal_code, director, phone, fax, mobile, email, website, address_country, address_province, address_city, address_area, full_address, address_country_name, address_province_name, address_city_name, address_area_name, invoice_country, invoice_province, invoice_city, invoice_area, invoice_full_address, invoice_country_name, invoice_province_name, invoice_city_name, invoice_area_name, business_scope, business_content, minio_file_name, approval_status, process_id, remark, create_user_id, create_user_name, create_time, update_time
     </sql>
 
     <select id="selectBatchForApprovalList" resultMap="BaseResultMap">
         SELECT *
         FROM biz_business_outsourcer_info
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.outsourcerNo != null and request.outsourcerNo !=''">
+        <if test="request != null and request.outsourcerNo != null and request.outsourcerNo !=''">
             and outsourcer_no like concat('%',#{request.outsourcerNo},'%')
         </if>
-        <if test="request.outsourcerName != null and request.outsourcerName !=''">
+        <if test="request != null and request.outsourcerName != null and request.outsourcerName !=''">
             and outsourcer_name like concat('%',#{request.outsourcerName},'%')
         </if>
-        <if test="request.director != null and request.director !=''">
+        <if test="request != null and request.director != null and request.director !=''">
             and director like concat('%',#{request.director},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
@@ -93,6 +95,6 @@
     </select>
 
     <select id="selectMaxNo" resultType="java.lang.Long">
-        SELECT IFNULL(max(RIGHT(outsourcer_no, 12)), 0) from biz_business_outsourcer_info
+        SELECT IFNULL(max(RIGHT(outsourcer_no, 3)), 0) from biz_business_outsourcer_info
     </select>
 </mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessSiteExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessSiteExecutiveInfoMapper.xml
index 135c5d0..3c5ae79 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessSiteExecutiveInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessSiteExecutiveInfoMapper.xml
@@ -38,25 +38,25 @@
         FROM biz_business_site_executive_info bsei
         LEFT JOIN biz_resource_customer_info rci ON bsei.customer_id = rci.id
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and bsei.approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and bsei.create_user_id = #{request.createUserId}
         </if>
-        <if test="request.siteExecutiveNo != null and request.siteExecutiveNo !=''">
+        <if test="request != null and request.siteExecutiveNo != null and request.siteExecutiveNo !=''">
             and bsei.site_executive_no like concat('%',#{request.siteExecutiveNo},'%')
         </if>
-        <if test="request.customerName != null and request.customerName !=''">
+        <if test="request != null and request.customerName != null and request.customerName !=''">
             and rci.outsourcer_name like concat('%',#{request.customerName},'%')
         </if>
-        <if test="request.applyName != null and request.applyName !=''">
+        <if test="request != null and request.applyName != null and request.applyName !=''">
             and bsei.apply_name like concat('%',#{request.applyName},'%')
         </if>
-        <if test="request.applyTimeStart != null and request.applyTimeStart !=''">
+        <if test="request != null and request.applyTimeStart != null and request.applyTimeStart !=''">
             and bsei.apply_time &gt;= #{request.applyTimeStart}
         </if>
-        <if test="request.applyTimeEnd != null and request.applyTimeEnd !=''">
+        <if test="request != null and request.applyTimeEnd != null and request.applyTimeEnd !=''">
             and bsei.apply_time &lt;= #{request.applyTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml
index 84d9e2a..6bd38a9 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml
@@ -105,6 +105,12 @@
         <if test="request.isUrgent != null and request.isUrgent !=''">
             AND bo.is_urgent = #{request.isUrgent}
         </if>
+        <if test="request.ids != null">
+            and blei.id in
+            <foreach collection="request.ids" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
         ORDER BY blei.update_time DESC
     </select>
 
@@ -137,6 +143,12 @@
         <if test="request.isUrgent != null and request.isUrgent !=''">
             AND bo.is_urgent = #{request.isUrgent}
         </if>
+        <if test="request.ids != null">
+            and blei.id in
+            <foreach collection="request.ids" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
         ORDER BY blei.update_time DESC
     </select>
 
diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardInfoMapper.xml
index 1a5551b..2ed8d17 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardInfoMapper.xml
@@ -45,12 +45,6 @@
         FROM biz_equipment_standard_info besi
         LEFT JOIN biz_equipment_standard_technology_relation bestr ON besi.standard_no = bestr.standard_no
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
-            and besi.approval_status = #{request.approvalStatus}
-        </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
-            and besi.create_user_id = #{request.createUserId}
-        </if>
         <if test="request.standardName != null and request.standardName !=''">
             and besi.standard_name like concat('%',#{request.standardName},'%')
         </if>
diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardTechnologyRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardTechnologyRelationMapper.xml
index fc7e16c..cd03c8c 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardTechnologyRelationMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardTechnologyRelationMapper.xml
@@ -6,6 +6,7 @@
     <resultMap id="BaseResultMap" type="com.casic.missiles.model.equipment.BizEquipmentStandardTechnologyRelation">
         <id column="id" property="id" />
         <result column="technology_file_id" property="technologyFileId" />
+        <result column="technology_file_no" property="technologyFileNo" />
         <result column="technology_file_name" property="technologyFileName" />
         <result column="standard_id" property="standardId" />
         <result column="standard_no" property="standardNo" />
@@ -14,7 +15,7 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, technology_file_id, technology_file_name, standard_id, remark
+        id, technology_file_id, technology_file_no, technology_file_name, standard_id, remark
     </sql>
 
 </mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceAuthorizeOrderMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceAuthorizeOrderMapper.xml
index ac5176c..554fe65 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceAuthorizeOrderMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceAuthorizeOrderMapper.xml
@@ -32,22 +32,22 @@
         SELECT *
         FROM biz_resource_authorize_order
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.orderNo != null and request.orderNo !=''">
+        <if test="request != null and request.orderNo != null and request.orderNo !=''">
             and order_no like concat('%',#{request.orderNo},'%')
         </if>
-        <if test="request.createUserName != null and request.createUserName !=''">
+        <if test="request != null and request.createUserName != null and request.createUserName !=''">
             and create_user_name like concat('%',#{request.createUserName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerExamineFormMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerExamineFormMapper.xml
index ab242f6..af7f98f 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerExamineFormMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerExamineFormMapper.xml
@@ -41,28 +41,28 @@
         SELECT *
         FROM biz_resource_customer_examine_form
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.formNo != null and request.formNo !=''">
+        <if test="request != null and request.formNo != null and request.formNo !=''">
             and form_no like concat('%',#{request.formNo},'%')
         </if>
-        <if test="request.labCode != null and request.labCode !=''">
+        <if test="request != null and request.labCode != null and request.labCode !=''">
             and lab_code like concat('%',#{request.labCode},'%')
         </if>
-        <if test="request.groupCode != null and request.groupCode !=''">
+        <if test="request != null and request.groupCode != null and request.groupCode !=''">
             and group_code like concat('%',#{request.groupCode},'%')
         </if>
-        <if test="request.createUserName != null and request.createUserName !=''">
+        <if test="request != null and request.createUserName != null and request.createUserName !=''">
             and create_user_name like concat('%',#{request.createUserName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerInfoMapper.xml
index fa8ffbc..06a2798 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerInfoMapper.xml
@@ -33,25 +33,25 @@
         SELECT *
         FROM biz_resource_customer_info
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.customerNo != null and request.customerNo !=''">
+        <if test="request != null and request.customerNo != null and request.customerNo !=''">
             and customer_no like concat('%',#{request.customerNo},'%')
         </if>
-        <if test="request.customerName != null and request.customerName !=''">
+        <if test="request != null and request.customerName != null and request.customerName !=''">
             and customer_name like concat('%',#{request.customerName},'%')
         </if>
-        <if test="request.contacts != null and request.contacts !=''">
+        <if test="request != null and request.contacts != null and request.contacts !=''">
             and contacts like concat('%',#{request.contacts},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerSuggestFormMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerSuggestFormMapper.xml
index 28f5bb2..1806662 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerSuggestFormMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerSuggestFormMapper.xml
@@ -33,28 +33,28 @@
         SELECT *
         FROM biz_resource_customer_suggest_form
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.formNo != null and request.formNo !=''">
+        <if test="request != null and request.formNo != null and request.formNo !=''">
             and form_no like concat('%',#{request.formNo},'%')
         </if>
-        <if test="request.customerName != null and request.customerName !=''">
+        <if test="request != null and request.customerName != null and request.customerName !=''">
             and customer_name like concat('%',#{request.customerName},'%')
         </if>
-        <if test="request.customerDeptName != null and request.customerDeptName !=''">
+        <if test="request != null and request.customerDeptName != null and request.customerDeptName !=''">
             and customer_dept_name like concat('%',#{request.customerDeptName},'%')
         </if>
-        <if test="request.createUserName != null and request.createUserName !=''">
+        <if test="request != null and request.createUserName != null and request.createUserName !=''">
             and create_user_name like concat('%',#{request.createUserName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSealUseNoteMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSealUseNoteMapper.xml
index ab37bc1..b02bb33 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSealUseNoteMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSealUseNoteMapper.xml
@@ -29,32 +29,32 @@
     </sql>
 
     <select id="selectBatchForApprovalList" resultMap="BaseResultMap">
-        SELECT *
+        SELECT brsun.*, brsi.seal_name, brsi.seal_type, brsi.approver_name
         FROM biz_resource_seal_use_note brsun
         JOIN biz_resource_seal_info brsi ON brsun.seal_id = brsi.id
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and brsun.approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and brsun.create_user_id = #{request.createUserId}
         </if>
-        <if test="request.sealName != null and request.sealName !=''">
+        <if test="request != null and request.sealName != null and request.sealName !=''">
             and brsi.seal_name like concat('%',#{request.sealName},'%')
         </if>
-        <if test="request.sealType != null and request.sealType !=''">
+        <if test="request != null and request.sealType != null and request.sealType !=''">
             and brsi.seal_type = #{request.sealType}
         </if>
-        <if test="request.applyDeptName != null and request.applyDeptName !=''">
+        <if test="request != null and request.applyDeptName != null and request.applyDeptName !=''">
             and brsun.apply_dept_name like concat('%',#{request.applyDeptName},'%')
         </if>
-        <if test="request.applyUserName != null and request.applyUserName !=''">
+        <if test="request != null and request.applyUserName != null and request.applyUserName !=''">
             and brsun.apply_user_name like concat('%',#{request.applyUserName},'%')
         </if>
-        <if test="request.applyTimeStart != null and request.applyTimeStart !=''">
+        <if test="request != null and request.applyTimeStart != null and request.applyTimeStart !=''">
             and brsun.apply_time &gt;= #{request.applyTimeStart}
         </if>
-        <if test="request.applyTimeEnd != null and request.applyTimeEnd !=''">
+        <if test="request != null and request.applyTimeEnd != null and request.applyTimeEnd !=''">
             and brsun.apply_time &lt;= #{request.applyTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml
index 119bf7d..4f8392a 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml
@@ -31,6 +31,12 @@
         <if test="request.deptName != null and request.deptName !=''">
             and brsi.dept_name like concat('%',#{request.deptName},'%')
         </if>
+        <if test="request.ids != null">
+            and brsv.id in
+            <foreach collection="request.ids" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
         ORDER BY brsv.grant_date DESC
     </select>
 
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSupplierInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSupplierInfoMapper.xml
index fe8d399..e8ce7ef 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSupplierInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSupplierInfoMapper.xml
@@ -48,28 +48,28 @@
         SELECT *
         FROM biz_resource_supplier_info
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.supplierNo != null and request.supplierNo !=''">
+        <if test="request != null and request.supplierNo != null and request.supplierNo !=''">
             and supplier_no like concat('%',#{request.supplierNo},'%')
         </if>
-        <if test="request.supplierName != null and request.supplierName !=''">
+        <if test="request != null and request.supplierName != null and request.supplierName !=''">
             and supplier_name like concat('%',#{request.supplierName},'%')
         </if>
-        <if test="request.director != null and request.director !=''">
+        <if test="request != null and request.director != null and request.director !=''">
             and director like concat('%',#{request.director},'%')
         </if>
-        <if test="request.supplierType != null and request.supplierType !=''">
+        <if test="request != null and request.supplierType != null and request.supplierType !=''">
             and supplier_type = #{request.supplierType}
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/EnvLocationInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/EnvLocationInfoMapper.xml
new file mode 100644
index 0000000..68bcf10
--- /dev/null
+++ b/casic-metering-dao/src/main/resources/mapper/resource/EnvLocationInfoMapper.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.mapper.resource.EnvLocationInfoMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.resource.EnvLocationInfo">
+        <id column="id" property="id" />
+        <result column="location_no" property="locationNo" />
+        <result column="location_name" property="locationName" />
+        <result column="location_position" property="locationPosition" />
+        <result column="create_user_id" property="createUserId" />
+        <result column="create_user" property="createUser" />
+        <result column="create_time" property="createTime" />
+        <result column="update_time" property="updateTime" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, location_no, location_name, location_position, create_user_id, create_user, create_time, update_time
+    </sql>
+
+    <select id="selectLocationListPage" resultType="com.casic.missiles.dto.resource.environment.LocationListResponse">
+        SELECT *
+        FROM env_location_info
+        WHERE 1=1
+        <if test="request.locationNo != null and request.locationNo !=''">
+            AND location_no LIKE concat('%',#{request.locationNo},'%')
+        </if>
+        <if test="request.locationName != null and request.locationName !=''">
+            AND location_name LIKE concat('%',#{request.locationName},'%')
+        </if>
+        ORDER BY create_time DESC
+    </select>
+
+</mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml
index b28c18f..8854047 100644
--- a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml
@@ -11,7 +11,6 @@
         <result column="sign_desc" property="signDesc" />
         <result column="sign_director" property="signDirector" />
         <result column="sign_user_id" property="signUserId" />
-        <result column="sign_type" property="signType" />
         <result column="minio_file_name" property="minioFileName" />
         <result column="create_time" property="createTime" />
         <result column="update_time" property="updateTime" />
@@ -28,7 +27,6 @@
         <result column="sign_name" property="signName" />
         <result column="sign_desc" property="signDesc" />
         <result column="sign_director" property="signDirector" />
-        <result column="sign_type" property="signType" />
         <result column="sign_user_id" property="signUserId" />
         <result column="minio_file_name" property="minioFileName" />
         <result column="create_time" property="createTime" />
@@ -62,4 +60,58 @@
         JOIN system_sign_user_relation ssur ON ss.id = ssur.sign_id
         WHERE ssur.user_id = #{userId}
     </select>
+
+    <select id="selectSignListPage" resultMap="BaseResultMap">
+        SELECT ss.*, sd.SIMPLE_NAME AS deptName
+        FROM system_sign ss
+        LEFT JOIN sys_user su ON su.id = ss.sign_user_id
+        LEFT JOIN sys_dept sd ON sd.id = su.dept_id
+        WHERE 1=1
+        <if test="request.signNo != null and request.signNo !=''">
+            AND ss.sign_no LIKE concat('%',#{request.signNo},'%')
+        </if>
+        <if test="request.signName != null and request.signName !=''">
+            AND ss.sign_name LIKE concat('%',#{request.signName},'%')
+        </if>
+        <if test="request.signDirector != null and request.signDirector !=''">
+            AND ss.sign_director LIKE concat('%',#{request.signDirector},'%')
+        </if>
+        <if test="request.signUserId != null and request.signUserId !=''">
+            AND ss.sign_user_id = #{request.signUserId}
+        </if>
+        <if test="request.createStartTime != null and request.createStartTime !=''">
+            AND DATE_FORMAT(ss.create_time,'%Y-%m-%d') &gt;= DATE_FORMAT(#{request.createStartTime},'%Y-%m-%d')
+        </if>
+        <if test="request.createEndTime != null and request.createEndTime !=''">
+            AND DATE_FORMAT(ss.create_time,'%Y-%m-%d')  &lt;= DATE_FORMAT(#{request.createEndTime},'%Y-%m-%d')
+        </if>
+        ORDER BY ss.create_time DESC
+    </select>
+
+    <select id="selectSignList" resultMap="BaseResultMap">
+        SELECT ss.*, sd.SIMPLE_NAME AS deptName
+        FROM system_sign ss
+        LEFT JOIN sys_user su ON su.id = ss.sign_user_id
+        LEFT JOIN sys_dept sd ON sd.id = su.dept_id
+        WHERE 1=1
+        <if test="request.signNo != null and request.signNo !=''">
+            AND ss.sign_no LIKE concat('%',#{request.signNo},'%')
+        </if>
+        <if test="request.signName != null and request.signName !=''">
+            AND ss.sign_name LIKE concat('%',#{request.signName},'%')
+        </if>
+        <if test="request.signDirector != null and request.signDirector !=''">
+            AND ss.sign_director LIKE concat('%',#{request.signDirector},'%')
+        </if>
+        <if test="request.signUserId != null and request.signUserId !=''">
+            AND ss.sign_user_id = #{request.signUserId}
+        </if>
+        <if test="request.createStartTime != null and request.createStartTime !=''">
+            AND DATE_FORMAT(ss.create_time,'%Y-%m-%d') &gt;= DATE_FORMAT(#{request.createStartTime},'%Y-%m-%d')
+        </if>
+        <if test="request.createEndTime != null and request.createEndTime !=''">
+            AND DATE_FORMAT(ss.create_time,'%Y-%m-%d')  &lt;= DATE_FORMAT(#{request.createEndTime},'%Y-%m-%d')
+        </if>
+        ORDER BY ss.create_time DESC
+    </select>
 </mapper>

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java
index bb0c50f..13a699b 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java
@@ -12,6 +12,7 @@
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.IGeneralApprovalService;
+import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
@@ -19,6 +20,7 @@
 import org.springframework.web.bind.annotation.RequestBody;
 
 import javax.validation.Valid;
+import java.util.List;
 import java.util.Objects;
 
 /**
@@ -117,4 +119,17 @@
         }
         return baseApprovalService.failUpdate(request);
     }
+
+    public List<O> exportList(@RequestBody @Valid R request) throws Exception {
+        List<O> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = baseApprovalService.listExportByIds(request.getIds());
+        } else {
+            list = baseApprovalService.listExport(request);
+        }
+        for (O record : list) {
+            DictCodeUtils.convertDictCodeToName(record);
+        }
+        return list;
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java
index 8a90961..d775831 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java
@@ -5,6 +5,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.business.certificate.CertificateChangeApplyApprovalListRequest;
 import com.casic.missiles.dto.business.certificate.CertificateChangeApplySaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessCertificateChangeApply;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
@@ -20,6 +21,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -48,4 +50,12 @@
         }
         return changeApplyService.saveChangeApply(request);
     }
+
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody CertificateChangeApplyApprovalListRequest request) throws Exception {
+        List<BizBusinessCertificateChangeApply> list = super.exportList(request);
+        super.exportExcel(BizBusinessCertificateChangeApply.class, list, ExportEnum.CERTIFICATE_CHANGE_APPLY.getSheetName());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java
index 5fc4b07..af8230e 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java
@@ -9,6 +9,7 @@
 import com.casic.missiles.dto.business.certificate.CertificatePrintApprovalListRequest;
 import com.casic.missiles.dto.business.certificate.CertificatePrintListResponse;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.enums.business.CertificatePrintStatusEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessCertificatePrintLog;
@@ -18,10 +19,16 @@
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.io.IOException;
+import java.util.List;
 import java.util.Objects;
 
 /**
@@ -98,4 +105,16 @@
         });
         return certificatePrintService.certificatePrintLog(idDTO.getId());
     }
+
+    @ApiOperation("证书打印审批导出")
+    @PostMapping("/listExport")
+    public void exportList(@RequestBody CertificatePrintApprovalListRequest request) throws IOException {
+        List<CertificatePrintListResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = certificatePrintService.listByIds(request.getIds());
+        } else {
+            list = certificatePrintService.list(request);
+        }
+        super.exportExcel(CertificatePrintListResponse.class, list, ExportEnum.CERTIFICATE_PRINT.getSheetName());
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java
index 63b06dc..6b2efd5 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java
@@ -6,6 +6,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.business.certificate.CertificateReportApprovalListRequest;
 import com.casic.missiles.dto.business.certificate.CertificateReportSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessCertificateReport;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
@@ -21,6 +22,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -50,7 +52,7 @@
         return certificateReportService.saveCertificateReport(request);
     }
 
-    @ApiOperation("证书审批详情（基本信息）")
+    @ApiOperation("详情（基本信息）")
     @PostMapping("/detail")
     public ReturnDTO<BizBusinessCertificateReport> detail(@RequestBody @Valid BaseDetailRequest request, BindingResult bindingResult) throws Exception {
         if(bindingResult.hasErrors()){
@@ -59,4 +61,11 @@
         return certificateReportService.detail(request);
     }
 
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody CertificateReportApprovalListRequest request) throws Exception {
+        List<BizBusinessCertificateReport> list = super.exportList(request);
+        super.exportExcel(BizBusinessCertificateReport.class, list, ExportEnum.CERTIFICATE_REPORT.getSheetName());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java
index 46b26bd..57c0809 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java
@@ -10,20 +10,21 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.business.identify.IdentifyListRequest;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessIdentifyInfo;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.business.IBizBusinessIdentifyInfoService;
+import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import javax.validation.Valid;
+import java.util.List;
 import java.util.Objects;
 
 /**
@@ -57,16 +58,13 @@
         return identifyInfoService.addIdentify(identifyInfo);
     }
 
-    @ApiOperation("标识打印更新")
+    @ApiOperation("标识打印更新（更新打印时间）")
     @PostMapping("/update")
-    public ReturnDTO updateIdentify(@RequestBody @Valid BizBusinessIdentifyInfo identifyInfo, BindingResult bindingResult) {
-        Assert.isFalse(Objects.isNull(identifyInfo.getId()), () -> {
+    public ReturnDTO updateIdentify(@RequestBody @Valid IdDTO idDTO) {
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        Assert.isFalse(bindingResult.hasErrors(), () -> {
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        });
-        return identifyInfoService.updateIdentify(identifyInfo);
+        return identifyInfoService.updateIdentify(idDTO.getId());
     }
 
     @ApiOperation("标识打印删除")
@@ -77,4 +75,37 @@
         });
         return identifyInfoService.deleteIdentify(idDTO.getId());
     }
+
+    @ApiOperation("标识打印导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody @Valid IdentifyListRequest request, BindingResult bindingResult) throws Exception {
+        if (bindingResult.hasErrors()) {
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        List<BizBusinessIdentifyInfo> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = identifyInfoService.listByIds(request.getIds());
+        } else {
+            list = identifyInfoService.list(request);
+        }
+        for (BizBusinessIdentifyInfo record : list) {
+            DictCodeUtils.convertDictCodeToName(record);
+        }
+        super.exportExcel(BizBusinessIdentifyInfo.class, list, ExportEnum.IDENTIFY_EXPORT.getSheetName());
+    }
+
+
+    // TODO: 2023/8/23 查询设备信息，4个底部按钮查设备（按钮的作用就是前端用来调不同接口、用来区分中间即将展示的标识），前端弹窗选设备，在确定保存时前端根据底部按钮判断传入设备类型deviceType字典code
+    // TODO: 2023/8/23 接口：查受检设备（第1个按钮），查设备台账（后3个按钮同一接口），查询之后前端根据标志类型的不同加到中间页面时进行判断（按产品给的对应表）
+    // TODO: 2023/8/23 提供二维码接口，前端在加到中间页面时调用一下
+
+    @ApiOperation("设备二维码")
+    @PostMapping("/equipment/qrCode")
+    public ReturnDTO<String> equipmentQrCode(@RequestBody @Valid IdDTO idDTO) {
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return identifyInfoService.equipmentQrCode(idDTO.getId());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java
index 707be6e..7e0453d 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java
@@ -117,7 +117,7 @@
     }
 
     @ApiOperation("任务单导出")
-    @PostMapping("/export")
+    @PostMapping("/listExport")
     public void orderExport(@RequestBody @Valid OrderListRequest request, HttpServletResponse response) {
         businessOrderService.orderExport(request, response);
     }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java
index 529a6ce..51432be 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java
@@ -1,9 +1,28 @@
 package com.casic.missiles.controller.business;
 
+import com.casic.missiles.controller.GeneralApprovalController;
+import com.casic.missiles.dto.BaseApprovalSubmitRequest;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.business.outsource.OutsourceAssessApprovalListRequest;
+import com.casic.missiles.dto.business.outsource.OutsourceAssessSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
+import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.model.business.BizBusinessOutsourceAssess;
+import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
+import com.casic.missiles.service.IGeneralApprovalService;
+import com.casic.missiles.service.business.IBizBusinessOutsourceAssessService;
 import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.BindingResult;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.validation.Valid;
+import java.util.List;
+
 /**
  * <p>
  * 计量检定业务-分包管理-测试、校准或检定工作分包评审表 前端控制器
@@ -15,6 +34,27 @@
 @Api(tags = "分包管理-测试、校准或检定工作分包评审表")
 @RestController
 @RequestMapping("/business/outsource/assess")
-public class BizBusinessOutsourceAssessController {
+public class BizBusinessOutsourceAssessController extends GeneralApprovalController<BizBusinessOutsourceAssess, BizBusinessOutsourceAssess, OutsourceAssessApprovalListRequest, BaseApprovalSubmitRequest> {
+    @Autowired
+    private IBizBusinessOutsourceAssessService outsourceAssessService;
 
+    public BizBusinessOutsourceAssessController(IGeneralApprovalService<BizBusinessOutsourceAssess, BizBusinessOutsourceAssess, OutsourceAssessApprovalListRequest, BaseApprovalSubmitRequest> baseApprovalService) {
+        super(baseApprovalService);
+    }
+
+    @ApiOperation("草稿箱-保存")
+    @PostMapping("/save")
+    public ReturnDTO<OutsourceAssessSaveResponse> saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceAssess request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        return outsourceAssessService.saveOutsourceAssess(request);
+    }
+
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception {
+        List<BizBusinessOutsourceAssess> list = super.exportList(request);
+        super.exportExcel(BizBusinessOutsourceAssess.class, list, ExportEnum.OUTSOURCE_ASSESS.getSheetName());
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java
new file mode 100644
index 0000000..9adef18
--- /dev/null
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java
@@ -0,0 +1,60 @@
+package com.casic.missiles.controller.business;
+
+import com.casic.missiles.controller.GeneralApprovalController;
+import com.casic.missiles.dto.BaseApprovalSubmitRequest;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.business.outsource.OutsourceProtocolApprovalListRequest;
+import com.casic.missiles.dto.business.outsource.OutsourceProtocolSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
+import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.model.business.BizBusinessOutsourceProtocol;
+import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
+import com.casic.missiles.service.IGeneralApprovalService;
+import com.casic.missiles.service.business.IBizBusinessOutsourceProtocolService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.BindingResult;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.validation.Valid;
+import java.util.List;
+
+/**
+ * <p>
+ * 计量检定业务-分包管理-测试、校准或检定工作分包协议书 前端控制器
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-08-24
+ */
+@Api(tags = "分包管理-测试、校准或检定工作分包协议书")
+@RestController
+@RequestMapping("/business/outsource/protocol")
+public class BizBusinessOutsourceProtocolController extends GeneralApprovalController<BizBusinessOutsourceProtocol, BizBusinessOutsourceProtocol, OutsourceProtocolApprovalListRequest, BaseApprovalSubmitRequest> {
+    @Autowired
+    private IBizBusinessOutsourceProtocolService outsourceProtocolService;
+
+    public BizBusinessOutsourceProtocolController(IGeneralApprovalService<BizBusinessOutsourceProtocol, BizBusinessOutsourceProtocol, OutsourceProtocolApprovalListRequest, BaseApprovalSubmitRequest> baseApprovalService) {
+        super(baseApprovalService);
+    }
+
+    @ApiOperation("草稿箱-保存")
+    @PostMapping("/save")
+    public ReturnDTO<OutsourceProtocolSaveResponse> saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceProtocol request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        return outsourceProtocolService.saveOutsourceProtocol(request);
+    }
+
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody OutsourceProtocolApprovalListRequest request) throws Exception {
+        List<BizBusinessOutsourceProtocol> list = super.exportList(request);
+        super.exportExcel(BizBusinessOutsourceProtocol.class, list, ExportEnum.OUTSOURCE_PROTOCOL.getSheetName());
+    }
+}
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java
index 097f645..f0f0943 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java
@@ -17,7 +17,6 @@
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.IGeneralApprovalService;
 import com.casic.missiles.service.business.IBizBusinessOutsourcerInfoService;
-import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -71,19 +70,8 @@
 
     @ApiOperation("分包方导出")
     @PostMapping("/listExport")
-    public void export(@RequestBody @Valid OutsourcerInfoApprovalListRequest request, BindingResult bindingResult) throws Exception {
-        if (bindingResult.hasErrors()) {
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        }
-        List<BizBusinessOutsourcerInfo> list;
-        if (!CollectionUtils.isEmpty(request.getIds())) {
-            list = outsourcerInfoService.listByIds(request.getIds());
-        } else {
-            list = outsourcerInfoService.list(request);
-        }
-        for (BizBusinessOutsourcerInfo record : list) {
-            DictCodeUtils.convertDictCodeToName(record);
-        }
+    public void export(@RequestBody OutsourcerInfoApprovalListRequest request) throws Exception {
+        List<BizBusinessOutsourcerInfo> list = super.exportList(request);
         super.exportExcel(BizBusinessOutsourcerInfo.class, list, ExportEnum.OUTSOURCER_EXPORT.getSheetName());
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java
index c2cbf9f..0410918 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java
@@ -17,11 +17,9 @@
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.IGeneralApprovalService;
 import com.casic.missiles.service.business.IBizBusinessSiteExecutiveInfoService;
-import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -60,7 +58,7 @@
         return siteExecutiveInfoService.saveSiteExecutiveInfo(siteExecutiveInfo);
     }
 
-    @ApiOperation("现场检测详情")
+    @ApiOperation("详情")
     @PostMapping("/detail")
     public ReturnDTO<SiteExecutiveDetailResponse> siteExecutiveDetail(@RequestBody @Valid IdDTO idDTO) throws Exception {
         Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
@@ -69,21 +67,10 @@
         return ReturnUtil.success(siteExecutiveInfoService.detail(idDTO.getId()));
     }
 
-    @ApiOperation("现场检测导出")
+    @ApiOperation("导出")
     @PostMapping("/listExport")
-    public void export(@RequestBody @Valid SiteExecutiveApprovalListRequest request, BindingResult bindingResult) throws Exception {
-        if (bindingResult.hasErrors()) {
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        }
-        List<SiteExecutiveApprovalListResponse> list;
-        if (!CollectionUtils.isEmpty(request.getIds())) {
-            list = siteExecutiveInfoService.listInfoByIds(request.getIds());
-        } else {
-            list = siteExecutiveInfoService.listInfo(request);
-        }
-        for (SiteExecutiveApprovalListResponse record : list) {
-            DictCodeUtils.convertDictCodeToName(record);
-        }
+    public void export(@RequestBody SiteExecutiveApprovalListRequest request) throws Exception {
+        List<SiteExecutiveApprovalListResponse> list = super.exportList(request);
         super.exportExcel(SiteExecutiveApprovalListResponse.class, list, ExportEnum.SITE_EXECUTIVE_EXPORT.getSheetName());
     }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
index 7e793cd..a92e209 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
@@ -55,7 +55,7 @@
 
     @ApiOperation("设备收发列表导出")
     @PostMapping("/export")
-    public void exportList(@RequestBody @Valid SampleDispatchListRequest request) throws IOException {
+    public void exportList(@RequestBody SampleDispatchListRequest request) throws IOException {
         List<SampleDispatchListResponse> list;
         if (!CollectionUtils.isEmpty(request.getIds())) {
             list = dispatchService.listByIds(request.getIds());
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java
index cdc77fc..d120fd4 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java
@@ -7,6 +7,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.business.labExecutive.*;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.business.IBusinessLabExecutiveInfoService;
@@ -14,6 +15,7 @@
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.*;
 
@@ -32,7 +34,7 @@
     @Autowired
     private IBusinessLabExecutiveInfoService labExecutiveInfoService;
 
-    @ApiOperation("实验室检测-部门检测-查询各状态列表（待检测、检测中、检测完）")
+    @ApiOperation("实验室任务-查询各状态列表（待检测、检测中、检测完）")
     @PostMapping("/deptExecutive/List")
     public ReturnDTO<PageInfoBT<SampleLabExecutiveListResponse>> queryDeptExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
@@ -43,10 +45,19 @@
         return ReturnUtil.success(super.packForBT(labExecutiveInfoService.deptLabExecutiveListPage(page, labExecutiveListRequest)));
     }
 
-    /**
-     * 实验室检测-我的检测-查询各状态列表（待检测、检测中、检测完）
-     */
-    @ApiOperation("实验室检测-我的检测-查询各状态列表（待检测、检测中、检测完）")
+    @ApiOperation("实验室任务导出")
+    @PostMapping("/deptExecutive/export")
+    public void deptExportList(@RequestBody @Valid SampleLabExecutiveListRequest request) throws Exception {
+        List<SampleLabExecutiveListResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = labExecutiveInfoService.deptLabExecutiveListByIds(request.getMeasureStatus(), request.getIds());
+        } else {
+            list = labExecutiveInfoService.deptLabExecutiveList(request);
+        }
+        super.exportExcel(SampleLabExecutiveListResponse.class, list, ExportEnum.DEPT_EXECUTIVE_TASK.getSheetName());
+    }
+
+    @ApiOperation("我的任务-查询各状态列表（待检测、检测中、检测完）")
     @PostMapping("/myExecutive/list")
     public ReturnDTO<PageInfoBT<SampleLabExecutiveListResponse>> queryMyExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
@@ -57,19 +68,25 @@
         return ReturnUtil.success(super.packForBT(labExecutiveInfoService.myLabExecutiveListPage(page, labExecutiveListRequest)));
     }
 
-    /**
-     * 实验室检测-我的检测-查询各状态样品数量（待检测、检测中、检测完）
-     */
-    @ApiOperation("实验室检测-我的检测-查询各状态样品数量（待检测、检测中、检测完）")
+    @ApiOperation("我的任务导出")
+    @PostMapping("/myExecutive/export")
+    public void exportList(@RequestBody @Valid SampleLabExecutiveListRequest request) throws Exception {
+        List<SampleLabExecutiveListResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = labExecutiveInfoService.myLabExecutiveListByIds(request.getMeasureStatus(), request.getIds());
+        } else {
+            list = labExecutiveInfoService.myLabExecutiveList(request);
+        }
+        super.exportExcel(SampleLabExecutiveListResponse.class, list, ExportEnum.MY_EXECUTIVE_TASK.getSheetName());
+    }
+
+    @ApiOperation("我的任务-查询各状态样品数量（待检测、检测中、检测完）")
     @GetMapping("/myExecutive/amount")
     public ReturnDTO<List<SampleAmountResponse>> queryMyExecutiveAmount() {
         return ReturnUtil.success(labExecutiveInfoService.myExecutiveAmount());
     }
 
-    /**
-     * 实验室检测-部门检测-分配（分配给具体人员）
-     */
-    @ApiOperation("实验室检测-部门检测-分配按钮（分配给具体人员）")
+    @ApiOperation("实验室任务-分配按钮（分配给具体人员）")
     @PostMapping("/deptExecutive/allocate")
     public ReturnDTO allocateStaff(@RequestBody @Valid SampleAllocateRequest sampleAllocateRequest, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -78,10 +95,7 @@
         return labExecutiveInfoService.allocateStaff(sampleAllocateRequest);
     }
 
-    /**
-     * 实验室检测-我的检测-检定人扫描收入（待检测->检测中）
-     */
-    @ApiOperation("实验室检测-我的检测-检定人扫描收入（待检测->检测中）")
+    @ApiOperation("我的任务-检定人扫描收入（待检测->检测中）")
     @PostMapping("/myExecutive/receive")
     public ReturnDTO sampleReceive(@RequestBody @Valid List<SampleOperateRequest> requestList, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -90,10 +104,7 @@
         return labExecutiveInfoService.sampleReceive(requestList);
     }
 
-    /**
-     * 实验室检测-负责人/检定人扫描检完（检测中->检测完）
-     */
-    @ApiOperation("实验室检测-负责人/检定人扫描检完（检测中->检测完）")
+    @ApiOperation("实验室任务-负责人/检定人扫描检完（检测中->检测完）")
     @PostMapping("/myExecutive/complete")
     public ReturnDTO sampleExecutiveComplete(@RequestBody @Valid List<SampleOperateRequest> requestList, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -102,10 +113,7 @@
         return labExecutiveInfoService.sampleExecutiveComplete(requestList);
     }
 
-    /**
-     * 实验室检测-部门检测/我的检测 编辑（只能修改应出具证书）
-     */
-    @ApiOperation("实验室检测-部门检测/我的检测 编辑（只能修改应出具证书）")
+    @ApiOperation("实验室任务/我的任务 编辑（只能修改应出具证书）")
     @PostMapping("/executive/update")
     public ReturnDTO updateExecutive(@RequestBody @Valid UpdateExecutiveRequest request, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -114,10 +122,7 @@
         return labExecutiveInfoService.updateExecutive(request);
     }
 
-    /**
-     * 实验室检测-部门检测/我的检测 详情
-     */
-    @ApiOperation("实验室检测-部门检测/我的检测 详情")
+    @ApiOperation("实验室任务/我的任务 详情")
     @PostMapping("/executive/detail")
     public ReturnDTO<ExecutiveDetailResponse> executiveDetail(@RequestBody @Valid ExecutiveDetailRequest request, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
@@ -131,7 +136,7 @@
      * 退回后会将下一个要执行的实验室检测状态更新为待分配，将后面的实验室顺序变更为连续（都进行减1）
      * 最后一个检测的实验室退回，等分发员再增加实验室或设备收发中的已收入直接手动点击完成
      */
-    @ApiOperation("实验室检测-部门检测/我的检测 退回（待检测/检测中->退回）")
+    @ApiOperation("实验室任务/我的任务 退回（待检测/检测中->退回）")
     @PostMapping("/executive/sendBack")
     public ReturnDTO executiveSendBack(@RequestBody @Valid ExecutiveSendBackRequest request, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -140,9 +145,6 @@
         return labExecutiveInfoService.sampleExecutiveSendBack(request);
     }
 
-    /**
-     * 分发员编辑实验室检测列表
-     */
     @ApiOperation("分发员编辑实验室检测列表")
     @PostMapping("/handOut/updateList")
     public ReturnDTO updateExecutiveList(@RequestBody @Valid UpdateExecutiveListRequest request, BindingResult bindingResult) {
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java
index 48a67ed..0c04f31 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java
@@ -10,6 +10,7 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.resource.customer.CustomerApprovalListRequest;
 import com.casic.missiles.dto.resource.customer.CustomerSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceCustomerInfo;
@@ -26,6 +27,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -55,6 +57,13 @@
         return customerInfoService.saveCustomerInfo(request);
     }
 
+    @ApiOperation("委托方名录导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody CustomerApprovalListRequest request) throws Exception {
+        List<BizResourceCustomerInfo> list = super.exportList(request);
+        super.exportExcel(BizResourceCustomerInfo.class, list, ExportEnum.CUSTOMER_INFO.getSheetName());
+    }
+
     @ApiOperation("委托方人员列表（分页）")
     @PostMapping("/person/listPage")
     public ReturnDTO<PageInfoBT<BizResourceCustomerStaff>> personListPage(@RequestBody IdDTO idDto) {
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
index 972ed4b..6418ea5 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
@@ -5,6 +5,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.resource.customer.SuggestFormApprovalListRequest;
 import com.casic.missiles.dto.resource.customer.SuggestFormSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceCustomerSuggestForm;
@@ -20,6 +21,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -50,4 +52,11 @@
         return suggestFormService.saveSuggestForm(request);
     }
 
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody SuggestFormApprovalListRequest request) throws Exception {
+        List<BizResourceCustomerSuggestForm> list = super.exportList(request);
+        super.exportExcel(BizResourceCustomerSuggestForm.class, list, ExportEnum.CUSTOMER_SUGGEST_FORM.getSheetName());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java
index 1934d1a..9e07eab 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java
@@ -15,12 +15,16 @@
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.resource.IEnvEnvironmentRecordConfigService;
 import com.casic.missiles.service.resource.IEnvEnvironmentRecordDataService;
+import com.casic.missiles.service.resource.IEnvLocationInfoService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
 import java.util.List;
@@ -39,6 +43,8 @@
     private IEnvEnvironmentRecordDataService environmentRecordDataService;
     @Autowired
     private IEnvEnvironmentRecordConfigService environmentRecordConfigService;
+    @Autowired
+    private IEnvLocationInfoService locationInfoService;
 
     @ApiOperation("环境记录单数据列表/详情")
     @PostMapping("/data/listPage")
@@ -95,4 +101,11 @@
         });
         return environmentRecordConfigService.deleteEnvironmentRecordConfig(idDTO.getId());
     }
+
+    @ApiOperation("地点列表")
+    @PostMapping("/location/listPage")
+    public ReturnDTO<PageInfoBT<LocationListResponse>> locationListPage(@RequestBody @Valid LocationListRequest request) {
+        Page<LocationListResponse> page = PageFactory.defaultPage();
+        return ReturnUtil.success(super.packForBT(locationInfoService.listPage(page, request)));
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java
index 82efe3f..e9561fa 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java
@@ -10,6 +10,7 @@
 import com.casic.missiles.dto.resource.seal.SealLogListRequest;
 import com.casic.missiles.dto.resource.seal.SealNoteApprovalListRequest;
 import com.casic.missiles.dto.resource.seal.SealNoteSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceSealUseLog;
@@ -27,6 +28,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -58,6 +60,13 @@
         return sealUseNoteService.saveSeal(request);
     }
 
+    @ApiOperation("印章使用登记导出（列表和导出中去掉经办人和监印人）")
+    @PostMapping("/listExport")
+    public void export(@RequestBody SealNoteApprovalListRequest request) throws Exception {
+        List<BizResourceSealUseNote> list = super.exportList(request);
+        super.exportExcel(BizResourceSealUseNote.class, list, ExportEnum.SEAL_NOTE.getSheetName());
+    }
+
     // TODO: 2023/7/28 印章使用日志：系统中使用印章时插入数据库
 
     @ApiOperation("印章使用日志列表（分页）")
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java
index 9b674fc..06b6521 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java
@@ -9,16 +9,20 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.resource.staff.StaffCertRequest;
 import com.casic.missiles.dto.resource.staff.StaffCertResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.service.resource.IBizResourceStaffInfoService;
 import com.casic.missiles.service.resource.IBizResourceStaffVerifierService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.List;
+
 /**
  * @Description:
  * @Author: wangpeng
@@ -41,9 +45,21 @@
         return ReturnUtil.success(super.packForBT(responsePage));
     }
 
+    @ApiOperation("证书逾期提醒导出")
+    @PostMapping("/listExport")
+    public void exportList(@RequestBody StaffCertRequest request) throws Exception {
+        List<StaffCertResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = staffInfoService.certListByIds(request.getIds());
+        } else {
+            list = staffInfoService.certList(request);
+        }
+        super.exportExcel(StaffCertResponse.class, list, ExportEnum.STAFF_CERTIFICATE_EXPIRE.getSheetName());
+    }
+
     @ApiOperation("证书逾期提醒")
     @PostMapping("/expirationReminder")
-    public ReturnDTO expirationReminder(@RequestBody IdDTO idDto) {
-        return verifierService.expirationReminder(idDto);
+    public ReturnDTO expirationReminder(@RequestBody IdDTO idDTO) {
+        return verifierService.expirationReminder(idDTO);
     }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java
index 3b251ad..a6e7850 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java
@@ -12,6 +12,7 @@
 import com.casic.missiles.dto.resource.staff.StaffListRequest;
 import com.casic.missiles.dto.resource.staff.TrainListRequest;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.*;
@@ -22,7 +23,10 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
 import java.util.List;
@@ -52,8 +56,19 @@
             throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
         }
         Page<BizResourceStaffInfo> page = PageFactory.defaultPage();
-        Page<BizResourceStaffInfo> responsePage = staffInfoService.listPage(page, request);
-        return ReturnUtil.success(super.packForBT(responsePage));
+        return ReturnUtil.success(super.packForBT(staffInfoService.listPage(page, request)));
+    }
+
+    @ApiOperation("人员登记导出")
+    @PostMapping("/listExport")
+    public void exportList(@RequestBody StaffListRequest request) throws Exception {
+        List<BizResourceStaffInfo> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = staffInfoService.listByIds(request.getIds());
+        } else {
+            list = staffInfoService.list(request);
+        }
+        super.exportExcel(BizResourceStaffInfo.class, list, ExportEnum.STAFF_INFO.getSheetName());
     }
 
     @ApiOperation("人员登记详情基础信息")
@@ -85,9 +100,9 @@
 
     @ApiOperation("科研教育列表（分页）")
     @PostMapping("/education/listPage")
-    public ReturnDTO<PageInfoBT<BizResourceStaffEducation>> educationListPage(@RequestBody IdDTO idDto) {
+    public ReturnDTO<PageInfoBT<BizResourceStaffEducation>> educationListPage(@RequestBody IdDTO idDTO) {
         Page<BizResourceStaffEducation> page = PageFactory.defaultPage();
-        Page<BizResourceStaffEducation> responsePage = staffInfoService.educationListPage(page, idDto);
+        Page<BizResourceStaffEducation> responsePage = staffInfoService.educationListPage(page, idDTO);
         return ReturnUtil.success(super.packForBT(responsePage));
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java
index af6aa86..d85d84a 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java
@@ -9,6 +9,7 @@
 import com.casic.missiles.dto.resource.outsideService.SupplierApprovalListRequest;
 import com.casic.missiles.dto.resource.outsideService.SupplierSaveResponse;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceSupplierAbility;
@@ -67,6 +68,13 @@
         return ReturnUtil.success(supplierInfoService.detail(idDTO.getId()));
     }
 
+    @ApiOperation("合格供方导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody SupplierApprovalListRequest request) throws Exception {
+        List<BizResourceSupplierInfo> list = super.exportList(request);
+        super.exportExcel(BizResourceSupplierInfo.class, list, ExportEnum.SUPPLIER_INFO.getSheetName());
+    }
+
     @ApiOperation("供方人员列表（分页）")
     @PostMapping("/person/listPage")
     public ReturnDTO<PageInfoBT<BizResourceSupplierPerson>> personListPage(@RequestBody IdDTO idDTO) {
diff --git a/casic-metering-api/src/main/resources/config/application.yml b/casic-metering-api/src/main/resources/config/application.yml
index 350db5f..ecff521 100644
--- a/casic-metering-api/src/main/resources/config/application.yml
+++ b/casic-metering-api/src/main/resources/config/application.yml
@@ -126,7 +126,7 @@
     #作者
     author: wangpeng
     #待生成对象表名
-    table-name: biz_equipment_technical_target_approval,biz_equipment_attachment_approval,biz_equipment_checkpoint_approval
+    table-name: biz_business_outsource_protocol
 
 reminder:
   #节点--common模块config包 ReminderNodeConfig配置
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
index 4a19e4e..d47d552 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
@@ -53,6 +53,7 @@
     SUGGEST_FORM_SAVE_FAILED(2509, "委托方意见登记表保存至草稿箱失败"),
     EXAMINE_FORM_SAVE_FAILED(2510, "要求、委托书及合同评审表保存至草稿箱失败"),
     CUSTOMER_EXIST_SAVE_FAILED(2511, "该委托方已存在，请重新选择"),
+    DUPLICATE_LOCATION_NO(2512, "地点编号已存在"),
 
     /**
      * 计量检定业务模块
@@ -68,6 +69,8 @@
     COMPLETE_SAMPLE_NOT_EXIST(2609, "检测中不存在扫描收入的样品"),
     CANNOT_CHANGE_MEASURE_INFO(2610, "无法更改非当前登录用户的检测信息"),
     NON_EXIST_ORDER_OR_SAMPLE(2611, "不存在该委托单或该委托单下的样品"),
+    OUTSOURCE_ACCESS_SAVE_FAILED(2612, "测试、校准或检定工作分包评审表保存至草稿箱失败"),
+    OUTSOURCE_PROTOCOL_SAVE_FAILED(2613, "测试、校准或检定工作分包协议书保存至草稿箱失败"),
 
     /**
      * 历史遗留备用
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
index 5089ad1..81a406b 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
@@ -10,54 +10,38 @@
     /**
      * 资源管理
      */
-    ENVIRONMENT_DATA_EXPORT("environmentData", "environmentData", "环境记录单数据"),
+    ENVIRONMENT_DATA_EXPORT("environmentData", "环境记录单数据", "环境记录单数据"),
+    STAFF_INFO("staffInfo", "人员登记", "人员登记"),
+    STAFF_CERTIFICATE_EXPIRE("certificateExpire", "证书逾期提醒", "证书逾期提醒"),
+    SUPPLIER_INFO("supplierInfo", "合格供方名录", "合格供方名录"),
+    CUSTOMER_INFO("customerInfo", "委托方名录", "委托方名录"),
+    CUSTOMER_SUGGEST_FORM("customerSuggestForm", "委托方意见登记表", "委托方意见登记表"),
+    SEAL_NOTE("sealNote", "印章使用登记", "印章使用登记"),
 
-    FILE_EXPORT("meterFileData", "meterFileData", "计量文件信息"),
-    TRAIN_PLAN_EXPORT("trainPlanData", "trainPlanData", "培训计划"),
-    TRAIN_LOG_EXPORT("trainLogData", "trainLogData", "培训记录"),
-    METER_ORGANIZE_EXPORT("meterOrganizeData", "meterOrganizeData", "计量组织"),
-    TRACE_SUPPLIER_EXPORT("traceSupplierData", "traceSupplierData", "溯源供方"),
-    SIGN_EXPORT("signData", "signData", "签名/签章"),
-    TEMPLATE_EXPORT("templateData", "templateData", "原始记录模板/证书报告模板"),
-    FIXED_ASSETS("meterFixedAssets", "meterFixedAssets", "固定资产"),
-    METER_EQUIPMENT("meterEquipment", "meterEquipment", "测量设备"),
-    CALIBRATION_TEST_EQUIPMENT("calibrationTestEquipment", "calibrationTestEquipment", "校准检定设备"),
-    MEASURE_ACCOUNT("measureAccount", "measureAccount", "测量工装"),
-    STANDARD_SUPPORT_EQUIPMENT("standardSupportEquipment", "standardSupportEquipment", "标准配套设备"),
-    STANDARD_EQUIPMENT("standardEquipment", "standardEquipment", "标准装置"),
-    FLOW_DEF_EXPORT("flowDefData", "flowDefData", "流程定义"),
-    STAFF_CERTIFICATE("certificate", "certificate", "计量人员证书"),
-    CHECK_INFO("checkInfo", "checkInfo", "设备管理点检测"),
-    EQUIPMENT_APPLY("equipmentApply", "equipmentApply", "设备借用"),
-    STANDARD_EQUIPMENT_REMIND("equipmentApplyRemind", "equipmentApplyRemind", "标准装置到期提醒"),
-    METER_PRICE("meterPrice", "meterPrice", "价格库"),
-    METER_STAFF("meterStaff", "meterStaff", "计量人员"),
-    STANDARD_EQUIPMENT_APPLY("standardEquipmentApply", "standardEquipmentApply", "标准装置申请"),
-    STATE_MANAGE_APPLY("stateManage", "stateManage", "状态管理"),
-    METER_ACCEPTANCE_CHECK("acceptanceCheck", "acceptanceCheck", "设备检修保养验收单"),
-    CUSTOMER_EXPORT("customerData", "customerData", "客户信息"),
-    ORDER_EXPORT("orderData", "orderData", "委托书信息"),
-    SAMPLE_EXPORT("sampleData", "sampleData", "样本信息"),
-    EXCHANGE_DATA("exchangeData", "exchangeData", "设备交接单"),
-    DISPATCH_DATA("dispatchData", "dispatchData", "设备收发"),
-    ENVIRONMENT_DATA("environmentData", "environmentData", "环境记录单"),
-    ORIGIN_DATA("originData", "originData", "原始记录"),
-    CERTIFICATE_REPORT("certificateReport", "certificateReport", "证书报告"),
-    ADVICE_EXPORT("adviceData", "adviceData", "客户反馈"),
-    HANDOUT_EXPORT("handoutData", "handoutData", "任务分发列表"),
-    OUTSOURCER_EXPORT("outsourcerData", "outsourcerData", "分包方"),
-    SITE_EXECUTIVE_EXPORT("siteExecutiveData", "siteExecutiveData", "现场测试、校准或检定"),
-    CERTIFICATE_PRINT_EXPORT("certificatePrintData", "certificatePrintData", "证书打印"),
-    DOWNLOAD_TEMPLATE("downloadTemplate", "downloadTemplate", "页面配置"),
-    OUTSOURCER_CERTIFICATE_EXPORT("outsourceCertificateData", "outsourceCertificateData", "分包证书"),
-    SETTLEMENT_INFO_EXPORT("settlementInfoData", "settlementInfoData", "业务结算"),
-    EQUIPMENT_REMIND("equipmentRemind", "equipmentRemind", "设备到期提醒"),
-    AGREEMENT_INFO_EXPORT("agreementInfoData", "agreementInfoData", "合同"),
-    WORK_STATISTICS_EXPORT("workStatisticsData", "workStatisticsData", "实时工作统计"),
-    DEPT_OUTPUT_EXPORT("deptOutputData", "deptOutputData", "部门产值分析"),
-    WORKLOAD_EXPORT("workloadData", "workloadData", "业务工作量分析"),
-    DEPT_COMPREHENSIVE_EXPORT("deptComprehensiveData", "deptComprehensiveData", "部门综合分析"),
-    ENVIRONMENTAL_RECORD("environmentalRecordData", "environmentalRecordData", "现场环境记录");
+    /**
+     * 计量检定业务
+     */
+    OUTSOURCER_EXPORT("outsourcerData", "分包方名录", "分包方名录"),
+    IDENTIFY_EXPORT("identifyData", "计量标识", "计量标识"),
+    ORDER_EXPORT("orderData", "任务单", "任务单"),
+    DISPATCH_DATA("dispatchData", "设备收发", "设备收发"),
+    HANDOUT_EXPORT("handoutData", "任务分发", "任务分发"),
+    SITE_EXECUTIVE_EXPORT("siteExecutiveData", "现场测试、校准或检定", "现场测试、校准或检定"),
+    CERTIFICATE_REPORT("certificateReport", "证书审批", "证书审批"),
+    CERTIFICATE_CHANGE_APPLY("certificateChangeApply", "证书报告补充或更换申请单", "证书报告补充或更换申请单"),
+    CERTIFICATE_PRINT("certificatePrintData", "证书打印审批", "证书打印审批"),
+    DEPT_EXECUTIVE_TASK("deptExecutiveTaskData", "实验室任务", "实验室任务"),
+    MY_EXECUTIVE_TASK("myExecutiveTaskData", "我的任务", "我的任务"),
+    OUTSOURCE_ASSESS("outsourceAssess", "测试、校准或检定工作分包评审表", "测试、校准或检定工作分包评审表"),
+    OUTSOURCE_PROTOCOL("outsourceProtocol", "测试、校准或检定工作分包协议书", "测试、校准或检定工作分包协议书"),
+
+    /**
+     * 系统管理
+     */
+    SIGN_EXPORT("signData", "签名", "签名"),
+    TEMPLATE_EXPORT("templateData", "文件模板", "文件模板"),
+    FLOW_DEF_EXPORT("flowDefData", "流程定义", "流程定义"),
+    DOWNLOAD_TEMPLATE("downloadTemplate", "流程定义", "页面配置");
 
     ExportEnum(String fileName, String sheetName, String description) {
         this.fileName = fileName;
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateRecordTypeCodeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateRecordTypeCodeEnum.java
index 31d913c..a963522 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateRecordTypeCodeEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateRecordTypeCodeEnum.java
@@ -46,4 +46,14 @@
     String SITE_EXECUTIVE_APPROVAL = "01";
     //《现场测试、校准或检定工作记录表》
     String SITE_EXECUTIVE_LOG = "02";
+
+    //测试、校准或检定工作分包协议书
+    String OUTSOURCE_PROTOCOL = "01";
+    //测试、校准或检定工作分包评审表
+    String OUTSOURCE_ACCESS = "02";
+    //测试、校准或检定工作分包通知书
+    String OUTSOURCE_NOTICE = "03";
+    //测试、校准或检定工作分包方名录
+    String OUTSOURCE_INFO = "04";
+
 }
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
index 24b8635..f78bd53 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
@@ -15,6 +15,10 @@
     String CERTIFICATE_CHANGE_APPLY_BEAN_NAME = "certificateChangeApplyBean";
     //现场测试、校准或检定
     String SITE_EXECUTIVE_BEAN_NAME = "siteExecutiveBean";
+    //测试、校准或检定工作分包评审表
+    String OUTSOURCE_ASSESS_BEAN_NAME = "outsourceAssessBean";
+    //测试、校准或检定工作分包协议书
+    String OUTSOURCE_PROTOCOL_BEAN_NAME = "outsourceProtocolBean";
 
     /*********************************设备与装置************************************/
     //设备台账
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 b21c661..6b86fd1 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
@@ -18,6 +18,8 @@
     OUTSOURCER_APPROVAL(OUTSOURCER_BEAN_NAME, ""),
     CERTIFICATE_CHANGE_APPROVAL(CERTIFICATE_CHANGE_APPLY_BEAN_NAME, ""),
     SITE_EXECUTIVE_APPROVAL(SITE_EXECUTIVE_BEAN_NAME, ""),
+    OUTSOURCE_ASSESS_APPROVAL(OUTSOURCE_ASSESS_BEAN_NAME, ""),
+    OUTSOURCE_PROTOCOL_APPROVAL(OUTSOURCE_PROTOCOL_BEAN_NAME, ""),
 
     ACTION_STATUS_MAP(new HashMap<String, AwareActionStatusEnum>() {
         {
@@ -47,6 +49,10 @@
             put(ApplyFromIdEnum.CERTIFICATE_CHANGE_APPROVAL.getCode(), CERTIFICATE_CHANGE_APPROVAL);
             //现场测试、校准或检定审批
             put(ApplyFromIdEnum.SITE_EXECUTIVE_APPROVAL.getCode(), SITE_EXECUTIVE_APPROVAL);
+            //测试、校准或检定工作分包评审表
+            put(ApplyFromIdEnum.OUTSOURCE_ASSESS_APPROVAL.getCode(), OUTSOURCE_ASSESS_APPROVAL);
+            //测试、校准或检定工作分包协议书
+            put(ApplyFromIdEnum.OUTSOURCE_PROTOCOL_APPROVAL.getCode(), OUTSOURCE_PROTOCOL_APPROVAL);
         }
     });
     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 934405e..c7410bd 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
@@ -9,6 +9,8 @@
     CERTIFICATE_CHANGE_APPROVAL("jljdywzsbchghsqd", MessageSourceModuleEnum.BUSINESS.getCode(), "证书/报告补充或更换申请单"),
     OUTSOURCER_APPROVAL("jljdywcsjzhgfbfml", MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定合格分包方名录"),
     SITE_EXECUTIVE_APPROVAL("jljdywxccsjzsp", MessageSourceModuleEnum.BUSINESS.getCode(), "现场测试、校准或检定审批"),
+    OUTSOURCE_ASSESS_APPROVAL("jljdywcsjzfbpsb", MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包评审表"),
+    OUTSOURCE_PROTOCOL_APPROVAL("jljdywcsjzfbxys", MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包协议书"),
 
 
     /*******************************************设备与装置*********************************************/
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/GeneralApprovalMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/GeneralApprovalMapper.java
index 4fb7344..0c9d6ae 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/GeneralApprovalMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/GeneralApprovalMapper.java
@@ -17,8 +17,4 @@
 
     Page<O> selectBatchForApprovalList(Page<O> page, @Param("request") R request, @Param("businessKeys") List<String> businessKeys);
 
-//    Page<O> selectListPage(Page<O> page, @Param("request") R request);
-
-//    Long selectMaxNo();
-
 }
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceAssessMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceAssessMapper.java
index 7867bb8..ba59009 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceAssessMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceAssessMapper.java
@@ -1,7 +1,12 @@
 package com.casic.missiles.mapper.business;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.business.outsource.OutsourceAssessApprovalListRequest;
+import com.casic.missiles.mapper.GeneralApprovalMapper;
 import com.casic.missiles.model.business.BizBusinessOutsourceAssess;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * <p>
@@ -11,6 +16,10 @@
  * @author wangpeng
  * @since 2023-08-16
  */
-public interface BizBusinessOutsourceAssessMapper extends BaseMapper<BizBusinessOutsourceAssess> {
+public interface BizBusinessOutsourceAssessMapper extends GeneralApprovalMapper<BizBusinessOutsourceAssess, BizBusinessOutsourceAssess, OutsourceAssessApprovalListRequest> {
+
+    Page<BizBusinessOutsourceAssess> selectBatchForApprovalList(Page<BizBusinessOutsourceAssess> page, @Param("request") OutsourceAssessApprovalListRequest request, @Param("businessKeys") List<String> businessKeys);
+
+    Long selectMaxProjectNo();
 
 }
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceProtocolMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceProtocolMapper.java
new file mode 100644
index 0000000..e6aba35
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceProtocolMapper.java
@@ -0,0 +1,24 @@
+package com.casic.missiles.mapper.business;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.business.outsource.OutsourceProtocolApprovalListRequest;
+import com.casic.missiles.mapper.GeneralApprovalMapper;
+import com.casic.missiles.model.business.BizBusinessOutsourceProtocol;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 计量检定业务-分包管理-测试、校准或检定工作分包协议书 Mapper 接口
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-08-24
+ */
+public interface BizBusinessOutsourceProtocolMapper extends GeneralApprovalMapper<BizBusinessOutsourceProtocol, BizBusinessOutsourceProtocol, OutsourceProtocolApprovalListRequest> {
+
+    Page<BizBusinessOutsourceProtocol> selectBatchForApprovalList(Page<BizBusinessOutsourceProtocol> page, @Param("request") OutsourceProtocolApprovalListRequest request, @Param("businessKeys") List<String> businessKeys);
+
+    Long selectMaxProtocolNo();
+}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/EnvLocationInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/EnvLocationInfoMapper.java
new file mode 100644
index 0000000..49eff87
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/EnvLocationInfoMapper.java
@@ -0,0 +1,21 @@
+package com.casic.missiles.mapper.resource;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.resource.environment.LocationListRequest;
+import com.casic.missiles.dto.resource.environment.LocationListResponse;
+import com.casic.missiles.model.resource.EnvLocationInfo;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * <p>
+ * 实验室环境监控系统-设备表 Mapper 接口
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-06-07
+ */
+public interface EnvLocationInfoMapper extends BaseMapper<EnvLocationInfo> {
+
+    Page<LocationListResponse> selectLocationListPage(Page<LocationListResponse> page, @Param("request") LocationListRequest request);
+}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java
index de124db..85ed0f7 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java
@@ -1,7 +1,9 @@
 package com.casic.missiles.mapper.system;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.dto.system.SignDetailResponse;
+import com.casic.missiles.dto.system.SignListRequest;
 import com.casic.missiles.model.system.SystemSign;
 import org.apache.ibatis.annotations.Param;
 
@@ -22,4 +24,8 @@
     SignDetailResponse selectSignDetailById(Long id);
 
     List<SystemSign> selectUsableSignList(@Param("userId") Long userId);
+
+    Page<SystemSign> selectSignListPage(Page<SystemSign> page, @Param("request") SignListRequest request);
+
+    List<SystemSign> selectSignList(@Param("request") SignListRequest request);
 }
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateChangeApplyMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateChangeApplyMapper.xml
index d798447..c496092 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateChangeApplyMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateChangeApplyMapper.xml
@@ -30,31 +30,31 @@
         SELECT *
         FROM biz_business_certificate_change_apply
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.changeApplyNo != null and request.changeApplyNo !=''">
+        <if test="request != null and request.changeApplyNo != null and request.changeApplyNo !=''">
             and change_apply_no like concat('%',#{request.changeApplyNo},'%')
         </if>
-        <if test="request.changeReportNo != null and request.changeReportNo !=''">
+        <if test="request != null and request.changeReportNo != null and request.changeReportNo !=''">
             and change_report_no like concat('%',#{request.changeReportNo},'%')
         </if>
-        <if test="request.changeReportName != null and request.changeReportName !=''">
+        <if test="request != null and request.changeReportName != null and request.changeReportName !=''">
             and change_report_name like concat('%',#{request.changeReportName},'%')
         </if>
-        <if test="request.changeType != null and request.changeType !=''">
+        <if test="request != null and request.changeType != null and request.changeType !=''">
             and change_type = #{request.changeType}
         </if>
-        <if test="request.createUserName != null and request.createUserName !=''">
+        <if test="request != null and request.createUserName != null and request.createUserName !=''">
             and create_user_name like concat('%',#{request.createUserName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificatePrintMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificatePrintMapper.xml
index b66cd99..49c0ac8 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificatePrintMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificatePrintMapper.xml
@@ -31,34 +31,34 @@
         LEFT JOIN biz_business_order_sample_relation bosr ON (bosr.order_id = bcr.order_id AND bosr.sample_id = bcr.sample_id)
         LEFT JOIN biz_business_order_info boi ON boi.id = bosr.order_id
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and bcp.approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.printStatus != null and request.printStatus !=''">
+        <if test="request != null and request.printStatus != null and request.printStatus !=''">
             and print_status = #{request.printStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and bcp.create_user_id = #{request.createUserId}
         </if>
-        <if test="request.certificateReportNo != null and request.certificateReportNo !=''">
+        <if test="request != null and request.certificateReportNo != null and request.certificateReportNo !=''">
             and bcr.certificate_report_no like concat('%',#{request.certificateReportNo},'%')
         </if>
-        <if test="request.certificateReportName != null and request.certificateReportName !=''">
+        <if test="request != null and request.certificateReportName != null and request.certificateReportName !=''">
             and bcr.certificate_report_name like concat('%',#{request.certificateReportName},'%')
         </if>
-        <if test="request.customerName != null and request.customerName !=''">
+        <if test="request != null and request.customerName != null and request.customerName !=''">
             and boi.customer_name like concat('%',#{request.customerName},'%')
         </if>
-        <if test="request.sampleNo != null and request.sampleNo !=''">
+        <if test="request != null and request.sampleNo != null and request.sampleNo !=''">
             and bosr.sample_no like concat('%',#{request.sampleNo},'%')
         </if>
-        <if test="request.sampleName != null and request.sampleName !=''">
+        <if test="request != null and request.sampleName != null and request.sampleName !=''">
             and bosr.sample_name like concat('%',#{request.sampleName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and bcp.create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and bcp.create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml
index b366034..767695d 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml
@@ -46,33 +46,37 @@
         SELECT bcr.*, bosr.sample_no, bosr.sample_name, bosr.sample_model, rsi.staff_name
         FROM biz_business_certificate_report bcr
         LEFT JOIN biz_business_order_sample_relation bosr ON (bosr.order_id = bcr.order_id AND bosr.sample_id = bcr.sample_id)
+        LEFT JOIN biz_business_order_info boi ON boi.id = bcr.order_id
         LEFT JOIN biz_resource_staff_info rsi ON rsi.id = bcr.measure_person_id
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and bcr.approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and bcr.create_user_id = #{request.createUserId}
         </if>
-        <if test="request.certificateReportNo != null and request.certificateReportNo !=''">
+        <if test="request != null and request.customerId != null and request.customerId !=''">
+            and boi.customer_id = #{request.customerId}
+        </if>
+        <if test="request != null and request.certificateReportNo != null and request.certificateReportNo !=''">
             and bcr.certificate_report_no like concat('%',#{request.certificateReportNo},'%')
         </if>
-        <if test="request.certificateReportName != null and request.certificateReportName !=''">
+        <if test="request != null and request.certificateReportName != null and request.certificateReportName !=''">
             and bcr.certificate_report_name like concat('%',#{request.certificateReportName},'%')
         </if>
-        <if test="request.sampleNo != null and request.sampleNo !=''">
+        <if test="request != null and request.sampleNo != null and request.sampleNo !=''">
             and bosr.sample_no like concat('%',#{request.sampleNo},'%')
         </if>
-        <if test="request.measureCategory != null and request.measureCategory !=''">
+        <if test="request != null and request.measureCategory != null and request.measureCategory !=''">
             and bcr.measure_category = #{request.measureCategory}
         </if>
-        <if test="request.measurePerson != null and request.measurePerson !=''">
+        <if test="request != null and request.measurePerson != null and request.measurePerson !=''">
             and rsi.staff_name like concat('%',#{request.measurePerson},'%')
         </if>
-        <if test="request.calibrationTimeStart != null and request.calibrationTimeStart !=''">
+        <if test="request != null and request.calibrationTimeStart != null and request.calibrationTimeStart !=''">
             and bcr.calibration_time &gt;= #{request.calibrationTimeStart}
         </if>
-        <if test="request.calibrationTimeEnd != null and request.calibrationTimeEnd !=''">
+        <if test="request != null and request.calibrationTimeEnd != null and request.calibrationTimeEnd !=''">
             and bcr.calibration_time &lt;= #{request.calibrationTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceAssessMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceAssessMapper.xml
index d0fcf8b..c22c101 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceAssessMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceAssessMapper.xml
@@ -7,6 +7,8 @@
         <id column="id" property="id" />
         <result column="project_no" property="projectNo" />
         <result column="project_name" property="projectName" />
+        <result column="lab_code" property="labCode" />
+        <result column="group_code" property="groupCode" />
         <result column="applicant_id" property="applicantId" />
         <result column="applicant_name" property="applicantName" />
         <result column="applicant_time" property="applicantTime" />
@@ -31,7 +33,45 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, project_no, project_name, applicant_id, applicant_name, applicant_time, minio_file_name, remark, create_user_id, create_user_name, outsourcer_id, pre_start_time, pre_end_time, outsource_reason, pre_cost, approval_status, process_id, approve_situation, traceability, test_method, technique_ability, create_time, update_time
+        id, project_no, project_name, lab_code, group_code, applicant_id, applicant_name, applicant_time, minio_file_name, remark, create_user_id, create_user_name, outsourcer_id, pre_start_time, pre_end_time, outsource_reason, pre_cost, approval_status, process_id, approve_situation, traceability, test_method, technique_ability, create_time, update_time
     </sql>
 
+    <select id="selectMaxProjectNo" resultType="java.lang.Long">
+        SELECT IFNULL(max(RIGHT(project_no, 3)), 0) from biz_business_outsource_assess
+    </select>
+
+    <select id="selectBatchForApprovalList" resultMap="BaseResultMap">
+        SELECT bboa.*, bboi.outsourcer_name, bboi.director
+        FROM biz_business_outsource_assess bboa
+        LEFT JOIN biz_business_outsourcer_info bboi ON bboa.outsourcer_id = bboi.id
+        WHERE 1=1
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
+            and bboa.approval_status = #{request.approvalStatus}
+        </if>
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
+            and bboa.create_user_id = #{request.createUserId}
+        </if>
+        <if test="request != null and request.projectNo != null and request.projectNo !=''">
+            and bboa.project_no like concat('%',#{request.projectNo},'%')
+        </if>
+        <if test="request != null and request.outsourcerName != null and request.outsourcerName !=''">
+            and bboi.outsourcer_name like concat('%',#{request.outsourcerName},'%')
+        </if>
+        <if test="request != null and request.applicantName != null and request.applicantName !=''">
+            and bboa.applicant_name like concat('%',#{request.applicantName},'%')
+        </if>
+        <if test="request != null and request.applicantTimeStart != null and request.applicantTimeStart !=''">
+            and bboa.applicant_time &gt;= #{request.applicantTimeStart}
+        </if>
+        <if test="request != null and request.applicantTimeEnd != null and request.applicantTimeEnd !=''">
+            and bboa.applicant_time &lt;= #{request.applicantTimeEnd}
+        </if>
+        <if test="businessKeys != null">
+            and bboa.id in
+            <foreach collection="businessKeys" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
+        ORDER BY bboa.create_time DESC
+    </select>
 </mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceProtocolMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceProtocolMapper.xml
new file mode 100644
index 0000000..b7b2149
--- /dev/null
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceProtocolMapper.xml
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.mapper.business.BizBusinessOutsourceProtocolMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.business.BizBusinessOutsourceProtocol">
+        <id column="id" property="id" />
+        <result column="protocol_no" property="protocolNo" />
+        <result column="project_name" property="projectName" />
+        <result column="lab_code" property="labCode" />
+        <result column="group_code" property="groupCode" />
+        <result column="outsourcer_id" property="outsourcerId" />
+        <result column="remark" property="remark" />
+        <result column="outsource_no" property="outsourceNo" />
+        <result column="outsource_name" property="outsourceName" />
+        <result column="contacts" property="contacts" />
+        <result column="mobile" property="mobile" />
+        <result column="address" property="address" />
+        <result column="require_date" property="requireDate" />
+        <result column="outsource_cost" property="outsourceCost" />
+        <result column="director" property="director" />
+        <result column="item" property="item" />
+        <result column="requires" property="requires" />
+        <result column="create_user_id" property="createUserId" />
+        <result column="create_user_name" property="createUserName" />
+        <result column="approval_status" property="approvalStatus" />
+        <result column="process_id" property="processId" />
+        <result column="create_time" property="createTime" />
+        <result column="update_time" property="updateTime" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, protocol_no, project_name, lab_code, group_code, outsourcer_id, remark, outsource_no, outsource_name, contacts, mobile, address, require_date, outsource_cost, director, item, requires, create_user_id, create_user_name, approval_status, process_id, create_time, update_time
+    </sql>
+
+    <select id="selectMaxProtocolNo" resultType="java.lang.Long">
+        SELECT IFNULL(max(RIGHT(protocol_no, 3)), 0) from biz_business_outsource_protocol
+    </select>
+
+    <select id="selectBatchForApprovalList" resultMap="BaseResultMap">
+        SELECT *
+        FROM biz_business_outsource_protocol
+        WHERE 1=1
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
+            and approval_status = #{request.approvalStatus}
+        </if>
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
+            and create_user_id = #{request.createUserId}
+        </if>
+        <if test="request != null and request.protocolNo != null and request.protocolNo !=''">
+            and protocol_no like concat('%',#{request.protocolNo},'%')
+        </if>
+        <if test="request != null and request.outsourcerName != null and request.outsourcerName !=''">
+            and outsourcer_name like concat('%',#{request.outsourcerName},'%')
+        </if>
+        <if test="request != null and request.applicantName != null and request.applicantName !=''">
+            and create_user_name like concat('%',#{request.applicantName},'%')
+        </if>
+        <if test="request != null and request.applicantTimeStart != null and request.applicantTimeStart !=''">
+            and create_time &gt;= #{request.applicantTimeStart}
+        </if>
+        <if test="request != null and request.applicantTimeEnd != null and request.applicantTimeEnd !=''">
+            and create_time &lt;= #{request.applicantTimeEnd}
+        </if>
+        <if test="businessKeys != null">
+            and id in
+            <foreach collection="businessKeys" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
+        ORDER BY create_time DESC
+    </select>
+</mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourcerInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourcerInfoMapper.xml
index 510a80b..3049b54 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourcerInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourcerInfoMapper.xml
@@ -7,6 +7,8 @@
         <id column="id" property="id" />
         <result column="outsourcer_no" property="outsourcerNo" />
         <result column="outsourcer_name" property="outsourcerName" />
+        <result column="lab_code" property="labCode" />
+        <result column="group_code" property="groupCode" />
         <result column="outsourcer_brief_name" property="outsourcerBriefName" />
         <result column="outsourcer_size" property="outsourcerSize" />
         <result column="business_size" property="businessSize" />
@@ -55,32 +57,32 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, outsourcer_no, outsourcer_name, outsourcer_brief_name, outsourcer_size, business_size, grade, evaluation, tax_number, bank_account, bank_name, bank_account_number, postal_code, director, phone, fax, mobile, email, website, address_country, address_province, address_city, address_area, full_address, address_country_name, address_province_name, address_city_name, address_area_name, invoice_country, invoice_province, invoice_city, invoice_area, invoice_full_address, invoice_country_name, invoice_province_name, invoice_city_name, invoice_area_name, business_scope, business_content, minio_file_name, approval_status, process_id, remark, create_user_id, create_user_name, create_time, update_time
+        id, outsourcer_no, outsourcer_name, lab_code, group_code, outsourcer_brief_name, outsourcer_size, business_size, grade, evaluation, tax_number, bank_account, bank_name, bank_account_number, postal_code, director, phone, fax, mobile, email, website, address_country, address_province, address_city, address_area, full_address, address_country_name, address_province_name, address_city_name, address_area_name, invoice_country, invoice_province, invoice_city, invoice_area, invoice_full_address, invoice_country_name, invoice_province_name, invoice_city_name, invoice_area_name, business_scope, business_content, minio_file_name, approval_status, process_id, remark, create_user_id, create_user_name, create_time, update_time
     </sql>
 
     <select id="selectBatchForApprovalList" resultMap="BaseResultMap">
         SELECT *
         FROM biz_business_outsourcer_info
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.outsourcerNo != null and request.outsourcerNo !=''">
+        <if test="request != null and request.outsourcerNo != null and request.outsourcerNo !=''">
             and outsourcer_no like concat('%',#{request.outsourcerNo},'%')
         </if>
-        <if test="request.outsourcerName != null and request.outsourcerName !=''">
+        <if test="request != null and request.outsourcerName != null and request.outsourcerName !=''">
             and outsourcer_name like concat('%',#{request.outsourcerName},'%')
         </if>
-        <if test="request.director != null and request.director !=''">
+        <if test="request != null and request.director != null and request.director !=''">
             and director like concat('%',#{request.director},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
@@ -93,6 +95,6 @@
     </select>
 
     <select id="selectMaxNo" resultType="java.lang.Long">
-        SELECT IFNULL(max(RIGHT(outsourcer_no, 12)), 0) from biz_business_outsourcer_info
+        SELECT IFNULL(max(RIGHT(outsourcer_no, 3)), 0) from biz_business_outsourcer_info
     </select>
 </mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessSiteExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessSiteExecutiveInfoMapper.xml
index 135c5d0..3c5ae79 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessSiteExecutiveInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessSiteExecutiveInfoMapper.xml
@@ -38,25 +38,25 @@
         FROM biz_business_site_executive_info bsei
         LEFT JOIN biz_resource_customer_info rci ON bsei.customer_id = rci.id
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and bsei.approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and bsei.create_user_id = #{request.createUserId}
         </if>
-        <if test="request.siteExecutiveNo != null and request.siteExecutiveNo !=''">
+        <if test="request != null and request.siteExecutiveNo != null and request.siteExecutiveNo !=''">
             and bsei.site_executive_no like concat('%',#{request.siteExecutiveNo},'%')
         </if>
-        <if test="request.customerName != null and request.customerName !=''">
+        <if test="request != null and request.customerName != null and request.customerName !=''">
             and rci.outsourcer_name like concat('%',#{request.customerName},'%')
         </if>
-        <if test="request.applyName != null and request.applyName !=''">
+        <if test="request != null and request.applyName != null and request.applyName !=''">
             and bsei.apply_name like concat('%',#{request.applyName},'%')
         </if>
-        <if test="request.applyTimeStart != null and request.applyTimeStart !=''">
+        <if test="request != null and request.applyTimeStart != null and request.applyTimeStart !=''">
             and bsei.apply_time &gt;= #{request.applyTimeStart}
         </if>
-        <if test="request.applyTimeEnd != null and request.applyTimeEnd !=''">
+        <if test="request != null and request.applyTimeEnd != null and request.applyTimeEnd !=''">
             and bsei.apply_time &lt;= #{request.applyTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml
index 84d9e2a..6bd38a9 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml
@@ -105,6 +105,12 @@
         <if test="request.isUrgent != null and request.isUrgent !=''">
             AND bo.is_urgent = #{request.isUrgent}
         </if>
+        <if test="request.ids != null">
+            and blei.id in
+            <foreach collection="request.ids" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
         ORDER BY blei.update_time DESC
     </select>
 
@@ -137,6 +143,12 @@
         <if test="request.isUrgent != null and request.isUrgent !=''">
             AND bo.is_urgent = #{request.isUrgent}
         </if>
+        <if test="request.ids != null">
+            and blei.id in
+            <foreach collection="request.ids" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
         ORDER BY blei.update_time DESC
     </select>
 
diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardInfoMapper.xml
index 1a5551b..2ed8d17 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardInfoMapper.xml
@@ -45,12 +45,6 @@
         FROM biz_equipment_standard_info besi
         LEFT JOIN biz_equipment_standard_technology_relation bestr ON besi.standard_no = bestr.standard_no
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
-            and besi.approval_status = #{request.approvalStatus}
-        </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
-            and besi.create_user_id = #{request.createUserId}
-        </if>
         <if test="request.standardName != null and request.standardName !=''">
             and besi.standard_name like concat('%',#{request.standardName},'%')
         </if>
diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardTechnologyRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardTechnologyRelationMapper.xml
index fc7e16c..cd03c8c 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardTechnologyRelationMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardTechnologyRelationMapper.xml
@@ -6,6 +6,7 @@
     <resultMap id="BaseResultMap" type="com.casic.missiles.model.equipment.BizEquipmentStandardTechnologyRelation">
         <id column="id" property="id" />
         <result column="technology_file_id" property="technologyFileId" />
+        <result column="technology_file_no" property="technologyFileNo" />
         <result column="technology_file_name" property="technologyFileName" />
         <result column="standard_id" property="standardId" />
         <result column="standard_no" property="standardNo" />
@@ -14,7 +15,7 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, technology_file_id, technology_file_name, standard_id, remark
+        id, technology_file_id, technology_file_no, technology_file_name, standard_id, remark
     </sql>
 
 </mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceAuthorizeOrderMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceAuthorizeOrderMapper.xml
index ac5176c..554fe65 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceAuthorizeOrderMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceAuthorizeOrderMapper.xml
@@ -32,22 +32,22 @@
         SELECT *
         FROM biz_resource_authorize_order
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.orderNo != null and request.orderNo !=''">
+        <if test="request != null and request.orderNo != null and request.orderNo !=''">
             and order_no like concat('%',#{request.orderNo},'%')
         </if>
-        <if test="request.createUserName != null and request.createUserName !=''">
+        <if test="request != null and request.createUserName != null and request.createUserName !=''">
             and create_user_name like concat('%',#{request.createUserName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerExamineFormMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerExamineFormMapper.xml
index ab242f6..af7f98f 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerExamineFormMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerExamineFormMapper.xml
@@ -41,28 +41,28 @@
         SELECT *
         FROM biz_resource_customer_examine_form
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.formNo != null and request.formNo !=''">
+        <if test="request != null and request.formNo != null and request.formNo !=''">
             and form_no like concat('%',#{request.formNo},'%')
         </if>
-        <if test="request.labCode != null and request.labCode !=''">
+        <if test="request != null and request.labCode != null and request.labCode !=''">
             and lab_code like concat('%',#{request.labCode},'%')
         </if>
-        <if test="request.groupCode != null and request.groupCode !=''">
+        <if test="request != null and request.groupCode != null and request.groupCode !=''">
             and group_code like concat('%',#{request.groupCode},'%')
         </if>
-        <if test="request.createUserName != null and request.createUserName !=''">
+        <if test="request != null and request.createUserName != null and request.createUserName !=''">
             and create_user_name like concat('%',#{request.createUserName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerInfoMapper.xml
index fa8ffbc..06a2798 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerInfoMapper.xml
@@ -33,25 +33,25 @@
         SELECT *
         FROM biz_resource_customer_info
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.customerNo != null and request.customerNo !=''">
+        <if test="request != null and request.customerNo != null and request.customerNo !=''">
             and customer_no like concat('%',#{request.customerNo},'%')
         </if>
-        <if test="request.customerName != null and request.customerName !=''">
+        <if test="request != null and request.customerName != null and request.customerName !=''">
             and customer_name like concat('%',#{request.customerName},'%')
         </if>
-        <if test="request.contacts != null and request.contacts !=''">
+        <if test="request != null and request.contacts != null and request.contacts !=''">
             and contacts like concat('%',#{request.contacts},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerSuggestFormMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerSuggestFormMapper.xml
index 28f5bb2..1806662 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerSuggestFormMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerSuggestFormMapper.xml
@@ -33,28 +33,28 @@
         SELECT *
         FROM biz_resource_customer_suggest_form
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.formNo != null and request.formNo !=''">
+        <if test="request != null and request.formNo != null and request.formNo !=''">
             and form_no like concat('%',#{request.formNo},'%')
         </if>
-        <if test="request.customerName != null and request.customerName !=''">
+        <if test="request != null and request.customerName != null and request.customerName !=''">
             and customer_name like concat('%',#{request.customerName},'%')
         </if>
-        <if test="request.customerDeptName != null and request.customerDeptName !=''">
+        <if test="request != null and request.customerDeptName != null and request.customerDeptName !=''">
             and customer_dept_name like concat('%',#{request.customerDeptName},'%')
         </if>
-        <if test="request.createUserName != null and request.createUserName !=''">
+        <if test="request != null and request.createUserName != null and request.createUserName !=''">
             and create_user_name like concat('%',#{request.createUserName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSealUseNoteMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSealUseNoteMapper.xml
index ab37bc1..b02bb33 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSealUseNoteMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSealUseNoteMapper.xml
@@ -29,32 +29,32 @@
     </sql>
 
     <select id="selectBatchForApprovalList" resultMap="BaseResultMap">
-        SELECT *
+        SELECT brsun.*, brsi.seal_name, brsi.seal_type, brsi.approver_name
         FROM biz_resource_seal_use_note brsun
         JOIN biz_resource_seal_info brsi ON brsun.seal_id = brsi.id
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and brsun.approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and brsun.create_user_id = #{request.createUserId}
         </if>
-        <if test="request.sealName != null and request.sealName !=''">
+        <if test="request != null and request.sealName != null and request.sealName !=''">
             and brsi.seal_name like concat('%',#{request.sealName},'%')
         </if>
-        <if test="request.sealType != null and request.sealType !=''">
+        <if test="request != null and request.sealType != null and request.sealType !=''">
             and brsi.seal_type = #{request.sealType}
         </if>
-        <if test="request.applyDeptName != null and request.applyDeptName !=''">
+        <if test="request != null and request.applyDeptName != null and request.applyDeptName !=''">
             and brsun.apply_dept_name like concat('%',#{request.applyDeptName},'%')
         </if>
-        <if test="request.applyUserName != null and request.applyUserName !=''">
+        <if test="request != null and request.applyUserName != null and request.applyUserName !=''">
             and brsun.apply_user_name like concat('%',#{request.applyUserName},'%')
         </if>
-        <if test="request.applyTimeStart != null and request.applyTimeStart !=''">
+        <if test="request != null and request.applyTimeStart != null and request.applyTimeStart !=''">
             and brsun.apply_time &gt;= #{request.applyTimeStart}
         </if>
-        <if test="request.applyTimeEnd != null and request.applyTimeEnd !=''">
+        <if test="request != null and request.applyTimeEnd != null and request.applyTimeEnd !=''">
             and brsun.apply_time &lt;= #{request.applyTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml
index 119bf7d..4f8392a 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml
@@ -31,6 +31,12 @@
         <if test="request.deptName != null and request.deptName !=''">
             and brsi.dept_name like concat('%',#{request.deptName},'%')
         </if>
+        <if test="request.ids != null">
+            and brsv.id in
+            <foreach collection="request.ids" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
         ORDER BY brsv.grant_date DESC
     </select>
 
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSupplierInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSupplierInfoMapper.xml
index fe8d399..e8ce7ef 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSupplierInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSupplierInfoMapper.xml
@@ -48,28 +48,28 @@
         SELECT *
         FROM biz_resource_supplier_info
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.supplierNo != null and request.supplierNo !=''">
+        <if test="request != null and request.supplierNo != null and request.supplierNo !=''">
             and supplier_no like concat('%',#{request.supplierNo},'%')
         </if>
-        <if test="request.supplierName != null and request.supplierName !=''">
+        <if test="request != null and request.supplierName != null and request.supplierName !=''">
             and supplier_name like concat('%',#{request.supplierName},'%')
         </if>
-        <if test="request.director != null and request.director !=''">
+        <if test="request != null and request.director != null and request.director !=''">
             and director like concat('%',#{request.director},'%')
         </if>
-        <if test="request.supplierType != null and request.supplierType !=''">
+        <if test="request != null and request.supplierType != null and request.supplierType !=''">
             and supplier_type = #{request.supplierType}
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/EnvLocationInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/EnvLocationInfoMapper.xml
new file mode 100644
index 0000000..68bcf10
--- /dev/null
+++ b/casic-metering-dao/src/main/resources/mapper/resource/EnvLocationInfoMapper.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.mapper.resource.EnvLocationInfoMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.resource.EnvLocationInfo">
+        <id column="id" property="id" />
+        <result column="location_no" property="locationNo" />
+        <result column="location_name" property="locationName" />
+        <result column="location_position" property="locationPosition" />
+        <result column="create_user_id" property="createUserId" />
+        <result column="create_user" property="createUser" />
+        <result column="create_time" property="createTime" />
+        <result column="update_time" property="updateTime" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, location_no, location_name, location_position, create_user_id, create_user, create_time, update_time
+    </sql>
+
+    <select id="selectLocationListPage" resultType="com.casic.missiles.dto.resource.environment.LocationListResponse">
+        SELECT *
+        FROM env_location_info
+        WHERE 1=1
+        <if test="request.locationNo != null and request.locationNo !=''">
+            AND location_no LIKE concat('%',#{request.locationNo},'%')
+        </if>
+        <if test="request.locationName != null and request.locationName !=''">
+            AND location_name LIKE concat('%',#{request.locationName},'%')
+        </if>
+        ORDER BY create_time DESC
+    </select>
+
+</mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml
index b28c18f..8854047 100644
--- a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml
@@ -11,7 +11,6 @@
         <result column="sign_desc" property="signDesc" />
         <result column="sign_director" property="signDirector" />
         <result column="sign_user_id" property="signUserId" />
-        <result column="sign_type" property="signType" />
         <result column="minio_file_name" property="minioFileName" />
         <result column="create_time" property="createTime" />
         <result column="update_time" property="updateTime" />
@@ -28,7 +27,6 @@
         <result column="sign_name" property="signName" />
         <result column="sign_desc" property="signDesc" />
         <result column="sign_director" property="signDirector" />
-        <result column="sign_type" property="signType" />
         <result column="sign_user_id" property="signUserId" />
         <result column="minio_file_name" property="minioFileName" />
         <result column="create_time" property="createTime" />
@@ -62,4 +60,58 @@
         JOIN system_sign_user_relation ssur ON ss.id = ssur.sign_id
         WHERE ssur.user_id = #{userId}
     </select>
+
+    <select id="selectSignListPage" resultMap="BaseResultMap">
+        SELECT ss.*, sd.SIMPLE_NAME AS deptName
+        FROM system_sign ss
+        LEFT JOIN sys_user su ON su.id = ss.sign_user_id
+        LEFT JOIN sys_dept sd ON sd.id = su.dept_id
+        WHERE 1=1
+        <if test="request.signNo != null and request.signNo !=''">
+            AND ss.sign_no LIKE concat('%',#{request.signNo},'%')
+        </if>
+        <if test="request.signName != null and request.signName !=''">
+            AND ss.sign_name LIKE concat('%',#{request.signName},'%')
+        </if>
+        <if test="request.signDirector != null and request.signDirector !=''">
+            AND ss.sign_director LIKE concat('%',#{request.signDirector},'%')
+        </if>
+        <if test="request.signUserId != null and request.signUserId !=''">
+            AND ss.sign_user_id = #{request.signUserId}
+        </if>
+        <if test="request.createStartTime != null and request.createStartTime !=''">
+            AND DATE_FORMAT(ss.create_time,'%Y-%m-%d') &gt;= DATE_FORMAT(#{request.createStartTime},'%Y-%m-%d')
+        </if>
+        <if test="request.createEndTime != null and request.createEndTime !=''">
+            AND DATE_FORMAT(ss.create_time,'%Y-%m-%d')  &lt;= DATE_FORMAT(#{request.createEndTime},'%Y-%m-%d')
+        </if>
+        ORDER BY ss.create_time DESC
+    </select>
+
+    <select id="selectSignList" resultMap="BaseResultMap">
+        SELECT ss.*, sd.SIMPLE_NAME AS deptName
+        FROM system_sign ss
+        LEFT JOIN sys_user su ON su.id = ss.sign_user_id
+        LEFT JOIN sys_dept sd ON sd.id = su.dept_id
+        WHERE 1=1
+        <if test="request.signNo != null and request.signNo !=''">
+            AND ss.sign_no LIKE concat('%',#{request.signNo},'%')
+        </if>
+        <if test="request.signName != null and request.signName !=''">
+            AND ss.sign_name LIKE concat('%',#{request.signName},'%')
+        </if>
+        <if test="request.signDirector != null and request.signDirector !=''">
+            AND ss.sign_director LIKE concat('%',#{request.signDirector},'%')
+        </if>
+        <if test="request.signUserId != null and request.signUserId !=''">
+            AND ss.sign_user_id = #{request.signUserId}
+        </if>
+        <if test="request.createStartTime != null and request.createStartTime !=''">
+            AND DATE_FORMAT(ss.create_time,'%Y-%m-%d') &gt;= DATE_FORMAT(#{request.createStartTime},'%Y-%m-%d')
+        </if>
+        <if test="request.createEndTime != null and request.createEndTime !=''">
+            AND DATE_FORMAT(ss.create_time,'%Y-%m-%d')  &lt;= DATE_FORMAT(#{request.createEndTime},'%Y-%m-%d')
+        </if>
+        ORDER BY ss.create_time DESC
+    </select>
 </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 515050a..60f530b 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
@@ -47,8 +47,8 @@
     String STORAGE_LOCATION = "bizStorageLocation";
     //计量专业
     String MEASURE_MAJOR = "bizMeasureMajor";
-    //管理状态
-    String MANAGER_STATE = "bizManagerState";
+    //标准装置管理状态
+    String STANDARD_MANAGER_STATE = "bizStandardManagerState";
 
     /**
      * 资源管理 字典code
@@ -95,8 +95,6 @@
     String MEASURE_STATUS = "measureStatus";
     //检定方式
     String MEASURE_TYPE = "measureType";
-    //标识打印标志类型
-    String IDENTIFY_PRINT_TYPE = "bizBusinessIdentify";
     //变更类型
     String REPORT_CHANGE_TYPE = "bizCertChangeType";
     //规模类型
@@ -111,19 +109,24 @@
     String MEASURE_CATEGORY = "measureCategory";
     //检定结果
     String MEASURE_RESULT = "measureResult";
+    //分包原因
+    String OUTSOURCE_REASON = "outsourceReason";
+
+    /**
+     * 系统管理
+     */
+    String TEMPLATE_TYPE = "templateType";
+
 
     /**
      * 标准装置 字典code
      */
     //类别
     String STANDARD_CATEGORY = "standardCategory";
-    //管理状态
-    String STANDARD_MANAGER_STATE = "standardManagerState";
     //标准等级
     String STANDARD_LEVEL = "standardLevel";
     //传递范围
     String STANDARD_TRANSMIT_RANGE = "transmitRange";
-
     //资本来源
     String CAPITAL_SOURCE = "capitalSource";
     //标准装置-申请类型
@@ -148,8 +151,6 @@
     String CERTIFICATE_CLASS = "certificationClass";
     //证书管理-检校专业
     String CALIBRATION_MAJOR = "calibrationMajor";
-    //分包原因
-    String OUTSOURCE_REASON = "outsourceReason";
 
     /**
      * 工作台

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java
index bb0c50f..13a699b 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java
@@ -12,6 +12,7 @@
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.IGeneralApprovalService;
+import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
@@ -19,6 +20,7 @@
 import org.springframework.web.bind.annotation.RequestBody;
 
 import javax.validation.Valid;
+import java.util.List;
 import java.util.Objects;
 
 /**
@@ -117,4 +119,17 @@
         }
         return baseApprovalService.failUpdate(request);
     }
+
+    public List<O> exportList(@RequestBody @Valid R request) throws Exception {
+        List<O> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = baseApprovalService.listExportByIds(request.getIds());
+        } else {
+            list = baseApprovalService.listExport(request);
+        }
+        for (O record : list) {
+            DictCodeUtils.convertDictCodeToName(record);
+        }
+        return list;
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java
index 8a90961..d775831 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java
@@ -5,6 +5,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.business.certificate.CertificateChangeApplyApprovalListRequest;
 import com.casic.missiles.dto.business.certificate.CertificateChangeApplySaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessCertificateChangeApply;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
@@ -20,6 +21,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -48,4 +50,12 @@
         }
         return changeApplyService.saveChangeApply(request);
     }
+
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody CertificateChangeApplyApprovalListRequest request) throws Exception {
+        List<BizBusinessCertificateChangeApply> list = super.exportList(request);
+        super.exportExcel(BizBusinessCertificateChangeApply.class, list, ExportEnum.CERTIFICATE_CHANGE_APPLY.getSheetName());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java
index 5fc4b07..af8230e 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java
@@ -9,6 +9,7 @@
 import com.casic.missiles.dto.business.certificate.CertificatePrintApprovalListRequest;
 import com.casic.missiles.dto.business.certificate.CertificatePrintListResponse;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.enums.business.CertificatePrintStatusEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessCertificatePrintLog;
@@ -18,10 +19,16 @@
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.io.IOException;
+import java.util.List;
 import java.util.Objects;
 
 /**
@@ -98,4 +105,16 @@
         });
         return certificatePrintService.certificatePrintLog(idDTO.getId());
     }
+
+    @ApiOperation("证书打印审批导出")
+    @PostMapping("/listExport")
+    public void exportList(@RequestBody CertificatePrintApprovalListRequest request) throws IOException {
+        List<CertificatePrintListResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = certificatePrintService.listByIds(request.getIds());
+        } else {
+            list = certificatePrintService.list(request);
+        }
+        super.exportExcel(CertificatePrintListResponse.class, list, ExportEnum.CERTIFICATE_PRINT.getSheetName());
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java
index 63b06dc..6b2efd5 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java
@@ -6,6 +6,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.business.certificate.CertificateReportApprovalListRequest;
 import com.casic.missiles.dto.business.certificate.CertificateReportSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessCertificateReport;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
@@ -21,6 +22,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -50,7 +52,7 @@
         return certificateReportService.saveCertificateReport(request);
     }
 
-    @ApiOperation("证书审批详情（基本信息）")
+    @ApiOperation("详情（基本信息）")
     @PostMapping("/detail")
     public ReturnDTO<BizBusinessCertificateReport> detail(@RequestBody @Valid BaseDetailRequest request, BindingResult bindingResult) throws Exception {
         if(bindingResult.hasErrors()){
@@ -59,4 +61,11 @@
         return certificateReportService.detail(request);
     }
 
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody CertificateReportApprovalListRequest request) throws Exception {
+        List<BizBusinessCertificateReport> list = super.exportList(request);
+        super.exportExcel(BizBusinessCertificateReport.class, list, ExportEnum.CERTIFICATE_REPORT.getSheetName());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java
index 46b26bd..57c0809 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java
@@ -10,20 +10,21 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.business.identify.IdentifyListRequest;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessIdentifyInfo;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.business.IBizBusinessIdentifyInfoService;
+import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import javax.validation.Valid;
+import java.util.List;
 import java.util.Objects;
 
 /**
@@ -57,16 +58,13 @@
         return identifyInfoService.addIdentify(identifyInfo);
     }
 
-    @ApiOperation("标识打印更新")
+    @ApiOperation("标识打印更新（更新打印时间）")
     @PostMapping("/update")
-    public ReturnDTO updateIdentify(@RequestBody @Valid BizBusinessIdentifyInfo identifyInfo, BindingResult bindingResult) {
-        Assert.isFalse(Objects.isNull(identifyInfo.getId()), () -> {
+    public ReturnDTO updateIdentify(@RequestBody @Valid IdDTO idDTO) {
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        Assert.isFalse(bindingResult.hasErrors(), () -> {
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        });
-        return identifyInfoService.updateIdentify(identifyInfo);
+        return identifyInfoService.updateIdentify(idDTO.getId());
     }
 
     @ApiOperation("标识打印删除")
@@ -77,4 +75,37 @@
         });
         return identifyInfoService.deleteIdentify(idDTO.getId());
     }
+
+    @ApiOperation("标识打印导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody @Valid IdentifyListRequest request, BindingResult bindingResult) throws Exception {
+        if (bindingResult.hasErrors()) {
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        List<BizBusinessIdentifyInfo> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = identifyInfoService.listByIds(request.getIds());
+        } else {
+            list = identifyInfoService.list(request);
+        }
+        for (BizBusinessIdentifyInfo record : list) {
+            DictCodeUtils.convertDictCodeToName(record);
+        }
+        super.exportExcel(BizBusinessIdentifyInfo.class, list, ExportEnum.IDENTIFY_EXPORT.getSheetName());
+    }
+
+
+    // TODO: 2023/8/23 查询设备信息，4个底部按钮查设备（按钮的作用就是前端用来调不同接口、用来区分中间即将展示的标识），前端弹窗选设备，在确定保存时前端根据底部按钮判断传入设备类型deviceType字典code
+    // TODO: 2023/8/23 接口：查受检设备（第1个按钮），查设备台账（后3个按钮同一接口），查询之后前端根据标志类型的不同加到中间页面时进行判断（按产品给的对应表）
+    // TODO: 2023/8/23 提供二维码接口，前端在加到中间页面时调用一下
+
+    @ApiOperation("设备二维码")
+    @PostMapping("/equipment/qrCode")
+    public ReturnDTO<String> equipmentQrCode(@RequestBody @Valid IdDTO idDTO) {
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return identifyInfoService.equipmentQrCode(idDTO.getId());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java
index 707be6e..7e0453d 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java
@@ -117,7 +117,7 @@
     }
 
     @ApiOperation("任务单导出")
-    @PostMapping("/export")
+    @PostMapping("/listExport")
     public void orderExport(@RequestBody @Valid OrderListRequest request, HttpServletResponse response) {
         businessOrderService.orderExport(request, response);
     }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java
index 529a6ce..51432be 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java
@@ -1,9 +1,28 @@
 package com.casic.missiles.controller.business;
 
+import com.casic.missiles.controller.GeneralApprovalController;
+import com.casic.missiles.dto.BaseApprovalSubmitRequest;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.business.outsource.OutsourceAssessApprovalListRequest;
+import com.casic.missiles.dto.business.outsource.OutsourceAssessSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
+import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.model.business.BizBusinessOutsourceAssess;
+import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
+import com.casic.missiles.service.IGeneralApprovalService;
+import com.casic.missiles.service.business.IBizBusinessOutsourceAssessService;
 import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.BindingResult;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.validation.Valid;
+import java.util.List;
+
 /**
  * <p>
  * 计量检定业务-分包管理-测试、校准或检定工作分包评审表 前端控制器
@@ -15,6 +34,27 @@
 @Api(tags = "分包管理-测试、校准或检定工作分包评审表")
 @RestController
 @RequestMapping("/business/outsource/assess")
-public class BizBusinessOutsourceAssessController {
+public class BizBusinessOutsourceAssessController extends GeneralApprovalController<BizBusinessOutsourceAssess, BizBusinessOutsourceAssess, OutsourceAssessApprovalListRequest, BaseApprovalSubmitRequest> {
+    @Autowired
+    private IBizBusinessOutsourceAssessService outsourceAssessService;
 
+    public BizBusinessOutsourceAssessController(IGeneralApprovalService<BizBusinessOutsourceAssess, BizBusinessOutsourceAssess, OutsourceAssessApprovalListRequest, BaseApprovalSubmitRequest> baseApprovalService) {
+        super(baseApprovalService);
+    }
+
+    @ApiOperation("草稿箱-保存")
+    @PostMapping("/save")
+    public ReturnDTO<OutsourceAssessSaveResponse> saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceAssess request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        return outsourceAssessService.saveOutsourceAssess(request);
+    }
+
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception {
+        List<BizBusinessOutsourceAssess> list = super.exportList(request);
+        super.exportExcel(BizBusinessOutsourceAssess.class, list, ExportEnum.OUTSOURCE_ASSESS.getSheetName());
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java
new file mode 100644
index 0000000..9adef18
--- /dev/null
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java
@@ -0,0 +1,60 @@
+package com.casic.missiles.controller.business;
+
+import com.casic.missiles.controller.GeneralApprovalController;
+import com.casic.missiles.dto.BaseApprovalSubmitRequest;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.business.outsource.OutsourceProtocolApprovalListRequest;
+import com.casic.missiles.dto.business.outsource.OutsourceProtocolSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
+import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.model.business.BizBusinessOutsourceProtocol;
+import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
+import com.casic.missiles.service.IGeneralApprovalService;
+import com.casic.missiles.service.business.IBizBusinessOutsourceProtocolService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.BindingResult;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.validation.Valid;
+import java.util.List;
+
+/**
+ * <p>
+ * 计量检定业务-分包管理-测试、校准或检定工作分包协议书 前端控制器
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-08-24
+ */
+@Api(tags = "分包管理-测试、校准或检定工作分包协议书")
+@RestController
+@RequestMapping("/business/outsource/protocol")
+public class BizBusinessOutsourceProtocolController extends GeneralApprovalController<BizBusinessOutsourceProtocol, BizBusinessOutsourceProtocol, OutsourceProtocolApprovalListRequest, BaseApprovalSubmitRequest> {
+    @Autowired
+    private IBizBusinessOutsourceProtocolService outsourceProtocolService;
+
+    public BizBusinessOutsourceProtocolController(IGeneralApprovalService<BizBusinessOutsourceProtocol, BizBusinessOutsourceProtocol, OutsourceProtocolApprovalListRequest, BaseApprovalSubmitRequest> baseApprovalService) {
+        super(baseApprovalService);
+    }
+
+    @ApiOperation("草稿箱-保存")
+    @PostMapping("/save")
+    public ReturnDTO<OutsourceProtocolSaveResponse> saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceProtocol request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        return outsourceProtocolService.saveOutsourceProtocol(request);
+    }
+
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody OutsourceProtocolApprovalListRequest request) throws Exception {
+        List<BizBusinessOutsourceProtocol> list = super.exportList(request);
+        super.exportExcel(BizBusinessOutsourceProtocol.class, list, ExportEnum.OUTSOURCE_PROTOCOL.getSheetName());
+    }
+}
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java
index 097f645..f0f0943 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java
@@ -17,7 +17,6 @@
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.IGeneralApprovalService;
 import com.casic.missiles.service.business.IBizBusinessOutsourcerInfoService;
-import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -71,19 +70,8 @@
 
     @ApiOperation("分包方导出")
     @PostMapping("/listExport")
-    public void export(@RequestBody @Valid OutsourcerInfoApprovalListRequest request, BindingResult bindingResult) throws Exception {
-        if (bindingResult.hasErrors()) {
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        }
-        List<BizBusinessOutsourcerInfo> list;
-        if (!CollectionUtils.isEmpty(request.getIds())) {
-            list = outsourcerInfoService.listByIds(request.getIds());
-        } else {
-            list = outsourcerInfoService.list(request);
-        }
-        for (BizBusinessOutsourcerInfo record : list) {
-            DictCodeUtils.convertDictCodeToName(record);
-        }
+    public void export(@RequestBody OutsourcerInfoApprovalListRequest request) throws Exception {
+        List<BizBusinessOutsourcerInfo> list = super.exportList(request);
         super.exportExcel(BizBusinessOutsourcerInfo.class, list, ExportEnum.OUTSOURCER_EXPORT.getSheetName());
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java
index c2cbf9f..0410918 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java
@@ -17,11 +17,9 @@
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.IGeneralApprovalService;
 import com.casic.missiles.service.business.IBizBusinessSiteExecutiveInfoService;
-import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -60,7 +58,7 @@
         return siteExecutiveInfoService.saveSiteExecutiveInfo(siteExecutiveInfo);
     }
 
-    @ApiOperation("现场检测详情")
+    @ApiOperation("详情")
     @PostMapping("/detail")
     public ReturnDTO<SiteExecutiveDetailResponse> siteExecutiveDetail(@RequestBody @Valid IdDTO idDTO) throws Exception {
         Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
@@ -69,21 +67,10 @@
         return ReturnUtil.success(siteExecutiveInfoService.detail(idDTO.getId()));
     }
 
-    @ApiOperation("现场检测导出")
+    @ApiOperation("导出")
     @PostMapping("/listExport")
-    public void export(@RequestBody @Valid SiteExecutiveApprovalListRequest request, BindingResult bindingResult) throws Exception {
-        if (bindingResult.hasErrors()) {
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        }
-        List<SiteExecutiveApprovalListResponse> list;
-        if (!CollectionUtils.isEmpty(request.getIds())) {
-            list = siteExecutiveInfoService.listInfoByIds(request.getIds());
-        } else {
-            list = siteExecutiveInfoService.listInfo(request);
-        }
-        for (SiteExecutiveApprovalListResponse record : list) {
-            DictCodeUtils.convertDictCodeToName(record);
-        }
+    public void export(@RequestBody SiteExecutiveApprovalListRequest request) throws Exception {
+        List<SiteExecutiveApprovalListResponse> list = super.exportList(request);
         super.exportExcel(SiteExecutiveApprovalListResponse.class, list, ExportEnum.SITE_EXECUTIVE_EXPORT.getSheetName());
     }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
index 7e793cd..a92e209 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
@@ -55,7 +55,7 @@
 
     @ApiOperation("设备收发列表导出")
     @PostMapping("/export")
-    public void exportList(@RequestBody @Valid SampleDispatchListRequest request) throws IOException {
+    public void exportList(@RequestBody SampleDispatchListRequest request) throws IOException {
         List<SampleDispatchListResponse> list;
         if (!CollectionUtils.isEmpty(request.getIds())) {
             list = dispatchService.listByIds(request.getIds());
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java
index cdc77fc..d120fd4 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java
@@ -7,6 +7,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.business.labExecutive.*;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.business.IBusinessLabExecutiveInfoService;
@@ -14,6 +15,7 @@
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.*;
 
@@ -32,7 +34,7 @@
     @Autowired
     private IBusinessLabExecutiveInfoService labExecutiveInfoService;
 
-    @ApiOperation("实验室检测-部门检测-查询各状态列表（待检测、检测中、检测完）")
+    @ApiOperation("实验室任务-查询各状态列表（待检测、检测中、检测完）")
     @PostMapping("/deptExecutive/List")
     public ReturnDTO<PageInfoBT<SampleLabExecutiveListResponse>> queryDeptExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
@@ -43,10 +45,19 @@
         return ReturnUtil.success(super.packForBT(labExecutiveInfoService.deptLabExecutiveListPage(page, labExecutiveListRequest)));
     }
 
-    /**
-     * 实验室检测-我的检测-查询各状态列表（待检测、检测中、检测完）
-     */
-    @ApiOperation("实验室检测-我的检测-查询各状态列表（待检测、检测中、检测完）")
+    @ApiOperation("实验室任务导出")
+    @PostMapping("/deptExecutive/export")
+    public void deptExportList(@RequestBody @Valid SampleLabExecutiveListRequest request) throws Exception {
+        List<SampleLabExecutiveListResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = labExecutiveInfoService.deptLabExecutiveListByIds(request.getMeasureStatus(), request.getIds());
+        } else {
+            list = labExecutiveInfoService.deptLabExecutiveList(request);
+        }
+        super.exportExcel(SampleLabExecutiveListResponse.class, list, ExportEnum.DEPT_EXECUTIVE_TASK.getSheetName());
+    }
+
+    @ApiOperation("我的任务-查询各状态列表（待检测、检测中、检测完）")
     @PostMapping("/myExecutive/list")
     public ReturnDTO<PageInfoBT<SampleLabExecutiveListResponse>> queryMyExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
@@ -57,19 +68,25 @@
         return ReturnUtil.success(super.packForBT(labExecutiveInfoService.myLabExecutiveListPage(page, labExecutiveListRequest)));
     }
 
-    /**
-     * 实验室检测-我的检测-查询各状态样品数量（待检测、检测中、检测完）
-     */
-    @ApiOperation("实验室检测-我的检测-查询各状态样品数量（待检测、检测中、检测完）")
+    @ApiOperation("我的任务导出")
+    @PostMapping("/myExecutive/export")
+    public void exportList(@RequestBody @Valid SampleLabExecutiveListRequest request) throws Exception {
+        List<SampleLabExecutiveListResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = labExecutiveInfoService.myLabExecutiveListByIds(request.getMeasureStatus(), request.getIds());
+        } else {
+            list = labExecutiveInfoService.myLabExecutiveList(request);
+        }
+        super.exportExcel(SampleLabExecutiveListResponse.class, list, ExportEnum.MY_EXECUTIVE_TASK.getSheetName());
+    }
+
+    @ApiOperation("我的任务-查询各状态样品数量（待检测、检测中、检测完）")
     @GetMapping("/myExecutive/amount")
     public ReturnDTO<List<SampleAmountResponse>> queryMyExecutiveAmount() {
         return ReturnUtil.success(labExecutiveInfoService.myExecutiveAmount());
     }
 
-    /**
-     * 实验室检测-部门检测-分配（分配给具体人员）
-     */
-    @ApiOperation("实验室检测-部门检测-分配按钮（分配给具体人员）")
+    @ApiOperation("实验室任务-分配按钮（分配给具体人员）")
     @PostMapping("/deptExecutive/allocate")
     public ReturnDTO allocateStaff(@RequestBody @Valid SampleAllocateRequest sampleAllocateRequest, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -78,10 +95,7 @@
         return labExecutiveInfoService.allocateStaff(sampleAllocateRequest);
     }
 
-    /**
-     * 实验室检测-我的检测-检定人扫描收入（待检测->检测中）
-     */
-    @ApiOperation("实验室检测-我的检测-检定人扫描收入（待检测->检测中）")
+    @ApiOperation("我的任务-检定人扫描收入（待检测->检测中）")
     @PostMapping("/myExecutive/receive")
     public ReturnDTO sampleReceive(@RequestBody @Valid List<SampleOperateRequest> requestList, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -90,10 +104,7 @@
         return labExecutiveInfoService.sampleReceive(requestList);
     }
 
-    /**
-     * 实验室检测-负责人/检定人扫描检完（检测中->检测完）
-     */
-    @ApiOperation("实验室检测-负责人/检定人扫描检完（检测中->检测完）")
+    @ApiOperation("实验室任务-负责人/检定人扫描检完（检测中->检测完）")
     @PostMapping("/myExecutive/complete")
     public ReturnDTO sampleExecutiveComplete(@RequestBody @Valid List<SampleOperateRequest> requestList, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -102,10 +113,7 @@
         return labExecutiveInfoService.sampleExecutiveComplete(requestList);
     }
 
-    /**
-     * 实验室检测-部门检测/我的检测 编辑（只能修改应出具证书）
-     */
-    @ApiOperation("实验室检测-部门检测/我的检测 编辑（只能修改应出具证书）")
+    @ApiOperation("实验室任务/我的任务 编辑（只能修改应出具证书）")
     @PostMapping("/executive/update")
     public ReturnDTO updateExecutive(@RequestBody @Valid UpdateExecutiveRequest request, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -114,10 +122,7 @@
         return labExecutiveInfoService.updateExecutive(request);
     }
 
-    /**
-     * 实验室检测-部门检测/我的检测 详情
-     */
-    @ApiOperation("实验室检测-部门检测/我的检测 详情")
+    @ApiOperation("实验室任务/我的任务 详情")
     @PostMapping("/executive/detail")
     public ReturnDTO<ExecutiveDetailResponse> executiveDetail(@RequestBody @Valid ExecutiveDetailRequest request, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
@@ -131,7 +136,7 @@
      * 退回后会将下一个要执行的实验室检测状态更新为待分配，将后面的实验室顺序变更为连续（都进行减1）
      * 最后一个检测的实验室退回，等分发员再增加实验室或设备收发中的已收入直接手动点击完成
      */
-    @ApiOperation("实验室检测-部门检测/我的检测 退回（待检测/检测中->退回）")
+    @ApiOperation("实验室任务/我的任务 退回（待检测/检测中->退回）")
     @PostMapping("/executive/sendBack")
     public ReturnDTO executiveSendBack(@RequestBody @Valid ExecutiveSendBackRequest request, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -140,9 +145,6 @@
         return labExecutiveInfoService.sampleExecutiveSendBack(request);
     }
 
-    /**
-     * 分发员编辑实验室检测列表
-     */
     @ApiOperation("分发员编辑实验室检测列表")
     @PostMapping("/handOut/updateList")
     public ReturnDTO updateExecutiveList(@RequestBody @Valid UpdateExecutiveListRequest request, BindingResult bindingResult) {
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java
index 48a67ed..0c04f31 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java
@@ -10,6 +10,7 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.resource.customer.CustomerApprovalListRequest;
 import com.casic.missiles.dto.resource.customer.CustomerSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceCustomerInfo;
@@ -26,6 +27,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -55,6 +57,13 @@
         return customerInfoService.saveCustomerInfo(request);
     }
 
+    @ApiOperation("委托方名录导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody CustomerApprovalListRequest request) throws Exception {
+        List<BizResourceCustomerInfo> list = super.exportList(request);
+        super.exportExcel(BizResourceCustomerInfo.class, list, ExportEnum.CUSTOMER_INFO.getSheetName());
+    }
+
     @ApiOperation("委托方人员列表（分页）")
     @PostMapping("/person/listPage")
     public ReturnDTO<PageInfoBT<BizResourceCustomerStaff>> personListPage(@RequestBody IdDTO idDto) {
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
index 972ed4b..6418ea5 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
@@ -5,6 +5,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.resource.customer.SuggestFormApprovalListRequest;
 import com.casic.missiles.dto.resource.customer.SuggestFormSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceCustomerSuggestForm;
@@ -20,6 +21,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -50,4 +52,11 @@
         return suggestFormService.saveSuggestForm(request);
     }
 
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody SuggestFormApprovalListRequest request) throws Exception {
+        List<BizResourceCustomerSuggestForm> list = super.exportList(request);
+        super.exportExcel(BizResourceCustomerSuggestForm.class, list, ExportEnum.CUSTOMER_SUGGEST_FORM.getSheetName());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java
index 1934d1a..9e07eab 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java
@@ -15,12 +15,16 @@
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.resource.IEnvEnvironmentRecordConfigService;
 import com.casic.missiles.service.resource.IEnvEnvironmentRecordDataService;
+import com.casic.missiles.service.resource.IEnvLocationInfoService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
 import java.util.List;
@@ -39,6 +43,8 @@
     private IEnvEnvironmentRecordDataService environmentRecordDataService;
     @Autowired
     private IEnvEnvironmentRecordConfigService environmentRecordConfigService;
+    @Autowired
+    private IEnvLocationInfoService locationInfoService;
 
     @ApiOperation("环境记录单数据列表/详情")
     @PostMapping("/data/listPage")
@@ -95,4 +101,11 @@
         });
         return environmentRecordConfigService.deleteEnvironmentRecordConfig(idDTO.getId());
     }
+
+    @ApiOperation("地点列表")
+    @PostMapping("/location/listPage")
+    public ReturnDTO<PageInfoBT<LocationListResponse>> locationListPage(@RequestBody @Valid LocationListRequest request) {
+        Page<LocationListResponse> page = PageFactory.defaultPage();
+        return ReturnUtil.success(super.packForBT(locationInfoService.listPage(page, request)));
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java
index 82efe3f..e9561fa 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java
@@ -10,6 +10,7 @@
 import com.casic.missiles.dto.resource.seal.SealLogListRequest;
 import com.casic.missiles.dto.resource.seal.SealNoteApprovalListRequest;
 import com.casic.missiles.dto.resource.seal.SealNoteSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceSealUseLog;
@@ -27,6 +28,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -58,6 +60,13 @@
         return sealUseNoteService.saveSeal(request);
     }
 
+    @ApiOperation("印章使用登记导出（列表和导出中去掉经办人和监印人）")
+    @PostMapping("/listExport")
+    public void export(@RequestBody SealNoteApprovalListRequest request) throws Exception {
+        List<BizResourceSealUseNote> list = super.exportList(request);
+        super.exportExcel(BizResourceSealUseNote.class, list, ExportEnum.SEAL_NOTE.getSheetName());
+    }
+
     // TODO: 2023/7/28 印章使用日志：系统中使用印章时插入数据库
 
     @ApiOperation("印章使用日志列表（分页）")
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java
index 9b674fc..06b6521 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java
@@ -9,16 +9,20 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.resource.staff.StaffCertRequest;
 import com.casic.missiles.dto.resource.staff.StaffCertResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.service.resource.IBizResourceStaffInfoService;
 import com.casic.missiles.service.resource.IBizResourceStaffVerifierService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.List;
+
 /**
  * @Description:
  * @Author: wangpeng
@@ -41,9 +45,21 @@
         return ReturnUtil.success(super.packForBT(responsePage));
     }
 
+    @ApiOperation("证书逾期提醒导出")
+    @PostMapping("/listExport")
+    public void exportList(@RequestBody StaffCertRequest request) throws Exception {
+        List<StaffCertResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = staffInfoService.certListByIds(request.getIds());
+        } else {
+            list = staffInfoService.certList(request);
+        }
+        super.exportExcel(StaffCertResponse.class, list, ExportEnum.STAFF_CERTIFICATE_EXPIRE.getSheetName());
+    }
+
     @ApiOperation("证书逾期提醒")
     @PostMapping("/expirationReminder")
-    public ReturnDTO expirationReminder(@RequestBody IdDTO idDto) {
-        return verifierService.expirationReminder(idDto);
+    public ReturnDTO expirationReminder(@RequestBody IdDTO idDTO) {
+        return verifierService.expirationReminder(idDTO);
     }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java
index 3b251ad..a6e7850 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java
@@ -12,6 +12,7 @@
 import com.casic.missiles.dto.resource.staff.StaffListRequest;
 import com.casic.missiles.dto.resource.staff.TrainListRequest;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.*;
@@ -22,7 +23,10 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
 import java.util.List;
@@ -52,8 +56,19 @@
             throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
         }
         Page<BizResourceStaffInfo> page = PageFactory.defaultPage();
-        Page<BizResourceStaffInfo> responsePage = staffInfoService.listPage(page, request);
-        return ReturnUtil.success(super.packForBT(responsePage));
+        return ReturnUtil.success(super.packForBT(staffInfoService.listPage(page, request)));
+    }
+
+    @ApiOperation("人员登记导出")
+    @PostMapping("/listExport")
+    public void exportList(@RequestBody StaffListRequest request) throws Exception {
+        List<BizResourceStaffInfo> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = staffInfoService.listByIds(request.getIds());
+        } else {
+            list = staffInfoService.list(request);
+        }
+        super.exportExcel(BizResourceStaffInfo.class, list, ExportEnum.STAFF_INFO.getSheetName());
     }
 
     @ApiOperation("人员登记详情基础信息")
@@ -85,9 +100,9 @@
 
     @ApiOperation("科研教育列表（分页）")
     @PostMapping("/education/listPage")
-    public ReturnDTO<PageInfoBT<BizResourceStaffEducation>> educationListPage(@RequestBody IdDTO idDto) {
+    public ReturnDTO<PageInfoBT<BizResourceStaffEducation>> educationListPage(@RequestBody IdDTO idDTO) {
         Page<BizResourceStaffEducation> page = PageFactory.defaultPage();
-        Page<BizResourceStaffEducation> responsePage = staffInfoService.educationListPage(page, idDto);
+        Page<BizResourceStaffEducation> responsePage = staffInfoService.educationListPage(page, idDTO);
         return ReturnUtil.success(super.packForBT(responsePage));
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java
index af6aa86..d85d84a 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java
@@ -9,6 +9,7 @@
 import com.casic.missiles.dto.resource.outsideService.SupplierApprovalListRequest;
 import com.casic.missiles.dto.resource.outsideService.SupplierSaveResponse;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceSupplierAbility;
@@ -67,6 +68,13 @@
         return ReturnUtil.success(supplierInfoService.detail(idDTO.getId()));
     }
 
+    @ApiOperation("合格供方导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody SupplierApprovalListRequest request) throws Exception {
+        List<BizResourceSupplierInfo> list = super.exportList(request);
+        super.exportExcel(BizResourceSupplierInfo.class, list, ExportEnum.SUPPLIER_INFO.getSheetName());
+    }
+
     @ApiOperation("供方人员列表（分页）")
     @PostMapping("/person/listPage")
     public ReturnDTO<PageInfoBT<BizResourceSupplierPerson>> personListPage(@RequestBody IdDTO idDTO) {
diff --git a/casic-metering-api/src/main/resources/config/application.yml b/casic-metering-api/src/main/resources/config/application.yml
index 350db5f..ecff521 100644
--- a/casic-metering-api/src/main/resources/config/application.yml
+++ b/casic-metering-api/src/main/resources/config/application.yml
@@ -126,7 +126,7 @@
     #作者
     author: wangpeng
     #待生成对象表名
-    table-name: biz_equipment_technical_target_approval,biz_equipment_attachment_approval,biz_equipment_checkpoint_approval
+    table-name: biz_business_outsource_protocol
 
 reminder:
   #节点--common模块config包 ReminderNodeConfig配置
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
index 4a19e4e..d47d552 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
@@ -53,6 +53,7 @@
     SUGGEST_FORM_SAVE_FAILED(2509, "委托方意见登记表保存至草稿箱失败"),
     EXAMINE_FORM_SAVE_FAILED(2510, "要求、委托书及合同评审表保存至草稿箱失败"),
     CUSTOMER_EXIST_SAVE_FAILED(2511, "该委托方已存在，请重新选择"),
+    DUPLICATE_LOCATION_NO(2512, "地点编号已存在"),
 
     /**
      * 计量检定业务模块
@@ -68,6 +69,8 @@
     COMPLETE_SAMPLE_NOT_EXIST(2609, "检测中不存在扫描收入的样品"),
     CANNOT_CHANGE_MEASURE_INFO(2610, "无法更改非当前登录用户的检测信息"),
     NON_EXIST_ORDER_OR_SAMPLE(2611, "不存在该委托单或该委托单下的样品"),
+    OUTSOURCE_ACCESS_SAVE_FAILED(2612, "测试、校准或检定工作分包评审表保存至草稿箱失败"),
+    OUTSOURCE_PROTOCOL_SAVE_FAILED(2613, "测试、校准或检定工作分包协议书保存至草稿箱失败"),
 
     /**
      * 历史遗留备用
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
index 5089ad1..81a406b 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
@@ -10,54 +10,38 @@
     /**
      * 资源管理
      */
-    ENVIRONMENT_DATA_EXPORT("environmentData", "environmentData", "环境记录单数据"),
+    ENVIRONMENT_DATA_EXPORT("environmentData", "环境记录单数据", "环境记录单数据"),
+    STAFF_INFO("staffInfo", "人员登记", "人员登记"),
+    STAFF_CERTIFICATE_EXPIRE("certificateExpire", "证书逾期提醒", "证书逾期提醒"),
+    SUPPLIER_INFO("supplierInfo", "合格供方名录", "合格供方名录"),
+    CUSTOMER_INFO("customerInfo", "委托方名录", "委托方名录"),
+    CUSTOMER_SUGGEST_FORM("customerSuggestForm", "委托方意见登记表", "委托方意见登记表"),
+    SEAL_NOTE("sealNote", "印章使用登记", "印章使用登记"),
 
-    FILE_EXPORT("meterFileData", "meterFileData", "计量文件信息"),
-    TRAIN_PLAN_EXPORT("trainPlanData", "trainPlanData", "培训计划"),
-    TRAIN_LOG_EXPORT("trainLogData", "trainLogData", "培训记录"),
-    METER_ORGANIZE_EXPORT("meterOrganizeData", "meterOrganizeData", "计量组织"),
-    TRACE_SUPPLIER_EXPORT("traceSupplierData", "traceSupplierData", "溯源供方"),
-    SIGN_EXPORT("signData", "signData", "签名/签章"),
-    TEMPLATE_EXPORT("templateData", "templateData", "原始记录模板/证书报告模板"),
-    FIXED_ASSETS("meterFixedAssets", "meterFixedAssets", "固定资产"),
-    METER_EQUIPMENT("meterEquipment", "meterEquipment", "测量设备"),
-    CALIBRATION_TEST_EQUIPMENT("calibrationTestEquipment", "calibrationTestEquipment", "校准检定设备"),
-    MEASURE_ACCOUNT("measureAccount", "measureAccount", "测量工装"),
-    STANDARD_SUPPORT_EQUIPMENT("standardSupportEquipment", "standardSupportEquipment", "标准配套设备"),
-    STANDARD_EQUIPMENT("standardEquipment", "standardEquipment", "标准装置"),
-    FLOW_DEF_EXPORT("flowDefData", "flowDefData", "流程定义"),
-    STAFF_CERTIFICATE("certificate", "certificate", "计量人员证书"),
-    CHECK_INFO("checkInfo", "checkInfo", "设备管理点检测"),
-    EQUIPMENT_APPLY("equipmentApply", "equipmentApply", "设备借用"),
-    STANDARD_EQUIPMENT_REMIND("equipmentApplyRemind", "equipmentApplyRemind", "标准装置到期提醒"),
-    METER_PRICE("meterPrice", "meterPrice", "价格库"),
-    METER_STAFF("meterStaff", "meterStaff", "计量人员"),
-    STANDARD_EQUIPMENT_APPLY("standardEquipmentApply", "standardEquipmentApply", "标准装置申请"),
-    STATE_MANAGE_APPLY("stateManage", "stateManage", "状态管理"),
-    METER_ACCEPTANCE_CHECK("acceptanceCheck", "acceptanceCheck", "设备检修保养验收单"),
-    CUSTOMER_EXPORT("customerData", "customerData", "客户信息"),
-    ORDER_EXPORT("orderData", "orderData", "委托书信息"),
-    SAMPLE_EXPORT("sampleData", "sampleData", "样本信息"),
-    EXCHANGE_DATA("exchangeData", "exchangeData", "设备交接单"),
-    DISPATCH_DATA("dispatchData", "dispatchData", "设备收发"),
-    ENVIRONMENT_DATA("environmentData", "environmentData", "环境记录单"),
-    ORIGIN_DATA("originData", "originData", "原始记录"),
-    CERTIFICATE_REPORT("certificateReport", "certificateReport", "证书报告"),
-    ADVICE_EXPORT("adviceData", "adviceData", "客户反馈"),
-    HANDOUT_EXPORT("handoutData", "handoutData", "任务分发列表"),
-    OUTSOURCER_EXPORT("outsourcerData", "outsourcerData", "分包方"),
-    SITE_EXECUTIVE_EXPORT("siteExecutiveData", "siteExecutiveData", "现场测试、校准或检定"),
-    CERTIFICATE_PRINT_EXPORT("certificatePrintData", "certificatePrintData", "证书打印"),
-    DOWNLOAD_TEMPLATE("downloadTemplate", "downloadTemplate", "页面配置"),
-    OUTSOURCER_CERTIFICATE_EXPORT("outsourceCertificateData", "outsourceCertificateData", "分包证书"),
-    SETTLEMENT_INFO_EXPORT("settlementInfoData", "settlementInfoData", "业务结算"),
-    EQUIPMENT_REMIND("equipmentRemind", "equipmentRemind", "设备到期提醒"),
-    AGREEMENT_INFO_EXPORT("agreementInfoData", "agreementInfoData", "合同"),
-    WORK_STATISTICS_EXPORT("workStatisticsData", "workStatisticsData", "实时工作统计"),
-    DEPT_OUTPUT_EXPORT("deptOutputData", "deptOutputData", "部门产值分析"),
-    WORKLOAD_EXPORT("workloadData", "workloadData", "业务工作量分析"),
-    DEPT_COMPREHENSIVE_EXPORT("deptComprehensiveData", "deptComprehensiveData", "部门综合分析"),
-    ENVIRONMENTAL_RECORD("environmentalRecordData", "environmentalRecordData", "现场环境记录");
+    /**
+     * 计量检定业务
+     */
+    OUTSOURCER_EXPORT("outsourcerData", "分包方名录", "分包方名录"),
+    IDENTIFY_EXPORT("identifyData", "计量标识", "计量标识"),
+    ORDER_EXPORT("orderData", "任务单", "任务单"),
+    DISPATCH_DATA("dispatchData", "设备收发", "设备收发"),
+    HANDOUT_EXPORT("handoutData", "任务分发", "任务分发"),
+    SITE_EXECUTIVE_EXPORT("siteExecutiveData", "现场测试、校准或检定", "现场测试、校准或检定"),
+    CERTIFICATE_REPORT("certificateReport", "证书审批", "证书审批"),
+    CERTIFICATE_CHANGE_APPLY("certificateChangeApply", "证书报告补充或更换申请单", "证书报告补充或更换申请单"),
+    CERTIFICATE_PRINT("certificatePrintData", "证书打印审批", "证书打印审批"),
+    DEPT_EXECUTIVE_TASK("deptExecutiveTaskData", "实验室任务", "实验室任务"),
+    MY_EXECUTIVE_TASK("myExecutiveTaskData", "我的任务", "我的任务"),
+    OUTSOURCE_ASSESS("outsourceAssess", "测试、校准或检定工作分包评审表", "测试、校准或检定工作分包评审表"),
+    OUTSOURCE_PROTOCOL("outsourceProtocol", "测试、校准或检定工作分包协议书", "测试、校准或检定工作分包协议书"),
+
+    /**
+     * 系统管理
+     */
+    SIGN_EXPORT("signData", "签名", "签名"),
+    TEMPLATE_EXPORT("templateData", "文件模板", "文件模板"),
+    FLOW_DEF_EXPORT("flowDefData", "流程定义", "流程定义"),
+    DOWNLOAD_TEMPLATE("downloadTemplate", "流程定义", "页面配置");
 
     ExportEnum(String fileName, String sheetName, String description) {
         this.fileName = fileName;
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateRecordTypeCodeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateRecordTypeCodeEnum.java
index 31d913c..a963522 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateRecordTypeCodeEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateRecordTypeCodeEnum.java
@@ -46,4 +46,14 @@
     String SITE_EXECUTIVE_APPROVAL = "01";
     //《现场测试、校准或检定工作记录表》
     String SITE_EXECUTIVE_LOG = "02";
+
+    //测试、校准或检定工作分包协议书
+    String OUTSOURCE_PROTOCOL = "01";
+    //测试、校准或检定工作分包评审表
+    String OUTSOURCE_ACCESS = "02";
+    //测试、校准或检定工作分包通知书
+    String OUTSOURCE_NOTICE = "03";
+    //测试、校准或检定工作分包方名录
+    String OUTSOURCE_INFO = "04";
+
 }
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
index 24b8635..f78bd53 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
@@ -15,6 +15,10 @@
     String CERTIFICATE_CHANGE_APPLY_BEAN_NAME = "certificateChangeApplyBean";
     //现场测试、校准或检定
     String SITE_EXECUTIVE_BEAN_NAME = "siteExecutiveBean";
+    //测试、校准或检定工作分包评审表
+    String OUTSOURCE_ASSESS_BEAN_NAME = "outsourceAssessBean";
+    //测试、校准或检定工作分包协议书
+    String OUTSOURCE_PROTOCOL_BEAN_NAME = "outsourceProtocolBean";
 
     /*********************************设备与装置************************************/
     //设备台账
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 b21c661..6b86fd1 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
@@ -18,6 +18,8 @@
     OUTSOURCER_APPROVAL(OUTSOURCER_BEAN_NAME, ""),
     CERTIFICATE_CHANGE_APPROVAL(CERTIFICATE_CHANGE_APPLY_BEAN_NAME, ""),
     SITE_EXECUTIVE_APPROVAL(SITE_EXECUTIVE_BEAN_NAME, ""),
+    OUTSOURCE_ASSESS_APPROVAL(OUTSOURCE_ASSESS_BEAN_NAME, ""),
+    OUTSOURCE_PROTOCOL_APPROVAL(OUTSOURCE_PROTOCOL_BEAN_NAME, ""),
 
     ACTION_STATUS_MAP(new HashMap<String, AwareActionStatusEnum>() {
         {
@@ -47,6 +49,10 @@
             put(ApplyFromIdEnum.CERTIFICATE_CHANGE_APPROVAL.getCode(), CERTIFICATE_CHANGE_APPROVAL);
             //现场测试、校准或检定审批
             put(ApplyFromIdEnum.SITE_EXECUTIVE_APPROVAL.getCode(), SITE_EXECUTIVE_APPROVAL);
+            //测试、校准或检定工作分包评审表
+            put(ApplyFromIdEnum.OUTSOURCE_ASSESS_APPROVAL.getCode(), OUTSOURCE_ASSESS_APPROVAL);
+            //测试、校准或检定工作分包协议书
+            put(ApplyFromIdEnum.OUTSOURCE_PROTOCOL_APPROVAL.getCode(), OUTSOURCE_PROTOCOL_APPROVAL);
         }
     });
     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 934405e..c7410bd 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
@@ -9,6 +9,8 @@
     CERTIFICATE_CHANGE_APPROVAL("jljdywzsbchghsqd", MessageSourceModuleEnum.BUSINESS.getCode(), "证书/报告补充或更换申请单"),
     OUTSOURCER_APPROVAL("jljdywcsjzhgfbfml", MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定合格分包方名录"),
     SITE_EXECUTIVE_APPROVAL("jljdywxccsjzsp", MessageSourceModuleEnum.BUSINESS.getCode(), "现场测试、校准或检定审批"),
+    OUTSOURCE_ASSESS_APPROVAL("jljdywcsjzfbpsb", MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包评审表"),
+    OUTSOURCE_PROTOCOL_APPROVAL("jljdywcsjzfbxys", MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包协议书"),
 
 
     /*******************************************设备与装置*********************************************/
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/GeneralApprovalMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/GeneralApprovalMapper.java
index 4fb7344..0c9d6ae 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/GeneralApprovalMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/GeneralApprovalMapper.java
@@ -17,8 +17,4 @@
 
     Page<O> selectBatchForApprovalList(Page<O> page, @Param("request") R request, @Param("businessKeys") List<String> businessKeys);
 
-//    Page<O> selectListPage(Page<O> page, @Param("request") R request);
-
-//    Long selectMaxNo();
-
 }
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceAssessMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceAssessMapper.java
index 7867bb8..ba59009 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceAssessMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceAssessMapper.java
@@ -1,7 +1,12 @@
 package com.casic.missiles.mapper.business;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.business.outsource.OutsourceAssessApprovalListRequest;
+import com.casic.missiles.mapper.GeneralApprovalMapper;
 import com.casic.missiles.model.business.BizBusinessOutsourceAssess;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * <p>
@@ -11,6 +16,10 @@
  * @author wangpeng
  * @since 2023-08-16
  */
-public interface BizBusinessOutsourceAssessMapper extends BaseMapper<BizBusinessOutsourceAssess> {
+public interface BizBusinessOutsourceAssessMapper extends GeneralApprovalMapper<BizBusinessOutsourceAssess, BizBusinessOutsourceAssess, OutsourceAssessApprovalListRequest> {
+
+    Page<BizBusinessOutsourceAssess> selectBatchForApprovalList(Page<BizBusinessOutsourceAssess> page, @Param("request") OutsourceAssessApprovalListRequest request, @Param("businessKeys") List<String> businessKeys);
+
+    Long selectMaxProjectNo();
 
 }
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceProtocolMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceProtocolMapper.java
new file mode 100644
index 0000000..e6aba35
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceProtocolMapper.java
@@ -0,0 +1,24 @@
+package com.casic.missiles.mapper.business;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.business.outsource.OutsourceProtocolApprovalListRequest;
+import com.casic.missiles.mapper.GeneralApprovalMapper;
+import com.casic.missiles.model.business.BizBusinessOutsourceProtocol;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 计量检定业务-分包管理-测试、校准或检定工作分包协议书 Mapper 接口
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-08-24
+ */
+public interface BizBusinessOutsourceProtocolMapper extends GeneralApprovalMapper<BizBusinessOutsourceProtocol, BizBusinessOutsourceProtocol, OutsourceProtocolApprovalListRequest> {
+
+    Page<BizBusinessOutsourceProtocol> selectBatchForApprovalList(Page<BizBusinessOutsourceProtocol> page, @Param("request") OutsourceProtocolApprovalListRequest request, @Param("businessKeys") List<String> businessKeys);
+
+    Long selectMaxProtocolNo();
+}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/EnvLocationInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/EnvLocationInfoMapper.java
new file mode 100644
index 0000000..49eff87
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/EnvLocationInfoMapper.java
@@ -0,0 +1,21 @@
+package com.casic.missiles.mapper.resource;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.resource.environment.LocationListRequest;
+import com.casic.missiles.dto.resource.environment.LocationListResponse;
+import com.casic.missiles.model.resource.EnvLocationInfo;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * <p>
+ * 实验室环境监控系统-设备表 Mapper 接口
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-06-07
+ */
+public interface EnvLocationInfoMapper extends BaseMapper<EnvLocationInfo> {
+
+    Page<LocationListResponse> selectLocationListPage(Page<LocationListResponse> page, @Param("request") LocationListRequest request);
+}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java
index de124db..85ed0f7 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java
@@ -1,7 +1,9 @@
 package com.casic.missiles.mapper.system;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.dto.system.SignDetailResponse;
+import com.casic.missiles.dto.system.SignListRequest;
 import com.casic.missiles.model.system.SystemSign;
 import org.apache.ibatis.annotations.Param;
 
@@ -22,4 +24,8 @@
     SignDetailResponse selectSignDetailById(Long id);
 
     List<SystemSign> selectUsableSignList(@Param("userId") Long userId);
+
+    Page<SystemSign> selectSignListPage(Page<SystemSign> page, @Param("request") SignListRequest request);
+
+    List<SystemSign> selectSignList(@Param("request") SignListRequest request);
 }
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateChangeApplyMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateChangeApplyMapper.xml
index d798447..c496092 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateChangeApplyMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateChangeApplyMapper.xml
@@ -30,31 +30,31 @@
         SELECT *
         FROM biz_business_certificate_change_apply
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.changeApplyNo != null and request.changeApplyNo !=''">
+        <if test="request != null and request.changeApplyNo != null and request.changeApplyNo !=''">
             and change_apply_no like concat('%',#{request.changeApplyNo},'%')
         </if>
-        <if test="request.changeReportNo != null and request.changeReportNo !=''">
+        <if test="request != null and request.changeReportNo != null and request.changeReportNo !=''">
             and change_report_no like concat('%',#{request.changeReportNo},'%')
         </if>
-        <if test="request.changeReportName != null and request.changeReportName !=''">
+        <if test="request != null and request.changeReportName != null and request.changeReportName !=''">
             and change_report_name like concat('%',#{request.changeReportName},'%')
         </if>
-        <if test="request.changeType != null and request.changeType !=''">
+        <if test="request != null and request.changeType != null and request.changeType !=''">
             and change_type = #{request.changeType}
         </if>
-        <if test="request.createUserName != null and request.createUserName !=''">
+        <if test="request != null and request.createUserName != null and request.createUserName !=''">
             and create_user_name like concat('%',#{request.createUserName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificatePrintMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificatePrintMapper.xml
index b66cd99..49c0ac8 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificatePrintMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificatePrintMapper.xml
@@ -31,34 +31,34 @@
         LEFT JOIN biz_business_order_sample_relation bosr ON (bosr.order_id = bcr.order_id AND bosr.sample_id = bcr.sample_id)
         LEFT JOIN biz_business_order_info boi ON boi.id = bosr.order_id
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and bcp.approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.printStatus != null and request.printStatus !=''">
+        <if test="request != null and request.printStatus != null and request.printStatus !=''">
             and print_status = #{request.printStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and bcp.create_user_id = #{request.createUserId}
         </if>
-        <if test="request.certificateReportNo != null and request.certificateReportNo !=''">
+        <if test="request != null and request.certificateReportNo != null and request.certificateReportNo !=''">
             and bcr.certificate_report_no like concat('%',#{request.certificateReportNo},'%')
         </if>
-        <if test="request.certificateReportName != null and request.certificateReportName !=''">
+        <if test="request != null and request.certificateReportName != null and request.certificateReportName !=''">
             and bcr.certificate_report_name like concat('%',#{request.certificateReportName},'%')
         </if>
-        <if test="request.customerName != null and request.customerName !=''">
+        <if test="request != null and request.customerName != null and request.customerName !=''">
             and boi.customer_name like concat('%',#{request.customerName},'%')
         </if>
-        <if test="request.sampleNo != null and request.sampleNo !=''">
+        <if test="request != null and request.sampleNo != null and request.sampleNo !=''">
             and bosr.sample_no like concat('%',#{request.sampleNo},'%')
         </if>
-        <if test="request.sampleName != null and request.sampleName !=''">
+        <if test="request != null and request.sampleName != null and request.sampleName !=''">
             and bosr.sample_name like concat('%',#{request.sampleName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and bcp.create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and bcp.create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml
index b366034..767695d 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml
@@ -46,33 +46,37 @@
         SELECT bcr.*, bosr.sample_no, bosr.sample_name, bosr.sample_model, rsi.staff_name
         FROM biz_business_certificate_report bcr
         LEFT JOIN biz_business_order_sample_relation bosr ON (bosr.order_id = bcr.order_id AND bosr.sample_id = bcr.sample_id)
+        LEFT JOIN biz_business_order_info boi ON boi.id = bcr.order_id
         LEFT JOIN biz_resource_staff_info rsi ON rsi.id = bcr.measure_person_id
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and bcr.approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and bcr.create_user_id = #{request.createUserId}
         </if>
-        <if test="request.certificateReportNo != null and request.certificateReportNo !=''">
+        <if test="request != null and request.customerId != null and request.customerId !=''">
+            and boi.customer_id = #{request.customerId}
+        </if>
+        <if test="request != null and request.certificateReportNo != null and request.certificateReportNo !=''">
             and bcr.certificate_report_no like concat('%',#{request.certificateReportNo},'%')
         </if>
-        <if test="request.certificateReportName != null and request.certificateReportName !=''">
+        <if test="request != null and request.certificateReportName != null and request.certificateReportName !=''">
             and bcr.certificate_report_name like concat('%',#{request.certificateReportName},'%')
         </if>
-        <if test="request.sampleNo != null and request.sampleNo !=''">
+        <if test="request != null and request.sampleNo != null and request.sampleNo !=''">
             and bosr.sample_no like concat('%',#{request.sampleNo},'%')
         </if>
-        <if test="request.measureCategory != null and request.measureCategory !=''">
+        <if test="request != null and request.measureCategory != null and request.measureCategory !=''">
             and bcr.measure_category = #{request.measureCategory}
         </if>
-        <if test="request.measurePerson != null and request.measurePerson !=''">
+        <if test="request != null and request.measurePerson != null and request.measurePerson !=''">
             and rsi.staff_name like concat('%',#{request.measurePerson},'%')
         </if>
-        <if test="request.calibrationTimeStart != null and request.calibrationTimeStart !=''">
+        <if test="request != null and request.calibrationTimeStart != null and request.calibrationTimeStart !=''">
             and bcr.calibration_time &gt;= #{request.calibrationTimeStart}
         </if>
-        <if test="request.calibrationTimeEnd != null and request.calibrationTimeEnd !=''">
+        <if test="request != null and request.calibrationTimeEnd != null and request.calibrationTimeEnd !=''">
             and bcr.calibration_time &lt;= #{request.calibrationTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceAssessMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceAssessMapper.xml
index d0fcf8b..c22c101 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceAssessMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceAssessMapper.xml
@@ -7,6 +7,8 @@
         <id column="id" property="id" />
         <result column="project_no" property="projectNo" />
         <result column="project_name" property="projectName" />
+        <result column="lab_code" property="labCode" />
+        <result column="group_code" property="groupCode" />
         <result column="applicant_id" property="applicantId" />
         <result column="applicant_name" property="applicantName" />
         <result column="applicant_time" property="applicantTime" />
@@ -31,7 +33,45 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, project_no, project_name, applicant_id, applicant_name, applicant_time, minio_file_name, remark, create_user_id, create_user_name, outsourcer_id, pre_start_time, pre_end_time, outsource_reason, pre_cost, approval_status, process_id, approve_situation, traceability, test_method, technique_ability, create_time, update_time
+        id, project_no, project_name, lab_code, group_code, applicant_id, applicant_name, applicant_time, minio_file_name, remark, create_user_id, create_user_name, outsourcer_id, pre_start_time, pre_end_time, outsource_reason, pre_cost, approval_status, process_id, approve_situation, traceability, test_method, technique_ability, create_time, update_time
     </sql>
 
+    <select id="selectMaxProjectNo" resultType="java.lang.Long">
+        SELECT IFNULL(max(RIGHT(project_no, 3)), 0) from biz_business_outsource_assess
+    </select>
+
+    <select id="selectBatchForApprovalList" resultMap="BaseResultMap">
+        SELECT bboa.*, bboi.outsourcer_name, bboi.director
+        FROM biz_business_outsource_assess bboa
+        LEFT JOIN biz_business_outsourcer_info bboi ON bboa.outsourcer_id = bboi.id
+        WHERE 1=1
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
+            and bboa.approval_status = #{request.approvalStatus}
+        </if>
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
+            and bboa.create_user_id = #{request.createUserId}
+        </if>
+        <if test="request != null and request.projectNo != null and request.projectNo !=''">
+            and bboa.project_no like concat('%',#{request.projectNo},'%')
+        </if>
+        <if test="request != null and request.outsourcerName != null and request.outsourcerName !=''">
+            and bboi.outsourcer_name like concat('%',#{request.outsourcerName},'%')
+        </if>
+        <if test="request != null and request.applicantName != null and request.applicantName !=''">
+            and bboa.applicant_name like concat('%',#{request.applicantName},'%')
+        </if>
+        <if test="request != null and request.applicantTimeStart != null and request.applicantTimeStart !=''">
+            and bboa.applicant_time &gt;= #{request.applicantTimeStart}
+        </if>
+        <if test="request != null and request.applicantTimeEnd != null and request.applicantTimeEnd !=''">
+            and bboa.applicant_time &lt;= #{request.applicantTimeEnd}
+        </if>
+        <if test="businessKeys != null">
+            and bboa.id in
+            <foreach collection="businessKeys" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
+        ORDER BY bboa.create_time DESC
+    </select>
 </mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceProtocolMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceProtocolMapper.xml
new file mode 100644
index 0000000..b7b2149
--- /dev/null
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceProtocolMapper.xml
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.mapper.business.BizBusinessOutsourceProtocolMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.business.BizBusinessOutsourceProtocol">
+        <id column="id" property="id" />
+        <result column="protocol_no" property="protocolNo" />
+        <result column="project_name" property="projectName" />
+        <result column="lab_code" property="labCode" />
+        <result column="group_code" property="groupCode" />
+        <result column="outsourcer_id" property="outsourcerId" />
+        <result column="remark" property="remark" />
+        <result column="outsource_no" property="outsourceNo" />
+        <result column="outsource_name" property="outsourceName" />
+        <result column="contacts" property="contacts" />
+        <result column="mobile" property="mobile" />
+        <result column="address" property="address" />
+        <result column="require_date" property="requireDate" />
+        <result column="outsource_cost" property="outsourceCost" />
+        <result column="director" property="director" />
+        <result column="item" property="item" />
+        <result column="requires" property="requires" />
+        <result column="create_user_id" property="createUserId" />
+        <result column="create_user_name" property="createUserName" />
+        <result column="approval_status" property="approvalStatus" />
+        <result column="process_id" property="processId" />
+        <result column="create_time" property="createTime" />
+        <result column="update_time" property="updateTime" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, protocol_no, project_name, lab_code, group_code, outsourcer_id, remark, outsource_no, outsource_name, contacts, mobile, address, require_date, outsource_cost, director, item, requires, create_user_id, create_user_name, approval_status, process_id, create_time, update_time
+    </sql>
+
+    <select id="selectMaxProtocolNo" resultType="java.lang.Long">
+        SELECT IFNULL(max(RIGHT(protocol_no, 3)), 0) from biz_business_outsource_protocol
+    </select>
+
+    <select id="selectBatchForApprovalList" resultMap="BaseResultMap">
+        SELECT *
+        FROM biz_business_outsource_protocol
+        WHERE 1=1
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
+            and approval_status = #{request.approvalStatus}
+        </if>
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
+            and create_user_id = #{request.createUserId}
+        </if>
+        <if test="request != null and request.protocolNo != null and request.protocolNo !=''">
+            and protocol_no like concat('%',#{request.protocolNo},'%')
+        </if>
+        <if test="request != null and request.outsourcerName != null and request.outsourcerName !=''">
+            and outsourcer_name like concat('%',#{request.outsourcerName},'%')
+        </if>
+        <if test="request != null and request.applicantName != null and request.applicantName !=''">
+            and create_user_name like concat('%',#{request.applicantName},'%')
+        </if>
+        <if test="request != null and request.applicantTimeStart != null and request.applicantTimeStart !=''">
+            and create_time &gt;= #{request.applicantTimeStart}
+        </if>
+        <if test="request != null and request.applicantTimeEnd != null and request.applicantTimeEnd !=''">
+            and create_time &lt;= #{request.applicantTimeEnd}
+        </if>
+        <if test="businessKeys != null">
+            and id in
+            <foreach collection="businessKeys" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
+        ORDER BY create_time DESC
+    </select>
+</mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourcerInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourcerInfoMapper.xml
index 510a80b..3049b54 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourcerInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourcerInfoMapper.xml
@@ -7,6 +7,8 @@
         <id column="id" property="id" />
         <result column="outsourcer_no" property="outsourcerNo" />
         <result column="outsourcer_name" property="outsourcerName" />
+        <result column="lab_code" property="labCode" />
+        <result column="group_code" property="groupCode" />
         <result column="outsourcer_brief_name" property="outsourcerBriefName" />
         <result column="outsourcer_size" property="outsourcerSize" />
         <result column="business_size" property="businessSize" />
@@ -55,32 +57,32 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, outsourcer_no, outsourcer_name, outsourcer_brief_name, outsourcer_size, business_size, grade, evaluation, tax_number, bank_account, bank_name, bank_account_number, postal_code, director, phone, fax, mobile, email, website, address_country, address_province, address_city, address_area, full_address, address_country_name, address_province_name, address_city_name, address_area_name, invoice_country, invoice_province, invoice_city, invoice_area, invoice_full_address, invoice_country_name, invoice_province_name, invoice_city_name, invoice_area_name, business_scope, business_content, minio_file_name, approval_status, process_id, remark, create_user_id, create_user_name, create_time, update_time
+        id, outsourcer_no, outsourcer_name, lab_code, group_code, outsourcer_brief_name, outsourcer_size, business_size, grade, evaluation, tax_number, bank_account, bank_name, bank_account_number, postal_code, director, phone, fax, mobile, email, website, address_country, address_province, address_city, address_area, full_address, address_country_name, address_province_name, address_city_name, address_area_name, invoice_country, invoice_province, invoice_city, invoice_area, invoice_full_address, invoice_country_name, invoice_province_name, invoice_city_name, invoice_area_name, business_scope, business_content, minio_file_name, approval_status, process_id, remark, create_user_id, create_user_name, create_time, update_time
     </sql>
 
     <select id="selectBatchForApprovalList" resultMap="BaseResultMap">
         SELECT *
         FROM biz_business_outsourcer_info
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.outsourcerNo != null and request.outsourcerNo !=''">
+        <if test="request != null and request.outsourcerNo != null and request.outsourcerNo !=''">
             and outsourcer_no like concat('%',#{request.outsourcerNo},'%')
         </if>
-        <if test="request.outsourcerName != null and request.outsourcerName !=''">
+        <if test="request != null and request.outsourcerName != null and request.outsourcerName !=''">
             and outsourcer_name like concat('%',#{request.outsourcerName},'%')
         </if>
-        <if test="request.director != null and request.director !=''">
+        <if test="request != null and request.director != null and request.director !=''">
             and director like concat('%',#{request.director},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
@@ -93,6 +95,6 @@
     </select>
 
     <select id="selectMaxNo" resultType="java.lang.Long">
-        SELECT IFNULL(max(RIGHT(outsourcer_no, 12)), 0) from biz_business_outsourcer_info
+        SELECT IFNULL(max(RIGHT(outsourcer_no, 3)), 0) from biz_business_outsourcer_info
     </select>
 </mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessSiteExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessSiteExecutiveInfoMapper.xml
index 135c5d0..3c5ae79 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessSiteExecutiveInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessSiteExecutiveInfoMapper.xml
@@ -38,25 +38,25 @@
         FROM biz_business_site_executive_info bsei
         LEFT JOIN biz_resource_customer_info rci ON bsei.customer_id = rci.id
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and bsei.approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and bsei.create_user_id = #{request.createUserId}
         </if>
-        <if test="request.siteExecutiveNo != null and request.siteExecutiveNo !=''">
+        <if test="request != null and request.siteExecutiveNo != null and request.siteExecutiveNo !=''">
             and bsei.site_executive_no like concat('%',#{request.siteExecutiveNo},'%')
         </if>
-        <if test="request.customerName != null and request.customerName !=''">
+        <if test="request != null and request.customerName != null and request.customerName !=''">
             and rci.outsourcer_name like concat('%',#{request.customerName},'%')
         </if>
-        <if test="request.applyName != null and request.applyName !=''">
+        <if test="request != null and request.applyName != null and request.applyName !=''">
             and bsei.apply_name like concat('%',#{request.applyName},'%')
         </if>
-        <if test="request.applyTimeStart != null and request.applyTimeStart !=''">
+        <if test="request != null and request.applyTimeStart != null and request.applyTimeStart !=''">
             and bsei.apply_time &gt;= #{request.applyTimeStart}
         </if>
-        <if test="request.applyTimeEnd != null and request.applyTimeEnd !=''">
+        <if test="request != null and request.applyTimeEnd != null and request.applyTimeEnd !=''">
             and bsei.apply_time &lt;= #{request.applyTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml
index 84d9e2a..6bd38a9 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml
@@ -105,6 +105,12 @@
         <if test="request.isUrgent != null and request.isUrgent !=''">
             AND bo.is_urgent = #{request.isUrgent}
         </if>
+        <if test="request.ids != null">
+            and blei.id in
+            <foreach collection="request.ids" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
         ORDER BY blei.update_time DESC
     </select>
 
@@ -137,6 +143,12 @@
         <if test="request.isUrgent != null and request.isUrgent !=''">
             AND bo.is_urgent = #{request.isUrgent}
         </if>
+        <if test="request.ids != null">
+            and blei.id in
+            <foreach collection="request.ids" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
         ORDER BY blei.update_time DESC
     </select>
 
diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardInfoMapper.xml
index 1a5551b..2ed8d17 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardInfoMapper.xml
@@ -45,12 +45,6 @@
         FROM biz_equipment_standard_info besi
         LEFT JOIN biz_equipment_standard_technology_relation bestr ON besi.standard_no = bestr.standard_no
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
-            and besi.approval_status = #{request.approvalStatus}
-        </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
-            and besi.create_user_id = #{request.createUserId}
-        </if>
         <if test="request.standardName != null and request.standardName !=''">
             and besi.standard_name like concat('%',#{request.standardName},'%')
         </if>
diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardTechnologyRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardTechnologyRelationMapper.xml
index fc7e16c..cd03c8c 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardTechnologyRelationMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardTechnologyRelationMapper.xml
@@ -6,6 +6,7 @@
     <resultMap id="BaseResultMap" type="com.casic.missiles.model.equipment.BizEquipmentStandardTechnologyRelation">
         <id column="id" property="id" />
         <result column="technology_file_id" property="technologyFileId" />
+        <result column="technology_file_no" property="technologyFileNo" />
         <result column="technology_file_name" property="technologyFileName" />
         <result column="standard_id" property="standardId" />
         <result column="standard_no" property="standardNo" />
@@ -14,7 +15,7 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, technology_file_id, technology_file_name, standard_id, remark
+        id, technology_file_id, technology_file_no, technology_file_name, standard_id, remark
     </sql>
 
 </mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceAuthorizeOrderMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceAuthorizeOrderMapper.xml
index ac5176c..554fe65 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceAuthorizeOrderMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceAuthorizeOrderMapper.xml
@@ -32,22 +32,22 @@
         SELECT *
         FROM biz_resource_authorize_order
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.orderNo != null and request.orderNo !=''">
+        <if test="request != null and request.orderNo != null and request.orderNo !=''">
             and order_no like concat('%',#{request.orderNo},'%')
         </if>
-        <if test="request.createUserName != null and request.createUserName !=''">
+        <if test="request != null and request.createUserName != null and request.createUserName !=''">
             and create_user_name like concat('%',#{request.createUserName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerExamineFormMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerExamineFormMapper.xml
index ab242f6..af7f98f 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerExamineFormMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerExamineFormMapper.xml
@@ -41,28 +41,28 @@
         SELECT *
         FROM biz_resource_customer_examine_form
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.formNo != null and request.formNo !=''">
+        <if test="request != null and request.formNo != null and request.formNo !=''">
             and form_no like concat('%',#{request.formNo},'%')
         </if>
-        <if test="request.labCode != null and request.labCode !=''">
+        <if test="request != null and request.labCode != null and request.labCode !=''">
             and lab_code like concat('%',#{request.labCode},'%')
         </if>
-        <if test="request.groupCode != null and request.groupCode !=''">
+        <if test="request != null and request.groupCode != null and request.groupCode !=''">
             and group_code like concat('%',#{request.groupCode},'%')
         </if>
-        <if test="request.createUserName != null and request.createUserName !=''">
+        <if test="request != null and request.createUserName != null and request.createUserName !=''">
             and create_user_name like concat('%',#{request.createUserName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerInfoMapper.xml
index fa8ffbc..06a2798 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerInfoMapper.xml
@@ -33,25 +33,25 @@
         SELECT *
         FROM biz_resource_customer_info
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.customerNo != null and request.customerNo !=''">
+        <if test="request != null and request.customerNo != null and request.customerNo !=''">
             and customer_no like concat('%',#{request.customerNo},'%')
         </if>
-        <if test="request.customerName != null and request.customerName !=''">
+        <if test="request != null and request.customerName != null and request.customerName !=''">
             and customer_name like concat('%',#{request.customerName},'%')
         </if>
-        <if test="request.contacts != null and request.contacts !=''">
+        <if test="request != null and request.contacts != null and request.contacts !=''">
             and contacts like concat('%',#{request.contacts},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerSuggestFormMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerSuggestFormMapper.xml
index 28f5bb2..1806662 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerSuggestFormMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerSuggestFormMapper.xml
@@ -33,28 +33,28 @@
         SELECT *
         FROM biz_resource_customer_suggest_form
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.formNo != null and request.formNo !=''">
+        <if test="request != null and request.formNo != null and request.formNo !=''">
             and form_no like concat('%',#{request.formNo},'%')
         </if>
-        <if test="request.customerName != null and request.customerName !=''">
+        <if test="request != null and request.customerName != null and request.customerName !=''">
             and customer_name like concat('%',#{request.customerName},'%')
         </if>
-        <if test="request.customerDeptName != null and request.customerDeptName !=''">
+        <if test="request != null and request.customerDeptName != null and request.customerDeptName !=''">
             and customer_dept_name like concat('%',#{request.customerDeptName},'%')
         </if>
-        <if test="request.createUserName != null and request.createUserName !=''">
+        <if test="request != null and request.createUserName != null and request.createUserName !=''">
             and create_user_name like concat('%',#{request.createUserName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSealUseNoteMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSealUseNoteMapper.xml
index ab37bc1..b02bb33 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSealUseNoteMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSealUseNoteMapper.xml
@@ -29,32 +29,32 @@
     </sql>
 
     <select id="selectBatchForApprovalList" resultMap="BaseResultMap">
-        SELECT *
+        SELECT brsun.*, brsi.seal_name, brsi.seal_type, brsi.approver_name
         FROM biz_resource_seal_use_note brsun
         JOIN biz_resource_seal_info brsi ON brsun.seal_id = brsi.id
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and brsun.approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and brsun.create_user_id = #{request.createUserId}
         </if>
-        <if test="request.sealName != null and request.sealName !=''">
+        <if test="request != null and request.sealName != null and request.sealName !=''">
             and brsi.seal_name like concat('%',#{request.sealName},'%')
         </if>
-        <if test="request.sealType != null and request.sealType !=''">
+        <if test="request != null and request.sealType != null and request.sealType !=''">
             and brsi.seal_type = #{request.sealType}
         </if>
-        <if test="request.applyDeptName != null and request.applyDeptName !=''">
+        <if test="request != null and request.applyDeptName != null and request.applyDeptName !=''">
             and brsun.apply_dept_name like concat('%',#{request.applyDeptName},'%')
         </if>
-        <if test="request.applyUserName != null and request.applyUserName !=''">
+        <if test="request != null and request.applyUserName != null and request.applyUserName !=''">
             and brsun.apply_user_name like concat('%',#{request.applyUserName},'%')
         </if>
-        <if test="request.applyTimeStart != null and request.applyTimeStart !=''">
+        <if test="request != null and request.applyTimeStart != null and request.applyTimeStart !=''">
             and brsun.apply_time &gt;= #{request.applyTimeStart}
         </if>
-        <if test="request.applyTimeEnd != null and request.applyTimeEnd !=''">
+        <if test="request != null and request.applyTimeEnd != null and request.applyTimeEnd !=''">
             and brsun.apply_time &lt;= #{request.applyTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml
index 119bf7d..4f8392a 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml
@@ -31,6 +31,12 @@
         <if test="request.deptName != null and request.deptName !=''">
             and brsi.dept_name like concat('%',#{request.deptName},'%')
         </if>
+        <if test="request.ids != null">
+            and brsv.id in
+            <foreach collection="request.ids" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
         ORDER BY brsv.grant_date DESC
     </select>
 
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSupplierInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSupplierInfoMapper.xml
index fe8d399..e8ce7ef 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSupplierInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSupplierInfoMapper.xml
@@ -48,28 +48,28 @@
         SELECT *
         FROM biz_resource_supplier_info
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.supplierNo != null and request.supplierNo !=''">
+        <if test="request != null and request.supplierNo != null and request.supplierNo !=''">
             and supplier_no like concat('%',#{request.supplierNo},'%')
         </if>
-        <if test="request.supplierName != null and request.supplierName !=''">
+        <if test="request != null and request.supplierName != null and request.supplierName !=''">
             and supplier_name like concat('%',#{request.supplierName},'%')
         </if>
-        <if test="request.director != null and request.director !=''">
+        <if test="request != null and request.director != null and request.director !=''">
             and director like concat('%',#{request.director},'%')
         </if>
-        <if test="request.supplierType != null and request.supplierType !=''">
+        <if test="request != null and request.supplierType != null and request.supplierType !=''">
             and supplier_type = #{request.supplierType}
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/EnvLocationInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/EnvLocationInfoMapper.xml
new file mode 100644
index 0000000..68bcf10
--- /dev/null
+++ b/casic-metering-dao/src/main/resources/mapper/resource/EnvLocationInfoMapper.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.mapper.resource.EnvLocationInfoMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.resource.EnvLocationInfo">
+        <id column="id" property="id" />
+        <result column="location_no" property="locationNo" />
+        <result column="location_name" property="locationName" />
+        <result column="location_position" property="locationPosition" />
+        <result column="create_user_id" property="createUserId" />
+        <result column="create_user" property="createUser" />
+        <result column="create_time" property="createTime" />
+        <result column="update_time" property="updateTime" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, location_no, location_name, location_position, create_user_id, create_user, create_time, update_time
+    </sql>
+
+    <select id="selectLocationListPage" resultType="com.casic.missiles.dto.resource.environment.LocationListResponse">
+        SELECT *
+        FROM env_location_info
+        WHERE 1=1
+        <if test="request.locationNo != null and request.locationNo !=''">
+            AND location_no LIKE concat('%',#{request.locationNo},'%')
+        </if>
+        <if test="request.locationName != null and request.locationName !=''">
+            AND location_name LIKE concat('%',#{request.locationName},'%')
+        </if>
+        ORDER BY create_time DESC
+    </select>
+
+</mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml
index b28c18f..8854047 100644
--- a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml
@@ -11,7 +11,6 @@
         <result column="sign_desc" property="signDesc" />
         <result column="sign_director" property="signDirector" />
         <result column="sign_user_id" property="signUserId" />
-        <result column="sign_type" property="signType" />
         <result column="minio_file_name" property="minioFileName" />
         <result column="create_time" property="createTime" />
         <result column="update_time" property="updateTime" />
@@ -28,7 +27,6 @@
         <result column="sign_name" property="signName" />
         <result column="sign_desc" property="signDesc" />
         <result column="sign_director" property="signDirector" />
-        <result column="sign_type" property="signType" />
         <result column="sign_user_id" property="signUserId" />
         <result column="minio_file_name" property="minioFileName" />
         <result column="create_time" property="createTime" />
@@ -62,4 +60,58 @@
         JOIN system_sign_user_relation ssur ON ss.id = ssur.sign_id
         WHERE ssur.user_id = #{userId}
     </select>
+
+    <select id="selectSignListPage" resultMap="BaseResultMap">
+        SELECT ss.*, sd.SIMPLE_NAME AS deptName
+        FROM system_sign ss
+        LEFT JOIN sys_user su ON su.id = ss.sign_user_id
+        LEFT JOIN sys_dept sd ON sd.id = su.dept_id
+        WHERE 1=1
+        <if test="request.signNo != null and request.signNo !=''">
+            AND ss.sign_no LIKE concat('%',#{request.signNo},'%')
+        </if>
+        <if test="request.signName != null and request.signName !=''">
+            AND ss.sign_name LIKE concat('%',#{request.signName},'%')
+        </if>
+        <if test="request.signDirector != null and request.signDirector !=''">
+            AND ss.sign_director LIKE concat('%',#{request.signDirector},'%')
+        </if>
+        <if test="request.signUserId != null and request.signUserId !=''">
+            AND ss.sign_user_id = #{request.signUserId}
+        </if>
+        <if test="request.createStartTime != null and request.createStartTime !=''">
+            AND DATE_FORMAT(ss.create_time,'%Y-%m-%d') &gt;= DATE_FORMAT(#{request.createStartTime},'%Y-%m-%d')
+        </if>
+        <if test="request.createEndTime != null and request.createEndTime !=''">
+            AND DATE_FORMAT(ss.create_time,'%Y-%m-%d')  &lt;= DATE_FORMAT(#{request.createEndTime},'%Y-%m-%d')
+        </if>
+        ORDER BY ss.create_time DESC
+    </select>
+
+    <select id="selectSignList" resultMap="BaseResultMap">
+        SELECT ss.*, sd.SIMPLE_NAME AS deptName
+        FROM system_sign ss
+        LEFT JOIN sys_user su ON su.id = ss.sign_user_id
+        LEFT JOIN sys_dept sd ON sd.id = su.dept_id
+        WHERE 1=1
+        <if test="request.signNo != null and request.signNo !=''">
+            AND ss.sign_no LIKE concat('%',#{request.signNo},'%')
+        </if>
+        <if test="request.signName != null and request.signName !=''">
+            AND ss.sign_name LIKE concat('%',#{request.signName},'%')
+        </if>
+        <if test="request.signDirector != null and request.signDirector !=''">
+            AND ss.sign_director LIKE concat('%',#{request.signDirector},'%')
+        </if>
+        <if test="request.signUserId != null and request.signUserId !=''">
+            AND ss.sign_user_id = #{request.signUserId}
+        </if>
+        <if test="request.createStartTime != null and request.createStartTime !=''">
+            AND DATE_FORMAT(ss.create_time,'%Y-%m-%d') &gt;= DATE_FORMAT(#{request.createStartTime},'%Y-%m-%d')
+        </if>
+        <if test="request.createEndTime != null and request.createEndTime !=''">
+            AND DATE_FORMAT(ss.create_time,'%Y-%m-%d')  &lt;= DATE_FORMAT(#{request.createEndTime},'%Y-%m-%d')
+        </if>
+        ORDER BY ss.create_time DESC
+    </select>
 </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 515050a..60f530b 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
@@ -47,8 +47,8 @@
     String STORAGE_LOCATION = "bizStorageLocation";
     //计量专业
     String MEASURE_MAJOR = "bizMeasureMajor";
-    //管理状态
-    String MANAGER_STATE = "bizManagerState";
+    //标准装置管理状态
+    String STANDARD_MANAGER_STATE = "bizStandardManagerState";
 
     /**
      * 资源管理 字典code
@@ -95,8 +95,6 @@
     String MEASURE_STATUS = "measureStatus";
     //检定方式
     String MEASURE_TYPE = "measureType";
-    //标识打印标志类型
-    String IDENTIFY_PRINT_TYPE = "bizBusinessIdentify";
     //变更类型
     String REPORT_CHANGE_TYPE = "bizCertChangeType";
     //规模类型
@@ -111,19 +109,24 @@
     String MEASURE_CATEGORY = "measureCategory";
     //检定结果
     String MEASURE_RESULT = "measureResult";
+    //分包原因
+    String OUTSOURCE_REASON = "outsourceReason";
+
+    /**
+     * 系统管理
+     */
+    String TEMPLATE_TYPE = "templateType";
+
 
     /**
      * 标准装置 字典code
      */
     //类别
     String STANDARD_CATEGORY = "standardCategory";
-    //管理状态
-    String STANDARD_MANAGER_STATE = "standardManagerState";
     //标准等级
     String STANDARD_LEVEL = "standardLevel";
     //传递范围
     String STANDARD_TRANSMIT_RANGE = "transmitRange";
-
     //资本来源
     String CAPITAL_SOURCE = "capitalSource";
     //标准装置-申请类型
@@ -148,8 +151,6 @@
     String CERTIFICATE_CLASS = "certificationClass";
     //证书管理-检校专业
     String CALIBRATION_MAJOR = "calibrationMajor";
-    //分包原因
-    String OUTSOURCE_REASON = "outsourceReason";
 
     /**
      * 工作台
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/BaseApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/BaseApprovalListRequest.java
index 73c12c1..80d7424 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/BaseApprovalListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/BaseApprovalListRequest.java
@@ -6,6 +6,7 @@
 
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotEmpty;
+import java.util.List;
 
 /**
  * @Description:
@@ -19,14 +20,14 @@
      * 表单id
      */
     @NotBlank(message = "表单id不能为空")
-    @ApiModelProperty(value = "表单id（流程定义对应的表单id，等价于业务id）", dataType = "String")
+    @ApiModelProperty(value = "表单id（流程定义对应的表单id，等价于业务id），导出接口不用传", dataType = "String")
     private String formId;
 
     /**
      * 审批状态类型，对应ApprovalStatusEnum
      */
     @NotEmpty(message = "审批状态类型不能为空")
-    @ApiModelProperty(value = "审批状态类型code", dataType = "String")
+    @ApiModelProperty(value = "审批状态类型code，导出接口不用传", dataType = "String")
     private String approvalStatus;
 
     @ApiModelProperty(hidden = true)
@@ -34,4 +35,7 @@
 
     @ApiModelProperty(hidden = true)
     private Long createUserId;
+
+    @ApiModelProperty(value = "导出ids", dataType = "List")
+    private List<Long> ids;
 }

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java
index bb0c50f..13a699b 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java
@@ -12,6 +12,7 @@
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.IGeneralApprovalService;
+import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
@@ -19,6 +20,7 @@
 import org.springframework.web.bind.annotation.RequestBody;
 
 import javax.validation.Valid;
+import java.util.List;
 import java.util.Objects;
 
 /**
@@ -117,4 +119,17 @@
         }
         return baseApprovalService.failUpdate(request);
     }
+
+    public List<O> exportList(@RequestBody @Valid R request) throws Exception {
+        List<O> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = baseApprovalService.listExportByIds(request.getIds());
+        } else {
+            list = baseApprovalService.listExport(request);
+        }
+        for (O record : list) {
+            DictCodeUtils.convertDictCodeToName(record);
+        }
+        return list;
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java
index 8a90961..d775831 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java
@@ -5,6 +5,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.business.certificate.CertificateChangeApplyApprovalListRequest;
 import com.casic.missiles.dto.business.certificate.CertificateChangeApplySaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessCertificateChangeApply;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
@@ -20,6 +21,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -48,4 +50,12 @@
         }
         return changeApplyService.saveChangeApply(request);
     }
+
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody CertificateChangeApplyApprovalListRequest request) throws Exception {
+        List<BizBusinessCertificateChangeApply> list = super.exportList(request);
+        super.exportExcel(BizBusinessCertificateChangeApply.class, list, ExportEnum.CERTIFICATE_CHANGE_APPLY.getSheetName());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java
index 5fc4b07..af8230e 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java
@@ -9,6 +9,7 @@
 import com.casic.missiles.dto.business.certificate.CertificatePrintApprovalListRequest;
 import com.casic.missiles.dto.business.certificate.CertificatePrintListResponse;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.enums.business.CertificatePrintStatusEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessCertificatePrintLog;
@@ -18,10 +19,16 @@
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.io.IOException;
+import java.util.List;
 import java.util.Objects;
 
 /**
@@ -98,4 +105,16 @@
         });
         return certificatePrintService.certificatePrintLog(idDTO.getId());
     }
+
+    @ApiOperation("证书打印审批导出")
+    @PostMapping("/listExport")
+    public void exportList(@RequestBody CertificatePrintApprovalListRequest request) throws IOException {
+        List<CertificatePrintListResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = certificatePrintService.listByIds(request.getIds());
+        } else {
+            list = certificatePrintService.list(request);
+        }
+        super.exportExcel(CertificatePrintListResponse.class, list, ExportEnum.CERTIFICATE_PRINT.getSheetName());
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java
index 63b06dc..6b2efd5 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java
@@ -6,6 +6,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.business.certificate.CertificateReportApprovalListRequest;
 import com.casic.missiles.dto.business.certificate.CertificateReportSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessCertificateReport;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
@@ -21,6 +22,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -50,7 +52,7 @@
         return certificateReportService.saveCertificateReport(request);
     }
 
-    @ApiOperation("证书审批详情（基本信息）")
+    @ApiOperation("详情（基本信息）")
     @PostMapping("/detail")
     public ReturnDTO<BizBusinessCertificateReport> detail(@RequestBody @Valid BaseDetailRequest request, BindingResult bindingResult) throws Exception {
         if(bindingResult.hasErrors()){
@@ -59,4 +61,11 @@
         return certificateReportService.detail(request);
     }
 
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody CertificateReportApprovalListRequest request) throws Exception {
+        List<BizBusinessCertificateReport> list = super.exportList(request);
+        super.exportExcel(BizBusinessCertificateReport.class, list, ExportEnum.CERTIFICATE_REPORT.getSheetName());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java
index 46b26bd..57c0809 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java
@@ -10,20 +10,21 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.business.identify.IdentifyListRequest;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessIdentifyInfo;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.business.IBizBusinessIdentifyInfoService;
+import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import javax.validation.Valid;
+import java.util.List;
 import java.util.Objects;
 
 /**
@@ -57,16 +58,13 @@
         return identifyInfoService.addIdentify(identifyInfo);
     }
 
-    @ApiOperation("标识打印更新")
+    @ApiOperation("标识打印更新（更新打印时间）")
     @PostMapping("/update")
-    public ReturnDTO updateIdentify(@RequestBody @Valid BizBusinessIdentifyInfo identifyInfo, BindingResult bindingResult) {
-        Assert.isFalse(Objects.isNull(identifyInfo.getId()), () -> {
+    public ReturnDTO updateIdentify(@RequestBody @Valid IdDTO idDTO) {
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        Assert.isFalse(bindingResult.hasErrors(), () -> {
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        });
-        return identifyInfoService.updateIdentify(identifyInfo);
+        return identifyInfoService.updateIdentify(idDTO.getId());
     }
 
     @ApiOperation("标识打印删除")
@@ -77,4 +75,37 @@
         });
         return identifyInfoService.deleteIdentify(idDTO.getId());
     }
+
+    @ApiOperation("标识打印导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody @Valid IdentifyListRequest request, BindingResult bindingResult) throws Exception {
+        if (bindingResult.hasErrors()) {
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        List<BizBusinessIdentifyInfo> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = identifyInfoService.listByIds(request.getIds());
+        } else {
+            list = identifyInfoService.list(request);
+        }
+        for (BizBusinessIdentifyInfo record : list) {
+            DictCodeUtils.convertDictCodeToName(record);
+        }
+        super.exportExcel(BizBusinessIdentifyInfo.class, list, ExportEnum.IDENTIFY_EXPORT.getSheetName());
+    }
+
+
+    // TODO: 2023/8/23 查询设备信息，4个底部按钮查设备（按钮的作用就是前端用来调不同接口、用来区分中间即将展示的标识），前端弹窗选设备，在确定保存时前端根据底部按钮判断传入设备类型deviceType字典code
+    // TODO: 2023/8/23 接口：查受检设备（第1个按钮），查设备台账（后3个按钮同一接口），查询之后前端根据标志类型的不同加到中间页面时进行判断（按产品给的对应表）
+    // TODO: 2023/8/23 提供二维码接口，前端在加到中间页面时调用一下
+
+    @ApiOperation("设备二维码")
+    @PostMapping("/equipment/qrCode")
+    public ReturnDTO<String> equipmentQrCode(@RequestBody @Valid IdDTO idDTO) {
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return identifyInfoService.equipmentQrCode(idDTO.getId());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java
index 707be6e..7e0453d 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java
@@ -117,7 +117,7 @@
     }
 
     @ApiOperation("任务单导出")
-    @PostMapping("/export")
+    @PostMapping("/listExport")
     public void orderExport(@RequestBody @Valid OrderListRequest request, HttpServletResponse response) {
         businessOrderService.orderExport(request, response);
     }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java
index 529a6ce..51432be 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java
@@ -1,9 +1,28 @@
 package com.casic.missiles.controller.business;
 
+import com.casic.missiles.controller.GeneralApprovalController;
+import com.casic.missiles.dto.BaseApprovalSubmitRequest;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.business.outsource.OutsourceAssessApprovalListRequest;
+import com.casic.missiles.dto.business.outsource.OutsourceAssessSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
+import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.model.business.BizBusinessOutsourceAssess;
+import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
+import com.casic.missiles.service.IGeneralApprovalService;
+import com.casic.missiles.service.business.IBizBusinessOutsourceAssessService;
 import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.BindingResult;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.validation.Valid;
+import java.util.List;
+
 /**
  * <p>
  * 计量检定业务-分包管理-测试、校准或检定工作分包评审表 前端控制器
@@ -15,6 +34,27 @@
 @Api(tags = "分包管理-测试、校准或检定工作分包评审表")
 @RestController
 @RequestMapping("/business/outsource/assess")
-public class BizBusinessOutsourceAssessController {
+public class BizBusinessOutsourceAssessController extends GeneralApprovalController<BizBusinessOutsourceAssess, BizBusinessOutsourceAssess, OutsourceAssessApprovalListRequest, BaseApprovalSubmitRequest> {
+    @Autowired
+    private IBizBusinessOutsourceAssessService outsourceAssessService;
 
+    public BizBusinessOutsourceAssessController(IGeneralApprovalService<BizBusinessOutsourceAssess, BizBusinessOutsourceAssess, OutsourceAssessApprovalListRequest, BaseApprovalSubmitRequest> baseApprovalService) {
+        super(baseApprovalService);
+    }
+
+    @ApiOperation("草稿箱-保存")
+    @PostMapping("/save")
+    public ReturnDTO<OutsourceAssessSaveResponse> saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceAssess request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        return outsourceAssessService.saveOutsourceAssess(request);
+    }
+
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception {
+        List<BizBusinessOutsourceAssess> list = super.exportList(request);
+        super.exportExcel(BizBusinessOutsourceAssess.class, list, ExportEnum.OUTSOURCE_ASSESS.getSheetName());
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java
new file mode 100644
index 0000000..9adef18
--- /dev/null
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java
@@ -0,0 +1,60 @@
+package com.casic.missiles.controller.business;
+
+import com.casic.missiles.controller.GeneralApprovalController;
+import com.casic.missiles.dto.BaseApprovalSubmitRequest;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.business.outsource.OutsourceProtocolApprovalListRequest;
+import com.casic.missiles.dto.business.outsource.OutsourceProtocolSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
+import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.model.business.BizBusinessOutsourceProtocol;
+import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
+import com.casic.missiles.service.IGeneralApprovalService;
+import com.casic.missiles.service.business.IBizBusinessOutsourceProtocolService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.BindingResult;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.validation.Valid;
+import java.util.List;
+
+/**
+ * <p>
+ * 计量检定业务-分包管理-测试、校准或检定工作分包协议书 前端控制器
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-08-24
+ */
+@Api(tags = "分包管理-测试、校准或检定工作分包协议书")
+@RestController
+@RequestMapping("/business/outsource/protocol")
+public class BizBusinessOutsourceProtocolController extends GeneralApprovalController<BizBusinessOutsourceProtocol, BizBusinessOutsourceProtocol, OutsourceProtocolApprovalListRequest, BaseApprovalSubmitRequest> {
+    @Autowired
+    private IBizBusinessOutsourceProtocolService outsourceProtocolService;
+
+    public BizBusinessOutsourceProtocolController(IGeneralApprovalService<BizBusinessOutsourceProtocol, BizBusinessOutsourceProtocol, OutsourceProtocolApprovalListRequest, BaseApprovalSubmitRequest> baseApprovalService) {
+        super(baseApprovalService);
+    }
+
+    @ApiOperation("草稿箱-保存")
+    @PostMapping("/save")
+    public ReturnDTO<OutsourceProtocolSaveResponse> saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceProtocol request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        return outsourceProtocolService.saveOutsourceProtocol(request);
+    }
+
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody OutsourceProtocolApprovalListRequest request) throws Exception {
+        List<BizBusinessOutsourceProtocol> list = super.exportList(request);
+        super.exportExcel(BizBusinessOutsourceProtocol.class, list, ExportEnum.OUTSOURCE_PROTOCOL.getSheetName());
+    }
+}
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java
index 097f645..f0f0943 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java
@@ -17,7 +17,6 @@
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.IGeneralApprovalService;
 import com.casic.missiles.service.business.IBizBusinessOutsourcerInfoService;
-import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -71,19 +70,8 @@
 
     @ApiOperation("分包方导出")
     @PostMapping("/listExport")
-    public void export(@RequestBody @Valid OutsourcerInfoApprovalListRequest request, BindingResult bindingResult) throws Exception {
-        if (bindingResult.hasErrors()) {
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        }
-        List<BizBusinessOutsourcerInfo> list;
-        if (!CollectionUtils.isEmpty(request.getIds())) {
-            list = outsourcerInfoService.listByIds(request.getIds());
-        } else {
-            list = outsourcerInfoService.list(request);
-        }
-        for (BizBusinessOutsourcerInfo record : list) {
-            DictCodeUtils.convertDictCodeToName(record);
-        }
+    public void export(@RequestBody OutsourcerInfoApprovalListRequest request) throws Exception {
+        List<BizBusinessOutsourcerInfo> list = super.exportList(request);
         super.exportExcel(BizBusinessOutsourcerInfo.class, list, ExportEnum.OUTSOURCER_EXPORT.getSheetName());
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java
index c2cbf9f..0410918 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java
@@ -17,11 +17,9 @@
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.IGeneralApprovalService;
 import com.casic.missiles.service.business.IBizBusinessSiteExecutiveInfoService;
-import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -60,7 +58,7 @@
         return siteExecutiveInfoService.saveSiteExecutiveInfo(siteExecutiveInfo);
     }
 
-    @ApiOperation("现场检测详情")
+    @ApiOperation("详情")
     @PostMapping("/detail")
     public ReturnDTO<SiteExecutiveDetailResponse> siteExecutiveDetail(@RequestBody @Valid IdDTO idDTO) throws Exception {
         Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
@@ -69,21 +67,10 @@
         return ReturnUtil.success(siteExecutiveInfoService.detail(idDTO.getId()));
     }
 
-    @ApiOperation("现场检测导出")
+    @ApiOperation("导出")
     @PostMapping("/listExport")
-    public void export(@RequestBody @Valid SiteExecutiveApprovalListRequest request, BindingResult bindingResult) throws Exception {
-        if (bindingResult.hasErrors()) {
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        }
-        List<SiteExecutiveApprovalListResponse> list;
-        if (!CollectionUtils.isEmpty(request.getIds())) {
-            list = siteExecutiveInfoService.listInfoByIds(request.getIds());
-        } else {
-            list = siteExecutiveInfoService.listInfo(request);
-        }
-        for (SiteExecutiveApprovalListResponse record : list) {
-            DictCodeUtils.convertDictCodeToName(record);
-        }
+    public void export(@RequestBody SiteExecutiveApprovalListRequest request) throws Exception {
+        List<SiteExecutiveApprovalListResponse> list = super.exportList(request);
         super.exportExcel(SiteExecutiveApprovalListResponse.class, list, ExportEnum.SITE_EXECUTIVE_EXPORT.getSheetName());
     }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
index 7e793cd..a92e209 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
@@ -55,7 +55,7 @@
 
     @ApiOperation("设备收发列表导出")
     @PostMapping("/export")
-    public void exportList(@RequestBody @Valid SampleDispatchListRequest request) throws IOException {
+    public void exportList(@RequestBody SampleDispatchListRequest request) throws IOException {
         List<SampleDispatchListResponse> list;
         if (!CollectionUtils.isEmpty(request.getIds())) {
             list = dispatchService.listByIds(request.getIds());
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java
index cdc77fc..d120fd4 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java
@@ -7,6 +7,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.business.labExecutive.*;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.business.IBusinessLabExecutiveInfoService;
@@ -14,6 +15,7 @@
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.*;
 
@@ -32,7 +34,7 @@
     @Autowired
     private IBusinessLabExecutiveInfoService labExecutiveInfoService;
 
-    @ApiOperation("实验室检测-部门检测-查询各状态列表（待检测、检测中、检测完）")
+    @ApiOperation("实验室任务-查询各状态列表（待检测、检测中、检测完）")
     @PostMapping("/deptExecutive/List")
     public ReturnDTO<PageInfoBT<SampleLabExecutiveListResponse>> queryDeptExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
@@ -43,10 +45,19 @@
         return ReturnUtil.success(super.packForBT(labExecutiveInfoService.deptLabExecutiveListPage(page, labExecutiveListRequest)));
     }
 
-    /**
-     * 实验室检测-我的检测-查询各状态列表（待检测、检测中、检测完）
-     */
-    @ApiOperation("实验室检测-我的检测-查询各状态列表（待检测、检测中、检测完）")
+    @ApiOperation("实验室任务导出")
+    @PostMapping("/deptExecutive/export")
+    public void deptExportList(@RequestBody @Valid SampleLabExecutiveListRequest request) throws Exception {
+        List<SampleLabExecutiveListResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = labExecutiveInfoService.deptLabExecutiveListByIds(request.getMeasureStatus(), request.getIds());
+        } else {
+            list = labExecutiveInfoService.deptLabExecutiveList(request);
+        }
+        super.exportExcel(SampleLabExecutiveListResponse.class, list, ExportEnum.DEPT_EXECUTIVE_TASK.getSheetName());
+    }
+
+    @ApiOperation("我的任务-查询各状态列表（待检测、检测中、检测完）")
     @PostMapping("/myExecutive/list")
     public ReturnDTO<PageInfoBT<SampleLabExecutiveListResponse>> queryMyExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
@@ -57,19 +68,25 @@
         return ReturnUtil.success(super.packForBT(labExecutiveInfoService.myLabExecutiveListPage(page, labExecutiveListRequest)));
     }
 
-    /**
-     * 实验室检测-我的检测-查询各状态样品数量（待检测、检测中、检测完）
-     */
-    @ApiOperation("实验室检测-我的检测-查询各状态样品数量（待检测、检测中、检测完）")
+    @ApiOperation("我的任务导出")
+    @PostMapping("/myExecutive/export")
+    public void exportList(@RequestBody @Valid SampleLabExecutiveListRequest request) throws Exception {
+        List<SampleLabExecutiveListResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = labExecutiveInfoService.myLabExecutiveListByIds(request.getMeasureStatus(), request.getIds());
+        } else {
+            list = labExecutiveInfoService.myLabExecutiveList(request);
+        }
+        super.exportExcel(SampleLabExecutiveListResponse.class, list, ExportEnum.MY_EXECUTIVE_TASK.getSheetName());
+    }
+
+    @ApiOperation("我的任务-查询各状态样品数量（待检测、检测中、检测完）")
     @GetMapping("/myExecutive/amount")
     public ReturnDTO<List<SampleAmountResponse>> queryMyExecutiveAmount() {
         return ReturnUtil.success(labExecutiveInfoService.myExecutiveAmount());
     }
 
-    /**
-     * 实验室检测-部门检测-分配（分配给具体人员）
-     */
-    @ApiOperation("实验室检测-部门检测-分配按钮（分配给具体人员）")
+    @ApiOperation("实验室任务-分配按钮（分配给具体人员）")
     @PostMapping("/deptExecutive/allocate")
     public ReturnDTO allocateStaff(@RequestBody @Valid SampleAllocateRequest sampleAllocateRequest, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -78,10 +95,7 @@
         return labExecutiveInfoService.allocateStaff(sampleAllocateRequest);
     }
 
-    /**
-     * 实验室检测-我的检测-检定人扫描收入（待检测->检测中）
-     */
-    @ApiOperation("实验室检测-我的检测-检定人扫描收入（待检测->检测中）")
+    @ApiOperation("我的任务-检定人扫描收入（待检测->检测中）")
     @PostMapping("/myExecutive/receive")
     public ReturnDTO sampleReceive(@RequestBody @Valid List<SampleOperateRequest> requestList, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -90,10 +104,7 @@
         return labExecutiveInfoService.sampleReceive(requestList);
     }
 
-    /**
-     * 实验室检测-负责人/检定人扫描检完（检测中->检测完）
-     */
-    @ApiOperation("实验室检测-负责人/检定人扫描检完（检测中->检测完）")
+    @ApiOperation("实验室任务-负责人/检定人扫描检完（检测中->检测完）")
     @PostMapping("/myExecutive/complete")
     public ReturnDTO sampleExecutiveComplete(@RequestBody @Valid List<SampleOperateRequest> requestList, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -102,10 +113,7 @@
         return labExecutiveInfoService.sampleExecutiveComplete(requestList);
     }
 
-    /**
-     * 实验室检测-部门检测/我的检测 编辑（只能修改应出具证书）
-     */
-    @ApiOperation("实验室检测-部门检测/我的检测 编辑（只能修改应出具证书）")
+    @ApiOperation("实验室任务/我的任务 编辑（只能修改应出具证书）")
     @PostMapping("/executive/update")
     public ReturnDTO updateExecutive(@RequestBody @Valid UpdateExecutiveRequest request, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -114,10 +122,7 @@
         return labExecutiveInfoService.updateExecutive(request);
     }
 
-    /**
-     * 实验室检测-部门检测/我的检测 详情
-     */
-    @ApiOperation("实验室检测-部门检测/我的检测 详情")
+    @ApiOperation("实验室任务/我的任务 详情")
     @PostMapping("/executive/detail")
     public ReturnDTO<ExecutiveDetailResponse> executiveDetail(@RequestBody @Valid ExecutiveDetailRequest request, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
@@ -131,7 +136,7 @@
      * 退回后会将下一个要执行的实验室检测状态更新为待分配，将后面的实验室顺序变更为连续（都进行减1）
      * 最后一个检测的实验室退回，等分发员再增加实验室或设备收发中的已收入直接手动点击完成
      */
-    @ApiOperation("实验室检测-部门检测/我的检测 退回（待检测/检测中->退回）")
+    @ApiOperation("实验室任务/我的任务 退回（待检测/检测中->退回）")
     @PostMapping("/executive/sendBack")
     public ReturnDTO executiveSendBack(@RequestBody @Valid ExecutiveSendBackRequest request, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -140,9 +145,6 @@
         return labExecutiveInfoService.sampleExecutiveSendBack(request);
     }
 
-    /**
-     * 分发员编辑实验室检测列表
-     */
     @ApiOperation("分发员编辑实验室检测列表")
     @PostMapping("/handOut/updateList")
     public ReturnDTO updateExecutiveList(@RequestBody @Valid UpdateExecutiveListRequest request, BindingResult bindingResult) {
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java
index 48a67ed..0c04f31 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java
@@ -10,6 +10,7 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.resource.customer.CustomerApprovalListRequest;
 import com.casic.missiles.dto.resource.customer.CustomerSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceCustomerInfo;
@@ -26,6 +27,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -55,6 +57,13 @@
         return customerInfoService.saveCustomerInfo(request);
     }
 
+    @ApiOperation("委托方名录导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody CustomerApprovalListRequest request) throws Exception {
+        List<BizResourceCustomerInfo> list = super.exportList(request);
+        super.exportExcel(BizResourceCustomerInfo.class, list, ExportEnum.CUSTOMER_INFO.getSheetName());
+    }
+
     @ApiOperation("委托方人员列表（分页）")
     @PostMapping("/person/listPage")
     public ReturnDTO<PageInfoBT<BizResourceCustomerStaff>> personListPage(@RequestBody IdDTO idDto) {
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
index 972ed4b..6418ea5 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
@@ -5,6 +5,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.resource.customer.SuggestFormApprovalListRequest;
 import com.casic.missiles.dto.resource.customer.SuggestFormSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceCustomerSuggestForm;
@@ -20,6 +21,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -50,4 +52,11 @@
         return suggestFormService.saveSuggestForm(request);
     }
 
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody SuggestFormApprovalListRequest request) throws Exception {
+        List<BizResourceCustomerSuggestForm> list = super.exportList(request);
+        super.exportExcel(BizResourceCustomerSuggestForm.class, list, ExportEnum.CUSTOMER_SUGGEST_FORM.getSheetName());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java
index 1934d1a..9e07eab 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java
@@ -15,12 +15,16 @@
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.resource.IEnvEnvironmentRecordConfigService;
 import com.casic.missiles.service.resource.IEnvEnvironmentRecordDataService;
+import com.casic.missiles.service.resource.IEnvLocationInfoService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
 import java.util.List;
@@ -39,6 +43,8 @@
     private IEnvEnvironmentRecordDataService environmentRecordDataService;
     @Autowired
     private IEnvEnvironmentRecordConfigService environmentRecordConfigService;
+    @Autowired
+    private IEnvLocationInfoService locationInfoService;
 
     @ApiOperation("环境记录单数据列表/详情")
     @PostMapping("/data/listPage")
@@ -95,4 +101,11 @@
         });
         return environmentRecordConfigService.deleteEnvironmentRecordConfig(idDTO.getId());
     }
+
+    @ApiOperation("地点列表")
+    @PostMapping("/location/listPage")
+    public ReturnDTO<PageInfoBT<LocationListResponse>> locationListPage(@RequestBody @Valid LocationListRequest request) {
+        Page<LocationListResponse> page = PageFactory.defaultPage();
+        return ReturnUtil.success(super.packForBT(locationInfoService.listPage(page, request)));
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java
index 82efe3f..e9561fa 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java
@@ -10,6 +10,7 @@
 import com.casic.missiles.dto.resource.seal.SealLogListRequest;
 import com.casic.missiles.dto.resource.seal.SealNoteApprovalListRequest;
 import com.casic.missiles.dto.resource.seal.SealNoteSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceSealUseLog;
@@ -27,6 +28,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -58,6 +60,13 @@
         return sealUseNoteService.saveSeal(request);
     }
 
+    @ApiOperation("印章使用登记导出（列表和导出中去掉经办人和监印人）")
+    @PostMapping("/listExport")
+    public void export(@RequestBody SealNoteApprovalListRequest request) throws Exception {
+        List<BizResourceSealUseNote> list = super.exportList(request);
+        super.exportExcel(BizResourceSealUseNote.class, list, ExportEnum.SEAL_NOTE.getSheetName());
+    }
+
     // TODO: 2023/7/28 印章使用日志：系统中使用印章时插入数据库
 
     @ApiOperation("印章使用日志列表（分页）")
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java
index 9b674fc..06b6521 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java
@@ -9,16 +9,20 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.resource.staff.StaffCertRequest;
 import com.casic.missiles.dto.resource.staff.StaffCertResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.service.resource.IBizResourceStaffInfoService;
 import com.casic.missiles.service.resource.IBizResourceStaffVerifierService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.List;
+
 /**
  * @Description:
  * @Author: wangpeng
@@ -41,9 +45,21 @@
         return ReturnUtil.success(super.packForBT(responsePage));
     }
 
+    @ApiOperation("证书逾期提醒导出")
+    @PostMapping("/listExport")
+    public void exportList(@RequestBody StaffCertRequest request) throws Exception {
+        List<StaffCertResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = staffInfoService.certListByIds(request.getIds());
+        } else {
+            list = staffInfoService.certList(request);
+        }
+        super.exportExcel(StaffCertResponse.class, list, ExportEnum.STAFF_CERTIFICATE_EXPIRE.getSheetName());
+    }
+
     @ApiOperation("证书逾期提醒")
     @PostMapping("/expirationReminder")
-    public ReturnDTO expirationReminder(@RequestBody IdDTO idDto) {
-        return verifierService.expirationReminder(idDto);
+    public ReturnDTO expirationReminder(@RequestBody IdDTO idDTO) {
+        return verifierService.expirationReminder(idDTO);
     }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java
index 3b251ad..a6e7850 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java
@@ -12,6 +12,7 @@
 import com.casic.missiles.dto.resource.staff.StaffListRequest;
 import com.casic.missiles.dto.resource.staff.TrainListRequest;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.*;
@@ -22,7 +23,10 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
 import java.util.List;
@@ -52,8 +56,19 @@
             throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
         }
         Page<BizResourceStaffInfo> page = PageFactory.defaultPage();
-        Page<BizResourceStaffInfo> responsePage = staffInfoService.listPage(page, request);
-        return ReturnUtil.success(super.packForBT(responsePage));
+        return ReturnUtil.success(super.packForBT(staffInfoService.listPage(page, request)));
+    }
+
+    @ApiOperation("人员登记导出")
+    @PostMapping("/listExport")
+    public void exportList(@RequestBody StaffListRequest request) throws Exception {
+        List<BizResourceStaffInfo> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = staffInfoService.listByIds(request.getIds());
+        } else {
+            list = staffInfoService.list(request);
+        }
+        super.exportExcel(BizResourceStaffInfo.class, list, ExportEnum.STAFF_INFO.getSheetName());
     }
 
     @ApiOperation("人员登记详情基础信息")
@@ -85,9 +100,9 @@
 
     @ApiOperation("科研教育列表（分页）")
     @PostMapping("/education/listPage")
-    public ReturnDTO<PageInfoBT<BizResourceStaffEducation>> educationListPage(@RequestBody IdDTO idDto) {
+    public ReturnDTO<PageInfoBT<BizResourceStaffEducation>> educationListPage(@RequestBody IdDTO idDTO) {
         Page<BizResourceStaffEducation> page = PageFactory.defaultPage();
-        Page<BizResourceStaffEducation> responsePage = staffInfoService.educationListPage(page, idDto);
+        Page<BizResourceStaffEducation> responsePage = staffInfoService.educationListPage(page, idDTO);
         return ReturnUtil.success(super.packForBT(responsePage));
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java
index af6aa86..d85d84a 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java
@@ -9,6 +9,7 @@
 import com.casic.missiles.dto.resource.outsideService.SupplierApprovalListRequest;
 import com.casic.missiles.dto.resource.outsideService.SupplierSaveResponse;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceSupplierAbility;
@@ -67,6 +68,13 @@
         return ReturnUtil.success(supplierInfoService.detail(idDTO.getId()));
     }
 
+    @ApiOperation("合格供方导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody SupplierApprovalListRequest request) throws Exception {
+        List<BizResourceSupplierInfo> list = super.exportList(request);
+        super.exportExcel(BizResourceSupplierInfo.class, list, ExportEnum.SUPPLIER_INFO.getSheetName());
+    }
+
     @ApiOperation("供方人员列表（分页）")
     @PostMapping("/person/listPage")
     public ReturnDTO<PageInfoBT<BizResourceSupplierPerson>> personListPage(@RequestBody IdDTO idDTO) {
diff --git a/casic-metering-api/src/main/resources/config/application.yml b/casic-metering-api/src/main/resources/config/application.yml
index 350db5f..ecff521 100644
--- a/casic-metering-api/src/main/resources/config/application.yml
+++ b/casic-metering-api/src/main/resources/config/application.yml
@@ -126,7 +126,7 @@
     #作者
     author: wangpeng
     #待生成对象表名
-    table-name: biz_equipment_technical_target_approval,biz_equipment_attachment_approval,biz_equipment_checkpoint_approval
+    table-name: biz_business_outsource_protocol
 
 reminder:
   #节点--common模块config包 ReminderNodeConfig配置
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
index 4a19e4e..d47d552 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
@@ -53,6 +53,7 @@
     SUGGEST_FORM_SAVE_FAILED(2509, "委托方意见登记表保存至草稿箱失败"),
     EXAMINE_FORM_SAVE_FAILED(2510, "要求、委托书及合同评审表保存至草稿箱失败"),
     CUSTOMER_EXIST_SAVE_FAILED(2511, "该委托方已存在，请重新选择"),
+    DUPLICATE_LOCATION_NO(2512, "地点编号已存在"),
 
     /**
      * 计量检定业务模块
@@ -68,6 +69,8 @@
     COMPLETE_SAMPLE_NOT_EXIST(2609, "检测中不存在扫描收入的样品"),
     CANNOT_CHANGE_MEASURE_INFO(2610, "无法更改非当前登录用户的检测信息"),
     NON_EXIST_ORDER_OR_SAMPLE(2611, "不存在该委托单或该委托单下的样品"),
+    OUTSOURCE_ACCESS_SAVE_FAILED(2612, "测试、校准或检定工作分包评审表保存至草稿箱失败"),
+    OUTSOURCE_PROTOCOL_SAVE_FAILED(2613, "测试、校准或检定工作分包协议书保存至草稿箱失败"),
 
     /**
      * 历史遗留备用
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
index 5089ad1..81a406b 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
@@ -10,54 +10,38 @@
     /**
      * 资源管理
      */
-    ENVIRONMENT_DATA_EXPORT("environmentData", "environmentData", "环境记录单数据"),
+    ENVIRONMENT_DATA_EXPORT("environmentData", "环境记录单数据", "环境记录单数据"),
+    STAFF_INFO("staffInfo", "人员登记", "人员登记"),
+    STAFF_CERTIFICATE_EXPIRE("certificateExpire", "证书逾期提醒", "证书逾期提醒"),
+    SUPPLIER_INFO("supplierInfo", "合格供方名录", "合格供方名录"),
+    CUSTOMER_INFO("customerInfo", "委托方名录", "委托方名录"),
+    CUSTOMER_SUGGEST_FORM("customerSuggestForm", "委托方意见登记表", "委托方意见登记表"),
+    SEAL_NOTE("sealNote", "印章使用登记", "印章使用登记"),
 
-    FILE_EXPORT("meterFileData", "meterFileData", "计量文件信息"),
-    TRAIN_PLAN_EXPORT("trainPlanData", "trainPlanData", "培训计划"),
-    TRAIN_LOG_EXPORT("trainLogData", "trainLogData", "培训记录"),
-    METER_ORGANIZE_EXPORT("meterOrganizeData", "meterOrganizeData", "计量组织"),
-    TRACE_SUPPLIER_EXPORT("traceSupplierData", "traceSupplierData", "溯源供方"),
-    SIGN_EXPORT("signData", "signData", "签名/签章"),
-    TEMPLATE_EXPORT("templateData", "templateData", "原始记录模板/证书报告模板"),
-    FIXED_ASSETS("meterFixedAssets", "meterFixedAssets", "固定资产"),
-    METER_EQUIPMENT("meterEquipment", "meterEquipment", "测量设备"),
-    CALIBRATION_TEST_EQUIPMENT("calibrationTestEquipment", "calibrationTestEquipment", "校准检定设备"),
-    MEASURE_ACCOUNT("measureAccount", "measureAccount", "测量工装"),
-    STANDARD_SUPPORT_EQUIPMENT("standardSupportEquipment", "standardSupportEquipment", "标准配套设备"),
-    STANDARD_EQUIPMENT("standardEquipment", "standardEquipment", "标准装置"),
-    FLOW_DEF_EXPORT("flowDefData", "flowDefData", "流程定义"),
-    STAFF_CERTIFICATE("certificate", "certificate", "计量人员证书"),
-    CHECK_INFO("checkInfo", "checkInfo", "设备管理点检测"),
-    EQUIPMENT_APPLY("equipmentApply", "equipmentApply", "设备借用"),
-    STANDARD_EQUIPMENT_REMIND("equipmentApplyRemind", "equipmentApplyRemind", "标准装置到期提醒"),
-    METER_PRICE("meterPrice", "meterPrice", "价格库"),
-    METER_STAFF("meterStaff", "meterStaff", "计量人员"),
-    STANDARD_EQUIPMENT_APPLY("standardEquipmentApply", "standardEquipmentApply", "标准装置申请"),
-    STATE_MANAGE_APPLY("stateManage", "stateManage", "状态管理"),
-    METER_ACCEPTANCE_CHECK("acceptanceCheck", "acceptanceCheck", "设备检修保养验收单"),
-    CUSTOMER_EXPORT("customerData", "customerData", "客户信息"),
-    ORDER_EXPORT("orderData", "orderData", "委托书信息"),
-    SAMPLE_EXPORT("sampleData", "sampleData", "样本信息"),
-    EXCHANGE_DATA("exchangeData", "exchangeData", "设备交接单"),
-    DISPATCH_DATA("dispatchData", "dispatchData", "设备收发"),
-    ENVIRONMENT_DATA("environmentData", "environmentData", "环境记录单"),
-    ORIGIN_DATA("originData", "originData", "原始记录"),
-    CERTIFICATE_REPORT("certificateReport", "certificateReport", "证书报告"),
-    ADVICE_EXPORT("adviceData", "adviceData", "客户反馈"),
-    HANDOUT_EXPORT("handoutData", "handoutData", "任务分发列表"),
-    OUTSOURCER_EXPORT("outsourcerData", "outsourcerData", "分包方"),
-    SITE_EXECUTIVE_EXPORT("siteExecutiveData", "siteExecutiveData", "现场测试、校准或检定"),
-    CERTIFICATE_PRINT_EXPORT("certificatePrintData", "certificatePrintData", "证书打印"),
-    DOWNLOAD_TEMPLATE("downloadTemplate", "downloadTemplate", "页面配置"),
-    OUTSOURCER_CERTIFICATE_EXPORT("outsourceCertificateData", "outsourceCertificateData", "分包证书"),
-    SETTLEMENT_INFO_EXPORT("settlementInfoData", "settlementInfoData", "业务结算"),
-    EQUIPMENT_REMIND("equipmentRemind", "equipmentRemind", "设备到期提醒"),
-    AGREEMENT_INFO_EXPORT("agreementInfoData", "agreementInfoData", "合同"),
-    WORK_STATISTICS_EXPORT("workStatisticsData", "workStatisticsData", "实时工作统计"),
-    DEPT_OUTPUT_EXPORT("deptOutputData", "deptOutputData", "部门产值分析"),
-    WORKLOAD_EXPORT("workloadData", "workloadData", "业务工作量分析"),
-    DEPT_COMPREHENSIVE_EXPORT("deptComprehensiveData", "deptComprehensiveData", "部门综合分析"),
-    ENVIRONMENTAL_RECORD("environmentalRecordData", "environmentalRecordData", "现场环境记录");
+    /**
+     * 计量检定业务
+     */
+    OUTSOURCER_EXPORT("outsourcerData", "分包方名录", "分包方名录"),
+    IDENTIFY_EXPORT("identifyData", "计量标识", "计量标识"),
+    ORDER_EXPORT("orderData", "任务单", "任务单"),
+    DISPATCH_DATA("dispatchData", "设备收发", "设备收发"),
+    HANDOUT_EXPORT("handoutData", "任务分发", "任务分发"),
+    SITE_EXECUTIVE_EXPORT("siteExecutiveData", "现场测试、校准或检定", "现场测试、校准或检定"),
+    CERTIFICATE_REPORT("certificateReport", "证书审批", "证书审批"),
+    CERTIFICATE_CHANGE_APPLY("certificateChangeApply", "证书报告补充或更换申请单", "证书报告补充或更换申请单"),
+    CERTIFICATE_PRINT("certificatePrintData", "证书打印审批", "证书打印审批"),
+    DEPT_EXECUTIVE_TASK("deptExecutiveTaskData", "实验室任务", "实验室任务"),
+    MY_EXECUTIVE_TASK("myExecutiveTaskData", "我的任务", "我的任务"),
+    OUTSOURCE_ASSESS("outsourceAssess", "测试、校准或检定工作分包评审表", "测试、校准或检定工作分包评审表"),
+    OUTSOURCE_PROTOCOL("outsourceProtocol", "测试、校准或检定工作分包协议书", "测试、校准或检定工作分包协议书"),
+
+    /**
+     * 系统管理
+     */
+    SIGN_EXPORT("signData", "签名", "签名"),
+    TEMPLATE_EXPORT("templateData", "文件模板", "文件模板"),
+    FLOW_DEF_EXPORT("flowDefData", "流程定义", "流程定义"),
+    DOWNLOAD_TEMPLATE("downloadTemplate", "流程定义", "页面配置");
 
     ExportEnum(String fileName, String sheetName, String description) {
         this.fileName = fileName;
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateRecordTypeCodeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateRecordTypeCodeEnum.java
index 31d913c..a963522 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateRecordTypeCodeEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateRecordTypeCodeEnum.java
@@ -46,4 +46,14 @@
     String SITE_EXECUTIVE_APPROVAL = "01";
     //《现场测试、校准或检定工作记录表》
     String SITE_EXECUTIVE_LOG = "02";
+
+    //测试、校准或检定工作分包协议书
+    String OUTSOURCE_PROTOCOL = "01";
+    //测试、校准或检定工作分包评审表
+    String OUTSOURCE_ACCESS = "02";
+    //测试、校准或检定工作分包通知书
+    String OUTSOURCE_NOTICE = "03";
+    //测试、校准或检定工作分包方名录
+    String OUTSOURCE_INFO = "04";
+
 }
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
index 24b8635..f78bd53 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
@@ -15,6 +15,10 @@
     String CERTIFICATE_CHANGE_APPLY_BEAN_NAME = "certificateChangeApplyBean";
     //现场测试、校准或检定
     String SITE_EXECUTIVE_BEAN_NAME = "siteExecutiveBean";
+    //测试、校准或检定工作分包评审表
+    String OUTSOURCE_ASSESS_BEAN_NAME = "outsourceAssessBean";
+    //测试、校准或检定工作分包协议书
+    String OUTSOURCE_PROTOCOL_BEAN_NAME = "outsourceProtocolBean";
 
     /*********************************设备与装置************************************/
     //设备台账
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 b21c661..6b86fd1 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
@@ -18,6 +18,8 @@
     OUTSOURCER_APPROVAL(OUTSOURCER_BEAN_NAME, ""),
     CERTIFICATE_CHANGE_APPROVAL(CERTIFICATE_CHANGE_APPLY_BEAN_NAME, ""),
     SITE_EXECUTIVE_APPROVAL(SITE_EXECUTIVE_BEAN_NAME, ""),
+    OUTSOURCE_ASSESS_APPROVAL(OUTSOURCE_ASSESS_BEAN_NAME, ""),
+    OUTSOURCE_PROTOCOL_APPROVAL(OUTSOURCE_PROTOCOL_BEAN_NAME, ""),
 
     ACTION_STATUS_MAP(new HashMap<String, AwareActionStatusEnum>() {
         {
@@ -47,6 +49,10 @@
             put(ApplyFromIdEnum.CERTIFICATE_CHANGE_APPROVAL.getCode(), CERTIFICATE_CHANGE_APPROVAL);
             //现场测试、校准或检定审批
             put(ApplyFromIdEnum.SITE_EXECUTIVE_APPROVAL.getCode(), SITE_EXECUTIVE_APPROVAL);
+            //测试、校准或检定工作分包评审表
+            put(ApplyFromIdEnum.OUTSOURCE_ASSESS_APPROVAL.getCode(), OUTSOURCE_ASSESS_APPROVAL);
+            //测试、校准或检定工作分包协议书
+            put(ApplyFromIdEnum.OUTSOURCE_PROTOCOL_APPROVAL.getCode(), OUTSOURCE_PROTOCOL_APPROVAL);
         }
     });
     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 934405e..c7410bd 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
@@ -9,6 +9,8 @@
     CERTIFICATE_CHANGE_APPROVAL("jljdywzsbchghsqd", MessageSourceModuleEnum.BUSINESS.getCode(), "证书/报告补充或更换申请单"),
     OUTSOURCER_APPROVAL("jljdywcsjzhgfbfml", MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定合格分包方名录"),
     SITE_EXECUTIVE_APPROVAL("jljdywxccsjzsp", MessageSourceModuleEnum.BUSINESS.getCode(), "现场测试、校准或检定审批"),
+    OUTSOURCE_ASSESS_APPROVAL("jljdywcsjzfbpsb", MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包评审表"),
+    OUTSOURCE_PROTOCOL_APPROVAL("jljdywcsjzfbxys", MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包协议书"),
 
 
     /*******************************************设备与装置*********************************************/
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/GeneralApprovalMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/GeneralApprovalMapper.java
index 4fb7344..0c9d6ae 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/GeneralApprovalMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/GeneralApprovalMapper.java
@@ -17,8 +17,4 @@
 
     Page<O> selectBatchForApprovalList(Page<O> page, @Param("request") R request, @Param("businessKeys") List<String> businessKeys);
 
-//    Page<O> selectListPage(Page<O> page, @Param("request") R request);
-
-//    Long selectMaxNo();
-
 }
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceAssessMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceAssessMapper.java
index 7867bb8..ba59009 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceAssessMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceAssessMapper.java
@@ -1,7 +1,12 @@
 package com.casic.missiles.mapper.business;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.business.outsource.OutsourceAssessApprovalListRequest;
+import com.casic.missiles.mapper.GeneralApprovalMapper;
 import com.casic.missiles.model.business.BizBusinessOutsourceAssess;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * <p>
@@ -11,6 +16,10 @@
  * @author wangpeng
  * @since 2023-08-16
  */
-public interface BizBusinessOutsourceAssessMapper extends BaseMapper<BizBusinessOutsourceAssess> {
+public interface BizBusinessOutsourceAssessMapper extends GeneralApprovalMapper<BizBusinessOutsourceAssess, BizBusinessOutsourceAssess, OutsourceAssessApprovalListRequest> {
+
+    Page<BizBusinessOutsourceAssess> selectBatchForApprovalList(Page<BizBusinessOutsourceAssess> page, @Param("request") OutsourceAssessApprovalListRequest request, @Param("businessKeys") List<String> businessKeys);
+
+    Long selectMaxProjectNo();
 
 }
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceProtocolMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceProtocolMapper.java
new file mode 100644
index 0000000..e6aba35
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceProtocolMapper.java
@@ -0,0 +1,24 @@
+package com.casic.missiles.mapper.business;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.business.outsource.OutsourceProtocolApprovalListRequest;
+import com.casic.missiles.mapper.GeneralApprovalMapper;
+import com.casic.missiles.model.business.BizBusinessOutsourceProtocol;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 计量检定业务-分包管理-测试、校准或检定工作分包协议书 Mapper 接口
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-08-24
+ */
+public interface BizBusinessOutsourceProtocolMapper extends GeneralApprovalMapper<BizBusinessOutsourceProtocol, BizBusinessOutsourceProtocol, OutsourceProtocolApprovalListRequest> {
+
+    Page<BizBusinessOutsourceProtocol> selectBatchForApprovalList(Page<BizBusinessOutsourceProtocol> page, @Param("request") OutsourceProtocolApprovalListRequest request, @Param("businessKeys") List<String> businessKeys);
+
+    Long selectMaxProtocolNo();
+}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/EnvLocationInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/EnvLocationInfoMapper.java
new file mode 100644
index 0000000..49eff87
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/EnvLocationInfoMapper.java
@@ -0,0 +1,21 @@
+package com.casic.missiles.mapper.resource;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.resource.environment.LocationListRequest;
+import com.casic.missiles.dto.resource.environment.LocationListResponse;
+import com.casic.missiles.model.resource.EnvLocationInfo;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * <p>
+ * 实验室环境监控系统-设备表 Mapper 接口
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-06-07
+ */
+public interface EnvLocationInfoMapper extends BaseMapper<EnvLocationInfo> {
+
+    Page<LocationListResponse> selectLocationListPage(Page<LocationListResponse> page, @Param("request") LocationListRequest request);
+}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java
index de124db..85ed0f7 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java
@@ -1,7 +1,9 @@
 package com.casic.missiles.mapper.system;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.dto.system.SignDetailResponse;
+import com.casic.missiles.dto.system.SignListRequest;
 import com.casic.missiles.model.system.SystemSign;
 import org.apache.ibatis.annotations.Param;
 
@@ -22,4 +24,8 @@
     SignDetailResponse selectSignDetailById(Long id);
 
     List<SystemSign> selectUsableSignList(@Param("userId") Long userId);
+
+    Page<SystemSign> selectSignListPage(Page<SystemSign> page, @Param("request") SignListRequest request);
+
+    List<SystemSign> selectSignList(@Param("request") SignListRequest request);
 }
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateChangeApplyMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateChangeApplyMapper.xml
index d798447..c496092 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateChangeApplyMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateChangeApplyMapper.xml
@@ -30,31 +30,31 @@
         SELECT *
         FROM biz_business_certificate_change_apply
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.changeApplyNo != null and request.changeApplyNo !=''">
+        <if test="request != null and request.changeApplyNo != null and request.changeApplyNo !=''">
             and change_apply_no like concat('%',#{request.changeApplyNo},'%')
         </if>
-        <if test="request.changeReportNo != null and request.changeReportNo !=''">
+        <if test="request != null and request.changeReportNo != null and request.changeReportNo !=''">
             and change_report_no like concat('%',#{request.changeReportNo},'%')
         </if>
-        <if test="request.changeReportName != null and request.changeReportName !=''">
+        <if test="request != null and request.changeReportName != null and request.changeReportName !=''">
             and change_report_name like concat('%',#{request.changeReportName},'%')
         </if>
-        <if test="request.changeType != null and request.changeType !=''">
+        <if test="request != null and request.changeType != null and request.changeType !=''">
             and change_type = #{request.changeType}
         </if>
-        <if test="request.createUserName != null and request.createUserName !=''">
+        <if test="request != null and request.createUserName != null and request.createUserName !=''">
             and create_user_name like concat('%',#{request.createUserName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificatePrintMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificatePrintMapper.xml
index b66cd99..49c0ac8 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificatePrintMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificatePrintMapper.xml
@@ -31,34 +31,34 @@
         LEFT JOIN biz_business_order_sample_relation bosr ON (bosr.order_id = bcr.order_id AND bosr.sample_id = bcr.sample_id)
         LEFT JOIN biz_business_order_info boi ON boi.id = bosr.order_id
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and bcp.approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.printStatus != null and request.printStatus !=''">
+        <if test="request != null and request.printStatus != null and request.printStatus !=''">
             and print_status = #{request.printStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and bcp.create_user_id = #{request.createUserId}
         </if>
-        <if test="request.certificateReportNo != null and request.certificateReportNo !=''">
+        <if test="request != null and request.certificateReportNo != null and request.certificateReportNo !=''">
             and bcr.certificate_report_no like concat('%',#{request.certificateReportNo},'%')
         </if>
-        <if test="request.certificateReportName != null and request.certificateReportName !=''">
+        <if test="request != null and request.certificateReportName != null and request.certificateReportName !=''">
             and bcr.certificate_report_name like concat('%',#{request.certificateReportName},'%')
         </if>
-        <if test="request.customerName != null and request.customerName !=''">
+        <if test="request != null and request.customerName != null and request.customerName !=''">
             and boi.customer_name like concat('%',#{request.customerName},'%')
         </if>
-        <if test="request.sampleNo != null and request.sampleNo !=''">
+        <if test="request != null and request.sampleNo != null and request.sampleNo !=''">
             and bosr.sample_no like concat('%',#{request.sampleNo},'%')
         </if>
-        <if test="request.sampleName != null and request.sampleName !=''">
+        <if test="request != null and request.sampleName != null and request.sampleName !=''">
             and bosr.sample_name like concat('%',#{request.sampleName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and bcp.create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and bcp.create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml
index b366034..767695d 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml
@@ -46,33 +46,37 @@
         SELECT bcr.*, bosr.sample_no, bosr.sample_name, bosr.sample_model, rsi.staff_name
         FROM biz_business_certificate_report bcr
         LEFT JOIN biz_business_order_sample_relation bosr ON (bosr.order_id = bcr.order_id AND bosr.sample_id = bcr.sample_id)
+        LEFT JOIN biz_business_order_info boi ON boi.id = bcr.order_id
         LEFT JOIN biz_resource_staff_info rsi ON rsi.id = bcr.measure_person_id
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and bcr.approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and bcr.create_user_id = #{request.createUserId}
         </if>
-        <if test="request.certificateReportNo != null and request.certificateReportNo !=''">
+        <if test="request != null and request.customerId != null and request.customerId !=''">
+            and boi.customer_id = #{request.customerId}
+        </if>
+        <if test="request != null and request.certificateReportNo != null and request.certificateReportNo !=''">
             and bcr.certificate_report_no like concat('%',#{request.certificateReportNo},'%')
         </if>
-        <if test="request.certificateReportName != null and request.certificateReportName !=''">
+        <if test="request != null and request.certificateReportName != null and request.certificateReportName !=''">
             and bcr.certificate_report_name like concat('%',#{request.certificateReportName},'%')
         </if>
-        <if test="request.sampleNo != null and request.sampleNo !=''">
+        <if test="request != null and request.sampleNo != null and request.sampleNo !=''">
             and bosr.sample_no like concat('%',#{request.sampleNo},'%')
         </if>
-        <if test="request.measureCategory != null and request.measureCategory !=''">
+        <if test="request != null and request.measureCategory != null and request.measureCategory !=''">
             and bcr.measure_category = #{request.measureCategory}
         </if>
-        <if test="request.measurePerson != null and request.measurePerson !=''">
+        <if test="request != null and request.measurePerson != null and request.measurePerson !=''">
             and rsi.staff_name like concat('%',#{request.measurePerson},'%')
         </if>
-        <if test="request.calibrationTimeStart != null and request.calibrationTimeStart !=''">
+        <if test="request != null and request.calibrationTimeStart != null and request.calibrationTimeStart !=''">
             and bcr.calibration_time &gt;= #{request.calibrationTimeStart}
         </if>
-        <if test="request.calibrationTimeEnd != null and request.calibrationTimeEnd !=''">
+        <if test="request != null and request.calibrationTimeEnd != null and request.calibrationTimeEnd !=''">
             and bcr.calibration_time &lt;= #{request.calibrationTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceAssessMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceAssessMapper.xml
index d0fcf8b..c22c101 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceAssessMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceAssessMapper.xml
@@ -7,6 +7,8 @@
         <id column="id" property="id" />
         <result column="project_no" property="projectNo" />
         <result column="project_name" property="projectName" />
+        <result column="lab_code" property="labCode" />
+        <result column="group_code" property="groupCode" />
         <result column="applicant_id" property="applicantId" />
         <result column="applicant_name" property="applicantName" />
         <result column="applicant_time" property="applicantTime" />
@@ -31,7 +33,45 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, project_no, project_name, applicant_id, applicant_name, applicant_time, minio_file_name, remark, create_user_id, create_user_name, outsourcer_id, pre_start_time, pre_end_time, outsource_reason, pre_cost, approval_status, process_id, approve_situation, traceability, test_method, technique_ability, create_time, update_time
+        id, project_no, project_name, lab_code, group_code, applicant_id, applicant_name, applicant_time, minio_file_name, remark, create_user_id, create_user_name, outsourcer_id, pre_start_time, pre_end_time, outsource_reason, pre_cost, approval_status, process_id, approve_situation, traceability, test_method, technique_ability, create_time, update_time
     </sql>
 
+    <select id="selectMaxProjectNo" resultType="java.lang.Long">
+        SELECT IFNULL(max(RIGHT(project_no, 3)), 0) from biz_business_outsource_assess
+    </select>
+
+    <select id="selectBatchForApprovalList" resultMap="BaseResultMap">
+        SELECT bboa.*, bboi.outsourcer_name, bboi.director
+        FROM biz_business_outsource_assess bboa
+        LEFT JOIN biz_business_outsourcer_info bboi ON bboa.outsourcer_id = bboi.id
+        WHERE 1=1
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
+            and bboa.approval_status = #{request.approvalStatus}
+        </if>
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
+            and bboa.create_user_id = #{request.createUserId}
+        </if>
+        <if test="request != null and request.projectNo != null and request.projectNo !=''">
+            and bboa.project_no like concat('%',#{request.projectNo},'%')
+        </if>
+        <if test="request != null and request.outsourcerName != null and request.outsourcerName !=''">
+            and bboi.outsourcer_name like concat('%',#{request.outsourcerName},'%')
+        </if>
+        <if test="request != null and request.applicantName != null and request.applicantName !=''">
+            and bboa.applicant_name like concat('%',#{request.applicantName},'%')
+        </if>
+        <if test="request != null and request.applicantTimeStart != null and request.applicantTimeStart !=''">
+            and bboa.applicant_time &gt;= #{request.applicantTimeStart}
+        </if>
+        <if test="request != null and request.applicantTimeEnd != null and request.applicantTimeEnd !=''">
+            and bboa.applicant_time &lt;= #{request.applicantTimeEnd}
+        </if>
+        <if test="businessKeys != null">
+            and bboa.id in
+            <foreach collection="businessKeys" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
+        ORDER BY bboa.create_time DESC
+    </select>
 </mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceProtocolMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceProtocolMapper.xml
new file mode 100644
index 0000000..b7b2149
--- /dev/null
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceProtocolMapper.xml
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.mapper.business.BizBusinessOutsourceProtocolMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.business.BizBusinessOutsourceProtocol">
+        <id column="id" property="id" />
+        <result column="protocol_no" property="protocolNo" />
+        <result column="project_name" property="projectName" />
+        <result column="lab_code" property="labCode" />
+        <result column="group_code" property="groupCode" />
+        <result column="outsourcer_id" property="outsourcerId" />
+        <result column="remark" property="remark" />
+        <result column="outsource_no" property="outsourceNo" />
+        <result column="outsource_name" property="outsourceName" />
+        <result column="contacts" property="contacts" />
+        <result column="mobile" property="mobile" />
+        <result column="address" property="address" />
+        <result column="require_date" property="requireDate" />
+        <result column="outsource_cost" property="outsourceCost" />
+        <result column="director" property="director" />
+        <result column="item" property="item" />
+        <result column="requires" property="requires" />
+        <result column="create_user_id" property="createUserId" />
+        <result column="create_user_name" property="createUserName" />
+        <result column="approval_status" property="approvalStatus" />
+        <result column="process_id" property="processId" />
+        <result column="create_time" property="createTime" />
+        <result column="update_time" property="updateTime" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, protocol_no, project_name, lab_code, group_code, outsourcer_id, remark, outsource_no, outsource_name, contacts, mobile, address, require_date, outsource_cost, director, item, requires, create_user_id, create_user_name, approval_status, process_id, create_time, update_time
+    </sql>
+
+    <select id="selectMaxProtocolNo" resultType="java.lang.Long">
+        SELECT IFNULL(max(RIGHT(protocol_no, 3)), 0) from biz_business_outsource_protocol
+    </select>
+
+    <select id="selectBatchForApprovalList" resultMap="BaseResultMap">
+        SELECT *
+        FROM biz_business_outsource_protocol
+        WHERE 1=1
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
+            and approval_status = #{request.approvalStatus}
+        </if>
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
+            and create_user_id = #{request.createUserId}
+        </if>
+        <if test="request != null and request.protocolNo != null and request.protocolNo !=''">
+            and protocol_no like concat('%',#{request.protocolNo},'%')
+        </if>
+        <if test="request != null and request.outsourcerName != null and request.outsourcerName !=''">
+            and outsourcer_name like concat('%',#{request.outsourcerName},'%')
+        </if>
+        <if test="request != null and request.applicantName != null and request.applicantName !=''">
+            and create_user_name like concat('%',#{request.applicantName},'%')
+        </if>
+        <if test="request != null and request.applicantTimeStart != null and request.applicantTimeStart !=''">
+            and create_time &gt;= #{request.applicantTimeStart}
+        </if>
+        <if test="request != null and request.applicantTimeEnd != null and request.applicantTimeEnd !=''">
+            and create_time &lt;= #{request.applicantTimeEnd}
+        </if>
+        <if test="businessKeys != null">
+            and id in
+            <foreach collection="businessKeys" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
+        ORDER BY create_time DESC
+    </select>
+</mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourcerInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourcerInfoMapper.xml
index 510a80b..3049b54 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourcerInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourcerInfoMapper.xml
@@ -7,6 +7,8 @@
         <id column="id" property="id" />
         <result column="outsourcer_no" property="outsourcerNo" />
         <result column="outsourcer_name" property="outsourcerName" />
+        <result column="lab_code" property="labCode" />
+        <result column="group_code" property="groupCode" />
         <result column="outsourcer_brief_name" property="outsourcerBriefName" />
         <result column="outsourcer_size" property="outsourcerSize" />
         <result column="business_size" property="businessSize" />
@@ -55,32 +57,32 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, outsourcer_no, outsourcer_name, outsourcer_brief_name, outsourcer_size, business_size, grade, evaluation, tax_number, bank_account, bank_name, bank_account_number, postal_code, director, phone, fax, mobile, email, website, address_country, address_province, address_city, address_area, full_address, address_country_name, address_province_name, address_city_name, address_area_name, invoice_country, invoice_province, invoice_city, invoice_area, invoice_full_address, invoice_country_name, invoice_province_name, invoice_city_name, invoice_area_name, business_scope, business_content, minio_file_name, approval_status, process_id, remark, create_user_id, create_user_name, create_time, update_time
+        id, outsourcer_no, outsourcer_name, lab_code, group_code, outsourcer_brief_name, outsourcer_size, business_size, grade, evaluation, tax_number, bank_account, bank_name, bank_account_number, postal_code, director, phone, fax, mobile, email, website, address_country, address_province, address_city, address_area, full_address, address_country_name, address_province_name, address_city_name, address_area_name, invoice_country, invoice_province, invoice_city, invoice_area, invoice_full_address, invoice_country_name, invoice_province_name, invoice_city_name, invoice_area_name, business_scope, business_content, minio_file_name, approval_status, process_id, remark, create_user_id, create_user_name, create_time, update_time
     </sql>
 
     <select id="selectBatchForApprovalList" resultMap="BaseResultMap">
         SELECT *
         FROM biz_business_outsourcer_info
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.outsourcerNo != null and request.outsourcerNo !=''">
+        <if test="request != null and request.outsourcerNo != null and request.outsourcerNo !=''">
             and outsourcer_no like concat('%',#{request.outsourcerNo},'%')
         </if>
-        <if test="request.outsourcerName != null and request.outsourcerName !=''">
+        <if test="request != null and request.outsourcerName != null and request.outsourcerName !=''">
             and outsourcer_name like concat('%',#{request.outsourcerName},'%')
         </if>
-        <if test="request.director != null and request.director !=''">
+        <if test="request != null and request.director != null and request.director !=''">
             and director like concat('%',#{request.director},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
@@ -93,6 +95,6 @@
     </select>
 
     <select id="selectMaxNo" resultType="java.lang.Long">
-        SELECT IFNULL(max(RIGHT(outsourcer_no, 12)), 0) from biz_business_outsourcer_info
+        SELECT IFNULL(max(RIGHT(outsourcer_no, 3)), 0) from biz_business_outsourcer_info
     </select>
 </mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessSiteExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessSiteExecutiveInfoMapper.xml
index 135c5d0..3c5ae79 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessSiteExecutiveInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessSiteExecutiveInfoMapper.xml
@@ -38,25 +38,25 @@
         FROM biz_business_site_executive_info bsei
         LEFT JOIN biz_resource_customer_info rci ON bsei.customer_id = rci.id
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and bsei.approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and bsei.create_user_id = #{request.createUserId}
         </if>
-        <if test="request.siteExecutiveNo != null and request.siteExecutiveNo !=''">
+        <if test="request != null and request.siteExecutiveNo != null and request.siteExecutiveNo !=''">
             and bsei.site_executive_no like concat('%',#{request.siteExecutiveNo},'%')
         </if>
-        <if test="request.customerName != null and request.customerName !=''">
+        <if test="request != null and request.customerName != null and request.customerName !=''">
             and rci.outsourcer_name like concat('%',#{request.customerName},'%')
         </if>
-        <if test="request.applyName != null and request.applyName !=''">
+        <if test="request != null and request.applyName != null and request.applyName !=''">
             and bsei.apply_name like concat('%',#{request.applyName},'%')
         </if>
-        <if test="request.applyTimeStart != null and request.applyTimeStart !=''">
+        <if test="request != null and request.applyTimeStart != null and request.applyTimeStart !=''">
             and bsei.apply_time &gt;= #{request.applyTimeStart}
         </if>
-        <if test="request.applyTimeEnd != null and request.applyTimeEnd !=''">
+        <if test="request != null and request.applyTimeEnd != null and request.applyTimeEnd !=''">
             and bsei.apply_time &lt;= #{request.applyTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml
index 84d9e2a..6bd38a9 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml
@@ -105,6 +105,12 @@
         <if test="request.isUrgent != null and request.isUrgent !=''">
             AND bo.is_urgent = #{request.isUrgent}
         </if>
+        <if test="request.ids != null">
+            and blei.id in
+            <foreach collection="request.ids" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
         ORDER BY blei.update_time DESC
     </select>
 
@@ -137,6 +143,12 @@
         <if test="request.isUrgent != null and request.isUrgent !=''">
             AND bo.is_urgent = #{request.isUrgent}
         </if>
+        <if test="request.ids != null">
+            and blei.id in
+            <foreach collection="request.ids" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
         ORDER BY blei.update_time DESC
     </select>
 
diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardInfoMapper.xml
index 1a5551b..2ed8d17 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardInfoMapper.xml
@@ -45,12 +45,6 @@
         FROM biz_equipment_standard_info besi
         LEFT JOIN biz_equipment_standard_technology_relation bestr ON besi.standard_no = bestr.standard_no
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
-            and besi.approval_status = #{request.approvalStatus}
-        </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
-            and besi.create_user_id = #{request.createUserId}
-        </if>
         <if test="request.standardName != null and request.standardName !=''">
             and besi.standard_name like concat('%',#{request.standardName},'%')
         </if>
diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardTechnologyRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardTechnologyRelationMapper.xml
index fc7e16c..cd03c8c 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardTechnologyRelationMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardTechnologyRelationMapper.xml
@@ -6,6 +6,7 @@
     <resultMap id="BaseResultMap" type="com.casic.missiles.model.equipment.BizEquipmentStandardTechnologyRelation">
         <id column="id" property="id" />
         <result column="technology_file_id" property="technologyFileId" />
+        <result column="technology_file_no" property="technologyFileNo" />
         <result column="technology_file_name" property="technologyFileName" />
         <result column="standard_id" property="standardId" />
         <result column="standard_no" property="standardNo" />
@@ -14,7 +15,7 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, technology_file_id, technology_file_name, standard_id, remark
+        id, technology_file_id, technology_file_no, technology_file_name, standard_id, remark
     </sql>
 
 </mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceAuthorizeOrderMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceAuthorizeOrderMapper.xml
index ac5176c..554fe65 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceAuthorizeOrderMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceAuthorizeOrderMapper.xml
@@ -32,22 +32,22 @@
         SELECT *
         FROM biz_resource_authorize_order
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.orderNo != null and request.orderNo !=''">
+        <if test="request != null and request.orderNo != null and request.orderNo !=''">
             and order_no like concat('%',#{request.orderNo},'%')
         </if>
-        <if test="request.createUserName != null and request.createUserName !=''">
+        <if test="request != null and request.createUserName != null and request.createUserName !=''">
             and create_user_name like concat('%',#{request.createUserName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerExamineFormMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerExamineFormMapper.xml
index ab242f6..af7f98f 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerExamineFormMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerExamineFormMapper.xml
@@ -41,28 +41,28 @@
         SELECT *
         FROM biz_resource_customer_examine_form
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.formNo != null and request.formNo !=''">
+        <if test="request != null and request.formNo != null and request.formNo !=''">
             and form_no like concat('%',#{request.formNo},'%')
         </if>
-        <if test="request.labCode != null and request.labCode !=''">
+        <if test="request != null and request.labCode != null and request.labCode !=''">
             and lab_code like concat('%',#{request.labCode},'%')
         </if>
-        <if test="request.groupCode != null and request.groupCode !=''">
+        <if test="request != null and request.groupCode != null and request.groupCode !=''">
             and group_code like concat('%',#{request.groupCode},'%')
         </if>
-        <if test="request.createUserName != null and request.createUserName !=''">
+        <if test="request != null and request.createUserName != null and request.createUserName !=''">
             and create_user_name like concat('%',#{request.createUserName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerInfoMapper.xml
index fa8ffbc..06a2798 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerInfoMapper.xml
@@ -33,25 +33,25 @@
         SELECT *
         FROM biz_resource_customer_info
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.customerNo != null and request.customerNo !=''">
+        <if test="request != null and request.customerNo != null and request.customerNo !=''">
             and customer_no like concat('%',#{request.customerNo},'%')
         </if>
-        <if test="request.customerName != null and request.customerName !=''">
+        <if test="request != null and request.customerName != null and request.customerName !=''">
             and customer_name like concat('%',#{request.customerName},'%')
         </if>
-        <if test="request.contacts != null and request.contacts !=''">
+        <if test="request != null and request.contacts != null and request.contacts !=''">
             and contacts like concat('%',#{request.contacts},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerSuggestFormMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerSuggestFormMapper.xml
index 28f5bb2..1806662 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerSuggestFormMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerSuggestFormMapper.xml
@@ -33,28 +33,28 @@
         SELECT *
         FROM biz_resource_customer_suggest_form
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.formNo != null and request.formNo !=''">
+        <if test="request != null and request.formNo != null and request.formNo !=''">
             and form_no like concat('%',#{request.formNo},'%')
         </if>
-        <if test="request.customerName != null and request.customerName !=''">
+        <if test="request != null and request.customerName != null and request.customerName !=''">
             and customer_name like concat('%',#{request.customerName},'%')
         </if>
-        <if test="request.customerDeptName != null and request.customerDeptName !=''">
+        <if test="request != null and request.customerDeptName != null and request.customerDeptName !=''">
             and customer_dept_name like concat('%',#{request.customerDeptName},'%')
         </if>
-        <if test="request.createUserName != null and request.createUserName !=''">
+        <if test="request != null and request.createUserName != null and request.createUserName !=''">
             and create_user_name like concat('%',#{request.createUserName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSealUseNoteMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSealUseNoteMapper.xml
index ab37bc1..b02bb33 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSealUseNoteMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSealUseNoteMapper.xml
@@ -29,32 +29,32 @@
     </sql>
 
     <select id="selectBatchForApprovalList" resultMap="BaseResultMap">
-        SELECT *
+        SELECT brsun.*, brsi.seal_name, brsi.seal_type, brsi.approver_name
         FROM biz_resource_seal_use_note brsun
         JOIN biz_resource_seal_info brsi ON brsun.seal_id = brsi.id
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and brsun.approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and brsun.create_user_id = #{request.createUserId}
         </if>
-        <if test="request.sealName != null and request.sealName !=''">
+        <if test="request != null and request.sealName != null and request.sealName !=''">
             and brsi.seal_name like concat('%',#{request.sealName},'%')
         </if>
-        <if test="request.sealType != null and request.sealType !=''">
+        <if test="request != null and request.sealType != null and request.sealType !=''">
             and brsi.seal_type = #{request.sealType}
         </if>
-        <if test="request.applyDeptName != null and request.applyDeptName !=''">
+        <if test="request != null and request.applyDeptName != null and request.applyDeptName !=''">
             and brsun.apply_dept_name like concat('%',#{request.applyDeptName},'%')
         </if>
-        <if test="request.applyUserName != null and request.applyUserName !=''">
+        <if test="request != null and request.applyUserName != null and request.applyUserName !=''">
             and brsun.apply_user_name like concat('%',#{request.applyUserName},'%')
         </if>
-        <if test="request.applyTimeStart != null and request.applyTimeStart !=''">
+        <if test="request != null and request.applyTimeStart != null and request.applyTimeStart !=''">
             and brsun.apply_time &gt;= #{request.applyTimeStart}
         </if>
-        <if test="request.applyTimeEnd != null and request.applyTimeEnd !=''">
+        <if test="request != null and request.applyTimeEnd != null and request.applyTimeEnd !=''">
             and brsun.apply_time &lt;= #{request.applyTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml
index 119bf7d..4f8392a 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml
@@ -31,6 +31,12 @@
         <if test="request.deptName != null and request.deptName !=''">
             and brsi.dept_name like concat('%',#{request.deptName},'%')
         </if>
+        <if test="request.ids != null">
+            and brsv.id in
+            <foreach collection="request.ids" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
         ORDER BY brsv.grant_date DESC
     </select>
 
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSupplierInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSupplierInfoMapper.xml
index fe8d399..e8ce7ef 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSupplierInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSupplierInfoMapper.xml
@@ -48,28 +48,28 @@
         SELECT *
         FROM biz_resource_supplier_info
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.supplierNo != null and request.supplierNo !=''">
+        <if test="request != null and request.supplierNo != null and request.supplierNo !=''">
             and supplier_no like concat('%',#{request.supplierNo},'%')
         </if>
-        <if test="request.supplierName != null and request.supplierName !=''">
+        <if test="request != null and request.supplierName != null and request.supplierName !=''">
             and supplier_name like concat('%',#{request.supplierName},'%')
         </if>
-        <if test="request.director != null and request.director !=''">
+        <if test="request != null and request.director != null and request.director !=''">
             and director like concat('%',#{request.director},'%')
         </if>
-        <if test="request.supplierType != null and request.supplierType !=''">
+        <if test="request != null and request.supplierType != null and request.supplierType !=''">
             and supplier_type = #{request.supplierType}
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/EnvLocationInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/EnvLocationInfoMapper.xml
new file mode 100644
index 0000000..68bcf10
--- /dev/null
+++ b/casic-metering-dao/src/main/resources/mapper/resource/EnvLocationInfoMapper.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.mapper.resource.EnvLocationInfoMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.resource.EnvLocationInfo">
+        <id column="id" property="id" />
+        <result column="location_no" property="locationNo" />
+        <result column="location_name" property="locationName" />
+        <result column="location_position" property="locationPosition" />
+        <result column="create_user_id" property="createUserId" />
+        <result column="create_user" property="createUser" />
+        <result column="create_time" property="createTime" />
+        <result column="update_time" property="updateTime" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, location_no, location_name, location_position, create_user_id, create_user, create_time, update_time
+    </sql>
+
+    <select id="selectLocationListPage" resultType="com.casic.missiles.dto.resource.environment.LocationListResponse">
+        SELECT *
+        FROM env_location_info
+        WHERE 1=1
+        <if test="request.locationNo != null and request.locationNo !=''">
+            AND location_no LIKE concat('%',#{request.locationNo},'%')
+        </if>
+        <if test="request.locationName != null and request.locationName !=''">
+            AND location_name LIKE concat('%',#{request.locationName},'%')
+        </if>
+        ORDER BY create_time DESC
+    </select>
+
+</mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml
index b28c18f..8854047 100644
--- a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml
@@ -11,7 +11,6 @@
         <result column="sign_desc" property="signDesc" />
         <result column="sign_director" property="signDirector" />
         <result column="sign_user_id" property="signUserId" />
-        <result column="sign_type" property="signType" />
         <result column="minio_file_name" property="minioFileName" />
         <result column="create_time" property="createTime" />
         <result column="update_time" property="updateTime" />
@@ -28,7 +27,6 @@
         <result column="sign_name" property="signName" />
         <result column="sign_desc" property="signDesc" />
         <result column="sign_director" property="signDirector" />
-        <result column="sign_type" property="signType" />
         <result column="sign_user_id" property="signUserId" />
         <result column="minio_file_name" property="minioFileName" />
         <result column="create_time" property="createTime" />
@@ -62,4 +60,58 @@
         JOIN system_sign_user_relation ssur ON ss.id = ssur.sign_id
         WHERE ssur.user_id = #{userId}
     </select>
+
+    <select id="selectSignListPage" resultMap="BaseResultMap">
+        SELECT ss.*, sd.SIMPLE_NAME AS deptName
+        FROM system_sign ss
+        LEFT JOIN sys_user su ON su.id = ss.sign_user_id
+        LEFT JOIN sys_dept sd ON sd.id = su.dept_id
+        WHERE 1=1
+        <if test="request.signNo != null and request.signNo !=''">
+            AND ss.sign_no LIKE concat('%',#{request.signNo},'%')
+        </if>
+        <if test="request.signName != null and request.signName !=''">
+            AND ss.sign_name LIKE concat('%',#{request.signName},'%')
+        </if>
+        <if test="request.signDirector != null and request.signDirector !=''">
+            AND ss.sign_director LIKE concat('%',#{request.signDirector},'%')
+        </if>
+        <if test="request.signUserId != null and request.signUserId !=''">
+            AND ss.sign_user_id = #{request.signUserId}
+        </if>
+        <if test="request.createStartTime != null and request.createStartTime !=''">
+            AND DATE_FORMAT(ss.create_time,'%Y-%m-%d') &gt;= DATE_FORMAT(#{request.createStartTime},'%Y-%m-%d')
+        </if>
+        <if test="request.createEndTime != null and request.createEndTime !=''">
+            AND DATE_FORMAT(ss.create_time,'%Y-%m-%d')  &lt;= DATE_FORMAT(#{request.createEndTime},'%Y-%m-%d')
+        </if>
+        ORDER BY ss.create_time DESC
+    </select>
+
+    <select id="selectSignList" resultMap="BaseResultMap">
+        SELECT ss.*, sd.SIMPLE_NAME AS deptName
+        FROM system_sign ss
+        LEFT JOIN sys_user su ON su.id = ss.sign_user_id
+        LEFT JOIN sys_dept sd ON sd.id = su.dept_id
+        WHERE 1=1
+        <if test="request.signNo != null and request.signNo !=''">
+            AND ss.sign_no LIKE concat('%',#{request.signNo},'%')
+        </if>
+        <if test="request.signName != null and request.signName !=''">
+            AND ss.sign_name LIKE concat('%',#{request.signName},'%')
+        </if>
+        <if test="request.signDirector != null and request.signDirector !=''">
+            AND ss.sign_director LIKE concat('%',#{request.signDirector},'%')
+        </if>
+        <if test="request.signUserId != null and request.signUserId !=''">
+            AND ss.sign_user_id = #{request.signUserId}
+        </if>
+        <if test="request.createStartTime != null and request.createStartTime !=''">
+            AND DATE_FORMAT(ss.create_time,'%Y-%m-%d') &gt;= DATE_FORMAT(#{request.createStartTime},'%Y-%m-%d')
+        </if>
+        <if test="request.createEndTime != null and request.createEndTime !=''">
+            AND DATE_FORMAT(ss.create_time,'%Y-%m-%d')  &lt;= DATE_FORMAT(#{request.createEndTime},'%Y-%m-%d')
+        </if>
+        ORDER BY ss.create_time DESC
+    </select>
 </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 515050a..60f530b 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
@@ -47,8 +47,8 @@
     String STORAGE_LOCATION = "bizStorageLocation";
     //计量专业
     String MEASURE_MAJOR = "bizMeasureMajor";
-    //管理状态
-    String MANAGER_STATE = "bizManagerState";
+    //标准装置管理状态
+    String STANDARD_MANAGER_STATE = "bizStandardManagerState";
 
     /**
      * 资源管理 字典code
@@ -95,8 +95,6 @@
     String MEASURE_STATUS = "measureStatus";
     //检定方式
     String MEASURE_TYPE = "measureType";
-    //标识打印标志类型
-    String IDENTIFY_PRINT_TYPE = "bizBusinessIdentify";
     //变更类型
     String REPORT_CHANGE_TYPE = "bizCertChangeType";
     //规模类型
@@ -111,19 +109,24 @@
     String MEASURE_CATEGORY = "measureCategory";
     //检定结果
     String MEASURE_RESULT = "measureResult";
+    //分包原因
+    String OUTSOURCE_REASON = "outsourceReason";
+
+    /**
+     * 系统管理
+     */
+    String TEMPLATE_TYPE = "templateType";
+
 
     /**
      * 标准装置 字典code
      */
     //类别
     String STANDARD_CATEGORY = "standardCategory";
-    //管理状态
-    String STANDARD_MANAGER_STATE = "standardManagerState";
     //标准等级
     String STANDARD_LEVEL = "standardLevel";
     //传递范围
     String STANDARD_TRANSMIT_RANGE = "transmitRange";
-
     //资本来源
     String CAPITAL_SOURCE = "capitalSource";
     //标准装置-申请类型
@@ -148,8 +151,6 @@
     String CERTIFICATE_CLASS = "certificationClass";
     //证书管理-检校专业
     String CALIBRATION_MAJOR = "calibrationMajor";
-    //分包原因
-    String OUTSOURCE_REASON = "outsourceReason";
 
     /**
      * 工作台
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/BaseApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/BaseApprovalListRequest.java
index 73c12c1..80d7424 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/BaseApprovalListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/BaseApprovalListRequest.java
@@ -6,6 +6,7 @@
 
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotEmpty;
+import java.util.List;
 
 /**
  * @Description:
@@ -19,14 +20,14 @@
      * 表单id
      */
     @NotBlank(message = "表单id不能为空")
-    @ApiModelProperty(value = "表单id（流程定义对应的表单id，等价于业务id）", dataType = "String")
+    @ApiModelProperty(value = "表单id（流程定义对应的表单id，等价于业务id），导出接口不用传", dataType = "String")
     private String formId;
 
     /**
      * 审批状态类型，对应ApprovalStatusEnum
      */
     @NotEmpty(message = "审批状态类型不能为空")
-    @ApiModelProperty(value = "审批状态类型code", dataType = "String")
+    @ApiModelProperty(value = "审批状态类型code，导出接口不用传", dataType = "String")
     private String approvalStatus;
 
     @ApiModelProperty(hidden = true)
@@ -34,4 +35,7 @@
 
     @ApiModelProperty(hidden = true)
     private Long createUserId;
+
+    @ApiModelProperty(value = "导出ids", dataType = "List")
+    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificatePrintApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificatePrintApprovalListRequest.java
index b93d1c9..3cc2f4e 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificatePrintApprovalListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificatePrintApprovalListRequest.java
@@ -5,8 +5,6 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import java.util.List;
-
 /**
  * @Description:
  * @Author: wangpeng
@@ -38,7 +36,4 @@
 
     @ApiModelProperty(value = "创建结束时间", dataType = "String")
     private String createTimeEnd;
-
-    @ApiModelProperty(value = "导出ids", dataType = "List")
-    private List<Long> ids;
 }

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java
index bb0c50f..13a699b 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java
@@ -12,6 +12,7 @@
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.IGeneralApprovalService;
+import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
@@ -19,6 +20,7 @@
 import org.springframework.web.bind.annotation.RequestBody;
 
 import javax.validation.Valid;
+import java.util.List;
 import java.util.Objects;
 
 /**
@@ -117,4 +119,17 @@
         }
         return baseApprovalService.failUpdate(request);
     }
+
+    public List<O> exportList(@RequestBody @Valid R request) throws Exception {
+        List<O> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = baseApprovalService.listExportByIds(request.getIds());
+        } else {
+            list = baseApprovalService.listExport(request);
+        }
+        for (O record : list) {
+            DictCodeUtils.convertDictCodeToName(record);
+        }
+        return list;
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java
index 8a90961..d775831 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java
@@ -5,6 +5,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.business.certificate.CertificateChangeApplyApprovalListRequest;
 import com.casic.missiles.dto.business.certificate.CertificateChangeApplySaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessCertificateChangeApply;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
@@ -20,6 +21,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -48,4 +50,12 @@
         }
         return changeApplyService.saveChangeApply(request);
     }
+
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody CertificateChangeApplyApprovalListRequest request) throws Exception {
+        List<BizBusinessCertificateChangeApply> list = super.exportList(request);
+        super.exportExcel(BizBusinessCertificateChangeApply.class, list, ExportEnum.CERTIFICATE_CHANGE_APPLY.getSheetName());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java
index 5fc4b07..af8230e 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java
@@ -9,6 +9,7 @@
 import com.casic.missiles.dto.business.certificate.CertificatePrintApprovalListRequest;
 import com.casic.missiles.dto.business.certificate.CertificatePrintListResponse;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.enums.business.CertificatePrintStatusEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessCertificatePrintLog;
@@ -18,10 +19,16 @@
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.io.IOException;
+import java.util.List;
 import java.util.Objects;
 
 /**
@@ -98,4 +105,16 @@
         });
         return certificatePrintService.certificatePrintLog(idDTO.getId());
     }
+
+    @ApiOperation("证书打印审批导出")
+    @PostMapping("/listExport")
+    public void exportList(@RequestBody CertificatePrintApprovalListRequest request) throws IOException {
+        List<CertificatePrintListResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = certificatePrintService.listByIds(request.getIds());
+        } else {
+            list = certificatePrintService.list(request);
+        }
+        super.exportExcel(CertificatePrintListResponse.class, list, ExportEnum.CERTIFICATE_PRINT.getSheetName());
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java
index 63b06dc..6b2efd5 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java
@@ -6,6 +6,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.business.certificate.CertificateReportApprovalListRequest;
 import com.casic.missiles.dto.business.certificate.CertificateReportSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessCertificateReport;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
@@ -21,6 +22,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -50,7 +52,7 @@
         return certificateReportService.saveCertificateReport(request);
     }
 
-    @ApiOperation("证书审批详情（基本信息）")
+    @ApiOperation("详情（基本信息）")
     @PostMapping("/detail")
     public ReturnDTO<BizBusinessCertificateReport> detail(@RequestBody @Valid BaseDetailRequest request, BindingResult bindingResult) throws Exception {
         if(bindingResult.hasErrors()){
@@ -59,4 +61,11 @@
         return certificateReportService.detail(request);
     }
 
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody CertificateReportApprovalListRequest request) throws Exception {
+        List<BizBusinessCertificateReport> list = super.exportList(request);
+        super.exportExcel(BizBusinessCertificateReport.class, list, ExportEnum.CERTIFICATE_REPORT.getSheetName());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java
index 46b26bd..57c0809 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java
@@ -10,20 +10,21 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.business.identify.IdentifyListRequest;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessIdentifyInfo;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.business.IBizBusinessIdentifyInfoService;
+import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import javax.validation.Valid;
+import java.util.List;
 import java.util.Objects;
 
 /**
@@ -57,16 +58,13 @@
         return identifyInfoService.addIdentify(identifyInfo);
     }
 
-    @ApiOperation("标识打印更新")
+    @ApiOperation("标识打印更新（更新打印时间）")
     @PostMapping("/update")
-    public ReturnDTO updateIdentify(@RequestBody @Valid BizBusinessIdentifyInfo identifyInfo, BindingResult bindingResult) {
-        Assert.isFalse(Objects.isNull(identifyInfo.getId()), () -> {
+    public ReturnDTO updateIdentify(@RequestBody @Valid IdDTO idDTO) {
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        Assert.isFalse(bindingResult.hasErrors(), () -> {
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        });
-        return identifyInfoService.updateIdentify(identifyInfo);
+        return identifyInfoService.updateIdentify(idDTO.getId());
     }
 
     @ApiOperation("标识打印删除")
@@ -77,4 +75,37 @@
         });
         return identifyInfoService.deleteIdentify(idDTO.getId());
     }
+
+    @ApiOperation("标识打印导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody @Valid IdentifyListRequest request, BindingResult bindingResult) throws Exception {
+        if (bindingResult.hasErrors()) {
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        List<BizBusinessIdentifyInfo> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = identifyInfoService.listByIds(request.getIds());
+        } else {
+            list = identifyInfoService.list(request);
+        }
+        for (BizBusinessIdentifyInfo record : list) {
+            DictCodeUtils.convertDictCodeToName(record);
+        }
+        super.exportExcel(BizBusinessIdentifyInfo.class, list, ExportEnum.IDENTIFY_EXPORT.getSheetName());
+    }
+
+
+    // TODO: 2023/8/23 查询设备信息，4个底部按钮查设备（按钮的作用就是前端用来调不同接口、用来区分中间即将展示的标识），前端弹窗选设备，在确定保存时前端根据底部按钮判断传入设备类型deviceType字典code
+    // TODO: 2023/8/23 接口：查受检设备（第1个按钮），查设备台账（后3个按钮同一接口），查询之后前端根据标志类型的不同加到中间页面时进行判断（按产品给的对应表）
+    // TODO: 2023/8/23 提供二维码接口，前端在加到中间页面时调用一下
+
+    @ApiOperation("设备二维码")
+    @PostMapping("/equipment/qrCode")
+    public ReturnDTO<String> equipmentQrCode(@RequestBody @Valid IdDTO idDTO) {
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return identifyInfoService.equipmentQrCode(idDTO.getId());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java
index 707be6e..7e0453d 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java
@@ -117,7 +117,7 @@
     }
 
     @ApiOperation("任务单导出")
-    @PostMapping("/export")
+    @PostMapping("/listExport")
     public void orderExport(@RequestBody @Valid OrderListRequest request, HttpServletResponse response) {
         businessOrderService.orderExport(request, response);
     }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java
index 529a6ce..51432be 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java
@@ -1,9 +1,28 @@
 package com.casic.missiles.controller.business;
 
+import com.casic.missiles.controller.GeneralApprovalController;
+import com.casic.missiles.dto.BaseApprovalSubmitRequest;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.business.outsource.OutsourceAssessApprovalListRequest;
+import com.casic.missiles.dto.business.outsource.OutsourceAssessSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
+import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.model.business.BizBusinessOutsourceAssess;
+import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
+import com.casic.missiles.service.IGeneralApprovalService;
+import com.casic.missiles.service.business.IBizBusinessOutsourceAssessService;
 import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.BindingResult;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.validation.Valid;
+import java.util.List;
+
 /**
  * <p>
  * 计量检定业务-分包管理-测试、校准或检定工作分包评审表 前端控制器
@@ -15,6 +34,27 @@
 @Api(tags = "分包管理-测试、校准或检定工作分包评审表")
 @RestController
 @RequestMapping("/business/outsource/assess")
-public class BizBusinessOutsourceAssessController {
+public class BizBusinessOutsourceAssessController extends GeneralApprovalController<BizBusinessOutsourceAssess, BizBusinessOutsourceAssess, OutsourceAssessApprovalListRequest, BaseApprovalSubmitRequest> {
+    @Autowired
+    private IBizBusinessOutsourceAssessService outsourceAssessService;
 
+    public BizBusinessOutsourceAssessController(IGeneralApprovalService<BizBusinessOutsourceAssess, BizBusinessOutsourceAssess, OutsourceAssessApprovalListRequest, BaseApprovalSubmitRequest> baseApprovalService) {
+        super(baseApprovalService);
+    }
+
+    @ApiOperation("草稿箱-保存")
+    @PostMapping("/save")
+    public ReturnDTO<OutsourceAssessSaveResponse> saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceAssess request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        return outsourceAssessService.saveOutsourceAssess(request);
+    }
+
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception {
+        List<BizBusinessOutsourceAssess> list = super.exportList(request);
+        super.exportExcel(BizBusinessOutsourceAssess.class, list, ExportEnum.OUTSOURCE_ASSESS.getSheetName());
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java
new file mode 100644
index 0000000..9adef18
--- /dev/null
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java
@@ -0,0 +1,60 @@
+package com.casic.missiles.controller.business;
+
+import com.casic.missiles.controller.GeneralApprovalController;
+import com.casic.missiles.dto.BaseApprovalSubmitRequest;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.business.outsource.OutsourceProtocolApprovalListRequest;
+import com.casic.missiles.dto.business.outsource.OutsourceProtocolSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
+import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.model.business.BizBusinessOutsourceProtocol;
+import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
+import com.casic.missiles.service.IGeneralApprovalService;
+import com.casic.missiles.service.business.IBizBusinessOutsourceProtocolService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.BindingResult;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.validation.Valid;
+import java.util.List;
+
+/**
+ * <p>
+ * 计量检定业务-分包管理-测试、校准或检定工作分包协议书 前端控制器
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-08-24
+ */
+@Api(tags = "分包管理-测试、校准或检定工作分包协议书")
+@RestController
+@RequestMapping("/business/outsource/protocol")
+public class BizBusinessOutsourceProtocolController extends GeneralApprovalController<BizBusinessOutsourceProtocol, BizBusinessOutsourceProtocol, OutsourceProtocolApprovalListRequest, BaseApprovalSubmitRequest> {
+    @Autowired
+    private IBizBusinessOutsourceProtocolService outsourceProtocolService;
+
+    public BizBusinessOutsourceProtocolController(IGeneralApprovalService<BizBusinessOutsourceProtocol, BizBusinessOutsourceProtocol, OutsourceProtocolApprovalListRequest, BaseApprovalSubmitRequest> baseApprovalService) {
+        super(baseApprovalService);
+    }
+
+    @ApiOperation("草稿箱-保存")
+    @PostMapping("/save")
+    public ReturnDTO<OutsourceProtocolSaveResponse> saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceProtocol request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        return outsourceProtocolService.saveOutsourceProtocol(request);
+    }
+
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody OutsourceProtocolApprovalListRequest request) throws Exception {
+        List<BizBusinessOutsourceProtocol> list = super.exportList(request);
+        super.exportExcel(BizBusinessOutsourceProtocol.class, list, ExportEnum.OUTSOURCE_PROTOCOL.getSheetName());
+    }
+}
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java
index 097f645..f0f0943 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java
@@ -17,7 +17,6 @@
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.IGeneralApprovalService;
 import com.casic.missiles.service.business.IBizBusinessOutsourcerInfoService;
-import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -71,19 +70,8 @@
 
     @ApiOperation("分包方导出")
     @PostMapping("/listExport")
-    public void export(@RequestBody @Valid OutsourcerInfoApprovalListRequest request, BindingResult bindingResult) throws Exception {
-        if (bindingResult.hasErrors()) {
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        }
-        List<BizBusinessOutsourcerInfo> list;
-        if (!CollectionUtils.isEmpty(request.getIds())) {
-            list = outsourcerInfoService.listByIds(request.getIds());
-        } else {
-            list = outsourcerInfoService.list(request);
-        }
-        for (BizBusinessOutsourcerInfo record : list) {
-            DictCodeUtils.convertDictCodeToName(record);
-        }
+    public void export(@RequestBody OutsourcerInfoApprovalListRequest request) throws Exception {
+        List<BizBusinessOutsourcerInfo> list = super.exportList(request);
         super.exportExcel(BizBusinessOutsourcerInfo.class, list, ExportEnum.OUTSOURCER_EXPORT.getSheetName());
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java
index c2cbf9f..0410918 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java
@@ -17,11 +17,9 @@
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.IGeneralApprovalService;
 import com.casic.missiles.service.business.IBizBusinessSiteExecutiveInfoService;
-import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -60,7 +58,7 @@
         return siteExecutiveInfoService.saveSiteExecutiveInfo(siteExecutiveInfo);
     }
 
-    @ApiOperation("现场检测详情")
+    @ApiOperation("详情")
     @PostMapping("/detail")
     public ReturnDTO<SiteExecutiveDetailResponse> siteExecutiveDetail(@RequestBody @Valid IdDTO idDTO) throws Exception {
         Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
@@ -69,21 +67,10 @@
         return ReturnUtil.success(siteExecutiveInfoService.detail(idDTO.getId()));
     }
 
-    @ApiOperation("现场检测导出")
+    @ApiOperation("导出")
     @PostMapping("/listExport")
-    public void export(@RequestBody @Valid SiteExecutiveApprovalListRequest request, BindingResult bindingResult) throws Exception {
-        if (bindingResult.hasErrors()) {
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        }
-        List<SiteExecutiveApprovalListResponse> list;
-        if (!CollectionUtils.isEmpty(request.getIds())) {
-            list = siteExecutiveInfoService.listInfoByIds(request.getIds());
-        } else {
-            list = siteExecutiveInfoService.listInfo(request);
-        }
-        for (SiteExecutiveApprovalListResponse record : list) {
-            DictCodeUtils.convertDictCodeToName(record);
-        }
+    public void export(@RequestBody SiteExecutiveApprovalListRequest request) throws Exception {
+        List<SiteExecutiveApprovalListResponse> list = super.exportList(request);
         super.exportExcel(SiteExecutiveApprovalListResponse.class, list, ExportEnum.SITE_EXECUTIVE_EXPORT.getSheetName());
     }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
index 7e793cd..a92e209 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
@@ -55,7 +55,7 @@
 
     @ApiOperation("设备收发列表导出")
     @PostMapping("/export")
-    public void exportList(@RequestBody @Valid SampleDispatchListRequest request) throws IOException {
+    public void exportList(@RequestBody SampleDispatchListRequest request) throws IOException {
         List<SampleDispatchListResponse> list;
         if (!CollectionUtils.isEmpty(request.getIds())) {
             list = dispatchService.listByIds(request.getIds());
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java
index cdc77fc..d120fd4 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java
@@ -7,6 +7,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.business.labExecutive.*;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.business.IBusinessLabExecutiveInfoService;
@@ -14,6 +15,7 @@
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.*;
 
@@ -32,7 +34,7 @@
     @Autowired
     private IBusinessLabExecutiveInfoService labExecutiveInfoService;
 
-    @ApiOperation("实验室检测-部门检测-查询各状态列表（待检测、检测中、检测完）")
+    @ApiOperation("实验室任务-查询各状态列表（待检测、检测中、检测完）")
     @PostMapping("/deptExecutive/List")
     public ReturnDTO<PageInfoBT<SampleLabExecutiveListResponse>> queryDeptExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
@@ -43,10 +45,19 @@
         return ReturnUtil.success(super.packForBT(labExecutiveInfoService.deptLabExecutiveListPage(page, labExecutiveListRequest)));
     }
 
-    /**
-     * 实验室检测-我的检测-查询各状态列表（待检测、检测中、检测完）
-     */
-    @ApiOperation("实验室检测-我的检测-查询各状态列表（待检测、检测中、检测完）")
+    @ApiOperation("实验室任务导出")
+    @PostMapping("/deptExecutive/export")
+    public void deptExportList(@RequestBody @Valid SampleLabExecutiveListRequest request) throws Exception {
+        List<SampleLabExecutiveListResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = labExecutiveInfoService.deptLabExecutiveListByIds(request.getMeasureStatus(), request.getIds());
+        } else {
+            list = labExecutiveInfoService.deptLabExecutiveList(request);
+        }
+        super.exportExcel(SampleLabExecutiveListResponse.class, list, ExportEnum.DEPT_EXECUTIVE_TASK.getSheetName());
+    }
+
+    @ApiOperation("我的任务-查询各状态列表（待检测、检测中、检测完）")
     @PostMapping("/myExecutive/list")
     public ReturnDTO<PageInfoBT<SampleLabExecutiveListResponse>> queryMyExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
@@ -57,19 +68,25 @@
         return ReturnUtil.success(super.packForBT(labExecutiveInfoService.myLabExecutiveListPage(page, labExecutiveListRequest)));
     }
 
-    /**
-     * 实验室检测-我的检测-查询各状态样品数量（待检测、检测中、检测完）
-     */
-    @ApiOperation("实验室检测-我的检测-查询各状态样品数量（待检测、检测中、检测完）")
+    @ApiOperation("我的任务导出")
+    @PostMapping("/myExecutive/export")
+    public void exportList(@RequestBody @Valid SampleLabExecutiveListRequest request) throws Exception {
+        List<SampleLabExecutiveListResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = labExecutiveInfoService.myLabExecutiveListByIds(request.getMeasureStatus(), request.getIds());
+        } else {
+            list = labExecutiveInfoService.myLabExecutiveList(request);
+        }
+        super.exportExcel(SampleLabExecutiveListResponse.class, list, ExportEnum.MY_EXECUTIVE_TASK.getSheetName());
+    }
+
+    @ApiOperation("我的任务-查询各状态样品数量（待检测、检测中、检测完）")
     @GetMapping("/myExecutive/amount")
     public ReturnDTO<List<SampleAmountResponse>> queryMyExecutiveAmount() {
         return ReturnUtil.success(labExecutiveInfoService.myExecutiveAmount());
     }
 
-    /**
-     * 实验室检测-部门检测-分配（分配给具体人员）
-     */
-    @ApiOperation("实验室检测-部门检测-分配按钮（分配给具体人员）")
+    @ApiOperation("实验室任务-分配按钮（分配给具体人员）")
     @PostMapping("/deptExecutive/allocate")
     public ReturnDTO allocateStaff(@RequestBody @Valid SampleAllocateRequest sampleAllocateRequest, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -78,10 +95,7 @@
         return labExecutiveInfoService.allocateStaff(sampleAllocateRequest);
     }
 
-    /**
-     * 实验室检测-我的检测-检定人扫描收入（待检测->检测中）
-     */
-    @ApiOperation("实验室检测-我的检测-检定人扫描收入（待检测->检测中）")
+    @ApiOperation("我的任务-检定人扫描收入（待检测->检测中）")
     @PostMapping("/myExecutive/receive")
     public ReturnDTO sampleReceive(@RequestBody @Valid List<SampleOperateRequest> requestList, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -90,10 +104,7 @@
         return labExecutiveInfoService.sampleReceive(requestList);
     }
 
-    /**
-     * 实验室检测-负责人/检定人扫描检完（检测中->检测完）
-     */
-    @ApiOperation("实验室检测-负责人/检定人扫描检完（检测中->检测完）")
+    @ApiOperation("实验室任务-负责人/检定人扫描检完（检测中->检测完）")
     @PostMapping("/myExecutive/complete")
     public ReturnDTO sampleExecutiveComplete(@RequestBody @Valid List<SampleOperateRequest> requestList, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -102,10 +113,7 @@
         return labExecutiveInfoService.sampleExecutiveComplete(requestList);
     }
 
-    /**
-     * 实验室检测-部门检测/我的检测 编辑（只能修改应出具证书）
-     */
-    @ApiOperation("实验室检测-部门检测/我的检测 编辑（只能修改应出具证书）")
+    @ApiOperation("实验室任务/我的任务 编辑（只能修改应出具证书）")
     @PostMapping("/executive/update")
     public ReturnDTO updateExecutive(@RequestBody @Valid UpdateExecutiveRequest request, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -114,10 +122,7 @@
         return labExecutiveInfoService.updateExecutive(request);
     }
 
-    /**
-     * 实验室检测-部门检测/我的检测 详情
-     */
-    @ApiOperation("实验室检测-部门检测/我的检测 详情")
+    @ApiOperation("实验室任务/我的任务 详情")
     @PostMapping("/executive/detail")
     public ReturnDTO<ExecutiveDetailResponse> executiveDetail(@RequestBody @Valid ExecutiveDetailRequest request, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
@@ -131,7 +136,7 @@
      * 退回后会将下一个要执行的实验室检测状态更新为待分配，将后面的实验室顺序变更为连续（都进行减1）
      * 最后一个检测的实验室退回，等分发员再增加实验室或设备收发中的已收入直接手动点击完成
      */
-    @ApiOperation("实验室检测-部门检测/我的检测 退回（待检测/检测中->退回）")
+    @ApiOperation("实验室任务/我的任务 退回（待检测/检测中->退回）")
     @PostMapping("/executive/sendBack")
     public ReturnDTO executiveSendBack(@RequestBody @Valid ExecutiveSendBackRequest request, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -140,9 +145,6 @@
         return labExecutiveInfoService.sampleExecutiveSendBack(request);
     }
 
-    /**
-     * 分发员编辑实验室检测列表
-     */
     @ApiOperation("分发员编辑实验室检测列表")
     @PostMapping("/handOut/updateList")
     public ReturnDTO updateExecutiveList(@RequestBody @Valid UpdateExecutiveListRequest request, BindingResult bindingResult) {
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java
index 48a67ed..0c04f31 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java
@@ -10,6 +10,7 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.resource.customer.CustomerApprovalListRequest;
 import com.casic.missiles.dto.resource.customer.CustomerSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceCustomerInfo;
@@ -26,6 +27,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -55,6 +57,13 @@
         return customerInfoService.saveCustomerInfo(request);
     }
 
+    @ApiOperation("委托方名录导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody CustomerApprovalListRequest request) throws Exception {
+        List<BizResourceCustomerInfo> list = super.exportList(request);
+        super.exportExcel(BizResourceCustomerInfo.class, list, ExportEnum.CUSTOMER_INFO.getSheetName());
+    }
+
     @ApiOperation("委托方人员列表（分页）")
     @PostMapping("/person/listPage")
     public ReturnDTO<PageInfoBT<BizResourceCustomerStaff>> personListPage(@RequestBody IdDTO idDto) {
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
index 972ed4b..6418ea5 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
@@ -5,6 +5,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.resource.customer.SuggestFormApprovalListRequest;
 import com.casic.missiles.dto.resource.customer.SuggestFormSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceCustomerSuggestForm;
@@ -20,6 +21,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -50,4 +52,11 @@
         return suggestFormService.saveSuggestForm(request);
     }
 
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody SuggestFormApprovalListRequest request) throws Exception {
+        List<BizResourceCustomerSuggestForm> list = super.exportList(request);
+        super.exportExcel(BizResourceCustomerSuggestForm.class, list, ExportEnum.CUSTOMER_SUGGEST_FORM.getSheetName());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java
index 1934d1a..9e07eab 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java
@@ -15,12 +15,16 @@
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.resource.IEnvEnvironmentRecordConfigService;
 import com.casic.missiles.service.resource.IEnvEnvironmentRecordDataService;
+import com.casic.missiles.service.resource.IEnvLocationInfoService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
 import java.util.List;
@@ -39,6 +43,8 @@
     private IEnvEnvironmentRecordDataService environmentRecordDataService;
     @Autowired
     private IEnvEnvironmentRecordConfigService environmentRecordConfigService;
+    @Autowired
+    private IEnvLocationInfoService locationInfoService;
 
     @ApiOperation("环境记录单数据列表/详情")
     @PostMapping("/data/listPage")
@@ -95,4 +101,11 @@
         });
         return environmentRecordConfigService.deleteEnvironmentRecordConfig(idDTO.getId());
     }
+
+    @ApiOperation("地点列表")
+    @PostMapping("/location/listPage")
+    public ReturnDTO<PageInfoBT<LocationListResponse>> locationListPage(@RequestBody @Valid LocationListRequest request) {
+        Page<LocationListResponse> page = PageFactory.defaultPage();
+        return ReturnUtil.success(super.packForBT(locationInfoService.listPage(page, request)));
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java
index 82efe3f..e9561fa 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java
@@ -10,6 +10,7 @@
 import com.casic.missiles.dto.resource.seal.SealLogListRequest;
 import com.casic.missiles.dto.resource.seal.SealNoteApprovalListRequest;
 import com.casic.missiles.dto.resource.seal.SealNoteSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceSealUseLog;
@@ -27,6 +28,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -58,6 +60,13 @@
         return sealUseNoteService.saveSeal(request);
     }
 
+    @ApiOperation("印章使用登记导出（列表和导出中去掉经办人和监印人）")
+    @PostMapping("/listExport")
+    public void export(@RequestBody SealNoteApprovalListRequest request) throws Exception {
+        List<BizResourceSealUseNote> list = super.exportList(request);
+        super.exportExcel(BizResourceSealUseNote.class, list, ExportEnum.SEAL_NOTE.getSheetName());
+    }
+
     // TODO: 2023/7/28 印章使用日志：系统中使用印章时插入数据库
 
     @ApiOperation("印章使用日志列表（分页）")
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java
index 9b674fc..06b6521 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java
@@ -9,16 +9,20 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.resource.staff.StaffCertRequest;
 import com.casic.missiles.dto.resource.staff.StaffCertResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.service.resource.IBizResourceStaffInfoService;
 import com.casic.missiles.service.resource.IBizResourceStaffVerifierService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.List;
+
 /**
  * @Description:
  * @Author: wangpeng
@@ -41,9 +45,21 @@
         return ReturnUtil.success(super.packForBT(responsePage));
     }
 
+    @ApiOperation("证书逾期提醒导出")
+    @PostMapping("/listExport")
+    public void exportList(@RequestBody StaffCertRequest request) throws Exception {
+        List<StaffCertResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = staffInfoService.certListByIds(request.getIds());
+        } else {
+            list = staffInfoService.certList(request);
+        }
+        super.exportExcel(StaffCertResponse.class, list, ExportEnum.STAFF_CERTIFICATE_EXPIRE.getSheetName());
+    }
+
     @ApiOperation("证书逾期提醒")
     @PostMapping("/expirationReminder")
-    public ReturnDTO expirationReminder(@RequestBody IdDTO idDto) {
-        return verifierService.expirationReminder(idDto);
+    public ReturnDTO expirationReminder(@RequestBody IdDTO idDTO) {
+        return verifierService.expirationReminder(idDTO);
     }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java
index 3b251ad..a6e7850 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java
@@ -12,6 +12,7 @@
 import com.casic.missiles.dto.resource.staff.StaffListRequest;
 import com.casic.missiles.dto.resource.staff.TrainListRequest;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.*;
@@ -22,7 +23,10 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
 import java.util.List;
@@ -52,8 +56,19 @@
             throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
         }
         Page<BizResourceStaffInfo> page = PageFactory.defaultPage();
-        Page<BizResourceStaffInfo> responsePage = staffInfoService.listPage(page, request);
-        return ReturnUtil.success(super.packForBT(responsePage));
+        return ReturnUtil.success(super.packForBT(staffInfoService.listPage(page, request)));
+    }
+
+    @ApiOperation("人员登记导出")
+    @PostMapping("/listExport")
+    public void exportList(@RequestBody StaffListRequest request) throws Exception {
+        List<BizResourceStaffInfo> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = staffInfoService.listByIds(request.getIds());
+        } else {
+            list = staffInfoService.list(request);
+        }
+        super.exportExcel(BizResourceStaffInfo.class, list, ExportEnum.STAFF_INFO.getSheetName());
     }
 
     @ApiOperation("人员登记详情基础信息")
@@ -85,9 +100,9 @@
 
     @ApiOperation("科研教育列表（分页）")
     @PostMapping("/education/listPage")
-    public ReturnDTO<PageInfoBT<BizResourceStaffEducation>> educationListPage(@RequestBody IdDTO idDto) {
+    public ReturnDTO<PageInfoBT<BizResourceStaffEducation>> educationListPage(@RequestBody IdDTO idDTO) {
         Page<BizResourceStaffEducation> page = PageFactory.defaultPage();
-        Page<BizResourceStaffEducation> responsePage = staffInfoService.educationListPage(page, idDto);
+        Page<BizResourceStaffEducation> responsePage = staffInfoService.educationListPage(page, idDTO);
         return ReturnUtil.success(super.packForBT(responsePage));
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java
index af6aa86..d85d84a 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java
@@ -9,6 +9,7 @@
 import com.casic.missiles.dto.resource.outsideService.SupplierApprovalListRequest;
 import com.casic.missiles.dto.resource.outsideService.SupplierSaveResponse;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceSupplierAbility;
@@ -67,6 +68,13 @@
         return ReturnUtil.success(supplierInfoService.detail(idDTO.getId()));
     }
 
+    @ApiOperation("合格供方导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody SupplierApprovalListRequest request) throws Exception {
+        List<BizResourceSupplierInfo> list = super.exportList(request);
+        super.exportExcel(BizResourceSupplierInfo.class, list, ExportEnum.SUPPLIER_INFO.getSheetName());
+    }
+
     @ApiOperation("供方人员列表（分页）")
     @PostMapping("/person/listPage")
     public ReturnDTO<PageInfoBT<BizResourceSupplierPerson>> personListPage(@RequestBody IdDTO idDTO) {
diff --git a/casic-metering-api/src/main/resources/config/application.yml b/casic-metering-api/src/main/resources/config/application.yml
index 350db5f..ecff521 100644
--- a/casic-metering-api/src/main/resources/config/application.yml
+++ b/casic-metering-api/src/main/resources/config/application.yml
@@ -126,7 +126,7 @@
     #作者
     author: wangpeng
     #待生成对象表名
-    table-name: biz_equipment_technical_target_approval,biz_equipment_attachment_approval,biz_equipment_checkpoint_approval
+    table-name: biz_business_outsource_protocol
 
 reminder:
   #节点--common模块config包 ReminderNodeConfig配置
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
index 4a19e4e..d47d552 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
@@ -53,6 +53,7 @@
     SUGGEST_FORM_SAVE_FAILED(2509, "委托方意见登记表保存至草稿箱失败"),
     EXAMINE_FORM_SAVE_FAILED(2510, "要求、委托书及合同评审表保存至草稿箱失败"),
     CUSTOMER_EXIST_SAVE_FAILED(2511, "该委托方已存在，请重新选择"),
+    DUPLICATE_LOCATION_NO(2512, "地点编号已存在"),
 
     /**
      * 计量检定业务模块
@@ -68,6 +69,8 @@
     COMPLETE_SAMPLE_NOT_EXIST(2609, "检测中不存在扫描收入的样品"),
     CANNOT_CHANGE_MEASURE_INFO(2610, "无法更改非当前登录用户的检测信息"),
     NON_EXIST_ORDER_OR_SAMPLE(2611, "不存在该委托单或该委托单下的样品"),
+    OUTSOURCE_ACCESS_SAVE_FAILED(2612, "测试、校准或检定工作分包评审表保存至草稿箱失败"),
+    OUTSOURCE_PROTOCOL_SAVE_FAILED(2613, "测试、校准或检定工作分包协议书保存至草稿箱失败"),
 
     /**
      * 历史遗留备用
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
index 5089ad1..81a406b 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
@@ -10,54 +10,38 @@
     /**
      * 资源管理
      */
-    ENVIRONMENT_DATA_EXPORT("environmentData", "environmentData", "环境记录单数据"),
+    ENVIRONMENT_DATA_EXPORT("environmentData", "环境记录单数据", "环境记录单数据"),
+    STAFF_INFO("staffInfo", "人员登记", "人员登记"),
+    STAFF_CERTIFICATE_EXPIRE("certificateExpire", "证书逾期提醒", "证书逾期提醒"),
+    SUPPLIER_INFO("supplierInfo", "合格供方名录", "合格供方名录"),
+    CUSTOMER_INFO("customerInfo", "委托方名录", "委托方名录"),
+    CUSTOMER_SUGGEST_FORM("customerSuggestForm", "委托方意见登记表", "委托方意见登记表"),
+    SEAL_NOTE("sealNote", "印章使用登记", "印章使用登记"),
 
-    FILE_EXPORT("meterFileData", "meterFileData", "计量文件信息"),
-    TRAIN_PLAN_EXPORT("trainPlanData", "trainPlanData", "培训计划"),
-    TRAIN_LOG_EXPORT("trainLogData", "trainLogData", "培训记录"),
-    METER_ORGANIZE_EXPORT("meterOrganizeData", "meterOrganizeData", "计量组织"),
-    TRACE_SUPPLIER_EXPORT("traceSupplierData", "traceSupplierData", "溯源供方"),
-    SIGN_EXPORT("signData", "signData", "签名/签章"),
-    TEMPLATE_EXPORT("templateData", "templateData", "原始记录模板/证书报告模板"),
-    FIXED_ASSETS("meterFixedAssets", "meterFixedAssets", "固定资产"),
-    METER_EQUIPMENT("meterEquipment", "meterEquipment", "测量设备"),
-    CALIBRATION_TEST_EQUIPMENT("calibrationTestEquipment", "calibrationTestEquipment", "校准检定设备"),
-    MEASURE_ACCOUNT("measureAccount", "measureAccount", "测量工装"),
-    STANDARD_SUPPORT_EQUIPMENT("standardSupportEquipment", "standardSupportEquipment", "标准配套设备"),
-    STANDARD_EQUIPMENT("standardEquipment", "standardEquipment", "标准装置"),
-    FLOW_DEF_EXPORT("flowDefData", "flowDefData", "流程定义"),
-    STAFF_CERTIFICATE("certificate", "certificate", "计量人员证书"),
-    CHECK_INFO("checkInfo", "checkInfo", "设备管理点检测"),
-    EQUIPMENT_APPLY("equipmentApply", "equipmentApply", "设备借用"),
-    STANDARD_EQUIPMENT_REMIND("equipmentApplyRemind", "equipmentApplyRemind", "标准装置到期提醒"),
-    METER_PRICE("meterPrice", "meterPrice", "价格库"),
-    METER_STAFF("meterStaff", "meterStaff", "计量人员"),
-    STANDARD_EQUIPMENT_APPLY("standardEquipmentApply", "standardEquipmentApply", "标准装置申请"),
-    STATE_MANAGE_APPLY("stateManage", "stateManage", "状态管理"),
-    METER_ACCEPTANCE_CHECK("acceptanceCheck", "acceptanceCheck", "设备检修保养验收单"),
-    CUSTOMER_EXPORT("customerData", "customerData", "客户信息"),
-    ORDER_EXPORT("orderData", "orderData", "委托书信息"),
-    SAMPLE_EXPORT("sampleData", "sampleData", "样本信息"),
-    EXCHANGE_DATA("exchangeData", "exchangeData", "设备交接单"),
-    DISPATCH_DATA("dispatchData", "dispatchData", "设备收发"),
-    ENVIRONMENT_DATA("environmentData", "environmentData", "环境记录单"),
-    ORIGIN_DATA("originData", "originData", "原始记录"),
-    CERTIFICATE_REPORT("certificateReport", "certificateReport", "证书报告"),
-    ADVICE_EXPORT("adviceData", "adviceData", "客户反馈"),
-    HANDOUT_EXPORT("handoutData", "handoutData", "任务分发列表"),
-    OUTSOURCER_EXPORT("outsourcerData", "outsourcerData", "分包方"),
-    SITE_EXECUTIVE_EXPORT("siteExecutiveData", "siteExecutiveData", "现场测试、校准或检定"),
-    CERTIFICATE_PRINT_EXPORT("certificatePrintData", "certificatePrintData", "证书打印"),
-    DOWNLOAD_TEMPLATE("downloadTemplate", "downloadTemplate", "页面配置"),
-    OUTSOURCER_CERTIFICATE_EXPORT("outsourceCertificateData", "outsourceCertificateData", "分包证书"),
-    SETTLEMENT_INFO_EXPORT("settlementInfoData", "settlementInfoData", "业务结算"),
-    EQUIPMENT_REMIND("equipmentRemind", "equipmentRemind", "设备到期提醒"),
-    AGREEMENT_INFO_EXPORT("agreementInfoData", "agreementInfoData", "合同"),
-    WORK_STATISTICS_EXPORT("workStatisticsData", "workStatisticsData", "实时工作统计"),
-    DEPT_OUTPUT_EXPORT("deptOutputData", "deptOutputData", "部门产值分析"),
-    WORKLOAD_EXPORT("workloadData", "workloadData", "业务工作量分析"),
-    DEPT_COMPREHENSIVE_EXPORT("deptComprehensiveData", "deptComprehensiveData", "部门综合分析"),
-    ENVIRONMENTAL_RECORD("environmentalRecordData", "environmentalRecordData", "现场环境记录");
+    /**
+     * 计量检定业务
+     */
+    OUTSOURCER_EXPORT("outsourcerData", "分包方名录", "分包方名录"),
+    IDENTIFY_EXPORT("identifyData", "计量标识", "计量标识"),
+    ORDER_EXPORT("orderData", "任务单", "任务单"),
+    DISPATCH_DATA("dispatchData", "设备收发", "设备收发"),
+    HANDOUT_EXPORT("handoutData", "任务分发", "任务分发"),
+    SITE_EXECUTIVE_EXPORT("siteExecutiveData", "现场测试、校准或检定", "现场测试、校准或检定"),
+    CERTIFICATE_REPORT("certificateReport", "证书审批", "证书审批"),
+    CERTIFICATE_CHANGE_APPLY("certificateChangeApply", "证书报告补充或更换申请单", "证书报告补充或更换申请单"),
+    CERTIFICATE_PRINT("certificatePrintData", "证书打印审批", "证书打印审批"),
+    DEPT_EXECUTIVE_TASK("deptExecutiveTaskData", "实验室任务", "实验室任务"),
+    MY_EXECUTIVE_TASK("myExecutiveTaskData", "我的任务", "我的任务"),
+    OUTSOURCE_ASSESS("outsourceAssess", "测试、校准或检定工作分包评审表", "测试、校准或检定工作分包评审表"),
+    OUTSOURCE_PROTOCOL("outsourceProtocol", "测试、校准或检定工作分包协议书", "测试、校准或检定工作分包协议书"),
+
+    /**
+     * 系统管理
+     */
+    SIGN_EXPORT("signData", "签名", "签名"),
+    TEMPLATE_EXPORT("templateData", "文件模板", "文件模板"),
+    FLOW_DEF_EXPORT("flowDefData", "流程定义", "流程定义"),
+    DOWNLOAD_TEMPLATE("downloadTemplate", "流程定义", "页面配置");
 
     ExportEnum(String fileName, String sheetName, String description) {
         this.fileName = fileName;
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateRecordTypeCodeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateRecordTypeCodeEnum.java
index 31d913c..a963522 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateRecordTypeCodeEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateRecordTypeCodeEnum.java
@@ -46,4 +46,14 @@
     String SITE_EXECUTIVE_APPROVAL = "01";
     //《现场测试、校准或检定工作记录表》
     String SITE_EXECUTIVE_LOG = "02";
+
+    //测试、校准或检定工作分包协议书
+    String OUTSOURCE_PROTOCOL = "01";
+    //测试、校准或检定工作分包评审表
+    String OUTSOURCE_ACCESS = "02";
+    //测试、校准或检定工作分包通知书
+    String OUTSOURCE_NOTICE = "03";
+    //测试、校准或检定工作分包方名录
+    String OUTSOURCE_INFO = "04";
+
 }
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
index 24b8635..f78bd53 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
@@ -15,6 +15,10 @@
     String CERTIFICATE_CHANGE_APPLY_BEAN_NAME = "certificateChangeApplyBean";
     //现场测试、校准或检定
     String SITE_EXECUTIVE_BEAN_NAME = "siteExecutiveBean";
+    //测试、校准或检定工作分包评审表
+    String OUTSOURCE_ASSESS_BEAN_NAME = "outsourceAssessBean";
+    //测试、校准或检定工作分包协议书
+    String OUTSOURCE_PROTOCOL_BEAN_NAME = "outsourceProtocolBean";
 
     /*********************************设备与装置************************************/
     //设备台账
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 b21c661..6b86fd1 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
@@ -18,6 +18,8 @@
     OUTSOURCER_APPROVAL(OUTSOURCER_BEAN_NAME, ""),
     CERTIFICATE_CHANGE_APPROVAL(CERTIFICATE_CHANGE_APPLY_BEAN_NAME, ""),
     SITE_EXECUTIVE_APPROVAL(SITE_EXECUTIVE_BEAN_NAME, ""),
+    OUTSOURCE_ASSESS_APPROVAL(OUTSOURCE_ASSESS_BEAN_NAME, ""),
+    OUTSOURCE_PROTOCOL_APPROVAL(OUTSOURCE_PROTOCOL_BEAN_NAME, ""),
 
     ACTION_STATUS_MAP(new HashMap<String, AwareActionStatusEnum>() {
         {
@@ -47,6 +49,10 @@
             put(ApplyFromIdEnum.CERTIFICATE_CHANGE_APPROVAL.getCode(), CERTIFICATE_CHANGE_APPROVAL);
             //现场测试、校准或检定审批
             put(ApplyFromIdEnum.SITE_EXECUTIVE_APPROVAL.getCode(), SITE_EXECUTIVE_APPROVAL);
+            //测试、校准或检定工作分包评审表
+            put(ApplyFromIdEnum.OUTSOURCE_ASSESS_APPROVAL.getCode(), OUTSOURCE_ASSESS_APPROVAL);
+            //测试、校准或检定工作分包协议书
+            put(ApplyFromIdEnum.OUTSOURCE_PROTOCOL_APPROVAL.getCode(), OUTSOURCE_PROTOCOL_APPROVAL);
         }
     });
     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 934405e..c7410bd 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
@@ -9,6 +9,8 @@
     CERTIFICATE_CHANGE_APPROVAL("jljdywzsbchghsqd", MessageSourceModuleEnum.BUSINESS.getCode(), "证书/报告补充或更换申请单"),
     OUTSOURCER_APPROVAL("jljdywcsjzhgfbfml", MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定合格分包方名录"),
     SITE_EXECUTIVE_APPROVAL("jljdywxccsjzsp", MessageSourceModuleEnum.BUSINESS.getCode(), "现场测试、校准或检定审批"),
+    OUTSOURCE_ASSESS_APPROVAL("jljdywcsjzfbpsb", MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包评审表"),
+    OUTSOURCE_PROTOCOL_APPROVAL("jljdywcsjzfbxys", MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包协议书"),
 
 
     /*******************************************设备与装置*********************************************/
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/GeneralApprovalMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/GeneralApprovalMapper.java
index 4fb7344..0c9d6ae 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/GeneralApprovalMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/GeneralApprovalMapper.java
@@ -17,8 +17,4 @@
 
     Page<O> selectBatchForApprovalList(Page<O> page, @Param("request") R request, @Param("businessKeys") List<String> businessKeys);
 
-//    Page<O> selectListPage(Page<O> page, @Param("request") R request);
-
-//    Long selectMaxNo();
-
 }
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceAssessMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceAssessMapper.java
index 7867bb8..ba59009 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceAssessMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceAssessMapper.java
@@ -1,7 +1,12 @@
 package com.casic.missiles.mapper.business;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.business.outsource.OutsourceAssessApprovalListRequest;
+import com.casic.missiles.mapper.GeneralApprovalMapper;
 import com.casic.missiles.model.business.BizBusinessOutsourceAssess;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * <p>
@@ -11,6 +16,10 @@
  * @author wangpeng
  * @since 2023-08-16
  */
-public interface BizBusinessOutsourceAssessMapper extends BaseMapper<BizBusinessOutsourceAssess> {
+public interface BizBusinessOutsourceAssessMapper extends GeneralApprovalMapper<BizBusinessOutsourceAssess, BizBusinessOutsourceAssess, OutsourceAssessApprovalListRequest> {
+
+    Page<BizBusinessOutsourceAssess> selectBatchForApprovalList(Page<BizBusinessOutsourceAssess> page, @Param("request") OutsourceAssessApprovalListRequest request, @Param("businessKeys") List<String> businessKeys);
+
+    Long selectMaxProjectNo();
 
 }
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceProtocolMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceProtocolMapper.java
new file mode 100644
index 0000000..e6aba35
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceProtocolMapper.java
@@ -0,0 +1,24 @@
+package com.casic.missiles.mapper.business;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.business.outsource.OutsourceProtocolApprovalListRequest;
+import com.casic.missiles.mapper.GeneralApprovalMapper;
+import com.casic.missiles.model.business.BizBusinessOutsourceProtocol;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 计量检定业务-分包管理-测试、校准或检定工作分包协议书 Mapper 接口
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-08-24
+ */
+public interface BizBusinessOutsourceProtocolMapper extends GeneralApprovalMapper<BizBusinessOutsourceProtocol, BizBusinessOutsourceProtocol, OutsourceProtocolApprovalListRequest> {
+
+    Page<BizBusinessOutsourceProtocol> selectBatchForApprovalList(Page<BizBusinessOutsourceProtocol> page, @Param("request") OutsourceProtocolApprovalListRequest request, @Param("businessKeys") List<String> businessKeys);
+
+    Long selectMaxProtocolNo();
+}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/EnvLocationInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/EnvLocationInfoMapper.java
new file mode 100644
index 0000000..49eff87
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/EnvLocationInfoMapper.java
@@ -0,0 +1,21 @@
+package com.casic.missiles.mapper.resource;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.resource.environment.LocationListRequest;
+import com.casic.missiles.dto.resource.environment.LocationListResponse;
+import com.casic.missiles.model.resource.EnvLocationInfo;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * <p>
+ * 实验室环境监控系统-设备表 Mapper 接口
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-06-07
+ */
+public interface EnvLocationInfoMapper extends BaseMapper<EnvLocationInfo> {
+
+    Page<LocationListResponse> selectLocationListPage(Page<LocationListResponse> page, @Param("request") LocationListRequest request);
+}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java
index de124db..85ed0f7 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java
@@ -1,7 +1,9 @@
 package com.casic.missiles.mapper.system;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.dto.system.SignDetailResponse;
+import com.casic.missiles.dto.system.SignListRequest;
 import com.casic.missiles.model.system.SystemSign;
 import org.apache.ibatis.annotations.Param;
 
@@ -22,4 +24,8 @@
     SignDetailResponse selectSignDetailById(Long id);
 
     List<SystemSign> selectUsableSignList(@Param("userId") Long userId);
+
+    Page<SystemSign> selectSignListPage(Page<SystemSign> page, @Param("request") SignListRequest request);
+
+    List<SystemSign> selectSignList(@Param("request") SignListRequest request);
 }
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateChangeApplyMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateChangeApplyMapper.xml
index d798447..c496092 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateChangeApplyMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateChangeApplyMapper.xml
@@ -30,31 +30,31 @@
         SELECT *
         FROM biz_business_certificate_change_apply
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.changeApplyNo != null and request.changeApplyNo !=''">
+        <if test="request != null and request.changeApplyNo != null and request.changeApplyNo !=''">
             and change_apply_no like concat('%',#{request.changeApplyNo},'%')
         </if>
-        <if test="request.changeReportNo != null and request.changeReportNo !=''">
+        <if test="request != null and request.changeReportNo != null and request.changeReportNo !=''">
             and change_report_no like concat('%',#{request.changeReportNo},'%')
         </if>
-        <if test="request.changeReportName != null and request.changeReportName !=''">
+        <if test="request != null and request.changeReportName != null and request.changeReportName !=''">
             and change_report_name like concat('%',#{request.changeReportName},'%')
         </if>
-        <if test="request.changeType != null and request.changeType !=''">
+        <if test="request != null and request.changeType != null and request.changeType !=''">
             and change_type = #{request.changeType}
         </if>
-        <if test="request.createUserName != null and request.createUserName !=''">
+        <if test="request != null and request.createUserName != null and request.createUserName !=''">
             and create_user_name like concat('%',#{request.createUserName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificatePrintMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificatePrintMapper.xml
index b66cd99..49c0ac8 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificatePrintMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificatePrintMapper.xml
@@ -31,34 +31,34 @@
         LEFT JOIN biz_business_order_sample_relation bosr ON (bosr.order_id = bcr.order_id AND bosr.sample_id = bcr.sample_id)
         LEFT JOIN biz_business_order_info boi ON boi.id = bosr.order_id
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and bcp.approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.printStatus != null and request.printStatus !=''">
+        <if test="request != null and request.printStatus != null and request.printStatus !=''">
             and print_status = #{request.printStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and bcp.create_user_id = #{request.createUserId}
         </if>
-        <if test="request.certificateReportNo != null and request.certificateReportNo !=''">
+        <if test="request != null and request.certificateReportNo != null and request.certificateReportNo !=''">
             and bcr.certificate_report_no like concat('%',#{request.certificateReportNo},'%')
         </if>
-        <if test="request.certificateReportName != null and request.certificateReportName !=''">
+        <if test="request != null and request.certificateReportName != null and request.certificateReportName !=''">
             and bcr.certificate_report_name like concat('%',#{request.certificateReportName},'%')
         </if>
-        <if test="request.customerName != null and request.customerName !=''">
+        <if test="request != null and request.customerName != null and request.customerName !=''">
             and boi.customer_name like concat('%',#{request.customerName},'%')
         </if>
-        <if test="request.sampleNo != null and request.sampleNo !=''">
+        <if test="request != null and request.sampleNo != null and request.sampleNo !=''">
             and bosr.sample_no like concat('%',#{request.sampleNo},'%')
         </if>
-        <if test="request.sampleName != null and request.sampleName !=''">
+        <if test="request != null and request.sampleName != null and request.sampleName !=''">
             and bosr.sample_name like concat('%',#{request.sampleName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and bcp.create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and bcp.create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml
index b366034..767695d 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml
@@ -46,33 +46,37 @@
         SELECT bcr.*, bosr.sample_no, bosr.sample_name, bosr.sample_model, rsi.staff_name
         FROM biz_business_certificate_report bcr
         LEFT JOIN biz_business_order_sample_relation bosr ON (bosr.order_id = bcr.order_id AND bosr.sample_id = bcr.sample_id)
+        LEFT JOIN biz_business_order_info boi ON boi.id = bcr.order_id
         LEFT JOIN biz_resource_staff_info rsi ON rsi.id = bcr.measure_person_id
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and bcr.approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and bcr.create_user_id = #{request.createUserId}
         </if>
-        <if test="request.certificateReportNo != null and request.certificateReportNo !=''">
+        <if test="request != null and request.customerId != null and request.customerId !=''">
+            and boi.customer_id = #{request.customerId}
+        </if>
+        <if test="request != null and request.certificateReportNo != null and request.certificateReportNo !=''">
             and bcr.certificate_report_no like concat('%',#{request.certificateReportNo},'%')
         </if>
-        <if test="request.certificateReportName != null and request.certificateReportName !=''">
+        <if test="request != null and request.certificateReportName != null and request.certificateReportName !=''">
             and bcr.certificate_report_name like concat('%',#{request.certificateReportName},'%')
         </if>
-        <if test="request.sampleNo != null and request.sampleNo !=''">
+        <if test="request != null and request.sampleNo != null and request.sampleNo !=''">
             and bosr.sample_no like concat('%',#{request.sampleNo},'%')
         </if>
-        <if test="request.measureCategory != null and request.measureCategory !=''">
+        <if test="request != null and request.measureCategory != null and request.measureCategory !=''">
             and bcr.measure_category = #{request.measureCategory}
         </if>
-        <if test="request.measurePerson != null and request.measurePerson !=''">
+        <if test="request != null and request.measurePerson != null and request.measurePerson !=''">
             and rsi.staff_name like concat('%',#{request.measurePerson},'%')
         </if>
-        <if test="request.calibrationTimeStart != null and request.calibrationTimeStart !=''">
+        <if test="request != null and request.calibrationTimeStart != null and request.calibrationTimeStart !=''">
             and bcr.calibration_time &gt;= #{request.calibrationTimeStart}
         </if>
-        <if test="request.calibrationTimeEnd != null and request.calibrationTimeEnd !=''">
+        <if test="request != null and request.calibrationTimeEnd != null and request.calibrationTimeEnd !=''">
             and bcr.calibration_time &lt;= #{request.calibrationTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceAssessMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceAssessMapper.xml
index d0fcf8b..c22c101 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceAssessMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceAssessMapper.xml
@@ -7,6 +7,8 @@
         <id column="id" property="id" />
         <result column="project_no" property="projectNo" />
         <result column="project_name" property="projectName" />
+        <result column="lab_code" property="labCode" />
+        <result column="group_code" property="groupCode" />
         <result column="applicant_id" property="applicantId" />
         <result column="applicant_name" property="applicantName" />
         <result column="applicant_time" property="applicantTime" />
@@ -31,7 +33,45 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, project_no, project_name, applicant_id, applicant_name, applicant_time, minio_file_name, remark, create_user_id, create_user_name, outsourcer_id, pre_start_time, pre_end_time, outsource_reason, pre_cost, approval_status, process_id, approve_situation, traceability, test_method, technique_ability, create_time, update_time
+        id, project_no, project_name, lab_code, group_code, applicant_id, applicant_name, applicant_time, minio_file_name, remark, create_user_id, create_user_name, outsourcer_id, pre_start_time, pre_end_time, outsource_reason, pre_cost, approval_status, process_id, approve_situation, traceability, test_method, technique_ability, create_time, update_time
     </sql>
 
+    <select id="selectMaxProjectNo" resultType="java.lang.Long">
+        SELECT IFNULL(max(RIGHT(project_no, 3)), 0) from biz_business_outsource_assess
+    </select>
+
+    <select id="selectBatchForApprovalList" resultMap="BaseResultMap">
+        SELECT bboa.*, bboi.outsourcer_name, bboi.director
+        FROM biz_business_outsource_assess bboa
+        LEFT JOIN biz_business_outsourcer_info bboi ON bboa.outsourcer_id = bboi.id
+        WHERE 1=1
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
+            and bboa.approval_status = #{request.approvalStatus}
+        </if>
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
+            and bboa.create_user_id = #{request.createUserId}
+        </if>
+        <if test="request != null and request.projectNo != null and request.projectNo !=''">
+            and bboa.project_no like concat('%',#{request.projectNo},'%')
+        </if>
+        <if test="request != null and request.outsourcerName != null and request.outsourcerName !=''">
+            and bboi.outsourcer_name like concat('%',#{request.outsourcerName},'%')
+        </if>
+        <if test="request != null and request.applicantName != null and request.applicantName !=''">
+            and bboa.applicant_name like concat('%',#{request.applicantName},'%')
+        </if>
+        <if test="request != null and request.applicantTimeStart != null and request.applicantTimeStart !=''">
+            and bboa.applicant_time &gt;= #{request.applicantTimeStart}
+        </if>
+        <if test="request != null and request.applicantTimeEnd != null and request.applicantTimeEnd !=''">
+            and bboa.applicant_time &lt;= #{request.applicantTimeEnd}
+        </if>
+        <if test="businessKeys != null">
+            and bboa.id in
+            <foreach collection="businessKeys" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
+        ORDER BY bboa.create_time DESC
+    </select>
 </mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceProtocolMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceProtocolMapper.xml
new file mode 100644
index 0000000..b7b2149
--- /dev/null
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceProtocolMapper.xml
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.mapper.business.BizBusinessOutsourceProtocolMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.business.BizBusinessOutsourceProtocol">
+        <id column="id" property="id" />
+        <result column="protocol_no" property="protocolNo" />
+        <result column="project_name" property="projectName" />
+        <result column="lab_code" property="labCode" />
+        <result column="group_code" property="groupCode" />
+        <result column="outsourcer_id" property="outsourcerId" />
+        <result column="remark" property="remark" />
+        <result column="outsource_no" property="outsourceNo" />
+        <result column="outsource_name" property="outsourceName" />
+        <result column="contacts" property="contacts" />
+        <result column="mobile" property="mobile" />
+        <result column="address" property="address" />
+        <result column="require_date" property="requireDate" />
+        <result column="outsource_cost" property="outsourceCost" />
+        <result column="director" property="director" />
+        <result column="item" property="item" />
+        <result column="requires" property="requires" />
+        <result column="create_user_id" property="createUserId" />
+        <result column="create_user_name" property="createUserName" />
+        <result column="approval_status" property="approvalStatus" />
+        <result column="process_id" property="processId" />
+        <result column="create_time" property="createTime" />
+        <result column="update_time" property="updateTime" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, protocol_no, project_name, lab_code, group_code, outsourcer_id, remark, outsource_no, outsource_name, contacts, mobile, address, require_date, outsource_cost, director, item, requires, create_user_id, create_user_name, approval_status, process_id, create_time, update_time
+    </sql>
+
+    <select id="selectMaxProtocolNo" resultType="java.lang.Long">
+        SELECT IFNULL(max(RIGHT(protocol_no, 3)), 0) from biz_business_outsource_protocol
+    </select>
+
+    <select id="selectBatchForApprovalList" resultMap="BaseResultMap">
+        SELECT *
+        FROM biz_business_outsource_protocol
+        WHERE 1=1
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
+            and approval_status = #{request.approvalStatus}
+        </if>
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
+            and create_user_id = #{request.createUserId}
+        </if>
+        <if test="request != null and request.protocolNo != null and request.protocolNo !=''">
+            and protocol_no like concat('%',#{request.protocolNo},'%')
+        </if>
+        <if test="request != null and request.outsourcerName != null and request.outsourcerName !=''">
+            and outsourcer_name like concat('%',#{request.outsourcerName},'%')
+        </if>
+        <if test="request != null and request.applicantName != null and request.applicantName !=''">
+            and create_user_name like concat('%',#{request.applicantName},'%')
+        </if>
+        <if test="request != null and request.applicantTimeStart != null and request.applicantTimeStart !=''">
+            and create_time &gt;= #{request.applicantTimeStart}
+        </if>
+        <if test="request != null and request.applicantTimeEnd != null and request.applicantTimeEnd !=''">
+            and create_time &lt;= #{request.applicantTimeEnd}
+        </if>
+        <if test="businessKeys != null">
+            and id in
+            <foreach collection="businessKeys" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
+        ORDER BY create_time DESC
+    </select>
+</mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourcerInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourcerInfoMapper.xml
index 510a80b..3049b54 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourcerInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourcerInfoMapper.xml
@@ -7,6 +7,8 @@
         <id column="id" property="id" />
         <result column="outsourcer_no" property="outsourcerNo" />
         <result column="outsourcer_name" property="outsourcerName" />
+        <result column="lab_code" property="labCode" />
+        <result column="group_code" property="groupCode" />
         <result column="outsourcer_brief_name" property="outsourcerBriefName" />
         <result column="outsourcer_size" property="outsourcerSize" />
         <result column="business_size" property="businessSize" />
@@ -55,32 +57,32 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, outsourcer_no, outsourcer_name, outsourcer_brief_name, outsourcer_size, business_size, grade, evaluation, tax_number, bank_account, bank_name, bank_account_number, postal_code, director, phone, fax, mobile, email, website, address_country, address_province, address_city, address_area, full_address, address_country_name, address_province_name, address_city_name, address_area_name, invoice_country, invoice_province, invoice_city, invoice_area, invoice_full_address, invoice_country_name, invoice_province_name, invoice_city_name, invoice_area_name, business_scope, business_content, minio_file_name, approval_status, process_id, remark, create_user_id, create_user_name, create_time, update_time
+        id, outsourcer_no, outsourcer_name, lab_code, group_code, outsourcer_brief_name, outsourcer_size, business_size, grade, evaluation, tax_number, bank_account, bank_name, bank_account_number, postal_code, director, phone, fax, mobile, email, website, address_country, address_province, address_city, address_area, full_address, address_country_name, address_province_name, address_city_name, address_area_name, invoice_country, invoice_province, invoice_city, invoice_area, invoice_full_address, invoice_country_name, invoice_province_name, invoice_city_name, invoice_area_name, business_scope, business_content, minio_file_name, approval_status, process_id, remark, create_user_id, create_user_name, create_time, update_time
     </sql>
 
     <select id="selectBatchForApprovalList" resultMap="BaseResultMap">
         SELECT *
         FROM biz_business_outsourcer_info
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.outsourcerNo != null and request.outsourcerNo !=''">
+        <if test="request != null and request.outsourcerNo != null and request.outsourcerNo !=''">
             and outsourcer_no like concat('%',#{request.outsourcerNo},'%')
         </if>
-        <if test="request.outsourcerName != null and request.outsourcerName !=''">
+        <if test="request != null and request.outsourcerName != null and request.outsourcerName !=''">
             and outsourcer_name like concat('%',#{request.outsourcerName},'%')
         </if>
-        <if test="request.director != null and request.director !=''">
+        <if test="request != null and request.director != null and request.director !=''">
             and director like concat('%',#{request.director},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
@@ -93,6 +95,6 @@
     </select>
 
     <select id="selectMaxNo" resultType="java.lang.Long">
-        SELECT IFNULL(max(RIGHT(outsourcer_no, 12)), 0) from biz_business_outsourcer_info
+        SELECT IFNULL(max(RIGHT(outsourcer_no, 3)), 0) from biz_business_outsourcer_info
     </select>
 </mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessSiteExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessSiteExecutiveInfoMapper.xml
index 135c5d0..3c5ae79 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessSiteExecutiveInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessSiteExecutiveInfoMapper.xml
@@ -38,25 +38,25 @@
         FROM biz_business_site_executive_info bsei
         LEFT JOIN biz_resource_customer_info rci ON bsei.customer_id = rci.id
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and bsei.approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and bsei.create_user_id = #{request.createUserId}
         </if>
-        <if test="request.siteExecutiveNo != null and request.siteExecutiveNo !=''">
+        <if test="request != null and request.siteExecutiveNo != null and request.siteExecutiveNo !=''">
             and bsei.site_executive_no like concat('%',#{request.siteExecutiveNo},'%')
         </if>
-        <if test="request.customerName != null and request.customerName !=''">
+        <if test="request != null and request.customerName != null and request.customerName !=''">
             and rci.outsourcer_name like concat('%',#{request.customerName},'%')
         </if>
-        <if test="request.applyName != null and request.applyName !=''">
+        <if test="request != null and request.applyName != null and request.applyName !=''">
             and bsei.apply_name like concat('%',#{request.applyName},'%')
         </if>
-        <if test="request.applyTimeStart != null and request.applyTimeStart !=''">
+        <if test="request != null and request.applyTimeStart != null and request.applyTimeStart !=''">
             and bsei.apply_time &gt;= #{request.applyTimeStart}
         </if>
-        <if test="request.applyTimeEnd != null and request.applyTimeEnd !=''">
+        <if test="request != null and request.applyTimeEnd != null and request.applyTimeEnd !=''">
             and bsei.apply_time &lt;= #{request.applyTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml
index 84d9e2a..6bd38a9 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml
@@ -105,6 +105,12 @@
         <if test="request.isUrgent != null and request.isUrgent !=''">
             AND bo.is_urgent = #{request.isUrgent}
         </if>
+        <if test="request.ids != null">
+            and blei.id in
+            <foreach collection="request.ids" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
         ORDER BY blei.update_time DESC
     </select>
 
@@ -137,6 +143,12 @@
         <if test="request.isUrgent != null and request.isUrgent !=''">
             AND bo.is_urgent = #{request.isUrgent}
         </if>
+        <if test="request.ids != null">
+            and blei.id in
+            <foreach collection="request.ids" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
         ORDER BY blei.update_time DESC
     </select>
 
diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardInfoMapper.xml
index 1a5551b..2ed8d17 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardInfoMapper.xml
@@ -45,12 +45,6 @@
         FROM biz_equipment_standard_info besi
         LEFT JOIN biz_equipment_standard_technology_relation bestr ON besi.standard_no = bestr.standard_no
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
-            and besi.approval_status = #{request.approvalStatus}
-        </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
-            and besi.create_user_id = #{request.createUserId}
-        </if>
         <if test="request.standardName != null and request.standardName !=''">
             and besi.standard_name like concat('%',#{request.standardName},'%')
         </if>
diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardTechnologyRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardTechnologyRelationMapper.xml
index fc7e16c..cd03c8c 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardTechnologyRelationMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardTechnologyRelationMapper.xml
@@ -6,6 +6,7 @@
     <resultMap id="BaseResultMap" type="com.casic.missiles.model.equipment.BizEquipmentStandardTechnologyRelation">
         <id column="id" property="id" />
         <result column="technology_file_id" property="technologyFileId" />
+        <result column="technology_file_no" property="technologyFileNo" />
         <result column="technology_file_name" property="technologyFileName" />
         <result column="standard_id" property="standardId" />
         <result column="standard_no" property="standardNo" />
@@ -14,7 +15,7 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, technology_file_id, technology_file_name, standard_id, remark
+        id, technology_file_id, technology_file_no, technology_file_name, standard_id, remark
     </sql>
 
 </mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceAuthorizeOrderMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceAuthorizeOrderMapper.xml
index ac5176c..554fe65 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceAuthorizeOrderMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceAuthorizeOrderMapper.xml
@@ -32,22 +32,22 @@
         SELECT *
         FROM biz_resource_authorize_order
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.orderNo != null and request.orderNo !=''">
+        <if test="request != null and request.orderNo != null and request.orderNo !=''">
             and order_no like concat('%',#{request.orderNo},'%')
         </if>
-        <if test="request.createUserName != null and request.createUserName !=''">
+        <if test="request != null and request.createUserName != null and request.createUserName !=''">
             and create_user_name like concat('%',#{request.createUserName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerExamineFormMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerExamineFormMapper.xml
index ab242f6..af7f98f 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerExamineFormMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerExamineFormMapper.xml
@@ -41,28 +41,28 @@
         SELECT *
         FROM biz_resource_customer_examine_form
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.formNo != null and request.formNo !=''">
+        <if test="request != null and request.formNo != null and request.formNo !=''">
             and form_no like concat('%',#{request.formNo},'%')
         </if>
-        <if test="request.labCode != null and request.labCode !=''">
+        <if test="request != null and request.labCode != null and request.labCode !=''">
             and lab_code like concat('%',#{request.labCode},'%')
         </if>
-        <if test="request.groupCode != null and request.groupCode !=''">
+        <if test="request != null and request.groupCode != null and request.groupCode !=''">
             and group_code like concat('%',#{request.groupCode},'%')
         </if>
-        <if test="request.createUserName != null and request.createUserName !=''">
+        <if test="request != null and request.createUserName != null and request.createUserName !=''">
             and create_user_name like concat('%',#{request.createUserName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerInfoMapper.xml
index fa8ffbc..06a2798 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerInfoMapper.xml
@@ -33,25 +33,25 @@
         SELECT *
         FROM biz_resource_customer_info
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.customerNo != null and request.customerNo !=''">
+        <if test="request != null and request.customerNo != null and request.customerNo !=''">
             and customer_no like concat('%',#{request.customerNo},'%')
         </if>
-        <if test="request.customerName != null and request.customerName !=''">
+        <if test="request != null and request.customerName != null and request.customerName !=''">
             and customer_name like concat('%',#{request.customerName},'%')
         </if>
-        <if test="request.contacts != null and request.contacts !=''">
+        <if test="request != null and request.contacts != null and request.contacts !=''">
             and contacts like concat('%',#{request.contacts},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerSuggestFormMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerSuggestFormMapper.xml
index 28f5bb2..1806662 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerSuggestFormMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerSuggestFormMapper.xml
@@ -33,28 +33,28 @@
         SELECT *
         FROM biz_resource_customer_suggest_form
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.formNo != null and request.formNo !=''">
+        <if test="request != null and request.formNo != null and request.formNo !=''">
             and form_no like concat('%',#{request.formNo},'%')
         </if>
-        <if test="request.customerName != null and request.customerName !=''">
+        <if test="request != null and request.customerName != null and request.customerName !=''">
             and customer_name like concat('%',#{request.customerName},'%')
         </if>
-        <if test="request.customerDeptName != null and request.customerDeptName !=''">
+        <if test="request != null and request.customerDeptName != null and request.customerDeptName !=''">
             and customer_dept_name like concat('%',#{request.customerDeptName},'%')
         </if>
-        <if test="request.createUserName != null and request.createUserName !=''">
+        <if test="request != null and request.createUserName != null and request.createUserName !=''">
             and create_user_name like concat('%',#{request.createUserName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSealUseNoteMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSealUseNoteMapper.xml
index ab37bc1..b02bb33 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSealUseNoteMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSealUseNoteMapper.xml
@@ -29,32 +29,32 @@
     </sql>
 
     <select id="selectBatchForApprovalList" resultMap="BaseResultMap">
-        SELECT *
+        SELECT brsun.*, brsi.seal_name, brsi.seal_type, brsi.approver_name
         FROM biz_resource_seal_use_note brsun
         JOIN biz_resource_seal_info brsi ON brsun.seal_id = brsi.id
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and brsun.approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and brsun.create_user_id = #{request.createUserId}
         </if>
-        <if test="request.sealName != null and request.sealName !=''">
+        <if test="request != null and request.sealName != null and request.sealName !=''">
             and brsi.seal_name like concat('%',#{request.sealName},'%')
         </if>
-        <if test="request.sealType != null and request.sealType !=''">
+        <if test="request != null and request.sealType != null and request.sealType !=''">
             and brsi.seal_type = #{request.sealType}
         </if>
-        <if test="request.applyDeptName != null and request.applyDeptName !=''">
+        <if test="request != null and request.applyDeptName != null and request.applyDeptName !=''">
             and brsun.apply_dept_name like concat('%',#{request.applyDeptName},'%')
         </if>
-        <if test="request.applyUserName != null and request.applyUserName !=''">
+        <if test="request != null and request.applyUserName != null and request.applyUserName !=''">
             and brsun.apply_user_name like concat('%',#{request.applyUserName},'%')
         </if>
-        <if test="request.applyTimeStart != null and request.applyTimeStart !=''">
+        <if test="request != null and request.applyTimeStart != null and request.applyTimeStart !=''">
             and brsun.apply_time &gt;= #{request.applyTimeStart}
         </if>
-        <if test="request.applyTimeEnd != null and request.applyTimeEnd !=''">
+        <if test="request != null and request.applyTimeEnd != null and request.applyTimeEnd !=''">
             and brsun.apply_time &lt;= #{request.applyTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml
index 119bf7d..4f8392a 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml
@@ -31,6 +31,12 @@
         <if test="request.deptName != null and request.deptName !=''">
             and brsi.dept_name like concat('%',#{request.deptName},'%')
         </if>
+        <if test="request.ids != null">
+            and brsv.id in
+            <foreach collection="request.ids" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
         ORDER BY brsv.grant_date DESC
     </select>
 
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSupplierInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSupplierInfoMapper.xml
index fe8d399..e8ce7ef 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSupplierInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSupplierInfoMapper.xml
@@ -48,28 +48,28 @@
         SELECT *
         FROM biz_resource_supplier_info
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.supplierNo != null and request.supplierNo !=''">
+        <if test="request != null and request.supplierNo != null and request.supplierNo !=''">
             and supplier_no like concat('%',#{request.supplierNo},'%')
         </if>
-        <if test="request.supplierName != null and request.supplierName !=''">
+        <if test="request != null and request.supplierName != null and request.supplierName !=''">
             and supplier_name like concat('%',#{request.supplierName},'%')
         </if>
-        <if test="request.director != null and request.director !=''">
+        <if test="request != null and request.director != null and request.director !=''">
             and director like concat('%',#{request.director},'%')
         </if>
-        <if test="request.supplierType != null and request.supplierType !=''">
+        <if test="request != null and request.supplierType != null and request.supplierType !=''">
             and supplier_type = #{request.supplierType}
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/EnvLocationInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/EnvLocationInfoMapper.xml
new file mode 100644
index 0000000..68bcf10
--- /dev/null
+++ b/casic-metering-dao/src/main/resources/mapper/resource/EnvLocationInfoMapper.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.mapper.resource.EnvLocationInfoMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.resource.EnvLocationInfo">
+        <id column="id" property="id" />
+        <result column="location_no" property="locationNo" />
+        <result column="location_name" property="locationName" />
+        <result column="location_position" property="locationPosition" />
+        <result column="create_user_id" property="createUserId" />
+        <result column="create_user" property="createUser" />
+        <result column="create_time" property="createTime" />
+        <result column="update_time" property="updateTime" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, location_no, location_name, location_position, create_user_id, create_user, create_time, update_time
+    </sql>
+
+    <select id="selectLocationListPage" resultType="com.casic.missiles.dto.resource.environment.LocationListResponse">
+        SELECT *
+        FROM env_location_info
+        WHERE 1=1
+        <if test="request.locationNo != null and request.locationNo !=''">
+            AND location_no LIKE concat('%',#{request.locationNo},'%')
+        </if>
+        <if test="request.locationName != null and request.locationName !=''">
+            AND location_name LIKE concat('%',#{request.locationName},'%')
+        </if>
+        ORDER BY create_time DESC
+    </select>
+
+</mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml
index b28c18f..8854047 100644
--- a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml
@@ -11,7 +11,6 @@
         <result column="sign_desc" property="signDesc" />
         <result column="sign_director" property="signDirector" />
         <result column="sign_user_id" property="signUserId" />
-        <result column="sign_type" property="signType" />
         <result column="minio_file_name" property="minioFileName" />
         <result column="create_time" property="createTime" />
         <result column="update_time" property="updateTime" />
@@ -28,7 +27,6 @@
         <result column="sign_name" property="signName" />
         <result column="sign_desc" property="signDesc" />
         <result column="sign_director" property="signDirector" />
-        <result column="sign_type" property="signType" />
         <result column="sign_user_id" property="signUserId" />
         <result column="minio_file_name" property="minioFileName" />
         <result column="create_time" property="createTime" />
@@ -62,4 +60,58 @@
         JOIN system_sign_user_relation ssur ON ss.id = ssur.sign_id
         WHERE ssur.user_id = #{userId}
     </select>
+
+    <select id="selectSignListPage" resultMap="BaseResultMap">
+        SELECT ss.*, sd.SIMPLE_NAME AS deptName
+        FROM system_sign ss
+        LEFT JOIN sys_user su ON su.id = ss.sign_user_id
+        LEFT JOIN sys_dept sd ON sd.id = su.dept_id
+        WHERE 1=1
+        <if test="request.signNo != null and request.signNo !=''">
+            AND ss.sign_no LIKE concat('%',#{request.signNo},'%')
+        </if>
+        <if test="request.signName != null and request.signName !=''">
+            AND ss.sign_name LIKE concat('%',#{request.signName},'%')
+        </if>
+        <if test="request.signDirector != null and request.signDirector !=''">
+            AND ss.sign_director LIKE concat('%',#{request.signDirector},'%')
+        </if>
+        <if test="request.signUserId != null and request.signUserId !=''">
+            AND ss.sign_user_id = #{request.signUserId}
+        </if>
+        <if test="request.createStartTime != null and request.createStartTime !=''">
+            AND DATE_FORMAT(ss.create_time,'%Y-%m-%d') &gt;= DATE_FORMAT(#{request.createStartTime},'%Y-%m-%d')
+        </if>
+        <if test="request.createEndTime != null and request.createEndTime !=''">
+            AND DATE_FORMAT(ss.create_time,'%Y-%m-%d')  &lt;= DATE_FORMAT(#{request.createEndTime},'%Y-%m-%d')
+        </if>
+        ORDER BY ss.create_time DESC
+    </select>
+
+    <select id="selectSignList" resultMap="BaseResultMap">
+        SELECT ss.*, sd.SIMPLE_NAME AS deptName
+        FROM system_sign ss
+        LEFT JOIN sys_user su ON su.id = ss.sign_user_id
+        LEFT JOIN sys_dept sd ON sd.id = su.dept_id
+        WHERE 1=1
+        <if test="request.signNo != null and request.signNo !=''">
+            AND ss.sign_no LIKE concat('%',#{request.signNo},'%')
+        </if>
+        <if test="request.signName != null and request.signName !=''">
+            AND ss.sign_name LIKE concat('%',#{request.signName},'%')
+        </if>
+        <if test="request.signDirector != null and request.signDirector !=''">
+            AND ss.sign_director LIKE concat('%',#{request.signDirector},'%')
+        </if>
+        <if test="request.signUserId != null and request.signUserId !=''">
+            AND ss.sign_user_id = #{request.signUserId}
+        </if>
+        <if test="request.createStartTime != null and request.createStartTime !=''">
+            AND DATE_FORMAT(ss.create_time,'%Y-%m-%d') &gt;= DATE_FORMAT(#{request.createStartTime},'%Y-%m-%d')
+        </if>
+        <if test="request.createEndTime != null and request.createEndTime !=''">
+            AND DATE_FORMAT(ss.create_time,'%Y-%m-%d')  &lt;= DATE_FORMAT(#{request.createEndTime},'%Y-%m-%d')
+        </if>
+        ORDER BY ss.create_time DESC
+    </select>
 </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 515050a..60f530b 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
@@ -47,8 +47,8 @@
     String STORAGE_LOCATION = "bizStorageLocation";
     //计量专业
     String MEASURE_MAJOR = "bizMeasureMajor";
-    //管理状态
-    String MANAGER_STATE = "bizManagerState";
+    //标准装置管理状态
+    String STANDARD_MANAGER_STATE = "bizStandardManagerState";
 
     /**
      * 资源管理 字典code
@@ -95,8 +95,6 @@
     String MEASURE_STATUS = "measureStatus";
     //检定方式
     String MEASURE_TYPE = "measureType";
-    //标识打印标志类型
-    String IDENTIFY_PRINT_TYPE = "bizBusinessIdentify";
     //变更类型
     String REPORT_CHANGE_TYPE = "bizCertChangeType";
     //规模类型
@@ -111,19 +109,24 @@
     String MEASURE_CATEGORY = "measureCategory";
     //检定结果
     String MEASURE_RESULT = "measureResult";
+    //分包原因
+    String OUTSOURCE_REASON = "outsourceReason";
+
+    /**
+     * 系统管理
+     */
+    String TEMPLATE_TYPE = "templateType";
+
 
     /**
      * 标准装置 字典code
      */
     //类别
     String STANDARD_CATEGORY = "standardCategory";
-    //管理状态
-    String STANDARD_MANAGER_STATE = "standardManagerState";
     //标准等级
     String STANDARD_LEVEL = "standardLevel";
     //传递范围
     String STANDARD_TRANSMIT_RANGE = "transmitRange";
-
     //资本来源
     String CAPITAL_SOURCE = "capitalSource";
     //标准装置-申请类型
@@ -148,8 +151,6 @@
     String CERTIFICATE_CLASS = "certificationClass";
     //证书管理-检校专业
     String CALIBRATION_MAJOR = "calibrationMajor";
-    //分包原因
-    String OUTSOURCE_REASON = "outsourceReason";
 
     /**
      * 工作台
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/BaseApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/BaseApprovalListRequest.java
index 73c12c1..80d7424 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/BaseApprovalListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/BaseApprovalListRequest.java
@@ -6,6 +6,7 @@
 
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotEmpty;
+import java.util.List;
 
 /**
  * @Description:
@@ -19,14 +20,14 @@
      * 表单id
      */
     @NotBlank(message = "表单id不能为空")
-    @ApiModelProperty(value = "表单id（流程定义对应的表单id，等价于业务id）", dataType = "String")
+    @ApiModelProperty(value = "表单id（流程定义对应的表单id，等价于业务id），导出接口不用传", dataType = "String")
     private String formId;
 
     /**
      * 审批状态类型，对应ApprovalStatusEnum
      */
     @NotEmpty(message = "审批状态类型不能为空")
-    @ApiModelProperty(value = "审批状态类型code", dataType = "String")
+    @ApiModelProperty(value = "审批状态类型code，导出接口不用传", dataType = "String")
     private String approvalStatus;
 
     @ApiModelProperty(hidden = true)
@@ -34,4 +35,7 @@
 
     @ApiModelProperty(hidden = true)
     private Long createUserId;
+
+    @ApiModelProperty(value = "导出ids", dataType = "List")
+    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificatePrintApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificatePrintApprovalListRequest.java
index b93d1c9..3cc2f4e 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificatePrintApprovalListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificatePrintApprovalListRequest.java
@@ -5,8 +5,6 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import java.util.List;
-
 /**
  * @Description:
  * @Author: wangpeng
@@ -38,7 +36,4 @@
 
     @ApiModelProperty(value = "创建结束时间", dataType = "String")
     private String createTimeEnd;
-
-    @ApiModelProperty(value = "导出ids", dataType = "List")
-    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportApprovalListRequest.java
index 4f7a038..c115847 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportApprovalListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportApprovalListRequest.java
@@ -5,8 +5,6 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import java.util.List;
-
 /**
  * @Description:
  * @Author: wangpeng
@@ -15,6 +13,8 @@
 @ApiModel
 @Data
 public class CertificateReportApprovalListRequest extends BaseApprovalListRequest {
+    @ApiModelProperty(value = "委托方id", dataType = "String")
+    private Long customerId;
 
     @ApiModelProperty(value = "证书报告编号", dataType = "String")
     private String certificateReportNo;
@@ -37,6 +37,4 @@
     @ApiModelProperty(value = "检校结束时间", dataType = "String")
     private String calibrationTimeEnd;
 
-    @ApiModelProperty(value = "导出ids", dataType = "List")
-    private List<Long> ids;
 }

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java
index bb0c50f..13a699b 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java
@@ -12,6 +12,7 @@
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.IGeneralApprovalService;
+import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
@@ -19,6 +20,7 @@
 import org.springframework.web.bind.annotation.RequestBody;
 
 import javax.validation.Valid;
+import java.util.List;
 import java.util.Objects;
 
 /**
@@ -117,4 +119,17 @@
         }
         return baseApprovalService.failUpdate(request);
     }
+
+    public List<O> exportList(@RequestBody @Valid R request) throws Exception {
+        List<O> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = baseApprovalService.listExportByIds(request.getIds());
+        } else {
+            list = baseApprovalService.listExport(request);
+        }
+        for (O record : list) {
+            DictCodeUtils.convertDictCodeToName(record);
+        }
+        return list;
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java
index 8a90961..d775831 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java
@@ -5,6 +5,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.business.certificate.CertificateChangeApplyApprovalListRequest;
 import com.casic.missiles.dto.business.certificate.CertificateChangeApplySaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessCertificateChangeApply;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
@@ -20,6 +21,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -48,4 +50,12 @@
         }
         return changeApplyService.saveChangeApply(request);
     }
+
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody CertificateChangeApplyApprovalListRequest request) throws Exception {
+        List<BizBusinessCertificateChangeApply> list = super.exportList(request);
+        super.exportExcel(BizBusinessCertificateChangeApply.class, list, ExportEnum.CERTIFICATE_CHANGE_APPLY.getSheetName());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java
index 5fc4b07..af8230e 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java
@@ -9,6 +9,7 @@
 import com.casic.missiles.dto.business.certificate.CertificatePrintApprovalListRequest;
 import com.casic.missiles.dto.business.certificate.CertificatePrintListResponse;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.enums.business.CertificatePrintStatusEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessCertificatePrintLog;
@@ -18,10 +19,16 @@
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.io.IOException;
+import java.util.List;
 import java.util.Objects;
 
 /**
@@ -98,4 +105,16 @@
         });
         return certificatePrintService.certificatePrintLog(idDTO.getId());
     }
+
+    @ApiOperation("证书打印审批导出")
+    @PostMapping("/listExport")
+    public void exportList(@RequestBody CertificatePrintApprovalListRequest request) throws IOException {
+        List<CertificatePrintListResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = certificatePrintService.listByIds(request.getIds());
+        } else {
+            list = certificatePrintService.list(request);
+        }
+        super.exportExcel(CertificatePrintListResponse.class, list, ExportEnum.CERTIFICATE_PRINT.getSheetName());
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java
index 63b06dc..6b2efd5 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java
@@ -6,6 +6,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.business.certificate.CertificateReportApprovalListRequest;
 import com.casic.missiles.dto.business.certificate.CertificateReportSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessCertificateReport;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
@@ -21,6 +22,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -50,7 +52,7 @@
         return certificateReportService.saveCertificateReport(request);
     }
 
-    @ApiOperation("证书审批详情（基本信息）")
+    @ApiOperation("详情（基本信息）")
     @PostMapping("/detail")
     public ReturnDTO<BizBusinessCertificateReport> detail(@RequestBody @Valid BaseDetailRequest request, BindingResult bindingResult) throws Exception {
         if(bindingResult.hasErrors()){
@@ -59,4 +61,11 @@
         return certificateReportService.detail(request);
     }
 
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody CertificateReportApprovalListRequest request) throws Exception {
+        List<BizBusinessCertificateReport> list = super.exportList(request);
+        super.exportExcel(BizBusinessCertificateReport.class, list, ExportEnum.CERTIFICATE_REPORT.getSheetName());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java
index 46b26bd..57c0809 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java
@@ -10,20 +10,21 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.business.identify.IdentifyListRequest;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessIdentifyInfo;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.business.IBizBusinessIdentifyInfoService;
+import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import javax.validation.Valid;
+import java.util.List;
 import java.util.Objects;
 
 /**
@@ -57,16 +58,13 @@
         return identifyInfoService.addIdentify(identifyInfo);
     }
 
-    @ApiOperation("标识打印更新")
+    @ApiOperation("标识打印更新（更新打印时间）")
     @PostMapping("/update")
-    public ReturnDTO updateIdentify(@RequestBody @Valid BizBusinessIdentifyInfo identifyInfo, BindingResult bindingResult) {
-        Assert.isFalse(Objects.isNull(identifyInfo.getId()), () -> {
+    public ReturnDTO updateIdentify(@RequestBody @Valid IdDTO idDTO) {
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        Assert.isFalse(bindingResult.hasErrors(), () -> {
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        });
-        return identifyInfoService.updateIdentify(identifyInfo);
+        return identifyInfoService.updateIdentify(idDTO.getId());
     }
 
     @ApiOperation("标识打印删除")
@@ -77,4 +75,37 @@
         });
         return identifyInfoService.deleteIdentify(idDTO.getId());
     }
+
+    @ApiOperation("标识打印导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody @Valid IdentifyListRequest request, BindingResult bindingResult) throws Exception {
+        if (bindingResult.hasErrors()) {
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        List<BizBusinessIdentifyInfo> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = identifyInfoService.listByIds(request.getIds());
+        } else {
+            list = identifyInfoService.list(request);
+        }
+        for (BizBusinessIdentifyInfo record : list) {
+            DictCodeUtils.convertDictCodeToName(record);
+        }
+        super.exportExcel(BizBusinessIdentifyInfo.class, list, ExportEnum.IDENTIFY_EXPORT.getSheetName());
+    }
+
+
+    // TODO: 2023/8/23 查询设备信息，4个底部按钮查设备（按钮的作用就是前端用来调不同接口、用来区分中间即将展示的标识），前端弹窗选设备，在确定保存时前端根据底部按钮判断传入设备类型deviceType字典code
+    // TODO: 2023/8/23 接口：查受检设备（第1个按钮），查设备台账（后3个按钮同一接口），查询之后前端根据标志类型的不同加到中间页面时进行判断（按产品给的对应表）
+    // TODO: 2023/8/23 提供二维码接口，前端在加到中间页面时调用一下
+
+    @ApiOperation("设备二维码")
+    @PostMapping("/equipment/qrCode")
+    public ReturnDTO<String> equipmentQrCode(@RequestBody @Valid IdDTO idDTO) {
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return identifyInfoService.equipmentQrCode(idDTO.getId());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java
index 707be6e..7e0453d 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java
@@ -117,7 +117,7 @@
     }
 
     @ApiOperation("任务单导出")
-    @PostMapping("/export")
+    @PostMapping("/listExport")
     public void orderExport(@RequestBody @Valid OrderListRequest request, HttpServletResponse response) {
         businessOrderService.orderExport(request, response);
     }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java
index 529a6ce..51432be 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java
@@ -1,9 +1,28 @@
 package com.casic.missiles.controller.business;
 
+import com.casic.missiles.controller.GeneralApprovalController;
+import com.casic.missiles.dto.BaseApprovalSubmitRequest;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.business.outsource.OutsourceAssessApprovalListRequest;
+import com.casic.missiles.dto.business.outsource.OutsourceAssessSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
+import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.model.business.BizBusinessOutsourceAssess;
+import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
+import com.casic.missiles.service.IGeneralApprovalService;
+import com.casic.missiles.service.business.IBizBusinessOutsourceAssessService;
 import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.BindingResult;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.validation.Valid;
+import java.util.List;
+
 /**
  * <p>
  * 计量检定业务-分包管理-测试、校准或检定工作分包评审表 前端控制器
@@ -15,6 +34,27 @@
 @Api(tags = "分包管理-测试、校准或检定工作分包评审表")
 @RestController
 @RequestMapping("/business/outsource/assess")
-public class BizBusinessOutsourceAssessController {
+public class BizBusinessOutsourceAssessController extends GeneralApprovalController<BizBusinessOutsourceAssess, BizBusinessOutsourceAssess, OutsourceAssessApprovalListRequest, BaseApprovalSubmitRequest> {
+    @Autowired
+    private IBizBusinessOutsourceAssessService outsourceAssessService;
 
+    public BizBusinessOutsourceAssessController(IGeneralApprovalService<BizBusinessOutsourceAssess, BizBusinessOutsourceAssess, OutsourceAssessApprovalListRequest, BaseApprovalSubmitRequest> baseApprovalService) {
+        super(baseApprovalService);
+    }
+
+    @ApiOperation("草稿箱-保存")
+    @PostMapping("/save")
+    public ReturnDTO<OutsourceAssessSaveResponse> saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceAssess request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        return outsourceAssessService.saveOutsourceAssess(request);
+    }
+
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception {
+        List<BizBusinessOutsourceAssess> list = super.exportList(request);
+        super.exportExcel(BizBusinessOutsourceAssess.class, list, ExportEnum.OUTSOURCE_ASSESS.getSheetName());
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java
new file mode 100644
index 0000000..9adef18
--- /dev/null
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java
@@ -0,0 +1,60 @@
+package com.casic.missiles.controller.business;
+
+import com.casic.missiles.controller.GeneralApprovalController;
+import com.casic.missiles.dto.BaseApprovalSubmitRequest;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.business.outsource.OutsourceProtocolApprovalListRequest;
+import com.casic.missiles.dto.business.outsource.OutsourceProtocolSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
+import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.model.business.BizBusinessOutsourceProtocol;
+import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
+import com.casic.missiles.service.IGeneralApprovalService;
+import com.casic.missiles.service.business.IBizBusinessOutsourceProtocolService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.BindingResult;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.validation.Valid;
+import java.util.List;
+
+/**
+ * <p>
+ * 计量检定业务-分包管理-测试、校准或检定工作分包协议书 前端控制器
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-08-24
+ */
+@Api(tags = "分包管理-测试、校准或检定工作分包协议书")
+@RestController
+@RequestMapping("/business/outsource/protocol")
+public class BizBusinessOutsourceProtocolController extends GeneralApprovalController<BizBusinessOutsourceProtocol, BizBusinessOutsourceProtocol, OutsourceProtocolApprovalListRequest, BaseApprovalSubmitRequest> {
+    @Autowired
+    private IBizBusinessOutsourceProtocolService outsourceProtocolService;
+
+    public BizBusinessOutsourceProtocolController(IGeneralApprovalService<BizBusinessOutsourceProtocol, BizBusinessOutsourceProtocol, OutsourceProtocolApprovalListRequest, BaseApprovalSubmitRequest> baseApprovalService) {
+        super(baseApprovalService);
+    }
+
+    @ApiOperation("草稿箱-保存")
+    @PostMapping("/save")
+    public ReturnDTO<OutsourceProtocolSaveResponse> saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceProtocol request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        return outsourceProtocolService.saveOutsourceProtocol(request);
+    }
+
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody OutsourceProtocolApprovalListRequest request) throws Exception {
+        List<BizBusinessOutsourceProtocol> list = super.exportList(request);
+        super.exportExcel(BizBusinessOutsourceProtocol.class, list, ExportEnum.OUTSOURCE_PROTOCOL.getSheetName());
+    }
+}
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java
index 097f645..f0f0943 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java
@@ -17,7 +17,6 @@
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.IGeneralApprovalService;
 import com.casic.missiles.service.business.IBizBusinessOutsourcerInfoService;
-import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -71,19 +70,8 @@
 
     @ApiOperation("分包方导出")
     @PostMapping("/listExport")
-    public void export(@RequestBody @Valid OutsourcerInfoApprovalListRequest request, BindingResult bindingResult) throws Exception {
-        if (bindingResult.hasErrors()) {
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        }
-        List<BizBusinessOutsourcerInfo> list;
-        if (!CollectionUtils.isEmpty(request.getIds())) {
-            list = outsourcerInfoService.listByIds(request.getIds());
-        } else {
-            list = outsourcerInfoService.list(request);
-        }
-        for (BizBusinessOutsourcerInfo record : list) {
-            DictCodeUtils.convertDictCodeToName(record);
-        }
+    public void export(@RequestBody OutsourcerInfoApprovalListRequest request) throws Exception {
+        List<BizBusinessOutsourcerInfo> list = super.exportList(request);
         super.exportExcel(BizBusinessOutsourcerInfo.class, list, ExportEnum.OUTSOURCER_EXPORT.getSheetName());
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java
index c2cbf9f..0410918 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java
@@ -17,11 +17,9 @@
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.IGeneralApprovalService;
 import com.casic.missiles.service.business.IBizBusinessSiteExecutiveInfoService;
-import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -60,7 +58,7 @@
         return siteExecutiveInfoService.saveSiteExecutiveInfo(siteExecutiveInfo);
     }
 
-    @ApiOperation("现场检测详情")
+    @ApiOperation("详情")
     @PostMapping("/detail")
     public ReturnDTO<SiteExecutiveDetailResponse> siteExecutiveDetail(@RequestBody @Valid IdDTO idDTO) throws Exception {
         Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
@@ -69,21 +67,10 @@
         return ReturnUtil.success(siteExecutiveInfoService.detail(idDTO.getId()));
     }
 
-    @ApiOperation("现场检测导出")
+    @ApiOperation("导出")
     @PostMapping("/listExport")
-    public void export(@RequestBody @Valid SiteExecutiveApprovalListRequest request, BindingResult bindingResult) throws Exception {
-        if (bindingResult.hasErrors()) {
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        }
-        List<SiteExecutiveApprovalListResponse> list;
-        if (!CollectionUtils.isEmpty(request.getIds())) {
-            list = siteExecutiveInfoService.listInfoByIds(request.getIds());
-        } else {
-            list = siteExecutiveInfoService.listInfo(request);
-        }
-        for (SiteExecutiveApprovalListResponse record : list) {
-            DictCodeUtils.convertDictCodeToName(record);
-        }
+    public void export(@RequestBody SiteExecutiveApprovalListRequest request) throws Exception {
+        List<SiteExecutiveApprovalListResponse> list = super.exportList(request);
         super.exportExcel(SiteExecutiveApprovalListResponse.class, list, ExportEnum.SITE_EXECUTIVE_EXPORT.getSheetName());
     }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
index 7e793cd..a92e209 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
@@ -55,7 +55,7 @@
 
     @ApiOperation("设备收发列表导出")
     @PostMapping("/export")
-    public void exportList(@RequestBody @Valid SampleDispatchListRequest request) throws IOException {
+    public void exportList(@RequestBody SampleDispatchListRequest request) throws IOException {
         List<SampleDispatchListResponse> list;
         if (!CollectionUtils.isEmpty(request.getIds())) {
             list = dispatchService.listByIds(request.getIds());
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java
index cdc77fc..d120fd4 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java
@@ -7,6 +7,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.business.labExecutive.*;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.business.IBusinessLabExecutiveInfoService;
@@ -14,6 +15,7 @@
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.*;
 
@@ -32,7 +34,7 @@
     @Autowired
     private IBusinessLabExecutiveInfoService labExecutiveInfoService;
 
-    @ApiOperation("实验室检测-部门检测-查询各状态列表（待检测、检测中、检测完）")
+    @ApiOperation("实验室任务-查询各状态列表（待检测、检测中、检测完）")
     @PostMapping("/deptExecutive/List")
     public ReturnDTO<PageInfoBT<SampleLabExecutiveListResponse>> queryDeptExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
@@ -43,10 +45,19 @@
         return ReturnUtil.success(super.packForBT(labExecutiveInfoService.deptLabExecutiveListPage(page, labExecutiveListRequest)));
     }
 
-    /**
-     * 实验室检测-我的检测-查询各状态列表（待检测、检测中、检测完）
-     */
-    @ApiOperation("实验室检测-我的检测-查询各状态列表（待检测、检测中、检测完）")
+    @ApiOperation("实验室任务导出")
+    @PostMapping("/deptExecutive/export")
+    public void deptExportList(@RequestBody @Valid SampleLabExecutiveListRequest request) throws Exception {
+        List<SampleLabExecutiveListResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = labExecutiveInfoService.deptLabExecutiveListByIds(request.getMeasureStatus(), request.getIds());
+        } else {
+            list = labExecutiveInfoService.deptLabExecutiveList(request);
+        }
+        super.exportExcel(SampleLabExecutiveListResponse.class, list, ExportEnum.DEPT_EXECUTIVE_TASK.getSheetName());
+    }
+
+    @ApiOperation("我的任务-查询各状态列表（待检测、检测中、检测完）")
     @PostMapping("/myExecutive/list")
     public ReturnDTO<PageInfoBT<SampleLabExecutiveListResponse>> queryMyExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
@@ -57,19 +68,25 @@
         return ReturnUtil.success(super.packForBT(labExecutiveInfoService.myLabExecutiveListPage(page, labExecutiveListRequest)));
     }
 
-    /**
-     * 实验室检测-我的检测-查询各状态样品数量（待检测、检测中、检测完）
-     */
-    @ApiOperation("实验室检测-我的检测-查询各状态样品数量（待检测、检测中、检测完）")
+    @ApiOperation("我的任务导出")
+    @PostMapping("/myExecutive/export")
+    public void exportList(@RequestBody @Valid SampleLabExecutiveListRequest request) throws Exception {
+        List<SampleLabExecutiveListResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = labExecutiveInfoService.myLabExecutiveListByIds(request.getMeasureStatus(), request.getIds());
+        } else {
+            list = labExecutiveInfoService.myLabExecutiveList(request);
+        }
+        super.exportExcel(SampleLabExecutiveListResponse.class, list, ExportEnum.MY_EXECUTIVE_TASK.getSheetName());
+    }
+
+    @ApiOperation("我的任务-查询各状态样品数量（待检测、检测中、检测完）")
     @GetMapping("/myExecutive/amount")
     public ReturnDTO<List<SampleAmountResponse>> queryMyExecutiveAmount() {
         return ReturnUtil.success(labExecutiveInfoService.myExecutiveAmount());
     }
 
-    /**
-     * 实验室检测-部门检测-分配（分配给具体人员）
-     */
-    @ApiOperation("实验室检测-部门检测-分配按钮（分配给具体人员）")
+    @ApiOperation("实验室任务-分配按钮（分配给具体人员）")
     @PostMapping("/deptExecutive/allocate")
     public ReturnDTO allocateStaff(@RequestBody @Valid SampleAllocateRequest sampleAllocateRequest, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -78,10 +95,7 @@
         return labExecutiveInfoService.allocateStaff(sampleAllocateRequest);
     }
 
-    /**
-     * 实验室检测-我的检测-检定人扫描收入（待检测->检测中）
-     */
-    @ApiOperation("实验室检测-我的检测-检定人扫描收入（待检测->检测中）")
+    @ApiOperation("我的任务-检定人扫描收入（待检测->检测中）")
     @PostMapping("/myExecutive/receive")
     public ReturnDTO sampleReceive(@RequestBody @Valid List<SampleOperateRequest> requestList, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -90,10 +104,7 @@
         return labExecutiveInfoService.sampleReceive(requestList);
     }
 
-    /**
-     * 实验室检测-负责人/检定人扫描检完（检测中->检测完）
-     */
-    @ApiOperation("实验室检测-负责人/检定人扫描检完（检测中->检测完）")
+    @ApiOperation("实验室任务-负责人/检定人扫描检完（检测中->检测完）")
     @PostMapping("/myExecutive/complete")
     public ReturnDTO sampleExecutiveComplete(@RequestBody @Valid List<SampleOperateRequest> requestList, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -102,10 +113,7 @@
         return labExecutiveInfoService.sampleExecutiveComplete(requestList);
     }
 
-    /**
-     * 实验室检测-部门检测/我的检测 编辑（只能修改应出具证书）
-     */
-    @ApiOperation("实验室检测-部门检测/我的检测 编辑（只能修改应出具证书）")
+    @ApiOperation("实验室任务/我的任务 编辑（只能修改应出具证书）")
     @PostMapping("/executive/update")
     public ReturnDTO updateExecutive(@RequestBody @Valid UpdateExecutiveRequest request, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -114,10 +122,7 @@
         return labExecutiveInfoService.updateExecutive(request);
     }
 
-    /**
-     * 实验室检测-部门检测/我的检测 详情
-     */
-    @ApiOperation("实验室检测-部门检测/我的检测 详情")
+    @ApiOperation("实验室任务/我的任务 详情")
     @PostMapping("/executive/detail")
     public ReturnDTO<ExecutiveDetailResponse> executiveDetail(@RequestBody @Valid ExecutiveDetailRequest request, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
@@ -131,7 +136,7 @@
      * 退回后会将下一个要执行的实验室检测状态更新为待分配，将后面的实验室顺序变更为连续（都进行减1）
      * 最后一个检测的实验室退回，等分发员再增加实验室或设备收发中的已收入直接手动点击完成
      */
-    @ApiOperation("实验室检测-部门检测/我的检测 退回（待检测/检测中->退回）")
+    @ApiOperation("实验室任务/我的任务 退回（待检测/检测中->退回）")
     @PostMapping("/executive/sendBack")
     public ReturnDTO executiveSendBack(@RequestBody @Valid ExecutiveSendBackRequest request, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -140,9 +145,6 @@
         return labExecutiveInfoService.sampleExecutiveSendBack(request);
     }
 
-    /**
-     * 分发员编辑实验室检测列表
-     */
     @ApiOperation("分发员编辑实验室检测列表")
     @PostMapping("/handOut/updateList")
     public ReturnDTO updateExecutiveList(@RequestBody @Valid UpdateExecutiveListRequest request, BindingResult bindingResult) {
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java
index 48a67ed..0c04f31 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java
@@ -10,6 +10,7 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.resource.customer.CustomerApprovalListRequest;
 import com.casic.missiles.dto.resource.customer.CustomerSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceCustomerInfo;
@@ -26,6 +27,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -55,6 +57,13 @@
         return customerInfoService.saveCustomerInfo(request);
     }
 
+    @ApiOperation("委托方名录导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody CustomerApprovalListRequest request) throws Exception {
+        List<BizResourceCustomerInfo> list = super.exportList(request);
+        super.exportExcel(BizResourceCustomerInfo.class, list, ExportEnum.CUSTOMER_INFO.getSheetName());
+    }
+
     @ApiOperation("委托方人员列表（分页）")
     @PostMapping("/person/listPage")
     public ReturnDTO<PageInfoBT<BizResourceCustomerStaff>> personListPage(@RequestBody IdDTO idDto) {
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
index 972ed4b..6418ea5 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
@@ -5,6 +5,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.resource.customer.SuggestFormApprovalListRequest;
 import com.casic.missiles.dto.resource.customer.SuggestFormSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceCustomerSuggestForm;
@@ -20,6 +21,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -50,4 +52,11 @@
         return suggestFormService.saveSuggestForm(request);
     }
 
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody SuggestFormApprovalListRequest request) throws Exception {
+        List<BizResourceCustomerSuggestForm> list = super.exportList(request);
+        super.exportExcel(BizResourceCustomerSuggestForm.class, list, ExportEnum.CUSTOMER_SUGGEST_FORM.getSheetName());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java
index 1934d1a..9e07eab 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java
@@ -15,12 +15,16 @@
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.resource.IEnvEnvironmentRecordConfigService;
 import com.casic.missiles.service.resource.IEnvEnvironmentRecordDataService;
+import com.casic.missiles.service.resource.IEnvLocationInfoService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
 import java.util.List;
@@ -39,6 +43,8 @@
     private IEnvEnvironmentRecordDataService environmentRecordDataService;
     @Autowired
     private IEnvEnvironmentRecordConfigService environmentRecordConfigService;
+    @Autowired
+    private IEnvLocationInfoService locationInfoService;
 
     @ApiOperation("环境记录单数据列表/详情")
     @PostMapping("/data/listPage")
@@ -95,4 +101,11 @@
         });
         return environmentRecordConfigService.deleteEnvironmentRecordConfig(idDTO.getId());
     }
+
+    @ApiOperation("地点列表")
+    @PostMapping("/location/listPage")
+    public ReturnDTO<PageInfoBT<LocationListResponse>> locationListPage(@RequestBody @Valid LocationListRequest request) {
+        Page<LocationListResponse> page = PageFactory.defaultPage();
+        return ReturnUtil.success(super.packForBT(locationInfoService.listPage(page, request)));
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java
index 82efe3f..e9561fa 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java
@@ -10,6 +10,7 @@
 import com.casic.missiles.dto.resource.seal.SealLogListRequest;
 import com.casic.missiles.dto.resource.seal.SealNoteApprovalListRequest;
 import com.casic.missiles.dto.resource.seal.SealNoteSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceSealUseLog;
@@ -27,6 +28,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -58,6 +60,13 @@
         return sealUseNoteService.saveSeal(request);
     }
 
+    @ApiOperation("印章使用登记导出（列表和导出中去掉经办人和监印人）")
+    @PostMapping("/listExport")
+    public void export(@RequestBody SealNoteApprovalListRequest request) throws Exception {
+        List<BizResourceSealUseNote> list = super.exportList(request);
+        super.exportExcel(BizResourceSealUseNote.class, list, ExportEnum.SEAL_NOTE.getSheetName());
+    }
+
     // TODO: 2023/7/28 印章使用日志：系统中使用印章时插入数据库
 
     @ApiOperation("印章使用日志列表（分页）")
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java
index 9b674fc..06b6521 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java
@@ -9,16 +9,20 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.resource.staff.StaffCertRequest;
 import com.casic.missiles.dto.resource.staff.StaffCertResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.service.resource.IBizResourceStaffInfoService;
 import com.casic.missiles.service.resource.IBizResourceStaffVerifierService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.List;
+
 /**
  * @Description:
  * @Author: wangpeng
@@ -41,9 +45,21 @@
         return ReturnUtil.success(super.packForBT(responsePage));
     }
 
+    @ApiOperation("证书逾期提醒导出")
+    @PostMapping("/listExport")
+    public void exportList(@RequestBody StaffCertRequest request) throws Exception {
+        List<StaffCertResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = staffInfoService.certListByIds(request.getIds());
+        } else {
+            list = staffInfoService.certList(request);
+        }
+        super.exportExcel(StaffCertResponse.class, list, ExportEnum.STAFF_CERTIFICATE_EXPIRE.getSheetName());
+    }
+
     @ApiOperation("证书逾期提醒")
     @PostMapping("/expirationReminder")
-    public ReturnDTO expirationReminder(@RequestBody IdDTO idDto) {
-        return verifierService.expirationReminder(idDto);
+    public ReturnDTO expirationReminder(@RequestBody IdDTO idDTO) {
+        return verifierService.expirationReminder(idDTO);
     }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java
index 3b251ad..a6e7850 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java
@@ -12,6 +12,7 @@
 import com.casic.missiles.dto.resource.staff.StaffListRequest;
 import com.casic.missiles.dto.resource.staff.TrainListRequest;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.*;
@@ -22,7 +23,10 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
 import java.util.List;
@@ -52,8 +56,19 @@
             throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
         }
         Page<BizResourceStaffInfo> page = PageFactory.defaultPage();
-        Page<BizResourceStaffInfo> responsePage = staffInfoService.listPage(page, request);
-        return ReturnUtil.success(super.packForBT(responsePage));
+        return ReturnUtil.success(super.packForBT(staffInfoService.listPage(page, request)));
+    }
+
+    @ApiOperation("人员登记导出")
+    @PostMapping("/listExport")
+    public void exportList(@RequestBody StaffListRequest request) throws Exception {
+        List<BizResourceStaffInfo> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = staffInfoService.listByIds(request.getIds());
+        } else {
+            list = staffInfoService.list(request);
+        }
+        super.exportExcel(BizResourceStaffInfo.class, list, ExportEnum.STAFF_INFO.getSheetName());
     }
 
     @ApiOperation("人员登记详情基础信息")
@@ -85,9 +100,9 @@
 
     @ApiOperation("科研教育列表（分页）")
     @PostMapping("/education/listPage")
-    public ReturnDTO<PageInfoBT<BizResourceStaffEducation>> educationListPage(@RequestBody IdDTO idDto) {
+    public ReturnDTO<PageInfoBT<BizResourceStaffEducation>> educationListPage(@RequestBody IdDTO idDTO) {
         Page<BizResourceStaffEducation> page = PageFactory.defaultPage();
-        Page<BizResourceStaffEducation> responsePage = staffInfoService.educationListPage(page, idDto);
+        Page<BizResourceStaffEducation> responsePage = staffInfoService.educationListPage(page, idDTO);
         return ReturnUtil.success(super.packForBT(responsePage));
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java
index af6aa86..d85d84a 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java
@@ -9,6 +9,7 @@
 import com.casic.missiles.dto.resource.outsideService.SupplierApprovalListRequest;
 import com.casic.missiles.dto.resource.outsideService.SupplierSaveResponse;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceSupplierAbility;
@@ -67,6 +68,13 @@
         return ReturnUtil.success(supplierInfoService.detail(idDTO.getId()));
     }
 
+    @ApiOperation("合格供方导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody SupplierApprovalListRequest request) throws Exception {
+        List<BizResourceSupplierInfo> list = super.exportList(request);
+        super.exportExcel(BizResourceSupplierInfo.class, list, ExportEnum.SUPPLIER_INFO.getSheetName());
+    }
+
     @ApiOperation("供方人员列表（分页）")
     @PostMapping("/person/listPage")
     public ReturnDTO<PageInfoBT<BizResourceSupplierPerson>> personListPage(@RequestBody IdDTO idDTO) {
diff --git a/casic-metering-api/src/main/resources/config/application.yml b/casic-metering-api/src/main/resources/config/application.yml
index 350db5f..ecff521 100644
--- a/casic-metering-api/src/main/resources/config/application.yml
+++ b/casic-metering-api/src/main/resources/config/application.yml
@@ -126,7 +126,7 @@
     #作者
     author: wangpeng
     #待生成对象表名
-    table-name: biz_equipment_technical_target_approval,biz_equipment_attachment_approval,biz_equipment_checkpoint_approval
+    table-name: biz_business_outsource_protocol
 
 reminder:
   #节点--common模块config包 ReminderNodeConfig配置
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
index 4a19e4e..d47d552 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
@@ -53,6 +53,7 @@
     SUGGEST_FORM_SAVE_FAILED(2509, "委托方意见登记表保存至草稿箱失败"),
     EXAMINE_FORM_SAVE_FAILED(2510, "要求、委托书及合同评审表保存至草稿箱失败"),
     CUSTOMER_EXIST_SAVE_FAILED(2511, "该委托方已存在，请重新选择"),
+    DUPLICATE_LOCATION_NO(2512, "地点编号已存在"),
 
     /**
      * 计量检定业务模块
@@ -68,6 +69,8 @@
     COMPLETE_SAMPLE_NOT_EXIST(2609, "检测中不存在扫描收入的样品"),
     CANNOT_CHANGE_MEASURE_INFO(2610, "无法更改非当前登录用户的检测信息"),
     NON_EXIST_ORDER_OR_SAMPLE(2611, "不存在该委托单或该委托单下的样品"),
+    OUTSOURCE_ACCESS_SAVE_FAILED(2612, "测试、校准或检定工作分包评审表保存至草稿箱失败"),
+    OUTSOURCE_PROTOCOL_SAVE_FAILED(2613, "测试、校准或检定工作分包协议书保存至草稿箱失败"),
 
     /**
      * 历史遗留备用
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
index 5089ad1..81a406b 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
@@ -10,54 +10,38 @@
     /**
      * 资源管理
      */
-    ENVIRONMENT_DATA_EXPORT("environmentData", "environmentData", "环境记录单数据"),
+    ENVIRONMENT_DATA_EXPORT("environmentData", "环境记录单数据", "环境记录单数据"),
+    STAFF_INFO("staffInfo", "人员登记", "人员登记"),
+    STAFF_CERTIFICATE_EXPIRE("certificateExpire", "证书逾期提醒", "证书逾期提醒"),
+    SUPPLIER_INFO("supplierInfo", "合格供方名录", "合格供方名录"),
+    CUSTOMER_INFO("customerInfo", "委托方名录", "委托方名录"),
+    CUSTOMER_SUGGEST_FORM("customerSuggestForm", "委托方意见登记表", "委托方意见登记表"),
+    SEAL_NOTE("sealNote", "印章使用登记", "印章使用登记"),
 
-    FILE_EXPORT("meterFileData", "meterFileData", "计量文件信息"),
-    TRAIN_PLAN_EXPORT("trainPlanData", "trainPlanData", "培训计划"),
-    TRAIN_LOG_EXPORT("trainLogData", "trainLogData", "培训记录"),
-    METER_ORGANIZE_EXPORT("meterOrganizeData", "meterOrganizeData", "计量组织"),
-    TRACE_SUPPLIER_EXPORT("traceSupplierData", "traceSupplierData", "溯源供方"),
-    SIGN_EXPORT("signData", "signData", "签名/签章"),
-    TEMPLATE_EXPORT("templateData", "templateData", "原始记录模板/证书报告模板"),
-    FIXED_ASSETS("meterFixedAssets", "meterFixedAssets", "固定资产"),
-    METER_EQUIPMENT("meterEquipment", "meterEquipment", "测量设备"),
-    CALIBRATION_TEST_EQUIPMENT("calibrationTestEquipment", "calibrationTestEquipment", "校准检定设备"),
-    MEASURE_ACCOUNT("measureAccount", "measureAccount", "测量工装"),
-    STANDARD_SUPPORT_EQUIPMENT("standardSupportEquipment", "standardSupportEquipment", "标准配套设备"),
-    STANDARD_EQUIPMENT("standardEquipment", "standardEquipment", "标准装置"),
-    FLOW_DEF_EXPORT("flowDefData", "flowDefData", "流程定义"),
-    STAFF_CERTIFICATE("certificate", "certificate", "计量人员证书"),
-    CHECK_INFO("checkInfo", "checkInfo", "设备管理点检测"),
-    EQUIPMENT_APPLY("equipmentApply", "equipmentApply", "设备借用"),
-    STANDARD_EQUIPMENT_REMIND("equipmentApplyRemind", "equipmentApplyRemind", "标准装置到期提醒"),
-    METER_PRICE("meterPrice", "meterPrice", "价格库"),
-    METER_STAFF("meterStaff", "meterStaff", "计量人员"),
-    STANDARD_EQUIPMENT_APPLY("standardEquipmentApply", "standardEquipmentApply", "标准装置申请"),
-    STATE_MANAGE_APPLY("stateManage", "stateManage", "状态管理"),
-    METER_ACCEPTANCE_CHECK("acceptanceCheck", "acceptanceCheck", "设备检修保养验收单"),
-    CUSTOMER_EXPORT("customerData", "customerData", "客户信息"),
-    ORDER_EXPORT("orderData", "orderData", "委托书信息"),
-    SAMPLE_EXPORT("sampleData", "sampleData", "样本信息"),
-    EXCHANGE_DATA("exchangeData", "exchangeData", "设备交接单"),
-    DISPATCH_DATA("dispatchData", "dispatchData", "设备收发"),
-    ENVIRONMENT_DATA("environmentData", "environmentData", "环境记录单"),
-    ORIGIN_DATA("originData", "originData", "原始记录"),
-    CERTIFICATE_REPORT("certificateReport", "certificateReport", "证书报告"),
-    ADVICE_EXPORT("adviceData", "adviceData", "客户反馈"),
-    HANDOUT_EXPORT("handoutData", "handoutData", "任务分发列表"),
-    OUTSOURCER_EXPORT("outsourcerData", "outsourcerData", "分包方"),
-    SITE_EXECUTIVE_EXPORT("siteExecutiveData", "siteExecutiveData", "现场测试、校准或检定"),
-    CERTIFICATE_PRINT_EXPORT("certificatePrintData", "certificatePrintData", "证书打印"),
-    DOWNLOAD_TEMPLATE("downloadTemplate", "downloadTemplate", "页面配置"),
-    OUTSOURCER_CERTIFICATE_EXPORT("outsourceCertificateData", "outsourceCertificateData", "分包证书"),
-    SETTLEMENT_INFO_EXPORT("settlementInfoData", "settlementInfoData", "业务结算"),
-    EQUIPMENT_REMIND("equipmentRemind", "equipmentRemind", "设备到期提醒"),
-    AGREEMENT_INFO_EXPORT("agreementInfoData", "agreementInfoData", "合同"),
-    WORK_STATISTICS_EXPORT("workStatisticsData", "workStatisticsData", "实时工作统计"),
-    DEPT_OUTPUT_EXPORT("deptOutputData", "deptOutputData", "部门产值分析"),
-    WORKLOAD_EXPORT("workloadData", "workloadData", "业务工作量分析"),
-    DEPT_COMPREHENSIVE_EXPORT("deptComprehensiveData", "deptComprehensiveData", "部门综合分析"),
-    ENVIRONMENTAL_RECORD("environmentalRecordData", "environmentalRecordData", "现场环境记录");
+    /**
+     * 计量检定业务
+     */
+    OUTSOURCER_EXPORT("outsourcerData", "分包方名录", "分包方名录"),
+    IDENTIFY_EXPORT("identifyData", "计量标识", "计量标识"),
+    ORDER_EXPORT("orderData", "任务单", "任务单"),
+    DISPATCH_DATA("dispatchData", "设备收发", "设备收发"),
+    HANDOUT_EXPORT("handoutData", "任务分发", "任务分发"),
+    SITE_EXECUTIVE_EXPORT("siteExecutiveData", "现场测试、校准或检定", "现场测试、校准或检定"),
+    CERTIFICATE_REPORT("certificateReport", "证书审批", "证书审批"),
+    CERTIFICATE_CHANGE_APPLY("certificateChangeApply", "证书报告补充或更换申请单", "证书报告补充或更换申请单"),
+    CERTIFICATE_PRINT("certificatePrintData", "证书打印审批", "证书打印审批"),
+    DEPT_EXECUTIVE_TASK("deptExecutiveTaskData", "实验室任务", "实验室任务"),
+    MY_EXECUTIVE_TASK("myExecutiveTaskData", "我的任务", "我的任务"),
+    OUTSOURCE_ASSESS("outsourceAssess", "测试、校准或检定工作分包评审表", "测试、校准或检定工作分包评审表"),
+    OUTSOURCE_PROTOCOL("outsourceProtocol", "测试、校准或检定工作分包协议书", "测试、校准或检定工作分包协议书"),
+
+    /**
+     * 系统管理
+     */
+    SIGN_EXPORT("signData", "签名", "签名"),
+    TEMPLATE_EXPORT("templateData", "文件模板", "文件模板"),
+    FLOW_DEF_EXPORT("flowDefData", "流程定义", "流程定义"),
+    DOWNLOAD_TEMPLATE("downloadTemplate", "流程定义", "页面配置");
 
     ExportEnum(String fileName, String sheetName, String description) {
         this.fileName = fileName;
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateRecordTypeCodeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateRecordTypeCodeEnum.java
index 31d913c..a963522 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateRecordTypeCodeEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateRecordTypeCodeEnum.java
@@ -46,4 +46,14 @@
     String SITE_EXECUTIVE_APPROVAL = "01";
     //《现场测试、校准或检定工作记录表》
     String SITE_EXECUTIVE_LOG = "02";
+
+    //测试、校准或检定工作分包协议书
+    String OUTSOURCE_PROTOCOL = "01";
+    //测试、校准或检定工作分包评审表
+    String OUTSOURCE_ACCESS = "02";
+    //测试、校准或检定工作分包通知书
+    String OUTSOURCE_NOTICE = "03";
+    //测试、校准或检定工作分包方名录
+    String OUTSOURCE_INFO = "04";
+
 }
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
index 24b8635..f78bd53 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
@@ -15,6 +15,10 @@
     String CERTIFICATE_CHANGE_APPLY_BEAN_NAME = "certificateChangeApplyBean";
     //现场测试、校准或检定
     String SITE_EXECUTIVE_BEAN_NAME = "siteExecutiveBean";
+    //测试、校准或检定工作分包评审表
+    String OUTSOURCE_ASSESS_BEAN_NAME = "outsourceAssessBean";
+    //测试、校准或检定工作分包协议书
+    String OUTSOURCE_PROTOCOL_BEAN_NAME = "outsourceProtocolBean";
 
     /*********************************设备与装置************************************/
     //设备台账
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 b21c661..6b86fd1 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
@@ -18,6 +18,8 @@
     OUTSOURCER_APPROVAL(OUTSOURCER_BEAN_NAME, ""),
     CERTIFICATE_CHANGE_APPROVAL(CERTIFICATE_CHANGE_APPLY_BEAN_NAME, ""),
     SITE_EXECUTIVE_APPROVAL(SITE_EXECUTIVE_BEAN_NAME, ""),
+    OUTSOURCE_ASSESS_APPROVAL(OUTSOURCE_ASSESS_BEAN_NAME, ""),
+    OUTSOURCE_PROTOCOL_APPROVAL(OUTSOURCE_PROTOCOL_BEAN_NAME, ""),
 
     ACTION_STATUS_MAP(new HashMap<String, AwareActionStatusEnum>() {
         {
@@ -47,6 +49,10 @@
             put(ApplyFromIdEnum.CERTIFICATE_CHANGE_APPROVAL.getCode(), CERTIFICATE_CHANGE_APPROVAL);
             //现场测试、校准或检定审批
             put(ApplyFromIdEnum.SITE_EXECUTIVE_APPROVAL.getCode(), SITE_EXECUTIVE_APPROVAL);
+            //测试、校准或检定工作分包评审表
+            put(ApplyFromIdEnum.OUTSOURCE_ASSESS_APPROVAL.getCode(), OUTSOURCE_ASSESS_APPROVAL);
+            //测试、校准或检定工作分包协议书
+            put(ApplyFromIdEnum.OUTSOURCE_PROTOCOL_APPROVAL.getCode(), OUTSOURCE_PROTOCOL_APPROVAL);
         }
     });
     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 934405e..c7410bd 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
@@ -9,6 +9,8 @@
     CERTIFICATE_CHANGE_APPROVAL("jljdywzsbchghsqd", MessageSourceModuleEnum.BUSINESS.getCode(), "证书/报告补充或更换申请单"),
     OUTSOURCER_APPROVAL("jljdywcsjzhgfbfml", MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定合格分包方名录"),
     SITE_EXECUTIVE_APPROVAL("jljdywxccsjzsp", MessageSourceModuleEnum.BUSINESS.getCode(), "现场测试、校准或检定审批"),
+    OUTSOURCE_ASSESS_APPROVAL("jljdywcsjzfbpsb", MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包评审表"),
+    OUTSOURCE_PROTOCOL_APPROVAL("jljdywcsjzfbxys", MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包协议书"),
 
 
     /*******************************************设备与装置*********************************************/
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/GeneralApprovalMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/GeneralApprovalMapper.java
index 4fb7344..0c9d6ae 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/GeneralApprovalMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/GeneralApprovalMapper.java
@@ -17,8 +17,4 @@
 
     Page<O> selectBatchForApprovalList(Page<O> page, @Param("request") R request, @Param("businessKeys") List<String> businessKeys);
 
-//    Page<O> selectListPage(Page<O> page, @Param("request") R request);
-
-//    Long selectMaxNo();
-
 }
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceAssessMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceAssessMapper.java
index 7867bb8..ba59009 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceAssessMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceAssessMapper.java
@@ -1,7 +1,12 @@
 package com.casic.missiles.mapper.business;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.business.outsource.OutsourceAssessApprovalListRequest;
+import com.casic.missiles.mapper.GeneralApprovalMapper;
 import com.casic.missiles.model.business.BizBusinessOutsourceAssess;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * <p>
@@ -11,6 +16,10 @@
  * @author wangpeng
  * @since 2023-08-16
  */
-public interface BizBusinessOutsourceAssessMapper extends BaseMapper<BizBusinessOutsourceAssess> {
+public interface BizBusinessOutsourceAssessMapper extends GeneralApprovalMapper<BizBusinessOutsourceAssess, BizBusinessOutsourceAssess, OutsourceAssessApprovalListRequest> {
+
+    Page<BizBusinessOutsourceAssess> selectBatchForApprovalList(Page<BizBusinessOutsourceAssess> page, @Param("request") OutsourceAssessApprovalListRequest request, @Param("businessKeys") List<String> businessKeys);
+
+    Long selectMaxProjectNo();
 
 }
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceProtocolMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceProtocolMapper.java
new file mode 100644
index 0000000..e6aba35
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceProtocolMapper.java
@@ -0,0 +1,24 @@
+package com.casic.missiles.mapper.business;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.business.outsource.OutsourceProtocolApprovalListRequest;
+import com.casic.missiles.mapper.GeneralApprovalMapper;
+import com.casic.missiles.model.business.BizBusinessOutsourceProtocol;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 计量检定业务-分包管理-测试、校准或检定工作分包协议书 Mapper 接口
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-08-24
+ */
+public interface BizBusinessOutsourceProtocolMapper extends GeneralApprovalMapper<BizBusinessOutsourceProtocol, BizBusinessOutsourceProtocol, OutsourceProtocolApprovalListRequest> {
+
+    Page<BizBusinessOutsourceProtocol> selectBatchForApprovalList(Page<BizBusinessOutsourceProtocol> page, @Param("request") OutsourceProtocolApprovalListRequest request, @Param("businessKeys") List<String> businessKeys);
+
+    Long selectMaxProtocolNo();
+}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/EnvLocationInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/EnvLocationInfoMapper.java
new file mode 100644
index 0000000..49eff87
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/EnvLocationInfoMapper.java
@@ -0,0 +1,21 @@
+package com.casic.missiles.mapper.resource;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.resource.environment.LocationListRequest;
+import com.casic.missiles.dto.resource.environment.LocationListResponse;
+import com.casic.missiles.model.resource.EnvLocationInfo;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * <p>
+ * 实验室环境监控系统-设备表 Mapper 接口
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-06-07
+ */
+public interface EnvLocationInfoMapper extends BaseMapper<EnvLocationInfo> {
+
+    Page<LocationListResponse> selectLocationListPage(Page<LocationListResponse> page, @Param("request") LocationListRequest request);
+}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java
index de124db..85ed0f7 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java
@@ -1,7 +1,9 @@
 package com.casic.missiles.mapper.system;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.dto.system.SignDetailResponse;
+import com.casic.missiles.dto.system.SignListRequest;
 import com.casic.missiles.model.system.SystemSign;
 import org.apache.ibatis.annotations.Param;
 
@@ -22,4 +24,8 @@
     SignDetailResponse selectSignDetailById(Long id);
 
     List<SystemSign> selectUsableSignList(@Param("userId") Long userId);
+
+    Page<SystemSign> selectSignListPage(Page<SystemSign> page, @Param("request") SignListRequest request);
+
+    List<SystemSign> selectSignList(@Param("request") SignListRequest request);
 }
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateChangeApplyMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateChangeApplyMapper.xml
index d798447..c496092 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateChangeApplyMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateChangeApplyMapper.xml
@@ -30,31 +30,31 @@
         SELECT *
         FROM biz_business_certificate_change_apply
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.changeApplyNo != null and request.changeApplyNo !=''">
+        <if test="request != null and request.changeApplyNo != null and request.changeApplyNo !=''">
             and change_apply_no like concat('%',#{request.changeApplyNo},'%')
         </if>
-        <if test="request.changeReportNo != null and request.changeReportNo !=''">
+        <if test="request != null and request.changeReportNo != null and request.changeReportNo !=''">
             and change_report_no like concat('%',#{request.changeReportNo},'%')
         </if>
-        <if test="request.changeReportName != null and request.changeReportName !=''">
+        <if test="request != null and request.changeReportName != null and request.changeReportName !=''">
             and change_report_name like concat('%',#{request.changeReportName},'%')
         </if>
-        <if test="request.changeType != null and request.changeType !=''">
+        <if test="request != null and request.changeType != null and request.changeType !=''">
             and change_type = #{request.changeType}
         </if>
-        <if test="request.createUserName != null and request.createUserName !=''">
+        <if test="request != null and request.createUserName != null and request.createUserName !=''">
             and create_user_name like concat('%',#{request.createUserName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificatePrintMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificatePrintMapper.xml
index b66cd99..49c0ac8 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificatePrintMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificatePrintMapper.xml
@@ -31,34 +31,34 @@
         LEFT JOIN biz_business_order_sample_relation bosr ON (bosr.order_id = bcr.order_id AND bosr.sample_id = bcr.sample_id)
         LEFT JOIN biz_business_order_info boi ON boi.id = bosr.order_id
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and bcp.approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.printStatus != null and request.printStatus !=''">
+        <if test="request != null and request.printStatus != null and request.printStatus !=''">
             and print_status = #{request.printStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and bcp.create_user_id = #{request.createUserId}
         </if>
-        <if test="request.certificateReportNo != null and request.certificateReportNo !=''">
+        <if test="request != null and request.certificateReportNo != null and request.certificateReportNo !=''">
             and bcr.certificate_report_no like concat('%',#{request.certificateReportNo},'%')
         </if>
-        <if test="request.certificateReportName != null and request.certificateReportName !=''">
+        <if test="request != null and request.certificateReportName != null and request.certificateReportName !=''">
             and bcr.certificate_report_name like concat('%',#{request.certificateReportName},'%')
         </if>
-        <if test="request.customerName != null and request.customerName !=''">
+        <if test="request != null and request.customerName != null and request.customerName !=''">
             and boi.customer_name like concat('%',#{request.customerName},'%')
         </if>
-        <if test="request.sampleNo != null and request.sampleNo !=''">
+        <if test="request != null and request.sampleNo != null and request.sampleNo !=''">
             and bosr.sample_no like concat('%',#{request.sampleNo},'%')
         </if>
-        <if test="request.sampleName != null and request.sampleName !=''">
+        <if test="request != null and request.sampleName != null and request.sampleName !=''">
             and bosr.sample_name like concat('%',#{request.sampleName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and bcp.create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and bcp.create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml
index b366034..767695d 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml
@@ -46,33 +46,37 @@
         SELECT bcr.*, bosr.sample_no, bosr.sample_name, bosr.sample_model, rsi.staff_name
         FROM biz_business_certificate_report bcr
         LEFT JOIN biz_business_order_sample_relation bosr ON (bosr.order_id = bcr.order_id AND bosr.sample_id = bcr.sample_id)
+        LEFT JOIN biz_business_order_info boi ON boi.id = bcr.order_id
         LEFT JOIN biz_resource_staff_info rsi ON rsi.id = bcr.measure_person_id
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and bcr.approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and bcr.create_user_id = #{request.createUserId}
         </if>
-        <if test="request.certificateReportNo != null and request.certificateReportNo !=''">
+        <if test="request != null and request.customerId != null and request.customerId !=''">
+            and boi.customer_id = #{request.customerId}
+        </if>
+        <if test="request != null and request.certificateReportNo != null and request.certificateReportNo !=''">
             and bcr.certificate_report_no like concat('%',#{request.certificateReportNo},'%')
         </if>
-        <if test="request.certificateReportName != null and request.certificateReportName !=''">
+        <if test="request != null and request.certificateReportName != null and request.certificateReportName !=''">
             and bcr.certificate_report_name like concat('%',#{request.certificateReportName},'%')
         </if>
-        <if test="request.sampleNo != null and request.sampleNo !=''">
+        <if test="request != null and request.sampleNo != null and request.sampleNo !=''">
             and bosr.sample_no like concat('%',#{request.sampleNo},'%')
         </if>
-        <if test="request.measureCategory != null and request.measureCategory !=''">
+        <if test="request != null and request.measureCategory != null and request.measureCategory !=''">
             and bcr.measure_category = #{request.measureCategory}
         </if>
-        <if test="request.measurePerson != null and request.measurePerson !=''">
+        <if test="request != null and request.measurePerson != null and request.measurePerson !=''">
             and rsi.staff_name like concat('%',#{request.measurePerson},'%')
         </if>
-        <if test="request.calibrationTimeStart != null and request.calibrationTimeStart !=''">
+        <if test="request != null and request.calibrationTimeStart != null and request.calibrationTimeStart !=''">
             and bcr.calibration_time &gt;= #{request.calibrationTimeStart}
         </if>
-        <if test="request.calibrationTimeEnd != null and request.calibrationTimeEnd !=''">
+        <if test="request != null and request.calibrationTimeEnd != null and request.calibrationTimeEnd !=''">
             and bcr.calibration_time &lt;= #{request.calibrationTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceAssessMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceAssessMapper.xml
index d0fcf8b..c22c101 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceAssessMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceAssessMapper.xml
@@ -7,6 +7,8 @@
         <id column="id" property="id" />
         <result column="project_no" property="projectNo" />
         <result column="project_name" property="projectName" />
+        <result column="lab_code" property="labCode" />
+        <result column="group_code" property="groupCode" />
         <result column="applicant_id" property="applicantId" />
         <result column="applicant_name" property="applicantName" />
         <result column="applicant_time" property="applicantTime" />
@@ -31,7 +33,45 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, project_no, project_name, applicant_id, applicant_name, applicant_time, minio_file_name, remark, create_user_id, create_user_name, outsourcer_id, pre_start_time, pre_end_time, outsource_reason, pre_cost, approval_status, process_id, approve_situation, traceability, test_method, technique_ability, create_time, update_time
+        id, project_no, project_name, lab_code, group_code, applicant_id, applicant_name, applicant_time, minio_file_name, remark, create_user_id, create_user_name, outsourcer_id, pre_start_time, pre_end_time, outsource_reason, pre_cost, approval_status, process_id, approve_situation, traceability, test_method, technique_ability, create_time, update_time
     </sql>
 
+    <select id="selectMaxProjectNo" resultType="java.lang.Long">
+        SELECT IFNULL(max(RIGHT(project_no, 3)), 0) from biz_business_outsource_assess
+    </select>
+
+    <select id="selectBatchForApprovalList" resultMap="BaseResultMap">
+        SELECT bboa.*, bboi.outsourcer_name, bboi.director
+        FROM biz_business_outsource_assess bboa
+        LEFT JOIN biz_business_outsourcer_info bboi ON bboa.outsourcer_id = bboi.id
+        WHERE 1=1
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
+            and bboa.approval_status = #{request.approvalStatus}
+        </if>
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
+            and bboa.create_user_id = #{request.createUserId}
+        </if>
+        <if test="request != null and request.projectNo != null and request.projectNo !=''">
+            and bboa.project_no like concat('%',#{request.projectNo},'%')
+        </if>
+        <if test="request != null and request.outsourcerName != null and request.outsourcerName !=''">
+            and bboi.outsourcer_name like concat('%',#{request.outsourcerName},'%')
+        </if>
+        <if test="request != null and request.applicantName != null and request.applicantName !=''">
+            and bboa.applicant_name like concat('%',#{request.applicantName},'%')
+        </if>
+        <if test="request != null and request.applicantTimeStart != null and request.applicantTimeStart !=''">
+            and bboa.applicant_time &gt;= #{request.applicantTimeStart}
+        </if>
+        <if test="request != null and request.applicantTimeEnd != null and request.applicantTimeEnd !=''">
+            and bboa.applicant_time &lt;= #{request.applicantTimeEnd}
+        </if>
+        <if test="businessKeys != null">
+            and bboa.id in
+            <foreach collection="businessKeys" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
+        ORDER BY bboa.create_time DESC
+    </select>
 </mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceProtocolMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceProtocolMapper.xml
new file mode 100644
index 0000000..b7b2149
--- /dev/null
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceProtocolMapper.xml
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.mapper.business.BizBusinessOutsourceProtocolMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.business.BizBusinessOutsourceProtocol">
+        <id column="id" property="id" />
+        <result column="protocol_no" property="protocolNo" />
+        <result column="project_name" property="projectName" />
+        <result column="lab_code" property="labCode" />
+        <result column="group_code" property="groupCode" />
+        <result column="outsourcer_id" property="outsourcerId" />
+        <result column="remark" property="remark" />
+        <result column="outsource_no" property="outsourceNo" />
+        <result column="outsource_name" property="outsourceName" />
+        <result column="contacts" property="contacts" />
+        <result column="mobile" property="mobile" />
+        <result column="address" property="address" />
+        <result column="require_date" property="requireDate" />
+        <result column="outsource_cost" property="outsourceCost" />
+        <result column="director" property="director" />
+        <result column="item" property="item" />
+        <result column="requires" property="requires" />
+        <result column="create_user_id" property="createUserId" />
+        <result column="create_user_name" property="createUserName" />
+        <result column="approval_status" property="approvalStatus" />
+        <result column="process_id" property="processId" />
+        <result column="create_time" property="createTime" />
+        <result column="update_time" property="updateTime" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, protocol_no, project_name, lab_code, group_code, outsourcer_id, remark, outsource_no, outsource_name, contacts, mobile, address, require_date, outsource_cost, director, item, requires, create_user_id, create_user_name, approval_status, process_id, create_time, update_time
+    </sql>
+
+    <select id="selectMaxProtocolNo" resultType="java.lang.Long">
+        SELECT IFNULL(max(RIGHT(protocol_no, 3)), 0) from biz_business_outsource_protocol
+    </select>
+
+    <select id="selectBatchForApprovalList" resultMap="BaseResultMap">
+        SELECT *
+        FROM biz_business_outsource_protocol
+        WHERE 1=1
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
+            and approval_status = #{request.approvalStatus}
+        </if>
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
+            and create_user_id = #{request.createUserId}
+        </if>
+        <if test="request != null and request.protocolNo != null and request.protocolNo !=''">
+            and protocol_no like concat('%',#{request.protocolNo},'%')
+        </if>
+        <if test="request != null and request.outsourcerName != null and request.outsourcerName !=''">
+            and outsourcer_name like concat('%',#{request.outsourcerName},'%')
+        </if>
+        <if test="request != null and request.applicantName != null and request.applicantName !=''">
+            and create_user_name like concat('%',#{request.applicantName},'%')
+        </if>
+        <if test="request != null and request.applicantTimeStart != null and request.applicantTimeStart !=''">
+            and create_time &gt;= #{request.applicantTimeStart}
+        </if>
+        <if test="request != null and request.applicantTimeEnd != null and request.applicantTimeEnd !=''">
+            and create_time &lt;= #{request.applicantTimeEnd}
+        </if>
+        <if test="businessKeys != null">
+            and id in
+            <foreach collection="businessKeys" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
+        ORDER BY create_time DESC
+    </select>
+</mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourcerInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourcerInfoMapper.xml
index 510a80b..3049b54 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourcerInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourcerInfoMapper.xml
@@ -7,6 +7,8 @@
         <id column="id" property="id" />
         <result column="outsourcer_no" property="outsourcerNo" />
         <result column="outsourcer_name" property="outsourcerName" />
+        <result column="lab_code" property="labCode" />
+        <result column="group_code" property="groupCode" />
         <result column="outsourcer_brief_name" property="outsourcerBriefName" />
         <result column="outsourcer_size" property="outsourcerSize" />
         <result column="business_size" property="businessSize" />
@@ -55,32 +57,32 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, outsourcer_no, outsourcer_name, outsourcer_brief_name, outsourcer_size, business_size, grade, evaluation, tax_number, bank_account, bank_name, bank_account_number, postal_code, director, phone, fax, mobile, email, website, address_country, address_province, address_city, address_area, full_address, address_country_name, address_province_name, address_city_name, address_area_name, invoice_country, invoice_province, invoice_city, invoice_area, invoice_full_address, invoice_country_name, invoice_province_name, invoice_city_name, invoice_area_name, business_scope, business_content, minio_file_name, approval_status, process_id, remark, create_user_id, create_user_name, create_time, update_time
+        id, outsourcer_no, outsourcer_name, lab_code, group_code, outsourcer_brief_name, outsourcer_size, business_size, grade, evaluation, tax_number, bank_account, bank_name, bank_account_number, postal_code, director, phone, fax, mobile, email, website, address_country, address_province, address_city, address_area, full_address, address_country_name, address_province_name, address_city_name, address_area_name, invoice_country, invoice_province, invoice_city, invoice_area, invoice_full_address, invoice_country_name, invoice_province_name, invoice_city_name, invoice_area_name, business_scope, business_content, minio_file_name, approval_status, process_id, remark, create_user_id, create_user_name, create_time, update_time
     </sql>
 
     <select id="selectBatchForApprovalList" resultMap="BaseResultMap">
         SELECT *
         FROM biz_business_outsourcer_info
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.outsourcerNo != null and request.outsourcerNo !=''">
+        <if test="request != null and request.outsourcerNo != null and request.outsourcerNo !=''">
             and outsourcer_no like concat('%',#{request.outsourcerNo},'%')
         </if>
-        <if test="request.outsourcerName != null and request.outsourcerName !=''">
+        <if test="request != null and request.outsourcerName != null and request.outsourcerName !=''">
             and outsourcer_name like concat('%',#{request.outsourcerName},'%')
         </if>
-        <if test="request.director != null and request.director !=''">
+        <if test="request != null and request.director != null and request.director !=''">
             and director like concat('%',#{request.director},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
@@ -93,6 +95,6 @@
     </select>
 
     <select id="selectMaxNo" resultType="java.lang.Long">
-        SELECT IFNULL(max(RIGHT(outsourcer_no, 12)), 0) from biz_business_outsourcer_info
+        SELECT IFNULL(max(RIGHT(outsourcer_no, 3)), 0) from biz_business_outsourcer_info
     </select>
 </mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessSiteExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessSiteExecutiveInfoMapper.xml
index 135c5d0..3c5ae79 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessSiteExecutiveInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessSiteExecutiveInfoMapper.xml
@@ -38,25 +38,25 @@
         FROM biz_business_site_executive_info bsei
         LEFT JOIN biz_resource_customer_info rci ON bsei.customer_id = rci.id
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and bsei.approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and bsei.create_user_id = #{request.createUserId}
         </if>
-        <if test="request.siteExecutiveNo != null and request.siteExecutiveNo !=''">
+        <if test="request != null and request.siteExecutiveNo != null and request.siteExecutiveNo !=''">
             and bsei.site_executive_no like concat('%',#{request.siteExecutiveNo},'%')
         </if>
-        <if test="request.customerName != null and request.customerName !=''">
+        <if test="request != null and request.customerName != null and request.customerName !=''">
             and rci.outsourcer_name like concat('%',#{request.customerName},'%')
         </if>
-        <if test="request.applyName != null and request.applyName !=''">
+        <if test="request != null and request.applyName != null and request.applyName !=''">
             and bsei.apply_name like concat('%',#{request.applyName},'%')
         </if>
-        <if test="request.applyTimeStart != null and request.applyTimeStart !=''">
+        <if test="request != null and request.applyTimeStart != null and request.applyTimeStart !=''">
             and bsei.apply_time &gt;= #{request.applyTimeStart}
         </if>
-        <if test="request.applyTimeEnd != null and request.applyTimeEnd !=''">
+        <if test="request != null and request.applyTimeEnd != null and request.applyTimeEnd !=''">
             and bsei.apply_time &lt;= #{request.applyTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml
index 84d9e2a..6bd38a9 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml
@@ -105,6 +105,12 @@
         <if test="request.isUrgent != null and request.isUrgent !=''">
             AND bo.is_urgent = #{request.isUrgent}
         </if>
+        <if test="request.ids != null">
+            and blei.id in
+            <foreach collection="request.ids" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
         ORDER BY blei.update_time DESC
     </select>
 
@@ -137,6 +143,12 @@
         <if test="request.isUrgent != null and request.isUrgent !=''">
             AND bo.is_urgent = #{request.isUrgent}
         </if>
+        <if test="request.ids != null">
+            and blei.id in
+            <foreach collection="request.ids" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
         ORDER BY blei.update_time DESC
     </select>
 
diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardInfoMapper.xml
index 1a5551b..2ed8d17 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardInfoMapper.xml
@@ -45,12 +45,6 @@
         FROM biz_equipment_standard_info besi
         LEFT JOIN biz_equipment_standard_technology_relation bestr ON besi.standard_no = bestr.standard_no
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
-            and besi.approval_status = #{request.approvalStatus}
-        </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
-            and besi.create_user_id = #{request.createUserId}
-        </if>
         <if test="request.standardName != null and request.standardName !=''">
             and besi.standard_name like concat('%',#{request.standardName},'%')
         </if>
diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardTechnologyRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardTechnologyRelationMapper.xml
index fc7e16c..cd03c8c 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardTechnologyRelationMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardTechnologyRelationMapper.xml
@@ -6,6 +6,7 @@
     <resultMap id="BaseResultMap" type="com.casic.missiles.model.equipment.BizEquipmentStandardTechnologyRelation">
         <id column="id" property="id" />
         <result column="technology_file_id" property="technologyFileId" />
+        <result column="technology_file_no" property="technologyFileNo" />
         <result column="technology_file_name" property="technologyFileName" />
         <result column="standard_id" property="standardId" />
         <result column="standard_no" property="standardNo" />
@@ -14,7 +15,7 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, technology_file_id, technology_file_name, standard_id, remark
+        id, technology_file_id, technology_file_no, technology_file_name, standard_id, remark
     </sql>
 
 </mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceAuthorizeOrderMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceAuthorizeOrderMapper.xml
index ac5176c..554fe65 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceAuthorizeOrderMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceAuthorizeOrderMapper.xml
@@ -32,22 +32,22 @@
         SELECT *
         FROM biz_resource_authorize_order
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.orderNo != null and request.orderNo !=''">
+        <if test="request != null and request.orderNo != null and request.orderNo !=''">
             and order_no like concat('%',#{request.orderNo},'%')
         </if>
-        <if test="request.createUserName != null and request.createUserName !=''">
+        <if test="request != null and request.createUserName != null and request.createUserName !=''">
             and create_user_name like concat('%',#{request.createUserName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerExamineFormMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerExamineFormMapper.xml
index ab242f6..af7f98f 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerExamineFormMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerExamineFormMapper.xml
@@ -41,28 +41,28 @@
         SELECT *
         FROM biz_resource_customer_examine_form
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.formNo != null and request.formNo !=''">
+        <if test="request != null and request.formNo != null and request.formNo !=''">
             and form_no like concat('%',#{request.formNo},'%')
         </if>
-        <if test="request.labCode != null and request.labCode !=''">
+        <if test="request != null and request.labCode != null and request.labCode !=''">
             and lab_code like concat('%',#{request.labCode},'%')
         </if>
-        <if test="request.groupCode != null and request.groupCode !=''">
+        <if test="request != null and request.groupCode != null and request.groupCode !=''">
             and group_code like concat('%',#{request.groupCode},'%')
         </if>
-        <if test="request.createUserName != null and request.createUserName !=''">
+        <if test="request != null and request.createUserName != null and request.createUserName !=''">
             and create_user_name like concat('%',#{request.createUserName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerInfoMapper.xml
index fa8ffbc..06a2798 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerInfoMapper.xml
@@ -33,25 +33,25 @@
         SELECT *
         FROM biz_resource_customer_info
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.customerNo != null and request.customerNo !=''">
+        <if test="request != null and request.customerNo != null and request.customerNo !=''">
             and customer_no like concat('%',#{request.customerNo},'%')
         </if>
-        <if test="request.customerName != null and request.customerName !=''">
+        <if test="request != null and request.customerName != null and request.customerName !=''">
             and customer_name like concat('%',#{request.customerName},'%')
         </if>
-        <if test="request.contacts != null and request.contacts !=''">
+        <if test="request != null and request.contacts != null and request.contacts !=''">
             and contacts like concat('%',#{request.contacts},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerSuggestFormMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerSuggestFormMapper.xml
index 28f5bb2..1806662 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerSuggestFormMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerSuggestFormMapper.xml
@@ -33,28 +33,28 @@
         SELECT *
         FROM biz_resource_customer_suggest_form
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.formNo != null and request.formNo !=''">
+        <if test="request != null and request.formNo != null and request.formNo !=''">
             and form_no like concat('%',#{request.formNo},'%')
         </if>
-        <if test="request.customerName != null and request.customerName !=''">
+        <if test="request != null and request.customerName != null and request.customerName !=''">
             and customer_name like concat('%',#{request.customerName},'%')
         </if>
-        <if test="request.customerDeptName != null and request.customerDeptName !=''">
+        <if test="request != null and request.customerDeptName != null and request.customerDeptName !=''">
             and customer_dept_name like concat('%',#{request.customerDeptName},'%')
         </if>
-        <if test="request.createUserName != null and request.createUserName !=''">
+        <if test="request != null and request.createUserName != null and request.createUserName !=''">
             and create_user_name like concat('%',#{request.createUserName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSealUseNoteMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSealUseNoteMapper.xml
index ab37bc1..b02bb33 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSealUseNoteMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSealUseNoteMapper.xml
@@ -29,32 +29,32 @@
     </sql>
 
     <select id="selectBatchForApprovalList" resultMap="BaseResultMap">
-        SELECT *
+        SELECT brsun.*, brsi.seal_name, brsi.seal_type, brsi.approver_name
         FROM biz_resource_seal_use_note brsun
         JOIN biz_resource_seal_info brsi ON brsun.seal_id = brsi.id
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and brsun.approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and brsun.create_user_id = #{request.createUserId}
         </if>
-        <if test="request.sealName != null and request.sealName !=''">
+        <if test="request != null and request.sealName != null and request.sealName !=''">
             and brsi.seal_name like concat('%',#{request.sealName},'%')
         </if>
-        <if test="request.sealType != null and request.sealType !=''">
+        <if test="request != null and request.sealType != null and request.sealType !=''">
             and brsi.seal_type = #{request.sealType}
         </if>
-        <if test="request.applyDeptName != null and request.applyDeptName !=''">
+        <if test="request != null and request.applyDeptName != null and request.applyDeptName !=''">
             and brsun.apply_dept_name like concat('%',#{request.applyDeptName},'%')
         </if>
-        <if test="request.applyUserName != null and request.applyUserName !=''">
+        <if test="request != null and request.applyUserName != null and request.applyUserName !=''">
             and brsun.apply_user_name like concat('%',#{request.applyUserName},'%')
         </if>
-        <if test="request.applyTimeStart != null and request.applyTimeStart !=''">
+        <if test="request != null and request.applyTimeStart != null and request.applyTimeStart !=''">
             and brsun.apply_time &gt;= #{request.applyTimeStart}
         </if>
-        <if test="request.applyTimeEnd != null and request.applyTimeEnd !=''">
+        <if test="request != null and request.applyTimeEnd != null and request.applyTimeEnd !=''">
             and brsun.apply_time &lt;= #{request.applyTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml
index 119bf7d..4f8392a 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml
@@ -31,6 +31,12 @@
         <if test="request.deptName != null and request.deptName !=''">
             and brsi.dept_name like concat('%',#{request.deptName},'%')
         </if>
+        <if test="request.ids != null">
+            and brsv.id in
+            <foreach collection="request.ids" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
         ORDER BY brsv.grant_date DESC
     </select>
 
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSupplierInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSupplierInfoMapper.xml
index fe8d399..e8ce7ef 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSupplierInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSupplierInfoMapper.xml
@@ -48,28 +48,28 @@
         SELECT *
         FROM biz_resource_supplier_info
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.supplierNo != null and request.supplierNo !=''">
+        <if test="request != null and request.supplierNo != null and request.supplierNo !=''">
             and supplier_no like concat('%',#{request.supplierNo},'%')
         </if>
-        <if test="request.supplierName != null and request.supplierName !=''">
+        <if test="request != null and request.supplierName != null and request.supplierName !=''">
             and supplier_name like concat('%',#{request.supplierName},'%')
         </if>
-        <if test="request.director != null and request.director !=''">
+        <if test="request != null and request.director != null and request.director !=''">
             and director like concat('%',#{request.director},'%')
         </if>
-        <if test="request.supplierType != null and request.supplierType !=''">
+        <if test="request != null and request.supplierType != null and request.supplierType !=''">
             and supplier_type = #{request.supplierType}
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/EnvLocationInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/EnvLocationInfoMapper.xml
new file mode 100644
index 0000000..68bcf10
--- /dev/null
+++ b/casic-metering-dao/src/main/resources/mapper/resource/EnvLocationInfoMapper.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.mapper.resource.EnvLocationInfoMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.resource.EnvLocationInfo">
+        <id column="id" property="id" />
+        <result column="location_no" property="locationNo" />
+        <result column="location_name" property="locationName" />
+        <result column="location_position" property="locationPosition" />
+        <result column="create_user_id" property="createUserId" />
+        <result column="create_user" property="createUser" />
+        <result column="create_time" property="createTime" />
+        <result column="update_time" property="updateTime" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, location_no, location_name, location_position, create_user_id, create_user, create_time, update_time
+    </sql>
+
+    <select id="selectLocationListPage" resultType="com.casic.missiles.dto.resource.environment.LocationListResponse">
+        SELECT *
+        FROM env_location_info
+        WHERE 1=1
+        <if test="request.locationNo != null and request.locationNo !=''">
+            AND location_no LIKE concat('%',#{request.locationNo},'%')
+        </if>
+        <if test="request.locationName != null and request.locationName !=''">
+            AND location_name LIKE concat('%',#{request.locationName},'%')
+        </if>
+        ORDER BY create_time DESC
+    </select>
+
+</mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml
index b28c18f..8854047 100644
--- a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml
@@ -11,7 +11,6 @@
         <result column="sign_desc" property="signDesc" />
         <result column="sign_director" property="signDirector" />
         <result column="sign_user_id" property="signUserId" />
-        <result column="sign_type" property="signType" />
         <result column="minio_file_name" property="minioFileName" />
         <result column="create_time" property="createTime" />
         <result column="update_time" property="updateTime" />
@@ -28,7 +27,6 @@
         <result column="sign_name" property="signName" />
         <result column="sign_desc" property="signDesc" />
         <result column="sign_director" property="signDirector" />
-        <result column="sign_type" property="signType" />
         <result column="sign_user_id" property="signUserId" />
         <result column="minio_file_name" property="minioFileName" />
         <result column="create_time" property="createTime" />
@@ -62,4 +60,58 @@
         JOIN system_sign_user_relation ssur ON ss.id = ssur.sign_id
         WHERE ssur.user_id = #{userId}
     </select>
+
+    <select id="selectSignListPage" resultMap="BaseResultMap">
+        SELECT ss.*, sd.SIMPLE_NAME AS deptName
+        FROM system_sign ss
+        LEFT JOIN sys_user su ON su.id = ss.sign_user_id
+        LEFT JOIN sys_dept sd ON sd.id = su.dept_id
+        WHERE 1=1
+        <if test="request.signNo != null and request.signNo !=''">
+            AND ss.sign_no LIKE concat('%',#{request.signNo},'%')
+        </if>
+        <if test="request.signName != null and request.signName !=''">
+            AND ss.sign_name LIKE concat('%',#{request.signName},'%')
+        </if>
+        <if test="request.signDirector != null and request.signDirector !=''">
+            AND ss.sign_director LIKE concat('%',#{request.signDirector},'%')
+        </if>
+        <if test="request.signUserId != null and request.signUserId !=''">
+            AND ss.sign_user_id = #{request.signUserId}
+        </if>
+        <if test="request.createStartTime != null and request.createStartTime !=''">
+            AND DATE_FORMAT(ss.create_time,'%Y-%m-%d') &gt;= DATE_FORMAT(#{request.createStartTime},'%Y-%m-%d')
+        </if>
+        <if test="request.createEndTime != null and request.createEndTime !=''">
+            AND DATE_FORMAT(ss.create_time,'%Y-%m-%d')  &lt;= DATE_FORMAT(#{request.createEndTime},'%Y-%m-%d')
+        </if>
+        ORDER BY ss.create_time DESC
+    </select>
+
+    <select id="selectSignList" resultMap="BaseResultMap">
+        SELECT ss.*, sd.SIMPLE_NAME AS deptName
+        FROM system_sign ss
+        LEFT JOIN sys_user su ON su.id = ss.sign_user_id
+        LEFT JOIN sys_dept sd ON sd.id = su.dept_id
+        WHERE 1=1
+        <if test="request.signNo != null and request.signNo !=''">
+            AND ss.sign_no LIKE concat('%',#{request.signNo},'%')
+        </if>
+        <if test="request.signName != null and request.signName !=''">
+            AND ss.sign_name LIKE concat('%',#{request.signName},'%')
+        </if>
+        <if test="request.signDirector != null and request.signDirector !=''">
+            AND ss.sign_director LIKE concat('%',#{request.signDirector},'%')
+        </if>
+        <if test="request.signUserId != null and request.signUserId !=''">
+            AND ss.sign_user_id = #{request.signUserId}
+        </if>
+        <if test="request.createStartTime != null and request.createStartTime !=''">
+            AND DATE_FORMAT(ss.create_time,'%Y-%m-%d') &gt;= DATE_FORMAT(#{request.createStartTime},'%Y-%m-%d')
+        </if>
+        <if test="request.createEndTime != null and request.createEndTime !=''">
+            AND DATE_FORMAT(ss.create_time,'%Y-%m-%d')  &lt;= DATE_FORMAT(#{request.createEndTime},'%Y-%m-%d')
+        </if>
+        ORDER BY ss.create_time DESC
+    </select>
 </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 515050a..60f530b 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
@@ -47,8 +47,8 @@
     String STORAGE_LOCATION = "bizStorageLocation";
     //计量专业
     String MEASURE_MAJOR = "bizMeasureMajor";
-    //管理状态
-    String MANAGER_STATE = "bizManagerState";
+    //标准装置管理状态
+    String STANDARD_MANAGER_STATE = "bizStandardManagerState";
 
     /**
      * 资源管理 字典code
@@ -95,8 +95,6 @@
     String MEASURE_STATUS = "measureStatus";
     //检定方式
     String MEASURE_TYPE = "measureType";
-    //标识打印标志类型
-    String IDENTIFY_PRINT_TYPE = "bizBusinessIdentify";
     //变更类型
     String REPORT_CHANGE_TYPE = "bizCertChangeType";
     //规模类型
@@ -111,19 +109,24 @@
     String MEASURE_CATEGORY = "measureCategory";
     //检定结果
     String MEASURE_RESULT = "measureResult";
+    //分包原因
+    String OUTSOURCE_REASON = "outsourceReason";
+
+    /**
+     * 系统管理
+     */
+    String TEMPLATE_TYPE = "templateType";
+
 
     /**
      * 标准装置 字典code
      */
     //类别
     String STANDARD_CATEGORY = "standardCategory";
-    //管理状态
-    String STANDARD_MANAGER_STATE = "standardManagerState";
     //标准等级
     String STANDARD_LEVEL = "standardLevel";
     //传递范围
     String STANDARD_TRANSMIT_RANGE = "transmitRange";
-
     //资本来源
     String CAPITAL_SOURCE = "capitalSource";
     //标准装置-申请类型
@@ -148,8 +151,6 @@
     String CERTIFICATE_CLASS = "certificationClass";
     //证书管理-检校专业
     String CALIBRATION_MAJOR = "calibrationMajor";
-    //分包原因
-    String OUTSOURCE_REASON = "outsourceReason";
 
     /**
      * 工作台
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/BaseApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/BaseApprovalListRequest.java
index 73c12c1..80d7424 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/BaseApprovalListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/BaseApprovalListRequest.java
@@ -6,6 +6,7 @@
 
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotEmpty;
+import java.util.List;
 
 /**
  * @Description:
@@ -19,14 +20,14 @@
      * 表单id
      */
     @NotBlank(message = "表单id不能为空")
-    @ApiModelProperty(value = "表单id（流程定义对应的表单id，等价于业务id）", dataType = "String")
+    @ApiModelProperty(value = "表单id（流程定义对应的表单id，等价于业务id），导出接口不用传", dataType = "String")
     private String formId;
 
     /**
      * 审批状态类型，对应ApprovalStatusEnum
      */
     @NotEmpty(message = "审批状态类型不能为空")
-    @ApiModelProperty(value = "审批状态类型code", dataType = "String")
+    @ApiModelProperty(value = "审批状态类型code，导出接口不用传", dataType = "String")
     private String approvalStatus;
 
     @ApiModelProperty(hidden = true)
@@ -34,4 +35,7 @@
 
     @ApiModelProperty(hidden = true)
     private Long createUserId;
+
+    @ApiModelProperty(value = "导出ids", dataType = "List")
+    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificatePrintApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificatePrintApprovalListRequest.java
index b93d1c9..3cc2f4e 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificatePrintApprovalListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificatePrintApprovalListRequest.java
@@ -5,8 +5,6 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import java.util.List;
-
 /**
  * @Description:
  * @Author: wangpeng
@@ -38,7 +36,4 @@
 
     @ApiModelProperty(value = "创建结束时间", dataType = "String")
     private String createTimeEnd;
-
-    @ApiModelProperty(value = "导出ids", dataType = "List")
-    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportApprovalListRequest.java
index 4f7a038..c115847 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportApprovalListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportApprovalListRequest.java
@@ -5,8 +5,6 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import java.util.List;
-
 /**
  * @Description:
  * @Author: wangpeng
@@ -15,6 +13,8 @@
 @ApiModel
 @Data
 public class CertificateReportApprovalListRequest extends BaseApprovalListRequest {
+    @ApiModelProperty(value = "委托方id", dataType = "String")
+    private Long customerId;
 
     @ApiModelProperty(value = "证书报告编号", dataType = "String")
     private String certificateReportNo;
@@ -37,6 +37,4 @@
     @ApiModelProperty(value = "检校结束时间", dataType = "String")
     private String calibrationTimeEnd;
 
-    @ApiModelProperty(value = "导出ids", dataType = "List")
-    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/identify/IdentifyListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/identify/IdentifyListRequest.java
index 1b87ae6..f019203 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/identify/IdentifyListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/identify/IdentifyListRequest.java
@@ -4,6 +4,8 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * @Description:
  * @Author: wangpeng
@@ -26,4 +28,7 @@
 
     @ApiModelProperty(value = "打印结束时间", dataType = "String")
     private String createTimeEnd;
+
+    @ApiModelProperty(value = "导出ids", dataType = "List")
+    private List<Long> ids;
 }

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java
index bb0c50f..13a699b 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java
@@ -12,6 +12,7 @@
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.IGeneralApprovalService;
+import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
@@ -19,6 +20,7 @@
 import org.springframework.web.bind.annotation.RequestBody;
 
 import javax.validation.Valid;
+import java.util.List;
 import java.util.Objects;
 
 /**
@@ -117,4 +119,17 @@
         }
         return baseApprovalService.failUpdate(request);
     }
+
+    public List<O> exportList(@RequestBody @Valid R request) throws Exception {
+        List<O> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = baseApprovalService.listExportByIds(request.getIds());
+        } else {
+            list = baseApprovalService.listExport(request);
+        }
+        for (O record : list) {
+            DictCodeUtils.convertDictCodeToName(record);
+        }
+        return list;
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java
index 8a90961..d775831 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java
@@ -5,6 +5,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.business.certificate.CertificateChangeApplyApprovalListRequest;
 import com.casic.missiles.dto.business.certificate.CertificateChangeApplySaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessCertificateChangeApply;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
@@ -20,6 +21,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -48,4 +50,12 @@
         }
         return changeApplyService.saveChangeApply(request);
     }
+
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody CertificateChangeApplyApprovalListRequest request) throws Exception {
+        List<BizBusinessCertificateChangeApply> list = super.exportList(request);
+        super.exportExcel(BizBusinessCertificateChangeApply.class, list, ExportEnum.CERTIFICATE_CHANGE_APPLY.getSheetName());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java
index 5fc4b07..af8230e 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java
@@ -9,6 +9,7 @@
 import com.casic.missiles.dto.business.certificate.CertificatePrintApprovalListRequest;
 import com.casic.missiles.dto.business.certificate.CertificatePrintListResponse;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.enums.business.CertificatePrintStatusEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessCertificatePrintLog;
@@ -18,10 +19,16 @@
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.io.IOException;
+import java.util.List;
 import java.util.Objects;
 
 /**
@@ -98,4 +105,16 @@
         });
         return certificatePrintService.certificatePrintLog(idDTO.getId());
     }
+
+    @ApiOperation("证书打印审批导出")
+    @PostMapping("/listExport")
+    public void exportList(@RequestBody CertificatePrintApprovalListRequest request) throws IOException {
+        List<CertificatePrintListResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = certificatePrintService.listByIds(request.getIds());
+        } else {
+            list = certificatePrintService.list(request);
+        }
+        super.exportExcel(CertificatePrintListResponse.class, list, ExportEnum.CERTIFICATE_PRINT.getSheetName());
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java
index 63b06dc..6b2efd5 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java
@@ -6,6 +6,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.business.certificate.CertificateReportApprovalListRequest;
 import com.casic.missiles.dto.business.certificate.CertificateReportSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessCertificateReport;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
@@ -21,6 +22,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -50,7 +52,7 @@
         return certificateReportService.saveCertificateReport(request);
     }
 
-    @ApiOperation("证书审批详情（基本信息）")
+    @ApiOperation("详情（基本信息）")
     @PostMapping("/detail")
     public ReturnDTO<BizBusinessCertificateReport> detail(@RequestBody @Valid BaseDetailRequest request, BindingResult bindingResult) throws Exception {
         if(bindingResult.hasErrors()){
@@ -59,4 +61,11 @@
         return certificateReportService.detail(request);
     }
 
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody CertificateReportApprovalListRequest request) throws Exception {
+        List<BizBusinessCertificateReport> list = super.exportList(request);
+        super.exportExcel(BizBusinessCertificateReport.class, list, ExportEnum.CERTIFICATE_REPORT.getSheetName());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java
index 46b26bd..57c0809 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java
@@ -10,20 +10,21 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.business.identify.IdentifyListRequest;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessIdentifyInfo;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.business.IBizBusinessIdentifyInfoService;
+import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import javax.validation.Valid;
+import java.util.List;
 import java.util.Objects;
 
 /**
@@ -57,16 +58,13 @@
         return identifyInfoService.addIdentify(identifyInfo);
     }
 
-    @ApiOperation("标识打印更新")
+    @ApiOperation("标识打印更新（更新打印时间）")
     @PostMapping("/update")
-    public ReturnDTO updateIdentify(@RequestBody @Valid BizBusinessIdentifyInfo identifyInfo, BindingResult bindingResult) {
-        Assert.isFalse(Objects.isNull(identifyInfo.getId()), () -> {
+    public ReturnDTO updateIdentify(@RequestBody @Valid IdDTO idDTO) {
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        Assert.isFalse(bindingResult.hasErrors(), () -> {
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        });
-        return identifyInfoService.updateIdentify(identifyInfo);
+        return identifyInfoService.updateIdentify(idDTO.getId());
     }
 
     @ApiOperation("标识打印删除")
@@ -77,4 +75,37 @@
         });
         return identifyInfoService.deleteIdentify(idDTO.getId());
     }
+
+    @ApiOperation("标识打印导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody @Valid IdentifyListRequest request, BindingResult bindingResult) throws Exception {
+        if (bindingResult.hasErrors()) {
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        List<BizBusinessIdentifyInfo> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = identifyInfoService.listByIds(request.getIds());
+        } else {
+            list = identifyInfoService.list(request);
+        }
+        for (BizBusinessIdentifyInfo record : list) {
+            DictCodeUtils.convertDictCodeToName(record);
+        }
+        super.exportExcel(BizBusinessIdentifyInfo.class, list, ExportEnum.IDENTIFY_EXPORT.getSheetName());
+    }
+
+
+    // TODO: 2023/8/23 查询设备信息，4个底部按钮查设备（按钮的作用就是前端用来调不同接口、用来区分中间即将展示的标识），前端弹窗选设备，在确定保存时前端根据底部按钮判断传入设备类型deviceType字典code
+    // TODO: 2023/8/23 接口：查受检设备（第1个按钮），查设备台账（后3个按钮同一接口），查询之后前端根据标志类型的不同加到中间页面时进行判断（按产品给的对应表）
+    // TODO: 2023/8/23 提供二维码接口，前端在加到中间页面时调用一下
+
+    @ApiOperation("设备二维码")
+    @PostMapping("/equipment/qrCode")
+    public ReturnDTO<String> equipmentQrCode(@RequestBody @Valid IdDTO idDTO) {
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return identifyInfoService.equipmentQrCode(idDTO.getId());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java
index 707be6e..7e0453d 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java
@@ -117,7 +117,7 @@
     }
 
     @ApiOperation("任务单导出")
-    @PostMapping("/export")
+    @PostMapping("/listExport")
     public void orderExport(@RequestBody @Valid OrderListRequest request, HttpServletResponse response) {
         businessOrderService.orderExport(request, response);
     }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java
index 529a6ce..51432be 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java
@@ -1,9 +1,28 @@
 package com.casic.missiles.controller.business;
 
+import com.casic.missiles.controller.GeneralApprovalController;
+import com.casic.missiles.dto.BaseApprovalSubmitRequest;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.business.outsource.OutsourceAssessApprovalListRequest;
+import com.casic.missiles.dto.business.outsource.OutsourceAssessSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
+import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.model.business.BizBusinessOutsourceAssess;
+import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
+import com.casic.missiles.service.IGeneralApprovalService;
+import com.casic.missiles.service.business.IBizBusinessOutsourceAssessService;
 import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.BindingResult;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.validation.Valid;
+import java.util.List;
+
 /**
  * <p>
  * 计量检定业务-分包管理-测试、校准或检定工作分包评审表 前端控制器
@@ -15,6 +34,27 @@
 @Api(tags = "分包管理-测试、校准或检定工作分包评审表")
 @RestController
 @RequestMapping("/business/outsource/assess")
-public class BizBusinessOutsourceAssessController {
+public class BizBusinessOutsourceAssessController extends GeneralApprovalController<BizBusinessOutsourceAssess, BizBusinessOutsourceAssess, OutsourceAssessApprovalListRequest, BaseApprovalSubmitRequest> {
+    @Autowired
+    private IBizBusinessOutsourceAssessService outsourceAssessService;
 
+    public BizBusinessOutsourceAssessController(IGeneralApprovalService<BizBusinessOutsourceAssess, BizBusinessOutsourceAssess, OutsourceAssessApprovalListRequest, BaseApprovalSubmitRequest> baseApprovalService) {
+        super(baseApprovalService);
+    }
+
+    @ApiOperation("草稿箱-保存")
+    @PostMapping("/save")
+    public ReturnDTO<OutsourceAssessSaveResponse> saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceAssess request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        return outsourceAssessService.saveOutsourceAssess(request);
+    }
+
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception {
+        List<BizBusinessOutsourceAssess> list = super.exportList(request);
+        super.exportExcel(BizBusinessOutsourceAssess.class, list, ExportEnum.OUTSOURCE_ASSESS.getSheetName());
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java
new file mode 100644
index 0000000..9adef18
--- /dev/null
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java
@@ -0,0 +1,60 @@
+package com.casic.missiles.controller.business;
+
+import com.casic.missiles.controller.GeneralApprovalController;
+import com.casic.missiles.dto.BaseApprovalSubmitRequest;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.business.outsource.OutsourceProtocolApprovalListRequest;
+import com.casic.missiles.dto.business.outsource.OutsourceProtocolSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
+import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.model.business.BizBusinessOutsourceProtocol;
+import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
+import com.casic.missiles.service.IGeneralApprovalService;
+import com.casic.missiles.service.business.IBizBusinessOutsourceProtocolService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.BindingResult;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.validation.Valid;
+import java.util.List;
+
+/**
+ * <p>
+ * 计量检定业务-分包管理-测试、校准或检定工作分包协议书 前端控制器
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-08-24
+ */
+@Api(tags = "分包管理-测试、校准或检定工作分包协议书")
+@RestController
+@RequestMapping("/business/outsource/protocol")
+public class BizBusinessOutsourceProtocolController extends GeneralApprovalController<BizBusinessOutsourceProtocol, BizBusinessOutsourceProtocol, OutsourceProtocolApprovalListRequest, BaseApprovalSubmitRequest> {
+    @Autowired
+    private IBizBusinessOutsourceProtocolService outsourceProtocolService;
+
+    public BizBusinessOutsourceProtocolController(IGeneralApprovalService<BizBusinessOutsourceProtocol, BizBusinessOutsourceProtocol, OutsourceProtocolApprovalListRequest, BaseApprovalSubmitRequest> baseApprovalService) {
+        super(baseApprovalService);
+    }
+
+    @ApiOperation("草稿箱-保存")
+    @PostMapping("/save")
+    public ReturnDTO<OutsourceProtocolSaveResponse> saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceProtocol request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        return outsourceProtocolService.saveOutsourceProtocol(request);
+    }
+
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody OutsourceProtocolApprovalListRequest request) throws Exception {
+        List<BizBusinessOutsourceProtocol> list = super.exportList(request);
+        super.exportExcel(BizBusinessOutsourceProtocol.class, list, ExportEnum.OUTSOURCE_PROTOCOL.getSheetName());
+    }
+}
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java
index 097f645..f0f0943 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java
@@ -17,7 +17,6 @@
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.IGeneralApprovalService;
 import com.casic.missiles.service.business.IBizBusinessOutsourcerInfoService;
-import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -71,19 +70,8 @@
 
     @ApiOperation("分包方导出")
     @PostMapping("/listExport")
-    public void export(@RequestBody @Valid OutsourcerInfoApprovalListRequest request, BindingResult bindingResult) throws Exception {
-        if (bindingResult.hasErrors()) {
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        }
-        List<BizBusinessOutsourcerInfo> list;
-        if (!CollectionUtils.isEmpty(request.getIds())) {
-            list = outsourcerInfoService.listByIds(request.getIds());
-        } else {
-            list = outsourcerInfoService.list(request);
-        }
-        for (BizBusinessOutsourcerInfo record : list) {
-            DictCodeUtils.convertDictCodeToName(record);
-        }
+    public void export(@RequestBody OutsourcerInfoApprovalListRequest request) throws Exception {
+        List<BizBusinessOutsourcerInfo> list = super.exportList(request);
         super.exportExcel(BizBusinessOutsourcerInfo.class, list, ExportEnum.OUTSOURCER_EXPORT.getSheetName());
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java
index c2cbf9f..0410918 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java
@@ -17,11 +17,9 @@
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.IGeneralApprovalService;
 import com.casic.missiles.service.business.IBizBusinessSiteExecutiveInfoService;
-import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -60,7 +58,7 @@
         return siteExecutiveInfoService.saveSiteExecutiveInfo(siteExecutiveInfo);
     }
 
-    @ApiOperation("现场检测详情")
+    @ApiOperation("详情")
     @PostMapping("/detail")
     public ReturnDTO<SiteExecutiveDetailResponse> siteExecutiveDetail(@RequestBody @Valid IdDTO idDTO) throws Exception {
         Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
@@ -69,21 +67,10 @@
         return ReturnUtil.success(siteExecutiveInfoService.detail(idDTO.getId()));
     }
 
-    @ApiOperation("现场检测导出")
+    @ApiOperation("导出")
     @PostMapping("/listExport")
-    public void export(@RequestBody @Valid SiteExecutiveApprovalListRequest request, BindingResult bindingResult) throws Exception {
-        if (bindingResult.hasErrors()) {
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        }
-        List<SiteExecutiveApprovalListResponse> list;
-        if (!CollectionUtils.isEmpty(request.getIds())) {
-            list = siteExecutiveInfoService.listInfoByIds(request.getIds());
-        } else {
-            list = siteExecutiveInfoService.listInfo(request);
-        }
-        for (SiteExecutiveApprovalListResponse record : list) {
-            DictCodeUtils.convertDictCodeToName(record);
-        }
+    public void export(@RequestBody SiteExecutiveApprovalListRequest request) throws Exception {
+        List<SiteExecutiveApprovalListResponse> list = super.exportList(request);
         super.exportExcel(SiteExecutiveApprovalListResponse.class, list, ExportEnum.SITE_EXECUTIVE_EXPORT.getSheetName());
     }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
index 7e793cd..a92e209 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
@@ -55,7 +55,7 @@
 
     @ApiOperation("设备收发列表导出")
     @PostMapping("/export")
-    public void exportList(@RequestBody @Valid SampleDispatchListRequest request) throws IOException {
+    public void exportList(@RequestBody SampleDispatchListRequest request) throws IOException {
         List<SampleDispatchListResponse> list;
         if (!CollectionUtils.isEmpty(request.getIds())) {
             list = dispatchService.listByIds(request.getIds());
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java
index cdc77fc..d120fd4 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java
@@ -7,6 +7,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.business.labExecutive.*;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.business.IBusinessLabExecutiveInfoService;
@@ -14,6 +15,7 @@
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.*;
 
@@ -32,7 +34,7 @@
     @Autowired
     private IBusinessLabExecutiveInfoService labExecutiveInfoService;
 
-    @ApiOperation("实验室检测-部门检测-查询各状态列表（待检测、检测中、检测完）")
+    @ApiOperation("实验室任务-查询各状态列表（待检测、检测中、检测完）")
     @PostMapping("/deptExecutive/List")
     public ReturnDTO<PageInfoBT<SampleLabExecutiveListResponse>> queryDeptExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
@@ -43,10 +45,19 @@
         return ReturnUtil.success(super.packForBT(labExecutiveInfoService.deptLabExecutiveListPage(page, labExecutiveListRequest)));
     }
 
-    /**
-     * 实验室检测-我的检测-查询各状态列表（待检测、检测中、检测完）
-     */
-    @ApiOperation("实验室检测-我的检测-查询各状态列表（待检测、检测中、检测完）")
+    @ApiOperation("实验室任务导出")
+    @PostMapping("/deptExecutive/export")
+    public void deptExportList(@RequestBody @Valid SampleLabExecutiveListRequest request) throws Exception {
+        List<SampleLabExecutiveListResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = labExecutiveInfoService.deptLabExecutiveListByIds(request.getMeasureStatus(), request.getIds());
+        } else {
+            list = labExecutiveInfoService.deptLabExecutiveList(request);
+        }
+        super.exportExcel(SampleLabExecutiveListResponse.class, list, ExportEnum.DEPT_EXECUTIVE_TASK.getSheetName());
+    }
+
+    @ApiOperation("我的任务-查询各状态列表（待检测、检测中、检测完）")
     @PostMapping("/myExecutive/list")
     public ReturnDTO<PageInfoBT<SampleLabExecutiveListResponse>> queryMyExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
@@ -57,19 +68,25 @@
         return ReturnUtil.success(super.packForBT(labExecutiveInfoService.myLabExecutiveListPage(page, labExecutiveListRequest)));
     }
 
-    /**
-     * 实验室检测-我的检测-查询各状态样品数量（待检测、检测中、检测完）
-     */
-    @ApiOperation("实验室检测-我的检测-查询各状态样品数量（待检测、检测中、检测完）")
+    @ApiOperation("我的任务导出")
+    @PostMapping("/myExecutive/export")
+    public void exportList(@RequestBody @Valid SampleLabExecutiveListRequest request) throws Exception {
+        List<SampleLabExecutiveListResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = labExecutiveInfoService.myLabExecutiveListByIds(request.getMeasureStatus(), request.getIds());
+        } else {
+            list = labExecutiveInfoService.myLabExecutiveList(request);
+        }
+        super.exportExcel(SampleLabExecutiveListResponse.class, list, ExportEnum.MY_EXECUTIVE_TASK.getSheetName());
+    }
+
+    @ApiOperation("我的任务-查询各状态样品数量（待检测、检测中、检测完）")
     @GetMapping("/myExecutive/amount")
     public ReturnDTO<List<SampleAmountResponse>> queryMyExecutiveAmount() {
         return ReturnUtil.success(labExecutiveInfoService.myExecutiveAmount());
     }
 
-    /**
-     * 实验室检测-部门检测-分配（分配给具体人员）
-     */
-    @ApiOperation("实验室检测-部门检测-分配按钮（分配给具体人员）")
+    @ApiOperation("实验室任务-分配按钮（分配给具体人员）")
     @PostMapping("/deptExecutive/allocate")
     public ReturnDTO allocateStaff(@RequestBody @Valid SampleAllocateRequest sampleAllocateRequest, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -78,10 +95,7 @@
         return labExecutiveInfoService.allocateStaff(sampleAllocateRequest);
     }
 
-    /**
-     * 实验室检测-我的检测-检定人扫描收入（待检测->检测中）
-     */
-    @ApiOperation("实验室检测-我的检测-检定人扫描收入（待检测->检测中）")
+    @ApiOperation("我的任务-检定人扫描收入（待检测->检测中）")
     @PostMapping("/myExecutive/receive")
     public ReturnDTO sampleReceive(@RequestBody @Valid List<SampleOperateRequest> requestList, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -90,10 +104,7 @@
         return labExecutiveInfoService.sampleReceive(requestList);
     }
 
-    /**
-     * 实验室检测-负责人/检定人扫描检完（检测中->检测完）
-     */
-    @ApiOperation("实验室检测-负责人/检定人扫描检完（检测中->检测完）")
+    @ApiOperation("实验室任务-负责人/检定人扫描检完（检测中->检测完）")
     @PostMapping("/myExecutive/complete")
     public ReturnDTO sampleExecutiveComplete(@RequestBody @Valid List<SampleOperateRequest> requestList, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -102,10 +113,7 @@
         return labExecutiveInfoService.sampleExecutiveComplete(requestList);
     }
 
-    /**
-     * 实验室检测-部门检测/我的检测 编辑（只能修改应出具证书）
-     */
-    @ApiOperation("实验室检测-部门检测/我的检测 编辑（只能修改应出具证书）")
+    @ApiOperation("实验室任务/我的任务 编辑（只能修改应出具证书）")
     @PostMapping("/executive/update")
     public ReturnDTO updateExecutive(@RequestBody @Valid UpdateExecutiveRequest request, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -114,10 +122,7 @@
         return labExecutiveInfoService.updateExecutive(request);
     }
 
-    /**
-     * 实验室检测-部门检测/我的检测 详情
-     */
-    @ApiOperation("实验室检测-部门检测/我的检测 详情")
+    @ApiOperation("实验室任务/我的任务 详情")
     @PostMapping("/executive/detail")
     public ReturnDTO<ExecutiveDetailResponse> executiveDetail(@RequestBody @Valid ExecutiveDetailRequest request, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
@@ -131,7 +136,7 @@
      * 退回后会将下一个要执行的实验室检测状态更新为待分配，将后面的实验室顺序变更为连续（都进行减1）
      * 最后一个检测的实验室退回，等分发员再增加实验室或设备收发中的已收入直接手动点击完成
      */
-    @ApiOperation("实验室检测-部门检测/我的检测 退回（待检测/检测中->退回）")
+    @ApiOperation("实验室任务/我的任务 退回（待检测/检测中->退回）")
     @PostMapping("/executive/sendBack")
     public ReturnDTO executiveSendBack(@RequestBody @Valid ExecutiveSendBackRequest request, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -140,9 +145,6 @@
         return labExecutiveInfoService.sampleExecutiveSendBack(request);
     }
 
-    /**
-     * 分发员编辑实验室检测列表
-     */
     @ApiOperation("分发员编辑实验室检测列表")
     @PostMapping("/handOut/updateList")
     public ReturnDTO updateExecutiveList(@RequestBody @Valid UpdateExecutiveListRequest request, BindingResult bindingResult) {
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java
index 48a67ed..0c04f31 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java
@@ -10,6 +10,7 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.resource.customer.CustomerApprovalListRequest;
 import com.casic.missiles.dto.resource.customer.CustomerSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceCustomerInfo;
@@ -26,6 +27,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -55,6 +57,13 @@
         return customerInfoService.saveCustomerInfo(request);
     }
 
+    @ApiOperation("委托方名录导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody CustomerApprovalListRequest request) throws Exception {
+        List<BizResourceCustomerInfo> list = super.exportList(request);
+        super.exportExcel(BizResourceCustomerInfo.class, list, ExportEnum.CUSTOMER_INFO.getSheetName());
+    }
+
     @ApiOperation("委托方人员列表（分页）")
     @PostMapping("/person/listPage")
     public ReturnDTO<PageInfoBT<BizResourceCustomerStaff>> personListPage(@RequestBody IdDTO idDto) {
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
index 972ed4b..6418ea5 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
@@ -5,6 +5,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.resource.customer.SuggestFormApprovalListRequest;
 import com.casic.missiles.dto.resource.customer.SuggestFormSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceCustomerSuggestForm;
@@ -20,6 +21,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -50,4 +52,11 @@
         return suggestFormService.saveSuggestForm(request);
     }
 
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody SuggestFormApprovalListRequest request) throws Exception {
+        List<BizResourceCustomerSuggestForm> list = super.exportList(request);
+        super.exportExcel(BizResourceCustomerSuggestForm.class, list, ExportEnum.CUSTOMER_SUGGEST_FORM.getSheetName());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java
index 1934d1a..9e07eab 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java
@@ -15,12 +15,16 @@
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.resource.IEnvEnvironmentRecordConfigService;
 import com.casic.missiles.service.resource.IEnvEnvironmentRecordDataService;
+import com.casic.missiles.service.resource.IEnvLocationInfoService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
 import java.util.List;
@@ -39,6 +43,8 @@
     private IEnvEnvironmentRecordDataService environmentRecordDataService;
     @Autowired
     private IEnvEnvironmentRecordConfigService environmentRecordConfigService;
+    @Autowired
+    private IEnvLocationInfoService locationInfoService;
 
     @ApiOperation("环境记录单数据列表/详情")
     @PostMapping("/data/listPage")
@@ -95,4 +101,11 @@
         });
         return environmentRecordConfigService.deleteEnvironmentRecordConfig(idDTO.getId());
     }
+
+    @ApiOperation("地点列表")
+    @PostMapping("/location/listPage")
+    public ReturnDTO<PageInfoBT<LocationListResponse>> locationListPage(@RequestBody @Valid LocationListRequest request) {
+        Page<LocationListResponse> page = PageFactory.defaultPage();
+        return ReturnUtil.success(super.packForBT(locationInfoService.listPage(page, request)));
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java
index 82efe3f..e9561fa 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java
@@ -10,6 +10,7 @@
 import com.casic.missiles.dto.resource.seal.SealLogListRequest;
 import com.casic.missiles.dto.resource.seal.SealNoteApprovalListRequest;
 import com.casic.missiles.dto.resource.seal.SealNoteSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceSealUseLog;
@@ -27,6 +28,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -58,6 +60,13 @@
         return sealUseNoteService.saveSeal(request);
     }
 
+    @ApiOperation("印章使用登记导出（列表和导出中去掉经办人和监印人）")
+    @PostMapping("/listExport")
+    public void export(@RequestBody SealNoteApprovalListRequest request) throws Exception {
+        List<BizResourceSealUseNote> list = super.exportList(request);
+        super.exportExcel(BizResourceSealUseNote.class, list, ExportEnum.SEAL_NOTE.getSheetName());
+    }
+
     // TODO: 2023/7/28 印章使用日志：系统中使用印章时插入数据库
 
     @ApiOperation("印章使用日志列表（分页）")
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java
index 9b674fc..06b6521 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java
@@ -9,16 +9,20 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.resource.staff.StaffCertRequest;
 import com.casic.missiles.dto.resource.staff.StaffCertResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.service.resource.IBizResourceStaffInfoService;
 import com.casic.missiles.service.resource.IBizResourceStaffVerifierService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.List;
+
 /**
  * @Description:
  * @Author: wangpeng
@@ -41,9 +45,21 @@
         return ReturnUtil.success(super.packForBT(responsePage));
     }
 
+    @ApiOperation("证书逾期提醒导出")
+    @PostMapping("/listExport")
+    public void exportList(@RequestBody StaffCertRequest request) throws Exception {
+        List<StaffCertResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = staffInfoService.certListByIds(request.getIds());
+        } else {
+            list = staffInfoService.certList(request);
+        }
+        super.exportExcel(StaffCertResponse.class, list, ExportEnum.STAFF_CERTIFICATE_EXPIRE.getSheetName());
+    }
+
     @ApiOperation("证书逾期提醒")
     @PostMapping("/expirationReminder")
-    public ReturnDTO expirationReminder(@RequestBody IdDTO idDto) {
-        return verifierService.expirationReminder(idDto);
+    public ReturnDTO expirationReminder(@RequestBody IdDTO idDTO) {
+        return verifierService.expirationReminder(idDTO);
     }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java
index 3b251ad..a6e7850 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java
@@ -12,6 +12,7 @@
 import com.casic.missiles.dto.resource.staff.StaffListRequest;
 import com.casic.missiles.dto.resource.staff.TrainListRequest;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.*;
@@ -22,7 +23,10 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
 import java.util.List;
@@ -52,8 +56,19 @@
             throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
         }
         Page<BizResourceStaffInfo> page = PageFactory.defaultPage();
-        Page<BizResourceStaffInfo> responsePage = staffInfoService.listPage(page, request);
-        return ReturnUtil.success(super.packForBT(responsePage));
+        return ReturnUtil.success(super.packForBT(staffInfoService.listPage(page, request)));
+    }
+
+    @ApiOperation("人员登记导出")
+    @PostMapping("/listExport")
+    public void exportList(@RequestBody StaffListRequest request) throws Exception {
+        List<BizResourceStaffInfo> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = staffInfoService.listByIds(request.getIds());
+        } else {
+            list = staffInfoService.list(request);
+        }
+        super.exportExcel(BizResourceStaffInfo.class, list, ExportEnum.STAFF_INFO.getSheetName());
     }
 
     @ApiOperation("人员登记详情基础信息")
@@ -85,9 +100,9 @@
 
     @ApiOperation("科研教育列表（分页）")
     @PostMapping("/education/listPage")
-    public ReturnDTO<PageInfoBT<BizResourceStaffEducation>> educationListPage(@RequestBody IdDTO idDto) {
+    public ReturnDTO<PageInfoBT<BizResourceStaffEducation>> educationListPage(@RequestBody IdDTO idDTO) {
         Page<BizResourceStaffEducation> page = PageFactory.defaultPage();
-        Page<BizResourceStaffEducation> responsePage = staffInfoService.educationListPage(page, idDto);
+        Page<BizResourceStaffEducation> responsePage = staffInfoService.educationListPage(page, idDTO);
         return ReturnUtil.success(super.packForBT(responsePage));
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java
index af6aa86..d85d84a 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java
@@ -9,6 +9,7 @@
 import com.casic.missiles.dto.resource.outsideService.SupplierApprovalListRequest;
 import com.casic.missiles.dto.resource.outsideService.SupplierSaveResponse;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceSupplierAbility;
@@ -67,6 +68,13 @@
         return ReturnUtil.success(supplierInfoService.detail(idDTO.getId()));
     }
 
+    @ApiOperation("合格供方导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody SupplierApprovalListRequest request) throws Exception {
+        List<BizResourceSupplierInfo> list = super.exportList(request);
+        super.exportExcel(BizResourceSupplierInfo.class, list, ExportEnum.SUPPLIER_INFO.getSheetName());
+    }
+
     @ApiOperation("供方人员列表（分页）")
     @PostMapping("/person/listPage")
     public ReturnDTO<PageInfoBT<BizResourceSupplierPerson>> personListPage(@RequestBody IdDTO idDTO) {
diff --git a/casic-metering-api/src/main/resources/config/application.yml b/casic-metering-api/src/main/resources/config/application.yml
index 350db5f..ecff521 100644
--- a/casic-metering-api/src/main/resources/config/application.yml
+++ b/casic-metering-api/src/main/resources/config/application.yml
@@ -126,7 +126,7 @@
     #作者
     author: wangpeng
     #待生成对象表名
-    table-name: biz_equipment_technical_target_approval,biz_equipment_attachment_approval,biz_equipment_checkpoint_approval
+    table-name: biz_business_outsource_protocol
 
 reminder:
   #节点--common模块config包 ReminderNodeConfig配置
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
index 4a19e4e..d47d552 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
@@ -53,6 +53,7 @@
     SUGGEST_FORM_SAVE_FAILED(2509, "委托方意见登记表保存至草稿箱失败"),
     EXAMINE_FORM_SAVE_FAILED(2510, "要求、委托书及合同评审表保存至草稿箱失败"),
     CUSTOMER_EXIST_SAVE_FAILED(2511, "该委托方已存在，请重新选择"),
+    DUPLICATE_LOCATION_NO(2512, "地点编号已存在"),
 
     /**
      * 计量检定业务模块
@@ -68,6 +69,8 @@
     COMPLETE_SAMPLE_NOT_EXIST(2609, "检测中不存在扫描收入的样品"),
     CANNOT_CHANGE_MEASURE_INFO(2610, "无法更改非当前登录用户的检测信息"),
     NON_EXIST_ORDER_OR_SAMPLE(2611, "不存在该委托单或该委托单下的样品"),
+    OUTSOURCE_ACCESS_SAVE_FAILED(2612, "测试、校准或检定工作分包评审表保存至草稿箱失败"),
+    OUTSOURCE_PROTOCOL_SAVE_FAILED(2613, "测试、校准或检定工作分包协议书保存至草稿箱失败"),
 
     /**
      * 历史遗留备用
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
index 5089ad1..81a406b 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
@@ -10,54 +10,38 @@
     /**
      * 资源管理
      */
-    ENVIRONMENT_DATA_EXPORT("environmentData", "environmentData", "环境记录单数据"),
+    ENVIRONMENT_DATA_EXPORT("environmentData", "环境记录单数据", "环境记录单数据"),
+    STAFF_INFO("staffInfo", "人员登记", "人员登记"),
+    STAFF_CERTIFICATE_EXPIRE("certificateExpire", "证书逾期提醒", "证书逾期提醒"),
+    SUPPLIER_INFO("supplierInfo", "合格供方名录", "合格供方名录"),
+    CUSTOMER_INFO("customerInfo", "委托方名录", "委托方名录"),
+    CUSTOMER_SUGGEST_FORM("customerSuggestForm", "委托方意见登记表", "委托方意见登记表"),
+    SEAL_NOTE("sealNote", "印章使用登记", "印章使用登记"),
 
-    FILE_EXPORT("meterFileData", "meterFileData", "计量文件信息"),
-    TRAIN_PLAN_EXPORT("trainPlanData", "trainPlanData", "培训计划"),
-    TRAIN_LOG_EXPORT("trainLogData", "trainLogData", "培训记录"),
-    METER_ORGANIZE_EXPORT("meterOrganizeData", "meterOrganizeData", "计量组织"),
-    TRACE_SUPPLIER_EXPORT("traceSupplierData", "traceSupplierData", "溯源供方"),
-    SIGN_EXPORT("signData", "signData", "签名/签章"),
-    TEMPLATE_EXPORT("templateData", "templateData", "原始记录模板/证书报告模板"),
-    FIXED_ASSETS("meterFixedAssets", "meterFixedAssets", "固定资产"),
-    METER_EQUIPMENT("meterEquipment", "meterEquipment", "测量设备"),
-    CALIBRATION_TEST_EQUIPMENT("calibrationTestEquipment", "calibrationTestEquipment", "校准检定设备"),
-    MEASURE_ACCOUNT("measureAccount", "measureAccount", "测量工装"),
-    STANDARD_SUPPORT_EQUIPMENT("standardSupportEquipment", "standardSupportEquipment", "标准配套设备"),
-    STANDARD_EQUIPMENT("standardEquipment", "standardEquipment", "标准装置"),
-    FLOW_DEF_EXPORT("flowDefData", "flowDefData", "流程定义"),
-    STAFF_CERTIFICATE("certificate", "certificate", "计量人员证书"),
-    CHECK_INFO("checkInfo", "checkInfo", "设备管理点检测"),
-    EQUIPMENT_APPLY("equipmentApply", "equipmentApply", "设备借用"),
-    STANDARD_EQUIPMENT_REMIND("equipmentApplyRemind", "equipmentApplyRemind", "标准装置到期提醒"),
-    METER_PRICE("meterPrice", "meterPrice", "价格库"),
-    METER_STAFF("meterStaff", "meterStaff", "计量人员"),
-    STANDARD_EQUIPMENT_APPLY("standardEquipmentApply", "standardEquipmentApply", "标准装置申请"),
-    STATE_MANAGE_APPLY("stateManage", "stateManage", "状态管理"),
-    METER_ACCEPTANCE_CHECK("acceptanceCheck", "acceptanceCheck", "设备检修保养验收单"),
-    CUSTOMER_EXPORT("customerData", "customerData", "客户信息"),
-    ORDER_EXPORT("orderData", "orderData", "委托书信息"),
-    SAMPLE_EXPORT("sampleData", "sampleData", "样本信息"),
-    EXCHANGE_DATA("exchangeData", "exchangeData", "设备交接单"),
-    DISPATCH_DATA("dispatchData", "dispatchData", "设备收发"),
-    ENVIRONMENT_DATA("environmentData", "environmentData", "环境记录单"),
-    ORIGIN_DATA("originData", "originData", "原始记录"),
-    CERTIFICATE_REPORT("certificateReport", "certificateReport", "证书报告"),
-    ADVICE_EXPORT("adviceData", "adviceData", "客户反馈"),
-    HANDOUT_EXPORT("handoutData", "handoutData", "任务分发列表"),
-    OUTSOURCER_EXPORT("outsourcerData", "outsourcerData", "分包方"),
-    SITE_EXECUTIVE_EXPORT("siteExecutiveData", "siteExecutiveData", "现场测试、校准或检定"),
-    CERTIFICATE_PRINT_EXPORT("certificatePrintData", "certificatePrintData", "证书打印"),
-    DOWNLOAD_TEMPLATE("downloadTemplate", "downloadTemplate", "页面配置"),
-    OUTSOURCER_CERTIFICATE_EXPORT("outsourceCertificateData", "outsourceCertificateData", "分包证书"),
-    SETTLEMENT_INFO_EXPORT("settlementInfoData", "settlementInfoData", "业务结算"),
-    EQUIPMENT_REMIND("equipmentRemind", "equipmentRemind", "设备到期提醒"),
-    AGREEMENT_INFO_EXPORT("agreementInfoData", "agreementInfoData", "合同"),
-    WORK_STATISTICS_EXPORT("workStatisticsData", "workStatisticsData", "实时工作统计"),
-    DEPT_OUTPUT_EXPORT("deptOutputData", "deptOutputData", "部门产值分析"),
-    WORKLOAD_EXPORT("workloadData", "workloadData", "业务工作量分析"),
-    DEPT_COMPREHENSIVE_EXPORT("deptComprehensiveData", "deptComprehensiveData", "部门综合分析"),
-    ENVIRONMENTAL_RECORD("environmentalRecordData", "environmentalRecordData", "现场环境记录");
+    /**
+     * 计量检定业务
+     */
+    OUTSOURCER_EXPORT("outsourcerData", "分包方名录", "分包方名录"),
+    IDENTIFY_EXPORT("identifyData", "计量标识", "计量标识"),
+    ORDER_EXPORT("orderData", "任务单", "任务单"),
+    DISPATCH_DATA("dispatchData", "设备收发", "设备收发"),
+    HANDOUT_EXPORT("handoutData", "任务分发", "任务分发"),
+    SITE_EXECUTIVE_EXPORT("siteExecutiveData", "现场测试、校准或检定", "现场测试、校准或检定"),
+    CERTIFICATE_REPORT("certificateReport", "证书审批", "证书审批"),
+    CERTIFICATE_CHANGE_APPLY("certificateChangeApply", "证书报告补充或更换申请单", "证书报告补充或更换申请单"),
+    CERTIFICATE_PRINT("certificatePrintData", "证书打印审批", "证书打印审批"),
+    DEPT_EXECUTIVE_TASK("deptExecutiveTaskData", "实验室任务", "实验室任务"),
+    MY_EXECUTIVE_TASK("myExecutiveTaskData", "我的任务", "我的任务"),
+    OUTSOURCE_ASSESS("outsourceAssess", "测试、校准或检定工作分包评审表", "测试、校准或检定工作分包评审表"),
+    OUTSOURCE_PROTOCOL("outsourceProtocol", "测试、校准或检定工作分包协议书", "测试、校准或检定工作分包协议书"),
+
+    /**
+     * 系统管理
+     */
+    SIGN_EXPORT("signData", "签名", "签名"),
+    TEMPLATE_EXPORT("templateData", "文件模板", "文件模板"),
+    FLOW_DEF_EXPORT("flowDefData", "流程定义", "流程定义"),
+    DOWNLOAD_TEMPLATE("downloadTemplate", "流程定义", "页面配置");
 
     ExportEnum(String fileName, String sheetName, String description) {
         this.fileName = fileName;
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateRecordTypeCodeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateRecordTypeCodeEnum.java
index 31d913c..a963522 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateRecordTypeCodeEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateRecordTypeCodeEnum.java
@@ -46,4 +46,14 @@
     String SITE_EXECUTIVE_APPROVAL = "01";
     //《现场测试、校准或检定工作记录表》
     String SITE_EXECUTIVE_LOG = "02";
+
+    //测试、校准或检定工作分包协议书
+    String OUTSOURCE_PROTOCOL = "01";
+    //测试、校准或检定工作分包评审表
+    String OUTSOURCE_ACCESS = "02";
+    //测试、校准或检定工作分包通知书
+    String OUTSOURCE_NOTICE = "03";
+    //测试、校准或检定工作分包方名录
+    String OUTSOURCE_INFO = "04";
+
 }
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
index 24b8635..f78bd53 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
@@ -15,6 +15,10 @@
     String CERTIFICATE_CHANGE_APPLY_BEAN_NAME = "certificateChangeApplyBean";
     //现场测试、校准或检定
     String SITE_EXECUTIVE_BEAN_NAME = "siteExecutiveBean";
+    //测试、校准或检定工作分包评审表
+    String OUTSOURCE_ASSESS_BEAN_NAME = "outsourceAssessBean";
+    //测试、校准或检定工作分包协议书
+    String OUTSOURCE_PROTOCOL_BEAN_NAME = "outsourceProtocolBean";
 
     /*********************************设备与装置************************************/
     //设备台账
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 b21c661..6b86fd1 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
@@ -18,6 +18,8 @@
     OUTSOURCER_APPROVAL(OUTSOURCER_BEAN_NAME, ""),
     CERTIFICATE_CHANGE_APPROVAL(CERTIFICATE_CHANGE_APPLY_BEAN_NAME, ""),
     SITE_EXECUTIVE_APPROVAL(SITE_EXECUTIVE_BEAN_NAME, ""),
+    OUTSOURCE_ASSESS_APPROVAL(OUTSOURCE_ASSESS_BEAN_NAME, ""),
+    OUTSOURCE_PROTOCOL_APPROVAL(OUTSOURCE_PROTOCOL_BEAN_NAME, ""),
 
     ACTION_STATUS_MAP(new HashMap<String, AwareActionStatusEnum>() {
         {
@@ -47,6 +49,10 @@
             put(ApplyFromIdEnum.CERTIFICATE_CHANGE_APPROVAL.getCode(), CERTIFICATE_CHANGE_APPROVAL);
             //现场测试、校准或检定审批
             put(ApplyFromIdEnum.SITE_EXECUTIVE_APPROVAL.getCode(), SITE_EXECUTIVE_APPROVAL);
+            //测试、校准或检定工作分包评审表
+            put(ApplyFromIdEnum.OUTSOURCE_ASSESS_APPROVAL.getCode(), OUTSOURCE_ASSESS_APPROVAL);
+            //测试、校准或检定工作分包协议书
+            put(ApplyFromIdEnum.OUTSOURCE_PROTOCOL_APPROVAL.getCode(), OUTSOURCE_PROTOCOL_APPROVAL);
         }
     });
     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 934405e..c7410bd 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
@@ -9,6 +9,8 @@
     CERTIFICATE_CHANGE_APPROVAL("jljdywzsbchghsqd", MessageSourceModuleEnum.BUSINESS.getCode(), "证书/报告补充或更换申请单"),
     OUTSOURCER_APPROVAL("jljdywcsjzhgfbfml", MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定合格分包方名录"),
     SITE_EXECUTIVE_APPROVAL("jljdywxccsjzsp", MessageSourceModuleEnum.BUSINESS.getCode(), "现场测试、校准或检定审批"),
+    OUTSOURCE_ASSESS_APPROVAL("jljdywcsjzfbpsb", MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包评审表"),
+    OUTSOURCE_PROTOCOL_APPROVAL("jljdywcsjzfbxys", MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包协议书"),
 
 
     /*******************************************设备与装置*********************************************/
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/GeneralApprovalMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/GeneralApprovalMapper.java
index 4fb7344..0c9d6ae 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/GeneralApprovalMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/GeneralApprovalMapper.java
@@ -17,8 +17,4 @@
 
     Page<O> selectBatchForApprovalList(Page<O> page, @Param("request") R request, @Param("businessKeys") List<String> businessKeys);
 
-//    Page<O> selectListPage(Page<O> page, @Param("request") R request);
-
-//    Long selectMaxNo();
-
 }
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceAssessMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceAssessMapper.java
index 7867bb8..ba59009 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceAssessMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceAssessMapper.java
@@ -1,7 +1,12 @@
 package com.casic.missiles.mapper.business;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.business.outsource.OutsourceAssessApprovalListRequest;
+import com.casic.missiles.mapper.GeneralApprovalMapper;
 import com.casic.missiles.model.business.BizBusinessOutsourceAssess;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * <p>
@@ -11,6 +16,10 @@
  * @author wangpeng
  * @since 2023-08-16
  */
-public interface BizBusinessOutsourceAssessMapper extends BaseMapper<BizBusinessOutsourceAssess> {
+public interface BizBusinessOutsourceAssessMapper extends GeneralApprovalMapper<BizBusinessOutsourceAssess, BizBusinessOutsourceAssess, OutsourceAssessApprovalListRequest> {
+
+    Page<BizBusinessOutsourceAssess> selectBatchForApprovalList(Page<BizBusinessOutsourceAssess> page, @Param("request") OutsourceAssessApprovalListRequest request, @Param("businessKeys") List<String> businessKeys);
+
+    Long selectMaxProjectNo();
 
 }
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceProtocolMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceProtocolMapper.java
new file mode 100644
index 0000000..e6aba35
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceProtocolMapper.java
@@ -0,0 +1,24 @@
+package com.casic.missiles.mapper.business;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.business.outsource.OutsourceProtocolApprovalListRequest;
+import com.casic.missiles.mapper.GeneralApprovalMapper;
+import com.casic.missiles.model.business.BizBusinessOutsourceProtocol;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 计量检定业务-分包管理-测试、校准或检定工作分包协议书 Mapper 接口
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-08-24
+ */
+public interface BizBusinessOutsourceProtocolMapper extends GeneralApprovalMapper<BizBusinessOutsourceProtocol, BizBusinessOutsourceProtocol, OutsourceProtocolApprovalListRequest> {
+
+    Page<BizBusinessOutsourceProtocol> selectBatchForApprovalList(Page<BizBusinessOutsourceProtocol> page, @Param("request") OutsourceProtocolApprovalListRequest request, @Param("businessKeys") List<String> businessKeys);
+
+    Long selectMaxProtocolNo();
+}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/EnvLocationInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/EnvLocationInfoMapper.java
new file mode 100644
index 0000000..49eff87
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/EnvLocationInfoMapper.java
@@ -0,0 +1,21 @@
+package com.casic.missiles.mapper.resource;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.resource.environment.LocationListRequest;
+import com.casic.missiles.dto.resource.environment.LocationListResponse;
+import com.casic.missiles.model.resource.EnvLocationInfo;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * <p>
+ * 实验室环境监控系统-设备表 Mapper 接口
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-06-07
+ */
+public interface EnvLocationInfoMapper extends BaseMapper<EnvLocationInfo> {
+
+    Page<LocationListResponse> selectLocationListPage(Page<LocationListResponse> page, @Param("request") LocationListRequest request);
+}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java
index de124db..85ed0f7 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java
@@ -1,7 +1,9 @@
 package com.casic.missiles.mapper.system;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.dto.system.SignDetailResponse;
+import com.casic.missiles.dto.system.SignListRequest;
 import com.casic.missiles.model.system.SystemSign;
 import org.apache.ibatis.annotations.Param;
 
@@ -22,4 +24,8 @@
     SignDetailResponse selectSignDetailById(Long id);
 
     List<SystemSign> selectUsableSignList(@Param("userId") Long userId);
+
+    Page<SystemSign> selectSignListPage(Page<SystemSign> page, @Param("request") SignListRequest request);
+
+    List<SystemSign> selectSignList(@Param("request") SignListRequest request);
 }
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateChangeApplyMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateChangeApplyMapper.xml
index d798447..c496092 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateChangeApplyMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateChangeApplyMapper.xml
@@ -30,31 +30,31 @@
         SELECT *
         FROM biz_business_certificate_change_apply
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.changeApplyNo != null and request.changeApplyNo !=''">
+        <if test="request != null and request.changeApplyNo != null and request.changeApplyNo !=''">
             and change_apply_no like concat('%',#{request.changeApplyNo},'%')
         </if>
-        <if test="request.changeReportNo != null and request.changeReportNo !=''">
+        <if test="request != null and request.changeReportNo != null and request.changeReportNo !=''">
             and change_report_no like concat('%',#{request.changeReportNo},'%')
         </if>
-        <if test="request.changeReportName != null and request.changeReportName !=''">
+        <if test="request != null and request.changeReportName != null and request.changeReportName !=''">
             and change_report_name like concat('%',#{request.changeReportName},'%')
         </if>
-        <if test="request.changeType != null and request.changeType !=''">
+        <if test="request != null and request.changeType != null and request.changeType !=''">
             and change_type = #{request.changeType}
         </if>
-        <if test="request.createUserName != null and request.createUserName !=''">
+        <if test="request != null and request.createUserName != null and request.createUserName !=''">
             and create_user_name like concat('%',#{request.createUserName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificatePrintMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificatePrintMapper.xml
index b66cd99..49c0ac8 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificatePrintMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificatePrintMapper.xml
@@ -31,34 +31,34 @@
         LEFT JOIN biz_business_order_sample_relation bosr ON (bosr.order_id = bcr.order_id AND bosr.sample_id = bcr.sample_id)
         LEFT JOIN biz_business_order_info boi ON boi.id = bosr.order_id
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and bcp.approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.printStatus != null and request.printStatus !=''">
+        <if test="request != null and request.printStatus != null and request.printStatus !=''">
             and print_status = #{request.printStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and bcp.create_user_id = #{request.createUserId}
         </if>
-        <if test="request.certificateReportNo != null and request.certificateReportNo !=''">
+        <if test="request != null and request.certificateReportNo != null and request.certificateReportNo !=''">
             and bcr.certificate_report_no like concat('%',#{request.certificateReportNo},'%')
         </if>
-        <if test="request.certificateReportName != null and request.certificateReportName !=''">
+        <if test="request != null and request.certificateReportName != null and request.certificateReportName !=''">
             and bcr.certificate_report_name like concat('%',#{request.certificateReportName},'%')
         </if>
-        <if test="request.customerName != null and request.customerName !=''">
+        <if test="request != null and request.customerName != null and request.customerName !=''">
             and boi.customer_name like concat('%',#{request.customerName},'%')
         </if>
-        <if test="request.sampleNo != null and request.sampleNo !=''">
+        <if test="request != null and request.sampleNo != null and request.sampleNo !=''">
             and bosr.sample_no like concat('%',#{request.sampleNo},'%')
         </if>
-        <if test="request.sampleName != null and request.sampleName !=''">
+        <if test="request != null and request.sampleName != null and request.sampleName !=''">
             and bosr.sample_name like concat('%',#{request.sampleName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and bcp.create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and bcp.create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml
index b366034..767695d 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml
@@ -46,33 +46,37 @@
         SELECT bcr.*, bosr.sample_no, bosr.sample_name, bosr.sample_model, rsi.staff_name
         FROM biz_business_certificate_report bcr
         LEFT JOIN biz_business_order_sample_relation bosr ON (bosr.order_id = bcr.order_id AND bosr.sample_id = bcr.sample_id)
+        LEFT JOIN biz_business_order_info boi ON boi.id = bcr.order_id
         LEFT JOIN biz_resource_staff_info rsi ON rsi.id = bcr.measure_person_id
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and bcr.approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and bcr.create_user_id = #{request.createUserId}
         </if>
-        <if test="request.certificateReportNo != null and request.certificateReportNo !=''">
+        <if test="request != null and request.customerId != null and request.customerId !=''">
+            and boi.customer_id = #{request.customerId}
+        </if>
+        <if test="request != null and request.certificateReportNo != null and request.certificateReportNo !=''">
             and bcr.certificate_report_no like concat('%',#{request.certificateReportNo},'%')
         </if>
-        <if test="request.certificateReportName != null and request.certificateReportName !=''">
+        <if test="request != null and request.certificateReportName != null and request.certificateReportName !=''">
             and bcr.certificate_report_name like concat('%',#{request.certificateReportName},'%')
         </if>
-        <if test="request.sampleNo != null and request.sampleNo !=''">
+        <if test="request != null and request.sampleNo != null and request.sampleNo !=''">
             and bosr.sample_no like concat('%',#{request.sampleNo},'%')
         </if>
-        <if test="request.measureCategory != null and request.measureCategory !=''">
+        <if test="request != null and request.measureCategory != null and request.measureCategory !=''">
             and bcr.measure_category = #{request.measureCategory}
         </if>
-        <if test="request.measurePerson != null and request.measurePerson !=''">
+        <if test="request != null and request.measurePerson != null and request.measurePerson !=''">
             and rsi.staff_name like concat('%',#{request.measurePerson},'%')
         </if>
-        <if test="request.calibrationTimeStart != null and request.calibrationTimeStart !=''">
+        <if test="request != null and request.calibrationTimeStart != null and request.calibrationTimeStart !=''">
             and bcr.calibration_time &gt;= #{request.calibrationTimeStart}
         </if>
-        <if test="request.calibrationTimeEnd != null and request.calibrationTimeEnd !=''">
+        <if test="request != null and request.calibrationTimeEnd != null and request.calibrationTimeEnd !=''">
             and bcr.calibration_time &lt;= #{request.calibrationTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceAssessMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceAssessMapper.xml
index d0fcf8b..c22c101 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceAssessMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceAssessMapper.xml
@@ -7,6 +7,8 @@
         <id column="id" property="id" />
         <result column="project_no" property="projectNo" />
         <result column="project_name" property="projectName" />
+        <result column="lab_code" property="labCode" />
+        <result column="group_code" property="groupCode" />
         <result column="applicant_id" property="applicantId" />
         <result column="applicant_name" property="applicantName" />
         <result column="applicant_time" property="applicantTime" />
@@ -31,7 +33,45 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, project_no, project_name, applicant_id, applicant_name, applicant_time, minio_file_name, remark, create_user_id, create_user_name, outsourcer_id, pre_start_time, pre_end_time, outsource_reason, pre_cost, approval_status, process_id, approve_situation, traceability, test_method, technique_ability, create_time, update_time
+        id, project_no, project_name, lab_code, group_code, applicant_id, applicant_name, applicant_time, minio_file_name, remark, create_user_id, create_user_name, outsourcer_id, pre_start_time, pre_end_time, outsource_reason, pre_cost, approval_status, process_id, approve_situation, traceability, test_method, technique_ability, create_time, update_time
     </sql>
 
+    <select id="selectMaxProjectNo" resultType="java.lang.Long">
+        SELECT IFNULL(max(RIGHT(project_no, 3)), 0) from biz_business_outsource_assess
+    </select>
+
+    <select id="selectBatchForApprovalList" resultMap="BaseResultMap">
+        SELECT bboa.*, bboi.outsourcer_name, bboi.director
+        FROM biz_business_outsource_assess bboa
+        LEFT JOIN biz_business_outsourcer_info bboi ON bboa.outsourcer_id = bboi.id
+        WHERE 1=1
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
+            and bboa.approval_status = #{request.approvalStatus}
+        </if>
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
+            and bboa.create_user_id = #{request.createUserId}
+        </if>
+        <if test="request != null and request.projectNo != null and request.projectNo !=''">
+            and bboa.project_no like concat('%',#{request.projectNo},'%')
+        </if>
+        <if test="request != null and request.outsourcerName != null and request.outsourcerName !=''">
+            and bboi.outsourcer_name like concat('%',#{request.outsourcerName},'%')
+        </if>
+        <if test="request != null and request.applicantName != null and request.applicantName !=''">
+            and bboa.applicant_name like concat('%',#{request.applicantName},'%')
+        </if>
+        <if test="request != null and request.applicantTimeStart != null and request.applicantTimeStart !=''">
+            and bboa.applicant_time &gt;= #{request.applicantTimeStart}
+        </if>
+        <if test="request != null and request.applicantTimeEnd != null and request.applicantTimeEnd !=''">
+            and bboa.applicant_time &lt;= #{request.applicantTimeEnd}
+        </if>
+        <if test="businessKeys != null">
+            and bboa.id in
+            <foreach collection="businessKeys" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
+        ORDER BY bboa.create_time DESC
+    </select>
 </mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceProtocolMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceProtocolMapper.xml
new file mode 100644
index 0000000..b7b2149
--- /dev/null
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceProtocolMapper.xml
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.mapper.business.BizBusinessOutsourceProtocolMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.business.BizBusinessOutsourceProtocol">
+        <id column="id" property="id" />
+        <result column="protocol_no" property="protocolNo" />
+        <result column="project_name" property="projectName" />
+        <result column="lab_code" property="labCode" />
+        <result column="group_code" property="groupCode" />
+        <result column="outsourcer_id" property="outsourcerId" />
+        <result column="remark" property="remark" />
+        <result column="outsource_no" property="outsourceNo" />
+        <result column="outsource_name" property="outsourceName" />
+        <result column="contacts" property="contacts" />
+        <result column="mobile" property="mobile" />
+        <result column="address" property="address" />
+        <result column="require_date" property="requireDate" />
+        <result column="outsource_cost" property="outsourceCost" />
+        <result column="director" property="director" />
+        <result column="item" property="item" />
+        <result column="requires" property="requires" />
+        <result column="create_user_id" property="createUserId" />
+        <result column="create_user_name" property="createUserName" />
+        <result column="approval_status" property="approvalStatus" />
+        <result column="process_id" property="processId" />
+        <result column="create_time" property="createTime" />
+        <result column="update_time" property="updateTime" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, protocol_no, project_name, lab_code, group_code, outsourcer_id, remark, outsource_no, outsource_name, contacts, mobile, address, require_date, outsource_cost, director, item, requires, create_user_id, create_user_name, approval_status, process_id, create_time, update_time
+    </sql>
+
+    <select id="selectMaxProtocolNo" resultType="java.lang.Long">
+        SELECT IFNULL(max(RIGHT(protocol_no, 3)), 0) from biz_business_outsource_protocol
+    </select>
+
+    <select id="selectBatchForApprovalList" resultMap="BaseResultMap">
+        SELECT *
+        FROM biz_business_outsource_protocol
+        WHERE 1=1
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
+            and approval_status = #{request.approvalStatus}
+        </if>
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
+            and create_user_id = #{request.createUserId}
+        </if>
+        <if test="request != null and request.protocolNo != null and request.protocolNo !=''">
+            and protocol_no like concat('%',#{request.protocolNo},'%')
+        </if>
+        <if test="request != null and request.outsourcerName != null and request.outsourcerName !=''">
+            and outsourcer_name like concat('%',#{request.outsourcerName},'%')
+        </if>
+        <if test="request != null and request.applicantName != null and request.applicantName !=''">
+            and create_user_name like concat('%',#{request.applicantName},'%')
+        </if>
+        <if test="request != null and request.applicantTimeStart != null and request.applicantTimeStart !=''">
+            and create_time &gt;= #{request.applicantTimeStart}
+        </if>
+        <if test="request != null and request.applicantTimeEnd != null and request.applicantTimeEnd !=''">
+            and create_time &lt;= #{request.applicantTimeEnd}
+        </if>
+        <if test="businessKeys != null">
+            and id in
+            <foreach collection="businessKeys" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
+        ORDER BY create_time DESC
+    </select>
+</mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourcerInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourcerInfoMapper.xml
index 510a80b..3049b54 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourcerInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourcerInfoMapper.xml
@@ -7,6 +7,8 @@
         <id column="id" property="id" />
         <result column="outsourcer_no" property="outsourcerNo" />
         <result column="outsourcer_name" property="outsourcerName" />
+        <result column="lab_code" property="labCode" />
+        <result column="group_code" property="groupCode" />
         <result column="outsourcer_brief_name" property="outsourcerBriefName" />
         <result column="outsourcer_size" property="outsourcerSize" />
         <result column="business_size" property="businessSize" />
@@ -55,32 +57,32 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, outsourcer_no, outsourcer_name, outsourcer_brief_name, outsourcer_size, business_size, grade, evaluation, tax_number, bank_account, bank_name, bank_account_number, postal_code, director, phone, fax, mobile, email, website, address_country, address_province, address_city, address_area, full_address, address_country_name, address_province_name, address_city_name, address_area_name, invoice_country, invoice_province, invoice_city, invoice_area, invoice_full_address, invoice_country_name, invoice_province_name, invoice_city_name, invoice_area_name, business_scope, business_content, minio_file_name, approval_status, process_id, remark, create_user_id, create_user_name, create_time, update_time
+        id, outsourcer_no, outsourcer_name, lab_code, group_code, outsourcer_brief_name, outsourcer_size, business_size, grade, evaluation, tax_number, bank_account, bank_name, bank_account_number, postal_code, director, phone, fax, mobile, email, website, address_country, address_province, address_city, address_area, full_address, address_country_name, address_province_name, address_city_name, address_area_name, invoice_country, invoice_province, invoice_city, invoice_area, invoice_full_address, invoice_country_name, invoice_province_name, invoice_city_name, invoice_area_name, business_scope, business_content, minio_file_name, approval_status, process_id, remark, create_user_id, create_user_name, create_time, update_time
     </sql>
 
     <select id="selectBatchForApprovalList" resultMap="BaseResultMap">
         SELECT *
         FROM biz_business_outsourcer_info
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.outsourcerNo != null and request.outsourcerNo !=''">
+        <if test="request != null and request.outsourcerNo != null and request.outsourcerNo !=''">
             and outsourcer_no like concat('%',#{request.outsourcerNo},'%')
         </if>
-        <if test="request.outsourcerName != null and request.outsourcerName !=''">
+        <if test="request != null and request.outsourcerName != null and request.outsourcerName !=''">
             and outsourcer_name like concat('%',#{request.outsourcerName},'%')
         </if>
-        <if test="request.director != null and request.director !=''">
+        <if test="request != null and request.director != null and request.director !=''">
             and director like concat('%',#{request.director},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
@@ -93,6 +95,6 @@
     </select>
 
     <select id="selectMaxNo" resultType="java.lang.Long">
-        SELECT IFNULL(max(RIGHT(outsourcer_no, 12)), 0) from biz_business_outsourcer_info
+        SELECT IFNULL(max(RIGHT(outsourcer_no, 3)), 0) from biz_business_outsourcer_info
     </select>
 </mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessSiteExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessSiteExecutiveInfoMapper.xml
index 135c5d0..3c5ae79 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessSiteExecutiveInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessSiteExecutiveInfoMapper.xml
@@ -38,25 +38,25 @@
         FROM biz_business_site_executive_info bsei
         LEFT JOIN biz_resource_customer_info rci ON bsei.customer_id = rci.id
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and bsei.approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and bsei.create_user_id = #{request.createUserId}
         </if>
-        <if test="request.siteExecutiveNo != null and request.siteExecutiveNo !=''">
+        <if test="request != null and request.siteExecutiveNo != null and request.siteExecutiveNo !=''">
             and bsei.site_executive_no like concat('%',#{request.siteExecutiveNo},'%')
         </if>
-        <if test="request.customerName != null and request.customerName !=''">
+        <if test="request != null and request.customerName != null and request.customerName !=''">
             and rci.outsourcer_name like concat('%',#{request.customerName},'%')
         </if>
-        <if test="request.applyName != null and request.applyName !=''">
+        <if test="request != null and request.applyName != null and request.applyName !=''">
             and bsei.apply_name like concat('%',#{request.applyName},'%')
         </if>
-        <if test="request.applyTimeStart != null and request.applyTimeStart !=''">
+        <if test="request != null and request.applyTimeStart != null and request.applyTimeStart !=''">
             and bsei.apply_time &gt;= #{request.applyTimeStart}
         </if>
-        <if test="request.applyTimeEnd != null and request.applyTimeEnd !=''">
+        <if test="request != null and request.applyTimeEnd != null and request.applyTimeEnd !=''">
             and bsei.apply_time &lt;= #{request.applyTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml
index 84d9e2a..6bd38a9 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml
@@ -105,6 +105,12 @@
         <if test="request.isUrgent != null and request.isUrgent !=''">
             AND bo.is_urgent = #{request.isUrgent}
         </if>
+        <if test="request.ids != null">
+            and blei.id in
+            <foreach collection="request.ids" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
         ORDER BY blei.update_time DESC
     </select>
 
@@ -137,6 +143,12 @@
         <if test="request.isUrgent != null and request.isUrgent !=''">
             AND bo.is_urgent = #{request.isUrgent}
         </if>
+        <if test="request.ids != null">
+            and blei.id in
+            <foreach collection="request.ids" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
         ORDER BY blei.update_time DESC
     </select>
 
diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardInfoMapper.xml
index 1a5551b..2ed8d17 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardInfoMapper.xml
@@ -45,12 +45,6 @@
         FROM biz_equipment_standard_info besi
         LEFT JOIN biz_equipment_standard_technology_relation bestr ON besi.standard_no = bestr.standard_no
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
-            and besi.approval_status = #{request.approvalStatus}
-        </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
-            and besi.create_user_id = #{request.createUserId}
-        </if>
         <if test="request.standardName != null and request.standardName !=''">
             and besi.standard_name like concat('%',#{request.standardName},'%')
         </if>
diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardTechnologyRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardTechnologyRelationMapper.xml
index fc7e16c..cd03c8c 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardTechnologyRelationMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardTechnologyRelationMapper.xml
@@ -6,6 +6,7 @@
     <resultMap id="BaseResultMap" type="com.casic.missiles.model.equipment.BizEquipmentStandardTechnologyRelation">
         <id column="id" property="id" />
         <result column="technology_file_id" property="technologyFileId" />
+        <result column="technology_file_no" property="technologyFileNo" />
         <result column="technology_file_name" property="technologyFileName" />
         <result column="standard_id" property="standardId" />
         <result column="standard_no" property="standardNo" />
@@ -14,7 +15,7 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, technology_file_id, technology_file_name, standard_id, remark
+        id, technology_file_id, technology_file_no, technology_file_name, standard_id, remark
     </sql>
 
 </mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceAuthorizeOrderMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceAuthorizeOrderMapper.xml
index ac5176c..554fe65 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceAuthorizeOrderMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceAuthorizeOrderMapper.xml
@@ -32,22 +32,22 @@
         SELECT *
         FROM biz_resource_authorize_order
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.orderNo != null and request.orderNo !=''">
+        <if test="request != null and request.orderNo != null and request.orderNo !=''">
             and order_no like concat('%',#{request.orderNo},'%')
         </if>
-        <if test="request.createUserName != null and request.createUserName !=''">
+        <if test="request != null and request.createUserName != null and request.createUserName !=''">
             and create_user_name like concat('%',#{request.createUserName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerExamineFormMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerExamineFormMapper.xml
index ab242f6..af7f98f 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerExamineFormMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerExamineFormMapper.xml
@@ -41,28 +41,28 @@
         SELECT *
         FROM biz_resource_customer_examine_form
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.formNo != null and request.formNo !=''">
+        <if test="request != null and request.formNo != null and request.formNo !=''">
             and form_no like concat('%',#{request.formNo},'%')
         </if>
-        <if test="request.labCode != null and request.labCode !=''">
+        <if test="request != null and request.labCode != null and request.labCode !=''">
             and lab_code like concat('%',#{request.labCode},'%')
         </if>
-        <if test="request.groupCode != null and request.groupCode !=''">
+        <if test="request != null and request.groupCode != null and request.groupCode !=''">
             and group_code like concat('%',#{request.groupCode},'%')
         </if>
-        <if test="request.createUserName != null and request.createUserName !=''">
+        <if test="request != null and request.createUserName != null and request.createUserName !=''">
             and create_user_name like concat('%',#{request.createUserName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerInfoMapper.xml
index fa8ffbc..06a2798 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerInfoMapper.xml
@@ -33,25 +33,25 @@
         SELECT *
         FROM biz_resource_customer_info
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.customerNo != null and request.customerNo !=''">
+        <if test="request != null and request.customerNo != null and request.customerNo !=''">
             and customer_no like concat('%',#{request.customerNo},'%')
         </if>
-        <if test="request.customerName != null and request.customerName !=''">
+        <if test="request != null and request.customerName != null and request.customerName !=''">
             and customer_name like concat('%',#{request.customerName},'%')
         </if>
-        <if test="request.contacts != null and request.contacts !=''">
+        <if test="request != null and request.contacts != null and request.contacts !=''">
             and contacts like concat('%',#{request.contacts},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerSuggestFormMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerSuggestFormMapper.xml
index 28f5bb2..1806662 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerSuggestFormMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerSuggestFormMapper.xml
@@ -33,28 +33,28 @@
         SELECT *
         FROM biz_resource_customer_suggest_form
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.formNo != null and request.formNo !=''">
+        <if test="request != null and request.formNo != null and request.formNo !=''">
             and form_no like concat('%',#{request.formNo},'%')
         </if>
-        <if test="request.customerName != null and request.customerName !=''">
+        <if test="request != null and request.customerName != null and request.customerName !=''">
             and customer_name like concat('%',#{request.customerName},'%')
         </if>
-        <if test="request.customerDeptName != null and request.customerDeptName !=''">
+        <if test="request != null and request.customerDeptName != null and request.customerDeptName !=''">
             and customer_dept_name like concat('%',#{request.customerDeptName},'%')
         </if>
-        <if test="request.createUserName != null and request.createUserName !=''">
+        <if test="request != null and request.createUserName != null and request.createUserName !=''">
             and create_user_name like concat('%',#{request.createUserName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSealUseNoteMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSealUseNoteMapper.xml
index ab37bc1..b02bb33 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSealUseNoteMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSealUseNoteMapper.xml
@@ -29,32 +29,32 @@
     </sql>
 
     <select id="selectBatchForApprovalList" resultMap="BaseResultMap">
-        SELECT *
+        SELECT brsun.*, brsi.seal_name, brsi.seal_type, brsi.approver_name
         FROM biz_resource_seal_use_note brsun
         JOIN biz_resource_seal_info brsi ON brsun.seal_id = brsi.id
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and brsun.approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and brsun.create_user_id = #{request.createUserId}
         </if>
-        <if test="request.sealName != null and request.sealName !=''">
+        <if test="request != null and request.sealName != null and request.sealName !=''">
             and brsi.seal_name like concat('%',#{request.sealName},'%')
         </if>
-        <if test="request.sealType != null and request.sealType !=''">
+        <if test="request != null and request.sealType != null and request.sealType !=''">
             and brsi.seal_type = #{request.sealType}
         </if>
-        <if test="request.applyDeptName != null and request.applyDeptName !=''">
+        <if test="request != null and request.applyDeptName != null and request.applyDeptName !=''">
             and brsun.apply_dept_name like concat('%',#{request.applyDeptName},'%')
         </if>
-        <if test="request.applyUserName != null and request.applyUserName !=''">
+        <if test="request != null and request.applyUserName != null and request.applyUserName !=''">
             and brsun.apply_user_name like concat('%',#{request.applyUserName},'%')
         </if>
-        <if test="request.applyTimeStart != null and request.applyTimeStart !=''">
+        <if test="request != null and request.applyTimeStart != null and request.applyTimeStart !=''">
             and brsun.apply_time &gt;= #{request.applyTimeStart}
         </if>
-        <if test="request.applyTimeEnd != null and request.applyTimeEnd !=''">
+        <if test="request != null and request.applyTimeEnd != null and request.applyTimeEnd !=''">
             and brsun.apply_time &lt;= #{request.applyTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml
index 119bf7d..4f8392a 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml
@@ -31,6 +31,12 @@
         <if test="request.deptName != null and request.deptName !=''">
             and brsi.dept_name like concat('%',#{request.deptName},'%')
         </if>
+        <if test="request.ids != null">
+            and brsv.id in
+            <foreach collection="request.ids" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
         ORDER BY brsv.grant_date DESC
     </select>
 
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSupplierInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSupplierInfoMapper.xml
index fe8d399..e8ce7ef 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSupplierInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSupplierInfoMapper.xml
@@ -48,28 +48,28 @@
         SELECT *
         FROM biz_resource_supplier_info
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.supplierNo != null and request.supplierNo !=''">
+        <if test="request != null and request.supplierNo != null and request.supplierNo !=''">
             and supplier_no like concat('%',#{request.supplierNo},'%')
         </if>
-        <if test="request.supplierName != null and request.supplierName !=''">
+        <if test="request != null and request.supplierName != null and request.supplierName !=''">
             and supplier_name like concat('%',#{request.supplierName},'%')
         </if>
-        <if test="request.director != null and request.director !=''">
+        <if test="request != null and request.director != null and request.director !=''">
             and director like concat('%',#{request.director},'%')
         </if>
-        <if test="request.supplierType != null and request.supplierType !=''">
+        <if test="request != null and request.supplierType != null and request.supplierType !=''">
             and supplier_type = #{request.supplierType}
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/EnvLocationInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/EnvLocationInfoMapper.xml
new file mode 100644
index 0000000..68bcf10
--- /dev/null
+++ b/casic-metering-dao/src/main/resources/mapper/resource/EnvLocationInfoMapper.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.mapper.resource.EnvLocationInfoMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.resource.EnvLocationInfo">
+        <id column="id" property="id" />
+        <result column="location_no" property="locationNo" />
+        <result column="location_name" property="locationName" />
+        <result column="location_position" property="locationPosition" />
+        <result column="create_user_id" property="createUserId" />
+        <result column="create_user" property="createUser" />
+        <result column="create_time" property="createTime" />
+        <result column="update_time" property="updateTime" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, location_no, location_name, location_position, create_user_id, create_user, create_time, update_time
+    </sql>
+
+    <select id="selectLocationListPage" resultType="com.casic.missiles.dto.resource.environment.LocationListResponse">
+        SELECT *
+        FROM env_location_info
+        WHERE 1=1
+        <if test="request.locationNo != null and request.locationNo !=''">
+            AND location_no LIKE concat('%',#{request.locationNo},'%')
+        </if>
+        <if test="request.locationName != null and request.locationName !=''">
+            AND location_name LIKE concat('%',#{request.locationName},'%')
+        </if>
+        ORDER BY create_time DESC
+    </select>
+
+</mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml
index b28c18f..8854047 100644
--- a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml
@@ -11,7 +11,6 @@
         <result column="sign_desc" property="signDesc" />
         <result column="sign_director" property="signDirector" />
         <result column="sign_user_id" property="signUserId" />
-        <result column="sign_type" property="signType" />
         <result column="minio_file_name" property="minioFileName" />
         <result column="create_time" property="createTime" />
         <result column="update_time" property="updateTime" />
@@ -28,7 +27,6 @@
         <result column="sign_name" property="signName" />
         <result column="sign_desc" property="signDesc" />
         <result column="sign_director" property="signDirector" />
-        <result column="sign_type" property="signType" />
         <result column="sign_user_id" property="signUserId" />
         <result column="minio_file_name" property="minioFileName" />
         <result column="create_time" property="createTime" />
@@ -62,4 +60,58 @@
         JOIN system_sign_user_relation ssur ON ss.id = ssur.sign_id
         WHERE ssur.user_id = #{userId}
     </select>
+
+    <select id="selectSignListPage" resultMap="BaseResultMap">
+        SELECT ss.*, sd.SIMPLE_NAME AS deptName
+        FROM system_sign ss
+        LEFT JOIN sys_user su ON su.id = ss.sign_user_id
+        LEFT JOIN sys_dept sd ON sd.id = su.dept_id
+        WHERE 1=1
+        <if test="request.signNo != null and request.signNo !=''">
+            AND ss.sign_no LIKE concat('%',#{request.signNo},'%')
+        </if>
+        <if test="request.signName != null and request.signName !=''">
+            AND ss.sign_name LIKE concat('%',#{request.signName},'%')
+        </if>
+        <if test="request.signDirector != null and request.signDirector !=''">
+            AND ss.sign_director LIKE concat('%',#{request.signDirector},'%')
+        </if>
+        <if test="request.signUserId != null and request.signUserId !=''">
+            AND ss.sign_user_id = #{request.signUserId}
+        </if>
+        <if test="request.createStartTime != null and request.createStartTime !=''">
+            AND DATE_FORMAT(ss.create_time,'%Y-%m-%d') &gt;= DATE_FORMAT(#{request.createStartTime},'%Y-%m-%d')
+        </if>
+        <if test="request.createEndTime != null and request.createEndTime !=''">
+            AND DATE_FORMAT(ss.create_time,'%Y-%m-%d')  &lt;= DATE_FORMAT(#{request.createEndTime},'%Y-%m-%d')
+        </if>
+        ORDER BY ss.create_time DESC
+    </select>
+
+    <select id="selectSignList" resultMap="BaseResultMap">
+        SELECT ss.*, sd.SIMPLE_NAME AS deptName
+        FROM system_sign ss
+        LEFT JOIN sys_user su ON su.id = ss.sign_user_id
+        LEFT JOIN sys_dept sd ON sd.id = su.dept_id
+        WHERE 1=1
+        <if test="request.signNo != null and request.signNo !=''">
+            AND ss.sign_no LIKE concat('%',#{request.signNo},'%')
+        </if>
+        <if test="request.signName != null and request.signName !=''">
+            AND ss.sign_name LIKE concat('%',#{request.signName},'%')
+        </if>
+        <if test="request.signDirector != null and request.signDirector !=''">
+            AND ss.sign_director LIKE concat('%',#{request.signDirector},'%')
+        </if>
+        <if test="request.signUserId != null and request.signUserId !=''">
+            AND ss.sign_user_id = #{request.signUserId}
+        </if>
+        <if test="request.createStartTime != null and request.createStartTime !=''">
+            AND DATE_FORMAT(ss.create_time,'%Y-%m-%d') &gt;= DATE_FORMAT(#{request.createStartTime},'%Y-%m-%d')
+        </if>
+        <if test="request.createEndTime != null and request.createEndTime !=''">
+            AND DATE_FORMAT(ss.create_time,'%Y-%m-%d')  &lt;= DATE_FORMAT(#{request.createEndTime},'%Y-%m-%d')
+        </if>
+        ORDER BY ss.create_time DESC
+    </select>
 </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 515050a..60f530b 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
@@ -47,8 +47,8 @@
     String STORAGE_LOCATION = "bizStorageLocation";
     //计量专业
     String MEASURE_MAJOR = "bizMeasureMajor";
-    //管理状态
-    String MANAGER_STATE = "bizManagerState";
+    //标准装置管理状态
+    String STANDARD_MANAGER_STATE = "bizStandardManagerState";
 
     /**
      * 资源管理 字典code
@@ -95,8 +95,6 @@
     String MEASURE_STATUS = "measureStatus";
     //检定方式
     String MEASURE_TYPE = "measureType";
-    //标识打印标志类型
-    String IDENTIFY_PRINT_TYPE = "bizBusinessIdentify";
     //变更类型
     String REPORT_CHANGE_TYPE = "bizCertChangeType";
     //规模类型
@@ -111,19 +109,24 @@
     String MEASURE_CATEGORY = "measureCategory";
     //检定结果
     String MEASURE_RESULT = "measureResult";
+    //分包原因
+    String OUTSOURCE_REASON = "outsourceReason";
+
+    /**
+     * 系统管理
+     */
+    String TEMPLATE_TYPE = "templateType";
+
 
     /**
      * 标准装置 字典code
      */
     //类别
     String STANDARD_CATEGORY = "standardCategory";
-    //管理状态
-    String STANDARD_MANAGER_STATE = "standardManagerState";
     //标准等级
     String STANDARD_LEVEL = "standardLevel";
     //传递范围
     String STANDARD_TRANSMIT_RANGE = "transmitRange";
-
     //资本来源
     String CAPITAL_SOURCE = "capitalSource";
     //标准装置-申请类型
@@ -148,8 +151,6 @@
     String CERTIFICATE_CLASS = "certificationClass";
     //证书管理-检校专业
     String CALIBRATION_MAJOR = "calibrationMajor";
-    //分包原因
-    String OUTSOURCE_REASON = "outsourceReason";
 
     /**
      * 工作台
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/BaseApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/BaseApprovalListRequest.java
index 73c12c1..80d7424 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/BaseApprovalListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/BaseApprovalListRequest.java
@@ -6,6 +6,7 @@
 
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotEmpty;
+import java.util.List;
 
 /**
  * @Description:
@@ -19,14 +20,14 @@
      * 表单id
      */
     @NotBlank(message = "表单id不能为空")
-    @ApiModelProperty(value = "表单id（流程定义对应的表单id，等价于业务id）", dataType = "String")
+    @ApiModelProperty(value = "表单id（流程定义对应的表单id，等价于业务id），导出接口不用传", dataType = "String")
     private String formId;
 
     /**
      * 审批状态类型，对应ApprovalStatusEnum
      */
     @NotEmpty(message = "审批状态类型不能为空")
-    @ApiModelProperty(value = "审批状态类型code", dataType = "String")
+    @ApiModelProperty(value = "审批状态类型code，导出接口不用传", dataType = "String")
     private String approvalStatus;
 
     @ApiModelProperty(hidden = true)
@@ -34,4 +35,7 @@
 
     @ApiModelProperty(hidden = true)
     private Long createUserId;
+
+    @ApiModelProperty(value = "导出ids", dataType = "List")
+    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificatePrintApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificatePrintApprovalListRequest.java
index b93d1c9..3cc2f4e 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificatePrintApprovalListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificatePrintApprovalListRequest.java
@@ -5,8 +5,6 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import java.util.List;
-
 /**
  * @Description:
  * @Author: wangpeng
@@ -38,7 +36,4 @@
 
     @ApiModelProperty(value = "创建结束时间", dataType = "String")
     private String createTimeEnd;
-
-    @ApiModelProperty(value = "导出ids", dataType = "List")
-    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportApprovalListRequest.java
index 4f7a038..c115847 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportApprovalListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportApprovalListRequest.java
@@ -5,8 +5,6 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import java.util.List;
-
 /**
  * @Description:
  * @Author: wangpeng
@@ -15,6 +13,8 @@
 @ApiModel
 @Data
 public class CertificateReportApprovalListRequest extends BaseApprovalListRequest {
+    @ApiModelProperty(value = "委托方id", dataType = "String")
+    private Long customerId;
 
     @ApiModelProperty(value = "证书报告编号", dataType = "String")
     private String certificateReportNo;
@@ -37,6 +37,4 @@
     @ApiModelProperty(value = "检校结束时间", dataType = "String")
     private String calibrationTimeEnd;
 
-    @ApiModelProperty(value = "导出ids", dataType = "List")
-    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/identify/IdentifyListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/identify/IdentifyListRequest.java
index 1b87ae6..f019203 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/identify/IdentifyListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/identify/IdentifyListRequest.java
@@ -4,6 +4,8 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * @Description:
  * @Author: wangpeng
@@ -26,4 +28,7 @@
 
     @ApiModelProperty(value = "打印结束时间", dataType = "String")
     private String createTimeEnd;
+
+    @ApiModelProperty(value = "导出ids", dataType = "List")
+    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListRequest.java
index 1264883..62415fb 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListRequest.java
@@ -7,6 +7,7 @@
 import lombok.Data;
 
 import javax.validation.constraints.NotBlank;
+import java.util.List;
 
 @Data
 @ApiModel
@@ -37,4 +38,6 @@
     @ApiModelProperty(value = "是否加急（1是0否null全部）", dataType = "Integer")
     private String isUrgent;
 
+    @ApiModelProperty(value = "导出ids", dataType = "List")
+    private List<Long> ids;
 }

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java
index bb0c50f..13a699b 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java
@@ -12,6 +12,7 @@
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.IGeneralApprovalService;
+import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
@@ -19,6 +20,7 @@
 import org.springframework.web.bind.annotation.RequestBody;
 
 import javax.validation.Valid;
+import java.util.List;
 import java.util.Objects;
 
 /**
@@ -117,4 +119,17 @@
         }
         return baseApprovalService.failUpdate(request);
     }
+
+    public List<O> exportList(@RequestBody @Valid R request) throws Exception {
+        List<O> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = baseApprovalService.listExportByIds(request.getIds());
+        } else {
+            list = baseApprovalService.listExport(request);
+        }
+        for (O record : list) {
+            DictCodeUtils.convertDictCodeToName(record);
+        }
+        return list;
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java
index 8a90961..d775831 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java
@@ -5,6 +5,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.business.certificate.CertificateChangeApplyApprovalListRequest;
 import com.casic.missiles.dto.business.certificate.CertificateChangeApplySaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessCertificateChangeApply;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
@@ -20,6 +21,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -48,4 +50,12 @@
         }
         return changeApplyService.saveChangeApply(request);
     }
+
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody CertificateChangeApplyApprovalListRequest request) throws Exception {
+        List<BizBusinessCertificateChangeApply> list = super.exportList(request);
+        super.exportExcel(BizBusinessCertificateChangeApply.class, list, ExportEnum.CERTIFICATE_CHANGE_APPLY.getSheetName());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java
index 5fc4b07..af8230e 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java
@@ -9,6 +9,7 @@
 import com.casic.missiles.dto.business.certificate.CertificatePrintApprovalListRequest;
 import com.casic.missiles.dto.business.certificate.CertificatePrintListResponse;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.enums.business.CertificatePrintStatusEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessCertificatePrintLog;
@@ -18,10 +19,16 @@
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.io.IOException;
+import java.util.List;
 import java.util.Objects;
 
 /**
@@ -98,4 +105,16 @@
         });
         return certificatePrintService.certificatePrintLog(idDTO.getId());
     }
+
+    @ApiOperation("证书打印审批导出")
+    @PostMapping("/listExport")
+    public void exportList(@RequestBody CertificatePrintApprovalListRequest request) throws IOException {
+        List<CertificatePrintListResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = certificatePrintService.listByIds(request.getIds());
+        } else {
+            list = certificatePrintService.list(request);
+        }
+        super.exportExcel(CertificatePrintListResponse.class, list, ExportEnum.CERTIFICATE_PRINT.getSheetName());
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java
index 63b06dc..6b2efd5 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java
@@ -6,6 +6,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.business.certificate.CertificateReportApprovalListRequest;
 import com.casic.missiles.dto.business.certificate.CertificateReportSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessCertificateReport;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
@@ -21,6 +22,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -50,7 +52,7 @@
         return certificateReportService.saveCertificateReport(request);
     }
 
-    @ApiOperation("证书审批详情（基本信息）")
+    @ApiOperation("详情（基本信息）")
     @PostMapping("/detail")
     public ReturnDTO<BizBusinessCertificateReport> detail(@RequestBody @Valid BaseDetailRequest request, BindingResult bindingResult) throws Exception {
         if(bindingResult.hasErrors()){
@@ -59,4 +61,11 @@
         return certificateReportService.detail(request);
     }
 
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody CertificateReportApprovalListRequest request) throws Exception {
+        List<BizBusinessCertificateReport> list = super.exportList(request);
+        super.exportExcel(BizBusinessCertificateReport.class, list, ExportEnum.CERTIFICATE_REPORT.getSheetName());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java
index 46b26bd..57c0809 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java
@@ -10,20 +10,21 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.business.identify.IdentifyListRequest;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessIdentifyInfo;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.business.IBizBusinessIdentifyInfoService;
+import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import javax.validation.Valid;
+import java.util.List;
 import java.util.Objects;
 
 /**
@@ -57,16 +58,13 @@
         return identifyInfoService.addIdentify(identifyInfo);
     }
 
-    @ApiOperation("标识打印更新")
+    @ApiOperation("标识打印更新（更新打印时间）")
     @PostMapping("/update")
-    public ReturnDTO updateIdentify(@RequestBody @Valid BizBusinessIdentifyInfo identifyInfo, BindingResult bindingResult) {
-        Assert.isFalse(Objects.isNull(identifyInfo.getId()), () -> {
+    public ReturnDTO updateIdentify(@RequestBody @Valid IdDTO idDTO) {
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        Assert.isFalse(bindingResult.hasErrors(), () -> {
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        });
-        return identifyInfoService.updateIdentify(identifyInfo);
+        return identifyInfoService.updateIdentify(idDTO.getId());
     }
 
     @ApiOperation("标识打印删除")
@@ -77,4 +75,37 @@
         });
         return identifyInfoService.deleteIdentify(idDTO.getId());
     }
+
+    @ApiOperation("标识打印导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody @Valid IdentifyListRequest request, BindingResult bindingResult) throws Exception {
+        if (bindingResult.hasErrors()) {
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        List<BizBusinessIdentifyInfo> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = identifyInfoService.listByIds(request.getIds());
+        } else {
+            list = identifyInfoService.list(request);
+        }
+        for (BizBusinessIdentifyInfo record : list) {
+            DictCodeUtils.convertDictCodeToName(record);
+        }
+        super.exportExcel(BizBusinessIdentifyInfo.class, list, ExportEnum.IDENTIFY_EXPORT.getSheetName());
+    }
+
+
+    // TODO: 2023/8/23 查询设备信息，4个底部按钮查设备（按钮的作用就是前端用来调不同接口、用来区分中间即将展示的标识），前端弹窗选设备，在确定保存时前端根据底部按钮判断传入设备类型deviceType字典code
+    // TODO: 2023/8/23 接口：查受检设备（第1个按钮），查设备台账（后3个按钮同一接口），查询之后前端根据标志类型的不同加到中间页面时进行判断（按产品给的对应表）
+    // TODO: 2023/8/23 提供二维码接口，前端在加到中间页面时调用一下
+
+    @ApiOperation("设备二维码")
+    @PostMapping("/equipment/qrCode")
+    public ReturnDTO<String> equipmentQrCode(@RequestBody @Valid IdDTO idDTO) {
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return identifyInfoService.equipmentQrCode(idDTO.getId());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java
index 707be6e..7e0453d 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java
@@ -117,7 +117,7 @@
     }
 
     @ApiOperation("任务单导出")
-    @PostMapping("/export")
+    @PostMapping("/listExport")
     public void orderExport(@RequestBody @Valid OrderListRequest request, HttpServletResponse response) {
         businessOrderService.orderExport(request, response);
     }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java
index 529a6ce..51432be 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java
@@ -1,9 +1,28 @@
 package com.casic.missiles.controller.business;
 
+import com.casic.missiles.controller.GeneralApprovalController;
+import com.casic.missiles.dto.BaseApprovalSubmitRequest;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.business.outsource.OutsourceAssessApprovalListRequest;
+import com.casic.missiles.dto.business.outsource.OutsourceAssessSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
+import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.model.business.BizBusinessOutsourceAssess;
+import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
+import com.casic.missiles.service.IGeneralApprovalService;
+import com.casic.missiles.service.business.IBizBusinessOutsourceAssessService;
 import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.BindingResult;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.validation.Valid;
+import java.util.List;
+
 /**
  * <p>
  * 计量检定业务-分包管理-测试、校准或检定工作分包评审表 前端控制器
@@ -15,6 +34,27 @@
 @Api(tags = "分包管理-测试、校准或检定工作分包评审表")
 @RestController
 @RequestMapping("/business/outsource/assess")
-public class BizBusinessOutsourceAssessController {
+public class BizBusinessOutsourceAssessController extends GeneralApprovalController<BizBusinessOutsourceAssess, BizBusinessOutsourceAssess, OutsourceAssessApprovalListRequest, BaseApprovalSubmitRequest> {
+    @Autowired
+    private IBizBusinessOutsourceAssessService outsourceAssessService;
 
+    public BizBusinessOutsourceAssessController(IGeneralApprovalService<BizBusinessOutsourceAssess, BizBusinessOutsourceAssess, OutsourceAssessApprovalListRequest, BaseApprovalSubmitRequest> baseApprovalService) {
+        super(baseApprovalService);
+    }
+
+    @ApiOperation("草稿箱-保存")
+    @PostMapping("/save")
+    public ReturnDTO<OutsourceAssessSaveResponse> saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceAssess request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        return outsourceAssessService.saveOutsourceAssess(request);
+    }
+
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception {
+        List<BizBusinessOutsourceAssess> list = super.exportList(request);
+        super.exportExcel(BizBusinessOutsourceAssess.class, list, ExportEnum.OUTSOURCE_ASSESS.getSheetName());
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java
new file mode 100644
index 0000000..9adef18
--- /dev/null
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java
@@ -0,0 +1,60 @@
+package com.casic.missiles.controller.business;
+
+import com.casic.missiles.controller.GeneralApprovalController;
+import com.casic.missiles.dto.BaseApprovalSubmitRequest;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.business.outsource.OutsourceProtocolApprovalListRequest;
+import com.casic.missiles.dto.business.outsource.OutsourceProtocolSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
+import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.model.business.BizBusinessOutsourceProtocol;
+import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
+import com.casic.missiles.service.IGeneralApprovalService;
+import com.casic.missiles.service.business.IBizBusinessOutsourceProtocolService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.BindingResult;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.validation.Valid;
+import java.util.List;
+
+/**
+ * <p>
+ * 计量检定业务-分包管理-测试、校准或检定工作分包协议书 前端控制器
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-08-24
+ */
+@Api(tags = "分包管理-测试、校准或检定工作分包协议书")
+@RestController
+@RequestMapping("/business/outsource/protocol")
+public class BizBusinessOutsourceProtocolController extends GeneralApprovalController<BizBusinessOutsourceProtocol, BizBusinessOutsourceProtocol, OutsourceProtocolApprovalListRequest, BaseApprovalSubmitRequest> {
+    @Autowired
+    private IBizBusinessOutsourceProtocolService outsourceProtocolService;
+
+    public BizBusinessOutsourceProtocolController(IGeneralApprovalService<BizBusinessOutsourceProtocol, BizBusinessOutsourceProtocol, OutsourceProtocolApprovalListRequest, BaseApprovalSubmitRequest> baseApprovalService) {
+        super(baseApprovalService);
+    }
+
+    @ApiOperation("草稿箱-保存")
+    @PostMapping("/save")
+    public ReturnDTO<OutsourceProtocolSaveResponse> saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceProtocol request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        return outsourceProtocolService.saveOutsourceProtocol(request);
+    }
+
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody OutsourceProtocolApprovalListRequest request) throws Exception {
+        List<BizBusinessOutsourceProtocol> list = super.exportList(request);
+        super.exportExcel(BizBusinessOutsourceProtocol.class, list, ExportEnum.OUTSOURCE_PROTOCOL.getSheetName());
+    }
+}
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java
index 097f645..f0f0943 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java
@@ -17,7 +17,6 @@
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.IGeneralApprovalService;
 import com.casic.missiles.service.business.IBizBusinessOutsourcerInfoService;
-import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -71,19 +70,8 @@
 
     @ApiOperation("分包方导出")
     @PostMapping("/listExport")
-    public void export(@RequestBody @Valid OutsourcerInfoApprovalListRequest request, BindingResult bindingResult) throws Exception {
-        if (bindingResult.hasErrors()) {
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        }
-        List<BizBusinessOutsourcerInfo> list;
-        if (!CollectionUtils.isEmpty(request.getIds())) {
-            list = outsourcerInfoService.listByIds(request.getIds());
-        } else {
-            list = outsourcerInfoService.list(request);
-        }
-        for (BizBusinessOutsourcerInfo record : list) {
-            DictCodeUtils.convertDictCodeToName(record);
-        }
+    public void export(@RequestBody OutsourcerInfoApprovalListRequest request) throws Exception {
+        List<BizBusinessOutsourcerInfo> list = super.exportList(request);
         super.exportExcel(BizBusinessOutsourcerInfo.class, list, ExportEnum.OUTSOURCER_EXPORT.getSheetName());
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java
index c2cbf9f..0410918 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java
@@ -17,11 +17,9 @@
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.IGeneralApprovalService;
 import com.casic.missiles.service.business.IBizBusinessSiteExecutiveInfoService;
-import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -60,7 +58,7 @@
         return siteExecutiveInfoService.saveSiteExecutiveInfo(siteExecutiveInfo);
     }
 
-    @ApiOperation("现场检测详情")
+    @ApiOperation("详情")
     @PostMapping("/detail")
     public ReturnDTO<SiteExecutiveDetailResponse> siteExecutiveDetail(@RequestBody @Valid IdDTO idDTO) throws Exception {
         Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
@@ -69,21 +67,10 @@
         return ReturnUtil.success(siteExecutiveInfoService.detail(idDTO.getId()));
     }
 
-    @ApiOperation("现场检测导出")
+    @ApiOperation("导出")
     @PostMapping("/listExport")
-    public void export(@RequestBody @Valid SiteExecutiveApprovalListRequest request, BindingResult bindingResult) throws Exception {
-        if (bindingResult.hasErrors()) {
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        }
-        List<SiteExecutiveApprovalListResponse> list;
-        if (!CollectionUtils.isEmpty(request.getIds())) {
-            list = siteExecutiveInfoService.listInfoByIds(request.getIds());
-        } else {
-            list = siteExecutiveInfoService.listInfo(request);
-        }
-        for (SiteExecutiveApprovalListResponse record : list) {
-            DictCodeUtils.convertDictCodeToName(record);
-        }
+    public void export(@RequestBody SiteExecutiveApprovalListRequest request) throws Exception {
+        List<SiteExecutiveApprovalListResponse> list = super.exportList(request);
         super.exportExcel(SiteExecutiveApprovalListResponse.class, list, ExportEnum.SITE_EXECUTIVE_EXPORT.getSheetName());
     }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
index 7e793cd..a92e209 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
@@ -55,7 +55,7 @@
 
     @ApiOperation("设备收发列表导出")
     @PostMapping("/export")
-    public void exportList(@RequestBody @Valid SampleDispatchListRequest request) throws IOException {
+    public void exportList(@RequestBody SampleDispatchListRequest request) throws IOException {
         List<SampleDispatchListResponse> list;
         if (!CollectionUtils.isEmpty(request.getIds())) {
             list = dispatchService.listByIds(request.getIds());
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java
index cdc77fc..d120fd4 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java
@@ -7,6 +7,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.business.labExecutive.*;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.business.IBusinessLabExecutiveInfoService;
@@ -14,6 +15,7 @@
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.*;
 
@@ -32,7 +34,7 @@
     @Autowired
     private IBusinessLabExecutiveInfoService labExecutiveInfoService;
 
-    @ApiOperation("实验室检测-部门检测-查询各状态列表（待检测、检测中、检测完）")
+    @ApiOperation("实验室任务-查询各状态列表（待检测、检测中、检测完）")
     @PostMapping("/deptExecutive/List")
     public ReturnDTO<PageInfoBT<SampleLabExecutiveListResponse>> queryDeptExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
@@ -43,10 +45,19 @@
         return ReturnUtil.success(super.packForBT(labExecutiveInfoService.deptLabExecutiveListPage(page, labExecutiveListRequest)));
     }
 
-    /**
-     * 实验室检测-我的检测-查询各状态列表（待检测、检测中、检测完）
-     */
-    @ApiOperation("实验室检测-我的检测-查询各状态列表（待检测、检测中、检测完）")
+    @ApiOperation("实验室任务导出")
+    @PostMapping("/deptExecutive/export")
+    public void deptExportList(@RequestBody @Valid SampleLabExecutiveListRequest request) throws Exception {
+        List<SampleLabExecutiveListResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = labExecutiveInfoService.deptLabExecutiveListByIds(request.getMeasureStatus(), request.getIds());
+        } else {
+            list = labExecutiveInfoService.deptLabExecutiveList(request);
+        }
+        super.exportExcel(SampleLabExecutiveListResponse.class, list, ExportEnum.DEPT_EXECUTIVE_TASK.getSheetName());
+    }
+
+    @ApiOperation("我的任务-查询各状态列表（待检测、检测中、检测完）")
     @PostMapping("/myExecutive/list")
     public ReturnDTO<PageInfoBT<SampleLabExecutiveListResponse>> queryMyExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
@@ -57,19 +68,25 @@
         return ReturnUtil.success(super.packForBT(labExecutiveInfoService.myLabExecutiveListPage(page, labExecutiveListRequest)));
     }
 
-    /**
-     * 实验室检测-我的检测-查询各状态样品数量（待检测、检测中、检测完）
-     */
-    @ApiOperation("实验室检测-我的检测-查询各状态样品数量（待检测、检测中、检测完）")
+    @ApiOperation("我的任务导出")
+    @PostMapping("/myExecutive/export")
+    public void exportList(@RequestBody @Valid SampleLabExecutiveListRequest request) throws Exception {
+        List<SampleLabExecutiveListResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = labExecutiveInfoService.myLabExecutiveListByIds(request.getMeasureStatus(), request.getIds());
+        } else {
+            list = labExecutiveInfoService.myLabExecutiveList(request);
+        }
+        super.exportExcel(SampleLabExecutiveListResponse.class, list, ExportEnum.MY_EXECUTIVE_TASK.getSheetName());
+    }
+
+    @ApiOperation("我的任务-查询各状态样品数量（待检测、检测中、检测完）")
     @GetMapping("/myExecutive/amount")
     public ReturnDTO<List<SampleAmountResponse>> queryMyExecutiveAmount() {
         return ReturnUtil.success(labExecutiveInfoService.myExecutiveAmount());
     }
 
-    /**
-     * 实验室检测-部门检测-分配（分配给具体人员）
-     */
-    @ApiOperation("实验室检测-部门检测-分配按钮（分配给具体人员）")
+    @ApiOperation("实验室任务-分配按钮（分配给具体人员）")
     @PostMapping("/deptExecutive/allocate")
     public ReturnDTO allocateStaff(@RequestBody @Valid SampleAllocateRequest sampleAllocateRequest, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -78,10 +95,7 @@
         return labExecutiveInfoService.allocateStaff(sampleAllocateRequest);
     }
 
-    /**
-     * 实验室检测-我的检测-检定人扫描收入（待检测->检测中）
-     */
-    @ApiOperation("实验室检测-我的检测-检定人扫描收入（待检测->检测中）")
+    @ApiOperation("我的任务-检定人扫描收入（待检测->检测中）")
     @PostMapping("/myExecutive/receive")
     public ReturnDTO sampleReceive(@RequestBody @Valid List<SampleOperateRequest> requestList, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -90,10 +104,7 @@
         return labExecutiveInfoService.sampleReceive(requestList);
     }
 
-    /**
-     * 实验室检测-负责人/检定人扫描检完（检测中->检测完）
-     */
-    @ApiOperation("实验室检测-负责人/检定人扫描检完（检测中->检测完）")
+    @ApiOperation("实验室任务-负责人/检定人扫描检完（检测中->检测完）")
     @PostMapping("/myExecutive/complete")
     public ReturnDTO sampleExecutiveComplete(@RequestBody @Valid List<SampleOperateRequest> requestList, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -102,10 +113,7 @@
         return labExecutiveInfoService.sampleExecutiveComplete(requestList);
     }
 
-    /**
-     * 实验室检测-部门检测/我的检测 编辑（只能修改应出具证书）
-     */
-    @ApiOperation("实验室检测-部门检测/我的检测 编辑（只能修改应出具证书）")
+    @ApiOperation("实验室任务/我的任务 编辑（只能修改应出具证书）")
     @PostMapping("/executive/update")
     public ReturnDTO updateExecutive(@RequestBody @Valid UpdateExecutiveRequest request, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -114,10 +122,7 @@
         return labExecutiveInfoService.updateExecutive(request);
     }
 
-    /**
-     * 实验室检测-部门检测/我的检测 详情
-     */
-    @ApiOperation("实验室检测-部门检测/我的检测 详情")
+    @ApiOperation("实验室任务/我的任务 详情")
     @PostMapping("/executive/detail")
     public ReturnDTO<ExecutiveDetailResponse> executiveDetail(@RequestBody @Valid ExecutiveDetailRequest request, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
@@ -131,7 +136,7 @@
      * 退回后会将下一个要执行的实验室检测状态更新为待分配，将后面的实验室顺序变更为连续（都进行减1）
      * 最后一个检测的实验室退回，等分发员再增加实验室或设备收发中的已收入直接手动点击完成
      */
-    @ApiOperation("实验室检测-部门检测/我的检测 退回（待检测/检测中->退回）")
+    @ApiOperation("实验室任务/我的任务 退回（待检测/检测中->退回）")
     @PostMapping("/executive/sendBack")
     public ReturnDTO executiveSendBack(@RequestBody @Valid ExecutiveSendBackRequest request, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -140,9 +145,6 @@
         return labExecutiveInfoService.sampleExecutiveSendBack(request);
     }
 
-    /**
-     * 分发员编辑实验室检测列表
-     */
     @ApiOperation("分发员编辑实验室检测列表")
     @PostMapping("/handOut/updateList")
     public ReturnDTO updateExecutiveList(@RequestBody @Valid UpdateExecutiveListRequest request, BindingResult bindingResult) {
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java
index 48a67ed..0c04f31 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java
@@ -10,6 +10,7 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.resource.customer.CustomerApprovalListRequest;
 import com.casic.missiles.dto.resource.customer.CustomerSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceCustomerInfo;
@@ -26,6 +27,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -55,6 +57,13 @@
         return customerInfoService.saveCustomerInfo(request);
     }
 
+    @ApiOperation("委托方名录导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody CustomerApprovalListRequest request) throws Exception {
+        List<BizResourceCustomerInfo> list = super.exportList(request);
+        super.exportExcel(BizResourceCustomerInfo.class, list, ExportEnum.CUSTOMER_INFO.getSheetName());
+    }
+
     @ApiOperation("委托方人员列表（分页）")
     @PostMapping("/person/listPage")
     public ReturnDTO<PageInfoBT<BizResourceCustomerStaff>> personListPage(@RequestBody IdDTO idDto) {
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
index 972ed4b..6418ea5 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
@@ -5,6 +5,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.resource.customer.SuggestFormApprovalListRequest;
 import com.casic.missiles.dto.resource.customer.SuggestFormSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceCustomerSuggestForm;
@@ -20,6 +21,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -50,4 +52,11 @@
         return suggestFormService.saveSuggestForm(request);
     }
 
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody SuggestFormApprovalListRequest request) throws Exception {
+        List<BizResourceCustomerSuggestForm> list = super.exportList(request);
+        super.exportExcel(BizResourceCustomerSuggestForm.class, list, ExportEnum.CUSTOMER_SUGGEST_FORM.getSheetName());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java
index 1934d1a..9e07eab 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java
@@ -15,12 +15,16 @@
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.resource.IEnvEnvironmentRecordConfigService;
 import com.casic.missiles.service.resource.IEnvEnvironmentRecordDataService;
+import com.casic.missiles.service.resource.IEnvLocationInfoService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
 import java.util.List;
@@ -39,6 +43,8 @@
     private IEnvEnvironmentRecordDataService environmentRecordDataService;
     @Autowired
     private IEnvEnvironmentRecordConfigService environmentRecordConfigService;
+    @Autowired
+    private IEnvLocationInfoService locationInfoService;
 
     @ApiOperation("环境记录单数据列表/详情")
     @PostMapping("/data/listPage")
@@ -95,4 +101,11 @@
         });
         return environmentRecordConfigService.deleteEnvironmentRecordConfig(idDTO.getId());
     }
+
+    @ApiOperation("地点列表")
+    @PostMapping("/location/listPage")
+    public ReturnDTO<PageInfoBT<LocationListResponse>> locationListPage(@RequestBody @Valid LocationListRequest request) {
+        Page<LocationListResponse> page = PageFactory.defaultPage();
+        return ReturnUtil.success(super.packForBT(locationInfoService.listPage(page, request)));
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java
index 82efe3f..e9561fa 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java
@@ -10,6 +10,7 @@
 import com.casic.missiles.dto.resource.seal.SealLogListRequest;
 import com.casic.missiles.dto.resource.seal.SealNoteApprovalListRequest;
 import com.casic.missiles.dto.resource.seal.SealNoteSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceSealUseLog;
@@ -27,6 +28,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -58,6 +60,13 @@
         return sealUseNoteService.saveSeal(request);
     }
 
+    @ApiOperation("印章使用登记导出（列表和导出中去掉经办人和监印人）")
+    @PostMapping("/listExport")
+    public void export(@RequestBody SealNoteApprovalListRequest request) throws Exception {
+        List<BizResourceSealUseNote> list = super.exportList(request);
+        super.exportExcel(BizResourceSealUseNote.class, list, ExportEnum.SEAL_NOTE.getSheetName());
+    }
+
     // TODO: 2023/7/28 印章使用日志：系统中使用印章时插入数据库
 
     @ApiOperation("印章使用日志列表（分页）")
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java
index 9b674fc..06b6521 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java
@@ -9,16 +9,20 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.resource.staff.StaffCertRequest;
 import com.casic.missiles.dto.resource.staff.StaffCertResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.service.resource.IBizResourceStaffInfoService;
 import com.casic.missiles.service.resource.IBizResourceStaffVerifierService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.List;
+
 /**
  * @Description:
  * @Author: wangpeng
@@ -41,9 +45,21 @@
         return ReturnUtil.success(super.packForBT(responsePage));
     }
 
+    @ApiOperation("证书逾期提醒导出")
+    @PostMapping("/listExport")
+    public void exportList(@RequestBody StaffCertRequest request) throws Exception {
+        List<StaffCertResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = staffInfoService.certListByIds(request.getIds());
+        } else {
+            list = staffInfoService.certList(request);
+        }
+        super.exportExcel(StaffCertResponse.class, list, ExportEnum.STAFF_CERTIFICATE_EXPIRE.getSheetName());
+    }
+
     @ApiOperation("证书逾期提醒")
     @PostMapping("/expirationReminder")
-    public ReturnDTO expirationReminder(@RequestBody IdDTO idDto) {
-        return verifierService.expirationReminder(idDto);
+    public ReturnDTO expirationReminder(@RequestBody IdDTO idDTO) {
+        return verifierService.expirationReminder(idDTO);
     }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java
index 3b251ad..a6e7850 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java
@@ -12,6 +12,7 @@
 import com.casic.missiles.dto.resource.staff.StaffListRequest;
 import com.casic.missiles.dto.resource.staff.TrainListRequest;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.*;
@@ -22,7 +23,10 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
 import java.util.List;
@@ -52,8 +56,19 @@
             throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
         }
         Page<BizResourceStaffInfo> page = PageFactory.defaultPage();
-        Page<BizResourceStaffInfo> responsePage = staffInfoService.listPage(page, request);
-        return ReturnUtil.success(super.packForBT(responsePage));
+        return ReturnUtil.success(super.packForBT(staffInfoService.listPage(page, request)));
+    }
+
+    @ApiOperation("人员登记导出")
+    @PostMapping("/listExport")
+    public void exportList(@RequestBody StaffListRequest request) throws Exception {
+        List<BizResourceStaffInfo> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = staffInfoService.listByIds(request.getIds());
+        } else {
+            list = staffInfoService.list(request);
+        }
+        super.exportExcel(BizResourceStaffInfo.class, list, ExportEnum.STAFF_INFO.getSheetName());
     }
 
     @ApiOperation("人员登记详情基础信息")
@@ -85,9 +100,9 @@
 
     @ApiOperation("科研教育列表（分页）")
     @PostMapping("/education/listPage")
-    public ReturnDTO<PageInfoBT<BizResourceStaffEducation>> educationListPage(@RequestBody IdDTO idDto) {
+    public ReturnDTO<PageInfoBT<BizResourceStaffEducation>> educationListPage(@RequestBody IdDTO idDTO) {
         Page<BizResourceStaffEducation> page = PageFactory.defaultPage();
-        Page<BizResourceStaffEducation> responsePage = staffInfoService.educationListPage(page, idDto);
+        Page<BizResourceStaffEducation> responsePage = staffInfoService.educationListPage(page, idDTO);
         return ReturnUtil.success(super.packForBT(responsePage));
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java
index af6aa86..d85d84a 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java
@@ -9,6 +9,7 @@
 import com.casic.missiles.dto.resource.outsideService.SupplierApprovalListRequest;
 import com.casic.missiles.dto.resource.outsideService.SupplierSaveResponse;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceSupplierAbility;
@@ -67,6 +68,13 @@
         return ReturnUtil.success(supplierInfoService.detail(idDTO.getId()));
     }
 
+    @ApiOperation("合格供方导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody SupplierApprovalListRequest request) throws Exception {
+        List<BizResourceSupplierInfo> list = super.exportList(request);
+        super.exportExcel(BizResourceSupplierInfo.class, list, ExportEnum.SUPPLIER_INFO.getSheetName());
+    }
+
     @ApiOperation("供方人员列表（分页）")
     @PostMapping("/person/listPage")
     public ReturnDTO<PageInfoBT<BizResourceSupplierPerson>> personListPage(@RequestBody IdDTO idDTO) {
diff --git a/casic-metering-api/src/main/resources/config/application.yml b/casic-metering-api/src/main/resources/config/application.yml
index 350db5f..ecff521 100644
--- a/casic-metering-api/src/main/resources/config/application.yml
+++ b/casic-metering-api/src/main/resources/config/application.yml
@@ -126,7 +126,7 @@
     #作者
     author: wangpeng
     #待生成对象表名
-    table-name: biz_equipment_technical_target_approval,biz_equipment_attachment_approval,biz_equipment_checkpoint_approval
+    table-name: biz_business_outsource_protocol
 
 reminder:
   #节点--common模块config包 ReminderNodeConfig配置
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
index 4a19e4e..d47d552 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
@@ -53,6 +53,7 @@
     SUGGEST_FORM_SAVE_FAILED(2509, "委托方意见登记表保存至草稿箱失败"),
     EXAMINE_FORM_SAVE_FAILED(2510, "要求、委托书及合同评审表保存至草稿箱失败"),
     CUSTOMER_EXIST_SAVE_FAILED(2511, "该委托方已存在，请重新选择"),
+    DUPLICATE_LOCATION_NO(2512, "地点编号已存在"),
 
     /**
      * 计量检定业务模块
@@ -68,6 +69,8 @@
     COMPLETE_SAMPLE_NOT_EXIST(2609, "检测中不存在扫描收入的样品"),
     CANNOT_CHANGE_MEASURE_INFO(2610, "无法更改非当前登录用户的检测信息"),
     NON_EXIST_ORDER_OR_SAMPLE(2611, "不存在该委托单或该委托单下的样品"),
+    OUTSOURCE_ACCESS_SAVE_FAILED(2612, "测试、校准或检定工作分包评审表保存至草稿箱失败"),
+    OUTSOURCE_PROTOCOL_SAVE_FAILED(2613, "测试、校准或检定工作分包协议书保存至草稿箱失败"),
 
     /**
      * 历史遗留备用
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
index 5089ad1..81a406b 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
@@ -10,54 +10,38 @@
     /**
      * 资源管理
      */
-    ENVIRONMENT_DATA_EXPORT("environmentData", "environmentData", "环境记录单数据"),
+    ENVIRONMENT_DATA_EXPORT("environmentData", "环境记录单数据", "环境记录单数据"),
+    STAFF_INFO("staffInfo", "人员登记", "人员登记"),
+    STAFF_CERTIFICATE_EXPIRE("certificateExpire", "证书逾期提醒", "证书逾期提醒"),
+    SUPPLIER_INFO("supplierInfo", "合格供方名录", "合格供方名录"),
+    CUSTOMER_INFO("customerInfo", "委托方名录", "委托方名录"),
+    CUSTOMER_SUGGEST_FORM("customerSuggestForm", "委托方意见登记表", "委托方意见登记表"),
+    SEAL_NOTE("sealNote", "印章使用登记", "印章使用登记"),
 
-    FILE_EXPORT("meterFileData", "meterFileData", "计量文件信息"),
-    TRAIN_PLAN_EXPORT("trainPlanData", "trainPlanData", "培训计划"),
-    TRAIN_LOG_EXPORT("trainLogData", "trainLogData", "培训记录"),
-    METER_ORGANIZE_EXPORT("meterOrganizeData", "meterOrganizeData", "计量组织"),
-    TRACE_SUPPLIER_EXPORT("traceSupplierData", "traceSupplierData", "溯源供方"),
-    SIGN_EXPORT("signData", "signData", "签名/签章"),
-    TEMPLATE_EXPORT("templateData", "templateData", "原始记录模板/证书报告模板"),
-    FIXED_ASSETS("meterFixedAssets", "meterFixedAssets", "固定资产"),
-    METER_EQUIPMENT("meterEquipment", "meterEquipment", "测量设备"),
-    CALIBRATION_TEST_EQUIPMENT("calibrationTestEquipment", "calibrationTestEquipment", "校准检定设备"),
-    MEASURE_ACCOUNT("measureAccount", "measureAccount", "测量工装"),
-    STANDARD_SUPPORT_EQUIPMENT("standardSupportEquipment", "standardSupportEquipment", "标准配套设备"),
-    STANDARD_EQUIPMENT("standardEquipment", "standardEquipment", "标准装置"),
-    FLOW_DEF_EXPORT("flowDefData", "flowDefData", "流程定义"),
-    STAFF_CERTIFICATE("certificate", "certificate", "计量人员证书"),
-    CHECK_INFO("checkInfo", "checkInfo", "设备管理点检测"),
-    EQUIPMENT_APPLY("equipmentApply", "equipmentApply", "设备借用"),
-    STANDARD_EQUIPMENT_REMIND("equipmentApplyRemind", "equipmentApplyRemind", "标准装置到期提醒"),
-    METER_PRICE("meterPrice", "meterPrice", "价格库"),
-    METER_STAFF("meterStaff", "meterStaff", "计量人员"),
-    STANDARD_EQUIPMENT_APPLY("standardEquipmentApply", "standardEquipmentApply", "标准装置申请"),
-    STATE_MANAGE_APPLY("stateManage", "stateManage", "状态管理"),
-    METER_ACCEPTANCE_CHECK("acceptanceCheck", "acceptanceCheck", "设备检修保养验收单"),
-    CUSTOMER_EXPORT("customerData", "customerData", "客户信息"),
-    ORDER_EXPORT("orderData", "orderData", "委托书信息"),
-    SAMPLE_EXPORT("sampleData", "sampleData", "样本信息"),
-    EXCHANGE_DATA("exchangeData", "exchangeData", "设备交接单"),
-    DISPATCH_DATA("dispatchData", "dispatchData", "设备收发"),
-    ENVIRONMENT_DATA("environmentData", "environmentData", "环境记录单"),
-    ORIGIN_DATA("originData", "originData", "原始记录"),
-    CERTIFICATE_REPORT("certificateReport", "certificateReport", "证书报告"),
-    ADVICE_EXPORT("adviceData", "adviceData", "客户反馈"),
-    HANDOUT_EXPORT("handoutData", "handoutData", "任务分发列表"),
-    OUTSOURCER_EXPORT("outsourcerData", "outsourcerData", "分包方"),
-    SITE_EXECUTIVE_EXPORT("siteExecutiveData", "siteExecutiveData", "现场测试、校准或检定"),
-    CERTIFICATE_PRINT_EXPORT("certificatePrintData", "certificatePrintData", "证书打印"),
-    DOWNLOAD_TEMPLATE("downloadTemplate", "downloadTemplate", "页面配置"),
-    OUTSOURCER_CERTIFICATE_EXPORT("outsourceCertificateData", "outsourceCertificateData", "分包证书"),
-    SETTLEMENT_INFO_EXPORT("settlementInfoData", "settlementInfoData", "业务结算"),
-    EQUIPMENT_REMIND("equipmentRemind", "equipmentRemind", "设备到期提醒"),
-    AGREEMENT_INFO_EXPORT("agreementInfoData", "agreementInfoData", "合同"),
-    WORK_STATISTICS_EXPORT("workStatisticsData", "workStatisticsData", "实时工作统计"),
-    DEPT_OUTPUT_EXPORT("deptOutputData", "deptOutputData", "部门产值分析"),
-    WORKLOAD_EXPORT("workloadData", "workloadData", "业务工作量分析"),
-    DEPT_COMPREHENSIVE_EXPORT("deptComprehensiveData", "deptComprehensiveData", "部门综合分析"),
-    ENVIRONMENTAL_RECORD("environmentalRecordData", "environmentalRecordData", "现场环境记录");
+    /**
+     * 计量检定业务
+     */
+    OUTSOURCER_EXPORT("outsourcerData", "分包方名录", "分包方名录"),
+    IDENTIFY_EXPORT("identifyData", "计量标识", "计量标识"),
+    ORDER_EXPORT("orderData", "任务单", "任务单"),
+    DISPATCH_DATA("dispatchData", "设备收发", "设备收发"),
+    HANDOUT_EXPORT("handoutData", "任务分发", "任务分发"),
+    SITE_EXECUTIVE_EXPORT("siteExecutiveData", "现场测试、校准或检定", "现场测试、校准或检定"),
+    CERTIFICATE_REPORT("certificateReport", "证书审批", "证书审批"),
+    CERTIFICATE_CHANGE_APPLY("certificateChangeApply", "证书报告补充或更换申请单", "证书报告补充或更换申请单"),
+    CERTIFICATE_PRINT("certificatePrintData", "证书打印审批", "证书打印审批"),
+    DEPT_EXECUTIVE_TASK("deptExecutiveTaskData", "实验室任务", "实验室任务"),
+    MY_EXECUTIVE_TASK("myExecutiveTaskData", "我的任务", "我的任务"),
+    OUTSOURCE_ASSESS("outsourceAssess", "测试、校准或检定工作分包评审表", "测试、校准或检定工作分包评审表"),
+    OUTSOURCE_PROTOCOL("outsourceProtocol", "测试、校准或检定工作分包协议书", "测试、校准或检定工作分包协议书"),
+
+    /**
+     * 系统管理
+     */
+    SIGN_EXPORT("signData", "签名", "签名"),
+    TEMPLATE_EXPORT("templateData", "文件模板", "文件模板"),
+    FLOW_DEF_EXPORT("flowDefData", "流程定义", "流程定义"),
+    DOWNLOAD_TEMPLATE("downloadTemplate", "流程定义", "页面配置");
 
     ExportEnum(String fileName, String sheetName, String description) {
         this.fileName = fileName;
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateRecordTypeCodeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateRecordTypeCodeEnum.java
index 31d913c..a963522 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateRecordTypeCodeEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateRecordTypeCodeEnum.java
@@ -46,4 +46,14 @@
     String SITE_EXECUTIVE_APPROVAL = "01";
     //《现场测试、校准或检定工作记录表》
     String SITE_EXECUTIVE_LOG = "02";
+
+    //测试、校准或检定工作分包协议书
+    String OUTSOURCE_PROTOCOL = "01";
+    //测试、校准或检定工作分包评审表
+    String OUTSOURCE_ACCESS = "02";
+    //测试、校准或检定工作分包通知书
+    String OUTSOURCE_NOTICE = "03";
+    //测试、校准或检定工作分包方名录
+    String OUTSOURCE_INFO = "04";
+
 }
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
index 24b8635..f78bd53 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
@@ -15,6 +15,10 @@
     String CERTIFICATE_CHANGE_APPLY_BEAN_NAME = "certificateChangeApplyBean";
     //现场测试、校准或检定
     String SITE_EXECUTIVE_BEAN_NAME = "siteExecutiveBean";
+    //测试、校准或检定工作分包评审表
+    String OUTSOURCE_ASSESS_BEAN_NAME = "outsourceAssessBean";
+    //测试、校准或检定工作分包协议书
+    String OUTSOURCE_PROTOCOL_BEAN_NAME = "outsourceProtocolBean";
 
     /*********************************设备与装置************************************/
     //设备台账
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 b21c661..6b86fd1 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
@@ -18,6 +18,8 @@
     OUTSOURCER_APPROVAL(OUTSOURCER_BEAN_NAME, ""),
     CERTIFICATE_CHANGE_APPROVAL(CERTIFICATE_CHANGE_APPLY_BEAN_NAME, ""),
     SITE_EXECUTIVE_APPROVAL(SITE_EXECUTIVE_BEAN_NAME, ""),
+    OUTSOURCE_ASSESS_APPROVAL(OUTSOURCE_ASSESS_BEAN_NAME, ""),
+    OUTSOURCE_PROTOCOL_APPROVAL(OUTSOURCE_PROTOCOL_BEAN_NAME, ""),
 
     ACTION_STATUS_MAP(new HashMap<String, AwareActionStatusEnum>() {
         {
@@ -47,6 +49,10 @@
             put(ApplyFromIdEnum.CERTIFICATE_CHANGE_APPROVAL.getCode(), CERTIFICATE_CHANGE_APPROVAL);
             //现场测试、校准或检定审批
             put(ApplyFromIdEnum.SITE_EXECUTIVE_APPROVAL.getCode(), SITE_EXECUTIVE_APPROVAL);
+            //测试、校准或检定工作分包评审表
+            put(ApplyFromIdEnum.OUTSOURCE_ASSESS_APPROVAL.getCode(), OUTSOURCE_ASSESS_APPROVAL);
+            //测试、校准或检定工作分包协议书
+            put(ApplyFromIdEnum.OUTSOURCE_PROTOCOL_APPROVAL.getCode(), OUTSOURCE_PROTOCOL_APPROVAL);
         }
     });
     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 934405e..c7410bd 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
@@ -9,6 +9,8 @@
     CERTIFICATE_CHANGE_APPROVAL("jljdywzsbchghsqd", MessageSourceModuleEnum.BUSINESS.getCode(), "证书/报告补充或更换申请单"),
     OUTSOURCER_APPROVAL("jljdywcsjzhgfbfml", MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定合格分包方名录"),
     SITE_EXECUTIVE_APPROVAL("jljdywxccsjzsp", MessageSourceModuleEnum.BUSINESS.getCode(), "现场测试、校准或检定审批"),
+    OUTSOURCE_ASSESS_APPROVAL("jljdywcsjzfbpsb", MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包评审表"),
+    OUTSOURCE_PROTOCOL_APPROVAL("jljdywcsjzfbxys", MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包协议书"),
 
 
     /*******************************************设备与装置*********************************************/
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/GeneralApprovalMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/GeneralApprovalMapper.java
index 4fb7344..0c9d6ae 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/GeneralApprovalMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/GeneralApprovalMapper.java
@@ -17,8 +17,4 @@
 
     Page<O> selectBatchForApprovalList(Page<O> page, @Param("request") R request, @Param("businessKeys") List<String> businessKeys);
 
-//    Page<O> selectListPage(Page<O> page, @Param("request") R request);
-
-//    Long selectMaxNo();
-
 }
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceAssessMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceAssessMapper.java
index 7867bb8..ba59009 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceAssessMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceAssessMapper.java
@@ -1,7 +1,12 @@
 package com.casic.missiles.mapper.business;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.business.outsource.OutsourceAssessApprovalListRequest;
+import com.casic.missiles.mapper.GeneralApprovalMapper;
 import com.casic.missiles.model.business.BizBusinessOutsourceAssess;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * <p>
@@ -11,6 +16,10 @@
  * @author wangpeng
  * @since 2023-08-16
  */
-public interface BizBusinessOutsourceAssessMapper extends BaseMapper<BizBusinessOutsourceAssess> {
+public interface BizBusinessOutsourceAssessMapper extends GeneralApprovalMapper<BizBusinessOutsourceAssess, BizBusinessOutsourceAssess, OutsourceAssessApprovalListRequest> {
+
+    Page<BizBusinessOutsourceAssess> selectBatchForApprovalList(Page<BizBusinessOutsourceAssess> page, @Param("request") OutsourceAssessApprovalListRequest request, @Param("businessKeys") List<String> businessKeys);
+
+    Long selectMaxProjectNo();
 
 }
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceProtocolMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceProtocolMapper.java
new file mode 100644
index 0000000..e6aba35
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceProtocolMapper.java
@@ -0,0 +1,24 @@
+package com.casic.missiles.mapper.business;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.business.outsource.OutsourceProtocolApprovalListRequest;
+import com.casic.missiles.mapper.GeneralApprovalMapper;
+import com.casic.missiles.model.business.BizBusinessOutsourceProtocol;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 计量检定业务-分包管理-测试、校准或检定工作分包协议书 Mapper 接口
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-08-24
+ */
+public interface BizBusinessOutsourceProtocolMapper extends GeneralApprovalMapper<BizBusinessOutsourceProtocol, BizBusinessOutsourceProtocol, OutsourceProtocolApprovalListRequest> {
+
+    Page<BizBusinessOutsourceProtocol> selectBatchForApprovalList(Page<BizBusinessOutsourceProtocol> page, @Param("request") OutsourceProtocolApprovalListRequest request, @Param("businessKeys") List<String> businessKeys);
+
+    Long selectMaxProtocolNo();
+}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/EnvLocationInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/EnvLocationInfoMapper.java
new file mode 100644
index 0000000..49eff87
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/EnvLocationInfoMapper.java
@@ -0,0 +1,21 @@
+package com.casic.missiles.mapper.resource;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.resource.environment.LocationListRequest;
+import com.casic.missiles.dto.resource.environment.LocationListResponse;
+import com.casic.missiles.model.resource.EnvLocationInfo;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * <p>
+ * 实验室环境监控系统-设备表 Mapper 接口
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-06-07
+ */
+public interface EnvLocationInfoMapper extends BaseMapper<EnvLocationInfo> {
+
+    Page<LocationListResponse> selectLocationListPage(Page<LocationListResponse> page, @Param("request") LocationListRequest request);
+}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java
index de124db..85ed0f7 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java
@@ -1,7 +1,9 @@
 package com.casic.missiles.mapper.system;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.dto.system.SignDetailResponse;
+import com.casic.missiles.dto.system.SignListRequest;
 import com.casic.missiles.model.system.SystemSign;
 import org.apache.ibatis.annotations.Param;
 
@@ -22,4 +24,8 @@
     SignDetailResponse selectSignDetailById(Long id);
 
     List<SystemSign> selectUsableSignList(@Param("userId") Long userId);
+
+    Page<SystemSign> selectSignListPage(Page<SystemSign> page, @Param("request") SignListRequest request);
+
+    List<SystemSign> selectSignList(@Param("request") SignListRequest request);
 }
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateChangeApplyMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateChangeApplyMapper.xml
index d798447..c496092 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateChangeApplyMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateChangeApplyMapper.xml
@@ -30,31 +30,31 @@
         SELECT *
         FROM biz_business_certificate_change_apply
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.changeApplyNo != null and request.changeApplyNo !=''">
+        <if test="request != null and request.changeApplyNo != null and request.changeApplyNo !=''">
             and change_apply_no like concat('%',#{request.changeApplyNo},'%')
         </if>
-        <if test="request.changeReportNo != null and request.changeReportNo !=''">
+        <if test="request != null and request.changeReportNo != null and request.changeReportNo !=''">
             and change_report_no like concat('%',#{request.changeReportNo},'%')
         </if>
-        <if test="request.changeReportName != null and request.changeReportName !=''">
+        <if test="request != null and request.changeReportName != null and request.changeReportName !=''">
             and change_report_name like concat('%',#{request.changeReportName},'%')
         </if>
-        <if test="request.changeType != null and request.changeType !=''">
+        <if test="request != null and request.changeType != null and request.changeType !=''">
             and change_type = #{request.changeType}
         </if>
-        <if test="request.createUserName != null and request.createUserName !=''">
+        <if test="request != null and request.createUserName != null and request.createUserName !=''">
             and create_user_name like concat('%',#{request.createUserName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificatePrintMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificatePrintMapper.xml
index b66cd99..49c0ac8 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificatePrintMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificatePrintMapper.xml
@@ -31,34 +31,34 @@
         LEFT JOIN biz_business_order_sample_relation bosr ON (bosr.order_id = bcr.order_id AND bosr.sample_id = bcr.sample_id)
         LEFT JOIN biz_business_order_info boi ON boi.id = bosr.order_id
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and bcp.approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.printStatus != null and request.printStatus !=''">
+        <if test="request != null and request.printStatus != null and request.printStatus !=''">
             and print_status = #{request.printStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and bcp.create_user_id = #{request.createUserId}
         </if>
-        <if test="request.certificateReportNo != null and request.certificateReportNo !=''">
+        <if test="request != null and request.certificateReportNo != null and request.certificateReportNo !=''">
             and bcr.certificate_report_no like concat('%',#{request.certificateReportNo},'%')
         </if>
-        <if test="request.certificateReportName != null and request.certificateReportName !=''">
+        <if test="request != null and request.certificateReportName != null and request.certificateReportName !=''">
             and bcr.certificate_report_name like concat('%',#{request.certificateReportName},'%')
         </if>
-        <if test="request.customerName != null and request.customerName !=''">
+        <if test="request != null and request.customerName != null and request.customerName !=''">
             and boi.customer_name like concat('%',#{request.customerName},'%')
         </if>
-        <if test="request.sampleNo != null and request.sampleNo !=''">
+        <if test="request != null and request.sampleNo != null and request.sampleNo !=''">
             and bosr.sample_no like concat('%',#{request.sampleNo},'%')
         </if>
-        <if test="request.sampleName != null and request.sampleName !=''">
+        <if test="request != null and request.sampleName != null and request.sampleName !=''">
             and bosr.sample_name like concat('%',#{request.sampleName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and bcp.create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and bcp.create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml
index b366034..767695d 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml
@@ -46,33 +46,37 @@
         SELECT bcr.*, bosr.sample_no, bosr.sample_name, bosr.sample_model, rsi.staff_name
         FROM biz_business_certificate_report bcr
         LEFT JOIN biz_business_order_sample_relation bosr ON (bosr.order_id = bcr.order_id AND bosr.sample_id = bcr.sample_id)
+        LEFT JOIN biz_business_order_info boi ON boi.id = bcr.order_id
         LEFT JOIN biz_resource_staff_info rsi ON rsi.id = bcr.measure_person_id
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and bcr.approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and bcr.create_user_id = #{request.createUserId}
         </if>
-        <if test="request.certificateReportNo != null and request.certificateReportNo !=''">
+        <if test="request != null and request.customerId != null and request.customerId !=''">
+            and boi.customer_id = #{request.customerId}
+        </if>
+        <if test="request != null and request.certificateReportNo != null and request.certificateReportNo !=''">
             and bcr.certificate_report_no like concat('%',#{request.certificateReportNo},'%')
         </if>
-        <if test="request.certificateReportName != null and request.certificateReportName !=''">
+        <if test="request != null and request.certificateReportName != null and request.certificateReportName !=''">
             and bcr.certificate_report_name like concat('%',#{request.certificateReportName},'%')
         </if>
-        <if test="request.sampleNo != null and request.sampleNo !=''">
+        <if test="request != null and request.sampleNo != null and request.sampleNo !=''">
             and bosr.sample_no like concat('%',#{request.sampleNo},'%')
         </if>
-        <if test="request.measureCategory != null and request.measureCategory !=''">
+        <if test="request != null and request.measureCategory != null and request.measureCategory !=''">
             and bcr.measure_category = #{request.measureCategory}
         </if>
-        <if test="request.measurePerson != null and request.measurePerson !=''">
+        <if test="request != null and request.measurePerson != null and request.measurePerson !=''">
             and rsi.staff_name like concat('%',#{request.measurePerson},'%')
         </if>
-        <if test="request.calibrationTimeStart != null and request.calibrationTimeStart !=''">
+        <if test="request != null and request.calibrationTimeStart != null and request.calibrationTimeStart !=''">
             and bcr.calibration_time &gt;= #{request.calibrationTimeStart}
         </if>
-        <if test="request.calibrationTimeEnd != null and request.calibrationTimeEnd !=''">
+        <if test="request != null and request.calibrationTimeEnd != null and request.calibrationTimeEnd !=''">
             and bcr.calibration_time &lt;= #{request.calibrationTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceAssessMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceAssessMapper.xml
index d0fcf8b..c22c101 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceAssessMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceAssessMapper.xml
@@ -7,6 +7,8 @@
         <id column="id" property="id" />
         <result column="project_no" property="projectNo" />
         <result column="project_name" property="projectName" />
+        <result column="lab_code" property="labCode" />
+        <result column="group_code" property="groupCode" />
         <result column="applicant_id" property="applicantId" />
         <result column="applicant_name" property="applicantName" />
         <result column="applicant_time" property="applicantTime" />
@@ -31,7 +33,45 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, project_no, project_name, applicant_id, applicant_name, applicant_time, minio_file_name, remark, create_user_id, create_user_name, outsourcer_id, pre_start_time, pre_end_time, outsource_reason, pre_cost, approval_status, process_id, approve_situation, traceability, test_method, technique_ability, create_time, update_time
+        id, project_no, project_name, lab_code, group_code, applicant_id, applicant_name, applicant_time, minio_file_name, remark, create_user_id, create_user_name, outsourcer_id, pre_start_time, pre_end_time, outsource_reason, pre_cost, approval_status, process_id, approve_situation, traceability, test_method, technique_ability, create_time, update_time
     </sql>
 
+    <select id="selectMaxProjectNo" resultType="java.lang.Long">
+        SELECT IFNULL(max(RIGHT(project_no, 3)), 0) from biz_business_outsource_assess
+    </select>
+
+    <select id="selectBatchForApprovalList" resultMap="BaseResultMap">
+        SELECT bboa.*, bboi.outsourcer_name, bboi.director
+        FROM biz_business_outsource_assess bboa
+        LEFT JOIN biz_business_outsourcer_info bboi ON bboa.outsourcer_id = bboi.id
+        WHERE 1=1
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
+            and bboa.approval_status = #{request.approvalStatus}
+        </if>
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
+            and bboa.create_user_id = #{request.createUserId}
+        </if>
+        <if test="request != null and request.projectNo != null and request.projectNo !=''">
+            and bboa.project_no like concat('%',#{request.projectNo},'%')
+        </if>
+        <if test="request != null and request.outsourcerName != null and request.outsourcerName !=''">
+            and bboi.outsourcer_name like concat('%',#{request.outsourcerName},'%')
+        </if>
+        <if test="request != null and request.applicantName != null and request.applicantName !=''">
+            and bboa.applicant_name like concat('%',#{request.applicantName},'%')
+        </if>
+        <if test="request != null and request.applicantTimeStart != null and request.applicantTimeStart !=''">
+            and bboa.applicant_time &gt;= #{request.applicantTimeStart}
+        </if>
+        <if test="request != null and request.applicantTimeEnd != null and request.applicantTimeEnd !=''">
+            and bboa.applicant_time &lt;= #{request.applicantTimeEnd}
+        </if>
+        <if test="businessKeys != null">
+            and bboa.id in
+            <foreach collection="businessKeys" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
+        ORDER BY bboa.create_time DESC
+    </select>
 </mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceProtocolMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceProtocolMapper.xml
new file mode 100644
index 0000000..b7b2149
--- /dev/null
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceProtocolMapper.xml
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.mapper.business.BizBusinessOutsourceProtocolMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.business.BizBusinessOutsourceProtocol">
+        <id column="id" property="id" />
+        <result column="protocol_no" property="protocolNo" />
+        <result column="project_name" property="projectName" />
+        <result column="lab_code" property="labCode" />
+        <result column="group_code" property="groupCode" />
+        <result column="outsourcer_id" property="outsourcerId" />
+        <result column="remark" property="remark" />
+        <result column="outsource_no" property="outsourceNo" />
+        <result column="outsource_name" property="outsourceName" />
+        <result column="contacts" property="contacts" />
+        <result column="mobile" property="mobile" />
+        <result column="address" property="address" />
+        <result column="require_date" property="requireDate" />
+        <result column="outsource_cost" property="outsourceCost" />
+        <result column="director" property="director" />
+        <result column="item" property="item" />
+        <result column="requires" property="requires" />
+        <result column="create_user_id" property="createUserId" />
+        <result column="create_user_name" property="createUserName" />
+        <result column="approval_status" property="approvalStatus" />
+        <result column="process_id" property="processId" />
+        <result column="create_time" property="createTime" />
+        <result column="update_time" property="updateTime" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, protocol_no, project_name, lab_code, group_code, outsourcer_id, remark, outsource_no, outsource_name, contacts, mobile, address, require_date, outsource_cost, director, item, requires, create_user_id, create_user_name, approval_status, process_id, create_time, update_time
+    </sql>
+
+    <select id="selectMaxProtocolNo" resultType="java.lang.Long">
+        SELECT IFNULL(max(RIGHT(protocol_no, 3)), 0) from biz_business_outsource_protocol
+    </select>
+
+    <select id="selectBatchForApprovalList" resultMap="BaseResultMap">
+        SELECT *
+        FROM biz_business_outsource_protocol
+        WHERE 1=1
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
+            and approval_status = #{request.approvalStatus}
+        </if>
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
+            and create_user_id = #{request.createUserId}
+        </if>
+        <if test="request != null and request.protocolNo != null and request.protocolNo !=''">
+            and protocol_no like concat('%',#{request.protocolNo},'%')
+        </if>
+        <if test="request != null and request.outsourcerName != null and request.outsourcerName !=''">
+            and outsourcer_name like concat('%',#{request.outsourcerName},'%')
+        </if>
+        <if test="request != null and request.applicantName != null and request.applicantName !=''">
+            and create_user_name like concat('%',#{request.applicantName},'%')
+        </if>
+        <if test="request != null and request.applicantTimeStart != null and request.applicantTimeStart !=''">
+            and create_time &gt;= #{request.applicantTimeStart}
+        </if>
+        <if test="request != null and request.applicantTimeEnd != null and request.applicantTimeEnd !=''">
+            and create_time &lt;= #{request.applicantTimeEnd}
+        </if>
+        <if test="businessKeys != null">
+            and id in
+            <foreach collection="businessKeys" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
+        ORDER BY create_time DESC
+    </select>
+</mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourcerInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourcerInfoMapper.xml
index 510a80b..3049b54 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourcerInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourcerInfoMapper.xml
@@ -7,6 +7,8 @@
         <id column="id" property="id" />
         <result column="outsourcer_no" property="outsourcerNo" />
         <result column="outsourcer_name" property="outsourcerName" />
+        <result column="lab_code" property="labCode" />
+        <result column="group_code" property="groupCode" />
         <result column="outsourcer_brief_name" property="outsourcerBriefName" />
         <result column="outsourcer_size" property="outsourcerSize" />
         <result column="business_size" property="businessSize" />
@@ -55,32 +57,32 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, outsourcer_no, outsourcer_name, outsourcer_brief_name, outsourcer_size, business_size, grade, evaluation, tax_number, bank_account, bank_name, bank_account_number, postal_code, director, phone, fax, mobile, email, website, address_country, address_province, address_city, address_area, full_address, address_country_name, address_province_name, address_city_name, address_area_name, invoice_country, invoice_province, invoice_city, invoice_area, invoice_full_address, invoice_country_name, invoice_province_name, invoice_city_name, invoice_area_name, business_scope, business_content, minio_file_name, approval_status, process_id, remark, create_user_id, create_user_name, create_time, update_time
+        id, outsourcer_no, outsourcer_name, lab_code, group_code, outsourcer_brief_name, outsourcer_size, business_size, grade, evaluation, tax_number, bank_account, bank_name, bank_account_number, postal_code, director, phone, fax, mobile, email, website, address_country, address_province, address_city, address_area, full_address, address_country_name, address_province_name, address_city_name, address_area_name, invoice_country, invoice_province, invoice_city, invoice_area, invoice_full_address, invoice_country_name, invoice_province_name, invoice_city_name, invoice_area_name, business_scope, business_content, minio_file_name, approval_status, process_id, remark, create_user_id, create_user_name, create_time, update_time
     </sql>
 
     <select id="selectBatchForApprovalList" resultMap="BaseResultMap">
         SELECT *
         FROM biz_business_outsourcer_info
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.outsourcerNo != null and request.outsourcerNo !=''">
+        <if test="request != null and request.outsourcerNo != null and request.outsourcerNo !=''">
             and outsourcer_no like concat('%',#{request.outsourcerNo},'%')
         </if>
-        <if test="request.outsourcerName != null and request.outsourcerName !=''">
+        <if test="request != null and request.outsourcerName != null and request.outsourcerName !=''">
             and outsourcer_name like concat('%',#{request.outsourcerName},'%')
         </if>
-        <if test="request.director != null and request.director !=''">
+        <if test="request != null and request.director != null and request.director !=''">
             and director like concat('%',#{request.director},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
@@ -93,6 +95,6 @@
     </select>
 
     <select id="selectMaxNo" resultType="java.lang.Long">
-        SELECT IFNULL(max(RIGHT(outsourcer_no, 12)), 0) from biz_business_outsourcer_info
+        SELECT IFNULL(max(RIGHT(outsourcer_no, 3)), 0) from biz_business_outsourcer_info
     </select>
 </mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessSiteExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessSiteExecutiveInfoMapper.xml
index 135c5d0..3c5ae79 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessSiteExecutiveInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessSiteExecutiveInfoMapper.xml
@@ -38,25 +38,25 @@
         FROM biz_business_site_executive_info bsei
         LEFT JOIN biz_resource_customer_info rci ON bsei.customer_id = rci.id
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and bsei.approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and bsei.create_user_id = #{request.createUserId}
         </if>
-        <if test="request.siteExecutiveNo != null and request.siteExecutiveNo !=''">
+        <if test="request != null and request.siteExecutiveNo != null and request.siteExecutiveNo !=''">
             and bsei.site_executive_no like concat('%',#{request.siteExecutiveNo},'%')
         </if>
-        <if test="request.customerName != null and request.customerName !=''">
+        <if test="request != null and request.customerName != null and request.customerName !=''">
             and rci.outsourcer_name like concat('%',#{request.customerName},'%')
         </if>
-        <if test="request.applyName != null and request.applyName !=''">
+        <if test="request != null and request.applyName != null and request.applyName !=''">
             and bsei.apply_name like concat('%',#{request.applyName},'%')
         </if>
-        <if test="request.applyTimeStart != null and request.applyTimeStart !=''">
+        <if test="request != null and request.applyTimeStart != null and request.applyTimeStart !=''">
             and bsei.apply_time &gt;= #{request.applyTimeStart}
         </if>
-        <if test="request.applyTimeEnd != null and request.applyTimeEnd !=''">
+        <if test="request != null and request.applyTimeEnd != null and request.applyTimeEnd !=''">
             and bsei.apply_time &lt;= #{request.applyTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml
index 84d9e2a..6bd38a9 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml
@@ -105,6 +105,12 @@
         <if test="request.isUrgent != null and request.isUrgent !=''">
             AND bo.is_urgent = #{request.isUrgent}
         </if>
+        <if test="request.ids != null">
+            and blei.id in
+            <foreach collection="request.ids" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
         ORDER BY blei.update_time DESC
     </select>
 
@@ -137,6 +143,12 @@
         <if test="request.isUrgent != null and request.isUrgent !=''">
             AND bo.is_urgent = #{request.isUrgent}
         </if>
+        <if test="request.ids != null">
+            and blei.id in
+            <foreach collection="request.ids" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
         ORDER BY blei.update_time DESC
     </select>
 
diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardInfoMapper.xml
index 1a5551b..2ed8d17 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardInfoMapper.xml
@@ -45,12 +45,6 @@
         FROM biz_equipment_standard_info besi
         LEFT JOIN biz_equipment_standard_technology_relation bestr ON besi.standard_no = bestr.standard_no
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
-            and besi.approval_status = #{request.approvalStatus}
-        </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
-            and besi.create_user_id = #{request.createUserId}
-        </if>
         <if test="request.standardName != null and request.standardName !=''">
             and besi.standard_name like concat('%',#{request.standardName},'%')
         </if>
diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardTechnologyRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardTechnologyRelationMapper.xml
index fc7e16c..cd03c8c 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardTechnologyRelationMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardTechnologyRelationMapper.xml
@@ -6,6 +6,7 @@
     <resultMap id="BaseResultMap" type="com.casic.missiles.model.equipment.BizEquipmentStandardTechnologyRelation">
         <id column="id" property="id" />
         <result column="technology_file_id" property="technologyFileId" />
+        <result column="technology_file_no" property="technologyFileNo" />
         <result column="technology_file_name" property="technologyFileName" />
         <result column="standard_id" property="standardId" />
         <result column="standard_no" property="standardNo" />
@@ -14,7 +15,7 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, technology_file_id, technology_file_name, standard_id, remark
+        id, technology_file_id, technology_file_no, technology_file_name, standard_id, remark
     </sql>
 
 </mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceAuthorizeOrderMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceAuthorizeOrderMapper.xml
index ac5176c..554fe65 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceAuthorizeOrderMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceAuthorizeOrderMapper.xml
@@ -32,22 +32,22 @@
         SELECT *
         FROM biz_resource_authorize_order
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.orderNo != null and request.orderNo !=''">
+        <if test="request != null and request.orderNo != null and request.orderNo !=''">
             and order_no like concat('%',#{request.orderNo},'%')
         </if>
-        <if test="request.createUserName != null and request.createUserName !=''">
+        <if test="request != null and request.createUserName != null and request.createUserName !=''">
             and create_user_name like concat('%',#{request.createUserName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerExamineFormMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerExamineFormMapper.xml
index ab242f6..af7f98f 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerExamineFormMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerExamineFormMapper.xml
@@ -41,28 +41,28 @@
         SELECT *
         FROM biz_resource_customer_examine_form
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.formNo != null and request.formNo !=''">
+        <if test="request != null and request.formNo != null and request.formNo !=''">
             and form_no like concat('%',#{request.formNo},'%')
         </if>
-        <if test="request.labCode != null and request.labCode !=''">
+        <if test="request != null and request.labCode != null and request.labCode !=''">
             and lab_code like concat('%',#{request.labCode},'%')
         </if>
-        <if test="request.groupCode != null and request.groupCode !=''">
+        <if test="request != null and request.groupCode != null and request.groupCode !=''">
             and group_code like concat('%',#{request.groupCode},'%')
         </if>
-        <if test="request.createUserName != null and request.createUserName !=''">
+        <if test="request != null and request.createUserName != null and request.createUserName !=''">
             and create_user_name like concat('%',#{request.createUserName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerInfoMapper.xml
index fa8ffbc..06a2798 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerInfoMapper.xml
@@ -33,25 +33,25 @@
         SELECT *
         FROM biz_resource_customer_info
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.customerNo != null and request.customerNo !=''">
+        <if test="request != null and request.customerNo != null and request.customerNo !=''">
             and customer_no like concat('%',#{request.customerNo},'%')
         </if>
-        <if test="request.customerName != null and request.customerName !=''">
+        <if test="request != null and request.customerName != null and request.customerName !=''">
             and customer_name like concat('%',#{request.customerName},'%')
         </if>
-        <if test="request.contacts != null and request.contacts !=''">
+        <if test="request != null and request.contacts != null and request.contacts !=''">
             and contacts like concat('%',#{request.contacts},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerSuggestFormMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerSuggestFormMapper.xml
index 28f5bb2..1806662 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerSuggestFormMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerSuggestFormMapper.xml
@@ -33,28 +33,28 @@
         SELECT *
         FROM biz_resource_customer_suggest_form
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.formNo != null and request.formNo !=''">
+        <if test="request != null and request.formNo != null and request.formNo !=''">
             and form_no like concat('%',#{request.formNo},'%')
         </if>
-        <if test="request.customerName != null and request.customerName !=''">
+        <if test="request != null and request.customerName != null and request.customerName !=''">
             and customer_name like concat('%',#{request.customerName},'%')
         </if>
-        <if test="request.customerDeptName != null and request.customerDeptName !=''">
+        <if test="request != null and request.customerDeptName != null and request.customerDeptName !=''">
             and customer_dept_name like concat('%',#{request.customerDeptName},'%')
         </if>
-        <if test="request.createUserName != null and request.createUserName !=''">
+        <if test="request != null and request.createUserName != null and request.createUserName !=''">
             and create_user_name like concat('%',#{request.createUserName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSealUseNoteMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSealUseNoteMapper.xml
index ab37bc1..b02bb33 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSealUseNoteMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSealUseNoteMapper.xml
@@ -29,32 +29,32 @@
     </sql>
 
     <select id="selectBatchForApprovalList" resultMap="BaseResultMap">
-        SELECT *
+        SELECT brsun.*, brsi.seal_name, brsi.seal_type, brsi.approver_name
         FROM biz_resource_seal_use_note brsun
         JOIN biz_resource_seal_info brsi ON brsun.seal_id = brsi.id
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and brsun.approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and brsun.create_user_id = #{request.createUserId}
         </if>
-        <if test="request.sealName != null and request.sealName !=''">
+        <if test="request != null and request.sealName != null and request.sealName !=''">
             and brsi.seal_name like concat('%',#{request.sealName},'%')
         </if>
-        <if test="request.sealType != null and request.sealType !=''">
+        <if test="request != null and request.sealType != null and request.sealType !=''">
             and brsi.seal_type = #{request.sealType}
         </if>
-        <if test="request.applyDeptName != null and request.applyDeptName !=''">
+        <if test="request != null and request.applyDeptName != null and request.applyDeptName !=''">
             and brsun.apply_dept_name like concat('%',#{request.applyDeptName},'%')
         </if>
-        <if test="request.applyUserName != null and request.applyUserName !=''">
+        <if test="request != null and request.applyUserName != null and request.applyUserName !=''">
             and brsun.apply_user_name like concat('%',#{request.applyUserName},'%')
         </if>
-        <if test="request.applyTimeStart != null and request.applyTimeStart !=''">
+        <if test="request != null and request.applyTimeStart != null and request.applyTimeStart !=''">
             and brsun.apply_time &gt;= #{request.applyTimeStart}
         </if>
-        <if test="request.applyTimeEnd != null and request.applyTimeEnd !=''">
+        <if test="request != null and request.applyTimeEnd != null and request.applyTimeEnd !=''">
             and brsun.apply_time &lt;= #{request.applyTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml
index 119bf7d..4f8392a 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml
@@ -31,6 +31,12 @@
         <if test="request.deptName != null and request.deptName !=''">
             and brsi.dept_name like concat('%',#{request.deptName},'%')
         </if>
+        <if test="request.ids != null">
+            and brsv.id in
+            <foreach collection="request.ids" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
         ORDER BY brsv.grant_date DESC
     </select>
 
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSupplierInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSupplierInfoMapper.xml
index fe8d399..e8ce7ef 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSupplierInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSupplierInfoMapper.xml
@@ -48,28 +48,28 @@
         SELECT *
         FROM biz_resource_supplier_info
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.supplierNo != null and request.supplierNo !=''">
+        <if test="request != null and request.supplierNo != null and request.supplierNo !=''">
             and supplier_no like concat('%',#{request.supplierNo},'%')
         </if>
-        <if test="request.supplierName != null and request.supplierName !=''">
+        <if test="request != null and request.supplierName != null and request.supplierName !=''">
             and supplier_name like concat('%',#{request.supplierName},'%')
         </if>
-        <if test="request.director != null and request.director !=''">
+        <if test="request != null and request.director != null and request.director !=''">
             and director like concat('%',#{request.director},'%')
         </if>
-        <if test="request.supplierType != null and request.supplierType !=''">
+        <if test="request != null and request.supplierType != null and request.supplierType !=''">
             and supplier_type = #{request.supplierType}
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/EnvLocationInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/EnvLocationInfoMapper.xml
new file mode 100644
index 0000000..68bcf10
--- /dev/null
+++ b/casic-metering-dao/src/main/resources/mapper/resource/EnvLocationInfoMapper.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.mapper.resource.EnvLocationInfoMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.resource.EnvLocationInfo">
+        <id column="id" property="id" />
+        <result column="location_no" property="locationNo" />
+        <result column="location_name" property="locationName" />
+        <result column="location_position" property="locationPosition" />
+        <result column="create_user_id" property="createUserId" />
+        <result column="create_user" property="createUser" />
+        <result column="create_time" property="createTime" />
+        <result column="update_time" property="updateTime" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, location_no, location_name, location_position, create_user_id, create_user, create_time, update_time
+    </sql>
+
+    <select id="selectLocationListPage" resultType="com.casic.missiles.dto.resource.environment.LocationListResponse">
+        SELECT *
+        FROM env_location_info
+        WHERE 1=1
+        <if test="request.locationNo != null and request.locationNo !=''">
+            AND location_no LIKE concat('%',#{request.locationNo},'%')
+        </if>
+        <if test="request.locationName != null and request.locationName !=''">
+            AND location_name LIKE concat('%',#{request.locationName},'%')
+        </if>
+        ORDER BY create_time DESC
+    </select>
+
+</mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml
index b28c18f..8854047 100644
--- a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml
@@ -11,7 +11,6 @@
         <result column="sign_desc" property="signDesc" />
         <result column="sign_director" property="signDirector" />
         <result column="sign_user_id" property="signUserId" />
-        <result column="sign_type" property="signType" />
         <result column="minio_file_name" property="minioFileName" />
         <result column="create_time" property="createTime" />
         <result column="update_time" property="updateTime" />
@@ -28,7 +27,6 @@
         <result column="sign_name" property="signName" />
         <result column="sign_desc" property="signDesc" />
         <result column="sign_director" property="signDirector" />
-        <result column="sign_type" property="signType" />
         <result column="sign_user_id" property="signUserId" />
         <result column="minio_file_name" property="minioFileName" />
         <result column="create_time" property="createTime" />
@@ -62,4 +60,58 @@
         JOIN system_sign_user_relation ssur ON ss.id = ssur.sign_id
         WHERE ssur.user_id = #{userId}
     </select>
+
+    <select id="selectSignListPage" resultMap="BaseResultMap">
+        SELECT ss.*, sd.SIMPLE_NAME AS deptName
+        FROM system_sign ss
+        LEFT JOIN sys_user su ON su.id = ss.sign_user_id
+        LEFT JOIN sys_dept sd ON sd.id = su.dept_id
+        WHERE 1=1
+        <if test="request.signNo != null and request.signNo !=''">
+            AND ss.sign_no LIKE concat('%',#{request.signNo},'%')
+        </if>
+        <if test="request.signName != null and request.signName !=''">
+            AND ss.sign_name LIKE concat('%',#{request.signName},'%')
+        </if>
+        <if test="request.signDirector != null and request.signDirector !=''">
+            AND ss.sign_director LIKE concat('%',#{request.signDirector},'%')
+        </if>
+        <if test="request.signUserId != null and request.signUserId !=''">
+            AND ss.sign_user_id = #{request.signUserId}
+        </if>
+        <if test="request.createStartTime != null and request.createStartTime !=''">
+            AND DATE_FORMAT(ss.create_time,'%Y-%m-%d') &gt;= DATE_FORMAT(#{request.createStartTime},'%Y-%m-%d')
+        </if>
+        <if test="request.createEndTime != null and request.createEndTime !=''">
+            AND DATE_FORMAT(ss.create_time,'%Y-%m-%d')  &lt;= DATE_FORMAT(#{request.createEndTime},'%Y-%m-%d')
+        </if>
+        ORDER BY ss.create_time DESC
+    </select>
+
+    <select id="selectSignList" resultMap="BaseResultMap">
+        SELECT ss.*, sd.SIMPLE_NAME AS deptName
+        FROM system_sign ss
+        LEFT JOIN sys_user su ON su.id = ss.sign_user_id
+        LEFT JOIN sys_dept sd ON sd.id = su.dept_id
+        WHERE 1=1
+        <if test="request.signNo != null and request.signNo !=''">
+            AND ss.sign_no LIKE concat('%',#{request.signNo},'%')
+        </if>
+        <if test="request.signName != null and request.signName !=''">
+            AND ss.sign_name LIKE concat('%',#{request.signName},'%')
+        </if>
+        <if test="request.signDirector != null and request.signDirector !=''">
+            AND ss.sign_director LIKE concat('%',#{request.signDirector},'%')
+        </if>
+        <if test="request.signUserId != null and request.signUserId !=''">
+            AND ss.sign_user_id = #{request.signUserId}
+        </if>
+        <if test="request.createStartTime != null and request.createStartTime !=''">
+            AND DATE_FORMAT(ss.create_time,'%Y-%m-%d') &gt;= DATE_FORMAT(#{request.createStartTime},'%Y-%m-%d')
+        </if>
+        <if test="request.createEndTime != null and request.createEndTime !=''">
+            AND DATE_FORMAT(ss.create_time,'%Y-%m-%d')  &lt;= DATE_FORMAT(#{request.createEndTime},'%Y-%m-%d')
+        </if>
+        ORDER BY ss.create_time DESC
+    </select>
 </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 515050a..60f530b 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
@@ -47,8 +47,8 @@
     String STORAGE_LOCATION = "bizStorageLocation";
     //计量专业
     String MEASURE_MAJOR = "bizMeasureMajor";
-    //管理状态
-    String MANAGER_STATE = "bizManagerState";
+    //标准装置管理状态
+    String STANDARD_MANAGER_STATE = "bizStandardManagerState";
 
     /**
      * 资源管理 字典code
@@ -95,8 +95,6 @@
     String MEASURE_STATUS = "measureStatus";
     //检定方式
     String MEASURE_TYPE = "measureType";
-    //标识打印标志类型
-    String IDENTIFY_PRINT_TYPE = "bizBusinessIdentify";
     //变更类型
     String REPORT_CHANGE_TYPE = "bizCertChangeType";
     //规模类型
@@ -111,19 +109,24 @@
     String MEASURE_CATEGORY = "measureCategory";
     //检定结果
     String MEASURE_RESULT = "measureResult";
+    //分包原因
+    String OUTSOURCE_REASON = "outsourceReason";
+
+    /**
+     * 系统管理
+     */
+    String TEMPLATE_TYPE = "templateType";
+
 
     /**
      * 标准装置 字典code
      */
     //类别
     String STANDARD_CATEGORY = "standardCategory";
-    //管理状态
-    String STANDARD_MANAGER_STATE = "standardManagerState";
     //标准等级
     String STANDARD_LEVEL = "standardLevel";
     //传递范围
     String STANDARD_TRANSMIT_RANGE = "transmitRange";
-
     //资本来源
     String CAPITAL_SOURCE = "capitalSource";
     //标准装置-申请类型
@@ -148,8 +151,6 @@
     String CERTIFICATE_CLASS = "certificationClass";
     //证书管理-检校专业
     String CALIBRATION_MAJOR = "calibrationMajor";
-    //分包原因
-    String OUTSOURCE_REASON = "outsourceReason";
 
     /**
      * 工作台
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/BaseApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/BaseApprovalListRequest.java
index 73c12c1..80d7424 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/BaseApprovalListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/BaseApprovalListRequest.java
@@ -6,6 +6,7 @@
 
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotEmpty;
+import java.util.List;
 
 /**
  * @Description:
@@ -19,14 +20,14 @@
      * 表单id
      */
     @NotBlank(message = "表单id不能为空")
-    @ApiModelProperty(value = "表单id（流程定义对应的表单id，等价于业务id）", dataType = "String")
+    @ApiModelProperty(value = "表单id（流程定义对应的表单id，等价于业务id），导出接口不用传", dataType = "String")
     private String formId;
 
     /**
      * 审批状态类型，对应ApprovalStatusEnum
      */
     @NotEmpty(message = "审批状态类型不能为空")
-    @ApiModelProperty(value = "审批状态类型code", dataType = "String")
+    @ApiModelProperty(value = "审批状态类型code，导出接口不用传", dataType = "String")
     private String approvalStatus;
 
     @ApiModelProperty(hidden = true)
@@ -34,4 +35,7 @@
 
     @ApiModelProperty(hidden = true)
     private Long createUserId;
+
+    @ApiModelProperty(value = "导出ids", dataType = "List")
+    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificatePrintApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificatePrintApprovalListRequest.java
index b93d1c9..3cc2f4e 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificatePrintApprovalListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificatePrintApprovalListRequest.java
@@ -5,8 +5,6 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import java.util.List;
-
 /**
  * @Description:
  * @Author: wangpeng
@@ -38,7 +36,4 @@
 
     @ApiModelProperty(value = "创建结束时间", dataType = "String")
     private String createTimeEnd;
-
-    @ApiModelProperty(value = "导出ids", dataType = "List")
-    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportApprovalListRequest.java
index 4f7a038..c115847 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportApprovalListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportApprovalListRequest.java
@@ -5,8 +5,6 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import java.util.List;
-
 /**
  * @Description:
  * @Author: wangpeng
@@ -15,6 +13,8 @@
 @ApiModel
 @Data
 public class CertificateReportApprovalListRequest extends BaseApprovalListRequest {
+    @ApiModelProperty(value = "委托方id", dataType = "String")
+    private Long customerId;
 
     @ApiModelProperty(value = "证书报告编号", dataType = "String")
     private String certificateReportNo;
@@ -37,6 +37,4 @@
     @ApiModelProperty(value = "检校结束时间", dataType = "String")
     private String calibrationTimeEnd;
 
-    @ApiModelProperty(value = "导出ids", dataType = "List")
-    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/identify/IdentifyListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/identify/IdentifyListRequest.java
index 1b87ae6..f019203 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/identify/IdentifyListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/identify/IdentifyListRequest.java
@@ -4,6 +4,8 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * @Description:
  * @Author: wangpeng
@@ -26,4 +28,7 @@
 
     @ApiModelProperty(value = "打印结束时间", dataType = "String")
     private String createTimeEnd;
+
+    @ApiModelProperty(value = "导出ids", dataType = "List")
+    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListRequest.java
index 1264883..62415fb 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListRequest.java
@@ -7,6 +7,7 @@
 import lombok.Data;
 
 import javax.validation.constraints.NotBlank;
+import java.util.List;
 
 @Data
 @ApiModel
@@ -37,4 +38,6 @@
     @ApiModelProperty(value = "是否加急（1是0否null全部）", dataType = "Integer")
     private String isUrgent;
 
+    @ApiModelProperty(value = "导出ids", dataType = "List")
+    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListRequest.java
index 5201d7b..499760a 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListRequest.java
@@ -17,6 +17,9 @@
     @ApiModelProperty(value = "任务单编号", dataType = "String")
     private String orderNo;
 
+    @ApiModelProperty(value = "委托方id", dataType = "Long")
+    private Long customerId;
+
     @ApiModelProperty(value = "委托方名称", dataType = "String")
     private String customerName;
 

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java
index bb0c50f..13a699b 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java
@@ -12,6 +12,7 @@
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.IGeneralApprovalService;
+import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
@@ -19,6 +20,7 @@
 import org.springframework.web.bind.annotation.RequestBody;
 
 import javax.validation.Valid;
+import java.util.List;
 import java.util.Objects;
 
 /**
@@ -117,4 +119,17 @@
         }
         return baseApprovalService.failUpdate(request);
     }
+
+    public List<O> exportList(@RequestBody @Valid R request) throws Exception {
+        List<O> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = baseApprovalService.listExportByIds(request.getIds());
+        } else {
+            list = baseApprovalService.listExport(request);
+        }
+        for (O record : list) {
+            DictCodeUtils.convertDictCodeToName(record);
+        }
+        return list;
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java
index 8a90961..d775831 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java
@@ -5,6 +5,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.business.certificate.CertificateChangeApplyApprovalListRequest;
 import com.casic.missiles.dto.business.certificate.CertificateChangeApplySaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessCertificateChangeApply;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
@@ -20,6 +21,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -48,4 +50,12 @@
         }
         return changeApplyService.saveChangeApply(request);
     }
+
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody CertificateChangeApplyApprovalListRequest request) throws Exception {
+        List<BizBusinessCertificateChangeApply> list = super.exportList(request);
+        super.exportExcel(BizBusinessCertificateChangeApply.class, list, ExportEnum.CERTIFICATE_CHANGE_APPLY.getSheetName());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java
index 5fc4b07..af8230e 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java
@@ -9,6 +9,7 @@
 import com.casic.missiles.dto.business.certificate.CertificatePrintApprovalListRequest;
 import com.casic.missiles.dto.business.certificate.CertificatePrintListResponse;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.enums.business.CertificatePrintStatusEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessCertificatePrintLog;
@@ -18,10 +19,16 @@
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.io.IOException;
+import java.util.List;
 import java.util.Objects;
 
 /**
@@ -98,4 +105,16 @@
         });
         return certificatePrintService.certificatePrintLog(idDTO.getId());
     }
+
+    @ApiOperation("证书打印审批导出")
+    @PostMapping("/listExport")
+    public void exportList(@RequestBody CertificatePrintApprovalListRequest request) throws IOException {
+        List<CertificatePrintListResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = certificatePrintService.listByIds(request.getIds());
+        } else {
+            list = certificatePrintService.list(request);
+        }
+        super.exportExcel(CertificatePrintListResponse.class, list, ExportEnum.CERTIFICATE_PRINT.getSheetName());
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java
index 63b06dc..6b2efd5 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java
@@ -6,6 +6,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.business.certificate.CertificateReportApprovalListRequest;
 import com.casic.missiles.dto.business.certificate.CertificateReportSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessCertificateReport;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
@@ -21,6 +22,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -50,7 +52,7 @@
         return certificateReportService.saveCertificateReport(request);
     }
 
-    @ApiOperation("证书审批详情（基本信息）")
+    @ApiOperation("详情（基本信息）")
     @PostMapping("/detail")
     public ReturnDTO<BizBusinessCertificateReport> detail(@RequestBody @Valid BaseDetailRequest request, BindingResult bindingResult) throws Exception {
         if(bindingResult.hasErrors()){
@@ -59,4 +61,11 @@
         return certificateReportService.detail(request);
     }
 
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody CertificateReportApprovalListRequest request) throws Exception {
+        List<BizBusinessCertificateReport> list = super.exportList(request);
+        super.exportExcel(BizBusinessCertificateReport.class, list, ExportEnum.CERTIFICATE_REPORT.getSheetName());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java
index 46b26bd..57c0809 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java
@@ -10,20 +10,21 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.business.identify.IdentifyListRequest;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessIdentifyInfo;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.business.IBizBusinessIdentifyInfoService;
+import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import javax.validation.Valid;
+import java.util.List;
 import java.util.Objects;
 
 /**
@@ -57,16 +58,13 @@
         return identifyInfoService.addIdentify(identifyInfo);
     }
 
-    @ApiOperation("标识打印更新")
+    @ApiOperation("标识打印更新（更新打印时间）")
     @PostMapping("/update")
-    public ReturnDTO updateIdentify(@RequestBody @Valid BizBusinessIdentifyInfo identifyInfo, BindingResult bindingResult) {
-        Assert.isFalse(Objects.isNull(identifyInfo.getId()), () -> {
+    public ReturnDTO updateIdentify(@RequestBody @Valid IdDTO idDTO) {
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        Assert.isFalse(bindingResult.hasErrors(), () -> {
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        });
-        return identifyInfoService.updateIdentify(identifyInfo);
+        return identifyInfoService.updateIdentify(idDTO.getId());
     }
 
     @ApiOperation("标识打印删除")
@@ -77,4 +75,37 @@
         });
         return identifyInfoService.deleteIdentify(idDTO.getId());
     }
+
+    @ApiOperation("标识打印导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody @Valid IdentifyListRequest request, BindingResult bindingResult) throws Exception {
+        if (bindingResult.hasErrors()) {
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        List<BizBusinessIdentifyInfo> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = identifyInfoService.listByIds(request.getIds());
+        } else {
+            list = identifyInfoService.list(request);
+        }
+        for (BizBusinessIdentifyInfo record : list) {
+            DictCodeUtils.convertDictCodeToName(record);
+        }
+        super.exportExcel(BizBusinessIdentifyInfo.class, list, ExportEnum.IDENTIFY_EXPORT.getSheetName());
+    }
+
+
+    // TODO: 2023/8/23 查询设备信息，4个底部按钮查设备（按钮的作用就是前端用来调不同接口、用来区分中间即将展示的标识），前端弹窗选设备，在确定保存时前端根据底部按钮判断传入设备类型deviceType字典code
+    // TODO: 2023/8/23 接口：查受检设备（第1个按钮），查设备台账（后3个按钮同一接口），查询之后前端根据标志类型的不同加到中间页面时进行判断（按产品给的对应表）
+    // TODO: 2023/8/23 提供二维码接口，前端在加到中间页面时调用一下
+
+    @ApiOperation("设备二维码")
+    @PostMapping("/equipment/qrCode")
+    public ReturnDTO<String> equipmentQrCode(@RequestBody @Valid IdDTO idDTO) {
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return identifyInfoService.equipmentQrCode(idDTO.getId());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java
index 707be6e..7e0453d 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java
@@ -117,7 +117,7 @@
     }
 
     @ApiOperation("任务单导出")
-    @PostMapping("/export")
+    @PostMapping("/listExport")
     public void orderExport(@RequestBody @Valid OrderListRequest request, HttpServletResponse response) {
         businessOrderService.orderExport(request, response);
     }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java
index 529a6ce..51432be 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java
@@ -1,9 +1,28 @@
 package com.casic.missiles.controller.business;
 
+import com.casic.missiles.controller.GeneralApprovalController;
+import com.casic.missiles.dto.BaseApprovalSubmitRequest;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.business.outsource.OutsourceAssessApprovalListRequest;
+import com.casic.missiles.dto.business.outsource.OutsourceAssessSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
+import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.model.business.BizBusinessOutsourceAssess;
+import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
+import com.casic.missiles.service.IGeneralApprovalService;
+import com.casic.missiles.service.business.IBizBusinessOutsourceAssessService;
 import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.BindingResult;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.validation.Valid;
+import java.util.List;
+
 /**
  * <p>
  * 计量检定业务-分包管理-测试、校准或检定工作分包评审表 前端控制器
@@ -15,6 +34,27 @@
 @Api(tags = "分包管理-测试、校准或检定工作分包评审表")
 @RestController
 @RequestMapping("/business/outsource/assess")
-public class BizBusinessOutsourceAssessController {
+public class BizBusinessOutsourceAssessController extends GeneralApprovalController<BizBusinessOutsourceAssess, BizBusinessOutsourceAssess, OutsourceAssessApprovalListRequest, BaseApprovalSubmitRequest> {
+    @Autowired
+    private IBizBusinessOutsourceAssessService outsourceAssessService;
 
+    public BizBusinessOutsourceAssessController(IGeneralApprovalService<BizBusinessOutsourceAssess, BizBusinessOutsourceAssess, OutsourceAssessApprovalListRequest, BaseApprovalSubmitRequest> baseApprovalService) {
+        super(baseApprovalService);
+    }
+
+    @ApiOperation("草稿箱-保存")
+    @PostMapping("/save")
+    public ReturnDTO<OutsourceAssessSaveResponse> saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceAssess request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        return outsourceAssessService.saveOutsourceAssess(request);
+    }
+
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception {
+        List<BizBusinessOutsourceAssess> list = super.exportList(request);
+        super.exportExcel(BizBusinessOutsourceAssess.class, list, ExportEnum.OUTSOURCE_ASSESS.getSheetName());
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java
new file mode 100644
index 0000000..9adef18
--- /dev/null
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java
@@ -0,0 +1,60 @@
+package com.casic.missiles.controller.business;
+
+import com.casic.missiles.controller.GeneralApprovalController;
+import com.casic.missiles.dto.BaseApprovalSubmitRequest;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.business.outsource.OutsourceProtocolApprovalListRequest;
+import com.casic.missiles.dto.business.outsource.OutsourceProtocolSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
+import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.model.business.BizBusinessOutsourceProtocol;
+import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
+import com.casic.missiles.service.IGeneralApprovalService;
+import com.casic.missiles.service.business.IBizBusinessOutsourceProtocolService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.BindingResult;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.validation.Valid;
+import java.util.List;
+
+/**
+ * <p>
+ * 计量检定业务-分包管理-测试、校准或检定工作分包协议书 前端控制器
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-08-24
+ */
+@Api(tags = "分包管理-测试、校准或检定工作分包协议书")
+@RestController
+@RequestMapping("/business/outsource/protocol")
+public class BizBusinessOutsourceProtocolController extends GeneralApprovalController<BizBusinessOutsourceProtocol, BizBusinessOutsourceProtocol, OutsourceProtocolApprovalListRequest, BaseApprovalSubmitRequest> {
+    @Autowired
+    private IBizBusinessOutsourceProtocolService outsourceProtocolService;
+
+    public BizBusinessOutsourceProtocolController(IGeneralApprovalService<BizBusinessOutsourceProtocol, BizBusinessOutsourceProtocol, OutsourceProtocolApprovalListRequest, BaseApprovalSubmitRequest> baseApprovalService) {
+        super(baseApprovalService);
+    }
+
+    @ApiOperation("草稿箱-保存")
+    @PostMapping("/save")
+    public ReturnDTO<OutsourceProtocolSaveResponse> saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceProtocol request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        return outsourceProtocolService.saveOutsourceProtocol(request);
+    }
+
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody OutsourceProtocolApprovalListRequest request) throws Exception {
+        List<BizBusinessOutsourceProtocol> list = super.exportList(request);
+        super.exportExcel(BizBusinessOutsourceProtocol.class, list, ExportEnum.OUTSOURCE_PROTOCOL.getSheetName());
+    }
+}
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java
index 097f645..f0f0943 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java
@@ -17,7 +17,6 @@
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.IGeneralApprovalService;
 import com.casic.missiles.service.business.IBizBusinessOutsourcerInfoService;
-import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -71,19 +70,8 @@
 
     @ApiOperation("分包方导出")
     @PostMapping("/listExport")
-    public void export(@RequestBody @Valid OutsourcerInfoApprovalListRequest request, BindingResult bindingResult) throws Exception {
-        if (bindingResult.hasErrors()) {
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        }
-        List<BizBusinessOutsourcerInfo> list;
-        if (!CollectionUtils.isEmpty(request.getIds())) {
-            list = outsourcerInfoService.listByIds(request.getIds());
-        } else {
-            list = outsourcerInfoService.list(request);
-        }
-        for (BizBusinessOutsourcerInfo record : list) {
-            DictCodeUtils.convertDictCodeToName(record);
-        }
+    public void export(@RequestBody OutsourcerInfoApprovalListRequest request) throws Exception {
+        List<BizBusinessOutsourcerInfo> list = super.exportList(request);
         super.exportExcel(BizBusinessOutsourcerInfo.class, list, ExportEnum.OUTSOURCER_EXPORT.getSheetName());
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java
index c2cbf9f..0410918 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java
@@ -17,11 +17,9 @@
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.IGeneralApprovalService;
 import com.casic.missiles.service.business.IBizBusinessSiteExecutiveInfoService;
-import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -60,7 +58,7 @@
         return siteExecutiveInfoService.saveSiteExecutiveInfo(siteExecutiveInfo);
     }
 
-    @ApiOperation("现场检测详情")
+    @ApiOperation("详情")
     @PostMapping("/detail")
     public ReturnDTO<SiteExecutiveDetailResponse> siteExecutiveDetail(@RequestBody @Valid IdDTO idDTO) throws Exception {
         Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
@@ -69,21 +67,10 @@
         return ReturnUtil.success(siteExecutiveInfoService.detail(idDTO.getId()));
     }
 
-    @ApiOperation("现场检测导出")
+    @ApiOperation("导出")
     @PostMapping("/listExport")
-    public void export(@RequestBody @Valid SiteExecutiveApprovalListRequest request, BindingResult bindingResult) throws Exception {
-        if (bindingResult.hasErrors()) {
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        }
-        List<SiteExecutiveApprovalListResponse> list;
-        if (!CollectionUtils.isEmpty(request.getIds())) {
-            list = siteExecutiveInfoService.listInfoByIds(request.getIds());
-        } else {
-            list = siteExecutiveInfoService.listInfo(request);
-        }
-        for (SiteExecutiveApprovalListResponse record : list) {
-            DictCodeUtils.convertDictCodeToName(record);
-        }
+    public void export(@RequestBody SiteExecutiveApprovalListRequest request) throws Exception {
+        List<SiteExecutiveApprovalListResponse> list = super.exportList(request);
         super.exportExcel(SiteExecutiveApprovalListResponse.class, list, ExportEnum.SITE_EXECUTIVE_EXPORT.getSheetName());
     }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
index 7e793cd..a92e209 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
@@ -55,7 +55,7 @@
 
     @ApiOperation("设备收发列表导出")
     @PostMapping("/export")
-    public void exportList(@RequestBody @Valid SampleDispatchListRequest request) throws IOException {
+    public void exportList(@RequestBody SampleDispatchListRequest request) throws IOException {
         List<SampleDispatchListResponse> list;
         if (!CollectionUtils.isEmpty(request.getIds())) {
             list = dispatchService.listByIds(request.getIds());
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java
index cdc77fc..d120fd4 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java
@@ -7,6 +7,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.business.labExecutive.*;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.business.IBusinessLabExecutiveInfoService;
@@ -14,6 +15,7 @@
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.*;
 
@@ -32,7 +34,7 @@
     @Autowired
     private IBusinessLabExecutiveInfoService labExecutiveInfoService;
 
-    @ApiOperation("实验室检测-部门检测-查询各状态列表（待检测、检测中、检测完）")
+    @ApiOperation("实验室任务-查询各状态列表（待检测、检测中、检测完）")
     @PostMapping("/deptExecutive/List")
     public ReturnDTO<PageInfoBT<SampleLabExecutiveListResponse>> queryDeptExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
@@ -43,10 +45,19 @@
         return ReturnUtil.success(super.packForBT(labExecutiveInfoService.deptLabExecutiveListPage(page, labExecutiveListRequest)));
     }
 
-    /**
-     * 实验室检测-我的检测-查询各状态列表（待检测、检测中、检测完）
-     */
-    @ApiOperation("实验室检测-我的检测-查询各状态列表（待检测、检测中、检测完）")
+    @ApiOperation("实验室任务导出")
+    @PostMapping("/deptExecutive/export")
+    public void deptExportList(@RequestBody @Valid SampleLabExecutiveListRequest request) throws Exception {
+        List<SampleLabExecutiveListResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = labExecutiveInfoService.deptLabExecutiveListByIds(request.getMeasureStatus(), request.getIds());
+        } else {
+            list = labExecutiveInfoService.deptLabExecutiveList(request);
+        }
+        super.exportExcel(SampleLabExecutiveListResponse.class, list, ExportEnum.DEPT_EXECUTIVE_TASK.getSheetName());
+    }
+
+    @ApiOperation("我的任务-查询各状态列表（待检测、检测中、检测完）")
     @PostMapping("/myExecutive/list")
     public ReturnDTO<PageInfoBT<SampleLabExecutiveListResponse>> queryMyExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
@@ -57,19 +68,25 @@
         return ReturnUtil.success(super.packForBT(labExecutiveInfoService.myLabExecutiveListPage(page, labExecutiveListRequest)));
     }
 
-    /**
-     * 实验室检测-我的检测-查询各状态样品数量（待检测、检测中、检测完）
-     */
-    @ApiOperation("实验室检测-我的检测-查询各状态样品数量（待检测、检测中、检测完）")
+    @ApiOperation("我的任务导出")
+    @PostMapping("/myExecutive/export")
+    public void exportList(@RequestBody @Valid SampleLabExecutiveListRequest request) throws Exception {
+        List<SampleLabExecutiveListResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = labExecutiveInfoService.myLabExecutiveListByIds(request.getMeasureStatus(), request.getIds());
+        } else {
+            list = labExecutiveInfoService.myLabExecutiveList(request);
+        }
+        super.exportExcel(SampleLabExecutiveListResponse.class, list, ExportEnum.MY_EXECUTIVE_TASK.getSheetName());
+    }
+
+    @ApiOperation("我的任务-查询各状态样品数量（待检测、检测中、检测完）")
     @GetMapping("/myExecutive/amount")
     public ReturnDTO<List<SampleAmountResponse>> queryMyExecutiveAmount() {
         return ReturnUtil.success(labExecutiveInfoService.myExecutiveAmount());
     }
 
-    /**
-     * 实验室检测-部门检测-分配（分配给具体人员）
-     */
-    @ApiOperation("实验室检测-部门检测-分配按钮（分配给具体人员）")
+    @ApiOperation("实验室任务-分配按钮（分配给具体人员）")
     @PostMapping("/deptExecutive/allocate")
     public ReturnDTO allocateStaff(@RequestBody @Valid SampleAllocateRequest sampleAllocateRequest, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -78,10 +95,7 @@
         return labExecutiveInfoService.allocateStaff(sampleAllocateRequest);
     }
 
-    /**
-     * 实验室检测-我的检测-检定人扫描收入（待检测->检测中）
-     */
-    @ApiOperation("实验室检测-我的检测-检定人扫描收入（待检测->检测中）")
+    @ApiOperation("我的任务-检定人扫描收入（待检测->检测中）")
     @PostMapping("/myExecutive/receive")
     public ReturnDTO sampleReceive(@RequestBody @Valid List<SampleOperateRequest> requestList, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -90,10 +104,7 @@
         return labExecutiveInfoService.sampleReceive(requestList);
     }
 
-    /**
-     * 实验室检测-负责人/检定人扫描检完（检测中->检测完）
-     */
-    @ApiOperation("实验室检测-负责人/检定人扫描检完（检测中->检测完）")
+    @ApiOperation("实验室任务-负责人/检定人扫描检完（检测中->检测完）")
     @PostMapping("/myExecutive/complete")
     public ReturnDTO sampleExecutiveComplete(@RequestBody @Valid List<SampleOperateRequest> requestList, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -102,10 +113,7 @@
         return labExecutiveInfoService.sampleExecutiveComplete(requestList);
     }
 
-    /**
-     * 实验室检测-部门检测/我的检测 编辑（只能修改应出具证书）
-     */
-    @ApiOperation("实验室检测-部门检测/我的检测 编辑（只能修改应出具证书）")
+    @ApiOperation("实验室任务/我的任务 编辑（只能修改应出具证书）")
     @PostMapping("/executive/update")
     public ReturnDTO updateExecutive(@RequestBody @Valid UpdateExecutiveRequest request, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -114,10 +122,7 @@
         return labExecutiveInfoService.updateExecutive(request);
     }
 
-    /**
-     * 实验室检测-部门检测/我的检测 详情
-     */
-    @ApiOperation("实验室检测-部门检测/我的检测 详情")
+    @ApiOperation("实验室任务/我的任务 详情")
     @PostMapping("/executive/detail")
     public ReturnDTO<ExecutiveDetailResponse> executiveDetail(@RequestBody @Valid ExecutiveDetailRequest request, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
@@ -131,7 +136,7 @@
      * 退回后会将下一个要执行的实验室检测状态更新为待分配，将后面的实验室顺序变更为连续（都进行减1）
      * 最后一个检测的实验室退回，等分发员再增加实验室或设备收发中的已收入直接手动点击完成
      */
-    @ApiOperation("实验室检测-部门检测/我的检测 退回（待检测/检测中->退回）")
+    @ApiOperation("实验室任务/我的任务 退回（待检测/检测中->退回）")
     @PostMapping("/executive/sendBack")
     public ReturnDTO executiveSendBack(@RequestBody @Valid ExecutiveSendBackRequest request, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -140,9 +145,6 @@
         return labExecutiveInfoService.sampleExecutiveSendBack(request);
     }
 
-    /**
-     * 分发员编辑实验室检测列表
-     */
     @ApiOperation("分发员编辑实验室检测列表")
     @PostMapping("/handOut/updateList")
     public ReturnDTO updateExecutiveList(@RequestBody @Valid UpdateExecutiveListRequest request, BindingResult bindingResult) {
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java
index 48a67ed..0c04f31 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java
@@ -10,6 +10,7 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.resource.customer.CustomerApprovalListRequest;
 import com.casic.missiles.dto.resource.customer.CustomerSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceCustomerInfo;
@@ -26,6 +27,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -55,6 +57,13 @@
         return customerInfoService.saveCustomerInfo(request);
     }
 
+    @ApiOperation("委托方名录导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody CustomerApprovalListRequest request) throws Exception {
+        List<BizResourceCustomerInfo> list = super.exportList(request);
+        super.exportExcel(BizResourceCustomerInfo.class, list, ExportEnum.CUSTOMER_INFO.getSheetName());
+    }
+
     @ApiOperation("委托方人员列表（分页）")
     @PostMapping("/person/listPage")
     public ReturnDTO<PageInfoBT<BizResourceCustomerStaff>> personListPage(@RequestBody IdDTO idDto) {
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
index 972ed4b..6418ea5 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
@@ -5,6 +5,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.resource.customer.SuggestFormApprovalListRequest;
 import com.casic.missiles.dto.resource.customer.SuggestFormSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceCustomerSuggestForm;
@@ -20,6 +21,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -50,4 +52,11 @@
         return suggestFormService.saveSuggestForm(request);
     }
 
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody SuggestFormApprovalListRequest request) throws Exception {
+        List<BizResourceCustomerSuggestForm> list = super.exportList(request);
+        super.exportExcel(BizResourceCustomerSuggestForm.class, list, ExportEnum.CUSTOMER_SUGGEST_FORM.getSheetName());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java
index 1934d1a..9e07eab 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java
@@ -15,12 +15,16 @@
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.resource.IEnvEnvironmentRecordConfigService;
 import com.casic.missiles.service.resource.IEnvEnvironmentRecordDataService;
+import com.casic.missiles.service.resource.IEnvLocationInfoService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
 import java.util.List;
@@ -39,6 +43,8 @@
     private IEnvEnvironmentRecordDataService environmentRecordDataService;
     @Autowired
     private IEnvEnvironmentRecordConfigService environmentRecordConfigService;
+    @Autowired
+    private IEnvLocationInfoService locationInfoService;
 
     @ApiOperation("环境记录单数据列表/详情")
     @PostMapping("/data/listPage")
@@ -95,4 +101,11 @@
         });
         return environmentRecordConfigService.deleteEnvironmentRecordConfig(idDTO.getId());
     }
+
+    @ApiOperation("地点列表")
+    @PostMapping("/location/listPage")
+    public ReturnDTO<PageInfoBT<LocationListResponse>> locationListPage(@RequestBody @Valid LocationListRequest request) {
+        Page<LocationListResponse> page = PageFactory.defaultPage();
+        return ReturnUtil.success(super.packForBT(locationInfoService.listPage(page, request)));
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java
index 82efe3f..e9561fa 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java
@@ -10,6 +10,7 @@
 import com.casic.missiles.dto.resource.seal.SealLogListRequest;
 import com.casic.missiles.dto.resource.seal.SealNoteApprovalListRequest;
 import com.casic.missiles.dto.resource.seal.SealNoteSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceSealUseLog;
@@ -27,6 +28,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -58,6 +60,13 @@
         return sealUseNoteService.saveSeal(request);
     }
 
+    @ApiOperation("印章使用登记导出（列表和导出中去掉经办人和监印人）")
+    @PostMapping("/listExport")
+    public void export(@RequestBody SealNoteApprovalListRequest request) throws Exception {
+        List<BizResourceSealUseNote> list = super.exportList(request);
+        super.exportExcel(BizResourceSealUseNote.class, list, ExportEnum.SEAL_NOTE.getSheetName());
+    }
+
     // TODO: 2023/7/28 印章使用日志：系统中使用印章时插入数据库
 
     @ApiOperation("印章使用日志列表（分页）")
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java
index 9b674fc..06b6521 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java
@@ -9,16 +9,20 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.resource.staff.StaffCertRequest;
 import com.casic.missiles.dto.resource.staff.StaffCertResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.service.resource.IBizResourceStaffInfoService;
 import com.casic.missiles.service.resource.IBizResourceStaffVerifierService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.List;
+
 /**
  * @Description:
  * @Author: wangpeng
@@ -41,9 +45,21 @@
         return ReturnUtil.success(super.packForBT(responsePage));
     }
 
+    @ApiOperation("证书逾期提醒导出")
+    @PostMapping("/listExport")
+    public void exportList(@RequestBody StaffCertRequest request) throws Exception {
+        List<StaffCertResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = staffInfoService.certListByIds(request.getIds());
+        } else {
+            list = staffInfoService.certList(request);
+        }
+        super.exportExcel(StaffCertResponse.class, list, ExportEnum.STAFF_CERTIFICATE_EXPIRE.getSheetName());
+    }
+
     @ApiOperation("证书逾期提醒")
     @PostMapping("/expirationReminder")
-    public ReturnDTO expirationReminder(@RequestBody IdDTO idDto) {
-        return verifierService.expirationReminder(idDto);
+    public ReturnDTO expirationReminder(@RequestBody IdDTO idDTO) {
+        return verifierService.expirationReminder(idDTO);
     }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java
index 3b251ad..a6e7850 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java
@@ -12,6 +12,7 @@
 import com.casic.missiles.dto.resource.staff.StaffListRequest;
 import com.casic.missiles.dto.resource.staff.TrainListRequest;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.*;
@@ -22,7 +23,10 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
 import java.util.List;
@@ -52,8 +56,19 @@
             throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
         }
         Page<BizResourceStaffInfo> page = PageFactory.defaultPage();
-        Page<BizResourceStaffInfo> responsePage = staffInfoService.listPage(page, request);
-        return ReturnUtil.success(super.packForBT(responsePage));
+        return ReturnUtil.success(super.packForBT(staffInfoService.listPage(page, request)));
+    }
+
+    @ApiOperation("人员登记导出")
+    @PostMapping("/listExport")
+    public void exportList(@RequestBody StaffListRequest request) throws Exception {
+        List<BizResourceStaffInfo> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = staffInfoService.listByIds(request.getIds());
+        } else {
+            list = staffInfoService.list(request);
+        }
+        super.exportExcel(BizResourceStaffInfo.class, list, ExportEnum.STAFF_INFO.getSheetName());
     }
 
     @ApiOperation("人员登记详情基础信息")
@@ -85,9 +100,9 @@
 
     @ApiOperation("科研教育列表（分页）")
     @PostMapping("/education/listPage")
-    public ReturnDTO<PageInfoBT<BizResourceStaffEducation>> educationListPage(@RequestBody IdDTO idDto) {
+    public ReturnDTO<PageInfoBT<BizResourceStaffEducation>> educationListPage(@RequestBody IdDTO idDTO) {
         Page<BizResourceStaffEducation> page = PageFactory.defaultPage();
-        Page<BizResourceStaffEducation> responsePage = staffInfoService.educationListPage(page, idDto);
+        Page<BizResourceStaffEducation> responsePage = staffInfoService.educationListPage(page, idDTO);
         return ReturnUtil.success(super.packForBT(responsePage));
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java
index af6aa86..d85d84a 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java
@@ -9,6 +9,7 @@
 import com.casic.missiles.dto.resource.outsideService.SupplierApprovalListRequest;
 import com.casic.missiles.dto.resource.outsideService.SupplierSaveResponse;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceSupplierAbility;
@@ -67,6 +68,13 @@
         return ReturnUtil.success(supplierInfoService.detail(idDTO.getId()));
     }
 
+    @ApiOperation("合格供方导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody SupplierApprovalListRequest request) throws Exception {
+        List<BizResourceSupplierInfo> list = super.exportList(request);
+        super.exportExcel(BizResourceSupplierInfo.class, list, ExportEnum.SUPPLIER_INFO.getSheetName());
+    }
+
     @ApiOperation("供方人员列表（分页）")
     @PostMapping("/person/listPage")
     public ReturnDTO<PageInfoBT<BizResourceSupplierPerson>> personListPage(@RequestBody IdDTO idDTO) {
diff --git a/casic-metering-api/src/main/resources/config/application.yml b/casic-metering-api/src/main/resources/config/application.yml
index 350db5f..ecff521 100644
--- a/casic-metering-api/src/main/resources/config/application.yml
+++ b/casic-metering-api/src/main/resources/config/application.yml
@@ -126,7 +126,7 @@
     #作者
     author: wangpeng
     #待生成对象表名
-    table-name: biz_equipment_technical_target_approval,biz_equipment_attachment_approval,biz_equipment_checkpoint_approval
+    table-name: biz_business_outsource_protocol
 
 reminder:
   #节点--common模块config包 ReminderNodeConfig配置
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
index 4a19e4e..d47d552 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
@@ -53,6 +53,7 @@
     SUGGEST_FORM_SAVE_FAILED(2509, "委托方意见登记表保存至草稿箱失败"),
     EXAMINE_FORM_SAVE_FAILED(2510, "要求、委托书及合同评审表保存至草稿箱失败"),
     CUSTOMER_EXIST_SAVE_FAILED(2511, "该委托方已存在，请重新选择"),
+    DUPLICATE_LOCATION_NO(2512, "地点编号已存在"),
 
     /**
      * 计量检定业务模块
@@ -68,6 +69,8 @@
     COMPLETE_SAMPLE_NOT_EXIST(2609, "检测中不存在扫描收入的样品"),
     CANNOT_CHANGE_MEASURE_INFO(2610, "无法更改非当前登录用户的检测信息"),
     NON_EXIST_ORDER_OR_SAMPLE(2611, "不存在该委托单或该委托单下的样品"),
+    OUTSOURCE_ACCESS_SAVE_FAILED(2612, "测试、校准或检定工作分包评审表保存至草稿箱失败"),
+    OUTSOURCE_PROTOCOL_SAVE_FAILED(2613, "测试、校准或检定工作分包协议书保存至草稿箱失败"),
 
     /**
      * 历史遗留备用
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
index 5089ad1..81a406b 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
@@ -10,54 +10,38 @@
     /**
      * 资源管理
      */
-    ENVIRONMENT_DATA_EXPORT("environmentData", "environmentData", "环境记录单数据"),
+    ENVIRONMENT_DATA_EXPORT("environmentData", "环境记录单数据", "环境记录单数据"),
+    STAFF_INFO("staffInfo", "人员登记", "人员登记"),
+    STAFF_CERTIFICATE_EXPIRE("certificateExpire", "证书逾期提醒", "证书逾期提醒"),
+    SUPPLIER_INFO("supplierInfo", "合格供方名录", "合格供方名录"),
+    CUSTOMER_INFO("customerInfo", "委托方名录", "委托方名录"),
+    CUSTOMER_SUGGEST_FORM("customerSuggestForm", "委托方意见登记表", "委托方意见登记表"),
+    SEAL_NOTE("sealNote", "印章使用登记", "印章使用登记"),
 
-    FILE_EXPORT("meterFileData", "meterFileData", "计量文件信息"),
-    TRAIN_PLAN_EXPORT("trainPlanData", "trainPlanData", "培训计划"),
-    TRAIN_LOG_EXPORT("trainLogData", "trainLogData", "培训记录"),
-    METER_ORGANIZE_EXPORT("meterOrganizeData", "meterOrganizeData", "计量组织"),
-    TRACE_SUPPLIER_EXPORT("traceSupplierData", "traceSupplierData", "溯源供方"),
-    SIGN_EXPORT("signData", "signData", "签名/签章"),
-    TEMPLATE_EXPORT("templateData", "templateData", "原始记录模板/证书报告模板"),
-    FIXED_ASSETS("meterFixedAssets", "meterFixedAssets", "固定资产"),
-    METER_EQUIPMENT("meterEquipment", "meterEquipment", "测量设备"),
-    CALIBRATION_TEST_EQUIPMENT("calibrationTestEquipment", "calibrationTestEquipment", "校准检定设备"),
-    MEASURE_ACCOUNT("measureAccount", "measureAccount", "测量工装"),
-    STANDARD_SUPPORT_EQUIPMENT("standardSupportEquipment", "standardSupportEquipment", "标准配套设备"),
-    STANDARD_EQUIPMENT("standardEquipment", "standardEquipment", "标准装置"),
-    FLOW_DEF_EXPORT("flowDefData", "flowDefData", "流程定义"),
-    STAFF_CERTIFICATE("certificate", "certificate", "计量人员证书"),
-    CHECK_INFO("checkInfo", "checkInfo", "设备管理点检测"),
-    EQUIPMENT_APPLY("equipmentApply", "equipmentApply", "设备借用"),
-    STANDARD_EQUIPMENT_REMIND("equipmentApplyRemind", "equipmentApplyRemind", "标准装置到期提醒"),
-    METER_PRICE("meterPrice", "meterPrice", "价格库"),
-    METER_STAFF("meterStaff", "meterStaff", "计量人员"),
-    STANDARD_EQUIPMENT_APPLY("standardEquipmentApply", "standardEquipmentApply", "标准装置申请"),
-    STATE_MANAGE_APPLY("stateManage", "stateManage", "状态管理"),
-    METER_ACCEPTANCE_CHECK("acceptanceCheck", "acceptanceCheck", "设备检修保养验收单"),
-    CUSTOMER_EXPORT("customerData", "customerData", "客户信息"),
-    ORDER_EXPORT("orderData", "orderData", "委托书信息"),
-    SAMPLE_EXPORT("sampleData", "sampleData", "样本信息"),
-    EXCHANGE_DATA("exchangeData", "exchangeData", "设备交接单"),
-    DISPATCH_DATA("dispatchData", "dispatchData", "设备收发"),
-    ENVIRONMENT_DATA("environmentData", "environmentData", "环境记录单"),
-    ORIGIN_DATA("originData", "originData", "原始记录"),
-    CERTIFICATE_REPORT("certificateReport", "certificateReport", "证书报告"),
-    ADVICE_EXPORT("adviceData", "adviceData", "客户反馈"),
-    HANDOUT_EXPORT("handoutData", "handoutData", "任务分发列表"),
-    OUTSOURCER_EXPORT("outsourcerData", "outsourcerData", "分包方"),
-    SITE_EXECUTIVE_EXPORT("siteExecutiveData", "siteExecutiveData", "现场测试、校准或检定"),
-    CERTIFICATE_PRINT_EXPORT("certificatePrintData", "certificatePrintData", "证书打印"),
-    DOWNLOAD_TEMPLATE("downloadTemplate", "downloadTemplate", "页面配置"),
-    OUTSOURCER_CERTIFICATE_EXPORT("outsourceCertificateData", "outsourceCertificateData", "分包证书"),
-    SETTLEMENT_INFO_EXPORT("settlementInfoData", "settlementInfoData", "业务结算"),
-    EQUIPMENT_REMIND("equipmentRemind", "equipmentRemind", "设备到期提醒"),
-    AGREEMENT_INFO_EXPORT("agreementInfoData", "agreementInfoData", "合同"),
-    WORK_STATISTICS_EXPORT("workStatisticsData", "workStatisticsData", "实时工作统计"),
-    DEPT_OUTPUT_EXPORT("deptOutputData", "deptOutputData", "部门产值分析"),
-    WORKLOAD_EXPORT("workloadData", "workloadData", "业务工作量分析"),
-    DEPT_COMPREHENSIVE_EXPORT("deptComprehensiveData", "deptComprehensiveData", "部门综合分析"),
-    ENVIRONMENTAL_RECORD("environmentalRecordData", "environmentalRecordData", "现场环境记录");
+    /**
+     * 计量检定业务
+     */
+    OUTSOURCER_EXPORT("outsourcerData", "分包方名录", "分包方名录"),
+    IDENTIFY_EXPORT("identifyData", "计量标识", "计量标识"),
+    ORDER_EXPORT("orderData", "任务单", "任务单"),
+    DISPATCH_DATA("dispatchData", "设备收发", "设备收发"),
+    HANDOUT_EXPORT("handoutData", "任务分发", "任务分发"),
+    SITE_EXECUTIVE_EXPORT("siteExecutiveData", "现场测试、校准或检定", "现场测试、校准或检定"),
+    CERTIFICATE_REPORT("certificateReport", "证书审批", "证书审批"),
+    CERTIFICATE_CHANGE_APPLY("certificateChangeApply", "证书报告补充或更换申请单", "证书报告补充或更换申请单"),
+    CERTIFICATE_PRINT("certificatePrintData", "证书打印审批", "证书打印审批"),
+    DEPT_EXECUTIVE_TASK("deptExecutiveTaskData", "实验室任务", "实验室任务"),
+    MY_EXECUTIVE_TASK("myExecutiveTaskData", "我的任务", "我的任务"),
+    OUTSOURCE_ASSESS("outsourceAssess", "测试、校准或检定工作分包评审表", "测试、校准或检定工作分包评审表"),
+    OUTSOURCE_PROTOCOL("outsourceProtocol", "测试、校准或检定工作分包协议书", "测试、校准或检定工作分包协议书"),
+
+    /**
+     * 系统管理
+     */
+    SIGN_EXPORT("signData", "签名", "签名"),
+    TEMPLATE_EXPORT("templateData", "文件模板", "文件模板"),
+    FLOW_DEF_EXPORT("flowDefData", "流程定义", "流程定义"),
+    DOWNLOAD_TEMPLATE("downloadTemplate", "流程定义", "页面配置");
 
     ExportEnum(String fileName, String sheetName, String description) {
         this.fileName = fileName;
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateRecordTypeCodeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateRecordTypeCodeEnum.java
index 31d913c..a963522 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateRecordTypeCodeEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateRecordTypeCodeEnum.java
@@ -46,4 +46,14 @@
     String SITE_EXECUTIVE_APPROVAL = "01";
     //《现场测试、校准或检定工作记录表》
     String SITE_EXECUTIVE_LOG = "02";
+
+    //测试、校准或检定工作分包协议书
+    String OUTSOURCE_PROTOCOL = "01";
+    //测试、校准或检定工作分包评审表
+    String OUTSOURCE_ACCESS = "02";
+    //测试、校准或检定工作分包通知书
+    String OUTSOURCE_NOTICE = "03";
+    //测试、校准或检定工作分包方名录
+    String OUTSOURCE_INFO = "04";
+
 }
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
index 24b8635..f78bd53 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
@@ -15,6 +15,10 @@
     String CERTIFICATE_CHANGE_APPLY_BEAN_NAME = "certificateChangeApplyBean";
     //现场测试、校准或检定
     String SITE_EXECUTIVE_BEAN_NAME = "siteExecutiveBean";
+    //测试、校准或检定工作分包评审表
+    String OUTSOURCE_ASSESS_BEAN_NAME = "outsourceAssessBean";
+    //测试、校准或检定工作分包协议书
+    String OUTSOURCE_PROTOCOL_BEAN_NAME = "outsourceProtocolBean";
 
     /*********************************设备与装置************************************/
     //设备台账
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 b21c661..6b86fd1 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
@@ -18,6 +18,8 @@
     OUTSOURCER_APPROVAL(OUTSOURCER_BEAN_NAME, ""),
     CERTIFICATE_CHANGE_APPROVAL(CERTIFICATE_CHANGE_APPLY_BEAN_NAME, ""),
     SITE_EXECUTIVE_APPROVAL(SITE_EXECUTIVE_BEAN_NAME, ""),
+    OUTSOURCE_ASSESS_APPROVAL(OUTSOURCE_ASSESS_BEAN_NAME, ""),
+    OUTSOURCE_PROTOCOL_APPROVAL(OUTSOURCE_PROTOCOL_BEAN_NAME, ""),
 
     ACTION_STATUS_MAP(new HashMap<String, AwareActionStatusEnum>() {
         {
@@ -47,6 +49,10 @@
             put(ApplyFromIdEnum.CERTIFICATE_CHANGE_APPROVAL.getCode(), CERTIFICATE_CHANGE_APPROVAL);
             //现场测试、校准或检定审批
             put(ApplyFromIdEnum.SITE_EXECUTIVE_APPROVAL.getCode(), SITE_EXECUTIVE_APPROVAL);
+            //测试、校准或检定工作分包评审表
+            put(ApplyFromIdEnum.OUTSOURCE_ASSESS_APPROVAL.getCode(), OUTSOURCE_ASSESS_APPROVAL);
+            //测试、校准或检定工作分包协议书
+            put(ApplyFromIdEnum.OUTSOURCE_PROTOCOL_APPROVAL.getCode(), OUTSOURCE_PROTOCOL_APPROVAL);
         }
     });
     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 934405e..c7410bd 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
@@ -9,6 +9,8 @@
     CERTIFICATE_CHANGE_APPROVAL("jljdywzsbchghsqd", MessageSourceModuleEnum.BUSINESS.getCode(), "证书/报告补充或更换申请单"),
     OUTSOURCER_APPROVAL("jljdywcsjzhgfbfml", MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定合格分包方名录"),
     SITE_EXECUTIVE_APPROVAL("jljdywxccsjzsp", MessageSourceModuleEnum.BUSINESS.getCode(), "现场测试、校准或检定审批"),
+    OUTSOURCE_ASSESS_APPROVAL("jljdywcsjzfbpsb", MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包评审表"),
+    OUTSOURCE_PROTOCOL_APPROVAL("jljdywcsjzfbxys", MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包协议书"),
 
 
     /*******************************************设备与装置*********************************************/
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/GeneralApprovalMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/GeneralApprovalMapper.java
index 4fb7344..0c9d6ae 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/GeneralApprovalMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/GeneralApprovalMapper.java
@@ -17,8 +17,4 @@
 
     Page<O> selectBatchForApprovalList(Page<O> page, @Param("request") R request, @Param("businessKeys") List<String> businessKeys);
 
-//    Page<O> selectListPage(Page<O> page, @Param("request") R request);
-
-//    Long selectMaxNo();
-
 }
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceAssessMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceAssessMapper.java
index 7867bb8..ba59009 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceAssessMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceAssessMapper.java
@@ -1,7 +1,12 @@
 package com.casic.missiles.mapper.business;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.business.outsource.OutsourceAssessApprovalListRequest;
+import com.casic.missiles.mapper.GeneralApprovalMapper;
 import com.casic.missiles.model.business.BizBusinessOutsourceAssess;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * <p>
@@ -11,6 +16,10 @@
  * @author wangpeng
  * @since 2023-08-16
  */
-public interface BizBusinessOutsourceAssessMapper extends BaseMapper<BizBusinessOutsourceAssess> {
+public interface BizBusinessOutsourceAssessMapper extends GeneralApprovalMapper<BizBusinessOutsourceAssess, BizBusinessOutsourceAssess, OutsourceAssessApprovalListRequest> {
+
+    Page<BizBusinessOutsourceAssess> selectBatchForApprovalList(Page<BizBusinessOutsourceAssess> page, @Param("request") OutsourceAssessApprovalListRequest request, @Param("businessKeys") List<String> businessKeys);
+
+    Long selectMaxProjectNo();
 
 }
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceProtocolMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceProtocolMapper.java
new file mode 100644
index 0000000..e6aba35
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceProtocolMapper.java
@@ -0,0 +1,24 @@
+package com.casic.missiles.mapper.business;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.business.outsource.OutsourceProtocolApprovalListRequest;
+import com.casic.missiles.mapper.GeneralApprovalMapper;
+import com.casic.missiles.model.business.BizBusinessOutsourceProtocol;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 计量检定业务-分包管理-测试、校准或检定工作分包协议书 Mapper 接口
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-08-24
+ */
+public interface BizBusinessOutsourceProtocolMapper extends GeneralApprovalMapper<BizBusinessOutsourceProtocol, BizBusinessOutsourceProtocol, OutsourceProtocolApprovalListRequest> {
+
+    Page<BizBusinessOutsourceProtocol> selectBatchForApprovalList(Page<BizBusinessOutsourceProtocol> page, @Param("request") OutsourceProtocolApprovalListRequest request, @Param("businessKeys") List<String> businessKeys);
+
+    Long selectMaxProtocolNo();
+}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/EnvLocationInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/EnvLocationInfoMapper.java
new file mode 100644
index 0000000..49eff87
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/EnvLocationInfoMapper.java
@@ -0,0 +1,21 @@
+package com.casic.missiles.mapper.resource;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.resource.environment.LocationListRequest;
+import com.casic.missiles.dto.resource.environment.LocationListResponse;
+import com.casic.missiles.model.resource.EnvLocationInfo;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * <p>
+ * 实验室环境监控系统-设备表 Mapper 接口
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-06-07
+ */
+public interface EnvLocationInfoMapper extends BaseMapper<EnvLocationInfo> {
+
+    Page<LocationListResponse> selectLocationListPage(Page<LocationListResponse> page, @Param("request") LocationListRequest request);
+}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java
index de124db..85ed0f7 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java
@@ -1,7 +1,9 @@
 package com.casic.missiles.mapper.system;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.dto.system.SignDetailResponse;
+import com.casic.missiles.dto.system.SignListRequest;
 import com.casic.missiles.model.system.SystemSign;
 import org.apache.ibatis.annotations.Param;
 
@@ -22,4 +24,8 @@
     SignDetailResponse selectSignDetailById(Long id);
 
     List<SystemSign> selectUsableSignList(@Param("userId") Long userId);
+
+    Page<SystemSign> selectSignListPage(Page<SystemSign> page, @Param("request") SignListRequest request);
+
+    List<SystemSign> selectSignList(@Param("request") SignListRequest request);
 }
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateChangeApplyMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateChangeApplyMapper.xml
index d798447..c496092 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateChangeApplyMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateChangeApplyMapper.xml
@@ -30,31 +30,31 @@
         SELECT *
         FROM biz_business_certificate_change_apply
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.changeApplyNo != null and request.changeApplyNo !=''">
+        <if test="request != null and request.changeApplyNo != null and request.changeApplyNo !=''">
             and change_apply_no like concat('%',#{request.changeApplyNo},'%')
         </if>
-        <if test="request.changeReportNo != null and request.changeReportNo !=''">
+        <if test="request != null and request.changeReportNo != null and request.changeReportNo !=''">
             and change_report_no like concat('%',#{request.changeReportNo},'%')
         </if>
-        <if test="request.changeReportName != null and request.changeReportName !=''">
+        <if test="request != null and request.changeReportName != null and request.changeReportName !=''">
             and change_report_name like concat('%',#{request.changeReportName},'%')
         </if>
-        <if test="request.changeType != null and request.changeType !=''">
+        <if test="request != null and request.changeType != null and request.changeType !=''">
             and change_type = #{request.changeType}
         </if>
-        <if test="request.createUserName != null and request.createUserName !=''">
+        <if test="request != null and request.createUserName != null and request.createUserName !=''">
             and create_user_name like concat('%',#{request.createUserName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificatePrintMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificatePrintMapper.xml
index b66cd99..49c0ac8 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificatePrintMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificatePrintMapper.xml
@@ -31,34 +31,34 @@
         LEFT JOIN biz_business_order_sample_relation bosr ON (bosr.order_id = bcr.order_id AND bosr.sample_id = bcr.sample_id)
         LEFT JOIN biz_business_order_info boi ON boi.id = bosr.order_id
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and bcp.approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.printStatus != null and request.printStatus !=''">
+        <if test="request != null and request.printStatus != null and request.printStatus !=''">
             and print_status = #{request.printStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and bcp.create_user_id = #{request.createUserId}
         </if>
-        <if test="request.certificateReportNo != null and request.certificateReportNo !=''">
+        <if test="request != null and request.certificateReportNo != null and request.certificateReportNo !=''">
             and bcr.certificate_report_no like concat('%',#{request.certificateReportNo},'%')
         </if>
-        <if test="request.certificateReportName != null and request.certificateReportName !=''">
+        <if test="request != null and request.certificateReportName != null and request.certificateReportName !=''">
             and bcr.certificate_report_name like concat('%',#{request.certificateReportName},'%')
         </if>
-        <if test="request.customerName != null and request.customerName !=''">
+        <if test="request != null and request.customerName != null and request.customerName !=''">
             and boi.customer_name like concat('%',#{request.customerName},'%')
         </if>
-        <if test="request.sampleNo != null and request.sampleNo !=''">
+        <if test="request != null and request.sampleNo != null and request.sampleNo !=''">
             and bosr.sample_no like concat('%',#{request.sampleNo},'%')
         </if>
-        <if test="request.sampleName != null and request.sampleName !=''">
+        <if test="request != null and request.sampleName != null and request.sampleName !=''">
             and bosr.sample_name like concat('%',#{request.sampleName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and bcp.create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and bcp.create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml
index b366034..767695d 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml
@@ -46,33 +46,37 @@
         SELECT bcr.*, bosr.sample_no, bosr.sample_name, bosr.sample_model, rsi.staff_name
         FROM biz_business_certificate_report bcr
         LEFT JOIN biz_business_order_sample_relation bosr ON (bosr.order_id = bcr.order_id AND bosr.sample_id = bcr.sample_id)
+        LEFT JOIN biz_business_order_info boi ON boi.id = bcr.order_id
         LEFT JOIN biz_resource_staff_info rsi ON rsi.id = bcr.measure_person_id
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and bcr.approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and bcr.create_user_id = #{request.createUserId}
         </if>
-        <if test="request.certificateReportNo != null and request.certificateReportNo !=''">
+        <if test="request != null and request.customerId != null and request.customerId !=''">
+            and boi.customer_id = #{request.customerId}
+        </if>
+        <if test="request != null and request.certificateReportNo != null and request.certificateReportNo !=''">
             and bcr.certificate_report_no like concat('%',#{request.certificateReportNo},'%')
         </if>
-        <if test="request.certificateReportName != null and request.certificateReportName !=''">
+        <if test="request != null and request.certificateReportName != null and request.certificateReportName !=''">
             and bcr.certificate_report_name like concat('%',#{request.certificateReportName},'%')
         </if>
-        <if test="request.sampleNo != null and request.sampleNo !=''">
+        <if test="request != null and request.sampleNo != null and request.sampleNo !=''">
             and bosr.sample_no like concat('%',#{request.sampleNo},'%')
         </if>
-        <if test="request.measureCategory != null and request.measureCategory !=''">
+        <if test="request != null and request.measureCategory != null and request.measureCategory !=''">
             and bcr.measure_category = #{request.measureCategory}
         </if>
-        <if test="request.measurePerson != null and request.measurePerson !=''">
+        <if test="request != null and request.measurePerson != null and request.measurePerson !=''">
             and rsi.staff_name like concat('%',#{request.measurePerson},'%')
         </if>
-        <if test="request.calibrationTimeStart != null and request.calibrationTimeStart !=''">
+        <if test="request != null and request.calibrationTimeStart != null and request.calibrationTimeStart !=''">
             and bcr.calibration_time &gt;= #{request.calibrationTimeStart}
         </if>
-        <if test="request.calibrationTimeEnd != null and request.calibrationTimeEnd !=''">
+        <if test="request != null and request.calibrationTimeEnd != null and request.calibrationTimeEnd !=''">
             and bcr.calibration_time &lt;= #{request.calibrationTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceAssessMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceAssessMapper.xml
index d0fcf8b..c22c101 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceAssessMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceAssessMapper.xml
@@ -7,6 +7,8 @@
         <id column="id" property="id" />
         <result column="project_no" property="projectNo" />
         <result column="project_name" property="projectName" />
+        <result column="lab_code" property="labCode" />
+        <result column="group_code" property="groupCode" />
         <result column="applicant_id" property="applicantId" />
         <result column="applicant_name" property="applicantName" />
         <result column="applicant_time" property="applicantTime" />
@@ -31,7 +33,45 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, project_no, project_name, applicant_id, applicant_name, applicant_time, minio_file_name, remark, create_user_id, create_user_name, outsourcer_id, pre_start_time, pre_end_time, outsource_reason, pre_cost, approval_status, process_id, approve_situation, traceability, test_method, technique_ability, create_time, update_time
+        id, project_no, project_name, lab_code, group_code, applicant_id, applicant_name, applicant_time, minio_file_name, remark, create_user_id, create_user_name, outsourcer_id, pre_start_time, pre_end_time, outsource_reason, pre_cost, approval_status, process_id, approve_situation, traceability, test_method, technique_ability, create_time, update_time
     </sql>
 
+    <select id="selectMaxProjectNo" resultType="java.lang.Long">
+        SELECT IFNULL(max(RIGHT(project_no, 3)), 0) from biz_business_outsource_assess
+    </select>
+
+    <select id="selectBatchForApprovalList" resultMap="BaseResultMap">
+        SELECT bboa.*, bboi.outsourcer_name, bboi.director
+        FROM biz_business_outsource_assess bboa
+        LEFT JOIN biz_business_outsourcer_info bboi ON bboa.outsourcer_id = bboi.id
+        WHERE 1=1
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
+            and bboa.approval_status = #{request.approvalStatus}
+        </if>
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
+            and bboa.create_user_id = #{request.createUserId}
+        </if>
+        <if test="request != null and request.projectNo != null and request.projectNo !=''">
+            and bboa.project_no like concat('%',#{request.projectNo},'%')
+        </if>
+        <if test="request != null and request.outsourcerName != null and request.outsourcerName !=''">
+            and bboi.outsourcer_name like concat('%',#{request.outsourcerName},'%')
+        </if>
+        <if test="request != null and request.applicantName != null and request.applicantName !=''">
+            and bboa.applicant_name like concat('%',#{request.applicantName},'%')
+        </if>
+        <if test="request != null and request.applicantTimeStart != null and request.applicantTimeStart !=''">
+            and bboa.applicant_time &gt;= #{request.applicantTimeStart}
+        </if>
+        <if test="request != null and request.applicantTimeEnd != null and request.applicantTimeEnd !=''">
+            and bboa.applicant_time &lt;= #{request.applicantTimeEnd}
+        </if>
+        <if test="businessKeys != null">
+            and bboa.id in
+            <foreach collection="businessKeys" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
+        ORDER BY bboa.create_time DESC
+    </select>
 </mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceProtocolMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceProtocolMapper.xml
new file mode 100644
index 0000000..b7b2149
--- /dev/null
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceProtocolMapper.xml
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.mapper.business.BizBusinessOutsourceProtocolMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.business.BizBusinessOutsourceProtocol">
+        <id column="id" property="id" />
+        <result column="protocol_no" property="protocolNo" />
+        <result column="project_name" property="projectName" />
+        <result column="lab_code" property="labCode" />
+        <result column="group_code" property="groupCode" />
+        <result column="outsourcer_id" property="outsourcerId" />
+        <result column="remark" property="remark" />
+        <result column="outsource_no" property="outsourceNo" />
+        <result column="outsource_name" property="outsourceName" />
+        <result column="contacts" property="contacts" />
+        <result column="mobile" property="mobile" />
+        <result column="address" property="address" />
+        <result column="require_date" property="requireDate" />
+        <result column="outsource_cost" property="outsourceCost" />
+        <result column="director" property="director" />
+        <result column="item" property="item" />
+        <result column="requires" property="requires" />
+        <result column="create_user_id" property="createUserId" />
+        <result column="create_user_name" property="createUserName" />
+        <result column="approval_status" property="approvalStatus" />
+        <result column="process_id" property="processId" />
+        <result column="create_time" property="createTime" />
+        <result column="update_time" property="updateTime" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, protocol_no, project_name, lab_code, group_code, outsourcer_id, remark, outsource_no, outsource_name, contacts, mobile, address, require_date, outsource_cost, director, item, requires, create_user_id, create_user_name, approval_status, process_id, create_time, update_time
+    </sql>
+
+    <select id="selectMaxProtocolNo" resultType="java.lang.Long">
+        SELECT IFNULL(max(RIGHT(protocol_no, 3)), 0) from biz_business_outsource_protocol
+    </select>
+
+    <select id="selectBatchForApprovalList" resultMap="BaseResultMap">
+        SELECT *
+        FROM biz_business_outsource_protocol
+        WHERE 1=1
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
+            and approval_status = #{request.approvalStatus}
+        </if>
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
+            and create_user_id = #{request.createUserId}
+        </if>
+        <if test="request != null and request.protocolNo != null and request.protocolNo !=''">
+            and protocol_no like concat('%',#{request.protocolNo},'%')
+        </if>
+        <if test="request != null and request.outsourcerName != null and request.outsourcerName !=''">
+            and outsourcer_name like concat('%',#{request.outsourcerName},'%')
+        </if>
+        <if test="request != null and request.applicantName != null and request.applicantName !=''">
+            and create_user_name like concat('%',#{request.applicantName},'%')
+        </if>
+        <if test="request != null and request.applicantTimeStart != null and request.applicantTimeStart !=''">
+            and create_time &gt;= #{request.applicantTimeStart}
+        </if>
+        <if test="request != null and request.applicantTimeEnd != null and request.applicantTimeEnd !=''">
+            and create_time &lt;= #{request.applicantTimeEnd}
+        </if>
+        <if test="businessKeys != null">
+            and id in
+            <foreach collection="businessKeys" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
+        ORDER BY create_time DESC
+    </select>
+</mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourcerInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourcerInfoMapper.xml
index 510a80b..3049b54 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourcerInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourcerInfoMapper.xml
@@ -7,6 +7,8 @@
         <id column="id" property="id" />
         <result column="outsourcer_no" property="outsourcerNo" />
         <result column="outsourcer_name" property="outsourcerName" />
+        <result column="lab_code" property="labCode" />
+        <result column="group_code" property="groupCode" />
         <result column="outsourcer_brief_name" property="outsourcerBriefName" />
         <result column="outsourcer_size" property="outsourcerSize" />
         <result column="business_size" property="businessSize" />
@@ -55,32 +57,32 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, outsourcer_no, outsourcer_name, outsourcer_brief_name, outsourcer_size, business_size, grade, evaluation, tax_number, bank_account, bank_name, bank_account_number, postal_code, director, phone, fax, mobile, email, website, address_country, address_province, address_city, address_area, full_address, address_country_name, address_province_name, address_city_name, address_area_name, invoice_country, invoice_province, invoice_city, invoice_area, invoice_full_address, invoice_country_name, invoice_province_name, invoice_city_name, invoice_area_name, business_scope, business_content, minio_file_name, approval_status, process_id, remark, create_user_id, create_user_name, create_time, update_time
+        id, outsourcer_no, outsourcer_name, lab_code, group_code, outsourcer_brief_name, outsourcer_size, business_size, grade, evaluation, tax_number, bank_account, bank_name, bank_account_number, postal_code, director, phone, fax, mobile, email, website, address_country, address_province, address_city, address_area, full_address, address_country_name, address_province_name, address_city_name, address_area_name, invoice_country, invoice_province, invoice_city, invoice_area, invoice_full_address, invoice_country_name, invoice_province_name, invoice_city_name, invoice_area_name, business_scope, business_content, minio_file_name, approval_status, process_id, remark, create_user_id, create_user_name, create_time, update_time
     </sql>
 
     <select id="selectBatchForApprovalList" resultMap="BaseResultMap">
         SELECT *
         FROM biz_business_outsourcer_info
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.outsourcerNo != null and request.outsourcerNo !=''">
+        <if test="request != null and request.outsourcerNo != null and request.outsourcerNo !=''">
             and outsourcer_no like concat('%',#{request.outsourcerNo},'%')
         </if>
-        <if test="request.outsourcerName != null and request.outsourcerName !=''">
+        <if test="request != null and request.outsourcerName != null and request.outsourcerName !=''">
             and outsourcer_name like concat('%',#{request.outsourcerName},'%')
         </if>
-        <if test="request.director != null and request.director !=''">
+        <if test="request != null and request.director != null and request.director !=''">
             and director like concat('%',#{request.director},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
@@ -93,6 +95,6 @@
     </select>
 
     <select id="selectMaxNo" resultType="java.lang.Long">
-        SELECT IFNULL(max(RIGHT(outsourcer_no, 12)), 0) from biz_business_outsourcer_info
+        SELECT IFNULL(max(RIGHT(outsourcer_no, 3)), 0) from biz_business_outsourcer_info
     </select>
 </mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessSiteExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessSiteExecutiveInfoMapper.xml
index 135c5d0..3c5ae79 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessSiteExecutiveInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessSiteExecutiveInfoMapper.xml
@@ -38,25 +38,25 @@
         FROM biz_business_site_executive_info bsei
         LEFT JOIN biz_resource_customer_info rci ON bsei.customer_id = rci.id
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and bsei.approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and bsei.create_user_id = #{request.createUserId}
         </if>
-        <if test="request.siteExecutiveNo != null and request.siteExecutiveNo !=''">
+        <if test="request != null and request.siteExecutiveNo != null and request.siteExecutiveNo !=''">
             and bsei.site_executive_no like concat('%',#{request.siteExecutiveNo},'%')
         </if>
-        <if test="request.customerName != null and request.customerName !=''">
+        <if test="request != null and request.customerName != null and request.customerName !=''">
             and rci.outsourcer_name like concat('%',#{request.customerName},'%')
         </if>
-        <if test="request.applyName != null and request.applyName !=''">
+        <if test="request != null and request.applyName != null and request.applyName !=''">
             and bsei.apply_name like concat('%',#{request.applyName},'%')
         </if>
-        <if test="request.applyTimeStart != null and request.applyTimeStart !=''">
+        <if test="request != null and request.applyTimeStart != null and request.applyTimeStart !=''">
             and bsei.apply_time &gt;= #{request.applyTimeStart}
         </if>
-        <if test="request.applyTimeEnd != null and request.applyTimeEnd !=''">
+        <if test="request != null and request.applyTimeEnd != null and request.applyTimeEnd !=''">
             and bsei.apply_time &lt;= #{request.applyTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml
index 84d9e2a..6bd38a9 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml
@@ -105,6 +105,12 @@
         <if test="request.isUrgent != null and request.isUrgent !=''">
             AND bo.is_urgent = #{request.isUrgent}
         </if>
+        <if test="request.ids != null">
+            and blei.id in
+            <foreach collection="request.ids" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
         ORDER BY blei.update_time DESC
     </select>
 
@@ -137,6 +143,12 @@
         <if test="request.isUrgent != null and request.isUrgent !=''">
             AND bo.is_urgent = #{request.isUrgent}
         </if>
+        <if test="request.ids != null">
+            and blei.id in
+            <foreach collection="request.ids" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
         ORDER BY blei.update_time DESC
     </select>
 
diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardInfoMapper.xml
index 1a5551b..2ed8d17 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardInfoMapper.xml
@@ -45,12 +45,6 @@
         FROM biz_equipment_standard_info besi
         LEFT JOIN biz_equipment_standard_technology_relation bestr ON besi.standard_no = bestr.standard_no
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
-            and besi.approval_status = #{request.approvalStatus}
-        </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
-            and besi.create_user_id = #{request.createUserId}
-        </if>
         <if test="request.standardName != null and request.standardName !=''">
             and besi.standard_name like concat('%',#{request.standardName},'%')
         </if>
diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardTechnologyRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardTechnologyRelationMapper.xml
index fc7e16c..cd03c8c 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardTechnologyRelationMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardTechnologyRelationMapper.xml
@@ -6,6 +6,7 @@
     <resultMap id="BaseResultMap" type="com.casic.missiles.model.equipment.BizEquipmentStandardTechnologyRelation">
         <id column="id" property="id" />
         <result column="technology_file_id" property="technologyFileId" />
+        <result column="technology_file_no" property="technologyFileNo" />
         <result column="technology_file_name" property="technologyFileName" />
         <result column="standard_id" property="standardId" />
         <result column="standard_no" property="standardNo" />
@@ -14,7 +15,7 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, technology_file_id, technology_file_name, standard_id, remark
+        id, technology_file_id, technology_file_no, technology_file_name, standard_id, remark
     </sql>
 
 </mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceAuthorizeOrderMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceAuthorizeOrderMapper.xml
index ac5176c..554fe65 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceAuthorizeOrderMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceAuthorizeOrderMapper.xml
@@ -32,22 +32,22 @@
         SELECT *
         FROM biz_resource_authorize_order
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.orderNo != null and request.orderNo !=''">
+        <if test="request != null and request.orderNo != null and request.orderNo !=''">
             and order_no like concat('%',#{request.orderNo},'%')
         </if>
-        <if test="request.createUserName != null and request.createUserName !=''">
+        <if test="request != null and request.createUserName != null and request.createUserName !=''">
             and create_user_name like concat('%',#{request.createUserName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerExamineFormMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerExamineFormMapper.xml
index ab242f6..af7f98f 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerExamineFormMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerExamineFormMapper.xml
@@ -41,28 +41,28 @@
         SELECT *
         FROM biz_resource_customer_examine_form
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.formNo != null and request.formNo !=''">
+        <if test="request != null and request.formNo != null and request.formNo !=''">
             and form_no like concat('%',#{request.formNo},'%')
         </if>
-        <if test="request.labCode != null and request.labCode !=''">
+        <if test="request != null and request.labCode != null and request.labCode !=''">
             and lab_code like concat('%',#{request.labCode},'%')
         </if>
-        <if test="request.groupCode != null and request.groupCode !=''">
+        <if test="request != null and request.groupCode != null and request.groupCode !=''">
             and group_code like concat('%',#{request.groupCode},'%')
         </if>
-        <if test="request.createUserName != null and request.createUserName !=''">
+        <if test="request != null and request.createUserName != null and request.createUserName !=''">
             and create_user_name like concat('%',#{request.createUserName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerInfoMapper.xml
index fa8ffbc..06a2798 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerInfoMapper.xml
@@ -33,25 +33,25 @@
         SELECT *
         FROM biz_resource_customer_info
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.customerNo != null and request.customerNo !=''">
+        <if test="request != null and request.customerNo != null and request.customerNo !=''">
             and customer_no like concat('%',#{request.customerNo},'%')
         </if>
-        <if test="request.customerName != null and request.customerName !=''">
+        <if test="request != null and request.customerName != null and request.customerName !=''">
             and customer_name like concat('%',#{request.customerName},'%')
         </if>
-        <if test="request.contacts != null and request.contacts !=''">
+        <if test="request != null and request.contacts != null and request.contacts !=''">
             and contacts like concat('%',#{request.contacts},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerSuggestFormMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerSuggestFormMapper.xml
index 28f5bb2..1806662 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerSuggestFormMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerSuggestFormMapper.xml
@@ -33,28 +33,28 @@
         SELECT *
         FROM biz_resource_customer_suggest_form
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.formNo != null and request.formNo !=''">
+        <if test="request != null and request.formNo != null and request.formNo !=''">
             and form_no like concat('%',#{request.formNo},'%')
         </if>
-        <if test="request.customerName != null and request.customerName !=''">
+        <if test="request != null and request.customerName != null and request.customerName !=''">
             and customer_name like concat('%',#{request.customerName},'%')
         </if>
-        <if test="request.customerDeptName != null and request.customerDeptName !=''">
+        <if test="request != null and request.customerDeptName != null and request.customerDeptName !=''">
             and customer_dept_name like concat('%',#{request.customerDeptName},'%')
         </if>
-        <if test="request.createUserName != null and request.createUserName !=''">
+        <if test="request != null and request.createUserName != null and request.createUserName !=''">
             and create_user_name like concat('%',#{request.createUserName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSealUseNoteMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSealUseNoteMapper.xml
index ab37bc1..b02bb33 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSealUseNoteMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSealUseNoteMapper.xml
@@ -29,32 +29,32 @@
     </sql>
 
     <select id="selectBatchForApprovalList" resultMap="BaseResultMap">
-        SELECT *
+        SELECT brsun.*, brsi.seal_name, brsi.seal_type, brsi.approver_name
         FROM biz_resource_seal_use_note brsun
         JOIN biz_resource_seal_info brsi ON brsun.seal_id = brsi.id
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and brsun.approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and brsun.create_user_id = #{request.createUserId}
         </if>
-        <if test="request.sealName != null and request.sealName !=''">
+        <if test="request != null and request.sealName != null and request.sealName !=''">
             and brsi.seal_name like concat('%',#{request.sealName},'%')
         </if>
-        <if test="request.sealType != null and request.sealType !=''">
+        <if test="request != null and request.sealType != null and request.sealType !=''">
             and brsi.seal_type = #{request.sealType}
         </if>
-        <if test="request.applyDeptName != null and request.applyDeptName !=''">
+        <if test="request != null and request.applyDeptName != null and request.applyDeptName !=''">
             and brsun.apply_dept_name like concat('%',#{request.applyDeptName},'%')
         </if>
-        <if test="request.applyUserName != null and request.applyUserName !=''">
+        <if test="request != null and request.applyUserName != null and request.applyUserName !=''">
             and brsun.apply_user_name like concat('%',#{request.applyUserName},'%')
         </if>
-        <if test="request.applyTimeStart != null and request.applyTimeStart !=''">
+        <if test="request != null and request.applyTimeStart != null and request.applyTimeStart !=''">
             and brsun.apply_time &gt;= #{request.applyTimeStart}
         </if>
-        <if test="request.applyTimeEnd != null and request.applyTimeEnd !=''">
+        <if test="request != null and request.applyTimeEnd != null and request.applyTimeEnd !=''">
             and brsun.apply_time &lt;= #{request.applyTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml
index 119bf7d..4f8392a 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml
@@ -31,6 +31,12 @@
         <if test="request.deptName != null and request.deptName !=''">
             and brsi.dept_name like concat('%',#{request.deptName},'%')
         </if>
+        <if test="request.ids != null">
+            and brsv.id in
+            <foreach collection="request.ids" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
         ORDER BY brsv.grant_date DESC
     </select>
 
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSupplierInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSupplierInfoMapper.xml
index fe8d399..e8ce7ef 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSupplierInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSupplierInfoMapper.xml
@@ -48,28 +48,28 @@
         SELECT *
         FROM biz_resource_supplier_info
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.supplierNo != null and request.supplierNo !=''">
+        <if test="request != null and request.supplierNo != null and request.supplierNo !=''">
             and supplier_no like concat('%',#{request.supplierNo},'%')
         </if>
-        <if test="request.supplierName != null and request.supplierName !=''">
+        <if test="request != null and request.supplierName != null and request.supplierName !=''">
             and supplier_name like concat('%',#{request.supplierName},'%')
         </if>
-        <if test="request.director != null and request.director !=''">
+        <if test="request != null and request.director != null and request.director !=''">
             and director like concat('%',#{request.director},'%')
         </if>
-        <if test="request.supplierType != null and request.supplierType !=''">
+        <if test="request != null and request.supplierType != null and request.supplierType !=''">
             and supplier_type = #{request.supplierType}
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/EnvLocationInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/EnvLocationInfoMapper.xml
new file mode 100644
index 0000000..68bcf10
--- /dev/null
+++ b/casic-metering-dao/src/main/resources/mapper/resource/EnvLocationInfoMapper.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.mapper.resource.EnvLocationInfoMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.resource.EnvLocationInfo">
+        <id column="id" property="id" />
+        <result column="location_no" property="locationNo" />
+        <result column="location_name" property="locationName" />
+        <result column="location_position" property="locationPosition" />
+        <result column="create_user_id" property="createUserId" />
+        <result column="create_user" property="createUser" />
+        <result column="create_time" property="createTime" />
+        <result column="update_time" property="updateTime" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, location_no, location_name, location_position, create_user_id, create_user, create_time, update_time
+    </sql>
+
+    <select id="selectLocationListPage" resultType="com.casic.missiles.dto.resource.environment.LocationListResponse">
+        SELECT *
+        FROM env_location_info
+        WHERE 1=1
+        <if test="request.locationNo != null and request.locationNo !=''">
+            AND location_no LIKE concat('%',#{request.locationNo},'%')
+        </if>
+        <if test="request.locationName != null and request.locationName !=''">
+            AND location_name LIKE concat('%',#{request.locationName},'%')
+        </if>
+        ORDER BY create_time DESC
+    </select>
+
+</mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml
index b28c18f..8854047 100644
--- a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml
@@ -11,7 +11,6 @@
         <result column="sign_desc" property="signDesc" />
         <result column="sign_director" property="signDirector" />
         <result column="sign_user_id" property="signUserId" />
-        <result column="sign_type" property="signType" />
         <result column="minio_file_name" property="minioFileName" />
         <result column="create_time" property="createTime" />
         <result column="update_time" property="updateTime" />
@@ -28,7 +27,6 @@
         <result column="sign_name" property="signName" />
         <result column="sign_desc" property="signDesc" />
         <result column="sign_director" property="signDirector" />
-        <result column="sign_type" property="signType" />
         <result column="sign_user_id" property="signUserId" />
         <result column="minio_file_name" property="minioFileName" />
         <result column="create_time" property="createTime" />
@@ -62,4 +60,58 @@
         JOIN system_sign_user_relation ssur ON ss.id = ssur.sign_id
         WHERE ssur.user_id = #{userId}
     </select>
+
+    <select id="selectSignListPage" resultMap="BaseResultMap">
+        SELECT ss.*, sd.SIMPLE_NAME AS deptName
+        FROM system_sign ss
+        LEFT JOIN sys_user su ON su.id = ss.sign_user_id
+        LEFT JOIN sys_dept sd ON sd.id = su.dept_id
+        WHERE 1=1
+        <if test="request.signNo != null and request.signNo !=''">
+            AND ss.sign_no LIKE concat('%',#{request.signNo},'%')
+        </if>
+        <if test="request.signName != null and request.signName !=''">
+            AND ss.sign_name LIKE concat('%',#{request.signName},'%')
+        </if>
+        <if test="request.signDirector != null and request.signDirector !=''">
+            AND ss.sign_director LIKE concat('%',#{request.signDirector},'%')
+        </if>
+        <if test="request.signUserId != null and request.signUserId !=''">
+            AND ss.sign_user_id = #{request.signUserId}
+        </if>
+        <if test="request.createStartTime != null and request.createStartTime !=''">
+            AND DATE_FORMAT(ss.create_time,'%Y-%m-%d') &gt;= DATE_FORMAT(#{request.createStartTime},'%Y-%m-%d')
+        </if>
+        <if test="request.createEndTime != null and request.createEndTime !=''">
+            AND DATE_FORMAT(ss.create_time,'%Y-%m-%d')  &lt;= DATE_FORMAT(#{request.createEndTime},'%Y-%m-%d')
+        </if>
+        ORDER BY ss.create_time DESC
+    </select>
+
+    <select id="selectSignList" resultMap="BaseResultMap">
+        SELECT ss.*, sd.SIMPLE_NAME AS deptName
+        FROM system_sign ss
+        LEFT JOIN sys_user su ON su.id = ss.sign_user_id
+        LEFT JOIN sys_dept sd ON sd.id = su.dept_id
+        WHERE 1=1
+        <if test="request.signNo != null and request.signNo !=''">
+            AND ss.sign_no LIKE concat('%',#{request.signNo},'%')
+        </if>
+        <if test="request.signName != null and request.signName !=''">
+            AND ss.sign_name LIKE concat('%',#{request.signName},'%')
+        </if>
+        <if test="request.signDirector != null and request.signDirector !=''">
+            AND ss.sign_director LIKE concat('%',#{request.signDirector},'%')
+        </if>
+        <if test="request.signUserId != null and request.signUserId !=''">
+            AND ss.sign_user_id = #{request.signUserId}
+        </if>
+        <if test="request.createStartTime != null and request.createStartTime !=''">
+            AND DATE_FORMAT(ss.create_time,'%Y-%m-%d') &gt;= DATE_FORMAT(#{request.createStartTime},'%Y-%m-%d')
+        </if>
+        <if test="request.createEndTime != null and request.createEndTime !=''">
+            AND DATE_FORMAT(ss.create_time,'%Y-%m-%d')  &lt;= DATE_FORMAT(#{request.createEndTime},'%Y-%m-%d')
+        </if>
+        ORDER BY ss.create_time DESC
+    </select>
 </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 515050a..60f530b 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
@@ -47,8 +47,8 @@
     String STORAGE_LOCATION = "bizStorageLocation";
     //计量专业
     String MEASURE_MAJOR = "bizMeasureMajor";
-    //管理状态
-    String MANAGER_STATE = "bizManagerState";
+    //标准装置管理状态
+    String STANDARD_MANAGER_STATE = "bizStandardManagerState";
 
     /**
      * 资源管理 字典code
@@ -95,8 +95,6 @@
     String MEASURE_STATUS = "measureStatus";
     //检定方式
     String MEASURE_TYPE = "measureType";
-    //标识打印标志类型
-    String IDENTIFY_PRINT_TYPE = "bizBusinessIdentify";
     //变更类型
     String REPORT_CHANGE_TYPE = "bizCertChangeType";
     //规模类型
@@ -111,19 +109,24 @@
     String MEASURE_CATEGORY = "measureCategory";
     //检定结果
     String MEASURE_RESULT = "measureResult";
+    //分包原因
+    String OUTSOURCE_REASON = "outsourceReason";
+
+    /**
+     * 系统管理
+     */
+    String TEMPLATE_TYPE = "templateType";
+
 
     /**
      * 标准装置 字典code
      */
     //类别
     String STANDARD_CATEGORY = "standardCategory";
-    //管理状态
-    String STANDARD_MANAGER_STATE = "standardManagerState";
     //标准等级
     String STANDARD_LEVEL = "standardLevel";
     //传递范围
     String STANDARD_TRANSMIT_RANGE = "transmitRange";
-
     //资本来源
     String CAPITAL_SOURCE = "capitalSource";
     //标准装置-申请类型
@@ -148,8 +151,6 @@
     String CERTIFICATE_CLASS = "certificationClass";
     //证书管理-检校专业
     String CALIBRATION_MAJOR = "calibrationMajor";
-    //分包原因
-    String OUTSOURCE_REASON = "outsourceReason";
 
     /**
      * 工作台
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/BaseApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/BaseApprovalListRequest.java
index 73c12c1..80d7424 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/BaseApprovalListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/BaseApprovalListRequest.java
@@ -6,6 +6,7 @@
 
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotEmpty;
+import java.util.List;
 
 /**
  * @Description:
@@ -19,14 +20,14 @@
      * 表单id
      */
     @NotBlank(message = "表单id不能为空")
-    @ApiModelProperty(value = "表单id（流程定义对应的表单id，等价于业务id）", dataType = "String")
+    @ApiModelProperty(value = "表单id（流程定义对应的表单id，等价于业务id），导出接口不用传", dataType = "String")
     private String formId;
 
     /**
      * 审批状态类型，对应ApprovalStatusEnum
      */
     @NotEmpty(message = "审批状态类型不能为空")
-    @ApiModelProperty(value = "审批状态类型code", dataType = "String")
+    @ApiModelProperty(value = "审批状态类型code，导出接口不用传", dataType = "String")
     private String approvalStatus;
 
     @ApiModelProperty(hidden = true)
@@ -34,4 +35,7 @@
 
     @ApiModelProperty(hidden = true)
     private Long createUserId;
+
+    @ApiModelProperty(value = "导出ids", dataType = "List")
+    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificatePrintApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificatePrintApprovalListRequest.java
index b93d1c9..3cc2f4e 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificatePrintApprovalListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificatePrintApprovalListRequest.java
@@ -5,8 +5,6 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import java.util.List;
-
 /**
  * @Description:
  * @Author: wangpeng
@@ -38,7 +36,4 @@
 
     @ApiModelProperty(value = "创建结束时间", dataType = "String")
     private String createTimeEnd;
-
-    @ApiModelProperty(value = "导出ids", dataType = "List")
-    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportApprovalListRequest.java
index 4f7a038..c115847 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportApprovalListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportApprovalListRequest.java
@@ -5,8 +5,6 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import java.util.List;
-
 /**
  * @Description:
  * @Author: wangpeng
@@ -15,6 +13,8 @@
 @ApiModel
 @Data
 public class CertificateReportApprovalListRequest extends BaseApprovalListRequest {
+    @ApiModelProperty(value = "委托方id", dataType = "String")
+    private Long customerId;
 
     @ApiModelProperty(value = "证书报告编号", dataType = "String")
     private String certificateReportNo;
@@ -37,6 +37,4 @@
     @ApiModelProperty(value = "检校结束时间", dataType = "String")
     private String calibrationTimeEnd;
 
-    @ApiModelProperty(value = "导出ids", dataType = "List")
-    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/identify/IdentifyListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/identify/IdentifyListRequest.java
index 1b87ae6..f019203 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/identify/IdentifyListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/identify/IdentifyListRequest.java
@@ -4,6 +4,8 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * @Description:
  * @Author: wangpeng
@@ -26,4 +28,7 @@
 
     @ApiModelProperty(value = "打印结束时间", dataType = "String")
     private String createTimeEnd;
+
+    @ApiModelProperty(value = "导出ids", dataType = "List")
+    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListRequest.java
index 1264883..62415fb 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListRequest.java
@@ -7,6 +7,7 @@
 import lombok.Data;
 
 import javax.validation.constraints.NotBlank;
+import java.util.List;
 
 @Data
 @ApiModel
@@ -37,4 +38,6 @@
     @ApiModelProperty(value = "是否加急（1是0否null全部）", dataType = "Integer")
     private String isUrgent;
 
+    @ApiModelProperty(value = "导出ids", dataType = "List")
+    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListRequest.java
index 5201d7b..499760a 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListRequest.java
@@ -17,6 +17,9 @@
     @ApiModelProperty(value = "任务单编号", dataType = "String")
     private String orderNo;
 
+    @ApiModelProperty(value = "委托方id", dataType = "Long")
+    private Long customerId;
+
     @ApiModelProperty(value = "委托方名称", dataType = "String")
     private String customerName;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OrderSampleDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OrderSampleDTO.java
new file mode 100644
index 0000000..796edc0
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OrderSampleDTO.java
@@ -0,0 +1,19 @@
+package com.casic.missiles.dto.business.outsource;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/8/24 11:38
+ */
+@ApiModel
+@Data
+public class OrderSampleDTO {
+    @ApiModelProperty(value = "任务单id", dataType = "Long")
+    private Long orderId;
+    @ApiModelProperty(value = "受检设备id", dataType = "Long")
+    private Long sampleId;
+}

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java
index bb0c50f..13a699b 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java
@@ -12,6 +12,7 @@
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.IGeneralApprovalService;
+import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
@@ -19,6 +20,7 @@
 import org.springframework.web.bind.annotation.RequestBody;
 
 import javax.validation.Valid;
+import java.util.List;
 import java.util.Objects;
 
 /**
@@ -117,4 +119,17 @@
         }
         return baseApprovalService.failUpdate(request);
     }
+
+    public List<O> exportList(@RequestBody @Valid R request) throws Exception {
+        List<O> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = baseApprovalService.listExportByIds(request.getIds());
+        } else {
+            list = baseApprovalService.listExport(request);
+        }
+        for (O record : list) {
+            DictCodeUtils.convertDictCodeToName(record);
+        }
+        return list;
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java
index 8a90961..d775831 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java
@@ -5,6 +5,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.business.certificate.CertificateChangeApplyApprovalListRequest;
 import com.casic.missiles.dto.business.certificate.CertificateChangeApplySaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessCertificateChangeApply;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
@@ -20,6 +21,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -48,4 +50,12 @@
         }
         return changeApplyService.saveChangeApply(request);
     }
+
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody CertificateChangeApplyApprovalListRequest request) throws Exception {
+        List<BizBusinessCertificateChangeApply> list = super.exportList(request);
+        super.exportExcel(BizBusinessCertificateChangeApply.class, list, ExportEnum.CERTIFICATE_CHANGE_APPLY.getSheetName());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java
index 5fc4b07..af8230e 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java
@@ -9,6 +9,7 @@
 import com.casic.missiles.dto.business.certificate.CertificatePrintApprovalListRequest;
 import com.casic.missiles.dto.business.certificate.CertificatePrintListResponse;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.enums.business.CertificatePrintStatusEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessCertificatePrintLog;
@@ -18,10 +19,16 @@
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.io.IOException;
+import java.util.List;
 import java.util.Objects;
 
 /**
@@ -98,4 +105,16 @@
         });
         return certificatePrintService.certificatePrintLog(idDTO.getId());
     }
+
+    @ApiOperation("证书打印审批导出")
+    @PostMapping("/listExport")
+    public void exportList(@RequestBody CertificatePrintApprovalListRequest request) throws IOException {
+        List<CertificatePrintListResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = certificatePrintService.listByIds(request.getIds());
+        } else {
+            list = certificatePrintService.list(request);
+        }
+        super.exportExcel(CertificatePrintListResponse.class, list, ExportEnum.CERTIFICATE_PRINT.getSheetName());
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java
index 63b06dc..6b2efd5 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java
@@ -6,6 +6,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.business.certificate.CertificateReportApprovalListRequest;
 import com.casic.missiles.dto.business.certificate.CertificateReportSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessCertificateReport;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
@@ -21,6 +22,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -50,7 +52,7 @@
         return certificateReportService.saveCertificateReport(request);
     }
 
-    @ApiOperation("证书审批详情（基本信息）")
+    @ApiOperation("详情（基本信息）")
     @PostMapping("/detail")
     public ReturnDTO<BizBusinessCertificateReport> detail(@RequestBody @Valid BaseDetailRequest request, BindingResult bindingResult) throws Exception {
         if(bindingResult.hasErrors()){
@@ -59,4 +61,11 @@
         return certificateReportService.detail(request);
     }
 
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody CertificateReportApprovalListRequest request) throws Exception {
+        List<BizBusinessCertificateReport> list = super.exportList(request);
+        super.exportExcel(BizBusinessCertificateReport.class, list, ExportEnum.CERTIFICATE_REPORT.getSheetName());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java
index 46b26bd..57c0809 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java
@@ -10,20 +10,21 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.business.identify.IdentifyListRequest;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessIdentifyInfo;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.business.IBizBusinessIdentifyInfoService;
+import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import javax.validation.Valid;
+import java.util.List;
 import java.util.Objects;
 
 /**
@@ -57,16 +58,13 @@
         return identifyInfoService.addIdentify(identifyInfo);
     }
 
-    @ApiOperation("标识打印更新")
+    @ApiOperation("标识打印更新（更新打印时间）")
     @PostMapping("/update")
-    public ReturnDTO updateIdentify(@RequestBody @Valid BizBusinessIdentifyInfo identifyInfo, BindingResult bindingResult) {
-        Assert.isFalse(Objects.isNull(identifyInfo.getId()), () -> {
+    public ReturnDTO updateIdentify(@RequestBody @Valid IdDTO idDTO) {
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        Assert.isFalse(bindingResult.hasErrors(), () -> {
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        });
-        return identifyInfoService.updateIdentify(identifyInfo);
+        return identifyInfoService.updateIdentify(idDTO.getId());
     }
 
     @ApiOperation("标识打印删除")
@@ -77,4 +75,37 @@
         });
         return identifyInfoService.deleteIdentify(idDTO.getId());
     }
+
+    @ApiOperation("标识打印导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody @Valid IdentifyListRequest request, BindingResult bindingResult) throws Exception {
+        if (bindingResult.hasErrors()) {
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        List<BizBusinessIdentifyInfo> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = identifyInfoService.listByIds(request.getIds());
+        } else {
+            list = identifyInfoService.list(request);
+        }
+        for (BizBusinessIdentifyInfo record : list) {
+            DictCodeUtils.convertDictCodeToName(record);
+        }
+        super.exportExcel(BizBusinessIdentifyInfo.class, list, ExportEnum.IDENTIFY_EXPORT.getSheetName());
+    }
+
+
+    // TODO: 2023/8/23 查询设备信息，4个底部按钮查设备（按钮的作用就是前端用来调不同接口、用来区分中间即将展示的标识），前端弹窗选设备，在确定保存时前端根据底部按钮判断传入设备类型deviceType字典code
+    // TODO: 2023/8/23 接口：查受检设备（第1个按钮），查设备台账（后3个按钮同一接口），查询之后前端根据标志类型的不同加到中间页面时进行判断（按产品给的对应表）
+    // TODO: 2023/8/23 提供二维码接口，前端在加到中间页面时调用一下
+
+    @ApiOperation("设备二维码")
+    @PostMapping("/equipment/qrCode")
+    public ReturnDTO<String> equipmentQrCode(@RequestBody @Valid IdDTO idDTO) {
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return identifyInfoService.equipmentQrCode(idDTO.getId());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java
index 707be6e..7e0453d 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java
@@ -117,7 +117,7 @@
     }
 
     @ApiOperation("任务单导出")
-    @PostMapping("/export")
+    @PostMapping("/listExport")
     public void orderExport(@RequestBody @Valid OrderListRequest request, HttpServletResponse response) {
         businessOrderService.orderExport(request, response);
     }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java
index 529a6ce..51432be 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java
@@ -1,9 +1,28 @@
 package com.casic.missiles.controller.business;
 
+import com.casic.missiles.controller.GeneralApprovalController;
+import com.casic.missiles.dto.BaseApprovalSubmitRequest;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.business.outsource.OutsourceAssessApprovalListRequest;
+import com.casic.missiles.dto.business.outsource.OutsourceAssessSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
+import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.model.business.BizBusinessOutsourceAssess;
+import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
+import com.casic.missiles.service.IGeneralApprovalService;
+import com.casic.missiles.service.business.IBizBusinessOutsourceAssessService;
 import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.BindingResult;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.validation.Valid;
+import java.util.List;
+
 /**
  * <p>
  * 计量检定业务-分包管理-测试、校准或检定工作分包评审表 前端控制器
@@ -15,6 +34,27 @@
 @Api(tags = "分包管理-测试、校准或检定工作分包评审表")
 @RestController
 @RequestMapping("/business/outsource/assess")
-public class BizBusinessOutsourceAssessController {
+public class BizBusinessOutsourceAssessController extends GeneralApprovalController<BizBusinessOutsourceAssess, BizBusinessOutsourceAssess, OutsourceAssessApprovalListRequest, BaseApprovalSubmitRequest> {
+    @Autowired
+    private IBizBusinessOutsourceAssessService outsourceAssessService;
 
+    public BizBusinessOutsourceAssessController(IGeneralApprovalService<BizBusinessOutsourceAssess, BizBusinessOutsourceAssess, OutsourceAssessApprovalListRequest, BaseApprovalSubmitRequest> baseApprovalService) {
+        super(baseApprovalService);
+    }
+
+    @ApiOperation("草稿箱-保存")
+    @PostMapping("/save")
+    public ReturnDTO<OutsourceAssessSaveResponse> saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceAssess request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        return outsourceAssessService.saveOutsourceAssess(request);
+    }
+
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception {
+        List<BizBusinessOutsourceAssess> list = super.exportList(request);
+        super.exportExcel(BizBusinessOutsourceAssess.class, list, ExportEnum.OUTSOURCE_ASSESS.getSheetName());
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java
new file mode 100644
index 0000000..9adef18
--- /dev/null
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java
@@ -0,0 +1,60 @@
+package com.casic.missiles.controller.business;
+
+import com.casic.missiles.controller.GeneralApprovalController;
+import com.casic.missiles.dto.BaseApprovalSubmitRequest;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.business.outsource.OutsourceProtocolApprovalListRequest;
+import com.casic.missiles.dto.business.outsource.OutsourceProtocolSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
+import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.model.business.BizBusinessOutsourceProtocol;
+import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
+import com.casic.missiles.service.IGeneralApprovalService;
+import com.casic.missiles.service.business.IBizBusinessOutsourceProtocolService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.BindingResult;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.validation.Valid;
+import java.util.List;
+
+/**
+ * <p>
+ * 计量检定业务-分包管理-测试、校准或检定工作分包协议书 前端控制器
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-08-24
+ */
+@Api(tags = "分包管理-测试、校准或检定工作分包协议书")
+@RestController
+@RequestMapping("/business/outsource/protocol")
+public class BizBusinessOutsourceProtocolController extends GeneralApprovalController<BizBusinessOutsourceProtocol, BizBusinessOutsourceProtocol, OutsourceProtocolApprovalListRequest, BaseApprovalSubmitRequest> {
+    @Autowired
+    private IBizBusinessOutsourceProtocolService outsourceProtocolService;
+
+    public BizBusinessOutsourceProtocolController(IGeneralApprovalService<BizBusinessOutsourceProtocol, BizBusinessOutsourceProtocol, OutsourceProtocolApprovalListRequest, BaseApprovalSubmitRequest> baseApprovalService) {
+        super(baseApprovalService);
+    }
+
+    @ApiOperation("草稿箱-保存")
+    @PostMapping("/save")
+    public ReturnDTO<OutsourceProtocolSaveResponse> saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceProtocol request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        return outsourceProtocolService.saveOutsourceProtocol(request);
+    }
+
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody OutsourceProtocolApprovalListRequest request) throws Exception {
+        List<BizBusinessOutsourceProtocol> list = super.exportList(request);
+        super.exportExcel(BizBusinessOutsourceProtocol.class, list, ExportEnum.OUTSOURCE_PROTOCOL.getSheetName());
+    }
+}
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java
index 097f645..f0f0943 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java
@@ -17,7 +17,6 @@
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.IGeneralApprovalService;
 import com.casic.missiles.service.business.IBizBusinessOutsourcerInfoService;
-import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -71,19 +70,8 @@
 
     @ApiOperation("分包方导出")
     @PostMapping("/listExport")
-    public void export(@RequestBody @Valid OutsourcerInfoApprovalListRequest request, BindingResult bindingResult) throws Exception {
-        if (bindingResult.hasErrors()) {
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        }
-        List<BizBusinessOutsourcerInfo> list;
-        if (!CollectionUtils.isEmpty(request.getIds())) {
-            list = outsourcerInfoService.listByIds(request.getIds());
-        } else {
-            list = outsourcerInfoService.list(request);
-        }
-        for (BizBusinessOutsourcerInfo record : list) {
-            DictCodeUtils.convertDictCodeToName(record);
-        }
+    public void export(@RequestBody OutsourcerInfoApprovalListRequest request) throws Exception {
+        List<BizBusinessOutsourcerInfo> list = super.exportList(request);
         super.exportExcel(BizBusinessOutsourcerInfo.class, list, ExportEnum.OUTSOURCER_EXPORT.getSheetName());
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java
index c2cbf9f..0410918 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java
@@ -17,11 +17,9 @@
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.IGeneralApprovalService;
 import com.casic.missiles.service.business.IBizBusinessSiteExecutiveInfoService;
-import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -60,7 +58,7 @@
         return siteExecutiveInfoService.saveSiteExecutiveInfo(siteExecutiveInfo);
     }
 
-    @ApiOperation("现场检测详情")
+    @ApiOperation("详情")
     @PostMapping("/detail")
     public ReturnDTO<SiteExecutiveDetailResponse> siteExecutiveDetail(@RequestBody @Valid IdDTO idDTO) throws Exception {
         Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
@@ -69,21 +67,10 @@
         return ReturnUtil.success(siteExecutiveInfoService.detail(idDTO.getId()));
     }
 
-    @ApiOperation("现场检测导出")
+    @ApiOperation("导出")
     @PostMapping("/listExport")
-    public void export(@RequestBody @Valid SiteExecutiveApprovalListRequest request, BindingResult bindingResult) throws Exception {
-        if (bindingResult.hasErrors()) {
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        }
-        List<SiteExecutiveApprovalListResponse> list;
-        if (!CollectionUtils.isEmpty(request.getIds())) {
-            list = siteExecutiveInfoService.listInfoByIds(request.getIds());
-        } else {
-            list = siteExecutiveInfoService.listInfo(request);
-        }
-        for (SiteExecutiveApprovalListResponse record : list) {
-            DictCodeUtils.convertDictCodeToName(record);
-        }
+    public void export(@RequestBody SiteExecutiveApprovalListRequest request) throws Exception {
+        List<SiteExecutiveApprovalListResponse> list = super.exportList(request);
         super.exportExcel(SiteExecutiveApprovalListResponse.class, list, ExportEnum.SITE_EXECUTIVE_EXPORT.getSheetName());
     }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
index 7e793cd..a92e209 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
@@ -55,7 +55,7 @@
 
     @ApiOperation("设备收发列表导出")
     @PostMapping("/export")
-    public void exportList(@RequestBody @Valid SampleDispatchListRequest request) throws IOException {
+    public void exportList(@RequestBody SampleDispatchListRequest request) throws IOException {
         List<SampleDispatchListResponse> list;
         if (!CollectionUtils.isEmpty(request.getIds())) {
             list = dispatchService.listByIds(request.getIds());
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java
index cdc77fc..d120fd4 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java
@@ -7,6 +7,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.business.labExecutive.*;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.business.IBusinessLabExecutiveInfoService;
@@ -14,6 +15,7 @@
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.*;
 
@@ -32,7 +34,7 @@
     @Autowired
     private IBusinessLabExecutiveInfoService labExecutiveInfoService;
 
-    @ApiOperation("实验室检测-部门检测-查询各状态列表（待检测、检测中、检测完）")
+    @ApiOperation("实验室任务-查询各状态列表（待检测、检测中、检测完）")
     @PostMapping("/deptExecutive/List")
     public ReturnDTO<PageInfoBT<SampleLabExecutiveListResponse>> queryDeptExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
@@ -43,10 +45,19 @@
         return ReturnUtil.success(super.packForBT(labExecutiveInfoService.deptLabExecutiveListPage(page, labExecutiveListRequest)));
     }
 
-    /**
-     * 实验室检测-我的检测-查询各状态列表（待检测、检测中、检测完）
-     */
-    @ApiOperation("实验室检测-我的检测-查询各状态列表（待检测、检测中、检测完）")
+    @ApiOperation("实验室任务导出")
+    @PostMapping("/deptExecutive/export")
+    public void deptExportList(@RequestBody @Valid SampleLabExecutiveListRequest request) throws Exception {
+        List<SampleLabExecutiveListResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = labExecutiveInfoService.deptLabExecutiveListByIds(request.getMeasureStatus(), request.getIds());
+        } else {
+            list = labExecutiveInfoService.deptLabExecutiveList(request);
+        }
+        super.exportExcel(SampleLabExecutiveListResponse.class, list, ExportEnum.DEPT_EXECUTIVE_TASK.getSheetName());
+    }
+
+    @ApiOperation("我的任务-查询各状态列表（待检测、检测中、检测完）")
     @PostMapping("/myExecutive/list")
     public ReturnDTO<PageInfoBT<SampleLabExecutiveListResponse>> queryMyExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
@@ -57,19 +68,25 @@
         return ReturnUtil.success(super.packForBT(labExecutiveInfoService.myLabExecutiveListPage(page, labExecutiveListRequest)));
     }
 
-    /**
-     * 实验室检测-我的检测-查询各状态样品数量（待检测、检测中、检测完）
-     */
-    @ApiOperation("实验室检测-我的检测-查询各状态样品数量（待检测、检测中、检测完）")
+    @ApiOperation("我的任务导出")
+    @PostMapping("/myExecutive/export")
+    public void exportList(@RequestBody @Valid SampleLabExecutiveListRequest request) throws Exception {
+        List<SampleLabExecutiveListResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = labExecutiveInfoService.myLabExecutiveListByIds(request.getMeasureStatus(), request.getIds());
+        } else {
+            list = labExecutiveInfoService.myLabExecutiveList(request);
+        }
+        super.exportExcel(SampleLabExecutiveListResponse.class, list, ExportEnum.MY_EXECUTIVE_TASK.getSheetName());
+    }
+
+    @ApiOperation("我的任务-查询各状态样品数量（待检测、检测中、检测完）")
     @GetMapping("/myExecutive/amount")
     public ReturnDTO<List<SampleAmountResponse>> queryMyExecutiveAmount() {
         return ReturnUtil.success(labExecutiveInfoService.myExecutiveAmount());
     }
 
-    /**
-     * 实验室检测-部门检测-分配（分配给具体人员）
-     */
-    @ApiOperation("实验室检测-部门检测-分配按钮（分配给具体人员）")
+    @ApiOperation("实验室任务-分配按钮（分配给具体人员）")
     @PostMapping("/deptExecutive/allocate")
     public ReturnDTO allocateStaff(@RequestBody @Valid SampleAllocateRequest sampleAllocateRequest, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -78,10 +95,7 @@
         return labExecutiveInfoService.allocateStaff(sampleAllocateRequest);
     }
 
-    /**
-     * 实验室检测-我的检测-检定人扫描收入（待检测->检测中）
-     */
-    @ApiOperation("实验室检测-我的检测-检定人扫描收入（待检测->检测中）")
+    @ApiOperation("我的任务-检定人扫描收入（待检测->检测中）")
     @PostMapping("/myExecutive/receive")
     public ReturnDTO sampleReceive(@RequestBody @Valid List<SampleOperateRequest> requestList, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -90,10 +104,7 @@
         return labExecutiveInfoService.sampleReceive(requestList);
     }
 
-    /**
-     * 实验室检测-负责人/检定人扫描检完（检测中->检测完）
-     */
-    @ApiOperation("实验室检测-负责人/检定人扫描检完（检测中->检测完）")
+    @ApiOperation("实验室任务-负责人/检定人扫描检完（检测中->检测完）")
     @PostMapping("/myExecutive/complete")
     public ReturnDTO sampleExecutiveComplete(@RequestBody @Valid List<SampleOperateRequest> requestList, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -102,10 +113,7 @@
         return labExecutiveInfoService.sampleExecutiveComplete(requestList);
     }
 
-    /**
-     * 实验室检测-部门检测/我的检测 编辑（只能修改应出具证书）
-     */
-    @ApiOperation("实验室检测-部门检测/我的检测 编辑（只能修改应出具证书）")
+    @ApiOperation("实验室任务/我的任务 编辑（只能修改应出具证书）")
     @PostMapping("/executive/update")
     public ReturnDTO updateExecutive(@RequestBody @Valid UpdateExecutiveRequest request, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -114,10 +122,7 @@
         return labExecutiveInfoService.updateExecutive(request);
     }
 
-    /**
-     * 实验室检测-部门检测/我的检测 详情
-     */
-    @ApiOperation("实验室检测-部门检测/我的检测 详情")
+    @ApiOperation("实验室任务/我的任务 详情")
     @PostMapping("/executive/detail")
     public ReturnDTO<ExecutiveDetailResponse> executiveDetail(@RequestBody @Valid ExecutiveDetailRequest request, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
@@ -131,7 +136,7 @@
      * 退回后会将下一个要执行的实验室检测状态更新为待分配，将后面的实验室顺序变更为连续（都进行减1）
      * 最后一个检测的实验室退回，等分发员再增加实验室或设备收发中的已收入直接手动点击完成
      */
-    @ApiOperation("实验室检测-部门检测/我的检测 退回（待检测/检测中->退回）")
+    @ApiOperation("实验室任务/我的任务 退回（待检测/检测中->退回）")
     @PostMapping("/executive/sendBack")
     public ReturnDTO executiveSendBack(@RequestBody @Valid ExecutiveSendBackRequest request, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -140,9 +145,6 @@
         return labExecutiveInfoService.sampleExecutiveSendBack(request);
     }
 
-    /**
-     * 分发员编辑实验室检测列表
-     */
     @ApiOperation("分发员编辑实验室检测列表")
     @PostMapping("/handOut/updateList")
     public ReturnDTO updateExecutiveList(@RequestBody @Valid UpdateExecutiveListRequest request, BindingResult bindingResult) {
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java
index 48a67ed..0c04f31 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java
@@ -10,6 +10,7 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.resource.customer.CustomerApprovalListRequest;
 import com.casic.missiles.dto.resource.customer.CustomerSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceCustomerInfo;
@@ -26,6 +27,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -55,6 +57,13 @@
         return customerInfoService.saveCustomerInfo(request);
     }
 
+    @ApiOperation("委托方名录导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody CustomerApprovalListRequest request) throws Exception {
+        List<BizResourceCustomerInfo> list = super.exportList(request);
+        super.exportExcel(BizResourceCustomerInfo.class, list, ExportEnum.CUSTOMER_INFO.getSheetName());
+    }
+
     @ApiOperation("委托方人员列表（分页）")
     @PostMapping("/person/listPage")
     public ReturnDTO<PageInfoBT<BizResourceCustomerStaff>> personListPage(@RequestBody IdDTO idDto) {
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
index 972ed4b..6418ea5 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
@@ -5,6 +5,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.resource.customer.SuggestFormApprovalListRequest;
 import com.casic.missiles.dto.resource.customer.SuggestFormSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceCustomerSuggestForm;
@@ -20,6 +21,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -50,4 +52,11 @@
         return suggestFormService.saveSuggestForm(request);
     }
 
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody SuggestFormApprovalListRequest request) throws Exception {
+        List<BizResourceCustomerSuggestForm> list = super.exportList(request);
+        super.exportExcel(BizResourceCustomerSuggestForm.class, list, ExportEnum.CUSTOMER_SUGGEST_FORM.getSheetName());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java
index 1934d1a..9e07eab 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java
@@ -15,12 +15,16 @@
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.resource.IEnvEnvironmentRecordConfigService;
 import com.casic.missiles.service.resource.IEnvEnvironmentRecordDataService;
+import com.casic.missiles.service.resource.IEnvLocationInfoService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
 import java.util.List;
@@ -39,6 +43,8 @@
     private IEnvEnvironmentRecordDataService environmentRecordDataService;
     @Autowired
     private IEnvEnvironmentRecordConfigService environmentRecordConfigService;
+    @Autowired
+    private IEnvLocationInfoService locationInfoService;
 
     @ApiOperation("环境记录单数据列表/详情")
     @PostMapping("/data/listPage")
@@ -95,4 +101,11 @@
         });
         return environmentRecordConfigService.deleteEnvironmentRecordConfig(idDTO.getId());
     }
+
+    @ApiOperation("地点列表")
+    @PostMapping("/location/listPage")
+    public ReturnDTO<PageInfoBT<LocationListResponse>> locationListPage(@RequestBody @Valid LocationListRequest request) {
+        Page<LocationListResponse> page = PageFactory.defaultPage();
+        return ReturnUtil.success(super.packForBT(locationInfoService.listPage(page, request)));
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java
index 82efe3f..e9561fa 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java
@@ -10,6 +10,7 @@
 import com.casic.missiles.dto.resource.seal.SealLogListRequest;
 import com.casic.missiles.dto.resource.seal.SealNoteApprovalListRequest;
 import com.casic.missiles.dto.resource.seal.SealNoteSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceSealUseLog;
@@ -27,6 +28,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -58,6 +60,13 @@
         return sealUseNoteService.saveSeal(request);
     }
 
+    @ApiOperation("印章使用登记导出（列表和导出中去掉经办人和监印人）")
+    @PostMapping("/listExport")
+    public void export(@RequestBody SealNoteApprovalListRequest request) throws Exception {
+        List<BizResourceSealUseNote> list = super.exportList(request);
+        super.exportExcel(BizResourceSealUseNote.class, list, ExportEnum.SEAL_NOTE.getSheetName());
+    }
+
     // TODO: 2023/7/28 印章使用日志：系统中使用印章时插入数据库
 
     @ApiOperation("印章使用日志列表（分页）")
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java
index 9b674fc..06b6521 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java
@@ -9,16 +9,20 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.resource.staff.StaffCertRequest;
 import com.casic.missiles.dto.resource.staff.StaffCertResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.service.resource.IBizResourceStaffInfoService;
 import com.casic.missiles.service.resource.IBizResourceStaffVerifierService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.List;
+
 /**
  * @Description:
  * @Author: wangpeng
@@ -41,9 +45,21 @@
         return ReturnUtil.success(super.packForBT(responsePage));
     }
 
+    @ApiOperation("证书逾期提醒导出")
+    @PostMapping("/listExport")
+    public void exportList(@RequestBody StaffCertRequest request) throws Exception {
+        List<StaffCertResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = staffInfoService.certListByIds(request.getIds());
+        } else {
+            list = staffInfoService.certList(request);
+        }
+        super.exportExcel(StaffCertResponse.class, list, ExportEnum.STAFF_CERTIFICATE_EXPIRE.getSheetName());
+    }
+
     @ApiOperation("证书逾期提醒")
     @PostMapping("/expirationReminder")
-    public ReturnDTO expirationReminder(@RequestBody IdDTO idDto) {
-        return verifierService.expirationReminder(idDto);
+    public ReturnDTO expirationReminder(@RequestBody IdDTO idDTO) {
+        return verifierService.expirationReminder(idDTO);
     }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java
index 3b251ad..a6e7850 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java
@@ -12,6 +12,7 @@
 import com.casic.missiles.dto.resource.staff.StaffListRequest;
 import com.casic.missiles.dto.resource.staff.TrainListRequest;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.*;
@@ -22,7 +23,10 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
 import java.util.List;
@@ -52,8 +56,19 @@
             throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
         }
         Page<BizResourceStaffInfo> page = PageFactory.defaultPage();
-        Page<BizResourceStaffInfo> responsePage = staffInfoService.listPage(page, request);
-        return ReturnUtil.success(super.packForBT(responsePage));
+        return ReturnUtil.success(super.packForBT(staffInfoService.listPage(page, request)));
+    }
+
+    @ApiOperation("人员登记导出")
+    @PostMapping("/listExport")
+    public void exportList(@RequestBody StaffListRequest request) throws Exception {
+        List<BizResourceStaffInfo> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = staffInfoService.listByIds(request.getIds());
+        } else {
+            list = staffInfoService.list(request);
+        }
+        super.exportExcel(BizResourceStaffInfo.class, list, ExportEnum.STAFF_INFO.getSheetName());
     }
 
     @ApiOperation("人员登记详情基础信息")
@@ -85,9 +100,9 @@
 
     @ApiOperation("科研教育列表（分页）")
     @PostMapping("/education/listPage")
-    public ReturnDTO<PageInfoBT<BizResourceStaffEducation>> educationListPage(@RequestBody IdDTO idDto) {
+    public ReturnDTO<PageInfoBT<BizResourceStaffEducation>> educationListPage(@RequestBody IdDTO idDTO) {
         Page<BizResourceStaffEducation> page = PageFactory.defaultPage();
-        Page<BizResourceStaffEducation> responsePage = staffInfoService.educationListPage(page, idDto);
+        Page<BizResourceStaffEducation> responsePage = staffInfoService.educationListPage(page, idDTO);
         return ReturnUtil.success(super.packForBT(responsePage));
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java
index af6aa86..d85d84a 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java
@@ -9,6 +9,7 @@
 import com.casic.missiles.dto.resource.outsideService.SupplierApprovalListRequest;
 import com.casic.missiles.dto.resource.outsideService.SupplierSaveResponse;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceSupplierAbility;
@@ -67,6 +68,13 @@
         return ReturnUtil.success(supplierInfoService.detail(idDTO.getId()));
     }
 
+    @ApiOperation("合格供方导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody SupplierApprovalListRequest request) throws Exception {
+        List<BizResourceSupplierInfo> list = super.exportList(request);
+        super.exportExcel(BizResourceSupplierInfo.class, list, ExportEnum.SUPPLIER_INFO.getSheetName());
+    }
+
     @ApiOperation("供方人员列表（分页）")
     @PostMapping("/person/listPage")
     public ReturnDTO<PageInfoBT<BizResourceSupplierPerson>> personListPage(@RequestBody IdDTO idDTO) {
diff --git a/casic-metering-api/src/main/resources/config/application.yml b/casic-metering-api/src/main/resources/config/application.yml
index 350db5f..ecff521 100644
--- a/casic-metering-api/src/main/resources/config/application.yml
+++ b/casic-metering-api/src/main/resources/config/application.yml
@@ -126,7 +126,7 @@
     #作者
     author: wangpeng
     #待生成对象表名
-    table-name: biz_equipment_technical_target_approval,biz_equipment_attachment_approval,biz_equipment_checkpoint_approval
+    table-name: biz_business_outsource_protocol
 
 reminder:
   #节点--common模块config包 ReminderNodeConfig配置
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
index 4a19e4e..d47d552 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
@@ -53,6 +53,7 @@
     SUGGEST_FORM_SAVE_FAILED(2509, "委托方意见登记表保存至草稿箱失败"),
     EXAMINE_FORM_SAVE_FAILED(2510, "要求、委托书及合同评审表保存至草稿箱失败"),
     CUSTOMER_EXIST_SAVE_FAILED(2511, "该委托方已存在，请重新选择"),
+    DUPLICATE_LOCATION_NO(2512, "地点编号已存在"),
 
     /**
      * 计量检定业务模块
@@ -68,6 +69,8 @@
     COMPLETE_SAMPLE_NOT_EXIST(2609, "检测中不存在扫描收入的样品"),
     CANNOT_CHANGE_MEASURE_INFO(2610, "无法更改非当前登录用户的检测信息"),
     NON_EXIST_ORDER_OR_SAMPLE(2611, "不存在该委托单或该委托单下的样品"),
+    OUTSOURCE_ACCESS_SAVE_FAILED(2612, "测试、校准或检定工作分包评审表保存至草稿箱失败"),
+    OUTSOURCE_PROTOCOL_SAVE_FAILED(2613, "测试、校准或检定工作分包协议书保存至草稿箱失败"),
 
     /**
      * 历史遗留备用
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
index 5089ad1..81a406b 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
@@ -10,54 +10,38 @@
     /**
      * 资源管理
      */
-    ENVIRONMENT_DATA_EXPORT("environmentData", "environmentData", "环境记录单数据"),
+    ENVIRONMENT_DATA_EXPORT("environmentData", "环境记录单数据", "环境记录单数据"),
+    STAFF_INFO("staffInfo", "人员登记", "人员登记"),
+    STAFF_CERTIFICATE_EXPIRE("certificateExpire", "证书逾期提醒", "证书逾期提醒"),
+    SUPPLIER_INFO("supplierInfo", "合格供方名录", "合格供方名录"),
+    CUSTOMER_INFO("customerInfo", "委托方名录", "委托方名录"),
+    CUSTOMER_SUGGEST_FORM("customerSuggestForm", "委托方意见登记表", "委托方意见登记表"),
+    SEAL_NOTE("sealNote", "印章使用登记", "印章使用登记"),
 
-    FILE_EXPORT("meterFileData", "meterFileData", "计量文件信息"),
-    TRAIN_PLAN_EXPORT("trainPlanData", "trainPlanData", "培训计划"),
-    TRAIN_LOG_EXPORT("trainLogData", "trainLogData", "培训记录"),
-    METER_ORGANIZE_EXPORT("meterOrganizeData", "meterOrganizeData", "计量组织"),
-    TRACE_SUPPLIER_EXPORT("traceSupplierData", "traceSupplierData", "溯源供方"),
-    SIGN_EXPORT("signData", "signData", "签名/签章"),
-    TEMPLATE_EXPORT("templateData", "templateData", "原始记录模板/证书报告模板"),
-    FIXED_ASSETS("meterFixedAssets", "meterFixedAssets", "固定资产"),
-    METER_EQUIPMENT("meterEquipment", "meterEquipment", "测量设备"),
-    CALIBRATION_TEST_EQUIPMENT("calibrationTestEquipment", "calibrationTestEquipment", "校准检定设备"),
-    MEASURE_ACCOUNT("measureAccount", "measureAccount", "测量工装"),
-    STANDARD_SUPPORT_EQUIPMENT("standardSupportEquipment", "standardSupportEquipment", "标准配套设备"),
-    STANDARD_EQUIPMENT("standardEquipment", "standardEquipment", "标准装置"),
-    FLOW_DEF_EXPORT("flowDefData", "flowDefData", "流程定义"),
-    STAFF_CERTIFICATE("certificate", "certificate", "计量人员证书"),
-    CHECK_INFO("checkInfo", "checkInfo", "设备管理点检测"),
-    EQUIPMENT_APPLY("equipmentApply", "equipmentApply", "设备借用"),
-    STANDARD_EQUIPMENT_REMIND("equipmentApplyRemind", "equipmentApplyRemind", "标准装置到期提醒"),
-    METER_PRICE("meterPrice", "meterPrice", "价格库"),
-    METER_STAFF("meterStaff", "meterStaff", "计量人员"),
-    STANDARD_EQUIPMENT_APPLY("standardEquipmentApply", "standardEquipmentApply", "标准装置申请"),
-    STATE_MANAGE_APPLY("stateManage", "stateManage", "状态管理"),
-    METER_ACCEPTANCE_CHECK("acceptanceCheck", "acceptanceCheck", "设备检修保养验收单"),
-    CUSTOMER_EXPORT("customerData", "customerData", "客户信息"),
-    ORDER_EXPORT("orderData", "orderData", "委托书信息"),
-    SAMPLE_EXPORT("sampleData", "sampleData", "样本信息"),
-    EXCHANGE_DATA("exchangeData", "exchangeData", "设备交接单"),
-    DISPATCH_DATA("dispatchData", "dispatchData", "设备收发"),
-    ENVIRONMENT_DATA("environmentData", "environmentData", "环境记录单"),
-    ORIGIN_DATA("originData", "originData", "原始记录"),
-    CERTIFICATE_REPORT("certificateReport", "certificateReport", "证书报告"),
-    ADVICE_EXPORT("adviceData", "adviceData", "客户反馈"),
-    HANDOUT_EXPORT("handoutData", "handoutData", "任务分发列表"),
-    OUTSOURCER_EXPORT("outsourcerData", "outsourcerData", "分包方"),
-    SITE_EXECUTIVE_EXPORT("siteExecutiveData", "siteExecutiveData", "现场测试、校准或检定"),
-    CERTIFICATE_PRINT_EXPORT("certificatePrintData", "certificatePrintData", "证书打印"),
-    DOWNLOAD_TEMPLATE("downloadTemplate", "downloadTemplate", "页面配置"),
-    OUTSOURCER_CERTIFICATE_EXPORT("outsourceCertificateData", "outsourceCertificateData", "分包证书"),
-    SETTLEMENT_INFO_EXPORT("settlementInfoData", "settlementInfoData", "业务结算"),
-    EQUIPMENT_REMIND("equipmentRemind", "equipmentRemind", "设备到期提醒"),
-    AGREEMENT_INFO_EXPORT("agreementInfoData", "agreementInfoData", "合同"),
-    WORK_STATISTICS_EXPORT("workStatisticsData", "workStatisticsData", "实时工作统计"),
-    DEPT_OUTPUT_EXPORT("deptOutputData", "deptOutputData", "部门产值分析"),
-    WORKLOAD_EXPORT("workloadData", "workloadData", "业务工作量分析"),
-    DEPT_COMPREHENSIVE_EXPORT("deptComprehensiveData", "deptComprehensiveData", "部门综合分析"),
-    ENVIRONMENTAL_RECORD("environmentalRecordData", "environmentalRecordData", "现场环境记录");
+    /**
+     * 计量检定业务
+     */
+    OUTSOURCER_EXPORT("outsourcerData", "分包方名录", "分包方名录"),
+    IDENTIFY_EXPORT("identifyData", "计量标识", "计量标识"),
+    ORDER_EXPORT("orderData", "任务单", "任务单"),
+    DISPATCH_DATA("dispatchData", "设备收发", "设备收发"),
+    HANDOUT_EXPORT("handoutData", "任务分发", "任务分发"),
+    SITE_EXECUTIVE_EXPORT("siteExecutiveData", "现场测试、校准或检定", "现场测试、校准或检定"),
+    CERTIFICATE_REPORT("certificateReport", "证书审批", "证书审批"),
+    CERTIFICATE_CHANGE_APPLY("certificateChangeApply", "证书报告补充或更换申请单", "证书报告补充或更换申请单"),
+    CERTIFICATE_PRINT("certificatePrintData", "证书打印审批", "证书打印审批"),
+    DEPT_EXECUTIVE_TASK("deptExecutiveTaskData", "实验室任务", "实验室任务"),
+    MY_EXECUTIVE_TASK("myExecutiveTaskData", "我的任务", "我的任务"),
+    OUTSOURCE_ASSESS("outsourceAssess", "测试、校准或检定工作分包评审表", "测试、校准或检定工作分包评审表"),
+    OUTSOURCE_PROTOCOL("outsourceProtocol", "测试、校准或检定工作分包协议书", "测试、校准或检定工作分包协议书"),
+
+    /**
+     * 系统管理
+     */
+    SIGN_EXPORT("signData", "签名", "签名"),
+    TEMPLATE_EXPORT("templateData", "文件模板", "文件模板"),
+    FLOW_DEF_EXPORT("flowDefData", "流程定义", "流程定义"),
+    DOWNLOAD_TEMPLATE("downloadTemplate", "流程定义", "页面配置");
 
     ExportEnum(String fileName, String sheetName, String description) {
         this.fileName = fileName;
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateRecordTypeCodeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateRecordTypeCodeEnum.java
index 31d913c..a963522 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateRecordTypeCodeEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateRecordTypeCodeEnum.java
@@ -46,4 +46,14 @@
     String SITE_EXECUTIVE_APPROVAL = "01";
     //《现场测试、校准或检定工作记录表》
     String SITE_EXECUTIVE_LOG = "02";
+
+    //测试、校准或检定工作分包协议书
+    String OUTSOURCE_PROTOCOL = "01";
+    //测试、校准或检定工作分包评审表
+    String OUTSOURCE_ACCESS = "02";
+    //测试、校准或检定工作分包通知书
+    String OUTSOURCE_NOTICE = "03";
+    //测试、校准或检定工作分包方名录
+    String OUTSOURCE_INFO = "04";
+
 }
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
index 24b8635..f78bd53 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
@@ -15,6 +15,10 @@
     String CERTIFICATE_CHANGE_APPLY_BEAN_NAME = "certificateChangeApplyBean";
     //现场测试、校准或检定
     String SITE_EXECUTIVE_BEAN_NAME = "siteExecutiveBean";
+    //测试、校准或检定工作分包评审表
+    String OUTSOURCE_ASSESS_BEAN_NAME = "outsourceAssessBean";
+    //测试、校准或检定工作分包协议书
+    String OUTSOURCE_PROTOCOL_BEAN_NAME = "outsourceProtocolBean";
 
     /*********************************设备与装置************************************/
     //设备台账
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 b21c661..6b86fd1 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
@@ -18,6 +18,8 @@
     OUTSOURCER_APPROVAL(OUTSOURCER_BEAN_NAME, ""),
     CERTIFICATE_CHANGE_APPROVAL(CERTIFICATE_CHANGE_APPLY_BEAN_NAME, ""),
     SITE_EXECUTIVE_APPROVAL(SITE_EXECUTIVE_BEAN_NAME, ""),
+    OUTSOURCE_ASSESS_APPROVAL(OUTSOURCE_ASSESS_BEAN_NAME, ""),
+    OUTSOURCE_PROTOCOL_APPROVAL(OUTSOURCE_PROTOCOL_BEAN_NAME, ""),
 
     ACTION_STATUS_MAP(new HashMap<String, AwareActionStatusEnum>() {
         {
@@ -47,6 +49,10 @@
             put(ApplyFromIdEnum.CERTIFICATE_CHANGE_APPROVAL.getCode(), CERTIFICATE_CHANGE_APPROVAL);
             //现场测试、校准或检定审批
             put(ApplyFromIdEnum.SITE_EXECUTIVE_APPROVAL.getCode(), SITE_EXECUTIVE_APPROVAL);
+            //测试、校准或检定工作分包评审表
+            put(ApplyFromIdEnum.OUTSOURCE_ASSESS_APPROVAL.getCode(), OUTSOURCE_ASSESS_APPROVAL);
+            //测试、校准或检定工作分包协议书
+            put(ApplyFromIdEnum.OUTSOURCE_PROTOCOL_APPROVAL.getCode(), OUTSOURCE_PROTOCOL_APPROVAL);
         }
     });
     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 934405e..c7410bd 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
@@ -9,6 +9,8 @@
     CERTIFICATE_CHANGE_APPROVAL("jljdywzsbchghsqd", MessageSourceModuleEnum.BUSINESS.getCode(), "证书/报告补充或更换申请单"),
     OUTSOURCER_APPROVAL("jljdywcsjzhgfbfml", MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定合格分包方名录"),
     SITE_EXECUTIVE_APPROVAL("jljdywxccsjzsp", MessageSourceModuleEnum.BUSINESS.getCode(), "现场测试、校准或检定审批"),
+    OUTSOURCE_ASSESS_APPROVAL("jljdywcsjzfbpsb", MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包评审表"),
+    OUTSOURCE_PROTOCOL_APPROVAL("jljdywcsjzfbxys", MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包协议书"),
 
 
     /*******************************************设备与装置*********************************************/
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/GeneralApprovalMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/GeneralApprovalMapper.java
index 4fb7344..0c9d6ae 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/GeneralApprovalMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/GeneralApprovalMapper.java
@@ -17,8 +17,4 @@
 
     Page<O> selectBatchForApprovalList(Page<O> page, @Param("request") R request, @Param("businessKeys") List<String> businessKeys);
 
-//    Page<O> selectListPage(Page<O> page, @Param("request") R request);
-
-//    Long selectMaxNo();
-
 }
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceAssessMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceAssessMapper.java
index 7867bb8..ba59009 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceAssessMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceAssessMapper.java
@@ -1,7 +1,12 @@
 package com.casic.missiles.mapper.business;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.business.outsource.OutsourceAssessApprovalListRequest;
+import com.casic.missiles.mapper.GeneralApprovalMapper;
 import com.casic.missiles.model.business.BizBusinessOutsourceAssess;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * <p>
@@ -11,6 +16,10 @@
  * @author wangpeng
  * @since 2023-08-16
  */
-public interface BizBusinessOutsourceAssessMapper extends BaseMapper<BizBusinessOutsourceAssess> {
+public interface BizBusinessOutsourceAssessMapper extends GeneralApprovalMapper<BizBusinessOutsourceAssess, BizBusinessOutsourceAssess, OutsourceAssessApprovalListRequest> {
+
+    Page<BizBusinessOutsourceAssess> selectBatchForApprovalList(Page<BizBusinessOutsourceAssess> page, @Param("request") OutsourceAssessApprovalListRequest request, @Param("businessKeys") List<String> businessKeys);
+
+    Long selectMaxProjectNo();
 
 }
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceProtocolMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceProtocolMapper.java
new file mode 100644
index 0000000..e6aba35
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceProtocolMapper.java
@@ -0,0 +1,24 @@
+package com.casic.missiles.mapper.business;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.business.outsource.OutsourceProtocolApprovalListRequest;
+import com.casic.missiles.mapper.GeneralApprovalMapper;
+import com.casic.missiles.model.business.BizBusinessOutsourceProtocol;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 计量检定业务-分包管理-测试、校准或检定工作分包协议书 Mapper 接口
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-08-24
+ */
+public interface BizBusinessOutsourceProtocolMapper extends GeneralApprovalMapper<BizBusinessOutsourceProtocol, BizBusinessOutsourceProtocol, OutsourceProtocolApprovalListRequest> {
+
+    Page<BizBusinessOutsourceProtocol> selectBatchForApprovalList(Page<BizBusinessOutsourceProtocol> page, @Param("request") OutsourceProtocolApprovalListRequest request, @Param("businessKeys") List<String> businessKeys);
+
+    Long selectMaxProtocolNo();
+}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/EnvLocationInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/EnvLocationInfoMapper.java
new file mode 100644
index 0000000..49eff87
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/EnvLocationInfoMapper.java
@@ -0,0 +1,21 @@
+package com.casic.missiles.mapper.resource;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.resource.environment.LocationListRequest;
+import com.casic.missiles.dto.resource.environment.LocationListResponse;
+import com.casic.missiles.model.resource.EnvLocationInfo;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * <p>
+ * 实验室环境监控系统-设备表 Mapper 接口
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-06-07
+ */
+public interface EnvLocationInfoMapper extends BaseMapper<EnvLocationInfo> {
+
+    Page<LocationListResponse> selectLocationListPage(Page<LocationListResponse> page, @Param("request") LocationListRequest request);
+}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java
index de124db..85ed0f7 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java
@@ -1,7 +1,9 @@
 package com.casic.missiles.mapper.system;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.dto.system.SignDetailResponse;
+import com.casic.missiles.dto.system.SignListRequest;
 import com.casic.missiles.model.system.SystemSign;
 import org.apache.ibatis.annotations.Param;
 
@@ -22,4 +24,8 @@
     SignDetailResponse selectSignDetailById(Long id);
 
     List<SystemSign> selectUsableSignList(@Param("userId") Long userId);
+
+    Page<SystemSign> selectSignListPage(Page<SystemSign> page, @Param("request") SignListRequest request);
+
+    List<SystemSign> selectSignList(@Param("request") SignListRequest request);
 }
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateChangeApplyMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateChangeApplyMapper.xml
index d798447..c496092 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateChangeApplyMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateChangeApplyMapper.xml
@@ -30,31 +30,31 @@
         SELECT *
         FROM biz_business_certificate_change_apply
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.changeApplyNo != null and request.changeApplyNo !=''">
+        <if test="request != null and request.changeApplyNo != null and request.changeApplyNo !=''">
             and change_apply_no like concat('%',#{request.changeApplyNo},'%')
         </if>
-        <if test="request.changeReportNo != null and request.changeReportNo !=''">
+        <if test="request != null and request.changeReportNo != null and request.changeReportNo !=''">
             and change_report_no like concat('%',#{request.changeReportNo},'%')
         </if>
-        <if test="request.changeReportName != null and request.changeReportName !=''">
+        <if test="request != null and request.changeReportName != null and request.changeReportName !=''">
             and change_report_name like concat('%',#{request.changeReportName},'%')
         </if>
-        <if test="request.changeType != null and request.changeType !=''">
+        <if test="request != null and request.changeType != null and request.changeType !=''">
             and change_type = #{request.changeType}
         </if>
-        <if test="request.createUserName != null and request.createUserName !=''">
+        <if test="request != null and request.createUserName != null and request.createUserName !=''">
             and create_user_name like concat('%',#{request.createUserName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificatePrintMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificatePrintMapper.xml
index b66cd99..49c0ac8 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificatePrintMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificatePrintMapper.xml
@@ -31,34 +31,34 @@
         LEFT JOIN biz_business_order_sample_relation bosr ON (bosr.order_id = bcr.order_id AND bosr.sample_id = bcr.sample_id)
         LEFT JOIN biz_business_order_info boi ON boi.id = bosr.order_id
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and bcp.approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.printStatus != null and request.printStatus !=''">
+        <if test="request != null and request.printStatus != null and request.printStatus !=''">
             and print_status = #{request.printStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and bcp.create_user_id = #{request.createUserId}
         </if>
-        <if test="request.certificateReportNo != null and request.certificateReportNo !=''">
+        <if test="request != null and request.certificateReportNo != null and request.certificateReportNo !=''">
             and bcr.certificate_report_no like concat('%',#{request.certificateReportNo},'%')
         </if>
-        <if test="request.certificateReportName != null and request.certificateReportName !=''">
+        <if test="request != null and request.certificateReportName != null and request.certificateReportName !=''">
             and bcr.certificate_report_name like concat('%',#{request.certificateReportName},'%')
         </if>
-        <if test="request.customerName != null and request.customerName !=''">
+        <if test="request != null and request.customerName != null and request.customerName !=''">
             and boi.customer_name like concat('%',#{request.customerName},'%')
         </if>
-        <if test="request.sampleNo != null and request.sampleNo !=''">
+        <if test="request != null and request.sampleNo != null and request.sampleNo !=''">
             and bosr.sample_no like concat('%',#{request.sampleNo},'%')
         </if>
-        <if test="request.sampleName != null and request.sampleName !=''">
+        <if test="request != null and request.sampleName != null and request.sampleName !=''">
             and bosr.sample_name like concat('%',#{request.sampleName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and bcp.create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and bcp.create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml
index b366034..767695d 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml
@@ -46,33 +46,37 @@
         SELECT bcr.*, bosr.sample_no, bosr.sample_name, bosr.sample_model, rsi.staff_name
         FROM biz_business_certificate_report bcr
         LEFT JOIN biz_business_order_sample_relation bosr ON (bosr.order_id = bcr.order_id AND bosr.sample_id = bcr.sample_id)
+        LEFT JOIN biz_business_order_info boi ON boi.id = bcr.order_id
         LEFT JOIN biz_resource_staff_info rsi ON rsi.id = bcr.measure_person_id
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and bcr.approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and bcr.create_user_id = #{request.createUserId}
         </if>
-        <if test="request.certificateReportNo != null and request.certificateReportNo !=''">
+        <if test="request != null and request.customerId != null and request.customerId !=''">
+            and boi.customer_id = #{request.customerId}
+        </if>
+        <if test="request != null and request.certificateReportNo != null and request.certificateReportNo !=''">
             and bcr.certificate_report_no like concat('%',#{request.certificateReportNo},'%')
         </if>
-        <if test="request.certificateReportName != null and request.certificateReportName !=''">
+        <if test="request != null and request.certificateReportName != null and request.certificateReportName !=''">
             and bcr.certificate_report_name like concat('%',#{request.certificateReportName},'%')
         </if>
-        <if test="request.sampleNo != null and request.sampleNo !=''">
+        <if test="request != null and request.sampleNo != null and request.sampleNo !=''">
             and bosr.sample_no like concat('%',#{request.sampleNo},'%')
         </if>
-        <if test="request.measureCategory != null and request.measureCategory !=''">
+        <if test="request != null and request.measureCategory != null and request.measureCategory !=''">
             and bcr.measure_category = #{request.measureCategory}
         </if>
-        <if test="request.measurePerson != null and request.measurePerson !=''">
+        <if test="request != null and request.measurePerson != null and request.measurePerson !=''">
             and rsi.staff_name like concat('%',#{request.measurePerson},'%')
         </if>
-        <if test="request.calibrationTimeStart != null and request.calibrationTimeStart !=''">
+        <if test="request != null and request.calibrationTimeStart != null and request.calibrationTimeStart !=''">
             and bcr.calibration_time &gt;= #{request.calibrationTimeStart}
         </if>
-        <if test="request.calibrationTimeEnd != null and request.calibrationTimeEnd !=''">
+        <if test="request != null and request.calibrationTimeEnd != null and request.calibrationTimeEnd !=''">
             and bcr.calibration_time &lt;= #{request.calibrationTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceAssessMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceAssessMapper.xml
index d0fcf8b..c22c101 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceAssessMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceAssessMapper.xml
@@ -7,6 +7,8 @@
         <id column="id" property="id" />
         <result column="project_no" property="projectNo" />
         <result column="project_name" property="projectName" />
+        <result column="lab_code" property="labCode" />
+        <result column="group_code" property="groupCode" />
         <result column="applicant_id" property="applicantId" />
         <result column="applicant_name" property="applicantName" />
         <result column="applicant_time" property="applicantTime" />
@@ -31,7 +33,45 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, project_no, project_name, applicant_id, applicant_name, applicant_time, minio_file_name, remark, create_user_id, create_user_name, outsourcer_id, pre_start_time, pre_end_time, outsource_reason, pre_cost, approval_status, process_id, approve_situation, traceability, test_method, technique_ability, create_time, update_time
+        id, project_no, project_name, lab_code, group_code, applicant_id, applicant_name, applicant_time, minio_file_name, remark, create_user_id, create_user_name, outsourcer_id, pre_start_time, pre_end_time, outsource_reason, pre_cost, approval_status, process_id, approve_situation, traceability, test_method, technique_ability, create_time, update_time
     </sql>
 
+    <select id="selectMaxProjectNo" resultType="java.lang.Long">
+        SELECT IFNULL(max(RIGHT(project_no, 3)), 0) from biz_business_outsource_assess
+    </select>
+
+    <select id="selectBatchForApprovalList" resultMap="BaseResultMap">
+        SELECT bboa.*, bboi.outsourcer_name, bboi.director
+        FROM biz_business_outsource_assess bboa
+        LEFT JOIN biz_business_outsourcer_info bboi ON bboa.outsourcer_id = bboi.id
+        WHERE 1=1
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
+            and bboa.approval_status = #{request.approvalStatus}
+        </if>
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
+            and bboa.create_user_id = #{request.createUserId}
+        </if>
+        <if test="request != null and request.projectNo != null and request.projectNo !=''">
+            and bboa.project_no like concat('%',#{request.projectNo},'%')
+        </if>
+        <if test="request != null and request.outsourcerName != null and request.outsourcerName !=''">
+            and bboi.outsourcer_name like concat('%',#{request.outsourcerName},'%')
+        </if>
+        <if test="request != null and request.applicantName != null and request.applicantName !=''">
+            and bboa.applicant_name like concat('%',#{request.applicantName},'%')
+        </if>
+        <if test="request != null and request.applicantTimeStart != null and request.applicantTimeStart !=''">
+            and bboa.applicant_time &gt;= #{request.applicantTimeStart}
+        </if>
+        <if test="request != null and request.applicantTimeEnd != null and request.applicantTimeEnd !=''">
+            and bboa.applicant_time &lt;= #{request.applicantTimeEnd}
+        </if>
+        <if test="businessKeys != null">
+            and bboa.id in
+            <foreach collection="businessKeys" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
+        ORDER BY bboa.create_time DESC
+    </select>
 </mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceProtocolMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceProtocolMapper.xml
new file mode 100644
index 0000000..b7b2149
--- /dev/null
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceProtocolMapper.xml
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.mapper.business.BizBusinessOutsourceProtocolMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.business.BizBusinessOutsourceProtocol">
+        <id column="id" property="id" />
+        <result column="protocol_no" property="protocolNo" />
+        <result column="project_name" property="projectName" />
+        <result column="lab_code" property="labCode" />
+        <result column="group_code" property="groupCode" />
+        <result column="outsourcer_id" property="outsourcerId" />
+        <result column="remark" property="remark" />
+        <result column="outsource_no" property="outsourceNo" />
+        <result column="outsource_name" property="outsourceName" />
+        <result column="contacts" property="contacts" />
+        <result column="mobile" property="mobile" />
+        <result column="address" property="address" />
+        <result column="require_date" property="requireDate" />
+        <result column="outsource_cost" property="outsourceCost" />
+        <result column="director" property="director" />
+        <result column="item" property="item" />
+        <result column="requires" property="requires" />
+        <result column="create_user_id" property="createUserId" />
+        <result column="create_user_name" property="createUserName" />
+        <result column="approval_status" property="approvalStatus" />
+        <result column="process_id" property="processId" />
+        <result column="create_time" property="createTime" />
+        <result column="update_time" property="updateTime" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, protocol_no, project_name, lab_code, group_code, outsourcer_id, remark, outsource_no, outsource_name, contacts, mobile, address, require_date, outsource_cost, director, item, requires, create_user_id, create_user_name, approval_status, process_id, create_time, update_time
+    </sql>
+
+    <select id="selectMaxProtocolNo" resultType="java.lang.Long">
+        SELECT IFNULL(max(RIGHT(protocol_no, 3)), 0) from biz_business_outsource_protocol
+    </select>
+
+    <select id="selectBatchForApprovalList" resultMap="BaseResultMap">
+        SELECT *
+        FROM biz_business_outsource_protocol
+        WHERE 1=1
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
+            and approval_status = #{request.approvalStatus}
+        </if>
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
+            and create_user_id = #{request.createUserId}
+        </if>
+        <if test="request != null and request.protocolNo != null and request.protocolNo !=''">
+            and protocol_no like concat('%',#{request.protocolNo},'%')
+        </if>
+        <if test="request != null and request.outsourcerName != null and request.outsourcerName !=''">
+            and outsourcer_name like concat('%',#{request.outsourcerName},'%')
+        </if>
+        <if test="request != null and request.applicantName != null and request.applicantName !=''">
+            and create_user_name like concat('%',#{request.applicantName},'%')
+        </if>
+        <if test="request != null and request.applicantTimeStart != null and request.applicantTimeStart !=''">
+            and create_time &gt;= #{request.applicantTimeStart}
+        </if>
+        <if test="request != null and request.applicantTimeEnd != null and request.applicantTimeEnd !=''">
+            and create_time &lt;= #{request.applicantTimeEnd}
+        </if>
+        <if test="businessKeys != null">
+            and id in
+            <foreach collection="businessKeys" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
+        ORDER BY create_time DESC
+    </select>
+</mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourcerInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourcerInfoMapper.xml
index 510a80b..3049b54 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourcerInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourcerInfoMapper.xml
@@ -7,6 +7,8 @@
         <id column="id" property="id" />
         <result column="outsourcer_no" property="outsourcerNo" />
         <result column="outsourcer_name" property="outsourcerName" />
+        <result column="lab_code" property="labCode" />
+        <result column="group_code" property="groupCode" />
         <result column="outsourcer_brief_name" property="outsourcerBriefName" />
         <result column="outsourcer_size" property="outsourcerSize" />
         <result column="business_size" property="businessSize" />
@@ -55,32 +57,32 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, outsourcer_no, outsourcer_name, outsourcer_brief_name, outsourcer_size, business_size, grade, evaluation, tax_number, bank_account, bank_name, bank_account_number, postal_code, director, phone, fax, mobile, email, website, address_country, address_province, address_city, address_area, full_address, address_country_name, address_province_name, address_city_name, address_area_name, invoice_country, invoice_province, invoice_city, invoice_area, invoice_full_address, invoice_country_name, invoice_province_name, invoice_city_name, invoice_area_name, business_scope, business_content, minio_file_name, approval_status, process_id, remark, create_user_id, create_user_name, create_time, update_time
+        id, outsourcer_no, outsourcer_name, lab_code, group_code, outsourcer_brief_name, outsourcer_size, business_size, grade, evaluation, tax_number, bank_account, bank_name, bank_account_number, postal_code, director, phone, fax, mobile, email, website, address_country, address_province, address_city, address_area, full_address, address_country_name, address_province_name, address_city_name, address_area_name, invoice_country, invoice_province, invoice_city, invoice_area, invoice_full_address, invoice_country_name, invoice_province_name, invoice_city_name, invoice_area_name, business_scope, business_content, minio_file_name, approval_status, process_id, remark, create_user_id, create_user_name, create_time, update_time
     </sql>
 
     <select id="selectBatchForApprovalList" resultMap="BaseResultMap">
         SELECT *
         FROM biz_business_outsourcer_info
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.outsourcerNo != null and request.outsourcerNo !=''">
+        <if test="request != null and request.outsourcerNo != null and request.outsourcerNo !=''">
             and outsourcer_no like concat('%',#{request.outsourcerNo},'%')
         </if>
-        <if test="request.outsourcerName != null and request.outsourcerName !=''">
+        <if test="request != null and request.outsourcerName != null and request.outsourcerName !=''">
             and outsourcer_name like concat('%',#{request.outsourcerName},'%')
         </if>
-        <if test="request.director != null and request.director !=''">
+        <if test="request != null and request.director != null and request.director !=''">
             and director like concat('%',#{request.director},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
@@ -93,6 +95,6 @@
     </select>
 
     <select id="selectMaxNo" resultType="java.lang.Long">
-        SELECT IFNULL(max(RIGHT(outsourcer_no, 12)), 0) from biz_business_outsourcer_info
+        SELECT IFNULL(max(RIGHT(outsourcer_no, 3)), 0) from biz_business_outsourcer_info
     </select>
 </mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessSiteExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessSiteExecutiveInfoMapper.xml
index 135c5d0..3c5ae79 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessSiteExecutiveInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessSiteExecutiveInfoMapper.xml
@@ -38,25 +38,25 @@
         FROM biz_business_site_executive_info bsei
         LEFT JOIN biz_resource_customer_info rci ON bsei.customer_id = rci.id
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and bsei.approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and bsei.create_user_id = #{request.createUserId}
         </if>
-        <if test="request.siteExecutiveNo != null and request.siteExecutiveNo !=''">
+        <if test="request != null and request.siteExecutiveNo != null and request.siteExecutiveNo !=''">
             and bsei.site_executive_no like concat('%',#{request.siteExecutiveNo},'%')
         </if>
-        <if test="request.customerName != null and request.customerName !=''">
+        <if test="request != null and request.customerName != null and request.customerName !=''">
             and rci.outsourcer_name like concat('%',#{request.customerName},'%')
         </if>
-        <if test="request.applyName != null and request.applyName !=''">
+        <if test="request != null and request.applyName != null and request.applyName !=''">
             and bsei.apply_name like concat('%',#{request.applyName},'%')
         </if>
-        <if test="request.applyTimeStart != null and request.applyTimeStart !=''">
+        <if test="request != null and request.applyTimeStart != null and request.applyTimeStart !=''">
             and bsei.apply_time &gt;= #{request.applyTimeStart}
         </if>
-        <if test="request.applyTimeEnd != null and request.applyTimeEnd !=''">
+        <if test="request != null and request.applyTimeEnd != null and request.applyTimeEnd !=''">
             and bsei.apply_time &lt;= #{request.applyTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml
index 84d9e2a..6bd38a9 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml
@@ -105,6 +105,12 @@
         <if test="request.isUrgent != null and request.isUrgent !=''">
             AND bo.is_urgent = #{request.isUrgent}
         </if>
+        <if test="request.ids != null">
+            and blei.id in
+            <foreach collection="request.ids" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
         ORDER BY blei.update_time DESC
     </select>
 
@@ -137,6 +143,12 @@
         <if test="request.isUrgent != null and request.isUrgent !=''">
             AND bo.is_urgent = #{request.isUrgent}
         </if>
+        <if test="request.ids != null">
+            and blei.id in
+            <foreach collection="request.ids" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
         ORDER BY blei.update_time DESC
     </select>
 
diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardInfoMapper.xml
index 1a5551b..2ed8d17 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardInfoMapper.xml
@@ -45,12 +45,6 @@
         FROM biz_equipment_standard_info besi
         LEFT JOIN biz_equipment_standard_technology_relation bestr ON besi.standard_no = bestr.standard_no
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
-            and besi.approval_status = #{request.approvalStatus}
-        </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
-            and besi.create_user_id = #{request.createUserId}
-        </if>
         <if test="request.standardName != null and request.standardName !=''">
             and besi.standard_name like concat('%',#{request.standardName},'%')
         </if>
diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardTechnologyRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardTechnologyRelationMapper.xml
index fc7e16c..cd03c8c 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardTechnologyRelationMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardTechnologyRelationMapper.xml
@@ -6,6 +6,7 @@
     <resultMap id="BaseResultMap" type="com.casic.missiles.model.equipment.BizEquipmentStandardTechnologyRelation">
         <id column="id" property="id" />
         <result column="technology_file_id" property="technologyFileId" />
+        <result column="technology_file_no" property="technologyFileNo" />
         <result column="technology_file_name" property="technologyFileName" />
         <result column="standard_id" property="standardId" />
         <result column="standard_no" property="standardNo" />
@@ -14,7 +15,7 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, technology_file_id, technology_file_name, standard_id, remark
+        id, technology_file_id, technology_file_no, technology_file_name, standard_id, remark
     </sql>
 
 </mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceAuthorizeOrderMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceAuthorizeOrderMapper.xml
index ac5176c..554fe65 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceAuthorizeOrderMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceAuthorizeOrderMapper.xml
@@ -32,22 +32,22 @@
         SELECT *
         FROM biz_resource_authorize_order
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.orderNo != null and request.orderNo !=''">
+        <if test="request != null and request.orderNo != null and request.orderNo !=''">
             and order_no like concat('%',#{request.orderNo},'%')
         </if>
-        <if test="request.createUserName != null and request.createUserName !=''">
+        <if test="request != null and request.createUserName != null and request.createUserName !=''">
             and create_user_name like concat('%',#{request.createUserName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerExamineFormMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerExamineFormMapper.xml
index ab242f6..af7f98f 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerExamineFormMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerExamineFormMapper.xml
@@ -41,28 +41,28 @@
         SELECT *
         FROM biz_resource_customer_examine_form
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.formNo != null and request.formNo !=''">
+        <if test="request != null and request.formNo != null and request.formNo !=''">
             and form_no like concat('%',#{request.formNo},'%')
         </if>
-        <if test="request.labCode != null and request.labCode !=''">
+        <if test="request != null and request.labCode != null and request.labCode !=''">
             and lab_code like concat('%',#{request.labCode},'%')
         </if>
-        <if test="request.groupCode != null and request.groupCode !=''">
+        <if test="request != null and request.groupCode != null and request.groupCode !=''">
             and group_code like concat('%',#{request.groupCode},'%')
         </if>
-        <if test="request.createUserName != null and request.createUserName !=''">
+        <if test="request != null and request.createUserName != null and request.createUserName !=''">
             and create_user_name like concat('%',#{request.createUserName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerInfoMapper.xml
index fa8ffbc..06a2798 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerInfoMapper.xml
@@ -33,25 +33,25 @@
         SELECT *
         FROM biz_resource_customer_info
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.customerNo != null and request.customerNo !=''">
+        <if test="request != null and request.customerNo != null and request.customerNo !=''">
             and customer_no like concat('%',#{request.customerNo},'%')
         </if>
-        <if test="request.customerName != null and request.customerName !=''">
+        <if test="request != null and request.customerName != null and request.customerName !=''">
             and customer_name like concat('%',#{request.customerName},'%')
         </if>
-        <if test="request.contacts != null and request.contacts !=''">
+        <if test="request != null and request.contacts != null and request.contacts !=''">
             and contacts like concat('%',#{request.contacts},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerSuggestFormMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerSuggestFormMapper.xml
index 28f5bb2..1806662 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerSuggestFormMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerSuggestFormMapper.xml
@@ -33,28 +33,28 @@
         SELECT *
         FROM biz_resource_customer_suggest_form
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.formNo != null and request.formNo !=''">
+        <if test="request != null and request.formNo != null and request.formNo !=''">
             and form_no like concat('%',#{request.formNo},'%')
         </if>
-        <if test="request.customerName != null and request.customerName !=''">
+        <if test="request != null and request.customerName != null and request.customerName !=''">
             and customer_name like concat('%',#{request.customerName},'%')
         </if>
-        <if test="request.customerDeptName != null and request.customerDeptName !=''">
+        <if test="request != null and request.customerDeptName != null and request.customerDeptName !=''">
             and customer_dept_name like concat('%',#{request.customerDeptName},'%')
         </if>
-        <if test="request.createUserName != null and request.createUserName !=''">
+        <if test="request != null and request.createUserName != null and request.createUserName !=''">
             and create_user_name like concat('%',#{request.createUserName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSealUseNoteMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSealUseNoteMapper.xml
index ab37bc1..b02bb33 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSealUseNoteMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSealUseNoteMapper.xml
@@ -29,32 +29,32 @@
     </sql>
 
     <select id="selectBatchForApprovalList" resultMap="BaseResultMap">
-        SELECT *
+        SELECT brsun.*, brsi.seal_name, brsi.seal_type, brsi.approver_name
         FROM biz_resource_seal_use_note brsun
         JOIN biz_resource_seal_info brsi ON brsun.seal_id = brsi.id
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and brsun.approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and brsun.create_user_id = #{request.createUserId}
         </if>
-        <if test="request.sealName != null and request.sealName !=''">
+        <if test="request != null and request.sealName != null and request.sealName !=''">
             and brsi.seal_name like concat('%',#{request.sealName},'%')
         </if>
-        <if test="request.sealType != null and request.sealType !=''">
+        <if test="request != null and request.sealType != null and request.sealType !=''">
             and brsi.seal_type = #{request.sealType}
         </if>
-        <if test="request.applyDeptName != null and request.applyDeptName !=''">
+        <if test="request != null and request.applyDeptName != null and request.applyDeptName !=''">
             and brsun.apply_dept_name like concat('%',#{request.applyDeptName},'%')
         </if>
-        <if test="request.applyUserName != null and request.applyUserName !=''">
+        <if test="request != null and request.applyUserName != null and request.applyUserName !=''">
             and brsun.apply_user_name like concat('%',#{request.applyUserName},'%')
         </if>
-        <if test="request.applyTimeStart != null and request.applyTimeStart !=''">
+        <if test="request != null and request.applyTimeStart != null and request.applyTimeStart !=''">
             and brsun.apply_time &gt;= #{request.applyTimeStart}
         </if>
-        <if test="request.applyTimeEnd != null and request.applyTimeEnd !=''">
+        <if test="request != null and request.applyTimeEnd != null and request.applyTimeEnd !=''">
             and brsun.apply_time &lt;= #{request.applyTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml
index 119bf7d..4f8392a 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml
@@ -31,6 +31,12 @@
         <if test="request.deptName != null and request.deptName !=''">
             and brsi.dept_name like concat('%',#{request.deptName},'%')
         </if>
+        <if test="request.ids != null">
+            and brsv.id in
+            <foreach collection="request.ids" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
         ORDER BY brsv.grant_date DESC
     </select>
 
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSupplierInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSupplierInfoMapper.xml
index fe8d399..e8ce7ef 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSupplierInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSupplierInfoMapper.xml
@@ -48,28 +48,28 @@
         SELECT *
         FROM biz_resource_supplier_info
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.supplierNo != null and request.supplierNo !=''">
+        <if test="request != null and request.supplierNo != null and request.supplierNo !=''">
             and supplier_no like concat('%',#{request.supplierNo},'%')
         </if>
-        <if test="request.supplierName != null and request.supplierName !=''">
+        <if test="request != null and request.supplierName != null and request.supplierName !=''">
             and supplier_name like concat('%',#{request.supplierName},'%')
         </if>
-        <if test="request.director != null and request.director !=''">
+        <if test="request != null and request.director != null and request.director !=''">
             and director like concat('%',#{request.director},'%')
         </if>
-        <if test="request.supplierType != null and request.supplierType !=''">
+        <if test="request != null and request.supplierType != null and request.supplierType !=''">
             and supplier_type = #{request.supplierType}
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/EnvLocationInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/EnvLocationInfoMapper.xml
new file mode 100644
index 0000000..68bcf10
--- /dev/null
+++ b/casic-metering-dao/src/main/resources/mapper/resource/EnvLocationInfoMapper.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.mapper.resource.EnvLocationInfoMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.resource.EnvLocationInfo">
+        <id column="id" property="id" />
+        <result column="location_no" property="locationNo" />
+        <result column="location_name" property="locationName" />
+        <result column="location_position" property="locationPosition" />
+        <result column="create_user_id" property="createUserId" />
+        <result column="create_user" property="createUser" />
+        <result column="create_time" property="createTime" />
+        <result column="update_time" property="updateTime" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, location_no, location_name, location_position, create_user_id, create_user, create_time, update_time
+    </sql>
+
+    <select id="selectLocationListPage" resultType="com.casic.missiles.dto.resource.environment.LocationListResponse">
+        SELECT *
+        FROM env_location_info
+        WHERE 1=1
+        <if test="request.locationNo != null and request.locationNo !=''">
+            AND location_no LIKE concat('%',#{request.locationNo},'%')
+        </if>
+        <if test="request.locationName != null and request.locationName !=''">
+            AND location_name LIKE concat('%',#{request.locationName},'%')
+        </if>
+        ORDER BY create_time DESC
+    </select>
+
+</mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml
index b28c18f..8854047 100644
--- a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml
@@ -11,7 +11,6 @@
         <result column="sign_desc" property="signDesc" />
         <result column="sign_director" property="signDirector" />
         <result column="sign_user_id" property="signUserId" />
-        <result column="sign_type" property="signType" />
         <result column="minio_file_name" property="minioFileName" />
         <result column="create_time" property="createTime" />
         <result column="update_time" property="updateTime" />
@@ -28,7 +27,6 @@
         <result column="sign_name" property="signName" />
         <result column="sign_desc" property="signDesc" />
         <result column="sign_director" property="signDirector" />
-        <result column="sign_type" property="signType" />
         <result column="sign_user_id" property="signUserId" />
         <result column="minio_file_name" property="minioFileName" />
         <result column="create_time" property="createTime" />
@@ -62,4 +60,58 @@
         JOIN system_sign_user_relation ssur ON ss.id = ssur.sign_id
         WHERE ssur.user_id = #{userId}
     </select>
+
+    <select id="selectSignListPage" resultMap="BaseResultMap">
+        SELECT ss.*, sd.SIMPLE_NAME AS deptName
+        FROM system_sign ss
+        LEFT JOIN sys_user su ON su.id = ss.sign_user_id
+        LEFT JOIN sys_dept sd ON sd.id = su.dept_id
+        WHERE 1=1
+        <if test="request.signNo != null and request.signNo !=''">
+            AND ss.sign_no LIKE concat('%',#{request.signNo},'%')
+        </if>
+        <if test="request.signName != null and request.signName !=''">
+            AND ss.sign_name LIKE concat('%',#{request.signName},'%')
+        </if>
+        <if test="request.signDirector != null and request.signDirector !=''">
+            AND ss.sign_director LIKE concat('%',#{request.signDirector},'%')
+        </if>
+        <if test="request.signUserId != null and request.signUserId !=''">
+            AND ss.sign_user_id = #{request.signUserId}
+        </if>
+        <if test="request.createStartTime != null and request.createStartTime !=''">
+            AND DATE_FORMAT(ss.create_time,'%Y-%m-%d') &gt;= DATE_FORMAT(#{request.createStartTime},'%Y-%m-%d')
+        </if>
+        <if test="request.createEndTime != null and request.createEndTime !=''">
+            AND DATE_FORMAT(ss.create_time,'%Y-%m-%d')  &lt;= DATE_FORMAT(#{request.createEndTime},'%Y-%m-%d')
+        </if>
+        ORDER BY ss.create_time DESC
+    </select>
+
+    <select id="selectSignList" resultMap="BaseResultMap">
+        SELECT ss.*, sd.SIMPLE_NAME AS deptName
+        FROM system_sign ss
+        LEFT JOIN sys_user su ON su.id = ss.sign_user_id
+        LEFT JOIN sys_dept sd ON sd.id = su.dept_id
+        WHERE 1=1
+        <if test="request.signNo != null and request.signNo !=''">
+            AND ss.sign_no LIKE concat('%',#{request.signNo},'%')
+        </if>
+        <if test="request.signName != null and request.signName !=''">
+            AND ss.sign_name LIKE concat('%',#{request.signName},'%')
+        </if>
+        <if test="request.signDirector != null and request.signDirector !=''">
+            AND ss.sign_director LIKE concat('%',#{request.signDirector},'%')
+        </if>
+        <if test="request.signUserId != null and request.signUserId !=''">
+            AND ss.sign_user_id = #{request.signUserId}
+        </if>
+        <if test="request.createStartTime != null and request.createStartTime !=''">
+            AND DATE_FORMAT(ss.create_time,'%Y-%m-%d') &gt;= DATE_FORMAT(#{request.createStartTime},'%Y-%m-%d')
+        </if>
+        <if test="request.createEndTime != null and request.createEndTime !=''">
+            AND DATE_FORMAT(ss.create_time,'%Y-%m-%d')  &lt;= DATE_FORMAT(#{request.createEndTime},'%Y-%m-%d')
+        </if>
+        ORDER BY ss.create_time DESC
+    </select>
 </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 515050a..60f530b 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
@@ -47,8 +47,8 @@
     String STORAGE_LOCATION = "bizStorageLocation";
     //计量专业
     String MEASURE_MAJOR = "bizMeasureMajor";
-    //管理状态
-    String MANAGER_STATE = "bizManagerState";
+    //标准装置管理状态
+    String STANDARD_MANAGER_STATE = "bizStandardManagerState";
 
     /**
      * 资源管理 字典code
@@ -95,8 +95,6 @@
     String MEASURE_STATUS = "measureStatus";
     //检定方式
     String MEASURE_TYPE = "measureType";
-    //标识打印标志类型
-    String IDENTIFY_PRINT_TYPE = "bizBusinessIdentify";
     //变更类型
     String REPORT_CHANGE_TYPE = "bizCertChangeType";
     //规模类型
@@ -111,19 +109,24 @@
     String MEASURE_CATEGORY = "measureCategory";
     //检定结果
     String MEASURE_RESULT = "measureResult";
+    //分包原因
+    String OUTSOURCE_REASON = "outsourceReason";
+
+    /**
+     * 系统管理
+     */
+    String TEMPLATE_TYPE = "templateType";
+
 
     /**
      * 标准装置 字典code
      */
     //类别
     String STANDARD_CATEGORY = "standardCategory";
-    //管理状态
-    String STANDARD_MANAGER_STATE = "standardManagerState";
     //标准等级
     String STANDARD_LEVEL = "standardLevel";
     //传递范围
     String STANDARD_TRANSMIT_RANGE = "transmitRange";
-
     //资本来源
     String CAPITAL_SOURCE = "capitalSource";
     //标准装置-申请类型
@@ -148,8 +151,6 @@
     String CERTIFICATE_CLASS = "certificationClass";
     //证书管理-检校专业
     String CALIBRATION_MAJOR = "calibrationMajor";
-    //分包原因
-    String OUTSOURCE_REASON = "outsourceReason";
 
     /**
      * 工作台
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/BaseApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/BaseApprovalListRequest.java
index 73c12c1..80d7424 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/BaseApprovalListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/BaseApprovalListRequest.java
@@ -6,6 +6,7 @@
 
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotEmpty;
+import java.util.List;
 
 /**
  * @Description:
@@ -19,14 +20,14 @@
      * 表单id
      */
     @NotBlank(message = "表单id不能为空")
-    @ApiModelProperty(value = "表单id（流程定义对应的表单id，等价于业务id）", dataType = "String")
+    @ApiModelProperty(value = "表单id（流程定义对应的表单id，等价于业务id），导出接口不用传", dataType = "String")
     private String formId;
 
     /**
      * 审批状态类型，对应ApprovalStatusEnum
      */
     @NotEmpty(message = "审批状态类型不能为空")
-    @ApiModelProperty(value = "审批状态类型code", dataType = "String")
+    @ApiModelProperty(value = "审批状态类型code，导出接口不用传", dataType = "String")
     private String approvalStatus;
 
     @ApiModelProperty(hidden = true)
@@ -34,4 +35,7 @@
 
     @ApiModelProperty(hidden = true)
     private Long createUserId;
+
+    @ApiModelProperty(value = "导出ids", dataType = "List")
+    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificatePrintApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificatePrintApprovalListRequest.java
index b93d1c9..3cc2f4e 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificatePrintApprovalListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificatePrintApprovalListRequest.java
@@ -5,8 +5,6 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import java.util.List;
-
 /**
  * @Description:
  * @Author: wangpeng
@@ -38,7 +36,4 @@
 
     @ApiModelProperty(value = "创建结束时间", dataType = "String")
     private String createTimeEnd;
-
-    @ApiModelProperty(value = "导出ids", dataType = "List")
-    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportApprovalListRequest.java
index 4f7a038..c115847 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportApprovalListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportApprovalListRequest.java
@@ -5,8 +5,6 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import java.util.List;
-
 /**
  * @Description:
  * @Author: wangpeng
@@ -15,6 +13,8 @@
 @ApiModel
 @Data
 public class CertificateReportApprovalListRequest extends BaseApprovalListRequest {
+    @ApiModelProperty(value = "委托方id", dataType = "String")
+    private Long customerId;
 
     @ApiModelProperty(value = "证书报告编号", dataType = "String")
     private String certificateReportNo;
@@ -37,6 +37,4 @@
     @ApiModelProperty(value = "检校结束时间", dataType = "String")
     private String calibrationTimeEnd;
 
-    @ApiModelProperty(value = "导出ids", dataType = "List")
-    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/identify/IdentifyListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/identify/IdentifyListRequest.java
index 1b87ae6..f019203 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/identify/IdentifyListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/identify/IdentifyListRequest.java
@@ -4,6 +4,8 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * @Description:
  * @Author: wangpeng
@@ -26,4 +28,7 @@
 
     @ApiModelProperty(value = "打印结束时间", dataType = "String")
     private String createTimeEnd;
+
+    @ApiModelProperty(value = "导出ids", dataType = "List")
+    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListRequest.java
index 1264883..62415fb 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListRequest.java
@@ -7,6 +7,7 @@
 import lombok.Data;
 
 import javax.validation.constraints.NotBlank;
+import java.util.List;
 
 @Data
 @ApiModel
@@ -37,4 +38,6 @@
     @ApiModelProperty(value = "是否加急（1是0否null全部）", dataType = "Integer")
     private String isUrgent;
 
+    @ApiModelProperty(value = "导出ids", dataType = "List")
+    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListRequest.java
index 5201d7b..499760a 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListRequest.java
@@ -17,6 +17,9 @@
     @ApiModelProperty(value = "任务单编号", dataType = "String")
     private String orderNo;
 
+    @ApiModelProperty(value = "委托方id", dataType = "Long")
+    private Long customerId;
+
     @ApiModelProperty(value = "委托方名称", dataType = "String")
     private String customerName;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OrderSampleDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OrderSampleDTO.java
new file mode 100644
index 0000000..796edc0
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OrderSampleDTO.java
@@ -0,0 +1,19 @@
+package com.casic.missiles.dto.business.outsource;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/8/24 11:38
+ */
+@ApiModel
+@Data
+public class OrderSampleDTO {
+    @ApiModelProperty(value = "任务单id", dataType = "Long")
+    private Long orderId;
+    @ApiModelProperty(value = "受检设备id", dataType = "Long")
+    private Long sampleId;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceAssessApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceAssessApprovalListRequest.java
new file mode 100644
index 0000000..9a930c3
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceAssessApprovalListRequest.java
@@ -0,0 +1,30 @@
+package com.casic.missiles.dto.business.outsource;
+
+import com.casic.missiles.dto.BaseApprovalListRequest;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/8/24 11:01
+ */
+@ApiModel
+@Data
+public class OutsourceAssessApprovalListRequest extends BaseApprovalListRequest {
+    @ApiModelProperty(value = "评审表编号", dataType = "String")
+    private String projectNo;
+
+    @ApiModelProperty(value = "分包机构名称", dataType = "String")
+    private String outsourcerName;
+
+    @ApiModelProperty(value = "申请人", dataType = "String")
+    private String applicantName;
+
+    @ApiModelProperty(value = "申请时间开始", dataType = "String")
+    private String applicantTimeStart;
+
+    @ApiModelProperty(value = "申请时间结束", dataType = "String")
+    private String applicantTimeEnd;
+}

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java
index bb0c50f..13a699b 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java
@@ -12,6 +12,7 @@
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.IGeneralApprovalService;
+import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
@@ -19,6 +20,7 @@
 import org.springframework.web.bind.annotation.RequestBody;
 
 import javax.validation.Valid;
+import java.util.List;
 import java.util.Objects;
 
 /**
@@ -117,4 +119,17 @@
         }
         return baseApprovalService.failUpdate(request);
     }
+
+    public List<O> exportList(@RequestBody @Valid R request) throws Exception {
+        List<O> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = baseApprovalService.listExportByIds(request.getIds());
+        } else {
+            list = baseApprovalService.listExport(request);
+        }
+        for (O record : list) {
+            DictCodeUtils.convertDictCodeToName(record);
+        }
+        return list;
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java
index 8a90961..d775831 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java
@@ -5,6 +5,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.business.certificate.CertificateChangeApplyApprovalListRequest;
 import com.casic.missiles.dto.business.certificate.CertificateChangeApplySaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessCertificateChangeApply;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
@@ -20,6 +21,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -48,4 +50,12 @@
         }
         return changeApplyService.saveChangeApply(request);
     }
+
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody CertificateChangeApplyApprovalListRequest request) throws Exception {
+        List<BizBusinessCertificateChangeApply> list = super.exportList(request);
+        super.exportExcel(BizBusinessCertificateChangeApply.class, list, ExportEnum.CERTIFICATE_CHANGE_APPLY.getSheetName());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java
index 5fc4b07..af8230e 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java
@@ -9,6 +9,7 @@
 import com.casic.missiles.dto.business.certificate.CertificatePrintApprovalListRequest;
 import com.casic.missiles.dto.business.certificate.CertificatePrintListResponse;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.enums.business.CertificatePrintStatusEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessCertificatePrintLog;
@@ -18,10 +19,16 @@
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.io.IOException;
+import java.util.List;
 import java.util.Objects;
 
 /**
@@ -98,4 +105,16 @@
         });
         return certificatePrintService.certificatePrintLog(idDTO.getId());
     }
+
+    @ApiOperation("证书打印审批导出")
+    @PostMapping("/listExport")
+    public void exportList(@RequestBody CertificatePrintApprovalListRequest request) throws IOException {
+        List<CertificatePrintListResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = certificatePrintService.listByIds(request.getIds());
+        } else {
+            list = certificatePrintService.list(request);
+        }
+        super.exportExcel(CertificatePrintListResponse.class, list, ExportEnum.CERTIFICATE_PRINT.getSheetName());
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java
index 63b06dc..6b2efd5 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java
@@ -6,6 +6,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.business.certificate.CertificateReportApprovalListRequest;
 import com.casic.missiles.dto.business.certificate.CertificateReportSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessCertificateReport;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
@@ -21,6 +22,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -50,7 +52,7 @@
         return certificateReportService.saveCertificateReport(request);
     }
 
-    @ApiOperation("证书审批详情（基本信息）")
+    @ApiOperation("详情（基本信息）")
     @PostMapping("/detail")
     public ReturnDTO<BizBusinessCertificateReport> detail(@RequestBody @Valid BaseDetailRequest request, BindingResult bindingResult) throws Exception {
         if(bindingResult.hasErrors()){
@@ -59,4 +61,11 @@
         return certificateReportService.detail(request);
     }
 
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody CertificateReportApprovalListRequest request) throws Exception {
+        List<BizBusinessCertificateReport> list = super.exportList(request);
+        super.exportExcel(BizBusinessCertificateReport.class, list, ExportEnum.CERTIFICATE_REPORT.getSheetName());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java
index 46b26bd..57c0809 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java
@@ -10,20 +10,21 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.business.identify.IdentifyListRequest;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessIdentifyInfo;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.business.IBizBusinessIdentifyInfoService;
+import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import javax.validation.Valid;
+import java.util.List;
 import java.util.Objects;
 
 /**
@@ -57,16 +58,13 @@
         return identifyInfoService.addIdentify(identifyInfo);
     }
 
-    @ApiOperation("标识打印更新")
+    @ApiOperation("标识打印更新（更新打印时间）")
     @PostMapping("/update")
-    public ReturnDTO updateIdentify(@RequestBody @Valid BizBusinessIdentifyInfo identifyInfo, BindingResult bindingResult) {
-        Assert.isFalse(Objects.isNull(identifyInfo.getId()), () -> {
+    public ReturnDTO updateIdentify(@RequestBody @Valid IdDTO idDTO) {
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        Assert.isFalse(bindingResult.hasErrors(), () -> {
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        });
-        return identifyInfoService.updateIdentify(identifyInfo);
+        return identifyInfoService.updateIdentify(idDTO.getId());
     }
 
     @ApiOperation("标识打印删除")
@@ -77,4 +75,37 @@
         });
         return identifyInfoService.deleteIdentify(idDTO.getId());
     }
+
+    @ApiOperation("标识打印导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody @Valid IdentifyListRequest request, BindingResult bindingResult) throws Exception {
+        if (bindingResult.hasErrors()) {
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        List<BizBusinessIdentifyInfo> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = identifyInfoService.listByIds(request.getIds());
+        } else {
+            list = identifyInfoService.list(request);
+        }
+        for (BizBusinessIdentifyInfo record : list) {
+            DictCodeUtils.convertDictCodeToName(record);
+        }
+        super.exportExcel(BizBusinessIdentifyInfo.class, list, ExportEnum.IDENTIFY_EXPORT.getSheetName());
+    }
+
+
+    // TODO: 2023/8/23 查询设备信息，4个底部按钮查设备（按钮的作用就是前端用来调不同接口、用来区分中间即将展示的标识），前端弹窗选设备，在确定保存时前端根据底部按钮判断传入设备类型deviceType字典code
+    // TODO: 2023/8/23 接口：查受检设备（第1个按钮），查设备台账（后3个按钮同一接口），查询之后前端根据标志类型的不同加到中间页面时进行判断（按产品给的对应表）
+    // TODO: 2023/8/23 提供二维码接口，前端在加到中间页面时调用一下
+
+    @ApiOperation("设备二维码")
+    @PostMapping("/equipment/qrCode")
+    public ReturnDTO<String> equipmentQrCode(@RequestBody @Valid IdDTO idDTO) {
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return identifyInfoService.equipmentQrCode(idDTO.getId());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java
index 707be6e..7e0453d 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java
@@ -117,7 +117,7 @@
     }
 
     @ApiOperation("任务单导出")
-    @PostMapping("/export")
+    @PostMapping("/listExport")
     public void orderExport(@RequestBody @Valid OrderListRequest request, HttpServletResponse response) {
         businessOrderService.orderExport(request, response);
     }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java
index 529a6ce..51432be 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java
@@ -1,9 +1,28 @@
 package com.casic.missiles.controller.business;
 
+import com.casic.missiles.controller.GeneralApprovalController;
+import com.casic.missiles.dto.BaseApprovalSubmitRequest;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.business.outsource.OutsourceAssessApprovalListRequest;
+import com.casic.missiles.dto.business.outsource.OutsourceAssessSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
+import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.model.business.BizBusinessOutsourceAssess;
+import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
+import com.casic.missiles.service.IGeneralApprovalService;
+import com.casic.missiles.service.business.IBizBusinessOutsourceAssessService;
 import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.BindingResult;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.validation.Valid;
+import java.util.List;
+
 /**
  * <p>
  * 计量检定业务-分包管理-测试、校准或检定工作分包评审表 前端控制器
@@ -15,6 +34,27 @@
 @Api(tags = "分包管理-测试、校准或检定工作分包评审表")
 @RestController
 @RequestMapping("/business/outsource/assess")
-public class BizBusinessOutsourceAssessController {
+public class BizBusinessOutsourceAssessController extends GeneralApprovalController<BizBusinessOutsourceAssess, BizBusinessOutsourceAssess, OutsourceAssessApprovalListRequest, BaseApprovalSubmitRequest> {
+    @Autowired
+    private IBizBusinessOutsourceAssessService outsourceAssessService;
 
+    public BizBusinessOutsourceAssessController(IGeneralApprovalService<BizBusinessOutsourceAssess, BizBusinessOutsourceAssess, OutsourceAssessApprovalListRequest, BaseApprovalSubmitRequest> baseApprovalService) {
+        super(baseApprovalService);
+    }
+
+    @ApiOperation("草稿箱-保存")
+    @PostMapping("/save")
+    public ReturnDTO<OutsourceAssessSaveResponse> saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceAssess request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        return outsourceAssessService.saveOutsourceAssess(request);
+    }
+
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception {
+        List<BizBusinessOutsourceAssess> list = super.exportList(request);
+        super.exportExcel(BizBusinessOutsourceAssess.class, list, ExportEnum.OUTSOURCE_ASSESS.getSheetName());
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java
new file mode 100644
index 0000000..9adef18
--- /dev/null
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java
@@ -0,0 +1,60 @@
+package com.casic.missiles.controller.business;
+
+import com.casic.missiles.controller.GeneralApprovalController;
+import com.casic.missiles.dto.BaseApprovalSubmitRequest;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.business.outsource.OutsourceProtocolApprovalListRequest;
+import com.casic.missiles.dto.business.outsource.OutsourceProtocolSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
+import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.model.business.BizBusinessOutsourceProtocol;
+import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
+import com.casic.missiles.service.IGeneralApprovalService;
+import com.casic.missiles.service.business.IBizBusinessOutsourceProtocolService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.BindingResult;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.validation.Valid;
+import java.util.List;
+
+/**
+ * <p>
+ * 计量检定业务-分包管理-测试、校准或检定工作分包协议书 前端控制器
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-08-24
+ */
+@Api(tags = "分包管理-测试、校准或检定工作分包协议书")
+@RestController
+@RequestMapping("/business/outsource/protocol")
+public class BizBusinessOutsourceProtocolController extends GeneralApprovalController<BizBusinessOutsourceProtocol, BizBusinessOutsourceProtocol, OutsourceProtocolApprovalListRequest, BaseApprovalSubmitRequest> {
+    @Autowired
+    private IBizBusinessOutsourceProtocolService outsourceProtocolService;
+
+    public BizBusinessOutsourceProtocolController(IGeneralApprovalService<BizBusinessOutsourceProtocol, BizBusinessOutsourceProtocol, OutsourceProtocolApprovalListRequest, BaseApprovalSubmitRequest> baseApprovalService) {
+        super(baseApprovalService);
+    }
+
+    @ApiOperation("草稿箱-保存")
+    @PostMapping("/save")
+    public ReturnDTO<OutsourceProtocolSaveResponse> saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceProtocol request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        return outsourceProtocolService.saveOutsourceProtocol(request);
+    }
+
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody OutsourceProtocolApprovalListRequest request) throws Exception {
+        List<BizBusinessOutsourceProtocol> list = super.exportList(request);
+        super.exportExcel(BizBusinessOutsourceProtocol.class, list, ExportEnum.OUTSOURCE_PROTOCOL.getSheetName());
+    }
+}
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java
index 097f645..f0f0943 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java
@@ -17,7 +17,6 @@
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.IGeneralApprovalService;
 import com.casic.missiles.service.business.IBizBusinessOutsourcerInfoService;
-import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -71,19 +70,8 @@
 
     @ApiOperation("分包方导出")
     @PostMapping("/listExport")
-    public void export(@RequestBody @Valid OutsourcerInfoApprovalListRequest request, BindingResult bindingResult) throws Exception {
-        if (bindingResult.hasErrors()) {
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        }
-        List<BizBusinessOutsourcerInfo> list;
-        if (!CollectionUtils.isEmpty(request.getIds())) {
-            list = outsourcerInfoService.listByIds(request.getIds());
-        } else {
-            list = outsourcerInfoService.list(request);
-        }
-        for (BizBusinessOutsourcerInfo record : list) {
-            DictCodeUtils.convertDictCodeToName(record);
-        }
+    public void export(@RequestBody OutsourcerInfoApprovalListRequest request) throws Exception {
+        List<BizBusinessOutsourcerInfo> list = super.exportList(request);
         super.exportExcel(BizBusinessOutsourcerInfo.class, list, ExportEnum.OUTSOURCER_EXPORT.getSheetName());
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java
index c2cbf9f..0410918 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java
@@ -17,11 +17,9 @@
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.IGeneralApprovalService;
 import com.casic.missiles.service.business.IBizBusinessSiteExecutiveInfoService;
-import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -60,7 +58,7 @@
         return siteExecutiveInfoService.saveSiteExecutiveInfo(siteExecutiveInfo);
     }
 
-    @ApiOperation("现场检测详情")
+    @ApiOperation("详情")
     @PostMapping("/detail")
     public ReturnDTO<SiteExecutiveDetailResponse> siteExecutiveDetail(@RequestBody @Valid IdDTO idDTO) throws Exception {
         Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
@@ -69,21 +67,10 @@
         return ReturnUtil.success(siteExecutiveInfoService.detail(idDTO.getId()));
     }
 
-    @ApiOperation("现场检测导出")
+    @ApiOperation("导出")
     @PostMapping("/listExport")
-    public void export(@RequestBody @Valid SiteExecutiveApprovalListRequest request, BindingResult bindingResult) throws Exception {
-        if (bindingResult.hasErrors()) {
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        }
-        List<SiteExecutiveApprovalListResponse> list;
-        if (!CollectionUtils.isEmpty(request.getIds())) {
-            list = siteExecutiveInfoService.listInfoByIds(request.getIds());
-        } else {
-            list = siteExecutiveInfoService.listInfo(request);
-        }
-        for (SiteExecutiveApprovalListResponse record : list) {
-            DictCodeUtils.convertDictCodeToName(record);
-        }
+    public void export(@RequestBody SiteExecutiveApprovalListRequest request) throws Exception {
+        List<SiteExecutiveApprovalListResponse> list = super.exportList(request);
         super.exportExcel(SiteExecutiveApprovalListResponse.class, list, ExportEnum.SITE_EXECUTIVE_EXPORT.getSheetName());
     }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
index 7e793cd..a92e209 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
@@ -55,7 +55,7 @@
 
     @ApiOperation("设备收发列表导出")
     @PostMapping("/export")
-    public void exportList(@RequestBody @Valid SampleDispatchListRequest request) throws IOException {
+    public void exportList(@RequestBody SampleDispatchListRequest request) throws IOException {
         List<SampleDispatchListResponse> list;
         if (!CollectionUtils.isEmpty(request.getIds())) {
             list = dispatchService.listByIds(request.getIds());
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java
index cdc77fc..d120fd4 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java
@@ -7,6 +7,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.business.labExecutive.*;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.business.IBusinessLabExecutiveInfoService;
@@ -14,6 +15,7 @@
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.*;
 
@@ -32,7 +34,7 @@
     @Autowired
     private IBusinessLabExecutiveInfoService labExecutiveInfoService;
 
-    @ApiOperation("实验室检测-部门检测-查询各状态列表（待检测、检测中、检测完）")
+    @ApiOperation("实验室任务-查询各状态列表（待检测、检测中、检测完）")
     @PostMapping("/deptExecutive/List")
     public ReturnDTO<PageInfoBT<SampleLabExecutiveListResponse>> queryDeptExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
@@ -43,10 +45,19 @@
         return ReturnUtil.success(super.packForBT(labExecutiveInfoService.deptLabExecutiveListPage(page, labExecutiveListRequest)));
     }
 
-    /**
-     * 实验室检测-我的检测-查询各状态列表（待检测、检测中、检测完）
-     */
-    @ApiOperation("实验室检测-我的检测-查询各状态列表（待检测、检测中、检测完）")
+    @ApiOperation("实验室任务导出")
+    @PostMapping("/deptExecutive/export")
+    public void deptExportList(@RequestBody @Valid SampleLabExecutiveListRequest request) throws Exception {
+        List<SampleLabExecutiveListResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = labExecutiveInfoService.deptLabExecutiveListByIds(request.getMeasureStatus(), request.getIds());
+        } else {
+            list = labExecutiveInfoService.deptLabExecutiveList(request);
+        }
+        super.exportExcel(SampleLabExecutiveListResponse.class, list, ExportEnum.DEPT_EXECUTIVE_TASK.getSheetName());
+    }
+
+    @ApiOperation("我的任务-查询各状态列表（待检测、检测中、检测完）")
     @PostMapping("/myExecutive/list")
     public ReturnDTO<PageInfoBT<SampleLabExecutiveListResponse>> queryMyExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
@@ -57,19 +68,25 @@
         return ReturnUtil.success(super.packForBT(labExecutiveInfoService.myLabExecutiveListPage(page, labExecutiveListRequest)));
     }
 
-    /**
-     * 实验室检测-我的检测-查询各状态样品数量（待检测、检测中、检测完）
-     */
-    @ApiOperation("实验室检测-我的检测-查询各状态样品数量（待检测、检测中、检测完）")
+    @ApiOperation("我的任务导出")
+    @PostMapping("/myExecutive/export")
+    public void exportList(@RequestBody @Valid SampleLabExecutiveListRequest request) throws Exception {
+        List<SampleLabExecutiveListResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = labExecutiveInfoService.myLabExecutiveListByIds(request.getMeasureStatus(), request.getIds());
+        } else {
+            list = labExecutiveInfoService.myLabExecutiveList(request);
+        }
+        super.exportExcel(SampleLabExecutiveListResponse.class, list, ExportEnum.MY_EXECUTIVE_TASK.getSheetName());
+    }
+
+    @ApiOperation("我的任务-查询各状态样品数量（待检测、检测中、检测完）")
     @GetMapping("/myExecutive/amount")
     public ReturnDTO<List<SampleAmountResponse>> queryMyExecutiveAmount() {
         return ReturnUtil.success(labExecutiveInfoService.myExecutiveAmount());
     }
 
-    /**
-     * 实验室检测-部门检测-分配（分配给具体人员）
-     */
-    @ApiOperation("实验室检测-部门检测-分配按钮（分配给具体人员）")
+    @ApiOperation("实验室任务-分配按钮（分配给具体人员）")
     @PostMapping("/deptExecutive/allocate")
     public ReturnDTO allocateStaff(@RequestBody @Valid SampleAllocateRequest sampleAllocateRequest, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -78,10 +95,7 @@
         return labExecutiveInfoService.allocateStaff(sampleAllocateRequest);
     }
 
-    /**
-     * 实验室检测-我的检测-检定人扫描收入（待检测->检测中）
-     */
-    @ApiOperation("实验室检测-我的检测-检定人扫描收入（待检测->检测中）")
+    @ApiOperation("我的任务-检定人扫描收入（待检测->检测中）")
     @PostMapping("/myExecutive/receive")
     public ReturnDTO sampleReceive(@RequestBody @Valid List<SampleOperateRequest> requestList, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -90,10 +104,7 @@
         return labExecutiveInfoService.sampleReceive(requestList);
     }
 
-    /**
-     * 实验室检测-负责人/检定人扫描检完（检测中->检测完）
-     */
-    @ApiOperation("实验室检测-负责人/检定人扫描检完（检测中->检测完）")
+    @ApiOperation("实验室任务-负责人/检定人扫描检完（检测中->检测完）")
     @PostMapping("/myExecutive/complete")
     public ReturnDTO sampleExecutiveComplete(@RequestBody @Valid List<SampleOperateRequest> requestList, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -102,10 +113,7 @@
         return labExecutiveInfoService.sampleExecutiveComplete(requestList);
     }
 
-    /**
-     * 实验室检测-部门检测/我的检测 编辑（只能修改应出具证书）
-     */
-    @ApiOperation("实验室检测-部门检测/我的检测 编辑（只能修改应出具证书）")
+    @ApiOperation("实验室任务/我的任务 编辑（只能修改应出具证书）")
     @PostMapping("/executive/update")
     public ReturnDTO updateExecutive(@RequestBody @Valid UpdateExecutiveRequest request, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -114,10 +122,7 @@
         return labExecutiveInfoService.updateExecutive(request);
     }
 
-    /**
-     * 实验室检测-部门检测/我的检测 详情
-     */
-    @ApiOperation("实验室检测-部门检测/我的检测 详情")
+    @ApiOperation("实验室任务/我的任务 详情")
     @PostMapping("/executive/detail")
     public ReturnDTO<ExecutiveDetailResponse> executiveDetail(@RequestBody @Valid ExecutiveDetailRequest request, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
@@ -131,7 +136,7 @@
      * 退回后会将下一个要执行的实验室检测状态更新为待分配，将后面的实验室顺序变更为连续（都进行减1）
      * 最后一个检测的实验室退回，等分发员再增加实验室或设备收发中的已收入直接手动点击完成
      */
-    @ApiOperation("实验室检测-部门检测/我的检测 退回（待检测/检测中->退回）")
+    @ApiOperation("实验室任务/我的任务 退回（待检测/检测中->退回）")
     @PostMapping("/executive/sendBack")
     public ReturnDTO executiveSendBack(@RequestBody @Valid ExecutiveSendBackRequest request, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -140,9 +145,6 @@
         return labExecutiveInfoService.sampleExecutiveSendBack(request);
     }
 
-    /**
-     * 分发员编辑实验室检测列表
-     */
     @ApiOperation("分发员编辑实验室检测列表")
     @PostMapping("/handOut/updateList")
     public ReturnDTO updateExecutiveList(@RequestBody @Valid UpdateExecutiveListRequest request, BindingResult bindingResult) {
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java
index 48a67ed..0c04f31 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java
@@ -10,6 +10,7 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.resource.customer.CustomerApprovalListRequest;
 import com.casic.missiles.dto.resource.customer.CustomerSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceCustomerInfo;
@@ -26,6 +27,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -55,6 +57,13 @@
         return customerInfoService.saveCustomerInfo(request);
     }
 
+    @ApiOperation("委托方名录导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody CustomerApprovalListRequest request) throws Exception {
+        List<BizResourceCustomerInfo> list = super.exportList(request);
+        super.exportExcel(BizResourceCustomerInfo.class, list, ExportEnum.CUSTOMER_INFO.getSheetName());
+    }
+
     @ApiOperation("委托方人员列表（分页）")
     @PostMapping("/person/listPage")
     public ReturnDTO<PageInfoBT<BizResourceCustomerStaff>> personListPage(@RequestBody IdDTO idDto) {
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
index 972ed4b..6418ea5 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
@@ -5,6 +5,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.resource.customer.SuggestFormApprovalListRequest;
 import com.casic.missiles.dto.resource.customer.SuggestFormSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceCustomerSuggestForm;
@@ -20,6 +21,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -50,4 +52,11 @@
         return suggestFormService.saveSuggestForm(request);
     }
 
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody SuggestFormApprovalListRequest request) throws Exception {
+        List<BizResourceCustomerSuggestForm> list = super.exportList(request);
+        super.exportExcel(BizResourceCustomerSuggestForm.class, list, ExportEnum.CUSTOMER_SUGGEST_FORM.getSheetName());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java
index 1934d1a..9e07eab 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java
@@ -15,12 +15,16 @@
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.resource.IEnvEnvironmentRecordConfigService;
 import com.casic.missiles.service.resource.IEnvEnvironmentRecordDataService;
+import com.casic.missiles.service.resource.IEnvLocationInfoService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
 import java.util.List;
@@ -39,6 +43,8 @@
     private IEnvEnvironmentRecordDataService environmentRecordDataService;
     @Autowired
     private IEnvEnvironmentRecordConfigService environmentRecordConfigService;
+    @Autowired
+    private IEnvLocationInfoService locationInfoService;
 
     @ApiOperation("环境记录单数据列表/详情")
     @PostMapping("/data/listPage")
@@ -95,4 +101,11 @@
         });
         return environmentRecordConfigService.deleteEnvironmentRecordConfig(idDTO.getId());
     }
+
+    @ApiOperation("地点列表")
+    @PostMapping("/location/listPage")
+    public ReturnDTO<PageInfoBT<LocationListResponse>> locationListPage(@RequestBody @Valid LocationListRequest request) {
+        Page<LocationListResponse> page = PageFactory.defaultPage();
+        return ReturnUtil.success(super.packForBT(locationInfoService.listPage(page, request)));
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java
index 82efe3f..e9561fa 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java
@@ -10,6 +10,7 @@
 import com.casic.missiles.dto.resource.seal.SealLogListRequest;
 import com.casic.missiles.dto.resource.seal.SealNoteApprovalListRequest;
 import com.casic.missiles.dto.resource.seal.SealNoteSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceSealUseLog;
@@ -27,6 +28,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -58,6 +60,13 @@
         return sealUseNoteService.saveSeal(request);
     }
 
+    @ApiOperation("印章使用登记导出（列表和导出中去掉经办人和监印人）")
+    @PostMapping("/listExport")
+    public void export(@RequestBody SealNoteApprovalListRequest request) throws Exception {
+        List<BizResourceSealUseNote> list = super.exportList(request);
+        super.exportExcel(BizResourceSealUseNote.class, list, ExportEnum.SEAL_NOTE.getSheetName());
+    }
+
     // TODO: 2023/7/28 印章使用日志：系统中使用印章时插入数据库
 
     @ApiOperation("印章使用日志列表（分页）")
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java
index 9b674fc..06b6521 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java
@@ -9,16 +9,20 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.resource.staff.StaffCertRequest;
 import com.casic.missiles.dto.resource.staff.StaffCertResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.service.resource.IBizResourceStaffInfoService;
 import com.casic.missiles.service.resource.IBizResourceStaffVerifierService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.List;
+
 /**
  * @Description:
  * @Author: wangpeng
@@ -41,9 +45,21 @@
         return ReturnUtil.success(super.packForBT(responsePage));
     }
 
+    @ApiOperation("证书逾期提醒导出")
+    @PostMapping("/listExport")
+    public void exportList(@RequestBody StaffCertRequest request) throws Exception {
+        List<StaffCertResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = staffInfoService.certListByIds(request.getIds());
+        } else {
+            list = staffInfoService.certList(request);
+        }
+        super.exportExcel(StaffCertResponse.class, list, ExportEnum.STAFF_CERTIFICATE_EXPIRE.getSheetName());
+    }
+
     @ApiOperation("证书逾期提醒")
     @PostMapping("/expirationReminder")
-    public ReturnDTO expirationReminder(@RequestBody IdDTO idDto) {
-        return verifierService.expirationReminder(idDto);
+    public ReturnDTO expirationReminder(@RequestBody IdDTO idDTO) {
+        return verifierService.expirationReminder(idDTO);
     }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java
index 3b251ad..a6e7850 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java
@@ -12,6 +12,7 @@
 import com.casic.missiles.dto.resource.staff.StaffListRequest;
 import com.casic.missiles.dto.resource.staff.TrainListRequest;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.*;
@@ -22,7 +23,10 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
 import java.util.List;
@@ -52,8 +56,19 @@
             throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
         }
         Page<BizResourceStaffInfo> page = PageFactory.defaultPage();
-        Page<BizResourceStaffInfo> responsePage = staffInfoService.listPage(page, request);
-        return ReturnUtil.success(super.packForBT(responsePage));
+        return ReturnUtil.success(super.packForBT(staffInfoService.listPage(page, request)));
+    }
+
+    @ApiOperation("人员登记导出")
+    @PostMapping("/listExport")
+    public void exportList(@RequestBody StaffListRequest request) throws Exception {
+        List<BizResourceStaffInfo> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = staffInfoService.listByIds(request.getIds());
+        } else {
+            list = staffInfoService.list(request);
+        }
+        super.exportExcel(BizResourceStaffInfo.class, list, ExportEnum.STAFF_INFO.getSheetName());
     }
 
     @ApiOperation("人员登记详情基础信息")
@@ -85,9 +100,9 @@
 
     @ApiOperation("科研教育列表（分页）")
     @PostMapping("/education/listPage")
-    public ReturnDTO<PageInfoBT<BizResourceStaffEducation>> educationListPage(@RequestBody IdDTO idDto) {
+    public ReturnDTO<PageInfoBT<BizResourceStaffEducation>> educationListPage(@RequestBody IdDTO idDTO) {
         Page<BizResourceStaffEducation> page = PageFactory.defaultPage();
-        Page<BizResourceStaffEducation> responsePage = staffInfoService.educationListPage(page, idDto);
+        Page<BizResourceStaffEducation> responsePage = staffInfoService.educationListPage(page, idDTO);
         return ReturnUtil.success(super.packForBT(responsePage));
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java
index af6aa86..d85d84a 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java
@@ -9,6 +9,7 @@
 import com.casic.missiles.dto.resource.outsideService.SupplierApprovalListRequest;
 import com.casic.missiles.dto.resource.outsideService.SupplierSaveResponse;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceSupplierAbility;
@@ -67,6 +68,13 @@
         return ReturnUtil.success(supplierInfoService.detail(idDTO.getId()));
     }
 
+    @ApiOperation("合格供方导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody SupplierApprovalListRequest request) throws Exception {
+        List<BizResourceSupplierInfo> list = super.exportList(request);
+        super.exportExcel(BizResourceSupplierInfo.class, list, ExportEnum.SUPPLIER_INFO.getSheetName());
+    }
+
     @ApiOperation("供方人员列表（分页）")
     @PostMapping("/person/listPage")
     public ReturnDTO<PageInfoBT<BizResourceSupplierPerson>> personListPage(@RequestBody IdDTO idDTO) {
diff --git a/casic-metering-api/src/main/resources/config/application.yml b/casic-metering-api/src/main/resources/config/application.yml
index 350db5f..ecff521 100644
--- a/casic-metering-api/src/main/resources/config/application.yml
+++ b/casic-metering-api/src/main/resources/config/application.yml
@@ -126,7 +126,7 @@
     #作者
     author: wangpeng
     #待生成对象表名
-    table-name: biz_equipment_technical_target_approval,biz_equipment_attachment_approval,biz_equipment_checkpoint_approval
+    table-name: biz_business_outsource_protocol
 
 reminder:
   #节点--common模块config包 ReminderNodeConfig配置
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
index 4a19e4e..d47d552 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
@@ -53,6 +53,7 @@
     SUGGEST_FORM_SAVE_FAILED(2509, "委托方意见登记表保存至草稿箱失败"),
     EXAMINE_FORM_SAVE_FAILED(2510, "要求、委托书及合同评审表保存至草稿箱失败"),
     CUSTOMER_EXIST_SAVE_FAILED(2511, "该委托方已存在，请重新选择"),
+    DUPLICATE_LOCATION_NO(2512, "地点编号已存在"),
 
     /**
      * 计量检定业务模块
@@ -68,6 +69,8 @@
     COMPLETE_SAMPLE_NOT_EXIST(2609, "检测中不存在扫描收入的样品"),
     CANNOT_CHANGE_MEASURE_INFO(2610, "无法更改非当前登录用户的检测信息"),
     NON_EXIST_ORDER_OR_SAMPLE(2611, "不存在该委托单或该委托单下的样品"),
+    OUTSOURCE_ACCESS_SAVE_FAILED(2612, "测试、校准或检定工作分包评审表保存至草稿箱失败"),
+    OUTSOURCE_PROTOCOL_SAVE_FAILED(2613, "测试、校准或检定工作分包协议书保存至草稿箱失败"),
 
     /**
      * 历史遗留备用
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
index 5089ad1..81a406b 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
@@ -10,54 +10,38 @@
     /**
      * 资源管理
      */
-    ENVIRONMENT_DATA_EXPORT("environmentData", "environmentData", "环境记录单数据"),
+    ENVIRONMENT_DATA_EXPORT("environmentData", "环境记录单数据", "环境记录单数据"),
+    STAFF_INFO("staffInfo", "人员登记", "人员登记"),
+    STAFF_CERTIFICATE_EXPIRE("certificateExpire", "证书逾期提醒", "证书逾期提醒"),
+    SUPPLIER_INFO("supplierInfo", "合格供方名录", "合格供方名录"),
+    CUSTOMER_INFO("customerInfo", "委托方名录", "委托方名录"),
+    CUSTOMER_SUGGEST_FORM("customerSuggestForm", "委托方意见登记表", "委托方意见登记表"),
+    SEAL_NOTE("sealNote", "印章使用登记", "印章使用登记"),
 
-    FILE_EXPORT("meterFileData", "meterFileData", "计量文件信息"),
-    TRAIN_PLAN_EXPORT("trainPlanData", "trainPlanData", "培训计划"),
-    TRAIN_LOG_EXPORT("trainLogData", "trainLogData", "培训记录"),
-    METER_ORGANIZE_EXPORT("meterOrganizeData", "meterOrganizeData", "计量组织"),
-    TRACE_SUPPLIER_EXPORT("traceSupplierData", "traceSupplierData", "溯源供方"),
-    SIGN_EXPORT("signData", "signData", "签名/签章"),
-    TEMPLATE_EXPORT("templateData", "templateData", "原始记录模板/证书报告模板"),
-    FIXED_ASSETS("meterFixedAssets", "meterFixedAssets", "固定资产"),
-    METER_EQUIPMENT("meterEquipment", "meterEquipment", "测量设备"),
-    CALIBRATION_TEST_EQUIPMENT("calibrationTestEquipment", "calibrationTestEquipment", "校准检定设备"),
-    MEASURE_ACCOUNT("measureAccount", "measureAccount", "测量工装"),
-    STANDARD_SUPPORT_EQUIPMENT("standardSupportEquipment", "standardSupportEquipment", "标准配套设备"),
-    STANDARD_EQUIPMENT("standardEquipment", "standardEquipment", "标准装置"),
-    FLOW_DEF_EXPORT("flowDefData", "flowDefData", "流程定义"),
-    STAFF_CERTIFICATE("certificate", "certificate", "计量人员证书"),
-    CHECK_INFO("checkInfo", "checkInfo", "设备管理点检测"),
-    EQUIPMENT_APPLY("equipmentApply", "equipmentApply", "设备借用"),
-    STANDARD_EQUIPMENT_REMIND("equipmentApplyRemind", "equipmentApplyRemind", "标准装置到期提醒"),
-    METER_PRICE("meterPrice", "meterPrice", "价格库"),
-    METER_STAFF("meterStaff", "meterStaff", "计量人员"),
-    STANDARD_EQUIPMENT_APPLY("standardEquipmentApply", "standardEquipmentApply", "标准装置申请"),
-    STATE_MANAGE_APPLY("stateManage", "stateManage", "状态管理"),
-    METER_ACCEPTANCE_CHECK("acceptanceCheck", "acceptanceCheck", "设备检修保养验收单"),
-    CUSTOMER_EXPORT("customerData", "customerData", "客户信息"),
-    ORDER_EXPORT("orderData", "orderData", "委托书信息"),
-    SAMPLE_EXPORT("sampleData", "sampleData", "样本信息"),
-    EXCHANGE_DATA("exchangeData", "exchangeData", "设备交接单"),
-    DISPATCH_DATA("dispatchData", "dispatchData", "设备收发"),
-    ENVIRONMENT_DATA("environmentData", "environmentData", "环境记录单"),
-    ORIGIN_DATA("originData", "originData", "原始记录"),
-    CERTIFICATE_REPORT("certificateReport", "certificateReport", "证书报告"),
-    ADVICE_EXPORT("adviceData", "adviceData", "客户反馈"),
-    HANDOUT_EXPORT("handoutData", "handoutData", "任务分发列表"),
-    OUTSOURCER_EXPORT("outsourcerData", "outsourcerData", "分包方"),
-    SITE_EXECUTIVE_EXPORT("siteExecutiveData", "siteExecutiveData", "现场测试、校准或检定"),
-    CERTIFICATE_PRINT_EXPORT("certificatePrintData", "certificatePrintData", "证书打印"),
-    DOWNLOAD_TEMPLATE("downloadTemplate", "downloadTemplate", "页面配置"),
-    OUTSOURCER_CERTIFICATE_EXPORT("outsourceCertificateData", "outsourceCertificateData", "分包证书"),
-    SETTLEMENT_INFO_EXPORT("settlementInfoData", "settlementInfoData", "业务结算"),
-    EQUIPMENT_REMIND("equipmentRemind", "equipmentRemind", "设备到期提醒"),
-    AGREEMENT_INFO_EXPORT("agreementInfoData", "agreementInfoData", "合同"),
-    WORK_STATISTICS_EXPORT("workStatisticsData", "workStatisticsData", "实时工作统计"),
-    DEPT_OUTPUT_EXPORT("deptOutputData", "deptOutputData", "部门产值分析"),
-    WORKLOAD_EXPORT("workloadData", "workloadData", "业务工作量分析"),
-    DEPT_COMPREHENSIVE_EXPORT("deptComprehensiveData", "deptComprehensiveData", "部门综合分析"),
-    ENVIRONMENTAL_RECORD("environmentalRecordData", "environmentalRecordData", "现场环境记录");
+    /**
+     * 计量检定业务
+     */
+    OUTSOURCER_EXPORT("outsourcerData", "分包方名录", "分包方名录"),
+    IDENTIFY_EXPORT("identifyData", "计量标识", "计量标识"),
+    ORDER_EXPORT("orderData", "任务单", "任务单"),
+    DISPATCH_DATA("dispatchData", "设备收发", "设备收发"),
+    HANDOUT_EXPORT("handoutData", "任务分发", "任务分发"),
+    SITE_EXECUTIVE_EXPORT("siteExecutiveData", "现场测试、校准或检定", "现场测试、校准或检定"),
+    CERTIFICATE_REPORT("certificateReport", "证书审批", "证书审批"),
+    CERTIFICATE_CHANGE_APPLY("certificateChangeApply", "证书报告补充或更换申请单", "证书报告补充或更换申请单"),
+    CERTIFICATE_PRINT("certificatePrintData", "证书打印审批", "证书打印审批"),
+    DEPT_EXECUTIVE_TASK("deptExecutiveTaskData", "实验室任务", "实验室任务"),
+    MY_EXECUTIVE_TASK("myExecutiveTaskData", "我的任务", "我的任务"),
+    OUTSOURCE_ASSESS("outsourceAssess", "测试、校准或检定工作分包评审表", "测试、校准或检定工作分包评审表"),
+    OUTSOURCE_PROTOCOL("outsourceProtocol", "测试、校准或检定工作分包协议书", "测试、校准或检定工作分包协议书"),
+
+    /**
+     * 系统管理
+     */
+    SIGN_EXPORT("signData", "签名", "签名"),
+    TEMPLATE_EXPORT("templateData", "文件模板", "文件模板"),
+    FLOW_DEF_EXPORT("flowDefData", "流程定义", "流程定义"),
+    DOWNLOAD_TEMPLATE("downloadTemplate", "流程定义", "页面配置");
 
     ExportEnum(String fileName, String sheetName, String description) {
         this.fileName = fileName;
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateRecordTypeCodeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateRecordTypeCodeEnum.java
index 31d913c..a963522 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateRecordTypeCodeEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateRecordTypeCodeEnum.java
@@ -46,4 +46,14 @@
     String SITE_EXECUTIVE_APPROVAL = "01";
     //《现场测试、校准或检定工作记录表》
     String SITE_EXECUTIVE_LOG = "02";
+
+    //测试、校准或检定工作分包协议书
+    String OUTSOURCE_PROTOCOL = "01";
+    //测试、校准或检定工作分包评审表
+    String OUTSOURCE_ACCESS = "02";
+    //测试、校准或检定工作分包通知书
+    String OUTSOURCE_NOTICE = "03";
+    //测试、校准或检定工作分包方名录
+    String OUTSOURCE_INFO = "04";
+
 }
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
index 24b8635..f78bd53 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
@@ -15,6 +15,10 @@
     String CERTIFICATE_CHANGE_APPLY_BEAN_NAME = "certificateChangeApplyBean";
     //现场测试、校准或检定
     String SITE_EXECUTIVE_BEAN_NAME = "siteExecutiveBean";
+    //测试、校准或检定工作分包评审表
+    String OUTSOURCE_ASSESS_BEAN_NAME = "outsourceAssessBean";
+    //测试、校准或检定工作分包协议书
+    String OUTSOURCE_PROTOCOL_BEAN_NAME = "outsourceProtocolBean";
 
     /*********************************设备与装置************************************/
     //设备台账
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 b21c661..6b86fd1 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
@@ -18,6 +18,8 @@
     OUTSOURCER_APPROVAL(OUTSOURCER_BEAN_NAME, ""),
     CERTIFICATE_CHANGE_APPROVAL(CERTIFICATE_CHANGE_APPLY_BEAN_NAME, ""),
     SITE_EXECUTIVE_APPROVAL(SITE_EXECUTIVE_BEAN_NAME, ""),
+    OUTSOURCE_ASSESS_APPROVAL(OUTSOURCE_ASSESS_BEAN_NAME, ""),
+    OUTSOURCE_PROTOCOL_APPROVAL(OUTSOURCE_PROTOCOL_BEAN_NAME, ""),
 
     ACTION_STATUS_MAP(new HashMap<String, AwareActionStatusEnum>() {
         {
@@ -47,6 +49,10 @@
             put(ApplyFromIdEnum.CERTIFICATE_CHANGE_APPROVAL.getCode(), CERTIFICATE_CHANGE_APPROVAL);
             //现场测试、校准或检定审批
             put(ApplyFromIdEnum.SITE_EXECUTIVE_APPROVAL.getCode(), SITE_EXECUTIVE_APPROVAL);
+            //测试、校准或检定工作分包评审表
+            put(ApplyFromIdEnum.OUTSOURCE_ASSESS_APPROVAL.getCode(), OUTSOURCE_ASSESS_APPROVAL);
+            //测试、校准或检定工作分包协议书
+            put(ApplyFromIdEnum.OUTSOURCE_PROTOCOL_APPROVAL.getCode(), OUTSOURCE_PROTOCOL_APPROVAL);
         }
     });
     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 934405e..c7410bd 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
@@ -9,6 +9,8 @@
     CERTIFICATE_CHANGE_APPROVAL("jljdywzsbchghsqd", MessageSourceModuleEnum.BUSINESS.getCode(), "证书/报告补充或更换申请单"),
     OUTSOURCER_APPROVAL("jljdywcsjzhgfbfml", MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定合格分包方名录"),
     SITE_EXECUTIVE_APPROVAL("jljdywxccsjzsp", MessageSourceModuleEnum.BUSINESS.getCode(), "现场测试、校准或检定审批"),
+    OUTSOURCE_ASSESS_APPROVAL("jljdywcsjzfbpsb", MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包评审表"),
+    OUTSOURCE_PROTOCOL_APPROVAL("jljdywcsjzfbxys", MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包协议书"),
 
 
     /*******************************************设备与装置*********************************************/
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/GeneralApprovalMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/GeneralApprovalMapper.java
index 4fb7344..0c9d6ae 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/GeneralApprovalMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/GeneralApprovalMapper.java
@@ -17,8 +17,4 @@
 
     Page<O> selectBatchForApprovalList(Page<O> page, @Param("request") R request, @Param("businessKeys") List<String> businessKeys);
 
-//    Page<O> selectListPage(Page<O> page, @Param("request") R request);
-
-//    Long selectMaxNo();
-
 }
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceAssessMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceAssessMapper.java
index 7867bb8..ba59009 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceAssessMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceAssessMapper.java
@@ -1,7 +1,12 @@
 package com.casic.missiles.mapper.business;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.business.outsource.OutsourceAssessApprovalListRequest;
+import com.casic.missiles.mapper.GeneralApprovalMapper;
 import com.casic.missiles.model.business.BizBusinessOutsourceAssess;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * <p>
@@ -11,6 +16,10 @@
  * @author wangpeng
  * @since 2023-08-16
  */
-public interface BizBusinessOutsourceAssessMapper extends BaseMapper<BizBusinessOutsourceAssess> {
+public interface BizBusinessOutsourceAssessMapper extends GeneralApprovalMapper<BizBusinessOutsourceAssess, BizBusinessOutsourceAssess, OutsourceAssessApprovalListRequest> {
+
+    Page<BizBusinessOutsourceAssess> selectBatchForApprovalList(Page<BizBusinessOutsourceAssess> page, @Param("request") OutsourceAssessApprovalListRequest request, @Param("businessKeys") List<String> businessKeys);
+
+    Long selectMaxProjectNo();
 
 }
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceProtocolMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceProtocolMapper.java
new file mode 100644
index 0000000..e6aba35
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceProtocolMapper.java
@@ -0,0 +1,24 @@
+package com.casic.missiles.mapper.business;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.business.outsource.OutsourceProtocolApprovalListRequest;
+import com.casic.missiles.mapper.GeneralApprovalMapper;
+import com.casic.missiles.model.business.BizBusinessOutsourceProtocol;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 计量检定业务-分包管理-测试、校准或检定工作分包协议书 Mapper 接口
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-08-24
+ */
+public interface BizBusinessOutsourceProtocolMapper extends GeneralApprovalMapper<BizBusinessOutsourceProtocol, BizBusinessOutsourceProtocol, OutsourceProtocolApprovalListRequest> {
+
+    Page<BizBusinessOutsourceProtocol> selectBatchForApprovalList(Page<BizBusinessOutsourceProtocol> page, @Param("request") OutsourceProtocolApprovalListRequest request, @Param("businessKeys") List<String> businessKeys);
+
+    Long selectMaxProtocolNo();
+}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/EnvLocationInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/EnvLocationInfoMapper.java
new file mode 100644
index 0000000..49eff87
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/EnvLocationInfoMapper.java
@@ -0,0 +1,21 @@
+package com.casic.missiles.mapper.resource;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.resource.environment.LocationListRequest;
+import com.casic.missiles.dto.resource.environment.LocationListResponse;
+import com.casic.missiles.model.resource.EnvLocationInfo;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * <p>
+ * 实验室环境监控系统-设备表 Mapper 接口
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-06-07
+ */
+public interface EnvLocationInfoMapper extends BaseMapper<EnvLocationInfo> {
+
+    Page<LocationListResponse> selectLocationListPage(Page<LocationListResponse> page, @Param("request") LocationListRequest request);
+}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java
index de124db..85ed0f7 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java
@@ -1,7 +1,9 @@
 package com.casic.missiles.mapper.system;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.dto.system.SignDetailResponse;
+import com.casic.missiles.dto.system.SignListRequest;
 import com.casic.missiles.model.system.SystemSign;
 import org.apache.ibatis.annotations.Param;
 
@@ -22,4 +24,8 @@
     SignDetailResponse selectSignDetailById(Long id);
 
     List<SystemSign> selectUsableSignList(@Param("userId") Long userId);
+
+    Page<SystemSign> selectSignListPage(Page<SystemSign> page, @Param("request") SignListRequest request);
+
+    List<SystemSign> selectSignList(@Param("request") SignListRequest request);
 }
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateChangeApplyMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateChangeApplyMapper.xml
index d798447..c496092 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateChangeApplyMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateChangeApplyMapper.xml
@@ -30,31 +30,31 @@
         SELECT *
         FROM biz_business_certificate_change_apply
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.changeApplyNo != null and request.changeApplyNo !=''">
+        <if test="request != null and request.changeApplyNo != null and request.changeApplyNo !=''">
             and change_apply_no like concat('%',#{request.changeApplyNo},'%')
         </if>
-        <if test="request.changeReportNo != null and request.changeReportNo !=''">
+        <if test="request != null and request.changeReportNo != null and request.changeReportNo !=''">
             and change_report_no like concat('%',#{request.changeReportNo},'%')
         </if>
-        <if test="request.changeReportName != null and request.changeReportName !=''">
+        <if test="request != null and request.changeReportName != null and request.changeReportName !=''">
             and change_report_name like concat('%',#{request.changeReportName},'%')
         </if>
-        <if test="request.changeType != null and request.changeType !=''">
+        <if test="request != null and request.changeType != null and request.changeType !=''">
             and change_type = #{request.changeType}
         </if>
-        <if test="request.createUserName != null and request.createUserName !=''">
+        <if test="request != null and request.createUserName != null and request.createUserName !=''">
             and create_user_name like concat('%',#{request.createUserName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificatePrintMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificatePrintMapper.xml
index b66cd99..49c0ac8 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificatePrintMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificatePrintMapper.xml
@@ -31,34 +31,34 @@
         LEFT JOIN biz_business_order_sample_relation bosr ON (bosr.order_id = bcr.order_id AND bosr.sample_id = bcr.sample_id)
         LEFT JOIN biz_business_order_info boi ON boi.id = bosr.order_id
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and bcp.approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.printStatus != null and request.printStatus !=''">
+        <if test="request != null and request.printStatus != null and request.printStatus !=''">
             and print_status = #{request.printStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and bcp.create_user_id = #{request.createUserId}
         </if>
-        <if test="request.certificateReportNo != null and request.certificateReportNo !=''">
+        <if test="request != null and request.certificateReportNo != null and request.certificateReportNo !=''">
             and bcr.certificate_report_no like concat('%',#{request.certificateReportNo},'%')
         </if>
-        <if test="request.certificateReportName != null and request.certificateReportName !=''">
+        <if test="request != null and request.certificateReportName != null and request.certificateReportName !=''">
             and bcr.certificate_report_name like concat('%',#{request.certificateReportName},'%')
         </if>
-        <if test="request.customerName != null and request.customerName !=''">
+        <if test="request != null and request.customerName != null and request.customerName !=''">
             and boi.customer_name like concat('%',#{request.customerName},'%')
         </if>
-        <if test="request.sampleNo != null and request.sampleNo !=''">
+        <if test="request != null and request.sampleNo != null and request.sampleNo !=''">
             and bosr.sample_no like concat('%',#{request.sampleNo},'%')
         </if>
-        <if test="request.sampleName != null and request.sampleName !=''">
+        <if test="request != null and request.sampleName != null and request.sampleName !=''">
             and bosr.sample_name like concat('%',#{request.sampleName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and bcp.create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and bcp.create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml
index b366034..767695d 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml
@@ -46,33 +46,37 @@
         SELECT bcr.*, bosr.sample_no, bosr.sample_name, bosr.sample_model, rsi.staff_name
         FROM biz_business_certificate_report bcr
         LEFT JOIN biz_business_order_sample_relation bosr ON (bosr.order_id = bcr.order_id AND bosr.sample_id = bcr.sample_id)
+        LEFT JOIN biz_business_order_info boi ON boi.id = bcr.order_id
         LEFT JOIN biz_resource_staff_info rsi ON rsi.id = bcr.measure_person_id
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and bcr.approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and bcr.create_user_id = #{request.createUserId}
         </if>
-        <if test="request.certificateReportNo != null and request.certificateReportNo !=''">
+        <if test="request != null and request.customerId != null and request.customerId !=''">
+            and boi.customer_id = #{request.customerId}
+        </if>
+        <if test="request != null and request.certificateReportNo != null and request.certificateReportNo !=''">
             and bcr.certificate_report_no like concat('%',#{request.certificateReportNo},'%')
         </if>
-        <if test="request.certificateReportName != null and request.certificateReportName !=''">
+        <if test="request != null and request.certificateReportName != null and request.certificateReportName !=''">
             and bcr.certificate_report_name like concat('%',#{request.certificateReportName},'%')
         </if>
-        <if test="request.sampleNo != null and request.sampleNo !=''">
+        <if test="request != null and request.sampleNo != null and request.sampleNo !=''">
             and bosr.sample_no like concat('%',#{request.sampleNo},'%')
         </if>
-        <if test="request.measureCategory != null and request.measureCategory !=''">
+        <if test="request != null and request.measureCategory != null and request.measureCategory !=''">
             and bcr.measure_category = #{request.measureCategory}
         </if>
-        <if test="request.measurePerson != null and request.measurePerson !=''">
+        <if test="request != null and request.measurePerson != null and request.measurePerson !=''">
             and rsi.staff_name like concat('%',#{request.measurePerson},'%')
         </if>
-        <if test="request.calibrationTimeStart != null and request.calibrationTimeStart !=''">
+        <if test="request != null and request.calibrationTimeStart != null and request.calibrationTimeStart !=''">
             and bcr.calibration_time &gt;= #{request.calibrationTimeStart}
         </if>
-        <if test="request.calibrationTimeEnd != null and request.calibrationTimeEnd !=''">
+        <if test="request != null and request.calibrationTimeEnd != null and request.calibrationTimeEnd !=''">
             and bcr.calibration_time &lt;= #{request.calibrationTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceAssessMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceAssessMapper.xml
index d0fcf8b..c22c101 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceAssessMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceAssessMapper.xml
@@ -7,6 +7,8 @@
         <id column="id" property="id" />
         <result column="project_no" property="projectNo" />
         <result column="project_name" property="projectName" />
+        <result column="lab_code" property="labCode" />
+        <result column="group_code" property="groupCode" />
         <result column="applicant_id" property="applicantId" />
         <result column="applicant_name" property="applicantName" />
         <result column="applicant_time" property="applicantTime" />
@@ -31,7 +33,45 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, project_no, project_name, applicant_id, applicant_name, applicant_time, minio_file_name, remark, create_user_id, create_user_name, outsourcer_id, pre_start_time, pre_end_time, outsource_reason, pre_cost, approval_status, process_id, approve_situation, traceability, test_method, technique_ability, create_time, update_time
+        id, project_no, project_name, lab_code, group_code, applicant_id, applicant_name, applicant_time, minio_file_name, remark, create_user_id, create_user_name, outsourcer_id, pre_start_time, pre_end_time, outsource_reason, pre_cost, approval_status, process_id, approve_situation, traceability, test_method, technique_ability, create_time, update_time
     </sql>
 
+    <select id="selectMaxProjectNo" resultType="java.lang.Long">
+        SELECT IFNULL(max(RIGHT(project_no, 3)), 0) from biz_business_outsource_assess
+    </select>
+
+    <select id="selectBatchForApprovalList" resultMap="BaseResultMap">
+        SELECT bboa.*, bboi.outsourcer_name, bboi.director
+        FROM biz_business_outsource_assess bboa
+        LEFT JOIN biz_business_outsourcer_info bboi ON bboa.outsourcer_id = bboi.id
+        WHERE 1=1
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
+            and bboa.approval_status = #{request.approvalStatus}
+        </if>
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
+            and bboa.create_user_id = #{request.createUserId}
+        </if>
+        <if test="request != null and request.projectNo != null and request.projectNo !=''">
+            and bboa.project_no like concat('%',#{request.projectNo},'%')
+        </if>
+        <if test="request != null and request.outsourcerName != null and request.outsourcerName !=''">
+            and bboi.outsourcer_name like concat('%',#{request.outsourcerName},'%')
+        </if>
+        <if test="request != null and request.applicantName != null and request.applicantName !=''">
+            and bboa.applicant_name like concat('%',#{request.applicantName},'%')
+        </if>
+        <if test="request != null and request.applicantTimeStart != null and request.applicantTimeStart !=''">
+            and bboa.applicant_time &gt;= #{request.applicantTimeStart}
+        </if>
+        <if test="request != null and request.applicantTimeEnd != null and request.applicantTimeEnd !=''">
+            and bboa.applicant_time &lt;= #{request.applicantTimeEnd}
+        </if>
+        <if test="businessKeys != null">
+            and bboa.id in
+            <foreach collection="businessKeys" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
+        ORDER BY bboa.create_time DESC
+    </select>
 </mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceProtocolMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceProtocolMapper.xml
new file mode 100644
index 0000000..b7b2149
--- /dev/null
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceProtocolMapper.xml
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.mapper.business.BizBusinessOutsourceProtocolMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.business.BizBusinessOutsourceProtocol">
+        <id column="id" property="id" />
+        <result column="protocol_no" property="protocolNo" />
+        <result column="project_name" property="projectName" />
+        <result column="lab_code" property="labCode" />
+        <result column="group_code" property="groupCode" />
+        <result column="outsourcer_id" property="outsourcerId" />
+        <result column="remark" property="remark" />
+        <result column="outsource_no" property="outsourceNo" />
+        <result column="outsource_name" property="outsourceName" />
+        <result column="contacts" property="contacts" />
+        <result column="mobile" property="mobile" />
+        <result column="address" property="address" />
+        <result column="require_date" property="requireDate" />
+        <result column="outsource_cost" property="outsourceCost" />
+        <result column="director" property="director" />
+        <result column="item" property="item" />
+        <result column="requires" property="requires" />
+        <result column="create_user_id" property="createUserId" />
+        <result column="create_user_name" property="createUserName" />
+        <result column="approval_status" property="approvalStatus" />
+        <result column="process_id" property="processId" />
+        <result column="create_time" property="createTime" />
+        <result column="update_time" property="updateTime" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, protocol_no, project_name, lab_code, group_code, outsourcer_id, remark, outsource_no, outsource_name, contacts, mobile, address, require_date, outsource_cost, director, item, requires, create_user_id, create_user_name, approval_status, process_id, create_time, update_time
+    </sql>
+
+    <select id="selectMaxProtocolNo" resultType="java.lang.Long">
+        SELECT IFNULL(max(RIGHT(protocol_no, 3)), 0) from biz_business_outsource_protocol
+    </select>
+
+    <select id="selectBatchForApprovalList" resultMap="BaseResultMap">
+        SELECT *
+        FROM biz_business_outsource_protocol
+        WHERE 1=1
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
+            and approval_status = #{request.approvalStatus}
+        </if>
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
+            and create_user_id = #{request.createUserId}
+        </if>
+        <if test="request != null and request.protocolNo != null and request.protocolNo !=''">
+            and protocol_no like concat('%',#{request.protocolNo},'%')
+        </if>
+        <if test="request != null and request.outsourcerName != null and request.outsourcerName !=''">
+            and outsourcer_name like concat('%',#{request.outsourcerName},'%')
+        </if>
+        <if test="request != null and request.applicantName != null and request.applicantName !=''">
+            and create_user_name like concat('%',#{request.applicantName},'%')
+        </if>
+        <if test="request != null and request.applicantTimeStart != null and request.applicantTimeStart !=''">
+            and create_time &gt;= #{request.applicantTimeStart}
+        </if>
+        <if test="request != null and request.applicantTimeEnd != null and request.applicantTimeEnd !=''">
+            and create_time &lt;= #{request.applicantTimeEnd}
+        </if>
+        <if test="businessKeys != null">
+            and id in
+            <foreach collection="businessKeys" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
+        ORDER BY create_time DESC
+    </select>
+</mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourcerInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourcerInfoMapper.xml
index 510a80b..3049b54 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourcerInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourcerInfoMapper.xml
@@ -7,6 +7,8 @@
         <id column="id" property="id" />
         <result column="outsourcer_no" property="outsourcerNo" />
         <result column="outsourcer_name" property="outsourcerName" />
+        <result column="lab_code" property="labCode" />
+        <result column="group_code" property="groupCode" />
         <result column="outsourcer_brief_name" property="outsourcerBriefName" />
         <result column="outsourcer_size" property="outsourcerSize" />
         <result column="business_size" property="businessSize" />
@@ -55,32 +57,32 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, outsourcer_no, outsourcer_name, outsourcer_brief_name, outsourcer_size, business_size, grade, evaluation, tax_number, bank_account, bank_name, bank_account_number, postal_code, director, phone, fax, mobile, email, website, address_country, address_province, address_city, address_area, full_address, address_country_name, address_province_name, address_city_name, address_area_name, invoice_country, invoice_province, invoice_city, invoice_area, invoice_full_address, invoice_country_name, invoice_province_name, invoice_city_name, invoice_area_name, business_scope, business_content, minio_file_name, approval_status, process_id, remark, create_user_id, create_user_name, create_time, update_time
+        id, outsourcer_no, outsourcer_name, lab_code, group_code, outsourcer_brief_name, outsourcer_size, business_size, grade, evaluation, tax_number, bank_account, bank_name, bank_account_number, postal_code, director, phone, fax, mobile, email, website, address_country, address_province, address_city, address_area, full_address, address_country_name, address_province_name, address_city_name, address_area_name, invoice_country, invoice_province, invoice_city, invoice_area, invoice_full_address, invoice_country_name, invoice_province_name, invoice_city_name, invoice_area_name, business_scope, business_content, minio_file_name, approval_status, process_id, remark, create_user_id, create_user_name, create_time, update_time
     </sql>
 
     <select id="selectBatchForApprovalList" resultMap="BaseResultMap">
         SELECT *
         FROM biz_business_outsourcer_info
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.outsourcerNo != null and request.outsourcerNo !=''">
+        <if test="request != null and request.outsourcerNo != null and request.outsourcerNo !=''">
             and outsourcer_no like concat('%',#{request.outsourcerNo},'%')
         </if>
-        <if test="request.outsourcerName != null and request.outsourcerName !=''">
+        <if test="request != null and request.outsourcerName != null and request.outsourcerName !=''">
             and outsourcer_name like concat('%',#{request.outsourcerName},'%')
         </if>
-        <if test="request.director != null and request.director !=''">
+        <if test="request != null and request.director != null and request.director !=''">
             and director like concat('%',#{request.director},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
@@ -93,6 +95,6 @@
     </select>
 
     <select id="selectMaxNo" resultType="java.lang.Long">
-        SELECT IFNULL(max(RIGHT(outsourcer_no, 12)), 0) from biz_business_outsourcer_info
+        SELECT IFNULL(max(RIGHT(outsourcer_no, 3)), 0) from biz_business_outsourcer_info
     </select>
 </mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessSiteExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessSiteExecutiveInfoMapper.xml
index 135c5d0..3c5ae79 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessSiteExecutiveInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessSiteExecutiveInfoMapper.xml
@@ -38,25 +38,25 @@
         FROM biz_business_site_executive_info bsei
         LEFT JOIN biz_resource_customer_info rci ON bsei.customer_id = rci.id
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and bsei.approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and bsei.create_user_id = #{request.createUserId}
         </if>
-        <if test="request.siteExecutiveNo != null and request.siteExecutiveNo !=''">
+        <if test="request != null and request.siteExecutiveNo != null and request.siteExecutiveNo !=''">
             and bsei.site_executive_no like concat('%',#{request.siteExecutiveNo},'%')
         </if>
-        <if test="request.customerName != null and request.customerName !=''">
+        <if test="request != null and request.customerName != null and request.customerName !=''">
             and rci.outsourcer_name like concat('%',#{request.customerName},'%')
         </if>
-        <if test="request.applyName != null and request.applyName !=''">
+        <if test="request != null and request.applyName != null and request.applyName !=''">
             and bsei.apply_name like concat('%',#{request.applyName},'%')
         </if>
-        <if test="request.applyTimeStart != null and request.applyTimeStart !=''">
+        <if test="request != null and request.applyTimeStart != null and request.applyTimeStart !=''">
             and bsei.apply_time &gt;= #{request.applyTimeStart}
         </if>
-        <if test="request.applyTimeEnd != null and request.applyTimeEnd !=''">
+        <if test="request != null and request.applyTimeEnd != null and request.applyTimeEnd !=''">
             and bsei.apply_time &lt;= #{request.applyTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml
index 84d9e2a..6bd38a9 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml
@@ -105,6 +105,12 @@
         <if test="request.isUrgent != null and request.isUrgent !=''">
             AND bo.is_urgent = #{request.isUrgent}
         </if>
+        <if test="request.ids != null">
+            and blei.id in
+            <foreach collection="request.ids" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
         ORDER BY blei.update_time DESC
     </select>
 
@@ -137,6 +143,12 @@
         <if test="request.isUrgent != null and request.isUrgent !=''">
             AND bo.is_urgent = #{request.isUrgent}
         </if>
+        <if test="request.ids != null">
+            and blei.id in
+            <foreach collection="request.ids" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
         ORDER BY blei.update_time DESC
     </select>
 
diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardInfoMapper.xml
index 1a5551b..2ed8d17 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardInfoMapper.xml
@@ -45,12 +45,6 @@
         FROM biz_equipment_standard_info besi
         LEFT JOIN biz_equipment_standard_technology_relation bestr ON besi.standard_no = bestr.standard_no
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
-            and besi.approval_status = #{request.approvalStatus}
-        </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
-            and besi.create_user_id = #{request.createUserId}
-        </if>
         <if test="request.standardName != null and request.standardName !=''">
             and besi.standard_name like concat('%',#{request.standardName},'%')
         </if>
diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardTechnologyRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardTechnologyRelationMapper.xml
index fc7e16c..cd03c8c 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardTechnologyRelationMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardTechnologyRelationMapper.xml
@@ -6,6 +6,7 @@
     <resultMap id="BaseResultMap" type="com.casic.missiles.model.equipment.BizEquipmentStandardTechnologyRelation">
         <id column="id" property="id" />
         <result column="technology_file_id" property="technologyFileId" />
+        <result column="technology_file_no" property="technologyFileNo" />
         <result column="technology_file_name" property="technologyFileName" />
         <result column="standard_id" property="standardId" />
         <result column="standard_no" property="standardNo" />
@@ -14,7 +15,7 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, technology_file_id, technology_file_name, standard_id, remark
+        id, technology_file_id, technology_file_no, technology_file_name, standard_id, remark
     </sql>
 
 </mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceAuthorizeOrderMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceAuthorizeOrderMapper.xml
index ac5176c..554fe65 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceAuthorizeOrderMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceAuthorizeOrderMapper.xml
@@ -32,22 +32,22 @@
         SELECT *
         FROM biz_resource_authorize_order
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.orderNo != null and request.orderNo !=''">
+        <if test="request != null and request.orderNo != null and request.orderNo !=''">
             and order_no like concat('%',#{request.orderNo},'%')
         </if>
-        <if test="request.createUserName != null and request.createUserName !=''">
+        <if test="request != null and request.createUserName != null and request.createUserName !=''">
             and create_user_name like concat('%',#{request.createUserName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerExamineFormMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerExamineFormMapper.xml
index ab242f6..af7f98f 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerExamineFormMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerExamineFormMapper.xml
@@ -41,28 +41,28 @@
         SELECT *
         FROM biz_resource_customer_examine_form
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.formNo != null and request.formNo !=''">
+        <if test="request != null and request.formNo != null and request.formNo !=''">
             and form_no like concat('%',#{request.formNo},'%')
         </if>
-        <if test="request.labCode != null and request.labCode !=''">
+        <if test="request != null and request.labCode != null and request.labCode !=''">
             and lab_code like concat('%',#{request.labCode},'%')
         </if>
-        <if test="request.groupCode != null and request.groupCode !=''">
+        <if test="request != null and request.groupCode != null and request.groupCode !=''">
             and group_code like concat('%',#{request.groupCode},'%')
         </if>
-        <if test="request.createUserName != null and request.createUserName !=''">
+        <if test="request != null and request.createUserName != null and request.createUserName !=''">
             and create_user_name like concat('%',#{request.createUserName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerInfoMapper.xml
index fa8ffbc..06a2798 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerInfoMapper.xml
@@ -33,25 +33,25 @@
         SELECT *
         FROM biz_resource_customer_info
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.customerNo != null and request.customerNo !=''">
+        <if test="request != null and request.customerNo != null and request.customerNo !=''">
             and customer_no like concat('%',#{request.customerNo},'%')
         </if>
-        <if test="request.customerName != null and request.customerName !=''">
+        <if test="request != null and request.customerName != null and request.customerName !=''">
             and customer_name like concat('%',#{request.customerName},'%')
         </if>
-        <if test="request.contacts != null and request.contacts !=''">
+        <if test="request != null and request.contacts != null and request.contacts !=''">
             and contacts like concat('%',#{request.contacts},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerSuggestFormMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerSuggestFormMapper.xml
index 28f5bb2..1806662 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerSuggestFormMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerSuggestFormMapper.xml
@@ -33,28 +33,28 @@
         SELECT *
         FROM biz_resource_customer_suggest_form
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.formNo != null and request.formNo !=''">
+        <if test="request != null and request.formNo != null and request.formNo !=''">
             and form_no like concat('%',#{request.formNo},'%')
         </if>
-        <if test="request.customerName != null and request.customerName !=''">
+        <if test="request != null and request.customerName != null and request.customerName !=''">
             and customer_name like concat('%',#{request.customerName},'%')
         </if>
-        <if test="request.customerDeptName != null and request.customerDeptName !=''">
+        <if test="request != null and request.customerDeptName != null and request.customerDeptName !=''">
             and customer_dept_name like concat('%',#{request.customerDeptName},'%')
         </if>
-        <if test="request.createUserName != null and request.createUserName !=''">
+        <if test="request != null and request.createUserName != null and request.createUserName !=''">
             and create_user_name like concat('%',#{request.createUserName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSealUseNoteMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSealUseNoteMapper.xml
index ab37bc1..b02bb33 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSealUseNoteMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSealUseNoteMapper.xml
@@ -29,32 +29,32 @@
     </sql>
 
     <select id="selectBatchForApprovalList" resultMap="BaseResultMap">
-        SELECT *
+        SELECT brsun.*, brsi.seal_name, brsi.seal_type, brsi.approver_name
         FROM biz_resource_seal_use_note brsun
         JOIN biz_resource_seal_info brsi ON brsun.seal_id = brsi.id
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and brsun.approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and brsun.create_user_id = #{request.createUserId}
         </if>
-        <if test="request.sealName != null and request.sealName !=''">
+        <if test="request != null and request.sealName != null and request.sealName !=''">
             and brsi.seal_name like concat('%',#{request.sealName},'%')
         </if>
-        <if test="request.sealType != null and request.sealType !=''">
+        <if test="request != null and request.sealType != null and request.sealType !=''">
             and brsi.seal_type = #{request.sealType}
         </if>
-        <if test="request.applyDeptName != null and request.applyDeptName !=''">
+        <if test="request != null and request.applyDeptName != null and request.applyDeptName !=''">
             and brsun.apply_dept_name like concat('%',#{request.applyDeptName},'%')
         </if>
-        <if test="request.applyUserName != null and request.applyUserName !=''">
+        <if test="request != null and request.applyUserName != null and request.applyUserName !=''">
             and brsun.apply_user_name like concat('%',#{request.applyUserName},'%')
         </if>
-        <if test="request.applyTimeStart != null and request.applyTimeStart !=''">
+        <if test="request != null and request.applyTimeStart != null and request.applyTimeStart !=''">
             and brsun.apply_time &gt;= #{request.applyTimeStart}
         </if>
-        <if test="request.applyTimeEnd != null and request.applyTimeEnd !=''">
+        <if test="request != null and request.applyTimeEnd != null and request.applyTimeEnd !=''">
             and brsun.apply_time &lt;= #{request.applyTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml
index 119bf7d..4f8392a 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml
@@ -31,6 +31,12 @@
         <if test="request.deptName != null and request.deptName !=''">
             and brsi.dept_name like concat('%',#{request.deptName},'%')
         </if>
+        <if test="request.ids != null">
+            and brsv.id in
+            <foreach collection="request.ids" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
         ORDER BY brsv.grant_date DESC
     </select>
 
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSupplierInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSupplierInfoMapper.xml
index fe8d399..e8ce7ef 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSupplierInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSupplierInfoMapper.xml
@@ -48,28 +48,28 @@
         SELECT *
         FROM biz_resource_supplier_info
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.supplierNo != null and request.supplierNo !=''">
+        <if test="request != null and request.supplierNo != null and request.supplierNo !=''">
             and supplier_no like concat('%',#{request.supplierNo},'%')
         </if>
-        <if test="request.supplierName != null and request.supplierName !=''">
+        <if test="request != null and request.supplierName != null and request.supplierName !=''">
             and supplier_name like concat('%',#{request.supplierName},'%')
         </if>
-        <if test="request.director != null and request.director !=''">
+        <if test="request != null and request.director != null and request.director !=''">
             and director like concat('%',#{request.director},'%')
         </if>
-        <if test="request.supplierType != null and request.supplierType !=''">
+        <if test="request != null and request.supplierType != null and request.supplierType !=''">
             and supplier_type = #{request.supplierType}
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/EnvLocationInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/EnvLocationInfoMapper.xml
new file mode 100644
index 0000000..68bcf10
--- /dev/null
+++ b/casic-metering-dao/src/main/resources/mapper/resource/EnvLocationInfoMapper.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.mapper.resource.EnvLocationInfoMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.resource.EnvLocationInfo">
+        <id column="id" property="id" />
+        <result column="location_no" property="locationNo" />
+        <result column="location_name" property="locationName" />
+        <result column="location_position" property="locationPosition" />
+        <result column="create_user_id" property="createUserId" />
+        <result column="create_user" property="createUser" />
+        <result column="create_time" property="createTime" />
+        <result column="update_time" property="updateTime" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, location_no, location_name, location_position, create_user_id, create_user, create_time, update_time
+    </sql>
+
+    <select id="selectLocationListPage" resultType="com.casic.missiles.dto.resource.environment.LocationListResponse">
+        SELECT *
+        FROM env_location_info
+        WHERE 1=1
+        <if test="request.locationNo != null and request.locationNo !=''">
+            AND location_no LIKE concat('%',#{request.locationNo},'%')
+        </if>
+        <if test="request.locationName != null and request.locationName !=''">
+            AND location_name LIKE concat('%',#{request.locationName},'%')
+        </if>
+        ORDER BY create_time DESC
+    </select>
+
+</mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml
index b28c18f..8854047 100644
--- a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml
@@ -11,7 +11,6 @@
         <result column="sign_desc" property="signDesc" />
         <result column="sign_director" property="signDirector" />
         <result column="sign_user_id" property="signUserId" />
-        <result column="sign_type" property="signType" />
         <result column="minio_file_name" property="minioFileName" />
         <result column="create_time" property="createTime" />
         <result column="update_time" property="updateTime" />
@@ -28,7 +27,6 @@
         <result column="sign_name" property="signName" />
         <result column="sign_desc" property="signDesc" />
         <result column="sign_director" property="signDirector" />
-        <result column="sign_type" property="signType" />
         <result column="sign_user_id" property="signUserId" />
         <result column="minio_file_name" property="minioFileName" />
         <result column="create_time" property="createTime" />
@@ -62,4 +60,58 @@
         JOIN system_sign_user_relation ssur ON ss.id = ssur.sign_id
         WHERE ssur.user_id = #{userId}
     </select>
+
+    <select id="selectSignListPage" resultMap="BaseResultMap">
+        SELECT ss.*, sd.SIMPLE_NAME AS deptName
+        FROM system_sign ss
+        LEFT JOIN sys_user su ON su.id = ss.sign_user_id
+        LEFT JOIN sys_dept sd ON sd.id = su.dept_id
+        WHERE 1=1
+        <if test="request.signNo != null and request.signNo !=''">
+            AND ss.sign_no LIKE concat('%',#{request.signNo},'%')
+        </if>
+        <if test="request.signName != null and request.signName !=''">
+            AND ss.sign_name LIKE concat('%',#{request.signName},'%')
+        </if>
+        <if test="request.signDirector != null and request.signDirector !=''">
+            AND ss.sign_director LIKE concat('%',#{request.signDirector},'%')
+        </if>
+        <if test="request.signUserId != null and request.signUserId !=''">
+            AND ss.sign_user_id = #{request.signUserId}
+        </if>
+        <if test="request.createStartTime != null and request.createStartTime !=''">
+            AND DATE_FORMAT(ss.create_time,'%Y-%m-%d') &gt;= DATE_FORMAT(#{request.createStartTime},'%Y-%m-%d')
+        </if>
+        <if test="request.createEndTime != null and request.createEndTime !=''">
+            AND DATE_FORMAT(ss.create_time,'%Y-%m-%d')  &lt;= DATE_FORMAT(#{request.createEndTime},'%Y-%m-%d')
+        </if>
+        ORDER BY ss.create_time DESC
+    </select>
+
+    <select id="selectSignList" resultMap="BaseResultMap">
+        SELECT ss.*, sd.SIMPLE_NAME AS deptName
+        FROM system_sign ss
+        LEFT JOIN sys_user su ON su.id = ss.sign_user_id
+        LEFT JOIN sys_dept sd ON sd.id = su.dept_id
+        WHERE 1=1
+        <if test="request.signNo != null and request.signNo !=''">
+            AND ss.sign_no LIKE concat('%',#{request.signNo},'%')
+        </if>
+        <if test="request.signName != null and request.signName !=''">
+            AND ss.sign_name LIKE concat('%',#{request.signName},'%')
+        </if>
+        <if test="request.signDirector != null and request.signDirector !=''">
+            AND ss.sign_director LIKE concat('%',#{request.signDirector},'%')
+        </if>
+        <if test="request.signUserId != null and request.signUserId !=''">
+            AND ss.sign_user_id = #{request.signUserId}
+        </if>
+        <if test="request.createStartTime != null and request.createStartTime !=''">
+            AND DATE_FORMAT(ss.create_time,'%Y-%m-%d') &gt;= DATE_FORMAT(#{request.createStartTime},'%Y-%m-%d')
+        </if>
+        <if test="request.createEndTime != null and request.createEndTime !=''">
+            AND DATE_FORMAT(ss.create_time,'%Y-%m-%d')  &lt;= DATE_FORMAT(#{request.createEndTime},'%Y-%m-%d')
+        </if>
+        ORDER BY ss.create_time DESC
+    </select>
 </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 515050a..60f530b 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
@@ -47,8 +47,8 @@
     String STORAGE_LOCATION = "bizStorageLocation";
     //计量专业
     String MEASURE_MAJOR = "bizMeasureMajor";
-    //管理状态
-    String MANAGER_STATE = "bizManagerState";
+    //标准装置管理状态
+    String STANDARD_MANAGER_STATE = "bizStandardManagerState";
 
     /**
      * 资源管理 字典code
@@ -95,8 +95,6 @@
     String MEASURE_STATUS = "measureStatus";
     //检定方式
     String MEASURE_TYPE = "measureType";
-    //标识打印标志类型
-    String IDENTIFY_PRINT_TYPE = "bizBusinessIdentify";
     //变更类型
     String REPORT_CHANGE_TYPE = "bizCertChangeType";
     //规模类型
@@ -111,19 +109,24 @@
     String MEASURE_CATEGORY = "measureCategory";
     //检定结果
     String MEASURE_RESULT = "measureResult";
+    //分包原因
+    String OUTSOURCE_REASON = "outsourceReason";
+
+    /**
+     * 系统管理
+     */
+    String TEMPLATE_TYPE = "templateType";
+
 
     /**
      * 标准装置 字典code
      */
     //类别
     String STANDARD_CATEGORY = "standardCategory";
-    //管理状态
-    String STANDARD_MANAGER_STATE = "standardManagerState";
     //标准等级
     String STANDARD_LEVEL = "standardLevel";
     //传递范围
     String STANDARD_TRANSMIT_RANGE = "transmitRange";
-
     //资本来源
     String CAPITAL_SOURCE = "capitalSource";
     //标准装置-申请类型
@@ -148,8 +151,6 @@
     String CERTIFICATE_CLASS = "certificationClass";
     //证书管理-检校专业
     String CALIBRATION_MAJOR = "calibrationMajor";
-    //分包原因
-    String OUTSOURCE_REASON = "outsourceReason";
 
     /**
      * 工作台
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/BaseApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/BaseApprovalListRequest.java
index 73c12c1..80d7424 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/BaseApprovalListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/BaseApprovalListRequest.java
@@ -6,6 +6,7 @@
 
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotEmpty;
+import java.util.List;
 
 /**
  * @Description:
@@ -19,14 +20,14 @@
      * 表单id
      */
     @NotBlank(message = "表单id不能为空")
-    @ApiModelProperty(value = "表单id（流程定义对应的表单id，等价于业务id）", dataType = "String")
+    @ApiModelProperty(value = "表单id（流程定义对应的表单id，等价于业务id），导出接口不用传", dataType = "String")
     private String formId;
 
     /**
      * 审批状态类型，对应ApprovalStatusEnum
      */
     @NotEmpty(message = "审批状态类型不能为空")
-    @ApiModelProperty(value = "审批状态类型code", dataType = "String")
+    @ApiModelProperty(value = "审批状态类型code，导出接口不用传", dataType = "String")
     private String approvalStatus;
 
     @ApiModelProperty(hidden = true)
@@ -34,4 +35,7 @@
 
     @ApiModelProperty(hidden = true)
     private Long createUserId;
+
+    @ApiModelProperty(value = "导出ids", dataType = "List")
+    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificatePrintApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificatePrintApprovalListRequest.java
index b93d1c9..3cc2f4e 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificatePrintApprovalListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificatePrintApprovalListRequest.java
@@ -5,8 +5,6 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import java.util.List;
-
 /**
  * @Description:
  * @Author: wangpeng
@@ -38,7 +36,4 @@
 
     @ApiModelProperty(value = "创建结束时间", dataType = "String")
     private String createTimeEnd;
-
-    @ApiModelProperty(value = "导出ids", dataType = "List")
-    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportApprovalListRequest.java
index 4f7a038..c115847 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportApprovalListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportApprovalListRequest.java
@@ -5,8 +5,6 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import java.util.List;
-
 /**
  * @Description:
  * @Author: wangpeng
@@ -15,6 +13,8 @@
 @ApiModel
 @Data
 public class CertificateReportApprovalListRequest extends BaseApprovalListRequest {
+    @ApiModelProperty(value = "委托方id", dataType = "String")
+    private Long customerId;
 
     @ApiModelProperty(value = "证书报告编号", dataType = "String")
     private String certificateReportNo;
@@ -37,6 +37,4 @@
     @ApiModelProperty(value = "检校结束时间", dataType = "String")
     private String calibrationTimeEnd;
 
-    @ApiModelProperty(value = "导出ids", dataType = "List")
-    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/identify/IdentifyListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/identify/IdentifyListRequest.java
index 1b87ae6..f019203 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/identify/IdentifyListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/identify/IdentifyListRequest.java
@@ -4,6 +4,8 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * @Description:
  * @Author: wangpeng
@@ -26,4 +28,7 @@
 
     @ApiModelProperty(value = "打印结束时间", dataType = "String")
     private String createTimeEnd;
+
+    @ApiModelProperty(value = "导出ids", dataType = "List")
+    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListRequest.java
index 1264883..62415fb 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListRequest.java
@@ -7,6 +7,7 @@
 import lombok.Data;
 
 import javax.validation.constraints.NotBlank;
+import java.util.List;
 
 @Data
 @ApiModel
@@ -37,4 +38,6 @@
     @ApiModelProperty(value = "是否加急（1是0否null全部）", dataType = "Integer")
     private String isUrgent;
 
+    @ApiModelProperty(value = "导出ids", dataType = "List")
+    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListRequest.java
index 5201d7b..499760a 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListRequest.java
@@ -17,6 +17,9 @@
     @ApiModelProperty(value = "任务单编号", dataType = "String")
     private String orderNo;
 
+    @ApiModelProperty(value = "委托方id", dataType = "Long")
+    private Long customerId;
+
     @ApiModelProperty(value = "委托方名称", dataType = "String")
     private String customerName;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OrderSampleDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OrderSampleDTO.java
new file mode 100644
index 0000000..796edc0
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OrderSampleDTO.java
@@ -0,0 +1,19 @@
+package com.casic.missiles.dto.business.outsource;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/8/24 11:38
+ */
+@ApiModel
+@Data
+public class OrderSampleDTO {
+    @ApiModelProperty(value = "任务单id", dataType = "Long")
+    private Long orderId;
+    @ApiModelProperty(value = "受检设备id", dataType = "Long")
+    private Long sampleId;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceAssessApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceAssessApprovalListRequest.java
new file mode 100644
index 0000000..9a930c3
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceAssessApprovalListRequest.java
@@ -0,0 +1,30 @@
+package com.casic.missiles.dto.business.outsource;
+
+import com.casic.missiles.dto.BaseApprovalListRequest;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/8/24 11:01
+ */
+@ApiModel
+@Data
+public class OutsourceAssessApprovalListRequest extends BaseApprovalListRequest {
+    @ApiModelProperty(value = "评审表编号", dataType = "String")
+    private String projectNo;
+
+    @ApiModelProperty(value = "分包机构名称", dataType = "String")
+    private String outsourcerName;
+
+    @ApiModelProperty(value = "申请人", dataType = "String")
+    private String applicantName;
+
+    @ApiModelProperty(value = "申请时间开始", dataType = "String")
+    private String applicantTimeStart;
+
+    @ApiModelProperty(value = "申请时间结束", dataType = "String")
+    private String applicantTimeEnd;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceAssessSaveResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceAssessSaveResponse.java
new file mode 100644
index 0000000..8bf9aad
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceAssessSaveResponse.java
@@ -0,0 +1,20 @@
+package com.casic.missiles.dto.business.outsource;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/8/14 16:17
+ */
+@ApiModel
+@Data
+public class OutsourceAssessSaveResponse {
+    @ApiModelProperty(value = "主键id", dataType = "Long")
+    private Long id;
+
+    @ApiModelProperty(value = "编号", dataType = "String")
+    private String projectNo;
+}

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java
index bb0c50f..13a699b 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java
@@ -12,6 +12,7 @@
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.IGeneralApprovalService;
+import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
@@ -19,6 +20,7 @@
 import org.springframework.web.bind.annotation.RequestBody;
 
 import javax.validation.Valid;
+import java.util.List;
 import java.util.Objects;
 
 /**
@@ -117,4 +119,17 @@
         }
         return baseApprovalService.failUpdate(request);
     }
+
+    public List<O> exportList(@RequestBody @Valid R request) throws Exception {
+        List<O> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = baseApprovalService.listExportByIds(request.getIds());
+        } else {
+            list = baseApprovalService.listExport(request);
+        }
+        for (O record : list) {
+            DictCodeUtils.convertDictCodeToName(record);
+        }
+        return list;
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java
index 8a90961..d775831 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java
@@ -5,6 +5,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.business.certificate.CertificateChangeApplyApprovalListRequest;
 import com.casic.missiles.dto.business.certificate.CertificateChangeApplySaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessCertificateChangeApply;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
@@ -20,6 +21,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -48,4 +50,12 @@
         }
         return changeApplyService.saveChangeApply(request);
     }
+
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody CertificateChangeApplyApprovalListRequest request) throws Exception {
+        List<BizBusinessCertificateChangeApply> list = super.exportList(request);
+        super.exportExcel(BizBusinessCertificateChangeApply.class, list, ExportEnum.CERTIFICATE_CHANGE_APPLY.getSheetName());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java
index 5fc4b07..af8230e 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java
@@ -9,6 +9,7 @@
 import com.casic.missiles.dto.business.certificate.CertificatePrintApprovalListRequest;
 import com.casic.missiles.dto.business.certificate.CertificatePrintListResponse;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.enums.business.CertificatePrintStatusEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessCertificatePrintLog;
@@ -18,10 +19,16 @@
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.io.IOException;
+import java.util.List;
 import java.util.Objects;
 
 /**
@@ -98,4 +105,16 @@
         });
         return certificatePrintService.certificatePrintLog(idDTO.getId());
     }
+
+    @ApiOperation("证书打印审批导出")
+    @PostMapping("/listExport")
+    public void exportList(@RequestBody CertificatePrintApprovalListRequest request) throws IOException {
+        List<CertificatePrintListResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = certificatePrintService.listByIds(request.getIds());
+        } else {
+            list = certificatePrintService.list(request);
+        }
+        super.exportExcel(CertificatePrintListResponse.class, list, ExportEnum.CERTIFICATE_PRINT.getSheetName());
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java
index 63b06dc..6b2efd5 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java
@@ -6,6 +6,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.business.certificate.CertificateReportApprovalListRequest;
 import com.casic.missiles.dto.business.certificate.CertificateReportSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessCertificateReport;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
@@ -21,6 +22,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -50,7 +52,7 @@
         return certificateReportService.saveCertificateReport(request);
     }
 
-    @ApiOperation("证书审批详情（基本信息）")
+    @ApiOperation("详情（基本信息）")
     @PostMapping("/detail")
     public ReturnDTO<BizBusinessCertificateReport> detail(@RequestBody @Valid BaseDetailRequest request, BindingResult bindingResult) throws Exception {
         if(bindingResult.hasErrors()){
@@ -59,4 +61,11 @@
         return certificateReportService.detail(request);
     }
 
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody CertificateReportApprovalListRequest request) throws Exception {
+        List<BizBusinessCertificateReport> list = super.exportList(request);
+        super.exportExcel(BizBusinessCertificateReport.class, list, ExportEnum.CERTIFICATE_REPORT.getSheetName());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java
index 46b26bd..57c0809 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java
@@ -10,20 +10,21 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.business.identify.IdentifyListRequest;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessIdentifyInfo;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.business.IBizBusinessIdentifyInfoService;
+import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import javax.validation.Valid;
+import java.util.List;
 import java.util.Objects;
 
 /**
@@ -57,16 +58,13 @@
         return identifyInfoService.addIdentify(identifyInfo);
     }
 
-    @ApiOperation("标识打印更新")
+    @ApiOperation("标识打印更新（更新打印时间）")
     @PostMapping("/update")
-    public ReturnDTO updateIdentify(@RequestBody @Valid BizBusinessIdentifyInfo identifyInfo, BindingResult bindingResult) {
-        Assert.isFalse(Objects.isNull(identifyInfo.getId()), () -> {
+    public ReturnDTO updateIdentify(@RequestBody @Valid IdDTO idDTO) {
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        Assert.isFalse(bindingResult.hasErrors(), () -> {
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        });
-        return identifyInfoService.updateIdentify(identifyInfo);
+        return identifyInfoService.updateIdentify(idDTO.getId());
     }
 
     @ApiOperation("标识打印删除")
@@ -77,4 +75,37 @@
         });
         return identifyInfoService.deleteIdentify(idDTO.getId());
     }
+
+    @ApiOperation("标识打印导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody @Valid IdentifyListRequest request, BindingResult bindingResult) throws Exception {
+        if (bindingResult.hasErrors()) {
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        List<BizBusinessIdentifyInfo> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = identifyInfoService.listByIds(request.getIds());
+        } else {
+            list = identifyInfoService.list(request);
+        }
+        for (BizBusinessIdentifyInfo record : list) {
+            DictCodeUtils.convertDictCodeToName(record);
+        }
+        super.exportExcel(BizBusinessIdentifyInfo.class, list, ExportEnum.IDENTIFY_EXPORT.getSheetName());
+    }
+
+
+    // TODO: 2023/8/23 查询设备信息，4个底部按钮查设备（按钮的作用就是前端用来调不同接口、用来区分中间即将展示的标识），前端弹窗选设备，在确定保存时前端根据底部按钮判断传入设备类型deviceType字典code
+    // TODO: 2023/8/23 接口：查受检设备（第1个按钮），查设备台账（后3个按钮同一接口），查询之后前端根据标志类型的不同加到中间页面时进行判断（按产品给的对应表）
+    // TODO: 2023/8/23 提供二维码接口，前端在加到中间页面时调用一下
+
+    @ApiOperation("设备二维码")
+    @PostMapping("/equipment/qrCode")
+    public ReturnDTO<String> equipmentQrCode(@RequestBody @Valid IdDTO idDTO) {
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return identifyInfoService.equipmentQrCode(idDTO.getId());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java
index 707be6e..7e0453d 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java
@@ -117,7 +117,7 @@
     }
 
     @ApiOperation("任务单导出")
-    @PostMapping("/export")
+    @PostMapping("/listExport")
     public void orderExport(@RequestBody @Valid OrderListRequest request, HttpServletResponse response) {
         businessOrderService.orderExport(request, response);
     }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java
index 529a6ce..51432be 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java
@@ -1,9 +1,28 @@
 package com.casic.missiles.controller.business;
 
+import com.casic.missiles.controller.GeneralApprovalController;
+import com.casic.missiles.dto.BaseApprovalSubmitRequest;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.business.outsource.OutsourceAssessApprovalListRequest;
+import com.casic.missiles.dto.business.outsource.OutsourceAssessSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
+import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.model.business.BizBusinessOutsourceAssess;
+import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
+import com.casic.missiles.service.IGeneralApprovalService;
+import com.casic.missiles.service.business.IBizBusinessOutsourceAssessService;
 import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.BindingResult;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.validation.Valid;
+import java.util.List;
+
 /**
  * <p>
  * 计量检定业务-分包管理-测试、校准或检定工作分包评审表 前端控制器
@@ -15,6 +34,27 @@
 @Api(tags = "分包管理-测试、校准或检定工作分包评审表")
 @RestController
 @RequestMapping("/business/outsource/assess")
-public class BizBusinessOutsourceAssessController {
+public class BizBusinessOutsourceAssessController extends GeneralApprovalController<BizBusinessOutsourceAssess, BizBusinessOutsourceAssess, OutsourceAssessApprovalListRequest, BaseApprovalSubmitRequest> {
+    @Autowired
+    private IBizBusinessOutsourceAssessService outsourceAssessService;
 
+    public BizBusinessOutsourceAssessController(IGeneralApprovalService<BizBusinessOutsourceAssess, BizBusinessOutsourceAssess, OutsourceAssessApprovalListRequest, BaseApprovalSubmitRequest> baseApprovalService) {
+        super(baseApprovalService);
+    }
+
+    @ApiOperation("草稿箱-保存")
+    @PostMapping("/save")
+    public ReturnDTO<OutsourceAssessSaveResponse> saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceAssess request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        return outsourceAssessService.saveOutsourceAssess(request);
+    }
+
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception {
+        List<BizBusinessOutsourceAssess> list = super.exportList(request);
+        super.exportExcel(BizBusinessOutsourceAssess.class, list, ExportEnum.OUTSOURCE_ASSESS.getSheetName());
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java
new file mode 100644
index 0000000..9adef18
--- /dev/null
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java
@@ -0,0 +1,60 @@
+package com.casic.missiles.controller.business;
+
+import com.casic.missiles.controller.GeneralApprovalController;
+import com.casic.missiles.dto.BaseApprovalSubmitRequest;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.business.outsource.OutsourceProtocolApprovalListRequest;
+import com.casic.missiles.dto.business.outsource.OutsourceProtocolSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
+import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.model.business.BizBusinessOutsourceProtocol;
+import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
+import com.casic.missiles.service.IGeneralApprovalService;
+import com.casic.missiles.service.business.IBizBusinessOutsourceProtocolService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.BindingResult;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.validation.Valid;
+import java.util.List;
+
+/**
+ * <p>
+ * 计量检定业务-分包管理-测试、校准或检定工作分包协议书 前端控制器
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-08-24
+ */
+@Api(tags = "分包管理-测试、校准或检定工作分包协议书")
+@RestController
+@RequestMapping("/business/outsource/protocol")
+public class BizBusinessOutsourceProtocolController extends GeneralApprovalController<BizBusinessOutsourceProtocol, BizBusinessOutsourceProtocol, OutsourceProtocolApprovalListRequest, BaseApprovalSubmitRequest> {
+    @Autowired
+    private IBizBusinessOutsourceProtocolService outsourceProtocolService;
+
+    public BizBusinessOutsourceProtocolController(IGeneralApprovalService<BizBusinessOutsourceProtocol, BizBusinessOutsourceProtocol, OutsourceProtocolApprovalListRequest, BaseApprovalSubmitRequest> baseApprovalService) {
+        super(baseApprovalService);
+    }
+
+    @ApiOperation("草稿箱-保存")
+    @PostMapping("/save")
+    public ReturnDTO<OutsourceProtocolSaveResponse> saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceProtocol request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        return outsourceProtocolService.saveOutsourceProtocol(request);
+    }
+
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody OutsourceProtocolApprovalListRequest request) throws Exception {
+        List<BizBusinessOutsourceProtocol> list = super.exportList(request);
+        super.exportExcel(BizBusinessOutsourceProtocol.class, list, ExportEnum.OUTSOURCE_PROTOCOL.getSheetName());
+    }
+}
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java
index 097f645..f0f0943 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java
@@ -17,7 +17,6 @@
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.IGeneralApprovalService;
 import com.casic.missiles.service.business.IBizBusinessOutsourcerInfoService;
-import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -71,19 +70,8 @@
 
     @ApiOperation("分包方导出")
     @PostMapping("/listExport")
-    public void export(@RequestBody @Valid OutsourcerInfoApprovalListRequest request, BindingResult bindingResult) throws Exception {
-        if (bindingResult.hasErrors()) {
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        }
-        List<BizBusinessOutsourcerInfo> list;
-        if (!CollectionUtils.isEmpty(request.getIds())) {
-            list = outsourcerInfoService.listByIds(request.getIds());
-        } else {
-            list = outsourcerInfoService.list(request);
-        }
-        for (BizBusinessOutsourcerInfo record : list) {
-            DictCodeUtils.convertDictCodeToName(record);
-        }
+    public void export(@RequestBody OutsourcerInfoApprovalListRequest request) throws Exception {
+        List<BizBusinessOutsourcerInfo> list = super.exportList(request);
         super.exportExcel(BizBusinessOutsourcerInfo.class, list, ExportEnum.OUTSOURCER_EXPORT.getSheetName());
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java
index c2cbf9f..0410918 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java
@@ -17,11 +17,9 @@
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.IGeneralApprovalService;
 import com.casic.missiles.service.business.IBizBusinessSiteExecutiveInfoService;
-import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -60,7 +58,7 @@
         return siteExecutiveInfoService.saveSiteExecutiveInfo(siteExecutiveInfo);
     }
 
-    @ApiOperation("现场检测详情")
+    @ApiOperation("详情")
     @PostMapping("/detail")
     public ReturnDTO<SiteExecutiveDetailResponse> siteExecutiveDetail(@RequestBody @Valid IdDTO idDTO) throws Exception {
         Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
@@ -69,21 +67,10 @@
         return ReturnUtil.success(siteExecutiveInfoService.detail(idDTO.getId()));
     }
 
-    @ApiOperation("现场检测导出")
+    @ApiOperation("导出")
     @PostMapping("/listExport")
-    public void export(@RequestBody @Valid SiteExecutiveApprovalListRequest request, BindingResult bindingResult) throws Exception {
-        if (bindingResult.hasErrors()) {
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        }
-        List<SiteExecutiveApprovalListResponse> list;
-        if (!CollectionUtils.isEmpty(request.getIds())) {
-            list = siteExecutiveInfoService.listInfoByIds(request.getIds());
-        } else {
-            list = siteExecutiveInfoService.listInfo(request);
-        }
-        for (SiteExecutiveApprovalListResponse record : list) {
-            DictCodeUtils.convertDictCodeToName(record);
-        }
+    public void export(@RequestBody SiteExecutiveApprovalListRequest request) throws Exception {
+        List<SiteExecutiveApprovalListResponse> list = super.exportList(request);
         super.exportExcel(SiteExecutiveApprovalListResponse.class, list, ExportEnum.SITE_EXECUTIVE_EXPORT.getSheetName());
     }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
index 7e793cd..a92e209 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
@@ -55,7 +55,7 @@
 
     @ApiOperation("设备收发列表导出")
     @PostMapping("/export")
-    public void exportList(@RequestBody @Valid SampleDispatchListRequest request) throws IOException {
+    public void exportList(@RequestBody SampleDispatchListRequest request) throws IOException {
         List<SampleDispatchListResponse> list;
         if (!CollectionUtils.isEmpty(request.getIds())) {
             list = dispatchService.listByIds(request.getIds());
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java
index cdc77fc..d120fd4 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java
@@ -7,6 +7,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.business.labExecutive.*;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.business.IBusinessLabExecutiveInfoService;
@@ -14,6 +15,7 @@
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.*;
 
@@ -32,7 +34,7 @@
     @Autowired
     private IBusinessLabExecutiveInfoService labExecutiveInfoService;
 
-    @ApiOperation("实验室检测-部门检测-查询各状态列表（待检测、检测中、检测完）")
+    @ApiOperation("实验室任务-查询各状态列表（待检测、检测中、检测完）")
     @PostMapping("/deptExecutive/List")
     public ReturnDTO<PageInfoBT<SampleLabExecutiveListResponse>> queryDeptExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
@@ -43,10 +45,19 @@
         return ReturnUtil.success(super.packForBT(labExecutiveInfoService.deptLabExecutiveListPage(page, labExecutiveListRequest)));
     }
 
-    /**
-     * 实验室检测-我的检测-查询各状态列表（待检测、检测中、检测完）
-     */
-    @ApiOperation("实验室检测-我的检测-查询各状态列表（待检测、检测中、检测完）")
+    @ApiOperation("实验室任务导出")
+    @PostMapping("/deptExecutive/export")
+    public void deptExportList(@RequestBody @Valid SampleLabExecutiveListRequest request) throws Exception {
+        List<SampleLabExecutiveListResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = labExecutiveInfoService.deptLabExecutiveListByIds(request.getMeasureStatus(), request.getIds());
+        } else {
+            list = labExecutiveInfoService.deptLabExecutiveList(request);
+        }
+        super.exportExcel(SampleLabExecutiveListResponse.class, list, ExportEnum.DEPT_EXECUTIVE_TASK.getSheetName());
+    }
+
+    @ApiOperation("我的任务-查询各状态列表（待检测、检测中、检测完）")
     @PostMapping("/myExecutive/list")
     public ReturnDTO<PageInfoBT<SampleLabExecutiveListResponse>> queryMyExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
@@ -57,19 +68,25 @@
         return ReturnUtil.success(super.packForBT(labExecutiveInfoService.myLabExecutiveListPage(page, labExecutiveListRequest)));
     }
 
-    /**
-     * 实验室检测-我的检测-查询各状态样品数量（待检测、检测中、检测完）
-     */
-    @ApiOperation("实验室检测-我的检测-查询各状态样品数量（待检测、检测中、检测完）")
+    @ApiOperation("我的任务导出")
+    @PostMapping("/myExecutive/export")
+    public void exportList(@RequestBody @Valid SampleLabExecutiveListRequest request) throws Exception {
+        List<SampleLabExecutiveListResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = labExecutiveInfoService.myLabExecutiveListByIds(request.getMeasureStatus(), request.getIds());
+        } else {
+            list = labExecutiveInfoService.myLabExecutiveList(request);
+        }
+        super.exportExcel(SampleLabExecutiveListResponse.class, list, ExportEnum.MY_EXECUTIVE_TASK.getSheetName());
+    }
+
+    @ApiOperation("我的任务-查询各状态样品数量（待检测、检测中、检测完）")
     @GetMapping("/myExecutive/amount")
     public ReturnDTO<List<SampleAmountResponse>> queryMyExecutiveAmount() {
         return ReturnUtil.success(labExecutiveInfoService.myExecutiveAmount());
     }
 
-    /**
-     * 实验室检测-部门检测-分配（分配给具体人员）
-     */
-    @ApiOperation("实验室检测-部门检测-分配按钮（分配给具体人员）")
+    @ApiOperation("实验室任务-分配按钮（分配给具体人员）")
     @PostMapping("/deptExecutive/allocate")
     public ReturnDTO allocateStaff(@RequestBody @Valid SampleAllocateRequest sampleAllocateRequest, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -78,10 +95,7 @@
         return labExecutiveInfoService.allocateStaff(sampleAllocateRequest);
     }
 
-    /**
-     * 实验室检测-我的检测-检定人扫描收入（待检测->检测中）
-     */
-    @ApiOperation("实验室检测-我的检测-检定人扫描收入（待检测->检测中）")
+    @ApiOperation("我的任务-检定人扫描收入（待检测->检测中）")
     @PostMapping("/myExecutive/receive")
     public ReturnDTO sampleReceive(@RequestBody @Valid List<SampleOperateRequest> requestList, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -90,10 +104,7 @@
         return labExecutiveInfoService.sampleReceive(requestList);
     }
 
-    /**
-     * 实验室检测-负责人/检定人扫描检完（检测中->检测完）
-     */
-    @ApiOperation("实验室检测-负责人/检定人扫描检完（检测中->检测完）")
+    @ApiOperation("实验室任务-负责人/检定人扫描检完（检测中->检测完）")
     @PostMapping("/myExecutive/complete")
     public ReturnDTO sampleExecutiveComplete(@RequestBody @Valid List<SampleOperateRequest> requestList, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -102,10 +113,7 @@
         return labExecutiveInfoService.sampleExecutiveComplete(requestList);
     }
 
-    /**
-     * 实验室检测-部门检测/我的检测 编辑（只能修改应出具证书）
-     */
-    @ApiOperation("实验室检测-部门检测/我的检测 编辑（只能修改应出具证书）")
+    @ApiOperation("实验室任务/我的任务 编辑（只能修改应出具证书）")
     @PostMapping("/executive/update")
     public ReturnDTO updateExecutive(@RequestBody @Valid UpdateExecutiveRequest request, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -114,10 +122,7 @@
         return labExecutiveInfoService.updateExecutive(request);
     }
 
-    /**
-     * 实验室检测-部门检测/我的检测 详情
-     */
-    @ApiOperation("实验室检测-部门检测/我的检测 详情")
+    @ApiOperation("实验室任务/我的任务 详情")
     @PostMapping("/executive/detail")
     public ReturnDTO<ExecutiveDetailResponse> executiveDetail(@RequestBody @Valid ExecutiveDetailRequest request, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
@@ -131,7 +136,7 @@
      * 退回后会将下一个要执行的实验室检测状态更新为待分配，将后面的实验室顺序变更为连续（都进行减1）
      * 最后一个检测的实验室退回，等分发员再增加实验室或设备收发中的已收入直接手动点击完成
      */
-    @ApiOperation("实验室检测-部门检测/我的检测 退回（待检测/检测中->退回）")
+    @ApiOperation("实验室任务/我的任务 退回（待检测/检测中->退回）")
     @PostMapping("/executive/sendBack")
     public ReturnDTO executiveSendBack(@RequestBody @Valid ExecutiveSendBackRequest request, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -140,9 +145,6 @@
         return labExecutiveInfoService.sampleExecutiveSendBack(request);
     }
 
-    /**
-     * 分发员编辑实验室检测列表
-     */
     @ApiOperation("分发员编辑实验室检测列表")
     @PostMapping("/handOut/updateList")
     public ReturnDTO updateExecutiveList(@RequestBody @Valid UpdateExecutiveListRequest request, BindingResult bindingResult) {
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java
index 48a67ed..0c04f31 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java
@@ -10,6 +10,7 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.resource.customer.CustomerApprovalListRequest;
 import com.casic.missiles.dto.resource.customer.CustomerSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceCustomerInfo;
@@ -26,6 +27,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -55,6 +57,13 @@
         return customerInfoService.saveCustomerInfo(request);
     }
 
+    @ApiOperation("委托方名录导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody CustomerApprovalListRequest request) throws Exception {
+        List<BizResourceCustomerInfo> list = super.exportList(request);
+        super.exportExcel(BizResourceCustomerInfo.class, list, ExportEnum.CUSTOMER_INFO.getSheetName());
+    }
+
     @ApiOperation("委托方人员列表（分页）")
     @PostMapping("/person/listPage")
     public ReturnDTO<PageInfoBT<BizResourceCustomerStaff>> personListPage(@RequestBody IdDTO idDto) {
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
index 972ed4b..6418ea5 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
@@ -5,6 +5,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.resource.customer.SuggestFormApprovalListRequest;
 import com.casic.missiles.dto.resource.customer.SuggestFormSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceCustomerSuggestForm;
@@ -20,6 +21,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -50,4 +52,11 @@
         return suggestFormService.saveSuggestForm(request);
     }
 
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody SuggestFormApprovalListRequest request) throws Exception {
+        List<BizResourceCustomerSuggestForm> list = super.exportList(request);
+        super.exportExcel(BizResourceCustomerSuggestForm.class, list, ExportEnum.CUSTOMER_SUGGEST_FORM.getSheetName());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java
index 1934d1a..9e07eab 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java
@@ -15,12 +15,16 @@
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.resource.IEnvEnvironmentRecordConfigService;
 import com.casic.missiles.service.resource.IEnvEnvironmentRecordDataService;
+import com.casic.missiles.service.resource.IEnvLocationInfoService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
 import java.util.List;
@@ -39,6 +43,8 @@
     private IEnvEnvironmentRecordDataService environmentRecordDataService;
     @Autowired
     private IEnvEnvironmentRecordConfigService environmentRecordConfigService;
+    @Autowired
+    private IEnvLocationInfoService locationInfoService;
 
     @ApiOperation("环境记录单数据列表/详情")
     @PostMapping("/data/listPage")
@@ -95,4 +101,11 @@
         });
         return environmentRecordConfigService.deleteEnvironmentRecordConfig(idDTO.getId());
     }
+
+    @ApiOperation("地点列表")
+    @PostMapping("/location/listPage")
+    public ReturnDTO<PageInfoBT<LocationListResponse>> locationListPage(@RequestBody @Valid LocationListRequest request) {
+        Page<LocationListResponse> page = PageFactory.defaultPage();
+        return ReturnUtil.success(super.packForBT(locationInfoService.listPage(page, request)));
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java
index 82efe3f..e9561fa 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java
@@ -10,6 +10,7 @@
 import com.casic.missiles.dto.resource.seal.SealLogListRequest;
 import com.casic.missiles.dto.resource.seal.SealNoteApprovalListRequest;
 import com.casic.missiles.dto.resource.seal.SealNoteSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceSealUseLog;
@@ -27,6 +28,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -58,6 +60,13 @@
         return sealUseNoteService.saveSeal(request);
     }
 
+    @ApiOperation("印章使用登记导出（列表和导出中去掉经办人和监印人）")
+    @PostMapping("/listExport")
+    public void export(@RequestBody SealNoteApprovalListRequest request) throws Exception {
+        List<BizResourceSealUseNote> list = super.exportList(request);
+        super.exportExcel(BizResourceSealUseNote.class, list, ExportEnum.SEAL_NOTE.getSheetName());
+    }
+
     // TODO: 2023/7/28 印章使用日志：系统中使用印章时插入数据库
 
     @ApiOperation("印章使用日志列表（分页）")
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java
index 9b674fc..06b6521 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java
@@ -9,16 +9,20 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.resource.staff.StaffCertRequest;
 import com.casic.missiles.dto.resource.staff.StaffCertResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.service.resource.IBizResourceStaffInfoService;
 import com.casic.missiles.service.resource.IBizResourceStaffVerifierService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.List;
+
 /**
  * @Description:
  * @Author: wangpeng
@@ -41,9 +45,21 @@
         return ReturnUtil.success(super.packForBT(responsePage));
     }
 
+    @ApiOperation("证书逾期提醒导出")
+    @PostMapping("/listExport")
+    public void exportList(@RequestBody StaffCertRequest request) throws Exception {
+        List<StaffCertResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = staffInfoService.certListByIds(request.getIds());
+        } else {
+            list = staffInfoService.certList(request);
+        }
+        super.exportExcel(StaffCertResponse.class, list, ExportEnum.STAFF_CERTIFICATE_EXPIRE.getSheetName());
+    }
+
     @ApiOperation("证书逾期提醒")
     @PostMapping("/expirationReminder")
-    public ReturnDTO expirationReminder(@RequestBody IdDTO idDto) {
-        return verifierService.expirationReminder(idDto);
+    public ReturnDTO expirationReminder(@RequestBody IdDTO idDTO) {
+        return verifierService.expirationReminder(idDTO);
     }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java
index 3b251ad..a6e7850 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java
@@ -12,6 +12,7 @@
 import com.casic.missiles.dto.resource.staff.StaffListRequest;
 import com.casic.missiles.dto.resource.staff.TrainListRequest;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.*;
@@ -22,7 +23,10 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
 import java.util.List;
@@ -52,8 +56,19 @@
             throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
         }
         Page<BizResourceStaffInfo> page = PageFactory.defaultPage();
-        Page<BizResourceStaffInfo> responsePage = staffInfoService.listPage(page, request);
-        return ReturnUtil.success(super.packForBT(responsePage));
+        return ReturnUtil.success(super.packForBT(staffInfoService.listPage(page, request)));
+    }
+
+    @ApiOperation("人员登记导出")
+    @PostMapping("/listExport")
+    public void exportList(@RequestBody StaffListRequest request) throws Exception {
+        List<BizResourceStaffInfo> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = staffInfoService.listByIds(request.getIds());
+        } else {
+            list = staffInfoService.list(request);
+        }
+        super.exportExcel(BizResourceStaffInfo.class, list, ExportEnum.STAFF_INFO.getSheetName());
     }
 
     @ApiOperation("人员登记详情基础信息")
@@ -85,9 +100,9 @@
 
     @ApiOperation("科研教育列表（分页）")
     @PostMapping("/education/listPage")
-    public ReturnDTO<PageInfoBT<BizResourceStaffEducation>> educationListPage(@RequestBody IdDTO idDto) {
+    public ReturnDTO<PageInfoBT<BizResourceStaffEducation>> educationListPage(@RequestBody IdDTO idDTO) {
         Page<BizResourceStaffEducation> page = PageFactory.defaultPage();
-        Page<BizResourceStaffEducation> responsePage = staffInfoService.educationListPage(page, idDto);
+        Page<BizResourceStaffEducation> responsePage = staffInfoService.educationListPage(page, idDTO);
         return ReturnUtil.success(super.packForBT(responsePage));
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java
index af6aa86..d85d84a 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java
@@ -9,6 +9,7 @@
 import com.casic.missiles.dto.resource.outsideService.SupplierApprovalListRequest;
 import com.casic.missiles.dto.resource.outsideService.SupplierSaveResponse;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceSupplierAbility;
@@ -67,6 +68,13 @@
         return ReturnUtil.success(supplierInfoService.detail(idDTO.getId()));
     }
 
+    @ApiOperation("合格供方导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody SupplierApprovalListRequest request) throws Exception {
+        List<BizResourceSupplierInfo> list = super.exportList(request);
+        super.exportExcel(BizResourceSupplierInfo.class, list, ExportEnum.SUPPLIER_INFO.getSheetName());
+    }
+
     @ApiOperation("供方人员列表（分页）")
     @PostMapping("/person/listPage")
     public ReturnDTO<PageInfoBT<BizResourceSupplierPerson>> personListPage(@RequestBody IdDTO idDTO) {
diff --git a/casic-metering-api/src/main/resources/config/application.yml b/casic-metering-api/src/main/resources/config/application.yml
index 350db5f..ecff521 100644
--- a/casic-metering-api/src/main/resources/config/application.yml
+++ b/casic-metering-api/src/main/resources/config/application.yml
@@ -126,7 +126,7 @@
     #作者
     author: wangpeng
     #待生成对象表名
-    table-name: biz_equipment_technical_target_approval,biz_equipment_attachment_approval,biz_equipment_checkpoint_approval
+    table-name: biz_business_outsource_protocol
 
 reminder:
   #节点--common模块config包 ReminderNodeConfig配置
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
index 4a19e4e..d47d552 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
@@ -53,6 +53,7 @@
     SUGGEST_FORM_SAVE_FAILED(2509, "委托方意见登记表保存至草稿箱失败"),
     EXAMINE_FORM_SAVE_FAILED(2510, "要求、委托书及合同评审表保存至草稿箱失败"),
     CUSTOMER_EXIST_SAVE_FAILED(2511, "该委托方已存在，请重新选择"),
+    DUPLICATE_LOCATION_NO(2512, "地点编号已存在"),
 
     /**
      * 计量检定业务模块
@@ -68,6 +69,8 @@
     COMPLETE_SAMPLE_NOT_EXIST(2609, "检测中不存在扫描收入的样品"),
     CANNOT_CHANGE_MEASURE_INFO(2610, "无法更改非当前登录用户的检测信息"),
     NON_EXIST_ORDER_OR_SAMPLE(2611, "不存在该委托单或该委托单下的样品"),
+    OUTSOURCE_ACCESS_SAVE_FAILED(2612, "测试、校准或检定工作分包评审表保存至草稿箱失败"),
+    OUTSOURCE_PROTOCOL_SAVE_FAILED(2613, "测试、校准或检定工作分包协议书保存至草稿箱失败"),
 
     /**
      * 历史遗留备用
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
index 5089ad1..81a406b 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
@@ -10,54 +10,38 @@
     /**
      * 资源管理
      */
-    ENVIRONMENT_DATA_EXPORT("environmentData", "environmentData", "环境记录单数据"),
+    ENVIRONMENT_DATA_EXPORT("environmentData", "环境记录单数据", "环境记录单数据"),
+    STAFF_INFO("staffInfo", "人员登记", "人员登记"),
+    STAFF_CERTIFICATE_EXPIRE("certificateExpire", "证书逾期提醒", "证书逾期提醒"),
+    SUPPLIER_INFO("supplierInfo", "合格供方名录", "合格供方名录"),
+    CUSTOMER_INFO("customerInfo", "委托方名录", "委托方名录"),
+    CUSTOMER_SUGGEST_FORM("customerSuggestForm", "委托方意见登记表", "委托方意见登记表"),
+    SEAL_NOTE("sealNote", "印章使用登记", "印章使用登记"),
 
-    FILE_EXPORT("meterFileData", "meterFileData", "计量文件信息"),
-    TRAIN_PLAN_EXPORT("trainPlanData", "trainPlanData", "培训计划"),
-    TRAIN_LOG_EXPORT("trainLogData", "trainLogData", "培训记录"),
-    METER_ORGANIZE_EXPORT("meterOrganizeData", "meterOrganizeData", "计量组织"),
-    TRACE_SUPPLIER_EXPORT("traceSupplierData", "traceSupplierData", "溯源供方"),
-    SIGN_EXPORT("signData", "signData", "签名/签章"),
-    TEMPLATE_EXPORT("templateData", "templateData", "原始记录模板/证书报告模板"),
-    FIXED_ASSETS("meterFixedAssets", "meterFixedAssets", "固定资产"),
-    METER_EQUIPMENT("meterEquipment", "meterEquipment", "测量设备"),
-    CALIBRATION_TEST_EQUIPMENT("calibrationTestEquipment", "calibrationTestEquipment", "校准检定设备"),
-    MEASURE_ACCOUNT("measureAccount", "measureAccount", "测量工装"),
-    STANDARD_SUPPORT_EQUIPMENT("standardSupportEquipment", "standardSupportEquipment", "标准配套设备"),
-    STANDARD_EQUIPMENT("standardEquipment", "standardEquipment", "标准装置"),
-    FLOW_DEF_EXPORT("flowDefData", "flowDefData", "流程定义"),
-    STAFF_CERTIFICATE("certificate", "certificate", "计量人员证书"),
-    CHECK_INFO("checkInfo", "checkInfo", "设备管理点检测"),
-    EQUIPMENT_APPLY("equipmentApply", "equipmentApply", "设备借用"),
-    STANDARD_EQUIPMENT_REMIND("equipmentApplyRemind", "equipmentApplyRemind", "标准装置到期提醒"),
-    METER_PRICE("meterPrice", "meterPrice", "价格库"),
-    METER_STAFF("meterStaff", "meterStaff", "计量人员"),
-    STANDARD_EQUIPMENT_APPLY("standardEquipmentApply", "standardEquipmentApply", "标准装置申请"),
-    STATE_MANAGE_APPLY("stateManage", "stateManage", "状态管理"),
-    METER_ACCEPTANCE_CHECK("acceptanceCheck", "acceptanceCheck", "设备检修保养验收单"),
-    CUSTOMER_EXPORT("customerData", "customerData", "客户信息"),
-    ORDER_EXPORT("orderData", "orderData", "委托书信息"),
-    SAMPLE_EXPORT("sampleData", "sampleData", "样本信息"),
-    EXCHANGE_DATA("exchangeData", "exchangeData", "设备交接单"),
-    DISPATCH_DATA("dispatchData", "dispatchData", "设备收发"),
-    ENVIRONMENT_DATA("environmentData", "environmentData", "环境记录单"),
-    ORIGIN_DATA("originData", "originData", "原始记录"),
-    CERTIFICATE_REPORT("certificateReport", "certificateReport", "证书报告"),
-    ADVICE_EXPORT("adviceData", "adviceData", "客户反馈"),
-    HANDOUT_EXPORT("handoutData", "handoutData", "任务分发列表"),
-    OUTSOURCER_EXPORT("outsourcerData", "outsourcerData", "分包方"),
-    SITE_EXECUTIVE_EXPORT("siteExecutiveData", "siteExecutiveData", "现场测试、校准或检定"),
-    CERTIFICATE_PRINT_EXPORT("certificatePrintData", "certificatePrintData", "证书打印"),
-    DOWNLOAD_TEMPLATE("downloadTemplate", "downloadTemplate", "页面配置"),
-    OUTSOURCER_CERTIFICATE_EXPORT("outsourceCertificateData", "outsourceCertificateData", "分包证书"),
-    SETTLEMENT_INFO_EXPORT("settlementInfoData", "settlementInfoData", "业务结算"),
-    EQUIPMENT_REMIND("equipmentRemind", "equipmentRemind", "设备到期提醒"),
-    AGREEMENT_INFO_EXPORT("agreementInfoData", "agreementInfoData", "合同"),
-    WORK_STATISTICS_EXPORT("workStatisticsData", "workStatisticsData", "实时工作统计"),
-    DEPT_OUTPUT_EXPORT("deptOutputData", "deptOutputData", "部门产值分析"),
-    WORKLOAD_EXPORT("workloadData", "workloadData", "业务工作量分析"),
-    DEPT_COMPREHENSIVE_EXPORT("deptComprehensiveData", "deptComprehensiveData", "部门综合分析"),
-    ENVIRONMENTAL_RECORD("environmentalRecordData", "environmentalRecordData", "现场环境记录");
+    /**
+     * 计量检定业务
+     */
+    OUTSOURCER_EXPORT("outsourcerData", "分包方名录", "分包方名录"),
+    IDENTIFY_EXPORT("identifyData", "计量标识", "计量标识"),
+    ORDER_EXPORT("orderData", "任务单", "任务单"),
+    DISPATCH_DATA("dispatchData", "设备收发", "设备收发"),
+    HANDOUT_EXPORT("handoutData", "任务分发", "任务分发"),
+    SITE_EXECUTIVE_EXPORT("siteExecutiveData", "现场测试、校准或检定", "现场测试、校准或检定"),
+    CERTIFICATE_REPORT("certificateReport", "证书审批", "证书审批"),
+    CERTIFICATE_CHANGE_APPLY("certificateChangeApply", "证书报告补充或更换申请单", "证书报告补充或更换申请单"),
+    CERTIFICATE_PRINT("certificatePrintData", "证书打印审批", "证书打印审批"),
+    DEPT_EXECUTIVE_TASK("deptExecutiveTaskData", "实验室任务", "实验室任务"),
+    MY_EXECUTIVE_TASK("myExecutiveTaskData", "我的任务", "我的任务"),
+    OUTSOURCE_ASSESS("outsourceAssess", "测试、校准或检定工作分包评审表", "测试、校准或检定工作分包评审表"),
+    OUTSOURCE_PROTOCOL("outsourceProtocol", "测试、校准或检定工作分包协议书", "测试、校准或检定工作分包协议书"),
+
+    /**
+     * 系统管理
+     */
+    SIGN_EXPORT("signData", "签名", "签名"),
+    TEMPLATE_EXPORT("templateData", "文件模板", "文件模板"),
+    FLOW_DEF_EXPORT("flowDefData", "流程定义", "流程定义"),
+    DOWNLOAD_TEMPLATE("downloadTemplate", "流程定义", "页面配置");
 
     ExportEnum(String fileName, String sheetName, String description) {
         this.fileName = fileName;
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateRecordTypeCodeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateRecordTypeCodeEnum.java
index 31d913c..a963522 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateRecordTypeCodeEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateRecordTypeCodeEnum.java
@@ -46,4 +46,14 @@
     String SITE_EXECUTIVE_APPROVAL = "01";
     //《现场测试、校准或检定工作记录表》
     String SITE_EXECUTIVE_LOG = "02";
+
+    //测试、校准或检定工作分包协议书
+    String OUTSOURCE_PROTOCOL = "01";
+    //测试、校准或检定工作分包评审表
+    String OUTSOURCE_ACCESS = "02";
+    //测试、校准或检定工作分包通知书
+    String OUTSOURCE_NOTICE = "03";
+    //测试、校准或检定工作分包方名录
+    String OUTSOURCE_INFO = "04";
+
 }
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
index 24b8635..f78bd53 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
@@ -15,6 +15,10 @@
     String CERTIFICATE_CHANGE_APPLY_BEAN_NAME = "certificateChangeApplyBean";
     //现场测试、校准或检定
     String SITE_EXECUTIVE_BEAN_NAME = "siteExecutiveBean";
+    //测试、校准或检定工作分包评审表
+    String OUTSOURCE_ASSESS_BEAN_NAME = "outsourceAssessBean";
+    //测试、校准或检定工作分包协议书
+    String OUTSOURCE_PROTOCOL_BEAN_NAME = "outsourceProtocolBean";
 
     /*********************************设备与装置************************************/
     //设备台账
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 b21c661..6b86fd1 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
@@ -18,6 +18,8 @@
     OUTSOURCER_APPROVAL(OUTSOURCER_BEAN_NAME, ""),
     CERTIFICATE_CHANGE_APPROVAL(CERTIFICATE_CHANGE_APPLY_BEAN_NAME, ""),
     SITE_EXECUTIVE_APPROVAL(SITE_EXECUTIVE_BEAN_NAME, ""),
+    OUTSOURCE_ASSESS_APPROVAL(OUTSOURCE_ASSESS_BEAN_NAME, ""),
+    OUTSOURCE_PROTOCOL_APPROVAL(OUTSOURCE_PROTOCOL_BEAN_NAME, ""),
 
     ACTION_STATUS_MAP(new HashMap<String, AwareActionStatusEnum>() {
         {
@@ -47,6 +49,10 @@
             put(ApplyFromIdEnum.CERTIFICATE_CHANGE_APPROVAL.getCode(), CERTIFICATE_CHANGE_APPROVAL);
             //现场测试、校准或检定审批
             put(ApplyFromIdEnum.SITE_EXECUTIVE_APPROVAL.getCode(), SITE_EXECUTIVE_APPROVAL);
+            //测试、校准或检定工作分包评审表
+            put(ApplyFromIdEnum.OUTSOURCE_ASSESS_APPROVAL.getCode(), OUTSOURCE_ASSESS_APPROVAL);
+            //测试、校准或检定工作分包协议书
+            put(ApplyFromIdEnum.OUTSOURCE_PROTOCOL_APPROVAL.getCode(), OUTSOURCE_PROTOCOL_APPROVAL);
         }
     });
     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 934405e..c7410bd 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
@@ -9,6 +9,8 @@
     CERTIFICATE_CHANGE_APPROVAL("jljdywzsbchghsqd", MessageSourceModuleEnum.BUSINESS.getCode(), "证书/报告补充或更换申请单"),
     OUTSOURCER_APPROVAL("jljdywcsjzhgfbfml", MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定合格分包方名录"),
     SITE_EXECUTIVE_APPROVAL("jljdywxccsjzsp", MessageSourceModuleEnum.BUSINESS.getCode(), "现场测试、校准或检定审批"),
+    OUTSOURCE_ASSESS_APPROVAL("jljdywcsjzfbpsb", MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包评审表"),
+    OUTSOURCE_PROTOCOL_APPROVAL("jljdywcsjzfbxys", MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包协议书"),
 
 
     /*******************************************设备与装置*********************************************/
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/GeneralApprovalMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/GeneralApprovalMapper.java
index 4fb7344..0c9d6ae 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/GeneralApprovalMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/GeneralApprovalMapper.java
@@ -17,8 +17,4 @@
 
     Page<O> selectBatchForApprovalList(Page<O> page, @Param("request") R request, @Param("businessKeys") List<String> businessKeys);
 
-//    Page<O> selectListPage(Page<O> page, @Param("request") R request);
-
-//    Long selectMaxNo();
-
 }
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceAssessMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceAssessMapper.java
index 7867bb8..ba59009 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceAssessMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceAssessMapper.java
@@ -1,7 +1,12 @@
 package com.casic.missiles.mapper.business;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.business.outsource.OutsourceAssessApprovalListRequest;
+import com.casic.missiles.mapper.GeneralApprovalMapper;
 import com.casic.missiles.model.business.BizBusinessOutsourceAssess;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * <p>
@@ -11,6 +16,10 @@
  * @author wangpeng
  * @since 2023-08-16
  */
-public interface BizBusinessOutsourceAssessMapper extends BaseMapper<BizBusinessOutsourceAssess> {
+public interface BizBusinessOutsourceAssessMapper extends GeneralApprovalMapper<BizBusinessOutsourceAssess, BizBusinessOutsourceAssess, OutsourceAssessApprovalListRequest> {
+
+    Page<BizBusinessOutsourceAssess> selectBatchForApprovalList(Page<BizBusinessOutsourceAssess> page, @Param("request") OutsourceAssessApprovalListRequest request, @Param("businessKeys") List<String> businessKeys);
+
+    Long selectMaxProjectNo();
 
 }
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceProtocolMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceProtocolMapper.java
new file mode 100644
index 0000000..e6aba35
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceProtocolMapper.java
@@ -0,0 +1,24 @@
+package com.casic.missiles.mapper.business;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.business.outsource.OutsourceProtocolApprovalListRequest;
+import com.casic.missiles.mapper.GeneralApprovalMapper;
+import com.casic.missiles.model.business.BizBusinessOutsourceProtocol;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 计量检定业务-分包管理-测试、校准或检定工作分包协议书 Mapper 接口
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-08-24
+ */
+public interface BizBusinessOutsourceProtocolMapper extends GeneralApprovalMapper<BizBusinessOutsourceProtocol, BizBusinessOutsourceProtocol, OutsourceProtocolApprovalListRequest> {
+
+    Page<BizBusinessOutsourceProtocol> selectBatchForApprovalList(Page<BizBusinessOutsourceProtocol> page, @Param("request") OutsourceProtocolApprovalListRequest request, @Param("businessKeys") List<String> businessKeys);
+
+    Long selectMaxProtocolNo();
+}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/EnvLocationInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/EnvLocationInfoMapper.java
new file mode 100644
index 0000000..49eff87
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/EnvLocationInfoMapper.java
@@ -0,0 +1,21 @@
+package com.casic.missiles.mapper.resource;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.resource.environment.LocationListRequest;
+import com.casic.missiles.dto.resource.environment.LocationListResponse;
+import com.casic.missiles.model.resource.EnvLocationInfo;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * <p>
+ * 实验室环境监控系统-设备表 Mapper 接口
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-06-07
+ */
+public interface EnvLocationInfoMapper extends BaseMapper<EnvLocationInfo> {
+
+    Page<LocationListResponse> selectLocationListPage(Page<LocationListResponse> page, @Param("request") LocationListRequest request);
+}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java
index de124db..85ed0f7 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java
@@ -1,7 +1,9 @@
 package com.casic.missiles.mapper.system;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.dto.system.SignDetailResponse;
+import com.casic.missiles.dto.system.SignListRequest;
 import com.casic.missiles.model.system.SystemSign;
 import org.apache.ibatis.annotations.Param;
 
@@ -22,4 +24,8 @@
     SignDetailResponse selectSignDetailById(Long id);
 
     List<SystemSign> selectUsableSignList(@Param("userId") Long userId);
+
+    Page<SystemSign> selectSignListPage(Page<SystemSign> page, @Param("request") SignListRequest request);
+
+    List<SystemSign> selectSignList(@Param("request") SignListRequest request);
 }
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateChangeApplyMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateChangeApplyMapper.xml
index d798447..c496092 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateChangeApplyMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateChangeApplyMapper.xml
@@ -30,31 +30,31 @@
         SELECT *
         FROM biz_business_certificate_change_apply
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.changeApplyNo != null and request.changeApplyNo !=''">
+        <if test="request != null and request.changeApplyNo != null and request.changeApplyNo !=''">
             and change_apply_no like concat('%',#{request.changeApplyNo},'%')
         </if>
-        <if test="request.changeReportNo != null and request.changeReportNo !=''">
+        <if test="request != null and request.changeReportNo != null and request.changeReportNo !=''">
             and change_report_no like concat('%',#{request.changeReportNo},'%')
         </if>
-        <if test="request.changeReportName != null and request.changeReportName !=''">
+        <if test="request != null and request.changeReportName != null and request.changeReportName !=''">
             and change_report_name like concat('%',#{request.changeReportName},'%')
         </if>
-        <if test="request.changeType != null and request.changeType !=''">
+        <if test="request != null and request.changeType != null and request.changeType !=''">
             and change_type = #{request.changeType}
         </if>
-        <if test="request.createUserName != null and request.createUserName !=''">
+        <if test="request != null and request.createUserName != null and request.createUserName !=''">
             and create_user_name like concat('%',#{request.createUserName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificatePrintMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificatePrintMapper.xml
index b66cd99..49c0ac8 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificatePrintMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificatePrintMapper.xml
@@ -31,34 +31,34 @@
         LEFT JOIN biz_business_order_sample_relation bosr ON (bosr.order_id = bcr.order_id AND bosr.sample_id = bcr.sample_id)
         LEFT JOIN biz_business_order_info boi ON boi.id = bosr.order_id
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and bcp.approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.printStatus != null and request.printStatus !=''">
+        <if test="request != null and request.printStatus != null and request.printStatus !=''">
             and print_status = #{request.printStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and bcp.create_user_id = #{request.createUserId}
         </if>
-        <if test="request.certificateReportNo != null and request.certificateReportNo !=''">
+        <if test="request != null and request.certificateReportNo != null and request.certificateReportNo !=''">
             and bcr.certificate_report_no like concat('%',#{request.certificateReportNo},'%')
         </if>
-        <if test="request.certificateReportName != null and request.certificateReportName !=''">
+        <if test="request != null and request.certificateReportName != null and request.certificateReportName !=''">
             and bcr.certificate_report_name like concat('%',#{request.certificateReportName},'%')
         </if>
-        <if test="request.customerName != null and request.customerName !=''">
+        <if test="request != null and request.customerName != null and request.customerName !=''">
             and boi.customer_name like concat('%',#{request.customerName},'%')
         </if>
-        <if test="request.sampleNo != null and request.sampleNo !=''">
+        <if test="request != null and request.sampleNo != null and request.sampleNo !=''">
             and bosr.sample_no like concat('%',#{request.sampleNo},'%')
         </if>
-        <if test="request.sampleName != null and request.sampleName !=''">
+        <if test="request != null and request.sampleName != null and request.sampleName !=''">
             and bosr.sample_name like concat('%',#{request.sampleName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and bcp.create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and bcp.create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml
index b366034..767695d 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml
@@ -46,33 +46,37 @@
         SELECT bcr.*, bosr.sample_no, bosr.sample_name, bosr.sample_model, rsi.staff_name
         FROM biz_business_certificate_report bcr
         LEFT JOIN biz_business_order_sample_relation bosr ON (bosr.order_id = bcr.order_id AND bosr.sample_id = bcr.sample_id)
+        LEFT JOIN biz_business_order_info boi ON boi.id = bcr.order_id
         LEFT JOIN biz_resource_staff_info rsi ON rsi.id = bcr.measure_person_id
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and bcr.approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and bcr.create_user_id = #{request.createUserId}
         </if>
-        <if test="request.certificateReportNo != null and request.certificateReportNo !=''">
+        <if test="request != null and request.customerId != null and request.customerId !=''">
+            and boi.customer_id = #{request.customerId}
+        </if>
+        <if test="request != null and request.certificateReportNo != null and request.certificateReportNo !=''">
             and bcr.certificate_report_no like concat('%',#{request.certificateReportNo},'%')
         </if>
-        <if test="request.certificateReportName != null and request.certificateReportName !=''">
+        <if test="request != null and request.certificateReportName != null and request.certificateReportName !=''">
             and bcr.certificate_report_name like concat('%',#{request.certificateReportName},'%')
         </if>
-        <if test="request.sampleNo != null and request.sampleNo !=''">
+        <if test="request != null and request.sampleNo != null and request.sampleNo !=''">
             and bosr.sample_no like concat('%',#{request.sampleNo},'%')
         </if>
-        <if test="request.measureCategory != null and request.measureCategory !=''">
+        <if test="request != null and request.measureCategory != null and request.measureCategory !=''">
             and bcr.measure_category = #{request.measureCategory}
         </if>
-        <if test="request.measurePerson != null and request.measurePerson !=''">
+        <if test="request != null and request.measurePerson != null and request.measurePerson !=''">
             and rsi.staff_name like concat('%',#{request.measurePerson},'%')
         </if>
-        <if test="request.calibrationTimeStart != null and request.calibrationTimeStart !=''">
+        <if test="request != null and request.calibrationTimeStart != null and request.calibrationTimeStart !=''">
             and bcr.calibration_time &gt;= #{request.calibrationTimeStart}
         </if>
-        <if test="request.calibrationTimeEnd != null and request.calibrationTimeEnd !=''">
+        <if test="request != null and request.calibrationTimeEnd != null and request.calibrationTimeEnd !=''">
             and bcr.calibration_time &lt;= #{request.calibrationTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceAssessMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceAssessMapper.xml
index d0fcf8b..c22c101 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceAssessMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceAssessMapper.xml
@@ -7,6 +7,8 @@
         <id column="id" property="id" />
         <result column="project_no" property="projectNo" />
         <result column="project_name" property="projectName" />
+        <result column="lab_code" property="labCode" />
+        <result column="group_code" property="groupCode" />
         <result column="applicant_id" property="applicantId" />
         <result column="applicant_name" property="applicantName" />
         <result column="applicant_time" property="applicantTime" />
@@ -31,7 +33,45 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, project_no, project_name, applicant_id, applicant_name, applicant_time, minio_file_name, remark, create_user_id, create_user_name, outsourcer_id, pre_start_time, pre_end_time, outsource_reason, pre_cost, approval_status, process_id, approve_situation, traceability, test_method, technique_ability, create_time, update_time
+        id, project_no, project_name, lab_code, group_code, applicant_id, applicant_name, applicant_time, minio_file_name, remark, create_user_id, create_user_name, outsourcer_id, pre_start_time, pre_end_time, outsource_reason, pre_cost, approval_status, process_id, approve_situation, traceability, test_method, technique_ability, create_time, update_time
     </sql>
 
+    <select id="selectMaxProjectNo" resultType="java.lang.Long">
+        SELECT IFNULL(max(RIGHT(project_no, 3)), 0) from biz_business_outsource_assess
+    </select>
+
+    <select id="selectBatchForApprovalList" resultMap="BaseResultMap">
+        SELECT bboa.*, bboi.outsourcer_name, bboi.director
+        FROM biz_business_outsource_assess bboa
+        LEFT JOIN biz_business_outsourcer_info bboi ON bboa.outsourcer_id = bboi.id
+        WHERE 1=1
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
+            and bboa.approval_status = #{request.approvalStatus}
+        </if>
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
+            and bboa.create_user_id = #{request.createUserId}
+        </if>
+        <if test="request != null and request.projectNo != null and request.projectNo !=''">
+            and bboa.project_no like concat('%',#{request.projectNo},'%')
+        </if>
+        <if test="request != null and request.outsourcerName != null and request.outsourcerName !=''">
+            and bboi.outsourcer_name like concat('%',#{request.outsourcerName},'%')
+        </if>
+        <if test="request != null and request.applicantName != null and request.applicantName !=''">
+            and bboa.applicant_name like concat('%',#{request.applicantName},'%')
+        </if>
+        <if test="request != null and request.applicantTimeStart != null and request.applicantTimeStart !=''">
+            and bboa.applicant_time &gt;= #{request.applicantTimeStart}
+        </if>
+        <if test="request != null and request.applicantTimeEnd != null and request.applicantTimeEnd !=''">
+            and bboa.applicant_time &lt;= #{request.applicantTimeEnd}
+        </if>
+        <if test="businessKeys != null">
+            and bboa.id in
+            <foreach collection="businessKeys" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
+        ORDER BY bboa.create_time DESC
+    </select>
 </mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceProtocolMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceProtocolMapper.xml
new file mode 100644
index 0000000..b7b2149
--- /dev/null
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceProtocolMapper.xml
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.mapper.business.BizBusinessOutsourceProtocolMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.business.BizBusinessOutsourceProtocol">
+        <id column="id" property="id" />
+        <result column="protocol_no" property="protocolNo" />
+        <result column="project_name" property="projectName" />
+        <result column="lab_code" property="labCode" />
+        <result column="group_code" property="groupCode" />
+        <result column="outsourcer_id" property="outsourcerId" />
+        <result column="remark" property="remark" />
+        <result column="outsource_no" property="outsourceNo" />
+        <result column="outsource_name" property="outsourceName" />
+        <result column="contacts" property="contacts" />
+        <result column="mobile" property="mobile" />
+        <result column="address" property="address" />
+        <result column="require_date" property="requireDate" />
+        <result column="outsource_cost" property="outsourceCost" />
+        <result column="director" property="director" />
+        <result column="item" property="item" />
+        <result column="requires" property="requires" />
+        <result column="create_user_id" property="createUserId" />
+        <result column="create_user_name" property="createUserName" />
+        <result column="approval_status" property="approvalStatus" />
+        <result column="process_id" property="processId" />
+        <result column="create_time" property="createTime" />
+        <result column="update_time" property="updateTime" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, protocol_no, project_name, lab_code, group_code, outsourcer_id, remark, outsource_no, outsource_name, contacts, mobile, address, require_date, outsource_cost, director, item, requires, create_user_id, create_user_name, approval_status, process_id, create_time, update_time
+    </sql>
+
+    <select id="selectMaxProtocolNo" resultType="java.lang.Long">
+        SELECT IFNULL(max(RIGHT(protocol_no, 3)), 0) from biz_business_outsource_protocol
+    </select>
+
+    <select id="selectBatchForApprovalList" resultMap="BaseResultMap">
+        SELECT *
+        FROM biz_business_outsource_protocol
+        WHERE 1=1
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
+            and approval_status = #{request.approvalStatus}
+        </if>
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
+            and create_user_id = #{request.createUserId}
+        </if>
+        <if test="request != null and request.protocolNo != null and request.protocolNo !=''">
+            and protocol_no like concat('%',#{request.protocolNo},'%')
+        </if>
+        <if test="request != null and request.outsourcerName != null and request.outsourcerName !=''">
+            and outsourcer_name like concat('%',#{request.outsourcerName},'%')
+        </if>
+        <if test="request != null and request.applicantName != null and request.applicantName !=''">
+            and create_user_name like concat('%',#{request.applicantName},'%')
+        </if>
+        <if test="request != null and request.applicantTimeStart != null and request.applicantTimeStart !=''">
+            and create_time &gt;= #{request.applicantTimeStart}
+        </if>
+        <if test="request != null and request.applicantTimeEnd != null and request.applicantTimeEnd !=''">
+            and create_time &lt;= #{request.applicantTimeEnd}
+        </if>
+        <if test="businessKeys != null">
+            and id in
+            <foreach collection="businessKeys" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
+        ORDER BY create_time DESC
+    </select>
+</mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourcerInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourcerInfoMapper.xml
index 510a80b..3049b54 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourcerInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourcerInfoMapper.xml
@@ -7,6 +7,8 @@
         <id column="id" property="id" />
         <result column="outsourcer_no" property="outsourcerNo" />
         <result column="outsourcer_name" property="outsourcerName" />
+        <result column="lab_code" property="labCode" />
+        <result column="group_code" property="groupCode" />
         <result column="outsourcer_brief_name" property="outsourcerBriefName" />
         <result column="outsourcer_size" property="outsourcerSize" />
         <result column="business_size" property="businessSize" />
@@ -55,32 +57,32 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, outsourcer_no, outsourcer_name, outsourcer_brief_name, outsourcer_size, business_size, grade, evaluation, tax_number, bank_account, bank_name, bank_account_number, postal_code, director, phone, fax, mobile, email, website, address_country, address_province, address_city, address_area, full_address, address_country_name, address_province_name, address_city_name, address_area_name, invoice_country, invoice_province, invoice_city, invoice_area, invoice_full_address, invoice_country_name, invoice_province_name, invoice_city_name, invoice_area_name, business_scope, business_content, minio_file_name, approval_status, process_id, remark, create_user_id, create_user_name, create_time, update_time
+        id, outsourcer_no, outsourcer_name, lab_code, group_code, outsourcer_brief_name, outsourcer_size, business_size, grade, evaluation, tax_number, bank_account, bank_name, bank_account_number, postal_code, director, phone, fax, mobile, email, website, address_country, address_province, address_city, address_area, full_address, address_country_name, address_province_name, address_city_name, address_area_name, invoice_country, invoice_province, invoice_city, invoice_area, invoice_full_address, invoice_country_name, invoice_province_name, invoice_city_name, invoice_area_name, business_scope, business_content, minio_file_name, approval_status, process_id, remark, create_user_id, create_user_name, create_time, update_time
     </sql>
 
     <select id="selectBatchForApprovalList" resultMap="BaseResultMap">
         SELECT *
         FROM biz_business_outsourcer_info
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.outsourcerNo != null and request.outsourcerNo !=''">
+        <if test="request != null and request.outsourcerNo != null and request.outsourcerNo !=''">
             and outsourcer_no like concat('%',#{request.outsourcerNo},'%')
         </if>
-        <if test="request.outsourcerName != null and request.outsourcerName !=''">
+        <if test="request != null and request.outsourcerName != null and request.outsourcerName !=''">
             and outsourcer_name like concat('%',#{request.outsourcerName},'%')
         </if>
-        <if test="request.director != null and request.director !=''">
+        <if test="request != null and request.director != null and request.director !=''">
             and director like concat('%',#{request.director},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
@@ -93,6 +95,6 @@
     </select>
 
     <select id="selectMaxNo" resultType="java.lang.Long">
-        SELECT IFNULL(max(RIGHT(outsourcer_no, 12)), 0) from biz_business_outsourcer_info
+        SELECT IFNULL(max(RIGHT(outsourcer_no, 3)), 0) from biz_business_outsourcer_info
     </select>
 </mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessSiteExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessSiteExecutiveInfoMapper.xml
index 135c5d0..3c5ae79 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessSiteExecutiveInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessSiteExecutiveInfoMapper.xml
@@ -38,25 +38,25 @@
         FROM biz_business_site_executive_info bsei
         LEFT JOIN biz_resource_customer_info rci ON bsei.customer_id = rci.id
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and bsei.approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and bsei.create_user_id = #{request.createUserId}
         </if>
-        <if test="request.siteExecutiveNo != null and request.siteExecutiveNo !=''">
+        <if test="request != null and request.siteExecutiveNo != null and request.siteExecutiveNo !=''">
             and bsei.site_executive_no like concat('%',#{request.siteExecutiveNo},'%')
         </if>
-        <if test="request.customerName != null and request.customerName !=''">
+        <if test="request != null and request.customerName != null and request.customerName !=''">
             and rci.outsourcer_name like concat('%',#{request.customerName},'%')
         </if>
-        <if test="request.applyName != null and request.applyName !=''">
+        <if test="request != null and request.applyName != null and request.applyName !=''">
             and bsei.apply_name like concat('%',#{request.applyName},'%')
         </if>
-        <if test="request.applyTimeStart != null and request.applyTimeStart !=''">
+        <if test="request != null and request.applyTimeStart != null and request.applyTimeStart !=''">
             and bsei.apply_time &gt;= #{request.applyTimeStart}
         </if>
-        <if test="request.applyTimeEnd != null and request.applyTimeEnd !=''">
+        <if test="request != null and request.applyTimeEnd != null and request.applyTimeEnd !=''">
             and bsei.apply_time &lt;= #{request.applyTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml
index 84d9e2a..6bd38a9 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml
@@ -105,6 +105,12 @@
         <if test="request.isUrgent != null and request.isUrgent !=''">
             AND bo.is_urgent = #{request.isUrgent}
         </if>
+        <if test="request.ids != null">
+            and blei.id in
+            <foreach collection="request.ids" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
         ORDER BY blei.update_time DESC
     </select>
 
@@ -137,6 +143,12 @@
         <if test="request.isUrgent != null and request.isUrgent !=''">
             AND bo.is_urgent = #{request.isUrgent}
         </if>
+        <if test="request.ids != null">
+            and blei.id in
+            <foreach collection="request.ids" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
         ORDER BY blei.update_time DESC
     </select>
 
diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardInfoMapper.xml
index 1a5551b..2ed8d17 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardInfoMapper.xml
@@ -45,12 +45,6 @@
         FROM biz_equipment_standard_info besi
         LEFT JOIN biz_equipment_standard_technology_relation bestr ON besi.standard_no = bestr.standard_no
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
-            and besi.approval_status = #{request.approvalStatus}
-        </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
-            and besi.create_user_id = #{request.createUserId}
-        </if>
         <if test="request.standardName != null and request.standardName !=''">
             and besi.standard_name like concat('%',#{request.standardName},'%')
         </if>
diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardTechnologyRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardTechnologyRelationMapper.xml
index fc7e16c..cd03c8c 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardTechnologyRelationMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardTechnologyRelationMapper.xml
@@ -6,6 +6,7 @@
     <resultMap id="BaseResultMap" type="com.casic.missiles.model.equipment.BizEquipmentStandardTechnologyRelation">
         <id column="id" property="id" />
         <result column="technology_file_id" property="technologyFileId" />
+        <result column="technology_file_no" property="technologyFileNo" />
         <result column="technology_file_name" property="technologyFileName" />
         <result column="standard_id" property="standardId" />
         <result column="standard_no" property="standardNo" />
@@ -14,7 +15,7 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, technology_file_id, technology_file_name, standard_id, remark
+        id, technology_file_id, technology_file_no, technology_file_name, standard_id, remark
     </sql>
 
 </mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceAuthorizeOrderMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceAuthorizeOrderMapper.xml
index ac5176c..554fe65 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceAuthorizeOrderMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceAuthorizeOrderMapper.xml
@@ -32,22 +32,22 @@
         SELECT *
         FROM biz_resource_authorize_order
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.orderNo != null and request.orderNo !=''">
+        <if test="request != null and request.orderNo != null and request.orderNo !=''">
             and order_no like concat('%',#{request.orderNo},'%')
         </if>
-        <if test="request.createUserName != null and request.createUserName !=''">
+        <if test="request != null and request.createUserName != null and request.createUserName !=''">
             and create_user_name like concat('%',#{request.createUserName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerExamineFormMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerExamineFormMapper.xml
index ab242f6..af7f98f 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerExamineFormMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerExamineFormMapper.xml
@@ -41,28 +41,28 @@
         SELECT *
         FROM biz_resource_customer_examine_form
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.formNo != null and request.formNo !=''">
+        <if test="request != null and request.formNo != null and request.formNo !=''">
             and form_no like concat('%',#{request.formNo},'%')
         </if>
-        <if test="request.labCode != null and request.labCode !=''">
+        <if test="request != null and request.labCode != null and request.labCode !=''">
             and lab_code like concat('%',#{request.labCode},'%')
         </if>
-        <if test="request.groupCode != null and request.groupCode !=''">
+        <if test="request != null and request.groupCode != null and request.groupCode !=''">
             and group_code like concat('%',#{request.groupCode},'%')
         </if>
-        <if test="request.createUserName != null and request.createUserName !=''">
+        <if test="request != null and request.createUserName != null and request.createUserName !=''">
             and create_user_name like concat('%',#{request.createUserName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerInfoMapper.xml
index fa8ffbc..06a2798 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerInfoMapper.xml
@@ -33,25 +33,25 @@
         SELECT *
         FROM biz_resource_customer_info
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.customerNo != null and request.customerNo !=''">
+        <if test="request != null and request.customerNo != null and request.customerNo !=''">
             and customer_no like concat('%',#{request.customerNo},'%')
         </if>
-        <if test="request.customerName != null and request.customerName !=''">
+        <if test="request != null and request.customerName != null and request.customerName !=''">
             and customer_name like concat('%',#{request.customerName},'%')
         </if>
-        <if test="request.contacts != null and request.contacts !=''">
+        <if test="request != null and request.contacts != null and request.contacts !=''">
             and contacts like concat('%',#{request.contacts},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerSuggestFormMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerSuggestFormMapper.xml
index 28f5bb2..1806662 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerSuggestFormMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerSuggestFormMapper.xml
@@ -33,28 +33,28 @@
         SELECT *
         FROM biz_resource_customer_suggest_form
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.formNo != null and request.formNo !=''">
+        <if test="request != null and request.formNo != null and request.formNo !=''">
             and form_no like concat('%',#{request.formNo},'%')
         </if>
-        <if test="request.customerName != null and request.customerName !=''">
+        <if test="request != null and request.customerName != null and request.customerName !=''">
             and customer_name like concat('%',#{request.customerName},'%')
         </if>
-        <if test="request.customerDeptName != null and request.customerDeptName !=''">
+        <if test="request != null and request.customerDeptName != null and request.customerDeptName !=''">
             and customer_dept_name like concat('%',#{request.customerDeptName},'%')
         </if>
-        <if test="request.createUserName != null and request.createUserName !=''">
+        <if test="request != null and request.createUserName != null and request.createUserName !=''">
             and create_user_name like concat('%',#{request.createUserName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSealUseNoteMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSealUseNoteMapper.xml
index ab37bc1..b02bb33 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSealUseNoteMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSealUseNoteMapper.xml
@@ -29,32 +29,32 @@
     </sql>
 
     <select id="selectBatchForApprovalList" resultMap="BaseResultMap">
-        SELECT *
+        SELECT brsun.*, brsi.seal_name, brsi.seal_type, brsi.approver_name
         FROM biz_resource_seal_use_note brsun
         JOIN biz_resource_seal_info brsi ON brsun.seal_id = brsi.id
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and brsun.approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and brsun.create_user_id = #{request.createUserId}
         </if>
-        <if test="request.sealName != null and request.sealName !=''">
+        <if test="request != null and request.sealName != null and request.sealName !=''">
             and brsi.seal_name like concat('%',#{request.sealName},'%')
         </if>
-        <if test="request.sealType != null and request.sealType !=''">
+        <if test="request != null and request.sealType != null and request.sealType !=''">
             and brsi.seal_type = #{request.sealType}
         </if>
-        <if test="request.applyDeptName != null and request.applyDeptName !=''">
+        <if test="request != null and request.applyDeptName != null and request.applyDeptName !=''">
             and brsun.apply_dept_name like concat('%',#{request.applyDeptName},'%')
         </if>
-        <if test="request.applyUserName != null and request.applyUserName !=''">
+        <if test="request != null and request.applyUserName != null and request.applyUserName !=''">
             and brsun.apply_user_name like concat('%',#{request.applyUserName},'%')
         </if>
-        <if test="request.applyTimeStart != null and request.applyTimeStart !=''">
+        <if test="request != null and request.applyTimeStart != null and request.applyTimeStart !=''">
             and brsun.apply_time &gt;= #{request.applyTimeStart}
         </if>
-        <if test="request.applyTimeEnd != null and request.applyTimeEnd !=''">
+        <if test="request != null and request.applyTimeEnd != null and request.applyTimeEnd !=''">
             and brsun.apply_time &lt;= #{request.applyTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml
index 119bf7d..4f8392a 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml
@@ -31,6 +31,12 @@
         <if test="request.deptName != null and request.deptName !=''">
             and brsi.dept_name like concat('%',#{request.deptName},'%')
         </if>
+        <if test="request.ids != null">
+            and brsv.id in
+            <foreach collection="request.ids" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
         ORDER BY brsv.grant_date DESC
     </select>
 
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSupplierInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSupplierInfoMapper.xml
index fe8d399..e8ce7ef 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSupplierInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSupplierInfoMapper.xml
@@ -48,28 +48,28 @@
         SELECT *
         FROM biz_resource_supplier_info
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.supplierNo != null and request.supplierNo !=''">
+        <if test="request != null and request.supplierNo != null and request.supplierNo !=''">
             and supplier_no like concat('%',#{request.supplierNo},'%')
         </if>
-        <if test="request.supplierName != null and request.supplierName !=''">
+        <if test="request != null and request.supplierName != null and request.supplierName !=''">
             and supplier_name like concat('%',#{request.supplierName},'%')
         </if>
-        <if test="request.director != null and request.director !=''">
+        <if test="request != null and request.director != null and request.director !=''">
             and director like concat('%',#{request.director},'%')
         </if>
-        <if test="request.supplierType != null and request.supplierType !=''">
+        <if test="request != null and request.supplierType != null and request.supplierType !=''">
             and supplier_type = #{request.supplierType}
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/EnvLocationInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/EnvLocationInfoMapper.xml
new file mode 100644
index 0000000..68bcf10
--- /dev/null
+++ b/casic-metering-dao/src/main/resources/mapper/resource/EnvLocationInfoMapper.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.mapper.resource.EnvLocationInfoMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.resource.EnvLocationInfo">
+        <id column="id" property="id" />
+        <result column="location_no" property="locationNo" />
+        <result column="location_name" property="locationName" />
+        <result column="location_position" property="locationPosition" />
+        <result column="create_user_id" property="createUserId" />
+        <result column="create_user" property="createUser" />
+        <result column="create_time" property="createTime" />
+        <result column="update_time" property="updateTime" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, location_no, location_name, location_position, create_user_id, create_user, create_time, update_time
+    </sql>
+
+    <select id="selectLocationListPage" resultType="com.casic.missiles.dto.resource.environment.LocationListResponse">
+        SELECT *
+        FROM env_location_info
+        WHERE 1=1
+        <if test="request.locationNo != null and request.locationNo !=''">
+            AND location_no LIKE concat('%',#{request.locationNo},'%')
+        </if>
+        <if test="request.locationName != null and request.locationName !=''">
+            AND location_name LIKE concat('%',#{request.locationName},'%')
+        </if>
+        ORDER BY create_time DESC
+    </select>
+
+</mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml
index b28c18f..8854047 100644
--- a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml
@@ -11,7 +11,6 @@
         <result column="sign_desc" property="signDesc" />
         <result column="sign_director" property="signDirector" />
         <result column="sign_user_id" property="signUserId" />
-        <result column="sign_type" property="signType" />
         <result column="minio_file_name" property="minioFileName" />
         <result column="create_time" property="createTime" />
         <result column="update_time" property="updateTime" />
@@ -28,7 +27,6 @@
         <result column="sign_name" property="signName" />
         <result column="sign_desc" property="signDesc" />
         <result column="sign_director" property="signDirector" />
-        <result column="sign_type" property="signType" />
         <result column="sign_user_id" property="signUserId" />
         <result column="minio_file_name" property="minioFileName" />
         <result column="create_time" property="createTime" />
@@ -62,4 +60,58 @@
         JOIN system_sign_user_relation ssur ON ss.id = ssur.sign_id
         WHERE ssur.user_id = #{userId}
     </select>
+
+    <select id="selectSignListPage" resultMap="BaseResultMap">
+        SELECT ss.*, sd.SIMPLE_NAME AS deptName
+        FROM system_sign ss
+        LEFT JOIN sys_user su ON su.id = ss.sign_user_id
+        LEFT JOIN sys_dept sd ON sd.id = su.dept_id
+        WHERE 1=1
+        <if test="request.signNo != null and request.signNo !=''">
+            AND ss.sign_no LIKE concat('%',#{request.signNo},'%')
+        </if>
+        <if test="request.signName != null and request.signName !=''">
+            AND ss.sign_name LIKE concat('%',#{request.signName},'%')
+        </if>
+        <if test="request.signDirector != null and request.signDirector !=''">
+            AND ss.sign_director LIKE concat('%',#{request.signDirector},'%')
+        </if>
+        <if test="request.signUserId != null and request.signUserId !=''">
+            AND ss.sign_user_id = #{request.signUserId}
+        </if>
+        <if test="request.createStartTime != null and request.createStartTime !=''">
+            AND DATE_FORMAT(ss.create_time,'%Y-%m-%d') &gt;= DATE_FORMAT(#{request.createStartTime},'%Y-%m-%d')
+        </if>
+        <if test="request.createEndTime != null and request.createEndTime !=''">
+            AND DATE_FORMAT(ss.create_time,'%Y-%m-%d')  &lt;= DATE_FORMAT(#{request.createEndTime},'%Y-%m-%d')
+        </if>
+        ORDER BY ss.create_time DESC
+    </select>
+
+    <select id="selectSignList" resultMap="BaseResultMap">
+        SELECT ss.*, sd.SIMPLE_NAME AS deptName
+        FROM system_sign ss
+        LEFT JOIN sys_user su ON su.id = ss.sign_user_id
+        LEFT JOIN sys_dept sd ON sd.id = su.dept_id
+        WHERE 1=1
+        <if test="request.signNo != null and request.signNo !=''">
+            AND ss.sign_no LIKE concat('%',#{request.signNo},'%')
+        </if>
+        <if test="request.signName != null and request.signName !=''">
+            AND ss.sign_name LIKE concat('%',#{request.signName},'%')
+        </if>
+        <if test="request.signDirector != null and request.signDirector !=''">
+            AND ss.sign_director LIKE concat('%',#{request.signDirector},'%')
+        </if>
+        <if test="request.signUserId != null and request.signUserId !=''">
+            AND ss.sign_user_id = #{request.signUserId}
+        </if>
+        <if test="request.createStartTime != null and request.createStartTime !=''">
+            AND DATE_FORMAT(ss.create_time,'%Y-%m-%d') &gt;= DATE_FORMAT(#{request.createStartTime},'%Y-%m-%d')
+        </if>
+        <if test="request.createEndTime != null and request.createEndTime !=''">
+            AND DATE_FORMAT(ss.create_time,'%Y-%m-%d')  &lt;= DATE_FORMAT(#{request.createEndTime},'%Y-%m-%d')
+        </if>
+        ORDER BY ss.create_time DESC
+    </select>
 </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 515050a..60f530b 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
@@ -47,8 +47,8 @@
     String STORAGE_LOCATION = "bizStorageLocation";
     //计量专业
     String MEASURE_MAJOR = "bizMeasureMajor";
-    //管理状态
-    String MANAGER_STATE = "bizManagerState";
+    //标准装置管理状态
+    String STANDARD_MANAGER_STATE = "bizStandardManagerState";
 
     /**
      * 资源管理 字典code
@@ -95,8 +95,6 @@
     String MEASURE_STATUS = "measureStatus";
     //检定方式
     String MEASURE_TYPE = "measureType";
-    //标识打印标志类型
-    String IDENTIFY_PRINT_TYPE = "bizBusinessIdentify";
     //变更类型
     String REPORT_CHANGE_TYPE = "bizCertChangeType";
     //规模类型
@@ -111,19 +109,24 @@
     String MEASURE_CATEGORY = "measureCategory";
     //检定结果
     String MEASURE_RESULT = "measureResult";
+    //分包原因
+    String OUTSOURCE_REASON = "outsourceReason";
+
+    /**
+     * 系统管理
+     */
+    String TEMPLATE_TYPE = "templateType";
+
 
     /**
      * 标准装置 字典code
      */
     //类别
     String STANDARD_CATEGORY = "standardCategory";
-    //管理状态
-    String STANDARD_MANAGER_STATE = "standardManagerState";
     //标准等级
     String STANDARD_LEVEL = "standardLevel";
     //传递范围
     String STANDARD_TRANSMIT_RANGE = "transmitRange";
-
     //资本来源
     String CAPITAL_SOURCE = "capitalSource";
     //标准装置-申请类型
@@ -148,8 +151,6 @@
     String CERTIFICATE_CLASS = "certificationClass";
     //证书管理-检校专业
     String CALIBRATION_MAJOR = "calibrationMajor";
-    //分包原因
-    String OUTSOURCE_REASON = "outsourceReason";
 
     /**
      * 工作台
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/BaseApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/BaseApprovalListRequest.java
index 73c12c1..80d7424 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/BaseApprovalListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/BaseApprovalListRequest.java
@@ -6,6 +6,7 @@
 
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotEmpty;
+import java.util.List;
 
 /**
  * @Description:
@@ -19,14 +20,14 @@
      * 表单id
      */
     @NotBlank(message = "表单id不能为空")
-    @ApiModelProperty(value = "表单id（流程定义对应的表单id，等价于业务id）", dataType = "String")
+    @ApiModelProperty(value = "表单id（流程定义对应的表单id，等价于业务id），导出接口不用传", dataType = "String")
     private String formId;
 
     /**
      * 审批状态类型，对应ApprovalStatusEnum
      */
     @NotEmpty(message = "审批状态类型不能为空")
-    @ApiModelProperty(value = "审批状态类型code", dataType = "String")
+    @ApiModelProperty(value = "审批状态类型code，导出接口不用传", dataType = "String")
     private String approvalStatus;
 
     @ApiModelProperty(hidden = true)
@@ -34,4 +35,7 @@
 
     @ApiModelProperty(hidden = true)
     private Long createUserId;
+
+    @ApiModelProperty(value = "导出ids", dataType = "List")
+    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificatePrintApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificatePrintApprovalListRequest.java
index b93d1c9..3cc2f4e 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificatePrintApprovalListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificatePrintApprovalListRequest.java
@@ -5,8 +5,6 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import java.util.List;
-
 /**
  * @Description:
  * @Author: wangpeng
@@ -38,7 +36,4 @@
 
     @ApiModelProperty(value = "创建结束时间", dataType = "String")
     private String createTimeEnd;
-
-    @ApiModelProperty(value = "导出ids", dataType = "List")
-    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportApprovalListRequest.java
index 4f7a038..c115847 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportApprovalListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportApprovalListRequest.java
@@ -5,8 +5,6 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import java.util.List;
-
 /**
  * @Description:
  * @Author: wangpeng
@@ -15,6 +13,8 @@
 @ApiModel
 @Data
 public class CertificateReportApprovalListRequest extends BaseApprovalListRequest {
+    @ApiModelProperty(value = "委托方id", dataType = "String")
+    private Long customerId;
 
     @ApiModelProperty(value = "证书报告编号", dataType = "String")
     private String certificateReportNo;
@@ -37,6 +37,4 @@
     @ApiModelProperty(value = "检校结束时间", dataType = "String")
     private String calibrationTimeEnd;
 
-    @ApiModelProperty(value = "导出ids", dataType = "List")
-    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/identify/IdentifyListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/identify/IdentifyListRequest.java
index 1b87ae6..f019203 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/identify/IdentifyListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/identify/IdentifyListRequest.java
@@ -4,6 +4,8 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * @Description:
  * @Author: wangpeng
@@ -26,4 +28,7 @@
 
     @ApiModelProperty(value = "打印结束时间", dataType = "String")
     private String createTimeEnd;
+
+    @ApiModelProperty(value = "导出ids", dataType = "List")
+    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListRequest.java
index 1264883..62415fb 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListRequest.java
@@ -7,6 +7,7 @@
 import lombok.Data;
 
 import javax.validation.constraints.NotBlank;
+import java.util.List;
 
 @Data
 @ApiModel
@@ -37,4 +38,6 @@
     @ApiModelProperty(value = "是否加急（1是0否null全部）", dataType = "Integer")
     private String isUrgent;
 
+    @ApiModelProperty(value = "导出ids", dataType = "List")
+    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListRequest.java
index 5201d7b..499760a 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListRequest.java
@@ -17,6 +17,9 @@
     @ApiModelProperty(value = "任务单编号", dataType = "String")
     private String orderNo;
 
+    @ApiModelProperty(value = "委托方id", dataType = "Long")
+    private Long customerId;
+
     @ApiModelProperty(value = "委托方名称", dataType = "String")
     private String customerName;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OrderSampleDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OrderSampleDTO.java
new file mode 100644
index 0000000..796edc0
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OrderSampleDTO.java
@@ -0,0 +1,19 @@
+package com.casic.missiles.dto.business.outsource;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/8/24 11:38
+ */
+@ApiModel
+@Data
+public class OrderSampleDTO {
+    @ApiModelProperty(value = "任务单id", dataType = "Long")
+    private Long orderId;
+    @ApiModelProperty(value = "受检设备id", dataType = "Long")
+    private Long sampleId;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceAssessApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceAssessApprovalListRequest.java
new file mode 100644
index 0000000..9a930c3
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceAssessApprovalListRequest.java
@@ -0,0 +1,30 @@
+package com.casic.missiles.dto.business.outsource;
+
+import com.casic.missiles.dto.BaseApprovalListRequest;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/8/24 11:01
+ */
+@ApiModel
+@Data
+public class OutsourceAssessApprovalListRequest extends BaseApprovalListRequest {
+    @ApiModelProperty(value = "评审表编号", dataType = "String")
+    private String projectNo;
+
+    @ApiModelProperty(value = "分包机构名称", dataType = "String")
+    private String outsourcerName;
+
+    @ApiModelProperty(value = "申请人", dataType = "String")
+    private String applicantName;
+
+    @ApiModelProperty(value = "申请时间开始", dataType = "String")
+    private String applicantTimeStart;
+
+    @ApiModelProperty(value = "申请时间结束", dataType = "String")
+    private String applicantTimeEnd;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceAssessSaveResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceAssessSaveResponse.java
new file mode 100644
index 0000000..8bf9aad
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceAssessSaveResponse.java
@@ -0,0 +1,20 @@
+package com.casic.missiles.dto.business.outsource;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/8/14 16:17
+ */
+@ApiModel
+@Data
+public class OutsourceAssessSaveResponse {
+    @ApiModelProperty(value = "主键id", dataType = "Long")
+    private Long id;
+
+    @ApiModelProperty(value = "编号", dataType = "String")
+    private String projectNo;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProtocolApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProtocolApprovalListRequest.java
new file mode 100644
index 0000000..0f32331
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProtocolApprovalListRequest.java
@@ -0,0 +1,30 @@
+package com.casic.missiles.dto.business.outsource;
+
+import com.casic.missiles.dto.BaseApprovalListRequest;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/8/24 15:01
+ */
+@ApiModel
+@Data
+public class OutsourceProtocolApprovalListRequest extends BaseApprovalListRequest {
+    @ApiModelProperty(value = "协议书编号", dataType = "String")
+    private String protocolNo;
+
+    @ApiModelProperty(value = "分包方名称", dataType = "String")
+    private String outsourcerName;
+
+    @ApiModelProperty(value = "申请人", dataType = "String")
+    private String applicantName;
+
+    @ApiModelProperty(value = "申请时间开始", dataType = "String")
+    private String applicantTimeStart;
+
+    @ApiModelProperty(value = "申请时间结束", dataType = "String")
+    private String applicantTimeEnd;
+}

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java
index bb0c50f..13a699b 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java
@@ -12,6 +12,7 @@
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.IGeneralApprovalService;
+import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
@@ -19,6 +20,7 @@
 import org.springframework.web.bind.annotation.RequestBody;
 
 import javax.validation.Valid;
+import java.util.List;
 import java.util.Objects;
 
 /**
@@ -117,4 +119,17 @@
         }
         return baseApprovalService.failUpdate(request);
     }
+
+    public List<O> exportList(@RequestBody @Valid R request) throws Exception {
+        List<O> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = baseApprovalService.listExportByIds(request.getIds());
+        } else {
+            list = baseApprovalService.listExport(request);
+        }
+        for (O record : list) {
+            DictCodeUtils.convertDictCodeToName(record);
+        }
+        return list;
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java
index 8a90961..d775831 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java
@@ -5,6 +5,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.business.certificate.CertificateChangeApplyApprovalListRequest;
 import com.casic.missiles.dto.business.certificate.CertificateChangeApplySaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessCertificateChangeApply;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
@@ -20,6 +21,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -48,4 +50,12 @@
         }
         return changeApplyService.saveChangeApply(request);
     }
+
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody CertificateChangeApplyApprovalListRequest request) throws Exception {
+        List<BizBusinessCertificateChangeApply> list = super.exportList(request);
+        super.exportExcel(BizBusinessCertificateChangeApply.class, list, ExportEnum.CERTIFICATE_CHANGE_APPLY.getSheetName());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java
index 5fc4b07..af8230e 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java
@@ -9,6 +9,7 @@
 import com.casic.missiles.dto.business.certificate.CertificatePrintApprovalListRequest;
 import com.casic.missiles.dto.business.certificate.CertificatePrintListResponse;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.enums.business.CertificatePrintStatusEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessCertificatePrintLog;
@@ -18,10 +19,16 @@
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.io.IOException;
+import java.util.List;
 import java.util.Objects;
 
 /**
@@ -98,4 +105,16 @@
         });
         return certificatePrintService.certificatePrintLog(idDTO.getId());
     }
+
+    @ApiOperation("证书打印审批导出")
+    @PostMapping("/listExport")
+    public void exportList(@RequestBody CertificatePrintApprovalListRequest request) throws IOException {
+        List<CertificatePrintListResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = certificatePrintService.listByIds(request.getIds());
+        } else {
+            list = certificatePrintService.list(request);
+        }
+        super.exportExcel(CertificatePrintListResponse.class, list, ExportEnum.CERTIFICATE_PRINT.getSheetName());
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java
index 63b06dc..6b2efd5 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java
@@ -6,6 +6,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.business.certificate.CertificateReportApprovalListRequest;
 import com.casic.missiles.dto.business.certificate.CertificateReportSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessCertificateReport;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
@@ -21,6 +22,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -50,7 +52,7 @@
         return certificateReportService.saveCertificateReport(request);
     }
 
-    @ApiOperation("证书审批详情（基本信息）")
+    @ApiOperation("详情（基本信息）")
     @PostMapping("/detail")
     public ReturnDTO<BizBusinessCertificateReport> detail(@RequestBody @Valid BaseDetailRequest request, BindingResult bindingResult) throws Exception {
         if(bindingResult.hasErrors()){
@@ -59,4 +61,11 @@
         return certificateReportService.detail(request);
     }
 
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody CertificateReportApprovalListRequest request) throws Exception {
+        List<BizBusinessCertificateReport> list = super.exportList(request);
+        super.exportExcel(BizBusinessCertificateReport.class, list, ExportEnum.CERTIFICATE_REPORT.getSheetName());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java
index 46b26bd..57c0809 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java
@@ -10,20 +10,21 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.business.identify.IdentifyListRequest;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessIdentifyInfo;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.business.IBizBusinessIdentifyInfoService;
+import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import javax.validation.Valid;
+import java.util.List;
 import java.util.Objects;
 
 /**
@@ -57,16 +58,13 @@
         return identifyInfoService.addIdentify(identifyInfo);
     }
 
-    @ApiOperation("标识打印更新")
+    @ApiOperation("标识打印更新（更新打印时间）")
     @PostMapping("/update")
-    public ReturnDTO updateIdentify(@RequestBody @Valid BizBusinessIdentifyInfo identifyInfo, BindingResult bindingResult) {
-        Assert.isFalse(Objects.isNull(identifyInfo.getId()), () -> {
+    public ReturnDTO updateIdentify(@RequestBody @Valid IdDTO idDTO) {
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        Assert.isFalse(bindingResult.hasErrors(), () -> {
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        });
-        return identifyInfoService.updateIdentify(identifyInfo);
+        return identifyInfoService.updateIdentify(idDTO.getId());
     }
 
     @ApiOperation("标识打印删除")
@@ -77,4 +75,37 @@
         });
         return identifyInfoService.deleteIdentify(idDTO.getId());
     }
+
+    @ApiOperation("标识打印导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody @Valid IdentifyListRequest request, BindingResult bindingResult) throws Exception {
+        if (bindingResult.hasErrors()) {
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        List<BizBusinessIdentifyInfo> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = identifyInfoService.listByIds(request.getIds());
+        } else {
+            list = identifyInfoService.list(request);
+        }
+        for (BizBusinessIdentifyInfo record : list) {
+            DictCodeUtils.convertDictCodeToName(record);
+        }
+        super.exportExcel(BizBusinessIdentifyInfo.class, list, ExportEnum.IDENTIFY_EXPORT.getSheetName());
+    }
+
+
+    // TODO: 2023/8/23 查询设备信息，4个底部按钮查设备（按钮的作用就是前端用来调不同接口、用来区分中间即将展示的标识），前端弹窗选设备，在确定保存时前端根据底部按钮判断传入设备类型deviceType字典code
+    // TODO: 2023/8/23 接口：查受检设备（第1个按钮），查设备台账（后3个按钮同一接口），查询之后前端根据标志类型的不同加到中间页面时进行判断（按产品给的对应表）
+    // TODO: 2023/8/23 提供二维码接口，前端在加到中间页面时调用一下
+
+    @ApiOperation("设备二维码")
+    @PostMapping("/equipment/qrCode")
+    public ReturnDTO<String> equipmentQrCode(@RequestBody @Valid IdDTO idDTO) {
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return identifyInfoService.equipmentQrCode(idDTO.getId());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java
index 707be6e..7e0453d 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java
@@ -117,7 +117,7 @@
     }
 
     @ApiOperation("任务单导出")
-    @PostMapping("/export")
+    @PostMapping("/listExport")
     public void orderExport(@RequestBody @Valid OrderListRequest request, HttpServletResponse response) {
         businessOrderService.orderExport(request, response);
     }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java
index 529a6ce..51432be 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java
@@ -1,9 +1,28 @@
 package com.casic.missiles.controller.business;
 
+import com.casic.missiles.controller.GeneralApprovalController;
+import com.casic.missiles.dto.BaseApprovalSubmitRequest;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.business.outsource.OutsourceAssessApprovalListRequest;
+import com.casic.missiles.dto.business.outsource.OutsourceAssessSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
+import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.model.business.BizBusinessOutsourceAssess;
+import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
+import com.casic.missiles.service.IGeneralApprovalService;
+import com.casic.missiles.service.business.IBizBusinessOutsourceAssessService;
 import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.BindingResult;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.validation.Valid;
+import java.util.List;
+
 /**
  * <p>
  * 计量检定业务-分包管理-测试、校准或检定工作分包评审表 前端控制器
@@ -15,6 +34,27 @@
 @Api(tags = "分包管理-测试、校准或检定工作分包评审表")
 @RestController
 @RequestMapping("/business/outsource/assess")
-public class BizBusinessOutsourceAssessController {
+public class BizBusinessOutsourceAssessController extends GeneralApprovalController<BizBusinessOutsourceAssess, BizBusinessOutsourceAssess, OutsourceAssessApprovalListRequest, BaseApprovalSubmitRequest> {
+    @Autowired
+    private IBizBusinessOutsourceAssessService outsourceAssessService;
 
+    public BizBusinessOutsourceAssessController(IGeneralApprovalService<BizBusinessOutsourceAssess, BizBusinessOutsourceAssess, OutsourceAssessApprovalListRequest, BaseApprovalSubmitRequest> baseApprovalService) {
+        super(baseApprovalService);
+    }
+
+    @ApiOperation("草稿箱-保存")
+    @PostMapping("/save")
+    public ReturnDTO<OutsourceAssessSaveResponse> saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceAssess request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        return outsourceAssessService.saveOutsourceAssess(request);
+    }
+
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception {
+        List<BizBusinessOutsourceAssess> list = super.exportList(request);
+        super.exportExcel(BizBusinessOutsourceAssess.class, list, ExportEnum.OUTSOURCE_ASSESS.getSheetName());
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java
new file mode 100644
index 0000000..9adef18
--- /dev/null
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java
@@ -0,0 +1,60 @@
+package com.casic.missiles.controller.business;
+
+import com.casic.missiles.controller.GeneralApprovalController;
+import com.casic.missiles.dto.BaseApprovalSubmitRequest;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.business.outsource.OutsourceProtocolApprovalListRequest;
+import com.casic.missiles.dto.business.outsource.OutsourceProtocolSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
+import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.model.business.BizBusinessOutsourceProtocol;
+import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
+import com.casic.missiles.service.IGeneralApprovalService;
+import com.casic.missiles.service.business.IBizBusinessOutsourceProtocolService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.BindingResult;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.validation.Valid;
+import java.util.List;
+
+/**
+ * <p>
+ * 计量检定业务-分包管理-测试、校准或检定工作分包协议书 前端控制器
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-08-24
+ */
+@Api(tags = "分包管理-测试、校准或检定工作分包协议书")
+@RestController
+@RequestMapping("/business/outsource/protocol")
+public class BizBusinessOutsourceProtocolController extends GeneralApprovalController<BizBusinessOutsourceProtocol, BizBusinessOutsourceProtocol, OutsourceProtocolApprovalListRequest, BaseApprovalSubmitRequest> {
+    @Autowired
+    private IBizBusinessOutsourceProtocolService outsourceProtocolService;
+
+    public BizBusinessOutsourceProtocolController(IGeneralApprovalService<BizBusinessOutsourceProtocol, BizBusinessOutsourceProtocol, OutsourceProtocolApprovalListRequest, BaseApprovalSubmitRequest> baseApprovalService) {
+        super(baseApprovalService);
+    }
+
+    @ApiOperation("草稿箱-保存")
+    @PostMapping("/save")
+    public ReturnDTO<OutsourceProtocolSaveResponse> saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceProtocol request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        return outsourceProtocolService.saveOutsourceProtocol(request);
+    }
+
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody OutsourceProtocolApprovalListRequest request) throws Exception {
+        List<BizBusinessOutsourceProtocol> list = super.exportList(request);
+        super.exportExcel(BizBusinessOutsourceProtocol.class, list, ExportEnum.OUTSOURCE_PROTOCOL.getSheetName());
+    }
+}
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java
index 097f645..f0f0943 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java
@@ -17,7 +17,6 @@
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.IGeneralApprovalService;
 import com.casic.missiles.service.business.IBizBusinessOutsourcerInfoService;
-import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -71,19 +70,8 @@
 
     @ApiOperation("分包方导出")
     @PostMapping("/listExport")
-    public void export(@RequestBody @Valid OutsourcerInfoApprovalListRequest request, BindingResult bindingResult) throws Exception {
-        if (bindingResult.hasErrors()) {
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        }
-        List<BizBusinessOutsourcerInfo> list;
-        if (!CollectionUtils.isEmpty(request.getIds())) {
-            list = outsourcerInfoService.listByIds(request.getIds());
-        } else {
-            list = outsourcerInfoService.list(request);
-        }
-        for (BizBusinessOutsourcerInfo record : list) {
-            DictCodeUtils.convertDictCodeToName(record);
-        }
+    public void export(@RequestBody OutsourcerInfoApprovalListRequest request) throws Exception {
+        List<BizBusinessOutsourcerInfo> list = super.exportList(request);
         super.exportExcel(BizBusinessOutsourcerInfo.class, list, ExportEnum.OUTSOURCER_EXPORT.getSheetName());
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java
index c2cbf9f..0410918 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java
@@ -17,11 +17,9 @@
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.IGeneralApprovalService;
 import com.casic.missiles.service.business.IBizBusinessSiteExecutiveInfoService;
-import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -60,7 +58,7 @@
         return siteExecutiveInfoService.saveSiteExecutiveInfo(siteExecutiveInfo);
     }
 
-    @ApiOperation("现场检测详情")
+    @ApiOperation("详情")
     @PostMapping("/detail")
     public ReturnDTO<SiteExecutiveDetailResponse> siteExecutiveDetail(@RequestBody @Valid IdDTO idDTO) throws Exception {
         Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
@@ -69,21 +67,10 @@
         return ReturnUtil.success(siteExecutiveInfoService.detail(idDTO.getId()));
     }
 
-    @ApiOperation("现场检测导出")
+    @ApiOperation("导出")
     @PostMapping("/listExport")
-    public void export(@RequestBody @Valid SiteExecutiveApprovalListRequest request, BindingResult bindingResult) throws Exception {
-        if (bindingResult.hasErrors()) {
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        }
-        List<SiteExecutiveApprovalListResponse> list;
-        if (!CollectionUtils.isEmpty(request.getIds())) {
-            list = siteExecutiveInfoService.listInfoByIds(request.getIds());
-        } else {
-            list = siteExecutiveInfoService.listInfo(request);
-        }
-        for (SiteExecutiveApprovalListResponse record : list) {
-            DictCodeUtils.convertDictCodeToName(record);
-        }
+    public void export(@RequestBody SiteExecutiveApprovalListRequest request) throws Exception {
+        List<SiteExecutiveApprovalListResponse> list = super.exportList(request);
         super.exportExcel(SiteExecutiveApprovalListResponse.class, list, ExportEnum.SITE_EXECUTIVE_EXPORT.getSheetName());
     }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
index 7e793cd..a92e209 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
@@ -55,7 +55,7 @@
 
     @ApiOperation("设备收发列表导出")
     @PostMapping("/export")
-    public void exportList(@RequestBody @Valid SampleDispatchListRequest request) throws IOException {
+    public void exportList(@RequestBody SampleDispatchListRequest request) throws IOException {
         List<SampleDispatchListResponse> list;
         if (!CollectionUtils.isEmpty(request.getIds())) {
             list = dispatchService.listByIds(request.getIds());
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java
index cdc77fc..d120fd4 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java
@@ -7,6 +7,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.business.labExecutive.*;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.business.IBusinessLabExecutiveInfoService;
@@ -14,6 +15,7 @@
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.*;
 
@@ -32,7 +34,7 @@
     @Autowired
     private IBusinessLabExecutiveInfoService labExecutiveInfoService;
 
-    @ApiOperation("实验室检测-部门检测-查询各状态列表（待检测、检测中、检测完）")
+    @ApiOperation("实验室任务-查询各状态列表（待检测、检测中、检测完）")
     @PostMapping("/deptExecutive/List")
     public ReturnDTO<PageInfoBT<SampleLabExecutiveListResponse>> queryDeptExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
@@ -43,10 +45,19 @@
         return ReturnUtil.success(super.packForBT(labExecutiveInfoService.deptLabExecutiveListPage(page, labExecutiveListRequest)));
     }
 
-    /**
-     * 实验室检测-我的检测-查询各状态列表（待检测、检测中、检测完）
-     */
-    @ApiOperation("实验室检测-我的检测-查询各状态列表（待检测、检测中、检测完）")
+    @ApiOperation("实验室任务导出")
+    @PostMapping("/deptExecutive/export")
+    public void deptExportList(@RequestBody @Valid SampleLabExecutiveListRequest request) throws Exception {
+        List<SampleLabExecutiveListResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = labExecutiveInfoService.deptLabExecutiveListByIds(request.getMeasureStatus(), request.getIds());
+        } else {
+            list = labExecutiveInfoService.deptLabExecutiveList(request);
+        }
+        super.exportExcel(SampleLabExecutiveListResponse.class, list, ExportEnum.DEPT_EXECUTIVE_TASK.getSheetName());
+    }
+
+    @ApiOperation("我的任务-查询各状态列表（待检测、检测中、检测完）")
     @PostMapping("/myExecutive/list")
     public ReturnDTO<PageInfoBT<SampleLabExecutiveListResponse>> queryMyExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
@@ -57,19 +68,25 @@
         return ReturnUtil.success(super.packForBT(labExecutiveInfoService.myLabExecutiveListPage(page, labExecutiveListRequest)));
     }
 
-    /**
-     * 实验室检测-我的检测-查询各状态样品数量（待检测、检测中、检测完）
-     */
-    @ApiOperation("实验室检测-我的检测-查询各状态样品数量（待检测、检测中、检测完）")
+    @ApiOperation("我的任务导出")
+    @PostMapping("/myExecutive/export")
+    public void exportList(@RequestBody @Valid SampleLabExecutiveListRequest request) throws Exception {
+        List<SampleLabExecutiveListResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = labExecutiveInfoService.myLabExecutiveListByIds(request.getMeasureStatus(), request.getIds());
+        } else {
+            list = labExecutiveInfoService.myLabExecutiveList(request);
+        }
+        super.exportExcel(SampleLabExecutiveListResponse.class, list, ExportEnum.MY_EXECUTIVE_TASK.getSheetName());
+    }
+
+    @ApiOperation("我的任务-查询各状态样品数量（待检测、检测中、检测完）")
     @GetMapping("/myExecutive/amount")
     public ReturnDTO<List<SampleAmountResponse>> queryMyExecutiveAmount() {
         return ReturnUtil.success(labExecutiveInfoService.myExecutiveAmount());
     }
 
-    /**
-     * 实验室检测-部门检测-分配（分配给具体人员）
-     */
-    @ApiOperation("实验室检测-部门检测-分配按钮（分配给具体人员）")
+    @ApiOperation("实验室任务-分配按钮（分配给具体人员）")
     @PostMapping("/deptExecutive/allocate")
     public ReturnDTO allocateStaff(@RequestBody @Valid SampleAllocateRequest sampleAllocateRequest, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -78,10 +95,7 @@
         return labExecutiveInfoService.allocateStaff(sampleAllocateRequest);
     }
 
-    /**
-     * 实验室检测-我的检测-检定人扫描收入（待检测->检测中）
-     */
-    @ApiOperation("实验室检测-我的检测-检定人扫描收入（待检测->检测中）")
+    @ApiOperation("我的任务-检定人扫描收入（待检测->检测中）")
     @PostMapping("/myExecutive/receive")
     public ReturnDTO sampleReceive(@RequestBody @Valid List<SampleOperateRequest> requestList, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -90,10 +104,7 @@
         return labExecutiveInfoService.sampleReceive(requestList);
     }
 
-    /**
-     * 实验室检测-负责人/检定人扫描检完（检测中->检测完）
-     */
-    @ApiOperation("实验室检测-负责人/检定人扫描检完（检测中->检测完）")
+    @ApiOperation("实验室任务-负责人/检定人扫描检完（检测中->检测完）")
     @PostMapping("/myExecutive/complete")
     public ReturnDTO sampleExecutiveComplete(@RequestBody @Valid List<SampleOperateRequest> requestList, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -102,10 +113,7 @@
         return labExecutiveInfoService.sampleExecutiveComplete(requestList);
     }
 
-    /**
-     * 实验室检测-部门检测/我的检测 编辑（只能修改应出具证书）
-     */
-    @ApiOperation("实验室检测-部门检测/我的检测 编辑（只能修改应出具证书）")
+    @ApiOperation("实验室任务/我的任务 编辑（只能修改应出具证书）")
     @PostMapping("/executive/update")
     public ReturnDTO updateExecutive(@RequestBody @Valid UpdateExecutiveRequest request, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -114,10 +122,7 @@
         return labExecutiveInfoService.updateExecutive(request);
     }
 
-    /**
-     * 实验室检测-部门检测/我的检测 详情
-     */
-    @ApiOperation("实验室检测-部门检测/我的检测 详情")
+    @ApiOperation("实验室任务/我的任务 详情")
     @PostMapping("/executive/detail")
     public ReturnDTO<ExecutiveDetailResponse> executiveDetail(@RequestBody @Valid ExecutiveDetailRequest request, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
@@ -131,7 +136,7 @@
      * 退回后会将下一个要执行的实验室检测状态更新为待分配，将后面的实验室顺序变更为连续（都进行减1）
      * 最后一个检测的实验室退回，等分发员再增加实验室或设备收发中的已收入直接手动点击完成
      */
-    @ApiOperation("实验室检测-部门检测/我的检测 退回（待检测/检测中->退回）")
+    @ApiOperation("实验室任务/我的任务 退回（待检测/检测中->退回）")
     @PostMapping("/executive/sendBack")
     public ReturnDTO executiveSendBack(@RequestBody @Valid ExecutiveSendBackRequest request, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -140,9 +145,6 @@
         return labExecutiveInfoService.sampleExecutiveSendBack(request);
     }
 
-    /**
-     * 分发员编辑实验室检测列表
-     */
     @ApiOperation("分发员编辑实验室检测列表")
     @PostMapping("/handOut/updateList")
     public ReturnDTO updateExecutiveList(@RequestBody @Valid UpdateExecutiveListRequest request, BindingResult bindingResult) {
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java
index 48a67ed..0c04f31 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java
@@ -10,6 +10,7 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.resource.customer.CustomerApprovalListRequest;
 import com.casic.missiles.dto.resource.customer.CustomerSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceCustomerInfo;
@@ -26,6 +27,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -55,6 +57,13 @@
         return customerInfoService.saveCustomerInfo(request);
     }
 
+    @ApiOperation("委托方名录导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody CustomerApprovalListRequest request) throws Exception {
+        List<BizResourceCustomerInfo> list = super.exportList(request);
+        super.exportExcel(BizResourceCustomerInfo.class, list, ExportEnum.CUSTOMER_INFO.getSheetName());
+    }
+
     @ApiOperation("委托方人员列表（分页）")
     @PostMapping("/person/listPage")
     public ReturnDTO<PageInfoBT<BizResourceCustomerStaff>> personListPage(@RequestBody IdDTO idDto) {
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
index 972ed4b..6418ea5 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
@@ -5,6 +5,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.resource.customer.SuggestFormApprovalListRequest;
 import com.casic.missiles.dto.resource.customer.SuggestFormSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceCustomerSuggestForm;
@@ -20,6 +21,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -50,4 +52,11 @@
         return suggestFormService.saveSuggestForm(request);
     }
 
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody SuggestFormApprovalListRequest request) throws Exception {
+        List<BizResourceCustomerSuggestForm> list = super.exportList(request);
+        super.exportExcel(BizResourceCustomerSuggestForm.class, list, ExportEnum.CUSTOMER_SUGGEST_FORM.getSheetName());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java
index 1934d1a..9e07eab 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java
@@ -15,12 +15,16 @@
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.resource.IEnvEnvironmentRecordConfigService;
 import com.casic.missiles.service.resource.IEnvEnvironmentRecordDataService;
+import com.casic.missiles.service.resource.IEnvLocationInfoService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
 import java.util.List;
@@ -39,6 +43,8 @@
     private IEnvEnvironmentRecordDataService environmentRecordDataService;
     @Autowired
     private IEnvEnvironmentRecordConfigService environmentRecordConfigService;
+    @Autowired
+    private IEnvLocationInfoService locationInfoService;
 
     @ApiOperation("环境记录单数据列表/详情")
     @PostMapping("/data/listPage")
@@ -95,4 +101,11 @@
         });
         return environmentRecordConfigService.deleteEnvironmentRecordConfig(idDTO.getId());
     }
+
+    @ApiOperation("地点列表")
+    @PostMapping("/location/listPage")
+    public ReturnDTO<PageInfoBT<LocationListResponse>> locationListPage(@RequestBody @Valid LocationListRequest request) {
+        Page<LocationListResponse> page = PageFactory.defaultPage();
+        return ReturnUtil.success(super.packForBT(locationInfoService.listPage(page, request)));
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java
index 82efe3f..e9561fa 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java
@@ -10,6 +10,7 @@
 import com.casic.missiles.dto.resource.seal.SealLogListRequest;
 import com.casic.missiles.dto.resource.seal.SealNoteApprovalListRequest;
 import com.casic.missiles.dto.resource.seal.SealNoteSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceSealUseLog;
@@ -27,6 +28,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -58,6 +60,13 @@
         return sealUseNoteService.saveSeal(request);
     }
 
+    @ApiOperation("印章使用登记导出（列表和导出中去掉经办人和监印人）")
+    @PostMapping("/listExport")
+    public void export(@RequestBody SealNoteApprovalListRequest request) throws Exception {
+        List<BizResourceSealUseNote> list = super.exportList(request);
+        super.exportExcel(BizResourceSealUseNote.class, list, ExportEnum.SEAL_NOTE.getSheetName());
+    }
+
     // TODO: 2023/7/28 印章使用日志：系统中使用印章时插入数据库
 
     @ApiOperation("印章使用日志列表（分页）")
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java
index 9b674fc..06b6521 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java
@@ -9,16 +9,20 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.resource.staff.StaffCertRequest;
 import com.casic.missiles.dto.resource.staff.StaffCertResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.service.resource.IBizResourceStaffInfoService;
 import com.casic.missiles.service.resource.IBizResourceStaffVerifierService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.List;
+
 /**
  * @Description:
  * @Author: wangpeng
@@ -41,9 +45,21 @@
         return ReturnUtil.success(super.packForBT(responsePage));
     }
 
+    @ApiOperation("证书逾期提醒导出")
+    @PostMapping("/listExport")
+    public void exportList(@RequestBody StaffCertRequest request) throws Exception {
+        List<StaffCertResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = staffInfoService.certListByIds(request.getIds());
+        } else {
+            list = staffInfoService.certList(request);
+        }
+        super.exportExcel(StaffCertResponse.class, list, ExportEnum.STAFF_CERTIFICATE_EXPIRE.getSheetName());
+    }
+
     @ApiOperation("证书逾期提醒")
     @PostMapping("/expirationReminder")
-    public ReturnDTO expirationReminder(@RequestBody IdDTO idDto) {
-        return verifierService.expirationReminder(idDto);
+    public ReturnDTO expirationReminder(@RequestBody IdDTO idDTO) {
+        return verifierService.expirationReminder(idDTO);
     }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java
index 3b251ad..a6e7850 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java
@@ -12,6 +12,7 @@
 import com.casic.missiles.dto.resource.staff.StaffListRequest;
 import com.casic.missiles.dto.resource.staff.TrainListRequest;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.*;
@@ -22,7 +23,10 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
 import java.util.List;
@@ -52,8 +56,19 @@
             throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
         }
         Page<BizResourceStaffInfo> page = PageFactory.defaultPage();
-        Page<BizResourceStaffInfo> responsePage = staffInfoService.listPage(page, request);
-        return ReturnUtil.success(super.packForBT(responsePage));
+        return ReturnUtil.success(super.packForBT(staffInfoService.listPage(page, request)));
+    }
+
+    @ApiOperation("人员登记导出")
+    @PostMapping("/listExport")
+    public void exportList(@RequestBody StaffListRequest request) throws Exception {
+        List<BizResourceStaffInfo> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = staffInfoService.listByIds(request.getIds());
+        } else {
+            list = staffInfoService.list(request);
+        }
+        super.exportExcel(BizResourceStaffInfo.class, list, ExportEnum.STAFF_INFO.getSheetName());
     }
 
     @ApiOperation("人员登记详情基础信息")
@@ -85,9 +100,9 @@
 
     @ApiOperation("科研教育列表（分页）")
     @PostMapping("/education/listPage")
-    public ReturnDTO<PageInfoBT<BizResourceStaffEducation>> educationListPage(@RequestBody IdDTO idDto) {
+    public ReturnDTO<PageInfoBT<BizResourceStaffEducation>> educationListPage(@RequestBody IdDTO idDTO) {
         Page<BizResourceStaffEducation> page = PageFactory.defaultPage();
-        Page<BizResourceStaffEducation> responsePage = staffInfoService.educationListPage(page, idDto);
+        Page<BizResourceStaffEducation> responsePage = staffInfoService.educationListPage(page, idDTO);
         return ReturnUtil.success(super.packForBT(responsePage));
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java
index af6aa86..d85d84a 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java
@@ -9,6 +9,7 @@
 import com.casic.missiles.dto.resource.outsideService.SupplierApprovalListRequest;
 import com.casic.missiles.dto.resource.outsideService.SupplierSaveResponse;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceSupplierAbility;
@@ -67,6 +68,13 @@
         return ReturnUtil.success(supplierInfoService.detail(idDTO.getId()));
     }
 
+    @ApiOperation("合格供方导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody SupplierApprovalListRequest request) throws Exception {
+        List<BizResourceSupplierInfo> list = super.exportList(request);
+        super.exportExcel(BizResourceSupplierInfo.class, list, ExportEnum.SUPPLIER_INFO.getSheetName());
+    }
+
     @ApiOperation("供方人员列表（分页）")
     @PostMapping("/person/listPage")
     public ReturnDTO<PageInfoBT<BizResourceSupplierPerson>> personListPage(@RequestBody IdDTO idDTO) {
diff --git a/casic-metering-api/src/main/resources/config/application.yml b/casic-metering-api/src/main/resources/config/application.yml
index 350db5f..ecff521 100644
--- a/casic-metering-api/src/main/resources/config/application.yml
+++ b/casic-metering-api/src/main/resources/config/application.yml
@@ -126,7 +126,7 @@
     #作者
     author: wangpeng
     #待生成对象表名
-    table-name: biz_equipment_technical_target_approval,biz_equipment_attachment_approval,biz_equipment_checkpoint_approval
+    table-name: biz_business_outsource_protocol
 
 reminder:
   #节点--common模块config包 ReminderNodeConfig配置
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
index 4a19e4e..d47d552 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
@@ -53,6 +53,7 @@
     SUGGEST_FORM_SAVE_FAILED(2509, "委托方意见登记表保存至草稿箱失败"),
     EXAMINE_FORM_SAVE_FAILED(2510, "要求、委托书及合同评审表保存至草稿箱失败"),
     CUSTOMER_EXIST_SAVE_FAILED(2511, "该委托方已存在，请重新选择"),
+    DUPLICATE_LOCATION_NO(2512, "地点编号已存在"),
 
     /**
      * 计量检定业务模块
@@ -68,6 +69,8 @@
     COMPLETE_SAMPLE_NOT_EXIST(2609, "检测中不存在扫描收入的样品"),
     CANNOT_CHANGE_MEASURE_INFO(2610, "无法更改非当前登录用户的检测信息"),
     NON_EXIST_ORDER_OR_SAMPLE(2611, "不存在该委托单或该委托单下的样品"),
+    OUTSOURCE_ACCESS_SAVE_FAILED(2612, "测试、校准或检定工作分包评审表保存至草稿箱失败"),
+    OUTSOURCE_PROTOCOL_SAVE_FAILED(2613, "测试、校准或检定工作分包协议书保存至草稿箱失败"),
 
     /**
      * 历史遗留备用
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
index 5089ad1..81a406b 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
@@ -10,54 +10,38 @@
     /**
      * 资源管理
      */
-    ENVIRONMENT_DATA_EXPORT("environmentData", "environmentData", "环境记录单数据"),
+    ENVIRONMENT_DATA_EXPORT("environmentData", "环境记录单数据", "环境记录单数据"),
+    STAFF_INFO("staffInfo", "人员登记", "人员登记"),
+    STAFF_CERTIFICATE_EXPIRE("certificateExpire", "证书逾期提醒", "证书逾期提醒"),
+    SUPPLIER_INFO("supplierInfo", "合格供方名录", "合格供方名录"),
+    CUSTOMER_INFO("customerInfo", "委托方名录", "委托方名录"),
+    CUSTOMER_SUGGEST_FORM("customerSuggestForm", "委托方意见登记表", "委托方意见登记表"),
+    SEAL_NOTE("sealNote", "印章使用登记", "印章使用登记"),
 
-    FILE_EXPORT("meterFileData", "meterFileData", "计量文件信息"),
-    TRAIN_PLAN_EXPORT("trainPlanData", "trainPlanData", "培训计划"),
-    TRAIN_LOG_EXPORT("trainLogData", "trainLogData", "培训记录"),
-    METER_ORGANIZE_EXPORT("meterOrganizeData", "meterOrganizeData", "计量组织"),
-    TRACE_SUPPLIER_EXPORT("traceSupplierData", "traceSupplierData", "溯源供方"),
-    SIGN_EXPORT("signData", "signData", "签名/签章"),
-    TEMPLATE_EXPORT("templateData", "templateData", "原始记录模板/证书报告模板"),
-    FIXED_ASSETS("meterFixedAssets", "meterFixedAssets", "固定资产"),
-    METER_EQUIPMENT("meterEquipment", "meterEquipment", "测量设备"),
-    CALIBRATION_TEST_EQUIPMENT("calibrationTestEquipment", "calibrationTestEquipment", "校准检定设备"),
-    MEASURE_ACCOUNT("measureAccount", "measureAccount", "测量工装"),
-    STANDARD_SUPPORT_EQUIPMENT("standardSupportEquipment", "standardSupportEquipment", "标准配套设备"),
-    STANDARD_EQUIPMENT("standardEquipment", "standardEquipment", "标准装置"),
-    FLOW_DEF_EXPORT("flowDefData", "flowDefData", "流程定义"),
-    STAFF_CERTIFICATE("certificate", "certificate", "计量人员证书"),
-    CHECK_INFO("checkInfo", "checkInfo", "设备管理点检测"),
-    EQUIPMENT_APPLY("equipmentApply", "equipmentApply", "设备借用"),
-    STANDARD_EQUIPMENT_REMIND("equipmentApplyRemind", "equipmentApplyRemind", "标准装置到期提醒"),
-    METER_PRICE("meterPrice", "meterPrice", "价格库"),
-    METER_STAFF("meterStaff", "meterStaff", "计量人员"),
-    STANDARD_EQUIPMENT_APPLY("standardEquipmentApply", "standardEquipmentApply", "标准装置申请"),
-    STATE_MANAGE_APPLY("stateManage", "stateManage", "状态管理"),
-    METER_ACCEPTANCE_CHECK("acceptanceCheck", "acceptanceCheck", "设备检修保养验收单"),
-    CUSTOMER_EXPORT("customerData", "customerData", "客户信息"),
-    ORDER_EXPORT("orderData", "orderData", "委托书信息"),
-    SAMPLE_EXPORT("sampleData", "sampleData", "样本信息"),
-    EXCHANGE_DATA("exchangeData", "exchangeData", "设备交接单"),
-    DISPATCH_DATA("dispatchData", "dispatchData", "设备收发"),
-    ENVIRONMENT_DATA("environmentData", "environmentData", "环境记录单"),
-    ORIGIN_DATA("originData", "originData", "原始记录"),
-    CERTIFICATE_REPORT("certificateReport", "certificateReport", "证书报告"),
-    ADVICE_EXPORT("adviceData", "adviceData", "客户反馈"),
-    HANDOUT_EXPORT("handoutData", "handoutData", "任务分发列表"),
-    OUTSOURCER_EXPORT("outsourcerData", "outsourcerData", "分包方"),
-    SITE_EXECUTIVE_EXPORT("siteExecutiveData", "siteExecutiveData", "现场测试、校准或检定"),
-    CERTIFICATE_PRINT_EXPORT("certificatePrintData", "certificatePrintData", "证书打印"),
-    DOWNLOAD_TEMPLATE("downloadTemplate", "downloadTemplate", "页面配置"),
-    OUTSOURCER_CERTIFICATE_EXPORT("outsourceCertificateData", "outsourceCertificateData", "分包证书"),
-    SETTLEMENT_INFO_EXPORT("settlementInfoData", "settlementInfoData", "业务结算"),
-    EQUIPMENT_REMIND("equipmentRemind", "equipmentRemind", "设备到期提醒"),
-    AGREEMENT_INFO_EXPORT("agreementInfoData", "agreementInfoData", "合同"),
-    WORK_STATISTICS_EXPORT("workStatisticsData", "workStatisticsData", "实时工作统计"),
-    DEPT_OUTPUT_EXPORT("deptOutputData", "deptOutputData", "部门产值分析"),
-    WORKLOAD_EXPORT("workloadData", "workloadData", "业务工作量分析"),
-    DEPT_COMPREHENSIVE_EXPORT("deptComprehensiveData", "deptComprehensiveData", "部门综合分析"),
-    ENVIRONMENTAL_RECORD("environmentalRecordData", "environmentalRecordData", "现场环境记录");
+    /**
+     * 计量检定业务
+     */
+    OUTSOURCER_EXPORT("outsourcerData", "分包方名录", "分包方名录"),
+    IDENTIFY_EXPORT("identifyData", "计量标识", "计量标识"),
+    ORDER_EXPORT("orderData", "任务单", "任务单"),
+    DISPATCH_DATA("dispatchData", "设备收发", "设备收发"),
+    HANDOUT_EXPORT("handoutData", "任务分发", "任务分发"),
+    SITE_EXECUTIVE_EXPORT("siteExecutiveData", "现场测试、校准或检定", "现场测试、校准或检定"),
+    CERTIFICATE_REPORT("certificateReport", "证书审批", "证书审批"),
+    CERTIFICATE_CHANGE_APPLY("certificateChangeApply", "证书报告补充或更换申请单", "证书报告补充或更换申请单"),
+    CERTIFICATE_PRINT("certificatePrintData", "证书打印审批", "证书打印审批"),
+    DEPT_EXECUTIVE_TASK("deptExecutiveTaskData", "实验室任务", "实验室任务"),
+    MY_EXECUTIVE_TASK("myExecutiveTaskData", "我的任务", "我的任务"),
+    OUTSOURCE_ASSESS("outsourceAssess", "测试、校准或检定工作分包评审表", "测试、校准或检定工作分包评审表"),
+    OUTSOURCE_PROTOCOL("outsourceProtocol", "测试、校准或检定工作分包协议书", "测试、校准或检定工作分包协议书"),
+
+    /**
+     * 系统管理
+     */
+    SIGN_EXPORT("signData", "签名", "签名"),
+    TEMPLATE_EXPORT("templateData", "文件模板", "文件模板"),
+    FLOW_DEF_EXPORT("flowDefData", "流程定义", "流程定义"),
+    DOWNLOAD_TEMPLATE("downloadTemplate", "流程定义", "页面配置");
 
     ExportEnum(String fileName, String sheetName, String description) {
         this.fileName = fileName;
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateRecordTypeCodeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateRecordTypeCodeEnum.java
index 31d913c..a963522 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateRecordTypeCodeEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateRecordTypeCodeEnum.java
@@ -46,4 +46,14 @@
     String SITE_EXECUTIVE_APPROVAL = "01";
     //《现场测试、校准或检定工作记录表》
     String SITE_EXECUTIVE_LOG = "02";
+
+    //测试、校准或检定工作分包协议书
+    String OUTSOURCE_PROTOCOL = "01";
+    //测试、校准或检定工作分包评审表
+    String OUTSOURCE_ACCESS = "02";
+    //测试、校准或检定工作分包通知书
+    String OUTSOURCE_NOTICE = "03";
+    //测试、校准或检定工作分包方名录
+    String OUTSOURCE_INFO = "04";
+
 }
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
index 24b8635..f78bd53 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
@@ -15,6 +15,10 @@
     String CERTIFICATE_CHANGE_APPLY_BEAN_NAME = "certificateChangeApplyBean";
     //现场测试、校准或检定
     String SITE_EXECUTIVE_BEAN_NAME = "siteExecutiveBean";
+    //测试、校准或检定工作分包评审表
+    String OUTSOURCE_ASSESS_BEAN_NAME = "outsourceAssessBean";
+    //测试、校准或检定工作分包协议书
+    String OUTSOURCE_PROTOCOL_BEAN_NAME = "outsourceProtocolBean";
 
     /*********************************设备与装置************************************/
     //设备台账
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 b21c661..6b86fd1 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
@@ -18,6 +18,8 @@
     OUTSOURCER_APPROVAL(OUTSOURCER_BEAN_NAME, ""),
     CERTIFICATE_CHANGE_APPROVAL(CERTIFICATE_CHANGE_APPLY_BEAN_NAME, ""),
     SITE_EXECUTIVE_APPROVAL(SITE_EXECUTIVE_BEAN_NAME, ""),
+    OUTSOURCE_ASSESS_APPROVAL(OUTSOURCE_ASSESS_BEAN_NAME, ""),
+    OUTSOURCE_PROTOCOL_APPROVAL(OUTSOURCE_PROTOCOL_BEAN_NAME, ""),
 
     ACTION_STATUS_MAP(new HashMap<String, AwareActionStatusEnum>() {
         {
@@ -47,6 +49,10 @@
             put(ApplyFromIdEnum.CERTIFICATE_CHANGE_APPROVAL.getCode(), CERTIFICATE_CHANGE_APPROVAL);
             //现场测试、校准或检定审批
             put(ApplyFromIdEnum.SITE_EXECUTIVE_APPROVAL.getCode(), SITE_EXECUTIVE_APPROVAL);
+            //测试、校准或检定工作分包评审表
+            put(ApplyFromIdEnum.OUTSOURCE_ASSESS_APPROVAL.getCode(), OUTSOURCE_ASSESS_APPROVAL);
+            //测试、校准或检定工作分包协议书
+            put(ApplyFromIdEnum.OUTSOURCE_PROTOCOL_APPROVAL.getCode(), OUTSOURCE_PROTOCOL_APPROVAL);
         }
     });
     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 934405e..c7410bd 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
@@ -9,6 +9,8 @@
     CERTIFICATE_CHANGE_APPROVAL("jljdywzsbchghsqd", MessageSourceModuleEnum.BUSINESS.getCode(), "证书/报告补充或更换申请单"),
     OUTSOURCER_APPROVAL("jljdywcsjzhgfbfml", MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定合格分包方名录"),
     SITE_EXECUTIVE_APPROVAL("jljdywxccsjzsp", MessageSourceModuleEnum.BUSINESS.getCode(), "现场测试、校准或检定审批"),
+    OUTSOURCE_ASSESS_APPROVAL("jljdywcsjzfbpsb", MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包评审表"),
+    OUTSOURCE_PROTOCOL_APPROVAL("jljdywcsjzfbxys", MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包协议书"),
 
 
     /*******************************************设备与装置*********************************************/
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/GeneralApprovalMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/GeneralApprovalMapper.java
index 4fb7344..0c9d6ae 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/GeneralApprovalMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/GeneralApprovalMapper.java
@@ -17,8 +17,4 @@
 
     Page<O> selectBatchForApprovalList(Page<O> page, @Param("request") R request, @Param("businessKeys") List<String> businessKeys);
 
-//    Page<O> selectListPage(Page<O> page, @Param("request") R request);
-
-//    Long selectMaxNo();
-
 }
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceAssessMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceAssessMapper.java
index 7867bb8..ba59009 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceAssessMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceAssessMapper.java
@@ -1,7 +1,12 @@
 package com.casic.missiles.mapper.business;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.business.outsource.OutsourceAssessApprovalListRequest;
+import com.casic.missiles.mapper.GeneralApprovalMapper;
 import com.casic.missiles.model.business.BizBusinessOutsourceAssess;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * <p>
@@ -11,6 +16,10 @@
  * @author wangpeng
  * @since 2023-08-16
  */
-public interface BizBusinessOutsourceAssessMapper extends BaseMapper<BizBusinessOutsourceAssess> {
+public interface BizBusinessOutsourceAssessMapper extends GeneralApprovalMapper<BizBusinessOutsourceAssess, BizBusinessOutsourceAssess, OutsourceAssessApprovalListRequest> {
+
+    Page<BizBusinessOutsourceAssess> selectBatchForApprovalList(Page<BizBusinessOutsourceAssess> page, @Param("request") OutsourceAssessApprovalListRequest request, @Param("businessKeys") List<String> businessKeys);
+
+    Long selectMaxProjectNo();
 
 }
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceProtocolMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceProtocolMapper.java
new file mode 100644
index 0000000..e6aba35
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceProtocolMapper.java
@@ -0,0 +1,24 @@
+package com.casic.missiles.mapper.business;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.business.outsource.OutsourceProtocolApprovalListRequest;
+import com.casic.missiles.mapper.GeneralApprovalMapper;
+import com.casic.missiles.model.business.BizBusinessOutsourceProtocol;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 计量检定业务-分包管理-测试、校准或检定工作分包协议书 Mapper 接口
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-08-24
+ */
+public interface BizBusinessOutsourceProtocolMapper extends GeneralApprovalMapper<BizBusinessOutsourceProtocol, BizBusinessOutsourceProtocol, OutsourceProtocolApprovalListRequest> {
+
+    Page<BizBusinessOutsourceProtocol> selectBatchForApprovalList(Page<BizBusinessOutsourceProtocol> page, @Param("request") OutsourceProtocolApprovalListRequest request, @Param("businessKeys") List<String> businessKeys);
+
+    Long selectMaxProtocolNo();
+}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/EnvLocationInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/EnvLocationInfoMapper.java
new file mode 100644
index 0000000..49eff87
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/EnvLocationInfoMapper.java
@@ -0,0 +1,21 @@
+package com.casic.missiles.mapper.resource;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.resource.environment.LocationListRequest;
+import com.casic.missiles.dto.resource.environment.LocationListResponse;
+import com.casic.missiles.model.resource.EnvLocationInfo;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * <p>
+ * 实验室环境监控系统-设备表 Mapper 接口
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-06-07
+ */
+public interface EnvLocationInfoMapper extends BaseMapper<EnvLocationInfo> {
+
+    Page<LocationListResponse> selectLocationListPage(Page<LocationListResponse> page, @Param("request") LocationListRequest request);
+}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java
index de124db..85ed0f7 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java
@@ -1,7 +1,9 @@
 package com.casic.missiles.mapper.system;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.dto.system.SignDetailResponse;
+import com.casic.missiles.dto.system.SignListRequest;
 import com.casic.missiles.model.system.SystemSign;
 import org.apache.ibatis.annotations.Param;
 
@@ -22,4 +24,8 @@
     SignDetailResponse selectSignDetailById(Long id);
 
     List<SystemSign> selectUsableSignList(@Param("userId") Long userId);
+
+    Page<SystemSign> selectSignListPage(Page<SystemSign> page, @Param("request") SignListRequest request);
+
+    List<SystemSign> selectSignList(@Param("request") SignListRequest request);
 }
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateChangeApplyMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateChangeApplyMapper.xml
index d798447..c496092 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateChangeApplyMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateChangeApplyMapper.xml
@@ -30,31 +30,31 @@
         SELECT *
         FROM biz_business_certificate_change_apply
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.changeApplyNo != null and request.changeApplyNo !=''">
+        <if test="request != null and request.changeApplyNo != null and request.changeApplyNo !=''">
             and change_apply_no like concat('%',#{request.changeApplyNo},'%')
         </if>
-        <if test="request.changeReportNo != null and request.changeReportNo !=''">
+        <if test="request != null and request.changeReportNo != null and request.changeReportNo !=''">
             and change_report_no like concat('%',#{request.changeReportNo},'%')
         </if>
-        <if test="request.changeReportName != null and request.changeReportName !=''">
+        <if test="request != null and request.changeReportName != null and request.changeReportName !=''">
             and change_report_name like concat('%',#{request.changeReportName},'%')
         </if>
-        <if test="request.changeType != null and request.changeType !=''">
+        <if test="request != null and request.changeType != null and request.changeType !=''">
             and change_type = #{request.changeType}
         </if>
-        <if test="request.createUserName != null and request.createUserName !=''">
+        <if test="request != null and request.createUserName != null and request.createUserName !=''">
             and create_user_name like concat('%',#{request.createUserName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificatePrintMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificatePrintMapper.xml
index b66cd99..49c0ac8 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificatePrintMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificatePrintMapper.xml
@@ -31,34 +31,34 @@
         LEFT JOIN biz_business_order_sample_relation bosr ON (bosr.order_id = bcr.order_id AND bosr.sample_id = bcr.sample_id)
         LEFT JOIN biz_business_order_info boi ON boi.id = bosr.order_id
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and bcp.approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.printStatus != null and request.printStatus !=''">
+        <if test="request != null and request.printStatus != null and request.printStatus !=''">
             and print_status = #{request.printStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and bcp.create_user_id = #{request.createUserId}
         </if>
-        <if test="request.certificateReportNo != null and request.certificateReportNo !=''">
+        <if test="request != null and request.certificateReportNo != null and request.certificateReportNo !=''">
             and bcr.certificate_report_no like concat('%',#{request.certificateReportNo},'%')
         </if>
-        <if test="request.certificateReportName != null and request.certificateReportName !=''">
+        <if test="request != null and request.certificateReportName != null and request.certificateReportName !=''">
             and bcr.certificate_report_name like concat('%',#{request.certificateReportName},'%')
         </if>
-        <if test="request.customerName != null and request.customerName !=''">
+        <if test="request != null and request.customerName != null and request.customerName !=''">
             and boi.customer_name like concat('%',#{request.customerName},'%')
         </if>
-        <if test="request.sampleNo != null and request.sampleNo !=''">
+        <if test="request != null and request.sampleNo != null and request.sampleNo !=''">
             and bosr.sample_no like concat('%',#{request.sampleNo},'%')
         </if>
-        <if test="request.sampleName != null and request.sampleName !=''">
+        <if test="request != null and request.sampleName != null and request.sampleName !=''">
             and bosr.sample_name like concat('%',#{request.sampleName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and bcp.create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and bcp.create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml
index b366034..767695d 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml
@@ -46,33 +46,37 @@
         SELECT bcr.*, bosr.sample_no, bosr.sample_name, bosr.sample_model, rsi.staff_name
         FROM biz_business_certificate_report bcr
         LEFT JOIN biz_business_order_sample_relation bosr ON (bosr.order_id = bcr.order_id AND bosr.sample_id = bcr.sample_id)
+        LEFT JOIN biz_business_order_info boi ON boi.id = bcr.order_id
         LEFT JOIN biz_resource_staff_info rsi ON rsi.id = bcr.measure_person_id
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and bcr.approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and bcr.create_user_id = #{request.createUserId}
         </if>
-        <if test="request.certificateReportNo != null and request.certificateReportNo !=''">
+        <if test="request != null and request.customerId != null and request.customerId !=''">
+            and boi.customer_id = #{request.customerId}
+        </if>
+        <if test="request != null and request.certificateReportNo != null and request.certificateReportNo !=''">
             and bcr.certificate_report_no like concat('%',#{request.certificateReportNo},'%')
         </if>
-        <if test="request.certificateReportName != null and request.certificateReportName !=''">
+        <if test="request != null and request.certificateReportName != null and request.certificateReportName !=''">
             and bcr.certificate_report_name like concat('%',#{request.certificateReportName},'%')
         </if>
-        <if test="request.sampleNo != null and request.sampleNo !=''">
+        <if test="request != null and request.sampleNo != null and request.sampleNo !=''">
             and bosr.sample_no like concat('%',#{request.sampleNo},'%')
         </if>
-        <if test="request.measureCategory != null and request.measureCategory !=''">
+        <if test="request != null and request.measureCategory != null and request.measureCategory !=''">
             and bcr.measure_category = #{request.measureCategory}
         </if>
-        <if test="request.measurePerson != null and request.measurePerson !=''">
+        <if test="request != null and request.measurePerson != null and request.measurePerson !=''">
             and rsi.staff_name like concat('%',#{request.measurePerson},'%')
         </if>
-        <if test="request.calibrationTimeStart != null and request.calibrationTimeStart !=''">
+        <if test="request != null and request.calibrationTimeStart != null and request.calibrationTimeStart !=''">
             and bcr.calibration_time &gt;= #{request.calibrationTimeStart}
         </if>
-        <if test="request.calibrationTimeEnd != null and request.calibrationTimeEnd !=''">
+        <if test="request != null and request.calibrationTimeEnd != null and request.calibrationTimeEnd !=''">
             and bcr.calibration_time &lt;= #{request.calibrationTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceAssessMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceAssessMapper.xml
index d0fcf8b..c22c101 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceAssessMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceAssessMapper.xml
@@ -7,6 +7,8 @@
         <id column="id" property="id" />
         <result column="project_no" property="projectNo" />
         <result column="project_name" property="projectName" />
+        <result column="lab_code" property="labCode" />
+        <result column="group_code" property="groupCode" />
         <result column="applicant_id" property="applicantId" />
         <result column="applicant_name" property="applicantName" />
         <result column="applicant_time" property="applicantTime" />
@@ -31,7 +33,45 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, project_no, project_name, applicant_id, applicant_name, applicant_time, minio_file_name, remark, create_user_id, create_user_name, outsourcer_id, pre_start_time, pre_end_time, outsource_reason, pre_cost, approval_status, process_id, approve_situation, traceability, test_method, technique_ability, create_time, update_time
+        id, project_no, project_name, lab_code, group_code, applicant_id, applicant_name, applicant_time, minio_file_name, remark, create_user_id, create_user_name, outsourcer_id, pre_start_time, pre_end_time, outsource_reason, pre_cost, approval_status, process_id, approve_situation, traceability, test_method, technique_ability, create_time, update_time
     </sql>
 
+    <select id="selectMaxProjectNo" resultType="java.lang.Long">
+        SELECT IFNULL(max(RIGHT(project_no, 3)), 0) from biz_business_outsource_assess
+    </select>
+
+    <select id="selectBatchForApprovalList" resultMap="BaseResultMap">
+        SELECT bboa.*, bboi.outsourcer_name, bboi.director
+        FROM biz_business_outsource_assess bboa
+        LEFT JOIN biz_business_outsourcer_info bboi ON bboa.outsourcer_id = bboi.id
+        WHERE 1=1
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
+            and bboa.approval_status = #{request.approvalStatus}
+        </if>
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
+            and bboa.create_user_id = #{request.createUserId}
+        </if>
+        <if test="request != null and request.projectNo != null and request.projectNo !=''">
+            and bboa.project_no like concat('%',#{request.projectNo},'%')
+        </if>
+        <if test="request != null and request.outsourcerName != null and request.outsourcerName !=''">
+            and bboi.outsourcer_name like concat('%',#{request.outsourcerName},'%')
+        </if>
+        <if test="request != null and request.applicantName != null and request.applicantName !=''">
+            and bboa.applicant_name like concat('%',#{request.applicantName},'%')
+        </if>
+        <if test="request != null and request.applicantTimeStart != null and request.applicantTimeStart !=''">
+            and bboa.applicant_time &gt;= #{request.applicantTimeStart}
+        </if>
+        <if test="request != null and request.applicantTimeEnd != null and request.applicantTimeEnd !=''">
+            and bboa.applicant_time &lt;= #{request.applicantTimeEnd}
+        </if>
+        <if test="businessKeys != null">
+            and bboa.id in
+            <foreach collection="businessKeys" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
+        ORDER BY bboa.create_time DESC
+    </select>
 </mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceProtocolMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceProtocolMapper.xml
new file mode 100644
index 0000000..b7b2149
--- /dev/null
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceProtocolMapper.xml
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.mapper.business.BizBusinessOutsourceProtocolMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.business.BizBusinessOutsourceProtocol">
+        <id column="id" property="id" />
+        <result column="protocol_no" property="protocolNo" />
+        <result column="project_name" property="projectName" />
+        <result column="lab_code" property="labCode" />
+        <result column="group_code" property="groupCode" />
+        <result column="outsourcer_id" property="outsourcerId" />
+        <result column="remark" property="remark" />
+        <result column="outsource_no" property="outsourceNo" />
+        <result column="outsource_name" property="outsourceName" />
+        <result column="contacts" property="contacts" />
+        <result column="mobile" property="mobile" />
+        <result column="address" property="address" />
+        <result column="require_date" property="requireDate" />
+        <result column="outsource_cost" property="outsourceCost" />
+        <result column="director" property="director" />
+        <result column="item" property="item" />
+        <result column="requires" property="requires" />
+        <result column="create_user_id" property="createUserId" />
+        <result column="create_user_name" property="createUserName" />
+        <result column="approval_status" property="approvalStatus" />
+        <result column="process_id" property="processId" />
+        <result column="create_time" property="createTime" />
+        <result column="update_time" property="updateTime" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, protocol_no, project_name, lab_code, group_code, outsourcer_id, remark, outsource_no, outsource_name, contacts, mobile, address, require_date, outsource_cost, director, item, requires, create_user_id, create_user_name, approval_status, process_id, create_time, update_time
+    </sql>
+
+    <select id="selectMaxProtocolNo" resultType="java.lang.Long">
+        SELECT IFNULL(max(RIGHT(protocol_no, 3)), 0) from biz_business_outsource_protocol
+    </select>
+
+    <select id="selectBatchForApprovalList" resultMap="BaseResultMap">
+        SELECT *
+        FROM biz_business_outsource_protocol
+        WHERE 1=1
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
+            and approval_status = #{request.approvalStatus}
+        </if>
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
+            and create_user_id = #{request.createUserId}
+        </if>
+        <if test="request != null and request.protocolNo != null and request.protocolNo !=''">
+            and protocol_no like concat('%',#{request.protocolNo},'%')
+        </if>
+        <if test="request != null and request.outsourcerName != null and request.outsourcerName !=''">
+            and outsourcer_name like concat('%',#{request.outsourcerName},'%')
+        </if>
+        <if test="request != null and request.applicantName != null and request.applicantName !=''">
+            and create_user_name like concat('%',#{request.applicantName},'%')
+        </if>
+        <if test="request != null and request.applicantTimeStart != null and request.applicantTimeStart !=''">
+            and create_time &gt;= #{request.applicantTimeStart}
+        </if>
+        <if test="request != null and request.applicantTimeEnd != null and request.applicantTimeEnd !=''">
+            and create_time &lt;= #{request.applicantTimeEnd}
+        </if>
+        <if test="businessKeys != null">
+            and id in
+            <foreach collection="businessKeys" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
+        ORDER BY create_time DESC
+    </select>
+</mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourcerInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourcerInfoMapper.xml
index 510a80b..3049b54 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourcerInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourcerInfoMapper.xml
@@ -7,6 +7,8 @@
         <id column="id" property="id" />
         <result column="outsourcer_no" property="outsourcerNo" />
         <result column="outsourcer_name" property="outsourcerName" />
+        <result column="lab_code" property="labCode" />
+        <result column="group_code" property="groupCode" />
         <result column="outsourcer_brief_name" property="outsourcerBriefName" />
         <result column="outsourcer_size" property="outsourcerSize" />
         <result column="business_size" property="businessSize" />
@@ -55,32 +57,32 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, outsourcer_no, outsourcer_name, outsourcer_brief_name, outsourcer_size, business_size, grade, evaluation, tax_number, bank_account, bank_name, bank_account_number, postal_code, director, phone, fax, mobile, email, website, address_country, address_province, address_city, address_area, full_address, address_country_name, address_province_name, address_city_name, address_area_name, invoice_country, invoice_province, invoice_city, invoice_area, invoice_full_address, invoice_country_name, invoice_province_name, invoice_city_name, invoice_area_name, business_scope, business_content, minio_file_name, approval_status, process_id, remark, create_user_id, create_user_name, create_time, update_time
+        id, outsourcer_no, outsourcer_name, lab_code, group_code, outsourcer_brief_name, outsourcer_size, business_size, grade, evaluation, tax_number, bank_account, bank_name, bank_account_number, postal_code, director, phone, fax, mobile, email, website, address_country, address_province, address_city, address_area, full_address, address_country_name, address_province_name, address_city_name, address_area_name, invoice_country, invoice_province, invoice_city, invoice_area, invoice_full_address, invoice_country_name, invoice_province_name, invoice_city_name, invoice_area_name, business_scope, business_content, minio_file_name, approval_status, process_id, remark, create_user_id, create_user_name, create_time, update_time
     </sql>
 
     <select id="selectBatchForApprovalList" resultMap="BaseResultMap">
         SELECT *
         FROM biz_business_outsourcer_info
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.outsourcerNo != null and request.outsourcerNo !=''">
+        <if test="request != null and request.outsourcerNo != null and request.outsourcerNo !=''">
             and outsourcer_no like concat('%',#{request.outsourcerNo},'%')
         </if>
-        <if test="request.outsourcerName != null and request.outsourcerName !=''">
+        <if test="request != null and request.outsourcerName != null and request.outsourcerName !=''">
             and outsourcer_name like concat('%',#{request.outsourcerName},'%')
         </if>
-        <if test="request.director != null and request.director !=''">
+        <if test="request != null and request.director != null and request.director !=''">
             and director like concat('%',#{request.director},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
@@ -93,6 +95,6 @@
     </select>
 
     <select id="selectMaxNo" resultType="java.lang.Long">
-        SELECT IFNULL(max(RIGHT(outsourcer_no, 12)), 0) from biz_business_outsourcer_info
+        SELECT IFNULL(max(RIGHT(outsourcer_no, 3)), 0) from biz_business_outsourcer_info
     </select>
 </mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessSiteExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessSiteExecutiveInfoMapper.xml
index 135c5d0..3c5ae79 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessSiteExecutiveInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessSiteExecutiveInfoMapper.xml
@@ -38,25 +38,25 @@
         FROM biz_business_site_executive_info bsei
         LEFT JOIN biz_resource_customer_info rci ON bsei.customer_id = rci.id
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and bsei.approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and bsei.create_user_id = #{request.createUserId}
         </if>
-        <if test="request.siteExecutiveNo != null and request.siteExecutiveNo !=''">
+        <if test="request != null and request.siteExecutiveNo != null and request.siteExecutiveNo !=''">
             and bsei.site_executive_no like concat('%',#{request.siteExecutiveNo},'%')
         </if>
-        <if test="request.customerName != null and request.customerName !=''">
+        <if test="request != null and request.customerName != null and request.customerName !=''">
             and rci.outsourcer_name like concat('%',#{request.customerName},'%')
         </if>
-        <if test="request.applyName != null and request.applyName !=''">
+        <if test="request != null and request.applyName != null and request.applyName !=''">
             and bsei.apply_name like concat('%',#{request.applyName},'%')
         </if>
-        <if test="request.applyTimeStart != null and request.applyTimeStart !=''">
+        <if test="request != null and request.applyTimeStart != null and request.applyTimeStart !=''">
             and bsei.apply_time &gt;= #{request.applyTimeStart}
         </if>
-        <if test="request.applyTimeEnd != null and request.applyTimeEnd !=''">
+        <if test="request != null and request.applyTimeEnd != null and request.applyTimeEnd !=''">
             and bsei.apply_time &lt;= #{request.applyTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml
index 84d9e2a..6bd38a9 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml
@@ -105,6 +105,12 @@
         <if test="request.isUrgent != null and request.isUrgent !=''">
             AND bo.is_urgent = #{request.isUrgent}
         </if>
+        <if test="request.ids != null">
+            and blei.id in
+            <foreach collection="request.ids" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
         ORDER BY blei.update_time DESC
     </select>
 
@@ -137,6 +143,12 @@
         <if test="request.isUrgent != null and request.isUrgent !=''">
             AND bo.is_urgent = #{request.isUrgent}
         </if>
+        <if test="request.ids != null">
+            and blei.id in
+            <foreach collection="request.ids" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
         ORDER BY blei.update_time DESC
     </select>
 
diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardInfoMapper.xml
index 1a5551b..2ed8d17 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardInfoMapper.xml
@@ -45,12 +45,6 @@
         FROM biz_equipment_standard_info besi
         LEFT JOIN biz_equipment_standard_technology_relation bestr ON besi.standard_no = bestr.standard_no
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
-            and besi.approval_status = #{request.approvalStatus}
-        </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
-            and besi.create_user_id = #{request.createUserId}
-        </if>
         <if test="request.standardName != null and request.standardName !=''">
             and besi.standard_name like concat('%',#{request.standardName},'%')
         </if>
diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardTechnologyRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardTechnologyRelationMapper.xml
index fc7e16c..cd03c8c 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardTechnologyRelationMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardTechnologyRelationMapper.xml
@@ -6,6 +6,7 @@
     <resultMap id="BaseResultMap" type="com.casic.missiles.model.equipment.BizEquipmentStandardTechnologyRelation">
         <id column="id" property="id" />
         <result column="technology_file_id" property="technologyFileId" />
+        <result column="technology_file_no" property="technologyFileNo" />
         <result column="technology_file_name" property="technologyFileName" />
         <result column="standard_id" property="standardId" />
         <result column="standard_no" property="standardNo" />
@@ -14,7 +15,7 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, technology_file_id, technology_file_name, standard_id, remark
+        id, technology_file_id, technology_file_no, technology_file_name, standard_id, remark
     </sql>
 
 </mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceAuthorizeOrderMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceAuthorizeOrderMapper.xml
index ac5176c..554fe65 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceAuthorizeOrderMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceAuthorizeOrderMapper.xml
@@ -32,22 +32,22 @@
         SELECT *
         FROM biz_resource_authorize_order
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.orderNo != null and request.orderNo !=''">
+        <if test="request != null and request.orderNo != null and request.orderNo !=''">
             and order_no like concat('%',#{request.orderNo},'%')
         </if>
-        <if test="request.createUserName != null and request.createUserName !=''">
+        <if test="request != null and request.createUserName != null and request.createUserName !=''">
             and create_user_name like concat('%',#{request.createUserName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerExamineFormMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerExamineFormMapper.xml
index ab242f6..af7f98f 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerExamineFormMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerExamineFormMapper.xml
@@ -41,28 +41,28 @@
         SELECT *
         FROM biz_resource_customer_examine_form
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.formNo != null and request.formNo !=''">
+        <if test="request != null and request.formNo != null and request.formNo !=''">
             and form_no like concat('%',#{request.formNo},'%')
         </if>
-        <if test="request.labCode != null and request.labCode !=''">
+        <if test="request != null and request.labCode != null and request.labCode !=''">
             and lab_code like concat('%',#{request.labCode},'%')
         </if>
-        <if test="request.groupCode != null and request.groupCode !=''">
+        <if test="request != null and request.groupCode != null and request.groupCode !=''">
             and group_code like concat('%',#{request.groupCode},'%')
         </if>
-        <if test="request.createUserName != null and request.createUserName !=''">
+        <if test="request != null and request.createUserName != null and request.createUserName !=''">
             and create_user_name like concat('%',#{request.createUserName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerInfoMapper.xml
index fa8ffbc..06a2798 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerInfoMapper.xml
@@ -33,25 +33,25 @@
         SELECT *
         FROM biz_resource_customer_info
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.customerNo != null and request.customerNo !=''">
+        <if test="request != null and request.customerNo != null and request.customerNo !=''">
             and customer_no like concat('%',#{request.customerNo},'%')
         </if>
-        <if test="request.customerName != null and request.customerName !=''">
+        <if test="request != null and request.customerName != null and request.customerName !=''">
             and customer_name like concat('%',#{request.customerName},'%')
         </if>
-        <if test="request.contacts != null and request.contacts !=''">
+        <if test="request != null and request.contacts != null and request.contacts !=''">
             and contacts like concat('%',#{request.contacts},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerSuggestFormMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerSuggestFormMapper.xml
index 28f5bb2..1806662 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerSuggestFormMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerSuggestFormMapper.xml
@@ -33,28 +33,28 @@
         SELECT *
         FROM biz_resource_customer_suggest_form
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.formNo != null and request.formNo !=''">
+        <if test="request != null and request.formNo != null and request.formNo !=''">
             and form_no like concat('%',#{request.formNo},'%')
         </if>
-        <if test="request.customerName != null and request.customerName !=''">
+        <if test="request != null and request.customerName != null and request.customerName !=''">
             and customer_name like concat('%',#{request.customerName},'%')
         </if>
-        <if test="request.customerDeptName != null and request.customerDeptName !=''">
+        <if test="request != null and request.customerDeptName != null and request.customerDeptName !=''">
             and customer_dept_name like concat('%',#{request.customerDeptName},'%')
         </if>
-        <if test="request.createUserName != null and request.createUserName !=''">
+        <if test="request != null and request.createUserName != null and request.createUserName !=''">
             and create_user_name like concat('%',#{request.createUserName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSealUseNoteMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSealUseNoteMapper.xml
index ab37bc1..b02bb33 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSealUseNoteMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSealUseNoteMapper.xml
@@ -29,32 +29,32 @@
     </sql>
 
     <select id="selectBatchForApprovalList" resultMap="BaseResultMap">
-        SELECT *
+        SELECT brsun.*, brsi.seal_name, brsi.seal_type, brsi.approver_name
         FROM biz_resource_seal_use_note brsun
         JOIN biz_resource_seal_info brsi ON brsun.seal_id = brsi.id
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and brsun.approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and brsun.create_user_id = #{request.createUserId}
         </if>
-        <if test="request.sealName != null and request.sealName !=''">
+        <if test="request != null and request.sealName != null and request.sealName !=''">
             and brsi.seal_name like concat('%',#{request.sealName},'%')
         </if>
-        <if test="request.sealType != null and request.sealType !=''">
+        <if test="request != null and request.sealType != null and request.sealType !=''">
             and brsi.seal_type = #{request.sealType}
         </if>
-        <if test="request.applyDeptName != null and request.applyDeptName !=''">
+        <if test="request != null and request.applyDeptName != null and request.applyDeptName !=''">
             and brsun.apply_dept_name like concat('%',#{request.applyDeptName},'%')
         </if>
-        <if test="request.applyUserName != null and request.applyUserName !=''">
+        <if test="request != null and request.applyUserName != null and request.applyUserName !=''">
             and brsun.apply_user_name like concat('%',#{request.applyUserName},'%')
         </if>
-        <if test="request.applyTimeStart != null and request.applyTimeStart !=''">
+        <if test="request != null and request.applyTimeStart != null and request.applyTimeStart !=''">
             and brsun.apply_time &gt;= #{request.applyTimeStart}
         </if>
-        <if test="request.applyTimeEnd != null and request.applyTimeEnd !=''">
+        <if test="request != null and request.applyTimeEnd != null and request.applyTimeEnd !=''">
             and brsun.apply_time &lt;= #{request.applyTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml
index 119bf7d..4f8392a 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml
@@ -31,6 +31,12 @@
         <if test="request.deptName != null and request.deptName !=''">
             and brsi.dept_name like concat('%',#{request.deptName},'%')
         </if>
+        <if test="request.ids != null">
+            and brsv.id in
+            <foreach collection="request.ids" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
         ORDER BY brsv.grant_date DESC
     </select>
 
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSupplierInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSupplierInfoMapper.xml
index fe8d399..e8ce7ef 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSupplierInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSupplierInfoMapper.xml
@@ -48,28 +48,28 @@
         SELECT *
         FROM biz_resource_supplier_info
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.supplierNo != null and request.supplierNo !=''">
+        <if test="request != null and request.supplierNo != null and request.supplierNo !=''">
             and supplier_no like concat('%',#{request.supplierNo},'%')
         </if>
-        <if test="request.supplierName != null and request.supplierName !=''">
+        <if test="request != null and request.supplierName != null and request.supplierName !=''">
             and supplier_name like concat('%',#{request.supplierName},'%')
         </if>
-        <if test="request.director != null and request.director !=''">
+        <if test="request != null and request.director != null and request.director !=''">
             and director like concat('%',#{request.director},'%')
         </if>
-        <if test="request.supplierType != null and request.supplierType !=''">
+        <if test="request != null and request.supplierType != null and request.supplierType !=''">
             and supplier_type = #{request.supplierType}
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/EnvLocationInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/EnvLocationInfoMapper.xml
new file mode 100644
index 0000000..68bcf10
--- /dev/null
+++ b/casic-metering-dao/src/main/resources/mapper/resource/EnvLocationInfoMapper.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.mapper.resource.EnvLocationInfoMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.resource.EnvLocationInfo">
+        <id column="id" property="id" />
+        <result column="location_no" property="locationNo" />
+        <result column="location_name" property="locationName" />
+        <result column="location_position" property="locationPosition" />
+        <result column="create_user_id" property="createUserId" />
+        <result column="create_user" property="createUser" />
+        <result column="create_time" property="createTime" />
+        <result column="update_time" property="updateTime" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, location_no, location_name, location_position, create_user_id, create_user, create_time, update_time
+    </sql>
+
+    <select id="selectLocationListPage" resultType="com.casic.missiles.dto.resource.environment.LocationListResponse">
+        SELECT *
+        FROM env_location_info
+        WHERE 1=1
+        <if test="request.locationNo != null and request.locationNo !=''">
+            AND location_no LIKE concat('%',#{request.locationNo},'%')
+        </if>
+        <if test="request.locationName != null and request.locationName !=''">
+            AND location_name LIKE concat('%',#{request.locationName},'%')
+        </if>
+        ORDER BY create_time DESC
+    </select>
+
+</mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml
index b28c18f..8854047 100644
--- a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml
@@ -11,7 +11,6 @@
         <result column="sign_desc" property="signDesc" />
         <result column="sign_director" property="signDirector" />
         <result column="sign_user_id" property="signUserId" />
-        <result column="sign_type" property="signType" />
         <result column="minio_file_name" property="minioFileName" />
         <result column="create_time" property="createTime" />
         <result column="update_time" property="updateTime" />
@@ -28,7 +27,6 @@
         <result column="sign_name" property="signName" />
         <result column="sign_desc" property="signDesc" />
         <result column="sign_director" property="signDirector" />
-        <result column="sign_type" property="signType" />
         <result column="sign_user_id" property="signUserId" />
         <result column="minio_file_name" property="minioFileName" />
         <result column="create_time" property="createTime" />
@@ -62,4 +60,58 @@
         JOIN system_sign_user_relation ssur ON ss.id = ssur.sign_id
         WHERE ssur.user_id = #{userId}
     </select>
+
+    <select id="selectSignListPage" resultMap="BaseResultMap">
+        SELECT ss.*, sd.SIMPLE_NAME AS deptName
+        FROM system_sign ss
+        LEFT JOIN sys_user su ON su.id = ss.sign_user_id
+        LEFT JOIN sys_dept sd ON sd.id = su.dept_id
+        WHERE 1=1
+        <if test="request.signNo != null and request.signNo !=''">
+            AND ss.sign_no LIKE concat('%',#{request.signNo},'%')
+        </if>
+        <if test="request.signName != null and request.signName !=''">
+            AND ss.sign_name LIKE concat('%',#{request.signName},'%')
+        </if>
+        <if test="request.signDirector != null and request.signDirector !=''">
+            AND ss.sign_director LIKE concat('%',#{request.signDirector},'%')
+        </if>
+        <if test="request.signUserId != null and request.signUserId !=''">
+            AND ss.sign_user_id = #{request.signUserId}
+        </if>
+        <if test="request.createStartTime != null and request.createStartTime !=''">
+            AND DATE_FORMAT(ss.create_time,'%Y-%m-%d') &gt;= DATE_FORMAT(#{request.createStartTime},'%Y-%m-%d')
+        </if>
+        <if test="request.createEndTime != null and request.createEndTime !=''">
+            AND DATE_FORMAT(ss.create_time,'%Y-%m-%d')  &lt;= DATE_FORMAT(#{request.createEndTime},'%Y-%m-%d')
+        </if>
+        ORDER BY ss.create_time DESC
+    </select>
+
+    <select id="selectSignList" resultMap="BaseResultMap">
+        SELECT ss.*, sd.SIMPLE_NAME AS deptName
+        FROM system_sign ss
+        LEFT JOIN sys_user su ON su.id = ss.sign_user_id
+        LEFT JOIN sys_dept sd ON sd.id = su.dept_id
+        WHERE 1=1
+        <if test="request.signNo != null and request.signNo !=''">
+            AND ss.sign_no LIKE concat('%',#{request.signNo},'%')
+        </if>
+        <if test="request.signName != null and request.signName !=''">
+            AND ss.sign_name LIKE concat('%',#{request.signName},'%')
+        </if>
+        <if test="request.signDirector != null and request.signDirector !=''">
+            AND ss.sign_director LIKE concat('%',#{request.signDirector},'%')
+        </if>
+        <if test="request.signUserId != null and request.signUserId !=''">
+            AND ss.sign_user_id = #{request.signUserId}
+        </if>
+        <if test="request.createStartTime != null and request.createStartTime !=''">
+            AND DATE_FORMAT(ss.create_time,'%Y-%m-%d') &gt;= DATE_FORMAT(#{request.createStartTime},'%Y-%m-%d')
+        </if>
+        <if test="request.createEndTime != null and request.createEndTime !=''">
+            AND DATE_FORMAT(ss.create_time,'%Y-%m-%d')  &lt;= DATE_FORMAT(#{request.createEndTime},'%Y-%m-%d')
+        </if>
+        ORDER BY ss.create_time DESC
+    </select>
 </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 515050a..60f530b 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
@@ -47,8 +47,8 @@
     String STORAGE_LOCATION = "bizStorageLocation";
     //计量专业
     String MEASURE_MAJOR = "bizMeasureMajor";
-    //管理状态
-    String MANAGER_STATE = "bizManagerState";
+    //标准装置管理状态
+    String STANDARD_MANAGER_STATE = "bizStandardManagerState";
 
     /**
      * 资源管理 字典code
@@ -95,8 +95,6 @@
     String MEASURE_STATUS = "measureStatus";
     //检定方式
     String MEASURE_TYPE = "measureType";
-    //标识打印标志类型
-    String IDENTIFY_PRINT_TYPE = "bizBusinessIdentify";
     //变更类型
     String REPORT_CHANGE_TYPE = "bizCertChangeType";
     //规模类型
@@ -111,19 +109,24 @@
     String MEASURE_CATEGORY = "measureCategory";
     //检定结果
     String MEASURE_RESULT = "measureResult";
+    //分包原因
+    String OUTSOURCE_REASON = "outsourceReason";
+
+    /**
+     * 系统管理
+     */
+    String TEMPLATE_TYPE = "templateType";
+
 
     /**
      * 标准装置 字典code
      */
     //类别
     String STANDARD_CATEGORY = "standardCategory";
-    //管理状态
-    String STANDARD_MANAGER_STATE = "standardManagerState";
     //标准等级
     String STANDARD_LEVEL = "standardLevel";
     //传递范围
     String STANDARD_TRANSMIT_RANGE = "transmitRange";
-
     //资本来源
     String CAPITAL_SOURCE = "capitalSource";
     //标准装置-申请类型
@@ -148,8 +151,6 @@
     String CERTIFICATE_CLASS = "certificationClass";
     //证书管理-检校专业
     String CALIBRATION_MAJOR = "calibrationMajor";
-    //分包原因
-    String OUTSOURCE_REASON = "outsourceReason";
 
     /**
      * 工作台
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/BaseApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/BaseApprovalListRequest.java
index 73c12c1..80d7424 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/BaseApprovalListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/BaseApprovalListRequest.java
@@ -6,6 +6,7 @@
 
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotEmpty;
+import java.util.List;
 
 /**
  * @Description:
@@ -19,14 +20,14 @@
      * 表单id
      */
     @NotBlank(message = "表单id不能为空")
-    @ApiModelProperty(value = "表单id（流程定义对应的表单id，等价于业务id）", dataType = "String")
+    @ApiModelProperty(value = "表单id（流程定义对应的表单id，等价于业务id），导出接口不用传", dataType = "String")
     private String formId;
 
     /**
      * 审批状态类型，对应ApprovalStatusEnum
      */
     @NotEmpty(message = "审批状态类型不能为空")
-    @ApiModelProperty(value = "审批状态类型code", dataType = "String")
+    @ApiModelProperty(value = "审批状态类型code，导出接口不用传", dataType = "String")
     private String approvalStatus;
 
     @ApiModelProperty(hidden = true)
@@ -34,4 +35,7 @@
 
     @ApiModelProperty(hidden = true)
     private Long createUserId;
+
+    @ApiModelProperty(value = "导出ids", dataType = "List")
+    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificatePrintApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificatePrintApprovalListRequest.java
index b93d1c9..3cc2f4e 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificatePrintApprovalListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificatePrintApprovalListRequest.java
@@ -5,8 +5,6 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import java.util.List;
-
 /**
  * @Description:
  * @Author: wangpeng
@@ -38,7 +36,4 @@
 
     @ApiModelProperty(value = "创建结束时间", dataType = "String")
     private String createTimeEnd;
-
-    @ApiModelProperty(value = "导出ids", dataType = "List")
-    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportApprovalListRequest.java
index 4f7a038..c115847 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportApprovalListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportApprovalListRequest.java
@@ -5,8 +5,6 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import java.util.List;
-
 /**
  * @Description:
  * @Author: wangpeng
@@ -15,6 +13,8 @@
 @ApiModel
 @Data
 public class CertificateReportApprovalListRequest extends BaseApprovalListRequest {
+    @ApiModelProperty(value = "委托方id", dataType = "String")
+    private Long customerId;
 
     @ApiModelProperty(value = "证书报告编号", dataType = "String")
     private String certificateReportNo;
@@ -37,6 +37,4 @@
     @ApiModelProperty(value = "检校结束时间", dataType = "String")
     private String calibrationTimeEnd;
 
-    @ApiModelProperty(value = "导出ids", dataType = "List")
-    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/identify/IdentifyListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/identify/IdentifyListRequest.java
index 1b87ae6..f019203 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/identify/IdentifyListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/identify/IdentifyListRequest.java
@@ -4,6 +4,8 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * @Description:
  * @Author: wangpeng
@@ -26,4 +28,7 @@
 
     @ApiModelProperty(value = "打印结束时间", dataType = "String")
     private String createTimeEnd;
+
+    @ApiModelProperty(value = "导出ids", dataType = "List")
+    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListRequest.java
index 1264883..62415fb 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListRequest.java
@@ -7,6 +7,7 @@
 import lombok.Data;
 
 import javax.validation.constraints.NotBlank;
+import java.util.List;
 
 @Data
 @ApiModel
@@ -37,4 +38,6 @@
     @ApiModelProperty(value = "是否加急（1是0否null全部）", dataType = "Integer")
     private String isUrgent;
 
+    @ApiModelProperty(value = "导出ids", dataType = "List")
+    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListRequest.java
index 5201d7b..499760a 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListRequest.java
@@ -17,6 +17,9 @@
     @ApiModelProperty(value = "任务单编号", dataType = "String")
     private String orderNo;
 
+    @ApiModelProperty(value = "委托方id", dataType = "Long")
+    private Long customerId;
+
     @ApiModelProperty(value = "委托方名称", dataType = "String")
     private String customerName;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OrderSampleDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OrderSampleDTO.java
new file mode 100644
index 0000000..796edc0
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OrderSampleDTO.java
@@ -0,0 +1,19 @@
+package com.casic.missiles.dto.business.outsource;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/8/24 11:38
+ */
+@ApiModel
+@Data
+public class OrderSampleDTO {
+    @ApiModelProperty(value = "任务单id", dataType = "Long")
+    private Long orderId;
+    @ApiModelProperty(value = "受检设备id", dataType = "Long")
+    private Long sampleId;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceAssessApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceAssessApprovalListRequest.java
new file mode 100644
index 0000000..9a930c3
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceAssessApprovalListRequest.java
@@ -0,0 +1,30 @@
+package com.casic.missiles.dto.business.outsource;
+
+import com.casic.missiles.dto.BaseApprovalListRequest;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/8/24 11:01
+ */
+@ApiModel
+@Data
+public class OutsourceAssessApprovalListRequest extends BaseApprovalListRequest {
+    @ApiModelProperty(value = "评审表编号", dataType = "String")
+    private String projectNo;
+
+    @ApiModelProperty(value = "分包机构名称", dataType = "String")
+    private String outsourcerName;
+
+    @ApiModelProperty(value = "申请人", dataType = "String")
+    private String applicantName;
+
+    @ApiModelProperty(value = "申请时间开始", dataType = "String")
+    private String applicantTimeStart;
+
+    @ApiModelProperty(value = "申请时间结束", dataType = "String")
+    private String applicantTimeEnd;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceAssessSaveResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceAssessSaveResponse.java
new file mode 100644
index 0000000..8bf9aad
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceAssessSaveResponse.java
@@ -0,0 +1,20 @@
+package com.casic.missiles.dto.business.outsource;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/8/14 16:17
+ */
+@ApiModel
+@Data
+public class OutsourceAssessSaveResponse {
+    @ApiModelProperty(value = "主键id", dataType = "Long")
+    private Long id;
+
+    @ApiModelProperty(value = "编号", dataType = "String")
+    private String projectNo;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProtocolApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProtocolApprovalListRequest.java
new file mode 100644
index 0000000..0f32331
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProtocolApprovalListRequest.java
@@ -0,0 +1,30 @@
+package com.casic.missiles.dto.business.outsource;
+
+import com.casic.missiles.dto.BaseApprovalListRequest;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/8/24 15:01
+ */
+@ApiModel
+@Data
+public class OutsourceProtocolApprovalListRequest extends BaseApprovalListRequest {
+    @ApiModelProperty(value = "协议书编号", dataType = "String")
+    private String protocolNo;
+
+    @ApiModelProperty(value = "分包方名称", dataType = "String")
+    private String outsourcerName;
+
+    @ApiModelProperty(value = "申请人", dataType = "String")
+    private String applicantName;
+
+    @ApiModelProperty(value = "申请时间开始", dataType = "String")
+    private String applicantTimeStart;
+
+    @ApiModelProperty(value = "申请时间结束", dataType = "String")
+    private String applicantTimeEnd;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProtocolSaveResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProtocolSaveResponse.java
new file mode 100644
index 0000000..e324967
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProtocolSaveResponse.java
@@ -0,0 +1,20 @@
+package com.casic.missiles.dto.business.outsource;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/8/14 16:17
+ */
+@ApiModel
+@Data
+public class OutsourceProtocolSaveResponse {
+    @ApiModelProperty(value = "主键id", dataType = "Long")
+    private Long id;
+
+    @ApiModelProperty(value = "编号", dataType = "String")
+    private String protocolNo;
+}

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java
index bb0c50f..13a699b 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java
@@ -12,6 +12,7 @@
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.IGeneralApprovalService;
+import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
@@ -19,6 +20,7 @@
 import org.springframework.web.bind.annotation.RequestBody;
 
 import javax.validation.Valid;
+import java.util.List;
 import java.util.Objects;
 
 /**
@@ -117,4 +119,17 @@
         }
         return baseApprovalService.failUpdate(request);
     }
+
+    public List<O> exportList(@RequestBody @Valid R request) throws Exception {
+        List<O> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = baseApprovalService.listExportByIds(request.getIds());
+        } else {
+            list = baseApprovalService.listExport(request);
+        }
+        for (O record : list) {
+            DictCodeUtils.convertDictCodeToName(record);
+        }
+        return list;
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java
index 8a90961..d775831 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java
@@ -5,6 +5,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.business.certificate.CertificateChangeApplyApprovalListRequest;
 import com.casic.missiles.dto.business.certificate.CertificateChangeApplySaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessCertificateChangeApply;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
@@ -20,6 +21,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -48,4 +50,12 @@
         }
         return changeApplyService.saveChangeApply(request);
     }
+
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody CertificateChangeApplyApprovalListRequest request) throws Exception {
+        List<BizBusinessCertificateChangeApply> list = super.exportList(request);
+        super.exportExcel(BizBusinessCertificateChangeApply.class, list, ExportEnum.CERTIFICATE_CHANGE_APPLY.getSheetName());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java
index 5fc4b07..af8230e 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java
@@ -9,6 +9,7 @@
 import com.casic.missiles.dto.business.certificate.CertificatePrintApprovalListRequest;
 import com.casic.missiles.dto.business.certificate.CertificatePrintListResponse;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.enums.business.CertificatePrintStatusEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessCertificatePrintLog;
@@ -18,10 +19,16 @@
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.io.IOException;
+import java.util.List;
 import java.util.Objects;
 
 /**
@@ -98,4 +105,16 @@
         });
         return certificatePrintService.certificatePrintLog(idDTO.getId());
     }
+
+    @ApiOperation("证书打印审批导出")
+    @PostMapping("/listExport")
+    public void exportList(@RequestBody CertificatePrintApprovalListRequest request) throws IOException {
+        List<CertificatePrintListResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = certificatePrintService.listByIds(request.getIds());
+        } else {
+            list = certificatePrintService.list(request);
+        }
+        super.exportExcel(CertificatePrintListResponse.class, list, ExportEnum.CERTIFICATE_PRINT.getSheetName());
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java
index 63b06dc..6b2efd5 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java
@@ -6,6 +6,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.business.certificate.CertificateReportApprovalListRequest;
 import com.casic.missiles.dto.business.certificate.CertificateReportSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessCertificateReport;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
@@ -21,6 +22,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -50,7 +52,7 @@
         return certificateReportService.saveCertificateReport(request);
     }
 
-    @ApiOperation("证书审批详情（基本信息）")
+    @ApiOperation("详情（基本信息）")
     @PostMapping("/detail")
     public ReturnDTO<BizBusinessCertificateReport> detail(@RequestBody @Valid BaseDetailRequest request, BindingResult bindingResult) throws Exception {
         if(bindingResult.hasErrors()){
@@ -59,4 +61,11 @@
         return certificateReportService.detail(request);
     }
 
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody CertificateReportApprovalListRequest request) throws Exception {
+        List<BizBusinessCertificateReport> list = super.exportList(request);
+        super.exportExcel(BizBusinessCertificateReport.class, list, ExportEnum.CERTIFICATE_REPORT.getSheetName());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java
index 46b26bd..57c0809 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java
@@ -10,20 +10,21 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.business.identify.IdentifyListRequest;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessIdentifyInfo;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.business.IBizBusinessIdentifyInfoService;
+import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import javax.validation.Valid;
+import java.util.List;
 import java.util.Objects;
 
 /**
@@ -57,16 +58,13 @@
         return identifyInfoService.addIdentify(identifyInfo);
     }
 
-    @ApiOperation("标识打印更新")
+    @ApiOperation("标识打印更新（更新打印时间）")
     @PostMapping("/update")
-    public ReturnDTO updateIdentify(@RequestBody @Valid BizBusinessIdentifyInfo identifyInfo, BindingResult bindingResult) {
-        Assert.isFalse(Objects.isNull(identifyInfo.getId()), () -> {
+    public ReturnDTO updateIdentify(@RequestBody @Valid IdDTO idDTO) {
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        Assert.isFalse(bindingResult.hasErrors(), () -> {
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        });
-        return identifyInfoService.updateIdentify(identifyInfo);
+        return identifyInfoService.updateIdentify(idDTO.getId());
     }
 
     @ApiOperation("标识打印删除")
@@ -77,4 +75,37 @@
         });
         return identifyInfoService.deleteIdentify(idDTO.getId());
     }
+
+    @ApiOperation("标识打印导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody @Valid IdentifyListRequest request, BindingResult bindingResult) throws Exception {
+        if (bindingResult.hasErrors()) {
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        List<BizBusinessIdentifyInfo> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = identifyInfoService.listByIds(request.getIds());
+        } else {
+            list = identifyInfoService.list(request);
+        }
+        for (BizBusinessIdentifyInfo record : list) {
+            DictCodeUtils.convertDictCodeToName(record);
+        }
+        super.exportExcel(BizBusinessIdentifyInfo.class, list, ExportEnum.IDENTIFY_EXPORT.getSheetName());
+    }
+
+
+    // TODO: 2023/8/23 查询设备信息，4个底部按钮查设备（按钮的作用就是前端用来调不同接口、用来区分中间即将展示的标识），前端弹窗选设备，在确定保存时前端根据底部按钮判断传入设备类型deviceType字典code
+    // TODO: 2023/8/23 接口：查受检设备（第1个按钮），查设备台账（后3个按钮同一接口），查询之后前端根据标志类型的不同加到中间页面时进行判断（按产品给的对应表）
+    // TODO: 2023/8/23 提供二维码接口，前端在加到中间页面时调用一下
+
+    @ApiOperation("设备二维码")
+    @PostMapping("/equipment/qrCode")
+    public ReturnDTO<String> equipmentQrCode(@RequestBody @Valid IdDTO idDTO) {
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return identifyInfoService.equipmentQrCode(idDTO.getId());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java
index 707be6e..7e0453d 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java
@@ -117,7 +117,7 @@
     }
 
     @ApiOperation("任务单导出")
-    @PostMapping("/export")
+    @PostMapping("/listExport")
     public void orderExport(@RequestBody @Valid OrderListRequest request, HttpServletResponse response) {
         businessOrderService.orderExport(request, response);
     }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java
index 529a6ce..51432be 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java
@@ -1,9 +1,28 @@
 package com.casic.missiles.controller.business;
 
+import com.casic.missiles.controller.GeneralApprovalController;
+import com.casic.missiles.dto.BaseApprovalSubmitRequest;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.business.outsource.OutsourceAssessApprovalListRequest;
+import com.casic.missiles.dto.business.outsource.OutsourceAssessSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
+import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.model.business.BizBusinessOutsourceAssess;
+import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
+import com.casic.missiles.service.IGeneralApprovalService;
+import com.casic.missiles.service.business.IBizBusinessOutsourceAssessService;
 import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.BindingResult;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.validation.Valid;
+import java.util.List;
+
 /**
  * <p>
  * 计量检定业务-分包管理-测试、校准或检定工作分包评审表 前端控制器
@@ -15,6 +34,27 @@
 @Api(tags = "分包管理-测试、校准或检定工作分包评审表")
 @RestController
 @RequestMapping("/business/outsource/assess")
-public class BizBusinessOutsourceAssessController {
+public class BizBusinessOutsourceAssessController extends GeneralApprovalController<BizBusinessOutsourceAssess, BizBusinessOutsourceAssess, OutsourceAssessApprovalListRequest, BaseApprovalSubmitRequest> {
+    @Autowired
+    private IBizBusinessOutsourceAssessService outsourceAssessService;
 
+    public BizBusinessOutsourceAssessController(IGeneralApprovalService<BizBusinessOutsourceAssess, BizBusinessOutsourceAssess, OutsourceAssessApprovalListRequest, BaseApprovalSubmitRequest> baseApprovalService) {
+        super(baseApprovalService);
+    }
+
+    @ApiOperation("草稿箱-保存")
+    @PostMapping("/save")
+    public ReturnDTO<OutsourceAssessSaveResponse> saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceAssess request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        return outsourceAssessService.saveOutsourceAssess(request);
+    }
+
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception {
+        List<BizBusinessOutsourceAssess> list = super.exportList(request);
+        super.exportExcel(BizBusinessOutsourceAssess.class, list, ExportEnum.OUTSOURCE_ASSESS.getSheetName());
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java
new file mode 100644
index 0000000..9adef18
--- /dev/null
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java
@@ -0,0 +1,60 @@
+package com.casic.missiles.controller.business;
+
+import com.casic.missiles.controller.GeneralApprovalController;
+import com.casic.missiles.dto.BaseApprovalSubmitRequest;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.business.outsource.OutsourceProtocolApprovalListRequest;
+import com.casic.missiles.dto.business.outsource.OutsourceProtocolSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
+import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.model.business.BizBusinessOutsourceProtocol;
+import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
+import com.casic.missiles.service.IGeneralApprovalService;
+import com.casic.missiles.service.business.IBizBusinessOutsourceProtocolService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.BindingResult;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.validation.Valid;
+import java.util.List;
+
+/**
+ * <p>
+ * 计量检定业务-分包管理-测试、校准或检定工作分包协议书 前端控制器
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-08-24
+ */
+@Api(tags = "分包管理-测试、校准或检定工作分包协议书")
+@RestController
+@RequestMapping("/business/outsource/protocol")
+public class BizBusinessOutsourceProtocolController extends GeneralApprovalController<BizBusinessOutsourceProtocol, BizBusinessOutsourceProtocol, OutsourceProtocolApprovalListRequest, BaseApprovalSubmitRequest> {
+    @Autowired
+    private IBizBusinessOutsourceProtocolService outsourceProtocolService;
+
+    public BizBusinessOutsourceProtocolController(IGeneralApprovalService<BizBusinessOutsourceProtocol, BizBusinessOutsourceProtocol, OutsourceProtocolApprovalListRequest, BaseApprovalSubmitRequest> baseApprovalService) {
+        super(baseApprovalService);
+    }
+
+    @ApiOperation("草稿箱-保存")
+    @PostMapping("/save")
+    public ReturnDTO<OutsourceProtocolSaveResponse> saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceProtocol request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        return outsourceProtocolService.saveOutsourceProtocol(request);
+    }
+
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody OutsourceProtocolApprovalListRequest request) throws Exception {
+        List<BizBusinessOutsourceProtocol> list = super.exportList(request);
+        super.exportExcel(BizBusinessOutsourceProtocol.class, list, ExportEnum.OUTSOURCE_PROTOCOL.getSheetName());
+    }
+}
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java
index 097f645..f0f0943 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java
@@ -17,7 +17,6 @@
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.IGeneralApprovalService;
 import com.casic.missiles.service.business.IBizBusinessOutsourcerInfoService;
-import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -71,19 +70,8 @@
 
     @ApiOperation("分包方导出")
     @PostMapping("/listExport")
-    public void export(@RequestBody @Valid OutsourcerInfoApprovalListRequest request, BindingResult bindingResult) throws Exception {
-        if (bindingResult.hasErrors()) {
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        }
-        List<BizBusinessOutsourcerInfo> list;
-        if (!CollectionUtils.isEmpty(request.getIds())) {
-            list = outsourcerInfoService.listByIds(request.getIds());
-        } else {
-            list = outsourcerInfoService.list(request);
-        }
-        for (BizBusinessOutsourcerInfo record : list) {
-            DictCodeUtils.convertDictCodeToName(record);
-        }
+    public void export(@RequestBody OutsourcerInfoApprovalListRequest request) throws Exception {
+        List<BizBusinessOutsourcerInfo> list = super.exportList(request);
         super.exportExcel(BizBusinessOutsourcerInfo.class, list, ExportEnum.OUTSOURCER_EXPORT.getSheetName());
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java
index c2cbf9f..0410918 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java
@@ -17,11 +17,9 @@
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.IGeneralApprovalService;
 import com.casic.missiles.service.business.IBizBusinessSiteExecutiveInfoService;
-import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -60,7 +58,7 @@
         return siteExecutiveInfoService.saveSiteExecutiveInfo(siteExecutiveInfo);
     }
 
-    @ApiOperation("现场检测详情")
+    @ApiOperation("详情")
     @PostMapping("/detail")
     public ReturnDTO<SiteExecutiveDetailResponse> siteExecutiveDetail(@RequestBody @Valid IdDTO idDTO) throws Exception {
         Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
@@ -69,21 +67,10 @@
         return ReturnUtil.success(siteExecutiveInfoService.detail(idDTO.getId()));
     }
 
-    @ApiOperation("现场检测导出")
+    @ApiOperation("导出")
     @PostMapping("/listExport")
-    public void export(@RequestBody @Valid SiteExecutiveApprovalListRequest request, BindingResult bindingResult) throws Exception {
-        if (bindingResult.hasErrors()) {
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        }
-        List<SiteExecutiveApprovalListResponse> list;
-        if (!CollectionUtils.isEmpty(request.getIds())) {
-            list = siteExecutiveInfoService.listInfoByIds(request.getIds());
-        } else {
-            list = siteExecutiveInfoService.listInfo(request);
-        }
-        for (SiteExecutiveApprovalListResponse record : list) {
-            DictCodeUtils.convertDictCodeToName(record);
-        }
+    public void export(@RequestBody SiteExecutiveApprovalListRequest request) throws Exception {
+        List<SiteExecutiveApprovalListResponse> list = super.exportList(request);
         super.exportExcel(SiteExecutiveApprovalListResponse.class, list, ExportEnum.SITE_EXECUTIVE_EXPORT.getSheetName());
     }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
index 7e793cd..a92e209 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
@@ -55,7 +55,7 @@
 
     @ApiOperation("设备收发列表导出")
     @PostMapping("/export")
-    public void exportList(@RequestBody @Valid SampleDispatchListRequest request) throws IOException {
+    public void exportList(@RequestBody SampleDispatchListRequest request) throws IOException {
         List<SampleDispatchListResponse> list;
         if (!CollectionUtils.isEmpty(request.getIds())) {
             list = dispatchService.listByIds(request.getIds());
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java
index cdc77fc..d120fd4 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java
@@ -7,6 +7,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.business.labExecutive.*;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.business.IBusinessLabExecutiveInfoService;
@@ -14,6 +15,7 @@
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.*;
 
@@ -32,7 +34,7 @@
     @Autowired
     private IBusinessLabExecutiveInfoService labExecutiveInfoService;
 
-    @ApiOperation("实验室检测-部门检测-查询各状态列表（待检测、检测中、检测完）")
+    @ApiOperation("实验室任务-查询各状态列表（待检测、检测中、检测完）")
     @PostMapping("/deptExecutive/List")
     public ReturnDTO<PageInfoBT<SampleLabExecutiveListResponse>> queryDeptExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
@@ -43,10 +45,19 @@
         return ReturnUtil.success(super.packForBT(labExecutiveInfoService.deptLabExecutiveListPage(page, labExecutiveListRequest)));
     }
 
-    /**
-     * 实验室检测-我的检测-查询各状态列表（待检测、检测中、检测完）
-     */
-    @ApiOperation("实验室检测-我的检测-查询各状态列表（待检测、检测中、检测完）")
+    @ApiOperation("实验室任务导出")
+    @PostMapping("/deptExecutive/export")
+    public void deptExportList(@RequestBody @Valid SampleLabExecutiveListRequest request) throws Exception {
+        List<SampleLabExecutiveListResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = labExecutiveInfoService.deptLabExecutiveListByIds(request.getMeasureStatus(), request.getIds());
+        } else {
+            list = labExecutiveInfoService.deptLabExecutiveList(request);
+        }
+        super.exportExcel(SampleLabExecutiveListResponse.class, list, ExportEnum.DEPT_EXECUTIVE_TASK.getSheetName());
+    }
+
+    @ApiOperation("我的任务-查询各状态列表（待检测、检测中、检测完）")
     @PostMapping("/myExecutive/list")
     public ReturnDTO<PageInfoBT<SampleLabExecutiveListResponse>> queryMyExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
@@ -57,19 +68,25 @@
         return ReturnUtil.success(super.packForBT(labExecutiveInfoService.myLabExecutiveListPage(page, labExecutiveListRequest)));
     }
 
-    /**
-     * 实验室检测-我的检测-查询各状态样品数量（待检测、检测中、检测完）
-     */
-    @ApiOperation("实验室检测-我的检测-查询各状态样品数量（待检测、检测中、检测完）")
+    @ApiOperation("我的任务导出")
+    @PostMapping("/myExecutive/export")
+    public void exportList(@RequestBody @Valid SampleLabExecutiveListRequest request) throws Exception {
+        List<SampleLabExecutiveListResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = labExecutiveInfoService.myLabExecutiveListByIds(request.getMeasureStatus(), request.getIds());
+        } else {
+            list = labExecutiveInfoService.myLabExecutiveList(request);
+        }
+        super.exportExcel(SampleLabExecutiveListResponse.class, list, ExportEnum.MY_EXECUTIVE_TASK.getSheetName());
+    }
+
+    @ApiOperation("我的任务-查询各状态样品数量（待检测、检测中、检测完）")
     @GetMapping("/myExecutive/amount")
     public ReturnDTO<List<SampleAmountResponse>> queryMyExecutiveAmount() {
         return ReturnUtil.success(labExecutiveInfoService.myExecutiveAmount());
     }
 
-    /**
-     * 实验室检测-部门检测-分配（分配给具体人员）
-     */
-    @ApiOperation("实验室检测-部门检测-分配按钮（分配给具体人员）")
+    @ApiOperation("实验室任务-分配按钮（分配给具体人员）")
     @PostMapping("/deptExecutive/allocate")
     public ReturnDTO allocateStaff(@RequestBody @Valid SampleAllocateRequest sampleAllocateRequest, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -78,10 +95,7 @@
         return labExecutiveInfoService.allocateStaff(sampleAllocateRequest);
     }
 
-    /**
-     * 实验室检测-我的检测-检定人扫描收入（待检测->检测中）
-     */
-    @ApiOperation("实验室检测-我的检测-检定人扫描收入（待检测->检测中）")
+    @ApiOperation("我的任务-检定人扫描收入（待检测->检测中）")
     @PostMapping("/myExecutive/receive")
     public ReturnDTO sampleReceive(@RequestBody @Valid List<SampleOperateRequest> requestList, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -90,10 +104,7 @@
         return labExecutiveInfoService.sampleReceive(requestList);
     }
 
-    /**
-     * 实验室检测-负责人/检定人扫描检完（检测中->检测完）
-     */
-    @ApiOperation("实验室检测-负责人/检定人扫描检完（检测中->检测完）")
+    @ApiOperation("实验室任务-负责人/检定人扫描检完（检测中->检测完）")
     @PostMapping("/myExecutive/complete")
     public ReturnDTO sampleExecutiveComplete(@RequestBody @Valid List<SampleOperateRequest> requestList, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -102,10 +113,7 @@
         return labExecutiveInfoService.sampleExecutiveComplete(requestList);
     }
 
-    /**
-     * 实验室检测-部门检测/我的检测 编辑（只能修改应出具证书）
-     */
-    @ApiOperation("实验室检测-部门检测/我的检测 编辑（只能修改应出具证书）")
+    @ApiOperation("实验室任务/我的任务 编辑（只能修改应出具证书）")
     @PostMapping("/executive/update")
     public ReturnDTO updateExecutive(@RequestBody @Valid UpdateExecutiveRequest request, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -114,10 +122,7 @@
         return labExecutiveInfoService.updateExecutive(request);
     }
 
-    /**
-     * 实验室检测-部门检测/我的检测 详情
-     */
-    @ApiOperation("实验室检测-部门检测/我的检测 详情")
+    @ApiOperation("实验室任务/我的任务 详情")
     @PostMapping("/executive/detail")
     public ReturnDTO<ExecutiveDetailResponse> executiveDetail(@RequestBody @Valid ExecutiveDetailRequest request, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
@@ -131,7 +136,7 @@
      * 退回后会将下一个要执行的实验室检测状态更新为待分配，将后面的实验室顺序变更为连续（都进行减1）
      * 最后一个检测的实验室退回，等分发员再增加实验室或设备收发中的已收入直接手动点击完成
      */
-    @ApiOperation("实验室检测-部门检测/我的检测 退回（待检测/检测中->退回）")
+    @ApiOperation("实验室任务/我的任务 退回（待检测/检测中->退回）")
     @PostMapping("/executive/sendBack")
     public ReturnDTO executiveSendBack(@RequestBody @Valid ExecutiveSendBackRequest request, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -140,9 +145,6 @@
         return labExecutiveInfoService.sampleExecutiveSendBack(request);
     }
 
-    /**
-     * 分发员编辑实验室检测列表
-     */
     @ApiOperation("分发员编辑实验室检测列表")
     @PostMapping("/handOut/updateList")
     public ReturnDTO updateExecutiveList(@RequestBody @Valid UpdateExecutiveListRequest request, BindingResult bindingResult) {
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java
index 48a67ed..0c04f31 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java
@@ -10,6 +10,7 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.resource.customer.CustomerApprovalListRequest;
 import com.casic.missiles.dto.resource.customer.CustomerSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceCustomerInfo;
@@ -26,6 +27,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -55,6 +57,13 @@
         return customerInfoService.saveCustomerInfo(request);
     }
 
+    @ApiOperation("委托方名录导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody CustomerApprovalListRequest request) throws Exception {
+        List<BizResourceCustomerInfo> list = super.exportList(request);
+        super.exportExcel(BizResourceCustomerInfo.class, list, ExportEnum.CUSTOMER_INFO.getSheetName());
+    }
+
     @ApiOperation("委托方人员列表（分页）")
     @PostMapping("/person/listPage")
     public ReturnDTO<PageInfoBT<BizResourceCustomerStaff>> personListPage(@RequestBody IdDTO idDto) {
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
index 972ed4b..6418ea5 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
@@ -5,6 +5,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.resource.customer.SuggestFormApprovalListRequest;
 import com.casic.missiles.dto.resource.customer.SuggestFormSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceCustomerSuggestForm;
@@ -20,6 +21,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -50,4 +52,11 @@
         return suggestFormService.saveSuggestForm(request);
     }
 
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody SuggestFormApprovalListRequest request) throws Exception {
+        List<BizResourceCustomerSuggestForm> list = super.exportList(request);
+        super.exportExcel(BizResourceCustomerSuggestForm.class, list, ExportEnum.CUSTOMER_SUGGEST_FORM.getSheetName());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java
index 1934d1a..9e07eab 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java
@@ -15,12 +15,16 @@
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.resource.IEnvEnvironmentRecordConfigService;
 import com.casic.missiles.service.resource.IEnvEnvironmentRecordDataService;
+import com.casic.missiles.service.resource.IEnvLocationInfoService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
 import java.util.List;
@@ -39,6 +43,8 @@
     private IEnvEnvironmentRecordDataService environmentRecordDataService;
     @Autowired
     private IEnvEnvironmentRecordConfigService environmentRecordConfigService;
+    @Autowired
+    private IEnvLocationInfoService locationInfoService;
 
     @ApiOperation("环境记录单数据列表/详情")
     @PostMapping("/data/listPage")
@@ -95,4 +101,11 @@
         });
         return environmentRecordConfigService.deleteEnvironmentRecordConfig(idDTO.getId());
     }
+
+    @ApiOperation("地点列表")
+    @PostMapping("/location/listPage")
+    public ReturnDTO<PageInfoBT<LocationListResponse>> locationListPage(@RequestBody @Valid LocationListRequest request) {
+        Page<LocationListResponse> page = PageFactory.defaultPage();
+        return ReturnUtil.success(super.packForBT(locationInfoService.listPage(page, request)));
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java
index 82efe3f..e9561fa 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java
@@ -10,6 +10,7 @@
 import com.casic.missiles.dto.resource.seal.SealLogListRequest;
 import com.casic.missiles.dto.resource.seal.SealNoteApprovalListRequest;
 import com.casic.missiles.dto.resource.seal.SealNoteSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceSealUseLog;
@@ -27,6 +28,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -58,6 +60,13 @@
         return sealUseNoteService.saveSeal(request);
     }
 
+    @ApiOperation("印章使用登记导出（列表和导出中去掉经办人和监印人）")
+    @PostMapping("/listExport")
+    public void export(@RequestBody SealNoteApprovalListRequest request) throws Exception {
+        List<BizResourceSealUseNote> list = super.exportList(request);
+        super.exportExcel(BizResourceSealUseNote.class, list, ExportEnum.SEAL_NOTE.getSheetName());
+    }
+
     // TODO: 2023/7/28 印章使用日志：系统中使用印章时插入数据库
 
     @ApiOperation("印章使用日志列表（分页）")
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java
index 9b674fc..06b6521 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java
@@ -9,16 +9,20 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.resource.staff.StaffCertRequest;
 import com.casic.missiles.dto.resource.staff.StaffCertResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.service.resource.IBizResourceStaffInfoService;
 import com.casic.missiles.service.resource.IBizResourceStaffVerifierService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.List;
+
 /**
  * @Description:
  * @Author: wangpeng
@@ -41,9 +45,21 @@
         return ReturnUtil.success(super.packForBT(responsePage));
     }
 
+    @ApiOperation("证书逾期提醒导出")
+    @PostMapping("/listExport")
+    public void exportList(@RequestBody StaffCertRequest request) throws Exception {
+        List<StaffCertResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = staffInfoService.certListByIds(request.getIds());
+        } else {
+            list = staffInfoService.certList(request);
+        }
+        super.exportExcel(StaffCertResponse.class, list, ExportEnum.STAFF_CERTIFICATE_EXPIRE.getSheetName());
+    }
+
     @ApiOperation("证书逾期提醒")
     @PostMapping("/expirationReminder")
-    public ReturnDTO expirationReminder(@RequestBody IdDTO idDto) {
-        return verifierService.expirationReminder(idDto);
+    public ReturnDTO expirationReminder(@RequestBody IdDTO idDTO) {
+        return verifierService.expirationReminder(idDTO);
     }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java
index 3b251ad..a6e7850 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java
@@ -12,6 +12,7 @@
 import com.casic.missiles.dto.resource.staff.StaffListRequest;
 import com.casic.missiles.dto.resource.staff.TrainListRequest;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.*;
@@ -22,7 +23,10 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
 import java.util.List;
@@ -52,8 +56,19 @@
             throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
         }
         Page<BizResourceStaffInfo> page = PageFactory.defaultPage();
-        Page<BizResourceStaffInfo> responsePage = staffInfoService.listPage(page, request);
-        return ReturnUtil.success(super.packForBT(responsePage));
+        return ReturnUtil.success(super.packForBT(staffInfoService.listPage(page, request)));
+    }
+
+    @ApiOperation("人员登记导出")
+    @PostMapping("/listExport")
+    public void exportList(@RequestBody StaffListRequest request) throws Exception {
+        List<BizResourceStaffInfo> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = staffInfoService.listByIds(request.getIds());
+        } else {
+            list = staffInfoService.list(request);
+        }
+        super.exportExcel(BizResourceStaffInfo.class, list, ExportEnum.STAFF_INFO.getSheetName());
     }
 
     @ApiOperation("人员登记详情基础信息")
@@ -85,9 +100,9 @@
 
     @ApiOperation("科研教育列表（分页）")
     @PostMapping("/education/listPage")
-    public ReturnDTO<PageInfoBT<BizResourceStaffEducation>> educationListPage(@RequestBody IdDTO idDto) {
+    public ReturnDTO<PageInfoBT<BizResourceStaffEducation>> educationListPage(@RequestBody IdDTO idDTO) {
         Page<BizResourceStaffEducation> page = PageFactory.defaultPage();
-        Page<BizResourceStaffEducation> responsePage = staffInfoService.educationListPage(page, idDto);
+        Page<BizResourceStaffEducation> responsePage = staffInfoService.educationListPage(page, idDTO);
         return ReturnUtil.success(super.packForBT(responsePage));
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java
index af6aa86..d85d84a 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java
@@ -9,6 +9,7 @@
 import com.casic.missiles.dto.resource.outsideService.SupplierApprovalListRequest;
 import com.casic.missiles.dto.resource.outsideService.SupplierSaveResponse;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceSupplierAbility;
@@ -67,6 +68,13 @@
         return ReturnUtil.success(supplierInfoService.detail(idDTO.getId()));
     }
 
+    @ApiOperation("合格供方导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody SupplierApprovalListRequest request) throws Exception {
+        List<BizResourceSupplierInfo> list = super.exportList(request);
+        super.exportExcel(BizResourceSupplierInfo.class, list, ExportEnum.SUPPLIER_INFO.getSheetName());
+    }
+
     @ApiOperation("供方人员列表（分页）")
     @PostMapping("/person/listPage")
     public ReturnDTO<PageInfoBT<BizResourceSupplierPerson>> personListPage(@RequestBody IdDTO idDTO) {
diff --git a/casic-metering-api/src/main/resources/config/application.yml b/casic-metering-api/src/main/resources/config/application.yml
index 350db5f..ecff521 100644
--- a/casic-metering-api/src/main/resources/config/application.yml
+++ b/casic-metering-api/src/main/resources/config/application.yml
@@ -126,7 +126,7 @@
     #作者
     author: wangpeng
     #待生成对象表名
-    table-name: biz_equipment_technical_target_approval,biz_equipment_attachment_approval,biz_equipment_checkpoint_approval
+    table-name: biz_business_outsource_protocol
 
 reminder:
   #节点--common模块config包 ReminderNodeConfig配置
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
index 4a19e4e..d47d552 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
@@ -53,6 +53,7 @@
     SUGGEST_FORM_SAVE_FAILED(2509, "委托方意见登记表保存至草稿箱失败"),
     EXAMINE_FORM_SAVE_FAILED(2510, "要求、委托书及合同评审表保存至草稿箱失败"),
     CUSTOMER_EXIST_SAVE_FAILED(2511, "该委托方已存在，请重新选择"),
+    DUPLICATE_LOCATION_NO(2512, "地点编号已存在"),
 
     /**
      * 计量检定业务模块
@@ -68,6 +69,8 @@
     COMPLETE_SAMPLE_NOT_EXIST(2609, "检测中不存在扫描收入的样品"),
     CANNOT_CHANGE_MEASURE_INFO(2610, "无法更改非当前登录用户的检测信息"),
     NON_EXIST_ORDER_OR_SAMPLE(2611, "不存在该委托单或该委托单下的样品"),
+    OUTSOURCE_ACCESS_SAVE_FAILED(2612, "测试、校准或检定工作分包评审表保存至草稿箱失败"),
+    OUTSOURCE_PROTOCOL_SAVE_FAILED(2613, "测试、校准或检定工作分包协议书保存至草稿箱失败"),
 
     /**
      * 历史遗留备用
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
index 5089ad1..81a406b 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
@@ -10,54 +10,38 @@
     /**
      * 资源管理
      */
-    ENVIRONMENT_DATA_EXPORT("environmentData", "environmentData", "环境记录单数据"),
+    ENVIRONMENT_DATA_EXPORT("environmentData", "环境记录单数据", "环境记录单数据"),
+    STAFF_INFO("staffInfo", "人员登记", "人员登记"),
+    STAFF_CERTIFICATE_EXPIRE("certificateExpire", "证书逾期提醒", "证书逾期提醒"),
+    SUPPLIER_INFO("supplierInfo", "合格供方名录", "合格供方名录"),
+    CUSTOMER_INFO("customerInfo", "委托方名录", "委托方名录"),
+    CUSTOMER_SUGGEST_FORM("customerSuggestForm", "委托方意见登记表", "委托方意见登记表"),
+    SEAL_NOTE("sealNote", "印章使用登记", "印章使用登记"),
 
-    FILE_EXPORT("meterFileData", "meterFileData", "计量文件信息"),
-    TRAIN_PLAN_EXPORT("trainPlanData", "trainPlanData", "培训计划"),
-    TRAIN_LOG_EXPORT("trainLogData", "trainLogData", "培训记录"),
-    METER_ORGANIZE_EXPORT("meterOrganizeData", "meterOrganizeData", "计量组织"),
-    TRACE_SUPPLIER_EXPORT("traceSupplierData", "traceSupplierData", "溯源供方"),
-    SIGN_EXPORT("signData", "signData", "签名/签章"),
-    TEMPLATE_EXPORT("templateData", "templateData", "原始记录模板/证书报告模板"),
-    FIXED_ASSETS("meterFixedAssets", "meterFixedAssets", "固定资产"),
-    METER_EQUIPMENT("meterEquipment", "meterEquipment", "测量设备"),
-    CALIBRATION_TEST_EQUIPMENT("calibrationTestEquipment", "calibrationTestEquipment", "校准检定设备"),
-    MEASURE_ACCOUNT("measureAccount", "measureAccount", "测量工装"),
-    STANDARD_SUPPORT_EQUIPMENT("standardSupportEquipment", "standardSupportEquipment", "标准配套设备"),
-    STANDARD_EQUIPMENT("standardEquipment", "standardEquipment", "标准装置"),
-    FLOW_DEF_EXPORT("flowDefData", "flowDefData", "流程定义"),
-    STAFF_CERTIFICATE("certificate", "certificate", "计量人员证书"),
-    CHECK_INFO("checkInfo", "checkInfo", "设备管理点检测"),
-    EQUIPMENT_APPLY("equipmentApply", "equipmentApply", "设备借用"),
-    STANDARD_EQUIPMENT_REMIND("equipmentApplyRemind", "equipmentApplyRemind", "标准装置到期提醒"),
-    METER_PRICE("meterPrice", "meterPrice", "价格库"),
-    METER_STAFF("meterStaff", "meterStaff", "计量人员"),
-    STANDARD_EQUIPMENT_APPLY("standardEquipmentApply", "standardEquipmentApply", "标准装置申请"),
-    STATE_MANAGE_APPLY("stateManage", "stateManage", "状态管理"),
-    METER_ACCEPTANCE_CHECK("acceptanceCheck", "acceptanceCheck", "设备检修保养验收单"),
-    CUSTOMER_EXPORT("customerData", "customerData", "客户信息"),
-    ORDER_EXPORT("orderData", "orderData", "委托书信息"),
-    SAMPLE_EXPORT("sampleData", "sampleData", "样本信息"),
-    EXCHANGE_DATA("exchangeData", "exchangeData", "设备交接单"),
-    DISPATCH_DATA("dispatchData", "dispatchData", "设备收发"),
-    ENVIRONMENT_DATA("environmentData", "environmentData", "环境记录单"),
-    ORIGIN_DATA("originData", "originData", "原始记录"),
-    CERTIFICATE_REPORT("certificateReport", "certificateReport", "证书报告"),
-    ADVICE_EXPORT("adviceData", "adviceData", "客户反馈"),
-    HANDOUT_EXPORT("handoutData", "handoutData", "任务分发列表"),
-    OUTSOURCER_EXPORT("outsourcerData", "outsourcerData", "分包方"),
-    SITE_EXECUTIVE_EXPORT("siteExecutiveData", "siteExecutiveData", "现场测试、校准或检定"),
-    CERTIFICATE_PRINT_EXPORT("certificatePrintData", "certificatePrintData", "证书打印"),
-    DOWNLOAD_TEMPLATE("downloadTemplate", "downloadTemplate", "页面配置"),
-    OUTSOURCER_CERTIFICATE_EXPORT("outsourceCertificateData", "outsourceCertificateData", "分包证书"),
-    SETTLEMENT_INFO_EXPORT("settlementInfoData", "settlementInfoData", "业务结算"),
-    EQUIPMENT_REMIND("equipmentRemind", "equipmentRemind", "设备到期提醒"),
-    AGREEMENT_INFO_EXPORT("agreementInfoData", "agreementInfoData", "合同"),
-    WORK_STATISTICS_EXPORT("workStatisticsData", "workStatisticsData", "实时工作统计"),
-    DEPT_OUTPUT_EXPORT("deptOutputData", "deptOutputData", "部门产值分析"),
-    WORKLOAD_EXPORT("workloadData", "workloadData", "业务工作量分析"),
-    DEPT_COMPREHENSIVE_EXPORT("deptComprehensiveData", "deptComprehensiveData", "部门综合分析"),
-    ENVIRONMENTAL_RECORD("environmentalRecordData", "environmentalRecordData", "现场环境记录");
+    /**
+     * 计量检定业务
+     */
+    OUTSOURCER_EXPORT("outsourcerData", "分包方名录", "分包方名录"),
+    IDENTIFY_EXPORT("identifyData", "计量标识", "计量标识"),
+    ORDER_EXPORT("orderData", "任务单", "任务单"),
+    DISPATCH_DATA("dispatchData", "设备收发", "设备收发"),
+    HANDOUT_EXPORT("handoutData", "任务分发", "任务分发"),
+    SITE_EXECUTIVE_EXPORT("siteExecutiveData", "现场测试、校准或检定", "现场测试、校准或检定"),
+    CERTIFICATE_REPORT("certificateReport", "证书审批", "证书审批"),
+    CERTIFICATE_CHANGE_APPLY("certificateChangeApply", "证书报告补充或更换申请单", "证书报告补充或更换申请单"),
+    CERTIFICATE_PRINT("certificatePrintData", "证书打印审批", "证书打印审批"),
+    DEPT_EXECUTIVE_TASK("deptExecutiveTaskData", "实验室任务", "实验室任务"),
+    MY_EXECUTIVE_TASK("myExecutiveTaskData", "我的任务", "我的任务"),
+    OUTSOURCE_ASSESS("outsourceAssess", "测试、校准或检定工作分包评审表", "测试、校准或检定工作分包评审表"),
+    OUTSOURCE_PROTOCOL("outsourceProtocol", "测试、校准或检定工作分包协议书", "测试、校准或检定工作分包协议书"),
+
+    /**
+     * 系统管理
+     */
+    SIGN_EXPORT("signData", "签名", "签名"),
+    TEMPLATE_EXPORT("templateData", "文件模板", "文件模板"),
+    FLOW_DEF_EXPORT("flowDefData", "流程定义", "流程定义"),
+    DOWNLOAD_TEMPLATE("downloadTemplate", "流程定义", "页面配置");
 
     ExportEnum(String fileName, String sheetName, String description) {
         this.fileName = fileName;
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateRecordTypeCodeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateRecordTypeCodeEnum.java
index 31d913c..a963522 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateRecordTypeCodeEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateRecordTypeCodeEnum.java
@@ -46,4 +46,14 @@
     String SITE_EXECUTIVE_APPROVAL = "01";
     //《现场测试、校准或检定工作记录表》
     String SITE_EXECUTIVE_LOG = "02";
+
+    //测试、校准或检定工作分包协议书
+    String OUTSOURCE_PROTOCOL = "01";
+    //测试、校准或检定工作分包评审表
+    String OUTSOURCE_ACCESS = "02";
+    //测试、校准或检定工作分包通知书
+    String OUTSOURCE_NOTICE = "03";
+    //测试、校准或检定工作分包方名录
+    String OUTSOURCE_INFO = "04";
+
 }
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
index 24b8635..f78bd53 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
@@ -15,6 +15,10 @@
     String CERTIFICATE_CHANGE_APPLY_BEAN_NAME = "certificateChangeApplyBean";
     //现场测试、校准或检定
     String SITE_EXECUTIVE_BEAN_NAME = "siteExecutiveBean";
+    //测试、校准或检定工作分包评审表
+    String OUTSOURCE_ASSESS_BEAN_NAME = "outsourceAssessBean";
+    //测试、校准或检定工作分包协议书
+    String OUTSOURCE_PROTOCOL_BEAN_NAME = "outsourceProtocolBean";
 
     /*********************************设备与装置************************************/
     //设备台账
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 b21c661..6b86fd1 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
@@ -18,6 +18,8 @@
     OUTSOURCER_APPROVAL(OUTSOURCER_BEAN_NAME, ""),
     CERTIFICATE_CHANGE_APPROVAL(CERTIFICATE_CHANGE_APPLY_BEAN_NAME, ""),
     SITE_EXECUTIVE_APPROVAL(SITE_EXECUTIVE_BEAN_NAME, ""),
+    OUTSOURCE_ASSESS_APPROVAL(OUTSOURCE_ASSESS_BEAN_NAME, ""),
+    OUTSOURCE_PROTOCOL_APPROVAL(OUTSOURCE_PROTOCOL_BEAN_NAME, ""),
 
     ACTION_STATUS_MAP(new HashMap<String, AwareActionStatusEnum>() {
         {
@@ -47,6 +49,10 @@
             put(ApplyFromIdEnum.CERTIFICATE_CHANGE_APPROVAL.getCode(), CERTIFICATE_CHANGE_APPROVAL);
             //现场测试、校准或检定审批
             put(ApplyFromIdEnum.SITE_EXECUTIVE_APPROVAL.getCode(), SITE_EXECUTIVE_APPROVAL);
+            //测试、校准或检定工作分包评审表
+            put(ApplyFromIdEnum.OUTSOURCE_ASSESS_APPROVAL.getCode(), OUTSOURCE_ASSESS_APPROVAL);
+            //测试、校准或检定工作分包协议书
+            put(ApplyFromIdEnum.OUTSOURCE_PROTOCOL_APPROVAL.getCode(), OUTSOURCE_PROTOCOL_APPROVAL);
         }
     });
     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 934405e..c7410bd 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
@@ -9,6 +9,8 @@
     CERTIFICATE_CHANGE_APPROVAL("jljdywzsbchghsqd", MessageSourceModuleEnum.BUSINESS.getCode(), "证书/报告补充或更换申请单"),
     OUTSOURCER_APPROVAL("jljdywcsjzhgfbfml", MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定合格分包方名录"),
     SITE_EXECUTIVE_APPROVAL("jljdywxccsjzsp", MessageSourceModuleEnum.BUSINESS.getCode(), "现场测试、校准或检定审批"),
+    OUTSOURCE_ASSESS_APPROVAL("jljdywcsjzfbpsb", MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包评审表"),
+    OUTSOURCE_PROTOCOL_APPROVAL("jljdywcsjzfbxys", MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包协议书"),
 
 
     /*******************************************设备与装置*********************************************/
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/GeneralApprovalMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/GeneralApprovalMapper.java
index 4fb7344..0c9d6ae 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/GeneralApprovalMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/GeneralApprovalMapper.java
@@ -17,8 +17,4 @@
 
     Page<O> selectBatchForApprovalList(Page<O> page, @Param("request") R request, @Param("businessKeys") List<String> businessKeys);
 
-//    Page<O> selectListPage(Page<O> page, @Param("request") R request);
-
-//    Long selectMaxNo();
-
 }
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceAssessMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceAssessMapper.java
index 7867bb8..ba59009 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceAssessMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceAssessMapper.java
@@ -1,7 +1,12 @@
 package com.casic.missiles.mapper.business;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.business.outsource.OutsourceAssessApprovalListRequest;
+import com.casic.missiles.mapper.GeneralApprovalMapper;
 import com.casic.missiles.model.business.BizBusinessOutsourceAssess;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * <p>
@@ -11,6 +16,10 @@
  * @author wangpeng
  * @since 2023-08-16
  */
-public interface BizBusinessOutsourceAssessMapper extends BaseMapper<BizBusinessOutsourceAssess> {
+public interface BizBusinessOutsourceAssessMapper extends GeneralApprovalMapper<BizBusinessOutsourceAssess, BizBusinessOutsourceAssess, OutsourceAssessApprovalListRequest> {
+
+    Page<BizBusinessOutsourceAssess> selectBatchForApprovalList(Page<BizBusinessOutsourceAssess> page, @Param("request") OutsourceAssessApprovalListRequest request, @Param("businessKeys") List<String> businessKeys);
+
+    Long selectMaxProjectNo();
 
 }
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceProtocolMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceProtocolMapper.java
new file mode 100644
index 0000000..e6aba35
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceProtocolMapper.java
@@ -0,0 +1,24 @@
+package com.casic.missiles.mapper.business;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.business.outsource.OutsourceProtocolApprovalListRequest;
+import com.casic.missiles.mapper.GeneralApprovalMapper;
+import com.casic.missiles.model.business.BizBusinessOutsourceProtocol;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 计量检定业务-分包管理-测试、校准或检定工作分包协议书 Mapper 接口
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-08-24
+ */
+public interface BizBusinessOutsourceProtocolMapper extends GeneralApprovalMapper<BizBusinessOutsourceProtocol, BizBusinessOutsourceProtocol, OutsourceProtocolApprovalListRequest> {
+
+    Page<BizBusinessOutsourceProtocol> selectBatchForApprovalList(Page<BizBusinessOutsourceProtocol> page, @Param("request") OutsourceProtocolApprovalListRequest request, @Param("businessKeys") List<String> businessKeys);
+
+    Long selectMaxProtocolNo();
+}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/EnvLocationInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/EnvLocationInfoMapper.java
new file mode 100644
index 0000000..49eff87
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/EnvLocationInfoMapper.java
@@ -0,0 +1,21 @@
+package com.casic.missiles.mapper.resource;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.resource.environment.LocationListRequest;
+import com.casic.missiles.dto.resource.environment.LocationListResponse;
+import com.casic.missiles.model.resource.EnvLocationInfo;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * <p>
+ * 实验室环境监控系统-设备表 Mapper 接口
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-06-07
+ */
+public interface EnvLocationInfoMapper extends BaseMapper<EnvLocationInfo> {
+
+    Page<LocationListResponse> selectLocationListPage(Page<LocationListResponse> page, @Param("request") LocationListRequest request);
+}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java
index de124db..85ed0f7 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java
@@ -1,7 +1,9 @@
 package com.casic.missiles.mapper.system;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.dto.system.SignDetailResponse;
+import com.casic.missiles.dto.system.SignListRequest;
 import com.casic.missiles.model.system.SystemSign;
 import org.apache.ibatis.annotations.Param;
 
@@ -22,4 +24,8 @@
     SignDetailResponse selectSignDetailById(Long id);
 
     List<SystemSign> selectUsableSignList(@Param("userId") Long userId);
+
+    Page<SystemSign> selectSignListPage(Page<SystemSign> page, @Param("request") SignListRequest request);
+
+    List<SystemSign> selectSignList(@Param("request") SignListRequest request);
 }
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateChangeApplyMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateChangeApplyMapper.xml
index d798447..c496092 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateChangeApplyMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateChangeApplyMapper.xml
@@ -30,31 +30,31 @@
         SELECT *
         FROM biz_business_certificate_change_apply
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.changeApplyNo != null and request.changeApplyNo !=''">
+        <if test="request != null and request.changeApplyNo != null and request.changeApplyNo !=''">
             and change_apply_no like concat('%',#{request.changeApplyNo},'%')
         </if>
-        <if test="request.changeReportNo != null and request.changeReportNo !=''">
+        <if test="request != null and request.changeReportNo != null and request.changeReportNo !=''">
             and change_report_no like concat('%',#{request.changeReportNo},'%')
         </if>
-        <if test="request.changeReportName != null and request.changeReportName !=''">
+        <if test="request != null and request.changeReportName != null and request.changeReportName !=''">
             and change_report_name like concat('%',#{request.changeReportName},'%')
         </if>
-        <if test="request.changeType != null and request.changeType !=''">
+        <if test="request != null and request.changeType != null and request.changeType !=''">
             and change_type = #{request.changeType}
         </if>
-        <if test="request.createUserName != null and request.createUserName !=''">
+        <if test="request != null and request.createUserName != null and request.createUserName !=''">
             and create_user_name like concat('%',#{request.createUserName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificatePrintMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificatePrintMapper.xml
index b66cd99..49c0ac8 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificatePrintMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificatePrintMapper.xml
@@ -31,34 +31,34 @@
         LEFT JOIN biz_business_order_sample_relation bosr ON (bosr.order_id = bcr.order_id AND bosr.sample_id = bcr.sample_id)
         LEFT JOIN biz_business_order_info boi ON boi.id = bosr.order_id
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and bcp.approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.printStatus != null and request.printStatus !=''">
+        <if test="request != null and request.printStatus != null and request.printStatus !=''">
             and print_status = #{request.printStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and bcp.create_user_id = #{request.createUserId}
         </if>
-        <if test="request.certificateReportNo != null and request.certificateReportNo !=''">
+        <if test="request != null and request.certificateReportNo != null and request.certificateReportNo !=''">
             and bcr.certificate_report_no like concat('%',#{request.certificateReportNo},'%')
         </if>
-        <if test="request.certificateReportName != null and request.certificateReportName !=''">
+        <if test="request != null and request.certificateReportName != null and request.certificateReportName !=''">
             and bcr.certificate_report_name like concat('%',#{request.certificateReportName},'%')
         </if>
-        <if test="request.customerName != null and request.customerName !=''">
+        <if test="request != null and request.customerName != null and request.customerName !=''">
             and boi.customer_name like concat('%',#{request.customerName},'%')
         </if>
-        <if test="request.sampleNo != null and request.sampleNo !=''">
+        <if test="request != null and request.sampleNo != null and request.sampleNo !=''">
             and bosr.sample_no like concat('%',#{request.sampleNo},'%')
         </if>
-        <if test="request.sampleName != null and request.sampleName !=''">
+        <if test="request != null and request.sampleName != null and request.sampleName !=''">
             and bosr.sample_name like concat('%',#{request.sampleName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and bcp.create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and bcp.create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml
index b366034..767695d 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml
@@ -46,33 +46,37 @@
         SELECT bcr.*, bosr.sample_no, bosr.sample_name, bosr.sample_model, rsi.staff_name
         FROM biz_business_certificate_report bcr
         LEFT JOIN biz_business_order_sample_relation bosr ON (bosr.order_id = bcr.order_id AND bosr.sample_id = bcr.sample_id)
+        LEFT JOIN biz_business_order_info boi ON boi.id = bcr.order_id
         LEFT JOIN biz_resource_staff_info rsi ON rsi.id = bcr.measure_person_id
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and bcr.approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and bcr.create_user_id = #{request.createUserId}
         </if>
-        <if test="request.certificateReportNo != null and request.certificateReportNo !=''">
+        <if test="request != null and request.customerId != null and request.customerId !=''">
+            and boi.customer_id = #{request.customerId}
+        </if>
+        <if test="request != null and request.certificateReportNo != null and request.certificateReportNo !=''">
             and bcr.certificate_report_no like concat('%',#{request.certificateReportNo},'%')
         </if>
-        <if test="request.certificateReportName != null and request.certificateReportName !=''">
+        <if test="request != null and request.certificateReportName != null and request.certificateReportName !=''">
             and bcr.certificate_report_name like concat('%',#{request.certificateReportName},'%')
         </if>
-        <if test="request.sampleNo != null and request.sampleNo !=''">
+        <if test="request != null and request.sampleNo != null and request.sampleNo !=''">
             and bosr.sample_no like concat('%',#{request.sampleNo},'%')
         </if>
-        <if test="request.measureCategory != null and request.measureCategory !=''">
+        <if test="request != null and request.measureCategory != null and request.measureCategory !=''">
             and bcr.measure_category = #{request.measureCategory}
         </if>
-        <if test="request.measurePerson != null and request.measurePerson !=''">
+        <if test="request != null and request.measurePerson != null and request.measurePerson !=''">
             and rsi.staff_name like concat('%',#{request.measurePerson},'%')
         </if>
-        <if test="request.calibrationTimeStart != null and request.calibrationTimeStart !=''">
+        <if test="request != null and request.calibrationTimeStart != null and request.calibrationTimeStart !=''">
             and bcr.calibration_time &gt;= #{request.calibrationTimeStart}
         </if>
-        <if test="request.calibrationTimeEnd != null and request.calibrationTimeEnd !=''">
+        <if test="request != null and request.calibrationTimeEnd != null and request.calibrationTimeEnd !=''">
             and bcr.calibration_time &lt;= #{request.calibrationTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceAssessMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceAssessMapper.xml
index d0fcf8b..c22c101 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceAssessMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceAssessMapper.xml
@@ -7,6 +7,8 @@
         <id column="id" property="id" />
         <result column="project_no" property="projectNo" />
         <result column="project_name" property="projectName" />
+        <result column="lab_code" property="labCode" />
+        <result column="group_code" property="groupCode" />
         <result column="applicant_id" property="applicantId" />
         <result column="applicant_name" property="applicantName" />
         <result column="applicant_time" property="applicantTime" />
@@ -31,7 +33,45 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, project_no, project_name, applicant_id, applicant_name, applicant_time, minio_file_name, remark, create_user_id, create_user_name, outsourcer_id, pre_start_time, pre_end_time, outsource_reason, pre_cost, approval_status, process_id, approve_situation, traceability, test_method, technique_ability, create_time, update_time
+        id, project_no, project_name, lab_code, group_code, applicant_id, applicant_name, applicant_time, minio_file_name, remark, create_user_id, create_user_name, outsourcer_id, pre_start_time, pre_end_time, outsource_reason, pre_cost, approval_status, process_id, approve_situation, traceability, test_method, technique_ability, create_time, update_time
     </sql>
 
+    <select id="selectMaxProjectNo" resultType="java.lang.Long">
+        SELECT IFNULL(max(RIGHT(project_no, 3)), 0) from biz_business_outsource_assess
+    </select>
+
+    <select id="selectBatchForApprovalList" resultMap="BaseResultMap">
+        SELECT bboa.*, bboi.outsourcer_name, bboi.director
+        FROM biz_business_outsource_assess bboa
+        LEFT JOIN biz_business_outsourcer_info bboi ON bboa.outsourcer_id = bboi.id
+        WHERE 1=1
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
+            and bboa.approval_status = #{request.approvalStatus}
+        </if>
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
+            and bboa.create_user_id = #{request.createUserId}
+        </if>
+        <if test="request != null and request.projectNo != null and request.projectNo !=''">
+            and bboa.project_no like concat('%',#{request.projectNo},'%')
+        </if>
+        <if test="request != null and request.outsourcerName != null and request.outsourcerName !=''">
+            and bboi.outsourcer_name like concat('%',#{request.outsourcerName},'%')
+        </if>
+        <if test="request != null and request.applicantName != null and request.applicantName !=''">
+            and bboa.applicant_name like concat('%',#{request.applicantName},'%')
+        </if>
+        <if test="request != null and request.applicantTimeStart != null and request.applicantTimeStart !=''">
+            and bboa.applicant_time &gt;= #{request.applicantTimeStart}
+        </if>
+        <if test="request != null and request.applicantTimeEnd != null and request.applicantTimeEnd !=''">
+            and bboa.applicant_time &lt;= #{request.applicantTimeEnd}
+        </if>
+        <if test="businessKeys != null">
+            and bboa.id in
+            <foreach collection="businessKeys" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
+        ORDER BY bboa.create_time DESC
+    </select>
 </mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceProtocolMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceProtocolMapper.xml
new file mode 100644
index 0000000..b7b2149
--- /dev/null
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceProtocolMapper.xml
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.mapper.business.BizBusinessOutsourceProtocolMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.business.BizBusinessOutsourceProtocol">
+        <id column="id" property="id" />
+        <result column="protocol_no" property="protocolNo" />
+        <result column="project_name" property="projectName" />
+        <result column="lab_code" property="labCode" />
+        <result column="group_code" property="groupCode" />
+        <result column="outsourcer_id" property="outsourcerId" />
+        <result column="remark" property="remark" />
+        <result column="outsource_no" property="outsourceNo" />
+        <result column="outsource_name" property="outsourceName" />
+        <result column="contacts" property="contacts" />
+        <result column="mobile" property="mobile" />
+        <result column="address" property="address" />
+        <result column="require_date" property="requireDate" />
+        <result column="outsource_cost" property="outsourceCost" />
+        <result column="director" property="director" />
+        <result column="item" property="item" />
+        <result column="requires" property="requires" />
+        <result column="create_user_id" property="createUserId" />
+        <result column="create_user_name" property="createUserName" />
+        <result column="approval_status" property="approvalStatus" />
+        <result column="process_id" property="processId" />
+        <result column="create_time" property="createTime" />
+        <result column="update_time" property="updateTime" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, protocol_no, project_name, lab_code, group_code, outsourcer_id, remark, outsource_no, outsource_name, contacts, mobile, address, require_date, outsource_cost, director, item, requires, create_user_id, create_user_name, approval_status, process_id, create_time, update_time
+    </sql>
+
+    <select id="selectMaxProtocolNo" resultType="java.lang.Long">
+        SELECT IFNULL(max(RIGHT(protocol_no, 3)), 0) from biz_business_outsource_protocol
+    </select>
+
+    <select id="selectBatchForApprovalList" resultMap="BaseResultMap">
+        SELECT *
+        FROM biz_business_outsource_protocol
+        WHERE 1=1
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
+            and approval_status = #{request.approvalStatus}
+        </if>
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
+            and create_user_id = #{request.createUserId}
+        </if>
+        <if test="request != null and request.protocolNo != null and request.protocolNo !=''">
+            and protocol_no like concat('%',#{request.protocolNo},'%')
+        </if>
+        <if test="request != null and request.outsourcerName != null and request.outsourcerName !=''">
+            and outsourcer_name like concat('%',#{request.outsourcerName},'%')
+        </if>
+        <if test="request != null and request.applicantName != null and request.applicantName !=''">
+            and create_user_name like concat('%',#{request.applicantName},'%')
+        </if>
+        <if test="request != null and request.applicantTimeStart != null and request.applicantTimeStart !=''">
+            and create_time &gt;= #{request.applicantTimeStart}
+        </if>
+        <if test="request != null and request.applicantTimeEnd != null and request.applicantTimeEnd !=''">
+            and create_time &lt;= #{request.applicantTimeEnd}
+        </if>
+        <if test="businessKeys != null">
+            and id in
+            <foreach collection="businessKeys" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
+        ORDER BY create_time DESC
+    </select>
+</mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourcerInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourcerInfoMapper.xml
index 510a80b..3049b54 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourcerInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourcerInfoMapper.xml
@@ -7,6 +7,8 @@
         <id column="id" property="id" />
         <result column="outsourcer_no" property="outsourcerNo" />
         <result column="outsourcer_name" property="outsourcerName" />
+        <result column="lab_code" property="labCode" />
+        <result column="group_code" property="groupCode" />
         <result column="outsourcer_brief_name" property="outsourcerBriefName" />
         <result column="outsourcer_size" property="outsourcerSize" />
         <result column="business_size" property="businessSize" />
@@ -55,32 +57,32 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, outsourcer_no, outsourcer_name, outsourcer_brief_name, outsourcer_size, business_size, grade, evaluation, tax_number, bank_account, bank_name, bank_account_number, postal_code, director, phone, fax, mobile, email, website, address_country, address_province, address_city, address_area, full_address, address_country_name, address_province_name, address_city_name, address_area_name, invoice_country, invoice_province, invoice_city, invoice_area, invoice_full_address, invoice_country_name, invoice_province_name, invoice_city_name, invoice_area_name, business_scope, business_content, minio_file_name, approval_status, process_id, remark, create_user_id, create_user_name, create_time, update_time
+        id, outsourcer_no, outsourcer_name, lab_code, group_code, outsourcer_brief_name, outsourcer_size, business_size, grade, evaluation, tax_number, bank_account, bank_name, bank_account_number, postal_code, director, phone, fax, mobile, email, website, address_country, address_province, address_city, address_area, full_address, address_country_name, address_province_name, address_city_name, address_area_name, invoice_country, invoice_province, invoice_city, invoice_area, invoice_full_address, invoice_country_name, invoice_province_name, invoice_city_name, invoice_area_name, business_scope, business_content, minio_file_name, approval_status, process_id, remark, create_user_id, create_user_name, create_time, update_time
     </sql>
 
     <select id="selectBatchForApprovalList" resultMap="BaseResultMap">
         SELECT *
         FROM biz_business_outsourcer_info
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.outsourcerNo != null and request.outsourcerNo !=''">
+        <if test="request != null and request.outsourcerNo != null and request.outsourcerNo !=''">
             and outsourcer_no like concat('%',#{request.outsourcerNo},'%')
         </if>
-        <if test="request.outsourcerName != null and request.outsourcerName !=''">
+        <if test="request != null and request.outsourcerName != null and request.outsourcerName !=''">
             and outsourcer_name like concat('%',#{request.outsourcerName},'%')
         </if>
-        <if test="request.director != null and request.director !=''">
+        <if test="request != null and request.director != null and request.director !=''">
             and director like concat('%',#{request.director},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
@@ -93,6 +95,6 @@
     </select>
 
     <select id="selectMaxNo" resultType="java.lang.Long">
-        SELECT IFNULL(max(RIGHT(outsourcer_no, 12)), 0) from biz_business_outsourcer_info
+        SELECT IFNULL(max(RIGHT(outsourcer_no, 3)), 0) from biz_business_outsourcer_info
     </select>
 </mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessSiteExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessSiteExecutiveInfoMapper.xml
index 135c5d0..3c5ae79 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessSiteExecutiveInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessSiteExecutiveInfoMapper.xml
@@ -38,25 +38,25 @@
         FROM biz_business_site_executive_info bsei
         LEFT JOIN biz_resource_customer_info rci ON bsei.customer_id = rci.id
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and bsei.approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and bsei.create_user_id = #{request.createUserId}
         </if>
-        <if test="request.siteExecutiveNo != null and request.siteExecutiveNo !=''">
+        <if test="request != null and request.siteExecutiveNo != null and request.siteExecutiveNo !=''">
             and bsei.site_executive_no like concat('%',#{request.siteExecutiveNo},'%')
         </if>
-        <if test="request.customerName != null and request.customerName !=''">
+        <if test="request != null and request.customerName != null and request.customerName !=''">
             and rci.outsourcer_name like concat('%',#{request.customerName},'%')
         </if>
-        <if test="request.applyName != null and request.applyName !=''">
+        <if test="request != null and request.applyName != null and request.applyName !=''">
             and bsei.apply_name like concat('%',#{request.applyName},'%')
         </if>
-        <if test="request.applyTimeStart != null and request.applyTimeStart !=''">
+        <if test="request != null and request.applyTimeStart != null and request.applyTimeStart !=''">
             and bsei.apply_time &gt;= #{request.applyTimeStart}
         </if>
-        <if test="request.applyTimeEnd != null and request.applyTimeEnd !=''">
+        <if test="request != null and request.applyTimeEnd != null and request.applyTimeEnd !=''">
             and bsei.apply_time &lt;= #{request.applyTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml
index 84d9e2a..6bd38a9 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml
@@ -105,6 +105,12 @@
         <if test="request.isUrgent != null and request.isUrgent !=''">
             AND bo.is_urgent = #{request.isUrgent}
         </if>
+        <if test="request.ids != null">
+            and blei.id in
+            <foreach collection="request.ids" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
         ORDER BY blei.update_time DESC
     </select>
 
@@ -137,6 +143,12 @@
         <if test="request.isUrgent != null and request.isUrgent !=''">
             AND bo.is_urgent = #{request.isUrgent}
         </if>
+        <if test="request.ids != null">
+            and blei.id in
+            <foreach collection="request.ids" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
         ORDER BY blei.update_time DESC
     </select>
 
diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardInfoMapper.xml
index 1a5551b..2ed8d17 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardInfoMapper.xml
@@ -45,12 +45,6 @@
         FROM biz_equipment_standard_info besi
         LEFT JOIN biz_equipment_standard_technology_relation bestr ON besi.standard_no = bestr.standard_no
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
-            and besi.approval_status = #{request.approvalStatus}
-        </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
-            and besi.create_user_id = #{request.createUserId}
-        </if>
         <if test="request.standardName != null and request.standardName !=''">
             and besi.standard_name like concat('%',#{request.standardName},'%')
         </if>
diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardTechnologyRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardTechnologyRelationMapper.xml
index fc7e16c..cd03c8c 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardTechnologyRelationMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardTechnologyRelationMapper.xml
@@ -6,6 +6,7 @@
     <resultMap id="BaseResultMap" type="com.casic.missiles.model.equipment.BizEquipmentStandardTechnologyRelation">
         <id column="id" property="id" />
         <result column="technology_file_id" property="technologyFileId" />
+        <result column="technology_file_no" property="technologyFileNo" />
         <result column="technology_file_name" property="technologyFileName" />
         <result column="standard_id" property="standardId" />
         <result column="standard_no" property="standardNo" />
@@ -14,7 +15,7 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, technology_file_id, technology_file_name, standard_id, remark
+        id, technology_file_id, technology_file_no, technology_file_name, standard_id, remark
     </sql>
 
 </mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceAuthorizeOrderMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceAuthorizeOrderMapper.xml
index ac5176c..554fe65 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceAuthorizeOrderMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceAuthorizeOrderMapper.xml
@@ -32,22 +32,22 @@
         SELECT *
         FROM biz_resource_authorize_order
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.orderNo != null and request.orderNo !=''">
+        <if test="request != null and request.orderNo != null and request.orderNo !=''">
             and order_no like concat('%',#{request.orderNo},'%')
         </if>
-        <if test="request.createUserName != null and request.createUserName !=''">
+        <if test="request != null and request.createUserName != null and request.createUserName !=''">
             and create_user_name like concat('%',#{request.createUserName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerExamineFormMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerExamineFormMapper.xml
index ab242f6..af7f98f 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerExamineFormMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerExamineFormMapper.xml
@@ -41,28 +41,28 @@
         SELECT *
         FROM biz_resource_customer_examine_form
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.formNo != null and request.formNo !=''">
+        <if test="request != null and request.formNo != null and request.formNo !=''">
             and form_no like concat('%',#{request.formNo},'%')
         </if>
-        <if test="request.labCode != null and request.labCode !=''">
+        <if test="request != null and request.labCode != null and request.labCode !=''">
             and lab_code like concat('%',#{request.labCode},'%')
         </if>
-        <if test="request.groupCode != null and request.groupCode !=''">
+        <if test="request != null and request.groupCode != null and request.groupCode !=''">
             and group_code like concat('%',#{request.groupCode},'%')
         </if>
-        <if test="request.createUserName != null and request.createUserName !=''">
+        <if test="request != null and request.createUserName != null and request.createUserName !=''">
             and create_user_name like concat('%',#{request.createUserName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerInfoMapper.xml
index fa8ffbc..06a2798 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerInfoMapper.xml
@@ -33,25 +33,25 @@
         SELECT *
         FROM biz_resource_customer_info
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.customerNo != null and request.customerNo !=''">
+        <if test="request != null and request.customerNo != null and request.customerNo !=''">
             and customer_no like concat('%',#{request.customerNo},'%')
         </if>
-        <if test="request.customerName != null and request.customerName !=''">
+        <if test="request != null and request.customerName != null and request.customerName !=''">
             and customer_name like concat('%',#{request.customerName},'%')
         </if>
-        <if test="request.contacts != null and request.contacts !=''">
+        <if test="request != null and request.contacts != null and request.contacts !=''">
             and contacts like concat('%',#{request.contacts},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerSuggestFormMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerSuggestFormMapper.xml
index 28f5bb2..1806662 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerSuggestFormMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerSuggestFormMapper.xml
@@ -33,28 +33,28 @@
         SELECT *
         FROM biz_resource_customer_suggest_form
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.formNo != null and request.formNo !=''">
+        <if test="request != null and request.formNo != null and request.formNo !=''">
             and form_no like concat('%',#{request.formNo},'%')
         </if>
-        <if test="request.customerName != null and request.customerName !=''">
+        <if test="request != null and request.customerName != null and request.customerName !=''">
             and customer_name like concat('%',#{request.customerName},'%')
         </if>
-        <if test="request.customerDeptName != null and request.customerDeptName !=''">
+        <if test="request != null and request.customerDeptName != null and request.customerDeptName !=''">
             and customer_dept_name like concat('%',#{request.customerDeptName},'%')
         </if>
-        <if test="request.createUserName != null and request.createUserName !=''">
+        <if test="request != null and request.createUserName != null and request.createUserName !=''">
             and create_user_name like concat('%',#{request.createUserName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSealUseNoteMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSealUseNoteMapper.xml
index ab37bc1..b02bb33 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSealUseNoteMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSealUseNoteMapper.xml
@@ -29,32 +29,32 @@
     </sql>
 
     <select id="selectBatchForApprovalList" resultMap="BaseResultMap">
-        SELECT *
+        SELECT brsun.*, brsi.seal_name, brsi.seal_type, brsi.approver_name
         FROM biz_resource_seal_use_note brsun
         JOIN biz_resource_seal_info brsi ON brsun.seal_id = brsi.id
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and brsun.approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and brsun.create_user_id = #{request.createUserId}
         </if>
-        <if test="request.sealName != null and request.sealName !=''">
+        <if test="request != null and request.sealName != null and request.sealName !=''">
             and brsi.seal_name like concat('%',#{request.sealName},'%')
         </if>
-        <if test="request.sealType != null and request.sealType !=''">
+        <if test="request != null and request.sealType != null and request.sealType !=''">
             and brsi.seal_type = #{request.sealType}
         </if>
-        <if test="request.applyDeptName != null and request.applyDeptName !=''">
+        <if test="request != null and request.applyDeptName != null and request.applyDeptName !=''">
             and brsun.apply_dept_name like concat('%',#{request.applyDeptName},'%')
         </if>
-        <if test="request.applyUserName != null and request.applyUserName !=''">
+        <if test="request != null and request.applyUserName != null and request.applyUserName !=''">
             and brsun.apply_user_name like concat('%',#{request.applyUserName},'%')
         </if>
-        <if test="request.applyTimeStart != null and request.applyTimeStart !=''">
+        <if test="request != null and request.applyTimeStart != null and request.applyTimeStart !=''">
             and brsun.apply_time &gt;= #{request.applyTimeStart}
         </if>
-        <if test="request.applyTimeEnd != null and request.applyTimeEnd !=''">
+        <if test="request != null and request.applyTimeEnd != null and request.applyTimeEnd !=''">
             and brsun.apply_time &lt;= #{request.applyTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml
index 119bf7d..4f8392a 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml
@@ -31,6 +31,12 @@
         <if test="request.deptName != null and request.deptName !=''">
             and brsi.dept_name like concat('%',#{request.deptName},'%')
         </if>
+        <if test="request.ids != null">
+            and brsv.id in
+            <foreach collection="request.ids" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
         ORDER BY brsv.grant_date DESC
     </select>
 
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSupplierInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSupplierInfoMapper.xml
index fe8d399..e8ce7ef 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSupplierInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSupplierInfoMapper.xml
@@ -48,28 +48,28 @@
         SELECT *
         FROM biz_resource_supplier_info
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.supplierNo != null and request.supplierNo !=''">
+        <if test="request != null and request.supplierNo != null and request.supplierNo !=''">
             and supplier_no like concat('%',#{request.supplierNo},'%')
         </if>
-        <if test="request.supplierName != null and request.supplierName !=''">
+        <if test="request != null and request.supplierName != null and request.supplierName !=''">
             and supplier_name like concat('%',#{request.supplierName},'%')
         </if>
-        <if test="request.director != null and request.director !=''">
+        <if test="request != null and request.director != null and request.director !=''">
             and director like concat('%',#{request.director},'%')
         </if>
-        <if test="request.supplierType != null and request.supplierType !=''">
+        <if test="request != null and request.supplierType != null and request.supplierType !=''">
             and supplier_type = #{request.supplierType}
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/EnvLocationInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/EnvLocationInfoMapper.xml
new file mode 100644
index 0000000..68bcf10
--- /dev/null
+++ b/casic-metering-dao/src/main/resources/mapper/resource/EnvLocationInfoMapper.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.mapper.resource.EnvLocationInfoMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.resource.EnvLocationInfo">
+        <id column="id" property="id" />
+        <result column="location_no" property="locationNo" />
+        <result column="location_name" property="locationName" />
+        <result column="location_position" property="locationPosition" />
+        <result column="create_user_id" property="createUserId" />
+        <result column="create_user" property="createUser" />
+        <result column="create_time" property="createTime" />
+        <result column="update_time" property="updateTime" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, location_no, location_name, location_position, create_user_id, create_user, create_time, update_time
+    </sql>
+
+    <select id="selectLocationListPage" resultType="com.casic.missiles.dto.resource.environment.LocationListResponse">
+        SELECT *
+        FROM env_location_info
+        WHERE 1=1
+        <if test="request.locationNo != null and request.locationNo !=''">
+            AND location_no LIKE concat('%',#{request.locationNo},'%')
+        </if>
+        <if test="request.locationName != null and request.locationName !=''">
+            AND location_name LIKE concat('%',#{request.locationName},'%')
+        </if>
+        ORDER BY create_time DESC
+    </select>
+
+</mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml
index b28c18f..8854047 100644
--- a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml
@@ -11,7 +11,6 @@
         <result column="sign_desc" property="signDesc" />
         <result column="sign_director" property="signDirector" />
         <result column="sign_user_id" property="signUserId" />
-        <result column="sign_type" property="signType" />
         <result column="minio_file_name" property="minioFileName" />
         <result column="create_time" property="createTime" />
         <result column="update_time" property="updateTime" />
@@ -28,7 +27,6 @@
         <result column="sign_name" property="signName" />
         <result column="sign_desc" property="signDesc" />
         <result column="sign_director" property="signDirector" />
-        <result column="sign_type" property="signType" />
         <result column="sign_user_id" property="signUserId" />
         <result column="minio_file_name" property="minioFileName" />
         <result column="create_time" property="createTime" />
@@ -62,4 +60,58 @@
         JOIN system_sign_user_relation ssur ON ss.id = ssur.sign_id
         WHERE ssur.user_id = #{userId}
     </select>
+
+    <select id="selectSignListPage" resultMap="BaseResultMap">
+        SELECT ss.*, sd.SIMPLE_NAME AS deptName
+        FROM system_sign ss
+        LEFT JOIN sys_user su ON su.id = ss.sign_user_id
+        LEFT JOIN sys_dept sd ON sd.id = su.dept_id
+        WHERE 1=1
+        <if test="request.signNo != null and request.signNo !=''">
+            AND ss.sign_no LIKE concat('%',#{request.signNo},'%')
+        </if>
+        <if test="request.signName != null and request.signName !=''">
+            AND ss.sign_name LIKE concat('%',#{request.signName},'%')
+        </if>
+        <if test="request.signDirector != null and request.signDirector !=''">
+            AND ss.sign_director LIKE concat('%',#{request.signDirector},'%')
+        </if>
+        <if test="request.signUserId != null and request.signUserId !=''">
+            AND ss.sign_user_id = #{request.signUserId}
+        </if>
+        <if test="request.createStartTime != null and request.createStartTime !=''">
+            AND DATE_FORMAT(ss.create_time,'%Y-%m-%d') &gt;= DATE_FORMAT(#{request.createStartTime},'%Y-%m-%d')
+        </if>
+        <if test="request.createEndTime != null and request.createEndTime !=''">
+            AND DATE_FORMAT(ss.create_time,'%Y-%m-%d')  &lt;= DATE_FORMAT(#{request.createEndTime},'%Y-%m-%d')
+        </if>
+        ORDER BY ss.create_time DESC
+    </select>
+
+    <select id="selectSignList" resultMap="BaseResultMap">
+        SELECT ss.*, sd.SIMPLE_NAME AS deptName
+        FROM system_sign ss
+        LEFT JOIN sys_user su ON su.id = ss.sign_user_id
+        LEFT JOIN sys_dept sd ON sd.id = su.dept_id
+        WHERE 1=1
+        <if test="request.signNo != null and request.signNo !=''">
+            AND ss.sign_no LIKE concat('%',#{request.signNo},'%')
+        </if>
+        <if test="request.signName != null and request.signName !=''">
+            AND ss.sign_name LIKE concat('%',#{request.signName},'%')
+        </if>
+        <if test="request.signDirector != null and request.signDirector !=''">
+            AND ss.sign_director LIKE concat('%',#{request.signDirector},'%')
+        </if>
+        <if test="request.signUserId != null and request.signUserId !=''">
+            AND ss.sign_user_id = #{request.signUserId}
+        </if>
+        <if test="request.createStartTime != null and request.createStartTime !=''">
+            AND DATE_FORMAT(ss.create_time,'%Y-%m-%d') &gt;= DATE_FORMAT(#{request.createStartTime},'%Y-%m-%d')
+        </if>
+        <if test="request.createEndTime != null and request.createEndTime !=''">
+            AND DATE_FORMAT(ss.create_time,'%Y-%m-%d')  &lt;= DATE_FORMAT(#{request.createEndTime},'%Y-%m-%d')
+        </if>
+        ORDER BY ss.create_time DESC
+    </select>
 </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 515050a..60f530b 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
@@ -47,8 +47,8 @@
     String STORAGE_LOCATION = "bizStorageLocation";
     //计量专业
     String MEASURE_MAJOR = "bizMeasureMajor";
-    //管理状态
-    String MANAGER_STATE = "bizManagerState";
+    //标准装置管理状态
+    String STANDARD_MANAGER_STATE = "bizStandardManagerState";
 
     /**
      * 资源管理 字典code
@@ -95,8 +95,6 @@
     String MEASURE_STATUS = "measureStatus";
     //检定方式
     String MEASURE_TYPE = "measureType";
-    //标识打印标志类型
-    String IDENTIFY_PRINT_TYPE = "bizBusinessIdentify";
     //变更类型
     String REPORT_CHANGE_TYPE = "bizCertChangeType";
     //规模类型
@@ -111,19 +109,24 @@
     String MEASURE_CATEGORY = "measureCategory";
     //检定结果
     String MEASURE_RESULT = "measureResult";
+    //分包原因
+    String OUTSOURCE_REASON = "outsourceReason";
+
+    /**
+     * 系统管理
+     */
+    String TEMPLATE_TYPE = "templateType";
+
 
     /**
      * 标准装置 字典code
      */
     //类别
     String STANDARD_CATEGORY = "standardCategory";
-    //管理状态
-    String STANDARD_MANAGER_STATE = "standardManagerState";
     //标准等级
     String STANDARD_LEVEL = "standardLevel";
     //传递范围
     String STANDARD_TRANSMIT_RANGE = "transmitRange";
-
     //资本来源
     String CAPITAL_SOURCE = "capitalSource";
     //标准装置-申请类型
@@ -148,8 +151,6 @@
     String CERTIFICATE_CLASS = "certificationClass";
     //证书管理-检校专业
     String CALIBRATION_MAJOR = "calibrationMajor";
-    //分包原因
-    String OUTSOURCE_REASON = "outsourceReason";
 
     /**
      * 工作台
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/BaseApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/BaseApprovalListRequest.java
index 73c12c1..80d7424 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/BaseApprovalListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/BaseApprovalListRequest.java
@@ -6,6 +6,7 @@
 
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotEmpty;
+import java.util.List;
 
 /**
  * @Description:
@@ -19,14 +20,14 @@
      * 表单id
      */
     @NotBlank(message = "表单id不能为空")
-    @ApiModelProperty(value = "表单id（流程定义对应的表单id，等价于业务id）", dataType = "String")
+    @ApiModelProperty(value = "表单id（流程定义对应的表单id，等价于业务id），导出接口不用传", dataType = "String")
     private String formId;
 
     /**
      * 审批状态类型，对应ApprovalStatusEnum
      */
     @NotEmpty(message = "审批状态类型不能为空")
-    @ApiModelProperty(value = "审批状态类型code", dataType = "String")
+    @ApiModelProperty(value = "审批状态类型code，导出接口不用传", dataType = "String")
     private String approvalStatus;
 
     @ApiModelProperty(hidden = true)
@@ -34,4 +35,7 @@
 
     @ApiModelProperty(hidden = true)
     private Long createUserId;
+
+    @ApiModelProperty(value = "导出ids", dataType = "List")
+    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificatePrintApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificatePrintApprovalListRequest.java
index b93d1c9..3cc2f4e 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificatePrintApprovalListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificatePrintApprovalListRequest.java
@@ -5,8 +5,6 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import java.util.List;
-
 /**
  * @Description:
  * @Author: wangpeng
@@ -38,7 +36,4 @@
 
     @ApiModelProperty(value = "创建结束时间", dataType = "String")
     private String createTimeEnd;
-
-    @ApiModelProperty(value = "导出ids", dataType = "List")
-    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportApprovalListRequest.java
index 4f7a038..c115847 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportApprovalListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportApprovalListRequest.java
@@ -5,8 +5,6 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import java.util.List;
-
 /**
  * @Description:
  * @Author: wangpeng
@@ -15,6 +13,8 @@
 @ApiModel
 @Data
 public class CertificateReportApprovalListRequest extends BaseApprovalListRequest {
+    @ApiModelProperty(value = "委托方id", dataType = "String")
+    private Long customerId;
 
     @ApiModelProperty(value = "证书报告编号", dataType = "String")
     private String certificateReportNo;
@@ -37,6 +37,4 @@
     @ApiModelProperty(value = "检校结束时间", dataType = "String")
     private String calibrationTimeEnd;
 
-    @ApiModelProperty(value = "导出ids", dataType = "List")
-    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/identify/IdentifyListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/identify/IdentifyListRequest.java
index 1b87ae6..f019203 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/identify/IdentifyListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/identify/IdentifyListRequest.java
@@ -4,6 +4,8 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * @Description:
  * @Author: wangpeng
@@ -26,4 +28,7 @@
 
     @ApiModelProperty(value = "打印结束时间", dataType = "String")
     private String createTimeEnd;
+
+    @ApiModelProperty(value = "导出ids", dataType = "List")
+    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListRequest.java
index 1264883..62415fb 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListRequest.java
@@ -7,6 +7,7 @@
 import lombok.Data;
 
 import javax.validation.constraints.NotBlank;
+import java.util.List;
 
 @Data
 @ApiModel
@@ -37,4 +38,6 @@
     @ApiModelProperty(value = "是否加急（1是0否null全部）", dataType = "Integer")
     private String isUrgent;
 
+    @ApiModelProperty(value = "导出ids", dataType = "List")
+    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListRequest.java
index 5201d7b..499760a 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListRequest.java
@@ -17,6 +17,9 @@
     @ApiModelProperty(value = "任务单编号", dataType = "String")
     private String orderNo;
 
+    @ApiModelProperty(value = "委托方id", dataType = "Long")
+    private Long customerId;
+
     @ApiModelProperty(value = "委托方名称", dataType = "String")
     private String customerName;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OrderSampleDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OrderSampleDTO.java
new file mode 100644
index 0000000..796edc0
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OrderSampleDTO.java
@@ -0,0 +1,19 @@
+package com.casic.missiles.dto.business.outsource;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/8/24 11:38
+ */
+@ApiModel
+@Data
+public class OrderSampleDTO {
+    @ApiModelProperty(value = "任务单id", dataType = "Long")
+    private Long orderId;
+    @ApiModelProperty(value = "受检设备id", dataType = "Long")
+    private Long sampleId;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceAssessApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceAssessApprovalListRequest.java
new file mode 100644
index 0000000..9a930c3
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceAssessApprovalListRequest.java
@@ -0,0 +1,30 @@
+package com.casic.missiles.dto.business.outsource;
+
+import com.casic.missiles.dto.BaseApprovalListRequest;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/8/24 11:01
+ */
+@ApiModel
+@Data
+public class OutsourceAssessApprovalListRequest extends BaseApprovalListRequest {
+    @ApiModelProperty(value = "评审表编号", dataType = "String")
+    private String projectNo;
+
+    @ApiModelProperty(value = "分包机构名称", dataType = "String")
+    private String outsourcerName;
+
+    @ApiModelProperty(value = "申请人", dataType = "String")
+    private String applicantName;
+
+    @ApiModelProperty(value = "申请时间开始", dataType = "String")
+    private String applicantTimeStart;
+
+    @ApiModelProperty(value = "申请时间结束", dataType = "String")
+    private String applicantTimeEnd;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceAssessSaveResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceAssessSaveResponse.java
new file mode 100644
index 0000000..8bf9aad
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceAssessSaveResponse.java
@@ -0,0 +1,20 @@
+package com.casic.missiles.dto.business.outsource;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/8/14 16:17
+ */
+@ApiModel
+@Data
+public class OutsourceAssessSaveResponse {
+    @ApiModelProperty(value = "主键id", dataType = "Long")
+    private Long id;
+
+    @ApiModelProperty(value = "编号", dataType = "String")
+    private String projectNo;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProtocolApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProtocolApprovalListRequest.java
new file mode 100644
index 0000000..0f32331
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProtocolApprovalListRequest.java
@@ -0,0 +1,30 @@
+package com.casic.missiles.dto.business.outsource;
+
+import com.casic.missiles.dto.BaseApprovalListRequest;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/8/24 15:01
+ */
+@ApiModel
+@Data
+public class OutsourceProtocolApprovalListRequest extends BaseApprovalListRequest {
+    @ApiModelProperty(value = "协议书编号", dataType = "String")
+    private String protocolNo;
+
+    @ApiModelProperty(value = "分包方名称", dataType = "String")
+    private String outsourcerName;
+
+    @ApiModelProperty(value = "申请人", dataType = "String")
+    private String applicantName;
+
+    @ApiModelProperty(value = "申请时间开始", dataType = "String")
+    private String applicantTimeStart;
+
+    @ApiModelProperty(value = "申请时间结束", dataType = "String")
+    private String applicantTimeEnd;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProtocolSaveResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProtocolSaveResponse.java
new file mode 100644
index 0000000..e324967
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProtocolSaveResponse.java
@@ -0,0 +1,20 @@
+package com.casic.missiles.dto.business.outsource;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/8/14 16:17
+ */
+@ApiModel
+@Data
+public class OutsourceProtocolSaveResponse {
+    @ApiModelProperty(value = "主键id", dataType = "Long")
+    private Long id;
+
+    @ApiModelProperty(value = "编号", dataType = "String")
+    private String protocolNo;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveApprovalListRequest.java
index f29f4e4..7047c28 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveApprovalListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveApprovalListRequest.java
@@ -5,8 +5,6 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import java.util.List;
-
 /**
  * @Description: 现场检测审批列表请求实体
  * @Author: wangpeng
@@ -30,7 +28,4 @@
     @ApiModelProperty(value = "申请时间结束", dataType = "String")
     private String applyTimeEnd;
 
-    @ApiModelProperty(value = "导出ids", dataType = "List")
-    private List<Long> ids;
-
 }

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java
index bb0c50f..13a699b 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java
@@ -12,6 +12,7 @@
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.IGeneralApprovalService;
+import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
@@ -19,6 +20,7 @@
 import org.springframework.web.bind.annotation.RequestBody;
 
 import javax.validation.Valid;
+import java.util.List;
 import java.util.Objects;
 
 /**
@@ -117,4 +119,17 @@
         }
         return baseApprovalService.failUpdate(request);
     }
+
+    public List<O> exportList(@RequestBody @Valid R request) throws Exception {
+        List<O> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = baseApprovalService.listExportByIds(request.getIds());
+        } else {
+            list = baseApprovalService.listExport(request);
+        }
+        for (O record : list) {
+            DictCodeUtils.convertDictCodeToName(record);
+        }
+        return list;
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java
index 8a90961..d775831 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java
@@ -5,6 +5,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.business.certificate.CertificateChangeApplyApprovalListRequest;
 import com.casic.missiles.dto.business.certificate.CertificateChangeApplySaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessCertificateChangeApply;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
@@ -20,6 +21,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -48,4 +50,12 @@
         }
         return changeApplyService.saveChangeApply(request);
     }
+
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody CertificateChangeApplyApprovalListRequest request) throws Exception {
+        List<BizBusinessCertificateChangeApply> list = super.exportList(request);
+        super.exportExcel(BizBusinessCertificateChangeApply.class, list, ExportEnum.CERTIFICATE_CHANGE_APPLY.getSheetName());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java
index 5fc4b07..af8230e 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java
@@ -9,6 +9,7 @@
 import com.casic.missiles.dto.business.certificate.CertificatePrintApprovalListRequest;
 import com.casic.missiles.dto.business.certificate.CertificatePrintListResponse;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.enums.business.CertificatePrintStatusEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessCertificatePrintLog;
@@ -18,10 +19,16 @@
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.io.IOException;
+import java.util.List;
 import java.util.Objects;
 
 /**
@@ -98,4 +105,16 @@
         });
         return certificatePrintService.certificatePrintLog(idDTO.getId());
     }
+
+    @ApiOperation("证书打印审批导出")
+    @PostMapping("/listExport")
+    public void exportList(@RequestBody CertificatePrintApprovalListRequest request) throws IOException {
+        List<CertificatePrintListResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = certificatePrintService.listByIds(request.getIds());
+        } else {
+            list = certificatePrintService.list(request);
+        }
+        super.exportExcel(CertificatePrintListResponse.class, list, ExportEnum.CERTIFICATE_PRINT.getSheetName());
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java
index 63b06dc..6b2efd5 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java
@@ -6,6 +6,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.business.certificate.CertificateReportApprovalListRequest;
 import com.casic.missiles.dto.business.certificate.CertificateReportSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessCertificateReport;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
@@ -21,6 +22,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -50,7 +52,7 @@
         return certificateReportService.saveCertificateReport(request);
     }
 
-    @ApiOperation("证书审批详情（基本信息）")
+    @ApiOperation("详情（基本信息）")
     @PostMapping("/detail")
     public ReturnDTO<BizBusinessCertificateReport> detail(@RequestBody @Valid BaseDetailRequest request, BindingResult bindingResult) throws Exception {
         if(bindingResult.hasErrors()){
@@ -59,4 +61,11 @@
         return certificateReportService.detail(request);
     }
 
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody CertificateReportApprovalListRequest request) throws Exception {
+        List<BizBusinessCertificateReport> list = super.exportList(request);
+        super.exportExcel(BizBusinessCertificateReport.class, list, ExportEnum.CERTIFICATE_REPORT.getSheetName());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java
index 46b26bd..57c0809 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java
@@ -10,20 +10,21 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.business.identify.IdentifyListRequest;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessIdentifyInfo;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.business.IBizBusinessIdentifyInfoService;
+import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import javax.validation.Valid;
+import java.util.List;
 import java.util.Objects;
 
 /**
@@ -57,16 +58,13 @@
         return identifyInfoService.addIdentify(identifyInfo);
     }
 
-    @ApiOperation("标识打印更新")
+    @ApiOperation("标识打印更新（更新打印时间）")
     @PostMapping("/update")
-    public ReturnDTO updateIdentify(@RequestBody @Valid BizBusinessIdentifyInfo identifyInfo, BindingResult bindingResult) {
-        Assert.isFalse(Objects.isNull(identifyInfo.getId()), () -> {
+    public ReturnDTO updateIdentify(@RequestBody @Valid IdDTO idDTO) {
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        Assert.isFalse(bindingResult.hasErrors(), () -> {
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        });
-        return identifyInfoService.updateIdentify(identifyInfo);
+        return identifyInfoService.updateIdentify(idDTO.getId());
     }
 
     @ApiOperation("标识打印删除")
@@ -77,4 +75,37 @@
         });
         return identifyInfoService.deleteIdentify(idDTO.getId());
     }
+
+    @ApiOperation("标识打印导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody @Valid IdentifyListRequest request, BindingResult bindingResult) throws Exception {
+        if (bindingResult.hasErrors()) {
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        List<BizBusinessIdentifyInfo> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = identifyInfoService.listByIds(request.getIds());
+        } else {
+            list = identifyInfoService.list(request);
+        }
+        for (BizBusinessIdentifyInfo record : list) {
+            DictCodeUtils.convertDictCodeToName(record);
+        }
+        super.exportExcel(BizBusinessIdentifyInfo.class, list, ExportEnum.IDENTIFY_EXPORT.getSheetName());
+    }
+
+
+    // TODO: 2023/8/23 查询设备信息，4个底部按钮查设备（按钮的作用就是前端用来调不同接口、用来区分中间即将展示的标识），前端弹窗选设备，在确定保存时前端根据底部按钮判断传入设备类型deviceType字典code
+    // TODO: 2023/8/23 接口：查受检设备（第1个按钮），查设备台账（后3个按钮同一接口），查询之后前端根据标志类型的不同加到中间页面时进行判断（按产品给的对应表）
+    // TODO: 2023/8/23 提供二维码接口，前端在加到中间页面时调用一下
+
+    @ApiOperation("设备二维码")
+    @PostMapping("/equipment/qrCode")
+    public ReturnDTO<String> equipmentQrCode(@RequestBody @Valid IdDTO idDTO) {
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return identifyInfoService.equipmentQrCode(idDTO.getId());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java
index 707be6e..7e0453d 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java
@@ -117,7 +117,7 @@
     }
 
     @ApiOperation("任务单导出")
-    @PostMapping("/export")
+    @PostMapping("/listExport")
     public void orderExport(@RequestBody @Valid OrderListRequest request, HttpServletResponse response) {
         businessOrderService.orderExport(request, response);
     }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java
index 529a6ce..51432be 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java
@@ -1,9 +1,28 @@
 package com.casic.missiles.controller.business;
 
+import com.casic.missiles.controller.GeneralApprovalController;
+import com.casic.missiles.dto.BaseApprovalSubmitRequest;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.business.outsource.OutsourceAssessApprovalListRequest;
+import com.casic.missiles.dto.business.outsource.OutsourceAssessSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
+import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.model.business.BizBusinessOutsourceAssess;
+import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
+import com.casic.missiles.service.IGeneralApprovalService;
+import com.casic.missiles.service.business.IBizBusinessOutsourceAssessService;
 import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.BindingResult;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.validation.Valid;
+import java.util.List;
+
 /**
  * <p>
  * 计量检定业务-分包管理-测试、校准或检定工作分包评审表 前端控制器
@@ -15,6 +34,27 @@
 @Api(tags = "分包管理-测试、校准或检定工作分包评审表")
 @RestController
 @RequestMapping("/business/outsource/assess")
-public class BizBusinessOutsourceAssessController {
+public class BizBusinessOutsourceAssessController extends GeneralApprovalController<BizBusinessOutsourceAssess, BizBusinessOutsourceAssess, OutsourceAssessApprovalListRequest, BaseApprovalSubmitRequest> {
+    @Autowired
+    private IBizBusinessOutsourceAssessService outsourceAssessService;
 
+    public BizBusinessOutsourceAssessController(IGeneralApprovalService<BizBusinessOutsourceAssess, BizBusinessOutsourceAssess, OutsourceAssessApprovalListRequest, BaseApprovalSubmitRequest> baseApprovalService) {
+        super(baseApprovalService);
+    }
+
+    @ApiOperation("草稿箱-保存")
+    @PostMapping("/save")
+    public ReturnDTO<OutsourceAssessSaveResponse> saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceAssess request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        return outsourceAssessService.saveOutsourceAssess(request);
+    }
+
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception {
+        List<BizBusinessOutsourceAssess> list = super.exportList(request);
+        super.exportExcel(BizBusinessOutsourceAssess.class, list, ExportEnum.OUTSOURCE_ASSESS.getSheetName());
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java
new file mode 100644
index 0000000..9adef18
--- /dev/null
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java
@@ -0,0 +1,60 @@
+package com.casic.missiles.controller.business;
+
+import com.casic.missiles.controller.GeneralApprovalController;
+import com.casic.missiles.dto.BaseApprovalSubmitRequest;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.business.outsource.OutsourceProtocolApprovalListRequest;
+import com.casic.missiles.dto.business.outsource.OutsourceProtocolSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
+import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.model.business.BizBusinessOutsourceProtocol;
+import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
+import com.casic.missiles.service.IGeneralApprovalService;
+import com.casic.missiles.service.business.IBizBusinessOutsourceProtocolService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.BindingResult;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.validation.Valid;
+import java.util.List;
+
+/**
+ * <p>
+ * 计量检定业务-分包管理-测试、校准或检定工作分包协议书 前端控制器
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-08-24
+ */
+@Api(tags = "分包管理-测试、校准或检定工作分包协议书")
+@RestController
+@RequestMapping("/business/outsource/protocol")
+public class BizBusinessOutsourceProtocolController extends GeneralApprovalController<BizBusinessOutsourceProtocol, BizBusinessOutsourceProtocol, OutsourceProtocolApprovalListRequest, BaseApprovalSubmitRequest> {
+    @Autowired
+    private IBizBusinessOutsourceProtocolService outsourceProtocolService;
+
+    public BizBusinessOutsourceProtocolController(IGeneralApprovalService<BizBusinessOutsourceProtocol, BizBusinessOutsourceProtocol, OutsourceProtocolApprovalListRequest, BaseApprovalSubmitRequest> baseApprovalService) {
+        super(baseApprovalService);
+    }
+
+    @ApiOperation("草稿箱-保存")
+    @PostMapping("/save")
+    public ReturnDTO<OutsourceProtocolSaveResponse> saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceProtocol request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        return outsourceProtocolService.saveOutsourceProtocol(request);
+    }
+
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody OutsourceProtocolApprovalListRequest request) throws Exception {
+        List<BizBusinessOutsourceProtocol> list = super.exportList(request);
+        super.exportExcel(BizBusinessOutsourceProtocol.class, list, ExportEnum.OUTSOURCE_PROTOCOL.getSheetName());
+    }
+}
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java
index 097f645..f0f0943 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java
@@ -17,7 +17,6 @@
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.IGeneralApprovalService;
 import com.casic.missiles.service.business.IBizBusinessOutsourcerInfoService;
-import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -71,19 +70,8 @@
 
     @ApiOperation("分包方导出")
     @PostMapping("/listExport")
-    public void export(@RequestBody @Valid OutsourcerInfoApprovalListRequest request, BindingResult bindingResult) throws Exception {
-        if (bindingResult.hasErrors()) {
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        }
-        List<BizBusinessOutsourcerInfo> list;
-        if (!CollectionUtils.isEmpty(request.getIds())) {
-            list = outsourcerInfoService.listByIds(request.getIds());
-        } else {
-            list = outsourcerInfoService.list(request);
-        }
-        for (BizBusinessOutsourcerInfo record : list) {
-            DictCodeUtils.convertDictCodeToName(record);
-        }
+    public void export(@RequestBody OutsourcerInfoApprovalListRequest request) throws Exception {
+        List<BizBusinessOutsourcerInfo> list = super.exportList(request);
         super.exportExcel(BizBusinessOutsourcerInfo.class, list, ExportEnum.OUTSOURCER_EXPORT.getSheetName());
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java
index c2cbf9f..0410918 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java
@@ -17,11 +17,9 @@
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.IGeneralApprovalService;
 import com.casic.missiles.service.business.IBizBusinessSiteExecutiveInfoService;
-import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -60,7 +58,7 @@
         return siteExecutiveInfoService.saveSiteExecutiveInfo(siteExecutiveInfo);
     }
 
-    @ApiOperation("现场检测详情")
+    @ApiOperation("详情")
     @PostMapping("/detail")
     public ReturnDTO<SiteExecutiveDetailResponse> siteExecutiveDetail(@RequestBody @Valid IdDTO idDTO) throws Exception {
         Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
@@ -69,21 +67,10 @@
         return ReturnUtil.success(siteExecutiveInfoService.detail(idDTO.getId()));
     }
 
-    @ApiOperation("现场检测导出")
+    @ApiOperation("导出")
     @PostMapping("/listExport")
-    public void export(@RequestBody @Valid SiteExecutiveApprovalListRequest request, BindingResult bindingResult) throws Exception {
-        if (bindingResult.hasErrors()) {
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        }
-        List<SiteExecutiveApprovalListResponse> list;
-        if (!CollectionUtils.isEmpty(request.getIds())) {
-            list = siteExecutiveInfoService.listInfoByIds(request.getIds());
-        } else {
-            list = siteExecutiveInfoService.listInfo(request);
-        }
-        for (SiteExecutiveApprovalListResponse record : list) {
-            DictCodeUtils.convertDictCodeToName(record);
-        }
+    public void export(@RequestBody SiteExecutiveApprovalListRequest request) throws Exception {
+        List<SiteExecutiveApprovalListResponse> list = super.exportList(request);
         super.exportExcel(SiteExecutiveApprovalListResponse.class, list, ExportEnum.SITE_EXECUTIVE_EXPORT.getSheetName());
     }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
index 7e793cd..a92e209 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
@@ -55,7 +55,7 @@
 
     @ApiOperation("设备收发列表导出")
     @PostMapping("/export")
-    public void exportList(@RequestBody @Valid SampleDispatchListRequest request) throws IOException {
+    public void exportList(@RequestBody SampleDispatchListRequest request) throws IOException {
         List<SampleDispatchListResponse> list;
         if (!CollectionUtils.isEmpty(request.getIds())) {
             list = dispatchService.listByIds(request.getIds());
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java
index cdc77fc..d120fd4 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java
@@ -7,6 +7,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.business.labExecutive.*;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.business.IBusinessLabExecutiveInfoService;
@@ -14,6 +15,7 @@
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.*;
 
@@ -32,7 +34,7 @@
     @Autowired
     private IBusinessLabExecutiveInfoService labExecutiveInfoService;
 
-    @ApiOperation("实验室检测-部门检测-查询各状态列表（待检测、检测中、检测完）")
+    @ApiOperation("实验室任务-查询各状态列表（待检测、检测中、检测完）")
     @PostMapping("/deptExecutive/List")
     public ReturnDTO<PageInfoBT<SampleLabExecutiveListResponse>> queryDeptExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
@@ -43,10 +45,19 @@
         return ReturnUtil.success(super.packForBT(labExecutiveInfoService.deptLabExecutiveListPage(page, labExecutiveListRequest)));
     }
 
-    /**
-     * 实验室检测-我的检测-查询各状态列表（待检测、检测中、检测完）
-     */
-    @ApiOperation("实验室检测-我的检测-查询各状态列表（待检测、检测中、检测完）")
+    @ApiOperation("实验室任务导出")
+    @PostMapping("/deptExecutive/export")
+    public void deptExportList(@RequestBody @Valid SampleLabExecutiveListRequest request) throws Exception {
+        List<SampleLabExecutiveListResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = labExecutiveInfoService.deptLabExecutiveListByIds(request.getMeasureStatus(), request.getIds());
+        } else {
+            list = labExecutiveInfoService.deptLabExecutiveList(request);
+        }
+        super.exportExcel(SampleLabExecutiveListResponse.class, list, ExportEnum.DEPT_EXECUTIVE_TASK.getSheetName());
+    }
+
+    @ApiOperation("我的任务-查询各状态列表（待检测、检测中、检测完）")
     @PostMapping("/myExecutive/list")
     public ReturnDTO<PageInfoBT<SampleLabExecutiveListResponse>> queryMyExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
@@ -57,19 +68,25 @@
         return ReturnUtil.success(super.packForBT(labExecutiveInfoService.myLabExecutiveListPage(page, labExecutiveListRequest)));
     }
 
-    /**
-     * 实验室检测-我的检测-查询各状态样品数量（待检测、检测中、检测完）
-     */
-    @ApiOperation("实验室检测-我的检测-查询各状态样品数量（待检测、检测中、检测完）")
+    @ApiOperation("我的任务导出")
+    @PostMapping("/myExecutive/export")
+    public void exportList(@RequestBody @Valid SampleLabExecutiveListRequest request) throws Exception {
+        List<SampleLabExecutiveListResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = labExecutiveInfoService.myLabExecutiveListByIds(request.getMeasureStatus(), request.getIds());
+        } else {
+            list = labExecutiveInfoService.myLabExecutiveList(request);
+        }
+        super.exportExcel(SampleLabExecutiveListResponse.class, list, ExportEnum.MY_EXECUTIVE_TASK.getSheetName());
+    }
+
+    @ApiOperation("我的任务-查询各状态样品数量（待检测、检测中、检测完）")
     @GetMapping("/myExecutive/amount")
     public ReturnDTO<List<SampleAmountResponse>> queryMyExecutiveAmount() {
         return ReturnUtil.success(labExecutiveInfoService.myExecutiveAmount());
     }
 
-    /**
-     * 实验室检测-部门检测-分配（分配给具体人员）
-     */
-    @ApiOperation("实验室检测-部门检测-分配按钮（分配给具体人员）")
+    @ApiOperation("实验室任务-分配按钮（分配给具体人员）")
     @PostMapping("/deptExecutive/allocate")
     public ReturnDTO allocateStaff(@RequestBody @Valid SampleAllocateRequest sampleAllocateRequest, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -78,10 +95,7 @@
         return labExecutiveInfoService.allocateStaff(sampleAllocateRequest);
     }
 
-    /**
-     * 实验室检测-我的检测-检定人扫描收入（待检测->检测中）
-     */
-    @ApiOperation("实验室检测-我的检测-检定人扫描收入（待检测->检测中）")
+    @ApiOperation("我的任务-检定人扫描收入（待检测->检测中）")
     @PostMapping("/myExecutive/receive")
     public ReturnDTO sampleReceive(@RequestBody @Valid List<SampleOperateRequest> requestList, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -90,10 +104,7 @@
         return labExecutiveInfoService.sampleReceive(requestList);
     }
 
-    /**
-     * 实验室检测-负责人/检定人扫描检完（检测中->检测完）
-     */
-    @ApiOperation("实验室检测-负责人/检定人扫描检完（检测中->检测完）")
+    @ApiOperation("实验室任务-负责人/检定人扫描检完（检测中->检测完）")
     @PostMapping("/myExecutive/complete")
     public ReturnDTO sampleExecutiveComplete(@RequestBody @Valid List<SampleOperateRequest> requestList, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -102,10 +113,7 @@
         return labExecutiveInfoService.sampleExecutiveComplete(requestList);
     }
 
-    /**
-     * 实验室检测-部门检测/我的检测 编辑（只能修改应出具证书）
-     */
-    @ApiOperation("实验室检测-部门检测/我的检测 编辑（只能修改应出具证书）")
+    @ApiOperation("实验室任务/我的任务 编辑（只能修改应出具证书）")
     @PostMapping("/executive/update")
     public ReturnDTO updateExecutive(@RequestBody @Valid UpdateExecutiveRequest request, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -114,10 +122,7 @@
         return labExecutiveInfoService.updateExecutive(request);
     }
 
-    /**
-     * 实验室检测-部门检测/我的检测 详情
-     */
-    @ApiOperation("实验室检测-部门检测/我的检测 详情")
+    @ApiOperation("实验室任务/我的任务 详情")
     @PostMapping("/executive/detail")
     public ReturnDTO<ExecutiveDetailResponse> executiveDetail(@RequestBody @Valid ExecutiveDetailRequest request, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
@@ -131,7 +136,7 @@
      * 退回后会将下一个要执行的实验室检测状态更新为待分配，将后面的实验室顺序变更为连续（都进行减1）
      * 最后一个检测的实验室退回，等分发员再增加实验室或设备收发中的已收入直接手动点击完成
      */
-    @ApiOperation("实验室检测-部门检测/我的检测 退回（待检测/检测中->退回）")
+    @ApiOperation("实验室任务/我的任务 退回（待检测/检测中->退回）")
     @PostMapping("/executive/sendBack")
     public ReturnDTO executiveSendBack(@RequestBody @Valid ExecutiveSendBackRequest request, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -140,9 +145,6 @@
         return labExecutiveInfoService.sampleExecutiveSendBack(request);
     }
 
-    /**
-     * 分发员编辑实验室检测列表
-     */
     @ApiOperation("分发员编辑实验室检测列表")
     @PostMapping("/handOut/updateList")
     public ReturnDTO updateExecutiveList(@RequestBody @Valid UpdateExecutiveListRequest request, BindingResult bindingResult) {
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java
index 48a67ed..0c04f31 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java
@@ -10,6 +10,7 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.resource.customer.CustomerApprovalListRequest;
 import com.casic.missiles.dto.resource.customer.CustomerSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceCustomerInfo;
@@ -26,6 +27,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -55,6 +57,13 @@
         return customerInfoService.saveCustomerInfo(request);
     }
 
+    @ApiOperation("委托方名录导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody CustomerApprovalListRequest request) throws Exception {
+        List<BizResourceCustomerInfo> list = super.exportList(request);
+        super.exportExcel(BizResourceCustomerInfo.class, list, ExportEnum.CUSTOMER_INFO.getSheetName());
+    }
+
     @ApiOperation("委托方人员列表（分页）")
     @PostMapping("/person/listPage")
     public ReturnDTO<PageInfoBT<BizResourceCustomerStaff>> personListPage(@RequestBody IdDTO idDto) {
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
index 972ed4b..6418ea5 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
@@ -5,6 +5,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.resource.customer.SuggestFormApprovalListRequest;
 import com.casic.missiles.dto.resource.customer.SuggestFormSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceCustomerSuggestForm;
@@ -20,6 +21,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -50,4 +52,11 @@
         return suggestFormService.saveSuggestForm(request);
     }
 
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody SuggestFormApprovalListRequest request) throws Exception {
+        List<BizResourceCustomerSuggestForm> list = super.exportList(request);
+        super.exportExcel(BizResourceCustomerSuggestForm.class, list, ExportEnum.CUSTOMER_SUGGEST_FORM.getSheetName());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java
index 1934d1a..9e07eab 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java
@@ -15,12 +15,16 @@
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.resource.IEnvEnvironmentRecordConfigService;
 import com.casic.missiles.service.resource.IEnvEnvironmentRecordDataService;
+import com.casic.missiles.service.resource.IEnvLocationInfoService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
 import java.util.List;
@@ -39,6 +43,8 @@
     private IEnvEnvironmentRecordDataService environmentRecordDataService;
     @Autowired
     private IEnvEnvironmentRecordConfigService environmentRecordConfigService;
+    @Autowired
+    private IEnvLocationInfoService locationInfoService;
 
     @ApiOperation("环境记录单数据列表/详情")
     @PostMapping("/data/listPage")
@@ -95,4 +101,11 @@
         });
         return environmentRecordConfigService.deleteEnvironmentRecordConfig(idDTO.getId());
     }
+
+    @ApiOperation("地点列表")
+    @PostMapping("/location/listPage")
+    public ReturnDTO<PageInfoBT<LocationListResponse>> locationListPage(@RequestBody @Valid LocationListRequest request) {
+        Page<LocationListResponse> page = PageFactory.defaultPage();
+        return ReturnUtil.success(super.packForBT(locationInfoService.listPage(page, request)));
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java
index 82efe3f..e9561fa 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java
@@ -10,6 +10,7 @@
 import com.casic.missiles.dto.resource.seal.SealLogListRequest;
 import com.casic.missiles.dto.resource.seal.SealNoteApprovalListRequest;
 import com.casic.missiles.dto.resource.seal.SealNoteSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceSealUseLog;
@@ -27,6 +28,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -58,6 +60,13 @@
         return sealUseNoteService.saveSeal(request);
     }
 
+    @ApiOperation("印章使用登记导出（列表和导出中去掉经办人和监印人）")
+    @PostMapping("/listExport")
+    public void export(@RequestBody SealNoteApprovalListRequest request) throws Exception {
+        List<BizResourceSealUseNote> list = super.exportList(request);
+        super.exportExcel(BizResourceSealUseNote.class, list, ExportEnum.SEAL_NOTE.getSheetName());
+    }
+
     // TODO: 2023/7/28 印章使用日志：系统中使用印章时插入数据库
 
     @ApiOperation("印章使用日志列表（分页）")
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java
index 9b674fc..06b6521 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java
@@ -9,16 +9,20 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.resource.staff.StaffCertRequest;
 import com.casic.missiles.dto.resource.staff.StaffCertResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.service.resource.IBizResourceStaffInfoService;
 import com.casic.missiles.service.resource.IBizResourceStaffVerifierService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.List;
+
 /**
  * @Description:
  * @Author: wangpeng
@@ -41,9 +45,21 @@
         return ReturnUtil.success(super.packForBT(responsePage));
     }
 
+    @ApiOperation("证书逾期提醒导出")
+    @PostMapping("/listExport")
+    public void exportList(@RequestBody StaffCertRequest request) throws Exception {
+        List<StaffCertResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = staffInfoService.certListByIds(request.getIds());
+        } else {
+            list = staffInfoService.certList(request);
+        }
+        super.exportExcel(StaffCertResponse.class, list, ExportEnum.STAFF_CERTIFICATE_EXPIRE.getSheetName());
+    }
+
     @ApiOperation("证书逾期提醒")
     @PostMapping("/expirationReminder")
-    public ReturnDTO expirationReminder(@RequestBody IdDTO idDto) {
-        return verifierService.expirationReminder(idDto);
+    public ReturnDTO expirationReminder(@RequestBody IdDTO idDTO) {
+        return verifierService.expirationReminder(idDTO);
     }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java
index 3b251ad..a6e7850 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java
@@ -12,6 +12,7 @@
 import com.casic.missiles.dto.resource.staff.StaffListRequest;
 import com.casic.missiles.dto.resource.staff.TrainListRequest;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.*;
@@ -22,7 +23,10 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
 import java.util.List;
@@ -52,8 +56,19 @@
             throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
         }
         Page<BizResourceStaffInfo> page = PageFactory.defaultPage();
-        Page<BizResourceStaffInfo> responsePage = staffInfoService.listPage(page, request);
-        return ReturnUtil.success(super.packForBT(responsePage));
+        return ReturnUtil.success(super.packForBT(staffInfoService.listPage(page, request)));
+    }
+
+    @ApiOperation("人员登记导出")
+    @PostMapping("/listExport")
+    public void exportList(@RequestBody StaffListRequest request) throws Exception {
+        List<BizResourceStaffInfo> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = staffInfoService.listByIds(request.getIds());
+        } else {
+            list = staffInfoService.list(request);
+        }
+        super.exportExcel(BizResourceStaffInfo.class, list, ExportEnum.STAFF_INFO.getSheetName());
     }
 
     @ApiOperation("人员登记详情基础信息")
@@ -85,9 +100,9 @@
 
     @ApiOperation("科研教育列表（分页）")
     @PostMapping("/education/listPage")
-    public ReturnDTO<PageInfoBT<BizResourceStaffEducation>> educationListPage(@RequestBody IdDTO idDto) {
+    public ReturnDTO<PageInfoBT<BizResourceStaffEducation>> educationListPage(@RequestBody IdDTO idDTO) {
         Page<BizResourceStaffEducation> page = PageFactory.defaultPage();
-        Page<BizResourceStaffEducation> responsePage = staffInfoService.educationListPage(page, idDto);
+        Page<BizResourceStaffEducation> responsePage = staffInfoService.educationListPage(page, idDTO);
         return ReturnUtil.success(super.packForBT(responsePage));
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java
index af6aa86..d85d84a 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java
@@ -9,6 +9,7 @@
 import com.casic.missiles.dto.resource.outsideService.SupplierApprovalListRequest;
 import com.casic.missiles.dto.resource.outsideService.SupplierSaveResponse;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceSupplierAbility;
@@ -67,6 +68,13 @@
         return ReturnUtil.success(supplierInfoService.detail(idDTO.getId()));
     }
 
+    @ApiOperation("合格供方导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody SupplierApprovalListRequest request) throws Exception {
+        List<BizResourceSupplierInfo> list = super.exportList(request);
+        super.exportExcel(BizResourceSupplierInfo.class, list, ExportEnum.SUPPLIER_INFO.getSheetName());
+    }
+
     @ApiOperation("供方人员列表（分页）")
     @PostMapping("/person/listPage")
     public ReturnDTO<PageInfoBT<BizResourceSupplierPerson>> personListPage(@RequestBody IdDTO idDTO) {
diff --git a/casic-metering-api/src/main/resources/config/application.yml b/casic-metering-api/src/main/resources/config/application.yml
index 350db5f..ecff521 100644
--- a/casic-metering-api/src/main/resources/config/application.yml
+++ b/casic-metering-api/src/main/resources/config/application.yml
@@ -126,7 +126,7 @@
     #作者
     author: wangpeng
     #待生成对象表名
-    table-name: biz_equipment_technical_target_approval,biz_equipment_attachment_approval,biz_equipment_checkpoint_approval
+    table-name: biz_business_outsource_protocol
 
 reminder:
   #节点--common模块config包 ReminderNodeConfig配置
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
index 4a19e4e..d47d552 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
@@ -53,6 +53,7 @@
     SUGGEST_FORM_SAVE_FAILED(2509, "委托方意见登记表保存至草稿箱失败"),
     EXAMINE_FORM_SAVE_FAILED(2510, "要求、委托书及合同评审表保存至草稿箱失败"),
     CUSTOMER_EXIST_SAVE_FAILED(2511, "该委托方已存在，请重新选择"),
+    DUPLICATE_LOCATION_NO(2512, "地点编号已存在"),
 
     /**
      * 计量检定业务模块
@@ -68,6 +69,8 @@
     COMPLETE_SAMPLE_NOT_EXIST(2609, "检测中不存在扫描收入的样品"),
     CANNOT_CHANGE_MEASURE_INFO(2610, "无法更改非当前登录用户的检测信息"),
     NON_EXIST_ORDER_OR_SAMPLE(2611, "不存在该委托单或该委托单下的样品"),
+    OUTSOURCE_ACCESS_SAVE_FAILED(2612, "测试、校准或检定工作分包评审表保存至草稿箱失败"),
+    OUTSOURCE_PROTOCOL_SAVE_FAILED(2613, "测试、校准或检定工作分包协议书保存至草稿箱失败"),
 
     /**
      * 历史遗留备用
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
index 5089ad1..81a406b 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
@@ -10,54 +10,38 @@
     /**
      * 资源管理
      */
-    ENVIRONMENT_DATA_EXPORT("environmentData", "environmentData", "环境记录单数据"),
+    ENVIRONMENT_DATA_EXPORT("environmentData", "环境记录单数据", "环境记录单数据"),
+    STAFF_INFO("staffInfo", "人员登记", "人员登记"),
+    STAFF_CERTIFICATE_EXPIRE("certificateExpire", "证书逾期提醒", "证书逾期提醒"),
+    SUPPLIER_INFO("supplierInfo", "合格供方名录", "合格供方名录"),
+    CUSTOMER_INFO("customerInfo", "委托方名录", "委托方名录"),
+    CUSTOMER_SUGGEST_FORM("customerSuggestForm", "委托方意见登记表", "委托方意见登记表"),
+    SEAL_NOTE("sealNote", "印章使用登记", "印章使用登记"),
 
-    FILE_EXPORT("meterFileData", "meterFileData", "计量文件信息"),
-    TRAIN_PLAN_EXPORT("trainPlanData", "trainPlanData", "培训计划"),
-    TRAIN_LOG_EXPORT("trainLogData", "trainLogData", "培训记录"),
-    METER_ORGANIZE_EXPORT("meterOrganizeData", "meterOrganizeData", "计量组织"),
-    TRACE_SUPPLIER_EXPORT("traceSupplierData", "traceSupplierData", "溯源供方"),
-    SIGN_EXPORT("signData", "signData", "签名/签章"),
-    TEMPLATE_EXPORT("templateData", "templateData", "原始记录模板/证书报告模板"),
-    FIXED_ASSETS("meterFixedAssets", "meterFixedAssets", "固定资产"),
-    METER_EQUIPMENT("meterEquipment", "meterEquipment", "测量设备"),
-    CALIBRATION_TEST_EQUIPMENT("calibrationTestEquipment", "calibrationTestEquipment", "校准检定设备"),
-    MEASURE_ACCOUNT("measureAccount", "measureAccount", "测量工装"),
-    STANDARD_SUPPORT_EQUIPMENT("standardSupportEquipment", "standardSupportEquipment", "标准配套设备"),
-    STANDARD_EQUIPMENT("standardEquipment", "standardEquipment", "标准装置"),
-    FLOW_DEF_EXPORT("flowDefData", "flowDefData", "流程定义"),
-    STAFF_CERTIFICATE("certificate", "certificate", "计量人员证书"),
-    CHECK_INFO("checkInfo", "checkInfo", "设备管理点检测"),
-    EQUIPMENT_APPLY("equipmentApply", "equipmentApply", "设备借用"),
-    STANDARD_EQUIPMENT_REMIND("equipmentApplyRemind", "equipmentApplyRemind", "标准装置到期提醒"),
-    METER_PRICE("meterPrice", "meterPrice", "价格库"),
-    METER_STAFF("meterStaff", "meterStaff", "计量人员"),
-    STANDARD_EQUIPMENT_APPLY("standardEquipmentApply", "standardEquipmentApply", "标准装置申请"),
-    STATE_MANAGE_APPLY("stateManage", "stateManage", "状态管理"),
-    METER_ACCEPTANCE_CHECK("acceptanceCheck", "acceptanceCheck", "设备检修保养验收单"),
-    CUSTOMER_EXPORT("customerData", "customerData", "客户信息"),
-    ORDER_EXPORT("orderData", "orderData", "委托书信息"),
-    SAMPLE_EXPORT("sampleData", "sampleData", "样本信息"),
-    EXCHANGE_DATA("exchangeData", "exchangeData", "设备交接单"),
-    DISPATCH_DATA("dispatchData", "dispatchData", "设备收发"),
-    ENVIRONMENT_DATA("environmentData", "environmentData", "环境记录单"),
-    ORIGIN_DATA("originData", "originData", "原始记录"),
-    CERTIFICATE_REPORT("certificateReport", "certificateReport", "证书报告"),
-    ADVICE_EXPORT("adviceData", "adviceData", "客户反馈"),
-    HANDOUT_EXPORT("handoutData", "handoutData", "任务分发列表"),
-    OUTSOURCER_EXPORT("outsourcerData", "outsourcerData", "分包方"),
-    SITE_EXECUTIVE_EXPORT("siteExecutiveData", "siteExecutiveData", "现场测试、校准或检定"),
-    CERTIFICATE_PRINT_EXPORT("certificatePrintData", "certificatePrintData", "证书打印"),
-    DOWNLOAD_TEMPLATE("downloadTemplate", "downloadTemplate", "页面配置"),
-    OUTSOURCER_CERTIFICATE_EXPORT("outsourceCertificateData", "outsourceCertificateData", "分包证书"),
-    SETTLEMENT_INFO_EXPORT("settlementInfoData", "settlementInfoData", "业务结算"),
-    EQUIPMENT_REMIND("equipmentRemind", "equipmentRemind", "设备到期提醒"),
-    AGREEMENT_INFO_EXPORT("agreementInfoData", "agreementInfoData", "合同"),
-    WORK_STATISTICS_EXPORT("workStatisticsData", "workStatisticsData", "实时工作统计"),
-    DEPT_OUTPUT_EXPORT("deptOutputData", "deptOutputData", "部门产值分析"),
-    WORKLOAD_EXPORT("workloadData", "workloadData", "业务工作量分析"),
-    DEPT_COMPREHENSIVE_EXPORT("deptComprehensiveData", "deptComprehensiveData", "部门综合分析"),
-    ENVIRONMENTAL_RECORD("environmentalRecordData", "environmentalRecordData", "现场环境记录");
+    /**
+     * 计量检定业务
+     */
+    OUTSOURCER_EXPORT("outsourcerData", "分包方名录", "分包方名录"),
+    IDENTIFY_EXPORT("identifyData", "计量标识", "计量标识"),
+    ORDER_EXPORT("orderData", "任务单", "任务单"),
+    DISPATCH_DATA("dispatchData", "设备收发", "设备收发"),
+    HANDOUT_EXPORT("handoutData", "任务分发", "任务分发"),
+    SITE_EXECUTIVE_EXPORT("siteExecutiveData", "现场测试、校准或检定", "现场测试、校准或检定"),
+    CERTIFICATE_REPORT("certificateReport", "证书审批", "证书审批"),
+    CERTIFICATE_CHANGE_APPLY("certificateChangeApply", "证书报告补充或更换申请单", "证书报告补充或更换申请单"),
+    CERTIFICATE_PRINT("certificatePrintData", "证书打印审批", "证书打印审批"),
+    DEPT_EXECUTIVE_TASK("deptExecutiveTaskData", "实验室任务", "实验室任务"),
+    MY_EXECUTIVE_TASK("myExecutiveTaskData", "我的任务", "我的任务"),
+    OUTSOURCE_ASSESS("outsourceAssess", "测试、校准或检定工作分包评审表", "测试、校准或检定工作分包评审表"),
+    OUTSOURCE_PROTOCOL("outsourceProtocol", "测试、校准或检定工作分包协议书", "测试、校准或检定工作分包协议书"),
+
+    /**
+     * 系统管理
+     */
+    SIGN_EXPORT("signData", "签名", "签名"),
+    TEMPLATE_EXPORT("templateData", "文件模板", "文件模板"),
+    FLOW_DEF_EXPORT("flowDefData", "流程定义", "流程定义"),
+    DOWNLOAD_TEMPLATE("downloadTemplate", "流程定义", "页面配置");
 
     ExportEnum(String fileName, String sheetName, String description) {
         this.fileName = fileName;
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateRecordTypeCodeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateRecordTypeCodeEnum.java
index 31d913c..a963522 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateRecordTypeCodeEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateRecordTypeCodeEnum.java
@@ -46,4 +46,14 @@
     String SITE_EXECUTIVE_APPROVAL = "01";
     //《现场测试、校准或检定工作记录表》
     String SITE_EXECUTIVE_LOG = "02";
+
+    //测试、校准或检定工作分包协议书
+    String OUTSOURCE_PROTOCOL = "01";
+    //测试、校准或检定工作分包评审表
+    String OUTSOURCE_ACCESS = "02";
+    //测试、校准或检定工作分包通知书
+    String OUTSOURCE_NOTICE = "03";
+    //测试、校准或检定工作分包方名录
+    String OUTSOURCE_INFO = "04";
+
 }
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
index 24b8635..f78bd53 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
@@ -15,6 +15,10 @@
     String CERTIFICATE_CHANGE_APPLY_BEAN_NAME = "certificateChangeApplyBean";
     //现场测试、校准或检定
     String SITE_EXECUTIVE_BEAN_NAME = "siteExecutiveBean";
+    //测试、校准或检定工作分包评审表
+    String OUTSOURCE_ASSESS_BEAN_NAME = "outsourceAssessBean";
+    //测试、校准或检定工作分包协议书
+    String OUTSOURCE_PROTOCOL_BEAN_NAME = "outsourceProtocolBean";
 
     /*********************************设备与装置************************************/
     //设备台账
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 b21c661..6b86fd1 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
@@ -18,6 +18,8 @@
     OUTSOURCER_APPROVAL(OUTSOURCER_BEAN_NAME, ""),
     CERTIFICATE_CHANGE_APPROVAL(CERTIFICATE_CHANGE_APPLY_BEAN_NAME, ""),
     SITE_EXECUTIVE_APPROVAL(SITE_EXECUTIVE_BEAN_NAME, ""),
+    OUTSOURCE_ASSESS_APPROVAL(OUTSOURCE_ASSESS_BEAN_NAME, ""),
+    OUTSOURCE_PROTOCOL_APPROVAL(OUTSOURCE_PROTOCOL_BEAN_NAME, ""),
 
     ACTION_STATUS_MAP(new HashMap<String, AwareActionStatusEnum>() {
         {
@@ -47,6 +49,10 @@
             put(ApplyFromIdEnum.CERTIFICATE_CHANGE_APPROVAL.getCode(), CERTIFICATE_CHANGE_APPROVAL);
             //现场测试、校准或检定审批
             put(ApplyFromIdEnum.SITE_EXECUTIVE_APPROVAL.getCode(), SITE_EXECUTIVE_APPROVAL);
+            //测试、校准或检定工作分包评审表
+            put(ApplyFromIdEnum.OUTSOURCE_ASSESS_APPROVAL.getCode(), OUTSOURCE_ASSESS_APPROVAL);
+            //测试、校准或检定工作分包协议书
+            put(ApplyFromIdEnum.OUTSOURCE_PROTOCOL_APPROVAL.getCode(), OUTSOURCE_PROTOCOL_APPROVAL);
         }
     });
     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 934405e..c7410bd 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
@@ -9,6 +9,8 @@
     CERTIFICATE_CHANGE_APPROVAL("jljdywzsbchghsqd", MessageSourceModuleEnum.BUSINESS.getCode(), "证书/报告补充或更换申请单"),
     OUTSOURCER_APPROVAL("jljdywcsjzhgfbfml", MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定合格分包方名录"),
     SITE_EXECUTIVE_APPROVAL("jljdywxccsjzsp", MessageSourceModuleEnum.BUSINESS.getCode(), "现场测试、校准或检定审批"),
+    OUTSOURCE_ASSESS_APPROVAL("jljdywcsjzfbpsb", MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包评审表"),
+    OUTSOURCE_PROTOCOL_APPROVAL("jljdywcsjzfbxys", MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包协议书"),
 
 
     /*******************************************设备与装置*********************************************/
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/GeneralApprovalMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/GeneralApprovalMapper.java
index 4fb7344..0c9d6ae 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/GeneralApprovalMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/GeneralApprovalMapper.java
@@ -17,8 +17,4 @@
 
     Page<O> selectBatchForApprovalList(Page<O> page, @Param("request") R request, @Param("businessKeys") List<String> businessKeys);
 
-//    Page<O> selectListPage(Page<O> page, @Param("request") R request);
-
-//    Long selectMaxNo();
-
 }
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceAssessMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceAssessMapper.java
index 7867bb8..ba59009 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceAssessMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceAssessMapper.java
@@ -1,7 +1,12 @@
 package com.casic.missiles.mapper.business;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.business.outsource.OutsourceAssessApprovalListRequest;
+import com.casic.missiles.mapper.GeneralApprovalMapper;
 import com.casic.missiles.model.business.BizBusinessOutsourceAssess;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * <p>
@@ -11,6 +16,10 @@
  * @author wangpeng
  * @since 2023-08-16
  */
-public interface BizBusinessOutsourceAssessMapper extends BaseMapper<BizBusinessOutsourceAssess> {
+public interface BizBusinessOutsourceAssessMapper extends GeneralApprovalMapper<BizBusinessOutsourceAssess, BizBusinessOutsourceAssess, OutsourceAssessApprovalListRequest> {
+
+    Page<BizBusinessOutsourceAssess> selectBatchForApprovalList(Page<BizBusinessOutsourceAssess> page, @Param("request") OutsourceAssessApprovalListRequest request, @Param("businessKeys") List<String> businessKeys);
+
+    Long selectMaxProjectNo();
 
 }
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceProtocolMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceProtocolMapper.java
new file mode 100644
index 0000000..e6aba35
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceProtocolMapper.java
@@ -0,0 +1,24 @@
+package com.casic.missiles.mapper.business;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.business.outsource.OutsourceProtocolApprovalListRequest;
+import com.casic.missiles.mapper.GeneralApprovalMapper;
+import com.casic.missiles.model.business.BizBusinessOutsourceProtocol;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 计量检定业务-分包管理-测试、校准或检定工作分包协议书 Mapper 接口
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-08-24
+ */
+public interface BizBusinessOutsourceProtocolMapper extends GeneralApprovalMapper<BizBusinessOutsourceProtocol, BizBusinessOutsourceProtocol, OutsourceProtocolApprovalListRequest> {
+
+    Page<BizBusinessOutsourceProtocol> selectBatchForApprovalList(Page<BizBusinessOutsourceProtocol> page, @Param("request") OutsourceProtocolApprovalListRequest request, @Param("businessKeys") List<String> businessKeys);
+
+    Long selectMaxProtocolNo();
+}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/EnvLocationInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/EnvLocationInfoMapper.java
new file mode 100644
index 0000000..49eff87
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/EnvLocationInfoMapper.java
@@ -0,0 +1,21 @@
+package com.casic.missiles.mapper.resource;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.resource.environment.LocationListRequest;
+import com.casic.missiles.dto.resource.environment.LocationListResponse;
+import com.casic.missiles.model.resource.EnvLocationInfo;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * <p>
+ * 实验室环境监控系统-设备表 Mapper 接口
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-06-07
+ */
+public interface EnvLocationInfoMapper extends BaseMapper<EnvLocationInfo> {
+
+    Page<LocationListResponse> selectLocationListPage(Page<LocationListResponse> page, @Param("request") LocationListRequest request);
+}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java
index de124db..85ed0f7 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java
@@ -1,7 +1,9 @@
 package com.casic.missiles.mapper.system;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.dto.system.SignDetailResponse;
+import com.casic.missiles.dto.system.SignListRequest;
 import com.casic.missiles.model.system.SystemSign;
 import org.apache.ibatis.annotations.Param;
 
@@ -22,4 +24,8 @@
     SignDetailResponse selectSignDetailById(Long id);
 
     List<SystemSign> selectUsableSignList(@Param("userId") Long userId);
+
+    Page<SystemSign> selectSignListPage(Page<SystemSign> page, @Param("request") SignListRequest request);
+
+    List<SystemSign> selectSignList(@Param("request") SignListRequest request);
 }
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateChangeApplyMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateChangeApplyMapper.xml
index d798447..c496092 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateChangeApplyMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateChangeApplyMapper.xml
@@ -30,31 +30,31 @@
         SELECT *
         FROM biz_business_certificate_change_apply
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.changeApplyNo != null and request.changeApplyNo !=''">
+        <if test="request != null and request.changeApplyNo != null and request.changeApplyNo !=''">
             and change_apply_no like concat('%',#{request.changeApplyNo},'%')
         </if>
-        <if test="request.changeReportNo != null and request.changeReportNo !=''">
+        <if test="request != null and request.changeReportNo != null and request.changeReportNo !=''">
             and change_report_no like concat('%',#{request.changeReportNo},'%')
         </if>
-        <if test="request.changeReportName != null and request.changeReportName !=''">
+        <if test="request != null and request.changeReportName != null and request.changeReportName !=''">
             and change_report_name like concat('%',#{request.changeReportName},'%')
         </if>
-        <if test="request.changeType != null and request.changeType !=''">
+        <if test="request != null and request.changeType != null and request.changeType !=''">
             and change_type = #{request.changeType}
         </if>
-        <if test="request.createUserName != null and request.createUserName !=''">
+        <if test="request != null and request.createUserName != null and request.createUserName !=''">
             and create_user_name like concat('%',#{request.createUserName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificatePrintMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificatePrintMapper.xml
index b66cd99..49c0ac8 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificatePrintMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificatePrintMapper.xml
@@ -31,34 +31,34 @@
         LEFT JOIN biz_business_order_sample_relation bosr ON (bosr.order_id = bcr.order_id AND bosr.sample_id = bcr.sample_id)
         LEFT JOIN biz_business_order_info boi ON boi.id = bosr.order_id
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and bcp.approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.printStatus != null and request.printStatus !=''">
+        <if test="request != null and request.printStatus != null and request.printStatus !=''">
             and print_status = #{request.printStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and bcp.create_user_id = #{request.createUserId}
         </if>
-        <if test="request.certificateReportNo != null and request.certificateReportNo !=''">
+        <if test="request != null and request.certificateReportNo != null and request.certificateReportNo !=''">
             and bcr.certificate_report_no like concat('%',#{request.certificateReportNo},'%')
         </if>
-        <if test="request.certificateReportName != null and request.certificateReportName !=''">
+        <if test="request != null and request.certificateReportName != null and request.certificateReportName !=''">
             and bcr.certificate_report_name like concat('%',#{request.certificateReportName},'%')
         </if>
-        <if test="request.customerName != null and request.customerName !=''">
+        <if test="request != null and request.customerName != null and request.customerName !=''">
             and boi.customer_name like concat('%',#{request.customerName},'%')
         </if>
-        <if test="request.sampleNo != null and request.sampleNo !=''">
+        <if test="request != null and request.sampleNo != null and request.sampleNo !=''">
             and bosr.sample_no like concat('%',#{request.sampleNo},'%')
         </if>
-        <if test="request.sampleName != null and request.sampleName !=''">
+        <if test="request != null and request.sampleName != null and request.sampleName !=''">
             and bosr.sample_name like concat('%',#{request.sampleName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and bcp.create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and bcp.create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml
index b366034..767695d 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml
@@ -46,33 +46,37 @@
         SELECT bcr.*, bosr.sample_no, bosr.sample_name, bosr.sample_model, rsi.staff_name
         FROM biz_business_certificate_report bcr
         LEFT JOIN biz_business_order_sample_relation bosr ON (bosr.order_id = bcr.order_id AND bosr.sample_id = bcr.sample_id)
+        LEFT JOIN biz_business_order_info boi ON boi.id = bcr.order_id
         LEFT JOIN biz_resource_staff_info rsi ON rsi.id = bcr.measure_person_id
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and bcr.approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and bcr.create_user_id = #{request.createUserId}
         </if>
-        <if test="request.certificateReportNo != null and request.certificateReportNo !=''">
+        <if test="request != null and request.customerId != null and request.customerId !=''">
+            and boi.customer_id = #{request.customerId}
+        </if>
+        <if test="request != null and request.certificateReportNo != null and request.certificateReportNo !=''">
             and bcr.certificate_report_no like concat('%',#{request.certificateReportNo},'%')
         </if>
-        <if test="request.certificateReportName != null and request.certificateReportName !=''">
+        <if test="request != null and request.certificateReportName != null and request.certificateReportName !=''">
             and bcr.certificate_report_name like concat('%',#{request.certificateReportName},'%')
         </if>
-        <if test="request.sampleNo != null and request.sampleNo !=''">
+        <if test="request != null and request.sampleNo != null and request.sampleNo !=''">
             and bosr.sample_no like concat('%',#{request.sampleNo},'%')
         </if>
-        <if test="request.measureCategory != null and request.measureCategory !=''">
+        <if test="request != null and request.measureCategory != null and request.measureCategory !=''">
             and bcr.measure_category = #{request.measureCategory}
         </if>
-        <if test="request.measurePerson != null and request.measurePerson !=''">
+        <if test="request != null and request.measurePerson != null and request.measurePerson !=''">
             and rsi.staff_name like concat('%',#{request.measurePerson},'%')
         </if>
-        <if test="request.calibrationTimeStart != null and request.calibrationTimeStart !=''">
+        <if test="request != null and request.calibrationTimeStart != null and request.calibrationTimeStart !=''">
             and bcr.calibration_time &gt;= #{request.calibrationTimeStart}
         </if>
-        <if test="request.calibrationTimeEnd != null and request.calibrationTimeEnd !=''">
+        <if test="request != null and request.calibrationTimeEnd != null and request.calibrationTimeEnd !=''">
             and bcr.calibration_time &lt;= #{request.calibrationTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceAssessMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceAssessMapper.xml
index d0fcf8b..c22c101 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceAssessMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceAssessMapper.xml
@@ -7,6 +7,8 @@
         <id column="id" property="id" />
         <result column="project_no" property="projectNo" />
         <result column="project_name" property="projectName" />
+        <result column="lab_code" property="labCode" />
+        <result column="group_code" property="groupCode" />
         <result column="applicant_id" property="applicantId" />
         <result column="applicant_name" property="applicantName" />
         <result column="applicant_time" property="applicantTime" />
@@ -31,7 +33,45 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, project_no, project_name, applicant_id, applicant_name, applicant_time, minio_file_name, remark, create_user_id, create_user_name, outsourcer_id, pre_start_time, pre_end_time, outsource_reason, pre_cost, approval_status, process_id, approve_situation, traceability, test_method, technique_ability, create_time, update_time
+        id, project_no, project_name, lab_code, group_code, applicant_id, applicant_name, applicant_time, minio_file_name, remark, create_user_id, create_user_name, outsourcer_id, pre_start_time, pre_end_time, outsource_reason, pre_cost, approval_status, process_id, approve_situation, traceability, test_method, technique_ability, create_time, update_time
     </sql>
 
+    <select id="selectMaxProjectNo" resultType="java.lang.Long">
+        SELECT IFNULL(max(RIGHT(project_no, 3)), 0) from biz_business_outsource_assess
+    </select>
+
+    <select id="selectBatchForApprovalList" resultMap="BaseResultMap">
+        SELECT bboa.*, bboi.outsourcer_name, bboi.director
+        FROM biz_business_outsource_assess bboa
+        LEFT JOIN biz_business_outsourcer_info bboi ON bboa.outsourcer_id = bboi.id
+        WHERE 1=1
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
+            and bboa.approval_status = #{request.approvalStatus}
+        </if>
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
+            and bboa.create_user_id = #{request.createUserId}
+        </if>
+        <if test="request != null and request.projectNo != null and request.projectNo !=''">
+            and bboa.project_no like concat('%',#{request.projectNo},'%')
+        </if>
+        <if test="request != null and request.outsourcerName != null and request.outsourcerName !=''">
+            and bboi.outsourcer_name like concat('%',#{request.outsourcerName},'%')
+        </if>
+        <if test="request != null and request.applicantName != null and request.applicantName !=''">
+            and bboa.applicant_name like concat('%',#{request.applicantName},'%')
+        </if>
+        <if test="request != null and request.applicantTimeStart != null and request.applicantTimeStart !=''">
+            and bboa.applicant_time &gt;= #{request.applicantTimeStart}
+        </if>
+        <if test="request != null and request.applicantTimeEnd != null and request.applicantTimeEnd !=''">
+            and bboa.applicant_time &lt;= #{request.applicantTimeEnd}
+        </if>
+        <if test="businessKeys != null">
+            and bboa.id in
+            <foreach collection="businessKeys" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
+        ORDER BY bboa.create_time DESC
+    </select>
 </mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceProtocolMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceProtocolMapper.xml
new file mode 100644
index 0000000..b7b2149
--- /dev/null
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceProtocolMapper.xml
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.mapper.business.BizBusinessOutsourceProtocolMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.business.BizBusinessOutsourceProtocol">
+        <id column="id" property="id" />
+        <result column="protocol_no" property="protocolNo" />
+        <result column="project_name" property="projectName" />
+        <result column="lab_code" property="labCode" />
+        <result column="group_code" property="groupCode" />
+        <result column="outsourcer_id" property="outsourcerId" />
+        <result column="remark" property="remark" />
+        <result column="outsource_no" property="outsourceNo" />
+        <result column="outsource_name" property="outsourceName" />
+        <result column="contacts" property="contacts" />
+        <result column="mobile" property="mobile" />
+        <result column="address" property="address" />
+        <result column="require_date" property="requireDate" />
+        <result column="outsource_cost" property="outsourceCost" />
+        <result column="director" property="director" />
+        <result column="item" property="item" />
+        <result column="requires" property="requires" />
+        <result column="create_user_id" property="createUserId" />
+        <result column="create_user_name" property="createUserName" />
+        <result column="approval_status" property="approvalStatus" />
+        <result column="process_id" property="processId" />
+        <result column="create_time" property="createTime" />
+        <result column="update_time" property="updateTime" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, protocol_no, project_name, lab_code, group_code, outsourcer_id, remark, outsource_no, outsource_name, contacts, mobile, address, require_date, outsource_cost, director, item, requires, create_user_id, create_user_name, approval_status, process_id, create_time, update_time
+    </sql>
+
+    <select id="selectMaxProtocolNo" resultType="java.lang.Long">
+        SELECT IFNULL(max(RIGHT(protocol_no, 3)), 0) from biz_business_outsource_protocol
+    </select>
+
+    <select id="selectBatchForApprovalList" resultMap="BaseResultMap">
+        SELECT *
+        FROM biz_business_outsource_protocol
+        WHERE 1=1
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
+            and approval_status = #{request.approvalStatus}
+        </if>
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
+            and create_user_id = #{request.createUserId}
+        </if>
+        <if test="request != null and request.protocolNo != null and request.protocolNo !=''">
+            and protocol_no like concat('%',#{request.protocolNo},'%')
+        </if>
+        <if test="request != null and request.outsourcerName != null and request.outsourcerName !=''">
+            and outsourcer_name like concat('%',#{request.outsourcerName},'%')
+        </if>
+        <if test="request != null and request.applicantName != null and request.applicantName !=''">
+            and create_user_name like concat('%',#{request.applicantName},'%')
+        </if>
+        <if test="request != null and request.applicantTimeStart != null and request.applicantTimeStart !=''">
+            and create_time &gt;= #{request.applicantTimeStart}
+        </if>
+        <if test="request != null and request.applicantTimeEnd != null and request.applicantTimeEnd !=''">
+            and create_time &lt;= #{request.applicantTimeEnd}
+        </if>
+        <if test="businessKeys != null">
+            and id in
+            <foreach collection="businessKeys" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
+        ORDER BY create_time DESC
+    </select>
+</mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourcerInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourcerInfoMapper.xml
index 510a80b..3049b54 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourcerInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourcerInfoMapper.xml
@@ -7,6 +7,8 @@
         <id column="id" property="id" />
         <result column="outsourcer_no" property="outsourcerNo" />
         <result column="outsourcer_name" property="outsourcerName" />
+        <result column="lab_code" property="labCode" />
+        <result column="group_code" property="groupCode" />
         <result column="outsourcer_brief_name" property="outsourcerBriefName" />
         <result column="outsourcer_size" property="outsourcerSize" />
         <result column="business_size" property="businessSize" />
@@ -55,32 +57,32 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, outsourcer_no, outsourcer_name, outsourcer_brief_name, outsourcer_size, business_size, grade, evaluation, tax_number, bank_account, bank_name, bank_account_number, postal_code, director, phone, fax, mobile, email, website, address_country, address_province, address_city, address_area, full_address, address_country_name, address_province_name, address_city_name, address_area_name, invoice_country, invoice_province, invoice_city, invoice_area, invoice_full_address, invoice_country_name, invoice_province_name, invoice_city_name, invoice_area_name, business_scope, business_content, minio_file_name, approval_status, process_id, remark, create_user_id, create_user_name, create_time, update_time
+        id, outsourcer_no, outsourcer_name, lab_code, group_code, outsourcer_brief_name, outsourcer_size, business_size, grade, evaluation, tax_number, bank_account, bank_name, bank_account_number, postal_code, director, phone, fax, mobile, email, website, address_country, address_province, address_city, address_area, full_address, address_country_name, address_province_name, address_city_name, address_area_name, invoice_country, invoice_province, invoice_city, invoice_area, invoice_full_address, invoice_country_name, invoice_province_name, invoice_city_name, invoice_area_name, business_scope, business_content, minio_file_name, approval_status, process_id, remark, create_user_id, create_user_name, create_time, update_time
     </sql>
 
     <select id="selectBatchForApprovalList" resultMap="BaseResultMap">
         SELECT *
         FROM biz_business_outsourcer_info
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.outsourcerNo != null and request.outsourcerNo !=''">
+        <if test="request != null and request.outsourcerNo != null and request.outsourcerNo !=''">
             and outsourcer_no like concat('%',#{request.outsourcerNo},'%')
         </if>
-        <if test="request.outsourcerName != null and request.outsourcerName !=''">
+        <if test="request != null and request.outsourcerName != null and request.outsourcerName !=''">
             and outsourcer_name like concat('%',#{request.outsourcerName},'%')
         </if>
-        <if test="request.director != null and request.director !=''">
+        <if test="request != null and request.director != null and request.director !=''">
             and director like concat('%',#{request.director},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
@@ -93,6 +95,6 @@
     </select>
 
     <select id="selectMaxNo" resultType="java.lang.Long">
-        SELECT IFNULL(max(RIGHT(outsourcer_no, 12)), 0) from biz_business_outsourcer_info
+        SELECT IFNULL(max(RIGHT(outsourcer_no, 3)), 0) from biz_business_outsourcer_info
     </select>
 </mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessSiteExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessSiteExecutiveInfoMapper.xml
index 135c5d0..3c5ae79 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessSiteExecutiveInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessSiteExecutiveInfoMapper.xml
@@ -38,25 +38,25 @@
         FROM biz_business_site_executive_info bsei
         LEFT JOIN biz_resource_customer_info rci ON bsei.customer_id = rci.id
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and bsei.approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and bsei.create_user_id = #{request.createUserId}
         </if>
-        <if test="request.siteExecutiveNo != null and request.siteExecutiveNo !=''">
+        <if test="request != null and request.siteExecutiveNo != null and request.siteExecutiveNo !=''">
             and bsei.site_executive_no like concat('%',#{request.siteExecutiveNo},'%')
         </if>
-        <if test="request.customerName != null and request.customerName !=''">
+        <if test="request != null and request.customerName != null and request.customerName !=''">
             and rci.outsourcer_name like concat('%',#{request.customerName},'%')
         </if>
-        <if test="request.applyName != null and request.applyName !=''">
+        <if test="request != null and request.applyName != null and request.applyName !=''">
             and bsei.apply_name like concat('%',#{request.applyName},'%')
         </if>
-        <if test="request.applyTimeStart != null and request.applyTimeStart !=''">
+        <if test="request != null and request.applyTimeStart != null and request.applyTimeStart !=''">
             and bsei.apply_time &gt;= #{request.applyTimeStart}
         </if>
-        <if test="request.applyTimeEnd != null and request.applyTimeEnd !=''">
+        <if test="request != null and request.applyTimeEnd != null and request.applyTimeEnd !=''">
             and bsei.apply_time &lt;= #{request.applyTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml
index 84d9e2a..6bd38a9 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml
@@ -105,6 +105,12 @@
         <if test="request.isUrgent != null and request.isUrgent !=''">
             AND bo.is_urgent = #{request.isUrgent}
         </if>
+        <if test="request.ids != null">
+            and blei.id in
+            <foreach collection="request.ids" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
         ORDER BY blei.update_time DESC
     </select>
 
@@ -137,6 +143,12 @@
         <if test="request.isUrgent != null and request.isUrgent !=''">
             AND bo.is_urgent = #{request.isUrgent}
         </if>
+        <if test="request.ids != null">
+            and blei.id in
+            <foreach collection="request.ids" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
         ORDER BY blei.update_time DESC
     </select>
 
diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardInfoMapper.xml
index 1a5551b..2ed8d17 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardInfoMapper.xml
@@ -45,12 +45,6 @@
         FROM biz_equipment_standard_info besi
         LEFT JOIN biz_equipment_standard_technology_relation bestr ON besi.standard_no = bestr.standard_no
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
-            and besi.approval_status = #{request.approvalStatus}
-        </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
-            and besi.create_user_id = #{request.createUserId}
-        </if>
         <if test="request.standardName != null and request.standardName !=''">
             and besi.standard_name like concat('%',#{request.standardName},'%')
         </if>
diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardTechnologyRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardTechnologyRelationMapper.xml
index fc7e16c..cd03c8c 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardTechnologyRelationMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardTechnologyRelationMapper.xml
@@ -6,6 +6,7 @@
     <resultMap id="BaseResultMap" type="com.casic.missiles.model.equipment.BizEquipmentStandardTechnologyRelation">
         <id column="id" property="id" />
         <result column="technology_file_id" property="technologyFileId" />
+        <result column="technology_file_no" property="technologyFileNo" />
         <result column="technology_file_name" property="technologyFileName" />
         <result column="standard_id" property="standardId" />
         <result column="standard_no" property="standardNo" />
@@ -14,7 +15,7 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, technology_file_id, technology_file_name, standard_id, remark
+        id, technology_file_id, technology_file_no, technology_file_name, standard_id, remark
     </sql>
 
 </mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceAuthorizeOrderMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceAuthorizeOrderMapper.xml
index ac5176c..554fe65 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceAuthorizeOrderMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceAuthorizeOrderMapper.xml
@@ -32,22 +32,22 @@
         SELECT *
         FROM biz_resource_authorize_order
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.orderNo != null and request.orderNo !=''">
+        <if test="request != null and request.orderNo != null and request.orderNo !=''">
             and order_no like concat('%',#{request.orderNo},'%')
         </if>
-        <if test="request.createUserName != null and request.createUserName !=''">
+        <if test="request != null and request.createUserName != null and request.createUserName !=''">
             and create_user_name like concat('%',#{request.createUserName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerExamineFormMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerExamineFormMapper.xml
index ab242f6..af7f98f 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerExamineFormMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerExamineFormMapper.xml
@@ -41,28 +41,28 @@
         SELECT *
         FROM biz_resource_customer_examine_form
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.formNo != null and request.formNo !=''">
+        <if test="request != null and request.formNo != null and request.formNo !=''">
             and form_no like concat('%',#{request.formNo},'%')
         </if>
-        <if test="request.labCode != null and request.labCode !=''">
+        <if test="request != null and request.labCode != null and request.labCode !=''">
             and lab_code like concat('%',#{request.labCode},'%')
         </if>
-        <if test="request.groupCode != null and request.groupCode !=''">
+        <if test="request != null and request.groupCode != null and request.groupCode !=''">
             and group_code like concat('%',#{request.groupCode},'%')
         </if>
-        <if test="request.createUserName != null and request.createUserName !=''">
+        <if test="request != null and request.createUserName != null and request.createUserName !=''">
             and create_user_name like concat('%',#{request.createUserName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerInfoMapper.xml
index fa8ffbc..06a2798 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerInfoMapper.xml
@@ -33,25 +33,25 @@
         SELECT *
         FROM biz_resource_customer_info
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.customerNo != null and request.customerNo !=''">
+        <if test="request != null and request.customerNo != null and request.customerNo !=''">
             and customer_no like concat('%',#{request.customerNo},'%')
         </if>
-        <if test="request.customerName != null and request.customerName !=''">
+        <if test="request != null and request.customerName != null and request.customerName !=''">
             and customer_name like concat('%',#{request.customerName},'%')
         </if>
-        <if test="request.contacts != null and request.contacts !=''">
+        <if test="request != null and request.contacts != null and request.contacts !=''">
             and contacts like concat('%',#{request.contacts},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerSuggestFormMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerSuggestFormMapper.xml
index 28f5bb2..1806662 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerSuggestFormMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerSuggestFormMapper.xml
@@ -33,28 +33,28 @@
         SELECT *
         FROM biz_resource_customer_suggest_form
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.formNo != null and request.formNo !=''">
+        <if test="request != null and request.formNo != null and request.formNo !=''">
             and form_no like concat('%',#{request.formNo},'%')
         </if>
-        <if test="request.customerName != null and request.customerName !=''">
+        <if test="request != null and request.customerName != null and request.customerName !=''">
             and customer_name like concat('%',#{request.customerName},'%')
         </if>
-        <if test="request.customerDeptName != null and request.customerDeptName !=''">
+        <if test="request != null and request.customerDeptName != null and request.customerDeptName !=''">
             and customer_dept_name like concat('%',#{request.customerDeptName},'%')
         </if>
-        <if test="request.createUserName != null and request.createUserName !=''">
+        <if test="request != null and request.createUserName != null and request.createUserName !=''">
             and create_user_name like concat('%',#{request.createUserName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSealUseNoteMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSealUseNoteMapper.xml
index ab37bc1..b02bb33 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSealUseNoteMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSealUseNoteMapper.xml
@@ -29,32 +29,32 @@
     </sql>
 
     <select id="selectBatchForApprovalList" resultMap="BaseResultMap">
-        SELECT *
+        SELECT brsun.*, brsi.seal_name, brsi.seal_type, brsi.approver_name
         FROM biz_resource_seal_use_note brsun
         JOIN biz_resource_seal_info brsi ON brsun.seal_id = brsi.id
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and brsun.approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and brsun.create_user_id = #{request.createUserId}
         </if>
-        <if test="request.sealName != null and request.sealName !=''">
+        <if test="request != null and request.sealName != null and request.sealName !=''">
             and brsi.seal_name like concat('%',#{request.sealName},'%')
         </if>
-        <if test="request.sealType != null and request.sealType !=''">
+        <if test="request != null and request.sealType != null and request.sealType !=''">
             and brsi.seal_type = #{request.sealType}
         </if>
-        <if test="request.applyDeptName != null and request.applyDeptName !=''">
+        <if test="request != null and request.applyDeptName != null and request.applyDeptName !=''">
             and brsun.apply_dept_name like concat('%',#{request.applyDeptName},'%')
         </if>
-        <if test="request.applyUserName != null and request.applyUserName !=''">
+        <if test="request != null and request.applyUserName != null and request.applyUserName !=''">
             and brsun.apply_user_name like concat('%',#{request.applyUserName},'%')
         </if>
-        <if test="request.applyTimeStart != null and request.applyTimeStart !=''">
+        <if test="request != null and request.applyTimeStart != null and request.applyTimeStart !=''">
             and brsun.apply_time &gt;= #{request.applyTimeStart}
         </if>
-        <if test="request.applyTimeEnd != null and request.applyTimeEnd !=''">
+        <if test="request != null and request.applyTimeEnd != null and request.applyTimeEnd !=''">
             and brsun.apply_time &lt;= #{request.applyTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml
index 119bf7d..4f8392a 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml
@@ -31,6 +31,12 @@
         <if test="request.deptName != null and request.deptName !=''">
             and brsi.dept_name like concat('%',#{request.deptName},'%')
         </if>
+        <if test="request.ids != null">
+            and brsv.id in
+            <foreach collection="request.ids" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
         ORDER BY brsv.grant_date DESC
     </select>
 
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSupplierInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSupplierInfoMapper.xml
index fe8d399..e8ce7ef 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSupplierInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSupplierInfoMapper.xml
@@ -48,28 +48,28 @@
         SELECT *
         FROM biz_resource_supplier_info
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.supplierNo != null and request.supplierNo !=''">
+        <if test="request != null and request.supplierNo != null and request.supplierNo !=''">
             and supplier_no like concat('%',#{request.supplierNo},'%')
         </if>
-        <if test="request.supplierName != null and request.supplierName !=''">
+        <if test="request != null and request.supplierName != null and request.supplierName !=''">
             and supplier_name like concat('%',#{request.supplierName},'%')
         </if>
-        <if test="request.director != null and request.director !=''">
+        <if test="request != null and request.director != null and request.director !=''">
             and director like concat('%',#{request.director},'%')
         </if>
-        <if test="request.supplierType != null and request.supplierType !=''">
+        <if test="request != null and request.supplierType != null and request.supplierType !=''">
             and supplier_type = #{request.supplierType}
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/EnvLocationInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/EnvLocationInfoMapper.xml
new file mode 100644
index 0000000..68bcf10
--- /dev/null
+++ b/casic-metering-dao/src/main/resources/mapper/resource/EnvLocationInfoMapper.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.mapper.resource.EnvLocationInfoMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.resource.EnvLocationInfo">
+        <id column="id" property="id" />
+        <result column="location_no" property="locationNo" />
+        <result column="location_name" property="locationName" />
+        <result column="location_position" property="locationPosition" />
+        <result column="create_user_id" property="createUserId" />
+        <result column="create_user" property="createUser" />
+        <result column="create_time" property="createTime" />
+        <result column="update_time" property="updateTime" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, location_no, location_name, location_position, create_user_id, create_user, create_time, update_time
+    </sql>
+
+    <select id="selectLocationListPage" resultType="com.casic.missiles.dto.resource.environment.LocationListResponse">
+        SELECT *
+        FROM env_location_info
+        WHERE 1=1
+        <if test="request.locationNo != null and request.locationNo !=''">
+            AND location_no LIKE concat('%',#{request.locationNo},'%')
+        </if>
+        <if test="request.locationName != null and request.locationName !=''">
+            AND location_name LIKE concat('%',#{request.locationName},'%')
+        </if>
+        ORDER BY create_time DESC
+    </select>
+
+</mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml
index b28c18f..8854047 100644
--- a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml
@@ -11,7 +11,6 @@
         <result column="sign_desc" property="signDesc" />
         <result column="sign_director" property="signDirector" />
         <result column="sign_user_id" property="signUserId" />
-        <result column="sign_type" property="signType" />
         <result column="minio_file_name" property="minioFileName" />
         <result column="create_time" property="createTime" />
         <result column="update_time" property="updateTime" />
@@ -28,7 +27,6 @@
         <result column="sign_name" property="signName" />
         <result column="sign_desc" property="signDesc" />
         <result column="sign_director" property="signDirector" />
-        <result column="sign_type" property="signType" />
         <result column="sign_user_id" property="signUserId" />
         <result column="minio_file_name" property="minioFileName" />
         <result column="create_time" property="createTime" />
@@ -62,4 +60,58 @@
         JOIN system_sign_user_relation ssur ON ss.id = ssur.sign_id
         WHERE ssur.user_id = #{userId}
     </select>
+
+    <select id="selectSignListPage" resultMap="BaseResultMap">
+        SELECT ss.*, sd.SIMPLE_NAME AS deptName
+        FROM system_sign ss
+        LEFT JOIN sys_user su ON su.id = ss.sign_user_id
+        LEFT JOIN sys_dept sd ON sd.id = su.dept_id
+        WHERE 1=1
+        <if test="request.signNo != null and request.signNo !=''">
+            AND ss.sign_no LIKE concat('%',#{request.signNo},'%')
+        </if>
+        <if test="request.signName != null and request.signName !=''">
+            AND ss.sign_name LIKE concat('%',#{request.signName},'%')
+        </if>
+        <if test="request.signDirector != null and request.signDirector !=''">
+            AND ss.sign_director LIKE concat('%',#{request.signDirector},'%')
+        </if>
+        <if test="request.signUserId != null and request.signUserId !=''">
+            AND ss.sign_user_id = #{request.signUserId}
+        </if>
+        <if test="request.createStartTime != null and request.createStartTime !=''">
+            AND DATE_FORMAT(ss.create_time,'%Y-%m-%d') &gt;= DATE_FORMAT(#{request.createStartTime},'%Y-%m-%d')
+        </if>
+        <if test="request.createEndTime != null and request.createEndTime !=''">
+            AND DATE_FORMAT(ss.create_time,'%Y-%m-%d')  &lt;= DATE_FORMAT(#{request.createEndTime},'%Y-%m-%d')
+        </if>
+        ORDER BY ss.create_time DESC
+    </select>
+
+    <select id="selectSignList" resultMap="BaseResultMap">
+        SELECT ss.*, sd.SIMPLE_NAME AS deptName
+        FROM system_sign ss
+        LEFT JOIN sys_user su ON su.id = ss.sign_user_id
+        LEFT JOIN sys_dept sd ON sd.id = su.dept_id
+        WHERE 1=1
+        <if test="request.signNo != null and request.signNo !=''">
+            AND ss.sign_no LIKE concat('%',#{request.signNo},'%')
+        </if>
+        <if test="request.signName != null and request.signName !=''">
+            AND ss.sign_name LIKE concat('%',#{request.signName},'%')
+        </if>
+        <if test="request.signDirector != null and request.signDirector !=''">
+            AND ss.sign_director LIKE concat('%',#{request.signDirector},'%')
+        </if>
+        <if test="request.signUserId != null and request.signUserId !=''">
+            AND ss.sign_user_id = #{request.signUserId}
+        </if>
+        <if test="request.createStartTime != null and request.createStartTime !=''">
+            AND DATE_FORMAT(ss.create_time,'%Y-%m-%d') &gt;= DATE_FORMAT(#{request.createStartTime},'%Y-%m-%d')
+        </if>
+        <if test="request.createEndTime != null and request.createEndTime !=''">
+            AND DATE_FORMAT(ss.create_time,'%Y-%m-%d')  &lt;= DATE_FORMAT(#{request.createEndTime},'%Y-%m-%d')
+        </if>
+        ORDER BY ss.create_time DESC
+    </select>
 </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 515050a..60f530b 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
@@ -47,8 +47,8 @@
     String STORAGE_LOCATION = "bizStorageLocation";
     //计量专业
     String MEASURE_MAJOR = "bizMeasureMajor";
-    //管理状态
-    String MANAGER_STATE = "bizManagerState";
+    //标准装置管理状态
+    String STANDARD_MANAGER_STATE = "bizStandardManagerState";
 
     /**
      * 资源管理 字典code
@@ -95,8 +95,6 @@
     String MEASURE_STATUS = "measureStatus";
     //检定方式
     String MEASURE_TYPE = "measureType";
-    //标识打印标志类型
-    String IDENTIFY_PRINT_TYPE = "bizBusinessIdentify";
     //变更类型
     String REPORT_CHANGE_TYPE = "bizCertChangeType";
     //规模类型
@@ -111,19 +109,24 @@
     String MEASURE_CATEGORY = "measureCategory";
     //检定结果
     String MEASURE_RESULT = "measureResult";
+    //分包原因
+    String OUTSOURCE_REASON = "outsourceReason";
+
+    /**
+     * 系统管理
+     */
+    String TEMPLATE_TYPE = "templateType";
+
 
     /**
      * 标准装置 字典code
      */
     //类别
     String STANDARD_CATEGORY = "standardCategory";
-    //管理状态
-    String STANDARD_MANAGER_STATE = "standardManagerState";
     //标准等级
     String STANDARD_LEVEL = "standardLevel";
     //传递范围
     String STANDARD_TRANSMIT_RANGE = "transmitRange";
-
     //资本来源
     String CAPITAL_SOURCE = "capitalSource";
     //标准装置-申请类型
@@ -148,8 +151,6 @@
     String CERTIFICATE_CLASS = "certificationClass";
     //证书管理-检校专业
     String CALIBRATION_MAJOR = "calibrationMajor";
-    //分包原因
-    String OUTSOURCE_REASON = "outsourceReason";
 
     /**
      * 工作台
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/BaseApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/BaseApprovalListRequest.java
index 73c12c1..80d7424 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/BaseApprovalListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/BaseApprovalListRequest.java
@@ -6,6 +6,7 @@
 
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotEmpty;
+import java.util.List;
 
 /**
  * @Description:
@@ -19,14 +20,14 @@
      * 表单id
      */
     @NotBlank(message = "表单id不能为空")
-    @ApiModelProperty(value = "表单id（流程定义对应的表单id，等价于业务id）", dataType = "String")
+    @ApiModelProperty(value = "表单id（流程定义对应的表单id，等价于业务id），导出接口不用传", dataType = "String")
     private String formId;
 
     /**
      * 审批状态类型，对应ApprovalStatusEnum
      */
     @NotEmpty(message = "审批状态类型不能为空")
-    @ApiModelProperty(value = "审批状态类型code", dataType = "String")
+    @ApiModelProperty(value = "审批状态类型code，导出接口不用传", dataType = "String")
     private String approvalStatus;
 
     @ApiModelProperty(hidden = true)
@@ -34,4 +35,7 @@
 
     @ApiModelProperty(hidden = true)
     private Long createUserId;
+
+    @ApiModelProperty(value = "导出ids", dataType = "List")
+    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificatePrintApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificatePrintApprovalListRequest.java
index b93d1c9..3cc2f4e 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificatePrintApprovalListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificatePrintApprovalListRequest.java
@@ -5,8 +5,6 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import java.util.List;
-
 /**
  * @Description:
  * @Author: wangpeng
@@ -38,7 +36,4 @@
 
     @ApiModelProperty(value = "创建结束时间", dataType = "String")
     private String createTimeEnd;
-
-    @ApiModelProperty(value = "导出ids", dataType = "List")
-    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportApprovalListRequest.java
index 4f7a038..c115847 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportApprovalListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportApprovalListRequest.java
@@ -5,8 +5,6 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import java.util.List;
-
 /**
  * @Description:
  * @Author: wangpeng
@@ -15,6 +13,8 @@
 @ApiModel
 @Data
 public class CertificateReportApprovalListRequest extends BaseApprovalListRequest {
+    @ApiModelProperty(value = "委托方id", dataType = "String")
+    private Long customerId;
 
     @ApiModelProperty(value = "证书报告编号", dataType = "String")
     private String certificateReportNo;
@@ -37,6 +37,4 @@
     @ApiModelProperty(value = "检校结束时间", dataType = "String")
     private String calibrationTimeEnd;
 
-    @ApiModelProperty(value = "导出ids", dataType = "List")
-    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/identify/IdentifyListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/identify/IdentifyListRequest.java
index 1b87ae6..f019203 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/identify/IdentifyListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/identify/IdentifyListRequest.java
@@ -4,6 +4,8 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * @Description:
  * @Author: wangpeng
@@ -26,4 +28,7 @@
 
     @ApiModelProperty(value = "打印结束时间", dataType = "String")
     private String createTimeEnd;
+
+    @ApiModelProperty(value = "导出ids", dataType = "List")
+    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListRequest.java
index 1264883..62415fb 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListRequest.java
@@ -7,6 +7,7 @@
 import lombok.Data;
 
 import javax.validation.constraints.NotBlank;
+import java.util.List;
 
 @Data
 @ApiModel
@@ -37,4 +38,6 @@
     @ApiModelProperty(value = "是否加急（1是0否null全部）", dataType = "Integer")
     private String isUrgent;
 
+    @ApiModelProperty(value = "导出ids", dataType = "List")
+    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListRequest.java
index 5201d7b..499760a 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListRequest.java
@@ -17,6 +17,9 @@
     @ApiModelProperty(value = "任务单编号", dataType = "String")
     private String orderNo;
 
+    @ApiModelProperty(value = "委托方id", dataType = "Long")
+    private Long customerId;
+
     @ApiModelProperty(value = "委托方名称", dataType = "String")
     private String customerName;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OrderSampleDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OrderSampleDTO.java
new file mode 100644
index 0000000..796edc0
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OrderSampleDTO.java
@@ -0,0 +1,19 @@
+package com.casic.missiles.dto.business.outsource;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/8/24 11:38
+ */
+@ApiModel
+@Data
+public class OrderSampleDTO {
+    @ApiModelProperty(value = "任务单id", dataType = "Long")
+    private Long orderId;
+    @ApiModelProperty(value = "受检设备id", dataType = "Long")
+    private Long sampleId;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceAssessApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceAssessApprovalListRequest.java
new file mode 100644
index 0000000..9a930c3
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceAssessApprovalListRequest.java
@@ -0,0 +1,30 @@
+package com.casic.missiles.dto.business.outsource;
+
+import com.casic.missiles.dto.BaseApprovalListRequest;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/8/24 11:01
+ */
+@ApiModel
+@Data
+public class OutsourceAssessApprovalListRequest extends BaseApprovalListRequest {
+    @ApiModelProperty(value = "评审表编号", dataType = "String")
+    private String projectNo;
+
+    @ApiModelProperty(value = "分包机构名称", dataType = "String")
+    private String outsourcerName;
+
+    @ApiModelProperty(value = "申请人", dataType = "String")
+    private String applicantName;
+
+    @ApiModelProperty(value = "申请时间开始", dataType = "String")
+    private String applicantTimeStart;
+
+    @ApiModelProperty(value = "申请时间结束", dataType = "String")
+    private String applicantTimeEnd;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceAssessSaveResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceAssessSaveResponse.java
new file mode 100644
index 0000000..8bf9aad
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceAssessSaveResponse.java
@@ -0,0 +1,20 @@
+package com.casic.missiles.dto.business.outsource;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/8/14 16:17
+ */
+@ApiModel
+@Data
+public class OutsourceAssessSaveResponse {
+    @ApiModelProperty(value = "主键id", dataType = "Long")
+    private Long id;
+
+    @ApiModelProperty(value = "编号", dataType = "String")
+    private String projectNo;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProtocolApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProtocolApprovalListRequest.java
new file mode 100644
index 0000000..0f32331
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProtocolApprovalListRequest.java
@@ -0,0 +1,30 @@
+package com.casic.missiles.dto.business.outsource;
+
+import com.casic.missiles.dto.BaseApprovalListRequest;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/8/24 15:01
+ */
+@ApiModel
+@Data
+public class OutsourceProtocolApprovalListRequest extends BaseApprovalListRequest {
+    @ApiModelProperty(value = "协议书编号", dataType = "String")
+    private String protocolNo;
+
+    @ApiModelProperty(value = "分包方名称", dataType = "String")
+    private String outsourcerName;
+
+    @ApiModelProperty(value = "申请人", dataType = "String")
+    private String applicantName;
+
+    @ApiModelProperty(value = "申请时间开始", dataType = "String")
+    private String applicantTimeStart;
+
+    @ApiModelProperty(value = "申请时间结束", dataType = "String")
+    private String applicantTimeEnd;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProtocolSaveResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProtocolSaveResponse.java
new file mode 100644
index 0000000..e324967
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProtocolSaveResponse.java
@@ -0,0 +1,20 @@
+package com.casic.missiles.dto.business.outsource;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/8/14 16:17
+ */
+@ApiModel
+@Data
+public class OutsourceProtocolSaveResponse {
+    @ApiModelProperty(value = "主键id", dataType = "Long")
+    private Long id;
+
+    @ApiModelProperty(value = "编号", dataType = "String")
+    private String protocolNo;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveApprovalListRequest.java
index f29f4e4..7047c28 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveApprovalListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveApprovalListRequest.java
@@ -5,8 +5,6 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import java.util.List;
-
 /**
  * @Description: 现场检测审批列表请求实体
  * @Author: wangpeng
@@ -30,7 +28,4 @@
     @ApiModelProperty(value = "申请时间结束", dataType = "String")
     private String applyTimeEnd;
 
-    @ApiModelProperty(value = "导出ids", dataType = "List")
-    private List<Long> ids;
-
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveDetailResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveDetailResponse.java
index 1f28752..394c934 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveDetailResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveDetailResponse.java
@@ -12,6 +12,18 @@
     @ApiModelProperty(value = "id，更新/删除使用参数", dataType = "Long")
     private Long id;
 
+    @ApiModelProperty(value = "实验室代码(字典code)", dataType = "String")
+    private String labCode;
+
+    @ApiModelProperty(value = "实验室代码(字典value)", dataType = "String")
+    private String labCodeName;
+
+    @ApiModelProperty(value = "组别代码(字典code)", dataType = "String")
+    private String groupCode;
+
+    @ApiModelProperty(value = "组别代码(字典value)", dataType = "String")
+    private String groupCodeName;
+
     @ApiModelProperty(value = "审批编号", dataType = "String")
     private String siteExecutiveNo;
 

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java
index bb0c50f..13a699b 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java
@@ -12,6 +12,7 @@
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.IGeneralApprovalService;
+import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
@@ -19,6 +20,7 @@
 import org.springframework.web.bind.annotation.RequestBody;
 
 import javax.validation.Valid;
+import java.util.List;
 import java.util.Objects;
 
 /**
@@ -117,4 +119,17 @@
         }
         return baseApprovalService.failUpdate(request);
     }
+
+    public List<O> exportList(@RequestBody @Valid R request) throws Exception {
+        List<O> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = baseApprovalService.listExportByIds(request.getIds());
+        } else {
+            list = baseApprovalService.listExport(request);
+        }
+        for (O record : list) {
+            DictCodeUtils.convertDictCodeToName(record);
+        }
+        return list;
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java
index 8a90961..d775831 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java
@@ -5,6 +5,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.business.certificate.CertificateChangeApplyApprovalListRequest;
 import com.casic.missiles.dto.business.certificate.CertificateChangeApplySaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessCertificateChangeApply;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
@@ -20,6 +21,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -48,4 +50,12 @@
         }
         return changeApplyService.saveChangeApply(request);
     }
+
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody CertificateChangeApplyApprovalListRequest request) throws Exception {
+        List<BizBusinessCertificateChangeApply> list = super.exportList(request);
+        super.exportExcel(BizBusinessCertificateChangeApply.class, list, ExportEnum.CERTIFICATE_CHANGE_APPLY.getSheetName());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java
index 5fc4b07..af8230e 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java
@@ -9,6 +9,7 @@
 import com.casic.missiles.dto.business.certificate.CertificatePrintApprovalListRequest;
 import com.casic.missiles.dto.business.certificate.CertificatePrintListResponse;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.enums.business.CertificatePrintStatusEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessCertificatePrintLog;
@@ -18,10 +19,16 @@
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.io.IOException;
+import java.util.List;
 import java.util.Objects;
 
 /**
@@ -98,4 +105,16 @@
         });
         return certificatePrintService.certificatePrintLog(idDTO.getId());
     }
+
+    @ApiOperation("证书打印审批导出")
+    @PostMapping("/listExport")
+    public void exportList(@RequestBody CertificatePrintApprovalListRequest request) throws IOException {
+        List<CertificatePrintListResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = certificatePrintService.listByIds(request.getIds());
+        } else {
+            list = certificatePrintService.list(request);
+        }
+        super.exportExcel(CertificatePrintListResponse.class, list, ExportEnum.CERTIFICATE_PRINT.getSheetName());
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java
index 63b06dc..6b2efd5 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java
@@ -6,6 +6,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.business.certificate.CertificateReportApprovalListRequest;
 import com.casic.missiles.dto.business.certificate.CertificateReportSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessCertificateReport;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
@@ -21,6 +22,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -50,7 +52,7 @@
         return certificateReportService.saveCertificateReport(request);
     }
 
-    @ApiOperation("证书审批详情（基本信息）")
+    @ApiOperation("详情（基本信息）")
     @PostMapping("/detail")
     public ReturnDTO<BizBusinessCertificateReport> detail(@RequestBody @Valid BaseDetailRequest request, BindingResult bindingResult) throws Exception {
         if(bindingResult.hasErrors()){
@@ -59,4 +61,11 @@
         return certificateReportService.detail(request);
     }
 
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody CertificateReportApprovalListRequest request) throws Exception {
+        List<BizBusinessCertificateReport> list = super.exportList(request);
+        super.exportExcel(BizBusinessCertificateReport.class, list, ExportEnum.CERTIFICATE_REPORT.getSheetName());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java
index 46b26bd..57c0809 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java
@@ -10,20 +10,21 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.business.identify.IdentifyListRequest;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessIdentifyInfo;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.business.IBizBusinessIdentifyInfoService;
+import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import javax.validation.Valid;
+import java.util.List;
 import java.util.Objects;
 
 /**
@@ -57,16 +58,13 @@
         return identifyInfoService.addIdentify(identifyInfo);
     }
 
-    @ApiOperation("标识打印更新")
+    @ApiOperation("标识打印更新（更新打印时间）")
     @PostMapping("/update")
-    public ReturnDTO updateIdentify(@RequestBody @Valid BizBusinessIdentifyInfo identifyInfo, BindingResult bindingResult) {
-        Assert.isFalse(Objects.isNull(identifyInfo.getId()), () -> {
+    public ReturnDTO updateIdentify(@RequestBody @Valid IdDTO idDTO) {
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        Assert.isFalse(bindingResult.hasErrors(), () -> {
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        });
-        return identifyInfoService.updateIdentify(identifyInfo);
+        return identifyInfoService.updateIdentify(idDTO.getId());
     }
 
     @ApiOperation("标识打印删除")
@@ -77,4 +75,37 @@
         });
         return identifyInfoService.deleteIdentify(idDTO.getId());
     }
+
+    @ApiOperation("标识打印导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody @Valid IdentifyListRequest request, BindingResult bindingResult) throws Exception {
+        if (bindingResult.hasErrors()) {
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        List<BizBusinessIdentifyInfo> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = identifyInfoService.listByIds(request.getIds());
+        } else {
+            list = identifyInfoService.list(request);
+        }
+        for (BizBusinessIdentifyInfo record : list) {
+            DictCodeUtils.convertDictCodeToName(record);
+        }
+        super.exportExcel(BizBusinessIdentifyInfo.class, list, ExportEnum.IDENTIFY_EXPORT.getSheetName());
+    }
+
+
+    // TODO: 2023/8/23 查询设备信息，4个底部按钮查设备（按钮的作用就是前端用来调不同接口、用来区分中间即将展示的标识），前端弹窗选设备，在确定保存时前端根据底部按钮判断传入设备类型deviceType字典code
+    // TODO: 2023/8/23 接口：查受检设备（第1个按钮），查设备台账（后3个按钮同一接口），查询之后前端根据标志类型的不同加到中间页面时进行判断（按产品给的对应表）
+    // TODO: 2023/8/23 提供二维码接口，前端在加到中间页面时调用一下
+
+    @ApiOperation("设备二维码")
+    @PostMapping("/equipment/qrCode")
+    public ReturnDTO<String> equipmentQrCode(@RequestBody @Valid IdDTO idDTO) {
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return identifyInfoService.equipmentQrCode(idDTO.getId());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java
index 707be6e..7e0453d 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java
@@ -117,7 +117,7 @@
     }
 
     @ApiOperation("任务单导出")
-    @PostMapping("/export")
+    @PostMapping("/listExport")
     public void orderExport(@RequestBody @Valid OrderListRequest request, HttpServletResponse response) {
         businessOrderService.orderExport(request, response);
     }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java
index 529a6ce..51432be 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java
@@ -1,9 +1,28 @@
 package com.casic.missiles.controller.business;
 
+import com.casic.missiles.controller.GeneralApprovalController;
+import com.casic.missiles.dto.BaseApprovalSubmitRequest;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.business.outsource.OutsourceAssessApprovalListRequest;
+import com.casic.missiles.dto.business.outsource.OutsourceAssessSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
+import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.model.business.BizBusinessOutsourceAssess;
+import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
+import com.casic.missiles.service.IGeneralApprovalService;
+import com.casic.missiles.service.business.IBizBusinessOutsourceAssessService;
 import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.BindingResult;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.validation.Valid;
+import java.util.List;
+
 /**
  * <p>
  * 计量检定业务-分包管理-测试、校准或检定工作分包评审表 前端控制器
@@ -15,6 +34,27 @@
 @Api(tags = "分包管理-测试、校准或检定工作分包评审表")
 @RestController
 @RequestMapping("/business/outsource/assess")
-public class BizBusinessOutsourceAssessController {
+public class BizBusinessOutsourceAssessController extends GeneralApprovalController<BizBusinessOutsourceAssess, BizBusinessOutsourceAssess, OutsourceAssessApprovalListRequest, BaseApprovalSubmitRequest> {
+    @Autowired
+    private IBizBusinessOutsourceAssessService outsourceAssessService;
 
+    public BizBusinessOutsourceAssessController(IGeneralApprovalService<BizBusinessOutsourceAssess, BizBusinessOutsourceAssess, OutsourceAssessApprovalListRequest, BaseApprovalSubmitRequest> baseApprovalService) {
+        super(baseApprovalService);
+    }
+
+    @ApiOperation("草稿箱-保存")
+    @PostMapping("/save")
+    public ReturnDTO<OutsourceAssessSaveResponse> saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceAssess request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        return outsourceAssessService.saveOutsourceAssess(request);
+    }
+
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception {
+        List<BizBusinessOutsourceAssess> list = super.exportList(request);
+        super.exportExcel(BizBusinessOutsourceAssess.class, list, ExportEnum.OUTSOURCE_ASSESS.getSheetName());
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java
new file mode 100644
index 0000000..9adef18
--- /dev/null
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java
@@ -0,0 +1,60 @@
+package com.casic.missiles.controller.business;
+
+import com.casic.missiles.controller.GeneralApprovalController;
+import com.casic.missiles.dto.BaseApprovalSubmitRequest;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.business.outsource.OutsourceProtocolApprovalListRequest;
+import com.casic.missiles.dto.business.outsource.OutsourceProtocolSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
+import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.model.business.BizBusinessOutsourceProtocol;
+import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
+import com.casic.missiles.service.IGeneralApprovalService;
+import com.casic.missiles.service.business.IBizBusinessOutsourceProtocolService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.BindingResult;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.validation.Valid;
+import java.util.List;
+
+/**
+ * <p>
+ * 计量检定业务-分包管理-测试、校准或检定工作分包协议书 前端控制器
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-08-24
+ */
+@Api(tags = "分包管理-测试、校准或检定工作分包协议书")
+@RestController
+@RequestMapping("/business/outsource/protocol")
+public class BizBusinessOutsourceProtocolController extends GeneralApprovalController<BizBusinessOutsourceProtocol, BizBusinessOutsourceProtocol, OutsourceProtocolApprovalListRequest, BaseApprovalSubmitRequest> {
+    @Autowired
+    private IBizBusinessOutsourceProtocolService outsourceProtocolService;
+
+    public BizBusinessOutsourceProtocolController(IGeneralApprovalService<BizBusinessOutsourceProtocol, BizBusinessOutsourceProtocol, OutsourceProtocolApprovalListRequest, BaseApprovalSubmitRequest> baseApprovalService) {
+        super(baseApprovalService);
+    }
+
+    @ApiOperation("草稿箱-保存")
+    @PostMapping("/save")
+    public ReturnDTO<OutsourceProtocolSaveResponse> saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceProtocol request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        return outsourceProtocolService.saveOutsourceProtocol(request);
+    }
+
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody OutsourceProtocolApprovalListRequest request) throws Exception {
+        List<BizBusinessOutsourceProtocol> list = super.exportList(request);
+        super.exportExcel(BizBusinessOutsourceProtocol.class, list, ExportEnum.OUTSOURCE_PROTOCOL.getSheetName());
+    }
+}
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java
index 097f645..f0f0943 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java
@@ -17,7 +17,6 @@
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.IGeneralApprovalService;
 import com.casic.missiles.service.business.IBizBusinessOutsourcerInfoService;
-import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -71,19 +70,8 @@
 
     @ApiOperation("分包方导出")
     @PostMapping("/listExport")
-    public void export(@RequestBody @Valid OutsourcerInfoApprovalListRequest request, BindingResult bindingResult) throws Exception {
-        if (bindingResult.hasErrors()) {
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        }
-        List<BizBusinessOutsourcerInfo> list;
-        if (!CollectionUtils.isEmpty(request.getIds())) {
-            list = outsourcerInfoService.listByIds(request.getIds());
-        } else {
-            list = outsourcerInfoService.list(request);
-        }
-        for (BizBusinessOutsourcerInfo record : list) {
-            DictCodeUtils.convertDictCodeToName(record);
-        }
+    public void export(@RequestBody OutsourcerInfoApprovalListRequest request) throws Exception {
+        List<BizBusinessOutsourcerInfo> list = super.exportList(request);
         super.exportExcel(BizBusinessOutsourcerInfo.class, list, ExportEnum.OUTSOURCER_EXPORT.getSheetName());
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java
index c2cbf9f..0410918 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java
@@ -17,11 +17,9 @@
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.IGeneralApprovalService;
 import com.casic.missiles.service.business.IBizBusinessSiteExecutiveInfoService;
-import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -60,7 +58,7 @@
         return siteExecutiveInfoService.saveSiteExecutiveInfo(siteExecutiveInfo);
     }
 
-    @ApiOperation("现场检测详情")
+    @ApiOperation("详情")
     @PostMapping("/detail")
     public ReturnDTO<SiteExecutiveDetailResponse> siteExecutiveDetail(@RequestBody @Valid IdDTO idDTO) throws Exception {
         Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
@@ -69,21 +67,10 @@
         return ReturnUtil.success(siteExecutiveInfoService.detail(idDTO.getId()));
     }
 
-    @ApiOperation("现场检测导出")
+    @ApiOperation("导出")
     @PostMapping("/listExport")
-    public void export(@RequestBody @Valid SiteExecutiveApprovalListRequest request, BindingResult bindingResult) throws Exception {
-        if (bindingResult.hasErrors()) {
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        }
-        List<SiteExecutiveApprovalListResponse> list;
-        if (!CollectionUtils.isEmpty(request.getIds())) {
-            list = siteExecutiveInfoService.listInfoByIds(request.getIds());
-        } else {
-            list = siteExecutiveInfoService.listInfo(request);
-        }
-        for (SiteExecutiveApprovalListResponse record : list) {
-            DictCodeUtils.convertDictCodeToName(record);
-        }
+    public void export(@RequestBody SiteExecutiveApprovalListRequest request) throws Exception {
+        List<SiteExecutiveApprovalListResponse> list = super.exportList(request);
         super.exportExcel(SiteExecutiveApprovalListResponse.class, list, ExportEnum.SITE_EXECUTIVE_EXPORT.getSheetName());
     }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
index 7e793cd..a92e209 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
@@ -55,7 +55,7 @@
 
     @ApiOperation("设备收发列表导出")
     @PostMapping("/export")
-    public void exportList(@RequestBody @Valid SampleDispatchListRequest request) throws IOException {
+    public void exportList(@RequestBody SampleDispatchListRequest request) throws IOException {
         List<SampleDispatchListResponse> list;
         if (!CollectionUtils.isEmpty(request.getIds())) {
             list = dispatchService.listByIds(request.getIds());
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java
index cdc77fc..d120fd4 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java
@@ -7,6 +7,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.business.labExecutive.*;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.business.IBusinessLabExecutiveInfoService;
@@ -14,6 +15,7 @@
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.*;
 
@@ -32,7 +34,7 @@
     @Autowired
     private IBusinessLabExecutiveInfoService labExecutiveInfoService;
 
-    @ApiOperation("实验室检测-部门检测-查询各状态列表（待检测、检测中、检测完）")
+    @ApiOperation("实验室任务-查询各状态列表（待检测、检测中、检测完）")
     @PostMapping("/deptExecutive/List")
     public ReturnDTO<PageInfoBT<SampleLabExecutiveListResponse>> queryDeptExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
@@ -43,10 +45,19 @@
         return ReturnUtil.success(super.packForBT(labExecutiveInfoService.deptLabExecutiveListPage(page, labExecutiveListRequest)));
     }
 
-    /**
-     * 实验室检测-我的检测-查询各状态列表（待检测、检测中、检测完）
-     */
-    @ApiOperation("实验室检测-我的检测-查询各状态列表（待检测、检测中、检测完）")
+    @ApiOperation("实验室任务导出")
+    @PostMapping("/deptExecutive/export")
+    public void deptExportList(@RequestBody @Valid SampleLabExecutiveListRequest request) throws Exception {
+        List<SampleLabExecutiveListResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = labExecutiveInfoService.deptLabExecutiveListByIds(request.getMeasureStatus(), request.getIds());
+        } else {
+            list = labExecutiveInfoService.deptLabExecutiveList(request);
+        }
+        super.exportExcel(SampleLabExecutiveListResponse.class, list, ExportEnum.DEPT_EXECUTIVE_TASK.getSheetName());
+    }
+
+    @ApiOperation("我的任务-查询各状态列表（待检测、检测中、检测完）")
     @PostMapping("/myExecutive/list")
     public ReturnDTO<PageInfoBT<SampleLabExecutiveListResponse>> queryMyExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
@@ -57,19 +68,25 @@
         return ReturnUtil.success(super.packForBT(labExecutiveInfoService.myLabExecutiveListPage(page, labExecutiveListRequest)));
     }
 
-    /**
-     * 实验室检测-我的检测-查询各状态样品数量（待检测、检测中、检测完）
-     */
-    @ApiOperation("实验室检测-我的检测-查询各状态样品数量（待检测、检测中、检测完）")
+    @ApiOperation("我的任务导出")
+    @PostMapping("/myExecutive/export")
+    public void exportList(@RequestBody @Valid SampleLabExecutiveListRequest request) throws Exception {
+        List<SampleLabExecutiveListResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = labExecutiveInfoService.myLabExecutiveListByIds(request.getMeasureStatus(), request.getIds());
+        } else {
+            list = labExecutiveInfoService.myLabExecutiveList(request);
+        }
+        super.exportExcel(SampleLabExecutiveListResponse.class, list, ExportEnum.MY_EXECUTIVE_TASK.getSheetName());
+    }
+
+    @ApiOperation("我的任务-查询各状态样品数量（待检测、检测中、检测完）")
     @GetMapping("/myExecutive/amount")
     public ReturnDTO<List<SampleAmountResponse>> queryMyExecutiveAmount() {
         return ReturnUtil.success(labExecutiveInfoService.myExecutiveAmount());
     }
 
-    /**
-     * 实验室检测-部门检测-分配（分配给具体人员）
-     */
-    @ApiOperation("实验室检测-部门检测-分配按钮（分配给具体人员）")
+    @ApiOperation("实验室任务-分配按钮（分配给具体人员）")
     @PostMapping("/deptExecutive/allocate")
     public ReturnDTO allocateStaff(@RequestBody @Valid SampleAllocateRequest sampleAllocateRequest, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -78,10 +95,7 @@
         return labExecutiveInfoService.allocateStaff(sampleAllocateRequest);
     }
 
-    /**
-     * 实验室检测-我的检测-检定人扫描收入（待检测->检测中）
-     */
-    @ApiOperation("实验室检测-我的检测-检定人扫描收入（待检测->检测中）")
+    @ApiOperation("我的任务-检定人扫描收入（待检测->检测中）")
     @PostMapping("/myExecutive/receive")
     public ReturnDTO sampleReceive(@RequestBody @Valid List<SampleOperateRequest> requestList, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -90,10 +104,7 @@
         return labExecutiveInfoService.sampleReceive(requestList);
     }
 
-    /**
-     * 实验室检测-负责人/检定人扫描检完（检测中->检测完）
-     */
-    @ApiOperation("实验室检测-负责人/检定人扫描检完（检测中->检测完）")
+    @ApiOperation("实验室任务-负责人/检定人扫描检完（检测中->检测完）")
     @PostMapping("/myExecutive/complete")
     public ReturnDTO sampleExecutiveComplete(@RequestBody @Valid List<SampleOperateRequest> requestList, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -102,10 +113,7 @@
         return labExecutiveInfoService.sampleExecutiveComplete(requestList);
     }
 
-    /**
-     * 实验室检测-部门检测/我的检测 编辑（只能修改应出具证书）
-     */
-    @ApiOperation("实验室检测-部门检测/我的检测 编辑（只能修改应出具证书）")
+    @ApiOperation("实验室任务/我的任务 编辑（只能修改应出具证书）")
     @PostMapping("/executive/update")
     public ReturnDTO updateExecutive(@RequestBody @Valid UpdateExecutiveRequest request, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -114,10 +122,7 @@
         return labExecutiveInfoService.updateExecutive(request);
     }
 
-    /**
-     * 实验室检测-部门检测/我的检测 详情
-     */
-    @ApiOperation("实验室检测-部门检测/我的检测 详情")
+    @ApiOperation("实验室任务/我的任务 详情")
     @PostMapping("/executive/detail")
     public ReturnDTO<ExecutiveDetailResponse> executiveDetail(@RequestBody @Valid ExecutiveDetailRequest request, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
@@ -131,7 +136,7 @@
      * 退回后会将下一个要执行的实验室检测状态更新为待分配，将后面的实验室顺序变更为连续（都进行减1）
      * 最后一个检测的实验室退回，等分发员再增加实验室或设备收发中的已收入直接手动点击完成
      */
-    @ApiOperation("实验室检测-部门检测/我的检测 退回（待检测/检测中->退回）")
+    @ApiOperation("实验室任务/我的任务 退回（待检测/检测中->退回）")
     @PostMapping("/executive/sendBack")
     public ReturnDTO executiveSendBack(@RequestBody @Valid ExecutiveSendBackRequest request, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -140,9 +145,6 @@
         return labExecutiveInfoService.sampleExecutiveSendBack(request);
     }
 
-    /**
-     * 分发员编辑实验室检测列表
-     */
     @ApiOperation("分发员编辑实验室检测列表")
     @PostMapping("/handOut/updateList")
     public ReturnDTO updateExecutiveList(@RequestBody @Valid UpdateExecutiveListRequest request, BindingResult bindingResult) {
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java
index 48a67ed..0c04f31 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java
@@ -10,6 +10,7 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.resource.customer.CustomerApprovalListRequest;
 import com.casic.missiles.dto.resource.customer.CustomerSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceCustomerInfo;
@@ -26,6 +27,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -55,6 +57,13 @@
         return customerInfoService.saveCustomerInfo(request);
     }
 
+    @ApiOperation("委托方名录导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody CustomerApprovalListRequest request) throws Exception {
+        List<BizResourceCustomerInfo> list = super.exportList(request);
+        super.exportExcel(BizResourceCustomerInfo.class, list, ExportEnum.CUSTOMER_INFO.getSheetName());
+    }
+
     @ApiOperation("委托方人员列表（分页）")
     @PostMapping("/person/listPage")
     public ReturnDTO<PageInfoBT<BizResourceCustomerStaff>> personListPage(@RequestBody IdDTO idDto) {
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
index 972ed4b..6418ea5 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
@@ -5,6 +5,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.resource.customer.SuggestFormApprovalListRequest;
 import com.casic.missiles.dto.resource.customer.SuggestFormSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceCustomerSuggestForm;
@@ -20,6 +21,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -50,4 +52,11 @@
         return suggestFormService.saveSuggestForm(request);
     }
 
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody SuggestFormApprovalListRequest request) throws Exception {
+        List<BizResourceCustomerSuggestForm> list = super.exportList(request);
+        super.exportExcel(BizResourceCustomerSuggestForm.class, list, ExportEnum.CUSTOMER_SUGGEST_FORM.getSheetName());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java
index 1934d1a..9e07eab 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java
@@ -15,12 +15,16 @@
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.resource.IEnvEnvironmentRecordConfigService;
 import com.casic.missiles.service.resource.IEnvEnvironmentRecordDataService;
+import com.casic.missiles.service.resource.IEnvLocationInfoService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
 import java.util.List;
@@ -39,6 +43,8 @@
     private IEnvEnvironmentRecordDataService environmentRecordDataService;
     @Autowired
     private IEnvEnvironmentRecordConfigService environmentRecordConfigService;
+    @Autowired
+    private IEnvLocationInfoService locationInfoService;
 
     @ApiOperation("环境记录单数据列表/详情")
     @PostMapping("/data/listPage")
@@ -95,4 +101,11 @@
         });
         return environmentRecordConfigService.deleteEnvironmentRecordConfig(idDTO.getId());
     }
+
+    @ApiOperation("地点列表")
+    @PostMapping("/location/listPage")
+    public ReturnDTO<PageInfoBT<LocationListResponse>> locationListPage(@RequestBody @Valid LocationListRequest request) {
+        Page<LocationListResponse> page = PageFactory.defaultPage();
+        return ReturnUtil.success(super.packForBT(locationInfoService.listPage(page, request)));
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java
index 82efe3f..e9561fa 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java
@@ -10,6 +10,7 @@
 import com.casic.missiles.dto.resource.seal.SealLogListRequest;
 import com.casic.missiles.dto.resource.seal.SealNoteApprovalListRequest;
 import com.casic.missiles.dto.resource.seal.SealNoteSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceSealUseLog;
@@ -27,6 +28,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -58,6 +60,13 @@
         return sealUseNoteService.saveSeal(request);
     }
 
+    @ApiOperation("印章使用登记导出（列表和导出中去掉经办人和监印人）")
+    @PostMapping("/listExport")
+    public void export(@RequestBody SealNoteApprovalListRequest request) throws Exception {
+        List<BizResourceSealUseNote> list = super.exportList(request);
+        super.exportExcel(BizResourceSealUseNote.class, list, ExportEnum.SEAL_NOTE.getSheetName());
+    }
+
     // TODO: 2023/7/28 印章使用日志：系统中使用印章时插入数据库
 
     @ApiOperation("印章使用日志列表（分页）")
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java
index 9b674fc..06b6521 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java
@@ -9,16 +9,20 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.resource.staff.StaffCertRequest;
 import com.casic.missiles.dto.resource.staff.StaffCertResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.service.resource.IBizResourceStaffInfoService;
 import com.casic.missiles.service.resource.IBizResourceStaffVerifierService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.List;
+
 /**
  * @Description:
  * @Author: wangpeng
@@ -41,9 +45,21 @@
         return ReturnUtil.success(super.packForBT(responsePage));
     }
 
+    @ApiOperation("证书逾期提醒导出")
+    @PostMapping("/listExport")
+    public void exportList(@RequestBody StaffCertRequest request) throws Exception {
+        List<StaffCertResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = staffInfoService.certListByIds(request.getIds());
+        } else {
+            list = staffInfoService.certList(request);
+        }
+        super.exportExcel(StaffCertResponse.class, list, ExportEnum.STAFF_CERTIFICATE_EXPIRE.getSheetName());
+    }
+
     @ApiOperation("证书逾期提醒")
     @PostMapping("/expirationReminder")
-    public ReturnDTO expirationReminder(@RequestBody IdDTO idDto) {
-        return verifierService.expirationReminder(idDto);
+    public ReturnDTO expirationReminder(@RequestBody IdDTO idDTO) {
+        return verifierService.expirationReminder(idDTO);
     }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java
index 3b251ad..a6e7850 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java
@@ -12,6 +12,7 @@
 import com.casic.missiles.dto.resource.staff.StaffListRequest;
 import com.casic.missiles.dto.resource.staff.TrainListRequest;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.*;
@@ -22,7 +23,10 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
 import java.util.List;
@@ -52,8 +56,19 @@
             throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
         }
         Page<BizResourceStaffInfo> page = PageFactory.defaultPage();
-        Page<BizResourceStaffInfo> responsePage = staffInfoService.listPage(page, request);
-        return ReturnUtil.success(super.packForBT(responsePage));
+        return ReturnUtil.success(super.packForBT(staffInfoService.listPage(page, request)));
+    }
+
+    @ApiOperation("人员登记导出")
+    @PostMapping("/listExport")
+    public void exportList(@RequestBody StaffListRequest request) throws Exception {
+        List<BizResourceStaffInfo> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = staffInfoService.listByIds(request.getIds());
+        } else {
+            list = staffInfoService.list(request);
+        }
+        super.exportExcel(BizResourceStaffInfo.class, list, ExportEnum.STAFF_INFO.getSheetName());
     }
 
     @ApiOperation("人员登记详情基础信息")
@@ -85,9 +100,9 @@
 
     @ApiOperation("科研教育列表（分页）")
     @PostMapping("/education/listPage")
-    public ReturnDTO<PageInfoBT<BizResourceStaffEducation>> educationListPage(@RequestBody IdDTO idDto) {
+    public ReturnDTO<PageInfoBT<BizResourceStaffEducation>> educationListPage(@RequestBody IdDTO idDTO) {
         Page<BizResourceStaffEducation> page = PageFactory.defaultPage();
-        Page<BizResourceStaffEducation> responsePage = staffInfoService.educationListPage(page, idDto);
+        Page<BizResourceStaffEducation> responsePage = staffInfoService.educationListPage(page, idDTO);
         return ReturnUtil.success(super.packForBT(responsePage));
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java
index af6aa86..d85d84a 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java
@@ -9,6 +9,7 @@
 import com.casic.missiles.dto.resource.outsideService.SupplierApprovalListRequest;
 import com.casic.missiles.dto.resource.outsideService.SupplierSaveResponse;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceSupplierAbility;
@@ -67,6 +68,13 @@
         return ReturnUtil.success(supplierInfoService.detail(idDTO.getId()));
     }
 
+    @ApiOperation("合格供方导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody SupplierApprovalListRequest request) throws Exception {
+        List<BizResourceSupplierInfo> list = super.exportList(request);
+        super.exportExcel(BizResourceSupplierInfo.class, list, ExportEnum.SUPPLIER_INFO.getSheetName());
+    }
+
     @ApiOperation("供方人员列表（分页）")
     @PostMapping("/person/listPage")
     public ReturnDTO<PageInfoBT<BizResourceSupplierPerson>> personListPage(@RequestBody IdDTO idDTO) {
diff --git a/casic-metering-api/src/main/resources/config/application.yml b/casic-metering-api/src/main/resources/config/application.yml
index 350db5f..ecff521 100644
--- a/casic-metering-api/src/main/resources/config/application.yml
+++ b/casic-metering-api/src/main/resources/config/application.yml
@@ -126,7 +126,7 @@
     #作者
     author: wangpeng
     #待生成对象表名
-    table-name: biz_equipment_technical_target_approval,biz_equipment_attachment_approval,biz_equipment_checkpoint_approval
+    table-name: biz_business_outsource_protocol
 
 reminder:
   #节点--common模块config包 ReminderNodeConfig配置
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
index 4a19e4e..d47d552 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
@@ -53,6 +53,7 @@
     SUGGEST_FORM_SAVE_FAILED(2509, "委托方意见登记表保存至草稿箱失败"),
     EXAMINE_FORM_SAVE_FAILED(2510, "要求、委托书及合同评审表保存至草稿箱失败"),
     CUSTOMER_EXIST_SAVE_FAILED(2511, "该委托方已存在，请重新选择"),
+    DUPLICATE_LOCATION_NO(2512, "地点编号已存在"),
 
     /**
      * 计量检定业务模块
@@ -68,6 +69,8 @@
     COMPLETE_SAMPLE_NOT_EXIST(2609, "检测中不存在扫描收入的样品"),
     CANNOT_CHANGE_MEASURE_INFO(2610, "无法更改非当前登录用户的检测信息"),
     NON_EXIST_ORDER_OR_SAMPLE(2611, "不存在该委托单或该委托单下的样品"),
+    OUTSOURCE_ACCESS_SAVE_FAILED(2612, "测试、校准或检定工作分包评审表保存至草稿箱失败"),
+    OUTSOURCE_PROTOCOL_SAVE_FAILED(2613, "测试、校准或检定工作分包协议书保存至草稿箱失败"),
 
     /**
      * 历史遗留备用
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
index 5089ad1..81a406b 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
@@ -10,54 +10,38 @@
     /**
      * 资源管理
      */
-    ENVIRONMENT_DATA_EXPORT("environmentData", "environmentData", "环境记录单数据"),
+    ENVIRONMENT_DATA_EXPORT("environmentData", "环境记录单数据", "环境记录单数据"),
+    STAFF_INFO("staffInfo", "人员登记", "人员登记"),
+    STAFF_CERTIFICATE_EXPIRE("certificateExpire", "证书逾期提醒", "证书逾期提醒"),
+    SUPPLIER_INFO("supplierInfo", "合格供方名录", "合格供方名录"),
+    CUSTOMER_INFO("customerInfo", "委托方名录", "委托方名录"),
+    CUSTOMER_SUGGEST_FORM("customerSuggestForm", "委托方意见登记表", "委托方意见登记表"),
+    SEAL_NOTE("sealNote", "印章使用登记", "印章使用登记"),
 
-    FILE_EXPORT("meterFileData", "meterFileData", "计量文件信息"),
-    TRAIN_PLAN_EXPORT("trainPlanData", "trainPlanData", "培训计划"),
-    TRAIN_LOG_EXPORT("trainLogData", "trainLogData", "培训记录"),
-    METER_ORGANIZE_EXPORT("meterOrganizeData", "meterOrganizeData", "计量组织"),
-    TRACE_SUPPLIER_EXPORT("traceSupplierData", "traceSupplierData", "溯源供方"),
-    SIGN_EXPORT("signData", "signData", "签名/签章"),
-    TEMPLATE_EXPORT("templateData", "templateData", "原始记录模板/证书报告模板"),
-    FIXED_ASSETS("meterFixedAssets", "meterFixedAssets", "固定资产"),
-    METER_EQUIPMENT("meterEquipment", "meterEquipment", "测量设备"),
-    CALIBRATION_TEST_EQUIPMENT("calibrationTestEquipment", "calibrationTestEquipment", "校准检定设备"),
-    MEASURE_ACCOUNT("measureAccount", "measureAccount", "测量工装"),
-    STANDARD_SUPPORT_EQUIPMENT("standardSupportEquipment", "standardSupportEquipment", "标准配套设备"),
-    STANDARD_EQUIPMENT("standardEquipment", "standardEquipment", "标准装置"),
-    FLOW_DEF_EXPORT("flowDefData", "flowDefData", "流程定义"),
-    STAFF_CERTIFICATE("certificate", "certificate", "计量人员证书"),
-    CHECK_INFO("checkInfo", "checkInfo", "设备管理点检测"),
-    EQUIPMENT_APPLY("equipmentApply", "equipmentApply", "设备借用"),
-    STANDARD_EQUIPMENT_REMIND("equipmentApplyRemind", "equipmentApplyRemind", "标准装置到期提醒"),
-    METER_PRICE("meterPrice", "meterPrice", "价格库"),
-    METER_STAFF("meterStaff", "meterStaff", "计量人员"),
-    STANDARD_EQUIPMENT_APPLY("standardEquipmentApply", "standardEquipmentApply", "标准装置申请"),
-    STATE_MANAGE_APPLY("stateManage", "stateManage", "状态管理"),
-    METER_ACCEPTANCE_CHECK("acceptanceCheck", "acceptanceCheck", "设备检修保养验收单"),
-    CUSTOMER_EXPORT("customerData", "customerData", "客户信息"),
-    ORDER_EXPORT("orderData", "orderData", "委托书信息"),
-    SAMPLE_EXPORT("sampleData", "sampleData", "样本信息"),
-    EXCHANGE_DATA("exchangeData", "exchangeData", "设备交接单"),
-    DISPATCH_DATA("dispatchData", "dispatchData", "设备收发"),
-    ENVIRONMENT_DATA("environmentData", "environmentData", "环境记录单"),
-    ORIGIN_DATA("originData", "originData", "原始记录"),
-    CERTIFICATE_REPORT("certificateReport", "certificateReport", "证书报告"),
-    ADVICE_EXPORT("adviceData", "adviceData", "客户反馈"),
-    HANDOUT_EXPORT("handoutData", "handoutData", "任务分发列表"),
-    OUTSOURCER_EXPORT("outsourcerData", "outsourcerData", "分包方"),
-    SITE_EXECUTIVE_EXPORT("siteExecutiveData", "siteExecutiveData", "现场测试、校准或检定"),
-    CERTIFICATE_PRINT_EXPORT("certificatePrintData", "certificatePrintData", "证书打印"),
-    DOWNLOAD_TEMPLATE("downloadTemplate", "downloadTemplate", "页面配置"),
-    OUTSOURCER_CERTIFICATE_EXPORT("outsourceCertificateData", "outsourceCertificateData", "分包证书"),
-    SETTLEMENT_INFO_EXPORT("settlementInfoData", "settlementInfoData", "业务结算"),
-    EQUIPMENT_REMIND("equipmentRemind", "equipmentRemind", "设备到期提醒"),
-    AGREEMENT_INFO_EXPORT("agreementInfoData", "agreementInfoData", "合同"),
-    WORK_STATISTICS_EXPORT("workStatisticsData", "workStatisticsData", "实时工作统计"),
-    DEPT_OUTPUT_EXPORT("deptOutputData", "deptOutputData", "部门产值分析"),
-    WORKLOAD_EXPORT("workloadData", "workloadData", "业务工作量分析"),
-    DEPT_COMPREHENSIVE_EXPORT("deptComprehensiveData", "deptComprehensiveData", "部门综合分析"),
-    ENVIRONMENTAL_RECORD("environmentalRecordData", "environmentalRecordData", "现场环境记录");
+    /**
+     * 计量检定业务
+     */
+    OUTSOURCER_EXPORT("outsourcerData", "分包方名录", "分包方名录"),
+    IDENTIFY_EXPORT("identifyData", "计量标识", "计量标识"),
+    ORDER_EXPORT("orderData", "任务单", "任务单"),
+    DISPATCH_DATA("dispatchData", "设备收发", "设备收发"),
+    HANDOUT_EXPORT("handoutData", "任务分发", "任务分发"),
+    SITE_EXECUTIVE_EXPORT("siteExecutiveData", "现场测试、校准或检定", "现场测试、校准或检定"),
+    CERTIFICATE_REPORT("certificateReport", "证书审批", "证书审批"),
+    CERTIFICATE_CHANGE_APPLY("certificateChangeApply", "证书报告补充或更换申请单", "证书报告补充或更换申请单"),
+    CERTIFICATE_PRINT("certificatePrintData", "证书打印审批", "证书打印审批"),
+    DEPT_EXECUTIVE_TASK("deptExecutiveTaskData", "实验室任务", "实验室任务"),
+    MY_EXECUTIVE_TASK("myExecutiveTaskData", "我的任务", "我的任务"),
+    OUTSOURCE_ASSESS("outsourceAssess", "测试、校准或检定工作分包评审表", "测试、校准或检定工作分包评审表"),
+    OUTSOURCE_PROTOCOL("outsourceProtocol", "测试、校准或检定工作分包协议书", "测试、校准或检定工作分包协议书"),
+
+    /**
+     * 系统管理
+     */
+    SIGN_EXPORT("signData", "签名", "签名"),
+    TEMPLATE_EXPORT("templateData", "文件模板", "文件模板"),
+    FLOW_DEF_EXPORT("flowDefData", "流程定义", "流程定义"),
+    DOWNLOAD_TEMPLATE("downloadTemplate", "流程定义", "页面配置");
 
     ExportEnum(String fileName, String sheetName, String description) {
         this.fileName = fileName;
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateRecordTypeCodeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateRecordTypeCodeEnum.java
index 31d913c..a963522 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateRecordTypeCodeEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateRecordTypeCodeEnum.java
@@ -46,4 +46,14 @@
     String SITE_EXECUTIVE_APPROVAL = "01";
     //《现场测试、校准或检定工作记录表》
     String SITE_EXECUTIVE_LOG = "02";
+
+    //测试、校准或检定工作分包协议书
+    String OUTSOURCE_PROTOCOL = "01";
+    //测试、校准或检定工作分包评审表
+    String OUTSOURCE_ACCESS = "02";
+    //测试、校准或检定工作分包通知书
+    String OUTSOURCE_NOTICE = "03";
+    //测试、校准或检定工作分包方名录
+    String OUTSOURCE_INFO = "04";
+
 }
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
index 24b8635..f78bd53 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
@@ -15,6 +15,10 @@
     String CERTIFICATE_CHANGE_APPLY_BEAN_NAME = "certificateChangeApplyBean";
     //现场测试、校准或检定
     String SITE_EXECUTIVE_BEAN_NAME = "siteExecutiveBean";
+    //测试、校准或检定工作分包评审表
+    String OUTSOURCE_ASSESS_BEAN_NAME = "outsourceAssessBean";
+    //测试、校准或检定工作分包协议书
+    String OUTSOURCE_PROTOCOL_BEAN_NAME = "outsourceProtocolBean";
 
     /*********************************设备与装置************************************/
     //设备台账
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 b21c661..6b86fd1 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
@@ -18,6 +18,8 @@
     OUTSOURCER_APPROVAL(OUTSOURCER_BEAN_NAME, ""),
     CERTIFICATE_CHANGE_APPROVAL(CERTIFICATE_CHANGE_APPLY_BEAN_NAME, ""),
     SITE_EXECUTIVE_APPROVAL(SITE_EXECUTIVE_BEAN_NAME, ""),
+    OUTSOURCE_ASSESS_APPROVAL(OUTSOURCE_ASSESS_BEAN_NAME, ""),
+    OUTSOURCE_PROTOCOL_APPROVAL(OUTSOURCE_PROTOCOL_BEAN_NAME, ""),
 
     ACTION_STATUS_MAP(new HashMap<String, AwareActionStatusEnum>() {
         {
@@ -47,6 +49,10 @@
             put(ApplyFromIdEnum.CERTIFICATE_CHANGE_APPROVAL.getCode(), CERTIFICATE_CHANGE_APPROVAL);
             //现场测试、校准或检定审批
             put(ApplyFromIdEnum.SITE_EXECUTIVE_APPROVAL.getCode(), SITE_EXECUTIVE_APPROVAL);
+            //测试、校准或检定工作分包评审表
+            put(ApplyFromIdEnum.OUTSOURCE_ASSESS_APPROVAL.getCode(), OUTSOURCE_ASSESS_APPROVAL);
+            //测试、校准或检定工作分包协议书
+            put(ApplyFromIdEnum.OUTSOURCE_PROTOCOL_APPROVAL.getCode(), OUTSOURCE_PROTOCOL_APPROVAL);
         }
     });
     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 934405e..c7410bd 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
@@ -9,6 +9,8 @@
     CERTIFICATE_CHANGE_APPROVAL("jljdywzsbchghsqd", MessageSourceModuleEnum.BUSINESS.getCode(), "证书/报告补充或更换申请单"),
     OUTSOURCER_APPROVAL("jljdywcsjzhgfbfml", MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定合格分包方名录"),
     SITE_EXECUTIVE_APPROVAL("jljdywxccsjzsp", MessageSourceModuleEnum.BUSINESS.getCode(), "现场测试、校准或检定审批"),
+    OUTSOURCE_ASSESS_APPROVAL("jljdywcsjzfbpsb", MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包评审表"),
+    OUTSOURCE_PROTOCOL_APPROVAL("jljdywcsjzfbxys", MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包协议书"),
 
 
     /*******************************************设备与装置*********************************************/
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/GeneralApprovalMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/GeneralApprovalMapper.java
index 4fb7344..0c9d6ae 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/GeneralApprovalMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/GeneralApprovalMapper.java
@@ -17,8 +17,4 @@
 
     Page<O> selectBatchForApprovalList(Page<O> page, @Param("request") R request, @Param("businessKeys") List<String> businessKeys);
 
-//    Page<O> selectListPage(Page<O> page, @Param("request") R request);
-
-//    Long selectMaxNo();
-
 }
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceAssessMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceAssessMapper.java
index 7867bb8..ba59009 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceAssessMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceAssessMapper.java
@@ -1,7 +1,12 @@
 package com.casic.missiles.mapper.business;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.business.outsource.OutsourceAssessApprovalListRequest;
+import com.casic.missiles.mapper.GeneralApprovalMapper;
 import com.casic.missiles.model.business.BizBusinessOutsourceAssess;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * <p>
@@ -11,6 +16,10 @@
  * @author wangpeng
  * @since 2023-08-16
  */
-public interface BizBusinessOutsourceAssessMapper extends BaseMapper<BizBusinessOutsourceAssess> {
+public interface BizBusinessOutsourceAssessMapper extends GeneralApprovalMapper<BizBusinessOutsourceAssess, BizBusinessOutsourceAssess, OutsourceAssessApprovalListRequest> {
+
+    Page<BizBusinessOutsourceAssess> selectBatchForApprovalList(Page<BizBusinessOutsourceAssess> page, @Param("request") OutsourceAssessApprovalListRequest request, @Param("businessKeys") List<String> businessKeys);
+
+    Long selectMaxProjectNo();
 
 }
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceProtocolMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceProtocolMapper.java
new file mode 100644
index 0000000..e6aba35
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceProtocolMapper.java
@@ -0,0 +1,24 @@
+package com.casic.missiles.mapper.business;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.business.outsource.OutsourceProtocolApprovalListRequest;
+import com.casic.missiles.mapper.GeneralApprovalMapper;
+import com.casic.missiles.model.business.BizBusinessOutsourceProtocol;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 计量检定业务-分包管理-测试、校准或检定工作分包协议书 Mapper 接口
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-08-24
+ */
+public interface BizBusinessOutsourceProtocolMapper extends GeneralApprovalMapper<BizBusinessOutsourceProtocol, BizBusinessOutsourceProtocol, OutsourceProtocolApprovalListRequest> {
+
+    Page<BizBusinessOutsourceProtocol> selectBatchForApprovalList(Page<BizBusinessOutsourceProtocol> page, @Param("request") OutsourceProtocolApprovalListRequest request, @Param("businessKeys") List<String> businessKeys);
+
+    Long selectMaxProtocolNo();
+}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/EnvLocationInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/EnvLocationInfoMapper.java
new file mode 100644
index 0000000..49eff87
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/EnvLocationInfoMapper.java
@@ -0,0 +1,21 @@
+package com.casic.missiles.mapper.resource;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.resource.environment.LocationListRequest;
+import com.casic.missiles.dto.resource.environment.LocationListResponse;
+import com.casic.missiles.model.resource.EnvLocationInfo;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * <p>
+ * 实验室环境监控系统-设备表 Mapper 接口
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-06-07
+ */
+public interface EnvLocationInfoMapper extends BaseMapper<EnvLocationInfo> {
+
+    Page<LocationListResponse> selectLocationListPage(Page<LocationListResponse> page, @Param("request") LocationListRequest request);
+}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java
index de124db..85ed0f7 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java
@@ -1,7 +1,9 @@
 package com.casic.missiles.mapper.system;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.dto.system.SignDetailResponse;
+import com.casic.missiles.dto.system.SignListRequest;
 import com.casic.missiles.model.system.SystemSign;
 import org.apache.ibatis.annotations.Param;
 
@@ -22,4 +24,8 @@
     SignDetailResponse selectSignDetailById(Long id);
 
     List<SystemSign> selectUsableSignList(@Param("userId") Long userId);
+
+    Page<SystemSign> selectSignListPage(Page<SystemSign> page, @Param("request") SignListRequest request);
+
+    List<SystemSign> selectSignList(@Param("request") SignListRequest request);
 }
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateChangeApplyMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateChangeApplyMapper.xml
index d798447..c496092 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateChangeApplyMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateChangeApplyMapper.xml
@@ -30,31 +30,31 @@
         SELECT *
         FROM biz_business_certificate_change_apply
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.changeApplyNo != null and request.changeApplyNo !=''">
+        <if test="request != null and request.changeApplyNo != null and request.changeApplyNo !=''">
             and change_apply_no like concat('%',#{request.changeApplyNo},'%')
         </if>
-        <if test="request.changeReportNo != null and request.changeReportNo !=''">
+        <if test="request != null and request.changeReportNo != null and request.changeReportNo !=''">
             and change_report_no like concat('%',#{request.changeReportNo},'%')
         </if>
-        <if test="request.changeReportName != null and request.changeReportName !=''">
+        <if test="request != null and request.changeReportName != null and request.changeReportName !=''">
             and change_report_name like concat('%',#{request.changeReportName},'%')
         </if>
-        <if test="request.changeType != null and request.changeType !=''">
+        <if test="request != null and request.changeType != null and request.changeType !=''">
             and change_type = #{request.changeType}
         </if>
-        <if test="request.createUserName != null and request.createUserName !=''">
+        <if test="request != null and request.createUserName != null and request.createUserName !=''">
             and create_user_name like concat('%',#{request.createUserName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificatePrintMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificatePrintMapper.xml
index b66cd99..49c0ac8 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificatePrintMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificatePrintMapper.xml
@@ -31,34 +31,34 @@
         LEFT JOIN biz_business_order_sample_relation bosr ON (bosr.order_id = bcr.order_id AND bosr.sample_id = bcr.sample_id)
         LEFT JOIN biz_business_order_info boi ON boi.id = bosr.order_id
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and bcp.approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.printStatus != null and request.printStatus !=''">
+        <if test="request != null and request.printStatus != null and request.printStatus !=''">
             and print_status = #{request.printStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and bcp.create_user_id = #{request.createUserId}
         </if>
-        <if test="request.certificateReportNo != null and request.certificateReportNo !=''">
+        <if test="request != null and request.certificateReportNo != null and request.certificateReportNo !=''">
             and bcr.certificate_report_no like concat('%',#{request.certificateReportNo},'%')
         </if>
-        <if test="request.certificateReportName != null and request.certificateReportName !=''">
+        <if test="request != null and request.certificateReportName != null and request.certificateReportName !=''">
             and bcr.certificate_report_name like concat('%',#{request.certificateReportName},'%')
         </if>
-        <if test="request.customerName != null and request.customerName !=''">
+        <if test="request != null and request.customerName != null and request.customerName !=''">
             and boi.customer_name like concat('%',#{request.customerName},'%')
         </if>
-        <if test="request.sampleNo != null and request.sampleNo !=''">
+        <if test="request != null and request.sampleNo != null and request.sampleNo !=''">
             and bosr.sample_no like concat('%',#{request.sampleNo},'%')
         </if>
-        <if test="request.sampleName != null and request.sampleName !=''">
+        <if test="request != null and request.sampleName != null and request.sampleName !=''">
             and bosr.sample_name like concat('%',#{request.sampleName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and bcp.create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and bcp.create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml
index b366034..767695d 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml
@@ -46,33 +46,37 @@
         SELECT bcr.*, bosr.sample_no, bosr.sample_name, bosr.sample_model, rsi.staff_name
         FROM biz_business_certificate_report bcr
         LEFT JOIN biz_business_order_sample_relation bosr ON (bosr.order_id = bcr.order_id AND bosr.sample_id = bcr.sample_id)
+        LEFT JOIN biz_business_order_info boi ON boi.id = bcr.order_id
         LEFT JOIN biz_resource_staff_info rsi ON rsi.id = bcr.measure_person_id
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and bcr.approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and bcr.create_user_id = #{request.createUserId}
         </if>
-        <if test="request.certificateReportNo != null and request.certificateReportNo !=''">
+        <if test="request != null and request.customerId != null and request.customerId !=''">
+            and boi.customer_id = #{request.customerId}
+        </if>
+        <if test="request != null and request.certificateReportNo != null and request.certificateReportNo !=''">
             and bcr.certificate_report_no like concat('%',#{request.certificateReportNo},'%')
         </if>
-        <if test="request.certificateReportName != null and request.certificateReportName !=''">
+        <if test="request != null and request.certificateReportName != null and request.certificateReportName !=''">
             and bcr.certificate_report_name like concat('%',#{request.certificateReportName},'%')
         </if>
-        <if test="request.sampleNo != null and request.sampleNo !=''">
+        <if test="request != null and request.sampleNo != null and request.sampleNo !=''">
             and bosr.sample_no like concat('%',#{request.sampleNo},'%')
         </if>
-        <if test="request.measureCategory != null and request.measureCategory !=''">
+        <if test="request != null and request.measureCategory != null and request.measureCategory !=''">
             and bcr.measure_category = #{request.measureCategory}
         </if>
-        <if test="request.measurePerson != null and request.measurePerson !=''">
+        <if test="request != null and request.measurePerson != null and request.measurePerson !=''">
             and rsi.staff_name like concat('%',#{request.measurePerson},'%')
         </if>
-        <if test="request.calibrationTimeStart != null and request.calibrationTimeStart !=''">
+        <if test="request != null and request.calibrationTimeStart != null and request.calibrationTimeStart !=''">
             and bcr.calibration_time &gt;= #{request.calibrationTimeStart}
         </if>
-        <if test="request.calibrationTimeEnd != null and request.calibrationTimeEnd !=''">
+        <if test="request != null and request.calibrationTimeEnd != null and request.calibrationTimeEnd !=''">
             and bcr.calibration_time &lt;= #{request.calibrationTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceAssessMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceAssessMapper.xml
index d0fcf8b..c22c101 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceAssessMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceAssessMapper.xml
@@ -7,6 +7,8 @@
         <id column="id" property="id" />
         <result column="project_no" property="projectNo" />
         <result column="project_name" property="projectName" />
+        <result column="lab_code" property="labCode" />
+        <result column="group_code" property="groupCode" />
         <result column="applicant_id" property="applicantId" />
         <result column="applicant_name" property="applicantName" />
         <result column="applicant_time" property="applicantTime" />
@@ -31,7 +33,45 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, project_no, project_name, applicant_id, applicant_name, applicant_time, minio_file_name, remark, create_user_id, create_user_name, outsourcer_id, pre_start_time, pre_end_time, outsource_reason, pre_cost, approval_status, process_id, approve_situation, traceability, test_method, technique_ability, create_time, update_time
+        id, project_no, project_name, lab_code, group_code, applicant_id, applicant_name, applicant_time, minio_file_name, remark, create_user_id, create_user_name, outsourcer_id, pre_start_time, pre_end_time, outsource_reason, pre_cost, approval_status, process_id, approve_situation, traceability, test_method, technique_ability, create_time, update_time
     </sql>
 
+    <select id="selectMaxProjectNo" resultType="java.lang.Long">
+        SELECT IFNULL(max(RIGHT(project_no, 3)), 0) from biz_business_outsource_assess
+    </select>
+
+    <select id="selectBatchForApprovalList" resultMap="BaseResultMap">
+        SELECT bboa.*, bboi.outsourcer_name, bboi.director
+        FROM biz_business_outsource_assess bboa
+        LEFT JOIN biz_business_outsourcer_info bboi ON bboa.outsourcer_id = bboi.id
+        WHERE 1=1
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
+            and bboa.approval_status = #{request.approvalStatus}
+        </if>
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
+            and bboa.create_user_id = #{request.createUserId}
+        </if>
+        <if test="request != null and request.projectNo != null and request.projectNo !=''">
+            and bboa.project_no like concat('%',#{request.projectNo},'%')
+        </if>
+        <if test="request != null and request.outsourcerName != null and request.outsourcerName !=''">
+            and bboi.outsourcer_name like concat('%',#{request.outsourcerName},'%')
+        </if>
+        <if test="request != null and request.applicantName != null and request.applicantName !=''">
+            and bboa.applicant_name like concat('%',#{request.applicantName},'%')
+        </if>
+        <if test="request != null and request.applicantTimeStart != null and request.applicantTimeStart !=''">
+            and bboa.applicant_time &gt;= #{request.applicantTimeStart}
+        </if>
+        <if test="request != null and request.applicantTimeEnd != null and request.applicantTimeEnd !=''">
+            and bboa.applicant_time &lt;= #{request.applicantTimeEnd}
+        </if>
+        <if test="businessKeys != null">
+            and bboa.id in
+            <foreach collection="businessKeys" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
+        ORDER BY bboa.create_time DESC
+    </select>
 </mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceProtocolMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceProtocolMapper.xml
new file mode 100644
index 0000000..b7b2149
--- /dev/null
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceProtocolMapper.xml
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.mapper.business.BizBusinessOutsourceProtocolMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.business.BizBusinessOutsourceProtocol">
+        <id column="id" property="id" />
+        <result column="protocol_no" property="protocolNo" />
+        <result column="project_name" property="projectName" />
+        <result column="lab_code" property="labCode" />
+        <result column="group_code" property="groupCode" />
+        <result column="outsourcer_id" property="outsourcerId" />
+        <result column="remark" property="remark" />
+        <result column="outsource_no" property="outsourceNo" />
+        <result column="outsource_name" property="outsourceName" />
+        <result column="contacts" property="contacts" />
+        <result column="mobile" property="mobile" />
+        <result column="address" property="address" />
+        <result column="require_date" property="requireDate" />
+        <result column="outsource_cost" property="outsourceCost" />
+        <result column="director" property="director" />
+        <result column="item" property="item" />
+        <result column="requires" property="requires" />
+        <result column="create_user_id" property="createUserId" />
+        <result column="create_user_name" property="createUserName" />
+        <result column="approval_status" property="approvalStatus" />
+        <result column="process_id" property="processId" />
+        <result column="create_time" property="createTime" />
+        <result column="update_time" property="updateTime" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, protocol_no, project_name, lab_code, group_code, outsourcer_id, remark, outsource_no, outsource_name, contacts, mobile, address, require_date, outsource_cost, director, item, requires, create_user_id, create_user_name, approval_status, process_id, create_time, update_time
+    </sql>
+
+    <select id="selectMaxProtocolNo" resultType="java.lang.Long">
+        SELECT IFNULL(max(RIGHT(protocol_no, 3)), 0) from biz_business_outsource_protocol
+    </select>
+
+    <select id="selectBatchForApprovalList" resultMap="BaseResultMap">
+        SELECT *
+        FROM biz_business_outsource_protocol
+        WHERE 1=1
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
+            and approval_status = #{request.approvalStatus}
+        </if>
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
+            and create_user_id = #{request.createUserId}
+        </if>
+        <if test="request != null and request.protocolNo != null and request.protocolNo !=''">
+            and protocol_no like concat('%',#{request.protocolNo},'%')
+        </if>
+        <if test="request != null and request.outsourcerName != null and request.outsourcerName !=''">
+            and outsourcer_name like concat('%',#{request.outsourcerName},'%')
+        </if>
+        <if test="request != null and request.applicantName != null and request.applicantName !=''">
+            and create_user_name like concat('%',#{request.applicantName},'%')
+        </if>
+        <if test="request != null and request.applicantTimeStart != null and request.applicantTimeStart !=''">
+            and create_time &gt;= #{request.applicantTimeStart}
+        </if>
+        <if test="request != null and request.applicantTimeEnd != null and request.applicantTimeEnd !=''">
+            and create_time &lt;= #{request.applicantTimeEnd}
+        </if>
+        <if test="businessKeys != null">
+            and id in
+            <foreach collection="businessKeys" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
+        ORDER BY create_time DESC
+    </select>
+</mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourcerInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourcerInfoMapper.xml
index 510a80b..3049b54 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourcerInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourcerInfoMapper.xml
@@ -7,6 +7,8 @@
         <id column="id" property="id" />
         <result column="outsourcer_no" property="outsourcerNo" />
         <result column="outsourcer_name" property="outsourcerName" />
+        <result column="lab_code" property="labCode" />
+        <result column="group_code" property="groupCode" />
         <result column="outsourcer_brief_name" property="outsourcerBriefName" />
         <result column="outsourcer_size" property="outsourcerSize" />
         <result column="business_size" property="businessSize" />
@@ -55,32 +57,32 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, outsourcer_no, outsourcer_name, outsourcer_brief_name, outsourcer_size, business_size, grade, evaluation, tax_number, bank_account, bank_name, bank_account_number, postal_code, director, phone, fax, mobile, email, website, address_country, address_province, address_city, address_area, full_address, address_country_name, address_province_name, address_city_name, address_area_name, invoice_country, invoice_province, invoice_city, invoice_area, invoice_full_address, invoice_country_name, invoice_province_name, invoice_city_name, invoice_area_name, business_scope, business_content, minio_file_name, approval_status, process_id, remark, create_user_id, create_user_name, create_time, update_time
+        id, outsourcer_no, outsourcer_name, lab_code, group_code, outsourcer_brief_name, outsourcer_size, business_size, grade, evaluation, tax_number, bank_account, bank_name, bank_account_number, postal_code, director, phone, fax, mobile, email, website, address_country, address_province, address_city, address_area, full_address, address_country_name, address_province_name, address_city_name, address_area_name, invoice_country, invoice_province, invoice_city, invoice_area, invoice_full_address, invoice_country_name, invoice_province_name, invoice_city_name, invoice_area_name, business_scope, business_content, minio_file_name, approval_status, process_id, remark, create_user_id, create_user_name, create_time, update_time
     </sql>
 
     <select id="selectBatchForApprovalList" resultMap="BaseResultMap">
         SELECT *
         FROM biz_business_outsourcer_info
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.outsourcerNo != null and request.outsourcerNo !=''">
+        <if test="request != null and request.outsourcerNo != null and request.outsourcerNo !=''">
             and outsourcer_no like concat('%',#{request.outsourcerNo},'%')
         </if>
-        <if test="request.outsourcerName != null and request.outsourcerName !=''">
+        <if test="request != null and request.outsourcerName != null and request.outsourcerName !=''">
             and outsourcer_name like concat('%',#{request.outsourcerName},'%')
         </if>
-        <if test="request.director != null and request.director !=''">
+        <if test="request != null and request.director != null and request.director !=''">
             and director like concat('%',#{request.director},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
@@ -93,6 +95,6 @@
     </select>
 
     <select id="selectMaxNo" resultType="java.lang.Long">
-        SELECT IFNULL(max(RIGHT(outsourcer_no, 12)), 0) from biz_business_outsourcer_info
+        SELECT IFNULL(max(RIGHT(outsourcer_no, 3)), 0) from biz_business_outsourcer_info
     </select>
 </mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessSiteExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessSiteExecutiveInfoMapper.xml
index 135c5d0..3c5ae79 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessSiteExecutiveInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessSiteExecutiveInfoMapper.xml
@@ -38,25 +38,25 @@
         FROM biz_business_site_executive_info bsei
         LEFT JOIN biz_resource_customer_info rci ON bsei.customer_id = rci.id
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and bsei.approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and bsei.create_user_id = #{request.createUserId}
         </if>
-        <if test="request.siteExecutiveNo != null and request.siteExecutiveNo !=''">
+        <if test="request != null and request.siteExecutiveNo != null and request.siteExecutiveNo !=''">
             and bsei.site_executive_no like concat('%',#{request.siteExecutiveNo},'%')
         </if>
-        <if test="request.customerName != null and request.customerName !=''">
+        <if test="request != null and request.customerName != null and request.customerName !=''">
             and rci.outsourcer_name like concat('%',#{request.customerName},'%')
         </if>
-        <if test="request.applyName != null and request.applyName !=''">
+        <if test="request != null and request.applyName != null and request.applyName !=''">
             and bsei.apply_name like concat('%',#{request.applyName},'%')
         </if>
-        <if test="request.applyTimeStart != null and request.applyTimeStart !=''">
+        <if test="request != null and request.applyTimeStart != null and request.applyTimeStart !=''">
             and bsei.apply_time &gt;= #{request.applyTimeStart}
         </if>
-        <if test="request.applyTimeEnd != null and request.applyTimeEnd !=''">
+        <if test="request != null and request.applyTimeEnd != null and request.applyTimeEnd !=''">
             and bsei.apply_time &lt;= #{request.applyTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml
index 84d9e2a..6bd38a9 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml
@@ -105,6 +105,12 @@
         <if test="request.isUrgent != null and request.isUrgent !=''">
             AND bo.is_urgent = #{request.isUrgent}
         </if>
+        <if test="request.ids != null">
+            and blei.id in
+            <foreach collection="request.ids" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
         ORDER BY blei.update_time DESC
     </select>
 
@@ -137,6 +143,12 @@
         <if test="request.isUrgent != null and request.isUrgent !=''">
             AND bo.is_urgent = #{request.isUrgent}
         </if>
+        <if test="request.ids != null">
+            and blei.id in
+            <foreach collection="request.ids" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
         ORDER BY blei.update_time DESC
     </select>
 
diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardInfoMapper.xml
index 1a5551b..2ed8d17 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardInfoMapper.xml
@@ -45,12 +45,6 @@
         FROM biz_equipment_standard_info besi
         LEFT JOIN biz_equipment_standard_technology_relation bestr ON besi.standard_no = bestr.standard_no
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
-            and besi.approval_status = #{request.approvalStatus}
-        </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
-            and besi.create_user_id = #{request.createUserId}
-        </if>
         <if test="request.standardName != null and request.standardName !=''">
             and besi.standard_name like concat('%',#{request.standardName},'%')
         </if>
diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardTechnologyRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardTechnologyRelationMapper.xml
index fc7e16c..cd03c8c 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardTechnologyRelationMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardTechnologyRelationMapper.xml
@@ -6,6 +6,7 @@
     <resultMap id="BaseResultMap" type="com.casic.missiles.model.equipment.BizEquipmentStandardTechnologyRelation">
         <id column="id" property="id" />
         <result column="technology_file_id" property="technologyFileId" />
+        <result column="technology_file_no" property="technologyFileNo" />
         <result column="technology_file_name" property="technologyFileName" />
         <result column="standard_id" property="standardId" />
         <result column="standard_no" property="standardNo" />
@@ -14,7 +15,7 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, technology_file_id, technology_file_name, standard_id, remark
+        id, technology_file_id, technology_file_no, technology_file_name, standard_id, remark
     </sql>
 
 </mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceAuthorizeOrderMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceAuthorizeOrderMapper.xml
index ac5176c..554fe65 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceAuthorizeOrderMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceAuthorizeOrderMapper.xml
@@ -32,22 +32,22 @@
         SELECT *
         FROM biz_resource_authorize_order
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.orderNo != null and request.orderNo !=''">
+        <if test="request != null and request.orderNo != null and request.orderNo !=''">
             and order_no like concat('%',#{request.orderNo},'%')
         </if>
-        <if test="request.createUserName != null and request.createUserName !=''">
+        <if test="request != null and request.createUserName != null and request.createUserName !=''">
             and create_user_name like concat('%',#{request.createUserName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerExamineFormMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerExamineFormMapper.xml
index ab242f6..af7f98f 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerExamineFormMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerExamineFormMapper.xml
@@ -41,28 +41,28 @@
         SELECT *
         FROM biz_resource_customer_examine_form
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.formNo != null and request.formNo !=''">
+        <if test="request != null and request.formNo != null and request.formNo !=''">
             and form_no like concat('%',#{request.formNo},'%')
         </if>
-        <if test="request.labCode != null and request.labCode !=''">
+        <if test="request != null and request.labCode != null and request.labCode !=''">
             and lab_code like concat('%',#{request.labCode},'%')
         </if>
-        <if test="request.groupCode != null and request.groupCode !=''">
+        <if test="request != null and request.groupCode != null and request.groupCode !=''">
             and group_code like concat('%',#{request.groupCode},'%')
         </if>
-        <if test="request.createUserName != null and request.createUserName !=''">
+        <if test="request != null and request.createUserName != null and request.createUserName !=''">
             and create_user_name like concat('%',#{request.createUserName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerInfoMapper.xml
index fa8ffbc..06a2798 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerInfoMapper.xml
@@ -33,25 +33,25 @@
         SELECT *
         FROM biz_resource_customer_info
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.customerNo != null and request.customerNo !=''">
+        <if test="request != null and request.customerNo != null and request.customerNo !=''">
             and customer_no like concat('%',#{request.customerNo},'%')
         </if>
-        <if test="request.customerName != null and request.customerName !=''">
+        <if test="request != null and request.customerName != null and request.customerName !=''">
             and customer_name like concat('%',#{request.customerName},'%')
         </if>
-        <if test="request.contacts != null and request.contacts !=''">
+        <if test="request != null and request.contacts != null and request.contacts !=''">
             and contacts like concat('%',#{request.contacts},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerSuggestFormMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerSuggestFormMapper.xml
index 28f5bb2..1806662 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerSuggestFormMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerSuggestFormMapper.xml
@@ -33,28 +33,28 @@
         SELECT *
         FROM biz_resource_customer_suggest_form
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.formNo != null and request.formNo !=''">
+        <if test="request != null and request.formNo != null and request.formNo !=''">
             and form_no like concat('%',#{request.formNo},'%')
         </if>
-        <if test="request.customerName != null and request.customerName !=''">
+        <if test="request != null and request.customerName != null and request.customerName !=''">
             and customer_name like concat('%',#{request.customerName},'%')
         </if>
-        <if test="request.customerDeptName != null and request.customerDeptName !=''">
+        <if test="request != null and request.customerDeptName != null and request.customerDeptName !=''">
             and customer_dept_name like concat('%',#{request.customerDeptName},'%')
         </if>
-        <if test="request.createUserName != null and request.createUserName !=''">
+        <if test="request != null and request.createUserName != null and request.createUserName !=''">
             and create_user_name like concat('%',#{request.createUserName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSealUseNoteMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSealUseNoteMapper.xml
index ab37bc1..b02bb33 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSealUseNoteMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSealUseNoteMapper.xml
@@ -29,32 +29,32 @@
     </sql>
 
     <select id="selectBatchForApprovalList" resultMap="BaseResultMap">
-        SELECT *
+        SELECT brsun.*, brsi.seal_name, brsi.seal_type, brsi.approver_name
         FROM biz_resource_seal_use_note brsun
         JOIN biz_resource_seal_info brsi ON brsun.seal_id = brsi.id
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and brsun.approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and brsun.create_user_id = #{request.createUserId}
         </if>
-        <if test="request.sealName != null and request.sealName !=''">
+        <if test="request != null and request.sealName != null and request.sealName !=''">
             and brsi.seal_name like concat('%',#{request.sealName},'%')
         </if>
-        <if test="request.sealType != null and request.sealType !=''">
+        <if test="request != null and request.sealType != null and request.sealType !=''">
             and brsi.seal_type = #{request.sealType}
         </if>
-        <if test="request.applyDeptName != null and request.applyDeptName !=''">
+        <if test="request != null and request.applyDeptName != null and request.applyDeptName !=''">
             and brsun.apply_dept_name like concat('%',#{request.applyDeptName},'%')
         </if>
-        <if test="request.applyUserName != null and request.applyUserName !=''">
+        <if test="request != null and request.applyUserName != null and request.applyUserName !=''">
             and brsun.apply_user_name like concat('%',#{request.applyUserName},'%')
         </if>
-        <if test="request.applyTimeStart != null and request.applyTimeStart !=''">
+        <if test="request != null and request.applyTimeStart != null and request.applyTimeStart !=''">
             and brsun.apply_time &gt;= #{request.applyTimeStart}
         </if>
-        <if test="request.applyTimeEnd != null and request.applyTimeEnd !=''">
+        <if test="request != null and request.applyTimeEnd != null and request.applyTimeEnd !=''">
             and brsun.apply_time &lt;= #{request.applyTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml
index 119bf7d..4f8392a 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml
@@ -31,6 +31,12 @@
         <if test="request.deptName != null and request.deptName !=''">
             and brsi.dept_name like concat('%',#{request.deptName},'%')
         </if>
+        <if test="request.ids != null">
+            and brsv.id in
+            <foreach collection="request.ids" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
         ORDER BY brsv.grant_date DESC
     </select>
 
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSupplierInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSupplierInfoMapper.xml
index fe8d399..e8ce7ef 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSupplierInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSupplierInfoMapper.xml
@@ -48,28 +48,28 @@
         SELECT *
         FROM biz_resource_supplier_info
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.supplierNo != null and request.supplierNo !=''">
+        <if test="request != null and request.supplierNo != null and request.supplierNo !=''">
             and supplier_no like concat('%',#{request.supplierNo},'%')
         </if>
-        <if test="request.supplierName != null and request.supplierName !=''">
+        <if test="request != null and request.supplierName != null and request.supplierName !=''">
             and supplier_name like concat('%',#{request.supplierName},'%')
         </if>
-        <if test="request.director != null and request.director !=''">
+        <if test="request != null and request.director != null and request.director !=''">
             and director like concat('%',#{request.director},'%')
         </if>
-        <if test="request.supplierType != null and request.supplierType !=''">
+        <if test="request != null and request.supplierType != null and request.supplierType !=''">
             and supplier_type = #{request.supplierType}
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/EnvLocationInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/EnvLocationInfoMapper.xml
new file mode 100644
index 0000000..68bcf10
--- /dev/null
+++ b/casic-metering-dao/src/main/resources/mapper/resource/EnvLocationInfoMapper.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.mapper.resource.EnvLocationInfoMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.resource.EnvLocationInfo">
+        <id column="id" property="id" />
+        <result column="location_no" property="locationNo" />
+        <result column="location_name" property="locationName" />
+        <result column="location_position" property="locationPosition" />
+        <result column="create_user_id" property="createUserId" />
+        <result column="create_user" property="createUser" />
+        <result column="create_time" property="createTime" />
+        <result column="update_time" property="updateTime" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, location_no, location_name, location_position, create_user_id, create_user, create_time, update_time
+    </sql>
+
+    <select id="selectLocationListPage" resultType="com.casic.missiles.dto.resource.environment.LocationListResponse">
+        SELECT *
+        FROM env_location_info
+        WHERE 1=1
+        <if test="request.locationNo != null and request.locationNo !=''">
+            AND location_no LIKE concat('%',#{request.locationNo},'%')
+        </if>
+        <if test="request.locationName != null and request.locationName !=''">
+            AND location_name LIKE concat('%',#{request.locationName},'%')
+        </if>
+        ORDER BY create_time DESC
+    </select>
+
+</mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml
index b28c18f..8854047 100644
--- a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml
@@ -11,7 +11,6 @@
         <result column="sign_desc" property="signDesc" />
         <result column="sign_director" property="signDirector" />
         <result column="sign_user_id" property="signUserId" />
-        <result column="sign_type" property="signType" />
         <result column="minio_file_name" property="minioFileName" />
         <result column="create_time" property="createTime" />
         <result column="update_time" property="updateTime" />
@@ -28,7 +27,6 @@
         <result column="sign_name" property="signName" />
         <result column="sign_desc" property="signDesc" />
         <result column="sign_director" property="signDirector" />
-        <result column="sign_type" property="signType" />
         <result column="sign_user_id" property="signUserId" />
         <result column="minio_file_name" property="minioFileName" />
         <result column="create_time" property="createTime" />
@@ -62,4 +60,58 @@
         JOIN system_sign_user_relation ssur ON ss.id = ssur.sign_id
         WHERE ssur.user_id = #{userId}
     </select>
+
+    <select id="selectSignListPage" resultMap="BaseResultMap">
+        SELECT ss.*, sd.SIMPLE_NAME AS deptName
+        FROM system_sign ss
+        LEFT JOIN sys_user su ON su.id = ss.sign_user_id
+        LEFT JOIN sys_dept sd ON sd.id = su.dept_id
+        WHERE 1=1
+        <if test="request.signNo != null and request.signNo !=''">
+            AND ss.sign_no LIKE concat('%',#{request.signNo},'%')
+        </if>
+        <if test="request.signName != null and request.signName !=''">
+            AND ss.sign_name LIKE concat('%',#{request.signName},'%')
+        </if>
+        <if test="request.signDirector != null and request.signDirector !=''">
+            AND ss.sign_director LIKE concat('%',#{request.signDirector},'%')
+        </if>
+        <if test="request.signUserId != null and request.signUserId !=''">
+            AND ss.sign_user_id = #{request.signUserId}
+        </if>
+        <if test="request.createStartTime != null and request.createStartTime !=''">
+            AND DATE_FORMAT(ss.create_time,'%Y-%m-%d') &gt;= DATE_FORMAT(#{request.createStartTime},'%Y-%m-%d')
+        </if>
+        <if test="request.createEndTime != null and request.createEndTime !=''">
+            AND DATE_FORMAT(ss.create_time,'%Y-%m-%d')  &lt;= DATE_FORMAT(#{request.createEndTime},'%Y-%m-%d')
+        </if>
+        ORDER BY ss.create_time DESC
+    </select>
+
+    <select id="selectSignList" resultMap="BaseResultMap">
+        SELECT ss.*, sd.SIMPLE_NAME AS deptName
+        FROM system_sign ss
+        LEFT JOIN sys_user su ON su.id = ss.sign_user_id
+        LEFT JOIN sys_dept sd ON sd.id = su.dept_id
+        WHERE 1=1
+        <if test="request.signNo != null and request.signNo !=''">
+            AND ss.sign_no LIKE concat('%',#{request.signNo},'%')
+        </if>
+        <if test="request.signName != null and request.signName !=''">
+            AND ss.sign_name LIKE concat('%',#{request.signName},'%')
+        </if>
+        <if test="request.signDirector != null and request.signDirector !=''">
+            AND ss.sign_director LIKE concat('%',#{request.signDirector},'%')
+        </if>
+        <if test="request.signUserId != null and request.signUserId !=''">
+            AND ss.sign_user_id = #{request.signUserId}
+        </if>
+        <if test="request.createStartTime != null and request.createStartTime !=''">
+            AND DATE_FORMAT(ss.create_time,'%Y-%m-%d') &gt;= DATE_FORMAT(#{request.createStartTime},'%Y-%m-%d')
+        </if>
+        <if test="request.createEndTime != null and request.createEndTime !=''">
+            AND DATE_FORMAT(ss.create_time,'%Y-%m-%d')  &lt;= DATE_FORMAT(#{request.createEndTime},'%Y-%m-%d')
+        </if>
+        ORDER BY ss.create_time DESC
+    </select>
 </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 515050a..60f530b 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
@@ -47,8 +47,8 @@
     String STORAGE_LOCATION = "bizStorageLocation";
     //计量专业
     String MEASURE_MAJOR = "bizMeasureMajor";
-    //管理状态
-    String MANAGER_STATE = "bizManagerState";
+    //标准装置管理状态
+    String STANDARD_MANAGER_STATE = "bizStandardManagerState";
 
     /**
      * 资源管理 字典code
@@ -95,8 +95,6 @@
     String MEASURE_STATUS = "measureStatus";
     //检定方式
     String MEASURE_TYPE = "measureType";
-    //标识打印标志类型
-    String IDENTIFY_PRINT_TYPE = "bizBusinessIdentify";
     //变更类型
     String REPORT_CHANGE_TYPE = "bizCertChangeType";
     //规模类型
@@ -111,19 +109,24 @@
     String MEASURE_CATEGORY = "measureCategory";
     //检定结果
     String MEASURE_RESULT = "measureResult";
+    //分包原因
+    String OUTSOURCE_REASON = "outsourceReason";
+
+    /**
+     * 系统管理
+     */
+    String TEMPLATE_TYPE = "templateType";
+
 
     /**
      * 标准装置 字典code
      */
     //类别
     String STANDARD_CATEGORY = "standardCategory";
-    //管理状态
-    String STANDARD_MANAGER_STATE = "standardManagerState";
     //标准等级
     String STANDARD_LEVEL = "standardLevel";
     //传递范围
     String STANDARD_TRANSMIT_RANGE = "transmitRange";
-
     //资本来源
     String CAPITAL_SOURCE = "capitalSource";
     //标准装置-申请类型
@@ -148,8 +151,6 @@
     String CERTIFICATE_CLASS = "certificationClass";
     //证书管理-检校专业
     String CALIBRATION_MAJOR = "calibrationMajor";
-    //分包原因
-    String OUTSOURCE_REASON = "outsourceReason";
 
     /**
      * 工作台
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/BaseApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/BaseApprovalListRequest.java
index 73c12c1..80d7424 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/BaseApprovalListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/BaseApprovalListRequest.java
@@ -6,6 +6,7 @@
 
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotEmpty;
+import java.util.List;
 
 /**
  * @Description:
@@ -19,14 +20,14 @@
      * 表单id
      */
     @NotBlank(message = "表单id不能为空")
-    @ApiModelProperty(value = "表单id（流程定义对应的表单id，等价于业务id）", dataType = "String")
+    @ApiModelProperty(value = "表单id（流程定义对应的表单id，等价于业务id），导出接口不用传", dataType = "String")
     private String formId;
 
     /**
      * 审批状态类型，对应ApprovalStatusEnum
      */
     @NotEmpty(message = "审批状态类型不能为空")
-    @ApiModelProperty(value = "审批状态类型code", dataType = "String")
+    @ApiModelProperty(value = "审批状态类型code，导出接口不用传", dataType = "String")
     private String approvalStatus;
 
     @ApiModelProperty(hidden = true)
@@ -34,4 +35,7 @@
 
     @ApiModelProperty(hidden = true)
     private Long createUserId;
+
+    @ApiModelProperty(value = "导出ids", dataType = "List")
+    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificatePrintApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificatePrintApprovalListRequest.java
index b93d1c9..3cc2f4e 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificatePrintApprovalListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificatePrintApprovalListRequest.java
@@ -5,8 +5,6 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import java.util.List;
-
 /**
  * @Description:
  * @Author: wangpeng
@@ -38,7 +36,4 @@
 
     @ApiModelProperty(value = "创建结束时间", dataType = "String")
     private String createTimeEnd;
-
-    @ApiModelProperty(value = "导出ids", dataType = "List")
-    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportApprovalListRequest.java
index 4f7a038..c115847 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportApprovalListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportApprovalListRequest.java
@@ -5,8 +5,6 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import java.util.List;
-
 /**
  * @Description:
  * @Author: wangpeng
@@ -15,6 +13,8 @@
 @ApiModel
 @Data
 public class CertificateReportApprovalListRequest extends BaseApprovalListRequest {
+    @ApiModelProperty(value = "委托方id", dataType = "String")
+    private Long customerId;
 
     @ApiModelProperty(value = "证书报告编号", dataType = "String")
     private String certificateReportNo;
@@ -37,6 +37,4 @@
     @ApiModelProperty(value = "检校结束时间", dataType = "String")
     private String calibrationTimeEnd;
 
-    @ApiModelProperty(value = "导出ids", dataType = "List")
-    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/identify/IdentifyListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/identify/IdentifyListRequest.java
index 1b87ae6..f019203 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/identify/IdentifyListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/identify/IdentifyListRequest.java
@@ -4,6 +4,8 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * @Description:
  * @Author: wangpeng
@@ -26,4 +28,7 @@
 
     @ApiModelProperty(value = "打印结束时间", dataType = "String")
     private String createTimeEnd;
+
+    @ApiModelProperty(value = "导出ids", dataType = "List")
+    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListRequest.java
index 1264883..62415fb 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListRequest.java
@@ -7,6 +7,7 @@
 import lombok.Data;
 
 import javax.validation.constraints.NotBlank;
+import java.util.List;
 
 @Data
 @ApiModel
@@ -37,4 +38,6 @@
     @ApiModelProperty(value = "是否加急（1是0否null全部）", dataType = "Integer")
     private String isUrgent;
 
+    @ApiModelProperty(value = "导出ids", dataType = "List")
+    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListRequest.java
index 5201d7b..499760a 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListRequest.java
@@ -17,6 +17,9 @@
     @ApiModelProperty(value = "任务单编号", dataType = "String")
     private String orderNo;
 
+    @ApiModelProperty(value = "委托方id", dataType = "Long")
+    private Long customerId;
+
     @ApiModelProperty(value = "委托方名称", dataType = "String")
     private String customerName;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OrderSampleDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OrderSampleDTO.java
new file mode 100644
index 0000000..796edc0
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OrderSampleDTO.java
@@ -0,0 +1,19 @@
+package com.casic.missiles.dto.business.outsource;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/8/24 11:38
+ */
+@ApiModel
+@Data
+public class OrderSampleDTO {
+    @ApiModelProperty(value = "任务单id", dataType = "Long")
+    private Long orderId;
+    @ApiModelProperty(value = "受检设备id", dataType = "Long")
+    private Long sampleId;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceAssessApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceAssessApprovalListRequest.java
new file mode 100644
index 0000000..9a930c3
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceAssessApprovalListRequest.java
@@ -0,0 +1,30 @@
+package com.casic.missiles.dto.business.outsource;
+
+import com.casic.missiles.dto.BaseApprovalListRequest;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/8/24 11:01
+ */
+@ApiModel
+@Data
+public class OutsourceAssessApprovalListRequest extends BaseApprovalListRequest {
+    @ApiModelProperty(value = "评审表编号", dataType = "String")
+    private String projectNo;
+
+    @ApiModelProperty(value = "分包机构名称", dataType = "String")
+    private String outsourcerName;
+
+    @ApiModelProperty(value = "申请人", dataType = "String")
+    private String applicantName;
+
+    @ApiModelProperty(value = "申请时间开始", dataType = "String")
+    private String applicantTimeStart;
+
+    @ApiModelProperty(value = "申请时间结束", dataType = "String")
+    private String applicantTimeEnd;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceAssessSaveResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceAssessSaveResponse.java
new file mode 100644
index 0000000..8bf9aad
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceAssessSaveResponse.java
@@ -0,0 +1,20 @@
+package com.casic.missiles.dto.business.outsource;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/8/14 16:17
+ */
+@ApiModel
+@Data
+public class OutsourceAssessSaveResponse {
+    @ApiModelProperty(value = "主键id", dataType = "Long")
+    private Long id;
+
+    @ApiModelProperty(value = "编号", dataType = "String")
+    private String projectNo;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProtocolApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProtocolApprovalListRequest.java
new file mode 100644
index 0000000..0f32331
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProtocolApprovalListRequest.java
@@ -0,0 +1,30 @@
+package com.casic.missiles.dto.business.outsource;
+
+import com.casic.missiles.dto.BaseApprovalListRequest;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/8/24 15:01
+ */
+@ApiModel
+@Data
+public class OutsourceProtocolApprovalListRequest extends BaseApprovalListRequest {
+    @ApiModelProperty(value = "协议书编号", dataType = "String")
+    private String protocolNo;
+
+    @ApiModelProperty(value = "分包方名称", dataType = "String")
+    private String outsourcerName;
+
+    @ApiModelProperty(value = "申请人", dataType = "String")
+    private String applicantName;
+
+    @ApiModelProperty(value = "申请时间开始", dataType = "String")
+    private String applicantTimeStart;
+
+    @ApiModelProperty(value = "申请时间结束", dataType = "String")
+    private String applicantTimeEnd;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProtocolSaveResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProtocolSaveResponse.java
new file mode 100644
index 0000000..e324967
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProtocolSaveResponse.java
@@ -0,0 +1,20 @@
+package com.casic.missiles.dto.business.outsource;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/8/14 16:17
+ */
+@ApiModel
+@Data
+public class OutsourceProtocolSaveResponse {
+    @ApiModelProperty(value = "主键id", dataType = "Long")
+    private Long id;
+
+    @ApiModelProperty(value = "编号", dataType = "String")
+    private String protocolNo;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveApprovalListRequest.java
index f29f4e4..7047c28 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveApprovalListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveApprovalListRequest.java
@@ -5,8 +5,6 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import java.util.List;
-
 /**
  * @Description: 现场检测审批列表请求实体
  * @Author: wangpeng
@@ -30,7 +28,4 @@
     @ApiModelProperty(value = "申请时间结束", dataType = "String")
     private String applyTimeEnd;
 
-    @ApiModelProperty(value = "导出ids", dataType = "List")
-    private List<Long> ids;
-
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveDetailResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveDetailResponse.java
index 1f28752..394c934 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveDetailResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveDetailResponse.java
@@ -12,6 +12,18 @@
     @ApiModelProperty(value = "id，更新/删除使用参数", dataType = "Long")
     private Long id;
 
+    @ApiModelProperty(value = "实验室代码(字典code)", dataType = "String")
+    private String labCode;
+
+    @ApiModelProperty(value = "实验室代码(字典value)", dataType = "String")
+    private String labCodeName;
+
+    @ApiModelProperty(value = "组别代码(字典code)", dataType = "String")
+    private String groupCode;
+
+    @ApiModelProperty(value = "组别代码(字典value)", dataType = "String")
+    private String groupCodeName;
+
     @ApiModelProperty(value = "审批编号", dataType = "String")
     private String siteExecutiveNo;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/environment/LocationListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/environment/LocationListRequest.java
new file mode 100644
index 0000000..13d03c3
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/environment/LocationListRequest.java
@@ -0,0 +1,20 @@
+package com.casic.missiles.dto.resource.environment;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/6/8 13:56
+ */
+@ApiModel
+@Data
+public class LocationListRequest {
+    @ApiModelProperty(value = "地点编号", dataType = "String")
+    private String locationNo;
+
+    @ApiModelProperty(value = "地点名称", dataType = "String")
+    private String locationName;
+}

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java
index bb0c50f..13a699b 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java
@@ -12,6 +12,7 @@
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.IGeneralApprovalService;
+import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
@@ -19,6 +20,7 @@
 import org.springframework.web.bind.annotation.RequestBody;
 
 import javax.validation.Valid;
+import java.util.List;
 import java.util.Objects;
 
 /**
@@ -117,4 +119,17 @@
         }
         return baseApprovalService.failUpdate(request);
     }
+
+    public List<O> exportList(@RequestBody @Valid R request) throws Exception {
+        List<O> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = baseApprovalService.listExportByIds(request.getIds());
+        } else {
+            list = baseApprovalService.listExport(request);
+        }
+        for (O record : list) {
+            DictCodeUtils.convertDictCodeToName(record);
+        }
+        return list;
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java
index 8a90961..d775831 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java
@@ -5,6 +5,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.business.certificate.CertificateChangeApplyApprovalListRequest;
 import com.casic.missiles.dto.business.certificate.CertificateChangeApplySaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessCertificateChangeApply;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
@@ -20,6 +21,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -48,4 +50,12 @@
         }
         return changeApplyService.saveChangeApply(request);
     }
+
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody CertificateChangeApplyApprovalListRequest request) throws Exception {
+        List<BizBusinessCertificateChangeApply> list = super.exportList(request);
+        super.exportExcel(BizBusinessCertificateChangeApply.class, list, ExportEnum.CERTIFICATE_CHANGE_APPLY.getSheetName());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java
index 5fc4b07..af8230e 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java
@@ -9,6 +9,7 @@
 import com.casic.missiles.dto.business.certificate.CertificatePrintApprovalListRequest;
 import com.casic.missiles.dto.business.certificate.CertificatePrintListResponse;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.enums.business.CertificatePrintStatusEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessCertificatePrintLog;
@@ -18,10 +19,16 @@
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.io.IOException;
+import java.util.List;
 import java.util.Objects;
 
 /**
@@ -98,4 +105,16 @@
         });
         return certificatePrintService.certificatePrintLog(idDTO.getId());
     }
+
+    @ApiOperation("证书打印审批导出")
+    @PostMapping("/listExport")
+    public void exportList(@RequestBody CertificatePrintApprovalListRequest request) throws IOException {
+        List<CertificatePrintListResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = certificatePrintService.listByIds(request.getIds());
+        } else {
+            list = certificatePrintService.list(request);
+        }
+        super.exportExcel(CertificatePrintListResponse.class, list, ExportEnum.CERTIFICATE_PRINT.getSheetName());
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java
index 63b06dc..6b2efd5 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java
@@ -6,6 +6,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.business.certificate.CertificateReportApprovalListRequest;
 import com.casic.missiles.dto.business.certificate.CertificateReportSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessCertificateReport;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
@@ -21,6 +22,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -50,7 +52,7 @@
         return certificateReportService.saveCertificateReport(request);
     }
 
-    @ApiOperation("证书审批详情（基本信息）")
+    @ApiOperation("详情（基本信息）")
     @PostMapping("/detail")
     public ReturnDTO<BizBusinessCertificateReport> detail(@RequestBody @Valid BaseDetailRequest request, BindingResult bindingResult) throws Exception {
         if(bindingResult.hasErrors()){
@@ -59,4 +61,11 @@
         return certificateReportService.detail(request);
     }
 
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody CertificateReportApprovalListRequest request) throws Exception {
+        List<BizBusinessCertificateReport> list = super.exportList(request);
+        super.exportExcel(BizBusinessCertificateReport.class, list, ExportEnum.CERTIFICATE_REPORT.getSheetName());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java
index 46b26bd..57c0809 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java
@@ -10,20 +10,21 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.business.identify.IdentifyListRequest;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessIdentifyInfo;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.business.IBizBusinessIdentifyInfoService;
+import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import javax.validation.Valid;
+import java.util.List;
 import java.util.Objects;
 
 /**
@@ -57,16 +58,13 @@
         return identifyInfoService.addIdentify(identifyInfo);
     }
 
-    @ApiOperation("标识打印更新")
+    @ApiOperation("标识打印更新（更新打印时间）")
     @PostMapping("/update")
-    public ReturnDTO updateIdentify(@RequestBody @Valid BizBusinessIdentifyInfo identifyInfo, BindingResult bindingResult) {
-        Assert.isFalse(Objects.isNull(identifyInfo.getId()), () -> {
+    public ReturnDTO updateIdentify(@RequestBody @Valid IdDTO idDTO) {
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        Assert.isFalse(bindingResult.hasErrors(), () -> {
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        });
-        return identifyInfoService.updateIdentify(identifyInfo);
+        return identifyInfoService.updateIdentify(idDTO.getId());
     }
 
     @ApiOperation("标识打印删除")
@@ -77,4 +75,37 @@
         });
         return identifyInfoService.deleteIdentify(idDTO.getId());
     }
+
+    @ApiOperation("标识打印导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody @Valid IdentifyListRequest request, BindingResult bindingResult) throws Exception {
+        if (bindingResult.hasErrors()) {
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        List<BizBusinessIdentifyInfo> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = identifyInfoService.listByIds(request.getIds());
+        } else {
+            list = identifyInfoService.list(request);
+        }
+        for (BizBusinessIdentifyInfo record : list) {
+            DictCodeUtils.convertDictCodeToName(record);
+        }
+        super.exportExcel(BizBusinessIdentifyInfo.class, list, ExportEnum.IDENTIFY_EXPORT.getSheetName());
+    }
+
+
+    // TODO: 2023/8/23 查询设备信息，4个底部按钮查设备（按钮的作用就是前端用来调不同接口、用来区分中间即将展示的标识），前端弹窗选设备，在确定保存时前端根据底部按钮判断传入设备类型deviceType字典code
+    // TODO: 2023/8/23 接口：查受检设备（第1个按钮），查设备台账（后3个按钮同一接口），查询之后前端根据标志类型的不同加到中间页面时进行判断（按产品给的对应表）
+    // TODO: 2023/8/23 提供二维码接口，前端在加到中间页面时调用一下
+
+    @ApiOperation("设备二维码")
+    @PostMapping("/equipment/qrCode")
+    public ReturnDTO<String> equipmentQrCode(@RequestBody @Valid IdDTO idDTO) {
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return identifyInfoService.equipmentQrCode(idDTO.getId());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java
index 707be6e..7e0453d 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java
@@ -117,7 +117,7 @@
     }
 
     @ApiOperation("任务单导出")
-    @PostMapping("/export")
+    @PostMapping("/listExport")
     public void orderExport(@RequestBody @Valid OrderListRequest request, HttpServletResponse response) {
         businessOrderService.orderExport(request, response);
     }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java
index 529a6ce..51432be 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java
@@ -1,9 +1,28 @@
 package com.casic.missiles.controller.business;
 
+import com.casic.missiles.controller.GeneralApprovalController;
+import com.casic.missiles.dto.BaseApprovalSubmitRequest;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.business.outsource.OutsourceAssessApprovalListRequest;
+import com.casic.missiles.dto.business.outsource.OutsourceAssessSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
+import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.model.business.BizBusinessOutsourceAssess;
+import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
+import com.casic.missiles.service.IGeneralApprovalService;
+import com.casic.missiles.service.business.IBizBusinessOutsourceAssessService;
 import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.BindingResult;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.validation.Valid;
+import java.util.List;
+
 /**
  * <p>
  * 计量检定业务-分包管理-测试、校准或检定工作分包评审表 前端控制器
@@ -15,6 +34,27 @@
 @Api(tags = "分包管理-测试、校准或检定工作分包评审表")
 @RestController
 @RequestMapping("/business/outsource/assess")
-public class BizBusinessOutsourceAssessController {
+public class BizBusinessOutsourceAssessController extends GeneralApprovalController<BizBusinessOutsourceAssess, BizBusinessOutsourceAssess, OutsourceAssessApprovalListRequest, BaseApprovalSubmitRequest> {
+    @Autowired
+    private IBizBusinessOutsourceAssessService outsourceAssessService;
 
+    public BizBusinessOutsourceAssessController(IGeneralApprovalService<BizBusinessOutsourceAssess, BizBusinessOutsourceAssess, OutsourceAssessApprovalListRequest, BaseApprovalSubmitRequest> baseApprovalService) {
+        super(baseApprovalService);
+    }
+
+    @ApiOperation("草稿箱-保存")
+    @PostMapping("/save")
+    public ReturnDTO<OutsourceAssessSaveResponse> saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceAssess request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        return outsourceAssessService.saveOutsourceAssess(request);
+    }
+
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception {
+        List<BizBusinessOutsourceAssess> list = super.exportList(request);
+        super.exportExcel(BizBusinessOutsourceAssess.class, list, ExportEnum.OUTSOURCE_ASSESS.getSheetName());
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java
new file mode 100644
index 0000000..9adef18
--- /dev/null
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java
@@ -0,0 +1,60 @@
+package com.casic.missiles.controller.business;
+
+import com.casic.missiles.controller.GeneralApprovalController;
+import com.casic.missiles.dto.BaseApprovalSubmitRequest;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.business.outsource.OutsourceProtocolApprovalListRequest;
+import com.casic.missiles.dto.business.outsource.OutsourceProtocolSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
+import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.model.business.BizBusinessOutsourceProtocol;
+import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
+import com.casic.missiles.service.IGeneralApprovalService;
+import com.casic.missiles.service.business.IBizBusinessOutsourceProtocolService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.BindingResult;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.validation.Valid;
+import java.util.List;
+
+/**
+ * <p>
+ * 计量检定业务-分包管理-测试、校准或检定工作分包协议书 前端控制器
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-08-24
+ */
+@Api(tags = "分包管理-测试、校准或检定工作分包协议书")
+@RestController
+@RequestMapping("/business/outsource/protocol")
+public class BizBusinessOutsourceProtocolController extends GeneralApprovalController<BizBusinessOutsourceProtocol, BizBusinessOutsourceProtocol, OutsourceProtocolApprovalListRequest, BaseApprovalSubmitRequest> {
+    @Autowired
+    private IBizBusinessOutsourceProtocolService outsourceProtocolService;
+
+    public BizBusinessOutsourceProtocolController(IGeneralApprovalService<BizBusinessOutsourceProtocol, BizBusinessOutsourceProtocol, OutsourceProtocolApprovalListRequest, BaseApprovalSubmitRequest> baseApprovalService) {
+        super(baseApprovalService);
+    }
+
+    @ApiOperation("草稿箱-保存")
+    @PostMapping("/save")
+    public ReturnDTO<OutsourceProtocolSaveResponse> saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceProtocol request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        return outsourceProtocolService.saveOutsourceProtocol(request);
+    }
+
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody OutsourceProtocolApprovalListRequest request) throws Exception {
+        List<BizBusinessOutsourceProtocol> list = super.exportList(request);
+        super.exportExcel(BizBusinessOutsourceProtocol.class, list, ExportEnum.OUTSOURCE_PROTOCOL.getSheetName());
+    }
+}
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java
index 097f645..f0f0943 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java
@@ -17,7 +17,6 @@
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.IGeneralApprovalService;
 import com.casic.missiles.service.business.IBizBusinessOutsourcerInfoService;
-import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -71,19 +70,8 @@
 
     @ApiOperation("分包方导出")
     @PostMapping("/listExport")
-    public void export(@RequestBody @Valid OutsourcerInfoApprovalListRequest request, BindingResult bindingResult) throws Exception {
-        if (bindingResult.hasErrors()) {
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        }
-        List<BizBusinessOutsourcerInfo> list;
-        if (!CollectionUtils.isEmpty(request.getIds())) {
-            list = outsourcerInfoService.listByIds(request.getIds());
-        } else {
-            list = outsourcerInfoService.list(request);
-        }
-        for (BizBusinessOutsourcerInfo record : list) {
-            DictCodeUtils.convertDictCodeToName(record);
-        }
+    public void export(@RequestBody OutsourcerInfoApprovalListRequest request) throws Exception {
+        List<BizBusinessOutsourcerInfo> list = super.exportList(request);
         super.exportExcel(BizBusinessOutsourcerInfo.class, list, ExportEnum.OUTSOURCER_EXPORT.getSheetName());
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java
index c2cbf9f..0410918 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java
@@ -17,11 +17,9 @@
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.IGeneralApprovalService;
 import com.casic.missiles.service.business.IBizBusinessSiteExecutiveInfoService;
-import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -60,7 +58,7 @@
         return siteExecutiveInfoService.saveSiteExecutiveInfo(siteExecutiveInfo);
     }
 
-    @ApiOperation("现场检测详情")
+    @ApiOperation("详情")
     @PostMapping("/detail")
     public ReturnDTO<SiteExecutiveDetailResponse> siteExecutiveDetail(@RequestBody @Valid IdDTO idDTO) throws Exception {
         Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
@@ -69,21 +67,10 @@
         return ReturnUtil.success(siteExecutiveInfoService.detail(idDTO.getId()));
     }
 
-    @ApiOperation("现场检测导出")
+    @ApiOperation("导出")
     @PostMapping("/listExport")
-    public void export(@RequestBody @Valid SiteExecutiveApprovalListRequest request, BindingResult bindingResult) throws Exception {
-        if (bindingResult.hasErrors()) {
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        }
-        List<SiteExecutiveApprovalListResponse> list;
-        if (!CollectionUtils.isEmpty(request.getIds())) {
-            list = siteExecutiveInfoService.listInfoByIds(request.getIds());
-        } else {
-            list = siteExecutiveInfoService.listInfo(request);
-        }
-        for (SiteExecutiveApprovalListResponse record : list) {
-            DictCodeUtils.convertDictCodeToName(record);
-        }
+    public void export(@RequestBody SiteExecutiveApprovalListRequest request) throws Exception {
+        List<SiteExecutiveApprovalListResponse> list = super.exportList(request);
         super.exportExcel(SiteExecutiveApprovalListResponse.class, list, ExportEnum.SITE_EXECUTIVE_EXPORT.getSheetName());
     }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
index 7e793cd..a92e209 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
@@ -55,7 +55,7 @@
 
     @ApiOperation("设备收发列表导出")
     @PostMapping("/export")
-    public void exportList(@RequestBody @Valid SampleDispatchListRequest request) throws IOException {
+    public void exportList(@RequestBody SampleDispatchListRequest request) throws IOException {
         List<SampleDispatchListResponse> list;
         if (!CollectionUtils.isEmpty(request.getIds())) {
             list = dispatchService.listByIds(request.getIds());
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java
index cdc77fc..d120fd4 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java
@@ -7,6 +7,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.business.labExecutive.*;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.business.IBusinessLabExecutiveInfoService;
@@ -14,6 +15,7 @@
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.*;
 
@@ -32,7 +34,7 @@
     @Autowired
     private IBusinessLabExecutiveInfoService labExecutiveInfoService;
 
-    @ApiOperation("实验室检测-部门检测-查询各状态列表（待检测、检测中、检测完）")
+    @ApiOperation("实验室任务-查询各状态列表（待检测、检测中、检测完）")
     @PostMapping("/deptExecutive/List")
     public ReturnDTO<PageInfoBT<SampleLabExecutiveListResponse>> queryDeptExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
@@ -43,10 +45,19 @@
         return ReturnUtil.success(super.packForBT(labExecutiveInfoService.deptLabExecutiveListPage(page, labExecutiveListRequest)));
     }
 
-    /**
-     * 实验室检测-我的检测-查询各状态列表（待检测、检测中、检测完）
-     */
-    @ApiOperation("实验室检测-我的检测-查询各状态列表（待检测、检测中、检测完）")
+    @ApiOperation("实验室任务导出")
+    @PostMapping("/deptExecutive/export")
+    public void deptExportList(@RequestBody @Valid SampleLabExecutiveListRequest request) throws Exception {
+        List<SampleLabExecutiveListResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = labExecutiveInfoService.deptLabExecutiveListByIds(request.getMeasureStatus(), request.getIds());
+        } else {
+            list = labExecutiveInfoService.deptLabExecutiveList(request);
+        }
+        super.exportExcel(SampleLabExecutiveListResponse.class, list, ExportEnum.DEPT_EXECUTIVE_TASK.getSheetName());
+    }
+
+    @ApiOperation("我的任务-查询各状态列表（待检测、检测中、检测完）")
     @PostMapping("/myExecutive/list")
     public ReturnDTO<PageInfoBT<SampleLabExecutiveListResponse>> queryMyExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
@@ -57,19 +68,25 @@
         return ReturnUtil.success(super.packForBT(labExecutiveInfoService.myLabExecutiveListPage(page, labExecutiveListRequest)));
     }
 
-    /**
-     * 实验室检测-我的检测-查询各状态样品数量（待检测、检测中、检测完）
-     */
-    @ApiOperation("实验室检测-我的检测-查询各状态样品数量（待检测、检测中、检测完）")
+    @ApiOperation("我的任务导出")
+    @PostMapping("/myExecutive/export")
+    public void exportList(@RequestBody @Valid SampleLabExecutiveListRequest request) throws Exception {
+        List<SampleLabExecutiveListResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = labExecutiveInfoService.myLabExecutiveListByIds(request.getMeasureStatus(), request.getIds());
+        } else {
+            list = labExecutiveInfoService.myLabExecutiveList(request);
+        }
+        super.exportExcel(SampleLabExecutiveListResponse.class, list, ExportEnum.MY_EXECUTIVE_TASK.getSheetName());
+    }
+
+    @ApiOperation("我的任务-查询各状态样品数量（待检测、检测中、检测完）")
     @GetMapping("/myExecutive/amount")
     public ReturnDTO<List<SampleAmountResponse>> queryMyExecutiveAmount() {
         return ReturnUtil.success(labExecutiveInfoService.myExecutiveAmount());
     }
 
-    /**
-     * 实验室检测-部门检测-分配（分配给具体人员）
-     */
-    @ApiOperation("实验室检测-部门检测-分配按钮（分配给具体人员）")
+    @ApiOperation("实验室任务-分配按钮（分配给具体人员）")
     @PostMapping("/deptExecutive/allocate")
     public ReturnDTO allocateStaff(@RequestBody @Valid SampleAllocateRequest sampleAllocateRequest, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -78,10 +95,7 @@
         return labExecutiveInfoService.allocateStaff(sampleAllocateRequest);
     }
 
-    /**
-     * 实验室检测-我的检测-检定人扫描收入（待检测->检测中）
-     */
-    @ApiOperation("实验室检测-我的检测-检定人扫描收入（待检测->检测中）")
+    @ApiOperation("我的任务-检定人扫描收入（待检测->检测中）")
     @PostMapping("/myExecutive/receive")
     public ReturnDTO sampleReceive(@RequestBody @Valid List<SampleOperateRequest> requestList, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -90,10 +104,7 @@
         return labExecutiveInfoService.sampleReceive(requestList);
     }
 
-    /**
-     * 实验室检测-负责人/检定人扫描检完（检测中->检测完）
-     */
-    @ApiOperation("实验室检测-负责人/检定人扫描检完（检测中->检测完）")
+    @ApiOperation("实验室任务-负责人/检定人扫描检完（检测中->检测完）")
     @PostMapping("/myExecutive/complete")
     public ReturnDTO sampleExecutiveComplete(@RequestBody @Valid List<SampleOperateRequest> requestList, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -102,10 +113,7 @@
         return labExecutiveInfoService.sampleExecutiveComplete(requestList);
     }
 
-    /**
-     * 实验室检测-部门检测/我的检测 编辑（只能修改应出具证书）
-     */
-    @ApiOperation("实验室检测-部门检测/我的检测 编辑（只能修改应出具证书）")
+    @ApiOperation("实验室任务/我的任务 编辑（只能修改应出具证书）")
     @PostMapping("/executive/update")
     public ReturnDTO updateExecutive(@RequestBody @Valid UpdateExecutiveRequest request, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -114,10 +122,7 @@
         return labExecutiveInfoService.updateExecutive(request);
     }
 
-    /**
-     * 实验室检测-部门检测/我的检测 详情
-     */
-    @ApiOperation("实验室检测-部门检测/我的检测 详情")
+    @ApiOperation("实验室任务/我的任务 详情")
     @PostMapping("/executive/detail")
     public ReturnDTO<ExecutiveDetailResponse> executiveDetail(@RequestBody @Valid ExecutiveDetailRequest request, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
@@ -131,7 +136,7 @@
      * 退回后会将下一个要执行的实验室检测状态更新为待分配，将后面的实验室顺序变更为连续（都进行减1）
      * 最后一个检测的实验室退回，等分发员再增加实验室或设备收发中的已收入直接手动点击完成
      */
-    @ApiOperation("实验室检测-部门检测/我的检测 退回（待检测/检测中->退回）")
+    @ApiOperation("实验室任务/我的任务 退回（待检测/检测中->退回）")
     @PostMapping("/executive/sendBack")
     public ReturnDTO executiveSendBack(@RequestBody @Valid ExecutiveSendBackRequest request, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -140,9 +145,6 @@
         return labExecutiveInfoService.sampleExecutiveSendBack(request);
     }
 
-    /**
-     * 分发员编辑实验室检测列表
-     */
     @ApiOperation("分发员编辑实验室检测列表")
     @PostMapping("/handOut/updateList")
     public ReturnDTO updateExecutiveList(@RequestBody @Valid UpdateExecutiveListRequest request, BindingResult bindingResult) {
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java
index 48a67ed..0c04f31 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java
@@ -10,6 +10,7 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.resource.customer.CustomerApprovalListRequest;
 import com.casic.missiles.dto.resource.customer.CustomerSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceCustomerInfo;
@@ -26,6 +27,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -55,6 +57,13 @@
         return customerInfoService.saveCustomerInfo(request);
     }
 
+    @ApiOperation("委托方名录导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody CustomerApprovalListRequest request) throws Exception {
+        List<BizResourceCustomerInfo> list = super.exportList(request);
+        super.exportExcel(BizResourceCustomerInfo.class, list, ExportEnum.CUSTOMER_INFO.getSheetName());
+    }
+
     @ApiOperation("委托方人员列表（分页）")
     @PostMapping("/person/listPage")
     public ReturnDTO<PageInfoBT<BizResourceCustomerStaff>> personListPage(@RequestBody IdDTO idDto) {
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
index 972ed4b..6418ea5 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
@@ -5,6 +5,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.resource.customer.SuggestFormApprovalListRequest;
 import com.casic.missiles.dto.resource.customer.SuggestFormSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceCustomerSuggestForm;
@@ -20,6 +21,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -50,4 +52,11 @@
         return suggestFormService.saveSuggestForm(request);
     }
 
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody SuggestFormApprovalListRequest request) throws Exception {
+        List<BizResourceCustomerSuggestForm> list = super.exportList(request);
+        super.exportExcel(BizResourceCustomerSuggestForm.class, list, ExportEnum.CUSTOMER_SUGGEST_FORM.getSheetName());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java
index 1934d1a..9e07eab 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java
@@ -15,12 +15,16 @@
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.resource.IEnvEnvironmentRecordConfigService;
 import com.casic.missiles.service.resource.IEnvEnvironmentRecordDataService;
+import com.casic.missiles.service.resource.IEnvLocationInfoService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
 import java.util.List;
@@ -39,6 +43,8 @@
     private IEnvEnvironmentRecordDataService environmentRecordDataService;
     @Autowired
     private IEnvEnvironmentRecordConfigService environmentRecordConfigService;
+    @Autowired
+    private IEnvLocationInfoService locationInfoService;
 
     @ApiOperation("环境记录单数据列表/详情")
     @PostMapping("/data/listPage")
@@ -95,4 +101,11 @@
         });
         return environmentRecordConfigService.deleteEnvironmentRecordConfig(idDTO.getId());
     }
+
+    @ApiOperation("地点列表")
+    @PostMapping("/location/listPage")
+    public ReturnDTO<PageInfoBT<LocationListResponse>> locationListPage(@RequestBody @Valid LocationListRequest request) {
+        Page<LocationListResponse> page = PageFactory.defaultPage();
+        return ReturnUtil.success(super.packForBT(locationInfoService.listPage(page, request)));
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java
index 82efe3f..e9561fa 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java
@@ -10,6 +10,7 @@
 import com.casic.missiles.dto.resource.seal.SealLogListRequest;
 import com.casic.missiles.dto.resource.seal.SealNoteApprovalListRequest;
 import com.casic.missiles.dto.resource.seal.SealNoteSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceSealUseLog;
@@ -27,6 +28,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -58,6 +60,13 @@
         return sealUseNoteService.saveSeal(request);
     }
 
+    @ApiOperation("印章使用登记导出（列表和导出中去掉经办人和监印人）")
+    @PostMapping("/listExport")
+    public void export(@RequestBody SealNoteApprovalListRequest request) throws Exception {
+        List<BizResourceSealUseNote> list = super.exportList(request);
+        super.exportExcel(BizResourceSealUseNote.class, list, ExportEnum.SEAL_NOTE.getSheetName());
+    }
+
     // TODO: 2023/7/28 印章使用日志：系统中使用印章时插入数据库
 
     @ApiOperation("印章使用日志列表（分页）")
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java
index 9b674fc..06b6521 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java
@@ -9,16 +9,20 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.resource.staff.StaffCertRequest;
 import com.casic.missiles.dto.resource.staff.StaffCertResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.service.resource.IBizResourceStaffInfoService;
 import com.casic.missiles.service.resource.IBizResourceStaffVerifierService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.List;
+
 /**
  * @Description:
  * @Author: wangpeng
@@ -41,9 +45,21 @@
         return ReturnUtil.success(super.packForBT(responsePage));
     }
 
+    @ApiOperation("证书逾期提醒导出")
+    @PostMapping("/listExport")
+    public void exportList(@RequestBody StaffCertRequest request) throws Exception {
+        List<StaffCertResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = staffInfoService.certListByIds(request.getIds());
+        } else {
+            list = staffInfoService.certList(request);
+        }
+        super.exportExcel(StaffCertResponse.class, list, ExportEnum.STAFF_CERTIFICATE_EXPIRE.getSheetName());
+    }
+
     @ApiOperation("证书逾期提醒")
     @PostMapping("/expirationReminder")
-    public ReturnDTO expirationReminder(@RequestBody IdDTO idDto) {
-        return verifierService.expirationReminder(idDto);
+    public ReturnDTO expirationReminder(@RequestBody IdDTO idDTO) {
+        return verifierService.expirationReminder(idDTO);
     }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java
index 3b251ad..a6e7850 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java
@@ -12,6 +12,7 @@
 import com.casic.missiles.dto.resource.staff.StaffListRequest;
 import com.casic.missiles.dto.resource.staff.TrainListRequest;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.*;
@@ -22,7 +23,10 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
 import java.util.List;
@@ -52,8 +56,19 @@
             throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
         }
         Page<BizResourceStaffInfo> page = PageFactory.defaultPage();
-        Page<BizResourceStaffInfo> responsePage = staffInfoService.listPage(page, request);
-        return ReturnUtil.success(super.packForBT(responsePage));
+        return ReturnUtil.success(super.packForBT(staffInfoService.listPage(page, request)));
+    }
+
+    @ApiOperation("人员登记导出")
+    @PostMapping("/listExport")
+    public void exportList(@RequestBody StaffListRequest request) throws Exception {
+        List<BizResourceStaffInfo> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = staffInfoService.listByIds(request.getIds());
+        } else {
+            list = staffInfoService.list(request);
+        }
+        super.exportExcel(BizResourceStaffInfo.class, list, ExportEnum.STAFF_INFO.getSheetName());
     }
 
     @ApiOperation("人员登记详情基础信息")
@@ -85,9 +100,9 @@
 
     @ApiOperation("科研教育列表（分页）")
     @PostMapping("/education/listPage")
-    public ReturnDTO<PageInfoBT<BizResourceStaffEducation>> educationListPage(@RequestBody IdDTO idDto) {
+    public ReturnDTO<PageInfoBT<BizResourceStaffEducation>> educationListPage(@RequestBody IdDTO idDTO) {
         Page<BizResourceStaffEducation> page = PageFactory.defaultPage();
-        Page<BizResourceStaffEducation> responsePage = staffInfoService.educationListPage(page, idDto);
+        Page<BizResourceStaffEducation> responsePage = staffInfoService.educationListPage(page, idDTO);
         return ReturnUtil.success(super.packForBT(responsePage));
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java
index af6aa86..d85d84a 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java
@@ -9,6 +9,7 @@
 import com.casic.missiles.dto.resource.outsideService.SupplierApprovalListRequest;
 import com.casic.missiles.dto.resource.outsideService.SupplierSaveResponse;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceSupplierAbility;
@@ -67,6 +68,13 @@
         return ReturnUtil.success(supplierInfoService.detail(idDTO.getId()));
     }
 
+    @ApiOperation("合格供方导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody SupplierApprovalListRequest request) throws Exception {
+        List<BizResourceSupplierInfo> list = super.exportList(request);
+        super.exportExcel(BizResourceSupplierInfo.class, list, ExportEnum.SUPPLIER_INFO.getSheetName());
+    }
+
     @ApiOperation("供方人员列表（分页）")
     @PostMapping("/person/listPage")
     public ReturnDTO<PageInfoBT<BizResourceSupplierPerson>> personListPage(@RequestBody IdDTO idDTO) {
diff --git a/casic-metering-api/src/main/resources/config/application.yml b/casic-metering-api/src/main/resources/config/application.yml
index 350db5f..ecff521 100644
--- a/casic-metering-api/src/main/resources/config/application.yml
+++ b/casic-metering-api/src/main/resources/config/application.yml
@@ -126,7 +126,7 @@
     #作者
     author: wangpeng
     #待生成对象表名
-    table-name: biz_equipment_technical_target_approval,biz_equipment_attachment_approval,biz_equipment_checkpoint_approval
+    table-name: biz_business_outsource_protocol
 
 reminder:
   #节点--common模块config包 ReminderNodeConfig配置
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
index 4a19e4e..d47d552 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
@@ -53,6 +53,7 @@
     SUGGEST_FORM_SAVE_FAILED(2509, "委托方意见登记表保存至草稿箱失败"),
     EXAMINE_FORM_SAVE_FAILED(2510, "要求、委托书及合同评审表保存至草稿箱失败"),
     CUSTOMER_EXIST_SAVE_FAILED(2511, "该委托方已存在，请重新选择"),
+    DUPLICATE_LOCATION_NO(2512, "地点编号已存在"),
 
     /**
      * 计量检定业务模块
@@ -68,6 +69,8 @@
     COMPLETE_SAMPLE_NOT_EXIST(2609, "检测中不存在扫描收入的样品"),
     CANNOT_CHANGE_MEASURE_INFO(2610, "无法更改非当前登录用户的检测信息"),
     NON_EXIST_ORDER_OR_SAMPLE(2611, "不存在该委托单或该委托单下的样品"),
+    OUTSOURCE_ACCESS_SAVE_FAILED(2612, "测试、校准或检定工作分包评审表保存至草稿箱失败"),
+    OUTSOURCE_PROTOCOL_SAVE_FAILED(2613, "测试、校准或检定工作分包协议书保存至草稿箱失败"),
 
     /**
      * 历史遗留备用
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
index 5089ad1..81a406b 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
@@ -10,54 +10,38 @@
     /**
      * 资源管理
      */
-    ENVIRONMENT_DATA_EXPORT("environmentData", "environmentData", "环境记录单数据"),
+    ENVIRONMENT_DATA_EXPORT("environmentData", "环境记录单数据", "环境记录单数据"),
+    STAFF_INFO("staffInfo", "人员登记", "人员登记"),
+    STAFF_CERTIFICATE_EXPIRE("certificateExpire", "证书逾期提醒", "证书逾期提醒"),
+    SUPPLIER_INFO("supplierInfo", "合格供方名录", "合格供方名录"),
+    CUSTOMER_INFO("customerInfo", "委托方名录", "委托方名录"),
+    CUSTOMER_SUGGEST_FORM("customerSuggestForm", "委托方意见登记表", "委托方意见登记表"),
+    SEAL_NOTE("sealNote", "印章使用登记", "印章使用登记"),
 
-    FILE_EXPORT("meterFileData", "meterFileData", "计量文件信息"),
-    TRAIN_PLAN_EXPORT("trainPlanData", "trainPlanData", "培训计划"),
-    TRAIN_LOG_EXPORT("trainLogData", "trainLogData", "培训记录"),
-    METER_ORGANIZE_EXPORT("meterOrganizeData", "meterOrganizeData", "计量组织"),
-    TRACE_SUPPLIER_EXPORT("traceSupplierData", "traceSupplierData", "溯源供方"),
-    SIGN_EXPORT("signData", "signData", "签名/签章"),
-    TEMPLATE_EXPORT("templateData", "templateData", "原始记录模板/证书报告模板"),
-    FIXED_ASSETS("meterFixedAssets", "meterFixedAssets", "固定资产"),
-    METER_EQUIPMENT("meterEquipment", "meterEquipment", "测量设备"),
-    CALIBRATION_TEST_EQUIPMENT("calibrationTestEquipment", "calibrationTestEquipment", "校准检定设备"),
-    MEASURE_ACCOUNT("measureAccount", "measureAccount", "测量工装"),
-    STANDARD_SUPPORT_EQUIPMENT("standardSupportEquipment", "standardSupportEquipment", "标准配套设备"),
-    STANDARD_EQUIPMENT("standardEquipment", "standardEquipment", "标准装置"),
-    FLOW_DEF_EXPORT("flowDefData", "flowDefData", "流程定义"),
-    STAFF_CERTIFICATE("certificate", "certificate", "计量人员证书"),
-    CHECK_INFO("checkInfo", "checkInfo", "设备管理点检测"),
-    EQUIPMENT_APPLY("equipmentApply", "equipmentApply", "设备借用"),
-    STANDARD_EQUIPMENT_REMIND("equipmentApplyRemind", "equipmentApplyRemind", "标准装置到期提醒"),
-    METER_PRICE("meterPrice", "meterPrice", "价格库"),
-    METER_STAFF("meterStaff", "meterStaff", "计量人员"),
-    STANDARD_EQUIPMENT_APPLY("standardEquipmentApply", "standardEquipmentApply", "标准装置申请"),
-    STATE_MANAGE_APPLY("stateManage", "stateManage", "状态管理"),
-    METER_ACCEPTANCE_CHECK("acceptanceCheck", "acceptanceCheck", "设备检修保养验收单"),
-    CUSTOMER_EXPORT("customerData", "customerData", "客户信息"),
-    ORDER_EXPORT("orderData", "orderData", "委托书信息"),
-    SAMPLE_EXPORT("sampleData", "sampleData", "样本信息"),
-    EXCHANGE_DATA("exchangeData", "exchangeData", "设备交接单"),
-    DISPATCH_DATA("dispatchData", "dispatchData", "设备收发"),
-    ENVIRONMENT_DATA("environmentData", "environmentData", "环境记录单"),
-    ORIGIN_DATA("originData", "originData", "原始记录"),
-    CERTIFICATE_REPORT("certificateReport", "certificateReport", "证书报告"),
-    ADVICE_EXPORT("adviceData", "adviceData", "客户反馈"),
-    HANDOUT_EXPORT("handoutData", "handoutData", "任务分发列表"),
-    OUTSOURCER_EXPORT("outsourcerData", "outsourcerData", "分包方"),
-    SITE_EXECUTIVE_EXPORT("siteExecutiveData", "siteExecutiveData", "现场测试、校准或检定"),
-    CERTIFICATE_PRINT_EXPORT("certificatePrintData", "certificatePrintData", "证书打印"),
-    DOWNLOAD_TEMPLATE("downloadTemplate", "downloadTemplate", "页面配置"),
-    OUTSOURCER_CERTIFICATE_EXPORT("outsourceCertificateData", "outsourceCertificateData", "分包证书"),
-    SETTLEMENT_INFO_EXPORT("settlementInfoData", "settlementInfoData", "业务结算"),
-    EQUIPMENT_REMIND("equipmentRemind", "equipmentRemind", "设备到期提醒"),
-    AGREEMENT_INFO_EXPORT("agreementInfoData", "agreementInfoData", "合同"),
-    WORK_STATISTICS_EXPORT("workStatisticsData", "workStatisticsData", "实时工作统计"),
-    DEPT_OUTPUT_EXPORT("deptOutputData", "deptOutputData", "部门产值分析"),
-    WORKLOAD_EXPORT("workloadData", "workloadData", "业务工作量分析"),
-    DEPT_COMPREHENSIVE_EXPORT("deptComprehensiveData", "deptComprehensiveData", "部门综合分析"),
-    ENVIRONMENTAL_RECORD("environmentalRecordData", "environmentalRecordData", "现场环境记录");
+    /**
+     * 计量检定业务
+     */
+    OUTSOURCER_EXPORT("outsourcerData", "分包方名录", "分包方名录"),
+    IDENTIFY_EXPORT("identifyData", "计量标识", "计量标识"),
+    ORDER_EXPORT("orderData", "任务单", "任务单"),
+    DISPATCH_DATA("dispatchData", "设备收发", "设备收发"),
+    HANDOUT_EXPORT("handoutData", "任务分发", "任务分发"),
+    SITE_EXECUTIVE_EXPORT("siteExecutiveData", "现场测试、校准或检定", "现场测试、校准或检定"),
+    CERTIFICATE_REPORT("certificateReport", "证书审批", "证书审批"),
+    CERTIFICATE_CHANGE_APPLY("certificateChangeApply", "证书报告补充或更换申请单", "证书报告补充或更换申请单"),
+    CERTIFICATE_PRINT("certificatePrintData", "证书打印审批", "证书打印审批"),
+    DEPT_EXECUTIVE_TASK("deptExecutiveTaskData", "实验室任务", "实验室任务"),
+    MY_EXECUTIVE_TASK("myExecutiveTaskData", "我的任务", "我的任务"),
+    OUTSOURCE_ASSESS("outsourceAssess", "测试、校准或检定工作分包评审表", "测试、校准或检定工作分包评审表"),
+    OUTSOURCE_PROTOCOL("outsourceProtocol", "测试、校准或检定工作分包协议书", "测试、校准或检定工作分包协议书"),
+
+    /**
+     * 系统管理
+     */
+    SIGN_EXPORT("signData", "签名", "签名"),
+    TEMPLATE_EXPORT("templateData", "文件模板", "文件模板"),
+    FLOW_DEF_EXPORT("flowDefData", "流程定义", "流程定义"),
+    DOWNLOAD_TEMPLATE("downloadTemplate", "流程定义", "页面配置");
 
     ExportEnum(String fileName, String sheetName, String description) {
         this.fileName = fileName;
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateRecordTypeCodeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateRecordTypeCodeEnum.java
index 31d913c..a963522 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateRecordTypeCodeEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateRecordTypeCodeEnum.java
@@ -46,4 +46,14 @@
     String SITE_EXECUTIVE_APPROVAL = "01";
     //《现场测试、校准或检定工作记录表》
     String SITE_EXECUTIVE_LOG = "02";
+
+    //测试、校准或检定工作分包协议书
+    String OUTSOURCE_PROTOCOL = "01";
+    //测试、校准或检定工作分包评审表
+    String OUTSOURCE_ACCESS = "02";
+    //测试、校准或检定工作分包通知书
+    String OUTSOURCE_NOTICE = "03";
+    //测试、校准或检定工作分包方名录
+    String OUTSOURCE_INFO = "04";
+
 }
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
index 24b8635..f78bd53 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
@@ -15,6 +15,10 @@
     String CERTIFICATE_CHANGE_APPLY_BEAN_NAME = "certificateChangeApplyBean";
     //现场测试、校准或检定
     String SITE_EXECUTIVE_BEAN_NAME = "siteExecutiveBean";
+    //测试、校准或检定工作分包评审表
+    String OUTSOURCE_ASSESS_BEAN_NAME = "outsourceAssessBean";
+    //测试、校准或检定工作分包协议书
+    String OUTSOURCE_PROTOCOL_BEAN_NAME = "outsourceProtocolBean";
 
     /*********************************设备与装置************************************/
     //设备台账
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 b21c661..6b86fd1 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
@@ -18,6 +18,8 @@
     OUTSOURCER_APPROVAL(OUTSOURCER_BEAN_NAME, ""),
     CERTIFICATE_CHANGE_APPROVAL(CERTIFICATE_CHANGE_APPLY_BEAN_NAME, ""),
     SITE_EXECUTIVE_APPROVAL(SITE_EXECUTIVE_BEAN_NAME, ""),
+    OUTSOURCE_ASSESS_APPROVAL(OUTSOURCE_ASSESS_BEAN_NAME, ""),
+    OUTSOURCE_PROTOCOL_APPROVAL(OUTSOURCE_PROTOCOL_BEAN_NAME, ""),
 
     ACTION_STATUS_MAP(new HashMap<String, AwareActionStatusEnum>() {
         {
@@ -47,6 +49,10 @@
             put(ApplyFromIdEnum.CERTIFICATE_CHANGE_APPROVAL.getCode(), CERTIFICATE_CHANGE_APPROVAL);
             //现场测试、校准或检定审批
             put(ApplyFromIdEnum.SITE_EXECUTIVE_APPROVAL.getCode(), SITE_EXECUTIVE_APPROVAL);
+            //测试、校准或检定工作分包评审表
+            put(ApplyFromIdEnum.OUTSOURCE_ASSESS_APPROVAL.getCode(), OUTSOURCE_ASSESS_APPROVAL);
+            //测试、校准或检定工作分包协议书
+            put(ApplyFromIdEnum.OUTSOURCE_PROTOCOL_APPROVAL.getCode(), OUTSOURCE_PROTOCOL_APPROVAL);
         }
     });
     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 934405e..c7410bd 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
@@ -9,6 +9,8 @@
     CERTIFICATE_CHANGE_APPROVAL("jljdywzsbchghsqd", MessageSourceModuleEnum.BUSINESS.getCode(), "证书/报告补充或更换申请单"),
     OUTSOURCER_APPROVAL("jljdywcsjzhgfbfml", MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定合格分包方名录"),
     SITE_EXECUTIVE_APPROVAL("jljdywxccsjzsp", MessageSourceModuleEnum.BUSINESS.getCode(), "现场测试、校准或检定审批"),
+    OUTSOURCE_ASSESS_APPROVAL("jljdywcsjzfbpsb", MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包评审表"),
+    OUTSOURCE_PROTOCOL_APPROVAL("jljdywcsjzfbxys", MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包协议书"),
 
 
     /*******************************************设备与装置*********************************************/
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/GeneralApprovalMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/GeneralApprovalMapper.java
index 4fb7344..0c9d6ae 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/GeneralApprovalMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/GeneralApprovalMapper.java
@@ -17,8 +17,4 @@
 
     Page<O> selectBatchForApprovalList(Page<O> page, @Param("request") R request, @Param("businessKeys") List<String> businessKeys);
 
-//    Page<O> selectListPage(Page<O> page, @Param("request") R request);
-
-//    Long selectMaxNo();
-
 }
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceAssessMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceAssessMapper.java
index 7867bb8..ba59009 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceAssessMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceAssessMapper.java
@@ -1,7 +1,12 @@
 package com.casic.missiles.mapper.business;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.business.outsource.OutsourceAssessApprovalListRequest;
+import com.casic.missiles.mapper.GeneralApprovalMapper;
 import com.casic.missiles.model.business.BizBusinessOutsourceAssess;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * <p>
@@ -11,6 +16,10 @@
  * @author wangpeng
  * @since 2023-08-16
  */
-public interface BizBusinessOutsourceAssessMapper extends BaseMapper<BizBusinessOutsourceAssess> {
+public interface BizBusinessOutsourceAssessMapper extends GeneralApprovalMapper<BizBusinessOutsourceAssess, BizBusinessOutsourceAssess, OutsourceAssessApprovalListRequest> {
+
+    Page<BizBusinessOutsourceAssess> selectBatchForApprovalList(Page<BizBusinessOutsourceAssess> page, @Param("request") OutsourceAssessApprovalListRequest request, @Param("businessKeys") List<String> businessKeys);
+
+    Long selectMaxProjectNo();
 
 }
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceProtocolMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceProtocolMapper.java
new file mode 100644
index 0000000..e6aba35
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceProtocolMapper.java
@@ -0,0 +1,24 @@
+package com.casic.missiles.mapper.business;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.business.outsource.OutsourceProtocolApprovalListRequest;
+import com.casic.missiles.mapper.GeneralApprovalMapper;
+import com.casic.missiles.model.business.BizBusinessOutsourceProtocol;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 计量检定业务-分包管理-测试、校准或检定工作分包协议书 Mapper 接口
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-08-24
+ */
+public interface BizBusinessOutsourceProtocolMapper extends GeneralApprovalMapper<BizBusinessOutsourceProtocol, BizBusinessOutsourceProtocol, OutsourceProtocolApprovalListRequest> {
+
+    Page<BizBusinessOutsourceProtocol> selectBatchForApprovalList(Page<BizBusinessOutsourceProtocol> page, @Param("request") OutsourceProtocolApprovalListRequest request, @Param("businessKeys") List<String> businessKeys);
+
+    Long selectMaxProtocolNo();
+}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/EnvLocationInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/EnvLocationInfoMapper.java
new file mode 100644
index 0000000..49eff87
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/EnvLocationInfoMapper.java
@@ -0,0 +1,21 @@
+package com.casic.missiles.mapper.resource;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.resource.environment.LocationListRequest;
+import com.casic.missiles.dto.resource.environment.LocationListResponse;
+import com.casic.missiles.model.resource.EnvLocationInfo;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * <p>
+ * 实验室环境监控系统-设备表 Mapper 接口
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-06-07
+ */
+public interface EnvLocationInfoMapper extends BaseMapper<EnvLocationInfo> {
+
+    Page<LocationListResponse> selectLocationListPage(Page<LocationListResponse> page, @Param("request") LocationListRequest request);
+}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java
index de124db..85ed0f7 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java
@@ -1,7 +1,9 @@
 package com.casic.missiles.mapper.system;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.dto.system.SignDetailResponse;
+import com.casic.missiles.dto.system.SignListRequest;
 import com.casic.missiles.model.system.SystemSign;
 import org.apache.ibatis.annotations.Param;
 
@@ -22,4 +24,8 @@
     SignDetailResponse selectSignDetailById(Long id);
 
     List<SystemSign> selectUsableSignList(@Param("userId") Long userId);
+
+    Page<SystemSign> selectSignListPage(Page<SystemSign> page, @Param("request") SignListRequest request);
+
+    List<SystemSign> selectSignList(@Param("request") SignListRequest request);
 }
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateChangeApplyMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateChangeApplyMapper.xml
index d798447..c496092 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateChangeApplyMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateChangeApplyMapper.xml
@@ -30,31 +30,31 @@
         SELECT *
         FROM biz_business_certificate_change_apply
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.changeApplyNo != null and request.changeApplyNo !=''">
+        <if test="request != null and request.changeApplyNo != null and request.changeApplyNo !=''">
             and change_apply_no like concat('%',#{request.changeApplyNo},'%')
         </if>
-        <if test="request.changeReportNo != null and request.changeReportNo !=''">
+        <if test="request != null and request.changeReportNo != null and request.changeReportNo !=''">
             and change_report_no like concat('%',#{request.changeReportNo},'%')
         </if>
-        <if test="request.changeReportName != null and request.changeReportName !=''">
+        <if test="request != null and request.changeReportName != null and request.changeReportName !=''">
             and change_report_name like concat('%',#{request.changeReportName},'%')
         </if>
-        <if test="request.changeType != null and request.changeType !=''">
+        <if test="request != null and request.changeType != null and request.changeType !=''">
             and change_type = #{request.changeType}
         </if>
-        <if test="request.createUserName != null and request.createUserName !=''">
+        <if test="request != null and request.createUserName != null and request.createUserName !=''">
             and create_user_name like concat('%',#{request.createUserName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificatePrintMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificatePrintMapper.xml
index b66cd99..49c0ac8 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificatePrintMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificatePrintMapper.xml
@@ -31,34 +31,34 @@
         LEFT JOIN biz_business_order_sample_relation bosr ON (bosr.order_id = bcr.order_id AND bosr.sample_id = bcr.sample_id)
         LEFT JOIN biz_business_order_info boi ON boi.id = bosr.order_id
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and bcp.approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.printStatus != null and request.printStatus !=''">
+        <if test="request != null and request.printStatus != null and request.printStatus !=''">
             and print_status = #{request.printStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and bcp.create_user_id = #{request.createUserId}
         </if>
-        <if test="request.certificateReportNo != null and request.certificateReportNo !=''">
+        <if test="request != null and request.certificateReportNo != null and request.certificateReportNo !=''">
             and bcr.certificate_report_no like concat('%',#{request.certificateReportNo},'%')
         </if>
-        <if test="request.certificateReportName != null and request.certificateReportName !=''">
+        <if test="request != null and request.certificateReportName != null and request.certificateReportName !=''">
             and bcr.certificate_report_name like concat('%',#{request.certificateReportName},'%')
         </if>
-        <if test="request.customerName != null and request.customerName !=''">
+        <if test="request != null and request.customerName != null and request.customerName !=''">
             and boi.customer_name like concat('%',#{request.customerName},'%')
         </if>
-        <if test="request.sampleNo != null and request.sampleNo !=''">
+        <if test="request != null and request.sampleNo != null and request.sampleNo !=''">
             and bosr.sample_no like concat('%',#{request.sampleNo},'%')
         </if>
-        <if test="request.sampleName != null and request.sampleName !=''">
+        <if test="request != null and request.sampleName != null and request.sampleName !=''">
             and bosr.sample_name like concat('%',#{request.sampleName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and bcp.create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and bcp.create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml
index b366034..767695d 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml
@@ -46,33 +46,37 @@
         SELECT bcr.*, bosr.sample_no, bosr.sample_name, bosr.sample_model, rsi.staff_name
         FROM biz_business_certificate_report bcr
         LEFT JOIN biz_business_order_sample_relation bosr ON (bosr.order_id = bcr.order_id AND bosr.sample_id = bcr.sample_id)
+        LEFT JOIN biz_business_order_info boi ON boi.id = bcr.order_id
         LEFT JOIN biz_resource_staff_info rsi ON rsi.id = bcr.measure_person_id
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and bcr.approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and bcr.create_user_id = #{request.createUserId}
         </if>
-        <if test="request.certificateReportNo != null and request.certificateReportNo !=''">
+        <if test="request != null and request.customerId != null and request.customerId !=''">
+            and boi.customer_id = #{request.customerId}
+        </if>
+        <if test="request != null and request.certificateReportNo != null and request.certificateReportNo !=''">
             and bcr.certificate_report_no like concat('%',#{request.certificateReportNo},'%')
         </if>
-        <if test="request.certificateReportName != null and request.certificateReportName !=''">
+        <if test="request != null and request.certificateReportName != null and request.certificateReportName !=''">
             and bcr.certificate_report_name like concat('%',#{request.certificateReportName},'%')
         </if>
-        <if test="request.sampleNo != null and request.sampleNo !=''">
+        <if test="request != null and request.sampleNo != null and request.sampleNo !=''">
             and bosr.sample_no like concat('%',#{request.sampleNo},'%')
         </if>
-        <if test="request.measureCategory != null and request.measureCategory !=''">
+        <if test="request != null and request.measureCategory != null and request.measureCategory !=''">
             and bcr.measure_category = #{request.measureCategory}
         </if>
-        <if test="request.measurePerson != null and request.measurePerson !=''">
+        <if test="request != null and request.measurePerson != null and request.measurePerson !=''">
             and rsi.staff_name like concat('%',#{request.measurePerson},'%')
         </if>
-        <if test="request.calibrationTimeStart != null and request.calibrationTimeStart !=''">
+        <if test="request != null and request.calibrationTimeStart != null and request.calibrationTimeStart !=''">
             and bcr.calibration_time &gt;= #{request.calibrationTimeStart}
         </if>
-        <if test="request.calibrationTimeEnd != null and request.calibrationTimeEnd !=''">
+        <if test="request != null and request.calibrationTimeEnd != null and request.calibrationTimeEnd !=''">
             and bcr.calibration_time &lt;= #{request.calibrationTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceAssessMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceAssessMapper.xml
index d0fcf8b..c22c101 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceAssessMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceAssessMapper.xml
@@ -7,6 +7,8 @@
         <id column="id" property="id" />
         <result column="project_no" property="projectNo" />
         <result column="project_name" property="projectName" />
+        <result column="lab_code" property="labCode" />
+        <result column="group_code" property="groupCode" />
         <result column="applicant_id" property="applicantId" />
         <result column="applicant_name" property="applicantName" />
         <result column="applicant_time" property="applicantTime" />
@@ -31,7 +33,45 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, project_no, project_name, applicant_id, applicant_name, applicant_time, minio_file_name, remark, create_user_id, create_user_name, outsourcer_id, pre_start_time, pre_end_time, outsource_reason, pre_cost, approval_status, process_id, approve_situation, traceability, test_method, technique_ability, create_time, update_time
+        id, project_no, project_name, lab_code, group_code, applicant_id, applicant_name, applicant_time, minio_file_name, remark, create_user_id, create_user_name, outsourcer_id, pre_start_time, pre_end_time, outsource_reason, pre_cost, approval_status, process_id, approve_situation, traceability, test_method, technique_ability, create_time, update_time
     </sql>
 
+    <select id="selectMaxProjectNo" resultType="java.lang.Long">
+        SELECT IFNULL(max(RIGHT(project_no, 3)), 0) from biz_business_outsource_assess
+    </select>
+
+    <select id="selectBatchForApprovalList" resultMap="BaseResultMap">
+        SELECT bboa.*, bboi.outsourcer_name, bboi.director
+        FROM biz_business_outsource_assess bboa
+        LEFT JOIN biz_business_outsourcer_info bboi ON bboa.outsourcer_id = bboi.id
+        WHERE 1=1
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
+            and bboa.approval_status = #{request.approvalStatus}
+        </if>
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
+            and bboa.create_user_id = #{request.createUserId}
+        </if>
+        <if test="request != null and request.projectNo != null and request.projectNo !=''">
+            and bboa.project_no like concat('%',#{request.projectNo},'%')
+        </if>
+        <if test="request != null and request.outsourcerName != null and request.outsourcerName !=''">
+            and bboi.outsourcer_name like concat('%',#{request.outsourcerName},'%')
+        </if>
+        <if test="request != null and request.applicantName != null and request.applicantName !=''">
+            and bboa.applicant_name like concat('%',#{request.applicantName},'%')
+        </if>
+        <if test="request != null and request.applicantTimeStart != null and request.applicantTimeStart !=''">
+            and bboa.applicant_time &gt;= #{request.applicantTimeStart}
+        </if>
+        <if test="request != null and request.applicantTimeEnd != null and request.applicantTimeEnd !=''">
+            and bboa.applicant_time &lt;= #{request.applicantTimeEnd}
+        </if>
+        <if test="businessKeys != null">
+            and bboa.id in
+            <foreach collection="businessKeys" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
+        ORDER BY bboa.create_time DESC
+    </select>
 </mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceProtocolMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceProtocolMapper.xml
new file mode 100644
index 0000000..b7b2149
--- /dev/null
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceProtocolMapper.xml
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.mapper.business.BizBusinessOutsourceProtocolMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.business.BizBusinessOutsourceProtocol">
+        <id column="id" property="id" />
+        <result column="protocol_no" property="protocolNo" />
+        <result column="project_name" property="projectName" />
+        <result column="lab_code" property="labCode" />
+        <result column="group_code" property="groupCode" />
+        <result column="outsourcer_id" property="outsourcerId" />
+        <result column="remark" property="remark" />
+        <result column="outsource_no" property="outsourceNo" />
+        <result column="outsource_name" property="outsourceName" />
+        <result column="contacts" property="contacts" />
+        <result column="mobile" property="mobile" />
+        <result column="address" property="address" />
+        <result column="require_date" property="requireDate" />
+        <result column="outsource_cost" property="outsourceCost" />
+        <result column="director" property="director" />
+        <result column="item" property="item" />
+        <result column="requires" property="requires" />
+        <result column="create_user_id" property="createUserId" />
+        <result column="create_user_name" property="createUserName" />
+        <result column="approval_status" property="approvalStatus" />
+        <result column="process_id" property="processId" />
+        <result column="create_time" property="createTime" />
+        <result column="update_time" property="updateTime" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, protocol_no, project_name, lab_code, group_code, outsourcer_id, remark, outsource_no, outsource_name, contacts, mobile, address, require_date, outsource_cost, director, item, requires, create_user_id, create_user_name, approval_status, process_id, create_time, update_time
+    </sql>
+
+    <select id="selectMaxProtocolNo" resultType="java.lang.Long">
+        SELECT IFNULL(max(RIGHT(protocol_no, 3)), 0) from biz_business_outsource_protocol
+    </select>
+
+    <select id="selectBatchForApprovalList" resultMap="BaseResultMap">
+        SELECT *
+        FROM biz_business_outsource_protocol
+        WHERE 1=1
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
+            and approval_status = #{request.approvalStatus}
+        </if>
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
+            and create_user_id = #{request.createUserId}
+        </if>
+        <if test="request != null and request.protocolNo != null and request.protocolNo !=''">
+            and protocol_no like concat('%',#{request.protocolNo},'%')
+        </if>
+        <if test="request != null and request.outsourcerName != null and request.outsourcerName !=''">
+            and outsourcer_name like concat('%',#{request.outsourcerName},'%')
+        </if>
+        <if test="request != null and request.applicantName != null and request.applicantName !=''">
+            and create_user_name like concat('%',#{request.applicantName},'%')
+        </if>
+        <if test="request != null and request.applicantTimeStart != null and request.applicantTimeStart !=''">
+            and create_time &gt;= #{request.applicantTimeStart}
+        </if>
+        <if test="request != null and request.applicantTimeEnd != null and request.applicantTimeEnd !=''">
+            and create_time &lt;= #{request.applicantTimeEnd}
+        </if>
+        <if test="businessKeys != null">
+            and id in
+            <foreach collection="businessKeys" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
+        ORDER BY create_time DESC
+    </select>
+</mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourcerInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourcerInfoMapper.xml
index 510a80b..3049b54 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourcerInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourcerInfoMapper.xml
@@ -7,6 +7,8 @@
         <id column="id" property="id" />
         <result column="outsourcer_no" property="outsourcerNo" />
         <result column="outsourcer_name" property="outsourcerName" />
+        <result column="lab_code" property="labCode" />
+        <result column="group_code" property="groupCode" />
         <result column="outsourcer_brief_name" property="outsourcerBriefName" />
         <result column="outsourcer_size" property="outsourcerSize" />
         <result column="business_size" property="businessSize" />
@@ -55,32 +57,32 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, outsourcer_no, outsourcer_name, outsourcer_brief_name, outsourcer_size, business_size, grade, evaluation, tax_number, bank_account, bank_name, bank_account_number, postal_code, director, phone, fax, mobile, email, website, address_country, address_province, address_city, address_area, full_address, address_country_name, address_province_name, address_city_name, address_area_name, invoice_country, invoice_province, invoice_city, invoice_area, invoice_full_address, invoice_country_name, invoice_province_name, invoice_city_name, invoice_area_name, business_scope, business_content, minio_file_name, approval_status, process_id, remark, create_user_id, create_user_name, create_time, update_time
+        id, outsourcer_no, outsourcer_name, lab_code, group_code, outsourcer_brief_name, outsourcer_size, business_size, grade, evaluation, tax_number, bank_account, bank_name, bank_account_number, postal_code, director, phone, fax, mobile, email, website, address_country, address_province, address_city, address_area, full_address, address_country_name, address_province_name, address_city_name, address_area_name, invoice_country, invoice_province, invoice_city, invoice_area, invoice_full_address, invoice_country_name, invoice_province_name, invoice_city_name, invoice_area_name, business_scope, business_content, minio_file_name, approval_status, process_id, remark, create_user_id, create_user_name, create_time, update_time
     </sql>
 
     <select id="selectBatchForApprovalList" resultMap="BaseResultMap">
         SELECT *
         FROM biz_business_outsourcer_info
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.outsourcerNo != null and request.outsourcerNo !=''">
+        <if test="request != null and request.outsourcerNo != null and request.outsourcerNo !=''">
             and outsourcer_no like concat('%',#{request.outsourcerNo},'%')
         </if>
-        <if test="request.outsourcerName != null and request.outsourcerName !=''">
+        <if test="request != null and request.outsourcerName != null and request.outsourcerName !=''">
             and outsourcer_name like concat('%',#{request.outsourcerName},'%')
         </if>
-        <if test="request.director != null and request.director !=''">
+        <if test="request != null and request.director != null and request.director !=''">
             and director like concat('%',#{request.director},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
@@ -93,6 +95,6 @@
     </select>
 
     <select id="selectMaxNo" resultType="java.lang.Long">
-        SELECT IFNULL(max(RIGHT(outsourcer_no, 12)), 0) from biz_business_outsourcer_info
+        SELECT IFNULL(max(RIGHT(outsourcer_no, 3)), 0) from biz_business_outsourcer_info
     </select>
 </mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessSiteExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessSiteExecutiveInfoMapper.xml
index 135c5d0..3c5ae79 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessSiteExecutiveInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessSiteExecutiveInfoMapper.xml
@@ -38,25 +38,25 @@
         FROM biz_business_site_executive_info bsei
         LEFT JOIN biz_resource_customer_info rci ON bsei.customer_id = rci.id
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and bsei.approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and bsei.create_user_id = #{request.createUserId}
         </if>
-        <if test="request.siteExecutiveNo != null and request.siteExecutiveNo !=''">
+        <if test="request != null and request.siteExecutiveNo != null and request.siteExecutiveNo !=''">
             and bsei.site_executive_no like concat('%',#{request.siteExecutiveNo},'%')
         </if>
-        <if test="request.customerName != null and request.customerName !=''">
+        <if test="request != null and request.customerName != null and request.customerName !=''">
             and rci.outsourcer_name like concat('%',#{request.customerName},'%')
         </if>
-        <if test="request.applyName != null and request.applyName !=''">
+        <if test="request != null and request.applyName != null and request.applyName !=''">
             and bsei.apply_name like concat('%',#{request.applyName},'%')
         </if>
-        <if test="request.applyTimeStart != null and request.applyTimeStart !=''">
+        <if test="request != null and request.applyTimeStart != null and request.applyTimeStart !=''">
             and bsei.apply_time &gt;= #{request.applyTimeStart}
         </if>
-        <if test="request.applyTimeEnd != null and request.applyTimeEnd !=''">
+        <if test="request != null and request.applyTimeEnd != null and request.applyTimeEnd !=''">
             and bsei.apply_time &lt;= #{request.applyTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml
index 84d9e2a..6bd38a9 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml
@@ -105,6 +105,12 @@
         <if test="request.isUrgent != null and request.isUrgent !=''">
             AND bo.is_urgent = #{request.isUrgent}
         </if>
+        <if test="request.ids != null">
+            and blei.id in
+            <foreach collection="request.ids" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
         ORDER BY blei.update_time DESC
     </select>
 
@@ -137,6 +143,12 @@
         <if test="request.isUrgent != null and request.isUrgent !=''">
             AND bo.is_urgent = #{request.isUrgent}
         </if>
+        <if test="request.ids != null">
+            and blei.id in
+            <foreach collection="request.ids" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
         ORDER BY blei.update_time DESC
     </select>
 
diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardInfoMapper.xml
index 1a5551b..2ed8d17 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardInfoMapper.xml
@@ -45,12 +45,6 @@
         FROM biz_equipment_standard_info besi
         LEFT JOIN biz_equipment_standard_technology_relation bestr ON besi.standard_no = bestr.standard_no
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
-            and besi.approval_status = #{request.approvalStatus}
-        </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
-            and besi.create_user_id = #{request.createUserId}
-        </if>
         <if test="request.standardName != null and request.standardName !=''">
             and besi.standard_name like concat('%',#{request.standardName},'%')
         </if>
diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardTechnologyRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardTechnologyRelationMapper.xml
index fc7e16c..cd03c8c 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardTechnologyRelationMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardTechnologyRelationMapper.xml
@@ -6,6 +6,7 @@
     <resultMap id="BaseResultMap" type="com.casic.missiles.model.equipment.BizEquipmentStandardTechnologyRelation">
         <id column="id" property="id" />
         <result column="technology_file_id" property="technologyFileId" />
+        <result column="technology_file_no" property="technologyFileNo" />
         <result column="technology_file_name" property="technologyFileName" />
         <result column="standard_id" property="standardId" />
         <result column="standard_no" property="standardNo" />
@@ -14,7 +15,7 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, technology_file_id, technology_file_name, standard_id, remark
+        id, technology_file_id, technology_file_no, technology_file_name, standard_id, remark
     </sql>
 
 </mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceAuthorizeOrderMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceAuthorizeOrderMapper.xml
index ac5176c..554fe65 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceAuthorizeOrderMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceAuthorizeOrderMapper.xml
@@ -32,22 +32,22 @@
         SELECT *
         FROM biz_resource_authorize_order
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.orderNo != null and request.orderNo !=''">
+        <if test="request != null and request.orderNo != null and request.orderNo !=''">
             and order_no like concat('%',#{request.orderNo},'%')
         </if>
-        <if test="request.createUserName != null and request.createUserName !=''">
+        <if test="request != null and request.createUserName != null and request.createUserName !=''">
             and create_user_name like concat('%',#{request.createUserName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerExamineFormMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerExamineFormMapper.xml
index ab242f6..af7f98f 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerExamineFormMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerExamineFormMapper.xml
@@ -41,28 +41,28 @@
         SELECT *
         FROM biz_resource_customer_examine_form
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.formNo != null and request.formNo !=''">
+        <if test="request != null and request.formNo != null and request.formNo !=''">
             and form_no like concat('%',#{request.formNo},'%')
         </if>
-        <if test="request.labCode != null and request.labCode !=''">
+        <if test="request != null and request.labCode != null and request.labCode !=''">
             and lab_code like concat('%',#{request.labCode},'%')
         </if>
-        <if test="request.groupCode != null and request.groupCode !=''">
+        <if test="request != null and request.groupCode != null and request.groupCode !=''">
             and group_code like concat('%',#{request.groupCode},'%')
         </if>
-        <if test="request.createUserName != null and request.createUserName !=''">
+        <if test="request != null and request.createUserName != null and request.createUserName !=''">
             and create_user_name like concat('%',#{request.createUserName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerInfoMapper.xml
index fa8ffbc..06a2798 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerInfoMapper.xml
@@ -33,25 +33,25 @@
         SELECT *
         FROM biz_resource_customer_info
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.customerNo != null and request.customerNo !=''">
+        <if test="request != null and request.customerNo != null and request.customerNo !=''">
             and customer_no like concat('%',#{request.customerNo},'%')
         </if>
-        <if test="request.customerName != null and request.customerName !=''">
+        <if test="request != null and request.customerName != null and request.customerName !=''">
             and customer_name like concat('%',#{request.customerName},'%')
         </if>
-        <if test="request.contacts != null and request.contacts !=''">
+        <if test="request != null and request.contacts != null and request.contacts !=''">
             and contacts like concat('%',#{request.contacts},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerSuggestFormMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerSuggestFormMapper.xml
index 28f5bb2..1806662 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerSuggestFormMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerSuggestFormMapper.xml
@@ -33,28 +33,28 @@
         SELECT *
         FROM biz_resource_customer_suggest_form
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.formNo != null and request.formNo !=''">
+        <if test="request != null and request.formNo != null and request.formNo !=''">
             and form_no like concat('%',#{request.formNo},'%')
         </if>
-        <if test="request.customerName != null and request.customerName !=''">
+        <if test="request != null and request.customerName != null and request.customerName !=''">
             and customer_name like concat('%',#{request.customerName},'%')
         </if>
-        <if test="request.customerDeptName != null and request.customerDeptName !=''">
+        <if test="request != null and request.customerDeptName != null and request.customerDeptName !=''">
             and customer_dept_name like concat('%',#{request.customerDeptName},'%')
         </if>
-        <if test="request.createUserName != null and request.createUserName !=''">
+        <if test="request != null and request.createUserName != null and request.createUserName !=''">
             and create_user_name like concat('%',#{request.createUserName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSealUseNoteMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSealUseNoteMapper.xml
index ab37bc1..b02bb33 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSealUseNoteMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSealUseNoteMapper.xml
@@ -29,32 +29,32 @@
     </sql>
 
     <select id="selectBatchForApprovalList" resultMap="BaseResultMap">
-        SELECT *
+        SELECT brsun.*, brsi.seal_name, brsi.seal_type, brsi.approver_name
         FROM biz_resource_seal_use_note brsun
         JOIN biz_resource_seal_info brsi ON brsun.seal_id = brsi.id
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and brsun.approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and brsun.create_user_id = #{request.createUserId}
         </if>
-        <if test="request.sealName != null and request.sealName !=''">
+        <if test="request != null and request.sealName != null and request.sealName !=''">
             and brsi.seal_name like concat('%',#{request.sealName},'%')
         </if>
-        <if test="request.sealType != null and request.sealType !=''">
+        <if test="request != null and request.sealType != null and request.sealType !=''">
             and brsi.seal_type = #{request.sealType}
         </if>
-        <if test="request.applyDeptName != null and request.applyDeptName !=''">
+        <if test="request != null and request.applyDeptName != null and request.applyDeptName !=''">
             and brsun.apply_dept_name like concat('%',#{request.applyDeptName},'%')
         </if>
-        <if test="request.applyUserName != null and request.applyUserName !=''">
+        <if test="request != null and request.applyUserName != null and request.applyUserName !=''">
             and brsun.apply_user_name like concat('%',#{request.applyUserName},'%')
         </if>
-        <if test="request.applyTimeStart != null and request.applyTimeStart !=''">
+        <if test="request != null and request.applyTimeStart != null and request.applyTimeStart !=''">
             and brsun.apply_time &gt;= #{request.applyTimeStart}
         </if>
-        <if test="request.applyTimeEnd != null and request.applyTimeEnd !=''">
+        <if test="request != null and request.applyTimeEnd != null and request.applyTimeEnd !=''">
             and brsun.apply_time &lt;= #{request.applyTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml
index 119bf7d..4f8392a 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml
@@ -31,6 +31,12 @@
         <if test="request.deptName != null and request.deptName !=''">
             and brsi.dept_name like concat('%',#{request.deptName},'%')
         </if>
+        <if test="request.ids != null">
+            and brsv.id in
+            <foreach collection="request.ids" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
         ORDER BY brsv.grant_date DESC
     </select>
 
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSupplierInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSupplierInfoMapper.xml
index fe8d399..e8ce7ef 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSupplierInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSupplierInfoMapper.xml
@@ -48,28 +48,28 @@
         SELECT *
         FROM biz_resource_supplier_info
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.supplierNo != null and request.supplierNo !=''">
+        <if test="request != null and request.supplierNo != null and request.supplierNo !=''">
             and supplier_no like concat('%',#{request.supplierNo},'%')
         </if>
-        <if test="request.supplierName != null and request.supplierName !=''">
+        <if test="request != null and request.supplierName != null and request.supplierName !=''">
             and supplier_name like concat('%',#{request.supplierName},'%')
         </if>
-        <if test="request.director != null and request.director !=''">
+        <if test="request != null and request.director != null and request.director !=''">
             and director like concat('%',#{request.director},'%')
         </if>
-        <if test="request.supplierType != null and request.supplierType !=''">
+        <if test="request != null and request.supplierType != null and request.supplierType !=''">
             and supplier_type = #{request.supplierType}
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/EnvLocationInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/EnvLocationInfoMapper.xml
new file mode 100644
index 0000000..68bcf10
--- /dev/null
+++ b/casic-metering-dao/src/main/resources/mapper/resource/EnvLocationInfoMapper.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.mapper.resource.EnvLocationInfoMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.resource.EnvLocationInfo">
+        <id column="id" property="id" />
+        <result column="location_no" property="locationNo" />
+        <result column="location_name" property="locationName" />
+        <result column="location_position" property="locationPosition" />
+        <result column="create_user_id" property="createUserId" />
+        <result column="create_user" property="createUser" />
+        <result column="create_time" property="createTime" />
+        <result column="update_time" property="updateTime" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, location_no, location_name, location_position, create_user_id, create_user, create_time, update_time
+    </sql>
+
+    <select id="selectLocationListPage" resultType="com.casic.missiles.dto.resource.environment.LocationListResponse">
+        SELECT *
+        FROM env_location_info
+        WHERE 1=1
+        <if test="request.locationNo != null and request.locationNo !=''">
+            AND location_no LIKE concat('%',#{request.locationNo},'%')
+        </if>
+        <if test="request.locationName != null and request.locationName !=''">
+            AND location_name LIKE concat('%',#{request.locationName},'%')
+        </if>
+        ORDER BY create_time DESC
+    </select>
+
+</mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml
index b28c18f..8854047 100644
--- a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml
@@ -11,7 +11,6 @@
         <result column="sign_desc" property="signDesc" />
         <result column="sign_director" property="signDirector" />
         <result column="sign_user_id" property="signUserId" />
-        <result column="sign_type" property="signType" />
         <result column="minio_file_name" property="minioFileName" />
         <result column="create_time" property="createTime" />
         <result column="update_time" property="updateTime" />
@@ -28,7 +27,6 @@
         <result column="sign_name" property="signName" />
         <result column="sign_desc" property="signDesc" />
         <result column="sign_director" property="signDirector" />
-        <result column="sign_type" property="signType" />
         <result column="sign_user_id" property="signUserId" />
         <result column="minio_file_name" property="minioFileName" />
         <result column="create_time" property="createTime" />
@@ -62,4 +60,58 @@
         JOIN system_sign_user_relation ssur ON ss.id = ssur.sign_id
         WHERE ssur.user_id = #{userId}
     </select>
+
+    <select id="selectSignListPage" resultMap="BaseResultMap">
+        SELECT ss.*, sd.SIMPLE_NAME AS deptName
+        FROM system_sign ss
+        LEFT JOIN sys_user su ON su.id = ss.sign_user_id
+        LEFT JOIN sys_dept sd ON sd.id = su.dept_id
+        WHERE 1=1
+        <if test="request.signNo != null and request.signNo !=''">
+            AND ss.sign_no LIKE concat('%',#{request.signNo},'%')
+        </if>
+        <if test="request.signName != null and request.signName !=''">
+            AND ss.sign_name LIKE concat('%',#{request.signName},'%')
+        </if>
+        <if test="request.signDirector != null and request.signDirector !=''">
+            AND ss.sign_director LIKE concat('%',#{request.signDirector},'%')
+        </if>
+        <if test="request.signUserId != null and request.signUserId !=''">
+            AND ss.sign_user_id = #{request.signUserId}
+        </if>
+        <if test="request.createStartTime != null and request.createStartTime !=''">
+            AND DATE_FORMAT(ss.create_time,'%Y-%m-%d') &gt;= DATE_FORMAT(#{request.createStartTime},'%Y-%m-%d')
+        </if>
+        <if test="request.createEndTime != null and request.createEndTime !=''">
+            AND DATE_FORMAT(ss.create_time,'%Y-%m-%d')  &lt;= DATE_FORMAT(#{request.createEndTime},'%Y-%m-%d')
+        </if>
+        ORDER BY ss.create_time DESC
+    </select>
+
+    <select id="selectSignList" resultMap="BaseResultMap">
+        SELECT ss.*, sd.SIMPLE_NAME AS deptName
+        FROM system_sign ss
+        LEFT JOIN sys_user su ON su.id = ss.sign_user_id
+        LEFT JOIN sys_dept sd ON sd.id = su.dept_id
+        WHERE 1=1
+        <if test="request.signNo != null and request.signNo !=''">
+            AND ss.sign_no LIKE concat('%',#{request.signNo},'%')
+        </if>
+        <if test="request.signName != null and request.signName !=''">
+            AND ss.sign_name LIKE concat('%',#{request.signName},'%')
+        </if>
+        <if test="request.signDirector != null and request.signDirector !=''">
+            AND ss.sign_director LIKE concat('%',#{request.signDirector},'%')
+        </if>
+        <if test="request.signUserId != null and request.signUserId !=''">
+            AND ss.sign_user_id = #{request.signUserId}
+        </if>
+        <if test="request.createStartTime != null and request.createStartTime !=''">
+            AND DATE_FORMAT(ss.create_time,'%Y-%m-%d') &gt;= DATE_FORMAT(#{request.createStartTime},'%Y-%m-%d')
+        </if>
+        <if test="request.createEndTime != null and request.createEndTime !=''">
+            AND DATE_FORMAT(ss.create_time,'%Y-%m-%d')  &lt;= DATE_FORMAT(#{request.createEndTime},'%Y-%m-%d')
+        </if>
+        ORDER BY ss.create_time DESC
+    </select>
 </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 515050a..60f530b 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
@@ -47,8 +47,8 @@
     String STORAGE_LOCATION = "bizStorageLocation";
     //计量专业
     String MEASURE_MAJOR = "bizMeasureMajor";
-    //管理状态
-    String MANAGER_STATE = "bizManagerState";
+    //标准装置管理状态
+    String STANDARD_MANAGER_STATE = "bizStandardManagerState";
 
     /**
      * 资源管理 字典code
@@ -95,8 +95,6 @@
     String MEASURE_STATUS = "measureStatus";
     //检定方式
     String MEASURE_TYPE = "measureType";
-    //标识打印标志类型
-    String IDENTIFY_PRINT_TYPE = "bizBusinessIdentify";
     //变更类型
     String REPORT_CHANGE_TYPE = "bizCertChangeType";
     //规模类型
@@ -111,19 +109,24 @@
     String MEASURE_CATEGORY = "measureCategory";
     //检定结果
     String MEASURE_RESULT = "measureResult";
+    //分包原因
+    String OUTSOURCE_REASON = "outsourceReason";
+
+    /**
+     * 系统管理
+     */
+    String TEMPLATE_TYPE = "templateType";
+
 
     /**
      * 标准装置 字典code
      */
     //类别
     String STANDARD_CATEGORY = "standardCategory";
-    //管理状态
-    String STANDARD_MANAGER_STATE = "standardManagerState";
     //标准等级
     String STANDARD_LEVEL = "standardLevel";
     //传递范围
     String STANDARD_TRANSMIT_RANGE = "transmitRange";
-
     //资本来源
     String CAPITAL_SOURCE = "capitalSource";
     //标准装置-申请类型
@@ -148,8 +151,6 @@
     String CERTIFICATE_CLASS = "certificationClass";
     //证书管理-检校专业
     String CALIBRATION_MAJOR = "calibrationMajor";
-    //分包原因
-    String OUTSOURCE_REASON = "outsourceReason";
 
     /**
      * 工作台
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/BaseApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/BaseApprovalListRequest.java
index 73c12c1..80d7424 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/BaseApprovalListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/BaseApprovalListRequest.java
@@ -6,6 +6,7 @@
 
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotEmpty;
+import java.util.List;
 
 /**
  * @Description:
@@ -19,14 +20,14 @@
      * 表单id
      */
     @NotBlank(message = "表单id不能为空")
-    @ApiModelProperty(value = "表单id（流程定义对应的表单id，等价于业务id）", dataType = "String")
+    @ApiModelProperty(value = "表单id（流程定义对应的表单id，等价于业务id），导出接口不用传", dataType = "String")
     private String formId;
 
     /**
      * 审批状态类型，对应ApprovalStatusEnum
      */
     @NotEmpty(message = "审批状态类型不能为空")
-    @ApiModelProperty(value = "审批状态类型code", dataType = "String")
+    @ApiModelProperty(value = "审批状态类型code，导出接口不用传", dataType = "String")
     private String approvalStatus;
 
     @ApiModelProperty(hidden = true)
@@ -34,4 +35,7 @@
 
     @ApiModelProperty(hidden = true)
     private Long createUserId;
+
+    @ApiModelProperty(value = "导出ids", dataType = "List")
+    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificatePrintApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificatePrintApprovalListRequest.java
index b93d1c9..3cc2f4e 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificatePrintApprovalListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificatePrintApprovalListRequest.java
@@ -5,8 +5,6 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import java.util.List;
-
 /**
  * @Description:
  * @Author: wangpeng
@@ -38,7 +36,4 @@
 
     @ApiModelProperty(value = "创建结束时间", dataType = "String")
     private String createTimeEnd;
-
-    @ApiModelProperty(value = "导出ids", dataType = "List")
-    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportApprovalListRequest.java
index 4f7a038..c115847 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportApprovalListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportApprovalListRequest.java
@@ -5,8 +5,6 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import java.util.List;
-
 /**
  * @Description:
  * @Author: wangpeng
@@ -15,6 +13,8 @@
 @ApiModel
 @Data
 public class CertificateReportApprovalListRequest extends BaseApprovalListRequest {
+    @ApiModelProperty(value = "委托方id", dataType = "String")
+    private Long customerId;
 
     @ApiModelProperty(value = "证书报告编号", dataType = "String")
     private String certificateReportNo;
@@ -37,6 +37,4 @@
     @ApiModelProperty(value = "检校结束时间", dataType = "String")
     private String calibrationTimeEnd;
 
-    @ApiModelProperty(value = "导出ids", dataType = "List")
-    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/identify/IdentifyListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/identify/IdentifyListRequest.java
index 1b87ae6..f019203 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/identify/IdentifyListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/identify/IdentifyListRequest.java
@@ -4,6 +4,8 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * @Description:
  * @Author: wangpeng
@@ -26,4 +28,7 @@
 
     @ApiModelProperty(value = "打印结束时间", dataType = "String")
     private String createTimeEnd;
+
+    @ApiModelProperty(value = "导出ids", dataType = "List")
+    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListRequest.java
index 1264883..62415fb 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListRequest.java
@@ -7,6 +7,7 @@
 import lombok.Data;
 
 import javax.validation.constraints.NotBlank;
+import java.util.List;
 
 @Data
 @ApiModel
@@ -37,4 +38,6 @@
     @ApiModelProperty(value = "是否加急（1是0否null全部）", dataType = "Integer")
     private String isUrgent;
 
+    @ApiModelProperty(value = "导出ids", dataType = "List")
+    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListRequest.java
index 5201d7b..499760a 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListRequest.java
@@ -17,6 +17,9 @@
     @ApiModelProperty(value = "任务单编号", dataType = "String")
     private String orderNo;
 
+    @ApiModelProperty(value = "委托方id", dataType = "Long")
+    private Long customerId;
+
     @ApiModelProperty(value = "委托方名称", dataType = "String")
     private String customerName;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OrderSampleDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OrderSampleDTO.java
new file mode 100644
index 0000000..796edc0
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OrderSampleDTO.java
@@ -0,0 +1,19 @@
+package com.casic.missiles.dto.business.outsource;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/8/24 11:38
+ */
+@ApiModel
+@Data
+public class OrderSampleDTO {
+    @ApiModelProperty(value = "任务单id", dataType = "Long")
+    private Long orderId;
+    @ApiModelProperty(value = "受检设备id", dataType = "Long")
+    private Long sampleId;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceAssessApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceAssessApprovalListRequest.java
new file mode 100644
index 0000000..9a930c3
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceAssessApprovalListRequest.java
@@ -0,0 +1,30 @@
+package com.casic.missiles.dto.business.outsource;
+
+import com.casic.missiles.dto.BaseApprovalListRequest;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/8/24 11:01
+ */
+@ApiModel
+@Data
+public class OutsourceAssessApprovalListRequest extends BaseApprovalListRequest {
+    @ApiModelProperty(value = "评审表编号", dataType = "String")
+    private String projectNo;
+
+    @ApiModelProperty(value = "分包机构名称", dataType = "String")
+    private String outsourcerName;
+
+    @ApiModelProperty(value = "申请人", dataType = "String")
+    private String applicantName;
+
+    @ApiModelProperty(value = "申请时间开始", dataType = "String")
+    private String applicantTimeStart;
+
+    @ApiModelProperty(value = "申请时间结束", dataType = "String")
+    private String applicantTimeEnd;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceAssessSaveResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceAssessSaveResponse.java
new file mode 100644
index 0000000..8bf9aad
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceAssessSaveResponse.java
@@ -0,0 +1,20 @@
+package com.casic.missiles.dto.business.outsource;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/8/14 16:17
+ */
+@ApiModel
+@Data
+public class OutsourceAssessSaveResponse {
+    @ApiModelProperty(value = "主键id", dataType = "Long")
+    private Long id;
+
+    @ApiModelProperty(value = "编号", dataType = "String")
+    private String projectNo;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProtocolApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProtocolApprovalListRequest.java
new file mode 100644
index 0000000..0f32331
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProtocolApprovalListRequest.java
@@ -0,0 +1,30 @@
+package com.casic.missiles.dto.business.outsource;
+
+import com.casic.missiles.dto.BaseApprovalListRequest;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/8/24 15:01
+ */
+@ApiModel
+@Data
+public class OutsourceProtocolApprovalListRequest extends BaseApprovalListRequest {
+    @ApiModelProperty(value = "协议书编号", dataType = "String")
+    private String protocolNo;
+
+    @ApiModelProperty(value = "分包方名称", dataType = "String")
+    private String outsourcerName;
+
+    @ApiModelProperty(value = "申请人", dataType = "String")
+    private String applicantName;
+
+    @ApiModelProperty(value = "申请时间开始", dataType = "String")
+    private String applicantTimeStart;
+
+    @ApiModelProperty(value = "申请时间结束", dataType = "String")
+    private String applicantTimeEnd;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProtocolSaveResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProtocolSaveResponse.java
new file mode 100644
index 0000000..e324967
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProtocolSaveResponse.java
@@ -0,0 +1,20 @@
+package com.casic.missiles.dto.business.outsource;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/8/14 16:17
+ */
+@ApiModel
+@Data
+public class OutsourceProtocolSaveResponse {
+    @ApiModelProperty(value = "主键id", dataType = "Long")
+    private Long id;
+
+    @ApiModelProperty(value = "编号", dataType = "String")
+    private String protocolNo;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveApprovalListRequest.java
index f29f4e4..7047c28 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveApprovalListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveApprovalListRequest.java
@@ -5,8 +5,6 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import java.util.List;
-
 /**
  * @Description: 现场检测审批列表请求实体
  * @Author: wangpeng
@@ -30,7 +28,4 @@
     @ApiModelProperty(value = "申请时间结束", dataType = "String")
     private String applyTimeEnd;
 
-    @ApiModelProperty(value = "导出ids", dataType = "List")
-    private List<Long> ids;
-
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveDetailResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveDetailResponse.java
index 1f28752..394c934 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveDetailResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveDetailResponse.java
@@ -12,6 +12,18 @@
     @ApiModelProperty(value = "id，更新/删除使用参数", dataType = "Long")
     private Long id;
 
+    @ApiModelProperty(value = "实验室代码(字典code)", dataType = "String")
+    private String labCode;
+
+    @ApiModelProperty(value = "实验室代码(字典value)", dataType = "String")
+    private String labCodeName;
+
+    @ApiModelProperty(value = "组别代码(字典code)", dataType = "String")
+    private String groupCode;
+
+    @ApiModelProperty(value = "组别代码(字典value)", dataType = "String")
+    private String groupCodeName;
+
     @ApiModelProperty(value = "审批编号", dataType = "String")
     private String siteExecutiveNo;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/environment/LocationListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/environment/LocationListRequest.java
new file mode 100644
index 0000000..13d03c3
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/environment/LocationListRequest.java
@@ -0,0 +1,20 @@
+package com.casic.missiles.dto.resource.environment;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/6/8 13:56
+ */
+@ApiModel
+@Data
+public class LocationListRequest {
+    @ApiModelProperty(value = "地点编号", dataType = "String")
+    private String locationNo;
+
+    @ApiModelProperty(value = "地点名称", dataType = "String")
+    private String locationName;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/environment/LocationListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/environment/LocationListResponse.java
new file mode 100644
index 0000000..4c531af
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/environment/LocationListResponse.java
@@ -0,0 +1,78 @@
+package com.casic.missiles.dto.resource.environment;
+
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
+import com.baomidou.mybatisplus.annotation.TableField;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description: 地点列表响应实体
+ * @Author: wangpeng
+ * @Date: 2023/6/8 13:53
+ */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
+@ApiModel
+@Data
+public class LocationListResponse {
+    @ApiModelProperty(value = "主键id", dataType = "Long")
+    private Long id;
+
+    /**
+     * 地点编号
+     */
+    @ExcelProperty("地点编号")
+    @ApiModelProperty(value = "地点编号", dataType = "String")
+    private String locationNo;
+
+    /**
+     * 地点名称
+     */
+    @ExcelProperty("地点名称")
+    @ApiModelProperty(value = "地点名称", dataType = "String")
+    private String locationName;
+
+    /**
+     * 地点位置
+     */
+    @ExcelProperty("地点位置")
+    @ApiModelProperty(value = "地点位置", dataType = "String")
+    private String locationPosition;
+
+    /**
+     * 创建人id
+     */
+    @ApiModelProperty(value = "创建人id", dataType = "Long")
+    private Long createUserId;
+
+    /**
+     * 创建人
+     */
+    @ExcelProperty("创建人")
+    @ApiModelProperty(value = "创建人", dataType = "String")
+    @TableField("create_user")
+    private String createUser;
+
+    /**
+     * 创建时间
+     */
+    @ExcelProperty("创建时间")
+    @ApiModelProperty(value = "创建时间", dataType = "String")
+    private String createTime;
+
+    /**
+     * 更新时间
+     */
+    @ApiModelProperty(value = "更新时间", dataType = "String")
+    private String updateTime;
+}

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java
index bb0c50f..13a699b 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java
@@ -12,6 +12,7 @@
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.IGeneralApprovalService;
+import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
@@ -19,6 +20,7 @@
 import org.springframework.web.bind.annotation.RequestBody;
 
 import javax.validation.Valid;
+import java.util.List;
 import java.util.Objects;
 
 /**
@@ -117,4 +119,17 @@
         }
         return baseApprovalService.failUpdate(request);
     }
+
+    public List<O> exportList(@RequestBody @Valid R request) throws Exception {
+        List<O> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = baseApprovalService.listExportByIds(request.getIds());
+        } else {
+            list = baseApprovalService.listExport(request);
+        }
+        for (O record : list) {
+            DictCodeUtils.convertDictCodeToName(record);
+        }
+        return list;
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java
index 8a90961..d775831 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java
@@ -5,6 +5,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.business.certificate.CertificateChangeApplyApprovalListRequest;
 import com.casic.missiles.dto.business.certificate.CertificateChangeApplySaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessCertificateChangeApply;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
@@ -20,6 +21,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -48,4 +50,12 @@
         }
         return changeApplyService.saveChangeApply(request);
     }
+
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody CertificateChangeApplyApprovalListRequest request) throws Exception {
+        List<BizBusinessCertificateChangeApply> list = super.exportList(request);
+        super.exportExcel(BizBusinessCertificateChangeApply.class, list, ExportEnum.CERTIFICATE_CHANGE_APPLY.getSheetName());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java
index 5fc4b07..af8230e 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java
@@ -9,6 +9,7 @@
 import com.casic.missiles.dto.business.certificate.CertificatePrintApprovalListRequest;
 import com.casic.missiles.dto.business.certificate.CertificatePrintListResponse;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.enums.business.CertificatePrintStatusEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessCertificatePrintLog;
@@ -18,10 +19,16 @@
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.io.IOException;
+import java.util.List;
 import java.util.Objects;
 
 /**
@@ -98,4 +105,16 @@
         });
         return certificatePrintService.certificatePrintLog(idDTO.getId());
     }
+
+    @ApiOperation("证书打印审批导出")
+    @PostMapping("/listExport")
+    public void exportList(@RequestBody CertificatePrintApprovalListRequest request) throws IOException {
+        List<CertificatePrintListResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = certificatePrintService.listByIds(request.getIds());
+        } else {
+            list = certificatePrintService.list(request);
+        }
+        super.exportExcel(CertificatePrintListResponse.class, list, ExportEnum.CERTIFICATE_PRINT.getSheetName());
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java
index 63b06dc..6b2efd5 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java
@@ -6,6 +6,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.business.certificate.CertificateReportApprovalListRequest;
 import com.casic.missiles.dto.business.certificate.CertificateReportSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessCertificateReport;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
@@ -21,6 +22,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -50,7 +52,7 @@
         return certificateReportService.saveCertificateReport(request);
     }
 
-    @ApiOperation("证书审批详情（基本信息）")
+    @ApiOperation("详情（基本信息）")
     @PostMapping("/detail")
     public ReturnDTO<BizBusinessCertificateReport> detail(@RequestBody @Valid BaseDetailRequest request, BindingResult bindingResult) throws Exception {
         if(bindingResult.hasErrors()){
@@ -59,4 +61,11 @@
         return certificateReportService.detail(request);
     }
 
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody CertificateReportApprovalListRequest request) throws Exception {
+        List<BizBusinessCertificateReport> list = super.exportList(request);
+        super.exportExcel(BizBusinessCertificateReport.class, list, ExportEnum.CERTIFICATE_REPORT.getSheetName());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java
index 46b26bd..57c0809 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java
@@ -10,20 +10,21 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.business.identify.IdentifyListRequest;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessIdentifyInfo;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.business.IBizBusinessIdentifyInfoService;
+import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import javax.validation.Valid;
+import java.util.List;
 import java.util.Objects;
 
 /**
@@ -57,16 +58,13 @@
         return identifyInfoService.addIdentify(identifyInfo);
     }
 
-    @ApiOperation("标识打印更新")
+    @ApiOperation("标识打印更新（更新打印时间）")
     @PostMapping("/update")
-    public ReturnDTO updateIdentify(@RequestBody @Valid BizBusinessIdentifyInfo identifyInfo, BindingResult bindingResult) {
-        Assert.isFalse(Objects.isNull(identifyInfo.getId()), () -> {
+    public ReturnDTO updateIdentify(@RequestBody @Valid IdDTO idDTO) {
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        Assert.isFalse(bindingResult.hasErrors(), () -> {
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        });
-        return identifyInfoService.updateIdentify(identifyInfo);
+        return identifyInfoService.updateIdentify(idDTO.getId());
     }
 
     @ApiOperation("标识打印删除")
@@ -77,4 +75,37 @@
         });
         return identifyInfoService.deleteIdentify(idDTO.getId());
     }
+
+    @ApiOperation("标识打印导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody @Valid IdentifyListRequest request, BindingResult bindingResult) throws Exception {
+        if (bindingResult.hasErrors()) {
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        List<BizBusinessIdentifyInfo> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = identifyInfoService.listByIds(request.getIds());
+        } else {
+            list = identifyInfoService.list(request);
+        }
+        for (BizBusinessIdentifyInfo record : list) {
+            DictCodeUtils.convertDictCodeToName(record);
+        }
+        super.exportExcel(BizBusinessIdentifyInfo.class, list, ExportEnum.IDENTIFY_EXPORT.getSheetName());
+    }
+
+
+    // TODO: 2023/8/23 查询设备信息，4个底部按钮查设备（按钮的作用就是前端用来调不同接口、用来区分中间即将展示的标识），前端弹窗选设备，在确定保存时前端根据底部按钮判断传入设备类型deviceType字典code
+    // TODO: 2023/8/23 接口：查受检设备（第1个按钮），查设备台账（后3个按钮同一接口），查询之后前端根据标志类型的不同加到中间页面时进行判断（按产品给的对应表）
+    // TODO: 2023/8/23 提供二维码接口，前端在加到中间页面时调用一下
+
+    @ApiOperation("设备二维码")
+    @PostMapping("/equipment/qrCode")
+    public ReturnDTO<String> equipmentQrCode(@RequestBody @Valid IdDTO idDTO) {
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return identifyInfoService.equipmentQrCode(idDTO.getId());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java
index 707be6e..7e0453d 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java
@@ -117,7 +117,7 @@
     }
 
     @ApiOperation("任务单导出")
-    @PostMapping("/export")
+    @PostMapping("/listExport")
     public void orderExport(@RequestBody @Valid OrderListRequest request, HttpServletResponse response) {
         businessOrderService.orderExport(request, response);
     }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java
index 529a6ce..51432be 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java
@@ -1,9 +1,28 @@
 package com.casic.missiles.controller.business;
 
+import com.casic.missiles.controller.GeneralApprovalController;
+import com.casic.missiles.dto.BaseApprovalSubmitRequest;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.business.outsource.OutsourceAssessApprovalListRequest;
+import com.casic.missiles.dto.business.outsource.OutsourceAssessSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
+import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.model.business.BizBusinessOutsourceAssess;
+import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
+import com.casic.missiles.service.IGeneralApprovalService;
+import com.casic.missiles.service.business.IBizBusinessOutsourceAssessService;
 import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.BindingResult;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.validation.Valid;
+import java.util.List;
+
 /**
  * <p>
  * 计量检定业务-分包管理-测试、校准或检定工作分包评审表 前端控制器
@@ -15,6 +34,27 @@
 @Api(tags = "分包管理-测试、校准或检定工作分包评审表")
 @RestController
 @RequestMapping("/business/outsource/assess")
-public class BizBusinessOutsourceAssessController {
+public class BizBusinessOutsourceAssessController extends GeneralApprovalController<BizBusinessOutsourceAssess, BizBusinessOutsourceAssess, OutsourceAssessApprovalListRequest, BaseApprovalSubmitRequest> {
+    @Autowired
+    private IBizBusinessOutsourceAssessService outsourceAssessService;
 
+    public BizBusinessOutsourceAssessController(IGeneralApprovalService<BizBusinessOutsourceAssess, BizBusinessOutsourceAssess, OutsourceAssessApprovalListRequest, BaseApprovalSubmitRequest> baseApprovalService) {
+        super(baseApprovalService);
+    }
+
+    @ApiOperation("草稿箱-保存")
+    @PostMapping("/save")
+    public ReturnDTO<OutsourceAssessSaveResponse> saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceAssess request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        return outsourceAssessService.saveOutsourceAssess(request);
+    }
+
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception {
+        List<BizBusinessOutsourceAssess> list = super.exportList(request);
+        super.exportExcel(BizBusinessOutsourceAssess.class, list, ExportEnum.OUTSOURCE_ASSESS.getSheetName());
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java
new file mode 100644
index 0000000..9adef18
--- /dev/null
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java
@@ -0,0 +1,60 @@
+package com.casic.missiles.controller.business;
+
+import com.casic.missiles.controller.GeneralApprovalController;
+import com.casic.missiles.dto.BaseApprovalSubmitRequest;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.business.outsource.OutsourceProtocolApprovalListRequest;
+import com.casic.missiles.dto.business.outsource.OutsourceProtocolSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
+import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.model.business.BizBusinessOutsourceProtocol;
+import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
+import com.casic.missiles.service.IGeneralApprovalService;
+import com.casic.missiles.service.business.IBizBusinessOutsourceProtocolService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.BindingResult;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.validation.Valid;
+import java.util.List;
+
+/**
+ * <p>
+ * 计量检定业务-分包管理-测试、校准或检定工作分包协议书 前端控制器
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-08-24
+ */
+@Api(tags = "分包管理-测试、校准或检定工作分包协议书")
+@RestController
+@RequestMapping("/business/outsource/protocol")
+public class BizBusinessOutsourceProtocolController extends GeneralApprovalController<BizBusinessOutsourceProtocol, BizBusinessOutsourceProtocol, OutsourceProtocolApprovalListRequest, BaseApprovalSubmitRequest> {
+    @Autowired
+    private IBizBusinessOutsourceProtocolService outsourceProtocolService;
+
+    public BizBusinessOutsourceProtocolController(IGeneralApprovalService<BizBusinessOutsourceProtocol, BizBusinessOutsourceProtocol, OutsourceProtocolApprovalListRequest, BaseApprovalSubmitRequest> baseApprovalService) {
+        super(baseApprovalService);
+    }
+
+    @ApiOperation("草稿箱-保存")
+    @PostMapping("/save")
+    public ReturnDTO<OutsourceProtocolSaveResponse> saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceProtocol request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        return outsourceProtocolService.saveOutsourceProtocol(request);
+    }
+
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody OutsourceProtocolApprovalListRequest request) throws Exception {
+        List<BizBusinessOutsourceProtocol> list = super.exportList(request);
+        super.exportExcel(BizBusinessOutsourceProtocol.class, list, ExportEnum.OUTSOURCE_PROTOCOL.getSheetName());
+    }
+}
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java
index 097f645..f0f0943 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java
@@ -17,7 +17,6 @@
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.IGeneralApprovalService;
 import com.casic.missiles.service.business.IBizBusinessOutsourcerInfoService;
-import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -71,19 +70,8 @@
 
     @ApiOperation("分包方导出")
     @PostMapping("/listExport")
-    public void export(@RequestBody @Valid OutsourcerInfoApprovalListRequest request, BindingResult bindingResult) throws Exception {
-        if (bindingResult.hasErrors()) {
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        }
-        List<BizBusinessOutsourcerInfo> list;
-        if (!CollectionUtils.isEmpty(request.getIds())) {
-            list = outsourcerInfoService.listByIds(request.getIds());
-        } else {
-            list = outsourcerInfoService.list(request);
-        }
-        for (BizBusinessOutsourcerInfo record : list) {
-            DictCodeUtils.convertDictCodeToName(record);
-        }
+    public void export(@RequestBody OutsourcerInfoApprovalListRequest request) throws Exception {
+        List<BizBusinessOutsourcerInfo> list = super.exportList(request);
         super.exportExcel(BizBusinessOutsourcerInfo.class, list, ExportEnum.OUTSOURCER_EXPORT.getSheetName());
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java
index c2cbf9f..0410918 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java
@@ -17,11 +17,9 @@
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.IGeneralApprovalService;
 import com.casic.missiles.service.business.IBizBusinessSiteExecutiveInfoService;
-import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -60,7 +58,7 @@
         return siteExecutiveInfoService.saveSiteExecutiveInfo(siteExecutiveInfo);
     }
 
-    @ApiOperation("现场检测详情")
+    @ApiOperation("详情")
     @PostMapping("/detail")
     public ReturnDTO<SiteExecutiveDetailResponse> siteExecutiveDetail(@RequestBody @Valid IdDTO idDTO) throws Exception {
         Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
@@ -69,21 +67,10 @@
         return ReturnUtil.success(siteExecutiveInfoService.detail(idDTO.getId()));
     }
 
-    @ApiOperation("现场检测导出")
+    @ApiOperation("导出")
     @PostMapping("/listExport")
-    public void export(@RequestBody @Valid SiteExecutiveApprovalListRequest request, BindingResult bindingResult) throws Exception {
-        if (bindingResult.hasErrors()) {
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        }
-        List<SiteExecutiveApprovalListResponse> list;
-        if (!CollectionUtils.isEmpty(request.getIds())) {
-            list = siteExecutiveInfoService.listInfoByIds(request.getIds());
-        } else {
-            list = siteExecutiveInfoService.listInfo(request);
-        }
-        for (SiteExecutiveApprovalListResponse record : list) {
-            DictCodeUtils.convertDictCodeToName(record);
-        }
+    public void export(@RequestBody SiteExecutiveApprovalListRequest request) throws Exception {
+        List<SiteExecutiveApprovalListResponse> list = super.exportList(request);
         super.exportExcel(SiteExecutiveApprovalListResponse.class, list, ExportEnum.SITE_EXECUTIVE_EXPORT.getSheetName());
     }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
index 7e793cd..a92e209 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
@@ -55,7 +55,7 @@
 
     @ApiOperation("设备收发列表导出")
     @PostMapping("/export")
-    public void exportList(@RequestBody @Valid SampleDispatchListRequest request) throws IOException {
+    public void exportList(@RequestBody SampleDispatchListRequest request) throws IOException {
         List<SampleDispatchListResponse> list;
         if (!CollectionUtils.isEmpty(request.getIds())) {
             list = dispatchService.listByIds(request.getIds());
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java
index cdc77fc..d120fd4 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java
@@ -7,6 +7,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.business.labExecutive.*;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.business.IBusinessLabExecutiveInfoService;
@@ -14,6 +15,7 @@
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.*;
 
@@ -32,7 +34,7 @@
     @Autowired
     private IBusinessLabExecutiveInfoService labExecutiveInfoService;
 
-    @ApiOperation("实验室检测-部门检测-查询各状态列表（待检测、检测中、检测完）")
+    @ApiOperation("实验室任务-查询各状态列表（待检测、检测中、检测完）")
     @PostMapping("/deptExecutive/List")
     public ReturnDTO<PageInfoBT<SampleLabExecutiveListResponse>> queryDeptExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
@@ -43,10 +45,19 @@
         return ReturnUtil.success(super.packForBT(labExecutiveInfoService.deptLabExecutiveListPage(page, labExecutiveListRequest)));
     }
 
-    /**
-     * 实验室检测-我的检测-查询各状态列表（待检测、检测中、检测完）
-     */
-    @ApiOperation("实验室检测-我的检测-查询各状态列表（待检测、检测中、检测完）")
+    @ApiOperation("实验室任务导出")
+    @PostMapping("/deptExecutive/export")
+    public void deptExportList(@RequestBody @Valid SampleLabExecutiveListRequest request) throws Exception {
+        List<SampleLabExecutiveListResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = labExecutiveInfoService.deptLabExecutiveListByIds(request.getMeasureStatus(), request.getIds());
+        } else {
+            list = labExecutiveInfoService.deptLabExecutiveList(request);
+        }
+        super.exportExcel(SampleLabExecutiveListResponse.class, list, ExportEnum.DEPT_EXECUTIVE_TASK.getSheetName());
+    }
+
+    @ApiOperation("我的任务-查询各状态列表（待检测、检测中、检测完）")
     @PostMapping("/myExecutive/list")
     public ReturnDTO<PageInfoBT<SampleLabExecutiveListResponse>> queryMyExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
@@ -57,19 +68,25 @@
         return ReturnUtil.success(super.packForBT(labExecutiveInfoService.myLabExecutiveListPage(page, labExecutiveListRequest)));
     }
 
-    /**
-     * 实验室检测-我的检测-查询各状态样品数量（待检测、检测中、检测完）
-     */
-    @ApiOperation("实验室检测-我的检测-查询各状态样品数量（待检测、检测中、检测完）")
+    @ApiOperation("我的任务导出")
+    @PostMapping("/myExecutive/export")
+    public void exportList(@RequestBody @Valid SampleLabExecutiveListRequest request) throws Exception {
+        List<SampleLabExecutiveListResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = labExecutiveInfoService.myLabExecutiveListByIds(request.getMeasureStatus(), request.getIds());
+        } else {
+            list = labExecutiveInfoService.myLabExecutiveList(request);
+        }
+        super.exportExcel(SampleLabExecutiveListResponse.class, list, ExportEnum.MY_EXECUTIVE_TASK.getSheetName());
+    }
+
+    @ApiOperation("我的任务-查询各状态样品数量（待检测、检测中、检测完）")
     @GetMapping("/myExecutive/amount")
     public ReturnDTO<List<SampleAmountResponse>> queryMyExecutiveAmount() {
         return ReturnUtil.success(labExecutiveInfoService.myExecutiveAmount());
     }
 
-    /**
-     * 实验室检测-部门检测-分配（分配给具体人员）
-     */
-    @ApiOperation("实验室检测-部门检测-分配按钮（分配给具体人员）")
+    @ApiOperation("实验室任务-分配按钮（分配给具体人员）")
     @PostMapping("/deptExecutive/allocate")
     public ReturnDTO allocateStaff(@RequestBody @Valid SampleAllocateRequest sampleAllocateRequest, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -78,10 +95,7 @@
         return labExecutiveInfoService.allocateStaff(sampleAllocateRequest);
     }
 
-    /**
-     * 实验室检测-我的检测-检定人扫描收入（待检测->检测中）
-     */
-    @ApiOperation("实验室检测-我的检测-检定人扫描收入（待检测->检测中）")
+    @ApiOperation("我的任务-检定人扫描收入（待检测->检测中）")
     @PostMapping("/myExecutive/receive")
     public ReturnDTO sampleReceive(@RequestBody @Valid List<SampleOperateRequest> requestList, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -90,10 +104,7 @@
         return labExecutiveInfoService.sampleReceive(requestList);
     }
 
-    /**
-     * 实验室检测-负责人/检定人扫描检完（检测中->检测完）
-     */
-    @ApiOperation("实验室检测-负责人/检定人扫描检完（检测中->检测完）")
+    @ApiOperation("实验室任务-负责人/检定人扫描检完（检测中->检测完）")
     @PostMapping("/myExecutive/complete")
     public ReturnDTO sampleExecutiveComplete(@RequestBody @Valid List<SampleOperateRequest> requestList, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -102,10 +113,7 @@
         return labExecutiveInfoService.sampleExecutiveComplete(requestList);
     }
 
-    /**
-     * 实验室检测-部门检测/我的检测 编辑（只能修改应出具证书）
-     */
-    @ApiOperation("实验室检测-部门检测/我的检测 编辑（只能修改应出具证书）")
+    @ApiOperation("实验室任务/我的任务 编辑（只能修改应出具证书）")
     @PostMapping("/executive/update")
     public ReturnDTO updateExecutive(@RequestBody @Valid UpdateExecutiveRequest request, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -114,10 +122,7 @@
         return labExecutiveInfoService.updateExecutive(request);
     }
 
-    /**
-     * 实验室检测-部门检测/我的检测 详情
-     */
-    @ApiOperation("实验室检测-部门检测/我的检测 详情")
+    @ApiOperation("实验室任务/我的任务 详情")
     @PostMapping("/executive/detail")
     public ReturnDTO<ExecutiveDetailResponse> executiveDetail(@RequestBody @Valid ExecutiveDetailRequest request, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
@@ -131,7 +136,7 @@
      * 退回后会将下一个要执行的实验室检测状态更新为待分配，将后面的实验室顺序变更为连续（都进行减1）
      * 最后一个检测的实验室退回，等分发员再增加实验室或设备收发中的已收入直接手动点击完成
      */
-    @ApiOperation("实验室检测-部门检测/我的检测 退回（待检测/检测中->退回）")
+    @ApiOperation("实验室任务/我的任务 退回（待检测/检测中->退回）")
     @PostMapping("/executive/sendBack")
     public ReturnDTO executiveSendBack(@RequestBody @Valid ExecutiveSendBackRequest request, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -140,9 +145,6 @@
         return labExecutiveInfoService.sampleExecutiveSendBack(request);
     }
 
-    /**
-     * 分发员编辑实验室检测列表
-     */
     @ApiOperation("分发员编辑实验室检测列表")
     @PostMapping("/handOut/updateList")
     public ReturnDTO updateExecutiveList(@RequestBody @Valid UpdateExecutiveListRequest request, BindingResult bindingResult) {
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java
index 48a67ed..0c04f31 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java
@@ -10,6 +10,7 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.resource.customer.CustomerApprovalListRequest;
 import com.casic.missiles.dto.resource.customer.CustomerSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceCustomerInfo;
@@ -26,6 +27,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -55,6 +57,13 @@
         return customerInfoService.saveCustomerInfo(request);
     }
 
+    @ApiOperation("委托方名录导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody CustomerApprovalListRequest request) throws Exception {
+        List<BizResourceCustomerInfo> list = super.exportList(request);
+        super.exportExcel(BizResourceCustomerInfo.class, list, ExportEnum.CUSTOMER_INFO.getSheetName());
+    }
+
     @ApiOperation("委托方人员列表（分页）")
     @PostMapping("/person/listPage")
     public ReturnDTO<PageInfoBT<BizResourceCustomerStaff>> personListPage(@RequestBody IdDTO idDto) {
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
index 972ed4b..6418ea5 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
@@ -5,6 +5,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.resource.customer.SuggestFormApprovalListRequest;
 import com.casic.missiles.dto.resource.customer.SuggestFormSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceCustomerSuggestForm;
@@ -20,6 +21,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -50,4 +52,11 @@
         return suggestFormService.saveSuggestForm(request);
     }
 
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody SuggestFormApprovalListRequest request) throws Exception {
+        List<BizResourceCustomerSuggestForm> list = super.exportList(request);
+        super.exportExcel(BizResourceCustomerSuggestForm.class, list, ExportEnum.CUSTOMER_SUGGEST_FORM.getSheetName());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java
index 1934d1a..9e07eab 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java
@@ -15,12 +15,16 @@
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.resource.IEnvEnvironmentRecordConfigService;
 import com.casic.missiles.service.resource.IEnvEnvironmentRecordDataService;
+import com.casic.missiles.service.resource.IEnvLocationInfoService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
 import java.util.List;
@@ -39,6 +43,8 @@
     private IEnvEnvironmentRecordDataService environmentRecordDataService;
     @Autowired
     private IEnvEnvironmentRecordConfigService environmentRecordConfigService;
+    @Autowired
+    private IEnvLocationInfoService locationInfoService;
 
     @ApiOperation("环境记录单数据列表/详情")
     @PostMapping("/data/listPage")
@@ -95,4 +101,11 @@
         });
         return environmentRecordConfigService.deleteEnvironmentRecordConfig(idDTO.getId());
     }
+
+    @ApiOperation("地点列表")
+    @PostMapping("/location/listPage")
+    public ReturnDTO<PageInfoBT<LocationListResponse>> locationListPage(@RequestBody @Valid LocationListRequest request) {
+        Page<LocationListResponse> page = PageFactory.defaultPage();
+        return ReturnUtil.success(super.packForBT(locationInfoService.listPage(page, request)));
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java
index 82efe3f..e9561fa 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java
@@ -10,6 +10,7 @@
 import com.casic.missiles.dto.resource.seal.SealLogListRequest;
 import com.casic.missiles.dto.resource.seal.SealNoteApprovalListRequest;
 import com.casic.missiles.dto.resource.seal.SealNoteSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceSealUseLog;
@@ -27,6 +28,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -58,6 +60,13 @@
         return sealUseNoteService.saveSeal(request);
     }
 
+    @ApiOperation("印章使用登记导出（列表和导出中去掉经办人和监印人）")
+    @PostMapping("/listExport")
+    public void export(@RequestBody SealNoteApprovalListRequest request) throws Exception {
+        List<BizResourceSealUseNote> list = super.exportList(request);
+        super.exportExcel(BizResourceSealUseNote.class, list, ExportEnum.SEAL_NOTE.getSheetName());
+    }
+
     // TODO: 2023/7/28 印章使用日志：系统中使用印章时插入数据库
 
     @ApiOperation("印章使用日志列表（分页）")
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java
index 9b674fc..06b6521 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java
@@ -9,16 +9,20 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.resource.staff.StaffCertRequest;
 import com.casic.missiles.dto.resource.staff.StaffCertResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.service.resource.IBizResourceStaffInfoService;
 import com.casic.missiles.service.resource.IBizResourceStaffVerifierService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.List;
+
 /**
  * @Description:
  * @Author: wangpeng
@@ -41,9 +45,21 @@
         return ReturnUtil.success(super.packForBT(responsePage));
     }
 
+    @ApiOperation("证书逾期提醒导出")
+    @PostMapping("/listExport")
+    public void exportList(@RequestBody StaffCertRequest request) throws Exception {
+        List<StaffCertResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = staffInfoService.certListByIds(request.getIds());
+        } else {
+            list = staffInfoService.certList(request);
+        }
+        super.exportExcel(StaffCertResponse.class, list, ExportEnum.STAFF_CERTIFICATE_EXPIRE.getSheetName());
+    }
+
     @ApiOperation("证书逾期提醒")
     @PostMapping("/expirationReminder")
-    public ReturnDTO expirationReminder(@RequestBody IdDTO idDto) {
-        return verifierService.expirationReminder(idDto);
+    public ReturnDTO expirationReminder(@RequestBody IdDTO idDTO) {
+        return verifierService.expirationReminder(idDTO);
     }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java
index 3b251ad..a6e7850 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java
@@ -12,6 +12,7 @@
 import com.casic.missiles.dto.resource.staff.StaffListRequest;
 import com.casic.missiles.dto.resource.staff.TrainListRequest;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.*;
@@ -22,7 +23,10 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
 import java.util.List;
@@ -52,8 +56,19 @@
             throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
         }
         Page<BizResourceStaffInfo> page = PageFactory.defaultPage();
-        Page<BizResourceStaffInfo> responsePage = staffInfoService.listPage(page, request);
-        return ReturnUtil.success(super.packForBT(responsePage));
+        return ReturnUtil.success(super.packForBT(staffInfoService.listPage(page, request)));
+    }
+
+    @ApiOperation("人员登记导出")
+    @PostMapping("/listExport")
+    public void exportList(@RequestBody StaffListRequest request) throws Exception {
+        List<BizResourceStaffInfo> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = staffInfoService.listByIds(request.getIds());
+        } else {
+            list = staffInfoService.list(request);
+        }
+        super.exportExcel(BizResourceStaffInfo.class, list, ExportEnum.STAFF_INFO.getSheetName());
     }
 
     @ApiOperation("人员登记详情基础信息")
@@ -85,9 +100,9 @@
 
     @ApiOperation("科研教育列表（分页）")
     @PostMapping("/education/listPage")
-    public ReturnDTO<PageInfoBT<BizResourceStaffEducation>> educationListPage(@RequestBody IdDTO idDto) {
+    public ReturnDTO<PageInfoBT<BizResourceStaffEducation>> educationListPage(@RequestBody IdDTO idDTO) {
         Page<BizResourceStaffEducation> page = PageFactory.defaultPage();
-        Page<BizResourceStaffEducation> responsePage = staffInfoService.educationListPage(page, idDto);
+        Page<BizResourceStaffEducation> responsePage = staffInfoService.educationListPage(page, idDTO);
         return ReturnUtil.success(super.packForBT(responsePage));
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java
index af6aa86..d85d84a 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java
@@ -9,6 +9,7 @@
 import com.casic.missiles.dto.resource.outsideService.SupplierApprovalListRequest;
 import com.casic.missiles.dto.resource.outsideService.SupplierSaveResponse;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceSupplierAbility;
@@ -67,6 +68,13 @@
         return ReturnUtil.success(supplierInfoService.detail(idDTO.getId()));
     }
 
+    @ApiOperation("合格供方导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody SupplierApprovalListRequest request) throws Exception {
+        List<BizResourceSupplierInfo> list = super.exportList(request);
+        super.exportExcel(BizResourceSupplierInfo.class, list, ExportEnum.SUPPLIER_INFO.getSheetName());
+    }
+
     @ApiOperation("供方人员列表（分页）")
     @PostMapping("/person/listPage")
     public ReturnDTO<PageInfoBT<BizResourceSupplierPerson>> personListPage(@RequestBody IdDTO idDTO) {
diff --git a/casic-metering-api/src/main/resources/config/application.yml b/casic-metering-api/src/main/resources/config/application.yml
index 350db5f..ecff521 100644
--- a/casic-metering-api/src/main/resources/config/application.yml
+++ b/casic-metering-api/src/main/resources/config/application.yml
@@ -126,7 +126,7 @@
     #作者
     author: wangpeng
     #待生成对象表名
-    table-name: biz_equipment_technical_target_approval,biz_equipment_attachment_approval,biz_equipment_checkpoint_approval
+    table-name: biz_business_outsource_protocol
 
 reminder:
   #节点--common模块config包 ReminderNodeConfig配置
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
index 4a19e4e..d47d552 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
@@ -53,6 +53,7 @@
     SUGGEST_FORM_SAVE_FAILED(2509, "委托方意见登记表保存至草稿箱失败"),
     EXAMINE_FORM_SAVE_FAILED(2510, "要求、委托书及合同评审表保存至草稿箱失败"),
     CUSTOMER_EXIST_SAVE_FAILED(2511, "该委托方已存在，请重新选择"),
+    DUPLICATE_LOCATION_NO(2512, "地点编号已存在"),
 
     /**
      * 计量检定业务模块
@@ -68,6 +69,8 @@
     COMPLETE_SAMPLE_NOT_EXIST(2609, "检测中不存在扫描收入的样品"),
     CANNOT_CHANGE_MEASURE_INFO(2610, "无法更改非当前登录用户的检测信息"),
     NON_EXIST_ORDER_OR_SAMPLE(2611, "不存在该委托单或该委托单下的样品"),
+    OUTSOURCE_ACCESS_SAVE_FAILED(2612, "测试、校准或检定工作分包评审表保存至草稿箱失败"),
+    OUTSOURCE_PROTOCOL_SAVE_FAILED(2613, "测试、校准或检定工作分包协议书保存至草稿箱失败"),
 
     /**
      * 历史遗留备用
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
index 5089ad1..81a406b 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
@@ -10,54 +10,38 @@
     /**
      * 资源管理
      */
-    ENVIRONMENT_DATA_EXPORT("environmentData", "environmentData", "环境记录单数据"),
+    ENVIRONMENT_DATA_EXPORT("environmentData", "环境记录单数据", "环境记录单数据"),
+    STAFF_INFO("staffInfo", "人员登记", "人员登记"),
+    STAFF_CERTIFICATE_EXPIRE("certificateExpire", "证书逾期提醒", "证书逾期提醒"),
+    SUPPLIER_INFO("supplierInfo", "合格供方名录", "合格供方名录"),
+    CUSTOMER_INFO("customerInfo", "委托方名录", "委托方名录"),
+    CUSTOMER_SUGGEST_FORM("customerSuggestForm", "委托方意见登记表", "委托方意见登记表"),
+    SEAL_NOTE("sealNote", "印章使用登记", "印章使用登记"),
 
-    FILE_EXPORT("meterFileData", "meterFileData", "计量文件信息"),
-    TRAIN_PLAN_EXPORT("trainPlanData", "trainPlanData", "培训计划"),
-    TRAIN_LOG_EXPORT("trainLogData", "trainLogData", "培训记录"),
-    METER_ORGANIZE_EXPORT("meterOrganizeData", "meterOrganizeData", "计量组织"),
-    TRACE_SUPPLIER_EXPORT("traceSupplierData", "traceSupplierData", "溯源供方"),
-    SIGN_EXPORT("signData", "signData", "签名/签章"),
-    TEMPLATE_EXPORT("templateData", "templateData", "原始记录模板/证书报告模板"),
-    FIXED_ASSETS("meterFixedAssets", "meterFixedAssets", "固定资产"),
-    METER_EQUIPMENT("meterEquipment", "meterEquipment", "测量设备"),
-    CALIBRATION_TEST_EQUIPMENT("calibrationTestEquipment", "calibrationTestEquipment", "校准检定设备"),
-    MEASURE_ACCOUNT("measureAccount", "measureAccount", "测量工装"),
-    STANDARD_SUPPORT_EQUIPMENT("standardSupportEquipment", "standardSupportEquipment", "标准配套设备"),
-    STANDARD_EQUIPMENT("standardEquipment", "standardEquipment", "标准装置"),
-    FLOW_DEF_EXPORT("flowDefData", "flowDefData", "流程定义"),
-    STAFF_CERTIFICATE("certificate", "certificate", "计量人员证书"),
-    CHECK_INFO("checkInfo", "checkInfo", "设备管理点检测"),
-    EQUIPMENT_APPLY("equipmentApply", "equipmentApply", "设备借用"),
-    STANDARD_EQUIPMENT_REMIND("equipmentApplyRemind", "equipmentApplyRemind", "标准装置到期提醒"),
-    METER_PRICE("meterPrice", "meterPrice", "价格库"),
-    METER_STAFF("meterStaff", "meterStaff", "计量人员"),
-    STANDARD_EQUIPMENT_APPLY("standardEquipmentApply", "standardEquipmentApply", "标准装置申请"),
-    STATE_MANAGE_APPLY("stateManage", "stateManage", "状态管理"),
-    METER_ACCEPTANCE_CHECK("acceptanceCheck", "acceptanceCheck", "设备检修保养验收单"),
-    CUSTOMER_EXPORT("customerData", "customerData", "客户信息"),
-    ORDER_EXPORT("orderData", "orderData", "委托书信息"),
-    SAMPLE_EXPORT("sampleData", "sampleData", "样本信息"),
-    EXCHANGE_DATA("exchangeData", "exchangeData", "设备交接单"),
-    DISPATCH_DATA("dispatchData", "dispatchData", "设备收发"),
-    ENVIRONMENT_DATA("environmentData", "environmentData", "环境记录单"),
-    ORIGIN_DATA("originData", "originData", "原始记录"),
-    CERTIFICATE_REPORT("certificateReport", "certificateReport", "证书报告"),
-    ADVICE_EXPORT("adviceData", "adviceData", "客户反馈"),
-    HANDOUT_EXPORT("handoutData", "handoutData", "任务分发列表"),
-    OUTSOURCER_EXPORT("outsourcerData", "outsourcerData", "分包方"),
-    SITE_EXECUTIVE_EXPORT("siteExecutiveData", "siteExecutiveData", "现场测试、校准或检定"),
-    CERTIFICATE_PRINT_EXPORT("certificatePrintData", "certificatePrintData", "证书打印"),
-    DOWNLOAD_TEMPLATE("downloadTemplate", "downloadTemplate", "页面配置"),
-    OUTSOURCER_CERTIFICATE_EXPORT("outsourceCertificateData", "outsourceCertificateData", "分包证书"),
-    SETTLEMENT_INFO_EXPORT("settlementInfoData", "settlementInfoData", "业务结算"),
-    EQUIPMENT_REMIND("equipmentRemind", "equipmentRemind", "设备到期提醒"),
-    AGREEMENT_INFO_EXPORT("agreementInfoData", "agreementInfoData", "合同"),
-    WORK_STATISTICS_EXPORT("workStatisticsData", "workStatisticsData", "实时工作统计"),
-    DEPT_OUTPUT_EXPORT("deptOutputData", "deptOutputData", "部门产值分析"),
-    WORKLOAD_EXPORT("workloadData", "workloadData", "业务工作量分析"),
-    DEPT_COMPREHENSIVE_EXPORT("deptComprehensiveData", "deptComprehensiveData", "部门综合分析"),
-    ENVIRONMENTAL_RECORD("environmentalRecordData", "environmentalRecordData", "现场环境记录");
+    /**
+     * 计量检定业务
+     */
+    OUTSOURCER_EXPORT("outsourcerData", "分包方名录", "分包方名录"),
+    IDENTIFY_EXPORT("identifyData", "计量标识", "计量标识"),
+    ORDER_EXPORT("orderData", "任务单", "任务单"),
+    DISPATCH_DATA("dispatchData", "设备收发", "设备收发"),
+    HANDOUT_EXPORT("handoutData", "任务分发", "任务分发"),
+    SITE_EXECUTIVE_EXPORT("siteExecutiveData", "现场测试、校准或检定", "现场测试、校准或检定"),
+    CERTIFICATE_REPORT("certificateReport", "证书审批", "证书审批"),
+    CERTIFICATE_CHANGE_APPLY("certificateChangeApply", "证书报告补充或更换申请单", "证书报告补充或更换申请单"),
+    CERTIFICATE_PRINT("certificatePrintData", "证书打印审批", "证书打印审批"),
+    DEPT_EXECUTIVE_TASK("deptExecutiveTaskData", "实验室任务", "实验室任务"),
+    MY_EXECUTIVE_TASK("myExecutiveTaskData", "我的任务", "我的任务"),
+    OUTSOURCE_ASSESS("outsourceAssess", "测试、校准或检定工作分包评审表", "测试、校准或检定工作分包评审表"),
+    OUTSOURCE_PROTOCOL("outsourceProtocol", "测试、校准或检定工作分包协议书", "测试、校准或检定工作分包协议书"),
+
+    /**
+     * 系统管理
+     */
+    SIGN_EXPORT("signData", "签名", "签名"),
+    TEMPLATE_EXPORT("templateData", "文件模板", "文件模板"),
+    FLOW_DEF_EXPORT("flowDefData", "流程定义", "流程定义"),
+    DOWNLOAD_TEMPLATE("downloadTemplate", "流程定义", "页面配置");
 
     ExportEnum(String fileName, String sheetName, String description) {
         this.fileName = fileName;
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateRecordTypeCodeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateRecordTypeCodeEnum.java
index 31d913c..a963522 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateRecordTypeCodeEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateRecordTypeCodeEnum.java
@@ -46,4 +46,14 @@
     String SITE_EXECUTIVE_APPROVAL = "01";
     //《现场测试、校准或检定工作记录表》
     String SITE_EXECUTIVE_LOG = "02";
+
+    //测试、校准或检定工作分包协议书
+    String OUTSOURCE_PROTOCOL = "01";
+    //测试、校准或检定工作分包评审表
+    String OUTSOURCE_ACCESS = "02";
+    //测试、校准或检定工作分包通知书
+    String OUTSOURCE_NOTICE = "03";
+    //测试、校准或检定工作分包方名录
+    String OUTSOURCE_INFO = "04";
+
 }
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
index 24b8635..f78bd53 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
@@ -15,6 +15,10 @@
     String CERTIFICATE_CHANGE_APPLY_BEAN_NAME = "certificateChangeApplyBean";
     //现场测试、校准或检定
     String SITE_EXECUTIVE_BEAN_NAME = "siteExecutiveBean";
+    //测试、校准或检定工作分包评审表
+    String OUTSOURCE_ASSESS_BEAN_NAME = "outsourceAssessBean";
+    //测试、校准或检定工作分包协议书
+    String OUTSOURCE_PROTOCOL_BEAN_NAME = "outsourceProtocolBean";
 
     /*********************************设备与装置************************************/
     //设备台账
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 b21c661..6b86fd1 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
@@ -18,6 +18,8 @@
     OUTSOURCER_APPROVAL(OUTSOURCER_BEAN_NAME, ""),
     CERTIFICATE_CHANGE_APPROVAL(CERTIFICATE_CHANGE_APPLY_BEAN_NAME, ""),
     SITE_EXECUTIVE_APPROVAL(SITE_EXECUTIVE_BEAN_NAME, ""),
+    OUTSOURCE_ASSESS_APPROVAL(OUTSOURCE_ASSESS_BEAN_NAME, ""),
+    OUTSOURCE_PROTOCOL_APPROVAL(OUTSOURCE_PROTOCOL_BEAN_NAME, ""),
 
     ACTION_STATUS_MAP(new HashMap<String, AwareActionStatusEnum>() {
         {
@@ -47,6 +49,10 @@
             put(ApplyFromIdEnum.CERTIFICATE_CHANGE_APPROVAL.getCode(), CERTIFICATE_CHANGE_APPROVAL);
             //现场测试、校准或检定审批
             put(ApplyFromIdEnum.SITE_EXECUTIVE_APPROVAL.getCode(), SITE_EXECUTIVE_APPROVAL);
+            //测试、校准或检定工作分包评审表
+            put(ApplyFromIdEnum.OUTSOURCE_ASSESS_APPROVAL.getCode(), OUTSOURCE_ASSESS_APPROVAL);
+            //测试、校准或检定工作分包协议书
+            put(ApplyFromIdEnum.OUTSOURCE_PROTOCOL_APPROVAL.getCode(), OUTSOURCE_PROTOCOL_APPROVAL);
         }
     });
     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 934405e..c7410bd 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
@@ -9,6 +9,8 @@
     CERTIFICATE_CHANGE_APPROVAL("jljdywzsbchghsqd", MessageSourceModuleEnum.BUSINESS.getCode(), "证书/报告补充或更换申请单"),
     OUTSOURCER_APPROVAL("jljdywcsjzhgfbfml", MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定合格分包方名录"),
     SITE_EXECUTIVE_APPROVAL("jljdywxccsjzsp", MessageSourceModuleEnum.BUSINESS.getCode(), "现场测试、校准或检定审批"),
+    OUTSOURCE_ASSESS_APPROVAL("jljdywcsjzfbpsb", MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包评审表"),
+    OUTSOURCE_PROTOCOL_APPROVAL("jljdywcsjzfbxys", MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包协议书"),
 
 
     /*******************************************设备与装置*********************************************/
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/GeneralApprovalMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/GeneralApprovalMapper.java
index 4fb7344..0c9d6ae 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/GeneralApprovalMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/GeneralApprovalMapper.java
@@ -17,8 +17,4 @@
 
     Page<O> selectBatchForApprovalList(Page<O> page, @Param("request") R request, @Param("businessKeys") List<String> businessKeys);
 
-//    Page<O> selectListPage(Page<O> page, @Param("request") R request);
-
-//    Long selectMaxNo();
-
 }
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceAssessMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceAssessMapper.java
index 7867bb8..ba59009 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceAssessMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceAssessMapper.java
@@ -1,7 +1,12 @@
 package com.casic.missiles.mapper.business;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.business.outsource.OutsourceAssessApprovalListRequest;
+import com.casic.missiles.mapper.GeneralApprovalMapper;
 import com.casic.missiles.model.business.BizBusinessOutsourceAssess;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * <p>
@@ -11,6 +16,10 @@
  * @author wangpeng
  * @since 2023-08-16
  */
-public interface BizBusinessOutsourceAssessMapper extends BaseMapper<BizBusinessOutsourceAssess> {
+public interface BizBusinessOutsourceAssessMapper extends GeneralApprovalMapper<BizBusinessOutsourceAssess, BizBusinessOutsourceAssess, OutsourceAssessApprovalListRequest> {
+
+    Page<BizBusinessOutsourceAssess> selectBatchForApprovalList(Page<BizBusinessOutsourceAssess> page, @Param("request") OutsourceAssessApprovalListRequest request, @Param("businessKeys") List<String> businessKeys);
+
+    Long selectMaxProjectNo();
 
 }
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceProtocolMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceProtocolMapper.java
new file mode 100644
index 0000000..e6aba35
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceProtocolMapper.java
@@ -0,0 +1,24 @@
+package com.casic.missiles.mapper.business;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.business.outsource.OutsourceProtocolApprovalListRequest;
+import com.casic.missiles.mapper.GeneralApprovalMapper;
+import com.casic.missiles.model.business.BizBusinessOutsourceProtocol;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 计量检定业务-分包管理-测试、校准或检定工作分包协议书 Mapper 接口
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-08-24
+ */
+public interface BizBusinessOutsourceProtocolMapper extends GeneralApprovalMapper<BizBusinessOutsourceProtocol, BizBusinessOutsourceProtocol, OutsourceProtocolApprovalListRequest> {
+
+    Page<BizBusinessOutsourceProtocol> selectBatchForApprovalList(Page<BizBusinessOutsourceProtocol> page, @Param("request") OutsourceProtocolApprovalListRequest request, @Param("businessKeys") List<String> businessKeys);
+
+    Long selectMaxProtocolNo();
+}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/EnvLocationInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/EnvLocationInfoMapper.java
new file mode 100644
index 0000000..49eff87
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/EnvLocationInfoMapper.java
@@ -0,0 +1,21 @@
+package com.casic.missiles.mapper.resource;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.resource.environment.LocationListRequest;
+import com.casic.missiles.dto.resource.environment.LocationListResponse;
+import com.casic.missiles.model.resource.EnvLocationInfo;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * <p>
+ * 实验室环境监控系统-设备表 Mapper 接口
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-06-07
+ */
+public interface EnvLocationInfoMapper extends BaseMapper<EnvLocationInfo> {
+
+    Page<LocationListResponse> selectLocationListPage(Page<LocationListResponse> page, @Param("request") LocationListRequest request);
+}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java
index de124db..85ed0f7 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java
@@ -1,7 +1,9 @@
 package com.casic.missiles.mapper.system;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.dto.system.SignDetailResponse;
+import com.casic.missiles.dto.system.SignListRequest;
 import com.casic.missiles.model.system.SystemSign;
 import org.apache.ibatis.annotations.Param;
 
@@ -22,4 +24,8 @@
     SignDetailResponse selectSignDetailById(Long id);
 
     List<SystemSign> selectUsableSignList(@Param("userId") Long userId);
+
+    Page<SystemSign> selectSignListPage(Page<SystemSign> page, @Param("request") SignListRequest request);
+
+    List<SystemSign> selectSignList(@Param("request") SignListRequest request);
 }
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateChangeApplyMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateChangeApplyMapper.xml
index d798447..c496092 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateChangeApplyMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateChangeApplyMapper.xml
@@ -30,31 +30,31 @@
         SELECT *
         FROM biz_business_certificate_change_apply
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.changeApplyNo != null and request.changeApplyNo !=''">
+        <if test="request != null and request.changeApplyNo != null and request.changeApplyNo !=''">
             and change_apply_no like concat('%',#{request.changeApplyNo},'%')
         </if>
-        <if test="request.changeReportNo != null and request.changeReportNo !=''">
+        <if test="request != null and request.changeReportNo != null and request.changeReportNo !=''">
             and change_report_no like concat('%',#{request.changeReportNo},'%')
         </if>
-        <if test="request.changeReportName != null and request.changeReportName !=''">
+        <if test="request != null and request.changeReportName != null and request.changeReportName !=''">
             and change_report_name like concat('%',#{request.changeReportName},'%')
         </if>
-        <if test="request.changeType != null and request.changeType !=''">
+        <if test="request != null and request.changeType != null and request.changeType !=''">
             and change_type = #{request.changeType}
         </if>
-        <if test="request.createUserName != null and request.createUserName !=''">
+        <if test="request != null and request.createUserName != null and request.createUserName !=''">
             and create_user_name like concat('%',#{request.createUserName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificatePrintMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificatePrintMapper.xml
index b66cd99..49c0ac8 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificatePrintMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificatePrintMapper.xml
@@ -31,34 +31,34 @@
         LEFT JOIN biz_business_order_sample_relation bosr ON (bosr.order_id = bcr.order_id AND bosr.sample_id = bcr.sample_id)
         LEFT JOIN biz_business_order_info boi ON boi.id = bosr.order_id
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and bcp.approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.printStatus != null and request.printStatus !=''">
+        <if test="request != null and request.printStatus != null and request.printStatus !=''">
             and print_status = #{request.printStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and bcp.create_user_id = #{request.createUserId}
         </if>
-        <if test="request.certificateReportNo != null and request.certificateReportNo !=''">
+        <if test="request != null and request.certificateReportNo != null and request.certificateReportNo !=''">
             and bcr.certificate_report_no like concat('%',#{request.certificateReportNo},'%')
         </if>
-        <if test="request.certificateReportName != null and request.certificateReportName !=''">
+        <if test="request != null and request.certificateReportName != null and request.certificateReportName !=''">
             and bcr.certificate_report_name like concat('%',#{request.certificateReportName},'%')
         </if>
-        <if test="request.customerName != null and request.customerName !=''">
+        <if test="request != null and request.customerName != null and request.customerName !=''">
             and boi.customer_name like concat('%',#{request.customerName},'%')
         </if>
-        <if test="request.sampleNo != null and request.sampleNo !=''">
+        <if test="request != null and request.sampleNo != null and request.sampleNo !=''">
             and bosr.sample_no like concat('%',#{request.sampleNo},'%')
         </if>
-        <if test="request.sampleName != null and request.sampleName !=''">
+        <if test="request != null and request.sampleName != null and request.sampleName !=''">
             and bosr.sample_name like concat('%',#{request.sampleName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and bcp.create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and bcp.create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml
index b366034..767695d 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml
@@ -46,33 +46,37 @@
         SELECT bcr.*, bosr.sample_no, bosr.sample_name, bosr.sample_model, rsi.staff_name
         FROM biz_business_certificate_report bcr
         LEFT JOIN biz_business_order_sample_relation bosr ON (bosr.order_id = bcr.order_id AND bosr.sample_id = bcr.sample_id)
+        LEFT JOIN biz_business_order_info boi ON boi.id = bcr.order_id
         LEFT JOIN biz_resource_staff_info rsi ON rsi.id = bcr.measure_person_id
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and bcr.approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and bcr.create_user_id = #{request.createUserId}
         </if>
-        <if test="request.certificateReportNo != null and request.certificateReportNo !=''">
+        <if test="request != null and request.customerId != null and request.customerId !=''">
+            and boi.customer_id = #{request.customerId}
+        </if>
+        <if test="request != null and request.certificateReportNo != null and request.certificateReportNo !=''">
             and bcr.certificate_report_no like concat('%',#{request.certificateReportNo},'%')
         </if>
-        <if test="request.certificateReportName != null and request.certificateReportName !=''">
+        <if test="request != null and request.certificateReportName != null and request.certificateReportName !=''">
             and bcr.certificate_report_name like concat('%',#{request.certificateReportName},'%')
         </if>
-        <if test="request.sampleNo != null and request.sampleNo !=''">
+        <if test="request != null and request.sampleNo != null and request.sampleNo !=''">
             and bosr.sample_no like concat('%',#{request.sampleNo},'%')
         </if>
-        <if test="request.measureCategory != null and request.measureCategory !=''">
+        <if test="request != null and request.measureCategory != null and request.measureCategory !=''">
             and bcr.measure_category = #{request.measureCategory}
         </if>
-        <if test="request.measurePerson != null and request.measurePerson !=''">
+        <if test="request != null and request.measurePerson != null and request.measurePerson !=''">
             and rsi.staff_name like concat('%',#{request.measurePerson},'%')
         </if>
-        <if test="request.calibrationTimeStart != null and request.calibrationTimeStart !=''">
+        <if test="request != null and request.calibrationTimeStart != null and request.calibrationTimeStart !=''">
             and bcr.calibration_time &gt;= #{request.calibrationTimeStart}
         </if>
-        <if test="request.calibrationTimeEnd != null and request.calibrationTimeEnd !=''">
+        <if test="request != null and request.calibrationTimeEnd != null and request.calibrationTimeEnd !=''">
             and bcr.calibration_time &lt;= #{request.calibrationTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceAssessMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceAssessMapper.xml
index d0fcf8b..c22c101 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceAssessMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceAssessMapper.xml
@@ -7,6 +7,8 @@
         <id column="id" property="id" />
         <result column="project_no" property="projectNo" />
         <result column="project_name" property="projectName" />
+        <result column="lab_code" property="labCode" />
+        <result column="group_code" property="groupCode" />
         <result column="applicant_id" property="applicantId" />
         <result column="applicant_name" property="applicantName" />
         <result column="applicant_time" property="applicantTime" />
@@ -31,7 +33,45 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, project_no, project_name, applicant_id, applicant_name, applicant_time, minio_file_name, remark, create_user_id, create_user_name, outsourcer_id, pre_start_time, pre_end_time, outsource_reason, pre_cost, approval_status, process_id, approve_situation, traceability, test_method, technique_ability, create_time, update_time
+        id, project_no, project_name, lab_code, group_code, applicant_id, applicant_name, applicant_time, minio_file_name, remark, create_user_id, create_user_name, outsourcer_id, pre_start_time, pre_end_time, outsource_reason, pre_cost, approval_status, process_id, approve_situation, traceability, test_method, technique_ability, create_time, update_time
     </sql>
 
+    <select id="selectMaxProjectNo" resultType="java.lang.Long">
+        SELECT IFNULL(max(RIGHT(project_no, 3)), 0) from biz_business_outsource_assess
+    </select>
+
+    <select id="selectBatchForApprovalList" resultMap="BaseResultMap">
+        SELECT bboa.*, bboi.outsourcer_name, bboi.director
+        FROM biz_business_outsource_assess bboa
+        LEFT JOIN biz_business_outsourcer_info bboi ON bboa.outsourcer_id = bboi.id
+        WHERE 1=1
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
+            and bboa.approval_status = #{request.approvalStatus}
+        </if>
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
+            and bboa.create_user_id = #{request.createUserId}
+        </if>
+        <if test="request != null and request.projectNo != null and request.projectNo !=''">
+            and bboa.project_no like concat('%',#{request.projectNo},'%')
+        </if>
+        <if test="request != null and request.outsourcerName != null and request.outsourcerName !=''">
+            and bboi.outsourcer_name like concat('%',#{request.outsourcerName},'%')
+        </if>
+        <if test="request != null and request.applicantName != null and request.applicantName !=''">
+            and bboa.applicant_name like concat('%',#{request.applicantName},'%')
+        </if>
+        <if test="request != null and request.applicantTimeStart != null and request.applicantTimeStart !=''">
+            and bboa.applicant_time &gt;= #{request.applicantTimeStart}
+        </if>
+        <if test="request != null and request.applicantTimeEnd != null and request.applicantTimeEnd !=''">
+            and bboa.applicant_time &lt;= #{request.applicantTimeEnd}
+        </if>
+        <if test="businessKeys != null">
+            and bboa.id in
+            <foreach collection="businessKeys" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
+        ORDER BY bboa.create_time DESC
+    </select>
 </mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceProtocolMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceProtocolMapper.xml
new file mode 100644
index 0000000..b7b2149
--- /dev/null
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceProtocolMapper.xml
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.mapper.business.BizBusinessOutsourceProtocolMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.business.BizBusinessOutsourceProtocol">
+        <id column="id" property="id" />
+        <result column="protocol_no" property="protocolNo" />
+        <result column="project_name" property="projectName" />
+        <result column="lab_code" property="labCode" />
+        <result column="group_code" property="groupCode" />
+        <result column="outsourcer_id" property="outsourcerId" />
+        <result column="remark" property="remark" />
+        <result column="outsource_no" property="outsourceNo" />
+        <result column="outsource_name" property="outsourceName" />
+        <result column="contacts" property="contacts" />
+        <result column="mobile" property="mobile" />
+        <result column="address" property="address" />
+        <result column="require_date" property="requireDate" />
+        <result column="outsource_cost" property="outsourceCost" />
+        <result column="director" property="director" />
+        <result column="item" property="item" />
+        <result column="requires" property="requires" />
+        <result column="create_user_id" property="createUserId" />
+        <result column="create_user_name" property="createUserName" />
+        <result column="approval_status" property="approvalStatus" />
+        <result column="process_id" property="processId" />
+        <result column="create_time" property="createTime" />
+        <result column="update_time" property="updateTime" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, protocol_no, project_name, lab_code, group_code, outsourcer_id, remark, outsource_no, outsource_name, contacts, mobile, address, require_date, outsource_cost, director, item, requires, create_user_id, create_user_name, approval_status, process_id, create_time, update_time
+    </sql>
+
+    <select id="selectMaxProtocolNo" resultType="java.lang.Long">
+        SELECT IFNULL(max(RIGHT(protocol_no, 3)), 0) from biz_business_outsource_protocol
+    </select>
+
+    <select id="selectBatchForApprovalList" resultMap="BaseResultMap">
+        SELECT *
+        FROM biz_business_outsource_protocol
+        WHERE 1=1
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
+            and approval_status = #{request.approvalStatus}
+        </if>
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
+            and create_user_id = #{request.createUserId}
+        </if>
+        <if test="request != null and request.protocolNo != null and request.protocolNo !=''">
+            and protocol_no like concat('%',#{request.protocolNo},'%')
+        </if>
+        <if test="request != null and request.outsourcerName != null and request.outsourcerName !=''">
+            and outsourcer_name like concat('%',#{request.outsourcerName},'%')
+        </if>
+        <if test="request != null and request.applicantName != null and request.applicantName !=''">
+            and create_user_name like concat('%',#{request.applicantName},'%')
+        </if>
+        <if test="request != null and request.applicantTimeStart != null and request.applicantTimeStart !=''">
+            and create_time &gt;= #{request.applicantTimeStart}
+        </if>
+        <if test="request != null and request.applicantTimeEnd != null and request.applicantTimeEnd !=''">
+            and create_time &lt;= #{request.applicantTimeEnd}
+        </if>
+        <if test="businessKeys != null">
+            and id in
+            <foreach collection="businessKeys" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
+        ORDER BY create_time DESC
+    </select>
+</mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourcerInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourcerInfoMapper.xml
index 510a80b..3049b54 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourcerInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourcerInfoMapper.xml
@@ -7,6 +7,8 @@
         <id column="id" property="id" />
         <result column="outsourcer_no" property="outsourcerNo" />
         <result column="outsourcer_name" property="outsourcerName" />
+        <result column="lab_code" property="labCode" />
+        <result column="group_code" property="groupCode" />
         <result column="outsourcer_brief_name" property="outsourcerBriefName" />
         <result column="outsourcer_size" property="outsourcerSize" />
         <result column="business_size" property="businessSize" />
@@ -55,32 +57,32 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, outsourcer_no, outsourcer_name, outsourcer_brief_name, outsourcer_size, business_size, grade, evaluation, tax_number, bank_account, bank_name, bank_account_number, postal_code, director, phone, fax, mobile, email, website, address_country, address_province, address_city, address_area, full_address, address_country_name, address_province_name, address_city_name, address_area_name, invoice_country, invoice_province, invoice_city, invoice_area, invoice_full_address, invoice_country_name, invoice_province_name, invoice_city_name, invoice_area_name, business_scope, business_content, minio_file_name, approval_status, process_id, remark, create_user_id, create_user_name, create_time, update_time
+        id, outsourcer_no, outsourcer_name, lab_code, group_code, outsourcer_brief_name, outsourcer_size, business_size, grade, evaluation, tax_number, bank_account, bank_name, bank_account_number, postal_code, director, phone, fax, mobile, email, website, address_country, address_province, address_city, address_area, full_address, address_country_name, address_province_name, address_city_name, address_area_name, invoice_country, invoice_province, invoice_city, invoice_area, invoice_full_address, invoice_country_name, invoice_province_name, invoice_city_name, invoice_area_name, business_scope, business_content, minio_file_name, approval_status, process_id, remark, create_user_id, create_user_name, create_time, update_time
     </sql>
 
     <select id="selectBatchForApprovalList" resultMap="BaseResultMap">
         SELECT *
         FROM biz_business_outsourcer_info
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.outsourcerNo != null and request.outsourcerNo !=''">
+        <if test="request != null and request.outsourcerNo != null and request.outsourcerNo !=''">
             and outsourcer_no like concat('%',#{request.outsourcerNo},'%')
         </if>
-        <if test="request.outsourcerName != null and request.outsourcerName !=''">
+        <if test="request != null and request.outsourcerName != null and request.outsourcerName !=''">
             and outsourcer_name like concat('%',#{request.outsourcerName},'%')
         </if>
-        <if test="request.director != null and request.director !=''">
+        <if test="request != null and request.director != null and request.director !=''">
             and director like concat('%',#{request.director},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
@@ -93,6 +95,6 @@
     </select>
 
     <select id="selectMaxNo" resultType="java.lang.Long">
-        SELECT IFNULL(max(RIGHT(outsourcer_no, 12)), 0) from biz_business_outsourcer_info
+        SELECT IFNULL(max(RIGHT(outsourcer_no, 3)), 0) from biz_business_outsourcer_info
     </select>
 </mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessSiteExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessSiteExecutiveInfoMapper.xml
index 135c5d0..3c5ae79 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessSiteExecutiveInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessSiteExecutiveInfoMapper.xml
@@ -38,25 +38,25 @@
         FROM biz_business_site_executive_info bsei
         LEFT JOIN biz_resource_customer_info rci ON bsei.customer_id = rci.id
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and bsei.approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and bsei.create_user_id = #{request.createUserId}
         </if>
-        <if test="request.siteExecutiveNo != null and request.siteExecutiveNo !=''">
+        <if test="request != null and request.siteExecutiveNo != null and request.siteExecutiveNo !=''">
             and bsei.site_executive_no like concat('%',#{request.siteExecutiveNo},'%')
         </if>
-        <if test="request.customerName != null and request.customerName !=''">
+        <if test="request != null and request.customerName != null and request.customerName !=''">
             and rci.outsourcer_name like concat('%',#{request.customerName},'%')
         </if>
-        <if test="request.applyName != null and request.applyName !=''">
+        <if test="request != null and request.applyName != null and request.applyName !=''">
             and bsei.apply_name like concat('%',#{request.applyName},'%')
         </if>
-        <if test="request.applyTimeStart != null and request.applyTimeStart !=''">
+        <if test="request != null and request.applyTimeStart != null and request.applyTimeStart !=''">
             and bsei.apply_time &gt;= #{request.applyTimeStart}
         </if>
-        <if test="request.applyTimeEnd != null and request.applyTimeEnd !=''">
+        <if test="request != null and request.applyTimeEnd != null and request.applyTimeEnd !=''">
             and bsei.apply_time &lt;= #{request.applyTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml
index 84d9e2a..6bd38a9 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml
@@ -105,6 +105,12 @@
         <if test="request.isUrgent != null and request.isUrgent !=''">
             AND bo.is_urgent = #{request.isUrgent}
         </if>
+        <if test="request.ids != null">
+            and blei.id in
+            <foreach collection="request.ids" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
         ORDER BY blei.update_time DESC
     </select>
 
@@ -137,6 +143,12 @@
         <if test="request.isUrgent != null and request.isUrgent !=''">
             AND bo.is_urgent = #{request.isUrgent}
         </if>
+        <if test="request.ids != null">
+            and blei.id in
+            <foreach collection="request.ids" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
         ORDER BY blei.update_time DESC
     </select>
 
diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardInfoMapper.xml
index 1a5551b..2ed8d17 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardInfoMapper.xml
@@ -45,12 +45,6 @@
         FROM biz_equipment_standard_info besi
         LEFT JOIN biz_equipment_standard_technology_relation bestr ON besi.standard_no = bestr.standard_no
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
-            and besi.approval_status = #{request.approvalStatus}
-        </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
-            and besi.create_user_id = #{request.createUserId}
-        </if>
         <if test="request.standardName != null and request.standardName !=''">
             and besi.standard_name like concat('%',#{request.standardName},'%')
         </if>
diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardTechnologyRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardTechnologyRelationMapper.xml
index fc7e16c..cd03c8c 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardTechnologyRelationMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardTechnologyRelationMapper.xml
@@ -6,6 +6,7 @@
     <resultMap id="BaseResultMap" type="com.casic.missiles.model.equipment.BizEquipmentStandardTechnologyRelation">
         <id column="id" property="id" />
         <result column="technology_file_id" property="technologyFileId" />
+        <result column="technology_file_no" property="technologyFileNo" />
         <result column="technology_file_name" property="technologyFileName" />
         <result column="standard_id" property="standardId" />
         <result column="standard_no" property="standardNo" />
@@ -14,7 +15,7 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, technology_file_id, technology_file_name, standard_id, remark
+        id, technology_file_id, technology_file_no, technology_file_name, standard_id, remark
     </sql>
 
 </mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceAuthorizeOrderMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceAuthorizeOrderMapper.xml
index ac5176c..554fe65 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceAuthorizeOrderMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceAuthorizeOrderMapper.xml
@@ -32,22 +32,22 @@
         SELECT *
         FROM biz_resource_authorize_order
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.orderNo != null and request.orderNo !=''">
+        <if test="request != null and request.orderNo != null and request.orderNo !=''">
             and order_no like concat('%',#{request.orderNo},'%')
         </if>
-        <if test="request.createUserName != null and request.createUserName !=''">
+        <if test="request != null and request.createUserName != null and request.createUserName !=''">
             and create_user_name like concat('%',#{request.createUserName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerExamineFormMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerExamineFormMapper.xml
index ab242f6..af7f98f 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerExamineFormMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerExamineFormMapper.xml
@@ -41,28 +41,28 @@
         SELECT *
         FROM biz_resource_customer_examine_form
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.formNo != null and request.formNo !=''">
+        <if test="request != null and request.formNo != null and request.formNo !=''">
             and form_no like concat('%',#{request.formNo},'%')
         </if>
-        <if test="request.labCode != null and request.labCode !=''">
+        <if test="request != null and request.labCode != null and request.labCode !=''">
             and lab_code like concat('%',#{request.labCode},'%')
         </if>
-        <if test="request.groupCode != null and request.groupCode !=''">
+        <if test="request != null and request.groupCode != null and request.groupCode !=''">
             and group_code like concat('%',#{request.groupCode},'%')
         </if>
-        <if test="request.createUserName != null and request.createUserName !=''">
+        <if test="request != null and request.createUserName != null and request.createUserName !=''">
             and create_user_name like concat('%',#{request.createUserName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerInfoMapper.xml
index fa8ffbc..06a2798 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerInfoMapper.xml
@@ -33,25 +33,25 @@
         SELECT *
         FROM biz_resource_customer_info
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.customerNo != null and request.customerNo !=''">
+        <if test="request != null and request.customerNo != null and request.customerNo !=''">
             and customer_no like concat('%',#{request.customerNo},'%')
         </if>
-        <if test="request.customerName != null and request.customerName !=''">
+        <if test="request != null and request.customerName != null and request.customerName !=''">
             and customer_name like concat('%',#{request.customerName},'%')
         </if>
-        <if test="request.contacts != null and request.contacts !=''">
+        <if test="request != null and request.contacts != null and request.contacts !=''">
             and contacts like concat('%',#{request.contacts},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerSuggestFormMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerSuggestFormMapper.xml
index 28f5bb2..1806662 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerSuggestFormMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerSuggestFormMapper.xml
@@ -33,28 +33,28 @@
         SELECT *
         FROM biz_resource_customer_suggest_form
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.formNo != null and request.formNo !=''">
+        <if test="request != null and request.formNo != null and request.formNo !=''">
             and form_no like concat('%',#{request.formNo},'%')
         </if>
-        <if test="request.customerName != null and request.customerName !=''">
+        <if test="request != null and request.customerName != null and request.customerName !=''">
             and customer_name like concat('%',#{request.customerName},'%')
         </if>
-        <if test="request.customerDeptName != null and request.customerDeptName !=''">
+        <if test="request != null and request.customerDeptName != null and request.customerDeptName !=''">
             and customer_dept_name like concat('%',#{request.customerDeptName},'%')
         </if>
-        <if test="request.createUserName != null and request.createUserName !=''">
+        <if test="request != null and request.createUserName != null and request.createUserName !=''">
             and create_user_name like concat('%',#{request.createUserName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSealUseNoteMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSealUseNoteMapper.xml
index ab37bc1..b02bb33 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSealUseNoteMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSealUseNoteMapper.xml
@@ -29,32 +29,32 @@
     </sql>
 
     <select id="selectBatchForApprovalList" resultMap="BaseResultMap">
-        SELECT *
+        SELECT brsun.*, brsi.seal_name, brsi.seal_type, brsi.approver_name
         FROM biz_resource_seal_use_note brsun
         JOIN biz_resource_seal_info brsi ON brsun.seal_id = brsi.id
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and brsun.approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and brsun.create_user_id = #{request.createUserId}
         </if>
-        <if test="request.sealName != null and request.sealName !=''">
+        <if test="request != null and request.sealName != null and request.sealName !=''">
             and brsi.seal_name like concat('%',#{request.sealName},'%')
         </if>
-        <if test="request.sealType != null and request.sealType !=''">
+        <if test="request != null and request.sealType != null and request.sealType !=''">
             and brsi.seal_type = #{request.sealType}
         </if>
-        <if test="request.applyDeptName != null and request.applyDeptName !=''">
+        <if test="request != null and request.applyDeptName != null and request.applyDeptName !=''">
             and brsun.apply_dept_name like concat('%',#{request.applyDeptName},'%')
         </if>
-        <if test="request.applyUserName != null and request.applyUserName !=''">
+        <if test="request != null and request.applyUserName != null and request.applyUserName !=''">
             and brsun.apply_user_name like concat('%',#{request.applyUserName},'%')
         </if>
-        <if test="request.applyTimeStart != null and request.applyTimeStart !=''">
+        <if test="request != null and request.applyTimeStart != null and request.applyTimeStart !=''">
             and brsun.apply_time &gt;= #{request.applyTimeStart}
         </if>
-        <if test="request.applyTimeEnd != null and request.applyTimeEnd !=''">
+        <if test="request != null and request.applyTimeEnd != null and request.applyTimeEnd !=''">
             and brsun.apply_time &lt;= #{request.applyTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml
index 119bf7d..4f8392a 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml
@@ -31,6 +31,12 @@
         <if test="request.deptName != null and request.deptName !=''">
             and brsi.dept_name like concat('%',#{request.deptName},'%')
         </if>
+        <if test="request.ids != null">
+            and brsv.id in
+            <foreach collection="request.ids" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
         ORDER BY brsv.grant_date DESC
     </select>
 
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSupplierInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSupplierInfoMapper.xml
index fe8d399..e8ce7ef 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSupplierInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSupplierInfoMapper.xml
@@ -48,28 +48,28 @@
         SELECT *
         FROM biz_resource_supplier_info
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.supplierNo != null and request.supplierNo !=''">
+        <if test="request != null and request.supplierNo != null and request.supplierNo !=''">
             and supplier_no like concat('%',#{request.supplierNo},'%')
         </if>
-        <if test="request.supplierName != null and request.supplierName !=''">
+        <if test="request != null and request.supplierName != null and request.supplierName !=''">
             and supplier_name like concat('%',#{request.supplierName},'%')
         </if>
-        <if test="request.director != null and request.director !=''">
+        <if test="request != null and request.director != null and request.director !=''">
             and director like concat('%',#{request.director},'%')
         </if>
-        <if test="request.supplierType != null and request.supplierType !=''">
+        <if test="request != null and request.supplierType != null and request.supplierType !=''">
             and supplier_type = #{request.supplierType}
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/EnvLocationInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/EnvLocationInfoMapper.xml
new file mode 100644
index 0000000..68bcf10
--- /dev/null
+++ b/casic-metering-dao/src/main/resources/mapper/resource/EnvLocationInfoMapper.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.mapper.resource.EnvLocationInfoMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.resource.EnvLocationInfo">
+        <id column="id" property="id" />
+        <result column="location_no" property="locationNo" />
+        <result column="location_name" property="locationName" />
+        <result column="location_position" property="locationPosition" />
+        <result column="create_user_id" property="createUserId" />
+        <result column="create_user" property="createUser" />
+        <result column="create_time" property="createTime" />
+        <result column="update_time" property="updateTime" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, location_no, location_name, location_position, create_user_id, create_user, create_time, update_time
+    </sql>
+
+    <select id="selectLocationListPage" resultType="com.casic.missiles.dto.resource.environment.LocationListResponse">
+        SELECT *
+        FROM env_location_info
+        WHERE 1=1
+        <if test="request.locationNo != null and request.locationNo !=''">
+            AND location_no LIKE concat('%',#{request.locationNo},'%')
+        </if>
+        <if test="request.locationName != null and request.locationName !=''">
+            AND location_name LIKE concat('%',#{request.locationName},'%')
+        </if>
+        ORDER BY create_time DESC
+    </select>
+
+</mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml
index b28c18f..8854047 100644
--- a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml
@@ -11,7 +11,6 @@
         <result column="sign_desc" property="signDesc" />
         <result column="sign_director" property="signDirector" />
         <result column="sign_user_id" property="signUserId" />
-        <result column="sign_type" property="signType" />
         <result column="minio_file_name" property="minioFileName" />
         <result column="create_time" property="createTime" />
         <result column="update_time" property="updateTime" />
@@ -28,7 +27,6 @@
         <result column="sign_name" property="signName" />
         <result column="sign_desc" property="signDesc" />
         <result column="sign_director" property="signDirector" />
-        <result column="sign_type" property="signType" />
         <result column="sign_user_id" property="signUserId" />
         <result column="minio_file_name" property="minioFileName" />
         <result column="create_time" property="createTime" />
@@ -62,4 +60,58 @@
         JOIN system_sign_user_relation ssur ON ss.id = ssur.sign_id
         WHERE ssur.user_id = #{userId}
     </select>
+
+    <select id="selectSignListPage" resultMap="BaseResultMap">
+        SELECT ss.*, sd.SIMPLE_NAME AS deptName
+        FROM system_sign ss
+        LEFT JOIN sys_user su ON su.id = ss.sign_user_id
+        LEFT JOIN sys_dept sd ON sd.id = su.dept_id
+        WHERE 1=1
+        <if test="request.signNo != null and request.signNo !=''">
+            AND ss.sign_no LIKE concat('%',#{request.signNo},'%')
+        </if>
+        <if test="request.signName != null and request.signName !=''">
+            AND ss.sign_name LIKE concat('%',#{request.signName},'%')
+        </if>
+        <if test="request.signDirector != null and request.signDirector !=''">
+            AND ss.sign_director LIKE concat('%',#{request.signDirector},'%')
+        </if>
+        <if test="request.signUserId != null and request.signUserId !=''">
+            AND ss.sign_user_id = #{request.signUserId}
+        </if>
+        <if test="request.createStartTime != null and request.createStartTime !=''">
+            AND DATE_FORMAT(ss.create_time,'%Y-%m-%d') &gt;= DATE_FORMAT(#{request.createStartTime},'%Y-%m-%d')
+        </if>
+        <if test="request.createEndTime != null and request.createEndTime !=''">
+            AND DATE_FORMAT(ss.create_time,'%Y-%m-%d')  &lt;= DATE_FORMAT(#{request.createEndTime},'%Y-%m-%d')
+        </if>
+        ORDER BY ss.create_time DESC
+    </select>
+
+    <select id="selectSignList" resultMap="BaseResultMap">
+        SELECT ss.*, sd.SIMPLE_NAME AS deptName
+        FROM system_sign ss
+        LEFT JOIN sys_user su ON su.id = ss.sign_user_id
+        LEFT JOIN sys_dept sd ON sd.id = su.dept_id
+        WHERE 1=1
+        <if test="request.signNo != null and request.signNo !=''">
+            AND ss.sign_no LIKE concat('%',#{request.signNo},'%')
+        </if>
+        <if test="request.signName != null and request.signName !=''">
+            AND ss.sign_name LIKE concat('%',#{request.signName},'%')
+        </if>
+        <if test="request.signDirector != null and request.signDirector !=''">
+            AND ss.sign_director LIKE concat('%',#{request.signDirector},'%')
+        </if>
+        <if test="request.signUserId != null and request.signUserId !=''">
+            AND ss.sign_user_id = #{request.signUserId}
+        </if>
+        <if test="request.createStartTime != null and request.createStartTime !=''">
+            AND DATE_FORMAT(ss.create_time,'%Y-%m-%d') &gt;= DATE_FORMAT(#{request.createStartTime},'%Y-%m-%d')
+        </if>
+        <if test="request.createEndTime != null and request.createEndTime !=''">
+            AND DATE_FORMAT(ss.create_time,'%Y-%m-%d')  &lt;= DATE_FORMAT(#{request.createEndTime},'%Y-%m-%d')
+        </if>
+        ORDER BY ss.create_time DESC
+    </select>
 </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 515050a..60f530b 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
@@ -47,8 +47,8 @@
     String STORAGE_LOCATION = "bizStorageLocation";
     //计量专业
     String MEASURE_MAJOR = "bizMeasureMajor";
-    //管理状态
-    String MANAGER_STATE = "bizManagerState";
+    //标准装置管理状态
+    String STANDARD_MANAGER_STATE = "bizStandardManagerState";
 
     /**
      * 资源管理 字典code
@@ -95,8 +95,6 @@
     String MEASURE_STATUS = "measureStatus";
     //检定方式
     String MEASURE_TYPE = "measureType";
-    //标识打印标志类型
-    String IDENTIFY_PRINT_TYPE = "bizBusinessIdentify";
     //变更类型
     String REPORT_CHANGE_TYPE = "bizCertChangeType";
     //规模类型
@@ -111,19 +109,24 @@
     String MEASURE_CATEGORY = "measureCategory";
     //检定结果
     String MEASURE_RESULT = "measureResult";
+    //分包原因
+    String OUTSOURCE_REASON = "outsourceReason";
+
+    /**
+     * 系统管理
+     */
+    String TEMPLATE_TYPE = "templateType";
+
 
     /**
      * 标准装置 字典code
      */
     //类别
     String STANDARD_CATEGORY = "standardCategory";
-    //管理状态
-    String STANDARD_MANAGER_STATE = "standardManagerState";
     //标准等级
     String STANDARD_LEVEL = "standardLevel";
     //传递范围
     String STANDARD_TRANSMIT_RANGE = "transmitRange";
-
     //资本来源
     String CAPITAL_SOURCE = "capitalSource";
     //标准装置-申请类型
@@ -148,8 +151,6 @@
     String CERTIFICATE_CLASS = "certificationClass";
     //证书管理-检校专业
     String CALIBRATION_MAJOR = "calibrationMajor";
-    //分包原因
-    String OUTSOURCE_REASON = "outsourceReason";
 
     /**
      * 工作台
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/BaseApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/BaseApprovalListRequest.java
index 73c12c1..80d7424 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/BaseApprovalListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/BaseApprovalListRequest.java
@@ -6,6 +6,7 @@
 
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotEmpty;
+import java.util.List;
 
 /**
  * @Description:
@@ -19,14 +20,14 @@
      * 表单id
      */
     @NotBlank(message = "表单id不能为空")
-    @ApiModelProperty(value = "表单id（流程定义对应的表单id，等价于业务id）", dataType = "String")
+    @ApiModelProperty(value = "表单id（流程定义对应的表单id，等价于业务id），导出接口不用传", dataType = "String")
     private String formId;
 
     /**
      * 审批状态类型，对应ApprovalStatusEnum
      */
     @NotEmpty(message = "审批状态类型不能为空")
-    @ApiModelProperty(value = "审批状态类型code", dataType = "String")
+    @ApiModelProperty(value = "审批状态类型code，导出接口不用传", dataType = "String")
     private String approvalStatus;
 
     @ApiModelProperty(hidden = true)
@@ -34,4 +35,7 @@
 
     @ApiModelProperty(hidden = true)
     private Long createUserId;
+
+    @ApiModelProperty(value = "导出ids", dataType = "List")
+    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificatePrintApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificatePrintApprovalListRequest.java
index b93d1c9..3cc2f4e 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificatePrintApprovalListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificatePrintApprovalListRequest.java
@@ -5,8 +5,6 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import java.util.List;
-
 /**
  * @Description:
  * @Author: wangpeng
@@ -38,7 +36,4 @@
 
     @ApiModelProperty(value = "创建结束时间", dataType = "String")
     private String createTimeEnd;
-
-    @ApiModelProperty(value = "导出ids", dataType = "List")
-    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportApprovalListRequest.java
index 4f7a038..c115847 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportApprovalListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportApprovalListRequest.java
@@ -5,8 +5,6 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import java.util.List;
-
 /**
  * @Description:
  * @Author: wangpeng
@@ -15,6 +13,8 @@
 @ApiModel
 @Data
 public class CertificateReportApprovalListRequest extends BaseApprovalListRequest {
+    @ApiModelProperty(value = "委托方id", dataType = "String")
+    private Long customerId;
 
     @ApiModelProperty(value = "证书报告编号", dataType = "String")
     private String certificateReportNo;
@@ -37,6 +37,4 @@
     @ApiModelProperty(value = "检校结束时间", dataType = "String")
     private String calibrationTimeEnd;
 
-    @ApiModelProperty(value = "导出ids", dataType = "List")
-    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/identify/IdentifyListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/identify/IdentifyListRequest.java
index 1b87ae6..f019203 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/identify/IdentifyListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/identify/IdentifyListRequest.java
@@ -4,6 +4,8 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * @Description:
  * @Author: wangpeng
@@ -26,4 +28,7 @@
 
     @ApiModelProperty(value = "打印结束时间", dataType = "String")
     private String createTimeEnd;
+
+    @ApiModelProperty(value = "导出ids", dataType = "List")
+    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListRequest.java
index 1264883..62415fb 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListRequest.java
@@ -7,6 +7,7 @@
 import lombok.Data;
 
 import javax.validation.constraints.NotBlank;
+import java.util.List;
 
 @Data
 @ApiModel
@@ -37,4 +38,6 @@
     @ApiModelProperty(value = "是否加急（1是0否null全部）", dataType = "Integer")
     private String isUrgent;
 
+    @ApiModelProperty(value = "导出ids", dataType = "List")
+    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListRequest.java
index 5201d7b..499760a 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListRequest.java
@@ -17,6 +17,9 @@
     @ApiModelProperty(value = "任务单编号", dataType = "String")
     private String orderNo;
 
+    @ApiModelProperty(value = "委托方id", dataType = "Long")
+    private Long customerId;
+
     @ApiModelProperty(value = "委托方名称", dataType = "String")
     private String customerName;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OrderSampleDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OrderSampleDTO.java
new file mode 100644
index 0000000..796edc0
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OrderSampleDTO.java
@@ -0,0 +1,19 @@
+package com.casic.missiles.dto.business.outsource;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/8/24 11:38
+ */
+@ApiModel
+@Data
+public class OrderSampleDTO {
+    @ApiModelProperty(value = "任务单id", dataType = "Long")
+    private Long orderId;
+    @ApiModelProperty(value = "受检设备id", dataType = "Long")
+    private Long sampleId;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceAssessApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceAssessApprovalListRequest.java
new file mode 100644
index 0000000..9a930c3
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceAssessApprovalListRequest.java
@@ -0,0 +1,30 @@
+package com.casic.missiles.dto.business.outsource;
+
+import com.casic.missiles.dto.BaseApprovalListRequest;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/8/24 11:01
+ */
+@ApiModel
+@Data
+public class OutsourceAssessApprovalListRequest extends BaseApprovalListRequest {
+    @ApiModelProperty(value = "评审表编号", dataType = "String")
+    private String projectNo;
+
+    @ApiModelProperty(value = "分包机构名称", dataType = "String")
+    private String outsourcerName;
+
+    @ApiModelProperty(value = "申请人", dataType = "String")
+    private String applicantName;
+
+    @ApiModelProperty(value = "申请时间开始", dataType = "String")
+    private String applicantTimeStart;
+
+    @ApiModelProperty(value = "申请时间结束", dataType = "String")
+    private String applicantTimeEnd;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceAssessSaveResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceAssessSaveResponse.java
new file mode 100644
index 0000000..8bf9aad
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceAssessSaveResponse.java
@@ -0,0 +1,20 @@
+package com.casic.missiles.dto.business.outsource;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/8/14 16:17
+ */
+@ApiModel
+@Data
+public class OutsourceAssessSaveResponse {
+    @ApiModelProperty(value = "主键id", dataType = "Long")
+    private Long id;
+
+    @ApiModelProperty(value = "编号", dataType = "String")
+    private String projectNo;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProtocolApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProtocolApprovalListRequest.java
new file mode 100644
index 0000000..0f32331
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProtocolApprovalListRequest.java
@@ -0,0 +1,30 @@
+package com.casic.missiles.dto.business.outsource;
+
+import com.casic.missiles.dto.BaseApprovalListRequest;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/8/24 15:01
+ */
+@ApiModel
+@Data
+public class OutsourceProtocolApprovalListRequest extends BaseApprovalListRequest {
+    @ApiModelProperty(value = "协议书编号", dataType = "String")
+    private String protocolNo;
+
+    @ApiModelProperty(value = "分包方名称", dataType = "String")
+    private String outsourcerName;
+
+    @ApiModelProperty(value = "申请人", dataType = "String")
+    private String applicantName;
+
+    @ApiModelProperty(value = "申请时间开始", dataType = "String")
+    private String applicantTimeStart;
+
+    @ApiModelProperty(value = "申请时间结束", dataType = "String")
+    private String applicantTimeEnd;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProtocolSaveResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProtocolSaveResponse.java
new file mode 100644
index 0000000..e324967
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProtocolSaveResponse.java
@@ -0,0 +1,20 @@
+package com.casic.missiles.dto.business.outsource;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/8/14 16:17
+ */
+@ApiModel
+@Data
+public class OutsourceProtocolSaveResponse {
+    @ApiModelProperty(value = "主键id", dataType = "Long")
+    private Long id;
+
+    @ApiModelProperty(value = "编号", dataType = "String")
+    private String protocolNo;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveApprovalListRequest.java
index f29f4e4..7047c28 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveApprovalListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveApprovalListRequest.java
@@ -5,8 +5,6 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import java.util.List;
-
 /**
  * @Description: 现场检测审批列表请求实体
  * @Author: wangpeng
@@ -30,7 +28,4 @@
     @ApiModelProperty(value = "申请时间结束", dataType = "String")
     private String applyTimeEnd;
 
-    @ApiModelProperty(value = "导出ids", dataType = "List")
-    private List<Long> ids;
-
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveDetailResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveDetailResponse.java
index 1f28752..394c934 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveDetailResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveDetailResponse.java
@@ -12,6 +12,18 @@
     @ApiModelProperty(value = "id，更新/删除使用参数", dataType = "Long")
     private Long id;
 
+    @ApiModelProperty(value = "实验室代码(字典code)", dataType = "String")
+    private String labCode;
+
+    @ApiModelProperty(value = "实验室代码(字典value)", dataType = "String")
+    private String labCodeName;
+
+    @ApiModelProperty(value = "组别代码(字典code)", dataType = "String")
+    private String groupCode;
+
+    @ApiModelProperty(value = "组别代码(字典value)", dataType = "String")
+    private String groupCodeName;
+
     @ApiModelProperty(value = "审批编号", dataType = "String")
     private String siteExecutiveNo;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/environment/LocationListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/environment/LocationListRequest.java
new file mode 100644
index 0000000..13d03c3
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/environment/LocationListRequest.java
@@ -0,0 +1,20 @@
+package com.casic.missiles.dto.resource.environment;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/6/8 13:56
+ */
+@ApiModel
+@Data
+public class LocationListRequest {
+    @ApiModelProperty(value = "地点编号", dataType = "String")
+    private String locationNo;
+
+    @ApiModelProperty(value = "地点名称", dataType = "String")
+    private String locationName;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/environment/LocationListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/environment/LocationListResponse.java
new file mode 100644
index 0000000..4c531af
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/environment/LocationListResponse.java
@@ -0,0 +1,78 @@
+package com.casic.missiles.dto.resource.environment;
+
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
+import com.baomidou.mybatisplus.annotation.TableField;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description: 地点列表响应实体
+ * @Author: wangpeng
+ * @Date: 2023/6/8 13:53
+ */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
+@ApiModel
+@Data
+public class LocationListResponse {
+    @ApiModelProperty(value = "主键id", dataType = "Long")
+    private Long id;
+
+    /**
+     * 地点编号
+     */
+    @ExcelProperty("地点编号")
+    @ApiModelProperty(value = "地点编号", dataType = "String")
+    private String locationNo;
+
+    /**
+     * 地点名称
+     */
+    @ExcelProperty("地点名称")
+    @ApiModelProperty(value = "地点名称", dataType = "String")
+    private String locationName;
+
+    /**
+     * 地点位置
+     */
+    @ExcelProperty("地点位置")
+    @ApiModelProperty(value = "地点位置", dataType = "String")
+    private String locationPosition;
+
+    /**
+     * 创建人id
+     */
+    @ApiModelProperty(value = "创建人id", dataType = "Long")
+    private Long createUserId;
+
+    /**
+     * 创建人
+     */
+    @ExcelProperty("创建人")
+    @ApiModelProperty(value = "创建人", dataType = "String")
+    @TableField("create_user")
+    private String createUser;
+
+    /**
+     * 创建时间
+     */
+    @ExcelProperty("创建时间")
+    @ApiModelProperty(value = "创建时间", dataType = "String")
+    private String createTime;
+
+    /**
+     * 更新时间
+     */
+    @ApiModelProperty(value = "更新时间", dataType = "String")
+    private String updateTime;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertRequest.java
index 9a7f6c6..c827915 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertRequest.java
@@ -4,6 +4,8 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * @Description:
  * @Author: wangpeng
@@ -16,4 +18,7 @@
     private String name;
     @ApiModelProperty(value = "部门名", dataType = "String")
     private String deptName;
+
+    @ApiModelProperty(value = "导出ids", dataType = "List")
+    private List<Long> ids;
 }

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java
index bb0c50f..13a699b 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java
@@ -12,6 +12,7 @@
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.IGeneralApprovalService;
+import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
@@ -19,6 +20,7 @@
 import org.springframework.web.bind.annotation.RequestBody;
 
 import javax.validation.Valid;
+import java.util.List;
 import java.util.Objects;
 
 /**
@@ -117,4 +119,17 @@
         }
         return baseApprovalService.failUpdate(request);
     }
+
+    public List<O> exportList(@RequestBody @Valid R request) throws Exception {
+        List<O> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = baseApprovalService.listExportByIds(request.getIds());
+        } else {
+            list = baseApprovalService.listExport(request);
+        }
+        for (O record : list) {
+            DictCodeUtils.convertDictCodeToName(record);
+        }
+        return list;
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java
index 8a90961..d775831 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java
@@ -5,6 +5,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.business.certificate.CertificateChangeApplyApprovalListRequest;
 import com.casic.missiles.dto.business.certificate.CertificateChangeApplySaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessCertificateChangeApply;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
@@ -20,6 +21,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -48,4 +50,12 @@
         }
         return changeApplyService.saveChangeApply(request);
     }
+
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody CertificateChangeApplyApprovalListRequest request) throws Exception {
+        List<BizBusinessCertificateChangeApply> list = super.exportList(request);
+        super.exportExcel(BizBusinessCertificateChangeApply.class, list, ExportEnum.CERTIFICATE_CHANGE_APPLY.getSheetName());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java
index 5fc4b07..af8230e 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java
@@ -9,6 +9,7 @@
 import com.casic.missiles.dto.business.certificate.CertificatePrintApprovalListRequest;
 import com.casic.missiles.dto.business.certificate.CertificatePrintListResponse;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.enums.business.CertificatePrintStatusEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessCertificatePrintLog;
@@ -18,10 +19,16 @@
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.io.IOException;
+import java.util.List;
 import java.util.Objects;
 
 /**
@@ -98,4 +105,16 @@
         });
         return certificatePrintService.certificatePrintLog(idDTO.getId());
     }
+
+    @ApiOperation("证书打印审批导出")
+    @PostMapping("/listExport")
+    public void exportList(@RequestBody CertificatePrintApprovalListRequest request) throws IOException {
+        List<CertificatePrintListResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = certificatePrintService.listByIds(request.getIds());
+        } else {
+            list = certificatePrintService.list(request);
+        }
+        super.exportExcel(CertificatePrintListResponse.class, list, ExportEnum.CERTIFICATE_PRINT.getSheetName());
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java
index 63b06dc..6b2efd5 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java
@@ -6,6 +6,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.business.certificate.CertificateReportApprovalListRequest;
 import com.casic.missiles.dto.business.certificate.CertificateReportSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessCertificateReport;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
@@ -21,6 +22,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -50,7 +52,7 @@
         return certificateReportService.saveCertificateReport(request);
     }
 
-    @ApiOperation("证书审批详情（基本信息）")
+    @ApiOperation("详情（基本信息）")
     @PostMapping("/detail")
     public ReturnDTO<BizBusinessCertificateReport> detail(@RequestBody @Valid BaseDetailRequest request, BindingResult bindingResult) throws Exception {
         if(bindingResult.hasErrors()){
@@ -59,4 +61,11 @@
         return certificateReportService.detail(request);
     }
 
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody CertificateReportApprovalListRequest request) throws Exception {
+        List<BizBusinessCertificateReport> list = super.exportList(request);
+        super.exportExcel(BizBusinessCertificateReport.class, list, ExportEnum.CERTIFICATE_REPORT.getSheetName());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java
index 46b26bd..57c0809 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java
@@ -10,20 +10,21 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.business.identify.IdentifyListRequest;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessIdentifyInfo;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.business.IBizBusinessIdentifyInfoService;
+import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import javax.validation.Valid;
+import java.util.List;
 import java.util.Objects;
 
 /**
@@ -57,16 +58,13 @@
         return identifyInfoService.addIdentify(identifyInfo);
     }
 
-    @ApiOperation("标识打印更新")
+    @ApiOperation("标识打印更新（更新打印时间）")
     @PostMapping("/update")
-    public ReturnDTO updateIdentify(@RequestBody @Valid BizBusinessIdentifyInfo identifyInfo, BindingResult bindingResult) {
-        Assert.isFalse(Objects.isNull(identifyInfo.getId()), () -> {
+    public ReturnDTO updateIdentify(@RequestBody @Valid IdDTO idDTO) {
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        Assert.isFalse(bindingResult.hasErrors(), () -> {
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        });
-        return identifyInfoService.updateIdentify(identifyInfo);
+        return identifyInfoService.updateIdentify(idDTO.getId());
     }
 
     @ApiOperation("标识打印删除")
@@ -77,4 +75,37 @@
         });
         return identifyInfoService.deleteIdentify(idDTO.getId());
     }
+
+    @ApiOperation("标识打印导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody @Valid IdentifyListRequest request, BindingResult bindingResult) throws Exception {
+        if (bindingResult.hasErrors()) {
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        List<BizBusinessIdentifyInfo> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = identifyInfoService.listByIds(request.getIds());
+        } else {
+            list = identifyInfoService.list(request);
+        }
+        for (BizBusinessIdentifyInfo record : list) {
+            DictCodeUtils.convertDictCodeToName(record);
+        }
+        super.exportExcel(BizBusinessIdentifyInfo.class, list, ExportEnum.IDENTIFY_EXPORT.getSheetName());
+    }
+
+
+    // TODO: 2023/8/23 查询设备信息，4个底部按钮查设备（按钮的作用就是前端用来调不同接口、用来区分中间即将展示的标识），前端弹窗选设备，在确定保存时前端根据底部按钮判断传入设备类型deviceType字典code
+    // TODO: 2023/8/23 接口：查受检设备（第1个按钮），查设备台账（后3个按钮同一接口），查询之后前端根据标志类型的不同加到中间页面时进行判断（按产品给的对应表）
+    // TODO: 2023/8/23 提供二维码接口，前端在加到中间页面时调用一下
+
+    @ApiOperation("设备二维码")
+    @PostMapping("/equipment/qrCode")
+    public ReturnDTO<String> equipmentQrCode(@RequestBody @Valid IdDTO idDTO) {
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return identifyInfoService.equipmentQrCode(idDTO.getId());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java
index 707be6e..7e0453d 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java
@@ -117,7 +117,7 @@
     }
 
     @ApiOperation("任务单导出")
-    @PostMapping("/export")
+    @PostMapping("/listExport")
     public void orderExport(@RequestBody @Valid OrderListRequest request, HttpServletResponse response) {
         businessOrderService.orderExport(request, response);
     }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java
index 529a6ce..51432be 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java
@@ -1,9 +1,28 @@
 package com.casic.missiles.controller.business;
 
+import com.casic.missiles.controller.GeneralApprovalController;
+import com.casic.missiles.dto.BaseApprovalSubmitRequest;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.business.outsource.OutsourceAssessApprovalListRequest;
+import com.casic.missiles.dto.business.outsource.OutsourceAssessSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
+import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.model.business.BizBusinessOutsourceAssess;
+import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
+import com.casic.missiles.service.IGeneralApprovalService;
+import com.casic.missiles.service.business.IBizBusinessOutsourceAssessService;
 import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.BindingResult;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.validation.Valid;
+import java.util.List;
+
 /**
  * <p>
  * 计量检定业务-分包管理-测试、校准或检定工作分包评审表 前端控制器
@@ -15,6 +34,27 @@
 @Api(tags = "分包管理-测试、校准或检定工作分包评审表")
 @RestController
 @RequestMapping("/business/outsource/assess")
-public class BizBusinessOutsourceAssessController {
+public class BizBusinessOutsourceAssessController extends GeneralApprovalController<BizBusinessOutsourceAssess, BizBusinessOutsourceAssess, OutsourceAssessApprovalListRequest, BaseApprovalSubmitRequest> {
+    @Autowired
+    private IBizBusinessOutsourceAssessService outsourceAssessService;
 
+    public BizBusinessOutsourceAssessController(IGeneralApprovalService<BizBusinessOutsourceAssess, BizBusinessOutsourceAssess, OutsourceAssessApprovalListRequest, BaseApprovalSubmitRequest> baseApprovalService) {
+        super(baseApprovalService);
+    }
+
+    @ApiOperation("草稿箱-保存")
+    @PostMapping("/save")
+    public ReturnDTO<OutsourceAssessSaveResponse> saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceAssess request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        return outsourceAssessService.saveOutsourceAssess(request);
+    }
+
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception {
+        List<BizBusinessOutsourceAssess> list = super.exportList(request);
+        super.exportExcel(BizBusinessOutsourceAssess.class, list, ExportEnum.OUTSOURCE_ASSESS.getSheetName());
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java
new file mode 100644
index 0000000..9adef18
--- /dev/null
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java
@@ -0,0 +1,60 @@
+package com.casic.missiles.controller.business;
+
+import com.casic.missiles.controller.GeneralApprovalController;
+import com.casic.missiles.dto.BaseApprovalSubmitRequest;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.business.outsource.OutsourceProtocolApprovalListRequest;
+import com.casic.missiles.dto.business.outsource.OutsourceProtocolSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
+import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.model.business.BizBusinessOutsourceProtocol;
+import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
+import com.casic.missiles.service.IGeneralApprovalService;
+import com.casic.missiles.service.business.IBizBusinessOutsourceProtocolService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.BindingResult;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.validation.Valid;
+import java.util.List;
+
+/**
+ * <p>
+ * 计量检定业务-分包管理-测试、校准或检定工作分包协议书 前端控制器
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-08-24
+ */
+@Api(tags = "分包管理-测试、校准或检定工作分包协议书")
+@RestController
+@RequestMapping("/business/outsource/protocol")
+public class BizBusinessOutsourceProtocolController extends GeneralApprovalController<BizBusinessOutsourceProtocol, BizBusinessOutsourceProtocol, OutsourceProtocolApprovalListRequest, BaseApprovalSubmitRequest> {
+    @Autowired
+    private IBizBusinessOutsourceProtocolService outsourceProtocolService;
+
+    public BizBusinessOutsourceProtocolController(IGeneralApprovalService<BizBusinessOutsourceProtocol, BizBusinessOutsourceProtocol, OutsourceProtocolApprovalListRequest, BaseApprovalSubmitRequest> baseApprovalService) {
+        super(baseApprovalService);
+    }
+
+    @ApiOperation("草稿箱-保存")
+    @PostMapping("/save")
+    public ReturnDTO<OutsourceProtocolSaveResponse> saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceProtocol request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        return outsourceProtocolService.saveOutsourceProtocol(request);
+    }
+
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody OutsourceProtocolApprovalListRequest request) throws Exception {
+        List<BizBusinessOutsourceProtocol> list = super.exportList(request);
+        super.exportExcel(BizBusinessOutsourceProtocol.class, list, ExportEnum.OUTSOURCE_PROTOCOL.getSheetName());
+    }
+}
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java
index 097f645..f0f0943 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java
@@ -17,7 +17,6 @@
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.IGeneralApprovalService;
 import com.casic.missiles.service.business.IBizBusinessOutsourcerInfoService;
-import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -71,19 +70,8 @@
 
     @ApiOperation("分包方导出")
     @PostMapping("/listExport")
-    public void export(@RequestBody @Valid OutsourcerInfoApprovalListRequest request, BindingResult bindingResult) throws Exception {
-        if (bindingResult.hasErrors()) {
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        }
-        List<BizBusinessOutsourcerInfo> list;
-        if (!CollectionUtils.isEmpty(request.getIds())) {
-            list = outsourcerInfoService.listByIds(request.getIds());
-        } else {
-            list = outsourcerInfoService.list(request);
-        }
-        for (BizBusinessOutsourcerInfo record : list) {
-            DictCodeUtils.convertDictCodeToName(record);
-        }
+    public void export(@RequestBody OutsourcerInfoApprovalListRequest request) throws Exception {
+        List<BizBusinessOutsourcerInfo> list = super.exportList(request);
         super.exportExcel(BizBusinessOutsourcerInfo.class, list, ExportEnum.OUTSOURCER_EXPORT.getSheetName());
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java
index c2cbf9f..0410918 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java
@@ -17,11 +17,9 @@
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.IGeneralApprovalService;
 import com.casic.missiles.service.business.IBizBusinessSiteExecutiveInfoService;
-import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -60,7 +58,7 @@
         return siteExecutiveInfoService.saveSiteExecutiveInfo(siteExecutiveInfo);
     }
 
-    @ApiOperation("现场检测详情")
+    @ApiOperation("详情")
     @PostMapping("/detail")
     public ReturnDTO<SiteExecutiveDetailResponse> siteExecutiveDetail(@RequestBody @Valid IdDTO idDTO) throws Exception {
         Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
@@ -69,21 +67,10 @@
         return ReturnUtil.success(siteExecutiveInfoService.detail(idDTO.getId()));
     }
 
-    @ApiOperation("现场检测导出")
+    @ApiOperation("导出")
     @PostMapping("/listExport")
-    public void export(@RequestBody @Valid SiteExecutiveApprovalListRequest request, BindingResult bindingResult) throws Exception {
-        if (bindingResult.hasErrors()) {
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        }
-        List<SiteExecutiveApprovalListResponse> list;
-        if (!CollectionUtils.isEmpty(request.getIds())) {
-            list = siteExecutiveInfoService.listInfoByIds(request.getIds());
-        } else {
-            list = siteExecutiveInfoService.listInfo(request);
-        }
-        for (SiteExecutiveApprovalListResponse record : list) {
-            DictCodeUtils.convertDictCodeToName(record);
-        }
+    public void export(@RequestBody SiteExecutiveApprovalListRequest request) throws Exception {
+        List<SiteExecutiveApprovalListResponse> list = super.exportList(request);
         super.exportExcel(SiteExecutiveApprovalListResponse.class, list, ExportEnum.SITE_EXECUTIVE_EXPORT.getSheetName());
     }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
index 7e793cd..a92e209 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
@@ -55,7 +55,7 @@
 
     @ApiOperation("设备收发列表导出")
     @PostMapping("/export")
-    public void exportList(@RequestBody @Valid SampleDispatchListRequest request) throws IOException {
+    public void exportList(@RequestBody SampleDispatchListRequest request) throws IOException {
         List<SampleDispatchListResponse> list;
         if (!CollectionUtils.isEmpty(request.getIds())) {
             list = dispatchService.listByIds(request.getIds());
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java
index cdc77fc..d120fd4 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java
@@ -7,6 +7,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.business.labExecutive.*;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.business.IBusinessLabExecutiveInfoService;
@@ -14,6 +15,7 @@
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.*;
 
@@ -32,7 +34,7 @@
     @Autowired
     private IBusinessLabExecutiveInfoService labExecutiveInfoService;
 
-    @ApiOperation("实验室检测-部门检测-查询各状态列表（待检测、检测中、检测完）")
+    @ApiOperation("实验室任务-查询各状态列表（待检测、检测中、检测完）")
     @PostMapping("/deptExecutive/List")
     public ReturnDTO<PageInfoBT<SampleLabExecutiveListResponse>> queryDeptExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
@@ -43,10 +45,19 @@
         return ReturnUtil.success(super.packForBT(labExecutiveInfoService.deptLabExecutiveListPage(page, labExecutiveListRequest)));
     }
 
-    /**
-     * 实验室检测-我的检测-查询各状态列表（待检测、检测中、检测完）
-     */
-    @ApiOperation("实验室检测-我的检测-查询各状态列表（待检测、检测中、检测完）")
+    @ApiOperation("实验室任务导出")
+    @PostMapping("/deptExecutive/export")
+    public void deptExportList(@RequestBody @Valid SampleLabExecutiveListRequest request) throws Exception {
+        List<SampleLabExecutiveListResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = labExecutiveInfoService.deptLabExecutiveListByIds(request.getMeasureStatus(), request.getIds());
+        } else {
+            list = labExecutiveInfoService.deptLabExecutiveList(request);
+        }
+        super.exportExcel(SampleLabExecutiveListResponse.class, list, ExportEnum.DEPT_EXECUTIVE_TASK.getSheetName());
+    }
+
+    @ApiOperation("我的任务-查询各状态列表（待检测、检测中、检测完）")
     @PostMapping("/myExecutive/list")
     public ReturnDTO<PageInfoBT<SampleLabExecutiveListResponse>> queryMyExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
@@ -57,19 +68,25 @@
         return ReturnUtil.success(super.packForBT(labExecutiveInfoService.myLabExecutiveListPage(page, labExecutiveListRequest)));
     }
 
-    /**
-     * 实验室检测-我的检测-查询各状态样品数量（待检测、检测中、检测完）
-     */
-    @ApiOperation("实验室检测-我的检测-查询各状态样品数量（待检测、检测中、检测完）")
+    @ApiOperation("我的任务导出")
+    @PostMapping("/myExecutive/export")
+    public void exportList(@RequestBody @Valid SampleLabExecutiveListRequest request) throws Exception {
+        List<SampleLabExecutiveListResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = labExecutiveInfoService.myLabExecutiveListByIds(request.getMeasureStatus(), request.getIds());
+        } else {
+            list = labExecutiveInfoService.myLabExecutiveList(request);
+        }
+        super.exportExcel(SampleLabExecutiveListResponse.class, list, ExportEnum.MY_EXECUTIVE_TASK.getSheetName());
+    }
+
+    @ApiOperation("我的任务-查询各状态样品数量（待检测、检测中、检测完）")
     @GetMapping("/myExecutive/amount")
     public ReturnDTO<List<SampleAmountResponse>> queryMyExecutiveAmount() {
         return ReturnUtil.success(labExecutiveInfoService.myExecutiveAmount());
     }
 
-    /**
-     * 实验室检测-部门检测-分配（分配给具体人员）
-     */
-    @ApiOperation("实验室检测-部门检测-分配按钮（分配给具体人员）")
+    @ApiOperation("实验室任务-分配按钮（分配给具体人员）")
     @PostMapping("/deptExecutive/allocate")
     public ReturnDTO allocateStaff(@RequestBody @Valid SampleAllocateRequest sampleAllocateRequest, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -78,10 +95,7 @@
         return labExecutiveInfoService.allocateStaff(sampleAllocateRequest);
     }
 
-    /**
-     * 实验室检测-我的检测-检定人扫描收入（待检测->检测中）
-     */
-    @ApiOperation("实验室检测-我的检测-检定人扫描收入（待检测->检测中）")
+    @ApiOperation("我的任务-检定人扫描收入（待检测->检测中）")
     @PostMapping("/myExecutive/receive")
     public ReturnDTO sampleReceive(@RequestBody @Valid List<SampleOperateRequest> requestList, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -90,10 +104,7 @@
         return labExecutiveInfoService.sampleReceive(requestList);
     }
 
-    /**
-     * 实验室检测-负责人/检定人扫描检完（检测中->检测完）
-     */
-    @ApiOperation("实验室检测-负责人/检定人扫描检完（检测中->检测完）")
+    @ApiOperation("实验室任务-负责人/检定人扫描检完（检测中->检测完）")
     @PostMapping("/myExecutive/complete")
     public ReturnDTO sampleExecutiveComplete(@RequestBody @Valid List<SampleOperateRequest> requestList, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -102,10 +113,7 @@
         return labExecutiveInfoService.sampleExecutiveComplete(requestList);
     }
 
-    /**
-     * 实验室检测-部门检测/我的检测 编辑（只能修改应出具证书）
-     */
-    @ApiOperation("实验室检测-部门检测/我的检测 编辑（只能修改应出具证书）")
+    @ApiOperation("实验室任务/我的任务 编辑（只能修改应出具证书）")
     @PostMapping("/executive/update")
     public ReturnDTO updateExecutive(@RequestBody @Valid UpdateExecutiveRequest request, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -114,10 +122,7 @@
         return labExecutiveInfoService.updateExecutive(request);
     }
 
-    /**
-     * 实验室检测-部门检测/我的检测 详情
-     */
-    @ApiOperation("实验室检测-部门检测/我的检测 详情")
+    @ApiOperation("实验室任务/我的任务 详情")
     @PostMapping("/executive/detail")
     public ReturnDTO<ExecutiveDetailResponse> executiveDetail(@RequestBody @Valid ExecutiveDetailRequest request, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
@@ -131,7 +136,7 @@
      * 退回后会将下一个要执行的实验室检测状态更新为待分配，将后面的实验室顺序变更为连续（都进行减1）
      * 最后一个检测的实验室退回，等分发员再增加实验室或设备收发中的已收入直接手动点击完成
      */
-    @ApiOperation("实验室检测-部门检测/我的检测 退回（待检测/检测中->退回）")
+    @ApiOperation("实验室任务/我的任务 退回（待检测/检测中->退回）")
     @PostMapping("/executive/sendBack")
     public ReturnDTO executiveSendBack(@RequestBody @Valid ExecutiveSendBackRequest request, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -140,9 +145,6 @@
         return labExecutiveInfoService.sampleExecutiveSendBack(request);
     }
 
-    /**
-     * 分发员编辑实验室检测列表
-     */
     @ApiOperation("分发员编辑实验室检测列表")
     @PostMapping("/handOut/updateList")
     public ReturnDTO updateExecutiveList(@RequestBody @Valid UpdateExecutiveListRequest request, BindingResult bindingResult) {
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java
index 48a67ed..0c04f31 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java
@@ -10,6 +10,7 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.resource.customer.CustomerApprovalListRequest;
 import com.casic.missiles.dto.resource.customer.CustomerSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceCustomerInfo;
@@ -26,6 +27,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -55,6 +57,13 @@
         return customerInfoService.saveCustomerInfo(request);
     }
 
+    @ApiOperation("委托方名录导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody CustomerApprovalListRequest request) throws Exception {
+        List<BizResourceCustomerInfo> list = super.exportList(request);
+        super.exportExcel(BizResourceCustomerInfo.class, list, ExportEnum.CUSTOMER_INFO.getSheetName());
+    }
+
     @ApiOperation("委托方人员列表（分页）")
     @PostMapping("/person/listPage")
     public ReturnDTO<PageInfoBT<BizResourceCustomerStaff>> personListPage(@RequestBody IdDTO idDto) {
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
index 972ed4b..6418ea5 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
@@ -5,6 +5,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.resource.customer.SuggestFormApprovalListRequest;
 import com.casic.missiles.dto.resource.customer.SuggestFormSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceCustomerSuggestForm;
@@ -20,6 +21,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -50,4 +52,11 @@
         return suggestFormService.saveSuggestForm(request);
     }
 
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody SuggestFormApprovalListRequest request) throws Exception {
+        List<BizResourceCustomerSuggestForm> list = super.exportList(request);
+        super.exportExcel(BizResourceCustomerSuggestForm.class, list, ExportEnum.CUSTOMER_SUGGEST_FORM.getSheetName());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java
index 1934d1a..9e07eab 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java
@@ -15,12 +15,16 @@
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.resource.IEnvEnvironmentRecordConfigService;
 import com.casic.missiles.service.resource.IEnvEnvironmentRecordDataService;
+import com.casic.missiles.service.resource.IEnvLocationInfoService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
 import java.util.List;
@@ -39,6 +43,8 @@
     private IEnvEnvironmentRecordDataService environmentRecordDataService;
     @Autowired
     private IEnvEnvironmentRecordConfigService environmentRecordConfigService;
+    @Autowired
+    private IEnvLocationInfoService locationInfoService;
 
     @ApiOperation("环境记录单数据列表/详情")
     @PostMapping("/data/listPage")
@@ -95,4 +101,11 @@
         });
         return environmentRecordConfigService.deleteEnvironmentRecordConfig(idDTO.getId());
     }
+
+    @ApiOperation("地点列表")
+    @PostMapping("/location/listPage")
+    public ReturnDTO<PageInfoBT<LocationListResponse>> locationListPage(@RequestBody @Valid LocationListRequest request) {
+        Page<LocationListResponse> page = PageFactory.defaultPage();
+        return ReturnUtil.success(super.packForBT(locationInfoService.listPage(page, request)));
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java
index 82efe3f..e9561fa 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java
@@ -10,6 +10,7 @@
 import com.casic.missiles.dto.resource.seal.SealLogListRequest;
 import com.casic.missiles.dto.resource.seal.SealNoteApprovalListRequest;
 import com.casic.missiles.dto.resource.seal.SealNoteSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceSealUseLog;
@@ -27,6 +28,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -58,6 +60,13 @@
         return sealUseNoteService.saveSeal(request);
     }
 
+    @ApiOperation("印章使用登记导出（列表和导出中去掉经办人和监印人）")
+    @PostMapping("/listExport")
+    public void export(@RequestBody SealNoteApprovalListRequest request) throws Exception {
+        List<BizResourceSealUseNote> list = super.exportList(request);
+        super.exportExcel(BizResourceSealUseNote.class, list, ExportEnum.SEAL_NOTE.getSheetName());
+    }
+
     // TODO: 2023/7/28 印章使用日志：系统中使用印章时插入数据库
 
     @ApiOperation("印章使用日志列表（分页）")
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java
index 9b674fc..06b6521 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java
@@ -9,16 +9,20 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.resource.staff.StaffCertRequest;
 import com.casic.missiles.dto.resource.staff.StaffCertResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.service.resource.IBizResourceStaffInfoService;
 import com.casic.missiles.service.resource.IBizResourceStaffVerifierService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.List;
+
 /**
  * @Description:
  * @Author: wangpeng
@@ -41,9 +45,21 @@
         return ReturnUtil.success(super.packForBT(responsePage));
     }
 
+    @ApiOperation("证书逾期提醒导出")
+    @PostMapping("/listExport")
+    public void exportList(@RequestBody StaffCertRequest request) throws Exception {
+        List<StaffCertResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = staffInfoService.certListByIds(request.getIds());
+        } else {
+            list = staffInfoService.certList(request);
+        }
+        super.exportExcel(StaffCertResponse.class, list, ExportEnum.STAFF_CERTIFICATE_EXPIRE.getSheetName());
+    }
+
     @ApiOperation("证书逾期提醒")
     @PostMapping("/expirationReminder")
-    public ReturnDTO expirationReminder(@RequestBody IdDTO idDto) {
-        return verifierService.expirationReminder(idDto);
+    public ReturnDTO expirationReminder(@RequestBody IdDTO idDTO) {
+        return verifierService.expirationReminder(idDTO);
     }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java
index 3b251ad..a6e7850 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java
@@ -12,6 +12,7 @@
 import com.casic.missiles.dto.resource.staff.StaffListRequest;
 import com.casic.missiles.dto.resource.staff.TrainListRequest;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.*;
@@ -22,7 +23,10 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
 import java.util.List;
@@ -52,8 +56,19 @@
             throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
         }
         Page<BizResourceStaffInfo> page = PageFactory.defaultPage();
-        Page<BizResourceStaffInfo> responsePage = staffInfoService.listPage(page, request);
-        return ReturnUtil.success(super.packForBT(responsePage));
+        return ReturnUtil.success(super.packForBT(staffInfoService.listPage(page, request)));
+    }
+
+    @ApiOperation("人员登记导出")
+    @PostMapping("/listExport")
+    public void exportList(@RequestBody StaffListRequest request) throws Exception {
+        List<BizResourceStaffInfo> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = staffInfoService.listByIds(request.getIds());
+        } else {
+            list = staffInfoService.list(request);
+        }
+        super.exportExcel(BizResourceStaffInfo.class, list, ExportEnum.STAFF_INFO.getSheetName());
     }
 
     @ApiOperation("人员登记详情基础信息")
@@ -85,9 +100,9 @@
 
     @ApiOperation("科研教育列表（分页）")
     @PostMapping("/education/listPage")
-    public ReturnDTO<PageInfoBT<BizResourceStaffEducation>> educationListPage(@RequestBody IdDTO idDto) {
+    public ReturnDTO<PageInfoBT<BizResourceStaffEducation>> educationListPage(@RequestBody IdDTO idDTO) {
         Page<BizResourceStaffEducation> page = PageFactory.defaultPage();
-        Page<BizResourceStaffEducation> responsePage = staffInfoService.educationListPage(page, idDto);
+        Page<BizResourceStaffEducation> responsePage = staffInfoService.educationListPage(page, idDTO);
         return ReturnUtil.success(super.packForBT(responsePage));
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java
index af6aa86..d85d84a 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java
@@ -9,6 +9,7 @@
 import com.casic.missiles.dto.resource.outsideService.SupplierApprovalListRequest;
 import com.casic.missiles.dto.resource.outsideService.SupplierSaveResponse;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceSupplierAbility;
@@ -67,6 +68,13 @@
         return ReturnUtil.success(supplierInfoService.detail(idDTO.getId()));
     }
 
+    @ApiOperation("合格供方导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody SupplierApprovalListRequest request) throws Exception {
+        List<BizResourceSupplierInfo> list = super.exportList(request);
+        super.exportExcel(BizResourceSupplierInfo.class, list, ExportEnum.SUPPLIER_INFO.getSheetName());
+    }
+
     @ApiOperation("供方人员列表（分页）")
     @PostMapping("/person/listPage")
     public ReturnDTO<PageInfoBT<BizResourceSupplierPerson>> personListPage(@RequestBody IdDTO idDTO) {
diff --git a/casic-metering-api/src/main/resources/config/application.yml b/casic-metering-api/src/main/resources/config/application.yml
index 350db5f..ecff521 100644
--- a/casic-metering-api/src/main/resources/config/application.yml
+++ b/casic-metering-api/src/main/resources/config/application.yml
@@ -126,7 +126,7 @@
     #作者
     author: wangpeng
     #待生成对象表名
-    table-name: biz_equipment_technical_target_approval,biz_equipment_attachment_approval,biz_equipment_checkpoint_approval
+    table-name: biz_business_outsource_protocol
 
 reminder:
   #节点--common模块config包 ReminderNodeConfig配置
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
index 4a19e4e..d47d552 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
@@ -53,6 +53,7 @@
     SUGGEST_FORM_SAVE_FAILED(2509, "委托方意见登记表保存至草稿箱失败"),
     EXAMINE_FORM_SAVE_FAILED(2510, "要求、委托书及合同评审表保存至草稿箱失败"),
     CUSTOMER_EXIST_SAVE_FAILED(2511, "该委托方已存在，请重新选择"),
+    DUPLICATE_LOCATION_NO(2512, "地点编号已存在"),
 
     /**
      * 计量检定业务模块
@@ -68,6 +69,8 @@
     COMPLETE_SAMPLE_NOT_EXIST(2609, "检测中不存在扫描收入的样品"),
     CANNOT_CHANGE_MEASURE_INFO(2610, "无法更改非当前登录用户的检测信息"),
     NON_EXIST_ORDER_OR_SAMPLE(2611, "不存在该委托单或该委托单下的样品"),
+    OUTSOURCE_ACCESS_SAVE_FAILED(2612, "测试、校准或检定工作分包评审表保存至草稿箱失败"),
+    OUTSOURCE_PROTOCOL_SAVE_FAILED(2613, "测试、校准或检定工作分包协议书保存至草稿箱失败"),
 
     /**
      * 历史遗留备用
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
index 5089ad1..81a406b 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
@@ -10,54 +10,38 @@
     /**
      * 资源管理
      */
-    ENVIRONMENT_DATA_EXPORT("environmentData", "environmentData", "环境记录单数据"),
+    ENVIRONMENT_DATA_EXPORT("environmentData", "环境记录单数据", "环境记录单数据"),
+    STAFF_INFO("staffInfo", "人员登记", "人员登记"),
+    STAFF_CERTIFICATE_EXPIRE("certificateExpire", "证书逾期提醒", "证书逾期提醒"),
+    SUPPLIER_INFO("supplierInfo", "合格供方名录", "合格供方名录"),
+    CUSTOMER_INFO("customerInfo", "委托方名录", "委托方名录"),
+    CUSTOMER_SUGGEST_FORM("customerSuggestForm", "委托方意见登记表", "委托方意见登记表"),
+    SEAL_NOTE("sealNote", "印章使用登记", "印章使用登记"),
 
-    FILE_EXPORT("meterFileData", "meterFileData", "计量文件信息"),
-    TRAIN_PLAN_EXPORT("trainPlanData", "trainPlanData", "培训计划"),
-    TRAIN_LOG_EXPORT("trainLogData", "trainLogData", "培训记录"),
-    METER_ORGANIZE_EXPORT("meterOrganizeData", "meterOrganizeData", "计量组织"),
-    TRACE_SUPPLIER_EXPORT("traceSupplierData", "traceSupplierData", "溯源供方"),
-    SIGN_EXPORT("signData", "signData", "签名/签章"),
-    TEMPLATE_EXPORT("templateData", "templateData", "原始记录模板/证书报告模板"),
-    FIXED_ASSETS("meterFixedAssets", "meterFixedAssets", "固定资产"),
-    METER_EQUIPMENT("meterEquipment", "meterEquipment", "测量设备"),
-    CALIBRATION_TEST_EQUIPMENT("calibrationTestEquipment", "calibrationTestEquipment", "校准检定设备"),
-    MEASURE_ACCOUNT("measureAccount", "measureAccount", "测量工装"),
-    STANDARD_SUPPORT_EQUIPMENT("standardSupportEquipment", "standardSupportEquipment", "标准配套设备"),
-    STANDARD_EQUIPMENT("standardEquipment", "standardEquipment", "标准装置"),
-    FLOW_DEF_EXPORT("flowDefData", "flowDefData", "流程定义"),
-    STAFF_CERTIFICATE("certificate", "certificate", "计量人员证书"),
-    CHECK_INFO("checkInfo", "checkInfo", "设备管理点检测"),
-    EQUIPMENT_APPLY("equipmentApply", "equipmentApply", "设备借用"),
-    STANDARD_EQUIPMENT_REMIND("equipmentApplyRemind", "equipmentApplyRemind", "标准装置到期提醒"),
-    METER_PRICE("meterPrice", "meterPrice", "价格库"),
-    METER_STAFF("meterStaff", "meterStaff", "计量人员"),
-    STANDARD_EQUIPMENT_APPLY("standardEquipmentApply", "standardEquipmentApply", "标准装置申请"),
-    STATE_MANAGE_APPLY("stateManage", "stateManage", "状态管理"),
-    METER_ACCEPTANCE_CHECK("acceptanceCheck", "acceptanceCheck", "设备检修保养验收单"),
-    CUSTOMER_EXPORT("customerData", "customerData", "客户信息"),
-    ORDER_EXPORT("orderData", "orderData", "委托书信息"),
-    SAMPLE_EXPORT("sampleData", "sampleData", "样本信息"),
-    EXCHANGE_DATA("exchangeData", "exchangeData", "设备交接单"),
-    DISPATCH_DATA("dispatchData", "dispatchData", "设备收发"),
-    ENVIRONMENT_DATA("environmentData", "environmentData", "环境记录单"),
-    ORIGIN_DATA("originData", "originData", "原始记录"),
-    CERTIFICATE_REPORT("certificateReport", "certificateReport", "证书报告"),
-    ADVICE_EXPORT("adviceData", "adviceData", "客户反馈"),
-    HANDOUT_EXPORT("handoutData", "handoutData", "任务分发列表"),
-    OUTSOURCER_EXPORT("outsourcerData", "outsourcerData", "分包方"),
-    SITE_EXECUTIVE_EXPORT("siteExecutiveData", "siteExecutiveData", "现场测试、校准或检定"),
-    CERTIFICATE_PRINT_EXPORT("certificatePrintData", "certificatePrintData", "证书打印"),
-    DOWNLOAD_TEMPLATE("downloadTemplate", "downloadTemplate", "页面配置"),
-    OUTSOURCER_CERTIFICATE_EXPORT("outsourceCertificateData", "outsourceCertificateData", "分包证书"),
-    SETTLEMENT_INFO_EXPORT("settlementInfoData", "settlementInfoData", "业务结算"),
-    EQUIPMENT_REMIND("equipmentRemind", "equipmentRemind", "设备到期提醒"),
-    AGREEMENT_INFO_EXPORT("agreementInfoData", "agreementInfoData", "合同"),
-    WORK_STATISTICS_EXPORT("workStatisticsData", "workStatisticsData", "实时工作统计"),
-    DEPT_OUTPUT_EXPORT("deptOutputData", "deptOutputData", "部门产值分析"),
-    WORKLOAD_EXPORT("workloadData", "workloadData", "业务工作量分析"),
-    DEPT_COMPREHENSIVE_EXPORT("deptComprehensiveData", "deptComprehensiveData", "部门综合分析"),
-    ENVIRONMENTAL_RECORD("environmentalRecordData", "environmentalRecordData", "现场环境记录");
+    /**
+     * 计量检定业务
+     */
+    OUTSOURCER_EXPORT("outsourcerData", "分包方名录", "分包方名录"),
+    IDENTIFY_EXPORT("identifyData", "计量标识", "计量标识"),
+    ORDER_EXPORT("orderData", "任务单", "任务单"),
+    DISPATCH_DATA("dispatchData", "设备收发", "设备收发"),
+    HANDOUT_EXPORT("handoutData", "任务分发", "任务分发"),
+    SITE_EXECUTIVE_EXPORT("siteExecutiveData", "现场测试、校准或检定", "现场测试、校准或检定"),
+    CERTIFICATE_REPORT("certificateReport", "证书审批", "证书审批"),
+    CERTIFICATE_CHANGE_APPLY("certificateChangeApply", "证书报告补充或更换申请单", "证书报告补充或更换申请单"),
+    CERTIFICATE_PRINT("certificatePrintData", "证书打印审批", "证书打印审批"),
+    DEPT_EXECUTIVE_TASK("deptExecutiveTaskData", "实验室任务", "实验室任务"),
+    MY_EXECUTIVE_TASK("myExecutiveTaskData", "我的任务", "我的任务"),
+    OUTSOURCE_ASSESS("outsourceAssess", "测试、校准或检定工作分包评审表", "测试、校准或检定工作分包评审表"),
+    OUTSOURCE_PROTOCOL("outsourceProtocol", "测试、校准或检定工作分包协议书", "测试、校准或检定工作分包协议书"),
+
+    /**
+     * 系统管理
+     */
+    SIGN_EXPORT("signData", "签名", "签名"),
+    TEMPLATE_EXPORT("templateData", "文件模板", "文件模板"),
+    FLOW_DEF_EXPORT("flowDefData", "流程定义", "流程定义"),
+    DOWNLOAD_TEMPLATE("downloadTemplate", "流程定义", "页面配置");
 
     ExportEnum(String fileName, String sheetName, String description) {
         this.fileName = fileName;
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateRecordTypeCodeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateRecordTypeCodeEnum.java
index 31d913c..a963522 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateRecordTypeCodeEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateRecordTypeCodeEnum.java
@@ -46,4 +46,14 @@
     String SITE_EXECUTIVE_APPROVAL = "01";
     //《现场测试、校准或检定工作记录表》
     String SITE_EXECUTIVE_LOG = "02";
+
+    //测试、校准或检定工作分包协议书
+    String OUTSOURCE_PROTOCOL = "01";
+    //测试、校准或检定工作分包评审表
+    String OUTSOURCE_ACCESS = "02";
+    //测试、校准或检定工作分包通知书
+    String OUTSOURCE_NOTICE = "03";
+    //测试、校准或检定工作分包方名录
+    String OUTSOURCE_INFO = "04";
+
 }
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
index 24b8635..f78bd53 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
@@ -15,6 +15,10 @@
     String CERTIFICATE_CHANGE_APPLY_BEAN_NAME = "certificateChangeApplyBean";
     //现场测试、校准或检定
     String SITE_EXECUTIVE_BEAN_NAME = "siteExecutiveBean";
+    //测试、校准或检定工作分包评审表
+    String OUTSOURCE_ASSESS_BEAN_NAME = "outsourceAssessBean";
+    //测试、校准或检定工作分包协议书
+    String OUTSOURCE_PROTOCOL_BEAN_NAME = "outsourceProtocolBean";
 
     /*********************************设备与装置************************************/
     //设备台账
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 b21c661..6b86fd1 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
@@ -18,6 +18,8 @@
     OUTSOURCER_APPROVAL(OUTSOURCER_BEAN_NAME, ""),
     CERTIFICATE_CHANGE_APPROVAL(CERTIFICATE_CHANGE_APPLY_BEAN_NAME, ""),
     SITE_EXECUTIVE_APPROVAL(SITE_EXECUTIVE_BEAN_NAME, ""),
+    OUTSOURCE_ASSESS_APPROVAL(OUTSOURCE_ASSESS_BEAN_NAME, ""),
+    OUTSOURCE_PROTOCOL_APPROVAL(OUTSOURCE_PROTOCOL_BEAN_NAME, ""),
 
     ACTION_STATUS_MAP(new HashMap<String, AwareActionStatusEnum>() {
         {
@@ -47,6 +49,10 @@
             put(ApplyFromIdEnum.CERTIFICATE_CHANGE_APPROVAL.getCode(), CERTIFICATE_CHANGE_APPROVAL);
             //现场测试、校准或检定审批
             put(ApplyFromIdEnum.SITE_EXECUTIVE_APPROVAL.getCode(), SITE_EXECUTIVE_APPROVAL);
+            //测试、校准或检定工作分包评审表
+            put(ApplyFromIdEnum.OUTSOURCE_ASSESS_APPROVAL.getCode(), OUTSOURCE_ASSESS_APPROVAL);
+            //测试、校准或检定工作分包协议书
+            put(ApplyFromIdEnum.OUTSOURCE_PROTOCOL_APPROVAL.getCode(), OUTSOURCE_PROTOCOL_APPROVAL);
         }
     });
     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 934405e..c7410bd 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
@@ -9,6 +9,8 @@
     CERTIFICATE_CHANGE_APPROVAL("jljdywzsbchghsqd", MessageSourceModuleEnum.BUSINESS.getCode(), "证书/报告补充或更换申请单"),
     OUTSOURCER_APPROVAL("jljdywcsjzhgfbfml", MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定合格分包方名录"),
     SITE_EXECUTIVE_APPROVAL("jljdywxccsjzsp", MessageSourceModuleEnum.BUSINESS.getCode(), "现场测试、校准或检定审批"),
+    OUTSOURCE_ASSESS_APPROVAL("jljdywcsjzfbpsb", MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包评审表"),
+    OUTSOURCE_PROTOCOL_APPROVAL("jljdywcsjzfbxys", MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包协议书"),
 
 
     /*******************************************设备与装置*********************************************/
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/GeneralApprovalMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/GeneralApprovalMapper.java
index 4fb7344..0c9d6ae 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/GeneralApprovalMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/GeneralApprovalMapper.java
@@ -17,8 +17,4 @@
 
     Page<O> selectBatchForApprovalList(Page<O> page, @Param("request") R request, @Param("businessKeys") List<String> businessKeys);
 
-//    Page<O> selectListPage(Page<O> page, @Param("request") R request);
-
-//    Long selectMaxNo();
-
 }
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceAssessMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceAssessMapper.java
index 7867bb8..ba59009 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceAssessMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceAssessMapper.java
@@ -1,7 +1,12 @@
 package com.casic.missiles.mapper.business;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.business.outsource.OutsourceAssessApprovalListRequest;
+import com.casic.missiles.mapper.GeneralApprovalMapper;
 import com.casic.missiles.model.business.BizBusinessOutsourceAssess;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * <p>
@@ -11,6 +16,10 @@
  * @author wangpeng
  * @since 2023-08-16
  */
-public interface BizBusinessOutsourceAssessMapper extends BaseMapper<BizBusinessOutsourceAssess> {
+public interface BizBusinessOutsourceAssessMapper extends GeneralApprovalMapper<BizBusinessOutsourceAssess, BizBusinessOutsourceAssess, OutsourceAssessApprovalListRequest> {
+
+    Page<BizBusinessOutsourceAssess> selectBatchForApprovalList(Page<BizBusinessOutsourceAssess> page, @Param("request") OutsourceAssessApprovalListRequest request, @Param("businessKeys") List<String> businessKeys);
+
+    Long selectMaxProjectNo();
 
 }
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceProtocolMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceProtocolMapper.java
new file mode 100644
index 0000000..e6aba35
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceProtocolMapper.java
@@ -0,0 +1,24 @@
+package com.casic.missiles.mapper.business;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.business.outsource.OutsourceProtocolApprovalListRequest;
+import com.casic.missiles.mapper.GeneralApprovalMapper;
+import com.casic.missiles.model.business.BizBusinessOutsourceProtocol;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 计量检定业务-分包管理-测试、校准或检定工作分包协议书 Mapper 接口
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-08-24
+ */
+public interface BizBusinessOutsourceProtocolMapper extends GeneralApprovalMapper<BizBusinessOutsourceProtocol, BizBusinessOutsourceProtocol, OutsourceProtocolApprovalListRequest> {
+
+    Page<BizBusinessOutsourceProtocol> selectBatchForApprovalList(Page<BizBusinessOutsourceProtocol> page, @Param("request") OutsourceProtocolApprovalListRequest request, @Param("businessKeys") List<String> businessKeys);
+
+    Long selectMaxProtocolNo();
+}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/EnvLocationInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/EnvLocationInfoMapper.java
new file mode 100644
index 0000000..49eff87
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/EnvLocationInfoMapper.java
@@ -0,0 +1,21 @@
+package com.casic.missiles.mapper.resource;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.resource.environment.LocationListRequest;
+import com.casic.missiles.dto.resource.environment.LocationListResponse;
+import com.casic.missiles.model.resource.EnvLocationInfo;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * <p>
+ * 实验室环境监控系统-设备表 Mapper 接口
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-06-07
+ */
+public interface EnvLocationInfoMapper extends BaseMapper<EnvLocationInfo> {
+
+    Page<LocationListResponse> selectLocationListPage(Page<LocationListResponse> page, @Param("request") LocationListRequest request);
+}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java
index de124db..85ed0f7 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java
@@ -1,7 +1,9 @@
 package com.casic.missiles.mapper.system;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.dto.system.SignDetailResponse;
+import com.casic.missiles.dto.system.SignListRequest;
 import com.casic.missiles.model.system.SystemSign;
 import org.apache.ibatis.annotations.Param;
 
@@ -22,4 +24,8 @@
     SignDetailResponse selectSignDetailById(Long id);
 
     List<SystemSign> selectUsableSignList(@Param("userId") Long userId);
+
+    Page<SystemSign> selectSignListPage(Page<SystemSign> page, @Param("request") SignListRequest request);
+
+    List<SystemSign> selectSignList(@Param("request") SignListRequest request);
 }
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateChangeApplyMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateChangeApplyMapper.xml
index d798447..c496092 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateChangeApplyMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateChangeApplyMapper.xml
@@ -30,31 +30,31 @@
         SELECT *
         FROM biz_business_certificate_change_apply
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.changeApplyNo != null and request.changeApplyNo !=''">
+        <if test="request != null and request.changeApplyNo != null and request.changeApplyNo !=''">
             and change_apply_no like concat('%',#{request.changeApplyNo},'%')
         </if>
-        <if test="request.changeReportNo != null and request.changeReportNo !=''">
+        <if test="request != null and request.changeReportNo != null and request.changeReportNo !=''">
             and change_report_no like concat('%',#{request.changeReportNo},'%')
         </if>
-        <if test="request.changeReportName != null and request.changeReportName !=''">
+        <if test="request != null and request.changeReportName != null and request.changeReportName !=''">
             and change_report_name like concat('%',#{request.changeReportName},'%')
         </if>
-        <if test="request.changeType != null and request.changeType !=''">
+        <if test="request != null and request.changeType != null and request.changeType !=''">
             and change_type = #{request.changeType}
         </if>
-        <if test="request.createUserName != null and request.createUserName !=''">
+        <if test="request != null and request.createUserName != null and request.createUserName !=''">
             and create_user_name like concat('%',#{request.createUserName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificatePrintMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificatePrintMapper.xml
index b66cd99..49c0ac8 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificatePrintMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificatePrintMapper.xml
@@ -31,34 +31,34 @@
         LEFT JOIN biz_business_order_sample_relation bosr ON (bosr.order_id = bcr.order_id AND bosr.sample_id = bcr.sample_id)
         LEFT JOIN biz_business_order_info boi ON boi.id = bosr.order_id
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and bcp.approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.printStatus != null and request.printStatus !=''">
+        <if test="request != null and request.printStatus != null and request.printStatus !=''">
             and print_status = #{request.printStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and bcp.create_user_id = #{request.createUserId}
         </if>
-        <if test="request.certificateReportNo != null and request.certificateReportNo !=''">
+        <if test="request != null and request.certificateReportNo != null and request.certificateReportNo !=''">
             and bcr.certificate_report_no like concat('%',#{request.certificateReportNo},'%')
         </if>
-        <if test="request.certificateReportName != null and request.certificateReportName !=''">
+        <if test="request != null and request.certificateReportName != null and request.certificateReportName !=''">
             and bcr.certificate_report_name like concat('%',#{request.certificateReportName},'%')
         </if>
-        <if test="request.customerName != null and request.customerName !=''">
+        <if test="request != null and request.customerName != null and request.customerName !=''">
             and boi.customer_name like concat('%',#{request.customerName},'%')
         </if>
-        <if test="request.sampleNo != null and request.sampleNo !=''">
+        <if test="request != null and request.sampleNo != null and request.sampleNo !=''">
             and bosr.sample_no like concat('%',#{request.sampleNo},'%')
         </if>
-        <if test="request.sampleName != null and request.sampleName !=''">
+        <if test="request != null and request.sampleName != null and request.sampleName !=''">
             and bosr.sample_name like concat('%',#{request.sampleName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and bcp.create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and bcp.create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml
index b366034..767695d 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml
@@ -46,33 +46,37 @@
         SELECT bcr.*, bosr.sample_no, bosr.sample_name, bosr.sample_model, rsi.staff_name
         FROM biz_business_certificate_report bcr
         LEFT JOIN biz_business_order_sample_relation bosr ON (bosr.order_id = bcr.order_id AND bosr.sample_id = bcr.sample_id)
+        LEFT JOIN biz_business_order_info boi ON boi.id = bcr.order_id
         LEFT JOIN biz_resource_staff_info rsi ON rsi.id = bcr.measure_person_id
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and bcr.approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and bcr.create_user_id = #{request.createUserId}
         </if>
-        <if test="request.certificateReportNo != null and request.certificateReportNo !=''">
+        <if test="request != null and request.customerId != null and request.customerId !=''">
+            and boi.customer_id = #{request.customerId}
+        </if>
+        <if test="request != null and request.certificateReportNo != null and request.certificateReportNo !=''">
             and bcr.certificate_report_no like concat('%',#{request.certificateReportNo},'%')
         </if>
-        <if test="request.certificateReportName != null and request.certificateReportName !=''">
+        <if test="request != null and request.certificateReportName != null and request.certificateReportName !=''">
             and bcr.certificate_report_name like concat('%',#{request.certificateReportName},'%')
         </if>
-        <if test="request.sampleNo != null and request.sampleNo !=''">
+        <if test="request != null and request.sampleNo != null and request.sampleNo !=''">
             and bosr.sample_no like concat('%',#{request.sampleNo},'%')
         </if>
-        <if test="request.measureCategory != null and request.measureCategory !=''">
+        <if test="request != null and request.measureCategory != null and request.measureCategory !=''">
             and bcr.measure_category = #{request.measureCategory}
         </if>
-        <if test="request.measurePerson != null and request.measurePerson !=''">
+        <if test="request != null and request.measurePerson != null and request.measurePerson !=''">
             and rsi.staff_name like concat('%',#{request.measurePerson},'%')
         </if>
-        <if test="request.calibrationTimeStart != null and request.calibrationTimeStart !=''">
+        <if test="request != null and request.calibrationTimeStart != null and request.calibrationTimeStart !=''">
             and bcr.calibration_time &gt;= #{request.calibrationTimeStart}
         </if>
-        <if test="request.calibrationTimeEnd != null and request.calibrationTimeEnd !=''">
+        <if test="request != null and request.calibrationTimeEnd != null and request.calibrationTimeEnd !=''">
             and bcr.calibration_time &lt;= #{request.calibrationTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceAssessMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceAssessMapper.xml
index d0fcf8b..c22c101 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceAssessMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceAssessMapper.xml
@@ -7,6 +7,8 @@
         <id column="id" property="id" />
         <result column="project_no" property="projectNo" />
         <result column="project_name" property="projectName" />
+        <result column="lab_code" property="labCode" />
+        <result column="group_code" property="groupCode" />
         <result column="applicant_id" property="applicantId" />
         <result column="applicant_name" property="applicantName" />
         <result column="applicant_time" property="applicantTime" />
@@ -31,7 +33,45 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, project_no, project_name, applicant_id, applicant_name, applicant_time, minio_file_name, remark, create_user_id, create_user_name, outsourcer_id, pre_start_time, pre_end_time, outsource_reason, pre_cost, approval_status, process_id, approve_situation, traceability, test_method, technique_ability, create_time, update_time
+        id, project_no, project_name, lab_code, group_code, applicant_id, applicant_name, applicant_time, minio_file_name, remark, create_user_id, create_user_name, outsourcer_id, pre_start_time, pre_end_time, outsource_reason, pre_cost, approval_status, process_id, approve_situation, traceability, test_method, technique_ability, create_time, update_time
     </sql>
 
+    <select id="selectMaxProjectNo" resultType="java.lang.Long">
+        SELECT IFNULL(max(RIGHT(project_no, 3)), 0) from biz_business_outsource_assess
+    </select>
+
+    <select id="selectBatchForApprovalList" resultMap="BaseResultMap">
+        SELECT bboa.*, bboi.outsourcer_name, bboi.director
+        FROM biz_business_outsource_assess bboa
+        LEFT JOIN biz_business_outsourcer_info bboi ON bboa.outsourcer_id = bboi.id
+        WHERE 1=1
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
+            and bboa.approval_status = #{request.approvalStatus}
+        </if>
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
+            and bboa.create_user_id = #{request.createUserId}
+        </if>
+        <if test="request != null and request.projectNo != null and request.projectNo !=''">
+            and bboa.project_no like concat('%',#{request.projectNo},'%')
+        </if>
+        <if test="request != null and request.outsourcerName != null and request.outsourcerName !=''">
+            and bboi.outsourcer_name like concat('%',#{request.outsourcerName},'%')
+        </if>
+        <if test="request != null and request.applicantName != null and request.applicantName !=''">
+            and bboa.applicant_name like concat('%',#{request.applicantName},'%')
+        </if>
+        <if test="request != null and request.applicantTimeStart != null and request.applicantTimeStart !=''">
+            and bboa.applicant_time &gt;= #{request.applicantTimeStart}
+        </if>
+        <if test="request != null and request.applicantTimeEnd != null and request.applicantTimeEnd !=''">
+            and bboa.applicant_time &lt;= #{request.applicantTimeEnd}
+        </if>
+        <if test="businessKeys != null">
+            and bboa.id in
+            <foreach collection="businessKeys" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
+        ORDER BY bboa.create_time DESC
+    </select>
 </mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceProtocolMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceProtocolMapper.xml
new file mode 100644
index 0000000..b7b2149
--- /dev/null
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceProtocolMapper.xml
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.mapper.business.BizBusinessOutsourceProtocolMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.business.BizBusinessOutsourceProtocol">
+        <id column="id" property="id" />
+        <result column="protocol_no" property="protocolNo" />
+        <result column="project_name" property="projectName" />
+        <result column="lab_code" property="labCode" />
+        <result column="group_code" property="groupCode" />
+        <result column="outsourcer_id" property="outsourcerId" />
+        <result column="remark" property="remark" />
+        <result column="outsource_no" property="outsourceNo" />
+        <result column="outsource_name" property="outsourceName" />
+        <result column="contacts" property="contacts" />
+        <result column="mobile" property="mobile" />
+        <result column="address" property="address" />
+        <result column="require_date" property="requireDate" />
+        <result column="outsource_cost" property="outsourceCost" />
+        <result column="director" property="director" />
+        <result column="item" property="item" />
+        <result column="requires" property="requires" />
+        <result column="create_user_id" property="createUserId" />
+        <result column="create_user_name" property="createUserName" />
+        <result column="approval_status" property="approvalStatus" />
+        <result column="process_id" property="processId" />
+        <result column="create_time" property="createTime" />
+        <result column="update_time" property="updateTime" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, protocol_no, project_name, lab_code, group_code, outsourcer_id, remark, outsource_no, outsource_name, contacts, mobile, address, require_date, outsource_cost, director, item, requires, create_user_id, create_user_name, approval_status, process_id, create_time, update_time
+    </sql>
+
+    <select id="selectMaxProtocolNo" resultType="java.lang.Long">
+        SELECT IFNULL(max(RIGHT(protocol_no, 3)), 0) from biz_business_outsource_protocol
+    </select>
+
+    <select id="selectBatchForApprovalList" resultMap="BaseResultMap">
+        SELECT *
+        FROM biz_business_outsource_protocol
+        WHERE 1=1
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
+            and approval_status = #{request.approvalStatus}
+        </if>
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
+            and create_user_id = #{request.createUserId}
+        </if>
+        <if test="request != null and request.protocolNo != null and request.protocolNo !=''">
+            and protocol_no like concat('%',#{request.protocolNo},'%')
+        </if>
+        <if test="request != null and request.outsourcerName != null and request.outsourcerName !=''">
+            and outsourcer_name like concat('%',#{request.outsourcerName},'%')
+        </if>
+        <if test="request != null and request.applicantName != null and request.applicantName !=''">
+            and create_user_name like concat('%',#{request.applicantName},'%')
+        </if>
+        <if test="request != null and request.applicantTimeStart != null and request.applicantTimeStart !=''">
+            and create_time &gt;= #{request.applicantTimeStart}
+        </if>
+        <if test="request != null and request.applicantTimeEnd != null and request.applicantTimeEnd !=''">
+            and create_time &lt;= #{request.applicantTimeEnd}
+        </if>
+        <if test="businessKeys != null">
+            and id in
+            <foreach collection="businessKeys" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
+        ORDER BY create_time DESC
+    </select>
+</mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourcerInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourcerInfoMapper.xml
index 510a80b..3049b54 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourcerInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourcerInfoMapper.xml
@@ -7,6 +7,8 @@
         <id column="id" property="id" />
         <result column="outsourcer_no" property="outsourcerNo" />
         <result column="outsourcer_name" property="outsourcerName" />
+        <result column="lab_code" property="labCode" />
+        <result column="group_code" property="groupCode" />
         <result column="outsourcer_brief_name" property="outsourcerBriefName" />
         <result column="outsourcer_size" property="outsourcerSize" />
         <result column="business_size" property="businessSize" />
@@ -55,32 +57,32 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, outsourcer_no, outsourcer_name, outsourcer_brief_name, outsourcer_size, business_size, grade, evaluation, tax_number, bank_account, bank_name, bank_account_number, postal_code, director, phone, fax, mobile, email, website, address_country, address_province, address_city, address_area, full_address, address_country_name, address_province_name, address_city_name, address_area_name, invoice_country, invoice_province, invoice_city, invoice_area, invoice_full_address, invoice_country_name, invoice_province_name, invoice_city_name, invoice_area_name, business_scope, business_content, minio_file_name, approval_status, process_id, remark, create_user_id, create_user_name, create_time, update_time
+        id, outsourcer_no, outsourcer_name, lab_code, group_code, outsourcer_brief_name, outsourcer_size, business_size, grade, evaluation, tax_number, bank_account, bank_name, bank_account_number, postal_code, director, phone, fax, mobile, email, website, address_country, address_province, address_city, address_area, full_address, address_country_name, address_province_name, address_city_name, address_area_name, invoice_country, invoice_province, invoice_city, invoice_area, invoice_full_address, invoice_country_name, invoice_province_name, invoice_city_name, invoice_area_name, business_scope, business_content, minio_file_name, approval_status, process_id, remark, create_user_id, create_user_name, create_time, update_time
     </sql>
 
     <select id="selectBatchForApprovalList" resultMap="BaseResultMap">
         SELECT *
         FROM biz_business_outsourcer_info
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.outsourcerNo != null and request.outsourcerNo !=''">
+        <if test="request != null and request.outsourcerNo != null and request.outsourcerNo !=''">
             and outsourcer_no like concat('%',#{request.outsourcerNo},'%')
         </if>
-        <if test="request.outsourcerName != null and request.outsourcerName !=''">
+        <if test="request != null and request.outsourcerName != null and request.outsourcerName !=''">
             and outsourcer_name like concat('%',#{request.outsourcerName},'%')
         </if>
-        <if test="request.director != null and request.director !=''">
+        <if test="request != null and request.director != null and request.director !=''">
             and director like concat('%',#{request.director},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
@@ -93,6 +95,6 @@
     </select>
 
     <select id="selectMaxNo" resultType="java.lang.Long">
-        SELECT IFNULL(max(RIGHT(outsourcer_no, 12)), 0) from biz_business_outsourcer_info
+        SELECT IFNULL(max(RIGHT(outsourcer_no, 3)), 0) from biz_business_outsourcer_info
     </select>
 </mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessSiteExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessSiteExecutiveInfoMapper.xml
index 135c5d0..3c5ae79 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessSiteExecutiveInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessSiteExecutiveInfoMapper.xml
@@ -38,25 +38,25 @@
         FROM biz_business_site_executive_info bsei
         LEFT JOIN biz_resource_customer_info rci ON bsei.customer_id = rci.id
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and bsei.approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and bsei.create_user_id = #{request.createUserId}
         </if>
-        <if test="request.siteExecutiveNo != null and request.siteExecutiveNo !=''">
+        <if test="request != null and request.siteExecutiveNo != null and request.siteExecutiveNo !=''">
             and bsei.site_executive_no like concat('%',#{request.siteExecutiveNo},'%')
         </if>
-        <if test="request.customerName != null and request.customerName !=''">
+        <if test="request != null and request.customerName != null and request.customerName !=''">
             and rci.outsourcer_name like concat('%',#{request.customerName},'%')
         </if>
-        <if test="request.applyName != null and request.applyName !=''">
+        <if test="request != null and request.applyName != null and request.applyName !=''">
             and bsei.apply_name like concat('%',#{request.applyName},'%')
         </if>
-        <if test="request.applyTimeStart != null and request.applyTimeStart !=''">
+        <if test="request != null and request.applyTimeStart != null and request.applyTimeStart !=''">
             and bsei.apply_time &gt;= #{request.applyTimeStart}
         </if>
-        <if test="request.applyTimeEnd != null and request.applyTimeEnd !=''">
+        <if test="request != null and request.applyTimeEnd != null and request.applyTimeEnd !=''">
             and bsei.apply_time &lt;= #{request.applyTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml
index 84d9e2a..6bd38a9 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml
@@ -105,6 +105,12 @@
         <if test="request.isUrgent != null and request.isUrgent !=''">
             AND bo.is_urgent = #{request.isUrgent}
         </if>
+        <if test="request.ids != null">
+            and blei.id in
+            <foreach collection="request.ids" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
         ORDER BY blei.update_time DESC
     </select>
 
@@ -137,6 +143,12 @@
         <if test="request.isUrgent != null and request.isUrgent !=''">
             AND bo.is_urgent = #{request.isUrgent}
         </if>
+        <if test="request.ids != null">
+            and blei.id in
+            <foreach collection="request.ids" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
         ORDER BY blei.update_time DESC
     </select>
 
diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardInfoMapper.xml
index 1a5551b..2ed8d17 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardInfoMapper.xml
@@ -45,12 +45,6 @@
         FROM biz_equipment_standard_info besi
         LEFT JOIN biz_equipment_standard_technology_relation bestr ON besi.standard_no = bestr.standard_no
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
-            and besi.approval_status = #{request.approvalStatus}
-        </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
-            and besi.create_user_id = #{request.createUserId}
-        </if>
         <if test="request.standardName != null and request.standardName !=''">
             and besi.standard_name like concat('%',#{request.standardName},'%')
         </if>
diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardTechnologyRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardTechnologyRelationMapper.xml
index fc7e16c..cd03c8c 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardTechnologyRelationMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardTechnologyRelationMapper.xml
@@ -6,6 +6,7 @@
     <resultMap id="BaseResultMap" type="com.casic.missiles.model.equipment.BizEquipmentStandardTechnologyRelation">
         <id column="id" property="id" />
         <result column="technology_file_id" property="technologyFileId" />
+        <result column="technology_file_no" property="technologyFileNo" />
         <result column="technology_file_name" property="technologyFileName" />
         <result column="standard_id" property="standardId" />
         <result column="standard_no" property="standardNo" />
@@ -14,7 +15,7 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, technology_file_id, technology_file_name, standard_id, remark
+        id, technology_file_id, technology_file_no, technology_file_name, standard_id, remark
     </sql>
 
 </mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceAuthorizeOrderMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceAuthorizeOrderMapper.xml
index ac5176c..554fe65 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceAuthorizeOrderMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceAuthorizeOrderMapper.xml
@@ -32,22 +32,22 @@
         SELECT *
         FROM biz_resource_authorize_order
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.orderNo != null and request.orderNo !=''">
+        <if test="request != null and request.orderNo != null and request.orderNo !=''">
             and order_no like concat('%',#{request.orderNo},'%')
         </if>
-        <if test="request.createUserName != null and request.createUserName !=''">
+        <if test="request != null and request.createUserName != null and request.createUserName !=''">
             and create_user_name like concat('%',#{request.createUserName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerExamineFormMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerExamineFormMapper.xml
index ab242f6..af7f98f 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerExamineFormMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerExamineFormMapper.xml
@@ -41,28 +41,28 @@
         SELECT *
         FROM biz_resource_customer_examine_form
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.formNo != null and request.formNo !=''">
+        <if test="request != null and request.formNo != null and request.formNo !=''">
             and form_no like concat('%',#{request.formNo},'%')
         </if>
-        <if test="request.labCode != null and request.labCode !=''">
+        <if test="request != null and request.labCode != null and request.labCode !=''">
             and lab_code like concat('%',#{request.labCode},'%')
         </if>
-        <if test="request.groupCode != null and request.groupCode !=''">
+        <if test="request != null and request.groupCode != null and request.groupCode !=''">
             and group_code like concat('%',#{request.groupCode},'%')
         </if>
-        <if test="request.createUserName != null and request.createUserName !=''">
+        <if test="request != null and request.createUserName != null and request.createUserName !=''">
             and create_user_name like concat('%',#{request.createUserName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerInfoMapper.xml
index fa8ffbc..06a2798 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerInfoMapper.xml
@@ -33,25 +33,25 @@
         SELECT *
         FROM biz_resource_customer_info
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.customerNo != null and request.customerNo !=''">
+        <if test="request != null and request.customerNo != null and request.customerNo !=''">
             and customer_no like concat('%',#{request.customerNo},'%')
         </if>
-        <if test="request.customerName != null and request.customerName !=''">
+        <if test="request != null and request.customerName != null and request.customerName !=''">
             and customer_name like concat('%',#{request.customerName},'%')
         </if>
-        <if test="request.contacts != null and request.contacts !=''">
+        <if test="request != null and request.contacts != null and request.contacts !=''">
             and contacts like concat('%',#{request.contacts},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerSuggestFormMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerSuggestFormMapper.xml
index 28f5bb2..1806662 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerSuggestFormMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerSuggestFormMapper.xml
@@ -33,28 +33,28 @@
         SELECT *
         FROM biz_resource_customer_suggest_form
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.formNo != null and request.formNo !=''">
+        <if test="request != null and request.formNo != null and request.formNo !=''">
             and form_no like concat('%',#{request.formNo},'%')
         </if>
-        <if test="request.customerName != null and request.customerName !=''">
+        <if test="request != null and request.customerName != null and request.customerName !=''">
             and customer_name like concat('%',#{request.customerName},'%')
         </if>
-        <if test="request.customerDeptName != null and request.customerDeptName !=''">
+        <if test="request != null and request.customerDeptName != null and request.customerDeptName !=''">
             and customer_dept_name like concat('%',#{request.customerDeptName},'%')
         </if>
-        <if test="request.createUserName != null and request.createUserName !=''">
+        <if test="request != null and request.createUserName != null and request.createUserName !=''">
             and create_user_name like concat('%',#{request.createUserName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSealUseNoteMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSealUseNoteMapper.xml
index ab37bc1..b02bb33 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSealUseNoteMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSealUseNoteMapper.xml
@@ -29,32 +29,32 @@
     </sql>
 
     <select id="selectBatchForApprovalList" resultMap="BaseResultMap">
-        SELECT *
+        SELECT brsun.*, brsi.seal_name, brsi.seal_type, brsi.approver_name
         FROM biz_resource_seal_use_note brsun
         JOIN biz_resource_seal_info brsi ON brsun.seal_id = brsi.id
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and brsun.approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and brsun.create_user_id = #{request.createUserId}
         </if>
-        <if test="request.sealName != null and request.sealName !=''">
+        <if test="request != null and request.sealName != null and request.sealName !=''">
             and brsi.seal_name like concat('%',#{request.sealName},'%')
         </if>
-        <if test="request.sealType != null and request.sealType !=''">
+        <if test="request != null and request.sealType != null and request.sealType !=''">
             and brsi.seal_type = #{request.sealType}
         </if>
-        <if test="request.applyDeptName != null and request.applyDeptName !=''">
+        <if test="request != null and request.applyDeptName != null and request.applyDeptName !=''">
             and brsun.apply_dept_name like concat('%',#{request.applyDeptName},'%')
         </if>
-        <if test="request.applyUserName != null and request.applyUserName !=''">
+        <if test="request != null and request.applyUserName != null and request.applyUserName !=''">
             and brsun.apply_user_name like concat('%',#{request.applyUserName},'%')
         </if>
-        <if test="request.applyTimeStart != null and request.applyTimeStart !=''">
+        <if test="request != null and request.applyTimeStart != null and request.applyTimeStart !=''">
             and brsun.apply_time &gt;= #{request.applyTimeStart}
         </if>
-        <if test="request.applyTimeEnd != null and request.applyTimeEnd !=''">
+        <if test="request != null and request.applyTimeEnd != null and request.applyTimeEnd !=''">
             and brsun.apply_time &lt;= #{request.applyTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml
index 119bf7d..4f8392a 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml
@@ -31,6 +31,12 @@
         <if test="request.deptName != null and request.deptName !=''">
             and brsi.dept_name like concat('%',#{request.deptName},'%')
         </if>
+        <if test="request.ids != null">
+            and brsv.id in
+            <foreach collection="request.ids" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
         ORDER BY brsv.grant_date DESC
     </select>
 
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSupplierInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSupplierInfoMapper.xml
index fe8d399..e8ce7ef 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSupplierInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSupplierInfoMapper.xml
@@ -48,28 +48,28 @@
         SELECT *
         FROM biz_resource_supplier_info
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.supplierNo != null and request.supplierNo !=''">
+        <if test="request != null and request.supplierNo != null and request.supplierNo !=''">
             and supplier_no like concat('%',#{request.supplierNo},'%')
         </if>
-        <if test="request.supplierName != null and request.supplierName !=''">
+        <if test="request != null and request.supplierName != null and request.supplierName !=''">
             and supplier_name like concat('%',#{request.supplierName},'%')
         </if>
-        <if test="request.director != null and request.director !=''">
+        <if test="request != null and request.director != null and request.director !=''">
             and director like concat('%',#{request.director},'%')
         </if>
-        <if test="request.supplierType != null and request.supplierType !=''">
+        <if test="request != null and request.supplierType != null and request.supplierType !=''">
             and supplier_type = #{request.supplierType}
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/EnvLocationInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/EnvLocationInfoMapper.xml
new file mode 100644
index 0000000..68bcf10
--- /dev/null
+++ b/casic-metering-dao/src/main/resources/mapper/resource/EnvLocationInfoMapper.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.mapper.resource.EnvLocationInfoMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.resource.EnvLocationInfo">
+        <id column="id" property="id" />
+        <result column="location_no" property="locationNo" />
+        <result column="location_name" property="locationName" />
+        <result column="location_position" property="locationPosition" />
+        <result column="create_user_id" property="createUserId" />
+        <result column="create_user" property="createUser" />
+        <result column="create_time" property="createTime" />
+        <result column="update_time" property="updateTime" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, location_no, location_name, location_position, create_user_id, create_user, create_time, update_time
+    </sql>
+
+    <select id="selectLocationListPage" resultType="com.casic.missiles.dto.resource.environment.LocationListResponse">
+        SELECT *
+        FROM env_location_info
+        WHERE 1=1
+        <if test="request.locationNo != null and request.locationNo !=''">
+            AND location_no LIKE concat('%',#{request.locationNo},'%')
+        </if>
+        <if test="request.locationName != null and request.locationName !=''">
+            AND location_name LIKE concat('%',#{request.locationName},'%')
+        </if>
+        ORDER BY create_time DESC
+    </select>
+
+</mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml
index b28c18f..8854047 100644
--- a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml
@@ -11,7 +11,6 @@
         <result column="sign_desc" property="signDesc" />
         <result column="sign_director" property="signDirector" />
         <result column="sign_user_id" property="signUserId" />
-        <result column="sign_type" property="signType" />
         <result column="minio_file_name" property="minioFileName" />
         <result column="create_time" property="createTime" />
         <result column="update_time" property="updateTime" />
@@ -28,7 +27,6 @@
         <result column="sign_name" property="signName" />
         <result column="sign_desc" property="signDesc" />
         <result column="sign_director" property="signDirector" />
-        <result column="sign_type" property="signType" />
         <result column="sign_user_id" property="signUserId" />
         <result column="minio_file_name" property="minioFileName" />
         <result column="create_time" property="createTime" />
@@ -62,4 +60,58 @@
         JOIN system_sign_user_relation ssur ON ss.id = ssur.sign_id
         WHERE ssur.user_id = #{userId}
     </select>
+
+    <select id="selectSignListPage" resultMap="BaseResultMap">
+        SELECT ss.*, sd.SIMPLE_NAME AS deptName
+        FROM system_sign ss
+        LEFT JOIN sys_user su ON su.id = ss.sign_user_id
+        LEFT JOIN sys_dept sd ON sd.id = su.dept_id
+        WHERE 1=1
+        <if test="request.signNo != null and request.signNo !=''">
+            AND ss.sign_no LIKE concat('%',#{request.signNo},'%')
+        </if>
+        <if test="request.signName != null and request.signName !=''">
+            AND ss.sign_name LIKE concat('%',#{request.signName},'%')
+        </if>
+        <if test="request.signDirector != null and request.signDirector !=''">
+            AND ss.sign_director LIKE concat('%',#{request.signDirector},'%')
+        </if>
+        <if test="request.signUserId != null and request.signUserId !=''">
+            AND ss.sign_user_id = #{request.signUserId}
+        </if>
+        <if test="request.createStartTime != null and request.createStartTime !=''">
+            AND DATE_FORMAT(ss.create_time,'%Y-%m-%d') &gt;= DATE_FORMAT(#{request.createStartTime},'%Y-%m-%d')
+        </if>
+        <if test="request.createEndTime != null and request.createEndTime !=''">
+            AND DATE_FORMAT(ss.create_time,'%Y-%m-%d')  &lt;= DATE_FORMAT(#{request.createEndTime},'%Y-%m-%d')
+        </if>
+        ORDER BY ss.create_time DESC
+    </select>
+
+    <select id="selectSignList" resultMap="BaseResultMap">
+        SELECT ss.*, sd.SIMPLE_NAME AS deptName
+        FROM system_sign ss
+        LEFT JOIN sys_user su ON su.id = ss.sign_user_id
+        LEFT JOIN sys_dept sd ON sd.id = su.dept_id
+        WHERE 1=1
+        <if test="request.signNo != null and request.signNo !=''">
+            AND ss.sign_no LIKE concat('%',#{request.signNo},'%')
+        </if>
+        <if test="request.signName != null and request.signName !=''">
+            AND ss.sign_name LIKE concat('%',#{request.signName},'%')
+        </if>
+        <if test="request.signDirector != null and request.signDirector !=''">
+            AND ss.sign_director LIKE concat('%',#{request.signDirector},'%')
+        </if>
+        <if test="request.signUserId != null and request.signUserId !=''">
+            AND ss.sign_user_id = #{request.signUserId}
+        </if>
+        <if test="request.createStartTime != null and request.createStartTime !=''">
+            AND DATE_FORMAT(ss.create_time,'%Y-%m-%d') &gt;= DATE_FORMAT(#{request.createStartTime},'%Y-%m-%d')
+        </if>
+        <if test="request.createEndTime != null and request.createEndTime !=''">
+            AND DATE_FORMAT(ss.create_time,'%Y-%m-%d')  &lt;= DATE_FORMAT(#{request.createEndTime},'%Y-%m-%d')
+        </if>
+        ORDER BY ss.create_time DESC
+    </select>
 </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 515050a..60f530b 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
@@ -47,8 +47,8 @@
     String STORAGE_LOCATION = "bizStorageLocation";
     //计量专业
     String MEASURE_MAJOR = "bizMeasureMajor";
-    //管理状态
-    String MANAGER_STATE = "bizManagerState";
+    //标准装置管理状态
+    String STANDARD_MANAGER_STATE = "bizStandardManagerState";
 
     /**
      * 资源管理 字典code
@@ -95,8 +95,6 @@
     String MEASURE_STATUS = "measureStatus";
     //检定方式
     String MEASURE_TYPE = "measureType";
-    //标识打印标志类型
-    String IDENTIFY_PRINT_TYPE = "bizBusinessIdentify";
     //变更类型
     String REPORT_CHANGE_TYPE = "bizCertChangeType";
     //规模类型
@@ -111,19 +109,24 @@
     String MEASURE_CATEGORY = "measureCategory";
     //检定结果
     String MEASURE_RESULT = "measureResult";
+    //分包原因
+    String OUTSOURCE_REASON = "outsourceReason";
+
+    /**
+     * 系统管理
+     */
+    String TEMPLATE_TYPE = "templateType";
+
 
     /**
      * 标准装置 字典code
      */
     //类别
     String STANDARD_CATEGORY = "standardCategory";
-    //管理状态
-    String STANDARD_MANAGER_STATE = "standardManagerState";
     //标准等级
     String STANDARD_LEVEL = "standardLevel";
     //传递范围
     String STANDARD_TRANSMIT_RANGE = "transmitRange";
-
     //资本来源
     String CAPITAL_SOURCE = "capitalSource";
     //标准装置-申请类型
@@ -148,8 +151,6 @@
     String CERTIFICATE_CLASS = "certificationClass";
     //证书管理-检校专业
     String CALIBRATION_MAJOR = "calibrationMajor";
-    //分包原因
-    String OUTSOURCE_REASON = "outsourceReason";
 
     /**
      * 工作台
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/BaseApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/BaseApprovalListRequest.java
index 73c12c1..80d7424 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/BaseApprovalListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/BaseApprovalListRequest.java
@@ -6,6 +6,7 @@
 
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotEmpty;
+import java.util.List;
 
 /**
  * @Description:
@@ -19,14 +20,14 @@
      * 表单id
      */
     @NotBlank(message = "表单id不能为空")
-    @ApiModelProperty(value = "表单id（流程定义对应的表单id，等价于业务id）", dataType = "String")
+    @ApiModelProperty(value = "表单id（流程定义对应的表单id，等价于业务id），导出接口不用传", dataType = "String")
     private String formId;
 
     /**
      * 审批状态类型，对应ApprovalStatusEnum
      */
     @NotEmpty(message = "审批状态类型不能为空")
-    @ApiModelProperty(value = "审批状态类型code", dataType = "String")
+    @ApiModelProperty(value = "审批状态类型code，导出接口不用传", dataType = "String")
     private String approvalStatus;
 
     @ApiModelProperty(hidden = true)
@@ -34,4 +35,7 @@
 
     @ApiModelProperty(hidden = true)
     private Long createUserId;
+
+    @ApiModelProperty(value = "导出ids", dataType = "List")
+    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificatePrintApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificatePrintApprovalListRequest.java
index b93d1c9..3cc2f4e 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificatePrintApprovalListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificatePrintApprovalListRequest.java
@@ -5,8 +5,6 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import java.util.List;
-
 /**
  * @Description:
  * @Author: wangpeng
@@ -38,7 +36,4 @@
 
     @ApiModelProperty(value = "创建结束时间", dataType = "String")
     private String createTimeEnd;
-
-    @ApiModelProperty(value = "导出ids", dataType = "List")
-    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportApprovalListRequest.java
index 4f7a038..c115847 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportApprovalListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportApprovalListRequest.java
@@ -5,8 +5,6 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import java.util.List;
-
 /**
  * @Description:
  * @Author: wangpeng
@@ -15,6 +13,8 @@
 @ApiModel
 @Data
 public class CertificateReportApprovalListRequest extends BaseApprovalListRequest {
+    @ApiModelProperty(value = "委托方id", dataType = "String")
+    private Long customerId;
 
     @ApiModelProperty(value = "证书报告编号", dataType = "String")
     private String certificateReportNo;
@@ -37,6 +37,4 @@
     @ApiModelProperty(value = "检校结束时间", dataType = "String")
     private String calibrationTimeEnd;
 
-    @ApiModelProperty(value = "导出ids", dataType = "List")
-    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/identify/IdentifyListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/identify/IdentifyListRequest.java
index 1b87ae6..f019203 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/identify/IdentifyListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/identify/IdentifyListRequest.java
@@ -4,6 +4,8 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * @Description:
  * @Author: wangpeng
@@ -26,4 +28,7 @@
 
     @ApiModelProperty(value = "打印结束时间", dataType = "String")
     private String createTimeEnd;
+
+    @ApiModelProperty(value = "导出ids", dataType = "List")
+    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListRequest.java
index 1264883..62415fb 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListRequest.java
@@ -7,6 +7,7 @@
 import lombok.Data;
 
 import javax.validation.constraints.NotBlank;
+import java.util.List;
 
 @Data
 @ApiModel
@@ -37,4 +38,6 @@
     @ApiModelProperty(value = "是否加急（1是0否null全部）", dataType = "Integer")
     private String isUrgent;
 
+    @ApiModelProperty(value = "导出ids", dataType = "List")
+    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListRequest.java
index 5201d7b..499760a 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListRequest.java
@@ -17,6 +17,9 @@
     @ApiModelProperty(value = "任务单编号", dataType = "String")
     private String orderNo;
 
+    @ApiModelProperty(value = "委托方id", dataType = "Long")
+    private Long customerId;
+
     @ApiModelProperty(value = "委托方名称", dataType = "String")
     private String customerName;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OrderSampleDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OrderSampleDTO.java
new file mode 100644
index 0000000..796edc0
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OrderSampleDTO.java
@@ -0,0 +1,19 @@
+package com.casic.missiles.dto.business.outsource;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/8/24 11:38
+ */
+@ApiModel
+@Data
+public class OrderSampleDTO {
+    @ApiModelProperty(value = "任务单id", dataType = "Long")
+    private Long orderId;
+    @ApiModelProperty(value = "受检设备id", dataType = "Long")
+    private Long sampleId;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceAssessApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceAssessApprovalListRequest.java
new file mode 100644
index 0000000..9a930c3
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceAssessApprovalListRequest.java
@@ -0,0 +1,30 @@
+package com.casic.missiles.dto.business.outsource;
+
+import com.casic.missiles.dto.BaseApprovalListRequest;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/8/24 11:01
+ */
+@ApiModel
+@Data
+public class OutsourceAssessApprovalListRequest extends BaseApprovalListRequest {
+    @ApiModelProperty(value = "评审表编号", dataType = "String")
+    private String projectNo;
+
+    @ApiModelProperty(value = "分包机构名称", dataType = "String")
+    private String outsourcerName;
+
+    @ApiModelProperty(value = "申请人", dataType = "String")
+    private String applicantName;
+
+    @ApiModelProperty(value = "申请时间开始", dataType = "String")
+    private String applicantTimeStart;
+
+    @ApiModelProperty(value = "申请时间结束", dataType = "String")
+    private String applicantTimeEnd;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceAssessSaveResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceAssessSaveResponse.java
new file mode 100644
index 0000000..8bf9aad
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceAssessSaveResponse.java
@@ -0,0 +1,20 @@
+package com.casic.missiles.dto.business.outsource;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/8/14 16:17
+ */
+@ApiModel
+@Data
+public class OutsourceAssessSaveResponse {
+    @ApiModelProperty(value = "主键id", dataType = "Long")
+    private Long id;
+
+    @ApiModelProperty(value = "编号", dataType = "String")
+    private String projectNo;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProtocolApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProtocolApprovalListRequest.java
new file mode 100644
index 0000000..0f32331
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProtocolApprovalListRequest.java
@@ -0,0 +1,30 @@
+package com.casic.missiles.dto.business.outsource;
+
+import com.casic.missiles.dto.BaseApprovalListRequest;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/8/24 15:01
+ */
+@ApiModel
+@Data
+public class OutsourceProtocolApprovalListRequest extends BaseApprovalListRequest {
+    @ApiModelProperty(value = "协议书编号", dataType = "String")
+    private String protocolNo;
+
+    @ApiModelProperty(value = "分包方名称", dataType = "String")
+    private String outsourcerName;
+
+    @ApiModelProperty(value = "申请人", dataType = "String")
+    private String applicantName;
+
+    @ApiModelProperty(value = "申请时间开始", dataType = "String")
+    private String applicantTimeStart;
+
+    @ApiModelProperty(value = "申请时间结束", dataType = "String")
+    private String applicantTimeEnd;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProtocolSaveResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProtocolSaveResponse.java
new file mode 100644
index 0000000..e324967
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProtocolSaveResponse.java
@@ -0,0 +1,20 @@
+package com.casic.missiles.dto.business.outsource;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/8/14 16:17
+ */
+@ApiModel
+@Data
+public class OutsourceProtocolSaveResponse {
+    @ApiModelProperty(value = "主键id", dataType = "Long")
+    private Long id;
+
+    @ApiModelProperty(value = "编号", dataType = "String")
+    private String protocolNo;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveApprovalListRequest.java
index f29f4e4..7047c28 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveApprovalListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveApprovalListRequest.java
@@ -5,8 +5,6 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import java.util.List;
-
 /**
  * @Description: 现场检测审批列表请求实体
  * @Author: wangpeng
@@ -30,7 +28,4 @@
     @ApiModelProperty(value = "申请时间结束", dataType = "String")
     private String applyTimeEnd;
 
-    @ApiModelProperty(value = "导出ids", dataType = "List")
-    private List<Long> ids;
-
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveDetailResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveDetailResponse.java
index 1f28752..394c934 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveDetailResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveDetailResponse.java
@@ -12,6 +12,18 @@
     @ApiModelProperty(value = "id，更新/删除使用参数", dataType = "Long")
     private Long id;
 
+    @ApiModelProperty(value = "实验室代码(字典code)", dataType = "String")
+    private String labCode;
+
+    @ApiModelProperty(value = "实验室代码(字典value)", dataType = "String")
+    private String labCodeName;
+
+    @ApiModelProperty(value = "组别代码(字典code)", dataType = "String")
+    private String groupCode;
+
+    @ApiModelProperty(value = "组别代码(字典value)", dataType = "String")
+    private String groupCodeName;
+
     @ApiModelProperty(value = "审批编号", dataType = "String")
     private String siteExecutiveNo;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/environment/LocationListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/environment/LocationListRequest.java
new file mode 100644
index 0000000..13d03c3
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/environment/LocationListRequest.java
@@ -0,0 +1,20 @@
+package com.casic.missiles.dto.resource.environment;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/6/8 13:56
+ */
+@ApiModel
+@Data
+public class LocationListRequest {
+    @ApiModelProperty(value = "地点编号", dataType = "String")
+    private String locationNo;
+
+    @ApiModelProperty(value = "地点名称", dataType = "String")
+    private String locationName;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/environment/LocationListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/environment/LocationListResponse.java
new file mode 100644
index 0000000..4c531af
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/environment/LocationListResponse.java
@@ -0,0 +1,78 @@
+package com.casic.missiles.dto.resource.environment;
+
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
+import com.baomidou.mybatisplus.annotation.TableField;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description: 地点列表响应实体
+ * @Author: wangpeng
+ * @Date: 2023/6/8 13:53
+ */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
+@ApiModel
+@Data
+public class LocationListResponse {
+    @ApiModelProperty(value = "主键id", dataType = "Long")
+    private Long id;
+
+    /**
+     * 地点编号
+     */
+    @ExcelProperty("地点编号")
+    @ApiModelProperty(value = "地点编号", dataType = "String")
+    private String locationNo;
+
+    /**
+     * 地点名称
+     */
+    @ExcelProperty("地点名称")
+    @ApiModelProperty(value = "地点名称", dataType = "String")
+    private String locationName;
+
+    /**
+     * 地点位置
+     */
+    @ExcelProperty("地点位置")
+    @ApiModelProperty(value = "地点位置", dataType = "String")
+    private String locationPosition;
+
+    /**
+     * 创建人id
+     */
+    @ApiModelProperty(value = "创建人id", dataType = "Long")
+    private Long createUserId;
+
+    /**
+     * 创建人
+     */
+    @ExcelProperty("创建人")
+    @ApiModelProperty(value = "创建人", dataType = "String")
+    @TableField("create_user")
+    private String createUser;
+
+    /**
+     * 创建时间
+     */
+    @ExcelProperty("创建时间")
+    @ApiModelProperty(value = "创建时间", dataType = "String")
+    private String createTime;
+
+    /**
+     * 更新时间
+     */
+    @ApiModelProperty(value = "更新时间", dataType = "String")
+    private String updateTime;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertRequest.java
index 9a7f6c6..c827915 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertRequest.java
@@ -4,6 +4,8 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * @Description:
  * @Author: wangpeng
@@ -16,4 +18,7 @@
     private String name;
     @ApiModelProperty(value = "部门名", dataType = "String")
     private String deptName;
+
+    @ApiModelProperty(value = "导出ids", dataType = "List")
+    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertResponse.java
index f78b159..8f2f79e 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertResponse.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.dto.resource.staff;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.casic.missiles.annotation.DictCodeField;
 import com.casic.missiles.constants.MeterDictCode;
 import io.swagger.annotations.ApiModel;
@@ -13,12 +20,18 @@
  * @Author: wangpeng
  * @Date: 2023/7/27 15:13
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @ApiModel
 @Data
 public class StaffCertResponse {
     /**
      * 人员编号
      */
+    @ExcelProperty(value = "人员编号",order = 0)
     @NotEmpty(message = "人员编号不能为空")
     @ApiModelProperty(value = "人员编号", dataType = "String")
     private String staffNo;
@@ -26,6 +39,7 @@
     /**
      * 姓名
      */
+    @ExcelProperty(value = "姓名",order = 1)
     @ApiModelProperty(value = "姓名", dataType = "String")
     private String staffName;
 
@@ -54,6 +68,7 @@
     /**
      * 部门名字
      */
+    @ExcelProperty(value = "工作部门",order = 2)
     @ApiModelProperty(value = "部门名字", dataType = "String")
     private String deptName;
 
@@ -66,6 +81,7 @@
     /**
      * 计量专业
      */
+    @ExcelProperty(value = "计量专业",order = 3)
     @ApiModelProperty(value = "计量专业", dataType = "String")
     private String major;
 
@@ -110,6 +126,7 @@
     /**
      * 证书号
      */
+    @ExcelProperty(value = "证号",order = 4)
     @ApiModelProperty(value = "证书号", dataType = "String")
     private String certNo;
 
@@ -122,12 +139,14 @@
     /**
      * 有效日期
      */
+    @ExcelProperty(value = "证书有效期",order = 6)
     @ApiModelProperty(value = "有效日期", dataType = "String")
     private String effectiveDate;
 
     /**
      * 发放日期
      */
+    @ExcelProperty(value = "发证日期",order = 5)
     @ApiModelProperty(value = "发放日期", dataType = "String")
     private String grantDate;
 

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java
index bb0c50f..13a699b 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java
@@ -12,6 +12,7 @@
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.IGeneralApprovalService;
+import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
@@ -19,6 +20,7 @@
 import org.springframework.web.bind.annotation.RequestBody;
 
 import javax.validation.Valid;
+import java.util.List;
 import java.util.Objects;
 
 /**
@@ -117,4 +119,17 @@
         }
         return baseApprovalService.failUpdate(request);
     }
+
+    public List<O> exportList(@RequestBody @Valid R request) throws Exception {
+        List<O> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = baseApprovalService.listExportByIds(request.getIds());
+        } else {
+            list = baseApprovalService.listExport(request);
+        }
+        for (O record : list) {
+            DictCodeUtils.convertDictCodeToName(record);
+        }
+        return list;
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java
index 8a90961..d775831 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java
@@ -5,6 +5,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.business.certificate.CertificateChangeApplyApprovalListRequest;
 import com.casic.missiles.dto.business.certificate.CertificateChangeApplySaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessCertificateChangeApply;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
@@ -20,6 +21,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -48,4 +50,12 @@
         }
         return changeApplyService.saveChangeApply(request);
     }
+
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody CertificateChangeApplyApprovalListRequest request) throws Exception {
+        List<BizBusinessCertificateChangeApply> list = super.exportList(request);
+        super.exportExcel(BizBusinessCertificateChangeApply.class, list, ExportEnum.CERTIFICATE_CHANGE_APPLY.getSheetName());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java
index 5fc4b07..af8230e 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java
@@ -9,6 +9,7 @@
 import com.casic.missiles.dto.business.certificate.CertificatePrintApprovalListRequest;
 import com.casic.missiles.dto.business.certificate.CertificatePrintListResponse;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.enums.business.CertificatePrintStatusEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessCertificatePrintLog;
@@ -18,10 +19,16 @@
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.io.IOException;
+import java.util.List;
 import java.util.Objects;
 
 /**
@@ -98,4 +105,16 @@
         });
         return certificatePrintService.certificatePrintLog(idDTO.getId());
     }
+
+    @ApiOperation("证书打印审批导出")
+    @PostMapping("/listExport")
+    public void exportList(@RequestBody CertificatePrintApprovalListRequest request) throws IOException {
+        List<CertificatePrintListResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = certificatePrintService.listByIds(request.getIds());
+        } else {
+            list = certificatePrintService.list(request);
+        }
+        super.exportExcel(CertificatePrintListResponse.class, list, ExportEnum.CERTIFICATE_PRINT.getSheetName());
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java
index 63b06dc..6b2efd5 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java
@@ -6,6 +6,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.business.certificate.CertificateReportApprovalListRequest;
 import com.casic.missiles.dto.business.certificate.CertificateReportSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessCertificateReport;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
@@ -21,6 +22,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -50,7 +52,7 @@
         return certificateReportService.saveCertificateReport(request);
     }
 
-    @ApiOperation("证书审批详情（基本信息）")
+    @ApiOperation("详情（基本信息）")
     @PostMapping("/detail")
     public ReturnDTO<BizBusinessCertificateReport> detail(@RequestBody @Valid BaseDetailRequest request, BindingResult bindingResult) throws Exception {
         if(bindingResult.hasErrors()){
@@ -59,4 +61,11 @@
         return certificateReportService.detail(request);
     }
 
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody CertificateReportApprovalListRequest request) throws Exception {
+        List<BizBusinessCertificateReport> list = super.exportList(request);
+        super.exportExcel(BizBusinessCertificateReport.class, list, ExportEnum.CERTIFICATE_REPORT.getSheetName());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java
index 46b26bd..57c0809 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java
@@ -10,20 +10,21 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.business.identify.IdentifyListRequest;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessIdentifyInfo;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.business.IBizBusinessIdentifyInfoService;
+import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import javax.validation.Valid;
+import java.util.List;
 import java.util.Objects;
 
 /**
@@ -57,16 +58,13 @@
         return identifyInfoService.addIdentify(identifyInfo);
     }
 
-    @ApiOperation("标识打印更新")
+    @ApiOperation("标识打印更新（更新打印时间）")
     @PostMapping("/update")
-    public ReturnDTO updateIdentify(@RequestBody @Valid BizBusinessIdentifyInfo identifyInfo, BindingResult bindingResult) {
-        Assert.isFalse(Objects.isNull(identifyInfo.getId()), () -> {
+    public ReturnDTO updateIdentify(@RequestBody @Valid IdDTO idDTO) {
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        Assert.isFalse(bindingResult.hasErrors(), () -> {
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        });
-        return identifyInfoService.updateIdentify(identifyInfo);
+        return identifyInfoService.updateIdentify(idDTO.getId());
     }
 
     @ApiOperation("标识打印删除")
@@ -77,4 +75,37 @@
         });
         return identifyInfoService.deleteIdentify(idDTO.getId());
     }
+
+    @ApiOperation("标识打印导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody @Valid IdentifyListRequest request, BindingResult bindingResult) throws Exception {
+        if (bindingResult.hasErrors()) {
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        List<BizBusinessIdentifyInfo> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = identifyInfoService.listByIds(request.getIds());
+        } else {
+            list = identifyInfoService.list(request);
+        }
+        for (BizBusinessIdentifyInfo record : list) {
+            DictCodeUtils.convertDictCodeToName(record);
+        }
+        super.exportExcel(BizBusinessIdentifyInfo.class, list, ExportEnum.IDENTIFY_EXPORT.getSheetName());
+    }
+
+
+    // TODO: 2023/8/23 查询设备信息，4个底部按钮查设备（按钮的作用就是前端用来调不同接口、用来区分中间即将展示的标识），前端弹窗选设备，在确定保存时前端根据底部按钮判断传入设备类型deviceType字典code
+    // TODO: 2023/8/23 接口：查受检设备（第1个按钮），查设备台账（后3个按钮同一接口），查询之后前端根据标志类型的不同加到中间页面时进行判断（按产品给的对应表）
+    // TODO: 2023/8/23 提供二维码接口，前端在加到中间页面时调用一下
+
+    @ApiOperation("设备二维码")
+    @PostMapping("/equipment/qrCode")
+    public ReturnDTO<String> equipmentQrCode(@RequestBody @Valid IdDTO idDTO) {
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return identifyInfoService.equipmentQrCode(idDTO.getId());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java
index 707be6e..7e0453d 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java
@@ -117,7 +117,7 @@
     }
 
     @ApiOperation("任务单导出")
-    @PostMapping("/export")
+    @PostMapping("/listExport")
     public void orderExport(@RequestBody @Valid OrderListRequest request, HttpServletResponse response) {
         businessOrderService.orderExport(request, response);
     }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java
index 529a6ce..51432be 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java
@@ -1,9 +1,28 @@
 package com.casic.missiles.controller.business;
 
+import com.casic.missiles.controller.GeneralApprovalController;
+import com.casic.missiles.dto.BaseApprovalSubmitRequest;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.business.outsource.OutsourceAssessApprovalListRequest;
+import com.casic.missiles.dto.business.outsource.OutsourceAssessSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
+import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.model.business.BizBusinessOutsourceAssess;
+import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
+import com.casic.missiles.service.IGeneralApprovalService;
+import com.casic.missiles.service.business.IBizBusinessOutsourceAssessService;
 import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.BindingResult;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.validation.Valid;
+import java.util.List;
+
 /**
  * <p>
  * 计量检定业务-分包管理-测试、校准或检定工作分包评审表 前端控制器
@@ -15,6 +34,27 @@
 @Api(tags = "分包管理-测试、校准或检定工作分包评审表")
 @RestController
 @RequestMapping("/business/outsource/assess")
-public class BizBusinessOutsourceAssessController {
+public class BizBusinessOutsourceAssessController extends GeneralApprovalController<BizBusinessOutsourceAssess, BizBusinessOutsourceAssess, OutsourceAssessApprovalListRequest, BaseApprovalSubmitRequest> {
+    @Autowired
+    private IBizBusinessOutsourceAssessService outsourceAssessService;
 
+    public BizBusinessOutsourceAssessController(IGeneralApprovalService<BizBusinessOutsourceAssess, BizBusinessOutsourceAssess, OutsourceAssessApprovalListRequest, BaseApprovalSubmitRequest> baseApprovalService) {
+        super(baseApprovalService);
+    }
+
+    @ApiOperation("草稿箱-保存")
+    @PostMapping("/save")
+    public ReturnDTO<OutsourceAssessSaveResponse> saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceAssess request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        return outsourceAssessService.saveOutsourceAssess(request);
+    }
+
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception {
+        List<BizBusinessOutsourceAssess> list = super.exportList(request);
+        super.exportExcel(BizBusinessOutsourceAssess.class, list, ExportEnum.OUTSOURCE_ASSESS.getSheetName());
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java
new file mode 100644
index 0000000..9adef18
--- /dev/null
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java
@@ -0,0 +1,60 @@
+package com.casic.missiles.controller.business;
+
+import com.casic.missiles.controller.GeneralApprovalController;
+import com.casic.missiles.dto.BaseApprovalSubmitRequest;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.business.outsource.OutsourceProtocolApprovalListRequest;
+import com.casic.missiles.dto.business.outsource.OutsourceProtocolSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
+import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.model.business.BizBusinessOutsourceProtocol;
+import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
+import com.casic.missiles.service.IGeneralApprovalService;
+import com.casic.missiles.service.business.IBizBusinessOutsourceProtocolService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.BindingResult;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.validation.Valid;
+import java.util.List;
+
+/**
+ * <p>
+ * 计量检定业务-分包管理-测试、校准或检定工作分包协议书 前端控制器
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-08-24
+ */
+@Api(tags = "分包管理-测试、校准或检定工作分包协议书")
+@RestController
+@RequestMapping("/business/outsource/protocol")
+public class BizBusinessOutsourceProtocolController extends GeneralApprovalController<BizBusinessOutsourceProtocol, BizBusinessOutsourceProtocol, OutsourceProtocolApprovalListRequest, BaseApprovalSubmitRequest> {
+    @Autowired
+    private IBizBusinessOutsourceProtocolService outsourceProtocolService;
+
+    public BizBusinessOutsourceProtocolController(IGeneralApprovalService<BizBusinessOutsourceProtocol, BizBusinessOutsourceProtocol, OutsourceProtocolApprovalListRequest, BaseApprovalSubmitRequest> baseApprovalService) {
+        super(baseApprovalService);
+    }
+
+    @ApiOperation("草稿箱-保存")
+    @PostMapping("/save")
+    public ReturnDTO<OutsourceProtocolSaveResponse> saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceProtocol request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        return outsourceProtocolService.saveOutsourceProtocol(request);
+    }
+
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody OutsourceProtocolApprovalListRequest request) throws Exception {
+        List<BizBusinessOutsourceProtocol> list = super.exportList(request);
+        super.exportExcel(BizBusinessOutsourceProtocol.class, list, ExportEnum.OUTSOURCE_PROTOCOL.getSheetName());
+    }
+}
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java
index 097f645..f0f0943 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java
@@ -17,7 +17,6 @@
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.IGeneralApprovalService;
 import com.casic.missiles.service.business.IBizBusinessOutsourcerInfoService;
-import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -71,19 +70,8 @@
 
     @ApiOperation("分包方导出")
     @PostMapping("/listExport")
-    public void export(@RequestBody @Valid OutsourcerInfoApprovalListRequest request, BindingResult bindingResult) throws Exception {
-        if (bindingResult.hasErrors()) {
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        }
-        List<BizBusinessOutsourcerInfo> list;
-        if (!CollectionUtils.isEmpty(request.getIds())) {
-            list = outsourcerInfoService.listByIds(request.getIds());
-        } else {
-            list = outsourcerInfoService.list(request);
-        }
-        for (BizBusinessOutsourcerInfo record : list) {
-            DictCodeUtils.convertDictCodeToName(record);
-        }
+    public void export(@RequestBody OutsourcerInfoApprovalListRequest request) throws Exception {
+        List<BizBusinessOutsourcerInfo> list = super.exportList(request);
         super.exportExcel(BizBusinessOutsourcerInfo.class, list, ExportEnum.OUTSOURCER_EXPORT.getSheetName());
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java
index c2cbf9f..0410918 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java
@@ -17,11 +17,9 @@
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.IGeneralApprovalService;
 import com.casic.missiles.service.business.IBizBusinessSiteExecutiveInfoService;
-import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -60,7 +58,7 @@
         return siteExecutiveInfoService.saveSiteExecutiveInfo(siteExecutiveInfo);
     }
 
-    @ApiOperation("现场检测详情")
+    @ApiOperation("详情")
     @PostMapping("/detail")
     public ReturnDTO<SiteExecutiveDetailResponse> siteExecutiveDetail(@RequestBody @Valid IdDTO idDTO) throws Exception {
         Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
@@ -69,21 +67,10 @@
         return ReturnUtil.success(siteExecutiveInfoService.detail(idDTO.getId()));
     }
 
-    @ApiOperation("现场检测导出")
+    @ApiOperation("导出")
     @PostMapping("/listExport")
-    public void export(@RequestBody @Valid SiteExecutiveApprovalListRequest request, BindingResult bindingResult) throws Exception {
-        if (bindingResult.hasErrors()) {
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        }
-        List<SiteExecutiveApprovalListResponse> list;
-        if (!CollectionUtils.isEmpty(request.getIds())) {
-            list = siteExecutiveInfoService.listInfoByIds(request.getIds());
-        } else {
-            list = siteExecutiveInfoService.listInfo(request);
-        }
-        for (SiteExecutiveApprovalListResponse record : list) {
-            DictCodeUtils.convertDictCodeToName(record);
-        }
+    public void export(@RequestBody SiteExecutiveApprovalListRequest request) throws Exception {
+        List<SiteExecutiveApprovalListResponse> list = super.exportList(request);
         super.exportExcel(SiteExecutiveApprovalListResponse.class, list, ExportEnum.SITE_EXECUTIVE_EXPORT.getSheetName());
     }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
index 7e793cd..a92e209 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
@@ -55,7 +55,7 @@
 
     @ApiOperation("设备收发列表导出")
     @PostMapping("/export")
-    public void exportList(@RequestBody @Valid SampleDispatchListRequest request) throws IOException {
+    public void exportList(@RequestBody SampleDispatchListRequest request) throws IOException {
         List<SampleDispatchListResponse> list;
         if (!CollectionUtils.isEmpty(request.getIds())) {
             list = dispatchService.listByIds(request.getIds());
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java
index cdc77fc..d120fd4 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java
@@ -7,6 +7,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.business.labExecutive.*;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.business.IBusinessLabExecutiveInfoService;
@@ -14,6 +15,7 @@
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.*;
 
@@ -32,7 +34,7 @@
     @Autowired
     private IBusinessLabExecutiveInfoService labExecutiveInfoService;
 
-    @ApiOperation("实验室检测-部门检测-查询各状态列表（待检测、检测中、检测完）")
+    @ApiOperation("实验室任务-查询各状态列表（待检测、检测中、检测完）")
     @PostMapping("/deptExecutive/List")
     public ReturnDTO<PageInfoBT<SampleLabExecutiveListResponse>> queryDeptExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
@@ -43,10 +45,19 @@
         return ReturnUtil.success(super.packForBT(labExecutiveInfoService.deptLabExecutiveListPage(page, labExecutiveListRequest)));
     }
 
-    /**
-     * 实验室检测-我的检测-查询各状态列表（待检测、检测中、检测完）
-     */
-    @ApiOperation("实验室检测-我的检测-查询各状态列表（待检测、检测中、检测完）")
+    @ApiOperation("实验室任务导出")
+    @PostMapping("/deptExecutive/export")
+    public void deptExportList(@RequestBody @Valid SampleLabExecutiveListRequest request) throws Exception {
+        List<SampleLabExecutiveListResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = labExecutiveInfoService.deptLabExecutiveListByIds(request.getMeasureStatus(), request.getIds());
+        } else {
+            list = labExecutiveInfoService.deptLabExecutiveList(request);
+        }
+        super.exportExcel(SampleLabExecutiveListResponse.class, list, ExportEnum.DEPT_EXECUTIVE_TASK.getSheetName());
+    }
+
+    @ApiOperation("我的任务-查询各状态列表（待检测、检测中、检测完）")
     @PostMapping("/myExecutive/list")
     public ReturnDTO<PageInfoBT<SampleLabExecutiveListResponse>> queryMyExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
@@ -57,19 +68,25 @@
         return ReturnUtil.success(super.packForBT(labExecutiveInfoService.myLabExecutiveListPage(page, labExecutiveListRequest)));
     }
 
-    /**
-     * 实验室检测-我的检测-查询各状态样品数量（待检测、检测中、检测完）
-     */
-    @ApiOperation("实验室检测-我的检测-查询各状态样品数量（待检测、检测中、检测完）")
+    @ApiOperation("我的任务导出")
+    @PostMapping("/myExecutive/export")
+    public void exportList(@RequestBody @Valid SampleLabExecutiveListRequest request) throws Exception {
+        List<SampleLabExecutiveListResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = labExecutiveInfoService.myLabExecutiveListByIds(request.getMeasureStatus(), request.getIds());
+        } else {
+            list = labExecutiveInfoService.myLabExecutiveList(request);
+        }
+        super.exportExcel(SampleLabExecutiveListResponse.class, list, ExportEnum.MY_EXECUTIVE_TASK.getSheetName());
+    }
+
+    @ApiOperation("我的任务-查询各状态样品数量（待检测、检测中、检测完）")
     @GetMapping("/myExecutive/amount")
     public ReturnDTO<List<SampleAmountResponse>> queryMyExecutiveAmount() {
         return ReturnUtil.success(labExecutiveInfoService.myExecutiveAmount());
     }
 
-    /**
-     * 实验室检测-部门检测-分配（分配给具体人员）
-     */
-    @ApiOperation("实验室检测-部门检测-分配按钮（分配给具体人员）")
+    @ApiOperation("实验室任务-分配按钮（分配给具体人员）")
     @PostMapping("/deptExecutive/allocate")
     public ReturnDTO allocateStaff(@RequestBody @Valid SampleAllocateRequest sampleAllocateRequest, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -78,10 +95,7 @@
         return labExecutiveInfoService.allocateStaff(sampleAllocateRequest);
     }
 
-    /**
-     * 实验室检测-我的检测-检定人扫描收入（待检测->检测中）
-     */
-    @ApiOperation("实验室检测-我的检测-检定人扫描收入（待检测->检测中）")
+    @ApiOperation("我的任务-检定人扫描收入（待检测->检测中）")
     @PostMapping("/myExecutive/receive")
     public ReturnDTO sampleReceive(@RequestBody @Valid List<SampleOperateRequest> requestList, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -90,10 +104,7 @@
         return labExecutiveInfoService.sampleReceive(requestList);
     }
 
-    /**
-     * 实验室检测-负责人/检定人扫描检完（检测中->检测完）
-     */
-    @ApiOperation("实验室检测-负责人/检定人扫描检完（检测中->检测完）")
+    @ApiOperation("实验室任务-负责人/检定人扫描检完（检测中->检测完）")
     @PostMapping("/myExecutive/complete")
     public ReturnDTO sampleExecutiveComplete(@RequestBody @Valid List<SampleOperateRequest> requestList, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -102,10 +113,7 @@
         return labExecutiveInfoService.sampleExecutiveComplete(requestList);
     }
 
-    /**
-     * 实验室检测-部门检测/我的检测 编辑（只能修改应出具证书）
-     */
-    @ApiOperation("实验室检测-部门检测/我的检测 编辑（只能修改应出具证书）")
+    @ApiOperation("实验室任务/我的任务 编辑（只能修改应出具证书）")
     @PostMapping("/executive/update")
     public ReturnDTO updateExecutive(@RequestBody @Valid UpdateExecutiveRequest request, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -114,10 +122,7 @@
         return labExecutiveInfoService.updateExecutive(request);
     }
 
-    /**
-     * 实验室检测-部门检测/我的检测 详情
-     */
-    @ApiOperation("实验室检测-部门检测/我的检测 详情")
+    @ApiOperation("实验室任务/我的任务 详情")
     @PostMapping("/executive/detail")
     public ReturnDTO<ExecutiveDetailResponse> executiveDetail(@RequestBody @Valid ExecutiveDetailRequest request, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
@@ -131,7 +136,7 @@
      * 退回后会将下一个要执行的实验室检测状态更新为待分配，将后面的实验室顺序变更为连续（都进行减1）
      * 最后一个检测的实验室退回，等分发员再增加实验室或设备收发中的已收入直接手动点击完成
      */
-    @ApiOperation("实验室检测-部门检测/我的检测 退回（待检测/检测中->退回）")
+    @ApiOperation("实验室任务/我的任务 退回（待检测/检测中->退回）")
     @PostMapping("/executive/sendBack")
     public ReturnDTO executiveSendBack(@RequestBody @Valid ExecutiveSendBackRequest request, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -140,9 +145,6 @@
         return labExecutiveInfoService.sampleExecutiveSendBack(request);
     }
 
-    /**
-     * 分发员编辑实验室检测列表
-     */
     @ApiOperation("分发员编辑实验室检测列表")
     @PostMapping("/handOut/updateList")
     public ReturnDTO updateExecutiveList(@RequestBody @Valid UpdateExecutiveListRequest request, BindingResult bindingResult) {
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java
index 48a67ed..0c04f31 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java
@@ -10,6 +10,7 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.resource.customer.CustomerApprovalListRequest;
 import com.casic.missiles.dto.resource.customer.CustomerSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceCustomerInfo;
@@ -26,6 +27,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -55,6 +57,13 @@
         return customerInfoService.saveCustomerInfo(request);
     }
 
+    @ApiOperation("委托方名录导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody CustomerApprovalListRequest request) throws Exception {
+        List<BizResourceCustomerInfo> list = super.exportList(request);
+        super.exportExcel(BizResourceCustomerInfo.class, list, ExportEnum.CUSTOMER_INFO.getSheetName());
+    }
+
     @ApiOperation("委托方人员列表（分页）")
     @PostMapping("/person/listPage")
     public ReturnDTO<PageInfoBT<BizResourceCustomerStaff>> personListPage(@RequestBody IdDTO idDto) {
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
index 972ed4b..6418ea5 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
@@ -5,6 +5,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.resource.customer.SuggestFormApprovalListRequest;
 import com.casic.missiles.dto.resource.customer.SuggestFormSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceCustomerSuggestForm;
@@ -20,6 +21,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -50,4 +52,11 @@
         return suggestFormService.saveSuggestForm(request);
     }
 
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody SuggestFormApprovalListRequest request) throws Exception {
+        List<BizResourceCustomerSuggestForm> list = super.exportList(request);
+        super.exportExcel(BizResourceCustomerSuggestForm.class, list, ExportEnum.CUSTOMER_SUGGEST_FORM.getSheetName());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java
index 1934d1a..9e07eab 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java
@@ -15,12 +15,16 @@
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.resource.IEnvEnvironmentRecordConfigService;
 import com.casic.missiles.service.resource.IEnvEnvironmentRecordDataService;
+import com.casic.missiles.service.resource.IEnvLocationInfoService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
 import java.util.List;
@@ -39,6 +43,8 @@
     private IEnvEnvironmentRecordDataService environmentRecordDataService;
     @Autowired
     private IEnvEnvironmentRecordConfigService environmentRecordConfigService;
+    @Autowired
+    private IEnvLocationInfoService locationInfoService;
 
     @ApiOperation("环境记录单数据列表/详情")
     @PostMapping("/data/listPage")
@@ -95,4 +101,11 @@
         });
         return environmentRecordConfigService.deleteEnvironmentRecordConfig(idDTO.getId());
     }
+
+    @ApiOperation("地点列表")
+    @PostMapping("/location/listPage")
+    public ReturnDTO<PageInfoBT<LocationListResponse>> locationListPage(@RequestBody @Valid LocationListRequest request) {
+        Page<LocationListResponse> page = PageFactory.defaultPage();
+        return ReturnUtil.success(super.packForBT(locationInfoService.listPage(page, request)));
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java
index 82efe3f..e9561fa 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java
@@ -10,6 +10,7 @@
 import com.casic.missiles.dto.resource.seal.SealLogListRequest;
 import com.casic.missiles.dto.resource.seal.SealNoteApprovalListRequest;
 import com.casic.missiles.dto.resource.seal.SealNoteSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceSealUseLog;
@@ -27,6 +28,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -58,6 +60,13 @@
         return sealUseNoteService.saveSeal(request);
     }
 
+    @ApiOperation("印章使用登记导出（列表和导出中去掉经办人和监印人）")
+    @PostMapping("/listExport")
+    public void export(@RequestBody SealNoteApprovalListRequest request) throws Exception {
+        List<BizResourceSealUseNote> list = super.exportList(request);
+        super.exportExcel(BizResourceSealUseNote.class, list, ExportEnum.SEAL_NOTE.getSheetName());
+    }
+
     // TODO: 2023/7/28 印章使用日志：系统中使用印章时插入数据库
 
     @ApiOperation("印章使用日志列表（分页）")
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java
index 9b674fc..06b6521 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java
@@ -9,16 +9,20 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.resource.staff.StaffCertRequest;
 import com.casic.missiles.dto.resource.staff.StaffCertResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.service.resource.IBizResourceStaffInfoService;
 import com.casic.missiles.service.resource.IBizResourceStaffVerifierService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.List;
+
 /**
  * @Description:
  * @Author: wangpeng
@@ -41,9 +45,21 @@
         return ReturnUtil.success(super.packForBT(responsePage));
     }
 
+    @ApiOperation("证书逾期提醒导出")
+    @PostMapping("/listExport")
+    public void exportList(@RequestBody StaffCertRequest request) throws Exception {
+        List<StaffCertResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = staffInfoService.certListByIds(request.getIds());
+        } else {
+            list = staffInfoService.certList(request);
+        }
+        super.exportExcel(StaffCertResponse.class, list, ExportEnum.STAFF_CERTIFICATE_EXPIRE.getSheetName());
+    }
+
     @ApiOperation("证书逾期提醒")
     @PostMapping("/expirationReminder")
-    public ReturnDTO expirationReminder(@RequestBody IdDTO idDto) {
-        return verifierService.expirationReminder(idDto);
+    public ReturnDTO expirationReminder(@RequestBody IdDTO idDTO) {
+        return verifierService.expirationReminder(idDTO);
     }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java
index 3b251ad..a6e7850 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java
@@ -12,6 +12,7 @@
 import com.casic.missiles.dto.resource.staff.StaffListRequest;
 import com.casic.missiles.dto.resource.staff.TrainListRequest;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.*;
@@ -22,7 +23,10 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
 import java.util.List;
@@ -52,8 +56,19 @@
             throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
         }
         Page<BizResourceStaffInfo> page = PageFactory.defaultPage();
-        Page<BizResourceStaffInfo> responsePage = staffInfoService.listPage(page, request);
-        return ReturnUtil.success(super.packForBT(responsePage));
+        return ReturnUtil.success(super.packForBT(staffInfoService.listPage(page, request)));
+    }
+
+    @ApiOperation("人员登记导出")
+    @PostMapping("/listExport")
+    public void exportList(@RequestBody StaffListRequest request) throws Exception {
+        List<BizResourceStaffInfo> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = staffInfoService.listByIds(request.getIds());
+        } else {
+            list = staffInfoService.list(request);
+        }
+        super.exportExcel(BizResourceStaffInfo.class, list, ExportEnum.STAFF_INFO.getSheetName());
     }
 
     @ApiOperation("人员登记详情基础信息")
@@ -85,9 +100,9 @@
 
     @ApiOperation("科研教育列表（分页）")
     @PostMapping("/education/listPage")
-    public ReturnDTO<PageInfoBT<BizResourceStaffEducation>> educationListPage(@RequestBody IdDTO idDto) {
+    public ReturnDTO<PageInfoBT<BizResourceStaffEducation>> educationListPage(@RequestBody IdDTO idDTO) {
         Page<BizResourceStaffEducation> page = PageFactory.defaultPage();
-        Page<BizResourceStaffEducation> responsePage = staffInfoService.educationListPage(page, idDto);
+        Page<BizResourceStaffEducation> responsePage = staffInfoService.educationListPage(page, idDTO);
         return ReturnUtil.success(super.packForBT(responsePage));
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java
index af6aa86..d85d84a 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java
@@ -9,6 +9,7 @@
 import com.casic.missiles.dto.resource.outsideService.SupplierApprovalListRequest;
 import com.casic.missiles.dto.resource.outsideService.SupplierSaveResponse;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceSupplierAbility;
@@ -67,6 +68,13 @@
         return ReturnUtil.success(supplierInfoService.detail(idDTO.getId()));
     }
 
+    @ApiOperation("合格供方导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody SupplierApprovalListRequest request) throws Exception {
+        List<BizResourceSupplierInfo> list = super.exportList(request);
+        super.exportExcel(BizResourceSupplierInfo.class, list, ExportEnum.SUPPLIER_INFO.getSheetName());
+    }
+
     @ApiOperation("供方人员列表（分页）")
     @PostMapping("/person/listPage")
     public ReturnDTO<PageInfoBT<BizResourceSupplierPerson>> personListPage(@RequestBody IdDTO idDTO) {
diff --git a/casic-metering-api/src/main/resources/config/application.yml b/casic-metering-api/src/main/resources/config/application.yml
index 350db5f..ecff521 100644
--- a/casic-metering-api/src/main/resources/config/application.yml
+++ b/casic-metering-api/src/main/resources/config/application.yml
@@ -126,7 +126,7 @@
     #作者
     author: wangpeng
     #待生成对象表名
-    table-name: biz_equipment_technical_target_approval,biz_equipment_attachment_approval,biz_equipment_checkpoint_approval
+    table-name: biz_business_outsource_protocol
 
 reminder:
   #节点--common模块config包 ReminderNodeConfig配置
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
index 4a19e4e..d47d552 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
@@ -53,6 +53,7 @@
     SUGGEST_FORM_SAVE_FAILED(2509, "委托方意见登记表保存至草稿箱失败"),
     EXAMINE_FORM_SAVE_FAILED(2510, "要求、委托书及合同评审表保存至草稿箱失败"),
     CUSTOMER_EXIST_SAVE_FAILED(2511, "该委托方已存在，请重新选择"),
+    DUPLICATE_LOCATION_NO(2512, "地点编号已存在"),
 
     /**
      * 计量检定业务模块
@@ -68,6 +69,8 @@
     COMPLETE_SAMPLE_NOT_EXIST(2609, "检测中不存在扫描收入的样品"),
     CANNOT_CHANGE_MEASURE_INFO(2610, "无法更改非当前登录用户的检测信息"),
     NON_EXIST_ORDER_OR_SAMPLE(2611, "不存在该委托单或该委托单下的样品"),
+    OUTSOURCE_ACCESS_SAVE_FAILED(2612, "测试、校准或检定工作分包评审表保存至草稿箱失败"),
+    OUTSOURCE_PROTOCOL_SAVE_FAILED(2613, "测试、校准或检定工作分包协议书保存至草稿箱失败"),
 
     /**
      * 历史遗留备用
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
index 5089ad1..81a406b 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
@@ -10,54 +10,38 @@
     /**
      * 资源管理
      */
-    ENVIRONMENT_DATA_EXPORT("environmentData", "environmentData", "环境记录单数据"),
+    ENVIRONMENT_DATA_EXPORT("environmentData", "环境记录单数据", "环境记录单数据"),
+    STAFF_INFO("staffInfo", "人员登记", "人员登记"),
+    STAFF_CERTIFICATE_EXPIRE("certificateExpire", "证书逾期提醒", "证书逾期提醒"),
+    SUPPLIER_INFO("supplierInfo", "合格供方名录", "合格供方名录"),
+    CUSTOMER_INFO("customerInfo", "委托方名录", "委托方名录"),
+    CUSTOMER_SUGGEST_FORM("customerSuggestForm", "委托方意见登记表", "委托方意见登记表"),
+    SEAL_NOTE("sealNote", "印章使用登记", "印章使用登记"),
 
-    FILE_EXPORT("meterFileData", "meterFileData", "计量文件信息"),
-    TRAIN_PLAN_EXPORT("trainPlanData", "trainPlanData", "培训计划"),
-    TRAIN_LOG_EXPORT("trainLogData", "trainLogData", "培训记录"),
-    METER_ORGANIZE_EXPORT("meterOrganizeData", "meterOrganizeData", "计量组织"),
-    TRACE_SUPPLIER_EXPORT("traceSupplierData", "traceSupplierData", "溯源供方"),
-    SIGN_EXPORT("signData", "signData", "签名/签章"),
-    TEMPLATE_EXPORT("templateData", "templateData", "原始记录模板/证书报告模板"),
-    FIXED_ASSETS("meterFixedAssets", "meterFixedAssets", "固定资产"),
-    METER_EQUIPMENT("meterEquipment", "meterEquipment", "测量设备"),
-    CALIBRATION_TEST_EQUIPMENT("calibrationTestEquipment", "calibrationTestEquipment", "校准检定设备"),
-    MEASURE_ACCOUNT("measureAccount", "measureAccount", "测量工装"),
-    STANDARD_SUPPORT_EQUIPMENT("standardSupportEquipment", "standardSupportEquipment", "标准配套设备"),
-    STANDARD_EQUIPMENT("standardEquipment", "standardEquipment", "标准装置"),
-    FLOW_DEF_EXPORT("flowDefData", "flowDefData", "流程定义"),
-    STAFF_CERTIFICATE("certificate", "certificate", "计量人员证书"),
-    CHECK_INFO("checkInfo", "checkInfo", "设备管理点检测"),
-    EQUIPMENT_APPLY("equipmentApply", "equipmentApply", "设备借用"),
-    STANDARD_EQUIPMENT_REMIND("equipmentApplyRemind", "equipmentApplyRemind", "标准装置到期提醒"),
-    METER_PRICE("meterPrice", "meterPrice", "价格库"),
-    METER_STAFF("meterStaff", "meterStaff", "计量人员"),
-    STANDARD_EQUIPMENT_APPLY("standardEquipmentApply", "standardEquipmentApply", "标准装置申请"),
-    STATE_MANAGE_APPLY("stateManage", "stateManage", "状态管理"),
-    METER_ACCEPTANCE_CHECK("acceptanceCheck", "acceptanceCheck", "设备检修保养验收单"),
-    CUSTOMER_EXPORT("customerData", "customerData", "客户信息"),
-    ORDER_EXPORT("orderData", "orderData", "委托书信息"),
-    SAMPLE_EXPORT("sampleData", "sampleData", "样本信息"),
-    EXCHANGE_DATA("exchangeData", "exchangeData", "设备交接单"),
-    DISPATCH_DATA("dispatchData", "dispatchData", "设备收发"),
-    ENVIRONMENT_DATA("environmentData", "environmentData", "环境记录单"),
-    ORIGIN_DATA("originData", "originData", "原始记录"),
-    CERTIFICATE_REPORT("certificateReport", "certificateReport", "证书报告"),
-    ADVICE_EXPORT("adviceData", "adviceData", "客户反馈"),
-    HANDOUT_EXPORT("handoutData", "handoutData", "任务分发列表"),
-    OUTSOURCER_EXPORT("outsourcerData", "outsourcerData", "分包方"),
-    SITE_EXECUTIVE_EXPORT("siteExecutiveData", "siteExecutiveData", "现场测试、校准或检定"),
-    CERTIFICATE_PRINT_EXPORT("certificatePrintData", "certificatePrintData", "证书打印"),
-    DOWNLOAD_TEMPLATE("downloadTemplate", "downloadTemplate", "页面配置"),
-    OUTSOURCER_CERTIFICATE_EXPORT("outsourceCertificateData", "outsourceCertificateData", "分包证书"),
-    SETTLEMENT_INFO_EXPORT("settlementInfoData", "settlementInfoData", "业务结算"),
-    EQUIPMENT_REMIND("equipmentRemind", "equipmentRemind", "设备到期提醒"),
-    AGREEMENT_INFO_EXPORT("agreementInfoData", "agreementInfoData", "合同"),
-    WORK_STATISTICS_EXPORT("workStatisticsData", "workStatisticsData", "实时工作统计"),
-    DEPT_OUTPUT_EXPORT("deptOutputData", "deptOutputData", "部门产值分析"),
-    WORKLOAD_EXPORT("workloadData", "workloadData", "业务工作量分析"),
-    DEPT_COMPREHENSIVE_EXPORT("deptComprehensiveData", "deptComprehensiveData", "部门综合分析"),
-    ENVIRONMENTAL_RECORD("environmentalRecordData", "environmentalRecordData", "现场环境记录");
+    /**
+     * 计量检定业务
+     */
+    OUTSOURCER_EXPORT("outsourcerData", "分包方名录", "分包方名录"),
+    IDENTIFY_EXPORT("identifyData", "计量标识", "计量标识"),
+    ORDER_EXPORT("orderData", "任务单", "任务单"),
+    DISPATCH_DATA("dispatchData", "设备收发", "设备收发"),
+    HANDOUT_EXPORT("handoutData", "任务分发", "任务分发"),
+    SITE_EXECUTIVE_EXPORT("siteExecutiveData", "现场测试、校准或检定", "现场测试、校准或检定"),
+    CERTIFICATE_REPORT("certificateReport", "证书审批", "证书审批"),
+    CERTIFICATE_CHANGE_APPLY("certificateChangeApply", "证书报告补充或更换申请单", "证书报告补充或更换申请单"),
+    CERTIFICATE_PRINT("certificatePrintData", "证书打印审批", "证书打印审批"),
+    DEPT_EXECUTIVE_TASK("deptExecutiveTaskData", "实验室任务", "实验室任务"),
+    MY_EXECUTIVE_TASK("myExecutiveTaskData", "我的任务", "我的任务"),
+    OUTSOURCE_ASSESS("outsourceAssess", "测试、校准或检定工作分包评审表", "测试、校准或检定工作分包评审表"),
+    OUTSOURCE_PROTOCOL("outsourceProtocol", "测试、校准或检定工作分包协议书", "测试、校准或检定工作分包协议书"),
+
+    /**
+     * 系统管理
+     */
+    SIGN_EXPORT("signData", "签名", "签名"),
+    TEMPLATE_EXPORT("templateData", "文件模板", "文件模板"),
+    FLOW_DEF_EXPORT("flowDefData", "流程定义", "流程定义"),
+    DOWNLOAD_TEMPLATE("downloadTemplate", "流程定义", "页面配置");
 
     ExportEnum(String fileName, String sheetName, String description) {
         this.fileName = fileName;
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateRecordTypeCodeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateRecordTypeCodeEnum.java
index 31d913c..a963522 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateRecordTypeCodeEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateRecordTypeCodeEnum.java
@@ -46,4 +46,14 @@
     String SITE_EXECUTIVE_APPROVAL = "01";
     //《现场测试、校准或检定工作记录表》
     String SITE_EXECUTIVE_LOG = "02";
+
+    //测试、校准或检定工作分包协议书
+    String OUTSOURCE_PROTOCOL = "01";
+    //测试、校准或检定工作分包评审表
+    String OUTSOURCE_ACCESS = "02";
+    //测试、校准或检定工作分包通知书
+    String OUTSOURCE_NOTICE = "03";
+    //测试、校准或检定工作分包方名录
+    String OUTSOURCE_INFO = "04";
+
 }
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
index 24b8635..f78bd53 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
@@ -15,6 +15,10 @@
     String CERTIFICATE_CHANGE_APPLY_BEAN_NAME = "certificateChangeApplyBean";
     //现场测试、校准或检定
     String SITE_EXECUTIVE_BEAN_NAME = "siteExecutiveBean";
+    //测试、校准或检定工作分包评审表
+    String OUTSOURCE_ASSESS_BEAN_NAME = "outsourceAssessBean";
+    //测试、校准或检定工作分包协议书
+    String OUTSOURCE_PROTOCOL_BEAN_NAME = "outsourceProtocolBean";
 
     /*********************************设备与装置************************************/
     //设备台账
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 b21c661..6b86fd1 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
@@ -18,6 +18,8 @@
     OUTSOURCER_APPROVAL(OUTSOURCER_BEAN_NAME, ""),
     CERTIFICATE_CHANGE_APPROVAL(CERTIFICATE_CHANGE_APPLY_BEAN_NAME, ""),
     SITE_EXECUTIVE_APPROVAL(SITE_EXECUTIVE_BEAN_NAME, ""),
+    OUTSOURCE_ASSESS_APPROVAL(OUTSOURCE_ASSESS_BEAN_NAME, ""),
+    OUTSOURCE_PROTOCOL_APPROVAL(OUTSOURCE_PROTOCOL_BEAN_NAME, ""),
 
     ACTION_STATUS_MAP(new HashMap<String, AwareActionStatusEnum>() {
         {
@@ -47,6 +49,10 @@
             put(ApplyFromIdEnum.CERTIFICATE_CHANGE_APPROVAL.getCode(), CERTIFICATE_CHANGE_APPROVAL);
             //现场测试、校准或检定审批
             put(ApplyFromIdEnum.SITE_EXECUTIVE_APPROVAL.getCode(), SITE_EXECUTIVE_APPROVAL);
+            //测试、校准或检定工作分包评审表
+            put(ApplyFromIdEnum.OUTSOURCE_ASSESS_APPROVAL.getCode(), OUTSOURCE_ASSESS_APPROVAL);
+            //测试、校准或检定工作分包协议书
+            put(ApplyFromIdEnum.OUTSOURCE_PROTOCOL_APPROVAL.getCode(), OUTSOURCE_PROTOCOL_APPROVAL);
         }
     });
     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 934405e..c7410bd 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
@@ -9,6 +9,8 @@
     CERTIFICATE_CHANGE_APPROVAL("jljdywzsbchghsqd", MessageSourceModuleEnum.BUSINESS.getCode(), "证书/报告补充或更换申请单"),
     OUTSOURCER_APPROVAL("jljdywcsjzhgfbfml", MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定合格分包方名录"),
     SITE_EXECUTIVE_APPROVAL("jljdywxccsjzsp", MessageSourceModuleEnum.BUSINESS.getCode(), "现场测试、校准或检定审批"),
+    OUTSOURCE_ASSESS_APPROVAL("jljdywcsjzfbpsb", MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包评审表"),
+    OUTSOURCE_PROTOCOL_APPROVAL("jljdywcsjzfbxys", MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包协议书"),
 
 
     /*******************************************设备与装置*********************************************/
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/GeneralApprovalMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/GeneralApprovalMapper.java
index 4fb7344..0c9d6ae 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/GeneralApprovalMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/GeneralApprovalMapper.java
@@ -17,8 +17,4 @@
 
     Page<O> selectBatchForApprovalList(Page<O> page, @Param("request") R request, @Param("businessKeys") List<String> businessKeys);
 
-//    Page<O> selectListPage(Page<O> page, @Param("request") R request);
-
-//    Long selectMaxNo();
-
 }
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceAssessMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceAssessMapper.java
index 7867bb8..ba59009 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceAssessMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceAssessMapper.java
@@ -1,7 +1,12 @@
 package com.casic.missiles.mapper.business;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.business.outsource.OutsourceAssessApprovalListRequest;
+import com.casic.missiles.mapper.GeneralApprovalMapper;
 import com.casic.missiles.model.business.BizBusinessOutsourceAssess;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * <p>
@@ -11,6 +16,10 @@
  * @author wangpeng
  * @since 2023-08-16
  */
-public interface BizBusinessOutsourceAssessMapper extends BaseMapper<BizBusinessOutsourceAssess> {
+public interface BizBusinessOutsourceAssessMapper extends GeneralApprovalMapper<BizBusinessOutsourceAssess, BizBusinessOutsourceAssess, OutsourceAssessApprovalListRequest> {
+
+    Page<BizBusinessOutsourceAssess> selectBatchForApprovalList(Page<BizBusinessOutsourceAssess> page, @Param("request") OutsourceAssessApprovalListRequest request, @Param("businessKeys") List<String> businessKeys);
+
+    Long selectMaxProjectNo();
 
 }
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceProtocolMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceProtocolMapper.java
new file mode 100644
index 0000000..e6aba35
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceProtocolMapper.java
@@ -0,0 +1,24 @@
+package com.casic.missiles.mapper.business;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.business.outsource.OutsourceProtocolApprovalListRequest;
+import com.casic.missiles.mapper.GeneralApprovalMapper;
+import com.casic.missiles.model.business.BizBusinessOutsourceProtocol;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 计量检定业务-分包管理-测试、校准或检定工作分包协议书 Mapper 接口
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-08-24
+ */
+public interface BizBusinessOutsourceProtocolMapper extends GeneralApprovalMapper<BizBusinessOutsourceProtocol, BizBusinessOutsourceProtocol, OutsourceProtocolApprovalListRequest> {
+
+    Page<BizBusinessOutsourceProtocol> selectBatchForApprovalList(Page<BizBusinessOutsourceProtocol> page, @Param("request") OutsourceProtocolApprovalListRequest request, @Param("businessKeys") List<String> businessKeys);
+
+    Long selectMaxProtocolNo();
+}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/EnvLocationInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/EnvLocationInfoMapper.java
new file mode 100644
index 0000000..49eff87
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/EnvLocationInfoMapper.java
@@ -0,0 +1,21 @@
+package com.casic.missiles.mapper.resource;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.resource.environment.LocationListRequest;
+import com.casic.missiles.dto.resource.environment.LocationListResponse;
+import com.casic.missiles.model.resource.EnvLocationInfo;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * <p>
+ * 实验室环境监控系统-设备表 Mapper 接口
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-06-07
+ */
+public interface EnvLocationInfoMapper extends BaseMapper<EnvLocationInfo> {
+
+    Page<LocationListResponse> selectLocationListPage(Page<LocationListResponse> page, @Param("request") LocationListRequest request);
+}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java
index de124db..85ed0f7 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java
@@ -1,7 +1,9 @@
 package com.casic.missiles.mapper.system;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.dto.system.SignDetailResponse;
+import com.casic.missiles.dto.system.SignListRequest;
 import com.casic.missiles.model.system.SystemSign;
 import org.apache.ibatis.annotations.Param;
 
@@ -22,4 +24,8 @@
     SignDetailResponse selectSignDetailById(Long id);
 
     List<SystemSign> selectUsableSignList(@Param("userId") Long userId);
+
+    Page<SystemSign> selectSignListPage(Page<SystemSign> page, @Param("request") SignListRequest request);
+
+    List<SystemSign> selectSignList(@Param("request") SignListRequest request);
 }
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateChangeApplyMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateChangeApplyMapper.xml
index d798447..c496092 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateChangeApplyMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateChangeApplyMapper.xml
@@ -30,31 +30,31 @@
         SELECT *
         FROM biz_business_certificate_change_apply
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.changeApplyNo != null and request.changeApplyNo !=''">
+        <if test="request != null and request.changeApplyNo != null and request.changeApplyNo !=''">
             and change_apply_no like concat('%',#{request.changeApplyNo},'%')
         </if>
-        <if test="request.changeReportNo != null and request.changeReportNo !=''">
+        <if test="request != null and request.changeReportNo != null and request.changeReportNo !=''">
             and change_report_no like concat('%',#{request.changeReportNo},'%')
         </if>
-        <if test="request.changeReportName != null and request.changeReportName !=''">
+        <if test="request != null and request.changeReportName != null and request.changeReportName !=''">
             and change_report_name like concat('%',#{request.changeReportName},'%')
         </if>
-        <if test="request.changeType != null and request.changeType !=''">
+        <if test="request != null and request.changeType != null and request.changeType !=''">
             and change_type = #{request.changeType}
         </if>
-        <if test="request.createUserName != null and request.createUserName !=''">
+        <if test="request != null and request.createUserName != null and request.createUserName !=''">
             and create_user_name like concat('%',#{request.createUserName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificatePrintMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificatePrintMapper.xml
index b66cd99..49c0ac8 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificatePrintMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificatePrintMapper.xml
@@ -31,34 +31,34 @@
         LEFT JOIN biz_business_order_sample_relation bosr ON (bosr.order_id = bcr.order_id AND bosr.sample_id = bcr.sample_id)
         LEFT JOIN biz_business_order_info boi ON boi.id = bosr.order_id
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and bcp.approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.printStatus != null and request.printStatus !=''">
+        <if test="request != null and request.printStatus != null and request.printStatus !=''">
             and print_status = #{request.printStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and bcp.create_user_id = #{request.createUserId}
         </if>
-        <if test="request.certificateReportNo != null and request.certificateReportNo !=''">
+        <if test="request != null and request.certificateReportNo != null and request.certificateReportNo !=''">
             and bcr.certificate_report_no like concat('%',#{request.certificateReportNo},'%')
         </if>
-        <if test="request.certificateReportName != null and request.certificateReportName !=''">
+        <if test="request != null and request.certificateReportName != null and request.certificateReportName !=''">
             and bcr.certificate_report_name like concat('%',#{request.certificateReportName},'%')
         </if>
-        <if test="request.customerName != null and request.customerName !=''">
+        <if test="request != null and request.customerName != null and request.customerName !=''">
             and boi.customer_name like concat('%',#{request.customerName},'%')
         </if>
-        <if test="request.sampleNo != null and request.sampleNo !=''">
+        <if test="request != null and request.sampleNo != null and request.sampleNo !=''">
             and bosr.sample_no like concat('%',#{request.sampleNo},'%')
         </if>
-        <if test="request.sampleName != null and request.sampleName !=''">
+        <if test="request != null and request.sampleName != null and request.sampleName !=''">
             and bosr.sample_name like concat('%',#{request.sampleName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and bcp.create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and bcp.create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml
index b366034..767695d 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml
@@ -46,33 +46,37 @@
         SELECT bcr.*, bosr.sample_no, bosr.sample_name, bosr.sample_model, rsi.staff_name
         FROM biz_business_certificate_report bcr
         LEFT JOIN biz_business_order_sample_relation bosr ON (bosr.order_id = bcr.order_id AND bosr.sample_id = bcr.sample_id)
+        LEFT JOIN biz_business_order_info boi ON boi.id = bcr.order_id
         LEFT JOIN biz_resource_staff_info rsi ON rsi.id = bcr.measure_person_id
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and bcr.approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and bcr.create_user_id = #{request.createUserId}
         </if>
-        <if test="request.certificateReportNo != null and request.certificateReportNo !=''">
+        <if test="request != null and request.customerId != null and request.customerId !=''">
+            and boi.customer_id = #{request.customerId}
+        </if>
+        <if test="request != null and request.certificateReportNo != null and request.certificateReportNo !=''">
             and bcr.certificate_report_no like concat('%',#{request.certificateReportNo},'%')
         </if>
-        <if test="request.certificateReportName != null and request.certificateReportName !=''">
+        <if test="request != null and request.certificateReportName != null and request.certificateReportName !=''">
             and bcr.certificate_report_name like concat('%',#{request.certificateReportName},'%')
         </if>
-        <if test="request.sampleNo != null and request.sampleNo !=''">
+        <if test="request != null and request.sampleNo != null and request.sampleNo !=''">
             and bosr.sample_no like concat('%',#{request.sampleNo},'%')
         </if>
-        <if test="request.measureCategory != null and request.measureCategory !=''">
+        <if test="request != null and request.measureCategory != null and request.measureCategory !=''">
             and bcr.measure_category = #{request.measureCategory}
         </if>
-        <if test="request.measurePerson != null and request.measurePerson !=''">
+        <if test="request != null and request.measurePerson != null and request.measurePerson !=''">
             and rsi.staff_name like concat('%',#{request.measurePerson},'%')
         </if>
-        <if test="request.calibrationTimeStart != null and request.calibrationTimeStart !=''">
+        <if test="request != null and request.calibrationTimeStart != null and request.calibrationTimeStart !=''">
             and bcr.calibration_time &gt;= #{request.calibrationTimeStart}
         </if>
-        <if test="request.calibrationTimeEnd != null and request.calibrationTimeEnd !=''">
+        <if test="request != null and request.calibrationTimeEnd != null and request.calibrationTimeEnd !=''">
             and bcr.calibration_time &lt;= #{request.calibrationTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceAssessMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceAssessMapper.xml
index d0fcf8b..c22c101 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceAssessMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceAssessMapper.xml
@@ -7,6 +7,8 @@
         <id column="id" property="id" />
         <result column="project_no" property="projectNo" />
         <result column="project_name" property="projectName" />
+        <result column="lab_code" property="labCode" />
+        <result column="group_code" property="groupCode" />
         <result column="applicant_id" property="applicantId" />
         <result column="applicant_name" property="applicantName" />
         <result column="applicant_time" property="applicantTime" />
@@ -31,7 +33,45 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, project_no, project_name, applicant_id, applicant_name, applicant_time, minio_file_name, remark, create_user_id, create_user_name, outsourcer_id, pre_start_time, pre_end_time, outsource_reason, pre_cost, approval_status, process_id, approve_situation, traceability, test_method, technique_ability, create_time, update_time
+        id, project_no, project_name, lab_code, group_code, applicant_id, applicant_name, applicant_time, minio_file_name, remark, create_user_id, create_user_name, outsourcer_id, pre_start_time, pre_end_time, outsource_reason, pre_cost, approval_status, process_id, approve_situation, traceability, test_method, technique_ability, create_time, update_time
     </sql>
 
+    <select id="selectMaxProjectNo" resultType="java.lang.Long">
+        SELECT IFNULL(max(RIGHT(project_no, 3)), 0) from biz_business_outsource_assess
+    </select>
+
+    <select id="selectBatchForApprovalList" resultMap="BaseResultMap">
+        SELECT bboa.*, bboi.outsourcer_name, bboi.director
+        FROM biz_business_outsource_assess bboa
+        LEFT JOIN biz_business_outsourcer_info bboi ON bboa.outsourcer_id = bboi.id
+        WHERE 1=1
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
+            and bboa.approval_status = #{request.approvalStatus}
+        </if>
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
+            and bboa.create_user_id = #{request.createUserId}
+        </if>
+        <if test="request != null and request.projectNo != null and request.projectNo !=''">
+            and bboa.project_no like concat('%',#{request.projectNo},'%')
+        </if>
+        <if test="request != null and request.outsourcerName != null and request.outsourcerName !=''">
+            and bboi.outsourcer_name like concat('%',#{request.outsourcerName},'%')
+        </if>
+        <if test="request != null and request.applicantName != null and request.applicantName !=''">
+            and bboa.applicant_name like concat('%',#{request.applicantName},'%')
+        </if>
+        <if test="request != null and request.applicantTimeStart != null and request.applicantTimeStart !=''">
+            and bboa.applicant_time &gt;= #{request.applicantTimeStart}
+        </if>
+        <if test="request != null and request.applicantTimeEnd != null and request.applicantTimeEnd !=''">
+            and bboa.applicant_time &lt;= #{request.applicantTimeEnd}
+        </if>
+        <if test="businessKeys != null">
+            and bboa.id in
+            <foreach collection="businessKeys" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
+        ORDER BY bboa.create_time DESC
+    </select>
 </mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceProtocolMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceProtocolMapper.xml
new file mode 100644
index 0000000..b7b2149
--- /dev/null
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceProtocolMapper.xml
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.mapper.business.BizBusinessOutsourceProtocolMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.business.BizBusinessOutsourceProtocol">
+        <id column="id" property="id" />
+        <result column="protocol_no" property="protocolNo" />
+        <result column="project_name" property="projectName" />
+        <result column="lab_code" property="labCode" />
+        <result column="group_code" property="groupCode" />
+        <result column="outsourcer_id" property="outsourcerId" />
+        <result column="remark" property="remark" />
+        <result column="outsource_no" property="outsourceNo" />
+        <result column="outsource_name" property="outsourceName" />
+        <result column="contacts" property="contacts" />
+        <result column="mobile" property="mobile" />
+        <result column="address" property="address" />
+        <result column="require_date" property="requireDate" />
+        <result column="outsource_cost" property="outsourceCost" />
+        <result column="director" property="director" />
+        <result column="item" property="item" />
+        <result column="requires" property="requires" />
+        <result column="create_user_id" property="createUserId" />
+        <result column="create_user_name" property="createUserName" />
+        <result column="approval_status" property="approvalStatus" />
+        <result column="process_id" property="processId" />
+        <result column="create_time" property="createTime" />
+        <result column="update_time" property="updateTime" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, protocol_no, project_name, lab_code, group_code, outsourcer_id, remark, outsource_no, outsource_name, contacts, mobile, address, require_date, outsource_cost, director, item, requires, create_user_id, create_user_name, approval_status, process_id, create_time, update_time
+    </sql>
+
+    <select id="selectMaxProtocolNo" resultType="java.lang.Long">
+        SELECT IFNULL(max(RIGHT(protocol_no, 3)), 0) from biz_business_outsource_protocol
+    </select>
+
+    <select id="selectBatchForApprovalList" resultMap="BaseResultMap">
+        SELECT *
+        FROM biz_business_outsource_protocol
+        WHERE 1=1
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
+            and approval_status = #{request.approvalStatus}
+        </if>
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
+            and create_user_id = #{request.createUserId}
+        </if>
+        <if test="request != null and request.protocolNo != null and request.protocolNo !=''">
+            and protocol_no like concat('%',#{request.protocolNo},'%')
+        </if>
+        <if test="request != null and request.outsourcerName != null and request.outsourcerName !=''">
+            and outsourcer_name like concat('%',#{request.outsourcerName},'%')
+        </if>
+        <if test="request != null and request.applicantName != null and request.applicantName !=''">
+            and create_user_name like concat('%',#{request.applicantName},'%')
+        </if>
+        <if test="request != null and request.applicantTimeStart != null and request.applicantTimeStart !=''">
+            and create_time &gt;= #{request.applicantTimeStart}
+        </if>
+        <if test="request != null and request.applicantTimeEnd != null and request.applicantTimeEnd !=''">
+            and create_time &lt;= #{request.applicantTimeEnd}
+        </if>
+        <if test="businessKeys != null">
+            and id in
+            <foreach collection="businessKeys" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
+        ORDER BY create_time DESC
+    </select>
+</mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourcerInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourcerInfoMapper.xml
index 510a80b..3049b54 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourcerInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourcerInfoMapper.xml
@@ -7,6 +7,8 @@
         <id column="id" property="id" />
         <result column="outsourcer_no" property="outsourcerNo" />
         <result column="outsourcer_name" property="outsourcerName" />
+        <result column="lab_code" property="labCode" />
+        <result column="group_code" property="groupCode" />
         <result column="outsourcer_brief_name" property="outsourcerBriefName" />
         <result column="outsourcer_size" property="outsourcerSize" />
         <result column="business_size" property="businessSize" />
@@ -55,32 +57,32 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, outsourcer_no, outsourcer_name, outsourcer_brief_name, outsourcer_size, business_size, grade, evaluation, tax_number, bank_account, bank_name, bank_account_number, postal_code, director, phone, fax, mobile, email, website, address_country, address_province, address_city, address_area, full_address, address_country_name, address_province_name, address_city_name, address_area_name, invoice_country, invoice_province, invoice_city, invoice_area, invoice_full_address, invoice_country_name, invoice_province_name, invoice_city_name, invoice_area_name, business_scope, business_content, minio_file_name, approval_status, process_id, remark, create_user_id, create_user_name, create_time, update_time
+        id, outsourcer_no, outsourcer_name, lab_code, group_code, outsourcer_brief_name, outsourcer_size, business_size, grade, evaluation, tax_number, bank_account, bank_name, bank_account_number, postal_code, director, phone, fax, mobile, email, website, address_country, address_province, address_city, address_area, full_address, address_country_name, address_province_name, address_city_name, address_area_name, invoice_country, invoice_province, invoice_city, invoice_area, invoice_full_address, invoice_country_name, invoice_province_name, invoice_city_name, invoice_area_name, business_scope, business_content, minio_file_name, approval_status, process_id, remark, create_user_id, create_user_name, create_time, update_time
     </sql>
 
     <select id="selectBatchForApprovalList" resultMap="BaseResultMap">
         SELECT *
         FROM biz_business_outsourcer_info
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.outsourcerNo != null and request.outsourcerNo !=''">
+        <if test="request != null and request.outsourcerNo != null and request.outsourcerNo !=''">
             and outsourcer_no like concat('%',#{request.outsourcerNo},'%')
         </if>
-        <if test="request.outsourcerName != null and request.outsourcerName !=''">
+        <if test="request != null and request.outsourcerName != null and request.outsourcerName !=''">
             and outsourcer_name like concat('%',#{request.outsourcerName},'%')
         </if>
-        <if test="request.director != null and request.director !=''">
+        <if test="request != null and request.director != null and request.director !=''">
             and director like concat('%',#{request.director},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
@@ -93,6 +95,6 @@
     </select>
 
     <select id="selectMaxNo" resultType="java.lang.Long">
-        SELECT IFNULL(max(RIGHT(outsourcer_no, 12)), 0) from biz_business_outsourcer_info
+        SELECT IFNULL(max(RIGHT(outsourcer_no, 3)), 0) from biz_business_outsourcer_info
     </select>
 </mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessSiteExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessSiteExecutiveInfoMapper.xml
index 135c5d0..3c5ae79 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessSiteExecutiveInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessSiteExecutiveInfoMapper.xml
@@ -38,25 +38,25 @@
         FROM biz_business_site_executive_info bsei
         LEFT JOIN biz_resource_customer_info rci ON bsei.customer_id = rci.id
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and bsei.approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and bsei.create_user_id = #{request.createUserId}
         </if>
-        <if test="request.siteExecutiveNo != null and request.siteExecutiveNo !=''">
+        <if test="request != null and request.siteExecutiveNo != null and request.siteExecutiveNo !=''">
             and bsei.site_executive_no like concat('%',#{request.siteExecutiveNo},'%')
         </if>
-        <if test="request.customerName != null and request.customerName !=''">
+        <if test="request != null and request.customerName != null and request.customerName !=''">
             and rci.outsourcer_name like concat('%',#{request.customerName},'%')
         </if>
-        <if test="request.applyName != null and request.applyName !=''">
+        <if test="request != null and request.applyName != null and request.applyName !=''">
             and bsei.apply_name like concat('%',#{request.applyName},'%')
         </if>
-        <if test="request.applyTimeStart != null and request.applyTimeStart !=''">
+        <if test="request != null and request.applyTimeStart != null and request.applyTimeStart !=''">
             and bsei.apply_time &gt;= #{request.applyTimeStart}
         </if>
-        <if test="request.applyTimeEnd != null and request.applyTimeEnd !=''">
+        <if test="request != null and request.applyTimeEnd != null and request.applyTimeEnd !=''">
             and bsei.apply_time &lt;= #{request.applyTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml
index 84d9e2a..6bd38a9 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml
@@ -105,6 +105,12 @@
         <if test="request.isUrgent != null and request.isUrgent !=''">
             AND bo.is_urgent = #{request.isUrgent}
         </if>
+        <if test="request.ids != null">
+            and blei.id in
+            <foreach collection="request.ids" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
         ORDER BY blei.update_time DESC
     </select>
 
@@ -137,6 +143,12 @@
         <if test="request.isUrgent != null and request.isUrgent !=''">
             AND bo.is_urgent = #{request.isUrgent}
         </if>
+        <if test="request.ids != null">
+            and blei.id in
+            <foreach collection="request.ids" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
         ORDER BY blei.update_time DESC
     </select>
 
diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardInfoMapper.xml
index 1a5551b..2ed8d17 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardInfoMapper.xml
@@ -45,12 +45,6 @@
         FROM biz_equipment_standard_info besi
         LEFT JOIN biz_equipment_standard_technology_relation bestr ON besi.standard_no = bestr.standard_no
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
-            and besi.approval_status = #{request.approvalStatus}
-        </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
-            and besi.create_user_id = #{request.createUserId}
-        </if>
         <if test="request.standardName != null and request.standardName !=''">
             and besi.standard_name like concat('%',#{request.standardName},'%')
         </if>
diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardTechnologyRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardTechnologyRelationMapper.xml
index fc7e16c..cd03c8c 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardTechnologyRelationMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardTechnologyRelationMapper.xml
@@ -6,6 +6,7 @@
     <resultMap id="BaseResultMap" type="com.casic.missiles.model.equipment.BizEquipmentStandardTechnologyRelation">
         <id column="id" property="id" />
         <result column="technology_file_id" property="technologyFileId" />
+        <result column="technology_file_no" property="technologyFileNo" />
         <result column="technology_file_name" property="technologyFileName" />
         <result column="standard_id" property="standardId" />
         <result column="standard_no" property="standardNo" />
@@ -14,7 +15,7 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, technology_file_id, technology_file_name, standard_id, remark
+        id, technology_file_id, technology_file_no, technology_file_name, standard_id, remark
     </sql>
 
 </mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceAuthorizeOrderMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceAuthorizeOrderMapper.xml
index ac5176c..554fe65 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceAuthorizeOrderMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceAuthorizeOrderMapper.xml
@@ -32,22 +32,22 @@
         SELECT *
         FROM biz_resource_authorize_order
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.orderNo != null and request.orderNo !=''">
+        <if test="request != null and request.orderNo != null and request.orderNo !=''">
             and order_no like concat('%',#{request.orderNo},'%')
         </if>
-        <if test="request.createUserName != null and request.createUserName !=''">
+        <if test="request != null and request.createUserName != null and request.createUserName !=''">
             and create_user_name like concat('%',#{request.createUserName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerExamineFormMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerExamineFormMapper.xml
index ab242f6..af7f98f 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerExamineFormMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerExamineFormMapper.xml
@@ -41,28 +41,28 @@
         SELECT *
         FROM biz_resource_customer_examine_form
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.formNo != null and request.formNo !=''">
+        <if test="request != null and request.formNo != null and request.formNo !=''">
             and form_no like concat('%',#{request.formNo},'%')
         </if>
-        <if test="request.labCode != null and request.labCode !=''">
+        <if test="request != null and request.labCode != null and request.labCode !=''">
             and lab_code like concat('%',#{request.labCode},'%')
         </if>
-        <if test="request.groupCode != null and request.groupCode !=''">
+        <if test="request != null and request.groupCode != null and request.groupCode !=''">
             and group_code like concat('%',#{request.groupCode},'%')
         </if>
-        <if test="request.createUserName != null and request.createUserName !=''">
+        <if test="request != null and request.createUserName != null and request.createUserName !=''">
             and create_user_name like concat('%',#{request.createUserName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerInfoMapper.xml
index fa8ffbc..06a2798 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerInfoMapper.xml
@@ -33,25 +33,25 @@
         SELECT *
         FROM biz_resource_customer_info
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.customerNo != null and request.customerNo !=''">
+        <if test="request != null and request.customerNo != null and request.customerNo !=''">
             and customer_no like concat('%',#{request.customerNo},'%')
         </if>
-        <if test="request.customerName != null and request.customerName !=''">
+        <if test="request != null and request.customerName != null and request.customerName !=''">
             and customer_name like concat('%',#{request.customerName},'%')
         </if>
-        <if test="request.contacts != null and request.contacts !=''">
+        <if test="request != null and request.contacts != null and request.contacts !=''">
             and contacts like concat('%',#{request.contacts},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerSuggestFormMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerSuggestFormMapper.xml
index 28f5bb2..1806662 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerSuggestFormMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerSuggestFormMapper.xml
@@ -33,28 +33,28 @@
         SELECT *
         FROM biz_resource_customer_suggest_form
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.formNo != null and request.formNo !=''">
+        <if test="request != null and request.formNo != null and request.formNo !=''">
             and form_no like concat('%',#{request.formNo},'%')
         </if>
-        <if test="request.customerName != null and request.customerName !=''">
+        <if test="request != null and request.customerName != null and request.customerName !=''">
             and customer_name like concat('%',#{request.customerName},'%')
         </if>
-        <if test="request.customerDeptName != null and request.customerDeptName !=''">
+        <if test="request != null and request.customerDeptName != null and request.customerDeptName !=''">
             and customer_dept_name like concat('%',#{request.customerDeptName},'%')
         </if>
-        <if test="request.createUserName != null and request.createUserName !=''">
+        <if test="request != null and request.createUserName != null and request.createUserName !=''">
             and create_user_name like concat('%',#{request.createUserName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSealUseNoteMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSealUseNoteMapper.xml
index ab37bc1..b02bb33 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSealUseNoteMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSealUseNoteMapper.xml
@@ -29,32 +29,32 @@
     </sql>
 
     <select id="selectBatchForApprovalList" resultMap="BaseResultMap">
-        SELECT *
+        SELECT brsun.*, brsi.seal_name, brsi.seal_type, brsi.approver_name
         FROM biz_resource_seal_use_note brsun
         JOIN biz_resource_seal_info brsi ON brsun.seal_id = brsi.id
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and brsun.approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and brsun.create_user_id = #{request.createUserId}
         </if>
-        <if test="request.sealName != null and request.sealName !=''">
+        <if test="request != null and request.sealName != null and request.sealName !=''">
             and brsi.seal_name like concat('%',#{request.sealName},'%')
         </if>
-        <if test="request.sealType != null and request.sealType !=''">
+        <if test="request != null and request.sealType != null and request.sealType !=''">
             and brsi.seal_type = #{request.sealType}
         </if>
-        <if test="request.applyDeptName != null and request.applyDeptName !=''">
+        <if test="request != null and request.applyDeptName != null and request.applyDeptName !=''">
             and brsun.apply_dept_name like concat('%',#{request.applyDeptName},'%')
         </if>
-        <if test="request.applyUserName != null and request.applyUserName !=''">
+        <if test="request != null and request.applyUserName != null and request.applyUserName !=''">
             and brsun.apply_user_name like concat('%',#{request.applyUserName},'%')
         </if>
-        <if test="request.applyTimeStart != null and request.applyTimeStart !=''">
+        <if test="request != null and request.applyTimeStart != null and request.applyTimeStart !=''">
             and brsun.apply_time &gt;= #{request.applyTimeStart}
         </if>
-        <if test="request.applyTimeEnd != null and request.applyTimeEnd !=''">
+        <if test="request != null and request.applyTimeEnd != null and request.applyTimeEnd !=''">
             and brsun.apply_time &lt;= #{request.applyTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml
index 119bf7d..4f8392a 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml
@@ -31,6 +31,12 @@
         <if test="request.deptName != null and request.deptName !=''">
             and brsi.dept_name like concat('%',#{request.deptName},'%')
         </if>
+        <if test="request.ids != null">
+            and brsv.id in
+            <foreach collection="request.ids" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
         ORDER BY brsv.grant_date DESC
     </select>
 
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSupplierInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSupplierInfoMapper.xml
index fe8d399..e8ce7ef 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSupplierInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSupplierInfoMapper.xml
@@ -48,28 +48,28 @@
         SELECT *
         FROM biz_resource_supplier_info
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.supplierNo != null and request.supplierNo !=''">
+        <if test="request != null and request.supplierNo != null and request.supplierNo !=''">
             and supplier_no like concat('%',#{request.supplierNo},'%')
         </if>
-        <if test="request.supplierName != null and request.supplierName !=''">
+        <if test="request != null and request.supplierName != null and request.supplierName !=''">
             and supplier_name like concat('%',#{request.supplierName},'%')
         </if>
-        <if test="request.director != null and request.director !=''">
+        <if test="request != null and request.director != null and request.director !=''">
             and director like concat('%',#{request.director},'%')
         </if>
-        <if test="request.supplierType != null and request.supplierType !=''">
+        <if test="request != null and request.supplierType != null and request.supplierType !=''">
             and supplier_type = #{request.supplierType}
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/EnvLocationInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/EnvLocationInfoMapper.xml
new file mode 100644
index 0000000..68bcf10
--- /dev/null
+++ b/casic-metering-dao/src/main/resources/mapper/resource/EnvLocationInfoMapper.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.mapper.resource.EnvLocationInfoMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.resource.EnvLocationInfo">
+        <id column="id" property="id" />
+        <result column="location_no" property="locationNo" />
+        <result column="location_name" property="locationName" />
+        <result column="location_position" property="locationPosition" />
+        <result column="create_user_id" property="createUserId" />
+        <result column="create_user" property="createUser" />
+        <result column="create_time" property="createTime" />
+        <result column="update_time" property="updateTime" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, location_no, location_name, location_position, create_user_id, create_user, create_time, update_time
+    </sql>
+
+    <select id="selectLocationListPage" resultType="com.casic.missiles.dto.resource.environment.LocationListResponse">
+        SELECT *
+        FROM env_location_info
+        WHERE 1=1
+        <if test="request.locationNo != null and request.locationNo !=''">
+            AND location_no LIKE concat('%',#{request.locationNo},'%')
+        </if>
+        <if test="request.locationName != null and request.locationName !=''">
+            AND location_name LIKE concat('%',#{request.locationName},'%')
+        </if>
+        ORDER BY create_time DESC
+    </select>
+
+</mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml
index b28c18f..8854047 100644
--- a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml
@@ -11,7 +11,6 @@
         <result column="sign_desc" property="signDesc" />
         <result column="sign_director" property="signDirector" />
         <result column="sign_user_id" property="signUserId" />
-        <result column="sign_type" property="signType" />
         <result column="minio_file_name" property="minioFileName" />
         <result column="create_time" property="createTime" />
         <result column="update_time" property="updateTime" />
@@ -28,7 +27,6 @@
         <result column="sign_name" property="signName" />
         <result column="sign_desc" property="signDesc" />
         <result column="sign_director" property="signDirector" />
-        <result column="sign_type" property="signType" />
         <result column="sign_user_id" property="signUserId" />
         <result column="minio_file_name" property="minioFileName" />
         <result column="create_time" property="createTime" />
@@ -62,4 +60,58 @@
         JOIN system_sign_user_relation ssur ON ss.id = ssur.sign_id
         WHERE ssur.user_id = #{userId}
     </select>
+
+    <select id="selectSignListPage" resultMap="BaseResultMap">
+        SELECT ss.*, sd.SIMPLE_NAME AS deptName
+        FROM system_sign ss
+        LEFT JOIN sys_user su ON su.id = ss.sign_user_id
+        LEFT JOIN sys_dept sd ON sd.id = su.dept_id
+        WHERE 1=1
+        <if test="request.signNo != null and request.signNo !=''">
+            AND ss.sign_no LIKE concat('%',#{request.signNo},'%')
+        </if>
+        <if test="request.signName != null and request.signName !=''">
+            AND ss.sign_name LIKE concat('%',#{request.signName},'%')
+        </if>
+        <if test="request.signDirector != null and request.signDirector !=''">
+            AND ss.sign_director LIKE concat('%',#{request.signDirector},'%')
+        </if>
+        <if test="request.signUserId != null and request.signUserId !=''">
+            AND ss.sign_user_id = #{request.signUserId}
+        </if>
+        <if test="request.createStartTime != null and request.createStartTime !=''">
+            AND DATE_FORMAT(ss.create_time,'%Y-%m-%d') &gt;= DATE_FORMAT(#{request.createStartTime},'%Y-%m-%d')
+        </if>
+        <if test="request.createEndTime != null and request.createEndTime !=''">
+            AND DATE_FORMAT(ss.create_time,'%Y-%m-%d')  &lt;= DATE_FORMAT(#{request.createEndTime},'%Y-%m-%d')
+        </if>
+        ORDER BY ss.create_time DESC
+    </select>
+
+    <select id="selectSignList" resultMap="BaseResultMap">
+        SELECT ss.*, sd.SIMPLE_NAME AS deptName
+        FROM system_sign ss
+        LEFT JOIN sys_user su ON su.id = ss.sign_user_id
+        LEFT JOIN sys_dept sd ON sd.id = su.dept_id
+        WHERE 1=1
+        <if test="request.signNo != null and request.signNo !=''">
+            AND ss.sign_no LIKE concat('%',#{request.signNo},'%')
+        </if>
+        <if test="request.signName != null and request.signName !=''">
+            AND ss.sign_name LIKE concat('%',#{request.signName},'%')
+        </if>
+        <if test="request.signDirector != null and request.signDirector !=''">
+            AND ss.sign_director LIKE concat('%',#{request.signDirector},'%')
+        </if>
+        <if test="request.signUserId != null and request.signUserId !=''">
+            AND ss.sign_user_id = #{request.signUserId}
+        </if>
+        <if test="request.createStartTime != null and request.createStartTime !=''">
+            AND DATE_FORMAT(ss.create_time,'%Y-%m-%d') &gt;= DATE_FORMAT(#{request.createStartTime},'%Y-%m-%d')
+        </if>
+        <if test="request.createEndTime != null and request.createEndTime !=''">
+            AND DATE_FORMAT(ss.create_time,'%Y-%m-%d')  &lt;= DATE_FORMAT(#{request.createEndTime},'%Y-%m-%d')
+        </if>
+        ORDER BY ss.create_time DESC
+    </select>
 </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 515050a..60f530b 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
@@ -47,8 +47,8 @@
     String STORAGE_LOCATION = "bizStorageLocation";
     //计量专业
     String MEASURE_MAJOR = "bizMeasureMajor";
-    //管理状态
-    String MANAGER_STATE = "bizManagerState";
+    //标准装置管理状态
+    String STANDARD_MANAGER_STATE = "bizStandardManagerState";
 
     /**
      * 资源管理 字典code
@@ -95,8 +95,6 @@
     String MEASURE_STATUS = "measureStatus";
     //检定方式
     String MEASURE_TYPE = "measureType";
-    //标识打印标志类型
-    String IDENTIFY_PRINT_TYPE = "bizBusinessIdentify";
     //变更类型
     String REPORT_CHANGE_TYPE = "bizCertChangeType";
     //规模类型
@@ -111,19 +109,24 @@
     String MEASURE_CATEGORY = "measureCategory";
     //检定结果
     String MEASURE_RESULT = "measureResult";
+    //分包原因
+    String OUTSOURCE_REASON = "outsourceReason";
+
+    /**
+     * 系统管理
+     */
+    String TEMPLATE_TYPE = "templateType";
+
 
     /**
      * 标准装置 字典code
      */
     //类别
     String STANDARD_CATEGORY = "standardCategory";
-    //管理状态
-    String STANDARD_MANAGER_STATE = "standardManagerState";
     //标准等级
     String STANDARD_LEVEL = "standardLevel";
     //传递范围
     String STANDARD_TRANSMIT_RANGE = "transmitRange";
-
     //资本来源
     String CAPITAL_SOURCE = "capitalSource";
     //标准装置-申请类型
@@ -148,8 +151,6 @@
     String CERTIFICATE_CLASS = "certificationClass";
     //证书管理-检校专业
     String CALIBRATION_MAJOR = "calibrationMajor";
-    //分包原因
-    String OUTSOURCE_REASON = "outsourceReason";
 
     /**
      * 工作台
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/BaseApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/BaseApprovalListRequest.java
index 73c12c1..80d7424 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/BaseApprovalListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/BaseApprovalListRequest.java
@@ -6,6 +6,7 @@
 
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotEmpty;
+import java.util.List;
 
 /**
  * @Description:
@@ -19,14 +20,14 @@
      * 表单id
      */
     @NotBlank(message = "表单id不能为空")
-    @ApiModelProperty(value = "表单id（流程定义对应的表单id，等价于业务id）", dataType = "String")
+    @ApiModelProperty(value = "表单id（流程定义对应的表单id，等价于业务id），导出接口不用传", dataType = "String")
     private String formId;
 
     /**
      * 审批状态类型，对应ApprovalStatusEnum
      */
     @NotEmpty(message = "审批状态类型不能为空")
-    @ApiModelProperty(value = "审批状态类型code", dataType = "String")
+    @ApiModelProperty(value = "审批状态类型code，导出接口不用传", dataType = "String")
     private String approvalStatus;
 
     @ApiModelProperty(hidden = true)
@@ -34,4 +35,7 @@
 
     @ApiModelProperty(hidden = true)
     private Long createUserId;
+
+    @ApiModelProperty(value = "导出ids", dataType = "List")
+    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificatePrintApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificatePrintApprovalListRequest.java
index b93d1c9..3cc2f4e 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificatePrintApprovalListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificatePrintApprovalListRequest.java
@@ -5,8 +5,6 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import java.util.List;
-
 /**
  * @Description:
  * @Author: wangpeng
@@ -38,7 +36,4 @@
 
     @ApiModelProperty(value = "创建结束时间", dataType = "String")
     private String createTimeEnd;
-
-    @ApiModelProperty(value = "导出ids", dataType = "List")
-    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportApprovalListRequest.java
index 4f7a038..c115847 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportApprovalListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportApprovalListRequest.java
@@ -5,8 +5,6 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import java.util.List;
-
 /**
  * @Description:
  * @Author: wangpeng
@@ -15,6 +13,8 @@
 @ApiModel
 @Data
 public class CertificateReportApprovalListRequest extends BaseApprovalListRequest {
+    @ApiModelProperty(value = "委托方id", dataType = "String")
+    private Long customerId;
 
     @ApiModelProperty(value = "证书报告编号", dataType = "String")
     private String certificateReportNo;
@@ -37,6 +37,4 @@
     @ApiModelProperty(value = "检校结束时间", dataType = "String")
     private String calibrationTimeEnd;
 
-    @ApiModelProperty(value = "导出ids", dataType = "List")
-    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/identify/IdentifyListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/identify/IdentifyListRequest.java
index 1b87ae6..f019203 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/identify/IdentifyListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/identify/IdentifyListRequest.java
@@ -4,6 +4,8 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * @Description:
  * @Author: wangpeng
@@ -26,4 +28,7 @@
 
     @ApiModelProperty(value = "打印结束时间", dataType = "String")
     private String createTimeEnd;
+
+    @ApiModelProperty(value = "导出ids", dataType = "List")
+    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListRequest.java
index 1264883..62415fb 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListRequest.java
@@ -7,6 +7,7 @@
 import lombok.Data;
 
 import javax.validation.constraints.NotBlank;
+import java.util.List;
 
 @Data
 @ApiModel
@@ -37,4 +38,6 @@
     @ApiModelProperty(value = "是否加急（1是0否null全部）", dataType = "Integer")
     private String isUrgent;
 
+    @ApiModelProperty(value = "导出ids", dataType = "List")
+    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListRequest.java
index 5201d7b..499760a 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListRequest.java
@@ -17,6 +17,9 @@
     @ApiModelProperty(value = "任务单编号", dataType = "String")
     private String orderNo;
 
+    @ApiModelProperty(value = "委托方id", dataType = "Long")
+    private Long customerId;
+
     @ApiModelProperty(value = "委托方名称", dataType = "String")
     private String customerName;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OrderSampleDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OrderSampleDTO.java
new file mode 100644
index 0000000..796edc0
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OrderSampleDTO.java
@@ -0,0 +1,19 @@
+package com.casic.missiles.dto.business.outsource;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/8/24 11:38
+ */
+@ApiModel
+@Data
+public class OrderSampleDTO {
+    @ApiModelProperty(value = "任务单id", dataType = "Long")
+    private Long orderId;
+    @ApiModelProperty(value = "受检设备id", dataType = "Long")
+    private Long sampleId;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceAssessApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceAssessApprovalListRequest.java
new file mode 100644
index 0000000..9a930c3
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceAssessApprovalListRequest.java
@@ -0,0 +1,30 @@
+package com.casic.missiles.dto.business.outsource;
+
+import com.casic.missiles.dto.BaseApprovalListRequest;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/8/24 11:01
+ */
+@ApiModel
+@Data
+public class OutsourceAssessApprovalListRequest extends BaseApprovalListRequest {
+    @ApiModelProperty(value = "评审表编号", dataType = "String")
+    private String projectNo;
+
+    @ApiModelProperty(value = "分包机构名称", dataType = "String")
+    private String outsourcerName;
+
+    @ApiModelProperty(value = "申请人", dataType = "String")
+    private String applicantName;
+
+    @ApiModelProperty(value = "申请时间开始", dataType = "String")
+    private String applicantTimeStart;
+
+    @ApiModelProperty(value = "申请时间结束", dataType = "String")
+    private String applicantTimeEnd;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceAssessSaveResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceAssessSaveResponse.java
new file mode 100644
index 0000000..8bf9aad
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceAssessSaveResponse.java
@@ -0,0 +1,20 @@
+package com.casic.missiles.dto.business.outsource;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/8/14 16:17
+ */
+@ApiModel
+@Data
+public class OutsourceAssessSaveResponse {
+    @ApiModelProperty(value = "主键id", dataType = "Long")
+    private Long id;
+
+    @ApiModelProperty(value = "编号", dataType = "String")
+    private String projectNo;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProtocolApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProtocolApprovalListRequest.java
new file mode 100644
index 0000000..0f32331
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProtocolApprovalListRequest.java
@@ -0,0 +1,30 @@
+package com.casic.missiles.dto.business.outsource;
+
+import com.casic.missiles.dto.BaseApprovalListRequest;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/8/24 15:01
+ */
+@ApiModel
+@Data
+public class OutsourceProtocolApprovalListRequest extends BaseApprovalListRequest {
+    @ApiModelProperty(value = "协议书编号", dataType = "String")
+    private String protocolNo;
+
+    @ApiModelProperty(value = "分包方名称", dataType = "String")
+    private String outsourcerName;
+
+    @ApiModelProperty(value = "申请人", dataType = "String")
+    private String applicantName;
+
+    @ApiModelProperty(value = "申请时间开始", dataType = "String")
+    private String applicantTimeStart;
+
+    @ApiModelProperty(value = "申请时间结束", dataType = "String")
+    private String applicantTimeEnd;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProtocolSaveResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProtocolSaveResponse.java
new file mode 100644
index 0000000..e324967
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProtocolSaveResponse.java
@@ -0,0 +1,20 @@
+package com.casic.missiles.dto.business.outsource;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/8/14 16:17
+ */
+@ApiModel
+@Data
+public class OutsourceProtocolSaveResponse {
+    @ApiModelProperty(value = "主键id", dataType = "Long")
+    private Long id;
+
+    @ApiModelProperty(value = "编号", dataType = "String")
+    private String protocolNo;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveApprovalListRequest.java
index f29f4e4..7047c28 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveApprovalListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveApprovalListRequest.java
@@ -5,8 +5,6 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import java.util.List;
-
 /**
  * @Description: 现场检测审批列表请求实体
  * @Author: wangpeng
@@ -30,7 +28,4 @@
     @ApiModelProperty(value = "申请时间结束", dataType = "String")
     private String applyTimeEnd;
 
-    @ApiModelProperty(value = "导出ids", dataType = "List")
-    private List<Long> ids;
-
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveDetailResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveDetailResponse.java
index 1f28752..394c934 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveDetailResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveDetailResponse.java
@@ -12,6 +12,18 @@
     @ApiModelProperty(value = "id，更新/删除使用参数", dataType = "Long")
     private Long id;
 
+    @ApiModelProperty(value = "实验室代码(字典code)", dataType = "String")
+    private String labCode;
+
+    @ApiModelProperty(value = "实验室代码(字典value)", dataType = "String")
+    private String labCodeName;
+
+    @ApiModelProperty(value = "组别代码(字典code)", dataType = "String")
+    private String groupCode;
+
+    @ApiModelProperty(value = "组别代码(字典value)", dataType = "String")
+    private String groupCodeName;
+
     @ApiModelProperty(value = "审批编号", dataType = "String")
     private String siteExecutiveNo;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/environment/LocationListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/environment/LocationListRequest.java
new file mode 100644
index 0000000..13d03c3
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/environment/LocationListRequest.java
@@ -0,0 +1,20 @@
+package com.casic.missiles.dto.resource.environment;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/6/8 13:56
+ */
+@ApiModel
+@Data
+public class LocationListRequest {
+    @ApiModelProperty(value = "地点编号", dataType = "String")
+    private String locationNo;
+
+    @ApiModelProperty(value = "地点名称", dataType = "String")
+    private String locationName;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/environment/LocationListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/environment/LocationListResponse.java
new file mode 100644
index 0000000..4c531af
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/environment/LocationListResponse.java
@@ -0,0 +1,78 @@
+package com.casic.missiles.dto.resource.environment;
+
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
+import com.baomidou.mybatisplus.annotation.TableField;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description: 地点列表响应实体
+ * @Author: wangpeng
+ * @Date: 2023/6/8 13:53
+ */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
+@ApiModel
+@Data
+public class LocationListResponse {
+    @ApiModelProperty(value = "主键id", dataType = "Long")
+    private Long id;
+
+    /**
+     * 地点编号
+     */
+    @ExcelProperty("地点编号")
+    @ApiModelProperty(value = "地点编号", dataType = "String")
+    private String locationNo;
+
+    /**
+     * 地点名称
+     */
+    @ExcelProperty("地点名称")
+    @ApiModelProperty(value = "地点名称", dataType = "String")
+    private String locationName;
+
+    /**
+     * 地点位置
+     */
+    @ExcelProperty("地点位置")
+    @ApiModelProperty(value = "地点位置", dataType = "String")
+    private String locationPosition;
+
+    /**
+     * 创建人id
+     */
+    @ApiModelProperty(value = "创建人id", dataType = "Long")
+    private Long createUserId;
+
+    /**
+     * 创建人
+     */
+    @ExcelProperty("创建人")
+    @ApiModelProperty(value = "创建人", dataType = "String")
+    @TableField("create_user")
+    private String createUser;
+
+    /**
+     * 创建时间
+     */
+    @ExcelProperty("创建时间")
+    @ApiModelProperty(value = "创建时间", dataType = "String")
+    private String createTime;
+
+    /**
+     * 更新时间
+     */
+    @ApiModelProperty(value = "更新时间", dataType = "String")
+    private String updateTime;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertRequest.java
index 9a7f6c6..c827915 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertRequest.java
@@ -4,6 +4,8 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * @Description:
  * @Author: wangpeng
@@ -16,4 +18,7 @@
     private String name;
     @ApiModelProperty(value = "部门名", dataType = "String")
     private String deptName;
+
+    @ApiModelProperty(value = "导出ids", dataType = "List")
+    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertResponse.java
index f78b159..8f2f79e 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertResponse.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.dto.resource.staff;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.casic.missiles.annotation.DictCodeField;
 import com.casic.missiles.constants.MeterDictCode;
 import io.swagger.annotations.ApiModel;
@@ -13,12 +20,18 @@
  * @Author: wangpeng
  * @Date: 2023/7/27 15:13
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @ApiModel
 @Data
 public class StaffCertResponse {
     /**
      * 人员编号
      */
+    @ExcelProperty(value = "人员编号",order = 0)
     @NotEmpty(message = "人员编号不能为空")
     @ApiModelProperty(value = "人员编号", dataType = "String")
     private String staffNo;
@@ -26,6 +39,7 @@
     /**
      * 姓名
      */
+    @ExcelProperty(value = "姓名",order = 1)
     @ApiModelProperty(value = "姓名", dataType = "String")
     private String staffName;
 
@@ -54,6 +68,7 @@
     /**
      * 部门名字
      */
+    @ExcelProperty(value = "工作部门",order = 2)
     @ApiModelProperty(value = "部门名字", dataType = "String")
     private String deptName;
 
@@ -66,6 +81,7 @@
     /**
      * 计量专业
      */
+    @ExcelProperty(value = "计量专业",order = 3)
     @ApiModelProperty(value = "计量专业", dataType = "String")
     private String major;
 
@@ -110,6 +126,7 @@
     /**
      * 证书号
      */
+    @ExcelProperty(value = "证号",order = 4)
     @ApiModelProperty(value = "证书号", dataType = "String")
     private String certNo;
 
@@ -122,12 +139,14 @@
     /**
      * 有效日期
      */
+    @ExcelProperty(value = "证书有效期",order = 6)
     @ApiModelProperty(value = "有效日期", dataType = "String")
     private String effectiveDate;
 
     /**
      * 发放日期
      */
+    @ExcelProperty(value = "发证日期",order = 5)
     @ApiModelProperty(value = "发放日期", dataType = "String")
     private String grantDate;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffListRequest.java
index 7c4afb3..0a1194a 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffListRequest.java
@@ -4,6 +4,8 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * @Description:
  * @Author: wangpeng
@@ -18,4 +20,7 @@
     private String deptName;
     @ApiModelProperty(value = "部门id", dataType = "Long")
     private Long deptId;
+
+    @ApiModelProperty(value = "导出ids", dataType = "List")
+    private List<Long> ids;
 }

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java
index bb0c50f..13a699b 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java
@@ -12,6 +12,7 @@
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.IGeneralApprovalService;
+import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
@@ -19,6 +20,7 @@
 import org.springframework.web.bind.annotation.RequestBody;
 
 import javax.validation.Valid;
+import java.util.List;
 import java.util.Objects;
 
 /**
@@ -117,4 +119,17 @@
         }
         return baseApprovalService.failUpdate(request);
     }
+
+    public List<O> exportList(@RequestBody @Valid R request) throws Exception {
+        List<O> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = baseApprovalService.listExportByIds(request.getIds());
+        } else {
+            list = baseApprovalService.listExport(request);
+        }
+        for (O record : list) {
+            DictCodeUtils.convertDictCodeToName(record);
+        }
+        return list;
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java
index 8a90961..d775831 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java
@@ -5,6 +5,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.business.certificate.CertificateChangeApplyApprovalListRequest;
 import com.casic.missiles.dto.business.certificate.CertificateChangeApplySaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessCertificateChangeApply;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
@@ -20,6 +21,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -48,4 +50,12 @@
         }
         return changeApplyService.saveChangeApply(request);
     }
+
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody CertificateChangeApplyApprovalListRequest request) throws Exception {
+        List<BizBusinessCertificateChangeApply> list = super.exportList(request);
+        super.exportExcel(BizBusinessCertificateChangeApply.class, list, ExportEnum.CERTIFICATE_CHANGE_APPLY.getSheetName());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java
index 5fc4b07..af8230e 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java
@@ -9,6 +9,7 @@
 import com.casic.missiles.dto.business.certificate.CertificatePrintApprovalListRequest;
 import com.casic.missiles.dto.business.certificate.CertificatePrintListResponse;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.enums.business.CertificatePrintStatusEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessCertificatePrintLog;
@@ -18,10 +19,16 @@
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.io.IOException;
+import java.util.List;
 import java.util.Objects;
 
 /**
@@ -98,4 +105,16 @@
         });
         return certificatePrintService.certificatePrintLog(idDTO.getId());
     }
+
+    @ApiOperation("证书打印审批导出")
+    @PostMapping("/listExport")
+    public void exportList(@RequestBody CertificatePrintApprovalListRequest request) throws IOException {
+        List<CertificatePrintListResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = certificatePrintService.listByIds(request.getIds());
+        } else {
+            list = certificatePrintService.list(request);
+        }
+        super.exportExcel(CertificatePrintListResponse.class, list, ExportEnum.CERTIFICATE_PRINT.getSheetName());
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java
index 63b06dc..6b2efd5 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java
@@ -6,6 +6,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.business.certificate.CertificateReportApprovalListRequest;
 import com.casic.missiles.dto.business.certificate.CertificateReportSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessCertificateReport;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
@@ -21,6 +22,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -50,7 +52,7 @@
         return certificateReportService.saveCertificateReport(request);
     }
 
-    @ApiOperation("证书审批详情（基本信息）")
+    @ApiOperation("详情（基本信息）")
     @PostMapping("/detail")
     public ReturnDTO<BizBusinessCertificateReport> detail(@RequestBody @Valid BaseDetailRequest request, BindingResult bindingResult) throws Exception {
         if(bindingResult.hasErrors()){
@@ -59,4 +61,11 @@
         return certificateReportService.detail(request);
     }
 
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody CertificateReportApprovalListRequest request) throws Exception {
+        List<BizBusinessCertificateReport> list = super.exportList(request);
+        super.exportExcel(BizBusinessCertificateReport.class, list, ExportEnum.CERTIFICATE_REPORT.getSheetName());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java
index 46b26bd..57c0809 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java
@@ -10,20 +10,21 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.business.identify.IdentifyListRequest;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessIdentifyInfo;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.business.IBizBusinessIdentifyInfoService;
+import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import javax.validation.Valid;
+import java.util.List;
 import java.util.Objects;
 
 /**
@@ -57,16 +58,13 @@
         return identifyInfoService.addIdentify(identifyInfo);
     }
 
-    @ApiOperation("标识打印更新")
+    @ApiOperation("标识打印更新（更新打印时间）")
     @PostMapping("/update")
-    public ReturnDTO updateIdentify(@RequestBody @Valid BizBusinessIdentifyInfo identifyInfo, BindingResult bindingResult) {
-        Assert.isFalse(Objects.isNull(identifyInfo.getId()), () -> {
+    public ReturnDTO updateIdentify(@RequestBody @Valid IdDTO idDTO) {
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        Assert.isFalse(bindingResult.hasErrors(), () -> {
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        });
-        return identifyInfoService.updateIdentify(identifyInfo);
+        return identifyInfoService.updateIdentify(idDTO.getId());
     }
 
     @ApiOperation("标识打印删除")
@@ -77,4 +75,37 @@
         });
         return identifyInfoService.deleteIdentify(idDTO.getId());
     }
+
+    @ApiOperation("标识打印导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody @Valid IdentifyListRequest request, BindingResult bindingResult) throws Exception {
+        if (bindingResult.hasErrors()) {
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        List<BizBusinessIdentifyInfo> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = identifyInfoService.listByIds(request.getIds());
+        } else {
+            list = identifyInfoService.list(request);
+        }
+        for (BizBusinessIdentifyInfo record : list) {
+            DictCodeUtils.convertDictCodeToName(record);
+        }
+        super.exportExcel(BizBusinessIdentifyInfo.class, list, ExportEnum.IDENTIFY_EXPORT.getSheetName());
+    }
+
+
+    // TODO: 2023/8/23 查询设备信息，4个底部按钮查设备（按钮的作用就是前端用来调不同接口、用来区分中间即将展示的标识），前端弹窗选设备，在确定保存时前端根据底部按钮判断传入设备类型deviceType字典code
+    // TODO: 2023/8/23 接口：查受检设备（第1个按钮），查设备台账（后3个按钮同一接口），查询之后前端根据标志类型的不同加到中间页面时进行判断（按产品给的对应表）
+    // TODO: 2023/8/23 提供二维码接口，前端在加到中间页面时调用一下
+
+    @ApiOperation("设备二维码")
+    @PostMapping("/equipment/qrCode")
+    public ReturnDTO<String> equipmentQrCode(@RequestBody @Valid IdDTO idDTO) {
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return identifyInfoService.equipmentQrCode(idDTO.getId());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java
index 707be6e..7e0453d 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java
@@ -117,7 +117,7 @@
     }
 
     @ApiOperation("任务单导出")
-    @PostMapping("/export")
+    @PostMapping("/listExport")
     public void orderExport(@RequestBody @Valid OrderListRequest request, HttpServletResponse response) {
         businessOrderService.orderExport(request, response);
     }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java
index 529a6ce..51432be 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java
@@ -1,9 +1,28 @@
 package com.casic.missiles.controller.business;
 
+import com.casic.missiles.controller.GeneralApprovalController;
+import com.casic.missiles.dto.BaseApprovalSubmitRequest;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.business.outsource.OutsourceAssessApprovalListRequest;
+import com.casic.missiles.dto.business.outsource.OutsourceAssessSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
+import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.model.business.BizBusinessOutsourceAssess;
+import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
+import com.casic.missiles.service.IGeneralApprovalService;
+import com.casic.missiles.service.business.IBizBusinessOutsourceAssessService;
 import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.BindingResult;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.validation.Valid;
+import java.util.List;
+
 /**
  * <p>
  * 计量检定业务-分包管理-测试、校准或检定工作分包评审表 前端控制器
@@ -15,6 +34,27 @@
 @Api(tags = "分包管理-测试、校准或检定工作分包评审表")
 @RestController
 @RequestMapping("/business/outsource/assess")
-public class BizBusinessOutsourceAssessController {
+public class BizBusinessOutsourceAssessController extends GeneralApprovalController<BizBusinessOutsourceAssess, BizBusinessOutsourceAssess, OutsourceAssessApprovalListRequest, BaseApprovalSubmitRequest> {
+    @Autowired
+    private IBizBusinessOutsourceAssessService outsourceAssessService;
 
+    public BizBusinessOutsourceAssessController(IGeneralApprovalService<BizBusinessOutsourceAssess, BizBusinessOutsourceAssess, OutsourceAssessApprovalListRequest, BaseApprovalSubmitRequest> baseApprovalService) {
+        super(baseApprovalService);
+    }
+
+    @ApiOperation("草稿箱-保存")
+    @PostMapping("/save")
+    public ReturnDTO<OutsourceAssessSaveResponse> saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceAssess request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        return outsourceAssessService.saveOutsourceAssess(request);
+    }
+
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception {
+        List<BizBusinessOutsourceAssess> list = super.exportList(request);
+        super.exportExcel(BizBusinessOutsourceAssess.class, list, ExportEnum.OUTSOURCE_ASSESS.getSheetName());
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java
new file mode 100644
index 0000000..9adef18
--- /dev/null
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java
@@ -0,0 +1,60 @@
+package com.casic.missiles.controller.business;
+
+import com.casic.missiles.controller.GeneralApprovalController;
+import com.casic.missiles.dto.BaseApprovalSubmitRequest;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.business.outsource.OutsourceProtocolApprovalListRequest;
+import com.casic.missiles.dto.business.outsource.OutsourceProtocolSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
+import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.model.business.BizBusinessOutsourceProtocol;
+import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
+import com.casic.missiles.service.IGeneralApprovalService;
+import com.casic.missiles.service.business.IBizBusinessOutsourceProtocolService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.BindingResult;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.validation.Valid;
+import java.util.List;
+
+/**
+ * <p>
+ * 计量检定业务-分包管理-测试、校准或检定工作分包协议书 前端控制器
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-08-24
+ */
+@Api(tags = "分包管理-测试、校准或检定工作分包协议书")
+@RestController
+@RequestMapping("/business/outsource/protocol")
+public class BizBusinessOutsourceProtocolController extends GeneralApprovalController<BizBusinessOutsourceProtocol, BizBusinessOutsourceProtocol, OutsourceProtocolApprovalListRequest, BaseApprovalSubmitRequest> {
+    @Autowired
+    private IBizBusinessOutsourceProtocolService outsourceProtocolService;
+
+    public BizBusinessOutsourceProtocolController(IGeneralApprovalService<BizBusinessOutsourceProtocol, BizBusinessOutsourceProtocol, OutsourceProtocolApprovalListRequest, BaseApprovalSubmitRequest> baseApprovalService) {
+        super(baseApprovalService);
+    }
+
+    @ApiOperation("草稿箱-保存")
+    @PostMapping("/save")
+    public ReturnDTO<OutsourceProtocolSaveResponse> saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceProtocol request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        return outsourceProtocolService.saveOutsourceProtocol(request);
+    }
+
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody OutsourceProtocolApprovalListRequest request) throws Exception {
+        List<BizBusinessOutsourceProtocol> list = super.exportList(request);
+        super.exportExcel(BizBusinessOutsourceProtocol.class, list, ExportEnum.OUTSOURCE_PROTOCOL.getSheetName());
+    }
+}
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java
index 097f645..f0f0943 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java
@@ -17,7 +17,6 @@
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.IGeneralApprovalService;
 import com.casic.missiles.service.business.IBizBusinessOutsourcerInfoService;
-import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -71,19 +70,8 @@
 
     @ApiOperation("分包方导出")
     @PostMapping("/listExport")
-    public void export(@RequestBody @Valid OutsourcerInfoApprovalListRequest request, BindingResult bindingResult) throws Exception {
-        if (bindingResult.hasErrors()) {
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        }
-        List<BizBusinessOutsourcerInfo> list;
-        if (!CollectionUtils.isEmpty(request.getIds())) {
-            list = outsourcerInfoService.listByIds(request.getIds());
-        } else {
-            list = outsourcerInfoService.list(request);
-        }
-        for (BizBusinessOutsourcerInfo record : list) {
-            DictCodeUtils.convertDictCodeToName(record);
-        }
+    public void export(@RequestBody OutsourcerInfoApprovalListRequest request) throws Exception {
+        List<BizBusinessOutsourcerInfo> list = super.exportList(request);
         super.exportExcel(BizBusinessOutsourcerInfo.class, list, ExportEnum.OUTSOURCER_EXPORT.getSheetName());
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java
index c2cbf9f..0410918 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java
@@ -17,11 +17,9 @@
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.IGeneralApprovalService;
 import com.casic.missiles.service.business.IBizBusinessSiteExecutiveInfoService;
-import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -60,7 +58,7 @@
         return siteExecutiveInfoService.saveSiteExecutiveInfo(siteExecutiveInfo);
     }
 
-    @ApiOperation("现场检测详情")
+    @ApiOperation("详情")
     @PostMapping("/detail")
     public ReturnDTO<SiteExecutiveDetailResponse> siteExecutiveDetail(@RequestBody @Valid IdDTO idDTO) throws Exception {
         Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
@@ -69,21 +67,10 @@
         return ReturnUtil.success(siteExecutiveInfoService.detail(idDTO.getId()));
     }
 
-    @ApiOperation("现场检测导出")
+    @ApiOperation("导出")
     @PostMapping("/listExport")
-    public void export(@RequestBody @Valid SiteExecutiveApprovalListRequest request, BindingResult bindingResult) throws Exception {
-        if (bindingResult.hasErrors()) {
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        }
-        List<SiteExecutiveApprovalListResponse> list;
-        if (!CollectionUtils.isEmpty(request.getIds())) {
-            list = siteExecutiveInfoService.listInfoByIds(request.getIds());
-        } else {
-            list = siteExecutiveInfoService.listInfo(request);
-        }
-        for (SiteExecutiveApprovalListResponse record : list) {
-            DictCodeUtils.convertDictCodeToName(record);
-        }
+    public void export(@RequestBody SiteExecutiveApprovalListRequest request) throws Exception {
+        List<SiteExecutiveApprovalListResponse> list = super.exportList(request);
         super.exportExcel(SiteExecutiveApprovalListResponse.class, list, ExportEnum.SITE_EXECUTIVE_EXPORT.getSheetName());
     }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
index 7e793cd..a92e209 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
@@ -55,7 +55,7 @@
 
     @ApiOperation("设备收发列表导出")
     @PostMapping("/export")
-    public void exportList(@RequestBody @Valid SampleDispatchListRequest request) throws IOException {
+    public void exportList(@RequestBody SampleDispatchListRequest request) throws IOException {
         List<SampleDispatchListResponse> list;
         if (!CollectionUtils.isEmpty(request.getIds())) {
             list = dispatchService.listByIds(request.getIds());
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java
index cdc77fc..d120fd4 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java
@@ -7,6 +7,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.business.labExecutive.*;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.business.IBusinessLabExecutiveInfoService;
@@ -14,6 +15,7 @@
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.*;
 
@@ -32,7 +34,7 @@
     @Autowired
     private IBusinessLabExecutiveInfoService labExecutiveInfoService;
 
-    @ApiOperation("实验室检测-部门检测-查询各状态列表（待检测、检测中、检测完）")
+    @ApiOperation("实验室任务-查询各状态列表（待检测、检测中、检测完）")
     @PostMapping("/deptExecutive/List")
     public ReturnDTO<PageInfoBT<SampleLabExecutiveListResponse>> queryDeptExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
@@ -43,10 +45,19 @@
         return ReturnUtil.success(super.packForBT(labExecutiveInfoService.deptLabExecutiveListPage(page, labExecutiveListRequest)));
     }
 
-    /**
-     * 实验室检测-我的检测-查询各状态列表（待检测、检测中、检测完）
-     */
-    @ApiOperation("实验室检测-我的检测-查询各状态列表（待检测、检测中、检测完）")
+    @ApiOperation("实验室任务导出")
+    @PostMapping("/deptExecutive/export")
+    public void deptExportList(@RequestBody @Valid SampleLabExecutiveListRequest request) throws Exception {
+        List<SampleLabExecutiveListResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = labExecutiveInfoService.deptLabExecutiveListByIds(request.getMeasureStatus(), request.getIds());
+        } else {
+            list = labExecutiveInfoService.deptLabExecutiveList(request);
+        }
+        super.exportExcel(SampleLabExecutiveListResponse.class, list, ExportEnum.DEPT_EXECUTIVE_TASK.getSheetName());
+    }
+
+    @ApiOperation("我的任务-查询各状态列表（待检测、检测中、检测完）")
     @PostMapping("/myExecutive/list")
     public ReturnDTO<PageInfoBT<SampleLabExecutiveListResponse>> queryMyExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
@@ -57,19 +68,25 @@
         return ReturnUtil.success(super.packForBT(labExecutiveInfoService.myLabExecutiveListPage(page, labExecutiveListRequest)));
     }
 
-    /**
-     * 实验室检测-我的检测-查询各状态样品数量（待检测、检测中、检测完）
-     */
-    @ApiOperation("实验室检测-我的检测-查询各状态样品数量（待检测、检测中、检测完）")
+    @ApiOperation("我的任务导出")
+    @PostMapping("/myExecutive/export")
+    public void exportList(@RequestBody @Valid SampleLabExecutiveListRequest request) throws Exception {
+        List<SampleLabExecutiveListResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = labExecutiveInfoService.myLabExecutiveListByIds(request.getMeasureStatus(), request.getIds());
+        } else {
+            list = labExecutiveInfoService.myLabExecutiveList(request);
+        }
+        super.exportExcel(SampleLabExecutiveListResponse.class, list, ExportEnum.MY_EXECUTIVE_TASK.getSheetName());
+    }
+
+    @ApiOperation("我的任务-查询各状态样品数量（待检测、检测中、检测完）")
     @GetMapping("/myExecutive/amount")
     public ReturnDTO<List<SampleAmountResponse>> queryMyExecutiveAmount() {
         return ReturnUtil.success(labExecutiveInfoService.myExecutiveAmount());
     }
 
-    /**
-     * 实验室检测-部门检测-分配（分配给具体人员）
-     */
-    @ApiOperation("实验室检测-部门检测-分配按钮（分配给具体人员）")
+    @ApiOperation("实验室任务-分配按钮（分配给具体人员）")
     @PostMapping("/deptExecutive/allocate")
     public ReturnDTO allocateStaff(@RequestBody @Valid SampleAllocateRequest sampleAllocateRequest, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -78,10 +95,7 @@
         return labExecutiveInfoService.allocateStaff(sampleAllocateRequest);
     }
 
-    /**
-     * 实验室检测-我的检测-检定人扫描收入（待检测->检测中）
-     */
-    @ApiOperation("实验室检测-我的检测-检定人扫描收入（待检测->检测中）")
+    @ApiOperation("我的任务-检定人扫描收入（待检测->检测中）")
     @PostMapping("/myExecutive/receive")
     public ReturnDTO sampleReceive(@RequestBody @Valid List<SampleOperateRequest> requestList, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -90,10 +104,7 @@
         return labExecutiveInfoService.sampleReceive(requestList);
     }
 
-    /**
-     * 实验室检测-负责人/检定人扫描检完（检测中->检测完）
-     */
-    @ApiOperation("实验室检测-负责人/检定人扫描检完（检测中->检测完）")
+    @ApiOperation("实验室任务-负责人/检定人扫描检完（检测中->检测完）")
     @PostMapping("/myExecutive/complete")
     public ReturnDTO sampleExecutiveComplete(@RequestBody @Valid List<SampleOperateRequest> requestList, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -102,10 +113,7 @@
         return labExecutiveInfoService.sampleExecutiveComplete(requestList);
     }
 
-    /**
-     * 实验室检测-部门检测/我的检测 编辑（只能修改应出具证书）
-     */
-    @ApiOperation("实验室检测-部门检测/我的检测 编辑（只能修改应出具证书）")
+    @ApiOperation("实验室任务/我的任务 编辑（只能修改应出具证书）")
     @PostMapping("/executive/update")
     public ReturnDTO updateExecutive(@RequestBody @Valid UpdateExecutiveRequest request, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -114,10 +122,7 @@
         return labExecutiveInfoService.updateExecutive(request);
     }
 
-    /**
-     * 实验室检测-部门检测/我的检测 详情
-     */
-    @ApiOperation("实验室检测-部门检测/我的检测 详情")
+    @ApiOperation("实验室任务/我的任务 详情")
     @PostMapping("/executive/detail")
     public ReturnDTO<ExecutiveDetailResponse> executiveDetail(@RequestBody @Valid ExecutiveDetailRequest request, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
@@ -131,7 +136,7 @@
      * 退回后会将下一个要执行的实验室检测状态更新为待分配，将后面的实验室顺序变更为连续（都进行减1）
      * 最后一个检测的实验室退回，等分发员再增加实验室或设备收发中的已收入直接手动点击完成
      */
-    @ApiOperation("实验室检测-部门检测/我的检测 退回（待检测/检测中->退回）")
+    @ApiOperation("实验室任务/我的任务 退回（待检测/检测中->退回）")
     @PostMapping("/executive/sendBack")
     public ReturnDTO executiveSendBack(@RequestBody @Valid ExecutiveSendBackRequest request, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -140,9 +145,6 @@
         return labExecutiveInfoService.sampleExecutiveSendBack(request);
     }
 
-    /**
-     * 分发员编辑实验室检测列表
-     */
     @ApiOperation("分发员编辑实验室检测列表")
     @PostMapping("/handOut/updateList")
     public ReturnDTO updateExecutiveList(@RequestBody @Valid UpdateExecutiveListRequest request, BindingResult bindingResult) {
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java
index 48a67ed..0c04f31 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java
@@ -10,6 +10,7 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.resource.customer.CustomerApprovalListRequest;
 import com.casic.missiles.dto.resource.customer.CustomerSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceCustomerInfo;
@@ -26,6 +27,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -55,6 +57,13 @@
         return customerInfoService.saveCustomerInfo(request);
     }
 
+    @ApiOperation("委托方名录导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody CustomerApprovalListRequest request) throws Exception {
+        List<BizResourceCustomerInfo> list = super.exportList(request);
+        super.exportExcel(BizResourceCustomerInfo.class, list, ExportEnum.CUSTOMER_INFO.getSheetName());
+    }
+
     @ApiOperation("委托方人员列表（分页）")
     @PostMapping("/person/listPage")
     public ReturnDTO<PageInfoBT<BizResourceCustomerStaff>> personListPage(@RequestBody IdDTO idDto) {
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
index 972ed4b..6418ea5 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
@@ -5,6 +5,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.resource.customer.SuggestFormApprovalListRequest;
 import com.casic.missiles.dto.resource.customer.SuggestFormSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceCustomerSuggestForm;
@@ -20,6 +21,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -50,4 +52,11 @@
         return suggestFormService.saveSuggestForm(request);
     }
 
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody SuggestFormApprovalListRequest request) throws Exception {
+        List<BizResourceCustomerSuggestForm> list = super.exportList(request);
+        super.exportExcel(BizResourceCustomerSuggestForm.class, list, ExportEnum.CUSTOMER_SUGGEST_FORM.getSheetName());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java
index 1934d1a..9e07eab 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java
@@ -15,12 +15,16 @@
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.resource.IEnvEnvironmentRecordConfigService;
 import com.casic.missiles.service.resource.IEnvEnvironmentRecordDataService;
+import com.casic.missiles.service.resource.IEnvLocationInfoService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
 import java.util.List;
@@ -39,6 +43,8 @@
     private IEnvEnvironmentRecordDataService environmentRecordDataService;
     @Autowired
     private IEnvEnvironmentRecordConfigService environmentRecordConfigService;
+    @Autowired
+    private IEnvLocationInfoService locationInfoService;
 
     @ApiOperation("环境记录单数据列表/详情")
     @PostMapping("/data/listPage")
@@ -95,4 +101,11 @@
         });
         return environmentRecordConfigService.deleteEnvironmentRecordConfig(idDTO.getId());
     }
+
+    @ApiOperation("地点列表")
+    @PostMapping("/location/listPage")
+    public ReturnDTO<PageInfoBT<LocationListResponse>> locationListPage(@RequestBody @Valid LocationListRequest request) {
+        Page<LocationListResponse> page = PageFactory.defaultPage();
+        return ReturnUtil.success(super.packForBT(locationInfoService.listPage(page, request)));
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java
index 82efe3f..e9561fa 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java
@@ -10,6 +10,7 @@
 import com.casic.missiles.dto.resource.seal.SealLogListRequest;
 import com.casic.missiles.dto.resource.seal.SealNoteApprovalListRequest;
 import com.casic.missiles.dto.resource.seal.SealNoteSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceSealUseLog;
@@ -27,6 +28,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -58,6 +60,13 @@
         return sealUseNoteService.saveSeal(request);
     }
 
+    @ApiOperation("印章使用登记导出（列表和导出中去掉经办人和监印人）")
+    @PostMapping("/listExport")
+    public void export(@RequestBody SealNoteApprovalListRequest request) throws Exception {
+        List<BizResourceSealUseNote> list = super.exportList(request);
+        super.exportExcel(BizResourceSealUseNote.class, list, ExportEnum.SEAL_NOTE.getSheetName());
+    }
+
     // TODO: 2023/7/28 印章使用日志：系统中使用印章时插入数据库
 
     @ApiOperation("印章使用日志列表（分页）")
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java
index 9b674fc..06b6521 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java
@@ -9,16 +9,20 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.resource.staff.StaffCertRequest;
 import com.casic.missiles.dto.resource.staff.StaffCertResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.service.resource.IBizResourceStaffInfoService;
 import com.casic.missiles.service.resource.IBizResourceStaffVerifierService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.List;
+
 /**
  * @Description:
  * @Author: wangpeng
@@ -41,9 +45,21 @@
         return ReturnUtil.success(super.packForBT(responsePage));
     }
 
+    @ApiOperation("证书逾期提醒导出")
+    @PostMapping("/listExport")
+    public void exportList(@RequestBody StaffCertRequest request) throws Exception {
+        List<StaffCertResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = staffInfoService.certListByIds(request.getIds());
+        } else {
+            list = staffInfoService.certList(request);
+        }
+        super.exportExcel(StaffCertResponse.class, list, ExportEnum.STAFF_CERTIFICATE_EXPIRE.getSheetName());
+    }
+
     @ApiOperation("证书逾期提醒")
     @PostMapping("/expirationReminder")
-    public ReturnDTO expirationReminder(@RequestBody IdDTO idDto) {
-        return verifierService.expirationReminder(idDto);
+    public ReturnDTO expirationReminder(@RequestBody IdDTO idDTO) {
+        return verifierService.expirationReminder(idDTO);
     }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java
index 3b251ad..a6e7850 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java
@@ -12,6 +12,7 @@
 import com.casic.missiles.dto.resource.staff.StaffListRequest;
 import com.casic.missiles.dto.resource.staff.TrainListRequest;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.*;
@@ -22,7 +23,10 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
 import java.util.List;
@@ -52,8 +56,19 @@
             throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
         }
         Page<BizResourceStaffInfo> page = PageFactory.defaultPage();
-        Page<BizResourceStaffInfo> responsePage = staffInfoService.listPage(page, request);
-        return ReturnUtil.success(super.packForBT(responsePage));
+        return ReturnUtil.success(super.packForBT(staffInfoService.listPage(page, request)));
+    }
+
+    @ApiOperation("人员登记导出")
+    @PostMapping("/listExport")
+    public void exportList(@RequestBody StaffListRequest request) throws Exception {
+        List<BizResourceStaffInfo> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = staffInfoService.listByIds(request.getIds());
+        } else {
+            list = staffInfoService.list(request);
+        }
+        super.exportExcel(BizResourceStaffInfo.class, list, ExportEnum.STAFF_INFO.getSheetName());
     }
 
     @ApiOperation("人员登记详情基础信息")
@@ -85,9 +100,9 @@
 
     @ApiOperation("科研教育列表（分页）")
     @PostMapping("/education/listPage")
-    public ReturnDTO<PageInfoBT<BizResourceStaffEducation>> educationListPage(@RequestBody IdDTO idDto) {
+    public ReturnDTO<PageInfoBT<BizResourceStaffEducation>> educationListPage(@RequestBody IdDTO idDTO) {
         Page<BizResourceStaffEducation> page = PageFactory.defaultPage();
-        Page<BizResourceStaffEducation> responsePage = staffInfoService.educationListPage(page, idDto);
+        Page<BizResourceStaffEducation> responsePage = staffInfoService.educationListPage(page, idDTO);
         return ReturnUtil.success(super.packForBT(responsePage));
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java
index af6aa86..d85d84a 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java
@@ -9,6 +9,7 @@
 import com.casic.missiles.dto.resource.outsideService.SupplierApprovalListRequest;
 import com.casic.missiles.dto.resource.outsideService.SupplierSaveResponse;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceSupplierAbility;
@@ -67,6 +68,13 @@
         return ReturnUtil.success(supplierInfoService.detail(idDTO.getId()));
     }
 
+    @ApiOperation("合格供方导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody SupplierApprovalListRequest request) throws Exception {
+        List<BizResourceSupplierInfo> list = super.exportList(request);
+        super.exportExcel(BizResourceSupplierInfo.class, list, ExportEnum.SUPPLIER_INFO.getSheetName());
+    }
+
     @ApiOperation("供方人员列表（分页）")
     @PostMapping("/person/listPage")
     public ReturnDTO<PageInfoBT<BizResourceSupplierPerson>> personListPage(@RequestBody IdDTO idDTO) {
diff --git a/casic-metering-api/src/main/resources/config/application.yml b/casic-metering-api/src/main/resources/config/application.yml
index 350db5f..ecff521 100644
--- a/casic-metering-api/src/main/resources/config/application.yml
+++ b/casic-metering-api/src/main/resources/config/application.yml
@@ -126,7 +126,7 @@
     #作者
     author: wangpeng
     #待生成对象表名
-    table-name: biz_equipment_technical_target_approval,biz_equipment_attachment_approval,biz_equipment_checkpoint_approval
+    table-name: biz_business_outsource_protocol
 
 reminder:
   #节点--common模块config包 ReminderNodeConfig配置
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
index 4a19e4e..d47d552 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
@@ -53,6 +53,7 @@
     SUGGEST_FORM_SAVE_FAILED(2509, "委托方意见登记表保存至草稿箱失败"),
     EXAMINE_FORM_SAVE_FAILED(2510, "要求、委托书及合同评审表保存至草稿箱失败"),
     CUSTOMER_EXIST_SAVE_FAILED(2511, "该委托方已存在，请重新选择"),
+    DUPLICATE_LOCATION_NO(2512, "地点编号已存在"),
 
     /**
      * 计量检定业务模块
@@ -68,6 +69,8 @@
     COMPLETE_SAMPLE_NOT_EXIST(2609, "检测中不存在扫描收入的样品"),
     CANNOT_CHANGE_MEASURE_INFO(2610, "无法更改非当前登录用户的检测信息"),
     NON_EXIST_ORDER_OR_SAMPLE(2611, "不存在该委托单或该委托单下的样品"),
+    OUTSOURCE_ACCESS_SAVE_FAILED(2612, "测试、校准或检定工作分包评审表保存至草稿箱失败"),
+    OUTSOURCE_PROTOCOL_SAVE_FAILED(2613, "测试、校准或检定工作分包协议书保存至草稿箱失败"),
 
     /**
      * 历史遗留备用
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
index 5089ad1..81a406b 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
@@ -10,54 +10,38 @@
     /**
      * 资源管理
      */
-    ENVIRONMENT_DATA_EXPORT("environmentData", "environmentData", "环境记录单数据"),
+    ENVIRONMENT_DATA_EXPORT("environmentData", "环境记录单数据", "环境记录单数据"),
+    STAFF_INFO("staffInfo", "人员登记", "人员登记"),
+    STAFF_CERTIFICATE_EXPIRE("certificateExpire", "证书逾期提醒", "证书逾期提醒"),
+    SUPPLIER_INFO("supplierInfo", "合格供方名录", "合格供方名录"),
+    CUSTOMER_INFO("customerInfo", "委托方名录", "委托方名录"),
+    CUSTOMER_SUGGEST_FORM("customerSuggestForm", "委托方意见登记表", "委托方意见登记表"),
+    SEAL_NOTE("sealNote", "印章使用登记", "印章使用登记"),
 
-    FILE_EXPORT("meterFileData", "meterFileData", "计量文件信息"),
-    TRAIN_PLAN_EXPORT("trainPlanData", "trainPlanData", "培训计划"),
-    TRAIN_LOG_EXPORT("trainLogData", "trainLogData", "培训记录"),
-    METER_ORGANIZE_EXPORT("meterOrganizeData", "meterOrganizeData", "计量组织"),
-    TRACE_SUPPLIER_EXPORT("traceSupplierData", "traceSupplierData", "溯源供方"),
-    SIGN_EXPORT("signData", "signData", "签名/签章"),
-    TEMPLATE_EXPORT("templateData", "templateData", "原始记录模板/证书报告模板"),
-    FIXED_ASSETS("meterFixedAssets", "meterFixedAssets", "固定资产"),
-    METER_EQUIPMENT("meterEquipment", "meterEquipment", "测量设备"),
-    CALIBRATION_TEST_EQUIPMENT("calibrationTestEquipment", "calibrationTestEquipment", "校准检定设备"),
-    MEASURE_ACCOUNT("measureAccount", "measureAccount", "测量工装"),
-    STANDARD_SUPPORT_EQUIPMENT("standardSupportEquipment", "standardSupportEquipment", "标准配套设备"),
-    STANDARD_EQUIPMENT("standardEquipment", "standardEquipment", "标准装置"),
-    FLOW_DEF_EXPORT("flowDefData", "flowDefData", "流程定义"),
-    STAFF_CERTIFICATE("certificate", "certificate", "计量人员证书"),
-    CHECK_INFO("checkInfo", "checkInfo", "设备管理点检测"),
-    EQUIPMENT_APPLY("equipmentApply", "equipmentApply", "设备借用"),
-    STANDARD_EQUIPMENT_REMIND("equipmentApplyRemind", "equipmentApplyRemind", "标准装置到期提醒"),
-    METER_PRICE("meterPrice", "meterPrice", "价格库"),
-    METER_STAFF("meterStaff", "meterStaff", "计量人员"),
-    STANDARD_EQUIPMENT_APPLY("standardEquipmentApply", "standardEquipmentApply", "标准装置申请"),
-    STATE_MANAGE_APPLY("stateManage", "stateManage", "状态管理"),
-    METER_ACCEPTANCE_CHECK("acceptanceCheck", "acceptanceCheck", "设备检修保养验收单"),
-    CUSTOMER_EXPORT("customerData", "customerData", "客户信息"),
-    ORDER_EXPORT("orderData", "orderData", "委托书信息"),
-    SAMPLE_EXPORT("sampleData", "sampleData", "样本信息"),
-    EXCHANGE_DATA("exchangeData", "exchangeData", "设备交接单"),
-    DISPATCH_DATA("dispatchData", "dispatchData", "设备收发"),
-    ENVIRONMENT_DATA("environmentData", "environmentData", "环境记录单"),
-    ORIGIN_DATA("originData", "originData", "原始记录"),
-    CERTIFICATE_REPORT("certificateReport", "certificateReport", "证书报告"),
-    ADVICE_EXPORT("adviceData", "adviceData", "客户反馈"),
-    HANDOUT_EXPORT("handoutData", "handoutData", "任务分发列表"),
-    OUTSOURCER_EXPORT("outsourcerData", "outsourcerData", "分包方"),
-    SITE_EXECUTIVE_EXPORT("siteExecutiveData", "siteExecutiveData", "现场测试、校准或检定"),
-    CERTIFICATE_PRINT_EXPORT("certificatePrintData", "certificatePrintData", "证书打印"),
-    DOWNLOAD_TEMPLATE("downloadTemplate", "downloadTemplate", "页面配置"),
-    OUTSOURCER_CERTIFICATE_EXPORT("outsourceCertificateData", "outsourceCertificateData", "分包证书"),
-    SETTLEMENT_INFO_EXPORT("settlementInfoData", "settlementInfoData", "业务结算"),
-    EQUIPMENT_REMIND("equipmentRemind", "equipmentRemind", "设备到期提醒"),
-    AGREEMENT_INFO_EXPORT("agreementInfoData", "agreementInfoData", "合同"),
-    WORK_STATISTICS_EXPORT("workStatisticsData", "workStatisticsData", "实时工作统计"),
-    DEPT_OUTPUT_EXPORT("deptOutputData", "deptOutputData", "部门产值分析"),
-    WORKLOAD_EXPORT("workloadData", "workloadData", "业务工作量分析"),
-    DEPT_COMPREHENSIVE_EXPORT("deptComprehensiveData", "deptComprehensiveData", "部门综合分析"),
-    ENVIRONMENTAL_RECORD("environmentalRecordData", "environmentalRecordData", "现场环境记录");
+    /**
+     * 计量检定业务
+     */
+    OUTSOURCER_EXPORT("outsourcerData", "分包方名录", "分包方名录"),
+    IDENTIFY_EXPORT("identifyData", "计量标识", "计量标识"),
+    ORDER_EXPORT("orderData", "任务单", "任务单"),
+    DISPATCH_DATA("dispatchData", "设备收发", "设备收发"),
+    HANDOUT_EXPORT("handoutData", "任务分发", "任务分发"),
+    SITE_EXECUTIVE_EXPORT("siteExecutiveData", "现场测试、校准或检定", "现场测试、校准或检定"),
+    CERTIFICATE_REPORT("certificateReport", "证书审批", "证书审批"),
+    CERTIFICATE_CHANGE_APPLY("certificateChangeApply", "证书报告补充或更换申请单", "证书报告补充或更换申请单"),
+    CERTIFICATE_PRINT("certificatePrintData", "证书打印审批", "证书打印审批"),
+    DEPT_EXECUTIVE_TASK("deptExecutiveTaskData", "实验室任务", "实验室任务"),
+    MY_EXECUTIVE_TASK("myExecutiveTaskData", "我的任务", "我的任务"),
+    OUTSOURCE_ASSESS("outsourceAssess", "测试、校准或检定工作分包评审表", "测试、校准或检定工作分包评审表"),
+    OUTSOURCE_PROTOCOL("outsourceProtocol", "测试、校准或检定工作分包协议书", "测试、校准或检定工作分包协议书"),
+
+    /**
+     * 系统管理
+     */
+    SIGN_EXPORT("signData", "签名", "签名"),
+    TEMPLATE_EXPORT("templateData", "文件模板", "文件模板"),
+    FLOW_DEF_EXPORT("flowDefData", "流程定义", "流程定义"),
+    DOWNLOAD_TEMPLATE("downloadTemplate", "流程定义", "页面配置");
 
     ExportEnum(String fileName, String sheetName, String description) {
         this.fileName = fileName;
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateRecordTypeCodeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateRecordTypeCodeEnum.java
index 31d913c..a963522 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateRecordTypeCodeEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateRecordTypeCodeEnum.java
@@ -46,4 +46,14 @@
     String SITE_EXECUTIVE_APPROVAL = "01";
     //《现场测试、校准或检定工作记录表》
     String SITE_EXECUTIVE_LOG = "02";
+
+    //测试、校准或检定工作分包协议书
+    String OUTSOURCE_PROTOCOL = "01";
+    //测试、校准或检定工作分包评审表
+    String OUTSOURCE_ACCESS = "02";
+    //测试、校准或检定工作分包通知书
+    String OUTSOURCE_NOTICE = "03";
+    //测试、校准或检定工作分包方名录
+    String OUTSOURCE_INFO = "04";
+
 }
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
index 24b8635..f78bd53 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
@@ -15,6 +15,10 @@
     String CERTIFICATE_CHANGE_APPLY_BEAN_NAME = "certificateChangeApplyBean";
     //现场测试、校准或检定
     String SITE_EXECUTIVE_BEAN_NAME = "siteExecutiveBean";
+    //测试、校准或检定工作分包评审表
+    String OUTSOURCE_ASSESS_BEAN_NAME = "outsourceAssessBean";
+    //测试、校准或检定工作分包协议书
+    String OUTSOURCE_PROTOCOL_BEAN_NAME = "outsourceProtocolBean";
 
     /*********************************设备与装置************************************/
     //设备台账
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 b21c661..6b86fd1 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
@@ -18,6 +18,8 @@
     OUTSOURCER_APPROVAL(OUTSOURCER_BEAN_NAME, ""),
     CERTIFICATE_CHANGE_APPROVAL(CERTIFICATE_CHANGE_APPLY_BEAN_NAME, ""),
     SITE_EXECUTIVE_APPROVAL(SITE_EXECUTIVE_BEAN_NAME, ""),
+    OUTSOURCE_ASSESS_APPROVAL(OUTSOURCE_ASSESS_BEAN_NAME, ""),
+    OUTSOURCE_PROTOCOL_APPROVAL(OUTSOURCE_PROTOCOL_BEAN_NAME, ""),
 
     ACTION_STATUS_MAP(new HashMap<String, AwareActionStatusEnum>() {
         {
@@ -47,6 +49,10 @@
             put(ApplyFromIdEnum.CERTIFICATE_CHANGE_APPROVAL.getCode(), CERTIFICATE_CHANGE_APPROVAL);
             //现场测试、校准或检定审批
             put(ApplyFromIdEnum.SITE_EXECUTIVE_APPROVAL.getCode(), SITE_EXECUTIVE_APPROVAL);
+            //测试、校准或检定工作分包评审表
+            put(ApplyFromIdEnum.OUTSOURCE_ASSESS_APPROVAL.getCode(), OUTSOURCE_ASSESS_APPROVAL);
+            //测试、校准或检定工作分包协议书
+            put(ApplyFromIdEnum.OUTSOURCE_PROTOCOL_APPROVAL.getCode(), OUTSOURCE_PROTOCOL_APPROVAL);
         }
     });
     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 934405e..c7410bd 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
@@ -9,6 +9,8 @@
     CERTIFICATE_CHANGE_APPROVAL("jljdywzsbchghsqd", MessageSourceModuleEnum.BUSINESS.getCode(), "证书/报告补充或更换申请单"),
     OUTSOURCER_APPROVAL("jljdywcsjzhgfbfml", MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定合格分包方名录"),
     SITE_EXECUTIVE_APPROVAL("jljdywxccsjzsp", MessageSourceModuleEnum.BUSINESS.getCode(), "现场测试、校准或检定审批"),
+    OUTSOURCE_ASSESS_APPROVAL("jljdywcsjzfbpsb", MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包评审表"),
+    OUTSOURCE_PROTOCOL_APPROVAL("jljdywcsjzfbxys", MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包协议书"),
 
 
     /*******************************************设备与装置*********************************************/
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/GeneralApprovalMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/GeneralApprovalMapper.java
index 4fb7344..0c9d6ae 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/GeneralApprovalMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/GeneralApprovalMapper.java
@@ -17,8 +17,4 @@
 
     Page<O> selectBatchForApprovalList(Page<O> page, @Param("request") R request, @Param("businessKeys") List<String> businessKeys);
 
-//    Page<O> selectListPage(Page<O> page, @Param("request") R request);
-
-//    Long selectMaxNo();
-
 }
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceAssessMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceAssessMapper.java
index 7867bb8..ba59009 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceAssessMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceAssessMapper.java
@@ -1,7 +1,12 @@
 package com.casic.missiles.mapper.business;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.business.outsource.OutsourceAssessApprovalListRequest;
+import com.casic.missiles.mapper.GeneralApprovalMapper;
 import com.casic.missiles.model.business.BizBusinessOutsourceAssess;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * <p>
@@ -11,6 +16,10 @@
  * @author wangpeng
  * @since 2023-08-16
  */
-public interface BizBusinessOutsourceAssessMapper extends BaseMapper<BizBusinessOutsourceAssess> {
+public interface BizBusinessOutsourceAssessMapper extends GeneralApprovalMapper<BizBusinessOutsourceAssess, BizBusinessOutsourceAssess, OutsourceAssessApprovalListRequest> {
+
+    Page<BizBusinessOutsourceAssess> selectBatchForApprovalList(Page<BizBusinessOutsourceAssess> page, @Param("request") OutsourceAssessApprovalListRequest request, @Param("businessKeys") List<String> businessKeys);
+
+    Long selectMaxProjectNo();
 
 }
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceProtocolMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceProtocolMapper.java
new file mode 100644
index 0000000..e6aba35
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceProtocolMapper.java
@@ -0,0 +1,24 @@
+package com.casic.missiles.mapper.business;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.business.outsource.OutsourceProtocolApprovalListRequest;
+import com.casic.missiles.mapper.GeneralApprovalMapper;
+import com.casic.missiles.model.business.BizBusinessOutsourceProtocol;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 计量检定业务-分包管理-测试、校准或检定工作分包协议书 Mapper 接口
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-08-24
+ */
+public interface BizBusinessOutsourceProtocolMapper extends GeneralApprovalMapper<BizBusinessOutsourceProtocol, BizBusinessOutsourceProtocol, OutsourceProtocolApprovalListRequest> {
+
+    Page<BizBusinessOutsourceProtocol> selectBatchForApprovalList(Page<BizBusinessOutsourceProtocol> page, @Param("request") OutsourceProtocolApprovalListRequest request, @Param("businessKeys") List<String> businessKeys);
+
+    Long selectMaxProtocolNo();
+}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/EnvLocationInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/EnvLocationInfoMapper.java
new file mode 100644
index 0000000..49eff87
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/EnvLocationInfoMapper.java
@@ -0,0 +1,21 @@
+package com.casic.missiles.mapper.resource;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.resource.environment.LocationListRequest;
+import com.casic.missiles.dto.resource.environment.LocationListResponse;
+import com.casic.missiles.model.resource.EnvLocationInfo;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * <p>
+ * 实验室环境监控系统-设备表 Mapper 接口
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-06-07
+ */
+public interface EnvLocationInfoMapper extends BaseMapper<EnvLocationInfo> {
+
+    Page<LocationListResponse> selectLocationListPage(Page<LocationListResponse> page, @Param("request") LocationListRequest request);
+}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java
index de124db..85ed0f7 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java
@@ -1,7 +1,9 @@
 package com.casic.missiles.mapper.system;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.dto.system.SignDetailResponse;
+import com.casic.missiles.dto.system.SignListRequest;
 import com.casic.missiles.model.system.SystemSign;
 import org.apache.ibatis.annotations.Param;
 
@@ -22,4 +24,8 @@
     SignDetailResponse selectSignDetailById(Long id);
 
     List<SystemSign> selectUsableSignList(@Param("userId") Long userId);
+
+    Page<SystemSign> selectSignListPage(Page<SystemSign> page, @Param("request") SignListRequest request);
+
+    List<SystemSign> selectSignList(@Param("request") SignListRequest request);
 }
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateChangeApplyMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateChangeApplyMapper.xml
index d798447..c496092 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateChangeApplyMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateChangeApplyMapper.xml
@@ -30,31 +30,31 @@
         SELECT *
         FROM biz_business_certificate_change_apply
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.changeApplyNo != null and request.changeApplyNo !=''">
+        <if test="request != null and request.changeApplyNo != null and request.changeApplyNo !=''">
             and change_apply_no like concat('%',#{request.changeApplyNo},'%')
         </if>
-        <if test="request.changeReportNo != null and request.changeReportNo !=''">
+        <if test="request != null and request.changeReportNo != null and request.changeReportNo !=''">
             and change_report_no like concat('%',#{request.changeReportNo},'%')
         </if>
-        <if test="request.changeReportName != null and request.changeReportName !=''">
+        <if test="request != null and request.changeReportName != null and request.changeReportName !=''">
             and change_report_name like concat('%',#{request.changeReportName},'%')
         </if>
-        <if test="request.changeType != null and request.changeType !=''">
+        <if test="request != null and request.changeType != null and request.changeType !=''">
             and change_type = #{request.changeType}
         </if>
-        <if test="request.createUserName != null and request.createUserName !=''">
+        <if test="request != null and request.createUserName != null and request.createUserName !=''">
             and create_user_name like concat('%',#{request.createUserName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificatePrintMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificatePrintMapper.xml
index b66cd99..49c0ac8 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificatePrintMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificatePrintMapper.xml
@@ -31,34 +31,34 @@
         LEFT JOIN biz_business_order_sample_relation bosr ON (bosr.order_id = bcr.order_id AND bosr.sample_id = bcr.sample_id)
         LEFT JOIN biz_business_order_info boi ON boi.id = bosr.order_id
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and bcp.approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.printStatus != null and request.printStatus !=''">
+        <if test="request != null and request.printStatus != null and request.printStatus !=''">
             and print_status = #{request.printStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and bcp.create_user_id = #{request.createUserId}
         </if>
-        <if test="request.certificateReportNo != null and request.certificateReportNo !=''">
+        <if test="request != null and request.certificateReportNo != null and request.certificateReportNo !=''">
             and bcr.certificate_report_no like concat('%',#{request.certificateReportNo},'%')
         </if>
-        <if test="request.certificateReportName != null and request.certificateReportName !=''">
+        <if test="request != null and request.certificateReportName != null and request.certificateReportName !=''">
             and bcr.certificate_report_name like concat('%',#{request.certificateReportName},'%')
         </if>
-        <if test="request.customerName != null and request.customerName !=''">
+        <if test="request != null and request.customerName != null and request.customerName !=''">
             and boi.customer_name like concat('%',#{request.customerName},'%')
         </if>
-        <if test="request.sampleNo != null and request.sampleNo !=''">
+        <if test="request != null and request.sampleNo != null and request.sampleNo !=''">
             and bosr.sample_no like concat('%',#{request.sampleNo},'%')
         </if>
-        <if test="request.sampleName != null and request.sampleName !=''">
+        <if test="request != null and request.sampleName != null and request.sampleName !=''">
             and bosr.sample_name like concat('%',#{request.sampleName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and bcp.create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and bcp.create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml
index b366034..767695d 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml
@@ -46,33 +46,37 @@
         SELECT bcr.*, bosr.sample_no, bosr.sample_name, bosr.sample_model, rsi.staff_name
         FROM biz_business_certificate_report bcr
         LEFT JOIN biz_business_order_sample_relation bosr ON (bosr.order_id = bcr.order_id AND bosr.sample_id = bcr.sample_id)
+        LEFT JOIN biz_business_order_info boi ON boi.id = bcr.order_id
         LEFT JOIN biz_resource_staff_info rsi ON rsi.id = bcr.measure_person_id
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and bcr.approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and bcr.create_user_id = #{request.createUserId}
         </if>
-        <if test="request.certificateReportNo != null and request.certificateReportNo !=''">
+        <if test="request != null and request.customerId != null and request.customerId !=''">
+            and boi.customer_id = #{request.customerId}
+        </if>
+        <if test="request != null and request.certificateReportNo != null and request.certificateReportNo !=''">
             and bcr.certificate_report_no like concat('%',#{request.certificateReportNo},'%')
         </if>
-        <if test="request.certificateReportName != null and request.certificateReportName !=''">
+        <if test="request != null and request.certificateReportName != null and request.certificateReportName !=''">
             and bcr.certificate_report_name like concat('%',#{request.certificateReportName},'%')
         </if>
-        <if test="request.sampleNo != null and request.sampleNo !=''">
+        <if test="request != null and request.sampleNo != null and request.sampleNo !=''">
             and bosr.sample_no like concat('%',#{request.sampleNo},'%')
         </if>
-        <if test="request.measureCategory != null and request.measureCategory !=''">
+        <if test="request != null and request.measureCategory != null and request.measureCategory !=''">
             and bcr.measure_category = #{request.measureCategory}
         </if>
-        <if test="request.measurePerson != null and request.measurePerson !=''">
+        <if test="request != null and request.measurePerson != null and request.measurePerson !=''">
             and rsi.staff_name like concat('%',#{request.measurePerson},'%')
         </if>
-        <if test="request.calibrationTimeStart != null and request.calibrationTimeStart !=''">
+        <if test="request != null and request.calibrationTimeStart != null and request.calibrationTimeStart !=''">
             and bcr.calibration_time &gt;= #{request.calibrationTimeStart}
         </if>
-        <if test="request.calibrationTimeEnd != null and request.calibrationTimeEnd !=''">
+        <if test="request != null and request.calibrationTimeEnd != null and request.calibrationTimeEnd !=''">
             and bcr.calibration_time &lt;= #{request.calibrationTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceAssessMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceAssessMapper.xml
index d0fcf8b..c22c101 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceAssessMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceAssessMapper.xml
@@ -7,6 +7,8 @@
         <id column="id" property="id" />
         <result column="project_no" property="projectNo" />
         <result column="project_name" property="projectName" />
+        <result column="lab_code" property="labCode" />
+        <result column="group_code" property="groupCode" />
         <result column="applicant_id" property="applicantId" />
         <result column="applicant_name" property="applicantName" />
         <result column="applicant_time" property="applicantTime" />
@@ -31,7 +33,45 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, project_no, project_name, applicant_id, applicant_name, applicant_time, minio_file_name, remark, create_user_id, create_user_name, outsourcer_id, pre_start_time, pre_end_time, outsource_reason, pre_cost, approval_status, process_id, approve_situation, traceability, test_method, technique_ability, create_time, update_time
+        id, project_no, project_name, lab_code, group_code, applicant_id, applicant_name, applicant_time, minio_file_name, remark, create_user_id, create_user_name, outsourcer_id, pre_start_time, pre_end_time, outsource_reason, pre_cost, approval_status, process_id, approve_situation, traceability, test_method, technique_ability, create_time, update_time
     </sql>
 
+    <select id="selectMaxProjectNo" resultType="java.lang.Long">
+        SELECT IFNULL(max(RIGHT(project_no, 3)), 0) from biz_business_outsource_assess
+    </select>
+
+    <select id="selectBatchForApprovalList" resultMap="BaseResultMap">
+        SELECT bboa.*, bboi.outsourcer_name, bboi.director
+        FROM biz_business_outsource_assess bboa
+        LEFT JOIN biz_business_outsourcer_info bboi ON bboa.outsourcer_id = bboi.id
+        WHERE 1=1
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
+            and bboa.approval_status = #{request.approvalStatus}
+        </if>
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
+            and bboa.create_user_id = #{request.createUserId}
+        </if>
+        <if test="request != null and request.projectNo != null and request.projectNo !=''">
+            and bboa.project_no like concat('%',#{request.projectNo},'%')
+        </if>
+        <if test="request != null and request.outsourcerName != null and request.outsourcerName !=''">
+            and bboi.outsourcer_name like concat('%',#{request.outsourcerName},'%')
+        </if>
+        <if test="request != null and request.applicantName != null and request.applicantName !=''">
+            and bboa.applicant_name like concat('%',#{request.applicantName},'%')
+        </if>
+        <if test="request != null and request.applicantTimeStart != null and request.applicantTimeStart !=''">
+            and bboa.applicant_time &gt;= #{request.applicantTimeStart}
+        </if>
+        <if test="request != null and request.applicantTimeEnd != null and request.applicantTimeEnd !=''">
+            and bboa.applicant_time &lt;= #{request.applicantTimeEnd}
+        </if>
+        <if test="businessKeys != null">
+            and bboa.id in
+            <foreach collection="businessKeys" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
+        ORDER BY bboa.create_time DESC
+    </select>
 </mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceProtocolMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceProtocolMapper.xml
new file mode 100644
index 0000000..b7b2149
--- /dev/null
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceProtocolMapper.xml
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.mapper.business.BizBusinessOutsourceProtocolMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.business.BizBusinessOutsourceProtocol">
+        <id column="id" property="id" />
+        <result column="protocol_no" property="protocolNo" />
+        <result column="project_name" property="projectName" />
+        <result column="lab_code" property="labCode" />
+        <result column="group_code" property="groupCode" />
+        <result column="outsourcer_id" property="outsourcerId" />
+        <result column="remark" property="remark" />
+        <result column="outsource_no" property="outsourceNo" />
+        <result column="outsource_name" property="outsourceName" />
+        <result column="contacts" property="contacts" />
+        <result column="mobile" property="mobile" />
+        <result column="address" property="address" />
+        <result column="require_date" property="requireDate" />
+        <result column="outsource_cost" property="outsourceCost" />
+        <result column="director" property="director" />
+        <result column="item" property="item" />
+        <result column="requires" property="requires" />
+        <result column="create_user_id" property="createUserId" />
+        <result column="create_user_name" property="createUserName" />
+        <result column="approval_status" property="approvalStatus" />
+        <result column="process_id" property="processId" />
+        <result column="create_time" property="createTime" />
+        <result column="update_time" property="updateTime" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, protocol_no, project_name, lab_code, group_code, outsourcer_id, remark, outsource_no, outsource_name, contacts, mobile, address, require_date, outsource_cost, director, item, requires, create_user_id, create_user_name, approval_status, process_id, create_time, update_time
+    </sql>
+
+    <select id="selectMaxProtocolNo" resultType="java.lang.Long">
+        SELECT IFNULL(max(RIGHT(protocol_no, 3)), 0) from biz_business_outsource_protocol
+    </select>
+
+    <select id="selectBatchForApprovalList" resultMap="BaseResultMap">
+        SELECT *
+        FROM biz_business_outsource_protocol
+        WHERE 1=1
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
+            and approval_status = #{request.approvalStatus}
+        </if>
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
+            and create_user_id = #{request.createUserId}
+        </if>
+        <if test="request != null and request.protocolNo != null and request.protocolNo !=''">
+            and protocol_no like concat('%',#{request.protocolNo},'%')
+        </if>
+        <if test="request != null and request.outsourcerName != null and request.outsourcerName !=''">
+            and outsourcer_name like concat('%',#{request.outsourcerName},'%')
+        </if>
+        <if test="request != null and request.applicantName != null and request.applicantName !=''">
+            and create_user_name like concat('%',#{request.applicantName},'%')
+        </if>
+        <if test="request != null and request.applicantTimeStart != null and request.applicantTimeStart !=''">
+            and create_time &gt;= #{request.applicantTimeStart}
+        </if>
+        <if test="request != null and request.applicantTimeEnd != null and request.applicantTimeEnd !=''">
+            and create_time &lt;= #{request.applicantTimeEnd}
+        </if>
+        <if test="businessKeys != null">
+            and id in
+            <foreach collection="businessKeys" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
+        ORDER BY create_time DESC
+    </select>
+</mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourcerInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourcerInfoMapper.xml
index 510a80b..3049b54 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourcerInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourcerInfoMapper.xml
@@ -7,6 +7,8 @@
         <id column="id" property="id" />
         <result column="outsourcer_no" property="outsourcerNo" />
         <result column="outsourcer_name" property="outsourcerName" />
+        <result column="lab_code" property="labCode" />
+        <result column="group_code" property="groupCode" />
         <result column="outsourcer_brief_name" property="outsourcerBriefName" />
         <result column="outsourcer_size" property="outsourcerSize" />
         <result column="business_size" property="businessSize" />
@@ -55,32 +57,32 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, outsourcer_no, outsourcer_name, outsourcer_brief_name, outsourcer_size, business_size, grade, evaluation, tax_number, bank_account, bank_name, bank_account_number, postal_code, director, phone, fax, mobile, email, website, address_country, address_province, address_city, address_area, full_address, address_country_name, address_province_name, address_city_name, address_area_name, invoice_country, invoice_province, invoice_city, invoice_area, invoice_full_address, invoice_country_name, invoice_province_name, invoice_city_name, invoice_area_name, business_scope, business_content, minio_file_name, approval_status, process_id, remark, create_user_id, create_user_name, create_time, update_time
+        id, outsourcer_no, outsourcer_name, lab_code, group_code, outsourcer_brief_name, outsourcer_size, business_size, grade, evaluation, tax_number, bank_account, bank_name, bank_account_number, postal_code, director, phone, fax, mobile, email, website, address_country, address_province, address_city, address_area, full_address, address_country_name, address_province_name, address_city_name, address_area_name, invoice_country, invoice_province, invoice_city, invoice_area, invoice_full_address, invoice_country_name, invoice_province_name, invoice_city_name, invoice_area_name, business_scope, business_content, minio_file_name, approval_status, process_id, remark, create_user_id, create_user_name, create_time, update_time
     </sql>
 
     <select id="selectBatchForApprovalList" resultMap="BaseResultMap">
         SELECT *
         FROM biz_business_outsourcer_info
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.outsourcerNo != null and request.outsourcerNo !=''">
+        <if test="request != null and request.outsourcerNo != null and request.outsourcerNo !=''">
             and outsourcer_no like concat('%',#{request.outsourcerNo},'%')
         </if>
-        <if test="request.outsourcerName != null and request.outsourcerName !=''">
+        <if test="request != null and request.outsourcerName != null and request.outsourcerName !=''">
             and outsourcer_name like concat('%',#{request.outsourcerName},'%')
         </if>
-        <if test="request.director != null and request.director !=''">
+        <if test="request != null and request.director != null and request.director !=''">
             and director like concat('%',#{request.director},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
@@ -93,6 +95,6 @@
     </select>
 
     <select id="selectMaxNo" resultType="java.lang.Long">
-        SELECT IFNULL(max(RIGHT(outsourcer_no, 12)), 0) from biz_business_outsourcer_info
+        SELECT IFNULL(max(RIGHT(outsourcer_no, 3)), 0) from biz_business_outsourcer_info
     </select>
 </mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessSiteExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessSiteExecutiveInfoMapper.xml
index 135c5d0..3c5ae79 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessSiteExecutiveInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessSiteExecutiveInfoMapper.xml
@@ -38,25 +38,25 @@
         FROM biz_business_site_executive_info bsei
         LEFT JOIN biz_resource_customer_info rci ON bsei.customer_id = rci.id
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and bsei.approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and bsei.create_user_id = #{request.createUserId}
         </if>
-        <if test="request.siteExecutiveNo != null and request.siteExecutiveNo !=''">
+        <if test="request != null and request.siteExecutiveNo != null and request.siteExecutiveNo !=''">
             and bsei.site_executive_no like concat('%',#{request.siteExecutiveNo},'%')
         </if>
-        <if test="request.customerName != null and request.customerName !=''">
+        <if test="request != null and request.customerName != null and request.customerName !=''">
             and rci.outsourcer_name like concat('%',#{request.customerName},'%')
         </if>
-        <if test="request.applyName != null and request.applyName !=''">
+        <if test="request != null and request.applyName != null and request.applyName !=''">
             and bsei.apply_name like concat('%',#{request.applyName},'%')
         </if>
-        <if test="request.applyTimeStart != null and request.applyTimeStart !=''">
+        <if test="request != null and request.applyTimeStart != null and request.applyTimeStart !=''">
             and bsei.apply_time &gt;= #{request.applyTimeStart}
         </if>
-        <if test="request.applyTimeEnd != null and request.applyTimeEnd !=''">
+        <if test="request != null and request.applyTimeEnd != null and request.applyTimeEnd !=''">
             and bsei.apply_time &lt;= #{request.applyTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml
index 84d9e2a..6bd38a9 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml
@@ -105,6 +105,12 @@
         <if test="request.isUrgent != null and request.isUrgent !=''">
             AND bo.is_urgent = #{request.isUrgent}
         </if>
+        <if test="request.ids != null">
+            and blei.id in
+            <foreach collection="request.ids" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
         ORDER BY blei.update_time DESC
     </select>
 
@@ -137,6 +143,12 @@
         <if test="request.isUrgent != null and request.isUrgent !=''">
             AND bo.is_urgent = #{request.isUrgent}
         </if>
+        <if test="request.ids != null">
+            and blei.id in
+            <foreach collection="request.ids" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
         ORDER BY blei.update_time DESC
     </select>
 
diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardInfoMapper.xml
index 1a5551b..2ed8d17 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardInfoMapper.xml
@@ -45,12 +45,6 @@
         FROM biz_equipment_standard_info besi
         LEFT JOIN biz_equipment_standard_technology_relation bestr ON besi.standard_no = bestr.standard_no
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
-            and besi.approval_status = #{request.approvalStatus}
-        </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
-            and besi.create_user_id = #{request.createUserId}
-        </if>
         <if test="request.standardName != null and request.standardName !=''">
             and besi.standard_name like concat('%',#{request.standardName},'%')
         </if>
diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardTechnologyRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardTechnologyRelationMapper.xml
index fc7e16c..cd03c8c 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardTechnologyRelationMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardTechnologyRelationMapper.xml
@@ -6,6 +6,7 @@
     <resultMap id="BaseResultMap" type="com.casic.missiles.model.equipment.BizEquipmentStandardTechnologyRelation">
         <id column="id" property="id" />
         <result column="technology_file_id" property="technologyFileId" />
+        <result column="technology_file_no" property="technologyFileNo" />
         <result column="technology_file_name" property="technologyFileName" />
         <result column="standard_id" property="standardId" />
         <result column="standard_no" property="standardNo" />
@@ -14,7 +15,7 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, technology_file_id, technology_file_name, standard_id, remark
+        id, technology_file_id, technology_file_no, technology_file_name, standard_id, remark
     </sql>
 
 </mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceAuthorizeOrderMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceAuthorizeOrderMapper.xml
index ac5176c..554fe65 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceAuthorizeOrderMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceAuthorizeOrderMapper.xml
@@ -32,22 +32,22 @@
         SELECT *
         FROM biz_resource_authorize_order
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.orderNo != null and request.orderNo !=''">
+        <if test="request != null and request.orderNo != null and request.orderNo !=''">
             and order_no like concat('%',#{request.orderNo},'%')
         </if>
-        <if test="request.createUserName != null and request.createUserName !=''">
+        <if test="request != null and request.createUserName != null and request.createUserName !=''">
             and create_user_name like concat('%',#{request.createUserName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerExamineFormMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerExamineFormMapper.xml
index ab242f6..af7f98f 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerExamineFormMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerExamineFormMapper.xml
@@ -41,28 +41,28 @@
         SELECT *
         FROM biz_resource_customer_examine_form
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.formNo != null and request.formNo !=''">
+        <if test="request != null and request.formNo != null and request.formNo !=''">
             and form_no like concat('%',#{request.formNo},'%')
         </if>
-        <if test="request.labCode != null and request.labCode !=''">
+        <if test="request != null and request.labCode != null and request.labCode !=''">
             and lab_code like concat('%',#{request.labCode},'%')
         </if>
-        <if test="request.groupCode != null and request.groupCode !=''">
+        <if test="request != null and request.groupCode != null and request.groupCode !=''">
             and group_code like concat('%',#{request.groupCode},'%')
         </if>
-        <if test="request.createUserName != null and request.createUserName !=''">
+        <if test="request != null and request.createUserName != null and request.createUserName !=''">
             and create_user_name like concat('%',#{request.createUserName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerInfoMapper.xml
index fa8ffbc..06a2798 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerInfoMapper.xml
@@ -33,25 +33,25 @@
         SELECT *
         FROM biz_resource_customer_info
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.customerNo != null and request.customerNo !=''">
+        <if test="request != null and request.customerNo != null and request.customerNo !=''">
             and customer_no like concat('%',#{request.customerNo},'%')
         </if>
-        <if test="request.customerName != null and request.customerName !=''">
+        <if test="request != null and request.customerName != null and request.customerName !=''">
             and customer_name like concat('%',#{request.customerName},'%')
         </if>
-        <if test="request.contacts != null and request.contacts !=''">
+        <if test="request != null and request.contacts != null and request.contacts !=''">
             and contacts like concat('%',#{request.contacts},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerSuggestFormMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerSuggestFormMapper.xml
index 28f5bb2..1806662 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerSuggestFormMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerSuggestFormMapper.xml
@@ -33,28 +33,28 @@
         SELECT *
         FROM biz_resource_customer_suggest_form
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.formNo != null and request.formNo !=''">
+        <if test="request != null and request.formNo != null and request.formNo !=''">
             and form_no like concat('%',#{request.formNo},'%')
         </if>
-        <if test="request.customerName != null and request.customerName !=''">
+        <if test="request != null and request.customerName != null and request.customerName !=''">
             and customer_name like concat('%',#{request.customerName},'%')
         </if>
-        <if test="request.customerDeptName != null and request.customerDeptName !=''">
+        <if test="request != null and request.customerDeptName != null and request.customerDeptName !=''">
             and customer_dept_name like concat('%',#{request.customerDeptName},'%')
         </if>
-        <if test="request.createUserName != null and request.createUserName !=''">
+        <if test="request != null and request.createUserName != null and request.createUserName !=''">
             and create_user_name like concat('%',#{request.createUserName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSealUseNoteMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSealUseNoteMapper.xml
index ab37bc1..b02bb33 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSealUseNoteMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSealUseNoteMapper.xml
@@ -29,32 +29,32 @@
     </sql>
 
     <select id="selectBatchForApprovalList" resultMap="BaseResultMap">
-        SELECT *
+        SELECT brsun.*, brsi.seal_name, brsi.seal_type, brsi.approver_name
         FROM biz_resource_seal_use_note brsun
         JOIN biz_resource_seal_info brsi ON brsun.seal_id = brsi.id
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and brsun.approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and brsun.create_user_id = #{request.createUserId}
         </if>
-        <if test="request.sealName != null and request.sealName !=''">
+        <if test="request != null and request.sealName != null and request.sealName !=''">
             and brsi.seal_name like concat('%',#{request.sealName},'%')
         </if>
-        <if test="request.sealType != null and request.sealType !=''">
+        <if test="request != null and request.sealType != null and request.sealType !=''">
             and brsi.seal_type = #{request.sealType}
         </if>
-        <if test="request.applyDeptName != null and request.applyDeptName !=''">
+        <if test="request != null and request.applyDeptName != null and request.applyDeptName !=''">
             and brsun.apply_dept_name like concat('%',#{request.applyDeptName},'%')
         </if>
-        <if test="request.applyUserName != null and request.applyUserName !=''">
+        <if test="request != null and request.applyUserName != null and request.applyUserName !=''">
             and brsun.apply_user_name like concat('%',#{request.applyUserName},'%')
         </if>
-        <if test="request.applyTimeStart != null and request.applyTimeStart !=''">
+        <if test="request != null and request.applyTimeStart != null and request.applyTimeStart !=''">
             and brsun.apply_time &gt;= #{request.applyTimeStart}
         </if>
-        <if test="request.applyTimeEnd != null and request.applyTimeEnd !=''">
+        <if test="request != null and request.applyTimeEnd != null and request.applyTimeEnd !=''">
             and brsun.apply_time &lt;= #{request.applyTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml
index 119bf7d..4f8392a 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml
@@ -31,6 +31,12 @@
         <if test="request.deptName != null and request.deptName !=''">
             and brsi.dept_name like concat('%',#{request.deptName},'%')
         </if>
+        <if test="request.ids != null">
+            and brsv.id in
+            <foreach collection="request.ids" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
         ORDER BY brsv.grant_date DESC
     </select>
 
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSupplierInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSupplierInfoMapper.xml
index fe8d399..e8ce7ef 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSupplierInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSupplierInfoMapper.xml
@@ -48,28 +48,28 @@
         SELECT *
         FROM biz_resource_supplier_info
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.supplierNo != null and request.supplierNo !=''">
+        <if test="request != null and request.supplierNo != null and request.supplierNo !=''">
             and supplier_no like concat('%',#{request.supplierNo},'%')
         </if>
-        <if test="request.supplierName != null and request.supplierName !=''">
+        <if test="request != null and request.supplierName != null and request.supplierName !=''">
             and supplier_name like concat('%',#{request.supplierName},'%')
         </if>
-        <if test="request.director != null and request.director !=''">
+        <if test="request != null and request.director != null and request.director !=''">
             and director like concat('%',#{request.director},'%')
         </if>
-        <if test="request.supplierType != null and request.supplierType !=''">
+        <if test="request != null and request.supplierType != null and request.supplierType !=''">
             and supplier_type = #{request.supplierType}
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/EnvLocationInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/EnvLocationInfoMapper.xml
new file mode 100644
index 0000000..68bcf10
--- /dev/null
+++ b/casic-metering-dao/src/main/resources/mapper/resource/EnvLocationInfoMapper.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.mapper.resource.EnvLocationInfoMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.resource.EnvLocationInfo">
+        <id column="id" property="id" />
+        <result column="location_no" property="locationNo" />
+        <result column="location_name" property="locationName" />
+        <result column="location_position" property="locationPosition" />
+        <result column="create_user_id" property="createUserId" />
+        <result column="create_user" property="createUser" />
+        <result column="create_time" property="createTime" />
+        <result column="update_time" property="updateTime" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, location_no, location_name, location_position, create_user_id, create_user, create_time, update_time
+    </sql>
+
+    <select id="selectLocationListPage" resultType="com.casic.missiles.dto.resource.environment.LocationListResponse">
+        SELECT *
+        FROM env_location_info
+        WHERE 1=1
+        <if test="request.locationNo != null and request.locationNo !=''">
+            AND location_no LIKE concat('%',#{request.locationNo},'%')
+        </if>
+        <if test="request.locationName != null and request.locationName !=''">
+            AND location_name LIKE concat('%',#{request.locationName},'%')
+        </if>
+        ORDER BY create_time DESC
+    </select>
+
+</mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml
index b28c18f..8854047 100644
--- a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml
@@ -11,7 +11,6 @@
         <result column="sign_desc" property="signDesc" />
         <result column="sign_director" property="signDirector" />
         <result column="sign_user_id" property="signUserId" />
-        <result column="sign_type" property="signType" />
         <result column="minio_file_name" property="minioFileName" />
         <result column="create_time" property="createTime" />
         <result column="update_time" property="updateTime" />
@@ -28,7 +27,6 @@
         <result column="sign_name" property="signName" />
         <result column="sign_desc" property="signDesc" />
         <result column="sign_director" property="signDirector" />
-        <result column="sign_type" property="signType" />
         <result column="sign_user_id" property="signUserId" />
         <result column="minio_file_name" property="minioFileName" />
         <result column="create_time" property="createTime" />
@@ -62,4 +60,58 @@
         JOIN system_sign_user_relation ssur ON ss.id = ssur.sign_id
         WHERE ssur.user_id = #{userId}
     </select>
+
+    <select id="selectSignListPage" resultMap="BaseResultMap">
+        SELECT ss.*, sd.SIMPLE_NAME AS deptName
+        FROM system_sign ss
+        LEFT JOIN sys_user su ON su.id = ss.sign_user_id
+        LEFT JOIN sys_dept sd ON sd.id = su.dept_id
+        WHERE 1=1
+        <if test="request.signNo != null and request.signNo !=''">
+            AND ss.sign_no LIKE concat('%',#{request.signNo},'%')
+        </if>
+        <if test="request.signName != null and request.signName !=''">
+            AND ss.sign_name LIKE concat('%',#{request.signName},'%')
+        </if>
+        <if test="request.signDirector != null and request.signDirector !=''">
+            AND ss.sign_director LIKE concat('%',#{request.signDirector},'%')
+        </if>
+        <if test="request.signUserId != null and request.signUserId !=''">
+            AND ss.sign_user_id = #{request.signUserId}
+        </if>
+        <if test="request.createStartTime != null and request.createStartTime !=''">
+            AND DATE_FORMAT(ss.create_time,'%Y-%m-%d') &gt;= DATE_FORMAT(#{request.createStartTime},'%Y-%m-%d')
+        </if>
+        <if test="request.createEndTime != null and request.createEndTime !=''">
+            AND DATE_FORMAT(ss.create_time,'%Y-%m-%d')  &lt;= DATE_FORMAT(#{request.createEndTime},'%Y-%m-%d')
+        </if>
+        ORDER BY ss.create_time DESC
+    </select>
+
+    <select id="selectSignList" resultMap="BaseResultMap">
+        SELECT ss.*, sd.SIMPLE_NAME AS deptName
+        FROM system_sign ss
+        LEFT JOIN sys_user su ON su.id = ss.sign_user_id
+        LEFT JOIN sys_dept sd ON sd.id = su.dept_id
+        WHERE 1=1
+        <if test="request.signNo != null and request.signNo !=''">
+            AND ss.sign_no LIKE concat('%',#{request.signNo},'%')
+        </if>
+        <if test="request.signName != null and request.signName !=''">
+            AND ss.sign_name LIKE concat('%',#{request.signName},'%')
+        </if>
+        <if test="request.signDirector != null and request.signDirector !=''">
+            AND ss.sign_director LIKE concat('%',#{request.signDirector},'%')
+        </if>
+        <if test="request.signUserId != null and request.signUserId !=''">
+            AND ss.sign_user_id = #{request.signUserId}
+        </if>
+        <if test="request.createStartTime != null and request.createStartTime !=''">
+            AND DATE_FORMAT(ss.create_time,'%Y-%m-%d') &gt;= DATE_FORMAT(#{request.createStartTime},'%Y-%m-%d')
+        </if>
+        <if test="request.createEndTime != null and request.createEndTime !=''">
+            AND DATE_FORMAT(ss.create_time,'%Y-%m-%d')  &lt;= DATE_FORMAT(#{request.createEndTime},'%Y-%m-%d')
+        </if>
+        ORDER BY ss.create_time DESC
+    </select>
 </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 515050a..60f530b 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
@@ -47,8 +47,8 @@
     String STORAGE_LOCATION = "bizStorageLocation";
     //计量专业
     String MEASURE_MAJOR = "bizMeasureMajor";
-    //管理状态
-    String MANAGER_STATE = "bizManagerState";
+    //标准装置管理状态
+    String STANDARD_MANAGER_STATE = "bizStandardManagerState";
 
     /**
      * 资源管理 字典code
@@ -95,8 +95,6 @@
     String MEASURE_STATUS = "measureStatus";
     //检定方式
     String MEASURE_TYPE = "measureType";
-    //标识打印标志类型
-    String IDENTIFY_PRINT_TYPE = "bizBusinessIdentify";
     //变更类型
     String REPORT_CHANGE_TYPE = "bizCertChangeType";
     //规模类型
@@ -111,19 +109,24 @@
     String MEASURE_CATEGORY = "measureCategory";
     //检定结果
     String MEASURE_RESULT = "measureResult";
+    //分包原因
+    String OUTSOURCE_REASON = "outsourceReason";
+
+    /**
+     * 系统管理
+     */
+    String TEMPLATE_TYPE = "templateType";
+
 
     /**
      * 标准装置 字典code
      */
     //类别
     String STANDARD_CATEGORY = "standardCategory";
-    //管理状态
-    String STANDARD_MANAGER_STATE = "standardManagerState";
     //标准等级
     String STANDARD_LEVEL = "standardLevel";
     //传递范围
     String STANDARD_TRANSMIT_RANGE = "transmitRange";
-
     //资本来源
     String CAPITAL_SOURCE = "capitalSource";
     //标准装置-申请类型
@@ -148,8 +151,6 @@
     String CERTIFICATE_CLASS = "certificationClass";
     //证书管理-检校专业
     String CALIBRATION_MAJOR = "calibrationMajor";
-    //分包原因
-    String OUTSOURCE_REASON = "outsourceReason";
 
     /**
      * 工作台
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/BaseApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/BaseApprovalListRequest.java
index 73c12c1..80d7424 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/BaseApprovalListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/BaseApprovalListRequest.java
@@ -6,6 +6,7 @@
 
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotEmpty;
+import java.util.List;
 
 /**
  * @Description:
@@ -19,14 +20,14 @@
      * 表单id
      */
     @NotBlank(message = "表单id不能为空")
-    @ApiModelProperty(value = "表单id（流程定义对应的表单id，等价于业务id）", dataType = "String")
+    @ApiModelProperty(value = "表单id（流程定义对应的表单id，等价于业务id），导出接口不用传", dataType = "String")
     private String formId;
 
     /**
      * 审批状态类型，对应ApprovalStatusEnum
      */
     @NotEmpty(message = "审批状态类型不能为空")
-    @ApiModelProperty(value = "审批状态类型code", dataType = "String")
+    @ApiModelProperty(value = "审批状态类型code，导出接口不用传", dataType = "String")
     private String approvalStatus;
 
     @ApiModelProperty(hidden = true)
@@ -34,4 +35,7 @@
 
     @ApiModelProperty(hidden = true)
     private Long createUserId;
+
+    @ApiModelProperty(value = "导出ids", dataType = "List")
+    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificatePrintApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificatePrintApprovalListRequest.java
index b93d1c9..3cc2f4e 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificatePrintApprovalListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificatePrintApprovalListRequest.java
@@ -5,8 +5,6 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import java.util.List;
-
 /**
  * @Description:
  * @Author: wangpeng
@@ -38,7 +36,4 @@
 
     @ApiModelProperty(value = "创建结束时间", dataType = "String")
     private String createTimeEnd;
-
-    @ApiModelProperty(value = "导出ids", dataType = "List")
-    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportApprovalListRequest.java
index 4f7a038..c115847 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportApprovalListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportApprovalListRequest.java
@@ -5,8 +5,6 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import java.util.List;
-
 /**
  * @Description:
  * @Author: wangpeng
@@ -15,6 +13,8 @@
 @ApiModel
 @Data
 public class CertificateReportApprovalListRequest extends BaseApprovalListRequest {
+    @ApiModelProperty(value = "委托方id", dataType = "String")
+    private Long customerId;
 
     @ApiModelProperty(value = "证书报告编号", dataType = "String")
     private String certificateReportNo;
@@ -37,6 +37,4 @@
     @ApiModelProperty(value = "检校结束时间", dataType = "String")
     private String calibrationTimeEnd;
 
-    @ApiModelProperty(value = "导出ids", dataType = "List")
-    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/identify/IdentifyListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/identify/IdentifyListRequest.java
index 1b87ae6..f019203 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/identify/IdentifyListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/identify/IdentifyListRequest.java
@@ -4,6 +4,8 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * @Description:
  * @Author: wangpeng
@@ -26,4 +28,7 @@
 
     @ApiModelProperty(value = "打印结束时间", dataType = "String")
     private String createTimeEnd;
+
+    @ApiModelProperty(value = "导出ids", dataType = "List")
+    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListRequest.java
index 1264883..62415fb 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListRequest.java
@@ -7,6 +7,7 @@
 import lombok.Data;
 
 import javax.validation.constraints.NotBlank;
+import java.util.List;
 
 @Data
 @ApiModel
@@ -37,4 +38,6 @@
     @ApiModelProperty(value = "是否加急（1是0否null全部）", dataType = "Integer")
     private String isUrgent;
 
+    @ApiModelProperty(value = "导出ids", dataType = "List")
+    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListRequest.java
index 5201d7b..499760a 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListRequest.java
@@ -17,6 +17,9 @@
     @ApiModelProperty(value = "任务单编号", dataType = "String")
     private String orderNo;
 
+    @ApiModelProperty(value = "委托方id", dataType = "Long")
+    private Long customerId;
+
     @ApiModelProperty(value = "委托方名称", dataType = "String")
     private String customerName;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OrderSampleDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OrderSampleDTO.java
new file mode 100644
index 0000000..796edc0
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OrderSampleDTO.java
@@ -0,0 +1,19 @@
+package com.casic.missiles.dto.business.outsource;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/8/24 11:38
+ */
+@ApiModel
+@Data
+public class OrderSampleDTO {
+    @ApiModelProperty(value = "任务单id", dataType = "Long")
+    private Long orderId;
+    @ApiModelProperty(value = "受检设备id", dataType = "Long")
+    private Long sampleId;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceAssessApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceAssessApprovalListRequest.java
new file mode 100644
index 0000000..9a930c3
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceAssessApprovalListRequest.java
@@ -0,0 +1,30 @@
+package com.casic.missiles.dto.business.outsource;
+
+import com.casic.missiles.dto.BaseApprovalListRequest;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/8/24 11:01
+ */
+@ApiModel
+@Data
+public class OutsourceAssessApprovalListRequest extends BaseApprovalListRequest {
+    @ApiModelProperty(value = "评审表编号", dataType = "String")
+    private String projectNo;
+
+    @ApiModelProperty(value = "分包机构名称", dataType = "String")
+    private String outsourcerName;
+
+    @ApiModelProperty(value = "申请人", dataType = "String")
+    private String applicantName;
+
+    @ApiModelProperty(value = "申请时间开始", dataType = "String")
+    private String applicantTimeStart;
+
+    @ApiModelProperty(value = "申请时间结束", dataType = "String")
+    private String applicantTimeEnd;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceAssessSaveResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceAssessSaveResponse.java
new file mode 100644
index 0000000..8bf9aad
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceAssessSaveResponse.java
@@ -0,0 +1,20 @@
+package com.casic.missiles.dto.business.outsource;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/8/14 16:17
+ */
+@ApiModel
+@Data
+public class OutsourceAssessSaveResponse {
+    @ApiModelProperty(value = "主键id", dataType = "Long")
+    private Long id;
+
+    @ApiModelProperty(value = "编号", dataType = "String")
+    private String projectNo;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProtocolApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProtocolApprovalListRequest.java
new file mode 100644
index 0000000..0f32331
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProtocolApprovalListRequest.java
@@ -0,0 +1,30 @@
+package com.casic.missiles.dto.business.outsource;
+
+import com.casic.missiles.dto.BaseApprovalListRequest;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/8/24 15:01
+ */
+@ApiModel
+@Data
+public class OutsourceProtocolApprovalListRequest extends BaseApprovalListRequest {
+    @ApiModelProperty(value = "协议书编号", dataType = "String")
+    private String protocolNo;
+
+    @ApiModelProperty(value = "分包方名称", dataType = "String")
+    private String outsourcerName;
+
+    @ApiModelProperty(value = "申请人", dataType = "String")
+    private String applicantName;
+
+    @ApiModelProperty(value = "申请时间开始", dataType = "String")
+    private String applicantTimeStart;
+
+    @ApiModelProperty(value = "申请时间结束", dataType = "String")
+    private String applicantTimeEnd;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProtocolSaveResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProtocolSaveResponse.java
new file mode 100644
index 0000000..e324967
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProtocolSaveResponse.java
@@ -0,0 +1,20 @@
+package com.casic.missiles.dto.business.outsource;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/8/14 16:17
+ */
+@ApiModel
+@Data
+public class OutsourceProtocolSaveResponse {
+    @ApiModelProperty(value = "主键id", dataType = "Long")
+    private Long id;
+
+    @ApiModelProperty(value = "编号", dataType = "String")
+    private String protocolNo;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveApprovalListRequest.java
index f29f4e4..7047c28 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveApprovalListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveApprovalListRequest.java
@@ -5,8 +5,6 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import java.util.List;
-
 /**
  * @Description: 现场检测审批列表请求实体
  * @Author: wangpeng
@@ -30,7 +28,4 @@
     @ApiModelProperty(value = "申请时间结束", dataType = "String")
     private String applyTimeEnd;
 
-    @ApiModelProperty(value = "导出ids", dataType = "List")
-    private List<Long> ids;
-
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveDetailResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveDetailResponse.java
index 1f28752..394c934 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveDetailResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveDetailResponse.java
@@ -12,6 +12,18 @@
     @ApiModelProperty(value = "id，更新/删除使用参数", dataType = "Long")
     private Long id;
 
+    @ApiModelProperty(value = "实验室代码(字典code)", dataType = "String")
+    private String labCode;
+
+    @ApiModelProperty(value = "实验室代码(字典value)", dataType = "String")
+    private String labCodeName;
+
+    @ApiModelProperty(value = "组别代码(字典code)", dataType = "String")
+    private String groupCode;
+
+    @ApiModelProperty(value = "组别代码(字典value)", dataType = "String")
+    private String groupCodeName;
+
     @ApiModelProperty(value = "审批编号", dataType = "String")
     private String siteExecutiveNo;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/environment/LocationListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/environment/LocationListRequest.java
new file mode 100644
index 0000000..13d03c3
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/environment/LocationListRequest.java
@@ -0,0 +1,20 @@
+package com.casic.missiles.dto.resource.environment;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/6/8 13:56
+ */
+@ApiModel
+@Data
+public class LocationListRequest {
+    @ApiModelProperty(value = "地点编号", dataType = "String")
+    private String locationNo;
+
+    @ApiModelProperty(value = "地点名称", dataType = "String")
+    private String locationName;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/environment/LocationListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/environment/LocationListResponse.java
new file mode 100644
index 0000000..4c531af
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/environment/LocationListResponse.java
@@ -0,0 +1,78 @@
+package com.casic.missiles.dto.resource.environment;
+
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
+import com.baomidou.mybatisplus.annotation.TableField;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description: 地点列表响应实体
+ * @Author: wangpeng
+ * @Date: 2023/6/8 13:53
+ */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
+@ApiModel
+@Data
+public class LocationListResponse {
+    @ApiModelProperty(value = "主键id", dataType = "Long")
+    private Long id;
+
+    /**
+     * 地点编号
+     */
+    @ExcelProperty("地点编号")
+    @ApiModelProperty(value = "地点编号", dataType = "String")
+    private String locationNo;
+
+    /**
+     * 地点名称
+     */
+    @ExcelProperty("地点名称")
+    @ApiModelProperty(value = "地点名称", dataType = "String")
+    private String locationName;
+
+    /**
+     * 地点位置
+     */
+    @ExcelProperty("地点位置")
+    @ApiModelProperty(value = "地点位置", dataType = "String")
+    private String locationPosition;
+
+    /**
+     * 创建人id
+     */
+    @ApiModelProperty(value = "创建人id", dataType = "Long")
+    private Long createUserId;
+
+    /**
+     * 创建人
+     */
+    @ExcelProperty("创建人")
+    @ApiModelProperty(value = "创建人", dataType = "String")
+    @TableField("create_user")
+    private String createUser;
+
+    /**
+     * 创建时间
+     */
+    @ExcelProperty("创建时间")
+    @ApiModelProperty(value = "创建时间", dataType = "String")
+    private String createTime;
+
+    /**
+     * 更新时间
+     */
+    @ApiModelProperty(value = "更新时间", dataType = "String")
+    private String updateTime;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertRequest.java
index 9a7f6c6..c827915 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertRequest.java
@@ -4,6 +4,8 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * @Description:
  * @Author: wangpeng
@@ -16,4 +18,7 @@
     private String name;
     @ApiModelProperty(value = "部门名", dataType = "String")
     private String deptName;
+
+    @ApiModelProperty(value = "导出ids", dataType = "List")
+    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertResponse.java
index f78b159..8f2f79e 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertResponse.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.dto.resource.staff;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.casic.missiles.annotation.DictCodeField;
 import com.casic.missiles.constants.MeterDictCode;
 import io.swagger.annotations.ApiModel;
@@ -13,12 +20,18 @@
  * @Author: wangpeng
  * @Date: 2023/7/27 15:13
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @ApiModel
 @Data
 public class StaffCertResponse {
     /**
      * 人员编号
      */
+    @ExcelProperty(value = "人员编号",order = 0)
     @NotEmpty(message = "人员编号不能为空")
     @ApiModelProperty(value = "人员编号", dataType = "String")
     private String staffNo;
@@ -26,6 +39,7 @@
     /**
      * 姓名
      */
+    @ExcelProperty(value = "姓名",order = 1)
     @ApiModelProperty(value = "姓名", dataType = "String")
     private String staffName;
 
@@ -54,6 +68,7 @@
     /**
      * 部门名字
      */
+    @ExcelProperty(value = "工作部门",order = 2)
     @ApiModelProperty(value = "部门名字", dataType = "String")
     private String deptName;
 
@@ -66,6 +81,7 @@
     /**
      * 计量专业
      */
+    @ExcelProperty(value = "计量专业",order = 3)
     @ApiModelProperty(value = "计量专业", dataType = "String")
     private String major;
 
@@ -110,6 +126,7 @@
     /**
      * 证书号
      */
+    @ExcelProperty(value = "证号",order = 4)
     @ApiModelProperty(value = "证书号", dataType = "String")
     private String certNo;
 
@@ -122,12 +139,14 @@
     /**
      * 有效日期
      */
+    @ExcelProperty(value = "证书有效期",order = 6)
     @ApiModelProperty(value = "有效日期", dataType = "String")
     private String effectiveDate;
 
     /**
      * 发放日期
      */
+    @ExcelProperty(value = "发证日期",order = 5)
     @ApiModelProperty(value = "发放日期", dataType = "String")
     private String grantDate;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffListRequest.java
index 7c4afb3..0a1194a 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffListRequest.java
@@ -4,6 +4,8 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * @Description:
  * @Author: wangpeng
@@ -18,4 +20,7 @@
     private String deptName;
     @ApiModelProperty(value = "部门id", dataType = "Long")
     private Long deptId;
+
+    @ApiModelProperty(value = "导出ids", dataType = "List")
+    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/TrainListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/TrainListRequest.java
index f68597b..6321f8b 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/TrainListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/TrainListRequest.java
@@ -14,6 +14,8 @@
 public class TrainListRequest {
     @ApiModelProperty(value = "训练登记表编号", dataType = "String")
     private String trainNo;
+    @ApiModelProperty(value = "值班领导", dataType = "String")
+    private String dutyLeader;
     @ApiModelProperty(value = "创建开始时间", dataType = "String")
     private String createTimeStart;
     @ApiModelProperty(value = "创建结束时间", dataType = "String")

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java
index bb0c50f..13a699b 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java
@@ -12,6 +12,7 @@
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.IGeneralApprovalService;
+import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
@@ -19,6 +20,7 @@
 import org.springframework.web.bind.annotation.RequestBody;
 
 import javax.validation.Valid;
+import java.util.List;
 import java.util.Objects;
 
 /**
@@ -117,4 +119,17 @@
         }
         return baseApprovalService.failUpdate(request);
     }
+
+    public List<O> exportList(@RequestBody @Valid R request) throws Exception {
+        List<O> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = baseApprovalService.listExportByIds(request.getIds());
+        } else {
+            list = baseApprovalService.listExport(request);
+        }
+        for (O record : list) {
+            DictCodeUtils.convertDictCodeToName(record);
+        }
+        return list;
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java
index 8a90961..d775831 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java
@@ -5,6 +5,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.business.certificate.CertificateChangeApplyApprovalListRequest;
 import com.casic.missiles.dto.business.certificate.CertificateChangeApplySaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessCertificateChangeApply;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
@@ -20,6 +21,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -48,4 +50,12 @@
         }
         return changeApplyService.saveChangeApply(request);
     }
+
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody CertificateChangeApplyApprovalListRequest request) throws Exception {
+        List<BizBusinessCertificateChangeApply> list = super.exportList(request);
+        super.exportExcel(BizBusinessCertificateChangeApply.class, list, ExportEnum.CERTIFICATE_CHANGE_APPLY.getSheetName());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java
index 5fc4b07..af8230e 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java
@@ -9,6 +9,7 @@
 import com.casic.missiles.dto.business.certificate.CertificatePrintApprovalListRequest;
 import com.casic.missiles.dto.business.certificate.CertificatePrintListResponse;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.enums.business.CertificatePrintStatusEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessCertificatePrintLog;
@@ -18,10 +19,16 @@
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.io.IOException;
+import java.util.List;
 import java.util.Objects;
 
 /**
@@ -98,4 +105,16 @@
         });
         return certificatePrintService.certificatePrintLog(idDTO.getId());
     }
+
+    @ApiOperation("证书打印审批导出")
+    @PostMapping("/listExport")
+    public void exportList(@RequestBody CertificatePrintApprovalListRequest request) throws IOException {
+        List<CertificatePrintListResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = certificatePrintService.listByIds(request.getIds());
+        } else {
+            list = certificatePrintService.list(request);
+        }
+        super.exportExcel(CertificatePrintListResponse.class, list, ExportEnum.CERTIFICATE_PRINT.getSheetName());
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java
index 63b06dc..6b2efd5 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java
@@ -6,6 +6,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.business.certificate.CertificateReportApprovalListRequest;
 import com.casic.missiles.dto.business.certificate.CertificateReportSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessCertificateReport;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
@@ -21,6 +22,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -50,7 +52,7 @@
         return certificateReportService.saveCertificateReport(request);
     }
 
-    @ApiOperation("证书审批详情（基本信息）")
+    @ApiOperation("详情（基本信息）")
     @PostMapping("/detail")
     public ReturnDTO<BizBusinessCertificateReport> detail(@RequestBody @Valid BaseDetailRequest request, BindingResult bindingResult) throws Exception {
         if(bindingResult.hasErrors()){
@@ -59,4 +61,11 @@
         return certificateReportService.detail(request);
     }
 
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody CertificateReportApprovalListRequest request) throws Exception {
+        List<BizBusinessCertificateReport> list = super.exportList(request);
+        super.exportExcel(BizBusinessCertificateReport.class, list, ExportEnum.CERTIFICATE_REPORT.getSheetName());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java
index 46b26bd..57c0809 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java
@@ -10,20 +10,21 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.business.identify.IdentifyListRequest;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessIdentifyInfo;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.business.IBizBusinessIdentifyInfoService;
+import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import javax.validation.Valid;
+import java.util.List;
 import java.util.Objects;
 
 /**
@@ -57,16 +58,13 @@
         return identifyInfoService.addIdentify(identifyInfo);
     }
 
-    @ApiOperation("标识打印更新")
+    @ApiOperation("标识打印更新（更新打印时间）")
     @PostMapping("/update")
-    public ReturnDTO updateIdentify(@RequestBody @Valid BizBusinessIdentifyInfo identifyInfo, BindingResult bindingResult) {
-        Assert.isFalse(Objects.isNull(identifyInfo.getId()), () -> {
+    public ReturnDTO updateIdentify(@RequestBody @Valid IdDTO idDTO) {
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        Assert.isFalse(bindingResult.hasErrors(), () -> {
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        });
-        return identifyInfoService.updateIdentify(identifyInfo);
+        return identifyInfoService.updateIdentify(idDTO.getId());
     }
 
     @ApiOperation("标识打印删除")
@@ -77,4 +75,37 @@
         });
         return identifyInfoService.deleteIdentify(idDTO.getId());
     }
+
+    @ApiOperation("标识打印导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody @Valid IdentifyListRequest request, BindingResult bindingResult) throws Exception {
+        if (bindingResult.hasErrors()) {
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        List<BizBusinessIdentifyInfo> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = identifyInfoService.listByIds(request.getIds());
+        } else {
+            list = identifyInfoService.list(request);
+        }
+        for (BizBusinessIdentifyInfo record : list) {
+            DictCodeUtils.convertDictCodeToName(record);
+        }
+        super.exportExcel(BizBusinessIdentifyInfo.class, list, ExportEnum.IDENTIFY_EXPORT.getSheetName());
+    }
+
+
+    // TODO: 2023/8/23 查询设备信息，4个底部按钮查设备（按钮的作用就是前端用来调不同接口、用来区分中间即将展示的标识），前端弹窗选设备，在确定保存时前端根据底部按钮判断传入设备类型deviceType字典code
+    // TODO: 2023/8/23 接口：查受检设备（第1个按钮），查设备台账（后3个按钮同一接口），查询之后前端根据标志类型的不同加到中间页面时进行判断（按产品给的对应表）
+    // TODO: 2023/8/23 提供二维码接口，前端在加到中间页面时调用一下
+
+    @ApiOperation("设备二维码")
+    @PostMapping("/equipment/qrCode")
+    public ReturnDTO<String> equipmentQrCode(@RequestBody @Valid IdDTO idDTO) {
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return identifyInfoService.equipmentQrCode(idDTO.getId());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java
index 707be6e..7e0453d 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java
@@ -117,7 +117,7 @@
     }
 
     @ApiOperation("任务单导出")
-    @PostMapping("/export")
+    @PostMapping("/listExport")
     public void orderExport(@RequestBody @Valid OrderListRequest request, HttpServletResponse response) {
         businessOrderService.orderExport(request, response);
     }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java
index 529a6ce..51432be 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java
@@ -1,9 +1,28 @@
 package com.casic.missiles.controller.business;
 
+import com.casic.missiles.controller.GeneralApprovalController;
+import com.casic.missiles.dto.BaseApprovalSubmitRequest;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.business.outsource.OutsourceAssessApprovalListRequest;
+import com.casic.missiles.dto.business.outsource.OutsourceAssessSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
+import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.model.business.BizBusinessOutsourceAssess;
+import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
+import com.casic.missiles.service.IGeneralApprovalService;
+import com.casic.missiles.service.business.IBizBusinessOutsourceAssessService;
 import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.BindingResult;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.validation.Valid;
+import java.util.List;
+
 /**
  * <p>
  * 计量检定业务-分包管理-测试、校准或检定工作分包评审表 前端控制器
@@ -15,6 +34,27 @@
 @Api(tags = "分包管理-测试、校准或检定工作分包评审表")
 @RestController
 @RequestMapping("/business/outsource/assess")
-public class BizBusinessOutsourceAssessController {
+public class BizBusinessOutsourceAssessController extends GeneralApprovalController<BizBusinessOutsourceAssess, BizBusinessOutsourceAssess, OutsourceAssessApprovalListRequest, BaseApprovalSubmitRequest> {
+    @Autowired
+    private IBizBusinessOutsourceAssessService outsourceAssessService;
 
+    public BizBusinessOutsourceAssessController(IGeneralApprovalService<BizBusinessOutsourceAssess, BizBusinessOutsourceAssess, OutsourceAssessApprovalListRequest, BaseApprovalSubmitRequest> baseApprovalService) {
+        super(baseApprovalService);
+    }
+
+    @ApiOperation("草稿箱-保存")
+    @PostMapping("/save")
+    public ReturnDTO<OutsourceAssessSaveResponse> saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceAssess request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        return outsourceAssessService.saveOutsourceAssess(request);
+    }
+
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception {
+        List<BizBusinessOutsourceAssess> list = super.exportList(request);
+        super.exportExcel(BizBusinessOutsourceAssess.class, list, ExportEnum.OUTSOURCE_ASSESS.getSheetName());
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java
new file mode 100644
index 0000000..9adef18
--- /dev/null
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java
@@ -0,0 +1,60 @@
+package com.casic.missiles.controller.business;
+
+import com.casic.missiles.controller.GeneralApprovalController;
+import com.casic.missiles.dto.BaseApprovalSubmitRequest;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.business.outsource.OutsourceProtocolApprovalListRequest;
+import com.casic.missiles.dto.business.outsource.OutsourceProtocolSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
+import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.model.business.BizBusinessOutsourceProtocol;
+import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
+import com.casic.missiles.service.IGeneralApprovalService;
+import com.casic.missiles.service.business.IBizBusinessOutsourceProtocolService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.BindingResult;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.validation.Valid;
+import java.util.List;
+
+/**
+ * <p>
+ * 计量检定业务-分包管理-测试、校准或检定工作分包协议书 前端控制器
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-08-24
+ */
+@Api(tags = "分包管理-测试、校准或检定工作分包协议书")
+@RestController
+@RequestMapping("/business/outsource/protocol")
+public class BizBusinessOutsourceProtocolController extends GeneralApprovalController<BizBusinessOutsourceProtocol, BizBusinessOutsourceProtocol, OutsourceProtocolApprovalListRequest, BaseApprovalSubmitRequest> {
+    @Autowired
+    private IBizBusinessOutsourceProtocolService outsourceProtocolService;
+
+    public BizBusinessOutsourceProtocolController(IGeneralApprovalService<BizBusinessOutsourceProtocol, BizBusinessOutsourceProtocol, OutsourceProtocolApprovalListRequest, BaseApprovalSubmitRequest> baseApprovalService) {
+        super(baseApprovalService);
+    }
+
+    @ApiOperation("草稿箱-保存")
+    @PostMapping("/save")
+    public ReturnDTO<OutsourceProtocolSaveResponse> saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceProtocol request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        return outsourceProtocolService.saveOutsourceProtocol(request);
+    }
+
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody OutsourceProtocolApprovalListRequest request) throws Exception {
+        List<BizBusinessOutsourceProtocol> list = super.exportList(request);
+        super.exportExcel(BizBusinessOutsourceProtocol.class, list, ExportEnum.OUTSOURCE_PROTOCOL.getSheetName());
+    }
+}
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java
index 097f645..f0f0943 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java
@@ -17,7 +17,6 @@
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.IGeneralApprovalService;
 import com.casic.missiles.service.business.IBizBusinessOutsourcerInfoService;
-import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -71,19 +70,8 @@
 
     @ApiOperation("分包方导出")
     @PostMapping("/listExport")
-    public void export(@RequestBody @Valid OutsourcerInfoApprovalListRequest request, BindingResult bindingResult) throws Exception {
-        if (bindingResult.hasErrors()) {
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        }
-        List<BizBusinessOutsourcerInfo> list;
-        if (!CollectionUtils.isEmpty(request.getIds())) {
-            list = outsourcerInfoService.listByIds(request.getIds());
-        } else {
-            list = outsourcerInfoService.list(request);
-        }
-        for (BizBusinessOutsourcerInfo record : list) {
-            DictCodeUtils.convertDictCodeToName(record);
-        }
+    public void export(@RequestBody OutsourcerInfoApprovalListRequest request) throws Exception {
+        List<BizBusinessOutsourcerInfo> list = super.exportList(request);
         super.exportExcel(BizBusinessOutsourcerInfo.class, list, ExportEnum.OUTSOURCER_EXPORT.getSheetName());
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java
index c2cbf9f..0410918 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java
@@ -17,11 +17,9 @@
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.IGeneralApprovalService;
 import com.casic.missiles.service.business.IBizBusinessSiteExecutiveInfoService;
-import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -60,7 +58,7 @@
         return siteExecutiveInfoService.saveSiteExecutiveInfo(siteExecutiveInfo);
     }
 
-    @ApiOperation("现场检测详情")
+    @ApiOperation("详情")
     @PostMapping("/detail")
     public ReturnDTO<SiteExecutiveDetailResponse> siteExecutiveDetail(@RequestBody @Valid IdDTO idDTO) throws Exception {
         Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
@@ -69,21 +67,10 @@
         return ReturnUtil.success(siteExecutiveInfoService.detail(idDTO.getId()));
     }
 
-    @ApiOperation("现场检测导出")
+    @ApiOperation("导出")
     @PostMapping("/listExport")
-    public void export(@RequestBody @Valid SiteExecutiveApprovalListRequest request, BindingResult bindingResult) throws Exception {
-        if (bindingResult.hasErrors()) {
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        }
-        List<SiteExecutiveApprovalListResponse> list;
-        if (!CollectionUtils.isEmpty(request.getIds())) {
-            list = siteExecutiveInfoService.listInfoByIds(request.getIds());
-        } else {
-            list = siteExecutiveInfoService.listInfo(request);
-        }
-        for (SiteExecutiveApprovalListResponse record : list) {
-            DictCodeUtils.convertDictCodeToName(record);
-        }
+    public void export(@RequestBody SiteExecutiveApprovalListRequest request) throws Exception {
+        List<SiteExecutiveApprovalListResponse> list = super.exportList(request);
         super.exportExcel(SiteExecutiveApprovalListResponse.class, list, ExportEnum.SITE_EXECUTIVE_EXPORT.getSheetName());
     }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
index 7e793cd..a92e209 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
@@ -55,7 +55,7 @@
 
     @ApiOperation("设备收发列表导出")
     @PostMapping("/export")
-    public void exportList(@RequestBody @Valid SampleDispatchListRequest request) throws IOException {
+    public void exportList(@RequestBody SampleDispatchListRequest request) throws IOException {
         List<SampleDispatchListResponse> list;
         if (!CollectionUtils.isEmpty(request.getIds())) {
             list = dispatchService.listByIds(request.getIds());
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java
index cdc77fc..d120fd4 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java
@@ -7,6 +7,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.business.labExecutive.*;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.business.IBusinessLabExecutiveInfoService;
@@ -14,6 +15,7 @@
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.*;
 
@@ -32,7 +34,7 @@
     @Autowired
     private IBusinessLabExecutiveInfoService labExecutiveInfoService;
 
-    @ApiOperation("实验室检测-部门检测-查询各状态列表（待检测、检测中、检测完）")
+    @ApiOperation("实验室任务-查询各状态列表（待检测、检测中、检测完）")
     @PostMapping("/deptExecutive/List")
     public ReturnDTO<PageInfoBT<SampleLabExecutiveListResponse>> queryDeptExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
@@ -43,10 +45,19 @@
         return ReturnUtil.success(super.packForBT(labExecutiveInfoService.deptLabExecutiveListPage(page, labExecutiveListRequest)));
     }
 
-    /**
-     * 实验室检测-我的检测-查询各状态列表（待检测、检测中、检测完）
-     */
-    @ApiOperation("实验室检测-我的检测-查询各状态列表（待检测、检测中、检测完）")
+    @ApiOperation("实验室任务导出")
+    @PostMapping("/deptExecutive/export")
+    public void deptExportList(@RequestBody @Valid SampleLabExecutiveListRequest request) throws Exception {
+        List<SampleLabExecutiveListResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = labExecutiveInfoService.deptLabExecutiveListByIds(request.getMeasureStatus(), request.getIds());
+        } else {
+            list = labExecutiveInfoService.deptLabExecutiveList(request);
+        }
+        super.exportExcel(SampleLabExecutiveListResponse.class, list, ExportEnum.DEPT_EXECUTIVE_TASK.getSheetName());
+    }
+
+    @ApiOperation("我的任务-查询各状态列表（待检测、检测中、检测完）")
     @PostMapping("/myExecutive/list")
     public ReturnDTO<PageInfoBT<SampleLabExecutiveListResponse>> queryMyExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
@@ -57,19 +68,25 @@
         return ReturnUtil.success(super.packForBT(labExecutiveInfoService.myLabExecutiveListPage(page, labExecutiveListRequest)));
     }
 
-    /**
-     * 实验室检测-我的检测-查询各状态样品数量（待检测、检测中、检测完）
-     */
-    @ApiOperation("实验室检测-我的检测-查询各状态样品数量（待检测、检测中、检测完）")
+    @ApiOperation("我的任务导出")
+    @PostMapping("/myExecutive/export")
+    public void exportList(@RequestBody @Valid SampleLabExecutiveListRequest request) throws Exception {
+        List<SampleLabExecutiveListResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = labExecutiveInfoService.myLabExecutiveListByIds(request.getMeasureStatus(), request.getIds());
+        } else {
+            list = labExecutiveInfoService.myLabExecutiveList(request);
+        }
+        super.exportExcel(SampleLabExecutiveListResponse.class, list, ExportEnum.MY_EXECUTIVE_TASK.getSheetName());
+    }
+
+    @ApiOperation("我的任务-查询各状态样品数量（待检测、检测中、检测完）")
     @GetMapping("/myExecutive/amount")
     public ReturnDTO<List<SampleAmountResponse>> queryMyExecutiveAmount() {
         return ReturnUtil.success(labExecutiveInfoService.myExecutiveAmount());
     }
 
-    /**
-     * 实验室检测-部门检测-分配（分配给具体人员）
-     */
-    @ApiOperation("实验室检测-部门检测-分配按钮（分配给具体人员）")
+    @ApiOperation("实验室任务-分配按钮（分配给具体人员）")
     @PostMapping("/deptExecutive/allocate")
     public ReturnDTO allocateStaff(@RequestBody @Valid SampleAllocateRequest sampleAllocateRequest, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -78,10 +95,7 @@
         return labExecutiveInfoService.allocateStaff(sampleAllocateRequest);
     }
 
-    /**
-     * 实验室检测-我的检测-检定人扫描收入（待检测->检测中）
-     */
-    @ApiOperation("实验室检测-我的检测-检定人扫描收入（待检测->检测中）")
+    @ApiOperation("我的任务-检定人扫描收入（待检测->检测中）")
     @PostMapping("/myExecutive/receive")
     public ReturnDTO sampleReceive(@RequestBody @Valid List<SampleOperateRequest> requestList, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -90,10 +104,7 @@
         return labExecutiveInfoService.sampleReceive(requestList);
     }
 
-    /**
-     * 实验室检测-负责人/检定人扫描检完（检测中->检测完）
-     */
-    @ApiOperation("实验室检测-负责人/检定人扫描检完（检测中->检测完）")
+    @ApiOperation("实验室任务-负责人/检定人扫描检完（检测中->检测完）")
     @PostMapping("/myExecutive/complete")
     public ReturnDTO sampleExecutiveComplete(@RequestBody @Valid List<SampleOperateRequest> requestList, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -102,10 +113,7 @@
         return labExecutiveInfoService.sampleExecutiveComplete(requestList);
     }
 
-    /**
-     * 实验室检测-部门检测/我的检测 编辑（只能修改应出具证书）
-     */
-    @ApiOperation("实验室检测-部门检测/我的检测 编辑（只能修改应出具证书）")
+    @ApiOperation("实验室任务/我的任务 编辑（只能修改应出具证书）")
     @PostMapping("/executive/update")
     public ReturnDTO updateExecutive(@RequestBody @Valid UpdateExecutiveRequest request, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -114,10 +122,7 @@
         return labExecutiveInfoService.updateExecutive(request);
     }
 
-    /**
-     * 实验室检测-部门检测/我的检测 详情
-     */
-    @ApiOperation("实验室检测-部门检测/我的检测 详情")
+    @ApiOperation("实验室任务/我的任务 详情")
     @PostMapping("/executive/detail")
     public ReturnDTO<ExecutiveDetailResponse> executiveDetail(@RequestBody @Valid ExecutiveDetailRequest request, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
@@ -131,7 +136,7 @@
      * 退回后会将下一个要执行的实验室检测状态更新为待分配，将后面的实验室顺序变更为连续（都进行减1）
      * 最后一个检测的实验室退回，等分发员再增加实验室或设备收发中的已收入直接手动点击完成
      */
-    @ApiOperation("实验室检测-部门检测/我的检测 退回（待检测/检测中->退回）")
+    @ApiOperation("实验室任务/我的任务 退回（待检测/检测中->退回）")
     @PostMapping("/executive/sendBack")
     public ReturnDTO executiveSendBack(@RequestBody @Valid ExecutiveSendBackRequest request, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -140,9 +145,6 @@
         return labExecutiveInfoService.sampleExecutiveSendBack(request);
     }
 
-    /**
-     * 分发员编辑实验室检测列表
-     */
     @ApiOperation("分发员编辑实验室检测列表")
     @PostMapping("/handOut/updateList")
     public ReturnDTO updateExecutiveList(@RequestBody @Valid UpdateExecutiveListRequest request, BindingResult bindingResult) {
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java
index 48a67ed..0c04f31 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java
@@ -10,6 +10,7 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.resource.customer.CustomerApprovalListRequest;
 import com.casic.missiles.dto.resource.customer.CustomerSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceCustomerInfo;
@@ -26,6 +27,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -55,6 +57,13 @@
         return customerInfoService.saveCustomerInfo(request);
     }
 
+    @ApiOperation("委托方名录导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody CustomerApprovalListRequest request) throws Exception {
+        List<BizResourceCustomerInfo> list = super.exportList(request);
+        super.exportExcel(BizResourceCustomerInfo.class, list, ExportEnum.CUSTOMER_INFO.getSheetName());
+    }
+
     @ApiOperation("委托方人员列表（分页）")
     @PostMapping("/person/listPage")
     public ReturnDTO<PageInfoBT<BizResourceCustomerStaff>> personListPage(@RequestBody IdDTO idDto) {
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
index 972ed4b..6418ea5 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
@@ -5,6 +5,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.resource.customer.SuggestFormApprovalListRequest;
 import com.casic.missiles.dto.resource.customer.SuggestFormSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceCustomerSuggestForm;
@@ -20,6 +21,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -50,4 +52,11 @@
         return suggestFormService.saveSuggestForm(request);
     }
 
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody SuggestFormApprovalListRequest request) throws Exception {
+        List<BizResourceCustomerSuggestForm> list = super.exportList(request);
+        super.exportExcel(BizResourceCustomerSuggestForm.class, list, ExportEnum.CUSTOMER_SUGGEST_FORM.getSheetName());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java
index 1934d1a..9e07eab 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java
@@ -15,12 +15,16 @@
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.resource.IEnvEnvironmentRecordConfigService;
 import com.casic.missiles.service.resource.IEnvEnvironmentRecordDataService;
+import com.casic.missiles.service.resource.IEnvLocationInfoService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
 import java.util.List;
@@ -39,6 +43,8 @@
     private IEnvEnvironmentRecordDataService environmentRecordDataService;
     @Autowired
     private IEnvEnvironmentRecordConfigService environmentRecordConfigService;
+    @Autowired
+    private IEnvLocationInfoService locationInfoService;
 
     @ApiOperation("环境记录单数据列表/详情")
     @PostMapping("/data/listPage")
@@ -95,4 +101,11 @@
         });
         return environmentRecordConfigService.deleteEnvironmentRecordConfig(idDTO.getId());
     }
+
+    @ApiOperation("地点列表")
+    @PostMapping("/location/listPage")
+    public ReturnDTO<PageInfoBT<LocationListResponse>> locationListPage(@RequestBody @Valid LocationListRequest request) {
+        Page<LocationListResponse> page = PageFactory.defaultPage();
+        return ReturnUtil.success(super.packForBT(locationInfoService.listPage(page, request)));
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java
index 82efe3f..e9561fa 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java
@@ -10,6 +10,7 @@
 import com.casic.missiles.dto.resource.seal.SealLogListRequest;
 import com.casic.missiles.dto.resource.seal.SealNoteApprovalListRequest;
 import com.casic.missiles.dto.resource.seal.SealNoteSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceSealUseLog;
@@ -27,6 +28,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -58,6 +60,13 @@
         return sealUseNoteService.saveSeal(request);
     }
 
+    @ApiOperation("印章使用登记导出（列表和导出中去掉经办人和监印人）")
+    @PostMapping("/listExport")
+    public void export(@RequestBody SealNoteApprovalListRequest request) throws Exception {
+        List<BizResourceSealUseNote> list = super.exportList(request);
+        super.exportExcel(BizResourceSealUseNote.class, list, ExportEnum.SEAL_NOTE.getSheetName());
+    }
+
     // TODO: 2023/7/28 印章使用日志：系统中使用印章时插入数据库
 
     @ApiOperation("印章使用日志列表（分页）")
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java
index 9b674fc..06b6521 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java
@@ -9,16 +9,20 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.resource.staff.StaffCertRequest;
 import com.casic.missiles.dto.resource.staff.StaffCertResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.service.resource.IBizResourceStaffInfoService;
 import com.casic.missiles.service.resource.IBizResourceStaffVerifierService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.List;
+
 /**
  * @Description:
  * @Author: wangpeng
@@ -41,9 +45,21 @@
         return ReturnUtil.success(super.packForBT(responsePage));
     }
 
+    @ApiOperation("证书逾期提醒导出")
+    @PostMapping("/listExport")
+    public void exportList(@RequestBody StaffCertRequest request) throws Exception {
+        List<StaffCertResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = staffInfoService.certListByIds(request.getIds());
+        } else {
+            list = staffInfoService.certList(request);
+        }
+        super.exportExcel(StaffCertResponse.class, list, ExportEnum.STAFF_CERTIFICATE_EXPIRE.getSheetName());
+    }
+
     @ApiOperation("证书逾期提醒")
     @PostMapping("/expirationReminder")
-    public ReturnDTO expirationReminder(@RequestBody IdDTO idDto) {
-        return verifierService.expirationReminder(idDto);
+    public ReturnDTO expirationReminder(@RequestBody IdDTO idDTO) {
+        return verifierService.expirationReminder(idDTO);
     }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java
index 3b251ad..a6e7850 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java
@@ -12,6 +12,7 @@
 import com.casic.missiles.dto.resource.staff.StaffListRequest;
 import com.casic.missiles.dto.resource.staff.TrainListRequest;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.*;
@@ -22,7 +23,10 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
 import java.util.List;
@@ -52,8 +56,19 @@
             throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
         }
         Page<BizResourceStaffInfo> page = PageFactory.defaultPage();
-        Page<BizResourceStaffInfo> responsePage = staffInfoService.listPage(page, request);
-        return ReturnUtil.success(super.packForBT(responsePage));
+        return ReturnUtil.success(super.packForBT(staffInfoService.listPage(page, request)));
+    }
+
+    @ApiOperation("人员登记导出")
+    @PostMapping("/listExport")
+    public void exportList(@RequestBody StaffListRequest request) throws Exception {
+        List<BizResourceStaffInfo> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = staffInfoService.listByIds(request.getIds());
+        } else {
+            list = staffInfoService.list(request);
+        }
+        super.exportExcel(BizResourceStaffInfo.class, list, ExportEnum.STAFF_INFO.getSheetName());
     }
 
     @ApiOperation("人员登记详情基础信息")
@@ -85,9 +100,9 @@
 
     @ApiOperation("科研教育列表（分页）")
     @PostMapping("/education/listPage")
-    public ReturnDTO<PageInfoBT<BizResourceStaffEducation>> educationListPage(@RequestBody IdDTO idDto) {
+    public ReturnDTO<PageInfoBT<BizResourceStaffEducation>> educationListPage(@RequestBody IdDTO idDTO) {
         Page<BizResourceStaffEducation> page = PageFactory.defaultPage();
-        Page<BizResourceStaffEducation> responsePage = staffInfoService.educationListPage(page, idDto);
+        Page<BizResourceStaffEducation> responsePage = staffInfoService.educationListPage(page, idDTO);
         return ReturnUtil.success(super.packForBT(responsePage));
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java
index af6aa86..d85d84a 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java
@@ -9,6 +9,7 @@
 import com.casic.missiles.dto.resource.outsideService.SupplierApprovalListRequest;
 import com.casic.missiles.dto.resource.outsideService.SupplierSaveResponse;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceSupplierAbility;
@@ -67,6 +68,13 @@
         return ReturnUtil.success(supplierInfoService.detail(idDTO.getId()));
     }
 
+    @ApiOperation("合格供方导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody SupplierApprovalListRequest request) throws Exception {
+        List<BizResourceSupplierInfo> list = super.exportList(request);
+        super.exportExcel(BizResourceSupplierInfo.class, list, ExportEnum.SUPPLIER_INFO.getSheetName());
+    }
+
     @ApiOperation("供方人员列表（分页）")
     @PostMapping("/person/listPage")
     public ReturnDTO<PageInfoBT<BizResourceSupplierPerson>> personListPage(@RequestBody IdDTO idDTO) {
diff --git a/casic-metering-api/src/main/resources/config/application.yml b/casic-metering-api/src/main/resources/config/application.yml
index 350db5f..ecff521 100644
--- a/casic-metering-api/src/main/resources/config/application.yml
+++ b/casic-metering-api/src/main/resources/config/application.yml
@@ -126,7 +126,7 @@
     #作者
     author: wangpeng
     #待生成对象表名
-    table-name: biz_equipment_technical_target_approval,biz_equipment_attachment_approval,biz_equipment_checkpoint_approval
+    table-name: biz_business_outsource_protocol
 
 reminder:
   #节点--common模块config包 ReminderNodeConfig配置
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
index 4a19e4e..d47d552 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
@@ -53,6 +53,7 @@
     SUGGEST_FORM_SAVE_FAILED(2509, "委托方意见登记表保存至草稿箱失败"),
     EXAMINE_FORM_SAVE_FAILED(2510, "要求、委托书及合同评审表保存至草稿箱失败"),
     CUSTOMER_EXIST_SAVE_FAILED(2511, "该委托方已存在，请重新选择"),
+    DUPLICATE_LOCATION_NO(2512, "地点编号已存在"),
 
     /**
      * 计量检定业务模块
@@ -68,6 +69,8 @@
     COMPLETE_SAMPLE_NOT_EXIST(2609, "检测中不存在扫描收入的样品"),
     CANNOT_CHANGE_MEASURE_INFO(2610, "无法更改非当前登录用户的检测信息"),
     NON_EXIST_ORDER_OR_SAMPLE(2611, "不存在该委托单或该委托单下的样品"),
+    OUTSOURCE_ACCESS_SAVE_FAILED(2612, "测试、校准或检定工作分包评审表保存至草稿箱失败"),
+    OUTSOURCE_PROTOCOL_SAVE_FAILED(2613, "测试、校准或检定工作分包协议书保存至草稿箱失败"),
 
     /**
      * 历史遗留备用
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
index 5089ad1..81a406b 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
@@ -10,54 +10,38 @@
     /**
      * 资源管理
      */
-    ENVIRONMENT_DATA_EXPORT("environmentData", "environmentData", "环境记录单数据"),
+    ENVIRONMENT_DATA_EXPORT("environmentData", "环境记录单数据", "环境记录单数据"),
+    STAFF_INFO("staffInfo", "人员登记", "人员登记"),
+    STAFF_CERTIFICATE_EXPIRE("certificateExpire", "证书逾期提醒", "证书逾期提醒"),
+    SUPPLIER_INFO("supplierInfo", "合格供方名录", "合格供方名录"),
+    CUSTOMER_INFO("customerInfo", "委托方名录", "委托方名录"),
+    CUSTOMER_SUGGEST_FORM("customerSuggestForm", "委托方意见登记表", "委托方意见登记表"),
+    SEAL_NOTE("sealNote", "印章使用登记", "印章使用登记"),
 
-    FILE_EXPORT("meterFileData", "meterFileData", "计量文件信息"),
-    TRAIN_PLAN_EXPORT("trainPlanData", "trainPlanData", "培训计划"),
-    TRAIN_LOG_EXPORT("trainLogData", "trainLogData", "培训记录"),
-    METER_ORGANIZE_EXPORT("meterOrganizeData", "meterOrganizeData", "计量组织"),
-    TRACE_SUPPLIER_EXPORT("traceSupplierData", "traceSupplierData", "溯源供方"),
-    SIGN_EXPORT("signData", "signData", "签名/签章"),
-    TEMPLATE_EXPORT("templateData", "templateData", "原始记录模板/证书报告模板"),
-    FIXED_ASSETS("meterFixedAssets", "meterFixedAssets", "固定资产"),
-    METER_EQUIPMENT("meterEquipment", "meterEquipment", "测量设备"),
-    CALIBRATION_TEST_EQUIPMENT("calibrationTestEquipment", "calibrationTestEquipment", "校准检定设备"),
-    MEASURE_ACCOUNT("measureAccount", "measureAccount", "测量工装"),
-    STANDARD_SUPPORT_EQUIPMENT("standardSupportEquipment", "standardSupportEquipment", "标准配套设备"),
-    STANDARD_EQUIPMENT("standardEquipment", "standardEquipment", "标准装置"),
-    FLOW_DEF_EXPORT("flowDefData", "flowDefData", "流程定义"),
-    STAFF_CERTIFICATE("certificate", "certificate", "计量人员证书"),
-    CHECK_INFO("checkInfo", "checkInfo", "设备管理点检测"),
-    EQUIPMENT_APPLY("equipmentApply", "equipmentApply", "设备借用"),
-    STANDARD_EQUIPMENT_REMIND("equipmentApplyRemind", "equipmentApplyRemind", "标准装置到期提醒"),
-    METER_PRICE("meterPrice", "meterPrice", "价格库"),
-    METER_STAFF("meterStaff", "meterStaff", "计量人员"),
-    STANDARD_EQUIPMENT_APPLY("standardEquipmentApply", "standardEquipmentApply", "标准装置申请"),
-    STATE_MANAGE_APPLY("stateManage", "stateManage", "状态管理"),
-    METER_ACCEPTANCE_CHECK("acceptanceCheck", "acceptanceCheck", "设备检修保养验收单"),
-    CUSTOMER_EXPORT("customerData", "customerData", "客户信息"),
-    ORDER_EXPORT("orderData", "orderData", "委托书信息"),
-    SAMPLE_EXPORT("sampleData", "sampleData", "样本信息"),
-    EXCHANGE_DATA("exchangeData", "exchangeData", "设备交接单"),
-    DISPATCH_DATA("dispatchData", "dispatchData", "设备收发"),
-    ENVIRONMENT_DATA("environmentData", "environmentData", "环境记录单"),
-    ORIGIN_DATA("originData", "originData", "原始记录"),
-    CERTIFICATE_REPORT("certificateReport", "certificateReport", "证书报告"),
-    ADVICE_EXPORT("adviceData", "adviceData", "客户反馈"),
-    HANDOUT_EXPORT("handoutData", "handoutData", "任务分发列表"),
-    OUTSOURCER_EXPORT("outsourcerData", "outsourcerData", "分包方"),
-    SITE_EXECUTIVE_EXPORT("siteExecutiveData", "siteExecutiveData", "现场测试、校准或检定"),
-    CERTIFICATE_PRINT_EXPORT("certificatePrintData", "certificatePrintData", "证书打印"),
-    DOWNLOAD_TEMPLATE("downloadTemplate", "downloadTemplate", "页面配置"),
-    OUTSOURCER_CERTIFICATE_EXPORT("outsourceCertificateData", "outsourceCertificateData", "分包证书"),
-    SETTLEMENT_INFO_EXPORT("settlementInfoData", "settlementInfoData", "业务结算"),
-    EQUIPMENT_REMIND("equipmentRemind", "equipmentRemind", "设备到期提醒"),
-    AGREEMENT_INFO_EXPORT("agreementInfoData", "agreementInfoData", "合同"),
-    WORK_STATISTICS_EXPORT("workStatisticsData", "workStatisticsData", "实时工作统计"),
-    DEPT_OUTPUT_EXPORT("deptOutputData", "deptOutputData", "部门产值分析"),
-    WORKLOAD_EXPORT("workloadData", "workloadData", "业务工作量分析"),
-    DEPT_COMPREHENSIVE_EXPORT("deptComprehensiveData", "deptComprehensiveData", "部门综合分析"),
-    ENVIRONMENTAL_RECORD("environmentalRecordData", "environmentalRecordData", "现场环境记录");
+    /**
+     * 计量检定业务
+     */
+    OUTSOURCER_EXPORT("outsourcerData", "分包方名录", "分包方名录"),
+    IDENTIFY_EXPORT("identifyData", "计量标识", "计量标识"),
+    ORDER_EXPORT("orderData", "任务单", "任务单"),
+    DISPATCH_DATA("dispatchData", "设备收发", "设备收发"),
+    HANDOUT_EXPORT("handoutData", "任务分发", "任务分发"),
+    SITE_EXECUTIVE_EXPORT("siteExecutiveData", "现场测试、校准或检定", "现场测试、校准或检定"),
+    CERTIFICATE_REPORT("certificateReport", "证书审批", "证书审批"),
+    CERTIFICATE_CHANGE_APPLY("certificateChangeApply", "证书报告补充或更换申请单", "证书报告补充或更换申请单"),
+    CERTIFICATE_PRINT("certificatePrintData", "证书打印审批", "证书打印审批"),
+    DEPT_EXECUTIVE_TASK("deptExecutiveTaskData", "实验室任务", "实验室任务"),
+    MY_EXECUTIVE_TASK("myExecutiveTaskData", "我的任务", "我的任务"),
+    OUTSOURCE_ASSESS("outsourceAssess", "测试、校准或检定工作分包评审表", "测试、校准或检定工作分包评审表"),
+    OUTSOURCE_PROTOCOL("outsourceProtocol", "测试、校准或检定工作分包协议书", "测试、校准或检定工作分包协议书"),
+
+    /**
+     * 系统管理
+     */
+    SIGN_EXPORT("signData", "签名", "签名"),
+    TEMPLATE_EXPORT("templateData", "文件模板", "文件模板"),
+    FLOW_DEF_EXPORT("flowDefData", "流程定义", "流程定义"),
+    DOWNLOAD_TEMPLATE("downloadTemplate", "流程定义", "页面配置");
 
     ExportEnum(String fileName, String sheetName, String description) {
         this.fileName = fileName;
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateRecordTypeCodeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateRecordTypeCodeEnum.java
index 31d913c..a963522 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateRecordTypeCodeEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateRecordTypeCodeEnum.java
@@ -46,4 +46,14 @@
     String SITE_EXECUTIVE_APPROVAL = "01";
     //《现场测试、校准或检定工作记录表》
     String SITE_EXECUTIVE_LOG = "02";
+
+    //测试、校准或检定工作分包协议书
+    String OUTSOURCE_PROTOCOL = "01";
+    //测试、校准或检定工作分包评审表
+    String OUTSOURCE_ACCESS = "02";
+    //测试、校准或检定工作分包通知书
+    String OUTSOURCE_NOTICE = "03";
+    //测试、校准或检定工作分包方名录
+    String OUTSOURCE_INFO = "04";
+
 }
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
index 24b8635..f78bd53 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
@@ -15,6 +15,10 @@
     String CERTIFICATE_CHANGE_APPLY_BEAN_NAME = "certificateChangeApplyBean";
     //现场测试、校准或检定
     String SITE_EXECUTIVE_BEAN_NAME = "siteExecutiveBean";
+    //测试、校准或检定工作分包评审表
+    String OUTSOURCE_ASSESS_BEAN_NAME = "outsourceAssessBean";
+    //测试、校准或检定工作分包协议书
+    String OUTSOURCE_PROTOCOL_BEAN_NAME = "outsourceProtocolBean";
 
     /*********************************设备与装置************************************/
     //设备台账
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 b21c661..6b86fd1 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
@@ -18,6 +18,8 @@
     OUTSOURCER_APPROVAL(OUTSOURCER_BEAN_NAME, ""),
     CERTIFICATE_CHANGE_APPROVAL(CERTIFICATE_CHANGE_APPLY_BEAN_NAME, ""),
     SITE_EXECUTIVE_APPROVAL(SITE_EXECUTIVE_BEAN_NAME, ""),
+    OUTSOURCE_ASSESS_APPROVAL(OUTSOURCE_ASSESS_BEAN_NAME, ""),
+    OUTSOURCE_PROTOCOL_APPROVAL(OUTSOURCE_PROTOCOL_BEAN_NAME, ""),
 
     ACTION_STATUS_MAP(new HashMap<String, AwareActionStatusEnum>() {
         {
@@ -47,6 +49,10 @@
             put(ApplyFromIdEnum.CERTIFICATE_CHANGE_APPROVAL.getCode(), CERTIFICATE_CHANGE_APPROVAL);
             //现场测试、校准或检定审批
             put(ApplyFromIdEnum.SITE_EXECUTIVE_APPROVAL.getCode(), SITE_EXECUTIVE_APPROVAL);
+            //测试、校准或检定工作分包评审表
+            put(ApplyFromIdEnum.OUTSOURCE_ASSESS_APPROVAL.getCode(), OUTSOURCE_ASSESS_APPROVAL);
+            //测试、校准或检定工作分包协议书
+            put(ApplyFromIdEnum.OUTSOURCE_PROTOCOL_APPROVAL.getCode(), OUTSOURCE_PROTOCOL_APPROVAL);
         }
     });
     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 934405e..c7410bd 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
@@ -9,6 +9,8 @@
     CERTIFICATE_CHANGE_APPROVAL("jljdywzsbchghsqd", MessageSourceModuleEnum.BUSINESS.getCode(), "证书/报告补充或更换申请单"),
     OUTSOURCER_APPROVAL("jljdywcsjzhgfbfml", MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定合格分包方名录"),
     SITE_EXECUTIVE_APPROVAL("jljdywxccsjzsp", MessageSourceModuleEnum.BUSINESS.getCode(), "现场测试、校准或检定审批"),
+    OUTSOURCE_ASSESS_APPROVAL("jljdywcsjzfbpsb", MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包评审表"),
+    OUTSOURCE_PROTOCOL_APPROVAL("jljdywcsjzfbxys", MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包协议书"),
 
 
     /*******************************************设备与装置*********************************************/
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/GeneralApprovalMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/GeneralApprovalMapper.java
index 4fb7344..0c9d6ae 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/GeneralApprovalMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/GeneralApprovalMapper.java
@@ -17,8 +17,4 @@
 
     Page<O> selectBatchForApprovalList(Page<O> page, @Param("request") R request, @Param("businessKeys") List<String> businessKeys);
 
-//    Page<O> selectListPage(Page<O> page, @Param("request") R request);
-
-//    Long selectMaxNo();
-
 }
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceAssessMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceAssessMapper.java
index 7867bb8..ba59009 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceAssessMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceAssessMapper.java
@@ -1,7 +1,12 @@
 package com.casic.missiles.mapper.business;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.business.outsource.OutsourceAssessApprovalListRequest;
+import com.casic.missiles.mapper.GeneralApprovalMapper;
 import com.casic.missiles.model.business.BizBusinessOutsourceAssess;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * <p>
@@ -11,6 +16,10 @@
  * @author wangpeng
  * @since 2023-08-16
  */
-public interface BizBusinessOutsourceAssessMapper extends BaseMapper<BizBusinessOutsourceAssess> {
+public interface BizBusinessOutsourceAssessMapper extends GeneralApprovalMapper<BizBusinessOutsourceAssess, BizBusinessOutsourceAssess, OutsourceAssessApprovalListRequest> {
+
+    Page<BizBusinessOutsourceAssess> selectBatchForApprovalList(Page<BizBusinessOutsourceAssess> page, @Param("request") OutsourceAssessApprovalListRequest request, @Param("businessKeys") List<String> businessKeys);
+
+    Long selectMaxProjectNo();
 
 }
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceProtocolMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceProtocolMapper.java
new file mode 100644
index 0000000..e6aba35
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceProtocolMapper.java
@@ -0,0 +1,24 @@
+package com.casic.missiles.mapper.business;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.business.outsource.OutsourceProtocolApprovalListRequest;
+import com.casic.missiles.mapper.GeneralApprovalMapper;
+import com.casic.missiles.model.business.BizBusinessOutsourceProtocol;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 计量检定业务-分包管理-测试、校准或检定工作分包协议书 Mapper 接口
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-08-24
+ */
+public interface BizBusinessOutsourceProtocolMapper extends GeneralApprovalMapper<BizBusinessOutsourceProtocol, BizBusinessOutsourceProtocol, OutsourceProtocolApprovalListRequest> {
+
+    Page<BizBusinessOutsourceProtocol> selectBatchForApprovalList(Page<BizBusinessOutsourceProtocol> page, @Param("request") OutsourceProtocolApprovalListRequest request, @Param("businessKeys") List<String> businessKeys);
+
+    Long selectMaxProtocolNo();
+}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/EnvLocationInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/EnvLocationInfoMapper.java
new file mode 100644
index 0000000..49eff87
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/EnvLocationInfoMapper.java
@@ -0,0 +1,21 @@
+package com.casic.missiles.mapper.resource;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.resource.environment.LocationListRequest;
+import com.casic.missiles.dto.resource.environment.LocationListResponse;
+import com.casic.missiles.model.resource.EnvLocationInfo;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * <p>
+ * 实验室环境监控系统-设备表 Mapper 接口
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-06-07
+ */
+public interface EnvLocationInfoMapper extends BaseMapper<EnvLocationInfo> {
+
+    Page<LocationListResponse> selectLocationListPage(Page<LocationListResponse> page, @Param("request") LocationListRequest request);
+}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java
index de124db..85ed0f7 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java
@@ -1,7 +1,9 @@
 package com.casic.missiles.mapper.system;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.dto.system.SignDetailResponse;
+import com.casic.missiles.dto.system.SignListRequest;
 import com.casic.missiles.model.system.SystemSign;
 import org.apache.ibatis.annotations.Param;
 
@@ -22,4 +24,8 @@
     SignDetailResponse selectSignDetailById(Long id);
 
     List<SystemSign> selectUsableSignList(@Param("userId") Long userId);
+
+    Page<SystemSign> selectSignListPage(Page<SystemSign> page, @Param("request") SignListRequest request);
+
+    List<SystemSign> selectSignList(@Param("request") SignListRequest request);
 }
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateChangeApplyMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateChangeApplyMapper.xml
index d798447..c496092 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateChangeApplyMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateChangeApplyMapper.xml
@@ -30,31 +30,31 @@
         SELECT *
         FROM biz_business_certificate_change_apply
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.changeApplyNo != null and request.changeApplyNo !=''">
+        <if test="request != null and request.changeApplyNo != null and request.changeApplyNo !=''">
             and change_apply_no like concat('%',#{request.changeApplyNo},'%')
         </if>
-        <if test="request.changeReportNo != null and request.changeReportNo !=''">
+        <if test="request != null and request.changeReportNo != null and request.changeReportNo !=''">
             and change_report_no like concat('%',#{request.changeReportNo},'%')
         </if>
-        <if test="request.changeReportName != null and request.changeReportName !=''">
+        <if test="request != null and request.changeReportName != null and request.changeReportName !=''">
             and change_report_name like concat('%',#{request.changeReportName},'%')
         </if>
-        <if test="request.changeType != null and request.changeType !=''">
+        <if test="request != null and request.changeType != null and request.changeType !=''">
             and change_type = #{request.changeType}
         </if>
-        <if test="request.createUserName != null and request.createUserName !=''">
+        <if test="request != null and request.createUserName != null and request.createUserName !=''">
             and create_user_name like concat('%',#{request.createUserName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificatePrintMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificatePrintMapper.xml
index b66cd99..49c0ac8 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificatePrintMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificatePrintMapper.xml
@@ -31,34 +31,34 @@
         LEFT JOIN biz_business_order_sample_relation bosr ON (bosr.order_id = bcr.order_id AND bosr.sample_id = bcr.sample_id)
         LEFT JOIN biz_business_order_info boi ON boi.id = bosr.order_id
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and bcp.approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.printStatus != null and request.printStatus !=''">
+        <if test="request != null and request.printStatus != null and request.printStatus !=''">
             and print_status = #{request.printStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and bcp.create_user_id = #{request.createUserId}
         </if>
-        <if test="request.certificateReportNo != null and request.certificateReportNo !=''">
+        <if test="request != null and request.certificateReportNo != null and request.certificateReportNo !=''">
             and bcr.certificate_report_no like concat('%',#{request.certificateReportNo},'%')
         </if>
-        <if test="request.certificateReportName != null and request.certificateReportName !=''">
+        <if test="request != null and request.certificateReportName != null and request.certificateReportName !=''">
             and bcr.certificate_report_name like concat('%',#{request.certificateReportName},'%')
         </if>
-        <if test="request.customerName != null and request.customerName !=''">
+        <if test="request != null and request.customerName != null and request.customerName !=''">
             and boi.customer_name like concat('%',#{request.customerName},'%')
         </if>
-        <if test="request.sampleNo != null and request.sampleNo !=''">
+        <if test="request != null and request.sampleNo != null and request.sampleNo !=''">
             and bosr.sample_no like concat('%',#{request.sampleNo},'%')
         </if>
-        <if test="request.sampleName != null and request.sampleName !=''">
+        <if test="request != null and request.sampleName != null and request.sampleName !=''">
             and bosr.sample_name like concat('%',#{request.sampleName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and bcp.create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and bcp.create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml
index b366034..767695d 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml
@@ -46,33 +46,37 @@
         SELECT bcr.*, bosr.sample_no, bosr.sample_name, bosr.sample_model, rsi.staff_name
         FROM biz_business_certificate_report bcr
         LEFT JOIN biz_business_order_sample_relation bosr ON (bosr.order_id = bcr.order_id AND bosr.sample_id = bcr.sample_id)
+        LEFT JOIN biz_business_order_info boi ON boi.id = bcr.order_id
         LEFT JOIN biz_resource_staff_info rsi ON rsi.id = bcr.measure_person_id
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and bcr.approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and bcr.create_user_id = #{request.createUserId}
         </if>
-        <if test="request.certificateReportNo != null and request.certificateReportNo !=''">
+        <if test="request != null and request.customerId != null and request.customerId !=''">
+            and boi.customer_id = #{request.customerId}
+        </if>
+        <if test="request != null and request.certificateReportNo != null and request.certificateReportNo !=''">
             and bcr.certificate_report_no like concat('%',#{request.certificateReportNo},'%')
         </if>
-        <if test="request.certificateReportName != null and request.certificateReportName !=''">
+        <if test="request != null and request.certificateReportName != null and request.certificateReportName !=''">
             and bcr.certificate_report_name like concat('%',#{request.certificateReportName},'%')
         </if>
-        <if test="request.sampleNo != null and request.sampleNo !=''">
+        <if test="request != null and request.sampleNo != null and request.sampleNo !=''">
             and bosr.sample_no like concat('%',#{request.sampleNo},'%')
         </if>
-        <if test="request.measureCategory != null and request.measureCategory !=''">
+        <if test="request != null and request.measureCategory != null and request.measureCategory !=''">
             and bcr.measure_category = #{request.measureCategory}
         </if>
-        <if test="request.measurePerson != null and request.measurePerson !=''">
+        <if test="request != null and request.measurePerson != null and request.measurePerson !=''">
             and rsi.staff_name like concat('%',#{request.measurePerson},'%')
         </if>
-        <if test="request.calibrationTimeStart != null and request.calibrationTimeStart !=''">
+        <if test="request != null and request.calibrationTimeStart != null and request.calibrationTimeStart !=''">
             and bcr.calibration_time &gt;= #{request.calibrationTimeStart}
         </if>
-        <if test="request.calibrationTimeEnd != null and request.calibrationTimeEnd !=''">
+        <if test="request != null and request.calibrationTimeEnd != null and request.calibrationTimeEnd !=''">
             and bcr.calibration_time &lt;= #{request.calibrationTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceAssessMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceAssessMapper.xml
index d0fcf8b..c22c101 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceAssessMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceAssessMapper.xml
@@ -7,6 +7,8 @@
         <id column="id" property="id" />
         <result column="project_no" property="projectNo" />
         <result column="project_name" property="projectName" />
+        <result column="lab_code" property="labCode" />
+        <result column="group_code" property="groupCode" />
         <result column="applicant_id" property="applicantId" />
         <result column="applicant_name" property="applicantName" />
         <result column="applicant_time" property="applicantTime" />
@@ -31,7 +33,45 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, project_no, project_name, applicant_id, applicant_name, applicant_time, minio_file_name, remark, create_user_id, create_user_name, outsourcer_id, pre_start_time, pre_end_time, outsource_reason, pre_cost, approval_status, process_id, approve_situation, traceability, test_method, technique_ability, create_time, update_time
+        id, project_no, project_name, lab_code, group_code, applicant_id, applicant_name, applicant_time, minio_file_name, remark, create_user_id, create_user_name, outsourcer_id, pre_start_time, pre_end_time, outsource_reason, pre_cost, approval_status, process_id, approve_situation, traceability, test_method, technique_ability, create_time, update_time
     </sql>
 
+    <select id="selectMaxProjectNo" resultType="java.lang.Long">
+        SELECT IFNULL(max(RIGHT(project_no, 3)), 0) from biz_business_outsource_assess
+    </select>
+
+    <select id="selectBatchForApprovalList" resultMap="BaseResultMap">
+        SELECT bboa.*, bboi.outsourcer_name, bboi.director
+        FROM biz_business_outsource_assess bboa
+        LEFT JOIN biz_business_outsourcer_info bboi ON bboa.outsourcer_id = bboi.id
+        WHERE 1=1
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
+            and bboa.approval_status = #{request.approvalStatus}
+        </if>
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
+            and bboa.create_user_id = #{request.createUserId}
+        </if>
+        <if test="request != null and request.projectNo != null and request.projectNo !=''">
+            and bboa.project_no like concat('%',#{request.projectNo},'%')
+        </if>
+        <if test="request != null and request.outsourcerName != null and request.outsourcerName !=''">
+            and bboi.outsourcer_name like concat('%',#{request.outsourcerName},'%')
+        </if>
+        <if test="request != null and request.applicantName != null and request.applicantName !=''">
+            and bboa.applicant_name like concat('%',#{request.applicantName},'%')
+        </if>
+        <if test="request != null and request.applicantTimeStart != null and request.applicantTimeStart !=''">
+            and bboa.applicant_time &gt;= #{request.applicantTimeStart}
+        </if>
+        <if test="request != null and request.applicantTimeEnd != null and request.applicantTimeEnd !=''">
+            and bboa.applicant_time &lt;= #{request.applicantTimeEnd}
+        </if>
+        <if test="businessKeys != null">
+            and bboa.id in
+            <foreach collection="businessKeys" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
+        ORDER BY bboa.create_time DESC
+    </select>
 </mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceProtocolMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceProtocolMapper.xml
new file mode 100644
index 0000000..b7b2149
--- /dev/null
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceProtocolMapper.xml
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.mapper.business.BizBusinessOutsourceProtocolMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.business.BizBusinessOutsourceProtocol">
+        <id column="id" property="id" />
+        <result column="protocol_no" property="protocolNo" />
+        <result column="project_name" property="projectName" />
+        <result column="lab_code" property="labCode" />
+        <result column="group_code" property="groupCode" />
+        <result column="outsourcer_id" property="outsourcerId" />
+        <result column="remark" property="remark" />
+        <result column="outsource_no" property="outsourceNo" />
+        <result column="outsource_name" property="outsourceName" />
+        <result column="contacts" property="contacts" />
+        <result column="mobile" property="mobile" />
+        <result column="address" property="address" />
+        <result column="require_date" property="requireDate" />
+        <result column="outsource_cost" property="outsourceCost" />
+        <result column="director" property="director" />
+        <result column="item" property="item" />
+        <result column="requires" property="requires" />
+        <result column="create_user_id" property="createUserId" />
+        <result column="create_user_name" property="createUserName" />
+        <result column="approval_status" property="approvalStatus" />
+        <result column="process_id" property="processId" />
+        <result column="create_time" property="createTime" />
+        <result column="update_time" property="updateTime" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, protocol_no, project_name, lab_code, group_code, outsourcer_id, remark, outsource_no, outsource_name, contacts, mobile, address, require_date, outsource_cost, director, item, requires, create_user_id, create_user_name, approval_status, process_id, create_time, update_time
+    </sql>
+
+    <select id="selectMaxProtocolNo" resultType="java.lang.Long">
+        SELECT IFNULL(max(RIGHT(protocol_no, 3)), 0) from biz_business_outsource_protocol
+    </select>
+
+    <select id="selectBatchForApprovalList" resultMap="BaseResultMap">
+        SELECT *
+        FROM biz_business_outsource_protocol
+        WHERE 1=1
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
+            and approval_status = #{request.approvalStatus}
+        </if>
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
+            and create_user_id = #{request.createUserId}
+        </if>
+        <if test="request != null and request.protocolNo != null and request.protocolNo !=''">
+            and protocol_no like concat('%',#{request.protocolNo},'%')
+        </if>
+        <if test="request != null and request.outsourcerName != null and request.outsourcerName !=''">
+            and outsourcer_name like concat('%',#{request.outsourcerName},'%')
+        </if>
+        <if test="request != null and request.applicantName != null and request.applicantName !=''">
+            and create_user_name like concat('%',#{request.applicantName},'%')
+        </if>
+        <if test="request != null and request.applicantTimeStart != null and request.applicantTimeStart !=''">
+            and create_time &gt;= #{request.applicantTimeStart}
+        </if>
+        <if test="request != null and request.applicantTimeEnd != null and request.applicantTimeEnd !=''">
+            and create_time &lt;= #{request.applicantTimeEnd}
+        </if>
+        <if test="businessKeys != null">
+            and id in
+            <foreach collection="businessKeys" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
+        ORDER BY create_time DESC
+    </select>
+</mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourcerInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourcerInfoMapper.xml
index 510a80b..3049b54 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourcerInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourcerInfoMapper.xml
@@ -7,6 +7,8 @@
         <id column="id" property="id" />
         <result column="outsourcer_no" property="outsourcerNo" />
         <result column="outsourcer_name" property="outsourcerName" />
+        <result column="lab_code" property="labCode" />
+        <result column="group_code" property="groupCode" />
         <result column="outsourcer_brief_name" property="outsourcerBriefName" />
         <result column="outsourcer_size" property="outsourcerSize" />
         <result column="business_size" property="businessSize" />
@@ -55,32 +57,32 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, outsourcer_no, outsourcer_name, outsourcer_brief_name, outsourcer_size, business_size, grade, evaluation, tax_number, bank_account, bank_name, bank_account_number, postal_code, director, phone, fax, mobile, email, website, address_country, address_province, address_city, address_area, full_address, address_country_name, address_province_name, address_city_name, address_area_name, invoice_country, invoice_province, invoice_city, invoice_area, invoice_full_address, invoice_country_name, invoice_province_name, invoice_city_name, invoice_area_name, business_scope, business_content, minio_file_name, approval_status, process_id, remark, create_user_id, create_user_name, create_time, update_time
+        id, outsourcer_no, outsourcer_name, lab_code, group_code, outsourcer_brief_name, outsourcer_size, business_size, grade, evaluation, tax_number, bank_account, bank_name, bank_account_number, postal_code, director, phone, fax, mobile, email, website, address_country, address_province, address_city, address_area, full_address, address_country_name, address_province_name, address_city_name, address_area_name, invoice_country, invoice_province, invoice_city, invoice_area, invoice_full_address, invoice_country_name, invoice_province_name, invoice_city_name, invoice_area_name, business_scope, business_content, minio_file_name, approval_status, process_id, remark, create_user_id, create_user_name, create_time, update_time
     </sql>
 
     <select id="selectBatchForApprovalList" resultMap="BaseResultMap">
         SELECT *
         FROM biz_business_outsourcer_info
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.outsourcerNo != null and request.outsourcerNo !=''">
+        <if test="request != null and request.outsourcerNo != null and request.outsourcerNo !=''">
             and outsourcer_no like concat('%',#{request.outsourcerNo},'%')
         </if>
-        <if test="request.outsourcerName != null and request.outsourcerName !=''">
+        <if test="request != null and request.outsourcerName != null and request.outsourcerName !=''">
             and outsourcer_name like concat('%',#{request.outsourcerName},'%')
         </if>
-        <if test="request.director != null and request.director !=''">
+        <if test="request != null and request.director != null and request.director !=''">
             and director like concat('%',#{request.director},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
@@ -93,6 +95,6 @@
     </select>
 
     <select id="selectMaxNo" resultType="java.lang.Long">
-        SELECT IFNULL(max(RIGHT(outsourcer_no, 12)), 0) from biz_business_outsourcer_info
+        SELECT IFNULL(max(RIGHT(outsourcer_no, 3)), 0) from biz_business_outsourcer_info
     </select>
 </mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessSiteExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessSiteExecutiveInfoMapper.xml
index 135c5d0..3c5ae79 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessSiteExecutiveInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessSiteExecutiveInfoMapper.xml
@@ -38,25 +38,25 @@
         FROM biz_business_site_executive_info bsei
         LEFT JOIN biz_resource_customer_info rci ON bsei.customer_id = rci.id
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and bsei.approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and bsei.create_user_id = #{request.createUserId}
         </if>
-        <if test="request.siteExecutiveNo != null and request.siteExecutiveNo !=''">
+        <if test="request != null and request.siteExecutiveNo != null and request.siteExecutiveNo !=''">
             and bsei.site_executive_no like concat('%',#{request.siteExecutiveNo},'%')
         </if>
-        <if test="request.customerName != null and request.customerName !=''">
+        <if test="request != null and request.customerName != null and request.customerName !=''">
             and rci.outsourcer_name like concat('%',#{request.customerName},'%')
         </if>
-        <if test="request.applyName != null and request.applyName !=''">
+        <if test="request != null and request.applyName != null and request.applyName !=''">
             and bsei.apply_name like concat('%',#{request.applyName},'%')
         </if>
-        <if test="request.applyTimeStart != null and request.applyTimeStart !=''">
+        <if test="request != null and request.applyTimeStart != null and request.applyTimeStart !=''">
             and bsei.apply_time &gt;= #{request.applyTimeStart}
         </if>
-        <if test="request.applyTimeEnd != null and request.applyTimeEnd !=''">
+        <if test="request != null and request.applyTimeEnd != null and request.applyTimeEnd !=''">
             and bsei.apply_time &lt;= #{request.applyTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml
index 84d9e2a..6bd38a9 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml
@@ -105,6 +105,12 @@
         <if test="request.isUrgent != null and request.isUrgent !=''">
             AND bo.is_urgent = #{request.isUrgent}
         </if>
+        <if test="request.ids != null">
+            and blei.id in
+            <foreach collection="request.ids" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
         ORDER BY blei.update_time DESC
     </select>
 
@@ -137,6 +143,12 @@
         <if test="request.isUrgent != null and request.isUrgent !=''">
             AND bo.is_urgent = #{request.isUrgent}
         </if>
+        <if test="request.ids != null">
+            and blei.id in
+            <foreach collection="request.ids" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
         ORDER BY blei.update_time DESC
     </select>
 
diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardInfoMapper.xml
index 1a5551b..2ed8d17 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardInfoMapper.xml
@@ -45,12 +45,6 @@
         FROM biz_equipment_standard_info besi
         LEFT JOIN biz_equipment_standard_technology_relation bestr ON besi.standard_no = bestr.standard_no
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
-            and besi.approval_status = #{request.approvalStatus}
-        </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
-            and besi.create_user_id = #{request.createUserId}
-        </if>
         <if test="request.standardName != null and request.standardName !=''">
             and besi.standard_name like concat('%',#{request.standardName},'%')
         </if>
diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardTechnologyRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardTechnologyRelationMapper.xml
index fc7e16c..cd03c8c 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardTechnologyRelationMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardTechnologyRelationMapper.xml
@@ -6,6 +6,7 @@
     <resultMap id="BaseResultMap" type="com.casic.missiles.model.equipment.BizEquipmentStandardTechnologyRelation">
         <id column="id" property="id" />
         <result column="technology_file_id" property="technologyFileId" />
+        <result column="technology_file_no" property="technologyFileNo" />
         <result column="technology_file_name" property="technologyFileName" />
         <result column="standard_id" property="standardId" />
         <result column="standard_no" property="standardNo" />
@@ -14,7 +15,7 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, technology_file_id, technology_file_name, standard_id, remark
+        id, technology_file_id, technology_file_no, technology_file_name, standard_id, remark
     </sql>
 
 </mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceAuthorizeOrderMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceAuthorizeOrderMapper.xml
index ac5176c..554fe65 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceAuthorizeOrderMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceAuthorizeOrderMapper.xml
@@ -32,22 +32,22 @@
         SELECT *
         FROM biz_resource_authorize_order
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.orderNo != null and request.orderNo !=''">
+        <if test="request != null and request.orderNo != null and request.orderNo !=''">
             and order_no like concat('%',#{request.orderNo},'%')
         </if>
-        <if test="request.createUserName != null and request.createUserName !=''">
+        <if test="request != null and request.createUserName != null and request.createUserName !=''">
             and create_user_name like concat('%',#{request.createUserName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerExamineFormMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerExamineFormMapper.xml
index ab242f6..af7f98f 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerExamineFormMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerExamineFormMapper.xml
@@ -41,28 +41,28 @@
         SELECT *
         FROM biz_resource_customer_examine_form
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.formNo != null and request.formNo !=''">
+        <if test="request != null and request.formNo != null and request.formNo !=''">
             and form_no like concat('%',#{request.formNo},'%')
         </if>
-        <if test="request.labCode != null and request.labCode !=''">
+        <if test="request != null and request.labCode != null and request.labCode !=''">
             and lab_code like concat('%',#{request.labCode},'%')
         </if>
-        <if test="request.groupCode != null and request.groupCode !=''">
+        <if test="request != null and request.groupCode != null and request.groupCode !=''">
             and group_code like concat('%',#{request.groupCode},'%')
         </if>
-        <if test="request.createUserName != null and request.createUserName !=''">
+        <if test="request != null and request.createUserName != null and request.createUserName !=''">
             and create_user_name like concat('%',#{request.createUserName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerInfoMapper.xml
index fa8ffbc..06a2798 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerInfoMapper.xml
@@ -33,25 +33,25 @@
         SELECT *
         FROM biz_resource_customer_info
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.customerNo != null and request.customerNo !=''">
+        <if test="request != null and request.customerNo != null and request.customerNo !=''">
             and customer_no like concat('%',#{request.customerNo},'%')
         </if>
-        <if test="request.customerName != null and request.customerName !=''">
+        <if test="request != null and request.customerName != null and request.customerName !=''">
             and customer_name like concat('%',#{request.customerName},'%')
         </if>
-        <if test="request.contacts != null and request.contacts !=''">
+        <if test="request != null and request.contacts != null and request.contacts !=''">
             and contacts like concat('%',#{request.contacts},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerSuggestFormMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerSuggestFormMapper.xml
index 28f5bb2..1806662 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerSuggestFormMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerSuggestFormMapper.xml
@@ -33,28 +33,28 @@
         SELECT *
         FROM biz_resource_customer_suggest_form
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.formNo != null and request.formNo !=''">
+        <if test="request != null and request.formNo != null and request.formNo !=''">
             and form_no like concat('%',#{request.formNo},'%')
         </if>
-        <if test="request.customerName != null and request.customerName !=''">
+        <if test="request != null and request.customerName != null and request.customerName !=''">
             and customer_name like concat('%',#{request.customerName},'%')
         </if>
-        <if test="request.customerDeptName != null and request.customerDeptName !=''">
+        <if test="request != null and request.customerDeptName != null and request.customerDeptName !=''">
             and customer_dept_name like concat('%',#{request.customerDeptName},'%')
         </if>
-        <if test="request.createUserName != null and request.createUserName !=''">
+        <if test="request != null and request.createUserName != null and request.createUserName !=''">
             and create_user_name like concat('%',#{request.createUserName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSealUseNoteMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSealUseNoteMapper.xml
index ab37bc1..b02bb33 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSealUseNoteMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSealUseNoteMapper.xml
@@ -29,32 +29,32 @@
     </sql>
 
     <select id="selectBatchForApprovalList" resultMap="BaseResultMap">
-        SELECT *
+        SELECT brsun.*, brsi.seal_name, brsi.seal_type, brsi.approver_name
         FROM biz_resource_seal_use_note brsun
         JOIN biz_resource_seal_info brsi ON brsun.seal_id = brsi.id
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and brsun.approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and brsun.create_user_id = #{request.createUserId}
         </if>
-        <if test="request.sealName != null and request.sealName !=''">
+        <if test="request != null and request.sealName != null and request.sealName !=''">
             and brsi.seal_name like concat('%',#{request.sealName},'%')
         </if>
-        <if test="request.sealType != null and request.sealType !=''">
+        <if test="request != null and request.sealType != null and request.sealType !=''">
             and brsi.seal_type = #{request.sealType}
         </if>
-        <if test="request.applyDeptName != null and request.applyDeptName !=''">
+        <if test="request != null and request.applyDeptName != null and request.applyDeptName !=''">
             and brsun.apply_dept_name like concat('%',#{request.applyDeptName},'%')
         </if>
-        <if test="request.applyUserName != null and request.applyUserName !=''">
+        <if test="request != null and request.applyUserName != null and request.applyUserName !=''">
             and brsun.apply_user_name like concat('%',#{request.applyUserName},'%')
         </if>
-        <if test="request.applyTimeStart != null and request.applyTimeStart !=''">
+        <if test="request != null and request.applyTimeStart != null and request.applyTimeStart !=''">
             and brsun.apply_time &gt;= #{request.applyTimeStart}
         </if>
-        <if test="request.applyTimeEnd != null and request.applyTimeEnd !=''">
+        <if test="request != null and request.applyTimeEnd != null and request.applyTimeEnd !=''">
             and brsun.apply_time &lt;= #{request.applyTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml
index 119bf7d..4f8392a 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml
@@ -31,6 +31,12 @@
         <if test="request.deptName != null and request.deptName !=''">
             and brsi.dept_name like concat('%',#{request.deptName},'%')
         </if>
+        <if test="request.ids != null">
+            and brsv.id in
+            <foreach collection="request.ids" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
         ORDER BY brsv.grant_date DESC
     </select>
 
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSupplierInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSupplierInfoMapper.xml
index fe8d399..e8ce7ef 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSupplierInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSupplierInfoMapper.xml
@@ -48,28 +48,28 @@
         SELECT *
         FROM biz_resource_supplier_info
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.supplierNo != null and request.supplierNo !=''">
+        <if test="request != null and request.supplierNo != null and request.supplierNo !=''">
             and supplier_no like concat('%',#{request.supplierNo},'%')
         </if>
-        <if test="request.supplierName != null and request.supplierName !=''">
+        <if test="request != null and request.supplierName != null and request.supplierName !=''">
             and supplier_name like concat('%',#{request.supplierName},'%')
         </if>
-        <if test="request.director != null and request.director !=''">
+        <if test="request != null and request.director != null and request.director !=''">
             and director like concat('%',#{request.director},'%')
         </if>
-        <if test="request.supplierType != null and request.supplierType !=''">
+        <if test="request != null and request.supplierType != null and request.supplierType !=''">
             and supplier_type = #{request.supplierType}
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/EnvLocationInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/EnvLocationInfoMapper.xml
new file mode 100644
index 0000000..68bcf10
--- /dev/null
+++ b/casic-metering-dao/src/main/resources/mapper/resource/EnvLocationInfoMapper.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.mapper.resource.EnvLocationInfoMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.resource.EnvLocationInfo">
+        <id column="id" property="id" />
+        <result column="location_no" property="locationNo" />
+        <result column="location_name" property="locationName" />
+        <result column="location_position" property="locationPosition" />
+        <result column="create_user_id" property="createUserId" />
+        <result column="create_user" property="createUser" />
+        <result column="create_time" property="createTime" />
+        <result column="update_time" property="updateTime" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, location_no, location_name, location_position, create_user_id, create_user, create_time, update_time
+    </sql>
+
+    <select id="selectLocationListPage" resultType="com.casic.missiles.dto.resource.environment.LocationListResponse">
+        SELECT *
+        FROM env_location_info
+        WHERE 1=1
+        <if test="request.locationNo != null and request.locationNo !=''">
+            AND location_no LIKE concat('%',#{request.locationNo},'%')
+        </if>
+        <if test="request.locationName != null and request.locationName !=''">
+            AND location_name LIKE concat('%',#{request.locationName},'%')
+        </if>
+        ORDER BY create_time DESC
+    </select>
+
+</mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml
index b28c18f..8854047 100644
--- a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml
@@ -11,7 +11,6 @@
         <result column="sign_desc" property="signDesc" />
         <result column="sign_director" property="signDirector" />
         <result column="sign_user_id" property="signUserId" />
-        <result column="sign_type" property="signType" />
         <result column="minio_file_name" property="minioFileName" />
         <result column="create_time" property="createTime" />
         <result column="update_time" property="updateTime" />
@@ -28,7 +27,6 @@
         <result column="sign_name" property="signName" />
         <result column="sign_desc" property="signDesc" />
         <result column="sign_director" property="signDirector" />
-        <result column="sign_type" property="signType" />
         <result column="sign_user_id" property="signUserId" />
         <result column="minio_file_name" property="minioFileName" />
         <result column="create_time" property="createTime" />
@@ -62,4 +60,58 @@
         JOIN system_sign_user_relation ssur ON ss.id = ssur.sign_id
         WHERE ssur.user_id = #{userId}
     </select>
+
+    <select id="selectSignListPage" resultMap="BaseResultMap">
+        SELECT ss.*, sd.SIMPLE_NAME AS deptName
+        FROM system_sign ss
+        LEFT JOIN sys_user su ON su.id = ss.sign_user_id
+        LEFT JOIN sys_dept sd ON sd.id = su.dept_id
+        WHERE 1=1
+        <if test="request.signNo != null and request.signNo !=''">
+            AND ss.sign_no LIKE concat('%',#{request.signNo},'%')
+        </if>
+        <if test="request.signName != null and request.signName !=''">
+            AND ss.sign_name LIKE concat('%',#{request.signName},'%')
+        </if>
+        <if test="request.signDirector != null and request.signDirector !=''">
+            AND ss.sign_director LIKE concat('%',#{request.signDirector},'%')
+        </if>
+        <if test="request.signUserId != null and request.signUserId !=''">
+            AND ss.sign_user_id = #{request.signUserId}
+        </if>
+        <if test="request.createStartTime != null and request.createStartTime !=''">
+            AND DATE_FORMAT(ss.create_time,'%Y-%m-%d') &gt;= DATE_FORMAT(#{request.createStartTime},'%Y-%m-%d')
+        </if>
+        <if test="request.createEndTime != null and request.createEndTime !=''">
+            AND DATE_FORMAT(ss.create_time,'%Y-%m-%d')  &lt;= DATE_FORMAT(#{request.createEndTime},'%Y-%m-%d')
+        </if>
+        ORDER BY ss.create_time DESC
+    </select>
+
+    <select id="selectSignList" resultMap="BaseResultMap">
+        SELECT ss.*, sd.SIMPLE_NAME AS deptName
+        FROM system_sign ss
+        LEFT JOIN sys_user su ON su.id = ss.sign_user_id
+        LEFT JOIN sys_dept sd ON sd.id = su.dept_id
+        WHERE 1=1
+        <if test="request.signNo != null and request.signNo !=''">
+            AND ss.sign_no LIKE concat('%',#{request.signNo},'%')
+        </if>
+        <if test="request.signName != null and request.signName !=''">
+            AND ss.sign_name LIKE concat('%',#{request.signName},'%')
+        </if>
+        <if test="request.signDirector != null and request.signDirector !=''">
+            AND ss.sign_director LIKE concat('%',#{request.signDirector},'%')
+        </if>
+        <if test="request.signUserId != null and request.signUserId !=''">
+            AND ss.sign_user_id = #{request.signUserId}
+        </if>
+        <if test="request.createStartTime != null and request.createStartTime !=''">
+            AND DATE_FORMAT(ss.create_time,'%Y-%m-%d') &gt;= DATE_FORMAT(#{request.createStartTime},'%Y-%m-%d')
+        </if>
+        <if test="request.createEndTime != null and request.createEndTime !=''">
+            AND DATE_FORMAT(ss.create_time,'%Y-%m-%d')  &lt;= DATE_FORMAT(#{request.createEndTime},'%Y-%m-%d')
+        </if>
+        ORDER BY ss.create_time DESC
+    </select>
 </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 515050a..60f530b 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
@@ -47,8 +47,8 @@
     String STORAGE_LOCATION = "bizStorageLocation";
     //计量专业
     String MEASURE_MAJOR = "bizMeasureMajor";
-    //管理状态
-    String MANAGER_STATE = "bizManagerState";
+    //标准装置管理状态
+    String STANDARD_MANAGER_STATE = "bizStandardManagerState";
 
     /**
      * 资源管理 字典code
@@ -95,8 +95,6 @@
     String MEASURE_STATUS = "measureStatus";
     //检定方式
     String MEASURE_TYPE = "measureType";
-    //标识打印标志类型
-    String IDENTIFY_PRINT_TYPE = "bizBusinessIdentify";
     //变更类型
     String REPORT_CHANGE_TYPE = "bizCertChangeType";
     //规模类型
@@ -111,19 +109,24 @@
     String MEASURE_CATEGORY = "measureCategory";
     //检定结果
     String MEASURE_RESULT = "measureResult";
+    //分包原因
+    String OUTSOURCE_REASON = "outsourceReason";
+
+    /**
+     * 系统管理
+     */
+    String TEMPLATE_TYPE = "templateType";
+
 
     /**
      * 标准装置 字典code
      */
     //类别
     String STANDARD_CATEGORY = "standardCategory";
-    //管理状态
-    String STANDARD_MANAGER_STATE = "standardManagerState";
     //标准等级
     String STANDARD_LEVEL = "standardLevel";
     //传递范围
     String STANDARD_TRANSMIT_RANGE = "transmitRange";
-
     //资本来源
     String CAPITAL_SOURCE = "capitalSource";
     //标准装置-申请类型
@@ -148,8 +151,6 @@
     String CERTIFICATE_CLASS = "certificationClass";
     //证书管理-检校专业
     String CALIBRATION_MAJOR = "calibrationMajor";
-    //分包原因
-    String OUTSOURCE_REASON = "outsourceReason";
 
     /**
      * 工作台
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/BaseApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/BaseApprovalListRequest.java
index 73c12c1..80d7424 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/BaseApprovalListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/BaseApprovalListRequest.java
@@ -6,6 +6,7 @@
 
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotEmpty;
+import java.util.List;
 
 /**
  * @Description:
@@ -19,14 +20,14 @@
      * 表单id
      */
     @NotBlank(message = "表单id不能为空")
-    @ApiModelProperty(value = "表单id（流程定义对应的表单id，等价于业务id）", dataType = "String")
+    @ApiModelProperty(value = "表单id（流程定义对应的表单id，等价于业务id），导出接口不用传", dataType = "String")
     private String formId;
 
     /**
      * 审批状态类型，对应ApprovalStatusEnum
      */
     @NotEmpty(message = "审批状态类型不能为空")
-    @ApiModelProperty(value = "审批状态类型code", dataType = "String")
+    @ApiModelProperty(value = "审批状态类型code，导出接口不用传", dataType = "String")
     private String approvalStatus;
 
     @ApiModelProperty(hidden = true)
@@ -34,4 +35,7 @@
 
     @ApiModelProperty(hidden = true)
     private Long createUserId;
+
+    @ApiModelProperty(value = "导出ids", dataType = "List")
+    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificatePrintApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificatePrintApprovalListRequest.java
index b93d1c9..3cc2f4e 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificatePrintApprovalListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificatePrintApprovalListRequest.java
@@ -5,8 +5,6 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import java.util.List;
-
 /**
  * @Description:
  * @Author: wangpeng
@@ -38,7 +36,4 @@
 
     @ApiModelProperty(value = "创建结束时间", dataType = "String")
     private String createTimeEnd;
-
-    @ApiModelProperty(value = "导出ids", dataType = "List")
-    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportApprovalListRequest.java
index 4f7a038..c115847 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportApprovalListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportApprovalListRequest.java
@@ -5,8 +5,6 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import java.util.List;
-
 /**
  * @Description:
  * @Author: wangpeng
@@ -15,6 +13,8 @@
 @ApiModel
 @Data
 public class CertificateReportApprovalListRequest extends BaseApprovalListRequest {
+    @ApiModelProperty(value = "委托方id", dataType = "String")
+    private Long customerId;
 
     @ApiModelProperty(value = "证书报告编号", dataType = "String")
     private String certificateReportNo;
@@ -37,6 +37,4 @@
     @ApiModelProperty(value = "检校结束时间", dataType = "String")
     private String calibrationTimeEnd;
 
-    @ApiModelProperty(value = "导出ids", dataType = "List")
-    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/identify/IdentifyListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/identify/IdentifyListRequest.java
index 1b87ae6..f019203 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/identify/IdentifyListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/identify/IdentifyListRequest.java
@@ -4,6 +4,8 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * @Description:
  * @Author: wangpeng
@@ -26,4 +28,7 @@
 
     @ApiModelProperty(value = "打印结束时间", dataType = "String")
     private String createTimeEnd;
+
+    @ApiModelProperty(value = "导出ids", dataType = "List")
+    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListRequest.java
index 1264883..62415fb 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListRequest.java
@@ -7,6 +7,7 @@
 import lombok.Data;
 
 import javax.validation.constraints.NotBlank;
+import java.util.List;
 
 @Data
 @ApiModel
@@ -37,4 +38,6 @@
     @ApiModelProperty(value = "是否加急（1是0否null全部）", dataType = "Integer")
     private String isUrgent;
 
+    @ApiModelProperty(value = "导出ids", dataType = "List")
+    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListRequest.java
index 5201d7b..499760a 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListRequest.java
@@ -17,6 +17,9 @@
     @ApiModelProperty(value = "任务单编号", dataType = "String")
     private String orderNo;
 
+    @ApiModelProperty(value = "委托方id", dataType = "Long")
+    private Long customerId;
+
     @ApiModelProperty(value = "委托方名称", dataType = "String")
     private String customerName;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OrderSampleDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OrderSampleDTO.java
new file mode 100644
index 0000000..796edc0
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OrderSampleDTO.java
@@ -0,0 +1,19 @@
+package com.casic.missiles.dto.business.outsource;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/8/24 11:38
+ */
+@ApiModel
+@Data
+public class OrderSampleDTO {
+    @ApiModelProperty(value = "任务单id", dataType = "Long")
+    private Long orderId;
+    @ApiModelProperty(value = "受检设备id", dataType = "Long")
+    private Long sampleId;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceAssessApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceAssessApprovalListRequest.java
new file mode 100644
index 0000000..9a930c3
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceAssessApprovalListRequest.java
@@ -0,0 +1,30 @@
+package com.casic.missiles.dto.business.outsource;
+
+import com.casic.missiles.dto.BaseApprovalListRequest;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/8/24 11:01
+ */
+@ApiModel
+@Data
+public class OutsourceAssessApprovalListRequest extends BaseApprovalListRequest {
+    @ApiModelProperty(value = "评审表编号", dataType = "String")
+    private String projectNo;
+
+    @ApiModelProperty(value = "分包机构名称", dataType = "String")
+    private String outsourcerName;
+
+    @ApiModelProperty(value = "申请人", dataType = "String")
+    private String applicantName;
+
+    @ApiModelProperty(value = "申请时间开始", dataType = "String")
+    private String applicantTimeStart;
+
+    @ApiModelProperty(value = "申请时间结束", dataType = "String")
+    private String applicantTimeEnd;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceAssessSaveResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceAssessSaveResponse.java
new file mode 100644
index 0000000..8bf9aad
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceAssessSaveResponse.java
@@ -0,0 +1,20 @@
+package com.casic.missiles.dto.business.outsource;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/8/14 16:17
+ */
+@ApiModel
+@Data
+public class OutsourceAssessSaveResponse {
+    @ApiModelProperty(value = "主键id", dataType = "Long")
+    private Long id;
+
+    @ApiModelProperty(value = "编号", dataType = "String")
+    private String projectNo;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProtocolApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProtocolApprovalListRequest.java
new file mode 100644
index 0000000..0f32331
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProtocolApprovalListRequest.java
@@ -0,0 +1,30 @@
+package com.casic.missiles.dto.business.outsource;
+
+import com.casic.missiles.dto.BaseApprovalListRequest;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/8/24 15:01
+ */
+@ApiModel
+@Data
+public class OutsourceProtocolApprovalListRequest extends BaseApprovalListRequest {
+    @ApiModelProperty(value = "协议书编号", dataType = "String")
+    private String protocolNo;
+
+    @ApiModelProperty(value = "分包方名称", dataType = "String")
+    private String outsourcerName;
+
+    @ApiModelProperty(value = "申请人", dataType = "String")
+    private String applicantName;
+
+    @ApiModelProperty(value = "申请时间开始", dataType = "String")
+    private String applicantTimeStart;
+
+    @ApiModelProperty(value = "申请时间结束", dataType = "String")
+    private String applicantTimeEnd;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProtocolSaveResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProtocolSaveResponse.java
new file mode 100644
index 0000000..e324967
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProtocolSaveResponse.java
@@ -0,0 +1,20 @@
+package com.casic.missiles.dto.business.outsource;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/8/14 16:17
+ */
+@ApiModel
+@Data
+public class OutsourceProtocolSaveResponse {
+    @ApiModelProperty(value = "主键id", dataType = "Long")
+    private Long id;
+
+    @ApiModelProperty(value = "编号", dataType = "String")
+    private String protocolNo;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveApprovalListRequest.java
index f29f4e4..7047c28 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveApprovalListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveApprovalListRequest.java
@@ -5,8 +5,6 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import java.util.List;
-
 /**
  * @Description: 现场检测审批列表请求实体
  * @Author: wangpeng
@@ -30,7 +28,4 @@
     @ApiModelProperty(value = "申请时间结束", dataType = "String")
     private String applyTimeEnd;
 
-    @ApiModelProperty(value = "导出ids", dataType = "List")
-    private List<Long> ids;
-
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveDetailResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveDetailResponse.java
index 1f28752..394c934 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveDetailResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveDetailResponse.java
@@ -12,6 +12,18 @@
     @ApiModelProperty(value = "id，更新/删除使用参数", dataType = "Long")
     private Long id;
 
+    @ApiModelProperty(value = "实验室代码(字典code)", dataType = "String")
+    private String labCode;
+
+    @ApiModelProperty(value = "实验室代码(字典value)", dataType = "String")
+    private String labCodeName;
+
+    @ApiModelProperty(value = "组别代码(字典code)", dataType = "String")
+    private String groupCode;
+
+    @ApiModelProperty(value = "组别代码(字典value)", dataType = "String")
+    private String groupCodeName;
+
     @ApiModelProperty(value = "审批编号", dataType = "String")
     private String siteExecutiveNo;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/environment/LocationListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/environment/LocationListRequest.java
new file mode 100644
index 0000000..13d03c3
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/environment/LocationListRequest.java
@@ -0,0 +1,20 @@
+package com.casic.missiles.dto.resource.environment;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/6/8 13:56
+ */
+@ApiModel
+@Data
+public class LocationListRequest {
+    @ApiModelProperty(value = "地点编号", dataType = "String")
+    private String locationNo;
+
+    @ApiModelProperty(value = "地点名称", dataType = "String")
+    private String locationName;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/environment/LocationListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/environment/LocationListResponse.java
new file mode 100644
index 0000000..4c531af
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/environment/LocationListResponse.java
@@ -0,0 +1,78 @@
+package com.casic.missiles.dto.resource.environment;
+
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
+import com.baomidou.mybatisplus.annotation.TableField;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description: 地点列表响应实体
+ * @Author: wangpeng
+ * @Date: 2023/6/8 13:53
+ */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
+@ApiModel
+@Data
+public class LocationListResponse {
+    @ApiModelProperty(value = "主键id", dataType = "Long")
+    private Long id;
+
+    /**
+     * 地点编号
+     */
+    @ExcelProperty("地点编号")
+    @ApiModelProperty(value = "地点编号", dataType = "String")
+    private String locationNo;
+
+    /**
+     * 地点名称
+     */
+    @ExcelProperty("地点名称")
+    @ApiModelProperty(value = "地点名称", dataType = "String")
+    private String locationName;
+
+    /**
+     * 地点位置
+     */
+    @ExcelProperty("地点位置")
+    @ApiModelProperty(value = "地点位置", dataType = "String")
+    private String locationPosition;
+
+    /**
+     * 创建人id
+     */
+    @ApiModelProperty(value = "创建人id", dataType = "Long")
+    private Long createUserId;
+
+    /**
+     * 创建人
+     */
+    @ExcelProperty("创建人")
+    @ApiModelProperty(value = "创建人", dataType = "String")
+    @TableField("create_user")
+    private String createUser;
+
+    /**
+     * 创建时间
+     */
+    @ExcelProperty("创建时间")
+    @ApiModelProperty(value = "创建时间", dataType = "String")
+    private String createTime;
+
+    /**
+     * 更新时间
+     */
+    @ApiModelProperty(value = "更新时间", dataType = "String")
+    private String updateTime;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertRequest.java
index 9a7f6c6..c827915 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertRequest.java
@@ -4,6 +4,8 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * @Description:
  * @Author: wangpeng
@@ -16,4 +18,7 @@
     private String name;
     @ApiModelProperty(value = "部门名", dataType = "String")
     private String deptName;
+
+    @ApiModelProperty(value = "导出ids", dataType = "List")
+    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertResponse.java
index f78b159..8f2f79e 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertResponse.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.dto.resource.staff;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.casic.missiles.annotation.DictCodeField;
 import com.casic.missiles.constants.MeterDictCode;
 import io.swagger.annotations.ApiModel;
@@ -13,12 +20,18 @@
  * @Author: wangpeng
  * @Date: 2023/7/27 15:13
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @ApiModel
 @Data
 public class StaffCertResponse {
     /**
      * 人员编号
      */
+    @ExcelProperty(value = "人员编号",order = 0)
     @NotEmpty(message = "人员编号不能为空")
     @ApiModelProperty(value = "人员编号", dataType = "String")
     private String staffNo;
@@ -26,6 +39,7 @@
     /**
      * 姓名
      */
+    @ExcelProperty(value = "姓名",order = 1)
     @ApiModelProperty(value = "姓名", dataType = "String")
     private String staffName;
 
@@ -54,6 +68,7 @@
     /**
      * 部门名字
      */
+    @ExcelProperty(value = "工作部门",order = 2)
     @ApiModelProperty(value = "部门名字", dataType = "String")
     private String deptName;
 
@@ -66,6 +81,7 @@
     /**
      * 计量专业
      */
+    @ExcelProperty(value = "计量专业",order = 3)
     @ApiModelProperty(value = "计量专业", dataType = "String")
     private String major;
 
@@ -110,6 +126,7 @@
     /**
      * 证书号
      */
+    @ExcelProperty(value = "证号",order = 4)
     @ApiModelProperty(value = "证书号", dataType = "String")
     private String certNo;
 
@@ -122,12 +139,14 @@
     /**
      * 有效日期
      */
+    @ExcelProperty(value = "证书有效期",order = 6)
     @ApiModelProperty(value = "有效日期", dataType = "String")
     private String effectiveDate;
 
     /**
      * 发放日期
      */
+    @ExcelProperty(value = "发证日期",order = 5)
     @ApiModelProperty(value = "发放日期", dataType = "String")
     private String grantDate;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffListRequest.java
index 7c4afb3..0a1194a 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffListRequest.java
@@ -4,6 +4,8 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * @Description:
  * @Author: wangpeng
@@ -18,4 +20,7 @@
     private String deptName;
     @ApiModelProperty(value = "部门id", dataType = "Long")
     private Long deptId;
+
+    @ApiModelProperty(value = "导出ids", dataType = "List")
+    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/TrainListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/TrainListRequest.java
index f68597b..6321f8b 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/TrainListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/TrainListRequest.java
@@ -14,6 +14,8 @@
 public class TrainListRequest {
     @ApiModelProperty(value = "训练登记表编号", dataType = "String")
     private String trainNo;
+    @ApiModelProperty(value = "值班领导", dataType = "String")
+    private String dutyLeader;
     @ApiModelProperty(value = "创建开始时间", dataType = "String")
     private String createTimeStart;
     @ApiModelProperty(value = "创建结束时间", dataType = "String")
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/SignAddRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/SignAddRequest.java
index 117be34..d71055c 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/SignAddRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/SignAddRequest.java
@@ -43,13 +43,6 @@
     private Long signUserId;
 
     /**
-     * 签章或签名-字典code
-     */
-    @NotBlank(message = "类型不能为空")
-    @ApiModelProperty(value = "签名/签章-字典code", dataType = "String", required = true)
-    private String signType;
-
-    /**
      * minio存储文件名
      */
     @ApiModelProperty(value = "上传文件返回名称", dataType = "String")

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java
index bb0c50f..13a699b 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java
@@ -12,6 +12,7 @@
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.IGeneralApprovalService;
+import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
@@ -19,6 +20,7 @@
 import org.springframework.web.bind.annotation.RequestBody;
 
 import javax.validation.Valid;
+import java.util.List;
 import java.util.Objects;
 
 /**
@@ -117,4 +119,17 @@
         }
         return baseApprovalService.failUpdate(request);
     }
+
+    public List<O> exportList(@RequestBody @Valid R request) throws Exception {
+        List<O> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = baseApprovalService.listExportByIds(request.getIds());
+        } else {
+            list = baseApprovalService.listExport(request);
+        }
+        for (O record : list) {
+            DictCodeUtils.convertDictCodeToName(record);
+        }
+        return list;
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java
index 8a90961..d775831 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java
@@ -5,6 +5,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.business.certificate.CertificateChangeApplyApprovalListRequest;
 import com.casic.missiles.dto.business.certificate.CertificateChangeApplySaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessCertificateChangeApply;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
@@ -20,6 +21,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -48,4 +50,12 @@
         }
         return changeApplyService.saveChangeApply(request);
     }
+
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody CertificateChangeApplyApprovalListRequest request) throws Exception {
+        List<BizBusinessCertificateChangeApply> list = super.exportList(request);
+        super.exportExcel(BizBusinessCertificateChangeApply.class, list, ExportEnum.CERTIFICATE_CHANGE_APPLY.getSheetName());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java
index 5fc4b07..af8230e 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java
@@ -9,6 +9,7 @@
 import com.casic.missiles.dto.business.certificate.CertificatePrintApprovalListRequest;
 import com.casic.missiles.dto.business.certificate.CertificatePrintListResponse;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.enums.business.CertificatePrintStatusEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessCertificatePrintLog;
@@ -18,10 +19,16 @@
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.io.IOException;
+import java.util.List;
 import java.util.Objects;
 
 /**
@@ -98,4 +105,16 @@
         });
         return certificatePrintService.certificatePrintLog(idDTO.getId());
     }
+
+    @ApiOperation("证书打印审批导出")
+    @PostMapping("/listExport")
+    public void exportList(@RequestBody CertificatePrintApprovalListRequest request) throws IOException {
+        List<CertificatePrintListResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = certificatePrintService.listByIds(request.getIds());
+        } else {
+            list = certificatePrintService.list(request);
+        }
+        super.exportExcel(CertificatePrintListResponse.class, list, ExportEnum.CERTIFICATE_PRINT.getSheetName());
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java
index 63b06dc..6b2efd5 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java
@@ -6,6 +6,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.business.certificate.CertificateReportApprovalListRequest;
 import com.casic.missiles.dto.business.certificate.CertificateReportSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessCertificateReport;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
@@ -21,6 +22,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -50,7 +52,7 @@
         return certificateReportService.saveCertificateReport(request);
     }
 
-    @ApiOperation("证书审批详情（基本信息）")
+    @ApiOperation("详情（基本信息）")
     @PostMapping("/detail")
     public ReturnDTO<BizBusinessCertificateReport> detail(@RequestBody @Valid BaseDetailRequest request, BindingResult bindingResult) throws Exception {
         if(bindingResult.hasErrors()){
@@ -59,4 +61,11 @@
         return certificateReportService.detail(request);
     }
 
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody CertificateReportApprovalListRequest request) throws Exception {
+        List<BizBusinessCertificateReport> list = super.exportList(request);
+        super.exportExcel(BizBusinessCertificateReport.class, list, ExportEnum.CERTIFICATE_REPORT.getSheetName());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java
index 46b26bd..57c0809 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java
@@ -10,20 +10,21 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.business.identify.IdentifyListRequest;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessIdentifyInfo;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.business.IBizBusinessIdentifyInfoService;
+import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import javax.validation.Valid;
+import java.util.List;
 import java.util.Objects;
 
 /**
@@ -57,16 +58,13 @@
         return identifyInfoService.addIdentify(identifyInfo);
     }
 
-    @ApiOperation("标识打印更新")
+    @ApiOperation("标识打印更新（更新打印时间）")
     @PostMapping("/update")
-    public ReturnDTO updateIdentify(@RequestBody @Valid BizBusinessIdentifyInfo identifyInfo, BindingResult bindingResult) {
-        Assert.isFalse(Objects.isNull(identifyInfo.getId()), () -> {
+    public ReturnDTO updateIdentify(@RequestBody @Valid IdDTO idDTO) {
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        Assert.isFalse(bindingResult.hasErrors(), () -> {
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        });
-        return identifyInfoService.updateIdentify(identifyInfo);
+        return identifyInfoService.updateIdentify(idDTO.getId());
     }
 
     @ApiOperation("标识打印删除")
@@ -77,4 +75,37 @@
         });
         return identifyInfoService.deleteIdentify(idDTO.getId());
     }
+
+    @ApiOperation("标识打印导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody @Valid IdentifyListRequest request, BindingResult bindingResult) throws Exception {
+        if (bindingResult.hasErrors()) {
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        List<BizBusinessIdentifyInfo> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = identifyInfoService.listByIds(request.getIds());
+        } else {
+            list = identifyInfoService.list(request);
+        }
+        for (BizBusinessIdentifyInfo record : list) {
+            DictCodeUtils.convertDictCodeToName(record);
+        }
+        super.exportExcel(BizBusinessIdentifyInfo.class, list, ExportEnum.IDENTIFY_EXPORT.getSheetName());
+    }
+
+
+    // TODO: 2023/8/23 查询设备信息，4个底部按钮查设备（按钮的作用就是前端用来调不同接口、用来区分中间即将展示的标识），前端弹窗选设备，在确定保存时前端根据底部按钮判断传入设备类型deviceType字典code
+    // TODO: 2023/8/23 接口：查受检设备（第1个按钮），查设备台账（后3个按钮同一接口），查询之后前端根据标志类型的不同加到中间页面时进行判断（按产品给的对应表）
+    // TODO: 2023/8/23 提供二维码接口，前端在加到中间页面时调用一下
+
+    @ApiOperation("设备二维码")
+    @PostMapping("/equipment/qrCode")
+    public ReturnDTO<String> equipmentQrCode(@RequestBody @Valid IdDTO idDTO) {
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return identifyInfoService.equipmentQrCode(idDTO.getId());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java
index 707be6e..7e0453d 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java
@@ -117,7 +117,7 @@
     }
 
     @ApiOperation("任务单导出")
-    @PostMapping("/export")
+    @PostMapping("/listExport")
     public void orderExport(@RequestBody @Valid OrderListRequest request, HttpServletResponse response) {
         businessOrderService.orderExport(request, response);
     }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java
index 529a6ce..51432be 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java
@@ -1,9 +1,28 @@
 package com.casic.missiles.controller.business;
 
+import com.casic.missiles.controller.GeneralApprovalController;
+import com.casic.missiles.dto.BaseApprovalSubmitRequest;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.business.outsource.OutsourceAssessApprovalListRequest;
+import com.casic.missiles.dto.business.outsource.OutsourceAssessSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
+import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.model.business.BizBusinessOutsourceAssess;
+import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
+import com.casic.missiles.service.IGeneralApprovalService;
+import com.casic.missiles.service.business.IBizBusinessOutsourceAssessService;
 import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.BindingResult;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.validation.Valid;
+import java.util.List;
+
 /**
  * <p>
  * 计量检定业务-分包管理-测试、校准或检定工作分包评审表 前端控制器
@@ -15,6 +34,27 @@
 @Api(tags = "分包管理-测试、校准或检定工作分包评审表")
 @RestController
 @RequestMapping("/business/outsource/assess")
-public class BizBusinessOutsourceAssessController {
+public class BizBusinessOutsourceAssessController extends GeneralApprovalController<BizBusinessOutsourceAssess, BizBusinessOutsourceAssess, OutsourceAssessApprovalListRequest, BaseApprovalSubmitRequest> {
+    @Autowired
+    private IBizBusinessOutsourceAssessService outsourceAssessService;
 
+    public BizBusinessOutsourceAssessController(IGeneralApprovalService<BizBusinessOutsourceAssess, BizBusinessOutsourceAssess, OutsourceAssessApprovalListRequest, BaseApprovalSubmitRequest> baseApprovalService) {
+        super(baseApprovalService);
+    }
+
+    @ApiOperation("草稿箱-保存")
+    @PostMapping("/save")
+    public ReturnDTO<OutsourceAssessSaveResponse> saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceAssess request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        return outsourceAssessService.saveOutsourceAssess(request);
+    }
+
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception {
+        List<BizBusinessOutsourceAssess> list = super.exportList(request);
+        super.exportExcel(BizBusinessOutsourceAssess.class, list, ExportEnum.OUTSOURCE_ASSESS.getSheetName());
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java
new file mode 100644
index 0000000..9adef18
--- /dev/null
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java
@@ -0,0 +1,60 @@
+package com.casic.missiles.controller.business;
+
+import com.casic.missiles.controller.GeneralApprovalController;
+import com.casic.missiles.dto.BaseApprovalSubmitRequest;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.business.outsource.OutsourceProtocolApprovalListRequest;
+import com.casic.missiles.dto.business.outsource.OutsourceProtocolSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
+import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.model.business.BizBusinessOutsourceProtocol;
+import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
+import com.casic.missiles.service.IGeneralApprovalService;
+import com.casic.missiles.service.business.IBizBusinessOutsourceProtocolService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.BindingResult;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.validation.Valid;
+import java.util.List;
+
+/**
+ * <p>
+ * 计量检定业务-分包管理-测试、校准或检定工作分包协议书 前端控制器
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-08-24
+ */
+@Api(tags = "分包管理-测试、校准或检定工作分包协议书")
+@RestController
+@RequestMapping("/business/outsource/protocol")
+public class BizBusinessOutsourceProtocolController extends GeneralApprovalController<BizBusinessOutsourceProtocol, BizBusinessOutsourceProtocol, OutsourceProtocolApprovalListRequest, BaseApprovalSubmitRequest> {
+    @Autowired
+    private IBizBusinessOutsourceProtocolService outsourceProtocolService;
+
+    public BizBusinessOutsourceProtocolController(IGeneralApprovalService<BizBusinessOutsourceProtocol, BizBusinessOutsourceProtocol, OutsourceProtocolApprovalListRequest, BaseApprovalSubmitRequest> baseApprovalService) {
+        super(baseApprovalService);
+    }
+
+    @ApiOperation("草稿箱-保存")
+    @PostMapping("/save")
+    public ReturnDTO<OutsourceProtocolSaveResponse> saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceProtocol request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        return outsourceProtocolService.saveOutsourceProtocol(request);
+    }
+
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody OutsourceProtocolApprovalListRequest request) throws Exception {
+        List<BizBusinessOutsourceProtocol> list = super.exportList(request);
+        super.exportExcel(BizBusinessOutsourceProtocol.class, list, ExportEnum.OUTSOURCE_PROTOCOL.getSheetName());
+    }
+}
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java
index 097f645..f0f0943 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java
@@ -17,7 +17,6 @@
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.IGeneralApprovalService;
 import com.casic.missiles.service.business.IBizBusinessOutsourcerInfoService;
-import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -71,19 +70,8 @@
 
     @ApiOperation("分包方导出")
     @PostMapping("/listExport")
-    public void export(@RequestBody @Valid OutsourcerInfoApprovalListRequest request, BindingResult bindingResult) throws Exception {
-        if (bindingResult.hasErrors()) {
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        }
-        List<BizBusinessOutsourcerInfo> list;
-        if (!CollectionUtils.isEmpty(request.getIds())) {
-            list = outsourcerInfoService.listByIds(request.getIds());
-        } else {
-            list = outsourcerInfoService.list(request);
-        }
-        for (BizBusinessOutsourcerInfo record : list) {
-            DictCodeUtils.convertDictCodeToName(record);
-        }
+    public void export(@RequestBody OutsourcerInfoApprovalListRequest request) throws Exception {
+        List<BizBusinessOutsourcerInfo> list = super.exportList(request);
         super.exportExcel(BizBusinessOutsourcerInfo.class, list, ExportEnum.OUTSOURCER_EXPORT.getSheetName());
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java
index c2cbf9f..0410918 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java
@@ -17,11 +17,9 @@
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.IGeneralApprovalService;
 import com.casic.missiles.service.business.IBizBusinessSiteExecutiveInfoService;
-import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -60,7 +58,7 @@
         return siteExecutiveInfoService.saveSiteExecutiveInfo(siteExecutiveInfo);
     }
 
-    @ApiOperation("现场检测详情")
+    @ApiOperation("详情")
     @PostMapping("/detail")
     public ReturnDTO<SiteExecutiveDetailResponse> siteExecutiveDetail(@RequestBody @Valid IdDTO idDTO) throws Exception {
         Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
@@ -69,21 +67,10 @@
         return ReturnUtil.success(siteExecutiveInfoService.detail(idDTO.getId()));
     }
 
-    @ApiOperation("现场检测导出")
+    @ApiOperation("导出")
     @PostMapping("/listExport")
-    public void export(@RequestBody @Valid SiteExecutiveApprovalListRequest request, BindingResult bindingResult) throws Exception {
-        if (bindingResult.hasErrors()) {
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        }
-        List<SiteExecutiveApprovalListResponse> list;
-        if (!CollectionUtils.isEmpty(request.getIds())) {
-            list = siteExecutiveInfoService.listInfoByIds(request.getIds());
-        } else {
-            list = siteExecutiveInfoService.listInfo(request);
-        }
-        for (SiteExecutiveApprovalListResponse record : list) {
-            DictCodeUtils.convertDictCodeToName(record);
-        }
+    public void export(@RequestBody SiteExecutiveApprovalListRequest request) throws Exception {
+        List<SiteExecutiveApprovalListResponse> list = super.exportList(request);
         super.exportExcel(SiteExecutiveApprovalListResponse.class, list, ExportEnum.SITE_EXECUTIVE_EXPORT.getSheetName());
     }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
index 7e793cd..a92e209 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
@@ -55,7 +55,7 @@
 
     @ApiOperation("设备收发列表导出")
     @PostMapping("/export")
-    public void exportList(@RequestBody @Valid SampleDispatchListRequest request) throws IOException {
+    public void exportList(@RequestBody SampleDispatchListRequest request) throws IOException {
         List<SampleDispatchListResponse> list;
         if (!CollectionUtils.isEmpty(request.getIds())) {
             list = dispatchService.listByIds(request.getIds());
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java
index cdc77fc..d120fd4 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java
@@ -7,6 +7,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.business.labExecutive.*;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.business.IBusinessLabExecutiveInfoService;
@@ -14,6 +15,7 @@
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.*;
 
@@ -32,7 +34,7 @@
     @Autowired
     private IBusinessLabExecutiveInfoService labExecutiveInfoService;
 
-    @ApiOperation("实验室检测-部门检测-查询各状态列表（待检测、检测中、检测完）")
+    @ApiOperation("实验室任务-查询各状态列表（待检测、检测中、检测完）")
     @PostMapping("/deptExecutive/List")
     public ReturnDTO<PageInfoBT<SampleLabExecutiveListResponse>> queryDeptExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
@@ -43,10 +45,19 @@
         return ReturnUtil.success(super.packForBT(labExecutiveInfoService.deptLabExecutiveListPage(page, labExecutiveListRequest)));
     }
 
-    /**
-     * 实验室检测-我的检测-查询各状态列表（待检测、检测中、检测完）
-     */
-    @ApiOperation("实验室检测-我的检测-查询各状态列表（待检测、检测中、检测完）")
+    @ApiOperation("实验室任务导出")
+    @PostMapping("/deptExecutive/export")
+    public void deptExportList(@RequestBody @Valid SampleLabExecutiveListRequest request) throws Exception {
+        List<SampleLabExecutiveListResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = labExecutiveInfoService.deptLabExecutiveListByIds(request.getMeasureStatus(), request.getIds());
+        } else {
+            list = labExecutiveInfoService.deptLabExecutiveList(request);
+        }
+        super.exportExcel(SampleLabExecutiveListResponse.class, list, ExportEnum.DEPT_EXECUTIVE_TASK.getSheetName());
+    }
+
+    @ApiOperation("我的任务-查询各状态列表（待检测、检测中、检测完）")
     @PostMapping("/myExecutive/list")
     public ReturnDTO<PageInfoBT<SampleLabExecutiveListResponse>> queryMyExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
@@ -57,19 +68,25 @@
         return ReturnUtil.success(super.packForBT(labExecutiveInfoService.myLabExecutiveListPage(page, labExecutiveListRequest)));
     }
 
-    /**
-     * 实验室检测-我的检测-查询各状态样品数量（待检测、检测中、检测完）
-     */
-    @ApiOperation("实验室检测-我的检测-查询各状态样品数量（待检测、检测中、检测完）")
+    @ApiOperation("我的任务导出")
+    @PostMapping("/myExecutive/export")
+    public void exportList(@RequestBody @Valid SampleLabExecutiveListRequest request) throws Exception {
+        List<SampleLabExecutiveListResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = labExecutiveInfoService.myLabExecutiveListByIds(request.getMeasureStatus(), request.getIds());
+        } else {
+            list = labExecutiveInfoService.myLabExecutiveList(request);
+        }
+        super.exportExcel(SampleLabExecutiveListResponse.class, list, ExportEnum.MY_EXECUTIVE_TASK.getSheetName());
+    }
+
+    @ApiOperation("我的任务-查询各状态样品数量（待检测、检测中、检测完）")
     @GetMapping("/myExecutive/amount")
     public ReturnDTO<List<SampleAmountResponse>> queryMyExecutiveAmount() {
         return ReturnUtil.success(labExecutiveInfoService.myExecutiveAmount());
     }
 
-    /**
-     * 实验室检测-部门检测-分配（分配给具体人员）
-     */
-    @ApiOperation("实验室检测-部门检测-分配按钮（分配给具体人员）")
+    @ApiOperation("实验室任务-分配按钮（分配给具体人员）")
     @PostMapping("/deptExecutive/allocate")
     public ReturnDTO allocateStaff(@RequestBody @Valid SampleAllocateRequest sampleAllocateRequest, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -78,10 +95,7 @@
         return labExecutiveInfoService.allocateStaff(sampleAllocateRequest);
     }
 
-    /**
-     * 实验室检测-我的检测-检定人扫描收入（待检测->检测中）
-     */
-    @ApiOperation("实验室检测-我的检测-检定人扫描收入（待检测->检测中）")
+    @ApiOperation("我的任务-检定人扫描收入（待检测->检测中）")
     @PostMapping("/myExecutive/receive")
     public ReturnDTO sampleReceive(@RequestBody @Valid List<SampleOperateRequest> requestList, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -90,10 +104,7 @@
         return labExecutiveInfoService.sampleReceive(requestList);
     }
 
-    /**
-     * 实验室检测-负责人/检定人扫描检完（检测中->检测完）
-     */
-    @ApiOperation("实验室检测-负责人/检定人扫描检完（检测中->检测完）")
+    @ApiOperation("实验室任务-负责人/检定人扫描检完（检测中->检测完）")
     @PostMapping("/myExecutive/complete")
     public ReturnDTO sampleExecutiveComplete(@RequestBody @Valid List<SampleOperateRequest> requestList, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -102,10 +113,7 @@
         return labExecutiveInfoService.sampleExecutiveComplete(requestList);
     }
 
-    /**
-     * 实验室检测-部门检测/我的检测 编辑（只能修改应出具证书）
-     */
-    @ApiOperation("实验室检测-部门检测/我的检测 编辑（只能修改应出具证书）")
+    @ApiOperation("实验室任务/我的任务 编辑（只能修改应出具证书）")
     @PostMapping("/executive/update")
     public ReturnDTO updateExecutive(@RequestBody @Valid UpdateExecutiveRequest request, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -114,10 +122,7 @@
         return labExecutiveInfoService.updateExecutive(request);
     }
 
-    /**
-     * 实验室检测-部门检测/我的检测 详情
-     */
-    @ApiOperation("实验室检测-部门检测/我的检测 详情")
+    @ApiOperation("实验室任务/我的任务 详情")
     @PostMapping("/executive/detail")
     public ReturnDTO<ExecutiveDetailResponse> executiveDetail(@RequestBody @Valid ExecutiveDetailRequest request, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
@@ -131,7 +136,7 @@
      * 退回后会将下一个要执行的实验室检测状态更新为待分配，将后面的实验室顺序变更为连续（都进行减1）
      * 最后一个检测的实验室退回，等分发员再增加实验室或设备收发中的已收入直接手动点击完成
      */
-    @ApiOperation("实验室检测-部门检测/我的检测 退回（待检测/检测中->退回）")
+    @ApiOperation("实验室任务/我的任务 退回（待检测/检测中->退回）")
     @PostMapping("/executive/sendBack")
     public ReturnDTO executiveSendBack(@RequestBody @Valid ExecutiveSendBackRequest request, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -140,9 +145,6 @@
         return labExecutiveInfoService.sampleExecutiveSendBack(request);
     }
 
-    /**
-     * 分发员编辑实验室检测列表
-     */
     @ApiOperation("分发员编辑实验室检测列表")
     @PostMapping("/handOut/updateList")
     public ReturnDTO updateExecutiveList(@RequestBody @Valid UpdateExecutiveListRequest request, BindingResult bindingResult) {
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java
index 48a67ed..0c04f31 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java
@@ -10,6 +10,7 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.resource.customer.CustomerApprovalListRequest;
 import com.casic.missiles.dto.resource.customer.CustomerSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceCustomerInfo;
@@ -26,6 +27,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -55,6 +57,13 @@
         return customerInfoService.saveCustomerInfo(request);
     }
 
+    @ApiOperation("委托方名录导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody CustomerApprovalListRequest request) throws Exception {
+        List<BizResourceCustomerInfo> list = super.exportList(request);
+        super.exportExcel(BizResourceCustomerInfo.class, list, ExportEnum.CUSTOMER_INFO.getSheetName());
+    }
+
     @ApiOperation("委托方人员列表（分页）")
     @PostMapping("/person/listPage")
     public ReturnDTO<PageInfoBT<BizResourceCustomerStaff>> personListPage(@RequestBody IdDTO idDto) {
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
index 972ed4b..6418ea5 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
@@ -5,6 +5,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.resource.customer.SuggestFormApprovalListRequest;
 import com.casic.missiles.dto.resource.customer.SuggestFormSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceCustomerSuggestForm;
@@ -20,6 +21,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -50,4 +52,11 @@
         return suggestFormService.saveSuggestForm(request);
     }
 
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody SuggestFormApprovalListRequest request) throws Exception {
+        List<BizResourceCustomerSuggestForm> list = super.exportList(request);
+        super.exportExcel(BizResourceCustomerSuggestForm.class, list, ExportEnum.CUSTOMER_SUGGEST_FORM.getSheetName());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java
index 1934d1a..9e07eab 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java
@@ -15,12 +15,16 @@
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.resource.IEnvEnvironmentRecordConfigService;
 import com.casic.missiles.service.resource.IEnvEnvironmentRecordDataService;
+import com.casic.missiles.service.resource.IEnvLocationInfoService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
 import java.util.List;
@@ -39,6 +43,8 @@
     private IEnvEnvironmentRecordDataService environmentRecordDataService;
     @Autowired
     private IEnvEnvironmentRecordConfigService environmentRecordConfigService;
+    @Autowired
+    private IEnvLocationInfoService locationInfoService;
 
     @ApiOperation("环境记录单数据列表/详情")
     @PostMapping("/data/listPage")
@@ -95,4 +101,11 @@
         });
         return environmentRecordConfigService.deleteEnvironmentRecordConfig(idDTO.getId());
     }
+
+    @ApiOperation("地点列表")
+    @PostMapping("/location/listPage")
+    public ReturnDTO<PageInfoBT<LocationListResponse>> locationListPage(@RequestBody @Valid LocationListRequest request) {
+        Page<LocationListResponse> page = PageFactory.defaultPage();
+        return ReturnUtil.success(super.packForBT(locationInfoService.listPage(page, request)));
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java
index 82efe3f..e9561fa 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java
@@ -10,6 +10,7 @@
 import com.casic.missiles.dto.resource.seal.SealLogListRequest;
 import com.casic.missiles.dto.resource.seal.SealNoteApprovalListRequest;
 import com.casic.missiles.dto.resource.seal.SealNoteSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceSealUseLog;
@@ -27,6 +28,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -58,6 +60,13 @@
         return sealUseNoteService.saveSeal(request);
     }
 
+    @ApiOperation("印章使用登记导出（列表和导出中去掉经办人和监印人）")
+    @PostMapping("/listExport")
+    public void export(@RequestBody SealNoteApprovalListRequest request) throws Exception {
+        List<BizResourceSealUseNote> list = super.exportList(request);
+        super.exportExcel(BizResourceSealUseNote.class, list, ExportEnum.SEAL_NOTE.getSheetName());
+    }
+
     // TODO: 2023/7/28 印章使用日志：系统中使用印章时插入数据库
 
     @ApiOperation("印章使用日志列表（分页）")
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java
index 9b674fc..06b6521 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java
@@ -9,16 +9,20 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.resource.staff.StaffCertRequest;
 import com.casic.missiles.dto.resource.staff.StaffCertResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.service.resource.IBizResourceStaffInfoService;
 import com.casic.missiles.service.resource.IBizResourceStaffVerifierService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.List;
+
 /**
  * @Description:
  * @Author: wangpeng
@@ -41,9 +45,21 @@
         return ReturnUtil.success(super.packForBT(responsePage));
     }
 
+    @ApiOperation("证书逾期提醒导出")
+    @PostMapping("/listExport")
+    public void exportList(@RequestBody StaffCertRequest request) throws Exception {
+        List<StaffCertResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = staffInfoService.certListByIds(request.getIds());
+        } else {
+            list = staffInfoService.certList(request);
+        }
+        super.exportExcel(StaffCertResponse.class, list, ExportEnum.STAFF_CERTIFICATE_EXPIRE.getSheetName());
+    }
+
     @ApiOperation("证书逾期提醒")
     @PostMapping("/expirationReminder")
-    public ReturnDTO expirationReminder(@RequestBody IdDTO idDto) {
-        return verifierService.expirationReminder(idDto);
+    public ReturnDTO expirationReminder(@RequestBody IdDTO idDTO) {
+        return verifierService.expirationReminder(idDTO);
     }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java
index 3b251ad..a6e7850 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java
@@ -12,6 +12,7 @@
 import com.casic.missiles.dto.resource.staff.StaffListRequest;
 import com.casic.missiles.dto.resource.staff.TrainListRequest;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.*;
@@ -22,7 +23,10 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
 import java.util.List;
@@ -52,8 +56,19 @@
             throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
         }
         Page<BizResourceStaffInfo> page = PageFactory.defaultPage();
-        Page<BizResourceStaffInfo> responsePage = staffInfoService.listPage(page, request);
-        return ReturnUtil.success(super.packForBT(responsePage));
+        return ReturnUtil.success(super.packForBT(staffInfoService.listPage(page, request)));
+    }
+
+    @ApiOperation("人员登记导出")
+    @PostMapping("/listExport")
+    public void exportList(@RequestBody StaffListRequest request) throws Exception {
+        List<BizResourceStaffInfo> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = staffInfoService.listByIds(request.getIds());
+        } else {
+            list = staffInfoService.list(request);
+        }
+        super.exportExcel(BizResourceStaffInfo.class, list, ExportEnum.STAFF_INFO.getSheetName());
     }
 
     @ApiOperation("人员登记详情基础信息")
@@ -85,9 +100,9 @@
 
     @ApiOperation("科研教育列表（分页）")
     @PostMapping("/education/listPage")
-    public ReturnDTO<PageInfoBT<BizResourceStaffEducation>> educationListPage(@RequestBody IdDTO idDto) {
+    public ReturnDTO<PageInfoBT<BizResourceStaffEducation>> educationListPage(@RequestBody IdDTO idDTO) {
         Page<BizResourceStaffEducation> page = PageFactory.defaultPage();
-        Page<BizResourceStaffEducation> responsePage = staffInfoService.educationListPage(page, idDto);
+        Page<BizResourceStaffEducation> responsePage = staffInfoService.educationListPage(page, idDTO);
         return ReturnUtil.success(super.packForBT(responsePage));
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java
index af6aa86..d85d84a 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java
@@ -9,6 +9,7 @@
 import com.casic.missiles.dto.resource.outsideService.SupplierApprovalListRequest;
 import com.casic.missiles.dto.resource.outsideService.SupplierSaveResponse;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceSupplierAbility;
@@ -67,6 +68,13 @@
         return ReturnUtil.success(supplierInfoService.detail(idDTO.getId()));
     }
 
+    @ApiOperation("合格供方导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody SupplierApprovalListRequest request) throws Exception {
+        List<BizResourceSupplierInfo> list = super.exportList(request);
+        super.exportExcel(BizResourceSupplierInfo.class, list, ExportEnum.SUPPLIER_INFO.getSheetName());
+    }
+
     @ApiOperation("供方人员列表（分页）")
     @PostMapping("/person/listPage")
     public ReturnDTO<PageInfoBT<BizResourceSupplierPerson>> personListPage(@RequestBody IdDTO idDTO) {
diff --git a/casic-metering-api/src/main/resources/config/application.yml b/casic-metering-api/src/main/resources/config/application.yml
index 350db5f..ecff521 100644
--- a/casic-metering-api/src/main/resources/config/application.yml
+++ b/casic-metering-api/src/main/resources/config/application.yml
@@ -126,7 +126,7 @@
     #作者
     author: wangpeng
     #待生成对象表名
-    table-name: biz_equipment_technical_target_approval,biz_equipment_attachment_approval,biz_equipment_checkpoint_approval
+    table-name: biz_business_outsource_protocol
 
 reminder:
   #节点--common模块config包 ReminderNodeConfig配置
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
index 4a19e4e..d47d552 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
@@ -53,6 +53,7 @@
     SUGGEST_FORM_SAVE_FAILED(2509, "委托方意见登记表保存至草稿箱失败"),
     EXAMINE_FORM_SAVE_FAILED(2510, "要求、委托书及合同评审表保存至草稿箱失败"),
     CUSTOMER_EXIST_SAVE_FAILED(2511, "该委托方已存在，请重新选择"),
+    DUPLICATE_LOCATION_NO(2512, "地点编号已存在"),
 
     /**
      * 计量检定业务模块
@@ -68,6 +69,8 @@
     COMPLETE_SAMPLE_NOT_EXIST(2609, "检测中不存在扫描收入的样品"),
     CANNOT_CHANGE_MEASURE_INFO(2610, "无法更改非当前登录用户的检测信息"),
     NON_EXIST_ORDER_OR_SAMPLE(2611, "不存在该委托单或该委托单下的样品"),
+    OUTSOURCE_ACCESS_SAVE_FAILED(2612, "测试、校准或检定工作分包评审表保存至草稿箱失败"),
+    OUTSOURCE_PROTOCOL_SAVE_FAILED(2613, "测试、校准或检定工作分包协议书保存至草稿箱失败"),
 
     /**
      * 历史遗留备用
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
index 5089ad1..81a406b 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
@@ -10,54 +10,38 @@
     /**
      * 资源管理
      */
-    ENVIRONMENT_DATA_EXPORT("environmentData", "environmentData", "环境记录单数据"),
+    ENVIRONMENT_DATA_EXPORT("environmentData", "环境记录单数据", "环境记录单数据"),
+    STAFF_INFO("staffInfo", "人员登记", "人员登记"),
+    STAFF_CERTIFICATE_EXPIRE("certificateExpire", "证书逾期提醒", "证书逾期提醒"),
+    SUPPLIER_INFO("supplierInfo", "合格供方名录", "合格供方名录"),
+    CUSTOMER_INFO("customerInfo", "委托方名录", "委托方名录"),
+    CUSTOMER_SUGGEST_FORM("customerSuggestForm", "委托方意见登记表", "委托方意见登记表"),
+    SEAL_NOTE("sealNote", "印章使用登记", "印章使用登记"),
 
-    FILE_EXPORT("meterFileData", "meterFileData", "计量文件信息"),
-    TRAIN_PLAN_EXPORT("trainPlanData", "trainPlanData", "培训计划"),
-    TRAIN_LOG_EXPORT("trainLogData", "trainLogData", "培训记录"),
-    METER_ORGANIZE_EXPORT("meterOrganizeData", "meterOrganizeData", "计量组织"),
-    TRACE_SUPPLIER_EXPORT("traceSupplierData", "traceSupplierData", "溯源供方"),
-    SIGN_EXPORT("signData", "signData", "签名/签章"),
-    TEMPLATE_EXPORT("templateData", "templateData", "原始记录模板/证书报告模板"),
-    FIXED_ASSETS("meterFixedAssets", "meterFixedAssets", "固定资产"),
-    METER_EQUIPMENT("meterEquipment", "meterEquipment", "测量设备"),
-    CALIBRATION_TEST_EQUIPMENT("calibrationTestEquipment", "calibrationTestEquipment", "校准检定设备"),
-    MEASURE_ACCOUNT("measureAccount", "measureAccount", "测量工装"),
-    STANDARD_SUPPORT_EQUIPMENT("standardSupportEquipment", "standardSupportEquipment", "标准配套设备"),
-    STANDARD_EQUIPMENT("standardEquipment", "standardEquipment", "标准装置"),
-    FLOW_DEF_EXPORT("flowDefData", "flowDefData", "流程定义"),
-    STAFF_CERTIFICATE("certificate", "certificate", "计量人员证书"),
-    CHECK_INFO("checkInfo", "checkInfo", "设备管理点检测"),
-    EQUIPMENT_APPLY("equipmentApply", "equipmentApply", "设备借用"),
-    STANDARD_EQUIPMENT_REMIND("equipmentApplyRemind", "equipmentApplyRemind", "标准装置到期提醒"),
-    METER_PRICE("meterPrice", "meterPrice", "价格库"),
-    METER_STAFF("meterStaff", "meterStaff", "计量人员"),
-    STANDARD_EQUIPMENT_APPLY("standardEquipmentApply", "standardEquipmentApply", "标准装置申请"),
-    STATE_MANAGE_APPLY("stateManage", "stateManage", "状态管理"),
-    METER_ACCEPTANCE_CHECK("acceptanceCheck", "acceptanceCheck", "设备检修保养验收单"),
-    CUSTOMER_EXPORT("customerData", "customerData", "客户信息"),
-    ORDER_EXPORT("orderData", "orderData", "委托书信息"),
-    SAMPLE_EXPORT("sampleData", "sampleData", "样本信息"),
-    EXCHANGE_DATA("exchangeData", "exchangeData", "设备交接单"),
-    DISPATCH_DATA("dispatchData", "dispatchData", "设备收发"),
-    ENVIRONMENT_DATA("environmentData", "environmentData", "环境记录单"),
-    ORIGIN_DATA("originData", "originData", "原始记录"),
-    CERTIFICATE_REPORT("certificateReport", "certificateReport", "证书报告"),
-    ADVICE_EXPORT("adviceData", "adviceData", "客户反馈"),
-    HANDOUT_EXPORT("handoutData", "handoutData", "任务分发列表"),
-    OUTSOURCER_EXPORT("outsourcerData", "outsourcerData", "分包方"),
-    SITE_EXECUTIVE_EXPORT("siteExecutiveData", "siteExecutiveData", "现场测试、校准或检定"),
-    CERTIFICATE_PRINT_EXPORT("certificatePrintData", "certificatePrintData", "证书打印"),
-    DOWNLOAD_TEMPLATE("downloadTemplate", "downloadTemplate", "页面配置"),
-    OUTSOURCER_CERTIFICATE_EXPORT("outsourceCertificateData", "outsourceCertificateData", "分包证书"),
-    SETTLEMENT_INFO_EXPORT("settlementInfoData", "settlementInfoData", "业务结算"),
-    EQUIPMENT_REMIND("equipmentRemind", "equipmentRemind", "设备到期提醒"),
-    AGREEMENT_INFO_EXPORT("agreementInfoData", "agreementInfoData", "合同"),
-    WORK_STATISTICS_EXPORT("workStatisticsData", "workStatisticsData", "实时工作统计"),
-    DEPT_OUTPUT_EXPORT("deptOutputData", "deptOutputData", "部门产值分析"),
-    WORKLOAD_EXPORT("workloadData", "workloadData", "业务工作量分析"),
-    DEPT_COMPREHENSIVE_EXPORT("deptComprehensiveData", "deptComprehensiveData", "部门综合分析"),
-    ENVIRONMENTAL_RECORD("environmentalRecordData", "environmentalRecordData", "现场环境记录");
+    /**
+     * 计量检定业务
+     */
+    OUTSOURCER_EXPORT("outsourcerData", "分包方名录", "分包方名录"),
+    IDENTIFY_EXPORT("identifyData", "计量标识", "计量标识"),
+    ORDER_EXPORT("orderData", "任务单", "任务单"),
+    DISPATCH_DATA("dispatchData", "设备收发", "设备收发"),
+    HANDOUT_EXPORT("handoutData", "任务分发", "任务分发"),
+    SITE_EXECUTIVE_EXPORT("siteExecutiveData", "现场测试、校准或检定", "现场测试、校准或检定"),
+    CERTIFICATE_REPORT("certificateReport", "证书审批", "证书审批"),
+    CERTIFICATE_CHANGE_APPLY("certificateChangeApply", "证书报告补充或更换申请单", "证书报告补充或更换申请单"),
+    CERTIFICATE_PRINT("certificatePrintData", "证书打印审批", "证书打印审批"),
+    DEPT_EXECUTIVE_TASK("deptExecutiveTaskData", "实验室任务", "实验室任务"),
+    MY_EXECUTIVE_TASK("myExecutiveTaskData", "我的任务", "我的任务"),
+    OUTSOURCE_ASSESS("outsourceAssess", "测试、校准或检定工作分包评审表", "测试、校准或检定工作分包评审表"),
+    OUTSOURCE_PROTOCOL("outsourceProtocol", "测试、校准或检定工作分包协议书", "测试、校准或检定工作分包协议书"),
+
+    /**
+     * 系统管理
+     */
+    SIGN_EXPORT("signData", "签名", "签名"),
+    TEMPLATE_EXPORT("templateData", "文件模板", "文件模板"),
+    FLOW_DEF_EXPORT("flowDefData", "流程定义", "流程定义"),
+    DOWNLOAD_TEMPLATE("downloadTemplate", "流程定义", "页面配置");
 
     ExportEnum(String fileName, String sheetName, String description) {
         this.fileName = fileName;
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateRecordTypeCodeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateRecordTypeCodeEnum.java
index 31d913c..a963522 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateRecordTypeCodeEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateRecordTypeCodeEnum.java
@@ -46,4 +46,14 @@
     String SITE_EXECUTIVE_APPROVAL = "01";
     //《现场测试、校准或检定工作记录表》
     String SITE_EXECUTIVE_LOG = "02";
+
+    //测试、校准或检定工作分包协议书
+    String OUTSOURCE_PROTOCOL = "01";
+    //测试、校准或检定工作分包评审表
+    String OUTSOURCE_ACCESS = "02";
+    //测试、校准或检定工作分包通知书
+    String OUTSOURCE_NOTICE = "03";
+    //测试、校准或检定工作分包方名录
+    String OUTSOURCE_INFO = "04";
+
 }
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
index 24b8635..f78bd53 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
@@ -15,6 +15,10 @@
     String CERTIFICATE_CHANGE_APPLY_BEAN_NAME = "certificateChangeApplyBean";
     //现场测试、校准或检定
     String SITE_EXECUTIVE_BEAN_NAME = "siteExecutiveBean";
+    //测试、校准或检定工作分包评审表
+    String OUTSOURCE_ASSESS_BEAN_NAME = "outsourceAssessBean";
+    //测试、校准或检定工作分包协议书
+    String OUTSOURCE_PROTOCOL_BEAN_NAME = "outsourceProtocolBean";
 
     /*********************************设备与装置************************************/
     //设备台账
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 b21c661..6b86fd1 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
@@ -18,6 +18,8 @@
     OUTSOURCER_APPROVAL(OUTSOURCER_BEAN_NAME, ""),
     CERTIFICATE_CHANGE_APPROVAL(CERTIFICATE_CHANGE_APPLY_BEAN_NAME, ""),
     SITE_EXECUTIVE_APPROVAL(SITE_EXECUTIVE_BEAN_NAME, ""),
+    OUTSOURCE_ASSESS_APPROVAL(OUTSOURCE_ASSESS_BEAN_NAME, ""),
+    OUTSOURCE_PROTOCOL_APPROVAL(OUTSOURCE_PROTOCOL_BEAN_NAME, ""),
 
     ACTION_STATUS_MAP(new HashMap<String, AwareActionStatusEnum>() {
         {
@@ -47,6 +49,10 @@
             put(ApplyFromIdEnum.CERTIFICATE_CHANGE_APPROVAL.getCode(), CERTIFICATE_CHANGE_APPROVAL);
             //现场测试、校准或检定审批
             put(ApplyFromIdEnum.SITE_EXECUTIVE_APPROVAL.getCode(), SITE_EXECUTIVE_APPROVAL);
+            //测试、校准或检定工作分包评审表
+            put(ApplyFromIdEnum.OUTSOURCE_ASSESS_APPROVAL.getCode(), OUTSOURCE_ASSESS_APPROVAL);
+            //测试、校准或检定工作分包协议书
+            put(ApplyFromIdEnum.OUTSOURCE_PROTOCOL_APPROVAL.getCode(), OUTSOURCE_PROTOCOL_APPROVAL);
         }
     });
     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 934405e..c7410bd 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
@@ -9,6 +9,8 @@
     CERTIFICATE_CHANGE_APPROVAL("jljdywzsbchghsqd", MessageSourceModuleEnum.BUSINESS.getCode(), "证书/报告补充或更换申请单"),
     OUTSOURCER_APPROVAL("jljdywcsjzhgfbfml", MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定合格分包方名录"),
     SITE_EXECUTIVE_APPROVAL("jljdywxccsjzsp", MessageSourceModuleEnum.BUSINESS.getCode(), "现场测试、校准或检定审批"),
+    OUTSOURCE_ASSESS_APPROVAL("jljdywcsjzfbpsb", MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包评审表"),
+    OUTSOURCE_PROTOCOL_APPROVAL("jljdywcsjzfbxys", MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包协议书"),
 
 
     /*******************************************设备与装置*********************************************/
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/GeneralApprovalMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/GeneralApprovalMapper.java
index 4fb7344..0c9d6ae 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/GeneralApprovalMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/GeneralApprovalMapper.java
@@ -17,8 +17,4 @@
 
     Page<O> selectBatchForApprovalList(Page<O> page, @Param("request") R request, @Param("businessKeys") List<String> businessKeys);
 
-//    Page<O> selectListPage(Page<O> page, @Param("request") R request);
-
-//    Long selectMaxNo();
-
 }
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceAssessMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceAssessMapper.java
index 7867bb8..ba59009 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceAssessMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceAssessMapper.java
@@ -1,7 +1,12 @@
 package com.casic.missiles.mapper.business;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.business.outsource.OutsourceAssessApprovalListRequest;
+import com.casic.missiles.mapper.GeneralApprovalMapper;
 import com.casic.missiles.model.business.BizBusinessOutsourceAssess;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * <p>
@@ -11,6 +16,10 @@
  * @author wangpeng
  * @since 2023-08-16
  */
-public interface BizBusinessOutsourceAssessMapper extends BaseMapper<BizBusinessOutsourceAssess> {
+public interface BizBusinessOutsourceAssessMapper extends GeneralApprovalMapper<BizBusinessOutsourceAssess, BizBusinessOutsourceAssess, OutsourceAssessApprovalListRequest> {
+
+    Page<BizBusinessOutsourceAssess> selectBatchForApprovalList(Page<BizBusinessOutsourceAssess> page, @Param("request") OutsourceAssessApprovalListRequest request, @Param("businessKeys") List<String> businessKeys);
+
+    Long selectMaxProjectNo();
 
 }
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceProtocolMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceProtocolMapper.java
new file mode 100644
index 0000000..e6aba35
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceProtocolMapper.java
@@ -0,0 +1,24 @@
+package com.casic.missiles.mapper.business;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.business.outsource.OutsourceProtocolApprovalListRequest;
+import com.casic.missiles.mapper.GeneralApprovalMapper;
+import com.casic.missiles.model.business.BizBusinessOutsourceProtocol;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 计量检定业务-分包管理-测试、校准或检定工作分包协议书 Mapper 接口
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-08-24
+ */
+public interface BizBusinessOutsourceProtocolMapper extends GeneralApprovalMapper<BizBusinessOutsourceProtocol, BizBusinessOutsourceProtocol, OutsourceProtocolApprovalListRequest> {
+
+    Page<BizBusinessOutsourceProtocol> selectBatchForApprovalList(Page<BizBusinessOutsourceProtocol> page, @Param("request") OutsourceProtocolApprovalListRequest request, @Param("businessKeys") List<String> businessKeys);
+
+    Long selectMaxProtocolNo();
+}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/EnvLocationInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/EnvLocationInfoMapper.java
new file mode 100644
index 0000000..49eff87
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/EnvLocationInfoMapper.java
@@ -0,0 +1,21 @@
+package com.casic.missiles.mapper.resource;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.resource.environment.LocationListRequest;
+import com.casic.missiles.dto.resource.environment.LocationListResponse;
+import com.casic.missiles.model.resource.EnvLocationInfo;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * <p>
+ * 实验室环境监控系统-设备表 Mapper 接口
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-06-07
+ */
+public interface EnvLocationInfoMapper extends BaseMapper<EnvLocationInfo> {
+
+    Page<LocationListResponse> selectLocationListPage(Page<LocationListResponse> page, @Param("request") LocationListRequest request);
+}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java
index de124db..85ed0f7 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java
@@ -1,7 +1,9 @@
 package com.casic.missiles.mapper.system;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.dto.system.SignDetailResponse;
+import com.casic.missiles.dto.system.SignListRequest;
 import com.casic.missiles.model.system.SystemSign;
 import org.apache.ibatis.annotations.Param;
 
@@ -22,4 +24,8 @@
     SignDetailResponse selectSignDetailById(Long id);
 
     List<SystemSign> selectUsableSignList(@Param("userId") Long userId);
+
+    Page<SystemSign> selectSignListPage(Page<SystemSign> page, @Param("request") SignListRequest request);
+
+    List<SystemSign> selectSignList(@Param("request") SignListRequest request);
 }
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateChangeApplyMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateChangeApplyMapper.xml
index d798447..c496092 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateChangeApplyMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateChangeApplyMapper.xml
@@ -30,31 +30,31 @@
         SELECT *
         FROM biz_business_certificate_change_apply
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.changeApplyNo != null and request.changeApplyNo !=''">
+        <if test="request != null and request.changeApplyNo != null and request.changeApplyNo !=''">
             and change_apply_no like concat('%',#{request.changeApplyNo},'%')
         </if>
-        <if test="request.changeReportNo != null and request.changeReportNo !=''">
+        <if test="request != null and request.changeReportNo != null and request.changeReportNo !=''">
             and change_report_no like concat('%',#{request.changeReportNo},'%')
         </if>
-        <if test="request.changeReportName != null and request.changeReportName !=''">
+        <if test="request != null and request.changeReportName != null and request.changeReportName !=''">
             and change_report_name like concat('%',#{request.changeReportName},'%')
         </if>
-        <if test="request.changeType != null and request.changeType !=''">
+        <if test="request != null and request.changeType != null and request.changeType !=''">
             and change_type = #{request.changeType}
         </if>
-        <if test="request.createUserName != null and request.createUserName !=''">
+        <if test="request != null and request.createUserName != null and request.createUserName !=''">
             and create_user_name like concat('%',#{request.createUserName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificatePrintMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificatePrintMapper.xml
index b66cd99..49c0ac8 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificatePrintMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificatePrintMapper.xml
@@ -31,34 +31,34 @@
         LEFT JOIN biz_business_order_sample_relation bosr ON (bosr.order_id = bcr.order_id AND bosr.sample_id = bcr.sample_id)
         LEFT JOIN biz_business_order_info boi ON boi.id = bosr.order_id
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and bcp.approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.printStatus != null and request.printStatus !=''">
+        <if test="request != null and request.printStatus != null and request.printStatus !=''">
             and print_status = #{request.printStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and bcp.create_user_id = #{request.createUserId}
         </if>
-        <if test="request.certificateReportNo != null and request.certificateReportNo !=''">
+        <if test="request != null and request.certificateReportNo != null and request.certificateReportNo !=''">
             and bcr.certificate_report_no like concat('%',#{request.certificateReportNo},'%')
         </if>
-        <if test="request.certificateReportName != null and request.certificateReportName !=''">
+        <if test="request != null and request.certificateReportName != null and request.certificateReportName !=''">
             and bcr.certificate_report_name like concat('%',#{request.certificateReportName},'%')
         </if>
-        <if test="request.customerName != null and request.customerName !=''">
+        <if test="request != null and request.customerName != null and request.customerName !=''">
             and boi.customer_name like concat('%',#{request.customerName},'%')
         </if>
-        <if test="request.sampleNo != null and request.sampleNo !=''">
+        <if test="request != null and request.sampleNo != null and request.sampleNo !=''">
             and bosr.sample_no like concat('%',#{request.sampleNo},'%')
         </if>
-        <if test="request.sampleName != null and request.sampleName !=''">
+        <if test="request != null and request.sampleName != null and request.sampleName !=''">
             and bosr.sample_name like concat('%',#{request.sampleName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and bcp.create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and bcp.create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml
index b366034..767695d 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml
@@ -46,33 +46,37 @@
         SELECT bcr.*, bosr.sample_no, bosr.sample_name, bosr.sample_model, rsi.staff_name
         FROM biz_business_certificate_report bcr
         LEFT JOIN biz_business_order_sample_relation bosr ON (bosr.order_id = bcr.order_id AND bosr.sample_id = bcr.sample_id)
+        LEFT JOIN biz_business_order_info boi ON boi.id = bcr.order_id
         LEFT JOIN biz_resource_staff_info rsi ON rsi.id = bcr.measure_person_id
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and bcr.approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and bcr.create_user_id = #{request.createUserId}
         </if>
-        <if test="request.certificateReportNo != null and request.certificateReportNo !=''">
+        <if test="request != null and request.customerId != null and request.customerId !=''">
+            and boi.customer_id = #{request.customerId}
+        </if>
+        <if test="request != null and request.certificateReportNo != null and request.certificateReportNo !=''">
             and bcr.certificate_report_no like concat('%',#{request.certificateReportNo},'%')
         </if>
-        <if test="request.certificateReportName != null and request.certificateReportName !=''">
+        <if test="request != null and request.certificateReportName != null and request.certificateReportName !=''">
             and bcr.certificate_report_name like concat('%',#{request.certificateReportName},'%')
         </if>
-        <if test="request.sampleNo != null and request.sampleNo !=''">
+        <if test="request != null and request.sampleNo != null and request.sampleNo !=''">
             and bosr.sample_no like concat('%',#{request.sampleNo},'%')
         </if>
-        <if test="request.measureCategory != null and request.measureCategory !=''">
+        <if test="request != null and request.measureCategory != null and request.measureCategory !=''">
             and bcr.measure_category = #{request.measureCategory}
         </if>
-        <if test="request.measurePerson != null and request.measurePerson !=''">
+        <if test="request != null and request.measurePerson != null and request.measurePerson !=''">
             and rsi.staff_name like concat('%',#{request.measurePerson},'%')
         </if>
-        <if test="request.calibrationTimeStart != null and request.calibrationTimeStart !=''">
+        <if test="request != null and request.calibrationTimeStart != null and request.calibrationTimeStart !=''">
             and bcr.calibration_time &gt;= #{request.calibrationTimeStart}
         </if>
-        <if test="request.calibrationTimeEnd != null and request.calibrationTimeEnd !=''">
+        <if test="request != null and request.calibrationTimeEnd != null and request.calibrationTimeEnd !=''">
             and bcr.calibration_time &lt;= #{request.calibrationTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceAssessMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceAssessMapper.xml
index d0fcf8b..c22c101 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceAssessMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceAssessMapper.xml
@@ -7,6 +7,8 @@
         <id column="id" property="id" />
         <result column="project_no" property="projectNo" />
         <result column="project_name" property="projectName" />
+        <result column="lab_code" property="labCode" />
+        <result column="group_code" property="groupCode" />
         <result column="applicant_id" property="applicantId" />
         <result column="applicant_name" property="applicantName" />
         <result column="applicant_time" property="applicantTime" />
@@ -31,7 +33,45 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, project_no, project_name, applicant_id, applicant_name, applicant_time, minio_file_name, remark, create_user_id, create_user_name, outsourcer_id, pre_start_time, pre_end_time, outsource_reason, pre_cost, approval_status, process_id, approve_situation, traceability, test_method, technique_ability, create_time, update_time
+        id, project_no, project_name, lab_code, group_code, applicant_id, applicant_name, applicant_time, minio_file_name, remark, create_user_id, create_user_name, outsourcer_id, pre_start_time, pre_end_time, outsource_reason, pre_cost, approval_status, process_id, approve_situation, traceability, test_method, technique_ability, create_time, update_time
     </sql>
 
+    <select id="selectMaxProjectNo" resultType="java.lang.Long">
+        SELECT IFNULL(max(RIGHT(project_no, 3)), 0) from biz_business_outsource_assess
+    </select>
+
+    <select id="selectBatchForApprovalList" resultMap="BaseResultMap">
+        SELECT bboa.*, bboi.outsourcer_name, bboi.director
+        FROM biz_business_outsource_assess bboa
+        LEFT JOIN biz_business_outsourcer_info bboi ON bboa.outsourcer_id = bboi.id
+        WHERE 1=1
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
+            and bboa.approval_status = #{request.approvalStatus}
+        </if>
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
+            and bboa.create_user_id = #{request.createUserId}
+        </if>
+        <if test="request != null and request.projectNo != null and request.projectNo !=''">
+            and bboa.project_no like concat('%',#{request.projectNo},'%')
+        </if>
+        <if test="request != null and request.outsourcerName != null and request.outsourcerName !=''">
+            and bboi.outsourcer_name like concat('%',#{request.outsourcerName},'%')
+        </if>
+        <if test="request != null and request.applicantName != null and request.applicantName !=''">
+            and bboa.applicant_name like concat('%',#{request.applicantName},'%')
+        </if>
+        <if test="request != null and request.applicantTimeStart != null and request.applicantTimeStart !=''">
+            and bboa.applicant_time &gt;= #{request.applicantTimeStart}
+        </if>
+        <if test="request != null and request.applicantTimeEnd != null and request.applicantTimeEnd !=''">
+            and bboa.applicant_time &lt;= #{request.applicantTimeEnd}
+        </if>
+        <if test="businessKeys != null">
+            and bboa.id in
+            <foreach collection="businessKeys" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
+        ORDER BY bboa.create_time DESC
+    </select>
 </mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceProtocolMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceProtocolMapper.xml
new file mode 100644
index 0000000..b7b2149
--- /dev/null
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceProtocolMapper.xml
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.mapper.business.BizBusinessOutsourceProtocolMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.business.BizBusinessOutsourceProtocol">
+        <id column="id" property="id" />
+        <result column="protocol_no" property="protocolNo" />
+        <result column="project_name" property="projectName" />
+        <result column="lab_code" property="labCode" />
+        <result column="group_code" property="groupCode" />
+        <result column="outsourcer_id" property="outsourcerId" />
+        <result column="remark" property="remark" />
+        <result column="outsource_no" property="outsourceNo" />
+        <result column="outsource_name" property="outsourceName" />
+        <result column="contacts" property="contacts" />
+        <result column="mobile" property="mobile" />
+        <result column="address" property="address" />
+        <result column="require_date" property="requireDate" />
+        <result column="outsource_cost" property="outsourceCost" />
+        <result column="director" property="director" />
+        <result column="item" property="item" />
+        <result column="requires" property="requires" />
+        <result column="create_user_id" property="createUserId" />
+        <result column="create_user_name" property="createUserName" />
+        <result column="approval_status" property="approvalStatus" />
+        <result column="process_id" property="processId" />
+        <result column="create_time" property="createTime" />
+        <result column="update_time" property="updateTime" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, protocol_no, project_name, lab_code, group_code, outsourcer_id, remark, outsource_no, outsource_name, contacts, mobile, address, require_date, outsource_cost, director, item, requires, create_user_id, create_user_name, approval_status, process_id, create_time, update_time
+    </sql>
+
+    <select id="selectMaxProtocolNo" resultType="java.lang.Long">
+        SELECT IFNULL(max(RIGHT(protocol_no, 3)), 0) from biz_business_outsource_protocol
+    </select>
+
+    <select id="selectBatchForApprovalList" resultMap="BaseResultMap">
+        SELECT *
+        FROM biz_business_outsource_protocol
+        WHERE 1=1
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
+            and approval_status = #{request.approvalStatus}
+        </if>
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
+            and create_user_id = #{request.createUserId}
+        </if>
+        <if test="request != null and request.protocolNo != null and request.protocolNo !=''">
+            and protocol_no like concat('%',#{request.protocolNo},'%')
+        </if>
+        <if test="request != null and request.outsourcerName != null and request.outsourcerName !=''">
+            and outsourcer_name like concat('%',#{request.outsourcerName},'%')
+        </if>
+        <if test="request != null and request.applicantName != null and request.applicantName !=''">
+            and create_user_name like concat('%',#{request.applicantName},'%')
+        </if>
+        <if test="request != null and request.applicantTimeStart != null and request.applicantTimeStart !=''">
+            and create_time &gt;= #{request.applicantTimeStart}
+        </if>
+        <if test="request != null and request.applicantTimeEnd != null and request.applicantTimeEnd !=''">
+            and create_time &lt;= #{request.applicantTimeEnd}
+        </if>
+        <if test="businessKeys != null">
+            and id in
+            <foreach collection="businessKeys" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
+        ORDER BY create_time DESC
+    </select>
+</mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourcerInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourcerInfoMapper.xml
index 510a80b..3049b54 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourcerInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourcerInfoMapper.xml
@@ -7,6 +7,8 @@
         <id column="id" property="id" />
         <result column="outsourcer_no" property="outsourcerNo" />
         <result column="outsourcer_name" property="outsourcerName" />
+        <result column="lab_code" property="labCode" />
+        <result column="group_code" property="groupCode" />
         <result column="outsourcer_brief_name" property="outsourcerBriefName" />
         <result column="outsourcer_size" property="outsourcerSize" />
         <result column="business_size" property="businessSize" />
@@ -55,32 +57,32 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, outsourcer_no, outsourcer_name, outsourcer_brief_name, outsourcer_size, business_size, grade, evaluation, tax_number, bank_account, bank_name, bank_account_number, postal_code, director, phone, fax, mobile, email, website, address_country, address_province, address_city, address_area, full_address, address_country_name, address_province_name, address_city_name, address_area_name, invoice_country, invoice_province, invoice_city, invoice_area, invoice_full_address, invoice_country_name, invoice_province_name, invoice_city_name, invoice_area_name, business_scope, business_content, minio_file_name, approval_status, process_id, remark, create_user_id, create_user_name, create_time, update_time
+        id, outsourcer_no, outsourcer_name, lab_code, group_code, outsourcer_brief_name, outsourcer_size, business_size, grade, evaluation, tax_number, bank_account, bank_name, bank_account_number, postal_code, director, phone, fax, mobile, email, website, address_country, address_province, address_city, address_area, full_address, address_country_name, address_province_name, address_city_name, address_area_name, invoice_country, invoice_province, invoice_city, invoice_area, invoice_full_address, invoice_country_name, invoice_province_name, invoice_city_name, invoice_area_name, business_scope, business_content, minio_file_name, approval_status, process_id, remark, create_user_id, create_user_name, create_time, update_time
     </sql>
 
     <select id="selectBatchForApprovalList" resultMap="BaseResultMap">
         SELECT *
         FROM biz_business_outsourcer_info
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.outsourcerNo != null and request.outsourcerNo !=''">
+        <if test="request != null and request.outsourcerNo != null and request.outsourcerNo !=''">
             and outsourcer_no like concat('%',#{request.outsourcerNo},'%')
         </if>
-        <if test="request.outsourcerName != null and request.outsourcerName !=''">
+        <if test="request != null and request.outsourcerName != null and request.outsourcerName !=''">
             and outsourcer_name like concat('%',#{request.outsourcerName},'%')
         </if>
-        <if test="request.director != null and request.director !=''">
+        <if test="request != null and request.director != null and request.director !=''">
             and director like concat('%',#{request.director},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
@@ -93,6 +95,6 @@
     </select>
 
     <select id="selectMaxNo" resultType="java.lang.Long">
-        SELECT IFNULL(max(RIGHT(outsourcer_no, 12)), 0) from biz_business_outsourcer_info
+        SELECT IFNULL(max(RIGHT(outsourcer_no, 3)), 0) from biz_business_outsourcer_info
     </select>
 </mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessSiteExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessSiteExecutiveInfoMapper.xml
index 135c5d0..3c5ae79 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessSiteExecutiveInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessSiteExecutiveInfoMapper.xml
@@ -38,25 +38,25 @@
         FROM biz_business_site_executive_info bsei
         LEFT JOIN biz_resource_customer_info rci ON bsei.customer_id = rci.id
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and bsei.approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and bsei.create_user_id = #{request.createUserId}
         </if>
-        <if test="request.siteExecutiveNo != null and request.siteExecutiveNo !=''">
+        <if test="request != null and request.siteExecutiveNo != null and request.siteExecutiveNo !=''">
             and bsei.site_executive_no like concat('%',#{request.siteExecutiveNo},'%')
         </if>
-        <if test="request.customerName != null and request.customerName !=''">
+        <if test="request != null and request.customerName != null and request.customerName !=''">
             and rci.outsourcer_name like concat('%',#{request.customerName},'%')
         </if>
-        <if test="request.applyName != null and request.applyName !=''">
+        <if test="request != null and request.applyName != null and request.applyName !=''">
             and bsei.apply_name like concat('%',#{request.applyName},'%')
         </if>
-        <if test="request.applyTimeStart != null and request.applyTimeStart !=''">
+        <if test="request != null and request.applyTimeStart != null and request.applyTimeStart !=''">
             and bsei.apply_time &gt;= #{request.applyTimeStart}
         </if>
-        <if test="request.applyTimeEnd != null and request.applyTimeEnd !=''">
+        <if test="request != null and request.applyTimeEnd != null and request.applyTimeEnd !=''">
             and bsei.apply_time &lt;= #{request.applyTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml
index 84d9e2a..6bd38a9 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml
@@ -105,6 +105,12 @@
         <if test="request.isUrgent != null and request.isUrgent !=''">
             AND bo.is_urgent = #{request.isUrgent}
         </if>
+        <if test="request.ids != null">
+            and blei.id in
+            <foreach collection="request.ids" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
         ORDER BY blei.update_time DESC
     </select>
 
@@ -137,6 +143,12 @@
         <if test="request.isUrgent != null and request.isUrgent !=''">
             AND bo.is_urgent = #{request.isUrgent}
         </if>
+        <if test="request.ids != null">
+            and blei.id in
+            <foreach collection="request.ids" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
         ORDER BY blei.update_time DESC
     </select>
 
diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardInfoMapper.xml
index 1a5551b..2ed8d17 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardInfoMapper.xml
@@ -45,12 +45,6 @@
         FROM biz_equipment_standard_info besi
         LEFT JOIN biz_equipment_standard_technology_relation bestr ON besi.standard_no = bestr.standard_no
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
-            and besi.approval_status = #{request.approvalStatus}
-        </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
-            and besi.create_user_id = #{request.createUserId}
-        </if>
         <if test="request.standardName != null and request.standardName !=''">
             and besi.standard_name like concat('%',#{request.standardName},'%')
         </if>
diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardTechnologyRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardTechnologyRelationMapper.xml
index fc7e16c..cd03c8c 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardTechnologyRelationMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardTechnologyRelationMapper.xml
@@ -6,6 +6,7 @@
     <resultMap id="BaseResultMap" type="com.casic.missiles.model.equipment.BizEquipmentStandardTechnologyRelation">
         <id column="id" property="id" />
         <result column="technology_file_id" property="technologyFileId" />
+        <result column="technology_file_no" property="technologyFileNo" />
         <result column="technology_file_name" property="technologyFileName" />
         <result column="standard_id" property="standardId" />
         <result column="standard_no" property="standardNo" />
@@ -14,7 +15,7 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, technology_file_id, technology_file_name, standard_id, remark
+        id, technology_file_id, technology_file_no, technology_file_name, standard_id, remark
     </sql>
 
 </mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceAuthorizeOrderMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceAuthorizeOrderMapper.xml
index ac5176c..554fe65 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceAuthorizeOrderMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceAuthorizeOrderMapper.xml
@@ -32,22 +32,22 @@
         SELECT *
         FROM biz_resource_authorize_order
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.orderNo != null and request.orderNo !=''">
+        <if test="request != null and request.orderNo != null and request.orderNo !=''">
             and order_no like concat('%',#{request.orderNo},'%')
         </if>
-        <if test="request.createUserName != null and request.createUserName !=''">
+        <if test="request != null and request.createUserName != null and request.createUserName !=''">
             and create_user_name like concat('%',#{request.createUserName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerExamineFormMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerExamineFormMapper.xml
index ab242f6..af7f98f 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerExamineFormMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerExamineFormMapper.xml
@@ -41,28 +41,28 @@
         SELECT *
         FROM biz_resource_customer_examine_form
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.formNo != null and request.formNo !=''">
+        <if test="request != null and request.formNo != null and request.formNo !=''">
             and form_no like concat('%',#{request.formNo},'%')
         </if>
-        <if test="request.labCode != null and request.labCode !=''">
+        <if test="request != null and request.labCode != null and request.labCode !=''">
             and lab_code like concat('%',#{request.labCode},'%')
         </if>
-        <if test="request.groupCode != null and request.groupCode !=''">
+        <if test="request != null and request.groupCode != null and request.groupCode !=''">
             and group_code like concat('%',#{request.groupCode},'%')
         </if>
-        <if test="request.createUserName != null and request.createUserName !=''">
+        <if test="request != null and request.createUserName != null and request.createUserName !=''">
             and create_user_name like concat('%',#{request.createUserName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerInfoMapper.xml
index fa8ffbc..06a2798 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerInfoMapper.xml
@@ -33,25 +33,25 @@
         SELECT *
         FROM biz_resource_customer_info
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.customerNo != null and request.customerNo !=''">
+        <if test="request != null and request.customerNo != null and request.customerNo !=''">
             and customer_no like concat('%',#{request.customerNo},'%')
         </if>
-        <if test="request.customerName != null and request.customerName !=''">
+        <if test="request != null and request.customerName != null and request.customerName !=''">
             and customer_name like concat('%',#{request.customerName},'%')
         </if>
-        <if test="request.contacts != null and request.contacts !=''">
+        <if test="request != null and request.contacts != null and request.contacts !=''">
             and contacts like concat('%',#{request.contacts},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerSuggestFormMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerSuggestFormMapper.xml
index 28f5bb2..1806662 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerSuggestFormMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerSuggestFormMapper.xml
@@ -33,28 +33,28 @@
         SELECT *
         FROM biz_resource_customer_suggest_form
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.formNo != null and request.formNo !=''">
+        <if test="request != null and request.formNo != null and request.formNo !=''">
             and form_no like concat('%',#{request.formNo},'%')
         </if>
-        <if test="request.customerName != null and request.customerName !=''">
+        <if test="request != null and request.customerName != null and request.customerName !=''">
             and customer_name like concat('%',#{request.customerName},'%')
         </if>
-        <if test="request.customerDeptName != null and request.customerDeptName !=''">
+        <if test="request != null and request.customerDeptName != null and request.customerDeptName !=''">
             and customer_dept_name like concat('%',#{request.customerDeptName},'%')
         </if>
-        <if test="request.createUserName != null and request.createUserName !=''">
+        <if test="request != null and request.createUserName != null and request.createUserName !=''">
             and create_user_name like concat('%',#{request.createUserName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSealUseNoteMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSealUseNoteMapper.xml
index ab37bc1..b02bb33 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSealUseNoteMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSealUseNoteMapper.xml
@@ -29,32 +29,32 @@
     </sql>
 
     <select id="selectBatchForApprovalList" resultMap="BaseResultMap">
-        SELECT *
+        SELECT brsun.*, brsi.seal_name, brsi.seal_type, brsi.approver_name
         FROM biz_resource_seal_use_note brsun
         JOIN biz_resource_seal_info brsi ON brsun.seal_id = brsi.id
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and brsun.approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and brsun.create_user_id = #{request.createUserId}
         </if>
-        <if test="request.sealName != null and request.sealName !=''">
+        <if test="request != null and request.sealName != null and request.sealName !=''">
             and brsi.seal_name like concat('%',#{request.sealName},'%')
         </if>
-        <if test="request.sealType != null and request.sealType !=''">
+        <if test="request != null and request.sealType != null and request.sealType !=''">
             and brsi.seal_type = #{request.sealType}
         </if>
-        <if test="request.applyDeptName != null and request.applyDeptName !=''">
+        <if test="request != null and request.applyDeptName != null and request.applyDeptName !=''">
             and brsun.apply_dept_name like concat('%',#{request.applyDeptName},'%')
         </if>
-        <if test="request.applyUserName != null and request.applyUserName !=''">
+        <if test="request != null and request.applyUserName != null and request.applyUserName !=''">
             and brsun.apply_user_name like concat('%',#{request.applyUserName},'%')
         </if>
-        <if test="request.applyTimeStart != null and request.applyTimeStart !=''">
+        <if test="request != null and request.applyTimeStart != null and request.applyTimeStart !=''">
             and brsun.apply_time &gt;= #{request.applyTimeStart}
         </if>
-        <if test="request.applyTimeEnd != null and request.applyTimeEnd !=''">
+        <if test="request != null and request.applyTimeEnd != null and request.applyTimeEnd !=''">
             and brsun.apply_time &lt;= #{request.applyTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml
index 119bf7d..4f8392a 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml
@@ -31,6 +31,12 @@
         <if test="request.deptName != null and request.deptName !=''">
             and brsi.dept_name like concat('%',#{request.deptName},'%')
         </if>
+        <if test="request.ids != null">
+            and brsv.id in
+            <foreach collection="request.ids" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
         ORDER BY brsv.grant_date DESC
     </select>
 
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSupplierInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSupplierInfoMapper.xml
index fe8d399..e8ce7ef 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSupplierInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSupplierInfoMapper.xml
@@ -48,28 +48,28 @@
         SELECT *
         FROM biz_resource_supplier_info
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.supplierNo != null and request.supplierNo !=''">
+        <if test="request != null and request.supplierNo != null and request.supplierNo !=''">
             and supplier_no like concat('%',#{request.supplierNo},'%')
         </if>
-        <if test="request.supplierName != null and request.supplierName !=''">
+        <if test="request != null and request.supplierName != null and request.supplierName !=''">
             and supplier_name like concat('%',#{request.supplierName},'%')
         </if>
-        <if test="request.director != null and request.director !=''">
+        <if test="request != null and request.director != null and request.director !=''">
             and director like concat('%',#{request.director},'%')
         </if>
-        <if test="request.supplierType != null and request.supplierType !=''">
+        <if test="request != null and request.supplierType != null and request.supplierType !=''">
             and supplier_type = #{request.supplierType}
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/EnvLocationInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/EnvLocationInfoMapper.xml
new file mode 100644
index 0000000..68bcf10
--- /dev/null
+++ b/casic-metering-dao/src/main/resources/mapper/resource/EnvLocationInfoMapper.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.mapper.resource.EnvLocationInfoMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.resource.EnvLocationInfo">
+        <id column="id" property="id" />
+        <result column="location_no" property="locationNo" />
+        <result column="location_name" property="locationName" />
+        <result column="location_position" property="locationPosition" />
+        <result column="create_user_id" property="createUserId" />
+        <result column="create_user" property="createUser" />
+        <result column="create_time" property="createTime" />
+        <result column="update_time" property="updateTime" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, location_no, location_name, location_position, create_user_id, create_user, create_time, update_time
+    </sql>
+
+    <select id="selectLocationListPage" resultType="com.casic.missiles.dto.resource.environment.LocationListResponse">
+        SELECT *
+        FROM env_location_info
+        WHERE 1=1
+        <if test="request.locationNo != null and request.locationNo !=''">
+            AND location_no LIKE concat('%',#{request.locationNo},'%')
+        </if>
+        <if test="request.locationName != null and request.locationName !=''">
+            AND location_name LIKE concat('%',#{request.locationName},'%')
+        </if>
+        ORDER BY create_time DESC
+    </select>
+
+</mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml
index b28c18f..8854047 100644
--- a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml
@@ -11,7 +11,6 @@
         <result column="sign_desc" property="signDesc" />
         <result column="sign_director" property="signDirector" />
         <result column="sign_user_id" property="signUserId" />
-        <result column="sign_type" property="signType" />
         <result column="minio_file_name" property="minioFileName" />
         <result column="create_time" property="createTime" />
         <result column="update_time" property="updateTime" />
@@ -28,7 +27,6 @@
         <result column="sign_name" property="signName" />
         <result column="sign_desc" property="signDesc" />
         <result column="sign_director" property="signDirector" />
-        <result column="sign_type" property="signType" />
         <result column="sign_user_id" property="signUserId" />
         <result column="minio_file_name" property="minioFileName" />
         <result column="create_time" property="createTime" />
@@ -62,4 +60,58 @@
         JOIN system_sign_user_relation ssur ON ss.id = ssur.sign_id
         WHERE ssur.user_id = #{userId}
     </select>
+
+    <select id="selectSignListPage" resultMap="BaseResultMap">
+        SELECT ss.*, sd.SIMPLE_NAME AS deptName
+        FROM system_sign ss
+        LEFT JOIN sys_user su ON su.id = ss.sign_user_id
+        LEFT JOIN sys_dept sd ON sd.id = su.dept_id
+        WHERE 1=1
+        <if test="request.signNo != null and request.signNo !=''">
+            AND ss.sign_no LIKE concat('%',#{request.signNo},'%')
+        </if>
+        <if test="request.signName != null and request.signName !=''">
+            AND ss.sign_name LIKE concat('%',#{request.signName},'%')
+        </if>
+        <if test="request.signDirector != null and request.signDirector !=''">
+            AND ss.sign_director LIKE concat('%',#{request.signDirector},'%')
+        </if>
+        <if test="request.signUserId != null and request.signUserId !=''">
+            AND ss.sign_user_id = #{request.signUserId}
+        </if>
+        <if test="request.createStartTime != null and request.createStartTime !=''">
+            AND DATE_FORMAT(ss.create_time,'%Y-%m-%d') &gt;= DATE_FORMAT(#{request.createStartTime},'%Y-%m-%d')
+        </if>
+        <if test="request.createEndTime != null and request.createEndTime !=''">
+            AND DATE_FORMAT(ss.create_time,'%Y-%m-%d')  &lt;= DATE_FORMAT(#{request.createEndTime},'%Y-%m-%d')
+        </if>
+        ORDER BY ss.create_time DESC
+    </select>
+
+    <select id="selectSignList" resultMap="BaseResultMap">
+        SELECT ss.*, sd.SIMPLE_NAME AS deptName
+        FROM system_sign ss
+        LEFT JOIN sys_user su ON su.id = ss.sign_user_id
+        LEFT JOIN sys_dept sd ON sd.id = su.dept_id
+        WHERE 1=1
+        <if test="request.signNo != null and request.signNo !=''">
+            AND ss.sign_no LIKE concat('%',#{request.signNo},'%')
+        </if>
+        <if test="request.signName != null and request.signName !=''">
+            AND ss.sign_name LIKE concat('%',#{request.signName},'%')
+        </if>
+        <if test="request.signDirector != null and request.signDirector !=''">
+            AND ss.sign_director LIKE concat('%',#{request.signDirector},'%')
+        </if>
+        <if test="request.signUserId != null and request.signUserId !=''">
+            AND ss.sign_user_id = #{request.signUserId}
+        </if>
+        <if test="request.createStartTime != null and request.createStartTime !=''">
+            AND DATE_FORMAT(ss.create_time,'%Y-%m-%d') &gt;= DATE_FORMAT(#{request.createStartTime},'%Y-%m-%d')
+        </if>
+        <if test="request.createEndTime != null and request.createEndTime !=''">
+            AND DATE_FORMAT(ss.create_time,'%Y-%m-%d')  &lt;= DATE_FORMAT(#{request.createEndTime},'%Y-%m-%d')
+        </if>
+        ORDER BY ss.create_time DESC
+    </select>
 </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 515050a..60f530b 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
@@ -47,8 +47,8 @@
     String STORAGE_LOCATION = "bizStorageLocation";
     //计量专业
     String MEASURE_MAJOR = "bizMeasureMajor";
-    //管理状态
-    String MANAGER_STATE = "bizManagerState";
+    //标准装置管理状态
+    String STANDARD_MANAGER_STATE = "bizStandardManagerState";
 
     /**
      * 资源管理 字典code
@@ -95,8 +95,6 @@
     String MEASURE_STATUS = "measureStatus";
     //检定方式
     String MEASURE_TYPE = "measureType";
-    //标识打印标志类型
-    String IDENTIFY_PRINT_TYPE = "bizBusinessIdentify";
     //变更类型
     String REPORT_CHANGE_TYPE = "bizCertChangeType";
     //规模类型
@@ -111,19 +109,24 @@
     String MEASURE_CATEGORY = "measureCategory";
     //检定结果
     String MEASURE_RESULT = "measureResult";
+    //分包原因
+    String OUTSOURCE_REASON = "outsourceReason";
+
+    /**
+     * 系统管理
+     */
+    String TEMPLATE_TYPE = "templateType";
+
 
     /**
      * 标准装置 字典code
      */
     //类别
     String STANDARD_CATEGORY = "standardCategory";
-    //管理状态
-    String STANDARD_MANAGER_STATE = "standardManagerState";
     //标准等级
     String STANDARD_LEVEL = "standardLevel";
     //传递范围
     String STANDARD_TRANSMIT_RANGE = "transmitRange";
-
     //资本来源
     String CAPITAL_SOURCE = "capitalSource";
     //标准装置-申请类型
@@ -148,8 +151,6 @@
     String CERTIFICATE_CLASS = "certificationClass";
     //证书管理-检校专业
     String CALIBRATION_MAJOR = "calibrationMajor";
-    //分包原因
-    String OUTSOURCE_REASON = "outsourceReason";
 
     /**
      * 工作台
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/BaseApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/BaseApprovalListRequest.java
index 73c12c1..80d7424 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/BaseApprovalListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/BaseApprovalListRequest.java
@@ -6,6 +6,7 @@
 
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotEmpty;
+import java.util.List;
 
 /**
  * @Description:
@@ -19,14 +20,14 @@
      * 表单id
      */
     @NotBlank(message = "表单id不能为空")
-    @ApiModelProperty(value = "表单id（流程定义对应的表单id，等价于业务id）", dataType = "String")
+    @ApiModelProperty(value = "表单id（流程定义对应的表单id，等价于业务id），导出接口不用传", dataType = "String")
     private String formId;
 
     /**
      * 审批状态类型，对应ApprovalStatusEnum
      */
     @NotEmpty(message = "审批状态类型不能为空")
-    @ApiModelProperty(value = "审批状态类型code", dataType = "String")
+    @ApiModelProperty(value = "审批状态类型code，导出接口不用传", dataType = "String")
     private String approvalStatus;
 
     @ApiModelProperty(hidden = true)
@@ -34,4 +35,7 @@
 
     @ApiModelProperty(hidden = true)
     private Long createUserId;
+
+    @ApiModelProperty(value = "导出ids", dataType = "List")
+    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificatePrintApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificatePrintApprovalListRequest.java
index b93d1c9..3cc2f4e 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificatePrintApprovalListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificatePrintApprovalListRequest.java
@@ -5,8 +5,6 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import java.util.List;
-
 /**
  * @Description:
  * @Author: wangpeng
@@ -38,7 +36,4 @@
 
     @ApiModelProperty(value = "创建结束时间", dataType = "String")
     private String createTimeEnd;
-
-    @ApiModelProperty(value = "导出ids", dataType = "List")
-    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportApprovalListRequest.java
index 4f7a038..c115847 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportApprovalListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportApprovalListRequest.java
@@ -5,8 +5,6 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import java.util.List;
-
 /**
  * @Description:
  * @Author: wangpeng
@@ -15,6 +13,8 @@
 @ApiModel
 @Data
 public class CertificateReportApprovalListRequest extends BaseApprovalListRequest {
+    @ApiModelProperty(value = "委托方id", dataType = "String")
+    private Long customerId;
 
     @ApiModelProperty(value = "证书报告编号", dataType = "String")
     private String certificateReportNo;
@@ -37,6 +37,4 @@
     @ApiModelProperty(value = "检校结束时间", dataType = "String")
     private String calibrationTimeEnd;
 
-    @ApiModelProperty(value = "导出ids", dataType = "List")
-    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/identify/IdentifyListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/identify/IdentifyListRequest.java
index 1b87ae6..f019203 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/identify/IdentifyListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/identify/IdentifyListRequest.java
@@ -4,6 +4,8 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * @Description:
  * @Author: wangpeng
@@ -26,4 +28,7 @@
 
     @ApiModelProperty(value = "打印结束时间", dataType = "String")
     private String createTimeEnd;
+
+    @ApiModelProperty(value = "导出ids", dataType = "List")
+    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListRequest.java
index 1264883..62415fb 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListRequest.java
@@ -7,6 +7,7 @@
 import lombok.Data;
 
 import javax.validation.constraints.NotBlank;
+import java.util.List;
 
 @Data
 @ApiModel
@@ -37,4 +38,6 @@
     @ApiModelProperty(value = "是否加急（1是0否null全部）", dataType = "Integer")
     private String isUrgent;
 
+    @ApiModelProperty(value = "导出ids", dataType = "List")
+    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListRequest.java
index 5201d7b..499760a 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListRequest.java
@@ -17,6 +17,9 @@
     @ApiModelProperty(value = "任务单编号", dataType = "String")
     private String orderNo;
 
+    @ApiModelProperty(value = "委托方id", dataType = "Long")
+    private Long customerId;
+
     @ApiModelProperty(value = "委托方名称", dataType = "String")
     private String customerName;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OrderSampleDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OrderSampleDTO.java
new file mode 100644
index 0000000..796edc0
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OrderSampleDTO.java
@@ -0,0 +1,19 @@
+package com.casic.missiles.dto.business.outsource;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/8/24 11:38
+ */
+@ApiModel
+@Data
+public class OrderSampleDTO {
+    @ApiModelProperty(value = "任务单id", dataType = "Long")
+    private Long orderId;
+    @ApiModelProperty(value = "受检设备id", dataType = "Long")
+    private Long sampleId;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceAssessApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceAssessApprovalListRequest.java
new file mode 100644
index 0000000..9a930c3
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceAssessApprovalListRequest.java
@@ -0,0 +1,30 @@
+package com.casic.missiles.dto.business.outsource;
+
+import com.casic.missiles.dto.BaseApprovalListRequest;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/8/24 11:01
+ */
+@ApiModel
+@Data
+public class OutsourceAssessApprovalListRequest extends BaseApprovalListRequest {
+    @ApiModelProperty(value = "评审表编号", dataType = "String")
+    private String projectNo;
+
+    @ApiModelProperty(value = "分包机构名称", dataType = "String")
+    private String outsourcerName;
+
+    @ApiModelProperty(value = "申请人", dataType = "String")
+    private String applicantName;
+
+    @ApiModelProperty(value = "申请时间开始", dataType = "String")
+    private String applicantTimeStart;
+
+    @ApiModelProperty(value = "申请时间结束", dataType = "String")
+    private String applicantTimeEnd;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceAssessSaveResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceAssessSaveResponse.java
new file mode 100644
index 0000000..8bf9aad
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceAssessSaveResponse.java
@@ -0,0 +1,20 @@
+package com.casic.missiles.dto.business.outsource;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/8/14 16:17
+ */
+@ApiModel
+@Data
+public class OutsourceAssessSaveResponse {
+    @ApiModelProperty(value = "主键id", dataType = "Long")
+    private Long id;
+
+    @ApiModelProperty(value = "编号", dataType = "String")
+    private String projectNo;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProtocolApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProtocolApprovalListRequest.java
new file mode 100644
index 0000000..0f32331
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProtocolApprovalListRequest.java
@@ -0,0 +1,30 @@
+package com.casic.missiles.dto.business.outsource;
+
+import com.casic.missiles.dto.BaseApprovalListRequest;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/8/24 15:01
+ */
+@ApiModel
+@Data
+public class OutsourceProtocolApprovalListRequest extends BaseApprovalListRequest {
+    @ApiModelProperty(value = "协议书编号", dataType = "String")
+    private String protocolNo;
+
+    @ApiModelProperty(value = "分包方名称", dataType = "String")
+    private String outsourcerName;
+
+    @ApiModelProperty(value = "申请人", dataType = "String")
+    private String applicantName;
+
+    @ApiModelProperty(value = "申请时间开始", dataType = "String")
+    private String applicantTimeStart;
+
+    @ApiModelProperty(value = "申请时间结束", dataType = "String")
+    private String applicantTimeEnd;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProtocolSaveResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProtocolSaveResponse.java
new file mode 100644
index 0000000..e324967
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProtocolSaveResponse.java
@@ -0,0 +1,20 @@
+package com.casic.missiles.dto.business.outsource;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/8/14 16:17
+ */
+@ApiModel
+@Data
+public class OutsourceProtocolSaveResponse {
+    @ApiModelProperty(value = "主键id", dataType = "Long")
+    private Long id;
+
+    @ApiModelProperty(value = "编号", dataType = "String")
+    private String protocolNo;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveApprovalListRequest.java
index f29f4e4..7047c28 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveApprovalListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveApprovalListRequest.java
@@ -5,8 +5,6 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import java.util.List;
-
 /**
  * @Description: 现场检测审批列表请求实体
  * @Author: wangpeng
@@ -30,7 +28,4 @@
     @ApiModelProperty(value = "申请时间结束", dataType = "String")
     private String applyTimeEnd;
 
-    @ApiModelProperty(value = "导出ids", dataType = "List")
-    private List<Long> ids;
-
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveDetailResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveDetailResponse.java
index 1f28752..394c934 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveDetailResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveDetailResponse.java
@@ -12,6 +12,18 @@
     @ApiModelProperty(value = "id，更新/删除使用参数", dataType = "Long")
     private Long id;
 
+    @ApiModelProperty(value = "实验室代码(字典code)", dataType = "String")
+    private String labCode;
+
+    @ApiModelProperty(value = "实验室代码(字典value)", dataType = "String")
+    private String labCodeName;
+
+    @ApiModelProperty(value = "组别代码(字典code)", dataType = "String")
+    private String groupCode;
+
+    @ApiModelProperty(value = "组别代码(字典value)", dataType = "String")
+    private String groupCodeName;
+
     @ApiModelProperty(value = "审批编号", dataType = "String")
     private String siteExecutiveNo;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/environment/LocationListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/environment/LocationListRequest.java
new file mode 100644
index 0000000..13d03c3
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/environment/LocationListRequest.java
@@ -0,0 +1,20 @@
+package com.casic.missiles.dto.resource.environment;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/6/8 13:56
+ */
+@ApiModel
+@Data
+public class LocationListRequest {
+    @ApiModelProperty(value = "地点编号", dataType = "String")
+    private String locationNo;
+
+    @ApiModelProperty(value = "地点名称", dataType = "String")
+    private String locationName;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/environment/LocationListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/environment/LocationListResponse.java
new file mode 100644
index 0000000..4c531af
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/environment/LocationListResponse.java
@@ -0,0 +1,78 @@
+package com.casic.missiles.dto.resource.environment;
+
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
+import com.baomidou.mybatisplus.annotation.TableField;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description: 地点列表响应实体
+ * @Author: wangpeng
+ * @Date: 2023/6/8 13:53
+ */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
+@ApiModel
+@Data
+public class LocationListResponse {
+    @ApiModelProperty(value = "主键id", dataType = "Long")
+    private Long id;
+
+    /**
+     * 地点编号
+     */
+    @ExcelProperty("地点编号")
+    @ApiModelProperty(value = "地点编号", dataType = "String")
+    private String locationNo;
+
+    /**
+     * 地点名称
+     */
+    @ExcelProperty("地点名称")
+    @ApiModelProperty(value = "地点名称", dataType = "String")
+    private String locationName;
+
+    /**
+     * 地点位置
+     */
+    @ExcelProperty("地点位置")
+    @ApiModelProperty(value = "地点位置", dataType = "String")
+    private String locationPosition;
+
+    /**
+     * 创建人id
+     */
+    @ApiModelProperty(value = "创建人id", dataType = "Long")
+    private Long createUserId;
+
+    /**
+     * 创建人
+     */
+    @ExcelProperty("创建人")
+    @ApiModelProperty(value = "创建人", dataType = "String")
+    @TableField("create_user")
+    private String createUser;
+
+    /**
+     * 创建时间
+     */
+    @ExcelProperty("创建时间")
+    @ApiModelProperty(value = "创建时间", dataType = "String")
+    private String createTime;
+
+    /**
+     * 更新时间
+     */
+    @ApiModelProperty(value = "更新时间", dataType = "String")
+    private String updateTime;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertRequest.java
index 9a7f6c6..c827915 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertRequest.java
@@ -4,6 +4,8 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * @Description:
  * @Author: wangpeng
@@ -16,4 +18,7 @@
     private String name;
     @ApiModelProperty(value = "部门名", dataType = "String")
     private String deptName;
+
+    @ApiModelProperty(value = "导出ids", dataType = "List")
+    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertResponse.java
index f78b159..8f2f79e 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertResponse.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.dto.resource.staff;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.casic.missiles.annotation.DictCodeField;
 import com.casic.missiles.constants.MeterDictCode;
 import io.swagger.annotations.ApiModel;
@@ -13,12 +20,18 @@
  * @Author: wangpeng
  * @Date: 2023/7/27 15:13
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @ApiModel
 @Data
 public class StaffCertResponse {
     /**
      * 人员编号
      */
+    @ExcelProperty(value = "人员编号",order = 0)
     @NotEmpty(message = "人员编号不能为空")
     @ApiModelProperty(value = "人员编号", dataType = "String")
     private String staffNo;
@@ -26,6 +39,7 @@
     /**
      * 姓名
      */
+    @ExcelProperty(value = "姓名",order = 1)
     @ApiModelProperty(value = "姓名", dataType = "String")
     private String staffName;
 
@@ -54,6 +68,7 @@
     /**
      * 部门名字
      */
+    @ExcelProperty(value = "工作部门",order = 2)
     @ApiModelProperty(value = "部门名字", dataType = "String")
     private String deptName;
 
@@ -66,6 +81,7 @@
     /**
      * 计量专业
      */
+    @ExcelProperty(value = "计量专业",order = 3)
     @ApiModelProperty(value = "计量专业", dataType = "String")
     private String major;
 
@@ -110,6 +126,7 @@
     /**
      * 证书号
      */
+    @ExcelProperty(value = "证号",order = 4)
     @ApiModelProperty(value = "证书号", dataType = "String")
     private String certNo;
 
@@ -122,12 +139,14 @@
     /**
      * 有效日期
      */
+    @ExcelProperty(value = "证书有效期",order = 6)
     @ApiModelProperty(value = "有效日期", dataType = "String")
     private String effectiveDate;
 
     /**
      * 发放日期
      */
+    @ExcelProperty(value = "发证日期",order = 5)
     @ApiModelProperty(value = "发放日期", dataType = "String")
     private String grantDate;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffListRequest.java
index 7c4afb3..0a1194a 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffListRequest.java
@@ -4,6 +4,8 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * @Description:
  * @Author: wangpeng
@@ -18,4 +20,7 @@
     private String deptName;
     @ApiModelProperty(value = "部门id", dataType = "Long")
     private Long deptId;
+
+    @ApiModelProperty(value = "导出ids", dataType = "List")
+    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/TrainListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/TrainListRequest.java
index f68597b..6321f8b 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/TrainListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/TrainListRequest.java
@@ -14,6 +14,8 @@
 public class TrainListRequest {
     @ApiModelProperty(value = "训练登记表编号", dataType = "String")
     private String trainNo;
+    @ApiModelProperty(value = "值班领导", dataType = "String")
+    private String dutyLeader;
     @ApiModelProperty(value = "创建开始时间", dataType = "String")
     private String createTimeStart;
     @ApiModelProperty(value = "创建结束时间", dataType = "String")
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/SignAddRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/SignAddRequest.java
index 117be34..d71055c 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/SignAddRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/SignAddRequest.java
@@ -43,13 +43,6 @@
     private Long signUserId;
 
     /**
-     * 签章或签名-字典code
-     */
-    @NotBlank(message = "类型不能为空")
-    @ApiModelProperty(value = "签名/签章-字典code", dataType = "String", required = true)
-    private String signType;
-
-    /**
      * minio存储文件名
      */
     @ApiModelProperty(value = "上传文件返回名称", dataType = "String")
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateAddRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateAddRequest.java
index aff1265..6316648 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateAddRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateAddRequest.java
@@ -17,30 +17,28 @@
 @Data
 public class TemplateAddRequest extends BaseSystemRequest {
     /**
-     * 原始记录模板/证书报告模板名称
+     * 模板名称
      */
     @ApiModelProperty(value = "名称", dataType = "String", required = true)
     @NotBlank(message = "名称不能为空")
     private String templateName;
 
     /**
-     * 原始记录模板/证书报告模板描述
+     * 模板描述
      */
     @ApiModelProperty(value = "描述", dataType = "String")
     private String templateDesc;
 
     /**
-     * 原始记录模板/证书报告模板创建人
+     * 创建人
      */
     @ApiModelProperty(value = "创建人", dataType = "String", required = true)
     @NotBlank(message = "创建人不能为空")
     private String templateCreator;
 
-    /**
-     * 原始记录模板/证书报告模板-字典code
-     */
-    @NotBlank(message = "类型不能为空")
-    @ApiModelProperty(value = "原始记录模板/证书报告模板-字典code", dataType = "String", required = true)
+
+    @NotBlank(message = "模板类型不能为空")
+    @ApiModelProperty(value = "模板类型(字典code)", dataType = "String", required = true)
     private String templateType;
 
     /**

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java
index bb0c50f..13a699b 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java
@@ -12,6 +12,7 @@
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.IGeneralApprovalService;
+import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
@@ -19,6 +20,7 @@
 import org.springframework.web.bind.annotation.RequestBody;
 
 import javax.validation.Valid;
+import java.util.List;
 import java.util.Objects;
 
 /**
@@ -117,4 +119,17 @@
         }
         return baseApprovalService.failUpdate(request);
     }
+
+    public List<O> exportList(@RequestBody @Valid R request) throws Exception {
+        List<O> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = baseApprovalService.listExportByIds(request.getIds());
+        } else {
+            list = baseApprovalService.listExport(request);
+        }
+        for (O record : list) {
+            DictCodeUtils.convertDictCodeToName(record);
+        }
+        return list;
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java
index 8a90961..d775831 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java
@@ -5,6 +5,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.business.certificate.CertificateChangeApplyApprovalListRequest;
 import com.casic.missiles.dto.business.certificate.CertificateChangeApplySaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessCertificateChangeApply;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
@@ -20,6 +21,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -48,4 +50,12 @@
         }
         return changeApplyService.saveChangeApply(request);
     }
+
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody CertificateChangeApplyApprovalListRequest request) throws Exception {
+        List<BizBusinessCertificateChangeApply> list = super.exportList(request);
+        super.exportExcel(BizBusinessCertificateChangeApply.class, list, ExportEnum.CERTIFICATE_CHANGE_APPLY.getSheetName());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java
index 5fc4b07..af8230e 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java
@@ -9,6 +9,7 @@
 import com.casic.missiles.dto.business.certificate.CertificatePrintApprovalListRequest;
 import com.casic.missiles.dto.business.certificate.CertificatePrintListResponse;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.enums.business.CertificatePrintStatusEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessCertificatePrintLog;
@@ -18,10 +19,16 @@
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.io.IOException;
+import java.util.List;
 import java.util.Objects;
 
 /**
@@ -98,4 +105,16 @@
         });
         return certificatePrintService.certificatePrintLog(idDTO.getId());
     }
+
+    @ApiOperation("证书打印审批导出")
+    @PostMapping("/listExport")
+    public void exportList(@RequestBody CertificatePrintApprovalListRequest request) throws IOException {
+        List<CertificatePrintListResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = certificatePrintService.listByIds(request.getIds());
+        } else {
+            list = certificatePrintService.list(request);
+        }
+        super.exportExcel(CertificatePrintListResponse.class, list, ExportEnum.CERTIFICATE_PRINT.getSheetName());
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java
index 63b06dc..6b2efd5 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java
@@ -6,6 +6,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.business.certificate.CertificateReportApprovalListRequest;
 import com.casic.missiles.dto.business.certificate.CertificateReportSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessCertificateReport;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
@@ -21,6 +22,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -50,7 +52,7 @@
         return certificateReportService.saveCertificateReport(request);
     }
 
-    @ApiOperation("证书审批详情（基本信息）")
+    @ApiOperation("详情（基本信息）")
     @PostMapping("/detail")
     public ReturnDTO<BizBusinessCertificateReport> detail(@RequestBody @Valid BaseDetailRequest request, BindingResult bindingResult) throws Exception {
         if(bindingResult.hasErrors()){
@@ -59,4 +61,11 @@
         return certificateReportService.detail(request);
     }
 
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody CertificateReportApprovalListRequest request) throws Exception {
+        List<BizBusinessCertificateReport> list = super.exportList(request);
+        super.exportExcel(BizBusinessCertificateReport.class, list, ExportEnum.CERTIFICATE_REPORT.getSheetName());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java
index 46b26bd..57c0809 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java
@@ -10,20 +10,21 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.business.identify.IdentifyListRequest;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessIdentifyInfo;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.business.IBizBusinessIdentifyInfoService;
+import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import javax.validation.Valid;
+import java.util.List;
 import java.util.Objects;
 
 /**
@@ -57,16 +58,13 @@
         return identifyInfoService.addIdentify(identifyInfo);
     }
 
-    @ApiOperation("标识打印更新")
+    @ApiOperation("标识打印更新（更新打印时间）")
     @PostMapping("/update")
-    public ReturnDTO updateIdentify(@RequestBody @Valid BizBusinessIdentifyInfo identifyInfo, BindingResult bindingResult) {
-        Assert.isFalse(Objects.isNull(identifyInfo.getId()), () -> {
+    public ReturnDTO updateIdentify(@RequestBody @Valid IdDTO idDTO) {
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        Assert.isFalse(bindingResult.hasErrors(), () -> {
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        });
-        return identifyInfoService.updateIdentify(identifyInfo);
+        return identifyInfoService.updateIdentify(idDTO.getId());
     }
 
     @ApiOperation("标识打印删除")
@@ -77,4 +75,37 @@
         });
         return identifyInfoService.deleteIdentify(idDTO.getId());
     }
+
+    @ApiOperation("标识打印导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody @Valid IdentifyListRequest request, BindingResult bindingResult) throws Exception {
+        if (bindingResult.hasErrors()) {
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        List<BizBusinessIdentifyInfo> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = identifyInfoService.listByIds(request.getIds());
+        } else {
+            list = identifyInfoService.list(request);
+        }
+        for (BizBusinessIdentifyInfo record : list) {
+            DictCodeUtils.convertDictCodeToName(record);
+        }
+        super.exportExcel(BizBusinessIdentifyInfo.class, list, ExportEnum.IDENTIFY_EXPORT.getSheetName());
+    }
+
+
+    // TODO: 2023/8/23 查询设备信息，4个底部按钮查设备（按钮的作用就是前端用来调不同接口、用来区分中间即将展示的标识），前端弹窗选设备，在确定保存时前端根据底部按钮判断传入设备类型deviceType字典code
+    // TODO: 2023/8/23 接口：查受检设备（第1个按钮），查设备台账（后3个按钮同一接口），查询之后前端根据标志类型的不同加到中间页面时进行判断（按产品给的对应表）
+    // TODO: 2023/8/23 提供二维码接口，前端在加到中间页面时调用一下
+
+    @ApiOperation("设备二维码")
+    @PostMapping("/equipment/qrCode")
+    public ReturnDTO<String> equipmentQrCode(@RequestBody @Valid IdDTO idDTO) {
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return identifyInfoService.equipmentQrCode(idDTO.getId());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java
index 707be6e..7e0453d 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java
@@ -117,7 +117,7 @@
     }
 
     @ApiOperation("任务单导出")
-    @PostMapping("/export")
+    @PostMapping("/listExport")
     public void orderExport(@RequestBody @Valid OrderListRequest request, HttpServletResponse response) {
         businessOrderService.orderExport(request, response);
     }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java
index 529a6ce..51432be 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java
@@ -1,9 +1,28 @@
 package com.casic.missiles.controller.business;
 
+import com.casic.missiles.controller.GeneralApprovalController;
+import com.casic.missiles.dto.BaseApprovalSubmitRequest;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.business.outsource.OutsourceAssessApprovalListRequest;
+import com.casic.missiles.dto.business.outsource.OutsourceAssessSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
+import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.model.business.BizBusinessOutsourceAssess;
+import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
+import com.casic.missiles.service.IGeneralApprovalService;
+import com.casic.missiles.service.business.IBizBusinessOutsourceAssessService;
 import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.BindingResult;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.validation.Valid;
+import java.util.List;
+
 /**
  * <p>
  * 计量检定业务-分包管理-测试、校准或检定工作分包评审表 前端控制器
@@ -15,6 +34,27 @@
 @Api(tags = "分包管理-测试、校准或检定工作分包评审表")
 @RestController
 @RequestMapping("/business/outsource/assess")
-public class BizBusinessOutsourceAssessController {
+public class BizBusinessOutsourceAssessController extends GeneralApprovalController<BizBusinessOutsourceAssess, BizBusinessOutsourceAssess, OutsourceAssessApprovalListRequest, BaseApprovalSubmitRequest> {
+    @Autowired
+    private IBizBusinessOutsourceAssessService outsourceAssessService;
 
+    public BizBusinessOutsourceAssessController(IGeneralApprovalService<BizBusinessOutsourceAssess, BizBusinessOutsourceAssess, OutsourceAssessApprovalListRequest, BaseApprovalSubmitRequest> baseApprovalService) {
+        super(baseApprovalService);
+    }
+
+    @ApiOperation("草稿箱-保存")
+    @PostMapping("/save")
+    public ReturnDTO<OutsourceAssessSaveResponse> saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceAssess request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        return outsourceAssessService.saveOutsourceAssess(request);
+    }
+
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception {
+        List<BizBusinessOutsourceAssess> list = super.exportList(request);
+        super.exportExcel(BizBusinessOutsourceAssess.class, list, ExportEnum.OUTSOURCE_ASSESS.getSheetName());
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java
new file mode 100644
index 0000000..9adef18
--- /dev/null
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java
@@ -0,0 +1,60 @@
+package com.casic.missiles.controller.business;
+
+import com.casic.missiles.controller.GeneralApprovalController;
+import com.casic.missiles.dto.BaseApprovalSubmitRequest;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.business.outsource.OutsourceProtocolApprovalListRequest;
+import com.casic.missiles.dto.business.outsource.OutsourceProtocolSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
+import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.model.business.BizBusinessOutsourceProtocol;
+import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
+import com.casic.missiles.service.IGeneralApprovalService;
+import com.casic.missiles.service.business.IBizBusinessOutsourceProtocolService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.BindingResult;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.validation.Valid;
+import java.util.List;
+
+/**
+ * <p>
+ * 计量检定业务-分包管理-测试、校准或检定工作分包协议书 前端控制器
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-08-24
+ */
+@Api(tags = "分包管理-测试、校准或检定工作分包协议书")
+@RestController
+@RequestMapping("/business/outsource/protocol")
+public class BizBusinessOutsourceProtocolController extends GeneralApprovalController<BizBusinessOutsourceProtocol, BizBusinessOutsourceProtocol, OutsourceProtocolApprovalListRequest, BaseApprovalSubmitRequest> {
+    @Autowired
+    private IBizBusinessOutsourceProtocolService outsourceProtocolService;
+
+    public BizBusinessOutsourceProtocolController(IGeneralApprovalService<BizBusinessOutsourceProtocol, BizBusinessOutsourceProtocol, OutsourceProtocolApprovalListRequest, BaseApprovalSubmitRequest> baseApprovalService) {
+        super(baseApprovalService);
+    }
+
+    @ApiOperation("草稿箱-保存")
+    @PostMapping("/save")
+    public ReturnDTO<OutsourceProtocolSaveResponse> saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceProtocol request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        return outsourceProtocolService.saveOutsourceProtocol(request);
+    }
+
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody OutsourceProtocolApprovalListRequest request) throws Exception {
+        List<BizBusinessOutsourceProtocol> list = super.exportList(request);
+        super.exportExcel(BizBusinessOutsourceProtocol.class, list, ExportEnum.OUTSOURCE_PROTOCOL.getSheetName());
+    }
+}
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java
index 097f645..f0f0943 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java
@@ -17,7 +17,6 @@
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.IGeneralApprovalService;
 import com.casic.missiles.service.business.IBizBusinessOutsourcerInfoService;
-import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -71,19 +70,8 @@
 
     @ApiOperation("分包方导出")
     @PostMapping("/listExport")
-    public void export(@RequestBody @Valid OutsourcerInfoApprovalListRequest request, BindingResult bindingResult) throws Exception {
-        if (bindingResult.hasErrors()) {
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        }
-        List<BizBusinessOutsourcerInfo> list;
-        if (!CollectionUtils.isEmpty(request.getIds())) {
-            list = outsourcerInfoService.listByIds(request.getIds());
-        } else {
-            list = outsourcerInfoService.list(request);
-        }
-        for (BizBusinessOutsourcerInfo record : list) {
-            DictCodeUtils.convertDictCodeToName(record);
-        }
+    public void export(@RequestBody OutsourcerInfoApprovalListRequest request) throws Exception {
+        List<BizBusinessOutsourcerInfo> list = super.exportList(request);
         super.exportExcel(BizBusinessOutsourcerInfo.class, list, ExportEnum.OUTSOURCER_EXPORT.getSheetName());
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java
index c2cbf9f..0410918 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java
@@ -17,11 +17,9 @@
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.IGeneralApprovalService;
 import com.casic.missiles.service.business.IBizBusinessSiteExecutiveInfoService;
-import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -60,7 +58,7 @@
         return siteExecutiveInfoService.saveSiteExecutiveInfo(siteExecutiveInfo);
     }
 
-    @ApiOperation("现场检测详情")
+    @ApiOperation("详情")
     @PostMapping("/detail")
     public ReturnDTO<SiteExecutiveDetailResponse> siteExecutiveDetail(@RequestBody @Valid IdDTO idDTO) throws Exception {
         Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
@@ -69,21 +67,10 @@
         return ReturnUtil.success(siteExecutiveInfoService.detail(idDTO.getId()));
     }
 
-    @ApiOperation("现场检测导出")
+    @ApiOperation("导出")
     @PostMapping("/listExport")
-    public void export(@RequestBody @Valid SiteExecutiveApprovalListRequest request, BindingResult bindingResult) throws Exception {
-        if (bindingResult.hasErrors()) {
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        }
-        List<SiteExecutiveApprovalListResponse> list;
-        if (!CollectionUtils.isEmpty(request.getIds())) {
-            list = siteExecutiveInfoService.listInfoByIds(request.getIds());
-        } else {
-            list = siteExecutiveInfoService.listInfo(request);
-        }
-        for (SiteExecutiveApprovalListResponse record : list) {
-            DictCodeUtils.convertDictCodeToName(record);
-        }
+    public void export(@RequestBody SiteExecutiveApprovalListRequest request) throws Exception {
+        List<SiteExecutiveApprovalListResponse> list = super.exportList(request);
         super.exportExcel(SiteExecutiveApprovalListResponse.class, list, ExportEnum.SITE_EXECUTIVE_EXPORT.getSheetName());
     }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
index 7e793cd..a92e209 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
@@ -55,7 +55,7 @@
 
     @ApiOperation("设备收发列表导出")
     @PostMapping("/export")
-    public void exportList(@RequestBody @Valid SampleDispatchListRequest request) throws IOException {
+    public void exportList(@RequestBody SampleDispatchListRequest request) throws IOException {
         List<SampleDispatchListResponse> list;
         if (!CollectionUtils.isEmpty(request.getIds())) {
             list = dispatchService.listByIds(request.getIds());
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java
index cdc77fc..d120fd4 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java
@@ -7,6 +7,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.business.labExecutive.*;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.business.IBusinessLabExecutiveInfoService;
@@ -14,6 +15,7 @@
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.*;
 
@@ -32,7 +34,7 @@
     @Autowired
     private IBusinessLabExecutiveInfoService labExecutiveInfoService;
 
-    @ApiOperation("实验室检测-部门检测-查询各状态列表（待检测、检测中、检测完）")
+    @ApiOperation("实验室任务-查询各状态列表（待检测、检测中、检测完）")
     @PostMapping("/deptExecutive/List")
     public ReturnDTO<PageInfoBT<SampleLabExecutiveListResponse>> queryDeptExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
@@ -43,10 +45,19 @@
         return ReturnUtil.success(super.packForBT(labExecutiveInfoService.deptLabExecutiveListPage(page, labExecutiveListRequest)));
     }
 
-    /**
-     * 实验室检测-我的检测-查询各状态列表（待检测、检测中、检测完）
-     */
-    @ApiOperation("实验室检测-我的检测-查询各状态列表（待检测、检测中、检测完）")
+    @ApiOperation("实验室任务导出")
+    @PostMapping("/deptExecutive/export")
+    public void deptExportList(@RequestBody @Valid SampleLabExecutiveListRequest request) throws Exception {
+        List<SampleLabExecutiveListResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = labExecutiveInfoService.deptLabExecutiveListByIds(request.getMeasureStatus(), request.getIds());
+        } else {
+            list = labExecutiveInfoService.deptLabExecutiveList(request);
+        }
+        super.exportExcel(SampleLabExecutiveListResponse.class, list, ExportEnum.DEPT_EXECUTIVE_TASK.getSheetName());
+    }
+
+    @ApiOperation("我的任务-查询各状态列表（待检测、检测中、检测完）")
     @PostMapping("/myExecutive/list")
     public ReturnDTO<PageInfoBT<SampleLabExecutiveListResponse>> queryMyExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
@@ -57,19 +68,25 @@
         return ReturnUtil.success(super.packForBT(labExecutiveInfoService.myLabExecutiveListPage(page, labExecutiveListRequest)));
     }
 
-    /**
-     * 实验室检测-我的检测-查询各状态样品数量（待检测、检测中、检测完）
-     */
-    @ApiOperation("实验室检测-我的检测-查询各状态样品数量（待检测、检测中、检测完）")
+    @ApiOperation("我的任务导出")
+    @PostMapping("/myExecutive/export")
+    public void exportList(@RequestBody @Valid SampleLabExecutiveListRequest request) throws Exception {
+        List<SampleLabExecutiveListResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = labExecutiveInfoService.myLabExecutiveListByIds(request.getMeasureStatus(), request.getIds());
+        } else {
+            list = labExecutiveInfoService.myLabExecutiveList(request);
+        }
+        super.exportExcel(SampleLabExecutiveListResponse.class, list, ExportEnum.MY_EXECUTIVE_TASK.getSheetName());
+    }
+
+    @ApiOperation("我的任务-查询各状态样品数量（待检测、检测中、检测完）")
     @GetMapping("/myExecutive/amount")
     public ReturnDTO<List<SampleAmountResponse>> queryMyExecutiveAmount() {
         return ReturnUtil.success(labExecutiveInfoService.myExecutiveAmount());
     }
 
-    /**
-     * 实验室检测-部门检测-分配（分配给具体人员）
-     */
-    @ApiOperation("实验室检测-部门检测-分配按钮（分配给具体人员）")
+    @ApiOperation("实验室任务-分配按钮（分配给具体人员）")
     @PostMapping("/deptExecutive/allocate")
     public ReturnDTO allocateStaff(@RequestBody @Valid SampleAllocateRequest sampleAllocateRequest, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -78,10 +95,7 @@
         return labExecutiveInfoService.allocateStaff(sampleAllocateRequest);
     }
 
-    /**
-     * 实验室检测-我的检测-检定人扫描收入（待检测->检测中）
-     */
-    @ApiOperation("实验室检测-我的检测-检定人扫描收入（待检测->检测中）")
+    @ApiOperation("我的任务-检定人扫描收入（待检测->检测中）")
     @PostMapping("/myExecutive/receive")
     public ReturnDTO sampleReceive(@RequestBody @Valid List<SampleOperateRequest> requestList, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -90,10 +104,7 @@
         return labExecutiveInfoService.sampleReceive(requestList);
     }
 
-    /**
-     * 实验室检测-负责人/检定人扫描检完（检测中->检测完）
-     */
-    @ApiOperation("实验室检测-负责人/检定人扫描检完（检测中->检测完）")
+    @ApiOperation("实验室任务-负责人/检定人扫描检完（检测中->检测完）")
     @PostMapping("/myExecutive/complete")
     public ReturnDTO sampleExecutiveComplete(@RequestBody @Valid List<SampleOperateRequest> requestList, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -102,10 +113,7 @@
         return labExecutiveInfoService.sampleExecutiveComplete(requestList);
     }
 
-    /**
-     * 实验室检测-部门检测/我的检测 编辑（只能修改应出具证书）
-     */
-    @ApiOperation("实验室检测-部门检测/我的检测 编辑（只能修改应出具证书）")
+    @ApiOperation("实验室任务/我的任务 编辑（只能修改应出具证书）")
     @PostMapping("/executive/update")
     public ReturnDTO updateExecutive(@RequestBody @Valid UpdateExecutiveRequest request, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -114,10 +122,7 @@
         return labExecutiveInfoService.updateExecutive(request);
     }
 
-    /**
-     * 实验室检测-部门检测/我的检测 详情
-     */
-    @ApiOperation("实验室检测-部门检测/我的检测 详情")
+    @ApiOperation("实验室任务/我的任务 详情")
     @PostMapping("/executive/detail")
     public ReturnDTO<ExecutiveDetailResponse> executiveDetail(@RequestBody @Valid ExecutiveDetailRequest request, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
@@ -131,7 +136,7 @@
      * 退回后会将下一个要执行的实验室检测状态更新为待分配，将后面的实验室顺序变更为连续（都进行减1）
      * 最后一个检测的实验室退回，等分发员再增加实验室或设备收发中的已收入直接手动点击完成
      */
-    @ApiOperation("实验室检测-部门检测/我的检测 退回（待检测/检测中->退回）")
+    @ApiOperation("实验室任务/我的任务 退回（待检测/检测中->退回）")
     @PostMapping("/executive/sendBack")
     public ReturnDTO executiveSendBack(@RequestBody @Valid ExecutiveSendBackRequest request, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -140,9 +145,6 @@
         return labExecutiveInfoService.sampleExecutiveSendBack(request);
     }
 
-    /**
-     * 分发员编辑实验室检测列表
-     */
     @ApiOperation("分发员编辑实验室检测列表")
     @PostMapping("/handOut/updateList")
     public ReturnDTO updateExecutiveList(@RequestBody @Valid UpdateExecutiveListRequest request, BindingResult bindingResult) {
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java
index 48a67ed..0c04f31 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java
@@ -10,6 +10,7 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.resource.customer.CustomerApprovalListRequest;
 import com.casic.missiles.dto.resource.customer.CustomerSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceCustomerInfo;
@@ -26,6 +27,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -55,6 +57,13 @@
         return customerInfoService.saveCustomerInfo(request);
     }
 
+    @ApiOperation("委托方名录导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody CustomerApprovalListRequest request) throws Exception {
+        List<BizResourceCustomerInfo> list = super.exportList(request);
+        super.exportExcel(BizResourceCustomerInfo.class, list, ExportEnum.CUSTOMER_INFO.getSheetName());
+    }
+
     @ApiOperation("委托方人员列表（分页）")
     @PostMapping("/person/listPage")
     public ReturnDTO<PageInfoBT<BizResourceCustomerStaff>> personListPage(@RequestBody IdDTO idDto) {
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
index 972ed4b..6418ea5 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
@@ -5,6 +5,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.resource.customer.SuggestFormApprovalListRequest;
 import com.casic.missiles.dto.resource.customer.SuggestFormSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceCustomerSuggestForm;
@@ -20,6 +21,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -50,4 +52,11 @@
         return suggestFormService.saveSuggestForm(request);
     }
 
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody SuggestFormApprovalListRequest request) throws Exception {
+        List<BizResourceCustomerSuggestForm> list = super.exportList(request);
+        super.exportExcel(BizResourceCustomerSuggestForm.class, list, ExportEnum.CUSTOMER_SUGGEST_FORM.getSheetName());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java
index 1934d1a..9e07eab 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java
@@ -15,12 +15,16 @@
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.resource.IEnvEnvironmentRecordConfigService;
 import com.casic.missiles.service.resource.IEnvEnvironmentRecordDataService;
+import com.casic.missiles.service.resource.IEnvLocationInfoService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
 import java.util.List;
@@ -39,6 +43,8 @@
     private IEnvEnvironmentRecordDataService environmentRecordDataService;
     @Autowired
     private IEnvEnvironmentRecordConfigService environmentRecordConfigService;
+    @Autowired
+    private IEnvLocationInfoService locationInfoService;
 
     @ApiOperation("环境记录单数据列表/详情")
     @PostMapping("/data/listPage")
@@ -95,4 +101,11 @@
         });
         return environmentRecordConfigService.deleteEnvironmentRecordConfig(idDTO.getId());
     }
+
+    @ApiOperation("地点列表")
+    @PostMapping("/location/listPage")
+    public ReturnDTO<PageInfoBT<LocationListResponse>> locationListPage(@RequestBody @Valid LocationListRequest request) {
+        Page<LocationListResponse> page = PageFactory.defaultPage();
+        return ReturnUtil.success(super.packForBT(locationInfoService.listPage(page, request)));
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java
index 82efe3f..e9561fa 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java
@@ -10,6 +10,7 @@
 import com.casic.missiles.dto.resource.seal.SealLogListRequest;
 import com.casic.missiles.dto.resource.seal.SealNoteApprovalListRequest;
 import com.casic.missiles.dto.resource.seal.SealNoteSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceSealUseLog;
@@ -27,6 +28,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -58,6 +60,13 @@
         return sealUseNoteService.saveSeal(request);
     }
 
+    @ApiOperation("印章使用登记导出（列表和导出中去掉经办人和监印人）")
+    @PostMapping("/listExport")
+    public void export(@RequestBody SealNoteApprovalListRequest request) throws Exception {
+        List<BizResourceSealUseNote> list = super.exportList(request);
+        super.exportExcel(BizResourceSealUseNote.class, list, ExportEnum.SEAL_NOTE.getSheetName());
+    }
+
     // TODO: 2023/7/28 印章使用日志：系统中使用印章时插入数据库
 
     @ApiOperation("印章使用日志列表（分页）")
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java
index 9b674fc..06b6521 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java
@@ -9,16 +9,20 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.resource.staff.StaffCertRequest;
 import com.casic.missiles.dto.resource.staff.StaffCertResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.service.resource.IBizResourceStaffInfoService;
 import com.casic.missiles.service.resource.IBizResourceStaffVerifierService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.List;
+
 /**
  * @Description:
  * @Author: wangpeng
@@ -41,9 +45,21 @@
         return ReturnUtil.success(super.packForBT(responsePage));
     }
 
+    @ApiOperation("证书逾期提醒导出")
+    @PostMapping("/listExport")
+    public void exportList(@RequestBody StaffCertRequest request) throws Exception {
+        List<StaffCertResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = staffInfoService.certListByIds(request.getIds());
+        } else {
+            list = staffInfoService.certList(request);
+        }
+        super.exportExcel(StaffCertResponse.class, list, ExportEnum.STAFF_CERTIFICATE_EXPIRE.getSheetName());
+    }
+
     @ApiOperation("证书逾期提醒")
     @PostMapping("/expirationReminder")
-    public ReturnDTO expirationReminder(@RequestBody IdDTO idDto) {
-        return verifierService.expirationReminder(idDto);
+    public ReturnDTO expirationReminder(@RequestBody IdDTO idDTO) {
+        return verifierService.expirationReminder(idDTO);
     }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java
index 3b251ad..a6e7850 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java
@@ -12,6 +12,7 @@
 import com.casic.missiles.dto.resource.staff.StaffListRequest;
 import com.casic.missiles.dto.resource.staff.TrainListRequest;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.*;
@@ -22,7 +23,10 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
 import java.util.List;
@@ -52,8 +56,19 @@
             throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
         }
         Page<BizResourceStaffInfo> page = PageFactory.defaultPage();
-        Page<BizResourceStaffInfo> responsePage = staffInfoService.listPage(page, request);
-        return ReturnUtil.success(super.packForBT(responsePage));
+        return ReturnUtil.success(super.packForBT(staffInfoService.listPage(page, request)));
+    }
+
+    @ApiOperation("人员登记导出")
+    @PostMapping("/listExport")
+    public void exportList(@RequestBody StaffListRequest request) throws Exception {
+        List<BizResourceStaffInfo> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = staffInfoService.listByIds(request.getIds());
+        } else {
+            list = staffInfoService.list(request);
+        }
+        super.exportExcel(BizResourceStaffInfo.class, list, ExportEnum.STAFF_INFO.getSheetName());
     }
 
     @ApiOperation("人员登记详情基础信息")
@@ -85,9 +100,9 @@
 
     @ApiOperation("科研教育列表（分页）")
     @PostMapping("/education/listPage")
-    public ReturnDTO<PageInfoBT<BizResourceStaffEducation>> educationListPage(@RequestBody IdDTO idDto) {
+    public ReturnDTO<PageInfoBT<BizResourceStaffEducation>> educationListPage(@RequestBody IdDTO idDTO) {
         Page<BizResourceStaffEducation> page = PageFactory.defaultPage();
-        Page<BizResourceStaffEducation> responsePage = staffInfoService.educationListPage(page, idDto);
+        Page<BizResourceStaffEducation> responsePage = staffInfoService.educationListPage(page, idDTO);
         return ReturnUtil.success(super.packForBT(responsePage));
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java
index af6aa86..d85d84a 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java
@@ -9,6 +9,7 @@
 import com.casic.missiles.dto.resource.outsideService.SupplierApprovalListRequest;
 import com.casic.missiles.dto.resource.outsideService.SupplierSaveResponse;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceSupplierAbility;
@@ -67,6 +68,13 @@
         return ReturnUtil.success(supplierInfoService.detail(idDTO.getId()));
     }
 
+    @ApiOperation("合格供方导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody SupplierApprovalListRequest request) throws Exception {
+        List<BizResourceSupplierInfo> list = super.exportList(request);
+        super.exportExcel(BizResourceSupplierInfo.class, list, ExportEnum.SUPPLIER_INFO.getSheetName());
+    }
+
     @ApiOperation("供方人员列表（分页）")
     @PostMapping("/person/listPage")
     public ReturnDTO<PageInfoBT<BizResourceSupplierPerson>> personListPage(@RequestBody IdDTO idDTO) {
diff --git a/casic-metering-api/src/main/resources/config/application.yml b/casic-metering-api/src/main/resources/config/application.yml
index 350db5f..ecff521 100644
--- a/casic-metering-api/src/main/resources/config/application.yml
+++ b/casic-metering-api/src/main/resources/config/application.yml
@@ -126,7 +126,7 @@
     #作者
     author: wangpeng
     #待生成对象表名
-    table-name: biz_equipment_technical_target_approval,biz_equipment_attachment_approval,biz_equipment_checkpoint_approval
+    table-name: biz_business_outsource_protocol
 
 reminder:
   #节点--common模块config包 ReminderNodeConfig配置
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
index 4a19e4e..d47d552 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
@@ -53,6 +53,7 @@
     SUGGEST_FORM_SAVE_FAILED(2509, "委托方意见登记表保存至草稿箱失败"),
     EXAMINE_FORM_SAVE_FAILED(2510, "要求、委托书及合同评审表保存至草稿箱失败"),
     CUSTOMER_EXIST_SAVE_FAILED(2511, "该委托方已存在，请重新选择"),
+    DUPLICATE_LOCATION_NO(2512, "地点编号已存在"),
 
     /**
      * 计量检定业务模块
@@ -68,6 +69,8 @@
     COMPLETE_SAMPLE_NOT_EXIST(2609, "检测中不存在扫描收入的样品"),
     CANNOT_CHANGE_MEASURE_INFO(2610, "无法更改非当前登录用户的检测信息"),
     NON_EXIST_ORDER_OR_SAMPLE(2611, "不存在该委托单或该委托单下的样品"),
+    OUTSOURCE_ACCESS_SAVE_FAILED(2612, "测试、校准或检定工作分包评审表保存至草稿箱失败"),
+    OUTSOURCE_PROTOCOL_SAVE_FAILED(2613, "测试、校准或检定工作分包协议书保存至草稿箱失败"),
 
     /**
      * 历史遗留备用
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
index 5089ad1..81a406b 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
@@ -10,54 +10,38 @@
     /**
      * 资源管理
      */
-    ENVIRONMENT_DATA_EXPORT("environmentData", "environmentData", "环境记录单数据"),
+    ENVIRONMENT_DATA_EXPORT("environmentData", "环境记录单数据", "环境记录单数据"),
+    STAFF_INFO("staffInfo", "人员登记", "人员登记"),
+    STAFF_CERTIFICATE_EXPIRE("certificateExpire", "证书逾期提醒", "证书逾期提醒"),
+    SUPPLIER_INFO("supplierInfo", "合格供方名录", "合格供方名录"),
+    CUSTOMER_INFO("customerInfo", "委托方名录", "委托方名录"),
+    CUSTOMER_SUGGEST_FORM("customerSuggestForm", "委托方意见登记表", "委托方意见登记表"),
+    SEAL_NOTE("sealNote", "印章使用登记", "印章使用登记"),
 
-    FILE_EXPORT("meterFileData", "meterFileData", "计量文件信息"),
-    TRAIN_PLAN_EXPORT("trainPlanData", "trainPlanData", "培训计划"),
-    TRAIN_LOG_EXPORT("trainLogData", "trainLogData", "培训记录"),
-    METER_ORGANIZE_EXPORT("meterOrganizeData", "meterOrganizeData", "计量组织"),
-    TRACE_SUPPLIER_EXPORT("traceSupplierData", "traceSupplierData", "溯源供方"),
-    SIGN_EXPORT("signData", "signData", "签名/签章"),
-    TEMPLATE_EXPORT("templateData", "templateData", "原始记录模板/证书报告模板"),
-    FIXED_ASSETS("meterFixedAssets", "meterFixedAssets", "固定资产"),
-    METER_EQUIPMENT("meterEquipment", "meterEquipment", "测量设备"),
-    CALIBRATION_TEST_EQUIPMENT("calibrationTestEquipment", "calibrationTestEquipment", "校准检定设备"),
-    MEASURE_ACCOUNT("measureAccount", "measureAccount", "测量工装"),
-    STANDARD_SUPPORT_EQUIPMENT("standardSupportEquipment", "standardSupportEquipment", "标准配套设备"),
-    STANDARD_EQUIPMENT("standardEquipment", "standardEquipment", "标准装置"),
-    FLOW_DEF_EXPORT("flowDefData", "flowDefData", "流程定义"),
-    STAFF_CERTIFICATE("certificate", "certificate", "计量人员证书"),
-    CHECK_INFO("checkInfo", "checkInfo", "设备管理点检测"),
-    EQUIPMENT_APPLY("equipmentApply", "equipmentApply", "设备借用"),
-    STANDARD_EQUIPMENT_REMIND("equipmentApplyRemind", "equipmentApplyRemind", "标准装置到期提醒"),
-    METER_PRICE("meterPrice", "meterPrice", "价格库"),
-    METER_STAFF("meterStaff", "meterStaff", "计量人员"),
-    STANDARD_EQUIPMENT_APPLY("standardEquipmentApply", "standardEquipmentApply", "标准装置申请"),
-    STATE_MANAGE_APPLY("stateManage", "stateManage", "状态管理"),
-    METER_ACCEPTANCE_CHECK("acceptanceCheck", "acceptanceCheck", "设备检修保养验收单"),
-    CUSTOMER_EXPORT("customerData", "customerData", "客户信息"),
-    ORDER_EXPORT("orderData", "orderData", "委托书信息"),
-    SAMPLE_EXPORT("sampleData", "sampleData", "样本信息"),
-    EXCHANGE_DATA("exchangeData", "exchangeData", "设备交接单"),
-    DISPATCH_DATA("dispatchData", "dispatchData", "设备收发"),
-    ENVIRONMENT_DATA("environmentData", "environmentData", "环境记录单"),
-    ORIGIN_DATA("originData", "originData", "原始记录"),
-    CERTIFICATE_REPORT("certificateReport", "certificateReport", "证书报告"),
-    ADVICE_EXPORT("adviceData", "adviceData", "客户反馈"),
-    HANDOUT_EXPORT("handoutData", "handoutData", "任务分发列表"),
-    OUTSOURCER_EXPORT("outsourcerData", "outsourcerData", "分包方"),
-    SITE_EXECUTIVE_EXPORT("siteExecutiveData", "siteExecutiveData", "现场测试、校准或检定"),
-    CERTIFICATE_PRINT_EXPORT("certificatePrintData", "certificatePrintData", "证书打印"),
-    DOWNLOAD_TEMPLATE("downloadTemplate", "downloadTemplate", "页面配置"),
-    OUTSOURCER_CERTIFICATE_EXPORT("outsourceCertificateData", "outsourceCertificateData", "分包证书"),
-    SETTLEMENT_INFO_EXPORT("settlementInfoData", "settlementInfoData", "业务结算"),
-    EQUIPMENT_REMIND("equipmentRemind", "equipmentRemind", "设备到期提醒"),
-    AGREEMENT_INFO_EXPORT("agreementInfoData", "agreementInfoData", "合同"),
-    WORK_STATISTICS_EXPORT("workStatisticsData", "workStatisticsData", "实时工作统计"),
-    DEPT_OUTPUT_EXPORT("deptOutputData", "deptOutputData", "部门产值分析"),
-    WORKLOAD_EXPORT("workloadData", "workloadData", "业务工作量分析"),
-    DEPT_COMPREHENSIVE_EXPORT("deptComprehensiveData", "deptComprehensiveData", "部门综合分析"),
-    ENVIRONMENTAL_RECORD("environmentalRecordData", "environmentalRecordData", "现场环境记录");
+    /**
+     * 计量检定业务
+     */
+    OUTSOURCER_EXPORT("outsourcerData", "分包方名录", "分包方名录"),
+    IDENTIFY_EXPORT("identifyData", "计量标识", "计量标识"),
+    ORDER_EXPORT("orderData", "任务单", "任务单"),
+    DISPATCH_DATA("dispatchData", "设备收发", "设备收发"),
+    HANDOUT_EXPORT("handoutData", "任务分发", "任务分发"),
+    SITE_EXECUTIVE_EXPORT("siteExecutiveData", "现场测试、校准或检定", "现场测试、校准或检定"),
+    CERTIFICATE_REPORT("certificateReport", "证书审批", "证书审批"),
+    CERTIFICATE_CHANGE_APPLY("certificateChangeApply", "证书报告补充或更换申请单", "证书报告补充或更换申请单"),
+    CERTIFICATE_PRINT("certificatePrintData", "证书打印审批", "证书打印审批"),
+    DEPT_EXECUTIVE_TASK("deptExecutiveTaskData", "实验室任务", "实验室任务"),
+    MY_EXECUTIVE_TASK("myExecutiveTaskData", "我的任务", "我的任务"),
+    OUTSOURCE_ASSESS("outsourceAssess", "测试、校准或检定工作分包评审表", "测试、校准或检定工作分包评审表"),
+    OUTSOURCE_PROTOCOL("outsourceProtocol", "测试、校准或检定工作分包协议书", "测试、校准或检定工作分包协议书"),
+
+    /**
+     * 系统管理
+     */
+    SIGN_EXPORT("signData", "签名", "签名"),
+    TEMPLATE_EXPORT("templateData", "文件模板", "文件模板"),
+    FLOW_DEF_EXPORT("flowDefData", "流程定义", "流程定义"),
+    DOWNLOAD_TEMPLATE("downloadTemplate", "流程定义", "页面配置");
 
     ExportEnum(String fileName, String sheetName, String description) {
         this.fileName = fileName;
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateRecordTypeCodeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateRecordTypeCodeEnum.java
index 31d913c..a963522 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateRecordTypeCodeEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateRecordTypeCodeEnum.java
@@ -46,4 +46,14 @@
     String SITE_EXECUTIVE_APPROVAL = "01";
     //《现场测试、校准或检定工作记录表》
     String SITE_EXECUTIVE_LOG = "02";
+
+    //测试、校准或检定工作分包协议书
+    String OUTSOURCE_PROTOCOL = "01";
+    //测试、校准或检定工作分包评审表
+    String OUTSOURCE_ACCESS = "02";
+    //测试、校准或检定工作分包通知书
+    String OUTSOURCE_NOTICE = "03";
+    //测试、校准或检定工作分包方名录
+    String OUTSOURCE_INFO = "04";
+
 }
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
index 24b8635..f78bd53 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
@@ -15,6 +15,10 @@
     String CERTIFICATE_CHANGE_APPLY_BEAN_NAME = "certificateChangeApplyBean";
     //现场测试、校准或检定
     String SITE_EXECUTIVE_BEAN_NAME = "siteExecutiveBean";
+    //测试、校准或检定工作分包评审表
+    String OUTSOURCE_ASSESS_BEAN_NAME = "outsourceAssessBean";
+    //测试、校准或检定工作分包协议书
+    String OUTSOURCE_PROTOCOL_BEAN_NAME = "outsourceProtocolBean";
 
     /*********************************设备与装置************************************/
     //设备台账
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 b21c661..6b86fd1 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
@@ -18,6 +18,8 @@
     OUTSOURCER_APPROVAL(OUTSOURCER_BEAN_NAME, ""),
     CERTIFICATE_CHANGE_APPROVAL(CERTIFICATE_CHANGE_APPLY_BEAN_NAME, ""),
     SITE_EXECUTIVE_APPROVAL(SITE_EXECUTIVE_BEAN_NAME, ""),
+    OUTSOURCE_ASSESS_APPROVAL(OUTSOURCE_ASSESS_BEAN_NAME, ""),
+    OUTSOURCE_PROTOCOL_APPROVAL(OUTSOURCE_PROTOCOL_BEAN_NAME, ""),
 
     ACTION_STATUS_MAP(new HashMap<String, AwareActionStatusEnum>() {
         {
@@ -47,6 +49,10 @@
             put(ApplyFromIdEnum.CERTIFICATE_CHANGE_APPROVAL.getCode(), CERTIFICATE_CHANGE_APPROVAL);
             //现场测试、校准或检定审批
             put(ApplyFromIdEnum.SITE_EXECUTIVE_APPROVAL.getCode(), SITE_EXECUTIVE_APPROVAL);
+            //测试、校准或检定工作分包评审表
+            put(ApplyFromIdEnum.OUTSOURCE_ASSESS_APPROVAL.getCode(), OUTSOURCE_ASSESS_APPROVAL);
+            //测试、校准或检定工作分包协议书
+            put(ApplyFromIdEnum.OUTSOURCE_PROTOCOL_APPROVAL.getCode(), OUTSOURCE_PROTOCOL_APPROVAL);
         }
     });
     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 934405e..c7410bd 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
@@ -9,6 +9,8 @@
     CERTIFICATE_CHANGE_APPROVAL("jljdywzsbchghsqd", MessageSourceModuleEnum.BUSINESS.getCode(), "证书/报告补充或更换申请单"),
     OUTSOURCER_APPROVAL("jljdywcsjzhgfbfml", MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定合格分包方名录"),
     SITE_EXECUTIVE_APPROVAL("jljdywxccsjzsp", MessageSourceModuleEnum.BUSINESS.getCode(), "现场测试、校准或检定审批"),
+    OUTSOURCE_ASSESS_APPROVAL("jljdywcsjzfbpsb", MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包评审表"),
+    OUTSOURCE_PROTOCOL_APPROVAL("jljdywcsjzfbxys", MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包协议书"),
 
 
     /*******************************************设备与装置*********************************************/
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/GeneralApprovalMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/GeneralApprovalMapper.java
index 4fb7344..0c9d6ae 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/GeneralApprovalMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/GeneralApprovalMapper.java
@@ -17,8 +17,4 @@
 
     Page<O> selectBatchForApprovalList(Page<O> page, @Param("request") R request, @Param("businessKeys") List<String> businessKeys);
 
-//    Page<O> selectListPage(Page<O> page, @Param("request") R request);
-
-//    Long selectMaxNo();
-
 }
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceAssessMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceAssessMapper.java
index 7867bb8..ba59009 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceAssessMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceAssessMapper.java
@@ -1,7 +1,12 @@
 package com.casic.missiles.mapper.business;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.business.outsource.OutsourceAssessApprovalListRequest;
+import com.casic.missiles.mapper.GeneralApprovalMapper;
 import com.casic.missiles.model.business.BizBusinessOutsourceAssess;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * <p>
@@ -11,6 +16,10 @@
  * @author wangpeng
  * @since 2023-08-16
  */
-public interface BizBusinessOutsourceAssessMapper extends BaseMapper<BizBusinessOutsourceAssess> {
+public interface BizBusinessOutsourceAssessMapper extends GeneralApprovalMapper<BizBusinessOutsourceAssess, BizBusinessOutsourceAssess, OutsourceAssessApprovalListRequest> {
+
+    Page<BizBusinessOutsourceAssess> selectBatchForApprovalList(Page<BizBusinessOutsourceAssess> page, @Param("request") OutsourceAssessApprovalListRequest request, @Param("businessKeys") List<String> businessKeys);
+
+    Long selectMaxProjectNo();
 
 }
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceProtocolMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceProtocolMapper.java
new file mode 100644
index 0000000..e6aba35
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceProtocolMapper.java
@@ -0,0 +1,24 @@
+package com.casic.missiles.mapper.business;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.business.outsource.OutsourceProtocolApprovalListRequest;
+import com.casic.missiles.mapper.GeneralApprovalMapper;
+import com.casic.missiles.model.business.BizBusinessOutsourceProtocol;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 计量检定业务-分包管理-测试、校准或检定工作分包协议书 Mapper 接口
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-08-24
+ */
+public interface BizBusinessOutsourceProtocolMapper extends GeneralApprovalMapper<BizBusinessOutsourceProtocol, BizBusinessOutsourceProtocol, OutsourceProtocolApprovalListRequest> {
+
+    Page<BizBusinessOutsourceProtocol> selectBatchForApprovalList(Page<BizBusinessOutsourceProtocol> page, @Param("request") OutsourceProtocolApprovalListRequest request, @Param("businessKeys") List<String> businessKeys);
+
+    Long selectMaxProtocolNo();
+}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/EnvLocationInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/EnvLocationInfoMapper.java
new file mode 100644
index 0000000..49eff87
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/EnvLocationInfoMapper.java
@@ -0,0 +1,21 @@
+package com.casic.missiles.mapper.resource;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.resource.environment.LocationListRequest;
+import com.casic.missiles.dto.resource.environment.LocationListResponse;
+import com.casic.missiles.model.resource.EnvLocationInfo;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * <p>
+ * 实验室环境监控系统-设备表 Mapper 接口
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-06-07
+ */
+public interface EnvLocationInfoMapper extends BaseMapper<EnvLocationInfo> {
+
+    Page<LocationListResponse> selectLocationListPage(Page<LocationListResponse> page, @Param("request") LocationListRequest request);
+}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java
index de124db..85ed0f7 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java
@@ -1,7 +1,9 @@
 package com.casic.missiles.mapper.system;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.dto.system.SignDetailResponse;
+import com.casic.missiles.dto.system.SignListRequest;
 import com.casic.missiles.model.system.SystemSign;
 import org.apache.ibatis.annotations.Param;
 
@@ -22,4 +24,8 @@
     SignDetailResponse selectSignDetailById(Long id);
 
     List<SystemSign> selectUsableSignList(@Param("userId") Long userId);
+
+    Page<SystemSign> selectSignListPage(Page<SystemSign> page, @Param("request") SignListRequest request);
+
+    List<SystemSign> selectSignList(@Param("request") SignListRequest request);
 }
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateChangeApplyMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateChangeApplyMapper.xml
index d798447..c496092 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateChangeApplyMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateChangeApplyMapper.xml
@@ -30,31 +30,31 @@
         SELECT *
         FROM biz_business_certificate_change_apply
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.changeApplyNo != null and request.changeApplyNo !=''">
+        <if test="request != null and request.changeApplyNo != null and request.changeApplyNo !=''">
             and change_apply_no like concat('%',#{request.changeApplyNo},'%')
         </if>
-        <if test="request.changeReportNo != null and request.changeReportNo !=''">
+        <if test="request != null and request.changeReportNo != null and request.changeReportNo !=''">
             and change_report_no like concat('%',#{request.changeReportNo},'%')
         </if>
-        <if test="request.changeReportName != null and request.changeReportName !=''">
+        <if test="request != null and request.changeReportName != null and request.changeReportName !=''">
             and change_report_name like concat('%',#{request.changeReportName},'%')
         </if>
-        <if test="request.changeType != null and request.changeType !=''">
+        <if test="request != null and request.changeType != null and request.changeType !=''">
             and change_type = #{request.changeType}
         </if>
-        <if test="request.createUserName != null and request.createUserName !=''">
+        <if test="request != null and request.createUserName != null and request.createUserName !=''">
             and create_user_name like concat('%',#{request.createUserName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificatePrintMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificatePrintMapper.xml
index b66cd99..49c0ac8 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificatePrintMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificatePrintMapper.xml
@@ -31,34 +31,34 @@
         LEFT JOIN biz_business_order_sample_relation bosr ON (bosr.order_id = bcr.order_id AND bosr.sample_id = bcr.sample_id)
         LEFT JOIN biz_business_order_info boi ON boi.id = bosr.order_id
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and bcp.approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.printStatus != null and request.printStatus !=''">
+        <if test="request != null and request.printStatus != null and request.printStatus !=''">
             and print_status = #{request.printStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and bcp.create_user_id = #{request.createUserId}
         </if>
-        <if test="request.certificateReportNo != null and request.certificateReportNo !=''">
+        <if test="request != null and request.certificateReportNo != null and request.certificateReportNo !=''">
             and bcr.certificate_report_no like concat('%',#{request.certificateReportNo},'%')
         </if>
-        <if test="request.certificateReportName != null and request.certificateReportName !=''">
+        <if test="request != null and request.certificateReportName != null and request.certificateReportName !=''">
             and bcr.certificate_report_name like concat('%',#{request.certificateReportName},'%')
         </if>
-        <if test="request.customerName != null and request.customerName !=''">
+        <if test="request != null and request.customerName != null and request.customerName !=''">
             and boi.customer_name like concat('%',#{request.customerName},'%')
         </if>
-        <if test="request.sampleNo != null and request.sampleNo !=''">
+        <if test="request != null and request.sampleNo != null and request.sampleNo !=''">
             and bosr.sample_no like concat('%',#{request.sampleNo},'%')
         </if>
-        <if test="request.sampleName != null and request.sampleName !=''">
+        <if test="request != null and request.sampleName != null and request.sampleName !=''">
             and bosr.sample_name like concat('%',#{request.sampleName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and bcp.create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and bcp.create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml
index b366034..767695d 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml
@@ -46,33 +46,37 @@
         SELECT bcr.*, bosr.sample_no, bosr.sample_name, bosr.sample_model, rsi.staff_name
         FROM biz_business_certificate_report bcr
         LEFT JOIN biz_business_order_sample_relation bosr ON (bosr.order_id = bcr.order_id AND bosr.sample_id = bcr.sample_id)
+        LEFT JOIN biz_business_order_info boi ON boi.id = bcr.order_id
         LEFT JOIN biz_resource_staff_info rsi ON rsi.id = bcr.measure_person_id
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and bcr.approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and bcr.create_user_id = #{request.createUserId}
         </if>
-        <if test="request.certificateReportNo != null and request.certificateReportNo !=''">
+        <if test="request != null and request.customerId != null and request.customerId !=''">
+            and boi.customer_id = #{request.customerId}
+        </if>
+        <if test="request != null and request.certificateReportNo != null and request.certificateReportNo !=''">
             and bcr.certificate_report_no like concat('%',#{request.certificateReportNo},'%')
         </if>
-        <if test="request.certificateReportName != null and request.certificateReportName !=''">
+        <if test="request != null and request.certificateReportName != null and request.certificateReportName !=''">
             and bcr.certificate_report_name like concat('%',#{request.certificateReportName},'%')
         </if>
-        <if test="request.sampleNo != null and request.sampleNo !=''">
+        <if test="request != null and request.sampleNo != null and request.sampleNo !=''">
             and bosr.sample_no like concat('%',#{request.sampleNo},'%')
         </if>
-        <if test="request.measureCategory != null and request.measureCategory !=''">
+        <if test="request != null and request.measureCategory != null and request.measureCategory !=''">
             and bcr.measure_category = #{request.measureCategory}
         </if>
-        <if test="request.measurePerson != null and request.measurePerson !=''">
+        <if test="request != null and request.measurePerson != null and request.measurePerson !=''">
             and rsi.staff_name like concat('%',#{request.measurePerson},'%')
         </if>
-        <if test="request.calibrationTimeStart != null and request.calibrationTimeStart !=''">
+        <if test="request != null and request.calibrationTimeStart != null and request.calibrationTimeStart !=''">
             and bcr.calibration_time &gt;= #{request.calibrationTimeStart}
         </if>
-        <if test="request.calibrationTimeEnd != null and request.calibrationTimeEnd !=''">
+        <if test="request != null and request.calibrationTimeEnd != null and request.calibrationTimeEnd !=''">
             and bcr.calibration_time &lt;= #{request.calibrationTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceAssessMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceAssessMapper.xml
index d0fcf8b..c22c101 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceAssessMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceAssessMapper.xml
@@ -7,6 +7,8 @@
         <id column="id" property="id" />
         <result column="project_no" property="projectNo" />
         <result column="project_name" property="projectName" />
+        <result column="lab_code" property="labCode" />
+        <result column="group_code" property="groupCode" />
         <result column="applicant_id" property="applicantId" />
         <result column="applicant_name" property="applicantName" />
         <result column="applicant_time" property="applicantTime" />
@@ -31,7 +33,45 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, project_no, project_name, applicant_id, applicant_name, applicant_time, minio_file_name, remark, create_user_id, create_user_name, outsourcer_id, pre_start_time, pre_end_time, outsource_reason, pre_cost, approval_status, process_id, approve_situation, traceability, test_method, technique_ability, create_time, update_time
+        id, project_no, project_name, lab_code, group_code, applicant_id, applicant_name, applicant_time, minio_file_name, remark, create_user_id, create_user_name, outsourcer_id, pre_start_time, pre_end_time, outsource_reason, pre_cost, approval_status, process_id, approve_situation, traceability, test_method, technique_ability, create_time, update_time
     </sql>
 
+    <select id="selectMaxProjectNo" resultType="java.lang.Long">
+        SELECT IFNULL(max(RIGHT(project_no, 3)), 0) from biz_business_outsource_assess
+    </select>
+
+    <select id="selectBatchForApprovalList" resultMap="BaseResultMap">
+        SELECT bboa.*, bboi.outsourcer_name, bboi.director
+        FROM biz_business_outsource_assess bboa
+        LEFT JOIN biz_business_outsourcer_info bboi ON bboa.outsourcer_id = bboi.id
+        WHERE 1=1
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
+            and bboa.approval_status = #{request.approvalStatus}
+        </if>
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
+            and bboa.create_user_id = #{request.createUserId}
+        </if>
+        <if test="request != null and request.projectNo != null and request.projectNo !=''">
+            and bboa.project_no like concat('%',#{request.projectNo},'%')
+        </if>
+        <if test="request != null and request.outsourcerName != null and request.outsourcerName !=''">
+            and bboi.outsourcer_name like concat('%',#{request.outsourcerName},'%')
+        </if>
+        <if test="request != null and request.applicantName != null and request.applicantName !=''">
+            and bboa.applicant_name like concat('%',#{request.applicantName},'%')
+        </if>
+        <if test="request != null and request.applicantTimeStart != null and request.applicantTimeStart !=''">
+            and bboa.applicant_time &gt;= #{request.applicantTimeStart}
+        </if>
+        <if test="request != null and request.applicantTimeEnd != null and request.applicantTimeEnd !=''">
+            and bboa.applicant_time &lt;= #{request.applicantTimeEnd}
+        </if>
+        <if test="businessKeys != null">
+            and bboa.id in
+            <foreach collection="businessKeys" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
+        ORDER BY bboa.create_time DESC
+    </select>
 </mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceProtocolMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceProtocolMapper.xml
new file mode 100644
index 0000000..b7b2149
--- /dev/null
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceProtocolMapper.xml
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.mapper.business.BizBusinessOutsourceProtocolMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.business.BizBusinessOutsourceProtocol">
+        <id column="id" property="id" />
+        <result column="protocol_no" property="protocolNo" />
+        <result column="project_name" property="projectName" />
+        <result column="lab_code" property="labCode" />
+        <result column="group_code" property="groupCode" />
+        <result column="outsourcer_id" property="outsourcerId" />
+        <result column="remark" property="remark" />
+        <result column="outsource_no" property="outsourceNo" />
+        <result column="outsource_name" property="outsourceName" />
+        <result column="contacts" property="contacts" />
+        <result column="mobile" property="mobile" />
+        <result column="address" property="address" />
+        <result column="require_date" property="requireDate" />
+        <result column="outsource_cost" property="outsourceCost" />
+        <result column="director" property="director" />
+        <result column="item" property="item" />
+        <result column="requires" property="requires" />
+        <result column="create_user_id" property="createUserId" />
+        <result column="create_user_name" property="createUserName" />
+        <result column="approval_status" property="approvalStatus" />
+        <result column="process_id" property="processId" />
+        <result column="create_time" property="createTime" />
+        <result column="update_time" property="updateTime" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, protocol_no, project_name, lab_code, group_code, outsourcer_id, remark, outsource_no, outsource_name, contacts, mobile, address, require_date, outsource_cost, director, item, requires, create_user_id, create_user_name, approval_status, process_id, create_time, update_time
+    </sql>
+
+    <select id="selectMaxProtocolNo" resultType="java.lang.Long">
+        SELECT IFNULL(max(RIGHT(protocol_no, 3)), 0) from biz_business_outsource_protocol
+    </select>
+
+    <select id="selectBatchForApprovalList" resultMap="BaseResultMap">
+        SELECT *
+        FROM biz_business_outsource_protocol
+        WHERE 1=1
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
+            and approval_status = #{request.approvalStatus}
+        </if>
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
+            and create_user_id = #{request.createUserId}
+        </if>
+        <if test="request != null and request.protocolNo != null and request.protocolNo !=''">
+            and protocol_no like concat('%',#{request.protocolNo},'%')
+        </if>
+        <if test="request != null and request.outsourcerName != null and request.outsourcerName !=''">
+            and outsourcer_name like concat('%',#{request.outsourcerName},'%')
+        </if>
+        <if test="request != null and request.applicantName != null and request.applicantName !=''">
+            and create_user_name like concat('%',#{request.applicantName},'%')
+        </if>
+        <if test="request != null and request.applicantTimeStart != null and request.applicantTimeStart !=''">
+            and create_time &gt;= #{request.applicantTimeStart}
+        </if>
+        <if test="request != null and request.applicantTimeEnd != null and request.applicantTimeEnd !=''">
+            and create_time &lt;= #{request.applicantTimeEnd}
+        </if>
+        <if test="businessKeys != null">
+            and id in
+            <foreach collection="businessKeys" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
+        ORDER BY create_time DESC
+    </select>
+</mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourcerInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourcerInfoMapper.xml
index 510a80b..3049b54 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourcerInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourcerInfoMapper.xml
@@ -7,6 +7,8 @@
         <id column="id" property="id" />
         <result column="outsourcer_no" property="outsourcerNo" />
         <result column="outsourcer_name" property="outsourcerName" />
+        <result column="lab_code" property="labCode" />
+        <result column="group_code" property="groupCode" />
         <result column="outsourcer_brief_name" property="outsourcerBriefName" />
         <result column="outsourcer_size" property="outsourcerSize" />
         <result column="business_size" property="businessSize" />
@@ -55,32 +57,32 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, outsourcer_no, outsourcer_name, outsourcer_brief_name, outsourcer_size, business_size, grade, evaluation, tax_number, bank_account, bank_name, bank_account_number, postal_code, director, phone, fax, mobile, email, website, address_country, address_province, address_city, address_area, full_address, address_country_name, address_province_name, address_city_name, address_area_name, invoice_country, invoice_province, invoice_city, invoice_area, invoice_full_address, invoice_country_name, invoice_province_name, invoice_city_name, invoice_area_name, business_scope, business_content, minio_file_name, approval_status, process_id, remark, create_user_id, create_user_name, create_time, update_time
+        id, outsourcer_no, outsourcer_name, lab_code, group_code, outsourcer_brief_name, outsourcer_size, business_size, grade, evaluation, tax_number, bank_account, bank_name, bank_account_number, postal_code, director, phone, fax, mobile, email, website, address_country, address_province, address_city, address_area, full_address, address_country_name, address_province_name, address_city_name, address_area_name, invoice_country, invoice_province, invoice_city, invoice_area, invoice_full_address, invoice_country_name, invoice_province_name, invoice_city_name, invoice_area_name, business_scope, business_content, minio_file_name, approval_status, process_id, remark, create_user_id, create_user_name, create_time, update_time
     </sql>
 
     <select id="selectBatchForApprovalList" resultMap="BaseResultMap">
         SELECT *
         FROM biz_business_outsourcer_info
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.outsourcerNo != null and request.outsourcerNo !=''">
+        <if test="request != null and request.outsourcerNo != null and request.outsourcerNo !=''">
             and outsourcer_no like concat('%',#{request.outsourcerNo},'%')
         </if>
-        <if test="request.outsourcerName != null and request.outsourcerName !=''">
+        <if test="request != null and request.outsourcerName != null and request.outsourcerName !=''">
             and outsourcer_name like concat('%',#{request.outsourcerName},'%')
         </if>
-        <if test="request.director != null and request.director !=''">
+        <if test="request != null and request.director != null and request.director !=''">
             and director like concat('%',#{request.director},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
@@ -93,6 +95,6 @@
     </select>
 
     <select id="selectMaxNo" resultType="java.lang.Long">
-        SELECT IFNULL(max(RIGHT(outsourcer_no, 12)), 0) from biz_business_outsourcer_info
+        SELECT IFNULL(max(RIGHT(outsourcer_no, 3)), 0) from biz_business_outsourcer_info
     </select>
 </mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessSiteExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessSiteExecutiveInfoMapper.xml
index 135c5d0..3c5ae79 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessSiteExecutiveInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessSiteExecutiveInfoMapper.xml
@@ -38,25 +38,25 @@
         FROM biz_business_site_executive_info bsei
         LEFT JOIN biz_resource_customer_info rci ON bsei.customer_id = rci.id
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and bsei.approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and bsei.create_user_id = #{request.createUserId}
         </if>
-        <if test="request.siteExecutiveNo != null and request.siteExecutiveNo !=''">
+        <if test="request != null and request.siteExecutiveNo != null and request.siteExecutiveNo !=''">
             and bsei.site_executive_no like concat('%',#{request.siteExecutiveNo},'%')
         </if>
-        <if test="request.customerName != null and request.customerName !=''">
+        <if test="request != null and request.customerName != null and request.customerName !=''">
             and rci.outsourcer_name like concat('%',#{request.customerName},'%')
         </if>
-        <if test="request.applyName != null and request.applyName !=''">
+        <if test="request != null and request.applyName != null and request.applyName !=''">
             and bsei.apply_name like concat('%',#{request.applyName},'%')
         </if>
-        <if test="request.applyTimeStart != null and request.applyTimeStart !=''">
+        <if test="request != null and request.applyTimeStart != null and request.applyTimeStart !=''">
             and bsei.apply_time &gt;= #{request.applyTimeStart}
         </if>
-        <if test="request.applyTimeEnd != null and request.applyTimeEnd !=''">
+        <if test="request != null and request.applyTimeEnd != null and request.applyTimeEnd !=''">
             and bsei.apply_time &lt;= #{request.applyTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml
index 84d9e2a..6bd38a9 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml
@@ -105,6 +105,12 @@
         <if test="request.isUrgent != null and request.isUrgent !=''">
             AND bo.is_urgent = #{request.isUrgent}
         </if>
+        <if test="request.ids != null">
+            and blei.id in
+            <foreach collection="request.ids" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
         ORDER BY blei.update_time DESC
     </select>
 
@@ -137,6 +143,12 @@
         <if test="request.isUrgent != null and request.isUrgent !=''">
             AND bo.is_urgent = #{request.isUrgent}
         </if>
+        <if test="request.ids != null">
+            and blei.id in
+            <foreach collection="request.ids" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
         ORDER BY blei.update_time DESC
     </select>
 
diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardInfoMapper.xml
index 1a5551b..2ed8d17 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardInfoMapper.xml
@@ -45,12 +45,6 @@
         FROM biz_equipment_standard_info besi
         LEFT JOIN biz_equipment_standard_technology_relation bestr ON besi.standard_no = bestr.standard_no
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
-            and besi.approval_status = #{request.approvalStatus}
-        </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
-            and besi.create_user_id = #{request.createUserId}
-        </if>
         <if test="request.standardName != null and request.standardName !=''">
             and besi.standard_name like concat('%',#{request.standardName},'%')
         </if>
diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardTechnologyRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardTechnologyRelationMapper.xml
index fc7e16c..cd03c8c 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardTechnologyRelationMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardTechnologyRelationMapper.xml
@@ -6,6 +6,7 @@
     <resultMap id="BaseResultMap" type="com.casic.missiles.model.equipment.BizEquipmentStandardTechnologyRelation">
         <id column="id" property="id" />
         <result column="technology_file_id" property="technologyFileId" />
+        <result column="technology_file_no" property="technologyFileNo" />
         <result column="technology_file_name" property="technologyFileName" />
         <result column="standard_id" property="standardId" />
         <result column="standard_no" property="standardNo" />
@@ -14,7 +15,7 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, technology_file_id, technology_file_name, standard_id, remark
+        id, technology_file_id, technology_file_no, technology_file_name, standard_id, remark
     </sql>
 
 </mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceAuthorizeOrderMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceAuthorizeOrderMapper.xml
index ac5176c..554fe65 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceAuthorizeOrderMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceAuthorizeOrderMapper.xml
@@ -32,22 +32,22 @@
         SELECT *
         FROM biz_resource_authorize_order
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.orderNo != null and request.orderNo !=''">
+        <if test="request != null and request.orderNo != null and request.orderNo !=''">
             and order_no like concat('%',#{request.orderNo},'%')
         </if>
-        <if test="request.createUserName != null and request.createUserName !=''">
+        <if test="request != null and request.createUserName != null and request.createUserName !=''">
             and create_user_name like concat('%',#{request.createUserName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerExamineFormMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerExamineFormMapper.xml
index ab242f6..af7f98f 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerExamineFormMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerExamineFormMapper.xml
@@ -41,28 +41,28 @@
         SELECT *
         FROM biz_resource_customer_examine_form
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.formNo != null and request.formNo !=''">
+        <if test="request != null and request.formNo != null and request.formNo !=''">
             and form_no like concat('%',#{request.formNo},'%')
         </if>
-        <if test="request.labCode != null and request.labCode !=''">
+        <if test="request != null and request.labCode != null and request.labCode !=''">
             and lab_code like concat('%',#{request.labCode},'%')
         </if>
-        <if test="request.groupCode != null and request.groupCode !=''">
+        <if test="request != null and request.groupCode != null and request.groupCode !=''">
             and group_code like concat('%',#{request.groupCode},'%')
         </if>
-        <if test="request.createUserName != null and request.createUserName !=''">
+        <if test="request != null and request.createUserName != null and request.createUserName !=''">
             and create_user_name like concat('%',#{request.createUserName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerInfoMapper.xml
index fa8ffbc..06a2798 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerInfoMapper.xml
@@ -33,25 +33,25 @@
         SELECT *
         FROM biz_resource_customer_info
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.customerNo != null and request.customerNo !=''">
+        <if test="request != null and request.customerNo != null and request.customerNo !=''">
             and customer_no like concat('%',#{request.customerNo},'%')
         </if>
-        <if test="request.customerName != null and request.customerName !=''">
+        <if test="request != null and request.customerName != null and request.customerName !=''">
             and customer_name like concat('%',#{request.customerName},'%')
         </if>
-        <if test="request.contacts != null and request.contacts !=''">
+        <if test="request != null and request.contacts != null and request.contacts !=''">
             and contacts like concat('%',#{request.contacts},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerSuggestFormMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerSuggestFormMapper.xml
index 28f5bb2..1806662 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerSuggestFormMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerSuggestFormMapper.xml
@@ -33,28 +33,28 @@
         SELECT *
         FROM biz_resource_customer_suggest_form
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.formNo != null and request.formNo !=''">
+        <if test="request != null and request.formNo != null and request.formNo !=''">
             and form_no like concat('%',#{request.formNo},'%')
         </if>
-        <if test="request.customerName != null and request.customerName !=''">
+        <if test="request != null and request.customerName != null and request.customerName !=''">
             and customer_name like concat('%',#{request.customerName},'%')
         </if>
-        <if test="request.customerDeptName != null and request.customerDeptName !=''">
+        <if test="request != null and request.customerDeptName != null and request.customerDeptName !=''">
             and customer_dept_name like concat('%',#{request.customerDeptName},'%')
         </if>
-        <if test="request.createUserName != null and request.createUserName !=''">
+        <if test="request != null and request.createUserName != null and request.createUserName !=''">
             and create_user_name like concat('%',#{request.createUserName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSealUseNoteMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSealUseNoteMapper.xml
index ab37bc1..b02bb33 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSealUseNoteMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSealUseNoteMapper.xml
@@ -29,32 +29,32 @@
     </sql>
 
     <select id="selectBatchForApprovalList" resultMap="BaseResultMap">
-        SELECT *
+        SELECT brsun.*, brsi.seal_name, brsi.seal_type, brsi.approver_name
         FROM biz_resource_seal_use_note brsun
         JOIN biz_resource_seal_info brsi ON brsun.seal_id = brsi.id
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and brsun.approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and brsun.create_user_id = #{request.createUserId}
         </if>
-        <if test="request.sealName != null and request.sealName !=''">
+        <if test="request != null and request.sealName != null and request.sealName !=''">
             and brsi.seal_name like concat('%',#{request.sealName},'%')
         </if>
-        <if test="request.sealType != null and request.sealType !=''">
+        <if test="request != null and request.sealType != null and request.sealType !=''">
             and brsi.seal_type = #{request.sealType}
         </if>
-        <if test="request.applyDeptName != null and request.applyDeptName !=''">
+        <if test="request != null and request.applyDeptName != null and request.applyDeptName !=''">
             and brsun.apply_dept_name like concat('%',#{request.applyDeptName},'%')
         </if>
-        <if test="request.applyUserName != null and request.applyUserName !=''">
+        <if test="request != null and request.applyUserName != null and request.applyUserName !=''">
             and brsun.apply_user_name like concat('%',#{request.applyUserName},'%')
         </if>
-        <if test="request.applyTimeStart != null and request.applyTimeStart !=''">
+        <if test="request != null and request.applyTimeStart != null and request.applyTimeStart !=''">
             and brsun.apply_time &gt;= #{request.applyTimeStart}
         </if>
-        <if test="request.applyTimeEnd != null and request.applyTimeEnd !=''">
+        <if test="request != null and request.applyTimeEnd != null and request.applyTimeEnd !=''">
             and brsun.apply_time &lt;= #{request.applyTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml
index 119bf7d..4f8392a 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml
@@ -31,6 +31,12 @@
         <if test="request.deptName != null and request.deptName !=''">
             and brsi.dept_name like concat('%',#{request.deptName},'%')
         </if>
+        <if test="request.ids != null">
+            and brsv.id in
+            <foreach collection="request.ids" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
         ORDER BY brsv.grant_date DESC
     </select>
 
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSupplierInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSupplierInfoMapper.xml
index fe8d399..e8ce7ef 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSupplierInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSupplierInfoMapper.xml
@@ -48,28 +48,28 @@
         SELECT *
         FROM biz_resource_supplier_info
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.supplierNo != null and request.supplierNo !=''">
+        <if test="request != null and request.supplierNo != null and request.supplierNo !=''">
             and supplier_no like concat('%',#{request.supplierNo},'%')
         </if>
-        <if test="request.supplierName != null and request.supplierName !=''">
+        <if test="request != null and request.supplierName != null and request.supplierName !=''">
             and supplier_name like concat('%',#{request.supplierName},'%')
         </if>
-        <if test="request.director != null and request.director !=''">
+        <if test="request != null and request.director != null and request.director !=''">
             and director like concat('%',#{request.director},'%')
         </if>
-        <if test="request.supplierType != null and request.supplierType !=''">
+        <if test="request != null and request.supplierType != null and request.supplierType !=''">
             and supplier_type = #{request.supplierType}
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/EnvLocationInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/EnvLocationInfoMapper.xml
new file mode 100644
index 0000000..68bcf10
--- /dev/null
+++ b/casic-metering-dao/src/main/resources/mapper/resource/EnvLocationInfoMapper.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.mapper.resource.EnvLocationInfoMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.resource.EnvLocationInfo">
+        <id column="id" property="id" />
+        <result column="location_no" property="locationNo" />
+        <result column="location_name" property="locationName" />
+        <result column="location_position" property="locationPosition" />
+        <result column="create_user_id" property="createUserId" />
+        <result column="create_user" property="createUser" />
+        <result column="create_time" property="createTime" />
+        <result column="update_time" property="updateTime" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, location_no, location_name, location_position, create_user_id, create_user, create_time, update_time
+    </sql>
+
+    <select id="selectLocationListPage" resultType="com.casic.missiles.dto.resource.environment.LocationListResponse">
+        SELECT *
+        FROM env_location_info
+        WHERE 1=1
+        <if test="request.locationNo != null and request.locationNo !=''">
+            AND location_no LIKE concat('%',#{request.locationNo},'%')
+        </if>
+        <if test="request.locationName != null and request.locationName !=''">
+            AND location_name LIKE concat('%',#{request.locationName},'%')
+        </if>
+        ORDER BY create_time DESC
+    </select>
+
+</mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml
index b28c18f..8854047 100644
--- a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml
@@ -11,7 +11,6 @@
         <result column="sign_desc" property="signDesc" />
         <result column="sign_director" property="signDirector" />
         <result column="sign_user_id" property="signUserId" />
-        <result column="sign_type" property="signType" />
         <result column="minio_file_name" property="minioFileName" />
         <result column="create_time" property="createTime" />
         <result column="update_time" property="updateTime" />
@@ -28,7 +27,6 @@
         <result column="sign_name" property="signName" />
         <result column="sign_desc" property="signDesc" />
         <result column="sign_director" property="signDirector" />
-        <result column="sign_type" property="signType" />
         <result column="sign_user_id" property="signUserId" />
         <result column="minio_file_name" property="minioFileName" />
         <result column="create_time" property="createTime" />
@@ -62,4 +60,58 @@
         JOIN system_sign_user_relation ssur ON ss.id = ssur.sign_id
         WHERE ssur.user_id = #{userId}
     </select>
+
+    <select id="selectSignListPage" resultMap="BaseResultMap">
+        SELECT ss.*, sd.SIMPLE_NAME AS deptName
+        FROM system_sign ss
+        LEFT JOIN sys_user su ON su.id = ss.sign_user_id
+        LEFT JOIN sys_dept sd ON sd.id = su.dept_id
+        WHERE 1=1
+        <if test="request.signNo != null and request.signNo !=''">
+            AND ss.sign_no LIKE concat('%',#{request.signNo},'%')
+        </if>
+        <if test="request.signName != null and request.signName !=''">
+            AND ss.sign_name LIKE concat('%',#{request.signName},'%')
+        </if>
+        <if test="request.signDirector != null and request.signDirector !=''">
+            AND ss.sign_director LIKE concat('%',#{request.signDirector},'%')
+        </if>
+        <if test="request.signUserId != null and request.signUserId !=''">
+            AND ss.sign_user_id = #{request.signUserId}
+        </if>
+        <if test="request.createStartTime != null and request.createStartTime !=''">
+            AND DATE_FORMAT(ss.create_time,'%Y-%m-%d') &gt;= DATE_FORMAT(#{request.createStartTime},'%Y-%m-%d')
+        </if>
+        <if test="request.createEndTime != null and request.createEndTime !=''">
+            AND DATE_FORMAT(ss.create_time,'%Y-%m-%d')  &lt;= DATE_FORMAT(#{request.createEndTime},'%Y-%m-%d')
+        </if>
+        ORDER BY ss.create_time DESC
+    </select>
+
+    <select id="selectSignList" resultMap="BaseResultMap">
+        SELECT ss.*, sd.SIMPLE_NAME AS deptName
+        FROM system_sign ss
+        LEFT JOIN sys_user su ON su.id = ss.sign_user_id
+        LEFT JOIN sys_dept sd ON sd.id = su.dept_id
+        WHERE 1=1
+        <if test="request.signNo != null and request.signNo !=''">
+            AND ss.sign_no LIKE concat('%',#{request.signNo},'%')
+        </if>
+        <if test="request.signName != null and request.signName !=''">
+            AND ss.sign_name LIKE concat('%',#{request.signName},'%')
+        </if>
+        <if test="request.signDirector != null and request.signDirector !=''">
+            AND ss.sign_director LIKE concat('%',#{request.signDirector},'%')
+        </if>
+        <if test="request.signUserId != null and request.signUserId !=''">
+            AND ss.sign_user_id = #{request.signUserId}
+        </if>
+        <if test="request.createStartTime != null and request.createStartTime !=''">
+            AND DATE_FORMAT(ss.create_time,'%Y-%m-%d') &gt;= DATE_FORMAT(#{request.createStartTime},'%Y-%m-%d')
+        </if>
+        <if test="request.createEndTime != null and request.createEndTime !=''">
+            AND DATE_FORMAT(ss.create_time,'%Y-%m-%d')  &lt;= DATE_FORMAT(#{request.createEndTime},'%Y-%m-%d')
+        </if>
+        ORDER BY ss.create_time DESC
+    </select>
 </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 515050a..60f530b 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
@@ -47,8 +47,8 @@
     String STORAGE_LOCATION = "bizStorageLocation";
     //计量专业
     String MEASURE_MAJOR = "bizMeasureMajor";
-    //管理状态
-    String MANAGER_STATE = "bizManagerState";
+    //标准装置管理状态
+    String STANDARD_MANAGER_STATE = "bizStandardManagerState";
 
     /**
      * 资源管理 字典code
@@ -95,8 +95,6 @@
     String MEASURE_STATUS = "measureStatus";
     //检定方式
     String MEASURE_TYPE = "measureType";
-    //标识打印标志类型
-    String IDENTIFY_PRINT_TYPE = "bizBusinessIdentify";
     //变更类型
     String REPORT_CHANGE_TYPE = "bizCertChangeType";
     //规模类型
@@ -111,19 +109,24 @@
     String MEASURE_CATEGORY = "measureCategory";
     //检定结果
     String MEASURE_RESULT = "measureResult";
+    //分包原因
+    String OUTSOURCE_REASON = "outsourceReason";
+
+    /**
+     * 系统管理
+     */
+    String TEMPLATE_TYPE = "templateType";
+
 
     /**
      * 标准装置 字典code
      */
     //类别
     String STANDARD_CATEGORY = "standardCategory";
-    //管理状态
-    String STANDARD_MANAGER_STATE = "standardManagerState";
     //标准等级
     String STANDARD_LEVEL = "standardLevel";
     //传递范围
     String STANDARD_TRANSMIT_RANGE = "transmitRange";
-
     //资本来源
     String CAPITAL_SOURCE = "capitalSource";
     //标准装置-申请类型
@@ -148,8 +151,6 @@
     String CERTIFICATE_CLASS = "certificationClass";
     //证书管理-检校专业
     String CALIBRATION_MAJOR = "calibrationMajor";
-    //分包原因
-    String OUTSOURCE_REASON = "outsourceReason";
 
     /**
      * 工作台
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/BaseApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/BaseApprovalListRequest.java
index 73c12c1..80d7424 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/BaseApprovalListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/BaseApprovalListRequest.java
@@ -6,6 +6,7 @@
 
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotEmpty;
+import java.util.List;
 
 /**
  * @Description:
@@ -19,14 +20,14 @@
      * 表单id
      */
     @NotBlank(message = "表单id不能为空")
-    @ApiModelProperty(value = "表单id（流程定义对应的表单id，等价于业务id）", dataType = "String")
+    @ApiModelProperty(value = "表单id（流程定义对应的表单id，等价于业务id），导出接口不用传", dataType = "String")
     private String formId;
 
     /**
      * 审批状态类型，对应ApprovalStatusEnum
      */
     @NotEmpty(message = "审批状态类型不能为空")
-    @ApiModelProperty(value = "审批状态类型code", dataType = "String")
+    @ApiModelProperty(value = "审批状态类型code，导出接口不用传", dataType = "String")
     private String approvalStatus;
 
     @ApiModelProperty(hidden = true)
@@ -34,4 +35,7 @@
 
     @ApiModelProperty(hidden = true)
     private Long createUserId;
+
+    @ApiModelProperty(value = "导出ids", dataType = "List")
+    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificatePrintApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificatePrintApprovalListRequest.java
index b93d1c9..3cc2f4e 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificatePrintApprovalListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificatePrintApprovalListRequest.java
@@ -5,8 +5,6 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import java.util.List;
-
 /**
  * @Description:
  * @Author: wangpeng
@@ -38,7 +36,4 @@
 
     @ApiModelProperty(value = "创建结束时间", dataType = "String")
     private String createTimeEnd;
-
-    @ApiModelProperty(value = "导出ids", dataType = "List")
-    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportApprovalListRequest.java
index 4f7a038..c115847 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportApprovalListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportApprovalListRequest.java
@@ -5,8 +5,6 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import java.util.List;
-
 /**
  * @Description:
  * @Author: wangpeng
@@ -15,6 +13,8 @@
 @ApiModel
 @Data
 public class CertificateReportApprovalListRequest extends BaseApprovalListRequest {
+    @ApiModelProperty(value = "委托方id", dataType = "String")
+    private Long customerId;
 
     @ApiModelProperty(value = "证书报告编号", dataType = "String")
     private String certificateReportNo;
@@ -37,6 +37,4 @@
     @ApiModelProperty(value = "检校结束时间", dataType = "String")
     private String calibrationTimeEnd;
 
-    @ApiModelProperty(value = "导出ids", dataType = "List")
-    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/identify/IdentifyListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/identify/IdentifyListRequest.java
index 1b87ae6..f019203 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/identify/IdentifyListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/identify/IdentifyListRequest.java
@@ -4,6 +4,8 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * @Description:
  * @Author: wangpeng
@@ -26,4 +28,7 @@
 
     @ApiModelProperty(value = "打印结束时间", dataType = "String")
     private String createTimeEnd;
+
+    @ApiModelProperty(value = "导出ids", dataType = "List")
+    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListRequest.java
index 1264883..62415fb 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListRequest.java
@@ -7,6 +7,7 @@
 import lombok.Data;
 
 import javax.validation.constraints.NotBlank;
+import java.util.List;
 
 @Data
 @ApiModel
@@ -37,4 +38,6 @@
     @ApiModelProperty(value = "是否加急（1是0否null全部）", dataType = "Integer")
     private String isUrgent;
 
+    @ApiModelProperty(value = "导出ids", dataType = "List")
+    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListRequest.java
index 5201d7b..499760a 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListRequest.java
@@ -17,6 +17,9 @@
     @ApiModelProperty(value = "任务单编号", dataType = "String")
     private String orderNo;
 
+    @ApiModelProperty(value = "委托方id", dataType = "Long")
+    private Long customerId;
+
     @ApiModelProperty(value = "委托方名称", dataType = "String")
     private String customerName;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OrderSampleDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OrderSampleDTO.java
new file mode 100644
index 0000000..796edc0
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OrderSampleDTO.java
@@ -0,0 +1,19 @@
+package com.casic.missiles.dto.business.outsource;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/8/24 11:38
+ */
+@ApiModel
+@Data
+public class OrderSampleDTO {
+    @ApiModelProperty(value = "任务单id", dataType = "Long")
+    private Long orderId;
+    @ApiModelProperty(value = "受检设备id", dataType = "Long")
+    private Long sampleId;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceAssessApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceAssessApprovalListRequest.java
new file mode 100644
index 0000000..9a930c3
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceAssessApprovalListRequest.java
@@ -0,0 +1,30 @@
+package com.casic.missiles.dto.business.outsource;
+
+import com.casic.missiles.dto.BaseApprovalListRequest;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/8/24 11:01
+ */
+@ApiModel
+@Data
+public class OutsourceAssessApprovalListRequest extends BaseApprovalListRequest {
+    @ApiModelProperty(value = "评审表编号", dataType = "String")
+    private String projectNo;
+
+    @ApiModelProperty(value = "分包机构名称", dataType = "String")
+    private String outsourcerName;
+
+    @ApiModelProperty(value = "申请人", dataType = "String")
+    private String applicantName;
+
+    @ApiModelProperty(value = "申请时间开始", dataType = "String")
+    private String applicantTimeStart;
+
+    @ApiModelProperty(value = "申请时间结束", dataType = "String")
+    private String applicantTimeEnd;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceAssessSaveResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceAssessSaveResponse.java
new file mode 100644
index 0000000..8bf9aad
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceAssessSaveResponse.java
@@ -0,0 +1,20 @@
+package com.casic.missiles.dto.business.outsource;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/8/14 16:17
+ */
+@ApiModel
+@Data
+public class OutsourceAssessSaveResponse {
+    @ApiModelProperty(value = "主键id", dataType = "Long")
+    private Long id;
+
+    @ApiModelProperty(value = "编号", dataType = "String")
+    private String projectNo;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProtocolApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProtocolApprovalListRequest.java
new file mode 100644
index 0000000..0f32331
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProtocolApprovalListRequest.java
@@ -0,0 +1,30 @@
+package com.casic.missiles.dto.business.outsource;
+
+import com.casic.missiles.dto.BaseApprovalListRequest;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/8/24 15:01
+ */
+@ApiModel
+@Data
+public class OutsourceProtocolApprovalListRequest extends BaseApprovalListRequest {
+    @ApiModelProperty(value = "协议书编号", dataType = "String")
+    private String protocolNo;
+
+    @ApiModelProperty(value = "分包方名称", dataType = "String")
+    private String outsourcerName;
+
+    @ApiModelProperty(value = "申请人", dataType = "String")
+    private String applicantName;
+
+    @ApiModelProperty(value = "申请时间开始", dataType = "String")
+    private String applicantTimeStart;
+
+    @ApiModelProperty(value = "申请时间结束", dataType = "String")
+    private String applicantTimeEnd;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProtocolSaveResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProtocolSaveResponse.java
new file mode 100644
index 0000000..e324967
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProtocolSaveResponse.java
@@ -0,0 +1,20 @@
+package com.casic.missiles.dto.business.outsource;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/8/14 16:17
+ */
+@ApiModel
+@Data
+public class OutsourceProtocolSaveResponse {
+    @ApiModelProperty(value = "主键id", dataType = "Long")
+    private Long id;
+
+    @ApiModelProperty(value = "编号", dataType = "String")
+    private String protocolNo;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveApprovalListRequest.java
index f29f4e4..7047c28 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveApprovalListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveApprovalListRequest.java
@@ -5,8 +5,6 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import java.util.List;
-
 /**
  * @Description: 现场检测审批列表请求实体
  * @Author: wangpeng
@@ -30,7 +28,4 @@
     @ApiModelProperty(value = "申请时间结束", dataType = "String")
     private String applyTimeEnd;
 
-    @ApiModelProperty(value = "导出ids", dataType = "List")
-    private List<Long> ids;
-
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveDetailResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveDetailResponse.java
index 1f28752..394c934 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveDetailResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveDetailResponse.java
@@ -12,6 +12,18 @@
     @ApiModelProperty(value = "id，更新/删除使用参数", dataType = "Long")
     private Long id;
 
+    @ApiModelProperty(value = "实验室代码(字典code)", dataType = "String")
+    private String labCode;
+
+    @ApiModelProperty(value = "实验室代码(字典value)", dataType = "String")
+    private String labCodeName;
+
+    @ApiModelProperty(value = "组别代码(字典code)", dataType = "String")
+    private String groupCode;
+
+    @ApiModelProperty(value = "组别代码(字典value)", dataType = "String")
+    private String groupCodeName;
+
     @ApiModelProperty(value = "审批编号", dataType = "String")
     private String siteExecutiveNo;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/environment/LocationListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/environment/LocationListRequest.java
new file mode 100644
index 0000000..13d03c3
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/environment/LocationListRequest.java
@@ -0,0 +1,20 @@
+package com.casic.missiles.dto.resource.environment;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/6/8 13:56
+ */
+@ApiModel
+@Data
+public class LocationListRequest {
+    @ApiModelProperty(value = "地点编号", dataType = "String")
+    private String locationNo;
+
+    @ApiModelProperty(value = "地点名称", dataType = "String")
+    private String locationName;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/environment/LocationListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/environment/LocationListResponse.java
new file mode 100644
index 0000000..4c531af
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/environment/LocationListResponse.java
@@ -0,0 +1,78 @@
+package com.casic.missiles.dto.resource.environment;
+
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
+import com.baomidou.mybatisplus.annotation.TableField;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description: 地点列表响应实体
+ * @Author: wangpeng
+ * @Date: 2023/6/8 13:53
+ */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
+@ApiModel
+@Data
+public class LocationListResponse {
+    @ApiModelProperty(value = "主键id", dataType = "Long")
+    private Long id;
+
+    /**
+     * 地点编号
+     */
+    @ExcelProperty("地点编号")
+    @ApiModelProperty(value = "地点编号", dataType = "String")
+    private String locationNo;
+
+    /**
+     * 地点名称
+     */
+    @ExcelProperty("地点名称")
+    @ApiModelProperty(value = "地点名称", dataType = "String")
+    private String locationName;
+
+    /**
+     * 地点位置
+     */
+    @ExcelProperty("地点位置")
+    @ApiModelProperty(value = "地点位置", dataType = "String")
+    private String locationPosition;
+
+    /**
+     * 创建人id
+     */
+    @ApiModelProperty(value = "创建人id", dataType = "Long")
+    private Long createUserId;
+
+    /**
+     * 创建人
+     */
+    @ExcelProperty("创建人")
+    @ApiModelProperty(value = "创建人", dataType = "String")
+    @TableField("create_user")
+    private String createUser;
+
+    /**
+     * 创建时间
+     */
+    @ExcelProperty("创建时间")
+    @ApiModelProperty(value = "创建时间", dataType = "String")
+    private String createTime;
+
+    /**
+     * 更新时间
+     */
+    @ApiModelProperty(value = "更新时间", dataType = "String")
+    private String updateTime;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertRequest.java
index 9a7f6c6..c827915 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertRequest.java
@@ -4,6 +4,8 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * @Description:
  * @Author: wangpeng
@@ -16,4 +18,7 @@
     private String name;
     @ApiModelProperty(value = "部门名", dataType = "String")
     private String deptName;
+
+    @ApiModelProperty(value = "导出ids", dataType = "List")
+    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertResponse.java
index f78b159..8f2f79e 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertResponse.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.dto.resource.staff;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.casic.missiles.annotation.DictCodeField;
 import com.casic.missiles.constants.MeterDictCode;
 import io.swagger.annotations.ApiModel;
@@ -13,12 +20,18 @@
  * @Author: wangpeng
  * @Date: 2023/7/27 15:13
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @ApiModel
 @Data
 public class StaffCertResponse {
     /**
      * 人员编号
      */
+    @ExcelProperty(value = "人员编号",order = 0)
     @NotEmpty(message = "人员编号不能为空")
     @ApiModelProperty(value = "人员编号", dataType = "String")
     private String staffNo;
@@ -26,6 +39,7 @@
     /**
      * 姓名
      */
+    @ExcelProperty(value = "姓名",order = 1)
     @ApiModelProperty(value = "姓名", dataType = "String")
     private String staffName;
 
@@ -54,6 +68,7 @@
     /**
      * 部门名字
      */
+    @ExcelProperty(value = "工作部门",order = 2)
     @ApiModelProperty(value = "部门名字", dataType = "String")
     private String deptName;
 
@@ -66,6 +81,7 @@
     /**
      * 计量专业
      */
+    @ExcelProperty(value = "计量专业",order = 3)
     @ApiModelProperty(value = "计量专业", dataType = "String")
     private String major;
 
@@ -110,6 +126,7 @@
     /**
      * 证书号
      */
+    @ExcelProperty(value = "证号",order = 4)
     @ApiModelProperty(value = "证书号", dataType = "String")
     private String certNo;
 
@@ -122,12 +139,14 @@
     /**
      * 有效日期
      */
+    @ExcelProperty(value = "证书有效期",order = 6)
     @ApiModelProperty(value = "有效日期", dataType = "String")
     private String effectiveDate;
 
     /**
      * 发放日期
      */
+    @ExcelProperty(value = "发证日期",order = 5)
     @ApiModelProperty(value = "发放日期", dataType = "String")
     private String grantDate;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffListRequest.java
index 7c4afb3..0a1194a 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffListRequest.java
@@ -4,6 +4,8 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * @Description:
  * @Author: wangpeng
@@ -18,4 +20,7 @@
     private String deptName;
     @ApiModelProperty(value = "部门id", dataType = "Long")
     private Long deptId;
+
+    @ApiModelProperty(value = "导出ids", dataType = "List")
+    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/TrainListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/TrainListRequest.java
index f68597b..6321f8b 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/TrainListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/TrainListRequest.java
@@ -14,6 +14,8 @@
 public class TrainListRequest {
     @ApiModelProperty(value = "训练登记表编号", dataType = "String")
     private String trainNo;
+    @ApiModelProperty(value = "值班领导", dataType = "String")
+    private String dutyLeader;
     @ApiModelProperty(value = "创建开始时间", dataType = "String")
     private String createTimeStart;
     @ApiModelProperty(value = "创建结束时间", dataType = "String")
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/SignAddRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/SignAddRequest.java
index 117be34..d71055c 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/SignAddRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/SignAddRequest.java
@@ -43,13 +43,6 @@
     private Long signUserId;
 
     /**
-     * 签章或签名-字典code
-     */
-    @NotBlank(message = "类型不能为空")
-    @ApiModelProperty(value = "签名/签章-字典code", dataType = "String", required = true)
-    private String signType;
-
-    /**
      * minio存储文件名
      */
     @ApiModelProperty(value = "上传文件返回名称", dataType = "String")
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateAddRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateAddRequest.java
index aff1265..6316648 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateAddRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateAddRequest.java
@@ -17,30 +17,28 @@
 @Data
 public class TemplateAddRequest extends BaseSystemRequest {
     /**
-     * 原始记录模板/证书报告模板名称
+     * 模板名称
      */
     @ApiModelProperty(value = "名称", dataType = "String", required = true)
     @NotBlank(message = "名称不能为空")
     private String templateName;
 
     /**
-     * 原始记录模板/证书报告模板描述
+     * 模板描述
      */
     @ApiModelProperty(value = "描述", dataType = "String")
     private String templateDesc;
 
     /**
-     * 原始记录模板/证书报告模板创建人
+     * 创建人
      */
     @ApiModelProperty(value = "创建人", dataType = "String", required = true)
     @NotBlank(message = "创建人不能为空")
     private String templateCreator;
 
-    /**
-     * 原始记录模板/证书报告模板-字典code
-     */
-    @NotBlank(message = "类型不能为空")
-    @ApiModelProperty(value = "原始记录模板/证书报告模板-字典code", dataType = "String", required = true)
+
+    @NotBlank(message = "模板类型不能为空")
+    @ApiModelProperty(value = "模板类型(字典code)", dataType = "String", required = true)
     private String templateType;
 
     /**
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateListRequest.java
index eec5a1e..6d17bbe 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateListRequest.java
@@ -1,11 +1,12 @@
 package com.casic.missiles.dto.system;
 
+import com.casic.missiles.annotation.DictCodeField;
+import com.casic.missiles.constants.MeterDictCode;
 import com.casic.missiles.dto.BaseSystemRequest;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import javax.validation.constraints.NotBlank;
 import java.util.List;
 
 /**
@@ -19,8 +20,8 @@
     /**
      * 类型
      */
-//    @ApiModelProperty(value = "类型-字典code", dataType = "String", required = true)
-    @NotBlank(message = "类型不能为空")
+    @DictCodeField(message = "模板类型不合法", cacheName = MeterDictCode.TEMPLATE_TYPE)
+    @ApiModelProperty(value = "模板类型(字典code)", dataType = "String")
     private String templateType;
 
     /**

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java
index bb0c50f..13a699b 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java
@@ -12,6 +12,7 @@
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.IGeneralApprovalService;
+import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
@@ -19,6 +20,7 @@
 import org.springframework.web.bind.annotation.RequestBody;
 
 import javax.validation.Valid;
+import java.util.List;
 import java.util.Objects;
 
 /**
@@ -117,4 +119,17 @@
         }
         return baseApprovalService.failUpdate(request);
     }
+
+    public List<O> exportList(@RequestBody @Valid R request) throws Exception {
+        List<O> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = baseApprovalService.listExportByIds(request.getIds());
+        } else {
+            list = baseApprovalService.listExport(request);
+        }
+        for (O record : list) {
+            DictCodeUtils.convertDictCodeToName(record);
+        }
+        return list;
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java
index 8a90961..d775831 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java
@@ -5,6 +5,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.business.certificate.CertificateChangeApplyApprovalListRequest;
 import com.casic.missiles.dto.business.certificate.CertificateChangeApplySaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessCertificateChangeApply;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
@@ -20,6 +21,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -48,4 +50,12 @@
         }
         return changeApplyService.saveChangeApply(request);
     }
+
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody CertificateChangeApplyApprovalListRequest request) throws Exception {
+        List<BizBusinessCertificateChangeApply> list = super.exportList(request);
+        super.exportExcel(BizBusinessCertificateChangeApply.class, list, ExportEnum.CERTIFICATE_CHANGE_APPLY.getSheetName());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java
index 5fc4b07..af8230e 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java
@@ -9,6 +9,7 @@
 import com.casic.missiles.dto.business.certificate.CertificatePrintApprovalListRequest;
 import com.casic.missiles.dto.business.certificate.CertificatePrintListResponse;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.enums.business.CertificatePrintStatusEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessCertificatePrintLog;
@@ -18,10 +19,16 @@
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.io.IOException;
+import java.util.List;
 import java.util.Objects;
 
 /**
@@ -98,4 +105,16 @@
         });
         return certificatePrintService.certificatePrintLog(idDTO.getId());
     }
+
+    @ApiOperation("证书打印审批导出")
+    @PostMapping("/listExport")
+    public void exportList(@RequestBody CertificatePrintApprovalListRequest request) throws IOException {
+        List<CertificatePrintListResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = certificatePrintService.listByIds(request.getIds());
+        } else {
+            list = certificatePrintService.list(request);
+        }
+        super.exportExcel(CertificatePrintListResponse.class, list, ExportEnum.CERTIFICATE_PRINT.getSheetName());
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java
index 63b06dc..6b2efd5 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java
@@ -6,6 +6,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.business.certificate.CertificateReportApprovalListRequest;
 import com.casic.missiles.dto.business.certificate.CertificateReportSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessCertificateReport;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
@@ -21,6 +22,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -50,7 +52,7 @@
         return certificateReportService.saveCertificateReport(request);
     }
 
-    @ApiOperation("证书审批详情（基本信息）")
+    @ApiOperation("详情（基本信息）")
     @PostMapping("/detail")
     public ReturnDTO<BizBusinessCertificateReport> detail(@RequestBody @Valid BaseDetailRequest request, BindingResult bindingResult) throws Exception {
         if(bindingResult.hasErrors()){
@@ -59,4 +61,11 @@
         return certificateReportService.detail(request);
     }
 
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody CertificateReportApprovalListRequest request) throws Exception {
+        List<BizBusinessCertificateReport> list = super.exportList(request);
+        super.exportExcel(BizBusinessCertificateReport.class, list, ExportEnum.CERTIFICATE_REPORT.getSheetName());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java
index 46b26bd..57c0809 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java
@@ -10,20 +10,21 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.business.identify.IdentifyListRequest;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessIdentifyInfo;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.business.IBizBusinessIdentifyInfoService;
+import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import javax.validation.Valid;
+import java.util.List;
 import java.util.Objects;
 
 /**
@@ -57,16 +58,13 @@
         return identifyInfoService.addIdentify(identifyInfo);
     }
 
-    @ApiOperation("标识打印更新")
+    @ApiOperation("标识打印更新（更新打印时间）")
     @PostMapping("/update")
-    public ReturnDTO updateIdentify(@RequestBody @Valid BizBusinessIdentifyInfo identifyInfo, BindingResult bindingResult) {
-        Assert.isFalse(Objects.isNull(identifyInfo.getId()), () -> {
+    public ReturnDTO updateIdentify(@RequestBody @Valid IdDTO idDTO) {
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        Assert.isFalse(bindingResult.hasErrors(), () -> {
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        });
-        return identifyInfoService.updateIdentify(identifyInfo);
+        return identifyInfoService.updateIdentify(idDTO.getId());
     }
 
     @ApiOperation("标识打印删除")
@@ -77,4 +75,37 @@
         });
         return identifyInfoService.deleteIdentify(idDTO.getId());
     }
+
+    @ApiOperation("标识打印导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody @Valid IdentifyListRequest request, BindingResult bindingResult) throws Exception {
+        if (bindingResult.hasErrors()) {
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        List<BizBusinessIdentifyInfo> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = identifyInfoService.listByIds(request.getIds());
+        } else {
+            list = identifyInfoService.list(request);
+        }
+        for (BizBusinessIdentifyInfo record : list) {
+            DictCodeUtils.convertDictCodeToName(record);
+        }
+        super.exportExcel(BizBusinessIdentifyInfo.class, list, ExportEnum.IDENTIFY_EXPORT.getSheetName());
+    }
+
+
+    // TODO: 2023/8/23 查询设备信息，4个底部按钮查设备（按钮的作用就是前端用来调不同接口、用来区分中间即将展示的标识），前端弹窗选设备，在确定保存时前端根据底部按钮判断传入设备类型deviceType字典code
+    // TODO: 2023/8/23 接口：查受检设备（第1个按钮），查设备台账（后3个按钮同一接口），查询之后前端根据标志类型的不同加到中间页面时进行判断（按产品给的对应表）
+    // TODO: 2023/8/23 提供二维码接口，前端在加到中间页面时调用一下
+
+    @ApiOperation("设备二维码")
+    @PostMapping("/equipment/qrCode")
+    public ReturnDTO<String> equipmentQrCode(@RequestBody @Valid IdDTO idDTO) {
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return identifyInfoService.equipmentQrCode(idDTO.getId());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java
index 707be6e..7e0453d 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java
@@ -117,7 +117,7 @@
     }
 
     @ApiOperation("任务单导出")
-    @PostMapping("/export")
+    @PostMapping("/listExport")
     public void orderExport(@RequestBody @Valid OrderListRequest request, HttpServletResponse response) {
         businessOrderService.orderExport(request, response);
     }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java
index 529a6ce..51432be 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java
@@ -1,9 +1,28 @@
 package com.casic.missiles.controller.business;
 
+import com.casic.missiles.controller.GeneralApprovalController;
+import com.casic.missiles.dto.BaseApprovalSubmitRequest;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.business.outsource.OutsourceAssessApprovalListRequest;
+import com.casic.missiles.dto.business.outsource.OutsourceAssessSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
+import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.model.business.BizBusinessOutsourceAssess;
+import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
+import com.casic.missiles.service.IGeneralApprovalService;
+import com.casic.missiles.service.business.IBizBusinessOutsourceAssessService;
 import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.BindingResult;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.validation.Valid;
+import java.util.List;
+
 /**
  * <p>
  * 计量检定业务-分包管理-测试、校准或检定工作分包评审表 前端控制器
@@ -15,6 +34,27 @@
 @Api(tags = "分包管理-测试、校准或检定工作分包评审表")
 @RestController
 @RequestMapping("/business/outsource/assess")
-public class BizBusinessOutsourceAssessController {
+public class BizBusinessOutsourceAssessController extends GeneralApprovalController<BizBusinessOutsourceAssess, BizBusinessOutsourceAssess, OutsourceAssessApprovalListRequest, BaseApprovalSubmitRequest> {
+    @Autowired
+    private IBizBusinessOutsourceAssessService outsourceAssessService;
 
+    public BizBusinessOutsourceAssessController(IGeneralApprovalService<BizBusinessOutsourceAssess, BizBusinessOutsourceAssess, OutsourceAssessApprovalListRequest, BaseApprovalSubmitRequest> baseApprovalService) {
+        super(baseApprovalService);
+    }
+
+    @ApiOperation("草稿箱-保存")
+    @PostMapping("/save")
+    public ReturnDTO<OutsourceAssessSaveResponse> saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceAssess request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        return outsourceAssessService.saveOutsourceAssess(request);
+    }
+
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception {
+        List<BizBusinessOutsourceAssess> list = super.exportList(request);
+        super.exportExcel(BizBusinessOutsourceAssess.class, list, ExportEnum.OUTSOURCE_ASSESS.getSheetName());
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java
new file mode 100644
index 0000000..9adef18
--- /dev/null
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java
@@ -0,0 +1,60 @@
+package com.casic.missiles.controller.business;
+
+import com.casic.missiles.controller.GeneralApprovalController;
+import com.casic.missiles.dto.BaseApprovalSubmitRequest;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.business.outsource.OutsourceProtocolApprovalListRequest;
+import com.casic.missiles.dto.business.outsource.OutsourceProtocolSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
+import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.model.business.BizBusinessOutsourceProtocol;
+import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
+import com.casic.missiles.service.IGeneralApprovalService;
+import com.casic.missiles.service.business.IBizBusinessOutsourceProtocolService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.BindingResult;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.validation.Valid;
+import java.util.List;
+
+/**
+ * <p>
+ * 计量检定业务-分包管理-测试、校准或检定工作分包协议书 前端控制器
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-08-24
+ */
+@Api(tags = "分包管理-测试、校准或检定工作分包协议书")
+@RestController
+@RequestMapping("/business/outsource/protocol")
+public class BizBusinessOutsourceProtocolController extends GeneralApprovalController<BizBusinessOutsourceProtocol, BizBusinessOutsourceProtocol, OutsourceProtocolApprovalListRequest, BaseApprovalSubmitRequest> {
+    @Autowired
+    private IBizBusinessOutsourceProtocolService outsourceProtocolService;
+
+    public BizBusinessOutsourceProtocolController(IGeneralApprovalService<BizBusinessOutsourceProtocol, BizBusinessOutsourceProtocol, OutsourceProtocolApprovalListRequest, BaseApprovalSubmitRequest> baseApprovalService) {
+        super(baseApprovalService);
+    }
+
+    @ApiOperation("草稿箱-保存")
+    @PostMapping("/save")
+    public ReturnDTO<OutsourceProtocolSaveResponse> saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceProtocol request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        return outsourceProtocolService.saveOutsourceProtocol(request);
+    }
+
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody OutsourceProtocolApprovalListRequest request) throws Exception {
+        List<BizBusinessOutsourceProtocol> list = super.exportList(request);
+        super.exportExcel(BizBusinessOutsourceProtocol.class, list, ExportEnum.OUTSOURCE_PROTOCOL.getSheetName());
+    }
+}
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java
index 097f645..f0f0943 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java
@@ -17,7 +17,6 @@
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.IGeneralApprovalService;
 import com.casic.missiles.service.business.IBizBusinessOutsourcerInfoService;
-import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -71,19 +70,8 @@
 
     @ApiOperation("分包方导出")
     @PostMapping("/listExport")
-    public void export(@RequestBody @Valid OutsourcerInfoApprovalListRequest request, BindingResult bindingResult) throws Exception {
-        if (bindingResult.hasErrors()) {
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        }
-        List<BizBusinessOutsourcerInfo> list;
-        if (!CollectionUtils.isEmpty(request.getIds())) {
-            list = outsourcerInfoService.listByIds(request.getIds());
-        } else {
-            list = outsourcerInfoService.list(request);
-        }
-        for (BizBusinessOutsourcerInfo record : list) {
-            DictCodeUtils.convertDictCodeToName(record);
-        }
+    public void export(@RequestBody OutsourcerInfoApprovalListRequest request) throws Exception {
+        List<BizBusinessOutsourcerInfo> list = super.exportList(request);
         super.exportExcel(BizBusinessOutsourcerInfo.class, list, ExportEnum.OUTSOURCER_EXPORT.getSheetName());
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java
index c2cbf9f..0410918 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java
@@ -17,11 +17,9 @@
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.IGeneralApprovalService;
 import com.casic.missiles.service.business.IBizBusinessSiteExecutiveInfoService;
-import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -60,7 +58,7 @@
         return siteExecutiveInfoService.saveSiteExecutiveInfo(siteExecutiveInfo);
     }
 
-    @ApiOperation("现场检测详情")
+    @ApiOperation("详情")
     @PostMapping("/detail")
     public ReturnDTO<SiteExecutiveDetailResponse> siteExecutiveDetail(@RequestBody @Valid IdDTO idDTO) throws Exception {
         Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
@@ -69,21 +67,10 @@
         return ReturnUtil.success(siteExecutiveInfoService.detail(idDTO.getId()));
     }
 
-    @ApiOperation("现场检测导出")
+    @ApiOperation("导出")
     @PostMapping("/listExport")
-    public void export(@RequestBody @Valid SiteExecutiveApprovalListRequest request, BindingResult bindingResult) throws Exception {
-        if (bindingResult.hasErrors()) {
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        }
-        List<SiteExecutiveApprovalListResponse> list;
-        if (!CollectionUtils.isEmpty(request.getIds())) {
-            list = siteExecutiveInfoService.listInfoByIds(request.getIds());
-        } else {
-            list = siteExecutiveInfoService.listInfo(request);
-        }
-        for (SiteExecutiveApprovalListResponse record : list) {
-            DictCodeUtils.convertDictCodeToName(record);
-        }
+    public void export(@RequestBody SiteExecutiveApprovalListRequest request) throws Exception {
+        List<SiteExecutiveApprovalListResponse> list = super.exportList(request);
         super.exportExcel(SiteExecutiveApprovalListResponse.class, list, ExportEnum.SITE_EXECUTIVE_EXPORT.getSheetName());
     }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
index 7e793cd..a92e209 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
@@ -55,7 +55,7 @@
 
     @ApiOperation("设备收发列表导出")
     @PostMapping("/export")
-    public void exportList(@RequestBody @Valid SampleDispatchListRequest request) throws IOException {
+    public void exportList(@RequestBody SampleDispatchListRequest request) throws IOException {
         List<SampleDispatchListResponse> list;
         if (!CollectionUtils.isEmpty(request.getIds())) {
             list = dispatchService.listByIds(request.getIds());
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java
index cdc77fc..d120fd4 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java
@@ -7,6 +7,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.business.labExecutive.*;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.business.IBusinessLabExecutiveInfoService;
@@ -14,6 +15,7 @@
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.*;
 
@@ -32,7 +34,7 @@
     @Autowired
     private IBusinessLabExecutiveInfoService labExecutiveInfoService;
 
-    @ApiOperation("实验室检测-部门检测-查询各状态列表（待检测、检测中、检测完）")
+    @ApiOperation("实验室任务-查询各状态列表（待检测、检测中、检测完）")
     @PostMapping("/deptExecutive/List")
     public ReturnDTO<PageInfoBT<SampleLabExecutiveListResponse>> queryDeptExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
@@ -43,10 +45,19 @@
         return ReturnUtil.success(super.packForBT(labExecutiveInfoService.deptLabExecutiveListPage(page, labExecutiveListRequest)));
     }
 
-    /**
-     * 实验室检测-我的检测-查询各状态列表（待检测、检测中、检测完）
-     */
-    @ApiOperation("实验室检测-我的检测-查询各状态列表（待检测、检测中、检测完）")
+    @ApiOperation("实验室任务导出")
+    @PostMapping("/deptExecutive/export")
+    public void deptExportList(@RequestBody @Valid SampleLabExecutiveListRequest request) throws Exception {
+        List<SampleLabExecutiveListResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = labExecutiveInfoService.deptLabExecutiveListByIds(request.getMeasureStatus(), request.getIds());
+        } else {
+            list = labExecutiveInfoService.deptLabExecutiveList(request);
+        }
+        super.exportExcel(SampleLabExecutiveListResponse.class, list, ExportEnum.DEPT_EXECUTIVE_TASK.getSheetName());
+    }
+
+    @ApiOperation("我的任务-查询各状态列表（待检测、检测中、检测完）")
     @PostMapping("/myExecutive/list")
     public ReturnDTO<PageInfoBT<SampleLabExecutiveListResponse>> queryMyExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
@@ -57,19 +68,25 @@
         return ReturnUtil.success(super.packForBT(labExecutiveInfoService.myLabExecutiveListPage(page, labExecutiveListRequest)));
     }
 
-    /**
-     * 实验室检测-我的检测-查询各状态样品数量（待检测、检测中、检测完）
-     */
-    @ApiOperation("实验室检测-我的检测-查询各状态样品数量（待检测、检测中、检测完）")
+    @ApiOperation("我的任务导出")
+    @PostMapping("/myExecutive/export")
+    public void exportList(@RequestBody @Valid SampleLabExecutiveListRequest request) throws Exception {
+        List<SampleLabExecutiveListResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = labExecutiveInfoService.myLabExecutiveListByIds(request.getMeasureStatus(), request.getIds());
+        } else {
+            list = labExecutiveInfoService.myLabExecutiveList(request);
+        }
+        super.exportExcel(SampleLabExecutiveListResponse.class, list, ExportEnum.MY_EXECUTIVE_TASK.getSheetName());
+    }
+
+    @ApiOperation("我的任务-查询各状态样品数量（待检测、检测中、检测完）")
     @GetMapping("/myExecutive/amount")
     public ReturnDTO<List<SampleAmountResponse>> queryMyExecutiveAmount() {
         return ReturnUtil.success(labExecutiveInfoService.myExecutiveAmount());
     }
 
-    /**
-     * 实验室检测-部门检测-分配（分配给具体人员）
-     */
-    @ApiOperation("实验室检测-部门检测-分配按钮（分配给具体人员）")
+    @ApiOperation("实验室任务-分配按钮（分配给具体人员）")
     @PostMapping("/deptExecutive/allocate")
     public ReturnDTO allocateStaff(@RequestBody @Valid SampleAllocateRequest sampleAllocateRequest, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -78,10 +95,7 @@
         return labExecutiveInfoService.allocateStaff(sampleAllocateRequest);
     }
 
-    /**
-     * 实验室检测-我的检测-检定人扫描收入（待检测->检测中）
-     */
-    @ApiOperation("实验室检测-我的检测-检定人扫描收入（待检测->检测中）")
+    @ApiOperation("我的任务-检定人扫描收入（待检测->检测中）")
     @PostMapping("/myExecutive/receive")
     public ReturnDTO sampleReceive(@RequestBody @Valid List<SampleOperateRequest> requestList, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -90,10 +104,7 @@
         return labExecutiveInfoService.sampleReceive(requestList);
     }
 
-    /**
-     * 实验室检测-负责人/检定人扫描检完（检测中->检测完）
-     */
-    @ApiOperation("实验室检测-负责人/检定人扫描检完（检测中->检测完）")
+    @ApiOperation("实验室任务-负责人/检定人扫描检完（检测中->检测完）")
     @PostMapping("/myExecutive/complete")
     public ReturnDTO sampleExecutiveComplete(@RequestBody @Valid List<SampleOperateRequest> requestList, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -102,10 +113,7 @@
         return labExecutiveInfoService.sampleExecutiveComplete(requestList);
     }
 
-    /**
-     * 实验室检测-部门检测/我的检测 编辑（只能修改应出具证书）
-     */
-    @ApiOperation("实验室检测-部门检测/我的检测 编辑（只能修改应出具证书）")
+    @ApiOperation("实验室任务/我的任务 编辑（只能修改应出具证书）")
     @PostMapping("/executive/update")
     public ReturnDTO updateExecutive(@RequestBody @Valid UpdateExecutiveRequest request, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -114,10 +122,7 @@
         return labExecutiveInfoService.updateExecutive(request);
     }
 
-    /**
-     * 实验室检测-部门检测/我的检测 详情
-     */
-    @ApiOperation("实验室检测-部门检测/我的检测 详情")
+    @ApiOperation("实验室任务/我的任务 详情")
     @PostMapping("/executive/detail")
     public ReturnDTO<ExecutiveDetailResponse> executiveDetail(@RequestBody @Valid ExecutiveDetailRequest request, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
@@ -131,7 +136,7 @@
      * 退回后会将下一个要执行的实验室检测状态更新为待分配，将后面的实验室顺序变更为连续（都进行减1）
      * 最后一个检测的实验室退回，等分发员再增加实验室或设备收发中的已收入直接手动点击完成
      */
-    @ApiOperation("实验室检测-部门检测/我的检测 退回（待检测/检测中->退回）")
+    @ApiOperation("实验室任务/我的任务 退回（待检测/检测中->退回）")
     @PostMapping("/executive/sendBack")
     public ReturnDTO executiveSendBack(@RequestBody @Valid ExecutiveSendBackRequest request, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -140,9 +145,6 @@
         return labExecutiveInfoService.sampleExecutiveSendBack(request);
     }
 
-    /**
-     * 分发员编辑实验室检测列表
-     */
     @ApiOperation("分发员编辑实验室检测列表")
     @PostMapping("/handOut/updateList")
     public ReturnDTO updateExecutiveList(@RequestBody @Valid UpdateExecutiveListRequest request, BindingResult bindingResult) {
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java
index 48a67ed..0c04f31 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java
@@ -10,6 +10,7 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.resource.customer.CustomerApprovalListRequest;
 import com.casic.missiles.dto.resource.customer.CustomerSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceCustomerInfo;
@@ -26,6 +27,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -55,6 +57,13 @@
         return customerInfoService.saveCustomerInfo(request);
     }
 
+    @ApiOperation("委托方名录导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody CustomerApprovalListRequest request) throws Exception {
+        List<BizResourceCustomerInfo> list = super.exportList(request);
+        super.exportExcel(BizResourceCustomerInfo.class, list, ExportEnum.CUSTOMER_INFO.getSheetName());
+    }
+
     @ApiOperation("委托方人员列表（分页）")
     @PostMapping("/person/listPage")
     public ReturnDTO<PageInfoBT<BizResourceCustomerStaff>> personListPage(@RequestBody IdDTO idDto) {
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
index 972ed4b..6418ea5 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
@@ -5,6 +5,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.resource.customer.SuggestFormApprovalListRequest;
 import com.casic.missiles.dto.resource.customer.SuggestFormSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceCustomerSuggestForm;
@@ -20,6 +21,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -50,4 +52,11 @@
         return suggestFormService.saveSuggestForm(request);
     }
 
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody SuggestFormApprovalListRequest request) throws Exception {
+        List<BizResourceCustomerSuggestForm> list = super.exportList(request);
+        super.exportExcel(BizResourceCustomerSuggestForm.class, list, ExportEnum.CUSTOMER_SUGGEST_FORM.getSheetName());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java
index 1934d1a..9e07eab 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java
@@ -15,12 +15,16 @@
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.resource.IEnvEnvironmentRecordConfigService;
 import com.casic.missiles.service.resource.IEnvEnvironmentRecordDataService;
+import com.casic.missiles.service.resource.IEnvLocationInfoService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
 import java.util.List;
@@ -39,6 +43,8 @@
     private IEnvEnvironmentRecordDataService environmentRecordDataService;
     @Autowired
     private IEnvEnvironmentRecordConfigService environmentRecordConfigService;
+    @Autowired
+    private IEnvLocationInfoService locationInfoService;
 
     @ApiOperation("环境记录单数据列表/详情")
     @PostMapping("/data/listPage")
@@ -95,4 +101,11 @@
         });
         return environmentRecordConfigService.deleteEnvironmentRecordConfig(idDTO.getId());
     }
+
+    @ApiOperation("地点列表")
+    @PostMapping("/location/listPage")
+    public ReturnDTO<PageInfoBT<LocationListResponse>> locationListPage(@RequestBody @Valid LocationListRequest request) {
+        Page<LocationListResponse> page = PageFactory.defaultPage();
+        return ReturnUtil.success(super.packForBT(locationInfoService.listPage(page, request)));
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java
index 82efe3f..e9561fa 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java
@@ -10,6 +10,7 @@
 import com.casic.missiles.dto.resource.seal.SealLogListRequest;
 import com.casic.missiles.dto.resource.seal.SealNoteApprovalListRequest;
 import com.casic.missiles.dto.resource.seal.SealNoteSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceSealUseLog;
@@ -27,6 +28,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -58,6 +60,13 @@
         return sealUseNoteService.saveSeal(request);
     }
 
+    @ApiOperation("印章使用登记导出（列表和导出中去掉经办人和监印人）")
+    @PostMapping("/listExport")
+    public void export(@RequestBody SealNoteApprovalListRequest request) throws Exception {
+        List<BizResourceSealUseNote> list = super.exportList(request);
+        super.exportExcel(BizResourceSealUseNote.class, list, ExportEnum.SEAL_NOTE.getSheetName());
+    }
+
     // TODO: 2023/7/28 印章使用日志：系统中使用印章时插入数据库
 
     @ApiOperation("印章使用日志列表（分页）")
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java
index 9b674fc..06b6521 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java
@@ -9,16 +9,20 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.resource.staff.StaffCertRequest;
 import com.casic.missiles.dto.resource.staff.StaffCertResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.service.resource.IBizResourceStaffInfoService;
 import com.casic.missiles.service.resource.IBizResourceStaffVerifierService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.List;
+
 /**
  * @Description:
  * @Author: wangpeng
@@ -41,9 +45,21 @@
         return ReturnUtil.success(super.packForBT(responsePage));
     }
 
+    @ApiOperation("证书逾期提醒导出")
+    @PostMapping("/listExport")
+    public void exportList(@RequestBody StaffCertRequest request) throws Exception {
+        List<StaffCertResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = staffInfoService.certListByIds(request.getIds());
+        } else {
+            list = staffInfoService.certList(request);
+        }
+        super.exportExcel(StaffCertResponse.class, list, ExportEnum.STAFF_CERTIFICATE_EXPIRE.getSheetName());
+    }
+
     @ApiOperation("证书逾期提醒")
     @PostMapping("/expirationReminder")
-    public ReturnDTO expirationReminder(@RequestBody IdDTO idDto) {
-        return verifierService.expirationReminder(idDto);
+    public ReturnDTO expirationReminder(@RequestBody IdDTO idDTO) {
+        return verifierService.expirationReminder(idDTO);
     }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java
index 3b251ad..a6e7850 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java
@@ -12,6 +12,7 @@
 import com.casic.missiles.dto.resource.staff.StaffListRequest;
 import com.casic.missiles.dto.resource.staff.TrainListRequest;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.*;
@@ -22,7 +23,10 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
 import java.util.List;
@@ -52,8 +56,19 @@
             throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
         }
         Page<BizResourceStaffInfo> page = PageFactory.defaultPage();
-        Page<BizResourceStaffInfo> responsePage = staffInfoService.listPage(page, request);
-        return ReturnUtil.success(super.packForBT(responsePage));
+        return ReturnUtil.success(super.packForBT(staffInfoService.listPage(page, request)));
+    }
+
+    @ApiOperation("人员登记导出")
+    @PostMapping("/listExport")
+    public void exportList(@RequestBody StaffListRequest request) throws Exception {
+        List<BizResourceStaffInfo> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = staffInfoService.listByIds(request.getIds());
+        } else {
+            list = staffInfoService.list(request);
+        }
+        super.exportExcel(BizResourceStaffInfo.class, list, ExportEnum.STAFF_INFO.getSheetName());
     }
 
     @ApiOperation("人员登记详情基础信息")
@@ -85,9 +100,9 @@
 
     @ApiOperation("科研教育列表（分页）")
     @PostMapping("/education/listPage")
-    public ReturnDTO<PageInfoBT<BizResourceStaffEducation>> educationListPage(@RequestBody IdDTO idDto) {
+    public ReturnDTO<PageInfoBT<BizResourceStaffEducation>> educationListPage(@RequestBody IdDTO idDTO) {
         Page<BizResourceStaffEducation> page = PageFactory.defaultPage();
-        Page<BizResourceStaffEducation> responsePage = staffInfoService.educationListPage(page, idDto);
+        Page<BizResourceStaffEducation> responsePage = staffInfoService.educationListPage(page, idDTO);
         return ReturnUtil.success(super.packForBT(responsePage));
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java
index af6aa86..d85d84a 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java
@@ -9,6 +9,7 @@
 import com.casic.missiles.dto.resource.outsideService.SupplierApprovalListRequest;
 import com.casic.missiles.dto.resource.outsideService.SupplierSaveResponse;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceSupplierAbility;
@@ -67,6 +68,13 @@
         return ReturnUtil.success(supplierInfoService.detail(idDTO.getId()));
     }
 
+    @ApiOperation("合格供方导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody SupplierApprovalListRequest request) throws Exception {
+        List<BizResourceSupplierInfo> list = super.exportList(request);
+        super.exportExcel(BizResourceSupplierInfo.class, list, ExportEnum.SUPPLIER_INFO.getSheetName());
+    }
+
     @ApiOperation("供方人员列表（分页）")
     @PostMapping("/person/listPage")
     public ReturnDTO<PageInfoBT<BizResourceSupplierPerson>> personListPage(@RequestBody IdDTO idDTO) {
diff --git a/casic-metering-api/src/main/resources/config/application.yml b/casic-metering-api/src/main/resources/config/application.yml
index 350db5f..ecff521 100644
--- a/casic-metering-api/src/main/resources/config/application.yml
+++ b/casic-metering-api/src/main/resources/config/application.yml
@@ -126,7 +126,7 @@
     #作者
     author: wangpeng
     #待生成对象表名
-    table-name: biz_equipment_technical_target_approval,biz_equipment_attachment_approval,biz_equipment_checkpoint_approval
+    table-name: biz_business_outsource_protocol
 
 reminder:
   #节点--common模块config包 ReminderNodeConfig配置
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
index 4a19e4e..d47d552 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
@@ -53,6 +53,7 @@
     SUGGEST_FORM_SAVE_FAILED(2509, "委托方意见登记表保存至草稿箱失败"),
     EXAMINE_FORM_SAVE_FAILED(2510, "要求、委托书及合同评审表保存至草稿箱失败"),
     CUSTOMER_EXIST_SAVE_FAILED(2511, "该委托方已存在，请重新选择"),
+    DUPLICATE_LOCATION_NO(2512, "地点编号已存在"),
 
     /**
      * 计量检定业务模块
@@ -68,6 +69,8 @@
     COMPLETE_SAMPLE_NOT_EXIST(2609, "检测中不存在扫描收入的样品"),
     CANNOT_CHANGE_MEASURE_INFO(2610, "无法更改非当前登录用户的检测信息"),
     NON_EXIST_ORDER_OR_SAMPLE(2611, "不存在该委托单或该委托单下的样品"),
+    OUTSOURCE_ACCESS_SAVE_FAILED(2612, "测试、校准或检定工作分包评审表保存至草稿箱失败"),
+    OUTSOURCE_PROTOCOL_SAVE_FAILED(2613, "测试、校准或检定工作分包协议书保存至草稿箱失败"),
 
     /**
      * 历史遗留备用
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
index 5089ad1..81a406b 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
@@ -10,54 +10,38 @@
     /**
      * 资源管理
      */
-    ENVIRONMENT_DATA_EXPORT("environmentData", "environmentData", "环境记录单数据"),
+    ENVIRONMENT_DATA_EXPORT("environmentData", "环境记录单数据", "环境记录单数据"),
+    STAFF_INFO("staffInfo", "人员登记", "人员登记"),
+    STAFF_CERTIFICATE_EXPIRE("certificateExpire", "证书逾期提醒", "证书逾期提醒"),
+    SUPPLIER_INFO("supplierInfo", "合格供方名录", "合格供方名录"),
+    CUSTOMER_INFO("customerInfo", "委托方名录", "委托方名录"),
+    CUSTOMER_SUGGEST_FORM("customerSuggestForm", "委托方意见登记表", "委托方意见登记表"),
+    SEAL_NOTE("sealNote", "印章使用登记", "印章使用登记"),
 
-    FILE_EXPORT("meterFileData", "meterFileData", "计量文件信息"),
-    TRAIN_PLAN_EXPORT("trainPlanData", "trainPlanData", "培训计划"),
-    TRAIN_LOG_EXPORT("trainLogData", "trainLogData", "培训记录"),
-    METER_ORGANIZE_EXPORT("meterOrganizeData", "meterOrganizeData", "计量组织"),
-    TRACE_SUPPLIER_EXPORT("traceSupplierData", "traceSupplierData", "溯源供方"),
-    SIGN_EXPORT("signData", "signData", "签名/签章"),
-    TEMPLATE_EXPORT("templateData", "templateData", "原始记录模板/证书报告模板"),
-    FIXED_ASSETS("meterFixedAssets", "meterFixedAssets", "固定资产"),
-    METER_EQUIPMENT("meterEquipment", "meterEquipment", "测量设备"),
-    CALIBRATION_TEST_EQUIPMENT("calibrationTestEquipment", "calibrationTestEquipment", "校准检定设备"),
-    MEASURE_ACCOUNT("measureAccount", "measureAccount", "测量工装"),
-    STANDARD_SUPPORT_EQUIPMENT("standardSupportEquipment", "standardSupportEquipment", "标准配套设备"),
-    STANDARD_EQUIPMENT("standardEquipment", "standardEquipment", "标准装置"),
-    FLOW_DEF_EXPORT("flowDefData", "flowDefData", "流程定义"),
-    STAFF_CERTIFICATE("certificate", "certificate", "计量人员证书"),
-    CHECK_INFO("checkInfo", "checkInfo", "设备管理点检测"),
-    EQUIPMENT_APPLY("equipmentApply", "equipmentApply", "设备借用"),
-    STANDARD_EQUIPMENT_REMIND("equipmentApplyRemind", "equipmentApplyRemind", "标准装置到期提醒"),
-    METER_PRICE("meterPrice", "meterPrice", "价格库"),
-    METER_STAFF("meterStaff", "meterStaff", "计量人员"),
-    STANDARD_EQUIPMENT_APPLY("standardEquipmentApply", "standardEquipmentApply", "标准装置申请"),
-    STATE_MANAGE_APPLY("stateManage", "stateManage", "状态管理"),
-    METER_ACCEPTANCE_CHECK("acceptanceCheck", "acceptanceCheck", "设备检修保养验收单"),
-    CUSTOMER_EXPORT("customerData", "customerData", "客户信息"),
-    ORDER_EXPORT("orderData", "orderData", "委托书信息"),
-    SAMPLE_EXPORT("sampleData", "sampleData", "样本信息"),
-    EXCHANGE_DATA("exchangeData", "exchangeData", "设备交接单"),
-    DISPATCH_DATA("dispatchData", "dispatchData", "设备收发"),
-    ENVIRONMENT_DATA("environmentData", "environmentData", "环境记录单"),
-    ORIGIN_DATA("originData", "originData", "原始记录"),
-    CERTIFICATE_REPORT("certificateReport", "certificateReport", "证书报告"),
-    ADVICE_EXPORT("adviceData", "adviceData", "客户反馈"),
-    HANDOUT_EXPORT("handoutData", "handoutData", "任务分发列表"),
-    OUTSOURCER_EXPORT("outsourcerData", "outsourcerData", "分包方"),
-    SITE_EXECUTIVE_EXPORT("siteExecutiveData", "siteExecutiveData", "现场测试、校准或检定"),
-    CERTIFICATE_PRINT_EXPORT("certificatePrintData", "certificatePrintData", "证书打印"),
-    DOWNLOAD_TEMPLATE("downloadTemplate", "downloadTemplate", "页面配置"),
-    OUTSOURCER_CERTIFICATE_EXPORT("outsourceCertificateData", "outsourceCertificateData", "分包证书"),
-    SETTLEMENT_INFO_EXPORT("settlementInfoData", "settlementInfoData", "业务结算"),
-    EQUIPMENT_REMIND("equipmentRemind", "equipmentRemind", "设备到期提醒"),
-    AGREEMENT_INFO_EXPORT("agreementInfoData", "agreementInfoData", "合同"),
-    WORK_STATISTICS_EXPORT("workStatisticsData", "workStatisticsData", "实时工作统计"),
-    DEPT_OUTPUT_EXPORT("deptOutputData", "deptOutputData", "部门产值分析"),
-    WORKLOAD_EXPORT("workloadData", "workloadData", "业务工作量分析"),
-    DEPT_COMPREHENSIVE_EXPORT("deptComprehensiveData", "deptComprehensiveData", "部门综合分析"),
-    ENVIRONMENTAL_RECORD("environmentalRecordData", "environmentalRecordData", "现场环境记录");
+    /**
+     * 计量检定业务
+     */
+    OUTSOURCER_EXPORT("outsourcerData", "分包方名录", "分包方名录"),
+    IDENTIFY_EXPORT("identifyData", "计量标识", "计量标识"),
+    ORDER_EXPORT("orderData", "任务单", "任务单"),
+    DISPATCH_DATA("dispatchData", "设备收发", "设备收发"),
+    HANDOUT_EXPORT("handoutData", "任务分发", "任务分发"),
+    SITE_EXECUTIVE_EXPORT("siteExecutiveData", "现场测试、校准或检定", "现场测试、校准或检定"),
+    CERTIFICATE_REPORT("certificateReport", "证书审批", "证书审批"),
+    CERTIFICATE_CHANGE_APPLY("certificateChangeApply", "证书报告补充或更换申请单", "证书报告补充或更换申请单"),
+    CERTIFICATE_PRINT("certificatePrintData", "证书打印审批", "证书打印审批"),
+    DEPT_EXECUTIVE_TASK("deptExecutiveTaskData", "实验室任务", "实验室任务"),
+    MY_EXECUTIVE_TASK("myExecutiveTaskData", "我的任务", "我的任务"),
+    OUTSOURCE_ASSESS("outsourceAssess", "测试、校准或检定工作分包评审表", "测试、校准或检定工作分包评审表"),
+    OUTSOURCE_PROTOCOL("outsourceProtocol", "测试、校准或检定工作分包协议书", "测试、校准或检定工作分包协议书"),
+
+    /**
+     * 系统管理
+     */
+    SIGN_EXPORT("signData", "签名", "签名"),
+    TEMPLATE_EXPORT("templateData", "文件模板", "文件模板"),
+    FLOW_DEF_EXPORT("flowDefData", "流程定义", "流程定义"),
+    DOWNLOAD_TEMPLATE("downloadTemplate", "流程定义", "页面配置");
 
     ExportEnum(String fileName, String sheetName, String description) {
         this.fileName = fileName;
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateRecordTypeCodeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateRecordTypeCodeEnum.java
index 31d913c..a963522 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateRecordTypeCodeEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateRecordTypeCodeEnum.java
@@ -46,4 +46,14 @@
     String SITE_EXECUTIVE_APPROVAL = "01";
     //《现场测试、校准或检定工作记录表》
     String SITE_EXECUTIVE_LOG = "02";
+
+    //测试、校准或检定工作分包协议书
+    String OUTSOURCE_PROTOCOL = "01";
+    //测试、校准或检定工作分包评审表
+    String OUTSOURCE_ACCESS = "02";
+    //测试、校准或检定工作分包通知书
+    String OUTSOURCE_NOTICE = "03";
+    //测试、校准或检定工作分包方名录
+    String OUTSOURCE_INFO = "04";
+
 }
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
index 24b8635..f78bd53 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
@@ -15,6 +15,10 @@
     String CERTIFICATE_CHANGE_APPLY_BEAN_NAME = "certificateChangeApplyBean";
     //现场测试、校准或检定
     String SITE_EXECUTIVE_BEAN_NAME = "siteExecutiveBean";
+    //测试、校准或检定工作分包评审表
+    String OUTSOURCE_ASSESS_BEAN_NAME = "outsourceAssessBean";
+    //测试、校准或检定工作分包协议书
+    String OUTSOURCE_PROTOCOL_BEAN_NAME = "outsourceProtocolBean";
 
     /*********************************设备与装置************************************/
     //设备台账
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 b21c661..6b86fd1 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
@@ -18,6 +18,8 @@
     OUTSOURCER_APPROVAL(OUTSOURCER_BEAN_NAME, ""),
     CERTIFICATE_CHANGE_APPROVAL(CERTIFICATE_CHANGE_APPLY_BEAN_NAME, ""),
     SITE_EXECUTIVE_APPROVAL(SITE_EXECUTIVE_BEAN_NAME, ""),
+    OUTSOURCE_ASSESS_APPROVAL(OUTSOURCE_ASSESS_BEAN_NAME, ""),
+    OUTSOURCE_PROTOCOL_APPROVAL(OUTSOURCE_PROTOCOL_BEAN_NAME, ""),
 
     ACTION_STATUS_MAP(new HashMap<String, AwareActionStatusEnum>() {
         {
@@ -47,6 +49,10 @@
             put(ApplyFromIdEnum.CERTIFICATE_CHANGE_APPROVAL.getCode(), CERTIFICATE_CHANGE_APPROVAL);
             //现场测试、校准或检定审批
             put(ApplyFromIdEnum.SITE_EXECUTIVE_APPROVAL.getCode(), SITE_EXECUTIVE_APPROVAL);
+            //测试、校准或检定工作分包评审表
+            put(ApplyFromIdEnum.OUTSOURCE_ASSESS_APPROVAL.getCode(), OUTSOURCE_ASSESS_APPROVAL);
+            //测试、校准或检定工作分包协议书
+            put(ApplyFromIdEnum.OUTSOURCE_PROTOCOL_APPROVAL.getCode(), OUTSOURCE_PROTOCOL_APPROVAL);
         }
     });
     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 934405e..c7410bd 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
@@ -9,6 +9,8 @@
     CERTIFICATE_CHANGE_APPROVAL("jljdywzsbchghsqd", MessageSourceModuleEnum.BUSINESS.getCode(), "证书/报告补充或更换申请单"),
     OUTSOURCER_APPROVAL("jljdywcsjzhgfbfml", MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定合格分包方名录"),
     SITE_EXECUTIVE_APPROVAL("jljdywxccsjzsp", MessageSourceModuleEnum.BUSINESS.getCode(), "现场测试、校准或检定审批"),
+    OUTSOURCE_ASSESS_APPROVAL("jljdywcsjzfbpsb", MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包评审表"),
+    OUTSOURCE_PROTOCOL_APPROVAL("jljdywcsjzfbxys", MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包协议书"),
 
 
     /*******************************************设备与装置*********************************************/
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/GeneralApprovalMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/GeneralApprovalMapper.java
index 4fb7344..0c9d6ae 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/GeneralApprovalMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/GeneralApprovalMapper.java
@@ -17,8 +17,4 @@
 
     Page<O> selectBatchForApprovalList(Page<O> page, @Param("request") R request, @Param("businessKeys") List<String> businessKeys);
 
-//    Page<O> selectListPage(Page<O> page, @Param("request") R request);
-
-//    Long selectMaxNo();
-
 }
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceAssessMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceAssessMapper.java
index 7867bb8..ba59009 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceAssessMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceAssessMapper.java
@@ -1,7 +1,12 @@
 package com.casic.missiles.mapper.business;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.business.outsource.OutsourceAssessApprovalListRequest;
+import com.casic.missiles.mapper.GeneralApprovalMapper;
 import com.casic.missiles.model.business.BizBusinessOutsourceAssess;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * <p>
@@ -11,6 +16,10 @@
  * @author wangpeng
  * @since 2023-08-16
  */
-public interface BizBusinessOutsourceAssessMapper extends BaseMapper<BizBusinessOutsourceAssess> {
+public interface BizBusinessOutsourceAssessMapper extends GeneralApprovalMapper<BizBusinessOutsourceAssess, BizBusinessOutsourceAssess, OutsourceAssessApprovalListRequest> {
+
+    Page<BizBusinessOutsourceAssess> selectBatchForApprovalList(Page<BizBusinessOutsourceAssess> page, @Param("request") OutsourceAssessApprovalListRequest request, @Param("businessKeys") List<String> businessKeys);
+
+    Long selectMaxProjectNo();
 
 }
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceProtocolMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceProtocolMapper.java
new file mode 100644
index 0000000..e6aba35
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceProtocolMapper.java
@@ -0,0 +1,24 @@
+package com.casic.missiles.mapper.business;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.business.outsource.OutsourceProtocolApprovalListRequest;
+import com.casic.missiles.mapper.GeneralApprovalMapper;
+import com.casic.missiles.model.business.BizBusinessOutsourceProtocol;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 计量检定业务-分包管理-测试、校准或检定工作分包协议书 Mapper 接口
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-08-24
+ */
+public interface BizBusinessOutsourceProtocolMapper extends GeneralApprovalMapper<BizBusinessOutsourceProtocol, BizBusinessOutsourceProtocol, OutsourceProtocolApprovalListRequest> {
+
+    Page<BizBusinessOutsourceProtocol> selectBatchForApprovalList(Page<BizBusinessOutsourceProtocol> page, @Param("request") OutsourceProtocolApprovalListRequest request, @Param("businessKeys") List<String> businessKeys);
+
+    Long selectMaxProtocolNo();
+}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/EnvLocationInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/EnvLocationInfoMapper.java
new file mode 100644
index 0000000..49eff87
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/EnvLocationInfoMapper.java
@@ -0,0 +1,21 @@
+package com.casic.missiles.mapper.resource;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.resource.environment.LocationListRequest;
+import com.casic.missiles.dto.resource.environment.LocationListResponse;
+import com.casic.missiles.model.resource.EnvLocationInfo;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * <p>
+ * 实验室环境监控系统-设备表 Mapper 接口
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-06-07
+ */
+public interface EnvLocationInfoMapper extends BaseMapper<EnvLocationInfo> {
+
+    Page<LocationListResponse> selectLocationListPage(Page<LocationListResponse> page, @Param("request") LocationListRequest request);
+}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java
index de124db..85ed0f7 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java
@@ -1,7 +1,9 @@
 package com.casic.missiles.mapper.system;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.dto.system.SignDetailResponse;
+import com.casic.missiles.dto.system.SignListRequest;
 import com.casic.missiles.model.system.SystemSign;
 import org.apache.ibatis.annotations.Param;
 
@@ -22,4 +24,8 @@
     SignDetailResponse selectSignDetailById(Long id);
 
     List<SystemSign> selectUsableSignList(@Param("userId") Long userId);
+
+    Page<SystemSign> selectSignListPage(Page<SystemSign> page, @Param("request") SignListRequest request);
+
+    List<SystemSign> selectSignList(@Param("request") SignListRequest request);
 }
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateChangeApplyMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateChangeApplyMapper.xml
index d798447..c496092 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateChangeApplyMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateChangeApplyMapper.xml
@@ -30,31 +30,31 @@
         SELECT *
         FROM biz_business_certificate_change_apply
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.changeApplyNo != null and request.changeApplyNo !=''">
+        <if test="request != null and request.changeApplyNo != null and request.changeApplyNo !=''">
             and change_apply_no like concat('%',#{request.changeApplyNo},'%')
         </if>
-        <if test="request.changeReportNo != null and request.changeReportNo !=''">
+        <if test="request != null and request.changeReportNo != null and request.changeReportNo !=''">
             and change_report_no like concat('%',#{request.changeReportNo},'%')
         </if>
-        <if test="request.changeReportName != null and request.changeReportName !=''">
+        <if test="request != null and request.changeReportName != null and request.changeReportName !=''">
             and change_report_name like concat('%',#{request.changeReportName},'%')
         </if>
-        <if test="request.changeType != null and request.changeType !=''">
+        <if test="request != null and request.changeType != null and request.changeType !=''">
             and change_type = #{request.changeType}
         </if>
-        <if test="request.createUserName != null and request.createUserName !=''">
+        <if test="request != null and request.createUserName != null and request.createUserName !=''">
             and create_user_name like concat('%',#{request.createUserName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificatePrintMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificatePrintMapper.xml
index b66cd99..49c0ac8 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificatePrintMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificatePrintMapper.xml
@@ -31,34 +31,34 @@
         LEFT JOIN biz_business_order_sample_relation bosr ON (bosr.order_id = bcr.order_id AND bosr.sample_id = bcr.sample_id)
         LEFT JOIN biz_business_order_info boi ON boi.id = bosr.order_id
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and bcp.approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.printStatus != null and request.printStatus !=''">
+        <if test="request != null and request.printStatus != null and request.printStatus !=''">
             and print_status = #{request.printStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and bcp.create_user_id = #{request.createUserId}
         </if>
-        <if test="request.certificateReportNo != null and request.certificateReportNo !=''">
+        <if test="request != null and request.certificateReportNo != null and request.certificateReportNo !=''">
             and bcr.certificate_report_no like concat('%',#{request.certificateReportNo},'%')
         </if>
-        <if test="request.certificateReportName != null and request.certificateReportName !=''">
+        <if test="request != null and request.certificateReportName != null and request.certificateReportName !=''">
             and bcr.certificate_report_name like concat('%',#{request.certificateReportName},'%')
         </if>
-        <if test="request.customerName != null and request.customerName !=''">
+        <if test="request != null and request.customerName != null and request.customerName !=''">
             and boi.customer_name like concat('%',#{request.customerName},'%')
         </if>
-        <if test="request.sampleNo != null and request.sampleNo !=''">
+        <if test="request != null and request.sampleNo != null and request.sampleNo !=''">
             and bosr.sample_no like concat('%',#{request.sampleNo},'%')
         </if>
-        <if test="request.sampleName != null and request.sampleName !=''">
+        <if test="request != null and request.sampleName != null and request.sampleName !=''">
             and bosr.sample_name like concat('%',#{request.sampleName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and bcp.create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and bcp.create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml
index b366034..767695d 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml
@@ -46,33 +46,37 @@
         SELECT bcr.*, bosr.sample_no, bosr.sample_name, bosr.sample_model, rsi.staff_name
         FROM biz_business_certificate_report bcr
         LEFT JOIN biz_business_order_sample_relation bosr ON (bosr.order_id = bcr.order_id AND bosr.sample_id = bcr.sample_id)
+        LEFT JOIN biz_business_order_info boi ON boi.id = bcr.order_id
         LEFT JOIN biz_resource_staff_info rsi ON rsi.id = bcr.measure_person_id
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and bcr.approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and bcr.create_user_id = #{request.createUserId}
         </if>
-        <if test="request.certificateReportNo != null and request.certificateReportNo !=''">
+        <if test="request != null and request.customerId != null and request.customerId !=''">
+            and boi.customer_id = #{request.customerId}
+        </if>
+        <if test="request != null and request.certificateReportNo != null and request.certificateReportNo !=''">
             and bcr.certificate_report_no like concat('%',#{request.certificateReportNo},'%')
         </if>
-        <if test="request.certificateReportName != null and request.certificateReportName !=''">
+        <if test="request != null and request.certificateReportName != null and request.certificateReportName !=''">
             and bcr.certificate_report_name like concat('%',#{request.certificateReportName},'%')
         </if>
-        <if test="request.sampleNo != null and request.sampleNo !=''">
+        <if test="request != null and request.sampleNo != null and request.sampleNo !=''">
             and bosr.sample_no like concat('%',#{request.sampleNo},'%')
         </if>
-        <if test="request.measureCategory != null and request.measureCategory !=''">
+        <if test="request != null and request.measureCategory != null and request.measureCategory !=''">
             and bcr.measure_category = #{request.measureCategory}
         </if>
-        <if test="request.measurePerson != null and request.measurePerson !=''">
+        <if test="request != null and request.measurePerson != null and request.measurePerson !=''">
             and rsi.staff_name like concat('%',#{request.measurePerson},'%')
         </if>
-        <if test="request.calibrationTimeStart != null and request.calibrationTimeStart !=''">
+        <if test="request != null and request.calibrationTimeStart != null and request.calibrationTimeStart !=''">
             and bcr.calibration_time &gt;= #{request.calibrationTimeStart}
         </if>
-        <if test="request.calibrationTimeEnd != null and request.calibrationTimeEnd !=''">
+        <if test="request != null and request.calibrationTimeEnd != null and request.calibrationTimeEnd !=''">
             and bcr.calibration_time &lt;= #{request.calibrationTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceAssessMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceAssessMapper.xml
index d0fcf8b..c22c101 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceAssessMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceAssessMapper.xml
@@ -7,6 +7,8 @@
         <id column="id" property="id" />
         <result column="project_no" property="projectNo" />
         <result column="project_name" property="projectName" />
+        <result column="lab_code" property="labCode" />
+        <result column="group_code" property="groupCode" />
         <result column="applicant_id" property="applicantId" />
         <result column="applicant_name" property="applicantName" />
         <result column="applicant_time" property="applicantTime" />
@@ -31,7 +33,45 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, project_no, project_name, applicant_id, applicant_name, applicant_time, minio_file_name, remark, create_user_id, create_user_name, outsourcer_id, pre_start_time, pre_end_time, outsource_reason, pre_cost, approval_status, process_id, approve_situation, traceability, test_method, technique_ability, create_time, update_time
+        id, project_no, project_name, lab_code, group_code, applicant_id, applicant_name, applicant_time, minio_file_name, remark, create_user_id, create_user_name, outsourcer_id, pre_start_time, pre_end_time, outsource_reason, pre_cost, approval_status, process_id, approve_situation, traceability, test_method, technique_ability, create_time, update_time
     </sql>
 
+    <select id="selectMaxProjectNo" resultType="java.lang.Long">
+        SELECT IFNULL(max(RIGHT(project_no, 3)), 0) from biz_business_outsource_assess
+    </select>
+
+    <select id="selectBatchForApprovalList" resultMap="BaseResultMap">
+        SELECT bboa.*, bboi.outsourcer_name, bboi.director
+        FROM biz_business_outsource_assess bboa
+        LEFT JOIN biz_business_outsourcer_info bboi ON bboa.outsourcer_id = bboi.id
+        WHERE 1=1
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
+            and bboa.approval_status = #{request.approvalStatus}
+        </if>
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
+            and bboa.create_user_id = #{request.createUserId}
+        </if>
+        <if test="request != null and request.projectNo != null and request.projectNo !=''">
+            and bboa.project_no like concat('%',#{request.projectNo},'%')
+        </if>
+        <if test="request != null and request.outsourcerName != null and request.outsourcerName !=''">
+            and bboi.outsourcer_name like concat('%',#{request.outsourcerName},'%')
+        </if>
+        <if test="request != null and request.applicantName != null and request.applicantName !=''">
+            and bboa.applicant_name like concat('%',#{request.applicantName},'%')
+        </if>
+        <if test="request != null and request.applicantTimeStart != null and request.applicantTimeStart !=''">
+            and bboa.applicant_time &gt;= #{request.applicantTimeStart}
+        </if>
+        <if test="request != null and request.applicantTimeEnd != null and request.applicantTimeEnd !=''">
+            and bboa.applicant_time &lt;= #{request.applicantTimeEnd}
+        </if>
+        <if test="businessKeys != null">
+            and bboa.id in
+            <foreach collection="businessKeys" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
+        ORDER BY bboa.create_time DESC
+    </select>
 </mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceProtocolMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceProtocolMapper.xml
new file mode 100644
index 0000000..b7b2149
--- /dev/null
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceProtocolMapper.xml
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.mapper.business.BizBusinessOutsourceProtocolMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.business.BizBusinessOutsourceProtocol">
+        <id column="id" property="id" />
+        <result column="protocol_no" property="protocolNo" />
+        <result column="project_name" property="projectName" />
+        <result column="lab_code" property="labCode" />
+        <result column="group_code" property="groupCode" />
+        <result column="outsourcer_id" property="outsourcerId" />
+        <result column="remark" property="remark" />
+        <result column="outsource_no" property="outsourceNo" />
+        <result column="outsource_name" property="outsourceName" />
+        <result column="contacts" property="contacts" />
+        <result column="mobile" property="mobile" />
+        <result column="address" property="address" />
+        <result column="require_date" property="requireDate" />
+        <result column="outsource_cost" property="outsourceCost" />
+        <result column="director" property="director" />
+        <result column="item" property="item" />
+        <result column="requires" property="requires" />
+        <result column="create_user_id" property="createUserId" />
+        <result column="create_user_name" property="createUserName" />
+        <result column="approval_status" property="approvalStatus" />
+        <result column="process_id" property="processId" />
+        <result column="create_time" property="createTime" />
+        <result column="update_time" property="updateTime" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, protocol_no, project_name, lab_code, group_code, outsourcer_id, remark, outsource_no, outsource_name, contacts, mobile, address, require_date, outsource_cost, director, item, requires, create_user_id, create_user_name, approval_status, process_id, create_time, update_time
+    </sql>
+
+    <select id="selectMaxProtocolNo" resultType="java.lang.Long">
+        SELECT IFNULL(max(RIGHT(protocol_no, 3)), 0) from biz_business_outsource_protocol
+    </select>
+
+    <select id="selectBatchForApprovalList" resultMap="BaseResultMap">
+        SELECT *
+        FROM biz_business_outsource_protocol
+        WHERE 1=1
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
+            and approval_status = #{request.approvalStatus}
+        </if>
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
+            and create_user_id = #{request.createUserId}
+        </if>
+        <if test="request != null and request.protocolNo != null and request.protocolNo !=''">
+            and protocol_no like concat('%',#{request.protocolNo},'%')
+        </if>
+        <if test="request != null and request.outsourcerName != null and request.outsourcerName !=''">
+            and outsourcer_name like concat('%',#{request.outsourcerName},'%')
+        </if>
+        <if test="request != null and request.applicantName != null and request.applicantName !=''">
+            and create_user_name like concat('%',#{request.applicantName},'%')
+        </if>
+        <if test="request != null and request.applicantTimeStart != null and request.applicantTimeStart !=''">
+            and create_time &gt;= #{request.applicantTimeStart}
+        </if>
+        <if test="request != null and request.applicantTimeEnd != null and request.applicantTimeEnd !=''">
+            and create_time &lt;= #{request.applicantTimeEnd}
+        </if>
+        <if test="businessKeys != null">
+            and id in
+            <foreach collection="businessKeys" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
+        ORDER BY create_time DESC
+    </select>
+</mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourcerInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourcerInfoMapper.xml
index 510a80b..3049b54 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourcerInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourcerInfoMapper.xml
@@ -7,6 +7,8 @@
         <id column="id" property="id" />
         <result column="outsourcer_no" property="outsourcerNo" />
         <result column="outsourcer_name" property="outsourcerName" />
+        <result column="lab_code" property="labCode" />
+        <result column="group_code" property="groupCode" />
         <result column="outsourcer_brief_name" property="outsourcerBriefName" />
         <result column="outsourcer_size" property="outsourcerSize" />
         <result column="business_size" property="businessSize" />
@@ -55,32 +57,32 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, outsourcer_no, outsourcer_name, outsourcer_brief_name, outsourcer_size, business_size, grade, evaluation, tax_number, bank_account, bank_name, bank_account_number, postal_code, director, phone, fax, mobile, email, website, address_country, address_province, address_city, address_area, full_address, address_country_name, address_province_name, address_city_name, address_area_name, invoice_country, invoice_province, invoice_city, invoice_area, invoice_full_address, invoice_country_name, invoice_province_name, invoice_city_name, invoice_area_name, business_scope, business_content, minio_file_name, approval_status, process_id, remark, create_user_id, create_user_name, create_time, update_time
+        id, outsourcer_no, outsourcer_name, lab_code, group_code, outsourcer_brief_name, outsourcer_size, business_size, grade, evaluation, tax_number, bank_account, bank_name, bank_account_number, postal_code, director, phone, fax, mobile, email, website, address_country, address_province, address_city, address_area, full_address, address_country_name, address_province_name, address_city_name, address_area_name, invoice_country, invoice_province, invoice_city, invoice_area, invoice_full_address, invoice_country_name, invoice_province_name, invoice_city_name, invoice_area_name, business_scope, business_content, minio_file_name, approval_status, process_id, remark, create_user_id, create_user_name, create_time, update_time
     </sql>
 
     <select id="selectBatchForApprovalList" resultMap="BaseResultMap">
         SELECT *
         FROM biz_business_outsourcer_info
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.outsourcerNo != null and request.outsourcerNo !=''">
+        <if test="request != null and request.outsourcerNo != null and request.outsourcerNo !=''">
             and outsourcer_no like concat('%',#{request.outsourcerNo},'%')
         </if>
-        <if test="request.outsourcerName != null and request.outsourcerName !=''">
+        <if test="request != null and request.outsourcerName != null and request.outsourcerName !=''">
             and outsourcer_name like concat('%',#{request.outsourcerName},'%')
         </if>
-        <if test="request.director != null and request.director !=''">
+        <if test="request != null and request.director != null and request.director !=''">
             and director like concat('%',#{request.director},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
@@ -93,6 +95,6 @@
     </select>
 
     <select id="selectMaxNo" resultType="java.lang.Long">
-        SELECT IFNULL(max(RIGHT(outsourcer_no, 12)), 0) from biz_business_outsourcer_info
+        SELECT IFNULL(max(RIGHT(outsourcer_no, 3)), 0) from biz_business_outsourcer_info
     </select>
 </mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessSiteExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessSiteExecutiveInfoMapper.xml
index 135c5d0..3c5ae79 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessSiteExecutiveInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessSiteExecutiveInfoMapper.xml
@@ -38,25 +38,25 @@
         FROM biz_business_site_executive_info bsei
         LEFT JOIN biz_resource_customer_info rci ON bsei.customer_id = rci.id
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and bsei.approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and bsei.create_user_id = #{request.createUserId}
         </if>
-        <if test="request.siteExecutiveNo != null and request.siteExecutiveNo !=''">
+        <if test="request != null and request.siteExecutiveNo != null and request.siteExecutiveNo !=''">
             and bsei.site_executive_no like concat('%',#{request.siteExecutiveNo},'%')
         </if>
-        <if test="request.customerName != null and request.customerName !=''">
+        <if test="request != null and request.customerName != null and request.customerName !=''">
             and rci.outsourcer_name like concat('%',#{request.customerName},'%')
         </if>
-        <if test="request.applyName != null and request.applyName !=''">
+        <if test="request != null and request.applyName != null and request.applyName !=''">
             and bsei.apply_name like concat('%',#{request.applyName},'%')
         </if>
-        <if test="request.applyTimeStart != null and request.applyTimeStart !=''">
+        <if test="request != null and request.applyTimeStart != null and request.applyTimeStart !=''">
             and bsei.apply_time &gt;= #{request.applyTimeStart}
         </if>
-        <if test="request.applyTimeEnd != null and request.applyTimeEnd !=''">
+        <if test="request != null and request.applyTimeEnd != null and request.applyTimeEnd !=''">
             and bsei.apply_time &lt;= #{request.applyTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml
index 84d9e2a..6bd38a9 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml
@@ -105,6 +105,12 @@
         <if test="request.isUrgent != null and request.isUrgent !=''">
             AND bo.is_urgent = #{request.isUrgent}
         </if>
+        <if test="request.ids != null">
+            and blei.id in
+            <foreach collection="request.ids" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
         ORDER BY blei.update_time DESC
     </select>
 
@@ -137,6 +143,12 @@
         <if test="request.isUrgent != null and request.isUrgent !=''">
             AND bo.is_urgent = #{request.isUrgent}
         </if>
+        <if test="request.ids != null">
+            and blei.id in
+            <foreach collection="request.ids" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
         ORDER BY blei.update_time DESC
     </select>
 
diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardInfoMapper.xml
index 1a5551b..2ed8d17 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardInfoMapper.xml
@@ -45,12 +45,6 @@
         FROM biz_equipment_standard_info besi
         LEFT JOIN biz_equipment_standard_technology_relation bestr ON besi.standard_no = bestr.standard_no
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
-            and besi.approval_status = #{request.approvalStatus}
-        </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
-            and besi.create_user_id = #{request.createUserId}
-        </if>
         <if test="request.standardName != null and request.standardName !=''">
             and besi.standard_name like concat('%',#{request.standardName},'%')
         </if>
diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardTechnologyRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardTechnologyRelationMapper.xml
index fc7e16c..cd03c8c 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardTechnologyRelationMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardTechnologyRelationMapper.xml
@@ -6,6 +6,7 @@
     <resultMap id="BaseResultMap" type="com.casic.missiles.model.equipment.BizEquipmentStandardTechnologyRelation">
         <id column="id" property="id" />
         <result column="technology_file_id" property="technologyFileId" />
+        <result column="technology_file_no" property="technologyFileNo" />
         <result column="technology_file_name" property="technologyFileName" />
         <result column="standard_id" property="standardId" />
         <result column="standard_no" property="standardNo" />
@@ -14,7 +15,7 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, technology_file_id, technology_file_name, standard_id, remark
+        id, technology_file_id, technology_file_no, technology_file_name, standard_id, remark
     </sql>
 
 </mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceAuthorizeOrderMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceAuthorizeOrderMapper.xml
index ac5176c..554fe65 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceAuthorizeOrderMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceAuthorizeOrderMapper.xml
@@ -32,22 +32,22 @@
         SELECT *
         FROM biz_resource_authorize_order
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.orderNo != null and request.orderNo !=''">
+        <if test="request != null and request.orderNo != null and request.orderNo !=''">
             and order_no like concat('%',#{request.orderNo},'%')
         </if>
-        <if test="request.createUserName != null and request.createUserName !=''">
+        <if test="request != null and request.createUserName != null and request.createUserName !=''">
             and create_user_name like concat('%',#{request.createUserName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerExamineFormMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerExamineFormMapper.xml
index ab242f6..af7f98f 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerExamineFormMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerExamineFormMapper.xml
@@ -41,28 +41,28 @@
         SELECT *
         FROM biz_resource_customer_examine_form
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.formNo != null and request.formNo !=''">
+        <if test="request != null and request.formNo != null and request.formNo !=''">
             and form_no like concat('%',#{request.formNo},'%')
         </if>
-        <if test="request.labCode != null and request.labCode !=''">
+        <if test="request != null and request.labCode != null and request.labCode !=''">
             and lab_code like concat('%',#{request.labCode},'%')
         </if>
-        <if test="request.groupCode != null and request.groupCode !=''">
+        <if test="request != null and request.groupCode != null and request.groupCode !=''">
             and group_code like concat('%',#{request.groupCode},'%')
         </if>
-        <if test="request.createUserName != null and request.createUserName !=''">
+        <if test="request != null and request.createUserName != null and request.createUserName !=''">
             and create_user_name like concat('%',#{request.createUserName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerInfoMapper.xml
index fa8ffbc..06a2798 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerInfoMapper.xml
@@ -33,25 +33,25 @@
         SELECT *
         FROM biz_resource_customer_info
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.customerNo != null and request.customerNo !=''">
+        <if test="request != null and request.customerNo != null and request.customerNo !=''">
             and customer_no like concat('%',#{request.customerNo},'%')
         </if>
-        <if test="request.customerName != null and request.customerName !=''">
+        <if test="request != null and request.customerName != null and request.customerName !=''">
             and customer_name like concat('%',#{request.customerName},'%')
         </if>
-        <if test="request.contacts != null and request.contacts !=''">
+        <if test="request != null and request.contacts != null and request.contacts !=''">
             and contacts like concat('%',#{request.contacts},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerSuggestFormMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerSuggestFormMapper.xml
index 28f5bb2..1806662 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerSuggestFormMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerSuggestFormMapper.xml
@@ -33,28 +33,28 @@
         SELECT *
         FROM biz_resource_customer_suggest_form
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.formNo != null and request.formNo !=''">
+        <if test="request != null and request.formNo != null and request.formNo !=''">
             and form_no like concat('%',#{request.formNo},'%')
         </if>
-        <if test="request.customerName != null and request.customerName !=''">
+        <if test="request != null and request.customerName != null and request.customerName !=''">
             and customer_name like concat('%',#{request.customerName},'%')
         </if>
-        <if test="request.customerDeptName != null and request.customerDeptName !=''">
+        <if test="request != null and request.customerDeptName != null and request.customerDeptName !=''">
             and customer_dept_name like concat('%',#{request.customerDeptName},'%')
         </if>
-        <if test="request.createUserName != null and request.createUserName !=''">
+        <if test="request != null and request.createUserName != null and request.createUserName !=''">
             and create_user_name like concat('%',#{request.createUserName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSealUseNoteMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSealUseNoteMapper.xml
index ab37bc1..b02bb33 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSealUseNoteMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSealUseNoteMapper.xml
@@ -29,32 +29,32 @@
     </sql>
 
     <select id="selectBatchForApprovalList" resultMap="BaseResultMap">
-        SELECT *
+        SELECT brsun.*, brsi.seal_name, brsi.seal_type, brsi.approver_name
         FROM biz_resource_seal_use_note brsun
         JOIN biz_resource_seal_info brsi ON brsun.seal_id = brsi.id
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and brsun.approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and brsun.create_user_id = #{request.createUserId}
         </if>
-        <if test="request.sealName != null and request.sealName !=''">
+        <if test="request != null and request.sealName != null and request.sealName !=''">
             and brsi.seal_name like concat('%',#{request.sealName},'%')
         </if>
-        <if test="request.sealType != null and request.sealType !=''">
+        <if test="request != null and request.sealType != null and request.sealType !=''">
             and brsi.seal_type = #{request.sealType}
         </if>
-        <if test="request.applyDeptName != null and request.applyDeptName !=''">
+        <if test="request != null and request.applyDeptName != null and request.applyDeptName !=''">
             and brsun.apply_dept_name like concat('%',#{request.applyDeptName},'%')
         </if>
-        <if test="request.applyUserName != null and request.applyUserName !=''">
+        <if test="request != null and request.applyUserName != null and request.applyUserName !=''">
             and brsun.apply_user_name like concat('%',#{request.applyUserName},'%')
         </if>
-        <if test="request.applyTimeStart != null and request.applyTimeStart !=''">
+        <if test="request != null and request.applyTimeStart != null and request.applyTimeStart !=''">
             and brsun.apply_time &gt;= #{request.applyTimeStart}
         </if>
-        <if test="request.applyTimeEnd != null and request.applyTimeEnd !=''">
+        <if test="request != null and request.applyTimeEnd != null and request.applyTimeEnd !=''">
             and brsun.apply_time &lt;= #{request.applyTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml
index 119bf7d..4f8392a 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml
@@ -31,6 +31,12 @@
         <if test="request.deptName != null and request.deptName !=''">
             and brsi.dept_name like concat('%',#{request.deptName},'%')
         </if>
+        <if test="request.ids != null">
+            and brsv.id in
+            <foreach collection="request.ids" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
         ORDER BY brsv.grant_date DESC
     </select>
 
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSupplierInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSupplierInfoMapper.xml
index fe8d399..e8ce7ef 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSupplierInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSupplierInfoMapper.xml
@@ -48,28 +48,28 @@
         SELECT *
         FROM biz_resource_supplier_info
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.supplierNo != null and request.supplierNo !=''">
+        <if test="request != null and request.supplierNo != null and request.supplierNo !=''">
             and supplier_no like concat('%',#{request.supplierNo},'%')
         </if>
-        <if test="request.supplierName != null and request.supplierName !=''">
+        <if test="request != null and request.supplierName != null and request.supplierName !=''">
             and supplier_name like concat('%',#{request.supplierName},'%')
         </if>
-        <if test="request.director != null and request.director !=''">
+        <if test="request != null and request.director != null and request.director !=''">
             and director like concat('%',#{request.director},'%')
         </if>
-        <if test="request.supplierType != null and request.supplierType !=''">
+        <if test="request != null and request.supplierType != null and request.supplierType !=''">
             and supplier_type = #{request.supplierType}
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/EnvLocationInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/EnvLocationInfoMapper.xml
new file mode 100644
index 0000000..68bcf10
--- /dev/null
+++ b/casic-metering-dao/src/main/resources/mapper/resource/EnvLocationInfoMapper.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.mapper.resource.EnvLocationInfoMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.resource.EnvLocationInfo">
+        <id column="id" property="id" />
+        <result column="location_no" property="locationNo" />
+        <result column="location_name" property="locationName" />
+        <result column="location_position" property="locationPosition" />
+        <result column="create_user_id" property="createUserId" />
+        <result column="create_user" property="createUser" />
+        <result column="create_time" property="createTime" />
+        <result column="update_time" property="updateTime" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, location_no, location_name, location_position, create_user_id, create_user, create_time, update_time
+    </sql>
+
+    <select id="selectLocationListPage" resultType="com.casic.missiles.dto.resource.environment.LocationListResponse">
+        SELECT *
+        FROM env_location_info
+        WHERE 1=1
+        <if test="request.locationNo != null and request.locationNo !=''">
+            AND location_no LIKE concat('%',#{request.locationNo},'%')
+        </if>
+        <if test="request.locationName != null and request.locationName !=''">
+            AND location_name LIKE concat('%',#{request.locationName},'%')
+        </if>
+        ORDER BY create_time DESC
+    </select>
+
+</mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml
index b28c18f..8854047 100644
--- a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml
@@ -11,7 +11,6 @@
         <result column="sign_desc" property="signDesc" />
         <result column="sign_director" property="signDirector" />
         <result column="sign_user_id" property="signUserId" />
-        <result column="sign_type" property="signType" />
         <result column="minio_file_name" property="minioFileName" />
         <result column="create_time" property="createTime" />
         <result column="update_time" property="updateTime" />
@@ -28,7 +27,6 @@
         <result column="sign_name" property="signName" />
         <result column="sign_desc" property="signDesc" />
         <result column="sign_director" property="signDirector" />
-        <result column="sign_type" property="signType" />
         <result column="sign_user_id" property="signUserId" />
         <result column="minio_file_name" property="minioFileName" />
         <result column="create_time" property="createTime" />
@@ -62,4 +60,58 @@
         JOIN system_sign_user_relation ssur ON ss.id = ssur.sign_id
         WHERE ssur.user_id = #{userId}
     </select>
+
+    <select id="selectSignListPage" resultMap="BaseResultMap">
+        SELECT ss.*, sd.SIMPLE_NAME AS deptName
+        FROM system_sign ss
+        LEFT JOIN sys_user su ON su.id = ss.sign_user_id
+        LEFT JOIN sys_dept sd ON sd.id = su.dept_id
+        WHERE 1=1
+        <if test="request.signNo != null and request.signNo !=''">
+            AND ss.sign_no LIKE concat('%',#{request.signNo},'%')
+        </if>
+        <if test="request.signName != null and request.signName !=''">
+            AND ss.sign_name LIKE concat('%',#{request.signName},'%')
+        </if>
+        <if test="request.signDirector != null and request.signDirector !=''">
+            AND ss.sign_director LIKE concat('%',#{request.signDirector},'%')
+        </if>
+        <if test="request.signUserId != null and request.signUserId !=''">
+            AND ss.sign_user_id = #{request.signUserId}
+        </if>
+        <if test="request.createStartTime != null and request.createStartTime !=''">
+            AND DATE_FORMAT(ss.create_time,'%Y-%m-%d') &gt;= DATE_FORMAT(#{request.createStartTime},'%Y-%m-%d')
+        </if>
+        <if test="request.createEndTime != null and request.createEndTime !=''">
+            AND DATE_FORMAT(ss.create_time,'%Y-%m-%d')  &lt;= DATE_FORMAT(#{request.createEndTime},'%Y-%m-%d')
+        </if>
+        ORDER BY ss.create_time DESC
+    </select>
+
+    <select id="selectSignList" resultMap="BaseResultMap">
+        SELECT ss.*, sd.SIMPLE_NAME AS deptName
+        FROM system_sign ss
+        LEFT JOIN sys_user su ON su.id = ss.sign_user_id
+        LEFT JOIN sys_dept sd ON sd.id = su.dept_id
+        WHERE 1=1
+        <if test="request.signNo != null and request.signNo !=''">
+            AND ss.sign_no LIKE concat('%',#{request.signNo},'%')
+        </if>
+        <if test="request.signName != null and request.signName !=''">
+            AND ss.sign_name LIKE concat('%',#{request.signName},'%')
+        </if>
+        <if test="request.signDirector != null and request.signDirector !=''">
+            AND ss.sign_director LIKE concat('%',#{request.signDirector},'%')
+        </if>
+        <if test="request.signUserId != null and request.signUserId !=''">
+            AND ss.sign_user_id = #{request.signUserId}
+        </if>
+        <if test="request.createStartTime != null and request.createStartTime !=''">
+            AND DATE_FORMAT(ss.create_time,'%Y-%m-%d') &gt;= DATE_FORMAT(#{request.createStartTime},'%Y-%m-%d')
+        </if>
+        <if test="request.createEndTime != null and request.createEndTime !=''">
+            AND DATE_FORMAT(ss.create_time,'%Y-%m-%d')  &lt;= DATE_FORMAT(#{request.createEndTime},'%Y-%m-%d')
+        </if>
+        ORDER BY ss.create_time DESC
+    </select>
 </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 515050a..60f530b 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
@@ -47,8 +47,8 @@
     String STORAGE_LOCATION = "bizStorageLocation";
     //计量专业
     String MEASURE_MAJOR = "bizMeasureMajor";
-    //管理状态
-    String MANAGER_STATE = "bizManagerState";
+    //标准装置管理状态
+    String STANDARD_MANAGER_STATE = "bizStandardManagerState";
 
     /**
      * 资源管理 字典code
@@ -95,8 +95,6 @@
     String MEASURE_STATUS = "measureStatus";
     //检定方式
     String MEASURE_TYPE = "measureType";
-    //标识打印标志类型
-    String IDENTIFY_PRINT_TYPE = "bizBusinessIdentify";
     //变更类型
     String REPORT_CHANGE_TYPE = "bizCertChangeType";
     //规模类型
@@ -111,19 +109,24 @@
     String MEASURE_CATEGORY = "measureCategory";
     //检定结果
     String MEASURE_RESULT = "measureResult";
+    //分包原因
+    String OUTSOURCE_REASON = "outsourceReason";
+
+    /**
+     * 系统管理
+     */
+    String TEMPLATE_TYPE = "templateType";
+
 
     /**
      * 标准装置 字典code
      */
     //类别
     String STANDARD_CATEGORY = "standardCategory";
-    //管理状态
-    String STANDARD_MANAGER_STATE = "standardManagerState";
     //标准等级
     String STANDARD_LEVEL = "standardLevel";
     //传递范围
     String STANDARD_TRANSMIT_RANGE = "transmitRange";
-
     //资本来源
     String CAPITAL_SOURCE = "capitalSource";
     //标准装置-申请类型
@@ -148,8 +151,6 @@
     String CERTIFICATE_CLASS = "certificationClass";
     //证书管理-检校专业
     String CALIBRATION_MAJOR = "calibrationMajor";
-    //分包原因
-    String OUTSOURCE_REASON = "outsourceReason";
 
     /**
      * 工作台
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/BaseApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/BaseApprovalListRequest.java
index 73c12c1..80d7424 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/BaseApprovalListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/BaseApprovalListRequest.java
@@ -6,6 +6,7 @@
 
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotEmpty;
+import java.util.List;
 
 /**
  * @Description:
@@ -19,14 +20,14 @@
      * 表单id
      */
     @NotBlank(message = "表单id不能为空")
-    @ApiModelProperty(value = "表单id（流程定义对应的表单id，等价于业务id）", dataType = "String")
+    @ApiModelProperty(value = "表单id（流程定义对应的表单id，等价于业务id），导出接口不用传", dataType = "String")
     private String formId;
 
     /**
      * 审批状态类型，对应ApprovalStatusEnum
      */
     @NotEmpty(message = "审批状态类型不能为空")
-    @ApiModelProperty(value = "审批状态类型code", dataType = "String")
+    @ApiModelProperty(value = "审批状态类型code，导出接口不用传", dataType = "String")
     private String approvalStatus;
 
     @ApiModelProperty(hidden = true)
@@ -34,4 +35,7 @@
 
     @ApiModelProperty(hidden = true)
     private Long createUserId;
+
+    @ApiModelProperty(value = "导出ids", dataType = "List")
+    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificatePrintApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificatePrintApprovalListRequest.java
index b93d1c9..3cc2f4e 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificatePrintApprovalListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificatePrintApprovalListRequest.java
@@ -5,8 +5,6 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import java.util.List;
-
 /**
  * @Description:
  * @Author: wangpeng
@@ -38,7 +36,4 @@
 
     @ApiModelProperty(value = "创建结束时间", dataType = "String")
     private String createTimeEnd;
-
-    @ApiModelProperty(value = "导出ids", dataType = "List")
-    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportApprovalListRequest.java
index 4f7a038..c115847 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportApprovalListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportApprovalListRequest.java
@@ -5,8 +5,6 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import java.util.List;
-
 /**
  * @Description:
  * @Author: wangpeng
@@ -15,6 +13,8 @@
 @ApiModel
 @Data
 public class CertificateReportApprovalListRequest extends BaseApprovalListRequest {
+    @ApiModelProperty(value = "委托方id", dataType = "String")
+    private Long customerId;
 
     @ApiModelProperty(value = "证书报告编号", dataType = "String")
     private String certificateReportNo;
@@ -37,6 +37,4 @@
     @ApiModelProperty(value = "检校结束时间", dataType = "String")
     private String calibrationTimeEnd;
 
-    @ApiModelProperty(value = "导出ids", dataType = "List")
-    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/identify/IdentifyListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/identify/IdentifyListRequest.java
index 1b87ae6..f019203 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/identify/IdentifyListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/identify/IdentifyListRequest.java
@@ -4,6 +4,8 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * @Description:
  * @Author: wangpeng
@@ -26,4 +28,7 @@
 
     @ApiModelProperty(value = "打印结束时间", dataType = "String")
     private String createTimeEnd;
+
+    @ApiModelProperty(value = "导出ids", dataType = "List")
+    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListRequest.java
index 1264883..62415fb 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListRequest.java
@@ -7,6 +7,7 @@
 import lombok.Data;
 
 import javax.validation.constraints.NotBlank;
+import java.util.List;
 
 @Data
 @ApiModel
@@ -37,4 +38,6 @@
     @ApiModelProperty(value = "是否加急（1是0否null全部）", dataType = "Integer")
     private String isUrgent;
 
+    @ApiModelProperty(value = "导出ids", dataType = "List")
+    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListRequest.java
index 5201d7b..499760a 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListRequest.java
@@ -17,6 +17,9 @@
     @ApiModelProperty(value = "任务单编号", dataType = "String")
     private String orderNo;
 
+    @ApiModelProperty(value = "委托方id", dataType = "Long")
+    private Long customerId;
+
     @ApiModelProperty(value = "委托方名称", dataType = "String")
     private String customerName;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OrderSampleDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OrderSampleDTO.java
new file mode 100644
index 0000000..796edc0
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OrderSampleDTO.java
@@ -0,0 +1,19 @@
+package com.casic.missiles.dto.business.outsource;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/8/24 11:38
+ */
+@ApiModel
+@Data
+public class OrderSampleDTO {
+    @ApiModelProperty(value = "任务单id", dataType = "Long")
+    private Long orderId;
+    @ApiModelProperty(value = "受检设备id", dataType = "Long")
+    private Long sampleId;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceAssessApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceAssessApprovalListRequest.java
new file mode 100644
index 0000000..9a930c3
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceAssessApprovalListRequest.java
@@ -0,0 +1,30 @@
+package com.casic.missiles.dto.business.outsource;
+
+import com.casic.missiles.dto.BaseApprovalListRequest;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/8/24 11:01
+ */
+@ApiModel
+@Data
+public class OutsourceAssessApprovalListRequest extends BaseApprovalListRequest {
+    @ApiModelProperty(value = "评审表编号", dataType = "String")
+    private String projectNo;
+
+    @ApiModelProperty(value = "分包机构名称", dataType = "String")
+    private String outsourcerName;
+
+    @ApiModelProperty(value = "申请人", dataType = "String")
+    private String applicantName;
+
+    @ApiModelProperty(value = "申请时间开始", dataType = "String")
+    private String applicantTimeStart;
+
+    @ApiModelProperty(value = "申请时间结束", dataType = "String")
+    private String applicantTimeEnd;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceAssessSaveResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceAssessSaveResponse.java
new file mode 100644
index 0000000..8bf9aad
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceAssessSaveResponse.java
@@ -0,0 +1,20 @@
+package com.casic.missiles.dto.business.outsource;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/8/14 16:17
+ */
+@ApiModel
+@Data
+public class OutsourceAssessSaveResponse {
+    @ApiModelProperty(value = "主键id", dataType = "Long")
+    private Long id;
+
+    @ApiModelProperty(value = "编号", dataType = "String")
+    private String projectNo;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProtocolApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProtocolApprovalListRequest.java
new file mode 100644
index 0000000..0f32331
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProtocolApprovalListRequest.java
@@ -0,0 +1,30 @@
+package com.casic.missiles.dto.business.outsource;
+
+import com.casic.missiles.dto.BaseApprovalListRequest;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/8/24 15:01
+ */
+@ApiModel
+@Data
+public class OutsourceProtocolApprovalListRequest extends BaseApprovalListRequest {
+    @ApiModelProperty(value = "协议书编号", dataType = "String")
+    private String protocolNo;
+
+    @ApiModelProperty(value = "分包方名称", dataType = "String")
+    private String outsourcerName;
+
+    @ApiModelProperty(value = "申请人", dataType = "String")
+    private String applicantName;
+
+    @ApiModelProperty(value = "申请时间开始", dataType = "String")
+    private String applicantTimeStart;
+
+    @ApiModelProperty(value = "申请时间结束", dataType = "String")
+    private String applicantTimeEnd;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProtocolSaveResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProtocolSaveResponse.java
new file mode 100644
index 0000000..e324967
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProtocolSaveResponse.java
@@ -0,0 +1,20 @@
+package com.casic.missiles.dto.business.outsource;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/8/14 16:17
+ */
+@ApiModel
+@Data
+public class OutsourceProtocolSaveResponse {
+    @ApiModelProperty(value = "主键id", dataType = "Long")
+    private Long id;
+
+    @ApiModelProperty(value = "编号", dataType = "String")
+    private String protocolNo;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveApprovalListRequest.java
index f29f4e4..7047c28 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveApprovalListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveApprovalListRequest.java
@@ -5,8 +5,6 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import java.util.List;
-
 /**
  * @Description: 现场检测审批列表请求实体
  * @Author: wangpeng
@@ -30,7 +28,4 @@
     @ApiModelProperty(value = "申请时间结束", dataType = "String")
     private String applyTimeEnd;
 
-    @ApiModelProperty(value = "导出ids", dataType = "List")
-    private List<Long> ids;
-
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveDetailResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveDetailResponse.java
index 1f28752..394c934 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveDetailResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveDetailResponse.java
@@ -12,6 +12,18 @@
     @ApiModelProperty(value = "id，更新/删除使用参数", dataType = "Long")
     private Long id;
 
+    @ApiModelProperty(value = "实验室代码(字典code)", dataType = "String")
+    private String labCode;
+
+    @ApiModelProperty(value = "实验室代码(字典value)", dataType = "String")
+    private String labCodeName;
+
+    @ApiModelProperty(value = "组别代码(字典code)", dataType = "String")
+    private String groupCode;
+
+    @ApiModelProperty(value = "组别代码(字典value)", dataType = "String")
+    private String groupCodeName;
+
     @ApiModelProperty(value = "审批编号", dataType = "String")
     private String siteExecutiveNo;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/environment/LocationListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/environment/LocationListRequest.java
new file mode 100644
index 0000000..13d03c3
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/environment/LocationListRequest.java
@@ -0,0 +1,20 @@
+package com.casic.missiles.dto.resource.environment;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/6/8 13:56
+ */
+@ApiModel
+@Data
+public class LocationListRequest {
+    @ApiModelProperty(value = "地点编号", dataType = "String")
+    private String locationNo;
+
+    @ApiModelProperty(value = "地点名称", dataType = "String")
+    private String locationName;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/environment/LocationListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/environment/LocationListResponse.java
new file mode 100644
index 0000000..4c531af
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/environment/LocationListResponse.java
@@ -0,0 +1,78 @@
+package com.casic.missiles.dto.resource.environment;
+
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
+import com.baomidou.mybatisplus.annotation.TableField;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description: 地点列表响应实体
+ * @Author: wangpeng
+ * @Date: 2023/6/8 13:53
+ */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
+@ApiModel
+@Data
+public class LocationListResponse {
+    @ApiModelProperty(value = "主键id", dataType = "Long")
+    private Long id;
+
+    /**
+     * 地点编号
+     */
+    @ExcelProperty("地点编号")
+    @ApiModelProperty(value = "地点编号", dataType = "String")
+    private String locationNo;
+
+    /**
+     * 地点名称
+     */
+    @ExcelProperty("地点名称")
+    @ApiModelProperty(value = "地点名称", dataType = "String")
+    private String locationName;
+
+    /**
+     * 地点位置
+     */
+    @ExcelProperty("地点位置")
+    @ApiModelProperty(value = "地点位置", dataType = "String")
+    private String locationPosition;
+
+    /**
+     * 创建人id
+     */
+    @ApiModelProperty(value = "创建人id", dataType = "Long")
+    private Long createUserId;
+
+    /**
+     * 创建人
+     */
+    @ExcelProperty("创建人")
+    @ApiModelProperty(value = "创建人", dataType = "String")
+    @TableField("create_user")
+    private String createUser;
+
+    /**
+     * 创建时间
+     */
+    @ExcelProperty("创建时间")
+    @ApiModelProperty(value = "创建时间", dataType = "String")
+    private String createTime;
+
+    /**
+     * 更新时间
+     */
+    @ApiModelProperty(value = "更新时间", dataType = "String")
+    private String updateTime;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertRequest.java
index 9a7f6c6..c827915 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertRequest.java
@@ -4,6 +4,8 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * @Description:
  * @Author: wangpeng
@@ -16,4 +18,7 @@
     private String name;
     @ApiModelProperty(value = "部门名", dataType = "String")
     private String deptName;
+
+    @ApiModelProperty(value = "导出ids", dataType = "List")
+    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertResponse.java
index f78b159..8f2f79e 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertResponse.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.dto.resource.staff;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.casic.missiles.annotation.DictCodeField;
 import com.casic.missiles.constants.MeterDictCode;
 import io.swagger.annotations.ApiModel;
@@ -13,12 +20,18 @@
  * @Author: wangpeng
  * @Date: 2023/7/27 15:13
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @ApiModel
 @Data
 public class StaffCertResponse {
     /**
      * 人员编号
      */
+    @ExcelProperty(value = "人员编号",order = 0)
     @NotEmpty(message = "人员编号不能为空")
     @ApiModelProperty(value = "人员编号", dataType = "String")
     private String staffNo;
@@ -26,6 +39,7 @@
     /**
      * 姓名
      */
+    @ExcelProperty(value = "姓名",order = 1)
     @ApiModelProperty(value = "姓名", dataType = "String")
     private String staffName;
 
@@ -54,6 +68,7 @@
     /**
      * 部门名字
      */
+    @ExcelProperty(value = "工作部门",order = 2)
     @ApiModelProperty(value = "部门名字", dataType = "String")
     private String deptName;
 
@@ -66,6 +81,7 @@
     /**
      * 计量专业
      */
+    @ExcelProperty(value = "计量专业",order = 3)
     @ApiModelProperty(value = "计量专业", dataType = "String")
     private String major;
 
@@ -110,6 +126,7 @@
     /**
      * 证书号
      */
+    @ExcelProperty(value = "证号",order = 4)
     @ApiModelProperty(value = "证书号", dataType = "String")
     private String certNo;
 
@@ -122,12 +139,14 @@
     /**
      * 有效日期
      */
+    @ExcelProperty(value = "证书有效期",order = 6)
     @ApiModelProperty(value = "有效日期", dataType = "String")
     private String effectiveDate;
 
     /**
      * 发放日期
      */
+    @ExcelProperty(value = "发证日期",order = 5)
     @ApiModelProperty(value = "发放日期", dataType = "String")
     private String grantDate;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffListRequest.java
index 7c4afb3..0a1194a 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffListRequest.java
@@ -4,6 +4,8 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * @Description:
  * @Author: wangpeng
@@ -18,4 +20,7 @@
     private String deptName;
     @ApiModelProperty(value = "部门id", dataType = "Long")
     private Long deptId;
+
+    @ApiModelProperty(value = "导出ids", dataType = "List")
+    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/TrainListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/TrainListRequest.java
index f68597b..6321f8b 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/TrainListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/TrainListRequest.java
@@ -14,6 +14,8 @@
 public class TrainListRequest {
     @ApiModelProperty(value = "训练登记表编号", dataType = "String")
     private String trainNo;
+    @ApiModelProperty(value = "值班领导", dataType = "String")
+    private String dutyLeader;
     @ApiModelProperty(value = "创建开始时间", dataType = "String")
     private String createTimeStart;
     @ApiModelProperty(value = "创建结束时间", dataType = "String")
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/SignAddRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/SignAddRequest.java
index 117be34..d71055c 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/SignAddRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/SignAddRequest.java
@@ -43,13 +43,6 @@
     private Long signUserId;
 
     /**
-     * 签章或签名-字典code
-     */
-    @NotBlank(message = "类型不能为空")
-    @ApiModelProperty(value = "签名/签章-字典code", dataType = "String", required = true)
-    private String signType;
-
-    /**
      * minio存储文件名
      */
     @ApiModelProperty(value = "上传文件返回名称", dataType = "String")
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateAddRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateAddRequest.java
index aff1265..6316648 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateAddRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateAddRequest.java
@@ -17,30 +17,28 @@
 @Data
 public class TemplateAddRequest extends BaseSystemRequest {
     /**
-     * 原始记录模板/证书报告模板名称
+     * 模板名称
      */
     @ApiModelProperty(value = "名称", dataType = "String", required = true)
     @NotBlank(message = "名称不能为空")
     private String templateName;
 
     /**
-     * 原始记录模板/证书报告模板描述
+     * 模板描述
      */
     @ApiModelProperty(value = "描述", dataType = "String")
     private String templateDesc;
 
     /**
-     * 原始记录模板/证书报告模板创建人
+     * 创建人
      */
     @ApiModelProperty(value = "创建人", dataType = "String", required = true)
     @NotBlank(message = "创建人不能为空")
     private String templateCreator;
 
-    /**
-     * 原始记录模板/证书报告模板-字典code
-     */
-    @NotBlank(message = "类型不能为空")
-    @ApiModelProperty(value = "原始记录模板/证书报告模板-字典code", dataType = "String", required = true)
+
+    @NotBlank(message = "模板类型不能为空")
+    @ApiModelProperty(value = "模板类型(字典code)", dataType = "String", required = true)
     private String templateType;
 
     /**
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateListRequest.java
index eec5a1e..6d17bbe 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateListRequest.java
@@ -1,11 +1,12 @@
 package com.casic.missiles.dto.system;
 
+import com.casic.missiles.annotation.DictCodeField;
+import com.casic.missiles.constants.MeterDictCode;
 import com.casic.missiles.dto.BaseSystemRequest;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import javax.validation.constraints.NotBlank;
 import java.util.List;
 
 /**
@@ -19,8 +20,8 @@
     /**
      * 类型
      */
-//    @ApiModelProperty(value = "类型-字典code", dataType = "String", required = true)
-    @NotBlank(message = "类型不能为空")
+    @DictCodeField(message = "模板类型不合法", cacheName = MeterDictCode.TEMPLATE_TYPE)
+    @ApiModelProperty(value = "模板类型(字典code)", dataType = "String")
     private String templateType;
 
     /**
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificateChangeApply.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificateChangeApply.java
index 9216308..36923fd 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificateChangeApply.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificateChangeApply.java
@@ -1,11 +1,19 @@
 package com.casic.missiles.model.business;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 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 com.casic.missiles.dto.BaseRequest;
+import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -20,6 +28,12 @@
  * @author wangpeng
  * @since 2023-08-15
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
+@ApiModel
 @Data
 @TableName("biz_business_certificate_change_apply")
 public class BizBusinessCertificateChangeApply extends BaseRequest implements Serializable {
@@ -33,6 +47,7 @@
     /**
      * 申请单编号
      */
+    @ExcelProperty(value = "申请单编号", order = 1)
     @ApiModelProperty(value = "申请单编号", dataType = "String")
     @TableField("change_apply_no")
     private String changeApplyNo;
@@ -40,6 +55,7 @@
     /**
      * 申请单名字
      */
+    @ExcelProperty(value = "申请单名称", order = 2)
     @ApiModelProperty(value = "申请单名字", dataType = "String")
     @TableField("change_apply_name")
     private String changeApplyName;
@@ -54,6 +70,7 @@
     /**
      * 更换证书编号
      */
+    @ExcelProperty(value = "更换证书编号", order = 3)
     @ApiModelProperty(value = "更换证书编号", dataType = "String")
     @TableField("change_report_no")
     private String changeReportNo;
@@ -61,7 +78,8 @@
     /**
      * 更换证书名字
      */
-    @ApiModelProperty(value = "更换证书名字", dataType = "String")
+    @ExcelProperty(value = "更换证书/报告名称", order = 4)
+    @ApiModelProperty(value = "更换证书/报告名称", dataType = "String")
     @TableField("change_report_name")
     private String changeReportName;
 
@@ -73,6 +91,7 @@
     @TableField("change_type")
     private String changeType;
 
+    @ExcelProperty(value = "变更类型", order = 5)
     @ApiModelProperty(value = "变更类型(字典value)", dataType = "String")
     @TableField(exist = false)
     private String changeTypeName;
@@ -142,13 +161,15 @@
     /**
      * 创建用户名字
      */
-    @ApiModelProperty(value = "创建用户名字", dataType = "String")
+    @ExcelProperty(value = "创建人", order = 6)
+    @ApiModelProperty(value = "创建人名字", dataType = "String")
     @TableField("create_user_name")
     private String createUserName;
 
     /**
      * 创建时间
      */
+    @ExcelProperty(value = "创建时间", order = 7)
     @ApiModelProperty(value = "创建时间", dataType = "String")
     @TableField("create_time")
     private String createTime;

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java
index bb0c50f..13a699b 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java
@@ -12,6 +12,7 @@
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.IGeneralApprovalService;
+import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
@@ -19,6 +20,7 @@
 import org.springframework.web.bind.annotation.RequestBody;
 
 import javax.validation.Valid;
+import java.util.List;
 import java.util.Objects;
 
 /**
@@ -117,4 +119,17 @@
         }
         return baseApprovalService.failUpdate(request);
     }
+
+    public List<O> exportList(@RequestBody @Valid R request) throws Exception {
+        List<O> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = baseApprovalService.listExportByIds(request.getIds());
+        } else {
+            list = baseApprovalService.listExport(request);
+        }
+        for (O record : list) {
+            DictCodeUtils.convertDictCodeToName(record);
+        }
+        return list;
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java
index 8a90961..d775831 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java
@@ -5,6 +5,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.business.certificate.CertificateChangeApplyApprovalListRequest;
 import com.casic.missiles.dto.business.certificate.CertificateChangeApplySaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessCertificateChangeApply;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
@@ -20,6 +21,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -48,4 +50,12 @@
         }
         return changeApplyService.saveChangeApply(request);
     }
+
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody CertificateChangeApplyApprovalListRequest request) throws Exception {
+        List<BizBusinessCertificateChangeApply> list = super.exportList(request);
+        super.exportExcel(BizBusinessCertificateChangeApply.class, list, ExportEnum.CERTIFICATE_CHANGE_APPLY.getSheetName());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java
index 5fc4b07..af8230e 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java
@@ -9,6 +9,7 @@
 import com.casic.missiles.dto.business.certificate.CertificatePrintApprovalListRequest;
 import com.casic.missiles.dto.business.certificate.CertificatePrintListResponse;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.enums.business.CertificatePrintStatusEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessCertificatePrintLog;
@@ -18,10 +19,16 @@
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.io.IOException;
+import java.util.List;
 import java.util.Objects;
 
 /**
@@ -98,4 +105,16 @@
         });
         return certificatePrintService.certificatePrintLog(idDTO.getId());
     }
+
+    @ApiOperation("证书打印审批导出")
+    @PostMapping("/listExport")
+    public void exportList(@RequestBody CertificatePrintApprovalListRequest request) throws IOException {
+        List<CertificatePrintListResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = certificatePrintService.listByIds(request.getIds());
+        } else {
+            list = certificatePrintService.list(request);
+        }
+        super.exportExcel(CertificatePrintListResponse.class, list, ExportEnum.CERTIFICATE_PRINT.getSheetName());
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java
index 63b06dc..6b2efd5 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java
@@ -6,6 +6,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.business.certificate.CertificateReportApprovalListRequest;
 import com.casic.missiles.dto.business.certificate.CertificateReportSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessCertificateReport;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
@@ -21,6 +22,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -50,7 +52,7 @@
         return certificateReportService.saveCertificateReport(request);
     }
 
-    @ApiOperation("证书审批详情（基本信息）")
+    @ApiOperation("详情（基本信息）")
     @PostMapping("/detail")
     public ReturnDTO<BizBusinessCertificateReport> detail(@RequestBody @Valid BaseDetailRequest request, BindingResult bindingResult) throws Exception {
         if(bindingResult.hasErrors()){
@@ -59,4 +61,11 @@
         return certificateReportService.detail(request);
     }
 
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody CertificateReportApprovalListRequest request) throws Exception {
+        List<BizBusinessCertificateReport> list = super.exportList(request);
+        super.exportExcel(BizBusinessCertificateReport.class, list, ExportEnum.CERTIFICATE_REPORT.getSheetName());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java
index 46b26bd..57c0809 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java
@@ -10,20 +10,21 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.business.identify.IdentifyListRequest;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessIdentifyInfo;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.business.IBizBusinessIdentifyInfoService;
+import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import javax.validation.Valid;
+import java.util.List;
 import java.util.Objects;
 
 /**
@@ -57,16 +58,13 @@
         return identifyInfoService.addIdentify(identifyInfo);
     }
 
-    @ApiOperation("标识打印更新")
+    @ApiOperation("标识打印更新（更新打印时间）")
     @PostMapping("/update")
-    public ReturnDTO updateIdentify(@RequestBody @Valid BizBusinessIdentifyInfo identifyInfo, BindingResult bindingResult) {
-        Assert.isFalse(Objects.isNull(identifyInfo.getId()), () -> {
+    public ReturnDTO updateIdentify(@RequestBody @Valid IdDTO idDTO) {
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        Assert.isFalse(bindingResult.hasErrors(), () -> {
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        });
-        return identifyInfoService.updateIdentify(identifyInfo);
+        return identifyInfoService.updateIdentify(idDTO.getId());
     }
 
     @ApiOperation("标识打印删除")
@@ -77,4 +75,37 @@
         });
         return identifyInfoService.deleteIdentify(idDTO.getId());
     }
+
+    @ApiOperation("标识打印导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody @Valid IdentifyListRequest request, BindingResult bindingResult) throws Exception {
+        if (bindingResult.hasErrors()) {
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        List<BizBusinessIdentifyInfo> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = identifyInfoService.listByIds(request.getIds());
+        } else {
+            list = identifyInfoService.list(request);
+        }
+        for (BizBusinessIdentifyInfo record : list) {
+            DictCodeUtils.convertDictCodeToName(record);
+        }
+        super.exportExcel(BizBusinessIdentifyInfo.class, list, ExportEnum.IDENTIFY_EXPORT.getSheetName());
+    }
+
+
+    // TODO: 2023/8/23 查询设备信息，4个底部按钮查设备（按钮的作用就是前端用来调不同接口、用来区分中间即将展示的标识），前端弹窗选设备，在确定保存时前端根据底部按钮判断传入设备类型deviceType字典code
+    // TODO: 2023/8/23 接口：查受检设备（第1个按钮），查设备台账（后3个按钮同一接口），查询之后前端根据标志类型的不同加到中间页面时进行判断（按产品给的对应表）
+    // TODO: 2023/8/23 提供二维码接口，前端在加到中间页面时调用一下
+
+    @ApiOperation("设备二维码")
+    @PostMapping("/equipment/qrCode")
+    public ReturnDTO<String> equipmentQrCode(@RequestBody @Valid IdDTO idDTO) {
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return identifyInfoService.equipmentQrCode(idDTO.getId());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java
index 707be6e..7e0453d 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java
@@ -117,7 +117,7 @@
     }
 
     @ApiOperation("任务单导出")
-    @PostMapping("/export")
+    @PostMapping("/listExport")
     public void orderExport(@RequestBody @Valid OrderListRequest request, HttpServletResponse response) {
         businessOrderService.orderExport(request, response);
     }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java
index 529a6ce..51432be 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java
@@ -1,9 +1,28 @@
 package com.casic.missiles.controller.business;
 
+import com.casic.missiles.controller.GeneralApprovalController;
+import com.casic.missiles.dto.BaseApprovalSubmitRequest;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.business.outsource.OutsourceAssessApprovalListRequest;
+import com.casic.missiles.dto.business.outsource.OutsourceAssessSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
+import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.model.business.BizBusinessOutsourceAssess;
+import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
+import com.casic.missiles.service.IGeneralApprovalService;
+import com.casic.missiles.service.business.IBizBusinessOutsourceAssessService;
 import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.BindingResult;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.validation.Valid;
+import java.util.List;
+
 /**
  * <p>
  * 计量检定业务-分包管理-测试、校准或检定工作分包评审表 前端控制器
@@ -15,6 +34,27 @@
 @Api(tags = "分包管理-测试、校准或检定工作分包评审表")
 @RestController
 @RequestMapping("/business/outsource/assess")
-public class BizBusinessOutsourceAssessController {
+public class BizBusinessOutsourceAssessController extends GeneralApprovalController<BizBusinessOutsourceAssess, BizBusinessOutsourceAssess, OutsourceAssessApprovalListRequest, BaseApprovalSubmitRequest> {
+    @Autowired
+    private IBizBusinessOutsourceAssessService outsourceAssessService;
 
+    public BizBusinessOutsourceAssessController(IGeneralApprovalService<BizBusinessOutsourceAssess, BizBusinessOutsourceAssess, OutsourceAssessApprovalListRequest, BaseApprovalSubmitRequest> baseApprovalService) {
+        super(baseApprovalService);
+    }
+
+    @ApiOperation("草稿箱-保存")
+    @PostMapping("/save")
+    public ReturnDTO<OutsourceAssessSaveResponse> saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceAssess request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        return outsourceAssessService.saveOutsourceAssess(request);
+    }
+
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception {
+        List<BizBusinessOutsourceAssess> list = super.exportList(request);
+        super.exportExcel(BizBusinessOutsourceAssess.class, list, ExportEnum.OUTSOURCE_ASSESS.getSheetName());
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java
new file mode 100644
index 0000000..9adef18
--- /dev/null
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java
@@ -0,0 +1,60 @@
+package com.casic.missiles.controller.business;
+
+import com.casic.missiles.controller.GeneralApprovalController;
+import com.casic.missiles.dto.BaseApprovalSubmitRequest;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.business.outsource.OutsourceProtocolApprovalListRequest;
+import com.casic.missiles.dto.business.outsource.OutsourceProtocolSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
+import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.model.business.BizBusinessOutsourceProtocol;
+import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
+import com.casic.missiles.service.IGeneralApprovalService;
+import com.casic.missiles.service.business.IBizBusinessOutsourceProtocolService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.BindingResult;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.validation.Valid;
+import java.util.List;
+
+/**
+ * <p>
+ * 计量检定业务-分包管理-测试、校准或检定工作分包协议书 前端控制器
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-08-24
+ */
+@Api(tags = "分包管理-测试、校准或检定工作分包协议书")
+@RestController
+@RequestMapping("/business/outsource/protocol")
+public class BizBusinessOutsourceProtocolController extends GeneralApprovalController<BizBusinessOutsourceProtocol, BizBusinessOutsourceProtocol, OutsourceProtocolApprovalListRequest, BaseApprovalSubmitRequest> {
+    @Autowired
+    private IBizBusinessOutsourceProtocolService outsourceProtocolService;
+
+    public BizBusinessOutsourceProtocolController(IGeneralApprovalService<BizBusinessOutsourceProtocol, BizBusinessOutsourceProtocol, OutsourceProtocolApprovalListRequest, BaseApprovalSubmitRequest> baseApprovalService) {
+        super(baseApprovalService);
+    }
+
+    @ApiOperation("草稿箱-保存")
+    @PostMapping("/save")
+    public ReturnDTO<OutsourceProtocolSaveResponse> saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceProtocol request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        return outsourceProtocolService.saveOutsourceProtocol(request);
+    }
+
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody OutsourceProtocolApprovalListRequest request) throws Exception {
+        List<BizBusinessOutsourceProtocol> list = super.exportList(request);
+        super.exportExcel(BizBusinessOutsourceProtocol.class, list, ExportEnum.OUTSOURCE_PROTOCOL.getSheetName());
+    }
+}
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java
index 097f645..f0f0943 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java
@@ -17,7 +17,6 @@
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.IGeneralApprovalService;
 import com.casic.missiles.service.business.IBizBusinessOutsourcerInfoService;
-import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -71,19 +70,8 @@
 
     @ApiOperation("分包方导出")
     @PostMapping("/listExport")
-    public void export(@RequestBody @Valid OutsourcerInfoApprovalListRequest request, BindingResult bindingResult) throws Exception {
-        if (bindingResult.hasErrors()) {
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        }
-        List<BizBusinessOutsourcerInfo> list;
-        if (!CollectionUtils.isEmpty(request.getIds())) {
-            list = outsourcerInfoService.listByIds(request.getIds());
-        } else {
-            list = outsourcerInfoService.list(request);
-        }
-        for (BizBusinessOutsourcerInfo record : list) {
-            DictCodeUtils.convertDictCodeToName(record);
-        }
+    public void export(@RequestBody OutsourcerInfoApprovalListRequest request) throws Exception {
+        List<BizBusinessOutsourcerInfo> list = super.exportList(request);
         super.exportExcel(BizBusinessOutsourcerInfo.class, list, ExportEnum.OUTSOURCER_EXPORT.getSheetName());
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java
index c2cbf9f..0410918 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java
@@ -17,11 +17,9 @@
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.IGeneralApprovalService;
 import com.casic.missiles.service.business.IBizBusinessSiteExecutiveInfoService;
-import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -60,7 +58,7 @@
         return siteExecutiveInfoService.saveSiteExecutiveInfo(siteExecutiveInfo);
     }
 
-    @ApiOperation("现场检测详情")
+    @ApiOperation("详情")
     @PostMapping("/detail")
     public ReturnDTO<SiteExecutiveDetailResponse> siteExecutiveDetail(@RequestBody @Valid IdDTO idDTO) throws Exception {
         Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
@@ -69,21 +67,10 @@
         return ReturnUtil.success(siteExecutiveInfoService.detail(idDTO.getId()));
     }
 
-    @ApiOperation("现场检测导出")
+    @ApiOperation("导出")
     @PostMapping("/listExport")
-    public void export(@RequestBody @Valid SiteExecutiveApprovalListRequest request, BindingResult bindingResult) throws Exception {
-        if (bindingResult.hasErrors()) {
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        }
-        List<SiteExecutiveApprovalListResponse> list;
-        if (!CollectionUtils.isEmpty(request.getIds())) {
-            list = siteExecutiveInfoService.listInfoByIds(request.getIds());
-        } else {
-            list = siteExecutiveInfoService.listInfo(request);
-        }
-        for (SiteExecutiveApprovalListResponse record : list) {
-            DictCodeUtils.convertDictCodeToName(record);
-        }
+    public void export(@RequestBody SiteExecutiveApprovalListRequest request) throws Exception {
+        List<SiteExecutiveApprovalListResponse> list = super.exportList(request);
         super.exportExcel(SiteExecutiveApprovalListResponse.class, list, ExportEnum.SITE_EXECUTIVE_EXPORT.getSheetName());
     }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
index 7e793cd..a92e209 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
@@ -55,7 +55,7 @@
 
     @ApiOperation("设备收发列表导出")
     @PostMapping("/export")
-    public void exportList(@RequestBody @Valid SampleDispatchListRequest request) throws IOException {
+    public void exportList(@RequestBody SampleDispatchListRequest request) throws IOException {
         List<SampleDispatchListResponse> list;
         if (!CollectionUtils.isEmpty(request.getIds())) {
             list = dispatchService.listByIds(request.getIds());
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java
index cdc77fc..d120fd4 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java
@@ -7,6 +7,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.business.labExecutive.*;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.business.IBusinessLabExecutiveInfoService;
@@ -14,6 +15,7 @@
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.*;
 
@@ -32,7 +34,7 @@
     @Autowired
     private IBusinessLabExecutiveInfoService labExecutiveInfoService;
 
-    @ApiOperation("实验室检测-部门检测-查询各状态列表（待检测、检测中、检测完）")
+    @ApiOperation("实验室任务-查询各状态列表（待检测、检测中、检测完）")
     @PostMapping("/deptExecutive/List")
     public ReturnDTO<PageInfoBT<SampleLabExecutiveListResponse>> queryDeptExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
@@ -43,10 +45,19 @@
         return ReturnUtil.success(super.packForBT(labExecutiveInfoService.deptLabExecutiveListPage(page, labExecutiveListRequest)));
     }
 
-    /**
-     * 实验室检测-我的检测-查询各状态列表（待检测、检测中、检测完）
-     */
-    @ApiOperation("实验室检测-我的检测-查询各状态列表（待检测、检测中、检测完）")
+    @ApiOperation("实验室任务导出")
+    @PostMapping("/deptExecutive/export")
+    public void deptExportList(@RequestBody @Valid SampleLabExecutiveListRequest request) throws Exception {
+        List<SampleLabExecutiveListResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = labExecutiveInfoService.deptLabExecutiveListByIds(request.getMeasureStatus(), request.getIds());
+        } else {
+            list = labExecutiveInfoService.deptLabExecutiveList(request);
+        }
+        super.exportExcel(SampleLabExecutiveListResponse.class, list, ExportEnum.DEPT_EXECUTIVE_TASK.getSheetName());
+    }
+
+    @ApiOperation("我的任务-查询各状态列表（待检测、检测中、检测完）")
     @PostMapping("/myExecutive/list")
     public ReturnDTO<PageInfoBT<SampleLabExecutiveListResponse>> queryMyExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
@@ -57,19 +68,25 @@
         return ReturnUtil.success(super.packForBT(labExecutiveInfoService.myLabExecutiveListPage(page, labExecutiveListRequest)));
     }
 
-    /**
-     * 实验室检测-我的检测-查询各状态样品数量（待检测、检测中、检测完）
-     */
-    @ApiOperation("实验室检测-我的检测-查询各状态样品数量（待检测、检测中、检测完）")
+    @ApiOperation("我的任务导出")
+    @PostMapping("/myExecutive/export")
+    public void exportList(@RequestBody @Valid SampleLabExecutiveListRequest request) throws Exception {
+        List<SampleLabExecutiveListResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = labExecutiveInfoService.myLabExecutiveListByIds(request.getMeasureStatus(), request.getIds());
+        } else {
+            list = labExecutiveInfoService.myLabExecutiveList(request);
+        }
+        super.exportExcel(SampleLabExecutiveListResponse.class, list, ExportEnum.MY_EXECUTIVE_TASK.getSheetName());
+    }
+
+    @ApiOperation("我的任务-查询各状态样品数量（待检测、检测中、检测完）")
     @GetMapping("/myExecutive/amount")
     public ReturnDTO<List<SampleAmountResponse>> queryMyExecutiveAmount() {
         return ReturnUtil.success(labExecutiveInfoService.myExecutiveAmount());
     }
 
-    /**
-     * 实验室检测-部门检测-分配（分配给具体人员）
-     */
-    @ApiOperation("实验室检测-部门检测-分配按钮（分配给具体人员）")
+    @ApiOperation("实验室任务-分配按钮（分配给具体人员）")
     @PostMapping("/deptExecutive/allocate")
     public ReturnDTO allocateStaff(@RequestBody @Valid SampleAllocateRequest sampleAllocateRequest, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -78,10 +95,7 @@
         return labExecutiveInfoService.allocateStaff(sampleAllocateRequest);
     }
 
-    /**
-     * 实验室检测-我的检测-检定人扫描收入（待检测->检测中）
-     */
-    @ApiOperation("实验室检测-我的检测-检定人扫描收入（待检测->检测中）")
+    @ApiOperation("我的任务-检定人扫描收入（待检测->检测中）")
     @PostMapping("/myExecutive/receive")
     public ReturnDTO sampleReceive(@RequestBody @Valid List<SampleOperateRequest> requestList, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -90,10 +104,7 @@
         return labExecutiveInfoService.sampleReceive(requestList);
     }
 
-    /**
-     * 实验室检测-负责人/检定人扫描检完（检测中->检测完）
-     */
-    @ApiOperation("实验室检测-负责人/检定人扫描检完（检测中->检测完）")
+    @ApiOperation("实验室任务-负责人/检定人扫描检完（检测中->检测完）")
     @PostMapping("/myExecutive/complete")
     public ReturnDTO sampleExecutiveComplete(@RequestBody @Valid List<SampleOperateRequest> requestList, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -102,10 +113,7 @@
         return labExecutiveInfoService.sampleExecutiveComplete(requestList);
     }
 
-    /**
-     * 实验室检测-部门检测/我的检测 编辑（只能修改应出具证书）
-     */
-    @ApiOperation("实验室检测-部门检测/我的检测 编辑（只能修改应出具证书）")
+    @ApiOperation("实验室任务/我的任务 编辑（只能修改应出具证书）")
     @PostMapping("/executive/update")
     public ReturnDTO updateExecutive(@RequestBody @Valid UpdateExecutiveRequest request, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -114,10 +122,7 @@
         return labExecutiveInfoService.updateExecutive(request);
     }
 
-    /**
-     * 实验室检测-部门检测/我的检测 详情
-     */
-    @ApiOperation("实验室检测-部门检测/我的检测 详情")
+    @ApiOperation("实验室任务/我的任务 详情")
     @PostMapping("/executive/detail")
     public ReturnDTO<ExecutiveDetailResponse> executiveDetail(@RequestBody @Valid ExecutiveDetailRequest request, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
@@ -131,7 +136,7 @@
      * 退回后会将下一个要执行的实验室检测状态更新为待分配，将后面的实验室顺序变更为连续（都进行减1）
      * 最后一个检测的实验室退回，等分发员再增加实验室或设备收发中的已收入直接手动点击完成
      */
-    @ApiOperation("实验室检测-部门检测/我的检测 退回（待检测/检测中->退回）")
+    @ApiOperation("实验室任务/我的任务 退回（待检测/检测中->退回）")
     @PostMapping("/executive/sendBack")
     public ReturnDTO executiveSendBack(@RequestBody @Valid ExecutiveSendBackRequest request, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -140,9 +145,6 @@
         return labExecutiveInfoService.sampleExecutiveSendBack(request);
     }
 
-    /**
-     * 分发员编辑实验室检测列表
-     */
     @ApiOperation("分发员编辑实验室检测列表")
     @PostMapping("/handOut/updateList")
     public ReturnDTO updateExecutiveList(@RequestBody @Valid UpdateExecutiveListRequest request, BindingResult bindingResult) {
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java
index 48a67ed..0c04f31 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java
@@ -10,6 +10,7 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.resource.customer.CustomerApprovalListRequest;
 import com.casic.missiles.dto.resource.customer.CustomerSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceCustomerInfo;
@@ -26,6 +27,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -55,6 +57,13 @@
         return customerInfoService.saveCustomerInfo(request);
     }
 
+    @ApiOperation("委托方名录导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody CustomerApprovalListRequest request) throws Exception {
+        List<BizResourceCustomerInfo> list = super.exportList(request);
+        super.exportExcel(BizResourceCustomerInfo.class, list, ExportEnum.CUSTOMER_INFO.getSheetName());
+    }
+
     @ApiOperation("委托方人员列表（分页）")
     @PostMapping("/person/listPage")
     public ReturnDTO<PageInfoBT<BizResourceCustomerStaff>> personListPage(@RequestBody IdDTO idDto) {
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
index 972ed4b..6418ea5 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
@@ -5,6 +5,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.resource.customer.SuggestFormApprovalListRequest;
 import com.casic.missiles.dto.resource.customer.SuggestFormSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceCustomerSuggestForm;
@@ -20,6 +21,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -50,4 +52,11 @@
         return suggestFormService.saveSuggestForm(request);
     }
 
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody SuggestFormApprovalListRequest request) throws Exception {
+        List<BizResourceCustomerSuggestForm> list = super.exportList(request);
+        super.exportExcel(BizResourceCustomerSuggestForm.class, list, ExportEnum.CUSTOMER_SUGGEST_FORM.getSheetName());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java
index 1934d1a..9e07eab 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java
@@ -15,12 +15,16 @@
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.resource.IEnvEnvironmentRecordConfigService;
 import com.casic.missiles.service.resource.IEnvEnvironmentRecordDataService;
+import com.casic.missiles.service.resource.IEnvLocationInfoService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
 import java.util.List;
@@ -39,6 +43,8 @@
     private IEnvEnvironmentRecordDataService environmentRecordDataService;
     @Autowired
     private IEnvEnvironmentRecordConfigService environmentRecordConfigService;
+    @Autowired
+    private IEnvLocationInfoService locationInfoService;
 
     @ApiOperation("环境记录单数据列表/详情")
     @PostMapping("/data/listPage")
@@ -95,4 +101,11 @@
         });
         return environmentRecordConfigService.deleteEnvironmentRecordConfig(idDTO.getId());
     }
+
+    @ApiOperation("地点列表")
+    @PostMapping("/location/listPage")
+    public ReturnDTO<PageInfoBT<LocationListResponse>> locationListPage(@RequestBody @Valid LocationListRequest request) {
+        Page<LocationListResponse> page = PageFactory.defaultPage();
+        return ReturnUtil.success(super.packForBT(locationInfoService.listPage(page, request)));
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java
index 82efe3f..e9561fa 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java
@@ -10,6 +10,7 @@
 import com.casic.missiles.dto.resource.seal.SealLogListRequest;
 import com.casic.missiles.dto.resource.seal.SealNoteApprovalListRequest;
 import com.casic.missiles.dto.resource.seal.SealNoteSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceSealUseLog;
@@ -27,6 +28,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -58,6 +60,13 @@
         return sealUseNoteService.saveSeal(request);
     }
 
+    @ApiOperation("印章使用登记导出（列表和导出中去掉经办人和监印人）")
+    @PostMapping("/listExport")
+    public void export(@RequestBody SealNoteApprovalListRequest request) throws Exception {
+        List<BizResourceSealUseNote> list = super.exportList(request);
+        super.exportExcel(BizResourceSealUseNote.class, list, ExportEnum.SEAL_NOTE.getSheetName());
+    }
+
     // TODO: 2023/7/28 印章使用日志：系统中使用印章时插入数据库
 
     @ApiOperation("印章使用日志列表（分页）")
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java
index 9b674fc..06b6521 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java
@@ -9,16 +9,20 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.resource.staff.StaffCertRequest;
 import com.casic.missiles.dto.resource.staff.StaffCertResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.service.resource.IBizResourceStaffInfoService;
 import com.casic.missiles.service.resource.IBizResourceStaffVerifierService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.List;
+
 /**
  * @Description:
  * @Author: wangpeng
@@ -41,9 +45,21 @@
         return ReturnUtil.success(super.packForBT(responsePage));
     }
 
+    @ApiOperation("证书逾期提醒导出")
+    @PostMapping("/listExport")
+    public void exportList(@RequestBody StaffCertRequest request) throws Exception {
+        List<StaffCertResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = staffInfoService.certListByIds(request.getIds());
+        } else {
+            list = staffInfoService.certList(request);
+        }
+        super.exportExcel(StaffCertResponse.class, list, ExportEnum.STAFF_CERTIFICATE_EXPIRE.getSheetName());
+    }
+
     @ApiOperation("证书逾期提醒")
     @PostMapping("/expirationReminder")
-    public ReturnDTO expirationReminder(@RequestBody IdDTO idDto) {
-        return verifierService.expirationReminder(idDto);
+    public ReturnDTO expirationReminder(@RequestBody IdDTO idDTO) {
+        return verifierService.expirationReminder(idDTO);
     }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java
index 3b251ad..a6e7850 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java
@@ -12,6 +12,7 @@
 import com.casic.missiles.dto.resource.staff.StaffListRequest;
 import com.casic.missiles.dto.resource.staff.TrainListRequest;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.*;
@@ -22,7 +23,10 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
 import java.util.List;
@@ -52,8 +56,19 @@
             throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
         }
         Page<BizResourceStaffInfo> page = PageFactory.defaultPage();
-        Page<BizResourceStaffInfo> responsePage = staffInfoService.listPage(page, request);
-        return ReturnUtil.success(super.packForBT(responsePage));
+        return ReturnUtil.success(super.packForBT(staffInfoService.listPage(page, request)));
+    }
+
+    @ApiOperation("人员登记导出")
+    @PostMapping("/listExport")
+    public void exportList(@RequestBody StaffListRequest request) throws Exception {
+        List<BizResourceStaffInfo> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = staffInfoService.listByIds(request.getIds());
+        } else {
+            list = staffInfoService.list(request);
+        }
+        super.exportExcel(BizResourceStaffInfo.class, list, ExportEnum.STAFF_INFO.getSheetName());
     }
 
     @ApiOperation("人员登记详情基础信息")
@@ -85,9 +100,9 @@
 
     @ApiOperation("科研教育列表（分页）")
     @PostMapping("/education/listPage")
-    public ReturnDTO<PageInfoBT<BizResourceStaffEducation>> educationListPage(@RequestBody IdDTO idDto) {
+    public ReturnDTO<PageInfoBT<BizResourceStaffEducation>> educationListPage(@RequestBody IdDTO idDTO) {
         Page<BizResourceStaffEducation> page = PageFactory.defaultPage();
-        Page<BizResourceStaffEducation> responsePage = staffInfoService.educationListPage(page, idDto);
+        Page<BizResourceStaffEducation> responsePage = staffInfoService.educationListPage(page, idDTO);
         return ReturnUtil.success(super.packForBT(responsePage));
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java
index af6aa86..d85d84a 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java
@@ -9,6 +9,7 @@
 import com.casic.missiles.dto.resource.outsideService.SupplierApprovalListRequest;
 import com.casic.missiles.dto.resource.outsideService.SupplierSaveResponse;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceSupplierAbility;
@@ -67,6 +68,13 @@
         return ReturnUtil.success(supplierInfoService.detail(idDTO.getId()));
     }
 
+    @ApiOperation("合格供方导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody SupplierApprovalListRequest request) throws Exception {
+        List<BizResourceSupplierInfo> list = super.exportList(request);
+        super.exportExcel(BizResourceSupplierInfo.class, list, ExportEnum.SUPPLIER_INFO.getSheetName());
+    }
+
     @ApiOperation("供方人员列表（分页）")
     @PostMapping("/person/listPage")
     public ReturnDTO<PageInfoBT<BizResourceSupplierPerson>> personListPage(@RequestBody IdDTO idDTO) {
diff --git a/casic-metering-api/src/main/resources/config/application.yml b/casic-metering-api/src/main/resources/config/application.yml
index 350db5f..ecff521 100644
--- a/casic-metering-api/src/main/resources/config/application.yml
+++ b/casic-metering-api/src/main/resources/config/application.yml
@@ -126,7 +126,7 @@
     #作者
     author: wangpeng
     #待生成对象表名
-    table-name: biz_equipment_technical_target_approval,biz_equipment_attachment_approval,biz_equipment_checkpoint_approval
+    table-name: biz_business_outsource_protocol
 
 reminder:
   #节点--common模块config包 ReminderNodeConfig配置
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
index 4a19e4e..d47d552 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
@@ -53,6 +53,7 @@
     SUGGEST_FORM_SAVE_FAILED(2509, "委托方意见登记表保存至草稿箱失败"),
     EXAMINE_FORM_SAVE_FAILED(2510, "要求、委托书及合同评审表保存至草稿箱失败"),
     CUSTOMER_EXIST_SAVE_FAILED(2511, "该委托方已存在，请重新选择"),
+    DUPLICATE_LOCATION_NO(2512, "地点编号已存在"),
 
     /**
      * 计量检定业务模块
@@ -68,6 +69,8 @@
     COMPLETE_SAMPLE_NOT_EXIST(2609, "检测中不存在扫描收入的样品"),
     CANNOT_CHANGE_MEASURE_INFO(2610, "无法更改非当前登录用户的检测信息"),
     NON_EXIST_ORDER_OR_SAMPLE(2611, "不存在该委托单或该委托单下的样品"),
+    OUTSOURCE_ACCESS_SAVE_FAILED(2612, "测试、校准或检定工作分包评审表保存至草稿箱失败"),
+    OUTSOURCE_PROTOCOL_SAVE_FAILED(2613, "测试、校准或检定工作分包协议书保存至草稿箱失败"),
 
     /**
      * 历史遗留备用
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
index 5089ad1..81a406b 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
@@ -10,54 +10,38 @@
     /**
      * 资源管理
      */
-    ENVIRONMENT_DATA_EXPORT("environmentData", "environmentData", "环境记录单数据"),
+    ENVIRONMENT_DATA_EXPORT("environmentData", "环境记录单数据", "环境记录单数据"),
+    STAFF_INFO("staffInfo", "人员登记", "人员登记"),
+    STAFF_CERTIFICATE_EXPIRE("certificateExpire", "证书逾期提醒", "证书逾期提醒"),
+    SUPPLIER_INFO("supplierInfo", "合格供方名录", "合格供方名录"),
+    CUSTOMER_INFO("customerInfo", "委托方名录", "委托方名录"),
+    CUSTOMER_SUGGEST_FORM("customerSuggestForm", "委托方意见登记表", "委托方意见登记表"),
+    SEAL_NOTE("sealNote", "印章使用登记", "印章使用登记"),
 
-    FILE_EXPORT("meterFileData", "meterFileData", "计量文件信息"),
-    TRAIN_PLAN_EXPORT("trainPlanData", "trainPlanData", "培训计划"),
-    TRAIN_LOG_EXPORT("trainLogData", "trainLogData", "培训记录"),
-    METER_ORGANIZE_EXPORT("meterOrganizeData", "meterOrganizeData", "计量组织"),
-    TRACE_SUPPLIER_EXPORT("traceSupplierData", "traceSupplierData", "溯源供方"),
-    SIGN_EXPORT("signData", "signData", "签名/签章"),
-    TEMPLATE_EXPORT("templateData", "templateData", "原始记录模板/证书报告模板"),
-    FIXED_ASSETS("meterFixedAssets", "meterFixedAssets", "固定资产"),
-    METER_EQUIPMENT("meterEquipment", "meterEquipment", "测量设备"),
-    CALIBRATION_TEST_EQUIPMENT("calibrationTestEquipment", "calibrationTestEquipment", "校准检定设备"),
-    MEASURE_ACCOUNT("measureAccount", "measureAccount", "测量工装"),
-    STANDARD_SUPPORT_EQUIPMENT("standardSupportEquipment", "standardSupportEquipment", "标准配套设备"),
-    STANDARD_EQUIPMENT("standardEquipment", "standardEquipment", "标准装置"),
-    FLOW_DEF_EXPORT("flowDefData", "flowDefData", "流程定义"),
-    STAFF_CERTIFICATE("certificate", "certificate", "计量人员证书"),
-    CHECK_INFO("checkInfo", "checkInfo", "设备管理点检测"),
-    EQUIPMENT_APPLY("equipmentApply", "equipmentApply", "设备借用"),
-    STANDARD_EQUIPMENT_REMIND("equipmentApplyRemind", "equipmentApplyRemind", "标准装置到期提醒"),
-    METER_PRICE("meterPrice", "meterPrice", "价格库"),
-    METER_STAFF("meterStaff", "meterStaff", "计量人员"),
-    STANDARD_EQUIPMENT_APPLY("standardEquipmentApply", "standardEquipmentApply", "标准装置申请"),
-    STATE_MANAGE_APPLY("stateManage", "stateManage", "状态管理"),
-    METER_ACCEPTANCE_CHECK("acceptanceCheck", "acceptanceCheck", "设备检修保养验收单"),
-    CUSTOMER_EXPORT("customerData", "customerData", "客户信息"),
-    ORDER_EXPORT("orderData", "orderData", "委托书信息"),
-    SAMPLE_EXPORT("sampleData", "sampleData", "样本信息"),
-    EXCHANGE_DATA("exchangeData", "exchangeData", "设备交接单"),
-    DISPATCH_DATA("dispatchData", "dispatchData", "设备收发"),
-    ENVIRONMENT_DATA("environmentData", "environmentData", "环境记录单"),
-    ORIGIN_DATA("originData", "originData", "原始记录"),
-    CERTIFICATE_REPORT("certificateReport", "certificateReport", "证书报告"),
-    ADVICE_EXPORT("adviceData", "adviceData", "客户反馈"),
-    HANDOUT_EXPORT("handoutData", "handoutData", "任务分发列表"),
-    OUTSOURCER_EXPORT("outsourcerData", "outsourcerData", "分包方"),
-    SITE_EXECUTIVE_EXPORT("siteExecutiveData", "siteExecutiveData", "现场测试、校准或检定"),
-    CERTIFICATE_PRINT_EXPORT("certificatePrintData", "certificatePrintData", "证书打印"),
-    DOWNLOAD_TEMPLATE("downloadTemplate", "downloadTemplate", "页面配置"),
-    OUTSOURCER_CERTIFICATE_EXPORT("outsourceCertificateData", "outsourceCertificateData", "分包证书"),
-    SETTLEMENT_INFO_EXPORT("settlementInfoData", "settlementInfoData", "业务结算"),
-    EQUIPMENT_REMIND("equipmentRemind", "equipmentRemind", "设备到期提醒"),
-    AGREEMENT_INFO_EXPORT("agreementInfoData", "agreementInfoData", "合同"),
-    WORK_STATISTICS_EXPORT("workStatisticsData", "workStatisticsData", "实时工作统计"),
-    DEPT_OUTPUT_EXPORT("deptOutputData", "deptOutputData", "部门产值分析"),
-    WORKLOAD_EXPORT("workloadData", "workloadData", "业务工作量分析"),
-    DEPT_COMPREHENSIVE_EXPORT("deptComprehensiveData", "deptComprehensiveData", "部门综合分析"),
-    ENVIRONMENTAL_RECORD("environmentalRecordData", "environmentalRecordData", "现场环境记录");
+    /**
+     * 计量检定业务
+     */
+    OUTSOURCER_EXPORT("outsourcerData", "分包方名录", "分包方名录"),
+    IDENTIFY_EXPORT("identifyData", "计量标识", "计量标识"),
+    ORDER_EXPORT("orderData", "任务单", "任务单"),
+    DISPATCH_DATA("dispatchData", "设备收发", "设备收发"),
+    HANDOUT_EXPORT("handoutData", "任务分发", "任务分发"),
+    SITE_EXECUTIVE_EXPORT("siteExecutiveData", "现场测试、校准或检定", "现场测试、校准或检定"),
+    CERTIFICATE_REPORT("certificateReport", "证书审批", "证书审批"),
+    CERTIFICATE_CHANGE_APPLY("certificateChangeApply", "证书报告补充或更换申请单", "证书报告补充或更换申请单"),
+    CERTIFICATE_PRINT("certificatePrintData", "证书打印审批", "证书打印审批"),
+    DEPT_EXECUTIVE_TASK("deptExecutiveTaskData", "实验室任务", "实验室任务"),
+    MY_EXECUTIVE_TASK("myExecutiveTaskData", "我的任务", "我的任务"),
+    OUTSOURCE_ASSESS("outsourceAssess", "测试、校准或检定工作分包评审表", "测试、校准或检定工作分包评审表"),
+    OUTSOURCE_PROTOCOL("outsourceProtocol", "测试、校准或检定工作分包协议书", "测试、校准或检定工作分包协议书"),
+
+    /**
+     * 系统管理
+     */
+    SIGN_EXPORT("signData", "签名", "签名"),
+    TEMPLATE_EXPORT("templateData", "文件模板", "文件模板"),
+    FLOW_DEF_EXPORT("flowDefData", "流程定义", "流程定义"),
+    DOWNLOAD_TEMPLATE("downloadTemplate", "流程定义", "页面配置");
 
     ExportEnum(String fileName, String sheetName, String description) {
         this.fileName = fileName;
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateRecordTypeCodeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateRecordTypeCodeEnum.java
index 31d913c..a963522 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateRecordTypeCodeEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateRecordTypeCodeEnum.java
@@ -46,4 +46,14 @@
     String SITE_EXECUTIVE_APPROVAL = "01";
     //《现场测试、校准或检定工作记录表》
     String SITE_EXECUTIVE_LOG = "02";
+
+    //测试、校准或检定工作分包协议书
+    String OUTSOURCE_PROTOCOL = "01";
+    //测试、校准或检定工作分包评审表
+    String OUTSOURCE_ACCESS = "02";
+    //测试、校准或检定工作分包通知书
+    String OUTSOURCE_NOTICE = "03";
+    //测试、校准或检定工作分包方名录
+    String OUTSOURCE_INFO = "04";
+
 }
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
index 24b8635..f78bd53 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
@@ -15,6 +15,10 @@
     String CERTIFICATE_CHANGE_APPLY_BEAN_NAME = "certificateChangeApplyBean";
     //现场测试、校准或检定
     String SITE_EXECUTIVE_BEAN_NAME = "siteExecutiveBean";
+    //测试、校准或检定工作分包评审表
+    String OUTSOURCE_ASSESS_BEAN_NAME = "outsourceAssessBean";
+    //测试、校准或检定工作分包协议书
+    String OUTSOURCE_PROTOCOL_BEAN_NAME = "outsourceProtocolBean";
 
     /*********************************设备与装置************************************/
     //设备台账
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 b21c661..6b86fd1 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
@@ -18,6 +18,8 @@
     OUTSOURCER_APPROVAL(OUTSOURCER_BEAN_NAME, ""),
     CERTIFICATE_CHANGE_APPROVAL(CERTIFICATE_CHANGE_APPLY_BEAN_NAME, ""),
     SITE_EXECUTIVE_APPROVAL(SITE_EXECUTIVE_BEAN_NAME, ""),
+    OUTSOURCE_ASSESS_APPROVAL(OUTSOURCE_ASSESS_BEAN_NAME, ""),
+    OUTSOURCE_PROTOCOL_APPROVAL(OUTSOURCE_PROTOCOL_BEAN_NAME, ""),
 
     ACTION_STATUS_MAP(new HashMap<String, AwareActionStatusEnum>() {
         {
@@ -47,6 +49,10 @@
             put(ApplyFromIdEnum.CERTIFICATE_CHANGE_APPROVAL.getCode(), CERTIFICATE_CHANGE_APPROVAL);
             //现场测试、校准或检定审批
             put(ApplyFromIdEnum.SITE_EXECUTIVE_APPROVAL.getCode(), SITE_EXECUTIVE_APPROVAL);
+            //测试、校准或检定工作分包评审表
+            put(ApplyFromIdEnum.OUTSOURCE_ASSESS_APPROVAL.getCode(), OUTSOURCE_ASSESS_APPROVAL);
+            //测试、校准或检定工作分包协议书
+            put(ApplyFromIdEnum.OUTSOURCE_PROTOCOL_APPROVAL.getCode(), OUTSOURCE_PROTOCOL_APPROVAL);
         }
     });
     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 934405e..c7410bd 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
@@ -9,6 +9,8 @@
     CERTIFICATE_CHANGE_APPROVAL("jljdywzsbchghsqd", MessageSourceModuleEnum.BUSINESS.getCode(), "证书/报告补充或更换申请单"),
     OUTSOURCER_APPROVAL("jljdywcsjzhgfbfml", MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定合格分包方名录"),
     SITE_EXECUTIVE_APPROVAL("jljdywxccsjzsp", MessageSourceModuleEnum.BUSINESS.getCode(), "现场测试、校准或检定审批"),
+    OUTSOURCE_ASSESS_APPROVAL("jljdywcsjzfbpsb", MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包评审表"),
+    OUTSOURCE_PROTOCOL_APPROVAL("jljdywcsjzfbxys", MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包协议书"),
 
 
     /*******************************************设备与装置*********************************************/
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/GeneralApprovalMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/GeneralApprovalMapper.java
index 4fb7344..0c9d6ae 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/GeneralApprovalMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/GeneralApprovalMapper.java
@@ -17,8 +17,4 @@
 
     Page<O> selectBatchForApprovalList(Page<O> page, @Param("request") R request, @Param("businessKeys") List<String> businessKeys);
 
-//    Page<O> selectListPage(Page<O> page, @Param("request") R request);
-
-//    Long selectMaxNo();
-
 }
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceAssessMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceAssessMapper.java
index 7867bb8..ba59009 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceAssessMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceAssessMapper.java
@@ -1,7 +1,12 @@
 package com.casic.missiles.mapper.business;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.business.outsource.OutsourceAssessApprovalListRequest;
+import com.casic.missiles.mapper.GeneralApprovalMapper;
 import com.casic.missiles.model.business.BizBusinessOutsourceAssess;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * <p>
@@ -11,6 +16,10 @@
  * @author wangpeng
  * @since 2023-08-16
  */
-public interface BizBusinessOutsourceAssessMapper extends BaseMapper<BizBusinessOutsourceAssess> {
+public interface BizBusinessOutsourceAssessMapper extends GeneralApprovalMapper<BizBusinessOutsourceAssess, BizBusinessOutsourceAssess, OutsourceAssessApprovalListRequest> {
+
+    Page<BizBusinessOutsourceAssess> selectBatchForApprovalList(Page<BizBusinessOutsourceAssess> page, @Param("request") OutsourceAssessApprovalListRequest request, @Param("businessKeys") List<String> businessKeys);
+
+    Long selectMaxProjectNo();
 
 }
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceProtocolMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceProtocolMapper.java
new file mode 100644
index 0000000..e6aba35
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceProtocolMapper.java
@@ -0,0 +1,24 @@
+package com.casic.missiles.mapper.business;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.business.outsource.OutsourceProtocolApprovalListRequest;
+import com.casic.missiles.mapper.GeneralApprovalMapper;
+import com.casic.missiles.model.business.BizBusinessOutsourceProtocol;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 计量检定业务-分包管理-测试、校准或检定工作分包协议书 Mapper 接口
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-08-24
+ */
+public interface BizBusinessOutsourceProtocolMapper extends GeneralApprovalMapper<BizBusinessOutsourceProtocol, BizBusinessOutsourceProtocol, OutsourceProtocolApprovalListRequest> {
+
+    Page<BizBusinessOutsourceProtocol> selectBatchForApprovalList(Page<BizBusinessOutsourceProtocol> page, @Param("request") OutsourceProtocolApprovalListRequest request, @Param("businessKeys") List<String> businessKeys);
+
+    Long selectMaxProtocolNo();
+}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/EnvLocationInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/EnvLocationInfoMapper.java
new file mode 100644
index 0000000..49eff87
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/EnvLocationInfoMapper.java
@@ -0,0 +1,21 @@
+package com.casic.missiles.mapper.resource;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.resource.environment.LocationListRequest;
+import com.casic.missiles.dto.resource.environment.LocationListResponse;
+import com.casic.missiles.model.resource.EnvLocationInfo;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * <p>
+ * 实验室环境监控系统-设备表 Mapper 接口
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-06-07
+ */
+public interface EnvLocationInfoMapper extends BaseMapper<EnvLocationInfo> {
+
+    Page<LocationListResponse> selectLocationListPage(Page<LocationListResponse> page, @Param("request") LocationListRequest request);
+}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java
index de124db..85ed0f7 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java
@@ -1,7 +1,9 @@
 package com.casic.missiles.mapper.system;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.dto.system.SignDetailResponse;
+import com.casic.missiles.dto.system.SignListRequest;
 import com.casic.missiles.model.system.SystemSign;
 import org.apache.ibatis.annotations.Param;
 
@@ -22,4 +24,8 @@
     SignDetailResponse selectSignDetailById(Long id);
 
     List<SystemSign> selectUsableSignList(@Param("userId") Long userId);
+
+    Page<SystemSign> selectSignListPage(Page<SystemSign> page, @Param("request") SignListRequest request);
+
+    List<SystemSign> selectSignList(@Param("request") SignListRequest request);
 }
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateChangeApplyMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateChangeApplyMapper.xml
index d798447..c496092 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateChangeApplyMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateChangeApplyMapper.xml
@@ -30,31 +30,31 @@
         SELECT *
         FROM biz_business_certificate_change_apply
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.changeApplyNo != null and request.changeApplyNo !=''">
+        <if test="request != null and request.changeApplyNo != null and request.changeApplyNo !=''">
             and change_apply_no like concat('%',#{request.changeApplyNo},'%')
         </if>
-        <if test="request.changeReportNo != null and request.changeReportNo !=''">
+        <if test="request != null and request.changeReportNo != null and request.changeReportNo !=''">
             and change_report_no like concat('%',#{request.changeReportNo},'%')
         </if>
-        <if test="request.changeReportName != null and request.changeReportName !=''">
+        <if test="request != null and request.changeReportName != null and request.changeReportName !=''">
             and change_report_name like concat('%',#{request.changeReportName},'%')
         </if>
-        <if test="request.changeType != null and request.changeType !=''">
+        <if test="request != null and request.changeType != null and request.changeType !=''">
             and change_type = #{request.changeType}
         </if>
-        <if test="request.createUserName != null and request.createUserName !=''">
+        <if test="request != null and request.createUserName != null and request.createUserName !=''">
             and create_user_name like concat('%',#{request.createUserName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificatePrintMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificatePrintMapper.xml
index b66cd99..49c0ac8 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificatePrintMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificatePrintMapper.xml
@@ -31,34 +31,34 @@
         LEFT JOIN biz_business_order_sample_relation bosr ON (bosr.order_id = bcr.order_id AND bosr.sample_id = bcr.sample_id)
         LEFT JOIN biz_business_order_info boi ON boi.id = bosr.order_id
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and bcp.approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.printStatus != null and request.printStatus !=''">
+        <if test="request != null and request.printStatus != null and request.printStatus !=''">
             and print_status = #{request.printStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and bcp.create_user_id = #{request.createUserId}
         </if>
-        <if test="request.certificateReportNo != null and request.certificateReportNo !=''">
+        <if test="request != null and request.certificateReportNo != null and request.certificateReportNo !=''">
             and bcr.certificate_report_no like concat('%',#{request.certificateReportNo},'%')
         </if>
-        <if test="request.certificateReportName != null and request.certificateReportName !=''">
+        <if test="request != null and request.certificateReportName != null and request.certificateReportName !=''">
             and bcr.certificate_report_name like concat('%',#{request.certificateReportName},'%')
         </if>
-        <if test="request.customerName != null and request.customerName !=''">
+        <if test="request != null and request.customerName != null and request.customerName !=''">
             and boi.customer_name like concat('%',#{request.customerName},'%')
         </if>
-        <if test="request.sampleNo != null and request.sampleNo !=''">
+        <if test="request != null and request.sampleNo != null and request.sampleNo !=''">
             and bosr.sample_no like concat('%',#{request.sampleNo},'%')
         </if>
-        <if test="request.sampleName != null and request.sampleName !=''">
+        <if test="request != null and request.sampleName != null and request.sampleName !=''">
             and bosr.sample_name like concat('%',#{request.sampleName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and bcp.create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and bcp.create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml
index b366034..767695d 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml
@@ -46,33 +46,37 @@
         SELECT bcr.*, bosr.sample_no, bosr.sample_name, bosr.sample_model, rsi.staff_name
         FROM biz_business_certificate_report bcr
         LEFT JOIN biz_business_order_sample_relation bosr ON (bosr.order_id = bcr.order_id AND bosr.sample_id = bcr.sample_id)
+        LEFT JOIN biz_business_order_info boi ON boi.id = bcr.order_id
         LEFT JOIN biz_resource_staff_info rsi ON rsi.id = bcr.measure_person_id
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and bcr.approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and bcr.create_user_id = #{request.createUserId}
         </if>
-        <if test="request.certificateReportNo != null and request.certificateReportNo !=''">
+        <if test="request != null and request.customerId != null and request.customerId !=''">
+            and boi.customer_id = #{request.customerId}
+        </if>
+        <if test="request != null and request.certificateReportNo != null and request.certificateReportNo !=''">
             and bcr.certificate_report_no like concat('%',#{request.certificateReportNo},'%')
         </if>
-        <if test="request.certificateReportName != null and request.certificateReportName !=''">
+        <if test="request != null and request.certificateReportName != null and request.certificateReportName !=''">
             and bcr.certificate_report_name like concat('%',#{request.certificateReportName},'%')
         </if>
-        <if test="request.sampleNo != null and request.sampleNo !=''">
+        <if test="request != null and request.sampleNo != null and request.sampleNo !=''">
             and bosr.sample_no like concat('%',#{request.sampleNo},'%')
         </if>
-        <if test="request.measureCategory != null and request.measureCategory !=''">
+        <if test="request != null and request.measureCategory != null and request.measureCategory !=''">
             and bcr.measure_category = #{request.measureCategory}
         </if>
-        <if test="request.measurePerson != null and request.measurePerson !=''">
+        <if test="request != null and request.measurePerson != null and request.measurePerson !=''">
             and rsi.staff_name like concat('%',#{request.measurePerson},'%')
         </if>
-        <if test="request.calibrationTimeStart != null and request.calibrationTimeStart !=''">
+        <if test="request != null and request.calibrationTimeStart != null and request.calibrationTimeStart !=''">
             and bcr.calibration_time &gt;= #{request.calibrationTimeStart}
         </if>
-        <if test="request.calibrationTimeEnd != null and request.calibrationTimeEnd !=''">
+        <if test="request != null and request.calibrationTimeEnd != null and request.calibrationTimeEnd !=''">
             and bcr.calibration_time &lt;= #{request.calibrationTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceAssessMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceAssessMapper.xml
index d0fcf8b..c22c101 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceAssessMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceAssessMapper.xml
@@ -7,6 +7,8 @@
         <id column="id" property="id" />
         <result column="project_no" property="projectNo" />
         <result column="project_name" property="projectName" />
+        <result column="lab_code" property="labCode" />
+        <result column="group_code" property="groupCode" />
         <result column="applicant_id" property="applicantId" />
         <result column="applicant_name" property="applicantName" />
         <result column="applicant_time" property="applicantTime" />
@@ -31,7 +33,45 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, project_no, project_name, applicant_id, applicant_name, applicant_time, minio_file_name, remark, create_user_id, create_user_name, outsourcer_id, pre_start_time, pre_end_time, outsource_reason, pre_cost, approval_status, process_id, approve_situation, traceability, test_method, technique_ability, create_time, update_time
+        id, project_no, project_name, lab_code, group_code, applicant_id, applicant_name, applicant_time, minio_file_name, remark, create_user_id, create_user_name, outsourcer_id, pre_start_time, pre_end_time, outsource_reason, pre_cost, approval_status, process_id, approve_situation, traceability, test_method, technique_ability, create_time, update_time
     </sql>
 
+    <select id="selectMaxProjectNo" resultType="java.lang.Long">
+        SELECT IFNULL(max(RIGHT(project_no, 3)), 0) from biz_business_outsource_assess
+    </select>
+
+    <select id="selectBatchForApprovalList" resultMap="BaseResultMap">
+        SELECT bboa.*, bboi.outsourcer_name, bboi.director
+        FROM biz_business_outsource_assess bboa
+        LEFT JOIN biz_business_outsourcer_info bboi ON bboa.outsourcer_id = bboi.id
+        WHERE 1=1
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
+            and bboa.approval_status = #{request.approvalStatus}
+        </if>
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
+            and bboa.create_user_id = #{request.createUserId}
+        </if>
+        <if test="request != null and request.projectNo != null and request.projectNo !=''">
+            and bboa.project_no like concat('%',#{request.projectNo},'%')
+        </if>
+        <if test="request != null and request.outsourcerName != null and request.outsourcerName !=''">
+            and bboi.outsourcer_name like concat('%',#{request.outsourcerName},'%')
+        </if>
+        <if test="request != null and request.applicantName != null and request.applicantName !=''">
+            and bboa.applicant_name like concat('%',#{request.applicantName},'%')
+        </if>
+        <if test="request != null and request.applicantTimeStart != null and request.applicantTimeStart !=''">
+            and bboa.applicant_time &gt;= #{request.applicantTimeStart}
+        </if>
+        <if test="request != null and request.applicantTimeEnd != null and request.applicantTimeEnd !=''">
+            and bboa.applicant_time &lt;= #{request.applicantTimeEnd}
+        </if>
+        <if test="businessKeys != null">
+            and bboa.id in
+            <foreach collection="businessKeys" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
+        ORDER BY bboa.create_time DESC
+    </select>
 </mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceProtocolMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceProtocolMapper.xml
new file mode 100644
index 0000000..b7b2149
--- /dev/null
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceProtocolMapper.xml
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.mapper.business.BizBusinessOutsourceProtocolMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.business.BizBusinessOutsourceProtocol">
+        <id column="id" property="id" />
+        <result column="protocol_no" property="protocolNo" />
+        <result column="project_name" property="projectName" />
+        <result column="lab_code" property="labCode" />
+        <result column="group_code" property="groupCode" />
+        <result column="outsourcer_id" property="outsourcerId" />
+        <result column="remark" property="remark" />
+        <result column="outsource_no" property="outsourceNo" />
+        <result column="outsource_name" property="outsourceName" />
+        <result column="contacts" property="contacts" />
+        <result column="mobile" property="mobile" />
+        <result column="address" property="address" />
+        <result column="require_date" property="requireDate" />
+        <result column="outsource_cost" property="outsourceCost" />
+        <result column="director" property="director" />
+        <result column="item" property="item" />
+        <result column="requires" property="requires" />
+        <result column="create_user_id" property="createUserId" />
+        <result column="create_user_name" property="createUserName" />
+        <result column="approval_status" property="approvalStatus" />
+        <result column="process_id" property="processId" />
+        <result column="create_time" property="createTime" />
+        <result column="update_time" property="updateTime" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, protocol_no, project_name, lab_code, group_code, outsourcer_id, remark, outsource_no, outsource_name, contacts, mobile, address, require_date, outsource_cost, director, item, requires, create_user_id, create_user_name, approval_status, process_id, create_time, update_time
+    </sql>
+
+    <select id="selectMaxProtocolNo" resultType="java.lang.Long">
+        SELECT IFNULL(max(RIGHT(protocol_no, 3)), 0) from biz_business_outsource_protocol
+    </select>
+
+    <select id="selectBatchForApprovalList" resultMap="BaseResultMap">
+        SELECT *
+        FROM biz_business_outsource_protocol
+        WHERE 1=1
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
+            and approval_status = #{request.approvalStatus}
+        </if>
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
+            and create_user_id = #{request.createUserId}
+        </if>
+        <if test="request != null and request.protocolNo != null and request.protocolNo !=''">
+            and protocol_no like concat('%',#{request.protocolNo},'%')
+        </if>
+        <if test="request != null and request.outsourcerName != null and request.outsourcerName !=''">
+            and outsourcer_name like concat('%',#{request.outsourcerName},'%')
+        </if>
+        <if test="request != null and request.applicantName != null and request.applicantName !=''">
+            and create_user_name like concat('%',#{request.applicantName},'%')
+        </if>
+        <if test="request != null and request.applicantTimeStart != null and request.applicantTimeStart !=''">
+            and create_time &gt;= #{request.applicantTimeStart}
+        </if>
+        <if test="request != null and request.applicantTimeEnd != null and request.applicantTimeEnd !=''">
+            and create_time &lt;= #{request.applicantTimeEnd}
+        </if>
+        <if test="businessKeys != null">
+            and id in
+            <foreach collection="businessKeys" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
+        ORDER BY create_time DESC
+    </select>
+</mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourcerInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourcerInfoMapper.xml
index 510a80b..3049b54 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourcerInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourcerInfoMapper.xml
@@ -7,6 +7,8 @@
         <id column="id" property="id" />
         <result column="outsourcer_no" property="outsourcerNo" />
         <result column="outsourcer_name" property="outsourcerName" />
+        <result column="lab_code" property="labCode" />
+        <result column="group_code" property="groupCode" />
         <result column="outsourcer_brief_name" property="outsourcerBriefName" />
         <result column="outsourcer_size" property="outsourcerSize" />
         <result column="business_size" property="businessSize" />
@@ -55,32 +57,32 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, outsourcer_no, outsourcer_name, outsourcer_brief_name, outsourcer_size, business_size, grade, evaluation, tax_number, bank_account, bank_name, bank_account_number, postal_code, director, phone, fax, mobile, email, website, address_country, address_province, address_city, address_area, full_address, address_country_name, address_province_name, address_city_name, address_area_name, invoice_country, invoice_province, invoice_city, invoice_area, invoice_full_address, invoice_country_name, invoice_province_name, invoice_city_name, invoice_area_name, business_scope, business_content, minio_file_name, approval_status, process_id, remark, create_user_id, create_user_name, create_time, update_time
+        id, outsourcer_no, outsourcer_name, lab_code, group_code, outsourcer_brief_name, outsourcer_size, business_size, grade, evaluation, tax_number, bank_account, bank_name, bank_account_number, postal_code, director, phone, fax, mobile, email, website, address_country, address_province, address_city, address_area, full_address, address_country_name, address_province_name, address_city_name, address_area_name, invoice_country, invoice_province, invoice_city, invoice_area, invoice_full_address, invoice_country_name, invoice_province_name, invoice_city_name, invoice_area_name, business_scope, business_content, minio_file_name, approval_status, process_id, remark, create_user_id, create_user_name, create_time, update_time
     </sql>
 
     <select id="selectBatchForApprovalList" resultMap="BaseResultMap">
         SELECT *
         FROM biz_business_outsourcer_info
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.outsourcerNo != null and request.outsourcerNo !=''">
+        <if test="request != null and request.outsourcerNo != null and request.outsourcerNo !=''">
             and outsourcer_no like concat('%',#{request.outsourcerNo},'%')
         </if>
-        <if test="request.outsourcerName != null and request.outsourcerName !=''">
+        <if test="request != null and request.outsourcerName != null and request.outsourcerName !=''">
             and outsourcer_name like concat('%',#{request.outsourcerName},'%')
         </if>
-        <if test="request.director != null and request.director !=''">
+        <if test="request != null and request.director != null and request.director !=''">
             and director like concat('%',#{request.director},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
@@ -93,6 +95,6 @@
     </select>
 
     <select id="selectMaxNo" resultType="java.lang.Long">
-        SELECT IFNULL(max(RIGHT(outsourcer_no, 12)), 0) from biz_business_outsourcer_info
+        SELECT IFNULL(max(RIGHT(outsourcer_no, 3)), 0) from biz_business_outsourcer_info
     </select>
 </mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessSiteExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessSiteExecutiveInfoMapper.xml
index 135c5d0..3c5ae79 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessSiteExecutiveInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessSiteExecutiveInfoMapper.xml
@@ -38,25 +38,25 @@
         FROM biz_business_site_executive_info bsei
         LEFT JOIN biz_resource_customer_info rci ON bsei.customer_id = rci.id
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and bsei.approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and bsei.create_user_id = #{request.createUserId}
         </if>
-        <if test="request.siteExecutiveNo != null and request.siteExecutiveNo !=''">
+        <if test="request != null and request.siteExecutiveNo != null and request.siteExecutiveNo !=''">
             and bsei.site_executive_no like concat('%',#{request.siteExecutiveNo},'%')
         </if>
-        <if test="request.customerName != null and request.customerName !=''">
+        <if test="request != null and request.customerName != null and request.customerName !=''">
             and rci.outsourcer_name like concat('%',#{request.customerName},'%')
         </if>
-        <if test="request.applyName != null and request.applyName !=''">
+        <if test="request != null and request.applyName != null and request.applyName !=''">
             and bsei.apply_name like concat('%',#{request.applyName},'%')
         </if>
-        <if test="request.applyTimeStart != null and request.applyTimeStart !=''">
+        <if test="request != null and request.applyTimeStart != null and request.applyTimeStart !=''">
             and bsei.apply_time &gt;= #{request.applyTimeStart}
         </if>
-        <if test="request.applyTimeEnd != null and request.applyTimeEnd !=''">
+        <if test="request != null and request.applyTimeEnd != null and request.applyTimeEnd !=''">
             and bsei.apply_time &lt;= #{request.applyTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml
index 84d9e2a..6bd38a9 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml
@@ -105,6 +105,12 @@
         <if test="request.isUrgent != null and request.isUrgent !=''">
             AND bo.is_urgent = #{request.isUrgent}
         </if>
+        <if test="request.ids != null">
+            and blei.id in
+            <foreach collection="request.ids" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
         ORDER BY blei.update_time DESC
     </select>
 
@@ -137,6 +143,12 @@
         <if test="request.isUrgent != null and request.isUrgent !=''">
             AND bo.is_urgent = #{request.isUrgent}
         </if>
+        <if test="request.ids != null">
+            and blei.id in
+            <foreach collection="request.ids" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
         ORDER BY blei.update_time DESC
     </select>
 
diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardInfoMapper.xml
index 1a5551b..2ed8d17 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardInfoMapper.xml
@@ -45,12 +45,6 @@
         FROM biz_equipment_standard_info besi
         LEFT JOIN biz_equipment_standard_technology_relation bestr ON besi.standard_no = bestr.standard_no
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
-            and besi.approval_status = #{request.approvalStatus}
-        </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
-            and besi.create_user_id = #{request.createUserId}
-        </if>
         <if test="request.standardName != null and request.standardName !=''">
             and besi.standard_name like concat('%',#{request.standardName},'%')
         </if>
diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardTechnologyRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardTechnologyRelationMapper.xml
index fc7e16c..cd03c8c 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardTechnologyRelationMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardTechnologyRelationMapper.xml
@@ -6,6 +6,7 @@
     <resultMap id="BaseResultMap" type="com.casic.missiles.model.equipment.BizEquipmentStandardTechnologyRelation">
         <id column="id" property="id" />
         <result column="technology_file_id" property="technologyFileId" />
+        <result column="technology_file_no" property="technologyFileNo" />
         <result column="technology_file_name" property="technologyFileName" />
         <result column="standard_id" property="standardId" />
         <result column="standard_no" property="standardNo" />
@@ -14,7 +15,7 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, technology_file_id, technology_file_name, standard_id, remark
+        id, technology_file_id, technology_file_no, technology_file_name, standard_id, remark
     </sql>
 
 </mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceAuthorizeOrderMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceAuthorizeOrderMapper.xml
index ac5176c..554fe65 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceAuthorizeOrderMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceAuthorizeOrderMapper.xml
@@ -32,22 +32,22 @@
         SELECT *
         FROM biz_resource_authorize_order
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.orderNo != null and request.orderNo !=''">
+        <if test="request != null and request.orderNo != null and request.orderNo !=''">
             and order_no like concat('%',#{request.orderNo},'%')
         </if>
-        <if test="request.createUserName != null and request.createUserName !=''">
+        <if test="request != null and request.createUserName != null and request.createUserName !=''">
             and create_user_name like concat('%',#{request.createUserName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerExamineFormMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerExamineFormMapper.xml
index ab242f6..af7f98f 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerExamineFormMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerExamineFormMapper.xml
@@ -41,28 +41,28 @@
         SELECT *
         FROM biz_resource_customer_examine_form
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.formNo != null and request.formNo !=''">
+        <if test="request != null and request.formNo != null and request.formNo !=''">
             and form_no like concat('%',#{request.formNo},'%')
         </if>
-        <if test="request.labCode != null and request.labCode !=''">
+        <if test="request != null and request.labCode != null and request.labCode !=''">
             and lab_code like concat('%',#{request.labCode},'%')
         </if>
-        <if test="request.groupCode != null and request.groupCode !=''">
+        <if test="request != null and request.groupCode != null and request.groupCode !=''">
             and group_code like concat('%',#{request.groupCode},'%')
         </if>
-        <if test="request.createUserName != null and request.createUserName !=''">
+        <if test="request != null and request.createUserName != null and request.createUserName !=''">
             and create_user_name like concat('%',#{request.createUserName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerInfoMapper.xml
index fa8ffbc..06a2798 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerInfoMapper.xml
@@ -33,25 +33,25 @@
         SELECT *
         FROM biz_resource_customer_info
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.customerNo != null and request.customerNo !=''">
+        <if test="request != null and request.customerNo != null and request.customerNo !=''">
             and customer_no like concat('%',#{request.customerNo},'%')
         </if>
-        <if test="request.customerName != null and request.customerName !=''">
+        <if test="request != null and request.customerName != null and request.customerName !=''">
             and customer_name like concat('%',#{request.customerName},'%')
         </if>
-        <if test="request.contacts != null and request.contacts !=''">
+        <if test="request != null and request.contacts != null and request.contacts !=''">
             and contacts like concat('%',#{request.contacts},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerSuggestFormMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerSuggestFormMapper.xml
index 28f5bb2..1806662 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerSuggestFormMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerSuggestFormMapper.xml
@@ -33,28 +33,28 @@
         SELECT *
         FROM biz_resource_customer_suggest_form
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.formNo != null and request.formNo !=''">
+        <if test="request != null and request.formNo != null and request.formNo !=''">
             and form_no like concat('%',#{request.formNo},'%')
         </if>
-        <if test="request.customerName != null and request.customerName !=''">
+        <if test="request != null and request.customerName != null and request.customerName !=''">
             and customer_name like concat('%',#{request.customerName},'%')
         </if>
-        <if test="request.customerDeptName != null and request.customerDeptName !=''">
+        <if test="request != null and request.customerDeptName != null and request.customerDeptName !=''">
             and customer_dept_name like concat('%',#{request.customerDeptName},'%')
         </if>
-        <if test="request.createUserName != null and request.createUserName !=''">
+        <if test="request != null and request.createUserName != null and request.createUserName !=''">
             and create_user_name like concat('%',#{request.createUserName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSealUseNoteMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSealUseNoteMapper.xml
index ab37bc1..b02bb33 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSealUseNoteMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSealUseNoteMapper.xml
@@ -29,32 +29,32 @@
     </sql>
 
     <select id="selectBatchForApprovalList" resultMap="BaseResultMap">
-        SELECT *
+        SELECT brsun.*, brsi.seal_name, brsi.seal_type, brsi.approver_name
         FROM biz_resource_seal_use_note brsun
         JOIN biz_resource_seal_info brsi ON brsun.seal_id = brsi.id
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and brsun.approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and brsun.create_user_id = #{request.createUserId}
         </if>
-        <if test="request.sealName != null and request.sealName !=''">
+        <if test="request != null and request.sealName != null and request.sealName !=''">
             and brsi.seal_name like concat('%',#{request.sealName},'%')
         </if>
-        <if test="request.sealType != null and request.sealType !=''">
+        <if test="request != null and request.sealType != null and request.sealType !=''">
             and brsi.seal_type = #{request.sealType}
         </if>
-        <if test="request.applyDeptName != null and request.applyDeptName !=''">
+        <if test="request != null and request.applyDeptName != null and request.applyDeptName !=''">
             and brsun.apply_dept_name like concat('%',#{request.applyDeptName},'%')
         </if>
-        <if test="request.applyUserName != null and request.applyUserName !=''">
+        <if test="request != null and request.applyUserName != null and request.applyUserName !=''">
             and brsun.apply_user_name like concat('%',#{request.applyUserName},'%')
         </if>
-        <if test="request.applyTimeStart != null and request.applyTimeStart !=''">
+        <if test="request != null and request.applyTimeStart != null and request.applyTimeStart !=''">
             and brsun.apply_time &gt;= #{request.applyTimeStart}
         </if>
-        <if test="request.applyTimeEnd != null and request.applyTimeEnd !=''">
+        <if test="request != null and request.applyTimeEnd != null and request.applyTimeEnd !=''">
             and brsun.apply_time &lt;= #{request.applyTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml
index 119bf7d..4f8392a 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml
@@ -31,6 +31,12 @@
         <if test="request.deptName != null and request.deptName !=''">
             and brsi.dept_name like concat('%',#{request.deptName},'%')
         </if>
+        <if test="request.ids != null">
+            and brsv.id in
+            <foreach collection="request.ids" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
         ORDER BY brsv.grant_date DESC
     </select>
 
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSupplierInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSupplierInfoMapper.xml
index fe8d399..e8ce7ef 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSupplierInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSupplierInfoMapper.xml
@@ -48,28 +48,28 @@
         SELECT *
         FROM biz_resource_supplier_info
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.supplierNo != null and request.supplierNo !=''">
+        <if test="request != null and request.supplierNo != null and request.supplierNo !=''">
             and supplier_no like concat('%',#{request.supplierNo},'%')
         </if>
-        <if test="request.supplierName != null and request.supplierName !=''">
+        <if test="request != null and request.supplierName != null and request.supplierName !=''">
             and supplier_name like concat('%',#{request.supplierName},'%')
         </if>
-        <if test="request.director != null and request.director !=''">
+        <if test="request != null and request.director != null and request.director !=''">
             and director like concat('%',#{request.director},'%')
         </if>
-        <if test="request.supplierType != null and request.supplierType !=''">
+        <if test="request != null and request.supplierType != null and request.supplierType !=''">
             and supplier_type = #{request.supplierType}
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/EnvLocationInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/EnvLocationInfoMapper.xml
new file mode 100644
index 0000000..68bcf10
--- /dev/null
+++ b/casic-metering-dao/src/main/resources/mapper/resource/EnvLocationInfoMapper.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.mapper.resource.EnvLocationInfoMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.resource.EnvLocationInfo">
+        <id column="id" property="id" />
+        <result column="location_no" property="locationNo" />
+        <result column="location_name" property="locationName" />
+        <result column="location_position" property="locationPosition" />
+        <result column="create_user_id" property="createUserId" />
+        <result column="create_user" property="createUser" />
+        <result column="create_time" property="createTime" />
+        <result column="update_time" property="updateTime" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, location_no, location_name, location_position, create_user_id, create_user, create_time, update_time
+    </sql>
+
+    <select id="selectLocationListPage" resultType="com.casic.missiles.dto.resource.environment.LocationListResponse">
+        SELECT *
+        FROM env_location_info
+        WHERE 1=1
+        <if test="request.locationNo != null and request.locationNo !=''">
+            AND location_no LIKE concat('%',#{request.locationNo},'%')
+        </if>
+        <if test="request.locationName != null and request.locationName !=''">
+            AND location_name LIKE concat('%',#{request.locationName},'%')
+        </if>
+        ORDER BY create_time DESC
+    </select>
+
+</mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml
index b28c18f..8854047 100644
--- a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml
@@ -11,7 +11,6 @@
         <result column="sign_desc" property="signDesc" />
         <result column="sign_director" property="signDirector" />
         <result column="sign_user_id" property="signUserId" />
-        <result column="sign_type" property="signType" />
         <result column="minio_file_name" property="minioFileName" />
         <result column="create_time" property="createTime" />
         <result column="update_time" property="updateTime" />
@@ -28,7 +27,6 @@
         <result column="sign_name" property="signName" />
         <result column="sign_desc" property="signDesc" />
         <result column="sign_director" property="signDirector" />
-        <result column="sign_type" property="signType" />
         <result column="sign_user_id" property="signUserId" />
         <result column="minio_file_name" property="minioFileName" />
         <result column="create_time" property="createTime" />
@@ -62,4 +60,58 @@
         JOIN system_sign_user_relation ssur ON ss.id = ssur.sign_id
         WHERE ssur.user_id = #{userId}
     </select>
+
+    <select id="selectSignListPage" resultMap="BaseResultMap">
+        SELECT ss.*, sd.SIMPLE_NAME AS deptName
+        FROM system_sign ss
+        LEFT JOIN sys_user su ON su.id = ss.sign_user_id
+        LEFT JOIN sys_dept sd ON sd.id = su.dept_id
+        WHERE 1=1
+        <if test="request.signNo != null and request.signNo !=''">
+            AND ss.sign_no LIKE concat('%',#{request.signNo},'%')
+        </if>
+        <if test="request.signName != null and request.signName !=''">
+            AND ss.sign_name LIKE concat('%',#{request.signName},'%')
+        </if>
+        <if test="request.signDirector != null and request.signDirector !=''">
+            AND ss.sign_director LIKE concat('%',#{request.signDirector},'%')
+        </if>
+        <if test="request.signUserId != null and request.signUserId !=''">
+            AND ss.sign_user_id = #{request.signUserId}
+        </if>
+        <if test="request.createStartTime != null and request.createStartTime !=''">
+            AND DATE_FORMAT(ss.create_time,'%Y-%m-%d') &gt;= DATE_FORMAT(#{request.createStartTime},'%Y-%m-%d')
+        </if>
+        <if test="request.createEndTime != null and request.createEndTime !=''">
+            AND DATE_FORMAT(ss.create_time,'%Y-%m-%d')  &lt;= DATE_FORMAT(#{request.createEndTime},'%Y-%m-%d')
+        </if>
+        ORDER BY ss.create_time DESC
+    </select>
+
+    <select id="selectSignList" resultMap="BaseResultMap">
+        SELECT ss.*, sd.SIMPLE_NAME AS deptName
+        FROM system_sign ss
+        LEFT JOIN sys_user su ON su.id = ss.sign_user_id
+        LEFT JOIN sys_dept sd ON sd.id = su.dept_id
+        WHERE 1=1
+        <if test="request.signNo != null and request.signNo !=''">
+            AND ss.sign_no LIKE concat('%',#{request.signNo},'%')
+        </if>
+        <if test="request.signName != null and request.signName !=''">
+            AND ss.sign_name LIKE concat('%',#{request.signName},'%')
+        </if>
+        <if test="request.signDirector != null and request.signDirector !=''">
+            AND ss.sign_director LIKE concat('%',#{request.signDirector},'%')
+        </if>
+        <if test="request.signUserId != null and request.signUserId !=''">
+            AND ss.sign_user_id = #{request.signUserId}
+        </if>
+        <if test="request.createStartTime != null and request.createStartTime !=''">
+            AND DATE_FORMAT(ss.create_time,'%Y-%m-%d') &gt;= DATE_FORMAT(#{request.createStartTime},'%Y-%m-%d')
+        </if>
+        <if test="request.createEndTime != null and request.createEndTime !=''">
+            AND DATE_FORMAT(ss.create_time,'%Y-%m-%d')  &lt;= DATE_FORMAT(#{request.createEndTime},'%Y-%m-%d')
+        </if>
+        ORDER BY ss.create_time DESC
+    </select>
 </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 515050a..60f530b 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
@@ -47,8 +47,8 @@
     String STORAGE_LOCATION = "bizStorageLocation";
     //计量专业
     String MEASURE_MAJOR = "bizMeasureMajor";
-    //管理状态
-    String MANAGER_STATE = "bizManagerState";
+    //标准装置管理状态
+    String STANDARD_MANAGER_STATE = "bizStandardManagerState";
 
     /**
      * 资源管理 字典code
@@ -95,8 +95,6 @@
     String MEASURE_STATUS = "measureStatus";
     //检定方式
     String MEASURE_TYPE = "measureType";
-    //标识打印标志类型
-    String IDENTIFY_PRINT_TYPE = "bizBusinessIdentify";
     //变更类型
     String REPORT_CHANGE_TYPE = "bizCertChangeType";
     //规模类型
@@ -111,19 +109,24 @@
     String MEASURE_CATEGORY = "measureCategory";
     //检定结果
     String MEASURE_RESULT = "measureResult";
+    //分包原因
+    String OUTSOURCE_REASON = "outsourceReason";
+
+    /**
+     * 系统管理
+     */
+    String TEMPLATE_TYPE = "templateType";
+
 
     /**
      * 标准装置 字典code
      */
     //类别
     String STANDARD_CATEGORY = "standardCategory";
-    //管理状态
-    String STANDARD_MANAGER_STATE = "standardManagerState";
     //标准等级
     String STANDARD_LEVEL = "standardLevel";
     //传递范围
     String STANDARD_TRANSMIT_RANGE = "transmitRange";
-
     //资本来源
     String CAPITAL_SOURCE = "capitalSource";
     //标准装置-申请类型
@@ -148,8 +151,6 @@
     String CERTIFICATE_CLASS = "certificationClass";
     //证书管理-检校专业
     String CALIBRATION_MAJOR = "calibrationMajor";
-    //分包原因
-    String OUTSOURCE_REASON = "outsourceReason";
 
     /**
      * 工作台
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/BaseApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/BaseApprovalListRequest.java
index 73c12c1..80d7424 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/BaseApprovalListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/BaseApprovalListRequest.java
@@ -6,6 +6,7 @@
 
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotEmpty;
+import java.util.List;
 
 /**
  * @Description:
@@ -19,14 +20,14 @@
      * 表单id
      */
     @NotBlank(message = "表单id不能为空")
-    @ApiModelProperty(value = "表单id（流程定义对应的表单id，等价于业务id）", dataType = "String")
+    @ApiModelProperty(value = "表单id（流程定义对应的表单id，等价于业务id），导出接口不用传", dataType = "String")
     private String formId;
 
     /**
      * 审批状态类型，对应ApprovalStatusEnum
      */
     @NotEmpty(message = "审批状态类型不能为空")
-    @ApiModelProperty(value = "审批状态类型code", dataType = "String")
+    @ApiModelProperty(value = "审批状态类型code，导出接口不用传", dataType = "String")
     private String approvalStatus;
 
     @ApiModelProperty(hidden = true)
@@ -34,4 +35,7 @@
 
     @ApiModelProperty(hidden = true)
     private Long createUserId;
+
+    @ApiModelProperty(value = "导出ids", dataType = "List")
+    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificatePrintApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificatePrintApprovalListRequest.java
index b93d1c9..3cc2f4e 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificatePrintApprovalListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificatePrintApprovalListRequest.java
@@ -5,8 +5,6 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import java.util.List;
-
 /**
  * @Description:
  * @Author: wangpeng
@@ -38,7 +36,4 @@
 
     @ApiModelProperty(value = "创建结束时间", dataType = "String")
     private String createTimeEnd;
-
-    @ApiModelProperty(value = "导出ids", dataType = "List")
-    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportApprovalListRequest.java
index 4f7a038..c115847 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportApprovalListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportApprovalListRequest.java
@@ -5,8 +5,6 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import java.util.List;
-
 /**
  * @Description:
  * @Author: wangpeng
@@ -15,6 +13,8 @@
 @ApiModel
 @Data
 public class CertificateReportApprovalListRequest extends BaseApprovalListRequest {
+    @ApiModelProperty(value = "委托方id", dataType = "String")
+    private Long customerId;
 
     @ApiModelProperty(value = "证书报告编号", dataType = "String")
     private String certificateReportNo;
@@ -37,6 +37,4 @@
     @ApiModelProperty(value = "检校结束时间", dataType = "String")
     private String calibrationTimeEnd;
 
-    @ApiModelProperty(value = "导出ids", dataType = "List")
-    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/identify/IdentifyListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/identify/IdentifyListRequest.java
index 1b87ae6..f019203 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/identify/IdentifyListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/identify/IdentifyListRequest.java
@@ -4,6 +4,8 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * @Description:
  * @Author: wangpeng
@@ -26,4 +28,7 @@
 
     @ApiModelProperty(value = "打印结束时间", dataType = "String")
     private String createTimeEnd;
+
+    @ApiModelProperty(value = "导出ids", dataType = "List")
+    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListRequest.java
index 1264883..62415fb 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListRequest.java
@@ -7,6 +7,7 @@
 import lombok.Data;
 
 import javax.validation.constraints.NotBlank;
+import java.util.List;
 
 @Data
 @ApiModel
@@ -37,4 +38,6 @@
     @ApiModelProperty(value = "是否加急（1是0否null全部）", dataType = "Integer")
     private String isUrgent;
 
+    @ApiModelProperty(value = "导出ids", dataType = "List")
+    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListRequest.java
index 5201d7b..499760a 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListRequest.java
@@ -17,6 +17,9 @@
     @ApiModelProperty(value = "任务单编号", dataType = "String")
     private String orderNo;
 
+    @ApiModelProperty(value = "委托方id", dataType = "Long")
+    private Long customerId;
+
     @ApiModelProperty(value = "委托方名称", dataType = "String")
     private String customerName;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OrderSampleDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OrderSampleDTO.java
new file mode 100644
index 0000000..796edc0
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OrderSampleDTO.java
@@ -0,0 +1,19 @@
+package com.casic.missiles.dto.business.outsource;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/8/24 11:38
+ */
+@ApiModel
+@Data
+public class OrderSampleDTO {
+    @ApiModelProperty(value = "任务单id", dataType = "Long")
+    private Long orderId;
+    @ApiModelProperty(value = "受检设备id", dataType = "Long")
+    private Long sampleId;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceAssessApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceAssessApprovalListRequest.java
new file mode 100644
index 0000000..9a930c3
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceAssessApprovalListRequest.java
@@ -0,0 +1,30 @@
+package com.casic.missiles.dto.business.outsource;
+
+import com.casic.missiles.dto.BaseApprovalListRequest;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/8/24 11:01
+ */
+@ApiModel
+@Data
+public class OutsourceAssessApprovalListRequest extends BaseApprovalListRequest {
+    @ApiModelProperty(value = "评审表编号", dataType = "String")
+    private String projectNo;
+
+    @ApiModelProperty(value = "分包机构名称", dataType = "String")
+    private String outsourcerName;
+
+    @ApiModelProperty(value = "申请人", dataType = "String")
+    private String applicantName;
+
+    @ApiModelProperty(value = "申请时间开始", dataType = "String")
+    private String applicantTimeStart;
+
+    @ApiModelProperty(value = "申请时间结束", dataType = "String")
+    private String applicantTimeEnd;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceAssessSaveResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceAssessSaveResponse.java
new file mode 100644
index 0000000..8bf9aad
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceAssessSaveResponse.java
@@ -0,0 +1,20 @@
+package com.casic.missiles.dto.business.outsource;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/8/14 16:17
+ */
+@ApiModel
+@Data
+public class OutsourceAssessSaveResponse {
+    @ApiModelProperty(value = "主键id", dataType = "Long")
+    private Long id;
+
+    @ApiModelProperty(value = "编号", dataType = "String")
+    private String projectNo;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProtocolApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProtocolApprovalListRequest.java
new file mode 100644
index 0000000..0f32331
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProtocolApprovalListRequest.java
@@ -0,0 +1,30 @@
+package com.casic.missiles.dto.business.outsource;
+
+import com.casic.missiles.dto.BaseApprovalListRequest;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/8/24 15:01
+ */
+@ApiModel
+@Data
+public class OutsourceProtocolApprovalListRequest extends BaseApprovalListRequest {
+    @ApiModelProperty(value = "协议书编号", dataType = "String")
+    private String protocolNo;
+
+    @ApiModelProperty(value = "分包方名称", dataType = "String")
+    private String outsourcerName;
+
+    @ApiModelProperty(value = "申请人", dataType = "String")
+    private String applicantName;
+
+    @ApiModelProperty(value = "申请时间开始", dataType = "String")
+    private String applicantTimeStart;
+
+    @ApiModelProperty(value = "申请时间结束", dataType = "String")
+    private String applicantTimeEnd;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProtocolSaveResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProtocolSaveResponse.java
new file mode 100644
index 0000000..e324967
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProtocolSaveResponse.java
@@ -0,0 +1,20 @@
+package com.casic.missiles.dto.business.outsource;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/8/14 16:17
+ */
+@ApiModel
+@Data
+public class OutsourceProtocolSaveResponse {
+    @ApiModelProperty(value = "主键id", dataType = "Long")
+    private Long id;
+
+    @ApiModelProperty(value = "编号", dataType = "String")
+    private String protocolNo;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveApprovalListRequest.java
index f29f4e4..7047c28 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveApprovalListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveApprovalListRequest.java
@@ -5,8 +5,6 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import java.util.List;
-
 /**
  * @Description: 现场检测审批列表请求实体
  * @Author: wangpeng
@@ -30,7 +28,4 @@
     @ApiModelProperty(value = "申请时间结束", dataType = "String")
     private String applyTimeEnd;
 
-    @ApiModelProperty(value = "导出ids", dataType = "List")
-    private List<Long> ids;
-
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveDetailResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveDetailResponse.java
index 1f28752..394c934 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveDetailResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveDetailResponse.java
@@ -12,6 +12,18 @@
     @ApiModelProperty(value = "id，更新/删除使用参数", dataType = "Long")
     private Long id;
 
+    @ApiModelProperty(value = "实验室代码(字典code)", dataType = "String")
+    private String labCode;
+
+    @ApiModelProperty(value = "实验室代码(字典value)", dataType = "String")
+    private String labCodeName;
+
+    @ApiModelProperty(value = "组别代码(字典code)", dataType = "String")
+    private String groupCode;
+
+    @ApiModelProperty(value = "组别代码(字典value)", dataType = "String")
+    private String groupCodeName;
+
     @ApiModelProperty(value = "审批编号", dataType = "String")
     private String siteExecutiveNo;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/environment/LocationListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/environment/LocationListRequest.java
new file mode 100644
index 0000000..13d03c3
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/environment/LocationListRequest.java
@@ -0,0 +1,20 @@
+package com.casic.missiles.dto.resource.environment;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/6/8 13:56
+ */
+@ApiModel
+@Data
+public class LocationListRequest {
+    @ApiModelProperty(value = "地点编号", dataType = "String")
+    private String locationNo;
+
+    @ApiModelProperty(value = "地点名称", dataType = "String")
+    private String locationName;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/environment/LocationListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/environment/LocationListResponse.java
new file mode 100644
index 0000000..4c531af
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/environment/LocationListResponse.java
@@ -0,0 +1,78 @@
+package com.casic.missiles.dto.resource.environment;
+
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
+import com.baomidou.mybatisplus.annotation.TableField;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description: 地点列表响应实体
+ * @Author: wangpeng
+ * @Date: 2023/6/8 13:53
+ */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
+@ApiModel
+@Data
+public class LocationListResponse {
+    @ApiModelProperty(value = "主键id", dataType = "Long")
+    private Long id;
+
+    /**
+     * 地点编号
+     */
+    @ExcelProperty("地点编号")
+    @ApiModelProperty(value = "地点编号", dataType = "String")
+    private String locationNo;
+
+    /**
+     * 地点名称
+     */
+    @ExcelProperty("地点名称")
+    @ApiModelProperty(value = "地点名称", dataType = "String")
+    private String locationName;
+
+    /**
+     * 地点位置
+     */
+    @ExcelProperty("地点位置")
+    @ApiModelProperty(value = "地点位置", dataType = "String")
+    private String locationPosition;
+
+    /**
+     * 创建人id
+     */
+    @ApiModelProperty(value = "创建人id", dataType = "Long")
+    private Long createUserId;
+
+    /**
+     * 创建人
+     */
+    @ExcelProperty("创建人")
+    @ApiModelProperty(value = "创建人", dataType = "String")
+    @TableField("create_user")
+    private String createUser;
+
+    /**
+     * 创建时间
+     */
+    @ExcelProperty("创建时间")
+    @ApiModelProperty(value = "创建时间", dataType = "String")
+    private String createTime;
+
+    /**
+     * 更新时间
+     */
+    @ApiModelProperty(value = "更新时间", dataType = "String")
+    private String updateTime;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertRequest.java
index 9a7f6c6..c827915 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertRequest.java
@@ -4,6 +4,8 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * @Description:
  * @Author: wangpeng
@@ -16,4 +18,7 @@
     private String name;
     @ApiModelProperty(value = "部门名", dataType = "String")
     private String deptName;
+
+    @ApiModelProperty(value = "导出ids", dataType = "List")
+    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertResponse.java
index f78b159..8f2f79e 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertResponse.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.dto.resource.staff;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.casic.missiles.annotation.DictCodeField;
 import com.casic.missiles.constants.MeterDictCode;
 import io.swagger.annotations.ApiModel;
@@ -13,12 +20,18 @@
  * @Author: wangpeng
  * @Date: 2023/7/27 15:13
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @ApiModel
 @Data
 public class StaffCertResponse {
     /**
      * 人员编号
      */
+    @ExcelProperty(value = "人员编号",order = 0)
     @NotEmpty(message = "人员编号不能为空")
     @ApiModelProperty(value = "人员编号", dataType = "String")
     private String staffNo;
@@ -26,6 +39,7 @@
     /**
      * 姓名
      */
+    @ExcelProperty(value = "姓名",order = 1)
     @ApiModelProperty(value = "姓名", dataType = "String")
     private String staffName;
 
@@ -54,6 +68,7 @@
     /**
      * 部门名字
      */
+    @ExcelProperty(value = "工作部门",order = 2)
     @ApiModelProperty(value = "部门名字", dataType = "String")
     private String deptName;
 
@@ -66,6 +81,7 @@
     /**
      * 计量专业
      */
+    @ExcelProperty(value = "计量专业",order = 3)
     @ApiModelProperty(value = "计量专业", dataType = "String")
     private String major;
 
@@ -110,6 +126,7 @@
     /**
      * 证书号
      */
+    @ExcelProperty(value = "证号",order = 4)
     @ApiModelProperty(value = "证书号", dataType = "String")
     private String certNo;
 
@@ -122,12 +139,14 @@
     /**
      * 有效日期
      */
+    @ExcelProperty(value = "证书有效期",order = 6)
     @ApiModelProperty(value = "有效日期", dataType = "String")
     private String effectiveDate;
 
     /**
      * 发放日期
      */
+    @ExcelProperty(value = "发证日期",order = 5)
     @ApiModelProperty(value = "发放日期", dataType = "String")
     private String grantDate;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffListRequest.java
index 7c4afb3..0a1194a 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffListRequest.java
@@ -4,6 +4,8 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * @Description:
  * @Author: wangpeng
@@ -18,4 +20,7 @@
     private String deptName;
     @ApiModelProperty(value = "部门id", dataType = "Long")
     private Long deptId;
+
+    @ApiModelProperty(value = "导出ids", dataType = "List")
+    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/TrainListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/TrainListRequest.java
index f68597b..6321f8b 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/TrainListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/TrainListRequest.java
@@ -14,6 +14,8 @@
 public class TrainListRequest {
     @ApiModelProperty(value = "训练登记表编号", dataType = "String")
     private String trainNo;
+    @ApiModelProperty(value = "值班领导", dataType = "String")
+    private String dutyLeader;
     @ApiModelProperty(value = "创建开始时间", dataType = "String")
     private String createTimeStart;
     @ApiModelProperty(value = "创建结束时间", dataType = "String")
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/SignAddRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/SignAddRequest.java
index 117be34..d71055c 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/SignAddRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/SignAddRequest.java
@@ -43,13 +43,6 @@
     private Long signUserId;
 
     /**
-     * 签章或签名-字典code
-     */
-    @NotBlank(message = "类型不能为空")
-    @ApiModelProperty(value = "签名/签章-字典code", dataType = "String", required = true)
-    private String signType;
-
-    /**
      * minio存储文件名
      */
     @ApiModelProperty(value = "上传文件返回名称", dataType = "String")
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateAddRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateAddRequest.java
index aff1265..6316648 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateAddRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateAddRequest.java
@@ -17,30 +17,28 @@
 @Data
 public class TemplateAddRequest extends BaseSystemRequest {
     /**
-     * 原始记录模板/证书报告模板名称
+     * 模板名称
      */
     @ApiModelProperty(value = "名称", dataType = "String", required = true)
     @NotBlank(message = "名称不能为空")
     private String templateName;
 
     /**
-     * 原始记录模板/证书报告模板描述
+     * 模板描述
      */
     @ApiModelProperty(value = "描述", dataType = "String")
     private String templateDesc;
 
     /**
-     * 原始记录模板/证书报告模板创建人
+     * 创建人
      */
     @ApiModelProperty(value = "创建人", dataType = "String", required = true)
     @NotBlank(message = "创建人不能为空")
     private String templateCreator;
 
-    /**
-     * 原始记录模板/证书报告模板-字典code
-     */
-    @NotBlank(message = "类型不能为空")
-    @ApiModelProperty(value = "原始记录模板/证书报告模板-字典code", dataType = "String", required = true)
+
+    @NotBlank(message = "模板类型不能为空")
+    @ApiModelProperty(value = "模板类型(字典code)", dataType = "String", required = true)
     private String templateType;
 
     /**
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateListRequest.java
index eec5a1e..6d17bbe 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateListRequest.java
@@ -1,11 +1,12 @@
 package com.casic.missiles.dto.system;
 
+import com.casic.missiles.annotation.DictCodeField;
+import com.casic.missiles.constants.MeterDictCode;
 import com.casic.missiles.dto.BaseSystemRequest;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import javax.validation.constraints.NotBlank;
 import java.util.List;
 
 /**
@@ -19,8 +20,8 @@
     /**
      * 类型
      */
-//    @ApiModelProperty(value = "类型-字典code", dataType = "String", required = true)
-    @NotBlank(message = "类型不能为空")
+    @DictCodeField(message = "模板类型不合法", cacheName = MeterDictCode.TEMPLATE_TYPE)
+    @ApiModelProperty(value = "模板类型(字典code)", dataType = "String")
     private String templateType;
 
     /**
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificateChangeApply.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificateChangeApply.java
index 9216308..36923fd 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificateChangeApply.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificateChangeApply.java
@@ -1,11 +1,19 @@
 package com.casic.missiles.model.business;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 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 com.casic.missiles.dto.BaseRequest;
+import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -20,6 +28,12 @@
  * @author wangpeng
  * @since 2023-08-15
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
+@ApiModel
 @Data
 @TableName("biz_business_certificate_change_apply")
 public class BizBusinessCertificateChangeApply extends BaseRequest implements Serializable {
@@ -33,6 +47,7 @@
     /**
      * 申请单编号
      */
+    @ExcelProperty(value = "申请单编号", order = 1)
     @ApiModelProperty(value = "申请单编号", dataType = "String")
     @TableField("change_apply_no")
     private String changeApplyNo;
@@ -40,6 +55,7 @@
     /**
      * 申请单名字
      */
+    @ExcelProperty(value = "申请单名称", order = 2)
     @ApiModelProperty(value = "申请单名字", dataType = "String")
     @TableField("change_apply_name")
     private String changeApplyName;
@@ -54,6 +70,7 @@
     /**
      * 更换证书编号
      */
+    @ExcelProperty(value = "更换证书编号", order = 3)
     @ApiModelProperty(value = "更换证书编号", dataType = "String")
     @TableField("change_report_no")
     private String changeReportNo;
@@ -61,7 +78,8 @@
     /**
      * 更换证书名字
      */
-    @ApiModelProperty(value = "更换证书名字", dataType = "String")
+    @ExcelProperty(value = "更换证书/报告名称", order = 4)
+    @ApiModelProperty(value = "更换证书/报告名称", dataType = "String")
     @TableField("change_report_name")
     private String changeReportName;
 
@@ -73,6 +91,7 @@
     @TableField("change_type")
     private String changeType;
 
+    @ExcelProperty(value = "变更类型", order = 5)
     @ApiModelProperty(value = "变更类型(字典value)", dataType = "String")
     @TableField(exist = false)
     private String changeTypeName;
@@ -142,13 +161,15 @@
     /**
      * 创建用户名字
      */
-    @ApiModelProperty(value = "创建用户名字", dataType = "String")
+    @ExcelProperty(value = "创建人", order = 6)
+    @ApiModelProperty(value = "创建人名字", dataType = "String")
     @TableField("create_user_name")
     private String createUserName;
 
     /**
      * 创建时间
      */
+    @ExcelProperty(value = "创建时间", order = 7)
     @ApiModelProperty(value = "创建时间", dataType = "String")
     @TableField("create_time")
     private String createTime;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificateReport.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificateReport.java
index f01db9e..db06018 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificateReport.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificateReport.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.model.business;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -22,6 +29,11 @@
  * @author wangpeng
  * @since 2023-08-14
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @ApiModel
 @Data
 @TableName("biz_business_certificate_report")
@@ -36,6 +48,7 @@
     /**
      * 证书报告编号
      */
+    @ExcelProperty(value = "证书报告编号", order = 1)
     @ApiModelProperty(value = "证书报告编号", dataType = "String")
     @TableField("certificate_report_no")
     private String certificateReportNo;
@@ -43,6 +56,7 @@
     /**
      * 证书报告名称
      */
+    @ExcelProperty(value = "证书报告名称", order = 2)
     @ApiModelProperty(value = "证书报告名称", dataType = "String")
     @TableField("certificate_report_name")
     private String certificateReportName;
@@ -62,6 +76,7 @@
     @TableField("measure_category")
     private String measureCategory;
 
+    @ExcelProperty(value = "检校类别", order = 6)
     @ApiModelProperty(value = "检校类别(字典value)", dataType = "String")
     @TableField(exist = false)
     private String measureCategoryName;
@@ -69,6 +84,7 @@
     /**
      * 检校时间
      */
+    @ExcelProperty(value = "检校时间", order = 8)
     @ApiModelProperty(value = "检校时间", dataType = "String")
     @TableField("calibration_time")
     private String calibrationTime;
@@ -267,18 +283,22 @@
     @TableField(exist = false)
     private Integer decisionItem;
 
-    @ApiModelProperty(value = "设备样品编号（列表返回参数）", dataType = "String")
+    @ExcelProperty(value = "被检设备统一编号", order = 3)
+    @ApiModelProperty(value = "被检设备统一编号（列表返回参数）", dataType = "String")
     @TableField(exist = false)
     private String sampleNo;
 
-    @ApiModelProperty(value = "设备样品名称（列表返回参数）", dataType = "String")
+    @ExcelProperty(value = "被检设备名称", order = 4)
+    @ApiModelProperty(value = "被检设备名称（列表返回参数）", dataType = "String")
     @TableField(exist = false)
     private String sampleName;
 
-    @ApiModelProperty(value = "设备样品规格型号（列表返回参数）", dataType = "String")
+    @ExcelProperty(value = "规格型号", order = 5)
+    @ApiModelProperty(value = "规格型号（列表返回参数）", dataType = "String")
     @TableField(exist = false)
     private String sampleModel;
 
+    @ExcelProperty(value = "检定员", order = 7)
     @ApiModelProperty(value = "检定员名字（列表返回参数）", dataType = "String")
     @TableField(exist = false)
     private String staffName;

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java
index bb0c50f..13a699b 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java
@@ -12,6 +12,7 @@
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.IGeneralApprovalService;
+import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
@@ -19,6 +20,7 @@
 import org.springframework.web.bind.annotation.RequestBody;
 
 import javax.validation.Valid;
+import java.util.List;
 import java.util.Objects;
 
 /**
@@ -117,4 +119,17 @@
         }
         return baseApprovalService.failUpdate(request);
     }
+
+    public List<O> exportList(@RequestBody @Valid R request) throws Exception {
+        List<O> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = baseApprovalService.listExportByIds(request.getIds());
+        } else {
+            list = baseApprovalService.listExport(request);
+        }
+        for (O record : list) {
+            DictCodeUtils.convertDictCodeToName(record);
+        }
+        return list;
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java
index 8a90961..d775831 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java
@@ -5,6 +5,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.business.certificate.CertificateChangeApplyApprovalListRequest;
 import com.casic.missiles.dto.business.certificate.CertificateChangeApplySaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessCertificateChangeApply;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
@@ -20,6 +21,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -48,4 +50,12 @@
         }
         return changeApplyService.saveChangeApply(request);
     }
+
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody CertificateChangeApplyApprovalListRequest request) throws Exception {
+        List<BizBusinessCertificateChangeApply> list = super.exportList(request);
+        super.exportExcel(BizBusinessCertificateChangeApply.class, list, ExportEnum.CERTIFICATE_CHANGE_APPLY.getSheetName());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java
index 5fc4b07..af8230e 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java
@@ -9,6 +9,7 @@
 import com.casic.missiles.dto.business.certificate.CertificatePrintApprovalListRequest;
 import com.casic.missiles.dto.business.certificate.CertificatePrintListResponse;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.enums.business.CertificatePrintStatusEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessCertificatePrintLog;
@@ -18,10 +19,16 @@
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.io.IOException;
+import java.util.List;
 import java.util.Objects;
 
 /**
@@ -98,4 +105,16 @@
         });
         return certificatePrintService.certificatePrintLog(idDTO.getId());
     }
+
+    @ApiOperation("证书打印审批导出")
+    @PostMapping("/listExport")
+    public void exportList(@RequestBody CertificatePrintApprovalListRequest request) throws IOException {
+        List<CertificatePrintListResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = certificatePrintService.listByIds(request.getIds());
+        } else {
+            list = certificatePrintService.list(request);
+        }
+        super.exportExcel(CertificatePrintListResponse.class, list, ExportEnum.CERTIFICATE_PRINT.getSheetName());
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java
index 63b06dc..6b2efd5 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java
@@ -6,6 +6,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.business.certificate.CertificateReportApprovalListRequest;
 import com.casic.missiles.dto.business.certificate.CertificateReportSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessCertificateReport;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
@@ -21,6 +22,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -50,7 +52,7 @@
         return certificateReportService.saveCertificateReport(request);
     }
 
-    @ApiOperation("证书审批详情（基本信息）")
+    @ApiOperation("详情（基本信息）")
     @PostMapping("/detail")
     public ReturnDTO<BizBusinessCertificateReport> detail(@RequestBody @Valid BaseDetailRequest request, BindingResult bindingResult) throws Exception {
         if(bindingResult.hasErrors()){
@@ -59,4 +61,11 @@
         return certificateReportService.detail(request);
     }
 
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody CertificateReportApprovalListRequest request) throws Exception {
+        List<BizBusinessCertificateReport> list = super.exportList(request);
+        super.exportExcel(BizBusinessCertificateReport.class, list, ExportEnum.CERTIFICATE_REPORT.getSheetName());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java
index 46b26bd..57c0809 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java
@@ -10,20 +10,21 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.business.identify.IdentifyListRequest;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessIdentifyInfo;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.business.IBizBusinessIdentifyInfoService;
+import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import javax.validation.Valid;
+import java.util.List;
 import java.util.Objects;
 
 /**
@@ -57,16 +58,13 @@
         return identifyInfoService.addIdentify(identifyInfo);
     }
 
-    @ApiOperation("标识打印更新")
+    @ApiOperation("标识打印更新（更新打印时间）")
     @PostMapping("/update")
-    public ReturnDTO updateIdentify(@RequestBody @Valid BizBusinessIdentifyInfo identifyInfo, BindingResult bindingResult) {
-        Assert.isFalse(Objects.isNull(identifyInfo.getId()), () -> {
+    public ReturnDTO updateIdentify(@RequestBody @Valid IdDTO idDTO) {
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        Assert.isFalse(bindingResult.hasErrors(), () -> {
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        });
-        return identifyInfoService.updateIdentify(identifyInfo);
+        return identifyInfoService.updateIdentify(idDTO.getId());
     }
 
     @ApiOperation("标识打印删除")
@@ -77,4 +75,37 @@
         });
         return identifyInfoService.deleteIdentify(idDTO.getId());
     }
+
+    @ApiOperation("标识打印导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody @Valid IdentifyListRequest request, BindingResult bindingResult) throws Exception {
+        if (bindingResult.hasErrors()) {
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        List<BizBusinessIdentifyInfo> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = identifyInfoService.listByIds(request.getIds());
+        } else {
+            list = identifyInfoService.list(request);
+        }
+        for (BizBusinessIdentifyInfo record : list) {
+            DictCodeUtils.convertDictCodeToName(record);
+        }
+        super.exportExcel(BizBusinessIdentifyInfo.class, list, ExportEnum.IDENTIFY_EXPORT.getSheetName());
+    }
+
+
+    // TODO: 2023/8/23 查询设备信息，4个底部按钮查设备（按钮的作用就是前端用来调不同接口、用来区分中间即将展示的标识），前端弹窗选设备，在确定保存时前端根据底部按钮判断传入设备类型deviceType字典code
+    // TODO: 2023/8/23 接口：查受检设备（第1个按钮），查设备台账（后3个按钮同一接口），查询之后前端根据标志类型的不同加到中间页面时进行判断（按产品给的对应表）
+    // TODO: 2023/8/23 提供二维码接口，前端在加到中间页面时调用一下
+
+    @ApiOperation("设备二维码")
+    @PostMapping("/equipment/qrCode")
+    public ReturnDTO<String> equipmentQrCode(@RequestBody @Valid IdDTO idDTO) {
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return identifyInfoService.equipmentQrCode(idDTO.getId());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java
index 707be6e..7e0453d 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java
@@ -117,7 +117,7 @@
     }
 
     @ApiOperation("任务单导出")
-    @PostMapping("/export")
+    @PostMapping("/listExport")
     public void orderExport(@RequestBody @Valid OrderListRequest request, HttpServletResponse response) {
         businessOrderService.orderExport(request, response);
     }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java
index 529a6ce..51432be 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java
@@ -1,9 +1,28 @@
 package com.casic.missiles.controller.business;
 
+import com.casic.missiles.controller.GeneralApprovalController;
+import com.casic.missiles.dto.BaseApprovalSubmitRequest;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.business.outsource.OutsourceAssessApprovalListRequest;
+import com.casic.missiles.dto.business.outsource.OutsourceAssessSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
+import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.model.business.BizBusinessOutsourceAssess;
+import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
+import com.casic.missiles.service.IGeneralApprovalService;
+import com.casic.missiles.service.business.IBizBusinessOutsourceAssessService;
 import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.BindingResult;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.validation.Valid;
+import java.util.List;
+
 /**
  * <p>
  * 计量检定业务-分包管理-测试、校准或检定工作分包评审表 前端控制器
@@ -15,6 +34,27 @@
 @Api(tags = "分包管理-测试、校准或检定工作分包评审表")
 @RestController
 @RequestMapping("/business/outsource/assess")
-public class BizBusinessOutsourceAssessController {
+public class BizBusinessOutsourceAssessController extends GeneralApprovalController<BizBusinessOutsourceAssess, BizBusinessOutsourceAssess, OutsourceAssessApprovalListRequest, BaseApprovalSubmitRequest> {
+    @Autowired
+    private IBizBusinessOutsourceAssessService outsourceAssessService;
 
+    public BizBusinessOutsourceAssessController(IGeneralApprovalService<BizBusinessOutsourceAssess, BizBusinessOutsourceAssess, OutsourceAssessApprovalListRequest, BaseApprovalSubmitRequest> baseApprovalService) {
+        super(baseApprovalService);
+    }
+
+    @ApiOperation("草稿箱-保存")
+    @PostMapping("/save")
+    public ReturnDTO<OutsourceAssessSaveResponse> saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceAssess request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        return outsourceAssessService.saveOutsourceAssess(request);
+    }
+
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception {
+        List<BizBusinessOutsourceAssess> list = super.exportList(request);
+        super.exportExcel(BizBusinessOutsourceAssess.class, list, ExportEnum.OUTSOURCE_ASSESS.getSheetName());
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java
new file mode 100644
index 0000000..9adef18
--- /dev/null
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java
@@ -0,0 +1,60 @@
+package com.casic.missiles.controller.business;
+
+import com.casic.missiles.controller.GeneralApprovalController;
+import com.casic.missiles.dto.BaseApprovalSubmitRequest;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.business.outsource.OutsourceProtocolApprovalListRequest;
+import com.casic.missiles.dto.business.outsource.OutsourceProtocolSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
+import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.model.business.BizBusinessOutsourceProtocol;
+import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
+import com.casic.missiles.service.IGeneralApprovalService;
+import com.casic.missiles.service.business.IBizBusinessOutsourceProtocolService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.BindingResult;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.validation.Valid;
+import java.util.List;
+
+/**
+ * <p>
+ * 计量检定业务-分包管理-测试、校准或检定工作分包协议书 前端控制器
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-08-24
+ */
+@Api(tags = "分包管理-测试、校准或检定工作分包协议书")
+@RestController
+@RequestMapping("/business/outsource/protocol")
+public class BizBusinessOutsourceProtocolController extends GeneralApprovalController<BizBusinessOutsourceProtocol, BizBusinessOutsourceProtocol, OutsourceProtocolApprovalListRequest, BaseApprovalSubmitRequest> {
+    @Autowired
+    private IBizBusinessOutsourceProtocolService outsourceProtocolService;
+
+    public BizBusinessOutsourceProtocolController(IGeneralApprovalService<BizBusinessOutsourceProtocol, BizBusinessOutsourceProtocol, OutsourceProtocolApprovalListRequest, BaseApprovalSubmitRequest> baseApprovalService) {
+        super(baseApprovalService);
+    }
+
+    @ApiOperation("草稿箱-保存")
+    @PostMapping("/save")
+    public ReturnDTO<OutsourceProtocolSaveResponse> saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceProtocol request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        return outsourceProtocolService.saveOutsourceProtocol(request);
+    }
+
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody OutsourceProtocolApprovalListRequest request) throws Exception {
+        List<BizBusinessOutsourceProtocol> list = super.exportList(request);
+        super.exportExcel(BizBusinessOutsourceProtocol.class, list, ExportEnum.OUTSOURCE_PROTOCOL.getSheetName());
+    }
+}
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java
index 097f645..f0f0943 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java
@@ -17,7 +17,6 @@
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.IGeneralApprovalService;
 import com.casic.missiles.service.business.IBizBusinessOutsourcerInfoService;
-import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -71,19 +70,8 @@
 
     @ApiOperation("分包方导出")
     @PostMapping("/listExport")
-    public void export(@RequestBody @Valid OutsourcerInfoApprovalListRequest request, BindingResult bindingResult) throws Exception {
-        if (bindingResult.hasErrors()) {
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        }
-        List<BizBusinessOutsourcerInfo> list;
-        if (!CollectionUtils.isEmpty(request.getIds())) {
-            list = outsourcerInfoService.listByIds(request.getIds());
-        } else {
-            list = outsourcerInfoService.list(request);
-        }
-        for (BizBusinessOutsourcerInfo record : list) {
-            DictCodeUtils.convertDictCodeToName(record);
-        }
+    public void export(@RequestBody OutsourcerInfoApprovalListRequest request) throws Exception {
+        List<BizBusinessOutsourcerInfo> list = super.exportList(request);
         super.exportExcel(BizBusinessOutsourcerInfo.class, list, ExportEnum.OUTSOURCER_EXPORT.getSheetName());
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java
index c2cbf9f..0410918 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java
@@ -17,11 +17,9 @@
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.IGeneralApprovalService;
 import com.casic.missiles.service.business.IBizBusinessSiteExecutiveInfoService;
-import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -60,7 +58,7 @@
         return siteExecutiveInfoService.saveSiteExecutiveInfo(siteExecutiveInfo);
     }
 
-    @ApiOperation("现场检测详情")
+    @ApiOperation("详情")
     @PostMapping("/detail")
     public ReturnDTO<SiteExecutiveDetailResponse> siteExecutiveDetail(@RequestBody @Valid IdDTO idDTO) throws Exception {
         Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
@@ -69,21 +67,10 @@
         return ReturnUtil.success(siteExecutiveInfoService.detail(idDTO.getId()));
     }
 
-    @ApiOperation("现场检测导出")
+    @ApiOperation("导出")
     @PostMapping("/listExport")
-    public void export(@RequestBody @Valid SiteExecutiveApprovalListRequest request, BindingResult bindingResult) throws Exception {
-        if (bindingResult.hasErrors()) {
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        }
-        List<SiteExecutiveApprovalListResponse> list;
-        if (!CollectionUtils.isEmpty(request.getIds())) {
-            list = siteExecutiveInfoService.listInfoByIds(request.getIds());
-        } else {
-            list = siteExecutiveInfoService.listInfo(request);
-        }
-        for (SiteExecutiveApprovalListResponse record : list) {
-            DictCodeUtils.convertDictCodeToName(record);
-        }
+    public void export(@RequestBody SiteExecutiveApprovalListRequest request) throws Exception {
+        List<SiteExecutiveApprovalListResponse> list = super.exportList(request);
         super.exportExcel(SiteExecutiveApprovalListResponse.class, list, ExportEnum.SITE_EXECUTIVE_EXPORT.getSheetName());
     }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
index 7e793cd..a92e209 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
@@ -55,7 +55,7 @@
 
     @ApiOperation("设备收发列表导出")
     @PostMapping("/export")
-    public void exportList(@RequestBody @Valid SampleDispatchListRequest request) throws IOException {
+    public void exportList(@RequestBody SampleDispatchListRequest request) throws IOException {
         List<SampleDispatchListResponse> list;
         if (!CollectionUtils.isEmpty(request.getIds())) {
             list = dispatchService.listByIds(request.getIds());
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java
index cdc77fc..d120fd4 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java
@@ -7,6 +7,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.business.labExecutive.*;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.business.IBusinessLabExecutiveInfoService;
@@ -14,6 +15,7 @@
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.*;
 
@@ -32,7 +34,7 @@
     @Autowired
     private IBusinessLabExecutiveInfoService labExecutiveInfoService;
 
-    @ApiOperation("实验室检测-部门检测-查询各状态列表（待检测、检测中、检测完）")
+    @ApiOperation("实验室任务-查询各状态列表（待检测、检测中、检测完）")
     @PostMapping("/deptExecutive/List")
     public ReturnDTO<PageInfoBT<SampleLabExecutiveListResponse>> queryDeptExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
@@ -43,10 +45,19 @@
         return ReturnUtil.success(super.packForBT(labExecutiveInfoService.deptLabExecutiveListPage(page, labExecutiveListRequest)));
     }
 
-    /**
-     * 实验室检测-我的检测-查询各状态列表（待检测、检测中、检测完）
-     */
-    @ApiOperation("实验室检测-我的检测-查询各状态列表（待检测、检测中、检测完）")
+    @ApiOperation("实验室任务导出")
+    @PostMapping("/deptExecutive/export")
+    public void deptExportList(@RequestBody @Valid SampleLabExecutiveListRequest request) throws Exception {
+        List<SampleLabExecutiveListResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = labExecutiveInfoService.deptLabExecutiveListByIds(request.getMeasureStatus(), request.getIds());
+        } else {
+            list = labExecutiveInfoService.deptLabExecutiveList(request);
+        }
+        super.exportExcel(SampleLabExecutiveListResponse.class, list, ExportEnum.DEPT_EXECUTIVE_TASK.getSheetName());
+    }
+
+    @ApiOperation("我的任务-查询各状态列表（待检测、检测中、检测完）")
     @PostMapping("/myExecutive/list")
     public ReturnDTO<PageInfoBT<SampleLabExecutiveListResponse>> queryMyExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
@@ -57,19 +68,25 @@
         return ReturnUtil.success(super.packForBT(labExecutiveInfoService.myLabExecutiveListPage(page, labExecutiveListRequest)));
     }
 
-    /**
-     * 实验室检测-我的检测-查询各状态样品数量（待检测、检测中、检测完）
-     */
-    @ApiOperation("实验室检测-我的检测-查询各状态样品数量（待检测、检测中、检测完）")
+    @ApiOperation("我的任务导出")
+    @PostMapping("/myExecutive/export")
+    public void exportList(@RequestBody @Valid SampleLabExecutiveListRequest request) throws Exception {
+        List<SampleLabExecutiveListResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = labExecutiveInfoService.myLabExecutiveListByIds(request.getMeasureStatus(), request.getIds());
+        } else {
+            list = labExecutiveInfoService.myLabExecutiveList(request);
+        }
+        super.exportExcel(SampleLabExecutiveListResponse.class, list, ExportEnum.MY_EXECUTIVE_TASK.getSheetName());
+    }
+
+    @ApiOperation("我的任务-查询各状态样品数量（待检测、检测中、检测完）")
     @GetMapping("/myExecutive/amount")
     public ReturnDTO<List<SampleAmountResponse>> queryMyExecutiveAmount() {
         return ReturnUtil.success(labExecutiveInfoService.myExecutiveAmount());
     }
 
-    /**
-     * 实验室检测-部门检测-分配（分配给具体人员）
-     */
-    @ApiOperation("实验室检测-部门检测-分配按钮（分配给具体人员）")
+    @ApiOperation("实验室任务-分配按钮（分配给具体人员）")
     @PostMapping("/deptExecutive/allocate")
     public ReturnDTO allocateStaff(@RequestBody @Valid SampleAllocateRequest sampleAllocateRequest, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -78,10 +95,7 @@
         return labExecutiveInfoService.allocateStaff(sampleAllocateRequest);
     }
 
-    /**
-     * 实验室检测-我的检测-检定人扫描收入（待检测->检测中）
-     */
-    @ApiOperation("实验室检测-我的检测-检定人扫描收入（待检测->检测中）")
+    @ApiOperation("我的任务-检定人扫描收入（待检测->检测中）")
     @PostMapping("/myExecutive/receive")
     public ReturnDTO sampleReceive(@RequestBody @Valid List<SampleOperateRequest> requestList, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -90,10 +104,7 @@
         return labExecutiveInfoService.sampleReceive(requestList);
     }
 
-    /**
-     * 实验室检测-负责人/检定人扫描检完（检测中->检测完）
-     */
-    @ApiOperation("实验室检测-负责人/检定人扫描检完（检测中->检测完）")
+    @ApiOperation("实验室任务-负责人/检定人扫描检完（检测中->检测完）")
     @PostMapping("/myExecutive/complete")
     public ReturnDTO sampleExecutiveComplete(@RequestBody @Valid List<SampleOperateRequest> requestList, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -102,10 +113,7 @@
         return labExecutiveInfoService.sampleExecutiveComplete(requestList);
     }
 
-    /**
-     * 实验室检测-部门检测/我的检测 编辑（只能修改应出具证书）
-     */
-    @ApiOperation("实验室检测-部门检测/我的检测 编辑（只能修改应出具证书）")
+    @ApiOperation("实验室任务/我的任务 编辑（只能修改应出具证书）")
     @PostMapping("/executive/update")
     public ReturnDTO updateExecutive(@RequestBody @Valid UpdateExecutiveRequest request, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -114,10 +122,7 @@
         return labExecutiveInfoService.updateExecutive(request);
     }
 
-    /**
-     * 实验室检测-部门检测/我的检测 详情
-     */
-    @ApiOperation("实验室检测-部门检测/我的检测 详情")
+    @ApiOperation("实验室任务/我的任务 详情")
     @PostMapping("/executive/detail")
     public ReturnDTO<ExecutiveDetailResponse> executiveDetail(@RequestBody @Valid ExecutiveDetailRequest request, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
@@ -131,7 +136,7 @@
      * 退回后会将下一个要执行的实验室检测状态更新为待分配，将后面的实验室顺序变更为连续（都进行减1）
      * 最后一个检测的实验室退回，等分发员再增加实验室或设备收发中的已收入直接手动点击完成
      */
-    @ApiOperation("实验室检测-部门检测/我的检测 退回（待检测/检测中->退回）")
+    @ApiOperation("实验室任务/我的任务 退回（待检测/检测中->退回）")
     @PostMapping("/executive/sendBack")
     public ReturnDTO executiveSendBack(@RequestBody @Valid ExecutiveSendBackRequest request, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -140,9 +145,6 @@
         return labExecutiveInfoService.sampleExecutiveSendBack(request);
     }
 
-    /**
-     * 分发员编辑实验室检测列表
-     */
     @ApiOperation("分发员编辑实验室检测列表")
     @PostMapping("/handOut/updateList")
     public ReturnDTO updateExecutiveList(@RequestBody @Valid UpdateExecutiveListRequest request, BindingResult bindingResult) {
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java
index 48a67ed..0c04f31 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java
@@ -10,6 +10,7 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.resource.customer.CustomerApprovalListRequest;
 import com.casic.missiles.dto.resource.customer.CustomerSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceCustomerInfo;
@@ -26,6 +27,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -55,6 +57,13 @@
         return customerInfoService.saveCustomerInfo(request);
     }
 
+    @ApiOperation("委托方名录导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody CustomerApprovalListRequest request) throws Exception {
+        List<BizResourceCustomerInfo> list = super.exportList(request);
+        super.exportExcel(BizResourceCustomerInfo.class, list, ExportEnum.CUSTOMER_INFO.getSheetName());
+    }
+
     @ApiOperation("委托方人员列表（分页）")
     @PostMapping("/person/listPage")
     public ReturnDTO<PageInfoBT<BizResourceCustomerStaff>> personListPage(@RequestBody IdDTO idDto) {
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
index 972ed4b..6418ea5 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
@@ -5,6 +5,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.resource.customer.SuggestFormApprovalListRequest;
 import com.casic.missiles.dto.resource.customer.SuggestFormSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceCustomerSuggestForm;
@@ -20,6 +21,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -50,4 +52,11 @@
         return suggestFormService.saveSuggestForm(request);
     }
 
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody SuggestFormApprovalListRequest request) throws Exception {
+        List<BizResourceCustomerSuggestForm> list = super.exportList(request);
+        super.exportExcel(BizResourceCustomerSuggestForm.class, list, ExportEnum.CUSTOMER_SUGGEST_FORM.getSheetName());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java
index 1934d1a..9e07eab 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java
@@ -15,12 +15,16 @@
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.resource.IEnvEnvironmentRecordConfigService;
 import com.casic.missiles.service.resource.IEnvEnvironmentRecordDataService;
+import com.casic.missiles.service.resource.IEnvLocationInfoService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
 import java.util.List;
@@ -39,6 +43,8 @@
     private IEnvEnvironmentRecordDataService environmentRecordDataService;
     @Autowired
     private IEnvEnvironmentRecordConfigService environmentRecordConfigService;
+    @Autowired
+    private IEnvLocationInfoService locationInfoService;
 
     @ApiOperation("环境记录单数据列表/详情")
     @PostMapping("/data/listPage")
@@ -95,4 +101,11 @@
         });
         return environmentRecordConfigService.deleteEnvironmentRecordConfig(idDTO.getId());
     }
+
+    @ApiOperation("地点列表")
+    @PostMapping("/location/listPage")
+    public ReturnDTO<PageInfoBT<LocationListResponse>> locationListPage(@RequestBody @Valid LocationListRequest request) {
+        Page<LocationListResponse> page = PageFactory.defaultPage();
+        return ReturnUtil.success(super.packForBT(locationInfoService.listPage(page, request)));
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java
index 82efe3f..e9561fa 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java
@@ -10,6 +10,7 @@
 import com.casic.missiles.dto.resource.seal.SealLogListRequest;
 import com.casic.missiles.dto.resource.seal.SealNoteApprovalListRequest;
 import com.casic.missiles.dto.resource.seal.SealNoteSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceSealUseLog;
@@ -27,6 +28,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -58,6 +60,13 @@
         return sealUseNoteService.saveSeal(request);
     }
 
+    @ApiOperation("印章使用登记导出（列表和导出中去掉经办人和监印人）")
+    @PostMapping("/listExport")
+    public void export(@RequestBody SealNoteApprovalListRequest request) throws Exception {
+        List<BizResourceSealUseNote> list = super.exportList(request);
+        super.exportExcel(BizResourceSealUseNote.class, list, ExportEnum.SEAL_NOTE.getSheetName());
+    }
+
     // TODO: 2023/7/28 印章使用日志：系统中使用印章时插入数据库
 
     @ApiOperation("印章使用日志列表（分页）")
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java
index 9b674fc..06b6521 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java
@@ -9,16 +9,20 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.resource.staff.StaffCertRequest;
 import com.casic.missiles.dto.resource.staff.StaffCertResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.service.resource.IBizResourceStaffInfoService;
 import com.casic.missiles.service.resource.IBizResourceStaffVerifierService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.List;
+
 /**
  * @Description:
  * @Author: wangpeng
@@ -41,9 +45,21 @@
         return ReturnUtil.success(super.packForBT(responsePage));
     }
 
+    @ApiOperation("证书逾期提醒导出")
+    @PostMapping("/listExport")
+    public void exportList(@RequestBody StaffCertRequest request) throws Exception {
+        List<StaffCertResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = staffInfoService.certListByIds(request.getIds());
+        } else {
+            list = staffInfoService.certList(request);
+        }
+        super.exportExcel(StaffCertResponse.class, list, ExportEnum.STAFF_CERTIFICATE_EXPIRE.getSheetName());
+    }
+
     @ApiOperation("证书逾期提醒")
     @PostMapping("/expirationReminder")
-    public ReturnDTO expirationReminder(@RequestBody IdDTO idDto) {
-        return verifierService.expirationReminder(idDto);
+    public ReturnDTO expirationReminder(@RequestBody IdDTO idDTO) {
+        return verifierService.expirationReminder(idDTO);
     }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java
index 3b251ad..a6e7850 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java
@@ -12,6 +12,7 @@
 import com.casic.missiles.dto.resource.staff.StaffListRequest;
 import com.casic.missiles.dto.resource.staff.TrainListRequest;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.*;
@@ -22,7 +23,10 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
 import java.util.List;
@@ -52,8 +56,19 @@
             throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
         }
         Page<BizResourceStaffInfo> page = PageFactory.defaultPage();
-        Page<BizResourceStaffInfo> responsePage = staffInfoService.listPage(page, request);
-        return ReturnUtil.success(super.packForBT(responsePage));
+        return ReturnUtil.success(super.packForBT(staffInfoService.listPage(page, request)));
+    }
+
+    @ApiOperation("人员登记导出")
+    @PostMapping("/listExport")
+    public void exportList(@RequestBody StaffListRequest request) throws Exception {
+        List<BizResourceStaffInfo> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = staffInfoService.listByIds(request.getIds());
+        } else {
+            list = staffInfoService.list(request);
+        }
+        super.exportExcel(BizResourceStaffInfo.class, list, ExportEnum.STAFF_INFO.getSheetName());
     }
 
     @ApiOperation("人员登记详情基础信息")
@@ -85,9 +100,9 @@
 
     @ApiOperation("科研教育列表（分页）")
     @PostMapping("/education/listPage")
-    public ReturnDTO<PageInfoBT<BizResourceStaffEducation>> educationListPage(@RequestBody IdDTO idDto) {
+    public ReturnDTO<PageInfoBT<BizResourceStaffEducation>> educationListPage(@RequestBody IdDTO idDTO) {
         Page<BizResourceStaffEducation> page = PageFactory.defaultPage();
-        Page<BizResourceStaffEducation> responsePage = staffInfoService.educationListPage(page, idDto);
+        Page<BizResourceStaffEducation> responsePage = staffInfoService.educationListPage(page, idDTO);
         return ReturnUtil.success(super.packForBT(responsePage));
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java
index af6aa86..d85d84a 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java
@@ -9,6 +9,7 @@
 import com.casic.missiles.dto.resource.outsideService.SupplierApprovalListRequest;
 import com.casic.missiles.dto.resource.outsideService.SupplierSaveResponse;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceSupplierAbility;
@@ -67,6 +68,13 @@
         return ReturnUtil.success(supplierInfoService.detail(idDTO.getId()));
     }
 
+    @ApiOperation("合格供方导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody SupplierApprovalListRequest request) throws Exception {
+        List<BizResourceSupplierInfo> list = super.exportList(request);
+        super.exportExcel(BizResourceSupplierInfo.class, list, ExportEnum.SUPPLIER_INFO.getSheetName());
+    }
+
     @ApiOperation("供方人员列表（分页）")
     @PostMapping("/person/listPage")
     public ReturnDTO<PageInfoBT<BizResourceSupplierPerson>> personListPage(@RequestBody IdDTO idDTO) {
diff --git a/casic-metering-api/src/main/resources/config/application.yml b/casic-metering-api/src/main/resources/config/application.yml
index 350db5f..ecff521 100644
--- a/casic-metering-api/src/main/resources/config/application.yml
+++ b/casic-metering-api/src/main/resources/config/application.yml
@@ -126,7 +126,7 @@
     #作者
     author: wangpeng
     #待生成对象表名
-    table-name: biz_equipment_technical_target_approval,biz_equipment_attachment_approval,biz_equipment_checkpoint_approval
+    table-name: biz_business_outsource_protocol
 
 reminder:
   #节点--common模块config包 ReminderNodeConfig配置
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
index 4a19e4e..d47d552 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
@@ -53,6 +53,7 @@
     SUGGEST_FORM_SAVE_FAILED(2509, "委托方意见登记表保存至草稿箱失败"),
     EXAMINE_FORM_SAVE_FAILED(2510, "要求、委托书及合同评审表保存至草稿箱失败"),
     CUSTOMER_EXIST_SAVE_FAILED(2511, "该委托方已存在，请重新选择"),
+    DUPLICATE_LOCATION_NO(2512, "地点编号已存在"),
 
     /**
      * 计量检定业务模块
@@ -68,6 +69,8 @@
     COMPLETE_SAMPLE_NOT_EXIST(2609, "检测中不存在扫描收入的样品"),
     CANNOT_CHANGE_MEASURE_INFO(2610, "无法更改非当前登录用户的检测信息"),
     NON_EXIST_ORDER_OR_SAMPLE(2611, "不存在该委托单或该委托单下的样品"),
+    OUTSOURCE_ACCESS_SAVE_FAILED(2612, "测试、校准或检定工作分包评审表保存至草稿箱失败"),
+    OUTSOURCE_PROTOCOL_SAVE_FAILED(2613, "测试、校准或检定工作分包协议书保存至草稿箱失败"),
 
     /**
      * 历史遗留备用
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
index 5089ad1..81a406b 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
@@ -10,54 +10,38 @@
     /**
      * 资源管理
      */
-    ENVIRONMENT_DATA_EXPORT("environmentData", "environmentData", "环境记录单数据"),
+    ENVIRONMENT_DATA_EXPORT("environmentData", "环境记录单数据", "环境记录单数据"),
+    STAFF_INFO("staffInfo", "人员登记", "人员登记"),
+    STAFF_CERTIFICATE_EXPIRE("certificateExpire", "证书逾期提醒", "证书逾期提醒"),
+    SUPPLIER_INFO("supplierInfo", "合格供方名录", "合格供方名录"),
+    CUSTOMER_INFO("customerInfo", "委托方名录", "委托方名录"),
+    CUSTOMER_SUGGEST_FORM("customerSuggestForm", "委托方意见登记表", "委托方意见登记表"),
+    SEAL_NOTE("sealNote", "印章使用登记", "印章使用登记"),
 
-    FILE_EXPORT("meterFileData", "meterFileData", "计量文件信息"),
-    TRAIN_PLAN_EXPORT("trainPlanData", "trainPlanData", "培训计划"),
-    TRAIN_LOG_EXPORT("trainLogData", "trainLogData", "培训记录"),
-    METER_ORGANIZE_EXPORT("meterOrganizeData", "meterOrganizeData", "计量组织"),
-    TRACE_SUPPLIER_EXPORT("traceSupplierData", "traceSupplierData", "溯源供方"),
-    SIGN_EXPORT("signData", "signData", "签名/签章"),
-    TEMPLATE_EXPORT("templateData", "templateData", "原始记录模板/证书报告模板"),
-    FIXED_ASSETS("meterFixedAssets", "meterFixedAssets", "固定资产"),
-    METER_EQUIPMENT("meterEquipment", "meterEquipment", "测量设备"),
-    CALIBRATION_TEST_EQUIPMENT("calibrationTestEquipment", "calibrationTestEquipment", "校准检定设备"),
-    MEASURE_ACCOUNT("measureAccount", "measureAccount", "测量工装"),
-    STANDARD_SUPPORT_EQUIPMENT("standardSupportEquipment", "standardSupportEquipment", "标准配套设备"),
-    STANDARD_EQUIPMENT("standardEquipment", "standardEquipment", "标准装置"),
-    FLOW_DEF_EXPORT("flowDefData", "flowDefData", "流程定义"),
-    STAFF_CERTIFICATE("certificate", "certificate", "计量人员证书"),
-    CHECK_INFO("checkInfo", "checkInfo", "设备管理点检测"),
-    EQUIPMENT_APPLY("equipmentApply", "equipmentApply", "设备借用"),
-    STANDARD_EQUIPMENT_REMIND("equipmentApplyRemind", "equipmentApplyRemind", "标准装置到期提醒"),
-    METER_PRICE("meterPrice", "meterPrice", "价格库"),
-    METER_STAFF("meterStaff", "meterStaff", "计量人员"),
-    STANDARD_EQUIPMENT_APPLY("standardEquipmentApply", "standardEquipmentApply", "标准装置申请"),
-    STATE_MANAGE_APPLY("stateManage", "stateManage", "状态管理"),
-    METER_ACCEPTANCE_CHECK("acceptanceCheck", "acceptanceCheck", "设备检修保养验收单"),
-    CUSTOMER_EXPORT("customerData", "customerData", "客户信息"),
-    ORDER_EXPORT("orderData", "orderData", "委托书信息"),
-    SAMPLE_EXPORT("sampleData", "sampleData", "样本信息"),
-    EXCHANGE_DATA("exchangeData", "exchangeData", "设备交接单"),
-    DISPATCH_DATA("dispatchData", "dispatchData", "设备收发"),
-    ENVIRONMENT_DATA("environmentData", "environmentData", "环境记录单"),
-    ORIGIN_DATA("originData", "originData", "原始记录"),
-    CERTIFICATE_REPORT("certificateReport", "certificateReport", "证书报告"),
-    ADVICE_EXPORT("adviceData", "adviceData", "客户反馈"),
-    HANDOUT_EXPORT("handoutData", "handoutData", "任务分发列表"),
-    OUTSOURCER_EXPORT("outsourcerData", "outsourcerData", "分包方"),
-    SITE_EXECUTIVE_EXPORT("siteExecutiveData", "siteExecutiveData", "现场测试、校准或检定"),
-    CERTIFICATE_PRINT_EXPORT("certificatePrintData", "certificatePrintData", "证书打印"),
-    DOWNLOAD_TEMPLATE("downloadTemplate", "downloadTemplate", "页面配置"),
-    OUTSOURCER_CERTIFICATE_EXPORT("outsourceCertificateData", "outsourceCertificateData", "分包证书"),
-    SETTLEMENT_INFO_EXPORT("settlementInfoData", "settlementInfoData", "业务结算"),
-    EQUIPMENT_REMIND("equipmentRemind", "equipmentRemind", "设备到期提醒"),
-    AGREEMENT_INFO_EXPORT("agreementInfoData", "agreementInfoData", "合同"),
-    WORK_STATISTICS_EXPORT("workStatisticsData", "workStatisticsData", "实时工作统计"),
-    DEPT_OUTPUT_EXPORT("deptOutputData", "deptOutputData", "部门产值分析"),
-    WORKLOAD_EXPORT("workloadData", "workloadData", "业务工作量分析"),
-    DEPT_COMPREHENSIVE_EXPORT("deptComprehensiveData", "deptComprehensiveData", "部门综合分析"),
-    ENVIRONMENTAL_RECORD("environmentalRecordData", "environmentalRecordData", "现场环境记录");
+    /**
+     * 计量检定业务
+     */
+    OUTSOURCER_EXPORT("outsourcerData", "分包方名录", "分包方名录"),
+    IDENTIFY_EXPORT("identifyData", "计量标识", "计量标识"),
+    ORDER_EXPORT("orderData", "任务单", "任务单"),
+    DISPATCH_DATA("dispatchData", "设备收发", "设备收发"),
+    HANDOUT_EXPORT("handoutData", "任务分发", "任务分发"),
+    SITE_EXECUTIVE_EXPORT("siteExecutiveData", "现场测试、校准或检定", "现场测试、校准或检定"),
+    CERTIFICATE_REPORT("certificateReport", "证书审批", "证书审批"),
+    CERTIFICATE_CHANGE_APPLY("certificateChangeApply", "证书报告补充或更换申请单", "证书报告补充或更换申请单"),
+    CERTIFICATE_PRINT("certificatePrintData", "证书打印审批", "证书打印审批"),
+    DEPT_EXECUTIVE_TASK("deptExecutiveTaskData", "实验室任务", "实验室任务"),
+    MY_EXECUTIVE_TASK("myExecutiveTaskData", "我的任务", "我的任务"),
+    OUTSOURCE_ASSESS("outsourceAssess", "测试、校准或检定工作分包评审表", "测试、校准或检定工作分包评审表"),
+    OUTSOURCE_PROTOCOL("outsourceProtocol", "测试、校准或检定工作分包协议书", "测试、校准或检定工作分包协议书"),
+
+    /**
+     * 系统管理
+     */
+    SIGN_EXPORT("signData", "签名", "签名"),
+    TEMPLATE_EXPORT("templateData", "文件模板", "文件模板"),
+    FLOW_DEF_EXPORT("flowDefData", "流程定义", "流程定义"),
+    DOWNLOAD_TEMPLATE("downloadTemplate", "流程定义", "页面配置");
 
     ExportEnum(String fileName, String sheetName, String description) {
         this.fileName = fileName;
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateRecordTypeCodeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateRecordTypeCodeEnum.java
index 31d913c..a963522 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateRecordTypeCodeEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateRecordTypeCodeEnum.java
@@ -46,4 +46,14 @@
     String SITE_EXECUTIVE_APPROVAL = "01";
     //《现场测试、校准或检定工作记录表》
     String SITE_EXECUTIVE_LOG = "02";
+
+    //测试、校准或检定工作分包协议书
+    String OUTSOURCE_PROTOCOL = "01";
+    //测试、校准或检定工作分包评审表
+    String OUTSOURCE_ACCESS = "02";
+    //测试、校准或检定工作分包通知书
+    String OUTSOURCE_NOTICE = "03";
+    //测试、校准或检定工作分包方名录
+    String OUTSOURCE_INFO = "04";
+
 }
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
index 24b8635..f78bd53 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
@@ -15,6 +15,10 @@
     String CERTIFICATE_CHANGE_APPLY_BEAN_NAME = "certificateChangeApplyBean";
     //现场测试、校准或检定
     String SITE_EXECUTIVE_BEAN_NAME = "siteExecutiveBean";
+    //测试、校准或检定工作分包评审表
+    String OUTSOURCE_ASSESS_BEAN_NAME = "outsourceAssessBean";
+    //测试、校准或检定工作分包协议书
+    String OUTSOURCE_PROTOCOL_BEAN_NAME = "outsourceProtocolBean";
 
     /*********************************设备与装置************************************/
     //设备台账
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 b21c661..6b86fd1 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
@@ -18,6 +18,8 @@
     OUTSOURCER_APPROVAL(OUTSOURCER_BEAN_NAME, ""),
     CERTIFICATE_CHANGE_APPROVAL(CERTIFICATE_CHANGE_APPLY_BEAN_NAME, ""),
     SITE_EXECUTIVE_APPROVAL(SITE_EXECUTIVE_BEAN_NAME, ""),
+    OUTSOURCE_ASSESS_APPROVAL(OUTSOURCE_ASSESS_BEAN_NAME, ""),
+    OUTSOURCE_PROTOCOL_APPROVAL(OUTSOURCE_PROTOCOL_BEAN_NAME, ""),
 
     ACTION_STATUS_MAP(new HashMap<String, AwareActionStatusEnum>() {
         {
@@ -47,6 +49,10 @@
             put(ApplyFromIdEnum.CERTIFICATE_CHANGE_APPROVAL.getCode(), CERTIFICATE_CHANGE_APPROVAL);
             //现场测试、校准或检定审批
             put(ApplyFromIdEnum.SITE_EXECUTIVE_APPROVAL.getCode(), SITE_EXECUTIVE_APPROVAL);
+            //测试、校准或检定工作分包评审表
+            put(ApplyFromIdEnum.OUTSOURCE_ASSESS_APPROVAL.getCode(), OUTSOURCE_ASSESS_APPROVAL);
+            //测试、校准或检定工作分包协议书
+            put(ApplyFromIdEnum.OUTSOURCE_PROTOCOL_APPROVAL.getCode(), OUTSOURCE_PROTOCOL_APPROVAL);
         }
     });
     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 934405e..c7410bd 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
@@ -9,6 +9,8 @@
     CERTIFICATE_CHANGE_APPROVAL("jljdywzsbchghsqd", MessageSourceModuleEnum.BUSINESS.getCode(), "证书/报告补充或更换申请单"),
     OUTSOURCER_APPROVAL("jljdywcsjzhgfbfml", MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定合格分包方名录"),
     SITE_EXECUTIVE_APPROVAL("jljdywxccsjzsp", MessageSourceModuleEnum.BUSINESS.getCode(), "现场测试、校准或检定审批"),
+    OUTSOURCE_ASSESS_APPROVAL("jljdywcsjzfbpsb", MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包评审表"),
+    OUTSOURCE_PROTOCOL_APPROVAL("jljdywcsjzfbxys", MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包协议书"),
 
 
     /*******************************************设备与装置*********************************************/
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/GeneralApprovalMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/GeneralApprovalMapper.java
index 4fb7344..0c9d6ae 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/GeneralApprovalMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/GeneralApprovalMapper.java
@@ -17,8 +17,4 @@
 
     Page<O> selectBatchForApprovalList(Page<O> page, @Param("request") R request, @Param("businessKeys") List<String> businessKeys);
 
-//    Page<O> selectListPage(Page<O> page, @Param("request") R request);
-
-//    Long selectMaxNo();
-
 }
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceAssessMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceAssessMapper.java
index 7867bb8..ba59009 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceAssessMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceAssessMapper.java
@@ -1,7 +1,12 @@
 package com.casic.missiles.mapper.business;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.business.outsource.OutsourceAssessApprovalListRequest;
+import com.casic.missiles.mapper.GeneralApprovalMapper;
 import com.casic.missiles.model.business.BizBusinessOutsourceAssess;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * <p>
@@ -11,6 +16,10 @@
  * @author wangpeng
  * @since 2023-08-16
  */
-public interface BizBusinessOutsourceAssessMapper extends BaseMapper<BizBusinessOutsourceAssess> {
+public interface BizBusinessOutsourceAssessMapper extends GeneralApprovalMapper<BizBusinessOutsourceAssess, BizBusinessOutsourceAssess, OutsourceAssessApprovalListRequest> {
+
+    Page<BizBusinessOutsourceAssess> selectBatchForApprovalList(Page<BizBusinessOutsourceAssess> page, @Param("request") OutsourceAssessApprovalListRequest request, @Param("businessKeys") List<String> businessKeys);
+
+    Long selectMaxProjectNo();
 
 }
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceProtocolMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceProtocolMapper.java
new file mode 100644
index 0000000..e6aba35
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceProtocolMapper.java
@@ -0,0 +1,24 @@
+package com.casic.missiles.mapper.business;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.business.outsource.OutsourceProtocolApprovalListRequest;
+import com.casic.missiles.mapper.GeneralApprovalMapper;
+import com.casic.missiles.model.business.BizBusinessOutsourceProtocol;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 计量检定业务-分包管理-测试、校准或检定工作分包协议书 Mapper 接口
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-08-24
+ */
+public interface BizBusinessOutsourceProtocolMapper extends GeneralApprovalMapper<BizBusinessOutsourceProtocol, BizBusinessOutsourceProtocol, OutsourceProtocolApprovalListRequest> {
+
+    Page<BizBusinessOutsourceProtocol> selectBatchForApprovalList(Page<BizBusinessOutsourceProtocol> page, @Param("request") OutsourceProtocolApprovalListRequest request, @Param("businessKeys") List<String> businessKeys);
+
+    Long selectMaxProtocolNo();
+}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/EnvLocationInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/EnvLocationInfoMapper.java
new file mode 100644
index 0000000..49eff87
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/EnvLocationInfoMapper.java
@@ -0,0 +1,21 @@
+package com.casic.missiles.mapper.resource;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.resource.environment.LocationListRequest;
+import com.casic.missiles.dto.resource.environment.LocationListResponse;
+import com.casic.missiles.model.resource.EnvLocationInfo;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * <p>
+ * 实验室环境监控系统-设备表 Mapper 接口
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-06-07
+ */
+public interface EnvLocationInfoMapper extends BaseMapper<EnvLocationInfo> {
+
+    Page<LocationListResponse> selectLocationListPage(Page<LocationListResponse> page, @Param("request") LocationListRequest request);
+}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java
index de124db..85ed0f7 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java
@@ -1,7 +1,9 @@
 package com.casic.missiles.mapper.system;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.dto.system.SignDetailResponse;
+import com.casic.missiles.dto.system.SignListRequest;
 import com.casic.missiles.model.system.SystemSign;
 import org.apache.ibatis.annotations.Param;
 
@@ -22,4 +24,8 @@
     SignDetailResponse selectSignDetailById(Long id);
 
     List<SystemSign> selectUsableSignList(@Param("userId") Long userId);
+
+    Page<SystemSign> selectSignListPage(Page<SystemSign> page, @Param("request") SignListRequest request);
+
+    List<SystemSign> selectSignList(@Param("request") SignListRequest request);
 }
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateChangeApplyMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateChangeApplyMapper.xml
index d798447..c496092 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateChangeApplyMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateChangeApplyMapper.xml
@@ -30,31 +30,31 @@
         SELECT *
         FROM biz_business_certificate_change_apply
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.changeApplyNo != null and request.changeApplyNo !=''">
+        <if test="request != null and request.changeApplyNo != null and request.changeApplyNo !=''">
             and change_apply_no like concat('%',#{request.changeApplyNo},'%')
         </if>
-        <if test="request.changeReportNo != null and request.changeReportNo !=''">
+        <if test="request != null and request.changeReportNo != null and request.changeReportNo !=''">
             and change_report_no like concat('%',#{request.changeReportNo},'%')
         </if>
-        <if test="request.changeReportName != null and request.changeReportName !=''">
+        <if test="request != null and request.changeReportName != null and request.changeReportName !=''">
             and change_report_name like concat('%',#{request.changeReportName},'%')
         </if>
-        <if test="request.changeType != null and request.changeType !=''">
+        <if test="request != null and request.changeType != null and request.changeType !=''">
             and change_type = #{request.changeType}
         </if>
-        <if test="request.createUserName != null and request.createUserName !=''">
+        <if test="request != null and request.createUserName != null and request.createUserName !=''">
             and create_user_name like concat('%',#{request.createUserName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificatePrintMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificatePrintMapper.xml
index b66cd99..49c0ac8 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificatePrintMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificatePrintMapper.xml
@@ -31,34 +31,34 @@
         LEFT JOIN biz_business_order_sample_relation bosr ON (bosr.order_id = bcr.order_id AND bosr.sample_id = bcr.sample_id)
         LEFT JOIN biz_business_order_info boi ON boi.id = bosr.order_id
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and bcp.approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.printStatus != null and request.printStatus !=''">
+        <if test="request != null and request.printStatus != null and request.printStatus !=''">
             and print_status = #{request.printStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and bcp.create_user_id = #{request.createUserId}
         </if>
-        <if test="request.certificateReportNo != null and request.certificateReportNo !=''">
+        <if test="request != null and request.certificateReportNo != null and request.certificateReportNo !=''">
             and bcr.certificate_report_no like concat('%',#{request.certificateReportNo},'%')
         </if>
-        <if test="request.certificateReportName != null and request.certificateReportName !=''">
+        <if test="request != null and request.certificateReportName != null and request.certificateReportName !=''">
             and bcr.certificate_report_name like concat('%',#{request.certificateReportName},'%')
         </if>
-        <if test="request.customerName != null and request.customerName !=''">
+        <if test="request != null and request.customerName != null and request.customerName !=''">
             and boi.customer_name like concat('%',#{request.customerName},'%')
         </if>
-        <if test="request.sampleNo != null and request.sampleNo !=''">
+        <if test="request != null and request.sampleNo != null and request.sampleNo !=''">
             and bosr.sample_no like concat('%',#{request.sampleNo},'%')
         </if>
-        <if test="request.sampleName != null and request.sampleName !=''">
+        <if test="request != null and request.sampleName != null and request.sampleName !=''">
             and bosr.sample_name like concat('%',#{request.sampleName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and bcp.create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and bcp.create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml
index b366034..767695d 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml
@@ -46,33 +46,37 @@
         SELECT bcr.*, bosr.sample_no, bosr.sample_name, bosr.sample_model, rsi.staff_name
         FROM biz_business_certificate_report bcr
         LEFT JOIN biz_business_order_sample_relation bosr ON (bosr.order_id = bcr.order_id AND bosr.sample_id = bcr.sample_id)
+        LEFT JOIN biz_business_order_info boi ON boi.id = bcr.order_id
         LEFT JOIN biz_resource_staff_info rsi ON rsi.id = bcr.measure_person_id
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and bcr.approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and bcr.create_user_id = #{request.createUserId}
         </if>
-        <if test="request.certificateReportNo != null and request.certificateReportNo !=''">
+        <if test="request != null and request.customerId != null and request.customerId !=''">
+            and boi.customer_id = #{request.customerId}
+        </if>
+        <if test="request != null and request.certificateReportNo != null and request.certificateReportNo !=''">
             and bcr.certificate_report_no like concat('%',#{request.certificateReportNo},'%')
         </if>
-        <if test="request.certificateReportName != null and request.certificateReportName !=''">
+        <if test="request != null and request.certificateReportName != null and request.certificateReportName !=''">
             and bcr.certificate_report_name like concat('%',#{request.certificateReportName},'%')
         </if>
-        <if test="request.sampleNo != null and request.sampleNo !=''">
+        <if test="request != null and request.sampleNo != null and request.sampleNo !=''">
             and bosr.sample_no like concat('%',#{request.sampleNo},'%')
         </if>
-        <if test="request.measureCategory != null and request.measureCategory !=''">
+        <if test="request != null and request.measureCategory != null and request.measureCategory !=''">
             and bcr.measure_category = #{request.measureCategory}
         </if>
-        <if test="request.measurePerson != null and request.measurePerson !=''">
+        <if test="request != null and request.measurePerson != null and request.measurePerson !=''">
             and rsi.staff_name like concat('%',#{request.measurePerson},'%')
         </if>
-        <if test="request.calibrationTimeStart != null and request.calibrationTimeStart !=''">
+        <if test="request != null and request.calibrationTimeStart != null and request.calibrationTimeStart !=''">
             and bcr.calibration_time &gt;= #{request.calibrationTimeStart}
         </if>
-        <if test="request.calibrationTimeEnd != null and request.calibrationTimeEnd !=''">
+        <if test="request != null and request.calibrationTimeEnd != null and request.calibrationTimeEnd !=''">
             and bcr.calibration_time &lt;= #{request.calibrationTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceAssessMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceAssessMapper.xml
index d0fcf8b..c22c101 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceAssessMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceAssessMapper.xml
@@ -7,6 +7,8 @@
         <id column="id" property="id" />
         <result column="project_no" property="projectNo" />
         <result column="project_name" property="projectName" />
+        <result column="lab_code" property="labCode" />
+        <result column="group_code" property="groupCode" />
         <result column="applicant_id" property="applicantId" />
         <result column="applicant_name" property="applicantName" />
         <result column="applicant_time" property="applicantTime" />
@@ -31,7 +33,45 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, project_no, project_name, applicant_id, applicant_name, applicant_time, minio_file_name, remark, create_user_id, create_user_name, outsourcer_id, pre_start_time, pre_end_time, outsource_reason, pre_cost, approval_status, process_id, approve_situation, traceability, test_method, technique_ability, create_time, update_time
+        id, project_no, project_name, lab_code, group_code, applicant_id, applicant_name, applicant_time, minio_file_name, remark, create_user_id, create_user_name, outsourcer_id, pre_start_time, pre_end_time, outsource_reason, pre_cost, approval_status, process_id, approve_situation, traceability, test_method, technique_ability, create_time, update_time
     </sql>
 
+    <select id="selectMaxProjectNo" resultType="java.lang.Long">
+        SELECT IFNULL(max(RIGHT(project_no, 3)), 0) from biz_business_outsource_assess
+    </select>
+
+    <select id="selectBatchForApprovalList" resultMap="BaseResultMap">
+        SELECT bboa.*, bboi.outsourcer_name, bboi.director
+        FROM biz_business_outsource_assess bboa
+        LEFT JOIN biz_business_outsourcer_info bboi ON bboa.outsourcer_id = bboi.id
+        WHERE 1=1
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
+            and bboa.approval_status = #{request.approvalStatus}
+        </if>
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
+            and bboa.create_user_id = #{request.createUserId}
+        </if>
+        <if test="request != null and request.projectNo != null and request.projectNo !=''">
+            and bboa.project_no like concat('%',#{request.projectNo},'%')
+        </if>
+        <if test="request != null and request.outsourcerName != null and request.outsourcerName !=''">
+            and bboi.outsourcer_name like concat('%',#{request.outsourcerName},'%')
+        </if>
+        <if test="request != null and request.applicantName != null and request.applicantName !=''">
+            and bboa.applicant_name like concat('%',#{request.applicantName},'%')
+        </if>
+        <if test="request != null and request.applicantTimeStart != null and request.applicantTimeStart !=''">
+            and bboa.applicant_time &gt;= #{request.applicantTimeStart}
+        </if>
+        <if test="request != null and request.applicantTimeEnd != null and request.applicantTimeEnd !=''">
+            and bboa.applicant_time &lt;= #{request.applicantTimeEnd}
+        </if>
+        <if test="businessKeys != null">
+            and bboa.id in
+            <foreach collection="businessKeys" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
+        ORDER BY bboa.create_time DESC
+    </select>
 </mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceProtocolMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceProtocolMapper.xml
new file mode 100644
index 0000000..b7b2149
--- /dev/null
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceProtocolMapper.xml
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.mapper.business.BizBusinessOutsourceProtocolMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.business.BizBusinessOutsourceProtocol">
+        <id column="id" property="id" />
+        <result column="protocol_no" property="protocolNo" />
+        <result column="project_name" property="projectName" />
+        <result column="lab_code" property="labCode" />
+        <result column="group_code" property="groupCode" />
+        <result column="outsourcer_id" property="outsourcerId" />
+        <result column="remark" property="remark" />
+        <result column="outsource_no" property="outsourceNo" />
+        <result column="outsource_name" property="outsourceName" />
+        <result column="contacts" property="contacts" />
+        <result column="mobile" property="mobile" />
+        <result column="address" property="address" />
+        <result column="require_date" property="requireDate" />
+        <result column="outsource_cost" property="outsourceCost" />
+        <result column="director" property="director" />
+        <result column="item" property="item" />
+        <result column="requires" property="requires" />
+        <result column="create_user_id" property="createUserId" />
+        <result column="create_user_name" property="createUserName" />
+        <result column="approval_status" property="approvalStatus" />
+        <result column="process_id" property="processId" />
+        <result column="create_time" property="createTime" />
+        <result column="update_time" property="updateTime" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, protocol_no, project_name, lab_code, group_code, outsourcer_id, remark, outsource_no, outsource_name, contacts, mobile, address, require_date, outsource_cost, director, item, requires, create_user_id, create_user_name, approval_status, process_id, create_time, update_time
+    </sql>
+
+    <select id="selectMaxProtocolNo" resultType="java.lang.Long">
+        SELECT IFNULL(max(RIGHT(protocol_no, 3)), 0) from biz_business_outsource_protocol
+    </select>
+
+    <select id="selectBatchForApprovalList" resultMap="BaseResultMap">
+        SELECT *
+        FROM biz_business_outsource_protocol
+        WHERE 1=1
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
+            and approval_status = #{request.approvalStatus}
+        </if>
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
+            and create_user_id = #{request.createUserId}
+        </if>
+        <if test="request != null and request.protocolNo != null and request.protocolNo !=''">
+            and protocol_no like concat('%',#{request.protocolNo},'%')
+        </if>
+        <if test="request != null and request.outsourcerName != null and request.outsourcerName !=''">
+            and outsourcer_name like concat('%',#{request.outsourcerName},'%')
+        </if>
+        <if test="request != null and request.applicantName != null and request.applicantName !=''">
+            and create_user_name like concat('%',#{request.applicantName},'%')
+        </if>
+        <if test="request != null and request.applicantTimeStart != null and request.applicantTimeStart !=''">
+            and create_time &gt;= #{request.applicantTimeStart}
+        </if>
+        <if test="request != null and request.applicantTimeEnd != null and request.applicantTimeEnd !=''">
+            and create_time &lt;= #{request.applicantTimeEnd}
+        </if>
+        <if test="businessKeys != null">
+            and id in
+            <foreach collection="businessKeys" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
+        ORDER BY create_time DESC
+    </select>
+</mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourcerInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourcerInfoMapper.xml
index 510a80b..3049b54 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourcerInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourcerInfoMapper.xml
@@ -7,6 +7,8 @@
         <id column="id" property="id" />
         <result column="outsourcer_no" property="outsourcerNo" />
         <result column="outsourcer_name" property="outsourcerName" />
+        <result column="lab_code" property="labCode" />
+        <result column="group_code" property="groupCode" />
         <result column="outsourcer_brief_name" property="outsourcerBriefName" />
         <result column="outsourcer_size" property="outsourcerSize" />
         <result column="business_size" property="businessSize" />
@@ -55,32 +57,32 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, outsourcer_no, outsourcer_name, outsourcer_brief_name, outsourcer_size, business_size, grade, evaluation, tax_number, bank_account, bank_name, bank_account_number, postal_code, director, phone, fax, mobile, email, website, address_country, address_province, address_city, address_area, full_address, address_country_name, address_province_name, address_city_name, address_area_name, invoice_country, invoice_province, invoice_city, invoice_area, invoice_full_address, invoice_country_name, invoice_province_name, invoice_city_name, invoice_area_name, business_scope, business_content, minio_file_name, approval_status, process_id, remark, create_user_id, create_user_name, create_time, update_time
+        id, outsourcer_no, outsourcer_name, lab_code, group_code, outsourcer_brief_name, outsourcer_size, business_size, grade, evaluation, tax_number, bank_account, bank_name, bank_account_number, postal_code, director, phone, fax, mobile, email, website, address_country, address_province, address_city, address_area, full_address, address_country_name, address_province_name, address_city_name, address_area_name, invoice_country, invoice_province, invoice_city, invoice_area, invoice_full_address, invoice_country_name, invoice_province_name, invoice_city_name, invoice_area_name, business_scope, business_content, minio_file_name, approval_status, process_id, remark, create_user_id, create_user_name, create_time, update_time
     </sql>
 
     <select id="selectBatchForApprovalList" resultMap="BaseResultMap">
         SELECT *
         FROM biz_business_outsourcer_info
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.outsourcerNo != null and request.outsourcerNo !=''">
+        <if test="request != null and request.outsourcerNo != null and request.outsourcerNo !=''">
             and outsourcer_no like concat('%',#{request.outsourcerNo},'%')
         </if>
-        <if test="request.outsourcerName != null and request.outsourcerName !=''">
+        <if test="request != null and request.outsourcerName != null and request.outsourcerName !=''">
             and outsourcer_name like concat('%',#{request.outsourcerName},'%')
         </if>
-        <if test="request.director != null and request.director !=''">
+        <if test="request != null and request.director != null and request.director !=''">
             and director like concat('%',#{request.director},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
@@ -93,6 +95,6 @@
     </select>
 
     <select id="selectMaxNo" resultType="java.lang.Long">
-        SELECT IFNULL(max(RIGHT(outsourcer_no, 12)), 0) from biz_business_outsourcer_info
+        SELECT IFNULL(max(RIGHT(outsourcer_no, 3)), 0) from biz_business_outsourcer_info
     </select>
 </mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessSiteExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessSiteExecutiveInfoMapper.xml
index 135c5d0..3c5ae79 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessSiteExecutiveInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessSiteExecutiveInfoMapper.xml
@@ -38,25 +38,25 @@
         FROM biz_business_site_executive_info bsei
         LEFT JOIN biz_resource_customer_info rci ON bsei.customer_id = rci.id
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and bsei.approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and bsei.create_user_id = #{request.createUserId}
         </if>
-        <if test="request.siteExecutiveNo != null and request.siteExecutiveNo !=''">
+        <if test="request != null and request.siteExecutiveNo != null and request.siteExecutiveNo !=''">
             and bsei.site_executive_no like concat('%',#{request.siteExecutiveNo},'%')
         </if>
-        <if test="request.customerName != null and request.customerName !=''">
+        <if test="request != null and request.customerName != null and request.customerName !=''">
             and rci.outsourcer_name like concat('%',#{request.customerName},'%')
         </if>
-        <if test="request.applyName != null and request.applyName !=''">
+        <if test="request != null and request.applyName != null and request.applyName !=''">
             and bsei.apply_name like concat('%',#{request.applyName},'%')
         </if>
-        <if test="request.applyTimeStart != null and request.applyTimeStart !=''">
+        <if test="request != null and request.applyTimeStart != null and request.applyTimeStart !=''">
             and bsei.apply_time &gt;= #{request.applyTimeStart}
         </if>
-        <if test="request.applyTimeEnd != null and request.applyTimeEnd !=''">
+        <if test="request != null and request.applyTimeEnd != null and request.applyTimeEnd !=''">
             and bsei.apply_time &lt;= #{request.applyTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml
index 84d9e2a..6bd38a9 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml
@@ -105,6 +105,12 @@
         <if test="request.isUrgent != null and request.isUrgent !=''">
             AND bo.is_urgent = #{request.isUrgent}
         </if>
+        <if test="request.ids != null">
+            and blei.id in
+            <foreach collection="request.ids" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
         ORDER BY blei.update_time DESC
     </select>
 
@@ -137,6 +143,12 @@
         <if test="request.isUrgent != null and request.isUrgent !=''">
             AND bo.is_urgent = #{request.isUrgent}
         </if>
+        <if test="request.ids != null">
+            and blei.id in
+            <foreach collection="request.ids" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
         ORDER BY blei.update_time DESC
     </select>
 
diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardInfoMapper.xml
index 1a5551b..2ed8d17 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardInfoMapper.xml
@@ -45,12 +45,6 @@
         FROM biz_equipment_standard_info besi
         LEFT JOIN biz_equipment_standard_technology_relation bestr ON besi.standard_no = bestr.standard_no
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
-            and besi.approval_status = #{request.approvalStatus}
-        </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
-            and besi.create_user_id = #{request.createUserId}
-        </if>
         <if test="request.standardName != null and request.standardName !=''">
             and besi.standard_name like concat('%',#{request.standardName},'%')
         </if>
diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardTechnologyRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardTechnologyRelationMapper.xml
index fc7e16c..cd03c8c 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardTechnologyRelationMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardTechnologyRelationMapper.xml
@@ -6,6 +6,7 @@
     <resultMap id="BaseResultMap" type="com.casic.missiles.model.equipment.BizEquipmentStandardTechnologyRelation">
         <id column="id" property="id" />
         <result column="technology_file_id" property="technologyFileId" />
+        <result column="technology_file_no" property="technologyFileNo" />
         <result column="technology_file_name" property="technologyFileName" />
         <result column="standard_id" property="standardId" />
         <result column="standard_no" property="standardNo" />
@@ -14,7 +15,7 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, technology_file_id, technology_file_name, standard_id, remark
+        id, technology_file_id, technology_file_no, technology_file_name, standard_id, remark
     </sql>
 
 </mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceAuthorizeOrderMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceAuthorizeOrderMapper.xml
index ac5176c..554fe65 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceAuthorizeOrderMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceAuthorizeOrderMapper.xml
@@ -32,22 +32,22 @@
         SELECT *
         FROM biz_resource_authorize_order
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.orderNo != null and request.orderNo !=''">
+        <if test="request != null and request.orderNo != null and request.orderNo !=''">
             and order_no like concat('%',#{request.orderNo},'%')
         </if>
-        <if test="request.createUserName != null and request.createUserName !=''">
+        <if test="request != null and request.createUserName != null and request.createUserName !=''">
             and create_user_name like concat('%',#{request.createUserName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerExamineFormMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerExamineFormMapper.xml
index ab242f6..af7f98f 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerExamineFormMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerExamineFormMapper.xml
@@ -41,28 +41,28 @@
         SELECT *
         FROM biz_resource_customer_examine_form
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.formNo != null and request.formNo !=''">
+        <if test="request != null and request.formNo != null and request.formNo !=''">
             and form_no like concat('%',#{request.formNo},'%')
         </if>
-        <if test="request.labCode != null and request.labCode !=''">
+        <if test="request != null and request.labCode != null and request.labCode !=''">
             and lab_code like concat('%',#{request.labCode},'%')
         </if>
-        <if test="request.groupCode != null and request.groupCode !=''">
+        <if test="request != null and request.groupCode != null and request.groupCode !=''">
             and group_code like concat('%',#{request.groupCode},'%')
         </if>
-        <if test="request.createUserName != null and request.createUserName !=''">
+        <if test="request != null and request.createUserName != null and request.createUserName !=''">
             and create_user_name like concat('%',#{request.createUserName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerInfoMapper.xml
index fa8ffbc..06a2798 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerInfoMapper.xml
@@ -33,25 +33,25 @@
         SELECT *
         FROM biz_resource_customer_info
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.customerNo != null and request.customerNo !=''">
+        <if test="request != null and request.customerNo != null and request.customerNo !=''">
             and customer_no like concat('%',#{request.customerNo},'%')
         </if>
-        <if test="request.customerName != null and request.customerName !=''">
+        <if test="request != null and request.customerName != null and request.customerName !=''">
             and customer_name like concat('%',#{request.customerName},'%')
         </if>
-        <if test="request.contacts != null and request.contacts !=''">
+        <if test="request != null and request.contacts != null and request.contacts !=''">
             and contacts like concat('%',#{request.contacts},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerSuggestFormMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerSuggestFormMapper.xml
index 28f5bb2..1806662 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerSuggestFormMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerSuggestFormMapper.xml
@@ -33,28 +33,28 @@
         SELECT *
         FROM biz_resource_customer_suggest_form
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.formNo != null and request.formNo !=''">
+        <if test="request != null and request.formNo != null and request.formNo !=''">
             and form_no like concat('%',#{request.formNo},'%')
         </if>
-        <if test="request.customerName != null and request.customerName !=''">
+        <if test="request != null and request.customerName != null and request.customerName !=''">
             and customer_name like concat('%',#{request.customerName},'%')
         </if>
-        <if test="request.customerDeptName != null and request.customerDeptName !=''">
+        <if test="request != null and request.customerDeptName != null and request.customerDeptName !=''">
             and customer_dept_name like concat('%',#{request.customerDeptName},'%')
         </if>
-        <if test="request.createUserName != null and request.createUserName !=''">
+        <if test="request != null and request.createUserName != null and request.createUserName !=''">
             and create_user_name like concat('%',#{request.createUserName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSealUseNoteMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSealUseNoteMapper.xml
index ab37bc1..b02bb33 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSealUseNoteMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSealUseNoteMapper.xml
@@ -29,32 +29,32 @@
     </sql>
 
     <select id="selectBatchForApprovalList" resultMap="BaseResultMap">
-        SELECT *
+        SELECT brsun.*, brsi.seal_name, brsi.seal_type, brsi.approver_name
         FROM biz_resource_seal_use_note brsun
         JOIN biz_resource_seal_info brsi ON brsun.seal_id = brsi.id
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and brsun.approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and brsun.create_user_id = #{request.createUserId}
         </if>
-        <if test="request.sealName != null and request.sealName !=''">
+        <if test="request != null and request.sealName != null and request.sealName !=''">
             and brsi.seal_name like concat('%',#{request.sealName},'%')
         </if>
-        <if test="request.sealType != null and request.sealType !=''">
+        <if test="request != null and request.sealType != null and request.sealType !=''">
             and brsi.seal_type = #{request.sealType}
         </if>
-        <if test="request.applyDeptName != null and request.applyDeptName !=''">
+        <if test="request != null and request.applyDeptName != null and request.applyDeptName !=''">
             and brsun.apply_dept_name like concat('%',#{request.applyDeptName},'%')
         </if>
-        <if test="request.applyUserName != null and request.applyUserName !=''">
+        <if test="request != null and request.applyUserName != null and request.applyUserName !=''">
             and brsun.apply_user_name like concat('%',#{request.applyUserName},'%')
         </if>
-        <if test="request.applyTimeStart != null and request.applyTimeStart !=''">
+        <if test="request != null and request.applyTimeStart != null and request.applyTimeStart !=''">
             and brsun.apply_time &gt;= #{request.applyTimeStart}
         </if>
-        <if test="request.applyTimeEnd != null and request.applyTimeEnd !=''">
+        <if test="request != null and request.applyTimeEnd != null and request.applyTimeEnd !=''">
             and brsun.apply_time &lt;= #{request.applyTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml
index 119bf7d..4f8392a 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml
@@ -31,6 +31,12 @@
         <if test="request.deptName != null and request.deptName !=''">
             and brsi.dept_name like concat('%',#{request.deptName},'%')
         </if>
+        <if test="request.ids != null">
+            and brsv.id in
+            <foreach collection="request.ids" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
         ORDER BY brsv.grant_date DESC
     </select>
 
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSupplierInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSupplierInfoMapper.xml
index fe8d399..e8ce7ef 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSupplierInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSupplierInfoMapper.xml
@@ -48,28 +48,28 @@
         SELECT *
         FROM biz_resource_supplier_info
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.supplierNo != null and request.supplierNo !=''">
+        <if test="request != null and request.supplierNo != null and request.supplierNo !=''">
             and supplier_no like concat('%',#{request.supplierNo},'%')
         </if>
-        <if test="request.supplierName != null and request.supplierName !=''">
+        <if test="request != null and request.supplierName != null and request.supplierName !=''">
             and supplier_name like concat('%',#{request.supplierName},'%')
         </if>
-        <if test="request.director != null and request.director !=''">
+        <if test="request != null and request.director != null and request.director !=''">
             and director like concat('%',#{request.director},'%')
         </if>
-        <if test="request.supplierType != null and request.supplierType !=''">
+        <if test="request != null and request.supplierType != null and request.supplierType !=''">
             and supplier_type = #{request.supplierType}
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/EnvLocationInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/EnvLocationInfoMapper.xml
new file mode 100644
index 0000000..68bcf10
--- /dev/null
+++ b/casic-metering-dao/src/main/resources/mapper/resource/EnvLocationInfoMapper.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.mapper.resource.EnvLocationInfoMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.resource.EnvLocationInfo">
+        <id column="id" property="id" />
+        <result column="location_no" property="locationNo" />
+        <result column="location_name" property="locationName" />
+        <result column="location_position" property="locationPosition" />
+        <result column="create_user_id" property="createUserId" />
+        <result column="create_user" property="createUser" />
+        <result column="create_time" property="createTime" />
+        <result column="update_time" property="updateTime" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, location_no, location_name, location_position, create_user_id, create_user, create_time, update_time
+    </sql>
+
+    <select id="selectLocationListPage" resultType="com.casic.missiles.dto.resource.environment.LocationListResponse">
+        SELECT *
+        FROM env_location_info
+        WHERE 1=1
+        <if test="request.locationNo != null and request.locationNo !=''">
+            AND location_no LIKE concat('%',#{request.locationNo},'%')
+        </if>
+        <if test="request.locationName != null and request.locationName !=''">
+            AND location_name LIKE concat('%',#{request.locationName},'%')
+        </if>
+        ORDER BY create_time DESC
+    </select>
+
+</mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml
index b28c18f..8854047 100644
--- a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml
@@ -11,7 +11,6 @@
         <result column="sign_desc" property="signDesc" />
         <result column="sign_director" property="signDirector" />
         <result column="sign_user_id" property="signUserId" />
-        <result column="sign_type" property="signType" />
         <result column="minio_file_name" property="minioFileName" />
         <result column="create_time" property="createTime" />
         <result column="update_time" property="updateTime" />
@@ -28,7 +27,6 @@
         <result column="sign_name" property="signName" />
         <result column="sign_desc" property="signDesc" />
         <result column="sign_director" property="signDirector" />
-        <result column="sign_type" property="signType" />
         <result column="sign_user_id" property="signUserId" />
         <result column="minio_file_name" property="minioFileName" />
         <result column="create_time" property="createTime" />
@@ -62,4 +60,58 @@
         JOIN system_sign_user_relation ssur ON ss.id = ssur.sign_id
         WHERE ssur.user_id = #{userId}
     </select>
+
+    <select id="selectSignListPage" resultMap="BaseResultMap">
+        SELECT ss.*, sd.SIMPLE_NAME AS deptName
+        FROM system_sign ss
+        LEFT JOIN sys_user su ON su.id = ss.sign_user_id
+        LEFT JOIN sys_dept sd ON sd.id = su.dept_id
+        WHERE 1=1
+        <if test="request.signNo != null and request.signNo !=''">
+            AND ss.sign_no LIKE concat('%',#{request.signNo},'%')
+        </if>
+        <if test="request.signName != null and request.signName !=''">
+            AND ss.sign_name LIKE concat('%',#{request.signName},'%')
+        </if>
+        <if test="request.signDirector != null and request.signDirector !=''">
+            AND ss.sign_director LIKE concat('%',#{request.signDirector},'%')
+        </if>
+        <if test="request.signUserId != null and request.signUserId !=''">
+            AND ss.sign_user_id = #{request.signUserId}
+        </if>
+        <if test="request.createStartTime != null and request.createStartTime !=''">
+            AND DATE_FORMAT(ss.create_time,'%Y-%m-%d') &gt;= DATE_FORMAT(#{request.createStartTime},'%Y-%m-%d')
+        </if>
+        <if test="request.createEndTime != null and request.createEndTime !=''">
+            AND DATE_FORMAT(ss.create_time,'%Y-%m-%d')  &lt;= DATE_FORMAT(#{request.createEndTime},'%Y-%m-%d')
+        </if>
+        ORDER BY ss.create_time DESC
+    </select>
+
+    <select id="selectSignList" resultMap="BaseResultMap">
+        SELECT ss.*, sd.SIMPLE_NAME AS deptName
+        FROM system_sign ss
+        LEFT JOIN sys_user su ON su.id = ss.sign_user_id
+        LEFT JOIN sys_dept sd ON sd.id = su.dept_id
+        WHERE 1=1
+        <if test="request.signNo != null and request.signNo !=''">
+            AND ss.sign_no LIKE concat('%',#{request.signNo},'%')
+        </if>
+        <if test="request.signName != null and request.signName !=''">
+            AND ss.sign_name LIKE concat('%',#{request.signName},'%')
+        </if>
+        <if test="request.signDirector != null and request.signDirector !=''">
+            AND ss.sign_director LIKE concat('%',#{request.signDirector},'%')
+        </if>
+        <if test="request.signUserId != null and request.signUserId !=''">
+            AND ss.sign_user_id = #{request.signUserId}
+        </if>
+        <if test="request.createStartTime != null and request.createStartTime !=''">
+            AND DATE_FORMAT(ss.create_time,'%Y-%m-%d') &gt;= DATE_FORMAT(#{request.createStartTime},'%Y-%m-%d')
+        </if>
+        <if test="request.createEndTime != null and request.createEndTime !=''">
+            AND DATE_FORMAT(ss.create_time,'%Y-%m-%d')  &lt;= DATE_FORMAT(#{request.createEndTime},'%Y-%m-%d')
+        </if>
+        ORDER BY ss.create_time DESC
+    </select>
 </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 515050a..60f530b 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
@@ -47,8 +47,8 @@
     String STORAGE_LOCATION = "bizStorageLocation";
     //计量专业
     String MEASURE_MAJOR = "bizMeasureMajor";
-    //管理状态
-    String MANAGER_STATE = "bizManagerState";
+    //标准装置管理状态
+    String STANDARD_MANAGER_STATE = "bizStandardManagerState";
 
     /**
      * 资源管理 字典code
@@ -95,8 +95,6 @@
     String MEASURE_STATUS = "measureStatus";
     //检定方式
     String MEASURE_TYPE = "measureType";
-    //标识打印标志类型
-    String IDENTIFY_PRINT_TYPE = "bizBusinessIdentify";
     //变更类型
     String REPORT_CHANGE_TYPE = "bizCertChangeType";
     //规模类型
@@ -111,19 +109,24 @@
     String MEASURE_CATEGORY = "measureCategory";
     //检定结果
     String MEASURE_RESULT = "measureResult";
+    //分包原因
+    String OUTSOURCE_REASON = "outsourceReason";
+
+    /**
+     * 系统管理
+     */
+    String TEMPLATE_TYPE = "templateType";
+
 
     /**
      * 标准装置 字典code
      */
     //类别
     String STANDARD_CATEGORY = "standardCategory";
-    //管理状态
-    String STANDARD_MANAGER_STATE = "standardManagerState";
     //标准等级
     String STANDARD_LEVEL = "standardLevel";
     //传递范围
     String STANDARD_TRANSMIT_RANGE = "transmitRange";
-
     //资本来源
     String CAPITAL_SOURCE = "capitalSource";
     //标准装置-申请类型
@@ -148,8 +151,6 @@
     String CERTIFICATE_CLASS = "certificationClass";
     //证书管理-检校专业
     String CALIBRATION_MAJOR = "calibrationMajor";
-    //分包原因
-    String OUTSOURCE_REASON = "outsourceReason";
 
     /**
      * 工作台
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/BaseApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/BaseApprovalListRequest.java
index 73c12c1..80d7424 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/BaseApprovalListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/BaseApprovalListRequest.java
@@ -6,6 +6,7 @@
 
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotEmpty;
+import java.util.List;
 
 /**
  * @Description:
@@ -19,14 +20,14 @@
      * 表单id
      */
     @NotBlank(message = "表单id不能为空")
-    @ApiModelProperty(value = "表单id（流程定义对应的表单id，等价于业务id）", dataType = "String")
+    @ApiModelProperty(value = "表单id（流程定义对应的表单id，等价于业务id），导出接口不用传", dataType = "String")
     private String formId;
 
     /**
      * 审批状态类型，对应ApprovalStatusEnum
      */
     @NotEmpty(message = "审批状态类型不能为空")
-    @ApiModelProperty(value = "审批状态类型code", dataType = "String")
+    @ApiModelProperty(value = "审批状态类型code，导出接口不用传", dataType = "String")
     private String approvalStatus;
 
     @ApiModelProperty(hidden = true)
@@ -34,4 +35,7 @@
 
     @ApiModelProperty(hidden = true)
     private Long createUserId;
+
+    @ApiModelProperty(value = "导出ids", dataType = "List")
+    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificatePrintApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificatePrintApprovalListRequest.java
index b93d1c9..3cc2f4e 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificatePrintApprovalListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificatePrintApprovalListRequest.java
@@ -5,8 +5,6 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import java.util.List;
-
 /**
  * @Description:
  * @Author: wangpeng
@@ -38,7 +36,4 @@
 
     @ApiModelProperty(value = "创建结束时间", dataType = "String")
     private String createTimeEnd;
-
-    @ApiModelProperty(value = "导出ids", dataType = "List")
-    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportApprovalListRequest.java
index 4f7a038..c115847 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportApprovalListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportApprovalListRequest.java
@@ -5,8 +5,6 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import java.util.List;
-
 /**
  * @Description:
  * @Author: wangpeng
@@ -15,6 +13,8 @@
 @ApiModel
 @Data
 public class CertificateReportApprovalListRequest extends BaseApprovalListRequest {
+    @ApiModelProperty(value = "委托方id", dataType = "String")
+    private Long customerId;
 
     @ApiModelProperty(value = "证书报告编号", dataType = "String")
     private String certificateReportNo;
@@ -37,6 +37,4 @@
     @ApiModelProperty(value = "检校结束时间", dataType = "String")
     private String calibrationTimeEnd;
 
-    @ApiModelProperty(value = "导出ids", dataType = "List")
-    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/identify/IdentifyListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/identify/IdentifyListRequest.java
index 1b87ae6..f019203 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/identify/IdentifyListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/identify/IdentifyListRequest.java
@@ -4,6 +4,8 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * @Description:
  * @Author: wangpeng
@@ -26,4 +28,7 @@
 
     @ApiModelProperty(value = "打印结束时间", dataType = "String")
     private String createTimeEnd;
+
+    @ApiModelProperty(value = "导出ids", dataType = "List")
+    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListRequest.java
index 1264883..62415fb 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListRequest.java
@@ -7,6 +7,7 @@
 import lombok.Data;
 
 import javax.validation.constraints.NotBlank;
+import java.util.List;
 
 @Data
 @ApiModel
@@ -37,4 +38,6 @@
     @ApiModelProperty(value = "是否加急（1是0否null全部）", dataType = "Integer")
     private String isUrgent;
 
+    @ApiModelProperty(value = "导出ids", dataType = "List")
+    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListRequest.java
index 5201d7b..499760a 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListRequest.java
@@ -17,6 +17,9 @@
     @ApiModelProperty(value = "任务单编号", dataType = "String")
     private String orderNo;
 
+    @ApiModelProperty(value = "委托方id", dataType = "Long")
+    private Long customerId;
+
     @ApiModelProperty(value = "委托方名称", dataType = "String")
     private String customerName;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OrderSampleDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OrderSampleDTO.java
new file mode 100644
index 0000000..796edc0
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OrderSampleDTO.java
@@ -0,0 +1,19 @@
+package com.casic.missiles.dto.business.outsource;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/8/24 11:38
+ */
+@ApiModel
+@Data
+public class OrderSampleDTO {
+    @ApiModelProperty(value = "任务单id", dataType = "Long")
+    private Long orderId;
+    @ApiModelProperty(value = "受检设备id", dataType = "Long")
+    private Long sampleId;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceAssessApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceAssessApprovalListRequest.java
new file mode 100644
index 0000000..9a930c3
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceAssessApprovalListRequest.java
@@ -0,0 +1,30 @@
+package com.casic.missiles.dto.business.outsource;
+
+import com.casic.missiles.dto.BaseApprovalListRequest;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/8/24 11:01
+ */
+@ApiModel
+@Data
+public class OutsourceAssessApprovalListRequest extends BaseApprovalListRequest {
+    @ApiModelProperty(value = "评审表编号", dataType = "String")
+    private String projectNo;
+
+    @ApiModelProperty(value = "分包机构名称", dataType = "String")
+    private String outsourcerName;
+
+    @ApiModelProperty(value = "申请人", dataType = "String")
+    private String applicantName;
+
+    @ApiModelProperty(value = "申请时间开始", dataType = "String")
+    private String applicantTimeStart;
+
+    @ApiModelProperty(value = "申请时间结束", dataType = "String")
+    private String applicantTimeEnd;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceAssessSaveResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceAssessSaveResponse.java
new file mode 100644
index 0000000..8bf9aad
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceAssessSaveResponse.java
@@ -0,0 +1,20 @@
+package com.casic.missiles.dto.business.outsource;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/8/14 16:17
+ */
+@ApiModel
+@Data
+public class OutsourceAssessSaveResponse {
+    @ApiModelProperty(value = "主键id", dataType = "Long")
+    private Long id;
+
+    @ApiModelProperty(value = "编号", dataType = "String")
+    private String projectNo;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProtocolApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProtocolApprovalListRequest.java
new file mode 100644
index 0000000..0f32331
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProtocolApprovalListRequest.java
@@ -0,0 +1,30 @@
+package com.casic.missiles.dto.business.outsource;
+
+import com.casic.missiles.dto.BaseApprovalListRequest;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/8/24 15:01
+ */
+@ApiModel
+@Data
+public class OutsourceProtocolApprovalListRequest extends BaseApprovalListRequest {
+    @ApiModelProperty(value = "协议书编号", dataType = "String")
+    private String protocolNo;
+
+    @ApiModelProperty(value = "分包方名称", dataType = "String")
+    private String outsourcerName;
+
+    @ApiModelProperty(value = "申请人", dataType = "String")
+    private String applicantName;
+
+    @ApiModelProperty(value = "申请时间开始", dataType = "String")
+    private String applicantTimeStart;
+
+    @ApiModelProperty(value = "申请时间结束", dataType = "String")
+    private String applicantTimeEnd;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProtocolSaveResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProtocolSaveResponse.java
new file mode 100644
index 0000000..e324967
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProtocolSaveResponse.java
@@ -0,0 +1,20 @@
+package com.casic.missiles.dto.business.outsource;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/8/14 16:17
+ */
+@ApiModel
+@Data
+public class OutsourceProtocolSaveResponse {
+    @ApiModelProperty(value = "主键id", dataType = "Long")
+    private Long id;
+
+    @ApiModelProperty(value = "编号", dataType = "String")
+    private String protocolNo;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveApprovalListRequest.java
index f29f4e4..7047c28 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveApprovalListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveApprovalListRequest.java
@@ -5,8 +5,6 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import java.util.List;
-
 /**
  * @Description: 现场检测审批列表请求实体
  * @Author: wangpeng
@@ -30,7 +28,4 @@
     @ApiModelProperty(value = "申请时间结束", dataType = "String")
     private String applyTimeEnd;
 
-    @ApiModelProperty(value = "导出ids", dataType = "List")
-    private List<Long> ids;
-
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveDetailResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveDetailResponse.java
index 1f28752..394c934 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveDetailResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveDetailResponse.java
@@ -12,6 +12,18 @@
     @ApiModelProperty(value = "id，更新/删除使用参数", dataType = "Long")
     private Long id;
 
+    @ApiModelProperty(value = "实验室代码(字典code)", dataType = "String")
+    private String labCode;
+
+    @ApiModelProperty(value = "实验室代码(字典value)", dataType = "String")
+    private String labCodeName;
+
+    @ApiModelProperty(value = "组别代码(字典code)", dataType = "String")
+    private String groupCode;
+
+    @ApiModelProperty(value = "组别代码(字典value)", dataType = "String")
+    private String groupCodeName;
+
     @ApiModelProperty(value = "审批编号", dataType = "String")
     private String siteExecutiveNo;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/environment/LocationListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/environment/LocationListRequest.java
new file mode 100644
index 0000000..13d03c3
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/environment/LocationListRequest.java
@@ -0,0 +1,20 @@
+package com.casic.missiles.dto.resource.environment;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/6/8 13:56
+ */
+@ApiModel
+@Data
+public class LocationListRequest {
+    @ApiModelProperty(value = "地点编号", dataType = "String")
+    private String locationNo;
+
+    @ApiModelProperty(value = "地点名称", dataType = "String")
+    private String locationName;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/environment/LocationListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/environment/LocationListResponse.java
new file mode 100644
index 0000000..4c531af
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/environment/LocationListResponse.java
@@ -0,0 +1,78 @@
+package com.casic.missiles.dto.resource.environment;
+
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
+import com.baomidou.mybatisplus.annotation.TableField;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description: 地点列表响应实体
+ * @Author: wangpeng
+ * @Date: 2023/6/8 13:53
+ */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
+@ApiModel
+@Data
+public class LocationListResponse {
+    @ApiModelProperty(value = "主键id", dataType = "Long")
+    private Long id;
+
+    /**
+     * 地点编号
+     */
+    @ExcelProperty("地点编号")
+    @ApiModelProperty(value = "地点编号", dataType = "String")
+    private String locationNo;
+
+    /**
+     * 地点名称
+     */
+    @ExcelProperty("地点名称")
+    @ApiModelProperty(value = "地点名称", dataType = "String")
+    private String locationName;
+
+    /**
+     * 地点位置
+     */
+    @ExcelProperty("地点位置")
+    @ApiModelProperty(value = "地点位置", dataType = "String")
+    private String locationPosition;
+
+    /**
+     * 创建人id
+     */
+    @ApiModelProperty(value = "创建人id", dataType = "Long")
+    private Long createUserId;
+
+    /**
+     * 创建人
+     */
+    @ExcelProperty("创建人")
+    @ApiModelProperty(value = "创建人", dataType = "String")
+    @TableField("create_user")
+    private String createUser;
+
+    /**
+     * 创建时间
+     */
+    @ExcelProperty("创建时间")
+    @ApiModelProperty(value = "创建时间", dataType = "String")
+    private String createTime;
+
+    /**
+     * 更新时间
+     */
+    @ApiModelProperty(value = "更新时间", dataType = "String")
+    private String updateTime;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertRequest.java
index 9a7f6c6..c827915 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertRequest.java
@@ -4,6 +4,8 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * @Description:
  * @Author: wangpeng
@@ -16,4 +18,7 @@
     private String name;
     @ApiModelProperty(value = "部门名", dataType = "String")
     private String deptName;
+
+    @ApiModelProperty(value = "导出ids", dataType = "List")
+    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertResponse.java
index f78b159..8f2f79e 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertResponse.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.dto.resource.staff;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.casic.missiles.annotation.DictCodeField;
 import com.casic.missiles.constants.MeterDictCode;
 import io.swagger.annotations.ApiModel;
@@ -13,12 +20,18 @@
  * @Author: wangpeng
  * @Date: 2023/7/27 15:13
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @ApiModel
 @Data
 public class StaffCertResponse {
     /**
      * 人员编号
      */
+    @ExcelProperty(value = "人员编号",order = 0)
     @NotEmpty(message = "人员编号不能为空")
     @ApiModelProperty(value = "人员编号", dataType = "String")
     private String staffNo;
@@ -26,6 +39,7 @@
     /**
      * 姓名
      */
+    @ExcelProperty(value = "姓名",order = 1)
     @ApiModelProperty(value = "姓名", dataType = "String")
     private String staffName;
 
@@ -54,6 +68,7 @@
     /**
      * 部门名字
      */
+    @ExcelProperty(value = "工作部门",order = 2)
     @ApiModelProperty(value = "部门名字", dataType = "String")
     private String deptName;
 
@@ -66,6 +81,7 @@
     /**
      * 计量专业
      */
+    @ExcelProperty(value = "计量专业",order = 3)
     @ApiModelProperty(value = "计量专业", dataType = "String")
     private String major;
 
@@ -110,6 +126,7 @@
     /**
      * 证书号
      */
+    @ExcelProperty(value = "证号",order = 4)
     @ApiModelProperty(value = "证书号", dataType = "String")
     private String certNo;
 
@@ -122,12 +139,14 @@
     /**
      * 有效日期
      */
+    @ExcelProperty(value = "证书有效期",order = 6)
     @ApiModelProperty(value = "有效日期", dataType = "String")
     private String effectiveDate;
 
     /**
      * 发放日期
      */
+    @ExcelProperty(value = "发证日期",order = 5)
     @ApiModelProperty(value = "发放日期", dataType = "String")
     private String grantDate;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffListRequest.java
index 7c4afb3..0a1194a 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffListRequest.java
@@ -4,6 +4,8 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * @Description:
  * @Author: wangpeng
@@ -18,4 +20,7 @@
     private String deptName;
     @ApiModelProperty(value = "部门id", dataType = "Long")
     private Long deptId;
+
+    @ApiModelProperty(value = "导出ids", dataType = "List")
+    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/TrainListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/TrainListRequest.java
index f68597b..6321f8b 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/TrainListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/TrainListRequest.java
@@ -14,6 +14,8 @@
 public class TrainListRequest {
     @ApiModelProperty(value = "训练登记表编号", dataType = "String")
     private String trainNo;
+    @ApiModelProperty(value = "值班领导", dataType = "String")
+    private String dutyLeader;
     @ApiModelProperty(value = "创建开始时间", dataType = "String")
     private String createTimeStart;
     @ApiModelProperty(value = "创建结束时间", dataType = "String")
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/SignAddRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/SignAddRequest.java
index 117be34..d71055c 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/SignAddRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/SignAddRequest.java
@@ -43,13 +43,6 @@
     private Long signUserId;
 
     /**
-     * 签章或签名-字典code
-     */
-    @NotBlank(message = "类型不能为空")
-    @ApiModelProperty(value = "签名/签章-字典code", dataType = "String", required = true)
-    private String signType;
-
-    /**
      * minio存储文件名
      */
     @ApiModelProperty(value = "上传文件返回名称", dataType = "String")
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateAddRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateAddRequest.java
index aff1265..6316648 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateAddRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateAddRequest.java
@@ -17,30 +17,28 @@
 @Data
 public class TemplateAddRequest extends BaseSystemRequest {
     /**
-     * 原始记录模板/证书报告模板名称
+     * 模板名称
      */
     @ApiModelProperty(value = "名称", dataType = "String", required = true)
     @NotBlank(message = "名称不能为空")
     private String templateName;
 
     /**
-     * 原始记录模板/证书报告模板描述
+     * 模板描述
      */
     @ApiModelProperty(value = "描述", dataType = "String")
     private String templateDesc;
 
     /**
-     * 原始记录模板/证书报告模板创建人
+     * 创建人
      */
     @ApiModelProperty(value = "创建人", dataType = "String", required = true)
     @NotBlank(message = "创建人不能为空")
     private String templateCreator;
 
-    /**
-     * 原始记录模板/证书报告模板-字典code
-     */
-    @NotBlank(message = "类型不能为空")
-    @ApiModelProperty(value = "原始记录模板/证书报告模板-字典code", dataType = "String", required = true)
+
+    @NotBlank(message = "模板类型不能为空")
+    @ApiModelProperty(value = "模板类型(字典code)", dataType = "String", required = true)
     private String templateType;
 
     /**
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateListRequest.java
index eec5a1e..6d17bbe 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateListRequest.java
@@ -1,11 +1,12 @@
 package com.casic.missiles.dto.system;
 
+import com.casic.missiles.annotation.DictCodeField;
+import com.casic.missiles.constants.MeterDictCode;
 import com.casic.missiles.dto.BaseSystemRequest;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import javax.validation.constraints.NotBlank;
 import java.util.List;
 
 /**
@@ -19,8 +20,8 @@
     /**
      * 类型
      */
-//    @ApiModelProperty(value = "类型-字典code", dataType = "String", required = true)
-    @NotBlank(message = "类型不能为空")
+    @DictCodeField(message = "模板类型不合法", cacheName = MeterDictCode.TEMPLATE_TYPE)
+    @ApiModelProperty(value = "模板类型(字典code)", dataType = "String")
     private String templateType;
 
     /**
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificateChangeApply.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificateChangeApply.java
index 9216308..36923fd 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificateChangeApply.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificateChangeApply.java
@@ -1,11 +1,19 @@
 package com.casic.missiles.model.business;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 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 com.casic.missiles.dto.BaseRequest;
+import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -20,6 +28,12 @@
  * @author wangpeng
  * @since 2023-08-15
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
+@ApiModel
 @Data
 @TableName("biz_business_certificate_change_apply")
 public class BizBusinessCertificateChangeApply extends BaseRequest implements Serializable {
@@ -33,6 +47,7 @@
     /**
      * 申请单编号
      */
+    @ExcelProperty(value = "申请单编号", order = 1)
     @ApiModelProperty(value = "申请单编号", dataType = "String")
     @TableField("change_apply_no")
     private String changeApplyNo;
@@ -40,6 +55,7 @@
     /**
      * 申请单名字
      */
+    @ExcelProperty(value = "申请单名称", order = 2)
     @ApiModelProperty(value = "申请单名字", dataType = "String")
     @TableField("change_apply_name")
     private String changeApplyName;
@@ -54,6 +70,7 @@
     /**
      * 更换证书编号
      */
+    @ExcelProperty(value = "更换证书编号", order = 3)
     @ApiModelProperty(value = "更换证书编号", dataType = "String")
     @TableField("change_report_no")
     private String changeReportNo;
@@ -61,7 +78,8 @@
     /**
      * 更换证书名字
      */
-    @ApiModelProperty(value = "更换证书名字", dataType = "String")
+    @ExcelProperty(value = "更换证书/报告名称", order = 4)
+    @ApiModelProperty(value = "更换证书/报告名称", dataType = "String")
     @TableField("change_report_name")
     private String changeReportName;
 
@@ -73,6 +91,7 @@
     @TableField("change_type")
     private String changeType;
 
+    @ExcelProperty(value = "变更类型", order = 5)
     @ApiModelProperty(value = "变更类型(字典value)", dataType = "String")
     @TableField(exist = false)
     private String changeTypeName;
@@ -142,13 +161,15 @@
     /**
      * 创建用户名字
      */
-    @ApiModelProperty(value = "创建用户名字", dataType = "String")
+    @ExcelProperty(value = "创建人", order = 6)
+    @ApiModelProperty(value = "创建人名字", dataType = "String")
     @TableField("create_user_name")
     private String createUserName;
 
     /**
      * 创建时间
      */
+    @ExcelProperty(value = "创建时间", order = 7)
     @ApiModelProperty(value = "创建时间", dataType = "String")
     @TableField("create_time")
     private String createTime;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificateReport.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificateReport.java
index f01db9e..db06018 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificateReport.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificateReport.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.model.business;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -22,6 +29,11 @@
  * @author wangpeng
  * @since 2023-08-14
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @ApiModel
 @Data
 @TableName("biz_business_certificate_report")
@@ -36,6 +48,7 @@
     /**
      * 证书报告编号
      */
+    @ExcelProperty(value = "证书报告编号", order = 1)
     @ApiModelProperty(value = "证书报告编号", dataType = "String")
     @TableField("certificate_report_no")
     private String certificateReportNo;
@@ -43,6 +56,7 @@
     /**
      * 证书报告名称
      */
+    @ExcelProperty(value = "证书报告名称", order = 2)
     @ApiModelProperty(value = "证书报告名称", dataType = "String")
     @TableField("certificate_report_name")
     private String certificateReportName;
@@ -62,6 +76,7 @@
     @TableField("measure_category")
     private String measureCategory;
 
+    @ExcelProperty(value = "检校类别", order = 6)
     @ApiModelProperty(value = "检校类别(字典value)", dataType = "String")
     @TableField(exist = false)
     private String measureCategoryName;
@@ -69,6 +84,7 @@
     /**
      * 检校时间
      */
+    @ExcelProperty(value = "检校时间", order = 8)
     @ApiModelProperty(value = "检校时间", dataType = "String")
     @TableField("calibration_time")
     private String calibrationTime;
@@ -267,18 +283,22 @@
     @TableField(exist = false)
     private Integer decisionItem;
 
-    @ApiModelProperty(value = "设备样品编号（列表返回参数）", dataType = "String")
+    @ExcelProperty(value = "被检设备统一编号", order = 3)
+    @ApiModelProperty(value = "被检设备统一编号（列表返回参数）", dataType = "String")
     @TableField(exist = false)
     private String sampleNo;
 
-    @ApiModelProperty(value = "设备样品名称（列表返回参数）", dataType = "String")
+    @ExcelProperty(value = "被检设备名称", order = 4)
+    @ApiModelProperty(value = "被检设备名称（列表返回参数）", dataType = "String")
     @TableField(exist = false)
     private String sampleName;
 
-    @ApiModelProperty(value = "设备样品规格型号（列表返回参数）", dataType = "String")
+    @ExcelProperty(value = "规格型号", order = 5)
+    @ApiModelProperty(value = "规格型号（列表返回参数）", dataType = "String")
     @TableField(exist = false)
     private String sampleModel;
 
+    @ExcelProperty(value = "检定员", order = 7)
     @ApiModelProperty(value = "检定员名字（列表返回参数）", dataType = "String")
     @TableField(exist = false)
     private String staffName;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessIdentifyInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessIdentifyInfo.java
index 46bfba5..f1a9bec 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessIdentifyInfo.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessIdentifyInfo.java
@@ -1,10 +1,15 @@
 package com.casic.missiles.model.business;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 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;
 
@@ -20,6 +25,11 @@
  * @author wangpeng
  * @since 2023-08-15
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @Data
 @TableName("biz_business_identify_info")
 public class BizBusinessIdentifyInfo implements Serializable {
@@ -33,6 +43,7 @@
     /**
      * 记录编号
      */
+    @ExcelProperty(value = "记录编号", order = 1)
     @ApiModelProperty(value = "记录编号", dataType = "String")
     @TableField("record_no")
     private String recordNo;
@@ -41,20 +52,15 @@
      * 标志类型(字典code)
      */
     @NotEmpty(message = "标志类型不能为空")
-    @ApiModelProperty(value = "标志类型(字典code)", dataType = "String")
-    @DictCodeField(message = "标志类型不合法", cacheName = MeterDictCode.IDENTIFY_PRINT_TYPE)
+    @ApiModelProperty(value = "标志类型(直接存计量标识/使用状态/校准状态的字典value)", dataType = "String")
     @TableField("identify_type")
     private String identifyType;
 
-    @ApiModelProperty(value = "标志类型(字典value)", dataType = "String")
-    @TableField(exist = false)
-    private String identifyTypeName;
-
     /**
      * 设备id(可以是受检设备/设备台账)
      */
     @NotNull(message = "设备id不能为空")
-    @ApiModelProperty(value = "设备id(可以是受检设备/设备台账)", dataType = "String")
+    @ApiModelProperty(value = "设备id(可以是受检设备/设备台账)", dataType = "Long")
     @TableField("device_id")
     private Long deviceId;
 
@@ -66,29 +72,32 @@
     @TableField("device_type")
     private String deviceType;
 
+    @ExcelProperty(value = "统一编号", order = 3)
     @NotEmpty(message = "设备编号不能为空")
-    @ApiModelProperty(value = "设备编号", dataType = "String")
+    @ApiModelProperty(value = "统一编号", dataType = "String")
     @TableField("device_no")
     private String deviceNo;
 
     /**
      * 设备名字
      */
-    @NotEmpty(message = "设备名字不能为空")
-    @ApiModelProperty(value = "设备名字", dataType = "String")
+    @ExcelProperty(value = "设备名称", order = 4)
+    @NotEmpty(message = "设备名称不能为空")
+    @ApiModelProperty(value = "设备名称", dataType = "String")
     @TableField("device_name")
     private String deviceName;
 
     /**
      * 检定员id
      */
-    @ApiModelProperty(value = "检定员id", dataType = "String")
+    @ApiModelProperty(value = "检定员id", dataType = "Long")
     @TableField("measure_person_id")
     private Long measurePersonId;
 
     /**
      * 检定员名字
      */
+    @ExcelProperty(value = "检定员", order = 5)
     @ApiModelProperty(value = "检定员名字", dataType = "String")
     @TableField("measure_person")
     private String measurePerson;
@@ -103,7 +112,8 @@
     /**
      * 更新时间
      */
-    @ApiModelProperty(value = "更新时间", dataType = "String")
+    @ExcelProperty(value = "打印时间", order = 6)
+    @ApiModelProperty(value = "打印时间", dataType = "String")
     @TableField("update_time")
     private String updateTime;
 

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java
index bb0c50f..13a699b 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java
@@ -12,6 +12,7 @@
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.IGeneralApprovalService;
+import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
@@ -19,6 +20,7 @@
 import org.springframework.web.bind.annotation.RequestBody;
 
 import javax.validation.Valid;
+import java.util.List;
 import java.util.Objects;
 
 /**
@@ -117,4 +119,17 @@
         }
         return baseApprovalService.failUpdate(request);
     }
+
+    public List<O> exportList(@RequestBody @Valid R request) throws Exception {
+        List<O> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = baseApprovalService.listExportByIds(request.getIds());
+        } else {
+            list = baseApprovalService.listExport(request);
+        }
+        for (O record : list) {
+            DictCodeUtils.convertDictCodeToName(record);
+        }
+        return list;
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java
index 8a90961..d775831 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java
@@ -5,6 +5,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.business.certificate.CertificateChangeApplyApprovalListRequest;
 import com.casic.missiles.dto.business.certificate.CertificateChangeApplySaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessCertificateChangeApply;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
@@ -20,6 +21,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -48,4 +50,12 @@
         }
         return changeApplyService.saveChangeApply(request);
     }
+
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody CertificateChangeApplyApprovalListRequest request) throws Exception {
+        List<BizBusinessCertificateChangeApply> list = super.exportList(request);
+        super.exportExcel(BizBusinessCertificateChangeApply.class, list, ExportEnum.CERTIFICATE_CHANGE_APPLY.getSheetName());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java
index 5fc4b07..af8230e 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java
@@ -9,6 +9,7 @@
 import com.casic.missiles.dto.business.certificate.CertificatePrintApprovalListRequest;
 import com.casic.missiles.dto.business.certificate.CertificatePrintListResponse;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.enums.business.CertificatePrintStatusEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessCertificatePrintLog;
@@ -18,10 +19,16 @@
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.io.IOException;
+import java.util.List;
 import java.util.Objects;
 
 /**
@@ -98,4 +105,16 @@
         });
         return certificatePrintService.certificatePrintLog(idDTO.getId());
     }
+
+    @ApiOperation("证书打印审批导出")
+    @PostMapping("/listExport")
+    public void exportList(@RequestBody CertificatePrintApprovalListRequest request) throws IOException {
+        List<CertificatePrintListResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = certificatePrintService.listByIds(request.getIds());
+        } else {
+            list = certificatePrintService.list(request);
+        }
+        super.exportExcel(CertificatePrintListResponse.class, list, ExportEnum.CERTIFICATE_PRINT.getSheetName());
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java
index 63b06dc..6b2efd5 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java
@@ -6,6 +6,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.business.certificate.CertificateReportApprovalListRequest;
 import com.casic.missiles.dto.business.certificate.CertificateReportSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessCertificateReport;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
@@ -21,6 +22,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -50,7 +52,7 @@
         return certificateReportService.saveCertificateReport(request);
     }
 
-    @ApiOperation("证书审批详情（基本信息）")
+    @ApiOperation("详情（基本信息）")
     @PostMapping("/detail")
     public ReturnDTO<BizBusinessCertificateReport> detail(@RequestBody @Valid BaseDetailRequest request, BindingResult bindingResult) throws Exception {
         if(bindingResult.hasErrors()){
@@ -59,4 +61,11 @@
         return certificateReportService.detail(request);
     }
 
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody CertificateReportApprovalListRequest request) throws Exception {
+        List<BizBusinessCertificateReport> list = super.exportList(request);
+        super.exportExcel(BizBusinessCertificateReport.class, list, ExportEnum.CERTIFICATE_REPORT.getSheetName());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java
index 46b26bd..57c0809 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java
@@ -10,20 +10,21 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.business.identify.IdentifyListRequest;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessIdentifyInfo;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.business.IBizBusinessIdentifyInfoService;
+import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import javax.validation.Valid;
+import java.util.List;
 import java.util.Objects;
 
 /**
@@ -57,16 +58,13 @@
         return identifyInfoService.addIdentify(identifyInfo);
     }
 
-    @ApiOperation("标识打印更新")
+    @ApiOperation("标识打印更新（更新打印时间）")
     @PostMapping("/update")
-    public ReturnDTO updateIdentify(@RequestBody @Valid BizBusinessIdentifyInfo identifyInfo, BindingResult bindingResult) {
-        Assert.isFalse(Objects.isNull(identifyInfo.getId()), () -> {
+    public ReturnDTO updateIdentify(@RequestBody @Valid IdDTO idDTO) {
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        Assert.isFalse(bindingResult.hasErrors(), () -> {
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        });
-        return identifyInfoService.updateIdentify(identifyInfo);
+        return identifyInfoService.updateIdentify(idDTO.getId());
     }
 
     @ApiOperation("标识打印删除")
@@ -77,4 +75,37 @@
         });
         return identifyInfoService.deleteIdentify(idDTO.getId());
     }
+
+    @ApiOperation("标识打印导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody @Valid IdentifyListRequest request, BindingResult bindingResult) throws Exception {
+        if (bindingResult.hasErrors()) {
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        List<BizBusinessIdentifyInfo> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = identifyInfoService.listByIds(request.getIds());
+        } else {
+            list = identifyInfoService.list(request);
+        }
+        for (BizBusinessIdentifyInfo record : list) {
+            DictCodeUtils.convertDictCodeToName(record);
+        }
+        super.exportExcel(BizBusinessIdentifyInfo.class, list, ExportEnum.IDENTIFY_EXPORT.getSheetName());
+    }
+
+
+    // TODO: 2023/8/23 查询设备信息，4个底部按钮查设备（按钮的作用就是前端用来调不同接口、用来区分中间即将展示的标识），前端弹窗选设备，在确定保存时前端根据底部按钮判断传入设备类型deviceType字典code
+    // TODO: 2023/8/23 接口：查受检设备（第1个按钮），查设备台账（后3个按钮同一接口），查询之后前端根据标志类型的不同加到中间页面时进行判断（按产品给的对应表）
+    // TODO: 2023/8/23 提供二维码接口，前端在加到中间页面时调用一下
+
+    @ApiOperation("设备二维码")
+    @PostMapping("/equipment/qrCode")
+    public ReturnDTO<String> equipmentQrCode(@RequestBody @Valid IdDTO idDTO) {
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return identifyInfoService.equipmentQrCode(idDTO.getId());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java
index 707be6e..7e0453d 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java
@@ -117,7 +117,7 @@
     }
 
     @ApiOperation("任务单导出")
-    @PostMapping("/export")
+    @PostMapping("/listExport")
     public void orderExport(@RequestBody @Valid OrderListRequest request, HttpServletResponse response) {
         businessOrderService.orderExport(request, response);
     }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java
index 529a6ce..51432be 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java
@@ -1,9 +1,28 @@
 package com.casic.missiles.controller.business;
 
+import com.casic.missiles.controller.GeneralApprovalController;
+import com.casic.missiles.dto.BaseApprovalSubmitRequest;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.business.outsource.OutsourceAssessApprovalListRequest;
+import com.casic.missiles.dto.business.outsource.OutsourceAssessSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
+import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.model.business.BizBusinessOutsourceAssess;
+import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
+import com.casic.missiles.service.IGeneralApprovalService;
+import com.casic.missiles.service.business.IBizBusinessOutsourceAssessService;
 import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.BindingResult;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.validation.Valid;
+import java.util.List;
+
 /**
  * <p>
  * 计量检定业务-分包管理-测试、校准或检定工作分包评审表 前端控制器
@@ -15,6 +34,27 @@
 @Api(tags = "分包管理-测试、校准或检定工作分包评审表")
 @RestController
 @RequestMapping("/business/outsource/assess")
-public class BizBusinessOutsourceAssessController {
+public class BizBusinessOutsourceAssessController extends GeneralApprovalController<BizBusinessOutsourceAssess, BizBusinessOutsourceAssess, OutsourceAssessApprovalListRequest, BaseApprovalSubmitRequest> {
+    @Autowired
+    private IBizBusinessOutsourceAssessService outsourceAssessService;
 
+    public BizBusinessOutsourceAssessController(IGeneralApprovalService<BizBusinessOutsourceAssess, BizBusinessOutsourceAssess, OutsourceAssessApprovalListRequest, BaseApprovalSubmitRequest> baseApprovalService) {
+        super(baseApprovalService);
+    }
+
+    @ApiOperation("草稿箱-保存")
+    @PostMapping("/save")
+    public ReturnDTO<OutsourceAssessSaveResponse> saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceAssess request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        return outsourceAssessService.saveOutsourceAssess(request);
+    }
+
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception {
+        List<BizBusinessOutsourceAssess> list = super.exportList(request);
+        super.exportExcel(BizBusinessOutsourceAssess.class, list, ExportEnum.OUTSOURCE_ASSESS.getSheetName());
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java
new file mode 100644
index 0000000..9adef18
--- /dev/null
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java
@@ -0,0 +1,60 @@
+package com.casic.missiles.controller.business;
+
+import com.casic.missiles.controller.GeneralApprovalController;
+import com.casic.missiles.dto.BaseApprovalSubmitRequest;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.business.outsource.OutsourceProtocolApprovalListRequest;
+import com.casic.missiles.dto.business.outsource.OutsourceProtocolSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
+import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.model.business.BizBusinessOutsourceProtocol;
+import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
+import com.casic.missiles.service.IGeneralApprovalService;
+import com.casic.missiles.service.business.IBizBusinessOutsourceProtocolService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.BindingResult;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.validation.Valid;
+import java.util.List;
+
+/**
+ * <p>
+ * 计量检定业务-分包管理-测试、校准或检定工作分包协议书 前端控制器
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-08-24
+ */
+@Api(tags = "分包管理-测试、校准或检定工作分包协议书")
+@RestController
+@RequestMapping("/business/outsource/protocol")
+public class BizBusinessOutsourceProtocolController extends GeneralApprovalController<BizBusinessOutsourceProtocol, BizBusinessOutsourceProtocol, OutsourceProtocolApprovalListRequest, BaseApprovalSubmitRequest> {
+    @Autowired
+    private IBizBusinessOutsourceProtocolService outsourceProtocolService;
+
+    public BizBusinessOutsourceProtocolController(IGeneralApprovalService<BizBusinessOutsourceProtocol, BizBusinessOutsourceProtocol, OutsourceProtocolApprovalListRequest, BaseApprovalSubmitRequest> baseApprovalService) {
+        super(baseApprovalService);
+    }
+
+    @ApiOperation("草稿箱-保存")
+    @PostMapping("/save")
+    public ReturnDTO<OutsourceProtocolSaveResponse> saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceProtocol request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        return outsourceProtocolService.saveOutsourceProtocol(request);
+    }
+
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody OutsourceProtocolApprovalListRequest request) throws Exception {
+        List<BizBusinessOutsourceProtocol> list = super.exportList(request);
+        super.exportExcel(BizBusinessOutsourceProtocol.class, list, ExportEnum.OUTSOURCE_PROTOCOL.getSheetName());
+    }
+}
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java
index 097f645..f0f0943 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java
@@ -17,7 +17,6 @@
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.IGeneralApprovalService;
 import com.casic.missiles.service.business.IBizBusinessOutsourcerInfoService;
-import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -71,19 +70,8 @@
 
     @ApiOperation("分包方导出")
     @PostMapping("/listExport")
-    public void export(@RequestBody @Valid OutsourcerInfoApprovalListRequest request, BindingResult bindingResult) throws Exception {
-        if (bindingResult.hasErrors()) {
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        }
-        List<BizBusinessOutsourcerInfo> list;
-        if (!CollectionUtils.isEmpty(request.getIds())) {
-            list = outsourcerInfoService.listByIds(request.getIds());
-        } else {
-            list = outsourcerInfoService.list(request);
-        }
-        for (BizBusinessOutsourcerInfo record : list) {
-            DictCodeUtils.convertDictCodeToName(record);
-        }
+    public void export(@RequestBody OutsourcerInfoApprovalListRequest request) throws Exception {
+        List<BizBusinessOutsourcerInfo> list = super.exportList(request);
         super.exportExcel(BizBusinessOutsourcerInfo.class, list, ExportEnum.OUTSOURCER_EXPORT.getSheetName());
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java
index c2cbf9f..0410918 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java
@@ -17,11 +17,9 @@
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.IGeneralApprovalService;
 import com.casic.missiles.service.business.IBizBusinessSiteExecutiveInfoService;
-import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -60,7 +58,7 @@
         return siteExecutiveInfoService.saveSiteExecutiveInfo(siteExecutiveInfo);
     }
 
-    @ApiOperation("现场检测详情")
+    @ApiOperation("详情")
     @PostMapping("/detail")
     public ReturnDTO<SiteExecutiveDetailResponse> siteExecutiveDetail(@RequestBody @Valid IdDTO idDTO) throws Exception {
         Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
@@ -69,21 +67,10 @@
         return ReturnUtil.success(siteExecutiveInfoService.detail(idDTO.getId()));
     }
 
-    @ApiOperation("现场检测导出")
+    @ApiOperation("导出")
     @PostMapping("/listExport")
-    public void export(@RequestBody @Valid SiteExecutiveApprovalListRequest request, BindingResult bindingResult) throws Exception {
-        if (bindingResult.hasErrors()) {
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        }
-        List<SiteExecutiveApprovalListResponse> list;
-        if (!CollectionUtils.isEmpty(request.getIds())) {
-            list = siteExecutiveInfoService.listInfoByIds(request.getIds());
-        } else {
-            list = siteExecutiveInfoService.listInfo(request);
-        }
-        for (SiteExecutiveApprovalListResponse record : list) {
-            DictCodeUtils.convertDictCodeToName(record);
-        }
+    public void export(@RequestBody SiteExecutiveApprovalListRequest request) throws Exception {
+        List<SiteExecutiveApprovalListResponse> list = super.exportList(request);
         super.exportExcel(SiteExecutiveApprovalListResponse.class, list, ExportEnum.SITE_EXECUTIVE_EXPORT.getSheetName());
     }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
index 7e793cd..a92e209 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
@@ -55,7 +55,7 @@
 
     @ApiOperation("设备收发列表导出")
     @PostMapping("/export")
-    public void exportList(@RequestBody @Valid SampleDispatchListRequest request) throws IOException {
+    public void exportList(@RequestBody SampleDispatchListRequest request) throws IOException {
         List<SampleDispatchListResponse> list;
         if (!CollectionUtils.isEmpty(request.getIds())) {
             list = dispatchService.listByIds(request.getIds());
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java
index cdc77fc..d120fd4 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java
@@ -7,6 +7,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.business.labExecutive.*;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.business.IBusinessLabExecutiveInfoService;
@@ -14,6 +15,7 @@
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.*;
 
@@ -32,7 +34,7 @@
     @Autowired
     private IBusinessLabExecutiveInfoService labExecutiveInfoService;
 
-    @ApiOperation("实验室检测-部门检测-查询各状态列表（待检测、检测中、检测完）")
+    @ApiOperation("实验室任务-查询各状态列表（待检测、检测中、检测完）")
     @PostMapping("/deptExecutive/List")
     public ReturnDTO<PageInfoBT<SampleLabExecutiveListResponse>> queryDeptExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
@@ -43,10 +45,19 @@
         return ReturnUtil.success(super.packForBT(labExecutiveInfoService.deptLabExecutiveListPage(page, labExecutiveListRequest)));
     }
 
-    /**
-     * 实验室检测-我的检测-查询各状态列表（待检测、检测中、检测完）
-     */
-    @ApiOperation("实验室检测-我的检测-查询各状态列表（待检测、检测中、检测完）")
+    @ApiOperation("实验室任务导出")
+    @PostMapping("/deptExecutive/export")
+    public void deptExportList(@RequestBody @Valid SampleLabExecutiveListRequest request) throws Exception {
+        List<SampleLabExecutiveListResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = labExecutiveInfoService.deptLabExecutiveListByIds(request.getMeasureStatus(), request.getIds());
+        } else {
+            list = labExecutiveInfoService.deptLabExecutiveList(request);
+        }
+        super.exportExcel(SampleLabExecutiveListResponse.class, list, ExportEnum.DEPT_EXECUTIVE_TASK.getSheetName());
+    }
+
+    @ApiOperation("我的任务-查询各状态列表（待检测、检测中、检测完）")
     @PostMapping("/myExecutive/list")
     public ReturnDTO<PageInfoBT<SampleLabExecutiveListResponse>> queryMyExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
@@ -57,19 +68,25 @@
         return ReturnUtil.success(super.packForBT(labExecutiveInfoService.myLabExecutiveListPage(page, labExecutiveListRequest)));
     }
 
-    /**
-     * 实验室检测-我的检测-查询各状态样品数量（待检测、检测中、检测完）
-     */
-    @ApiOperation("实验室检测-我的检测-查询各状态样品数量（待检测、检测中、检测完）")
+    @ApiOperation("我的任务导出")
+    @PostMapping("/myExecutive/export")
+    public void exportList(@RequestBody @Valid SampleLabExecutiveListRequest request) throws Exception {
+        List<SampleLabExecutiveListResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = labExecutiveInfoService.myLabExecutiveListByIds(request.getMeasureStatus(), request.getIds());
+        } else {
+            list = labExecutiveInfoService.myLabExecutiveList(request);
+        }
+        super.exportExcel(SampleLabExecutiveListResponse.class, list, ExportEnum.MY_EXECUTIVE_TASK.getSheetName());
+    }
+
+    @ApiOperation("我的任务-查询各状态样品数量（待检测、检测中、检测完）")
     @GetMapping("/myExecutive/amount")
     public ReturnDTO<List<SampleAmountResponse>> queryMyExecutiveAmount() {
         return ReturnUtil.success(labExecutiveInfoService.myExecutiveAmount());
     }
 
-    /**
-     * 实验室检测-部门检测-分配（分配给具体人员）
-     */
-    @ApiOperation("实验室检测-部门检测-分配按钮（分配给具体人员）")
+    @ApiOperation("实验室任务-分配按钮（分配给具体人员）")
     @PostMapping("/deptExecutive/allocate")
     public ReturnDTO allocateStaff(@RequestBody @Valid SampleAllocateRequest sampleAllocateRequest, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -78,10 +95,7 @@
         return labExecutiveInfoService.allocateStaff(sampleAllocateRequest);
     }
 
-    /**
-     * 实验室检测-我的检测-检定人扫描收入（待检测->检测中）
-     */
-    @ApiOperation("实验室检测-我的检测-检定人扫描收入（待检测->检测中）")
+    @ApiOperation("我的任务-检定人扫描收入（待检测->检测中）")
     @PostMapping("/myExecutive/receive")
     public ReturnDTO sampleReceive(@RequestBody @Valid List<SampleOperateRequest> requestList, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -90,10 +104,7 @@
         return labExecutiveInfoService.sampleReceive(requestList);
     }
 
-    /**
-     * 实验室检测-负责人/检定人扫描检完（检测中->检测完）
-     */
-    @ApiOperation("实验室检测-负责人/检定人扫描检完（检测中->检测完）")
+    @ApiOperation("实验室任务-负责人/检定人扫描检完（检测中->检测完）")
     @PostMapping("/myExecutive/complete")
     public ReturnDTO sampleExecutiveComplete(@RequestBody @Valid List<SampleOperateRequest> requestList, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -102,10 +113,7 @@
         return labExecutiveInfoService.sampleExecutiveComplete(requestList);
     }
 
-    /**
-     * 实验室检测-部门检测/我的检测 编辑（只能修改应出具证书）
-     */
-    @ApiOperation("实验室检测-部门检测/我的检测 编辑（只能修改应出具证书）")
+    @ApiOperation("实验室任务/我的任务 编辑（只能修改应出具证书）")
     @PostMapping("/executive/update")
     public ReturnDTO updateExecutive(@RequestBody @Valid UpdateExecutiveRequest request, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -114,10 +122,7 @@
         return labExecutiveInfoService.updateExecutive(request);
     }
 
-    /**
-     * 实验室检测-部门检测/我的检测 详情
-     */
-    @ApiOperation("实验室检测-部门检测/我的检测 详情")
+    @ApiOperation("实验室任务/我的任务 详情")
     @PostMapping("/executive/detail")
     public ReturnDTO<ExecutiveDetailResponse> executiveDetail(@RequestBody @Valid ExecutiveDetailRequest request, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
@@ -131,7 +136,7 @@
      * 退回后会将下一个要执行的实验室检测状态更新为待分配，将后面的实验室顺序变更为连续（都进行减1）
      * 最后一个检测的实验室退回，等分发员再增加实验室或设备收发中的已收入直接手动点击完成
      */
-    @ApiOperation("实验室检测-部门检测/我的检测 退回（待检测/检测中->退回）")
+    @ApiOperation("实验室任务/我的任务 退回（待检测/检测中->退回）")
     @PostMapping("/executive/sendBack")
     public ReturnDTO executiveSendBack(@RequestBody @Valid ExecutiveSendBackRequest request, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -140,9 +145,6 @@
         return labExecutiveInfoService.sampleExecutiveSendBack(request);
     }
 
-    /**
-     * 分发员编辑实验室检测列表
-     */
     @ApiOperation("分发员编辑实验室检测列表")
     @PostMapping("/handOut/updateList")
     public ReturnDTO updateExecutiveList(@RequestBody @Valid UpdateExecutiveListRequest request, BindingResult bindingResult) {
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java
index 48a67ed..0c04f31 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java
@@ -10,6 +10,7 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.resource.customer.CustomerApprovalListRequest;
 import com.casic.missiles.dto.resource.customer.CustomerSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceCustomerInfo;
@@ -26,6 +27,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -55,6 +57,13 @@
         return customerInfoService.saveCustomerInfo(request);
     }
 
+    @ApiOperation("委托方名录导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody CustomerApprovalListRequest request) throws Exception {
+        List<BizResourceCustomerInfo> list = super.exportList(request);
+        super.exportExcel(BizResourceCustomerInfo.class, list, ExportEnum.CUSTOMER_INFO.getSheetName());
+    }
+
     @ApiOperation("委托方人员列表（分页）")
     @PostMapping("/person/listPage")
     public ReturnDTO<PageInfoBT<BizResourceCustomerStaff>> personListPage(@RequestBody IdDTO idDto) {
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
index 972ed4b..6418ea5 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
@@ -5,6 +5,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.resource.customer.SuggestFormApprovalListRequest;
 import com.casic.missiles.dto.resource.customer.SuggestFormSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceCustomerSuggestForm;
@@ -20,6 +21,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -50,4 +52,11 @@
         return suggestFormService.saveSuggestForm(request);
     }
 
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody SuggestFormApprovalListRequest request) throws Exception {
+        List<BizResourceCustomerSuggestForm> list = super.exportList(request);
+        super.exportExcel(BizResourceCustomerSuggestForm.class, list, ExportEnum.CUSTOMER_SUGGEST_FORM.getSheetName());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java
index 1934d1a..9e07eab 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java
@@ -15,12 +15,16 @@
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.resource.IEnvEnvironmentRecordConfigService;
 import com.casic.missiles.service.resource.IEnvEnvironmentRecordDataService;
+import com.casic.missiles.service.resource.IEnvLocationInfoService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
 import java.util.List;
@@ -39,6 +43,8 @@
     private IEnvEnvironmentRecordDataService environmentRecordDataService;
     @Autowired
     private IEnvEnvironmentRecordConfigService environmentRecordConfigService;
+    @Autowired
+    private IEnvLocationInfoService locationInfoService;
 
     @ApiOperation("环境记录单数据列表/详情")
     @PostMapping("/data/listPage")
@@ -95,4 +101,11 @@
         });
         return environmentRecordConfigService.deleteEnvironmentRecordConfig(idDTO.getId());
     }
+
+    @ApiOperation("地点列表")
+    @PostMapping("/location/listPage")
+    public ReturnDTO<PageInfoBT<LocationListResponse>> locationListPage(@RequestBody @Valid LocationListRequest request) {
+        Page<LocationListResponse> page = PageFactory.defaultPage();
+        return ReturnUtil.success(super.packForBT(locationInfoService.listPage(page, request)));
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java
index 82efe3f..e9561fa 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java
@@ -10,6 +10,7 @@
 import com.casic.missiles.dto.resource.seal.SealLogListRequest;
 import com.casic.missiles.dto.resource.seal.SealNoteApprovalListRequest;
 import com.casic.missiles.dto.resource.seal.SealNoteSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceSealUseLog;
@@ -27,6 +28,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -58,6 +60,13 @@
         return sealUseNoteService.saveSeal(request);
     }
 
+    @ApiOperation("印章使用登记导出（列表和导出中去掉经办人和监印人）")
+    @PostMapping("/listExport")
+    public void export(@RequestBody SealNoteApprovalListRequest request) throws Exception {
+        List<BizResourceSealUseNote> list = super.exportList(request);
+        super.exportExcel(BizResourceSealUseNote.class, list, ExportEnum.SEAL_NOTE.getSheetName());
+    }
+
     // TODO: 2023/7/28 印章使用日志：系统中使用印章时插入数据库
 
     @ApiOperation("印章使用日志列表（分页）")
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java
index 9b674fc..06b6521 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java
@@ -9,16 +9,20 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.resource.staff.StaffCertRequest;
 import com.casic.missiles.dto.resource.staff.StaffCertResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.service.resource.IBizResourceStaffInfoService;
 import com.casic.missiles.service.resource.IBizResourceStaffVerifierService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.List;
+
 /**
  * @Description:
  * @Author: wangpeng
@@ -41,9 +45,21 @@
         return ReturnUtil.success(super.packForBT(responsePage));
     }
 
+    @ApiOperation("证书逾期提醒导出")
+    @PostMapping("/listExport")
+    public void exportList(@RequestBody StaffCertRequest request) throws Exception {
+        List<StaffCertResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = staffInfoService.certListByIds(request.getIds());
+        } else {
+            list = staffInfoService.certList(request);
+        }
+        super.exportExcel(StaffCertResponse.class, list, ExportEnum.STAFF_CERTIFICATE_EXPIRE.getSheetName());
+    }
+
     @ApiOperation("证书逾期提醒")
     @PostMapping("/expirationReminder")
-    public ReturnDTO expirationReminder(@RequestBody IdDTO idDto) {
-        return verifierService.expirationReminder(idDto);
+    public ReturnDTO expirationReminder(@RequestBody IdDTO idDTO) {
+        return verifierService.expirationReminder(idDTO);
     }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java
index 3b251ad..a6e7850 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java
@@ -12,6 +12,7 @@
 import com.casic.missiles.dto.resource.staff.StaffListRequest;
 import com.casic.missiles.dto.resource.staff.TrainListRequest;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.*;
@@ -22,7 +23,10 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
 import java.util.List;
@@ -52,8 +56,19 @@
             throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
         }
         Page<BizResourceStaffInfo> page = PageFactory.defaultPage();
-        Page<BizResourceStaffInfo> responsePage = staffInfoService.listPage(page, request);
-        return ReturnUtil.success(super.packForBT(responsePage));
+        return ReturnUtil.success(super.packForBT(staffInfoService.listPage(page, request)));
+    }
+
+    @ApiOperation("人员登记导出")
+    @PostMapping("/listExport")
+    public void exportList(@RequestBody StaffListRequest request) throws Exception {
+        List<BizResourceStaffInfo> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = staffInfoService.listByIds(request.getIds());
+        } else {
+            list = staffInfoService.list(request);
+        }
+        super.exportExcel(BizResourceStaffInfo.class, list, ExportEnum.STAFF_INFO.getSheetName());
     }
 
     @ApiOperation("人员登记详情基础信息")
@@ -85,9 +100,9 @@
 
     @ApiOperation("科研教育列表（分页）")
     @PostMapping("/education/listPage")
-    public ReturnDTO<PageInfoBT<BizResourceStaffEducation>> educationListPage(@RequestBody IdDTO idDto) {
+    public ReturnDTO<PageInfoBT<BizResourceStaffEducation>> educationListPage(@RequestBody IdDTO idDTO) {
         Page<BizResourceStaffEducation> page = PageFactory.defaultPage();
-        Page<BizResourceStaffEducation> responsePage = staffInfoService.educationListPage(page, idDto);
+        Page<BizResourceStaffEducation> responsePage = staffInfoService.educationListPage(page, idDTO);
         return ReturnUtil.success(super.packForBT(responsePage));
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java
index af6aa86..d85d84a 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java
@@ -9,6 +9,7 @@
 import com.casic.missiles.dto.resource.outsideService.SupplierApprovalListRequest;
 import com.casic.missiles.dto.resource.outsideService.SupplierSaveResponse;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceSupplierAbility;
@@ -67,6 +68,13 @@
         return ReturnUtil.success(supplierInfoService.detail(idDTO.getId()));
     }
 
+    @ApiOperation("合格供方导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody SupplierApprovalListRequest request) throws Exception {
+        List<BizResourceSupplierInfo> list = super.exportList(request);
+        super.exportExcel(BizResourceSupplierInfo.class, list, ExportEnum.SUPPLIER_INFO.getSheetName());
+    }
+
     @ApiOperation("供方人员列表（分页）")
     @PostMapping("/person/listPage")
     public ReturnDTO<PageInfoBT<BizResourceSupplierPerson>> personListPage(@RequestBody IdDTO idDTO) {
diff --git a/casic-metering-api/src/main/resources/config/application.yml b/casic-metering-api/src/main/resources/config/application.yml
index 350db5f..ecff521 100644
--- a/casic-metering-api/src/main/resources/config/application.yml
+++ b/casic-metering-api/src/main/resources/config/application.yml
@@ -126,7 +126,7 @@
     #作者
     author: wangpeng
     #待生成对象表名
-    table-name: biz_equipment_technical_target_approval,biz_equipment_attachment_approval,biz_equipment_checkpoint_approval
+    table-name: biz_business_outsource_protocol
 
 reminder:
   #节点--common模块config包 ReminderNodeConfig配置
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
index 4a19e4e..d47d552 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
@@ -53,6 +53,7 @@
     SUGGEST_FORM_SAVE_FAILED(2509, "委托方意见登记表保存至草稿箱失败"),
     EXAMINE_FORM_SAVE_FAILED(2510, "要求、委托书及合同评审表保存至草稿箱失败"),
     CUSTOMER_EXIST_SAVE_FAILED(2511, "该委托方已存在，请重新选择"),
+    DUPLICATE_LOCATION_NO(2512, "地点编号已存在"),
 
     /**
      * 计量检定业务模块
@@ -68,6 +69,8 @@
     COMPLETE_SAMPLE_NOT_EXIST(2609, "检测中不存在扫描收入的样品"),
     CANNOT_CHANGE_MEASURE_INFO(2610, "无法更改非当前登录用户的检测信息"),
     NON_EXIST_ORDER_OR_SAMPLE(2611, "不存在该委托单或该委托单下的样品"),
+    OUTSOURCE_ACCESS_SAVE_FAILED(2612, "测试、校准或检定工作分包评审表保存至草稿箱失败"),
+    OUTSOURCE_PROTOCOL_SAVE_FAILED(2613, "测试、校准或检定工作分包协议书保存至草稿箱失败"),
 
     /**
      * 历史遗留备用
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
index 5089ad1..81a406b 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
@@ -10,54 +10,38 @@
     /**
      * 资源管理
      */
-    ENVIRONMENT_DATA_EXPORT("environmentData", "environmentData", "环境记录单数据"),
+    ENVIRONMENT_DATA_EXPORT("environmentData", "环境记录单数据", "环境记录单数据"),
+    STAFF_INFO("staffInfo", "人员登记", "人员登记"),
+    STAFF_CERTIFICATE_EXPIRE("certificateExpire", "证书逾期提醒", "证书逾期提醒"),
+    SUPPLIER_INFO("supplierInfo", "合格供方名录", "合格供方名录"),
+    CUSTOMER_INFO("customerInfo", "委托方名录", "委托方名录"),
+    CUSTOMER_SUGGEST_FORM("customerSuggestForm", "委托方意见登记表", "委托方意见登记表"),
+    SEAL_NOTE("sealNote", "印章使用登记", "印章使用登记"),
 
-    FILE_EXPORT("meterFileData", "meterFileData", "计量文件信息"),
-    TRAIN_PLAN_EXPORT("trainPlanData", "trainPlanData", "培训计划"),
-    TRAIN_LOG_EXPORT("trainLogData", "trainLogData", "培训记录"),
-    METER_ORGANIZE_EXPORT("meterOrganizeData", "meterOrganizeData", "计量组织"),
-    TRACE_SUPPLIER_EXPORT("traceSupplierData", "traceSupplierData", "溯源供方"),
-    SIGN_EXPORT("signData", "signData", "签名/签章"),
-    TEMPLATE_EXPORT("templateData", "templateData", "原始记录模板/证书报告模板"),
-    FIXED_ASSETS("meterFixedAssets", "meterFixedAssets", "固定资产"),
-    METER_EQUIPMENT("meterEquipment", "meterEquipment", "测量设备"),
-    CALIBRATION_TEST_EQUIPMENT("calibrationTestEquipment", "calibrationTestEquipment", "校准检定设备"),
-    MEASURE_ACCOUNT("measureAccount", "measureAccount", "测量工装"),
-    STANDARD_SUPPORT_EQUIPMENT("standardSupportEquipment", "standardSupportEquipment", "标准配套设备"),
-    STANDARD_EQUIPMENT("standardEquipment", "standardEquipment", "标准装置"),
-    FLOW_DEF_EXPORT("flowDefData", "flowDefData", "流程定义"),
-    STAFF_CERTIFICATE("certificate", "certificate", "计量人员证书"),
-    CHECK_INFO("checkInfo", "checkInfo", "设备管理点检测"),
-    EQUIPMENT_APPLY("equipmentApply", "equipmentApply", "设备借用"),
-    STANDARD_EQUIPMENT_REMIND("equipmentApplyRemind", "equipmentApplyRemind", "标准装置到期提醒"),
-    METER_PRICE("meterPrice", "meterPrice", "价格库"),
-    METER_STAFF("meterStaff", "meterStaff", "计量人员"),
-    STANDARD_EQUIPMENT_APPLY("standardEquipmentApply", "standardEquipmentApply", "标准装置申请"),
-    STATE_MANAGE_APPLY("stateManage", "stateManage", "状态管理"),
-    METER_ACCEPTANCE_CHECK("acceptanceCheck", "acceptanceCheck", "设备检修保养验收单"),
-    CUSTOMER_EXPORT("customerData", "customerData", "客户信息"),
-    ORDER_EXPORT("orderData", "orderData", "委托书信息"),
-    SAMPLE_EXPORT("sampleData", "sampleData", "样本信息"),
-    EXCHANGE_DATA("exchangeData", "exchangeData", "设备交接单"),
-    DISPATCH_DATA("dispatchData", "dispatchData", "设备收发"),
-    ENVIRONMENT_DATA("environmentData", "environmentData", "环境记录单"),
-    ORIGIN_DATA("originData", "originData", "原始记录"),
-    CERTIFICATE_REPORT("certificateReport", "certificateReport", "证书报告"),
-    ADVICE_EXPORT("adviceData", "adviceData", "客户反馈"),
-    HANDOUT_EXPORT("handoutData", "handoutData", "任务分发列表"),
-    OUTSOURCER_EXPORT("outsourcerData", "outsourcerData", "分包方"),
-    SITE_EXECUTIVE_EXPORT("siteExecutiveData", "siteExecutiveData", "现场测试、校准或检定"),
-    CERTIFICATE_PRINT_EXPORT("certificatePrintData", "certificatePrintData", "证书打印"),
-    DOWNLOAD_TEMPLATE("downloadTemplate", "downloadTemplate", "页面配置"),
-    OUTSOURCER_CERTIFICATE_EXPORT("outsourceCertificateData", "outsourceCertificateData", "分包证书"),
-    SETTLEMENT_INFO_EXPORT("settlementInfoData", "settlementInfoData", "业务结算"),
-    EQUIPMENT_REMIND("equipmentRemind", "equipmentRemind", "设备到期提醒"),
-    AGREEMENT_INFO_EXPORT("agreementInfoData", "agreementInfoData", "合同"),
-    WORK_STATISTICS_EXPORT("workStatisticsData", "workStatisticsData", "实时工作统计"),
-    DEPT_OUTPUT_EXPORT("deptOutputData", "deptOutputData", "部门产值分析"),
-    WORKLOAD_EXPORT("workloadData", "workloadData", "业务工作量分析"),
-    DEPT_COMPREHENSIVE_EXPORT("deptComprehensiveData", "deptComprehensiveData", "部门综合分析"),
-    ENVIRONMENTAL_RECORD("environmentalRecordData", "environmentalRecordData", "现场环境记录");
+    /**
+     * 计量检定业务
+     */
+    OUTSOURCER_EXPORT("outsourcerData", "分包方名录", "分包方名录"),
+    IDENTIFY_EXPORT("identifyData", "计量标识", "计量标识"),
+    ORDER_EXPORT("orderData", "任务单", "任务单"),
+    DISPATCH_DATA("dispatchData", "设备收发", "设备收发"),
+    HANDOUT_EXPORT("handoutData", "任务分发", "任务分发"),
+    SITE_EXECUTIVE_EXPORT("siteExecutiveData", "现场测试、校准或检定", "现场测试、校准或检定"),
+    CERTIFICATE_REPORT("certificateReport", "证书审批", "证书审批"),
+    CERTIFICATE_CHANGE_APPLY("certificateChangeApply", "证书报告补充或更换申请单", "证书报告补充或更换申请单"),
+    CERTIFICATE_PRINT("certificatePrintData", "证书打印审批", "证书打印审批"),
+    DEPT_EXECUTIVE_TASK("deptExecutiveTaskData", "实验室任务", "实验室任务"),
+    MY_EXECUTIVE_TASK("myExecutiveTaskData", "我的任务", "我的任务"),
+    OUTSOURCE_ASSESS("outsourceAssess", "测试、校准或检定工作分包评审表", "测试、校准或检定工作分包评审表"),
+    OUTSOURCE_PROTOCOL("outsourceProtocol", "测试、校准或检定工作分包协议书", "测试、校准或检定工作分包协议书"),
+
+    /**
+     * 系统管理
+     */
+    SIGN_EXPORT("signData", "签名", "签名"),
+    TEMPLATE_EXPORT("templateData", "文件模板", "文件模板"),
+    FLOW_DEF_EXPORT("flowDefData", "流程定义", "流程定义"),
+    DOWNLOAD_TEMPLATE("downloadTemplate", "流程定义", "页面配置");
 
     ExportEnum(String fileName, String sheetName, String description) {
         this.fileName = fileName;
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateRecordTypeCodeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateRecordTypeCodeEnum.java
index 31d913c..a963522 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateRecordTypeCodeEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateRecordTypeCodeEnum.java
@@ -46,4 +46,14 @@
     String SITE_EXECUTIVE_APPROVAL = "01";
     //《现场测试、校准或检定工作记录表》
     String SITE_EXECUTIVE_LOG = "02";
+
+    //测试、校准或检定工作分包协议书
+    String OUTSOURCE_PROTOCOL = "01";
+    //测试、校准或检定工作分包评审表
+    String OUTSOURCE_ACCESS = "02";
+    //测试、校准或检定工作分包通知书
+    String OUTSOURCE_NOTICE = "03";
+    //测试、校准或检定工作分包方名录
+    String OUTSOURCE_INFO = "04";
+
 }
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
index 24b8635..f78bd53 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
@@ -15,6 +15,10 @@
     String CERTIFICATE_CHANGE_APPLY_BEAN_NAME = "certificateChangeApplyBean";
     //现场测试、校准或检定
     String SITE_EXECUTIVE_BEAN_NAME = "siteExecutiveBean";
+    //测试、校准或检定工作分包评审表
+    String OUTSOURCE_ASSESS_BEAN_NAME = "outsourceAssessBean";
+    //测试、校准或检定工作分包协议书
+    String OUTSOURCE_PROTOCOL_BEAN_NAME = "outsourceProtocolBean";
 
     /*********************************设备与装置************************************/
     //设备台账
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 b21c661..6b86fd1 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
@@ -18,6 +18,8 @@
     OUTSOURCER_APPROVAL(OUTSOURCER_BEAN_NAME, ""),
     CERTIFICATE_CHANGE_APPROVAL(CERTIFICATE_CHANGE_APPLY_BEAN_NAME, ""),
     SITE_EXECUTIVE_APPROVAL(SITE_EXECUTIVE_BEAN_NAME, ""),
+    OUTSOURCE_ASSESS_APPROVAL(OUTSOURCE_ASSESS_BEAN_NAME, ""),
+    OUTSOURCE_PROTOCOL_APPROVAL(OUTSOURCE_PROTOCOL_BEAN_NAME, ""),
 
     ACTION_STATUS_MAP(new HashMap<String, AwareActionStatusEnum>() {
         {
@@ -47,6 +49,10 @@
             put(ApplyFromIdEnum.CERTIFICATE_CHANGE_APPROVAL.getCode(), CERTIFICATE_CHANGE_APPROVAL);
             //现场测试、校准或检定审批
             put(ApplyFromIdEnum.SITE_EXECUTIVE_APPROVAL.getCode(), SITE_EXECUTIVE_APPROVAL);
+            //测试、校准或检定工作分包评审表
+            put(ApplyFromIdEnum.OUTSOURCE_ASSESS_APPROVAL.getCode(), OUTSOURCE_ASSESS_APPROVAL);
+            //测试、校准或检定工作分包协议书
+            put(ApplyFromIdEnum.OUTSOURCE_PROTOCOL_APPROVAL.getCode(), OUTSOURCE_PROTOCOL_APPROVAL);
         }
     });
     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 934405e..c7410bd 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
@@ -9,6 +9,8 @@
     CERTIFICATE_CHANGE_APPROVAL("jljdywzsbchghsqd", MessageSourceModuleEnum.BUSINESS.getCode(), "证书/报告补充或更换申请单"),
     OUTSOURCER_APPROVAL("jljdywcsjzhgfbfml", MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定合格分包方名录"),
     SITE_EXECUTIVE_APPROVAL("jljdywxccsjzsp", MessageSourceModuleEnum.BUSINESS.getCode(), "现场测试、校准或检定审批"),
+    OUTSOURCE_ASSESS_APPROVAL("jljdywcsjzfbpsb", MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包评审表"),
+    OUTSOURCE_PROTOCOL_APPROVAL("jljdywcsjzfbxys", MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包协议书"),
 
 
     /*******************************************设备与装置*********************************************/
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/GeneralApprovalMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/GeneralApprovalMapper.java
index 4fb7344..0c9d6ae 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/GeneralApprovalMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/GeneralApprovalMapper.java
@@ -17,8 +17,4 @@
 
     Page<O> selectBatchForApprovalList(Page<O> page, @Param("request") R request, @Param("businessKeys") List<String> businessKeys);
 
-//    Page<O> selectListPage(Page<O> page, @Param("request") R request);
-
-//    Long selectMaxNo();
-
 }
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceAssessMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceAssessMapper.java
index 7867bb8..ba59009 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceAssessMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceAssessMapper.java
@@ -1,7 +1,12 @@
 package com.casic.missiles.mapper.business;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.business.outsource.OutsourceAssessApprovalListRequest;
+import com.casic.missiles.mapper.GeneralApprovalMapper;
 import com.casic.missiles.model.business.BizBusinessOutsourceAssess;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * <p>
@@ -11,6 +16,10 @@
  * @author wangpeng
  * @since 2023-08-16
  */
-public interface BizBusinessOutsourceAssessMapper extends BaseMapper<BizBusinessOutsourceAssess> {
+public interface BizBusinessOutsourceAssessMapper extends GeneralApprovalMapper<BizBusinessOutsourceAssess, BizBusinessOutsourceAssess, OutsourceAssessApprovalListRequest> {
+
+    Page<BizBusinessOutsourceAssess> selectBatchForApprovalList(Page<BizBusinessOutsourceAssess> page, @Param("request") OutsourceAssessApprovalListRequest request, @Param("businessKeys") List<String> businessKeys);
+
+    Long selectMaxProjectNo();
 
 }
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceProtocolMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceProtocolMapper.java
new file mode 100644
index 0000000..e6aba35
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceProtocolMapper.java
@@ -0,0 +1,24 @@
+package com.casic.missiles.mapper.business;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.business.outsource.OutsourceProtocolApprovalListRequest;
+import com.casic.missiles.mapper.GeneralApprovalMapper;
+import com.casic.missiles.model.business.BizBusinessOutsourceProtocol;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 计量检定业务-分包管理-测试、校准或检定工作分包协议书 Mapper 接口
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-08-24
+ */
+public interface BizBusinessOutsourceProtocolMapper extends GeneralApprovalMapper<BizBusinessOutsourceProtocol, BizBusinessOutsourceProtocol, OutsourceProtocolApprovalListRequest> {
+
+    Page<BizBusinessOutsourceProtocol> selectBatchForApprovalList(Page<BizBusinessOutsourceProtocol> page, @Param("request") OutsourceProtocolApprovalListRequest request, @Param("businessKeys") List<String> businessKeys);
+
+    Long selectMaxProtocolNo();
+}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/EnvLocationInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/EnvLocationInfoMapper.java
new file mode 100644
index 0000000..49eff87
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/EnvLocationInfoMapper.java
@@ -0,0 +1,21 @@
+package com.casic.missiles.mapper.resource;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.resource.environment.LocationListRequest;
+import com.casic.missiles.dto.resource.environment.LocationListResponse;
+import com.casic.missiles.model.resource.EnvLocationInfo;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * <p>
+ * 实验室环境监控系统-设备表 Mapper 接口
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-06-07
+ */
+public interface EnvLocationInfoMapper extends BaseMapper<EnvLocationInfo> {
+
+    Page<LocationListResponse> selectLocationListPage(Page<LocationListResponse> page, @Param("request") LocationListRequest request);
+}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java
index de124db..85ed0f7 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java
@@ -1,7 +1,9 @@
 package com.casic.missiles.mapper.system;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.dto.system.SignDetailResponse;
+import com.casic.missiles.dto.system.SignListRequest;
 import com.casic.missiles.model.system.SystemSign;
 import org.apache.ibatis.annotations.Param;
 
@@ -22,4 +24,8 @@
     SignDetailResponse selectSignDetailById(Long id);
 
     List<SystemSign> selectUsableSignList(@Param("userId") Long userId);
+
+    Page<SystemSign> selectSignListPage(Page<SystemSign> page, @Param("request") SignListRequest request);
+
+    List<SystemSign> selectSignList(@Param("request") SignListRequest request);
 }
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateChangeApplyMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateChangeApplyMapper.xml
index d798447..c496092 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateChangeApplyMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateChangeApplyMapper.xml
@@ -30,31 +30,31 @@
         SELECT *
         FROM biz_business_certificate_change_apply
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.changeApplyNo != null and request.changeApplyNo !=''">
+        <if test="request != null and request.changeApplyNo != null and request.changeApplyNo !=''">
             and change_apply_no like concat('%',#{request.changeApplyNo},'%')
         </if>
-        <if test="request.changeReportNo != null and request.changeReportNo !=''">
+        <if test="request != null and request.changeReportNo != null and request.changeReportNo !=''">
             and change_report_no like concat('%',#{request.changeReportNo},'%')
         </if>
-        <if test="request.changeReportName != null and request.changeReportName !=''">
+        <if test="request != null and request.changeReportName != null and request.changeReportName !=''">
             and change_report_name like concat('%',#{request.changeReportName},'%')
         </if>
-        <if test="request.changeType != null and request.changeType !=''">
+        <if test="request != null and request.changeType != null and request.changeType !=''">
             and change_type = #{request.changeType}
         </if>
-        <if test="request.createUserName != null and request.createUserName !=''">
+        <if test="request != null and request.createUserName != null and request.createUserName !=''">
             and create_user_name like concat('%',#{request.createUserName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificatePrintMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificatePrintMapper.xml
index b66cd99..49c0ac8 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificatePrintMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificatePrintMapper.xml
@@ -31,34 +31,34 @@
         LEFT JOIN biz_business_order_sample_relation bosr ON (bosr.order_id = bcr.order_id AND bosr.sample_id = bcr.sample_id)
         LEFT JOIN biz_business_order_info boi ON boi.id = bosr.order_id
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and bcp.approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.printStatus != null and request.printStatus !=''">
+        <if test="request != null and request.printStatus != null and request.printStatus !=''">
             and print_status = #{request.printStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and bcp.create_user_id = #{request.createUserId}
         </if>
-        <if test="request.certificateReportNo != null and request.certificateReportNo !=''">
+        <if test="request != null and request.certificateReportNo != null and request.certificateReportNo !=''">
             and bcr.certificate_report_no like concat('%',#{request.certificateReportNo},'%')
         </if>
-        <if test="request.certificateReportName != null and request.certificateReportName !=''">
+        <if test="request != null and request.certificateReportName != null and request.certificateReportName !=''">
             and bcr.certificate_report_name like concat('%',#{request.certificateReportName},'%')
         </if>
-        <if test="request.customerName != null and request.customerName !=''">
+        <if test="request != null and request.customerName != null and request.customerName !=''">
             and boi.customer_name like concat('%',#{request.customerName},'%')
         </if>
-        <if test="request.sampleNo != null and request.sampleNo !=''">
+        <if test="request != null and request.sampleNo != null and request.sampleNo !=''">
             and bosr.sample_no like concat('%',#{request.sampleNo},'%')
         </if>
-        <if test="request.sampleName != null and request.sampleName !=''">
+        <if test="request != null and request.sampleName != null and request.sampleName !=''">
             and bosr.sample_name like concat('%',#{request.sampleName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and bcp.create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and bcp.create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml
index b366034..767695d 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml
@@ -46,33 +46,37 @@
         SELECT bcr.*, bosr.sample_no, bosr.sample_name, bosr.sample_model, rsi.staff_name
         FROM biz_business_certificate_report bcr
         LEFT JOIN biz_business_order_sample_relation bosr ON (bosr.order_id = bcr.order_id AND bosr.sample_id = bcr.sample_id)
+        LEFT JOIN biz_business_order_info boi ON boi.id = bcr.order_id
         LEFT JOIN biz_resource_staff_info rsi ON rsi.id = bcr.measure_person_id
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and bcr.approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and bcr.create_user_id = #{request.createUserId}
         </if>
-        <if test="request.certificateReportNo != null and request.certificateReportNo !=''">
+        <if test="request != null and request.customerId != null and request.customerId !=''">
+            and boi.customer_id = #{request.customerId}
+        </if>
+        <if test="request != null and request.certificateReportNo != null and request.certificateReportNo !=''">
             and bcr.certificate_report_no like concat('%',#{request.certificateReportNo},'%')
         </if>
-        <if test="request.certificateReportName != null and request.certificateReportName !=''">
+        <if test="request != null and request.certificateReportName != null and request.certificateReportName !=''">
             and bcr.certificate_report_name like concat('%',#{request.certificateReportName},'%')
         </if>
-        <if test="request.sampleNo != null and request.sampleNo !=''">
+        <if test="request != null and request.sampleNo != null and request.sampleNo !=''">
             and bosr.sample_no like concat('%',#{request.sampleNo},'%')
         </if>
-        <if test="request.measureCategory != null and request.measureCategory !=''">
+        <if test="request != null and request.measureCategory != null and request.measureCategory !=''">
             and bcr.measure_category = #{request.measureCategory}
         </if>
-        <if test="request.measurePerson != null and request.measurePerson !=''">
+        <if test="request != null and request.measurePerson != null and request.measurePerson !=''">
             and rsi.staff_name like concat('%',#{request.measurePerson},'%')
         </if>
-        <if test="request.calibrationTimeStart != null and request.calibrationTimeStart !=''">
+        <if test="request != null and request.calibrationTimeStart != null and request.calibrationTimeStart !=''">
             and bcr.calibration_time &gt;= #{request.calibrationTimeStart}
         </if>
-        <if test="request.calibrationTimeEnd != null and request.calibrationTimeEnd !=''">
+        <if test="request != null and request.calibrationTimeEnd != null and request.calibrationTimeEnd !=''">
             and bcr.calibration_time &lt;= #{request.calibrationTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceAssessMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceAssessMapper.xml
index d0fcf8b..c22c101 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceAssessMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceAssessMapper.xml
@@ -7,6 +7,8 @@
         <id column="id" property="id" />
         <result column="project_no" property="projectNo" />
         <result column="project_name" property="projectName" />
+        <result column="lab_code" property="labCode" />
+        <result column="group_code" property="groupCode" />
         <result column="applicant_id" property="applicantId" />
         <result column="applicant_name" property="applicantName" />
         <result column="applicant_time" property="applicantTime" />
@@ -31,7 +33,45 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, project_no, project_name, applicant_id, applicant_name, applicant_time, minio_file_name, remark, create_user_id, create_user_name, outsourcer_id, pre_start_time, pre_end_time, outsource_reason, pre_cost, approval_status, process_id, approve_situation, traceability, test_method, technique_ability, create_time, update_time
+        id, project_no, project_name, lab_code, group_code, applicant_id, applicant_name, applicant_time, minio_file_name, remark, create_user_id, create_user_name, outsourcer_id, pre_start_time, pre_end_time, outsource_reason, pre_cost, approval_status, process_id, approve_situation, traceability, test_method, technique_ability, create_time, update_time
     </sql>
 
+    <select id="selectMaxProjectNo" resultType="java.lang.Long">
+        SELECT IFNULL(max(RIGHT(project_no, 3)), 0) from biz_business_outsource_assess
+    </select>
+
+    <select id="selectBatchForApprovalList" resultMap="BaseResultMap">
+        SELECT bboa.*, bboi.outsourcer_name, bboi.director
+        FROM biz_business_outsource_assess bboa
+        LEFT JOIN biz_business_outsourcer_info bboi ON bboa.outsourcer_id = bboi.id
+        WHERE 1=1
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
+            and bboa.approval_status = #{request.approvalStatus}
+        </if>
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
+            and bboa.create_user_id = #{request.createUserId}
+        </if>
+        <if test="request != null and request.projectNo != null and request.projectNo !=''">
+            and bboa.project_no like concat('%',#{request.projectNo},'%')
+        </if>
+        <if test="request != null and request.outsourcerName != null and request.outsourcerName !=''">
+            and bboi.outsourcer_name like concat('%',#{request.outsourcerName},'%')
+        </if>
+        <if test="request != null and request.applicantName != null and request.applicantName !=''">
+            and bboa.applicant_name like concat('%',#{request.applicantName},'%')
+        </if>
+        <if test="request != null and request.applicantTimeStart != null and request.applicantTimeStart !=''">
+            and bboa.applicant_time &gt;= #{request.applicantTimeStart}
+        </if>
+        <if test="request != null and request.applicantTimeEnd != null and request.applicantTimeEnd !=''">
+            and bboa.applicant_time &lt;= #{request.applicantTimeEnd}
+        </if>
+        <if test="businessKeys != null">
+            and bboa.id in
+            <foreach collection="businessKeys" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
+        ORDER BY bboa.create_time DESC
+    </select>
 </mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceProtocolMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceProtocolMapper.xml
new file mode 100644
index 0000000..b7b2149
--- /dev/null
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceProtocolMapper.xml
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.mapper.business.BizBusinessOutsourceProtocolMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.business.BizBusinessOutsourceProtocol">
+        <id column="id" property="id" />
+        <result column="protocol_no" property="protocolNo" />
+        <result column="project_name" property="projectName" />
+        <result column="lab_code" property="labCode" />
+        <result column="group_code" property="groupCode" />
+        <result column="outsourcer_id" property="outsourcerId" />
+        <result column="remark" property="remark" />
+        <result column="outsource_no" property="outsourceNo" />
+        <result column="outsource_name" property="outsourceName" />
+        <result column="contacts" property="contacts" />
+        <result column="mobile" property="mobile" />
+        <result column="address" property="address" />
+        <result column="require_date" property="requireDate" />
+        <result column="outsource_cost" property="outsourceCost" />
+        <result column="director" property="director" />
+        <result column="item" property="item" />
+        <result column="requires" property="requires" />
+        <result column="create_user_id" property="createUserId" />
+        <result column="create_user_name" property="createUserName" />
+        <result column="approval_status" property="approvalStatus" />
+        <result column="process_id" property="processId" />
+        <result column="create_time" property="createTime" />
+        <result column="update_time" property="updateTime" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, protocol_no, project_name, lab_code, group_code, outsourcer_id, remark, outsource_no, outsource_name, contacts, mobile, address, require_date, outsource_cost, director, item, requires, create_user_id, create_user_name, approval_status, process_id, create_time, update_time
+    </sql>
+
+    <select id="selectMaxProtocolNo" resultType="java.lang.Long">
+        SELECT IFNULL(max(RIGHT(protocol_no, 3)), 0) from biz_business_outsource_protocol
+    </select>
+
+    <select id="selectBatchForApprovalList" resultMap="BaseResultMap">
+        SELECT *
+        FROM biz_business_outsource_protocol
+        WHERE 1=1
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
+            and approval_status = #{request.approvalStatus}
+        </if>
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
+            and create_user_id = #{request.createUserId}
+        </if>
+        <if test="request != null and request.protocolNo != null and request.protocolNo !=''">
+            and protocol_no like concat('%',#{request.protocolNo},'%')
+        </if>
+        <if test="request != null and request.outsourcerName != null and request.outsourcerName !=''">
+            and outsourcer_name like concat('%',#{request.outsourcerName},'%')
+        </if>
+        <if test="request != null and request.applicantName != null and request.applicantName !=''">
+            and create_user_name like concat('%',#{request.applicantName},'%')
+        </if>
+        <if test="request != null and request.applicantTimeStart != null and request.applicantTimeStart !=''">
+            and create_time &gt;= #{request.applicantTimeStart}
+        </if>
+        <if test="request != null and request.applicantTimeEnd != null and request.applicantTimeEnd !=''">
+            and create_time &lt;= #{request.applicantTimeEnd}
+        </if>
+        <if test="businessKeys != null">
+            and id in
+            <foreach collection="businessKeys" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
+        ORDER BY create_time DESC
+    </select>
+</mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourcerInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourcerInfoMapper.xml
index 510a80b..3049b54 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourcerInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourcerInfoMapper.xml
@@ -7,6 +7,8 @@
         <id column="id" property="id" />
         <result column="outsourcer_no" property="outsourcerNo" />
         <result column="outsourcer_name" property="outsourcerName" />
+        <result column="lab_code" property="labCode" />
+        <result column="group_code" property="groupCode" />
         <result column="outsourcer_brief_name" property="outsourcerBriefName" />
         <result column="outsourcer_size" property="outsourcerSize" />
         <result column="business_size" property="businessSize" />
@@ -55,32 +57,32 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, outsourcer_no, outsourcer_name, outsourcer_brief_name, outsourcer_size, business_size, grade, evaluation, tax_number, bank_account, bank_name, bank_account_number, postal_code, director, phone, fax, mobile, email, website, address_country, address_province, address_city, address_area, full_address, address_country_name, address_province_name, address_city_name, address_area_name, invoice_country, invoice_province, invoice_city, invoice_area, invoice_full_address, invoice_country_name, invoice_province_name, invoice_city_name, invoice_area_name, business_scope, business_content, minio_file_name, approval_status, process_id, remark, create_user_id, create_user_name, create_time, update_time
+        id, outsourcer_no, outsourcer_name, lab_code, group_code, outsourcer_brief_name, outsourcer_size, business_size, grade, evaluation, tax_number, bank_account, bank_name, bank_account_number, postal_code, director, phone, fax, mobile, email, website, address_country, address_province, address_city, address_area, full_address, address_country_name, address_province_name, address_city_name, address_area_name, invoice_country, invoice_province, invoice_city, invoice_area, invoice_full_address, invoice_country_name, invoice_province_name, invoice_city_name, invoice_area_name, business_scope, business_content, minio_file_name, approval_status, process_id, remark, create_user_id, create_user_name, create_time, update_time
     </sql>
 
     <select id="selectBatchForApprovalList" resultMap="BaseResultMap">
         SELECT *
         FROM biz_business_outsourcer_info
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.outsourcerNo != null and request.outsourcerNo !=''">
+        <if test="request != null and request.outsourcerNo != null and request.outsourcerNo !=''">
             and outsourcer_no like concat('%',#{request.outsourcerNo},'%')
         </if>
-        <if test="request.outsourcerName != null and request.outsourcerName !=''">
+        <if test="request != null and request.outsourcerName != null and request.outsourcerName !=''">
             and outsourcer_name like concat('%',#{request.outsourcerName},'%')
         </if>
-        <if test="request.director != null and request.director !=''">
+        <if test="request != null and request.director != null and request.director !=''">
             and director like concat('%',#{request.director},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
@@ -93,6 +95,6 @@
     </select>
 
     <select id="selectMaxNo" resultType="java.lang.Long">
-        SELECT IFNULL(max(RIGHT(outsourcer_no, 12)), 0) from biz_business_outsourcer_info
+        SELECT IFNULL(max(RIGHT(outsourcer_no, 3)), 0) from biz_business_outsourcer_info
     </select>
 </mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessSiteExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessSiteExecutiveInfoMapper.xml
index 135c5d0..3c5ae79 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessSiteExecutiveInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessSiteExecutiveInfoMapper.xml
@@ -38,25 +38,25 @@
         FROM biz_business_site_executive_info bsei
         LEFT JOIN biz_resource_customer_info rci ON bsei.customer_id = rci.id
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and bsei.approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and bsei.create_user_id = #{request.createUserId}
         </if>
-        <if test="request.siteExecutiveNo != null and request.siteExecutiveNo !=''">
+        <if test="request != null and request.siteExecutiveNo != null and request.siteExecutiveNo !=''">
             and bsei.site_executive_no like concat('%',#{request.siteExecutiveNo},'%')
         </if>
-        <if test="request.customerName != null and request.customerName !=''">
+        <if test="request != null and request.customerName != null and request.customerName !=''">
             and rci.outsourcer_name like concat('%',#{request.customerName},'%')
         </if>
-        <if test="request.applyName != null and request.applyName !=''">
+        <if test="request != null and request.applyName != null and request.applyName !=''">
             and bsei.apply_name like concat('%',#{request.applyName},'%')
         </if>
-        <if test="request.applyTimeStart != null and request.applyTimeStart !=''">
+        <if test="request != null and request.applyTimeStart != null and request.applyTimeStart !=''">
             and bsei.apply_time &gt;= #{request.applyTimeStart}
         </if>
-        <if test="request.applyTimeEnd != null and request.applyTimeEnd !=''">
+        <if test="request != null and request.applyTimeEnd != null and request.applyTimeEnd !=''">
             and bsei.apply_time &lt;= #{request.applyTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml
index 84d9e2a..6bd38a9 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml
@@ -105,6 +105,12 @@
         <if test="request.isUrgent != null and request.isUrgent !=''">
             AND bo.is_urgent = #{request.isUrgent}
         </if>
+        <if test="request.ids != null">
+            and blei.id in
+            <foreach collection="request.ids" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
         ORDER BY blei.update_time DESC
     </select>
 
@@ -137,6 +143,12 @@
         <if test="request.isUrgent != null and request.isUrgent !=''">
             AND bo.is_urgent = #{request.isUrgent}
         </if>
+        <if test="request.ids != null">
+            and blei.id in
+            <foreach collection="request.ids" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
         ORDER BY blei.update_time DESC
     </select>
 
diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardInfoMapper.xml
index 1a5551b..2ed8d17 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardInfoMapper.xml
@@ -45,12 +45,6 @@
         FROM biz_equipment_standard_info besi
         LEFT JOIN biz_equipment_standard_technology_relation bestr ON besi.standard_no = bestr.standard_no
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
-            and besi.approval_status = #{request.approvalStatus}
-        </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
-            and besi.create_user_id = #{request.createUserId}
-        </if>
         <if test="request.standardName != null and request.standardName !=''">
             and besi.standard_name like concat('%',#{request.standardName},'%')
         </if>
diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardTechnologyRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardTechnologyRelationMapper.xml
index fc7e16c..cd03c8c 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardTechnologyRelationMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardTechnologyRelationMapper.xml
@@ -6,6 +6,7 @@
     <resultMap id="BaseResultMap" type="com.casic.missiles.model.equipment.BizEquipmentStandardTechnologyRelation">
         <id column="id" property="id" />
         <result column="technology_file_id" property="technologyFileId" />
+        <result column="technology_file_no" property="technologyFileNo" />
         <result column="technology_file_name" property="technologyFileName" />
         <result column="standard_id" property="standardId" />
         <result column="standard_no" property="standardNo" />
@@ -14,7 +15,7 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, technology_file_id, technology_file_name, standard_id, remark
+        id, technology_file_id, technology_file_no, technology_file_name, standard_id, remark
     </sql>
 
 </mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceAuthorizeOrderMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceAuthorizeOrderMapper.xml
index ac5176c..554fe65 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceAuthorizeOrderMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceAuthorizeOrderMapper.xml
@@ -32,22 +32,22 @@
         SELECT *
         FROM biz_resource_authorize_order
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.orderNo != null and request.orderNo !=''">
+        <if test="request != null and request.orderNo != null and request.orderNo !=''">
             and order_no like concat('%',#{request.orderNo},'%')
         </if>
-        <if test="request.createUserName != null and request.createUserName !=''">
+        <if test="request != null and request.createUserName != null and request.createUserName !=''">
             and create_user_name like concat('%',#{request.createUserName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerExamineFormMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerExamineFormMapper.xml
index ab242f6..af7f98f 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerExamineFormMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerExamineFormMapper.xml
@@ -41,28 +41,28 @@
         SELECT *
         FROM biz_resource_customer_examine_form
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.formNo != null and request.formNo !=''">
+        <if test="request != null and request.formNo != null and request.formNo !=''">
             and form_no like concat('%',#{request.formNo},'%')
         </if>
-        <if test="request.labCode != null and request.labCode !=''">
+        <if test="request != null and request.labCode != null and request.labCode !=''">
             and lab_code like concat('%',#{request.labCode},'%')
         </if>
-        <if test="request.groupCode != null and request.groupCode !=''">
+        <if test="request != null and request.groupCode != null and request.groupCode !=''">
             and group_code like concat('%',#{request.groupCode},'%')
         </if>
-        <if test="request.createUserName != null and request.createUserName !=''">
+        <if test="request != null and request.createUserName != null and request.createUserName !=''">
             and create_user_name like concat('%',#{request.createUserName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerInfoMapper.xml
index fa8ffbc..06a2798 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerInfoMapper.xml
@@ -33,25 +33,25 @@
         SELECT *
         FROM biz_resource_customer_info
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.customerNo != null and request.customerNo !=''">
+        <if test="request != null and request.customerNo != null and request.customerNo !=''">
             and customer_no like concat('%',#{request.customerNo},'%')
         </if>
-        <if test="request.customerName != null and request.customerName !=''">
+        <if test="request != null and request.customerName != null and request.customerName !=''">
             and customer_name like concat('%',#{request.customerName},'%')
         </if>
-        <if test="request.contacts != null and request.contacts !=''">
+        <if test="request != null and request.contacts != null and request.contacts !=''">
             and contacts like concat('%',#{request.contacts},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerSuggestFormMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerSuggestFormMapper.xml
index 28f5bb2..1806662 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerSuggestFormMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerSuggestFormMapper.xml
@@ -33,28 +33,28 @@
         SELECT *
         FROM biz_resource_customer_suggest_form
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.formNo != null and request.formNo !=''">
+        <if test="request != null and request.formNo != null and request.formNo !=''">
             and form_no like concat('%',#{request.formNo},'%')
         </if>
-        <if test="request.customerName != null and request.customerName !=''">
+        <if test="request != null and request.customerName != null and request.customerName !=''">
             and customer_name like concat('%',#{request.customerName},'%')
         </if>
-        <if test="request.customerDeptName != null and request.customerDeptName !=''">
+        <if test="request != null and request.customerDeptName != null and request.customerDeptName !=''">
             and customer_dept_name like concat('%',#{request.customerDeptName},'%')
         </if>
-        <if test="request.createUserName != null and request.createUserName !=''">
+        <if test="request != null and request.createUserName != null and request.createUserName !=''">
             and create_user_name like concat('%',#{request.createUserName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSealUseNoteMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSealUseNoteMapper.xml
index ab37bc1..b02bb33 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSealUseNoteMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSealUseNoteMapper.xml
@@ -29,32 +29,32 @@
     </sql>
 
     <select id="selectBatchForApprovalList" resultMap="BaseResultMap">
-        SELECT *
+        SELECT brsun.*, brsi.seal_name, brsi.seal_type, brsi.approver_name
         FROM biz_resource_seal_use_note brsun
         JOIN biz_resource_seal_info brsi ON brsun.seal_id = brsi.id
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and brsun.approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and brsun.create_user_id = #{request.createUserId}
         </if>
-        <if test="request.sealName != null and request.sealName !=''">
+        <if test="request != null and request.sealName != null and request.sealName !=''">
             and brsi.seal_name like concat('%',#{request.sealName},'%')
         </if>
-        <if test="request.sealType != null and request.sealType !=''">
+        <if test="request != null and request.sealType != null and request.sealType !=''">
             and brsi.seal_type = #{request.sealType}
         </if>
-        <if test="request.applyDeptName != null and request.applyDeptName !=''">
+        <if test="request != null and request.applyDeptName != null and request.applyDeptName !=''">
             and brsun.apply_dept_name like concat('%',#{request.applyDeptName},'%')
         </if>
-        <if test="request.applyUserName != null and request.applyUserName !=''">
+        <if test="request != null and request.applyUserName != null and request.applyUserName !=''">
             and brsun.apply_user_name like concat('%',#{request.applyUserName},'%')
         </if>
-        <if test="request.applyTimeStart != null and request.applyTimeStart !=''">
+        <if test="request != null and request.applyTimeStart != null and request.applyTimeStart !=''">
             and brsun.apply_time &gt;= #{request.applyTimeStart}
         </if>
-        <if test="request.applyTimeEnd != null and request.applyTimeEnd !=''">
+        <if test="request != null and request.applyTimeEnd != null and request.applyTimeEnd !=''">
             and brsun.apply_time &lt;= #{request.applyTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml
index 119bf7d..4f8392a 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml
@@ -31,6 +31,12 @@
         <if test="request.deptName != null and request.deptName !=''">
             and brsi.dept_name like concat('%',#{request.deptName},'%')
         </if>
+        <if test="request.ids != null">
+            and brsv.id in
+            <foreach collection="request.ids" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
         ORDER BY brsv.grant_date DESC
     </select>
 
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSupplierInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSupplierInfoMapper.xml
index fe8d399..e8ce7ef 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSupplierInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSupplierInfoMapper.xml
@@ -48,28 +48,28 @@
         SELECT *
         FROM biz_resource_supplier_info
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.supplierNo != null and request.supplierNo !=''">
+        <if test="request != null and request.supplierNo != null and request.supplierNo !=''">
             and supplier_no like concat('%',#{request.supplierNo},'%')
         </if>
-        <if test="request.supplierName != null and request.supplierName !=''">
+        <if test="request != null and request.supplierName != null and request.supplierName !=''">
             and supplier_name like concat('%',#{request.supplierName},'%')
         </if>
-        <if test="request.director != null and request.director !=''">
+        <if test="request != null and request.director != null and request.director !=''">
             and director like concat('%',#{request.director},'%')
         </if>
-        <if test="request.supplierType != null and request.supplierType !=''">
+        <if test="request != null and request.supplierType != null and request.supplierType !=''">
             and supplier_type = #{request.supplierType}
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/EnvLocationInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/EnvLocationInfoMapper.xml
new file mode 100644
index 0000000..68bcf10
--- /dev/null
+++ b/casic-metering-dao/src/main/resources/mapper/resource/EnvLocationInfoMapper.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.mapper.resource.EnvLocationInfoMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.resource.EnvLocationInfo">
+        <id column="id" property="id" />
+        <result column="location_no" property="locationNo" />
+        <result column="location_name" property="locationName" />
+        <result column="location_position" property="locationPosition" />
+        <result column="create_user_id" property="createUserId" />
+        <result column="create_user" property="createUser" />
+        <result column="create_time" property="createTime" />
+        <result column="update_time" property="updateTime" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, location_no, location_name, location_position, create_user_id, create_user, create_time, update_time
+    </sql>
+
+    <select id="selectLocationListPage" resultType="com.casic.missiles.dto.resource.environment.LocationListResponse">
+        SELECT *
+        FROM env_location_info
+        WHERE 1=1
+        <if test="request.locationNo != null and request.locationNo !=''">
+            AND location_no LIKE concat('%',#{request.locationNo},'%')
+        </if>
+        <if test="request.locationName != null and request.locationName !=''">
+            AND location_name LIKE concat('%',#{request.locationName},'%')
+        </if>
+        ORDER BY create_time DESC
+    </select>
+
+</mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml
index b28c18f..8854047 100644
--- a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml
@@ -11,7 +11,6 @@
         <result column="sign_desc" property="signDesc" />
         <result column="sign_director" property="signDirector" />
         <result column="sign_user_id" property="signUserId" />
-        <result column="sign_type" property="signType" />
         <result column="minio_file_name" property="minioFileName" />
         <result column="create_time" property="createTime" />
         <result column="update_time" property="updateTime" />
@@ -28,7 +27,6 @@
         <result column="sign_name" property="signName" />
         <result column="sign_desc" property="signDesc" />
         <result column="sign_director" property="signDirector" />
-        <result column="sign_type" property="signType" />
         <result column="sign_user_id" property="signUserId" />
         <result column="minio_file_name" property="minioFileName" />
         <result column="create_time" property="createTime" />
@@ -62,4 +60,58 @@
         JOIN system_sign_user_relation ssur ON ss.id = ssur.sign_id
         WHERE ssur.user_id = #{userId}
     </select>
+
+    <select id="selectSignListPage" resultMap="BaseResultMap">
+        SELECT ss.*, sd.SIMPLE_NAME AS deptName
+        FROM system_sign ss
+        LEFT JOIN sys_user su ON su.id = ss.sign_user_id
+        LEFT JOIN sys_dept sd ON sd.id = su.dept_id
+        WHERE 1=1
+        <if test="request.signNo != null and request.signNo !=''">
+            AND ss.sign_no LIKE concat('%',#{request.signNo},'%')
+        </if>
+        <if test="request.signName != null and request.signName !=''">
+            AND ss.sign_name LIKE concat('%',#{request.signName},'%')
+        </if>
+        <if test="request.signDirector != null and request.signDirector !=''">
+            AND ss.sign_director LIKE concat('%',#{request.signDirector},'%')
+        </if>
+        <if test="request.signUserId != null and request.signUserId !=''">
+            AND ss.sign_user_id = #{request.signUserId}
+        </if>
+        <if test="request.createStartTime != null and request.createStartTime !=''">
+            AND DATE_FORMAT(ss.create_time,'%Y-%m-%d') &gt;= DATE_FORMAT(#{request.createStartTime},'%Y-%m-%d')
+        </if>
+        <if test="request.createEndTime != null and request.createEndTime !=''">
+            AND DATE_FORMAT(ss.create_time,'%Y-%m-%d')  &lt;= DATE_FORMAT(#{request.createEndTime},'%Y-%m-%d')
+        </if>
+        ORDER BY ss.create_time DESC
+    </select>
+
+    <select id="selectSignList" resultMap="BaseResultMap">
+        SELECT ss.*, sd.SIMPLE_NAME AS deptName
+        FROM system_sign ss
+        LEFT JOIN sys_user su ON su.id = ss.sign_user_id
+        LEFT JOIN sys_dept sd ON sd.id = su.dept_id
+        WHERE 1=1
+        <if test="request.signNo != null and request.signNo !=''">
+            AND ss.sign_no LIKE concat('%',#{request.signNo},'%')
+        </if>
+        <if test="request.signName != null and request.signName !=''">
+            AND ss.sign_name LIKE concat('%',#{request.signName},'%')
+        </if>
+        <if test="request.signDirector != null and request.signDirector !=''">
+            AND ss.sign_director LIKE concat('%',#{request.signDirector},'%')
+        </if>
+        <if test="request.signUserId != null and request.signUserId !=''">
+            AND ss.sign_user_id = #{request.signUserId}
+        </if>
+        <if test="request.createStartTime != null and request.createStartTime !=''">
+            AND DATE_FORMAT(ss.create_time,'%Y-%m-%d') &gt;= DATE_FORMAT(#{request.createStartTime},'%Y-%m-%d')
+        </if>
+        <if test="request.createEndTime != null and request.createEndTime !=''">
+            AND DATE_FORMAT(ss.create_time,'%Y-%m-%d')  &lt;= DATE_FORMAT(#{request.createEndTime},'%Y-%m-%d')
+        </if>
+        ORDER BY ss.create_time DESC
+    </select>
 </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 515050a..60f530b 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
@@ -47,8 +47,8 @@
     String STORAGE_LOCATION = "bizStorageLocation";
     //计量专业
     String MEASURE_MAJOR = "bizMeasureMajor";
-    //管理状态
-    String MANAGER_STATE = "bizManagerState";
+    //标准装置管理状态
+    String STANDARD_MANAGER_STATE = "bizStandardManagerState";
 
     /**
      * 资源管理 字典code
@@ -95,8 +95,6 @@
     String MEASURE_STATUS = "measureStatus";
     //检定方式
     String MEASURE_TYPE = "measureType";
-    //标识打印标志类型
-    String IDENTIFY_PRINT_TYPE = "bizBusinessIdentify";
     //变更类型
     String REPORT_CHANGE_TYPE = "bizCertChangeType";
     //规模类型
@@ -111,19 +109,24 @@
     String MEASURE_CATEGORY = "measureCategory";
     //检定结果
     String MEASURE_RESULT = "measureResult";
+    //分包原因
+    String OUTSOURCE_REASON = "outsourceReason";
+
+    /**
+     * 系统管理
+     */
+    String TEMPLATE_TYPE = "templateType";
+
 
     /**
      * 标准装置 字典code
      */
     //类别
     String STANDARD_CATEGORY = "standardCategory";
-    //管理状态
-    String STANDARD_MANAGER_STATE = "standardManagerState";
     //标准等级
     String STANDARD_LEVEL = "standardLevel";
     //传递范围
     String STANDARD_TRANSMIT_RANGE = "transmitRange";
-
     //资本来源
     String CAPITAL_SOURCE = "capitalSource";
     //标准装置-申请类型
@@ -148,8 +151,6 @@
     String CERTIFICATE_CLASS = "certificationClass";
     //证书管理-检校专业
     String CALIBRATION_MAJOR = "calibrationMajor";
-    //分包原因
-    String OUTSOURCE_REASON = "outsourceReason";
 
     /**
      * 工作台
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/BaseApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/BaseApprovalListRequest.java
index 73c12c1..80d7424 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/BaseApprovalListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/BaseApprovalListRequest.java
@@ -6,6 +6,7 @@
 
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotEmpty;
+import java.util.List;
 
 /**
  * @Description:
@@ -19,14 +20,14 @@
      * 表单id
      */
     @NotBlank(message = "表单id不能为空")
-    @ApiModelProperty(value = "表单id（流程定义对应的表单id，等价于业务id）", dataType = "String")
+    @ApiModelProperty(value = "表单id（流程定义对应的表单id，等价于业务id），导出接口不用传", dataType = "String")
     private String formId;
 
     /**
      * 审批状态类型，对应ApprovalStatusEnum
      */
     @NotEmpty(message = "审批状态类型不能为空")
-    @ApiModelProperty(value = "审批状态类型code", dataType = "String")
+    @ApiModelProperty(value = "审批状态类型code，导出接口不用传", dataType = "String")
     private String approvalStatus;
 
     @ApiModelProperty(hidden = true)
@@ -34,4 +35,7 @@
 
     @ApiModelProperty(hidden = true)
     private Long createUserId;
+
+    @ApiModelProperty(value = "导出ids", dataType = "List")
+    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificatePrintApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificatePrintApprovalListRequest.java
index b93d1c9..3cc2f4e 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificatePrintApprovalListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificatePrintApprovalListRequest.java
@@ -5,8 +5,6 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import java.util.List;
-
 /**
  * @Description:
  * @Author: wangpeng
@@ -38,7 +36,4 @@
 
     @ApiModelProperty(value = "创建结束时间", dataType = "String")
     private String createTimeEnd;
-
-    @ApiModelProperty(value = "导出ids", dataType = "List")
-    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportApprovalListRequest.java
index 4f7a038..c115847 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportApprovalListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportApprovalListRequest.java
@@ -5,8 +5,6 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import java.util.List;
-
 /**
  * @Description:
  * @Author: wangpeng
@@ -15,6 +13,8 @@
 @ApiModel
 @Data
 public class CertificateReportApprovalListRequest extends BaseApprovalListRequest {
+    @ApiModelProperty(value = "委托方id", dataType = "String")
+    private Long customerId;
 
     @ApiModelProperty(value = "证书报告编号", dataType = "String")
     private String certificateReportNo;
@@ -37,6 +37,4 @@
     @ApiModelProperty(value = "检校结束时间", dataType = "String")
     private String calibrationTimeEnd;
 
-    @ApiModelProperty(value = "导出ids", dataType = "List")
-    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/identify/IdentifyListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/identify/IdentifyListRequest.java
index 1b87ae6..f019203 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/identify/IdentifyListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/identify/IdentifyListRequest.java
@@ -4,6 +4,8 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * @Description:
  * @Author: wangpeng
@@ -26,4 +28,7 @@
 
     @ApiModelProperty(value = "打印结束时间", dataType = "String")
     private String createTimeEnd;
+
+    @ApiModelProperty(value = "导出ids", dataType = "List")
+    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListRequest.java
index 1264883..62415fb 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListRequest.java
@@ -7,6 +7,7 @@
 import lombok.Data;
 
 import javax.validation.constraints.NotBlank;
+import java.util.List;
 
 @Data
 @ApiModel
@@ -37,4 +38,6 @@
     @ApiModelProperty(value = "是否加急（1是0否null全部）", dataType = "Integer")
     private String isUrgent;
 
+    @ApiModelProperty(value = "导出ids", dataType = "List")
+    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListRequest.java
index 5201d7b..499760a 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListRequest.java
@@ -17,6 +17,9 @@
     @ApiModelProperty(value = "任务单编号", dataType = "String")
     private String orderNo;
 
+    @ApiModelProperty(value = "委托方id", dataType = "Long")
+    private Long customerId;
+
     @ApiModelProperty(value = "委托方名称", dataType = "String")
     private String customerName;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OrderSampleDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OrderSampleDTO.java
new file mode 100644
index 0000000..796edc0
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OrderSampleDTO.java
@@ -0,0 +1,19 @@
+package com.casic.missiles.dto.business.outsource;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/8/24 11:38
+ */
+@ApiModel
+@Data
+public class OrderSampleDTO {
+    @ApiModelProperty(value = "任务单id", dataType = "Long")
+    private Long orderId;
+    @ApiModelProperty(value = "受检设备id", dataType = "Long")
+    private Long sampleId;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceAssessApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceAssessApprovalListRequest.java
new file mode 100644
index 0000000..9a930c3
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceAssessApprovalListRequest.java
@@ -0,0 +1,30 @@
+package com.casic.missiles.dto.business.outsource;
+
+import com.casic.missiles.dto.BaseApprovalListRequest;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/8/24 11:01
+ */
+@ApiModel
+@Data
+public class OutsourceAssessApprovalListRequest extends BaseApprovalListRequest {
+    @ApiModelProperty(value = "评审表编号", dataType = "String")
+    private String projectNo;
+
+    @ApiModelProperty(value = "分包机构名称", dataType = "String")
+    private String outsourcerName;
+
+    @ApiModelProperty(value = "申请人", dataType = "String")
+    private String applicantName;
+
+    @ApiModelProperty(value = "申请时间开始", dataType = "String")
+    private String applicantTimeStart;
+
+    @ApiModelProperty(value = "申请时间结束", dataType = "String")
+    private String applicantTimeEnd;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceAssessSaveResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceAssessSaveResponse.java
new file mode 100644
index 0000000..8bf9aad
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceAssessSaveResponse.java
@@ -0,0 +1,20 @@
+package com.casic.missiles.dto.business.outsource;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/8/14 16:17
+ */
+@ApiModel
+@Data
+public class OutsourceAssessSaveResponse {
+    @ApiModelProperty(value = "主键id", dataType = "Long")
+    private Long id;
+
+    @ApiModelProperty(value = "编号", dataType = "String")
+    private String projectNo;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProtocolApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProtocolApprovalListRequest.java
new file mode 100644
index 0000000..0f32331
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProtocolApprovalListRequest.java
@@ -0,0 +1,30 @@
+package com.casic.missiles.dto.business.outsource;
+
+import com.casic.missiles.dto.BaseApprovalListRequest;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/8/24 15:01
+ */
+@ApiModel
+@Data
+public class OutsourceProtocolApprovalListRequest extends BaseApprovalListRequest {
+    @ApiModelProperty(value = "协议书编号", dataType = "String")
+    private String protocolNo;
+
+    @ApiModelProperty(value = "分包方名称", dataType = "String")
+    private String outsourcerName;
+
+    @ApiModelProperty(value = "申请人", dataType = "String")
+    private String applicantName;
+
+    @ApiModelProperty(value = "申请时间开始", dataType = "String")
+    private String applicantTimeStart;
+
+    @ApiModelProperty(value = "申请时间结束", dataType = "String")
+    private String applicantTimeEnd;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProtocolSaveResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProtocolSaveResponse.java
new file mode 100644
index 0000000..e324967
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProtocolSaveResponse.java
@@ -0,0 +1,20 @@
+package com.casic.missiles.dto.business.outsource;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/8/14 16:17
+ */
+@ApiModel
+@Data
+public class OutsourceProtocolSaveResponse {
+    @ApiModelProperty(value = "主键id", dataType = "Long")
+    private Long id;
+
+    @ApiModelProperty(value = "编号", dataType = "String")
+    private String protocolNo;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveApprovalListRequest.java
index f29f4e4..7047c28 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveApprovalListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveApprovalListRequest.java
@@ -5,8 +5,6 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import java.util.List;
-
 /**
  * @Description: 现场检测审批列表请求实体
  * @Author: wangpeng
@@ -30,7 +28,4 @@
     @ApiModelProperty(value = "申请时间结束", dataType = "String")
     private String applyTimeEnd;
 
-    @ApiModelProperty(value = "导出ids", dataType = "List")
-    private List<Long> ids;
-
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveDetailResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveDetailResponse.java
index 1f28752..394c934 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveDetailResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveDetailResponse.java
@@ -12,6 +12,18 @@
     @ApiModelProperty(value = "id，更新/删除使用参数", dataType = "Long")
     private Long id;
 
+    @ApiModelProperty(value = "实验室代码(字典code)", dataType = "String")
+    private String labCode;
+
+    @ApiModelProperty(value = "实验室代码(字典value)", dataType = "String")
+    private String labCodeName;
+
+    @ApiModelProperty(value = "组别代码(字典code)", dataType = "String")
+    private String groupCode;
+
+    @ApiModelProperty(value = "组别代码(字典value)", dataType = "String")
+    private String groupCodeName;
+
     @ApiModelProperty(value = "审批编号", dataType = "String")
     private String siteExecutiveNo;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/environment/LocationListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/environment/LocationListRequest.java
new file mode 100644
index 0000000..13d03c3
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/environment/LocationListRequest.java
@@ -0,0 +1,20 @@
+package com.casic.missiles.dto.resource.environment;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/6/8 13:56
+ */
+@ApiModel
+@Data
+public class LocationListRequest {
+    @ApiModelProperty(value = "地点编号", dataType = "String")
+    private String locationNo;
+
+    @ApiModelProperty(value = "地点名称", dataType = "String")
+    private String locationName;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/environment/LocationListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/environment/LocationListResponse.java
new file mode 100644
index 0000000..4c531af
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/environment/LocationListResponse.java
@@ -0,0 +1,78 @@
+package com.casic.missiles.dto.resource.environment;
+
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
+import com.baomidou.mybatisplus.annotation.TableField;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description: 地点列表响应实体
+ * @Author: wangpeng
+ * @Date: 2023/6/8 13:53
+ */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
+@ApiModel
+@Data
+public class LocationListResponse {
+    @ApiModelProperty(value = "主键id", dataType = "Long")
+    private Long id;
+
+    /**
+     * 地点编号
+     */
+    @ExcelProperty("地点编号")
+    @ApiModelProperty(value = "地点编号", dataType = "String")
+    private String locationNo;
+
+    /**
+     * 地点名称
+     */
+    @ExcelProperty("地点名称")
+    @ApiModelProperty(value = "地点名称", dataType = "String")
+    private String locationName;
+
+    /**
+     * 地点位置
+     */
+    @ExcelProperty("地点位置")
+    @ApiModelProperty(value = "地点位置", dataType = "String")
+    private String locationPosition;
+
+    /**
+     * 创建人id
+     */
+    @ApiModelProperty(value = "创建人id", dataType = "Long")
+    private Long createUserId;
+
+    /**
+     * 创建人
+     */
+    @ExcelProperty("创建人")
+    @ApiModelProperty(value = "创建人", dataType = "String")
+    @TableField("create_user")
+    private String createUser;
+
+    /**
+     * 创建时间
+     */
+    @ExcelProperty("创建时间")
+    @ApiModelProperty(value = "创建时间", dataType = "String")
+    private String createTime;
+
+    /**
+     * 更新时间
+     */
+    @ApiModelProperty(value = "更新时间", dataType = "String")
+    private String updateTime;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertRequest.java
index 9a7f6c6..c827915 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertRequest.java
@@ -4,6 +4,8 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * @Description:
  * @Author: wangpeng
@@ -16,4 +18,7 @@
     private String name;
     @ApiModelProperty(value = "部门名", dataType = "String")
     private String deptName;
+
+    @ApiModelProperty(value = "导出ids", dataType = "List")
+    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertResponse.java
index f78b159..8f2f79e 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertResponse.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.dto.resource.staff;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.casic.missiles.annotation.DictCodeField;
 import com.casic.missiles.constants.MeterDictCode;
 import io.swagger.annotations.ApiModel;
@@ -13,12 +20,18 @@
  * @Author: wangpeng
  * @Date: 2023/7/27 15:13
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @ApiModel
 @Data
 public class StaffCertResponse {
     /**
      * 人员编号
      */
+    @ExcelProperty(value = "人员编号",order = 0)
     @NotEmpty(message = "人员编号不能为空")
     @ApiModelProperty(value = "人员编号", dataType = "String")
     private String staffNo;
@@ -26,6 +39,7 @@
     /**
      * 姓名
      */
+    @ExcelProperty(value = "姓名",order = 1)
     @ApiModelProperty(value = "姓名", dataType = "String")
     private String staffName;
 
@@ -54,6 +68,7 @@
     /**
      * 部门名字
      */
+    @ExcelProperty(value = "工作部门",order = 2)
     @ApiModelProperty(value = "部门名字", dataType = "String")
     private String deptName;
 
@@ -66,6 +81,7 @@
     /**
      * 计量专业
      */
+    @ExcelProperty(value = "计量专业",order = 3)
     @ApiModelProperty(value = "计量专业", dataType = "String")
     private String major;
 
@@ -110,6 +126,7 @@
     /**
      * 证书号
      */
+    @ExcelProperty(value = "证号",order = 4)
     @ApiModelProperty(value = "证书号", dataType = "String")
     private String certNo;
 
@@ -122,12 +139,14 @@
     /**
      * 有效日期
      */
+    @ExcelProperty(value = "证书有效期",order = 6)
     @ApiModelProperty(value = "有效日期", dataType = "String")
     private String effectiveDate;
 
     /**
      * 发放日期
      */
+    @ExcelProperty(value = "发证日期",order = 5)
     @ApiModelProperty(value = "发放日期", dataType = "String")
     private String grantDate;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffListRequest.java
index 7c4afb3..0a1194a 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffListRequest.java
@@ -4,6 +4,8 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * @Description:
  * @Author: wangpeng
@@ -18,4 +20,7 @@
     private String deptName;
     @ApiModelProperty(value = "部门id", dataType = "Long")
     private Long deptId;
+
+    @ApiModelProperty(value = "导出ids", dataType = "List")
+    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/TrainListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/TrainListRequest.java
index f68597b..6321f8b 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/TrainListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/TrainListRequest.java
@@ -14,6 +14,8 @@
 public class TrainListRequest {
     @ApiModelProperty(value = "训练登记表编号", dataType = "String")
     private String trainNo;
+    @ApiModelProperty(value = "值班领导", dataType = "String")
+    private String dutyLeader;
     @ApiModelProperty(value = "创建开始时间", dataType = "String")
     private String createTimeStart;
     @ApiModelProperty(value = "创建结束时间", dataType = "String")
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/SignAddRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/SignAddRequest.java
index 117be34..d71055c 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/SignAddRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/SignAddRequest.java
@@ -43,13 +43,6 @@
     private Long signUserId;
 
     /**
-     * 签章或签名-字典code
-     */
-    @NotBlank(message = "类型不能为空")
-    @ApiModelProperty(value = "签名/签章-字典code", dataType = "String", required = true)
-    private String signType;
-
-    /**
      * minio存储文件名
      */
     @ApiModelProperty(value = "上传文件返回名称", dataType = "String")
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateAddRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateAddRequest.java
index aff1265..6316648 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateAddRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateAddRequest.java
@@ -17,30 +17,28 @@
 @Data
 public class TemplateAddRequest extends BaseSystemRequest {
     /**
-     * 原始记录模板/证书报告模板名称
+     * 模板名称
      */
     @ApiModelProperty(value = "名称", dataType = "String", required = true)
     @NotBlank(message = "名称不能为空")
     private String templateName;
 
     /**
-     * 原始记录模板/证书报告模板描述
+     * 模板描述
      */
     @ApiModelProperty(value = "描述", dataType = "String")
     private String templateDesc;
 
     /**
-     * 原始记录模板/证书报告模板创建人
+     * 创建人
      */
     @ApiModelProperty(value = "创建人", dataType = "String", required = true)
     @NotBlank(message = "创建人不能为空")
     private String templateCreator;
 
-    /**
-     * 原始记录模板/证书报告模板-字典code
-     */
-    @NotBlank(message = "类型不能为空")
-    @ApiModelProperty(value = "原始记录模板/证书报告模板-字典code", dataType = "String", required = true)
+
+    @NotBlank(message = "模板类型不能为空")
+    @ApiModelProperty(value = "模板类型(字典code)", dataType = "String", required = true)
     private String templateType;
 
     /**
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateListRequest.java
index eec5a1e..6d17bbe 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateListRequest.java
@@ -1,11 +1,12 @@
 package com.casic.missiles.dto.system;
 
+import com.casic.missiles.annotation.DictCodeField;
+import com.casic.missiles.constants.MeterDictCode;
 import com.casic.missiles.dto.BaseSystemRequest;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import javax.validation.constraints.NotBlank;
 import java.util.List;
 
 /**
@@ -19,8 +20,8 @@
     /**
      * 类型
      */
-//    @ApiModelProperty(value = "类型-字典code", dataType = "String", required = true)
-    @NotBlank(message = "类型不能为空")
+    @DictCodeField(message = "模板类型不合法", cacheName = MeterDictCode.TEMPLATE_TYPE)
+    @ApiModelProperty(value = "模板类型(字典code)", dataType = "String")
     private String templateType;
 
     /**
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificateChangeApply.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificateChangeApply.java
index 9216308..36923fd 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificateChangeApply.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificateChangeApply.java
@@ -1,11 +1,19 @@
 package com.casic.missiles.model.business;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 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 com.casic.missiles.dto.BaseRequest;
+import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -20,6 +28,12 @@
  * @author wangpeng
  * @since 2023-08-15
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
+@ApiModel
 @Data
 @TableName("biz_business_certificate_change_apply")
 public class BizBusinessCertificateChangeApply extends BaseRequest implements Serializable {
@@ -33,6 +47,7 @@
     /**
      * 申请单编号
      */
+    @ExcelProperty(value = "申请单编号", order = 1)
     @ApiModelProperty(value = "申请单编号", dataType = "String")
     @TableField("change_apply_no")
     private String changeApplyNo;
@@ -40,6 +55,7 @@
     /**
      * 申请单名字
      */
+    @ExcelProperty(value = "申请单名称", order = 2)
     @ApiModelProperty(value = "申请单名字", dataType = "String")
     @TableField("change_apply_name")
     private String changeApplyName;
@@ -54,6 +70,7 @@
     /**
      * 更换证书编号
      */
+    @ExcelProperty(value = "更换证书编号", order = 3)
     @ApiModelProperty(value = "更换证书编号", dataType = "String")
     @TableField("change_report_no")
     private String changeReportNo;
@@ -61,7 +78,8 @@
     /**
      * 更换证书名字
      */
-    @ApiModelProperty(value = "更换证书名字", dataType = "String")
+    @ExcelProperty(value = "更换证书/报告名称", order = 4)
+    @ApiModelProperty(value = "更换证书/报告名称", dataType = "String")
     @TableField("change_report_name")
     private String changeReportName;
 
@@ -73,6 +91,7 @@
     @TableField("change_type")
     private String changeType;
 
+    @ExcelProperty(value = "变更类型", order = 5)
     @ApiModelProperty(value = "变更类型(字典value)", dataType = "String")
     @TableField(exist = false)
     private String changeTypeName;
@@ -142,13 +161,15 @@
     /**
      * 创建用户名字
      */
-    @ApiModelProperty(value = "创建用户名字", dataType = "String")
+    @ExcelProperty(value = "创建人", order = 6)
+    @ApiModelProperty(value = "创建人名字", dataType = "String")
     @TableField("create_user_name")
     private String createUserName;
 
     /**
      * 创建时间
      */
+    @ExcelProperty(value = "创建时间", order = 7)
     @ApiModelProperty(value = "创建时间", dataType = "String")
     @TableField("create_time")
     private String createTime;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificateReport.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificateReport.java
index f01db9e..db06018 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificateReport.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificateReport.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.model.business;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -22,6 +29,11 @@
  * @author wangpeng
  * @since 2023-08-14
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @ApiModel
 @Data
 @TableName("biz_business_certificate_report")
@@ -36,6 +48,7 @@
     /**
      * 证书报告编号
      */
+    @ExcelProperty(value = "证书报告编号", order = 1)
     @ApiModelProperty(value = "证书报告编号", dataType = "String")
     @TableField("certificate_report_no")
     private String certificateReportNo;
@@ -43,6 +56,7 @@
     /**
      * 证书报告名称
      */
+    @ExcelProperty(value = "证书报告名称", order = 2)
     @ApiModelProperty(value = "证书报告名称", dataType = "String")
     @TableField("certificate_report_name")
     private String certificateReportName;
@@ -62,6 +76,7 @@
     @TableField("measure_category")
     private String measureCategory;
 
+    @ExcelProperty(value = "检校类别", order = 6)
     @ApiModelProperty(value = "检校类别(字典value)", dataType = "String")
     @TableField(exist = false)
     private String measureCategoryName;
@@ -69,6 +84,7 @@
     /**
      * 检校时间
      */
+    @ExcelProperty(value = "检校时间", order = 8)
     @ApiModelProperty(value = "检校时间", dataType = "String")
     @TableField("calibration_time")
     private String calibrationTime;
@@ -267,18 +283,22 @@
     @TableField(exist = false)
     private Integer decisionItem;
 
-    @ApiModelProperty(value = "设备样品编号（列表返回参数）", dataType = "String")
+    @ExcelProperty(value = "被检设备统一编号", order = 3)
+    @ApiModelProperty(value = "被检设备统一编号（列表返回参数）", dataType = "String")
     @TableField(exist = false)
     private String sampleNo;
 
-    @ApiModelProperty(value = "设备样品名称（列表返回参数）", dataType = "String")
+    @ExcelProperty(value = "被检设备名称", order = 4)
+    @ApiModelProperty(value = "被检设备名称（列表返回参数）", dataType = "String")
     @TableField(exist = false)
     private String sampleName;
 
-    @ApiModelProperty(value = "设备样品规格型号（列表返回参数）", dataType = "String")
+    @ExcelProperty(value = "规格型号", order = 5)
+    @ApiModelProperty(value = "规格型号（列表返回参数）", dataType = "String")
     @TableField(exist = false)
     private String sampleModel;
 
+    @ExcelProperty(value = "检定员", order = 7)
     @ApiModelProperty(value = "检定员名字（列表返回参数）", dataType = "String")
     @TableField(exist = false)
     private String staffName;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessIdentifyInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessIdentifyInfo.java
index 46bfba5..f1a9bec 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessIdentifyInfo.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessIdentifyInfo.java
@@ -1,10 +1,15 @@
 package com.casic.missiles.model.business;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 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;
 
@@ -20,6 +25,11 @@
  * @author wangpeng
  * @since 2023-08-15
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @Data
 @TableName("biz_business_identify_info")
 public class BizBusinessIdentifyInfo implements Serializable {
@@ -33,6 +43,7 @@
     /**
      * 记录编号
      */
+    @ExcelProperty(value = "记录编号", order = 1)
     @ApiModelProperty(value = "记录编号", dataType = "String")
     @TableField("record_no")
     private String recordNo;
@@ -41,20 +52,15 @@
      * 标志类型(字典code)
      */
     @NotEmpty(message = "标志类型不能为空")
-    @ApiModelProperty(value = "标志类型(字典code)", dataType = "String")
-    @DictCodeField(message = "标志类型不合法", cacheName = MeterDictCode.IDENTIFY_PRINT_TYPE)
+    @ApiModelProperty(value = "标志类型(直接存计量标识/使用状态/校准状态的字典value)", dataType = "String")
     @TableField("identify_type")
     private String identifyType;
 
-    @ApiModelProperty(value = "标志类型(字典value)", dataType = "String")
-    @TableField(exist = false)
-    private String identifyTypeName;
-
     /**
      * 设备id(可以是受检设备/设备台账)
      */
     @NotNull(message = "设备id不能为空")
-    @ApiModelProperty(value = "设备id(可以是受检设备/设备台账)", dataType = "String")
+    @ApiModelProperty(value = "设备id(可以是受检设备/设备台账)", dataType = "Long")
     @TableField("device_id")
     private Long deviceId;
 
@@ -66,29 +72,32 @@
     @TableField("device_type")
     private String deviceType;
 
+    @ExcelProperty(value = "统一编号", order = 3)
     @NotEmpty(message = "设备编号不能为空")
-    @ApiModelProperty(value = "设备编号", dataType = "String")
+    @ApiModelProperty(value = "统一编号", dataType = "String")
     @TableField("device_no")
     private String deviceNo;
 
     /**
      * 设备名字
      */
-    @NotEmpty(message = "设备名字不能为空")
-    @ApiModelProperty(value = "设备名字", dataType = "String")
+    @ExcelProperty(value = "设备名称", order = 4)
+    @NotEmpty(message = "设备名称不能为空")
+    @ApiModelProperty(value = "设备名称", dataType = "String")
     @TableField("device_name")
     private String deviceName;
 
     /**
      * 检定员id
      */
-    @ApiModelProperty(value = "检定员id", dataType = "String")
+    @ApiModelProperty(value = "检定员id", dataType = "Long")
     @TableField("measure_person_id")
     private Long measurePersonId;
 
     /**
      * 检定员名字
      */
+    @ExcelProperty(value = "检定员", order = 5)
     @ApiModelProperty(value = "检定员名字", dataType = "String")
     @TableField("measure_person")
     private String measurePerson;
@@ -103,7 +112,8 @@
     /**
      * 更新时间
      */
-    @ApiModelProperty(value = "更新时间", dataType = "String")
+    @ExcelProperty(value = "打印时间", order = 6)
+    @ApiModelProperty(value = "打印时间", dataType = "String")
     @TableField("update_time")
     private String updateTime;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceAssess.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceAssess.java
index 659d9ca..6720b90 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceAssess.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceAssess.java
@@ -1,11 +1,26 @@
 package com.casic.missiles.model.business;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 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 com.casic.missiles.dto.BaseRequest;
+import com.casic.missiles.dto.business.outsource.OrderSampleDTO;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import javax.validation.constraints.NotEmpty;
 import java.io.Serializable;
+import java.util.List;
 
 /**
  * <p>
@@ -15,146 +30,231 @@
  * @author wangpeng
  * @since 2023-08-16
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
+@ApiModel
 @Data
 @TableName("biz_business_outsource_assess")
-public class BizBusinessOutsourceAssess implements Serializable {
+public class BizBusinessOutsourceAssess extends BaseRequest implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
+    @ApiModelProperty(value = "id，更新/删除使用参数", dataType = "Long")
     @TableId("id")
     private Long id;
 
     /**
      * 评审表编号
      */
+    @ExcelProperty(value = "评审表编号", order = 1)
+    @ApiModelProperty(value = "评审表编号(后台生成)", dataType = "String")
     @TableField("project_no")
     private String projectNo;
 
     /**
      * 评审表名称
      */
+    @ExcelProperty(value = "评审表名称", order = 2)
+    @ApiModelProperty(value = "评审表名称", dataType = "String")
     @TableField("project_name")
     private String projectName;
 
+    @NotEmpty(message = "实验室代码不能为空")
+    @DictCodeField(message = "实验室代码描述不合法", cacheName = MeterDictCode.LAB_CODE)
+    @ApiModelProperty(value = "实验室代码(字典code)", dataType = "String")
+    @TableField("lab_code")
+    private String labCode;
+
+    @ApiModelProperty(value = "实验室代码(字典value)", dataType = "String")
+    @TableField(exist = false)
+    private String labCodeName;
+
+    /**
+     * 组别代码
+     */
+    @NotEmpty(message = "组别代码不能为空")
+    @DictCodeField(message = "组别代码描述不合法", cacheName = MeterDictCode.GROUP_CODE)
+    @ApiModelProperty(value = "组别代码(字典code)", dataType = "String")
+    @TableField("group_code")
+    private String groupCode;
+
+    @ApiModelProperty(value = "组别代码(字典value)", dataType = "String")
+    @TableField(exist = false)
+    private String groupCodeName;
+
     /**
      * 申请人id
      */
+    @ApiModelProperty(value = "申请人id", dataType = "String")
     @TableField("applicant_id")
     private Long applicantId;
 
     /**
      * 申请人名字
      */
+    @ExcelProperty(value = "申请人", order = 5)
+    @ApiModelProperty(value = "申请人", dataType = "String")
     @TableField("applicant_name")
     private String applicantName;
 
     /**
      * 申请时间
      */
+    @ExcelProperty(value = "申请时间", order = 6)
+    @ApiModelProperty(value = "申请时间", dataType = "String")
     @TableField("applicant_time")
     private String applicantTime;
 
     /**
      * 附件(minio存储文件名)
      */
+    @ApiModelProperty(value = "附件(minio存储文件名)", dataType = "String")
     @TableField("minio_file_name")
     private String minioFileName;
 
     /**
      * 备注
      */
+    @ApiModelProperty(value = "备注", dataType = "String")
     @TableField("remark")
     private String remark;
 
     /**
      * 创建人id
      */
+    @ApiModelProperty(value = "创建人id", dataType = "String")
     @TableField("create_user_id")
     private Long createUserId;
 
     /**
      * 创建人名字
      */
+    @ApiModelProperty(value = "创建人名字", dataType = "String")
     @TableField("create_user_name")
     private String createUserName;
 
     /**
      * 分包方id
      */
+    @ApiModelProperty(value = "评审表编号", dataType = "String")
     @TableField("outsourcer_id")
     private Long outsourcerId;
 
     /**
      * 预计开始时间
      */
+    @ApiModelProperty(value = "预计开始时间", dataType = "String")
     @TableField("pre_start_time")
     private String preStartTime;
 
     /**
      * 预计结束时间
      */
+    @ApiModelProperty(value = "预计结束时间", dataType = "String")
     @TableField("pre_end_time")
     private String preEndTime;
 
     /**
      * 分包原因-字典
      */
+    @ApiModelProperty(value = "分包原因(字典code)", dataType = "String")
+    @DictCodeField(message = "分包原因描述不合法", cacheName = MeterDictCode.OUTSOURCE_REASON)
     @TableField("outsource_reason")
     private String outsourceReason;
 
+    @ApiModelProperty(value = "分包原因(字典value)", dataType = "String")
+    @TableField(exist = false)
+    private String outsourceReasonName;
+
     /**
      * 预计费用
      */
+    @ApiModelProperty(value = "预计费用", dataType = "String")
     @TableField("pre_cost")
     private String preCost;
 
     /**
      * 审批状态
      */
+    @ApiModelProperty(value = "审批状态", dataType = "String")
+    @DictCodeField(message = "审批状态描述不合法", cacheName = MeterDictCode.APPROVAL_STATUS)
     @TableField("approval_status")
     private String approvalStatus;
 
     /**
      * 流程实例id
      */
+    @ApiModelProperty(value = "流程实例id", dataType = "String")
     @TableField("process_id")
     private String processId;
 
     /**
      * 实验室认可情况
      */
+    @ApiModelProperty(value = "实验室认可情况", dataType = "String")
     @TableField("approve_situation")
     private String approveSituation;
 
     /**
      * 溯源性
      */
+    @ApiModelProperty(value = "溯源性", dataType = "String")
     @TableField("traceability")
     private String traceability;
 
     /**
      * 测试方法
      */
+    @ApiModelProperty(value = "测试方法", dataType = "String")
     @TableField("test_method")
     private String testMethod;
 
     /**
      * 技术能力
      */
+    @ApiModelProperty(value = "技术能力", dataType = "String")
     @TableField("technique_ability")
     private String techniqueAbility;
 
     /**
      * 创建时间
      */
+    @ApiModelProperty(hidden = true)
     @TableField("create_time")
     private String createTime;
 
     /**
      * 更新时间
      */
+    @ApiModelProperty(hidden = true)
     @TableField("update_time")
     private String updateTime;
 
+    @ApiModelProperty(value = "审批状态类型-字典value", dataType = "String")
+    @TableField(exist = false)
+    private String approvalStatusName;
 
+    @ApiModelProperty(value = "任务id（同意、驳回等操作使用）", dataType = "String")
+    @TableField(exist = false)
+    private String taskId;
+
+    @ApiModelProperty(value = "可选决策项（1同意驳回拒绝 2同意驳回 3同意拒绝，用于待审批列表同意/驳回/拒绝按钮展示）", dataType = "Integer")
+    @TableField(exist = false)
+    private Integer decisionItem;
+
+    @NotEmpty(message = "受检设备信息不能为空")
+    @ApiModelProperty(value = "受检设备id列表（新建使用参数）", dataType = "List")
+    @TableField(exist = false)
+    private List<OrderSampleDTO> orderSampleList;
+
+    @ExcelProperty(value = "分包机构名称", order = 3)
+    @ApiModelProperty(value = "分包机构名称（列表返回参数）", dataType = "String")
+    private String outsourcerName;
+
+    @ExcelProperty(value = "机构负责人", order = 4)
+    @ApiModelProperty(value = "机构负责人（列表返回参数）", dataType = "String")
+    private String director;
 }

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java
index bb0c50f..13a699b 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java
@@ -12,6 +12,7 @@
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.IGeneralApprovalService;
+import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
@@ -19,6 +20,7 @@
 import org.springframework.web.bind.annotation.RequestBody;
 
 import javax.validation.Valid;
+import java.util.List;
 import java.util.Objects;
 
 /**
@@ -117,4 +119,17 @@
         }
         return baseApprovalService.failUpdate(request);
     }
+
+    public List<O> exportList(@RequestBody @Valid R request) throws Exception {
+        List<O> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = baseApprovalService.listExportByIds(request.getIds());
+        } else {
+            list = baseApprovalService.listExport(request);
+        }
+        for (O record : list) {
+            DictCodeUtils.convertDictCodeToName(record);
+        }
+        return list;
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java
index 8a90961..d775831 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java
@@ -5,6 +5,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.business.certificate.CertificateChangeApplyApprovalListRequest;
 import com.casic.missiles.dto.business.certificate.CertificateChangeApplySaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessCertificateChangeApply;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
@@ -20,6 +21,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -48,4 +50,12 @@
         }
         return changeApplyService.saveChangeApply(request);
     }
+
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody CertificateChangeApplyApprovalListRequest request) throws Exception {
+        List<BizBusinessCertificateChangeApply> list = super.exportList(request);
+        super.exportExcel(BizBusinessCertificateChangeApply.class, list, ExportEnum.CERTIFICATE_CHANGE_APPLY.getSheetName());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java
index 5fc4b07..af8230e 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java
@@ -9,6 +9,7 @@
 import com.casic.missiles.dto.business.certificate.CertificatePrintApprovalListRequest;
 import com.casic.missiles.dto.business.certificate.CertificatePrintListResponse;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.enums.business.CertificatePrintStatusEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessCertificatePrintLog;
@@ -18,10 +19,16 @@
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.io.IOException;
+import java.util.List;
 import java.util.Objects;
 
 /**
@@ -98,4 +105,16 @@
         });
         return certificatePrintService.certificatePrintLog(idDTO.getId());
     }
+
+    @ApiOperation("证书打印审批导出")
+    @PostMapping("/listExport")
+    public void exportList(@RequestBody CertificatePrintApprovalListRequest request) throws IOException {
+        List<CertificatePrintListResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = certificatePrintService.listByIds(request.getIds());
+        } else {
+            list = certificatePrintService.list(request);
+        }
+        super.exportExcel(CertificatePrintListResponse.class, list, ExportEnum.CERTIFICATE_PRINT.getSheetName());
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java
index 63b06dc..6b2efd5 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java
@@ -6,6 +6,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.business.certificate.CertificateReportApprovalListRequest;
 import com.casic.missiles.dto.business.certificate.CertificateReportSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessCertificateReport;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
@@ -21,6 +22,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -50,7 +52,7 @@
         return certificateReportService.saveCertificateReport(request);
     }
 
-    @ApiOperation("证书审批详情（基本信息）")
+    @ApiOperation("详情（基本信息）")
     @PostMapping("/detail")
     public ReturnDTO<BizBusinessCertificateReport> detail(@RequestBody @Valid BaseDetailRequest request, BindingResult bindingResult) throws Exception {
         if(bindingResult.hasErrors()){
@@ -59,4 +61,11 @@
         return certificateReportService.detail(request);
     }
 
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody CertificateReportApprovalListRequest request) throws Exception {
+        List<BizBusinessCertificateReport> list = super.exportList(request);
+        super.exportExcel(BizBusinessCertificateReport.class, list, ExportEnum.CERTIFICATE_REPORT.getSheetName());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java
index 46b26bd..57c0809 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java
@@ -10,20 +10,21 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.business.identify.IdentifyListRequest;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessIdentifyInfo;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.business.IBizBusinessIdentifyInfoService;
+import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import javax.validation.Valid;
+import java.util.List;
 import java.util.Objects;
 
 /**
@@ -57,16 +58,13 @@
         return identifyInfoService.addIdentify(identifyInfo);
     }
 
-    @ApiOperation("标识打印更新")
+    @ApiOperation("标识打印更新（更新打印时间）")
     @PostMapping("/update")
-    public ReturnDTO updateIdentify(@RequestBody @Valid BizBusinessIdentifyInfo identifyInfo, BindingResult bindingResult) {
-        Assert.isFalse(Objects.isNull(identifyInfo.getId()), () -> {
+    public ReturnDTO updateIdentify(@RequestBody @Valid IdDTO idDTO) {
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        Assert.isFalse(bindingResult.hasErrors(), () -> {
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        });
-        return identifyInfoService.updateIdentify(identifyInfo);
+        return identifyInfoService.updateIdentify(idDTO.getId());
     }
 
     @ApiOperation("标识打印删除")
@@ -77,4 +75,37 @@
         });
         return identifyInfoService.deleteIdentify(idDTO.getId());
     }
+
+    @ApiOperation("标识打印导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody @Valid IdentifyListRequest request, BindingResult bindingResult) throws Exception {
+        if (bindingResult.hasErrors()) {
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        List<BizBusinessIdentifyInfo> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = identifyInfoService.listByIds(request.getIds());
+        } else {
+            list = identifyInfoService.list(request);
+        }
+        for (BizBusinessIdentifyInfo record : list) {
+            DictCodeUtils.convertDictCodeToName(record);
+        }
+        super.exportExcel(BizBusinessIdentifyInfo.class, list, ExportEnum.IDENTIFY_EXPORT.getSheetName());
+    }
+
+
+    // TODO: 2023/8/23 查询设备信息，4个底部按钮查设备（按钮的作用就是前端用来调不同接口、用来区分中间即将展示的标识），前端弹窗选设备，在确定保存时前端根据底部按钮判断传入设备类型deviceType字典code
+    // TODO: 2023/8/23 接口：查受检设备（第1个按钮），查设备台账（后3个按钮同一接口），查询之后前端根据标志类型的不同加到中间页面时进行判断（按产品给的对应表）
+    // TODO: 2023/8/23 提供二维码接口，前端在加到中间页面时调用一下
+
+    @ApiOperation("设备二维码")
+    @PostMapping("/equipment/qrCode")
+    public ReturnDTO<String> equipmentQrCode(@RequestBody @Valid IdDTO idDTO) {
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return identifyInfoService.equipmentQrCode(idDTO.getId());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java
index 707be6e..7e0453d 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java
@@ -117,7 +117,7 @@
     }
 
     @ApiOperation("任务单导出")
-    @PostMapping("/export")
+    @PostMapping("/listExport")
     public void orderExport(@RequestBody @Valid OrderListRequest request, HttpServletResponse response) {
         businessOrderService.orderExport(request, response);
     }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java
index 529a6ce..51432be 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java
@@ -1,9 +1,28 @@
 package com.casic.missiles.controller.business;
 
+import com.casic.missiles.controller.GeneralApprovalController;
+import com.casic.missiles.dto.BaseApprovalSubmitRequest;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.business.outsource.OutsourceAssessApprovalListRequest;
+import com.casic.missiles.dto.business.outsource.OutsourceAssessSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
+import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.model.business.BizBusinessOutsourceAssess;
+import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
+import com.casic.missiles.service.IGeneralApprovalService;
+import com.casic.missiles.service.business.IBizBusinessOutsourceAssessService;
 import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.BindingResult;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.validation.Valid;
+import java.util.List;
+
 /**
  * <p>
  * 计量检定业务-分包管理-测试、校准或检定工作分包评审表 前端控制器
@@ -15,6 +34,27 @@
 @Api(tags = "分包管理-测试、校准或检定工作分包评审表")
 @RestController
 @RequestMapping("/business/outsource/assess")
-public class BizBusinessOutsourceAssessController {
+public class BizBusinessOutsourceAssessController extends GeneralApprovalController<BizBusinessOutsourceAssess, BizBusinessOutsourceAssess, OutsourceAssessApprovalListRequest, BaseApprovalSubmitRequest> {
+    @Autowired
+    private IBizBusinessOutsourceAssessService outsourceAssessService;
 
+    public BizBusinessOutsourceAssessController(IGeneralApprovalService<BizBusinessOutsourceAssess, BizBusinessOutsourceAssess, OutsourceAssessApprovalListRequest, BaseApprovalSubmitRequest> baseApprovalService) {
+        super(baseApprovalService);
+    }
+
+    @ApiOperation("草稿箱-保存")
+    @PostMapping("/save")
+    public ReturnDTO<OutsourceAssessSaveResponse> saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceAssess request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        return outsourceAssessService.saveOutsourceAssess(request);
+    }
+
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception {
+        List<BizBusinessOutsourceAssess> list = super.exportList(request);
+        super.exportExcel(BizBusinessOutsourceAssess.class, list, ExportEnum.OUTSOURCE_ASSESS.getSheetName());
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java
new file mode 100644
index 0000000..9adef18
--- /dev/null
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java
@@ -0,0 +1,60 @@
+package com.casic.missiles.controller.business;
+
+import com.casic.missiles.controller.GeneralApprovalController;
+import com.casic.missiles.dto.BaseApprovalSubmitRequest;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.business.outsource.OutsourceProtocolApprovalListRequest;
+import com.casic.missiles.dto.business.outsource.OutsourceProtocolSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
+import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.model.business.BizBusinessOutsourceProtocol;
+import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
+import com.casic.missiles.service.IGeneralApprovalService;
+import com.casic.missiles.service.business.IBizBusinessOutsourceProtocolService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.BindingResult;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.validation.Valid;
+import java.util.List;
+
+/**
+ * <p>
+ * 计量检定业务-分包管理-测试、校准或检定工作分包协议书 前端控制器
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-08-24
+ */
+@Api(tags = "分包管理-测试、校准或检定工作分包协议书")
+@RestController
+@RequestMapping("/business/outsource/protocol")
+public class BizBusinessOutsourceProtocolController extends GeneralApprovalController<BizBusinessOutsourceProtocol, BizBusinessOutsourceProtocol, OutsourceProtocolApprovalListRequest, BaseApprovalSubmitRequest> {
+    @Autowired
+    private IBizBusinessOutsourceProtocolService outsourceProtocolService;
+
+    public BizBusinessOutsourceProtocolController(IGeneralApprovalService<BizBusinessOutsourceProtocol, BizBusinessOutsourceProtocol, OutsourceProtocolApprovalListRequest, BaseApprovalSubmitRequest> baseApprovalService) {
+        super(baseApprovalService);
+    }
+
+    @ApiOperation("草稿箱-保存")
+    @PostMapping("/save")
+    public ReturnDTO<OutsourceProtocolSaveResponse> saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceProtocol request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        return outsourceProtocolService.saveOutsourceProtocol(request);
+    }
+
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody OutsourceProtocolApprovalListRequest request) throws Exception {
+        List<BizBusinessOutsourceProtocol> list = super.exportList(request);
+        super.exportExcel(BizBusinessOutsourceProtocol.class, list, ExportEnum.OUTSOURCE_PROTOCOL.getSheetName());
+    }
+}
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java
index 097f645..f0f0943 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java
@@ -17,7 +17,6 @@
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.IGeneralApprovalService;
 import com.casic.missiles.service.business.IBizBusinessOutsourcerInfoService;
-import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -71,19 +70,8 @@
 
     @ApiOperation("分包方导出")
     @PostMapping("/listExport")
-    public void export(@RequestBody @Valid OutsourcerInfoApprovalListRequest request, BindingResult bindingResult) throws Exception {
-        if (bindingResult.hasErrors()) {
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        }
-        List<BizBusinessOutsourcerInfo> list;
-        if (!CollectionUtils.isEmpty(request.getIds())) {
-            list = outsourcerInfoService.listByIds(request.getIds());
-        } else {
-            list = outsourcerInfoService.list(request);
-        }
-        for (BizBusinessOutsourcerInfo record : list) {
-            DictCodeUtils.convertDictCodeToName(record);
-        }
+    public void export(@RequestBody OutsourcerInfoApprovalListRequest request) throws Exception {
+        List<BizBusinessOutsourcerInfo> list = super.exportList(request);
         super.exportExcel(BizBusinessOutsourcerInfo.class, list, ExportEnum.OUTSOURCER_EXPORT.getSheetName());
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java
index c2cbf9f..0410918 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java
@@ -17,11 +17,9 @@
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.IGeneralApprovalService;
 import com.casic.missiles.service.business.IBizBusinessSiteExecutiveInfoService;
-import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -60,7 +58,7 @@
         return siteExecutiveInfoService.saveSiteExecutiveInfo(siteExecutiveInfo);
     }
 
-    @ApiOperation("现场检测详情")
+    @ApiOperation("详情")
     @PostMapping("/detail")
     public ReturnDTO<SiteExecutiveDetailResponse> siteExecutiveDetail(@RequestBody @Valid IdDTO idDTO) throws Exception {
         Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
@@ -69,21 +67,10 @@
         return ReturnUtil.success(siteExecutiveInfoService.detail(idDTO.getId()));
     }
 
-    @ApiOperation("现场检测导出")
+    @ApiOperation("导出")
     @PostMapping("/listExport")
-    public void export(@RequestBody @Valid SiteExecutiveApprovalListRequest request, BindingResult bindingResult) throws Exception {
-        if (bindingResult.hasErrors()) {
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        }
-        List<SiteExecutiveApprovalListResponse> list;
-        if (!CollectionUtils.isEmpty(request.getIds())) {
-            list = siteExecutiveInfoService.listInfoByIds(request.getIds());
-        } else {
-            list = siteExecutiveInfoService.listInfo(request);
-        }
-        for (SiteExecutiveApprovalListResponse record : list) {
-            DictCodeUtils.convertDictCodeToName(record);
-        }
+    public void export(@RequestBody SiteExecutiveApprovalListRequest request) throws Exception {
+        List<SiteExecutiveApprovalListResponse> list = super.exportList(request);
         super.exportExcel(SiteExecutiveApprovalListResponse.class, list, ExportEnum.SITE_EXECUTIVE_EXPORT.getSheetName());
     }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
index 7e793cd..a92e209 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
@@ -55,7 +55,7 @@
 
     @ApiOperation("设备收发列表导出")
     @PostMapping("/export")
-    public void exportList(@RequestBody @Valid SampleDispatchListRequest request) throws IOException {
+    public void exportList(@RequestBody SampleDispatchListRequest request) throws IOException {
         List<SampleDispatchListResponse> list;
         if (!CollectionUtils.isEmpty(request.getIds())) {
             list = dispatchService.listByIds(request.getIds());
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java
index cdc77fc..d120fd4 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java
@@ -7,6 +7,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.business.labExecutive.*;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.business.IBusinessLabExecutiveInfoService;
@@ -14,6 +15,7 @@
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.*;
 
@@ -32,7 +34,7 @@
     @Autowired
     private IBusinessLabExecutiveInfoService labExecutiveInfoService;
 
-    @ApiOperation("实验室检测-部门检测-查询各状态列表（待检测、检测中、检测完）")
+    @ApiOperation("实验室任务-查询各状态列表（待检测、检测中、检测完）")
     @PostMapping("/deptExecutive/List")
     public ReturnDTO<PageInfoBT<SampleLabExecutiveListResponse>> queryDeptExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
@@ -43,10 +45,19 @@
         return ReturnUtil.success(super.packForBT(labExecutiveInfoService.deptLabExecutiveListPage(page, labExecutiveListRequest)));
     }
 
-    /**
-     * 实验室检测-我的检测-查询各状态列表（待检测、检测中、检测完）
-     */
-    @ApiOperation("实验室检测-我的检测-查询各状态列表（待检测、检测中、检测完）")
+    @ApiOperation("实验室任务导出")
+    @PostMapping("/deptExecutive/export")
+    public void deptExportList(@RequestBody @Valid SampleLabExecutiveListRequest request) throws Exception {
+        List<SampleLabExecutiveListResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = labExecutiveInfoService.deptLabExecutiveListByIds(request.getMeasureStatus(), request.getIds());
+        } else {
+            list = labExecutiveInfoService.deptLabExecutiveList(request);
+        }
+        super.exportExcel(SampleLabExecutiveListResponse.class, list, ExportEnum.DEPT_EXECUTIVE_TASK.getSheetName());
+    }
+
+    @ApiOperation("我的任务-查询各状态列表（待检测、检测中、检测完）")
     @PostMapping("/myExecutive/list")
     public ReturnDTO<PageInfoBT<SampleLabExecutiveListResponse>> queryMyExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
@@ -57,19 +68,25 @@
         return ReturnUtil.success(super.packForBT(labExecutiveInfoService.myLabExecutiveListPage(page, labExecutiveListRequest)));
     }
 
-    /**
-     * 实验室检测-我的检测-查询各状态样品数量（待检测、检测中、检测完）
-     */
-    @ApiOperation("实验室检测-我的检测-查询各状态样品数量（待检测、检测中、检测完）")
+    @ApiOperation("我的任务导出")
+    @PostMapping("/myExecutive/export")
+    public void exportList(@RequestBody @Valid SampleLabExecutiveListRequest request) throws Exception {
+        List<SampleLabExecutiveListResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = labExecutiveInfoService.myLabExecutiveListByIds(request.getMeasureStatus(), request.getIds());
+        } else {
+            list = labExecutiveInfoService.myLabExecutiveList(request);
+        }
+        super.exportExcel(SampleLabExecutiveListResponse.class, list, ExportEnum.MY_EXECUTIVE_TASK.getSheetName());
+    }
+
+    @ApiOperation("我的任务-查询各状态样品数量（待检测、检测中、检测完）")
     @GetMapping("/myExecutive/amount")
     public ReturnDTO<List<SampleAmountResponse>> queryMyExecutiveAmount() {
         return ReturnUtil.success(labExecutiveInfoService.myExecutiveAmount());
     }
 
-    /**
-     * 实验室检测-部门检测-分配（分配给具体人员）
-     */
-    @ApiOperation("实验室检测-部门检测-分配按钮（分配给具体人员）")
+    @ApiOperation("实验室任务-分配按钮（分配给具体人员）")
     @PostMapping("/deptExecutive/allocate")
     public ReturnDTO allocateStaff(@RequestBody @Valid SampleAllocateRequest sampleAllocateRequest, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -78,10 +95,7 @@
         return labExecutiveInfoService.allocateStaff(sampleAllocateRequest);
     }
 
-    /**
-     * 实验室检测-我的检测-检定人扫描收入（待检测->检测中）
-     */
-    @ApiOperation("实验室检测-我的检测-检定人扫描收入（待检测->检测中）")
+    @ApiOperation("我的任务-检定人扫描收入（待检测->检测中）")
     @PostMapping("/myExecutive/receive")
     public ReturnDTO sampleReceive(@RequestBody @Valid List<SampleOperateRequest> requestList, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -90,10 +104,7 @@
         return labExecutiveInfoService.sampleReceive(requestList);
     }
 
-    /**
-     * 实验室检测-负责人/检定人扫描检完（检测中->检测完）
-     */
-    @ApiOperation("实验室检测-负责人/检定人扫描检完（检测中->检测完）")
+    @ApiOperation("实验室任务-负责人/检定人扫描检完（检测中->检测完）")
     @PostMapping("/myExecutive/complete")
     public ReturnDTO sampleExecutiveComplete(@RequestBody @Valid List<SampleOperateRequest> requestList, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -102,10 +113,7 @@
         return labExecutiveInfoService.sampleExecutiveComplete(requestList);
     }
 
-    /**
-     * 实验室检测-部门检测/我的检测 编辑（只能修改应出具证书）
-     */
-    @ApiOperation("实验室检测-部门检测/我的检测 编辑（只能修改应出具证书）")
+    @ApiOperation("实验室任务/我的任务 编辑（只能修改应出具证书）")
     @PostMapping("/executive/update")
     public ReturnDTO updateExecutive(@RequestBody @Valid UpdateExecutiveRequest request, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -114,10 +122,7 @@
         return labExecutiveInfoService.updateExecutive(request);
     }
 
-    /**
-     * 实验室检测-部门检测/我的检测 详情
-     */
-    @ApiOperation("实验室检测-部门检测/我的检测 详情")
+    @ApiOperation("实验室任务/我的任务 详情")
     @PostMapping("/executive/detail")
     public ReturnDTO<ExecutiveDetailResponse> executiveDetail(@RequestBody @Valid ExecutiveDetailRequest request, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
@@ -131,7 +136,7 @@
      * 退回后会将下一个要执行的实验室检测状态更新为待分配，将后面的实验室顺序变更为连续（都进行减1）
      * 最后一个检测的实验室退回，等分发员再增加实验室或设备收发中的已收入直接手动点击完成
      */
-    @ApiOperation("实验室检测-部门检测/我的检测 退回（待检测/检测中->退回）")
+    @ApiOperation("实验室任务/我的任务 退回（待检测/检测中->退回）")
     @PostMapping("/executive/sendBack")
     public ReturnDTO executiveSendBack(@RequestBody @Valid ExecutiveSendBackRequest request, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -140,9 +145,6 @@
         return labExecutiveInfoService.sampleExecutiveSendBack(request);
     }
 
-    /**
-     * 分发员编辑实验室检测列表
-     */
     @ApiOperation("分发员编辑实验室检测列表")
     @PostMapping("/handOut/updateList")
     public ReturnDTO updateExecutiveList(@RequestBody @Valid UpdateExecutiveListRequest request, BindingResult bindingResult) {
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java
index 48a67ed..0c04f31 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java
@@ -10,6 +10,7 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.resource.customer.CustomerApprovalListRequest;
 import com.casic.missiles.dto.resource.customer.CustomerSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceCustomerInfo;
@@ -26,6 +27,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -55,6 +57,13 @@
         return customerInfoService.saveCustomerInfo(request);
     }
 
+    @ApiOperation("委托方名录导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody CustomerApprovalListRequest request) throws Exception {
+        List<BizResourceCustomerInfo> list = super.exportList(request);
+        super.exportExcel(BizResourceCustomerInfo.class, list, ExportEnum.CUSTOMER_INFO.getSheetName());
+    }
+
     @ApiOperation("委托方人员列表（分页）")
     @PostMapping("/person/listPage")
     public ReturnDTO<PageInfoBT<BizResourceCustomerStaff>> personListPage(@RequestBody IdDTO idDto) {
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
index 972ed4b..6418ea5 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
@@ -5,6 +5,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.resource.customer.SuggestFormApprovalListRequest;
 import com.casic.missiles.dto.resource.customer.SuggestFormSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceCustomerSuggestForm;
@@ -20,6 +21,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -50,4 +52,11 @@
         return suggestFormService.saveSuggestForm(request);
     }
 
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody SuggestFormApprovalListRequest request) throws Exception {
+        List<BizResourceCustomerSuggestForm> list = super.exportList(request);
+        super.exportExcel(BizResourceCustomerSuggestForm.class, list, ExportEnum.CUSTOMER_SUGGEST_FORM.getSheetName());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java
index 1934d1a..9e07eab 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java
@@ -15,12 +15,16 @@
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.resource.IEnvEnvironmentRecordConfigService;
 import com.casic.missiles.service.resource.IEnvEnvironmentRecordDataService;
+import com.casic.missiles.service.resource.IEnvLocationInfoService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
 import java.util.List;
@@ -39,6 +43,8 @@
     private IEnvEnvironmentRecordDataService environmentRecordDataService;
     @Autowired
     private IEnvEnvironmentRecordConfigService environmentRecordConfigService;
+    @Autowired
+    private IEnvLocationInfoService locationInfoService;
 
     @ApiOperation("环境记录单数据列表/详情")
     @PostMapping("/data/listPage")
@@ -95,4 +101,11 @@
         });
         return environmentRecordConfigService.deleteEnvironmentRecordConfig(idDTO.getId());
     }
+
+    @ApiOperation("地点列表")
+    @PostMapping("/location/listPage")
+    public ReturnDTO<PageInfoBT<LocationListResponse>> locationListPage(@RequestBody @Valid LocationListRequest request) {
+        Page<LocationListResponse> page = PageFactory.defaultPage();
+        return ReturnUtil.success(super.packForBT(locationInfoService.listPage(page, request)));
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java
index 82efe3f..e9561fa 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java
@@ -10,6 +10,7 @@
 import com.casic.missiles.dto.resource.seal.SealLogListRequest;
 import com.casic.missiles.dto.resource.seal.SealNoteApprovalListRequest;
 import com.casic.missiles.dto.resource.seal.SealNoteSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceSealUseLog;
@@ -27,6 +28,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -58,6 +60,13 @@
         return sealUseNoteService.saveSeal(request);
     }
 
+    @ApiOperation("印章使用登记导出（列表和导出中去掉经办人和监印人）")
+    @PostMapping("/listExport")
+    public void export(@RequestBody SealNoteApprovalListRequest request) throws Exception {
+        List<BizResourceSealUseNote> list = super.exportList(request);
+        super.exportExcel(BizResourceSealUseNote.class, list, ExportEnum.SEAL_NOTE.getSheetName());
+    }
+
     // TODO: 2023/7/28 印章使用日志：系统中使用印章时插入数据库
 
     @ApiOperation("印章使用日志列表（分页）")
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java
index 9b674fc..06b6521 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java
@@ -9,16 +9,20 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.resource.staff.StaffCertRequest;
 import com.casic.missiles.dto.resource.staff.StaffCertResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.service.resource.IBizResourceStaffInfoService;
 import com.casic.missiles.service.resource.IBizResourceStaffVerifierService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.List;
+
 /**
  * @Description:
  * @Author: wangpeng
@@ -41,9 +45,21 @@
         return ReturnUtil.success(super.packForBT(responsePage));
     }
 
+    @ApiOperation("证书逾期提醒导出")
+    @PostMapping("/listExport")
+    public void exportList(@RequestBody StaffCertRequest request) throws Exception {
+        List<StaffCertResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = staffInfoService.certListByIds(request.getIds());
+        } else {
+            list = staffInfoService.certList(request);
+        }
+        super.exportExcel(StaffCertResponse.class, list, ExportEnum.STAFF_CERTIFICATE_EXPIRE.getSheetName());
+    }
+
     @ApiOperation("证书逾期提醒")
     @PostMapping("/expirationReminder")
-    public ReturnDTO expirationReminder(@RequestBody IdDTO idDto) {
-        return verifierService.expirationReminder(idDto);
+    public ReturnDTO expirationReminder(@RequestBody IdDTO idDTO) {
+        return verifierService.expirationReminder(idDTO);
     }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java
index 3b251ad..a6e7850 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java
@@ -12,6 +12,7 @@
 import com.casic.missiles.dto.resource.staff.StaffListRequest;
 import com.casic.missiles.dto.resource.staff.TrainListRequest;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.*;
@@ -22,7 +23,10 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
 import java.util.List;
@@ -52,8 +56,19 @@
             throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
         }
         Page<BizResourceStaffInfo> page = PageFactory.defaultPage();
-        Page<BizResourceStaffInfo> responsePage = staffInfoService.listPage(page, request);
-        return ReturnUtil.success(super.packForBT(responsePage));
+        return ReturnUtil.success(super.packForBT(staffInfoService.listPage(page, request)));
+    }
+
+    @ApiOperation("人员登记导出")
+    @PostMapping("/listExport")
+    public void exportList(@RequestBody StaffListRequest request) throws Exception {
+        List<BizResourceStaffInfo> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = staffInfoService.listByIds(request.getIds());
+        } else {
+            list = staffInfoService.list(request);
+        }
+        super.exportExcel(BizResourceStaffInfo.class, list, ExportEnum.STAFF_INFO.getSheetName());
     }
 
     @ApiOperation("人员登记详情基础信息")
@@ -85,9 +100,9 @@
 
     @ApiOperation("科研教育列表（分页）")
     @PostMapping("/education/listPage")
-    public ReturnDTO<PageInfoBT<BizResourceStaffEducation>> educationListPage(@RequestBody IdDTO idDto) {
+    public ReturnDTO<PageInfoBT<BizResourceStaffEducation>> educationListPage(@RequestBody IdDTO idDTO) {
         Page<BizResourceStaffEducation> page = PageFactory.defaultPage();
-        Page<BizResourceStaffEducation> responsePage = staffInfoService.educationListPage(page, idDto);
+        Page<BizResourceStaffEducation> responsePage = staffInfoService.educationListPage(page, idDTO);
         return ReturnUtil.success(super.packForBT(responsePage));
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java
index af6aa86..d85d84a 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java
@@ -9,6 +9,7 @@
 import com.casic.missiles.dto.resource.outsideService.SupplierApprovalListRequest;
 import com.casic.missiles.dto.resource.outsideService.SupplierSaveResponse;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceSupplierAbility;
@@ -67,6 +68,13 @@
         return ReturnUtil.success(supplierInfoService.detail(idDTO.getId()));
     }
 
+    @ApiOperation("合格供方导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody SupplierApprovalListRequest request) throws Exception {
+        List<BizResourceSupplierInfo> list = super.exportList(request);
+        super.exportExcel(BizResourceSupplierInfo.class, list, ExportEnum.SUPPLIER_INFO.getSheetName());
+    }
+
     @ApiOperation("供方人员列表（分页）")
     @PostMapping("/person/listPage")
     public ReturnDTO<PageInfoBT<BizResourceSupplierPerson>> personListPage(@RequestBody IdDTO idDTO) {
diff --git a/casic-metering-api/src/main/resources/config/application.yml b/casic-metering-api/src/main/resources/config/application.yml
index 350db5f..ecff521 100644
--- a/casic-metering-api/src/main/resources/config/application.yml
+++ b/casic-metering-api/src/main/resources/config/application.yml
@@ -126,7 +126,7 @@
     #作者
     author: wangpeng
     #待生成对象表名
-    table-name: biz_equipment_technical_target_approval,biz_equipment_attachment_approval,biz_equipment_checkpoint_approval
+    table-name: biz_business_outsource_protocol
 
 reminder:
   #节点--common模块config包 ReminderNodeConfig配置
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
index 4a19e4e..d47d552 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
@@ -53,6 +53,7 @@
     SUGGEST_FORM_SAVE_FAILED(2509, "委托方意见登记表保存至草稿箱失败"),
     EXAMINE_FORM_SAVE_FAILED(2510, "要求、委托书及合同评审表保存至草稿箱失败"),
     CUSTOMER_EXIST_SAVE_FAILED(2511, "该委托方已存在，请重新选择"),
+    DUPLICATE_LOCATION_NO(2512, "地点编号已存在"),
 
     /**
      * 计量检定业务模块
@@ -68,6 +69,8 @@
     COMPLETE_SAMPLE_NOT_EXIST(2609, "检测中不存在扫描收入的样品"),
     CANNOT_CHANGE_MEASURE_INFO(2610, "无法更改非当前登录用户的检测信息"),
     NON_EXIST_ORDER_OR_SAMPLE(2611, "不存在该委托单或该委托单下的样品"),
+    OUTSOURCE_ACCESS_SAVE_FAILED(2612, "测试、校准或检定工作分包评审表保存至草稿箱失败"),
+    OUTSOURCE_PROTOCOL_SAVE_FAILED(2613, "测试、校准或检定工作分包协议书保存至草稿箱失败"),
 
     /**
      * 历史遗留备用
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
index 5089ad1..81a406b 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
@@ -10,54 +10,38 @@
     /**
      * 资源管理
      */
-    ENVIRONMENT_DATA_EXPORT("environmentData", "environmentData", "环境记录单数据"),
+    ENVIRONMENT_DATA_EXPORT("environmentData", "环境记录单数据", "环境记录单数据"),
+    STAFF_INFO("staffInfo", "人员登记", "人员登记"),
+    STAFF_CERTIFICATE_EXPIRE("certificateExpire", "证书逾期提醒", "证书逾期提醒"),
+    SUPPLIER_INFO("supplierInfo", "合格供方名录", "合格供方名录"),
+    CUSTOMER_INFO("customerInfo", "委托方名录", "委托方名录"),
+    CUSTOMER_SUGGEST_FORM("customerSuggestForm", "委托方意见登记表", "委托方意见登记表"),
+    SEAL_NOTE("sealNote", "印章使用登记", "印章使用登记"),
 
-    FILE_EXPORT("meterFileData", "meterFileData", "计量文件信息"),
-    TRAIN_PLAN_EXPORT("trainPlanData", "trainPlanData", "培训计划"),
-    TRAIN_LOG_EXPORT("trainLogData", "trainLogData", "培训记录"),
-    METER_ORGANIZE_EXPORT("meterOrganizeData", "meterOrganizeData", "计量组织"),
-    TRACE_SUPPLIER_EXPORT("traceSupplierData", "traceSupplierData", "溯源供方"),
-    SIGN_EXPORT("signData", "signData", "签名/签章"),
-    TEMPLATE_EXPORT("templateData", "templateData", "原始记录模板/证书报告模板"),
-    FIXED_ASSETS("meterFixedAssets", "meterFixedAssets", "固定资产"),
-    METER_EQUIPMENT("meterEquipment", "meterEquipment", "测量设备"),
-    CALIBRATION_TEST_EQUIPMENT("calibrationTestEquipment", "calibrationTestEquipment", "校准检定设备"),
-    MEASURE_ACCOUNT("measureAccount", "measureAccount", "测量工装"),
-    STANDARD_SUPPORT_EQUIPMENT("standardSupportEquipment", "standardSupportEquipment", "标准配套设备"),
-    STANDARD_EQUIPMENT("standardEquipment", "standardEquipment", "标准装置"),
-    FLOW_DEF_EXPORT("flowDefData", "flowDefData", "流程定义"),
-    STAFF_CERTIFICATE("certificate", "certificate", "计量人员证书"),
-    CHECK_INFO("checkInfo", "checkInfo", "设备管理点检测"),
-    EQUIPMENT_APPLY("equipmentApply", "equipmentApply", "设备借用"),
-    STANDARD_EQUIPMENT_REMIND("equipmentApplyRemind", "equipmentApplyRemind", "标准装置到期提醒"),
-    METER_PRICE("meterPrice", "meterPrice", "价格库"),
-    METER_STAFF("meterStaff", "meterStaff", "计量人员"),
-    STANDARD_EQUIPMENT_APPLY("standardEquipmentApply", "standardEquipmentApply", "标准装置申请"),
-    STATE_MANAGE_APPLY("stateManage", "stateManage", "状态管理"),
-    METER_ACCEPTANCE_CHECK("acceptanceCheck", "acceptanceCheck", "设备检修保养验收单"),
-    CUSTOMER_EXPORT("customerData", "customerData", "客户信息"),
-    ORDER_EXPORT("orderData", "orderData", "委托书信息"),
-    SAMPLE_EXPORT("sampleData", "sampleData", "样本信息"),
-    EXCHANGE_DATA("exchangeData", "exchangeData", "设备交接单"),
-    DISPATCH_DATA("dispatchData", "dispatchData", "设备收发"),
-    ENVIRONMENT_DATA("environmentData", "environmentData", "环境记录单"),
-    ORIGIN_DATA("originData", "originData", "原始记录"),
-    CERTIFICATE_REPORT("certificateReport", "certificateReport", "证书报告"),
-    ADVICE_EXPORT("adviceData", "adviceData", "客户反馈"),
-    HANDOUT_EXPORT("handoutData", "handoutData", "任务分发列表"),
-    OUTSOURCER_EXPORT("outsourcerData", "outsourcerData", "分包方"),
-    SITE_EXECUTIVE_EXPORT("siteExecutiveData", "siteExecutiveData", "现场测试、校准或检定"),
-    CERTIFICATE_PRINT_EXPORT("certificatePrintData", "certificatePrintData", "证书打印"),
-    DOWNLOAD_TEMPLATE("downloadTemplate", "downloadTemplate", "页面配置"),
-    OUTSOURCER_CERTIFICATE_EXPORT("outsourceCertificateData", "outsourceCertificateData", "分包证书"),
-    SETTLEMENT_INFO_EXPORT("settlementInfoData", "settlementInfoData", "业务结算"),
-    EQUIPMENT_REMIND("equipmentRemind", "equipmentRemind", "设备到期提醒"),
-    AGREEMENT_INFO_EXPORT("agreementInfoData", "agreementInfoData", "合同"),
-    WORK_STATISTICS_EXPORT("workStatisticsData", "workStatisticsData", "实时工作统计"),
-    DEPT_OUTPUT_EXPORT("deptOutputData", "deptOutputData", "部门产值分析"),
-    WORKLOAD_EXPORT("workloadData", "workloadData", "业务工作量分析"),
-    DEPT_COMPREHENSIVE_EXPORT("deptComprehensiveData", "deptComprehensiveData", "部门综合分析"),
-    ENVIRONMENTAL_RECORD("environmentalRecordData", "environmentalRecordData", "现场环境记录");
+    /**
+     * 计量检定业务
+     */
+    OUTSOURCER_EXPORT("outsourcerData", "分包方名录", "分包方名录"),
+    IDENTIFY_EXPORT("identifyData", "计量标识", "计量标识"),
+    ORDER_EXPORT("orderData", "任务单", "任务单"),
+    DISPATCH_DATA("dispatchData", "设备收发", "设备收发"),
+    HANDOUT_EXPORT("handoutData", "任务分发", "任务分发"),
+    SITE_EXECUTIVE_EXPORT("siteExecutiveData", "现场测试、校准或检定", "现场测试、校准或检定"),
+    CERTIFICATE_REPORT("certificateReport", "证书审批", "证书审批"),
+    CERTIFICATE_CHANGE_APPLY("certificateChangeApply", "证书报告补充或更换申请单", "证书报告补充或更换申请单"),
+    CERTIFICATE_PRINT("certificatePrintData", "证书打印审批", "证书打印审批"),
+    DEPT_EXECUTIVE_TASK("deptExecutiveTaskData", "实验室任务", "实验室任务"),
+    MY_EXECUTIVE_TASK("myExecutiveTaskData", "我的任务", "我的任务"),
+    OUTSOURCE_ASSESS("outsourceAssess", "测试、校准或检定工作分包评审表", "测试、校准或检定工作分包评审表"),
+    OUTSOURCE_PROTOCOL("outsourceProtocol", "测试、校准或检定工作分包协议书", "测试、校准或检定工作分包协议书"),
+
+    /**
+     * 系统管理
+     */
+    SIGN_EXPORT("signData", "签名", "签名"),
+    TEMPLATE_EXPORT("templateData", "文件模板", "文件模板"),
+    FLOW_DEF_EXPORT("flowDefData", "流程定义", "流程定义"),
+    DOWNLOAD_TEMPLATE("downloadTemplate", "流程定义", "页面配置");
 
     ExportEnum(String fileName, String sheetName, String description) {
         this.fileName = fileName;
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateRecordTypeCodeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateRecordTypeCodeEnum.java
index 31d913c..a963522 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateRecordTypeCodeEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateRecordTypeCodeEnum.java
@@ -46,4 +46,14 @@
     String SITE_EXECUTIVE_APPROVAL = "01";
     //《现场测试、校准或检定工作记录表》
     String SITE_EXECUTIVE_LOG = "02";
+
+    //测试、校准或检定工作分包协议书
+    String OUTSOURCE_PROTOCOL = "01";
+    //测试、校准或检定工作分包评审表
+    String OUTSOURCE_ACCESS = "02";
+    //测试、校准或检定工作分包通知书
+    String OUTSOURCE_NOTICE = "03";
+    //测试、校准或检定工作分包方名录
+    String OUTSOURCE_INFO = "04";
+
 }
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
index 24b8635..f78bd53 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
@@ -15,6 +15,10 @@
     String CERTIFICATE_CHANGE_APPLY_BEAN_NAME = "certificateChangeApplyBean";
     //现场测试、校准或检定
     String SITE_EXECUTIVE_BEAN_NAME = "siteExecutiveBean";
+    //测试、校准或检定工作分包评审表
+    String OUTSOURCE_ASSESS_BEAN_NAME = "outsourceAssessBean";
+    //测试、校准或检定工作分包协议书
+    String OUTSOURCE_PROTOCOL_BEAN_NAME = "outsourceProtocolBean";
 
     /*********************************设备与装置************************************/
     //设备台账
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 b21c661..6b86fd1 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
@@ -18,6 +18,8 @@
     OUTSOURCER_APPROVAL(OUTSOURCER_BEAN_NAME, ""),
     CERTIFICATE_CHANGE_APPROVAL(CERTIFICATE_CHANGE_APPLY_BEAN_NAME, ""),
     SITE_EXECUTIVE_APPROVAL(SITE_EXECUTIVE_BEAN_NAME, ""),
+    OUTSOURCE_ASSESS_APPROVAL(OUTSOURCE_ASSESS_BEAN_NAME, ""),
+    OUTSOURCE_PROTOCOL_APPROVAL(OUTSOURCE_PROTOCOL_BEAN_NAME, ""),
 
     ACTION_STATUS_MAP(new HashMap<String, AwareActionStatusEnum>() {
         {
@@ -47,6 +49,10 @@
             put(ApplyFromIdEnum.CERTIFICATE_CHANGE_APPROVAL.getCode(), CERTIFICATE_CHANGE_APPROVAL);
             //现场测试、校准或检定审批
             put(ApplyFromIdEnum.SITE_EXECUTIVE_APPROVAL.getCode(), SITE_EXECUTIVE_APPROVAL);
+            //测试、校准或检定工作分包评审表
+            put(ApplyFromIdEnum.OUTSOURCE_ASSESS_APPROVAL.getCode(), OUTSOURCE_ASSESS_APPROVAL);
+            //测试、校准或检定工作分包协议书
+            put(ApplyFromIdEnum.OUTSOURCE_PROTOCOL_APPROVAL.getCode(), OUTSOURCE_PROTOCOL_APPROVAL);
         }
     });
     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 934405e..c7410bd 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
@@ -9,6 +9,8 @@
     CERTIFICATE_CHANGE_APPROVAL("jljdywzsbchghsqd", MessageSourceModuleEnum.BUSINESS.getCode(), "证书/报告补充或更换申请单"),
     OUTSOURCER_APPROVAL("jljdywcsjzhgfbfml", MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定合格分包方名录"),
     SITE_EXECUTIVE_APPROVAL("jljdywxccsjzsp", MessageSourceModuleEnum.BUSINESS.getCode(), "现场测试、校准或检定审批"),
+    OUTSOURCE_ASSESS_APPROVAL("jljdywcsjzfbpsb", MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包评审表"),
+    OUTSOURCE_PROTOCOL_APPROVAL("jljdywcsjzfbxys", MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包协议书"),
 
 
     /*******************************************设备与装置*********************************************/
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/GeneralApprovalMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/GeneralApprovalMapper.java
index 4fb7344..0c9d6ae 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/GeneralApprovalMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/GeneralApprovalMapper.java
@@ -17,8 +17,4 @@
 
     Page<O> selectBatchForApprovalList(Page<O> page, @Param("request") R request, @Param("businessKeys") List<String> businessKeys);
 
-//    Page<O> selectListPage(Page<O> page, @Param("request") R request);
-
-//    Long selectMaxNo();
-
 }
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceAssessMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceAssessMapper.java
index 7867bb8..ba59009 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceAssessMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceAssessMapper.java
@@ -1,7 +1,12 @@
 package com.casic.missiles.mapper.business;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.business.outsource.OutsourceAssessApprovalListRequest;
+import com.casic.missiles.mapper.GeneralApprovalMapper;
 import com.casic.missiles.model.business.BizBusinessOutsourceAssess;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * <p>
@@ -11,6 +16,10 @@
  * @author wangpeng
  * @since 2023-08-16
  */
-public interface BizBusinessOutsourceAssessMapper extends BaseMapper<BizBusinessOutsourceAssess> {
+public interface BizBusinessOutsourceAssessMapper extends GeneralApprovalMapper<BizBusinessOutsourceAssess, BizBusinessOutsourceAssess, OutsourceAssessApprovalListRequest> {
+
+    Page<BizBusinessOutsourceAssess> selectBatchForApprovalList(Page<BizBusinessOutsourceAssess> page, @Param("request") OutsourceAssessApprovalListRequest request, @Param("businessKeys") List<String> businessKeys);
+
+    Long selectMaxProjectNo();
 
 }
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceProtocolMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceProtocolMapper.java
new file mode 100644
index 0000000..e6aba35
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceProtocolMapper.java
@@ -0,0 +1,24 @@
+package com.casic.missiles.mapper.business;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.business.outsource.OutsourceProtocolApprovalListRequest;
+import com.casic.missiles.mapper.GeneralApprovalMapper;
+import com.casic.missiles.model.business.BizBusinessOutsourceProtocol;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 计量检定业务-分包管理-测试、校准或检定工作分包协议书 Mapper 接口
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-08-24
+ */
+public interface BizBusinessOutsourceProtocolMapper extends GeneralApprovalMapper<BizBusinessOutsourceProtocol, BizBusinessOutsourceProtocol, OutsourceProtocolApprovalListRequest> {
+
+    Page<BizBusinessOutsourceProtocol> selectBatchForApprovalList(Page<BizBusinessOutsourceProtocol> page, @Param("request") OutsourceProtocolApprovalListRequest request, @Param("businessKeys") List<String> businessKeys);
+
+    Long selectMaxProtocolNo();
+}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/EnvLocationInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/EnvLocationInfoMapper.java
new file mode 100644
index 0000000..49eff87
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/EnvLocationInfoMapper.java
@@ -0,0 +1,21 @@
+package com.casic.missiles.mapper.resource;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.resource.environment.LocationListRequest;
+import com.casic.missiles.dto.resource.environment.LocationListResponse;
+import com.casic.missiles.model.resource.EnvLocationInfo;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * <p>
+ * 实验室环境监控系统-设备表 Mapper 接口
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-06-07
+ */
+public interface EnvLocationInfoMapper extends BaseMapper<EnvLocationInfo> {
+
+    Page<LocationListResponse> selectLocationListPage(Page<LocationListResponse> page, @Param("request") LocationListRequest request);
+}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java
index de124db..85ed0f7 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java
@@ -1,7 +1,9 @@
 package com.casic.missiles.mapper.system;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.dto.system.SignDetailResponse;
+import com.casic.missiles.dto.system.SignListRequest;
 import com.casic.missiles.model.system.SystemSign;
 import org.apache.ibatis.annotations.Param;
 
@@ -22,4 +24,8 @@
     SignDetailResponse selectSignDetailById(Long id);
 
     List<SystemSign> selectUsableSignList(@Param("userId") Long userId);
+
+    Page<SystemSign> selectSignListPage(Page<SystemSign> page, @Param("request") SignListRequest request);
+
+    List<SystemSign> selectSignList(@Param("request") SignListRequest request);
 }
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateChangeApplyMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateChangeApplyMapper.xml
index d798447..c496092 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateChangeApplyMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateChangeApplyMapper.xml
@@ -30,31 +30,31 @@
         SELECT *
         FROM biz_business_certificate_change_apply
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.changeApplyNo != null and request.changeApplyNo !=''">
+        <if test="request != null and request.changeApplyNo != null and request.changeApplyNo !=''">
             and change_apply_no like concat('%',#{request.changeApplyNo},'%')
         </if>
-        <if test="request.changeReportNo != null and request.changeReportNo !=''">
+        <if test="request != null and request.changeReportNo != null and request.changeReportNo !=''">
             and change_report_no like concat('%',#{request.changeReportNo},'%')
         </if>
-        <if test="request.changeReportName != null and request.changeReportName !=''">
+        <if test="request != null and request.changeReportName != null and request.changeReportName !=''">
             and change_report_name like concat('%',#{request.changeReportName},'%')
         </if>
-        <if test="request.changeType != null and request.changeType !=''">
+        <if test="request != null and request.changeType != null and request.changeType !=''">
             and change_type = #{request.changeType}
         </if>
-        <if test="request.createUserName != null and request.createUserName !=''">
+        <if test="request != null and request.createUserName != null and request.createUserName !=''">
             and create_user_name like concat('%',#{request.createUserName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificatePrintMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificatePrintMapper.xml
index b66cd99..49c0ac8 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificatePrintMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificatePrintMapper.xml
@@ -31,34 +31,34 @@
         LEFT JOIN biz_business_order_sample_relation bosr ON (bosr.order_id = bcr.order_id AND bosr.sample_id = bcr.sample_id)
         LEFT JOIN biz_business_order_info boi ON boi.id = bosr.order_id
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and bcp.approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.printStatus != null and request.printStatus !=''">
+        <if test="request != null and request.printStatus != null and request.printStatus !=''">
             and print_status = #{request.printStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and bcp.create_user_id = #{request.createUserId}
         </if>
-        <if test="request.certificateReportNo != null and request.certificateReportNo !=''">
+        <if test="request != null and request.certificateReportNo != null and request.certificateReportNo !=''">
             and bcr.certificate_report_no like concat('%',#{request.certificateReportNo},'%')
         </if>
-        <if test="request.certificateReportName != null and request.certificateReportName !=''">
+        <if test="request != null and request.certificateReportName != null and request.certificateReportName !=''">
             and bcr.certificate_report_name like concat('%',#{request.certificateReportName},'%')
         </if>
-        <if test="request.customerName != null and request.customerName !=''">
+        <if test="request != null and request.customerName != null and request.customerName !=''">
             and boi.customer_name like concat('%',#{request.customerName},'%')
         </if>
-        <if test="request.sampleNo != null and request.sampleNo !=''">
+        <if test="request != null and request.sampleNo != null and request.sampleNo !=''">
             and bosr.sample_no like concat('%',#{request.sampleNo},'%')
         </if>
-        <if test="request.sampleName != null and request.sampleName !=''">
+        <if test="request != null and request.sampleName != null and request.sampleName !=''">
             and bosr.sample_name like concat('%',#{request.sampleName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and bcp.create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and bcp.create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml
index b366034..767695d 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml
@@ -46,33 +46,37 @@
         SELECT bcr.*, bosr.sample_no, bosr.sample_name, bosr.sample_model, rsi.staff_name
         FROM biz_business_certificate_report bcr
         LEFT JOIN biz_business_order_sample_relation bosr ON (bosr.order_id = bcr.order_id AND bosr.sample_id = bcr.sample_id)
+        LEFT JOIN biz_business_order_info boi ON boi.id = bcr.order_id
         LEFT JOIN biz_resource_staff_info rsi ON rsi.id = bcr.measure_person_id
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and bcr.approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and bcr.create_user_id = #{request.createUserId}
         </if>
-        <if test="request.certificateReportNo != null and request.certificateReportNo !=''">
+        <if test="request != null and request.customerId != null and request.customerId !=''">
+            and boi.customer_id = #{request.customerId}
+        </if>
+        <if test="request != null and request.certificateReportNo != null and request.certificateReportNo !=''">
             and bcr.certificate_report_no like concat('%',#{request.certificateReportNo},'%')
         </if>
-        <if test="request.certificateReportName != null and request.certificateReportName !=''">
+        <if test="request != null and request.certificateReportName != null and request.certificateReportName !=''">
             and bcr.certificate_report_name like concat('%',#{request.certificateReportName},'%')
         </if>
-        <if test="request.sampleNo != null and request.sampleNo !=''">
+        <if test="request != null and request.sampleNo != null and request.sampleNo !=''">
             and bosr.sample_no like concat('%',#{request.sampleNo},'%')
         </if>
-        <if test="request.measureCategory != null and request.measureCategory !=''">
+        <if test="request != null and request.measureCategory != null and request.measureCategory !=''">
             and bcr.measure_category = #{request.measureCategory}
         </if>
-        <if test="request.measurePerson != null and request.measurePerson !=''">
+        <if test="request != null and request.measurePerson != null and request.measurePerson !=''">
             and rsi.staff_name like concat('%',#{request.measurePerson},'%')
         </if>
-        <if test="request.calibrationTimeStart != null and request.calibrationTimeStart !=''">
+        <if test="request != null and request.calibrationTimeStart != null and request.calibrationTimeStart !=''">
             and bcr.calibration_time &gt;= #{request.calibrationTimeStart}
         </if>
-        <if test="request.calibrationTimeEnd != null and request.calibrationTimeEnd !=''">
+        <if test="request != null and request.calibrationTimeEnd != null and request.calibrationTimeEnd !=''">
             and bcr.calibration_time &lt;= #{request.calibrationTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceAssessMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceAssessMapper.xml
index d0fcf8b..c22c101 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceAssessMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceAssessMapper.xml
@@ -7,6 +7,8 @@
         <id column="id" property="id" />
         <result column="project_no" property="projectNo" />
         <result column="project_name" property="projectName" />
+        <result column="lab_code" property="labCode" />
+        <result column="group_code" property="groupCode" />
         <result column="applicant_id" property="applicantId" />
         <result column="applicant_name" property="applicantName" />
         <result column="applicant_time" property="applicantTime" />
@@ -31,7 +33,45 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, project_no, project_name, applicant_id, applicant_name, applicant_time, minio_file_name, remark, create_user_id, create_user_name, outsourcer_id, pre_start_time, pre_end_time, outsource_reason, pre_cost, approval_status, process_id, approve_situation, traceability, test_method, technique_ability, create_time, update_time
+        id, project_no, project_name, lab_code, group_code, applicant_id, applicant_name, applicant_time, minio_file_name, remark, create_user_id, create_user_name, outsourcer_id, pre_start_time, pre_end_time, outsource_reason, pre_cost, approval_status, process_id, approve_situation, traceability, test_method, technique_ability, create_time, update_time
     </sql>
 
+    <select id="selectMaxProjectNo" resultType="java.lang.Long">
+        SELECT IFNULL(max(RIGHT(project_no, 3)), 0) from biz_business_outsource_assess
+    </select>
+
+    <select id="selectBatchForApprovalList" resultMap="BaseResultMap">
+        SELECT bboa.*, bboi.outsourcer_name, bboi.director
+        FROM biz_business_outsource_assess bboa
+        LEFT JOIN biz_business_outsourcer_info bboi ON bboa.outsourcer_id = bboi.id
+        WHERE 1=1
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
+            and bboa.approval_status = #{request.approvalStatus}
+        </if>
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
+            and bboa.create_user_id = #{request.createUserId}
+        </if>
+        <if test="request != null and request.projectNo != null and request.projectNo !=''">
+            and bboa.project_no like concat('%',#{request.projectNo},'%')
+        </if>
+        <if test="request != null and request.outsourcerName != null and request.outsourcerName !=''">
+            and bboi.outsourcer_name like concat('%',#{request.outsourcerName},'%')
+        </if>
+        <if test="request != null and request.applicantName != null and request.applicantName !=''">
+            and bboa.applicant_name like concat('%',#{request.applicantName},'%')
+        </if>
+        <if test="request != null and request.applicantTimeStart != null and request.applicantTimeStart !=''">
+            and bboa.applicant_time &gt;= #{request.applicantTimeStart}
+        </if>
+        <if test="request != null and request.applicantTimeEnd != null and request.applicantTimeEnd !=''">
+            and bboa.applicant_time &lt;= #{request.applicantTimeEnd}
+        </if>
+        <if test="businessKeys != null">
+            and bboa.id in
+            <foreach collection="businessKeys" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
+        ORDER BY bboa.create_time DESC
+    </select>
 </mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceProtocolMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceProtocolMapper.xml
new file mode 100644
index 0000000..b7b2149
--- /dev/null
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceProtocolMapper.xml
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.mapper.business.BizBusinessOutsourceProtocolMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.business.BizBusinessOutsourceProtocol">
+        <id column="id" property="id" />
+        <result column="protocol_no" property="protocolNo" />
+        <result column="project_name" property="projectName" />
+        <result column="lab_code" property="labCode" />
+        <result column="group_code" property="groupCode" />
+        <result column="outsourcer_id" property="outsourcerId" />
+        <result column="remark" property="remark" />
+        <result column="outsource_no" property="outsourceNo" />
+        <result column="outsource_name" property="outsourceName" />
+        <result column="contacts" property="contacts" />
+        <result column="mobile" property="mobile" />
+        <result column="address" property="address" />
+        <result column="require_date" property="requireDate" />
+        <result column="outsource_cost" property="outsourceCost" />
+        <result column="director" property="director" />
+        <result column="item" property="item" />
+        <result column="requires" property="requires" />
+        <result column="create_user_id" property="createUserId" />
+        <result column="create_user_name" property="createUserName" />
+        <result column="approval_status" property="approvalStatus" />
+        <result column="process_id" property="processId" />
+        <result column="create_time" property="createTime" />
+        <result column="update_time" property="updateTime" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, protocol_no, project_name, lab_code, group_code, outsourcer_id, remark, outsource_no, outsource_name, contacts, mobile, address, require_date, outsource_cost, director, item, requires, create_user_id, create_user_name, approval_status, process_id, create_time, update_time
+    </sql>
+
+    <select id="selectMaxProtocolNo" resultType="java.lang.Long">
+        SELECT IFNULL(max(RIGHT(protocol_no, 3)), 0) from biz_business_outsource_protocol
+    </select>
+
+    <select id="selectBatchForApprovalList" resultMap="BaseResultMap">
+        SELECT *
+        FROM biz_business_outsource_protocol
+        WHERE 1=1
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
+            and approval_status = #{request.approvalStatus}
+        </if>
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
+            and create_user_id = #{request.createUserId}
+        </if>
+        <if test="request != null and request.protocolNo != null and request.protocolNo !=''">
+            and protocol_no like concat('%',#{request.protocolNo},'%')
+        </if>
+        <if test="request != null and request.outsourcerName != null and request.outsourcerName !=''">
+            and outsourcer_name like concat('%',#{request.outsourcerName},'%')
+        </if>
+        <if test="request != null and request.applicantName != null and request.applicantName !=''">
+            and create_user_name like concat('%',#{request.applicantName},'%')
+        </if>
+        <if test="request != null and request.applicantTimeStart != null and request.applicantTimeStart !=''">
+            and create_time &gt;= #{request.applicantTimeStart}
+        </if>
+        <if test="request != null and request.applicantTimeEnd != null and request.applicantTimeEnd !=''">
+            and create_time &lt;= #{request.applicantTimeEnd}
+        </if>
+        <if test="businessKeys != null">
+            and id in
+            <foreach collection="businessKeys" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
+        ORDER BY create_time DESC
+    </select>
+</mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourcerInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourcerInfoMapper.xml
index 510a80b..3049b54 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourcerInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourcerInfoMapper.xml
@@ -7,6 +7,8 @@
         <id column="id" property="id" />
         <result column="outsourcer_no" property="outsourcerNo" />
         <result column="outsourcer_name" property="outsourcerName" />
+        <result column="lab_code" property="labCode" />
+        <result column="group_code" property="groupCode" />
         <result column="outsourcer_brief_name" property="outsourcerBriefName" />
         <result column="outsourcer_size" property="outsourcerSize" />
         <result column="business_size" property="businessSize" />
@@ -55,32 +57,32 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, outsourcer_no, outsourcer_name, outsourcer_brief_name, outsourcer_size, business_size, grade, evaluation, tax_number, bank_account, bank_name, bank_account_number, postal_code, director, phone, fax, mobile, email, website, address_country, address_province, address_city, address_area, full_address, address_country_name, address_province_name, address_city_name, address_area_name, invoice_country, invoice_province, invoice_city, invoice_area, invoice_full_address, invoice_country_name, invoice_province_name, invoice_city_name, invoice_area_name, business_scope, business_content, minio_file_name, approval_status, process_id, remark, create_user_id, create_user_name, create_time, update_time
+        id, outsourcer_no, outsourcer_name, lab_code, group_code, outsourcer_brief_name, outsourcer_size, business_size, grade, evaluation, tax_number, bank_account, bank_name, bank_account_number, postal_code, director, phone, fax, mobile, email, website, address_country, address_province, address_city, address_area, full_address, address_country_name, address_province_name, address_city_name, address_area_name, invoice_country, invoice_province, invoice_city, invoice_area, invoice_full_address, invoice_country_name, invoice_province_name, invoice_city_name, invoice_area_name, business_scope, business_content, minio_file_name, approval_status, process_id, remark, create_user_id, create_user_name, create_time, update_time
     </sql>
 
     <select id="selectBatchForApprovalList" resultMap="BaseResultMap">
         SELECT *
         FROM biz_business_outsourcer_info
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.outsourcerNo != null and request.outsourcerNo !=''">
+        <if test="request != null and request.outsourcerNo != null and request.outsourcerNo !=''">
             and outsourcer_no like concat('%',#{request.outsourcerNo},'%')
         </if>
-        <if test="request.outsourcerName != null and request.outsourcerName !=''">
+        <if test="request != null and request.outsourcerName != null and request.outsourcerName !=''">
             and outsourcer_name like concat('%',#{request.outsourcerName},'%')
         </if>
-        <if test="request.director != null and request.director !=''">
+        <if test="request != null and request.director != null and request.director !=''">
             and director like concat('%',#{request.director},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
@@ -93,6 +95,6 @@
     </select>
 
     <select id="selectMaxNo" resultType="java.lang.Long">
-        SELECT IFNULL(max(RIGHT(outsourcer_no, 12)), 0) from biz_business_outsourcer_info
+        SELECT IFNULL(max(RIGHT(outsourcer_no, 3)), 0) from biz_business_outsourcer_info
     </select>
 </mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessSiteExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessSiteExecutiveInfoMapper.xml
index 135c5d0..3c5ae79 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessSiteExecutiveInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessSiteExecutiveInfoMapper.xml
@@ -38,25 +38,25 @@
         FROM biz_business_site_executive_info bsei
         LEFT JOIN biz_resource_customer_info rci ON bsei.customer_id = rci.id
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and bsei.approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and bsei.create_user_id = #{request.createUserId}
         </if>
-        <if test="request.siteExecutiveNo != null and request.siteExecutiveNo !=''">
+        <if test="request != null and request.siteExecutiveNo != null and request.siteExecutiveNo !=''">
             and bsei.site_executive_no like concat('%',#{request.siteExecutiveNo},'%')
         </if>
-        <if test="request.customerName != null and request.customerName !=''">
+        <if test="request != null and request.customerName != null and request.customerName !=''">
             and rci.outsourcer_name like concat('%',#{request.customerName},'%')
         </if>
-        <if test="request.applyName != null and request.applyName !=''">
+        <if test="request != null and request.applyName != null and request.applyName !=''">
             and bsei.apply_name like concat('%',#{request.applyName},'%')
         </if>
-        <if test="request.applyTimeStart != null and request.applyTimeStart !=''">
+        <if test="request != null and request.applyTimeStart != null and request.applyTimeStart !=''">
             and bsei.apply_time &gt;= #{request.applyTimeStart}
         </if>
-        <if test="request.applyTimeEnd != null and request.applyTimeEnd !=''">
+        <if test="request != null and request.applyTimeEnd != null and request.applyTimeEnd !=''">
             and bsei.apply_time &lt;= #{request.applyTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml
index 84d9e2a..6bd38a9 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml
@@ -105,6 +105,12 @@
         <if test="request.isUrgent != null and request.isUrgent !=''">
             AND bo.is_urgent = #{request.isUrgent}
         </if>
+        <if test="request.ids != null">
+            and blei.id in
+            <foreach collection="request.ids" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
         ORDER BY blei.update_time DESC
     </select>
 
@@ -137,6 +143,12 @@
         <if test="request.isUrgent != null and request.isUrgent !=''">
             AND bo.is_urgent = #{request.isUrgent}
         </if>
+        <if test="request.ids != null">
+            and blei.id in
+            <foreach collection="request.ids" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
         ORDER BY blei.update_time DESC
     </select>
 
diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardInfoMapper.xml
index 1a5551b..2ed8d17 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardInfoMapper.xml
@@ -45,12 +45,6 @@
         FROM biz_equipment_standard_info besi
         LEFT JOIN biz_equipment_standard_technology_relation bestr ON besi.standard_no = bestr.standard_no
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
-            and besi.approval_status = #{request.approvalStatus}
-        </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
-            and besi.create_user_id = #{request.createUserId}
-        </if>
         <if test="request.standardName != null and request.standardName !=''">
             and besi.standard_name like concat('%',#{request.standardName},'%')
         </if>
diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardTechnologyRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardTechnologyRelationMapper.xml
index fc7e16c..cd03c8c 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardTechnologyRelationMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardTechnologyRelationMapper.xml
@@ -6,6 +6,7 @@
     <resultMap id="BaseResultMap" type="com.casic.missiles.model.equipment.BizEquipmentStandardTechnologyRelation">
         <id column="id" property="id" />
         <result column="technology_file_id" property="technologyFileId" />
+        <result column="technology_file_no" property="technologyFileNo" />
         <result column="technology_file_name" property="technologyFileName" />
         <result column="standard_id" property="standardId" />
         <result column="standard_no" property="standardNo" />
@@ -14,7 +15,7 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, technology_file_id, technology_file_name, standard_id, remark
+        id, technology_file_id, technology_file_no, technology_file_name, standard_id, remark
     </sql>
 
 </mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceAuthorizeOrderMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceAuthorizeOrderMapper.xml
index ac5176c..554fe65 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceAuthorizeOrderMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceAuthorizeOrderMapper.xml
@@ -32,22 +32,22 @@
         SELECT *
         FROM biz_resource_authorize_order
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.orderNo != null and request.orderNo !=''">
+        <if test="request != null and request.orderNo != null and request.orderNo !=''">
             and order_no like concat('%',#{request.orderNo},'%')
         </if>
-        <if test="request.createUserName != null and request.createUserName !=''">
+        <if test="request != null and request.createUserName != null and request.createUserName !=''">
             and create_user_name like concat('%',#{request.createUserName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerExamineFormMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerExamineFormMapper.xml
index ab242f6..af7f98f 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerExamineFormMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerExamineFormMapper.xml
@@ -41,28 +41,28 @@
         SELECT *
         FROM biz_resource_customer_examine_form
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.formNo != null and request.formNo !=''">
+        <if test="request != null and request.formNo != null and request.formNo !=''">
             and form_no like concat('%',#{request.formNo},'%')
         </if>
-        <if test="request.labCode != null and request.labCode !=''">
+        <if test="request != null and request.labCode != null and request.labCode !=''">
             and lab_code like concat('%',#{request.labCode},'%')
         </if>
-        <if test="request.groupCode != null and request.groupCode !=''">
+        <if test="request != null and request.groupCode != null and request.groupCode !=''">
             and group_code like concat('%',#{request.groupCode},'%')
         </if>
-        <if test="request.createUserName != null and request.createUserName !=''">
+        <if test="request != null and request.createUserName != null and request.createUserName !=''">
             and create_user_name like concat('%',#{request.createUserName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerInfoMapper.xml
index fa8ffbc..06a2798 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerInfoMapper.xml
@@ -33,25 +33,25 @@
         SELECT *
         FROM biz_resource_customer_info
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.customerNo != null and request.customerNo !=''">
+        <if test="request != null and request.customerNo != null and request.customerNo !=''">
             and customer_no like concat('%',#{request.customerNo},'%')
         </if>
-        <if test="request.customerName != null and request.customerName !=''">
+        <if test="request != null and request.customerName != null and request.customerName !=''">
             and customer_name like concat('%',#{request.customerName},'%')
         </if>
-        <if test="request.contacts != null and request.contacts !=''">
+        <if test="request != null and request.contacts != null and request.contacts !=''">
             and contacts like concat('%',#{request.contacts},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerSuggestFormMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerSuggestFormMapper.xml
index 28f5bb2..1806662 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerSuggestFormMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerSuggestFormMapper.xml
@@ -33,28 +33,28 @@
         SELECT *
         FROM biz_resource_customer_suggest_form
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.formNo != null and request.formNo !=''">
+        <if test="request != null and request.formNo != null and request.formNo !=''">
             and form_no like concat('%',#{request.formNo},'%')
         </if>
-        <if test="request.customerName != null and request.customerName !=''">
+        <if test="request != null and request.customerName != null and request.customerName !=''">
             and customer_name like concat('%',#{request.customerName},'%')
         </if>
-        <if test="request.customerDeptName != null and request.customerDeptName !=''">
+        <if test="request != null and request.customerDeptName != null and request.customerDeptName !=''">
             and customer_dept_name like concat('%',#{request.customerDeptName},'%')
         </if>
-        <if test="request.createUserName != null and request.createUserName !=''">
+        <if test="request != null and request.createUserName != null and request.createUserName !=''">
             and create_user_name like concat('%',#{request.createUserName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSealUseNoteMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSealUseNoteMapper.xml
index ab37bc1..b02bb33 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSealUseNoteMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSealUseNoteMapper.xml
@@ -29,32 +29,32 @@
     </sql>
 
     <select id="selectBatchForApprovalList" resultMap="BaseResultMap">
-        SELECT *
+        SELECT brsun.*, brsi.seal_name, brsi.seal_type, brsi.approver_name
         FROM biz_resource_seal_use_note brsun
         JOIN biz_resource_seal_info brsi ON brsun.seal_id = brsi.id
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and brsun.approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and brsun.create_user_id = #{request.createUserId}
         </if>
-        <if test="request.sealName != null and request.sealName !=''">
+        <if test="request != null and request.sealName != null and request.sealName !=''">
             and brsi.seal_name like concat('%',#{request.sealName},'%')
         </if>
-        <if test="request.sealType != null and request.sealType !=''">
+        <if test="request != null and request.sealType != null and request.sealType !=''">
             and brsi.seal_type = #{request.sealType}
         </if>
-        <if test="request.applyDeptName != null and request.applyDeptName !=''">
+        <if test="request != null and request.applyDeptName != null and request.applyDeptName !=''">
             and brsun.apply_dept_name like concat('%',#{request.applyDeptName},'%')
         </if>
-        <if test="request.applyUserName != null and request.applyUserName !=''">
+        <if test="request != null and request.applyUserName != null and request.applyUserName !=''">
             and brsun.apply_user_name like concat('%',#{request.applyUserName},'%')
         </if>
-        <if test="request.applyTimeStart != null and request.applyTimeStart !=''">
+        <if test="request != null and request.applyTimeStart != null and request.applyTimeStart !=''">
             and brsun.apply_time &gt;= #{request.applyTimeStart}
         </if>
-        <if test="request.applyTimeEnd != null and request.applyTimeEnd !=''">
+        <if test="request != null and request.applyTimeEnd != null and request.applyTimeEnd !=''">
             and brsun.apply_time &lt;= #{request.applyTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml
index 119bf7d..4f8392a 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml
@@ -31,6 +31,12 @@
         <if test="request.deptName != null and request.deptName !=''">
             and brsi.dept_name like concat('%',#{request.deptName},'%')
         </if>
+        <if test="request.ids != null">
+            and brsv.id in
+            <foreach collection="request.ids" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
         ORDER BY brsv.grant_date DESC
     </select>
 
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSupplierInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSupplierInfoMapper.xml
index fe8d399..e8ce7ef 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSupplierInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSupplierInfoMapper.xml
@@ -48,28 +48,28 @@
         SELECT *
         FROM biz_resource_supplier_info
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.supplierNo != null and request.supplierNo !=''">
+        <if test="request != null and request.supplierNo != null and request.supplierNo !=''">
             and supplier_no like concat('%',#{request.supplierNo},'%')
         </if>
-        <if test="request.supplierName != null and request.supplierName !=''">
+        <if test="request != null and request.supplierName != null and request.supplierName !=''">
             and supplier_name like concat('%',#{request.supplierName},'%')
         </if>
-        <if test="request.director != null and request.director !=''">
+        <if test="request != null and request.director != null and request.director !=''">
             and director like concat('%',#{request.director},'%')
         </if>
-        <if test="request.supplierType != null and request.supplierType !=''">
+        <if test="request != null and request.supplierType != null and request.supplierType !=''">
             and supplier_type = #{request.supplierType}
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/EnvLocationInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/EnvLocationInfoMapper.xml
new file mode 100644
index 0000000..68bcf10
--- /dev/null
+++ b/casic-metering-dao/src/main/resources/mapper/resource/EnvLocationInfoMapper.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.mapper.resource.EnvLocationInfoMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.resource.EnvLocationInfo">
+        <id column="id" property="id" />
+        <result column="location_no" property="locationNo" />
+        <result column="location_name" property="locationName" />
+        <result column="location_position" property="locationPosition" />
+        <result column="create_user_id" property="createUserId" />
+        <result column="create_user" property="createUser" />
+        <result column="create_time" property="createTime" />
+        <result column="update_time" property="updateTime" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, location_no, location_name, location_position, create_user_id, create_user, create_time, update_time
+    </sql>
+
+    <select id="selectLocationListPage" resultType="com.casic.missiles.dto.resource.environment.LocationListResponse">
+        SELECT *
+        FROM env_location_info
+        WHERE 1=1
+        <if test="request.locationNo != null and request.locationNo !=''">
+            AND location_no LIKE concat('%',#{request.locationNo},'%')
+        </if>
+        <if test="request.locationName != null and request.locationName !=''">
+            AND location_name LIKE concat('%',#{request.locationName},'%')
+        </if>
+        ORDER BY create_time DESC
+    </select>
+
+</mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml
index b28c18f..8854047 100644
--- a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml
@@ -11,7 +11,6 @@
         <result column="sign_desc" property="signDesc" />
         <result column="sign_director" property="signDirector" />
         <result column="sign_user_id" property="signUserId" />
-        <result column="sign_type" property="signType" />
         <result column="minio_file_name" property="minioFileName" />
         <result column="create_time" property="createTime" />
         <result column="update_time" property="updateTime" />
@@ -28,7 +27,6 @@
         <result column="sign_name" property="signName" />
         <result column="sign_desc" property="signDesc" />
         <result column="sign_director" property="signDirector" />
-        <result column="sign_type" property="signType" />
         <result column="sign_user_id" property="signUserId" />
         <result column="minio_file_name" property="minioFileName" />
         <result column="create_time" property="createTime" />
@@ -62,4 +60,58 @@
         JOIN system_sign_user_relation ssur ON ss.id = ssur.sign_id
         WHERE ssur.user_id = #{userId}
     </select>
+
+    <select id="selectSignListPage" resultMap="BaseResultMap">
+        SELECT ss.*, sd.SIMPLE_NAME AS deptName
+        FROM system_sign ss
+        LEFT JOIN sys_user su ON su.id = ss.sign_user_id
+        LEFT JOIN sys_dept sd ON sd.id = su.dept_id
+        WHERE 1=1
+        <if test="request.signNo != null and request.signNo !=''">
+            AND ss.sign_no LIKE concat('%',#{request.signNo},'%')
+        </if>
+        <if test="request.signName != null and request.signName !=''">
+            AND ss.sign_name LIKE concat('%',#{request.signName},'%')
+        </if>
+        <if test="request.signDirector != null and request.signDirector !=''">
+            AND ss.sign_director LIKE concat('%',#{request.signDirector},'%')
+        </if>
+        <if test="request.signUserId != null and request.signUserId !=''">
+            AND ss.sign_user_id = #{request.signUserId}
+        </if>
+        <if test="request.createStartTime != null and request.createStartTime !=''">
+            AND DATE_FORMAT(ss.create_time,'%Y-%m-%d') &gt;= DATE_FORMAT(#{request.createStartTime},'%Y-%m-%d')
+        </if>
+        <if test="request.createEndTime != null and request.createEndTime !=''">
+            AND DATE_FORMAT(ss.create_time,'%Y-%m-%d')  &lt;= DATE_FORMAT(#{request.createEndTime},'%Y-%m-%d')
+        </if>
+        ORDER BY ss.create_time DESC
+    </select>
+
+    <select id="selectSignList" resultMap="BaseResultMap">
+        SELECT ss.*, sd.SIMPLE_NAME AS deptName
+        FROM system_sign ss
+        LEFT JOIN sys_user su ON su.id = ss.sign_user_id
+        LEFT JOIN sys_dept sd ON sd.id = su.dept_id
+        WHERE 1=1
+        <if test="request.signNo != null and request.signNo !=''">
+            AND ss.sign_no LIKE concat('%',#{request.signNo},'%')
+        </if>
+        <if test="request.signName != null and request.signName !=''">
+            AND ss.sign_name LIKE concat('%',#{request.signName},'%')
+        </if>
+        <if test="request.signDirector != null and request.signDirector !=''">
+            AND ss.sign_director LIKE concat('%',#{request.signDirector},'%')
+        </if>
+        <if test="request.signUserId != null and request.signUserId !=''">
+            AND ss.sign_user_id = #{request.signUserId}
+        </if>
+        <if test="request.createStartTime != null and request.createStartTime !=''">
+            AND DATE_FORMAT(ss.create_time,'%Y-%m-%d') &gt;= DATE_FORMAT(#{request.createStartTime},'%Y-%m-%d')
+        </if>
+        <if test="request.createEndTime != null and request.createEndTime !=''">
+            AND DATE_FORMAT(ss.create_time,'%Y-%m-%d')  &lt;= DATE_FORMAT(#{request.createEndTime},'%Y-%m-%d')
+        </if>
+        ORDER BY ss.create_time DESC
+    </select>
 </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 515050a..60f530b 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
@@ -47,8 +47,8 @@
     String STORAGE_LOCATION = "bizStorageLocation";
     //计量专业
     String MEASURE_MAJOR = "bizMeasureMajor";
-    //管理状态
-    String MANAGER_STATE = "bizManagerState";
+    //标准装置管理状态
+    String STANDARD_MANAGER_STATE = "bizStandardManagerState";
 
     /**
      * 资源管理 字典code
@@ -95,8 +95,6 @@
     String MEASURE_STATUS = "measureStatus";
     //检定方式
     String MEASURE_TYPE = "measureType";
-    //标识打印标志类型
-    String IDENTIFY_PRINT_TYPE = "bizBusinessIdentify";
     //变更类型
     String REPORT_CHANGE_TYPE = "bizCertChangeType";
     //规模类型
@@ -111,19 +109,24 @@
     String MEASURE_CATEGORY = "measureCategory";
     //检定结果
     String MEASURE_RESULT = "measureResult";
+    //分包原因
+    String OUTSOURCE_REASON = "outsourceReason";
+
+    /**
+     * 系统管理
+     */
+    String TEMPLATE_TYPE = "templateType";
+
 
     /**
      * 标准装置 字典code
      */
     //类别
     String STANDARD_CATEGORY = "standardCategory";
-    //管理状态
-    String STANDARD_MANAGER_STATE = "standardManagerState";
     //标准等级
     String STANDARD_LEVEL = "standardLevel";
     //传递范围
     String STANDARD_TRANSMIT_RANGE = "transmitRange";
-
     //资本来源
     String CAPITAL_SOURCE = "capitalSource";
     //标准装置-申请类型
@@ -148,8 +151,6 @@
     String CERTIFICATE_CLASS = "certificationClass";
     //证书管理-检校专业
     String CALIBRATION_MAJOR = "calibrationMajor";
-    //分包原因
-    String OUTSOURCE_REASON = "outsourceReason";
 
     /**
      * 工作台
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/BaseApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/BaseApprovalListRequest.java
index 73c12c1..80d7424 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/BaseApprovalListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/BaseApprovalListRequest.java
@@ -6,6 +6,7 @@
 
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotEmpty;
+import java.util.List;
 
 /**
  * @Description:
@@ -19,14 +20,14 @@
      * 表单id
      */
     @NotBlank(message = "表单id不能为空")
-    @ApiModelProperty(value = "表单id（流程定义对应的表单id，等价于业务id）", dataType = "String")
+    @ApiModelProperty(value = "表单id（流程定义对应的表单id，等价于业务id），导出接口不用传", dataType = "String")
     private String formId;
 
     /**
      * 审批状态类型，对应ApprovalStatusEnum
      */
     @NotEmpty(message = "审批状态类型不能为空")
-    @ApiModelProperty(value = "审批状态类型code", dataType = "String")
+    @ApiModelProperty(value = "审批状态类型code，导出接口不用传", dataType = "String")
     private String approvalStatus;
 
     @ApiModelProperty(hidden = true)
@@ -34,4 +35,7 @@
 
     @ApiModelProperty(hidden = true)
     private Long createUserId;
+
+    @ApiModelProperty(value = "导出ids", dataType = "List")
+    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificatePrintApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificatePrintApprovalListRequest.java
index b93d1c9..3cc2f4e 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificatePrintApprovalListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificatePrintApprovalListRequest.java
@@ -5,8 +5,6 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import java.util.List;
-
 /**
  * @Description:
  * @Author: wangpeng
@@ -38,7 +36,4 @@
 
     @ApiModelProperty(value = "创建结束时间", dataType = "String")
     private String createTimeEnd;
-
-    @ApiModelProperty(value = "导出ids", dataType = "List")
-    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportApprovalListRequest.java
index 4f7a038..c115847 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportApprovalListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportApprovalListRequest.java
@@ -5,8 +5,6 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import java.util.List;
-
 /**
  * @Description:
  * @Author: wangpeng
@@ -15,6 +13,8 @@
 @ApiModel
 @Data
 public class CertificateReportApprovalListRequest extends BaseApprovalListRequest {
+    @ApiModelProperty(value = "委托方id", dataType = "String")
+    private Long customerId;
 
     @ApiModelProperty(value = "证书报告编号", dataType = "String")
     private String certificateReportNo;
@@ -37,6 +37,4 @@
     @ApiModelProperty(value = "检校结束时间", dataType = "String")
     private String calibrationTimeEnd;
 
-    @ApiModelProperty(value = "导出ids", dataType = "List")
-    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/identify/IdentifyListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/identify/IdentifyListRequest.java
index 1b87ae6..f019203 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/identify/IdentifyListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/identify/IdentifyListRequest.java
@@ -4,6 +4,8 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * @Description:
  * @Author: wangpeng
@@ -26,4 +28,7 @@
 
     @ApiModelProperty(value = "打印结束时间", dataType = "String")
     private String createTimeEnd;
+
+    @ApiModelProperty(value = "导出ids", dataType = "List")
+    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListRequest.java
index 1264883..62415fb 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListRequest.java
@@ -7,6 +7,7 @@
 import lombok.Data;
 
 import javax.validation.constraints.NotBlank;
+import java.util.List;
 
 @Data
 @ApiModel
@@ -37,4 +38,6 @@
     @ApiModelProperty(value = "是否加急（1是0否null全部）", dataType = "Integer")
     private String isUrgent;
 
+    @ApiModelProperty(value = "导出ids", dataType = "List")
+    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListRequest.java
index 5201d7b..499760a 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListRequest.java
@@ -17,6 +17,9 @@
     @ApiModelProperty(value = "任务单编号", dataType = "String")
     private String orderNo;
 
+    @ApiModelProperty(value = "委托方id", dataType = "Long")
+    private Long customerId;
+
     @ApiModelProperty(value = "委托方名称", dataType = "String")
     private String customerName;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OrderSampleDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OrderSampleDTO.java
new file mode 100644
index 0000000..796edc0
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OrderSampleDTO.java
@@ -0,0 +1,19 @@
+package com.casic.missiles.dto.business.outsource;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/8/24 11:38
+ */
+@ApiModel
+@Data
+public class OrderSampleDTO {
+    @ApiModelProperty(value = "任务单id", dataType = "Long")
+    private Long orderId;
+    @ApiModelProperty(value = "受检设备id", dataType = "Long")
+    private Long sampleId;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceAssessApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceAssessApprovalListRequest.java
new file mode 100644
index 0000000..9a930c3
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceAssessApprovalListRequest.java
@@ -0,0 +1,30 @@
+package com.casic.missiles.dto.business.outsource;
+
+import com.casic.missiles.dto.BaseApprovalListRequest;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/8/24 11:01
+ */
+@ApiModel
+@Data
+public class OutsourceAssessApprovalListRequest extends BaseApprovalListRequest {
+    @ApiModelProperty(value = "评审表编号", dataType = "String")
+    private String projectNo;
+
+    @ApiModelProperty(value = "分包机构名称", dataType = "String")
+    private String outsourcerName;
+
+    @ApiModelProperty(value = "申请人", dataType = "String")
+    private String applicantName;
+
+    @ApiModelProperty(value = "申请时间开始", dataType = "String")
+    private String applicantTimeStart;
+
+    @ApiModelProperty(value = "申请时间结束", dataType = "String")
+    private String applicantTimeEnd;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceAssessSaveResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceAssessSaveResponse.java
new file mode 100644
index 0000000..8bf9aad
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceAssessSaveResponse.java
@@ -0,0 +1,20 @@
+package com.casic.missiles.dto.business.outsource;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/8/14 16:17
+ */
+@ApiModel
+@Data
+public class OutsourceAssessSaveResponse {
+    @ApiModelProperty(value = "主键id", dataType = "Long")
+    private Long id;
+
+    @ApiModelProperty(value = "编号", dataType = "String")
+    private String projectNo;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProtocolApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProtocolApprovalListRequest.java
new file mode 100644
index 0000000..0f32331
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProtocolApprovalListRequest.java
@@ -0,0 +1,30 @@
+package com.casic.missiles.dto.business.outsource;
+
+import com.casic.missiles.dto.BaseApprovalListRequest;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/8/24 15:01
+ */
+@ApiModel
+@Data
+public class OutsourceProtocolApprovalListRequest extends BaseApprovalListRequest {
+    @ApiModelProperty(value = "协议书编号", dataType = "String")
+    private String protocolNo;
+
+    @ApiModelProperty(value = "分包方名称", dataType = "String")
+    private String outsourcerName;
+
+    @ApiModelProperty(value = "申请人", dataType = "String")
+    private String applicantName;
+
+    @ApiModelProperty(value = "申请时间开始", dataType = "String")
+    private String applicantTimeStart;
+
+    @ApiModelProperty(value = "申请时间结束", dataType = "String")
+    private String applicantTimeEnd;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProtocolSaveResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProtocolSaveResponse.java
new file mode 100644
index 0000000..e324967
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProtocolSaveResponse.java
@@ -0,0 +1,20 @@
+package com.casic.missiles.dto.business.outsource;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/8/14 16:17
+ */
+@ApiModel
+@Data
+public class OutsourceProtocolSaveResponse {
+    @ApiModelProperty(value = "主键id", dataType = "Long")
+    private Long id;
+
+    @ApiModelProperty(value = "编号", dataType = "String")
+    private String protocolNo;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveApprovalListRequest.java
index f29f4e4..7047c28 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveApprovalListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveApprovalListRequest.java
@@ -5,8 +5,6 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import java.util.List;
-
 /**
  * @Description: 现场检测审批列表请求实体
  * @Author: wangpeng
@@ -30,7 +28,4 @@
     @ApiModelProperty(value = "申请时间结束", dataType = "String")
     private String applyTimeEnd;
 
-    @ApiModelProperty(value = "导出ids", dataType = "List")
-    private List<Long> ids;
-
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveDetailResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveDetailResponse.java
index 1f28752..394c934 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveDetailResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveDetailResponse.java
@@ -12,6 +12,18 @@
     @ApiModelProperty(value = "id，更新/删除使用参数", dataType = "Long")
     private Long id;
 
+    @ApiModelProperty(value = "实验室代码(字典code)", dataType = "String")
+    private String labCode;
+
+    @ApiModelProperty(value = "实验室代码(字典value)", dataType = "String")
+    private String labCodeName;
+
+    @ApiModelProperty(value = "组别代码(字典code)", dataType = "String")
+    private String groupCode;
+
+    @ApiModelProperty(value = "组别代码(字典value)", dataType = "String")
+    private String groupCodeName;
+
     @ApiModelProperty(value = "审批编号", dataType = "String")
     private String siteExecutiveNo;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/environment/LocationListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/environment/LocationListRequest.java
new file mode 100644
index 0000000..13d03c3
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/environment/LocationListRequest.java
@@ -0,0 +1,20 @@
+package com.casic.missiles.dto.resource.environment;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/6/8 13:56
+ */
+@ApiModel
+@Data
+public class LocationListRequest {
+    @ApiModelProperty(value = "地点编号", dataType = "String")
+    private String locationNo;
+
+    @ApiModelProperty(value = "地点名称", dataType = "String")
+    private String locationName;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/environment/LocationListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/environment/LocationListResponse.java
new file mode 100644
index 0000000..4c531af
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/environment/LocationListResponse.java
@@ -0,0 +1,78 @@
+package com.casic.missiles.dto.resource.environment;
+
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
+import com.baomidou.mybatisplus.annotation.TableField;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description: 地点列表响应实体
+ * @Author: wangpeng
+ * @Date: 2023/6/8 13:53
+ */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
+@ApiModel
+@Data
+public class LocationListResponse {
+    @ApiModelProperty(value = "主键id", dataType = "Long")
+    private Long id;
+
+    /**
+     * 地点编号
+     */
+    @ExcelProperty("地点编号")
+    @ApiModelProperty(value = "地点编号", dataType = "String")
+    private String locationNo;
+
+    /**
+     * 地点名称
+     */
+    @ExcelProperty("地点名称")
+    @ApiModelProperty(value = "地点名称", dataType = "String")
+    private String locationName;
+
+    /**
+     * 地点位置
+     */
+    @ExcelProperty("地点位置")
+    @ApiModelProperty(value = "地点位置", dataType = "String")
+    private String locationPosition;
+
+    /**
+     * 创建人id
+     */
+    @ApiModelProperty(value = "创建人id", dataType = "Long")
+    private Long createUserId;
+
+    /**
+     * 创建人
+     */
+    @ExcelProperty("创建人")
+    @ApiModelProperty(value = "创建人", dataType = "String")
+    @TableField("create_user")
+    private String createUser;
+
+    /**
+     * 创建时间
+     */
+    @ExcelProperty("创建时间")
+    @ApiModelProperty(value = "创建时间", dataType = "String")
+    private String createTime;
+
+    /**
+     * 更新时间
+     */
+    @ApiModelProperty(value = "更新时间", dataType = "String")
+    private String updateTime;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertRequest.java
index 9a7f6c6..c827915 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertRequest.java
@@ -4,6 +4,8 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * @Description:
  * @Author: wangpeng
@@ -16,4 +18,7 @@
     private String name;
     @ApiModelProperty(value = "部门名", dataType = "String")
     private String deptName;
+
+    @ApiModelProperty(value = "导出ids", dataType = "List")
+    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertResponse.java
index f78b159..8f2f79e 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertResponse.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.dto.resource.staff;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.casic.missiles.annotation.DictCodeField;
 import com.casic.missiles.constants.MeterDictCode;
 import io.swagger.annotations.ApiModel;
@@ -13,12 +20,18 @@
  * @Author: wangpeng
  * @Date: 2023/7/27 15:13
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @ApiModel
 @Data
 public class StaffCertResponse {
     /**
      * 人员编号
      */
+    @ExcelProperty(value = "人员编号",order = 0)
     @NotEmpty(message = "人员编号不能为空")
     @ApiModelProperty(value = "人员编号", dataType = "String")
     private String staffNo;
@@ -26,6 +39,7 @@
     /**
      * 姓名
      */
+    @ExcelProperty(value = "姓名",order = 1)
     @ApiModelProperty(value = "姓名", dataType = "String")
     private String staffName;
 
@@ -54,6 +68,7 @@
     /**
      * 部门名字
      */
+    @ExcelProperty(value = "工作部门",order = 2)
     @ApiModelProperty(value = "部门名字", dataType = "String")
     private String deptName;
 
@@ -66,6 +81,7 @@
     /**
      * 计量专业
      */
+    @ExcelProperty(value = "计量专业",order = 3)
     @ApiModelProperty(value = "计量专业", dataType = "String")
     private String major;
 
@@ -110,6 +126,7 @@
     /**
      * 证书号
      */
+    @ExcelProperty(value = "证号",order = 4)
     @ApiModelProperty(value = "证书号", dataType = "String")
     private String certNo;
 
@@ -122,12 +139,14 @@
     /**
      * 有效日期
      */
+    @ExcelProperty(value = "证书有效期",order = 6)
     @ApiModelProperty(value = "有效日期", dataType = "String")
     private String effectiveDate;
 
     /**
      * 发放日期
      */
+    @ExcelProperty(value = "发证日期",order = 5)
     @ApiModelProperty(value = "发放日期", dataType = "String")
     private String grantDate;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffListRequest.java
index 7c4afb3..0a1194a 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffListRequest.java
@@ -4,6 +4,8 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * @Description:
  * @Author: wangpeng
@@ -18,4 +20,7 @@
     private String deptName;
     @ApiModelProperty(value = "部门id", dataType = "Long")
     private Long deptId;
+
+    @ApiModelProperty(value = "导出ids", dataType = "List")
+    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/TrainListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/TrainListRequest.java
index f68597b..6321f8b 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/TrainListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/TrainListRequest.java
@@ -14,6 +14,8 @@
 public class TrainListRequest {
     @ApiModelProperty(value = "训练登记表编号", dataType = "String")
     private String trainNo;
+    @ApiModelProperty(value = "值班领导", dataType = "String")
+    private String dutyLeader;
     @ApiModelProperty(value = "创建开始时间", dataType = "String")
     private String createTimeStart;
     @ApiModelProperty(value = "创建结束时间", dataType = "String")
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/SignAddRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/SignAddRequest.java
index 117be34..d71055c 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/SignAddRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/SignAddRequest.java
@@ -43,13 +43,6 @@
     private Long signUserId;
 
     /**
-     * 签章或签名-字典code
-     */
-    @NotBlank(message = "类型不能为空")
-    @ApiModelProperty(value = "签名/签章-字典code", dataType = "String", required = true)
-    private String signType;
-
-    /**
      * minio存储文件名
      */
     @ApiModelProperty(value = "上传文件返回名称", dataType = "String")
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateAddRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateAddRequest.java
index aff1265..6316648 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateAddRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateAddRequest.java
@@ -17,30 +17,28 @@
 @Data
 public class TemplateAddRequest extends BaseSystemRequest {
     /**
-     * 原始记录模板/证书报告模板名称
+     * 模板名称
      */
     @ApiModelProperty(value = "名称", dataType = "String", required = true)
     @NotBlank(message = "名称不能为空")
     private String templateName;
 
     /**
-     * 原始记录模板/证书报告模板描述
+     * 模板描述
      */
     @ApiModelProperty(value = "描述", dataType = "String")
     private String templateDesc;
 
     /**
-     * 原始记录模板/证书报告模板创建人
+     * 创建人
      */
     @ApiModelProperty(value = "创建人", dataType = "String", required = true)
     @NotBlank(message = "创建人不能为空")
     private String templateCreator;
 
-    /**
-     * 原始记录模板/证书报告模板-字典code
-     */
-    @NotBlank(message = "类型不能为空")
-    @ApiModelProperty(value = "原始记录模板/证书报告模板-字典code", dataType = "String", required = true)
+
+    @NotBlank(message = "模板类型不能为空")
+    @ApiModelProperty(value = "模板类型(字典code)", dataType = "String", required = true)
     private String templateType;
 
     /**
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateListRequest.java
index eec5a1e..6d17bbe 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateListRequest.java
@@ -1,11 +1,12 @@
 package com.casic.missiles.dto.system;
 
+import com.casic.missiles.annotation.DictCodeField;
+import com.casic.missiles.constants.MeterDictCode;
 import com.casic.missiles.dto.BaseSystemRequest;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import javax.validation.constraints.NotBlank;
 import java.util.List;
 
 /**
@@ -19,8 +20,8 @@
     /**
      * 类型
      */
-//    @ApiModelProperty(value = "类型-字典code", dataType = "String", required = true)
-    @NotBlank(message = "类型不能为空")
+    @DictCodeField(message = "模板类型不合法", cacheName = MeterDictCode.TEMPLATE_TYPE)
+    @ApiModelProperty(value = "模板类型(字典code)", dataType = "String")
     private String templateType;
 
     /**
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificateChangeApply.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificateChangeApply.java
index 9216308..36923fd 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificateChangeApply.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificateChangeApply.java
@@ -1,11 +1,19 @@
 package com.casic.missiles.model.business;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 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 com.casic.missiles.dto.BaseRequest;
+import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -20,6 +28,12 @@
  * @author wangpeng
  * @since 2023-08-15
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
+@ApiModel
 @Data
 @TableName("biz_business_certificate_change_apply")
 public class BizBusinessCertificateChangeApply extends BaseRequest implements Serializable {
@@ -33,6 +47,7 @@
     /**
      * 申请单编号
      */
+    @ExcelProperty(value = "申请单编号", order = 1)
     @ApiModelProperty(value = "申请单编号", dataType = "String")
     @TableField("change_apply_no")
     private String changeApplyNo;
@@ -40,6 +55,7 @@
     /**
      * 申请单名字
      */
+    @ExcelProperty(value = "申请单名称", order = 2)
     @ApiModelProperty(value = "申请单名字", dataType = "String")
     @TableField("change_apply_name")
     private String changeApplyName;
@@ -54,6 +70,7 @@
     /**
      * 更换证书编号
      */
+    @ExcelProperty(value = "更换证书编号", order = 3)
     @ApiModelProperty(value = "更换证书编号", dataType = "String")
     @TableField("change_report_no")
     private String changeReportNo;
@@ -61,7 +78,8 @@
     /**
      * 更换证书名字
      */
-    @ApiModelProperty(value = "更换证书名字", dataType = "String")
+    @ExcelProperty(value = "更换证书/报告名称", order = 4)
+    @ApiModelProperty(value = "更换证书/报告名称", dataType = "String")
     @TableField("change_report_name")
     private String changeReportName;
 
@@ -73,6 +91,7 @@
     @TableField("change_type")
     private String changeType;
 
+    @ExcelProperty(value = "变更类型", order = 5)
     @ApiModelProperty(value = "变更类型(字典value)", dataType = "String")
     @TableField(exist = false)
     private String changeTypeName;
@@ -142,13 +161,15 @@
     /**
      * 创建用户名字
      */
-    @ApiModelProperty(value = "创建用户名字", dataType = "String")
+    @ExcelProperty(value = "创建人", order = 6)
+    @ApiModelProperty(value = "创建人名字", dataType = "String")
     @TableField("create_user_name")
     private String createUserName;
 
     /**
      * 创建时间
      */
+    @ExcelProperty(value = "创建时间", order = 7)
     @ApiModelProperty(value = "创建时间", dataType = "String")
     @TableField("create_time")
     private String createTime;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificateReport.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificateReport.java
index f01db9e..db06018 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificateReport.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificateReport.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.model.business;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -22,6 +29,11 @@
  * @author wangpeng
  * @since 2023-08-14
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @ApiModel
 @Data
 @TableName("biz_business_certificate_report")
@@ -36,6 +48,7 @@
     /**
      * 证书报告编号
      */
+    @ExcelProperty(value = "证书报告编号", order = 1)
     @ApiModelProperty(value = "证书报告编号", dataType = "String")
     @TableField("certificate_report_no")
     private String certificateReportNo;
@@ -43,6 +56,7 @@
     /**
      * 证书报告名称
      */
+    @ExcelProperty(value = "证书报告名称", order = 2)
     @ApiModelProperty(value = "证书报告名称", dataType = "String")
     @TableField("certificate_report_name")
     private String certificateReportName;
@@ -62,6 +76,7 @@
     @TableField("measure_category")
     private String measureCategory;
 
+    @ExcelProperty(value = "检校类别", order = 6)
     @ApiModelProperty(value = "检校类别(字典value)", dataType = "String")
     @TableField(exist = false)
     private String measureCategoryName;
@@ -69,6 +84,7 @@
     /**
      * 检校时间
      */
+    @ExcelProperty(value = "检校时间", order = 8)
     @ApiModelProperty(value = "检校时间", dataType = "String")
     @TableField("calibration_time")
     private String calibrationTime;
@@ -267,18 +283,22 @@
     @TableField(exist = false)
     private Integer decisionItem;
 
-    @ApiModelProperty(value = "设备样品编号（列表返回参数）", dataType = "String")
+    @ExcelProperty(value = "被检设备统一编号", order = 3)
+    @ApiModelProperty(value = "被检设备统一编号（列表返回参数）", dataType = "String")
     @TableField(exist = false)
     private String sampleNo;
 
-    @ApiModelProperty(value = "设备样品名称（列表返回参数）", dataType = "String")
+    @ExcelProperty(value = "被检设备名称", order = 4)
+    @ApiModelProperty(value = "被检设备名称（列表返回参数）", dataType = "String")
     @TableField(exist = false)
     private String sampleName;
 
-    @ApiModelProperty(value = "设备样品规格型号（列表返回参数）", dataType = "String")
+    @ExcelProperty(value = "规格型号", order = 5)
+    @ApiModelProperty(value = "规格型号（列表返回参数）", dataType = "String")
     @TableField(exist = false)
     private String sampleModel;
 
+    @ExcelProperty(value = "检定员", order = 7)
     @ApiModelProperty(value = "检定员名字（列表返回参数）", dataType = "String")
     @TableField(exist = false)
     private String staffName;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessIdentifyInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessIdentifyInfo.java
index 46bfba5..f1a9bec 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessIdentifyInfo.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessIdentifyInfo.java
@@ -1,10 +1,15 @@
 package com.casic.missiles.model.business;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 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;
 
@@ -20,6 +25,11 @@
  * @author wangpeng
  * @since 2023-08-15
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @Data
 @TableName("biz_business_identify_info")
 public class BizBusinessIdentifyInfo implements Serializable {
@@ -33,6 +43,7 @@
     /**
      * 记录编号
      */
+    @ExcelProperty(value = "记录编号", order = 1)
     @ApiModelProperty(value = "记录编号", dataType = "String")
     @TableField("record_no")
     private String recordNo;
@@ -41,20 +52,15 @@
      * 标志类型(字典code)
      */
     @NotEmpty(message = "标志类型不能为空")
-    @ApiModelProperty(value = "标志类型(字典code)", dataType = "String")
-    @DictCodeField(message = "标志类型不合法", cacheName = MeterDictCode.IDENTIFY_PRINT_TYPE)
+    @ApiModelProperty(value = "标志类型(直接存计量标识/使用状态/校准状态的字典value)", dataType = "String")
     @TableField("identify_type")
     private String identifyType;
 
-    @ApiModelProperty(value = "标志类型(字典value)", dataType = "String")
-    @TableField(exist = false)
-    private String identifyTypeName;
-
     /**
      * 设备id(可以是受检设备/设备台账)
      */
     @NotNull(message = "设备id不能为空")
-    @ApiModelProperty(value = "设备id(可以是受检设备/设备台账)", dataType = "String")
+    @ApiModelProperty(value = "设备id(可以是受检设备/设备台账)", dataType = "Long")
     @TableField("device_id")
     private Long deviceId;
 
@@ -66,29 +72,32 @@
     @TableField("device_type")
     private String deviceType;
 
+    @ExcelProperty(value = "统一编号", order = 3)
     @NotEmpty(message = "设备编号不能为空")
-    @ApiModelProperty(value = "设备编号", dataType = "String")
+    @ApiModelProperty(value = "统一编号", dataType = "String")
     @TableField("device_no")
     private String deviceNo;
 
     /**
      * 设备名字
      */
-    @NotEmpty(message = "设备名字不能为空")
-    @ApiModelProperty(value = "设备名字", dataType = "String")
+    @ExcelProperty(value = "设备名称", order = 4)
+    @NotEmpty(message = "设备名称不能为空")
+    @ApiModelProperty(value = "设备名称", dataType = "String")
     @TableField("device_name")
     private String deviceName;
 
     /**
      * 检定员id
      */
-    @ApiModelProperty(value = "检定员id", dataType = "String")
+    @ApiModelProperty(value = "检定员id", dataType = "Long")
     @TableField("measure_person_id")
     private Long measurePersonId;
 
     /**
      * 检定员名字
      */
+    @ExcelProperty(value = "检定员", order = 5)
     @ApiModelProperty(value = "检定员名字", dataType = "String")
     @TableField("measure_person")
     private String measurePerson;
@@ -103,7 +112,8 @@
     /**
      * 更新时间
      */
-    @ApiModelProperty(value = "更新时间", dataType = "String")
+    @ExcelProperty(value = "打印时间", order = 6)
+    @ApiModelProperty(value = "打印时间", dataType = "String")
     @TableField("update_time")
     private String updateTime;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceAssess.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceAssess.java
index 659d9ca..6720b90 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceAssess.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceAssess.java
@@ -1,11 +1,26 @@
 package com.casic.missiles.model.business;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 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 com.casic.missiles.dto.BaseRequest;
+import com.casic.missiles.dto.business.outsource.OrderSampleDTO;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import javax.validation.constraints.NotEmpty;
 import java.io.Serializable;
+import java.util.List;
 
 /**
  * <p>
@@ -15,146 +30,231 @@
  * @author wangpeng
  * @since 2023-08-16
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
+@ApiModel
 @Data
 @TableName("biz_business_outsource_assess")
-public class BizBusinessOutsourceAssess implements Serializable {
+public class BizBusinessOutsourceAssess extends BaseRequest implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
+    @ApiModelProperty(value = "id，更新/删除使用参数", dataType = "Long")
     @TableId("id")
     private Long id;
 
     /**
      * 评审表编号
      */
+    @ExcelProperty(value = "评审表编号", order = 1)
+    @ApiModelProperty(value = "评审表编号(后台生成)", dataType = "String")
     @TableField("project_no")
     private String projectNo;
 
     /**
      * 评审表名称
      */
+    @ExcelProperty(value = "评审表名称", order = 2)
+    @ApiModelProperty(value = "评审表名称", dataType = "String")
     @TableField("project_name")
     private String projectName;
 
+    @NotEmpty(message = "实验室代码不能为空")
+    @DictCodeField(message = "实验室代码描述不合法", cacheName = MeterDictCode.LAB_CODE)
+    @ApiModelProperty(value = "实验室代码(字典code)", dataType = "String")
+    @TableField("lab_code")
+    private String labCode;
+
+    @ApiModelProperty(value = "实验室代码(字典value)", dataType = "String")
+    @TableField(exist = false)
+    private String labCodeName;
+
+    /**
+     * 组别代码
+     */
+    @NotEmpty(message = "组别代码不能为空")
+    @DictCodeField(message = "组别代码描述不合法", cacheName = MeterDictCode.GROUP_CODE)
+    @ApiModelProperty(value = "组别代码(字典code)", dataType = "String")
+    @TableField("group_code")
+    private String groupCode;
+
+    @ApiModelProperty(value = "组别代码(字典value)", dataType = "String")
+    @TableField(exist = false)
+    private String groupCodeName;
+
     /**
      * 申请人id
      */
+    @ApiModelProperty(value = "申请人id", dataType = "String")
     @TableField("applicant_id")
     private Long applicantId;
 
     /**
      * 申请人名字
      */
+    @ExcelProperty(value = "申请人", order = 5)
+    @ApiModelProperty(value = "申请人", dataType = "String")
     @TableField("applicant_name")
     private String applicantName;
 
     /**
      * 申请时间
      */
+    @ExcelProperty(value = "申请时间", order = 6)
+    @ApiModelProperty(value = "申请时间", dataType = "String")
     @TableField("applicant_time")
     private String applicantTime;
 
     /**
      * 附件(minio存储文件名)
      */
+    @ApiModelProperty(value = "附件(minio存储文件名)", dataType = "String")
     @TableField("minio_file_name")
     private String minioFileName;
 
     /**
      * 备注
      */
+    @ApiModelProperty(value = "备注", dataType = "String")
     @TableField("remark")
     private String remark;
 
     /**
      * 创建人id
      */
+    @ApiModelProperty(value = "创建人id", dataType = "String")
     @TableField("create_user_id")
     private Long createUserId;
 
     /**
      * 创建人名字
      */
+    @ApiModelProperty(value = "创建人名字", dataType = "String")
     @TableField("create_user_name")
     private String createUserName;
 
     /**
      * 分包方id
      */
+    @ApiModelProperty(value = "评审表编号", dataType = "String")
     @TableField("outsourcer_id")
     private Long outsourcerId;
 
     /**
      * 预计开始时间
      */
+    @ApiModelProperty(value = "预计开始时间", dataType = "String")
     @TableField("pre_start_time")
     private String preStartTime;
 
     /**
      * 预计结束时间
      */
+    @ApiModelProperty(value = "预计结束时间", dataType = "String")
     @TableField("pre_end_time")
     private String preEndTime;
 
     /**
      * 分包原因-字典
      */
+    @ApiModelProperty(value = "分包原因(字典code)", dataType = "String")
+    @DictCodeField(message = "分包原因描述不合法", cacheName = MeterDictCode.OUTSOURCE_REASON)
     @TableField("outsource_reason")
     private String outsourceReason;
 
+    @ApiModelProperty(value = "分包原因(字典value)", dataType = "String")
+    @TableField(exist = false)
+    private String outsourceReasonName;
+
     /**
      * 预计费用
      */
+    @ApiModelProperty(value = "预计费用", dataType = "String")
     @TableField("pre_cost")
     private String preCost;
 
     /**
      * 审批状态
      */
+    @ApiModelProperty(value = "审批状态", dataType = "String")
+    @DictCodeField(message = "审批状态描述不合法", cacheName = MeterDictCode.APPROVAL_STATUS)
     @TableField("approval_status")
     private String approvalStatus;
 
     /**
      * 流程实例id
      */
+    @ApiModelProperty(value = "流程实例id", dataType = "String")
     @TableField("process_id")
     private String processId;
 
     /**
      * 实验室认可情况
      */
+    @ApiModelProperty(value = "实验室认可情况", dataType = "String")
     @TableField("approve_situation")
     private String approveSituation;
 
     /**
      * 溯源性
      */
+    @ApiModelProperty(value = "溯源性", dataType = "String")
     @TableField("traceability")
     private String traceability;
 
     /**
      * 测试方法
      */
+    @ApiModelProperty(value = "测试方法", dataType = "String")
     @TableField("test_method")
     private String testMethod;
 
     /**
      * 技术能力
      */
+    @ApiModelProperty(value = "技术能力", dataType = "String")
     @TableField("technique_ability")
     private String techniqueAbility;
 
     /**
      * 创建时间
      */
+    @ApiModelProperty(hidden = true)
     @TableField("create_time")
     private String createTime;
 
     /**
      * 更新时间
      */
+    @ApiModelProperty(hidden = true)
     @TableField("update_time")
     private String updateTime;
 
+    @ApiModelProperty(value = "审批状态类型-字典value", dataType = "String")
+    @TableField(exist = false)
+    private String approvalStatusName;
 
+    @ApiModelProperty(value = "任务id（同意、驳回等操作使用）", dataType = "String")
+    @TableField(exist = false)
+    private String taskId;
+
+    @ApiModelProperty(value = "可选决策项（1同意驳回拒绝 2同意驳回 3同意拒绝，用于待审批列表同意/驳回/拒绝按钮展示）", dataType = "Integer")
+    @TableField(exist = false)
+    private Integer decisionItem;
+
+    @NotEmpty(message = "受检设备信息不能为空")
+    @ApiModelProperty(value = "受检设备id列表（新建使用参数）", dataType = "List")
+    @TableField(exist = false)
+    private List<OrderSampleDTO> orderSampleList;
+
+    @ExcelProperty(value = "分包机构名称", order = 3)
+    @ApiModelProperty(value = "分包机构名称（列表返回参数）", dataType = "String")
+    private String outsourcerName;
+
+    @ExcelProperty(value = "机构负责人", order = 4)
+    @ApiModelProperty(value = "机构负责人（列表返回参数）", dataType = "String")
+    private String director;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceProtocol.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceProtocol.java
new file mode 100644
index 0000000..38df697
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceProtocol.java
@@ -0,0 +1,225 @@
+package com.casic.missiles.model.business;
+
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
+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 com.casic.missiles.dto.BaseRequest;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotEmpty;
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 计量检定业务-分包管理-测试、校准或检定工作分包协议书
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-08-24
+ */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
+@Data
+@TableName("biz_business_outsource_protocol")
+public class BizBusinessOutsourceProtocol extends BaseRequest implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "id，更新/删除使用参数", dataType = "Long")
+    @TableId("id")
+    private Long id;
+
+    /**
+     * 协议书编号
+     */
+    @ExcelProperty(value = "协议书编号", order = 1)
+    @ApiModelProperty(value = "协议书编号(后台生成)", dataType = "String")
+    @TableField("protocol_no")
+    private String protocolNo;
+
+    /**
+     * 协议书名称
+     */
+    @ExcelProperty(value = "协议书名称", order = 2)
+    @ApiModelProperty(value = "协议书名称", dataType = "String")
+    @TableField("project_name")
+    private String projectName;
+
+    @NotEmpty(message = "实验室代码不能为空")
+    @DictCodeField(message = "实验室代码描述不合法", cacheName = MeterDictCode.LAB_CODE)
+    @ApiModelProperty(value = "实验室代码(字典code)", dataType = "String")
+    @TableField("lab_code")
+    private String labCode;
+
+    @ApiModelProperty(value = "实验室代码(字典value)", dataType = "String")
+    @TableField(exist = false)
+    private String labCodeName;
+
+    @NotEmpty(message = "组别代码不能为空")
+    @DictCodeField(message = "组别代码描述不合法", cacheName = MeterDictCode.GROUP_CODE)
+    @ApiModelProperty(value = "组别代码(字典code)", dataType = "String")
+    @TableField("group_code")
+    private String groupCode;
+
+    @ApiModelProperty(value = "组别代码(字典value)", dataType = "String")
+    @TableField(exist = false)
+    private String groupCodeName;
+
+    /**
+     * 分包方id
+     */
+    @ApiModelProperty(value = "分包方id", dataType = "Long")
+    @TableField("outsourcer_id")
+    private Long outsourcerId;
+
+    /**
+     * 其他
+     */
+    @ApiModelProperty(value = "其他", dataType = "String")
+    @TableField("remark")
+    private String remark;
+
+    /**
+     * 分包方编号
+     */
+    @ApiModelProperty(value = "分包方编号(新建不用传)", dataType = "String")
+    @TableField("outsource_no")
+    private String outsourceNo;
+
+    /**
+     * 分包方名称
+     */
+    @ExcelProperty(value = "分包方名称", order = 3)
+    @ApiModelProperty(value = "分包方名称(新建不用传)", dataType = "String")
+    @TableField("outsource_name")
+    private String outsourceName;
+
+    /**
+     * 联系人
+     */
+    @ExcelProperty(value = "联系人", order = 4)
+    @ApiModelProperty(value = "联系人", dataType = "String")
+    @TableField("contacts")
+    private String contacts;
+
+    /**
+     * 电话
+     */
+    @ApiModelProperty(value = "电话", dataType = "String")
+    @TableField("mobile")
+    private String mobile;
+
+    /**
+     * 地址
+     */
+    @ApiModelProperty(value = "地址", dataType = "String")
+    @TableField("address")
+    private String address;
+
+    /**
+     * 要求完成日期
+     */
+    @ApiModelProperty(value = "要求完成日期", dataType = "String")
+    @TableField("require_date")
+    private String requireDate;
+
+    /**
+     * 分包费用(元)
+     */
+    @ApiModelProperty(value = "分包费用(元)", dataType = "String")
+    @TableField("outsource_cost")
+    private Double outsourceCost;
+
+    /**
+     * 分包方负责人
+     */
+    @ApiModelProperty(value = "分包方负责人", dataType = "String")
+    @TableField("director")
+    private String director;
+
+    /**
+     * 分包项目
+     */
+    @ApiModelProperty(value = "分包项目", dataType = "String")
+    @TableField("item")
+    private String item;
+
+    /**
+     * 分包要求
+     */
+    @ApiModelProperty(value = "分包要求", dataType = "String")
+    @TableField("requires")
+    private String requires;
+
+    /**
+     * 创建人id
+     */
+    @ApiModelProperty(hidden = true)
+    @TableField("create_user_id")
+    private Long createUserId;
+
+    /**
+     * 创建人名字
+     */
+    @ExcelProperty(value = "申请人", order = 5)
+    @ApiModelProperty(value = "申请人", dataType = "String")
+    @TableField("create_user_name")
+    private String createUserName;
+
+    /**
+     * 审批状态
+     */
+    @ApiModelProperty(value = "审批状态", dataType = "String")
+    @DictCodeField(message = "审批状态描述不合法", cacheName = MeterDictCode.APPROVAL_STATUS)
+    @TableField("approval_status")
+    private String approvalStatus;
+
+    /**
+     * 流程实例id
+     */
+    @ApiModelProperty(value = "流程实例id", dataType = "String")
+    @TableField("process_id")
+    private String processId;
+
+    /**
+     * 创建时间
+     */
+    @ExcelProperty(value = "申请时间", order = 6)
+    @ApiModelProperty(value = "申请时间", dataType = "String")
+    @TableField("create_time")
+    private String createTime;
+
+    /**
+     * 更新时间
+     */
+    @ApiModelProperty(hidden = true)
+    @TableField("update_time")
+    private String updateTime;
+
+    @ApiModelProperty(value = "审批状态类型-字典value", dataType = "String")
+    @TableField(exist = false)
+    private String approvalStatusName;
+
+    @ApiModelProperty(value = "任务id（同意、驳回等操作使用）", dataType = "String")
+    @TableField(exist = false)
+    private String taskId;
+
+    @ApiModelProperty(value = "可选决策项（1同意驳回拒绝 2同意驳回 3同意拒绝，用于待审批列表同意/驳回/拒绝按钮展示）", dataType = "Integer")
+    @TableField(exist = false)
+    private Integer decisionItem;
+
+
+}

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java
index bb0c50f..13a699b 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java
@@ -12,6 +12,7 @@
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.IGeneralApprovalService;
+import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
@@ -19,6 +20,7 @@
 import org.springframework.web.bind.annotation.RequestBody;
 
 import javax.validation.Valid;
+import java.util.List;
 import java.util.Objects;
 
 /**
@@ -117,4 +119,17 @@
         }
         return baseApprovalService.failUpdate(request);
     }
+
+    public List<O> exportList(@RequestBody @Valid R request) throws Exception {
+        List<O> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = baseApprovalService.listExportByIds(request.getIds());
+        } else {
+            list = baseApprovalService.listExport(request);
+        }
+        for (O record : list) {
+            DictCodeUtils.convertDictCodeToName(record);
+        }
+        return list;
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java
index 8a90961..d775831 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java
@@ -5,6 +5,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.business.certificate.CertificateChangeApplyApprovalListRequest;
 import com.casic.missiles.dto.business.certificate.CertificateChangeApplySaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessCertificateChangeApply;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
@@ -20,6 +21,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -48,4 +50,12 @@
         }
         return changeApplyService.saveChangeApply(request);
     }
+
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody CertificateChangeApplyApprovalListRequest request) throws Exception {
+        List<BizBusinessCertificateChangeApply> list = super.exportList(request);
+        super.exportExcel(BizBusinessCertificateChangeApply.class, list, ExportEnum.CERTIFICATE_CHANGE_APPLY.getSheetName());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java
index 5fc4b07..af8230e 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java
@@ -9,6 +9,7 @@
 import com.casic.missiles.dto.business.certificate.CertificatePrintApprovalListRequest;
 import com.casic.missiles.dto.business.certificate.CertificatePrintListResponse;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.enums.business.CertificatePrintStatusEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessCertificatePrintLog;
@@ -18,10 +19,16 @@
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.io.IOException;
+import java.util.List;
 import java.util.Objects;
 
 /**
@@ -98,4 +105,16 @@
         });
         return certificatePrintService.certificatePrintLog(idDTO.getId());
     }
+
+    @ApiOperation("证书打印审批导出")
+    @PostMapping("/listExport")
+    public void exportList(@RequestBody CertificatePrintApprovalListRequest request) throws IOException {
+        List<CertificatePrintListResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = certificatePrintService.listByIds(request.getIds());
+        } else {
+            list = certificatePrintService.list(request);
+        }
+        super.exportExcel(CertificatePrintListResponse.class, list, ExportEnum.CERTIFICATE_PRINT.getSheetName());
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java
index 63b06dc..6b2efd5 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java
@@ -6,6 +6,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.business.certificate.CertificateReportApprovalListRequest;
 import com.casic.missiles.dto.business.certificate.CertificateReportSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessCertificateReport;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
@@ -21,6 +22,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -50,7 +52,7 @@
         return certificateReportService.saveCertificateReport(request);
     }
 
-    @ApiOperation("证书审批详情（基本信息）")
+    @ApiOperation("详情（基本信息）")
     @PostMapping("/detail")
     public ReturnDTO<BizBusinessCertificateReport> detail(@RequestBody @Valid BaseDetailRequest request, BindingResult bindingResult) throws Exception {
         if(bindingResult.hasErrors()){
@@ -59,4 +61,11 @@
         return certificateReportService.detail(request);
     }
 
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody CertificateReportApprovalListRequest request) throws Exception {
+        List<BizBusinessCertificateReport> list = super.exportList(request);
+        super.exportExcel(BizBusinessCertificateReport.class, list, ExportEnum.CERTIFICATE_REPORT.getSheetName());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java
index 46b26bd..57c0809 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java
@@ -10,20 +10,21 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.business.identify.IdentifyListRequest;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessIdentifyInfo;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.business.IBizBusinessIdentifyInfoService;
+import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import javax.validation.Valid;
+import java.util.List;
 import java.util.Objects;
 
 /**
@@ -57,16 +58,13 @@
         return identifyInfoService.addIdentify(identifyInfo);
     }
 
-    @ApiOperation("标识打印更新")
+    @ApiOperation("标识打印更新（更新打印时间）")
     @PostMapping("/update")
-    public ReturnDTO updateIdentify(@RequestBody @Valid BizBusinessIdentifyInfo identifyInfo, BindingResult bindingResult) {
-        Assert.isFalse(Objects.isNull(identifyInfo.getId()), () -> {
+    public ReturnDTO updateIdentify(@RequestBody @Valid IdDTO idDTO) {
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        Assert.isFalse(bindingResult.hasErrors(), () -> {
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        });
-        return identifyInfoService.updateIdentify(identifyInfo);
+        return identifyInfoService.updateIdentify(idDTO.getId());
     }
 
     @ApiOperation("标识打印删除")
@@ -77,4 +75,37 @@
         });
         return identifyInfoService.deleteIdentify(idDTO.getId());
     }
+
+    @ApiOperation("标识打印导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody @Valid IdentifyListRequest request, BindingResult bindingResult) throws Exception {
+        if (bindingResult.hasErrors()) {
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        List<BizBusinessIdentifyInfo> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = identifyInfoService.listByIds(request.getIds());
+        } else {
+            list = identifyInfoService.list(request);
+        }
+        for (BizBusinessIdentifyInfo record : list) {
+            DictCodeUtils.convertDictCodeToName(record);
+        }
+        super.exportExcel(BizBusinessIdentifyInfo.class, list, ExportEnum.IDENTIFY_EXPORT.getSheetName());
+    }
+
+
+    // TODO: 2023/8/23 查询设备信息，4个底部按钮查设备（按钮的作用就是前端用来调不同接口、用来区分中间即将展示的标识），前端弹窗选设备，在确定保存时前端根据底部按钮判断传入设备类型deviceType字典code
+    // TODO: 2023/8/23 接口：查受检设备（第1个按钮），查设备台账（后3个按钮同一接口），查询之后前端根据标志类型的不同加到中间页面时进行判断（按产品给的对应表）
+    // TODO: 2023/8/23 提供二维码接口，前端在加到中间页面时调用一下
+
+    @ApiOperation("设备二维码")
+    @PostMapping("/equipment/qrCode")
+    public ReturnDTO<String> equipmentQrCode(@RequestBody @Valid IdDTO idDTO) {
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return identifyInfoService.equipmentQrCode(idDTO.getId());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java
index 707be6e..7e0453d 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java
@@ -117,7 +117,7 @@
     }
 
     @ApiOperation("任务单导出")
-    @PostMapping("/export")
+    @PostMapping("/listExport")
     public void orderExport(@RequestBody @Valid OrderListRequest request, HttpServletResponse response) {
         businessOrderService.orderExport(request, response);
     }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java
index 529a6ce..51432be 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java
@@ -1,9 +1,28 @@
 package com.casic.missiles.controller.business;
 
+import com.casic.missiles.controller.GeneralApprovalController;
+import com.casic.missiles.dto.BaseApprovalSubmitRequest;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.business.outsource.OutsourceAssessApprovalListRequest;
+import com.casic.missiles.dto.business.outsource.OutsourceAssessSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
+import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.model.business.BizBusinessOutsourceAssess;
+import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
+import com.casic.missiles.service.IGeneralApprovalService;
+import com.casic.missiles.service.business.IBizBusinessOutsourceAssessService;
 import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.BindingResult;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.validation.Valid;
+import java.util.List;
+
 /**
  * <p>
  * 计量检定业务-分包管理-测试、校准或检定工作分包评审表 前端控制器
@@ -15,6 +34,27 @@
 @Api(tags = "分包管理-测试、校准或检定工作分包评审表")
 @RestController
 @RequestMapping("/business/outsource/assess")
-public class BizBusinessOutsourceAssessController {
+public class BizBusinessOutsourceAssessController extends GeneralApprovalController<BizBusinessOutsourceAssess, BizBusinessOutsourceAssess, OutsourceAssessApprovalListRequest, BaseApprovalSubmitRequest> {
+    @Autowired
+    private IBizBusinessOutsourceAssessService outsourceAssessService;
 
+    public BizBusinessOutsourceAssessController(IGeneralApprovalService<BizBusinessOutsourceAssess, BizBusinessOutsourceAssess, OutsourceAssessApprovalListRequest, BaseApprovalSubmitRequest> baseApprovalService) {
+        super(baseApprovalService);
+    }
+
+    @ApiOperation("草稿箱-保存")
+    @PostMapping("/save")
+    public ReturnDTO<OutsourceAssessSaveResponse> saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceAssess request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        return outsourceAssessService.saveOutsourceAssess(request);
+    }
+
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception {
+        List<BizBusinessOutsourceAssess> list = super.exportList(request);
+        super.exportExcel(BizBusinessOutsourceAssess.class, list, ExportEnum.OUTSOURCE_ASSESS.getSheetName());
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java
new file mode 100644
index 0000000..9adef18
--- /dev/null
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java
@@ -0,0 +1,60 @@
+package com.casic.missiles.controller.business;
+
+import com.casic.missiles.controller.GeneralApprovalController;
+import com.casic.missiles.dto.BaseApprovalSubmitRequest;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.business.outsource.OutsourceProtocolApprovalListRequest;
+import com.casic.missiles.dto.business.outsource.OutsourceProtocolSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
+import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.model.business.BizBusinessOutsourceProtocol;
+import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
+import com.casic.missiles.service.IGeneralApprovalService;
+import com.casic.missiles.service.business.IBizBusinessOutsourceProtocolService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.BindingResult;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.validation.Valid;
+import java.util.List;
+
+/**
+ * <p>
+ * 计量检定业务-分包管理-测试、校准或检定工作分包协议书 前端控制器
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-08-24
+ */
+@Api(tags = "分包管理-测试、校准或检定工作分包协议书")
+@RestController
+@RequestMapping("/business/outsource/protocol")
+public class BizBusinessOutsourceProtocolController extends GeneralApprovalController<BizBusinessOutsourceProtocol, BizBusinessOutsourceProtocol, OutsourceProtocolApprovalListRequest, BaseApprovalSubmitRequest> {
+    @Autowired
+    private IBizBusinessOutsourceProtocolService outsourceProtocolService;
+
+    public BizBusinessOutsourceProtocolController(IGeneralApprovalService<BizBusinessOutsourceProtocol, BizBusinessOutsourceProtocol, OutsourceProtocolApprovalListRequest, BaseApprovalSubmitRequest> baseApprovalService) {
+        super(baseApprovalService);
+    }
+
+    @ApiOperation("草稿箱-保存")
+    @PostMapping("/save")
+    public ReturnDTO<OutsourceProtocolSaveResponse> saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceProtocol request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        return outsourceProtocolService.saveOutsourceProtocol(request);
+    }
+
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody OutsourceProtocolApprovalListRequest request) throws Exception {
+        List<BizBusinessOutsourceProtocol> list = super.exportList(request);
+        super.exportExcel(BizBusinessOutsourceProtocol.class, list, ExportEnum.OUTSOURCE_PROTOCOL.getSheetName());
+    }
+}
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java
index 097f645..f0f0943 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java
@@ -17,7 +17,6 @@
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.IGeneralApprovalService;
 import com.casic.missiles.service.business.IBizBusinessOutsourcerInfoService;
-import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -71,19 +70,8 @@
 
     @ApiOperation("分包方导出")
     @PostMapping("/listExport")
-    public void export(@RequestBody @Valid OutsourcerInfoApprovalListRequest request, BindingResult bindingResult) throws Exception {
-        if (bindingResult.hasErrors()) {
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        }
-        List<BizBusinessOutsourcerInfo> list;
-        if (!CollectionUtils.isEmpty(request.getIds())) {
-            list = outsourcerInfoService.listByIds(request.getIds());
-        } else {
-            list = outsourcerInfoService.list(request);
-        }
-        for (BizBusinessOutsourcerInfo record : list) {
-            DictCodeUtils.convertDictCodeToName(record);
-        }
+    public void export(@RequestBody OutsourcerInfoApprovalListRequest request) throws Exception {
+        List<BizBusinessOutsourcerInfo> list = super.exportList(request);
         super.exportExcel(BizBusinessOutsourcerInfo.class, list, ExportEnum.OUTSOURCER_EXPORT.getSheetName());
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java
index c2cbf9f..0410918 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java
@@ -17,11 +17,9 @@
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.IGeneralApprovalService;
 import com.casic.missiles.service.business.IBizBusinessSiteExecutiveInfoService;
-import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -60,7 +58,7 @@
         return siteExecutiveInfoService.saveSiteExecutiveInfo(siteExecutiveInfo);
     }
 
-    @ApiOperation("现场检测详情")
+    @ApiOperation("详情")
     @PostMapping("/detail")
     public ReturnDTO<SiteExecutiveDetailResponse> siteExecutiveDetail(@RequestBody @Valid IdDTO idDTO) throws Exception {
         Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
@@ -69,21 +67,10 @@
         return ReturnUtil.success(siteExecutiveInfoService.detail(idDTO.getId()));
     }
 
-    @ApiOperation("现场检测导出")
+    @ApiOperation("导出")
     @PostMapping("/listExport")
-    public void export(@RequestBody @Valid SiteExecutiveApprovalListRequest request, BindingResult bindingResult) throws Exception {
-        if (bindingResult.hasErrors()) {
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        }
-        List<SiteExecutiveApprovalListResponse> list;
-        if (!CollectionUtils.isEmpty(request.getIds())) {
-            list = siteExecutiveInfoService.listInfoByIds(request.getIds());
-        } else {
-            list = siteExecutiveInfoService.listInfo(request);
-        }
-        for (SiteExecutiveApprovalListResponse record : list) {
-            DictCodeUtils.convertDictCodeToName(record);
-        }
+    public void export(@RequestBody SiteExecutiveApprovalListRequest request) throws Exception {
+        List<SiteExecutiveApprovalListResponse> list = super.exportList(request);
         super.exportExcel(SiteExecutiveApprovalListResponse.class, list, ExportEnum.SITE_EXECUTIVE_EXPORT.getSheetName());
     }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
index 7e793cd..a92e209 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
@@ -55,7 +55,7 @@
 
     @ApiOperation("设备收发列表导出")
     @PostMapping("/export")
-    public void exportList(@RequestBody @Valid SampleDispatchListRequest request) throws IOException {
+    public void exportList(@RequestBody SampleDispatchListRequest request) throws IOException {
         List<SampleDispatchListResponse> list;
         if (!CollectionUtils.isEmpty(request.getIds())) {
             list = dispatchService.listByIds(request.getIds());
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java
index cdc77fc..d120fd4 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java
@@ -7,6 +7,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.business.labExecutive.*;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.business.IBusinessLabExecutiveInfoService;
@@ -14,6 +15,7 @@
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.*;
 
@@ -32,7 +34,7 @@
     @Autowired
     private IBusinessLabExecutiveInfoService labExecutiveInfoService;
 
-    @ApiOperation("实验室检测-部门检测-查询各状态列表（待检测、检测中、检测完）")
+    @ApiOperation("实验室任务-查询各状态列表（待检测、检测中、检测完）")
     @PostMapping("/deptExecutive/List")
     public ReturnDTO<PageInfoBT<SampleLabExecutiveListResponse>> queryDeptExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
@@ -43,10 +45,19 @@
         return ReturnUtil.success(super.packForBT(labExecutiveInfoService.deptLabExecutiveListPage(page, labExecutiveListRequest)));
     }
 
-    /**
-     * 实验室检测-我的检测-查询各状态列表（待检测、检测中、检测完）
-     */
-    @ApiOperation("实验室检测-我的检测-查询各状态列表（待检测、检测中、检测完）")
+    @ApiOperation("实验室任务导出")
+    @PostMapping("/deptExecutive/export")
+    public void deptExportList(@RequestBody @Valid SampleLabExecutiveListRequest request) throws Exception {
+        List<SampleLabExecutiveListResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = labExecutiveInfoService.deptLabExecutiveListByIds(request.getMeasureStatus(), request.getIds());
+        } else {
+            list = labExecutiveInfoService.deptLabExecutiveList(request);
+        }
+        super.exportExcel(SampleLabExecutiveListResponse.class, list, ExportEnum.DEPT_EXECUTIVE_TASK.getSheetName());
+    }
+
+    @ApiOperation("我的任务-查询各状态列表（待检测、检测中、检测完）")
     @PostMapping("/myExecutive/list")
     public ReturnDTO<PageInfoBT<SampleLabExecutiveListResponse>> queryMyExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
@@ -57,19 +68,25 @@
         return ReturnUtil.success(super.packForBT(labExecutiveInfoService.myLabExecutiveListPage(page, labExecutiveListRequest)));
     }
 
-    /**
-     * 实验室检测-我的检测-查询各状态样品数量（待检测、检测中、检测完）
-     */
-    @ApiOperation("实验室检测-我的检测-查询各状态样品数量（待检测、检测中、检测完）")
+    @ApiOperation("我的任务导出")
+    @PostMapping("/myExecutive/export")
+    public void exportList(@RequestBody @Valid SampleLabExecutiveListRequest request) throws Exception {
+        List<SampleLabExecutiveListResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = labExecutiveInfoService.myLabExecutiveListByIds(request.getMeasureStatus(), request.getIds());
+        } else {
+            list = labExecutiveInfoService.myLabExecutiveList(request);
+        }
+        super.exportExcel(SampleLabExecutiveListResponse.class, list, ExportEnum.MY_EXECUTIVE_TASK.getSheetName());
+    }
+
+    @ApiOperation("我的任务-查询各状态样品数量（待检测、检测中、检测完）")
     @GetMapping("/myExecutive/amount")
     public ReturnDTO<List<SampleAmountResponse>> queryMyExecutiveAmount() {
         return ReturnUtil.success(labExecutiveInfoService.myExecutiveAmount());
     }
 
-    /**
-     * 实验室检测-部门检测-分配（分配给具体人员）
-     */
-    @ApiOperation("实验室检测-部门检测-分配按钮（分配给具体人员）")
+    @ApiOperation("实验室任务-分配按钮（分配给具体人员）")
     @PostMapping("/deptExecutive/allocate")
     public ReturnDTO allocateStaff(@RequestBody @Valid SampleAllocateRequest sampleAllocateRequest, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -78,10 +95,7 @@
         return labExecutiveInfoService.allocateStaff(sampleAllocateRequest);
     }
 
-    /**
-     * 实验室检测-我的检测-检定人扫描收入（待检测->检测中）
-     */
-    @ApiOperation("实验室检测-我的检测-检定人扫描收入（待检测->检测中）")
+    @ApiOperation("我的任务-检定人扫描收入（待检测->检测中）")
     @PostMapping("/myExecutive/receive")
     public ReturnDTO sampleReceive(@RequestBody @Valid List<SampleOperateRequest> requestList, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -90,10 +104,7 @@
         return labExecutiveInfoService.sampleReceive(requestList);
     }
 
-    /**
-     * 实验室检测-负责人/检定人扫描检完（检测中->检测完）
-     */
-    @ApiOperation("实验室检测-负责人/检定人扫描检完（检测中->检测完）")
+    @ApiOperation("实验室任务-负责人/检定人扫描检完（检测中->检测完）")
     @PostMapping("/myExecutive/complete")
     public ReturnDTO sampleExecutiveComplete(@RequestBody @Valid List<SampleOperateRequest> requestList, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -102,10 +113,7 @@
         return labExecutiveInfoService.sampleExecutiveComplete(requestList);
     }
 
-    /**
-     * 实验室检测-部门检测/我的检测 编辑（只能修改应出具证书）
-     */
-    @ApiOperation("实验室检测-部门检测/我的检测 编辑（只能修改应出具证书）")
+    @ApiOperation("实验室任务/我的任务 编辑（只能修改应出具证书）")
     @PostMapping("/executive/update")
     public ReturnDTO updateExecutive(@RequestBody @Valid UpdateExecutiveRequest request, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -114,10 +122,7 @@
         return labExecutiveInfoService.updateExecutive(request);
     }
 
-    /**
-     * 实验室检测-部门检测/我的检测 详情
-     */
-    @ApiOperation("实验室检测-部门检测/我的检测 详情")
+    @ApiOperation("实验室任务/我的任务 详情")
     @PostMapping("/executive/detail")
     public ReturnDTO<ExecutiveDetailResponse> executiveDetail(@RequestBody @Valid ExecutiveDetailRequest request, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
@@ -131,7 +136,7 @@
      * 退回后会将下一个要执行的实验室检测状态更新为待分配，将后面的实验室顺序变更为连续（都进行减1）
      * 最后一个检测的实验室退回，等分发员再增加实验室或设备收发中的已收入直接手动点击完成
      */
-    @ApiOperation("实验室检测-部门检测/我的检测 退回（待检测/检测中->退回）")
+    @ApiOperation("实验室任务/我的任务 退回（待检测/检测中->退回）")
     @PostMapping("/executive/sendBack")
     public ReturnDTO executiveSendBack(@RequestBody @Valid ExecutiveSendBackRequest request, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -140,9 +145,6 @@
         return labExecutiveInfoService.sampleExecutiveSendBack(request);
     }
 
-    /**
-     * 分发员编辑实验室检测列表
-     */
     @ApiOperation("分发员编辑实验室检测列表")
     @PostMapping("/handOut/updateList")
     public ReturnDTO updateExecutiveList(@RequestBody @Valid UpdateExecutiveListRequest request, BindingResult bindingResult) {
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java
index 48a67ed..0c04f31 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java
@@ -10,6 +10,7 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.resource.customer.CustomerApprovalListRequest;
 import com.casic.missiles.dto.resource.customer.CustomerSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceCustomerInfo;
@@ -26,6 +27,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -55,6 +57,13 @@
         return customerInfoService.saveCustomerInfo(request);
     }
 
+    @ApiOperation("委托方名录导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody CustomerApprovalListRequest request) throws Exception {
+        List<BizResourceCustomerInfo> list = super.exportList(request);
+        super.exportExcel(BizResourceCustomerInfo.class, list, ExportEnum.CUSTOMER_INFO.getSheetName());
+    }
+
     @ApiOperation("委托方人员列表（分页）")
     @PostMapping("/person/listPage")
     public ReturnDTO<PageInfoBT<BizResourceCustomerStaff>> personListPage(@RequestBody IdDTO idDto) {
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
index 972ed4b..6418ea5 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
@@ -5,6 +5,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.resource.customer.SuggestFormApprovalListRequest;
 import com.casic.missiles.dto.resource.customer.SuggestFormSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceCustomerSuggestForm;
@@ -20,6 +21,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -50,4 +52,11 @@
         return suggestFormService.saveSuggestForm(request);
     }
 
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody SuggestFormApprovalListRequest request) throws Exception {
+        List<BizResourceCustomerSuggestForm> list = super.exportList(request);
+        super.exportExcel(BizResourceCustomerSuggestForm.class, list, ExportEnum.CUSTOMER_SUGGEST_FORM.getSheetName());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java
index 1934d1a..9e07eab 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java
@@ -15,12 +15,16 @@
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.resource.IEnvEnvironmentRecordConfigService;
 import com.casic.missiles.service.resource.IEnvEnvironmentRecordDataService;
+import com.casic.missiles.service.resource.IEnvLocationInfoService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
 import java.util.List;
@@ -39,6 +43,8 @@
     private IEnvEnvironmentRecordDataService environmentRecordDataService;
     @Autowired
     private IEnvEnvironmentRecordConfigService environmentRecordConfigService;
+    @Autowired
+    private IEnvLocationInfoService locationInfoService;
 
     @ApiOperation("环境记录单数据列表/详情")
     @PostMapping("/data/listPage")
@@ -95,4 +101,11 @@
         });
         return environmentRecordConfigService.deleteEnvironmentRecordConfig(idDTO.getId());
     }
+
+    @ApiOperation("地点列表")
+    @PostMapping("/location/listPage")
+    public ReturnDTO<PageInfoBT<LocationListResponse>> locationListPage(@RequestBody @Valid LocationListRequest request) {
+        Page<LocationListResponse> page = PageFactory.defaultPage();
+        return ReturnUtil.success(super.packForBT(locationInfoService.listPage(page, request)));
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java
index 82efe3f..e9561fa 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java
@@ -10,6 +10,7 @@
 import com.casic.missiles.dto.resource.seal.SealLogListRequest;
 import com.casic.missiles.dto.resource.seal.SealNoteApprovalListRequest;
 import com.casic.missiles.dto.resource.seal.SealNoteSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceSealUseLog;
@@ -27,6 +28,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -58,6 +60,13 @@
         return sealUseNoteService.saveSeal(request);
     }
 
+    @ApiOperation("印章使用登记导出（列表和导出中去掉经办人和监印人）")
+    @PostMapping("/listExport")
+    public void export(@RequestBody SealNoteApprovalListRequest request) throws Exception {
+        List<BizResourceSealUseNote> list = super.exportList(request);
+        super.exportExcel(BizResourceSealUseNote.class, list, ExportEnum.SEAL_NOTE.getSheetName());
+    }
+
     // TODO: 2023/7/28 印章使用日志：系统中使用印章时插入数据库
 
     @ApiOperation("印章使用日志列表（分页）")
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java
index 9b674fc..06b6521 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java
@@ -9,16 +9,20 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.resource.staff.StaffCertRequest;
 import com.casic.missiles.dto.resource.staff.StaffCertResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.service.resource.IBizResourceStaffInfoService;
 import com.casic.missiles.service.resource.IBizResourceStaffVerifierService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.List;
+
 /**
  * @Description:
  * @Author: wangpeng
@@ -41,9 +45,21 @@
         return ReturnUtil.success(super.packForBT(responsePage));
     }
 
+    @ApiOperation("证书逾期提醒导出")
+    @PostMapping("/listExport")
+    public void exportList(@RequestBody StaffCertRequest request) throws Exception {
+        List<StaffCertResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = staffInfoService.certListByIds(request.getIds());
+        } else {
+            list = staffInfoService.certList(request);
+        }
+        super.exportExcel(StaffCertResponse.class, list, ExportEnum.STAFF_CERTIFICATE_EXPIRE.getSheetName());
+    }
+
     @ApiOperation("证书逾期提醒")
     @PostMapping("/expirationReminder")
-    public ReturnDTO expirationReminder(@RequestBody IdDTO idDto) {
-        return verifierService.expirationReminder(idDto);
+    public ReturnDTO expirationReminder(@RequestBody IdDTO idDTO) {
+        return verifierService.expirationReminder(idDTO);
     }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java
index 3b251ad..a6e7850 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java
@@ -12,6 +12,7 @@
 import com.casic.missiles.dto.resource.staff.StaffListRequest;
 import com.casic.missiles.dto.resource.staff.TrainListRequest;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.*;
@@ -22,7 +23,10 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
 import java.util.List;
@@ -52,8 +56,19 @@
             throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
         }
         Page<BizResourceStaffInfo> page = PageFactory.defaultPage();
-        Page<BizResourceStaffInfo> responsePage = staffInfoService.listPage(page, request);
-        return ReturnUtil.success(super.packForBT(responsePage));
+        return ReturnUtil.success(super.packForBT(staffInfoService.listPage(page, request)));
+    }
+
+    @ApiOperation("人员登记导出")
+    @PostMapping("/listExport")
+    public void exportList(@RequestBody StaffListRequest request) throws Exception {
+        List<BizResourceStaffInfo> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = staffInfoService.listByIds(request.getIds());
+        } else {
+            list = staffInfoService.list(request);
+        }
+        super.exportExcel(BizResourceStaffInfo.class, list, ExportEnum.STAFF_INFO.getSheetName());
     }
 
     @ApiOperation("人员登记详情基础信息")
@@ -85,9 +100,9 @@
 
     @ApiOperation("科研教育列表（分页）")
     @PostMapping("/education/listPage")
-    public ReturnDTO<PageInfoBT<BizResourceStaffEducation>> educationListPage(@RequestBody IdDTO idDto) {
+    public ReturnDTO<PageInfoBT<BizResourceStaffEducation>> educationListPage(@RequestBody IdDTO idDTO) {
         Page<BizResourceStaffEducation> page = PageFactory.defaultPage();
-        Page<BizResourceStaffEducation> responsePage = staffInfoService.educationListPage(page, idDto);
+        Page<BizResourceStaffEducation> responsePage = staffInfoService.educationListPage(page, idDTO);
         return ReturnUtil.success(super.packForBT(responsePage));
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java
index af6aa86..d85d84a 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java
@@ -9,6 +9,7 @@
 import com.casic.missiles.dto.resource.outsideService.SupplierApprovalListRequest;
 import com.casic.missiles.dto.resource.outsideService.SupplierSaveResponse;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceSupplierAbility;
@@ -67,6 +68,13 @@
         return ReturnUtil.success(supplierInfoService.detail(idDTO.getId()));
     }
 
+    @ApiOperation("合格供方导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody SupplierApprovalListRequest request) throws Exception {
+        List<BizResourceSupplierInfo> list = super.exportList(request);
+        super.exportExcel(BizResourceSupplierInfo.class, list, ExportEnum.SUPPLIER_INFO.getSheetName());
+    }
+
     @ApiOperation("供方人员列表（分页）")
     @PostMapping("/person/listPage")
     public ReturnDTO<PageInfoBT<BizResourceSupplierPerson>> personListPage(@RequestBody IdDTO idDTO) {
diff --git a/casic-metering-api/src/main/resources/config/application.yml b/casic-metering-api/src/main/resources/config/application.yml
index 350db5f..ecff521 100644
--- a/casic-metering-api/src/main/resources/config/application.yml
+++ b/casic-metering-api/src/main/resources/config/application.yml
@@ -126,7 +126,7 @@
     #作者
     author: wangpeng
     #待生成对象表名
-    table-name: biz_equipment_technical_target_approval,biz_equipment_attachment_approval,biz_equipment_checkpoint_approval
+    table-name: biz_business_outsource_protocol
 
 reminder:
   #节点--common模块config包 ReminderNodeConfig配置
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
index 4a19e4e..d47d552 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
@@ -53,6 +53,7 @@
     SUGGEST_FORM_SAVE_FAILED(2509, "委托方意见登记表保存至草稿箱失败"),
     EXAMINE_FORM_SAVE_FAILED(2510, "要求、委托书及合同评审表保存至草稿箱失败"),
     CUSTOMER_EXIST_SAVE_FAILED(2511, "该委托方已存在，请重新选择"),
+    DUPLICATE_LOCATION_NO(2512, "地点编号已存在"),
 
     /**
      * 计量检定业务模块
@@ -68,6 +69,8 @@
     COMPLETE_SAMPLE_NOT_EXIST(2609, "检测中不存在扫描收入的样品"),
     CANNOT_CHANGE_MEASURE_INFO(2610, "无法更改非当前登录用户的检测信息"),
     NON_EXIST_ORDER_OR_SAMPLE(2611, "不存在该委托单或该委托单下的样品"),
+    OUTSOURCE_ACCESS_SAVE_FAILED(2612, "测试、校准或检定工作分包评审表保存至草稿箱失败"),
+    OUTSOURCE_PROTOCOL_SAVE_FAILED(2613, "测试、校准或检定工作分包协议书保存至草稿箱失败"),
 
     /**
      * 历史遗留备用
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
index 5089ad1..81a406b 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
@@ -10,54 +10,38 @@
     /**
      * 资源管理
      */
-    ENVIRONMENT_DATA_EXPORT("environmentData", "environmentData", "环境记录单数据"),
+    ENVIRONMENT_DATA_EXPORT("environmentData", "环境记录单数据", "环境记录单数据"),
+    STAFF_INFO("staffInfo", "人员登记", "人员登记"),
+    STAFF_CERTIFICATE_EXPIRE("certificateExpire", "证书逾期提醒", "证书逾期提醒"),
+    SUPPLIER_INFO("supplierInfo", "合格供方名录", "合格供方名录"),
+    CUSTOMER_INFO("customerInfo", "委托方名录", "委托方名录"),
+    CUSTOMER_SUGGEST_FORM("customerSuggestForm", "委托方意见登记表", "委托方意见登记表"),
+    SEAL_NOTE("sealNote", "印章使用登记", "印章使用登记"),
 
-    FILE_EXPORT("meterFileData", "meterFileData", "计量文件信息"),
-    TRAIN_PLAN_EXPORT("trainPlanData", "trainPlanData", "培训计划"),
-    TRAIN_LOG_EXPORT("trainLogData", "trainLogData", "培训记录"),
-    METER_ORGANIZE_EXPORT("meterOrganizeData", "meterOrganizeData", "计量组织"),
-    TRACE_SUPPLIER_EXPORT("traceSupplierData", "traceSupplierData", "溯源供方"),
-    SIGN_EXPORT("signData", "signData", "签名/签章"),
-    TEMPLATE_EXPORT("templateData", "templateData", "原始记录模板/证书报告模板"),
-    FIXED_ASSETS("meterFixedAssets", "meterFixedAssets", "固定资产"),
-    METER_EQUIPMENT("meterEquipment", "meterEquipment", "测量设备"),
-    CALIBRATION_TEST_EQUIPMENT("calibrationTestEquipment", "calibrationTestEquipment", "校准检定设备"),
-    MEASURE_ACCOUNT("measureAccount", "measureAccount", "测量工装"),
-    STANDARD_SUPPORT_EQUIPMENT("standardSupportEquipment", "standardSupportEquipment", "标准配套设备"),
-    STANDARD_EQUIPMENT("standardEquipment", "standardEquipment", "标准装置"),
-    FLOW_DEF_EXPORT("flowDefData", "flowDefData", "流程定义"),
-    STAFF_CERTIFICATE("certificate", "certificate", "计量人员证书"),
-    CHECK_INFO("checkInfo", "checkInfo", "设备管理点检测"),
-    EQUIPMENT_APPLY("equipmentApply", "equipmentApply", "设备借用"),
-    STANDARD_EQUIPMENT_REMIND("equipmentApplyRemind", "equipmentApplyRemind", "标准装置到期提醒"),
-    METER_PRICE("meterPrice", "meterPrice", "价格库"),
-    METER_STAFF("meterStaff", "meterStaff", "计量人员"),
-    STANDARD_EQUIPMENT_APPLY("standardEquipmentApply", "standardEquipmentApply", "标准装置申请"),
-    STATE_MANAGE_APPLY("stateManage", "stateManage", "状态管理"),
-    METER_ACCEPTANCE_CHECK("acceptanceCheck", "acceptanceCheck", "设备检修保养验收单"),
-    CUSTOMER_EXPORT("customerData", "customerData", "客户信息"),
-    ORDER_EXPORT("orderData", "orderData", "委托书信息"),
-    SAMPLE_EXPORT("sampleData", "sampleData", "样本信息"),
-    EXCHANGE_DATA("exchangeData", "exchangeData", "设备交接单"),
-    DISPATCH_DATA("dispatchData", "dispatchData", "设备收发"),
-    ENVIRONMENT_DATA("environmentData", "environmentData", "环境记录单"),
-    ORIGIN_DATA("originData", "originData", "原始记录"),
-    CERTIFICATE_REPORT("certificateReport", "certificateReport", "证书报告"),
-    ADVICE_EXPORT("adviceData", "adviceData", "客户反馈"),
-    HANDOUT_EXPORT("handoutData", "handoutData", "任务分发列表"),
-    OUTSOURCER_EXPORT("outsourcerData", "outsourcerData", "分包方"),
-    SITE_EXECUTIVE_EXPORT("siteExecutiveData", "siteExecutiveData", "现场测试、校准或检定"),
-    CERTIFICATE_PRINT_EXPORT("certificatePrintData", "certificatePrintData", "证书打印"),
-    DOWNLOAD_TEMPLATE("downloadTemplate", "downloadTemplate", "页面配置"),
-    OUTSOURCER_CERTIFICATE_EXPORT("outsourceCertificateData", "outsourceCertificateData", "分包证书"),
-    SETTLEMENT_INFO_EXPORT("settlementInfoData", "settlementInfoData", "业务结算"),
-    EQUIPMENT_REMIND("equipmentRemind", "equipmentRemind", "设备到期提醒"),
-    AGREEMENT_INFO_EXPORT("agreementInfoData", "agreementInfoData", "合同"),
-    WORK_STATISTICS_EXPORT("workStatisticsData", "workStatisticsData", "实时工作统计"),
-    DEPT_OUTPUT_EXPORT("deptOutputData", "deptOutputData", "部门产值分析"),
-    WORKLOAD_EXPORT("workloadData", "workloadData", "业务工作量分析"),
-    DEPT_COMPREHENSIVE_EXPORT("deptComprehensiveData", "deptComprehensiveData", "部门综合分析"),
-    ENVIRONMENTAL_RECORD("environmentalRecordData", "environmentalRecordData", "现场环境记录");
+    /**
+     * 计量检定业务
+     */
+    OUTSOURCER_EXPORT("outsourcerData", "分包方名录", "分包方名录"),
+    IDENTIFY_EXPORT("identifyData", "计量标识", "计量标识"),
+    ORDER_EXPORT("orderData", "任务单", "任务单"),
+    DISPATCH_DATA("dispatchData", "设备收发", "设备收发"),
+    HANDOUT_EXPORT("handoutData", "任务分发", "任务分发"),
+    SITE_EXECUTIVE_EXPORT("siteExecutiveData", "现场测试、校准或检定", "现场测试、校准或检定"),
+    CERTIFICATE_REPORT("certificateReport", "证书审批", "证书审批"),
+    CERTIFICATE_CHANGE_APPLY("certificateChangeApply", "证书报告补充或更换申请单", "证书报告补充或更换申请单"),
+    CERTIFICATE_PRINT("certificatePrintData", "证书打印审批", "证书打印审批"),
+    DEPT_EXECUTIVE_TASK("deptExecutiveTaskData", "实验室任务", "实验室任务"),
+    MY_EXECUTIVE_TASK("myExecutiveTaskData", "我的任务", "我的任务"),
+    OUTSOURCE_ASSESS("outsourceAssess", "测试、校准或检定工作分包评审表", "测试、校准或检定工作分包评审表"),
+    OUTSOURCE_PROTOCOL("outsourceProtocol", "测试、校准或检定工作分包协议书", "测试、校准或检定工作分包协议书"),
+
+    /**
+     * 系统管理
+     */
+    SIGN_EXPORT("signData", "签名", "签名"),
+    TEMPLATE_EXPORT("templateData", "文件模板", "文件模板"),
+    FLOW_DEF_EXPORT("flowDefData", "流程定义", "流程定义"),
+    DOWNLOAD_TEMPLATE("downloadTemplate", "流程定义", "页面配置");
 
     ExportEnum(String fileName, String sheetName, String description) {
         this.fileName = fileName;
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateRecordTypeCodeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateRecordTypeCodeEnum.java
index 31d913c..a963522 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateRecordTypeCodeEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateRecordTypeCodeEnum.java
@@ -46,4 +46,14 @@
     String SITE_EXECUTIVE_APPROVAL = "01";
     //《现场测试、校准或检定工作记录表》
     String SITE_EXECUTIVE_LOG = "02";
+
+    //测试、校准或检定工作分包协议书
+    String OUTSOURCE_PROTOCOL = "01";
+    //测试、校准或检定工作分包评审表
+    String OUTSOURCE_ACCESS = "02";
+    //测试、校准或检定工作分包通知书
+    String OUTSOURCE_NOTICE = "03";
+    //测试、校准或检定工作分包方名录
+    String OUTSOURCE_INFO = "04";
+
 }
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
index 24b8635..f78bd53 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
@@ -15,6 +15,10 @@
     String CERTIFICATE_CHANGE_APPLY_BEAN_NAME = "certificateChangeApplyBean";
     //现场测试、校准或检定
     String SITE_EXECUTIVE_BEAN_NAME = "siteExecutiveBean";
+    //测试、校准或检定工作分包评审表
+    String OUTSOURCE_ASSESS_BEAN_NAME = "outsourceAssessBean";
+    //测试、校准或检定工作分包协议书
+    String OUTSOURCE_PROTOCOL_BEAN_NAME = "outsourceProtocolBean";
 
     /*********************************设备与装置************************************/
     //设备台账
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 b21c661..6b86fd1 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
@@ -18,6 +18,8 @@
     OUTSOURCER_APPROVAL(OUTSOURCER_BEAN_NAME, ""),
     CERTIFICATE_CHANGE_APPROVAL(CERTIFICATE_CHANGE_APPLY_BEAN_NAME, ""),
     SITE_EXECUTIVE_APPROVAL(SITE_EXECUTIVE_BEAN_NAME, ""),
+    OUTSOURCE_ASSESS_APPROVAL(OUTSOURCE_ASSESS_BEAN_NAME, ""),
+    OUTSOURCE_PROTOCOL_APPROVAL(OUTSOURCE_PROTOCOL_BEAN_NAME, ""),
 
     ACTION_STATUS_MAP(new HashMap<String, AwareActionStatusEnum>() {
         {
@@ -47,6 +49,10 @@
             put(ApplyFromIdEnum.CERTIFICATE_CHANGE_APPROVAL.getCode(), CERTIFICATE_CHANGE_APPROVAL);
             //现场测试、校准或检定审批
             put(ApplyFromIdEnum.SITE_EXECUTIVE_APPROVAL.getCode(), SITE_EXECUTIVE_APPROVAL);
+            //测试、校准或检定工作分包评审表
+            put(ApplyFromIdEnum.OUTSOURCE_ASSESS_APPROVAL.getCode(), OUTSOURCE_ASSESS_APPROVAL);
+            //测试、校准或检定工作分包协议书
+            put(ApplyFromIdEnum.OUTSOURCE_PROTOCOL_APPROVAL.getCode(), OUTSOURCE_PROTOCOL_APPROVAL);
         }
     });
     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 934405e..c7410bd 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
@@ -9,6 +9,8 @@
     CERTIFICATE_CHANGE_APPROVAL("jljdywzsbchghsqd", MessageSourceModuleEnum.BUSINESS.getCode(), "证书/报告补充或更换申请单"),
     OUTSOURCER_APPROVAL("jljdywcsjzhgfbfml", MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定合格分包方名录"),
     SITE_EXECUTIVE_APPROVAL("jljdywxccsjzsp", MessageSourceModuleEnum.BUSINESS.getCode(), "现场测试、校准或检定审批"),
+    OUTSOURCE_ASSESS_APPROVAL("jljdywcsjzfbpsb", MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包评审表"),
+    OUTSOURCE_PROTOCOL_APPROVAL("jljdywcsjzfbxys", MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包协议书"),
 
 
     /*******************************************设备与装置*********************************************/
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/GeneralApprovalMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/GeneralApprovalMapper.java
index 4fb7344..0c9d6ae 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/GeneralApprovalMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/GeneralApprovalMapper.java
@@ -17,8 +17,4 @@
 
     Page<O> selectBatchForApprovalList(Page<O> page, @Param("request") R request, @Param("businessKeys") List<String> businessKeys);
 
-//    Page<O> selectListPage(Page<O> page, @Param("request") R request);
-
-//    Long selectMaxNo();
-
 }
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceAssessMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceAssessMapper.java
index 7867bb8..ba59009 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceAssessMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceAssessMapper.java
@@ -1,7 +1,12 @@
 package com.casic.missiles.mapper.business;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.business.outsource.OutsourceAssessApprovalListRequest;
+import com.casic.missiles.mapper.GeneralApprovalMapper;
 import com.casic.missiles.model.business.BizBusinessOutsourceAssess;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * <p>
@@ -11,6 +16,10 @@
  * @author wangpeng
  * @since 2023-08-16
  */
-public interface BizBusinessOutsourceAssessMapper extends BaseMapper<BizBusinessOutsourceAssess> {
+public interface BizBusinessOutsourceAssessMapper extends GeneralApprovalMapper<BizBusinessOutsourceAssess, BizBusinessOutsourceAssess, OutsourceAssessApprovalListRequest> {
+
+    Page<BizBusinessOutsourceAssess> selectBatchForApprovalList(Page<BizBusinessOutsourceAssess> page, @Param("request") OutsourceAssessApprovalListRequest request, @Param("businessKeys") List<String> businessKeys);
+
+    Long selectMaxProjectNo();
 
 }
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceProtocolMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceProtocolMapper.java
new file mode 100644
index 0000000..e6aba35
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceProtocolMapper.java
@@ -0,0 +1,24 @@
+package com.casic.missiles.mapper.business;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.business.outsource.OutsourceProtocolApprovalListRequest;
+import com.casic.missiles.mapper.GeneralApprovalMapper;
+import com.casic.missiles.model.business.BizBusinessOutsourceProtocol;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 计量检定业务-分包管理-测试、校准或检定工作分包协议书 Mapper 接口
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-08-24
+ */
+public interface BizBusinessOutsourceProtocolMapper extends GeneralApprovalMapper<BizBusinessOutsourceProtocol, BizBusinessOutsourceProtocol, OutsourceProtocolApprovalListRequest> {
+
+    Page<BizBusinessOutsourceProtocol> selectBatchForApprovalList(Page<BizBusinessOutsourceProtocol> page, @Param("request") OutsourceProtocolApprovalListRequest request, @Param("businessKeys") List<String> businessKeys);
+
+    Long selectMaxProtocolNo();
+}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/EnvLocationInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/EnvLocationInfoMapper.java
new file mode 100644
index 0000000..49eff87
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/EnvLocationInfoMapper.java
@@ -0,0 +1,21 @@
+package com.casic.missiles.mapper.resource;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.resource.environment.LocationListRequest;
+import com.casic.missiles.dto.resource.environment.LocationListResponse;
+import com.casic.missiles.model.resource.EnvLocationInfo;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * <p>
+ * 实验室环境监控系统-设备表 Mapper 接口
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-06-07
+ */
+public interface EnvLocationInfoMapper extends BaseMapper<EnvLocationInfo> {
+
+    Page<LocationListResponse> selectLocationListPage(Page<LocationListResponse> page, @Param("request") LocationListRequest request);
+}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java
index de124db..85ed0f7 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java
@@ -1,7 +1,9 @@
 package com.casic.missiles.mapper.system;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.dto.system.SignDetailResponse;
+import com.casic.missiles.dto.system.SignListRequest;
 import com.casic.missiles.model.system.SystemSign;
 import org.apache.ibatis.annotations.Param;
 
@@ -22,4 +24,8 @@
     SignDetailResponse selectSignDetailById(Long id);
 
     List<SystemSign> selectUsableSignList(@Param("userId") Long userId);
+
+    Page<SystemSign> selectSignListPage(Page<SystemSign> page, @Param("request") SignListRequest request);
+
+    List<SystemSign> selectSignList(@Param("request") SignListRequest request);
 }
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateChangeApplyMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateChangeApplyMapper.xml
index d798447..c496092 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateChangeApplyMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateChangeApplyMapper.xml
@@ -30,31 +30,31 @@
         SELECT *
         FROM biz_business_certificate_change_apply
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.changeApplyNo != null and request.changeApplyNo !=''">
+        <if test="request != null and request.changeApplyNo != null and request.changeApplyNo !=''">
             and change_apply_no like concat('%',#{request.changeApplyNo},'%')
         </if>
-        <if test="request.changeReportNo != null and request.changeReportNo !=''">
+        <if test="request != null and request.changeReportNo != null and request.changeReportNo !=''">
             and change_report_no like concat('%',#{request.changeReportNo},'%')
         </if>
-        <if test="request.changeReportName != null and request.changeReportName !=''">
+        <if test="request != null and request.changeReportName != null and request.changeReportName !=''">
             and change_report_name like concat('%',#{request.changeReportName},'%')
         </if>
-        <if test="request.changeType != null and request.changeType !=''">
+        <if test="request != null and request.changeType != null and request.changeType !=''">
             and change_type = #{request.changeType}
         </if>
-        <if test="request.createUserName != null and request.createUserName !=''">
+        <if test="request != null and request.createUserName != null and request.createUserName !=''">
             and create_user_name like concat('%',#{request.createUserName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificatePrintMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificatePrintMapper.xml
index b66cd99..49c0ac8 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificatePrintMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificatePrintMapper.xml
@@ -31,34 +31,34 @@
         LEFT JOIN biz_business_order_sample_relation bosr ON (bosr.order_id = bcr.order_id AND bosr.sample_id = bcr.sample_id)
         LEFT JOIN biz_business_order_info boi ON boi.id = bosr.order_id
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and bcp.approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.printStatus != null and request.printStatus !=''">
+        <if test="request != null and request.printStatus != null and request.printStatus !=''">
             and print_status = #{request.printStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and bcp.create_user_id = #{request.createUserId}
         </if>
-        <if test="request.certificateReportNo != null and request.certificateReportNo !=''">
+        <if test="request != null and request.certificateReportNo != null and request.certificateReportNo !=''">
             and bcr.certificate_report_no like concat('%',#{request.certificateReportNo},'%')
         </if>
-        <if test="request.certificateReportName != null and request.certificateReportName !=''">
+        <if test="request != null and request.certificateReportName != null and request.certificateReportName !=''">
             and bcr.certificate_report_name like concat('%',#{request.certificateReportName},'%')
         </if>
-        <if test="request.customerName != null and request.customerName !=''">
+        <if test="request != null and request.customerName != null and request.customerName !=''">
             and boi.customer_name like concat('%',#{request.customerName},'%')
         </if>
-        <if test="request.sampleNo != null and request.sampleNo !=''">
+        <if test="request != null and request.sampleNo != null and request.sampleNo !=''">
             and bosr.sample_no like concat('%',#{request.sampleNo},'%')
         </if>
-        <if test="request.sampleName != null and request.sampleName !=''">
+        <if test="request != null and request.sampleName != null and request.sampleName !=''">
             and bosr.sample_name like concat('%',#{request.sampleName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and bcp.create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and bcp.create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml
index b366034..767695d 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml
@@ -46,33 +46,37 @@
         SELECT bcr.*, bosr.sample_no, bosr.sample_name, bosr.sample_model, rsi.staff_name
         FROM biz_business_certificate_report bcr
         LEFT JOIN biz_business_order_sample_relation bosr ON (bosr.order_id = bcr.order_id AND bosr.sample_id = bcr.sample_id)
+        LEFT JOIN biz_business_order_info boi ON boi.id = bcr.order_id
         LEFT JOIN biz_resource_staff_info rsi ON rsi.id = bcr.measure_person_id
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and bcr.approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and bcr.create_user_id = #{request.createUserId}
         </if>
-        <if test="request.certificateReportNo != null and request.certificateReportNo !=''">
+        <if test="request != null and request.customerId != null and request.customerId !=''">
+            and boi.customer_id = #{request.customerId}
+        </if>
+        <if test="request != null and request.certificateReportNo != null and request.certificateReportNo !=''">
             and bcr.certificate_report_no like concat('%',#{request.certificateReportNo},'%')
         </if>
-        <if test="request.certificateReportName != null and request.certificateReportName !=''">
+        <if test="request != null and request.certificateReportName != null and request.certificateReportName !=''">
             and bcr.certificate_report_name like concat('%',#{request.certificateReportName},'%')
         </if>
-        <if test="request.sampleNo != null and request.sampleNo !=''">
+        <if test="request != null and request.sampleNo != null and request.sampleNo !=''">
             and bosr.sample_no like concat('%',#{request.sampleNo},'%')
         </if>
-        <if test="request.measureCategory != null and request.measureCategory !=''">
+        <if test="request != null and request.measureCategory != null and request.measureCategory !=''">
             and bcr.measure_category = #{request.measureCategory}
         </if>
-        <if test="request.measurePerson != null and request.measurePerson !=''">
+        <if test="request != null and request.measurePerson != null and request.measurePerson !=''">
             and rsi.staff_name like concat('%',#{request.measurePerson},'%')
         </if>
-        <if test="request.calibrationTimeStart != null and request.calibrationTimeStart !=''">
+        <if test="request != null and request.calibrationTimeStart != null and request.calibrationTimeStart !=''">
             and bcr.calibration_time &gt;= #{request.calibrationTimeStart}
         </if>
-        <if test="request.calibrationTimeEnd != null and request.calibrationTimeEnd !=''">
+        <if test="request != null and request.calibrationTimeEnd != null and request.calibrationTimeEnd !=''">
             and bcr.calibration_time &lt;= #{request.calibrationTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceAssessMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceAssessMapper.xml
index d0fcf8b..c22c101 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceAssessMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceAssessMapper.xml
@@ -7,6 +7,8 @@
         <id column="id" property="id" />
         <result column="project_no" property="projectNo" />
         <result column="project_name" property="projectName" />
+        <result column="lab_code" property="labCode" />
+        <result column="group_code" property="groupCode" />
         <result column="applicant_id" property="applicantId" />
         <result column="applicant_name" property="applicantName" />
         <result column="applicant_time" property="applicantTime" />
@@ -31,7 +33,45 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, project_no, project_name, applicant_id, applicant_name, applicant_time, minio_file_name, remark, create_user_id, create_user_name, outsourcer_id, pre_start_time, pre_end_time, outsource_reason, pre_cost, approval_status, process_id, approve_situation, traceability, test_method, technique_ability, create_time, update_time
+        id, project_no, project_name, lab_code, group_code, applicant_id, applicant_name, applicant_time, minio_file_name, remark, create_user_id, create_user_name, outsourcer_id, pre_start_time, pre_end_time, outsource_reason, pre_cost, approval_status, process_id, approve_situation, traceability, test_method, technique_ability, create_time, update_time
     </sql>
 
+    <select id="selectMaxProjectNo" resultType="java.lang.Long">
+        SELECT IFNULL(max(RIGHT(project_no, 3)), 0) from biz_business_outsource_assess
+    </select>
+
+    <select id="selectBatchForApprovalList" resultMap="BaseResultMap">
+        SELECT bboa.*, bboi.outsourcer_name, bboi.director
+        FROM biz_business_outsource_assess bboa
+        LEFT JOIN biz_business_outsourcer_info bboi ON bboa.outsourcer_id = bboi.id
+        WHERE 1=1
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
+            and bboa.approval_status = #{request.approvalStatus}
+        </if>
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
+            and bboa.create_user_id = #{request.createUserId}
+        </if>
+        <if test="request != null and request.projectNo != null and request.projectNo !=''">
+            and bboa.project_no like concat('%',#{request.projectNo},'%')
+        </if>
+        <if test="request != null and request.outsourcerName != null and request.outsourcerName !=''">
+            and bboi.outsourcer_name like concat('%',#{request.outsourcerName},'%')
+        </if>
+        <if test="request != null and request.applicantName != null and request.applicantName !=''">
+            and bboa.applicant_name like concat('%',#{request.applicantName},'%')
+        </if>
+        <if test="request != null and request.applicantTimeStart != null and request.applicantTimeStart !=''">
+            and bboa.applicant_time &gt;= #{request.applicantTimeStart}
+        </if>
+        <if test="request != null and request.applicantTimeEnd != null and request.applicantTimeEnd !=''">
+            and bboa.applicant_time &lt;= #{request.applicantTimeEnd}
+        </if>
+        <if test="businessKeys != null">
+            and bboa.id in
+            <foreach collection="businessKeys" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
+        ORDER BY bboa.create_time DESC
+    </select>
 </mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceProtocolMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceProtocolMapper.xml
new file mode 100644
index 0000000..b7b2149
--- /dev/null
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceProtocolMapper.xml
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.mapper.business.BizBusinessOutsourceProtocolMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.business.BizBusinessOutsourceProtocol">
+        <id column="id" property="id" />
+        <result column="protocol_no" property="protocolNo" />
+        <result column="project_name" property="projectName" />
+        <result column="lab_code" property="labCode" />
+        <result column="group_code" property="groupCode" />
+        <result column="outsourcer_id" property="outsourcerId" />
+        <result column="remark" property="remark" />
+        <result column="outsource_no" property="outsourceNo" />
+        <result column="outsource_name" property="outsourceName" />
+        <result column="contacts" property="contacts" />
+        <result column="mobile" property="mobile" />
+        <result column="address" property="address" />
+        <result column="require_date" property="requireDate" />
+        <result column="outsource_cost" property="outsourceCost" />
+        <result column="director" property="director" />
+        <result column="item" property="item" />
+        <result column="requires" property="requires" />
+        <result column="create_user_id" property="createUserId" />
+        <result column="create_user_name" property="createUserName" />
+        <result column="approval_status" property="approvalStatus" />
+        <result column="process_id" property="processId" />
+        <result column="create_time" property="createTime" />
+        <result column="update_time" property="updateTime" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, protocol_no, project_name, lab_code, group_code, outsourcer_id, remark, outsource_no, outsource_name, contacts, mobile, address, require_date, outsource_cost, director, item, requires, create_user_id, create_user_name, approval_status, process_id, create_time, update_time
+    </sql>
+
+    <select id="selectMaxProtocolNo" resultType="java.lang.Long">
+        SELECT IFNULL(max(RIGHT(protocol_no, 3)), 0) from biz_business_outsource_protocol
+    </select>
+
+    <select id="selectBatchForApprovalList" resultMap="BaseResultMap">
+        SELECT *
+        FROM biz_business_outsource_protocol
+        WHERE 1=1
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
+            and approval_status = #{request.approvalStatus}
+        </if>
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
+            and create_user_id = #{request.createUserId}
+        </if>
+        <if test="request != null and request.protocolNo != null and request.protocolNo !=''">
+            and protocol_no like concat('%',#{request.protocolNo},'%')
+        </if>
+        <if test="request != null and request.outsourcerName != null and request.outsourcerName !=''">
+            and outsourcer_name like concat('%',#{request.outsourcerName},'%')
+        </if>
+        <if test="request != null and request.applicantName != null and request.applicantName !=''">
+            and create_user_name like concat('%',#{request.applicantName},'%')
+        </if>
+        <if test="request != null and request.applicantTimeStart != null and request.applicantTimeStart !=''">
+            and create_time &gt;= #{request.applicantTimeStart}
+        </if>
+        <if test="request != null and request.applicantTimeEnd != null and request.applicantTimeEnd !=''">
+            and create_time &lt;= #{request.applicantTimeEnd}
+        </if>
+        <if test="businessKeys != null">
+            and id in
+            <foreach collection="businessKeys" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
+        ORDER BY create_time DESC
+    </select>
+</mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourcerInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourcerInfoMapper.xml
index 510a80b..3049b54 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourcerInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourcerInfoMapper.xml
@@ -7,6 +7,8 @@
         <id column="id" property="id" />
         <result column="outsourcer_no" property="outsourcerNo" />
         <result column="outsourcer_name" property="outsourcerName" />
+        <result column="lab_code" property="labCode" />
+        <result column="group_code" property="groupCode" />
         <result column="outsourcer_brief_name" property="outsourcerBriefName" />
         <result column="outsourcer_size" property="outsourcerSize" />
         <result column="business_size" property="businessSize" />
@@ -55,32 +57,32 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, outsourcer_no, outsourcer_name, outsourcer_brief_name, outsourcer_size, business_size, grade, evaluation, tax_number, bank_account, bank_name, bank_account_number, postal_code, director, phone, fax, mobile, email, website, address_country, address_province, address_city, address_area, full_address, address_country_name, address_province_name, address_city_name, address_area_name, invoice_country, invoice_province, invoice_city, invoice_area, invoice_full_address, invoice_country_name, invoice_province_name, invoice_city_name, invoice_area_name, business_scope, business_content, minio_file_name, approval_status, process_id, remark, create_user_id, create_user_name, create_time, update_time
+        id, outsourcer_no, outsourcer_name, lab_code, group_code, outsourcer_brief_name, outsourcer_size, business_size, grade, evaluation, tax_number, bank_account, bank_name, bank_account_number, postal_code, director, phone, fax, mobile, email, website, address_country, address_province, address_city, address_area, full_address, address_country_name, address_province_name, address_city_name, address_area_name, invoice_country, invoice_province, invoice_city, invoice_area, invoice_full_address, invoice_country_name, invoice_province_name, invoice_city_name, invoice_area_name, business_scope, business_content, minio_file_name, approval_status, process_id, remark, create_user_id, create_user_name, create_time, update_time
     </sql>
 
     <select id="selectBatchForApprovalList" resultMap="BaseResultMap">
         SELECT *
         FROM biz_business_outsourcer_info
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.outsourcerNo != null and request.outsourcerNo !=''">
+        <if test="request != null and request.outsourcerNo != null and request.outsourcerNo !=''">
             and outsourcer_no like concat('%',#{request.outsourcerNo},'%')
         </if>
-        <if test="request.outsourcerName != null and request.outsourcerName !=''">
+        <if test="request != null and request.outsourcerName != null and request.outsourcerName !=''">
             and outsourcer_name like concat('%',#{request.outsourcerName},'%')
         </if>
-        <if test="request.director != null and request.director !=''">
+        <if test="request != null and request.director != null and request.director !=''">
             and director like concat('%',#{request.director},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
@@ -93,6 +95,6 @@
     </select>
 
     <select id="selectMaxNo" resultType="java.lang.Long">
-        SELECT IFNULL(max(RIGHT(outsourcer_no, 12)), 0) from biz_business_outsourcer_info
+        SELECT IFNULL(max(RIGHT(outsourcer_no, 3)), 0) from biz_business_outsourcer_info
     </select>
 </mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessSiteExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessSiteExecutiveInfoMapper.xml
index 135c5d0..3c5ae79 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessSiteExecutiveInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessSiteExecutiveInfoMapper.xml
@@ -38,25 +38,25 @@
         FROM biz_business_site_executive_info bsei
         LEFT JOIN biz_resource_customer_info rci ON bsei.customer_id = rci.id
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and bsei.approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and bsei.create_user_id = #{request.createUserId}
         </if>
-        <if test="request.siteExecutiveNo != null and request.siteExecutiveNo !=''">
+        <if test="request != null and request.siteExecutiveNo != null and request.siteExecutiveNo !=''">
             and bsei.site_executive_no like concat('%',#{request.siteExecutiveNo},'%')
         </if>
-        <if test="request.customerName != null and request.customerName !=''">
+        <if test="request != null and request.customerName != null and request.customerName !=''">
             and rci.outsourcer_name like concat('%',#{request.customerName},'%')
         </if>
-        <if test="request.applyName != null and request.applyName !=''">
+        <if test="request != null and request.applyName != null and request.applyName !=''">
             and bsei.apply_name like concat('%',#{request.applyName},'%')
         </if>
-        <if test="request.applyTimeStart != null and request.applyTimeStart !=''">
+        <if test="request != null and request.applyTimeStart != null and request.applyTimeStart !=''">
             and bsei.apply_time &gt;= #{request.applyTimeStart}
         </if>
-        <if test="request.applyTimeEnd != null and request.applyTimeEnd !=''">
+        <if test="request != null and request.applyTimeEnd != null and request.applyTimeEnd !=''">
             and bsei.apply_time &lt;= #{request.applyTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml
index 84d9e2a..6bd38a9 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml
@@ -105,6 +105,12 @@
         <if test="request.isUrgent != null and request.isUrgent !=''">
             AND bo.is_urgent = #{request.isUrgent}
         </if>
+        <if test="request.ids != null">
+            and blei.id in
+            <foreach collection="request.ids" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
         ORDER BY blei.update_time DESC
     </select>
 
@@ -137,6 +143,12 @@
         <if test="request.isUrgent != null and request.isUrgent !=''">
             AND bo.is_urgent = #{request.isUrgent}
         </if>
+        <if test="request.ids != null">
+            and blei.id in
+            <foreach collection="request.ids" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
         ORDER BY blei.update_time DESC
     </select>
 
diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardInfoMapper.xml
index 1a5551b..2ed8d17 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardInfoMapper.xml
@@ -45,12 +45,6 @@
         FROM biz_equipment_standard_info besi
         LEFT JOIN biz_equipment_standard_technology_relation bestr ON besi.standard_no = bestr.standard_no
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
-            and besi.approval_status = #{request.approvalStatus}
-        </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
-            and besi.create_user_id = #{request.createUserId}
-        </if>
         <if test="request.standardName != null and request.standardName !=''">
             and besi.standard_name like concat('%',#{request.standardName},'%')
         </if>
diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardTechnologyRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardTechnologyRelationMapper.xml
index fc7e16c..cd03c8c 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardTechnologyRelationMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardTechnologyRelationMapper.xml
@@ -6,6 +6,7 @@
     <resultMap id="BaseResultMap" type="com.casic.missiles.model.equipment.BizEquipmentStandardTechnologyRelation">
         <id column="id" property="id" />
         <result column="technology_file_id" property="technologyFileId" />
+        <result column="technology_file_no" property="technologyFileNo" />
         <result column="technology_file_name" property="technologyFileName" />
         <result column="standard_id" property="standardId" />
         <result column="standard_no" property="standardNo" />
@@ -14,7 +15,7 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, technology_file_id, technology_file_name, standard_id, remark
+        id, technology_file_id, technology_file_no, technology_file_name, standard_id, remark
     </sql>
 
 </mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceAuthorizeOrderMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceAuthorizeOrderMapper.xml
index ac5176c..554fe65 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceAuthorizeOrderMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceAuthorizeOrderMapper.xml
@@ -32,22 +32,22 @@
         SELECT *
         FROM biz_resource_authorize_order
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.orderNo != null and request.orderNo !=''">
+        <if test="request != null and request.orderNo != null and request.orderNo !=''">
             and order_no like concat('%',#{request.orderNo},'%')
         </if>
-        <if test="request.createUserName != null and request.createUserName !=''">
+        <if test="request != null and request.createUserName != null and request.createUserName !=''">
             and create_user_name like concat('%',#{request.createUserName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerExamineFormMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerExamineFormMapper.xml
index ab242f6..af7f98f 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerExamineFormMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerExamineFormMapper.xml
@@ -41,28 +41,28 @@
         SELECT *
         FROM biz_resource_customer_examine_form
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.formNo != null and request.formNo !=''">
+        <if test="request != null and request.formNo != null and request.formNo !=''">
             and form_no like concat('%',#{request.formNo},'%')
         </if>
-        <if test="request.labCode != null and request.labCode !=''">
+        <if test="request != null and request.labCode != null and request.labCode !=''">
             and lab_code like concat('%',#{request.labCode},'%')
         </if>
-        <if test="request.groupCode != null and request.groupCode !=''">
+        <if test="request != null and request.groupCode != null and request.groupCode !=''">
             and group_code like concat('%',#{request.groupCode},'%')
         </if>
-        <if test="request.createUserName != null and request.createUserName !=''">
+        <if test="request != null and request.createUserName != null and request.createUserName !=''">
             and create_user_name like concat('%',#{request.createUserName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerInfoMapper.xml
index fa8ffbc..06a2798 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerInfoMapper.xml
@@ -33,25 +33,25 @@
         SELECT *
         FROM biz_resource_customer_info
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.customerNo != null and request.customerNo !=''">
+        <if test="request != null and request.customerNo != null and request.customerNo !=''">
             and customer_no like concat('%',#{request.customerNo},'%')
         </if>
-        <if test="request.customerName != null and request.customerName !=''">
+        <if test="request != null and request.customerName != null and request.customerName !=''">
             and customer_name like concat('%',#{request.customerName},'%')
         </if>
-        <if test="request.contacts != null and request.contacts !=''">
+        <if test="request != null and request.contacts != null and request.contacts !=''">
             and contacts like concat('%',#{request.contacts},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerSuggestFormMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerSuggestFormMapper.xml
index 28f5bb2..1806662 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerSuggestFormMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerSuggestFormMapper.xml
@@ -33,28 +33,28 @@
         SELECT *
         FROM biz_resource_customer_suggest_form
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.formNo != null and request.formNo !=''">
+        <if test="request != null and request.formNo != null and request.formNo !=''">
             and form_no like concat('%',#{request.formNo},'%')
         </if>
-        <if test="request.customerName != null and request.customerName !=''">
+        <if test="request != null and request.customerName != null and request.customerName !=''">
             and customer_name like concat('%',#{request.customerName},'%')
         </if>
-        <if test="request.customerDeptName != null and request.customerDeptName !=''">
+        <if test="request != null and request.customerDeptName != null and request.customerDeptName !=''">
             and customer_dept_name like concat('%',#{request.customerDeptName},'%')
         </if>
-        <if test="request.createUserName != null and request.createUserName !=''">
+        <if test="request != null and request.createUserName != null and request.createUserName !=''">
             and create_user_name like concat('%',#{request.createUserName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSealUseNoteMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSealUseNoteMapper.xml
index ab37bc1..b02bb33 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSealUseNoteMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSealUseNoteMapper.xml
@@ -29,32 +29,32 @@
     </sql>
 
     <select id="selectBatchForApprovalList" resultMap="BaseResultMap">
-        SELECT *
+        SELECT brsun.*, brsi.seal_name, brsi.seal_type, brsi.approver_name
         FROM biz_resource_seal_use_note brsun
         JOIN biz_resource_seal_info brsi ON brsun.seal_id = brsi.id
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and brsun.approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and brsun.create_user_id = #{request.createUserId}
         </if>
-        <if test="request.sealName != null and request.sealName !=''">
+        <if test="request != null and request.sealName != null and request.sealName !=''">
             and brsi.seal_name like concat('%',#{request.sealName},'%')
         </if>
-        <if test="request.sealType != null and request.sealType !=''">
+        <if test="request != null and request.sealType != null and request.sealType !=''">
             and brsi.seal_type = #{request.sealType}
         </if>
-        <if test="request.applyDeptName != null and request.applyDeptName !=''">
+        <if test="request != null and request.applyDeptName != null and request.applyDeptName !=''">
             and brsun.apply_dept_name like concat('%',#{request.applyDeptName},'%')
         </if>
-        <if test="request.applyUserName != null and request.applyUserName !=''">
+        <if test="request != null and request.applyUserName != null and request.applyUserName !=''">
             and brsun.apply_user_name like concat('%',#{request.applyUserName},'%')
         </if>
-        <if test="request.applyTimeStart != null and request.applyTimeStart !=''">
+        <if test="request != null and request.applyTimeStart != null and request.applyTimeStart !=''">
             and brsun.apply_time &gt;= #{request.applyTimeStart}
         </if>
-        <if test="request.applyTimeEnd != null and request.applyTimeEnd !=''">
+        <if test="request != null and request.applyTimeEnd != null and request.applyTimeEnd !=''">
             and brsun.apply_time &lt;= #{request.applyTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml
index 119bf7d..4f8392a 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml
@@ -31,6 +31,12 @@
         <if test="request.deptName != null and request.deptName !=''">
             and brsi.dept_name like concat('%',#{request.deptName},'%')
         </if>
+        <if test="request.ids != null">
+            and brsv.id in
+            <foreach collection="request.ids" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
         ORDER BY brsv.grant_date DESC
     </select>
 
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSupplierInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSupplierInfoMapper.xml
index fe8d399..e8ce7ef 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSupplierInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSupplierInfoMapper.xml
@@ -48,28 +48,28 @@
         SELECT *
         FROM biz_resource_supplier_info
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.supplierNo != null and request.supplierNo !=''">
+        <if test="request != null and request.supplierNo != null and request.supplierNo !=''">
             and supplier_no like concat('%',#{request.supplierNo},'%')
         </if>
-        <if test="request.supplierName != null and request.supplierName !=''">
+        <if test="request != null and request.supplierName != null and request.supplierName !=''">
             and supplier_name like concat('%',#{request.supplierName},'%')
         </if>
-        <if test="request.director != null and request.director !=''">
+        <if test="request != null and request.director != null and request.director !=''">
             and director like concat('%',#{request.director},'%')
         </if>
-        <if test="request.supplierType != null and request.supplierType !=''">
+        <if test="request != null and request.supplierType != null and request.supplierType !=''">
             and supplier_type = #{request.supplierType}
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/EnvLocationInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/EnvLocationInfoMapper.xml
new file mode 100644
index 0000000..68bcf10
--- /dev/null
+++ b/casic-metering-dao/src/main/resources/mapper/resource/EnvLocationInfoMapper.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.mapper.resource.EnvLocationInfoMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.resource.EnvLocationInfo">
+        <id column="id" property="id" />
+        <result column="location_no" property="locationNo" />
+        <result column="location_name" property="locationName" />
+        <result column="location_position" property="locationPosition" />
+        <result column="create_user_id" property="createUserId" />
+        <result column="create_user" property="createUser" />
+        <result column="create_time" property="createTime" />
+        <result column="update_time" property="updateTime" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, location_no, location_name, location_position, create_user_id, create_user, create_time, update_time
+    </sql>
+
+    <select id="selectLocationListPage" resultType="com.casic.missiles.dto.resource.environment.LocationListResponse">
+        SELECT *
+        FROM env_location_info
+        WHERE 1=1
+        <if test="request.locationNo != null and request.locationNo !=''">
+            AND location_no LIKE concat('%',#{request.locationNo},'%')
+        </if>
+        <if test="request.locationName != null and request.locationName !=''">
+            AND location_name LIKE concat('%',#{request.locationName},'%')
+        </if>
+        ORDER BY create_time DESC
+    </select>
+
+</mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml
index b28c18f..8854047 100644
--- a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml
@@ -11,7 +11,6 @@
         <result column="sign_desc" property="signDesc" />
         <result column="sign_director" property="signDirector" />
         <result column="sign_user_id" property="signUserId" />
-        <result column="sign_type" property="signType" />
         <result column="minio_file_name" property="minioFileName" />
         <result column="create_time" property="createTime" />
         <result column="update_time" property="updateTime" />
@@ -28,7 +27,6 @@
         <result column="sign_name" property="signName" />
         <result column="sign_desc" property="signDesc" />
         <result column="sign_director" property="signDirector" />
-        <result column="sign_type" property="signType" />
         <result column="sign_user_id" property="signUserId" />
         <result column="minio_file_name" property="minioFileName" />
         <result column="create_time" property="createTime" />
@@ -62,4 +60,58 @@
         JOIN system_sign_user_relation ssur ON ss.id = ssur.sign_id
         WHERE ssur.user_id = #{userId}
     </select>
+
+    <select id="selectSignListPage" resultMap="BaseResultMap">
+        SELECT ss.*, sd.SIMPLE_NAME AS deptName
+        FROM system_sign ss
+        LEFT JOIN sys_user su ON su.id = ss.sign_user_id
+        LEFT JOIN sys_dept sd ON sd.id = su.dept_id
+        WHERE 1=1
+        <if test="request.signNo != null and request.signNo !=''">
+            AND ss.sign_no LIKE concat('%',#{request.signNo},'%')
+        </if>
+        <if test="request.signName != null and request.signName !=''">
+            AND ss.sign_name LIKE concat('%',#{request.signName},'%')
+        </if>
+        <if test="request.signDirector != null and request.signDirector !=''">
+            AND ss.sign_director LIKE concat('%',#{request.signDirector},'%')
+        </if>
+        <if test="request.signUserId != null and request.signUserId !=''">
+            AND ss.sign_user_id = #{request.signUserId}
+        </if>
+        <if test="request.createStartTime != null and request.createStartTime !=''">
+            AND DATE_FORMAT(ss.create_time,'%Y-%m-%d') &gt;= DATE_FORMAT(#{request.createStartTime},'%Y-%m-%d')
+        </if>
+        <if test="request.createEndTime != null and request.createEndTime !=''">
+            AND DATE_FORMAT(ss.create_time,'%Y-%m-%d')  &lt;= DATE_FORMAT(#{request.createEndTime},'%Y-%m-%d')
+        </if>
+        ORDER BY ss.create_time DESC
+    </select>
+
+    <select id="selectSignList" resultMap="BaseResultMap">
+        SELECT ss.*, sd.SIMPLE_NAME AS deptName
+        FROM system_sign ss
+        LEFT JOIN sys_user su ON su.id = ss.sign_user_id
+        LEFT JOIN sys_dept sd ON sd.id = su.dept_id
+        WHERE 1=1
+        <if test="request.signNo != null and request.signNo !=''">
+            AND ss.sign_no LIKE concat('%',#{request.signNo},'%')
+        </if>
+        <if test="request.signName != null and request.signName !=''">
+            AND ss.sign_name LIKE concat('%',#{request.signName},'%')
+        </if>
+        <if test="request.signDirector != null and request.signDirector !=''">
+            AND ss.sign_director LIKE concat('%',#{request.signDirector},'%')
+        </if>
+        <if test="request.signUserId != null and request.signUserId !=''">
+            AND ss.sign_user_id = #{request.signUserId}
+        </if>
+        <if test="request.createStartTime != null and request.createStartTime !=''">
+            AND DATE_FORMAT(ss.create_time,'%Y-%m-%d') &gt;= DATE_FORMAT(#{request.createStartTime},'%Y-%m-%d')
+        </if>
+        <if test="request.createEndTime != null and request.createEndTime !=''">
+            AND DATE_FORMAT(ss.create_time,'%Y-%m-%d')  &lt;= DATE_FORMAT(#{request.createEndTime},'%Y-%m-%d')
+        </if>
+        ORDER BY ss.create_time DESC
+    </select>
 </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 515050a..60f530b 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
@@ -47,8 +47,8 @@
     String STORAGE_LOCATION = "bizStorageLocation";
     //计量专业
     String MEASURE_MAJOR = "bizMeasureMajor";
-    //管理状态
-    String MANAGER_STATE = "bizManagerState";
+    //标准装置管理状态
+    String STANDARD_MANAGER_STATE = "bizStandardManagerState";
 
     /**
      * 资源管理 字典code
@@ -95,8 +95,6 @@
     String MEASURE_STATUS = "measureStatus";
     //检定方式
     String MEASURE_TYPE = "measureType";
-    //标识打印标志类型
-    String IDENTIFY_PRINT_TYPE = "bizBusinessIdentify";
     //变更类型
     String REPORT_CHANGE_TYPE = "bizCertChangeType";
     //规模类型
@@ -111,19 +109,24 @@
     String MEASURE_CATEGORY = "measureCategory";
     //检定结果
     String MEASURE_RESULT = "measureResult";
+    //分包原因
+    String OUTSOURCE_REASON = "outsourceReason";
+
+    /**
+     * 系统管理
+     */
+    String TEMPLATE_TYPE = "templateType";
+
 
     /**
      * 标准装置 字典code
      */
     //类别
     String STANDARD_CATEGORY = "standardCategory";
-    //管理状态
-    String STANDARD_MANAGER_STATE = "standardManagerState";
     //标准等级
     String STANDARD_LEVEL = "standardLevel";
     //传递范围
     String STANDARD_TRANSMIT_RANGE = "transmitRange";
-
     //资本来源
     String CAPITAL_SOURCE = "capitalSource";
     //标准装置-申请类型
@@ -148,8 +151,6 @@
     String CERTIFICATE_CLASS = "certificationClass";
     //证书管理-检校专业
     String CALIBRATION_MAJOR = "calibrationMajor";
-    //分包原因
-    String OUTSOURCE_REASON = "outsourceReason";
 
     /**
      * 工作台
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/BaseApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/BaseApprovalListRequest.java
index 73c12c1..80d7424 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/BaseApprovalListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/BaseApprovalListRequest.java
@@ -6,6 +6,7 @@
 
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotEmpty;
+import java.util.List;
 
 /**
  * @Description:
@@ -19,14 +20,14 @@
      * 表单id
      */
     @NotBlank(message = "表单id不能为空")
-    @ApiModelProperty(value = "表单id（流程定义对应的表单id，等价于业务id）", dataType = "String")
+    @ApiModelProperty(value = "表单id（流程定义对应的表单id，等价于业务id），导出接口不用传", dataType = "String")
     private String formId;
 
     /**
      * 审批状态类型，对应ApprovalStatusEnum
      */
     @NotEmpty(message = "审批状态类型不能为空")
-    @ApiModelProperty(value = "审批状态类型code", dataType = "String")
+    @ApiModelProperty(value = "审批状态类型code，导出接口不用传", dataType = "String")
     private String approvalStatus;
 
     @ApiModelProperty(hidden = true)
@@ -34,4 +35,7 @@
 
     @ApiModelProperty(hidden = true)
     private Long createUserId;
+
+    @ApiModelProperty(value = "导出ids", dataType = "List")
+    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificatePrintApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificatePrintApprovalListRequest.java
index b93d1c9..3cc2f4e 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificatePrintApprovalListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificatePrintApprovalListRequest.java
@@ -5,8 +5,6 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import java.util.List;
-
 /**
  * @Description:
  * @Author: wangpeng
@@ -38,7 +36,4 @@
 
     @ApiModelProperty(value = "创建结束时间", dataType = "String")
     private String createTimeEnd;
-
-    @ApiModelProperty(value = "导出ids", dataType = "List")
-    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportApprovalListRequest.java
index 4f7a038..c115847 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportApprovalListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportApprovalListRequest.java
@@ -5,8 +5,6 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import java.util.List;
-
 /**
  * @Description:
  * @Author: wangpeng
@@ -15,6 +13,8 @@
 @ApiModel
 @Data
 public class CertificateReportApprovalListRequest extends BaseApprovalListRequest {
+    @ApiModelProperty(value = "委托方id", dataType = "String")
+    private Long customerId;
 
     @ApiModelProperty(value = "证书报告编号", dataType = "String")
     private String certificateReportNo;
@@ -37,6 +37,4 @@
     @ApiModelProperty(value = "检校结束时间", dataType = "String")
     private String calibrationTimeEnd;
 
-    @ApiModelProperty(value = "导出ids", dataType = "List")
-    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/identify/IdentifyListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/identify/IdentifyListRequest.java
index 1b87ae6..f019203 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/identify/IdentifyListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/identify/IdentifyListRequest.java
@@ -4,6 +4,8 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * @Description:
  * @Author: wangpeng
@@ -26,4 +28,7 @@
 
     @ApiModelProperty(value = "打印结束时间", dataType = "String")
     private String createTimeEnd;
+
+    @ApiModelProperty(value = "导出ids", dataType = "List")
+    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListRequest.java
index 1264883..62415fb 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListRequest.java
@@ -7,6 +7,7 @@
 import lombok.Data;
 
 import javax.validation.constraints.NotBlank;
+import java.util.List;
 
 @Data
 @ApiModel
@@ -37,4 +38,6 @@
     @ApiModelProperty(value = "是否加急（1是0否null全部）", dataType = "Integer")
     private String isUrgent;
 
+    @ApiModelProperty(value = "导出ids", dataType = "List")
+    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListRequest.java
index 5201d7b..499760a 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListRequest.java
@@ -17,6 +17,9 @@
     @ApiModelProperty(value = "任务单编号", dataType = "String")
     private String orderNo;
 
+    @ApiModelProperty(value = "委托方id", dataType = "Long")
+    private Long customerId;
+
     @ApiModelProperty(value = "委托方名称", dataType = "String")
     private String customerName;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OrderSampleDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OrderSampleDTO.java
new file mode 100644
index 0000000..796edc0
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OrderSampleDTO.java
@@ -0,0 +1,19 @@
+package com.casic.missiles.dto.business.outsource;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/8/24 11:38
+ */
+@ApiModel
+@Data
+public class OrderSampleDTO {
+    @ApiModelProperty(value = "任务单id", dataType = "Long")
+    private Long orderId;
+    @ApiModelProperty(value = "受检设备id", dataType = "Long")
+    private Long sampleId;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceAssessApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceAssessApprovalListRequest.java
new file mode 100644
index 0000000..9a930c3
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceAssessApprovalListRequest.java
@@ -0,0 +1,30 @@
+package com.casic.missiles.dto.business.outsource;
+
+import com.casic.missiles.dto.BaseApprovalListRequest;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/8/24 11:01
+ */
+@ApiModel
+@Data
+public class OutsourceAssessApprovalListRequest extends BaseApprovalListRequest {
+    @ApiModelProperty(value = "评审表编号", dataType = "String")
+    private String projectNo;
+
+    @ApiModelProperty(value = "分包机构名称", dataType = "String")
+    private String outsourcerName;
+
+    @ApiModelProperty(value = "申请人", dataType = "String")
+    private String applicantName;
+
+    @ApiModelProperty(value = "申请时间开始", dataType = "String")
+    private String applicantTimeStart;
+
+    @ApiModelProperty(value = "申请时间结束", dataType = "String")
+    private String applicantTimeEnd;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceAssessSaveResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceAssessSaveResponse.java
new file mode 100644
index 0000000..8bf9aad
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceAssessSaveResponse.java
@@ -0,0 +1,20 @@
+package com.casic.missiles.dto.business.outsource;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/8/14 16:17
+ */
+@ApiModel
+@Data
+public class OutsourceAssessSaveResponse {
+    @ApiModelProperty(value = "主键id", dataType = "Long")
+    private Long id;
+
+    @ApiModelProperty(value = "编号", dataType = "String")
+    private String projectNo;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProtocolApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProtocolApprovalListRequest.java
new file mode 100644
index 0000000..0f32331
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProtocolApprovalListRequest.java
@@ -0,0 +1,30 @@
+package com.casic.missiles.dto.business.outsource;
+
+import com.casic.missiles.dto.BaseApprovalListRequest;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/8/24 15:01
+ */
+@ApiModel
+@Data
+public class OutsourceProtocolApprovalListRequest extends BaseApprovalListRequest {
+    @ApiModelProperty(value = "协议书编号", dataType = "String")
+    private String protocolNo;
+
+    @ApiModelProperty(value = "分包方名称", dataType = "String")
+    private String outsourcerName;
+
+    @ApiModelProperty(value = "申请人", dataType = "String")
+    private String applicantName;
+
+    @ApiModelProperty(value = "申请时间开始", dataType = "String")
+    private String applicantTimeStart;
+
+    @ApiModelProperty(value = "申请时间结束", dataType = "String")
+    private String applicantTimeEnd;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProtocolSaveResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProtocolSaveResponse.java
new file mode 100644
index 0000000..e324967
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProtocolSaveResponse.java
@@ -0,0 +1,20 @@
+package com.casic.missiles.dto.business.outsource;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/8/14 16:17
+ */
+@ApiModel
+@Data
+public class OutsourceProtocolSaveResponse {
+    @ApiModelProperty(value = "主键id", dataType = "Long")
+    private Long id;
+
+    @ApiModelProperty(value = "编号", dataType = "String")
+    private String protocolNo;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveApprovalListRequest.java
index f29f4e4..7047c28 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveApprovalListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveApprovalListRequest.java
@@ -5,8 +5,6 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import java.util.List;
-
 /**
  * @Description: 现场检测审批列表请求实体
  * @Author: wangpeng
@@ -30,7 +28,4 @@
     @ApiModelProperty(value = "申请时间结束", dataType = "String")
     private String applyTimeEnd;
 
-    @ApiModelProperty(value = "导出ids", dataType = "List")
-    private List<Long> ids;
-
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveDetailResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveDetailResponse.java
index 1f28752..394c934 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveDetailResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveDetailResponse.java
@@ -12,6 +12,18 @@
     @ApiModelProperty(value = "id，更新/删除使用参数", dataType = "Long")
     private Long id;
 
+    @ApiModelProperty(value = "实验室代码(字典code)", dataType = "String")
+    private String labCode;
+
+    @ApiModelProperty(value = "实验室代码(字典value)", dataType = "String")
+    private String labCodeName;
+
+    @ApiModelProperty(value = "组别代码(字典code)", dataType = "String")
+    private String groupCode;
+
+    @ApiModelProperty(value = "组别代码(字典value)", dataType = "String")
+    private String groupCodeName;
+
     @ApiModelProperty(value = "审批编号", dataType = "String")
     private String siteExecutiveNo;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/environment/LocationListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/environment/LocationListRequest.java
new file mode 100644
index 0000000..13d03c3
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/environment/LocationListRequest.java
@@ -0,0 +1,20 @@
+package com.casic.missiles.dto.resource.environment;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/6/8 13:56
+ */
+@ApiModel
+@Data
+public class LocationListRequest {
+    @ApiModelProperty(value = "地点编号", dataType = "String")
+    private String locationNo;
+
+    @ApiModelProperty(value = "地点名称", dataType = "String")
+    private String locationName;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/environment/LocationListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/environment/LocationListResponse.java
new file mode 100644
index 0000000..4c531af
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/environment/LocationListResponse.java
@@ -0,0 +1,78 @@
+package com.casic.missiles.dto.resource.environment;
+
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
+import com.baomidou.mybatisplus.annotation.TableField;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description: 地点列表响应实体
+ * @Author: wangpeng
+ * @Date: 2023/6/8 13:53
+ */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
+@ApiModel
+@Data
+public class LocationListResponse {
+    @ApiModelProperty(value = "主键id", dataType = "Long")
+    private Long id;
+
+    /**
+     * 地点编号
+     */
+    @ExcelProperty("地点编号")
+    @ApiModelProperty(value = "地点编号", dataType = "String")
+    private String locationNo;
+
+    /**
+     * 地点名称
+     */
+    @ExcelProperty("地点名称")
+    @ApiModelProperty(value = "地点名称", dataType = "String")
+    private String locationName;
+
+    /**
+     * 地点位置
+     */
+    @ExcelProperty("地点位置")
+    @ApiModelProperty(value = "地点位置", dataType = "String")
+    private String locationPosition;
+
+    /**
+     * 创建人id
+     */
+    @ApiModelProperty(value = "创建人id", dataType = "Long")
+    private Long createUserId;
+
+    /**
+     * 创建人
+     */
+    @ExcelProperty("创建人")
+    @ApiModelProperty(value = "创建人", dataType = "String")
+    @TableField("create_user")
+    private String createUser;
+
+    /**
+     * 创建时间
+     */
+    @ExcelProperty("创建时间")
+    @ApiModelProperty(value = "创建时间", dataType = "String")
+    private String createTime;
+
+    /**
+     * 更新时间
+     */
+    @ApiModelProperty(value = "更新时间", dataType = "String")
+    private String updateTime;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertRequest.java
index 9a7f6c6..c827915 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertRequest.java
@@ -4,6 +4,8 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * @Description:
  * @Author: wangpeng
@@ -16,4 +18,7 @@
     private String name;
     @ApiModelProperty(value = "部门名", dataType = "String")
     private String deptName;
+
+    @ApiModelProperty(value = "导出ids", dataType = "List")
+    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertResponse.java
index f78b159..8f2f79e 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertResponse.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.dto.resource.staff;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.casic.missiles.annotation.DictCodeField;
 import com.casic.missiles.constants.MeterDictCode;
 import io.swagger.annotations.ApiModel;
@@ -13,12 +20,18 @@
  * @Author: wangpeng
  * @Date: 2023/7/27 15:13
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @ApiModel
 @Data
 public class StaffCertResponse {
     /**
      * 人员编号
      */
+    @ExcelProperty(value = "人员编号",order = 0)
     @NotEmpty(message = "人员编号不能为空")
     @ApiModelProperty(value = "人员编号", dataType = "String")
     private String staffNo;
@@ -26,6 +39,7 @@
     /**
      * 姓名
      */
+    @ExcelProperty(value = "姓名",order = 1)
     @ApiModelProperty(value = "姓名", dataType = "String")
     private String staffName;
 
@@ -54,6 +68,7 @@
     /**
      * 部门名字
      */
+    @ExcelProperty(value = "工作部门",order = 2)
     @ApiModelProperty(value = "部门名字", dataType = "String")
     private String deptName;
 
@@ -66,6 +81,7 @@
     /**
      * 计量专业
      */
+    @ExcelProperty(value = "计量专业",order = 3)
     @ApiModelProperty(value = "计量专业", dataType = "String")
     private String major;
 
@@ -110,6 +126,7 @@
     /**
      * 证书号
      */
+    @ExcelProperty(value = "证号",order = 4)
     @ApiModelProperty(value = "证书号", dataType = "String")
     private String certNo;
 
@@ -122,12 +139,14 @@
     /**
      * 有效日期
      */
+    @ExcelProperty(value = "证书有效期",order = 6)
     @ApiModelProperty(value = "有效日期", dataType = "String")
     private String effectiveDate;
 
     /**
      * 发放日期
      */
+    @ExcelProperty(value = "发证日期",order = 5)
     @ApiModelProperty(value = "发放日期", dataType = "String")
     private String grantDate;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffListRequest.java
index 7c4afb3..0a1194a 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffListRequest.java
@@ -4,6 +4,8 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * @Description:
  * @Author: wangpeng
@@ -18,4 +20,7 @@
     private String deptName;
     @ApiModelProperty(value = "部门id", dataType = "Long")
     private Long deptId;
+
+    @ApiModelProperty(value = "导出ids", dataType = "List")
+    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/TrainListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/TrainListRequest.java
index f68597b..6321f8b 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/TrainListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/TrainListRequest.java
@@ -14,6 +14,8 @@
 public class TrainListRequest {
     @ApiModelProperty(value = "训练登记表编号", dataType = "String")
     private String trainNo;
+    @ApiModelProperty(value = "值班领导", dataType = "String")
+    private String dutyLeader;
     @ApiModelProperty(value = "创建开始时间", dataType = "String")
     private String createTimeStart;
     @ApiModelProperty(value = "创建结束时间", dataType = "String")
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/SignAddRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/SignAddRequest.java
index 117be34..d71055c 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/SignAddRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/SignAddRequest.java
@@ -43,13 +43,6 @@
     private Long signUserId;
 
     /**
-     * 签章或签名-字典code
-     */
-    @NotBlank(message = "类型不能为空")
-    @ApiModelProperty(value = "签名/签章-字典code", dataType = "String", required = true)
-    private String signType;
-
-    /**
      * minio存储文件名
      */
     @ApiModelProperty(value = "上传文件返回名称", dataType = "String")
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateAddRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateAddRequest.java
index aff1265..6316648 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateAddRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateAddRequest.java
@@ -17,30 +17,28 @@
 @Data
 public class TemplateAddRequest extends BaseSystemRequest {
     /**
-     * 原始记录模板/证书报告模板名称
+     * 模板名称
      */
     @ApiModelProperty(value = "名称", dataType = "String", required = true)
     @NotBlank(message = "名称不能为空")
     private String templateName;
 
     /**
-     * 原始记录模板/证书报告模板描述
+     * 模板描述
      */
     @ApiModelProperty(value = "描述", dataType = "String")
     private String templateDesc;
 
     /**
-     * 原始记录模板/证书报告模板创建人
+     * 创建人
      */
     @ApiModelProperty(value = "创建人", dataType = "String", required = true)
     @NotBlank(message = "创建人不能为空")
     private String templateCreator;
 
-    /**
-     * 原始记录模板/证书报告模板-字典code
-     */
-    @NotBlank(message = "类型不能为空")
-    @ApiModelProperty(value = "原始记录模板/证书报告模板-字典code", dataType = "String", required = true)
+
+    @NotBlank(message = "模板类型不能为空")
+    @ApiModelProperty(value = "模板类型(字典code)", dataType = "String", required = true)
     private String templateType;
 
     /**
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateListRequest.java
index eec5a1e..6d17bbe 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateListRequest.java
@@ -1,11 +1,12 @@
 package com.casic.missiles.dto.system;
 
+import com.casic.missiles.annotation.DictCodeField;
+import com.casic.missiles.constants.MeterDictCode;
 import com.casic.missiles.dto.BaseSystemRequest;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import javax.validation.constraints.NotBlank;
 import java.util.List;
 
 /**
@@ -19,8 +20,8 @@
     /**
      * 类型
      */
-//    @ApiModelProperty(value = "类型-字典code", dataType = "String", required = true)
-    @NotBlank(message = "类型不能为空")
+    @DictCodeField(message = "模板类型不合法", cacheName = MeterDictCode.TEMPLATE_TYPE)
+    @ApiModelProperty(value = "模板类型(字典code)", dataType = "String")
     private String templateType;
 
     /**
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificateChangeApply.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificateChangeApply.java
index 9216308..36923fd 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificateChangeApply.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificateChangeApply.java
@@ -1,11 +1,19 @@
 package com.casic.missiles.model.business;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 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 com.casic.missiles.dto.BaseRequest;
+import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -20,6 +28,12 @@
  * @author wangpeng
  * @since 2023-08-15
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
+@ApiModel
 @Data
 @TableName("biz_business_certificate_change_apply")
 public class BizBusinessCertificateChangeApply extends BaseRequest implements Serializable {
@@ -33,6 +47,7 @@
     /**
      * 申请单编号
      */
+    @ExcelProperty(value = "申请单编号", order = 1)
     @ApiModelProperty(value = "申请单编号", dataType = "String")
     @TableField("change_apply_no")
     private String changeApplyNo;
@@ -40,6 +55,7 @@
     /**
      * 申请单名字
      */
+    @ExcelProperty(value = "申请单名称", order = 2)
     @ApiModelProperty(value = "申请单名字", dataType = "String")
     @TableField("change_apply_name")
     private String changeApplyName;
@@ -54,6 +70,7 @@
     /**
      * 更换证书编号
      */
+    @ExcelProperty(value = "更换证书编号", order = 3)
     @ApiModelProperty(value = "更换证书编号", dataType = "String")
     @TableField("change_report_no")
     private String changeReportNo;
@@ -61,7 +78,8 @@
     /**
      * 更换证书名字
      */
-    @ApiModelProperty(value = "更换证书名字", dataType = "String")
+    @ExcelProperty(value = "更换证书/报告名称", order = 4)
+    @ApiModelProperty(value = "更换证书/报告名称", dataType = "String")
     @TableField("change_report_name")
     private String changeReportName;
 
@@ -73,6 +91,7 @@
     @TableField("change_type")
     private String changeType;
 
+    @ExcelProperty(value = "变更类型", order = 5)
     @ApiModelProperty(value = "变更类型(字典value)", dataType = "String")
     @TableField(exist = false)
     private String changeTypeName;
@@ -142,13 +161,15 @@
     /**
      * 创建用户名字
      */
-    @ApiModelProperty(value = "创建用户名字", dataType = "String")
+    @ExcelProperty(value = "创建人", order = 6)
+    @ApiModelProperty(value = "创建人名字", dataType = "String")
     @TableField("create_user_name")
     private String createUserName;
 
     /**
      * 创建时间
      */
+    @ExcelProperty(value = "创建时间", order = 7)
     @ApiModelProperty(value = "创建时间", dataType = "String")
     @TableField("create_time")
     private String createTime;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificateReport.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificateReport.java
index f01db9e..db06018 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificateReport.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificateReport.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.model.business;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -22,6 +29,11 @@
  * @author wangpeng
  * @since 2023-08-14
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @ApiModel
 @Data
 @TableName("biz_business_certificate_report")
@@ -36,6 +48,7 @@
     /**
      * 证书报告编号
      */
+    @ExcelProperty(value = "证书报告编号", order = 1)
     @ApiModelProperty(value = "证书报告编号", dataType = "String")
     @TableField("certificate_report_no")
     private String certificateReportNo;
@@ -43,6 +56,7 @@
     /**
      * 证书报告名称
      */
+    @ExcelProperty(value = "证书报告名称", order = 2)
     @ApiModelProperty(value = "证书报告名称", dataType = "String")
     @TableField("certificate_report_name")
     private String certificateReportName;
@@ -62,6 +76,7 @@
     @TableField("measure_category")
     private String measureCategory;
 
+    @ExcelProperty(value = "检校类别", order = 6)
     @ApiModelProperty(value = "检校类别(字典value)", dataType = "String")
     @TableField(exist = false)
     private String measureCategoryName;
@@ -69,6 +84,7 @@
     /**
      * 检校时间
      */
+    @ExcelProperty(value = "检校时间", order = 8)
     @ApiModelProperty(value = "检校时间", dataType = "String")
     @TableField("calibration_time")
     private String calibrationTime;
@@ -267,18 +283,22 @@
     @TableField(exist = false)
     private Integer decisionItem;
 
-    @ApiModelProperty(value = "设备样品编号（列表返回参数）", dataType = "String")
+    @ExcelProperty(value = "被检设备统一编号", order = 3)
+    @ApiModelProperty(value = "被检设备统一编号（列表返回参数）", dataType = "String")
     @TableField(exist = false)
     private String sampleNo;
 
-    @ApiModelProperty(value = "设备样品名称（列表返回参数）", dataType = "String")
+    @ExcelProperty(value = "被检设备名称", order = 4)
+    @ApiModelProperty(value = "被检设备名称（列表返回参数）", dataType = "String")
     @TableField(exist = false)
     private String sampleName;
 
-    @ApiModelProperty(value = "设备样品规格型号（列表返回参数）", dataType = "String")
+    @ExcelProperty(value = "规格型号", order = 5)
+    @ApiModelProperty(value = "规格型号（列表返回参数）", dataType = "String")
     @TableField(exist = false)
     private String sampleModel;
 
+    @ExcelProperty(value = "检定员", order = 7)
     @ApiModelProperty(value = "检定员名字（列表返回参数）", dataType = "String")
     @TableField(exist = false)
     private String staffName;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessIdentifyInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessIdentifyInfo.java
index 46bfba5..f1a9bec 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessIdentifyInfo.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessIdentifyInfo.java
@@ -1,10 +1,15 @@
 package com.casic.missiles.model.business;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 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;
 
@@ -20,6 +25,11 @@
  * @author wangpeng
  * @since 2023-08-15
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @Data
 @TableName("biz_business_identify_info")
 public class BizBusinessIdentifyInfo implements Serializable {
@@ -33,6 +43,7 @@
     /**
      * 记录编号
      */
+    @ExcelProperty(value = "记录编号", order = 1)
     @ApiModelProperty(value = "记录编号", dataType = "String")
     @TableField("record_no")
     private String recordNo;
@@ -41,20 +52,15 @@
      * 标志类型(字典code)
      */
     @NotEmpty(message = "标志类型不能为空")
-    @ApiModelProperty(value = "标志类型(字典code)", dataType = "String")
-    @DictCodeField(message = "标志类型不合法", cacheName = MeterDictCode.IDENTIFY_PRINT_TYPE)
+    @ApiModelProperty(value = "标志类型(直接存计量标识/使用状态/校准状态的字典value)", dataType = "String")
     @TableField("identify_type")
     private String identifyType;
 
-    @ApiModelProperty(value = "标志类型(字典value)", dataType = "String")
-    @TableField(exist = false)
-    private String identifyTypeName;
-
     /**
      * 设备id(可以是受检设备/设备台账)
      */
     @NotNull(message = "设备id不能为空")
-    @ApiModelProperty(value = "设备id(可以是受检设备/设备台账)", dataType = "String")
+    @ApiModelProperty(value = "设备id(可以是受检设备/设备台账)", dataType = "Long")
     @TableField("device_id")
     private Long deviceId;
 
@@ -66,29 +72,32 @@
     @TableField("device_type")
     private String deviceType;
 
+    @ExcelProperty(value = "统一编号", order = 3)
     @NotEmpty(message = "设备编号不能为空")
-    @ApiModelProperty(value = "设备编号", dataType = "String")
+    @ApiModelProperty(value = "统一编号", dataType = "String")
     @TableField("device_no")
     private String deviceNo;
 
     /**
      * 设备名字
      */
-    @NotEmpty(message = "设备名字不能为空")
-    @ApiModelProperty(value = "设备名字", dataType = "String")
+    @ExcelProperty(value = "设备名称", order = 4)
+    @NotEmpty(message = "设备名称不能为空")
+    @ApiModelProperty(value = "设备名称", dataType = "String")
     @TableField("device_name")
     private String deviceName;
 
     /**
      * 检定员id
      */
-    @ApiModelProperty(value = "检定员id", dataType = "String")
+    @ApiModelProperty(value = "检定员id", dataType = "Long")
     @TableField("measure_person_id")
     private Long measurePersonId;
 
     /**
      * 检定员名字
      */
+    @ExcelProperty(value = "检定员", order = 5)
     @ApiModelProperty(value = "检定员名字", dataType = "String")
     @TableField("measure_person")
     private String measurePerson;
@@ -103,7 +112,8 @@
     /**
      * 更新时间
      */
-    @ApiModelProperty(value = "更新时间", dataType = "String")
+    @ExcelProperty(value = "打印时间", order = 6)
+    @ApiModelProperty(value = "打印时间", dataType = "String")
     @TableField("update_time")
     private String updateTime;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceAssess.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceAssess.java
index 659d9ca..6720b90 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceAssess.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceAssess.java
@@ -1,11 +1,26 @@
 package com.casic.missiles.model.business;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 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 com.casic.missiles.dto.BaseRequest;
+import com.casic.missiles.dto.business.outsource.OrderSampleDTO;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import javax.validation.constraints.NotEmpty;
 import java.io.Serializable;
+import java.util.List;
 
 /**
  * <p>
@@ -15,146 +30,231 @@
  * @author wangpeng
  * @since 2023-08-16
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
+@ApiModel
 @Data
 @TableName("biz_business_outsource_assess")
-public class BizBusinessOutsourceAssess implements Serializable {
+public class BizBusinessOutsourceAssess extends BaseRequest implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
+    @ApiModelProperty(value = "id，更新/删除使用参数", dataType = "Long")
     @TableId("id")
     private Long id;
 
     /**
      * 评审表编号
      */
+    @ExcelProperty(value = "评审表编号", order = 1)
+    @ApiModelProperty(value = "评审表编号(后台生成)", dataType = "String")
     @TableField("project_no")
     private String projectNo;
 
     /**
      * 评审表名称
      */
+    @ExcelProperty(value = "评审表名称", order = 2)
+    @ApiModelProperty(value = "评审表名称", dataType = "String")
     @TableField("project_name")
     private String projectName;
 
+    @NotEmpty(message = "实验室代码不能为空")
+    @DictCodeField(message = "实验室代码描述不合法", cacheName = MeterDictCode.LAB_CODE)
+    @ApiModelProperty(value = "实验室代码(字典code)", dataType = "String")
+    @TableField("lab_code")
+    private String labCode;
+
+    @ApiModelProperty(value = "实验室代码(字典value)", dataType = "String")
+    @TableField(exist = false)
+    private String labCodeName;
+
+    /**
+     * 组别代码
+     */
+    @NotEmpty(message = "组别代码不能为空")
+    @DictCodeField(message = "组别代码描述不合法", cacheName = MeterDictCode.GROUP_CODE)
+    @ApiModelProperty(value = "组别代码(字典code)", dataType = "String")
+    @TableField("group_code")
+    private String groupCode;
+
+    @ApiModelProperty(value = "组别代码(字典value)", dataType = "String")
+    @TableField(exist = false)
+    private String groupCodeName;
+
     /**
      * 申请人id
      */
+    @ApiModelProperty(value = "申请人id", dataType = "String")
     @TableField("applicant_id")
     private Long applicantId;
 
     /**
      * 申请人名字
      */
+    @ExcelProperty(value = "申请人", order = 5)
+    @ApiModelProperty(value = "申请人", dataType = "String")
     @TableField("applicant_name")
     private String applicantName;
 
     /**
      * 申请时间
      */
+    @ExcelProperty(value = "申请时间", order = 6)
+    @ApiModelProperty(value = "申请时间", dataType = "String")
     @TableField("applicant_time")
     private String applicantTime;
 
     /**
      * 附件(minio存储文件名)
      */
+    @ApiModelProperty(value = "附件(minio存储文件名)", dataType = "String")
     @TableField("minio_file_name")
     private String minioFileName;
 
     /**
      * 备注
      */
+    @ApiModelProperty(value = "备注", dataType = "String")
     @TableField("remark")
     private String remark;
 
     /**
      * 创建人id
      */
+    @ApiModelProperty(value = "创建人id", dataType = "String")
     @TableField("create_user_id")
     private Long createUserId;
 
     /**
      * 创建人名字
      */
+    @ApiModelProperty(value = "创建人名字", dataType = "String")
     @TableField("create_user_name")
     private String createUserName;
 
     /**
      * 分包方id
      */
+    @ApiModelProperty(value = "评审表编号", dataType = "String")
     @TableField("outsourcer_id")
     private Long outsourcerId;
 
     /**
      * 预计开始时间
      */
+    @ApiModelProperty(value = "预计开始时间", dataType = "String")
     @TableField("pre_start_time")
     private String preStartTime;
 
     /**
      * 预计结束时间
      */
+    @ApiModelProperty(value = "预计结束时间", dataType = "String")
     @TableField("pre_end_time")
     private String preEndTime;
 
     /**
      * 分包原因-字典
      */
+    @ApiModelProperty(value = "分包原因(字典code)", dataType = "String")
+    @DictCodeField(message = "分包原因描述不合法", cacheName = MeterDictCode.OUTSOURCE_REASON)
     @TableField("outsource_reason")
     private String outsourceReason;
 
+    @ApiModelProperty(value = "分包原因(字典value)", dataType = "String")
+    @TableField(exist = false)
+    private String outsourceReasonName;
+
     /**
      * 预计费用
      */
+    @ApiModelProperty(value = "预计费用", dataType = "String")
     @TableField("pre_cost")
     private String preCost;
 
     /**
      * 审批状态
      */
+    @ApiModelProperty(value = "审批状态", dataType = "String")
+    @DictCodeField(message = "审批状态描述不合法", cacheName = MeterDictCode.APPROVAL_STATUS)
     @TableField("approval_status")
     private String approvalStatus;
 
     /**
      * 流程实例id
      */
+    @ApiModelProperty(value = "流程实例id", dataType = "String")
     @TableField("process_id")
     private String processId;
 
     /**
      * 实验室认可情况
      */
+    @ApiModelProperty(value = "实验室认可情况", dataType = "String")
     @TableField("approve_situation")
     private String approveSituation;
 
     /**
      * 溯源性
      */
+    @ApiModelProperty(value = "溯源性", dataType = "String")
     @TableField("traceability")
     private String traceability;
 
     /**
      * 测试方法
      */
+    @ApiModelProperty(value = "测试方法", dataType = "String")
     @TableField("test_method")
     private String testMethod;
 
     /**
      * 技术能力
      */
+    @ApiModelProperty(value = "技术能力", dataType = "String")
     @TableField("technique_ability")
     private String techniqueAbility;
 
     /**
      * 创建时间
      */
+    @ApiModelProperty(hidden = true)
     @TableField("create_time")
     private String createTime;
 
     /**
      * 更新时间
      */
+    @ApiModelProperty(hidden = true)
     @TableField("update_time")
     private String updateTime;
 
+    @ApiModelProperty(value = "审批状态类型-字典value", dataType = "String")
+    @TableField(exist = false)
+    private String approvalStatusName;
 
+    @ApiModelProperty(value = "任务id（同意、驳回等操作使用）", dataType = "String")
+    @TableField(exist = false)
+    private String taskId;
+
+    @ApiModelProperty(value = "可选决策项（1同意驳回拒绝 2同意驳回 3同意拒绝，用于待审批列表同意/驳回/拒绝按钮展示）", dataType = "Integer")
+    @TableField(exist = false)
+    private Integer decisionItem;
+
+    @NotEmpty(message = "受检设备信息不能为空")
+    @ApiModelProperty(value = "受检设备id列表（新建使用参数）", dataType = "List")
+    @TableField(exist = false)
+    private List<OrderSampleDTO> orderSampleList;
+
+    @ExcelProperty(value = "分包机构名称", order = 3)
+    @ApiModelProperty(value = "分包机构名称（列表返回参数）", dataType = "String")
+    private String outsourcerName;
+
+    @ExcelProperty(value = "机构负责人", order = 4)
+    @ApiModelProperty(value = "机构负责人（列表返回参数）", dataType = "String")
+    private String director;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceProtocol.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceProtocol.java
new file mode 100644
index 0000000..38df697
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceProtocol.java
@@ -0,0 +1,225 @@
+package com.casic.missiles.model.business;
+
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
+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 com.casic.missiles.dto.BaseRequest;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotEmpty;
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 计量检定业务-分包管理-测试、校准或检定工作分包协议书
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-08-24
+ */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
+@Data
+@TableName("biz_business_outsource_protocol")
+public class BizBusinessOutsourceProtocol extends BaseRequest implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "id，更新/删除使用参数", dataType = "Long")
+    @TableId("id")
+    private Long id;
+
+    /**
+     * 协议书编号
+     */
+    @ExcelProperty(value = "协议书编号", order = 1)
+    @ApiModelProperty(value = "协议书编号(后台生成)", dataType = "String")
+    @TableField("protocol_no")
+    private String protocolNo;
+
+    /**
+     * 协议书名称
+     */
+    @ExcelProperty(value = "协议书名称", order = 2)
+    @ApiModelProperty(value = "协议书名称", dataType = "String")
+    @TableField("project_name")
+    private String projectName;
+
+    @NotEmpty(message = "实验室代码不能为空")
+    @DictCodeField(message = "实验室代码描述不合法", cacheName = MeterDictCode.LAB_CODE)
+    @ApiModelProperty(value = "实验室代码(字典code)", dataType = "String")
+    @TableField("lab_code")
+    private String labCode;
+
+    @ApiModelProperty(value = "实验室代码(字典value)", dataType = "String")
+    @TableField(exist = false)
+    private String labCodeName;
+
+    @NotEmpty(message = "组别代码不能为空")
+    @DictCodeField(message = "组别代码描述不合法", cacheName = MeterDictCode.GROUP_CODE)
+    @ApiModelProperty(value = "组别代码(字典code)", dataType = "String")
+    @TableField("group_code")
+    private String groupCode;
+
+    @ApiModelProperty(value = "组别代码(字典value)", dataType = "String")
+    @TableField(exist = false)
+    private String groupCodeName;
+
+    /**
+     * 分包方id
+     */
+    @ApiModelProperty(value = "分包方id", dataType = "Long")
+    @TableField("outsourcer_id")
+    private Long outsourcerId;
+
+    /**
+     * 其他
+     */
+    @ApiModelProperty(value = "其他", dataType = "String")
+    @TableField("remark")
+    private String remark;
+
+    /**
+     * 分包方编号
+     */
+    @ApiModelProperty(value = "分包方编号(新建不用传)", dataType = "String")
+    @TableField("outsource_no")
+    private String outsourceNo;
+
+    /**
+     * 分包方名称
+     */
+    @ExcelProperty(value = "分包方名称", order = 3)
+    @ApiModelProperty(value = "分包方名称(新建不用传)", dataType = "String")
+    @TableField("outsource_name")
+    private String outsourceName;
+
+    /**
+     * 联系人
+     */
+    @ExcelProperty(value = "联系人", order = 4)
+    @ApiModelProperty(value = "联系人", dataType = "String")
+    @TableField("contacts")
+    private String contacts;
+
+    /**
+     * 电话
+     */
+    @ApiModelProperty(value = "电话", dataType = "String")
+    @TableField("mobile")
+    private String mobile;
+
+    /**
+     * 地址
+     */
+    @ApiModelProperty(value = "地址", dataType = "String")
+    @TableField("address")
+    private String address;
+
+    /**
+     * 要求完成日期
+     */
+    @ApiModelProperty(value = "要求完成日期", dataType = "String")
+    @TableField("require_date")
+    private String requireDate;
+
+    /**
+     * 分包费用(元)
+     */
+    @ApiModelProperty(value = "分包费用(元)", dataType = "String")
+    @TableField("outsource_cost")
+    private Double outsourceCost;
+
+    /**
+     * 分包方负责人
+     */
+    @ApiModelProperty(value = "分包方负责人", dataType = "String")
+    @TableField("director")
+    private String director;
+
+    /**
+     * 分包项目
+     */
+    @ApiModelProperty(value = "分包项目", dataType = "String")
+    @TableField("item")
+    private String item;
+
+    /**
+     * 分包要求
+     */
+    @ApiModelProperty(value = "分包要求", dataType = "String")
+    @TableField("requires")
+    private String requires;
+
+    /**
+     * 创建人id
+     */
+    @ApiModelProperty(hidden = true)
+    @TableField("create_user_id")
+    private Long createUserId;
+
+    /**
+     * 创建人名字
+     */
+    @ExcelProperty(value = "申请人", order = 5)
+    @ApiModelProperty(value = "申请人", dataType = "String")
+    @TableField("create_user_name")
+    private String createUserName;
+
+    /**
+     * 审批状态
+     */
+    @ApiModelProperty(value = "审批状态", dataType = "String")
+    @DictCodeField(message = "审批状态描述不合法", cacheName = MeterDictCode.APPROVAL_STATUS)
+    @TableField("approval_status")
+    private String approvalStatus;
+
+    /**
+     * 流程实例id
+     */
+    @ApiModelProperty(value = "流程实例id", dataType = "String")
+    @TableField("process_id")
+    private String processId;
+
+    /**
+     * 创建时间
+     */
+    @ExcelProperty(value = "申请时间", order = 6)
+    @ApiModelProperty(value = "申请时间", dataType = "String")
+    @TableField("create_time")
+    private String createTime;
+
+    /**
+     * 更新时间
+     */
+    @ApiModelProperty(hidden = true)
+    @TableField("update_time")
+    private String updateTime;
+
+    @ApiModelProperty(value = "审批状态类型-字典value", dataType = "String")
+    @TableField(exist = false)
+    private String approvalStatusName;
+
+    @ApiModelProperty(value = "任务id（同意、驳回等操作使用）", dataType = "String")
+    @TableField(exist = false)
+    private String taskId;
+
+    @ApiModelProperty(value = "可选决策项（1同意驳回拒绝 2同意驳回 3同意拒绝，用于待审批列表同意/驳回/拒绝按钮展示）", dataType = "Integer")
+    @TableField(exist = false)
+    private Integer decisionItem;
+
+
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourcerInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourcerInfo.java
index ec4e997..f9aa69e 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourcerInfo.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourcerInfo.java
@@ -17,6 +17,7 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import javax.validation.constraints.NotEmpty;
 import java.io.Serializable;
 
 /**
@@ -59,6 +60,29 @@
     @TableField("outsourcer_name")
     private String outsourcerName;
 
+    @NotEmpty(message = "实验室代码不能为空")
+    @DictCodeField(message = "实验室代码描述不合法", cacheName = MeterDictCode.LAB_CODE)
+    @ApiModelProperty(value = "实验室代码(字典code)", dataType = "String")
+    @TableField("lab_code")
+    private String labCode;
+
+    @ApiModelProperty(value = "实验室代码(字典value)", dataType = "String")
+    @TableField(exist = false)
+    private String labCodeName;
+
+    /**
+     * 组别代码
+     */
+    @NotEmpty(message = "组别代码不能为空")
+    @DictCodeField(message = "组别代码描述不合法", cacheName = MeterDictCode.GROUP_CODE)
+    @ApiModelProperty(value = "组别代码(字典code)", dataType = "String")
+    @TableField("group_code")
+    private String groupCode;
+
+    @ApiModelProperty(value = "组别代码(字典value)", dataType = "String")
+    @TableField(exist = false)
+    private String groupCodeName;
+
     /**
      * 单位简称
      */

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java
index bb0c50f..13a699b 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java
@@ -12,6 +12,7 @@
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.IGeneralApprovalService;
+import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
@@ -19,6 +20,7 @@
 import org.springframework.web.bind.annotation.RequestBody;
 
 import javax.validation.Valid;
+import java.util.List;
 import java.util.Objects;
 
 /**
@@ -117,4 +119,17 @@
         }
         return baseApprovalService.failUpdate(request);
     }
+
+    public List<O> exportList(@RequestBody @Valid R request) throws Exception {
+        List<O> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = baseApprovalService.listExportByIds(request.getIds());
+        } else {
+            list = baseApprovalService.listExport(request);
+        }
+        for (O record : list) {
+            DictCodeUtils.convertDictCodeToName(record);
+        }
+        return list;
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java
index 8a90961..d775831 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java
@@ -5,6 +5,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.business.certificate.CertificateChangeApplyApprovalListRequest;
 import com.casic.missiles.dto.business.certificate.CertificateChangeApplySaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessCertificateChangeApply;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
@@ -20,6 +21,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -48,4 +50,12 @@
         }
         return changeApplyService.saveChangeApply(request);
     }
+
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody CertificateChangeApplyApprovalListRequest request) throws Exception {
+        List<BizBusinessCertificateChangeApply> list = super.exportList(request);
+        super.exportExcel(BizBusinessCertificateChangeApply.class, list, ExportEnum.CERTIFICATE_CHANGE_APPLY.getSheetName());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java
index 5fc4b07..af8230e 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java
@@ -9,6 +9,7 @@
 import com.casic.missiles.dto.business.certificate.CertificatePrintApprovalListRequest;
 import com.casic.missiles.dto.business.certificate.CertificatePrintListResponse;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.enums.business.CertificatePrintStatusEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessCertificatePrintLog;
@@ -18,10 +19,16 @@
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.io.IOException;
+import java.util.List;
 import java.util.Objects;
 
 /**
@@ -98,4 +105,16 @@
         });
         return certificatePrintService.certificatePrintLog(idDTO.getId());
     }
+
+    @ApiOperation("证书打印审批导出")
+    @PostMapping("/listExport")
+    public void exportList(@RequestBody CertificatePrintApprovalListRequest request) throws IOException {
+        List<CertificatePrintListResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = certificatePrintService.listByIds(request.getIds());
+        } else {
+            list = certificatePrintService.list(request);
+        }
+        super.exportExcel(CertificatePrintListResponse.class, list, ExportEnum.CERTIFICATE_PRINT.getSheetName());
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java
index 63b06dc..6b2efd5 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java
@@ -6,6 +6,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.business.certificate.CertificateReportApprovalListRequest;
 import com.casic.missiles.dto.business.certificate.CertificateReportSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessCertificateReport;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
@@ -21,6 +22,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -50,7 +52,7 @@
         return certificateReportService.saveCertificateReport(request);
     }
 
-    @ApiOperation("证书审批详情（基本信息）")
+    @ApiOperation("详情（基本信息）")
     @PostMapping("/detail")
     public ReturnDTO<BizBusinessCertificateReport> detail(@RequestBody @Valid BaseDetailRequest request, BindingResult bindingResult) throws Exception {
         if(bindingResult.hasErrors()){
@@ -59,4 +61,11 @@
         return certificateReportService.detail(request);
     }
 
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody CertificateReportApprovalListRequest request) throws Exception {
+        List<BizBusinessCertificateReport> list = super.exportList(request);
+        super.exportExcel(BizBusinessCertificateReport.class, list, ExportEnum.CERTIFICATE_REPORT.getSheetName());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java
index 46b26bd..57c0809 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java
@@ -10,20 +10,21 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.business.identify.IdentifyListRequest;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessIdentifyInfo;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.business.IBizBusinessIdentifyInfoService;
+import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import javax.validation.Valid;
+import java.util.List;
 import java.util.Objects;
 
 /**
@@ -57,16 +58,13 @@
         return identifyInfoService.addIdentify(identifyInfo);
     }
 
-    @ApiOperation("标识打印更新")
+    @ApiOperation("标识打印更新（更新打印时间）")
     @PostMapping("/update")
-    public ReturnDTO updateIdentify(@RequestBody @Valid BizBusinessIdentifyInfo identifyInfo, BindingResult bindingResult) {
-        Assert.isFalse(Objects.isNull(identifyInfo.getId()), () -> {
+    public ReturnDTO updateIdentify(@RequestBody @Valid IdDTO idDTO) {
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        Assert.isFalse(bindingResult.hasErrors(), () -> {
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        });
-        return identifyInfoService.updateIdentify(identifyInfo);
+        return identifyInfoService.updateIdentify(idDTO.getId());
     }
 
     @ApiOperation("标识打印删除")
@@ -77,4 +75,37 @@
         });
         return identifyInfoService.deleteIdentify(idDTO.getId());
     }
+
+    @ApiOperation("标识打印导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody @Valid IdentifyListRequest request, BindingResult bindingResult) throws Exception {
+        if (bindingResult.hasErrors()) {
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        List<BizBusinessIdentifyInfo> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = identifyInfoService.listByIds(request.getIds());
+        } else {
+            list = identifyInfoService.list(request);
+        }
+        for (BizBusinessIdentifyInfo record : list) {
+            DictCodeUtils.convertDictCodeToName(record);
+        }
+        super.exportExcel(BizBusinessIdentifyInfo.class, list, ExportEnum.IDENTIFY_EXPORT.getSheetName());
+    }
+
+
+    // TODO: 2023/8/23 查询设备信息，4个底部按钮查设备（按钮的作用就是前端用来调不同接口、用来区分中间即将展示的标识），前端弹窗选设备，在确定保存时前端根据底部按钮判断传入设备类型deviceType字典code
+    // TODO: 2023/8/23 接口：查受检设备（第1个按钮），查设备台账（后3个按钮同一接口），查询之后前端根据标志类型的不同加到中间页面时进行判断（按产品给的对应表）
+    // TODO: 2023/8/23 提供二维码接口，前端在加到中间页面时调用一下
+
+    @ApiOperation("设备二维码")
+    @PostMapping("/equipment/qrCode")
+    public ReturnDTO<String> equipmentQrCode(@RequestBody @Valid IdDTO idDTO) {
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return identifyInfoService.equipmentQrCode(idDTO.getId());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java
index 707be6e..7e0453d 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java
@@ -117,7 +117,7 @@
     }
 
     @ApiOperation("任务单导出")
-    @PostMapping("/export")
+    @PostMapping("/listExport")
     public void orderExport(@RequestBody @Valid OrderListRequest request, HttpServletResponse response) {
         businessOrderService.orderExport(request, response);
     }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java
index 529a6ce..51432be 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java
@@ -1,9 +1,28 @@
 package com.casic.missiles.controller.business;
 
+import com.casic.missiles.controller.GeneralApprovalController;
+import com.casic.missiles.dto.BaseApprovalSubmitRequest;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.business.outsource.OutsourceAssessApprovalListRequest;
+import com.casic.missiles.dto.business.outsource.OutsourceAssessSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
+import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.model.business.BizBusinessOutsourceAssess;
+import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
+import com.casic.missiles.service.IGeneralApprovalService;
+import com.casic.missiles.service.business.IBizBusinessOutsourceAssessService;
 import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.BindingResult;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.validation.Valid;
+import java.util.List;
+
 /**
  * <p>
  * 计量检定业务-分包管理-测试、校准或检定工作分包评审表 前端控制器
@@ -15,6 +34,27 @@
 @Api(tags = "分包管理-测试、校准或检定工作分包评审表")
 @RestController
 @RequestMapping("/business/outsource/assess")
-public class BizBusinessOutsourceAssessController {
+public class BizBusinessOutsourceAssessController extends GeneralApprovalController<BizBusinessOutsourceAssess, BizBusinessOutsourceAssess, OutsourceAssessApprovalListRequest, BaseApprovalSubmitRequest> {
+    @Autowired
+    private IBizBusinessOutsourceAssessService outsourceAssessService;
 
+    public BizBusinessOutsourceAssessController(IGeneralApprovalService<BizBusinessOutsourceAssess, BizBusinessOutsourceAssess, OutsourceAssessApprovalListRequest, BaseApprovalSubmitRequest> baseApprovalService) {
+        super(baseApprovalService);
+    }
+
+    @ApiOperation("草稿箱-保存")
+    @PostMapping("/save")
+    public ReturnDTO<OutsourceAssessSaveResponse> saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceAssess request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        return outsourceAssessService.saveOutsourceAssess(request);
+    }
+
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception {
+        List<BizBusinessOutsourceAssess> list = super.exportList(request);
+        super.exportExcel(BizBusinessOutsourceAssess.class, list, ExportEnum.OUTSOURCE_ASSESS.getSheetName());
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java
new file mode 100644
index 0000000..9adef18
--- /dev/null
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java
@@ -0,0 +1,60 @@
+package com.casic.missiles.controller.business;
+
+import com.casic.missiles.controller.GeneralApprovalController;
+import com.casic.missiles.dto.BaseApprovalSubmitRequest;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.business.outsource.OutsourceProtocolApprovalListRequest;
+import com.casic.missiles.dto.business.outsource.OutsourceProtocolSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
+import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.model.business.BizBusinessOutsourceProtocol;
+import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
+import com.casic.missiles.service.IGeneralApprovalService;
+import com.casic.missiles.service.business.IBizBusinessOutsourceProtocolService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.BindingResult;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.validation.Valid;
+import java.util.List;
+
+/**
+ * <p>
+ * 计量检定业务-分包管理-测试、校准或检定工作分包协议书 前端控制器
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-08-24
+ */
+@Api(tags = "分包管理-测试、校准或检定工作分包协议书")
+@RestController
+@RequestMapping("/business/outsource/protocol")
+public class BizBusinessOutsourceProtocolController extends GeneralApprovalController<BizBusinessOutsourceProtocol, BizBusinessOutsourceProtocol, OutsourceProtocolApprovalListRequest, BaseApprovalSubmitRequest> {
+    @Autowired
+    private IBizBusinessOutsourceProtocolService outsourceProtocolService;
+
+    public BizBusinessOutsourceProtocolController(IGeneralApprovalService<BizBusinessOutsourceProtocol, BizBusinessOutsourceProtocol, OutsourceProtocolApprovalListRequest, BaseApprovalSubmitRequest> baseApprovalService) {
+        super(baseApprovalService);
+    }
+
+    @ApiOperation("草稿箱-保存")
+    @PostMapping("/save")
+    public ReturnDTO<OutsourceProtocolSaveResponse> saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceProtocol request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        return outsourceProtocolService.saveOutsourceProtocol(request);
+    }
+
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody OutsourceProtocolApprovalListRequest request) throws Exception {
+        List<BizBusinessOutsourceProtocol> list = super.exportList(request);
+        super.exportExcel(BizBusinessOutsourceProtocol.class, list, ExportEnum.OUTSOURCE_PROTOCOL.getSheetName());
+    }
+}
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java
index 097f645..f0f0943 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java
@@ -17,7 +17,6 @@
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.IGeneralApprovalService;
 import com.casic.missiles.service.business.IBizBusinessOutsourcerInfoService;
-import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -71,19 +70,8 @@
 
     @ApiOperation("分包方导出")
     @PostMapping("/listExport")
-    public void export(@RequestBody @Valid OutsourcerInfoApprovalListRequest request, BindingResult bindingResult) throws Exception {
-        if (bindingResult.hasErrors()) {
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        }
-        List<BizBusinessOutsourcerInfo> list;
-        if (!CollectionUtils.isEmpty(request.getIds())) {
-            list = outsourcerInfoService.listByIds(request.getIds());
-        } else {
-            list = outsourcerInfoService.list(request);
-        }
-        for (BizBusinessOutsourcerInfo record : list) {
-            DictCodeUtils.convertDictCodeToName(record);
-        }
+    public void export(@RequestBody OutsourcerInfoApprovalListRequest request) throws Exception {
+        List<BizBusinessOutsourcerInfo> list = super.exportList(request);
         super.exportExcel(BizBusinessOutsourcerInfo.class, list, ExportEnum.OUTSOURCER_EXPORT.getSheetName());
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java
index c2cbf9f..0410918 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java
@@ -17,11 +17,9 @@
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.IGeneralApprovalService;
 import com.casic.missiles.service.business.IBizBusinessSiteExecutiveInfoService;
-import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -60,7 +58,7 @@
         return siteExecutiveInfoService.saveSiteExecutiveInfo(siteExecutiveInfo);
     }
 
-    @ApiOperation("现场检测详情")
+    @ApiOperation("详情")
     @PostMapping("/detail")
     public ReturnDTO<SiteExecutiveDetailResponse> siteExecutiveDetail(@RequestBody @Valid IdDTO idDTO) throws Exception {
         Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
@@ -69,21 +67,10 @@
         return ReturnUtil.success(siteExecutiveInfoService.detail(idDTO.getId()));
     }
 
-    @ApiOperation("现场检测导出")
+    @ApiOperation("导出")
     @PostMapping("/listExport")
-    public void export(@RequestBody @Valid SiteExecutiveApprovalListRequest request, BindingResult bindingResult) throws Exception {
-        if (bindingResult.hasErrors()) {
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        }
-        List<SiteExecutiveApprovalListResponse> list;
-        if (!CollectionUtils.isEmpty(request.getIds())) {
-            list = siteExecutiveInfoService.listInfoByIds(request.getIds());
-        } else {
-            list = siteExecutiveInfoService.listInfo(request);
-        }
-        for (SiteExecutiveApprovalListResponse record : list) {
-            DictCodeUtils.convertDictCodeToName(record);
-        }
+    public void export(@RequestBody SiteExecutiveApprovalListRequest request) throws Exception {
+        List<SiteExecutiveApprovalListResponse> list = super.exportList(request);
         super.exportExcel(SiteExecutiveApprovalListResponse.class, list, ExportEnum.SITE_EXECUTIVE_EXPORT.getSheetName());
     }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
index 7e793cd..a92e209 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
@@ -55,7 +55,7 @@
 
     @ApiOperation("设备收发列表导出")
     @PostMapping("/export")
-    public void exportList(@RequestBody @Valid SampleDispatchListRequest request) throws IOException {
+    public void exportList(@RequestBody SampleDispatchListRequest request) throws IOException {
         List<SampleDispatchListResponse> list;
         if (!CollectionUtils.isEmpty(request.getIds())) {
             list = dispatchService.listByIds(request.getIds());
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java
index cdc77fc..d120fd4 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java
@@ -7,6 +7,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.business.labExecutive.*;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.business.IBusinessLabExecutiveInfoService;
@@ -14,6 +15,7 @@
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.*;
 
@@ -32,7 +34,7 @@
     @Autowired
     private IBusinessLabExecutiveInfoService labExecutiveInfoService;
 
-    @ApiOperation("实验室检测-部门检测-查询各状态列表（待检测、检测中、检测完）")
+    @ApiOperation("实验室任务-查询各状态列表（待检测、检测中、检测完）")
     @PostMapping("/deptExecutive/List")
     public ReturnDTO<PageInfoBT<SampleLabExecutiveListResponse>> queryDeptExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
@@ -43,10 +45,19 @@
         return ReturnUtil.success(super.packForBT(labExecutiveInfoService.deptLabExecutiveListPage(page, labExecutiveListRequest)));
     }
 
-    /**
-     * 实验室检测-我的检测-查询各状态列表（待检测、检测中、检测完）
-     */
-    @ApiOperation("实验室检测-我的检测-查询各状态列表（待检测、检测中、检测完）")
+    @ApiOperation("实验室任务导出")
+    @PostMapping("/deptExecutive/export")
+    public void deptExportList(@RequestBody @Valid SampleLabExecutiveListRequest request) throws Exception {
+        List<SampleLabExecutiveListResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = labExecutiveInfoService.deptLabExecutiveListByIds(request.getMeasureStatus(), request.getIds());
+        } else {
+            list = labExecutiveInfoService.deptLabExecutiveList(request);
+        }
+        super.exportExcel(SampleLabExecutiveListResponse.class, list, ExportEnum.DEPT_EXECUTIVE_TASK.getSheetName());
+    }
+
+    @ApiOperation("我的任务-查询各状态列表（待检测、检测中、检测完）")
     @PostMapping("/myExecutive/list")
     public ReturnDTO<PageInfoBT<SampleLabExecutiveListResponse>> queryMyExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
@@ -57,19 +68,25 @@
         return ReturnUtil.success(super.packForBT(labExecutiveInfoService.myLabExecutiveListPage(page, labExecutiveListRequest)));
     }
 
-    /**
-     * 实验室检测-我的检测-查询各状态样品数量（待检测、检测中、检测完）
-     */
-    @ApiOperation("实验室检测-我的检测-查询各状态样品数量（待检测、检测中、检测完）")
+    @ApiOperation("我的任务导出")
+    @PostMapping("/myExecutive/export")
+    public void exportList(@RequestBody @Valid SampleLabExecutiveListRequest request) throws Exception {
+        List<SampleLabExecutiveListResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = labExecutiveInfoService.myLabExecutiveListByIds(request.getMeasureStatus(), request.getIds());
+        } else {
+            list = labExecutiveInfoService.myLabExecutiveList(request);
+        }
+        super.exportExcel(SampleLabExecutiveListResponse.class, list, ExportEnum.MY_EXECUTIVE_TASK.getSheetName());
+    }
+
+    @ApiOperation("我的任务-查询各状态样品数量（待检测、检测中、检测完）")
     @GetMapping("/myExecutive/amount")
     public ReturnDTO<List<SampleAmountResponse>> queryMyExecutiveAmount() {
         return ReturnUtil.success(labExecutiveInfoService.myExecutiveAmount());
     }
 
-    /**
-     * 实验室检测-部门检测-分配（分配给具体人员）
-     */
-    @ApiOperation("实验室检测-部门检测-分配按钮（分配给具体人员）")
+    @ApiOperation("实验室任务-分配按钮（分配给具体人员）")
     @PostMapping("/deptExecutive/allocate")
     public ReturnDTO allocateStaff(@RequestBody @Valid SampleAllocateRequest sampleAllocateRequest, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -78,10 +95,7 @@
         return labExecutiveInfoService.allocateStaff(sampleAllocateRequest);
     }
 
-    /**
-     * 实验室检测-我的检测-检定人扫描收入（待检测->检测中）
-     */
-    @ApiOperation("实验室检测-我的检测-检定人扫描收入（待检测->检测中）")
+    @ApiOperation("我的任务-检定人扫描收入（待检测->检测中）")
     @PostMapping("/myExecutive/receive")
     public ReturnDTO sampleReceive(@RequestBody @Valid List<SampleOperateRequest> requestList, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -90,10 +104,7 @@
         return labExecutiveInfoService.sampleReceive(requestList);
     }
 
-    /**
-     * 实验室检测-负责人/检定人扫描检完（检测中->检测完）
-     */
-    @ApiOperation("实验室检测-负责人/检定人扫描检完（检测中->检测完）")
+    @ApiOperation("实验室任务-负责人/检定人扫描检完（检测中->检测完）")
     @PostMapping("/myExecutive/complete")
     public ReturnDTO sampleExecutiveComplete(@RequestBody @Valid List<SampleOperateRequest> requestList, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -102,10 +113,7 @@
         return labExecutiveInfoService.sampleExecutiveComplete(requestList);
     }
 
-    /**
-     * 实验室检测-部门检测/我的检测 编辑（只能修改应出具证书）
-     */
-    @ApiOperation("实验室检测-部门检测/我的检测 编辑（只能修改应出具证书）")
+    @ApiOperation("实验室任务/我的任务 编辑（只能修改应出具证书）")
     @PostMapping("/executive/update")
     public ReturnDTO updateExecutive(@RequestBody @Valid UpdateExecutiveRequest request, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -114,10 +122,7 @@
         return labExecutiveInfoService.updateExecutive(request);
     }
 
-    /**
-     * 实验室检测-部门检测/我的检测 详情
-     */
-    @ApiOperation("实验室检测-部门检测/我的检测 详情")
+    @ApiOperation("实验室任务/我的任务 详情")
     @PostMapping("/executive/detail")
     public ReturnDTO<ExecutiveDetailResponse> executiveDetail(@RequestBody @Valid ExecutiveDetailRequest request, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
@@ -131,7 +136,7 @@
      * 退回后会将下一个要执行的实验室检测状态更新为待分配，将后面的实验室顺序变更为连续（都进行减1）
      * 最后一个检测的实验室退回，等分发员再增加实验室或设备收发中的已收入直接手动点击完成
      */
-    @ApiOperation("实验室检测-部门检测/我的检测 退回（待检测/检测中->退回）")
+    @ApiOperation("实验室任务/我的任务 退回（待检测/检测中->退回）")
     @PostMapping("/executive/sendBack")
     public ReturnDTO executiveSendBack(@RequestBody @Valid ExecutiveSendBackRequest request, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -140,9 +145,6 @@
         return labExecutiveInfoService.sampleExecutiveSendBack(request);
     }
 
-    /**
-     * 分发员编辑实验室检测列表
-     */
     @ApiOperation("分发员编辑实验室检测列表")
     @PostMapping("/handOut/updateList")
     public ReturnDTO updateExecutiveList(@RequestBody @Valid UpdateExecutiveListRequest request, BindingResult bindingResult) {
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java
index 48a67ed..0c04f31 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java
@@ -10,6 +10,7 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.resource.customer.CustomerApprovalListRequest;
 import com.casic.missiles.dto.resource.customer.CustomerSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceCustomerInfo;
@@ -26,6 +27,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -55,6 +57,13 @@
         return customerInfoService.saveCustomerInfo(request);
     }
 
+    @ApiOperation("委托方名录导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody CustomerApprovalListRequest request) throws Exception {
+        List<BizResourceCustomerInfo> list = super.exportList(request);
+        super.exportExcel(BizResourceCustomerInfo.class, list, ExportEnum.CUSTOMER_INFO.getSheetName());
+    }
+
     @ApiOperation("委托方人员列表（分页）")
     @PostMapping("/person/listPage")
     public ReturnDTO<PageInfoBT<BizResourceCustomerStaff>> personListPage(@RequestBody IdDTO idDto) {
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
index 972ed4b..6418ea5 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
@@ -5,6 +5,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.resource.customer.SuggestFormApprovalListRequest;
 import com.casic.missiles.dto.resource.customer.SuggestFormSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceCustomerSuggestForm;
@@ -20,6 +21,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -50,4 +52,11 @@
         return suggestFormService.saveSuggestForm(request);
     }
 
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody SuggestFormApprovalListRequest request) throws Exception {
+        List<BizResourceCustomerSuggestForm> list = super.exportList(request);
+        super.exportExcel(BizResourceCustomerSuggestForm.class, list, ExportEnum.CUSTOMER_SUGGEST_FORM.getSheetName());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java
index 1934d1a..9e07eab 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java
@@ -15,12 +15,16 @@
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.resource.IEnvEnvironmentRecordConfigService;
 import com.casic.missiles.service.resource.IEnvEnvironmentRecordDataService;
+import com.casic.missiles.service.resource.IEnvLocationInfoService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
 import java.util.List;
@@ -39,6 +43,8 @@
     private IEnvEnvironmentRecordDataService environmentRecordDataService;
     @Autowired
     private IEnvEnvironmentRecordConfigService environmentRecordConfigService;
+    @Autowired
+    private IEnvLocationInfoService locationInfoService;
 
     @ApiOperation("环境记录单数据列表/详情")
     @PostMapping("/data/listPage")
@@ -95,4 +101,11 @@
         });
         return environmentRecordConfigService.deleteEnvironmentRecordConfig(idDTO.getId());
     }
+
+    @ApiOperation("地点列表")
+    @PostMapping("/location/listPage")
+    public ReturnDTO<PageInfoBT<LocationListResponse>> locationListPage(@RequestBody @Valid LocationListRequest request) {
+        Page<LocationListResponse> page = PageFactory.defaultPage();
+        return ReturnUtil.success(super.packForBT(locationInfoService.listPage(page, request)));
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java
index 82efe3f..e9561fa 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java
@@ -10,6 +10,7 @@
 import com.casic.missiles.dto.resource.seal.SealLogListRequest;
 import com.casic.missiles.dto.resource.seal.SealNoteApprovalListRequest;
 import com.casic.missiles.dto.resource.seal.SealNoteSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceSealUseLog;
@@ -27,6 +28,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -58,6 +60,13 @@
         return sealUseNoteService.saveSeal(request);
     }
 
+    @ApiOperation("印章使用登记导出（列表和导出中去掉经办人和监印人）")
+    @PostMapping("/listExport")
+    public void export(@RequestBody SealNoteApprovalListRequest request) throws Exception {
+        List<BizResourceSealUseNote> list = super.exportList(request);
+        super.exportExcel(BizResourceSealUseNote.class, list, ExportEnum.SEAL_NOTE.getSheetName());
+    }
+
     // TODO: 2023/7/28 印章使用日志：系统中使用印章时插入数据库
 
     @ApiOperation("印章使用日志列表（分页）")
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java
index 9b674fc..06b6521 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java
@@ -9,16 +9,20 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.resource.staff.StaffCertRequest;
 import com.casic.missiles.dto.resource.staff.StaffCertResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.service.resource.IBizResourceStaffInfoService;
 import com.casic.missiles.service.resource.IBizResourceStaffVerifierService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.List;
+
 /**
  * @Description:
  * @Author: wangpeng
@@ -41,9 +45,21 @@
         return ReturnUtil.success(super.packForBT(responsePage));
     }
 
+    @ApiOperation("证书逾期提醒导出")
+    @PostMapping("/listExport")
+    public void exportList(@RequestBody StaffCertRequest request) throws Exception {
+        List<StaffCertResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = staffInfoService.certListByIds(request.getIds());
+        } else {
+            list = staffInfoService.certList(request);
+        }
+        super.exportExcel(StaffCertResponse.class, list, ExportEnum.STAFF_CERTIFICATE_EXPIRE.getSheetName());
+    }
+
     @ApiOperation("证书逾期提醒")
     @PostMapping("/expirationReminder")
-    public ReturnDTO expirationReminder(@RequestBody IdDTO idDto) {
-        return verifierService.expirationReminder(idDto);
+    public ReturnDTO expirationReminder(@RequestBody IdDTO idDTO) {
+        return verifierService.expirationReminder(idDTO);
     }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java
index 3b251ad..a6e7850 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java
@@ -12,6 +12,7 @@
 import com.casic.missiles.dto.resource.staff.StaffListRequest;
 import com.casic.missiles.dto.resource.staff.TrainListRequest;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.*;
@@ -22,7 +23,10 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
 import java.util.List;
@@ -52,8 +56,19 @@
             throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
         }
         Page<BizResourceStaffInfo> page = PageFactory.defaultPage();
-        Page<BizResourceStaffInfo> responsePage = staffInfoService.listPage(page, request);
-        return ReturnUtil.success(super.packForBT(responsePage));
+        return ReturnUtil.success(super.packForBT(staffInfoService.listPage(page, request)));
+    }
+
+    @ApiOperation("人员登记导出")
+    @PostMapping("/listExport")
+    public void exportList(@RequestBody StaffListRequest request) throws Exception {
+        List<BizResourceStaffInfo> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = staffInfoService.listByIds(request.getIds());
+        } else {
+            list = staffInfoService.list(request);
+        }
+        super.exportExcel(BizResourceStaffInfo.class, list, ExportEnum.STAFF_INFO.getSheetName());
     }
 
     @ApiOperation("人员登记详情基础信息")
@@ -85,9 +100,9 @@
 
     @ApiOperation("科研教育列表（分页）")
     @PostMapping("/education/listPage")
-    public ReturnDTO<PageInfoBT<BizResourceStaffEducation>> educationListPage(@RequestBody IdDTO idDto) {
+    public ReturnDTO<PageInfoBT<BizResourceStaffEducation>> educationListPage(@RequestBody IdDTO idDTO) {
         Page<BizResourceStaffEducation> page = PageFactory.defaultPage();
-        Page<BizResourceStaffEducation> responsePage = staffInfoService.educationListPage(page, idDto);
+        Page<BizResourceStaffEducation> responsePage = staffInfoService.educationListPage(page, idDTO);
         return ReturnUtil.success(super.packForBT(responsePage));
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java
index af6aa86..d85d84a 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java
@@ -9,6 +9,7 @@
 import com.casic.missiles.dto.resource.outsideService.SupplierApprovalListRequest;
 import com.casic.missiles.dto.resource.outsideService.SupplierSaveResponse;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceSupplierAbility;
@@ -67,6 +68,13 @@
         return ReturnUtil.success(supplierInfoService.detail(idDTO.getId()));
     }
 
+    @ApiOperation("合格供方导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody SupplierApprovalListRequest request) throws Exception {
+        List<BizResourceSupplierInfo> list = super.exportList(request);
+        super.exportExcel(BizResourceSupplierInfo.class, list, ExportEnum.SUPPLIER_INFO.getSheetName());
+    }
+
     @ApiOperation("供方人员列表（分页）")
     @PostMapping("/person/listPage")
     public ReturnDTO<PageInfoBT<BizResourceSupplierPerson>> personListPage(@RequestBody IdDTO idDTO) {
diff --git a/casic-metering-api/src/main/resources/config/application.yml b/casic-metering-api/src/main/resources/config/application.yml
index 350db5f..ecff521 100644
--- a/casic-metering-api/src/main/resources/config/application.yml
+++ b/casic-metering-api/src/main/resources/config/application.yml
@@ -126,7 +126,7 @@
     #作者
     author: wangpeng
     #待生成对象表名
-    table-name: biz_equipment_technical_target_approval,biz_equipment_attachment_approval,biz_equipment_checkpoint_approval
+    table-name: biz_business_outsource_protocol
 
 reminder:
   #节点--common模块config包 ReminderNodeConfig配置
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
index 4a19e4e..d47d552 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
@@ -53,6 +53,7 @@
     SUGGEST_FORM_SAVE_FAILED(2509, "委托方意见登记表保存至草稿箱失败"),
     EXAMINE_FORM_SAVE_FAILED(2510, "要求、委托书及合同评审表保存至草稿箱失败"),
     CUSTOMER_EXIST_SAVE_FAILED(2511, "该委托方已存在，请重新选择"),
+    DUPLICATE_LOCATION_NO(2512, "地点编号已存在"),
 
     /**
      * 计量检定业务模块
@@ -68,6 +69,8 @@
     COMPLETE_SAMPLE_NOT_EXIST(2609, "检测中不存在扫描收入的样品"),
     CANNOT_CHANGE_MEASURE_INFO(2610, "无法更改非当前登录用户的检测信息"),
     NON_EXIST_ORDER_OR_SAMPLE(2611, "不存在该委托单或该委托单下的样品"),
+    OUTSOURCE_ACCESS_SAVE_FAILED(2612, "测试、校准或检定工作分包评审表保存至草稿箱失败"),
+    OUTSOURCE_PROTOCOL_SAVE_FAILED(2613, "测试、校准或检定工作分包协议书保存至草稿箱失败"),
 
     /**
      * 历史遗留备用
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
index 5089ad1..81a406b 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
@@ -10,54 +10,38 @@
     /**
      * 资源管理
      */
-    ENVIRONMENT_DATA_EXPORT("environmentData", "environmentData", "环境记录单数据"),
+    ENVIRONMENT_DATA_EXPORT("environmentData", "环境记录单数据", "环境记录单数据"),
+    STAFF_INFO("staffInfo", "人员登记", "人员登记"),
+    STAFF_CERTIFICATE_EXPIRE("certificateExpire", "证书逾期提醒", "证书逾期提醒"),
+    SUPPLIER_INFO("supplierInfo", "合格供方名录", "合格供方名录"),
+    CUSTOMER_INFO("customerInfo", "委托方名录", "委托方名录"),
+    CUSTOMER_SUGGEST_FORM("customerSuggestForm", "委托方意见登记表", "委托方意见登记表"),
+    SEAL_NOTE("sealNote", "印章使用登记", "印章使用登记"),
 
-    FILE_EXPORT("meterFileData", "meterFileData", "计量文件信息"),
-    TRAIN_PLAN_EXPORT("trainPlanData", "trainPlanData", "培训计划"),
-    TRAIN_LOG_EXPORT("trainLogData", "trainLogData", "培训记录"),
-    METER_ORGANIZE_EXPORT("meterOrganizeData", "meterOrganizeData", "计量组织"),
-    TRACE_SUPPLIER_EXPORT("traceSupplierData", "traceSupplierData", "溯源供方"),
-    SIGN_EXPORT("signData", "signData", "签名/签章"),
-    TEMPLATE_EXPORT("templateData", "templateData", "原始记录模板/证书报告模板"),
-    FIXED_ASSETS("meterFixedAssets", "meterFixedAssets", "固定资产"),
-    METER_EQUIPMENT("meterEquipment", "meterEquipment", "测量设备"),
-    CALIBRATION_TEST_EQUIPMENT("calibrationTestEquipment", "calibrationTestEquipment", "校准检定设备"),
-    MEASURE_ACCOUNT("measureAccount", "measureAccount", "测量工装"),
-    STANDARD_SUPPORT_EQUIPMENT("standardSupportEquipment", "standardSupportEquipment", "标准配套设备"),
-    STANDARD_EQUIPMENT("standardEquipment", "standardEquipment", "标准装置"),
-    FLOW_DEF_EXPORT("flowDefData", "flowDefData", "流程定义"),
-    STAFF_CERTIFICATE("certificate", "certificate", "计量人员证书"),
-    CHECK_INFO("checkInfo", "checkInfo", "设备管理点检测"),
-    EQUIPMENT_APPLY("equipmentApply", "equipmentApply", "设备借用"),
-    STANDARD_EQUIPMENT_REMIND("equipmentApplyRemind", "equipmentApplyRemind", "标准装置到期提醒"),
-    METER_PRICE("meterPrice", "meterPrice", "价格库"),
-    METER_STAFF("meterStaff", "meterStaff", "计量人员"),
-    STANDARD_EQUIPMENT_APPLY("standardEquipmentApply", "standardEquipmentApply", "标准装置申请"),
-    STATE_MANAGE_APPLY("stateManage", "stateManage", "状态管理"),
-    METER_ACCEPTANCE_CHECK("acceptanceCheck", "acceptanceCheck", "设备检修保养验收单"),
-    CUSTOMER_EXPORT("customerData", "customerData", "客户信息"),
-    ORDER_EXPORT("orderData", "orderData", "委托书信息"),
-    SAMPLE_EXPORT("sampleData", "sampleData", "样本信息"),
-    EXCHANGE_DATA("exchangeData", "exchangeData", "设备交接单"),
-    DISPATCH_DATA("dispatchData", "dispatchData", "设备收发"),
-    ENVIRONMENT_DATA("environmentData", "environmentData", "环境记录单"),
-    ORIGIN_DATA("originData", "originData", "原始记录"),
-    CERTIFICATE_REPORT("certificateReport", "certificateReport", "证书报告"),
-    ADVICE_EXPORT("adviceData", "adviceData", "客户反馈"),
-    HANDOUT_EXPORT("handoutData", "handoutData", "任务分发列表"),
-    OUTSOURCER_EXPORT("outsourcerData", "outsourcerData", "分包方"),
-    SITE_EXECUTIVE_EXPORT("siteExecutiveData", "siteExecutiveData", "现场测试、校准或检定"),
-    CERTIFICATE_PRINT_EXPORT("certificatePrintData", "certificatePrintData", "证书打印"),
-    DOWNLOAD_TEMPLATE("downloadTemplate", "downloadTemplate", "页面配置"),
-    OUTSOURCER_CERTIFICATE_EXPORT("outsourceCertificateData", "outsourceCertificateData", "分包证书"),
-    SETTLEMENT_INFO_EXPORT("settlementInfoData", "settlementInfoData", "业务结算"),
-    EQUIPMENT_REMIND("equipmentRemind", "equipmentRemind", "设备到期提醒"),
-    AGREEMENT_INFO_EXPORT("agreementInfoData", "agreementInfoData", "合同"),
-    WORK_STATISTICS_EXPORT("workStatisticsData", "workStatisticsData", "实时工作统计"),
-    DEPT_OUTPUT_EXPORT("deptOutputData", "deptOutputData", "部门产值分析"),
-    WORKLOAD_EXPORT("workloadData", "workloadData", "业务工作量分析"),
-    DEPT_COMPREHENSIVE_EXPORT("deptComprehensiveData", "deptComprehensiveData", "部门综合分析"),
-    ENVIRONMENTAL_RECORD("environmentalRecordData", "environmentalRecordData", "现场环境记录");
+    /**
+     * 计量检定业务
+     */
+    OUTSOURCER_EXPORT("outsourcerData", "分包方名录", "分包方名录"),
+    IDENTIFY_EXPORT("identifyData", "计量标识", "计量标识"),
+    ORDER_EXPORT("orderData", "任务单", "任务单"),
+    DISPATCH_DATA("dispatchData", "设备收发", "设备收发"),
+    HANDOUT_EXPORT("handoutData", "任务分发", "任务分发"),
+    SITE_EXECUTIVE_EXPORT("siteExecutiveData", "现场测试、校准或检定", "现场测试、校准或检定"),
+    CERTIFICATE_REPORT("certificateReport", "证书审批", "证书审批"),
+    CERTIFICATE_CHANGE_APPLY("certificateChangeApply", "证书报告补充或更换申请单", "证书报告补充或更换申请单"),
+    CERTIFICATE_PRINT("certificatePrintData", "证书打印审批", "证书打印审批"),
+    DEPT_EXECUTIVE_TASK("deptExecutiveTaskData", "实验室任务", "实验室任务"),
+    MY_EXECUTIVE_TASK("myExecutiveTaskData", "我的任务", "我的任务"),
+    OUTSOURCE_ASSESS("outsourceAssess", "测试、校准或检定工作分包评审表", "测试、校准或检定工作分包评审表"),
+    OUTSOURCE_PROTOCOL("outsourceProtocol", "测试、校准或检定工作分包协议书", "测试、校准或检定工作分包协议书"),
+
+    /**
+     * 系统管理
+     */
+    SIGN_EXPORT("signData", "签名", "签名"),
+    TEMPLATE_EXPORT("templateData", "文件模板", "文件模板"),
+    FLOW_DEF_EXPORT("flowDefData", "流程定义", "流程定义"),
+    DOWNLOAD_TEMPLATE("downloadTemplate", "流程定义", "页面配置");
 
     ExportEnum(String fileName, String sheetName, String description) {
         this.fileName = fileName;
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateRecordTypeCodeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateRecordTypeCodeEnum.java
index 31d913c..a963522 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateRecordTypeCodeEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateRecordTypeCodeEnum.java
@@ -46,4 +46,14 @@
     String SITE_EXECUTIVE_APPROVAL = "01";
     //《现场测试、校准或检定工作记录表》
     String SITE_EXECUTIVE_LOG = "02";
+
+    //测试、校准或检定工作分包协议书
+    String OUTSOURCE_PROTOCOL = "01";
+    //测试、校准或检定工作分包评审表
+    String OUTSOURCE_ACCESS = "02";
+    //测试、校准或检定工作分包通知书
+    String OUTSOURCE_NOTICE = "03";
+    //测试、校准或检定工作分包方名录
+    String OUTSOURCE_INFO = "04";
+
 }
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
index 24b8635..f78bd53 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
@@ -15,6 +15,10 @@
     String CERTIFICATE_CHANGE_APPLY_BEAN_NAME = "certificateChangeApplyBean";
     //现场测试、校准或检定
     String SITE_EXECUTIVE_BEAN_NAME = "siteExecutiveBean";
+    //测试、校准或检定工作分包评审表
+    String OUTSOURCE_ASSESS_BEAN_NAME = "outsourceAssessBean";
+    //测试、校准或检定工作分包协议书
+    String OUTSOURCE_PROTOCOL_BEAN_NAME = "outsourceProtocolBean";
 
     /*********************************设备与装置************************************/
     //设备台账
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 b21c661..6b86fd1 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
@@ -18,6 +18,8 @@
     OUTSOURCER_APPROVAL(OUTSOURCER_BEAN_NAME, ""),
     CERTIFICATE_CHANGE_APPROVAL(CERTIFICATE_CHANGE_APPLY_BEAN_NAME, ""),
     SITE_EXECUTIVE_APPROVAL(SITE_EXECUTIVE_BEAN_NAME, ""),
+    OUTSOURCE_ASSESS_APPROVAL(OUTSOURCE_ASSESS_BEAN_NAME, ""),
+    OUTSOURCE_PROTOCOL_APPROVAL(OUTSOURCE_PROTOCOL_BEAN_NAME, ""),
 
     ACTION_STATUS_MAP(new HashMap<String, AwareActionStatusEnum>() {
         {
@@ -47,6 +49,10 @@
             put(ApplyFromIdEnum.CERTIFICATE_CHANGE_APPROVAL.getCode(), CERTIFICATE_CHANGE_APPROVAL);
             //现场测试、校准或检定审批
             put(ApplyFromIdEnum.SITE_EXECUTIVE_APPROVAL.getCode(), SITE_EXECUTIVE_APPROVAL);
+            //测试、校准或检定工作分包评审表
+            put(ApplyFromIdEnum.OUTSOURCE_ASSESS_APPROVAL.getCode(), OUTSOURCE_ASSESS_APPROVAL);
+            //测试、校准或检定工作分包协议书
+            put(ApplyFromIdEnum.OUTSOURCE_PROTOCOL_APPROVAL.getCode(), OUTSOURCE_PROTOCOL_APPROVAL);
         }
     });
     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 934405e..c7410bd 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
@@ -9,6 +9,8 @@
     CERTIFICATE_CHANGE_APPROVAL("jljdywzsbchghsqd", MessageSourceModuleEnum.BUSINESS.getCode(), "证书/报告补充或更换申请单"),
     OUTSOURCER_APPROVAL("jljdywcsjzhgfbfml", MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定合格分包方名录"),
     SITE_EXECUTIVE_APPROVAL("jljdywxccsjzsp", MessageSourceModuleEnum.BUSINESS.getCode(), "现场测试、校准或检定审批"),
+    OUTSOURCE_ASSESS_APPROVAL("jljdywcsjzfbpsb", MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包评审表"),
+    OUTSOURCE_PROTOCOL_APPROVAL("jljdywcsjzfbxys", MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包协议书"),
 
 
     /*******************************************设备与装置*********************************************/
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/GeneralApprovalMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/GeneralApprovalMapper.java
index 4fb7344..0c9d6ae 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/GeneralApprovalMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/GeneralApprovalMapper.java
@@ -17,8 +17,4 @@
 
     Page<O> selectBatchForApprovalList(Page<O> page, @Param("request") R request, @Param("businessKeys") List<String> businessKeys);
 
-//    Page<O> selectListPage(Page<O> page, @Param("request") R request);
-
-//    Long selectMaxNo();
-
 }
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceAssessMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceAssessMapper.java
index 7867bb8..ba59009 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceAssessMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceAssessMapper.java
@@ -1,7 +1,12 @@
 package com.casic.missiles.mapper.business;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.business.outsource.OutsourceAssessApprovalListRequest;
+import com.casic.missiles.mapper.GeneralApprovalMapper;
 import com.casic.missiles.model.business.BizBusinessOutsourceAssess;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * <p>
@@ -11,6 +16,10 @@
  * @author wangpeng
  * @since 2023-08-16
  */
-public interface BizBusinessOutsourceAssessMapper extends BaseMapper<BizBusinessOutsourceAssess> {
+public interface BizBusinessOutsourceAssessMapper extends GeneralApprovalMapper<BizBusinessOutsourceAssess, BizBusinessOutsourceAssess, OutsourceAssessApprovalListRequest> {
+
+    Page<BizBusinessOutsourceAssess> selectBatchForApprovalList(Page<BizBusinessOutsourceAssess> page, @Param("request") OutsourceAssessApprovalListRequest request, @Param("businessKeys") List<String> businessKeys);
+
+    Long selectMaxProjectNo();
 
 }
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceProtocolMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceProtocolMapper.java
new file mode 100644
index 0000000..e6aba35
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceProtocolMapper.java
@@ -0,0 +1,24 @@
+package com.casic.missiles.mapper.business;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.business.outsource.OutsourceProtocolApprovalListRequest;
+import com.casic.missiles.mapper.GeneralApprovalMapper;
+import com.casic.missiles.model.business.BizBusinessOutsourceProtocol;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 计量检定业务-分包管理-测试、校准或检定工作分包协议书 Mapper 接口
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-08-24
+ */
+public interface BizBusinessOutsourceProtocolMapper extends GeneralApprovalMapper<BizBusinessOutsourceProtocol, BizBusinessOutsourceProtocol, OutsourceProtocolApprovalListRequest> {
+
+    Page<BizBusinessOutsourceProtocol> selectBatchForApprovalList(Page<BizBusinessOutsourceProtocol> page, @Param("request") OutsourceProtocolApprovalListRequest request, @Param("businessKeys") List<String> businessKeys);
+
+    Long selectMaxProtocolNo();
+}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/EnvLocationInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/EnvLocationInfoMapper.java
new file mode 100644
index 0000000..49eff87
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/EnvLocationInfoMapper.java
@@ -0,0 +1,21 @@
+package com.casic.missiles.mapper.resource;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.resource.environment.LocationListRequest;
+import com.casic.missiles.dto.resource.environment.LocationListResponse;
+import com.casic.missiles.model.resource.EnvLocationInfo;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * <p>
+ * 实验室环境监控系统-设备表 Mapper 接口
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-06-07
+ */
+public interface EnvLocationInfoMapper extends BaseMapper<EnvLocationInfo> {
+
+    Page<LocationListResponse> selectLocationListPage(Page<LocationListResponse> page, @Param("request") LocationListRequest request);
+}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java
index de124db..85ed0f7 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java
@@ -1,7 +1,9 @@
 package com.casic.missiles.mapper.system;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.dto.system.SignDetailResponse;
+import com.casic.missiles.dto.system.SignListRequest;
 import com.casic.missiles.model.system.SystemSign;
 import org.apache.ibatis.annotations.Param;
 
@@ -22,4 +24,8 @@
     SignDetailResponse selectSignDetailById(Long id);
 
     List<SystemSign> selectUsableSignList(@Param("userId") Long userId);
+
+    Page<SystemSign> selectSignListPage(Page<SystemSign> page, @Param("request") SignListRequest request);
+
+    List<SystemSign> selectSignList(@Param("request") SignListRequest request);
 }
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateChangeApplyMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateChangeApplyMapper.xml
index d798447..c496092 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateChangeApplyMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateChangeApplyMapper.xml
@@ -30,31 +30,31 @@
         SELECT *
         FROM biz_business_certificate_change_apply
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.changeApplyNo != null and request.changeApplyNo !=''">
+        <if test="request != null and request.changeApplyNo != null and request.changeApplyNo !=''">
             and change_apply_no like concat('%',#{request.changeApplyNo},'%')
         </if>
-        <if test="request.changeReportNo != null and request.changeReportNo !=''">
+        <if test="request != null and request.changeReportNo != null and request.changeReportNo !=''">
             and change_report_no like concat('%',#{request.changeReportNo},'%')
         </if>
-        <if test="request.changeReportName != null and request.changeReportName !=''">
+        <if test="request != null and request.changeReportName != null and request.changeReportName !=''">
             and change_report_name like concat('%',#{request.changeReportName},'%')
         </if>
-        <if test="request.changeType != null and request.changeType !=''">
+        <if test="request != null and request.changeType != null and request.changeType !=''">
             and change_type = #{request.changeType}
         </if>
-        <if test="request.createUserName != null and request.createUserName !=''">
+        <if test="request != null and request.createUserName != null and request.createUserName !=''">
             and create_user_name like concat('%',#{request.createUserName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificatePrintMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificatePrintMapper.xml
index b66cd99..49c0ac8 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificatePrintMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificatePrintMapper.xml
@@ -31,34 +31,34 @@
         LEFT JOIN biz_business_order_sample_relation bosr ON (bosr.order_id = bcr.order_id AND bosr.sample_id = bcr.sample_id)
         LEFT JOIN biz_business_order_info boi ON boi.id = bosr.order_id
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and bcp.approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.printStatus != null and request.printStatus !=''">
+        <if test="request != null and request.printStatus != null and request.printStatus !=''">
             and print_status = #{request.printStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and bcp.create_user_id = #{request.createUserId}
         </if>
-        <if test="request.certificateReportNo != null and request.certificateReportNo !=''">
+        <if test="request != null and request.certificateReportNo != null and request.certificateReportNo !=''">
             and bcr.certificate_report_no like concat('%',#{request.certificateReportNo},'%')
         </if>
-        <if test="request.certificateReportName != null and request.certificateReportName !=''">
+        <if test="request != null and request.certificateReportName != null and request.certificateReportName !=''">
             and bcr.certificate_report_name like concat('%',#{request.certificateReportName},'%')
         </if>
-        <if test="request.customerName != null and request.customerName !=''">
+        <if test="request != null and request.customerName != null and request.customerName !=''">
             and boi.customer_name like concat('%',#{request.customerName},'%')
         </if>
-        <if test="request.sampleNo != null and request.sampleNo !=''">
+        <if test="request != null and request.sampleNo != null and request.sampleNo !=''">
             and bosr.sample_no like concat('%',#{request.sampleNo},'%')
         </if>
-        <if test="request.sampleName != null and request.sampleName !=''">
+        <if test="request != null and request.sampleName != null and request.sampleName !=''">
             and bosr.sample_name like concat('%',#{request.sampleName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and bcp.create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and bcp.create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml
index b366034..767695d 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml
@@ -46,33 +46,37 @@
         SELECT bcr.*, bosr.sample_no, bosr.sample_name, bosr.sample_model, rsi.staff_name
         FROM biz_business_certificate_report bcr
         LEFT JOIN biz_business_order_sample_relation bosr ON (bosr.order_id = bcr.order_id AND bosr.sample_id = bcr.sample_id)
+        LEFT JOIN biz_business_order_info boi ON boi.id = bcr.order_id
         LEFT JOIN biz_resource_staff_info rsi ON rsi.id = bcr.measure_person_id
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and bcr.approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and bcr.create_user_id = #{request.createUserId}
         </if>
-        <if test="request.certificateReportNo != null and request.certificateReportNo !=''">
+        <if test="request != null and request.customerId != null and request.customerId !=''">
+            and boi.customer_id = #{request.customerId}
+        </if>
+        <if test="request != null and request.certificateReportNo != null and request.certificateReportNo !=''">
             and bcr.certificate_report_no like concat('%',#{request.certificateReportNo},'%')
         </if>
-        <if test="request.certificateReportName != null and request.certificateReportName !=''">
+        <if test="request != null and request.certificateReportName != null and request.certificateReportName !=''">
             and bcr.certificate_report_name like concat('%',#{request.certificateReportName},'%')
         </if>
-        <if test="request.sampleNo != null and request.sampleNo !=''">
+        <if test="request != null and request.sampleNo != null and request.sampleNo !=''">
             and bosr.sample_no like concat('%',#{request.sampleNo},'%')
         </if>
-        <if test="request.measureCategory != null and request.measureCategory !=''">
+        <if test="request != null and request.measureCategory != null and request.measureCategory !=''">
             and bcr.measure_category = #{request.measureCategory}
         </if>
-        <if test="request.measurePerson != null and request.measurePerson !=''">
+        <if test="request != null and request.measurePerson != null and request.measurePerson !=''">
             and rsi.staff_name like concat('%',#{request.measurePerson},'%')
         </if>
-        <if test="request.calibrationTimeStart != null and request.calibrationTimeStart !=''">
+        <if test="request != null and request.calibrationTimeStart != null and request.calibrationTimeStart !=''">
             and bcr.calibration_time &gt;= #{request.calibrationTimeStart}
         </if>
-        <if test="request.calibrationTimeEnd != null and request.calibrationTimeEnd !=''">
+        <if test="request != null and request.calibrationTimeEnd != null and request.calibrationTimeEnd !=''">
             and bcr.calibration_time &lt;= #{request.calibrationTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceAssessMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceAssessMapper.xml
index d0fcf8b..c22c101 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceAssessMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceAssessMapper.xml
@@ -7,6 +7,8 @@
         <id column="id" property="id" />
         <result column="project_no" property="projectNo" />
         <result column="project_name" property="projectName" />
+        <result column="lab_code" property="labCode" />
+        <result column="group_code" property="groupCode" />
         <result column="applicant_id" property="applicantId" />
         <result column="applicant_name" property="applicantName" />
         <result column="applicant_time" property="applicantTime" />
@@ -31,7 +33,45 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, project_no, project_name, applicant_id, applicant_name, applicant_time, minio_file_name, remark, create_user_id, create_user_name, outsourcer_id, pre_start_time, pre_end_time, outsource_reason, pre_cost, approval_status, process_id, approve_situation, traceability, test_method, technique_ability, create_time, update_time
+        id, project_no, project_name, lab_code, group_code, applicant_id, applicant_name, applicant_time, minio_file_name, remark, create_user_id, create_user_name, outsourcer_id, pre_start_time, pre_end_time, outsource_reason, pre_cost, approval_status, process_id, approve_situation, traceability, test_method, technique_ability, create_time, update_time
     </sql>
 
+    <select id="selectMaxProjectNo" resultType="java.lang.Long">
+        SELECT IFNULL(max(RIGHT(project_no, 3)), 0) from biz_business_outsource_assess
+    </select>
+
+    <select id="selectBatchForApprovalList" resultMap="BaseResultMap">
+        SELECT bboa.*, bboi.outsourcer_name, bboi.director
+        FROM biz_business_outsource_assess bboa
+        LEFT JOIN biz_business_outsourcer_info bboi ON bboa.outsourcer_id = bboi.id
+        WHERE 1=1
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
+            and bboa.approval_status = #{request.approvalStatus}
+        </if>
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
+            and bboa.create_user_id = #{request.createUserId}
+        </if>
+        <if test="request != null and request.projectNo != null and request.projectNo !=''">
+            and bboa.project_no like concat('%',#{request.projectNo},'%')
+        </if>
+        <if test="request != null and request.outsourcerName != null and request.outsourcerName !=''">
+            and bboi.outsourcer_name like concat('%',#{request.outsourcerName},'%')
+        </if>
+        <if test="request != null and request.applicantName != null and request.applicantName !=''">
+            and bboa.applicant_name like concat('%',#{request.applicantName},'%')
+        </if>
+        <if test="request != null and request.applicantTimeStart != null and request.applicantTimeStart !=''">
+            and bboa.applicant_time &gt;= #{request.applicantTimeStart}
+        </if>
+        <if test="request != null and request.applicantTimeEnd != null and request.applicantTimeEnd !=''">
+            and bboa.applicant_time &lt;= #{request.applicantTimeEnd}
+        </if>
+        <if test="businessKeys != null">
+            and bboa.id in
+            <foreach collection="businessKeys" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
+        ORDER BY bboa.create_time DESC
+    </select>
 </mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceProtocolMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceProtocolMapper.xml
new file mode 100644
index 0000000..b7b2149
--- /dev/null
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceProtocolMapper.xml
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.mapper.business.BizBusinessOutsourceProtocolMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.business.BizBusinessOutsourceProtocol">
+        <id column="id" property="id" />
+        <result column="protocol_no" property="protocolNo" />
+        <result column="project_name" property="projectName" />
+        <result column="lab_code" property="labCode" />
+        <result column="group_code" property="groupCode" />
+        <result column="outsourcer_id" property="outsourcerId" />
+        <result column="remark" property="remark" />
+        <result column="outsource_no" property="outsourceNo" />
+        <result column="outsource_name" property="outsourceName" />
+        <result column="contacts" property="contacts" />
+        <result column="mobile" property="mobile" />
+        <result column="address" property="address" />
+        <result column="require_date" property="requireDate" />
+        <result column="outsource_cost" property="outsourceCost" />
+        <result column="director" property="director" />
+        <result column="item" property="item" />
+        <result column="requires" property="requires" />
+        <result column="create_user_id" property="createUserId" />
+        <result column="create_user_name" property="createUserName" />
+        <result column="approval_status" property="approvalStatus" />
+        <result column="process_id" property="processId" />
+        <result column="create_time" property="createTime" />
+        <result column="update_time" property="updateTime" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, protocol_no, project_name, lab_code, group_code, outsourcer_id, remark, outsource_no, outsource_name, contacts, mobile, address, require_date, outsource_cost, director, item, requires, create_user_id, create_user_name, approval_status, process_id, create_time, update_time
+    </sql>
+
+    <select id="selectMaxProtocolNo" resultType="java.lang.Long">
+        SELECT IFNULL(max(RIGHT(protocol_no, 3)), 0) from biz_business_outsource_protocol
+    </select>
+
+    <select id="selectBatchForApprovalList" resultMap="BaseResultMap">
+        SELECT *
+        FROM biz_business_outsource_protocol
+        WHERE 1=1
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
+            and approval_status = #{request.approvalStatus}
+        </if>
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
+            and create_user_id = #{request.createUserId}
+        </if>
+        <if test="request != null and request.protocolNo != null and request.protocolNo !=''">
+            and protocol_no like concat('%',#{request.protocolNo},'%')
+        </if>
+        <if test="request != null and request.outsourcerName != null and request.outsourcerName !=''">
+            and outsourcer_name like concat('%',#{request.outsourcerName},'%')
+        </if>
+        <if test="request != null and request.applicantName != null and request.applicantName !=''">
+            and create_user_name like concat('%',#{request.applicantName},'%')
+        </if>
+        <if test="request != null and request.applicantTimeStart != null and request.applicantTimeStart !=''">
+            and create_time &gt;= #{request.applicantTimeStart}
+        </if>
+        <if test="request != null and request.applicantTimeEnd != null and request.applicantTimeEnd !=''">
+            and create_time &lt;= #{request.applicantTimeEnd}
+        </if>
+        <if test="businessKeys != null">
+            and id in
+            <foreach collection="businessKeys" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
+        ORDER BY create_time DESC
+    </select>
+</mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourcerInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourcerInfoMapper.xml
index 510a80b..3049b54 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourcerInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourcerInfoMapper.xml
@@ -7,6 +7,8 @@
         <id column="id" property="id" />
         <result column="outsourcer_no" property="outsourcerNo" />
         <result column="outsourcer_name" property="outsourcerName" />
+        <result column="lab_code" property="labCode" />
+        <result column="group_code" property="groupCode" />
         <result column="outsourcer_brief_name" property="outsourcerBriefName" />
         <result column="outsourcer_size" property="outsourcerSize" />
         <result column="business_size" property="businessSize" />
@@ -55,32 +57,32 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, outsourcer_no, outsourcer_name, outsourcer_brief_name, outsourcer_size, business_size, grade, evaluation, tax_number, bank_account, bank_name, bank_account_number, postal_code, director, phone, fax, mobile, email, website, address_country, address_province, address_city, address_area, full_address, address_country_name, address_province_name, address_city_name, address_area_name, invoice_country, invoice_province, invoice_city, invoice_area, invoice_full_address, invoice_country_name, invoice_province_name, invoice_city_name, invoice_area_name, business_scope, business_content, minio_file_name, approval_status, process_id, remark, create_user_id, create_user_name, create_time, update_time
+        id, outsourcer_no, outsourcer_name, lab_code, group_code, outsourcer_brief_name, outsourcer_size, business_size, grade, evaluation, tax_number, bank_account, bank_name, bank_account_number, postal_code, director, phone, fax, mobile, email, website, address_country, address_province, address_city, address_area, full_address, address_country_name, address_province_name, address_city_name, address_area_name, invoice_country, invoice_province, invoice_city, invoice_area, invoice_full_address, invoice_country_name, invoice_province_name, invoice_city_name, invoice_area_name, business_scope, business_content, minio_file_name, approval_status, process_id, remark, create_user_id, create_user_name, create_time, update_time
     </sql>
 
     <select id="selectBatchForApprovalList" resultMap="BaseResultMap">
         SELECT *
         FROM biz_business_outsourcer_info
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.outsourcerNo != null and request.outsourcerNo !=''">
+        <if test="request != null and request.outsourcerNo != null and request.outsourcerNo !=''">
             and outsourcer_no like concat('%',#{request.outsourcerNo},'%')
         </if>
-        <if test="request.outsourcerName != null and request.outsourcerName !=''">
+        <if test="request != null and request.outsourcerName != null and request.outsourcerName !=''">
             and outsourcer_name like concat('%',#{request.outsourcerName},'%')
         </if>
-        <if test="request.director != null and request.director !=''">
+        <if test="request != null and request.director != null and request.director !=''">
             and director like concat('%',#{request.director},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
@@ -93,6 +95,6 @@
     </select>
 
     <select id="selectMaxNo" resultType="java.lang.Long">
-        SELECT IFNULL(max(RIGHT(outsourcer_no, 12)), 0) from biz_business_outsourcer_info
+        SELECT IFNULL(max(RIGHT(outsourcer_no, 3)), 0) from biz_business_outsourcer_info
     </select>
 </mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessSiteExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessSiteExecutiveInfoMapper.xml
index 135c5d0..3c5ae79 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessSiteExecutiveInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessSiteExecutiveInfoMapper.xml
@@ -38,25 +38,25 @@
         FROM biz_business_site_executive_info bsei
         LEFT JOIN biz_resource_customer_info rci ON bsei.customer_id = rci.id
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and bsei.approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and bsei.create_user_id = #{request.createUserId}
         </if>
-        <if test="request.siteExecutiveNo != null and request.siteExecutiveNo !=''">
+        <if test="request != null and request.siteExecutiveNo != null and request.siteExecutiveNo !=''">
             and bsei.site_executive_no like concat('%',#{request.siteExecutiveNo},'%')
         </if>
-        <if test="request.customerName != null and request.customerName !=''">
+        <if test="request != null and request.customerName != null and request.customerName !=''">
             and rci.outsourcer_name like concat('%',#{request.customerName},'%')
         </if>
-        <if test="request.applyName != null and request.applyName !=''">
+        <if test="request != null and request.applyName != null and request.applyName !=''">
             and bsei.apply_name like concat('%',#{request.applyName},'%')
         </if>
-        <if test="request.applyTimeStart != null and request.applyTimeStart !=''">
+        <if test="request != null and request.applyTimeStart != null and request.applyTimeStart !=''">
             and bsei.apply_time &gt;= #{request.applyTimeStart}
         </if>
-        <if test="request.applyTimeEnd != null and request.applyTimeEnd !=''">
+        <if test="request != null and request.applyTimeEnd != null and request.applyTimeEnd !=''">
             and bsei.apply_time &lt;= #{request.applyTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml
index 84d9e2a..6bd38a9 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml
@@ -105,6 +105,12 @@
         <if test="request.isUrgent != null and request.isUrgent !=''">
             AND bo.is_urgent = #{request.isUrgent}
         </if>
+        <if test="request.ids != null">
+            and blei.id in
+            <foreach collection="request.ids" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
         ORDER BY blei.update_time DESC
     </select>
 
@@ -137,6 +143,12 @@
         <if test="request.isUrgent != null and request.isUrgent !=''">
             AND bo.is_urgent = #{request.isUrgent}
         </if>
+        <if test="request.ids != null">
+            and blei.id in
+            <foreach collection="request.ids" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
         ORDER BY blei.update_time DESC
     </select>
 
diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardInfoMapper.xml
index 1a5551b..2ed8d17 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardInfoMapper.xml
@@ -45,12 +45,6 @@
         FROM biz_equipment_standard_info besi
         LEFT JOIN biz_equipment_standard_technology_relation bestr ON besi.standard_no = bestr.standard_no
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
-            and besi.approval_status = #{request.approvalStatus}
-        </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
-            and besi.create_user_id = #{request.createUserId}
-        </if>
         <if test="request.standardName != null and request.standardName !=''">
             and besi.standard_name like concat('%',#{request.standardName},'%')
         </if>
diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardTechnologyRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardTechnologyRelationMapper.xml
index fc7e16c..cd03c8c 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardTechnologyRelationMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardTechnologyRelationMapper.xml
@@ -6,6 +6,7 @@
     <resultMap id="BaseResultMap" type="com.casic.missiles.model.equipment.BizEquipmentStandardTechnologyRelation">
         <id column="id" property="id" />
         <result column="technology_file_id" property="technologyFileId" />
+        <result column="technology_file_no" property="technologyFileNo" />
         <result column="technology_file_name" property="technologyFileName" />
         <result column="standard_id" property="standardId" />
         <result column="standard_no" property="standardNo" />
@@ -14,7 +15,7 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, technology_file_id, technology_file_name, standard_id, remark
+        id, technology_file_id, technology_file_no, technology_file_name, standard_id, remark
     </sql>
 
 </mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceAuthorizeOrderMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceAuthorizeOrderMapper.xml
index ac5176c..554fe65 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceAuthorizeOrderMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceAuthorizeOrderMapper.xml
@@ -32,22 +32,22 @@
         SELECT *
         FROM biz_resource_authorize_order
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.orderNo != null and request.orderNo !=''">
+        <if test="request != null and request.orderNo != null and request.orderNo !=''">
             and order_no like concat('%',#{request.orderNo},'%')
         </if>
-        <if test="request.createUserName != null and request.createUserName !=''">
+        <if test="request != null and request.createUserName != null and request.createUserName !=''">
             and create_user_name like concat('%',#{request.createUserName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerExamineFormMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerExamineFormMapper.xml
index ab242f6..af7f98f 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerExamineFormMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerExamineFormMapper.xml
@@ -41,28 +41,28 @@
         SELECT *
         FROM biz_resource_customer_examine_form
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.formNo != null and request.formNo !=''">
+        <if test="request != null and request.formNo != null and request.formNo !=''">
             and form_no like concat('%',#{request.formNo},'%')
         </if>
-        <if test="request.labCode != null and request.labCode !=''">
+        <if test="request != null and request.labCode != null and request.labCode !=''">
             and lab_code like concat('%',#{request.labCode},'%')
         </if>
-        <if test="request.groupCode != null and request.groupCode !=''">
+        <if test="request != null and request.groupCode != null and request.groupCode !=''">
             and group_code like concat('%',#{request.groupCode},'%')
         </if>
-        <if test="request.createUserName != null and request.createUserName !=''">
+        <if test="request != null and request.createUserName != null and request.createUserName !=''">
             and create_user_name like concat('%',#{request.createUserName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerInfoMapper.xml
index fa8ffbc..06a2798 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerInfoMapper.xml
@@ -33,25 +33,25 @@
         SELECT *
         FROM biz_resource_customer_info
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.customerNo != null and request.customerNo !=''">
+        <if test="request != null and request.customerNo != null and request.customerNo !=''">
             and customer_no like concat('%',#{request.customerNo},'%')
         </if>
-        <if test="request.customerName != null and request.customerName !=''">
+        <if test="request != null and request.customerName != null and request.customerName !=''">
             and customer_name like concat('%',#{request.customerName},'%')
         </if>
-        <if test="request.contacts != null and request.contacts !=''">
+        <if test="request != null and request.contacts != null and request.contacts !=''">
             and contacts like concat('%',#{request.contacts},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerSuggestFormMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerSuggestFormMapper.xml
index 28f5bb2..1806662 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerSuggestFormMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerSuggestFormMapper.xml
@@ -33,28 +33,28 @@
         SELECT *
         FROM biz_resource_customer_suggest_form
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.formNo != null and request.formNo !=''">
+        <if test="request != null and request.formNo != null and request.formNo !=''">
             and form_no like concat('%',#{request.formNo},'%')
         </if>
-        <if test="request.customerName != null and request.customerName !=''">
+        <if test="request != null and request.customerName != null and request.customerName !=''">
             and customer_name like concat('%',#{request.customerName},'%')
         </if>
-        <if test="request.customerDeptName != null and request.customerDeptName !=''">
+        <if test="request != null and request.customerDeptName != null and request.customerDeptName !=''">
             and customer_dept_name like concat('%',#{request.customerDeptName},'%')
         </if>
-        <if test="request.createUserName != null and request.createUserName !=''">
+        <if test="request != null and request.createUserName != null and request.createUserName !=''">
             and create_user_name like concat('%',#{request.createUserName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSealUseNoteMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSealUseNoteMapper.xml
index ab37bc1..b02bb33 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSealUseNoteMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSealUseNoteMapper.xml
@@ -29,32 +29,32 @@
     </sql>
 
     <select id="selectBatchForApprovalList" resultMap="BaseResultMap">
-        SELECT *
+        SELECT brsun.*, brsi.seal_name, brsi.seal_type, brsi.approver_name
         FROM biz_resource_seal_use_note brsun
         JOIN biz_resource_seal_info brsi ON brsun.seal_id = brsi.id
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and brsun.approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and brsun.create_user_id = #{request.createUserId}
         </if>
-        <if test="request.sealName != null and request.sealName !=''">
+        <if test="request != null and request.sealName != null and request.sealName !=''">
             and brsi.seal_name like concat('%',#{request.sealName},'%')
         </if>
-        <if test="request.sealType != null and request.sealType !=''">
+        <if test="request != null and request.sealType != null and request.sealType !=''">
             and brsi.seal_type = #{request.sealType}
         </if>
-        <if test="request.applyDeptName != null and request.applyDeptName !=''">
+        <if test="request != null and request.applyDeptName != null and request.applyDeptName !=''">
             and brsun.apply_dept_name like concat('%',#{request.applyDeptName},'%')
         </if>
-        <if test="request.applyUserName != null and request.applyUserName !=''">
+        <if test="request != null and request.applyUserName != null and request.applyUserName !=''">
             and brsun.apply_user_name like concat('%',#{request.applyUserName},'%')
         </if>
-        <if test="request.applyTimeStart != null and request.applyTimeStart !=''">
+        <if test="request != null and request.applyTimeStart != null and request.applyTimeStart !=''">
             and brsun.apply_time &gt;= #{request.applyTimeStart}
         </if>
-        <if test="request.applyTimeEnd != null and request.applyTimeEnd !=''">
+        <if test="request != null and request.applyTimeEnd != null and request.applyTimeEnd !=''">
             and brsun.apply_time &lt;= #{request.applyTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml
index 119bf7d..4f8392a 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml
@@ -31,6 +31,12 @@
         <if test="request.deptName != null and request.deptName !=''">
             and brsi.dept_name like concat('%',#{request.deptName},'%')
         </if>
+        <if test="request.ids != null">
+            and brsv.id in
+            <foreach collection="request.ids" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
         ORDER BY brsv.grant_date DESC
     </select>
 
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSupplierInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSupplierInfoMapper.xml
index fe8d399..e8ce7ef 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSupplierInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSupplierInfoMapper.xml
@@ -48,28 +48,28 @@
         SELECT *
         FROM biz_resource_supplier_info
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.supplierNo != null and request.supplierNo !=''">
+        <if test="request != null and request.supplierNo != null and request.supplierNo !=''">
             and supplier_no like concat('%',#{request.supplierNo},'%')
         </if>
-        <if test="request.supplierName != null and request.supplierName !=''">
+        <if test="request != null and request.supplierName != null and request.supplierName !=''">
             and supplier_name like concat('%',#{request.supplierName},'%')
         </if>
-        <if test="request.director != null and request.director !=''">
+        <if test="request != null and request.director != null and request.director !=''">
             and director like concat('%',#{request.director},'%')
         </if>
-        <if test="request.supplierType != null and request.supplierType !=''">
+        <if test="request != null and request.supplierType != null and request.supplierType !=''">
             and supplier_type = #{request.supplierType}
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/EnvLocationInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/EnvLocationInfoMapper.xml
new file mode 100644
index 0000000..68bcf10
--- /dev/null
+++ b/casic-metering-dao/src/main/resources/mapper/resource/EnvLocationInfoMapper.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.mapper.resource.EnvLocationInfoMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.resource.EnvLocationInfo">
+        <id column="id" property="id" />
+        <result column="location_no" property="locationNo" />
+        <result column="location_name" property="locationName" />
+        <result column="location_position" property="locationPosition" />
+        <result column="create_user_id" property="createUserId" />
+        <result column="create_user" property="createUser" />
+        <result column="create_time" property="createTime" />
+        <result column="update_time" property="updateTime" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, location_no, location_name, location_position, create_user_id, create_user, create_time, update_time
+    </sql>
+
+    <select id="selectLocationListPage" resultType="com.casic.missiles.dto.resource.environment.LocationListResponse">
+        SELECT *
+        FROM env_location_info
+        WHERE 1=1
+        <if test="request.locationNo != null and request.locationNo !=''">
+            AND location_no LIKE concat('%',#{request.locationNo},'%')
+        </if>
+        <if test="request.locationName != null and request.locationName !=''">
+            AND location_name LIKE concat('%',#{request.locationName},'%')
+        </if>
+        ORDER BY create_time DESC
+    </select>
+
+</mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml
index b28c18f..8854047 100644
--- a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml
@@ -11,7 +11,6 @@
         <result column="sign_desc" property="signDesc" />
         <result column="sign_director" property="signDirector" />
         <result column="sign_user_id" property="signUserId" />
-        <result column="sign_type" property="signType" />
         <result column="minio_file_name" property="minioFileName" />
         <result column="create_time" property="createTime" />
         <result column="update_time" property="updateTime" />
@@ -28,7 +27,6 @@
         <result column="sign_name" property="signName" />
         <result column="sign_desc" property="signDesc" />
         <result column="sign_director" property="signDirector" />
-        <result column="sign_type" property="signType" />
         <result column="sign_user_id" property="signUserId" />
         <result column="minio_file_name" property="minioFileName" />
         <result column="create_time" property="createTime" />
@@ -62,4 +60,58 @@
         JOIN system_sign_user_relation ssur ON ss.id = ssur.sign_id
         WHERE ssur.user_id = #{userId}
     </select>
+
+    <select id="selectSignListPage" resultMap="BaseResultMap">
+        SELECT ss.*, sd.SIMPLE_NAME AS deptName
+        FROM system_sign ss
+        LEFT JOIN sys_user su ON su.id = ss.sign_user_id
+        LEFT JOIN sys_dept sd ON sd.id = su.dept_id
+        WHERE 1=1
+        <if test="request.signNo != null and request.signNo !=''">
+            AND ss.sign_no LIKE concat('%',#{request.signNo},'%')
+        </if>
+        <if test="request.signName != null and request.signName !=''">
+            AND ss.sign_name LIKE concat('%',#{request.signName},'%')
+        </if>
+        <if test="request.signDirector != null and request.signDirector !=''">
+            AND ss.sign_director LIKE concat('%',#{request.signDirector},'%')
+        </if>
+        <if test="request.signUserId != null and request.signUserId !=''">
+            AND ss.sign_user_id = #{request.signUserId}
+        </if>
+        <if test="request.createStartTime != null and request.createStartTime !=''">
+            AND DATE_FORMAT(ss.create_time,'%Y-%m-%d') &gt;= DATE_FORMAT(#{request.createStartTime},'%Y-%m-%d')
+        </if>
+        <if test="request.createEndTime != null and request.createEndTime !=''">
+            AND DATE_FORMAT(ss.create_time,'%Y-%m-%d')  &lt;= DATE_FORMAT(#{request.createEndTime},'%Y-%m-%d')
+        </if>
+        ORDER BY ss.create_time DESC
+    </select>
+
+    <select id="selectSignList" resultMap="BaseResultMap">
+        SELECT ss.*, sd.SIMPLE_NAME AS deptName
+        FROM system_sign ss
+        LEFT JOIN sys_user su ON su.id = ss.sign_user_id
+        LEFT JOIN sys_dept sd ON sd.id = su.dept_id
+        WHERE 1=1
+        <if test="request.signNo != null and request.signNo !=''">
+            AND ss.sign_no LIKE concat('%',#{request.signNo},'%')
+        </if>
+        <if test="request.signName != null and request.signName !=''">
+            AND ss.sign_name LIKE concat('%',#{request.signName},'%')
+        </if>
+        <if test="request.signDirector != null and request.signDirector !=''">
+            AND ss.sign_director LIKE concat('%',#{request.signDirector},'%')
+        </if>
+        <if test="request.signUserId != null and request.signUserId !=''">
+            AND ss.sign_user_id = #{request.signUserId}
+        </if>
+        <if test="request.createStartTime != null and request.createStartTime !=''">
+            AND DATE_FORMAT(ss.create_time,'%Y-%m-%d') &gt;= DATE_FORMAT(#{request.createStartTime},'%Y-%m-%d')
+        </if>
+        <if test="request.createEndTime != null and request.createEndTime !=''">
+            AND DATE_FORMAT(ss.create_time,'%Y-%m-%d')  &lt;= DATE_FORMAT(#{request.createEndTime},'%Y-%m-%d')
+        </if>
+        ORDER BY ss.create_time DESC
+    </select>
 </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 515050a..60f530b 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
@@ -47,8 +47,8 @@
     String STORAGE_LOCATION = "bizStorageLocation";
     //计量专业
     String MEASURE_MAJOR = "bizMeasureMajor";
-    //管理状态
-    String MANAGER_STATE = "bizManagerState";
+    //标准装置管理状态
+    String STANDARD_MANAGER_STATE = "bizStandardManagerState";
 
     /**
      * 资源管理 字典code
@@ -95,8 +95,6 @@
     String MEASURE_STATUS = "measureStatus";
     //检定方式
     String MEASURE_TYPE = "measureType";
-    //标识打印标志类型
-    String IDENTIFY_PRINT_TYPE = "bizBusinessIdentify";
     //变更类型
     String REPORT_CHANGE_TYPE = "bizCertChangeType";
     //规模类型
@@ -111,19 +109,24 @@
     String MEASURE_CATEGORY = "measureCategory";
     //检定结果
     String MEASURE_RESULT = "measureResult";
+    //分包原因
+    String OUTSOURCE_REASON = "outsourceReason";
+
+    /**
+     * 系统管理
+     */
+    String TEMPLATE_TYPE = "templateType";
+
 
     /**
      * 标准装置 字典code
      */
     //类别
     String STANDARD_CATEGORY = "standardCategory";
-    //管理状态
-    String STANDARD_MANAGER_STATE = "standardManagerState";
     //标准等级
     String STANDARD_LEVEL = "standardLevel";
     //传递范围
     String STANDARD_TRANSMIT_RANGE = "transmitRange";
-
     //资本来源
     String CAPITAL_SOURCE = "capitalSource";
     //标准装置-申请类型
@@ -148,8 +151,6 @@
     String CERTIFICATE_CLASS = "certificationClass";
     //证书管理-检校专业
     String CALIBRATION_MAJOR = "calibrationMajor";
-    //分包原因
-    String OUTSOURCE_REASON = "outsourceReason";
 
     /**
      * 工作台
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/BaseApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/BaseApprovalListRequest.java
index 73c12c1..80d7424 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/BaseApprovalListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/BaseApprovalListRequest.java
@@ -6,6 +6,7 @@
 
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotEmpty;
+import java.util.List;
 
 /**
  * @Description:
@@ -19,14 +20,14 @@
      * 表单id
      */
     @NotBlank(message = "表单id不能为空")
-    @ApiModelProperty(value = "表单id（流程定义对应的表单id，等价于业务id）", dataType = "String")
+    @ApiModelProperty(value = "表单id（流程定义对应的表单id，等价于业务id），导出接口不用传", dataType = "String")
     private String formId;
 
     /**
      * 审批状态类型，对应ApprovalStatusEnum
      */
     @NotEmpty(message = "审批状态类型不能为空")
-    @ApiModelProperty(value = "审批状态类型code", dataType = "String")
+    @ApiModelProperty(value = "审批状态类型code，导出接口不用传", dataType = "String")
     private String approvalStatus;
 
     @ApiModelProperty(hidden = true)
@@ -34,4 +35,7 @@
 
     @ApiModelProperty(hidden = true)
     private Long createUserId;
+
+    @ApiModelProperty(value = "导出ids", dataType = "List")
+    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificatePrintApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificatePrintApprovalListRequest.java
index b93d1c9..3cc2f4e 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificatePrintApprovalListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificatePrintApprovalListRequest.java
@@ -5,8 +5,6 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import java.util.List;
-
 /**
  * @Description:
  * @Author: wangpeng
@@ -38,7 +36,4 @@
 
     @ApiModelProperty(value = "创建结束时间", dataType = "String")
     private String createTimeEnd;
-
-    @ApiModelProperty(value = "导出ids", dataType = "List")
-    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportApprovalListRequest.java
index 4f7a038..c115847 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportApprovalListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportApprovalListRequest.java
@@ -5,8 +5,6 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import java.util.List;
-
 /**
  * @Description:
  * @Author: wangpeng
@@ -15,6 +13,8 @@
 @ApiModel
 @Data
 public class CertificateReportApprovalListRequest extends BaseApprovalListRequest {
+    @ApiModelProperty(value = "委托方id", dataType = "String")
+    private Long customerId;
 
     @ApiModelProperty(value = "证书报告编号", dataType = "String")
     private String certificateReportNo;
@@ -37,6 +37,4 @@
     @ApiModelProperty(value = "检校结束时间", dataType = "String")
     private String calibrationTimeEnd;
 
-    @ApiModelProperty(value = "导出ids", dataType = "List")
-    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/identify/IdentifyListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/identify/IdentifyListRequest.java
index 1b87ae6..f019203 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/identify/IdentifyListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/identify/IdentifyListRequest.java
@@ -4,6 +4,8 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * @Description:
  * @Author: wangpeng
@@ -26,4 +28,7 @@
 
     @ApiModelProperty(value = "打印结束时间", dataType = "String")
     private String createTimeEnd;
+
+    @ApiModelProperty(value = "导出ids", dataType = "List")
+    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListRequest.java
index 1264883..62415fb 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListRequest.java
@@ -7,6 +7,7 @@
 import lombok.Data;
 
 import javax.validation.constraints.NotBlank;
+import java.util.List;
 
 @Data
 @ApiModel
@@ -37,4 +38,6 @@
     @ApiModelProperty(value = "是否加急（1是0否null全部）", dataType = "Integer")
     private String isUrgent;
 
+    @ApiModelProperty(value = "导出ids", dataType = "List")
+    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListRequest.java
index 5201d7b..499760a 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListRequest.java
@@ -17,6 +17,9 @@
     @ApiModelProperty(value = "任务单编号", dataType = "String")
     private String orderNo;
 
+    @ApiModelProperty(value = "委托方id", dataType = "Long")
+    private Long customerId;
+
     @ApiModelProperty(value = "委托方名称", dataType = "String")
     private String customerName;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OrderSampleDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OrderSampleDTO.java
new file mode 100644
index 0000000..796edc0
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OrderSampleDTO.java
@@ -0,0 +1,19 @@
+package com.casic.missiles.dto.business.outsource;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/8/24 11:38
+ */
+@ApiModel
+@Data
+public class OrderSampleDTO {
+    @ApiModelProperty(value = "任务单id", dataType = "Long")
+    private Long orderId;
+    @ApiModelProperty(value = "受检设备id", dataType = "Long")
+    private Long sampleId;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceAssessApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceAssessApprovalListRequest.java
new file mode 100644
index 0000000..9a930c3
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceAssessApprovalListRequest.java
@@ -0,0 +1,30 @@
+package com.casic.missiles.dto.business.outsource;
+
+import com.casic.missiles.dto.BaseApprovalListRequest;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/8/24 11:01
+ */
+@ApiModel
+@Data
+public class OutsourceAssessApprovalListRequest extends BaseApprovalListRequest {
+    @ApiModelProperty(value = "评审表编号", dataType = "String")
+    private String projectNo;
+
+    @ApiModelProperty(value = "分包机构名称", dataType = "String")
+    private String outsourcerName;
+
+    @ApiModelProperty(value = "申请人", dataType = "String")
+    private String applicantName;
+
+    @ApiModelProperty(value = "申请时间开始", dataType = "String")
+    private String applicantTimeStart;
+
+    @ApiModelProperty(value = "申请时间结束", dataType = "String")
+    private String applicantTimeEnd;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceAssessSaveResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceAssessSaveResponse.java
new file mode 100644
index 0000000..8bf9aad
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceAssessSaveResponse.java
@@ -0,0 +1,20 @@
+package com.casic.missiles.dto.business.outsource;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/8/14 16:17
+ */
+@ApiModel
+@Data
+public class OutsourceAssessSaveResponse {
+    @ApiModelProperty(value = "主键id", dataType = "Long")
+    private Long id;
+
+    @ApiModelProperty(value = "编号", dataType = "String")
+    private String projectNo;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProtocolApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProtocolApprovalListRequest.java
new file mode 100644
index 0000000..0f32331
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProtocolApprovalListRequest.java
@@ -0,0 +1,30 @@
+package com.casic.missiles.dto.business.outsource;
+
+import com.casic.missiles.dto.BaseApprovalListRequest;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/8/24 15:01
+ */
+@ApiModel
+@Data
+public class OutsourceProtocolApprovalListRequest extends BaseApprovalListRequest {
+    @ApiModelProperty(value = "协议书编号", dataType = "String")
+    private String protocolNo;
+
+    @ApiModelProperty(value = "分包方名称", dataType = "String")
+    private String outsourcerName;
+
+    @ApiModelProperty(value = "申请人", dataType = "String")
+    private String applicantName;
+
+    @ApiModelProperty(value = "申请时间开始", dataType = "String")
+    private String applicantTimeStart;
+
+    @ApiModelProperty(value = "申请时间结束", dataType = "String")
+    private String applicantTimeEnd;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProtocolSaveResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProtocolSaveResponse.java
new file mode 100644
index 0000000..e324967
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProtocolSaveResponse.java
@@ -0,0 +1,20 @@
+package com.casic.missiles.dto.business.outsource;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/8/14 16:17
+ */
+@ApiModel
+@Data
+public class OutsourceProtocolSaveResponse {
+    @ApiModelProperty(value = "主键id", dataType = "Long")
+    private Long id;
+
+    @ApiModelProperty(value = "编号", dataType = "String")
+    private String protocolNo;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveApprovalListRequest.java
index f29f4e4..7047c28 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveApprovalListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveApprovalListRequest.java
@@ -5,8 +5,6 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import java.util.List;
-
 /**
  * @Description: 现场检测审批列表请求实体
  * @Author: wangpeng
@@ -30,7 +28,4 @@
     @ApiModelProperty(value = "申请时间结束", dataType = "String")
     private String applyTimeEnd;
 
-    @ApiModelProperty(value = "导出ids", dataType = "List")
-    private List<Long> ids;
-
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveDetailResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveDetailResponse.java
index 1f28752..394c934 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveDetailResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveDetailResponse.java
@@ -12,6 +12,18 @@
     @ApiModelProperty(value = "id，更新/删除使用参数", dataType = "Long")
     private Long id;
 
+    @ApiModelProperty(value = "实验室代码(字典code)", dataType = "String")
+    private String labCode;
+
+    @ApiModelProperty(value = "实验室代码(字典value)", dataType = "String")
+    private String labCodeName;
+
+    @ApiModelProperty(value = "组别代码(字典code)", dataType = "String")
+    private String groupCode;
+
+    @ApiModelProperty(value = "组别代码(字典value)", dataType = "String")
+    private String groupCodeName;
+
     @ApiModelProperty(value = "审批编号", dataType = "String")
     private String siteExecutiveNo;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/environment/LocationListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/environment/LocationListRequest.java
new file mode 100644
index 0000000..13d03c3
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/environment/LocationListRequest.java
@@ -0,0 +1,20 @@
+package com.casic.missiles.dto.resource.environment;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/6/8 13:56
+ */
+@ApiModel
+@Data
+public class LocationListRequest {
+    @ApiModelProperty(value = "地点编号", dataType = "String")
+    private String locationNo;
+
+    @ApiModelProperty(value = "地点名称", dataType = "String")
+    private String locationName;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/environment/LocationListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/environment/LocationListResponse.java
new file mode 100644
index 0000000..4c531af
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/environment/LocationListResponse.java
@@ -0,0 +1,78 @@
+package com.casic.missiles.dto.resource.environment;
+
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
+import com.baomidou.mybatisplus.annotation.TableField;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description: 地点列表响应实体
+ * @Author: wangpeng
+ * @Date: 2023/6/8 13:53
+ */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
+@ApiModel
+@Data
+public class LocationListResponse {
+    @ApiModelProperty(value = "主键id", dataType = "Long")
+    private Long id;
+
+    /**
+     * 地点编号
+     */
+    @ExcelProperty("地点编号")
+    @ApiModelProperty(value = "地点编号", dataType = "String")
+    private String locationNo;
+
+    /**
+     * 地点名称
+     */
+    @ExcelProperty("地点名称")
+    @ApiModelProperty(value = "地点名称", dataType = "String")
+    private String locationName;
+
+    /**
+     * 地点位置
+     */
+    @ExcelProperty("地点位置")
+    @ApiModelProperty(value = "地点位置", dataType = "String")
+    private String locationPosition;
+
+    /**
+     * 创建人id
+     */
+    @ApiModelProperty(value = "创建人id", dataType = "Long")
+    private Long createUserId;
+
+    /**
+     * 创建人
+     */
+    @ExcelProperty("创建人")
+    @ApiModelProperty(value = "创建人", dataType = "String")
+    @TableField("create_user")
+    private String createUser;
+
+    /**
+     * 创建时间
+     */
+    @ExcelProperty("创建时间")
+    @ApiModelProperty(value = "创建时间", dataType = "String")
+    private String createTime;
+
+    /**
+     * 更新时间
+     */
+    @ApiModelProperty(value = "更新时间", dataType = "String")
+    private String updateTime;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertRequest.java
index 9a7f6c6..c827915 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertRequest.java
@@ -4,6 +4,8 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * @Description:
  * @Author: wangpeng
@@ -16,4 +18,7 @@
     private String name;
     @ApiModelProperty(value = "部门名", dataType = "String")
     private String deptName;
+
+    @ApiModelProperty(value = "导出ids", dataType = "List")
+    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertResponse.java
index f78b159..8f2f79e 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertResponse.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.dto.resource.staff;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.casic.missiles.annotation.DictCodeField;
 import com.casic.missiles.constants.MeterDictCode;
 import io.swagger.annotations.ApiModel;
@@ -13,12 +20,18 @@
  * @Author: wangpeng
  * @Date: 2023/7/27 15:13
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @ApiModel
 @Data
 public class StaffCertResponse {
     /**
      * 人员编号
      */
+    @ExcelProperty(value = "人员编号",order = 0)
     @NotEmpty(message = "人员编号不能为空")
     @ApiModelProperty(value = "人员编号", dataType = "String")
     private String staffNo;
@@ -26,6 +39,7 @@
     /**
      * 姓名
      */
+    @ExcelProperty(value = "姓名",order = 1)
     @ApiModelProperty(value = "姓名", dataType = "String")
     private String staffName;
 
@@ -54,6 +68,7 @@
     /**
      * 部门名字
      */
+    @ExcelProperty(value = "工作部门",order = 2)
     @ApiModelProperty(value = "部门名字", dataType = "String")
     private String deptName;
 
@@ -66,6 +81,7 @@
     /**
      * 计量专业
      */
+    @ExcelProperty(value = "计量专业",order = 3)
     @ApiModelProperty(value = "计量专业", dataType = "String")
     private String major;
 
@@ -110,6 +126,7 @@
     /**
      * 证书号
      */
+    @ExcelProperty(value = "证号",order = 4)
     @ApiModelProperty(value = "证书号", dataType = "String")
     private String certNo;
 
@@ -122,12 +139,14 @@
     /**
      * 有效日期
      */
+    @ExcelProperty(value = "证书有效期",order = 6)
     @ApiModelProperty(value = "有效日期", dataType = "String")
     private String effectiveDate;
 
     /**
      * 发放日期
      */
+    @ExcelProperty(value = "发证日期",order = 5)
     @ApiModelProperty(value = "发放日期", dataType = "String")
     private String grantDate;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffListRequest.java
index 7c4afb3..0a1194a 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffListRequest.java
@@ -4,6 +4,8 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * @Description:
  * @Author: wangpeng
@@ -18,4 +20,7 @@
     private String deptName;
     @ApiModelProperty(value = "部门id", dataType = "Long")
     private Long deptId;
+
+    @ApiModelProperty(value = "导出ids", dataType = "List")
+    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/TrainListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/TrainListRequest.java
index f68597b..6321f8b 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/TrainListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/TrainListRequest.java
@@ -14,6 +14,8 @@
 public class TrainListRequest {
     @ApiModelProperty(value = "训练登记表编号", dataType = "String")
     private String trainNo;
+    @ApiModelProperty(value = "值班领导", dataType = "String")
+    private String dutyLeader;
     @ApiModelProperty(value = "创建开始时间", dataType = "String")
     private String createTimeStart;
     @ApiModelProperty(value = "创建结束时间", dataType = "String")
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/SignAddRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/SignAddRequest.java
index 117be34..d71055c 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/SignAddRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/SignAddRequest.java
@@ -43,13 +43,6 @@
     private Long signUserId;
 
     /**
-     * 签章或签名-字典code
-     */
-    @NotBlank(message = "类型不能为空")
-    @ApiModelProperty(value = "签名/签章-字典code", dataType = "String", required = true)
-    private String signType;
-
-    /**
      * minio存储文件名
      */
     @ApiModelProperty(value = "上传文件返回名称", dataType = "String")
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateAddRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateAddRequest.java
index aff1265..6316648 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateAddRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateAddRequest.java
@@ -17,30 +17,28 @@
 @Data
 public class TemplateAddRequest extends BaseSystemRequest {
     /**
-     * 原始记录模板/证书报告模板名称
+     * 模板名称
      */
     @ApiModelProperty(value = "名称", dataType = "String", required = true)
     @NotBlank(message = "名称不能为空")
     private String templateName;
 
     /**
-     * 原始记录模板/证书报告模板描述
+     * 模板描述
      */
     @ApiModelProperty(value = "描述", dataType = "String")
     private String templateDesc;
 
     /**
-     * 原始记录模板/证书报告模板创建人
+     * 创建人
      */
     @ApiModelProperty(value = "创建人", dataType = "String", required = true)
     @NotBlank(message = "创建人不能为空")
     private String templateCreator;
 
-    /**
-     * 原始记录模板/证书报告模板-字典code
-     */
-    @NotBlank(message = "类型不能为空")
-    @ApiModelProperty(value = "原始记录模板/证书报告模板-字典code", dataType = "String", required = true)
+
+    @NotBlank(message = "模板类型不能为空")
+    @ApiModelProperty(value = "模板类型(字典code)", dataType = "String", required = true)
     private String templateType;
 
     /**
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateListRequest.java
index eec5a1e..6d17bbe 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateListRequest.java
@@ -1,11 +1,12 @@
 package com.casic.missiles.dto.system;
 
+import com.casic.missiles.annotation.DictCodeField;
+import com.casic.missiles.constants.MeterDictCode;
 import com.casic.missiles.dto.BaseSystemRequest;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import javax.validation.constraints.NotBlank;
 import java.util.List;
 
 /**
@@ -19,8 +20,8 @@
     /**
      * 类型
      */
-//    @ApiModelProperty(value = "类型-字典code", dataType = "String", required = true)
-    @NotBlank(message = "类型不能为空")
+    @DictCodeField(message = "模板类型不合法", cacheName = MeterDictCode.TEMPLATE_TYPE)
+    @ApiModelProperty(value = "模板类型(字典code)", dataType = "String")
     private String templateType;
 
     /**
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificateChangeApply.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificateChangeApply.java
index 9216308..36923fd 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificateChangeApply.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificateChangeApply.java
@@ -1,11 +1,19 @@
 package com.casic.missiles.model.business;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 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 com.casic.missiles.dto.BaseRequest;
+import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -20,6 +28,12 @@
  * @author wangpeng
  * @since 2023-08-15
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
+@ApiModel
 @Data
 @TableName("biz_business_certificate_change_apply")
 public class BizBusinessCertificateChangeApply extends BaseRequest implements Serializable {
@@ -33,6 +47,7 @@
     /**
      * 申请单编号
      */
+    @ExcelProperty(value = "申请单编号", order = 1)
     @ApiModelProperty(value = "申请单编号", dataType = "String")
     @TableField("change_apply_no")
     private String changeApplyNo;
@@ -40,6 +55,7 @@
     /**
      * 申请单名字
      */
+    @ExcelProperty(value = "申请单名称", order = 2)
     @ApiModelProperty(value = "申请单名字", dataType = "String")
     @TableField("change_apply_name")
     private String changeApplyName;
@@ -54,6 +70,7 @@
     /**
      * 更换证书编号
      */
+    @ExcelProperty(value = "更换证书编号", order = 3)
     @ApiModelProperty(value = "更换证书编号", dataType = "String")
     @TableField("change_report_no")
     private String changeReportNo;
@@ -61,7 +78,8 @@
     /**
      * 更换证书名字
      */
-    @ApiModelProperty(value = "更换证书名字", dataType = "String")
+    @ExcelProperty(value = "更换证书/报告名称", order = 4)
+    @ApiModelProperty(value = "更换证书/报告名称", dataType = "String")
     @TableField("change_report_name")
     private String changeReportName;
 
@@ -73,6 +91,7 @@
     @TableField("change_type")
     private String changeType;
 
+    @ExcelProperty(value = "变更类型", order = 5)
     @ApiModelProperty(value = "变更类型(字典value)", dataType = "String")
     @TableField(exist = false)
     private String changeTypeName;
@@ -142,13 +161,15 @@
     /**
      * 创建用户名字
      */
-    @ApiModelProperty(value = "创建用户名字", dataType = "String")
+    @ExcelProperty(value = "创建人", order = 6)
+    @ApiModelProperty(value = "创建人名字", dataType = "String")
     @TableField("create_user_name")
     private String createUserName;
 
     /**
      * 创建时间
      */
+    @ExcelProperty(value = "创建时间", order = 7)
     @ApiModelProperty(value = "创建时间", dataType = "String")
     @TableField("create_time")
     private String createTime;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificateReport.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificateReport.java
index f01db9e..db06018 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificateReport.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificateReport.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.model.business;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -22,6 +29,11 @@
  * @author wangpeng
  * @since 2023-08-14
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @ApiModel
 @Data
 @TableName("biz_business_certificate_report")
@@ -36,6 +48,7 @@
     /**
      * 证书报告编号
      */
+    @ExcelProperty(value = "证书报告编号", order = 1)
     @ApiModelProperty(value = "证书报告编号", dataType = "String")
     @TableField("certificate_report_no")
     private String certificateReportNo;
@@ -43,6 +56,7 @@
     /**
      * 证书报告名称
      */
+    @ExcelProperty(value = "证书报告名称", order = 2)
     @ApiModelProperty(value = "证书报告名称", dataType = "String")
     @TableField("certificate_report_name")
     private String certificateReportName;
@@ -62,6 +76,7 @@
     @TableField("measure_category")
     private String measureCategory;
 
+    @ExcelProperty(value = "检校类别", order = 6)
     @ApiModelProperty(value = "检校类别(字典value)", dataType = "String")
     @TableField(exist = false)
     private String measureCategoryName;
@@ -69,6 +84,7 @@
     /**
      * 检校时间
      */
+    @ExcelProperty(value = "检校时间", order = 8)
     @ApiModelProperty(value = "检校时间", dataType = "String")
     @TableField("calibration_time")
     private String calibrationTime;
@@ -267,18 +283,22 @@
     @TableField(exist = false)
     private Integer decisionItem;
 
-    @ApiModelProperty(value = "设备样品编号（列表返回参数）", dataType = "String")
+    @ExcelProperty(value = "被检设备统一编号", order = 3)
+    @ApiModelProperty(value = "被检设备统一编号（列表返回参数）", dataType = "String")
     @TableField(exist = false)
     private String sampleNo;
 
-    @ApiModelProperty(value = "设备样品名称（列表返回参数）", dataType = "String")
+    @ExcelProperty(value = "被检设备名称", order = 4)
+    @ApiModelProperty(value = "被检设备名称（列表返回参数）", dataType = "String")
     @TableField(exist = false)
     private String sampleName;
 
-    @ApiModelProperty(value = "设备样品规格型号（列表返回参数）", dataType = "String")
+    @ExcelProperty(value = "规格型号", order = 5)
+    @ApiModelProperty(value = "规格型号（列表返回参数）", dataType = "String")
     @TableField(exist = false)
     private String sampleModel;
 
+    @ExcelProperty(value = "检定员", order = 7)
     @ApiModelProperty(value = "检定员名字（列表返回参数）", dataType = "String")
     @TableField(exist = false)
     private String staffName;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessIdentifyInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessIdentifyInfo.java
index 46bfba5..f1a9bec 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessIdentifyInfo.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessIdentifyInfo.java
@@ -1,10 +1,15 @@
 package com.casic.missiles.model.business;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 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;
 
@@ -20,6 +25,11 @@
  * @author wangpeng
  * @since 2023-08-15
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @Data
 @TableName("biz_business_identify_info")
 public class BizBusinessIdentifyInfo implements Serializable {
@@ -33,6 +43,7 @@
     /**
      * 记录编号
      */
+    @ExcelProperty(value = "记录编号", order = 1)
     @ApiModelProperty(value = "记录编号", dataType = "String")
     @TableField("record_no")
     private String recordNo;
@@ -41,20 +52,15 @@
      * 标志类型(字典code)
      */
     @NotEmpty(message = "标志类型不能为空")
-    @ApiModelProperty(value = "标志类型(字典code)", dataType = "String")
-    @DictCodeField(message = "标志类型不合法", cacheName = MeterDictCode.IDENTIFY_PRINT_TYPE)
+    @ApiModelProperty(value = "标志类型(直接存计量标识/使用状态/校准状态的字典value)", dataType = "String")
     @TableField("identify_type")
     private String identifyType;
 
-    @ApiModelProperty(value = "标志类型(字典value)", dataType = "String")
-    @TableField(exist = false)
-    private String identifyTypeName;
-
     /**
      * 设备id(可以是受检设备/设备台账)
      */
     @NotNull(message = "设备id不能为空")
-    @ApiModelProperty(value = "设备id(可以是受检设备/设备台账)", dataType = "String")
+    @ApiModelProperty(value = "设备id(可以是受检设备/设备台账)", dataType = "Long")
     @TableField("device_id")
     private Long deviceId;
 
@@ -66,29 +72,32 @@
     @TableField("device_type")
     private String deviceType;
 
+    @ExcelProperty(value = "统一编号", order = 3)
     @NotEmpty(message = "设备编号不能为空")
-    @ApiModelProperty(value = "设备编号", dataType = "String")
+    @ApiModelProperty(value = "统一编号", dataType = "String")
     @TableField("device_no")
     private String deviceNo;
 
     /**
      * 设备名字
      */
-    @NotEmpty(message = "设备名字不能为空")
-    @ApiModelProperty(value = "设备名字", dataType = "String")
+    @ExcelProperty(value = "设备名称", order = 4)
+    @NotEmpty(message = "设备名称不能为空")
+    @ApiModelProperty(value = "设备名称", dataType = "String")
     @TableField("device_name")
     private String deviceName;
 
     /**
      * 检定员id
      */
-    @ApiModelProperty(value = "检定员id", dataType = "String")
+    @ApiModelProperty(value = "检定员id", dataType = "Long")
     @TableField("measure_person_id")
     private Long measurePersonId;
 
     /**
      * 检定员名字
      */
+    @ExcelProperty(value = "检定员", order = 5)
     @ApiModelProperty(value = "检定员名字", dataType = "String")
     @TableField("measure_person")
     private String measurePerson;
@@ -103,7 +112,8 @@
     /**
      * 更新时间
      */
-    @ApiModelProperty(value = "更新时间", dataType = "String")
+    @ExcelProperty(value = "打印时间", order = 6)
+    @ApiModelProperty(value = "打印时间", dataType = "String")
     @TableField("update_time")
     private String updateTime;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceAssess.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceAssess.java
index 659d9ca..6720b90 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceAssess.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceAssess.java
@@ -1,11 +1,26 @@
 package com.casic.missiles.model.business;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 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 com.casic.missiles.dto.BaseRequest;
+import com.casic.missiles.dto.business.outsource.OrderSampleDTO;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import javax.validation.constraints.NotEmpty;
 import java.io.Serializable;
+import java.util.List;
 
 /**
  * <p>
@@ -15,146 +30,231 @@
  * @author wangpeng
  * @since 2023-08-16
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
+@ApiModel
 @Data
 @TableName("biz_business_outsource_assess")
-public class BizBusinessOutsourceAssess implements Serializable {
+public class BizBusinessOutsourceAssess extends BaseRequest implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
+    @ApiModelProperty(value = "id，更新/删除使用参数", dataType = "Long")
     @TableId("id")
     private Long id;
 
     /**
      * 评审表编号
      */
+    @ExcelProperty(value = "评审表编号", order = 1)
+    @ApiModelProperty(value = "评审表编号(后台生成)", dataType = "String")
     @TableField("project_no")
     private String projectNo;
 
     /**
      * 评审表名称
      */
+    @ExcelProperty(value = "评审表名称", order = 2)
+    @ApiModelProperty(value = "评审表名称", dataType = "String")
     @TableField("project_name")
     private String projectName;
 
+    @NotEmpty(message = "实验室代码不能为空")
+    @DictCodeField(message = "实验室代码描述不合法", cacheName = MeterDictCode.LAB_CODE)
+    @ApiModelProperty(value = "实验室代码(字典code)", dataType = "String")
+    @TableField("lab_code")
+    private String labCode;
+
+    @ApiModelProperty(value = "实验室代码(字典value)", dataType = "String")
+    @TableField(exist = false)
+    private String labCodeName;
+
+    /**
+     * 组别代码
+     */
+    @NotEmpty(message = "组别代码不能为空")
+    @DictCodeField(message = "组别代码描述不合法", cacheName = MeterDictCode.GROUP_CODE)
+    @ApiModelProperty(value = "组别代码(字典code)", dataType = "String")
+    @TableField("group_code")
+    private String groupCode;
+
+    @ApiModelProperty(value = "组别代码(字典value)", dataType = "String")
+    @TableField(exist = false)
+    private String groupCodeName;
+
     /**
      * 申请人id
      */
+    @ApiModelProperty(value = "申请人id", dataType = "String")
     @TableField("applicant_id")
     private Long applicantId;
 
     /**
      * 申请人名字
      */
+    @ExcelProperty(value = "申请人", order = 5)
+    @ApiModelProperty(value = "申请人", dataType = "String")
     @TableField("applicant_name")
     private String applicantName;
 
     /**
      * 申请时间
      */
+    @ExcelProperty(value = "申请时间", order = 6)
+    @ApiModelProperty(value = "申请时间", dataType = "String")
     @TableField("applicant_time")
     private String applicantTime;
 
     /**
      * 附件(minio存储文件名)
      */
+    @ApiModelProperty(value = "附件(minio存储文件名)", dataType = "String")
     @TableField("minio_file_name")
     private String minioFileName;
 
     /**
      * 备注
      */
+    @ApiModelProperty(value = "备注", dataType = "String")
     @TableField("remark")
     private String remark;
 
     /**
      * 创建人id
      */
+    @ApiModelProperty(value = "创建人id", dataType = "String")
     @TableField("create_user_id")
     private Long createUserId;
 
     /**
      * 创建人名字
      */
+    @ApiModelProperty(value = "创建人名字", dataType = "String")
     @TableField("create_user_name")
     private String createUserName;
 
     /**
      * 分包方id
      */
+    @ApiModelProperty(value = "评审表编号", dataType = "String")
     @TableField("outsourcer_id")
     private Long outsourcerId;
 
     /**
      * 预计开始时间
      */
+    @ApiModelProperty(value = "预计开始时间", dataType = "String")
     @TableField("pre_start_time")
     private String preStartTime;
 
     /**
      * 预计结束时间
      */
+    @ApiModelProperty(value = "预计结束时间", dataType = "String")
     @TableField("pre_end_time")
     private String preEndTime;
 
     /**
      * 分包原因-字典
      */
+    @ApiModelProperty(value = "分包原因(字典code)", dataType = "String")
+    @DictCodeField(message = "分包原因描述不合法", cacheName = MeterDictCode.OUTSOURCE_REASON)
     @TableField("outsource_reason")
     private String outsourceReason;
 
+    @ApiModelProperty(value = "分包原因(字典value)", dataType = "String")
+    @TableField(exist = false)
+    private String outsourceReasonName;
+
     /**
      * 预计费用
      */
+    @ApiModelProperty(value = "预计费用", dataType = "String")
     @TableField("pre_cost")
     private String preCost;
 
     /**
      * 审批状态
      */
+    @ApiModelProperty(value = "审批状态", dataType = "String")
+    @DictCodeField(message = "审批状态描述不合法", cacheName = MeterDictCode.APPROVAL_STATUS)
     @TableField("approval_status")
     private String approvalStatus;
 
     /**
      * 流程实例id
      */
+    @ApiModelProperty(value = "流程实例id", dataType = "String")
     @TableField("process_id")
     private String processId;
 
     /**
      * 实验室认可情况
      */
+    @ApiModelProperty(value = "实验室认可情况", dataType = "String")
     @TableField("approve_situation")
     private String approveSituation;
 
     /**
      * 溯源性
      */
+    @ApiModelProperty(value = "溯源性", dataType = "String")
     @TableField("traceability")
     private String traceability;
 
     /**
      * 测试方法
      */
+    @ApiModelProperty(value = "测试方法", dataType = "String")
     @TableField("test_method")
     private String testMethod;
 
     /**
      * 技术能力
      */
+    @ApiModelProperty(value = "技术能力", dataType = "String")
     @TableField("technique_ability")
     private String techniqueAbility;
 
     /**
      * 创建时间
      */
+    @ApiModelProperty(hidden = true)
     @TableField("create_time")
     private String createTime;
 
     /**
      * 更新时间
      */
+    @ApiModelProperty(hidden = true)
     @TableField("update_time")
     private String updateTime;
 
+    @ApiModelProperty(value = "审批状态类型-字典value", dataType = "String")
+    @TableField(exist = false)
+    private String approvalStatusName;
 
+    @ApiModelProperty(value = "任务id（同意、驳回等操作使用）", dataType = "String")
+    @TableField(exist = false)
+    private String taskId;
+
+    @ApiModelProperty(value = "可选决策项（1同意驳回拒绝 2同意驳回 3同意拒绝，用于待审批列表同意/驳回/拒绝按钮展示）", dataType = "Integer")
+    @TableField(exist = false)
+    private Integer decisionItem;
+
+    @NotEmpty(message = "受检设备信息不能为空")
+    @ApiModelProperty(value = "受检设备id列表（新建使用参数）", dataType = "List")
+    @TableField(exist = false)
+    private List<OrderSampleDTO> orderSampleList;
+
+    @ExcelProperty(value = "分包机构名称", order = 3)
+    @ApiModelProperty(value = "分包机构名称（列表返回参数）", dataType = "String")
+    private String outsourcerName;
+
+    @ExcelProperty(value = "机构负责人", order = 4)
+    @ApiModelProperty(value = "机构负责人（列表返回参数）", dataType = "String")
+    private String director;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceProtocol.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceProtocol.java
new file mode 100644
index 0000000..38df697
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceProtocol.java
@@ -0,0 +1,225 @@
+package com.casic.missiles.model.business;
+
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
+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 com.casic.missiles.dto.BaseRequest;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotEmpty;
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 计量检定业务-分包管理-测试、校准或检定工作分包协议书
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-08-24
+ */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
+@Data
+@TableName("biz_business_outsource_protocol")
+public class BizBusinessOutsourceProtocol extends BaseRequest implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "id，更新/删除使用参数", dataType = "Long")
+    @TableId("id")
+    private Long id;
+
+    /**
+     * 协议书编号
+     */
+    @ExcelProperty(value = "协议书编号", order = 1)
+    @ApiModelProperty(value = "协议书编号(后台生成)", dataType = "String")
+    @TableField("protocol_no")
+    private String protocolNo;
+
+    /**
+     * 协议书名称
+     */
+    @ExcelProperty(value = "协议书名称", order = 2)
+    @ApiModelProperty(value = "协议书名称", dataType = "String")
+    @TableField("project_name")
+    private String projectName;
+
+    @NotEmpty(message = "实验室代码不能为空")
+    @DictCodeField(message = "实验室代码描述不合法", cacheName = MeterDictCode.LAB_CODE)
+    @ApiModelProperty(value = "实验室代码(字典code)", dataType = "String")
+    @TableField("lab_code")
+    private String labCode;
+
+    @ApiModelProperty(value = "实验室代码(字典value)", dataType = "String")
+    @TableField(exist = false)
+    private String labCodeName;
+
+    @NotEmpty(message = "组别代码不能为空")
+    @DictCodeField(message = "组别代码描述不合法", cacheName = MeterDictCode.GROUP_CODE)
+    @ApiModelProperty(value = "组别代码(字典code)", dataType = "String")
+    @TableField("group_code")
+    private String groupCode;
+
+    @ApiModelProperty(value = "组别代码(字典value)", dataType = "String")
+    @TableField(exist = false)
+    private String groupCodeName;
+
+    /**
+     * 分包方id
+     */
+    @ApiModelProperty(value = "分包方id", dataType = "Long")
+    @TableField("outsourcer_id")
+    private Long outsourcerId;
+
+    /**
+     * 其他
+     */
+    @ApiModelProperty(value = "其他", dataType = "String")
+    @TableField("remark")
+    private String remark;
+
+    /**
+     * 分包方编号
+     */
+    @ApiModelProperty(value = "分包方编号(新建不用传)", dataType = "String")
+    @TableField("outsource_no")
+    private String outsourceNo;
+
+    /**
+     * 分包方名称
+     */
+    @ExcelProperty(value = "分包方名称", order = 3)
+    @ApiModelProperty(value = "分包方名称(新建不用传)", dataType = "String")
+    @TableField("outsource_name")
+    private String outsourceName;
+
+    /**
+     * 联系人
+     */
+    @ExcelProperty(value = "联系人", order = 4)
+    @ApiModelProperty(value = "联系人", dataType = "String")
+    @TableField("contacts")
+    private String contacts;
+
+    /**
+     * 电话
+     */
+    @ApiModelProperty(value = "电话", dataType = "String")
+    @TableField("mobile")
+    private String mobile;
+
+    /**
+     * 地址
+     */
+    @ApiModelProperty(value = "地址", dataType = "String")
+    @TableField("address")
+    private String address;
+
+    /**
+     * 要求完成日期
+     */
+    @ApiModelProperty(value = "要求完成日期", dataType = "String")
+    @TableField("require_date")
+    private String requireDate;
+
+    /**
+     * 分包费用(元)
+     */
+    @ApiModelProperty(value = "分包费用(元)", dataType = "String")
+    @TableField("outsource_cost")
+    private Double outsourceCost;
+
+    /**
+     * 分包方负责人
+     */
+    @ApiModelProperty(value = "分包方负责人", dataType = "String")
+    @TableField("director")
+    private String director;
+
+    /**
+     * 分包项目
+     */
+    @ApiModelProperty(value = "分包项目", dataType = "String")
+    @TableField("item")
+    private String item;
+
+    /**
+     * 分包要求
+     */
+    @ApiModelProperty(value = "分包要求", dataType = "String")
+    @TableField("requires")
+    private String requires;
+
+    /**
+     * 创建人id
+     */
+    @ApiModelProperty(hidden = true)
+    @TableField("create_user_id")
+    private Long createUserId;
+
+    /**
+     * 创建人名字
+     */
+    @ExcelProperty(value = "申请人", order = 5)
+    @ApiModelProperty(value = "申请人", dataType = "String")
+    @TableField("create_user_name")
+    private String createUserName;
+
+    /**
+     * 审批状态
+     */
+    @ApiModelProperty(value = "审批状态", dataType = "String")
+    @DictCodeField(message = "审批状态描述不合法", cacheName = MeterDictCode.APPROVAL_STATUS)
+    @TableField("approval_status")
+    private String approvalStatus;
+
+    /**
+     * 流程实例id
+     */
+    @ApiModelProperty(value = "流程实例id", dataType = "String")
+    @TableField("process_id")
+    private String processId;
+
+    /**
+     * 创建时间
+     */
+    @ExcelProperty(value = "申请时间", order = 6)
+    @ApiModelProperty(value = "申请时间", dataType = "String")
+    @TableField("create_time")
+    private String createTime;
+
+    /**
+     * 更新时间
+     */
+    @ApiModelProperty(hidden = true)
+    @TableField("update_time")
+    private String updateTime;
+
+    @ApiModelProperty(value = "审批状态类型-字典value", dataType = "String")
+    @TableField(exist = false)
+    private String approvalStatusName;
+
+    @ApiModelProperty(value = "任务id（同意、驳回等操作使用）", dataType = "String")
+    @TableField(exist = false)
+    private String taskId;
+
+    @ApiModelProperty(value = "可选决策项（1同意驳回拒绝 2同意驳回 3同意拒绝，用于待审批列表同意/驳回/拒绝按钮展示）", dataType = "Integer")
+    @TableField(exist = false)
+    private Integer decisionItem;
+
+
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourcerInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourcerInfo.java
index ec4e997..f9aa69e 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourcerInfo.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourcerInfo.java
@@ -17,6 +17,7 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import javax.validation.constraints.NotEmpty;
 import java.io.Serializable;
 
 /**
@@ -59,6 +60,29 @@
     @TableField("outsourcer_name")
     private String outsourcerName;
 
+    @NotEmpty(message = "实验室代码不能为空")
+    @DictCodeField(message = "实验室代码描述不合法", cacheName = MeterDictCode.LAB_CODE)
+    @ApiModelProperty(value = "实验室代码(字典code)", dataType = "String")
+    @TableField("lab_code")
+    private String labCode;
+
+    @ApiModelProperty(value = "实验室代码(字典value)", dataType = "String")
+    @TableField(exist = false)
+    private String labCodeName;
+
+    /**
+     * 组别代码
+     */
+    @NotEmpty(message = "组别代码不能为空")
+    @DictCodeField(message = "组别代码描述不合法", cacheName = MeterDictCode.GROUP_CODE)
+    @ApiModelProperty(value = "组别代码(字典code)", dataType = "String")
+    @TableField("group_code")
+    private String groupCode;
+
+    @ApiModelProperty(value = "组别代码(字典value)", dataType = "String")
+    @TableField(exist = false)
+    private String groupCodeName;
+
     /**
      * 单位简称
      */
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardInfo.java
index c48eed7..dffdfdd 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardInfo.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardInfo.java
@@ -5,6 +5,7 @@
 import com.baomidou.mybatisplus.annotation.TableName;
 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;
 
@@ -18,6 +19,7 @@
  * @author wangpeng
  * @since 2023-08-04
  */
+@ApiModel
 @Data
 @TableName("biz_equipment_standard_info")
 public class BizEquipmentStandardInfo implements Serializable {
@@ -119,7 +121,7 @@
      * 管理状态(字典code)
      */
     @ApiModelProperty(value = "管理状态(字典code)", dataType = "String")
-    @DictCodeField(message = "管理状态不合法", cacheName = MeterDictCode.MANAGER_STATE)
+    @DictCodeField(message = "管理状态不合法", cacheName = MeterDictCode.STANDARD_MANAGER_STATE)
     @TableField("manage_status")
     private String manageStatus;
 
@@ -151,7 +153,7 @@
     /**
      * 温度(℃)
      */
-    @ApiModelProperty(value = "使用状态(字典code)", dataType = "String")
+    @ApiModelProperty(value = "温度(℃)", dataType = "String")
     @TableField("temperature")
     private Double temperature;
 

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java
index bb0c50f..13a699b 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java
@@ -12,6 +12,7 @@
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.IGeneralApprovalService;
+import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
@@ -19,6 +20,7 @@
 import org.springframework.web.bind.annotation.RequestBody;
 
 import javax.validation.Valid;
+import java.util.List;
 import java.util.Objects;
 
 /**
@@ -117,4 +119,17 @@
         }
         return baseApprovalService.failUpdate(request);
     }
+
+    public List<O> exportList(@RequestBody @Valid R request) throws Exception {
+        List<O> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = baseApprovalService.listExportByIds(request.getIds());
+        } else {
+            list = baseApprovalService.listExport(request);
+        }
+        for (O record : list) {
+            DictCodeUtils.convertDictCodeToName(record);
+        }
+        return list;
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java
index 8a90961..d775831 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java
@@ -5,6 +5,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.business.certificate.CertificateChangeApplyApprovalListRequest;
 import com.casic.missiles.dto.business.certificate.CertificateChangeApplySaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessCertificateChangeApply;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
@@ -20,6 +21,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -48,4 +50,12 @@
         }
         return changeApplyService.saveChangeApply(request);
     }
+
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody CertificateChangeApplyApprovalListRequest request) throws Exception {
+        List<BizBusinessCertificateChangeApply> list = super.exportList(request);
+        super.exportExcel(BizBusinessCertificateChangeApply.class, list, ExportEnum.CERTIFICATE_CHANGE_APPLY.getSheetName());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java
index 5fc4b07..af8230e 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java
@@ -9,6 +9,7 @@
 import com.casic.missiles.dto.business.certificate.CertificatePrintApprovalListRequest;
 import com.casic.missiles.dto.business.certificate.CertificatePrintListResponse;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.enums.business.CertificatePrintStatusEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessCertificatePrintLog;
@@ -18,10 +19,16 @@
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.io.IOException;
+import java.util.List;
 import java.util.Objects;
 
 /**
@@ -98,4 +105,16 @@
         });
         return certificatePrintService.certificatePrintLog(idDTO.getId());
     }
+
+    @ApiOperation("证书打印审批导出")
+    @PostMapping("/listExport")
+    public void exportList(@RequestBody CertificatePrintApprovalListRequest request) throws IOException {
+        List<CertificatePrintListResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = certificatePrintService.listByIds(request.getIds());
+        } else {
+            list = certificatePrintService.list(request);
+        }
+        super.exportExcel(CertificatePrintListResponse.class, list, ExportEnum.CERTIFICATE_PRINT.getSheetName());
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java
index 63b06dc..6b2efd5 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java
@@ -6,6 +6,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.business.certificate.CertificateReportApprovalListRequest;
 import com.casic.missiles.dto.business.certificate.CertificateReportSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessCertificateReport;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
@@ -21,6 +22,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -50,7 +52,7 @@
         return certificateReportService.saveCertificateReport(request);
     }
 
-    @ApiOperation("证书审批详情（基本信息）")
+    @ApiOperation("详情（基本信息）")
     @PostMapping("/detail")
     public ReturnDTO<BizBusinessCertificateReport> detail(@RequestBody @Valid BaseDetailRequest request, BindingResult bindingResult) throws Exception {
         if(bindingResult.hasErrors()){
@@ -59,4 +61,11 @@
         return certificateReportService.detail(request);
     }
 
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody CertificateReportApprovalListRequest request) throws Exception {
+        List<BizBusinessCertificateReport> list = super.exportList(request);
+        super.exportExcel(BizBusinessCertificateReport.class, list, ExportEnum.CERTIFICATE_REPORT.getSheetName());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java
index 46b26bd..57c0809 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java
@@ -10,20 +10,21 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.business.identify.IdentifyListRequest;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessIdentifyInfo;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.business.IBizBusinessIdentifyInfoService;
+import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import javax.validation.Valid;
+import java.util.List;
 import java.util.Objects;
 
 /**
@@ -57,16 +58,13 @@
         return identifyInfoService.addIdentify(identifyInfo);
     }
 
-    @ApiOperation("标识打印更新")
+    @ApiOperation("标识打印更新（更新打印时间）")
     @PostMapping("/update")
-    public ReturnDTO updateIdentify(@RequestBody @Valid BizBusinessIdentifyInfo identifyInfo, BindingResult bindingResult) {
-        Assert.isFalse(Objects.isNull(identifyInfo.getId()), () -> {
+    public ReturnDTO updateIdentify(@RequestBody @Valid IdDTO idDTO) {
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        Assert.isFalse(bindingResult.hasErrors(), () -> {
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        });
-        return identifyInfoService.updateIdentify(identifyInfo);
+        return identifyInfoService.updateIdentify(idDTO.getId());
     }
 
     @ApiOperation("标识打印删除")
@@ -77,4 +75,37 @@
         });
         return identifyInfoService.deleteIdentify(idDTO.getId());
     }
+
+    @ApiOperation("标识打印导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody @Valid IdentifyListRequest request, BindingResult bindingResult) throws Exception {
+        if (bindingResult.hasErrors()) {
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        List<BizBusinessIdentifyInfo> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = identifyInfoService.listByIds(request.getIds());
+        } else {
+            list = identifyInfoService.list(request);
+        }
+        for (BizBusinessIdentifyInfo record : list) {
+            DictCodeUtils.convertDictCodeToName(record);
+        }
+        super.exportExcel(BizBusinessIdentifyInfo.class, list, ExportEnum.IDENTIFY_EXPORT.getSheetName());
+    }
+
+
+    // TODO: 2023/8/23 查询设备信息，4个底部按钮查设备（按钮的作用就是前端用来调不同接口、用来区分中间即将展示的标识），前端弹窗选设备，在确定保存时前端根据底部按钮判断传入设备类型deviceType字典code
+    // TODO: 2023/8/23 接口：查受检设备（第1个按钮），查设备台账（后3个按钮同一接口），查询之后前端根据标志类型的不同加到中间页面时进行判断（按产品给的对应表）
+    // TODO: 2023/8/23 提供二维码接口，前端在加到中间页面时调用一下
+
+    @ApiOperation("设备二维码")
+    @PostMapping("/equipment/qrCode")
+    public ReturnDTO<String> equipmentQrCode(@RequestBody @Valid IdDTO idDTO) {
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return identifyInfoService.equipmentQrCode(idDTO.getId());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java
index 707be6e..7e0453d 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java
@@ -117,7 +117,7 @@
     }
 
     @ApiOperation("任务单导出")
-    @PostMapping("/export")
+    @PostMapping("/listExport")
     public void orderExport(@RequestBody @Valid OrderListRequest request, HttpServletResponse response) {
         businessOrderService.orderExport(request, response);
     }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java
index 529a6ce..51432be 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java
@@ -1,9 +1,28 @@
 package com.casic.missiles.controller.business;
 
+import com.casic.missiles.controller.GeneralApprovalController;
+import com.casic.missiles.dto.BaseApprovalSubmitRequest;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.business.outsource.OutsourceAssessApprovalListRequest;
+import com.casic.missiles.dto.business.outsource.OutsourceAssessSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
+import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.model.business.BizBusinessOutsourceAssess;
+import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
+import com.casic.missiles.service.IGeneralApprovalService;
+import com.casic.missiles.service.business.IBizBusinessOutsourceAssessService;
 import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.BindingResult;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.validation.Valid;
+import java.util.List;
+
 /**
  * <p>
  * 计量检定业务-分包管理-测试、校准或检定工作分包评审表 前端控制器
@@ -15,6 +34,27 @@
 @Api(tags = "分包管理-测试、校准或检定工作分包评审表")
 @RestController
 @RequestMapping("/business/outsource/assess")
-public class BizBusinessOutsourceAssessController {
+public class BizBusinessOutsourceAssessController extends GeneralApprovalController<BizBusinessOutsourceAssess, BizBusinessOutsourceAssess, OutsourceAssessApprovalListRequest, BaseApprovalSubmitRequest> {
+    @Autowired
+    private IBizBusinessOutsourceAssessService outsourceAssessService;
 
+    public BizBusinessOutsourceAssessController(IGeneralApprovalService<BizBusinessOutsourceAssess, BizBusinessOutsourceAssess, OutsourceAssessApprovalListRequest, BaseApprovalSubmitRequest> baseApprovalService) {
+        super(baseApprovalService);
+    }
+
+    @ApiOperation("草稿箱-保存")
+    @PostMapping("/save")
+    public ReturnDTO<OutsourceAssessSaveResponse> saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceAssess request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        return outsourceAssessService.saveOutsourceAssess(request);
+    }
+
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception {
+        List<BizBusinessOutsourceAssess> list = super.exportList(request);
+        super.exportExcel(BizBusinessOutsourceAssess.class, list, ExportEnum.OUTSOURCE_ASSESS.getSheetName());
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java
new file mode 100644
index 0000000..9adef18
--- /dev/null
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java
@@ -0,0 +1,60 @@
+package com.casic.missiles.controller.business;
+
+import com.casic.missiles.controller.GeneralApprovalController;
+import com.casic.missiles.dto.BaseApprovalSubmitRequest;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.business.outsource.OutsourceProtocolApprovalListRequest;
+import com.casic.missiles.dto.business.outsource.OutsourceProtocolSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
+import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.model.business.BizBusinessOutsourceProtocol;
+import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
+import com.casic.missiles.service.IGeneralApprovalService;
+import com.casic.missiles.service.business.IBizBusinessOutsourceProtocolService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.BindingResult;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.validation.Valid;
+import java.util.List;
+
+/**
+ * <p>
+ * 计量检定业务-分包管理-测试、校准或检定工作分包协议书 前端控制器
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-08-24
+ */
+@Api(tags = "分包管理-测试、校准或检定工作分包协议书")
+@RestController
+@RequestMapping("/business/outsource/protocol")
+public class BizBusinessOutsourceProtocolController extends GeneralApprovalController<BizBusinessOutsourceProtocol, BizBusinessOutsourceProtocol, OutsourceProtocolApprovalListRequest, BaseApprovalSubmitRequest> {
+    @Autowired
+    private IBizBusinessOutsourceProtocolService outsourceProtocolService;
+
+    public BizBusinessOutsourceProtocolController(IGeneralApprovalService<BizBusinessOutsourceProtocol, BizBusinessOutsourceProtocol, OutsourceProtocolApprovalListRequest, BaseApprovalSubmitRequest> baseApprovalService) {
+        super(baseApprovalService);
+    }
+
+    @ApiOperation("草稿箱-保存")
+    @PostMapping("/save")
+    public ReturnDTO<OutsourceProtocolSaveResponse> saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceProtocol request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        return outsourceProtocolService.saveOutsourceProtocol(request);
+    }
+
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody OutsourceProtocolApprovalListRequest request) throws Exception {
+        List<BizBusinessOutsourceProtocol> list = super.exportList(request);
+        super.exportExcel(BizBusinessOutsourceProtocol.class, list, ExportEnum.OUTSOURCE_PROTOCOL.getSheetName());
+    }
+}
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java
index 097f645..f0f0943 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java
@@ -17,7 +17,6 @@
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.IGeneralApprovalService;
 import com.casic.missiles.service.business.IBizBusinessOutsourcerInfoService;
-import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -71,19 +70,8 @@
 
     @ApiOperation("分包方导出")
     @PostMapping("/listExport")
-    public void export(@RequestBody @Valid OutsourcerInfoApprovalListRequest request, BindingResult bindingResult) throws Exception {
-        if (bindingResult.hasErrors()) {
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        }
-        List<BizBusinessOutsourcerInfo> list;
-        if (!CollectionUtils.isEmpty(request.getIds())) {
-            list = outsourcerInfoService.listByIds(request.getIds());
-        } else {
-            list = outsourcerInfoService.list(request);
-        }
-        for (BizBusinessOutsourcerInfo record : list) {
-            DictCodeUtils.convertDictCodeToName(record);
-        }
+    public void export(@RequestBody OutsourcerInfoApprovalListRequest request) throws Exception {
+        List<BizBusinessOutsourcerInfo> list = super.exportList(request);
         super.exportExcel(BizBusinessOutsourcerInfo.class, list, ExportEnum.OUTSOURCER_EXPORT.getSheetName());
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java
index c2cbf9f..0410918 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java
@@ -17,11 +17,9 @@
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.IGeneralApprovalService;
 import com.casic.missiles.service.business.IBizBusinessSiteExecutiveInfoService;
-import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -60,7 +58,7 @@
         return siteExecutiveInfoService.saveSiteExecutiveInfo(siteExecutiveInfo);
     }
 
-    @ApiOperation("现场检测详情")
+    @ApiOperation("详情")
     @PostMapping("/detail")
     public ReturnDTO<SiteExecutiveDetailResponse> siteExecutiveDetail(@RequestBody @Valid IdDTO idDTO) throws Exception {
         Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
@@ -69,21 +67,10 @@
         return ReturnUtil.success(siteExecutiveInfoService.detail(idDTO.getId()));
     }
 
-    @ApiOperation("现场检测导出")
+    @ApiOperation("导出")
     @PostMapping("/listExport")
-    public void export(@RequestBody @Valid SiteExecutiveApprovalListRequest request, BindingResult bindingResult) throws Exception {
-        if (bindingResult.hasErrors()) {
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        }
-        List<SiteExecutiveApprovalListResponse> list;
-        if (!CollectionUtils.isEmpty(request.getIds())) {
-            list = siteExecutiveInfoService.listInfoByIds(request.getIds());
-        } else {
-            list = siteExecutiveInfoService.listInfo(request);
-        }
-        for (SiteExecutiveApprovalListResponse record : list) {
-            DictCodeUtils.convertDictCodeToName(record);
-        }
+    public void export(@RequestBody SiteExecutiveApprovalListRequest request) throws Exception {
+        List<SiteExecutiveApprovalListResponse> list = super.exportList(request);
         super.exportExcel(SiteExecutiveApprovalListResponse.class, list, ExportEnum.SITE_EXECUTIVE_EXPORT.getSheetName());
     }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
index 7e793cd..a92e209 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
@@ -55,7 +55,7 @@
 
     @ApiOperation("设备收发列表导出")
     @PostMapping("/export")
-    public void exportList(@RequestBody @Valid SampleDispatchListRequest request) throws IOException {
+    public void exportList(@RequestBody SampleDispatchListRequest request) throws IOException {
         List<SampleDispatchListResponse> list;
         if (!CollectionUtils.isEmpty(request.getIds())) {
             list = dispatchService.listByIds(request.getIds());
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java
index cdc77fc..d120fd4 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java
@@ -7,6 +7,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.business.labExecutive.*;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.business.IBusinessLabExecutiveInfoService;
@@ -14,6 +15,7 @@
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.*;
 
@@ -32,7 +34,7 @@
     @Autowired
     private IBusinessLabExecutiveInfoService labExecutiveInfoService;
 
-    @ApiOperation("实验室检测-部门检测-查询各状态列表（待检测、检测中、检测完）")
+    @ApiOperation("实验室任务-查询各状态列表（待检测、检测中、检测完）")
     @PostMapping("/deptExecutive/List")
     public ReturnDTO<PageInfoBT<SampleLabExecutiveListResponse>> queryDeptExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
@@ -43,10 +45,19 @@
         return ReturnUtil.success(super.packForBT(labExecutiveInfoService.deptLabExecutiveListPage(page, labExecutiveListRequest)));
     }
 
-    /**
-     * 实验室检测-我的检测-查询各状态列表（待检测、检测中、检测完）
-     */
-    @ApiOperation("实验室检测-我的检测-查询各状态列表（待检测、检测中、检测完）")
+    @ApiOperation("实验室任务导出")
+    @PostMapping("/deptExecutive/export")
+    public void deptExportList(@RequestBody @Valid SampleLabExecutiveListRequest request) throws Exception {
+        List<SampleLabExecutiveListResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = labExecutiveInfoService.deptLabExecutiveListByIds(request.getMeasureStatus(), request.getIds());
+        } else {
+            list = labExecutiveInfoService.deptLabExecutiveList(request);
+        }
+        super.exportExcel(SampleLabExecutiveListResponse.class, list, ExportEnum.DEPT_EXECUTIVE_TASK.getSheetName());
+    }
+
+    @ApiOperation("我的任务-查询各状态列表（待检测、检测中、检测完）")
     @PostMapping("/myExecutive/list")
     public ReturnDTO<PageInfoBT<SampleLabExecutiveListResponse>> queryMyExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
@@ -57,19 +68,25 @@
         return ReturnUtil.success(super.packForBT(labExecutiveInfoService.myLabExecutiveListPage(page, labExecutiveListRequest)));
     }
 
-    /**
-     * 实验室检测-我的检测-查询各状态样品数量（待检测、检测中、检测完）
-     */
-    @ApiOperation("实验室检测-我的检测-查询各状态样品数量（待检测、检测中、检测完）")
+    @ApiOperation("我的任务导出")
+    @PostMapping("/myExecutive/export")
+    public void exportList(@RequestBody @Valid SampleLabExecutiveListRequest request) throws Exception {
+        List<SampleLabExecutiveListResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = labExecutiveInfoService.myLabExecutiveListByIds(request.getMeasureStatus(), request.getIds());
+        } else {
+            list = labExecutiveInfoService.myLabExecutiveList(request);
+        }
+        super.exportExcel(SampleLabExecutiveListResponse.class, list, ExportEnum.MY_EXECUTIVE_TASK.getSheetName());
+    }
+
+    @ApiOperation("我的任务-查询各状态样品数量（待检测、检测中、检测完）")
     @GetMapping("/myExecutive/amount")
     public ReturnDTO<List<SampleAmountResponse>> queryMyExecutiveAmount() {
         return ReturnUtil.success(labExecutiveInfoService.myExecutiveAmount());
     }
 
-    /**
-     * 实验室检测-部门检测-分配（分配给具体人员）
-     */
-    @ApiOperation("实验室检测-部门检测-分配按钮（分配给具体人员）")
+    @ApiOperation("实验室任务-分配按钮（分配给具体人员）")
     @PostMapping("/deptExecutive/allocate")
     public ReturnDTO allocateStaff(@RequestBody @Valid SampleAllocateRequest sampleAllocateRequest, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -78,10 +95,7 @@
         return labExecutiveInfoService.allocateStaff(sampleAllocateRequest);
     }
 
-    /**
-     * 实验室检测-我的检测-检定人扫描收入（待检测->检测中）
-     */
-    @ApiOperation("实验室检测-我的检测-检定人扫描收入（待检测->检测中）")
+    @ApiOperation("我的任务-检定人扫描收入（待检测->检测中）")
     @PostMapping("/myExecutive/receive")
     public ReturnDTO sampleReceive(@RequestBody @Valid List<SampleOperateRequest> requestList, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -90,10 +104,7 @@
         return labExecutiveInfoService.sampleReceive(requestList);
     }
 
-    /**
-     * 实验室检测-负责人/检定人扫描检完（检测中->检测完）
-     */
-    @ApiOperation("实验室检测-负责人/检定人扫描检完（检测中->检测完）")
+    @ApiOperation("实验室任务-负责人/检定人扫描检完（检测中->检测完）")
     @PostMapping("/myExecutive/complete")
     public ReturnDTO sampleExecutiveComplete(@RequestBody @Valid List<SampleOperateRequest> requestList, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -102,10 +113,7 @@
         return labExecutiveInfoService.sampleExecutiveComplete(requestList);
     }
 
-    /**
-     * 实验室检测-部门检测/我的检测 编辑（只能修改应出具证书）
-     */
-    @ApiOperation("实验室检测-部门检测/我的检测 编辑（只能修改应出具证书）")
+    @ApiOperation("实验室任务/我的任务 编辑（只能修改应出具证书）")
     @PostMapping("/executive/update")
     public ReturnDTO updateExecutive(@RequestBody @Valid UpdateExecutiveRequest request, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -114,10 +122,7 @@
         return labExecutiveInfoService.updateExecutive(request);
     }
 
-    /**
-     * 实验室检测-部门检测/我的检测 详情
-     */
-    @ApiOperation("实验室检测-部门检测/我的检测 详情")
+    @ApiOperation("实验室任务/我的任务 详情")
     @PostMapping("/executive/detail")
     public ReturnDTO<ExecutiveDetailResponse> executiveDetail(@RequestBody @Valid ExecutiveDetailRequest request, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
@@ -131,7 +136,7 @@
      * 退回后会将下一个要执行的实验室检测状态更新为待分配，将后面的实验室顺序变更为连续（都进行减1）
      * 最后一个检测的实验室退回，等分发员再增加实验室或设备收发中的已收入直接手动点击完成
      */
-    @ApiOperation("实验室检测-部门检测/我的检测 退回（待检测/检测中->退回）")
+    @ApiOperation("实验室任务/我的任务 退回（待检测/检测中->退回）")
     @PostMapping("/executive/sendBack")
     public ReturnDTO executiveSendBack(@RequestBody @Valid ExecutiveSendBackRequest request, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -140,9 +145,6 @@
         return labExecutiveInfoService.sampleExecutiveSendBack(request);
     }
 
-    /**
-     * 分发员编辑实验室检测列表
-     */
     @ApiOperation("分发员编辑实验室检测列表")
     @PostMapping("/handOut/updateList")
     public ReturnDTO updateExecutiveList(@RequestBody @Valid UpdateExecutiveListRequest request, BindingResult bindingResult) {
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java
index 48a67ed..0c04f31 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java
@@ -10,6 +10,7 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.resource.customer.CustomerApprovalListRequest;
 import com.casic.missiles.dto.resource.customer.CustomerSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceCustomerInfo;
@@ -26,6 +27,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -55,6 +57,13 @@
         return customerInfoService.saveCustomerInfo(request);
     }
 
+    @ApiOperation("委托方名录导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody CustomerApprovalListRequest request) throws Exception {
+        List<BizResourceCustomerInfo> list = super.exportList(request);
+        super.exportExcel(BizResourceCustomerInfo.class, list, ExportEnum.CUSTOMER_INFO.getSheetName());
+    }
+
     @ApiOperation("委托方人员列表（分页）")
     @PostMapping("/person/listPage")
     public ReturnDTO<PageInfoBT<BizResourceCustomerStaff>> personListPage(@RequestBody IdDTO idDto) {
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
index 972ed4b..6418ea5 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
@@ -5,6 +5,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.resource.customer.SuggestFormApprovalListRequest;
 import com.casic.missiles.dto.resource.customer.SuggestFormSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceCustomerSuggestForm;
@@ -20,6 +21,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -50,4 +52,11 @@
         return suggestFormService.saveSuggestForm(request);
     }
 
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody SuggestFormApprovalListRequest request) throws Exception {
+        List<BizResourceCustomerSuggestForm> list = super.exportList(request);
+        super.exportExcel(BizResourceCustomerSuggestForm.class, list, ExportEnum.CUSTOMER_SUGGEST_FORM.getSheetName());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java
index 1934d1a..9e07eab 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java
@@ -15,12 +15,16 @@
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.resource.IEnvEnvironmentRecordConfigService;
 import com.casic.missiles.service.resource.IEnvEnvironmentRecordDataService;
+import com.casic.missiles.service.resource.IEnvLocationInfoService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
 import java.util.List;
@@ -39,6 +43,8 @@
     private IEnvEnvironmentRecordDataService environmentRecordDataService;
     @Autowired
     private IEnvEnvironmentRecordConfigService environmentRecordConfigService;
+    @Autowired
+    private IEnvLocationInfoService locationInfoService;
 
     @ApiOperation("环境记录单数据列表/详情")
     @PostMapping("/data/listPage")
@@ -95,4 +101,11 @@
         });
         return environmentRecordConfigService.deleteEnvironmentRecordConfig(idDTO.getId());
     }
+
+    @ApiOperation("地点列表")
+    @PostMapping("/location/listPage")
+    public ReturnDTO<PageInfoBT<LocationListResponse>> locationListPage(@RequestBody @Valid LocationListRequest request) {
+        Page<LocationListResponse> page = PageFactory.defaultPage();
+        return ReturnUtil.success(super.packForBT(locationInfoService.listPage(page, request)));
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java
index 82efe3f..e9561fa 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java
@@ -10,6 +10,7 @@
 import com.casic.missiles.dto.resource.seal.SealLogListRequest;
 import com.casic.missiles.dto.resource.seal.SealNoteApprovalListRequest;
 import com.casic.missiles.dto.resource.seal.SealNoteSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceSealUseLog;
@@ -27,6 +28,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -58,6 +60,13 @@
         return sealUseNoteService.saveSeal(request);
     }
 
+    @ApiOperation("印章使用登记导出（列表和导出中去掉经办人和监印人）")
+    @PostMapping("/listExport")
+    public void export(@RequestBody SealNoteApprovalListRequest request) throws Exception {
+        List<BizResourceSealUseNote> list = super.exportList(request);
+        super.exportExcel(BizResourceSealUseNote.class, list, ExportEnum.SEAL_NOTE.getSheetName());
+    }
+
     // TODO: 2023/7/28 印章使用日志：系统中使用印章时插入数据库
 
     @ApiOperation("印章使用日志列表（分页）")
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java
index 9b674fc..06b6521 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java
@@ -9,16 +9,20 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.resource.staff.StaffCertRequest;
 import com.casic.missiles.dto.resource.staff.StaffCertResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.service.resource.IBizResourceStaffInfoService;
 import com.casic.missiles.service.resource.IBizResourceStaffVerifierService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.List;
+
 /**
  * @Description:
  * @Author: wangpeng
@@ -41,9 +45,21 @@
         return ReturnUtil.success(super.packForBT(responsePage));
     }
 
+    @ApiOperation("证书逾期提醒导出")
+    @PostMapping("/listExport")
+    public void exportList(@RequestBody StaffCertRequest request) throws Exception {
+        List<StaffCertResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = staffInfoService.certListByIds(request.getIds());
+        } else {
+            list = staffInfoService.certList(request);
+        }
+        super.exportExcel(StaffCertResponse.class, list, ExportEnum.STAFF_CERTIFICATE_EXPIRE.getSheetName());
+    }
+
     @ApiOperation("证书逾期提醒")
     @PostMapping("/expirationReminder")
-    public ReturnDTO expirationReminder(@RequestBody IdDTO idDto) {
-        return verifierService.expirationReminder(idDto);
+    public ReturnDTO expirationReminder(@RequestBody IdDTO idDTO) {
+        return verifierService.expirationReminder(idDTO);
     }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java
index 3b251ad..a6e7850 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java
@@ -12,6 +12,7 @@
 import com.casic.missiles.dto.resource.staff.StaffListRequest;
 import com.casic.missiles.dto.resource.staff.TrainListRequest;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.*;
@@ -22,7 +23,10 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
 import java.util.List;
@@ -52,8 +56,19 @@
             throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
         }
         Page<BizResourceStaffInfo> page = PageFactory.defaultPage();
-        Page<BizResourceStaffInfo> responsePage = staffInfoService.listPage(page, request);
-        return ReturnUtil.success(super.packForBT(responsePage));
+        return ReturnUtil.success(super.packForBT(staffInfoService.listPage(page, request)));
+    }
+
+    @ApiOperation("人员登记导出")
+    @PostMapping("/listExport")
+    public void exportList(@RequestBody StaffListRequest request) throws Exception {
+        List<BizResourceStaffInfo> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = staffInfoService.listByIds(request.getIds());
+        } else {
+            list = staffInfoService.list(request);
+        }
+        super.exportExcel(BizResourceStaffInfo.class, list, ExportEnum.STAFF_INFO.getSheetName());
     }
 
     @ApiOperation("人员登记详情基础信息")
@@ -85,9 +100,9 @@
 
     @ApiOperation("科研教育列表（分页）")
     @PostMapping("/education/listPage")
-    public ReturnDTO<PageInfoBT<BizResourceStaffEducation>> educationListPage(@RequestBody IdDTO idDto) {
+    public ReturnDTO<PageInfoBT<BizResourceStaffEducation>> educationListPage(@RequestBody IdDTO idDTO) {
         Page<BizResourceStaffEducation> page = PageFactory.defaultPage();
-        Page<BizResourceStaffEducation> responsePage = staffInfoService.educationListPage(page, idDto);
+        Page<BizResourceStaffEducation> responsePage = staffInfoService.educationListPage(page, idDTO);
         return ReturnUtil.success(super.packForBT(responsePage));
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java
index af6aa86..d85d84a 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java
@@ -9,6 +9,7 @@
 import com.casic.missiles.dto.resource.outsideService.SupplierApprovalListRequest;
 import com.casic.missiles.dto.resource.outsideService.SupplierSaveResponse;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceSupplierAbility;
@@ -67,6 +68,13 @@
         return ReturnUtil.success(supplierInfoService.detail(idDTO.getId()));
     }
 
+    @ApiOperation("合格供方导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody SupplierApprovalListRequest request) throws Exception {
+        List<BizResourceSupplierInfo> list = super.exportList(request);
+        super.exportExcel(BizResourceSupplierInfo.class, list, ExportEnum.SUPPLIER_INFO.getSheetName());
+    }
+
     @ApiOperation("供方人员列表（分页）")
     @PostMapping("/person/listPage")
     public ReturnDTO<PageInfoBT<BizResourceSupplierPerson>> personListPage(@RequestBody IdDTO idDTO) {
diff --git a/casic-metering-api/src/main/resources/config/application.yml b/casic-metering-api/src/main/resources/config/application.yml
index 350db5f..ecff521 100644
--- a/casic-metering-api/src/main/resources/config/application.yml
+++ b/casic-metering-api/src/main/resources/config/application.yml
@@ -126,7 +126,7 @@
     #作者
     author: wangpeng
     #待生成对象表名
-    table-name: biz_equipment_technical_target_approval,biz_equipment_attachment_approval,biz_equipment_checkpoint_approval
+    table-name: biz_business_outsource_protocol
 
 reminder:
   #节点--common模块config包 ReminderNodeConfig配置
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
index 4a19e4e..d47d552 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
@@ -53,6 +53,7 @@
     SUGGEST_FORM_SAVE_FAILED(2509, "委托方意见登记表保存至草稿箱失败"),
     EXAMINE_FORM_SAVE_FAILED(2510, "要求、委托书及合同评审表保存至草稿箱失败"),
     CUSTOMER_EXIST_SAVE_FAILED(2511, "该委托方已存在，请重新选择"),
+    DUPLICATE_LOCATION_NO(2512, "地点编号已存在"),
 
     /**
      * 计量检定业务模块
@@ -68,6 +69,8 @@
     COMPLETE_SAMPLE_NOT_EXIST(2609, "检测中不存在扫描收入的样品"),
     CANNOT_CHANGE_MEASURE_INFO(2610, "无法更改非当前登录用户的检测信息"),
     NON_EXIST_ORDER_OR_SAMPLE(2611, "不存在该委托单或该委托单下的样品"),
+    OUTSOURCE_ACCESS_SAVE_FAILED(2612, "测试、校准或检定工作分包评审表保存至草稿箱失败"),
+    OUTSOURCE_PROTOCOL_SAVE_FAILED(2613, "测试、校准或检定工作分包协议书保存至草稿箱失败"),
 
     /**
      * 历史遗留备用
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
index 5089ad1..81a406b 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
@@ -10,54 +10,38 @@
     /**
      * 资源管理
      */
-    ENVIRONMENT_DATA_EXPORT("environmentData", "environmentData", "环境记录单数据"),
+    ENVIRONMENT_DATA_EXPORT("environmentData", "环境记录单数据", "环境记录单数据"),
+    STAFF_INFO("staffInfo", "人员登记", "人员登记"),
+    STAFF_CERTIFICATE_EXPIRE("certificateExpire", "证书逾期提醒", "证书逾期提醒"),
+    SUPPLIER_INFO("supplierInfo", "合格供方名录", "合格供方名录"),
+    CUSTOMER_INFO("customerInfo", "委托方名录", "委托方名录"),
+    CUSTOMER_SUGGEST_FORM("customerSuggestForm", "委托方意见登记表", "委托方意见登记表"),
+    SEAL_NOTE("sealNote", "印章使用登记", "印章使用登记"),
 
-    FILE_EXPORT("meterFileData", "meterFileData", "计量文件信息"),
-    TRAIN_PLAN_EXPORT("trainPlanData", "trainPlanData", "培训计划"),
-    TRAIN_LOG_EXPORT("trainLogData", "trainLogData", "培训记录"),
-    METER_ORGANIZE_EXPORT("meterOrganizeData", "meterOrganizeData", "计量组织"),
-    TRACE_SUPPLIER_EXPORT("traceSupplierData", "traceSupplierData", "溯源供方"),
-    SIGN_EXPORT("signData", "signData", "签名/签章"),
-    TEMPLATE_EXPORT("templateData", "templateData", "原始记录模板/证书报告模板"),
-    FIXED_ASSETS("meterFixedAssets", "meterFixedAssets", "固定资产"),
-    METER_EQUIPMENT("meterEquipment", "meterEquipment", "测量设备"),
-    CALIBRATION_TEST_EQUIPMENT("calibrationTestEquipment", "calibrationTestEquipment", "校准检定设备"),
-    MEASURE_ACCOUNT("measureAccount", "measureAccount", "测量工装"),
-    STANDARD_SUPPORT_EQUIPMENT("standardSupportEquipment", "standardSupportEquipment", "标准配套设备"),
-    STANDARD_EQUIPMENT("standardEquipment", "standardEquipment", "标准装置"),
-    FLOW_DEF_EXPORT("flowDefData", "flowDefData", "流程定义"),
-    STAFF_CERTIFICATE("certificate", "certificate", "计量人员证书"),
-    CHECK_INFO("checkInfo", "checkInfo", "设备管理点检测"),
-    EQUIPMENT_APPLY("equipmentApply", "equipmentApply", "设备借用"),
-    STANDARD_EQUIPMENT_REMIND("equipmentApplyRemind", "equipmentApplyRemind", "标准装置到期提醒"),
-    METER_PRICE("meterPrice", "meterPrice", "价格库"),
-    METER_STAFF("meterStaff", "meterStaff", "计量人员"),
-    STANDARD_EQUIPMENT_APPLY("standardEquipmentApply", "standardEquipmentApply", "标准装置申请"),
-    STATE_MANAGE_APPLY("stateManage", "stateManage", "状态管理"),
-    METER_ACCEPTANCE_CHECK("acceptanceCheck", "acceptanceCheck", "设备检修保养验收单"),
-    CUSTOMER_EXPORT("customerData", "customerData", "客户信息"),
-    ORDER_EXPORT("orderData", "orderData", "委托书信息"),
-    SAMPLE_EXPORT("sampleData", "sampleData", "样本信息"),
-    EXCHANGE_DATA("exchangeData", "exchangeData", "设备交接单"),
-    DISPATCH_DATA("dispatchData", "dispatchData", "设备收发"),
-    ENVIRONMENT_DATA("environmentData", "environmentData", "环境记录单"),
-    ORIGIN_DATA("originData", "originData", "原始记录"),
-    CERTIFICATE_REPORT("certificateReport", "certificateReport", "证书报告"),
-    ADVICE_EXPORT("adviceData", "adviceData", "客户反馈"),
-    HANDOUT_EXPORT("handoutData", "handoutData", "任务分发列表"),
-    OUTSOURCER_EXPORT("outsourcerData", "outsourcerData", "分包方"),
-    SITE_EXECUTIVE_EXPORT("siteExecutiveData", "siteExecutiveData", "现场测试、校准或检定"),
-    CERTIFICATE_PRINT_EXPORT("certificatePrintData", "certificatePrintData", "证书打印"),
-    DOWNLOAD_TEMPLATE("downloadTemplate", "downloadTemplate", "页面配置"),
-    OUTSOURCER_CERTIFICATE_EXPORT("outsourceCertificateData", "outsourceCertificateData", "分包证书"),
-    SETTLEMENT_INFO_EXPORT("settlementInfoData", "settlementInfoData", "业务结算"),
-    EQUIPMENT_REMIND("equipmentRemind", "equipmentRemind", "设备到期提醒"),
-    AGREEMENT_INFO_EXPORT("agreementInfoData", "agreementInfoData", "合同"),
-    WORK_STATISTICS_EXPORT("workStatisticsData", "workStatisticsData", "实时工作统计"),
-    DEPT_OUTPUT_EXPORT("deptOutputData", "deptOutputData", "部门产值分析"),
-    WORKLOAD_EXPORT("workloadData", "workloadData", "业务工作量分析"),
-    DEPT_COMPREHENSIVE_EXPORT("deptComprehensiveData", "deptComprehensiveData", "部门综合分析"),
-    ENVIRONMENTAL_RECORD("environmentalRecordData", "environmentalRecordData", "现场环境记录");
+    /**
+     * 计量检定业务
+     */
+    OUTSOURCER_EXPORT("outsourcerData", "分包方名录", "分包方名录"),
+    IDENTIFY_EXPORT("identifyData", "计量标识", "计量标识"),
+    ORDER_EXPORT("orderData", "任务单", "任务单"),
+    DISPATCH_DATA("dispatchData", "设备收发", "设备收发"),
+    HANDOUT_EXPORT("handoutData", "任务分发", "任务分发"),
+    SITE_EXECUTIVE_EXPORT("siteExecutiveData", "现场测试、校准或检定", "现场测试、校准或检定"),
+    CERTIFICATE_REPORT("certificateReport", "证书审批", "证书审批"),
+    CERTIFICATE_CHANGE_APPLY("certificateChangeApply", "证书报告补充或更换申请单", "证书报告补充或更换申请单"),
+    CERTIFICATE_PRINT("certificatePrintData", "证书打印审批", "证书打印审批"),
+    DEPT_EXECUTIVE_TASK("deptExecutiveTaskData", "实验室任务", "实验室任务"),
+    MY_EXECUTIVE_TASK("myExecutiveTaskData", "我的任务", "我的任务"),
+    OUTSOURCE_ASSESS("outsourceAssess", "测试、校准或检定工作分包评审表", "测试、校准或检定工作分包评审表"),
+    OUTSOURCE_PROTOCOL("outsourceProtocol", "测试、校准或检定工作分包协议书", "测试、校准或检定工作分包协议书"),
+
+    /**
+     * 系统管理
+     */
+    SIGN_EXPORT("signData", "签名", "签名"),
+    TEMPLATE_EXPORT("templateData", "文件模板", "文件模板"),
+    FLOW_DEF_EXPORT("flowDefData", "流程定义", "流程定义"),
+    DOWNLOAD_TEMPLATE("downloadTemplate", "流程定义", "页面配置");
 
     ExportEnum(String fileName, String sheetName, String description) {
         this.fileName = fileName;
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateRecordTypeCodeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateRecordTypeCodeEnum.java
index 31d913c..a963522 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateRecordTypeCodeEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateRecordTypeCodeEnum.java
@@ -46,4 +46,14 @@
     String SITE_EXECUTIVE_APPROVAL = "01";
     //《现场测试、校准或检定工作记录表》
     String SITE_EXECUTIVE_LOG = "02";
+
+    //测试、校准或检定工作分包协议书
+    String OUTSOURCE_PROTOCOL = "01";
+    //测试、校准或检定工作分包评审表
+    String OUTSOURCE_ACCESS = "02";
+    //测试、校准或检定工作分包通知书
+    String OUTSOURCE_NOTICE = "03";
+    //测试、校准或检定工作分包方名录
+    String OUTSOURCE_INFO = "04";
+
 }
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
index 24b8635..f78bd53 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
@@ -15,6 +15,10 @@
     String CERTIFICATE_CHANGE_APPLY_BEAN_NAME = "certificateChangeApplyBean";
     //现场测试、校准或检定
     String SITE_EXECUTIVE_BEAN_NAME = "siteExecutiveBean";
+    //测试、校准或检定工作分包评审表
+    String OUTSOURCE_ASSESS_BEAN_NAME = "outsourceAssessBean";
+    //测试、校准或检定工作分包协议书
+    String OUTSOURCE_PROTOCOL_BEAN_NAME = "outsourceProtocolBean";
 
     /*********************************设备与装置************************************/
     //设备台账
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 b21c661..6b86fd1 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
@@ -18,6 +18,8 @@
     OUTSOURCER_APPROVAL(OUTSOURCER_BEAN_NAME, ""),
     CERTIFICATE_CHANGE_APPROVAL(CERTIFICATE_CHANGE_APPLY_BEAN_NAME, ""),
     SITE_EXECUTIVE_APPROVAL(SITE_EXECUTIVE_BEAN_NAME, ""),
+    OUTSOURCE_ASSESS_APPROVAL(OUTSOURCE_ASSESS_BEAN_NAME, ""),
+    OUTSOURCE_PROTOCOL_APPROVAL(OUTSOURCE_PROTOCOL_BEAN_NAME, ""),
 
     ACTION_STATUS_MAP(new HashMap<String, AwareActionStatusEnum>() {
         {
@@ -47,6 +49,10 @@
             put(ApplyFromIdEnum.CERTIFICATE_CHANGE_APPROVAL.getCode(), CERTIFICATE_CHANGE_APPROVAL);
             //现场测试、校准或检定审批
             put(ApplyFromIdEnum.SITE_EXECUTIVE_APPROVAL.getCode(), SITE_EXECUTIVE_APPROVAL);
+            //测试、校准或检定工作分包评审表
+            put(ApplyFromIdEnum.OUTSOURCE_ASSESS_APPROVAL.getCode(), OUTSOURCE_ASSESS_APPROVAL);
+            //测试、校准或检定工作分包协议书
+            put(ApplyFromIdEnum.OUTSOURCE_PROTOCOL_APPROVAL.getCode(), OUTSOURCE_PROTOCOL_APPROVAL);
         }
     });
     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 934405e..c7410bd 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
@@ -9,6 +9,8 @@
     CERTIFICATE_CHANGE_APPROVAL("jljdywzsbchghsqd", MessageSourceModuleEnum.BUSINESS.getCode(), "证书/报告补充或更换申请单"),
     OUTSOURCER_APPROVAL("jljdywcsjzhgfbfml", MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定合格分包方名录"),
     SITE_EXECUTIVE_APPROVAL("jljdywxccsjzsp", MessageSourceModuleEnum.BUSINESS.getCode(), "现场测试、校准或检定审批"),
+    OUTSOURCE_ASSESS_APPROVAL("jljdywcsjzfbpsb", MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包评审表"),
+    OUTSOURCE_PROTOCOL_APPROVAL("jljdywcsjzfbxys", MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包协议书"),
 
 
     /*******************************************设备与装置*********************************************/
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/GeneralApprovalMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/GeneralApprovalMapper.java
index 4fb7344..0c9d6ae 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/GeneralApprovalMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/GeneralApprovalMapper.java
@@ -17,8 +17,4 @@
 
     Page<O> selectBatchForApprovalList(Page<O> page, @Param("request") R request, @Param("businessKeys") List<String> businessKeys);
 
-//    Page<O> selectListPage(Page<O> page, @Param("request") R request);
-
-//    Long selectMaxNo();
-
 }
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceAssessMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceAssessMapper.java
index 7867bb8..ba59009 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceAssessMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceAssessMapper.java
@@ -1,7 +1,12 @@
 package com.casic.missiles.mapper.business;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.business.outsource.OutsourceAssessApprovalListRequest;
+import com.casic.missiles.mapper.GeneralApprovalMapper;
 import com.casic.missiles.model.business.BizBusinessOutsourceAssess;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * <p>
@@ -11,6 +16,10 @@
  * @author wangpeng
  * @since 2023-08-16
  */
-public interface BizBusinessOutsourceAssessMapper extends BaseMapper<BizBusinessOutsourceAssess> {
+public interface BizBusinessOutsourceAssessMapper extends GeneralApprovalMapper<BizBusinessOutsourceAssess, BizBusinessOutsourceAssess, OutsourceAssessApprovalListRequest> {
+
+    Page<BizBusinessOutsourceAssess> selectBatchForApprovalList(Page<BizBusinessOutsourceAssess> page, @Param("request") OutsourceAssessApprovalListRequest request, @Param("businessKeys") List<String> businessKeys);
+
+    Long selectMaxProjectNo();
 
 }
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceProtocolMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceProtocolMapper.java
new file mode 100644
index 0000000..e6aba35
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceProtocolMapper.java
@@ -0,0 +1,24 @@
+package com.casic.missiles.mapper.business;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.business.outsource.OutsourceProtocolApprovalListRequest;
+import com.casic.missiles.mapper.GeneralApprovalMapper;
+import com.casic.missiles.model.business.BizBusinessOutsourceProtocol;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 计量检定业务-分包管理-测试、校准或检定工作分包协议书 Mapper 接口
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-08-24
+ */
+public interface BizBusinessOutsourceProtocolMapper extends GeneralApprovalMapper<BizBusinessOutsourceProtocol, BizBusinessOutsourceProtocol, OutsourceProtocolApprovalListRequest> {
+
+    Page<BizBusinessOutsourceProtocol> selectBatchForApprovalList(Page<BizBusinessOutsourceProtocol> page, @Param("request") OutsourceProtocolApprovalListRequest request, @Param("businessKeys") List<String> businessKeys);
+
+    Long selectMaxProtocolNo();
+}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/EnvLocationInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/EnvLocationInfoMapper.java
new file mode 100644
index 0000000..49eff87
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/EnvLocationInfoMapper.java
@@ -0,0 +1,21 @@
+package com.casic.missiles.mapper.resource;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.resource.environment.LocationListRequest;
+import com.casic.missiles.dto.resource.environment.LocationListResponse;
+import com.casic.missiles.model.resource.EnvLocationInfo;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * <p>
+ * 实验室环境监控系统-设备表 Mapper 接口
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-06-07
+ */
+public interface EnvLocationInfoMapper extends BaseMapper<EnvLocationInfo> {
+
+    Page<LocationListResponse> selectLocationListPage(Page<LocationListResponse> page, @Param("request") LocationListRequest request);
+}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java
index de124db..85ed0f7 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java
@@ -1,7 +1,9 @@
 package com.casic.missiles.mapper.system;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.dto.system.SignDetailResponse;
+import com.casic.missiles.dto.system.SignListRequest;
 import com.casic.missiles.model.system.SystemSign;
 import org.apache.ibatis.annotations.Param;
 
@@ -22,4 +24,8 @@
     SignDetailResponse selectSignDetailById(Long id);
 
     List<SystemSign> selectUsableSignList(@Param("userId") Long userId);
+
+    Page<SystemSign> selectSignListPage(Page<SystemSign> page, @Param("request") SignListRequest request);
+
+    List<SystemSign> selectSignList(@Param("request") SignListRequest request);
 }
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateChangeApplyMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateChangeApplyMapper.xml
index d798447..c496092 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateChangeApplyMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateChangeApplyMapper.xml
@@ -30,31 +30,31 @@
         SELECT *
         FROM biz_business_certificate_change_apply
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.changeApplyNo != null and request.changeApplyNo !=''">
+        <if test="request != null and request.changeApplyNo != null and request.changeApplyNo !=''">
             and change_apply_no like concat('%',#{request.changeApplyNo},'%')
         </if>
-        <if test="request.changeReportNo != null and request.changeReportNo !=''">
+        <if test="request != null and request.changeReportNo != null and request.changeReportNo !=''">
             and change_report_no like concat('%',#{request.changeReportNo},'%')
         </if>
-        <if test="request.changeReportName != null and request.changeReportName !=''">
+        <if test="request != null and request.changeReportName != null and request.changeReportName !=''">
             and change_report_name like concat('%',#{request.changeReportName},'%')
         </if>
-        <if test="request.changeType != null and request.changeType !=''">
+        <if test="request != null and request.changeType != null and request.changeType !=''">
             and change_type = #{request.changeType}
         </if>
-        <if test="request.createUserName != null and request.createUserName !=''">
+        <if test="request != null and request.createUserName != null and request.createUserName !=''">
             and create_user_name like concat('%',#{request.createUserName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificatePrintMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificatePrintMapper.xml
index b66cd99..49c0ac8 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificatePrintMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificatePrintMapper.xml
@@ -31,34 +31,34 @@
         LEFT JOIN biz_business_order_sample_relation bosr ON (bosr.order_id = bcr.order_id AND bosr.sample_id = bcr.sample_id)
         LEFT JOIN biz_business_order_info boi ON boi.id = bosr.order_id
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and bcp.approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.printStatus != null and request.printStatus !=''">
+        <if test="request != null and request.printStatus != null and request.printStatus !=''">
             and print_status = #{request.printStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and bcp.create_user_id = #{request.createUserId}
         </if>
-        <if test="request.certificateReportNo != null and request.certificateReportNo !=''">
+        <if test="request != null and request.certificateReportNo != null and request.certificateReportNo !=''">
             and bcr.certificate_report_no like concat('%',#{request.certificateReportNo},'%')
         </if>
-        <if test="request.certificateReportName != null and request.certificateReportName !=''">
+        <if test="request != null and request.certificateReportName != null and request.certificateReportName !=''">
             and bcr.certificate_report_name like concat('%',#{request.certificateReportName},'%')
         </if>
-        <if test="request.customerName != null and request.customerName !=''">
+        <if test="request != null and request.customerName != null and request.customerName !=''">
             and boi.customer_name like concat('%',#{request.customerName},'%')
         </if>
-        <if test="request.sampleNo != null and request.sampleNo !=''">
+        <if test="request != null and request.sampleNo != null and request.sampleNo !=''">
             and bosr.sample_no like concat('%',#{request.sampleNo},'%')
         </if>
-        <if test="request.sampleName != null and request.sampleName !=''">
+        <if test="request != null and request.sampleName != null and request.sampleName !=''">
             and bosr.sample_name like concat('%',#{request.sampleName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and bcp.create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and bcp.create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml
index b366034..767695d 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml
@@ -46,33 +46,37 @@
         SELECT bcr.*, bosr.sample_no, bosr.sample_name, bosr.sample_model, rsi.staff_name
         FROM biz_business_certificate_report bcr
         LEFT JOIN biz_business_order_sample_relation bosr ON (bosr.order_id = bcr.order_id AND bosr.sample_id = bcr.sample_id)
+        LEFT JOIN biz_business_order_info boi ON boi.id = bcr.order_id
         LEFT JOIN biz_resource_staff_info rsi ON rsi.id = bcr.measure_person_id
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and bcr.approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and bcr.create_user_id = #{request.createUserId}
         </if>
-        <if test="request.certificateReportNo != null and request.certificateReportNo !=''">
+        <if test="request != null and request.customerId != null and request.customerId !=''">
+            and boi.customer_id = #{request.customerId}
+        </if>
+        <if test="request != null and request.certificateReportNo != null and request.certificateReportNo !=''">
             and bcr.certificate_report_no like concat('%',#{request.certificateReportNo},'%')
         </if>
-        <if test="request.certificateReportName != null and request.certificateReportName !=''">
+        <if test="request != null and request.certificateReportName != null and request.certificateReportName !=''">
             and bcr.certificate_report_name like concat('%',#{request.certificateReportName},'%')
         </if>
-        <if test="request.sampleNo != null and request.sampleNo !=''">
+        <if test="request != null and request.sampleNo != null and request.sampleNo !=''">
             and bosr.sample_no like concat('%',#{request.sampleNo},'%')
         </if>
-        <if test="request.measureCategory != null and request.measureCategory !=''">
+        <if test="request != null and request.measureCategory != null and request.measureCategory !=''">
             and bcr.measure_category = #{request.measureCategory}
         </if>
-        <if test="request.measurePerson != null and request.measurePerson !=''">
+        <if test="request != null and request.measurePerson != null and request.measurePerson !=''">
             and rsi.staff_name like concat('%',#{request.measurePerson},'%')
         </if>
-        <if test="request.calibrationTimeStart != null and request.calibrationTimeStart !=''">
+        <if test="request != null and request.calibrationTimeStart != null and request.calibrationTimeStart !=''">
             and bcr.calibration_time &gt;= #{request.calibrationTimeStart}
         </if>
-        <if test="request.calibrationTimeEnd != null and request.calibrationTimeEnd !=''">
+        <if test="request != null and request.calibrationTimeEnd != null and request.calibrationTimeEnd !=''">
             and bcr.calibration_time &lt;= #{request.calibrationTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceAssessMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceAssessMapper.xml
index d0fcf8b..c22c101 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceAssessMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceAssessMapper.xml
@@ -7,6 +7,8 @@
         <id column="id" property="id" />
         <result column="project_no" property="projectNo" />
         <result column="project_name" property="projectName" />
+        <result column="lab_code" property="labCode" />
+        <result column="group_code" property="groupCode" />
         <result column="applicant_id" property="applicantId" />
         <result column="applicant_name" property="applicantName" />
         <result column="applicant_time" property="applicantTime" />
@@ -31,7 +33,45 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, project_no, project_name, applicant_id, applicant_name, applicant_time, minio_file_name, remark, create_user_id, create_user_name, outsourcer_id, pre_start_time, pre_end_time, outsource_reason, pre_cost, approval_status, process_id, approve_situation, traceability, test_method, technique_ability, create_time, update_time
+        id, project_no, project_name, lab_code, group_code, applicant_id, applicant_name, applicant_time, minio_file_name, remark, create_user_id, create_user_name, outsourcer_id, pre_start_time, pre_end_time, outsource_reason, pre_cost, approval_status, process_id, approve_situation, traceability, test_method, technique_ability, create_time, update_time
     </sql>
 
+    <select id="selectMaxProjectNo" resultType="java.lang.Long">
+        SELECT IFNULL(max(RIGHT(project_no, 3)), 0) from biz_business_outsource_assess
+    </select>
+
+    <select id="selectBatchForApprovalList" resultMap="BaseResultMap">
+        SELECT bboa.*, bboi.outsourcer_name, bboi.director
+        FROM biz_business_outsource_assess bboa
+        LEFT JOIN biz_business_outsourcer_info bboi ON bboa.outsourcer_id = bboi.id
+        WHERE 1=1
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
+            and bboa.approval_status = #{request.approvalStatus}
+        </if>
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
+            and bboa.create_user_id = #{request.createUserId}
+        </if>
+        <if test="request != null and request.projectNo != null and request.projectNo !=''">
+            and bboa.project_no like concat('%',#{request.projectNo},'%')
+        </if>
+        <if test="request != null and request.outsourcerName != null and request.outsourcerName !=''">
+            and bboi.outsourcer_name like concat('%',#{request.outsourcerName},'%')
+        </if>
+        <if test="request != null and request.applicantName != null and request.applicantName !=''">
+            and bboa.applicant_name like concat('%',#{request.applicantName},'%')
+        </if>
+        <if test="request != null and request.applicantTimeStart != null and request.applicantTimeStart !=''">
+            and bboa.applicant_time &gt;= #{request.applicantTimeStart}
+        </if>
+        <if test="request != null and request.applicantTimeEnd != null and request.applicantTimeEnd !=''">
+            and bboa.applicant_time &lt;= #{request.applicantTimeEnd}
+        </if>
+        <if test="businessKeys != null">
+            and bboa.id in
+            <foreach collection="businessKeys" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
+        ORDER BY bboa.create_time DESC
+    </select>
 </mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceProtocolMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceProtocolMapper.xml
new file mode 100644
index 0000000..b7b2149
--- /dev/null
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceProtocolMapper.xml
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.mapper.business.BizBusinessOutsourceProtocolMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.business.BizBusinessOutsourceProtocol">
+        <id column="id" property="id" />
+        <result column="protocol_no" property="protocolNo" />
+        <result column="project_name" property="projectName" />
+        <result column="lab_code" property="labCode" />
+        <result column="group_code" property="groupCode" />
+        <result column="outsourcer_id" property="outsourcerId" />
+        <result column="remark" property="remark" />
+        <result column="outsource_no" property="outsourceNo" />
+        <result column="outsource_name" property="outsourceName" />
+        <result column="contacts" property="contacts" />
+        <result column="mobile" property="mobile" />
+        <result column="address" property="address" />
+        <result column="require_date" property="requireDate" />
+        <result column="outsource_cost" property="outsourceCost" />
+        <result column="director" property="director" />
+        <result column="item" property="item" />
+        <result column="requires" property="requires" />
+        <result column="create_user_id" property="createUserId" />
+        <result column="create_user_name" property="createUserName" />
+        <result column="approval_status" property="approvalStatus" />
+        <result column="process_id" property="processId" />
+        <result column="create_time" property="createTime" />
+        <result column="update_time" property="updateTime" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, protocol_no, project_name, lab_code, group_code, outsourcer_id, remark, outsource_no, outsource_name, contacts, mobile, address, require_date, outsource_cost, director, item, requires, create_user_id, create_user_name, approval_status, process_id, create_time, update_time
+    </sql>
+
+    <select id="selectMaxProtocolNo" resultType="java.lang.Long">
+        SELECT IFNULL(max(RIGHT(protocol_no, 3)), 0) from biz_business_outsource_protocol
+    </select>
+
+    <select id="selectBatchForApprovalList" resultMap="BaseResultMap">
+        SELECT *
+        FROM biz_business_outsource_protocol
+        WHERE 1=1
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
+            and approval_status = #{request.approvalStatus}
+        </if>
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
+            and create_user_id = #{request.createUserId}
+        </if>
+        <if test="request != null and request.protocolNo != null and request.protocolNo !=''">
+            and protocol_no like concat('%',#{request.protocolNo},'%')
+        </if>
+        <if test="request != null and request.outsourcerName != null and request.outsourcerName !=''">
+            and outsourcer_name like concat('%',#{request.outsourcerName},'%')
+        </if>
+        <if test="request != null and request.applicantName != null and request.applicantName !=''">
+            and create_user_name like concat('%',#{request.applicantName},'%')
+        </if>
+        <if test="request != null and request.applicantTimeStart != null and request.applicantTimeStart !=''">
+            and create_time &gt;= #{request.applicantTimeStart}
+        </if>
+        <if test="request != null and request.applicantTimeEnd != null and request.applicantTimeEnd !=''">
+            and create_time &lt;= #{request.applicantTimeEnd}
+        </if>
+        <if test="businessKeys != null">
+            and id in
+            <foreach collection="businessKeys" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
+        ORDER BY create_time DESC
+    </select>
+</mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourcerInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourcerInfoMapper.xml
index 510a80b..3049b54 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourcerInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourcerInfoMapper.xml
@@ -7,6 +7,8 @@
         <id column="id" property="id" />
         <result column="outsourcer_no" property="outsourcerNo" />
         <result column="outsourcer_name" property="outsourcerName" />
+        <result column="lab_code" property="labCode" />
+        <result column="group_code" property="groupCode" />
         <result column="outsourcer_brief_name" property="outsourcerBriefName" />
         <result column="outsourcer_size" property="outsourcerSize" />
         <result column="business_size" property="businessSize" />
@@ -55,32 +57,32 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, outsourcer_no, outsourcer_name, outsourcer_brief_name, outsourcer_size, business_size, grade, evaluation, tax_number, bank_account, bank_name, bank_account_number, postal_code, director, phone, fax, mobile, email, website, address_country, address_province, address_city, address_area, full_address, address_country_name, address_province_name, address_city_name, address_area_name, invoice_country, invoice_province, invoice_city, invoice_area, invoice_full_address, invoice_country_name, invoice_province_name, invoice_city_name, invoice_area_name, business_scope, business_content, minio_file_name, approval_status, process_id, remark, create_user_id, create_user_name, create_time, update_time
+        id, outsourcer_no, outsourcer_name, lab_code, group_code, outsourcer_brief_name, outsourcer_size, business_size, grade, evaluation, tax_number, bank_account, bank_name, bank_account_number, postal_code, director, phone, fax, mobile, email, website, address_country, address_province, address_city, address_area, full_address, address_country_name, address_province_name, address_city_name, address_area_name, invoice_country, invoice_province, invoice_city, invoice_area, invoice_full_address, invoice_country_name, invoice_province_name, invoice_city_name, invoice_area_name, business_scope, business_content, minio_file_name, approval_status, process_id, remark, create_user_id, create_user_name, create_time, update_time
     </sql>
 
     <select id="selectBatchForApprovalList" resultMap="BaseResultMap">
         SELECT *
         FROM biz_business_outsourcer_info
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.outsourcerNo != null and request.outsourcerNo !=''">
+        <if test="request != null and request.outsourcerNo != null and request.outsourcerNo !=''">
             and outsourcer_no like concat('%',#{request.outsourcerNo},'%')
         </if>
-        <if test="request.outsourcerName != null and request.outsourcerName !=''">
+        <if test="request != null and request.outsourcerName != null and request.outsourcerName !=''">
             and outsourcer_name like concat('%',#{request.outsourcerName},'%')
         </if>
-        <if test="request.director != null and request.director !=''">
+        <if test="request != null and request.director != null and request.director !=''">
             and director like concat('%',#{request.director},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
@@ -93,6 +95,6 @@
     </select>
 
     <select id="selectMaxNo" resultType="java.lang.Long">
-        SELECT IFNULL(max(RIGHT(outsourcer_no, 12)), 0) from biz_business_outsourcer_info
+        SELECT IFNULL(max(RIGHT(outsourcer_no, 3)), 0) from biz_business_outsourcer_info
     </select>
 </mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessSiteExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessSiteExecutiveInfoMapper.xml
index 135c5d0..3c5ae79 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessSiteExecutiveInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessSiteExecutiveInfoMapper.xml
@@ -38,25 +38,25 @@
         FROM biz_business_site_executive_info bsei
         LEFT JOIN biz_resource_customer_info rci ON bsei.customer_id = rci.id
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and bsei.approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and bsei.create_user_id = #{request.createUserId}
         </if>
-        <if test="request.siteExecutiveNo != null and request.siteExecutiveNo !=''">
+        <if test="request != null and request.siteExecutiveNo != null and request.siteExecutiveNo !=''">
             and bsei.site_executive_no like concat('%',#{request.siteExecutiveNo},'%')
         </if>
-        <if test="request.customerName != null and request.customerName !=''">
+        <if test="request != null and request.customerName != null and request.customerName !=''">
             and rci.outsourcer_name like concat('%',#{request.customerName},'%')
         </if>
-        <if test="request.applyName != null and request.applyName !=''">
+        <if test="request != null and request.applyName != null and request.applyName !=''">
             and bsei.apply_name like concat('%',#{request.applyName},'%')
         </if>
-        <if test="request.applyTimeStart != null and request.applyTimeStart !=''">
+        <if test="request != null and request.applyTimeStart != null and request.applyTimeStart !=''">
             and bsei.apply_time &gt;= #{request.applyTimeStart}
         </if>
-        <if test="request.applyTimeEnd != null and request.applyTimeEnd !=''">
+        <if test="request != null and request.applyTimeEnd != null and request.applyTimeEnd !=''">
             and bsei.apply_time &lt;= #{request.applyTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml
index 84d9e2a..6bd38a9 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml
@@ -105,6 +105,12 @@
         <if test="request.isUrgent != null and request.isUrgent !=''">
             AND bo.is_urgent = #{request.isUrgent}
         </if>
+        <if test="request.ids != null">
+            and blei.id in
+            <foreach collection="request.ids" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
         ORDER BY blei.update_time DESC
     </select>
 
@@ -137,6 +143,12 @@
         <if test="request.isUrgent != null and request.isUrgent !=''">
             AND bo.is_urgent = #{request.isUrgent}
         </if>
+        <if test="request.ids != null">
+            and blei.id in
+            <foreach collection="request.ids" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
         ORDER BY blei.update_time DESC
     </select>
 
diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardInfoMapper.xml
index 1a5551b..2ed8d17 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardInfoMapper.xml
@@ -45,12 +45,6 @@
         FROM biz_equipment_standard_info besi
         LEFT JOIN biz_equipment_standard_technology_relation bestr ON besi.standard_no = bestr.standard_no
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
-            and besi.approval_status = #{request.approvalStatus}
-        </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
-            and besi.create_user_id = #{request.createUserId}
-        </if>
         <if test="request.standardName != null and request.standardName !=''">
             and besi.standard_name like concat('%',#{request.standardName},'%')
         </if>
diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardTechnologyRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardTechnologyRelationMapper.xml
index fc7e16c..cd03c8c 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardTechnologyRelationMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardTechnologyRelationMapper.xml
@@ -6,6 +6,7 @@
     <resultMap id="BaseResultMap" type="com.casic.missiles.model.equipment.BizEquipmentStandardTechnologyRelation">
         <id column="id" property="id" />
         <result column="technology_file_id" property="technologyFileId" />
+        <result column="technology_file_no" property="technologyFileNo" />
         <result column="technology_file_name" property="technologyFileName" />
         <result column="standard_id" property="standardId" />
         <result column="standard_no" property="standardNo" />
@@ -14,7 +15,7 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, technology_file_id, technology_file_name, standard_id, remark
+        id, technology_file_id, technology_file_no, technology_file_name, standard_id, remark
     </sql>
 
 </mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceAuthorizeOrderMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceAuthorizeOrderMapper.xml
index ac5176c..554fe65 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceAuthorizeOrderMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceAuthorizeOrderMapper.xml
@@ -32,22 +32,22 @@
         SELECT *
         FROM biz_resource_authorize_order
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.orderNo != null and request.orderNo !=''">
+        <if test="request != null and request.orderNo != null and request.orderNo !=''">
             and order_no like concat('%',#{request.orderNo},'%')
         </if>
-        <if test="request.createUserName != null and request.createUserName !=''">
+        <if test="request != null and request.createUserName != null and request.createUserName !=''">
             and create_user_name like concat('%',#{request.createUserName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerExamineFormMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerExamineFormMapper.xml
index ab242f6..af7f98f 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerExamineFormMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerExamineFormMapper.xml
@@ -41,28 +41,28 @@
         SELECT *
         FROM biz_resource_customer_examine_form
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.formNo != null and request.formNo !=''">
+        <if test="request != null and request.formNo != null and request.formNo !=''">
             and form_no like concat('%',#{request.formNo},'%')
         </if>
-        <if test="request.labCode != null and request.labCode !=''">
+        <if test="request != null and request.labCode != null and request.labCode !=''">
             and lab_code like concat('%',#{request.labCode},'%')
         </if>
-        <if test="request.groupCode != null and request.groupCode !=''">
+        <if test="request != null and request.groupCode != null and request.groupCode !=''">
             and group_code like concat('%',#{request.groupCode},'%')
         </if>
-        <if test="request.createUserName != null and request.createUserName !=''">
+        <if test="request != null and request.createUserName != null and request.createUserName !=''">
             and create_user_name like concat('%',#{request.createUserName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerInfoMapper.xml
index fa8ffbc..06a2798 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerInfoMapper.xml
@@ -33,25 +33,25 @@
         SELECT *
         FROM biz_resource_customer_info
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.customerNo != null and request.customerNo !=''">
+        <if test="request != null and request.customerNo != null and request.customerNo !=''">
             and customer_no like concat('%',#{request.customerNo},'%')
         </if>
-        <if test="request.customerName != null and request.customerName !=''">
+        <if test="request != null and request.customerName != null and request.customerName !=''">
             and customer_name like concat('%',#{request.customerName},'%')
         </if>
-        <if test="request.contacts != null and request.contacts !=''">
+        <if test="request != null and request.contacts != null and request.contacts !=''">
             and contacts like concat('%',#{request.contacts},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerSuggestFormMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerSuggestFormMapper.xml
index 28f5bb2..1806662 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerSuggestFormMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerSuggestFormMapper.xml
@@ -33,28 +33,28 @@
         SELECT *
         FROM biz_resource_customer_suggest_form
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.formNo != null and request.formNo !=''">
+        <if test="request != null and request.formNo != null and request.formNo !=''">
             and form_no like concat('%',#{request.formNo},'%')
         </if>
-        <if test="request.customerName != null and request.customerName !=''">
+        <if test="request != null and request.customerName != null and request.customerName !=''">
             and customer_name like concat('%',#{request.customerName},'%')
         </if>
-        <if test="request.customerDeptName != null and request.customerDeptName !=''">
+        <if test="request != null and request.customerDeptName != null and request.customerDeptName !=''">
             and customer_dept_name like concat('%',#{request.customerDeptName},'%')
         </if>
-        <if test="request.createUserName != null and request.createUserName !=''">
+        <if test="request != null and request.createUserName != null and request.createUserName !=''">
             and create_user_name like concat('%',#{request.createUserName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSealUseNoteMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSealUseNoteMapper.xml
index ab37bc1..b02bb33 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSealUseNoteMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSealUseNoteMapper.xml
@@ -29,32 +29,32 @@
     </sql>
 
     <select id="selectBatchForApprovalList" resultMap="BaseResultMap">
-        SELECT *
+        SELECT brsun.*, brsi.seal_name, brsi.seal_type, brsi.approver_name
         FROM biz_resource_seal_use_note brsun
         JOIN biz_resource_seal_info brsi ON brsun.seal_id = brsi.id
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and brsun.approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and brsun.create_user_id = #{request.createUserId}
         </if>
-        <if test="request.sealName != null and request.sealName !=''">
+        <if test="request != null and request.sealName != null and request.sealName !=''">
             and brsi.seal_name like concat('%',#{request.sealName},'%')
         </if>
-        <if test="request.sealType != null and request.sealType !=''">
+        <if test="request != null and request.sealType != null and request.sealType !=''">
             and brsi.seal_type = #{request.sealType}
         </if>
-        <if test="request.applyDeptName != null and request.applyDeptName !=''">
+        <if test="request != null and request.applyDeptName != null and request.applyDeptName !=''">
             and brsun.apply_dept_name like concat('%',#{request.applyDeptName},'%')
         </if>
-        <if test="request.applyUserName != null and request.applyUserName !=''">
+        <if test="request != null and request.applyUserName != null and request.applyUserName !=''">
             and brsun.apply_user_name like concat('%',#{request.applyUserName},'%')
         </if>
-        <if test="request.applyTimeStart != null and request.applyTimeStart !=''">
+        <if test="request != null and request.applyTimeStart != null and request.applyTimeStart !=''">
             and brsun.apply_time &gt;= #{request.applyTimeStart}
         </if>
-        <if test="request.applyTimeEnd != null and request.applyTimeEnd !=''">
+        <if test="request != null and request.applyTimeEnd != null and request.applyTimeEnd !=''">
             and brsun.apply_time &lt;= #{request.applyTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml
index 119bf7d..4f8392a 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml
@@ -31,6 +31,12 @@
         <if test="request.deptName != null and request.deptName !=''">
             and brsi.dept_name like concat('%',#{request.deptName},'%')
         </if>
+        <if test="request.ids != null">
+            and brsv.id in
+            <foreach collection="request.ids" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
         ORDER BY brsv.grant_date DESC
     </select>
 
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSupplierInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSupplierInfoMapper.xml
index fe8d399..e8ce7ef 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSupplierInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSupplierInfoMapper.xml
@@ -48,28 +48,28 @@
         SELECT *
         FROM biz_resource_supplier_info
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.supplierNo != null and request.supplierNo !=''">
+        <if test="request != null and request.supplierNo != null and request.supplierNo !=''">
             and supplier_no like concat('%',#{request.supplierNo},'%')
         </if>
-        <if test="request.supplierName != null and request.supplierName !=''">
+        <if test="request != null and request.supplierName != null and request.supplierName !=''">
             and supplier_name like concat('%',#{request.supplierName},'%')
         </if>
-        <if test="request.director != null and request.director !=''">
+        <if test="request != null and request.director != null and request.director !=''">
             and director like concat('%',#{request.director},'%')
         </if>
-        <if test="request.supplierType != null and request.supplierType !=''">
+        <if test="request != null and request.supplierType != null and request.supplierType !=''">
             and supplier_type = #{request.supplierType}
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/EnvLocationInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/EnvLocationInfoMapper.xml
new file mode 100644
index 0000000..68bcf10
--- /dev/null
+++ b/casic-metering-dao/src/main/resources/mapper/resource/EnvLocationInfoMapper.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.mapper.resource.EnvLocationInfoMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.resource.EnvLocationInfo">
+        <id column="id" property="id" />
+        <result column="location_no" property="locationNo" />
+        <result column="location_name" property="locationName" />
+        <result column="location_position" property="locationPosition" />
+        <result column="create_user_id" property="createUserId" />
+        <result column="create_user" property="createUser" />
+        <result column="create_time" property="createTime" />
+        <result column="update_time" property="updateTime" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, location_no, location_name, location_position, create_user_id, create_user, create_time, update_time
+    </sql>
+
+    <select id="selectLocationListPage" resultType="com.casic.missiles.dto.resource.environment.LocationListResponse">
+        SELECT *
+        FROM env_location_info
+        WHERE 1=1
+        <if test="request.locationNo != null and request.locationNo !=''">
+            AND location_no LIKE concat('%',#{request.locationNo},'%')
+        </if>
+        <if test="request.locationName != null and request.locationName !=''">
+            AND location_name LIKE concat('%',#{request.locationName},'%')
+        </if>
+        ORDER BY create_time DESC
+    </select>
+
+</mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml
index b28c18f..8854047 100644
--- a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml
@@ -11,7 +11,6 @@
         <result column="sign_desc" property="signDesc" />
         <result column="sign_director" property="signDirector" />
         <result column="sign_user_id" property="signUserId" />
-        <result column="sign_type" property="signType" />
         <result column="minio_file_name" property="minioFileName" />
         <result column="create_time" property="createTime" />
         <result column="update_time" property="updateTime" />
@@ -28,7 +27,6 @@
         <result column="sign_name" property="signName" />
         <result column="sign_desc" property="signDesc" />
         <result column="sign_director" property="signDirector" />
-        <result column="sign_type" property="signType" />
         <result column="sign_user_id" property="signUserId" />
         <result column="minio_file_name" property="minioFileName" />
         <result column="create_time" property="createTime" />
@@ -62,4 +60,58 @@
         JOIN system_sign_user_relation ssur ON ss.id = ssur.sign_id
         WHERE ssur.user_id = #{userId}
     </select>
+
+    <select id="selectSignListPage" resultMap="BaseResultMap">
+        SELECT ss.*, sd.SIMPLE_NAME AS deptName
+        FROM system_sign ss
+        LEFT JOIN sys_user su ON su.id = ss.sign_user_id
+        LEFT JOIN sys_dept sd ON sd.id = su.dept_id
+        WHERE 1=1
+        <if test="request.signNo != null and request.signNo !=''">
+            AND ss.sign_no LIKE concat('%',#{request.signNo},'%')
+        </if>
+        <if test="request.signName != null and request.signName !=''">
+            AND ss.sign_name LIKE concat('%',#{request.signName},'%')
+        </if>
+        <if test="request.signDirector != null and request.signDirector !=''">
+            AND ss.sign_director LIKE concat('%',#{request.signDirector},'%')
+        </if>
+        <if test="request.signUserId != null and request.signUserId !=''">
+            AND ss.sign_user_id = #{request.signUserId}
+        </if>
+        <if test="request.createStartTime != null and request.createStartTime !=''">
+            AND DATE_FORMAT(ss.create_time,'%Y-%m-%d') &gt;= DATE_FORMAT(#{request.createStartTime},'%Y-%m-%d')
+        </if>
+        <if test="request.createEndTime != null and request.createEndTime !=''">
+            AND DATE_FORMAT(ss.create_time,'%Y-%m-%d')  &lt;= DATE_FORMAT(#{request.createEndTime},'%Y-%m-%d')
+        </if>
+        ORDER BY ss.create_time DESC
+    </select>
+
+    <select id="selectSignList" resultMap="BaseResultMap">
+        SELECT ss.*, sd.SIMPLE_NAME AS deptName
+        FROM system_sign ss
+        LEFT JOIN sys_user su ON su.id = ss.sign_user_id
+        LEFT JOIN sys_dept sd ON sd.id = su.dept_id
+        WHERE 1=1
+        <if test="request.signNo != null and request.signNo !=''">
+            AND ss.sign_no LIKE concat('%',#{request.signNo},'%')
+        </if>
+        <if test="request.signName != null and request.signName !=''">
+            AND ss.sign_name LIKE concat('%',#{request.signName},'%')
+        </if>
+        <if test="request.signDirector != null and request.signDirector !=''">
+            AND ss.sign_director LIKE concat('%',#{request.signDirector},'%')
+        </if>
+        <if test="request.signUserId != null and request.signUserId !=''">
+            AND ss.sign_user_id = #{request.signUserId}
+        </if>
+        <if test="request.createStartTime != null and request.createStartTime !=''">
+            AND DATE_FORMAT(ss.create_time,'%Y-%m-%d') &gt;= DATE_FORMAT(#{request.createStartTime},'%Y-%m-%d')
+        </if>
+        <if test="request.createEndTime != null and request.createEndTime !=''">
+            AND DATE_FORMAT(ss.create_time,'%Y-%m-%d')  &lt;= DATE_FORMAT(#{request.createEndTime},'%Y-%m-%d')
+        </if>
+        ORDER BY ss.create_time DESC
+    </select>
 </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 515050a..60f530b 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
@@ -47,8 +47,8 @@
     String STORAGE_LOCATION = "bizStorageLocation";
     //计量专业
     String MEASURE_MAJOR = "bizMeasureMajor";
-    //管理状态
-    String MANAGER_STATE = "bizManagerState";
+    //标准装置管理状态
+    String STANDARD_MANAGER_STATE = "bizStandardManagerState";
 
     /**
      * 资源管理 字典code
@@ -95,8 +95,6 @@
     String MEASURE_STATUS = "measureStatus";
     //检定方式
     String MEASURE_TYPE = "measureType";
-    //标识打印标志类型
-    String IDENTIFY_PRINT_TYPE = "bizBusinessIdentify";
     //变更类型
     String REPORT_CHANGE_TYPE = "bizCertChangeType";
     //规模类型
@@ -111,19 +109,24 @@
     String MEASURE_CATEGORY = "measureCategory";
     //检定结果
     String MEASURE_RESULT = "measureResult";
+    //分包原因
+    String OUTSOURCE_REASON = "outsourceReason";
+
+    /**
+     * 系统管理
+     */
+    String TEMPLATE_TYPE = "templateType";
+
 
     /**
      * 标准装置 字典code
      */
     //类别
     String STANDARD_CATEGORY = "standardCategory";
-    //管理状态
-    String STANDARD_MANAGER_STATE = "standardManagerState";
     //标准等级
     String STANDARD_LEVEL = "standardLevel";
     //传递范围
     String STANDARD_TRANSMIT_RANGE = "transmitRange";
-
     //资本来源
     String CAPITAL_SOURCE = "capitalSource";
     //标准装置-申请类型
@@ -148,8 +151,6 @@
     String CERTIFICATE_CLASS = "certificationClass";
     //证书管理-检校专业
     String CALIBRATION_MAJOR = "calibrationMajor";
-    //分包原因
-    String OUTSOURCE_REASON = "outsourceReason";
 
     /**
      * 工作台
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/BaseApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/BaseApprovalListRequest.java
index 73c12c1..80d7424 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/BaseApprovalListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/BaseApprovalListRequest.java
@@ -6,6 +6,7 @@
 
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotEmpty;
+import java.util.List;
 
 /**
  * @Description:
@@ -19,14 +20,14 @@
      * 表单id
      */
     @NotBlank(message = "表单id不能为空")
-    @ApiModelProperty(value = "表单id（流程定义对应的表单id，等价于业务id）", dataType = "String")
+    @ApiModelProperty(value = "表单id（流程定义对应的表单id，等价于业务id），导出接口不用传", dataType = "String")
     private String formId;
 
     /**
      * 审批状态类型，对应ApprovalStatusEnum
      */
     @NotEmpty(message = "审批状态类型不能为空")
-    @ApiModelProperty(value = "审批状态类型code", dataType = "String")
+    @ApiModelProperty(value = "审批状态类型code，导出接口不用传", dataType = "String")
     private String approvalStatus;
 
     @ApiModelProperty(hidden = true)
@@ -34,4 +35,7 @@
 
     @ApiModelProperty(hidden = true)
     private Long createUserId;
+
+    @ApiModelProperty(value = "导出ids", dataType = "List")
+    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificatePrintApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificatePrintApprovalListRequest.java
index b93d1c9..3cc2f4e 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificatePrintApprovalListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificatePrintApprovalListRequest.java
@@ -5,8 +5,6 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import java.util.List;
-
 /**
  * @Description:
  * @Author: wangpeng
@@ -38,7 +36,4 @@
 
     @ApiModelProperty(value = "创建结束时间", dataType = "String")
     private String createTimeEnd;
-
-    @ApiModelProperty(value = "导出ids", dataType = "List")
-    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportApprovalListRequest.java
index 4f7a038..c115847 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportApprovalListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportApprovalListRequest.java
@@ -5,8 +5,6 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import java.util.List;
-
 /**
  * @Description:
  * @Author: wangpeng
@@ -15,6 +13,8 @@
 @ApiModel
 @Data
 public class CertificateReportApprovalListRequest extends BaseApprovalListRequest {
+    @ApiModelProperty(value = "委托方id", dataType = "String")
+    private Long customerId;
 
     @ApiModelProperty(value = "证书报告编号", dataType = "String")
     private String certificateReportNo;
@@ -37,6 +37,4 @@
     @ApiModelProperty(value = "检校结束时间", dataType = "String")
     private String calibrationTimeEnd;
 
-    @ApiModelProperty(value = "导出ids", dataType = "List")
-    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/identify/IdentifyListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/identify/IdentifyListRequest.java
index 1b87ae6..f019203 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/identify/IdentifyListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/identify/IdentifyListRequest.java
@@ -4,6 +4,8 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * @Description:
  * @Author: wangpeng
@@ -26,4 +28,7 @@
 
     @ApiModelProperty(value = "打印结束时间", dataType = "String")
     private String createTimeEnd;
+
+    @ApiModelProperty(value = "导出ids", dataType = "List")
+    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListRequest.java
index 1264883..62415fb 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListRequest.java
@@ -7,6 +7,7 @@
 import lombok.Data;
 
 import javax.validation.constraints.NotBlank;
+import java.util.List;
 
 @Data
 @ApiModel
@@ -37,4 +38,6 @@
     @ApiModelProperty(value = "是否加急（1是0否null全部）", dataType = "Integer")
     private String isUrgent;
 
+    @ApiModelProperty(value = "导出ids", dataType = "List")
+    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListRequest.java
index 5201d7b..499760a 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListRequest.java
@@ -17,6 +17,9 @@
     @ApiModelProperty(value = "任务单编号", dataType = "String")
     private String orderNo;
 
+    @ApiModelProperty(value = "委托方id", dataType = "Long")
+    private Long customerId;
+
     @ApiModelProperty(value = "委托方名称", dataType = "String")
     private String customerName;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OrderSampleDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OrderSampleDTO.java
new file mode 100644
index 0000000..796edc0
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OrderSampleDTO.java
@@ -0,0 +1,19 @@
+package com.casic.missiles.dto.business.outsource;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/8/24 11:38
+ */
+@ApiModel
+@Data
+public class OrderSampleDTO {
+    @ApiModelProperty(value = "任务单id", dataType = "Long")
+    private Long orderId;
+    @ApiModelProperty(value = "受检设备id", dataType = "Long")
+    private Long sampleId;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceAssessApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceAssessApprovalListRequest.java
new file mode 100644
index 0000000..9a930c3
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceAssessApprovalListRequest.java
@@ -0,0 +1,30 @@
+package com.casic.missiles.dto.business.outsource;
+
+import com.casic.missiles.dto.BaseApprovalListRequest;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/8/24 11:01
+ */
+@ApiModel
+@Data
+public class OutsourceAssessApprovalListRequest extends BaseApprovalListRequest {
+    @ApiModelProperty(value = "评审表编号", dataType = "String")
+    private String projectNo;
+
+    @ApiModelProperty(value = "分包机构名称", dataType = "String")
+    private String outsourcerName;
+
+    @ApiModelProperty(value = "申请人", dataType = "String")
+    private String applicantName;
+
+    @ApiModelProperty(value = "申请时间开始", dataType = "String")
+    private String applicantTimeStart;
+
+    @ApiModelProperty(value = "申请时间结束", dataType = "String")
+    private String applicantTimeEnd;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceAssessSaveResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceAssessSaveResponse.java
new file mode 100644
index 0000000..8bf9aad
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceAssessSaveResponse.java
@@ -0,0 +1,20 @@
+package com.casic.missiles.dto.business.outsource;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/8/14 16:17
+ */
+@ApiModel
+@Data
+public class OutsourceAssessSaveResponse {
+    @ApiModelProperty(value = "主键id", dataType = "Long")
+    private Long id;
+
+    @ApiModelProperty(value = "编号", dataType = "String")
+    private String projectNo;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProtocolApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProtocolApprovalListRequest.java
new file mode 100644
index 0000000..0f32331
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProtocolApprovalListRequest.java
@@ -0,0 +1,30 @@
+package com.casic.missiles.dto.business.outsource;
+
+import com.casic.missiles.dto.BaseApprovalListRequest;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/8/24 15:01
+ */
+@ApiModel
+@Data
+public class OutsourceProtocolApprovalListRequest extends BaseApprovalListRequest {
+    @ApiModelProperty(value = "协议书编号", dataType = "String")
+    private String protocolNo;
+
+    @ApiModelProperty(value = "分包方名称", dataType = "String")
+    private String outsourcerName;
+
+    @ApiModelProperty(value = "申请人", dataType = "String")
+    private String applicantName;
+
+    @ApiModelProperty(value = "申请时间开始", dataType = "String")
+    private String applicantTimeStart;
+
+    @ApiModelProperty(value = "申请时间结束", dataType = "String")
+    private String applicantTimeEnd;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProtocolSaveResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProtocolSaveResponse.java
new file mode 100644
index 0000000..e324967
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProtocolSaveResponse.java
@@ -0,0 +1,20 @@
+package com.casic.missiles.dto.business.outsource;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/8/14 16:17
+ */
+@ApiModel
+@Data
+public class OutsourceProtocolSaveResponse {
+    @ApiModelProperty(value = "主键id", dataType = "Long")
+    private Long id;
+
+    @ApiModelProperty(value = "编号", dataType = "String")
+    private String protocolNo;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveApprovalListRequest.java
index f29f4e4..7047c28 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveApprovalListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveApprovalListRequest.java
@@ -5,8 +5,6 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import java.util.List;
-
 /**
  * @Description: 现场检测审批列表请求实体
  * @Author: wangpeng
@@ -30,7 +28,4 @@
     @ApiModelProperty(value = "申请时间结束", dataType = "String")
     private String applyTimeEnd;
 
-    @ApiModelProperty(value = "导出ids", dataType = "List")
-    private List<Long> ids;
-
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveDetailResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveDetailResponse.java
index 1f28752..394c934 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveDetailResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveDetailResponse.java
@@ -12,6 +12,18 @@
     @ApiModelProperty(value = "id，更新/删除使用参数", dataType = "Long")
     private Long id;
 
+    @ApiModelProperty(value = "实验室代码(字典code)", dataType = "String")
+    private String labCode;
+
+    @ApiModelProperty(value = "实验室代码(字典value)", dataType = "String")
+    private String labCodeName;
+
+    @ApiModelProperty(value = "组别代码(字典code)", dataType = "String")
+    private String groupCode;
+
+    @ApiModelProperty(value = "组别代码(字典value)", dataType = "String")
+    private String groupCodeName;
+
     @ApiModelProperty(value = "审批编号", dataType = "String")
     private String siteExecutiveNo;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/environment/LocationListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/environment/LocationListRequest.java
new file mode 100644
index 0000000..13d03c3
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/environment/LocationListRequest.java
@@ -0,0 +1,20 @@
+package com.casic.missiles.dto.resource.environment;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/6/8 13:56
+ */
+@ApiModel
+@Data
+public class LocationListRequest {
+    @ApiModelProperty(value = "地点编号", dataType = "String")
+    private String locationNo;
+
+    @ApiModelProperty(value = "地点名称", dataType = "String")
+    private String locationName;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/environment/LocationListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/environment/LocationListResponse.java
new file mode 100644
index 0000000..4c531af
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/environment/LocationListResponse.java
@@ -0,0 +1,78 @@
+package com.casic.missiles.dto.resource.environment;
+
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
+import com.baomidou.mybatisplus.annotation.TableField;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description: 地点列表响应实体
+ * @Author: wangpeng
+ * @Date: 2023/6/8 13:53
+ */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
+@ApiModel
+@Data
+public class LocationListResponse {
+    @ApiModelProperty(value = "主键id", dataType = "Long")
+    private Long id;
+
+    /**
+     * 地点编号
+     */
+    @ExcelProperty("地点编号")
+    @ApiModelProperty(value = "地点编号", dataType = "String")
+    private String locationNo;
+
+    /**
+     * 地点名称
+     */
+    @ExcelProperty("地点名称")
+    @ApiModelProperty(value = "地点名称", dataType = "String")
+    private String locationName;
+
+    /**
+     * 地点位置
+     */
+    @ExcelProperty("地点位置")
+    @ApiModelProperty(value = "地点位置", dataType = "String")
+    private String locationPosition;
+
+    /**
+     * 创建人id
+     */
+    @ApiModelProperty(value = "创建人id", dataType = "Long")
+    private Long createUserId;
+
+    /**
+     * 创建人
+     */
+    @ExcelProperty("创建人")
+    @ApiModelProperty(value = "创建人", dataType = "String")
+    @TableField("create_user")
+    private String createUser;
+
+    /**
+     * 创建时间
+     */
+    @ExcelProperty("创建时间")
+    @ApiModelProperty(value = "创建时间", dataType = "String")
+    private String createTime;
+
+    /**
+     * 更新时间
+     */
+    @ApiModelProperty(value = "更新时间", dataType = "String")
+    private String updateTime;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertRequest.java
index 9a7f6c6..c827915 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertRequest.java
@@ -4,6 +4,8 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * @Description:
  * @Author: wangpeng
@@ -16,4 +18,7 @@
     private String name;
     @ApiModelProperty(value = "部门名", dataType = "String")
     private String deptName;
+
+    @ApiModelProperty(value = "导出ids", dataType = "List")
+    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertResponse.java
index f78b159..8f2f79e 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertResponse.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.dto.resource.staff;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.casic.missiles.annotation.DictCodeField;
 import com.casic.missiles.constants.MeterDictCode;
 import io.swagger.annotations.ApiModel;
@@ -13,12 +20,18 @@
  * @Author: wangpeng
  * @Date: 2023/7/27 15:13
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @ApiModel
 @Data
 public class StaffCertResponse {
     /**
      * 人员编号
      */
+    @ExcelProperty(value = "人员编号",order = 0)
     @NotEmpty(message = "人员编号不能为空")
     @ApiModelProperty(value = "人员编号", dataType = "String")
     private String staffNo;
@@ -26,6 +39,7 @@
     /**
      * 姓名
      */
+    @ExcelProperty(value = "姓名",order = 1)
     @ApiModelProperty(value = "姓名", dataType = "String")
     private String staffName;
 
@@ -54,6 +68,7 @@
     /**
      * 部门名字
      */
+    @ExcelProperty(value = "工作部门",order = 2)
     @ApiModelProperty(value = "部门名字", dataType = "String")
     private String deptName;
 
@@ -66,6 +81,7 @@
     /**
      * 计量专业
      */
+    @ExcelProperty(value = "计量专业",order = 3)
     @ApiModelProperty(value = "计量专业", dataType = "String")
     private String major;
 
@@ -110,6 +126,7 @@
     /**
      * 证书号
      */
+    @ExcelProperty(value = "证号",order = 4)
     @ApiModelProperty(value = "证书号", dataType = "String")
     private String certNo;
 
@@ -122,12 +139,14 @@
     /**
      * 有效日期
      */
+    @ExcelProperty(value = "证书有效期",order = 6)
     @ApiModelProperty(value = "有效日期", dataType = "String")
     private String effectiveDate;
 
     /**
      * 发放日期
      */
+    @ExcelProperty(value = "发证日期",order = 5)
     @ApiModelProperty(value = "发放日期", dataType = "String")
     private String grantDate;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffListRequest.java
index 7c4afb3..0a1194a 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffListRequest.java
@@ -4,6 +4,8 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * @Description:
  * @Author: wangpeng
@@ -18,4 +20,7 @@
     private String deptName;
     @ApiModelProperty(value = "部门id", dataType = "Long")
     private Long deptId;
+
+    @ApiModelProperty(value = "导出ids", dataType = "List")
+    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/TrainListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/TrainListRequest.java
index f68597b..6321f8b 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/TrainListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/TrainListRequest.java
@@ -14,6 +14,8 @@
 public class TrainListRequest {
     @ApiModelProperty(value = "训练登记表编号", dataType = "String")
     private String trainNo;
+    @ApiModelProperty(value = "值班领导", dataType = "String")
+    private String dutyLeader;
     @ApiModelProperty(value = "创建开始时间", dataType = "String")
     private String createTimeStart;
     @ApiModelProperty(value = "创建结束时间", dataType = "String")
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/SignAddRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/SignAddRequest.java
index 117be34..d71055c 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/SignAddRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/SignAddRequest.java
@@ -43,13 +43,6 @@
     private Long signUserId;
 
     /**
-     * 签章或签名-字典code
-     */
-    @NotBlank(message = "类型不能为空")
-    @ApiModelProperty(value = "签名/签章-字典code", dataType = "String", required = true)
-    private String signType;
-
-    /**
      * minio存储文件名
      */
     @ApiModelProperty(value = "上传文件返回名称", dataType = "String")
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateAddRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateAddRequest.java
index aff1265..6316648 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateAddRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateAddRequest.java
@@ -17,30 +17,28 @@
 @Data
 public class TemplateAddRequest extends BaseSystemRequest {
     /**
-     * 原始记录模板/证书报告模板名称
+     * 模板名称
      */
     @ApiModelProperty(value = "名称", dataType = "String", required = true)
     @NotBlank(message = "名称不能为空")
     private String templateName;
 
     /**
-     * 原始记录模板/证书报告模板描述
+     * 模板描述
      */
     @ApiModelProperty(value = "描述", dataType = "String")
     private String templateDesc;
 
     /**
-     * 原始记录模板/证书报告模板创建人
+     * 创建人
      */
     @ApiModelProperty(value = "创建人", dataType = "String", required = true)
     @NotBlank(message = "创建人不能为空")
     private String templateCreator;
 
-    /**
-     * 原始记录模板/证书报告模板-字典code
-     */
-    @NotBlank(message = "类型不能为空")
-    @ApiModelProperty(value = "原始记录模板/证书报告模板-字典code", dataType = "String", required = true)
+
+    @NotBlank(message = "模板类型不能为空")
+    @ApiModelProperty(value = "模板类型(字典code)", dataType = "String", required = true)
     private String templateType;
 
     /**
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateListRequest.java
index eec5a1e..6d17bbe 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateListRequest.java
@@ -1,11 +1,12 @@
 package com.casic.missiles.dto.system;
 
+import com.casic.missiles.annotation.DictCodeField;
+import com.casic.missiles.constants.MeterDictCode;
 import com.casic.missiles.dto.BaseSystemRequest;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import javax.validation.constraints.NotBlank;
 import java.util.List;
 
 /**
@@ -19,8 +20,8 @@
     /**
      * 类型
      */
-//    @ApiModelProperty(value = "类型-字典code", dataType = "String", required = true)
-    @NotBlank(message = "类型不能为空")
+    @DictCodeField(message = "模板类型不合法", cacheName = MeterDictCode.TEMPLATE_TYPE)
+    @ApiModelProperty(value = "模板类型(字典code)", dataType = "String")
     private String templateType;
 
     /**
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificateChangeApply.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificateChangeApply.java
index 9216308..36923fd 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificateChangeApply.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificateChangeApply.java
@@ -1,11 +1,19 @@
 package com.casic.missiles.model.business;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 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 com.casic.missiles.dto.BaseRequest;
+import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -20,6 +28,12 @@
  * @author wangpeng
  * @since 2023-08-15
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
+@ApiModel
 @Data
 @TableName("biz_business_certificate_change_apply")
 public class BizBusinessCertificateChangeApply extends BaseRequest implements Serializable {
@@ -33,6 +47,7 @@
     /**
      * 申请单编号
      */
+    @ExcelProperty(value = "申请单编号", order = 1)
     @ApiModelProperty(value = "申请单编号", dataType = "String")
     @TableField("change_apply_no")
     private String changeApplyNo;
@@ -40,6 +55,7 @@
     /**
      * 申请单名字
      */
+    @ExcelProperty(value = "申请单名称", order = 2)
     @ApiModelProperty(value = "申请单名字", dataType = "String")
     @TableField("change_apply_name")
     private String changeApplyName;
@@ -54,6 +70,7 @@
     /**
      * 更换证书编号
      */
+    @ExcelProperty(value = "更换证书编号", order = 3)
     @ApiModelProperty(value = "更换证书编号", dataType = "String")
     @TableField("change_report_no")
     private String changeReportNo;
@@ -61,7 +78,8 @@
     /**
      * 更换证书名字
      */
-    @ApiModelProperty(value = "更换证书名字", dataType = "String")
+    @ExcelProperty(value = "更换证书/报告名称", order = 4)
+    @ApiModelProperty(value = "更换证书/报告名称", dataType = "String")
     @TableField("change_report_name")
     private String changeReportName;
 
@@ -73,6 +91,7 @@
     @TableField("change_type")
     private String changeType;
 
+    @ExcelProperty(value = "变更类型", order = 5)
     @ApiModelProperty(value = "变更类型(字典value)", dataType = "String")
     @TableField(exist = false)
     private String changeTypeName;
@@ -142,13 +161,15 @@
     /**
      * 创建用户名字
      */
-    @ApiModelProperty(value = "创建用户名字", dataType = "String")
+    @ExcelProperty(value = "创建人", order = 6)
+    @ApiModelProperty(value = "创建人名字", dataType = "String")
     @TableField("create_user_name")
     private String createUserName;
 
     /**
      * 创建时间
      */
+    @ExcelProperty(value = "创建时间", order = 7)
     @ApiModelProperty(value = "创建时间", dataType = "String")
     @TableField("create_time")
     private String createTime;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificateReport.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificateReport.java
index f01db9e..db06018 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificateReport.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificateReport.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.model.business;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -22,6 +29,11 @@
  * @author wangpeng
  * @since 2023-08-14
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @ApiModel
 @Data
 @TableName("biz_business_certificate_report")
@@ -36,6 +48,7 @@
     /**
      * 证书报告编号
      */
+    @ExcelProperty(value = "证书报告编号", order = 1)
     @ApiModelProperty(value = "证书报告编号", dataType = "String")
     @TableField("certificate_report_no")
     private String certificateReportNo;
@@ -43,6 +56,7 @@
     /**
      * 证书报告名称
      */
+    @ExcelProperty(value = "证书报告名称", order = 2)
     @ApiModelProperty(value = "证书报告名称", dataType = "String")
     @TableField("certificate_report_name")
     private String certificateReportName;
@@ -62,6 +76,7 @@
     @TableField("measure_category")
     private String measureCategory;
 
+    @ExcelProperty(value = "检校类别", order = 6)
     @ApiModelProperty(value = "检校类别(字典value)", dataType = "String")
     @TableField(exist = false)
     private String measureCategoryName;
@@ -69,6 +84,7 @@
     /**
      * 检校时间
      */
+    @ExcelProperty(value = "检校时间", order = 8)
     @ApiModelProperty(value = "检校时间", dataType = "String")
     @TableField("calibration_time")
     private String calibrationTime;
@@ -267,18 +283,22 @@
     @TableField(exist = false)
     private Integer decisionItem;
 
-    @ApiModelProperty(value = "设备样品编号（列表返回参数）", dataType = "String")
+    @ExcelProperty(value = "被检设备统一编号", order = 3)
+    @ApiModelProperty(value = "被检设备统一编号（列表返回参数）", dataType = "String")
     @TableField(exist = false)
     private String sampleNo;
 
-    @ApiModelProperty(value = "设备样品名称（列表返回参数）", dataType = "String")
+    @ExcelProperty(value = "被检设备名称", order = 4)
+    @ApiModelProperty(value = "被检设备名称（列表返回参数）", dataType = "String")
     @TableField(exist = false)
     private String sampleName;
 
-    @ApiModelProperty(value = "设备样品规格型号（列表返回参数）", dataType = "String")
+    @ExcelProperty(value = "规格型号", order = 5)
+    @ApiModelProperty(value = "规格型号（列表返回参数）", dataType = "String")
     @TableField(exist = false)
     private String sampleModel;
 
+    @ExcelProperty(value = "检定员", order = 7)
     @ApiModelProperty(value = "检定员名字（列表返回参数）", dataType = "String")
     @TableField(exist = false)
     private String staffName;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessIdentifyInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessIdentifyInfo.java
index 46bfba5..f1a9bec 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessIdentifyInfo.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessIdentifyInfo.java
@@ -1,10 +1,15 @@
 package com.casic.missiles.model.business;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 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;
 
@@ -20,6 +25,11 @@
  * @author wangpeng
  * @since 2023-08-15
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @Data
 @TableName("biz_business_identify_info")
 public class BizBusinessIdentifyInfo implements Serializable {
@@ -33,6 +43,7 @@
     /**
      * 记录编号
      */
+    @ExcelProperty(value = "记录编号", order = 1)
     @ApiModelProperty(value = "记录编号", dataType = "String")
     @TableField("record_no")
     private String recordNo;
@@ -41,20 +52,15 @@
      * 标志类型(字典code)
      */
     @NotEmpty(message = "标志类型不能为空")
-    @ApiModelProperty(value = "标志类型(字典code)", dataType = "String")
-    @DictCodeField(message = "标志类型不合法", cacheName = MeterDictCode.IDENTIFY_PRINT_TYPE)
+    @ApiModelProperty(value = "标志类型(直接存计量标识/使用状态/校准状态的字典value)", dataType = "String")
     @TableField("identify_type")
     private String identifyType;
 
-    @ApiModelProperty(value = "标志类型(字典value)", dataType = "String")
-    @TableField(exist = false)
-    private String identifyTypeName;
-
     /**
      * 设备id(可以是受检设备/设备台账)
      */
     @NotNull(message = "设备id不能为空")
-    @ApiModelProperty(value = "设备id(可以是受检设备/设备台账)", dataType = "String")
+    @ApiModelProperty(value = "设备id(可以是受检设备/设备台账)", dataType = "Long")
     @TableField("device_id")
     private Long deviceId;
 
@@ -66,29 +72,32 @@
     @TableField("device_type")
     private String deviceType;
 
+    @ExcelProperty(value = "统一编号", order = 3)
     @NotEmpty(message = "设备编号不能为空")
-    @ApiModelProperty(value = "设备编号", dataType = "String")
+    @ApiModelProperty(value = "统一编号", dataType = "String")
     @TableField("device_no")
     private String deviceNo;
 
     /**
      * 设备名字
      */
-    @NotEmpty(message = "设备名字不能为空")
-    @ApiModelProperty(value = "设备名字", dataType = "String")
+    @ExcelProperty(value = "设备名称", order = 4)
+    @NotEmpty(message = "设备名称不能为空")
+    @ApiModelProperty(value = "设备名称", dataType = "String")
     @TableField("device_name")
     private String deviceName;
 
     /**
      * 检定员id
      */
-    @ApiModelProperty(value = "检定员id", dataType = "String")
+    @ApiModelProperty(value = "检定员id", dataType = "Long")
     @TableField("measure_person_id")
     private Long measurePersonId;
 
     /**
      * 检定员名字
      */
+    @ExcelProperty(value = "检定员", order = 5)
     @ApiModelProperty(value = "检定员名字", dataType = "String")
     @TableField("measure_person")
     private String measurePerson;
@@ -103,7 +112,8 @@
     /**
      * 更新时间
      */
-    @ApiModelProperty(value = "更新时间", dataType = "String")
+    @ExcelProperty(value = "打印时间", order = 6)
+    @ApiModelProperty(value = "打印时间", dataType = "String")
     @TableField("update_time")
     private String updateTime;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceAssess.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceAssess.java
index 659d9ca..6720b90 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceAssess.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceAssess.java
@@ -1,11 +1,26 @@
 package com.casic.missiles.model.business;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 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 com.casic.missiles.dto.BaseRequest;
+import com.casic.missiles.dto.business.outsource.OrderSampleDTO;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import javax.validation.constraints.NotEmpty;
 import java.io.Serializable;
+import java.util.List;
 
 /**
  * <p>
@@ -15,146 +30,231 @@
  * @author wangpeng
  * @since 2023-08-16
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
+@ApiModel
 @Data
 @TableName("biz_business_outsource_assess")
-public class BizBusinessOutsourceAssess implements Serializable {
+public class BizBusinessOutsourceAssess extends BaseRequest implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
+    @ApiModelProperty(value = "id，更新/删除使用参数", dataType = "Long")
     @TableId("id")
     private Long id;
 
     /**
      * 评审表编号
      */
+    @ExcelProperty(value = "评审表编号", order = 1)
+    @ApiModelProperty(value = "评审表编号(后台生成)", dataType = "String")
     @TableField("project_no")
     private String projectNo;
 
     /**
      * 评审表名称
      */
+    @ExcelProperty(value = "评审表名称", order = 2)
+    @ApiModelProperty(value = "评审表名称", dataType = "String")
     @TableField("project_name")
     private String projectName;
 
+    @NotEmpty(message = "实验室代码不能为空")
+    @DictCodeField(message = "实验室代码描述不合法", cacheName = MeterDictCode.LAB_CODE)
+    @ApiModelProperty(value = "实验室代码(字典code)", dataType = "String")
+    @TableField("lab_code")
+    private String labCode;
+
+    @ApiModelProperty(value = "实验室代码(字典value)", dataType = "String")
+    @TableField(exist = false)
+    private String labCodeName;
+
+    /**
+     * 组别代码
+     */
+    @NotEmpty(message = "组别代码不能为空")
+    @DictCodeField(message = "组别代码描述不合法", cacheName = MeterDictCode.GROUP_CODE)
+    @ApiModelProperty(value = "组别代码(字典code)", dataType = "String")
+    @TableField("group_code")
+    private String groupCode;
+
+    @ApiModelProperty(value = "组别代码(字典value)", dataType = "String")
+    @TableField(exist = false)
+    private String groupCodeName;
+
     /**
      * 申请人id
      */
+    @ApiModelProperty(value = "申请人id", dataType = "String")
     @TableField("applicant_id")
     private Long applicantId;
 
     /**
      * 申请人名字
      */
+    @ExcelProperty(value = "申请人", order = 5)
+    @ApiModelProperty(value = "申请人", dataType = "String")
     @TableField("applicant_name")
     private String applicantName;
 
     /**
      * 申请时间
      */
+    @ExcelProperty(value = "申请时间", order = 6)
+    @ApiModelProperty(value = "申请时间", dataType = "String")
     @TableField("applicant_time")
     private String applicantTime;
 
     /**
      * 附件(minio存储文件名)
      */
+    @ApiModelProperty(value = "附件(minio存储文件名)", dataType = "String")
     @TableField("minio_file_name")
     private String minioFileName;
 
     /**
      * 备注
      */
+    @ApiModelProperty(value = "备注", dataType = "String")
     @TableField("remark")
     private String remark;
 
     /**
      * 创建人id
      */
+    @ApiModelProperty(value = "创建人id", dataType = "String")
     @TableField("create_user_id")
     private Long createUserId;
 
     /**
      * 创建人名字
      */
+    @ApiModelProperty(value = "创建人名字", dataType = "String")
     @TableField("create_user_name")
     private String createUserName;
 
     /**
      * 分包方id
      */
+    @ApiModelProperty(value = "评审表编号", dataType = "String")
     @TableField("outsourcer_id")
     private Long outsourcerId;
 
     /**
      * 预计开始时间
      */
+    @ApiModelProperty(value = "预计开始时间", dataType = "String")
     @TableField("pre_start_time")
     private String preStartTime;
 
     /**
      * 预计结束时间
      */
+    @ApiModelProperty(value = "预计结束时间", dataType = "String")
     @TableField("pre_end_time")
     private String preEndTime;
 
     /**
      * 分包原因-字典
      */
+    @ApiModelProperty(value = "分包原因(字典code)", dataType = "String")
+    @DictCodeField(message = "分包原因描述不合法", cacheName = MeterDictCode.OUTSOURCE_REASON)
     @TableField("outsource_reason")
     private String outsourceReason;
 
+    @ApiModelProperty(value = "分包原因(字典value)", dataType = "String")
+    @TableField(exist = false)
+    private String outsourceReasonName;
+
     /**
      * 预计费用
      */
+    @ApiModelProperty(value = "预计费用", dataType = "String")
     @TableField("pre_cost")
     private String preCost;
 
     /**
      * 审批状态
      */
+    @ApiModelProperty(value = "审批状态", dataType = "String")
+    @DictCodeField(message = "审批状态描述不合法", cacheName = MeterDictCode.APPROVAL_STATUS)
     @TableField("approval_status")
     private String approvalStatus;
 
     /**
      * 流程实例id
      */
+    @ApiModelProperty(value = "流程实例id", dataType = "String")
     @TableField("process_id")
     private String processId;
 
     /**
      * 实验室认可情况
      */
+    @ApiModelProperty(value = "实验室认可情况", dataType = "String")
     @TableField("approve_situation")
     private String approveSituation;
 
     /**
      * 溯源性
      */
+    @ApiModelProperty(value = "溯源性", dataType = "String")
     @TableField("traceability")
     private String traceability;
 
     /**
      * 测试方法
      */
+    @ApiModelProperty(value = "测试方法", dataType = "String")
     @TableField("test_method")
     private String testMethod;
 
     /**
      * 技术能力
      */
+    @ApiModelProperty(value = "技术能力", dataType = "String")
     @TableField("technique_ability")
     private String techniqueAbility;
 
     /**
      * 创建时间
      */
+    @ApiModelProperty(hidden = true)
     @TableField("create_time")
     private String createTime;
 
     /**
      * 更新时间
      */
+    @ApiModelProperty(hidden = true)
     @TableField("update_time")
     private String updateTime;
 
+    @ApiModelProperty(value = "审批状态类型-字典value", dataType = "String")
+    @TableField(exist = false)
+    private String approvalStatusName;
 
+    @ApiModelProperty(value = "任务id（同意、驳回等操作使用）", dataType = "String")
+    @TableField(exist = false)
+    private String taskId;
+
+    @ApiModelProperty(value = "可选决策项（1同意驳回拒绝 2同意驳回 3同意拒绝，用于待审批列表同意/驳回/拒绝按钮展示）", dataType = "Integer")
+    @TableField(exist = false)
+    private Integer decisionItem;
+
+    @NotEmpty(message = "受检设备信息不能为空")
+    @ApiModelProperty(value = "受检设备id列表（新建使用参数）", dataType = "List")
+    @TableField(exist = false)
+    private List<OrderSampleDTO> orderSampleList;
+
+    @ExcelProperty(value = "分包机构名称", order = 3)
+    @ApiModelProperty(value = "分包机构名称（列表返回参数）", dataType = "String")
+    private String outsourcerName;
+
+    @ExcelProperty(value = "机构负责人", order = 4)
+    @ApiModelProperty(value = "机构负责人（列表返回参数）", dataType = "String")
+    private String director;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceProtocol.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceProtocol.java
new file mode 100644
index 0000000..38df697
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceProtocol.java
@@ -0,0 +1,225 @@
+package com.casic.missiles.model.business;
+
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
+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 com.casic.missiles.dto.BaseRequest;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotEmpty;
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 计量检定业务-分包管理-测试、校准或检定工作分包协议书
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-08-24
+ */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
+@Data
+@TableName("biz_business_outsource_protocol")
+public class BizBusinessOutsourceProtocol extends BaseRequest implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "id，更新/删除使用参数", dataType = "Long")
+    @TableId("id")
+    private Long id;
+
+    /**
+     * 协议书编号
+     */
+    @ExcelProperty(value = "协议书编号", order = 1)
+    @ApiModelProperty(value = "协议书编号(后台生成)", dataType = "String")
+    @TableField("protocol_no")
+    private String protocolNo;
+
+    /**
+     * 协议书名称
+     */
+    @ExcelProperty(value = "协议书名称", order = 2)
+    @ApiModelProperty(value = "协议书名称", dataType = "String")
+    @TableField("project_name")
+    private String projectName;
+
+    @NotEmpty(message = "实验室代码不能为空")
+    @DictCodeField(message = "实验室代码描述不合法", cacheName = MeterDictCode.LAB_CODE)
+    @ApiModelProperty(value = "实验室代码(字典code)", dataType = "String")
+    @TableField("lab_code")
+    private String labCode;
+
+    @ApiModelProperty(value = "实验室代码(字典value)", dataType = "String")
+    @TableField(exist = false)
+    private String labCodeName;
+
+    @NotEmpty(message = "组别代码不能为空")
+    @DictCodeField(message = "组别代码描述不合法", cacheName = MeterDictCode.GROUP_CODE)
+    @ApiModelProperty(value = "组别代码(字典code)", dataType = "String")
+    @TableField("group_code")
+    private String groupCode;
+
+    @ApiModelProperty(value = "组别代码(字典value)", dataType = "String")
+    @TableField(exist = false)
+    private String groupCodeName;
+
+    /**
+     * 分包方id
+     */
+    @ApiModelProperty(value = "分包方id", dataType = "Long")
+    @TableField("outsourcer_id")
+    private Long outsourcerId;
+
+    /**
+     * 其他
+     */
+    @ApiModelProperty(value = "其他", dataType = "String")
+    @TableField("remark")
+    private String remark;
+
+    /**
+     * 分包方编号
+     */
+    @ApiModelProperty(value = "分包方编号(新建不用传)", dataType = "String")
+    @TableField("outsource_no")
+    private String outsourceNo;
+
+    /**
+     * 分包方名称
+     */
+    @ExcelProperty(value = "分包方名称", order = 3)
+    @ApiModelProperty(value = "分包方名称(新建不用传)", dataType = "String")
+    @TableField("outsource_name")
+    private String outsourceName;
+
+    /**
+     * 联系人
+     */
+    @ExcelProperty(value = "联系人", order = 4)
+    @ApiModelProperty(value = "联系人", dataType = "String")
+    @TableField("contacts")
+    private String contacts;
+
+    /**
+     * 电话
+     */
+    @ApiModelProperty(value = "电话", dataType = "String")
+    @TableField("mobile")
+    private String mobile;
+
+    /**
+     * 地址
+     */
+    @ApiModelProperty(value = "地址", dataType = "String")
+    @TableField("address")
+    private String address;
+
+    /**
+     * 要求完成日期
+     */
+    @ApiModelProperty(value = "要求完成日期", dataType = "String")
+    @TableField("require_date")
+    private String requireDate;
+
+    /**
+     * 分包费用(元)
+     */
+    @ApiModelProperty(value = "分包费用(元)", dataType = "String")
+    @TableField("outsource_cost")
+    private Double outsourceCost;
+
+    /**
+     * 分包方负责人
+     */
+    @ApiModelProperty(value = "分包方负责人", dataType = "String")
+    @TableField("director")
+    private String director;
+
+    /**
+     * 分包项目
+     */
+    @ApiModelProperty(value = "分包项目", dataType = "String")
+    @TableField("item")
+    private String item;
+
+    /**
+     * 分包要求
+     */
+    @ApiModelProperty(value = "分包要求", dataType = "String")
+    @TableField("requires")
+    private String requires;
+
+    /**
+     * 创建人id
+     */
+    @ApiModelProperty(hidden = true)
+    @TableField("create_user_id")
+    private Long createUserId;
+
+    /**
+     * 创建人名字
+     */
+    @ExcelProperty(value = "申请人", order = 5)
+    @ApiModelProperty(value = "申请人", dataType = "String")
+    @TableField("create_user_name")
+    private String createUserName;
+
+    /**
+     * 审批状态
+     */
+    @ApiModelProperty(value = "审批状态", dataType = "String")
+    @DictCodeField(message = "审批状态描述不合法", cacheName = MeterDictCode.APPROVAL_STATUS)
+    @TableField("approval_status")
+    private String approvalStatus;
+
+    /**
+     * 流程实例id
+     */
+    @ApiModelProperty(value = "流程实例id", dataType = "String")
+    @TableField("process_id")
+    private String processId;
+
+    /**
+     * 创建时间
+     */
+    @ExcelProperty(value = "申请时间", order = 6)
+    @ApiModelProperty(value = "申请时间", dataType = "String")
+    @TableField("create_time")
+    private String createTime;
+
+    /**
+     * 更新时间
+     */
+    @ApiModelProperty(hidden = true)
+    @TableField("update_time")
+    private String updateTime;
+
+    @ApiModelProperty(value = "审批状态类型-字典value", dataType = "String")
+    @TableField(exist = false)
+    private String approvalStatusName;
+
+    @ApiModelProperty(value = "任务id（同意、驳回等操作使用）", dataType = "String")
+    @TableField(exist = false)
+    private String taskId;
+
+    @ApiModelProperty(value = "可选决策项（1同意驳回拒绝 2同意驳回 3同意拒绝，用于待审批列表同意/驳回/拒绝按钮展示）", dataType = "Integer")
+    @TableField(exist = false)
+    private Integer decisionItem;
+
+
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourcerInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourcerInfo.java
index ec4e997..f9aa69e 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourcerInfo.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourcerInfo.java
@@ -17,6 +17,7 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import javax.validation.constraints.NotEmpty;
 import java.io.Serializable;
 
 /**
@@ -59,6 +60,29 @@
     @TableField("outsourcer_name")
     private String outsourcerName;
 
+    @NotEmpty(message = "实验室代码不能为空")
+    @DictCodeField(message = "实验室代码描述不合法", cacheName = MeterDictCode.LAB_CODE)
+    @ApiModelProperty(value = "实验室代码(字典code)", dataType = "String")
+    @TableField("lab_code")
+    private String labCode;
+
+    @ApiModelProperty(value = "实验室代码(字典value)", dataType = "String")
+    @TableField(exist = false)
+    private String labCodeName;
+
+    /**
+     * 组别代码
+     */
+    @NotEmpty(message = "组别代码不能为空")
+    @DictCodeField(message = "组别代码描述不合法", cacheName = MeterDictCode.GROUP_CODE)
+    @ApiModelProperty(value = "组别代码(字典code)", dataType = "String")
+    @TableField("group_code")
+    private String groupCode;
+
+    @ApiModelProperty(value = "组别代码(字典value)", dataType = "String")
+    @TableField(exist = false)
+    private String groupCodeName;
+
     /**
      * 单位简称
      */
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardInfo.java
index c48eed7..dffdfdd 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardInfo.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardInfo.java
@@ -5,6 +5,7 @@
 import com.baomidou.mybatisplus.annotation.TableName;
 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;
 
@@ -18,6 +19,7 @@
  * @author wangpeng
  * @since 2023-08-04
  */
+@ApiModel
 @Data
 @TableName("biz_equipment_standard_info")
 public class BizEquipmentStandardInfo implements Serializable {
@@ -119,7 +121,7 @@
      * 管理状态(字典code)
      */
     @ApiModelProperty(value = "管理状态(字典code)", dataType = "String")
-    @DictCodeField(message = "管理状态不合法", cacheName = MeterDictCode.MANAGER_STATE)
+    @DictCodeField(message = "管理状态不合法", cacheName = MeterDictCode.STANDARD_MANAGER_STATE)
     @TableField("manage_status")
     private String manageStatus;
 
@@ -151,7 +153,7 @@
     /**
      * 温度(℃)
      */
-    @ApiModelProperty(value = "使用状态(字典code)", dataType = "String")
+    @ApiModelProperty(value = "温度(℃)", dataType = "String")
     @TableField("temperature")
     private Double temperature;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardInfoApproval.java b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardInfoApproval.java
index dbd86ab..9f58d83 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardInfoApproval.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardInfoApproval.java
@@ -150,7 +150,7 @@
      * 管理状态(字典code)
      */
     @ApiModelProperty(value = "管理状态(字典code)", dataType = "String")
-    @DictCodeField(message = "管理状态不合法", cacheName = MeterDictCode.MANAGER_STATE)
+    @DictCodeField(message = "管理状态不合法", cacheName = MeterDictCode.STANDARD_MANAGER_STATE)
     @TableField("manage_status")
     private String manageStatus;
 

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java
index bb0c50f..13a699b 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java
@@ -12,6 +12,7 @@
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.IGeneralApprovalService;
+import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
@@ -19,6 +20,7 @@
 import org.springframework.web.bind.annotation.RequestBody;
 
 import javax.validation.Valid;
+import java.util.List;
 import java.util.Objects;
 
 /**
@@ -117,4 +119,17 @@
         }
         return baseApprovalService.failUpdate(request);
     }
+
+    public List<O> exportList(@RequestBody @Valid R request) throws Exception {
+        List<O> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = baseApprovalService.listExportByIds(request.getIds());
+        } else {
+            list = baseApprovalService.listExport(request);
+        }
+        for (O record : list) {
+            DictCodeUtils.convertDictCodeToName(record);
+        }
+        return list;
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java
index 8a90961..d775831 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java
@@ -5,6 +5,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.business.certificate.CertificateChangeApplyApprovalListRequest;
 import com.casic.missiles.dto.business.certificate.CertificateChangeApplySaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessCertificateChangeApply;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
@@ -20,6 +21,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -48,4 +50,12 @@
         }
         return changeApplyService.saveChangeApply(request);
     }
+
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody CertificateChangeApplyApprovalListRequest request) throws Exception {
+        List<BizBusinessCertificateChangeApply> list = super.exportList(request);
+        super.exportExcel(BizBusinessCertificateChangeApply.class, list, ExportEnum.CERTIFICATE_CHANGE_APPLY.getSheetName());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java
index 5fc4b07..af8230e 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java
@@ -9,6 +9,7 @@
 import com.casic.missiles.dto.business.certificate.CertificatePrintApprovalListRequest;
 import com.casic.missiles.dto.business.certificate.CertificatePrintListResponse;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.enums.business.CertificatePrintStatusEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessCertificatePrintLog;
@@ -18,10 +19,16 @@
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.io.IOException;
+import java.util.List;
 import java.util.Objects;
 
 /**
@@ -98,4 +105,16 @@
         });
         return certificatePrintService.certificatePrintLog(idDTO.getId());
     }
+
+    @ApiOperation("证书打印审批导出")
+    @PostMapping("/listExport")
+    public void exportList(@RequestBody CertificatePrintApprovalListRequest request) throws IOException {
+        List<CertificatePrintListResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = certificatePrintService.listByIds(request.getIds());
+        } else {
+            list = certificatePrintService.list(request);
+        }
+        super.exportExcel(CertificatePrintListResponse.class, list, ExportEnum.CERTIFICATE_PRINT.getSheetName());
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java
index 63b06dc..6b2efd5 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java
@@ -6,6 +6,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.business.certificate.CertificateReportApprovalListRequest;
 import com.casic.missiles.dto.business.certificate.CertificateReportSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessCertificateReport;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
@@ -21,6 +22,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -50,7 +52,7 @@
         return certificateReportService.saveCertificateReport(request);
     }
 
-    @ApiOperation("证书审批详情（基本信息）")
+    @ApiOperation("详情（基本信息）")
     @PostMapping("/detail")
     public ReturnDTO<BizBusinessCertificateReport> detail(@RequestBody @Valid BaseDetailRequest request, BindingResult bindingResult) throws Exception {
         if(bindingResult.hasErrors()){
@@ -59,4 +61,11 @@
         return certificateReportService.detail(request);
     }
 
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody CertificateReportApprovalListRequest request) throws Exception {
+        List<BizBusinessCertificateReport> list = super.exportList(request);
+        super.exportExcel(BizBusinessCertificateReport.class, list, ExportEnum.CERTIFICATE_REPORT.getSheetName());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java
index 46b26bd..57c0809 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java
@@ -10,20 +10,21 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.business.identify.IdentifyListRequest;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessIdentifyInfo;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.business.IBizBusinessIdentifyInfoService;
+import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import javax.validation.Valid;
+import java.util.List;
 import java.util.Objects;
 
 /**
@@ -57,16 +58,13 @@
         return identifyInfoService.addIdentify(identifyInfo);
     }
 
-    @ApiOperation("标识打印更新")
+    @ApiOperation("标识打印更新（更新打印时间）")
     @PostMapping("/update")
-    public ReturnDTO updateIdentify(@RequestBody @Valid BizBusinessIdentifyInfo identifyInfo, BindingResult bindingResult) {
-        Assert.isFalse(Objects.isNull(identifyInfo.getId()), () -> {
+    public ReturnDTO updateIdentify(@RequestBody @Valid IdDTO idDTO) {
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        Assert.isFalse(bindingResult.hasErrors(), () -> {
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        });
-        return identifyInfoService.updateIdentify(identifyInfo);
+        return identifyInfoService.updateIdentify(idDTO.getId());
     }
 
     @ApiOperation("标识打印删除")
@@ -77,4 +75,37 @@
         });
         return identifyInfoService.deleteIdentify(idDTO.getId());
     }
+
+    @ApiOperation("标识打印导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody @Valid IdentifyListRequest request, BindingResult bindingResult) throws Exception {
+        if (bindingResult.hasErrors()) {
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        List<BizBusinessIdentifyInfo> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = identifyInfoService.listByIds(request.getIds());
+        } else {
+            list = identifyInfoService.list(request);
+        }
+        for (BizBusinessIdentifyInfo record : list) {
+            DictCodeUtils.convertDictCodeToName(record);
+        }
+        super.exportExcel(BizBusinessIdentifyInfo.class, list, ExportEnum.IDENTIFY_EXPORT.getSheetName());
+    }
+
+
+    // TODO: 2023/8/23 查询设备信息，4个底部按钮查设备（按钮的作用就是前端用来调不同接口、用来区分中间即将展示的标识），前端弹窗选设备，在确定保存时前端根据底部按钮判断传入设备类型deviceType字典code
+    // TODO: 2023/8/23 接口：查受检设备（第1个按钮），查设备台账（后3个按钮同一接口），查询之后前端根据标志类型的不同加到中间页面时进行判断（按产品给的对应表）
+    // TODO: 2023/8/23 提供二维码接口，前端在加到中间页面时调用一下
+
+    @ApiOperation("设备二维码")
+    @PostMapping("/equipment/qrCode")
+    public ReturnDTO<String> equipmentQrCode(@RequestBody @Valid IdDTO idDTO) {
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return identifyInfoService.equipmentQrCode(idDTO.getId());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java
index 707be6e..7e0453d 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java
@@ -117,7 +117,7 @@
     }
 
     @ApiOperation("任务单导出")
-    @PostMapping("/export")
+    @PostMapping("/listExport")
     public void orderExport(@RequestBody @Valid OrderListRequest request, HttpServletResponse response) {
         businessOrderService.orderExport(request, response);
     }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java
index 529a6ce..51432be 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java
@@ -1,9 +1,28 @@
 package com.casic.missiles.controller.business;
 
+import com.casic.missiles.controller.GeneralApprovalController;
+import com.casic.missiles.dto.BaseApprovalSubmitRequest;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.business.outsource.OutsourceAssessApprovalListRequest;
+import com.casic.missiles.dto.business.outsource.OutsourceAssessSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
+import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.model.business.BizBusinessOutsourceAssess;
+import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
+import com.casic.missiles.service.IGeneralApprovalService;
+import com.casic.missiles.service.business.IBizBusinessOutsourceAssessService;
 import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.BindingResult;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.validation.Valid;
+import java.util.List;
+
 /**
  * <p>
  * 计量检定业务-分包管理-测试、校准或检定工作分包评审表 前端控制器
@@ -15,6 +34,27 @@
 @Api(tags = "分包管理-测试、校准或检定工作分包评审表")
 @RestController
 @RequestMapping("/business/outsource/assess")
-public class BizBusinessOutsourceAssessController {
+public class BizBusinessOutsourceAssessController extends GeneralApprovalController<BizBusinessOutsourceAssess, BizBusinessOutsourceAssess, OutsourceAssessApprovalListRequest, BaseApprovalSubmitRequest> {
+    @Autowired
+    private IBizBusinessOutsourceAssessService outsourceAssessService;
 
+    public BizBusinessOutsourceAssessController(IGeneralApprovalService<BizBusinessOutsourceAssess, BizBusinessOutsourceAssess, OutsourceAssessApprovalListRequest, BaseApprovalSubmitRequest> baseApprovalService) {
+        super(baseApprovalService);
+    }
+
+    @ApiOperation("草稿箱-保存")
+    @PostMapping("/save")
+    public ReturnDTO<OutsourceAssessSaveResponse> saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceAssess request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        return outsourceAssessService.saveOutsourceAssess(request);
+    }
+
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception {
+        List<BizBusinessOutsourceAssess> list = super.exportList(request);
+        super.exportExcel(BizBusinessOutsourceAssess.class, list, ExportEnum.OUTSOURCE_ASSESS.getSheetName());
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java
new file mode 100644
index 0000000..9adef18
--- /dev/null
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java
@@ -0,0 +1,60 @@
+package com.casic.missiles.controller.business;
+
+import com.casic.missiles.controller.GeneralApprovalController;
+import com.casic.missiles.dto.BaseApprovalSubmitRequest;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.business.outsource.OutsourceProtocolApprovalListRequest;
+import com.casic.missiles.dto.business.outsource.OutsourceProtocolSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
+import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.model.business.BizBusinessOutsourceProtocol;
+import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
+import com.casic.missiles.service.IGeneralApprovalService;
+import com.casic.missiles.service.business.IBizBusinessOutsourceProtocolService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.BindingResult;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.validation.Valid;
+import java.util.List;
+
+/**
+ * <p>
+ * 计量检定业务-分包管理-测试、校准或检定工作分包协议书 前端控制器
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-08-24
+ */
+@Api(tags = "分包管理-测试、校准或检定工作分包协议书")
+@RestController
+@RequestMapping("/business/outsource/protocol")
+public class BizBusinessOutsourceProtocolController extends GeneralApprovalController<BizBusinessOutsourceProtocol, BizBusinessOutsourceProtocol, OutsourceProtocolApprovalListRequest, BaseApprovalSubmitRequest> {
+    @Autowired
+    private IBizBusinessOutsourceProtocolService outsourceProtocolService;
+
+    public BizBusinessOutsourceProtocolController(IGeneralApprovalService<BizBusinessOutsourceProtocol, BizBusinessOutsourceProtocol, OutsourceProtocolApprovalListRequest, BaseApprovalSubmitRequest> baseApprovalService) {
+        super(baseApprovalService);
+    }
+
+    @ApiOperation("草稿箱-保存")
+    @PostMapping("/save")
+    public ReturnDTO<OutsourceProtocolSaveResponse> saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceProtocol request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        return outsourceProtocolService.saveOutsourceProtocol(request);
+    }
+
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody OutsourceProtocolApprovalListRequest request) throws Exception {
+        List<BizBusinessOutsourceProtocol> list = super.exportList(request);
+        super.exportExcel(BizBusinessOutsourceProtocol.class, list, ExportEnum.OUTSOURCE_PROTOCOL.getSheetName());
+    }
+}
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java
index 097f645..f0f0943 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java
@@ -17,7 +17,6 @@
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.IGeneralApprovalService;
 import com.casic.missiles.service.business.IBizBusinessOutsourcerInfoService;
-import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -71,19 +70,8 @@
 
     @ApiOperation("分包方导出")
     @PostMapping("/listExport")
-    public void export(@RequestBody @Valid OutsourcerInfoApprovalListRequest request, BindingResult bindingResult) throws Exception {
-        if (bindingResult.hasErrors()) {
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        }
-        List<BizBusinessOutsourcerInfo> list;
-        if (!CollectionUtils.isEmpty(request.getIds())) {
-            list = outsourcerInfoService.listByIds(request.getIds());
-        } else {
-            list = outsourcerInfoService.list(request);
-        }
-        for (BizBusinessOutsourcerInfo record : list) {
-            DictCodeUtils.convertDictCodeToName(record);
-        }
+    public void export(@RequestBody OutsourcerInfoApprovalListRequest request) throws Exception {
+        List<BizBusinessOutsourcerInfo> list = super.exportList(request);
         super.exportExcel(BizBusinessOutsourcerInfo.class, list, ExportEnum.OUTSOURCER_EXPORT.getSheetName());
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java
index c2cbf9f..0410918 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java
@@ -17,11 +17,9 @@
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.IGeneralApprovalService;
 import com.casic.missiles.service.business.IBizBusinessSiteExecutiveInfoService;
-import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -60,7 +58,7 @@
         return siteExecutiveInfoService.saveSiteExecutiveInfo(siteExecutiveInfo);
     }
 
-    @ApiOperation("现场检测详情")
+    @ApiOperation("详情")
     @PostMapping("/detail")
     public ReturnDTO<SiteExecutiveDetailResponse> siteExecutiveDetail(@RequestBody @Valid IdDTO idDTO) throws Exception {
         Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
@@ -69,21 +67,10 @@
         return ReturnUtil.success(siteExecutiveInfoService.detail(idDTO.getId()));
     }
 
-    @ApiOperation("现场检测导出")
+    @ApiOperation("导出")
     @PostMapping("/listExport")
-    public void export(@RequestBody @Valid SiteExecutiveApprovalListRequest request, BindingResult bindingResult) throws Exception {
-        if (bindingResult.hasErrors()) {
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        }
-        List<SiteExecutiveApprovalListResponse> list;
-        if (!CollectionUtils.isEmpty(request.getIds())) {
-            list = siteExecutiveInfoService.listInfoByIds(request.getIds());
-        } else {
-            list = siteExecutiveInfoService.listInfo(request);
-        }
-        for (SiteExecutiveApprovalListResponse record : list) {
-            DictCodeUtils.convertDictCodeToName(record);
-        }
+    public void export(@RequestBody SiteExecutiveApprovalListRequest request) throws Exception {
+        List<SiteExecutiveApprovalListResponse> list = super.exportList(request);
         super.exportExcel(SiteExecutiveApprovalListResponse.class, list, ExportEnum.SITE_EXECUTIVE_EXPORT.getSheetName());
     }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
index 7e793cd..a92e209 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
@@ -55,7 +55,7 @@
 
     @ApiOperation("设备收发列表导出")
     @PostMapping("/export")
-    public void exportList(@RequestBody @Valid SampleDispatchListRequest request) throws IOException {
+    public void exportList(@RequestBody SampleDispatchListRequest request) throws IOException {
         List<SampleDispatchListResponse> list;
         if (!CollectionUtils.isEmpty(request.getIds())) {
             list = dispatchService.listByIds(request.getIds());
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java
index cdc77fc..d120fd4 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java
@@ -7,6 +7,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.business.labExecutive.*;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.business.IBusinessLabExecutiveInfoService;
@@ -14,6 +15,7 @@
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.*;
 
@@ -32,7 +34,7 @@
     @Autowired
     private IBusinessLabExecutiveInfoService labExecutiveInfoService;
 
-    @ApiOperation("实验室检测-部门检测-查询各状态列表（待检测、检测中、检测完）")
+    @ApiOperation("实验室任务-查询各状态列表（待检测、检测中、检测完）")
     @PostMapping("/deptExecutive/List")
     public ReturnDTO<PageInfoBT<SampleLabExecutiveListResponse>> queryDeptExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
@@ -43,10 +45,19 @@
         return ReturnUtil.success(super.packForBT(labExecutiveInfoService.deptLabExecutiveListPage(page, labExecutiveListRequest)));
     }
 
-    /**
-     * 实验室检测-我的检测-查询各状态列表（待检测、检测中、检测完）
-     */
-    @ApiOperation("实验室检测-我的检测-查询各状态列表（待检测、检测中、检测完）")
+    @ApiOperation("实验室任务导出")
+    @PostMapping("/deptExecutive/export")
+    public void deptExportList(@RequestBody @Valid SampleLabExecutiveListRequest request) throws Exception {
+        List<SampleLabExecutiveListResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = labExecutiveInfoService.deptLabExecutiveListByIds(request.getMeasureStatus(), request.getIds());
+        } else {
+            list = labExecutiveInfoService.deptLabExecutiveList(request);
+        }
+        super.exportExcel(SampleLabExecutiveListResponse.class, list, ExportEnum.DEPT_EXECUTIVE_TASK.getSheetName());
+    }
+
+    @ApiOperation("我的任务-查询各状态列表（待检测、检测中、检测完）")
     @PostMapping("/myExecutive/list")
     public ReturnDTO<PageInfoBT<SampleLabExecutiveListResponse>> queryMyExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
@@ -57,19 +68,25 @@
         return ReturnUtil.success(super.packForBT(labExecutiveInfoService.myLabExecutiveListPage(page, labExecutiveListRequest)));
     }
 
-    /**
-     * 实验室检测-我的检测-查询各状态样品数量（待检测、检测中、检测完）
-     */
-    @ApiOperation("实验室检测-我的检测-查询各状态样品数量（待检测、检测中、检测完）")
+    @ApiOperation("我的任务导出")
+    @PostMapping("/myExecutive/export")
+    public void exportList(@RequestBody @Valid SampleLabExecutiveListRequest request) throws Exception {
+        List<SampleLabExecutiveListResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = labExecutiveInfoService.myLabExecutiveListByIds(request.getMeasureStatus(), request.getIds());
+        } else {
+            list = labExecutiveInfoService.myLabExecutiveList(request);
+        }
+        super.exportExcel(SampleLabExecutiveListResponse.class, list, ExportEnum.MY_EXECUTIVE_TASK.getSheetName());
+    }
+
+    @ApiOperation("我的任务-查询各状态样品数量（待检测、检测中、检测完）")
     @GetMapping("/myExecutive/amount")
     public ReturnDTO<List<SampleAmountResponse>> queryMyExecutiveAmount() {
         return ReturnUtil.success(labExecutiveInfoService.myExecutiveAmount());
     }
 
-    /**
-     * 实验室检测-部门检测-分配（分配给具体人员）
-     */
-    @ApiOperation("实验室检测-部门检测-分配按钮（分配给具体人员）")
+    @ApiOperation("实验室任务-分配按钮（分配给具体人员）")
     @PostMapping("/deptExecutive/allocate")
     public ReturnDTO allocateStaff(@RequestBody @Valid SampleAllocateRequest sampleAllocateRequest, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -78,10 +95,7 @@
         return labExecutiveInfoService.allocateStaff(sampleAllocateRequest);
     }
 
-    /**
-     * 实验室检测-我的检测-检定人扫描收入（待检测->检测中）
-     */
-    @ApiOperation("实验室检测-我的检测-检定人扫描收入（待检测->检测中）")
+    @ApiOperation("我的任务-检定人扫描收入（待检测->检测中）")
     @PostMapping("/myExecutive/receive")
     public ReturnDTO sampleReceive(@RequestBody @Valid List<SampleOperateRequest> requestList, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -90,10 +104,7 @@
         return labExecutiveInfoService.sampleReceive(requestList);
     }
 
-    /**
-     * 实验室检测-负责人/检定人扫描检完（检测中->检测完）
-     */
-    @ApiOperation("实验室检测-负责人/检定人扫描检完（检测中->检测完）")
+    @ApiOperation("实验室任务-负责人/检定人扫描检完（检测中->检测完）")
     @PostMapping("/myExecutive/complete")
     public ReturnDTO sampleExecutiveComplete(@RequestBody @Valid List<SampleOperateRequest> requestList, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -102,10 +113,7 @@
         return labExecutiveInfoService.sampleExecutiveComplete(requestList);
     }
 
-    /**
-     * 实验室检测-部门检测/我的检测 编辑（只能修改应出具证书）
-     */
-    @ApiOperation("实验室检测-部门检测/我的检测 编辑（只能修改应出具证书）")
+    @ApiOperation("实验室任务/我的任务 编辑（只能修改应出具证书）")
     @PostMapping("/executive/update")
     public ReturnDTO updateExecutive(@RequestBody @Valid UpdateExecutiveRequest request, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -114,10 +122,7 @@
         return labExecutiveInfoService.updateExecutive(request);
     }
 
-    /**
-     * 实验室检测-部门检测/我的检测 详情
-     */
-    @ApiOperation("实验室检测-部门检测/我的检测 详情")
+    @ApiOperation("实验室任务/我的任务 详情")
     @PostMapping("/executive/detail")
     public ReturnDTO<ExecutiveDetailResponse> executiveDetail(@RequestBody @Valid ExecutiveDetailRequest request, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
@@ -131,7 +136,7 @@
      * 退回后会将下一个要执行的实验室检测状态更新为待分配，将后面的实验室顺序变更为连续（都进行减1）
      * 最后一个检测的实验室退回，等分发员再增加实验室或设备收发中的已收入直接手动点击完成
      */
-    @ApiOperation("实验室检测-部门检测/我的检测 退回（待检测/检测中->退回）")
+    @ApiOperation("实验室任务/我的任务 退回（待检测/检测中->退回）")
     @PostMapping("/executive/sendBack")
     public ReturnDTO executiveSendBack(@RequestBody @Valid ExecutiveSendBackRequest request, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -140,9 +145,6 @@
         return labExecutiveInfoService.sampleExecutiveSendBack(request);
     }
 
-    /**
-     * 分发员编辑实验室检测列表
-     */
     @ApiOperation("分发员编辑实验室检测列表")
     @PostMapping("/handOut/updateList")
     public ReturnDTO updateExecutiveList(@RequestBody @Valid UpdateExecutiveListRequest request, BindingResult bindingResult) {
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java
index 48a67ed..0c04f31 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java
@@ -10,6 +10,7 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.resource.customer.CustomerApprovalListRequest;
 import com.casic.missiles.dto.resource.customer.CustomerSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceCustomerInfo;
@@ -26,6 +27,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -55,6 +57,13 @@
         return customerInfoService.saveCustomerInfo(request);
     }
 
+    @ApiOperation("委托方名录导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody CustomerApprovalListRequest request) throws Exception {
+        List<BizResourceCustomerInfo> list = super.exportList(request);
+        super.exportExcel(BizResourceCustomerInfo.class, list, ExportEnum.CUSTOMER_INFO.getSheetName());
+    }
+
     @ApiOperation("委托方人员列表（分页）")
     @PostMapping("/person/listPage")
     public ReturnDTO<PageInfoBT<BizResourceCustomerStaff>> personListPage(@RequestBody IdDTO idDto) {
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
index 972ed4b..6418ea5 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
@@ -5,6 +5,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.resource.customer.SuggestFormApprovalListRequest;
 import com.casic.missiles.dto.resource.customer.SuggestFormSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceCustomerSuggestForm;
@@ -20,6 +21,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -50,4 +52,11 @@
         return suggestFormService.saveSuggestForm(request);
     }
 
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody SuggestFormApprovalListRequest request) throws Exception {
+        List<BizResourceCustomerSuggestForm> list = super.exportList(request);
+        super.exportExcel(BizResourceCustomerSuggestForm.class, list, ExportEnum.CUSTOMER_SUGGEST_FORM.getSheetName());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java
index 1934d1a..9e07eab 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java
@@ -15,12 +15,16 @@
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.resource.IEnvEnvironmentRecordConfigService;
 import com.casic.missiles.service.resource.IEnvEnvironmentRecordDataService;
+import com.casic.missiles.service.resource.IEnvLocationInfoService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
 import java.util.List;
@@ -39,6 +43,8 @@
     private IEnvEnvironmentRecordDataService environmentRecordDataService;
     @Autowired
     private IEnvEnvironmentRecordConfigService environmentRecordConfigService;
+    @Autowired
+    private IEnvLocationInfoService locationInfoService;
 
     @ApiOperation("环境记录单数据列表/详情")
     @PostMapping("/data/listPage")
@@ -95,4 +101,11 @@
         });
         return environmentRecordConfigService.deleteEnvironmentRecordConfig(idDTO.getId());
     }
+
+    @ApiOperation("地点列表")
+    @PostMapping("/location/listPage")
+    public ReturnDTO<PageInfoBT<LocationListResponse>> locationListPage(@RequestBody @Valid LocationListRequest request) {
+        Page<LocationListResponse> page = PageFactory.defaultPage();
+        return ReturnUtil.success(super.packForBT(locationInfoService.listPage(page, request)));
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java
index 82efe3f..e9561fa 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java
@@ -10,6 +10,7 @@
 import com.casic.missiles.dto.resource.seal.SealLogListRequest;
 import com.casic.missiles.dto.resource.seal.SealNoteApprovalListRequest;
 import com.casic.missiles.dto.resource.seal.SealNoteSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceSealUseLog;
@@ -27,6 +28,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -58,6 +60,13 @@
         return sealUseNoteService.saveSeal(request);
     }
 
+    @ApiOperation("印章使用登记导出（列表和导出中去掉经办人和监印人）")
+    @PostMapping("/listExport")
+    public void export(@RequestBody SealNoteApprovalListRequest request) throws Exception {
+        List<BizResourceSealUseNote> list = super.exportList(request);
+        super.exportExcel(BizResourceSealUseNote.class, list, ExportEnum.SEAL_NOTE.getSheetName());
+    }
+
     // TODO: 2023/7/28 印章使用日志：系统中使用印章时插入数据库
 
     @ApiOperation("印章使用日志列表（分页）")
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java
index 9b674fc..06b6521 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java
@@ -9,16 +9,20 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.resource.staff.StaffCertRequest;
 import com.casic.missiles.dto.resource.staff.StaffCertResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.service.resource.IBizResourceStaffInfoService;
 import com.casic.missiles.service.resource.IBizResourceStaffVerifierService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.List;
+
 /**
  * @Description:
  * @Author: wangpeng
@@ -41,9 +45,21 @@
         return ReturnUtil.success(super.packForBT(responsePage));
     }
 
+    @ApiOperation("证书逾期提醒导出")
+    @PostMapping("/listExport")
+    public void exportList(@RequestBody StaffCertRequest request) throws Exception {
+        List<StaffCertResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = staffInfoService.certListByIds(request.getIds());
+        } else {
+            list = staffInfoService.certList(request);
+        }
+        super.exportExcel(StaffCertResponse.class, list, ExportEnum.STAFF_CERTIFICATE_EXPIRE.getSheetName());
+    }
+
     @ApiOperation("证书逾期提醒")
     @PostMapping("/expirationReminder")
-    public ReturnDTO expirationReminder(@RequestBody IdDTO idDto) {
-        return verifierService.expirationReminder(idDto);
+    public ReturnDTO expirationReminder(@RequestBody IdDTO idDTO) {
+        return verifierService.expirationReminder(idDTO);
     }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java
index 3b251ad..a6e7850 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java
@@ -12,6 +12,7 @@
 import com.casic.missiles.dto.resource.staff.StaffListRequest;
 import com.casic.missiles.dto.resource.staff.TrainListRequest;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.*;
@@ -22,7 +23,10 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
 import java.util.List;
@@ -52,8 +56,19 @@
             throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
         }
         Page<BizResourceStaffInfo> page = PageFactory.defaultPage();
-        Page<BizResourceStaffInfo> responsePage = staffInfoService.listPage(page, request);
-        return ReturnUtil.success(super.packForBT(responsePage));
+        return ReturnUtil.success(super.packForBT(staffInfoService.listPage(page, request)));
+    }
+
+    @ApiOperation("人员登记导出")
+    @PostMapping("/listExport")
+    public void exportList(@RequestBody StaffListRequest request) throws Exception {
+        List<BizResourceStaffInfo> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = staffInfoService.listByIds(request.getIds());
+        } else {
+            list = staffInfoService.list(request);
+        }
+        super.exportExcel(BizResourceStaffInfo.class, list, ExportEnum.STAFF_INFO.getSheetName());
     }
 
     @ApiOperation("人员登记详情基础信息")
@@ -85,9 +100,9 @@
 
     @ApiOperation("科研教育列表（分页）")
     @PostMapping("/education/listPage")
-    public ReturnDTO<PageInfoBT<BizResourceStaffEducation>> educationListPage(@RequestBody IdDTO idDto) {
+    public ReturnDTO<PageInfoBT<BizResourceStaffEducation>> educationListPage(@RequestBody IdDTO idDTO) {
         Page<BizResourceStaffEducation> page = PageFactory.defaultPage();
-        Page<BizResourceStaffEducation> responsePage = staffInfoService.educationListPage(page, idDto);
+        Page<BizResourceStaffEducation> responsePage = staffInfoService.educationListPage(page, idDTO);
         return ReturnUtil.success(super.packForBT(responsePage));
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java
index af6aa86..d85d84a 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java
@@ -9,6 +9,7 @@
 import com.casic.missiles.dto.resource.outsideService.SupplierApprovalListRequest;
 import com.casic.missiles.dto.resource.outsideService.SupplierSaveResponse;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceSupplierAbility;
@@ -67,6 +68,13 @@
         return ReturnUtil.success(supplierInfoService.detail(idDTO.getId()));
     }
 
+    @ApiOperation("合格供方导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody SupplierApprovalListRequest request) throws Exception {
+        List<BizResourceSupplierInfo> list = super.exportList(request);
+        super.exportExcel(BizResourceSupplierInfo.class, list, ExportEnum.SUPPLIER_INFO.getSheetName());
+    }
+
     @ApiOperation("供方人员列表（分页）")
     @PostMapping("/person/listPage")
     public ReturnDTO<PageInfoBT<BizResourceSupplierPerson>> personListPage(@RequestBody IdDTO idDTO) {
diff --git a/casic-metering-api/src/main/resources/config/application.yml b/casic-metering-api/src/main/resources/config/application.yml
index 350db5f..ecff521 100644
--- a/casic-metering-api/src/main/resources/config/application.yml
+++ b/casic-metering-api/src/main/resources/config/application.yml
@@ -126,7 +126,7 @@
     #作者
     author: wangpeng
     #待生成对象表名
-    table-name: biz_equipment_technical_target_approval,biz_equipment_attachment_approval,biz_equipment_checkpoint_approval
+    table-name: biz_business_outsource_protocol
 
 reminder:
   #节点--common模块config包 ReminderNodeConfig配置
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
index 4a19e4e..d47d552 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
@@ -53,6 +53,7 @@
     SUGGEST_FORM_SAVE_FAILED(2509, "委托方意见登记表保存至草稿箱失败"),
     EXAMINE_FORM_SAVE_FAILED(2510, "要求、委托书及合同评审表保存至草稿箱失败"),
     CUSTOMER_EXIST_SAVE_FAILED(2511, "该委托方已存在，请重新选择"),
+    DUPLICATE_LOCATION_NO(2512, "地点编号已存在"),
 
     /**
      * 计量检定业务模块
@@ -68,6 +69,8 @@
     COMPLETE_SAMPLE_NOT_EXIST(2609, "检测中不存在扫描收入的样品"),
     CANNOT_CHANGE_MEASURE_INFO(2610, "无法更改非当前登录用户的检测信息"),
     NON_EXIST_ORDER_OR_SAMPLE(2611, "不存在该委托单或该委托单下的样品"),
+    OUTSOURCE_ACCESS_SAVE_FAILED(2612, "测试、校准或检定工作分包评审表保存至草稿箱失败"),
+    OUTSOURCE_PROTOCOL_SAVE_FAILED(2613, "测试、校准或检定工作分包协议书保存至草稿箱失败"),
 
     /**
      * 历史遗留备用
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
index 5089ad1..81a406b 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
@@ -10,54 +10,38 @@
     /**
      * 资源管理
      */
-    ENVIRONMENT_DATA_EXPORT("environmentData", "environmentData", "环境记录单数据"),
+    ENVIRONMENT_DATA_EXPORT("environmentData", "环境记录单数据", "环境记录单数据"),
+    STAFF_INFO("staffInfo", "人员登记", "人员登记"),
+    STAFF_CERTIFICATE_EXPIRE("certificateExpire", "证书逾期提醒", "证书逾期提醒"),
+    SUPPLIER_INFO("supplierInfo", "合格供方名录", "合格供方名录"),
+    CUSTOMER_INFO("customerInfo", "委托方名录", "委托方名录"),
+    CUSTOMER_SUGGEST_FORM("customerSuggestForm", "委托方意见登记表", "委托方意见登记表"),
+    SEAL_NOTE("sealNote", "印章使用登记", "印章使用登记"),
 
-    FILE_EXPORT("meterFileData", "meterFileData", "计量文件信息"),
-    TRAIN_PLAN_EXPORT("trainPlanData", "trainPlanData", "培训计划"),
-    TRAIN_LOG_EXPORT("trainLogData", "trainLogData", "培训记录"),
-    METER_ORGANIZE_EXPORT("meterOrganizeData", "meterOrganizeData", "计量组织"),
-    TRACE_SUPPLIER_EXPORT("traceSupplierData", "traceSupplierData", "溯源供方"),
-    SIGN_EXPORT("signData", "signData", "签名/签章"),
-    TEMPLATE_EXPORT("templateData", "templateData", "原始记录模板/证书报告模板"),
-    FIXED_ASSETS("meterFixedAssets", "meterFixedAssets", "固定资产"),
-    METER_EQUIPMENT("meterEquipment", "meterEquipment", "测量设备"),
-    CALIBRATION_TEST_EQUIPMENT("calibrationTestEquipment", "calibrationTestEquipment", "校准检定设备"),
-    MEASURE_ACCOUNT("measureAccount", "measureAccount", "测量工装"),
-    STANDARD_SUPPORT_EQUIPMENT("standardSupportEquipment", "standardSupportEquipment", "标准配套设备"),
-    STANDARD_EQUIPMENT("standardEquipment", "standardEquipment", "标准装置"),
-    FLOW_DEF_EXPORT("flowDefData", "flowDefData", "流程定义"),
-    STAFF_CERTIFICATE("certificate", "certificate", "计量人员证书"),
-    CHECK_INFO("checkInfo", "checkInfo", "设备管理点检测"),
-    EQUIPMENT_APPLY("equipmentApply", "equipmentApply", "设备借用"),
-    STANDARD_EQUIPMENT_REMIND("equipmentApplyRemind", "equipmentApplyRemind", "标准装置到期提醒"),
-    METER_PRICE("meterPrice", "meterPrice", "价格库"),
-    METER_STAFF("meterStaff", "meterStaff", "计量人员"),
-    STANDARD_EQUIPMENT_APPLY("standardEquipmentApply", "standardEquipmentApply", "标准装置申请"),
-    STATE_MANAGE_APPLY("stateManage", "stateManage", "状态管理"),
-    METER_ACCEPTANCE_CHECK("acceptanceCheck", "acceptanceCheck", "设备检修保养验收单"),
-    CUSTOMER_EXPORT("customerData", "customerData", "客户信息"),
-    ORDER_EXPORT("orderData", "orderData", "委托书信息"),
-    SAMPLE_EXPORT("sampleData", "sampleData", "样本信息"),
-    EXCHANGE_DATA("exchangeData", "exchangeData", "设备交接单"),
-    DISPATCH_DATA("dispatchData", "dispatchData", "设备收发"),
-    ENVIRONMENT_DATA("environmentData", "environmentData", "环境记录单"),
-    ORIGIN_DATA("originData", "originData", "原始记录"),
-    CERTIFICATE_REPORT("certificateReport", "certificateReport", "证书报告"),
-    ADVICE_EXPORT("adviceData", "adviceData", "客户反馈"),
-    HANDOUT_EXPORT("handoutData", "handoutData", "任务分发列表"),
-    OUTSOURCER_EXPORT("outsourcerData", "outsourcerData", "分包方"),
-    SITE_EXECUTIVE_EXPORT("siteExecutiveData", "siteExecutiveData", "现场测试、校准或检定"),
-    CERTIFICATE_PRINT_EXPORT("certificatePrintData", "certificatePrintData", "证书打印"),
-    DOWNLOAD_TEMPLATE("downloadTemplate", "downloadTemplate", "页面配置"),
-    OUTSOURCER_CERTIFICATE_EXPORT("outsourceCertificateData", "outsourceCertificateData", "分包证书"),
-    SETTLEMENT_INFO_EXPORT("settlementInfoData", "settlementInfoData", "业务结算"),
-    EQUIPMENT_REMIND("equipmentRemind", "equipmentRemind", "设备到期提醒"),
-    AGREEMENT_INFO_EXPORT("agreementInfoData", "agreementInfoData", "合同"),
-    WORK_STATISTICS_EXPORT("workStatisticsData", "workStatisticsData", "实时工作统计"),
-    DEPT_OUTPUT_EXPORT("deptOutputData", "deptOutputData", "部门产值分析"),
-    WORKLOAD_EXPORT("workloadData", "workloadData", "业务工作量分析"),
-    DEPT_COMPREHENSIVE_EXPORT("deptComprehensiveData", "deptComprehensiveData", "部门综合分析"),
-    ENVIRONMENTAL_RECORD("environmentalRecordData", "environmentalRecordData", "现场环境记录");
+    /**
+     * 计量检定业务
+     */
+    OUTSOURCER_EXPORT("outsourcerData", "分包方名录", "分包方名录"),
+    IDENTIFY_EXPORT("identifyData", "计量标识", "计量标识"),
+    ORDER_EXPORT("orderData", "任务单", "任务单"),
+    DISPATCH_DATA("dispatchData", "设备收发", "设备收发"),
+    HANDOUT_EXPORT("handoutData", "任务分发", "任务分发"),
+    SITE_EXECUTIVE_EXPORT("siteExecutiveData", "现场测试、校准或检定", "现场测试、校准或检定"),
+    CERTIFICATE_REPORT("certificateReport", "证书审批", "证书审批"),
+    CERTIFICATE_CHANGE_APPLY("certificateChangeApply", "证书报告补充或更换申请单", "证书报告补充或更换申请单"),
+    CERTIFICATE_PRINT("certificatePrintData", "证书打印审批", "证书打印审批"),
+    DEPT_EXECUTIVE_TASK("deptExecutiveTaskData", "实验室任务", "实验室任务"),
+    MY_EXECUTIVE_TASK("myExecutiveTaskData", "我的任务", "我的任务"),
+    OUTSOURCE_ASSESS("outsourceAssess", "测试、校准或检定工作分包评审表", "测试、校准或检定工作分包评审表"),
+    OUTSOURCE_PROTOCOL("outsourceProtocol", "测试、校准或检定工作分包协议书", "测试、校准或检定工作分包协议书"),
+
+    /**
+     * 系统管理
+     */
+    SIGN_EXPORT("signData", "签名", "签名"),
+    TEMPLATE_EXPORT("templateData", "文件模板", "文件模板"),
+    FLOW_DEF_EXPORT("flowDefData", "流程定义", "流程定义"),
+    DOWNLOAD_TEMPLATE("downloadTemplate", "流程定义", "页面配置");
 
     ExportEnum(String fileName, String sheetName, String description) {
         this.fileName = fileName;
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateRecordTypeCodeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateRecordTypeCodeEnum.java
index 31d913c..a963522 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateRecordTypeCodeEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateRecordTypeCodeEnum.java
@@ -46,4 +46,14 @@
     String SITE_EXECUTIVE_APPROVAL = "01";
     //《现场测试、校准或检定工作记录表》
     String SITE_EXECUTIVE_LOG = "02";
+
+    //测试、校准或检定工作分包协议书
+    String OUTSOURCE_PROTOCOL = "01";
+    //测试、校准或检定工作分包评审表
+    String OUTSOURCE_ACCESS = "02";
+    //测试、校准或检定工作分包通知书
+    String OUTSOURCE_NOTICE = "03";
+    //测试、校准或检定工作分包方名录
+    String OUTSOURCE_INFO = "04";
+
 }
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
index 24b8635..f78bd53 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
@@ -15,6 +15,10 @@
     String CERTIFICATE_CHANGE_APPLY_BEAN_NAME = "certificateChangeApplyBean";
     //现场测试、校准或检定
     String SITE_EXECUTIVE_BEAN_NAME = "siteExecutiveBean";
+    //测试、校准或检定工作分包评审表
+    String OUTSOURCE_ASSESS_BEAN_NAME = "outsourceAssessBean";
+    //测试、校准或检定工作分包协议书
+    String OUTSOURCE_PROTOCOL_BEAN_NAME = "outsourceProtocolBean";
 
     /*********************************设备与装置************************************/
     //设备台账
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 b21c661..6b86fd1 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
@@ -18,6 +18,8 @@
     OUTSOURCER_APPROVAL(OUTSOURCER_BEAN_NAME, ""),
     CERTIFICATE_CHANGE_APPROVAL(CERTIFICATE_CHANGE_APPLY_BEAN_NAME, ""),
     SITE_EXECUTIVE_APPROVAL(SITE_EXECUTIVE_BEAN_NAME, ""),
+    OUTSOURCE_ASSESS_APPROVAL(OUTSOURCE_ASSESS_BEAN_NAME, ""),
+    OUTSOURCE_PROTOCOL_APPROVAL(OUTSOURCE_PROTOCOL_BEAN_NAME, ""),
 
     ACTION_STATUS_MAP(new HashMap<String, AwareActionStatusEnum>() {
         {
@@ -47,6 +49,10 @@
             put(ApplyFromIdEnum.CERTIFICATE_CHANGE_APPROVAL.getCode(), CERTIFICATE_CHANGE_APPROVAL);
             //现场测试、校准或检定审批
             put(ApplyFromIdEnum.SITE_EXECUTIVE_APPROVAL.getCode(), SITE_EXECUTIVE_APPROVAL);
+            //测试、校准或检定工作分包评审表
+            put(ApplyFromIdEnum.OUTSOURCE_ASSESS_APPROVAL.getCode(), OUTSOURCE_ASSESS_APPROVAL);
+            //测试、校准或检定工作分包协议书
+            put(ApplyFromIdEnum.OUTSOURCE_PROTOCOL_APPROVAL.getCode(), OUTSOURCE_PROTOCOL_APPROVAL);
         }
     });
     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 934405e..c7410bd 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
@@ -9,6 +9,8 @@
     CERTIFICATE_CHANGE_APPROVAL("jljdywzsbchghsqd", MessageSourceModuleEnum.BUSINESS.getCode(), "证书/报告补充或更换申请单"),
     OUTSOURCER_APPROVAL("jljdywcsjzhgfbfml", MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定合格分包方名录"),
     SITE_EXECUTIVE_APPROVAL("jljdywxccsjzsp", MessageSourceModuleEnum.BUSINESS.getCode(), "现场测试、校准或检定审批"),
+    OUTSOURCE_ASSESS_APPROVAL("jljdywcsjzfbpsb", MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包评审表"),
+    OUTSOURCE_PROTOCOL_APPROVAL("jljdywcsjzfbxys", MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包协议书"),
 
 
     /*******************************************设备与装置*********************************************/
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/GeneralApprovalMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/GeneralApprovalMapper.java
index 4fb7344..0c9d6ae 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/GeneralApprovalMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/GeneralApprovalMapper.java
@@ -17,8 +17,4 @@
 
     Page<O> selectBatchForApprovalList(Page<O> page, @Param("request") R request, @Param("businessKeys") List<String> businessKeys);
 
-//    Page<O> selectListPage(Page<O> page, @Param("request") R request);
-
-//    Long selectMaxNo();
-
 }
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceAssessMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceAssessMapper.java
index 7867bb8..ba59009 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceAssessMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceAssessMapper.java
@@ -1,7 +1,12 @@
 package com.casic.missiles.mapper.business;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.business.outsource.OutsourceAssessApprovalListRequest;
+import com.casic.missiles.mapper.GeneralApprovalMapper;
 import com.casic.missiles.model.business.BizBusinessOutsourceAssess;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * <p>
@@ -11,6 +16,10 @@
  * @author wangpeng
  * @since 2023-08-16
  */
-public interface BizBusinessOutsourceAssessMapper extends BaseMapper<BizBusinessOutsourceAssess> {
+public interface BizBusinessOutsourceAssessMapper extends GeneralApprovalMapper<BizBusinessOutsourceAssess, BizBusinessOutsourceAssess, OutsourceAssessApprovalListRequest> {
+
+    Page<BizBusinessOutsourceAssess> selectBatchForApprovalList(Page<BizBusinessOutsourceAssess> page, @Param("request") OutsourceAssessApprovalListRequest request, @Param("businessKeys") List<String> businessKeys);
+
+    Long selectMaxProjectNo();
 
 }
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceProtocolMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceProtocolMapper.java
new file mode 100644
index 0000000..e6aba35
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceProtocolMapper.java
@@ -0,0 +1,24 @@
+package com.casic.missiles.mapper.business;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.business.outsource.OutsourceProtocolApprovalListRequest;
+import com.casic.missiles.mapper.GeneralApprovalMapper;
+import com.casic.missiles.model.business.BizBusinessOutsourceProtocol;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 计量检定业务-分包管理-测试、校准或检定工作分包协议书 Mapper 接口
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-08-24
+ */
+public interface BizBusinessOutsourceProtocolMapper extends GeneralApprovalMapper<BizBusinessOutsourceProtocol, BizBusinessOutsourceProtocol, OutsourceProtocolApprovalListRequest> {
+
+    Page<BizBusinessOutsourceProtocol> selectBatchForApprovalList(Page<BizBusinessOutsourceProtocol> page, @Param("request") OutsourceProtocolApprovalListRequest request, @Param("businessKeys") List<String> businessKeys);
+
+    Long selectMaxProtocolNo();
+}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/EnvLocationInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/EnvLocationInfoMapper.java
new file mode 100644
index 0000000..49eff87
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/EnvLocationInfoMapper.java
@@ -0,0 +1,21 @@
+package com.casic.missiles.mapper.resource;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.resource.environment.LocationListRequest;
+import com.casic.missiles.dto.resource.environment.LocationListResponse;
+import com.casic.missiles.model.resource.EnvLocationInfo;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * <p>
+ * 实验室环境监控系统-设备表 Mapper 接口
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-06-07
+ */
+public interface EnvLocationInfoMapper extends BaseMapper<EnvLocationInfo> {
+
+    Page<LocationListResponse> selectLocationListPage(Page<LocationListResponse> page, @Param("request") LocationListRequest request);
+}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java
index de124db..85ed0f7 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java
@@ -1,7 +1,9 @@
 package com.casic.missiles.mapper.system;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.dto.system.SignDetailResponse;
+import com.casic.missiles.dto.system.SignListRequest;
 import com.casic.missiles.model.system.SystemSign;
 import org.apache.ibatis.annotations.Param;
 
@@ -22,4 +24,8 @@
     SignDetailResponse selectSignDetailById(Long id);
 
     List<SystemSign> selectUsableSignList(@Param("userId") Long userId);
+
+    Page<SystemSign> selectSignListPage(Page<SystemSign> page, @Param("request") SignListRequest request);
+
+    List<SystemSign> selectSignList(@Param("request") SignListRequest request);
 }
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateChangeApplyMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateChangeApplyMapper.xml
index d798447..c496092 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateChangeApplyMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateChangeApplyMapper.xml
@@ -30,31 +30,31 @@
         SELECT *
         FROM biz_business_certificate_change_apply
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.changeApplyNo != null and request.changeApplyNo !=''">
+        <if test="request != null and request.changeApplyNo != null and request.changeApplyNo !=''">
             and change_apply_no like concat('%',#{request.changeApplyNo},'%')
         </if>
-        <if test="request.changeReportNo != null and request.changeReportNo !=''">
+        <if test="request != null and request.changeReportNo != null and request.changeReportNo !=''">
             and change_report_no like concat('%',#{request.changeReportNo},'%')
         </if>
-        <if test="request.changeReportName != null and request.changeReportName !=''">
+        <if test="request != null and request.changeReportName != null and request.changeReportName !=''">
             and change_report_name like concat('%',#{request.changeReportName},'%')
         </if>
-        <if test="request.changeType != null and request.changeType !=''">
+        <if test="request != null and request.changeType != null and request.changeType !=''">
             and change_type = #{request.changeType}
         </if>
-        <if test="request.createUserName != null and request.createUserName !=''">
+        <if test="request != null and request.createUserName != null and request.createUserName !=''">
             and create_user_name like concat('%',#{request.createUserName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificatePrintMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificatePrintMapper.xml
index b66cd99..49c0ac8 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificatePrintMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificatePrintMapper.xml
@@ -31,34 +31,34 @@
         LEFT JOIN biz_business_order_sample_relation bosr ON (bosr.order_id = bcr.order_id AND bosr.sample_id = bcr.sample_id)
         LEFT JOIN biz_business_order_info boi ON boi.id = bosr.order_id
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and bcp.approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.printStatus != null and request.printStatus !=''">
+        <if test="request != null and request.printStatus != null and request.printStatus !=''">
             and print_status = #{request.printStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and bcp.create_user_id = #{request.createUserId}
         </if>
-        <if test="request.certificateReportNo != null and request.certificateReportNo !=''">
+        <if test="request != null and request.certificateReportNo != null and request.certificateReportNo !=''">
             and bcr.certificate_report_no like concat('%',#{request.certificateReportNo},'%')
         </if>
-        <if test="request.certificateReportName != null and request.certificateReportName !=''">
+        <if test="request != null and request.certificateReportName != null and request.certificateReportName !=''">
             and bcr.certificate_report_name like concat('%',#{request.certificateReportName},'%')
         </if>
-        <if test="request.customerName != null and request.customerName !=''">
+        <if test="request != null and request.customerName != null and request.customerName !=''">
             and boi.customer_name like concat('%',#{request.customerName},'%')
         </if>
-        <if test="request.sampleNo != null and request.sampleNo !=''">
+        <if test="request != null and request.sampleNo != null and request.sampleNo !=''">
             and bosr.sample_no like concat('%',#{request.sampleNo},'%')
         </if>
-        <if test="request.sampleName != null and request.sampleName !=''">
+        <if test="request != null and request.sampleName != null and request.sampleName !=''">
             and bosr.sample_name like concat('%',#{request.sampleName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and bcp.create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and bcp.create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml
index b366034..767695d 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml
@@ -46,33 +46,37 @@
         SELECT bcr.*, bosr.sample_no, bosr.sample_name, bosr.sample_model, rsi.staff_name
         FROM biz_business_certificate_report bcr
         LEFT JOIN biz_business_order_sample_relation bosr ON (bosr.order_id = bcr.order_id AND bosr.sample_id = bcr.sample_id)
+        LEFT JOIN biz_business_order_info boi ON boi.id = bcr.order_id
         LEFT JOIN biz_resource_staff_info rsi ON rsi.id = bcr.measure_person_id
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and bcr.approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and bcr.create_user_id = #{request.createUserId}
         </if>
-        <if test="request.certificateReportNo != null and request.certificateReportNo !=''">
+        <if test="request != null and request.customerId != null and request.customerId !=''">
+            and boi.customer_id = #{request.customerId}
+        </if>
+        <if test="request != null and request.certificateReportNo != null and request.certificateReportNo !=''">
             and bcr.certificate_report_no like concat('%',#{request.certificateReportNo},'%')
         </if>
-        <if test="request.certificateReportName != null and request.certificateReportName !=''">
+        <if test="request != null and request.certificateReportName != null and request.certificateReportName !=''">
             and bcr.certificate_report_name like concat('%',#{request.certificateReportName},'%')
         </if>
-        <if test="request.sampleNo != null and request.sampleNo !=''">
+        <if test="request != null and request.sampleNo != null and request.sampleNo !=''">
             and bosr.sample_no like concat('%',#{request.sampleNo},'%')
         </if>
-        <if test="request.measureCategory != null and request.measureCategory !=''">
+        <if test="request != null and request.measureCategory != null and request.measureCategory !=''">
             and bcr.measure_category = #{request.measureCategory}
         </if>
-        <if test="request.measurePerson != null and request.measurePerson !=''">
+        <if test="request != null and request.measurePerson != null and request.measurePerson !=''">
             and rsi.staff_name like concat('%',#{request.measurePerson},'%')
         </if>
-        <if test="request.calibrationTimeStart != null and request.calibrationTimeStart !=''">
+        <if test="request != null and request.calibrationTimeStart != null and request.calibrationTimeStart !=''">
             and bcr.calibration_time &gt;= #{request.calibrationTimeStart}
         </if>
-        <if test="request.calibrationTimeEnd != null and request.calibrationTimeEnd !=''">
+        <if test="request != null and request.calibrationTimeEnd != null and request.calibrationTimeEnd !=''">
             and bcr.calibration_time &lt;= #{request.calibrationTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceAssessMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceAssessMapper.xml
index d0fcf8b..c22c101 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceAssessMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceAssessMapper.xml
@@ -7,6 +7,8 @@
         <id column="id" property="id" />
         <result column="project_no" property="projectNo" />
         <result column="project_name" property="projectName" />
+        <result column="lab_code" property="labCode" />
+        <result column="group_code" property="groupCode" />
         <result column="applicant_id" property="applicantId" />
         <result column="applicant_name" property="applicantName" />
         <result column="applicant_time" property="applicantTime" />
@@ -31,7 +33,45 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, project_no, project_name, applicant_id, applicant_name, applicant_time, minio_file_name, remark, create_user_id, create_user_name, outsourcer_id, pre_start_time, pre_end_time, outsource_reason, pre_cost, approval_status, process_id, approve_situation, traceability, test_method, technique_ability, create_time, update_time
+        id, project_no, project_name, lab_code, group_code, applicant_id, applicant_name, applicant_time, minio_file_name, remark, create_user_id, create_user_name, outsourcer_id, pre_start_time, pre_end_time, outsource_reason, pre_cost, approval_status, process_id, approve_situation, traceability, test_method, technique_ability, create_time, update_time
     </sql>
 
+    <select id="selectMaxProjectNo" resultType="java.lang.Long">
+        SELECT IFNULL(max(RIGHT(project_no, 3)), 0) from biz_business_outsource_assess
+    </select>
+
+    <select id="selectBatchForApprovalList" resultMap="BaseResultMap">
+        SELECT bboa.*, bboi.outsourcer_name, bboi.director
+        FROM biz_business_outsource_assess bboa
+        LEFT JOIN biz_business_outsourcer_info bboi ON bboa.outsourcer_id = bboi.id
+        WHERE 1=1
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
+            and bboa.approval_status = #{request.approvalStatus}
+        </if>
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
+            and bboa.create_user_id = #{request.createUserId}
+        </if>
+        <if test="request != null and request.projectNo != null and request.projectNo !=''">
+            and bboa.project_no like concat('%',#{request.projectNo},'%')
+        </if>
+        <if test="request != null and request.outsourcerName != null and request.outsourcerName !=''">
+            and bboi.outsourcer_name like concat('%',#{request.outsourcerName},'%')
+        </if>
+        <if test="request != null and request.applicantName != null and request.applicantName !=''">
+            and bboa.applicant_name like concat('%',#{request.applicantName},'%')
+        </if>
+        <if test="request != null and request.applicantTimeStart != null and request.applicantTimeStart !=''">
+            and bboa.applicant_time &gt;= #{request.applicantTimeStart}
+        </if>
+        <if test="request != null and request.applicantTimeEnd != null and request.applicantTimeEnd !=''">
+            and bboa.applicant_time &lt;= #{request.applicantTimeEnd}
+        </if>
+        <if test="businessKeys != null">
+            and bboa.id in
+            <foreach collection="businessKeys" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
+        ORDER BY bboa.create_time DESC
+    </select>
 </mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceProtocolMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceProtocolMapper.xml
new file mode 100644
index 0000000..b7b2149
--- /dev/null
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceProtocolMapper.xml
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.mapper.business.BizBusinessOutsourceProtocolMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.business.BizBusinessOutsourceProtocol">
+        <id column="id" property="id" />
+        <result column="protocol_no" property="protocolNo" />
+        <result column="project_name" property="projectName" />
+        <result column="lab_code" property="labCode" />
+        <result column="group_code" property="groupCode" />
+        <result column="outsourcer_id" property="outsourcerId" />
+        <result column="remark" property="remark" />
+        <result column="outsource_no" property="outsourceNo" />
+        <result column="outsource_name" property="outsourceName" />
+        <result column="contacts" property="contacts" />
+        <result column="mobile" property="mobile" />
+        <result column="address" property="address" />
+        <result column="require_date" property="requireDate" />
+        <result column="outsource_cost" property="outsourceCost" />
+        <result column="director" property="director" />
+        <result column="item" property="item" />
+        <result column="requires" property="requires" />
+        <result column="create_user_id" property="createUserId" />
+        <result column="create_user_name" property="createUserName" />
+        <result column="approval_status" property="approvalStatus" />
+        <result column="process_id" property="processId" />
+        <result column="create_time" property="createTime" />
+        <result column="update_time" property="updateTime" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, protocol_no, project_name, lab_code, group_code, outsourcer_id, remark, outsource_no, outsource_name, contacts, mobile, address, require_date, outsource_cost, director, item, requires, create_user_id, create_user_name, approval_status, process_id, create_time, update_time
+    </sql>
+
+    <select id="selectMaxProtocolNo" resultType="java.lang.Long">
+        SELECT IFNULL(max(RIGHT(protocol_no, 3)), 0) from biz_business_outsource_protocol
+    </select>
+
+    <select id="selectBatchForApprovalList" resultMap="BaseResultMap">
+        SELECT *
+        FROM biz_business_outsource_protocol
+        WHERE 1=1
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
+            and approval_status = #{request.approvalStatus}
+        </if>
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
+            and create_user_id = #{request.createUserId}
+        </if>
+        <if test="request != null and request.protocolNo != null and request.protocolNo !=''">
+            and protocol_no like concat('%',#{request.protocolNo},'%')
+        </if>
+        <if test="request != null and request.outsourcerName != null and request.outsourcerName !=''">
+            and outsourcer_name like concat('%',#{request.outsourcerName},'%')
+        </if>
+        <if test="request != null and request.applicantName != null and request.applicantName !=''">
+            and create_user_name like concat('%',#{request.applicantName},'%')
+        </if>
+        <if test="request != null and request.applicantTimeStart != null and request.applicantTimeStart !=''">
+            and create_time &gt;= #{request.applicantTimeStart}
+        </if>
+        <if test="request != null and request.applicantTimeEnd != null and request.applicantTimeEnd !=''">
+            and create_time &lt;= #{request.applicantTimeEnd}
+        </if>
+        <if test="businessKeys != null">
+            and id in
+            <foreach collection="businessKeys" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
+        ORDER BY create_time DESC
+    </select>
+</mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourcerInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourcerInfoMapper.xml
index 510a80b..3049b54 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourcerInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourcerInfoMapper.xml
@@ -7,6 +7,8 @@
         <id column="id" property="id" />
         <result column="outsourcer_no" property="outsourcerNo" />
         <result column="outsourcer_name" property="outsourcerName" />
+        <result column="lab_code" property="labCode" />
+        <result column="group_code" property="groupCode" />
         <result column="outsourcer_brief_name" property="outsourcerBriefName" />
         <result column="outsourcer_size" property="outsourcerSize" />
         <result column="business_size" property="businessSize" />
@@ -55,32 +57,32 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, outsourcer_no, outsourcer_name, outsourcer_brief_name, outsourcer_size, business_size, grade, evaluation, tax_number, bank_account, bank_name, bank_account_number, postal_code, director, phone, fax, mobile, email, website, address_country, address_province, address_city, address_area, full_address, address_country_name, address_province_name, address_city_name, address_area_name, invoice_country, invoice_province, invoice_city, invoice_area, invoice_full_address, invoice_country_name, invoice_province_name, invoice_city_name, invoice_area_name, business_scope, business_content, minio_file_name, approval_status, process_id, remark, create_user_id, create_user_name, create_time, update_time
+        id, outsourcer_no, outsourcer_name, lab_code, group_code, outsourcer_brief_name, outsourcer_size, business_size, grade, evaluation, tax_number, bank_account, bank_name, bank_account_number, postal_code, director, phone, fax, mobile, email, website, address_country, address_province, address_city, address_area, full_address, address_country_name, address_province_name, address_city_name, address_area_name, invoice_country, invoice_province, invoice_city, invoice_area, invoice_full_address, invoice_country_name, invoice_province_name, invoice_city_name, invoice_area_name, business_scope, business_content, minio_file_name, approval_status, process_id, remark, create_user_id, create_user_name, create_time, update_time
     </sql>
 
     <select id="selectBatchForApprovalList" resultMap="BaseResultMap">
         SELECT *
         FROM biz_business_outsourcer_info
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.outsourcerNo != null and request.outsourcerNo !=''">
+        <if test="request != null and request.outsourcerNo != null and request.outsourcerNo !=''">
             and outsourcer_no like concat('%',#{request.outsourcerNo},'%')
         </if>
-        <if test="request.outsourcerName != null and request.outsourcerName !=''">
+        <if test="request != null and request.outsourcerName != null and request.outsourcerName !=''">
             and outsourcer_name like concat('%',#{request.outsourcerName},'%')
         </if>
-        <if test="request.director != null and request.director !=''">
+        <if test="request != null and request.director != null and request.director !=''">
             and director like concat('%',#{request.director},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
@@ -93,6 +95,6 @@
     </select>
 
     <select id="selectMaxNo" resultType="java.lang.Long">
-        SELECT IFNULL(max(RIGHT(outsourcer_no, 12)), 0) from biz_business_outsourcer_info
+        SELECT IFNULL(max(RIGHT(outsourcer_no, 3)), 0) from biz_business_outsourcer_info
     </select>
 </mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessSiteExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessSiteExecutiveInfoMapper.xml
index 135c5d0..3c5ae79 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessSiteExecutiveInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessSiteExecutiveInfoMapper.xml
@@ -38,25 +38,25 @@
         FROM biz_business_site_executive_info bsei
         LEFT JOIN biz_resource_customer_info rci ON bsei.customer_id = rci.id
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and bsei.approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and bsei.create_user_id = #{request.createUserId}
         </if>
-        <if test="request.siteExecutiveNo != null and request.siteExecutiveNo !=''">
+        <if test="request != null and request.siteExecutiveNo != null and request.siteExecutiveNo !=''">
             and bsei.site_executive_no like concat('%',#{request.siteExecutiveNo},'%')
         </if>
-        <if test="request.customerName != null and request.customerName !=''">
+        <if test="request != null and request.customerName != null and request.customerName !=''">
             and rci.outsourcer_name like concat('%',#{request.customerName},'%')
         </if>
-        <if test="request.applyName != null and request.applyName !=''">
+        <if test="request != null and request.applyName != null and request.applyName !=''">
             and bsei.apply_name like concat('%',#{request.applyName},'%')
         </if>
-        <if test="request.applyTimeStart != null and request.applyTimeStart !=''">
+        <if test="request != null and request.applyTimeStart != null and request.applyTimeStart !=''">
             and bsei.apply_time &gt;= #{request.applyTimeStart}
         </if>
-        <if test="request.applyTimeEnd != null and request.applyTimeEnd !=''">
+        <if test="request != null and request.applyTimeEnd != null and request.applyTimeEnd !=''">
             and bsei.apply_time &lt;= #{request.applyTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml
index 84d9e2a..6bd38a9 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml
@@ -105,6 +105,12 @@
         <if test="request.isUrgent != null and request.isUrgent !=''">
             AND bo.is_urgent = #{request.isUrgent}
         </if>
+        <if test="request.ids != null">
+            and blei.id in
+            <foreach collection="request.ids" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
         ORDER BY blei.update_time DESC
     </select>
 
@@ -137,6 +143,12 @@
         <if test="request.isUrgent != null and request.isUrgent !=''">
             AND bo.is_urgent = #{request.isUrgent}
         </if>
+        <if test="request.ids != null">
+            and blei.id in
+            <foreach collection="request.ids" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
         ORDER BY blei.update_time DESC
     </select>
 
diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardInfoMapper.xml
index 1a5551b..2ed8d17 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardInfoMapper.xml
@@ -45,12 +45,6 @@
         FROM biz_equipment_standard_info besi
         LEFT JOIN biz_equipment_standard_technology_relation bestr ON besi.standard_no = bestr.standard_no
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
-            and besi.approval_status = #{request.approvalStatus}
-        </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
-            and besi.create_user_id = #{request.createUserId}
-        </if>
         <if test="request.standardName != null and request.standardName !=''">
             and besi.standard_name like concat('%',#{request.standardName},'%')
         </if>
diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardTechnologyRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardTechnologyRelationMapper.xml
index fc7e16c..cd03c8c 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardTechnologyRelationMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardTechnologyRelationMapper.xml
@@ -6,6 +6,7 @@
     <resultMap id="BaseResultMap" type="com.casic.missiles.model.equipment.BizEquipmentStandardTechnologyRelation">
         <id column="id" property="id" />
         <result column="technology_file_id" property="technologyFileId" />
+        <result column="technology_file_no" property="technologyFileNo" />
         <result column="technology_file_name" property="technologyFileName" />
         <result column="standard_id" property="standardId" />
         <result column="standard_no" property="standardNo" />
@@ -14,7 +15,7 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, technology_file_id, technology_file_name, standard_id, remark
+        id, technology_file_id, technology_file_no, technology_file_name, standard_id, remark
     </sql>
 
 </mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceAuthorizeOrderMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceAuthorizeOrderMapper.xml
index ac5176c..554fe65 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceAuthorizeOrderMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceAuthorizeOrderMapper.xml
@@ -32,22 +32,22 @@
         SELECT *
         FROM biz_resource_authorize_order
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.orderNo != null and request.orderNo !=''">
+        <if test="request != null and request.orderNo != null and request.orderNo !=''">
             and order_no like concat('%',#{request.orderNo},'%')
         </if>
-        <if test="request.createUserName != null and request.createUserName !=''">
+        <if test="request != null and request.createUserName != null and request.createUserName !=''">
             and create_user_name like concat('%',#{request.createUserName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerExamineFormMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerExamineFormMapper.xml
index ab242f6..af7f98f 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerExamineFormMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerExamineFormMapper.xml
@@ -41,28 +41,28 @@
         SELECT *
         FROM biz_resource_customer_examine_form
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.formNo != null and request.formNo !=''">
+        <if test="request != null and request.formNo != null and request.formNo !=''">
             and form_no like concat('%',#{request.formNo},'%')
         </if>
-        <if test="request.labCode != null and request.labCode !=''">
+        <if test="request != null and request.labCode != null and request.labCode !=''">
             and lab_code like concat('%',#{request.labCode},'%')
         </if>
-        <if test="request.groupCode != null and request.groupCode !=''">
+        <if test="request != null and request.groupCode != null and request.groupCode !=''">
             and group_code like concat('%',#{request.groupCode},'%')
         </if>
-        <if test="request.createUserName != null and request.createUserName !=''">
+        <if test="request != null and request.createUserName != null and request.createUserName !=''">
             and create_user_name like concat('%',#{request.createUserName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerInfoMapper.xml
index fa8ffbc..06a2798 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerInfoMapper.xml
@@ -33,25 +33,25 @@
         SELECT *
         FROM biz_resource_customer_info
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.customerNo != null and request.customerNo !=''">
+        <if test="request != null and request.customerNo != null and request.customerNo !=''">
             and customer_no like concat('%',#{request.customerNo},'%')
         </if>
-        <if test="request.customerName != null and request.customerName !=''">
+        <if test="request != null and request.customerName != null and request.customerName !=''">
             and customer_name like concat('%',#{request.customerName},'%')
         </if>
-        <if test="request.contacts != null and request.contacts !=''">
+        <if test="request != null and request.contacts != null and request.contacts !=''">
             and contacts like concat('%',#{request.contacts},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerSuggestFormMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerSuggestFormMapper.xml
index 28f5bb2..1806662 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerSuggestFormMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerSuggestFormMapper.xml
@@ -33,28 +33,28 @@
         SELECT *
         FROM biz_resource_customer_suggest_form
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.formNo != null and request.formNo !=''">
+        <if test="request != null and request.formNo != null and request.formNo !=''">
             and form_no like concat('%',#{request.formNo},'%')
         </if>
-        <if test="request.customerName != null and request.customerName !=''">
+        <if test="request != null and request.customerName != null and request.customerName !=''">
             and customer_name like concat('%',#{request.customerName},'%')
         </if>
-        <if test="request.customerDeptName != null and request.customerDeptName !=''">
+        <if test="request != null and request.customerDeptName != null and request.customerDeptName !=''">
             and customer_dept_name like concat('%',#{request.customerDeptName},'%')
         </if>
-        <if test="request.createUserName != null and request.createUserName !=''">
+        <if test="request != null and request.createUserName != null and request.createUserName !=''">
             and create_user_name like concat('%',#{request.createUserName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSealUseNoteMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSealUseNoteMapper.xml
index ab37bc1..b02bb33 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSealUseNoteMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSealUseNoteMapper.xml
@@ -29,32 +29,32 @@
     </sql>
 
     <select id="selectBatchForApprovalList" resultMap="BaseResultMap">
-        SELECT *
+        SELECT brsun.*, brsi.seal_name, brsi.seal_type, brsi.approver_name
         FROM biz_resource_seal_use_note brsun
         JOIN biz_resource_seal_info brsi ON brsun.seal_id = brsi.id
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and brsun.approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and brsun.create_user_id = #{request.createUserId}
         </if>
-        <if test="request.sealName != null and request.sealName !=''">
+        <if test="request != null and request.sealName != null and request.sealName !=''">
             and brsi.seal_name like concat('%',#{request.sealName},'%')
         </if>
-        <if test="request.sealType != null and request.sealType !=''">
+        <if test="request != null and request.sealType != null and request.sealType !=''">
             and brsi.seal_type = #{request.sealType}
         </if>
-        <if test="request.applyDeptName != null and request.applyDeptName !=''">
+        <if test="request != null and request.applyDeptName != null and request.applyDeptName !=''">
             and brsun.apply_dept_name like concat('%',#{request.applyDeptName},'%')
         </if>
-        <if test="request.applyUserName != null and request.applyUserName !=''">
+        <if test="request != null and request.applyUserName != null and request.applyUserName !=''">
             and brsun.apply_user_name like concat('%',#{request.applyUserName},'%')
         </if>
-        <if test="request.applyTimeStart != null and request.applyTimeStart !=''">
+        <if test="request != null and request.applyTimeStart != null and request.applyTimeStart !=''">
             and brsun.apply_time &gt;= #{request.applyTimeStart}
         </if>
-        <if test="request.applyTimeEnd != null and request.applyTimeEnd !=''">
+        <if test="request != null and request.applyTimeEnd != null and request.applyTimeEnd !=''">
             and brsun.apply_time &lt;= #{request.applyTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml
index 119bf7d..4f8392a 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml
@@ -31,6 +31,12 @@
         <if test="request.deptName != null and request.deptName !=''">
             and brsi.dept_name like concat('%',#{request.deptName},'%')
         </if>
+        <if test="request.ids != null">
+            and brsv.id in
+            <foreach collection="request.ids" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
         ORDER BY brsv.grant_date DESC
     </select>
 
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSupplierInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSupplierInfoMapper.xml
index fe8d399..e8ce7ef 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSupplierInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSupplierInfoMapper.xml
@@ -48,28 +48,28 @@
         SELECT *
         FROM biz_resource_supplier_info
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.supplierNo != null and request.supplierNo !=''">
+        <if test="request != null and request.supplierNo != null and request.supplierNo !=''">
             and supplier_no like concat('%',#{request.supplierNo},'%')
         </if>
-        <if test="request.supplierName != null and request.supplierName !=''">
+        <if test="request != null and request.supplierName != null and request.supplierName !=''">
             and supplier_name like concat('%',#{request.supplierName},'%')
         </if>
-        <if test="request.director != null and request.director !=''">
+        <if test="request != null and request.director != null and request.director !=''">
             and director like concat('%',#{request.director},'%')
         </if>
-        <if test="request.supplierType != null and request.supplierType !=''">
+        <if test="request != null and request.supplierType != null and request.supplierType !=''">
             and supplier_type = #{request.supplierType}
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/EnvLocationInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/EnvLocationInfoMapper.xml
new file mode 100644
index 0000000..68bcf10
--- /dev/null
+++ b/casic-metering-dao/src/main/resources/mapper/resource/EnvLocationInfoMapper.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.mapper.resource.EnvLocationInfoMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.resource.EnvLocationInfo">
+        <id column="id" property="id" />
+        <result column="location_no" property="locationNo" />
+        <result column="location_name" property="locationName" />
+        <result column="location_position" property="locationPosition" />
+        <result column="create_user_id" property="createUserId" />
+        <result column="create_user" property="createUser" />
+        <result column="create_time" property="createTime" />
+        <result column="update_time" property="updateTime" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, location_no, location_name, location_position, create_user_id, create_user, create_time, update_time
+    </sql>
+
+    <select id="selectLocationListPage" resultType="com.casic.missiles.dto.resource.environment.LocationListResponse">
+        SELECT *
+        FROM env_location_info
+        WHERE 1=1
+        <if test="request.locationNo != null and request.locationNo !=''">
+            AND location_no LIKE concat('%',#{request.locationNo},'%')
+        </if>
+        <if test="request.locationName != null and request.locationName !=''">
+            AND location_name LIKE concat('%',#{request.locationName},'%')
+        </if>
+        ORDER BY create_time DESC
+    </select>
+
+</mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml
index b28c18f..8854047 100644
--- a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml
@@ -11,7 +11,6 @@
         <result column="sign_desc" property="signDesc" />
         <result column="sign_director" property="signDirector" />
         <result column="sign_user_id" property="signUserId" />
-        <result column="sign_type" property="signType" />
         <result column="minio_file_name" property="minioFileName" />
         <result column="create_time" property="createTime" />
         <result column="update_time" property="updateTime" />
@@ -28,7 +27,6 @@
         <result column="sign_name" property="signName" />
         <result column="sign_desc" property="signDesc" />
         <result column="sign_director" property="signDirector" />
-        <result column="sign_type" property="signType" />
         <result column="sign_user_id" property="signUserId" />
         <result column="minio_file_name" property="minioFileName" />
         <result column="create_time" property="createTime" />
@@ -62,4 +60,58 @@
         JOIN system_sign_user_relation ssur ON ss.id = ssur.sign_id
         WHERE ssur.user_id = #{userId}
     </select>
+
+    <select id="selectSignListPage" resultMap="BaseResultMap">
+        SELECT ss.*, sd.SIMPLE_NAME AS deptName
+        FROM system_sign ss
+        LEFT JOIN sys_user su ON su.id = ss.sign_user_id
+        LEFT JOIN sys_dept sd ON sd.id = su.dept_id
+        WHERE 1=1
+        <if test="request.signNo != null and request.signNo !=''">
+            AND ss.sign_no LIKE concat('%',#{request.signNo},'%')
+        </if>
+        <if test="request.signName != null and request.signName !=''">
+            AND ss.sign_name LIKE concat('%',#{request.signName},'%')
+        </if>
+        <if test="request.signDirector != null and request.signDirector !=''">
+            AND ss.sign_director LIKE concat('%',#{request.signDirector},'%')
+        </if>
+        <if test="request.signUserId != null and request.signUserId !=''">
+            AND ss.sign_user_id = #{request.signUserId}
+        </if>
+        <if test="request.createStartTime != null and request.createStartTime !=''">
+            AND DATE_FORMAT(ss.create_time,'%Y-%m-%d') &gt;= DATE_FORMAT(#{request.createStartTime},'%Y-%m-%d')
+        </if>
+        <if test="request.createEndTime != null and request.createEndTime !=''">
+            AND DATE_FORMAT(ss.create_time,'%Y-%m-%d')  &lt;= DATE_FORMAT(#{request.createEndTime},'%Y-%m-%d')
+        </if>
+        ORDER BY ss.create_time DESC
+    </select>
+
+    <select id="selectSignList" resultMap="BaseResultMap">
+        SELECT ss.*, sd.SIMPLE_NAME AS deptName
+        FROM system_sign ss
+        LEFT JOIN sys_user su ON su.id = ss.sign_user_id
+        LEFT JOIN sys_dept sd ON sd.id = su.dept_id
+        WHERE 1=1
+        <if test="request.signNo != null and request.signNo !=''">
+            AND ss.sign_no LIKE concat('%',#{request.signNo},'%')
+        </if>
+        <if test="request.signName != null and request.signName !=''">
+            AND ss.sign_name LIKE concat('%',#{request.signName},'%')
+        </if>
+        <if test="request.signDirector != null and request.signDirector !=''">
+            AND ss.sign_director LIKE concat('%',#{request.signDirector},'%')
+        </if>
+        <if test="request.signUserId != null and request.signUserId !=''">
+            AND ss.sign_user_id = #{request.signUserId}
+        </if>
+        <if test="request.createStartTime != null and request.createStartTime !=''">
+            AND DATE_FORMAT(ss.create_time,'%Y-%m-%d') &gt;= DATE_FORMAT(#{request.createStartTime},'%Y-%m-%d')
+        </if>
+        <if test="request.createEndTime != null and request.createEndTime !=''">
+            AND DATE_FORMAT(ss.create_time,'%Y-%m-%d')  &lt;= DATE_FORMAT(#{request.createEndTime},'%Y-%m-%d')
+        </if>
+        ORDER BY ss.create_time DESC
+    </select>
 </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 515050a..60f530b 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
@@ -47,8 +47,8 @@
     String STORAGE_LOCATION = "bizStorageLocation";
     //计量专业
     String MEASURE_MAJOR = "bizMeasureMajor";
-    //管理状态
-    String MANAGER_STATE = "bizManagerState";
+    //标准装置管理状态
+    String STANDARD_MANAGER_STATE = "bizStandardManagerState";
 
     /**
      * 资源管理 字典code
@@ -95,8 +95,6 @@
     String MEASURE_STATUS = "measureStatus";
     //检定方式
     String MEASURE_TYPE = "measureType";
-    //标识打印标志类型
-    String IDENTIFY_PRINT_TYPE = "bizBusinessIdentify";
     //变更类型
     String REPORT_CHANGE_TYPE = "bizCertChangeType";
     //规模类型
@@ -111,19 +109,24 @@
     String MEASURE_CATEGORY = "measureCategory";
     //检定结果
     String MEASURE_RESULT = "measureResult";
+    //分包原因
+    String OUTSOURCE_REASON = "outsourceReason";
+
+    /**
+     * 系统管理
+     */
+    String TEMPLATE_TYPE = "templateType";
+
 
     /**
      * 标准装置 字典code
      */
     //类别
     String STANDARD_CATEGORY = "standardCategory";
-    //管理状态
-    String STANDARD_MANAGER_STATE = "standardManagerState";
     //标准等级
     String STANDARD_LEVEL = "standardLevel";
     //传递范围
     String STANDARD_TRANSMIT_RANGE = "transmitRange";
-
     //资本来源
     String CAPITAL_SOURCE = "capitalSource";
     //标准装置-申请类型
@@ -148,8 +151,6 @@
     String CERTIFICATE_CLASS = "certificationClass";
     //证书管理-检校专业
     String CALIBRATION_MAJOR = "calibrationMajor";
-    //分包原因
-    String OUTSOURCE_REASON = "outsourceReason";
 
     /**
      * 工作台
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/BaseApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/BaseApprovalListRequest.java
index 73c12c1..80d7424 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/BaseApprovalListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/BaseApprovalListRequest.java
@@ -6,6 +6,7 @@
 
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotEmpty;
+import java.util.List;
 
 /**
  * @Description:
@@ -19,14 +20,14 @@
      * 表单id
      */
     @NotBlank(message = "表单id不能为空")
-    @ApiModelProperty(value = "表单id（流程定义对应的表单id，等价于业务id）", dataType = "String")
+    @ApiModelProperty(value = "表单id（流程定义对应的表单id，等价于业务id），导出接口不用传", dataType = "String")
     private String formId;
 
     /**
      * 审批状态类型，对应ApprovalStatusEnum
      */
     @NotEmpty(message = "审批状态类型不能为空")
-    @ApiModelProperty(value = "审批状态类型code", dataType = "String")
+    @ApiModelProperty(value = "审批状态类型code，导出接口不用传", dataType = "String")
     private String approvalStatus;
 
     @ApiModelProperty(hidden = true)
@@ -34,4 +35,7 @@
 
     @ApiModelProperty(hidden = true)
     private Long createUserId;
+
+    @ApiModelProperty(value = "导出ids", dataType = "List")
+    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificatePrintApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificatePrintApprovalListRequest.java
index b93d1c9..3cc2f4e 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificatePrintApprovalListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificatePrintApprovalListRequest.java
@@ -5,8 +5,6 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import java.util.List;
-
 /**
  * @Description:
  * @Author: wangpeng
@@ -38,7 +36,4 @@
 
     @ApiModelProperty(value = "创建结束时间", dataType = "String")
     private String createTimeEnd;
-
-    @ApiModelProperty(value = "导出ids", dataType = "List")
-    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportApprovalListRequest.java
index 4f7a038..c115847 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportApprovalListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportApprovalListRequest.java
@@ -5,8 +5,6 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import java.util.List;
-
 /**
  * @Description:
  * @Author: wangpeng
@@ -15,6 +13,8 @@
 @ApiModel
 @Data
 public class CertificateReportApprovalListRequest extends BaseApprovalListRequest {
+    @ApiModelProperty(value = "委托方id", dataType = "String")
+    private Long customerId;
 
     @ApiModelProperty(value = "证书报告编号", dataType = "String")
     private String certificateReportNo;
@@ -37,6 +37,4 @@
     @ApiModelProperty(value = "检校结束时间", dataType = "String")
     private String calibrationTimeEnd;
 
-    @ApiModelProperty(value = "导出ids", dataType = "List")
-    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/identify/IdentifyListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/identify/IdentifyListRequest.java
index 1b87ae6..f019203 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/identify/IdentifyListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/identify/IdentifyListRequest.java
@@ -4,6 +4,8 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * @Description:
  * @Author: wangpeng
@@ -26,4 +28,7 @@
 
     @ApiModelProperty(value = "打印结束时间", dataType = "String")
     private String createTimeEnd;
+
+    @ApiModelProperty(value = "导出ids", dataType = "List")
+    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListRequest.java
index 1264883..62415fb 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListRequest.java
@@ -7,6 +7,7 @@
 import lombok.Data;
 
 import javax.validation.constraints.NotBlank;
+import java.util.List;
 
 @Data
 @ApiModel
@@ -37,4 +38,6 @@
     @ApiModelProperty(value = "是否加急（1是0否null全部）", dataType = "Integer")
     private String isUrgent;
 
+    @ApiModelProperty(value = "导出ids", dataType = "List")
+    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListRequest.java
index 5201d7b..499760a 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListRequest.java
@@ -17,6 +17,9 @@
     @ApiModelProperty(value = "任务单编号", dataType = "String")
     private String orderNo;
 
+    @ApiModelProperty(value = "委托方id", dataType = "Long")
+    private Long customerId;
+
     @ApiModelProperty(value = "委托方名称", dataType = "String")
     private String customerName;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OrderSampleDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OrderSampleDTO.java
new file mode 100644
index 0000000..796edc0
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OrderSampleDTO.java
@@ -0,0 +1,19 @@
+package com.casic.missiles.dto.business.outsource;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/8/24 11:38
+ */
+@ApiModel
+@Data
+public class OrderSampleDTO {
+    @ApiModelProperty(value = "任务单id", dataType = "Long")
+    private Long orderId;
+    @ApiModelProperty(value = "受检设备id", dataType = "Long")
+    private Long sampleId;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceAssessApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceAssessApprovalListRequest.java
new file mode 100644
index 0000000..9a930c3
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceAssessApprovalListRequest.java
@@ -0,0 +1,30 @@
+package com.casic.missiles.dto.business.outsource;
+
+import com.casic.missiles.dto.BaseApprovalListRequest;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/8/24 11:01
+ */
+@ApiModel
+@Data
+public class OutsourceAssessApprovalListRequest extends BaseApprovalListRequest {
+    @ApiModelProperty(value = "评审表编号", dataType = "String")
+    private String projectNo;
+
+    @ApiModelProperty(value = "分包机构名称", dataType = "String")
+    private String outsourcerName;
+
+    @ApiModelProperty(value = "申请人", dataType = "String")
+    private String applicantName;
+
+    @ApiModelProperty(value = "申请时间开始", dataType = "String")
+    private String applicantTimeStart;
+
+    @ApiModelProperty(value = "申请时间结束", dataType = "String")
+    private String applicantTimeEnd;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceAssessSaveResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceAssessSaveResponse.java
new file mode 100644
index 0000000..8bf9aad
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceAssessSaveResponse.java
@@ -0,0 +1,20 @@
+package com.casic.missiles.dto.business.outsource;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/8/14 16:17
+ */
+@ApiModel
+@Data
+public class OutsourceAssessSaveResponse {
+    @ApiModelProperty(value = "主键id", dataType = "Long")
+    private Long id;
+
+    @ApiModelProperty(value = "编号", dataType = "String")
+    private String projectNo;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProtocolApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProtocolApprovalListRequest.java
new file mode 100644
index 0000000..0f32331
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProtocolApprovalListRequest.java
@@ -0,0 +1,30 @@
+package com.casic.missiles.dto.business.outsource;
+
+import com.casic.missiles.dto.BaseApprovalListRequest;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/8/24 15:01
+ */
+@ApiModel
+@Data
+public class OutsourceProtocolApprovalListRequest extends BaseApprovalListRequest {
+    @ApiModelProperty(value = "协议书编号", dataType = "String")
+    private String protocolNo;
+
+    @ApiModelProperty(value = "分包方名称", dataType = "String")
+    private String outsourcerName;
+
+    @ApiModelProperty(value = "申请人", dataType = "String")
+    private String applicantName;
+
+    @ApiModelProperty(value = "申请时间开始", dataType = "String")
+    private String applicantTimeStart;
+
+    @ApiModelProperty(value = "申请时间结束", dataType = "String")
+    private String applicantTimeEnd;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProtocolSaveResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProtocolSaveResponse.java
new file mode 100644
index 0000000..e324967
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProtocolSaveResponse.java
@@ -0,0 +1,20 @@
+package com.casic.missiles.dto.business.outsource;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/8/14 16:17
+ */
+@ApiModel
+@Data
+public class OutsourceProtocolSaveResponse {
+    @ApiModelProperty(value = "主键id", dataType = "Long")
+    private Long id;
+
+    @ApiModelProperty(value = "编号", dataType = "String")
+    private String protocolNo;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveApprovalListRequest.java
index f29f4e4..7047c28 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveApprovalListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveApprovalListRequest.java
@@ -5,8 +5,6 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import java.util.List;
-
 /**
  * @Description: 现场检测审批列表请求实体
  * @Author: wangpeng
@@ -30,7 +28,4 @@
     @ApiModelProperty(value = "申请时间结束", dataType = "String")
     private String applyTimeEnd;
 
-    @ApiModelProperty(value = "导出ids", dataType = "List")
-    private List<Long> ids;
-
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveDetailResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveDetailResponse.java
index 1f28752..394c934 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveDetailResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveDetailResponse.java
@@ -12,6 +12,18 @@
     @ApiModelProperty(value = "id，更新/删除使用参数", dataType = "Long")
     private Long id;
 
+    @ApiModelProperty(value = "实验室代码(字典code)", dataType = "String")
+    private String labCode;
+
+    @ApiModelProperty(value = "实验室代码(字典value)", dataType = "String")
+    private String labCodeName;
+
+    @ApiModelProperty(value = "组别代码(字典code)", dataType = "String")
+    private String groupCode;
+
+    @ApiModelProperty(value = "组别代码(字典value)", dataType = "String")
+    private String groupCodeName;
+
     @ApiModelProperty(value = "审批编号", dataType = "String")
     private String siteExecutiveNo;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/environment/LocationListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/environment/LocationListRequest.java
new file mode 100644
index 0000000..13d03c3
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/environment/LocationListRequest.java
@@ -0,0 +1,20 @@
+package com.casic.missiles.dto.resource.environment;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/6/8 13:56
+ */
+@ApiModel
+@Data
+public class LocationListRequest {
+    @ApiModelProperty(value = "地点编号", dataType = "String")
+    private String locationNo;
+
+    @ApiModelProperty(value = "地点名称", dataType = "String")
+    private String locationName;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/environment/LocationListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/environment/LocationListResponse.java
new file mode 100644
index 0000000..4c531af
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/environment/LocationListResponse.java
@@ -0,0 +1,78 @@
+package com.casic.missiles.dto.resource.environment;
+
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
+import com.baomidou.mybatisplus.annotation.TableField;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description: 地点列表响应实体
+ * @Author: wangpeng
+ * @Date: 2023/6/8 13:53
+ */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
+@ApiModel
+@Data
+public class LocationListResponse {
+    @ApiModelProperty(value = "主键id", dataType = "Long")
+    private Long id;
+
+    /**
+     * 地点编号
+     */
+    @ExcelProperty("地点编号")
+    @ApiModelProperty(value = "地点编号", dataType = "String")
+    private String locationNo;
+
+    /**
+     * 地点名称
+     */
+    @ExcelProperty("地点名称")
+    @ApiModelProperty(value = "地点名称", dataType = "String")
+    private String locationName;
+
+    /**
+     * 地点位置
+     */
+    @ExcelProperty("地点位置")
+    @ApiModelProperty(value = "地点位置", dataType = "String")
+    private String locationPosition;
+
+    /**
+     * 创建人id
+     */
+    @ApiModelProperty(value = "创建人id", dataType = "Long")
+    private Long createUserId;
+
+    /**
+     * 创建人
+     */
+    @ExcelProperty("创建人")
+    @ApiModelProperty(value = "创建人", dataType = "String")
+    @TableField("create_user")
+    private String createUser;
+
+    /**
+     * 创建时间
+     */
+    @ExcelProperty("创建时间")
+    @ApiModelProperty(value = "创建时间", dataType = "String")
+    private String createTime;
+
+    /**
+     * 更新时间
+     */
+    @ApiModelProperty(value = "更新时间", dataType = "String")
+    private String updateTime;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertRequest.java
index 9a7f6c6..c827915 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertRequest.java
@@ -4,6 +4,8 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * @Description:
  * @Author: wangpeng
@@ -16,4 +18,7 @@
     private String name;
     @ApiModelProperty(value = "部门名", dataType = "String")
     private String deptName;
+
+    @ApiModelProperty(value = "导出ids", dataType = "List")
+    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertResponse.java
index f78b159..8f2f79e 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertResponse.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.dto.resource.staff;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.casic.missiles.annotation.DictCodeField;
 import com.casic.missiles.constants.MeterDictCode;
 import io.swagger.annotations.ApiModel;
@@ -13,12 +20,18 @@
  * @Author: wangpeng
  * @Date: 2023/7/27 15:13
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @ApiModel
 @Data
 public class StaffCertResponse {
     /**
      * 人员编号
      */
+    @ExcelProperty(value = "人员编号",order = 0)
     @NotEmpty(message = "人员编号不能为空")
     @ApiModelProperty(value = "人员编号", dataType = "String")
     private String staffNo;
@@ -26,6 +39,7 @@
     /**
      * 姓名
      */
+    @ExcelProperty(value = "姓名",order = 1)
     @ApiModelProperty(value = "姓名", dataType = "String")
     private String staffName;
 
@@ -54,6 +68,7 @@
     /**
      * 部门名字
      */
+    @ExcelProperty(value = "工作部门",order = 2)
     @ApiModelProperty(value = "部门名字", dataType = "String")
     private String deptName;
 
@@ -66,6 +81,7 @@
     /**
      * 计量专业
      */
+    @ExcelProperty(value = "计量专业",order = 3)
     @ApiModelProperty(value = "计量专业", dataType = "String")
     private String major;
 
@@ -110,6 +126,7 @@
     /**
      * 证书号
      */
+    @ExcelProperty(value = "证号",order = 4)
     @ApiModelProperty(value = "证书号", dataType = "String")
     private String certNo;
 
@@ -122,12 +139,14 @@
     /**
      * 有效日期
      */
+    @ExcelProperty(value = "证书有效期",order = 6)
     @ApiModelProperty(value = "有效日期", dataType = "String")
     private String effectiveDate;
 
     /**
      * 发放日期
      */
+    @ExcelProperty(value = "发证日期",order = 5)
     @ApiModelProperty(value = "发放日期", dataType = "String")
     private String grantDate;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffListRequest.java
index 7c4afb3..0a1194a 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffListRequest.java
@@ -4,6 +4,8 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * @Description:
  * @Author: wangpeng
@@ -18,4 +20,7 @@
     private String deptName;
     @ApiModelProperty(value = "部门id", dataType = "Long")
     private Long deptId;
+
+    @ApiModelProperty(value = "导出ids", dataType = "List")
+    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/TrainListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/TrainListRequest.java
index f68597b..6321f8b 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/TrainListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/TrainListRequest.java
@@ -14,6 +14,8 @@
 public class TrainListRequest {
     @ApiModelProperty(value = "训练登记表编号", dataType = "String")
     private String trainNo;
+    @ApiModelProperty(value = "值班领导", dataType = "String")
+    private String dutyLeader;
     @ApiModelProperty(value = "创建开始时间", dataType = "String")
     private String createTimeStart;
     @ApiModelProperty(value = "创建结束时间", dataType = "String")
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/SignAddRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/SignAddRequest.java
index 117be34..d71055c 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/SignAddRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/SignAddRequest.java
@@ -43,13 +43,6 @@
     private Long signUserId;
 
     /**
-     * 签章或签名-字典code
-     */
-    @NotBlank(message = "类型不能为空")
-    @ApiModelProperty(value = "签名/签章-字典code", dataType = "String", required = true)
-    private String signType;
-
-    /**
      * minio存储文件名
      */
     @ApiModelProperty(value = "上传文件返回名称", dataType = "String")
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateAddRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateAddRequest.java
index aff1265..6316648 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateAddRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateAddRequest.java
@@ -17,30 +17,28 @@
 @Data
 public class TemplateAddRequest extends BaseSystemRequest {
     /**
-     * 原始记录模板/证书报告模板名称
+     * 模板名称
      */
     @ApiModelProperty(value = "名称", dataType = "String", required = true)
     @NotBlank(message = "名称不能为空")
     private String templateName;
 
     /**
-     * 原始记录模板/证书报告模板描述
+     * 模板描述
      */
     @ApiModelProperty(value = "描述", dataType = "String")
     private String templateDesc;
 
     /**
-     * 原始记录模板/证书报告模板创建人
+     * 创建人
      */
     @ApiModelProperty(value = "创建人", dataType = "String", required = true)
     @NotBlank(message = "创建人不能为空")
     private String templateCreator;
 
-    /**
-     * 原始记录模板/证书报告模板-字典code
-     */
-    @NotBlank(message = "类型不能为空")
-    @ApiModelProperty(value = "原始记录模板/证书报告模板-字典code", dataType = "String", required = true)
+
+    @NotBlank(message = "模板类型不能为空")
+    @ApiModelProperty(value = "模板类型(字典code)", dataType = "String", required = true)
     private String templateType;
 
     /**
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateListRequest.java
index eec5a1e..6d17bbe 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateListRequest.java
@@ -1,11 +1,12 @@
 package com.casic.missiles.dto.system;
 
+import com.casic.missiles.annotation.DictCodeField;
+import com.casic.missiles.constants.MeterDictCode;
 import com.casic.missiles.dto.BaseSystemRequest;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import javax.validation.constraints.NotBlank;
 import java.util.List;
 
 /**
@@ -19,8 +20,8 @@
     /**
      * 类型
      */
-//    @ApiModelProperty(value = "类型-字典code", dataType = "String", required = true)
-    @NotBlank(message = "类型不能为空")
+    @DictCodeField(message = "模板类型不合法", cacheName = MeterDictCode.TEMPLATE_TYPE)
+    @ApiModelProperty(value = "模板类型(字典code)", dataType = "String")
     private String templateType;
 
     /**
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificateChangeApply.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificateChangeApply.java
index 9216308..36923fd 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificateChangeApply.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificateChangeApply.java
@@ -1,11 +1,19 @@
 package com.casic.missiles.model.business;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 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 com.casic.missiles.dto.BaseRequest;
+import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -20,6 +28,12 @@
  * @author wangpeng
  * @since 2023-08-15
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
+@ApiModel
 @Data
 @TableName("biz_business_certificate_change_apply")
 public class BizBusinessCertificateChangeApply extends BaseRequest implements Serializable {
@@ -33,6 +47,7 @@
     /**
      * 申请单编号
      */
+    @ExcelProperty(value = "申请单编号", order = 1)
     @ApiModelProperty(value = "申请单编号", dataType = "String")
     @TableField("change_apply_no")
     private String changeApplyNo;
@@ -40,6 +55,7 @@
     /**
      * 申请单名字
      */
+    @ExcelProperty(value = "申请单名称", order = 2)
     @ApiModelProperty(value = "申请单名字", dataType = "String")
     @TableField("change_apply_name")
     private String changeApplyName;
@@ -54,6 +70,7 @@
     /**
      * 更换证书编号
      */
+    @ExcelProperty(value = "更换证书编号", order = 3)
     @ApiModelProperty(value = "更换证书编号", dataType = "String")
     @TableField("change_report_no")
     private String changeReportNo;
@@ -61,7 +78,8 @@
     /**
      * 更换证书名字
      */
-    @ApiModelProperty(value = "更换证书名字", dataType = "String")
+    @ExcelProperty(value = "更换证书/报告名称", order = 4)
+    @ApiModelProperty(value = "更换证书/报告名称", dataType = "String")
     @TableField("change_report_name")
     private String changeReportName;
 
@@ -73,6 +91,7 @@
     @TableField("change_type")
     private String changeType;
 
+    @ExcelProperty(value = "变更类型", order = 5)
     @ApiModelProperty(value = "变更类型(字典value)", dataType = "String")
     @TableField(exist = false)
     private String changeTypeName;
@@ -142,13 +161,15 @@
     /**
      * 创建用户名字
      */
-    @ApiModelProperty(value = "创建用户名字", dataType = "String")
+    @ExcelProperty(value = "创建人", order = 6)
+    @ApiModelProperty(value = "创建人名字", dataType = "String")
     @TableField("create_user_name")
     private String createUserName;
 
     /**
      * 创建时间
      */
+    @ExcelProperty(value = "创建时间", order = 7)
     @ApiModelProperty(value = "创建时间", dataType = "String")
     @TableField("create_time")
     private String createTime;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificateReport.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificateReport.java
index f01db9e..db06018 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificateReport.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificateReport.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.model.business;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -22,6 +29,11 @@
  * @author wangpeng
  * @since 2023-08-14
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @ApiModel
 @Data
 @TableName("biz_business_certificate_report")
@@ -36,6 +48,7 @@
     /**
      * 证书报告编号
      */
+    @ExcelProperty(value = "证书报告编号", order = 1)
     @ApiModelProperty(value = "证书报告编号", dataType = "String")
     @TableField("certificate_report_no")
     private String certificateReportNo;
@@ -43,6 +56,7 @@
     /**
      * 证书报告名称
      */
+    @ExcelProperty(value = "证书报告名称", order = 2)
     @ApiModelProperty(value = "证书报告名称", dataType = "String")
     @TableField("certificate_report_name")
     private String certificateReportName;
@@ -62,6 +76,7 @@
     @TableField("measure_category")
     private String measureCategory;
 
+    @ExcelProperty(value = "检校类别", order = 6)
     @ApiModelProperty(value = "检校类别(字典value)", dataType = "String")
     @TableField(exist = false)
     private String measureCategoryName;
@@ -69,6 +84,7 @@
     /**
      * 检校时间
      */
+    @ExcelProperty(value = "检校时间", order = 8)
     @ApiModelProperty(value = "检校时间", dataType = "String")
     @TableField("calibration_time")
     private String calibrationTime;
@@ -267,18 +283,22 @@
     @TableField(exist = false)
     private Integer decisionItem;
 
-    @ApiModelProperty(value = "设备样品编号（列表返回参数）", dataType = "String")
+    @ExcelProperty(value = "被检设备统一编号", order = 3)
+    @ApiModelProperty(value = "被检设备统一编号（列表返回参数）", dataType = "String")
     @TableField(exist = false)
     private String sampleNo;
 
-    @ApiModelProperty(value = "设备样品名称（列表返回参数）", dataType = "String")
+    @ExcelProperty(value = "被检设备名称", order = 4)
+    @ApiModelProperty(value = "被检设备名称（列表返回参数）", dataType = "String")
     @TableField(exist = false)
     private String sampleName;
 
-    @ApiModelProperty(value = "设备样品规格型号（列表返回参数）", dataType = "String")
+    @ExcelProperty(value = "规格型号", order = 5)
+    @ApiModelProperty(value = "规格型号（列表返回参数）", dataType = "String")
     @TableField(exist = false)
     private String sampleModel;
 
+    @ExcelProperty(value = "检定员", order = 7)
     @ApiModelProperty(value = "检定员名字（列表返回参数）", dataType = "String")
     @TableField(exist = false)
     private String staffName;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessIdentifyInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessIdentifyInfo.java
index 46bfba5..f1a9bec 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessIdentifyInfo.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessIdentifyInfo.java
@@ -1,10 +1,15 @@
 package com.casic.missiles.model.business;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 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;
 
@@ -20,6 +25,11 @@
  * @author wangpeng
  * @since 2023-08-15
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @Data
 @TableName("biz_business_identify_info")
 public class BizBusinessIdentifyInfo implements Serializable {
@@ -33,6 +43,7 @@
     /**
      * 记录编号
      */
+    @ExcelProperty(value = "记录编号", order = 1)
     @ApiModelProperty(value = "记录编号", dataType = "String")
     @TableField("record_no")
     private String recordNo;
@@ -41,20 +52,15 @@
      * 标志类型(字典code)
      */
     @NotEmpty(message = "标志类型不能为空")
-    @ApiModelProperty(value = "标志类型(字典code)", dataType = "String")
-    @DictCodeField(message = "标志类型不合法", cacheName = MeterDictCode.IDENTIFY_PRINT_TYPE)
+    @ApiModelProperty(value = "标志类型(直接存计量标识/使用状态/校准状态的字典value)", dataType = "String")
     @TableField("identify_type")
     private String identifyType;
 
-    @ApiModelProperty(value = "标志类型(字典value)", dataType = "String")
-    @TableField(exist = false)
-    private String identifyTypeName;
-
     /**
      * 设备id(可以是受检设备/设备台账)
      */
     @NotNull(message = "设备id不能为空")
-    @ApiModelProperty(value = "设备id(可以是受检设备/设备台账)", dataType = "String")
+    @ApiModelProperty(value = "设备id(可以是受检设备/设备台账)", dataType = "Long")
     @TableField("device_id")
     private Long deviceId;
 
@@ -66,29 +72,32 @@
     @TableField("device_type")
     private String deviceType;
 
+    @ExcelProperty(value = "统一编号", order = 3)
     @NotEmpty(message = "设备编号不能为空")
-    @ApiModelProperty(value = "设备编号", dataType = "String")
+    @ApiModelProperty(value = "统一编号", dataType = "String")
     @TableField("device_no")
     private String deviceNo;
 
     /**
      * 设备名字
      */
-    @NotEmpty(message = "设备名字不能为空")
-    @ApiModelProperty(value = "设备名字", dataType = "String")
+    @ExcelProperty(value = "设备名称", order = 4)
+    @NotEmpty(message = "设备名称不能为空")
+    @ApiModelProperty(value = "设备名称", dataType = "String")
     @TableField("device_name")
     private String deviceName;
 
     /**
      * 检定员id
      */
-    @ApiModelProperty(value = "检定员id", dataType = "String")
+    @ApiModelProperty(value = "检定员id", dataType = "Long")
     @TableField("measure_person_id")
     private Long measurePersonId;
 
     /**
      * 检定员名字
      */
+    @ExcelProperty(value = "检定员", order = 5)
     @ApiModelProperty(value = "检定员名字", dataType = "String")
     @TableField("measure_person")
     private String measurePerson;
@@ -103,7 +112,8 @@
     /**
      * 更新时间
      */
-    @ApiModelProperty(value = "更新时间", dataType = "String")
+    @ExcelProperty(value = "打印时间", order = 6)
+    @ApiModelProperty(value = "打印时间", dataType = "String")
     @TableField("update_time")
     private String updateTime;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceAssess.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceAssess.java
index 659d9ca..6720b90 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceAssess.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceAssess.java
@@ -1,11 +1,26 @@
 package com.casic.missiles.model.business;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 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 com.casic.missiles.dto.BaseRequest;
+import com.casic.missiles.dto.business.outsource.OrderSampleDTO;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import javax.validation.constraints.NotEmpty;
 import java.io.Serializable;
+import java.util.List;
 
 /**
  * <p>
@@ -15,146 +30,231 @@
  * @author wangpeng
  * @since 2023-08-16
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
+@ApiModel
 @Data
 @TableName("biz_business_outsource_assess")
-public class BizBusinessOutsourceAssess implements Serializable {
+public class BizBusinessOutsourceAssess extends BaseRequest implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
+    @ApiModelProperty(value = "id，更新/删除使用参数", dataType = "Long")
     @TableId("id")
     private Long id;
 
     /**
      * 评审表编号
      */
+    @ExcelProperty(value = "评审表编号", order = 1)
+    @ApiModelProperty(value = "评审表编号(后台生成)", dataType = "String")
     @TableField("project_no")
     private String projectNo;
 
     /**
      * 评审表名称
      */
+    @ExcelProperty(value = "评审表名称", order = 2)
+    @ApiModelProperty(value = "评审表名称", dataType = "String")
     @TableField("project_name")
     private String projectName;
 
+    @NotEmpty(message = "实验室代码不能为空")
+    @DictCodeField(message = "实验室代码描述不合法", cacheName = MeterDictCode.LAB_CODE)
+    @ApiModelProperty(value = "实验室代码(字典code)", dataType = "String")
+    @TableField("lab_code")
+    private String labCode;
+
+    @ApiModelProperty(value = "实验室代码(字典value)", dataType = "String")
+    @TableField(exist = false)
+    private String labCodeName;
+
+    /**
+     * 组别代码
+     */
+    @NotEmpty(message = "组别代码不能为空")
+    @DictCodeField(message = "组别代码描述不合法", cacheName = MeterDictCode.GROUP_CODE)
+    @ApiModelProperty(value = "组别代码(字典code)", dataType = "String")
+    @TableField("group_code")
+    private String groupCode;
+
+    @ApiModelProperty(value = "组别代码(字典value)", dataType = "String")
+    @TableField(exist = false)
+    private String groupCodeName;
+
     /**
      * 申请人id
      */
+    @ApiModelProperty(value = "申请人id", dataType = "String")
     @TableField("applicant_id")
     private Long applicantId;
 
     /**
      * 申请人名字
      */
+    @ExcelProperty(value = "申请人", order = 5)
+    @ApiModelProperty(value = "申请人", dataType = "String")
     @TableField("applicant_name")
     private String applicantName;
 
     /**
      * 申请时间
      */
+    @ExcelProperty(value = "申请时间", order = 6)
+    @ApiModelProperty(value = "申请时间", dataType = "String")
     @TableField("applicant_time")
     private String applicantTime;
 
     /**
      * 附件(minio存储文件名)
      */
+    @ApiModelProperty(value = "附件(minio存储文件名)", dataType = "String")
     @TableField("minio_file_name")
     private String minioFileName;
 
     /**
      * 备注
      */
+    @ApiModelProperty(value = "备注", dataType = "String")
     @TableField("remark")
     private String remark;
 
     /**
      * 创建人id
      */
+    @ApiModelProperty(value = "创建人id", dataType = "String")
     @TableField("create_user_id")
     private Long createUserId;
 
     /**
      * 创建人名字
      */
+    @ApiModelProperty(value = "创建人名字", dataType = "String")
     @TableField("create_user_name")
     private String createUserName;
 
     /**
      * 分包方id
      */
+    @ApiModelProperty(value = "评审表编号", dataType = "String")
     @TableField("outsourcer_id")
     private Long outsourcerId;
 
     /**
      * 预计开始时间
      */
+    @ApiModelProperty(value = "预计开始时间", dataType = "String")
     @TableField("pre_start_time")
     private String preStartTime;
 
     /**
      * 预计结束时间
      */
+    @ApiModelProperty(value = "预计结束时间", dataType = "String")
     @TableField("pre_end_time")
     private String preEndTime;
 
     /**
      * 分包原因-字典
      */
+    @ApiModelProperty(value = "分包原因(字典code)", dataType = "String")
+    @DictCodeField(message = "分包原因描述不合法", cacheName = MeterDictCode.OUTSOURCE_REASON)
     @TableField("outsource_reason")
     private String outsourceReason;
 
+    @ApiModelProperty(value = "分包原因(字典value)", dataType = "String")
+    @TableField(exist = false)
+    private String outsourceReasonName;
+
     /**
      * 预计费用
      */
+    @ApiModelProperty(value = "预计费用", dataType = "String")
     @TableField("pre_cost")
     private String preCost;
 
     /**
      * 审批状态
      */
+    @ApiModelProperty(value = "审批状态", dataType = "String")
+    @DictCodeField(message = "审批状态描述不合法", cacheName = MeterDictCode.APPROVAL_STATUS)
     @TableField("approval_status")
     private String approvalStatus;
 
     /**
      * 流程实例id
      */
+    @ApiModelProperty(value = "流程实例id", dataType = "String")
     @TableField("process_id")
     private String processId;
 
     /**
      * 实验室认可情况
      */
+    @ApiModelProperty(value = "实验室认可情况", dataType = "String")
     @TableField("approve_situation")
     private String approveSituation;
 
     /**
      * 溯源性
      */
+    @ApiModelProperty(value = "溯源性", dataType = "String")
     @TableField("traceability")
     private String traceability;
 
     /**
      * 测试方法
      */
+    @ApiModelProperty(value = "测试方法", dataType = "String")
     @TableField("test_method")
     private String testMethod;
 
     /**
      * 技术能力
      */
+    @ApiModelProperty(value = "技术能力", dataType = "String")
     @TableField("technique_ability")
     private String techniqueAbility;
 
     /**
      * 创建时间
      */
+    @ApiModelProperty(hidden = true)
     @TableField("create_time")
     private String createTime;
 
     /**
      * 更新时间
      */
+    @ApiModelProperty(hidden = true)
     @TableField("update_time")
     private String updateTime;
 
+    @ApiModelProperty(value = "审批状态类型-字典value", dataType = "String")
+    @TableField(exist = false)
+    private String approvalStatusName;
 
+    @ApiModelProperty(value = "任务id（同意、驳回等操作使用）", dataType = "String")
+    @TableField(exist = false)
+    private String taskId;
+
+    @ApiModelProperty(value = "可选决策项（1同意驳回拒绝 2同意驳回 3同意拒绝，用于待审批列表同意/驳回/拒绝按钮展示）", dataType = "Integer")
+    @TableField(exist = false)
+    private Integer decisionItem;
+
+    @NotEmpty(message = "受检设备信息不能为空")
+    @ApiModelProperty(value = "受检设备id列表（新建使用参数）", dataType = "List")
+    @TableField(exist = false)
+    private List<OrderSampleDTO> orderSampleList;
+
+    @ExcelProperty(value = "分包机构名称", order = 3)
+    @ApiModelProperty(value = "分包机构名称（列表返回参数）", dataType = "String")
+    private String outsourcerName;
+
+    @ExcelProperty(value = "机构负责人", order = 4)
+    @ApiModelProperty(value = "机构负责人（列表返回参数）", dataType = "String")
+    private String director;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceProtocol.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceProtocol.java
new file mode 100644
index 0000000..38df697
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceProtocol.java
@@ -0,0 +1,225 @@
+package com.casic.missiles.model.business;
+
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
+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 com.casic.missiles.dto.BaseRequest;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotEmpty;
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 计量检定业务-分包管理-测试、校准或检定工作分包协议书
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-08-24
+ */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
+@Data
+@TableName("biz_business_outsource_protocol")
+public class BizBusinessOutsourceProtocol extends BaseRequest implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "id，更新/删除使用参数", dataType = "Long")
+    @TableId("id")
+    private Long id;
+
+    /**
+     * 协议书编号
+     */
+    @ExcelProperty(value = "协议书编号", order = 1)
+    @ApiModelProperty(value = "协议书编号(后台生成)", dataType = "String")
+    @TableField("protocol_no")
+    private String protocolNo;
+
+    /**
+     * 协议书名称
+     */
+    @ExcelProperty(value = "协议书名称", order = 2)
+    @ApiModelProperty(value = "协议书名称", dataType = "String")
+    @TableField("project_name")
+    private String projectName;
+
+    @NotEmpty(message = "实验室代码不能为空")
+    @DictCodeField(message = "实验室代码描述不合法", cacheName = MeterDictCode.LAB_CODE)
+    @ApiModelProperty(value = "实验室代码(字典code)", dataType = "String")
+    @TableField("lab_code")
+    private String labCode;
+
+    @ApiModelProperty(value = "实验室代码(字典value)", dataType = "String")
+    @TableField(exist = false)
+    private String labCodeName;
+
+    @NotEmpty(message = "组别代码不能为空")
+    @DictCodeField(message = "组别代码描述不合法", cacheName = MeterDictCode.GROUP_CODE)
+    @ApiModelProperty(value = "组别代码(字典code)", dataType = "String")
+    @TableField("group_code")
+    private String groupCode;
+
+    @ApiModelProperty(value = "组别代码(字典value)", dataType = "String")
+    @TableField(exist = false)
+    private String groupCodeName;
+
+    /**
+     * 分包方id
+     */
+    @ApiModelProperty(value = "分包方id", dataType = "Long")
+    @TableField("outsourcer_id")
+    private Long outsourcerId;
+
+    /**
+     * 其他
+     */
+    @ApiModelProperty(value = "其他", dataType = "String")
+    @TableField("remark")
+    private String remark;
+
+    /**
+     * 分包方编号
+     */
+    @ApiModelProperty(value = "分包方编号(新建不用传)", dataType = "String")
+    @TableField("outsource_no")
+    private String outsourceNo;
+
+    /**
+     * 分包方名称
+     */
+    @ExcelProperty(value = "分包方名称", order = 3)
+    @ApiModelProperty(value = "分包方名称(新建不用传)", dataType = "String")
+    @TableField("outsource_name")
+    private String outsourceName;
+
+    /**
+     * 联系人
+     */
+    @ExcelProperty(value = "联系人", order = 4)
+    @ApiModelProperty(value = "联系人", dataType = "String")
+    @TableField("contacts")
+    private String contacts;
+
+    /**
+     * 电话
+     */
+    @ApiModelProperty(value = "电话", dataType = "String")
+    @TableField("mobile")
+    private String mobile;
+
+    /**
+     * 地址
+     */
+    @ApiModelProperty(value = "地址", dataType = "String")
+    @TableField("address")
+    private String address;
+
+    /**
+     * 要求完成日期
+     */
+    @ApiModelProperty(value = "要求完成日期", dataType = "String")
+    @TableField("require_date")
+    private String requireDate;
+
+    /**
+     * 分包费用(元)
+     */
+    @ApiModelProperty(value = "分包费用(元)", dataType = "String")
+    @TableField("outsource_cost")
+    private Double outsourceCost;
+
+    /**
+     * 分包方负责人
+     */
+    @ApiModelProperty(value = "分包方负责人", dataType = "String")
+    @TableField("director")
+    private String director;
+
+    /**
+     * 分包项目
+     */
+    @ApiModelProperty(value = "分包项目", dataType = "String")
+    @TableField("item")
+    private String item;
+
+    /**
+     * 分包要求
+     */
+    @ApiModelProperty(value = "分包要求", dataType = "String")
+    @TableField("requires")
+    private String requires;
+
+    /**
+     * 创建人id
+     */
+    @ApiModelProperty(hidden = true)
+    @TableField("create_user_id")
+    private Long createUserId;
+
+    /**
+     * 创建人名字
+     */
+    @ExcelProperty(value = "申请人", order = 5)
+    @ApiModelProperty(value = "申请人", dataType = "String")
+    @TableField("create_user_name")
+    private String createUserName;
+
+    /**
+     * 审批状态
+     */
+    @ApiModelProperty(value = "审批状态", dataType = "String")
+    @DictCodeField(message = "审批状态描述不合法", cacheName = MeterDictCode.APPROVAL_STATUS)
+    @TableField("approval_status")
+    private String approvalStatus;
+
+    /**
+     * 流程实例id
+     */
+    @ApiModelProperty(value = "流程实例id", dataType = "String")
+    @TableField("process_id")
+    private String processId;
+
+    /**
+     * 创建时间
+     */
+    @ExcelProperty(value = "申请时间", order = 6)
+    @ApiModelProperty(value = "申请时间", dataType = "String")
+    @TableField("create_time")
+    private String createTime;
+
+    /**
+     * 更新时间
+     */
+    @ApiModelProperty(hidden = true)
+    @TableField("update_time")
+    private String updateTime;
+
+    @ApiModelProperty(value = "审批状态类型-字典value", dataType = "String")
+    @TableField(exist = false)
+    private String approvalStatusName;
+
+    @ApiModelProperty(value = "任务id（同意、驳回等操作使用）", dataType = "String")
+    @TableField(exist = false)
+    private String taskId;
+
+    @ApiModelProperty(value = "可选决策项（1同意驳回拒绝 2同意驳回 3同意拒绝，用于待审批列表同意/驳回/拒绝按钮展示）", dataType = "Integer")
+    @TableField(exist = false)
+    private Integer decisionItem;
+
+
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourcerInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourcerInfo.java
index ec4e997..f9aa69e 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourcerInfo.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourcerInfo.java
@@ -17,6 +17,7 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import javax.validation.constraints.NotEmpty;
 import java.io.Serializable;
 
 /**
@@ -59,6 +60,29 @@
     @TableField("outsourcer_name")
     private String outsourcerName;
 
+    @NotEmpty(message = "实验室代码不能为空")
+    @DictCodeField(message = "实验室代码描述不合法", cacheName = MeterDictCode.LAB_CODE)
+    @ApiModelProperty(value = "实验室代码(字典code)", dataType = "String")
+    @TableField("lab_code")
+    private String labCode;
+
+    @ApiModelProperty(value = "实验室代码(字典value)", dataType = "String")
+    @TableField(exist = false)
+    private String labCodeName;
+
+    /**
+     * 组别代码
+     */
+    @NotEmpty(message = "组别代码不能为空")
+    @DictCodeField(message = "组别代码描述不合法", cacheName = MeterDictCode.GROUP_CODE)
+    @ApiModelProperty(value = "组别代码(字典code)", dataType = "String")
+    @TableField("group_code")
+    private String groupCode;
+
+    @ApiModelProperty(value = "组别代码(字典value)", dataType = "String")
+    @TableField(exist = false)
+    private String groupCodeName;
+
     /**
      * 单位简称
      */
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardInfo.java
index c48eed7..dffdfdd 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardInfo.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardInfo.java
@@ -5,6 +5,7 @@
 import com.baomidou.mybatisplus.annotation.TableName;
 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;
 
@@ -18,6 +19,7 @@
  * @author wangpeng
  * @since 2023-08-04
  */
+@ApiModel
 @Data
 @TableName("biz_equipment_standard_info")
 public class BizEquipmentStandardInfo implements Serializable {
@@ -119,7 +121,7 @@
      * 管理状态(字典code)
      */
     @ApiModelProperty(value = "管理状态(字典code)", dataType = "String")
-    @DictCodeField(message = "管理状态不合法", cacheName = MeterDictCode.MANAGER_STATE)
+    @DictCodeField(message = "管理状态不合法", cacheName = MeterDictCode.STANDARD_MANAGER_STATE)
     @TableField("manage_status")
     private String manageStatus;
 
@@ -151,7 +153,7 @@
     /**
      * 温度(℃)
      */
-    @ApiModelProperty(value = "使用状态(字典code)", dataType = "String")
+    @ApiModelProperty(value = "温度(℃)", dataType = "String")
     @TableField("temperature")
     private Double temperature;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardInfoApproval.java b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardInfoApproval.java
index dbd86ab..9f58d83 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardInfoApproval.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardInfoApproval.java
@@ -150,7 +150,7 @@
      * 管理状态(字典code)
      */
     @ApiModelProperty(value = "管理状态(字典code)", dataType = "String")
-    @DictCodeField(message = "管理状态不合法", cacheName = MeterDictCode.MANAGER_STATE)
+    @DictCodeField(message = "管理状态不合法", cacheName = MeterDictCode.STANDARD_MANAGER_STATE)
     @TableField("manage_status")
     private String manageStatus;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardTechnologyRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardTechnologyRelation.java
index 0e612bd..751f26b 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardTechnologyRelation.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardTechnologyRelation.java
@@ -3,6 +3,7 @@
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -16,6 +17,7 @@
  * @author wangpeng
  * @since 2023-08-04
  */
+@ApiModel
 @Data
 @TableName("biz_equipment_standard_technology_relation")
 public class BizEquipmentStandardTechnologyRelation implements Serializable {
@@ -33,6 +35,10 @@
     @TableField("technology_file_id")
     private Long technologyFileId;
 
+    @ApiModelProperty(value = "依据的技术文件编号", dataType = "String")
+    @TableField("technology_file_no")
+    private String technologyFileNo;
+
     /**
      * 依据的技术文件名称(技术文件中现行测试校准检定方法表文件名字段)
      */

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java
index bb0c50f..13a699b 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java
@@ -12,6 +12,7 @@
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.IGeneralApprovalService;
+import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
@@ -19,6 +20,7 @@
 import org.springframework.web.bind.annotation.RequestBody;
 
 import javax.validation.Valid;
+import java.util.List;
 import java.util.Objects;
 
 /**
@@ -117,4 +119,17 @@
         }
         return baseApprovalService.failUpdate(request);
     }
+
+    public List<O> exportList(@RequestBody @Valid R request) throws Exception {
+        List<O> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = baseApprovalService.listExportByIds(request.getIds());
+        } else {
+            list = baseApprovalService.listExport(request);
+        }
+        for (O record : list) {
+            DictCodeUtils.convertDictCodeToName(record);
+        }
+        return list;
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java
index 8a90961..d775831 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java
@@ -5,6 +5,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.business.certificate.CertificateChangeApplyApprovalListRequest;
 import com.casic.missiles.dto.business.certificate.CertificateChangeApplySaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessCertificateChangeApply;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
@@ -20,6 +21,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -48,4 +50,12 @@
         }
         return changeApplyService.saveChangeApply(request);
     }
+
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody CertificateChangeApplyApprovalListRequest request) throws Exception {
+        List<BizBusinessCertificateChangeApply> list = super.exportList(request);
+        super.exportExcel(BizBusinessCertificateChangeApply.class, list, ExportEnum.CERTIFICATE_CHANGE_APPLY.getSheetName());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java
index 5fc4b07..af8230e 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java
@@ -9,6 +9,7 @@
 import com.casic.missiles.dto.business.certificate.CertificatePrintApprovalListRequest;
 import com.casic.missiles.dto.business.certificate.CertificatePrintListResponse;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.enums.business.CertificatePrintStatusEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessCertificatePrintLog;
@@ -18,10 +19,16 @@
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.io.IOException;
+import java.util.List;
 import java.util.Objects;
 
 /**
@@ -98,4 +105,16 @@
         });
         return certificatePrintService.certificatePrintLog(idDTO.getId());
     }
+
+    @ApiOperation("证书打印审批导出")
+    @PostMapping("/listExport")
+    public void exportList(@RequestBody CertificatePrintApprovalListRequest request) throws IOException {
+        List<CertificatePrintListResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = certificatePrintService.listByIds(request.getIds());
+        } else {
+            list = certificatePrintService.list(request);
+        }
+        super.exportExcel(CertificatePrintListResponse.class, list, ExportEnum.CERTIFICATE_PRINT.getSheetName());
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java
index 63b06dc..6b2efd5 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java
@@ -6,6 +6,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.business.certificate.CertificateReportApprovalListRequest;
 import com.casic.missiles.dto.business.certificate.CertificateReportSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessCertificateReport;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
@@ -21,6 +22,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -50,7 +52,7 @@
         return certificateReportService.saveCertificateReport(request);
     }
 
-    @ApiOperation("证书审批详情（基本信息）")
+    @ApiOperation("详情（基本信息）")
     @PostMapping("/detail")
     public ReturnDTO<BizBusinessCertificateReport> detail(@RequestBody @Valid BaseDetailRequest request, BindingResult bindingResult) throws Exception {
         if(bindingResult.hasErrors()){
@@ -59,4 +61,11 @@
         return certificateReportService.detail(request);
     }
 
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody CertificateReportApprovalListRequest request) throws Exception {
+        List<BizBusinessCertificateReport> list = super.exportList(request);
+        super.exportExcel(BizBusinessCertificateReport.class, list, ExportEnum.CERTIFICATE_REPORT.getSheetName());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java
index 46b26bd..57c0809 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java
@@ -10,20 +10,21 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.business.identify.IdentifyListRequest;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessIdentifyInfo;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.business.IBizBusinessIdentifyInfoService;
+import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import javax.validation.Valid;
+import java.util.List;
 import java.util.Objects;
 
 /**
@@ -57,16 +58,13 @@
         return identifyInfoService.addIdentify(identifyInfo);
     }
 
-    @ApiOperation("标识打印更新")
+    @ApiOperation("标识打印更新（更新打印时间）")
     @PostMapping("/update")
-    public ReturnDTO updateIdentify(@RequestBody @Valid BizBusinessIdentifyInfo identifyInfo, BindingResult bindingResult) {
-        Assert.isFalse(Objects.isNull(identifyInfo.getId()), () -> {
+    public ReturnDTO updateIdentify(@RequestBody @Valid IdDTO idDTO) {
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        Assert.isFalse(bindingResult.hasErrors(), () -> {
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        });
-        return identifyInfoService.updateIdentify(identifyInfo);
+        return identifyInfoService.updateIdentify(idDTO.getId());
     }
 
     @ApiOperation("标识打印删除")
@@ -77,4 +75,37 @@
         });
         return identifyInfoService.deleteIdentify(idDTO.getId());
     }
+
+    @ApiOperation("标识打印导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody @Valid IdentifyListRequest request, BindingResult bindingResult) throws Exception {
+        if (bindingResult.hasErrors()) {
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        List<BizBusinessIdentifyInfo> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = identifyInfoService.listByIds(request.getIds());
+        } else {
+            list = identifyInfoService.list(request);
+        }
+        for (BizBusinessIdentifyInfo record : list) {
+            DictCodeUtils.convertDictCodeToName(record);
+        }
+        super.exportExcel(BizBusinessIdentifyInfo.class, list, ExportEnum.IDENTIFY_EXPORT.getSheetName());
+    }
+
+
+    // TODO: 2023/8/23 查询设备信息，4个底部按钮查设备（按钮的作用就是前端用来调不同接口、用来区分中间即将展示的标识），前端弹窗选设备，在确定保存时前端根据底部按钮判断传入设备类型deviceType字典code
+    // TODO: 2023/8/23 接口：查受检设备（第1个按钮），查设备台账（后3个按钮同一接口），查询之后前端根据标志类型的不同加到中间页面时进行判断（按产品给的对应表）
+    // TODO: 2023/8/23 提供二维码接口，前端在加到中间页面时调用一下
+
+    @ApiOperation("设备二维码")
+    @PostMapping("/equipment/qrCode")
+    public ReturnDTO<String> equipmentQrCode(@RequestBody @Valid IdDTO idDTO) {
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return identifyInfoService.equipmentQrCode(idDTO.getId());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java
index 707be6e..7e0453d 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java
@@ -117,7 +117,7 @@
     }
 
     @ApiOperation("任务单导出")
-    @PostMapping("/export")
+    @PostMapping("/listExport")
     public void orderExport(@RequestBody @Valid OrderListRequest request, HttpServletResponse response) {
         businessOrderService.orderExport(request, response);
     }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java
index 529a6ce..51432be 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java
@@ -1,9 +1,28 @@
 package com.casic.missiles.controller.business;
 
+import com.casic.missiles.controller.GeneralApprovalController;
+import com.casic.missiles.dto.BaseApprovalSubmitRequest;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.business.outsource.OutsourceAssessApprovalListRequest;
+import com.casic.missiles.dto.business.outsource.OutsourceAssessSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
+import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.model.business.BizBusinessOutsourceAssess;
+import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
+import com.casic.missiles.service.IGeneralApprovalService;
+import com.casic.missiles.service.business.IBizBusinessOutsourceAssessService;
 import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.BindingResult;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.validation.Valid;
+import java.util.List;
+
 /**
  * <p>
  * 计量检定业务-分包管理-测试、校准或检定工作分包评审表 前端控制器
@@ -15,6 +34,27 @@
 @Api(tags = "分包管理-测试、校准或检定工作分包评审表")
 @RestController
 @RequestMapping("/business/outsource/assess")
-public class BizBusinessOutsourceAssessController {
+public class BizBusinessOutsourceAssessController extends GeneralApprovalController<BizBusinessOutsourceAssess, BizBusinessOutsourceAssess, OutsourceAssessApprovalListRequest, BaseApprovalSubmitRequest> {
+    @Autowired
+    private IBizBusinessOutsourceAssessService outsourceAssessService;
 
+    public BizBusinessOutsourceAssessController(IGeneralApprovalService<BizBusinessOutsourceAssess, BizBusinessOutsourceAssess, OutsourceAssessApprovalListRequest, BaseApprovalSubmitRequest> baseApprovalService) {
+        super(baseApprovalService);
+    }
+
+    @ApiOperation("草稿箱-保存")
+    @PostMapping("/save")
+    public ReturnDTO<OutsourceAssessSaveResponse> saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceAssess request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        return outsourceAssessService.saveOutsourceAssess(request);
+    }
+
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception {
+        List<BizBusinessOutsourceAssess> list = super.exportList(request);
+        super.exportExcel(BizBusinessOutsourceAssess.class, list, ExportEnum.OUTSOURCE_ASSESS.getSheetName());
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java
new file mode 100644
index 0000000..9adef18
--- /dev/null
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java
@@ -0,0 +1,60 @@
+package com.casic.missiles.controller.business;
+
+import com.casic.missiles.controller.GeneralApprovalController;
+import com.casic.missiles.dto.BaseApprovalSubmitRequest;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.business.outsource.OutsourceProtocolApprovalListRequest;
+import com.casic.missiles.dto.business.outsource.OutsourceProtocolSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
+import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.model.business.BizBusinessOutsourceProtocol;
+import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
+import com.casic.missiles.service.IGeneralApprovalService;
+import com.casic.missiles.service.business.IBizBusinessOutsourceProtocolService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.BindingResult;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.validation.Valid;
+import java.util.List;
+
+/**
+ * <p>
+ * 计量检定业务-分包管理-测试、校准或检定工作分包协议书 前端控制器
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-08-24
+ */
+@Api(tags = "分包管理-测试、校准或检定工作分包协议书")
+@RestController
+@RequestMapping("/business/outsource/protocol")
+public class BizBusinessOutsourceProtocolController extends GeneralApprovalController<BizBusinessOutsourceProtocol, BizBusinessOutsourceProtocol, OutsourceProtocolApprovalListRequest, BaseApprovalSubmitRequest> {
+    @Autowired
+    private IBizBusinessOutsourceProtocolService outsourceProtocolService;
+
+    public BizBusinessOutsourceProtocolController(IGeneralApprovalService<BizBusinessOutsourceProtocol, BizBusinessOutsourceProtocol, OutsourceProtocolApprovalListRequest, BaseApprovalSubmitRequest> baseApprovalService) {
+        super(baseApprovalService);
+    }
+
+    @ApiOperation("草稿箱-保存")
+    @PostMapping("/save")
+    public ReturnDTO<OutsourceProtocolSaveResponse> saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceProtocol request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        return outsourceProtocolService.saveOutsourceProtocol(request);
+    }
+
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody OutsourceProtocolApprovalListRequest request) throws Exception {
+        List<BizBusinessOutsourceProtocol> list = super.exportList(request);
+        super.exportExcel(BizBusinessOutsourceProtocol.class, list, ExportEnum.OUTSOURCE_PROTOCOL.getSheetName());
+    }
+}
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java
index 097f645..f0f0943 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java
@@ -17,7 +17,6 @@
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.IGeneralApprovalService;
 import com.casic.missiles.service.business.IBizBusinessOutsourcerInfoService;
-import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -71,19 +70,8 @@
 
     @ApiOperation("分包方导出")
     @PostMapping("/listExport")
-    public void export(@RequestBody @Valid OutsourcerInfoApprovalListRequest request, BindingResult bindingResult) throws Exception {
-        if (bindingResult.hasErrors()) {
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        }
-        List<BizBusinessOutsourcerInfo> list;
-        if (!CollectionUtils.isEmpty(request.getIds())) {
-            list = outsourcerInfoService.listByIds(request.getIds());
-        } else {
-            list = outsourcerInfoService.list(request);
-        }
-        for (BizBusinessOutsourcerInfo record : list) {
-            DictCodeUtils.convertDictCodeToName(record);
-        }
+    public void export(@RequestBody OutsourcerInfoApprovalListRequest request) throws Exception {
+        List<BizBusinessOutsourcerInfo> list = super.exportList(request);
         super.exportExcel(BizBusinessOutsourcerInfo.class, list, ExportEnum.OUTSOURCER_EXPORT.getSheetName());
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java
index c2cbf9f..0410918 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java
@@ -17,11 +17,9 @@
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.IGeneralApprovalService;
 import com.casic.missiles.service.business.IBizBusinessSiteExecutiveInfoService;
-import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -60,7 +58,7 @@
         return siteExecutiveInfoService.saveSiteExecutiveInfo(siteExecutiveInfo);
     }
 
-    @ApiOperation("现场检测详情")
+    @ApiOperation("详情")
     @PostMapping("/detail")
     public ReturnDTO<SiteExecutiveDetailResponse> siteExecutiveDetail(@RequestBody @Valid IdDTO idDTO) throws Exception {
         Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
@@ -69,21 +67,10 @@
         return ReturnUtil.success(siteExecutiveInfoService.detail(idDTO.getId()));
     }
 
-    @ApiOperation("现场检测导出")
+    @ApiOperation("导出")
     @PostMapping("/listExport")
-    public void export(@RequestBody @Valid SiteExecutiveApprovalListRequest request, BindingResult bindingResult) throws Exception {
-        if (bindingResult.hasErrors()) {
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        }
-        List<SiteExecutiveApprovalListResponse> list;
-        if (!CollectionUtils.isEmpty(request.getIds())) {
-            list = siteExecutiveInfoService.listInfoByIds(request.getIds());
-        } else {
-            list = siteExecutiveInfoService.listInfo(request);
-        }
-        for (SiteExecutiveApprovalListResponse record : list) {
-            DictCodeUtils.convertDictCodeToName(record);
-        }
+    public void export(@RequestBody SiteExecutiveApprovalListRequest request) throws Exception {
+        List<SiteExecutiveApprovalListResponse> list = super.exportList(request);
         super.exportExcel(SiteExecutiveApprovalListResponse.class, list, ExportEnum.SITE_EXECUTIVE_EXPORT.getSheetName());
     }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
index 7e793cd..a92e209 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
@@ -55,7 +55,7 @@
 
     @ApiOperation("设备收发列表导出")
     @PostMapping("/export")
-    public void exportList(@RequestBody @Valid SampleDispatchListRequest request) throws IOException {
+    public void exportList(@RequestBody SampleDispatchListRequest request) throws IOException {
         List<SampleDispatchListResponse> list;
         if (!CollectionUtils.isEmpty(request.getIds())) {
             list = dispatchService.listByIds(request.getIds());
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java
index cdc77fc..d120fd4 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java
@@ -7,6 +7,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.business.labExecutive.*;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.business.IBusinessLabExecutiveInfoService;
@@ -14,6 +15,7 @@
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.*;
 
@@ -32,7 +34,7 @@
     @Autowired
     private IBusinessLabExecutiveInfoService labExecutiveInfoService;
 
-    @ApiOperation("实验室检测-部门检测-查询各状态列表（待检测、检测中、检测完）")
+    @ApiOperation("实验室任务-查询各状态列表（待检测、检测中、检测完）")
     @PostMapping("/deptExecutive/List")
     public ReturnDTO<PageInfoBT<SampleLabExecutiveListResponse>> queryDeptExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
@@ -43,10 +45,19 @@
         return ReturnUtil.success(super.packForBT(labExecutiveInfoService.deptLabExecutiveListPage(page, labExecutiveListRequest)));
     }
 
-    /**
-     * 实验室检测-我的检测-查询各状态列表（待检测、检测中、检测完）
-     */
-    @ApiOperation("实验室检测-我的检测-查询各状态列表（待检测、检测中、检测完）")
+    @ApiOperation("实验室任务导出")
+    @PostMapping("/deptExecutive/export")
+    public void deptExportList(@RequestBody @Valid SampleLabExecutiveListRequest request) throws Exception {
+        List<SampleLabExecutiveListResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = labExecutiveInfoService.deptLabExecutiveListByIds(request.getMeasureStatus(), request.getIds());
+        } else {
+            list = labExecutiveInfoService.deptLabExecutiveList(request);
+        }
+        super.exportExcel(SampleLabExecutiveListResponse.class, list, ExportEnum.DEPT_EXECUTIVE_TASK.getSheetName());
+    }
+
+    @ApiOperation("我的任务-查询各状态列表（待检测、检测中、检测完）")
     @PostMapping("/myExecutive/list")
     public ReturnDTO<PageInfoBT<SampleLabExecutiveListResponse>> queryMyExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
@@ -57,19 +68,25 @@
         return ReturnUtil.success(super.packForBT(labExecutiveInfoService.myLabExecutiveListPage(page, labExecutiveListRequest)));
     }
 
-    /**
-     * 实验室检测-我的检测-查询各状态样品数量（待检测、检测中、检测完）
-     */
-    @ApiOperation("实验室检测-我的检测-查询各状态样品数量（待检测、检测中、检测完）")
+    @ApiOperation("我的任务导出")
+    @PostMapping("/myExecutive/export")
+    public void exportList(@RequestBody @Valid SampleLabExecutiveListRequest request) throws Exception {
+        List<SampleLabExecutiveListResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = labExecutiveInfoService.myLabExecutiveListByIds(request.getMeasureStatus(), request.getIds());
+        } else {
+            list = labExecutiveInfoService.myLabExecutiveList(request);
+        }
+        super.exportExcel(SampleLabExecutiveListResponse.class, list, ExportEnum.MY_EXECUTIVE_TASK.getSheetName());
+    }
+
+    @ApiOperation("我的任务-查询各状态样品数量（待检测、检测中、检测完）")
     @GetMapping("/myExecutive/amount")
     public ReturnDTO<List<SampleAmountResponse>> queryMyExecutiveAmount() {
         return ReturnUtil.success(labExecutiveInfoService.myExecutiveAmount());
     }
 
-    /**
-     * 实验室检测-部门检测-分配（分配给具体人员）
-     */
-    @ApiOperation("实验室检测-部门检测-分配按钮（分配给具体人员）")
+    @ApiOperation("实验室任务-分配按钮（分配给具体人员）")
     @PostMapping("/deptExecutive/allocate")
     public ReturnDTO allocateStaff(@RequestBody @Valid SampleAllocateRequest sampleAllocateRequest, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -78,10 +95,7 @@
         return labExecutiveInfoService.allocateStaff(sampleAllocateRequest);
     }
 
-    /**
-     * 实验室检测-我的检测-检定人扫描收入（待检测->检测中）
-     */
-    @ApiOperation("实验室检测-我的检测-检定人扫描收入（待检测->检测中）")
+    @ApiOperation("我的任务-检定人扫描收入（待检测->检测中）")
     @PostMapping("/myExecutive/receive")
     public ReturnDTO sampleReceive(@RequestBody @Valid List<SampleOperateRequest> requestList, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -90,10 +104,7 @@
         return labExecutiveInfoService.sampleReceive(requestList);
     }
 
-    /**
-     * 实验室检测-负责人/检定人扫描检完（检测中->检测完）
-     */
-    @ApiOperation("实验室检测-负责人/检定人扫描检完（检测中->检测完）")
+    @ApiOperation("实验室任务-负责人/检定人扫描检完（检测中->检测完）")
     @PostMapping("/myExecutive/complete")
     public ReturnDTO sampleExecutiveComplete(@RequestBody @Valid List<SampleOperateRequest> requestList, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -102,10 +113,7 @@
         return labExecutiveInfoService.sampleExecutiveComplete(requestList);
     }
 
-    /**
-     * 实验室检测-部门检测/我的检测 编辑（只能修改应出具证书）
-     */
-    @ApiOperation("实验室检测-部门检测/我的检测 编辑（只能修改应出具证书）")
+    @ApiOperation("实验室任务/我的任务 编辑（只能修改应出具证书）")
     @PostMapping("/executive/update")
     public ReturnDTO updateExecutive(@RequestBody @Valid UpdateExecutiveRequest request, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -114,10 +122,7 @@
         return labExecutiveInfoService.updateExecutive(request);
     }
 
-    /**
-     * 实验室检测-部门检测/我的检测 详情
-     */
-    @ApiOperation("实验室检测-部门检测/我的检测 详情")
+    @ApiOperation("实验室任务/我的任务 详情")
     @PostMapping("/executive/detail")
     public ReturnDTO<ExecutiveDetailResponse> executiveDetail(@RequestBody @Valid ExecutiveDetailRequest request, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
@@ -131,7 +136,7 @@
      * 退回后会将下一个要执行的实验室检测状态更新为待分配，将后面的实验室顺序变更为连续（都进行减1）
      * 最后一个检测的实验室退回，等分发员再增加实验室或设备收发中的已收入直接手动点击完成
      */
-    @ApiOperation("实验室检测-部门检测/我的检测 退回（待检测/检测中->退回）")
+    @ApiOperation("实验室任务/我的任务 退回（待检测/检测中->退回）")
     @PostMapping("/executive/sendBack")
     public ReturnDTO executiveSendBack(@RequestBody @Valid ExecutiveSendBackRequest request, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -140,9 +145,6 @@
         return labExecutiveInfoService.sampleExecutiveSendBack(request);
     }
 
-    /**
-     * 分发员编辑实验室检测列表
-     */
     @ApiOperation("分发员编辑实验室检测列表")
     @PostMapping("/handOut/updateList")
     public ReturnDTO updateExecutiveList(@RequestBody @Valid UpdateExecutiveListRequest request, BindingResult bindingResult) {
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java
index 48a67ed..0c04f31 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java
@@ -10,6 +10,7 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.resource.customer.CustomerApprovalListRequest;
 import com.casic.missiles.dto.resource.customer.CustomerSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceCustomerInfo;
@@ -26,6 +27,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -55,6 +57,13 @@
         return customerInfoService.saveCustomerInfo(request);
     }
 
+    @ApiOperation("委托方名录导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody CustomerApprovalListRequest request) throws Exception {
+        List<BizResourceCustomerInfo> list = super.exportList(request);
+        super.exportExcel(BizResourceCustomerInfo.class, list, ExportEnum.CUSTOMER_INFO.getSheetName());
+    }
+
     @ApiOperation("委托方人员列表（分页）")
     @PostMapping("/person/listPage")
     public ReturnDTO<PageInfoBT<BizResourceCustomerStaff>> personListPage(@RequestBody IdDTO idDto) {
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
index 972ed4b..6418ea5 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
@@ -5,6 +5,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.resource.customer.SuggestFormApprovalListRequest;
 import com.casic.missiles.dto.resource.customer.SuggestFormSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceCustomerSuggestForm;
@@ -20,6 +21,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -50,4 +52,11 @@
         return suggestFormService.saveSuggestForm(request);
     }
 
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody SuggestFormApprovalListRequest request) throws Exception {
+        List<BizResourceCustomerSuggestForm> list = super.exportList(request);
+        super.exportExcel(BizResourceCustomerSuggestForm.class, list, ExportEnum.CUSTOMER_SUGGEST_FORM.getSheetName());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java
index 1934d1a..9e07eab 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java
@@ -15,12 +15,16 @@
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.resource.IEnvEnvironmentRecordConfigService;
 import com.casic.missiles.service.resource.IEnvEnvironmentRecordDataService;
+import com.casic.missiles.service.resource.IEnvLocationInfoService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
 import java.util.List;
@@ -39,6 +43,8 @@
     private IEnvEnvironmentRecordDataService environmentRecordDataService;
     @Autowired
     private IEnvEnvironmentRecordConfigService environmentRecordConfigService;
+    @Autowired
+    private IEnvLocationInfoService locationInfoService;
 
     @ApiOperation("环境记录单数据列表/详情")
     @PostMapping("/data/listPage")
@@ -95,4 +101,11 @@
         });
         return environmentRecordConfigService.deleteEnvironmentRecordConfig(idDTO.getId());
     }
+
+    @ApiOperation("地点列表")
+    @PostMapping("/location/listPage")
+    public ReturnDTO<PageInfoBT<LocationListResponse>> locationListPage(@RequestBody @Valid LocationListRequest request) {
+        Page<LocationListResponse> page = PageFactory.defaultPage();
+        return ReturnUtil.success(super.packForBT(locationInfoService.listPage(page, request)));
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java
index 82efe3f..e9561fa 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java
@@ -10,6 +10,7 @@
 import com.casic.missiles.dto.resource.seal.SealLogListRequest;
 import com.casic.missiles.dto.resource.seal.SealNoteApprovalListRequest;
 import com.casic.missiles.dto.resource.seal.SealNoteSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceSealUseLog;
@@ -27,6 +28,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -58,6 +60,13 @@
         return sealUseNoteService.saveSeal(request);
     }
 
+    @ApiOperation("印章使用登记导出（列表和导出中去掉经办人和监印人）")
+    @PostMapping("/listExport")
+    public void export(@RequestBody SealNoteApprovalListRequest request) throws Exception {
+        List<BizResourceSealUseNote> list = super.exportList(request);
+        super.exportExcel(BizResourceSealUseNote.class, list, ExportEnum.SEAL_NOTE.getSheetName());
+    }
+
     // TODO: 2023/7/28 印章使用日志：系统中使用印章时插入数据库
 
     @ApiOperation("印章使用日志列表（分页）")
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java
index 9b674fc..06b6521 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java
@@ -9,16 +9,20 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.resource.staff.StaffCertRequest;
 import com.casic.missiles.dto.resource.staff.StaffCertResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.service.resource.IBizResourceStaffInfoService;
 import com.casic.missiles.service.resource.IBizResourceStaffVerifierService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.List;
+
 /**
  * @Description:
  * @Author: wangpeng
@@ -41,9 +45,21 @@
         return ReturnUtil.success(super.packForBT(responsePage));
     }
 
+    @ApiOperation("证书逾期提醒导出")
+    @PostMapping("/listExport")
+    public void exportList(@RequestBody StaffCertRequest request) throws Exception {
+        List<StaffCertResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = staffInfoService.certListByIds(request.getIds());
+        } else {
+            list = staffInfoService.certList(request);
+        }
+        super.exportExcel(StaffCertResponse.class, list, ExportEnum.STAFF_CERTIFICATE_EXPIRE.getSheetName());
+    }
+
     @ApiOperation("证书逾期提醒")
     @PostMapping("/expirationReminder")
-    public ReturnDTO expirationReminder(@RequestBody IdDTO idDto) {
-        return verifierService.expirationReminder(idDto);
+    public ReturnDTO expirationReminder(@RequestBody IdDTO idDTO) {
+        return verifierService.expirationReminder(idDTO);
     }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java
index 3b251ad..a6e7850 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java
@@ -12,6 +12,7 @@
 import com.casic.missiles.dto.resource.staff.StaffListRequest;
 import com.casic.missiles.dto.resource.staff.TrainListRequest;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.*;
@@ -22,7 +23,10 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
 import java.util.List;
@@ -52,8 +56,19 @@
             throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
         }
         Page<BizResourceStaffInfo> page = PageFactory.defaultPage();
-        Page<BizResourceStaffInfo> responsePage = staffInfoService.listPage(page, request);
-        return ReturnUtil.success(super.packForBT(responsePage));
+        return ReturnUtil.success(super.packForBT(staffInfoService.listPage(page, request)));
+    }
+
+    @ApiOperation("人员登记导出")
+    @PostMapping("/listExport")
+    public void exportList(@RequestBody StaffListRequest request) throws Exception {
+        List<BizResourceStaffInfo> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = staffInfoService.listByIds(request.getIds());
+        } else {
+            list = staffInfoService.list(request);
+        }
+        super.exportExcel(BizResourceStaffInfo.class, list, ExportEnum.STAFF_INFO.getSheetName());
     }
 
     @ApiOperation("人员登记详情基础信息")
@@ -85,9 +100,9 @@
 
     @ApiOperation("科研教育列表（分页）")
     @PostMapping("/education/listPage")
-    public ReturnDTO<PageInfoBT<BizResourceStaffEducation>> educationListPage(@RequestBody IdDTO idDto) {
+    public ReturnDTO<PageInfoBT<BizResourceStaffEducation>> educationListPage(@RequestBody IdDTO idDTO) {
         Page<BizResourceStaffEducation> page = PageFactory.defaultPage();
-        Page<BizResourceStaffEducation> responsePage = staffInfoService.educationListPage(page, idDto);
+        Page<BizResourceStaffEducation> responsePage = staffInfoService.educationListPage(page, idDTO);
         return ReturnUtil.success(super.packForBT(responsePage));
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java
index af6aa86..d85d84a 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java
@@ -9,6 +9,7 @@
 import com.casic.missiles.dto.resource.outsideService.SupplierApprovalListRequest;
 import com.casic.missiles.dto.resource.outsideService.SupplierSaveResponse;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceSupplierAbility;
@@ -67,6 +68,13 @@
         return ReturnUtil.success(supplierInfoService.detail(idDTO.getId()));
     }
 
+    @ApiOperation("合格供方导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody SupplierApprovalListRequest request) throws Exception {
+        List<BizResourceSupplierInfo> list = super.exportList(request);
+        super.exportExcel(BizResourceSupplierInfo.class, list, ExportEnum.SUPPLIER_INFO.getSheetName());
+    }
+
     @ApiOperation("供方人员列表（分页）")
     @PostMapping("/person/listPage")
     public ReturnDTO<PageInfoBT<BizResourceSupplierPerson>> personListPage(@RequestBody IdDTO idDTO) {
diff --git a/casic-metering-api/src/main/resources/config/application.yml b/casic-metering-api/src/main/resources/config/application.yml
index 350db5f..ecff521 100644
--- a/casic-metering-api/src/main/resources/config/application.yml
+++ b/casic-metering-api/src/main/resources/config/application.yml
@@ -126,7 +126,7 @@
     #作者
     author: wangpeng
     #待生成对象表名
-    table-name: biz_equipment_technical_target_approval,biz_equipment_attachment_approval,biz_equipment_checkpoint_approval
+    table-name: biz_business_outsource_protocol
 
 reminder:
   #节点--common模块config包 ReminderNodeConfig配置
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
index 4a19e4e..d47d552 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
@@ -53,6 +53,7 @@
     SUGGEST_FORM_SAVE_FAILED(2509, "委托方意见登记表保存至草稿箱失败"),
     EXAMINE_FORM_SAVE_FAILED(2510, "要求、委托书及合同评审表保存至草稿箱失败"),
     CUSTOMER_EXIST_SAVE_FAILED(2511, "该委托方已存在，请重新选择"),
+    DUPLICATE_LOCATION_NO(2512, "地点编号已存在"),
 
     /**
      * 计量检定业务模块
@@ -68,6 +69,8 @@
     COMPLETE_SAMPLE_NOT_EXIST(2609, "检测中不存在扫描收入的样品"),
     CANNOT_CHANGE_MEASURE_INFO(2610, "无法更改非当前登录用户的检测信息"),
     NON_EXIST_ORDER_OR_SAMPLE(2611, "不存在该委托单或该委托单下的样品"),
+    OUTSOURCE_ACCESS_SAVE_FAILED(2612, "测试、校准或检定工作分包评审表保存至草稿箱失败"),
+    OUTSOURCE_PROTOCOL_SAVE_FAILED(2613, "测试、校准或检定工作分包协议书保存至草稿箱失败"),
 
     /**
      * 历史遗留备用
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
index 5089ad1..81a406b 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
@@ -10,54 +10,38 @@
     /**
      * 资源管理
      */
-    ENVIRONMENT_DATA_EXPORT("environmentData", "environmentData", "环境记录单数据"),
+    ENVIRONMENT_DATA_EXPORT("environmentData", "环境记录单数据", "环境记录单数据"),
+    STAFF_INFO("staffInfo", "人员登记", "人员登记"),
+    STAFF_CERTIFICATE_EXPIRE("certificateExpire", "证书逾期提醒", "证书逾期提醒"),
+    SUPPLIER_INFO("supplierInfo", "合格供方名录", "合格供方名录"),
+    CUSTOMER_INFO("customerInfo", "委托方名录", "委托方名录"),
+    CUSTOMER_SUGGEST_FORM("customerSuggestForm", "委托方意见登记表", "委托方意见登记表"),
+    SEAL_NOTE("sealNote", "印章使用登记", "印章使用登记"),
 
-    FILE_EXPORT("meterFileData", "meterFileData", "计量文件信息"),
-    TRAIN_PLAN_EXPORT("trainPlanData", "trainPlanData", "培训计划"),
-    TRAIN_LOG_EXPORT("trainLogData", "trainLogData", "培训记录"),
-    METER_ORGANIZE_EXPORT("meterOrganizeData", "meterOrganizeData", "计量组织"),
-    TRACE_SUPPLIER_EXPORT("traceSupplierData", "traceSupplierData", "溯源供方"),
-    SIGN_EXPORT("signData", "signData", "签名/签章"),
-    TEMPLATE_EXPORT("templateData", "templateData", "原始记录模板/证书报告模板"),
-    FIXED_ASSETS("meterFixedAssets", "meterFixedAssets", "固定资产"),
-    METER_EQUIPMENT("meterEquipment", "meterEquipment", "测量设备"),
-    CALIBRATION_TEST_EQUIPMENT("calibrationTestEquipment", "calibrationTestEquipment", "校准检定设备"),
-    MEASURE_ACCOUNT("measureAccount", "measureAccount", "测量工装"),
-    STANDARD_SUPPORT_EQUIPMENT("standardSupportEquipment", "standardSupportEquipment", "标准配套设备"),
-    STANDARD_EQUIPMENT("standardEquipment", "standardEquipment", "标准装置"),
-    FLOW_DEF_EXPORT("flowDefData", "flowDefData", "流程定义"),
-    STAFF_CERTIFICATE("certificate", "certificate", "计量人员证书"),
-    CHECK_INFO("checkInfo", "checkInfo", "设备管理点检测"),
-    EQUIPMENT_APPLY("equipmentApply", "equipmentApply", "设备借用"),
-    STANDARD_EQUIPMENT_REMIND("equipmentApplyRemind", "equipmentApplyRemind", "标准装置到期提醒"),
-    METER_PRICE("meterPrice", "meterPrice", "价格库"),
-    METER_STAFF("meterStaff", "meterStaff", "计量人员"),
-    STANDARD_EQUIPMENT_APPLY("standardEquipmentApply", "standardEquipmentApply", "标准装置申请"),
-    STATE_MANAGE_APPLY("stateManage", "stateManage", "状态管理"),
-    METER_ACCEPTANCE_CHECK("acceptanceCheck", "acceptanceCheck", "设备检修保养验收单"),
-    CUSTOMER_EXPORT("customerData", "customerData", "客户信息"),
-    ORDER_EXPORT("orderData", "orderData", "委托书信息"),
-    SAMPLE_EXPORT("sampleData", "sampleData", "样本信息"),
-    EXCHANGE_DATA("exchangeData", "exchangeData", "设备交接单"),
-    DISPATCH_DATA("dispatchData", "dispatchData", "设备收发"),
-    ENVIRONMENT_DATA("environmentData", "environmentData", "环境记录单"),
-    ORIGIN_DATA("originData", "originData", "原始记录"),
-    CERTIFICATE_REPORT("certificateReport", "certificateReport", "证书报告"),
-    ADVICE_EXPORT("adviceData", "adviceData", "客户反馈"),
-    HANDOUT_EXPORT("handoutData", "handoutData", "任务分发列表"),
-    OUTSOURCER_EXPORT("outsourcerData", "outsourcerData", "分包方"),
-    SITE_EXECUTIVE_EXPORT("siteExecutiveData", "siteExecutiveData", "现场测试、校准或检定"),
-    CERTIFICATE_PRINT_EXPORT("certificatePrintData", "certificatePrintData", "证书打印"),
-    DOWNLOAD_TEMPLATE("downloadTemplate", "downloadTemplate", "页面配置"),
-    OUTSOURCER_CERTIFICATE_EXPORT("outsourceCertificateData", "outsourceCertificateData", "分包证书"),
-    SETTLEMENT_INFO_EXPORT("settlementInfoData", "settlementInfoData", "业务结算"),
-    EQUIPMENT_REMIND("equipmentRemind", "equipmentRemind", "设备到期提醒"),
-    AGREEMENT_INFO_EXPORT("agreementInfoData", "agreementInfoData", "合同"),
-    WORK_STATISTICS_EXPORT("workStatisticsData", "workStatisticsData", "实时工作统计"),
-    DEPT_OUTPUT_EXPORT("deptOutputData", "deptOutputData", "部门产值分析"),
-    WORKLOAD_EXPORT("workloadData", "workloadData", "业务工作量分析"),
-    DEPT_COMPREHENSIVE_EXPORT("deptComprehensiveData", "deptComprehensiveData", "部门综合分析"),
-    ENVIRONMENTAL_RECORD("environmentalRecordData", "environmentalRecordData", "现场环境记录");
+    /**
+     * 计量检定业务
+     */
+    OUTSOURCER_EXPORT("outsourcerData", "分包方名录", "分包方名录"),
+    IDENTIFY_EXPORT("identifyData", "计量标识", "计量标识"),
+    ORDER_EXPORT("orderData", "任务单", "任务单"),
+    DISPATCH_DATA("dispatchData", "设备收发", "设备收发"),
+    HANDOUT_EXPORT("handoutData", "任务分发", "任务分发"),
+    SITE_EXECUTIVE_EXPORT("siteExecutiveData", "现场测试、校准或检定", "现场测试、校准或检定"),
+    CERTIFICATE_REPORT("certificateReport", "证书审批", "证书审批"),
+    CERTIFICATE_CHANGE_APPLY("certificateChangeApply", "证书报告补充或更换申请单", "证书报告补充或更换申请单"),
+    CERTIFICATE_PRINT("certificatePrintData", "证书打印审批", "证书打印审批"),
+    DEPT_EXECUTIVE_TASK("deptExecutiveTaskData", "实验室任务", "实验室任务"),
+    MY_EXECUTIVE_TASK("myExecutiveTaskData", "我的任务", "我的任务"),
+    OUTSOURCE_ASSESS("outsourceAssess", "测试、校准或检定工作分包评审表", "测试、校准或检定工作分包评审表"),
+    OUTSOURCE_PROTOCOL("outsourceProtocol", "测试、校准或检定工作分包协议书", "测试、校准或检定工作分包协议书"),
+
+    /**
+     * 系统管理
+     */
+    SIGN_EXPORT("signData", "签名", "签名"),
+    TEMPLATE_EXPORT("templateData", "文件模板", "文件模板"),
+    FLOW_DEF_EXPORT("flowDefData", "流程定义", "流程定义"),
+    DOWNLOAD_TEMPLATE("downloadTemplate", "流程定义", "页面配置");
 
     ExportEnum(String fileName, String sheetName, String description) {
         this.fileName = fileName;
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateRecordTypeCodeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateRecordTypeCodeEnum.java
index 31d913c..a963522 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateRecordTypeCodeEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateRecordTypeCodeEnum.java
@@ -46,4 +46,14 @@
     String SITE_EXECUTIVE_APPROVAL = "01";
     //《现场测试、校准或检定工作记录表》
     String SITE_EXECUTIVE_LOG = "02";
+
+    //测试、校准或检定工作分包协议书
+    String OUTSOURCE_PROTOCOL = "01";
+    //测试、校准或检定工作分包评审表
+    String OUTSOURCE_ACCESS = "02";
+    //测试、校准或检定工作分包通知书
+    String OUTSOURCE_NOTICE = "03";
+    //测试、校准或检定工作分包方名录
+    String OUTSOURCE_INFO = "04";
+
 }
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
index 24b8635..f78bd53 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
@@ -15,6 +15,10 @@
     String CERTIFICATE_CHANGE_APPLY_BEAN_NAME = "certificateChangeApplyBean";
     //现场测试、校准或检定
     String SITE_EXECUTIVE_BEAN_NAME = "siteExecutiveBean";
+    //测试、校准或检定工作分包评审表
+    String OUTSOURCE_ASSESS_BEAN_NAME = "outsourceAssessBean";
+    //测试、校准或检定工作分包协议书
+    String OUTSOURCE_PROTOCOL_BEAN_NAME = "outsourceProtocolBean";
 
     /*********************************设备与装置************************************/
     //设备台账
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 b21c661..6b86fd1 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
@@ -18,6 +18,8 @@
     OUTSOURCER_APPROVAL(OUTSOURCER_BEAN_NAME, ""),
     CERTIFICATE_CHANGE_APPROVAL(CERTIFICATE_CHANGE_APPLY_BEAN_NAME, ""),
     SITE_EXECUTIVE_APPROVAL(SITE_EXECUTIVE_BEAN_NAME, ""),
+    OUTSOURCE_ASSESS_APPROVAL(OUTSOURCE_ASSESS_BEAN_NAME, ""),
+    OUTSOURCE_PROTOCOL_APPROVAL(OUTSOURCE_PROTOCOL_BEAN_NAME, ""),
 
     ACTION_STATUS_MAP(new HashMap<String, AwareActionStatusEnum>() {
         {
@@ -47,6 +49,10 @@
             put(ApplyFromIdEnum.CERTIFICATE_CHANGE_APPROVAL.getCode(), CERTIFICATE_CHANGE_APPROVAL);
             //现场测试、校准或检定审批
             put(ApplyFromIdEnum.SITE_EXECUTIVE_APPROVAL.getCode(), SITE_EXECUTIVE_APPROVAL);
+            //测试、校准或检定工作分包评审表
+            put(ApplyFromIdEnum.OUTSOURCE_ASSESS_APPROVAL.getCode(), OUTSOURCE_ASSESS_APPROVAL);
+            //测试、校准或检定工作分包协议书
+            put(ApplyFromIdEnum.OUTSOURCE_PROTOCOL_APPROVAL.getCode(), OUTSOURCE_PROTOCOL_APPROVAL);
         }
     });
     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 934405e..c7410bd 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
@@ -9,6 +9,8 @@
     CERTIFICATE_CHANGE_APPROVAL("jljdywzsbchghsqd", MessageSourceModuleEnum.BUSINESS.getCode(), "证书/报告补充或更换申请单"),
     OUTSOURCER_APPROVAL("jljdywcsjzhgfbfml", MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定合格分包方名录"),
     SITE_EXECUTIVE_APPROVAL("jljdywxccsjzsp", MessageSourceModuleEnum.BUSINESS.getCode(), "现场测试、校准或检定审批"),
+    OUTSOURCE_ASSESS_APPROVAL("jljdywcsjzfbpsb", MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包评审表"),
+    OUTSOURCE_PROTOCOL_APPROVAL("jljdywcsjzfbxys", MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包协议书"),
 
 
     /*******************************************设备与装置*********************************************/
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/GeneralApprovalMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/GeneralApprovalMapper.java
index 4fb7344..0c9d6ae 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/GeneralApprovalMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/GeneralApprovalMapper.java
@@ -17,8 +17,4 @@
 
     Page<O> selectBatchForApprovalList(Page<O> page, @Param("request") R request, @Param("businessKeys") List<String> businessKeys);
 
-//    Page<O> selectListPage(Page<O> page, @Param("request") R request);
-
-//    Long selectMaxNo();
-
 }
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceAssessMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceAssessMapper.java
index 7867bb8..ba59009 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceAssessMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceAssessMapper.java
@@ -1,7 +1,12 @@
 package com.casic.missiles.mapper.business;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.business.outsource.OutsourceAssessApprovalListRequest;
+import com.casic.missiles.mapper.GeneralApprovalMapper;
 import com.casic.missiles.model.business.BizBusinessOutsourceAssess;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * <p>
@@ -11,6 +16,10 @@
  * @author wangpeng
  * @since 2023-08-16
  */
-public interface BizBusinessOutsourceAssessMapper extends BaseMapper<BizBusinessOutsourceAssess> {
+public interface BizBusinessOutsourceAssessMapper extends GeneralApprovalMapper<BizBusinessOutsourceAssess, BizBusinessOutsourceAssess, OutsourceAssessApprovalListRequest> {
+
+    Page<BizBusinessOutsourceAssess> selectBatchForApprovalList(Page<BizBusinessOutsourceAssess> page, @Param("request") OutsourceAssessApprovalListRequest request, @Param("businessKeys") List<String> businessKeys);
+
+    Long selectMaxProjectNo();
 
 }
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceProtocolMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceProtocolMapper.java
new file mode 100644
index 0000000..e6aba35
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceProtocolMapper.java
@@ -0,0 +1,24 @@
+package com.casic.missiles.mapper.business;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.business.outsource.OutsourceProtocolApprovalListRequest;
+import com.casic.missiles.mapper.GeneralApprovalMapper;
+import com.casic.missiles.model.business.BizBusinessOutsourceProtocol;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 计量检定业务-分包管理-测试、校准或检定工作分包协议书 Mapper 接口
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-08-24
+ */
+public interface BizBusinessOutsourceProtocolMapper extends GeneralApprovalMapper<BizBusinessOutsourceProtocol, BizBusinessOutsourceProtocol, OutsourceProtocolApprovalListRequest> {
+
+    Page<BizBusinessOutsourceProtocol> selectBatchForApprovalList(Page<BizBusinessOutsourceProtocol> page, @Param("request") OutsourceProtocolApprovalListRequest request, @Param("businessKeys") List<String> businessKeys);
+
+    Long selectMaxProtocolNo();
+}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/EnvLocationInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/EnvLocationInfoMapper.java
new file mode 100644
index 0000000..49eff87
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/EnvLocationInfoMapper.java
@@ -0,0 +1,21 @@
+package com.casic.missiles.mapper.resource;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.resource.environment.LocationListRequest;
+import com.casic.missiles.dto.resource.environment.LocationListResponse;
+import com.casic.missiles.model.resource.EnvLocationInfo;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * <p>
+ * 实验室环境监控系统-设备表 Mapper 接口
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-06-07
+ */
+public interface EnvLocationInfoMapper extends BaseMapper<EnvLocationInfo> {
+
+    Page<LocationListResponse> selectLocationListPage(Page<LocationListResponse> page, @Param("request") LocationListRequest request);
+}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java
index de124db..85ed0f7 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java
@@ -1,7 +1,9 @@
 package com.casic.missiles.mapper.system;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.dto.system.SignDetailResponse;
+import com.casic.missiles.dto.system.SignListRequest;
 import com.casic.missiles.model.system.SystemSign;
 import org.apache.ibatis.annotations.Param;
 
@@ -22,4 +24,8 @@
     SignDetailResponse selectSignDetailById(Long id);
 
     List<SystemSign> selectUsableSignList(@Param("userId") Long userId);
+
+    Page<SystemSign> selectSignListPage(Page<SystemSign> page, @Param("request") SignListRequest request);
+
+    List<SystemSign> selectSignList(@Param("request") SignListRequest request);
 }
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateChangeApplyMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateChangeApplyMapper.xml
index d798447..c496092 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateChangeApplyMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateChangeApplyMapper.xml
@@ -30,31 +30,31 @@
         SELECT *
         FROM biz_business_certificate_change_apply
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.changeApplyNo != null and request.changeApplyNo !=''">
+        <if test="request != null and request.changeApplyNo != null and request.changeApplyNo !=''">
             and change_apply_no like concat('%',#{request.changeApplyNo},'%')
         </if>
-        <if test="request.changeReportNo != null and request.changeReportNo !=''">
+        <if test="request != null and request.changeReportNo != null and request.changeReportNo !=''">
             and change_report_no like concat('%',#{request.changeReportNo},'%')
         </if>
-        <if test="request.changeReportName != null and request.changeReportName !=''">
+        <if test="request != null and request.changeReportName != null and request.changeReportName !=''">
             and change_report_name like concat('%',#{request.changeReportName},'%')
         </if>
-        <if test="request.changeType != null and request.changeType !=''">
+        <if test="request != null and request.changeType != null and request.changeType !=''">
             and change_type = #{request.changeType}
         </if>
-        <if test="request.createUserName != null and request.createUserName !=''">
+        <if test="request != null and request.createUserName != null and request.createUserName !=''">
             and create_user_name like concat('%',#{request.createUserName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificatePrintMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificatePrintMapper.xml
index b66cd99..49c0ac8 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificatePrintMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificatePrintMapper.xml
@@ -31,34 +31,34 @@
         LEFT JOIN biz_business_order_sample_relation bosr ON (bosr.order_id = bcr.order_id AND bosr.sample_id = bcr.sample_id)
         LEFT JOIN biz_business_order_info boi ON boi.id = bosr.order_id
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and bcp.approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.printStatus != null and request.printStatus !=''">
+        <if test="request != null and request.printStatus != null and request.printStatus !=''">
             and print_status = #{request.printStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and bcp.create_user_id = #{request.createUserId}
         </if>
-        <if test="request.certificateReportNo != null and request.certificateReportNo !=''">
+        <if test="request != null and request.certificateReportNo != null and request.certificateReportNo !=''">
             and bcr.certificate_report_no like concat('%',#{request.certificateReportNo},'%')
         </if>
-        <if test="request.certificateReportName != null and request.certificateReportName !=''">
+        <if test="request != null and request.certificateReportName != null and request.certificateReportName !=''">
             and bcr.certificate_report_name like concat('%',#{request.certificateReportName},'%')
         </if>
-        <if test="request.customerName != null and request.customerName !=''">
+        <if test="request != null and request.customerName != null and request.customerName !=''">
             and boi.customer_name like concat('%',#{request.customerName},'%')
         </if>
-        <if test="request.sampleNo != null and request.sampleNo !=''">
+        <if test="request != null and request.sampleNo != null and request.sampleNo !=''">
             and bosr.sample_no like concat('%',#{request.sampleNo},'%')
         </if>
-        <if test="request.sampleName != null and request.sampleName !=''">
+        <if test="request != null and request.sampleName != null and request.sampleName !=''">
             and bosr.sample_name like concat('%',#{request.sampleName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and bcp.create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and bcp.create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml
index b366034..767695d 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml
@@ -46,33 +46,37 @@
         SELECT bcr.*, bosr.sample_no, bosr.sample_name, bosr.sample_model, rsi.staff_name
         FROM biz_business_certificate_report bcr
         LEFT JOIN biz_business_order_sample_relation bosr ON (bosr.order_id = bcr.order_id AND bosr.sample_id = bcr.sample_id)
+        LEFT JOIN biz_business_order_info boi ON boi.id = bcr.order_id
         LEFT JOIN biz_resource_staff_info rsi ON rsi.id = bcr.measure_person_id
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and bcr.approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and bcr.create_user_id = #{request.createUserId}
         </if>
-        <if test="request.certificateReportNo != null and request.certificateReportNo !=''">
+        <if test="request != null and request.customerId != null and request.customerId !=''">
+            and boi.customer_id = #{request.customerId}
+        </if>
+        <if test="request != null and request.certificateReportNo != null and request.certificateReportNo !=''">
             and bcr.certificate_report_no like concat('%',#{request.certificateReportNo},'%')
         </if>
-        <if test="request.certificateReportName != null and request.certificateReportName !=''">
+        <if test="request != null and request.certificateReportName != null and request.certificateReportName !=''">
             and bcr.certificate_report_name like concat('%',#{request.certificateReportName},'%')
         </if>
-        <if test="request.sampleNo != null and request.sampleNo !=''">
+        <if test="request != null and request.sampleNo != null and request.sampleNo !=''">
             and bosr.sample_no like concat('%',#{request.sampleNo},'%')
         </if>
-        <if test="request.measureCategory != null and request.measureCategory !=''">
+        <if test="request != null and request.measureCategory != null and request.measureCategory !=''">
             and bcr.measure_category = #{request.measureCategory}
         </if>
-        <if test="request.measurePerson != null and request.measurePerson !=''">
+        <if test="request != null and request.measurePerson != null and request.measurePerson !=''">
             and rsi.staff_name like concat('%',#{request.measurePerson},'%')
         </if>
-        <if test="request.calibrationTimeStart != null and request.calibrationTimeStart !=''">
+        <if test="request != null and request.calibrationTimeStart != null and request.calibrationTimeStart !=''">
             and bcr.calibration_time &gt;= #{request.calibrationTimeStart}
         </if>
-        <if test="request.calibrationTimeEnd != null and request.calibrationTimeEnd !=''">
+        <if test="request != null and request.calibrationTimeEnd != null and request.calibrationTimeEnd !=''">
             and bcr.calibration_time &lt;= #{request.calibrationTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceAssessMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceAssessMapper.xml
index d0fcf8b..c22c101 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceAssessMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceAssessMapper.xml
@@ -7,6 +7,8 @@
         <id column="id" property="id" />
         <result column="project_no" property="projectNo" />
         <result column="project_name" property="projectName" />
+        <result column="lab_code" property="labCode" />
+        <result column="group_code" property="groupCode" />
         <result column="applicant_id" property="applicantId" />
         <result column="applicant_name" property="applicantName" />
         <result column="applicant_time" property="applicantTime" />
@@ -31,7 +33,45 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, project_no, project_name, applicant_id, applicant_name, applicant_time, minio_file_name, remark, create_user_id, create_user_name, outsourcer_id, pre_start_time, pre_end_time, outsource_reason, pre_cost, approval_status, process_id, approve_situation, traceability, test_method, technique_ability, create_time, update_time
+        id, project_no, project_name, lab_code, group_code, applicant_id, applicant_name, applicant_time, minio_file_name, remark, create_user_id, create_user_name, outsourcer_id, pre_start_time, pre_end_time, outsource_reason, pre_cost, approval_status, process_id, approve_situation, traceability, test_method, technique_ability, create_time, update_time
     </sql>
 
+    <select id="selectMaxProjectNo" resultType="java.lang.Long">
+        SELECT IFNULL(max(RIGHT(project_no, 3)), 0) from biz_business_outsource_assess
+    </select>
+
+    <select id="selectBatchForApprovalList" resultMap="BaseResultMap">
+        SELECT bboa.*, bboi.outsourcer_name, bboi.director
+        FROM biz_business_outsource_assess bboa
+        LEFT JOIN biz_business_outsourcer_info bboi ON bboa.outsourcer_id = bboi.id
+        WHERE 1=1
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
+            and bboa.approval_status = #{request.approvalStatus}
+        </if>
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
+            and bboa.create_user_id = #{request.createUserId}
+        </if>
+        <if test="request != null and request.projectNo != null and request.projectNo !=''">
+            and bboa.project_no like concat('%',#{request.projectNo},'%')
+        </if>
+        <if test="request != null and request.outsourcerName != null and request.outsourcerName !=''">
+            and bboi.outsourcer_name like concat('%',#{request.outsourcerName},'%')
+        </if>
+        <if test="request != null and request.applicantName != null and request.applicantName !=''">
+            and bboa.applicant_name like concat('%',#{request.applicantName},'%')
+        </if>
+        <if test="request != null and request.applicantTimeStart != null and request.applicantTimeStart !=''">
+            and bboa.applicant_time &gt;= #{request.applicantTimeStart}
+        </if>
+        <if test="request != null and request.applicantTimeEnd != null and request.applicantTimeEnd !=''">
+            and bboa.applicant_time &lt;= #{request.applicantTimeEnd}
+        </if>
+        <if test="businessKeys != null">
+            and bboa.id in
+            <foreach collection="businessKeys" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
+        ORDER BY bboa.create_time DESC
+    </select>
 </mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceProtocolMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceProtocolMapper.xml
new file mode 100644
index 0000000..b7b2149
--- /dev/null
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceProtocolMapper.xml
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.mapper.business.BizBusinessOutsourceProtocolMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.business.BizBusinessOutsourceProtocol">
+        <id column="id" property="id" />
+        <result column="protocol_no" property="protocolNo" />
+        <result column="project_name" property="projectName" />
+        <result column="lab_code" property="labCode" />
+        <result column="group_code" property="groupCode" />
+        <result column="outsourcer_id" property="outsourcerId" />
+        <result column="remark" property="remark" />
+        <result column="outsource_no" property="outsourceNo" />
+        <result column="outsource_name" property="outsourceName" />
+        <result column="contacts" property="contacts" />
+        <result column="mobile" property="mobile" />
+        <result column="address" property="address" />
+        <result column="require_date" property="requireDate" />
+        <result column="outsource_cost" property="outsourceCost" />
+        <result column="director" property="director" />
+        <result column="item" property="item" />
+        <result column="requires" property="requires" />
+        <result column="create_user_id" property="createUserId" />
+        <result column="create_user_name" property="createUserName" />
+        <result column="approval_status" property="approvalStatus" />
+        <result column="process_id" property="processId" />
+        <result column="create_time" property="createTime" />
+        <result column="update_time" property="updateTime" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, protocol_no, project_name, lab_code, group_code, outsourcer_id, remark, outsource_no, outsource_name, contacts, mobile, address, require_date, outsource_cost, director, item, requires, create_user_id, create_user_name, approval_status, process_id, create_time, update_time
+    </sql>
+
+    <select id="selectMaxProtocolNo" resultType="java.lang.Long">
+        SELECT IFNULL(max(RIGHT(protocol_no, 3)), 0) from biz_business_outsource_protocol
+    </select>
+
+    <select id="selectBatchForApprovalList" resultMap="BaseResultMap">
+        SELECT *
+        FROM biz_business_outsource_protocol
+        WHERE 1=1
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
+            and approval_status = #{request.approvalStatus}
+        </if>
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
+            and create_user_id = #{request.createUserId}
+        </if>
+        <if test="request != null and request.protocolNo != null and request.protocolNo !=''">
+            and protocol_no like concat('%',#{request.protocolNo},'%')
+        </if>
+        <if test="request != null and request.outsourcerName != null and request.outsourcerName !=''">
+            and outsourcer_name like concat('%',#{request.outsourcerName},'%')
+        </if>
+        <if test="request != null and request.applicantName != null and request.applicantName !=''">
+            and create_user_name like concat('%',#{request.applicantName},'%')
+        </if>
+        <if test="request != null and request.applicantTimeStart != null and request.applicantTimeStart !=''">
+            and create_time &gt;= #{request.applicantTimeStart}
+        </if>
+        <if test="request != null and request.applicantTimeEnd != null and request.applicantTimeEnd !=''">
+            and create_time &lt;= #{request.applicantTimeEnd}
+        </if>
+        <if test="businessKeys != null">
+            and id in
+            <foreach collection="businessKeys" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
+        ORDER BY create_time DESC
+    </select>
+</mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourcerInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourcerInfoMapper.xml
index 510a80b..3049b54 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourcerInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourcerInfoMapper.xml
@@ -7,6 +7,8 @@
         <id column="id" property="id" />
         <result column="outsourcer_no" property="outsourcerNo" />
         <result column="outsourcer_name" property="outsourcerName" />
+        <result column="lab_code" property="labCode" />
+        <result column="group_code" property="groupCode" />
         <result column="outsourcer_brief_name" property="outsourcerBriefName" />
         <result column="outsourcer_size" property="outsourcerSize" />
         <result column="business_size" property="businessSize" />
@@ -55,32 +57,32 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, outsourcer_no, outsourcer_name, outsourcer_brief_name, outsourcer_size, business_size, grade, evaluation, tax_number, bank_account, bank_name, bank_account_number, postal_code, director, phone, fax, mobile, email, website, address_country, address_province, address_city, address_area, full_address, address_country_name, address_province_name, address_city_name, address_area_name, invoice_country, invoice_province, invoice_city, invoice_area, invoice_full_address, invoice_country_name, invoice_province_name, invoice_city_name, invoice_area_name, business_scope, business_content, minio_file_name, approval_status, process_id, remark, create_user_id, create_user_name, create_time, update_time
+        id, outsourcer_no, outsourcer_name, lab_code, group_code, outsourcer_brief_name, outsourcer_size, business_size, grade, evaluation, tax_number, bank_account, bank_name, bank_account_number, postal_code, director, phone, fax, mobile, email, website, address_country, address_province, address_city, address_area, full_address, address_country_name, address_province_name, address_city_name, address_area_name, invoice_country, invoice_province, invoice_city, invoice_area, invoice_full_address, invoice_country_name, invoice_province_name, invoice_city_name, invoice_area_name, business_scope, business_content, minio_file_name, approval_status, process_id, remark, create_user_id, create_user_name, create_time, update_time
     </sql>
 
     <select id="selectBatchForApprovalList" resultMap="BaseResultMap">
         SELECT *
         FROM biz_business_outsourcer_info
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.outsourcerNo != null and request.outsourcerNo !=''">
+        <if test="request != null and request.outsourcerNo != null and request.outsourcerNo !=''">
             and outsourcer_no like concat('%',#{request.outsourcerNo},'%')
         </if>
-        <if test="request.outsourcerName != null and request.outsourcerName !=''">
+        <if test="request != null and request.outsourcerName != null and request.outsourcerName !=''">
             and outsourcer_name like concat('%',#{request.outsourcerName},'%')
         </if>
-        <if test="request.director != null and request.director !=''">
+        <if test="request != null and request.director != null and request.director !=''">
             and director like concat('%',#{request.director},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
@@ -93,6 +95,6 @@
     </select>
 
     <select id="selectMaxNo" resultType="java.lang.Long">
-        SELECT IFNULL(max(RIGHT(outsourcer_no, 12)), 0) from biz_business_outsourcer_info
+        SELECT IFNULL(max(RIGHT(outsourcer_no, 3)), 0) from biz_business_outsourcer_info
     </select>
 </mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessSiteExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessSiteExecutiveInfoMapper.xml
index 135c5d0..3c5ae79 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessSiteExecutiveInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessSiteExecutiveInfoMapper.xml
@@ -38,25 +38,25 @@
         FROM biz_business_site_executive_info bsei
         LEFT JOIN biz_resource_customer_info rci ON bsei.customer_id = rci.id
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and bsei.approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and bsei.create_user_id = #{request.createUserId}
         </if>
-        <if test="request.siteExecutiveNo != null and request.siteExecutiveNo !=''">
+        <if test="request != null and request.siteExecutiveNo != null and request.siteExecutiveNo !=''">
             and bsei.site_executive_no like concat('%',#{request.siteExecutiveNo},'%')
         </if>
-        <if test="request.customerName != null and request.customerName !=''">
+        <if test="request != null and request.customerName != null and request.customerName !=''">
             and rci.outsourcer_name like concat('%',#{request.customerName},'%')
         </if>
-        <if test="request.applyName != null and request.applyName !=''">
+        <if test="request != null and request.applyName != null and request.applyName !=''">
             and bsei.apply_name like concat('%',#{request.applyName},'%')
         </if>
-        <if test="request.applyTimeStart != null and request.applyTimeStart !=''">
+        <if test="request != null and request.applyTimeStart != null and request.applyTimeStart !=''">
             and bsei.apply_time &gt;= #{request.applyTimeStart}
         </if>
-        <if test="request.applyTimeEnd != null and request.applyTimeEnd !=''">
+        <if test="request != null and request.applyTimeEnd != null and request.applyTimeEnd !=''">
             and bsei.apply_time &lt;= #{request.applyTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml
index 84d9e2a..6bd38a9 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml
@@ -105,6 +105,12 @@
         <if test="request.isUrgent != null and request.isUrgent !=''">
             AND bo.is_urgent = #{request.isUrgent}
         </if>
+        <if test="request.ids != null">
+            and blei.id in
+            <foreach collection="request.ids" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
         ORDER BY blei.update_time DESC
     </select>
 
@@ -137,6 +143,12 @@
         <if test="request.isUrgent != null and request.isUrgent !=''">
             AND bo.is_urgent = #{request.isUrgent}
         </if>
+        <if test="request.ids != null">
+            and blei.id in
+            <foreach collection="request.ids" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
         ORDER BY blei.update_time DESC
     </select>
 
diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardInfoMapper.xml
index 1a5551b..2ed8d17 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardInfoMapper.xml
@@ -45,12 +45,6 @@
         FROM biz_equipment_standard_info besi
         LEFT JOIN biz_equipment_standard_technology_relation bestr ON besi.standard_no = bestr.standard_no
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
-            and besi.approval_status = #{request.approvalStatus}
-        </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
-            and besi.create_user_id = #{request.createUserId}
-        </if>
         <if test="request.standardName != null and request.standardName !=''">
             and besi.standard_name like concat('%',#{request.standardName},'%')
         </if>
diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardTechnologyRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardTechnologyRelationMapper.xml
index fc7e16c..cd03c8c 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardTechnologyRelationMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardTechnologyRelationMapper.xml
@@ -6,6 +6,7 @@
     <resultMap id="BaseResultMap" type="com.casic.missiles.model.equipment.BizEquipmentStandardTechnologyRelation">
         <id column="id" property="id" />
         <result column="technology_file_id" property="technologyFileId" />
+        <result column="technology_file_no" property="technologyFileNo" />
         <result column="technology_file_name" property="technologyFileName" />
         <result column="standard_id" property="standardId" />
         <result column="standard_no" property="standardNo" />
@@ -14,7 +15,7 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, technology_file_id, technology_file_name, standard_id, remark
+        id, technology_file_id, technology_file_no, technology_file_name, standard_id, remark
     </sql>
 
 </mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceAuthorizeOrderMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceAuthorizeOrderMapper.xml
index ac5176c..554fe65 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceAuthorizeOrderMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceAuthorizeOrderMapper.xml
@@ -32,22 +32,22 @@
         SELECT *
         FROM biz_resource_authorize_order
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.orderNo != null and request.orderNo !=''">
+        <if test="request != null and request.orderNo != null and request.orderNo !=''">
             and order_no like concat('%',#{request.orderNo},'%')
         </if>
-        <if test="request.createUserName != null and request.createUserName !=''">
+        <if test="request != null and request.createUserName != null and request.createUserName !=''">
             and create_user_name like concat('%',#{request.createUserName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerExamineFormMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerExamineFormMapper.xml
index ab242f6..af7f98f 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerExamineFormMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerExamineFormMapper.xml
@@ -41,28 +41,28 @@
         SELECT *
         FROM biz_resource_customer_examine_form
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.formNo != null and request.formNo !=''">
+        <if test="request != null and request.formNo != null and request.formNo !=''">
             and form_no like concat('%',#{request.formNo},'%')
         </if>
-        <if test="request.labCode != null and request.labCode !=''">
+        <if test="request != null and request.labCode != null and request.labCode !=''">
             and lab_code like concat('%',#{request.labCode},'%')
         </if>
-        <if test="request.groupCode != null and request.groupCode !=''">
+        <if test="request != null and request.groupCode != null and request.groupCode !=''">
             and group_code like concat('%',#{request.groupCode},'%')
         </if>
-        <if test="request.createUserName != null and request.createUserName !=''">
+        <if test="request != null and request.createUserName != null and request.createUserName !=''">
             and create_user_name like concat('%',#{request.createUserName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerInfoMapper.xml
index fa8ffbc..06a2798 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerInfoMapper.xml
@@ -33,25 +33,25 @@
         SELECT *
         FROM biz_resource_customer_info
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.customerNo != null and request.customerNo !=''">
+        <if test="request != null and request.customerNo != null and request.customerNo !=''">
             and customer_no like concat('%',#{request.customerNo},'%')
         </if>
-        <if test="request.customerName != null and request.customerName !=''">
+        <if test="request != null and request.customerName != null and request.customerName !=''">
             and customer_name like concat('%',#{request.customerName},'%')
         </if>
-        <if test="request.contacts != null and request.contacts !=''">
+        <if test="request != null and request.contacts != null and request.contacts !=''">
             and contacts like concat('%',#{request.contacts},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerSuggestFormMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerSuggestFormMapper.xml
index 28f5bb2..1806662 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerSuggestFormMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerSuggestFormMapper.xml
@@ -33,28 +33,28 @@
         SELECT *
         FROM biz_resource_customer_suggest_form
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.formNo != null and request.formNo !=''">
+        <if test="request != null and request.formNo != null and request.formNo !=''">
             and form_no like concat('%',#{request.formNo},'%')
         </if>
-        <if test="request.customerName != null and request.customerName !=''">
+        <if test="request != null and request.customerName != null and request.customerName !=''">
             and customer_name like concat('%',#{request.customerName},'%')
         </if>
-        <if test="request.customerDeptName != null and request.customerDeptName !=''">
+        <if test="request != null and request.customerDeptName != null and request.customerDeptName !=''">
             and customer_dept_name like concat('%',#{request.customerDeptName},'%')
         </if>
-        <if test="request.createUserName != null and request.createUserName !=''">
+        <if test="request != null and request.createUserName != null and request.createUserName !=''">
             and create_user_name like concat('%',#{request.createUserName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSealUseNoteMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSealUseNoteMapper.xml
index ab37bc1..b02bb33 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSealUseNoteMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSealUseNoteMapper.xml
@@ -29,32 +29,32 @@
     </sql>
 
     <select id="selectBatchForApprovalList" resultMap="BaseResultMap">
-        SELECT *
+        SELECT brsun.*, brsi.seal_name, brsi.seal_type, brsi.approver_name
         FROM biz_resource_seal_use_note brsun
         JOIN biz_resource_seal_info brsi ON brsun.seal_id = brsi.id
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and brsun.approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and brsun.create_user_id = #{request.createUserId}
         </if>
-        <if test="request.sealName != null and request.sealName !=''">
+        <if test="request != null and request.sealName != null and request.sealName !=''">
             and brsi.seal_name like concat('%',#{request.sealName},'%')
         </if>
-        <if test="request.sealType != null and request.sealType !=''">
+        <if test="request != null and request.sealType != null and request.sealType !=''">
             and brsi.seal_type = #{request.sealType}
         </if>
-        <if test="request.applyDeptName != null and request.applyDeptName !=''">
+        <if test="request != null and request.applyDeptName != null and request.applyDeptName !=''">
             and brsun.apply_dept_name like concat('%',#{request.applyDeptName},'%')
         </if>
-        <if test="request.applyUserName != null and request.applyUserName !=''">
+        <if test="request != null and request.applyUserName != null and request.applyUserName !=''">
             and brsun.apply_user_name like concat('%',#{request.applyUserName},'%')
         </if>
-        <if test="request.applyTimeStart != null and request.applyTimeStart !=''">
+        <if test="request != null and request.applyTimeStart != null and request.applyTimeStart !=''">
             and brsun.apply_time &gt;= #{request.applyTimeStart}
         </if>
-        <if test="request.applyTimeEnd != null and request.applyTimeEnd !=''">
+        <if test="request != null and request.applyTimeEnd != null and request.applyTimeEnd !=''">
             and brsun.apply_time &lt;= #{request.applyTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml
index 119bf7d..4f8392a 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml
@@ -31,6 +31,12 @@
         <if test="request.deptName != null and request.deptName !=''">
             and brsi.dept_name like concat('%',#{request.deptName},'%')
         </if>
+        <if test="request.ids != null">
+            and brsv.id in
+            <foreach collection="request.ids" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
         ORDER BY brsv.grant_date DESC
     </select>
 
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSupplierInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSupplierInfoMapper.xml
index fe8d399..e8ce7ef 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSupplierInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSupplierInfoMapper.xml
@@ -48,28 +48,28 @@
         SELECT *
         FROM biz_resource_supplier_info
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.supplierNo != null and request.supplierNo !=''">
+        <if test="request != null and request.supplierNo != null and request.supplierNo !=''">
             and supplier_no like concat('%',#{request.supplierNo},'%')
         </if>
-        <if test="request.supplierName != null and request.supplierName !=''">
+        <if test="request != null and request.supplierName != null and request.supplierName !=''">
             and supplier_name like concat('%',#{request.supplierName},'%')
         </if>
-        <if test="request.director != null and request.director !=''">
+        <if test="request != null and request.director != null and request.director !=''">
             and director like concat('%',#{request.director},'%')
         </if>
-        <if test="request.supplierType != null and request.supplierType !=''">
+        <if test="request != null and request.supplierType != null and request.supplierType !=''">
             and supplier_type = #{request.supplierType}
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/EnvLocationInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/EnvLocationInfoMapper.xml
new file mode 100644
index 0000000..68bcf10
--- /dev/null
+++ b/casic-metering-dao/src/main/resources/mapper/resource/EnvLocationInfoMapper.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.mapper.resource.EnvLocationInfoMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.resource.EnvLocationInfo">
+        <id column="id" property="id" />
+        <result column="location_no" property="locationNo" />
+        <result column="location_name" property="locationName" />
+        <result column="location_position" property="locationPosition" />
+        <result column="create_user_id" property="createUserId" />
+        <result column="create_user" property="createUser" />
+        <result column="create_time" property="createTime" />
+        <result column="update_time" property="updateTime" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, location_no, location_name, location_position, create_user_id, create_user, create_time, update_time
+    </sql>
+
+    <select id="selectLocationListPage" resultType="com.casic.missiles.dto.resource.environment.LocationListResponse">
+        SELECT *
+        FROM env_location_info
+        WHERE 1=1
+        <if test="request.locationNo != null and request.locationNo !=''">
+            AND location_no LIKE concat('%',#{request.locationNo},'%')
+        </if>
+        <if test="request.locationName != null and request.locationName !=''">
+            AND location_name LIKE concat('%',#{request.locationName},'%')
+        </if>
+        ORDER BY create_time DESC
+    </select>
+
+</mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml
index b28c18f..8854047 100644
--- a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml
@@ -11,7 +11,6 @@
         <result column="sign_desc" property="signDesc" />
         <result column="sign_director" property="signDirector" />
         <result column="sign_user_id" property="signUserId" />
-        <result column="sign_type" property="signType" />
         <result column="minio_file_name" property="minioFileName" />
         <result column="create_time" property="createTime" />
         <result column="update_time" property="updateTime" />
@@ -28,7 +27,6 @@
         <result column="sign_name" property="signName" />
         <result column="sign_desc" property="signDesc" />
         <result column="sign_director" property="signDirector" />
-        <result column="sign_type" property="signType" />
         <result column="sign_user_id" property="signUserId" />
         <result column="minio_file_name" property="minioFileName" />
         <result column="create_time" property="createTime" />
@@ -62,4 +60,58 @@
         JOIN system_sign_user_relation ssur ON ss.id = ssur.sign_id
         WHERE ssur.user_id = #{userId}
     </select>
+
+    <select id="selectSignListPage" resultMap="BaseResultMap">
+        SELECT ss.*, sd.SIMPLE_NAME AS deptName
+        FROM system_sign ss
+        LEFT JOIN sys_user su ON su.id = ss.sign_user_id
+        LEFT JOIN sys_dept sd ON sd.id = su.dept_id
+        WHERE 1=1
+        <if test="request.signNo != null and request.signNo !=''">
+            AND ss.sign_no LIKE concat('%',#{request.signNo},'%')
+        </if>
+        <if test="request.signName != null and request.signName !=''">
+            AND ss.sign_name LIKE concat('%',#{request.signName},'%')
+        </if>
+        <if test="request.signDirector != null and request.signDirector !=''">
+            AND ss.sign_director LIKE concat('%',#{request.signDirector},'%')
+        </if>
+        <if test="request.signUserId != null and request.signUserId !=''">
+            AND ss.sign_user_id = #{request.signUserId}
+        </if>
+        <if test="request.createStartTime != null and request.createStartTime !=''">
+            AND DATE_FORMAT(ss.create_time,'%Y-%m-%d') &gt;= DATE_FORMAT(#{request.createStartTime},'%Y-%m-%d')
+        </if>
+        <if test="request.createEndTime != null and request.createEndTime !=''">
+            AND DATE_FORMAT(ss.create_time,'%Y-%m-%d')  &lt;= DATE_FORMAT(#{request.createEndTime},'%Y-%m-%d')
+        </if>
+        ORDER BY ss.create_time DESC
+    </select>
+
+    <select id="selectSignList" resultMap="BaseResultMap">
+        SELECT ss.*, sd.SIMPLE_NAME AS deptName
+        FROM system_sign ss
+        LEFT JOIN sys_user su ON su.id = ss.sign_user_id
+        LEFT JOIN sys_dept sd ON sd.id = su.dept_id
+        WHERE 1=1
+        <if test="request.signNo != null and request.signNo !=''">
+            AND ss.sign_no LIKE concat('%',#{request.signNo},'%')
+        </if>
+        <if test="request.signName != null and request.signName !=''">
+            AND ss.sign_name LIKE concat('%',#{request.signName},'%')
+        </if>
+        <if test="request.signDirector != null and request.signDirector !=''">
+            AND ss.sign_director LIKE concat('%',#{request.signDirector},'%')
+        </if>
+        <if test="request.signUserId != null and request.signUserId !=''">
+            AND ss.sign_user_id = #{request.signUserId}
+        </if>
+        <if test="request.createStartTime != null and request.createStartTime !=''">
+            AND DATE_FORMAT(ss.create_time,'%Y-%m-%d') &gt;= DATE_FORMAT(#{request.createStartTime},'%Y-%m-%d')
+        </if>
+        <if test="request.createEndTime != null and request.createEndTime !=''">
+            AND DATE_FORMAT(ss.create_time,'%Y-%m-%d')  &lt;= DATE_FORMAT(#{request.createEndTime},'%Y-%m-%d')
+        </if>
+        ORDER BY ss.create_time DESC
+    </select>
 </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 515050a..60f530b 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
@@ -47,8 +47,8 @@
     String STORAGE_LOCATION = "bizStorageLocation";
     //计量专业
     String MEASURE_MAJOR = "bizMeasureMajor";
-    //管理状态
-    String MANAGER_STATE = "bizManagerState";
+    //标准装置管理状态
+    String STANDARD_MANAGER_STATE = "bizStandardManagerState";
 
     /**
      * 资源管理 字典code
@@ -95,8 +95,6 @@
     String MEASURE_STATUS = "measureStatus";
     //检定方式
     String MEASURE_TYPE = "measureType";
-    //标识打印标志类型
-    String IDENTIFY_PRINT_TYPE = "bizBusinessIdentify";
     //变更类型
     String REPORT_CHANGE_TYPE = "bizCertChangeType";
     //规模类型
@@ -111,19 +109,24 @@
     String MEASURE_CATEGORY = "measureCategory";
     //检定结果
     String MEASURE_RESULT = "measureResult";
+    //分包原因
+    String OUTSOURCE_REASON = "outsourceReason";
+
+    /**
+     * 系统管理
+     */
+    String TEMPLATE_TYPE = "templateType";
+
 
     /**
      * 标准装置 字典code
      */
     //类别
     String STANDARD_CATEGORY = "standardCategory";
-    //管理状态
-    String STANDARD_MANAGER_STATE = "standardManagerState";
     //标准等级
     String STANDARD_LEVEL = "standardLevel";
     //传递范围
     String STANDARD_TRANSMIT_RANGE = "transmitRange";
-
     //资本来源
     String CAPITAL_SOURCE = "capitalSource";
     //标准装置-申请类型
@@ -148,8 +151,6 @@
     String CERTIFICATE_CLASS = "certificationClass";
     //证书管理-检校专业
     String CALIBRATION_MAJOR = "calibrationMajor";
-    //分包原因
-    String OUTSOURCE_REASON = "outsourceReason";
 
     /**
      * 工作台
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/BaseApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/BaseApprovalListRequest.java
index 73c12c1..80d7424 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/BaseApprovalListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/BaseApprovalListRequest.java
@@ -6,6 +6,7 @@
 
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotEmpty;
+import java.util.List;
 
 /**
  * @Description:
@@ -19,14 +20,14 @@
      * 表单id
      */
     @NotBlank(message = "表单id不能为空")
-    @ApiModelProperty(value = "表单id（流程定义对应的表单id，等价于业务id）", dataType = "String")
+    @ApiModelProperty(value = "表单id（流程定义对应的表单id，等价于业务id），导出接口不用传", dataType = "String")
     private String formId;
 
     /**
      * 审批状态类型，对应ApprovalStatusEnum
      */
     @NotEmpty(message = "审批状态类型不能为空")
-    @ApiModelProperty(value = "审批状态类型code", dataType = "String")
+    @ApiModelProperty(value = "审批状态类型code，导出接口不用传", dataType = "String")
     private String approvalStatus;
 
     @ApiModelProperty(hidden = true)
@@ -34,4 +35,7 @@
 
     @ApiModelProperty(hidden = true)
     private Long createUserId;
+
+    @ApiModelProperty(value = "导出ids", dataType = "List")
+    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificatePrintApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificatePrintApprovalListRequest.java
index b93d1c9..3cc2f4e 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificatePrintApprovalListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificatePrintApprovalListRequest.java
@@ -5,8 +5,6 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import java.util.List;
-
 /**
  * @Description:
  * @Author: wangpeng
@@ -38,7 +36,4 @@
 
     @ApiModelProperty(value = "创建结束时间", dataType = "String")
     private String createTimeEnd;
-
-    @ApiModelProperty(value = "导出ids", dataType = "List")
-    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportApprovalListRequest.java
index 4f7a038..c115847 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportApprovalListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportApprovalListRequest.java
@@ -5,8 +5,6 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import java.util.List;
-
 /**
  * @Description:
  * @Author: wangpeng
@@ -15,6 +13,8 @@
 @ApiModel
 @Data
 public class CertificateReportApprovalListRequest extends BaseApprovalListRequest {
+    @ApiModelProperty(value = "委托方id", dataType = "String")
+    private Long customerId;
 
     @ApiModelProperty(value = "证书报告编号", dataType = "String")
     private String certificateReportNo;
@@ -37,6 +37,4 @@
     @ApiModelProperty(value = "检校结束时间", dataType = "String")
     private String calibrationTimeEnd;
 
-    @ApiModelProperty(value = "导出ids", dataType = "List")
-    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/identify/IdentifyListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/identify/IdentifyListRequest.java
index 1b87ae6..f019203 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/identify/IdentifyListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/identify/IdentifyListRequest.java
@@ -4,6 +4,8 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * @Description:
  * @Author: wangpeng
@@ -26,4 +28,7 @@
 
     @ApiModelProperty(value = "打印结束时间", dataType = "String")
     private String createTimeEnd;
+
+    @ApiModelProperty(value = "导出ids", dataType = "List")
+    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListRequest.java
index 1264883..62415fb 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListRequest.java
@@ -7,6 +7,7 @@
 import lombok.Data;
 
 import javax.validation.constraints.NotBlank;
+import java.util.List;
 
 @Data
 @ApiModel
@@ -37,4 +38,6 @@
     @ApiModelProperty(value = "是否加急（1是0否null全部）", dataType = "Integer")
     private String isUrgent;
 
+    @ApiModelProperty(value = "导出ids", dataType = "List")
+    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListRequest.java
index 5201d7b..499760a 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListRequest.java
@@ -17,6 +17,9 @@
     @ApiModelProperty(value = "任务单编号", dataType = "String")
     private String orderNo;
 
+    @ApiModelProperty(value = "委托方id", dataType = "Long")
+    private Long customerId;
+
     @ApiModelProperty(value = "委托方名称", dataType = "String")
     private String customerName;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OrderSampleDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OrderSampleDTO.java
new file mode 100644
index 0000000..796edc0
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OrderSampleDTO.java
@@ -0,0 +1,19 @@
+package com.casic.missiles.dto.business.outsource;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/8/24 11:38
+ */
+@ApiModel
+@Data
+public class OrderSampleDTO {
+    @ApiModelProperty(value = "任务单id", dataType = "Long")
+    private Long orderId;
+    @ApiModelProperty(value = "受检设备id", dataType = "Long")
+    private Long sampleId;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceAssessApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceAssessApprovalListRequest.java
new file mode 100644
index 0000000..9a930c3
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceAssessApprovalListRequest.java
@@ -0,0 +1,30 @@
+package com.casic.missiles.dto.business.outsource;
+
+import com.casic.missiles.dto.BaseApprovalListRequest;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/8/24 11:01
+ */
+@ApiModel
+@Data
+public class OutsourceAssessApprovalListRequest extends BaseApprovalListRequest {
+    @ApiModelProperty(value = "评审表编号", dataType = "String")
+    private String projectNo;
+
+    @ApiModelProperty(value = "分包机构名称", dataType = "String")
+    private String outsourcerName;
+
+    @ApiModelProperty(value = "申请人", dataType = "String")
+    private String applicantName;
+
+    @ApiModelProperty(value = "申请时间开始", dataType = "String")
+    private String applicantTimeStart;
+
+    @ApiModelProperty(value = "申请时间结束", dataType = "String")
+    private String applicantTimeEnd;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceAssessSaveResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceAssessSaveResponse.java
new file mode 100644
index 0000000..8bf9aad
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceAssessSaveResponse.java
@@ -0,0 +1,20 @@
+package com.casic.missiles.dto.business.outsource;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/8/14 16:17
+ */
+@ApiModel
+@Data
+public class OutsourceAssessSaveResponse {
+    @ApiModelProperty(value = "主键id", dataType = "Long")
+    private Long id;
+
+    @ApiModelProperty(value = "编号", dataType = "String")
+    private String projectNo;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProtocolApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProtocolApprovalListRequest.java
new file mode 100644
index 0000000..0f32331
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProtocolApprovalListRequest.java
@@ -0,0 +1,30 @@
+package com.casic.missiles.dto.business.outsource;
+
+import com.casic.missiles.dto.BaseApprovalListRequest;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/8/24 15:01
+ */
+@ApiModel
+@Data
+public class OutsourceProtocolApprovalListRequest extends BaseApprovalListRequest {
+    @ApiModelProperty(value = "协议书编号", dataType = "String")
+    private String protocolNo;
+
+    @ApiModelProperty(value = "分包方名称", dataType = "String")
+    private String outsourcerName;
+
+    @ApiModelProperty(value = "申请人", dataType = "String")
+    private String applicantName;
+
+    @ApiModelProperty(value = "申请时间开始", dataType = "String")
+    private String applicantTimeStart;
+
+    @ApiModelProperty(value = "申请时间结束", dataType = "String")
+    private String applicantTimeEnd;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProtocolSaveResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProtocolSaveResponse.java
new file mode 100644
index 0000000..e324967
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProtocolSaveResponse.java
@@ -0,0 +1,20 @@
+package com.casic.missiles.dto.business.outsource;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/8/14 16:17
+ */
+@ApiModel
+@Data
+public class OutsourceProtocolSaveResponse {
+    @ApiModelProperty(value = "主键id", dataType = "Long")
+    private Long id;
+
+    @ApiModelProperty(value = "编号", dataType = "String")
+    private String protocolNo;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveApprovalListRequest.java
index f29f4e4..7047c28 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveApprovalListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveApprovalListRequest.java
@@ -5,8 +5,6 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import java.util.List;
-
 /**
  * @Description: 现场检测审批列表请求实体
  * @Author: wangpeng
@@ -30,7 +28,4 @@
     @ApiModelProperty(value = "申请时间结束", dataType = "String")
     private String applyTimeEnd;
 
-    @ApiModelProperty(value = "导出ids", dataType = "List")
-    private List<Long> ids;
-
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveDetailResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveDetailResponse.java
index 1f28752..394c934 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveDetailResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveDetailResponse.java
@@ -12,6 +12,18 @@
     @ApiModelProperty(value = "id，更新/删除使用参数", dataType = "Long")
     private Long id;
 
+    @ApiModelProperty(value = "实验室代码(字典code)", dataType = "String")
+    private String labCode;
+
+    @ApiModelProperty(value = "实验室代码(字典value)", dataType = "String")
+    private String labCodeName;
+
+    @ApiModelProperty(value = "组别代码(字典code)", dataType = "String")
+    private String groupCode;
+
+    @ApiModelProperty(value = "组别代码(字典value)", dataType = "String")
+    private String groupCodeName;
+
     @ApiModelProperty(value = "审批编号", dataType = "String")
     private String siteExecutiveNo;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/environment/LocationListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/environment/LocationListRequest.java
new file mode 100644
index 0000000..13d03c3
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/environment/LocationListRequest.java
@@ -0,0 +1,20 @@
+package com.casic.missiles.dto.resource.environment;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/6/8 13:56
+ */
+@ApiModel
+@Data
+public class LocationListRequest {
+    @ApiModelProperty(value = "地点编号", dataType = "String")
+    private String locationNo;
+
+    @ApiModelProperty(value = "地点名称", dataType = "String")
+    private String locationName;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/environment/LocationListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/environment/LocationListResponse.java
new file mode 100644
index 0000000..4c531af
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/environment/LocationListResponse.java
@@ -0,0 +1,78 @@
+package com.casic.missiles.dto.resource.environment;
+
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
+import com.baomidou.mybatisplus.annotation.TableField;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description: 地点列表响应实体
+ * @Author: wangpeng
+ * @Date: 2023/6/8 13:53
+ */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
+@ApiModel
+@Data
+public class LocationListResponse {
+    @ApiModelProperty(value = "主键id", dataType = "Long")
+    private Long id;
+
+    /**
+     * 地点编号
+     */
+    @ExcelProperty("地点编号")
+    @ApiModelProperty(value = "地点编号", dataType = "String")
+    private String locationNo;
+
+    /**
+     * 地点名称
+     */
+    @ExcelProperty("地点名称")
+    @ApiModelProperty(value = "地点名称", dataType = "String")
+    private String locationName;
+
+    /**
+     * 地点位置
+     */
+    @ExcelProperty("地点位置")
+    @ApiModelProperty(value = "地点位置", dataType = "String")
+    private String locationPosition;
+
+    /**
+     * 创建人id
+     */
+    @ApiModelProperty(value = "创建人id", dataType = "Long")
+    private Long createUserId;
+
+    /**
+     * 创建人
+     */
+    @ExcelProperty("创建人")
+    @ApiModelProperty(value = "创建人", dataType = "String")
+    @TableField("create_user")
+    private String createUser;
+
+    /**
+     * 创建时间
+     */
+    @ExcelProperty("创建时间")
+    @ApiModelProperty(value = "创建时间", dataType = "String")
+    private String createTime;
+
+    /**
+     * 更新时间
+     */
+    @ApiModelProperty(value = "更新时间", dataType = "String")
+    private String updateTime;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertRequest.java
index 9a7f6c6..c827915 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertRequest.java
@@ -4,6 +4,8 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * @Description:
  * @Author: wangpeng
@@ -16,4 +18,7 @@
     private String name;
     @ApiModelProperty(value = "部门名", dataType = "String")
     private String deptName;
+
+    @ApiModelProperty(value = "导出ids", dataType = "List")
+    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertResponse.java
index f78b159..8f2f79e 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertResponse.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.dto.resource.staff;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.casic.missiles.annotation.DictCodeField;
 import com.casic.missiles.constants.MeterDictCode;
 import io.swagger.annotations.ApiModel;
@@ -13,12 +20,18 @@
  * @Author: wangpeng
  * @Date: 2023/7/27 15:13
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @ApiModel
 @Data
 public class StaffCertResponse {
     /**
      * 人员编号
      */
+    @ExcelProperty(value = "人员编号",order = 0)
     @NotEmpty(message = "人员编号不能为空")
     @ApiModelProperty(value = "人员编号", dataType = "String")
     private String staffNo;
@@ -26,6 +39,7 @@
     /**
      * 姓名
      */
+    @ExcelProperty(value = "姓名",order = 1)
     @ApiModelProperty(value = "姓名", dataType = "String")
     private String staffName;
 
@@ -54,6 +68,7 @@
     /**
      * 部门名字
      */
+    @ExcelProperty(value = "工作部门",order = 2)
     @ApiModelProperty(value = "部门名字", dataType = "String")
     private String deptName;
 
@@ -66,6 +81,7 @@
     /**
      * 计量专业
      */
+    @ExcelProperty(value = "计量专业",order = 3)
     @ApiModelProperty(value = "计量专业", dataType = "String")
     private String major;
 
@@ -110,6 +126,7 @@
     /**
      * 证书号
      */
+    @ExcelProperty(value = "证号",order = 4)
     @ApiModelProperty(value = "证书号", dataType = "String")
     private String certNo;
 
@@ -122,12 +139,14 @@
     /**
      * 有效日期
      */
+    @ExcelProperty(value = "证书有效期",order = 6)
     @ApiModelProperty(value = "有效日期", dataType = "String")
     private String effectiveDate;
 
     /**
      * 发放日期
      */
+    @ExcelProperty(value = "发证日期",order = 5)
     @ApiModelProperty(value = "发放日期", dataType = "String")
     private String grantDate;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffListRequest.java
index 7c4afb3..0a1194a 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffListRequest.java
@@ -4,6 +4,8 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * @Description:
  * @Author: wangpeng
@@ -18,4 +20,7 @@
     private String deptName;
     @ApiModelProperty(value = "部门id", dataType = "Long")
     private Long deptId;
+
+    @ApiModelProperty(value = "导出ids", dataType = "List")
+    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/TrainListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/TrainListRequest.java
index f68597b..6321f8b 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/TrainListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/TrainListRequest.java
@@ -14,6 +14,8 @@
 public class TrainListRequest {
     @ApiModelProperty(value = "训练登记表编号", dataType = "String")
     private String trainNo;
+    @ApiModelProperty(value = "值班领导", dataType = "String")
+    private String dutyLeader;
     @ApiModelProperty(value = "创建开始时间", dataType = "String")
     private String createTimeStart;
     @ApiModelProperty(value = "创建结束时间", dataType = "String")
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/SignAddRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/SignAddRequest.java
index 117be34..d71055c 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/SignAddRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/SignAddRequest.java
@@ -43,13 +43,6 @@
     private Long signUserId;
 
     /**
-     * 签章或签名-字典code
-     */
-    @NotBlank(message = "类型不能为空")
-    @ApiModelProperty(value = "签名/签章-字典code", dataType = "String", required = true)
-    private String signType;
-
-    /**
      * minio存储文件名
      */
     @ApiModelProperty(value = "上传文件返回名称", dataType = "String")
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateAddRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateAddRequest.java
index aff1265..6316648 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateAddRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateAddRequest.java
@@ -17,30 +17,28 @@
 @Data
 public class TemplateAddRequest extends BaseSystemRequest {
     /**
-     * 原始记录模板/证书报告模板名称
+     * 模板名称
      */
     @ApiModelProperty(value = "名称", dataType = "String", required = true)
     @NotBlank(message = "名称不能为空")
     private String templateName;
 
     /**
-     * 原始记录模板/证书报告模板描述
+     * 模板描述
      */
     @ApiModelProperty(value = "描述", dataType = "String")
     private String templateDesc;
 
     /**
-     * 原始记录模板/证书报告模板创建人
+     * 创建人
      */
     @ApiModelProperty(value = "创建人", dataType = "String", required = true)
     @NotBlank(message = "创建人不能为空")
     private String templateCreator;
 
-    /**
-     * 原始记录模板/证书报告模板-字典code
-     */
-    @NotBlank(message = "类型不能为空")
-    @ApiModelProperty(value = "原始记录模板/证书报告模板-字典code", dataType = "String", required = true)
+
+    @NotBlank(message = "模板类型不能为空")
+    @ApiModelProperty(value = "模板类型(字典code)", dataType = "String", required = true)
     private String templateType;
 
     /**
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateListRequest.java
index eec5a1e..6d17bbe 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateListRequest.java
@@ -1,11 +1,12 @@
 package com.casic.missiles.dto.system;
 
+import com.casic.missiles.annotation.DictCodeField;
+import com.casic.missiles.constants.MeterDictCode;
 import com.casic.missiles.dto.BaseSystemRequest;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import javax.validation.constraints.NotBlank;
 import java.util.List;
 
 /**
@@ -19,8 +20,8 @@
     /**
      * 类型
      */
-//    @ApiModelProperty(value = "类型-字典code", dataType = "String", required = true)
-    @NotBlank(message = "类型不能为空")
+    @DictCodeField(message = "模板类型不合法", cacheName = MeterDictCode.TEMPLATE_TYPE)
+    @ApiModelProperty(value = "模板类型(字典code)", dataType = "String")
     private String templateType;
 
     /**
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificateChangeApply.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificateChangeApply.java
index 9216308..36923fd 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificateChangeApply.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificateChangeApply.java
@@ -1,11 +1,19 @@
 package com.casic.missiles.model.business;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 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 com.casic.missiles.dto.BaseRequest;
+import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -20,6 +28,12 @@
  * @author wangpeng
  * @since 2023-08-15
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
+@ApiModel
 @Data
 @TableName("biz_business_certificate_change_apply")
 public class BizBusinessCertificateChangeApply extends BaseRequest implements Serializable {
@@ -33,6 +47,7 @@
     /**
      * 申请单编号
      */
+    @ExcelProperty(value = "申请单编号", order = 1)
     @ApiModelProperty(value = "申请单编号", dataType = "String")
     @TableField("change_apply_no")
     private String changeApplyNo;
@@ -40,6 +55,7 @@
     /**
      * 申请单名字
      */
+    @ExcelProperty(value = "申请单名称", order = 2)
     @ApiModelProperty(value = "申请单名字", dataType = "String")
     @TableField("change_apply_name")
     private String changeApplyName;
@@ -54,6 +70,7 @@
     /**
      * 更换证书编号
      */
+    @ExcelProperty(value = "更换证书编号", order = 3)
     @ApiModelProperty(value = "更换证书编号", dataType = "String")
     @TableField("change_report_no")
     private String changeReportNo;
@@ -61,7 +78,8 @@
     /**
      * 更换证书名字
      */
-    @ApiModelProperty(value = "更换证书名字", dataType = "String")
+    @ExcelProperty(value = "更换证书/报告名称", order = 4)
+    @ApiModelProperty(value = "更换证书/报告名称", dataType = "String")
     @TableField("change_report_name")
     private String changeReportName;
 
@@ -73,6 +91,7 @@
     @TableField("change_type")
     private String changeType;
 
+    @ExcelProperty(value = "变更类型", order = 5)
     @ApiModelProperty(value = "变更类型(字典value)", dataType = "String")
     @TableField(exist = false)
     private String changeTypeName;
@@ -142,13 +161,15 @@
     /**
      * 创建用户名字
      */
-    @ApiModelProperty(value = "创建用户名字", dataType = "String")
+    @ExcelProperty(value = "创建人", order = 6)
+    @ApiModelProperty(value = "创建人名字", dataType = "String")
     @TableField("create_user_name")
     private String createUserName;
 
     /**
      * 创建时间
      */
+    @ExcelProperty(value = "创建时间", order = 7)
     @ApiModelProperty(value = "创建时间", dataType = "String")
     @TableField("create_time")
     private String createTime;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificateReport.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificateReport.java
index f01db9e..db06018 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificateReport.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificateReport.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.model.business;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -22,6 +29,11 @@
  * @author wangpeng
  * @since 2023-08-14
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @ApiModel
 @Data
 @TableName("biz_business_certificate_report")
@@ -36,6 +48,7 @@
     /**
      * 证书报告编号
      */
+    @ExcelProperty(value = "证书报告编号", order = 1)
     @ApiModelProperty(value = "证书报告编号", dataType = "String")
     @TableField("certificate_report_no")
     private String certificateReportNo;
@@ -43,6 +56,7 @@
     /**
      * 证书报告名称
      */
+    @ExcelProperty(value = "证书报告名称", order = 2)
     @ApiModelProperty(value = "证书报告名称", dataType = "String")
     @TableField("certificate_report_name")
     private String certificateReportName;
@@ -62,6 +76,7 @@
     @TableField("measure_category")
     private String measureCategory;
 
+    @ExcelProperty(value = "检校类别", order = 6)
     @ApiModelProperty(value = "检校类别(字典value)", dataType = "String")
     @TableField(exist = false)
     private String measureCategoryName;
@@ -69,6 +84,7 @@
     /**
      * 检校时间
      */
+    @ExcelProperty(value = "检校时间", order = 8)
     @ApiModelProperty(value = "检校时间", dataType = "String")
     @TableField("calibration_time")
     private String calibrationTime;
@@ -267,18 +283,22 @@
     @TableField(exist = false)
     private Integer decisionItem;
 
-    @ApiModelProperty(value = "设备样品编号（列表返回参数）", dataType = "String")
+    @ExcelProperty(value = "被检设备统一编号", order = 3)
+    @ApiModelProperty(value = "被检设备统一编号（列表返回参数）", dataType = "String")
     @TableField(exist = false)
     private String sampleNo;
 
-    @ApiModelProperty(value = "设备样品名称（列表返回参数）", dataType = "String")
+    @ExcelProperty(value = "被检设备名称", order = 4)
+    @ApiModelProperty(value = "被检设备名称（列表返回参数）", dataType = "String")
     @TableField(exist = false)
     private String sampleName;
 
-    @ApiModelProperty(value = "设备样品规格型号（列表返回参数）", dataType = "String")
+    @ExcelProperty(value = "规格型号", order = 5)
+    @ApiModelProperty(value = "规格型号（列表返回参数）", dataType = "String")
     @TableField(exist = false)
     private String sampleModel;
 
+    @ExcelProperty(value = "检定员", order = 7)
     @ApiModelProperty(value = "检定员名字（列表返回参数）", dataType = "String")
     @TableField(exist = false)
     private String staffName;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessIdentifyInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessIdentifyInfo.java
index 46bfba5..f1a9bec 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessIdentifyInfo.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessIdentifyInfo.java
@@ -1,10 +1,15 @@
 package com.casic.missiles.model.business;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 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;
 
@@ -20,6 +25,11 @@
  * @author wangpeng
  * @since 2023-08-15
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @Data
 @TableName("biz_business_identify_info")
 public class BizBusinessIdentifyInfo implements Serializable {
@@ -33,6 +43,7 @@
     /**
      * 记录编号
      */
+    @ExcelProperty(value = "记录编号", order = 1)
     @ApiModelProperty(value = "记录编号", dataType = "String")
     @TableField("record_no")
     private String recordNo;
@@ -41,20 +52,15 @@
      * 标志类型(字典code)
      */
     @NotEmpty(message = "标志类型不能为空")
-    @ApiModelProperty(value = "标志类型(字典code)", dataType = "String")
-    @DictCodeField(message = "标志类型不合法", cacheName = MeterDictCode.IDENTIFY_PRINT_TYPE)
+    @ApiModelProperty(value = "标志类型(直接存计量标识/使用状态/校准状态的字典value)", dataType = "String")
     @TableField("identify_type")
     private String identifyType;
 
-    @ApiModelProperty(value = "标志类型(字典value)", dataType = "String")
-    @TableField(exist = false)
-    private String identifyTypeName;
-
     /**
      * 设备id(可以是受检设备/设备台账)
      */
     @NotNull(message = "设备id不能为空")
-    @ApiModelProperty(value = "设备id(可以是受检设备/设备台账)", dataType = "String")
+    @ApiModelProperty(value = "设备id(可以是受检设备/设备台账)", dataType = "Long")
     @TableField("device_id")
     private Long deviceId;
 
@@ -66,29 +72,32 @@
     @TableField("device_type")
     private String deviceType;
 
+    @ExcelProperty(value = "统一编号", order = 3)
     @NotEmpty(message = "设备编号不能为空")
-    @ApiModelProperty(value = "设备编号", dataType = "String")
+    @ApiModelProperty(value = "统一编号", dataType = "String")
     @TableField("device_no")
     private String deviceNo;
 
     /**
      * 设备名字
      */
-    @NotEmpty(message = "设备名字不能为空")
-    @ApiModelProperty(value = "设备名字", dataType = "String")
+    @ExcelProperty(value = "设备名称", order = 4)
+    @NotEmpty(message = "设备名称不能为空")
+    @ApiModelProperty(value = "设备名称", dataType = "String")
     @TableField("device_name")
     private String deviceName;
 
     /**
      * 检定员id
      */
-    @ApiModelProperty(value = "检定员id", dataType = "String")
+    @ApiModelProperty(value = "检定员id", dataType = "Long")
     @TableField("measure_person_id")
     private Long measurePersonId;
 
     /**
      * 检定员名字
      */
+    @ExcelProperty(value = "检定员", order = 5)
     @ApiModelProperty(value = "检定员名字", dataType = "String")
     @TableField("measure_person")
     private String measurePerson;
@@ -103,7 +112,8 @@
     /**
      * 更新时间
      */
-    @ApiModelProperty(value = "更新时间", dataType = "String")
+    @ExcelProperty(value = "打印时间", order = 6)
+    @ApiModelProperty(value = "打印时间", dataType = "String")
     @TableField("update_time")
     private String updateTime;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceAssess.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceAssess.java
index 659d9ca..6720b90 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceAssess.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceAssess.java
@@ -1,11 +1,26 @@
 package com.casic.missiles.model.business;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 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 com.casic.missiles.dto.BaseRequest;
+import com.casic.missiles.dto.business.outsource.OrderSampleDTO;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import javax.validation.constraints.NotEmpty;
 import java.io.Serializable;
+import java.util.List;
 
 /**
  * <p>
@@ -15,146 +30,231 @@
  * @author wangpeng
  * @since 2023-08-16
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
+@ApiModel
 @Data
 @TableName("biz_business_outsource_assess")
-public class BizBusinessOutsourceAssess implements Serializable {
+public class BizBusinessOutsourceAssess extends BaseRequest implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
+    @ApiModelProperty(value = "id，更新/删除使用参数", dataType = "Long")
     @TableId("id")
     private Long id;
 
     /**
      * 评审表编号
      */
+    @ExcelProperty(value = "评审表编号", order = 1)
+    @ApiModelProperty(value = "评审表编号(后台生成)", dataType = "String")
     @TableField("project_no")
     private String projectNo;
 
     /**
      * 评审表名称
      */
+    @ExcelProperty(value = "评审表名称", order = 2)
+    @ApiModelProperty(value = "评审表名称", dataType = "String")
     @TableField("project_name")
     private String projectName;
 
+    @NotEmpty(message = "实验室代码不能为空")
+    @DictCodeField(message = "实验室代码描述不合法", cacheName = MeterDictCode.LAB_CODE)
+    @ApiModelProperty(value = "实验室代码(字典code)", dataType = "String")
+    @TableField("lab_code")
+    private String labCode;
+
+    @ApiModelProperty(value = "实验室代码(字典value)", dataType = "String")
+    @TableField(exist = false)
+    private String labCodeName;
+
+    /**
+     * 组别代码
+     */
+    @NotEmpty(message = "组别代码不能为空")
+    @DictCodeField(message = "组别代码描述不合法", cacheName = MeterDictCode.GROUP_CODE)
+    @ApiModelProperty(value = "组别代码(字典code)", dataType = "String")
+    @TableField("group_code")
+    private String groupCode;
+
+    @ApiModelProperty(value = "组别代码(字典value)", dataType = "String")
+    @TableField(exist = false)
+    private String groupCodeName;
+
     /**
      * 申请人id
      */
+    @ApiModelProperty(value = "申请人id", dataType = "String")
     @TableField("applicant_id")
     private Long applicantId;
 
     /**
      * 申请人名字
      */
+    @ExcelProperty(value = "申请人", order = 5)
+    @ApiModelProperty(value = "申请人", dataType = "String")
     @TableField("applicant_name")
     private String applicantName;
 
     /**
      * 申请时间
      */
+    @ExcelProperty(value = "申请时间", order = 6)
+    @ApiModelProperty(value = "申请时间", dataType = "String")
     @TableField("applicant_time")
     private String applicantTime;
 
     /**
      * 附件(minio存储文件名)
      */
+    @ApiModelProperty(value = "附件(minio存储文件名)", dataType = "String")
     @TableField("minio_file_name")
     private String minioFileName;
 
     /**
      * 备注
      */
+    @ApiModelProperty(value = "备注", dataType = "String")
     @TableField("remark")
     private String remark;
 
     /**
      * 创建人id
      */
+    @ApiModelProperty(value = "创建人id", dataType = "String")
     @TableField("create_user_id")
     private Long createUserId;
 
     /**
      * 创建人名字
      */
+    @ApiModelProperty(value = "创建人名字", dataType = "String")
     @TableField("create_user_name")
     private String createUserName;
 
     /**
      * 分包方id
      */
+    @ApiModelProperty(value = "评审表编号", dataType = "String")
     @TableField("outsourcer_id")
     private Long outsourcerId;
 
     /**
      * 预计开始时间
      */
+    @ApiModelProperty(value = "预计开始时间", dataType = "String")
     @TableField("pre_start_time")
     private String preStartTime;
 
     /**
      * 预计结束时间
      */
+    @ApiModelProperty(value = "预计结束时间", dataType = "String")
     @TableField("pre_end_time")
     private String preEndTime;
 
     /**
      * 分包原因-字典
      */
+    @ApiModelProperty(value = "分包原因(字典code)", dataType = "String")
+    @DictCodeField(message = "分包原因描述不合法", cacheName = MeterDictCode.OUTSOURCE_REASON)
     @TableField("outsource_reason")
     private String outsourceReason;
 
+    @ApiModelProperty(value = "分包原因(字典value)", dataType = "String")
+    @TableField(exist = false)
+    private String outsourceReasonName;
+
     /**
      * 预计费用
      */
+    @ApiModelProperty(value = "预计费用", dataType = "String")
     @TableField("pre_cost")
     private String preCost;
 
     /**
      * 审批状态
      */
+    @ApiModelProperty(value = "审批状态", dataType = "String")
+    @DictCodeField(message = "审批状态描述不合法", cacheName = MeterDictCode.APPROVAL_STATUS)
     @TableField("approval_status")
     private String approvalStatus;
 
     /**
      * 流程实例id
      */
+    @ApiModelProperty(value = "流程实例id", dataType = "String")
     @TableField("process_id")
     private String processId;
 
     /**
      * 实验室认可情况
      */
+    @ApiModelProperty(value = "实验室认可情况", dataType = "String")
     @TableField("approve_situation")
     private String approveSituation;
 
     /**
      * 溯源性
      */
+    @ApiModelProperty(value = "溯源性", dataType = "String")
     @TableField("traceability")
     private String traceability;
 
     /**
      * 测试方法
      */
+    @ApiModelProperty(value = "测试方法", dataType = "String")
     @TableField("test_method")
     private String testMethod;
 
     /**
      * 技术能力
      */
+    @ApiModelProperty(value = "技术能力", dataType = "String")
     @TableField("technique_ability")
     private String techniqueAbility;
 
     /**
      * 创建时间
      */
+    @ApiModelProperty(hidden = true)
     @TableField("create_time")
     private String createTime;
 
     /**
      * 更新时间
      */
+    @ApiModelProperty(hidden = true)
     @TableField("update_time")
     private String updateTime;
 
+    @ApiModelProperty(value = "审批状态类型-字典value", dataType = "String")
+    @TableField(exist = false)
+    private String approvalStatusName;
 
+    @ApiModelProperty(value = "任务id（同意、驳回等操作使用）", dataType = "String")
+    @TableField(exist = false)
+    private String taskId;
+
+    @ApiModelProperty(value = "可选决策项（1同意驳回拒绝 2同意驳回 3同意拒绝，用于待审批列表同意/驳回/拒绝按钮展示）", dataType = "Integer")
+    @TableField(exist = false)
+    private Integer decisionItem;
+
+    @NotEmpty(message = "受检设备信息不能为空")
+    @ApiModelProperty(value = "受检设备id列表（新建使用参数）", dataType = "List")
+    @TableField(exist = false)
+    private List<OrderSampleDTO> orderSampleList;
+
+    @ExcelProperty(value = "分包机构名称", order = 3)
+    @ApiModelProperty(value = "分包机构名称（列表返回参数）", dataType = "String")
+    private String outsourcerName;
+
+    @ExcelProperty(value = "机构负责人", order = 4)
+    @ApiModelProperty(value = "机构负责人（列表返回参数）", dataType = "String")
+    private String director;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceProtocol.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceProtocol.java
new file mode 100644
index 0000000..38df697
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceProtocol.java
@@ -0,0 +1,225 @@
+package com.casic.missiles.model.business;
+
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
+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 com.casic.missiles.dto.BaseRequest;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotEmpty;
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 计量检定业务-分包管理-测试、校准或检定工作分包协议书
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-08-24
+ */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
+@Data
+@TableName("biz_business_outsource_protocol")
+public class BizBusinessOutsourceProtocol extends BaseRequest implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "id，更新/删除使用参数", dataType = "Long")
+    @TableId("id")
+    private Long id;
+
+    /**
+     * 协议书编号
+     */
+    @ExcelProperty(value = "协议书编号", order = 1)
+    @ApiModelProperty(value = "协议书编号(后台生成)", dataType = "String")
+    @TableField("protocol_no")
+    private String protocolNo;
+
+    /**
+     * 协议书名称
+     */
+    @ExcelProperty(value = "协议书名称", order = 2)
+    @ApiModelProperty(value = "协议书名称", dataType = "String")
+    @TableField("project_name")
+    private String projectName;
+
+    @NotEmpty(message = "实验室代码不能为空")
+    @DictCodeField(message = "实验室代码描述不合法", cacheName = MeterDictCode.LAB_CODE)
+    @ApiModelProperty(value = "实验室代码(字典code)", dataType = "String")
+    @TableField("lab_code")
+    private String labCode;
+
+    @ApiModelProperty(value = "实验室代码(字典value)", dataType = "String")
+    @TableField(exist = false)
+    private String labCodeName;
+
+    @NotEmpty(message = "组别代码不能为空")
+    @DictCodeField(message = "组别代码描述不合法", cacheName = MeterDictCode.GROUP_CODE)
+    @ApiModelProperty(value = "组别代码(字典code)", dataType = "String")
+    @TableField("group_code")
+    private String groupCode;
+
+    @ApiModelProperty(value = "组别代码(字典value)", dataType = "String")
+    @TableField(exist = false)
+    private String groupCodeName;
+
+    /**
+     * 分包方id
+     */
+    @ApiModelProperty(value = "分包方id", dataType = "Long")
+    @TableField("outsourcer_id")
+    private Long outsourcerId;
+
+    /**
+     * 其他
+     */
+    @ApiModelProperty(value = "其他", dataType = "String")
+    @TableField("remark")
+    private String remark;
+
+    /**
+     * 分包方编号
+     */
+    @ApiModelProperty(value = "分包方编号(新建不用传)", dataType = "String")
+    @TableField("outsource_no")
+    private String outsourceNo;
+
+    /**
+     * 分包方名称
+     */
+    @ExcelProperty(value = "分包方名称", order = 3)
+    @ApiModelProperty(value = "分包方名称(新建不用传)", dataType = "String")
+    @TableField("outsource_name")
+    private String outsourceName;
+
+    /**
+     * 联系人
+     */
+    @ExcelProperty(value = "联系人", order = 4)
+    @ApiModelProperty(value = "联系人", dataType = "String")
+    @TableField("contacts")
+    private String contacts;
+
+    /**
+     * 电话
+     */
+    @ApiModelProperty(value = "电话", dataType = "String")
+    @TableField("mobile")
+    private String mobile;
+
+    /**
+     * 地址
+     */
+    @ApiModelProperty(value = "地址", dataType = "String")
+    @TableField("address")
+    private String address;
+
+    /**
+     * 要求完成日期
+     */
+    @ApiModelProperty(value = "要求完成日期", dataType = "String")
+    @TableField("require_date")
+    private String requireDate;
+
+    /**
+     * 分包费用(元)
+     */
+    @ApiModelProperty(value = "分包费用(元)", dataType = "String")
+    @TableField("outsource_cost")
+    private Double outsourceCost;
+
+    /**
+     * 分包方负责人
+     */
+    @ApiModelProperty(value = "分包方负责人", dataType = "String")
+    @TableField("director")
+    private String director;
+
+    /**
+     * 分包项目
+     */
+    @ApiModelProperty(value = "分包项目", dataType = "String")
+    @TableField("item")
+    private String item;
+
+    /**
+     * 分包要求
+     */
+    @ApiModelProperty(value = "分包要求", dataType = "String")
+    @TableField("requires")
+    private String requires;
+
+    /**
+     * 创建人id
+     */
+    @ApiModelProperty(hidden = true)
+    @TableField("create_user_id")
+    private Long createUserId;
+
+    /**
+     * 创建人名字
+     */
+    @ExcelProperty(value = "申请人", order = 5)
+    @ApiModelProperty(value = "申请人", dataType = "String")
+    @TableField("create_user_name")
+    private String createUserName;
+
+    /**
+     * 审批状态
+     */
+    @ApiModelProperty(value = "审批状态", dataType = "String")
+    @DictCodeField(message = "审批状态描述不合法", cacheName = MeterDictCode.APPROVAL_STATUS)
+    @TableField("approval_status")
+    private String approvalStatus;
+
+    /**
+     * 流程实例id
+     */
+    @ApiModelProperty(value = "流程实例id", dataType = "String")
+    @TableField("process_id")
+    private String processId;
+
+    /**
+     * 创建时间
+     */
+    @ExcelProperty(value = "申请时间", order = 6)
+    @ApiModelProperty(value = "申请时间", dataType = "String")
+    @TableField("create_time")
+    private String createTime;
+
+    /**
+     * 更新时间
+     */
+    @ApiModelProperty(hidden = true)
+    @TableField("update_time")
+    private String updateTime;
+
+    @ApiModelProperty(value = "审批状态类型-字典value", dataType = "String")
+    @TableField(exist = false)
+    private String approvalStatusName;
+
+    @ApiModelProperty(value = "任务id（同意、驳回等操作使用）", dataType = "String")
+    @TableField(exist = false)
+    private String taskId;
+
+    @ApiModelProperty(value = "可选决策项（1同意驳回拒绝 2同意驳回 3同意拒绝，用于待审批列表同意/驳回/拒绝按钮展示）", dataType = "Integer")
+    @TableField(exist = false)
+    private Integer decisionItem;
+
+
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourcerInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourcerInfo.java
index ec4e997..f9aa69e 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourcerInfo.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourcerInfo.java
@@ -17,6 +17,7 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import javax.validation.constraints.NotEmpty;
 import java.io.Serializable;
 
 /**
@@ -59,6 +60,29 @@
     @TableField("outsourcer_name")
     private String outsourcerName;
 
+    @NotEmpty(message = "实验室代码不能为空")
+    @DictCodeField(message = "实验室代码描述不合法", cacheName = MeterDictCode.LAB_CODE)
+    @ApiModelProperty(value = "实验室代码(字典code)", dataType = "String")
+    @TableField("lab_code")
+    private String labCode;
+
+    @ApiModelProperty(value = "实验室代码(字典value)", dataType = "String")
+    @TableField(exist = false)
+    private String labCodeName;
+
+    /**
+     * 组别代码
+     */
+    @NotEmpty(message = "组别代码不能为空")
+    @DictCodeField(message = "组别代码描述不合法", cacheName = MeterDictCode.GROUP_CODE)
+    @ApiModelProperty(value = "组别代码(字典code)", dataType = "String")
+    @TableField("group_code")
+    private String groupCode;
+
+    @ApiModelProperty(value = "组别代码(字典value)", dataType = "String")
+    @TableField(exist = false)
+    private String groupCodeName;
+
     /**
      * 单位简称
      */
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardInfo.java
index c48eed7..dffdfdd 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardInfo.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardInfo.java
@@ -5,6 +5,7 @@
 import com.baomidou.mybatisplus.annotation.TableName;
 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;
 
@@ -18,6 +19,7 @@
  * @author wangpeng
  * @since 2023-08-04
  */
+@ApiModel
 @Data
 @TableName("biz_equipment_standard_info")
 public class BizEquipmentStandardInfo implements Serializable {
@@ -119,7 +121,7 @@
      * 管理状态(字典code)
      */
     @ApiModelProperty(value = "管理状态(字典code)", dataType = "String")
-    @DictCodeField(message = "管理状态不合法", cacheName = MeterDictCode.MANAGER_STATE)
+    @DictCodeField(message = "管理状态不合法", cacheName = MeterDictCode.STANDARD_MANAGER_STATE)
     @TableField("manage_status")
     private String manageStatus;
 
@@ -151,7 +153,7 @@
     /**
      * 温度(℃)
      */
-    @ApiModelProperty(value = "使用状态(字典code)", dataType = "String")
+    @ApiModelProperty(value = "温度(℃)", dataType = "String")
     @TableField("temperature")
     private Double temperature;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardInfoApproval.java b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardInfoApproval.java
index dbd86ab..9f58d83 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardInfoApproval.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardInfoApproval.java
@@ -150,7 +150,7 @@
      * 管理状态(字典code)
      */
     @ApiModelProperty(value = "管理状态(字典code)", dataType = "String")
-    @DictCodeField(message = "管理状态不合法", cacheName = MeterDictCode.MANAGER_STATE)
+    @DictCodeField(message = "管理状态不合法", cacheName = MeterDictCode.STANDARD_MANAGER_STATE)
     @TableField("manage_status")
     private String manageStatus;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardTechnologyRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardTechnologyRelation.java
index 0e612bd..751f26b 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardTechnologyRelation.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardTechnologyRelation.java
@@ -3,6 +3,7 @@
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -16,6 +17,7 @@
  * @author wangpeng
  * @since 2023-08-04
  */
+@ApiModel
 @Data
 @TableName("biz_equipment_standard_technology_relation")
 public class BizEquipmentStandardTechnologyRelation implements Serializable {
@@ -33,6 +35,10 @@
     @TableField("technology_file_id")
     private Long technologyFileId;
 
+    @ApiModelProperty(value = "依据的技术文件编号", dataType = "String")
+    @TableField("technology_file_no")
+    private String technologyFileNo;
+
     /**
      * 依据的技术文件名称(技术文件中现行测试校准检定方法表文件名字段)
      */
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerInfo.java
index d6e8bed..65cd6bc 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerInfo.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerInfo.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.model.resource;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -21,6 +28,11 @@
  * @author wangpeng
  * @since 2023-08-08
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @ApiModel
 @Data
 @TableName("biz_resource_customer_info")
@@ -35,6 +47,7 @@
     /**
      * 委托方编号
      */
+    @ExcelProperty(value = "委托方编号", order = 1)
     @ApiModelProperty(value = "委托方编号", dataType = "String")
     @TableField("customer_no")
     private String customerNo;
@@ -42,6 +55,7 @@
     /**
      * 委托方名称
      */
+    @ExcelProperty(value = "委托方名称", order = 2)
     @ApiModelProperty(value = "委托方名称(新建时为下拉选择一个受检单位组织的名字，传deptId字段，后端获取名称)", dataType = "String")
     @TableField("customer_name")
     private String customerName;
@@ -63,6 +77,7 @@
     /**
      * 联系人
      */
+    @ExcelProperty(value = "联系人", order = 3)
     @ApiModelProperty(value = "联系人", dataType = "String")
     @TableField("contacts")
     private String contacts;
@@ -70,6 +85,7 @@
     /**
      * 座机电话
      */
+    @ExcelProperty(value = "座机电话", order = 4)
     @ApiModelProperty(value = "座机电话", dataType = "String")
     @TableField("mobile")
     private String mobile;
@@ -77,6 +93,7 @@
     /**
      * 手机号码
      */
+    @ExcelProperty(value = "手机号码", order = 5)
     @ApiModelProperty(value = "手机号码", dataType = "String")
     @TableField("phone")
     private String phone;
@@ -91,6 +108,7 @@
     /**
      * 地址
      */
+    @ExcelProperty(value = "地址", order = 6)
     @ApiModelProperty(value = "地址", dataType = "String")
     @TableField("address")
     private String address;
@@ -141,6 +159,7 @@
     /**
      * 创建时间
      */
+    @ExcelProperty(value = "创建时间", order = 7)
     @ApiModelProperty(value = "创建时间", dataType = "String")
     @TableField("create_time")
     private String createTime;

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java
index bb0c50f..13a699b 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java
@@ -12,6 +12,7 @@
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.IGeneralApprovalService;
+import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
@@ -19,6 +20,7 @@
 import org.springframework.web.bind.annotation.RequestBody;
 
 import javax.validation.Valid;
+import java.util.List;
 import java.util.Objects;
 
 /**
@@ -117,4 +119,17 @@
         }
         return baseApprovalService.failUpdate(request);
     }
+
+    public List<O> exportList(@RequestBody @Valid R request) throws Exception {
+        List<O> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = baseApprovalService.listExportByIds(request.getIds());
+        } else {
+            list = baseApprovalService.listExport(request);
+        }
+        for (O record : list) {
+            DictCodeUtils.convertDictCodeToName(record);
+        }
+        return list;
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java
index 8a90961..d775831 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java
@@ -5,6 +5,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.business.certificate.CertificateChangeApplyApprovalListRequest;
 import com.casic.missiles.dto.business.certificate.CertificateChangeApplySaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessCertificateChangeApply;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
@@ -20,6 +21,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -48,4 +50,12 @@
         }
         return changeApplyService.saveChangeApply(request);
     }
+
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody CertificateChangeApplyApprovalListRequest request) throws Exception {
+        List<BizBusinessCertificateChangeApply> list = super.exportList(request);
+        super.exportExcel(BizBusinessCertificateChangeApply.class, list, ExportEnum.CERTIFICATE_CHANGE_APPLY.getSheetName());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java
index 5fc4b07..af8230e 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java
@@ -9,6 +9,7 @@
 import com.casic.missiles.dto.business.certificate.CertificatePrintApprovalListRequest;
 import com.casic.missiles.dto.business.certificate.CertificatePrintListResponse;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.enums.business.CertificatePrintStatusEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessCertificatePrintLog;
@@ -18,10 +19,16 @@
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.io.IOException;
+import java.util.List;
 import java.util.Objects;
 
 /**
@@ -98,4 +105,16 @@
         });
         return certificatePrintService.certificatePrintLog(idDTO.getId());
     }
+
+    @ApiOperation("证书打印审批导出")
+    @PostMapping("/listExport")
+    public void exportList(@RequestBody CertificatePrintApprovalListRequest request) throws IOException {
+        List<CertificatePrintListResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = certificatePrintService.listByIds(request.getIds());
+        } else {
+            list = certificatePrintService.list(request);
+        }
+        super.exportExcel(CertificatePrintListResponse.class, list, ExportEnum.CERTIFICATE_PRINT.getSheetName());
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java
index 63b06dc..6b2efd5 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java
@@ -6,6 +6,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.business.certificate.CertificateReportApprovalListRequest;
 import com.casic.missiles.dto.business.certificate.CertificateReportSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessCertificateReport;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
@@ -21,6 +22,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -50,7 +52,7 @@
         return certificateReportService.saveCertificateReport(request);
     }
 
-    @ApiOperation("证书审批详情（基本信息）")
+    @ApiOperation("详情（基本信息）")
     @PostMapping("/detail")
     public ReturnDTO<BizBusinessCertificateReport> detail(@RequestBody @Valid BaseDetailRequest request, BindingResult bindingResult) throws Exception {
         if(bindingResult.hasErrors()){
@@ -59,4 +61,11 @@
         return certificateReportService.detail(request);
     }
 
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody CertificateReportApprovalListRequest request) throws Exception {
+        List<BizBusinessCertificateReport> list = super.exportList(request);
+        super.exportExcel(BizBusinessCertificateReport.class, list, ExportEnum.CERTIFICATE_REPORT.getSheetName());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java
index 46b26bd..57c0809 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java
@@ -10,20 +10,21 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.business.identify.IdentifyListRequest;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessIdentifyInfo;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.business.IBizBusinessIdentifyInfoService;
+import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import javax.validation.Valid;
+import java.util.List;
 import java.util.Objects;
 
 /**
@@ -57,16 +58,13 @@
         return identifyInfoService.addIdentify(identifyInfo);
     }
 
-    @ApiOperation("标识打印更新")
+    @ApiOperation("标识打印更新（更新打印时间）")
     @PostMapping("/update")
-    public ReturnDTO updateIdentify(@RequestBody @Valid BizBusinessIdentifyInfo identifyInfo, BindingResult bindingResult) {
-        Assert.isFalse(Objects.isNull(identifyInfo.getId()), () -> {
+    public ReturnDTO updateIdentify(@RequestBody @Valid IdDTO idDTO) {
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        Assert.isFalse(bindingResult.hasErrors(), () -> {
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        });
-        return identifyInfoService.updateIdentify(identifyInfo);
+        return identifyInfoService.updateIdentify(idDTO.getId());
     }
 
     @ApiOperation("标识打印删除")
@@ -77,4 +75,37 @@
         });
         return identifyInfoService.deleteIdentify(idDTO.getId());
     }
+
+    @ApiOperation("标识打印导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody @Valid IdentifyListRequest request, BindingResult bindingResult) throws Exception {
+        if (bindingResult.hasErrors()) {
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        List<BizBusinessIdentifyInfo> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = identifyInfoService.listByIds(request.getIds());
+        } else {
+            list = identifyInfoService.list(request);
+        }
+        for (BizBusinessIdentifyInfo record : list) {
+            DictCodeUtils.convertDictCodeToName(record);
+        }
+        super.exportExcel(BizBusinessIdentifyInfo.class, list, ExportEnum.IDENTIFY_EXPORT.getSheetName());
+    }
+
+
+    // TODO: 2023/8/23 查询设备信息，4个底部按钮查设备（按钮的作用就是前端用来调不同接口、用来区分中间即将展示的标识），前端弹窗选设备，在确定保存时前端根据底部按钮判断传入设备类型deviceType字典code
+    // TODO: 2023/8/23 接口：查受检设备（第1个按钮），查设备台账（后3个按钮同一接口），查询之后前端根据标志类型的不同加到中间页面时进行判断（按产品给的对应表）
+    // TODO: 2023/8/23 提供二维码接口，前端在加到中间页面时调用一下
+
+    @ApiOperation("设备二维码")
+    @PostMapping("/equipment/qrCode")
+    public ReturnDTO<String> equipmentQrCode(@RequestBody @Valid IdDTO idDTO) {
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return identifyInfoService.equipmentQrCode(idDTO.getId());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java
index 707be6e..7e0453d 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java
@@ -117,7 +117,7 @@
     }
 
     @ApiOperation("任务单导出")
-    @PostMapping("/export")
+    @PostMapping("/listExport")
     public void orderExport(@RequestBody @Valid OrderListRequest request, HttpServletResponse response) {
         businessOrderService.orderExport(request, response);
     }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java
index 529a6ce..51432be 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java
@@ -1,9 +1,28 @@
 package com.casic.missiles.controller.business;
 
+import com.casic.missiles.controller.GeneralApprovalController;
+import com.casic.missiles.dto.BaseApprovalSubmitRequest;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.business.outsource.OutsourceAssessApprovalListRequest;
+import com.casic.missiles.dto.business.outsource.OutsourceAssessSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
+import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.model.business.BizBusinessOutsourceAssess;
+import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
+import com.casic.missiles.service.IGeneralApprovalService;
+import com.casic.missiles.service.business.IBizBusinessOutsourceAssessService;
 import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.BindingResult;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.validation.Valid;
+import java.util.List;
+
 /**
  * <p>
  * 计量检定业务-分包管理-测试、校准或检定工作分包评审表 前端控制器
@@ -15,6 +34,27 @@
 @Api(tags = "分包管理-测试、校准或检定工作分包评审表")
 @RestController
 @RequestMapping("/business/outsource/assess")
-public class BizBusinessOutsourceAssessController {
+public class BizBusinessOutsourceAssessController extends GeneralApprovalController<BizBusinessOutsourceAssess, BizBusinessOutsourceAssess, OutsourceAssessApprovalListRequest, BaseApprovalSubmitRequest> {
+    @Autowired
+    private IBizBusinessOutsourceAssessService outsourceAssessService;
 
+    public BizBusinessOutsourceAssessController(IGeneralApprovalService<BizBusinessOutsourceAssess, BizBusinessOutsourceAssess, OutsourceAssessApprovalListRequest, BaseApprovalSubmitRequest> baseApprovalService) {
+        super(baseApprovalService);
+    }
+
+    @ApiOperation("草稿箱-保存")
+    @PostMapping("/save")
+    public ReturnDTO<OutsourceAssessSaveResponse> saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceAssess request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        return outsourceAssessService.saveOutsourceAssess(request);
+    }
+
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception {
+        List<BizBusinessOutsourceAssess> list = super.exportList(request);
+        super.exportExcel(BizBusinessOutsourceAssess.class, list, ExportEnum.OUTSOURCE_ASSESS.getSheetName());
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java
new file mode 100644
index 0000000..9adef18
--- /dev/null
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java
@@ -0,0 +1,60 @@
+package com.casic.missiles.controller.business;
+
+import com.casic.missiles.controller.GeneralApprovalController;
+import com.casic.missiles.dto.BaseApprovalSubmitRequest;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.business.outsource.OutsourceProtocolApprovalListRequest;
+import com.casic.missiles.dto.business.outsource.OutsourceProtocolSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
+import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.model.business.BizBusinessOutsourceProtocol;
+import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
+import com.casic.missiles.service.IGeneralApprovalService;
+import com.casic.missiles.service.business.IBizBusinessOutsourceProtocolService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.BindingResult;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.validation.Valid;
+import java.util.List;
+
+/**
+ * <p>
+ * 计量检定业务-分包管理-测试、校准或检定工作分包协议书 前端控制器
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-08-24
+ */
+@Api(tags = "分包管理-测试、校准或检定工作分包协议书")
+@RestController
+@RequestMapping("/business/outsource/protocol")
+public class BizBusinessOutsourceProtocolController extends GeneralApprovalController<BizBusinessOutsourceProtocol, BizBusinessOutsourceProtocol, OutsourceProtocolApprovalListRequest, BaseApprovalSubmitRequest> {
+    @Autowired
+    private IBizBusinessOutsourceProtocolService outsourceProtocolService;
+
+    public BizBusinessOutsourceProtocolController(IGeneralApprovalService<BizBusinessOutsourceProtocol, BizBusinessOutsourceProtocol, OutsourceProtocolApprovalListRequest, BaseApprovalSubmitRequest> baseApprovalService) {
+        super(baseApprovalService);
+    }
+
+    @ApiOperation("草稿箱-保存")
+    @PostMapping("/save")
+    public ReturnDTO<OutsourceProtocolSaveResponse> saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceProtocol request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        return outsourceProtocolService.saveOutsourceProtocol(request);
+    }
+
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody OutsourceProtocolApprovalListRequest request) throws Exception {
+        List<BizBusinessOutsourceProtocol> list = super.exportList(request);
+        super.exportExcel(BizBusinessOutsourceProtocol.class, list, ExportEnum.OUTSOURCE_PROTOCOL.getSheetName());
+    }
+}
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java
index 097f645..f0f0943 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java
@@ -17,7 +17,6 @@
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.IGeneralApprovalService;
 import com.casic.missiles.service.business.IBizBusinessOutsourcerInfoService;
-import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -71,19 +70,8 @@
 
     @ApiOperation("分包方导出")
     @PostMapping("/listExport")
-    public void export(@RequestBody @Valid OutsourcerInfoApprovalListRequest request, BindingResult bindingResult) throws Exception {
-        if (bindingResult.hasErrors()) {
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        }
-        List<BizBusinessOutsourcerInfo> list;
-        if (!CollectionUtils.isEmpty(request.getIds())) {
-            list = outsourcerInfoService.listByIds(request.getIds());
-        } else {
-            list = outsourcerInfoService.list(request);
-        }
-        for (BizBusinessOutsourcerInfo record : list) {
-            DictCodeUtils.convertDictCodeToName(record);
-        }
+    public void export(@RequestBody OutsourcerInfoApprovalListRequest request) throws Exception {
+        List<BizBusinessOutsourcerInfo> list = super.exportList(request);
         super.exportExcel(BizBusinessOutsourcerInfo.class, list, ExportEnum.OUTSOURCER_EXPORT.getSheetName());
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java
index c2cbf9f..0410918 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java
@@ -17,11 +17,9 @@
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.IGeneralApprovalService;
 import com.casic.missiles.service.business.IBizBusinessSiteExecutiveInfoService;
-import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -60,7 +58,7 @@
         return siteExecutiveInfoService.saveSiteExecutiveInfo(siteExecutiveInfo);
     }
 
-    @ApiOperation("现场检测详情")
+    @ApiOperation("详情")
     @PostMapping("/detail")
     public ReturnDTO<SiteExecutiveDetailResponse> siteExecutiveDetail(@RequestBody @Valid IdDTO idDTO) throws Exception {
         Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
@@ -69,21 +67,10 @@
         return ReturnUtil.success(siteExecutiveInfoService.detail(idDTO.getId()));
     }
 
-    @ApiOperation("现场检测导出")
+    @ApiOperation("导出")
     @PostMapping("/listExport")
-    public void export(@RequestBody @Valid SiteExecutiveApprovalListRequest request, BindingResult bindingResult) throws Exception {
-        if (bindingResult.hasErrors()) {
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        }
-        List<SiteExecutiveApprovalListResponse> list;
-        if (!CollectionUtils.isEmpty(request.getIds())) {
-            list = siteExecutiveInfoService.listInfoByIds(request.getIds());
-        } else {
-            list = siteExecutiveInfoService.listInfo(request);
-        }
-        for (SiteExecutiveApprovalListResponse record : list) {
-            DictCodeUtils.convertDictCodeToName(record);
-        }
+    public void export(@RequestBody SiteExecutiveApprovalListRequest request) throws Exception {
+        List<SiteExecutiveApprovalListResponse> list = super.exportList(request);
         super.exportExcel(SiteExecutiveApprovalListResponse.class, list, ExportEnum.SITE_EXECUTIVE_EXPORT.getSheetName());
     }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
index 7e793cd..a92e209 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
@@ -55,7 +55,7 @@
 
     @ApiOperation("设备收发列表导出")
     @PostMapping("/export")
-    public void exportList(@RequestBody @Valid SampleDispatchListRequest request) throws IOException {
+    public void exportList(@RequestBody SampleDispatchListRequest request) throws IOException {
         List<SampleDispatchListResponse> list;
         if (!CollectionUtils.isEmpty(request.getIds())) {
             list = dispatchService.listByIds(request.getIds());
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java
index cdc77fc..d120fd4 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java
@@ -7,6 +7,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.business.labExecutive.*;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.business.IBusinessLabExecutiveInfoService;
@@ -14,6 +15,7 @@
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.*;
 
@@ -32,7 +34,7 @@
     @Autowired
     private IBusinessLabExecutiveInfoService labExecutiveInfoService;
 
-    @ApiOperation("实验室检测-部门检测-查询各状态列表（待检测、检测中、检测完）")
+    @ApiOperation("实验室任务-查询各状态列表（待检测、检测中、检测完）")
     @PostMapping("/deptExecutive/List")
     public ReturnDTO<PageInfoBT<SampleLabExecutiveListResponse>> queryDeptExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
@@ -43,10 +45,19 @@
         return ReturnUtil.success(super.packForBT(labExecutiveInfoService.deptLabExecutiveListPage(page, labExecutiveListRequest)));
     }
 
-    /**
-     * 实验室检测-我的检测-查询各状态列表（待检测、检测中、检测完）
-     */
-    @ApiOperation("实验室检测-我的检测-查询各状态列表（待检测、检测中、检测完）")
+    @ApiOperation("实验室任务导出")
+    @PostMapping("/deptExecutive/export")
+    public void deptExportList(@RequestBody @Valid SampleLabExecutiveListRequest request) throws Exception {
+        List<SampleLabExecutiveListResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = labExecutiveInfoService.deptLabExecutiveListByIds(request.getMeasureStatus(), request.getIds());
+        } else {
+            list = labExecutiveInfoService.deptLabExecutiveList(request);
+        }
+        super.exportExcel(SampleLabExecutiveListResponse.class, list, ExportEnum.DEPT_EXECUTIVE_TASK.getSheetName());
+    }
+
+    @ApiOperation("我的任务-查询各状态列表（待检测、检测中、检测完）")
     @PostMapping("/myExecutive/list")
     public ReturnDTO<PageInfoBT<SampleLabExecutiveListResponse>> queryMyExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
@@ -57,19 +68,25 @@
         return ReturnUtil.success(super.packForBT(labExecutiveInfoService.myLabExecutiveListPage(page, labExecutiveListRequest)));
     }
 
-    /**
-     * 实验室检测-我的检测-查询各状态样品数量（待检测、检测中、检测完）
-     */
-    @ApiOperation("实验室检测-我的检测-查询各状态样品数量（待检测、检测中、检测完）")
+    @ApiOperation("我的任务导出")
+    @PostMapping("/myExecutive/export")
+    public void exportList(@RequestBody @Valid SampleLabExecutiveListRequest request) throws Exception {
+        List<SampleLabExecutiveListResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = labExecutiveInfoService.myLabExecutiveListByIds(request.getMeasureStatus(), request.getIds());
+        } else {
+            list = labExecutiveInfoService.myLabExecutiveList(request);
+        }
+        super.exportExcel(SampleLabExecutiveListResponse.class, list, ExportEnum.MY_EXECUTIVE_TASK.getSheetName());
+    }
+
+    @ApiOperation("我的任务-查询各状态样品数量（待检测、检测中、检测完）")
     @GetMapping("/myExecutive/amount")
     public ReturnDTO<List<SampleAmountResponse>> queryMyExecutiveAmount() {
         return ReturnUtil.success(labExecutiveInfoService.myExecutiveAmount());
     }
 
-    /**
-     * 实验室检测-部门检测-分配（分配给具体人员）
-     */
-    @ApiOperation("实验室检测-部门检测-分配按钮（分配给具体人员）")
+    @ApiOperation("实验室任务-分配按钮（分配给具体人员）")
     @PostMapping("/deptExecutive/allocate")
     public ReturnDTO allocateStaff(@RequestBody @Valid SampleAllocateRequest sampleAllocateRequest, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -78,10 +95,7 @@
         return labExecutiveInfoService.allocateStaff(sampleAllocateRequest);
     }
 
-    /**
-     * 实验室检测-我的检测-检定人扫描收入（待检测->检测中）
-     */
-    @ApiOperation("实验室检测-我的检测-检定人扫描收入（待检测->检测中）")
+    @ApiOperation("我的任务-检定人扫描收入（待检测->检测中）")
     @PostMapping("/myExecutive/receive")
     public ReturnDTO sampleReceive(@RequestBody @Valid List<SampleOperateRequest> requestList, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -90,10 +104,7 @@
         return labExecutiveInfoService.sampleReceive(requestList);
     }
 
-    /**
-     * 实验室检测-负责人/检定人扫描检完（检测中->检测完）
-     */
-    @ApiOperation("实验室检测-负责人/检定人扫描检完（检测中->检测完）")
+    @ApiOperation("实验室任务-负责人/检定人扫描检完（检测中->检测完）")
     @PostMapping("/myExecutive/complete")
     public ReturnDTO sampleExecutiveComplete(@RequestBody @Valid List<SampleOperateRequest> requestList, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -102,10 +113,7 @@
         return labExecutiveInfoService.sampleExecutiveComplete(requestList);
     }
 
-    /**
-     * 实验室检测-部门检测/我的检测 编辑（只能修改应出具证书）
-     */
-    @ApiOperation("实验室检测-部门检测/我的检测 编辑（只能修改应出具证书）")
+    @ApiOperation("实验室任务/我的任务 编辑（只能修改应出具证书）")
     @PostMapping("/executive/update")
     public ReturnDTO updateExecutive(@RequestBody @Valid UpdateExecutiveRequest request, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -114,10 +122,7 @@
         return labExecutiveInfoService.updateExecutive(request);
     }
 
-    /**
-     * 实验室检测-部门检测/我的检测 详情
-     */
-    @ApiOperation("实验室检测-部门检测/我的检测 详情")
+    @ApiOperation("实验室任务/我的任务 详情")
     @PostMapping("/executive/detail")
     public ReturnDTO<ExecutiveDetailResponse> executiveDetail(@RequestBody @Valid ExecutiveDetailRequest request, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
@@ -131,7 +136,7 @@
      * 退回后会将下一个要执行的实验室检测状态更新为待分配，将后面的实验室顺序变更为连续（都进行减1）
      * 最后一个检测的实验室退回，等分发员再增加实验室或设备收发中的已收入直接手动点击完成
      */
-    @ApiOperation("实验室检测-部门检测/我的检测 退回（待检测/检测中->退回）")
+    @ApiOperation("实验室任务/我的任务 退回（待检测/检测中->退回）")
     @PostMapping("/executive/sendBack")
     public ReturnDTO executiveSendBack(@RequestBody @Valid ExecutiveSendBackRequest request, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -140,9 +145,6 @@
         return labExecutiveInfoService.sampleExecutiveSendBack(request);
     }
 
-    /**
-     * 分发员编辑实验室检测列表
-     */
     @ApiOperation("分发员编辑实验室检测列表")
     @PostMapping("/handOut/updateList")
     public ReturnDTO updateExecutiveList(@RequestBody @Valid UpdateExecutiveListRequest request, BindingResult bindingResult) {
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java
index 48a67ed..0c04f31 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java
@@ -10,6 +10,7 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.resource.customer.CustomerApprovalListRequest;
 import com.casic.missiles.dto.resource.customer.CustomerSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceCustomerInfo;
@@ -26,6 +27,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -55,6 +57,13 @@
         return customerInfoService.saveCustomerInfo(request);
     }
 
+    @ApiOperation("委托方名录导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody CustomerApprovalListRequest request) throws Exception {
+        List<BizResourceCustomerInfo> list = super.exportList(request);
+        super.exportExcel(BizResourceCustomerInfo.class, list, ExportEnum.CUSTOMER_INFO.getSheetName());
+    }
+
     @ApiOperation("委托方人员列表（分页）")
     @PostMapping("/person/listPage")
     public ReturnDTO<PageInfoBT<BizResourceCustomerStaff>> personListPage(@RequestBody IdDTO idDto) {
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
index 972ed4b..6418ea5 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
@@ -5,6 +5,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.resource.customer.SuggestFormApprovalListRequest;
 import com.casic.missiles.dto.resource.customer.SuggestFormSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceCustomerSuggestForm;
@@ -20,6 +21,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -50,4 +52,11 @@
         return suggestFormService.saveSuggestForm(request);
     }
 
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody SuggestFormApprovalListRequest request) throws Exception {
+        List<BizResourceCustomerSuggestForm> list = super.exportList(request);
+        super.exportExcel(BizResourceCustomerSuggestForm.class, list, ExportEnum.CUSTOMER_SUGGEST_FORM.getSheetName());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java
index 1934d1a..9e07eab 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java
@@ -15,12 +15,16 @@
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.resource.IEnvEnvironmentRecordConfigService;
 import com.casic.missiles.service.resource.IEnvEnvironmentRecordDataService;
+import com.casic.missiles.service.resource.IEnvLocationInfoService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
 import java.util.List;
@@ -39,6 +43,8 @@
     private IEnvEnvironmentRecordDataService environmentRecordDataService;
     @Autowired
     private IEnvEnvironmentRecordConfigService environmentRecordConfigService;
+    @Autowired
+    private IEnvLocationInfoService locationInfoService;
 
     @ApiOperation("环境记录单数据列表/详情")
     @PostMapping("/data/listPage")
@@ -95,4 +101,11 @@
         });
         return environmentRecordConfigService.deleteEnvironmentRecordConfig(idDTO.getId());
     }
+
+    @ApiOperation("地点列表")
+    @PostMapping("/location/listPage")
+    public ReturnDTO<PageInfoBT<LocationListResponse>> locationListPage(@RequestBody @Valid LocationListRequest request) {
+        Page<LocationListResponse> page = PageFactory.defaultPage();
+        return ReturnUtil.success(super.packForBT(locationInfoService.listPage(page, request)));
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java
index 82efe3f..e9561fa 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java
@@ -10,6 +10,7 @@
 import com.casic.missiles.dto.resource.seal.SealLogListRequest;
 import com.casic.missiles.dto.resource.seal.SealNoteApprovalListRequest;
 import com.casic.missiles.dto.resource.seal.SealNoteSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceSealUseLog;
@@ -27,6 +28,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -58,6 +60,13 @@
         return sealUseNoteService.saveSeal(request);
     }
 
+    @ApiOperation("印章使用登记导出（列表和导出中去掉经办人和监印人）")
+    @PostMapping("/listExport")
+    public void export(@RequestBody SealNoteApprovalListRequest request) throws Exception {
+        List<BizResourceSealUseNote> list = super.exportList(request);
+        super.exportExcel(BizResourceSealUseNote.class, list, ExportEnum.SEAL_NOTE.getSheetName());
+    }
+
     // TODO: 2023/7/28 印章使用日志：系统中使用印章时插入数据库
 
     @ApiOperation("印章使用日志列表（分页）")
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java
index 9b674fc..06b6521 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java
@@ -9,16 +9,20 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.resource.staff.StaffCertRequest;
 import com.casic.missiles.dto.resource.staff.StaffCertResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.service.resource.IBizResourceStaffInfoService;
 import com.casic.missiles.service.resource.IBizResourceStaffVerifierService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.List;
+
 /**
  * @Description:
  * @Author: wangpeng
@@ -41,9 +45,21 @@
         return ReturnUtil.success(super.packForBT(responsePage));
     }
 
+    @ApiOperation("证书逾期提醒导出")
+    @PostMapping("/listExport")
+    public void exportList(@RequestBody StaffCertRequest request) throws Exception {
+        List<StaffCertResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = staffInfoService.certListByIds(request.getIds());
+        } else {
+            list = staffInfoService.certList(request);
+        }
+        super.exportExcel(StaffCertResponse.class, list, ExportEnum.STAFF_CERTIFICATE_EXPIRE.getSheetName());
+    }
+
     @ApiOperation("证书逾期提醒")
     @PostMapping("/expirationReminder")
-    public ReturnDTO expirationReminder(@RequestBody IdDTO idDto) {
-        return verifierService.expirationReminder(idDto);
+    public ReturnDTO expirationReminder(@RequestBody IdDTO idDTO) {
+        return verifierService.expirationReminder(idDTO);
     }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java
index 3b251ad..a6e7850 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java
@@ -12,6 +12,7 @@
 import com.casic.missiles.dto.resource.staff.StaffListRequest;
 import com.casic.missiles.dto.resource.staff.TrainListRequest;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.*;
@@ -22,7 +23,10 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
 import java.util.List;
@@ -52,8 +56,19 @@
             throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
         }
         Page<BizResourceStaffInfo> page = PageFactory.defaultPage();
-        Page<BizResourceStaffInfo> responsePage = staffInfoService.listPage(page, request);
-        return ReturnUtil.success(super.packForBT(responsePage));
+        return ReturnUtil.success(super.packForBT(staffInfoService.listPage(page, request)));
+    }
+
+    @ApiOperation("人员登记导出")
+    @PostMapping("/listExport")
+    public void exportList(@RequestBody StaffListRequest request) throws Exception {
+        List<BizResourceStaffInfo> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = staffInfoService.listByIds(request.getIds());
+        } else {
+            list = staffInfoService.list(request);
+        }
+        super.exportExcel(BizResourceStaffInfo.class, list, ExportEnum.STAFF_INFO.getSheetName());
     }
 
     @ApiOperation("人员登记详情基础信息")
@@ -85,9 +100,9 @@
 
     @ApiOperation("科研教育列表（分页）")
     @PostMapping("/education/listPage")
-    public ReturnDTO<PageInfoBT<BizResourceStaffEducation>> educationListPage(@RequestBody IdDTO idDto) {
+    public ReturnDTO<PageInfoBT<BizResourceStaffEducation>> educationListPage(@RequestBody IdDTO idDTO) {
         Page<BizResourceStaffEducation> page = PageFactory.defaultPage();
-        Page<BizResourceStaffEducation> responsePage = staffInfoService.educationListPage(page, idDto);
+        Page<BizResourceStaffEducation> responsePage = staffInfoService.educationListPage(page, idDTO);
         return ReturnUtil.success(super.packForBT(responsePage));
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java
index af6aa86..d85d84a 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java
@@ -9,6 +9,7 @@
 import com.casic.missiles.dto.resource.outsideService.SupplierApprovalListRequest;
 import com.casic.missiles.dto.resource.outsideService.SupplierSaveResponse;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceSupplierAbility;
@@ -67,6 +68,13 @@
         return ReturnUtil.success(supplierInfoService.detail(idDTO.getId()));
     }
 
+    @ApiOperation("合格供方导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody SupplierApprovalListRequest request) throws Exception {
+        List<BizResourceSupplierInfo> list = super.exportList(request);
+        super.exportExcel(BizResourceSupplierInfo.class, list, ExportEnum.SUPPLIER_INFO.getSheetName());
+    }
+
     @ApiOperation("供方人员列表（分页）")
     @PostMapping("/person/listPage")
     public ReturnDTO<PageInfoBT<BizResourceSupplierPerson>> personListPage(@RequestBody IdDTO idDTO) {
diff --git a/casic-metering-api/src/main/resources/config/application.yml b/casic-metering-api/src/main/resources/config/application.yml
index 350db5f..ecff521 100644
--- a/casic-metering-api/src/main/resources/config/application.yml
+++ b/casic-metering-api/src/main/resources/config/application.yml
@@ -126,7 +126,7 @@
     #作者
     author: wangpeng
     #待生成对象表名
-    table-name: biz_equipment_technical_target_approval,biz_equipment_attachment_approval,biz_equipment_checkpoint_approval
+    table-name: biz_business_outsource_protocol
 
 reminder:
   #节点--common模块config包 ReminderNodeConfig配置
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
index 4a19e4e..d47d552 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
@@ -53,6 +53,7 @@
     SUGGEST_FORM_SAVE_FAILED(2509, "委托方意见登记表保存至草稿箱失败"),
     EXAMINE_FORM_SAVE_FAILED(2510, "要求、委托书及合同评审表保存至草稿箱失败"),
     CUSTOMER_EXIST_SAVE_FAILED(2511, "该委托方已存在，请重新选择"),
+    DUPLICATE_LOCATION_NO(2512, "地点编号已存在"),
 
     /**
      * 计量检定业务模块
@@ -68,6 +69,8 @@
     COMPLETE_SAMPLE_NOT_EXIST(2609, "检测中不存在扫描收入的样品"),
     CANNOT_CHANGE_MEASURE_INFO(2610, "无法更改非当前登录用户的检测信息"),
     NON_EXIST_ORDER_OR_SAMPLE(2611, "不存在该委托单或该委托单下的样品"),
+    OUTSOURCE_ACCESS_SAVE_FAILED(2612, "测试、校准或检定工作分包评审表保存至草稿箱失败"),
+    OUTSOURCE_PROTOCOL_SAVE_FAILED(2613, "测试、校准或检定工作分包协议书保存至草稿箱失败"),
 
     /**
      * 历史遗留备用
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
index 5089ad1..81a406b 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
@@ -10,54 +10,38 @@
     /**
      * 资源管理
      */
-    ENVIRONMENT_DATA_EXPORT("environmentData", "environmentData", "环境记录单数据"),
+    ENVIRONMENT_DATA_EXPORT("environmentData", "环境记录单数据", "环境记录单数据"),
+    STAFF_INFO("staffInfo", "人员登记", "人员登记"),
+    STAFF_CERTIFICATE_EXPIRE("certificateExpire", "证书逾期提醒", "证书逾期提醒"),
+    SUPPLIER_INFO("supplierInfo", "合格供方名录", "合格供方名录"),
+    CUSTOMER_INFO("customerInfo", "委托方名录", "委托方名录"),
+    CUSTOMER_SUGGEST_FORM("customerSuggestForm", "委托方意见登记表", "委托方意见登记表"),
+    SEAL_NOTE("sealNote", "印章使用登记", "印章使用登记"),
 
-    FILE_EXPORT("meterFileData", "meterFileData", "计量文件信息"),
-    TRAIN_PLAN_EXPORT("trainPlanData", "trainPlanData", "培训计划"),
-    TRAIN_LOG_EXPORT("trainLogData", "trainLogData", "培训记录"),
-    METER_ORGANIZE_EXPORT("meterOrganizeData", "meterOrganizeData", "计量组织"),
-    TRACE_SUPPLIER_EXPORT("traceSupplierData", "traceSupplierData", "溯源供方"),
-    SIGN_EXPORT("signData", "signData", "签名/签章"),
-    TEMPLATE_EXPORT("templateData", "templateData", "原始记录模板/证书报告模板"),
-    FIXED_ASSETS("meterFixedAssets", "meterFixedAssets", "固定资产"),
-    METER_EQUIPMENT("meterEquipment", "meterEquipment", "测量设备"),
-    CALIBRATION_TEST_EQUIPMENT("calibrationTestEquipment", "calibrationTestEquipment", "校准检定设备"),
-    MEASURE_ACCOUNT("measureAccount", "measureAccount", "测量工装"),
-    STANDARD_SUPPORT_EQUIPMENT("standardSupportEquipment", "standardSupportEquipment", "标准配套设备"),
-    STANDARD_EQUIPMENT("standardEquipment", "standardEquipment", "标准装置"),
-    FLOW_DEF_EXPORT("flowDefData", "flowDefData", "流程定义"),
-    STAFF_CERTIFICATE("certificate", "certificate", "计量人员证书"),
-    CHECK_INFO("checkInfo", "checkInfo", "设备管理点检测"),
-    EQUIPMENT_APPLY("equipmentApply", "equipmentApply", "设备借用"),
-    STANDARD_EQUIPMENT_REMIND("equipmentApplyRemind", "equipmentApplyRemind", "标准装置到期提醒"),
-    METER_PRICE("meterPrice", "meterPrice", "价格库"),
-    METER_STAFF("meterStaff", "meterStaff", "计量人员"),
-    STANDARD_EQUIPMENT_APPLY("standardEquipmentApply", "standardEquipmentApply", "标准装置申请"),
-    STATE_MANAGE_APPLY("stateManage", "stateManage", "状态管理"),
-    METER_ACCEPTANCE_CHECK("acceptanceCheck", "acceptanceCheck", "设备检修保养验收单"),
-    CUSTOMER_EXPORT("customerData", "customerData", "客户信息"),
-    ORDER_EXPORT("orderData", "orderData", "委托书信息"),
-    SAMPLE_EXPORT("sampleData", "sampleData", "样本信息"),
-    EXCHANGE_DATA("exchangeData", "exchangeData", "设备交接单"),
-    DISPATCH_DATA("dispatchData", "dispatchData", "设备收发"),
-    ENVIRONMENT_DATA("environmentData", "environmentData", "环境记录单"),
-    ORIGIN_DATA("originData", "originData", "原始记录"),
-    CERTIFICATE_REPORT("certificateReport", "certificateReport", "证书报告"),
-    ADVICE_EXPORT("adviceData", "adviceData", "客户反馈"),
-    HANDOUT_EXPORT("handoutData", "handoutData", "任务分发列表"),
-    OUTSOURCER_EXPORT("outsourcerData", "outsourcerData", "分包方"),
-    SITE_EXECUTIVE_EXPORT("siteExecutiveData", "siteExecutiveData", "现场测试、校准或检定"),
-    CERTIFICATE_PRINT_EXPORT("certificatePrintData", "certificatePrintData", "证书打印"),
-    DOWNLOAD_TEMPLATE("downloadTemplate", "downloadTemplate", "页面配置"),
-    OUTSOURCER_CERTIFICATE_EXPORT("outsourceCertificateData", "outsourceCertificateData", "分包证书"),
-    SETTLEMENT_INFO_EXPORT("settlementInfoData", "settlementInfoData", "业务结算"),
-    EQUIPMENT_REMIND("equipmentRemind", "equipmentRemind", "设备到期提醒"),
-    AGREEMENT_INFO_EXPORT("agreementInfoData", "agreementInfoData", "合同"),
-    WORK_STATISTICS_EXPORT("workStatisticsData", "workStatisticsData", "实时工作统计"),
-    DEPT_OUTPUT_EXPORT("deptOutputData", "deptOutputData", "部门产值分析"),
-    WORKLOAD_EXPORT("workloadData", "workloadData", "业务工作量分析"),
-    DEPT_COMPREHENSIVE_EXPORT("deptComprehensiveData", "deptComprehensiveData", "部门综合分析"),
-    ENVIRONMENTAL_RECORD("environmentalRecordData", "environmentalRecordData", "现场环境记录");
+    /**
+     * 计量检定业务
+     */
+    OUTSOURCER_EXPORT("outsourcerData", "分包方名录", "分包方名录"),
+    IDENTIFY_EXPORT("identifyData", "计量标识", "计量标识"),
+    ORDER_EXPORT("orderData", "任务单", "任务单"),
+    DISPATCH_DATA("dispatchData", "设备收发", "设备收发"),
+    HANDOUT_EXPORT("handoutData", "任务分发", "任务分发"),
+    SITE_EXECUTIVE_EXPORT("siteExecutiveData", "现场测试、校准或检定", "现场测试、校准或检定"),
+    CERTIFICATE_REPORT("certificateReport", "证书审批", "证书审批"),
+    CERTIFICATE_CHANGE_APPLY("certificateChangeApply", "证书报告补充或更换申请单", "证书报告补充或更换申请单"),
+    CERTIFICATE_PRINT("certificatePrintData", "证书打印审批", "证书打印审批"),
+    DEPT_EXECUTIVE_TASK("deptExecutiveTaskData", "实验室任务", "实验室任务"),
+    MY_EXECUTIVE_TASK("myExecutiveTaskData", "我的任务", "我的任务"),
+    OUTSOURCE_ASSESS("outsourceAssess", "测试、校准或检定工作分包评审表", "测试、校准或检定工作分包评审表"),
+    OUTSOURCE_PROTOCOL("outsourceProtocol", "测试、校准或检定工作分包协议书", "测试、校准或检定工作分包协议书"),
+
+    /**
+     * 系统管理
+     */
+    SIGN_EXPORT("signData", "签名", "签名"),
+    TEMPLATE_EXPORT("templateData", "文件模板", "文件模板"),
+    FLOW_DEF_EXPORT("flowDefData", "流程定义", "流程定义"),
+    DOWNLOAD_TEMPLATE("downloadTemplate", "流程定义", "页面配置");
 
     ExportEnum(String fileName, String sheetName, String description) {
         this.fileName = fileName;
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateRecordTypeCodeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateRecordTypeCodeEnum.java
index 31d913c..a963522 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateRecordTypeCodeEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateRecordTypeCodeEnum.java
@@ -46,4 +46,14 @@
     String SITE_EXECUTIVE_APPROVAL = "01";
     //《现场测试、校准或检定工作记录表》
     String SITE_EXECUTIVE_LOG = "02";
+
+    //测试、校准或检定工作分包协议书
+    String OUTSOURCE_PROTOCOL = "01";
+    //测试、校准或检定工作分包评审表
+    String OUTSOURCE_ACCESS = "02";
+    //测试、校准或检定工作分包通知书
+    String OUTSOURCE_NOTICE = "03";
+    //测试、校准或检定工作分包方名录
+    String OUTSOURCE_INFO = "04";
+
 }
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
index 24b8635..f78bd53 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
@@ -15,6 +15,10 @@
     String CERTIFICATE_CHANGE_APPLY_BEAN_NAME = "certificateChangeApplyBean";
     //现场测试、校准或检定
     String SITE_EXECUTIVE_BEAN_NAME = "siteExecutiveBean";
+    //测试、校准或检定工作分包评审表
+    String OUTSOURCE_ASSESS_BEAN_NAME = "outsourceAssessBean";
+    //测试、校准或检定工作分包协议书
+    String OUTSOURCE_PROTOCOL_BEAN_NAME = "outsourceProtocolBean";
 
     /*********************************设备与装置************************************/
     //设备台账
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 b21c661..6b86fd1 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
@@ -18,6 +18,8 @@
     OUTSOURCER_APPROVAL(OUTSOURCER_BEAN_NAME, ""),
     CERTIFICATE_CHANGE_APPROVAL(CERTIFICATE_CHANGE_APPLY_BEAN_NAME, ""),
     SITE_EXECUTIVE_APPROVAL(SITE_EXECUTIVE_BEAN_NAME, ""),
+    OUTSOURCE_ASSESS_APPROVAL(OUTSOURCE_ASSESS_BEAN_NAME, ""),
+    OUTSOURCE_PROTOCOL_APPROVAL(OUTSOURCE_PROTOCOL_BEAN_NAME, ""),
 
     ACTION_STATUS_MAP(new HashMap<String, AwareActionStatusEnum>() {
         {
@@ -47,6 +49,10 @@
             put(ApplyFromIdEnum.CERTIFICATE_CHANGE_APPROVAL.getCode(), CERTIFICATE_CHANGE_APPROVAL);
             //现场测试、校准或检定审批
             put(ApplyFromIdEnum.SITE_EXECUTIVE_APPROVAL.getCode(), SITE_EXECUTIVE_APPROVAL);
+            //测试、校准或检定工作分包评审表
+            put(ApplyFromIdEnum.OUTSOURCE_ASSESS_APPROVAL.getCode(), OUTSOURCE_ASSESS_APPROVAL);
+            //测试、校准或检定工作分包协议书
+            put(ApplyFromIdEnum.OUTSOURCE_PROTOCOL_APPROVAL.getCode(), OUTSOURCE_PROTOCOL_APPROVAL);
         }
     });
     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 934405e..c7410bd 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
@@ -9,6 +9,8 @@
     CERTIFICATE_CHANGE_APPROVAL("jljdywzsbchghsqd", MessageSourceModuleEnum.BUSINESS.getCode(), "证书/报告补充或更换申请单"),
     OUTSOURCER_APPROVAL("jljdywcsjzhgfbfml", MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定合格分包方名录"),
     SITE_EXECUTIVE_APPROVAL("jljdywxccsjzsp", MessageSourceModuleEnum.BUSINESS.getCode(), "现场测试、校准或检定审批"),
+    OUTSOURCE_ASSESS_APPROVAL("jljdywcsjzfbpsb", MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包评审表"),
+    OUTSOURCE_PROTOCOL_APPROVAL("jljdywcsjzfbxys", MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包协议书"),
 
 
     /*******************************************设备与装置*********************************************/
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/GeneralApprovalMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/GeneralApprovalMapper.java
index 4fb7344..0c9d6ae 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/GeneralApprovalMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/GeneralApprovalMapper.java
@@ -17,8 +17,4 @@
 
     Page<O> selectBatchForApprovalList(Page<O> page, @Param("request") R request, @Param("businessKeys") List<String> businessKeys);
 
-//    Page<O> selectListPage(Page<O> page, @Param("request") R request);
-
-//    Long selectMaxNo();
-
 }
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceAssessMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceAssessMapper.java
index 7867bb8..ba59009 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceAssessMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceAssessMapper.java
@@ -1,7 +1,12 @@
 package com.casic.missiles.mapper.business;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.business.outsource.OutsourceAssessApprovalListRequest;
+import com.casic.missiles.mapper.GeneralApprovalMapper;
 import com.casic.missiles.model.business.BizBusinessOutsourceAssess;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * <p>
@@ -11,6 +16,10 @@
  * @author wangpeng
  * @since 2023-08-16
  */
-public interface BizBusinessOutsourceAssessMapper extends BaseMapper<BizBusinessOutsourceAssess> {
+public interface BizBusinessOutsourceAssessMapper extends GeneralApprovalMapper<BizBusinessOutsourceAssess, BizBusinessOutsourceAssess, OutsourceAssessApprovalListRequest> {
+
+    Page<BizBusinessOutsourceAssess> selectBatchForApprovalList(Page<BizBusinessOutsourceAssess> page, @Param("request") OutsourceAssessApprovalListRequest request, @Param("businessKeys") List<String> businessKeys);
+
+    Long selectMaxProjectNo();
 
 }
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceProtocolMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceProtocolMapper.java
new file mode 100644
index 0000000..e6aba35
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceProtocolMapper.java
@@ -0,0 +1,24 @@
+package com.casic.missiles.mapper.business;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.business.outsource.OutsourceProtocolApprovalListRequest;
+import com.casic.missiles.mapper.GeneralApprovalMapper;
+import com.casic.missiles.model.business.BizBusinessOutsourceProtocol;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 计量检定业务-分包管理-测试、校准或检定工作分包协议书 Mapper 接口
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-08-24
+ */
+public interface BizBusinessOutsourceProtocolMapper extends GeneralApprovalMapper<BizBusinessOutsourceProtocol, BizBusinessOutsourceProtocol, OutsourceProtocolApprovalListRequest> {
+
+    Page<BizBusinessOutsourceProtocol> selectBatchForApprovalList(Page<BizBusinessOutsourceProtocol> page, @Param("request") OutsourceProtocolApprovalListRequest request, @Param("businessKeys") List<String> businessKeys);
+
+    Long selectMaxProtocolNo();
+}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/EnvLocationInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/EnvLocationInfoMapper.java
new file mode 100644
index 0000000..49eff87
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/EnvLocationInfoMapper.java
@@ -0,0 +1,21 @@
+package com.casic.missiles.mapper.resource;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.resource.environment.LocationListRequest;
+import com.casic.missiles.dto.resource.environment.LocationListResponse;
+import com.casic.missiles.model.resource.EnvLocationInfo;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * <p>
+ * 实验室环境监控系统-设备表 Mapper 接口
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-06-07
+ */
+public interface EnvLocationInfoMapper extends BaseMapper<EnvLocationInfo> {
+
+    Page<LocationListResponse> selectLocationListPage(Page<LocationListResponse> page, @Param("request") LocationListRequest request);
+}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java
index de124db..85ed0f7 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java
@@ -1,7 +1,9 @@
 package com.casic.missiles.mapper.system;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.dto.system.SignDetailResponse;
+import com.casic.missiles.dto.system.SignListRequest;
 import com.casic.missiles.model.system.SystemSign;
 import org.apache.ibatis.annotations.Param;
 
@@ -22,4 +24,8 @@
     SignDetailResponse selectSignDetailById(Long id);
 
     List<SystemSign> selectUsableSignList(@Param("userId") Long userId);
+
+    Page<SystemSign> selectSignListPage(Page<SystemSign> page, @Param("request") SignListRequest request);
+
+    List<SystemSign> selectSignList(@Param("request") SignListRequest request);
 }
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateChangeApplyMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateChangeApplyMapper.xml
index d798447..c496092 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateChangeApplyMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateChangeApplyMapper.xml
@@ -30,31 +30,31 @@
         SELECT *
         FROM biz_business_certificate_change_apply
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.changeApplyNo != null and request.changeApplyNo !=''">
+        <if test="request != null and request.changeApplyNo != null and request.changeApplyNo !=''">
             and change_apply_no like concat('%',#{request.changeApplyNo},'%')
         </if>
-        <if test="request.changeReportNo != null and request.changeReportNo !=''">
+        <if test="request != null and request.changeReportNo != null and request.changeReportNo !=''">
             and change_report_no like concat('%',#{request.changeReportNo},'%')
         </if>
-        <if test="request.changeReportName != null and request.changeReportName !=''">
+        <if test="request != null and request.changeReportName != null and request.changeReportName !=''">
             and change_report_name like concat('%',#{request.changeReportName},'%')
         </if>
-        <if test="request.changeType != null and request.changeType !=''">
+        <if test="request != null and request.changeType != null and request.changeType !=''">
             and change_type = #{request.changeType}
         </if>
-        <if test="request.createUserName != null and request.createUserName !=''">
+        <if test="request != null and request.createUserName != null and request.createUserName !=''">
             and create_user_name like concat('%',#{request.createUserName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificatePrintMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificatePrintMapper.xml
index b66cd99..49c0ac8 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificatePrintMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificatePrintMapper.xml
@@ -31,34 +31,34 @@
         LEFT JOIN biz_business_order_sample_relation bosr ON (bosr.order_id = bcr.order_id AND bosr.sample_id = bcr.sample_id)
         LEFT JOIN biz_business_order_info boi ON boi.id = bosr.order_id
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and bcp.approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.printStatus != null and request.printStatus !=''">
+        <if test="request != null and request.printStatus != null and request.printStatus !=''">
             and print_status = #{request.printStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and bcp.create_user_id = #{request.createUserId}
         </if>
-        <if test="request.certificateReportNo != null and request.certificateReportNo !=''">
+        <if test="request != null and request.certificateReportNo != null and request.certificateReportNo !=''">
             and bcr.certificate_report_no like concat('%',#{request.certificateReportNo},'%')
         </if>
-        <if test="request.certificateReportName != null and request.certificateReportName !=''">
+        <if test="request != null and request.certificateReportName != null and request.certificateReportName !=''">
             and bcr.certificate_report_name like concat('%',#{request.certificateReportName},'%')
         </if>
-        <if test="request.customerName != null and request.customerName !=''">
+        <if test="request != null and request.customerName != null and request.customerName !=''">
             and boi.customer_name like concat('%',#{request.customerName},'%')
         </if>
-        <if test="request.sampleNo != null and request.sampleNo !=''">
+        <if test="request != null and request.sampleNo != null and request.sampleNo !=''">
             and bosr.sample_no like concat('%',#{request.sampleNo},'%')
         </if>
-        <if test="request.sampleName != null and request.sampleName !=''">
+        <if test="request != null and request.sampleName != null and request.sampleName !=''">
             and bosr.sample_name like concat('%',#{request.sampleName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and bcp.create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and bcp.create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml
index b366034..767695d 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml
@@ -46,33 +46,37 @@
         SELECT bcr.*, bosr.sample_no, bosr.sample_name, bosr.sample_model, rsi.staff_name
         FROM biz_business_certificate_report bcr
         LEFT JOIN biz_business_order_sample_relation bosr ON (bosr.order_id = bcr.order_id AND bosr.sample_id = bcr.sample_id)
+        LEFT JOIN biz_business_order_info boi ON boi.id = bcr.order_id
         LEFT JOIN biz_resource_staff_info rsi ON rsi.id = bcr.measure_person_id
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and bcr.approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and bcr.create_user_id = #{request.createUserId}
         </if>
-        <if test="request.certificateReportNo != null and request.certificateReportNo !=''">
+        <if test="request != null and request.customerId != null and request.customerId !=''">
+            and boi.customer_id = #{request.customerId}
+        </if>
+        <if test="request != null and request.certificateReportNo != null and request.certificateReportNo !=''">
             and bcr.certificate_report_no like concat('%',#{request.certificateReportNo},'%')
         </if>
-        <if test="request.certificateReportName != null and request.certificateReportName !=''">
+        <if test="request != null and request.certificateReportName != null and request.certificateReportName !=''">
             and bcr.certificate_report_name like concat('%',#{request.certificateReportName},'%')
         </if>
-        <if test="request.sampleNo != null and request.sampleNo !=''">
+        <if test="request != null and request.sampleNo != null and request.sampleNo !=''">
             and bosr.sample_no like concat('%',#{request.sampleNo},'%')
         </if>
-        <if test="request.measureCategory != null and request.measureCategory !=''">
+        <if test="request != null and request.measureCategory != null and request.measureCategory !=''">
             and bcr.measure_category = #{request.measureCategory}
         </if>
-        <if test="request.measurePerson != null and request.measurePerson !=''">
+        <if test="request != null and request.measurePerson != null and request.measurePerson !=''">
             and rsi.staff_name like concat('%',#{request.measurePerson},'%')
         </if>
-        <if test="request.calibrationTimeStart != null and request.calibrationTimeStart !=''">
+        <if test="request != null and request.calibrationTimeStart != null and request.calibrationTimeStart !=''">
             and bcr.calibration_time &gt;= #{request.calibrationTimeStart}
         </if>
-        <if test="request.calibrationTimeEnd != null and request.calibrationTimeEnd !=''">
+        <if test="request != null and request.calibrationTimeEnd != null and request.calibrationTimeEnd !=''">
             and bcr.calibration_time &lt;= #{request.calibrationTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceAssessMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceAssessMapper.xml
index d0fcf8b..c22c101 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceAssessMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceAssessMapper.xml
@@ -7,6 +7,8 @@
         <id column="id" property="id" />
         <result column="project_no" property="projectNo" />
         <result column="project_name" property="projectName" />
+        <result column="lab_code" property="labCode" />
+        <result column="group_code" property="groupCode" />
         <result column="applicant_id" property="applicantId" />
         <result column="applicant_name" property="applicantName" />
         <result column="applicant_time" property="applicantTime" />
@@ -31,7 +33,45 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, project_no, project_name, applicant_id, applicant_name, applicant_time, minio_file_name, remark, create_user_id, create_user_name, outsourcer_id, pre_start_time, pre_end_time, outsource_reason, pre_cost, approval_status, process_id, approve_situation, traceability, test_method, technique_ability, create_time, update_time
+        id, project_no, project_name, lab_code, group_code, applicant_id, applicant_name, applicant_time, minio_file_name, remark, create_user_id, create_user_name, outsourcer_id, pre_start_time, pre_end_time, outsource_reason, pre_cost, approval_status, process_id, approve_situation, traceability, test_method, technique_ability, create_time, update_time
     </sql>
 
+    <select id="selectMaxProjectNo" resultType="java.lang.Long">
+        SELECT IFNULL(max(RIGHT(project_no, 3)), 0) from biz_business_outsource_assess
+    </select>
+
+    <select id="selectBatchForApprovalList" resultMap="BaseResultMap">
+        SELECT bboa.*, bboi.outsourcer_name, bboi.director
+        FROM biz_business_outsource_assess bboa
+        LEFT JOIN biz_business_outsourcer_info bboi ON bboa.outsourcer_id = bboi.id
+        WHERE 1=1
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
+            and bboa.approval_status = #{request.approvalStatus}
+        </if>
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
+            and bboa.create_user_id = #{request.createUserId}
+        </if>
+        <if test="request != null and request.projectNo != null and request.projectNo !=''">
+            and bboa.project_no like concat('%',#{request.projectNo},'%')
+        </if>
+        <if test="request != null and request.outsourcerName != null and request.outsourcerName !=''">
+            and bboi.outsourcer_name like concat('%',#{request.outsourcerName},'%')
+        </if>
+        <if test="request != null and request.applicantName != null and request.applicantName !=''">
+            and bboa.applicant_name like concat('%',#{request.applicantName},'%')
+        </if>
+        <if test="request != null and request.applicantTimeStart != null and request.applicantTimeStart !=''">
+            and bboa.applicant_time &gt;= #{request.applicantTimeStart}
+        </if>
+        <if test="request != null and request.applicantTimeEnd != null and request.applicantTimeEnd !=''">
+            and bboa.applicant_time &lt;= #{request.applicantTimeEnd}
+        </if>
+        <if test="businessKeys != null">
+            and bboa.id in
+            <foreach collection="businessKeys" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
+        ORDER BY bboa.create_time DESC
+    </select>
 </mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceProtocolMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceProtocolMapper.xml
new file mode 100644
index 0000000..b7b2149
--- /dev/null
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceProtocolMapper.xml
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.mapper.business.BizBusinessOutsourceProtocolMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.business.BizBusinessOutsourceProtocol">
+        <id column="id" property="id" />
+        <result column="protocol_no" property="protocolNo" />
+        <result column="project_name" property="projectName" />
+        <result column="lab_code" property="labCode" />
+        <result column="group_code" property="groupCode" />
+        <result column="outsourcer_id" property="outsourcerId" />
+        <result column="remark" property="remark" />
+        <result column="outsource_no" property="outsourceNo" />
+        <result column="outsource_name" property="outsourceName" />
+        <result column="contacts" property="contacts" />
+        <result column="mobile" property="mobile" />
+        <result column="address" property="address" />
+        <result column="require_date" property="requireDate" />
+        <result column="outsource_cost" property="outsourceCost" />
+        <result column="director" property="director" />
+        <result column="item" property="item" />
+        <result column="requires" property="requires" />
+        <result column="create_user_id" property="createUserId" />
+        <result column="create_user_name" property="createUserName" />
+        <result column="approval_status" property="approvalStatus" />
+        <result column="process_id" property="processId" />
+        <result column="create_time" property="createTime" />
+        <result column="update_time" property="updateTime" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, protocol_no, project_name, lab_code, group_code, outsourcer_id, remark, outsource_no, outsource_name, contacts, mobile, address, require_date, outsource_cost, director, item, requires, create_user_id, create_user_name, approval_status, process_id, create_time, update_time
+    </sql>
+
+    <select id="selectMaxProtocolNo" resultType="java.lang.Long">
+        SELECT IFNULL(max(RIGHT(protocol_no, 3)), 0) from biz_business_outsource_protocol
+    </select>
+
+    <select id="selectBatchForApprovalList" resultMap="BaseResultMap">
+        SELECT *
+        FROM biz_business_outsource_protocol
+        WHERE 1=1
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
+            and approval_status = #{request.approvalStatus}
+        </if>
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
+            and create_user_id = #{request.createUserId}
+        </if>
+        <if test="request != null and request.protocolNo != null and request.protocolNo !=''">
+            and protocol_no like concat('%',#{request.protocolNo},'%')
+        </if>
+        <if test="request != null and request.outsourcerName != null and request.outsourcerName !=''">
+            and outsourcer_name like concat('%',#{request.outsourcerName},'%')
+        </if>
+        <if test="request != null and request.applicantName != null and request.applicantName !=''">
+            and create_user_name like concat('%',#{request.applicantName},'%')
+        </if>
+        <if test="request != null and request.applicantTimeStart != null and request.applicantTimeStart !=''">
+            and create_time &gt;= #{request.applicantTimeStart}
+        </if>
+        <if test="request != null and request.applicantTimeEnd != null and request.applicantTimeEnd !=''">
+            and create_time &lt;= #{request.applicantTimeEnd}
+        </if>
+        <if test="businessKeys != null">
+            and id in
+            <foreach collection="businessKeys" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
+        ORDER BY create_time DESC
+    </select>
+</mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourcerInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourcerInfoMapper.xml
index 510a80b..3049b54 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourcerInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourcerInfoMapper.xml
@@ -7,6 +7,8 @@
         <id column="id" property="id" />
         <result column="outsourcer_no" property="outsourcerNo" />
         <result column="outsourcer_name" property="outsourcerName" />
+        <result column="lab_code" property="labCode" />
+        <result column="group_code" property="groupCode" />
         <result column="outsourcer_brief_name" property="outsourcerBriefName" />
         <result column="outsourcer_size" property="outsourcerSize" />
         <result column="business_size" property="businessSize" />
@@ -55,32 +57,32 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, outsourcer_no, outsourcer_name, outsourcer_brief_name, outsourcer_size, business_size, grade, evaluation, tax_number, bank_account, bank_name, bank_account_number, postal_code, director, phone, fax, mobile, email, website, address_country, address_province, address_city, address_area, full_address, address_country_name, address_province_name, address_city_name, address_area_name, invoice_country, invoice_province, invoice_city, invoice_area, invoice_full_address, invoice_country_name, invoice_province_name, invoice_city_name, invoice_area_name, business_scope, business_content, minio_file_name, approval_status, process_id, remark, create_user_id, create_user_name, create_time, update_time
+        id, outsourcer_no, outsourcer_name, lab_code, group_code, outsourcer_brief_name, outsourcer_size, business_size, grade, evaluation, tax_number, bank_account, bank_name, bank_account_number, postal_code, director, phone, fax, mobile, email, website, address_country, address_province, address_city, address_area, full_address, address_country_name, address_province_name, address_city_name, address_area_name, invoice_country, invoice_province, invoice_city, invoice_area, invoice_full_address, invoice_country_name, invoice_province_name, invoice_city_name, invoice_area_name, business_scope, business_content, minio_file_name, approval_status, process_id, remark, create_user_id, create_user_name, create_time, update_time
     </sql>
 
     <select id="selectBatchForApprovalList" resultMap="BaseResultMap">
         SELECT *
         FROM biz_business_outsourcer_info
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.outsourcerNo != null and request.outsourcerNo !=''">
+        <if test="request != null and request.outsourcerNo != null and request.outsourcerNo !=''">
             and outsourcer_no like concat('%',#{request.outsourcerNo},'%')
         </if>
-        <if test="request.outsourcerName != null and request.outsourcerName !=''">
+        <if test="request != null and request.outsourcerName != null and request.outsourcerName !=''">
             and outsourcer_name like concat('%',#{request.outsourcerName},'%')
         </if>
-        <if test="request.director != null and request.director !=''">
+        <if test="request != null and request.director != null and request.director !=''">
             and director like concat('%',#{request.director},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
@@ -93,6 +95,6 @@
     </select>
 
     <select id="selectMaxNo" resultType="java.lang.Long">
-        SELECT IFNULL(max(RIGHT(outsourcer_no, 12)), 0) from biz_business_outsourcer_info
+        SELECT IFNULL(max(RIGHT(outsourcer_no, 3)), 0) from biz_business_outsourcer_info
     </select>
 </mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessSiteExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessSiteExecutiveInfoMapper.xml
index 135c5d0..3c5ae79 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessSiteExecutiveInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessSiteExecutiveInfoMapper.xml
@@ -38,25 +38,25 @@
         FROM biz_business_site_executive_info bsei
         LEFT JOIN biz_resource_customer_info rci ON bsei.customer_id = rci.id
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and bsei.approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and bsei.create_user_id = #{request.createUserId}
         </if>
-        <if test="request.siteExecutiveNo != null and request.siteExecutiveNo !=''">
+        <if test="request != null and request.siteExecutiveNo != null and request.siteExecutiveNo !=''">
             and bsei.site_executive_no like concat('%',#{request.siteExecutiveNo},'%')
         </if>
-        <if test="request.customerName != null and request.customerName !=''">
+        <if test="request != null and request.customerName != null and request.customerName !=''">
             and rci.outsourcer_name like concat('%',#{request.customerName},'%')
         </if>
-        <if test="request.applyName != null and request.applyName !=''">
+        <if test="request != null and request.applyName != null and request.applyName !=''">
             and bsei.apply_name like concat('%',#{request.applyName},'%')
         </if>
-        <if test="request.applyTimeStart != null and request.applyTimeStart !=''">
+        <if test="request != null and request.applyTimeStart != null and request.applyTimeStart !=''">
             and bsei.apply_time &gt;= #{request.applyTimeStart}
         </if>
-        <if test="request.applyTimeEnd != null and request.applyTimeEnd !=''">
+        <if test="request != null and request.applyTimeEnd != null and request.applyTimeEnd !=''">
             and bsei.apply_time &lt;= #{request.applyTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml
index 84d9e2a..6bd38a9 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml
@@ -105,6 +105,12 @@
         <if test="request.isUrgent != null and request.isUrgent !=''">
             AND bo.is_urgent = #{request.isUrgent}
         </if>
+        <if test="request.ids != null">
+            and blei.id in
+            <foreach collection="request.ids" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
         ORDER BY blei.update_time DESC
     </select>
 
@@ -137,6 +143,12 @@
         <if test="request.isUrgent != null and request.isUrgent !=''">
             AND bo.is_urgent = #{request.isUrgent}
         </if>
+        <if test="request.ids != null">
+            and blei.id in
+            <foreach collection="request.ids" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
         ORDER BY blei.update_time DESC
     </select>
 
diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardInfoMapper.xml
index 1a5551b..2ed8d17 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardInfoMapper.xml
@@ -45,12 +45,6 @@
         FROM biz_equipment_standard_info besi
         LEFT JOIN biz_equipment_standard_technology_relation bestr ON besi.standard_no = bestr.standard_no
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
-            and besi.approval_status = #{request.approvalStatus}
-        </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
-            and besi.create_user_id = #{request.createUserId}
-        </if>
         <if test="request.standardName != null and request.standardName !=''">
             and besi.standard_name like concat('%',#{request.standardName},'%')
         </if>
diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardTechnologyRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardTechnologyRelationMapper.xml
index fc7e16c..cd03c8c 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardTechnologyRelationMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardTechnologyRelationMapper.xml
@@ -6,6 +6,7 @@
     <resultMap id="BaseResultMap" type="com.casic.missiles.model.equipment.BizEquipmentStandardTechnologyRelation">
         <id column="id" property="id" />
         <result column="technology_file_id" property="technologyFileId" />
+        <result column="technology_file_no" property="technologyFileNo" />
         <result column="technology_file_name" property="technologyFileName" />
         <result column="standard_id" property="standardId" />
         <result column="standard_no" property="standardNo" />
@@ -14,7 +15,7 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, technology_file_id, technology_file_name, standard_id, remark
+        id, technology_file_id, technology_file_no, technology_file_name, standard_id, remark
     </sql>
 
 </mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceAuthorizeOrderMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceAuthorizeOrderMapper.xml
index ac5176c..554fe65 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceAuthorizeOrderMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceAuthorizeOrderMapper.xml
@@ -32,22 +32,22 @@
         SELECT *
         FROM biz_resource_authorize_order
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.orderNo != null and request.orderNo !=''">
+        <if test="request != null and request.orderNo != null and request.orderNo !=''">
             and order_no like concat('%',#{request.orderNo},'%')
         </if>
-        <if test="request.createUserName != null and request.createUserName !=''">
+        <if test="request != null and request.createUserName != null and request.createUserName !=''">
             and create_user_name like concat('%',#{request.createUserName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerExamineFormMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerExamineFormMapper.xml
index ab242f6..af7f98f 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerExamineFormMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerExamineFormMapper.xml
@@ -41,28 +41,28 @@
         SELECT *
         FROM biz_resource_customer_examine_form
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.formNo != null and request.formNo !=''">
+        <if test="request != null and request.formNo != null and request.formNo !=''">
             and form_no like concat('%',#{request.formNo},'%')
         </if>
-        <if test="request.labCode != null and request.labCode !=''">
+        <if test="request != null and request.labCode != null and request.labCode !=''">
             and lab_code like concat('%',#{request.labCode},'%')
         </if>
-        <if test="request.groupCode != null and request.groupCode !=''">
+        <if test="request != null and request.groupCode != null and request.groupCode !=''">
             and group_code like concat('%',#{request.groupCode},'%')
         </if>
-        <if test="request.createUserName != null and request.createUserName !=''">
+        <if test="request != null and request.createUserName != null and request.createUserName !=''">
             and create_user_name like concat('%',#{request.createUserName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerInfoMapper.xml
index fa8ffbc..06a2798 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerInfoMapper.xml
@@ -33,25 +33,25 @@
         SELECT *
         FROM biz_resource_customer_info
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.customerNo != null and request.customerNo !=''">
+        <if test="request != null and request.customerNo != null and request.customerNo !=''">
             and customer_no like concat('%',#{request.customerNo},'%')
         </if>
-        <if test="request.customerName != null and request.customerName !=''">
+        <if test="request != null and request.customerName != null and request.customerName !=''">
             and customer_name like concat('%',#{request.customerName},'%')
         </if>
-        <if test="request.contacts != null and request.contacts !=''">
+        <if test="request != null and request.contacts != null and request.contacts !=''">
             and contacts like concat('%',#{request.contacts},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerSuggestFormMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerSuggestFormMapper.xml
index 28f5bb2..1806662 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerSuggestFormMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerSuggestFormMapper.xml
@@ -33,28 +33,28 @@
         SELECT *
         FROM biz_resource_customer_suggest_form
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.formNo != null and request.formNo !=''">
+        <if test="request != null and request.formNo != null and request.formNo !=''">
             and form_no like concat('%',#{request.formNo},'%')
         </if>
-        <if test="request.customerName != null and request.customerName !=''">
+        <if test="request != null and request.customerName != null and request.customerName !=''">
             and customer_name like concat('%',#{request.customerName},'%')
         </if>
-        <if test="request.customerDeptName != null and request.customerDeptName !=''">
+        <if test="request != null and request.customerDeptName != null and request.customerDeptName !=''">
             and customer_dept_name like concat('%',#{request.customerDeptName},'%')
         </if>
-        <if test="request.createUserName != null and request.createUserName !=''">
+        <if test="request != null and request.createUserName != null and request.createUserName !=''">
             and create_user_name like concat('%',#{request.createUserName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSealUseNoteMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSealUseNoteMapper.xml
index ab37bc1..b02bb33 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSealUseNoteMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSealUseNoteMapper.xml
@@ -29,32 +29,32 @@
     </sql>
 
     <select id="selectBatchForApprovalList" resultMap="BaseResultMap">
-        SELECT *
+        SELECT brsun.*, brsi.seal_name, brsi.seal_type, brsi.approver_name
         FROM biz_resource_seal_use_note brsun
         JOIN biz_resource_seal_info brsi ON brsun.seal_id = brsi.id
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and brsun.approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and brsun.create_user_id = #{request.createUserId}
         </if>
-        <if test="request.sealName != null and request.sealName !=''">
+        <if test="request != null and request.sealName != null and request.sealName !=''">
             and brsi.seal_name like concat('%',#{request.sealName},'%')
         </if>
-        <if test="request.sealType != null and request.sealType !=''">
+        <if test="request != null and request.sealType != null and request.sealType !=''">
             and brsi.seal_type = #{request.sealType}
         </if>
-        <if test="request.applyDeptName != null and request.applyDeptName !=''">
+        <if test="request != null and request.applyDeptName != null and request.applyDeptName !=''">
             and brsun.apply_dept_name like concat('%',#{request.applyDeptName},'%')
         </if>
-        <if test="request.applyUserName != null and request.applyUserName !=''">
+        <if test="request != null and request.applyUserName != null and request.applyUserName !=''">
             and brsun.apply_user_name like concat('%',#{request.applyUserName},'%')
         </if>
-        <if test="request.applyTimeStart != null and request.applyTimeStart !=''">
+        <if test="request != null and request.applyTimeStart != null and request.applyTimeStart !=''">
             and brsun.apply_time &gt;= #{request.applyTimeStart}
         </if>
-        <if test="request.applyTimeEnd != null and request.applyTimeEnd !=''">
+        <if test="request != null and request.applyTimeEnd != null and request.applyTimeEnd !=''">
             and brsun.apply_time &lt;= #{request.applyTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml
index 119bf7d..4f8392a 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml
@@ -31,6 +31,12 @@
         <if test="request.deptName != null and request.deptName !=''">
             and brsi.dept_name like concat('%',#{request.deptName},'%')
         </if>
+        <if test="request.ids != null">
+            and brsv.id in
+            <foreach collection="request.ids" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
         ORDER BY brsv.grant_date DESC
     </select>
 
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSupplierInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSupplierInfoMapper.xml
index fe8d399..e8ce7ef 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSupplierInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSupplierInfoMapper.xml
@@ -48,28 +48,28 @@
         SELECT *
         FROM biz_resource_supplier_info
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.supplierNo != null and request.supplierNo !=''">
+        <if test="request != null and request.supplierNo != null and request.supplierNo !=''">
             and supplier_no like concat('%',#{request.supplierNo},'%')
         </if>
-        <if test="request.supplierName != null and request.supplierName !=''">
+        <if test="request != null and request.supplierName != null and request.supplierName !=''">
             and supplier_name like concat('%',#{request.supplierName},'%')
         </if>
-        <if test="request.director != null and request.director !=''">
+        <if test="request != null and request.director != null and request.director !=''">
             and director like concat('%',#{request.director},'%')
         </if>
-        <if test="request.supplierType != null and request.supplierType !=''">
+        <if test="request != null and request.supplierType != null and request.supplierType !=''">
             and supplier_type = #{request.supplierType}
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/EnvLocationInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/EnvLocationInfoMapper.xml
new file mode 100644
index 0000000..68bcf10
--- /dev/null
+++ b/casic-metering-dao/src/main/resources/mapper/resource/EnvLocationInfoMapper.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.mapper.resource.EnvLocationInfoMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.resource.EnvLocationInfo">
+        <id column="id" property="id" />
+        <result column="location_no" property="locationNo" />
+        <result column="location_name" property="locationName" />
+        <result column="location_position" property="locationPosition" />
+        <result column="create_user_id" property="createUserId" />
+        <result column="create_user" property="createUser" />
+        <result column="create_time" property="createTime" />
+        <result column="update_time" property="updateTime" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, location_no, location_name, location_position, create_user_id, create_user, create_time, update_time
+    </sql>
+
+    <select id="selectLocationListPage" resultType="com.casic.missiles.dto.resource.environment.LocationListResponse">
+        SELECT *
+        FROM env_location_info
+        WHERE 1=1
+        <if test="request.locationNo != null and request.locationNo !=''">
+            AND location_no LIKE concat('%',#{request.locationNo},'%')
+        </if>
+        <if test="request.locationName != null and request.locationName !=''">
+            AND location_name LIKE concat('%',#{request.locationName},'%')
+        </if>
+        ORDER BY create_time DESC
+    </select>
+
+</mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml
index b28c18f..8854047 100644
--- a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml
@@ -11,7 +11,6 @@
         <result column="sign_desc" property="signDesc" />
         <result column="sign_director" property="signDirector" />
         <result column="sign_user_id" property="signUserId" />
-        <result column="sign_type" property="signType" />
         <result column="minio_file_name" property="minioFileName" />
         <result column="create_time" property="createTime" />
         <result column="update_time" property="updateTime" />
@@ -28,7 +27,6 @@
         <result column="sign_name" property="signName" />
         <result column="sign_desc" property="signDesc" />
         <result column="sign_director" property="signDirector" />
-        <result column="sign_type" property="signType" />
         <result column="sign_user_id" property="signUserId" />
         <result column="minio_file_name" property="minioFileName" />
         <result column="create_time" property="createTime" />
@@ -62,4 +60,58 @@
         JOIN system_sign_user_relation ssur ON ss.id = ssur.sign_id
         WHERE ssur.user_id = #{userId}
     </select>
+
+    <select id="selectSignListPage" resultMap="BaseResultMap">
+        SELECT ss.*, sd.SIMPLE_NAME AS deptName
+        FROM system_sign ss
+        LEFT JOIN sys_user su ON su.id = ss.sign_user_id
+        LEFT JOIN sys_dept sd ON sd.id = su.dept_id
+        WHERE 1=1
+        <if test="request.signNo != null and request.signNo !=''">
+            AND ss.sign_no LIKE concat('%',#{request.signNo},'%')
+        </if>
+        <if test="request.signName != null and request.signName !=''">
+            AND ss.sign_name LIKE concat('%',#{request.signName},'%')
+        </if>
+        <if test="request.signDirector != null and request.signDirector !=''">
+            AND ss.sign_director LIKE concat('%',#{request.signDirector},'%')
+        </if>
+        <if test="request.signUserId != null and request.signUserId !=''">
+            AND ss.sign_user_id = #{request.signUserId}
+        </if>
+        <if test="request.createStartTime != null and request.createStartTime !=''">
+            AND DATE_FORMAT(ss.create_time,'%Y-%m-%d') &gt;= DATE_FORMAT(#{request.createStartTime},'%Y-%m-%d')
+        </if>
+        <if test="request.createEndTime != null and request.createEndTime !=''">
+            AND DATE_FORMAT(ss.create_time,'%Y-%m-%d')  &lt;= DATE_FORMAT(#{request.createEndTime},'%Y-%m-%d')
+        </if>
+        ORDER BY ss.create_time DESC
+    </select>
+
+    <select id="selectSignList" resultMap="BaseResultMap">
+        SELECT ss.*, sd.SIMPLE_NAME AS deptName
+        FROM system_sign ss
+        LEFT JOIN sys_user su ON su.id = ss.sign_user_id
+        LEFT JOIN sys_dept sd ON sd.id = su.dept_id
+        WHERE 1=1
+        <if test="request.signNo != null and request.signNo !=''">
+            AND ss.sign_no LIKE concat('%',#{request.signNo},'%')
+        </if>
+        <if test="request.signName != null and request.signName !=''">
+            AND ss.sign_name LIKE concat('%',#{request.signName},'%')
+        </if>
+        <if test="request.signDirector != null and request.signDirector !=''">
+            AND ss.sign_director LIKE concat('%',#{request.signDirector},'%')
+        </if>
+        <if test="request.signUserId != null and request.signUserId !=''">
+            AND ss.sign_user_id = #{request.signUserId}
+        </if>
+        <if test="request.createStartTime != null and request.createStartTime !=''">
+            AND DATE_FORMAT(ss.create_time,'%Y-%m-%d') &gt;= DATE_FORMAT(#{request.createStartTime},'%Y-%m-%d')
+        </if>
+        <if test="request.createEndTime != null and request.createEndTime !=''">
+            AND DATE_FORMAT(ss.create_time,'%Y-%m-%d')  &lt;= DATE_FORMAT(#{request.createEndTime},'%Y-%m-%d')
+        </if>
+        ORDER BY ss.create_time DESC
+    </select>
 </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 515050a..60f530b 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
@@ -47,8 +47,8 @@
     String STORAGE_LOCATION = "bizStorageLocation";
     //计量专业
     String MEASURE_MAJOR = "bizMeasureMajor";
-    //管理状态
-    String MANAGER_STATE = "bizManagerState";
+    //标准装置管理状态
+    String STANDARD_MANAGER_STATE = "bizStandardManagerState";
 
     /**
      * 资源管理 字典code
@@ -95,8 +95,6 @@
     String MEASURE_STATUS = "measureStatus";
     //检定方式
     String MEASURE_TYPE = "measureType";
-    //标识打印标志类型
-    String IDENTIFY_PRINT_TYPE = "bizBusinessIdentify";
     //变更类型
     String REPORT_CHANGE_TYPE = "bizCertChangeType";
     //规模类型
@@ -111,19 +109,24 @@
     String MEASURE_CATEGORY = "measureCategory";
     //检定结果
     String MEASURE_RESULT = "measureResult";
+    //分包原因
+    String OUTSOURCE_REASON = "outsourceReason";
+
+    /**
+     * 系统管理
+     */
+    String TEMPLATE_TYPE = "templateType";
+
 
     /**
      * 标准装置 字典code
      */
     //类别
     String STANDARD_CATEGORY = "standardCategory";
-    //管理状态
-    String STANDARD_MANAGER_STATE = "standardManagerState";
     //标准等级
     String STANDARD_LEVEL = "standardLevel";
     //传递范围
     String STANDARD_TRANSMIT_RANGE = "transmitRange";
-
     //资本来源
     String CAPITAL_SOURCE = "capitalSource";
     //标准装置-申请类型
@@ -148,8 +151,6 @@
     String CERTIFICATE_CLASS = "certificationClass";
     //证书管理-检校专业
     String CALIBRATION_MAJOR = "calibrationMajor";
-    //分包原因
-    String OUTSOURCE_REASON = "outsourceReason";
 
     /**
      * 工作台
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/BaseApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/BaseApprovalListRequest.java
index 73c12c1..80d7424 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/BaseApprovalListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/BaseApprovalListRequest.java
@@ -6,6 +6,7 @@
 
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotEmpty;
+import java.util.List;
 
 /**
  * @Description:
@@ -19,14 +20,14 @@
      * 表单id
      */
     @NotBlank(message = "表单id不能为空")
-    @ApiModelProperty(value = "表单id（流程定义对应的表单id，等价于业务id）", dataType = "String")
+    @ApiModelProperty(value = "表单id（流程定义对应的表单id，等价于业务id），导出接口不用传", dataType = "String")
     private String formId;
 
     /**
      * 审批状态类型，对应ApprovalStatusEnum
      */
     @NotEmpty(message = "审批状态类型不能为空")
-    @ApiModelProperty(value = "审批状态类型code", dataType = "String")
+    @ApiModelProperty(value = "审批状态类型code，导出接口不用传", dataType = "String")
     private String approvalStatus;
 
     @ApiModelProperty(hidden = true)
@@ -34,4 +35,7 @@
 
     @ApiModelProperty(hidden = true)
     private Long createUserId;
+
+    @ApiModelProperty(value = "导出ids", dataType = "List")
+    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificatePrintApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificatePrintApprovalListRequest.java
index b93d1c9..3cc2f4e 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificatePrintApprovalListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificatePrintApprovalListRequest.java
@@ -5,8 +5,6 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import java.util.List;
-
 /**
  * @Description:
  * @Author: wangpeng
@@ -38,7 +36,4 @@
 
     @ApiModelProperty(value = "创建结束时间", dataType = "String")
     private String createTimeEnd;
-
-    @ApiModelProperty(value = "导出ids", dataType = "List")
-    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportApprovalListRequest.java
index 4f7a038..c115847 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportApprovalListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportApprovalListRequest.java
@@ -5,8 +5,6 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import java.util.List;
-
 /**
  * @Description:
  * @Author: wangpeng
@@ -15,6 +13,8 @@
 @ApiModel
 @Data
 public class CertificateReportApprovalListRequest extends BaseApprovalListRequest {
+    @ApiModelProperty(value = "委托方id", dataType = "String")
+    private Long customerId;
 
     @ApiModelProperty(value = "证书报告编号", dataType = "String")
     private String certificateReportNo;
@@ -37,6 +37,4 @@
     @ApiModelProperty(value = "检校结束时间", dataType = "String")
     private String calibrationTimeEnd;
 
-    @ApiModelProperty(value = "导出ids", dataType = "List")
-    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/identify/IdentifyListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/identify/IdentifyListRequest.java
index 1b87ae6..f019203 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/identify/IdentifyListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/identify/IdentifyListRequest.java
@@ -4,6 +4,8 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * @Description:
  * @Author: wangpeng
@@ -26,4 +28,7 @@
 
     @ApiModelProperty(value = "打印结束时间", dataType = "String")
     private String createTimeEnd;
+
+    @ApiModelProperty(value = "导出ids", dataType = "List")
+    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListRequest.java
index 1264883..62415fb 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListRequest.java
@@ -7,6 +7,7 @@
 import lombok.Data;
 
 import javax.validation.constraints.NotBlank;
+import java.util.List;
 
 @Data
 @ApiModel
@@ -37,4 +38,6 @@
     @ApiModelProperty(value = "是否加急（1是0否null全部）", dataType = "Integer")
     private String isUrgent;
 
+    @ApiModelProperty(value = "导出ids", dataType = "List")
+    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListRequest.java
index 5201d7b..499760a 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListRequest.java
@@ -17,6 +17,9 @@
     @ApiModelProperty(value = "任务单编号", dataType = "String")
     private String orderNo;
 
+    @ApiModelProperty(value = "委托方id", dataType = "Long")
+    private Long customerId;
+
     @ApiModelProperty(value = "委托方名称", dataType = "String")
     private String customerName;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OrderSampleDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OrderSampleDTO.java
new file mode 100644
index 0000000..796edc0
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OrderSampleDTO.java
@@ -0,0 +1,19 @@
+package com.casic.missiles.dto.business.outsource;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/8/24 11:38
+ */
+@ApiModel
+@Data
+public class OrderSampleDTO {
+    @ApiModelProperty(value = "任务单id", dataType = "Long")
+    private Long orderId;
+    @ApiModelProperty(value = "受检设备id", dataType = "Long")
+    private Long sampleId;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceAssessApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceAssessApprovalListRequest.java
new file mode 100644
index 0000000..9a930c3
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceAssessApprovalListRequest.java
@@ -0,0 +1,30 @@
+package com.casic.missiles.dto.business.outsource;
+
+import com.casic.missiles.dto.BaseApprovalListRequest;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/8/24 11:01
+ */
+@ApiModel
+@Data
+public class OutsourceAssessApprovalListRequest extends BaseApprovalListRequest {
+    @ApiModelProperty(value = "评审表编号", dataType = "String")
+    private String projectNo;
+
+    @ApiModelProperty(value = "分包机构名称", dataType = "String")
+    private String outsourcerName;
+
+    @ApiModelProperty(value = "申请人", dataType = "String")
+    private String applicantName;
+
+    @ApiModelProperty(value = "申请时间开始", dataType = "String")
+    private String applicantTimeStart;
+
+    @ApiModelProperty(value = "申请时间结束", dataType = "String")
+    private String applicantTimeEnd;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceAssessSaveResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceAssessSaveResponse.java
new file mode 100644
index 0000000..8bf9aad
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceAssessSaveResponse.java
@@ -0,0 +1,20 @@
+package com.casic.missiles.dto.business.outsource;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/8/14 16:17
+ */
+@ApiModel
+@Data
+public class OutsourceAssessSaveResponse {
+    @ApiModelProperty(value = "主键id", dataType = "Long")
+    private Long id;
+
+    @ApiModelProperty(value = "编号", dataType = "String")
+    private String projectNo;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProtocolApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProtocolApprovalListRequest.java
new file mode 100644
index 0000000..0f32331
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProtocolApprovalListRequest.java
@@ -0,0 +1,30 @@
+package com.casic.missiles.dto.business.outsource;
+
+import com.casic.missiles.dto.BaseApprovalListRequest;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/8/24 15:01
+ */
+@ApiModel
+@Data
+public class OutsourceProtocolApprovalListRequest extends BaseApprovalListRequest {
+    @ApiModelProperty(value = "协议书编号", dataType = "String")
+    private String protocolNo;
+
+    @ApiModelProperty(value = "分包方名称", dataType = "String")
+    private String outsourcerName;
+
+    @ApiModelProperty(value = "申请人", dataType = "String")
+    private String applicantName;
+
+    @ApiModelProperty(value = "申请时间开始", dataType = "String")
+    private String applicantTimeStart;
+
+    @ApiModelProperty(value = "申请时间结束", dataType = "String")
+    private String applicantTimeEnd;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProtocolSaveResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProtocolSaveResponse.java
new file mode 100644
index 0000000..e324967
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProtocolSaveResponse.java
@@ -0,0 +1,20 @@
+package com.casic.missiles.dto.business.outsource;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/8/14 16:17
+ */
+@ApiModel
+@Data
+public class OutsourceProtocolSaveResponse {
+    @ApiModelProperty(value = "主键id", dataType = "Long")
+    private Long id;
+
+    @ApiModelProperty(value = "编号", dataType = "String")
+    private String protocolNo;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveApprovalListRequest.java
index f29f4e4..7047c28 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveApprovalListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveApprovalListRequest.java
@@ -5,8 +5,6 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import java.util.List;
-
 /**
  * @Description: 现场检测审批列表请求实体
  * @Author: wangpeng
@@ -30,7 +28,4 @@
     @ApiModelProperty(value = "申请时间结束", dataType = "String")
     private String applyTimeEnd;
 
-    @ApiModelProperty(value = "导出ids", dataType = "List")
-    private List<Long> ids;
-
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveDetailResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveDetailResponse.java
index 1f28752..394c934 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveDetailResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveDetailResponse.java
@@ -12,6 +12,18 @@
     @ApiModelProperty(value = "id，更新/删除使用参数", dataType = "Long")
     private Long id;
 
+    @ApiModelProperty(value = "实验室代码(字典code)", dataType = "String")
+    private String labCode;
+
+    @ApiModelProperty(value = "实验室代码(字典value)", dataType = "String")
+    private String labCodeName;
+
+    @ApiModelProperty(value = "组别代码(字典code)", dataType = "String")
+    private String groupCode;
+
+    @ApiModelProperty(value = "组别代码(字典value)", dataType = "String")
+    private String groupCodeName;
+
     @ApiModelProperty(value = "审批编号", dataType = "String")
     private String siteExecutiveNo;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/environment/LocationListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/environment/LocationListRequest.java
new file mode 100644
index 0000000..13d03c3
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/environment/LocationListRequest.java
@@ -0,0 +1,20 @@
+package com.casic.missiles.dto.resource.environment;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/6/8 13:56
+ */
+@ApiModel
+@Data
+public class LocationListRequest {
+    @ApiModelProperty(value = "地点编号", dataType = "String")
+    private String locationNo;
+
+    @ApiModelProperty(value = "地点名称", dataType = "String")
+    private String locationName;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/environment/LocationListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/environment/LocationListResponse.java
new file mode 100644
index 0000000..4c531af
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/environment/LocationListResponse.java
@@ -0,0 +1,78 @@
+package com.casic.missiles.dto.resource.environment;
+
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
+import com.baomidou.mybatisplus.annotation.TableField;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description: 地点列表响应实体
+ * @Author: wangpeng
+ * @Date: 2023/6/8 13:53
+ */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
+@ApiModel
+@Data
+public class LocationListResponse {
+    @ApiModelProperty(value = "主键id", dataType = "Long")
+    private Long id;
+
+    /**
+     * 地点编号
+     */
+    @ExcelProperty("地点编号")
+    @ApiModelProperty(value = "地点编号", dataType = "String")
+    private String locationNo;
+
+    /**
+     * 地点名称
+     */
+    @ExcelProperty("地点名称")
+    @ApiModelProperty(value = "地点名称", dataType = "String")
+    private String locationName;
+
+    /**
+     * 地点位置
+     */
+    @ExcelProperty("地点位置")
+    @ApiModelProperty(value = "地点位置", dataType = "String")
+    private String locationPosition;
+
+    /**
+     * 创建人id
+     */
+    @ApiModelProperty(value = "创建人id", dataType = "Long")
+    private Long createUserId;
+
+    /**
+     * 创建人
+     */
+    @ExcelProperty("创建人")
+    @ApiModelProperty(value = "创建人", dataType = "String")
+    @TableField("create_user")
+    private String createUser;
+
+    /**
+     * 创建时间
+     */
+    @ExcelProperty("创建时间")
+    @ApiModelProperty(value = "创建时间", dataType = "String")
+    private String createTime;
+
+    /**
+     * 更新时间
+     */
+    @ApiModelProperty(value = "更新时间", dataType = "String")
+    private String updateTime;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertRequest.java
index 9a7f6c6..c827915 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertRequest.java
@@ -4,6 +4,8 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * @Description:
  * @Author: wangpeng
@@ -16,4 +18,7 @@
     private String name;
     @ApiModelProperty(value = "部门名", dataType = "String")
     private String deptName;
+
+    @ApiModelProperty(value = "导出ids", dataType = "List")
+    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertResponse.java
index f78b159..8f2f79e 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertResponse.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.dto.resource.staff;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.casic.missiles.annotation.DictCodeField;
 import com.casic.missiles.constants.MeterDictCode;
 import io.swagger.annotations.ApiModel;
@@ -13,12 +20,18 @@
  * @Author: wangpeng
  * @Date: 2023/7/27 15:13
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @ApiModel
 @Data
 public class StaffCertResponse {
     /**
      * 人员编号
      */
+    @ExcelProperty(value = "人员编号",order = 0)
     @NotEmpty(message = "人员编号不能为空")
     @ApiModelProperty(value = "人员编号", dataType = "String")
     private String staffNo;
@@ -26,6 +39,7 @@
     /**
      * 姓名
      */
+    @ExcelProperty(value = "姓名",order = 1)
     @ApiModelProperty(value = "姓名", dataType = "String")
     private String staffName;
 
@@ -54,6 +68,7 @@
     /**
      * 部门名字
      */
+    @ExcelProperty(value = "工作部门",order = 2)
     @ApiModelProperty(value = "部门名字", dataType = "String")
     private String deptName;
 
@@ -66,6 +81,7 @@
     /**
      * 计量专业
      */
+    @ExcelProperty(value = "计量专业",order = 3)
     @ApiModelProperty(value = "计量专业", dataType = "String")
     private String major;
 
@@ -110,6 +126,7 @@
     /**
      * 证书号
      */
+    @ExcelProperty(value = "证号",order = 4)
     @ApiModelProperty(value = "证书号", dataType = "String")
     private String certNo;
 
@@ -122,12 +139,14 @@
     /**
      * 有效日期
      */
+    @ExcelProperty(value = "证书有效期",order = 6)
     @ApiModelProperty(value = "有效日期", dataType = "String")
     private String effectiveDate;
 
     /**
      * 发放日期
      */
+    @ExcelProperty(value = "发证日期",order = 5)
     @ApiModelProperty(value = "发放日期", dataType = "String")
     private String grantDate;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffListRequest.java
index 7c4afb3..0a1194a 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffListRequest.java
@@ -4,6 +4,8 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * @Description:
  * @Author: wangpeng
@@ -18,4 +20,7 @@
     private String deptName;
     @ApiModelProperty(value = "部门id", dataType = "Long")
     private Long deptId;
+
+    @ApiModelProperty(value = "导出ids", dataType = "List")
+    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/TrainListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/TrainListRequest.java
index f68597b..6321f8b 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/TrainListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/TrainListRequest.java
@@ -14,6 +14,8 @@
 public class TrainListRequest {
     @ApiModelProperty(value = "训练登记表编号", dataType = "String")
     private String trainNo;
+    @ApiModelProperty(value = "值班领导", dataType = "String")
+    private String dutyLeader;
     @ApiModelProperty(value = "创建开始时间", dataType = "String")
     private String createTimeStart;
     @ApiModelProperty(value = "创建结束时间", dataType = "String")
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/SignAddRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/SignAddRequest.java
index 117be34..d71055c 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/SignAddRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/SignAddRequest.java
@@ -43,13 +43,6 @@
     private Long signUserId;
 
     /**
-     * 签章或签名-字典code
-     */
-    @NotBlank(message = "类型不能为空")
-    @ApiModelProperty(value = "签名/签章-字典code", dataType = "String", required = true)
-    private String signType;
-
-    /**
      * minio存储文件名
      */
     @ApiModelProperty(value = "上传文件返回名称", dataType = "String")
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateAddRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateAddRequest.java
index aff1265..6316648 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateAddRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateAddRequest.java
@@ -17,30 +17,28 @@
 @Data
 public class TemplateAddRequest extends BaseSystemRequest {
     /**
-     * 原始记录模板/证书报告模板名称
+     * 模板名称
      */
     @ApiModelProperty(value = "名称", dataType = "String", required = true)
     @NotBlank(message = "名称不能为空")
     private String templateName;
 
     /**
-     * 原始记录模板/证书报告模板描述
+     * 模板描述
      */
     @ApiModelProperty(value = "描述", dataType = "String")
     private String templateDesc;
 
     /**
-     * 原始记录模板/证书报告模板创建人
+     * 创建人
      */
     @ApiModelProperty(value = "创建人", dataType = "String", required = true)
     @NotBlank(message = "创建人不能为空")
     private String templateCreator;
 
-    /**
-     * 原始记录模板/证书报告模板-字典code
-     */
-    @NotBlank(message = "类型不能为空")
-    @ApiModelProperty(value = "原始记录模板/证书报告模板-字典code", dataType = "String", required = true)
+
+    @NotBlank(message = "模板类型不能为空")
+    @ApiModelProperty(value = "模板类型(字典code)", dataType = "String", required = true)
     private String templateType;
 
     /**
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateListRequest.java
index eec5a1e..6d17bbe 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateListRequest.java
@@ -1,11 +1,12 @@
 package com.casic.missiles.dto.system;
 
+import com.casic.missiles.annotation.DictCodeField;
+import com.casic.missiles.constants.MeterDictCode;
 import com.casic.missiles.dto.BaseSystemRequest;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import javax.validation.constraints.NotBlank;
 import java.util.List;
 
 /**
@@ -19,8 +20,8 @@
     /**
      * 类型
      */
-//    @ApiModelProperty(value = "类型-字典code", dataType = "String", required = true)
-    @NotBlank(message = "类型不能为空")
+    @DictCodeField(message = "模板类型不合法", cacheName = MeterDictCode.TEMPLATE_TYPE)
+    @ApiModelProperty(value = "模板类型(字典code)", dataType = "String")
     private String templateType;
 
     /**
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificateChangeApply.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificateChangeApply.java
index 9216308..36923fd 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificateChangeApply.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificateChangeApply.java
@@ -1,11 +1,19 @@
 package com.casic.missiles.model.business;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 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 com.casic.missiles.dto.BaseRequest;
+import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -20,6 +28,12 @@
  * @author wangpeng
  * @since 2023-08-15
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
+@ApiModel
 @Data
 @TableName("biz_business_certificate_change_apply")
 public class BizBusinessCertificateChangeApply extends BaseRequest implements Serializable {
@@ -33,6 +47,7 @@
     /**
      * 申请单编号
      */
+    @ExcelProperty(value = "申请单编号", order = 1)
     @ApiModelProperty(value = "申请单编号", dataType = "String")
     @TableField("change_apply_no")
     private String changeApplyNo;
@@ -40,6 +55,7 @@
     /**
      * 申请单名字
      */
+    @ExcelProperty(value = "申请单名称", order = 2)
     @ApiModelProperty(value = "申请单名字", dataType = "String")
     @TableField("change_apply_name")
     private String changeApplyName;
@@ -54,6 +70,7 @@
     /**
      * 更换证书编号
      */
+    @ExcelProperty(value = "更换证书编号", order = 3)
     @ApiModelProperty(value = "更换证书编号", dataType = "String")
     @TableField("change_report_no")
     private String changeReportNo;
@@ -61,7 +78,8 @@
     /**
      * 更换证书名字
      */
-    @ApiModelProperty(value = "更换证书名字", dataType = "String")
+    @ExcelProperty(value = "更换证书/报告名称", order = 4)
+    @ApiModelProperty(value = "更换证书/报告名称", dataType = "String")
     @TableField("change_report_name")
     private String changeReportName;
 
@@ -73,6 +91,7 @@
     @TableField("change_type")
     private String changeType;
 
+    @ExcelProperty(value = "变更类型", order = 5)
     @ApiModelProperty(value = "变更类型(字典value)", dataType = "String")
     @TableField(exist = false)
     private String changeTypeName;
@@ -142,13 +161,15 @@
     /**
      * 创建用户名字
      */
-    @ApiModelProperty(value = "创建用户名字", dataType = "String")
+    @ExcelProperty(value = "创建人", order = 6)
+    @ApiModelProperty(value = "创建人名字", dataType = "String")
     @TableField("create_user_name")
     private String createUserName;
 
     /**
      * 创建时间
      */
+    @ExcelProperty(value = "创建时间", order = 7)
     @ApiModelProperty(value = "创建时间", dataType = "String")
     @TableField("create_time")
     private String createTime;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificateReport.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificateReport.java
index f01db9e..db06018 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificateReport.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificateReport.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.model.business;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -22,6 +29,11 @@
  * @author wangpeng
  * @since 2023-08-14
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @ApiModel
 @Data
 @TableName("biz_business_certificate_report")
@@ -36,6 +48,7 @@
     /**
      * 证书报告编号
      */
+    @ExcelProperty(value = "证书报告编号", order = 1)
     @ApiModelProperty(value = "证书报告编号", dataType = "String")
     @TableField("certificate_report_no")
     private String certificateReportNo;
@@ -43,6 +56,7 @@
     /**
      * 证书报告名称
      */
+    @ExcelProperty(value = "证书报告名称", order = 2)
     @ApiModelProperty(value = "证书报告名称", dataType = "String")
     @TableField("certificate_report_name")
     private String certificateReportName;
@@ -62,6 +76,7 @@
     @TableField("measure_category")
     private String measureCategory;
 
+    @ExcelProperty(value = "检校类别", order = 6)
     @ApiModelProperty(value = "检校类别(字典value)", dataType = "String")
     @TableField(exist = false)
     private String measureCategoryName;
@@ -69,6 +84,7 @@
     /**
      * 检校时间
      */
+    @ExcelProperty(value = "检校时间", order = 8)
     @ApiModelProperty(value = "检校时间", dataType = "String")
     @TableField("calibration_time")
     private String calibrationTime;
@@ -267,18 +283,22 @@
     @TableField(exist = false)
     private Integer decisionItem;
 
-    @ApiModelProperty(value = "设备样品编号（列表返回参数）", dataType = "String")
+    @ExcelProperty(value = "被检设备统一编号", order = 3)
+    @ApiModelProperty(value = "被检设备统一编号（列表返回参数）", dataType = "String")
     @TableField(exist = false)
     private String sampleNo;
 
-    @ApiModelProperty(value = "设备样品名称（列表返回参数）", dataType = "String")
+    @ExcelProperty(value = "被检设备名称", order = 4)
+    @ApiModelProperty(value = "被检设备名称（列表返回参数）", dataType = "String")
     @TableField(exist = false)
     private String sampleName;
 
-    @ApiModelProperty(value = "设备样品规格型号（列表返回参数）", dataType = "String")
+    @ExcelProperty(value = "规格型号", order = 5)
+    @ApiModelProperty(value = "规格型号（列表返回参数）", dataType = "String")
     @TableField(exist = false)
     private String sampleModel;
 
+    @ExcelProperty(value = "检定员", order = 7)
     @ApiModelProperty(value = "检定员名字（列表返回参数）", dataType = "String")
     @TableField(exist = false)
     private String staffName;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessIdentifyInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessIdentifyInfo.java
index 46bfba5..f1a9bec 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessIdentifyInfo.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessIdentifyInfo.java
@@ -1,10 +1,15 @@
 package com.casic.missiles.model.business;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 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;
 
@@ -20,6 +25,11 @@
  * @author wangpeng
  * @since 2023-08-15
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @Data
 @TableName("biz_business_identify_info")
 public class BizBusinessIdentifyInfo implements Serializable {
@@ -33,6 +43,7 @@
     /**
      * 记录编号
      */
+    @ExcelProperty(value = "记录编号", order = 1)
     @ApiModelProperty(value = "记录编号", dataType = "String")
     @TableField("record_no")
     private String recordNo;
@@ -41,20 +52,15 @@
      * 标志类型(字典code)
      */
     @NotEmpty(message = "标志类型不能为空")
-    @ApiModelProperty(value = "标志类型(字典code)", dataType = "String")
-    @DictCodeField(message = "标志类型不合法", cacheName = MeterDictCode.IDENTIFY_PRINT_TYPE)
+    @ApiModelProperty(value = "标志类型(直接存计量标识/使用状态/校准状态的字典value)", dataType = "String")
     @TableField("identify_type")
     private String identifyType;
 
-    @ApiModelProperty(value = "标志类型(字典value)", dataType = "String")
-    @TableField(exist = false)
-    private String identifyTypeName;
-
     /**
      * 设备id(可以是受检设备/设备台账)
      */
     @NotNull(message = "设备id不能为空")
-    @ApiModelProperty(value = "设备id(可以是受检设备/设备台账)", dataType = "String")
+    @ApiModelProperty(value = "设备id(可以是受检设备/设备台账)", dataType = "Long")
     @TableField("device_id")
     private Long deviceId;
 
@@ -66,29 +72,32 @@
     @TableField("device_type")
     private String deviceType;
 
+    @ExcelProperty(value = "统一编号", order = 3)
     @NotEmpty(message = "设备编号不能为空")
-    @ApiModelProperty(value = "设备编号", dataType = "String")
+    @ApiModelProperty(value = "统一编号", dataType = "String")
     @TableField("device_no")
     private String deviceNo;
 
     /**
      * 设备名字
      */
-    @NotEmpty(message = "设备名字不能为空")
-    @ApiModelProperty(value = "设备名字", dataType = "String")
+    @ExcelProperty(value = "设备名称", order = 4)
+    @NotEmpty(message = "设备名称不能为空")
+    @ApiModelProperty(value = "设备名称", dataType = "String")
     @TableField("device_name")
     private String deviceName;
 
     /**
      * 检定员id
      */
-    @ApiModelProperty(value = "检定员id", dataType = "String")
+    @ApiModelProperty(value = "检定员id", dataType = "Long")
     @TableField("measure_person_id")
     private Long measurePersonId;
 
     /**
      * 检定员名字
      */
+    @ExcelProperty(value = "检定员", order = 5)
     @ApiModelProperty(value = "检定员名字", dataType = "String")
     @TableField("measure_person")
     private String measurePerson;
@@ -103,7 +112,8 @@
     /**
      * 更新时间
      */
-    @ApiModelProperty(value = "更新时间", dataType = "String")
+    @ExcelProperty(value = "打印时间", order = 6)
+    @ApiModelProperty(value = "打印时间", dataType = "String")
     @TableField("update_time")
     private String updateTime;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceAssess.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceAssess.java
index 659d9ca..6720b90 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceAssess.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceAssess.java
@@ -1,11 +1,26 @@
 package com.casic.missiles.model.business;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 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 com.casic.missiles.dto.BaseRequest;
+import com.casic.missiles.dto.business.outsource.OrderSampleDTO;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import javax.validation.constraints.NotEmpty;
 import java.io.Serializable;
+import java.util.List;
 
 /**
  * <p>
@@ -15,146 +30,231 @@
  * @author wangpeng
  * @since 2023-08-16
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
+@ApiModel
 @Data
 @TableName("biz_business_outsource_assess")
-public class BizBusinessOutsourceAssess implements Serializable {
+public class BizBusinessOutsourceAssess extends BaseRequest implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
+    @ApiModelProperty(value = "id，更新/删除使用参数", dataType = "Long")
     @TableId("id")
     private Long id;
 
     /**
      * 评审表编号
      */
+    @ExcelProperty(value = "评审表编号", order = 1)
+    @ApiModelProperty(value = "评审表编号(后台生成)", dataType = "String")
     @TableField("project_no")
     private String projectNo;
 
     /**
      * 评审表名称
      */
+    @ExcelProperty(value = "评审表名称", order = 2)
+    @ApiModelProperty(value = "评审表名称", dataType = "String")
     @TableField("project_name")
     private String projectName;
 
+    @NotEmpty(message = "实验室代码不能为空")
+    @DictCodeField(message = "实验室代码描述不合法", cacheName = MeterDictCode.LAB_CODE)
+    @ApiModelProperty(value = "实验室代码(字典code)", dataType = "String")
+    @TableField("lab_code")
+    private String labCode;
+
+    @ApiModelProperty(value = "实验室代码(字典value)", dataType = "String")
+    @TableField(exist = false)
+    private String labCodeName;
+
+    /**
+     * 组别代码
+     */
+    @NotEmpty(message = "组别代码不能为空")
+    @DictCodeField(message = "组别代码描述不合法", cacheName = MeterDictCode.GROUP_CODE)
+    @ApiModelProperty(value = "组别代码(字典code)", dataType = "String")
+    @TableField("group_code")
+    private String groupCode;
+
+    @ApiModelProperty(value = "组别代码(字典value)", dataType = "String")
+    @TableField(exist = false)
+    private String groupCodeName;
+
     /**
      * 申请人id
      */
+    @ApiModelProperty(value = "申请人id", dataType = "String")
     @TableField("applicant_id")
     private Long applicantId;
 
     /**
      * 申请人名字
      */
+    @ExcelProperty(value = "申请人", order = 5)
+    @ApiModelProperty(value = "申请人", dataType = "String")
     @TableField("applicant_name")
     private String applicantName;
 
     /**
      * 申请时间
      */
+    @ExcelProperty(value = "申请时间", order = 6)
+    @ApiModelProperty(value = "申请时间", dataType = "String")
     @TableField("applicant_time")
     private String applicantTime;
 
     /**
      * 附件(minio存储文件名)
      */
+    @ApiModelProperty(value = "附件(minio存储文件名)", dataType = "String")
     @TableField("minio_file_name")
     private String minioFileName;
 
     /**
      * 备注
      */
+    @ApiModelProperty(value = "备注", dataType = "String")
     @TableField("remark")
     private String remark;
 
     /**
      * 创建人id
      */
+    @ApiModelProperty(value = "创建人id", dataType = "String")
     @TableField("create_user_id")
     private Long createUserId;
 
     /**
      * 创建人名字
      */
+    @ApiModelProperty(value = "创建人名字", dataType = "String")
     @TableField("create_user_name")
     private String createUserName;
 
     /**
      * 分包方id
      */
+    @ApiModelProperty(value = "评审表编号", dataType = "String")
     @TableField("outsourcer_id")
     private Long outsourcerId;
 
     /**
      * 预计开始时间
      */
+    @ApiModelProperty(value = "预计开始时间", dataType = "String")
     @TableField("pre_start_time")
     private String preStartTime;
 
     /**
      * 预计结束时间
      */
+    @ApiModelProperty(value = "预计结束时间", dataType = "String")
     @TableField("pre_end_time")
     private String preEndTime;
 
     /**
      * 分包原因-字典
      */
+    @ApiModelProperty(value = "分包原因(字典code)", dataType = "String")
+    @DictCodeField(message = "分包原因描述不合法", cacheName = MeterDictCode.OUTSOURCE_REASON)
     @TableField("outsource_reason")
     private String outsourceReason;
 
+    @ApiModelProperty(value = "分包原因(字典value)", dataType = "String")
+    @TableField(exist = false)
+    private String outsourceReasonName;
+
     /**
      * 预计费用
      */
+    @ApiModelProperty(value = "预计费用", dataType = "String")
     @TableField("pre_cost")
     private String preCost;
 
     /**
      * 审批状态
      */
+    @ApiModelProperty(value = "审批状态", dataType = "String")
+    @DictCodeField(message = "审批状态描述不合法", cacheName = MeterDictCode.APPROVAL_STATUS)
     @TableField("approval_status")
     private String approvalStatus;
 
     /**
      * 流程实例id
      */
+    @ApiModelProperty(value = "流程实例id", dataType = "String")
     @TableField("process_id")
     private String processId;
 
     /**
      * 实验室认可情况
      */
+    @ApiModelProperty(value = "实验室认可情况", dataType = "String")
     @TableField("approve_situation")
     private String approveSituation;
 
     /**
      * 溯源性
      */
+    @ApiModelProperty(value = "溯源性", dataType = "String")
     @TableField("traceability")
     private String traceability;
 
     /**
      * 测试方法
      */
+    @ApiModelProperty(value = "测试方法", dataType = "String")
     @TableField("test_method")
     private String testMethod;
 
     /**
      * 技术能力
      */
+    @ApiModelProperty(value = "技术能力", dataType = "String")
     @TableField("technique_ability")
     private String techniqueAbility;
 
     /**
      * 创建时间
      */
+    @ApiModelProperty(hidden = true)
     @TableField("create_time")
     private String createTime;
 
     /**
      * 更新时间
      */
+    @ApiModelProperty(hidden = true)
     @TableField("update_time")
     private String updateTime;
 
+    @ApiModelProperty(value = "审批状态类型-字典value", dataType = "String")
+    @TableField(exist = false)
+    private String approvalStatusName;
 
+    @ApiModelProperty(value = "任务id（同意、驳回等操作使用）", dataType = "String")
+    @TableField(exist = false)
+    private String taskId;
+
+    @ApiModelProperty(value = "可选决策项（1同意驳回拒绝 2同意驳回 3同意拒绝，用于待审批列表同意/驳回/拒绝按钮展示）", dataType = "Integer")
+    @TableField(exist = false)
+    private Integer decisionItem;
+
+    @NotEmpty(message = "受检设备信息不能为空")
+    @ApiModelProperty(value = "受检设备id列表（新建使用参数）", dataType = "List")
+    @TableField(exist = false)
+    private List<OrderSampleDTO> orderSampleList;
+
+    @ExcelProperty(value = "分包机构名称", order = 3)
+    @ApiModelProperty(value = "分包机构名称（列表返回参数）", dataType = "String")
+    private String outsourcerName;
+
+    @ExcelProperty(value = "机构负责人", order = 4)
+    @ApiModelProperty(value = "机构负责人（列表返回参数）", dataType = "String")
+    private String director;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceProtocol.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceProtocol.java
new file mode 100644
index 0000000..38df697
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceProtocol.java
@@ -0,0 +1,225 @@
+package com.casic.missiles.model.business;
+
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
+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 com.casic.missiles.dto.BaseRequest;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotEmpty;
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 计量检定业务-分包管理-测试、校准或检定工作分包协议书
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-08-24
+ */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
+@Data
+@TableName("biz_business_outsource_protocol")
+public class BizBusinessOutsourceProtocol extends BaseRequest implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "id，更新/删除使用参数", dataType = "Long")
+    @TableId("id")
+    private Long id;
+
+    /**
+     * 协议书编号
+     */
+    @ExcelProperty(value = "协议书编号", order = 1)
+    @ApiModelProperty(value = "协议书编号(后台生成)", dataType = "String")
+    @TableField("protocol_no")
+    private String protocolNo;
+
+    /**
+     * 协议书名称
+     */
+    @ExcelProperty(value = "协议书名称", order = 2)
+    @ApiModelProperty(value = "协议书名称", dataType = "String")
+    @TableField("project_name")
+    private String projectName;
+
+    @NotEmpty(message = "实验室代码不能为空")
+    @DictCodeField(message = "实验室代码描述不合法", cacheName = MeterDictCode.LAB_CODE)
+    @ApiModelProperty(value = "实验室代码(字典code)", dataType = "String")
+    @TableField("lab_code")
+    private String labCode;
+
+    @ApiModelProperty(value = "实验室代码(字典value)", dataType = "String")
+    @TableField(exist = false)
+    private String labCodeName;
+
+    @NotEmpty(message = "组别代码不能为空")
+    @DictCodeField(message = "组别代码描述不合法", cacheName = MeterDictCode.GROUP_CODE)
+    @ApiModelProperty(value = "组别代码(字典code)", dataType = "String")
+    @TableField("group_code")
+    private String groupCode;
+
+    @ApiModelProperty(value = "组别代码(字典value)", dataType = "String")
+    @TableField(exist = false)
+    private String groupCodeName;
+
+    /**
+     * 分包方id
+     */
+    @ApiModelProperty(value = "分包方id", dataType = "Long")
+    @TableField("outsourcer_id")
+    private Long outsourcerId;
+
+    /**
+     * 其他
+     */
+    @ApiModelProperty(value = "其他", dataType = "String")
+    @TableField("remark")
+    private String remark;
+
+    /**
+     * 分包方编号
+     */
+    @ApiModelProperty(value = "分包方编号(新建不用传)", dataType = "String")
+    @TableField("outsource_no")
+    private String outsourceNo;
+
+    /**
+     * 分包方名称
+     */
+    @ExcelProperty(value = "分包方名称", order = 3)
+    @ApiModelProperty(value = "分包方名称(新建不用传)", dataType = "String")
+    @TableField("outsource_name")
+    private String outsourceName;
+
+    /**
+     * 联系人
+     */
+    @ExcelProperty(value = "联系人", order = 4)
+    @ApiModelProperty(value = "联系人", dataType = "String")
+    @TableField("contacts")
+    private String contacts;
+
+    /**
+     * 电话
+     */
+    @ApiModelProperty(value = "电话", dataType = "String")
+    @TableField("mobile")
+    private String mobile;
+
+    /**
+     * 地址
+     */
+    @ApiModelProperty(value = "地址", dataType = "String")
+    @TableField("address")
+    private String address;
+
+    /**
+     * 要求完成日期
+     */
+    @ApiModelProperty(value = "要求完成日期", dataType = "String")
+    @TableField("require_date")
+    private String requireDate;
+
+    /**
+     * 分包费用(元)
+     */
+    @ApiModelProperty(value = "分包费用(元)", dataType = "String")
+    @TableField("outsource_cost")
+    private Double outsourceCost;
+
+    /**
+     * 分包方负责人
+     */
+    @ApiModelProperty(value = "分包方负责人", dataType = "String")
+    @TableField("director")
+    private String director;
+
+    /**
+     * 分包项目
+     */
+    @ApiModelProperty(value = "分包项目", dataType = "String")
+    @TableField("item")
+    private String item;
+
+    /**
+     * 分包要求
+     */
+    @ApiModelProperty(value = "分包要求", dataType = "String")
+    @TableField("requires")
+    private String requires;
+
+    /**
+     * 创建人id
+     */
+    @ApiModelProperty(hidden = true)
+    @TableField("create_user_id")
+    private Long createUserId;
+
+    /**
+     * 创建人名字
+     */
+    @ExcelProperty(value = "申请人", order = 5)
+    @ApiModelProperty(value = "申请人", dataType = "String")
+    @TableField("create_user_name")
+    private String createUserName;
+
+    /**
+     * 审批状态
+     */
+    @ApiModelProperty(value = "审批状态", dataType = "String")
+    @DictCodeField(message = "审批状态描述不合法", cacheName = MeterDictCode.APPROVAL_STATUS)
+    @TableField("approval_status")
+    private String approvalStatus;
+
+    /**
+     * 流程实例id
+     */
+    @ApiModelProperty(value = "流程实例id", dataType = "String")
+    @TableField("process_id")
+    private String processId;
+
+    /**
+     * 创建时间
+     */
+    @ExcelProperty(value = "申请时间", order = 6)
+    @ApiModelProperty(value = "申请时间", dataType = "String")
+    @TableField("create_time")
+    private String createTime;
+
+    /**
+     * 更新时间
+     */
+    @ApiModelProperty(hidden = true)
+    @TableField("update_time")
+    private String updateTime;
+
+    @ApiModelProperty(value = "审批状态类型-字典value", dataType = "String")
+    @TableField(exist = false)
+    private String approvalStatusName;
+
+    @ApiModelProperty(value = "任务id（同意、驳回等操作使用）", dataType = "String")
+    @TableField(exist = false)
+    private String taskId;
+
+    @ApiModelProperty(value = "可选决策项（1同意驳回拒绝 2同意驳回 3同意拒绝，用于待审批列表同意/驳回/拒绝按钮展示）", dataType = "Integer")
+    @TableField(exist = false)
+    private Integer decisionItem;
+
+
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourcerInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourcerInfo.java
index ec4e997..f9aa69e 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourcerInfo.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourcerInfo.java
@@ -17,6 +17,7 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import javax.validation.constraints.NotEmpty;
 import java.io.Serializable;
 
 /**
@@ -59,6 +60,29 @@
     @TableField("outsourcer_name")
     private String outsourcerName;
 
+    @NotEmpty(message = "实验室代码不能为空")
+    @DictCodeField(message = "实验室代码描述不合法", cacheName = MeterDictCode.LAB_CODE)
+    @ApiModelProperty(value = "实验室代码(字典code)", dataType = "String")
+    @TableField("lab_code")
+    private String labCode;
+
+    @ApiModelProperty(value = "实验室代码(字典value)", dataType = "String")
+    @TableField(exist = false)
+    private String labCodeName;
+
+    /**
+     * 组别代码
+     */
+    @NotEmpty(message = "组别代码不能为空")
+    @DictCodeField(message = "组别代码描述不合法", cacheName = MeterDictCode.GROUP_CODE)
+    @ApiModelProperty(value = "组别代码(字典code)", dataType = "String")
+    @TableField("group_code")
+    private String groupCode;
+
+    @ApiModelProperty(value = "组别代码(字典value)", dataType = "String")
+    @TableField(exist = false)
+    private String groupCodeName;
+
     /**
      * 单位简称
      */
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardInfo.java
index c48eed7..dffdfdd 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardInfo.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardInfo.java
@@ -5,6 +5,7 @@
 import com.baomidou.mybatisplus.annotation.TableName;
 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;
 
@@ -18,6 +19,7 @@
  * @author wangpeng
  * @since 2023-08-04
  */
+@ApiModel
 @Data
 @TableName("biz_equipment_standard_info")
 public class BizEquipmentStandardInfo implements Serializable {
@@ -119,7 +121,7 @@
      * 管理状态(字典code)
      */
     @ApiModelProperty(value = "管理状态(字典code)", dataType = "String")
-    @DictCodeField(message = "管理状态不合法", cacheName = MeterDictCode.MANAGER_STATE)
+    @DictCodeField(message = "管理状态不合法", cacheName = MeterDictCode.STANDARD_MANAGER_STATE)
     @TableField("manage_status")
     private String manageStatus;
 
@@ -151,7 +153,7 @@
     /**
      * 温度(℃)
      */
-    @ApiModelProperty(value = "使用状态(字典code)", dataType = "String")
+    @ApiModelProperty(value = "温度(℃)", dataType = "String")
     @TableField("temperature")
     private Double temperature;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardInfoApproval.java b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardInfoApproval.java
index dbd86ab..9f58d83 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardInfoApproval.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardInfoApproval.java
@@ -150,7 +150,7 @@
      * 管理状态(字典code)
      */
     @ApiModelProperty(value = "管理状态(字典code)", dataType = "String")
-    @DictCodeField(message = "管理状态不合法", cacheName = MeterDictCode.MANAGER_STATE)
+    @DictCodeField(message = "管理状态不合法", cacheName = MeterDictCode.STANDARD_MANAGER_STATE)
     @TableField("manage_status")
     private String manageStatus;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardTechnologyRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardTechnologyRelation.java
index 0e612bd..751f26b 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardTechnologyRelation.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardTechnologyRelation.java
@@ -3,6 +3,7 @@
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -16,6 +17,7 @@
  * @author wangpeng
  * @since 2023-08-04
  */
+@ApiModel
 @Data
 @TableName("biz_equipment_standard_technology_relation")
 public class BizEquipmentStandardTechnologyRelation implements Serializable {
@@ -33,6 +35,10 @@
     @TableField("technology_file_id")
     private Long technologyFileId;
 
+    @ApiModelProperty(value = "依据的技术文件编号", dataType = "String")
+    @TableField("technology_file_no")
+    private String technologyFileNo;
+
     /**
      * 依据的技术文件名称(技术文件中现行测试校准检定方法表文件名字段)
      */
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerInfo.java
index d6e8bed..65cd6bc 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerInfo.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerInfo.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.model.resource;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -21,6 +28,11 @@
  * @author wangpeng
  * @since 2023-08-08
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @ApiModel
 @Data
 @TableName("biz_resource_customer_info")
@@ -35,6 +47,7 @@
     /**
      * 委托方编号
      */
+    @ExcelProperty(value = "委托方编号", order = 1)
     @ApiModelProperty(value = "委托方编号", dataType = "String")
     @TableField("customer_no")
     private String customerNo;
@@ -42,6 +55,7 @@
     /**
      * 委托方名称
      */
+    @ExcelProperty(value = "委托方名称", order = 2)
     @ApiModelProperty(value = "委托方名称(新建时为下拉选择一个受检单位组织的名字，传deptId字段，后端获取名称)", dataType = "String")
     @TableField("customer_name")
     private String customerName;
@@ -63,6 +77,7 @@
     /**
      * 联系人
      */
+    @ExcelProperty(value = "联系人", order = 3)
     @ApiModelProperty(value = "联系人", dataType = "String")
     @TableField("contacts")
     private String contacts;
@@ -70,6 +85,7 @@
     /**
      * 座机电话
      */
+    @ExcelProperty(value = "座机电话", order = 4)
     @ApiModelProperty(value = "座机电话", dataType = "String")
     @TableField("mobile")
     private String mobile;
@@ -77,6 +93,7 @@
     /**
      * 手机号码
      */
+    @ExcelProperty(value = "手机号码", order = 5)
     @ApiModelProperty(value = "手机号码", dataType = "String")
     @TableField("phone")
     private String phone;
@@ -91,6 +108,7 @@
     /**
      * 地址
      */
+    @ExcelProperty(value = "地址", order = 6)
     @ApiModelProperty(value = "地址", dataType = "String")
     @TableField("address")
     private String address;
@@ -141,6 +159,7 @@
     /**
      * 创建时间
      */
+    @ExcelProperty(value = "创建时间", order = 7)
     @ApiModelProperty(value = "创建时间", dataType = "String")
     @TableField("create_time")
     private String createTime;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerSuggestForm.java b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerSuggestForm.java
index 7201bbd..701bf8b 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerSuggestForm.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerSuggestForm.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.model.resource;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -22,6 +29,11 @@
  * @author wangpeng
  * @since 2023-08-08
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @ApiModel
 @Data
 @TableName("biz_resource_customer_suggest_form")
@@ -44,7 +56,8 @@
     /**
      * 委托方名称
      */
-    @ApiModelProperty(value = "委托方名称", dataType = "String")
+    @ExcelProperty(value = "意见反馈单位", order = 2)
+    @ApiModelProperty(value = "意见反馈单位", dataType = "String")
     @TableField("customer_name")
     private String customerName;
 
@@ -59,7 +72,8 @@
     /**
      * 委托方意见反馈部门名称
      */
-    @ApiModelProperty(value = "委托方意见反馈部门名称", dataType = "String")
+    @ExcelProperty(value = "委托方意见反馈部门", order = 3)
+    @ApiModelProperty(value = "委托方意见反馈部门", dataType = "String")
     @TableField("customer_dept_name")
     private String customerDeptName;
 
@@ -73,6 +87,7 @@
     /**
      * 表单编号
      */
+    @ExcelProperty(value = "表单编号", order = 1)
     @ApiModelProperty(value = "表单编号", dataType = "String")
     @TableField("form_no")
     private String formNo;
@@ -111,6 +126,7 @@
     /**
      * 创建人名字
      */
+    @ExcelProperty(value = "创建人", order = 4)
     @ApiModelProperty(value = "创建人名字", dataType = "String")
     @TableField("create_user_name")
     private String createUserName;
@@ -147,6 +163,7 @@
     /**
      * 创建时间
      */
+    @ExcelProperty(value = "创建时间", order = 5)
     @ApiModelProperty(value = "创建时间", dataType = "String")
     @TableField("create_time")
     private String createTime;

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java
index bb0c50f..13a699b 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java
@@ -12,6 +12,7 @@
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.IGeneralApprovalService;
+import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
@@ -19,6 +20,7 @@
 import org.springframework.web.bind.annotation.RequestBody;
 
 import javax.validation.Valid;
+import java.util.List;
 import java.util.Objects;
 
 /**
@@ -117,4 +119,17 @@
         }
         return baseApprovalService.failUpdate(request);
     }
+
+    public List<O> exportList(@RequestBody @Valid R request) throws Exception {
+        List<O> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = baseApprovalService.listExportByIds(request.getIds());
+        } else {
+            list = baseApprovalService.listExport(request);
+        }
+        for (O record : list) {
+            DictCodeUtils.convertDictCodeToName(record);
+        }
+        return list;
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java
index 8a90961..d775831 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java
@@ -5,6 +5,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.business.certificate.CertificateChangeApplyApprovalListRequest;
 import com.casic.missiles.dto.business.certificate.CertificateChangeApplySaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessCertificateChangeApply;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
@@ -20,6 +21,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -48,4 +50,12 @@
         }
         return changeApplyService.saveChangeApply(request);
     }
+
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody CertificateChangeApplyApprovalListRequest request) throws Exception {
+        List<BizBusinessCertificateChangeApply> list = super.exportList(request);
+        super.exportExcel(BizBusinessCertificateChangeApply.class, list, ExportEnum.CERTIFICATE_CHANGE_APPLY.getSheetName());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java
index 5fc4b07..af8230e 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java
@@ -9,6 +9,7 @@
 import com.casic.missiles.dto.business.certificate.CertificatePrintApprovalListRequest;
 import com.casic.missiles.dto.business.certificate.CertificatePrintListResponse;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.enums.business.CertificatePrintStatusEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessCertificatePrintLog;
@@ -18,10 +19,16 @@
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.io.IOException;
+import java.util.List;
 import java.util.Objects;
 
 /**
@@ -98,4 +105,16 @@
         });
         return certificatePrintService.certificatePrintLog(idDTO.getId());
     }
+
+    @ApiOperation("证书打印审批导出")
+    @PostMapping("/listExport")
+    public void exportList(@RequestBody CertificatePrintApprovalListRequest request) throws IOException {
+        List<CertificatePrintListResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = certificatePrintService.listByIds(request.getIds());
+        } else {
+            list = certificatePrintService.list(request);
+        }
+        super.exportExcel(CertificatePrintListResponse.class, list, ExportEnum.CERTIFICATE_PRINT.getSheetName());
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java
index 63b06dc..6b2efd5 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java
@@ -6,6 +6,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.business.certificate.CertificateReportApprovalListRequest;
 import com.casic.missiles.dto.business.certificate.CertificateReportSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessCertificateReport;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
@@ -21,6 +22,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -50,7 +52,7 @@
         return certificateReportService.saveCertificateReport(request);
     }
 
-    @ApiOperation("证书审批详情（基本信息）")
+    @ApiOperation("详情（基本信息）")
     @PostMapping("/detail")
     public ReturnDTO<BizBusinessCertificateReport> detail(@RequestBody @Valid BaseDetailRequest request, BindingResult bindingResult) throws Exception {
         if(bindingResult.hasErrors()){
@@ -59,4 +61,11 @@
         return certificateReportService.detail(request);
     }
 
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody CertificateReportApprovalListRequest request) throws Exception {
+        List<BizBusinessCertificateReport> list = super.exportList(request);
+        super.exportExcel(BizBusinessCertificateReport.class, list, ExportEnum.CERTIFICATE_REPORT.getSheetName());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java
index 46b26bd..57c0809 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java
@@ -10,20 +10,21 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.business.identify.IdentifyListRequest;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessIdentifyInfo;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.business.IBizBusinessIdentifyInfoService;
+import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import javax.validation.Valid;
+import java.util.List;
 import java.util.Objects;
 
 /**
@@ -57,16 +58,13 @@
         return identifyInfoService.addIdentify(identifyInfo);
     }
 
-    @ApiOperation("标识打印更新")
+    @ApiOperation("标识打印更新（更新打印时间）")
     @PostMapping("/update")
-    public ReturnDTO updateIdentify(@RequestBody @Valid BizBusinessIdentifyInfo identifyInfo, BindingResult bindingResult) {
-        Assert.isFalse(Objects.isNull(identifyInfo.getId()), () -> {
+    public ReturnDTO updateIdentify(@RequestBody @Valid IdDTO idDTO) {
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        Assert.isFalse(bindingResult.hasErrors(), () -> {
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        });
-        return identifyInfoService.updateIdentify(identifyInfo);
+        return identifyInfoService.updateIdentify(idDTO.getId());
     }
 
     @ApiOperation("标识打印删除")
@@ -77,4 +75,37 @@
         });
         return identifyInfoService.deleteIdentify(idDTO.getId());
     }
+
+    @ApiOperation("标识打印导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody @Valid IdentifyListRequest request, BindingResult bindingResult) throws Exception {
+        if (bindingResult.hasErrors()) {
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        List<BizBusinessIdentifyInfo> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = identifyInfoService.listByIds(request.getIds());
+        } else {
+            list = identifyInfoService.list(request);
+        }
+        for (BizBusinessIdentifyInfo record : list) {
+            DictCodeUtils.convertDictCodeToName(record);
+        }
+        super.exportExcel(BizBusinessIdentifyInfo.class, list, ExportEnum.IDENTIFY_EXPORT.getSheetName());
+    }
+
+
+    // TODO: 2023/8/23 查询设备信息，4个底部按钮查设备（按钮的作用就是前端用来调不同接口、用来区分中间即将展示的标识），前端弹窗选设备，在确定保存时前端根据底部按钮判断传入设备类型deviceType字典code
+    // TODO: 2023/8/23 接口：查受检设备（第1个按钮），查设备台账（后3个按钮同一接口），查询之后前端根据标志类型的不同加到中间页面时进行判断（按产品给的对应表）
+    // TODO: 2023/8/23 提供二维码接口，前端在加到中间页面时调用一下
+
+    @ApiOperation("设备二维码")
+    @PostMapping("/equipment/qrCode")
+    public ReturnDTO<String> equipmentQrCode(@RequestBody @Valid IdDTO idDTO) {
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return identifyInfoService.equipmentQrCode(idDTO.getId());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java
index 707be6e..7e0453d 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java
@@ -117,7 +117,7 @@
     }
 
     @ApiOperation("任务单导出")
-    @PostMapping("/export")
+    @PostMapping("/listExport")
     public void orderExport(@RequestBody @Valid OrderListRequest request, HttpServletResponse response) {
         businessOrderService.orderExport(request, response);
     }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java
index 529a6ce..51432be 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java
@@ -1,9 +1,28 @@
 package com.casic.missiles.controller.business;
 
+import com.casic.missiles.controller.GeneralApprovalController;
+import com.casic.missiles.dto.BaseApprovalSubmitRequest;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.business.outsource.OutsourceAssessApprovalListRequest;
+import com.casic.missiles.dto.business.outsource.OutsourceAssessSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
+import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.model.business.BizBusinessOutsourceAssess;
+import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
+import com.casic.missiles.service.IGeneralApprovalService;
+import com.casic.missiles.service.business.IBizBusinessOutsourceAssessService;
 import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.BindingResult;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.validation.Valid;
+import java.util.List;
+
 /**
  * <p>
  * 计量检定业务-分包管理-测试、校准或检定工作分包评审表 前端控制器
@@ -15,6 +34,27 @@
 @Api(tags = "分包管理-测试、校准或检定工作分包评审表")
 @RestController
 @RequestMapping("/business/outsource/assess")
-public class BizBusinessOutsourceAssessController {
+public class BizBusinessOutsourceAssessController extends GeneralApprovalController<BizBusinessOutsourceAssess, BizBusinessOutsourceAssess, OutsourceAssessApprovalListRequest, BaseApprovalSubmitRequest> {
+    @Autowired
+    private IBizBusinessOutsourceAssessService outsourceAssessService;
 
+    public BizBusinessOutsourceAssessController(IGeneralApprovalService<BizBusinessOutsourceAssess, BizBusinessOutsourceAssess, OutsourceAssessApprovalListRequest, BaseApprovalSubmitRequest> baseApprovalService) {
+        super(baseApprovalService);
+    }
+
+    @ApiOperation("草稿箱-保存")
+    @PostMapping("/save")
+    public ReturnDTO<OutsourceAssessSaveResponse> saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceAssess request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        return outsourceAssessService.saveOutsourceAssess(request);
+    }
+
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception {
+        List<BizBusinessOutsourceAssess> list = super.exportList(request);
+        super.exportExcel(BizBusinessOutsourceAssess.class, list, ExportEnum.OUTSOURCE_ASSESS.getSheetName());
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java
new file mode 100644
index 0000000..9adef18
--- /dev/null
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java
@@ -0,0 +1,60 @@
+package com.casic.missiles.controller.business;
+
+import com.casic.missiles.controller.GeneralApprovalController;
+import com.casic.missiles.dto.BaseApprovalSubmitRequest;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.business.outsource.OutsourceProtocolApprovalListRequest;
+import com.casic.missiles.dto.business.outsource.OutsourceProtocolSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
+import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.model.business.BizBusinessOutsourceProtocol;
+import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
+import com.casic.missiles.service.IGeneralApprovalService;
+import com.casic.missiles.service.business.IBizBusinessOutsourceProtocolService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.BindingResult;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.validation.Valid;
+import java.util.List;
+
+/**
+ * <p>
+ * 计量检定业务-分包管理-测试、校准或检定工作分包协议书 前端控制器
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-08-24
+ */
+@Api(tags = "分包管理-测试、校准或检定工作分包协议书")
+@RestController
+@RequestMapping("/business/outsource/protocol")
+public class BizBusinessOutsourceProtocolController extends GeneralApprovalController<BizBusinessOutsourceProtocol, BizBusinessOutsourceProtocol, OutsourceProtocolApprovalListRequest, BaseApprovalSubmitRequest> {
+    @Autowired
+    private IBizBusinessOutsourceProtocolService outsourceProtocolService;
+
+    public BizBusinessOutsourceProtocolController(IGeneralApprovalService<BizBusinessOutsourceProtocol, BizBusinessOutsourceProtocol, OutsourceProtocolApprovalListRequest, BaseApprovalSubmitRequest> baseApprovalService) {
+        super(baseApprovalService);
+    }
+
+    @ApiOperation("草稿箱-保存")
+    @PostMapping("/save")
+    public ReturnDTO<OutsourceProtocolSaveResponse> saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceProtocol request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        return outsourceProtocolService.saveOutsourceProtocol(request);
+    }
+
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody OutsourceProtocolApprovalListRequest request) throws Exception {
+        List<BizBusinessOutsourceProtocol> list = super.exportList(request);
+        super.exportExcel(BizBusinessOutsourceProtocol.class, list, ExportEnum.OUTSOURCE_PROTOCOL.getSheetName());
+    }
+}
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java
index 097f645..f0f0943 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java
@@ -17,7 +17,6 @@
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.IGeneralApprovalService;
 import com.casic.missiles.service.business.IBizBusinessOutsourcerInfoService;
-import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -71,19 +70,8 @@
 
     @ApiOperation("分包方导出")
     @PostMapping("/listExport")
-    public void export(@RequestBody @Valid OutsourcerInfoApprovalListRequest request, BindingResult bindingResult) throws Exception {
-        if (bindingResult.hasErrors()) {
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        }
-        List<BizBusinessOutsourcerInfo> list;
-        if (!CollectionUtils.isEmpty(request.getIds())) {
-            list = outsourcerInfoService.listByIds(request.getIds());
-        } else {
-            list = outsourcerInfoService.list(request);
-        }
-        for (BizBusinessOutsourcerInfo record : list) {
-            DictCodeUtils.convertDictCodeToName(record);
-        }
+    public void export(@RequestBody OutsourcerInfoApprovalListRequest request) throws Exception {
+        List<BizBusinessOutsourcerInfo> list = super.exportList(request);
         super.exportExcel(BizBusinessOutsourcerInfo.class, list, ExportEnum.OUTSOURCER_EXPORT.getSheetName());
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java
index c2cbf9f..0410918 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java
@@ -17,11 +17,9 @@
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.IGeneralApprovalService;
 import com.casic.missiles.service.business.IBizBusinessSiteExecutiveInfoService;
-import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -60,7 +58,7 @@
         return siteExecutiveInfoService.saveSiteExecutiveInfo(siteExecutiveInfo);
     }
 
-    @ApiOperation("现场检测详情")
+    @ApiOperation("详情")
     @PostMapping("/detail")
     public ReturnDTO<SiteExecutiveDetailResponse> siteExecutiveDetail(@RequestBody @Valid IdDTO idDTO) throws Exception {
         Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
@@ -69,21 +67,10 @@
         return ReturnUtil.success(siteExecutiveInfoService.detail(idDTO.getId()));
     }
 
-    @ApiOperation("现场检测导出")
+    @ApiOperation("导出")
     @PostMapping("/listExport")
-    public void export(@RequestBody @Valid SiteExecutiveApprovalListRequest request, BindingResult bindingResult) throws Exception {
-        if (bindingResult.hasErrors()) {
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        }
-        List<SiteExecutiveApprovalListResponse> list;
-        if (!CollectionUtils.isEmpty(request.getIds())) {
-            list = siteExecutiveInfoService.listInfoByIds(request.getIds());
-        } else {
-            list = siteExecutiveInfoService.listInfo(request);
-        }
-        for (SiteExecutiveApprovalListResponse record : list) {
-            DictCodeUtils.convertDictCodeToName(record);
-        }
+    public void export(@RequestBody SiteExecutiveApprovalListRequest request) throws Exception {
+        List<SiteExecutiveApprovalListResponse> list = super.exportList(request);
         super.exportExcel(SiteExecutiveApprovalListResponse.class, list, ExportEnum.SITE_EXECUTIVE_EXPORT.getSheetName());
     }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
index 7e793cd..a92e209 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
@@ -55,7 +55,7 @@
 
     @ApiOperation("设备收发列表导出")
     @PostMapping("/export")
-    public void exportList(@RequestBody @Valid SampleDispatchListRequest request) throws IOException {
+    public void exportList(@RequestBody SampleDispatchListRequest request) throws IOException {
         List<SampleDispatchListResponse> list;
         if (!CollectionUtils.isEmpty(request.getIds())) {
             list = dispatchService.listByIds(request.getIds());
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java
index cdc77fc..d120fd4 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java
@@ -7,6 +7,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.business.labExecutive.*;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.business.IBusinessLabExecutiveInfoService;
@@ -14,6 +15,7 @@
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.*;
 
@@ -32,7 +34,7 @@
     @Autowired
     private IBusinessLabExecutiveInfoService labExecutiveInfoService;
 
-    @ApiOperation("实验室检测-部门检测-查询各状态列表（待检测、检测中、检测完）")
+    @ApiOperation("实验室任务-查询各状态列表（待检测、检测中、检测完）")
     @PostMapping("/deptExecutive/List")
     public ReturnDTO<PageInfoBT<SampleLabExecutiveListResponse>> queryDeptExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
@@ -43,10 +45,19 @@
         return ReturnUtil.success(super.packForBT(labExecutiveInfoService.deptLabExecutiveListPage(page, labExecutiveListRequest)));
     }
 
-    /**
-     * 实验室检测-我的检测-查询各状态列表（待检测、检测中、检测完）
-     */
-    @ApiOperation("实验室检测-我的检测-查询各状态列表（待检测、检测中、检测完）")
+    @ApiOperation("实验室任务导出")
+    @PostMapping("/deptExecutive/export")
+    public void deptExportList(@RequestBody @Valid SampleLabExecutiveListRequest request) throws Exception {
+        List<SampleLabExecutiveListResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = labExecutiveInfoService.deptLabExecutiveListByIds(request.getMeasureStatus(), request.getIds());
+        } else {
+            list = labExecutiveInfoService.deptLabExecutiveList(request);
+        }
+        super.exportExcel(SampleLabExecutiveListResponse.class, list, ExportEnum.DEPT_EXECUTIVE_TASK.getSheetName());
+    }
+
+    @ApiOperation("我的任务-查询各状态列表（待检测、检测中、检测完）")
     @PostMapping("/myExecutive/list")
     public ReturnDTO<PageInfoBT<SampleLabExecutiveListResponse>> queryMyExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
@@ -57,19 +68,25 @@
         return ReturnUtil.success(super.packForBT(labExecutiveInfoService.myLabExecutiveListPage(page, labExecutiveListRequest)));
     }
 
-    /**
-     * 实验室检测-我的检测-查询各状态样品数量（待检测、检测中、检测完）
-     */
-    @ApiOperation("实验室检测-我的检测-查询各状态样品数量（待检测、检测中、检测完）")
+    @ApiOperation("我的任务导出")
+    @PostMapping("/myExecutive/export")
+    public void exportList(@RequestBody @Valid SampleLabExecutiveListRequest request) throws Exception {
+        List<SampleLabExecutiveListResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = labExecutiveInfoService.myLabExecutiveListByIds(request.getMeasureStatus(), request.getIds());
+        } else {
+            list = labExecutiveInfoService.myLabExecutiveList(request);
+        }
+        super.exportExcel(SampleLabExecutiveListResponse.class, list, ExportEnum.MY_EXECUTIVE_TASK.getSheetName());
+    }
+
+    @ApiOperation("我的任务-查询各状态样品数量（待检测、检测中、检测完）")
     @GetMapping("/myExecutive/amount")
     public ReturnDTO<List<SampleAmountResponse>> queryMyExecutiveAmount() {
         return ReturnUtil.success(labExecutiveInfoService.myExecutiveAmount());
     }
 
-    /**
-     * 实验室检测-部门检测-分配（分配给具体人员）
-     */
-    @ApiOperation("实验室检测-部门检测-分配按钮（分配给具体人员）")
+    @ApiOperation("实验室任务-分配按钮（分配给具体人员）")
     @PostMapping("/deptExecutive/allocate")
     public ReturnDTO allocateStaff(@RequestBody @Valid SampleAllocateRequest sampleAllocateRequest, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -78,10 +95,7 @@
         return labExecutiveInfoService.allocateStaff(sampleAllocateRequest);
     }
 
-    /**
-     * 实验室检测-我的检测-检定人扫描收入（待检测->检测中）
-     */
-    @ApiOperation("实验室检测-我的检测-检定人扫描收入（待检测->检测中）")
+    @ApiOperation("我的任务-检定人扫描收入（待检测->检测中）")
     @PostMapping("/myExecutive/receive")
     public ReturnDTO sampleReceive(@RequestBody @Valid List<SampleOperateRequest> requestList, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -90,10 +104,7 @@
         return labExecutiveInfoService.sampleReceive(requestList);
     }
 
-    /**
-     * 实验室检测-负责人/检定人扫描检完（检测中->检测完）
-     */
-    @ApiOperation("实验室检测-负责人/检定人扫描检完（检测中->检测完）")
+    @ApiOperation("实验室任务-负责人/检定人扫描检完（检测中->检测完）")
     @PostMapping("/myExecutive/complete")
     public ReturnDTO sampleExecutiveComplete(@RequestBody @Valid List<SampleOperateRequest> requestList, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -102,10 +113,7 @@
         return labExecutiveInfoService.sampleExecutiveComplete(requestList);
     }
 
-    /**
-     * 实验室检测-部门检测/我的检测 编辑（只能修改应出具证书）
-     */
-    @ApiOperation("实验室检测-部门检测/我的检测 编辑（只能修改应出具证书）")
+    @ApiOperation("实验室任务/我的任务 编辑（只能修改应出具证书）")
     @PostMapping("/executive/update")
     public ReturnDTO updateExecutive(@RequestBody @Valid UpdateExecutiveRequest request, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -114,10 +122,7 @@
         return labExecutiveInfoService.updateExecutive(request);
     }
 
-    /**
-     * 实验室检测-部门检测/我的检测 详情
-     */
-    @ApiOperation("实验室检测-部门检测/我的检测 详情")
+    @ApiOperation("实验室任务/我的任务 详情")
     @PostMapping("/executive/detail")
     public ReturnDTO<ExecutiveDetailResponse> executiveDetail(@RequestBody @Valid ExecutiveDetailRequest request, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
@@ -131,7 +136,7 @@
      * 退回后会将下一个要执行的实验室检测状态更新为待分配，将后面的实验室顺序变更为连续（都进行减1）
      * 最后一个检测的实验室退回，等分发员再增加实验室或设备收发中的已收入直接手动点击完成
      */
-    @ApiOperation("实验室检测-部门检测/我的检测 退回（待检测/检测中->退回）")
+    @ApiOperation("实验室任务/我的任务 退回（待检测/检测中->退回）")
     @PostMapping("/executive/sendBack")
     public ReturnDTO executiveSendBack(@RequestBody @Valid ExecutiveSendBackRequest request, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -140,9 +145,6 @@
         return labExecutiveInfoService.sampleExecutiveSendBack(request);
     }
 
-    /**
-     * 分发员编辑实验室检测列表
-     */
     @ApiOperation("分发员编辑实验室检测列表")
     @PostMapping("/handOut/updateList")
     public ReturnDTO updateExecutiveList(@RequestBody @Valid UpdateExecutiveListRequest request, BindingResult bindingResult) {
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java
index 48a67ed..0c04f31 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java
@@ -10,6 +10,7 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.resource.customer.CustomerApprovalListRequest;
 import com.casic.missiles.dto.resource.customer.CustomerSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceCustomerInfo;
@@ -26,6 +27,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -55,6 +57,13 @@
         return customerInfoService.saveCustomerInfo(request);
     }
 
+    @ApiOperation("委托方名录导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody CustomerApprovalListRequest request) throws Exception {
+        List<BizResourceCustomerInfo> list = super.exportList(request);
+        super.exportExcel(BizResourceCustomerInfo.class, list, ExportEnum.CUSTOMER_INFO.getSheetName());
+    }
+
     @ApiOperation("委托方人员列表（分页）")
     @PostMapping("/person/listPage")
     public ReturnDTO<PageInfoBT<BizResourceCustomerStaff>> personListPage(@RequestBody IdDTO idDto) {
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
index 972ed4b..6418ea5 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
@@ -5,6 +5,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.resource.customer.SuggestFormApprovalListRequest;
 import com.casic.missiles.dto.resource.customer.SuggestFormSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceCustomerSuggestForm;
@@ -20,6 +21,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -50,4 +52,11 @@
         return suggestFormService.saveSuggestForm(request);
     }
 
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody SuggestFormApprovalListRequest request) throws Exception {
+        List<BizResourceCustomerSuggestForm> list = super.exportList(request);
+        super.exportExcel(BizResourceCustomerSuggestForm.class, list, ExportEnum.CUSTOMER_SUGGEST_FORM.getSheetName());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java
index 1934d1a..9e07eab 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java
@@ -15,12 +15,16 @@
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.resource.IEnvEnvironmentRecordConfigService;
 import com.casic.missiles.service.resource.IEnvEnvironmentRecordDataService;
+import com.casic.missiles.service.resource.IEnvLocationInfoService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
 import java.util.List;
@@ -39,6 +43,8 @@
     private IEnvEnvironmentRecordDataService environmentRecordDataService;
     @Autowired
     private IEnvEnvironmentRecordConfigService environmentRecordConfigService;
+    @Autowired
+    private IEnvLocationInfoService locationInfoService;
 
     @ApiOperation("环境记录单数据列表/详情")
     @PostMapping("/data/listPage")
@@ -95,4 +101,11 @@
         });
         return environmentRecordConfigService.deleteEnvironmentRecordConfig(idDTO.getId());
     }
+
+    @ApiOperation("地点列表")
+    @PostMapping("/location/listPage")
+    public ReturnDTO<PageInfoBT<LocationListResponse>> locationListPage(@RequestBody @Valid LocationListRequest request) {
+        Page<LocationListResponse> page = PageFactory.defaultPage();
+        return ReturnUtil.success(super.packForBT(locationInfoService.listPage(page, request)));
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java
index 82efe3f..e9561fa 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java
@@ -10,6 +10,7 @@
 import com.casic.missiles.dto.resource.seal.SealLogListRequest;
 import com.casic.missiles.dto.resource.seal.SealNoteApprovalListRequest;
 import com.casic.missiles.dto.resource.seal.SealNoteSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceSealUseLog;
@@ -27,6 +28,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -58,6 +60,13 @@
         return sealUseNoteService.saveSeal(request);
     }
 
+    @ApiOperation("印章使用登记导出（列表和导出中去掉经办人和监印人）")
+    @PostMapping("/listExport")
+    public void export(@RequestBody SealNoteApprovalListRequest request) throws Exception {
+        List<BizResourceSealUseNote> list = super.exportList(request);
+        super.exportExcel(BizResourceSealUseNote.class, list, ExportEnum.SEAL_NOTE.getSheetName());
+    }
+
     // TODO: 2023/7/28 印章使用日志：系统中使用印章时插入数据库
 
     @ApiOperation("印章使用日志列表（分页）")
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java
index 9b674fc..06b6521 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java
@@ -9,16 +9,20 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.resource.staff.StaffCertRequest;
 import com.casic.missiles.dto.resource.staff.StaffCertResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.service.resource.IBizResourceStaffInfoService;
 import com.casic.missiles.service.resource.IBizResourceStaffVerifierService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.List;
+
 /**
  * @Description:
  * @Author: wangpeng
@@ -41,9 +45,21 @@
         return ReturnUtil.success(super.packForBT(responsePage));
     }
 
+    @ApiOperation("证书逾期提醒导出")
+    @PostMapping("/listExport")
+    public void exportList(@RequestBody StaffCertRequest request) throws Exception {
+        List<StaffCertResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = staffInfoService.certListByIds(request.getIds());
+        } else {
+            list = staffInfoService.certList(request);
+        }
+        super.exportExcel(StaffCertResponse.class, list, ExportEnum.STAFF_CERTIFICATE_EXPIRE.getSheetName());
+    }
+
     @ApiOperation("证书逾期提醒")
     @PostMapping("/expirationReminder")
-    public ReturnDTO expirationReminder(@RequestBody IdDTO idDto) {
-        return verifierService.expirationReminder(idDto);
+    public ReturnDTO expirationReminder(@RequestBody IdDTO idDTO) {
+        return verifierService.expirationReminder(idDTO);
     }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java
index 3b251ad..a6e7850 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java
@@ -12,6 +12,7 @@
 import com.casic.missiles.dto.resource.staff.StaffListRequest;
 import com.casic.missiles.dto.resource.staff.TrainListRequest;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.*;
@@ -22,7 +23,10 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
 import java.util.List;
@@ -52,8 +56,19 @@
             throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
         }
         Page<BizResourceStaffInfo> page = PageFactory.defaultPage();
-        Page<BizResourceStaffInfo> responsePage = staffInfoService.listPage(page, request);
-        return ReturnUtil.success(super.packForBT(responsePage));
+        return ReturnUtil.success(super.packForBT(staffInfoService.listPage(page, request)));
+    }
+
+    @ApiOperation("人员登记导出")
+    @PostMapping("/listExport")
+    public void exportList(@RequestBody StaffListRequest request) throws Exception {
+        List<BizResourceStaffInfo> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = staffInfoService.listByIds(request.getIds());
+        } else {
+            list = staffInfoService.list(request);
+        }
+        super.exportExcel(BizResourceStaffInfo.class, list, ExportEnum.STAFF_INFO.getSheetName());
     }
 
     @ApiOperation("人员登记详情基础信息")
@@ -85,9 +100,9 @@
 
     @ApiOperation("科研教育列表（分页）")
     @PostMapping("/education/listPage")
-    public ReturnDTO<PageInfoBT<BizResourceStaffEducation>> educationListPage(@RequestBody IdDTO idDto) {
+    public ReturnDTO<PageInfoBT<BizResourceStaffEducation>> educationListPage(@RequestBody IdDTO idDTO) {
         Page<BizResourceStaffEducation> page = PageFactory.defaultPage();
-        Page<BizResourceStaffEducation> responsePage = staffInfoService.educationListPage(page, idDto);
+        Page<BizResourceStaffEducation> responsePage = staffInfoService.educationListPage(page, idDTO);
         return ReturnUtil.success(super.packForBT(responsePage));
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java
index af6aa86..d85d84a 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java
@@ -9,6 +9,7 @@
 import com.casic.missiles.dto.resource.outsideService.SupplierApprovalListRequest;
 import com.casic.missiles.dto.resource.outsideService.SupplierSaveResponse;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceSupplierAbility;
@@ -67,6 +68,13 @@
         return ReturnUtil.success(supplierInfoService.detail(idDTO.getId()));
     }
 
+    @ApiOperation("合格供方导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody SupplierApprovalListRequest request) throws Exception {
+        List<BizResourceSupplierInfo> list = super.exportList(request);
+        super.exportExcel(BizResourceSupplierInfo.class, list, ExportEnum.SUPPLIER_INFO.getSheetName());
+    }
+
     @ApiOperation("供方人员列表（分页）")
     @PostMapping("/person/listPage")
     public ReturnDTO<PageInfoBT<BizResourceSupplierPerson>> personListPage(@RequestBody IdDTO idDTO) {
diff --git a/casic-metering-api/src/main/resources/config/application.yml b/casic-metering-api/src/main/resources/config/application.yml
index 350db5f..ecff521 100644
--- a/casic-metering-api/src/main/resources/config/application.yml
+++ b/casic-metering-api/src/main/resources/config/application.yml
@@ -126,7 +126,7 @@
     #作者
     author: wangpeng
     #待生成对象表名
-    table-name: biz_equipment_technical_target_approval,biz_equipment_attachment_approval,biz_equipment_checkpoint_approval
+    table-name: biz_business_outsource_protocol
 
 reminder:
   #节点--common模块config包 ReminderNodeConfig配置
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
index 4a19e4e..d47d552 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
@@ -53,6 +53,7 @@
     SUGGEST_FORM_SAVE_FAILED(2509, "委托方意见登记表保存至草稿箱失败"),
     EXAMINE_FORM_SAVE_FAILED(2510, "要求、委托书及合同评审表保存至草稿箱失败"),
     CUSTOMER_EXIST_SAVE_FAILED(2511, "该委托方已存在，请重新选择"),
+    DUPLICATE_LOCATION_NO(2512, "地点编号已存在"),
 
     /**
      * 计量检定业务模块
@@ -68,6 +69,8 @@
     COMPLETE_SAMPLE_NOT_EXIST(2609, "检测中不存在扫描收入的样品"),
     CANNOT_CHANGE_MEASURE_INFO(2610, "无法更改非当前登录用户的检测信息"),
     NON_EXIST_ORDER_OR_SAMPLE(2611, "不存在该委托单或该委托单下的样品"),
+    OUTSOURCE_ACCESS_SAVE_FAILED(2612, "测试、校准或检定工作分包评审表保存至草稿箱失败"),
+    OUTSOURCE_PROTOCOL_SAVE_FAILED(2613, "测试、校准或检定工作分包协议书保存至草稿箱失败"),
 
     /**
      * 历史遗留备用
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
index 5089ad1..81a406b 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
@@ -10,54 +10,38 @@
     /**
      * 资源管理
      */
-    ENVIRONMENT_DATA_EXPORT("environmentData", "environmentData", "环境记录单数据"),
+    ENVIRONMENT_DATA_EXPORT("environmentData", "环境记录单数据", "环境记录单数据"),
+    STAFF_INFO("staffInfo", "人员登记", "人员登记"),
+    STAFF_CERTIFICATE_EXPIRE("certificateExpire", "证书逾期提醒", "证书逾期提醒"),
+    SUPPLIER_INFO("supplierInfo", "合格供方名录", "合格供方名录"),
+    CUSTOMER_INFO("customerInfo", "委托方名录", "委托方名录"),
+    CUSTOMER_SUGGEST_FORM("customerSuggestForm", "委托方意见登记表", "委托方意见登记表"),
+    SEAL_NOTE("sealNote", "印章使用登记", "印章使用登记"),
 
-    FILE_EXPORT("meterFileData", "meterFileData", "计量文件信息"),
-    TRAIN_PLAN_EXPORT("trainPlanData", "trainPlanData", "培训计划"),
-    TRAIN_LOG_EXPORT("trainLogData", "trainLogData", "培训记录"),
-    METER_ORGANIZE_EXPORT("meterOrganizeData", "meterOrganizeData", "计量组织"),
-    TRACE_SUPPLIER_EXPORT("traceSupplierData", "traceSupplierData", "溯源供方"),
-    SIGN_EXPORT("signData", "signData", "签名/签章"),
-    TEMPLATE_EXPORT("templateData", "templateData", "原始记录模板/证书报告模板"),
-    FIXED_ASSETS("meterFixedAssets", "meterFixedAssets", "固定资产"),
-    METER_EQUIPMENT("meterEquipment", "meterEquipment", "测量设备"),
-    CALIBRATION_TEST_EQUIPMENT("calibrationTestEquipment", "calibrationTestEquipment", "校准检定设备"),
-    MEASURE_ACCOUNT("measureAccount", "measureAccount", "测量工装"),
-    STANDARD_SUPPORT_EQUIPMENT("standardSupportEquipment", "standardSupportEquipment", "标准配套设备"),
-    STANDARD_EQUIPMENT("standardEquipment", "standardEquipment", "标准装置"),
-    FLOW_DEF_EXPORT("flowDefData", "flowDefData", "流程定义"),
-    STAFF_CERTIFICATE("certificate", "certificate", "计量人员证书"),
-    CHECK_INFO("checkInfo", "checkInfo", "设备管理点检测"),
-    EQUIPMENT_APPLY("equipmentApply", "equipmentApply", "设备借用"),
-    STANDARD_EQUIPMENT_REMIND("equipmentApplyRemind", "equipmentApplyRemind", "标准装置到期提醒"),
-    METER_PRICE("meterPrice", "meterPrice", "价格库"),
-    METER_STAFF("meterStaff", "meterStaff", "计量人员"),
-    STANDARD_EQUIPMENT_APPLY("standardEquipmentApply", "standardEquipmentApply", "标准装置申请"),
-    STATE_MANAGE_APPLY("stateManage", "stateManage", "状态管理"),
-    METER_ACCEPTANCE_CHECK("acceptanceCheck", "acceptanceCheck", "设备检修保养验收单"),
-    CUSTOMER_EXPORT("customerData", "customerData", "客户信息"),
-    ORDER_EXPORT("orderData", "orderData", "委托书信息"),
-    SAMPLE_EXPORT("sampleData", "sampleData", "样本信息"),
-    EXCHANGE_DATA("exchangeData", "exchangeData", "设备交接单"),
-    DISPATCH_DATA("dispatchData", "dispatchData", "设备收发"),
-    ENVIRONMENT_DATA("environmentData", "environmentData", "环境记录单"),
-    ORIGIN_DATA("originData", "originData", "原始记录"),
-    CERTIFICATE_REPORT("certificateReport", "certificateReport", "证书报告"),
-    ADVICE_EXPORT("adviceData", "adviceData", "客户反馈"),
-    HANDOUT_EXPORT("handoutData", "handoutData", "任务分发列表"),
-    OUTSOURCER_EXPORT("outsourcerData", "outsourcerData", "分包方"),
-    SITE_EXECUTIVE_EXPORT("siteExecutiveData", "siteExecutiveData", "现场测试、校准或检定"),
-    CERTIFICATE_PRINT_EXPORT("certificatePrintData", "certificatePrintData", "证书打印"),
-    DOWNLOAD_TEMPLATE("downloadTemplate", "downloadTemplate", "页面配置"),
-    OUTSOURCER_CERTIFICATE_EXPORT("outsourceCertificateData", "outsourceCertificateData", "分包证书"),
-    SETTLEMENT_INFO_EXPORT("settlementInfoData", "settlementInfoData", "业务结算"),
-    EQUIPMENT_REMIND("equipmentRemind", "equipmentRemind", "设备到期提醒"),
-    AGREEMENT_INFO_EXPORT("agreementInfoData", "agreementInfoData", "合同"),
-    WORK_STATISTICS_EXPORT("workStatisticsData", "workStatisticsData", "实时工作统计"),
-    DEPT_OUTPUT_EXPORT("deptOutputData", "deptOutputData", "部门产值分析"),
-    WORKLOAD_EXPORT("workloadData", "workloadData", "业务工作量分析"),
-    DEPT_COMPREHENSIVE_EXPORT("deptComprehensiveData", "deptComprehensiveData", "部门综合分析"),
-    ENVIRONMENTAL_RECORD("environmentalRecordData", "environmentalRecordData", "现场环境记录");
+    /**
+     * 计量检定业务
+     */
+    OUTSOURCER_EXPORT("outsourcerData", "分包方名录", "分包方名录"),
+    IDENTIFY_EXPORT("identifyData", "计量标识", "计量标识"),
+    ORDER_EXPORT("orderData", "任务单", "任务单"),
+    DISPATCH_DATA("dispatchData", "设备收发", "设备收发"),
+    HANDOUT_EXPORT("handoutData", "任务分发", "任务分发"),
+    SITE_EXECUTIVE_EXPORT("siteExecutiveData", "现场测试、校准或检定", "现场测试、校准或检定"),
+    CERTIFICATE_REPORT("certificateReport", "证书审批", "证书审批"),
+    CERTIFICATE_CHANGE_APPLY("certificateChangeApply", "证书报告补充或更换申请单", "证书报告补充或更换申请单"),
+    CERTIFICATE_PRINT("certificatePrintData", "证书打印审批", "证书打印审批"),
+    DEPT_EXECUTIVE_TASK("deptExecutiveTaskData", "实验室任务", "实验室任务"),
+    MY_EXECUTIVE_TASK("myExecutiveTaskData", "我的任务", "我的任务"),
+    OUTSOURCE_ASSESS("outsourceAssess", "测试、校准或检定工作分包评审表", "测试、校准或检定工作分包评审表"),
+    OUTSOURCE_PROTOCOL("outsourceProtocol", "测试、校准或检定工作分包协议书", "测试、校准或检定工作分包协议书"),
+
+    /**
+     * 系统管理
+     */
+    SIGN_EXPORT("signData", "签名", "签名"),
+    TEMPLATE_EXPORT("templateData", "文件模板", "文件模板"),
+    FLOW_DEF_EXPORT("flowDefData", "流程定义", "流程定义"),
+    DOWNLOAD_TEMPLATE("downloadTemplate", "流程定义", "页面配置");
 
     ExportEnum(String fileName, String sheetName, String description) {
         this.fileName = fileName;
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateRecordTypeCodeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateRecordTypeCodeEnum.java
index 31d913c..a963522 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateRecordTypeCodeEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateRecordTypeCodeEnum.java
@@ -46,4 +46,14 @@
     String SITE_EXECUTIVE_APPROVAL = "01";
     //《现场测试、校准或检定工作记录表》
     String SITE_EXECUTIVE_LOG = "02";
+
+    //测试、校准或检定工作分包协议书
+    String OUTSOURCE_PROTOCOL = "01";
+    //测试、校准或检定工作分包评审表
+    String OUTSOURCE_ACCESS = "02";
+    //测试、校准或检定工作分包通知书
+    String OUTSOURCE_NOTICE = "03";
+    //测试、校准或检定工作分包方名录
+    String OUTSOURCE_INFO = "04";
+
 }
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
index 24b8635..f78bd53 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
@@ -15,6 +15,10 @@
     String CERTIFICATE_CHANGE_APPLY_BEAN_NAME = "certificateChangeApplyBean";
     //现场测试、校准或检定
     String SITE_EXECUTIVE_BEAN_NAME = "siteExecutiveBean";
+    //测试、校准或检定工作分包评审表
+    String OUTSOURCE_ASSESS_BEAN_NAME = "outsourceAssessBean";
+    //测试、校准或检定工作分包协议书
+    String OUTSOURCE_PROTOCOL_BEAN_NAME = "outsourceProtocolBean";
 
     /*********************************设备与装置************************************/
     //设备台账
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 b21c661..6b86fd1 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
@@ -18,6 +18,8 @@
     OUTSOURCER_APPROVAL(OUTSOURCER_BEAN_NAME, ""),
     CERTIFICATE_CHANGE_APPROVAL(CERTIFICATE_CHANGE_APPLY_BEAN_NAME, ""),
     SITE_EXECUTIVE_APPROVAL(SITE_EXECUTIVE_BEAN_NAME, ""),
+    OUTSOURCE_ASSESS_APPROVAL(OUTSOURCE_ASSESS_BEAN_NAME, ""),
+    OUTSOURCE_PROTOCOL_APPROVAL(OUTSOURCE_PROTOCOL_BEAN_NAME, ""),
 
     ACTION_STATUS_MAP(new HashMap<String, AwareActionStatusEnum>() {
         {
@@ -47,6 +49,10 @@
             put(ApplyFromIdEnum.CERTIFICATE_CHANGE_APPROVAL.getCode(), CERTIFICATE_CHANGE_APPROVAL);
             //现场测试、校准或检定审批
             put(ApplyFromIdEnum.SITE_EXECUTIVE_APPROVAL.getCode(), SITE_EXECUTIVE_APPROVAL);
+            //测试、校准或检定工作分包评审表
+            put(ApplyFromIdEnum.OUTSOURCE_ASSESS_APPROVAL.getCode(), OUTSOURCE_ASSESS_APPROVAL);
+            //测试、校准或检定工作分包协议书
+            put(ApplyFromIdEnum.OUTSOURCE_PROTOCOL_APPROVAL.getCode(), OUTSOURCE_PROTOCOL_APPROVAL);
         }
     });
     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 934405e..c7410bd 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
@@ -9,6 +9,8 @@
     CERTIFICATE_CHANGE_APPROVAL("jljdywzsbchghsqd", MessageSourceModuleEnum.BUSINESS.getCode(), "证书/报告补充或更换申请单"),
     OUTSOURCER_APPROVAL("jljdywcsjzhgfbfml", MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定合格分包方名录"),
     SITE_EXECUTIVE_APPROVAL("jljdywxccsjzsp", MessageSourceModuleEnum.BUSINESS.getCode(), "现场测试、校准或检定审批"),
+    OUTSOURCE_ASSESS_APPROVAL("jljdywcsjzfbpsb", MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包评审表"),
+    OUTSOURCE_PROTOCOL_APPROVAL("jljdywcsjzfbxys", MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包协议书"),
 
 
     /*******************************************设备与装置*********************************************/
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/GeneralApprovalMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/GeneralApprovalMapper.java
index 4fb7344..0c9d6ae 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/GeneralApprovalMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/GeneralApprovalMapper.java
@@ -17,8 +17,4 @@
 
     Page<O> selectBatchForApprovalList(Page<O> page, @Param("request") R request, @Param("businessKeys") List<String> businessKeys);
 
-//    Page<O> selectListPage(Page<O> page, @Param("request") R request);
-
-//    Long selectMaxNo();
-
 }
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceAssessMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceAssessMapper.java
index 7867bb8..ba59009 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceAssessMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceAssessMapper.java
@@ -1,7 +1,12 @@
 package com.casic.missiles.mapper.business;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.business.outsource.OutsourceAssessApprovalListRequest;
+import com.casic.missiles.mapper.GeneralApprovalMapper;
 import com.casic.missiles.model.business.BizBusinessOutsourceAssess;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * <p>
@@ -11,6 +16,10 @@
  * @author wangpeng
  * @since 2023-08-16
  */
-public interface BizBusinessOutsourceAssessMapper extends BaseMapper<BizBusinessOutsourceAssess> {
+public interface BizBusinessOutsourceAssessMapper extends GeneralApprovalMapper<BizBusinessOutsourceAssess, BizBusinessOutsourceAssess, OutsourceAssessApprovalListRequest> {
+
+    Page<BizBusinessOutsourceAssess> selectBatchForApprovalList(Page<BizBusinessOutsourceAssess> page, @Param("request") OutsourceAssessApprovalListRequest request, @Param("businessKeys") List<String> businessKeys);
+
+    Long selectMaxProjectNo();
 
 }
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceProtocolMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceProtocolMapper.java
new file mode 100644
index 0000000..e6aba35
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceProtocolMapper.java
@@ -0,0 +1,24 @@
+package com.casic.missiles.mapper.business;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.business.outsource.OutsourceProtocolApprovalListRequest;
+import com.casic.missiles.mapper.GeneralApprovalMapper;
+import com.casic.missiles.model.business.BizBusinessOutsourceProtocol;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 计量检定业务-分包管理-测试、校准或检定工作分包协议书 Mapper 接口
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-08-24
+ */
+public interface BizBusinessOutsourceProtocolMapper extends GeneralApprovalMapper<BizBusinessOutsourceProtocol, BizBusinessOutsourceProtocol, OutsourceProtocolApprovalListRequest> {
+
+    Page<BizBusinessOutsourceProtocol> selectBatchForApprovalList(Page<BizBusinessOutsourceProtocol> page, @Param("request") OutsourceProtocolApprovalListRequest request, @Param("businessKeys") List<String> businessKeys);
+
+    Long selectMaxProtocolNo();
+}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/EnvLocationInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/EnvLocationInfoMapper.java
new file mode 100644
index 0000000..49eff87
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/EnvLocationInfoMapper.java
@@ -0,0 +1,21 @@
+package com.casic.missiles.mapper.resource;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.resource.environment.LocationListRequest;
+import com.casic.missiles.dto.resource.environment.LocationListResponse;
+import com.casic.missiles.model.resource.EnvLocationInfo;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * <p>
+ * 实验室环境监控系统-设备表 Mapper 接口
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-06-07
+ */
+public interface EnvLocationInfoMapper extends BaseMapper<EnvLocationInfo> {
+
+    Page<LocationListResponse> selectLocationListPage(Page<LocationListResponse> page, @Param("request") LocationListRequest request);
+}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java
index de124db..85ed0f7 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java
@@ -1,7 +1,9 @@
 package com.casic.missiles.mapper.system;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.dto.system.SignDetailResponse;
+import com.casic.missiles.dto.system.SignListRequest;
 import com.casic.missiles.model.system.SystemSign;
 import org.apache.ibatis.annotations.Param;
 
@@ -22,4 +24,8 @@
     SignDetailResponse selectSignDetailById(Long id);
 
     List<SystemSign> selectUsableSignList(@Param("userId") Long userId);
+
+    Page<SystemSign> selectSignListPage(Page<SystemSign> page, @Param("request") SignListRequest request);
+
+    List<SystemSign> selectSignList(@Param("request") SignListRequest request);
 }
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateChangeApplyMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateChangeApplyMapper.xml
index d798447..c496092 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateChangeApplyMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateChangeApplyMapper.xml
@@ -30,31 +30,31 @@
         SELECT *
         FROM biz_business_certificate_change_apply
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.changeApplyNo != null and request.changeApplyNo !=''">
+        <if test="request != null and request.changeApplyNo != null and request.changeApplyNo !=''">
             and change_apply_no like concat('%',#{request.changeApplyNo},'%')
         </if>
-        <if test="request.changeReportNo != null and request.changeReportNo !=''">
+        <if test="request != null and request.changeReportNo != null and request.changeReportNo !=''">
             and change_report_no like concat('%',#{request.changeReportNo},'%')
         </if>
-        <if test="request.changeReportName != null and request.changeReportName !=''">
+        <if test="request != null and request.changeReportName != null and request.changeReportName !=''">
             and change_report_name like concat('%',#{request.changeReportName},'%')
         </if>
-        <if test="request.changeType != null and request.changeType !=''">
+        <if test="request != null and request.changeType != null and request.changeType !=''">
             and change_type = #{request.changeType}
         </if>
-        <if test="request.createUserName != null and request.createUserName !=''">
+        <if test="request != null and request.createUserName != null and request.createUserName !=''">
             and create_user_name like concat('%',#{request.createUserName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificatePrintMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificatePrintMapper.xml
index b66cd99..49c0ac8 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificatePrintMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificatePrintMapper.xml
@@ -31,34 +31,34 @@
         LEFT JOIN biz_business_order_sample_relation bosr ON (bosr.order_id = bcr.order_id AND bosr.sample_id = bcr.sample_id)
         LEFT JOIN biz_business_order_info boi ON boi.id = bosr.order_id
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and bcp.approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.printStatus != null and request.printStatus !=''">
+        <if test="request != null and request.printStatus != null and request.printStatus !=''">
             and print_status = #{request.printStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and bcp.create_user_id = #{request.createUserId}
         </if>
-        <if test="request.certificateReportNo != null and request.certificateReportNo !=''">
+        <if test="request != null and request.certificateReportNo != null and request.certificateReportNo !=''">
             and bcr.certificate_report_no like concat('%',#{request.certificateReportNo},'%')
         </if>
-        <if test="request.certificateReportName != null and request.certificateReportName !=''">
+        <if test="request != null and request.certificateReportName != null and request.certificateReportName !=''">
             and bcr.certificate_report_name like concat('%',#{request.certificateReportName},'%')
         </if>
-        <if test="request.customerName != null and request.customerName !=''">
+        <if test="request != null and request.customerName != null and request.customerName !=''">
             and boi.customer_name like concat('%',#{request.customerName},'%')
         </if>
-        <if test="request.sampleNo != null and request.sampleNo !=''">
+        <if test="request != null and request.sampleNo != null and request.sampleNo !=''">
             and bosr.sample_no like concat('%',#{request.sampleNo},'%')
         </if>
-        <if test="request.sampleName != null and request.sampleName !=''">
+        <if test="request != null and request.sampleName != null and request.sampleName !=''">
             and bosr.sample_name like concat('%',#{request.sampleName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and bcp.create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and bcp.create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml
index b366034..767695d 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml
@@ -46,33 +46,37 @@
         SELECT bcr.*, bosr.sample_no, bosr.sample_name, bosr.sample_model, rsi.staff_name
         FROM biz_business_certificate_report bcr
         LEFT JOIN biz_business_order_sample_relation bosr ON (bosr.order_id = bcr.order_id AND bosr.sample_id = bcr.sample_id)
+        LEFT JOIN biz_business_order_info boi ON boi.id = bcr.order_id
         LEFT JOIN biz_resource_staff_info rsi ON rsi.id = bcr.measure_person_id
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and bcr.approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and bcr.create_user_id = #{request.createUserId}
         </if>
-        <if test="request.certificateReportNo != null and request.certificateReportNo !=''">
+        <if test="request != null and request.customerId != null and request.customerId !=''">
+            and boi.customer_id = #{request.customerId}
+        </if>
+        <if test="request != null and request.certificateReportNo != null and request.certificateReportNo !=''">
             and bcr.certificate_report_no like concat('%',#{request.certificateReportNo},'%')
         </if>
-        <if test="request.certificateReportName != null and request.certificateReportName !=''">
+        <if test="request != null and request.certificateReportName != null and request.certificateReportName !=''">
             and bcr.certificate_report_name like concat('%',#{request.certificateReportName},'%')
         </if>
-        <if test="request.sampleNo != null and request.sampleNo !=''">
+        <if test="request != null and request.sampleNo != null and request.sampleNo !=''">
             and bosr.sample_no like concat('%',#{request.sampleNo},'%')
         </if>
-        <if test="request.measureCategory != null and request.measureCategory !=''">
+        <if test="request != null and request.measureCategory != null and request.measureCategory !=''">
             and bcr.measure_category = #{request.measureCategory}
         </if>
-        <if test="request.measurePerson != null and request.measurePerson !=''">
+        <if test="request != null and request.measurePerson != null and request.measurePerson !=''">
             and rsi.staff_name like concat('%',#{request.measurePerson},'%')
         </if>
-        <if test="request.calibrationTimeStart != null and request.calibrationTimeStart !=''">
+        <if test="request != null and request.calibrationTimeStart != null and request.calibrationTimeStart !=''">
             and bcr.calibration_time &gt;= #{request.calibrationTimeStart}
         </if>
-        <if test="request.calibrationTimeEnd != null and request.calibrationTimeEnd !=''">
+        <if test="request != null and request.calibrationTimeEnd != null and request.calibrationTimeEnd !=''">
             and bcr.calibration_time &lt;= #{request.calibrationTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceAssessMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceAssessMapper.xml
index d0fcf8b..c22c101 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceAssessMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceAssessMapper.xml
@@ -7,6 +7,8 @@
         <id column="id" property="id" />
         <result column="project_no" property="projectNo" />
         <result column="project_name" property="projectName" />
+        <result column="lab_code" property="labCode" />
+        <result column="group_code" property="groupCode" />
         <result column="applicant_id" property="applicantId" />
         <result column="applicant_name" property="applicantName" />
         <result column="applicant_time" property="applicantTime" />
@@ -31,7 +33,45 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, project_no, project_name, applicant_id, applicant_name, applicant_time, minio_file_name, remark, create_user_id, create_user_name, outsourcer_id, pre_start_time, pre_end_time, outsource_reason, pre_cost, approval_status, process_id, approve_situation, traceability, test_method, technique_ability, create_time, update_time
+        id, project_no, project_name, lab_code, group_code, applicant_id, applicant_name, applicant_time, minio_file_name, remark, create_user_id, create_user_name, outsourcer_id, pre_start_time, pre_end_time, outsource_reason, pre_cost, approval_status, process_id, approve_situation, traceability, test_method, technique_ability, create_time, update_time
     </sql>
 
+    <select id="selectMaxProjectNo" resultType="java.lang.Long">
+        SELECT IFNULL(max(RIGHT(project_no, 3)), 0) from biz_business_outsource_assess
+    </select>
+
+    <select id="selectBatchForApprovalList" resultMap="BaseResultMap">
+        SELECT bboa.*, bboi.outsourcer_name, bboi.director
+        FROM biz_business_outsource_assess bboa
+        LEFT JOIN biz_business_outsourcer_info bboi ON bboa.outsourcer_id = bboi.id
+        WHERE 1=1
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
+            and bboa.approval_status = #{request.approvalStatus}
+        </if>
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
+            and bboa.create_user_id = #{request.createUserId}
+        </if>
+        <if test="request != null and request.projectNo != null and request.projectNo !=''">
+            and bboa.project_no like concat('%',#{request.projectNo},'%')
+        </if>
+        <if test="request != null and request.outsourcerName != null and request.outsourcerName !=''">
+            and bboi.outsourcer_name like concat('%',#{request.outsourcerName},'%')
+        </if>
+        <if test="request != null and request.applicantName != null and request.applicantName !=''">
+            and bboa.applicant_name like concat('%',#{request.applicantName},'%')
+        </if>
+        <if test="request != null and request.applicantTimeStart != null and request.applicantTimeStart !=''">
+            and bboa.applicant_time &gt;= #{request.applicantTimeStart}
+        </if>
+        <if test="request != null and request.applicantTimeEnd != null and request.applicantTimeEnd !=''">
+            and bboa.applicant_time &lt;= #{request.applicantTimeEnd}
+        </if>
+        <if test="businessKeys != null">
+            and bboa.id in
+            <foreach collection="businessKeys" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
+        ORDER BY bboa.create_time DESC
+    </select>
 </mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceProtocolMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceProtocolMapper.xml
new file mode 100644
index 0000000..b7b2149
--- /dev/null
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceProtocolMapper.xml
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.mapper.business.BizBusinessOutsourceProtocolMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.business.BizBusinessOutsourceProtocol">
+        <id column="id" property="id" />
+        <result column="protocol_no" property="protocolNo" />
+        <result column="project_name" property="projectName" />
+        <result column="lab_code" property="labCode" />
+        <result column="group_code" property="groupCode" />
+        <result column="outsourcer_id" property="outsourcerId" />
+        <result column="remark" property="remark" />
+        <result column="outsource_no" property="outsourceNo" />
+        <result column="outsource_name" property="outsourceName" />
+        <result column="contacts" property="contacts" />
+        <result column="mobile" property="mobile" />
+        <result column="address" property="address" />
+        <result column="require_date" property="requireDate" />
+        <result column="outsource_cost" property="outsourceCost" />
+        <result column="director" property="director" />
+        <result column="item" property="item" />
+        <result column="requires" property="requires" />
+        <result column="create_user_id" property="createUserId" />
+        <result column="create_user_name" property="createUserName" />
+        <result column="approval_status" property="approvalStatus" />
+        <result column="process_id" property="processId" />
+        <result column="create_time" property="createTime" />
+        <result column="update_time" property="updateTime" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, protocol_no, project_name, lab_code, group_code, outsourcer_id, remark, outsource_no, outsource_name, contacts, mobile, address, require_date, outsource_cost, director, item, requires, create_user_id, create_user_name, approval_status, process_id, create_time, update_time
+    </sql>
+
+    <select id="selectMaxProtocolNo" resultType="java.lang.Long">
+        SELECT IFNULL(max(RIGHT(protocol_no, 3)), 0) from biz_business_outsource_protocol
+    </select>
+
+    <select id="selectBatchForApprovalList" resultMap="BaseResultMap">
+        SELECT *
+        FROM biz_business_outsource_protocol
+        WHERE 1=1
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
+            and approval_status = #{request.approvalStatus}
+        </if>
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
+            and create_user_id = #{request.createUserId}
+        </if>
+        <if test="request != null and request.protocolNo != null and request.protocolNo !=''">
+            and protocol_no like concat('%',#{request.protocolNo},'%')
+        </if>
+        <if test="request != null and request.outsourcerName != null and request.outsourcerName !=''">
+            and outsourcer_name like concat('%',#{request.outsourcerName},'%')
+        </if>
+        <if test="request != null and request.applicantName != null and request.applicantName !=''">
+            and create_user_name like concat('%',#{request.applicantName},'%')
+        </if>
+        <if test="request != null and request.applicantTimeStart != null and request.applicantTimeStart !=''">
+            and create_time &gt;= #{request.applicantTimeStart}
+        </if>
+        <if test="request != null and request.applicantTimeEnd != null and request.applicantTimeEnd !=''">
+            and create_time &lt;= #{request.applicantTimeEnd}
+        </if>
+        <if test="businessKeys != null">
+            and id in
+            <foreach collection="businessKeys" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
+        ORDER BY create_time DESC
+    </select>
+</mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourcerInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourcerInfoMapper.xml
index 510a80b..3049b54 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourcerInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourcerInfoMapper.xml
@@ -7,6 +7,8 @@
         <id column="id" property="id" />
         <result column="outsourcer_no" property="outsourcerNo" />
         <result column="outsourcer_name" property="outsourcerName" />
+        <result column="lab_code" property="labCode" />
+        <result column="group_code" property="groupCode" />
         <result column="outsourcer_brief_name" property="outsourcerBriefName" />
         <result column="outsourcer_size" property="outsourcerSize" />
         <result column="business_size" property="businessSize" />
@@ -55,32 +57,32 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, outsourcer_no, outsourcer_name, outsourcer_brief_name, outsourcer_size, business_size, grade, evaluation, tax_number, bank_account, bank_name, bank_account_number, postal_code, director, phone, fax, mobile, email, website, address_country, address_province, address_city, address_area, full_address, address_country_name, address_province_name, address_city_name, address_area_name, invoice_country, invoice_province, invoice_city, invoice_area, invoice_full_address, invoice_country_name, invoice_province_name, invoice_city_name, invoice_area_name, business_scope, business_content, minio_file_name, approval_status, process_id, remark, create_user_id, create_user_name, create_time, update_time
+        id, outsourcer_no, outsourcer_name, lab_code, group_code, outsourcer_brief_name, outsourcer_size, business_size, grade, evaluation, tax_number, bank_account, bank_name, bank_account_number, postal_code, director, phone, fax, mobile, email, website, address_country, address_province, address_city, address_area, full_address, address_country_name, address_province_name, address_city_name, address_area_name, invoice_country, invoice_province, invoice_city, invoice_area, invoice_full_address, invoice_country_name, invoice_province_name, invoice_city_name, invoice_area_name, business_scope, business_content, minio_file_name, approval_status, process_id, remark, create_user_id, create_user_name, create_time, update_time
     </sql>
 
     <select id="selectBatchForApprovalList" resultMap="BaseResultMap">
         SELECT *
         FROM biz_business_outsourcer_info
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.outsourcerNo != null and request.outsourcerNo !=''">
+        <if test="request != null and request.outsourcerNo != null and request.outsourcerNo !=''">
             and outsourcer_no like concat('%',#{request.outsourcerNo},'%')
         </if>
-        <if test="request.outsourcerName != null and request.outsourcerName !=''">
+        <if test="request != null and request.outsourcerName != null and request.outsourcerName !=''">
             and outsourcer_name like concat('%',#{request.outsourcerName},'%')
         </if>
-        <if test="request.director != null and request.director !=''">
+        <if test="request != null and request.director != null and request.director !=''">
             and director like concat('%',#{request.director},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
@@ -93,6 +95,6 @@
     </select>
 
     <select id="selectMaxNo" resultType="java.lang.Long">
-        SELECT IFNULL(max(RIGHT(outsourcer_no, 12)), 0) from biz_business_outsourcer_info
+        SELECT IFNULL(max(RIGHT(outsourcer_no, 3)), 0) from biz_business_outsourcer_info
     </select>
 </mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessSiteExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessSiteExecutiveInfoMapper.xml
index 135c5d0..3c5ae79 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessSiteExecutiveInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessSiteExecutiveInfoMapper.xml
@@ -38,25 +38,25 @@
         FROM biz_business_site_executive_info bsei
         LEFT JOIN biz_resource_customer_info rci ON bsei.customer_id = rci.id
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and bsei.approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and bsei.create_user_id = #{request.createUserId}
         </if>
-        <if test="request.siteExecutiveNo != null and request.siteExecutiveNo !=''">
+        <if test="request != null and request.siteExecutiveNo != null and request.siteExecutiveNo !=''">
             and bsei.site_executive_no like concat('%',#{request.siteExecutiveNo},'%')
         </if>
-        <if test="request.customerName != null and request.customerName !=''">
+        <if test="request != null and request.customerName != null and request.customerName !=''">
             and rci.outsourcer_name like concat('%',#{request.customerName},'%')
         </if>
-        <if test="request.applyName != null and request.applyName !=''">
+        <if test="request != null and request.applyName != null and request.applyName !=''">
             and bsei.apply_name like concat('%',#{request.applyName},'%')
         </if>
-        <if test="request.applyTimeStart != null and request.applyTimeStart !=''">
+        <if test="request != null and request.applyTimeStart != null and request.applyTimeStart !=''">
             and bsei.apply_time &gt;= #{request.applyTimeStart}
         </if>
-        <if test="request.applyTimeEnd != null and request.applyTimeEnd !=''">
+        <if test="request != null and request.applyTimeEnd != null and request.applyTimeEnd !=''">
             and bsei.apply_time &lt;= #{request.applyTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml
index 84d9e2a..6bd38a9 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml
@@ -105,6 +105,12 @@
         <if test="request.isUrgent != null and request.isUrgent !=''">
             AND bo.is_urgent = #{request.isUrgent}
         </if>
+        <if test="request.ids != null">
+            and blei.id in
+            <foreach collection="request.ids" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
         ORDER BY blei.update_time DESC
     </select>
 
@@ -137,6 +143,12 @@
         <if test="request.isUrgent != null and request.isUrgent !=''">
             AND bo.is_urgent = #{request.isUrgent}
         </if>
+        <if test="request.ids != null">
+            and blei.id in
+            <foreach collection="request.ids" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
         ORDER BY blei.update_time DESC
     </select>
 
diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardInfoMapper.xml
index 1a5551b..2ed8d17 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardInfoMapper.xml
@@ -45,12 +45,6 @@
         FROM biz_equipment_standard_info besi
         LEFT JOIN biz_equipment_standard_technology_relation bestr ON besi.standard_no = bestr.standard_no
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
-            and besi.approval_status = #{request.approvalStatus}
-        </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
-            and besi.create_user_id = #{request.createUserId}
-        </if>
         <if test="request.standardName != null and request.standardName !=''">
             and besi.standard_name like concat('%',#{request.standardName},'%')
         </if>
diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardTechnologyRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardTechnologyRelationMapper.xml
index fc7e16c..cd03c8c 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardTechnologyRelationMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardTechnologyRelationMapper.xml
@@ -6,6 +6,7 @@
     <resultMap id="BaseResultMap" type="com.casic.missiles.model.equipment.BizEquipmentStandardTechnologyRelation">
         <id column="id" property="id" />
         <result column="technology_file_id" property="technologyFileId" />
+        <result column="technology_file_no" property="technologyFileNo" />
         <result column="technology_file_name" property="technologyFileName" />
         <result column="standard_id" property="standardId" />
         <result column="standard_no" property="standardNo" />
@@ -14,7 +15,7 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, technology_file_id, technology_file_name, standard_id, remark
+        id, technology_file_id, technology_file_no, technology_file_name, standard_id, remark
     </sql>
 
 </mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceAuthorizeOrderMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceAuthorizeOrderMapper.xml
index ac5176c..554fe65 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceAuthorizeOrderMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceAuthorizeOrderMapper.xml
@@ -32,22 +32,22 @@
         SELECT *
         FROM biz_resource_authorize_order
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.orderNo != null and request.orderNo !=''">
+        <if test="request != null and request.orderNo != null and request.orderNo !=''">
             and order_no like concat('%',#{request.orderNo},'%')
         </if>
-        <if test="request.createUserName != null and request.createUserName !=''">
+        <if test="request != null and request.createUserName != null and request.createUserName !=''">
             and create_user_name like concat('%',#{request.createUserName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerExamineFormMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerExamineFormMapper.xml
index ab242f6..af7f98f 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerExamineFormMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerExamineFormMapper.xml
@@ -41,28 +41,28 @@
         SELECT *
         FROM biz_resource_customer_examine_form
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.formNo != null and request.formNo !=''">
+        <if test="request != null and request.formNo != null and request.formNo !=''">
             and form_no like concat('%',#{request.formNo},'%')
         </if>
-        <if test="request.labCode != null and request.labCode !=''">
+        <if test="request != null and request.labCode != null and request.labCode !=''">
             and lab_code like concat('%',#{request.labCode},'%')
         </if>
-        <if test="request.groupCode != null and request.groupCode !=''">
+        <if test="request != null and request.groupCode != null and request.groupCode !=''">
             and group_code like concat('%',#{request.groupCode},'%')
         </if>
-        <if test="request.createUserName != null and request.createUserName !=''">
+        <if test="request != null and request.createUserName != null and request.createUserName !=''">
             and create_user_name like concat('%',#{request.createUserName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerInfoMapper.xml
index fa8ffbc..06a2798 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerInfoMapper.xml
@@ -33,25 +33,25 @@
         SELECT *
         FROM biz_resource_customer_info
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.customerNo != null and request.customerNo !=''">
+        <if test="request != null and request.customerNo != null and request.customerNo !=''">
             and customer_no like concat('%',#{request.customerNo},'%')
         </if>
-        <if test="request.customerName != null and request.customerName !=''">
+        <if test="request != null and request.customerName != null and request.customerName !=''">
             and customer_name like concat('%',#{request.customerName},'%')
         </if>
-        <if test="request.contacts != null and request.contacts !=''">
+        <if test="request != null and request.contacts != null and request.contacts !=''">
             and contacts like concat('%',#{request.contacts},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerSuggestFormMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerSuggestFormMapper.xml
index 28f5bb2..1806662 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerSuggestFormMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerSuggestFormMapper.xml
@@ -33,28 +33,28 @@
         SELECT *
         FROM biz_resource_customer_suggest_form
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.formNo != null and request.formNo !=''">
+        <if test="request != null and request.formNo != null and request.formNo !=''">
             and form_no like concat('%',#{request.formNo},'%')
         </if>
-        <if test="request.customerName != null and request.customerName !=''">
+        <if test="request != null and request.customerName != null and request.customerName !=''">
             and customer_name like concat('%',#{request.customerName},'%')
         </if>
-        <if test="request.customerDeptName != null and request.customerDeptName !=''">
+        <if test="request != null and request.customerDeptName != null and request.customerDeptName !=''">
             and customer_dept_name like concat('%',#{request.customerDeptName},'%')
         </if>
-        <if test="request.createUserName != null and request.createUserName !=''">
+        <if test="request != null and request.createUserName != null and request.createUserName !=''">
             and create_user_name like concat('%',#{request.createUserName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSealUseNoteMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSealUseNoteMapper.xml
index ab37bc1..b02bb33 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSealUseNoteMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSealUseNoteMapper.xml
@@ -29,32 +29,32 @@
     </sql>
 
     <select id="selectBatchForApprovalList" resultMap="BaseResultMap">
-        SELECT *
+        SELECT brsun.*, brsi.seal_name, brsi.seal_type, brsi.approver_name
         FROM biz_resource_seal_use_note brsun
         JOIN biz_resource_seal_info brsi ON brsun.seal_id = brsi.id
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and brsun.approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and brsun.create_user_id = #{request.createUserId}
         </if>
-        <if test="request.sealName != null and request.sealName !=''">
+        <if test="request != null and request.sealName != null and request.sealName !=''">
             and brsi.seal_name like concat('%',#{request.sealName},'%')
         </if>
-        <if test="request.sealType != null and request.sealType !=''">
+        <if test="request != null and request.sealType != null and request.sealType !=''">
             and brsi.seal_type = #{request.sealType}
         </if>
-        <if test="request.applyDeptName != null and request.applyDeptName !=''">
+        <if test="request != null and request.applyDeptName != null and request.applyDeptName !=''">
             and brsun.apply_dept_name like concat('%',#{request.applyDeptName},'%')
         </if>
-        <if test="request.applyUserName != null and request.applyUserName !=''">
+        <if test="request != null and request.applyUserName != null and request.applyUserName !=''">
             and brsun.apply_user_name like concat('%',#{request.applyUserName},'%')
         </if>
-        <if test="request.applyTimeStart != null and request.applyTimeStart !=''">
+        <if test="request != null and request.applyTimeStart != null and request.applyTimeStart !=''">
             and brsun.apply_time &gt;= #{request.applyTimeStart}
         </if>
-        <if test="request.applyTimeEnd != null and request.applyTimeEnd !=''">
+        <if test="request != null and request.applyTimeEnd != null and request.applyTimeEnd !=''">
             and brsun.apply_time &lt;= #{request.applyTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml
index 119bf7d..4f8392a 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml
@@ -31,6 +31,12 @@
         <if test="request.deptName != null and request.deptName !=''">
             and brsi.dept_name like concat('%',#{request.deptName},'%')
         </if>
+        <if test="request.ids != null">
+            and brsv.id in
+            <foreach collection="request.ids" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
         ORDER BY brsv.grant_date DESC
     </select>
 
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSupplierInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSupplierInfoMapper.xml
index fe8d399..e8ce7ef 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSupplierInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSupplierInfoMapper.xml
@@ -48,28 +48,28 @@
         SELECT *
         FROM biz_resource_supplier_info
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.supplierNo != null and request.supplierNo !=''">
+        <if test="request != null and request.supplierNo != null and request.supplierNo !=''">
             and supplier_no like concat('%',#{request.supplierNo},'%')
         </if>
-        <if test="request.supplierName != null and request.supplierName !=''">
+        <if test="request != null and request.supplierName != null and request.supplierName !=''">
             and supplier_name like concat('%',#{request.supplierName},'%')
         </if>
-        <if test="request.director != null and request.director !=''">
+        <if test="request != null and request.director != null and request.director !=''">
             and director like concat('%',#{request.director},'%')
         </if>
-        <if test="request.supplierType != null and request.supplierType !=''">
+        <if test="request != null and request.supplierType != null and request.supplierType !=''">
             and supplier_type = #{request.supplierType}
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/EnvLocationInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/EnvLocationInfoMapper.xml
new file mode 100644
index 0000000..68bcf10
--- /dev/null
+++ b/casic-metering-dao/src/main/resources/mapper/resource/EnvLocationInfoMapper.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.mapper.resource.EnvLocationInfoMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.resource.EnvLocationInfo">
+        <id column="id" property="id" />
+        <result column="location_no" property="locationNo" />
+        <result column="location_name" property="locationName" />
+        <result column="location_position" property="locationPosition" />
+        <result column="create_user_id" property="createUserId" />
+        <result column="create_user" property="createUser" />
+        <result column="create_time" property="createTime" />
+        <result column="update_time" property="updateTime" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, location_no, location_name, location_position, create_user_id, create_user, create_time, update_time
+    </sql>
+
+    <select id="selectLocationListPage" resultType="com.casic.missiles.dto.resource.environment.LocationListResponse">
+        SELECT *
+        FROM env_location_info
+        WHERE 1=1
+        <if test="request.locationNo != null and request.locationNo !=''">
+            AND location_no LIKE concat('%',#{request.locationNo},'%')
+        </if>
+        <if test="request.locationName != null and request.locationName !=''">
+            AND location_name LIKE concat('%',#{request.locationName},'%')
+        </if>
+        ORDER BY create_time DESC
+    </select>
+
+</mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml
index b28c18f..8854047 100644
--- a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml
@@ -11,7 +11,6 @@
         <result column="sign_desc" property="signDesc" />
         <result column="sign_director" property="signDirector" />
         <result column="sign_user_id" property="signUserId" />
-        <result column="sign_type" property="signType" />
         <result column="minio_file_name" property="minioFileName" />
         <result column="create_time" property="createTime" />
         <result column="update_time" property="updateTime" />
@@ -28,7 +27,6 @@
         <result column="sign_name" property="signName" />
         <result column="sign_desc" property="signDesc" />
         <result column="sign_director" property="signDirector" />
-        <result column="sign_type" property="signType" />
         <result column="sign_user_id" property="signUserId" />
         <result column="minio_file_name" property="minioFileName" />
         <result column="create_time" property="createTime" />
@@ -62,4 +60,58 @@
         JOIN system_sign_user_relation ssur ON ss.id = ssur.sign_id
         WHERE ssur.user_id = #{userId}
     </select>
+
+    <select id="selectSignListPage" resultMap="BaseResultMap">
+        SELECT ss.*, sd.SIMPLE_NAME AS deptName
+        FROM system_sign ss
+        LEFT JOIN sys_user su ON su.id = ss.sign_user_id
+        LEFT JOIN sys_dept sd ON sd.id = su.dept_id
+        WHERE 1=1
+        <if test="request.signNo != null and request.signNo !=''">
+            AND ss.sign_no LIKE concat('%',#{request.signNo},'%')
+        </if>
+        <if test="request.signName != null and request.signName !=''">
+            AND ss.sign_name LIKE concat('%',#{request.signName},'%')
+        </if>
+        <if test="request.signDirector != null and request.signDirector !=''">
+            AND ss.sign_director LIKE concat('%',#{request.signDirector},'%')
+        </if>
+        <if test="request.signUserId != null and request.signUserId !=''">
+            AND ss.sign_user_id = #{request.signUserId}
+        </if>
+        <if test="request.createStartTime != null and request.createStartTime !=''">
+            AND DATE_FORMAT(ss.create_time,'%Y-%m-%d') &gt;= DATE_FORMAT(#{request.createStartTime},'%Y-%m-%d')
+        </if>
+        <if test="request.createEndTime != null and request.createEndTime !=''">
+            AND DATE_FORMAT(ss.create_time,'%Y-%m-%d')  &lt;= DATE_FORMAT(#{request.createEndTime},'%Y-%m-%d')
+        </if>
+        ORDER BY ss.create_time DESC
+    </select>
+
+    <select id="selectSignList" resultMap="BaseResultMap">
+        SELECT ss.*, sd.SIMPLE_NAME AS deptName
+        FROM system_sign ss
+        LEFT JOIN sys_user su ON su.id = ss.sign_user_id
+        LEFT JOIN sys_dept sd ON sd.id = su.dept_id
+        WHERE 1=1
+        <if test="request.signNo != null and request.signNo !=''">
+            AND ss.sign_no LIKE concat('%',#{request.signNo},'%')
+        </if>
+        <if test="request.signName != null and request.signName !=''">
+            AND ss.sign_name LIKE concat('%',#{request.signName},'%')
+        </if>
+        <if test="request.signDirector != null and request.signDirector !=''">
+            AND ss.sign_director LIKE concat('%',#{request.signDirector},'%')
+        </if>
+        <if test="request.signUserId != null and request.signUserId !=''">
+            AND ss.sign_user_id = #{request.signUserId}
+        </if>
+        <if test="request.createStartTime != null and request.createStartTime !=''">
+            AND DATE_FORMAT(ss.create_time,'%Y-%m-%d') &gt;= DATE_FORMAT(#{request.createStartTime},'%Y-%m-%d')
+        </if>
+        <if test="request.createEndTime != null and request.createEndTime !=''">
+            AND DATE_FORMAT(ss.create_time,'%Y-%m-%d')  &lt;= DATE_FORMAT(#{request.createEndTime},'%Y-%m-%d')
+        </if>
+        ORDER BY ss.create_time DESC
+    </select>
 </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 515050a..60f530b 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
@@ -47,8 +47,8 @@
     String STORAGE_LOCATION = "bizStorageLocation";
     //计量专业
     String MEASURE_MAJOR = "bizMeasureMajor";
-    //管理状态
-    String MANAGER_STATE = "bizManagerState";
+    //标准装置管理状态
+    String STANDARD_MANAGER_STATE = "bizStandardManagerState";
 
     /**
      * 资源管理 字典code
@@ -95,8 +95,6 @@
     String MEASURE_STATUS = "measureStatus";
     //检定方式
     String MEASURE_TYPE = "measureType";
-    //标识打印标志类型
-    String IDENTIFY_PRINT_TYPE = "bizBusinessIdentify";
     //变更类型
     String REPORT_CHANGE_TYPE = "bizCertChangeType";
     //规模类型
@@ -111,19 +109,24 @@
     String MEASURE_CATEGORY = "measureCategory";
     //检定结果
     String MEASURE_RESULT = "measureResult";
+    //分包原因
+    String OUTSOURCE_REASON = "outsourceReason";
+
+    /**
+     * 系统管理
+     */
+    String TEMPLATE_TYPE = "templateType";
+
 
     /**
      * 标准装置 字典code
      */
     //类别
     String STANDARD_CATEGORY = "standardCategory";
-    //管理状态
-    String STANDARD_MANAGER_STATE = "standardManagerState";
     //标准等级
     String STANDARD_LEVEL = "standardLevel";
     //传递范围
     String STANDARD_TRANSMIT_RANGE = "transmitRange";
-
     //资本来源
     String CAPITAL_SOURCE = "capitalSource";
     //标准装置-申请类型
@@ -148,8 +151,6 @@
     String CERTIFICATE_CLASS = "certificationClass";
     //证书管理-检校专业
     String CALIBRATION_MAJOR = "calibrationMajor";
-    //分包原因
-    String OUTSOURCE_REASON = "outsourceReason";
 
     /**
      * 工作台
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/BaseApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/BaseApprovalListRequest.java
index 73c12c1..80d7424 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/BaseApprovalListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/BaseApprovalListRequest.java
@@ -6,6 +6,7 @@
 
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotEmpty;
+import java.util.List;
 
 /**
  * @Description:
@@ -19,14 +20,14 @@
      * 表单id
      */
     @NotBlank(message = "表单id不能为空")
-    @ApiModelProperty(value = "表单id（流程定义对应的表单id，等价于业务id）", dataType = "String")
+    @ApiModelProperty(value = "表单id（流程定义对应的表单id，等价于业务id），导出接口不用传", dataType = "String")
     private String formId;
 
     /**
      * 审批状态类型，对应ApprovalStatusEnum
      */
     @NotEmpty(message = "审批状态类型不能为空")
-    @ApiModelProperty(value = "审批状态类型code", dataType = "String")
+    @ApiModelProperty(value = "审批状态类型code，导出接口不用传", dataType = "String")
     private String approvalStatus;
 
     @ApiModelProperty(hidden = true)
@@ -34,4 +35,7 @@
 
     @ApiModelProperty(hidden = true)
     private Long createUserId;
+
+    @ApiModelProperty(value = "导出ids", dataType = "List")
+    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificatePrintApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificatePrintApprovalListRequest.java
index b93d1c9..3cc2f4e 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificatePrintApprovalListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificatePrintApprovalListRequest.java
@@ -5,8 +5,6 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import java.util.List;
-
 /**
  * @Description:
  * @Author: wangpeng
@@ -38,7 +36,4 @@
 
     @ApiModelProperty(value = "创建结束时间", dataType = "String")
     private String createTimeEnd;
-
-    @ApiModelProperty(value = "导出ids", dataType = "List")
-    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportApprovalListRequest.java
index 4f7a038..c115847 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportApprovalListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportApprovalListRequest.java
@@ -5,8 +5,6 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import java.util.List;
-
 /**
  * @Description:
  * @Author: wangpeng
@@ -15,6 +13,8 @@
 @ApiModel
 @Data
 public class CertificateReportApprovalListRequest extends BaseApprovalListRequest {
+    @ApiModelProperty(value = "委托方id", dataType = "String")
+    private Long customerId;
 
     @ApiModelProperty(value = "证书报告编号", dataType = "String")
     private String certificateReportNo;
@@ -37,6 +37,4 @@
     @ApiModelProperty(value = "检校结束时间", dataType = "String")
     private String calibrationTimeEnd;
 
-    @ApiModelProperty(value = "导出ids", dataType = "List")
-    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/identify/IdentifyListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/identify/IdentifyListRequest.java
index 1b87ae6..f019203 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/identify/IdentifyListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/identify/IdentifyListRequest.java
@@ -4,6 +4,8 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * @Description:
  * @Author: wangpeng
@@ -26,4 +28,7 @@
 
     @ApiModelProperty(value = "打印结束时间", dataType = "String")
     private String createTimeEnd;
+
+    @ApiModelProperty(value = "导出ids", dataType = "List")
+    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListRequest.java
index 1264883..62415fb 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListRequest.java
@@ -7,6 +7,7 @@
 import lombok.Data;
 
 import javax.validation.constraints.NotBlank;
+import java.util.List;
 
 @Data
 @ApiModel
@@ -37,4 +38,6 @@
     @ApiModelProperty(value = "是否加急（1是0否null全部）", dataType = "Integer")
     private String isUrgent;
 
+    @ApiModelProperty(value = "导出ids", dataType = "List")
+    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListRequest.java
index 5201d7b..499760a 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListRequest.java
@@ -17,6 +17,9 @@
     @ApiModelProperty(value = "任务单编号", dataType = "String")
     private String orderNo;
 
+    @ApiModelProperty(value = "委托方id", dataType = "Long")
+    private Long customerId;
+
     @ApiModelProperty(value = "委托方名称", dataType = "String")
     private String customerName;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OrderSampleDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OrderSampleDTO.java
new file mode 100644
index 0000000..796edc0
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OrderSampleDTO.java
@@ -0,0 +1,19 @@
+package com.casic.missiles.dto.business.outsource;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/8/24 11:38
+ */
+@ApiModel
+@Data
+public class OrderSampleDTO {
+    @ApiModelProperty(value = "任务单id", dataType = "Long")
+    private Long orderId;
+    @ApiModelProperty(value = "受检设备id", dataType = "Long")
+    private Long sampleId;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceAssessApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceAssessApprovalListRequest.java
new file mode 100644
index 0000000..9a930c3
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceAssessApprovalListRequest.java
@@ -0,0 +1,30 @@
+package com.casic.missiles.dto.business.outsource;
+
+import com.casic.missiles.dto.BaseApprovalListRequest;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/8/24 11:01
+ */
+@ApiModel
+@Data
+public class OutsourceAssessApprovalListRequest extends BaseApprovalListRequest {
+    @ApiModelProperty(value = "评审表编号", dataType = "String")
+    private String projectNo;
+
+    @ApiModelProperty(value = "分包机构名称", dataType = "String")
+    private String outsourcerName;
+
+    @ApiModelProperty(value = "申请人", dataType = "String")
+    private String applicantName;
+
+    @ApiModelProperty(value = "申请时间开始", dataType = "String")
+    private String applicantTimeStart;
+
+    @ApiModelProperty(value = "申请时间结束", dataType = "String")
+    private String applicantTimeEnd;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceAssessSaveResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceAssessSaveResponse.java
new file mode 100644
index 0000000..8bf9aad
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceAssessSaveResponse.java
@@ -0,0 +1,20 @@
+package com.casic.missiles.dto.business.outsource;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/8/14 16:17
+ */
+@ApiModel
+@Data
+public class OutsourceAssessSaveResponse {
+    @ApiModelProperty(value = "主键id", dataType = "Long")
+    private Long id;
+
+    @ApiModelProperty(value = "编号", dataType = "String")
+    private String projectNo;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProtocolApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProtocolApprovalListRequest.java
new file mode 100644
index 0000000..0f32331
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProtocolApprovalListRequest.java
@@ -0,0 +1,30 @@
+package com.casic.missiles.dto.business.outsource;
+
+import com.casic.missiles.dto.BaseApprovalListRequest;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/8/24 15:01
+ */
+@ApiModel
+@Data
+public class OutsourceProtocolApprovalListRequest extends BaseApprovalListRequest {
+    @ApiModelProperty(value = "协议书编号", dataType = "String")
+    private String protocolNo;
+
+    @ApiModelProperty(value = "分包方名称", dataType = "String")
+    private String outsourcerName;
+
+    @ApiModelProperty(value = "申请人", dataType = "String")
+    private String applicantName;
+
+    @ApiModelProperty(value = "申请时间开始", dataType = "String")
+    private String applicantTimeStart;
+
+    @ApiModelProperty(value = "申请时间结束", dataType = "String")
+    private String applicantTimeEnd;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProtocolSaveResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProtocolSaveResponse.java
new file mode 100644
index 0000000..e324967
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProtocolSaveResponse.java
@@ -0,0 +1,20 @@
+package com.casic.missiles.dto.business.outsource;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/8/14 16:17
+ */
+@ApiModel
+@Data
+public class OutsourceProtocolSaveResponse {
+    @ApiModelProperty(value = "主键id", dataType = "Long")
+    private Long id;
+
+    @ApiModelProperty(value = "编号", dataType = "String")
+    private String protocolNo;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveApprovalListRequest.java
index f29f4e4..7047c28 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveApprovalListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveApprovalListRequest.java
@@ -5,8 +5,6 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import java.util.List;
-
 /**
  * @Description: 现场检测审批列表请求实体
  * @Author: wangpeng
@@ -30,7 +28,4 @@
     @ApiModelProperty(value = "申请时间结束", dataType = "String")
     private String applyTimeEnd;
 
-    @ApiModelProperty(value = "导出ids", dataType = "List")
-    private List<Long> ids;
-
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveDetailResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveDetailResponse.java
index 1f28752..394c934 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveDetailResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveDetailResponse.java
@@ -12,6 +12,18 @@
     @ApiModelProperty(value = "id，更新/删除使用参数", dataType = "Long")
     private Long id;
 
+    @ApiModelProperty(value = "实验室代码(字典code)", dataType = "String")
+    private String labCode;
+
+    @ApiModelProperty(value = "实验室代码(字典value)", dataType = "String")
+    private String labCodeName;
+
+    @ApiModelProperty(value = "组别代码(字典code)", dataType = "String")
+    private String groupCode;
+
+    @ApiModelProperty(value = "组别代码(字典value)", dataType = "String")
+    private String groupCodeName;
+
     @ApiModelProperty(value = "审批编号", dataType = "String")
     private String siteExecutiveNo;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/environment/LocationListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/environment/LocationListRequest.java
new file mode 100644
index 0000000..13d03c3
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/environment/LocationListRequest.java
@@ -0,0 +1,20 @@
+package com.casic.missiles.dto.resource.environment;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/6/8 13:56
+ */
+@ApiModel
+@Data
+public class LocationListRequest {
+    @ApiModelProperty(value = "地点编号", dataType = "String")
+    private String locationNo;
+
+    @ApiModelProperty(value = "地点名称", dataType = "String")
+    private String locationName;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/environment/LocationListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/environment/LocationListResponse.java
new file mode 100644
index 0000000..4c531af
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/environment/LocationListResponse.java
@@ -0,0 +1,78 @@
+package com.casic.missiles.dto.resource.environment;
+
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
+import com.baomidou.mybatisplus.annotation.TableField;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description: 地点列表响应实体
+ * @Author: wangpeng
+ * @Date: 2023/6/8 13:53
+ */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
+@ApiModel
+@Data
+public class LocationListResponse {
+    @ApiModelProperty(value = "主键id", dataType = "Long")
+    private Long id;
+
+    /**
+     * 地点编号
+     */
+    @ExcelProperty("地点编号")
+    @ApiModelProperty(value = "地点编号", dataType = "String")
+    private String locationNo;
+
+    /**
+     * 地点名称
+     */
+    @ExcelProperty("地点名称")
+    @ApiModelProperty(value = "地点名称", dataType = "String")
+    private String locationName;
+
+    /**
+     * 地点位置
+     */
+    @ExcelProperty("地点位置")
+    @ApiModelProperty(value = "地点位置", dataType = "String")
+    private String locationPosition;
+
+    /**
+     * 创建人id
+     */
+    @ApiModelProperty(value = "创建人id", dataType = "Long")
+    private Long createUserId;
+
+    /**
+     * 创建人
+     */
+    @ExcelProperty("创建人")
+    @ApiModelProperty(value = "创建人", dataType = "String")
+    @TableField("create_user")
+    private String createUser;
+
+    /**
+     * 创建时间
+     */
+    @ExcelProperty("创建时间")
+    @ApiModelProperty(value = "创建时间", dataType = "String")
+    private String createTime;
+
+    /**
+     * 更新时间
+     */
+    @ApiModelProperty(value = "更新时间", dataType = "String")
+    private String updateTime;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertRequest.java
index 9a7f6c6..c827915 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertRequest.java
@@ -4,6 +4,8 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * @Description:
  * @Author: wangpeng
@@ -16,4 +18,7 @@
     private String name;
     @ApiModelProperty(value = "部门名", dataType = "String")
     private String deptName;
+
+    @ApiModelProperty(value = "导出ids", dataType = "List")
+    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertResponse.java
index f78b159..8f2f79e 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertResponse.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.dto.resource.staff;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.casic.missiles.annotation.DictCodeField;
 import com.casic.missiles.constants.MeterDictCode;
 import io.swagger.annotations.ApiModel;
@@ -13,12 +20,18 @@
  * @Author: wangpeng
  * @Date: 2023/7/27 15:13
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @ApiModel
 @Data
 public class StaffCertResponse {
     /**
      * 人员编号
      */
+    @ExcelProperty(value = "人员编号",order = 0)
     @NotEmpty(message = "人员编号不能为空")
     @ApiModelProperty(value = "人员编号", dataType = "String")
     private String staffNo;
@@ -26,6 +39,7 @@
     /**
      * 姓名
      */
+    @ExcelProperty(value = "姓名",order = 1)
     @ApiModelProperty(value = "姓名", dataType = "String")
     private String staffName;
 
@@ -54,6 +68,7 @@
     /**
      * 部门名字
      */
+    @ExcelProperty(value = "工作部门",order = 2)
     @ApiModelProperty(value = "部门名字", dataType = "String")
     private String deptName;
 
@@ -66,6 +81,7 @@
     /**
      * 计量专业
      */
+    @ExcelProperty(value = "计量专业",order = 3)
     @ApiModelProperty(value = "计量专业", dataType = "String")
     private String major;
 
@@ -110,6 +126,7 @@
     /**
      * 证书号
      */
+    @ExcelProperty(value = "证号",order = 4)
     @ApiModelProperty(value = "证书号", dataType = "String")
     private String certNo;
 
@@ -122,12 +139,14 @@
     /**
      * 有效日期
      */
+    @ExcelProperty(value = "证书有效期",order = 6)
     @ApiModelProperty(value = "有效日期", dataType = "String")
     private String effectiveDate;
 
     /**
      * 发放日期
      */
+    @ExcelProperty(value = "发证日期",order = 5)
     @ApiModelProperty(value = "发放日期", dataType = "String")
     private String grantDate;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffListRequest.java
index 7c4afb3..0a1194a 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffListRequest.java
@@ -4,6 +4,8 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * @Description:
  * @Author: wangpeng
@@ -18,4 +20,7 @@
     private String deptName;
     @ApiModelProperty(value = "部门id", dataType = "Long")
     private Long deptId;
+
+    @ApiModelProperty(value = "导出ids", dataType = "List")
+    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/TrainListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/TrainListRequest.java
index f68597b..6321f8b 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/TrainListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/TrainListRequest.java
@@ -14,6 +14,8 @@
 public class TrainListRequest {
     @ApiModelProperty(value = "训练登记表编号", dataType = "String")
     private String trainNo;
+    @ApiModelProperty(value = "值班领导", dataType = "String")
+    private String dutyLeader;
     @ApiModelProperty(value = "创建开始时间", dataType = "String")
     private String createTimeStart;
     @ApiModelProperty(value = "创建结束时间", dataType = "String")
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/SignAddRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/SignAddRequest.java
index 117be34..d71055c 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/SignAddRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/SignAddRequest.java
@@ -43,13 +43,6 @@
     private Long signUserId;
 
     /**
-     * 签章或签名-字典code
-     */
-    @NotBlank(message = "类型不能为空")
-    @ApiModelProperty(value = "签名/签章-字典code", dataType = "String", required = true)
-    private String signType;
-
-    /**
      * minio存储文件名
      */
     @ApiModelProperty(value = "上传文件返回名称", dataType = "String")
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateAddRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateAddRequest.java
index aff1265..6316648 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateAddRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateAddRequest.java
@@ -17,30 +17,28 @@
 @Data
 public class TemplateAddRequest extends BaseSystemRequest {
     /**
-     * 原始记录模板/证书报告模板名称
+     * 模板名称
      */
     @ApiModelProperty(value = "名称", dataType = "String", required = true)
     @NotBlank(message = "名称不能为空")
     private String templateName;
 
     /**
-     * 原始记录模板/证书报告模板描述
+     * 模板描述
      */
     @ApiModelProperty(value = "描述", dataType = "String")
     private String templateDesc;
 
     /**
-     * 原始记录模板/证书报告模板创建人
+     * 创建人
      */
     @ApiModelProperty(value = "创建人", dataType = "String", required = true)
     @NotBlank(message = "创建人不能为空")
     private String templateCreator;
 
-    /**
-     * 原始记录模板/证书报告模板-字典code
-     */
-    @NotBlank(message = "类型不能为空")
-    @ApiModelProperty(value = "原始记录模板/证书报告模板-字典code", dataType = "String", required = true)
+
+    @NotBlank(message = "模板类型不能为空")
+    @ApiModelProperty(value = "模板类型(字典code)", dataType = "String", required = true)
     private String templateType;
 
     /**
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateListRequest.java
index eec5a1e..6d17bbe 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateListRequest.java
@@ -1,11 +1,12 @@
 package com.casic.missiles.dto.system;
 
+import com.casic.missiles.annotation.DictCodeField;
+import com.casic.missiles.constants.MeterDictCode;
 import com.casic.missiles.dto.BaseSystemRequest;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import javax.validation.constraints.NotBlank;
 import java.util.List;
 
 /**
@@ -19,8 +20,8 @@
     /**
      * 类型
      */
-//    @ApiModelProperty(value = "类型-字典code", dataType = "String", required = true)
-    @NotBlank(message = "类型不能为空")
+    @DictCodeField(message = "模板类型不合法", cacheName = MeterDictCode.TEMPLATE_TYPE)
+    @ApiModelProperty(value = "模板类型(字典code)", dataType = "String")
     private String templateType;
 
     /**
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificateChangeApply.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificateChangeApply.java
index 9216308..36923fd 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificateChangeApply.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificateChangeApply.java
@@ -1,11 +1,19 @@
 package com.casic.missiles.model.business;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 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 com.casic.missiles.dto.BaseRequest;
+import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -20,6 +28,12 @@
  * @author wangpeng
  * @since 2023-08-15
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
+@ApiModel
 @Data
 @TableName("biz_business_certificate_change_apply")
 public class BizBusinessCertificateChangeApply extends BaseRequest implements Serializable {
@@ -33,6 +47,7 @@
     /**
      * 申请单编号
      */
+    @ExcelProperty(value = "申请单编号", order = 1)
     @ApiModelProperty(value = "申请单编号", dataType = "String")
     @TableField("change_apply_no")
     private String changeApplyNo;
@@ -40,6 +55,7 @@
     /**
      * 申请单名字
      */
+    @ExcelProperty(value = "申请单名称", order = 2)
     @ApiModelProperty(value = "申请单名字", dataType = "String")
     @TableField("change_apply_name")
     private String changeApplyName;
@@ -54,6 +70,7 @@
     /**
      * 更换证书编号
      */
+    @ExcelProperty(value = "更换证书编号", order = 3)
     @ApiModelProperty(value = "更换证书编号", dataType = "String")
     @TableField("change_report_no")
     private String changeReportNo;
@@ -61,7 +78,8 @@
     /**
      * 更换证书名字
      */
-    @ApiModelProperty(value = "更换证书名字", dataType = "String")
+    @ExcelProperty(value = "更换证书/报告名称", order = 4)
+    @ApiModelProperty(value = "更换证书/报告名称", dataType = "String")
     @TableField("change_report_name")
     private String changeReportName;
 
@@ -73,6 +91,7 @@
     @TableField("change_type")
     private String changeType;
 
+    @ExcelProperty(value = "变更类型", order = 5)
     @ApiModelProperty(value = "变更类型(字典value)", dataType = "String")
     @TableField(exist = false)
     private String changeTypeName;
@@ -142,13 +161,15 @@
     /**
      * 创建用户名字
      */
-    @ApiModelProperty(value = "创建用户名字", dataType = "String")
+    @ExcelProperty(value = "创建人", order = 6)
+    @ApiModelProperty(value = "创建人名字", dataType = "String")
     @TableField("create_user_name")
     private String createUserName;
 
     /**
      * 创建时间
      */
+    @ExcelProperty(value = "创建时间", order = 7)
     @ApiModelProperty(value = "创建时间", dataType = "String")
     @TableField("create_time")
     private String createTime;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificateReport.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificateReport.java
index f01db9e..db06018 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificateReport.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificateReport.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.model.business;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -22,6 +29,11 @@
  * @author wangpeng
  * @since 2023-08-14
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @ApiModel
 @Data
 @TableName("biz_business_certificate_report")
@@ -36,6 +48,7 @@
     /**
      * 证书报告编号
      */
+    @ExcelProperty(value = "证书报告编号", order = 1)
     @ApiModelProperty(value = "证书报告编号", dataType = "String")
     @TableField("certificate_report_no")
     private String certificateReportNo;
@@ -43,6 +56,7 @@
     /**
      * 证书报告名称
      */
+    @ExcelProperty(value = "证书报告名称", order = 2)
     @ApiModelProperty(value = "证书报告名称", dataType = "String")
     @TableField("certificate_report_name")
     private String certificateReportName;
@@ -62,6 +76,7 @@
     @TableField("measure_category")
     private String measureCategory;
 
+    @ExcelProperty(value = "检校类别", order = 6)
     @ApiModelProperty(value = "检校类别(字典value)", dataType = "String")
     @TableField(exist = false)
     private String measureCategoryName;
@@ -69,6 +84,7 @@
     /**
      * 检校时间
      */
+    @ExcelProperty(value = "检校时间", order = 8)
     @ApiModelProperty(value = "检校时间", dataType = "String")
     @TableField("calibration_time")
     private String calibrationTime;
@@ -267,18 +283,22 @@
     @TableField(exist = false)
     private Integer decisionItem;
 
-    @ApiModelProperty(value = "设备样品编号（列表返回参数）", dataType = "String")
+    @ExcelProperty(value = "被检设备统一编号", order = 3)
+    @ApiModelProperty(value = "被检设备统一编号（列表返回参数）", dataType = "String")
     @TableField(exist = false)
     private String sampleNo;
 
-    @ApiModelProperty(value = "设备样品名称（列表返回参数）", dataType = "String")
+    @ExcelProperty(value = "被检设备名称", order = 4)
+    @ApiModelProperty(value = "被检设备名称（列表返回参数）", dataType = "String")
     @TableField(exist = false)
     private String sampleName;
 
-    @ApiModelProperty(value = "设备样品规格型号（列表返回参数）", dataType = "String")
+    @ExcelProperty(value = "规格型号", order = 5)
+    @ApiModelProperty(value = "规格型号（列表返回参数）", dataType = "String")
     @TableField(exist = false)
     private String sampleModel;
 
+    @ExcelProperty(value = "检定员", order = 7)
     @ApiModelProperty(value = "检定员名字（列表返回参数）", dataType = "String")
     @TableField(exist = false)
     private String staffName;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessIdentifyInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessIdentifyInfo.java
index 46bfba5..f1a9bec 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessIdentifyInfo.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessIdentifyInfo.java
@@ -1,10 +1,15 @@
 package com.casic.missiles.model.business;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 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;
 
@@ -20,6 +25,11 @@
  * @author wangpeng
  * @since 2023-08-15
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @Data
 @TableName("biz_business_identify_info")
 public class BizBusinessIdentifyInfo implements Serializable {
@@ -33,6 +43,7 @@
     /**
      * 记录编号
      */
+    @ExcelProperty(value = "记录编号", order = 1)
     @ApiModelProperty(value = "记录编号", dataType = "String")
     @TableField("record_no")
     private String recordNo;
@@ -41,20 +52,15 @@
      * 标志类型(字典code)
      */
     @NotEmpty(message = "标志类型不能为空")
-    @ApiModelProperty(value = "标志类型(字典code)", dataType = "String")
-    @DictCodeField(message = "标志类型不合法", cacheName = MeterDictCode.IDENTIFY_PRINT_TYPE)
+    @ApiModelProperty(value = "标志类型(直接存计量标识/使用状态/校准状态的字典value)", dataType = "String")
     @TableField("identify_type")
     private String identifyType;
 
-    @ApiModelProperty(value = "标志类型(字典value)", dataType = "String")
-    @TableField(exist = false)
-    private String identifyTypeName;
-
     /**
      * 设备id(可以是受检设备/设备台账)
      */
     @NotNull(message = "设备id不能为空")
-    @ApiModelProperty(value = "设备id(可以是受检设备/设备台账)", dataType = "String")
+    @ApiModelProperty(value = "设备id(可以是受检设备/设备台账)", dataType = "Long")
     @TableField("device_id")
     private Long deviceId;
 
@@ -66,29 +72,32 @@
     @TableField("device_type")
     private String deviceType;
 
+    @ExcelProperty(value = "统一编号", order = 3)
     @NotEmpty(message = "设备编号不能为空")
-    @ApiModelProperty(value = "设备编号", dataType = "String")
+    @ApiModelProperty(value = "统一编号", dataType = "String")
     @TableField("device_no")
     private String deviceNo;
 
     /**
      * 设备名字
      */
-    @NotEmpty(message = "设备名字不能为空")
-    @ApiModelProperty(value = "设备名字", dataType = "String")
+    @ExcelProperty(value = "设备名称", order = 4)
+    @NotEmpty(message = "设备名称不能为空")
+    @ApiModelProperty(value = "设备名称", dataType = "String")
     @TableField("device_name")
     private String deviceName;
 
     /**
      * 检定员id
      */
-    @ApiModelProperty(value = "检定员id", dataType = "String")
+    @ApiModelProperty(value = "检定员id", dataType = "Long")
     @TableField("measure_person_id")
     private Long measurePersonId;
 
     /**
      * 检定员名字
      */
+    @ExcelProperty(value = "检定员", order = 5)
     @ApiModelProperty(value = "检定员名字", dataType = "String")
     @TableField("measure_person")
     private String measurePerson;
@@ -103,7 +112,8 @@
     /**
      * 更新时间
      */
-    @ApiModelProperty(value = "更新时间", dataType = "String")
+    @ExcelProperty(value = "打印时间", order = 6)
+    @ApiModelProperty(value = "打印时间", dataType = "String")
     @TableField("update_time")
     private String updateTime;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceAssess.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceAssess.java
index 659d9ca..6720b90 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceAssess.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceAssess.java
@@ -1,11 +1,26 @@
 package com.casic.missiles.model.business;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 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 com.casic.missiles.dto.BaseRequest;
+import com.casic.missiles.dto.business.outsource.OrderSampleDTO;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import javax.validation.constraints.NotEmpty;
 import java.io.Serializable;
+import java.util.List;
 
 /**
  * <p>
@@ -15,146 +30,231 @@
  * @author wangpeng
  * @since 2023-08-16
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
+@ApiModel
 @Data
 @TableName("biz_business_outsource_assess")
-public class BizBusinessOutsourceAssess implements Serializable {
+public class BizBusinessOutsourceAssess extends BaseRequest implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
+    @ApiModelProperty(value = "id，更新/删除使用参数", dataType = "Long")
     @TableId("id")
     private Long id;
 
     /**
      * 评审表编号
      */
+    @ExcelProperty(value = "评审表编号", order = 1)
+    @ApiModelProperty(value = "评审表编号(后台生成)", dataType = "String")
     @TableField("project_no")
     private String projectNo;
 
     /**
      * 评审表名称
      */
+    @ExcelProperty(value = "评审表名称", order = 2)
+    @ApiModelProperty(value = "评审表名称", dataType = "String")
     @TableField("project_name")
     private String projectName;
 
+    @NotEmpty(message = "实验室代码不能为空")
+    @DictCodeField(message = "实验室代码描述不合法", cacheName = MeterDictCode.LAB_CODE)
+    @ApiModelProperty(value = "实验室代码(字典code)", dataType = "String")
+    @TableField("lab_code")
+    private String labCode;
+
+    @ApiModelProperty(value = "实验室代码(字典value)", dataType = "String")
+    @TableField(exist = false)
+    private String labCodeName;
+
+    /**
+     * 组别代码
+     */
+    @NotEmpty(message = "组别代码不能为空")
+    @DictCodeField(message = "组别代码描述不合法", cacheName = MeterDictCode.GROUP_CODE)
+    @ApiModelProperty(value = "组别代码(字典code)", dataType = "String")
+    @TableField("group_code")
+    private String groupCode;
+
+    @ApiModelProperty(value = "组别代码(字典value)", dataType = "String")
+    @TableField(exist = false)
+    private String groupCodeName;
+
     /**
      * 申请人id
      */
+    @ApiModelProperty(value = "申请人id", dataType = "String")
     @TableField("applicant_id")
     private Long applicantId;
 
     /**
      * 申请人名字
      */
+    @ExcelProperty(value = "申请人", order = 5)
+    @ApiModelProperty(value = "申请人", dataType = "String")
     @TableField("applicant_name")
     private String applicantName;
 
     /**
      * 申请时间
      */
+    @ExcelProperty(value = "申请时间", order = 6)
+    @ApiModelProperty(value = "申请时间", dataType = "String")
     @TableField("applicant_time")
     private String applicantTime;
 
     /**
      * 附件(minio存储文件名)
      */
+    @ApiModelProperty(value = "附件(minio存储文件名)", dataType = "String")
     @TableField("minio_file_name")
     private String minioFileName;
 
     /**
      * 备注
      */
+    @ApiModelProperty(value = "备注", dataType = "String")
     @TableField("remark")
     private String remark;
 
     /**
      * 创建人id
      */
+    @ApiModelProperty(value = "创建人id", dataType = "String")
     @TableField("create_user_id")
     private Long createUserId;
 
     /**
      * 创建人名字
      */
+    @ApiModelProperty(value = "创建人名字", dataType = "String")
     @TableField("create_user_name")
     private String createUserName;
 
     /**
      * 分包方id
      */
+    @ApiModelProperty(value = "评审表编号", dataType = "String")
     @TableField("outsourcer_id")
     private Long outsourcerId;
 
     /**
      * 预计开始时间
      */
+    @ApiModelProperty(value = "预计开始时间", dataType = "String")
     @TableField("pre_start_time")
     private String preStartTime;
 
     /**
      * 预计结束时间
      */
+    @ApiModelProperty(value = "预计结束时间", dataType = "String")
     @TableField("pre_end_time")
     private String preEndTime;
 
     /**
      * 分包原因-字典
      */
+    @ApiModelProperty(value = "分包原因(字典code)", dataType = "String")
+    @DictCodeField(message = "分包原因描述不合法", cacheName = MeterDictCode.OUTSOURCE_REASON)
     @TableField("outsource_reason")
     private String outsourceReason;
 
+    @ApiModelProperty(value = "分包原因(字典value)", dataType = "String")
+    @TableField(exist = false)
+    private String outsourceReasonName;
+
     /**
      * 预计费用
      */
+    @ApiModelProperty(value = "预计费用", dataType = "String")
     @TableField("pre_cost")
     private String preCost;
 
     /**
      * 审批状态
      */
+    @ApiModelProperty(value = "审批状态", dataType = "String")
+    @DictCodeField(message = "审批状态描述不合法", cacheName = MeterDictCode.APPROVAL_STATUS)
     @TableField("approval_status")
     private String approvalStatus;
 
     /**
      * 流程实例id
      */
+    @ApiModelProperty(value = "流程实例id", dataType = "String")
     @TableField("process_id")
     private String processId;
 
     /**
      * 实验室认可情况
      */
+    @ApiModelProperty(value = "实验室认可情况", dataType = "String")
     @TableField("approve_situation")
     private String approveSituation;
 
     /**
      * 溯源性
      */
+    @ApiModelProperty(value = "溯源性", dataType = "String")
     @TableField("traceability")
     private String traceability;
 
     /**
      * 测试方法
      */
+    @ApiModelProperty(value = "测试方法", dataType = "String")
     @TableField("test_method")
     private String testMethod;
 
     /**
      * 技术能力
      */
+    @ApiModelProperty(value = "技术能力", dataType = "String")
     @TableField("technique_ability")
     private String techniqueAbility;
 
     /**
      * 创建时间
      */
+    @ApiModelProperty(hidden = true)
     @TableField("create_time")
     private String createTime;
 
     /**
      * 更新时间
      */
+    @ApiModelProperty(hidden = true)
     @TableField("update_time")
     private String updateTime;
 
+    @ApiModelProperty(value = "审批状态类型-字典value", dataType = "String")
+    @TableField(exist = false)
+    private String approvalStatusName;
 
+    @ApiModelProperty(value = "任务id（同意、驳回等操作使用）", dataType = "String")
+    @TableField(exist = false)
+    private String taskId;
+
+    @ApiModelProperty(value = "可选决策项（1同意驳回拒绝 2同意驳回 3同意拒绝，用于待审批列表同意/驳回/拒绝按钮展示）", dataType = "Integer")
+    @TableField(exist = false)
+    private Integer decisionItem;
+
+    @NotEmpty(message = "受检设备信息不能为空")
+    @ApiModelProperty(value = "受检设备id列表（新建使用参数）", dataType = "List")
+    @TableField(exist = false)
+    private List<OrderSampleDTO> orderSampleList;
+
+    @ExcelProperty(value = "分包机构名称", order = 3)
+    @ApiModelProperty(value = "分包机构名称（列表返回参数）", dataType = "String")
+    private String outsourcerName;
+
+    @ExcelProperty(value = "机构负责人", order = 4)
+    @ApiModelProperty(value = "机构负责人（列表返回参数）", dataType = "String")
+    private String director;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceProtocol.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceProtocol.java
new file mode 100644
index 0000000..38df697
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceProtocol.java
@@ -0,0 +1,225 @@
+package com.casic.missiles.model.business;
+
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
+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 com.casic.missiles.dto.BaseRequest;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotEmpty;
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 计量检定业务-分包管理-测试、校准或检定工作分包协议书
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-08-24
+ */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
+@Data
+@TableName("biz_business_outsource_protocol")
+public class BizBusinessOutsourceProtocol extends BaseRequest implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "id，更新/删除使用参数", dataType = "Long")
+    @TableId("id")
+    private Long id;
+
+    /**
+     * 协议书编号
+     */
+    @ExcelProperty(value = "协议书编号", order = 1)
+    @ApiModelProperty(value = "协议书编号(后台生成)", dataType = "String")
+    @TableField("protocol_no")
+    private String protocolNo;
+
+    /**
+     * 协议书名称
+     */
+    @ExcelProperty(value = "协议书名称", order = 2)
+    @ApiModelProperty(value = "协议书名称", dataType = "String")
+    @TableField("project_name")
+    private String projectName;
+
+    @NotEmpty(message = "实验室代码不能为空")
+    @DictCodeField(message = "实验室代码描述不合法", cacheName = MeterDictCode.LAB_CODE)
+    @ApiModelProperty(value = "实验室代码(字典code)", dataType = "String")
+    @TableField("lab_code")
+    private String labCode;
+
+    @ApiModelProperty(value = "实验室代码(字典value)", dataType = "String")
+    @TableField(exist = false)
+    private String labCodeName;
+
+    @NotEmpty(message = "组别代码不能为空")
+    @DictCodeField(message = "组别代码描述不合法", cacheName = MeterDictCode.GROUP_CODE)
+    @ApiModelProperty(value = "组别代码(字典code)", dataType = "String")
+    @TableField("group_code")
+    private String groupCode;
+
+    @ApiModelProperty(value = "组别代码(字典value)", dataType = "String")
+    @TableField(exist = false)
+    private String groupCodeName;
+
+    /**
+     * 分包方id
+     */
+    @ApiModelProperty(value = "分包方id", dataType = "Long")
+    @TableField("outsourcer_id")
+    private Long outsourcerId;
+
+    /**
+     * 其他
+     */
+    @ApiModelProperty(value = "其他", dataType = "String")
+    @TableField("remark")
+    private String remark;
+
+    /**
+     * 分包方编号
+     */
+    @ApiModelProperty(value = "分包方编号(新建不用传)", dataType = "String")
+    @TableField("outsource_no")
+    private String outsourceNo;
+
+    /**
+     * 分包方名称
+     */
+    @ExcelProperty(value = "分包方名称", order = 3)
+    @ApiModelProperty(value = "分包方名称(新建不用传)", dataType = "String")
+    @TableField("outsource_name")
+    private String outsourceName;
+
+    /**
+     * 联系人
+     */
+    @ExcelProperty(value = "联系人", order = 4)
+    @ApiModelProperty(value = "联系人", dataType = "String")
+    @TableField("contacts")
+    private String contacts;
+
+    /**
+     * 电话
+     */
+    @ApiModelProperty(value = "电话", dataType = "String")
+    @TableField("mobile")
+    private String mobile;
+
+    /**
+     * 地址
+     */
+    @ApiModelProperty(value = "地址", dataType = "String")
+    @TableField("address")
+    private String address;
+
+    /**
+     * 要求完成日期
+     */
+    @ApiModelProperty(value = "要求完成日期", dataType = "String")
+    @TableField("require_date")
+    private String requireDate;
+
+    /**
+     * 分包费用(元)
+     */
+    @ApiModelProperty(value = "分包费用(元)", dataType = "String")
+    @TableField("outsource_cost")
+    private Double outsourceCost;
+
+    /**
+     * 分包方负责人
+     */
+    @ApiModelProperty(value = "分包方负责人", dataType = "String")
+    @TableField("director")
+    private String director;
+
+    /**
+     * 分包项目
+     */
+    @ApiModelProperty(value = "分包项目", dataType = "String")
+    @TableField("item")
+    private String item;
+
+    /**
+     * 分包要求
+     */
+    @ApiModelProperty(value = "分包要求", dataType = "String")
+    @TableField("requires")
+    private String requires;
+
+    /**
+     * 创建人id
+     */
+    @ApiModelProperty(hidden = true)
+    @TableField("create_user_id")
+    private Long createUserId;
+
+    /**
+     * 创建人名字
+     */
+    @ExcelProperty(value = "申请人", order = 5)
+    @ApiModelProperty(value = "申请人", dataType = "String")
+    @TableField("create_user_name")
+    private String createUserName;
+
+    /**
+     * 审批状态
+     */
+    @ApiModelProperty(value = "审批状态", dataType = "String")
+    @DictCodeField(message = "审批状态描述不合法", cacheName = MeterDictCode.APPROVAL_STATUS)
+    @TableField("approval_status")
+    private String approvalStatus;
+
+    /**
+     * 流程实例id
+     */
+    @ApiModelProperty(value = "流程实例id", dataType = "String")
+    @TableField("process_id")
+    private String processId;
+
+    /**
+     * 创建时间
+     */
+    @ExcelProperty(value = "申请时间", order = 6)
+    @ApiModelProperty(value = "申请时间", dataType = "String")
+    @TableField("create_time")
+    private String createTime;
+
+    /**
+     * 更新时间
+     */
+    @ApiModelProperty(hidden = true)
+    @TableField("update_time")
+    private String updateTime;
+
+    @ApiModelProperty(value = "审批状态类型-字典value", dataType = "String")
+    @TableField(exist = false)
+    private String approvalStatusName;
+
+    @ApiModelProperty(value = "任务id（同意、驳回等操作使用）", dataType = "String")
+    @TableField(exist = false)
+    private String taskId;
+
+    @ApiModelProperty(value = "可选决策项（1同意驳回拒绝 2同意驳回 3同意拒绝，用于待审批列表同意/驳回/拒绝按钮展示）", dataType = "Integer")
+    @TableField(exist = false)
+    private Integer decisionItem;
+
+
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourcerInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourcerInfo.java
index ec4e997..f9aa69e 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourcerInfo.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourcerInfo.java
@@ -17,6 +17,7 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import javax.validation.constraints.NotEmpty;
 import java.io.Serializable;
 
 /**
@@ -59,6 +60,29 @@
     @TableField("outsourcer_name")
     private String outsourcerName;
 
+    @NotEmpty(message = "实验室代码不能为空")
+    @DictCodeField(message = "实验室代码描述不合法", cacheName = MeterDictCode.LAB_CODE)
+    @ApiModelProperty(value = "实验室代码(字典code)", dataType = "String")
+    @TableField("lab_code")
+    private String labCode;
+
+    @ApiModelProperty(value = "实验室代码(字典value)", dataType = "String")
+    @TableField(exist = false)
+    private String labCodeName;
+
+    /**
+     * 组别代码
+     */
+    @NotEmpty(message = "组别代码不能为空")
+    @DictCodeField(message = "组别代码描述不合法", cacheName = MeterDictCode.GROUP_CODE)
+    @ApiModelProperty(value = "组别代码(字典code)", dataType = "String")
+    @TableField("group_code")
+    private String groupCode;
+
+    @ApiModelProperty(value = "组别代码(字典value)", dataType = "String")
+    @TableField(exist = false)
+    private String groupCodeName;
+
     /**
      * 单位简称
      */
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardInfo.java
index c48eed7..dffdfdd 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardInfo.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardInfo.java
@@ -5,6 +5,7 @@
 import com.baomidou.mybatisplus.annotation.TableName;
 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;
 
@@ -18,6 +19,7 @@
  * @author wangpeng
  * @since 2023-08-04
  */
+@ApiModel
 @Data
 @TableName("biz_equipment_standard_info")
 public class BizEquipmentStandardInfo implements Serializable {
@@ -119,7 +121,7 @@
      * 管理状态(字典code)
      */
     @ApiModelProperty(value = "管理状态(字典code)", dataType = "String")
-    @DictCodeField(message = "管理状态不合法", cacheName = MeterDictCode.MANAGER_STATE)
+    @DictCodeField(message = "管理状态不合法", cacheName = MeterDictCode.STANDARD_MANAGER_STATE)
     @TableField("manage_status")
     private String manageStatus;
 
@@ -151,7 +153,7 @@
     /**
      * 温度(℃)
      */
-    @ApiModelProperty(value = "使用状态(字典code)", dataType = "String")
+    @ApiModelProperty(value = "温度(℃)", dataType = "String")
     @TableField("temperature")
     private Double temperature;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardInfoApproval.java b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardInfoApproval.java
index dbd86ab..9f58d83 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardInfoApproval.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardInfoApproval.java
@@ -150,7 +150,7 @@
      * 管理状态(字典code)
      */
     @ApiModelProperty(value = "管理状态(字典code)", dataType = "String")
-    @DictCodeField(message = "管理状态不合法", cacheName = MeterDictCode.MANAGER_STATE)
+    @DictCodeField(message = "管理状态不合法", cacheName = MeterDictCode.STANDARD_MANAGER_STATE)
     @TableField("manage_status")
     private String manageStatus;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardTechnologyRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardTechnologyRelation.java
index 0e612bd..751f26b 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardTechnologyRelation.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardTechnologyRelation.java
@@ -3,6 +3,7 @@
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -16,6 +17,7 @@
  * @author wangpeng
  * @since 2023-08-04
  */
+@ApiModel
 @Data
 @TableName("biz_equipment_standard_technology_relation")
 public class BizEquipmentStandardTechnologyRelation implements Serializable {
@@ -33,6 +35,10 @@
     @TableField("technology_file_id")
     private Long technologyFileId;
 
+    @ApiModelProperty(value = "依据的技术文件编号", dataType = "String")
+    @TableField("technology_file_no")
+    private String technologyFileNo;
+
     /**
      * 依据的技术文件名称(技术文件中现行测试校准检定方法表文件名字段)
      */
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerInfo.java
index d6e8bed..65cd6bc 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerInfo.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerInfo.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.model.resource;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -21,6 +28,11 @@
  * @author wangpeng
  * @since 2023-08-08
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @ApiModel
 @Data
 @TableName("biz_resource_customer_info")
@@ -35,6 +47,7 @@
     /**
      * 委托方编号
      */
+    @ExcelProperty(value = "委托方编号", order = 1)
     @ApiModelProperty(value = "委托方编号", dataType = "String")
     @TableField("customer_no")
     private String customerNo;
@@ -42,6 +55,7 @@
     /**
      * 委托方名称
      */
+    @ExcelProperty(value = "委托方名称", order = 2)
     @ApiModelProperty(value = "委托方名称(新建时为下拉选择一个受检单位组织的名字，传deptId字段，后端获取名称)", dataType = "String")
     @TableField("customer_name")
     private String customerName;
@@ -63,6 +77,7 @@
     /**
      * 联系人
      */
+    @ExcelProperty(value = "联系人", order = 3)
     @ApiModelProperty(value = "联系人", dataType = "String")
     @TableField("contacts")
     private String contacts;
@@ -70,6 +85,7 @@
     /**
      * 座机电话
      */
+    @ExcelProperty(value = "座机电话", order = 4)
     @ApiModelProperty(value = "座机电话", dataType = "String")
     @TableField("mobile")
     private String mobile;
@@ -77,6 +93,7 @@
     /**
      * 手机号码
      */
+    @ExcelProperty(value = "手机号码", order = 5)
     @ApiModelProperty(value = "手机号码", dataType = "String")
     @TableField("phone")
     private String phone;
@@ -91,6 +108,7 @@
     /**
      * 地址
      */
+    @ExcelProperty(value = "地址", order = 6)
     @ApiModelProperty(value = "地址", dataType = "String")
     @TableField("address")
     private String address;
@@ -141,6 +159,7 @@
     /**
      * 创建时间
      */
+    @ExcelProperty(value = "创建时间", order = 7)
     @ApiModelProperty(value = "创建时间", dataType = "String")
     @TableField("create_time")
     private String createTime;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerSuggestForm.java b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerSuggestForm.java
index 7201bbd..701bf8b 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerSuggestForm.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerSuggestForm.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.model.resource;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -22,6 +29,11 @@
  * @author wangpeng
  * @since 2023-08-08
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @ApiModel
 @Data
 @TableName("biz_resource_customer_suggest_form")
@@ -44,7 +56,8 @@
     /**
      * 委托方名称
      */
-    @ApiModelProperty(value = "委托方名称", dataType = "String")
+    @ExcelProperty(value = "意见反馈单位", order = 2)
+    @ApiModelProperty(value = "意见反馈单位", dataType = "String")
     @TableField("customer_name")
     private String customerName;
 
@@ -59,7 +72,8 @@
     /**
      * 委托方意见反馈部门名称
      */
-    @ApiModelProperty(value = "委托方意见反馈部门名称", dataType = "String")
+    @ExcelProperty(value = "委托方意见反馈部门", order = 3)
+    @ApiModelProperty(value = "委托方意见反馈部门", dataType = "String")
     @TableField("customer_dept_name")
     private String customerDeptName;
 
@@ -73,6 +87,7 @@
     /**
      * 表单编号
      */
+    @ExcelProperty(value = "表单编号", order = 1)
     @ApiModelProperty(value = "表单编号", dataType = "String")
     @TableField("form_no")
     private String formNo;
@@ -111,6 +126,7 @@
     /**
      * 创建人名字
      */
+    @ExcelProperty(value = "创建人", order = 4)
     @ApiModelProperty(value = "创建人名字", dataType = "String")
     @TableField("create_user_name")
     private String createUserName;
@@ -147,6 +163,7 @@
     /**
      * 创建时间
      */
+    @ExcelProperty(value = "创建时间", order = 5)
     @ApiModelProperty(value = "创建时间", dataType = "String")
     @TableField("create_time")
     private String createTime;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSealInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSealInfo.java
index cbf05d7..9bf389d 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSealInfo.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSealInfo.java
@@ -106,6 +106,10 @@
     @TableField("minio_file_name")
     private String minioFileName;
 
+    @ApiModelProperty(value = "minio存储文件url", dataType = "String")
+    @TableField(exist = false)
+    private String minioFileUrl;
+
     @ApiModelProperty(value = "创建时间", dataType = "String")
     @TableField("create_time")
     private String createTime;

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java
index bb0c50f..13a699b 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java
@@ -12,6 +12,7 @@
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.IGeneralApprovalService;
+import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
@@ -19,6 +20,7 @@
 import org.springframework.web.bind.annotation.RequestBody;
 
 import javax.validation.Valid;
+import java.util.List;
 import java.util.Objects;
 
 /**
@@ -117,4 +119,17 @@
         }
         return baseApprovalService.failUpdate(request);
     }
+
+    public List<O> exportList(@RequestBody @Valid R request) throws Exception {
+        List<O> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = baseApprovalService.listExportByIds(request.getIds());
+        } else {
+            list = baseApprovalService.listExport(request);
+        }
+        for (O record : list) {
+            DictCodeUtils.convertDictCodeToName(record);
+        }
+        return list;
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java
index 8a90961..d775831 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java
@@ -5,6 +5,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.business.certificate.CertificateChangeApplyApprovalListRequest;
 import com.casic.missiles.dto.business.certificate.CertificateChangeApplySaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessCertificateChangeApply;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
@@ -20,6 +21,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -48,4 +50,12 @@
         }
         return changeApplyService.saveChangeApply(request);
     }
+
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody CertificateChangeApplyApprovalListRequest request) throws Exception {
+        List<BizBusinessCertificateChangeApply> list = super.exportList(request);
+        super.exportExcel(BizBusinessCertificateChangeApply.class, list, ExportEnum.CERTIFICATE_CHANGE_APPLY.getSheetName());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java
index 5fc4b07..af8230e 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java
@@ -9,6 +9,7 @@
 import com.casic.missiles.dto.business.certificate.CertificatePrintApprovalListRequest;
 import com.casic.missiles.dto.business.certificate.CertificatePrintListResponse;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.enums.business.CertificatePrintStatusEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessCertificatePrintLog;
@@ -18,10 +19,16 @@
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.io.IOException;
+import java.util.List;
 import java.util.Objects;
 
 /**
@@ -98,4 +105,16 @@
         });
         return certificatePrintService.certificatePrintLog(idDTO.getId());
     }
+
+    @ApiOperation("证书打印审批导出")
+    @PostMapping("/listExport")
+    public void exportList(@RequestBody CertificatePrintApprovalListRequest request) throws IOException {
+        List<CertificatePrintListResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = certificatePrintService.listByIds(request.getIds());
+        } else {
+            list = certificatePrintService.list(request);
+        }
+        super.exportExcel(CertificatePrintListResponse.class, list, ExportEnum.CERTIFICATE_PRINT.getSheetName());
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java
index 63b06dc..6b2efd5 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java
@@ -6,6 +6,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.business.certificate.CertificateReportApprovalListRequest;
 import com.casic.missiles.dto.business.certificate.CertificateReportSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessCertificateReport;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
@@ -21,6 +22,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -50,7 +52,7 @@
         return certificateReportService.saveCertificateReport(request);
     }
 
-    @ApiOperation("证书审批详情（基本信息）")
+    @ApiOperation("详情（基本信息）")
     @PostMapping("/detail")
     public ReturnDTO<BizBusinessCertificateReport> detail(@RequestBody @Valid BaseDetailRequest request, BindingResult bindingResult) throws Exception {
         if(bindingResult.hasErrors()){
@@ -59,4 +61,11 @@
         return certificateReportService.detail(request);
     }
 
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody CertificateReportApprovalListRequest request) throws Exception {
+        List<BizBusinessCertificateReport> list = super.exportList(request);
+        super.exportExcel(BizBusinessCertificateReport.class, list, ExportEnum.CERTIFICATE_REPORT.getSheetName());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java
index 46b26bd..57c0809 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java
@@ -10,20 +10,21 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.business.identify.IdentifyListRequest;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessIdentifyInfo;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.business.IBizBusinessIdentifyInfoService;
+import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import javax.validation.Valid;
+import java.util.List;
 import java.util.Objects;
 
 /**
@@ -57,16 +58,13 @@
         return identifyInfoService.addIdentify(identifyInfo);
     }
 
-    @ApiOperation("标识打印更新")
+    @ApiOperation("标识打印更新（更新打印时间）")
     @PostMapping("/update")
-    public ReturnDTO updateIdentify(@RequestBody @Valid BizBusinessIdentifyInfo identifyInfo, BindingResult bindingResult) {
-        Assert.isFalse(Objects.isNull(identifyInfo.getId()), () -> {
+    public ReturnDTO updateIdentify(@RequestBody @Valid IdDTO idDTO) {
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        Assert.isFalse(bindingResult.hasErrors(), () -> {
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        });
-        return identifyInfoService.updateIdentify(identifyInfo);
+        return identifyInfoService.updateIdentify(idDTO.getId());
     }
 
     @ApiOperation("标识打印删除")
@@ -77,4 +75,37 @@
         });
         return identifyInfoService.deleteIdentify(idDTO.getId());
     }
+
+    @ApiOperation("标识打印导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody @Valid IdentifyListRequest request, BindingResult bindingResult) throws Exception {
+        if (bindingResult.hasErrors()) {
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        List<BizBusinessIdentifyInfo> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = identifyInfoService.listByIds(request.getIds());
+        } else {
+            list = identifyInfoService.list(request);
+        }
+        for (BizBusinessIdentifyInfo record : list) {
+            DictCodeUtils.convertDictCodeToName(record);
+        }
+        super.exportExcel(BizBusinessIdentifyInfo.class, list, ExportEnum.IDENTIFY_EXPORT.getSheetName());
+    }
+
+
+    // TODO: 2023/8/23 查询设备信息，4个底部按钮查设备（按钮的作用就是前端用来调不同接口、用来区分中间即将展示的标识），前端弹窗选设备，在确定保存时前端根据底部按钮判断传入设备类型deviceType字典code
+    // TODO: 2023/8/23 接口：查受检设备（第1个按钮），查设备台账（后3个按钮同一接口），查询之后前端根据标志类型的不同加到中间页面时进行判断（按产品给的对应表）
+    // TODO: 2023/8/23 提供二维码接口，前端在加到中间页面时调用一下
+
+    @ApiOperation("设备二维码")
+    @PostMapping("/equipment/qrCode")
+    public ReturnDTO<String> equipmentQrCode(@RequestBody @Valid IdDTO idDTO) {
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return identifyInfoService.equipmentQrCode(idDTO.getId());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java
index 707be6e..7e0453d 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java
@@ -117,7 +117,7 @@
     }
 
     @ApiOperation("任务单导出")
-    @PostMapping("/export")
+    @PostMapping("/listExport")
     public void orderExport(@RequestBody @Valid OrderListRequest request, HttpServletResponse response) {
         businessOrderService.orderExport(request, response);
     }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java
index 529a6ce..51432be 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java
@@ -1,9 +1,28 @@
 package com.casic.missiles.controller.business;
 
+import com.casic.missiles.controller.GeneralApprovalController;
+import com.casic.missiles.dto.BaseApprovalSubmitRequest;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.business.outsource.OutsourceAssessApprovalListRequest;
+import com.casic.missiles.dto.business.outsource.OutsourceAssessSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
+import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.model.business.BizBusinessOutsourceAssess;
+import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
+import com.casic.missiles.service.IGeneralApprovalService;
+import com.casic.missiles.service.business.IBizBusinessOutsourceAssessService;
 import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.BindingResult;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.validation.Valid;
+import java.util.List;
+
 /**
  * <p>
  * 计量检定业务-分包管理-测试、校准或检定工作分包评审表 前端控制器
@@ -15,6 +34,27 @@
 @Api(tags = "分包管理-测试、校准或检定工作分包评审表")
 @RestController
 @RequestMapping("/business/outsource/assess")
-public class BizBusinessOutsourceAssessController {
+public class BizBusinessOutsourceAssessController extends GeneralApprovalController<BizBusinessOutsourceAssess, BizBusinessOutsourceAssess, OutsourceAssessApprovalListRequest, BaseApprovalSubmitRequest> {
+    @Autowired
+    private IBizBusinessOutsourceAssessService outsourceAssessService;
 
+    public BizBusinessOutsourceAssessController(IGeneralApprovalService<BizBusinessOutsourceAssess, BizBusinessOutsourceAssess, OutsourceAssessApprovalListRequest, BaseApprovalSubmitRequest> baseApprovalService) {
+        super(baseApprovalService);
+    }
+
+    @ApiOperation("草稿箱-保存")
+    @PostMapping("/save")
+    public ReturnDTO<OutsourceAssessSaveResponse> saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceAssess request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        return outsourceAssessService.saveOutsourceAssess(request);
+    }
+
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception {
+        List<BizBusinessOutsourceAssess> list = super.exportList(request);
+        super.exportExcel(BizBusinessOutsourceAssess.class, list, ExportEnum.OUTSOURCE_ASSESS.getSheetName());
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java
new file mode 100644
index 0000000..9adef18
--- /dev/null
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java
@@ -0,0 +1,60 @@
+package com.casic.missiles.controller.business;
+
+import com.casic.missiles.controller.GeneralApprovalController;
+import com.casic.missiles.dto.BaseApprovalSubmitRequest;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.business.outsource.OutsourceProtocolApprovalListRequest;
+import com.casic.missiles.dto.business.outsource.OutsourceProtocolSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
+import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.model.business.BizBusinessOutsourceProtocol;
+import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
+import com.casic.missiles.service.IGeneralApprovalService;
+import com.casic.missiles.service.business.IBizBusinessOutsourceProtocolService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.BindingResult;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.validation.Valid;
+import java.util.List;
+
+/**
+ * <p>
+ * 计量检定业务-分包管理-测试、校准或检定工作分包协议书 前端控制器
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-08-24
+ */
+@Api(tags = "分包管理-测试、校准或检定工作分包协议书")
+@RestController
+@RequestMapping("/business/outsource/protocol")
+public class BizBusinessOutsourceProtocolController extends GeneralApprovalController<BizBusinessOutsourceProtocol, BizBusinessOutsourceProtocol, OutsourceProtocolApprovalListRequest, BaseApprovalSubmitRequest> {
+    @Autowired
+    private IBizBusinessOutsourceProtocolService outsourceProtocolService;
+
+    public BizBusinessOutsourceProtocolController(IGeneralApprovalService<BizBusinessOutsourceProtocol, BizBusinessOutsourceProtocol, OutsourceProtocolApprovalListRequest, BaseApprovalSubmitRequest> baseApprovalService) {
+        super(baseApprovalService);
+    }
+
+    @ApiOperation("草稿箱-保存")
+    @PostMapping("/save")
+    public ReturnDTO<OutsourceProtocolSaveResponse> saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceProtocol request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        return outsourceProtocolService.saveOutsourceProtocol(request);
+    }
+
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody OutsourceProtocolApprovalListRequest request) throws Exception {
+        List<BizBusinessOutsourceProtocol> list = super.exportList(request);
+        super.exportExcel(BizBusinessOutsourceProtocol.class, list, ExportEnum.OUTSOURCE_PROTOCOL.getSheetName());
+    }
+}
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java
index 097f645..f0f0943 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java
@@ -17,7 +17,6 @@
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.IGeneralApprovalService;
 import com.casic.missiles.service.business.IBizBusinessOutsourcerInfoService;
-import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -71,19 +70,8 @@
 
     @ApiOperation("分包方导出")
     @PostMapping("/listExport")
-    public void export(@RequestBody @Valid OutsourcerInfoApprovalListRequest request, BindingResult bindingResult) throws Exception {
-        if (bindingResult.hasErrors()) {
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        }
-        List<BizBusinessOutsourcerInfo> list;
-        if (!CollectionUtils.isEmpty(request.getIds())) {
-            list = outsourcerInfoService.listByIds(request.getIds());
-        } else {
-            list = outsourcerInfoService.list(request);
-        }
-        for (BizBusinessOutsourcerInfo record : list) {
-            DictCodeUtils.convertDictCodeToName(record);
-        }
+    public void export(@RequestBody OutsourcerInfoApprovalListRequest request) throws Exception {
+        List<BizBusinessOutsourcerInfo> list = super.exportList(request);
         super.exportExcel(BizBusinessOutsourcerInfo.class, list, ExportEnum.OUTSOURCER_EXPORT.getSheetName());
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java
index c2cbf9f..0410918 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java
@@ -17,11 +17,9 @@
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.IGeneralApprovalService;
 import com.casic.missiles.service.business.IBizBusinessSiteExecutiveInfoService;
-import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -60,7 +58,7 @@
         return siteExecutiveInfoService.saveSiteExecutiveInfo(siteExecutiveInfo);
     }
 
-    @ApiOperation("现场检测详情")
+    @ApiOperation("详情")
     @PostMapping("/detail")
     public ReturnDTO<SiteExecutiveDetailResponse> siteExecutiveDetail(@RequestBody @Valid IdDTO idDTO) throws Exception {
         Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
@@ -69,21 +67,10 @@
         return ReturnUtil.success(siteExecutiveInfoService.detail(idDTO.getId()));
     }
 
-    @ApiOperation("现场检测导出")
+    @ApiOperation("导出")
     @PostMapping("/listExport")
-    public void export(@RequestBody @Valid SiteExecutiveApprovalListRequest request, BindingResult bindingResult) throws Exception {
-        if (bindingResult.hasErrors()) {
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        }
-        List<SiteExecutiveApprovalListResponse> list;
-        if (!CollectionUtils.isEmpty(request.getIds())) {
-            list = siteExecutiveInfoService.listInfoByIds(request.getIds());
-        } else {
-            list = siteExecutiveInfoService.listInfo(request);
-        }
-        for (SiteExecutiveApprovalListResponse record : list) {
-            DictCodeUtils.convertDictCodeToName(record);
-        }
+    public void export(@RequestBody SiteExecutiveApprovalListRequest request) throws Exception {
+        List<SiteExecutiveApprovalListResponse> list = super.exportList(request);
         super.exportExcel(SiteExecutiveApprovalListResponse.class, list, ExportEnum.SITE_EXECUTIVE_EXPORT.getSheetName());
     }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
index 7e793cd..a92e209 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
@@ -55,7 +55,7 @@
 
     @ApiOperation("设备收发列表导出")
     @PostMapping("/export")
-    public void exportList(@RequestBody @Valid SampleDispatchListRequest request) throws IOException {
+    public void exportList(@RequestBody SampleDispatchListRequest request) throws IOException {
         List<SampleDispatchListResponse> list;
         if (!CollectionUtils.isEmpty(request.getIds())) {
             list = dispatchService.listByIds(request.getIds());
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java
index cdc77fc..d120fd4 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java
@@ -7,6 +7,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.business.labExecutive.*;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.business.IBusinessLabExecutiveInfoService;
@@ -14,6 +15,7 @@
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.*;
 
@@ -32,7 +34,7 @@
     @Autowired
     private IBusinessLabExecutiveInfoService labExecutiveInfoService;
 
-    @ApiOperation("实验室检测-部门检测-查询各状态列表（待检测、检测中、检测完）")
+    @ApiOperation("实验室任务-查询各状态列表（待检测、检测中、检测完）")
     @PostMapping("/deptExecutive/List")
     public ReturnDTO<PageInfoBT<SampleLabExecutiveListResponse>> queryDeptExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
@@ -43,10 +45,19 @@
         return ReturnUtil.success(super.packForBT(labExecutiveInfoService.deptLabExecutiveListPage(page, labExecutiveListRequest)));
     }
 
-    /**
-     * 实验室检测-我的检测-查询各状态列表（待检测、检测中、检测完）
-     */
-    @ApiOperation("实验室检测-我的检测-查询各状态列表（待检测、检测中、检测完）")
+    @ApiOperation("实验室任务导出")
+    @PostMapping("/deptExecutive/export")
+    public void deptExportList(@RequestBody @Valid SampleLabExecutiveListRequest request) throws Exception {
+        List<SampleLabExecutiveListResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = labExecutiveInfoService.deptLabExecutiveListByIds(request.getMeasureStatus(), request.getIds());
+        } else {
+            list = labExecutiveInfoService.deptLabExecutiveList(request);
+        }
+        super.exportExcel(SampleLabExecutiveListResponse.class, list, ExportEnum.DEPT_EXECUTIVE_TASK.getSheetName());
+    }
+
+    @ApiOperation("我的任务-查询各状态列表（待检测、检测中、检测完）")
     @PostMapping("/myExecutive/list")
     public ReturnDTO<PageInfoBT<SampleLabExecutiveListResponse>> queryMyExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
@@ -57,19 +68,25 @@
         return ReturnUtil.success(super.packForBT(labExecutiveInfoService.myLabExecutiveListPage(page, labExecutiveListRequest)));
     }
 
-    /**
-     * 实验室检测-我的检测-查询各状态样品数量（待检测、检测中、检测完）
-     */
-    @ApiOperation("实验室检测-我的检测-查询各状态样品数量（待检测、检测中、检测完）")
+    @ApiOperation("我的任务导出")
+    @PostMapping("/myExecutive/export")
+    public void exportList(@RequestBody @Valid SampleLabExecutiveListRequest request) throws Exception {
+        List<SampleLabExecutiveListResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = labExecutiveInfoService.myLabExecutiveListByIds(request.getMeasureStatus(), request.getIds());
+        } else {
+            list = labExecutiveInfoService.myLabExecutiveList(request);
+        }
+        super.exportExcel(SampleLabExecutiveListResponse.class, list, ExportEnum.MY_EXECUTIVE_TASK.getSheetName());
+    }
+
+    @ApiOperation("我的任务-查询各状态样品数量（待检测、检测中、检测完）")
     @GetMapping("/myExecutive/amount")
     public ReturnDTO<List<SampleAmountResponse>> queryMyExecutiveAmount() {
         return ReturnUtil.success(labExecutiveInfoService.myExecutiveAmount());
     }
 
-    /**
-     * 实验室检测-部门检测-分配（分配给具体人员）
-     */
-    @ApiOperation("实验室检测-部门检测-分配按钮（分配给具体人员）")
+    @ApiOperation("实验室任务-分配按钮（分配给具体人员）")
     @PostMapping("/deptExecutive/allocate")
     public ReturnDTO allocateStaff(@RequestBody @Valid SampleAllocateRequest sampleAllocateRequest, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -78,10 +95,7 @@
         return labExecutiveInfoService.allocateStaff(sampleAllocateRequest);
     }
 
-    /**
-     * 实验室检测-我的检测-检定人扫描收入（待检测->检测中）
-     */
-    @ApiOperation("实验室检测-我的检测-检定人扫描收入（待检测->检测中）")
+    @ApiOperation("我的任务-检定人扫描收入（待检测->检测中）")
     @PostMapping("/myExecutive/receive")
     public ReturnDTO sampleReceive(@RequestBody @Valid List<SampleOperateRequest> requestList, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -90,10 +104,7 @@
         return labExecutiveInfoService.sampleReceive(requestList);
     }
 
-    /**
-     * 实验室检测-负责人/检定人扫描检完（检测中->检测完）
-     */
-    @ApiOperation("实验室检测-负责人/检定人扫描检完（检测中->检测完）")
+    @ApiOperation("实验室任务-负责人/检定人扫描检完（检测中->检测完）")
     @PostMapping("/myExecutive/complete")
     public ReturnDTO sampleExecutiveComplete(@RequestBody @Valid List<SampleOperateRequest> requestList, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -102,10 +113,7 @@
         return labExecutiveInfoService.sampleExecutiveComplete(requestList);
     }
 
-    /**
-     * 实验室检测-部门检测/我的检测 编辑（只能修改应出具证书）
-     */
-    @ApiOperation("实验室检测-部门检测/我的检测 编辑（只能修改应出具证书）")
+    @ApiOperation("实验室任务/我的任务 编辑（只能修改应出具证书）")
     @PostMapping("/executive/update")
     public ReturnDTO updateExecutive(@RequestBody @Valid UpdateExecutiveRequest request, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -114,10 +122,7 @@
         return labExecutiveInfoService.updateExecutive(request);
     }
 
-    /**
-     * 实验室检测-部门检测/我的检测 详情
-     */
-    @ApiOperation("实验室检测-部门检测/我的检测 详情")
+    @ApiOperation("实验室任务/我的任务 详情")
     @PostMapping("/executive/detail")
     public ReturnDTO<ExecutiveDetailResponse> executiveDetail(@RequestBody @Valid ExecutiveDetailRequest request, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
@@ -131,7 +136,7 @@
      * 退回后会将下一个要执行的实验室检测状态更新为待分配，将后面的实验室顺序变更为连续（都进行减1）
      * 最后一个检测的实验室退回，等分发员再增加实验室或设备收发中的已收入直接手动点击完成
      */
-    @ApiOperation("实验室检测-部门检测/我的检测 退回（待检测/检测中->退回）")
+    @ApiOperation("实验室任务/我的任务 退回（待检测/检测中->退回）")
     @PostMapping("/executive/sendBack")
     public ReturnDTO executiveSendBack(@RequestBody @Valid ExecutiveSendBackRequest request, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -140,9 +145,6 @@
         return labExecutiveInfoService.sampleExecutiveSendBack(request);
     }
 
-    /**
-     * 分发员编辑实验室检测列表
-     */
     @ApiOperation("分发员编辑实验室检测列表")
     @PostMapping("/handOut/updateList")
     public ReturnDTO updateExecutiveList(@RequestBody @Valid UpdateExecutiveListRequest request, BindingResult bindingResult) {
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java
index 48a67ed..0c04f31 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java
@@ -10,6 +10,7 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.resource.customer.CustomerApprovalListRequest;
 import com.casic.missiles.dto.resource.customer.CustomerSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceCustomerInfo;
@@ -26,6 +27,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -55,6 +57,13 @@
         return customerInfoService.saveCustomerInfo(request);
     }
 
+    @ApiOperation("委托方名录导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody CustomerApprovalListRequest request) throws Exception {
+        List<BizResourceCustomerInfo> list = super.exportList(request);
+        super.exportExcel(BizResourceCustomerInfo.class, list, ExportEnum.CUSTOMER_INFO.getSheetName());
+    }
+
     @ApiOperation("委托方人员列表（分页）")
     @PostMapping("/person/listPage")
     public ReturnDTO<PageInfoBT<BizResourceCustomerStaff>> personListPage(@RequestBody IdDTO idDto) {
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
index 972ed4b..6418ea5 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
@@ -5,6 +5,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.resource.customer.SuggestFormApprovalListRequest;
 import com.casic.missiles.dto.resource.customer.SuggestFormSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceCustomerSuggestForm;
@@ -20,6 +21,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -50,4 +52,11 @@
         return suggestFormService.saveSuggestForm(request);
     }
 
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody SuggestFormApprovalListRequest request) throws Exception {
+        List<BizResourceCustomerSuggestForm> list = super.exportList(request);
+        super.exportExcel(BizResourceCustomerSuggestForm.class, list, ExportEnum.CUSTOMER_SUGGEST_FORM.getSheetName());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java
index 1934d1a..9e07eab 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java
@@ -15,12 +15,16 @@
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.resource.IEnvEnvironmentRecordConfigService;
 import com.casic.missiles.service.resource.IEnvEnvironmentRecordDataService;
+import com.casic.missiles.service.resource.IEnvLocationInfoService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
 import java.util.List;
@@ -39,6 +43,8 @@
     private IEnvEnvironmentRecordDataService environmentRecordDataService;
     @Autowired
     private IEnvEnvironmentRecordConfigService environmentRecordConfigService;
+    @Autowired
+    private IEnvLocationInfoService locationInfoService;
 
     @ApiOperation("环境记录单数据列表/详情")
     @PostMapping("/data/listPage")
@@ -95,4 +101,11 @@
         });
         return environmentRecordConfigService.deleteEnvironmentRecordConfig(idDTO.getId());
     }
+
+    @ApiOperation("地点列表")
+    @PostMapping("/location/listPage")
+    public ReturnDTO<PageInfoBT<LocationListResponse>> locationListPage(@RequestBody @Valid LocationListRequest request) {
+        Page<LocationListResponse> page = PageFactory.defaultPage();
+        return ReturnUtil.success(super.packForBT(locationInfoService.listPage(page, request)));
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java
index 82efe3f..e9561fa 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java
@@ -10,6 +10,7 @@
 import com.casic.missiles.dto.resource.seal.SealLogListRequest;
 import com.casic.missiles.dto.resource.seal.SealNoteApprovalListRequest;
 import com.casic.missiles.dto.resource.seal.SealNoteSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceSealUseLog;
@@ -27,6 +28,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -58,6 +60,13 @@
         return sealUseNoteService.saveSeal(request);
     }
 
+    @ApiOperation("印章使用登记导出（列表和导出中去掉经办人和监印人）")
+    @PostMapping("/listExport")
+    public void export(@RequestBody SealNoteApprovalListRequest request) throws Exception {
+        List<BizResourceSealUseNote> list = super.exportList(request);
+        super.exportExcel(BizResourceSealUseNote.class, list, ExportEnum.SEAL_NOTE.getSheetName());
+    }
+
     // TODO: 2023/7/28 印章使用日志：系统中使用印章时插入数据库
 
     @ApiOperation("印章使用日志列表（分页）")
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java
index 9b674fc..06b6521 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java
@@ -9,16 +9,20 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.resource.staff.StaffCertRequest;
 import com.casic.missiles.dto.resource.staff.StaffCertResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.service.resource.IBizResourceStaffInfoService;
 import com.casic.missiles.service.resource.IBizResourceStaffVerifierService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.List;
+
 /**
  * @Description:
  * @Author: wangpeng
@@ -41,9 +45,21 @@
         return ReturnUtil.success(super.packForBT(responsePage));
     }
 
+    @ApiOperation("证书逾期提醒导出")
+    @PostMapping("/listExport")
+    public void exportList(@RequestBody StaffCertRequest request) throws Exception {
+        List<StaffCertResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = staffInfoService.certListByIds(request.getIds());
+        } else {
+            list = staffInfoService.certList(request);
+        }
+        super.exportExcel(StaffCertResponse.class, list, ExportEnum.STAFF_CERTIFICATE_EXPIRE.getSheetName());
+    }
+
     @ApiOperation("证书逾期提醒")
     @PostMapping("/expirationReminder")
-    public ReturnDTO expirationReminder(@RequestBody IdDTO idDto) {
-        return verifierService.expirationReminder(idDto);
+    public ReturnDTO expirationReminder(@RequestBody IdDTO idDTO) {
+        return verifierService.expirationReminder(idDTO);
     }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java
index 3b251ad..a6e7850 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java
@@ -12,6 +12,7 @@
 import com.casic.missiles.dto.resource.staff.StaffListRequest;
 import com.casic.missiles.dto.resource.staff.TrainListRequest;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.*;
@@ -22,7 +23,10 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
 import java.util.List;
@@ -52,8 +56,19 @@
             throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
         }
         Page<BizResourceStaffInfo> page = PageFactory.defaultPage();
-        Page<BizResourceStaffInfo> responsePage = staffInfoService.listPage(page, request);
-        return ReturnUtil.success(super.packForBT(responsePage));
+        return ReturnUtil.success(super.packForBT(staffInfoService.listPage(page, request)));
+    }
+
+    @ApiOperation("人员登记导出")
+    @PostMapping("/listExport")
+    public void exportList(@RequestBody StaffListRequest request) throws Exception {
+        List<BizResourceStaffInfo> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = staffInfoService.listByIds(request.getIds());
+        } else {
+            list = staffInfoService.list(request);
+        }
+        super.exportExcel(BizResourceStaffInfo.class, list, ExportEnum.STAFF_INFO.getSheetName());
     }
 
     @ApiOperation("人员登记详情基础信息")
@@ -85,9 +100,9 @@
 
     @ApiOperation("科研教育列表（分页）")
     @PostMapping("/education/listPage")
-    public ReturnDTO<PageInfoBT<BizResourceStaffEducation>> educationListPage(@RequestBody IdDTO idDto) {
+    public ReturnDTO<PageInfoBT<BizResourceStaffEducation>> educationListPage(@RequestBody IdDTO idDTO) {
         Page<BizResourceStaffEducation> page = PageFactory.defaultPage();
-        Page<BizResourceStaffEducation> responsePage = staffInfoService.educationListPage(page, idDto);
+        Page<BizResourceStaffEducation> responsePage = staffInfoService.educationListPage(page, idDTO);
         return ReturnUtil.success(super.packForBT(responsePage));
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java
index af6aa86..d85d84a 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java
@@ -9,6 +9,7 @@
 import com.casic.missiles.dto.resource.outsideService.SupplierApprovalListRequest;
 import com.casic.missiles.dto.resource.outsideService.SupplierSaveResponse;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceSupplierAbility;
@@ -67,6 +68,13 @@
         return ReturnUtil.success(supplierInfoService.detail(idDTO.getId()));
     }
 
+    @ApiOperation("合格供方导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody SupplierApprovalListRequest request) throws Exception {
+        List<BizResourceSupplierInfo> list = super.exportList(request);
+        super.exportExcel(BizResourceSupplierInfo.class, list, ExportEnum.SUPPLIER_INFO.getSheetName());
+    }
+
     @ApiOperation("供方人员列表（分页）")
     @PostMapping("/person/listPage")
     public ReturnDTO<PageInfoBT<BizResourceSupplierPerson>> personListPage(@RequestBody IdDTO idDTO) {
diff --git a/casic-metering-api/src/main/resources/config/application.yml b/casic-metering-api/src/main/resources/config/application.yml
index 350db5f..ecff521 100644
--- a/casic-metering-api/src/main/resources/config/application.yml
+++ b/casic-metering-api/src/main/resources/config/application.yml
@@ -126,7 +126,7 @@
     #作者
     author: wangpeng
     #待生成对象表名
-    table-name: biz_equipment_technical_target_approval,biz_equipment_attachment_approval,biz_equipment_checkpoint_approval
+    table-name: biz_business_outsource_protocol
 
 reminder:
   #节点--common模块config包 ReminderNodeConfig配置
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
index 4a19e4e..d47d552 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
@@ -53,6 +53,7 @@
     SUGGEST_FORM_SAVE_FAILED(2509, "委托方意见登记表保存至草稿箱失败"),
     EXAMINE_FORM_SAVE_FAILED(2510, "要求、委托书及合同评审表保存至草稿箱失败"),
     CUSTOMER_EXIST_SAVE_FAILED(2511, "该委托方已存在，请重新选择"),
+    DUPLICATE_LOCATION_NO(2512, "地点编号已存在"),
 
     /**
      * 计量检定业务模块
@@ -68,6 +69,8 @@
     COMPLETE_SAMPLE_NOT_EXIST(2609, "检测中不存在扫描收入的样品"),
     CANNOT_CHANGE_MEASURE_INFO(2610, "无法更改非当前登录用户的检测信息"),
     NON_EXIST_ORDER_OR_SAMPLE(2611, "不存在该委托单或该委托单下的样品"),
+    OUTSOURCE_ACCESS_SAVE_FAILED(2612, "测试、校准或检定工作分包评审表保存至草稿箱失败"),
+    OUTSOURCE_PROTOCOL_SAVE_FAILED(2613, "测试、校准或检定工作分包协议书保存至草稿箱失败"),
 
     /**
      * 历史遗留备用
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
index 5089ad1..81a406b 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
@@ -10,54 +10,38 @@
     /**
      * 资源管理
      */
-    ENVIRONMENT_DATA_EXPORT("environmentData", "environmentData", "环境记录单数据"),
+    ENVIRONMENT_DATA_EXPORT("environmentData", "环境记录单数据", "环境记录单数据"),
+    STAFF_INFO("staffInfo", "人员登记", "人员登记"),
+    STAFF_CERTIFICATE_EXPIRE("certificateExpire", "证书逾期提醒", "证书逾期提醒"),
+    SUPPLIER_INFO("supplierInfo", "合格供方名录", "合格供方名录"),
+    CUSTOMER_INFO("customerInfo", "委托方名录", "委托方名录"),
+    CUSTOMER_SUGGEST_FORM("customerSuggestForm", "委托方意见登记表", "委托方意见登记表"),
+    SEAL_NOTE("sealNote", "印章使用登记", "印章使用登记"),
 
-    FILE_EXPORT("meterFileData", "meterFileData", "计量文件信息"),
-    TRAIN_PLAN_EXPORT("trainPlanData", "trainPlanData", "培训计划"),
-    TRAIN_LOG_EXPORT("trainLogData", "trainLogData", "培训记录"),
-    METER_ORGANIZE_EXPORT("meterOrganizeData", "meterOrganizeData", "计量组织"),
-    TRACE_SUPPLIER_EXPORT("traceSupplierData", "traceSupplierData", "溯源供方"),
-    SIGN_EXPORT("signData", "signData", "签名/签章"),
-    TEMPLATE_EXPORT("templateData", "templateData", "原始记录模板/证书报告模板"),
-    FIXED_ASSETS("meterFixedAssets", "meterFixedAssets", "固定资产"),
-    METER_EQUIPMENT("meterEquipment", "meterEquipment", "测量设备"),
-    CALIBRATION_TEST_EQUIPMENT("calibrationTestEquipment", "calibrationTestEquipment", "校准检定设备"),
-    MEASURE_ACCOUNT("measureAccount", "measureAccount", "测量工装"),
-    STANDARD_SUPPORT_EQUIPMENT("standardSupportEquipment", "standardSupportEquipment", "标准配套设备"),
-    STANDARD_EQUIPMENT("standardEquipment", "standardEquipment", "标准装置"),
-    FLOW_DEF_EXPORT("flowDefData", "flowDefData", "流程定义"),
-    STAFF_CERTIFICATE("certificate", "certificate", "计量人员证书"),
-    CHECK_INFO("checkInfo", "checkInfo", "设备管理点检测"),
-    EQUIPMENT_APPLY("equipmentApply", "equipmentApply", "设备借用"),
-    STANDARD_EQUIPMENT_REMIND("equipmentApplyRemind", "equipmentApplyRemind", "标准装置到期提醒"),
-    METER_PRICE("meterPrice", "meterPrice", "价格库"),
-    METER_STAFF("meterStaff", "meterStaff", "计量人员"),
-    STANDARD_EQUIPMENT_APPLY("standardEquipmentApply", "standardEquipmentApply", "标准装置申请"),
-    STATE_MANAGE_APPLY("stateManage", "stateManage", "状态管理"),
-    METER_ACCEPTANCE_CHECK("acceptanceCheck", "acceptanceCheck", "设备检修保养验收单"),
-    CUSTOMER_EXPORT("customerData", "customerData", "客户信息"),
-    ORDER_EXPORT("orderData", "orderData", "委托书信息"),
-    SAMPLE_EXPORT("sampleData", "sampleData", "样本信息"),
-    EXCHANGE_DATA("exchangeData", "exchangeData", "设备交接单"),
-    DISPATCH_DATA("dispatchData", "dispatchData", "设备收发"),
-    ENVIRONMENT_DATA("environmentData", "environmentData", "环境记录单"),
-    ORIGIN_DATA("originData", "originData", "原始记录"),
-    CERTIFICATE_REPORT("certificateReport", "certificateReport", "证书报告"),
-    ADVICE_EXPORT("adviceData", "adviceData", "客户反馈"),
-    HANDOUT_EXPORT("handoutData", "handoutData", "任务分发列表"),
-    OUTSOURCER_EXPORT("outsourcerData", "outsourcerData", "分包方"),
-    SITE_EXECUTIVE_EXPORT("siteExecutiveData", "siteExecutiveData", "现场测试、校准或检定"),
-    CERTIFICATE_PRINT_EXPORT("certificatePrintData", "certificatePrintData", "证书打印"),
-    DOWNLOAD_TEMPLATE("downloadTemplate", "downloadTemplate", "页面配置"),
-    OUTSOURCER_CERTIFICATE_EXPORT("outsourceCertificateData", "outsourceCertificateData", "分包证书"),
-    SETTLEMENT_INFO_EXPORT("settlementInfoData", "settlementInfoData", "业务结算"),
-    EQUIPMENT_REMIND("equipmentRemind", "equipmentRemind", "设备到期提醒"),
-    AGREEMENT_INFO_EXPORT("agreementInfoData", "agreementInfoData", "合同"),
-    WORK_STATISTICS_EXPORT("workStatisticsData", "workStatisticsData", "实时工作统计"),
-    DEPT_OUTPUT_EXPORT("deptOutputData", "deptOutputData", "部门产值分析"),
-    WORKLOAD_EXPORT("workloadData", "workloadData", "业务工作量分析"),
-    DEPT_COMPREHENSIVE_EXPORT("deptComprehensiveData", "deptComprehensiveData", "部门综合分析"),
-    ENVIRONMENTAL_RECORD("environmentalRecordData", "environmentalRecordData", "现场环境记录");
+    /**
+     * 计量检定业务
+     */
+    OUTSOURCER_EXPORT("outsourcerData", "分包方名录", "分包方名录"),
+    IDENTIFY_EXPORT("identifyData", "计量标识", "计量标识"),
+    ORDER_EXPORT("orderData", "任务单", "任务单"),
+    DISPATCH_DATA("dispatchData", "设备收发", "设备收发"),
+    HANDOUT_EXPORT("handoutData", "任务分发", "任务分发"),
+    SITE_EXECUTIVE_EXPORT("siteExecutiveData", "现场测试、校准或检定", "现场测试、校准或检定"),
+    CERTIFICATE_REPORT("certificateReport", "证书审批", "证书审批"),
+    CERTIFICATE_CHANGE_APPLY("certificateChangeApply", "证书报告补充或更换申请单", "证书报告补充或更换申请单"),
+    CERTIFICATE_PRINT("certificatePrintData", "证书打印审批", "证书打印审批"),
+    DEPT_EXECUTIVE_TASK("deptExecutiveTaskData", "实验室任务", "实验室任务"),
+    MY_EXECUTIVE_TASK("myExecutiveTaskData", "我的任务", "我的任务"),
+    OUTSOURCE_ASSESS("outsourceAssess", "测试、校准或检定工作分包评审表", "测试、校准或检定工作分包评审表"),
+    OUTSOURCE_PROTOCOL("outsourceProtocol", "测试、校准或检定工作分包协议书", "测试、校准或检定工作分包协议书"),
+
+    /**
+     * 系统管理
+     */
+    SIGN_EXPORT("signData", "签名", "签名"),
+    TEMPLATE_EXPORT("templateData", "文件模板", "文件模板"),
+    FLOW_DEF_EXPORT("flowDefData", "流程定义", "流程定义"),
+    DOWNLOAD_TEMPLATE("downloadTemplate", "流程定义", "页面配置");
 
     ExportEnum(String fileName, String sheetName, String description) {
         this.fileName = fileName;
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateRecordTypeCodeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateRecordTypeCodeEnum.java
index 31d913c..a963522 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateRecordTypeCodeEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateRecordTypeCodeEnum.java
@@ -46,4 +46,14 @@
     String SITE_EXECUTIVE_APPROVAL = "01";
     //《现场测试、校准或检定工作记录表》
     String SITE_EXECUTIVE_LOG = "02";
+
+    //测试、校准或检定工作分包协议书
+    String OUTSOURCE_PROTOCOL = "01";
+    //测试、校准或检定工作分包评审表
+    String OUTSOURCE_ACCESS = "02";
+    //测试、校准或检定工作分包通知书
+    String OUTSOURCE_NOTICE = "03";
+    //测试、校准或检定工作分包方名录
+    String OUTSOURCE_INFO = "04";
+
 }
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
index 24b8635..f78bd53 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
@@ -15,6 +15,10 @@
     String CERTIFICATE_CHANGE_APPLY_BEAN_NAME = "certificateChangeApplyBean";
     //现场测试、校准或检定
     String SITE_EXECUTIVE_BEAN_NAME = "siteExecutiveBean";
+    //测试、校准或检定工作分包评审表
+    String OUTSOURCE_ASSESS_BEAN_NAME = "outsourceAssessBean";
+    //测试、校准或检定工作分包协议书
+    String OUTSOURCE_PROTOCOL_BEAN_NAME = "outsourceProtocolBean";
 
     /*********************************设备与装置************************************/
     //设备台账
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 b21c661..6b86fd1 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
@@ -18,6 +18,8 @@
     OUTSOURCER_APPROVAL(OUTSOURCER_BEAN_NAME, ""),
     CERTIFICATE_CHANGE_APPROVAL(CERTIFICATE_CHANGE_APPLY_BEAN_NAME, ""),
     SITE_EXECUTIVE_APPROVAL(SITE_EXECUTIVE_BEAN_NAME, ""),
+    OUTSOURCE_ASSESS_APPROVAL(OUTSOURCE_ASSESS_BEAN_NAME, ""),
+    OUTSOURCE_PROTOCOL_APPROVAL(OUTSOURCE_PROTOCOL_BEAN_NAME, ""),
 
     ACTION_STATUS_MAP(new HashMap<String, AwareActionStatusEnum>() {
         {
@@ -47,6 +49,10 @@
             put(ApplyFromIdEnum.CERTIFICATE_CHANGE_APPROVAL.getCode(), CERTIFICATE_CHANGE_APPROVAL);
             //现场测试、校准或检定审批
             put(ApplyFromIdEnum.SITE_EXECUTIVE_APPROVAL.getCode(), SITE_EXECUTIVE_APPROVAL);
+            //测试、校准或检定工作分包评审表
+            put(ApplyFromIdEnum.OUTSOURCE_ASSESS_APPROVAL.getCode(), OUTSOURCE_ASSESS_APPROVAL);
+            //测试、校准或检定工作分包协议书
+            put(ApplyFromIdEnum.OUTSOURCE_PROTOCOL_APPROVAL.getCode(), OUTSOURCE_PROTOCOL_APPROVAL);
         }
     });
     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 934405e..c7410bd 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
@@ -9,6 +9,8 @@
     CERTIFICATE_CHANGE_APPROVAL("jljdywzsbchghsqd", MessageSourceModuleEnum.BUSINESS.getCode(), "证书/报告补充或更换申请单"),
     OUTSOURCER_APPROVAL("jljdywcsjzhgfbfml", MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定合格分包方名录"),
     SITE_EXECUTIVE_APPROVAL("jljdywxccsjzsp", MessageSourceModuleEnum.BUSINESS.getCode(), "现场测试、校准或检定审批"),
+    OUTSOURCE_ASSESS_APPROVAL("jljdywcsjzfbpsb", MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包评审表"),
+    OUTSOURCE_PROTOCOL_APPROVAL("jljdywcsjzfbxys", MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包协议书"),
 
 
     /*******************************************设备与装置*********************************************/
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/GeneralApprovalMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/GeneralApprovalMapper.java
index 4fb7344..0c9d6ae 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/GeneralApprovalMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/GeneralApprovalMapper.java
@@ -17,8 +17,4 @@
 
     Page<O> selectBatchForApprovalList(Page<O> page, @Param("request") R request, @Param("businessKeys") List<String> businessKeys);
 
-//    Page<O> selectListPage(Page<O> page, @Param("request") R request);
-
-//    Long selectMaxNo();
-
 }
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceAssessMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceAssessMapper.java
index 7867bb8..ba59009 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceAssessMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceAssessMapper.java
@@ -1,7 +1,12 @@
 package com.casic.missiles.mapper.business;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.business.outsource.OutsourceAssessApprovalListRequest;
+import com.casic.missiles.mapper.GeneralApprovalMapper;
 import com.casic.missiles.model.business.BizBusinessOutsourceAssess;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * <p>
@@ -11,6 +16,10 @@
  * @author wangpeng
  * @since 2023-08-16
  */
-public interface BizBusinessOutsourceAssessMapper extends BaseMapper<BizBusinessOutsourceAssess> {
+public interface BizBusinessOutsourceAssessMapper extends GeneralApprovalMapper<BizBusinessOutsourceAssess, BizBusinessOutsourceAssess, OutsourceAssessApprovalListRequest> {
+
+    Page<BizBusinessOutsourceAssess> selectBatchForApprovalList(Page<BizBusinessOutsourceAssess> page, @Param("request") OutsourceAssessApprovalListRequest request, @Param("businessKeys") List<String> businessKeys);
+
+    Long selectMaxProjectNo();
 
 }
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceProtocolMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceProtocolMapper.java
new file mode 100644
index 0000000..e6aba35
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceProtocolMapper.java
@@ -0,0 +1,24 @@
+package com.casic.missiles.mapper.business;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.business.outsource.OutsourceProtocolApprovalListRequest;
+import com.casic.missiles.mapper.GeneralApprovalMapper;
+import com.casic.missiles.model.business.BizBusinessOutsourceProtocol;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 计量检定业务-分包管理-测试、校准或检定工作分包协议书 Mapper 接口
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-08-24
+ */
+public interface BizBusinessOutsourceProtocolMapper extends GeneralApprovalMapper<BizBusinessOutsourceProtocol, BizBusinessOutsourceProtocol, OutsourceProtocolApprovalListRequest> {
+
+    Page<BizBusinessOutsourceProtocol> selectBatchForApprovalList(Page<BizBusinessOutsourceProtocol> page, @Param("request") OutsourceProtocolApprovalListRequest request, @Param("businessKeys") List<String> businessKeys);
+
+    Long selectMaxProtocolNo();
+}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/EnvLocationInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/EnvLocationInfoMapper.java
new file mode 100644
index 0000000..49eff87
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/EnvLocationInfoMapper.java
@@ -0,0 +1,21 @@
+package com.casic.missiles.mapper.resource;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.resource.environment.LocationListRequest;
+import com.casic.missiles.dto.resource.environment.LocationListResponse;
+import com.casic.missiles.model.resource.EnvLocationInfo;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * <p>
+ * 实验室环境监控系统-设备表 Mapper 接口
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-06-07
+ */
+public interface EnvLocationInfoMapper extends BaseMapper<EnvLocationInfo> {
+
+    Page<LocationListResponse> selectLocationListPage(Page<LocationListResponse> page, @Param("request") LocationListRequest request);
+}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java
index de124db..85ed0f7 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java
@@ -1,7 +1,9 @@
 package com.casic.missiles.mapper.system;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.dto.system.SignDetailResponse;
+import com.casic.missiles.dto.system.SignListRequest;
 import com.casic.missiles.model.system.SystemSign;
 import org.apache.ibatis.annotations.Param;
 
@@ -22,4 +24,8 @@
     SignDetailResponse selectSignDetailById(Long id);
 
     List<SystemSign> selectUsableSignList(@Param("userId") Long userId);
+
+    Page<SystemSign> selectSignListPage(Page<SystemSign> page, @Param("request") SignListRequest request);
+
+    List<SystemSign> selectSignList(@Param("request") SignListRequest request);
 }
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateChangeApplyMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateChangeApplyMapper.xml
index d798447..c496092 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateChangeApplyMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateChangeApplyMapper.xml
@@ -30,31 +30,31 @@
         SELECT *
         FROM biz_business_certificate_change_apply
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.changeApplyNo != null and request.changeApplyNo !=''">
+        <if test="request != null and request.changeApplyNo != null and request.changeApplyNo !=''">
             and change_apply_no like concat('%',#{request.changeApplyNo},'%')
         </if>
-        <if test="request.changeReportNo != null and request.changeReportNo !=''">
+        <if test="request != null and request.changeReportNo != null and request.changeReportNo !=''">
             and change_report_no like concat('%',#{request.changeReportNo},'%')
         </if>
-        <if test="request.changeReportName != null and request.changeReportName !=''">
+        <if test="request != null and request.changeReportName != null and request.changeReportName !=''">
             and change_report_name like concat('%',#{request.changeReportName},'%')
         </if>
-        <if test="request.changeType != null and request.changeType !=''">
+        <if test="request != null and request.changeType != null and request.changeType !=''">
             and change_type = #{request.changeType}
         </if>
-        <if test="request.createUserName != null and request.createUserName !=''">
+        <if test="request != null and request.createUserName != null and request.createUserName !=''">
             and create_user_name like concat('%',#{request.createUserName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificatePrintMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificatePrintMapper.xml
index b66cd99..49c0ac8 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificatePrintMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificatePrintMapper.xml
@@ -31,34 +31,34 @@
         LEFT JOIN biz_business_order_sample_relation bosr ON (bosr.order_id = bcr.order_id AND bosr.sample_id = bcr.sample_id)
         LEFT JOIN biz_business_order_info boi ON boi.id = bosr.order_id
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and bcp.approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.printStatus != null and request.printStatus !=''">
+        <if test="request != null and request.printStatus != null and request.printStatus !=''">
             and print_status = #{request.printStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and bcp.create_user_id = #{request.createUserId}
         </if>
-        <if test="request.certificateReportNo != null and request.certificateReportNo !=''">
+        <if test="request != null and request.certificateReportNo != null and request.certificateReportNo !=''">
             and bcr.certificate_report_no like concat('%',#{request.certificateReportNo},'%')
         </if>
-        <if test="request.certificateReportName != null and request.certificateReportName !=''">
+        <if test="request != null and request.certificateReportName != null and request.certificateReportName !=''">
             and bcr.certificate_report_name like concat('%',#{request.certificateReportName},'%')
         </if>
-        <if test="request.customerName != null and request.customerName !=''">
+        <if test="request != null and request.customerName != null and request.customerName !=''">
             and boi.customer_name like concat('%',#{request.customerName},'%')
         </if>
-        <if test="request.sampleNo != null and request.sampleNo !=''">
+        <if test="request != null and request.sampleNo != null and request.sampleNo !=''">
             and bosr.sample_no like concat('%',#{request.sampleNo},'%')
         </if>
-        <if test="request.sampleName != null and request.sampleName !=''">
+        <if test="request != null and request.sampleName != null and request.sampleName !=''">
             and bosr.sample_name like concat('%',#{request.sampleName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and bcp.create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and bcp.create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml
index b366034..767695d 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml
@@ -46,33 +46,37 @@
         SELECT bcr.*, bosr.sample_no, bosr.sample_name, bosr.sample_model, rsi.staff_name
         FROM biz_business_certificate_report bcr
         LEFT JOIN biz_business_order_sample_relation bosr ON (bosr.order_id = bcr.order_id AND bosr.sample_id = bcr.sample_id)
+        LEFT JOIN biz_business_order_info boi ON boi.id = bcr.order_id
         LEFT JOIN biz_resource_staff_info rsi ON rsi.id = bcr.measure_person_id
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and bcr.approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and bcr.create_user_id = #{request.createUserId}
         </if>
-        <if test="request.certificateReportNo != null and request.certificateReportNo !=''">
+        <if test="request != null and request.customerId != null and request.customerId !=''">
+            and boi.customer_id = #{request.customerId}
+        </if>
+        <if test="request != null and request.certificateReportNo != null and request.certificateReportNo !=''">
             and bcr.certificate_report_no like concat('%',#{request.certificateReportNo},'%')
         </if>
-        <if test="request.certificateReportName != null and request.certificateReportName !=''">
+        <if test="request != null and request.certificateReportName != null and request.certificateReportName !=''">
             and bcr.certificate_report_name like concat('%',#{request.certificateReportName},'%')
         </if>
-        <if test="request.sampleNo != null and request.sampleNo !=''">
+        <if test="request != null and request.sampleNo != null and request.sampleNo !=''">
             and bosr.sample_no like concat('%',#{request.sampleNo},'%')
         </if>
-        <if test="request.measureCategory != null and request.measureCategory !=''">
+        <if test="request != null and request.measureCategory != null and request.measureCategory !=''">
             and bcr.measure_category = #{request.measureCategory}
         </if>
-        <if test="request.measurePerson != null and request.measurePerson !=''">
+        <if test="request != null and request.measurePerson != null and request.measurePerson !=''">
             and rsi.staff_name like concat('%',#{request.measurePerson},'%')
         </if>
-        <if test="request.calibrationTimeStart != null and request.calibrationTimeStart !=''">
+        <if test="request != null and request.calibrationTimeStart != null and request.calibrationTimeStart !=''">
             and bcr.calibration_time &gt;= #{request.calibrationTimeStart}
         </if>
-        <if test="request.calibrationTimeEnd != null and request.calibrationTimeEnd !=''">
+        <if test="request != null and request.calibrationTimeEnd != null and request.calibrationTimeEnd !=''">
             and bcr.calibration_time &lt;= #{request.calibrationTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceAssessMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceAssessMapper.xml
index d0fcf8b..c22c101 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceAssessMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceAssessMapper.xml
@@ -7,6 +7,8 @@
         <id column="id" property="id" />
         <result column="project_no" property="projectNo" />
         <result column="project_name" property="projectName" />
+        <result column="lab_code" property="labCode" />
+        <result column="group_code" property="groupCode" />
         <result column="applicant_id" property="applicantId" />
         <result column="applicant_name" property="applicantName" />
         <result column="applicant_time" property="applicantTime" />
@@ -31,7 +33,45 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, project_no, project_name, applicant_id, applicant_name, applicant_time, minio_file_name, remark, create_user_id, create_user_name, outsourcer_id, pre_start_time, pre_end_time, outsource_reason, pre_cost, approval_status, process_id, approve_situation, traceability, test_method, technique_ability, create_time, update_time
+        id, project_no, project_name, lab_code, group_code, applicant_id, applicant_name, applicant_time, minio_file_name, remark, create_user_id, create_user_name, outsourcer_id, pre_start_time, pre_end_time, outsource_reason, pre_cost, approval_status, process_id, approve_situation, traceability, test_method, technique_ability, create_time, update_time
     </sql>
 
+    <select id="selectMaxProjectNo" resultType="java.lang.Long">
+        SELECT IFNULL(max(RIGHT(project_no, 3)), 0) from biz_business_outsource_assess
+    </select>
+
+    <select id="selectBatchForApprovalList" resultMap="BaseResultMap">
+        SELECT bboa.*, bboi.outsourcer_name, bboi.director
+        FROM biz_business_outsource_assess bboa
+        LEFT JOIN biz_business_outsourcer_info bboi ON bboa.outsourcer_id = bboi.id
+        WHERE 1=1
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
+            and bboa.approval_status = #{request.approvalStatus}
+        </if>
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
+            and bboa.create_user_id = #{request.createUserId}
+        </if>
+        <if test="request != null and request.projectNo != null and request.projectNo !=''">
+            and bboa.project_no like concat('%',#{request.projectNo},'%')
+        </if>
+        <if test="request != null and request.outsourcerName != null and request.outsourcerName !=''">
+            and bboi.outsourcer_name like concat('%',#{request.outsourcerName},'%')
+        </if>
+        <if test="request != null and request.applicantName != null and request.applicantName !=''">
+            and bboa.applicant_name like concat('%',#{request.applicantName},'%')
+        </if>
+        <if test="request != null and request.applicantTimeStart != null and request.applicantTimeStart !=''">
+            and bboa.applicant_time &gt;= #{request.applicantTimeStart}
+        </if>
+        <if test="request != null and request.applicantTimeEnd != null and request.applicantTimeEnd !=''">
+            and bboa.applicant_time &lt;= #{request.applicantTimeEnd}
+        </if>
+        <if test="businessKeys != null">
+            and bboa.id in
+            <foreach collection="businessKeys" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
+        ORDER BY bboa.create_time DESC
+    </select>
 </mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceProtocolMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceProtocolMapper.xml
new file mode 100644
index 0000000..b7b2149
--- /dev/null
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceProtocolMapper.xml
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.mapper.business.BizBusinessOutsourceProtocolMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.business.BizBusinessOutsourceProtocol">
+        <id column="id" property="id" />
+        <result column="protocol_no" property="protocolNo" />
+        <result column="project_name" property="projectName" />
+        <result column="lab_code" property="labCode" />
+        <result column="group_code" property="groupCode" />
+        <result column="outsourcer_id" property="outsourcerId" />
+        <result column="remark" property="remark" />
+        <result column="outsource_no" property="outsourceNo" />
+        <result column="outsource_name" property="outsourceName" />
+        <result column="contacts" property="contacts" />
+        <result column="mobile" property="mobile" />
+        <result column="address" property="address" />
+        <result column="require_date" property="requireDate" />
+        <result column="outsource_cost" property="outsourceCost" />
+        <result column="director" property="director" />
+        <result column="item" property="item" />
+        <result column="requires" property="requires" />
+        <result column="create_user_id" property="createUserId" />
+        <result column="create_user_name" property="createUserName" />
+        <result column="approval_status" property="approvalStatus" />
+        <result column="process_id" property="processId" />
+        <result column="create_time" property="createTime" />
+        <result column="update_time" property="updateTime" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, protocol_no, project_name, lab_code, group_code, outsourcer_id, remark, outsource_no, outsource_name, contacts, mobile, address, require_date, outsource_cost, director, item, requires, create_user_id, create_user_name, approval_status, process_id, create_time, update_time
+    </sql>
+
+    <select id="selectMaxProtocolNo" resultType="java.lang.Long">
+        SELECT IFNULL(max(RIGHT(protocol_no, 3)), 0) from biz_business_outsource_protocol
+    </select>
+
+    <select id="selectBatchForApprovalList" resultMap="BaseResultMap">
+        SELECT *
+        FROM biz_business_outsource_protocol
+        WHERE 1=1
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
+            and approval_status = #{request.approvalStatus}
+        </if>
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
+            and create_user_id = #{request.createUserId}
+        </if>
+        <if test="request != null and request.protocolNo != null and request.protocolNo !=''">
+            and protocol_no like concat('%',#{request.protocolNo},'%')
+        </if>
+        <if test="request != null and request.outsourcerName != null and request.outsourcerName !=''">
+            and outsourcer_name like concat('%',#{request.outsourcerName},'%')
+        </if>
+        <if test="request != null and request.applicantName != null and request.applicantName !=''">
+            and create_user_name like concat('%',#{request.applicantName},'%')
+        </if>
+        <if test="request != null and request.applicantTimeStart != null and request.applicantTimeStart !=''">
+            and create_time &gt;= #{request.applicantTimeStart}
+        </if>
+        <if test="request != null and request.applicantTimeEnd != null and request.applicantTimeEnd !=''">
+            and create_time &lt;= #{request.applicantTimeEnd}
+        </if>
+        <if test="businessKeys != null">
+            and id in
+            <foreach collection="businessKeys" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
+        ORDER BY create_time DESC
+    </select>
+</mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourcerInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourcerInfoMapper.xml
index 510a80b..3049b54 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourcerInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourcerInfoMapper.xml
@@ -7,6 +7,8 @@
         <id column="id" property="id" />
         <result column="outsourcer_no" property="outsourcerNo" />
         <result column="outsourcer_name" property="outsourcerName" />
+        <result column="lab_code" property="labCode" />
+        <result column="group_code" property="groupCode" />
         <result column="outsourcer_brief_name" property="outsourcerBriefName" />
         <result column="outsourcer_size" property="outsourcerSize" />
         <result column="business_size" property="businessSize" />
@@ -55,32 +57,32 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, outsourcer_no, outsourcer_name, outsourcer_brief_name, outsourcer_size, business_size, grade, evaluation, tax_number, bank_account, bank_name, bank_account_number, postal_code, director, phone, fax, mobile, email, website, address_country, address_province, address_city, address_area, full_address, address_country_name, address_province_name, address_city_name, address_area_name, invoice_country, invoice_province, invoice_city, invoice_area, invoice_full_address, invoice_country_name, invoice_province_name, invoice_city_name, invoice_area_name, business_scope, business_content, minio_file_name, approval_status, process_id, remark, create_user_id, create_user_name, create_time, update_time
+        id, outsourcer_no, outsourcer_name, lab_code, group_code, outsourcer_brief_name, outsourcer_size, business_size, grade, evaluation, tax_number, bank_account, bank_name, bank_account_number, postal_code, director, phone, fax, mobile, email, website, address_country, address_province, address_city, address_area, full_address, address_country_name, address_province_name, address_city_name, address_area_name, invoice_country, invoice_province, invoice_city, invoice_area, invoice_full_address, invoice_country_name, invoice_province_name, invoice_city_name, invoice_area_name, business_scope, business_content, minio_file_name, approval_status, process_id, remark, create_user_id, create_user_name, create_time, update_time
     </sql>
 
     <select id="selectBatchForApprovalList" resultMap="BaseResultMap">
         SELECT *
         FROM biz_business_outsourcer_info
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.outsourcerNo != null and request.outsourcerNo !=''">
+        <if test="request != null and request.outsourcerNo != null and request.outsourcerNo !=''">
             and outsourcer_no like concat('%',#{request.outsourcerNo},'%')
         </if>
-        <if test="request.outsourcerName != null and request.outsourcerName !=''">
+        <if test="request != null and request.outsourcerName != null and request.outsourcerName !=''">
             and outsourcer_name like concat('%',#{request.outsourcerName},'%')
         </if>
-        <if test="request.director != null and request.director !=''">
+        <if test="request != null and request.director != null and request.director !=''">
             and director like concat('%',#{request.director},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
@@ -93,6 +95,6 @@
     </select>
 
     <select id="selectMaxNo" resultType="java.lang.Long">
-        SELECT IFNULL(max(RIGHT(outsourcer_no, 12)), 0) from biz_business_outsourcer_info
+        SELECT IFNULL(max(RIGHT(outsourcer_no, 3)), 0) from biz_business_outsourcer_info
     </select>
 </mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessSiteExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessSiteExecutiveInfoMapper.xml
index 135c5d0..3c5ae79 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessSiteExecutiveInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessSiteExecutiveInfoMapper.xml
@@ -38,25 +38,25 @@
         FROM biz_business_site_executive_info bsei
         LEFT JOIN biz_resource_customer_info rci ON bsei.customer_id = rci.id
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and bsei.approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and bsei.create_user_id = #{request.createUserId}
         </if>
-        <if test="request.siteExecutiveNo != null and request.siteExecutiveNo !=''">
+        <if test="request != null and request.siteExecutiveNo != null and request.siteExecutiveNo !=''">
             and bsei.site_executive_no like concat('%',#{request.siteExecutiveNo},'%')
         </if>
-        <if test="request.customerName != null and request.customerName !=''">
+        <if test="request != null and request.customerName != null and request.customerName !=''">
             and rci.outsourcer_name like concat('%',#{request.customerName},'%')
         </if>
-        <if test="request.applyName != null and request.applyName !=''">
+        <if test="request != null and request.applyName != null and request.applyName !=''">
             and bsei.apply_name like concat('%',#{request.applyName},'%')
         </if>
-        <if test="request.applyTimeStart != null and request.applyTimeStart !=''">
+        <if test="request != null and request.applyTimeStart != null and request.applyTimeStart !=''">
             and bsei.apply_time &gt;= #{request.applyTimeStart}
         </if>
-        <if test="request.applyTimeEnd != null and request.applyTimeEnd !=''">
+        <if test="request != null and request.applyTimeEnd != null and request.applyTimeEnd !=''">
             and bsei.apply_time &lt;= #{request.applyTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml
index 84d9e2a..6bd38a9 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml
@@ -105,6 +105,12 @@
         <if test="request.isUrgent != null and request.isUrgent !=''">
             AND bo.is_urgent = #{request.isUrgent}
         </if>
+        <if test="request.ids != null">
+            and blei.id in
+            <foreach collection="request.ids" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
         ORDER BY blei.update_time DESC
     </select>
 
@@ -137,6 +143,12 @@
         <if test="request.isUrgent != null and request.isUrgent !=''">
             AND bo.is_urgent = #{request.isUrgent}
         </if>
+        <if test="request.ids != null">
+            and blei.id in
+            <foreach collection="request.ids" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
         ORDER BY blei.update_time DESC
     </select>
 
diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardInfoMapper.xml
index 1a5551b..2ed8d17 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardInfoMapper.xml
@@ -45,12 +45,6 @@
         FROM biz_equipment_standard_info besi
         LEFT JOIN biz_equipment_standard_technology_relation bestr ON besi.standard_no = bestr.standard_no
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
-            and besi.approval_status = #{request.approvalStatus}
-        </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
-            and besi.create_user_id = #{request.createUserId}
-        </if>
         <if test="request.standardName != null and request.standardName !=''">
             and besi.standard_name like concat('%',#{request.standardName},'%')
         </if>
diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardTechnologyRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardTechnologyRelationMapper.xml
index fc7e16c..cd03c8c 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardTechnologyRelationMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardTechnologyRelationMapper.xml
@@ -6,6 +6,7 @@
     <resultMap id="BaseResultMap" type="com.casic.missiles.model.equipment.BizEquipmentStandardTechnologyRelation">
         <id column="id" property="id" />
         <result column="technology_file_id" property="technologyFileId" />
+        <result column="technology_file_no" property="technologyFileNo" />
         <result column="technology_file_name" property="technologyFileName" />
         <result column="standard_id" property="standardId" />
         <result column="standard_no" property="standardNo" />
@@ -14,7 +15,7 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, technology_file_id, technology_file_name, standard_id, remark
+        id, technology_file_id, technology_file_no, technology_file_name, standard_id, remark
     </sql>
 
 </mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceAuthorizeOrderMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceAuthorizeOrderMapper.xml
index ac5176c..554fe65 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceAuthorizeOrderMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceAuthorizeOrderMapper.xml
@@ -32,22 +32,22 @@
         SELECT *
         FROM biz_resource_authorize_order
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.orderNo != null and request.orderNo !=''">
+        <if test="request != null and request.orderNo != null and request.orderNo !=''">
             and order_no like concat('%',#{request.orderNo},'%')
         </if>
-        <if test="request.createUserName != null and request.createUserName !=''">
+        <if test="request != null and request.createUserName != null and request.createUserName !=''">
             and create_user_name like concat('%',#{request.createUserName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerExamineFormMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerExamineFormMapper.xml
index ab242f6..af7f98f 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerExamineFormMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerExamineFormMapper.xml
@@ -41,28 +41,28 @@
         SELECT *
         FROM biz_resource_customer_examine_form
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.formNo != null and request.formNo !=''">
+        <if test="request != null and request.formNo != null and request.formNo !=''">
             and form_no like concat('%',#{request.formNo},'%')
         </if>
-        <if test="request.labCode != null and request.labCode !=''">
+        <if test="request != null and request.labCode != null and request.labCode !=''">
             and lab_code like concat('%',#{request.labCode},'%')
         </if>
-        <if test="request.groupCode != null and request.groupCode !=''">
+        <if test="request != null and request.groupCode != null and request.groupCode !=''">
             and group_code like concat('%',#{request.groupCode},'%')
         </if>
-        <if test="request.createUserName != null and request.createUserName !=''">
+        <if test="request != null and request.createUserName != null and request.createUserName !=''">
             and create_user_name like concat('%',#{request.createUserName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerInfoMapper.xml
index fa8ffbc..06a2798 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerInfoMapper.xml
@@ -33,25 +33,25 @@
         SELECT *
         FROM biz_resource_customer_info
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.customerNo != null and request.customerNo !=''">
+        <if test="request != null and request.customerNo != null and request.customerNo !=''">
             and customer_no like concat('%',#{request.customerNo},'%')
         </if>
-        <if test="request.customerName != null and request.customerName !=''">
+        <if test="request != null and request.customerName != null and request.customerName !=''">
             and customer_name like concat('%',#{request.customerName},'%')
         </if>
-        <if test="request.contacts != null and request.contacts !=''">
+        <if test="request != null and request.contacts != null and request.contacts !=''">
             and contacts like concat('%',#{request.contacts},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerSuggestFormMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerSuggestFormMapper.xml
index 28f5bb2..1806662 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerSuggestFormMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerSuggestFormMapper.xml
@@ -33,28 +33,28 @@
         SELECT *
         FROM biz_resource_customer_suggest_form
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.formNo != null and request.formNo !=''">
+        <if test="request != null and request.formNo != null and request.formNo !=''">
             and form_no like concat('%',#{request.formNo},'%')
         </if>
-        <if test="request.customerName != null and request.customerName !=''">
+        <if test="request != null and request.customerName != null and request.customerName !=''">
             and customer_name like concat('%',#{request.customerName},'%')
         </if>
-        <if test="request.customerDeptName != null and request.customerDeptName !=''">
+        <if test="request != null and request.customerDeptName != null and request.customerDeptName !=''">
             and customer_dept_name like concat('%',#{request.customerDeptName},'%')
         </if>
-        <if test="request.createUserName != null and request.createUserName !=''">
+        <if test="request != null and request.createUserName != null and request.createUserName !=''">
             and create_user_name like concat('%',#{request.createUserName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSealUseNoteMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSealUseNoteMapper.xml
index ab37bc1..b02bb33 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSealUseNoteMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSealUseNoteMapper.xml
@@ -29,32 +29,32 @@
     </sql>
 
     <select id="selectBatchForApprovalList" resultMap="BaseResultMap">
-        SELECT *
+        SELECT brsun.*, brsi.seal_name, brsi.seal_type, brsi.approver_name
         FROM biz_resource_seal_use_note brsun
         JOIN biz_resource_seal_info brsi ON brsun.seal_id = brsi.id
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and brsun.approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and brsun.create_user_id = #{request.createUserId}
         </if>
-        <if test="request.sealName != null and request.sealName !=''">
+        <if test="request != null and request.sealName != null and request.sealName !=''">
             and brsi.seal_name like concat('%',#{request.sealName},'%')
         </if>
-        <if test="request.sealType != null and request.sealType !=''">
+        <if test="request != null and request.sealType != null and request.sealType !=''">
             and brsi.seal_type = #{request.sealType}
         </if>
-        <if test="request.applyDeptName != null and request.applyDeptName !=''">
+        <if test="request != null and request.applyDeptName != null and request.applyDeptName !=''">
             and brsun.apply_dept_name like concat('%',#{request.applyDeptName},'%')
         </if>
-        <if test="request.applyUserName != null and request.applyUserName !=''">
+        <if test="request != null and request.applyUserName != null and request.applyUserName !=''">
             and brsun.apply_user_name like concat('%',#{request.applyUserName},'%')
         </if>
-        <if test="request.applyTimeStart != null and request.applyTimeStart !=''">
+        <if test="request != null and request.applyTimeStart != null and request.applyTimeStart !=''">
             and brsun.apply_time &gt;= #{request.applyTimeStart}
         </if>
-        <if test="request.applyTimeEnd != null and request.applyTimeEnd !=''">
+        <if test="request != null and request.applyTimeEnd != null and request.applyTimeEnd !=''">
             and brsun.apply_time &lt;= #{request.applyTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml
index 119bf7d..4f8392a 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml
@@ -31,6 +31,12 @@
         <if test="request.deptName != null and request.deptName !=''">
             and brsi.dept_name like concat('%',#{request.deptName},'%')
         </if>
+        <if test="request.ids != null">
+            and brsv.id in
+            <foreach collection="request.ids" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
         ORDER BY brsv.grant_date DESC
     </select>
 
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSupplierInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSupplierInfoMapper.xml
index fe8d399..e8ce7ef 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSupplierInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSupplierInfoMapper.xml
@@ -48,28 +48,28 @@
         SELECT *
         FROM biz_resource_supplier_info
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.supplierNo != null and request.supplierNo !=''">
+        <if test="request != null and request.supplierNo != null and request.supplierNo !=''">
             and supplier_no like concat('%',#{request.supplierNo},'%')
         </if>
-        <if test="request.supplierName != null and request.supplierName !=''">
+        <if test="request != null and request.supplierName != null and request.supplierName !=''">
             and supplier_name like concat('%',#{request.supplierName},'%')
         </if>
-        <if test="request.director != null and request.director !=''">
+        <if test="request != null and request.director != null and request.director !=''">
             and director like concat('%',#{request.director},'%')
         </if>
-        <if test="request.supplierType != null and request.supplierType !=''">
+        <if test="request != null and request.supplierType != null and request.supplierType !=''">
             and supplier_type = #{request.supplierType}
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/EnvLocationInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/EnvLocationInfoMapper.xml
new file mode 100644
index 0000000..68bcf10
--- /dev/null
+++ b/casic-metering-dao/src/main/resources/mapper/resource/EnvLocationInfoMapper.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.mapper.resource.EnvLocationInfoMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.resource.EnvLocationInfo">
+        <id column="id" property="id" />
+        <result column="location_no" property="locationNo" />
+        <result column="location_name" property="locationName" />
+        <result column="location_position" property="locationPosition" />
+        <result column="create_user_id" property="createUserId" />
+        <result column="create_user" property="createUser" />
+        <result column="create_time" property="createTime" />
+        <result column="update_time" property="updateTime" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, location_no, location_name, location_position, create_user_id, create_user, create_time, update_time
+    </sql>
+
+    <select id="selectLocationListPage" resultType="com.casic.missiles.dto.resource.environment.LocationListResponse">
+        SELECT *
+        FROM env_location_info
+        WHERE 1=1
+        <if test="request.locationNo != null and request.locationNo !=''">
+            AND location_no LIKE concat('%',#{request.locationNo},'%')
+        </if>
+        <if test="request.locationName != null and request.locationName !=''">
+            AND location_name LIKE concat('%',#{request.locationName},'%')
+        </if>
+        ORDER BY create_time DESC
+    </select>
+
+</mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml
index b28c18f..8854047 100644
--- a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml
@@ -11,7 +11,6 @@
         <result column="sign_desc" property="signDesc" />
         <result column="sign_director" property="signDirector" />
         <result column="sign_user_id" property="signUserId" />
-        <result column="sign_type" property="signType" />
         <result column="minio_file_name" property="minioFileName" />
         <result column="create_time" property="createTime" />
         <result column="update_time" property="updateTime" />
@@ -28,7 +27,6 @@
         <result column="sign_name" property="signName" />
         <result column="sign_desc" property="signDesc" />
         <result column="sign_director" property="signDirector" />
-        <result column="sign_type" property="signType" />
         <result column="sign_user_id" property="signUserId" />
         <result column="minio_file_name" property="minioFileName" />
         <result column="create_time" property="createTime" />
@@ -62,4 +60,58 @@
         JOIN system_sign_user_relation ssur ON ss.id = ssur.sign_id
         WHERE ssur.user_id = #{userId}
     </select>
+
+    <select id="selectSignListPage" resultMap="BaseResultMap">
+        SELECT ss.*, sd.SIMPLE_NAME AS deptName
+        FROM system_sign ss
+        LEFT JOIN sys_user su ON su.id = ss.sign_user_id
+        LEFT JOIN sys_dept sd ON sd.id = su.dept_id
+        WHERE 1=1
+        <if test="request.signNo != null and request.signNo !=''">
+            AND ss.sign_no LIKE concat('%',#{request.signNo},'%')
+        </if>
+        <if test="request.signName != null and request.signName !=''">
+            AND ss.sign_name LIKE concat('%',#{request.signName},'%')
+        </if>
+        <if test="request.signDirector != null and request.signDirector !=''">
+            AND ss.sign_director LIKE concat('%',#{request.signDirector},'%')
+        </if>
+        <if test="request.signUserId != null and request.signUserId !=''">
+            AND ss.sign_user_id = #{request.signUserId}
+        </if>
+        <if test="request.createStartTime != null and request.createStartTime !=''">
+            AND DATE_FORMAT(ss.create_time,'%Y-%m-%d') &gt;= DATE_FORMAT(#{request.createStartTime},'%Y-%m-%d')
+        </if>
+        <if test="request.createEndTime != null and request.createEndTime !=''">
+            AND DATE_FORMAT(ss.create_time,'%Y-%m-%d')  &lt;= DATE_FORMAT(#{request.createEndTime},'%Y-%m-%d')
+        </if>
+        ORDER BY ss.create_time DESC
+    </select>
+
+    <select id="selectSignList" resultMap="BaseResultMap">
+        SELECT ss.*, sd.SIMPLE_NAME AS deptName
+        FROM system_sign ss
+        LEFT JOIN sys_user su ON su.id = ss.sign_user_id
+        LEFT JOIN sys_dept sd ON sd.id = su.dept_id
+        WHERE 1=1
+        <if test="request.signNo != null and request.signNo !=''">
+            AND ss.sign_no LIKE concat('%',#{request.signNo},'%')
+        </if>
+        <if test="request.signName != null and request.signName !=''">
+            AND ss.sign_name LIKE concat('%',#{request.signName},'%')
+        </if>
+        <if test="request.signDirector != null and request.signDirector !=''">
+            AND ss.sign_director LIKE concat('%',#{request.signDirector},'%')
+        </if>
+        <if test="request.signUserId != null and request.signUserId !=''">
+            AND ss.sign_user_id = #{request.signUserId}
+        </if>
+        <if test="request.createStartTime != null and request.createStartTime !=''">
+            AND DATE_FORMAT(ss.create_time,'%Y-%m-%d') &gt;= DATE_FORMAT(#{request.createStartTime},'%Y-%m-%d')
+        </if>
+        <if test="request.createEndTime != null and request.createEndTime !=''">
+            AND DATE_FORMAT(ss.create_time,'%Y-%m-%d')  &lt;= DATE_FORMAT(#{request.createEndTime},'%Y-%m-%d')
+        </if>
+        ORDER BY ss.create_time DESC
+    </select>
 </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 515050a..60f530b 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
@@ -47,8 +47,8 @@
     String STORAGE_LOCATION = "bizStorageLocation";
     //计量专业
     String MEASURE_MAJOR = "bizMeasureMajor";
-    //管理状态
-    String MANAGER_STATE = "bizManagerState";
+    //标准装置管理状态
+    String STANDARD_MANAGER_STATE = "bizStandardManagerState";
 
     /**
      * 资源管理 字典code
@@ -95,8 +95,6 @@
     String MEASURE_STATUS = "measureStatus";
     //检定方式
     String MEASURE_TYPE = "measureType";
-    //标识打印标志类型
-    String IDENTIFY_PRINT_TYPE = "bizBusinessIdentify";
     //变更类型
     String REPORT_CHANGE_TYPE = "bizCertChangeType";
     //规模类型
@@ -111,19 +109,24 @@
     String MEASURE_CATEGORY = "measureCategory";
     //检定结果
     String MEASURE_RESULT = "measureResult";
+    //分包原因
+    String OUTSOURCE_REASON = "outsourceReason";
+
+    /**
+     * 系统管理
+     */
+    String TEMPLATE_TYPE = "templateType";
+
 
     /**
      * 标准装置 字典code
      */
     //类别
     String STANDARD_CATEGORY = "standardCategory";
-    //管理状态
-    String STANDARD_MANAGER_STATE = "standardManagerState";
     //标准等级
     String STANDARD_LEVEL = "standardLevel";
     //传递范围
     String STANDARD_TRANSMIT_RANGE = "transmitRange";
-
     //资本来源
     String CAPITAL_SOURCE = "capitalSource";
     //标准装置-申请类型
@@ -148,8 +151,6 @@
     String CERTIFICATE_CLASS = "certificationClass";
     //证书管理-检校专业
     String CALIBRATION_MAJOR = "calibrationMajor";
-    //分包原因
-    String OUTSOURCE_REASON = "outsourceReason";
 
     /**
      * 工作台
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/BaseApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/BaseApprovalListRequest.java
index 73c12c1..80d7424 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/BaseApprovalListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/BaseApprovalListRequest.java
@@ -6,6 +6,7 @@
 
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotEmpty;
+import java.util.List;
 
 /**
  * @Description:
@@ -19,14 +20,14 @@
      * 表单id
      */
     @NotBlank(message = "表单id不能为空")
-    @ApiModelProperty(value = "表单id（流程定义对应的表单id，等价于业务id）", dataType = "String")
+    @ApiModelProperty(value = "表单id（流程定义对应的表单id，等价于业务id），导出接口不用传", dataType = "String")
     private String formId;
 
     /**
      * 审批状态类型，对应ApprovalStatusEnum
      */
     @NotEmpty(message = "审批状态类型不能为空")
-    @ApiModelProperty(value = "审批状态类型code", dataType = "String")
+    @ApiModelProperty(value = "审批状态类型code，导出接口不用传", dataType = "String")
     private String approvalStatus;
 
     @ApiModelProperty(hidden = true)
@@ -34,4 +35,7 @@
 
     @ApiModelProperty(hidden = true)
     private Long createUserId;
+
+    @ApiModelProperty(value = "导出ids", dataType = "List")
+    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificatePrintApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificatePrintApprovalListRequest.java
index b93d1c9..3cc2f4e 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificatePrintApprovalListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificatePrintApprovalListRequest.java
@@ -5,8 +5,6 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import java.util.List;
-
 /**
  * @Description:
  * @Author: wangpeng
@@ -38,7 +36,4 @@
 
     @ApiModelProperty(value = "创建结束时间", dataType = "String")
     private String createTimeEnd;
-
-    @ApiModelProperty(value = "导出ids", dataType = "List")
-    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportApprovalListRequest.java
index 4f7a038..c115847 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportApprovalListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportApprovalListRequest.java
@@ -5,8 +5,6 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import java.util.List;
-
 /**
  * @Description:
  * @Author: wangpeng
@@ -15,6 +13,8 @@
 @ApiModel
 @Data
 public class CertificateReportApprovalListRequest extends BaseApprovalListRequest {
+    @ApiModelProperty(value = "委托方id", dataType = "String")
+    private Long customerId;
 
     @ApiModelProperty(value = "证书报告编号", dataType = "String")
     private String certificateReportNo;
@@ -37,6 +37,4 @@
     @ApiModelProperty(value = "检校结束时间", dataType = "String")
     private String calibrationTimeEnd;
 
-    @ApiModelProperty(value = "导出ids", dataType = "List")
-    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/identify/IdentifyListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/identify/IdentifyListRequest.java
index 1b87ae6..f019203 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/identify/IdentifyListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/identify/IdentifyListRequest.java
@@ -4,6 +4,8 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * @Description:
  * @Author: wangpeng
@@ -26,4 +28,7 @@
 
     @ApiModelProperty(value = "打印结束时间", dataType = "String")
     private String createTimeEnd;
+
+    @ApiModelProperty(value = "导出ids", dataType = "List")
+    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListRequest.java
index 1264883..62415fb 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListRequest.java
@@ -7,6 +7,7 @@
 import lombok.Data;
 
 import javax.validation.constraints.NotBlank;
+import java.util.List;
 
 @Data
 @ApiModel
@@ -37,4 +38,6 @@
     @ApiModelProperty(value = "是否加急（1是0否null全部）", dataType = "Integer")
     private String isUrgent;
 
+    @ApiModelProperty(value = "导出ids", dataType = "List")
+    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListRequest.java
index 5201d7b..499760a 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListRequest.java
@@ -17,6 +17,9 @@
     @ApiModelProperty(value = "任务单编号", dataType = "String")
     private String orderNo;
 
+    @ApiModelProperty(value = "委托方id", dataType = "Long")
+    private Long customerId;
+
     @ApiModelProperty(value = "委托方名称", dataType = "String")
     private String customerName;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OrderSampleDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OrderSampleDTO.java
new file mode 100644
index 0000000..796edc0
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OrderSampleDTO.java
@@ -0,0 +1,19 @@
+package com.casic.missiles.dto.business.outsource;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/8/24 11:38
+ */
+@ApiModel
+@Data
+public class OrderSampleDTO {
+    @ApiModelProperty(value = "任务单id", dataType = "Long")
+    private Long orderId;
+    @ApiModelProperty(value = "受检设备id", dataType = "Long")
+    private Long sampleId;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceAssessApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceAssessApprovalListRequest.java
new file mode 100644
index 0000000..9a930c3
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceAssessApprovalListRequest.java
@@ -0,0 +1,30 @@
+package com.casic.missiles.dto.business.outsource;
+
+import com.casic.missiles.dto.BaseApprovalListRequest;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/8/24 11:01
+ */
+@ApiModel
+@Data
+public class OutsourceAssessApprovalListRequest extends BaseApprovalListRequest {
+    @ApiModelProperty(value = "评审表编号", dataType = "String")
+    private String projectNo;
+
+    @ApiModelProperty(value = "分包机构名称", dataType = "String")
+    private String outsourcerName;
+
+    @ApiModelProperty(value = "申请人", dataType = "String")
+    private String applicantName;
+
+    @ApiModelProperty(value = "申请时间开始", dataType = "String")
+    private String applicantTimeStart;
+
+    @ApiModelProperty(value = "申请时间结束", dataType = "String")
+    private String applicantTimeEnd;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceAssessSaveResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceAssessSaveResponse.java
new file mode 100644
index 0000000..8bf9aad
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceAssessSaveResponse.java
@@ -0,0 +1,20 @@
+package com.casic.missiles.dto.business.outsource;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/8/14 16:17
+ */
+@ApiModel
+@Data
+public class OutsourceAssessSaveResponse {
+    @ApiModelProperty(value = "主键id", dataType = "Long")
+    private Long id;
+
+    @ApiModelProperty(value = "编号", dataType = "String")
+    private String projectNo;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProtocolApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProtocolApprovalListRequest.java
new file mode 100644
index 0000000..0f32331
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProtocolApprovalListRequest.java
@@ -0,0 +1,30 @@
+package com.casic.missiles.dto.business.outsource;
+
+import com.casic.missiles.dto.BaseApprovalListRequest;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/8/24 15:01
+ */
+@ApiModel
+@Data
+public class OutsourceProtocolApprovalListRequest extends BaseApprovalListRequest {
+    @ApiModelProperty(value = "协议书编号", dataType = "String")
+    private String protocolNo;
+
+    @ApiModelProperty(value = "分包方名称", dataType = "String")
+    private String outsourcerName;
+
+    @ApiModelProperty(value = "申请人", dataType = "String")
+    private String applicantName;
+
+    @ApiModelProperty(value = "申请时间开始", dataType = "String")
+    private String applicantTimeStart;
+
+    @ApiModelProperty(value = "申请时间结束", dataType = "String")
+    private String applicantTimeEnd;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProtocolSaveResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProtocolSaveResponse.java
new file mode 100644
index 0000000..e324967
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProtocolSaveResponse.java
@@ -0,0 +1,20 @@
+package com.casic.missiles.dto.business.outsource;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/8/14 16:17
+ */
+@ApiModel
+@Data
+public class OutsourceProtocolSaveResponse {
+    @ApiModelProperty(value = "主键id", dataType = "Long")
+    private Long id;
+
+    @ApiModelProperty(value = "编号", dataType = "String")
+    private String protocolNo;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveApprovalListRequest.java
index f29f4e4..7047c28 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveApprovalListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveApprovalListRequest.java
@@ -5,8 +5,6 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import java.util.List;
-
 /**
  * @Description: 现场检测审批列表请求实体
  * @Author: wangpeng
@@ -30,7 +28,4 @@
     @ApiModelProperty(value = "申请时间结束", dataType = "String")
     private String applyTimeEnd;
 
-    @ApiModelProperty(value = "导出ids", dataType = "List")
-    private List<Long> ids;
-
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveDetailResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveDetailResponse.java
index 1f28752..394c934 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveDetailResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveDetailResponse.java
@@ -12,6 +12,18 @@
     @ApiModelProperty(value = "id，更新/删除使用参数", dataType = "Long")
     private Long id;
 
+    @ApiModelProperty(value = "实验室代码(字典code)", dataType = "String")
+    private String labCode;
+
+    @ApiModelProperty(value = "实验室代码(字典value)", dataType = "String")
+    private String labCodeName;
+
+    @ApiModelProperty(value = "组别代码(字典code)", dataType = "String")
+    private String groupCode;
+
+    @ApiModelProperty(value = "组别代码(字典value)", dataType = "String")
+    private String groupCodeName;
+
     @ApiModelProperty(value = "审批编号", dataType = "String")
     private String siteExecutiveNo;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/environment/LocationListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/environment/LocationListRequest.java
new file mode 100644
index 0000000..13d03c3
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/environment/LocationListRequest.java
@@ -0,0 +1,20 @@
+package com.casic.missiles.dto.resource.environment;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/6/8 13:56
+ */
+@ApiModel
+@Data
+public class LocationListRequest {
+    @ApiModelProperty(value = "地点编号", dataType = "String")
+    private String locationNo;
+
+    @ApiModelProperty(value = "地点名称", dataType = "String")
+    private String locationName;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/environment/LocationListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/environment/LocationListResponse.java
new file mode 100644
index 0000000..4c531af
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/environment/LocationListResponse.java
@@ -0,0 +1,78 @@
+package com.casic.missiles.dto.resource.environment;
+
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
+import com.baomidou.mybatisplus.annotation.TableField;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description: 地点列表响应实体
+ * @Author: wangpeng
+ * @Date: 2023/6/8 13:53
+ */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
+@ApiModel
+@Data
+public class LocationListResponse {
+    @ApiModelProperty(value = "主键id", dataType = "Long")
+    private Long id;
+
+    /**
+     * 地点编号
+     */
+    @ExcelProperty("地点编号")
+    @ApiModelProperty(value = "地点编号", dataType = "String")
+    private String locationNo;
+
+    /**
+     * 地点名称
+     */
+    @ExcelProperty("地点名称")
+    @ApiModelProperty(value = "地点名称", dataType = "String")
+    private String locationName;
+
+    /**
+     * 地点位置
+     */
+    @ExcelProperty("地点位置")
+    @ApiModelProperty(value = "地点位置", dataType = "String")
+    private String locationPosition;
+
+    /**
+     * 创建人id
+     */
+    @ApiModelProperty(value = "创建人id", dataType = "Long")
+    private Long createUserId;
+
+    /**
+     * 创建人
+     */
+    @ExcelProperty("创建人")
+    @ApiModelProperty(value = "创建人", dataType = "String")
+    @TableField("create_user")
+    private String createUser;
+
+    /**
+     * 创建时间
+     */
+    @ExcelProperty("创建时间")
+    @ApiModelProperty(value = "创建时间", dataType = "String")
+    private String createTime;
+
+    /**
+     * 更新时间
+     */
+    @ApiModelProperty(value = "更新时间", dataType = "String")
+    private String updateTime;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertRequest.java
index 9a7f6c6..c827915 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertRequest.java
@@ -4,6 +4,8 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * @Description:
  * @Author: wangpeng
@@ -16,4 +18,7 @@
     private String name;
     @ApiModelProperty(value = "部门名", dataType = "String")
     private String deptName;
+
+    @ApiModelProperty(value = "导出ids", dataType = "List")
+    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertResponse.java
index f78b159..8f2f79e 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertResponse.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.dto.resource.staff;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.casic.missiles.annotation.DictCodeField;
 import com.casic.missiles.constants.MeterDictCode;
 import io.swagger.annotations.ApiModel;
@@ -13,12 +20,18 @@
  * @Author: wangpeng
  * @Date: 2023/7/27 15:13
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @ApiModel
 @Data
 public class StaffCertResponse {
     /**
      * 人员编号
      */
+    @ExcelProperty(value = "人员编号",order = 0)
     @NotEmpty(message = "人员编号不能为空")
     @ApiModelProperty(value = "人员编号", dataType = "String")
     private String staffNo;
@@ -26,6 +39,7 @@
     /**
      * 姓名
      */
+    @ExcelProperty(value = "姓名",order = 1)
     @ApiModelProperty(value = "姓名", dataType = "String")
     private String staffName;
 
@@ -54,6 +68,7 @@
     /**
      * 部门名字
      */
+    @ExcelProperty(value = "工作部门",order = 2)
     @ApiModelProperty(value = "部门名字", dataType = "String")
     private String deptName;
 
@@ -66,6 +81,7 @@
     /**
      * 计量专业
      */
+    @ExcelProperty(value = "计量专业",order = 3)
     @ApiModelProperty(value = "计量专业", dataType = "String")
     private String major;
 
@@ -110,6 +126,7 @@
     /**
      * 证书号
      */
+    @ExcelProperty(value = "证号",order = 4)
     @ApiModelProperty(value = "证书号", dataType = "String")
     private String certNo;
 
@@ -122,12 +139,14 @@
     /**
      * 有效日期
      */
+    @ExcelProperty(value = "证书有效期",order = 6)
     @ApiModelProperty(value = "有效日期", dataType = "String")
     private String effectiveDate;
 
     /**
      * 发放日期
      */
+    @ExcelProperty(value = "发证日期",order = 5)
     @ApiModelProperty(value = "发放日期", dataType = "String")
     private String grantDate;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffListRequest.java
index 7c4afb3..0a1194a 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffListRequest.java
@@ -4,6 +4,8 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * @Description:
  * @Author: wangpeng
@@ -18,4 +20,7 @@
     private String deptName;
     @ApiModelProperty(value = "部门id", dataType = "Long")
     private Long deptId;
+
+    @ApiModelProperty(value = "导出ids", dataType = "List")
+    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/TrainListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/TrainListRequest.java
index f68597b..6321f8b 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/TrainListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/TrainListRequest.java
@@ -14,6 +14,8 @@
 public class TrainListRequest {
     @ApiModelProperty(value = "训练登记表编号", dataType = "String")
     private String trainNo;
+    @ApiModelProperty(value = "值班领导", dataType = "String")
+    private String dutyLeader;
     @ApiModelProperty(value = "创建开始时间", dataType = "String")
     private String createTimeStart;
     @ApiModelProperty(value = "创建结束时间", dataType = "String")
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/SignAddRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/SignAddRequest.java
index 117be34..d71055c 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/SignAddRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/SignAddRequest.java
@@ -43,13 +43,6 @@
     private Long signUserId;
 
     /**
-     * 签章或签名-字典code
-     */
-    @NotBlank(message = "类型不能为空")
-    @ApiModelProperty(value = "签名/签章-字典code", dataType = "String", required = true)
-    private String signType;
-
-    /**
      * minio存储文件名
      */
     @ApiModelProperty(value = "上传文件返回名称", dataType = "String")
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateAddRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateAddRequest.java
index aff1265..6316648 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateAddRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateAddRequest.java
@@ -17,30 +17,28 @@
 @Data
 public class TemplateAddRequest extends BaseSystemRequest {
     /**
-     * 原始记录模板/证书报告模板名称
+     * 模板名称
      */
     @ApiModelProperty(value = "名称", dataType = "String", required = true)
     @NotBlank(message = "名称不能为空")
     private String templateName;
 
     /**
-     * 原始记录模板/证书报告模板描述
+     * 模板描述
      */
     @ApiModelProperty(value = "描述", dataType = "String")
     private String templateDesc;
 
     /**
-     * 原始记录模板/证书报告模板创建人
+     * 创建人
      */
     @ApiModelProperty(value = "创建人", dataType = "String", required = true)
     @NotBlank(message = "创建人不能为空")
     private String templateCreator;
 
-    /**
-     * 原始记录模板/证书报告模板-字典code
-     */
-    @NotBlank(message = "类型不能为空")
-    @ApiModelProperty(value = "原始记录模板/证书报告模板-字典code", dataType = "String", required = true)
+
+    @NotBlank(message = "模板类型不能为空")
+    @ApiModelProperty(value = "模板类型(字典code)", dataType = "String", required = true)
     private String templateType;
 
     /**
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateListRequest.java
index eec5a1e..6d17bbe 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateListRequest.java
@@ -1,11 +1,12 @@
 package com.casic.missiles.dto.system;
 
+import com.casic.missiles.annotation.DictCodeField;
+import com.casic.missiles.constants.MeterDictCode;
 import com.casic.missiles.dto.BaseSystemRequest;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import javax.validation.constraints.NotBlank;
 import java.util.List;
 
 /**
@@ -19,8 +20,8 @@
     /**
      * 类型
      */
-//    @ApiModelProperty(value = "类型-字典code", dataType = "String", required = true)
-    @NotBlank(message = "类型不能为空")
+    @DictCodeField(message = "模板类型不合法", cacheName = MeterDictCode.TEMPLATE_TYPE)
+    @ApiModelProperty(value = "模板类型(字典code)", dataType = "String")
     private String templateType;
 
     /**
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificateChangeApply.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificateChangeApply.java
index 9216308..36923fd 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificateChangeApply.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificateChangeApply.java
@@ -1,11 +1,19 @@
 package com.casic.missiles.model.business;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 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 com.casic.missiles.dto.BaseRequest;
+import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -20,6 +28,12 @@
  * @author wangpeng
  * @since 2023-08-15
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
+@ApiModel
 @Data
 @TableName("biz_business_certificate_change_apply")
 public class BizBusinessCertificateChangeApply extends BaseRequest implements Serializable {
@@ -33,6 +47,7 @@
     /**
      * 申请单编号
      */
+    @ExcelProperty(value = "申请单编号", order = 1)
     @ApiModelProperty(value = "申请单编号", dataType = "String")
     @TableField("change_apply_no")
     private String changeApplyNo;
@@ -40,6 +55,7 @@
     /**
      * 申请单名字
      */
+    @ExcelProperty(value = "申请单名称", order = 2)
     @ApiModelProperty(value = "申请单名字", dataType = "String")
     @TableField("change_apply_name")
     private String changeApplyName;
@@ -54,6 +70,7 @@
     /**
      * 更换证书编号
      */
+    @ExcelProperty(value = "更换证书编号", order = 3)
     @ApiModelProperty(value = "更换证书编号", dataType = "String")
     @TableField("change_report_no")
     private String changeReportNo;
@@ -61,7 +78,8 @@
     /**
      * 更换证书名字
      */
-    @ApiModelProperty(value = "更换证书名字", dataType = "String")
+    @ExcelProperty(value = "更换证书/报告名称", order = 4)
+    @ApiModelProperty(value = "更换证书/报告名称", dataType = "String")
     @TableField("change_report_name")
     private String changeReportName;
 
@@ -73,6 +91,7 @@
     @TableField("change_type")
     private String changeType;
 
+    @ExcelProperty(value = "变更类型", order = 5)
     @ApiModelProperty(value = "变更类型(字典value)", dataType = "String")
     @TableField(exist = false)
     private String changeTypeName;
@@ -142,13 +161,15 @@
     /**
      * 创建用户名字
      */
-    @ApiModelProperty(value = "创建用户名字", dataType = "String")
+    @ExcelProperty(value = "创建人", order = 6)
+    @ApiModelProperty(value = "创建人名字", dataType = "String")
     @TableField("create_user_name")
     private String createUserName;
 
     /**
      * 创建时间
      */
+    @ExcelProperty(value = "创建时间", order = 7)
     @ApiModelProperty(value = "创建时间", dataType = "String")
     @TableField("create_time")
     private String createTime;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificateReport.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificateReport.java
index f01db9e..db06018 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificateReport.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificateReport.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.model.business;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -22,6 +29,11 @@
  * @author wangpeng
  * @since 2023-08-14
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @ApiModel
 @Data
 @TableName("biz_business_certificate_report")
@@ -36,6 +48,7 @@
     /**
      * 证书报告编号
      */
+    @ExcelProperty(value = "证书报告编号", order = 1)
     @ApiModelProperty(value = "证书报告编号", dataType = "String")
     @TableField("certificate_report_no")
     private String certificateReportNo;
@@ -43,6 +56,7 @@
     /**
      * 证书报告名称
      */
+    @ExcelProperty(value = "证书报告名称", order = 2)
     @ApiModelProperty(value = "证书报告名称", dataType = "String")
     @TableField("certificate_report_name")
     private String certificateReportName;
@@ -62,6 +76,7 @@
     @TableField("measure_category")
     private String measureCategory;
 
+    @ExcelProperty(value = "检校类别", order = 6)
     @ApiModelProperty(value = "检校类别(字典value)", dataType = "String")
     @TableField(exist = false)
     private String measureCategoryName;
@@ -69,6 +84,7 @@
     /**
      * 检校时间
      */
+    @ExcelProperty(value = "检校时间", order = 8)
     @ApiModelProperty(value = "检校时间", dataType = "String")
     @TableField("calibration_time")
     private String calibrationTime;
@@ -267,18 +283,22 @@
     @TableField(exist = false)
     private Integer decisionItem;
 
-    @ApiModelProperty(value = "设备样品编号（列表返回参数）", dataType = "String")
+    @ExcelProperty(value = "被检设备统一编号", order = 3)
+    @ApiModelProperty(value = "被检设备统一编号（列表返回参数）", dataType = "String")
     @TableField(exist = false)
     private String sampleNo;
 
-    @ApiModelProperty(value = "设备样品名称（列表返回参数）", dataType = "String")
+    @ExcelProperty(value = "被检设备名称", order = 4)
+    @ApiModelProperty(value = "被检设备名称（列表返回参数）", dataType = "String")
     @TableField(exist = false)
     private String sampleName;
 
-    @ApiModelProperty(value = "设备样品规格型号（列表返回参数）", dataType = "String")
+    @ExcelProperty(value = "规格型号", order = 5)
+    @ApiModelProperty(value = "规格型号（列表返回参数）", dataType = "String")
     @TableField(exist = false)
     private String sampleModel;
 
+    @ExcelProperty(value = "检定员", order = 7)
     @ApiModelProperty(value = "检定员名字（列表返回参数）", dataType = "String")
     @TableField(exist = false)
     private String staffName;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessIdentifyInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessIdentifyInfo.java
index 46bfba5..f1a9bec 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessIdentifyInfo.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessIdentifyInfo.java
@@ -1,10 +1,15 @@
 package com.casic.missiles.model.business;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 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;
 
@@ -20,6 +25,11 @@
  * @author wangpeng
  * @since 2023-08-15
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @Data
 @TableName("biz_business_identify_info")
 public class BizBusinessIdentifyInfo implements Serializable {
@@ -33,6 +43,7 @@
     /**
      * 记录编号
      */
+    @ExcelProperty(value = "记录编号", order = 1)
     @ApiModelProperty(value = "记录编号", dataType = "String")
     @TableField("record_no")
     private String recordNo;
@@ -41,20 +52,15 @@
      * 标志类型(字典code)
      */
     @NotEmpty(message = "标志类型不能为空")
-    @ApiModelProperty(value = "标志类型(字典code)", dataType = "String")
-    @DictCodeField(message = "标志类型不合法", cacheName = MeterDictCode.IDENTIFY_PRINT_TYPE)
+    @ApiModelProperty(value = "标志类型(直接存计量标识/使用状态/校准状态的字典value)", dataType = "String")
     @TableField("identify_type")
     private String identifyType;
 
-    @ApiModelProperty(value = "标志类型(字典value)", dataType = "String")
-    @TableField(exist = false)
-    private String identifyTypeName;
-
     /**
      * 设备id(可以是受检设备/设备台账)
      */
     @NotNull(message = "设备id不能为空")
-    @ApiModelProperty(value = "设备id(可以是受检设备/设备台账)", dataType = "String")
+    @ApiModelProperty(value = "设备id(可以是受检设备/设备台账)", dataType = "Long")
     @TableField("device_id")
     private Long deviceId;
 
@@ -66,29 +72,32 @@
     @TableField("device_type")
     private String deviceType;
 
+    @ExcelProperty(value = "统一编号", order = 3)
     @NotEmpty(message = "设备编号不能为空")
-    @ApiModelProperty(value = "设备编号", dataType = "String")
+    @ApiModelProperty(value = "统一编号", dataType = "String")
     @TableField("device_no")
     private String deviceNo;
 
     /**
      * 设备名字
      */
-    @NotEmpty(message = "设备名字不能为空")
-    @ApiModelProperty(value = "设备名字", dataType = "String")
+    @ExcelProperty(value = "设备名称", order = 4)
+    @NotEmpty(message = "设备名称不能为空")
+    @ApiModelProperty(value = "设备名称", dataType = "String")
     @TableField("device_name")
     private String deviceName;
 
     /**
      * 检定员id
      */
-    @ApiModelProperty(value = "检定员id", dataType = "String")
+    @ApiModelProperty(value = "检定员id", dataType = "Long")
     @TableField("measure_person_id")
     private Long measurePersonId;
 
     /**
      * 检定员名字
      */
+    @ExcelProperty(value = "检定员", order = 5)
     @ApiModelProperty(value = "检定员名字", dataType = "String")
     @TableField("measure_person")
     private String measurePerson;
@@ -103,7 +112,8 @@
     /**
      * 更新时间
      */
-    @ApiModelProperty(value = "更新时间", dataType = "String")
+    @ExcelProperty(value = "打印时间", order = 6)
+    @ApiModelProperty(value = "打印时间", dataType = "String")
     @TableField("update_time")
     private String updateTime;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceAssess.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceAssess.java
index 659d9ca..6720b90 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceAssess.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceAssess.java
@@ -1,11 +1,26 @@
 package com.casic.missiles.model.business;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 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 com.casic.missiles.dto.BaseRequest;
+import com.casic.missiles.dto.business.outsource.OrderSampleDTO;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import javax.validation.constraints.NotEmpty;
 import java.io.Serializable;
+import java.util.List;
 
 /**
  * <p>
@@ -15,146 +30,231 @@
  * @author wangpeng
  * @since 2023-08-16
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
+@ApiModel
 @Data
 @TableName("biz_business_outsource_assess")
-public class BizBusinessOutsourceAssess implements Serializable {
+public class BizBusinessOutsourceAssess extends BaseRequest implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
+    @ApiModelProperty(value = "id，更新/删除使用参数", dataType = "Long")
     @TableId("id")
     private Long id;
 
     /**
      * 评审表编号
      */
+    @ExcelProperty(value = "评审表编号", order = 1)
+    @ApiModelProperty(value = "评审表编号(后台生成)", dataType = "String")
     @TableField("project_no")
     private String projectNo;
 
     /**
      * 评审表名称
      */
+    @ExcelProperty(value = "评审表名称", order = 2)
+    @ApiModelProperty(value = "评审表名称", dataType = "String")
     @TableField("project_name")
     private String projectName;
 
+    @NotEmpty(message = "实验室代码不能为空")
+    @DictCodeField(message = "实验室代码描述不合法", cacheName = MeterDictCode.LAB_CODE)
+    @ApiModelProperty(value = "实验室代码(字典code)", dataType = "String")
+    @TableField("lab_code")
+    private String labCode;
+
+    @ApiModelProperty(value = "实验室代码(字典value)", dataType = "String")
+    @TableField(exist = false)
+    private String labCodeName;
+
+    /**
+     * 组别代码
+     */
+    @NotEmpty(message = "组别代码不能为空")
+    @DictCodeField(message = "组别代码描述不合法", cacheName = MeterDictCode.GROUP_CODE)
+    @ApiModelProperty(value = "组别代码(字典code)", dataType = "String")
+    @TableField("group_code")
+    private String groupCode;
+
+    @ApiModelProperty(value = "组别代码(字典value)", dataType = "String")
+    @TableField(exist = false)
+    private String groupCodeName;
+
     /**
      * 申请人id
      */
+    @ApiModelProperty(value = "申请人id", dataType = "String")
     @TableField("applicant_id")
     private Long applicantId;
 
     /**
      * 申请人名字
      */
+    @ExcelProperty(value = "申请人", order = 5)
+    @ApiModelProperty(value = "申请人", dataType = "String")
     @TableField("applicant_name")
     private String applicantName;
 
     /**
      * 申请时间
      */
+    @ExcelProperty(value = "申请时间", order = 6)
+    @ApiModelProperty(value = "申请时间", dataType = "String")
     @TableField("applicant_time")
     private String applicantTime;
 
     /**
      * 附件(minio存储文件名)
      */
+    @ApiModelProperty(value = "附件(minio存储文件名)", dataType = "String")
     @TableField("minio_file_name")
     private String minioFileName;
 
     /**
      * 备注
      */
+    @ApiModelProperty(value = "备注", dataType = "String")
     @TableField("remark")
     private String remark;
 
     /**
      * 创建人id
      */
+    @ApiModelProperty(value = "创建人id", dataType = "String")
     @TableField("create_user_id")
     private Long createUserId;
 
     /**
      * 创建人名字
      */
+    @ApiModelProperty(value = "创建人名字", dataType = "String")
     @TableField("create_user_name")
     private String createUserName;
 
     /**
      * 分包方id
      */
+    @ApiModelProperty(value = "评审表编号", dataType = "String")
     @TableField("outsourcer_id")
     private Long outsourcerId;
 
     /**
      * 预计开始时间
      */
+    @ApiModelProperty(value = "预计开始时间", dataType = "String")
     @TableField("pre_start_time")
     private String preStartTime;
 
     /**
      * 预计结束时间
      */
+    @ApiModelProperty(value = "预计结束时间", dataType = "String")
     @TableField("pre_end_time")
     private String preEndTime;
 
     /**
      * 分包原因-字典
      */
+    @ApiModelProperty(value = "分包原因(字典code)", dataType = "String")
+    @DictCodeField(message = "分包原因描述不合法", cacheName = MeterDictCode.OUTSOURCE_REASON)
     @TableField("outsource_reason")
     private String outsourceReason;
 
+    @ApiModelProperty(value = "分包原因(字典value)", dataType = "String")
+    @TableField(exist = false)
+    private String outsourceReasonName;
+
     /**
      * 预计费用
      */
+    @ApiModelProperty(value = "预计费用", dataType = "String")
     @TableField("pre_cost")
     private String preCost;
 
     /**
      * 审批状态
      */
+    @ApiModelProperty(value = "审批状态", dataType = "String")
+    @DictCodeField(message = "审批状态描述不合法", cacheName = MeterDictCode.APPROVAL_STATUS)
     @TableField("approval_status")
     private String approvalStatus;
 
     /**
      * 流程实例id
      */
+    @ApiModelProperty(value = "流程实例id", dataType = "String")
     @TableField("process_id")
     private String processId;
 
     /**
      * 实验室认可情况
      */
+    @ApiModelProperty(value = "实验室认可情况", dataType = "String")
     @TableField("approve_situation")
     private String approveSituation;
 
     /**
      * 溯源性
      */
+    @ApiModelProperty(value = "溯源性", dataType = "String")
     @TableField("traceability")
     private String traceability;
 
     /**
      * 测试方法
      */
+    @ApiModelProperty(value = "测试方法", dataType = "String")
     @TableField("test_method")
     private String testMethod;
 
     /**
      * 技术能力
      */
+    @ApiModelProperty(value = "技术能力", dataType = "String")
     @TableField("technique_ability")
     private String techniqueAbility;
 
     /**
      * 创建时间
      */
+    @ApiModelProperty(hidden = true)
     @TableField("create_time")
     private String createTime;
 
     /**
      * 更新时间
      */
+    @ApiModelProperty(hidden = true)
     @TableField("update_time")
     private String updateTime;
 
+    @ApiModelProperty(value = "审批状态类型-字典value", dataType = "String")
+    @TableField(exist = false)
+    private String approvalStatusName;
 
+    @ApiModelProperty(value = "任务id（同意、驳回等操作使用）", dataType = "String")
+    @TableField(exist = false)
+    private String taskId;
+
+    @ApiModelProperty(value = "可选决策项（1同意驳回拒绝 2同意驳回 3同意拒绝，用于待审批列表同意/驳回/拒绝按钮展示）", dataType = "Integer")
+    @TableField(exist = false)
+    private Integer decisionItem;
+
+    @NotEmpty(message = "受检设备信息不能为空")
+    @ApiModelProperty(value = "受检设备id列表（新建使用参数）", dataType = "List")
+    @TableField(exist = false)
+    private List<OrderSampleDTO> orderSampleList;
+
+    @ExcelProperty(value = "分包机构名称", order = 3)
+    @ApiModelProperty(value = "分包机构名称（列表返回参数）", dataType = "String")
+    private String outsourcerName;
+
+    @ExcelProperty(value = "机构负责人", order = 4)
+    @ApiModelProperty(value = "机构负责人（列表返回参数）", dataType = "String")
+    private String director;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceProtocol.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceProtocol.java
new file mode 100644
index 0000000..38df697
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceProtocol.java
@@ -0,0 +1,225 @@
+package com.casic.missiles.model.business;
+
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
+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 com.casic.missiles.dto.BaseRequest;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotEmpty;
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 计量检定业务-分包管理-测试、校准或检定工作分包协议书
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-08-24
+ */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
+@Data
+@TableName("biz_business_outsource_protocol")
+public class BizBusinessOutsourceProtocol extends BaseRequest implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "id，更新/删除使用参数", dataType = "Long")
+    @TableId("id")
+    private Long id;
+
+    /**
+     * 协议书编号
+     */
+    @ExcelProperty(value = "协议书编号", order = 1)
+    @ApiModelProperty(value = "协议书编号(后台生成)", dataType = "String")
+    @TableField("protocol_no")
+    private String protocolNo;
+
+    /**
+     * 协议书名称
+     */
+    @ExcelProperty(value = "协议书名称", order = 2)
+    @ApiModelProperty(value = "协议书名称", dataType = "String")
+    @TableField("project_name")
+    private String projectName;
+
+    @NotEmpty(message = "实验室代码不能为空")
+    @DictCodeField(message = "实验室代码描述不合法", cacheName = MeterDictCode.LAB_CODE)
+    @ApiModelProperty(value = "实验室代码(字典code)", dataType = "String")
+    @TableField("lab_code")
+    private String labCode;
+
+    @ApiModelProperty(value = "实验室代码(字典value)", dataType = "String")
+    @TableField(exist = false)
+    private String labCodeName;
+
+    @NotEmpty(message = "组别代码不能为空")
+    @DictCodeField(message = "组别代码描述不合法", cacheName = MeterDictCode.GROUP_CODE)
+    @ApiModelProperty(value = "组别代码(字典code)", dataType = "String")
+    @TableField("group_code")
+    private String groupCode;
+
+    @ApiModelProperty(value = "组别代码(字典value)", dataType = "String")
+    @TableField(exist = false)
+    private String groupCodeName;
+
+    /**
+     * 分包方id
+     */
+    @ApiModelProperty(value = "分包方id", dataType = "Long")
+    @TableField("outsourcer_id")
+    private Long outsourcerId;
+
+    /**
+     * 其他
+     */
+    @ApiModelProperty(value = "其他", dataType = "String")
+    @TableField("remark")
+    private String remark;
+
+    /**
+     * 分包方编号
+     */
+    @ApiModelProperty(value = "分包方编号(新建不用传)", dataType = "String")
+    @TableField("outsource_no")
+    private String outsourceNo;
+
+    /**
+     * 分包方名称
+     */
+    @ExcelProperty(value = "分包方名称", order = 3)
+    @ApiModelProperty(value = "分包方名称(新建不用传)", dataType = "String")
+    @TableField("outsource_name")
+    private String outsourceName;
+
+    /**
+     * 联系人
+     */
+    @ExcelProperty(value = "联系人", order = 4)
+    @ApiModelProperty(value = "联系人", dataType = "String")
+    @TableField("contacts")
+    private String contacts;
+
+    /**
+     * 电话
+     */
+    @ApiModelProperty(value = "电话", dataType = "String")
+    @TableField("mobile")
+    private String mobile;
+
+    /**
+     * 地址
+     */
+    @ApiModelProperty(value = "地址", dataType = "String")
+    @TableField("address")
+    private String address;
+
+    /**
+     * 要求完成日期
+     */
+    @ApiModelProperty(value = "要求完成日期", dataType = "String")
+    @TableField("require_date")
+    private String requireDate;
+
+    /**
+     * 分包费用(元)
+     */
+    @ApiModelProperty(value = "分包费用(元)", dataType = "String")
+    @TableField("outsource_cost")
+    private Double outsourceCost;
+
+    /**
+     * 分包方负责人
+     */
+    @ApiModelProperty(value = "分包方负责人", dataType = "String")
+    @TableField("director")
+    private String director;
+
+    /**
+     * 分包项目
+     */
+    @ApiModelProperty(value = "分包项目", dataType = "String")
+    @TableField("item")
+    private String item;
+
+    /**
+     * 分包要求
+     */
+    @ApiModelProperty(value = "分包要求", dataType = "String")
+    @TableField("requires")
+    private String requires;
+
+    /**
+     * 创建人id
+     */
+    @ApiModelProperty(hidden = true)
+    @TableField("create_user_id")
+    private Long createUserId;
+
+    /**
+     * 创建人名字
+     */
+    @ExcelProperty(value = "申请人", order = 5)
+    @ApiModelProperty(value = "申请人", dataType = "String")
+    @TableField("create_user_name")
+    private String createUserName;
+
+    /**
+     * 审批状态
+     */
+    @ApiModelProperty(value = "审批状态", dataType = "String")
+    @DictCodeField(message = "审批状态描述不合法", cacheName = MeterDictCode.APPROVAL_STATUS)
+    @TableField("approval_status")
+    private String approvalStatus;
+
+    /**
+     * 流程实例id
+     */
+    @ApiModelProperty(value = "流程实例id", dataType = "String")
+    @TableField("process_id")
+    private String processId;
+
+    /**
+     * 创建时间
+     */
+    @ExcelProperty(value = "申请时间", order = 6)
+    @ApiModelProperty(value = "申请时间", dataType = "String")
+    @TableField("create_time")
+    private String createTime;
+
+    /**
+     * 更新时间
+     */
+    @ApiModelProperty(hidden = true)
+    @TableField("update_time")
+    private String updateTime;
+
+    @ApiModelProperty(value = "审批状态类型-字典value", dataType = "String")
+    @TableField(exist = false)
+    private String approvalStatusName;
+
+    @ApiModelProperty(value = "任务id（同意、驳回等操作使用）", dataType = "String")
+    @TableField(exist = false)
+    private String taskId;
+
+    @ApiModelProperty(value = "可选决策项（1同意驳回拒绝 2同意驳回 3同意拒绝，用于待审批列表同意/驳回/拒绝按钮展示）", dataType = "Integer")
+    @TableField(exist = false)
+    private Integer decisionItem;
+
+
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourcerInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourcerInfo.java
index ec4e997..f9aa69e 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourcerInfo.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourcerInfo.java
@@ -17,6 +17,7 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import javax.validation.constraints.NotEmpty;
 import java.io.Serializable;
 
 /**
@@ -59,6 +60,29 @@
     @TableField("outsourcer_name")
     private String outsourcerName;
 
+    @NotEmpty(message = "实验室代码不能为空")
+    @DictCodeField(message = "实验室代码描述不合法", cacheName = MeterDictCode.LAB_CODE)
+    @ApiModelProperty(value = "实验室代码(字典code)", dataType = "String")
+    @TableField("lab_code")
+    private String labCode;
+
+    @ApiModelProperty(value = "实验室代码(字典value)", dataType = "String")
+    @TableField(exist = false)
+    private String labCodeName;
+
+    /**
+     * 组别代码
+     */
+    @NotEmpty(message = "组别代码不能为空")
+    @DictCodeField(message = "组别代码描述不合法", cacheName = MeterDictCode.GROUP_CODE)
+    @ApiModelProperty(value = "组别代码(字典code)", dataType = "String")
+    @TableField("group_code")
+    private String groupCode;
+
+    @ApiModelProperty(value = "组别代码(字典value)", dataType = "String")
+    @TableField(exist = false)
+    private String groupCodeName;
+
     /**
      * 单位简称
      */
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardInfo.java
index c48eed7..dffdfdd 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardInfo.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardInfo.java
@@ -5,6 +5,7 @@
 import com.baomidou.mybatisplus.annotation.TableName;
 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;
 
@@ -18,6 +19,7 @@
  * @author wangpeng
  * @since 2023-08-04
  */
+@ApiModel
 @Data
 @TableName("biz_equipment_standard_info")
 public class BizEquipmentStandardInfo implements Serializable {
@@ -119,7 +121,7 @@
      * 管理状态(字典code)
      */
     @ApiModelProperty(value = "管理状态(字典code)", dataType = "String")
-    @DictCodeField(message = "管理状态不合法", cacheName = MeterDictCode.MANAGER_STATE)
+    @DictCodeField(message = "管理状态不合法", cacheName = MeterDictCode.STANDARD_MANAGER_STATE)
     @TableField("manage_status")
     private String manageStatus;
 
@@ -151,7 +153,7 @@
     /**
      * 温度(℃)
      */
-    @ApiModelProperty(value = "使用状态(字典code)", dataType = "String")
+    @ApiModelProperty(value = "温度(℃)", dataType = "String")
     @TableField("temperature")
     private Double temperature;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardInfoApproval.java b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardInfoApproval.java
index dbd86ab..9f58d83 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardInfoApproval.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardInfoApproval.java
@@ -150,7 +150,7 @@
      * 管理状态(字典code)
      */
     @ApiModelProperty(value = "管理状态(字典code)", dataType = "String")
-    @DictCodeField(message = "管理状态不合法", cacheName = MeterDictCode.MANAGER_STATE)
+    @DictCodeField(message = "管理状态不合法", cacheName = MeterDictCode.STANDARD_MANAGER_STATE)
     @TableField("manage_status")
     private String manageStatus;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardTechnologyRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardTechnologyRelation.java
index 0e612bd..751f26b 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardTechnologyRelation.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardTechnologyRelation.java
@@ -3,6 +3,7 @@
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -16,6 +17,7 @@
  * @author wangpeng
  * @since 2023-08-04
  */
+@ApiModel
 @Data
 @TableName("biz_equipment_standard_technology_relation")
 public class BizEquipmentStandardTechnologyRelation implements Serializable {
@@ -33,6 +35,10 @@
     @TableField("technology_file_id")
     private Long technologyFileId;
 
+    @ApiModelProperty(value = "依据的技术文件编号", dataType = "String")
+    @TableField("technology_file_no")
+    private String technologyFileNo;
+
     /**
      * 依据的技术文件名称(技术文件中现行测试校准检定方法表文件名字段)
      */
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerInfo.java
index d6e8bed..65cd6bc 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerInfo.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerInfo.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.model.resource;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -21,6 +28,11 @@
  * @author wangpeng
  * @since 2023-08-08
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @ApiModel
 @Data
 @TableName("biz_resource_customer_info")
@@ -35,6 +47,7 @@
     /**
      * 委托方编号
      */
+    @ExcelProperty(value = "委托方编号", order = 1)
     @ApiModelProperty(value = "委托方编号", dataType = "String")
     @TableField("customer_no")
     private String customerNo;
@@ -42,6 +55,7 @@
     /**
      * 委托方名称
      */
+    @ExcelProperty(value = "委托方名称", order = 2)
     @ApiModelProperty(value = "委托方名称(新建时为下拉选择一个受检单位组织的名字，传deptId字段，后端获取名称)", dataType = "String")
     @TableField("customer_name")
     private String customerName;
@@ -63,6 +77,7 @@
     /**
      * 联系人
      */
+    @ExcelProperty(value = "联系人", order = 3)
     @ApiModelProperty(value = "联系人", dataType = "String")
     @TableField("contacts")
     private String contacts;
@@ -70,6 +85,7 @@
     /**
      * 座机电话
      */
+    @ExcelProperty(value = "座机电话", order = 4)
     @ApiModelProperty(value = "座机电话", dataType = "String")
     @TableField("mobile")
     private String mobile;
@@ -77,6 +93,7 @@
     /**
      * 手机号码
      */
+    @ExcelProperty(value = "手机号码", order = 5)
     @ApiModelProperty(value = "手机号码", dataType = "String")
     @TableField("phone")
     private String phone;
@@ -91,6 +108,7 @@
     /**
      * 地址
      */
+    @ExcelProperty(value = "地址", order = 6)
     @ApiModelProperty(value = "地址", dataType = "String")
     @TableField("address")
     private String address;
@@ -141,6 +159,7 @@
     /**
      * 创建时间
      */
+    @ExcelProperty(value = "创建时间", order = 7)
     @ApiModelProperty(value = "创建时间", dataType = "String")
     @TableField("create_time")
     private String createTime;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerSuggestForm.java b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerSuggestForm.java
index 7201bbd..701bf8b 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerSuggestForm.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerSuggestForm.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.model.resource;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -22,6 +29,11 @@
  * @author wangpeng
  * @since 2023-08-08
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @ApiModel
 @Data
 @TableName("biz_resource_customer_suggest_form")
@@ -44,7 +56,8 @@
     /**
      * 委托方名称
      */
-    @ApiModelProperty(value = "委托方名称", dataType = "String")
+    @ExcelProperty(value = "意见反馈单位", order = 2)
+    @ApiModelProperty(value = "意见反馈单位", dataType = "String")
     @TableField("customer_name")
     private String customerName;
 
@@ -59,7 +72,8 @@
     /**
      * 委托方意见反馈部门名称
      */
-    @ApiModelProperty(value = "委托方意见反馈部门名称", dataType = "String")
+    @ExcelProperty(value = "委托方意见反馈部门", order = 3)
+    @ApiModelProperty(value = "委托方意见反馈部门", dataType = "String")
     @TableField("customer_dept_name")
     private String customerDeptName;
 
@@ -73,6 +87,7 @@
     /**
      * 表单编号
      */
+    @ExcelProperty(value = "表单编号", order = 1)
     @ApiModelProperty(value = "表单编号", dataType = "String")
     @TableField("form_no")
     private String formNo;
@@ -111,6 +126,7 @@
     /**
      * 创建人名字
      */
+    @ExcelProperty(value = "创建人", order = 4)
     @ApiModelProperty(value = "创建人名字", dataType = "String")
     @TableField("create_user_name")
     private String createUserName;
@@ -147,6 +163,7 @@
     /**
      * 创建时间
      */
+    @ExcelProperty(value = "创建时间", order = 5)
     @ApiModelProperty(value = "创建时间", dataType = "String")
     @TableField("create_time")
     private String createTime;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSealInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSealInfo.java
index cbf05d7..9bf389d 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSealInfo.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSealInfo.java
@@ -106,6 +106,10 @@
     @TableField("minio_file_name")
     private String minioFileName;
 
+    @ApiModelProperty(value = "minio存储文件url", dataType = "String")
+    @TableField(exist = false)
+    private String minioFileUrl;
+
     @ApiModelProperty(value = "创建时间", dataType = "String")
     @TableField("create_time")
     private String createTime;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSealUseNote.java b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSealUseNote.java
index 3f2d9e8..3ce16a8 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSealUseNote.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSealUseNote.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.model.resource;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -20,6 +27,11 @@
  * @author wangpeng
  * @since 2023-07-28
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @ApiModel
 @Data
 @TableName("biz_resource_seal_use_note")
@@ -34,6 +46,7 @@
     /**
      * 登记表编号
      */
+    @ExcelProperty(value = "申请单编号", order = 1)
     @ApiModelProperty(value = "登记表编号(自动生成)", dataType = "String")
     @TableField("note_form_no")
     private String noteFormNo;
@@ -55,6 +68,7 @@
     /**
      * 申请部门
      */
+    @ExcelProperty(value = "申请部门", order = 5)
     @ApiModelProperty(value = "申请部门", dataType = "String")
     @TableField("apply_dept_name")
     private String applyDeptName;
@@ -69,6 +83,7 @@
     /**
      * 申请人
      */
+    @ExcelProperty(value = "申请人", order = 6)
     @ApiModelProperty(value = "申请人", dataType = "String")
     @TableField("apply_user_name")
     private String applyUserName;
@@ -76,6 +91,7 @@
     /**
      * 申请时间
      */
+    @ExcelProperty(value = "申请时间", order = 7)
     @ApiModelProperty(value = "申请时间(新增自动获取当前时间)", dataType = "String")
     @TableField("apply_time")
     private String applyTime;
@@ -130,6 +146,26 @@
     @TableField("update_time")
     private String updateTime;
 
+    @ExcelProperty(value = "印章名称", order = 2)
+    @ApiModelProperty(value = "印章名称(列表返回参数)", dataType = "String")
+    @TableField(exist = false)
+    private String sealName;
+
+    @DictCodeField(message = "印章类型描述不合法", cacheName = MeterDictCode.SEAL_TYPE)
+    @ApiModelProperty(hidden = true)
+    @TableField(exist = false)
+    private String sealType;
+
+    @ExcelProperty(value = "印章类型", order = 3)
+    @ApiModelProperty(value = "印章类型(列表返回参数)", dataType = "String")
+    @TableField(exist = false)
+    private String sealTypeName;
+
+    @ExcelProperty(value = "批准人", order = 4)
+    @ApiModelProperty(value = "批准人(列表返回参数)", dataType = "String")
+    @TableField(exist = false)
+    private String approverName;
+
     @ApiModelProperty(value = "审批状态类型-字典value", dataType = "String")
     @TableField(exist = false)
     private String approvalStatusName;

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java
index bb0c50f..13a699b 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java
@@ -12,6 +12,7 @@
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.IGeneralApprovalService;
+import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
@@ -19,6 +20,7 @@
 import org.springframework.web.bind.annotation.RequestBody;
 
 import javax.validation.Valid;
+import java.util.List;
 import java.util.Objects;
 
 /**
@@ -117,4 +119,17 @@
         }
         return baseApprovalService.failUpdate(request);
     }
+
+    public List<O> exportList(@RequestBody @Valid R request) throws Exception {
+        List<O> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = baseApprovalService.listExportByIds(request.getIds());
+        } else {
+            list = baseApprovalService.listExport(request);
+        }
+        for (O record : list) {
+            DictCodeUtils.convertDictCodeToName(record);
+        }
+        return list;
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java
index 8a90961..d775831 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java
@@ -5,6 +5,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.business.certificate.CertificateChangeApplyApprovalListRequest;
 import com.casic.missiles.dto.business.certificate.CertificateChangeApplySaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessCertificateChangeApply;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
@@ -20,6 +21,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -48,4 +50,12 @@
         }
         return changeApplyService.saveChangeApply(request);
     }
+
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody CertificateChangeApplyApprovalListRequest request) throws Exception {
+        List<BizBusinessCertificateChangeApply> list = super.exportList(request);
+        super.exportExcel(BizBusinessCertificateChangeApply.class, list, ExportEnum.CERTIFICATE_CHANGE_APPLY.getSheetName());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java
index 5fc4b07..af8230e 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java
@@ -9,6 +9,7 @@
 import com.casic.missiles.dto.business.certificate.CertificatePrintApprovalListRequest;
 import com.casic.missiles.dto.business.certificate.CertificatePrintListResponse;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.enums.business.CertificatePrintStatusEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessCertificatePrintLog;
@@ -18,10 +19,16 @@
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.io.IOException;
+import java.util.List;
 import java.util.Objects;
 
 /**
@@ -98,4 +105,16 @@
         });
         return certificatePrintService.certificatePrintLog(idDTO.getId());
     }
+
+    @ApiOperation("证书打印审批导出")
+    @PostMapping("/listExport")
+    public void exportList(@RequestBody CertificatePrintApprovalListRequest request) throws IOException {
+        List<CertificatePrintListResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = certificatePrintService.listByIds(request.getIds());
+        } else {
+            list = certificatePrintService.list(request);
+        }
+        super.exportExcel(CertificatePrintListResponse.class, list, ExportEnum.CERTIFICATE_PRINT.getSheetName());
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java
index 63b06dc..6b2efd5 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java
@@ -6,6 +6,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.business.certificate.CertificateReportApprovalListRequest;
 import com.casic.missiles.dto.business.certificate.CertificateReportSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessCertificateReport;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
@@ -21,6 +22,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -50,7 +52,7 @@
         return certificateReportService.saveCertificateReport(request);
     }
 
-    @ApiOperation("证书审批详情（基本信息）")
+    @ApiOperation("详情（基本信息）")
     @PostMapping("/detail")
     public ReturnDTO<BizBusinessCertificateReport> detail(@RequestBody @Valid BaseDetailRequest request, BindingResult bindingResult) throws Exception {
         if(bindingResult.hasErrors()){
@@ -59,4 +61,11 @@
         return certificateReportService.detail(request);
     }
 
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody CertificateReportApprovalListRequest request) throws Exception {
+        List<BizBusinessCertificateReport> list = super.exportList(request);
+        super.exportExcel(BizBusinessCertificateReport.class, list, ExportEnum.CERTIFICATE_REPORT.getSheetName());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java
index 46b26bd..57c0809 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java
@@ -10,20 +10,21 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.business.identify.IdentifyListRequest;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessIdentifyInfo;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.business.IBizBusinessIdentifyInfoService;
+import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import javax.validation.Valid;
+import java.util.List;
 import java.util.Objects;
 
 /**
@@ -57,16 +58,13 @@
         return identifyInfoService.addIdentify(identifyInfo);
     }
 
-    @ApiOperation("标识打印更新")
+    @ApiOperation("标识打印更新（更新打印时间）")
     @PostMapping("/update")
-    public ReturnDTO updateIdentify(@RequestBody @Valid BizBusinessIdentifyInfo identifyInfo, BindingResult bindingResult) {
-        Assert.isFalse(Objects.isNull(identifyInfo.getId()), () -> {
+    public ReturnDTO updateIdentify(@RequestBody @Valid IdDTO idDTO) {
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        Assert.isFalse(bindingResult.hasErrors(), () -> {
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        });
-        return identifyInfoService.updateIdentify(identifyInfo);
+        return identifyInfoService.updateIdentify(idDTO.getId());
     }
 
     @ApiOperation("标识打印删除")
@@ -77,4 +75,37 @@
         });
         return identifyInfoService.deleteIdentify(idDTO.getId());
     }
+
+    @ApiOperation("标识打印导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody @Valid IdentifyListRequest request, BindingResult bindingResult) throws Exception {
+        if (bindingResult.hasErrors()) {
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        List<BizBusinessIdentifyInfo> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = identifyInfoService.listByIds(request.getIds());
+        } else {
+            list = identifyInfoService.list(request);
+        }
+        for (BizBusinessIdentifyInfo record : list) {
+            DictCodeUtils.convertDictCodeToName(record);
+        }
+        super.exportExcel(BizBusinessIdentifyInfo.class, list, ExportEnum.IDENTIFY_EXPORT.getSheetName());
+    }
+
+
+    // TODO: 2023/8/23 查询设备信息，4个底部按钮查设备（按钮的作用就是前端用来调不同接口、用来区分中间即将展示的标识），前端弹窗选设备，在确定保存时前端根据底部按钮判断传入设备类型deviceType字典code
+    // TODO: 2023/8/23 接口：查受检设备（第1个按钮），查设备台账（后3个按钮同一接口），查询之后前端根据标志类型的不同加到中间页面时进行判断（按产品给的对应表）
+    // TODO: 2023/8/23 提供二维码接口，前端在加到中间页面时调用一下
+
+    @ApiOperation("设备二维码")
+    @PostMapping("/equipment/qrCode")
+    public ReturnDTO<String> equipmentQrCode(@RequestBody @Valid IdDTO idDTO) {
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return identifyInfoService.equipmentQrCode(idDTO.getId());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java
index 707be6e..7e0453d 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java
@@ -117,7 +117,7 @@
     }
 
     @ApiOperation("任务单导出")
-    @PostMapping("/export")
+    @PostMapping("/listExport")
     public void orderExport(@RequestBody @Valid OrderListRequest request, HttpServletResponse response) {
         businessOrderService.orderExport(request, response);
     }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java
index 529a6ce..51432be 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java
@@ -1,9 +1,28 @@
 package com.casic.missiles.controller.business;
 
+import com.casic.missiles.controller.GeneralApprovalController;
+import com.casic.missiles.dto.BaseApprovalSubmitRequest;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.business.outsource.OutsourceAssessApprovalListRequest;
+import com.casic.missiles.dto.business.outsource.OutsourceAssessSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
+import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.model.business.BizBusinessOutsourceAssess;
+import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
+import com.casic.missiles.service.IGeneralApprovalService;
+import com.casic.missiles.service.business.IBizBusinessOutsourceAssessService;
 import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.BindingResult;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.validation.Valid;
+import java.util.List;
+
 /**
  * <p>
  * 计量检定业务-分包管理-测试、校准或检定工作分包评审表 前端控制器
@@ -15,6 +34,27 @@
 @Api(tags = "分包管理-测试、校准或检定工作分包评审表")
 @RestController
 @RequestMapping("/business/outsource/assess")
-public class BizBusinessOutsourceAssessController {
+public class BizBusinessOutsourceAssessController extends GeneralApprovalController<BizBusinessOutsourceAssess, BizBusinessOutsourceAssess, OutsourceAssessApprovalListRequest, BaseApprovalSubmitRequest> {
+    @Autowired
+    private IBizBusinessOutsourceAssessService outsourceAssessService;
 
+    public BizBusinessOutsourceAssessController(IGeneralApprovalService<BizBusinessOutsourceAssess, BizBusinessOutsourceAssess, OutsourceAssessApprovalListRequest, BaseApprovalSubmitRequest> baseApprovalService) {
+        super(baseApprovalService);
+    }
+
+    @ApiOperation("草稿箱-保存")
+    @PostMapping("/save")
+    public ReturnDTO<OutsourceAssessSaveResponse> saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceAssess request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        return outsourceAssessService.saveOutsourceAssess(request);
+    }
+
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception {
+        List<BizBusinessOutsourceAssess> list = super.exportList(request);
+        super.exportExcel(BizBusinessOutsourceAssess.class, list, ExportEnum.OUTSOURCE_ASSESS.getSheetName());
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java
new file mode 100644
index 0000000..9adef18
--- /dev/null
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java
@@ -0,0 +1,60 @@
+package com.casic.missiles.controller.business;
+
+import com.casic.missiles.controller.GeneralApprovalController;
+import com.casic.missiles.dto.BaseApprovalSubmitRequest;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.business.outsource.OutsourceProtocolApprovalListRequest;
+import com.casic.missiles.dto.business.outsource.OutsourceProtocolSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
+import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.model.business.BizBusinessOutsourceProtocol;
+import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
+import com.casic.missiles.service.IGeneralApprovalService;
+import com.casic.missiles.service.business.IBizBusinessOutsourceProtocolService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.BindingResult;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.validation.Valid;
+import java.util.List;
+
+/**
+ * <p>
+ * 计量检定业务-分包管理-测试、校准或检定工作分包协议书 前端控制器
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-08-24
+ */
+@Api(tags = "分包管理-测试、校准或检定工作分包协议书")
+@RestController
+@RequestMapping("/business/outsource/protocol")
+public class BizBusinessOutsourceProtocolController extends GeneralApprovalController<BizBusinessOutsourceProtocol, BizBusinessOutsourceProtocol, OutsourceProtocolApprovalListRequest, BaseApprovalSubmitRequest> {
+    @Autowired
+    private IBizBusinessOutsourceProtocolService outsourceProtocolService;
+
+    public BizBusinessOutsourceProtocolController(IGeneralApprovalService<BizBusinessOutsourceProtocol, BizBusinessOutsourceProtocol, OutsourceProtocolApprovalListRequest, BaseApprovalSubmitRequest> baseApprovalService) {
+        super(baseApprovalService);
+    }
+
+    @ApiOperation("草稿箱-保存")
+    @PostMapping("/save")
+    public ReturnDTO<OutsourceProtocolSaveResponse> saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceProtocol request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        return outsourceProtocolService.saveOutsourceProtocol(request);
+    }
+
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody OutsourceProtocolApprovalListRequest request) throws Exception {
+        List<BizBusinessOutsourceProtocol> list = super.exportList(request);
+        super.exportExcel(BizBusinessOutsourceProtocol.class, list, ExportEnum.OUTSOURCE_PROTOCOL.getSheetName());
+    }
+}
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java
index 097f645..f0f0943 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java
@@ -17,7 +17,6 @@
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.IGeneralApprovalService;
 import com.casic.missiles.service.business.IBizBusinessOutsourcerInfoService;
-import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -71,19 +70,8 @@
 
     @ApiOperation("分包方导出")
     @PostMapping("/listExport")
-    public void export(@RequestBody @Valid OutsourcerInfoApprovalListRequest request, BindingResult bindingResult) throws Exception {
-        if (bindingResult.hasErrors()) {
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        }
-        List<BizBusinessOutsourcerInfo> list;
-        if (!CollectionUtils.isEmpty(request.getIds())) {
-            list = outsourcerInfoService.listByIds(request.getIds());
-        } else {
-            list = outsourcerInfoService.list(request);
-        }
-        for (BizBusinessOutsourcerInfo record : list) {
-            DictCodeUtils.convertDictCodeToName(record);
-        }
+    public void export(@RequestBody OutsourcerInfoApprovalListRequest request) throws Exception {
+        List<BizBusinessOutsourcerInfo> list = super.exportList(request);
         super.exportExcel(BizBusinessOutsourcerInfo.class, list, ExportEnum.OUTSOURCER_EXPORT.getSheetName());
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java
index c2cbf9f..0410918 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java
@@ -17,11 +17,9 @@
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.IGeneralApprovalService;
 import com.casic.missiles.service.business.IBizBusinessSiteExecutiveInfoService;
-import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -60,7 +58,7 @@
         return siteExecutiveInfoService.saveSiteExecutiveInfo(siteExecutiveInfo);
     }
 
-    @ApiOperation("现场检测详情")
+    @ApiOperation("详情")
     @PostMapping("/detail")
     public ReturnDTO<SiteExecutiveDetailResponse> siteExecutiveDetail(@RequestBody @Valid IdDTO idDTO) throws Exception {
         Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
@@ -69,21 +67,10 @@
         return ReturnUtil.success(siteExecutiveInfoService.detail(idDTO.getId()));
     }
 
-    @ApiOperation("现场检测导出")
+    @ApiOperation("导出")
     @PostMapping("/listExport")
-    public void export(@RequestBody @Valid SiteExecutiveApprovalListRequest request, BindingResult bindingResult) throws Exception {
-        if (bindingResult.hasErrors()) {
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        }
-        List<SiteExecutiveApprovalListResponse> list;
-        if (!CollectionUtils.isEmpty(request.getIds())) {
-            list = siteExecutiveInfoService.listInfoByIds(request.getIds());
-        } else {
-            list = siteExecutiveInfoService.listInfo(request);
-        }
-        for (SiteExecutiveApprovalListResponse record : list) {
-            DictCodeUtils.convertDictCodeToName(record);
-        }
+    public void export(@RequestBody SiteExecutiveApprovalListRequest request) throws Exception {
+        List<SiteExecutiveApprovalListResponse> list = super.exportList(request);
         super.exportExcel(SiteExecutiveApprovalListResponse.class, list, ExportEnum.SITE_EXECUTIVE_EXPORT.getSheetName());
     }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
index 7e793cd..a92e209 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
@@ -55,7 +55,7 @@
 
     @ApiOperation("设备收发列表导出")
     @PostMapping("/export")
-    public void exportList(@RequestBody @Valid SampleDispatchListRequest request) throws IOException {
+    public void exportList(@RequestBody SampleDispatchListRequest request) throws IOException {
         List<SampleDispatchListResponse> list;
         if (!CollectionUtils.isEmpty(request.getIds())) {
             list = dispatchService.listByIds(request.getIds());
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java
index cdc77fc..d120fd4 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java
@@ -7,6 +7,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.business.labExecutive.*;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.business.IBusinessLabExecutiveInfoService;
@@ -14,6 +15,7 @@
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.*;
 
@@ -32,7 +34,7 @@
     @Autowired
     private IBusinessLabExecutiveInfoService labExecutiveInfoService;
 
-    @ApiOperation("实验室检测-部门检测-查询各状态列表（待检测、检测中、检测完）")
+    @ApiOperation("实验室任务-查询各状态列表（待检测、检测中、检测完）")
     @PostMapping("/deptExecutive/List")
     public ReturnDTO<PageInfoBT<SampleLabExecutiveListResponse>> queryDeptExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
@@ -43,10 +45,19 @@
         return ReturnUtil.success(super.packForBT(labExecutiveInfoService.deptLabExecutiveListPage(page, labExecutiveListRequest)));
     }
 
-    /**
-     * 实验室检测-我的检测-查询各状态列表（待检测、检测中、检测完）
-     */
-    @ApiOperation("实验室检测-我的检测-查询各状态列表（待检测、检测中、检测完）")
+    @ApiOperation("实验室任务导出")
+    @PostMapping("/deptExecutive/export")
+    public void deptExportList(@RequestBody @Valid SampleLabExecutiveListRequest request) throws Exception {
+        List<SampleLabExecutiveListResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = labExecutiveInfoService.deptLabExecutiveListByIds(request.getMeasureStatus(), request.getIds());
+        } else {
+            list = labExecutiveInfoService.deptLabExecutiveList(request);
+        }
+        super.exportExcel(SampleLabExecutiveListResponse.class, list, ExportEnum.DEPT_EXECUTIVE_TASK.getSheetName());
+    }
+
+    @ApiOperation("我的任务-查询各状态列表（待检测、检测中、检测完）")
     @PostMapping("/myExecutive/list")
     public ReturnDTO<PageInfoBT<SampleLabExecutiveListResponse>> queryMyExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
@@ -57,19 +68,25 @@
         return ReturnUtil.success(super.packForBT(labExecutiveInfoService.myLabExecutiveListPage(page, labExecutiveListRequest)));
     }
 
-    /**
-     * 实验室检测-我的检测-查询各状态样品数量（待检测、检测中、检测完）
-     */
-    @ApiOperation("实验室检测-我的检测-查询各状态样品数量（待检测、检测中、检测完）")
+    @ApiOperation("我的任务导出")
+    @PostMapping("/myExecutive/export")
+    public void exportList(@RequestBody @Valid SampleLabExecutiveListRequest request) throws Exception {
+        List<SampleLabExecutiveListResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = labExecutiveInfoService.myLabExecutiveListByIds(request.getMeasureStatus(), request.getIds());
+        } else {
+            list = labExecutiveInfoService.myLabExecutiveList(request);
+        }
+        super.exportExcel(SampleLabExecutiveListResponse.class, list, ExportEnum.MY_EXECUTIVE_TASK.getSheetName());
+    }
+
+    @ApiOperation("我的任务-查询各状态样品数量（待检测、检测中、检测完）")
     @GetMapping("/myExecutive/amount")
     public ReturnDTO<List<SampleAmountResponse>> queryMyExecutiveAmount() {
         return ReturnUtil.success(labExecutiveInfoService.myExecutiveAmount());
     }
 
-    /**
-     * 实验室检测-部门检测-分配（分配给具体人员）
-     */
-    @ApiOperation("实验室检测-部门检测-分配按钮（分配给具体人员）")
+    @ApiOperation("实验室任务-分配按钮（分配给具体人员）")
     @PostMapping("/deptExecutive/allocate")
     public ReturnDTO allocateStaff(@RequestBody @Valid SampleAllocateRequest sampleAllocateRequest, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -78,10 +95,7 @@
         return labExecutiveInfoService.allocateStaff(sampleAllocateRequest);
     }
 
-    /**
-     * 实验室检测-我的检测-检定人扫描收入（待检测->检测中）
-     */
-    @ApiOperation("实验室检测-我的检测-检定人扫描收入（待检测->检测中）")
+    @ApiOperation("我的任务-检定人扫描收入（待检测->检测中）")
     @PostMapping("/myExecutive/receive")
     public ReturnDTO sampleReceive(@RequestBody @Valid List<SampleOperateRequest> requestList, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -90,10 +104,7 @@
         return labExecutiveInfoService.sampleReceive(requestList);
     }
 
-    /**
-     * 实验室检测-负责人/检定人扫描检完（检测中->检测完）
-     */
-    @ApiOperation("实验室检测-负责人/检定人扫描检完（检测中->检测完）")
+    @ApiOperation("实验室任务-负责人/检定人扫描检完（检测中->检测完）")
     @PostMapping("/myExecutive/complete")
     public ReturnDTO sampleExecutiveComplete(@RequestBody @Valid List<SampleOperateRequest> requestList, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -102,10 +113,7 @@
         return labExecutiveInfoService.sampleExecutiveComplete(requestList);
     }
 
-    /**
-     * 实验室检测-部门检测/我的检测 编辑（只能修改应出具证书）
-     */
-    @ApiOperation("实验室检测-部门检测/我的检测 编辑（只能修改应出具证书）")
+    @ApiOperation("实验室任务/我的任务 编辑（只能修改应出具证书）")
     @PostMapping("/executive/update")
     public ReturnDTO updateExecutive(@RequestBody @Valid UpdateExecutiveRequest request, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -114,10 +122,7 @@
         return labExecutiveInfoService.updateExecutive(request);
     }
 
-    /**
-     * 实验室检测-部门检测/我的检测 详情
-     */
-    @ApiOperation("实验室检测-部门检测/我的检测 详情")
+    @ApiOperation("实验室任务/我的任务 详情")
     @PostMapping("/executive/detail")
     public ReturnDTO<ExecutiveDetailResponse> executiveDetail(@RequestBody @Valid ExecutiveDetailRequest request, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
@@ -131,7 +136,7 @@
      * 退回后会将下一个要执行的实验室检测状态更新为待分配，将后面的实验室顺序变更为连续（都进行减1）
      * 最后一个检测的实验室退回，等分发员再增加实验室或设备收发中的已收入直接手动点击完成
      */
-    @ApiOperation("实验室检测-部门检测/我的检测 退回（待检测/检测中->退回）")
+    @ApiOperation("实验室任务/我的任务 退回（待检测/检测中->退回）")
     @PostMapping("/executive/sendBack")
     public ReturnDTO executiveSendBack(@RequestBody @Valid ExecutiveSendBackRequest request, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -140,9 +145,6 @@
         return labExecutiveInfoService.sampleExecutiveSendBack(request);
     }
 
-    /**
-     * 分发员编辑实验室检测列表
-     */
     @ApiOperation("分发员编辑实验室检测列表")
     @PostMapping("/handOut/updateList")
     public ReturnDTO updateExecutiveList(@RequestBody @Valid UpdateExecutiveListRequest request, BindingResult bindingResult) {
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java
index 48a67ed..0c04f31 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java
@@ -10,6 +10,7 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.resource.customer.CustomerApprovalListRequest;
 import com.casic.missiles.dto.resource.customer.CustomerSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceCustomerInfo;
@@ -26,6 +27,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -55,6 +57,13 @@
         return customerInfoService.saveCustomerInfo(request);
     }
 
+    @ApiOperation("委托方名录导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody CustomerApprovalListRequest request) throws Exception {
+        List<BizResourceCustomerInfo> list = super.exportList(request);
+        super.exportExcel(BizResourceCustomerInfo.class, list, ExportEnum.CUSTOMER_INFO.getSheetName());
+    }
+
     @ApiOperation("委托方人员列表（分页）")
     @PostMapping("/person/listPage")
     public ReturnDTO<PageInfoBT<BizResourceCustomerStaff>> personListPage(@RequestBody IdDTO idDto) {
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
index 972ed4b..6418ea5 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
@@ -5,6 +5,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.resource.customer.SuggestFormApprovalListRequest;
 import com.casic.missiles.dto.resource.customer.SuggestFormSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceCustomerSuggestForm;
@@ -20,6 +21,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -50,4 +52,11 @@
         return suggestFormService.saveSuggestForm(request);
     }
 
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody SuggestFormApprovalListRequest request) throws Exception {
+        List<BizResourceCustomerSuggestForm> list = super.exportList(request);
+        super.exportExcel(BizResourceCustomerSuggestForm.class, list, ExportEnum.CUSTOMER_SUGGEST_FORM.getSheetName());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java
index 1934d1a..9e07eab 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java
@@ -15,12 +15,16 @@
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.resource.IEnvEnvironmentRecordConfigService;
 import com.casic.missiles.service.resource.IEnvEnvironmentRecordDataService;
+import com.casic.missiles.service.resource.IEnvLocationInfoService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
 import java.util.List;
@@ -39,6 +43,8 @@
     private IEnvEnvironmentRecordDataService environmentRecordDataService;
     @Autowired
     private IEnvEnvironmentRecordConfigService environmentRecordConfigService;
+    @Autowired
+    private IEnvLocationInfoService locationInfoService;
 
     @ApiOperation("环境记录单数据列表/详情")
     @PostMapping("/data/listPage")
@@ -95,4 +101,11 @@
         });
         return environmentRecordConfigService.deleteEnvironmentRecordConfig(idDTO.getId());
     }
+
+    @ApiOperation("地点列表")
+    @PostMapping("/location/listPage")
+    public ReturnDTO<PageInfoBT<LocationListResponse>> locationListPage(@RequestBody @Valid LocationListRequest request) {
+        Page<LocationListResponse> page = PageFactory.defaultPage();
+        return ReturnUtil.success(super.packForBT(locationInfoService.listPage(page, request)));
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java
index 82efe3f..e9561fa 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java
@@ -10,6 +10,7 @@
 import com.casic.missiles.dto.resource.seal.SealLogListRequest;
 import com.casic.missiles.dto.resource.seal.SealNoteApprovalListRequest;
 import com.casic.missiles.dto.resource.seal.SealNoteSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceSealUseLog;
@@ -27,6 +28,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -58,6 +60,13 @@
         return sealUseNoteService.saveSeal(request);
     }
 
+    @ApiOperation("印章使用登记导出（列表和导出中去掉经办人和监印人）")
+    @PostMapping("/listExport")
+    public void export(@RequestBody SealNoteApprovalListRequest request) throws Exception {
+        List<BizResourceSealUseNote> list = super.exportList(request);
+        super.exportExcel(BizResourceSealUseNote.class, list, ExportEnum.SEAL_NOTE.getSheetName());
+    }
+
     // TODO: 2023/7/28 印章使用日志：系统中使用印章时插入数据库
 
     @ApiOperation("印章使用日志列表（分页）")
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java
index 9b674fc..06b6521 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java
@@ -9,16 +9,20 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.resource.staff.StaffCertRequest;
 import com.casic.missiles.dto.resource.staff.StaffCertResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.service.resource.IBizResourceStaffInfoService;
 import com.casic.missiles.service.resource.IBizResourceStaffVerifierService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.List;
+
 /**
  * @Description:
  * @Author: wangpeng
@@ -41,9 +45,21 @@
         return ReturnUtil.success(super.packForBT(responsePage));
     }
 
+    @ApiOperation("证书逾期提醒导出")
+    @PostMapping("/listExport")
+    public void exportList(@RequestBody StaffCertRequest request) throws Exception {
+        List<StaffCertResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = staffInfoService.certListByIds(request.getIds());
+        } else {
+            list = staffInfoService.certList(request);
+        }
+        super.exportExcel(StaffCertResponse.class, list, ExportEnum.STAFF_CERTIFICATE_EXPIRE.getSheetName());
+    }
+
     @ApiOperation("证书逾期提醒")
     @PostMapping("/expirationReminder")
-    public ReturnDTO expirationReminder(@RequestBody IdDTO idDto) {
-        return verifierService.expirationReminder(idDto);
+    public ReturnDTO expirationReminder(@RequestBody IdDTO idDTO) {
+        return verifierService.expirationReminder(idDTO);
     }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java
index 3b251ad..a6e7850 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java
@@ -12,6 +12,7 @@
 import com.casic.missiles.dto.resource.staff.StaffListRequest;
 import com.casic.missiles.dto.resource.staff.TrainListRequest;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.*;
@@ -22,7 +23,10 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
 import java.util.List;
@@ -52,8 +56,19 @@
             throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
         }
         Page<BizResourceStaffInfo> page = PageFactory.defaultPage();
-        Page<BizResourceStaffInfo> responsePage = staffInfoService.listPage(page, request);
-        return ReturnUtil.success(super.packForBT(responsePage));
+        return ReturnUtil.success(super.packForBT(staffInfoService.listPage(page, request)));
+    }
+
+    @ApiOperation("人员登记导出")
+    @PostMapping("/listExport")
+    public void exportList(@RequestBody StaffListRequest request) throws Exception {
+        List<BizResourceStaffInfo> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = staffInfoService.listByIds(request.getIds());
+        } else {
+            list = staffInfoService.list(request);
+        }
+        super.exportExcel(BizResourceStaffInfo.class, list, ExportEnum.STAFF_INFO.getSheetName());
     }
 
     @ApiOperation("人员登记详情基础信息")
@@ -85,9 +100,9 @@
 
     @ApiOperation("科研教育列表（分页）")
     @PostMapping("/education/listPage")
-    public ReturnDTO<PageInfoBT<BizResourceStaffEducation>> educationListPage(@RequestBody IdDTO idDto) {
+    public ReturnDTO<PageInfoBT<BizResourceStaffEducation>> educationListPage(@RequestBody IdDTO idDTO) {
         Page<BizResourceStaffEducation> page = PageFactory.defaultPage();
-        Page<BizResourceStaffEducation> responsePage = staffInfoService.educationListPage(page, idDto);
+        Page<BizResourceStaffEducation> responsePage = staffInfoService.educationListPage(page, idDTO);
         return ReturnUtil.success(super.packForBT(responsePage));
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java
index af6aa86..d85d84a 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java
@@ -9,6 +9,7 @@
 import com.casic.missiles.dto.resource.outsideService.SupplierApprovalListRequest;
 import com.casic.missiles.dto.resource.outsideService.SupplierSaveResponse;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceSupplierAbility;
@@ -67,6 +68,13 @@
         return ReturnUtil.success(supplierInfoService.detail(idDTO.getId()));
     }
 
+    @ApiOperation("合格供方导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody SupplierApprovalListRequest request) throws Exception {
+        List<BizResourceSupplierInfo> list = super.exportList(request);
+        super.exportExcel(BizResourceSupplierInfo.class, list, ExportEnum.SUPPLIER_INFO.getSheetName());
+    }
+
     @ApiOperation("供方人员列表（分页）")
     @PostMapping("/person/listPage")
     public ReturnDTO<PageInfoBT<BizResourceSupplierPerson>> personListPage(@RequestBody IdDTO idDTO) {
diff --git a/casic-metering-api/src/main/resources/config/application.yml b/casic-metering-api/src/main/resources/config/application.yml
index 350db5f..ecff521 100644
--- a/casic-metering-api/src/main/resources/config/application.yml
+++ b/casic-metering-api/src/main/resources/config/application.yml
@@ -126,7 +126,7 @@
     #作者
     author: wangpeng
     #待生成对象表名
-    table-name: biz_equipment_technical_target_approval,biz_equipment_attachment_approval,biz_equipment_checkpoint_approval
+    table-name: biz_business_outsource_protocol
 
 reminder:
   #节点--common模块config包 ReminderNodeConfig配置
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
index 4a19e4e..d47d552 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
@@ -53,6 +53,7 @@
     SUGGEST_FORM_SAVE_FAILED(2509, "委托方意见登记表保存至草稿箱失败"),
     EXAMINE_FORM_SAVE_FAILED(2510, "要求、委托书及合同评审表保存至草稿箱失败"),
     CUSTOMER_EXIST_SAVE_FAILED(2511, "该委托方已存在，请重新选择"),
+    DUPLICATE_LOCATION_NO(2512, "地点编号已存在"),
 
     /**
      * 计量检定业务模块
@@ -68,6 +69,8 @@
     COMPLETE_SAMPLE_NOT_EXIST(2609, "检测中不存在扫描收入的样品"),
     CANNOT_CHANGE_MEASURE_INFO(2610, "无法更改非当前登录用户的检测信息"),
     NON_EXIST_ORDER_OR_SAMPLE(2611, "不存在该委托单或该委托单下的样品"),
+    OUTSOURCE_ACCESS_SAVE_FAILED(2612, "测试、校准或检定工作分包评审表保存至草稿箱失败"),
+    OUTSOURCE_PROTOCOL_SAVE_FAILED(2613, "测试、校准或检定工作分包协议书保存至草稿箱失败"),
 
     /**
      * 历史遗留备用
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
index 5089ad1..81a406b 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
@@ -10,54 +10,38 @@
     /**
      * 资源管理
      */
-    ENVIRONMENT_DATA_EXPORT("environmentData", "environmentData", "环境记录单数据"),
+    ENVIRONMENT_DATA_EXPORT("environmentData", "环境记录单数据", "环境记录单数据"),
+    STAFF_INFO("staffInfo", "人员登记", "人员登记"),
+    STAFF_CERTIFICATE_EXPIRE("certificateExpire", "证书逾期提醒", "证书逾期提醒"),
+    SUPPLIER_INFO("supplierInfo", "合格供方名录", "合格供方名录"),
+    CUSTOMER_INFO("customerInfo", "委托方名录", "委托方名录"),
+    CUSTOMER_SUGGEST_FORM("customerSuggestForm", "委托方意见登记表", "委托方意见登记表"),
+    SEAL_NOTE("sealNote", "印章使用登记", "印章使用登记"),
 
-    FILE_EXPORT("meterFileData", "meterFileData", "计量文件信息"),
-    TRAIN_PLAN_EXPORT("trainPlanData", "trainPlanData", "培训计划"),
-    TRAIN_LOG_EXPORT("trainLogData", "trainLogData", "培训记录"),
-    METER_ORGANIZE_EXPORT("meterOrganizeData", "meterOrganizeData", "计量组织"),
-    TRACE_SUPPLIER_EXPORT("traceSupplierData", "traceSupplierData", "溯源供方"),
-    SIGN_EXPORT("signData", "signData", "签名/签章"),
-    TEMPLATE_EXPORT("templateData", "templateData", "原始记录模板/证书报告模板"),
-    FIXED_ASSETS("meterFixedAssets", "meterFixedAssets", "固定资产"),
-    METER_EQUIPMENT("meterEquipment", "meterEquipment", "测量设备"),
-    CALIBRATION_TEST_EQUIPMENT("calibrationTestEquipment", "calibrationTestEquipment", "校准检定设备"),
-    MEASURE_ACCOUNT("measureAccount", "measureAccount", "测量工装"),
-    STANDARD_SUPPORT_EQUIPMENT("standardSupportEquipment", "standardSupportEquipment", "标准配套设备"),
-    STANDARD_EQUIPMENT("standardEquipment", "standardEquipment", "标准装置"),
-    FLOW_DEF_EXPORT("flowDefData", "flowDefData", "流程定义"),
-    STAFF_CERTIFICATE("certificate", "certificate", "计量人员证书"),
-    CHECK_INFO("checkInfo", "checkInfo", "设备管理点检测"),
-    EQUIPMENT_APPLY("equipmentApply", "equipmentApply", "设备借用"),
-    STANDARD_EQUIPMENT_REMIND("equipmentApplyRemind", "equipmentApplyRemind", "标准装置到期提醒"),
-    METER_PRICE("meterPrice", "meterPrice", "价格库"),
-    METER_STAFF("meterStaff", "meterStaff", "计量人员"),
-    STANDARD_EQUIPMENT_APPLY("standardEquipmentApply", "standardEquipmentApply", "标准装置申请"),
-    STATE_MANAGE_APPLY("stateManage", "stateManage", "状态管理"),
-    METER_ACCEPTANCE_CHECK("acceptanceCheck", "acceptanceCheck", "设备检修保养验收单"),
-    CUSTOMER_EXPORT("customerData", "customerData", "客户信息"),
-    ORDER_EXPORT("orderData", "orderData", "委托书信息"),
-    SAMPLE_EXPORT("sampleData", "sampleData", "样本信息"),
-    EXCHANGE_DATA("exchangeData", "exchangeData", "设备交接单"),
-    DISPATCH_DATA("dispatchData", "dispatchData", "设备收发"),
-    ENVIRONMENT_DATA("environmentData", "environmentData", "环境记录单"),
-    ORIGIN_DATA("originData", "originData", "原始记录"),
-    CERTIFICATE_REPORT("certificateReport", "certificateReport", "证书报告"),
-    ADVICE_EXPORT("adviceData", "adviceData", "客户反馈"),
-    HANDOUT_EXPORT("handoutData", "handoutData", "任务分发列表"),
-    OUTSOURCER_EXPORT("outsourcerData", "outsourcerData", "分包方"),
-    SITE_EXECUTIVE_EXPORT("siteExecutiveData", "siteExecutiveData", "现场测试、校准或检定"),
-    CERTIFICATE_PRINT_EXPORT("certificatePrintData", "certificatePrintData", "证书打印"),
-    DOWNLOAD_TEMPLATE("downloadTemplate", "downloadTemplate", "页面配置"),
-    OUTSOURCER_CERTIFICATE_EXPORT("outsourceCertificateData", "outsourceCertificateData", "分包证书"),
-    SETTLEMENT_INFO_EXPORT("settlementInfoData", "settlementInfoData", "业务结算"),
-    EQUIPMENT_REMIND("equipmentRemind", "equipmentRemind", "设备到期提醒"),
-    AGREEMENT_INFO_EXPORT("agreementInfoData", "agreementInfoData", "合同"),
-    WORK_STATISTICS_EXPORT("workStatisticsData", "workStatisticsData", "实时工作统计"),
-    DEPT_OUTPUT_EXPORT("deptOutputData", "deptOutputData", "部门产值分析"),
-    WORKLOAD_EXPORT("workloadData", "workloadData", "业务工作量分析"),
-    DEPT_COMPREHENSIVE_EXPORT("deptComprehensiveData", "deptComprehensiveData", "部门综合分析"),
-    ENVIRONMENTAL_RECORD("environmentalRecordData", "environmentalRecordData", "现场环境记录");
+    /**
+     * 计量检定业务
+     */
+    OUTSOURCER_EXPORT("outsourcerData", "分包方名录", "分包方名录"),
+    IDENTIFY_EXPORT("identifyData", "计量标识", "计量标识"),
+    ORDER_EXPORT("orderData", "任务单", "任务单"),
+    DISPATCH_DATA("dispatchData", "设备收发", "设备收发"),
+    HANDOUT_EXPORT("handoutData", "任务分发", "任务分发"),
+    SITE_EXECUTIVE_EXPORT("siteExecutiveData", "现场测试、校准或检定", "现场测试、校准或检定"),
+    CERTIFICATE_REPORT("certificateReport", "证书审批", "证书审批"),
+    CERTIFICATE_CHANGE_APPLY("certificateChangeApply", "证书报告补充或更换申请单", "证书报告补充或更换申请单"),
+    CERTIFICATE_PRINT("certificatePrintData", "证书打印审批", "证书打印审批"),
+    DEPT_EXECUTIVE_TASK("deptExecutiveTaskData", "实验室任务", "实验室任务"),
+    MY_EXECUTIVE_TASK("myExecutiveTaskData", "我的任务", "我的任务"),
+    OUTSOURCE_ASSESS("outsourceAssess", "测试、校准或检定工作分包评审表", "测试、校准或检定工作分包评审表"),
+    OUTSOURCE_PROTOCOL("outsourceProtocol", "测试、校准或检定工作分包协议书", "测试、校准或检定工作分包协议书"),
+
+    /**
+     * 系统管理
+     */
+    SIGN_EXPORT("signData", "签名", "签名"),
+    TEMPLATE_EXPORT("templateData", "文件模板", "文件模板"),
+    FLOW_DEF_EXPORT("flowDefData", "流程定义", "流程定义"),
+    DOWNLOAD_TEMPLATE("downloadTemplate", "流程定义", "页面配置");
 
     ExportEnum(String fileName, String sheetName, String description) {
         this.fileName = fileName;
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateRecordTypeCodeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateRecordTypeCodeEnum.java
index 31d913c..a963522 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateRecordTypeCodeEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateRecordTypeCodeEnum.java
@@ -46,4 +46,14 @@
     String SITE_EXECUTIVE_APPROVAL = "01";
     //《现场测试、校准或检定工作记录表》
     String SITE_EXECUTIVE_LOG = "02";
+
+    //测试、校准或检定工作分包协议书
+    String OUTSOURCE_PROTOCOL = "01";
+    //测试、校准或检定工作分包评审表
+    String OUTSOURCE_ACCESS = "02";
+    //测试、校准或检定工作分包通知书
+    String OUTSOURCE_NOTICE = "03";
+    //测试、校准或检定工作分包方名录
+    String OUTSOURCE_INFO = "04";
+
 }
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
index 24b8635..f78bd53 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
@@ -15,6 +15,10 @@
     String CERTIFICATE_CHANGE_APPLY_BEAN_NAME = "certificateChangeApplyBean";
     //现场测试、校准或检定
     String SITE_EXECUTIVE_BEAN_NAME = "siteExecutiveBean";
+    //测试、校准或检定工作分包评审表
+    String OUTSOURCE_ASSESS_BEAN_NAME = "outsourceAssessBean";
+    //测试、校准或检定工作分包协议书
+    String OUTSOURCE_PROTOCOL_BEAN_NAME = "outsourceProtocolBean";
 
     /*********************************设备与装置************************************/
     //设备台账
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 b21c661..6b86fd1 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
@@ -18,6 +18,8 @@
     OUTSOURCER_APPROVAL(OUTSOURCER_BEAN_NAME, ""),
     CERTIFICATE_CHANGE_APPROVAL(CERTIFICATE_CHANGE_APPLY_BEAN_NAME, ""),
     SITE_EXECUTIVE_APPROVAL(SITE_EXECUTIVE_BEAN_NAME, ""),
+    OUTSOURCE_ASSESS_APPROVAL(OUTSOURCE_ASSESS_BEAN_NAME, ""),
+    OUTSOURCE_PROTOCOL_APPROVAL(OUTSOURCE_PROTOCOL_BEAN_NAME, ""),
 
     ACTION_STATUS_MAP(new HashMap<String, AwareActionStatusEnum>() {
         {
@@ -47,6 +49,10 @@
             put(ApplyFromIdEnum.CERTIFICATE_CHANGE_APPROVAL.getCode(), CERTIFICATE_CHANGE_APPROVAL);
             //现场测试、校准或检定审批
             put(ApplyFromIdEnum.SITE_EXECUTIVE_APPROVAL.getCode(), SITE_EXECUTIVE_APPROVAL);
+            //测试、校准或检定工作分包评审表
+            put(ApplyFromIdEnum.OUTSOURCE_ASSESS_APPROVAL.getCode(), OUTSOURCE_ASSESS_APPROVAL);
+            //测试、校准或检定工作分包协议书
+            put(ApplyFromIdEnum.OUTSOURCE_PROTOCOL_APPROVAL.getCode(), OUTSOURCE_PROTOCOL_APPROVAL);
         }
     });
     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 934405e..c7410bd 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
@@ -9,6 +9,8 @@
     CERTIFICATE_CHANGE_APPROVAL("jljdywzsbchghsqd", MessageSourceModuleEnum.BUSINESS.getCode(), "证书/报告补充或更换申请单"),
     OUTSOURCER_APPROVAL("jljdywcsjzhgfbfml", MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定合格分包方名录"),
     SITE_EXECUTIVE_APPROVAL("jljdywxccsjzsp", MessageSourceModuleEnum.BUSINESS.getCode(), "现场测试、校准或检定审批"),
+    OUTSOURCE_ASSESS_APPROVAL("jljdywcsjzfbpsb", MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包评审表"),
+    OUTSOURCE_PROTOCOL_APPROVAL("jljdywcsjzfbxys", MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包协议书"),
 
 
     /*******************************************设备与装置*********************************************/
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/GeneralApprovalMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/GeneralApprovalMapper.java
index 4fb7344..0c9d6ae 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/GeneralApprovalMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/GeneralApprovalMapper.java
@@ -17,8 +17,4 @@
 
     Page<O> selectBatchForApprovalList(Page<O> page, @Param("request") R request, @Param("businessKeys") List<String> businessKeys);
 
-//    Page<O> selectListPage(Page<O> page, @Param("request") R request);
-
-//    Long selectMaxNo();
-
 }
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceAssessMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceAssessMapper.java
index 7867bb8..ba59009 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceAssessMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceAssessMapper.java
@@ -1,7 +1,12 @@
 package com.casic.missiles.mapper.business;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.business.outsource.OutsourceAssessApprovalListRequest;
+import com.casic.missiles.mapper.GeneralApprovalMapper;
 import com.casic.missiles.model.business.BizBusinessOutsourceAssess;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * <p>
@@ -11,6 +16,10 @@
  * @author wangpeng
  * @since 2023-08-16
  */
-public interface BizBusinessOutsourceAssessMapper extends BaseMapper<BizBusinessOutsourceAssess> {
+public interface BizBusinessOutsourceAssessMapper extends GeneralApprovalMapper<BizBusinessOutsourceAssess, BizBusinessOutsourceAssess, OutsourceAssessApprovalListRequest> {
+
+    Page<BizBusinessOutsourceAssess> selectBatchForApprovalList(Page<BizBusinessOutsourceAssess> page, @Param("request") OutsourceAssessApprovalListRequest request, @Param("businessKeys") List<String> businessKeys);
+
+    Long selectMaxProjectNo();
 
 }
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceProtocolMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceProtocolMapper.java
new file mode 100644
index 0000000..e6aba35
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceProtocolMapper.java
@@ -0,0 +1,24 @@
+package com.casic.missiles.mapper.business;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.business.outsource.OutsourceProtocolApprovalListRequest;
+import com.casic.missiles.mapper.GeneralApprovalMapper;
+import com.casic.missiles.model.business.BizBusinessOutsourceProtocol;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 计量检定业务-分包管理-测试、校准或检定工作分包协议书 Mapper 接口
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-08-24
+ */
+public interface BizBusinessOutsourceProtocolMapper extends GeneralApprovalMapper<BizBusinessOutsourceProtocol, BizBusinessOutsourceProtocol, OutsourceProtocolApprovalListRequest> {
+
+    Page<BizBusinessOutsourceProtocol> selectBatchForApprovalList(Page<BizBusinessOutsourceProtocol> page, @Param("request") OutsourceProtocolApprovalListRequest request, @Param("businessKeys") List<String> businessKeys);
+
+    Long selectMaxProtocolNo();
+}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/EnvLocationInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/EnvLocationInfoMapper.java
new file mode 100644
index 0000000..49eff87
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/EnvLocationInfoMapper.java
@@ -0,0 +1,21 @@
+package com.casic.missiles.mapper.resource;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.resource.environment.LocationListRequest;
+import com.casic.missiles.dto.resource.environment.LocationListResponse;
+import com.casic.missiles.model.resource.EnvLocationInfo;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * <p>
+ * 实验室环境监控系统-设备表 Mapper 接口
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-06-07
+ */
+public interface EnvLocationInfoMapper extends BaseMapper<EnvLocationInfo> {
+
+    Page<LocationListResponse> selectLocationListPage(Page<LocationListResponse> page, @Param("request") LocationListRequest request);
+}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java
index de124db..85ed0f7 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java
@@ -1,7 +1,9 @@
 package com.casic.missiles.mapper.system;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.dto.system.SignDetailResponse;
+import com.casic.missiles.dto.system.SignListRequest;
 import com.casic.missiles.model.system.SystemSign;
 import org.apache.ibatis.annotations.Param;
 
@@ -22,4 +24,8 @@
     SignDetailResponse selectSignDetailById(Long id);
 
     List<SystemSign> selectUsableSignList(@Param("userId") Long userId);
+
+    Page<SystemSign> selectSignListPage(Page<SystemSign> page, @Param("request") SignListRequest request);
+
+    List<SystemSign> selectSignList(@Param("request") SignListRequest request);
 }
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateChangeApplyMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateChangeApplyMapper.xml
index d798447..c496092 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateChangeApplyMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateChangeApplyMapper.xml
@@ -30,31 +30,31 @@
         SELECT *
         FROM biz_business_certificate_change_apply
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.changeApplyNo != null and request.changeApplyNo !=''">
+        <if test="request != null and request.changeApplyNo != null and request.changeApplyNo !=''">
             and change_apply_no like concat('%',#{request.changeApplyNo},'%')
         </if>
-        <if test="request.changeReportNo != null and request.changeReportNo !=''">
+        <if test="request != null and request.changeReportNo != null and request.changeReportNo !=''">
             and change_report_no like concat('%',#{request.changeReportNo},'%')
         </if>
-        <if test="request.changeReportName != null and request.changeReportName !=''">
+        <if test="request != null and request.changeReportName != null and request.changeReportName !=''">
             and change_report_name like concat('%',#{request.changeReportName},'%')
         </if>
-        <if test="request.changeType != null and request.changeType !=''">
+        <if test="request != null and request.changeType != null and request.changeType !=''">
             and change_type = #{request.changeType}
         </if>
-        <if test="request.createUserName != null and request.createUserName !=''">
+        <if test="request != null and request.createUserName != null and request.createUserName !=''">
             and create_user_name like concat('%',#{request.createUserName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificatePrintMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificatePrintMapper.xml
index b66cd99..49c0ac8 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificatePrintMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificatePrintMapper.xml
@@ -31,34 +31,34 @@
         LEFT JOIN biz_business_order_sample_relation bosr ON (bosr.order_id = bcr.order_id AND bosr.sample_id = bcr.sample_id)
         LEFT JOIN biz_business_order_info boi ON boi.id = bosr.order_id
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and bcp.approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.printStatus != null and request.printStatus !=''">
+        <if test="request != null and request.printStatus != null and request.printStatus !=''">
             and print_status = #{request.printStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and bcp.create_user_id = #{request.createUserId}
         </if>
-        <if test="request.certificateReportNo != null and request.certificateReportNo !=''">
+        <if test="request != null and request.certificateReportNo != null and request.certificateReportNo !=''">
             and bcr.certificate_report_no like concat('%',#{request.certificateReportNo},'%')
         </if>
-        <if test="request.certificateReportName != null and request.certificateReportName !=''">
+        <if test="request != null and request.certificateReportName != null and request.certificateReportName !=''">
             and bcr.certificate_report_name like concat('%',#{request.certificateReportName},'%')
         </if>
-        <if test="request.customerName != null and request.customerName !=''">
+        <if test="request != null and request.customerName != null and request.customerName !=''">
             and boi.customer_name like concat('%',#{request.customerName},'%')
         </if>
-        <if test="request.sampleNo != null and request.sampleNo !=''">
+        <if test="request != null and request.sampleNo != null and request.sampleNo !=''">
             and bosr.sample_no like concat('%',#{request.sampleNo},'%')
         </if>
-        <if test="request.sampleName != null and request.sampleName !=''">
+        <if test="request != null and request.sampleName != null and request.sampleName !=''">
             and bosr.sample_name like concat('%',#{request.sampleName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and bcp.create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and bcp.create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml
index b366034..767695d 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml
@@ -46,33 +46,37 @@
         SELECT bcr.*, bosr.sample_no, bosr.sample_name, bosr.sample_model, rsi.staff_name
         FROM biz_business_certificate_report bcr
         LEFT JOIN biz_business_order_sample_relation bosr ON (bosr.order_id = bcr.order_id AND bosr.sample_id = bcr.sample_id)
+        LEFT JOIN biz_business_order_info boi ON boi.id = bcr.order_id
         LEFT JOIN biz_resource_staff_info rsi ON rsi.id = bcr.measure_person_id
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and bcr.approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and bcr.create_user_id = #{request.createUserId}
         </if>
-        <if test="request.certificateReportNo != null and request.certificateReportNo !=''">
+        <if test="request != null and request.customerId != null and request.customerId !=''">
+            and boi.customer_id = #{request.customerId}
+        </if>
+        <if test="request != null and request.certificateReportNo != null and request.certificateReportNo !=''">
             and bcr.certificate_report_no like concat('%',#{request.certificateReportNo},'%')
         </if>
-        <if test="request.certificateReportName != null and request.certificateReportName !=''">
+        <if test="request != null and request.certificateReportName != null and request.certificateReportName !=''">
             and bcr.certificate_report_name like concat('%',#{request.certificateReportName},'%')
         </if>
-        <if test="request.sampleNo != null and request.sampleNo !=''">
+        <if test="request != null and request.sampleNo != null and request.sampleNo !=''">
             and bosr.sample_no like concat('%',#{request.sampleNo},'%')
         </if>
-        <if test="request.measureCategory != null and request.measureCategory !=''">
+        <if test="request != null and request.measureCategory != null and request.measureCategory !=''">
             and bcr.measure_category = #{request.measureCategory}
         </if>
-        <if test="request.measurePerson != null and request.measurePerson !=''">
+        <if test="request != null and request.measurePerson != null and request.measurePerson !=''">
             and rsi.staff_name like concat('%',#{request.measurePerson},'%')
         </if>
-        <if test="request.calibrationTimeStart != null and request.calibrationTimeStart !=''">
+        <if test="request != null and request.calibrationTimeStart != null and request.calibrationTimeStart !=''">
             and bcr.calibration_time &gt;= #{request.calibrationTimeStart}
         </if>
-        <if test="request.calibrationTimeEnd != null and request.calibrationTimeEnd !=''">
+        <if test="request != null and request.calibrationTimeEnd != null and request.calibrationTimeEnd !=''">
             and bcr.calibration_time &lt;= #{request.calibrationTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceAssessMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceAssessMapper.xml
index d0fcf8b..c22c101 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceAssessMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceAssessMapper.xml
@@ -7,6 +7,8 @@
         <id column="id" property="id" />
         <result column="project_no" property="projectNo" />
         <result column="project_name" property="projectName" />
+        <result column="lab_code" property="labCode" />
+        <result column="group_code" property="groupCode" />
         <result column="applicant_id" property="applicantId" />
         <result column="applicant_name" property="applicantName" />
         <result column="applicant_time" property="applicantTime" />
@@ -31,7 +33,45 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, project_no, project_name, applicant_id, applicant_name, applicant_time, minio_file_name, remark, create_user_id, create_user_name, outsourcer_id, pre_start_time, pre_end_time, outsource_reason, pre_cost, approval_status, process_id, approve_situation, traceability, test_method, technique_ability, create_time, update_time
+        id, project_no, project_name, lab_code, group_code, applicant_id, applicant_name, applicant_time, minio_file_name, remark, create_user_id, create_user_name, outsourcer_id, pre_start_time, pre_end_time, outsource_reason, pre_cost, approval_status, process_id, approve_situation, traceability, test_method, technique_ability, create_time, update_time
     </sql>
 
+    <select id="selectMaxProjectNo" resultType="java.lang.Long">
+        SELECT IFNULL(max(RIGHT(project_no, 3)), 0) from biz_business_outsource_assess
+    </select>
+
+    <select id="selectBatchForApprovalList" resultMap="BaseResultMap">
+        SELECT bboa.*, bboi.outsourcer_name, bboi.director
+        FROM biz_business_outsource_assess bboa
+        LEFT JOIN biz_business_outsourcer_info bboi ON bboa.outsourcer_id = bboi.id
+        WHERE 1=1
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
+            and bboa.approval_status = #{request.approvalStatus}
+        </if>
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
+            and bboa.create_user_id = #{request.createUserId}
+        </if>
+        <if test="request != null and request.projectNo != null and request.projectNo !=''">
+            and bboa.project_no like concat('%',#{request.projectNo},'%')
+        </if>
+        <if test="request != null and request.outsourcerName != null and request.outsourcerName !=''">
+            and bboi.outsourcer_name like concat('%',#{request.outsourcerName},'%')
+        </if>
+        <if test="request != null and request.applicantName != null and request.applicantName !=''">
+            and bboa.applicant_name like concat('%',#{request.applicantName},'%')
+        </if>
+        <if test="request != null and request.applicantTimeStart != null and request.applicantTimeStart !=''">
+            and bboa.applicant_time &gt;= #{request.applicantTimeStart}
+        </if>
+        <if test="request != null and request.applicantTimeEnd != null and request.applicantTimeEnd !=''">
+            and bboa.applicant_time &lt;= #{request.applicantTimeEnd}
+        </if>
+        <if test="businessKeys != null">
+            and bboa.id in
+            <foreach collection="businessKeys" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
+        ORDER BY bboa.create_time DESC
+    </select>
 </mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceProtocolMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceProtocolMapper.xml
new file mode 100644
index 0000000..b7b2149
--- /dev/null
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceProtocolMapper.xml
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.mapper.business.BizBusinessOutsourceProtocolMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.business.BizBusinessOutsourceProtocol">
+        <id column="id" property="id" />
+        <result column="protocol_no" property="protocolNo" />
+        <result column="project_name" property="projectName" />
+        <result column="lab_code" property="labCode" />
+        <result column="group_code" property="groupCode" />
+        <result column="outsourcer_id" property="outsourcerId" />
+        <result column="remark" property="remark" />
+        <result column="outsource_no" property="outsourceNo" />
+        <result column="outsource_name" property="outsourceName" />
+        <result column="contacts" property="contacts" />
+        <result column="mobile" property="mobile" />
+        <result column="address" property="address" />
+        <result column="require_date" property="requireDate" />
+        <result column="outsource_cost" property="outsourceCost" />
+        <result column="director" property="director" />
+        <result column="item" property="item" />
+        <result column="requires" property="requires" />
+        <result column="create_user_id" property="createUserId" />
+        <result column="create_user_name" property="createUserName" />
+        <result column="approval_status" property="approvalStatus" />
+        <result column="process_id" property="processId" />
+        <result column="create_time" property="createTime" />
+        <result column="update_time" property="updateTime" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, protocol_no, project_name, lab_code, group_code, outsourcer_id, remark, outsource_no, outsource_name, contacts, mobile, address, require_date, outsource_cost, director, item, requires, create_user_id, create_user_name, approval_status, process_id, create_time, update_time
+    </sql>
+
+    <select id="selectMaxProtocolNo" resultType="java.lang.Long">
+        SELECT IFNULL(max(RIGHT(protocol_no, 3)), 0) from biz_business_outsource_protocol
+    </select>
+
+    <select id="selectBatchForApprovalList" resultMap="BaseResultMap">
+        SELECT *
+        FROM biz_business_outsource_protocol
+        WHERE 1=1
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
+            and approval_status = #{request.approvalStatus}
+        </if>
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
+            and create_user_id = #{request.createUserId}
+        </if>
+        <if test="request != null and request.protocolNo != null and request.protocolNo !=''">
+            and protocol_no like concat('%',#{request.protocolNo},'%')
+        </if>
+        <if test="request != null and request.outsourcerName != null and request.outsourcerName !=''">
+            and outsourcer_name like concat('%',#{request.outsourcerName},'%')
+        </if>
+        <if test="request != null and request.applicantName != null and request.applicantName !=''">
+            and create_user_name like concat('%',#{request.applicantName},'%')
+        </if>
+        <if test="request != null and request.applicantTimeStart != null and request.applicantTimeStart !=''">
+            and create_time &gt;= #{request.applicantTimeStart}
+        </if>
+        <if test="request != null and request.applicantTimeEnd != null and request.applicantTimeEnd !=''">
+            and create_time &lt;= #{request.applicantTimeEnd}
+        </if>
+        <if test="businessKeys != null">
+            and id in
+            <foreach collection="businessKeys" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
+        ORDER BY create_time DESC
+    </select>
+</mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourcerInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourcerInfoMapper.xml
index 510a80b..3049b54 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourcerInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourcerInfoMapper.xml
@@ -7,6 +7,8 @@
         <id column="id" property="id" />
         <result column="outsourcer_no" property="outsourcerNo" />
         <result column="outsourcer_name" property="outsourcerName" />
+        <result column="lab_code" property="labCode" />
+        <result column="group_code" property="groupCode" />
         <result column="outsourcer_brief_name" property="outsourcerBriefName" />
         <result column="outsourcer_size" property="outsourcerSize" />
         <result column="business_size" property="businessSize" />
@@ -55,32 +57,32 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, outsourcer_no, outsourcer_name, outsourcer_brief_name, outsourcer_size, business_size, grade, evaluation, tax_number, bank_account, bank_name, bank_account_number, postal_code, director, phone, fax, mobile, email, website, address_country, address_province, address_city, address_area, full_address, address_country_name, address_province_name, address_city_name, address_area_name, invoice_country, invoice_province, invoice_city, invoice_area, invoice_full_address, invoice_country_name, invoice_province_name, invoice_city_name, invoice_area_name, business_scope, business_content, minio_file_name, approval_status, process_id, remark, create_user_id, create_user_name, create_time, update_time
+        id, outsourcer_no, outsourcer_name, lab_code, group_code, outsourcer_brief_name, outsourcer_size, business_size, grade, evaluation, tax_number, bank_account, bank_name, bank_account_number, postal_code, director, phone, fax, mobile, email, website, address_country, address_province, address_city, address_area, full_address, address_country_name, address_province_name, address_city_name, address_area_name, invoice_country, invoice_province, invoice_city, invoice_area, invoice_full_address, invoice_country_name, invoice_province_name, invoice_city_name, invoice_area_name, business_scope, business_content, minio_file_name, approval_status, process_id, remark, create_user_id, create_user_name, create_time, update_time
     </sql>
 
     <select id="selectBatchForApprovalList" resultMap="BaseResultMap">
         SELECT *
         FROM biz_business_outsourcer_info
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.outsourcerNo != null and request.outsourcerNo !=''">
+        <if test="request != null and request.outsourcerNo != null and request.outsourcerNo !=''">
             and outsourcer_no like concat('%',#{request.outsourcerNo},'%')
         </if>
-        <if test="request.outsourcerName != null and request.outsourcerName !=''">
+        <if test="request != null and request.outsourcerName != null and request.outsourcerName !=''">
             and outsourcer_name like concat('%',#{request.outsourcerName},'%')
         </if>
-        <if test="request.director != null and request.director !=''">
+        <if test="request != null and request.director != null and request.director !=''">
             and director like concat('%',#{request.director},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
@@ -93,6 +95,6 @@
     </select>
 
     <select id="selectMaxNo" resultType="java.lang.Long">
-        SELECT IFNULL(max(RIGHT(outsourcer_no, 12)), 0) from biz_business_outsourcer_info
+        SELECT IFNULL(max(RIGHT(outsourcer_no, 3)), 0) from biz_business_outsourcer_info
     </select>
 </mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessSiteExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessSiteExecutiveInfoMapper.xml
index 135c5d0..3c5ae79 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessSiteExecutiveInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessSiteExecutiveInfoMapper.xml
@@ -38,25 +38,25 @@
         FROM biz_business_site_executive_info bsei
         LEFT JOIN biz_resource_customer_info rci ON bsei.customer_id = rci.id
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and bsei.approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and bsei.create_user_id = #{request.createUserId}
         </if>
-        <if test="request.siteExecutiveNo != null and request.siteExecutiveNo !=''">
+        <if test="request != null and request.siteExecutiveNo != null and request.siteExecutiveNo !=''">
             and bsei.site_executive_no like concat('%',#{request.siteExecutiveNo},'%')
         </if>
-        <if test="request.customerName != null and request.customerName !=''">
+        <if test="request != null and request.customerName != null and request.customerName !=''">
             and rci.outsourcer_name like concat('%',#{request.customerName},'%')
         </if>
-        <if test="request.applyName != null and request.applyName !=''">
+        <if test="request != null and request.applyName != null and request.applyName !=''">
             and bsei.apply_name like concat('%',#{request.applyName},'%')
         </if>
-        <if test="request.applyTimeStart != null and request.applyTimeStart !=''">
+        <if test="request != null and request.applyTimeStart != null and request.applyTimeStart !=''">
             and bsei.apply_time &gt;= #{request.applyTimeStart}
         </if>
-        <if test="request.applyTimeEnd != null and request.applyTimeEnd !=''">
+        <if test="request != null and request.applyTimeEnd != null and request.applyTimeEnd !=''">
             and bsei.apply_time &lt;= #{request.applyTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml
index 84d9e2a..6bd38a9 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml
@@ -105,6 +105,12 @@
         <if test="request.isUrgent != null and request.isUrgent !=''">
             AND bo.is_urgent = #{request.isUrgent}
         </if>
+        <if test="request.ids != null">
+            and blei.id in
+            <foreach collection="request.ids" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
         ORDER BY blei.update_time DESC
     </select>
 
@@ -137,6 +143,12 @@
         <if test="request.isUrgent != null and request.isUrgent !=''">
             AND bo.is_urgent = #{request.isUrgent}
         </if>
+        <if test="request.ids != null">
+            and blei.id in
+            <foreach collection="request.ids" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
         ORDER BY blei.update_time DESC
     </select>
 
diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardInfoMapper.xml
index 1a5551b..2ed8d17 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardInfoMapper.xml
@@ -45,12 +45,6 @@
         FROM biz_equipment_standard_info besi
         LEFT JOIN biz_equipment_standard_technology_relation bestr ON besi.standard_no = bestr.standard_no
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
-            and besi.approval_status = #{request.approvalStatus}
-        </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
-            and besi.create_user_id = #{request.createUserId}
-        </if>
         <if test="request.standardName != null and request.standardName !=''">
             and besi.standard_name like concat('%',#{request.standardName},'%')
         </if>
diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardTechnologyRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardTechnologyRelationMapper.xml
index fc7e16c..cd03c8c 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardTechnologyRelationMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardTechnologyRelationMapper.xml
@@ -6,6 +6,7 @@
     <resultMap id="BaseResultMap" type="com.casic.missiles.model.equipment.BizEquipmentStandardTechnologyRelation">
         <id column="id" property="id" />
         <result column="technology_file_id" property="technologyFileId" />
+        <result column="technology_file_no" property="technologyFileNo" />
         <result column="technology_file_name" property="technologyFileName" />
         <result column="standard_id" property="standardId" />
         <result column="standard_no" property="standardNo" />
@@ -14,7 +15,7 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, technology_file_id, technology_file_name, standard_id, remark
+        id, technology_file_id, technology_file_no, technology_file_name, standard_id, remark
     </sql>
 
 </mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceAuthorizeOrderMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceAuthorizeOrderMapper.xml
index ac5176c..554fe65 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceAuthorizeOrderMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceAuthorizeOrderMapper.xml
@@ -32,22 +32,22 @@
         SELECT *
         FROM biz_resource_authorize_order
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.orderNo != null and request.orderNo !=''">
+        <if test="request != null and request.orderNo != null and request.orderNo !=''">
             and order_no like concat('%',#{request.orderNo},'%')
         </if>
-        <if test="request.createUserName != null and request.createUserName !=''">
+        <if test="request != null and request.createUserName != null and request.createUserName !=''">
             and create_user_name like concat('%',#{request.createUserName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerExamineFormMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerExamineFormMapper.xml
index ab242f6..af7f98f 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerExamineFormMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerExamineFormMapper.xml
@@ -41,28 +41,28 @@
         SELECT *
         FROM biz_resource_customer_examine_form
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.formNo != null and request.formNo !=''">
+        <if test="request != null and request.formNo != null and request.formNo !=''">
             and form_no like concat('%',#{request.formNo},'%')
         </if>
-        <if test="request.labCode != null and request.labCode !=''">
+        <if test="request != null and request.labCode != null and request.labCode !=''">
             and lab_code like concat('%',#{request.labCode},'%')
         </if>
-        <if test="request.groupCode != null and request.groupCode !=''">
+        <if test="request != null and request.groupCode != null and request.groupCode !=''">
             and group_code like concat('%',#{request.groupCode},'%')
         </if>
-        <if test="request.createUserName != null and request.createUserName !=''">
+        <if test="request != null and request.createUserName != null and request.createUserName !=''">
             and create_user_name like concat('%',#{request.createUserName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerInfoMapper.xml
index fa8ffbc..06a2798 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerInfoMapper.xml
@@ -33,25 +33,25 @@
         SELECT *
         FROM biz_resource_customer_info
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.customerNo != null and request.customerNo !=''">
+        <if test="request != null and request.customerNo != null and request.customerNo !=''">
             and customer_no like concat('%',#{request.customerNo},'%')
         </if>
-        <if test="request.customerName != null and request.customerName !=''">
+        <if test="request != null and request.customerName != null and request.customerName !=''">
             and customer_name like concat('%',#{request.customerName},'%')
         </if>
-        <if test="request.contacts != null and request.contacts !=''">
+        <if test="request != null and request.contacts != null and request.contacts !=''">
             and contacts like concat('%',#{request.contacts},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerSuggestFormMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerSuggestFormMapper.xml
index 28f5bb2..1806662 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerSuggestFormMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerSuggestFormMapper.xml
@@ -33,28 +33,28 @@
         SELECT *
         FROM biz_resource_customer_suggest_form
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.formNo != null and request.formNo !=''">
+        <if test="request != null and request.formNo != null and request.formNo !=''">
             and form_no like concat('%',#{request.formNo},'%')
         </if>
-        <if test="request.customerName != null and request.customerName !=''">
+        <if test="request != null and request.customerName != null and request.customerName !=''">
             and customer_name like concat('%',#{request.customerName},'%')
         </if>
-        <if test="request.customerDeptName != null and request.customerDeptName !=''">
+        <if test="request != null and request.customerDeptName != null and request.customerDeptName !=''">
             and customer_dept_name like concat('%',#{request.customerDeptName},'%')
         </if>
-        <if test="request.createUserName != null and request.createUserName !=''">
+        <if test="request != null and request.createUserName != null and request.createUserName !=''">
             and create_user_name like concat('%',#{request.createUserName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSealUseNoteMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSealUseNoteMapper.xml
index ab37bc1..b02bb33 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSealUseNoteMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSealUseNoteMapper.xml
@@ -29,32 +29,32 @@
     </sql>
 
     <select id="selectBatchForApprovalList" resultMap="BaseResultMap">
-        SELECT *
+        SELECT brsun.*, brsi.seal_name, brsi.seal_type, brsi.approver_name
         FROM biz_resource_seal_use_note brsun
         JOIN biz_resource_seal_info brsi ON brsun.seal_id = brsi.id
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and brsun.approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and brsun.create_user_id = #{request.createUserId}
         </if>
-        <if test="request.sealName != null and request.sealName !=''">
+        <if test="request != null and request.sealName != null and request.sealName !=''">
             and brsi.seal_name like concat('%',#{request.sealName},'%')
         </if>
-        <if test="request.sealType != null and request.sealType !=''">
+        <if test="request != null and request.sealType != null and request.sealType !=''">
             and brsi.seal_type = #{request.sealType}
         </if>
-        <if test="request.applyDeptName != null and request.applyDeptName !=''">
+        <if test="request != null and request.applyDeptName != null and request.applyDeptName !=''">
             and brsun.apply_dept_name like concat('%',#{request.applyDeptName},'%')
         </if>
-        <if test="request.applyUserName != null and request.applyUserName !=''">
+        <if test="request != null and request.applyUserName != null and request.applyUserName !=''">
             and brsun.apply_user_name like concat('%',#{request.applyUserName},'%')
         </if>
-        <if test="request.applyTimeStart != null and request.applyTimeStart !=''">
+        <if test="request != null and request.applyTimeStart != null and request.applyTimeStart !=''">
             and brsun.apply_time &gt;= #{request.applyTimeStart}
         </if>
-        <if test="request.applyTimeEnd != null and request.applyTimeEnd !=''">
+        <if test="request != null and request.applyTimeEnd != null and request.applyTimeEnd !=''">
             and brsun.apply_time &lt;= #{request.applyTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml
index 119bf7d..4f8392a 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml
@@ -31,6 +31,12 @@
         <if test="request.deptName != null and request.deptName !=''">
             and brsi.dept_name like concat('%',#{request.deptName},'%')
         </if>
+        <if test="request.ids != null">
+            and brsv.id in
+            <foreach collection="request.ids" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
         ORDER BY brsv.grant_date DESC
     </select>
 
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSupplierInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSupplierInfoMapper.xml
index fe8d399..e8ce7ef 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSupplierInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSupplierInfoMapper.xml
@@ -48,28 +48,28 @@
         SELECT *
         FROM biz_resource_supplier_info
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.supplierNo != null and request.supplierNo !=''">
+        <if test="request != null and request.supplierNo != null and request.supplierNo !=''">
             and supplier_no like concat('%',#{request.supplierNo},'%')
         </if>
-        <if test="request.supplierName != null and request.supplierName !=''">
+        <if test="request != null and request.supplierName != null and request.supplierName !=''">
             and supplier_name like concat('%',#{request.supplierName},'%')
         </if>
-        <if test="request.director != null and request.director !=''">
+        <if test="request != null and request.director != null and request.director !=''">
             and director like concat('%',#{request.director},'%')
         </if>
-        <if test="request.supplierType != null and request.supplierType !=''">
+        <if test="request != null and request.supplierType != null and request.supplierType !=''">
             and supplier_type = #{request.supplierType}
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/EnvLocationInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/EnvLocationInfoMapper.xml
new file mode 100644
index 0000000..68bcf10
--- /dev/null
+++ b/casic-metering-dao/src/main/resources/mapper/resource/EnvLocationInfoMapper.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.mapper.resource.EnvLocationInfoMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.resource.EnvLocationInfo">
+        <id column="id" property="id" />
+        <result column="location_no" property="locationNo" />
+        <result column="location_name" property="locationName" />
+        <result column="location_position" property="locationPosition" />
+        <result column="create_user_id" property="createUserId" />
+        <result column="create_user" property="createUser" />
+        <result column="create_time" property="createTime" />
+        <result column="update_time" property="updateTime" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, location_no, location_name, location_position, create_user_id, create_user, create_time, update_time
+    </sql>
+
+    <select id="selectLocationListPage" resultType="com.casic.missiles.dto.resource.environment.LocationListResponse">
+        SELECT *
+        FROM env_location_info
+        WHERE 1=1
+        <if test="request.locationNo != null and request.locationNo !=''">
+            AND location_no LIKE concat('%',#{request.locationNo},'%')
+        </if>
+        <if test="request.locationName != null and request.locationName !=''">
+            AND location_name LIKE concat('%',#{request.locationName},'%')
+        </if>
+        ORDER BY create_time DESC
+    </select>
+
+</mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml
index b28c18f..8854047 100644
--- a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml
@@ -11,7 +11,6 @@
         <result column="sign_desc" property="signDesc" />
         <result column="sign_director" property="signDirector" />
         <result column="sign_user_id" property="signUserId" />
-        <result column="sign_type" property="signType" />
         <result column="minio_file_name" property="minioFileName" />
         <result column="create_time" property="createTime" />
         <result column="update_time" property="updateTime" />
@@ -28,7 +27,6 @@
         <result column="sign_name" property="signName" />
         <result column="sign_desc" property="signDesc" />
         <result column="sign_director" property="signDirector" />
-        <result column="sign_type" property="signType" />
         <result column="sign_user_id" property="signUserId" />
         <result column="minio_file_name" property="minioFileName" />
         <result column="create_time" property="createTime" />
@@ -62,4 +60,58 @@
         JOIN system_sign_user_relation ssur ON ss.id = ssur.sign_id
         WHERE ssur.user_id = #{userId}
     </select>
+
+    <select id="selectSignListPage" resultMap="BaseResultMap">
+        SELECT ss.*, sd.SIMPLE_NAME AS deptName
+        FROM system_sign ss
+        LEFT JOIN sys_user su ON su.id = ss.sign_user_id
+        LEFT JOIN sys_dept sd ON sd.id = su.dept_id
+        WHERE 1=1
+        <if test="request.signNo != null and request.signNo !=''">
+            AND ss.sign_no LIKE concat('%',#{request.signNo},'%')
+        </if>
+        <if test="request.signName != null and request.signName !=''">
+            AND ss.sign_name LIKE concat('%',#{request.signName},'%')
+        </if>
+        <if test="request.signDirector != null and request.signDirector !=''">
+            AND ss.sign_director LIKE concat('%',#{request.signDirector},'%')
+        </if>
+        <if test="request.signUserId != null and request.signUserId !=''">
+            AND ss.sign_user_id = #{request.signUserId}
+        </if>
+        <if test="request.createStartTime != null and request.createStartTime !=''">
+            AND DATE_FORMAT(ss.create_time,'%Y-%m-%d') &gt;= DATE_FORMAT(#{request.createStartTime},'%Y-%m-%d')
+        </if>
+        <if test="request.createEndTime != null and request.createEndTime !=''">
+            AND DATE_FORMAT(ss.create_time,'%Y-%m-%d')  &lt;= DATE_FORMAT(#{request.createEndTime},'%Y-%m-%d')
+        </if>
+        ORDER BY ss.create_time DESC
+    </select>
+
+    <select id="selectSignList" resultMap="BaseResultMap">
+        SELECT ss.*, sd.SIMPLE_NAME AS deptName
+        FROM system_sign ss
+        LEFT JOIN sys_user su ON su.id = ss.sign_user_id
+        LEFT JOIN sys_dept sd ON sd.id = su.dept_id
+        WHERE 1=1
+        <if test="request.signNo != null and request.signNo !=''">
+            AND ss.sign_no LIKE concat('%',#{request.signNo},'%')
+        </if>
+        <if test="request.signName != null and request.signName !=''">
+            AND ss.sign_name LIKE concat('%',#{request.signName},'%')
+        </if>
+        <if test="request.signDirector != null and request.signDirector !=''">
+            AND ss.sign_director LIKE concat('%',#{request.signDirector},'%')
+        </if>
+        <if test="request.signUserId != null and request.signUserId !=''">
+            AND ss.sign_user_id = #{request.signUserId}
+        </if>
+        <if test="request.createStartTime != null and request.createStartTime !=''">
+            AND DATE_FORMAT(ss.create_time,'%Y-%m-%d') &gt;= DATE_FORMAT(#{request.createStartTime},'%Y-%m-%d')
+        </if>
+        <if test="request.createEndTime != null and request.createEndTime !=''">
+            AND DATE_FORMAT(ss.create_time,'%Y-%m-%d')  &lt;= DATE_FORMAT(#{request.createEndTime},'%Y-%m-%d')
+        </if>
+        ORDER BY ss.create_time DESC
+    </select>
 </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 515050a..60f530b 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
@@ -47,8 +47,8 @@
     String STORAGE_LOCATION = "bizStorageLocation";
     //计量专业
     String MEASURE_MAJOR = "bizMeasureMajor";
-    //管理状态
-    String MANAGER_STATE = "bizManagerState";
+    //标准装置管理状态
+    String STANDARD_MANAGER_STATE = "bizStandardManagerState";
 
     /**
      * 资源管理 字典code
@@ -95,8 +95,6 @@
     String MEASURE_STATUS = "measureStatus";
     //检定方式
     String MEASURE_TYPE = "measureType";
-    //标识打印标志类型
-    String IDENTIFY_PRINT_TYPE = "bizBusinessIdentify";
     //变更类型
     String REPORT_CHANGE_TYPE = "bizCertChangeType";
     //规模类型
@@ -111,19 +109,24 @@
     String MEASURE_CATEGORY = "measureCategory";
     //检定结果
     String MEASURE_RESULT = "measureResult";
+    //分包原因
+    String OUTSOURCE_REASON = "outsourceReason";
+
+    /**
+     * 系统管理
+     */
+    String TEMPLATE_TYPE = "templateType";
+
 
     /**
      * 标准装置 字典code
      */
     //类别
     String STANDARD_CATEGORY = "standardCategory";
-    //管理状态
-    String STANDARD_MANAGER_STATE = "standardManagerState";
     //标准等级
     String STANDARD_LEVEL = "standardLevel";
     //传递范围
     String STANDARD_TRANSMIT_RANGE = "transmitRange";
-
     //资本来源
     String CAPITAL_SOURCE = "capitalSource";
     //标准装置-申请类型
@@ -148,8 +151,6 @@
     String CERTIFICATE_CLASS = "certificationClass";
     //证书管理-检校专业
     String CALIBRATION_MAJOR = "calibrationMajor";
-    //分包原因
-    String OUTSOURCE_REASON = "outsourceReason";
 
     /**
      * 工作台
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/BaseApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/BaseApprovalListRequest.java
index 73c12c1..80d7424 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/BaseApprovalListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/BaseApprovalListRequest.java
@@ -6,6 +6,7 @@
 
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotEmpty;
+import java.util.List;
 
 /**
  * @Description:
@@ -19,14 +20,14 @@
      * 表单id
      */
     @NotBlank(message = "表单id不能为空")
-    @ApiModelProperty(value = "表单id（流程定义对应的表单id，等价于业务id）", dataType = "String")
+    @ApiModelProperty(value = "表单id（流程定义对应的表单id，等价于业务id），导出接口不用传", dataType = "String")
     private String formId;
 
     /**
      * 审批状态类型，对应ApprovalStatusEnum
      */
     @NotEmpty(message = "审批状态类型不能为空")
-    @ApiModelProperty(value = "审批状态类型code", dataType = "String")
+    @ApiModelProperty(value = "审批状态类型code，导出接口不用传", dataType = "String")
     private String approvalStatus;
 
     @ApiModelProperty(hidden = true)
@@ -34,4 +35,7 @@
 
     @ApiModelProperty(hidden = true)
     private Long createUserId;
+
+    @ApiModelProperty(value = "导出ids", dataType = "List")
+    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificatePrintApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificatePrintApprovalListRequest.java
index b93d1c9..3cc2f4e 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificatePrintApprovalListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificatePrintApprovalListRequest.java
@@ -5,8 +5,6 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import java.util.List;
-
 /**
  * @Description:
  * @Author: wangpeng
@@ -38,7 +36,4 @@
 
     @ApiModelProperty(value = "创建结束时间", dataType = "String")
     private String createTimeEnd;
-
-    @ApiModelProperty(value = "导出ids", dataType = "List")
-    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportApprovalListRequest.java
index 4f7a038..c115847 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportApprovalListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportApprovalListRequest.java
@@ -5,8 +5,6 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import java.util.List;
-
 /**
  * @Description:
  * @Author: wangpeng
@@ -15,6 +13,8 @@
 @ApiModel
 @Data
 public class CertificateReportApprovalListRequest extends BaseApprovalListRequest {
+    @ApiModelProperty(value = "委托方id", dataType = "String")
+    private Long customerId;
 
     @ApiModelProperty(value = "证书报告编号", dataType = "String")
     private String certificateReportNo;
@@ -37,6 +37,4 @@
     @ApiModelProperty(value = "检校结束时间", dataType = "String")
     private String calibrationTimeEnd;
 
-    @ApiModelProperty(value = "导出ids", dataType = "List")
-    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/identify/IdentifyListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/identify/IdentifyListRequest.java
index 1b87ae6..f019203 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/identify/IdentifyListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/identify/IdentifyListRequest.java
@@ -4,6 +4,8 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * @Description:
  * @Author: wangpeng
@@ -26,4 +28,7 @@
 
     @ApiModelProperty(value = "打印结束时间", dataType = "String")
     private String createTimeEnd;
+
+    @ApiModelProperty(value = "导出ids", dataType = "List")
+    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListRequest.java
index 1264883..62415fb 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListRequest.java
@@ -7,6 +7,7 @@
 import lombok.Data;
 
 import javax.validation.constraints.NotBlank;
+import java.util.List;
 
 @Data
 @ApiModel
@@ -37,4 +38,6 @@
     @ApiModelProperty(value = "是否加急（1是0否null全部）", dataType = "Integer")
     private String isUrgent;
 
+    @ApiModelProperty(value = "导出ids", dataType = "List")
+    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListRequest.java
index 5201d7b..499760a 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListRequest.java
@@ -17,6 +17,9 @@
     @ApiModelProperty(value = "任务单编号", dataType = "String")
     private String orderNo;
 
+    @ApiModelProperty(value = "委托方id", dataType = "Long")
+    private Long customerId;
+
     @ApiModelProperty(value = "委托方名称", dataType = "String")
     private String customerName;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OrderSampleDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OrderSampleDTO.java
new file mode 100644
index 0000000..796edc0
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OrderSampleDTO.java
@@ -0,0 +1,19 @@
+package com.casic.missiles.dto.business.outsource;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/8/24 11:38
+ */
+@ApiModel
+@Data
+public class OrderSampleDTO {
+    @ApiModelProperty(value = "任务单id", dataType = "Long")
+    private Long orderId;
+    @ApiModelProperty(value = "受检设备id", dataType = "Long")
+    private Long sampleId;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceAssessApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceAssessApprovalListRequest.java
new file mode 100644
index 0000000..9a930c3
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceAssessApprovalListRequest.java
@@ -0,0 +1,30 @@
+package com.casic.missiles.dto.business.outsource;
+
+import com.casic.missiles.dto.BaseApprovalListRequest;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/8/24 11:01
+ */
+@ApiModel
+@Data
+public class OutsourceAssessApprovalListRequest extends BaseApprovalListRequest {
+    @ApiModelProperty(value = "评审表编号", dataType = "String")
+    private String projectNo;
+
+    @ApiModelProperty(value = "分包机构名称", dataType = "String")
+    private String outsourcerName;
+
+    @ApiModelProperty(value = "申请人", dataType = "String")
+    private String applicantName;
+
+    @ApiModelProperty(value = "申请时间开始", dataType = "String")
+    private String applicantTimeStart;
+
+    @ApiModelProperty(value = "申请时间结束", dataType = "String")
+    private String applicantTimeEnd;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceAssessSaveResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceAssessSaveResponse.java
new file mode 100644
index 0000000..8bf9aad
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceAssessSaveResponse.java
@@ -0,0 +1,20 @@
+package com.casic.missiles.dto.business.outsource;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/8/14 16:17
+ */
+@ApiModel
+@Data
+public class OutsourceAssessSaveResponse {
+    @ApiModelProperty(value = "主键id", dataType = "Long")
+    private Long id;
+
+    @ApiModelProperty(value = "编号", dataType = "String")
+    private String projectNo;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProtocolApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProtocolApprovalListRequest.java
new file mode 100644
index 0000000..0f32331
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProtocolApprovalListRequest.java
@@ -0,0 +1,30 @@
+package com.casic.missiles.dto.business.outsource;
+
+import com.casic.missiles.dto.BaseApprovalListRequest;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/8/24 15:01
+ */
+@ApiModel
+@Data
+public class OutsourceProtocolApprovalListRequest extends BaseApprovalListRequest {
+    @ApiModelProperty(value = "协议书编号", dataType = "String")
+    private String protocolNo;
+
+    @ApiModelProperty(value = "分包方名称", dataType = "String")
+    private String outsourcerName;
+
+    @ApiModelProperty(value = "申请人", dataType = "String")
+    private String applicantName;
+
+    @ApiModelProperty(value = "申请时间开始", dataType = "String")
+    private String applicantTimeStart;
+
+    @ApiModelProperty(value = "申请时间结束", dataType = "String")
+    private String applicantTimeEnd;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProtocolSaveResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProtocolSaveResponse.java
new file mode 100644
index 0000000..e324967
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProtocolSaveResponse.java
@@ -0,0 +1,20 @@
+package com.casic.missiles.dto.business.outsource;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/8/14 16:17
+ */
+@ApiModel
+@Data
+public class OutsourceProtocolSaveResponse {
+    @ApiModelProperty(value = "主键id", dataType = "Long")
+    private Long id;
+
+    @ApiModelProperty(value = "编号", dataType = "String")
+    private String protocolNo;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveApprovalListRequest.java
index f29f4e4..7047c28 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveApprovalListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveApprovalListRequest.java
@@ -5,8 +5,6 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import java.util.List;
-
 /**
  * @Description: 现场检测审批列表请求实体
  * @Author: wangpeng
@@ -30,7 +28,4 @@
     @ApiModelProperty(value = "申请时间结束", dataType = "String")
     private String applyTimeEnd;
 
-    @ApiModelProperty(value = "导出ids", dataType = "List")
-    private List<Long> ids;
-
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveDetailResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveDetailResponse.java
index 1f28752..394c934 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveDetailResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveDetailResponse.java
@@ -12,6 +12,18 @@
     @ApiModelProperty(value = "id，更新/删除使用参数", dataType = "Long")
     private Long id;
 
+    @ApiModelProperty(value = "实验室代码(字典code)", dataType = "String")
+    private String labCode;
+
+    @ApiModelProperty(value = "实验室代码(字典value)", dataType = "String")
+    private String labCodeName;
+
+    @ApiModelProperty(value = "组别代码(字典code)", dataType = "String")
+    private String groupCode;
+
+    @ApiModelProperty(value = "组别代码(字典value)", dataType = "String")
+    private String groupCodeName;
+
     @ApiModelProperty(value = "审批编号", dataType = "String")
     private String siteExecutiveNo;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/environment/LocationListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/environment/LocationListRequest.java
new file mode 100644
index 0000000..13d03c3
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/environment/LocationListRequest.java
@@ -0,0 +1,20 @@
+package com.casic.missiles.dto.resource.environment;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/6/8 13:56
+ */
+@ApiModel
+@Data
+public class LocationListRequest {
+    @ApiModelProperty(value = "地点编号", dataType = "String")
+    private String locationNo;
+
+    @ApiModelProperty(value = "地点名称", dataType = "String")
+    private String locationName;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/environment/LocationListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/environment/LocationListResponse.java
new file mode 100644
index 0000000..4c531af
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/environment/LocationListResponse.java
@@ -0,0 +1,78 @@
+package com.casic.missiles.dto.resource.environment;
+
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
+import com.baomidou.mybatisplus.annotation.TableField;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description: 地点列表响应实体
+ * @Author: wangpeng
+ * @Date: 2023/6/8 13:53
+ */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
+@ApiModel
+@Data
+public class LocationListResponse {
+    @ApiModelProperty(value = "主键id", dataType = "Long")
+    private Long id;
+
+    /**
+     * 地点编号
+     */
+    @ExcelProperty("地点编号")
+    @ApiModelProperty(value = "地点编号", dataType = "String")
+    private String locationNo;
+
+    /**
+     * 地点名称
+     */
+    @ExcelProperty("地点名称")
+    @ApiModelProperty(value = "地点名称", dataType = "String")
+    private String locationName;
+
+    /**
+     * 地点位置
+     */
+    @ExcelProperty("地点位置")
+    @ApiModelProperty(value = "地点位置", dataType = "String")
+    private String locationPosition;
+
+    /**
+     * 创建人id
+     */
+    @ApiModelProperty(value = "创建人id", dataType = "Long")
+    private Long createUserId;
+
+    /**
+     * 创建人
+     */
+    @ExcelProperty("创建人")
+    @ApiModelProperty(value = "创建人", dataType = "String")
+    @TableField("create_user")
+    private String createUser;
+
+    /**
+     * 创建时间
+     */
+    @ExcelProperty("创建时间")
+    @ApiModelProperty(value = "创建时间", dataType = "String")
+    private String createTime;
+
+    /**
+     * 更新时间
+     */
+    @ApiModelProperty(value = "更新时间", dataType = "String")
+    private String updateTime;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertRequest.java
index 9a7f6c6..c827915 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertRequest.java
@@ -4,6 +4,8 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * @Description:
  * @Author: wangpeng
@@ -16,4 +18,7 @@
     private String name;
     @ApiModelProperty(value = "部门名", dataType = "String")
     private String deptName;
+
+    @ApiModelProperty(value = "导出ids", dataType = "List")
+    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertResponse.java
index f78b159..8f2f79e 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertResponse.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.dto.resource.staff;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.casic.missiles.annotation.DictCodeField;
 import com.casic.missiles.constants.MeterDictCode;
 import io.swagger.annotations.ApiModel;
@@ -13,12 +20,18 @@
  * @Author: wangpeng
  * @Date: 2023/7/27 15:13
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @ApiModel
 @Data
 public class StaffCertResponse {
     /**
      * 人员编号
      */
+    @ExcelProperty(value = "人员编号",order = 0)
     @NotEmpty(message = "人员编号不能为空")
     @ApiModelProperty(value = "人员编号", dataType = "String")
     private String staffNo;
@@ -26,6 +39,7 @@
     /**
      * 姓名
      */
+    @ExcelProperty(value = "姓名",order = 1)
     @ApiModelProperty(value = "姓名", dataType = "String")
     private String staffName;
 
@@ -54,6 +68,7 @@
     /**
      * 部门名字
      */
+    @ExcelProperty(value = "工作部门",order = 2)
     @ApiModelProperty(value = "部门名字", dataType = "String")
     private String deptName;
 
@@ -66,6 +81,7 @@
     /**
      * 计量专业
      */
+    @ExcelProperty(value = "计量专业",order = 3)
     @ApiModelProperty(value = "计量专业", dataType = "String")
     private String major;
 
@@ -110,6 +126,7 @@
     /**
      * 证书号
      */
+    @ExcelProperty(value = "证号",order = 4)
     @ApiModelProperty(value = "证书号", dataType = "String")
     private String certNo;
 
@@ -122,12 +139,14 @@
     /**
      * 有效日期
      */
+    @ExcelProperty(value = "证书有效期",order = 6)
     @ApiModelProperty(value = "有效日期", dataType = "String")
     private String effectiveDate;
 
     /**
      * 发放日期
      */
+    @ExcelProperty(value = "发证日期",order = 5)
     @ApiModelProperty(value = "发放日期", dataType = "String")
     private String grantDate;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffListRequest.java
index 7c4afb3..0a1194a 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffListRequest.java
@@ -4,6 +4,8 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * @Description:
  * @Author: wangpeng
@@ -18,4 +20,7 @@
     private String deptName;
     @ApiModelProperty(value = "部门id", dataType = "Long")
     private Long deptId;
+
+    @ApiModelProperty(value = "导出ids", dataType = "List")
+    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/TrainListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/TrainListRequest.java
index f68597b..6321f8b 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/TrainListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/TrainListRequest.java
@@ -14,6 +14,8 @@
 public class TrainListRequest {
     @ApiModelProperty(value = "训练登记表编号", dataType = "String")
     private String trainNo;
+    @ApiModelProperty(value = "值班领导", dataType = "String")
+    private String dutyLeader;
     @ApiModelProperty(value = "创建开始时间", dataType = "String")
     private String createTimeStart;
     @ApiModelProperty(value = "创建结束时间", dataType = "String")
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/SignAddRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/SignAddRequest.java
index 117be34..d71055c 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/SignAddRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/SignAddRequest.java
@@ -43,13 +43,6 @@
     private Long signUserId;
 
     /**
-     * 签章或签名-字典code
-     */
-    @NotBlank(message = "类型不能为空")
-    @ApiModelProperty(value = "签名/签章-字典code", dataType = "String", required = true)
-    private String signType;
-
-    /**
      * minio存储文件名
      */
     @ApiModelProperty(value = "上传文件返回名称", dataType = "String")
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateAddRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateAddRequest.java
index aff1265..6316648 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateAddRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateAddRequest.java
@@ -17,30 +17,28 @@
 @Data
 public class TemplateAddRequest extends BaseSystemRequest {
     /**
-     * 原始记录模板/证书报告模板名称
+     * 模板名称
      */
     @ApiModelProperty(value = "名称", dataType = "String", required = true)
     @NotBlank(message = "名称不能为空")
     private String templateName;
 
     /**
-     * 原始记录模板/证书报告模板描述
+     * 模板描述
      */
     @ApiModelProperty(value = "描述", dataType = "String")
     private String templateDesc;
 
     /**
-     * 原始记录模板/证书报告模板创建人
+     * 创建人
      */
     @ApiModelProperty(value = "创建人", dataType = "String", required = true)
     @NotBlank(message = "创建人不能为空")
     private String templateCreator;
 
-    /**
-     * 原始记录模板/证书报告模板-字典code
-     */
-    @NotBlank(message = "类型不能为空")
-    @ApiModelProperty(value = "原始记录模板/证书报告模板-字典code", dataType = "String", required = true)
+
+    @NotBlank(message = "模板类型不能为空")
+    @ApiModelProperty(value = "模板类型(字典code)", dataType = "String", required = true)
     private String templateType;
 
     /**
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateListRequest.java
index eec5a1e..6d17bbe 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateListRequest.java
@@ -1,11 +1,12 @@
 package com.casic.missiles.dto.system;
 
+import com.casic.missiles.annotation.DictCodeField;
+import com.casic.missiles.constants.MeterDictCode;
 import com.casic.missiles.dto.BaseSystemRequest;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import javax.validation.constraints.NotBlank;
 import java.util.List;
 
 /**
@@ -19,8 +20,8 @@
     /**
      * 类型
      */
-//    @ApiModelProperty(value = "类型-字典code", dataType = "String", required = true)
-    @NotBlank(message = "类型不能为空")
+    @DictCodeField(message = "模板类型不合法", cacheName = MeterDictCode.TEMPLATE_TYPE)
+    @ApiModelProperty(value = "模板类型(字典code)", dataType = "String")
     private String templateType;
 
     /**
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificateChangeApply.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificateChangeApply.java
index 9216308..36923fd 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificateChangeApply.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificateChangeApply.java
@@ -1,11 +1,19 @@
 package com.casic.missiles.model.business;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 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 com.casic.missiles.dto.BaseRequest;
+import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -20,6 +28,12 @@
  * @author wangpeng
  * @since 2023-08-15
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
+@ApiModel
 @Data
 @TableName("biz_business_certificate_change_apply")
 public class BizBusinessCertificateChangeApply extends BaseRequest implements Serializable {
@@ -33,6 +47,7 @@
     /**
      * 申请单编号
      */
+    @ExcelProperty(value = "申请单编号", order = 1)
     @ApiModelProperty(value = "申请单编号", dataType = "String")
     @TableField("change_apply_no")
     private String changeApplyNo;
@@ -40,6 +55,7 @@
     /**
      * 申请单名字
      */
+    @ExcelProperty(value = "申请单名称", order = 2)
     @ApiModelProperty(value = "申请单名字", dataType = "String")
     @TableField("change_apply_name")
     private String changeApplyName;
@@ -54,6 +70,7 @@
     /**
      * 更换证书编号
      */
+    @ExcelProperty(value = "更换证书编号", order = 3)
     @ApiModelProperty(value = "更换证书编号", dataType = "String")
     @TableField("change_report_no")
     private String changeReportNo;
@@ -61,7 +78,8 @@
     /**
      * 更换证书名字
      */
-    @ApiModelProperty(value = "更换证书名字", dataType = "String")
+    @ExcelProperty(value = "更换证书/报告名称", order = 4)
+    @ApiModelProperty(value = "更换证书/报告名称", dataType = "String")
     @TableField("change_report_name")
     private String changeReportName;
 
@@ -73,6 +91,7 @@
     @TableField("change_type")
     private String changeType;
 
+    @ExcelProperty(value = "变更类型", order = 5)
     @ApiModelProperty(value = "变更类型(字典value)", dataType = "String")
     @TableField(exist = false)
     private String changeTypeName;
@@ -142,13 +161,15 @@
     /**
      * 创建用户名字
      */
-    @ApiModelProperty(value = "创建用户名字", dataType = "String")
+    @ExcelProperty(value = "创建人", order = 6)
+    @ApiModelProperty(value = "创建人名字", dataType = "String")
     @TableField("create_user_name")
     private String createUserName;
 
     /**
      * 创建时间
      */
+    @ExcelProperty(value = "创建时间", order = 7)
     @ApiModelProperty(value = "创建时间", dataType = "String")
     @TableField("create_time")
     private String createTime;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificateReport.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificateReport.java
index f01db9e..db06018 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificateReport.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificateReport.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.model.business;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -22,6 +29,11 @@
  * @author wangpeng
  * @since 2023-08-14
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @ApiModel
 @Data
 @TableName("biz_business_certificate_report")
@@ -36,6 +48,7 @@
     /**
      * 证书报告编号
      */
+    @ExcelProperty(value = "证书报告编号", order = 1)
     @ApiModelProperty(value = "证书报告编号", dataType = "String")
     @TableField("certificate_report_no")
     private String certificateReportNo;
@@ -43,6 +56,7 @@
     /**
      * 证书报告名称
      */
+    @ExcelProperty(value = "证书报告名称", order = 2)
     @ApiModelProperty(value = "证书报告名称", dataType = "String")
     @TableField("certificate_report_name")
     private String certificateReportName;
@@ -62,6 +76,7 @@
     @TableField("measure_category")
     private String measureCategory;
 
+    @ExcelProperty(value = "检校类别", order = 6)
     @ApiModelProperty(value = "检校类别(字典value)", dataType = "String")
     @TableField(exist = false)
     private String measureCategoryName;
@@ -69,6 +84,7 @@
     /**
      * 检校时间
      */
+    @ExcelProperty(value = "检校时间", order = 8)
     @ApiModelProperty(value = "检校时间", dataType = "String")
     @TableField("calibration_time")
     private String calibrationTime;
@@ -267,18 +283,22 @@
     @TableField(exist = false)
     private Integer decisionItem;
 
-    @ApiModelProperty(value = "设备样品编号（列表返回参数）", dataType = "String")
+    @ExcelProperty(value = "被检设备统一编号", order = 3)
+    @ApiModelProperty(value = "被检设备统一编号（列表返回参数）", dataType = "String")
     @TableField(exist = false)
     private String sampleNo;
 
-    @ApiModelProperty(value = "设备样品名称（列表返回参数）", dataType = "String")
+    @ExcelProperty(value = "被检设备名称", order = 4)
+    @ApiModelProperty(value = "被检设备名称（列表返回参数）", dataType = "String")
     @TableField(exist = false)
     private String sampleName;
 
-    @ApiModelProperty(value = "设备样品规格型号（列表返回参数）", dataType = "String")
+    @ExcelProperty(value = "规格型号", order = 5)
+    @ApiModelProperty(value = "规格型号（列表返回参数）", dataType = "String")
     @TableField(exist = false)
     private String sampleModel;
 
+    @ExcelProperty(value = "检定员", order = 7)
     @ApiModelProperty(value = "检定员名字（列表返回参数）", dataType = "String")
     @TableField(exist = false)
     private String staffName;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessIdentifyInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessIdentifyInfo.java
index 46bfba5..f1a9bec 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessIdentifyInfo.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessIdentifyInfo.java
@@ -1,10 +1,15 @@
 package com.casic.missiles.model.business;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 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;
 
@@ -20,6 +25,11 @@
  * @author wangpeng
  * @since 2023-08-15
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @Data
 @TableName("biz_business_identify_info")
 public class BizBusinessIdentifyInfo implements Serializable {
@@ -33,6 +43,7 @@
     /**
      * 记录编号
      */
+    @ExcelProperty(value = "记录编号", order = 1)
     @ApiModelProperty(value = "记录编号", dataType = "String")
     @TableField("record_no")
     private String recordNo;
@@ -41,20 +52,15 @@
      * 标志类型(字典code)
      */
     @NotEmpty(message = "标志类型不能为空")
-    @ApiModelProperty(value = "标志类型(字典code)", dataType = "String")
-    @DictCodeField(message = "标志类型不合法", cacheName = MeterDictCode.IDENTIFY_PRINT_TYPE)
+    @ApiModelProperty(value = "标志类型(直接存计量标识/使用状态/校准状态的字典value)", dataType = "String")
     @TableField("identify_type")
     private String identifyType;
 
-    @ApiModelProperty(value = "标志类型(字典value)", dataType = "String")
-    @TableField(exist = false)
-    private String identifyTypeName;
-
     /**
      * 设备id(可以是受检设备/设备台账)
      */
     @NotNull(message = "设备id不能为空")
-    @ApiModelProperty(value = "设备id(可以是受检设备/设备台账)", dataType = "String")
+    @ApiModelProperty(value = "设备id(可以是受检设备/设备台账)", dataType = "Long")
     @TableField("device_id")
     private Long deviceId;
 
@@ -66,29 +72,32 @@
     @TableField("device_type")
     private String deviceType;
 
+    @ExcelProperty(value = "统一编号", order = 3)
     @NotEmpty(message = "设备编号不能为空")
-    @ApiModelProperty(value = "设备编号", dataType = "String")
+    @ApiModelProperty(value = "统一编号", dataType = "String")
     @TableField("device_no")
     private String deviceNo;
 
     /**
      * 设备名字
      */
-    @NotEmpty(message = "设备名字不能为空")
-    @ApiModelProperty(value = "设备名字", dataType = "String")
+    @ExcelProperty(value = "设备名称", order = 4)
+    @NotEmpty(message = "设备名称不能为空")
+    @ApiModelProperty(value = "设备名称", dataType = "String")
     @TableField("device_name")
     private String deviceName;
 
     /**
      * 检定员id
      */
-    @ApiModelProperty(value = "检定员id", dataType = "String")
+    @ApiModelProperty(value = "检定员id", dataType = "Long")
     @TableField("measure_person_id")
     private Long measurePersonId;
 
     /**
      * 检定员名字
      */
+    @ExcelProperty(value = "检定员", order = 5)
     @ApiModelProperty(value = "检定员名字", dataType = "String")
     @TableField("measure_person")
     private String measurePerson;
@@ -103,7 +112,8 @@
     /**
      * 更新时间
      */
-    @ApiModelProperty(value = "更新时间", dataType = "String")
+    @ExcelProperty(value = "打印时间", order = 6)
+    @ApiModelProperty(value = "打印时间", dataType = "String")
     @TableField("update_time")
     private String updateTime;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceAssess.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceAssess.java
index 659d9ca..6720b90 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceAssess.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceAssess.java
@@ -1,11 +1,26 @@
 package com.casic.missiles.model.business;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 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 com.casic.missiles.dto.BaseRequest;
+import com.casic.missiles.dto.business.outsource.OrderSampleDTO;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import javax.validation.constraints.NotEmpty;
 import java.io.Serializable;
+import java.util.List;
 
 /**
  * <p>
@@ -15,146 +30,231 @@
  * @author wangpeng
  * @since 2023-08-16
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
+@ApiModel
 @Data
 @TableName("biz_business_outsource_assess")
-public class BizBusinessOutsourceAssess implements Serializable {
+public class BizBusinessOutsourceAssess extends BaseRequest implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
+    @ApiModelProperty(value = "id，更新/删除使用参数", dataType = "Long")
     @TableId("id")
     private Long id;
 
     /**
      * 评审表编号
      */
+    @ExcelProperty(value = "评审表编号", order = 1)
+    @ApiModelProperty(value = "评审表编号(后台生成)", dataType = "String")
     @TableField("project_no")
     private String projectNo;
 
     /**
      * 评审表名称
      */
+    @ExcelProperty(value = "评审表名称", order = 2)
+    @ApiModelProperty(value = "评审表名称", dataType = "String")
     @TableField("project_name")
     private String projectName;
 
+    @NotEmpty(message = "实验室代码不能为空")
+    @DictCodeField(message = "实验室代码描述不合法", cacheName = MeterDictCode.LAB_CODE)
+    @ApiModelProperty(value = "实验室代码(字典code)", dataType = "String")
+    @TableField("lab_code")
+    private String labCode;
+
+    @ApiModelProperty(value = "实验室代码(字典value)", dataType = "String")
+    @TableField(exist = false)
+    private String labCodeName;
+
+    /**
+     * 组别代码
+     */
+    @NotEmpty(message = "组别代码不能为空")
+    @DictCodeField(message = "组别代码描述不合法", cacheName = MeterDictCode.GROUP_CODE)
+    @ApiModelProperty(value = "组别代码(字典code)", dataType = "String")
+    @TableField("group_code")
+    private String groupCode;
+
+    @ApiModelProperty(value = "组别代码(字典value)", dataType = "String")
+    @TableField(exist = false)
+    private String groupCodeName;
+
     /**
      * 申请人id
      */
+    @ApiModelProperty(value = "申请人id", dataType = "String")
     @TableField("applicant_id")
     private Long applicantId;
 
     /**
      * 申请人名字
      */
+    @ExcelProperty(value = "申请人", order = 5)
+    @ApiModelProperty(value = "申请人", dataType = "String")
     @TableField("applicant_name")
     private String applicantName;
 
     /**
      * 申请时间
      */
+    @ExcelProperty(value = "申请时间", order = 6)
+    @ApiModelProperty(value = "申请时间", dataType = "String")
     @TableField("applicant_time")
     private String applicantTime;
 
     /**
      * 附件(minio存储文件名)
      */
+    @ApiModelProperty(value = "附件(minio存储文件名)", dataType = "String")
     @TableField("minio_file_name")
     private String minioFileName;
 
     /**
      * 备注
      */
+    @ApiModelProperty(value = "备注", dataType = "String")
     @TableField("remark")
     private String remark;
 
     /**
      * 创建人id
      */
+    @ApiModelProperty(value = "创建人id", dataType = "String")
     @TableField("create_user_id")
     private Long createUserId;
 
     /**
      * 创建人名字
      */
+    @ApiModelProperty(value = "创建人名字", dataType = "String")
     @TableField("create_user_name")
     private String createUserName;
 
     /**
      * 分包方id
      */
+    @ApiModelProperty(value = "评审表编号", dataType = "String")
     @TableField("outsourcer_id")
     private Long outsourcerId;
 
     /**
      * 预计开始时间
      */
+    @ApiModelProperty(value = "预计开始时间", dataType = "String")
     @TableField("pre_start_time")
     private String preStartTime;
 
     /**
      * 预计结束时间
      */
+    @ApiModelProperty(value = "预计结束时间", dataType = "String")
     @TableField("pre_end_time")
     private String preEndTime;
 
     /**
      * 分包原因-字典
      */
+    @ApiModelProperty(value = "分包原因(字典code)", dataType = "String")
+    @DictCodeField(message = "分包原因描述不合法", cacheName = MeterDictCode.OUTSOURCE_REASON)
     @TableField("outsource_reason")
     private String outsourceReason;
 
+    @ApiModelProperty(value = "分包原因(字典value)", dataType = "String")
+    @TableField(exist = false)
+    private String outsourceReasonName;
+
     /**
      * 预计费用
      */
+    @ApiModelProperty(value = "预计费用", dataType = "String")
     @TableField("pre_cost")
     private String preCost;
 
     /**
      * 审批状态
      */
+    @ApiModelProperty(value = "审批状态", dataType = "String")
+    @DictCodeField(message = "审批状态描述不合法", cacheName = MeterDictCode.APPROVAL_STATUS)
     @TableField("approval_status")
     private String approvalStatus;
 
     /**
      * 流程实例id
      */
+    @ApiModelProperty(value = "流程实例id", dataType = "String")
     @TableField("process_id")
     private String processId;
 
     /**
      * 实验室认可情况
      */
+    @ApiModelProperty(value = "实验室认可情况", dataType = "String")
     @TableField("approve_situation")
     private String approveSituation;
 
     /**
      * 溯源性
      */
+    @ApiModelProperty(value = "溯源性", dataType = "String")
     @TableField("traceability")
     private String traceability;
 
     /**
      * 测试方法
      */
+    @ApiModelProperty(value = "测试方法", dataType = "String")
     @TableField("test_method")
     private String testMethod;
 
     /**
      * 技术能力
      */
+    @ApiModelProperty(value = "技术能力", dataType = "String")
     @TableField("technique_ability")
     private String techniqueAbility;
 
     /**
      * 创建时间
      */
+    @ApiModelProperty(hidden = true)
     @TableField("create_time")
     private String createTime;
 
     /**
      * 更新时间
      */
+    @ApiModelProperty(hidden = true)
     @TableField("update_time")
     private String updateTime;
 
+    @ApiModelProperty(value = "审批状态类型-字典value", dataType = "String")
+    @TableField(exist = false)
+    private String approvalStatusName;
 
+    @ApiModelProperty(value = "任务id（同意、驳回等操作使用）", dataType = "String")
+    @TableField(exist = false)
+    private String taskId;
+
+    @ApiModelProperty(value = "可选决策项（1同意驳回拒绝 2同意驳回 3同意拒绝，用于待审批列表同意/驳回/拒绝按钮展示）", dataType = "Integer")
+    @TableField(exist = false)
+    private Integer decisionItem;
+
+    @NotEmpty(message = "受检设备信息不能为空")
+    @ApiModelProperty(value = "受检设备id列表（新建使用参数）", dataType = "List")
+    @TableField(exist = false)
+    private List<OrderSampleDTO> orderSampleList;
+
+    @ExcelProperty(value = "分包机构名称", order = 3)
+    @ApiModelProperty(value = "分包机构名称（列表返回参数）", dataType = "String")
+    private String outsourcerName;
+
+    @ExcelProperty(value = "机构负责人", order = 4)
+    @ApiModelProperty(value = "机构负责人（列表返回参数）", dataType = "String")
+    private String director;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceProtocol.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceProtocol.java
new file mode 100644
index 0000000..38df697
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceProtocol.java
@@ -0,0 +1,225 @@
+package com.casic.missiles.model.business;
+
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
+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 com.casic.missiles.dto.BaseRequest;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotEmpty;
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 计量检定业务-分包管理-测试、校准或检定工作分包协议书
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-08-24
+ */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
+@Data
+@TableName("biz_business_outsource_protocol")
+public class BizBusinessOutsourceProtocol extends BaseRequest implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "id，更新/删除使用参数", dataType = "Long")
+    @TableId("id")
+    private Long id;
+
+    /**
+     * 协议书编号
+     */
+    @ExcelProperty(value = "协议书编号", order = 1)
+    @ApiModelProperty(value = "协议书编号(后台生成)", dataType = "String")
+    @TableField("protocol_no")
+    private String protocolNo;
+
+    /**
+     * 协议书名称
+     */
+    @ExcelProperty(value = "协议书名称", order = 2)
+    @ApiModelProperty(value = "协议书名称", dataType = "String")
+    @TableField("project_name")
+    private String projectName;
+
+    @NotEmpty(message = "实验室代码不能为空")
+    @DictCodeField(message = "实验室代码描述不合法", cacheName = MeterDictCode.LAB_CODE)
+    @ApiModelProperty(value = "实验室代码(字典code)", dataType = "String")
+    @TableField("lab_code")
+    private String labCode;
+
+    @ApiModelProperty(value = "实验室代码(字典value)", dataType = "String")
+    @TableField(exist = false)
+    private String labCodeName;
+
+    @NotEmpty(message = "组别代码不能为空")
+    @DictCodeField(message = "组别代码描述不合法", cacheName = MeterDictCode.GROUP_CODE)
+    @ApiModelProperty(value = "组别代码(字典code)", dataType = "String")
+    @TableField("group_code")
+    private String groupCode;
+
+    @ApiModelProperty(value = "组别代码(字典value)", dataType = "String")
+    @TableField(exist = false)
+    private String groupCodeName;
+
+    /**
+     * 分包方id
+     */
+    @ApiModelProperty(value = "分包方id", dataType = "Long")
+    @TableField("outsourcer_id")
+    private Long outsourcerId;
+
+    /**
+     * 其他
+     */
+    @ApiModelProperty(value = "其他", dataType = "String")
+    @TableField("remark")
+    private String remark;
+
+    /**
+     * 分包方编号
+     */
+    @ApiModelProperty(value = "分包方编号(新建不用传)", dataType = "String")
+    @TableField("outsource_no")
+    private String outsourceNo;
+
+    /**
+     * 分包方名称
+     */
+    @ExcelProperty(value = "分包方名称", order = 3)
+    @ApiModelProperty(value = "分包方名称(新建不用传)", dataType = "String")
+    @TableField("outsource_name")
+    private String outsourceName;
+
+    /**
+     * 联系人
+     */
+    @ExcelProperty(value = "联系人", order = 4)
+    @ApiModelProperty(value = "联系人", dataType = "String")
+    @TableField("contacts")
+    private String contacts;
+
+    /**
+     * 电话
+     */
+    @ApiModelProperty(value = "电话", dataType = "String")
+    @TableField("mobile")
+    private String mobile;
+
+    /**
+     * 地址
+     */
+    @ApiModelProperty(value = "地址", dataType = "String")
+    @TableField("address")
+    private String address;
+
+    /**
+     * 要求完成日期
+     */
+    @ApiModelProperty(value = "要求完成日期", dataType = "String")
+    @TableField("require_date")
+    private String requireDate;
+
+    /**
+     * 分包费用(元)
+     */
+    @ApiModelProperty(value = "分包费用(元)", dataType = "String")
+    @TableField("outsource_cost")
+    private Double outsourceCost;
+
+    /**
+     * 分包方负责人
+     */
+    @ApiModelProperty(value = "分包方负责人", dataType = "String")
+    @TableField("director")
+    private String director;
+
+    /**
+     * 分包项目
+     */
+    @ApiModelProperty(value = "分包项目", dataType = "String")
+    @TableField("item")
+    private String item;
+
+    /**
+     * 分包要求
+     */
+    @ApiModelProperty(value = "分包要求", dataType = "String")
+    @TableField("requires")
+    private String requires;
+
+    /**
+     * 创建人id
+     */
+    @ApiModelProperty(hidden = true)
+    @TableField("create_user_id")
+    private Long createUserId;
+
+    /**
+     * 创建人名字
+     */
+    @ExcelProperty(value = "申请人", order = 5)
+    @ApiModelProperty(value = "申请人", dataType = "String")
+    @TableField("create_user_name")
+    private String createUserName;
+
+    /**
+     * 审批状态
+     */
+    @ApiModelProperty(value = "审批状态", dataType = "String")
+    @DictCodeField(message = "审批状态描述不合法", cacheName = MeterDictCode.APPROVAL_STATUS)
+    @TableField("approval_status")
+    private String approvalStatus;
+
+    /**
+     * 流程实例id
+     */
+    @ApiModelProperty(value = "流程实例id", dataType = "String")
+    @TableField("process_id")
+    private String processId;
+
+    /**
+     * 创建时间
+     */
+    @ExcelProperty(value = "申请时间", order = 6)
+    @ApiModelProperty(value = "申请时间", dataType = "String")
+    @TableField("create_time")
+    private String createTime;
+
+    /**
+     * 更新时间
+     */
+    @ApiModelProperty(hidden = true)
+    @TableField("update_time")
+    private String updateTime;
+
+    @ApiModelProperty(value = "审批状态类型-字典value", dataType = "String")
+    @TableField(exist = false)
+    private String approvalStatusName;
+
+    @ApiModelProperty(value = "任务id（同意、驳回等操作使用）", dataType = "String")
+    @TableField(exist = false)
+    private String taskId;
+
+    @ApiModelProperty(value = "可选决策项（1同意驳回拒绝 2同意驳回 3同意拒绝，用于待审批列表同意/驳回/拒绝按钮展示）", dataType = "Integer")
+    @TableField(exist = false)
+    private Integer decisionItem;
+
+
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourcerInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourcerInfo.java
index ec4e997..f9aa69e 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourcerInfo.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourcerInfo.java
@@ -17,6 +17,7 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import javax.validation.constraints.NotEmpty;
 import java.io.Serializable;
 
 /**
@@ -59,6 +60,29 @@
     @TableField("outsourcer_name")
     private String outsourcerName;
 
+    @NotEmpty(message = "实验室代码不能为空")
+    @DictCodeField(message = "实验室代码描述不合法", cacheName = MeterDictCode.LAB_CODE)
+    @ApiModelProperty(value = "实验室代码(字典code)", dataType = "String")
+    @TableField("lab_code")
+    private String labCode;
+
+    @ApiModelProperty(value = "实验室代码(字典value)", dataType = "String")
+    @TableField(exist = false)
+    private String labCodeName;
+
+    /**
+     * 组别代码
+     */
+    @NotEmpty(message = "组别代码不能为空")
+    @DictCodeField(message = "组别代码描述不合法", cacheName = MeterDictCode.GROUP_CODE)
+    @ApiModelProperty(value = "组别代码(字典code)", dataType = "String")
+    @TableField("group_code")
+    private String groupCode;
+
+    @ApiModelProperty(value = "组别代码(字典value)", dataType = "String")
+    @TableField(exist = false)
+    private String groupCodeName;
+
     /**
      * 单位简称
      */
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardInfo.java
index c48eed7..dffdfdd 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardInfo.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardInfo.java
@@ -5,6 +5,7 @@
 import com.baomidou.mybatisplus.annotation.TableName;
 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;
 
@@ -18,6 +19,7 @@
  * @author wangpeng
  * @since 2023-08-04
  */
+@ApiModel
 @Data
 @TableName("biz_equipment_standard_info")
 public class BizEquipmentStandardInfo implements Serializable {
@@ -119,7 +121,7 @@
      * 管理状态(字典code)
      */
     @ApiModelProperty(value = "管理状态(字典code)", dataType = "String")
-    @DictCodeField(message = "管理状态不合法", cacheName = MeterDictCode.MANAGER_STATE)
+    @DictCodeField(message = "管理状态不合法", cacheName = MeterDictCode.STANDARD_MANAGER_STATE)
     @TableField("manage_status")
     private String manageStatus;
 
@@ -151,7 +153,7 @@
     /**
      * 温度(℃)
      */
-    @ApiModelProperty(value = "使用状态(字典code)", dataType = "String")
+    @ApiModelProperty(value = "温度(℃)", dataType = "String")
     @TableField("temperature")
     private Double temperature;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardInfoApproval.java b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardInfoApproval.java
index dbd86ab..9f58d83 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardInfoApproval.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardInfoApproval.java
@@ -150,7 +150,7 @@
      * 管理状态(字典code)
      */
     @ApiModelProperty(value = "管理状态(字典code)", dataType = "String")
-    @DictCodeField(message = "管理状态不合法", cacheName = MeterDictCode.MANAGER_STATE)
+    @DictCodeField(message = "管理状态不合法", cacheName = MeterDictCode.STANDARD_MANAGER_STATE)
     @TableField("manage_status")
     private String manageStatus;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardTechnologyRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardTechnologyRelation.java
index 0e612bd..751f26b 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardTechnologyRelation.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardTechnologyRelation.java
@@ -3,6 +3,7 @@
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -16,6 +17,7 @@
  * @author wangpeng
  * @since 2023-08-04
  */
+@ApiModel
 @Data
 @TableName("biz_equipment_standard_technology_relation")
 public class BizEquipmentStandardTechnologyRelation implements Serializable {
@@ -33,6 +35,10 @@
     @TableField("technology_file_id")
     private Long technologyFileId;
 
+    @ApiModelProperty(value = "依据的技术文件编号", dataType = "String")
+    @TableField("technology_file_no")
+    private String technologyFileNo;
+
     /**
      * 依据的技术文件名称(技术文件中现行测试校准检定方法表文件名字段)
      */
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerInfo.java
index d6e8bed..65cd6bc 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerInfo.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerInfo.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.model.resource;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -21,6 +28,11 @@
  * @author wangpeng
  * @since 2023-08-08
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @ApiModel
 @Data
 @TableName("biz_resource_customer_info")
@@ -35,6 +47,7 @@
     /**
      * 委托方编号
      */
+    @ExcelProperty(value = "委托方编号", order = 1)
     @ApiModelProperty(value = "委托方编号", dataType = "String")
     @TableField("customer_no")
     private String customerNo;
@@ -42,6 +55,7 @@
     /**
      * 委托方名称
      */
+    @ExcelProperty(value = "委托方名称", order = 2)
     @ApiModelProperty(value = "委托方名称(新建时为下拉选择一个受检单位组织的名字，传deptId字段，后端获取名称)", dataType = "String")
     @TableField("customer_name")
     private String customerName;
@@ -63,6 +77,7 @@
     /**
      * 联系人
      */
+    @ExcelProperty(value = "联系人", order = 3)
     @ApiModelProperty(value = "联系人", dataType = "String")
     @TableField("contacts")
     private String contacts;
@@ -70,6 +85,7 @@
     /**
      * 座机电话
      */
+    @ExcelProperty(value = "座机电话", order = 4)
     @ApiModelProperty(value = "座机电话", dataType = "String")
     @TableField("mobile")
     private String mobile;
@@ -77,6 +93,7 @@
     /**
      * 手机号码
      */
+    @ExcelProperty(value = "手机号码", order = 5)
     @ApiModelProperty(value = "手机号码", dataType = "String")
     @TableField("phone")
     private String phone;
@@ -91,6 +108,7 @@
     /**
      * 地址
      */
+    @ExcelProperty(value = "地址", order = 6)
     @ApiModelProperty(value = "地址", dataType = "String")
     @TableField("address")
     private String address;
@@ -141,6 +159,7 @@
     /**
      * 创建时间
      */
+    @ExcelProperty(value = "创建时间", order = 7)
     @ApiModelProperty(value = "创建时间", dataType = "String")
     @TableField("create_time")
     private String createTime;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerSuggestForm.java b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerSuggestForm.java
index 7201bbd..701bf8b 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerSuggestForm.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerSuggestForm.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.model.resource;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -22,6 +29,11 @@
  * @author wangpeng
  * @since 2023-08-08
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @ApiModel
 @Data
 @TableName("biz_resource_customer_suggest_form")
@@ -44,7 +56,8 @@
     /**
      * 委托方名称
      */
-    @ApiModelProperty(value = "委托方名称", dataType = "String")
+    @ExcelProperty(value = "意见反馈单位", order = 2)
+    @ApiModelProperty(value = "意见反馈单位", dataType = "String")
     @TableField("customer_name")
     private String customerName;
 
@@ -59,7 +72,8 @@
     /**
      * 委托方意见反馈部门名称
      */
-    @ApiModelProperty(value = "委托方意见反馈部门名称", dataType = "String")
+    @ExcelProperty(value = "委托方意见反馈部门", order = 3)
+    @ApiModelProperty(value = "委托方意见反馈部门", dataType = "String")
     @TableField("customer_dept_name")
     private String customerDeptName;
 
@@ -73,6 +87,7 @@
     /**
      * 表单编号
      */
+    @ExcelProperty(value = "表单编号", order = 1)
     @ApiModelProperty(value = "表单编号", dataType = "String")
     @TableField("form_no")
     private String formNo;
@@ -111,6 +126,7 @@
     /**
      * 创建人名字
      */
+    @ExcelProperty(value = "创建人", order = 4)
     @ApiModelProperty(value = "创建人名字", dataType = "String")
     @TableField("create_user_name")
     private String createUserName;
@@ -147,6 +163,7 @@
     /**
      * 创建时间
      */
+    @ExcelProperty(value = "创建时间", order = 5)
     @ApiModelProperty(value = "创建时间", dataType = "String")
     @TableField("create_time")
     private String createTime;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSealInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSealInfo.java
index cbf05d7..9bf389d 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSealInfo.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSealInfo.java
@@ -106,6 +106,10 @@
     @TableField("minio_file_name")
     private String minioFileName;
 
+    @ApiModelProperty(value = "minio存储文件url", dataType = "String")
+    @TableField(exist = false)
+    private String minioFileUrl;
+
     @ApiModelProperty(value = "创建时间", dataType = "String")
     @TableField("create_time")
     private String createTime;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSealUseNote.java b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSealUseNote.java
index 3f2d9e8..3ce16a8 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSealUseNote.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSealUseNote.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.model.resource;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -20,6 +27,11 @@
  * @author wangpeng
  * @since 2023-07-28
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @ApiModel
 @Data
 @TableName("biz_resource_seal_use_note")
@@ -34,6 +46,7 @@
     /**
      * 登记表编号
      */
+    @ExcelProperty(value = "申请单编号", order = 1)
     @ApiModelProperty(value = "登记表编号(自动生成)", dataType = "String")
     @TableField("note_form_no")
     private String noteFormNo;
@@ -55,6 +68,7 @@
     /**
      * 申请部门
      */
+    @ExcelProperty(value = "申请部门", order = 5)
     @ApiModelProperty(value = "申请部门", dataType = "String")
     @TableField("apply_dept_name")
     private String applyDeptName;
@@ -69,6 +83,7 @@
     /**
      * 申请人
      */
+    @ExcelProperty(value = "申请人", order = 6)
     @ApiModelProperty(value = "申请人", dataType = "String")
     @TableField("apply_user_name")
     private String applyUserName;
@@ -76,6 +91,7 @@
     /**
      * 申请时间
      */
+    @ExcelProperty(value = "申请时间", order = 7)
     @ApiModelProperty(value = "申请时间(新增自动获取当前时间)", dataType = "String")
     @TableField("apply_time")
     private String applyTime;
@@ -130,6 +146,26 @@
     @TableField("update_time")
     private String updateTime;
 
+    @ExcelProperty(value = "印章名称", order = 2)
+    @ApiModelProperty(value = "印章名称(列表返回参数)", dataType = "String")
+    @TableField(exist = false)
+    private String sealName;
+
+    @DictCodeField(message = "印章类型描述不合法", cacheName = MeterDictCode.SEAL_TYPE)
+    @ApiModelProperty(hidden = true)
+    @TableField(exist = false)
+    private String sealType;
+
+    @ExcelProperty(value = "印章类型", order = 3)
+    @ApiModelProperty(value = "印章类型(列表返回参数)", dataType = "String")
+    @TableField(exist = false)
+    private String sealTypeName;
+
+    @ExcelProperty(value = "批准人", order = 4)
+    @ApiModelProperty(value = "批准人(列表返回参数)", dataType = "String")
+    @TableField(exist = false)
+    private String approverName;
+
     @ApiModelProperty(value = "审批状态类型-字典value", dataType = "String")
     @TableField(exist = false)
     private String approvalStatusName;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceStaffInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceStaffInfo.java
index 5ef995b..41563a1 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceStaffInfo.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceStaffInfo.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.model.resource;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -20,6 +27,11 @@
  * @author wangpeng
  * @since 2023-07-25
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @ApiModel
 @Data
 @TableName("biz_resource_staff_info")
@@ -38,6 +50,7 @@
     /**
      * 人员编号
      */
+    @ExcelProperty(value = "人员编号",order = 0)
     @NotEmpty(message = "人员编号不能为空")
     @ApiModelProperty(value = "人员编号", dataType = "String")
     @TableField("staff_no")
@@ -46,6 +59,7 @@
     /**
      * 姓名
      */
+    @ExcelProperty(value = "姓名",order = 1)
     @ApiModelProperty(value = "姓名", dataType = "String")
     @TableField("staff_name")
     private String staffName;
@@ -152,13 +166,15 @@
     /**
      * 部门名字
      */
-    @ApiModelProperty(value = "部门名字", dataType = "String")
+    @ExcelProperty(value = "工作部门",order = 4)
+    @ApiModelProperty(value = "工作部门", dataType = "String")
     @TableField("dept_name")
     private String deptName;
 
     /**
      * 岗位
      */
+    @ExcelProperty(value = "岗位",order = 2)
     @ApiModelProperty(value = "岗位", dataType = "String")
     @TableField("station")
     private String station;
@@ -166,6 +182,7 @@
     /**
      * 计量专业
      */
+    @ExcelProperty(value = "计量专业",order = 5)
     @ApiModelProperty(value = "计量专业", dataType = "String")
     @TableField("major")
     private String major;
@@ -173,6 +190,7 @@
     /**
      * 证号
      */
+    @ExcelProperty(value = "证号",order = 3)
     @ApiModelProperty(value = "证号", dataType = "String")
     @TableField("certificate_number")
     private String certificateNumber;

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java
index bb0c50f..13a699b 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java
@@ -12,6 +12,7 @@
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.IGeneralApprovalService;
+import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
@@ -19,6 +20,7 @@
 import org.springframework.web.bind.annotation.RequestBody;
 
 import javax.validation.Valid;
+import java.util.List;
 import java.util.Objects;
 
 /**
@@ -117,4 +119,17 @@
         }
         return baseApprovalService.failUpdate(request);
     }
+
+    public List<O> exportList(@RequestBody @Valid R request) throws Exception {
+        List<O> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = baseApprovalService.listExportByIds(request.getIds());
+        } else {
+            list = baseApprovalService.listExport(request);
+        }
+        for (O record : list) {
+            DictCodeUtils.convertDictCodeToName(record);
+        }
+        return list;
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java
index 8a90961..d775831 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java
@@ -5,6 +5,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.business.certificate.CertificateChangeApplyApprovalListRequest;
 import com.casic.missiles.dto.business.certificate.CertificateChangeApplySaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessCertificateChangeApply;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
@@ -20,6 +21,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -48,4 +50,12 @@
         }
         return changeApplyService.saveChangeApply(request);
     }
+
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody CertificateChangeApplyApprovalListRequest request) throws Exception {
+        List<BizBusinessCertificateChangeApply> list = super.exportList(request);
+        super.exportExcel(BizBusinessCertificateChangeApply.class, list, ExportEnum.CERTIFICATE_CHANGE_APPLY.getSheetName());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java
index 5fc4b07..af8230e 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java
@@ -9,6 +9,7 @@
 import com.casic.missiles.dto.business.certificate.CertificatePrintApprovalListRequest;
 import com.casic.missiles.dto.business.certificate.CertificatePrintListResponse;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.enums.business.CertificatePrintStatusEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessCertificatePrintLog;
@@ -18,10 +19,16 @@
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.io.IOException;
+import java.util.List;
 import java.util.Objects;
 
 /**
@@ -98,4 +105,16 @@
         });
         return certificatePrintService.certificatePrintLog(idDTO.getId());
     }
+
+    @ApiOperation("证书打印审批导出")
+    @PostMapping("/listExport")
+    public void exportList(@RequestBody CertificatePrintApprovalListRequest request) throws IOException {
+        List<CertificatePrintListResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = certificatePrintService.listByIds(request.getIds());
+        } else {
+            list = certificatePrintService.list(request);
+        }
+        super.exportExcel(CertificatePrintListResponse.class, list, ExportEnum.CERTIFICATE_PRINT.getSheetName());
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java
index 63b06dc..6b2efd5 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java
@@ -6,6 +6,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.business.certificate.CertificateReportApprovalListRequest;
 import com.casic.missiles.dto.business.certificate.CertificateReportSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessCertificateReport;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
@@ -21,6 +22,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -50,7 +52,7 @@
         return certificateReportService.saveCertificateReport(request);
     }
 
-    @ApiOperation("证书审批详情（基本信息）")
+    @ApiOperation("详情（基本信息）")
     @PostMapping("/detail")
     public ReturnDTO<BizBusinessCertificateReport> detail(@RequestBody @Valid BaseDetailRequest request, BindingResult bindingResult) throws Exception {
         if(bindingResult.hasErrors()){
@@ -59,4 +61,11 @@
         return certificateReportService.detail(request);
     }
 
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody CertificateReportApprovalListRequest request) throws Exception {
+        List<BizBusinessCertificateReport> list = super.exportList(request);
+        super.exportExcel(BizBusinessCertificateReport.class, list, ExportEnum.CERTIFICATE_REPORT.getSheetName());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java
index 46b26bd..57c0809 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java
@@ -10,20 +10,21 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.business.identify.IdentifyListRequest;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessIdentifyInfo;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.business.IBizBusinessIdentifyInfoService;
+import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import javax.validation.Valid;
+import java.util.List;
 import java.util.Objects;
 
 /**
@@ -57,16 +58,13 @@
         return identifyInfoService.addIdentify(identifyInfo);
     }
 
-    @ApiOperation("标识打印更新")
+    @ApiOperation("标识打印更新（更新打印时间）")
     @PostMapping("/update")
-    public ReturnDTO updateIdentify(@RequestBody @Valid BizBusinessIdentifyInfo identifyInfo, BindingResult bindingResult) {
-        Assert.isFalse(Objects.isNull(identifyInfo.getId()), () -> {
+    public ReturnDTO updateIdentify(@RequestBody @Valid IdDTO idDTO) {
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        Assert.isFalse(bindingResult.hasErrors(), () -> {
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        });
-        return identifyInfoService.updateIdentify(identifyInfo);
+        return identifyInfoService.updateIdentify(idDTO.getId());
     }
 
     @ApiOperation("标识打印删除")
@@ -77,4 +75,37 @@
         });
         return identifyInfoService.deleteIdentify(idDTO.getId());
     }
+
+    @ApiOperation("标识打印导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody @Valid IdentifyListRequest request, BindingResult bindingResult) throws Exception {
+        if (bindingResult.hasErrors()) {
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        List<BizBusinessIdentifyInfo> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = identifyInfoService.listByIds(request.getIds());
+        } else {
+            list = identifyInfoService.list(request);
+        }
+        for (BizBusinessIdentifyInfo record : list) {
+            DictCodeUtils.convertDictCodeToName(record);
+        }
+        super.exportExcel(BizBusinessIdentifyInfo.class, list, ExportEnum.IDENTIFY_EXPORT.getSheetName());
+    }
+
+
+    // TODO: 2023/8/23 查询设备信息，4个底部按钮查设备（按钮的作用就是前端用来调不同接口、用来区分中间即将展示的标识），前端弹窗选设备，在确定保存时前端根据底部按钮判断传入设备类型deviceType字典code
+    // TODO: 2023/8/23 接口：查受检设备（第1个按钮），查设备台账（后3个按钮同一接口），查询之后前端根据标志类型的不同加到中间页面时进行判断（按产品给的对应表）
+    // TODO: 2023/8/23 提供二维码接口，前端在加到中间页面时调用一下
+
+    @ApiOperation("设备二维码")
+    @PostMapping("/equipment/qrCode")
+    public ReturnDTO<String> equipmentQrCode(@RequestBody @Valid IdDTO idDTO) {
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return identifyInfoService.equipmentQrCode(idDTO.getId());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java
index 707be6e..7e0453d 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java
@@ -117,7 +117,7 @@
     }
 
     @ApiOperation("任务单导出")
-    @PostMapping("/export")
+    @PostMapping("/listExport")
     public void orderExport(@RequestBody @Valid OrderListRequest request, HttpServletResponse response) {
         businessOrderService.orderExport(request, response);
     }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java
index 529a6ce..51432be 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java
@@ -1,9 +1,28 @@
 package com.casic.missiles.controller.business;
 
+import com.casic.missiles.controller.GeneralApprovalController;
+import com.casic.missiles.dto.BaseApprovalSubmitRequest;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.business.outsource.OutsourceAssessApprovalListRequest;
+import com.casic.missiles.dto.business.outsource.OutsourceAssessSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
+import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.model.business.BizBusinessOutsourceAssess;
+import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
+import com.casic.missiles.service.IGeneralApprovalService;
+import com.casic.missiles.service.business.IBizBusinessOutsourceAssessService;
 import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.BindingResult;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.validation.Valid;
+import java.util.List;
+
 /**
  * <p>
  * 计量检定业务-分包管理-测试、校准或检定工作分包评审表 前端控制器
@@ -15,6 +34,27 @@
 @Api(tags = "分包管理-测试、校准或检定工作分包评审表")
 @RestController
 @RequestMapping("/business/outsource/assess")
-public class BizBusinessOutsourceAssessController {
+public class BizBusinessOutsourceAssessController extends GeneralApprovalController<BizBusinessOutsourceAssess, BizBusinessOutsourceAssess, OutsourceAssessApprovalListRequest, BaseApprovalSubmitRequest> {
+    @Autowired
+    private IBizBusinessOutsourceAssessService outsourceAssessService;
 
+    public BizBusinessOutsourceAssessController(IGeneralApprovalService<BizBusinessOutsourceAssess, BizBusinessOutsourceAssess, OutsourceAssessApprovalListRequest, BaseApprovalSubmitRequest> baseApprovalService) {
+        super(baseApprovalService);
+    }
+
+    @ApiOperation("草稿箱-保存")
+    @PostMapping("/save")
+    public ReturnDTO<OutsourceAssessSaveResponse> saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceAssess request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        return outsourceAssessService.saveOutsourceAssess(request);
+    }
+
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception {
+        List<BizBusinessOutsourceAssess> list = super.exportList(request);
+        super.exportExcel(BizBusinessOutsourceAssess.class, list, ExportEnum.OUTSOURCE_ASSESS.getSheetName());
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java
new file mode 100644
index 0000000..9adef18
--- /dev/null
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java
@@ -0,0 +1,60 @@
+package com.casic.missiles.controller.business;
+
+import com.casic.missiles.controller.GeneralApprovalController;
+import com.casic.missiles.dto.BaseApprovalSubmitRequest;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.business.outsource.OutsourceProtocolApprovalListRequest;
+import com.casic.missiles.dto.business.outsource.OutsourceProtocolSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
+import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.model.business.BizBusinessOutsourceProtocol;
+import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
+import com.casic.missiles.service.IGeneralApprovalService;
+import com.casic.missiles.service.business.IBizBusinessOutsourceProtocolService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.BindingResult;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.validation.Valid;
+import java.util.List;
+
+/**
+ * <p>
+ * 计量检定业务-分包管理-测试、校准或检定工作分包协议书 前端控制器
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-08-24
+ */
+@Api(tags = "分包管理-测试、校准或检定工作分包协议书")
+@RestController
+@RequestMapping("/business/outsource/protocol")
+public class BizBusinessOutsourceProtocolController extends GeneralApprovalController<BizBusinessOutsourceProtocol, BizBusinessOutsourceProtocol, OutsourceProtocolApprovalListRequest, BaseApprovalSubmitRequest> {
+    @Autowired
+    private IBizBusinessOutsourceProtocolService outsourceProtocolService;
+
+    public BizBusinessOutsourceProtocolController(IGeneralApprovalService<BizBusinessOutsourceProtocol, BizBusinessOutsourceProtocol, OutsourceProtocolApprovalListRequest, BaseApprovalSubmitRequest> baseApprovalService) {
+        super(baseApprovalService);
+    }
+
+    @ApiOperation("草稿箱-保存")
+    @PostMapping("/save")
+    public ReturnDTO<OutsourceProtocolSaveResponse> saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceProtocol request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        return outsourceProtocolService.saveOutsourceProtocol(request);
+    }
+
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody OutsourceProtocolApprovalListRequest request) throws Exception {
+        List<BizBusinessOutsourceProtocol> list = super.exportList(request);
+        super.exportExcel(BizBusinessOutsourceProtocol.class, list, ExportEnum.OUTSOURCE_PROTOCOL.getSheetName());
+    }
+}
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java
index 097f645..f0f0943 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java
@@ -17,7 +17,6 @@
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.IGeneralApprovalService;
 import com.casic.missiles.service.business.IBizBusinessOutsourcerInfoService;
-import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -71,19 +70,8 @@
 
     @ApiOperation("分包方导出")
     @PostMapping("/listExport")
-    public void export(@RequestBody @Valid OutsourcerInfoApprovalListRequest request, BindingResult bindingResult) throws Exception {
-        if (bindingResult.hasErrors()) {
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        }
-        List<BizBusinessOutsourcerInfo> list;
-        if (!CollectionUtils.isEmpty(request.getIds())) {
-            list = outsourcerInfoService.listByIds(request.getIds());
-        } else {
-            list = outsourcerInfoService.list(request);
-        }
-        for (BizBusinessOutsourcerInfo record : list) {
-            DictCodeUtils.convertDictCodeToName(record);
-        }
+    public void export(@RequestBody OutsourcerInfoApprovalListRequest request) throws Exception {
+        List<BizBusinessOutsourcerInfo> list = super.exportList(request);
         super.exportExcel(BizBusinessOutsourcerInfo.class, list, ExportEnum.OUTSOURCER_EXPORT.getSheetName());
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java
index c2cbf9f..0410918 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java
@@ -17,11 +17,9 @@
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.IGeneralApprovalService;
 import com.casic.missiles.service.business.IBizBusinessSiteExecutiveInfoService;
-import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -60,7 +58,7 @@
         return siteExecutiveInfoService.saveSiteExecutiveInfo(siteExecutiveInfo);
     }
 
-    @ApiOperation("现场检测详情")
+    @ApiOperation("详情")
     @PostMapping("/detail")
     public ReturnDTO<SiteExecutiveDetailResponse> siteExecutiveDetail(@RequestBody @Valid IdDTO idDTO) throws Exception {
         Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
@@ -69,21 +67,10 @@
         return ReturnUtil.success(siteExecutiveInfoService.detail(idDTO.getId()));
     }
 
-    @ApiOperation("现场检测导出")
+    @ApiOperation("导出")
     @PostMapping("/listExport")
-    public void export(@RequestBody @Valid SiteExecutiveApprovalListRequest request, BindingResult bindingResult) throws Exception {
-        if (bindingResult.hasErrors()) {
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        }
-        List<SiteExecutiveApprovalListResponse> list;
-        if (!CollectionUtils.isEmpty(request.getIds())) {
-            list = siteExecutiveInfoService.listInfoByIds(request.getIds());
-        } else {
-            list = siteExecutiveInfoService.listInfo(request);
-        }
-        for (SiteExecutiveApprovalListResponse record : list) {
-            DictCodeUtils.convertDictCodeToName(record);
-        }
+    public void export(@RequestBody SiteExecutiveApprovalListRequest request) throws Exception {
+        List<SiteExecutiveApprovalListResponse> list = super.exportList(request);
         super.exportExcel(SiteExecutiveApprovalListResponse.class, list, ExportEnum.SITE_EXECUTIVE_EXPORT.getSheetName());
     }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
index 7e793cd..a92e209 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
@@ -55,7 +55,7 @@
 
     @ApiOperation("设备收发列表导出")
     @PostMapping("/export")
-    public void exportList(@RequestBody @Valid SampleDispatchListRequest request) throws IOException {
+    public void exportList(@RequestBody SampleDispatchListRequest request) throws IOException {
         List<SampleDispatchListResponse> list;
         if (!CollectionUtils.isEmpty(request.getIds())) {
             list = dispatchService.listByIds(request.getIds());
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java
index cdc77fc..d120fd4 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java
@@ -7,6 +7,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.business.labExecutive.*;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.business.IBusinessLabExecutiveInfoService;
@@ -14,6 +15,7 @@
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.*;
 
@@ -32,7 +34,7 @@
     @Autowired
     private IBusinessLabExecutiveInfoService labExecutiveInfoService;
 
-    @ApiOperation("实验室检测-部门检测-查询各状态列表（待检测、检测中、检测完）")
+    @ApiOperation("实验室任务-查询各状态列表（待检测、检测中、检测完）")
     @PostMapping("/deptExecutive/List")
     public ReturnDTO<PageInfoBT<SampleLabExecutiveListResponse>> queryDeptExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
@@ -43,10 +45,19 @@
         return ReturnUtil.success(super.packForBT(labExecutiveInfoService.deptLabExecutiveListPage(page, labExecutiveListRequest)));
     }
 
-    /**
-     * 实验室检测-我的检测-查询各状态列表（待检测、检测中、检测完）
-     */
-    @ApiOperation("实验室检测-我的检测-查询各状态列表（待检测、检测中、检测完）")
+    @ApiOperation("实验室任务导出")
+    @PostMapping("/deptExecutive/export")
+    public void deptExportList(@RequestBody @Valid SampleLabExecutiveListRequest request) throws Exception {
+        List<SampleLabExecutiveListResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = labExecutiveInfoService.deptLabExecutiveListByIds(request.getMeasureStatus(), request.getIds());
+        } else {
+            list = labExecutiveInfoService.deptLabExecutiveList(request);
+        }
+        super.exportExcel(SampleLabExecutiveListResponse.class, list, ExportEnum.DEPT_EXECUTIVE_TASK.getSheetName());
+    }
+
+    @ApiOperation("我的任务-查询各状态列表（待检测、检测中、检测完）")
     @PostMapping("/myExecutive/list")
     public ReturnDTO<PageInfoBT<SampleLabExecutiveListResponse>> queryMyExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
@@ -57,19 +68,25 @@
         return ReturnUtil.success(super.packForBT(labExecutiveInfoService.myLabExecutiveListPage(page, labExecutiveListRequest)));
     }
 
-    /**
-     * 实验室检测-我的检测-查询各状态样品数量（待检测、检测中、检测完）
-     */
-    @ApiOperation("实验室检测-我的检测-查询各状态样品数量（待检测、检测中、检测完）")
+    @ApiOperation("我的任务导出")
+    @PostMapping("/myExecutive/export")
+    public void exportList(@RequestBody @Valid SampleLabExecutiveListRequest request) throws Exception {
+        List<SampleLabExecutiveListResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = labExecutiveInfoService.myLabExecutiveListByIds(request.getMeasureStatus(), request.getIds());
+        } else {
+            list = labExecutiveInfoService.myLabExecutiveList(request);
+        }
+        super.exportExcel(SampleLabExecutiveListResponse.class, list, ExportEnum.MY_EXECUTIVE_TASK.getSheetName());
+    }
+
+    @ApiOperation("我的任务-查询各状态样品数量（待检测、检测中、检测完）")
     @GetMapping("/myExecutive/amount")
     public ReturnDTO<List<SampleAmountResponse>> queryMyExecutiveAmount() {
         return ReturnUtil.success(labExecutiveInfoService.myExecutiveAmount());
     }
 
-    /**
-     * 实验室检测-部门检测-分配（分配给具体人员）
-     */
-    @ApiOperation("实验室检测-部门检测-分配按钮（分配给具体人员）")
+    @ApiOperation("实验室任务-分配按钮（分配给具体人员）")
     @PostMapping("/deptExecutive/allocate")
     public ReturnDTO allocateStaff(@RequestBody @Valid SampleAllocateRequest sampleAllocateRequest, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -78,10 +95,7 @@
         return labExecutiveInfoService.allocateStaff(sampleAllocateRequest);
     }
 
-    /**
-     * 实验室检测-我的检测-检定人扫描收入（待检测->检测中）
-     */
-    @ApiOperation("实验室检测-我的检测-检定人扫描收入（待检测->检测中）")
+    @ApiOperation("我的任务-检定人扫描收入（待检测->检测中）")
     @PostMapping("/myExecutive/receive")
     public ReturnDTO sampleReceive(@RequestBody @Valid List<SampleOperateRequest> requestList, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -90,10 +104,7 @@
         return labExecutiveInfoService.sampleReceive(requestList);
     }
 
-    /**
-     * 实验室检测-负责人/检定人扫描检完（检测中->检测完）
-     */
-    @ApiOperation("实验室检测-负责人/检定人扫描检完（检测中->检测完）")
+    @ApiOperation("实验室任务-负责人/检定人扫描检完（检测中->检测完）")
     @PostMapping("/myExecutive/complete")
     public ReturnDTO sampleExecutiveComplete(@RequestBody @Valid List<SampleOperateRequest> requestList, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -102,10 +113,7 @@
         return labExecutiveInfoService.sampleExecutiveComplete(requestList);
     }
 
-    /**
-     * 实验室检测-部门检测/我的检测 编辑（只能修改应出具证书）
-     */
-    @ApiOperation("实验室检测-部门检测/我的检测 编辑（只能修改应出具证书）")
+    @ApiOperation("实验室任务/我的任务 编辑（只能修改应出具证书）")
     @PostMapping("/executive/update")
     public ReturnDTO updateExecutive(@RequestBody @Valid UpdateExecutiveRequest request, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -114,10 +122,7 @@
         return labExecutiveInfoService.updateExecutive(request);
     }
 
-    /**
-     * 实验室检测-部门检测/我的检测 详情
-     */
-    @ApiOperation("实验室检测-部门检测/我的检测 详情")
+    @ApiOperation("实验室任务/我的任务 详情")
     @PostMapping("/executive/detail")
     public ReturnDTO<ExecutiveDetailResponse> executiveDetail(@RequestBody @Valid ExecutiveDetailRequest request, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
@@ -131,7 +136,7 @@
      * 退回后会将下一个要执行的实验室检测状态更新为待分配，将后面的实验室顺序变更为连续（都进行减1）
      * 最后一个检测的实验室退回，等分发员再增加实验室或设备收发中的已收入直接手动点击完成
      */
-    @ApiOperation("实验室检测-部门检测/我的检测 退回（待检测/检测中->退回）")
+    @ApiOperation("实验室任务/我的任务 退回（待检测/检测中->退回）")
     @PostMapping("/executive/sendBack")
     public ReturnDTO executiveSendBack(@RequestBody @Valid ExecutiveSendBackRequest request, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -140,9 +145,6 @@
         return labExecutiveInfoService.sampleExecutiveSendBack(request);
     }
 
-    /**
-     * 分发员编辑实验室检测列表
-     */
     @ApiOperation("分发员编辑实验室检测列表")
     @PostMapping("/handOut/updateList")
     public ReturnDTO updateExecutiveList(@RequestBody @Valid UpdateExecutiveListRequest request, BindingResult bindingResult) {
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java
index 48a67ed..0c04f31 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java
@@ -10,6 +10,7 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.resource.customer.CustomerApprovalListRequest;
 import com.casic.missiles.dto.resource.customer.CustomerSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceCustomerInfo;
@@ -26,6 +27,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -55,6 +57,13 @@
         return customerInfoService.saveCustomerInfo(request);
     }
 
+    @ApiOperation("委托方名录导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody CustomerApprovalListRequest request) throws Exception {
+        List<BizResourceCustomerInfo> list = super.exportList(request);
+        super.exportExcel(BizResourceCustomerInfo.class, list, ExportEnum.CUSTOMER_INFO.getSheetName());
+    }
+
     @ApiOperation("委托方人员列表（分页）")
     @PostMapping("/person/listPage")
     public ReturnDTO<PageInfoBT<BizResourceCustomerStaff>> personListPage(@RequestBody IdDTO idDto) {
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
index 972ed4b..6418ea5 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
@@ -5,6 +5,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.resource.customer.SuggestFormApprovalListRequest;
 import com.casic.missiles.dto.resource.customer.SuggestFormSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceCustomerSuggestForm;
@@ -20,6 +21,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -50,4 +52,11 @@
         return suggestFormService.saveSuggestForm(request);
     }
 
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody SuggestFormApprovalListRequest request) throws Exception {
+        List<BizResourceCustomerSuggestForm> list = super.exportList(request);
+        super.exportExcel(BizResourceCustomerSuggestForm.class, list, ExportEnum.CUSTOMER_SUGGEST_FORM.getSheetName());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java
index 1934d1a..9e07eab 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java
@@ -15,12 +15,16 @@
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.resource.IEnvEnvironmentRecordConfigService;
 import com.casic.missiles.service.resource.IEnvEnvironmentRecordDataService;
+import com.casic.missiles.service.resource.IEnvLocationInfoService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
 import java.util.List;
@@ -39,6 +43,8 @@
     private IEnvEnvironmentRecordDataService environmentRecordDataService;
     @Autowired
     private IEnvEnvironmentRecordConfigService environmentRecordConfigService;
+    @Autowired
+    private IEnvLocationInfoService locationInfoService;
 
     @ApiOperation("环境记录单数据列表/详情")
     @PostMapping("/data/listPage")
@@ -95,4 +101,11 @@
         });
         return environmentRecordConfigService.deleteEnvironmentRecordConfig(idDTO.getId());
     }
+
+    @ApiOperation("地点列表")
+    @PostMapping("/location/listPage")
+    public ReturnDTO<PageInfoBT<LocationListResponse>> locationListPage(@RequestBody @Valid LocationListRequest request) {
+        Page<LocationListResponse> page = PageFactory.defaultPage();
+        return ReturnUtil.success(super.packForBT(locationInfoService.listPage(page, request)));
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java
index 82efe3f..e9561fa 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java
@@ -10,6 +10,7 @@
 import com.casic.missiles.dto.resource.seal.SealLogListRequest;
 import com.casic.missiles.dto.resource.seal.SealNoteApprovalListRequest;
 import com.casic.missiles.dto.resource.seal.SealNoteSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceSealUseLog;
@@ -27,6 +28,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -58,6 +60,13 @@
         return sealUseNoteService.saveSeal(request);
     }
 
+    @ApiOperation("印章使用登记导出（列表和导出中去掉经办人和监印人）")
+    @PostMapping("/listExport")
+    public void export(@RequestBody SealNoteApprovalListRequest request) throws Exception {
+        List<BizResourceSealUseNote> list = super.exportList(request);
+        super.exportExcel(BizResourceSealUseNote.class, list, ExportEnum.SEAL_NOTE.getSheetName());
+    }
+
     // TODO: 2023/7/28 印章使用日志：系统中使用印章时插入数据库
 
     @ApiOperation("印章使用日志列表（分页）")
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java
index 9b674fc..06b6521 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java
@@ -9,16 +9,20 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.resource.staff.StaffCertRequest;
 import com.casic.missiles.dto.resource.staff.StaffCertResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.service.resource.IBizResourceStaffInfoService;
 import com.casic.missiles.service.resource.IBizResourceStaffVerifierService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.List;
+
 /**
  * @Description:
  * @Author: wangpeng
@@ -41,9 +45,21 @@
         return ReturnUtil.success(super.packForBT(responsePage));
     }
 
+    @ApiOperation("证书逾期提醒导出")
+    @PostMapping("/listExport")
+    public void exportList(@RequestBody StaffCertRequest request) throws Exception {
+        List<StaffCertResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = staffInfoService.certListByIds(request.getIds());
+        } else {
+            list = staffInfoService.certList(request);
+        }
+        super.exportExcel(StaffCertResponse.class, list, ExportEnum.STAFF_CERTIFICATE_EXPIRE.getSheetName());
+    }
+
     @ApiOperation("证书逾期提醒")
     @PostMapping("/expirationReminder")
-    public ReturnDTO expirationReminder(@RequestBody IdDTO idDto) {
-        return verifierService.expirationReminder(idDto);
+    public ReturnDTO expirationReminder(@RequestBody IdDTO idDTO) {
+        return verifierService.expirationReminder(idDTO);
     }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java
index 3b251ad..a6e7850 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java
@@ -12,6 +12,7 @@
 import com.casic.missiles.dto.resource.staff.StaffListRequest;
 import com.casic.missiles.dto.resource.staff.TrainListRequest;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.*;
@@ -22,7 +23,10 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
 import java.util.List;
@@ -52,8 +56,19 @@
             throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
         }
         Page<BizResourceStaffInfo> page = PageFactory.defaultPage();
-        Page<BizResourceStaffInfo> responsePage = staffInfoService.listPage(page, request);
-        return ReturnUtil.success(super.packForBT(responsePage));
+        return ReturnUtil.success(super.packForBT(staffInfoService.listPage(page, request)));
+    }
+
+    @ApiOperation("人员登记导出")
+    @PostMapping("/listExport")
+    public void exportList(@RequestBody StaffListRequest request) throws Exception {
+        List<BizResourceStaffInfo> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = staffInfoService.listByIds(request.getIds());
+        } else {
+            list = staffInfoService.list(request);
+        }
+        super.exportExcel(BizResourceStaffInfo.class, list, ExportEnum.STAFF_INFO.getSheetName());
     }
 
     @ApiOperation("人员登记详情基础信息")
@@ -85,9 +100,9 @@
 
     @ApiOperation("科研教育列表（分页）")
     @PostMapping("/education/listPage")
-    public ReturnDTO<PageInfoBT<BizResourceStaffEducation>> educationListPage(@RequestBody IdDTO idDto) {
+    public ReturnDTO<PageInfoBT<BizResourceStaffEducation>> educationListPage(@RequestBody IdDTO idDTO) {
         Page<BizResourceStaffEducation> page = PageFactory.defaultPage();
-        Page<BizResourceStaffEducation> responsePage = staffInfoService.educationListPage(page, idDto);
+        Page<BizResourceStaffEducation> responsePage = staffInfoService.educationListPage(page, idDTO);
         return ReturnUtil.success(super.packForBT(responsePage));
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java
index af6aa86..d85d84a 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java
@@ -9,6 +9,7 @@
 import com.casic.missiles.dto.resource.outsideService.SupplierApprovalListRequest;
 import com.casic.missiles.dto.resource.outsideService.SupplierSaveResponse;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceSupplierAbility;
@@ -67,6 +68,13 @@
         return ReturnUtil.success(supplierInfoService.detail(idDTO.getId()));
     }
 
+    @ApiOperation("合格供方导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody SupplierApprovalListRequest request) throws Exception {
+        List<BizResourceSupplierInfo> list = super.exportList(request);
+        super.exportExcel(BizResourceSupplierInfo.class, list, ExportEnum.SUPPLIER_INFO.getSheetName());
+    }
+
     @ApiOperation("供方人员列表（分页）")
     @PostMapping("/person/listPage")
     public ReturnDTO<PageInfoBT<BizResourceSupplierPerson>> personListPage(@RequestBody IdDTO idDTO) {
diff --git a/casic-metering-api/src/main/resources/config/application.yml b/casic-metering-api/src/main/resources/config/application.yml
index 350db5f..ecff521 100644
--- a/casic-metering-api/src/main/resources/config/application.yml
+++ b/casic-metering-api/src/main/resources/config/application.yml
@@ -126,7 +126,7 @@
     #作者
     author: wangpeng
     #待生成对象表名
-    table-name: biz_equipment_technical_target_approval,biz_equipment_attachment_approval,biz_equipment_checkpoint_approval
+    table-name: biz_business_outsource_protocol
 
 reminder:
   #节点--common模块config包 ReminderNodeConfig配置
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
index 4a19e4e..d47d552 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
@@ -53,6 +53,7 @@
     SUGGEST_FORM_SAVE_FAILED(2509, "委托方意见登记表保存至草稿箱失败"),
     EXAMINE_FORM_SAVE_FAILED(2510, "要求、委托书及合同评审表保存至草稿箱失败"),
     CUSTOMER_EXIST_SAVE_FAILED(2511, "该委托方已存在，请重新选择"),
+    DUPLICATE_LOCATION_NO(2512, "地点编号已存在"),
 
     /**
      * 计量检定业务模块
@@ -68,6 +69,8 @@
     COMPLETE_SAMPLE_NOT_EXIST(2609, "检测中不存在扫描收入的样品"),
     CANNOT_CHANGE_MEASURE_INFO(2610, "无法更改非当前登录用户的检测信息"),
     NON_EXIST_ORDER_OR_SAMPLE(2611, "不存在该委托单或该委托单下的样品"),
+    OUTSOURCE_ACCESS_SAVE_FAILED(2612, "测试、校准或检定工作分包评审表保存至草稿箱失败"),
+    OUTSOURCE_PROTOCOL_SAVE_FAILED(2613, "测试、校准或检定工作分包协议书保存至草稿箱失败"),
 
     /**
      * 历史遗留备用
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
index 5089ad1..81a406b 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
@@ -10,54 +10,38 @@
     /**
      * 资源管理
      */
-    ENVIRONMENT_DATA_EXPORT("environmentData", "environmentData", "环境记录单数据"),
+    ENVIRONMENT_DATA_EXPORT("environmentData", "环境记录单数据", "环境记录单数据"),
+    STAFF_INFO("staffInfo", "人员登记", "人员登记"),
+    STAFF_CERTIFICATE_EXPIRE("certificateExpire", "证书逾期提醒", "证书逾期提醒"),
+    SUPPLIER_INFO("supplierInfo", "合格供方名录", "合格供方名录"),
+    CUSTOMER_INFO("customerInfo", "委托方名录", "委托方名录"),
+    CUSTOMER_SUGGEST_FORM("customerSuggestForm", "委托方意见登记表", "委托方意见登记表"),
+    SEAL_NOTE("sealNote", "印章使用登记", "印章使用登记"),
 
-    FILE_EXPORT("meterFileData", "meterFileData", "计量文件信息"),
-    TRAIN_PLAN_EXPORT("trainPlanData", "trainPlanData", "培训计划"),
-    TRAIN_LOG_EXPORT("trainLogData", "trainLogData", "培训记录"),
-    METER_ORGANIZE_EXPORT("meterOrganizeData", "meterOrganizeData", "计量组织"),
-    TRACE_SUPPLIER_EXPORT("traceSupplierData", "traceSupplierData", "溯源供方"),
-    SIGN_EXPORT("signData", "signData", "签名/签章"),
-    TEMPLATE_EXPORT("templateData", "templateData", "原始记录模板/证书报告模板"),
-    FIXED_ASSETS("meterFixedAssets", "meterFixedAssets", "固定资产"),
-    METER_EQUIPMENT("meterEquipment", "meterEquipment", "测量设备"),
-    CALIBRATION_TEST_EQUIPMENT("calibrationTestEquipment", "calibrationTestEquipment", "校准检定设备"),
-    MEASURE_ACCOUNT("measureAccount", "measureAccount", "测量工装"),
-    STANDARD_SUPPORT_EQUIPMENT("standardSupportEquipment", "standardSupportEquipment", "标准配套设备"),
-    STANDARD_EQUIPMENT("standardEquipment", "standardEquipment", "标准装置"),
-    FLOW_DEF_EXPORT("flowDefData", "flowDefData", "流程定义"),
-    STAFF_CERTIFICATE("certificate", "certificate", "计量人员证书"),
-    CHECK_INFO("checkInfo", "checkInfo", "设备管理点检测"),
-    EQUIPMENT_APPLY("equipmentApply", "equipmentApply", "设备借用"),
-    STANDARD_EQUIPMENT_REMIND("equipmentApplyRemind", "equipmentApplyRemind", "标准装置到期提醒"),
-    METER_PRICE("meterPrice", "meterPrice", "价格库"),
-    METER_STAFF("meterStaff", "meterStaff", "计量人员"),
-    STANDARD_EQUIPMENT_APPLY("standardEquipmentApply", "standardEquipmentApply", "标准装置申请"),
-    STATE_MANAGE_APPLY("stateManage", "stateManage", "状态管理"),
-    METER_ACCEPTANCE_CHECK("acceptanceCheck", "acceptanceCheck", "设备检修保养验收单"),
-    CUSTOMER_EXPORT("customerData", "customerData", "客户信息"),
-    ORDER_EXPORT("orderData", "orderData", "委托书信息"),
-    SAMPLE_EXPORT("sampleData", "sampleData", "样本信息"),
-    EXCHANGE_DATA("exchangeData", "exchangeData", "设备交接单"),
-    DISPATCH_DATA("dispatchData", "dispatchData", "设备收发"),
-    ENVIRONMENT_DATA("environmentData", "environmentData", "环境记录单"),
-    ORIGIN_DATA("originData", "originData", "原始记录"),
-    CERTIFICATE_REPORT("certificateReport", "certificateReport", "证书报告"),
-    ADVICE_EXPORT("adviceData", "adviceData", "客户反馈"),
-    HANDOUT_EXPORT("handoutData", "handoutData", "任务分发列表"),
-    OUTSOURCER_EXPORT("outsourcerData", "outsourcerData", "分包方"),
-    SITE_EXECUTIVE_EXPORT("siteExecutiveData", "siteExecutiveData", "现场测试、校准或检定"),
-    CERTIFICATE_PRINT_EXPORT("certificatePrintData", "certificatePrintData", "证书打印"),
-    DOWNLOAD_TEMPLATE("downloadTemplate", "downloadTemplate", "页面配置"),
-    OUTSOURCER_CERTIFICATE_EXPORT("outsourceCertificateData", "outsourceCertificateData", "分包证书"),
-    SETTLEMENT_INFO_EXPORT("settlementInfoData", "settlementInfoData", "业务结算"),
-    EQUIPMENT_REMIND("equipmentRemind", "equipmentRemind", "设备到期提醒"),
-    AGREEMENT_INFO_EXPORT("agreementInfoData", "agreementInfoData", "合同"),
-    WORK_STATISTICS_EXPORT("workStatisticsData", "workStatisticsData", "实时工作统计"),
-    DEPT_OUTPUT_EXPORT("deptOutputData", "deptOutputData", "部门产值分析"),
-    WORKLOAD_EXPORT("workloadData", "workloadData", "业务工作量分析"),
-    DEPT_COMPREHENSIVE_EXPORT("deptComprehensiveData", "deptComprehensiveData", "部门综合分析"),
-    ENVIRONMENTAL_RECORD("environmentalRecordData", "environmentalRecordData", "现场环境记录");
+    /**
+     * 计量检定业务
+     */
+    OUTSOURCER_EXPORT("outsourcerData", "分包方名录", "分包方名录"),
+    IDENTIFY_EXPORT("identifyData", "计量标识", "计量标识"),
+    ORDER_EXPORT("orderData", "任务单", "任务单"),
+    DISPATCH_DATA("dispatchData", "设备收发", "设备收发"),
+    HANDOUT_EXPORT("handoutData", "任务分发", "任务分发"),
+    SITE_EXECUTIVE_EXPORT("siteExecutiveData", "现场测试、校准或检定", "现场测试、校准或检定"),
+    CERTIFICATE_REPORT("certificateReport", "证书审批", "证书审批"),
+    CERTIFICATE_CHANGE_APPLY("certificateChangeApply", "证书报告补充或更换申请单", "证书报告补充或更换申请单"),
+    CERTIFICATE_PRINT("certificatePrintData", "证书打印审批", "证书打印审批"),
+    DEPT_EXECUTIVE_TASK("deptExecutiveTaskData", "实验室任务", "实验室任务"),
+    MY_EXECUTIVE_TASK("myExecutiveTaskData", "我的任务", "我的任务"),
+    OUTSOURCE_ASSESS("outsourceAssess", "测试、校准或检定工作分包评审表", "测试、校准或检定工作分包评审表"),
+    OUTSOURCE_PROTOCOL("outsourceProtocol", "测试、校准或检定工作分包协议书", "测试、校准或检定工作分包协议书"),
+
+    /**
+     * 系统管理
+     */
+    SIGN_EXPORT("signData", "签名", "签名"),
+    TEMPLATE_EXPORT("templateData", "文件模板", "文件模板"),
+    FLOW_DEF_EXPORT("flowDefData", "流程定义", "流程定义"),
+    DOWNLOAD_TEMPLATE("downloadTemplate", "流程定义", "页面配置");
 
     ExportEnum(String fileName, String sheetName, String description) {
         this.fileName = fileName;
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateRecordTypeCodeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateRecordTypeCodeEnum.java
index 31d913c..a963522 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateRecordTypeCodeEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateRecordTypeCodeEnum.java
@@ -46,4 +46,14 @@
     String SITE_EXECUTIVE_APPROVAL = "01";
     //《现场测试、校准或检定工作记录表》
     String SITE_EXECUTIVE_LOG = "02";
+
+    //测试、校准或检定工作分包协议书
+    String OUTSOURCE_PROTOCOL = "01";
+    //测试、校准或检定工作分包评审表
+    String OUTSOURCE_ACCESS = "02";
+    //测试、校准或检定工作分包通知书
+    String OUTSOURCE_NOTICE = "03";
+    //测试、校准或检定工作分包方名录
+    String OUTSOURCE_INFO = "04";
+
 }
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
index 24b8635..f78bd53 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
@@ -15,6 +15,10 @@
     String CERTIFICATE_CHANGE_APPLY_BEAN_NAME = "certificateChangeApplyBean";
     //现场测试、校准或检定
     String SITE_EXECUTIVE_BEAN_NAME = "siteExecutiveBean";
+    //测试、校准或检定工作分包评审表
+    String OUTSOURCE_ASSESS_BEAN_NAME = "outsourceAssessBean";
+    //测试、校准或检定工作分包协议书
+    String OUTSOURCE_PROTOCOL_BEAN_NAME = "outsourceProtocolBean";
 
     /*********************************设备与装置************************************/
     //设备台账
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 b21c661..6b86fd1 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
@@ -18,6 +18,8 @@
     OUTSOURCER_APPROVAL(OUTSOURCER_BEAN_NAME, ""),
     CERTIFICATE_CHANGE_APPROVAL(CERTIFICATE_CHANGE_APPLY_BEAN_NAME, ""),
     SITE_EXECUTIVE_APPROVAL(SITE_EXECUTIVE_BEAN_NAME, ""),
+    OUTSOURCE_ASSESS_APPROVAL(OUTSOURCE_ASSESS_BEAN_NAME, ""),
+    OUTSOURCE_PROTOCOL_APPROVAL(OUTSOURCE_PROTOCOL_BEAN_NAME, ""),
 
     ACTION_STATUS_MAP(new HashMap<String, AwareActionStatusEnum>() {
         {
@@ -47,6 +49,10 @@
             put(ApplyFromIdEnum.CERTIFICATE_CHANGE_APPROVAL.getCode(), CERTIFICATE_CHANGE_APPROVAL);
             //现场测试、校准或检定审批
             put(ApplyFromIdEnum.SITE_EXECUTIVE_APPROVAL.getCode(), SITE_EXECUTIVE_APPROVAL);
+            //测试、校准或检定工作分包评审表
+            put(ApplyFromIdEnum.OUTSOURCE_ASSESS_APPROVAL.getCode(), OUTSOURCE_ASSESS_APPROVAL);
+            //测试、校准或检定工作分包协议书
+            put(ApplyFromIdEnum.OUTSOURCE_PROTOCOL_APPROVAL.getCode(), OUTSOURCE_PROTOCOL_APPROVAL);
         }
     });
     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 934405e..c7410bd 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
@@ -9,6 +9,8 @@
     CERTIFICATE_CHANGE_APPROVAL("jljdywzsbchghsqd", MessageSourceModuleEnum.BUSINESS.getCode(), "证书/报告补充或更换申请单"),
     OUTSOURCER_APPROVAL("jljdywcsjzhgfbfml", MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定合格分包方名录"),
     SITE_EXECUTIVE_APPROVAL("jljdywxccsjzsp", MessageSourceModuleEnum.BUSINESS.getCode(), "现场测试、校准或检定审批"),
+    OUTSOURCE_ASSESS_APPROVAL("jljdywcsjzfbpsb", MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包评审表"),
+    OUTSOURCE_PROTOCOL_APPROVAL("jljdywcsjzfbxys", MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包协议书"),
 
 
     /*******************************************设备与装置*********************************************/
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/GeneralApprovalMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/GeneralApprovalMapper.java
index 4fb7344..0c9d6ae 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/GeneralApprovalMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/GeneralApprovalMapper.java
@@ -17,8 +17,4 @@
 
     Page<O> selectBatchForApprovalList(Page<O> page, @Param("request") R request, @Param("businessKeys") List<String> businessKeys);
 
-//    Page<O> selectListPage(Page<O> page, @Param("request") R request);
-
-//    Long selectMaxNo();
-
 }
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceAssessMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceAssessMapper.java
index 7867bb8..ba59009 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceAssessMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceAssessMapper.java
@@ -1,7 +1,12 @@
 package com.casic.missiles.mapper.business;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.business.outsource.OutsourceAssessApprovalListRequest;
+import com.casic.missiles.mapper.GeneralApprovalMapper;
 import com.casic.missiles.model.business.BizBusinessOutsourceAssess;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * <p>
@@ -11,6 +16,10 @@
  * @author wangpeng
  * @since 2023-08-16
  */
-public interface BizBusinessOutsourceAssessMapper extends BaseMapper<BizBusinessOutsourceAssess> {
+public interface BizBusinessOutsourceAssessMapper extends GeneralApprovalMapper<BizBusinessOutsourceAssess, BizBusinessOutsourceAssess, OutsourceAssessApprovalListRequest> {
+
+    Page<BizBusinessOutsourceAssess> selectBatchForApprovalList(Page<BizBusinessOutsourceAssess> page, @Param("request") OutsourceAssessApprovalListRequest request, @Param("businessKeys") List<String> businessKeys);
+
+    Long selectMaxProjectNo();
 
 }
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceProtocolMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceProtocolMapper.java
new file mode 100644
index 0000000..e6aba35
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceProtocolMapper.java
@@ -0,0 +1,24 @@
+package com.casic.missiles.mapper.business;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.business.outsource.OutsourceProtocolApprovalListRequest;
+import com.casic.missiles.mapper.GeneralApprovalMapper;
+import com.casic.missiles.model.business.BizBusinessOutsourceProtocol;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 计量检定业务-分包管理-测试、校准或检定工作分包协议书 Mapper 接口
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-08-24
+ */
+public interface BizBusinessOutsourceProtocolMapper extends GeneralApprovalMapper<BizBusinessOutsourceProtocol, BizBusinessOutsourceProtocol, OutsourceProtocolApprovalListRequest> {
+
+    Page<BizBusinessOutsourceProtocol> selectBatchForApprovalList(Page<BizBusinessOutsourceProtocol> page, @Param("request") OutsourceProtocolApprovalListRequest request, @Param("businessKeys") List<String> businessKeys);
+
+    Long selectMaxProtocolNo();
+}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/EnvLocationInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/EnvLocationInfoMapper.java
new file mode 100644
index 0000000..49eff87
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/EnvLocationInfoMapper.java
@@ -0,0 +1,21 @@
+package com.casic.missiles.mapper.resource;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.resource.environment.LocationListRequest;
+import com.casic.missiles.dto.resource.environment.LocationListResponse;
+import com.casic.missiles.model.resource.EnvLocationInfo;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * <p>
+ * 实验室环境监控系统-设备表 Mapper 接口
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-06-07
+ */
+public interface EnvLocationInfoMapper extends BaseMapper<EnvLocationInfo> {
+
+    Page<LocationListResponse> selectLocationListPage(Page<LocationListResponse> page, @Param("request") LocationListRequest request);
+}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java
index de124db..85ed0f7 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java
@@ -1,7 +1,9 @@
 package com.casic.missiles.mapper.system;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.dto.system.SignDetailResponse;
+import com.casic.missiles.dto.system.SignListRequest;
 import com.casic.missiles.model.system.SystemSign;
 import org.apache.ibatis.annotations.Param;
 
@@ -22,4 +24,8 @@
     SignDetailResponse selectSignDetailById(Long id);
 
     List<SystemSign> selectUsableSignList(@Param("userId") Long userId);
+
+    Page<SystemSign> selectSignListPage(Page<SystemSign> page, @Param("request") SignListRequest request);
+
+    List<SystemSign> selectSignList(@Param("request") SignListRequest request);
 }
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateChangeApplyMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateChangeApplyMapper.xml
index d798447..c496092 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateChangeApplyMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateChangeApplyMapper.xml
@@ -30,31 +30,31 @@
         SELECT *
         FROM biz_business_certificate_change_apply
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.changeApplyNo != null and request.changeApplyNo !=''">
+        <if test="request != null and request.changeApplyNo != null and request.changeApplyNo !=''">
             and change_apply_no like concat('%',#{request.changeApplyNo},'%')
         </if>
-        <if test="request.changeReportNo != null and request.changeReportNo !=''">
+        <if test="request != null and request.changeReportNo != null and request.changeReportNo !=''">
             and change_report_no like concat('%',#{request.changeReportNo},'%')
         </if>
-        <if test="request.changeReportName != null and request.changeReportName !=''">
+        <if test="request != null and request.changeReportName != null and request.changeReportName !=''">
             and change_report_name like concat('%',#{request.changeReportName},'%')
         </if>
-        <if test="request.changeType != null and request.changeType !=''">
+        <if test="request != null and request.changeType != null and request.changeType !=''">
             and change_type = #{request.changeType}
         </if>
-        <if test="request.createUserName != null and request.createUserName !=''">
+        <if test="request != null and request.createUserName != null and request.createUserName !=''">
             and create_user_name like concat('%',#{request.createUserName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificatePrintMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificatePrintMapper.xml
index b66cd99..49c0ac8 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificatePrintMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificatePrintMapper.xml
@@ -31,34 +31,34 @@
         LEFT JOIN biz_business_order_sample_relation bosr ON (bosr.order_id = bcr.order_id AND bosr.sample_id = bcr.sample_id)
         LEFT JOIN biz_business_order_info boi ON boi.id = bosr.order_id
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and bcp.approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.printStatus != null and request.printStatus !=''">
+        <if test="request != null and request.printStatus != null and request.printStatus !=''">
             and print_status = #{request.printStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and bcp.create_user_id = #{request.createUserId}
         </if>
-        <if test="request.certificateReportNo != null and request.certificateReportNo !=''">
+        <if test="request != null and request.certificateReportNo != null and request.certificateReportNo !=''">
             and bcr.certificate_report_no like concat('%',#{request.certificateReportNo},'%')
         </if>
-        <if test="request.certificateReportName != null and request.certificateReportName !=''">
+        <if test="request != null and request.certificateReportName != null and request.certificateReportName !=''">
             and bcr.certificate_report_name like concat('%',#{request.certificateReportName},'%')
         </if>
-        <if test="request.customerName != null and request.customerName !=''">
+        <if test="request != null and request.customerName != null and request.customerName !=''">
             and boi.customer_name like concat('%',#{request.customerName},'%')
         </if>
-        <if test="request.sampleNo != null and request.sampleNo !=''">
+        <if test="request != null and request.sampleNo != null and request.sampleNo !=''">
             and bosr.sample_no like concat('%',#{request.sampleNo},'%')
         </if>
-        <if test="request.sampleName != null and request.sampleName !=''">
+        <if test="request != null and request.sampleName != null and request.sampleName !=''">
             and bosr.sample_name like concat('%',#{request.sampleName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and bcp.create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and bcp.create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml
index b366034..767695d 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml
@@ -46,33 +46,37 @@
         SELECT bcr.*, bosr.sample_no, bosr.sample_name, bosr.sample_model, rsi.staff_name
         FROM biz_business_certificate_report bcr
         LEFT JOIN biz_business_order_sample_relation bosr ON (bosr.order_id = bcr.order_id AND bosr.sample_id = bcr.sample_id)
+        LEFT JOIN biz_business_order_info boi ON boi.id = bcr.order_id
         LEFT JOIN biz_resource_staff_info rsi ON rsi.id = bcr.measure_person_id
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and bcr.approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and bcr.create_user_id = #{request.createUserId}
         </if>
-        <if test="request.certificateReportNo != null and request.certificateReportNo !=''">
+        <if test="request != null and request.customerId != null and request.customerId !=''">
+            and boi.customer_id = #{request.customerId}
+        </if>
+        <if test="request != null and request.certificateReportNo != null and request.certificateReportNo !=''">
             and bcr.certificate_report_no like concat('%',#{request.certificateReportNo},'%')
         </if>
-        <if test="request.certificateReportName != null and request.certificateReportName !=''">
+        <if test="request != null and request.certificateReportName != null and request.certificateReportName !=''">
             and bcr.certificate_report_name like concat('%',#{request.certificateReportName},'%')
         </if>
-        <if test="request.sampleNo != null and request.sampleNo !=''">
+        <if test="request != null and request.sampleNo != null and request.sampleNo !=''">
             and bosr.sample_no like concat('%',#{request.sampleNo},'%')
         </if>
-        <if test="request.measureCategory != null and request.measureCategory !=''">
+        <if test="request != null and request.measureCategory != null and request.measureCategory !=''">
             and bcr.measure_category = #{request.measureCategory}
         </if>
-        <if test="request.measurePerson != null and request.measurePerson !=''">
+        <if test="request != null and request.measurePerson != null and request.measurePerson !=''">
             and rsi.staff_name like concat('%',#{request.measurePerson},'%')
         </if>
-        <if test="request.calibrationTimeStart != null and request.calibrationTimeStart !=''">
+        <if test="request != null and request.calibrationTimeStart != null and request.calibrationTimeStart !=''">
             and bcr.calibration_time &gt;= #{request.calibrationTimeStart}
         </if>
-        <if test="request.calibrationTimeEnd != null and request.calibrationTimeEnd !=''">
+        <if test="request != null and request.calibrationTimeEnd != null and request.calibrationTimeEnd !=''">
             and bcr.calibration_time &lt;= #{request.calibrationTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceAssessMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceAssessMapper.xml
index d0fcf8b..c22c101 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceAssessMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceAssessMapper.xml
@@ -7,6 +7,8 @@
         <id column="id" property="id" />
         <result column="project_no" property="projectNo" />
         <result column="project_name" property="projectName" />
+        <result column="lab_code" property="labCode" />
+        <result column="group_code" property="groupCode" />
         <result column="applicant_id" property="applicantId" />
         <result column="applicant_name" property="applicantName" />
         <result column="applicant_time" property="applicantTime" />
@@ -31,7 +33,45 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, project_no, project_name, applicant_id, applicant_name, applicant_time, minio_file_name, remark, create_user_id, create_user_name, outsourcer_id, pre_start_time, pre_end_time, outsource_reason, pre_cost, approval_status, process_id, approve_situation, traceability, test_method, technique_ability, create_time, update_time
+        id, project_no, project_name, lab_code, group_code, applicant_id, applicant_name, applicant_time, minio_file_name, remark, create_user_id, create_user_name, outsourcer_id, pre_start_time, pre_end_time, outsource_reason, pre_cost, approval_status, process_id, approve_situation, traceability, test_method, technique_ability, create_time, update_time
     </sql>
 
+    <select id="selectMaxProjectNo" resultType="java.lang.Long">
+        SELECT IFNULL(max(RIGHT(project_no, 3)), 0) from biz_business_outsource_assess
+    </select>
+
+    <select id="selectBatchForApprovalList" resultMap="BaseResultMap">
+        SELECT bboa.*, bboi.outsourcer_name, bboi.director
+        FROM biz_business_outsource_assess bboa
+        LEFT JOIN biz_business_outsourcer_info bboi ON bboa.outsourcer_id = bboi.id
+        WHERE 1=1
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
+            and bboa.approval_status = #{request.approvalStatus}
+        </if>
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
+            and bboa.create_user_id = #{request.createUserId}
+        </if>
+        <if test="request != null and request.projectNo != null and request.projectNo !=''">
+            and bboa.project_no like concat('%',#{request.projectNo},'%')
+        </if>
+        <if test="request != null and request.outsourcerName != null and request.outsourcerName !=''">
+            and bboi.outsourcer_name like concat('%',#{request.outsourcerName},'%')
+        </if>
+        <if test="request != null and request.applicantName != null and request.applicantName !=''">
+            and bboa.applicant_name like concat('%',#{request.applicantName},'%')
+        </if>
+        <if test="request != null and request.applicantTimeStart != null and request.applicantTimeStart !=''">
+            and bboa.applicant_time &gt;= #{request.applicantTimeStart}
+        </if>
+        <if test="request != null and request.applicantTimeEnd != null and request.applicantTimeEnd !=''">
+            and bboa.applicant_time &lt;= #{request.applicantTimeEnd}
+        </if>
+        <if test="businessKeys != null">
+            and bboa.id in
+            <foreach collection="businessKeys" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
+        ORDER BY bboa.create_time DESC
+    </select>
 </mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceProtocolMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceProtocolMapper.xml
new file mode 100644
index 0000000..b7b2149
--- /dev/null
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceProtocolMapper.xml
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.mapper.business.BizBusinessOutsourceProtocolMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.business.BizBusinessOutsourceProtocol">
+        <id column="id" property="id" />
+        <result column="protocol_no" property="protocolNo" />
+        <result column="project_name" property="projectName" />
+        <result column="lab_code" property="labCode" />
+        <result column="group_code" property="groupCode" />
+        <result column="outsourcer_id" property="outsourcerId" />
+        <result column="remark" property="remark" />
+        <result column="outsource_no" property="outsourceNo" />
+        <result column="outsource_name" property="outsourceName" />
+        <result column="contacts" property="contacts" />
+        <result column="mobile" property="mobile" />
+        <result column="address" property="address" />
+        <result column="require_date" property="requireDate" />
+        <result column="outsource_cost" property="outsourceCost" />
+        <result column="director" property="director" />
+        <result column="item" property="item" />
+        <result column="requires" property="requires" />
+        <result column="create_user_id" property="createUserId" />
+        <result column="create_user_name" property="createUserName" />
+        <result column="approval_status" property="approvalStatus" />
+        <result column="process_id" property="processId" />
+        <result column="create_time" property="createTime" />
+        <result column="update_time" property="updateTime" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, protocol_no, project_name, lab_code, group_code, outsourcer_id, remark, outsource_no, outsource_name, contacts, mobile, address, require_date, outsource_cost, director, item, requires, create_user_id, create_user_name, approval_status, process_id, create_time, update_time
+    </sql>
+
+    <select id="selectMaxProtocolNo" resultType="java.lang.Long">
+        SELECT IFNULL(max(RIGHT(protocol_no, 3)), 0) from biz_business_outsource_protocol
+    </select>
+
+    <select id="selectBatchForApprovalList" resultMap="BaseResultMap">
+        SELECT *
+        FROM biz_business_outsource_protocol
+        WHERE 1=1
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
+            and approval_status = #{request.approvalStatus}
+        </if>
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
+            and create_user_id = #{request.createUserId}
+        </if>
+        <if test="request != null and request.protocolNo != null and request.protocolNo !=''">
+            and protocol_no like concat('%',#{request.protocolNo},'%')
+        </if>
+        <if test="request != null and request.outsourcerName != null and request.outsourcerName !=''">
+            and outsourcer_name like concat('%',#{request.outsourcerName},'%')
+        </if>
+        <if test="request != null and request.applicantName != null and request.applicantName !=''">
+            and create_user_name like concat('%',#{request.applicantName},'%')
+        </if>
+        <if test="request != null and request.applicantTimeStart != null and request.applicantTimeStart !=''">
+            and create_time &gt;= #{request.applicantTimeStart}
+        </if>
+        <if test="request != null and request.applicantTimeEnd != null and request.applicantTimeEnd !=''">
+            and create_time &lt;= #{request.applicantTimeEnd}
+        </if>
+        <if test="businessKeys != null">
+            and id in
+            <foreach collection="businessKeys" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
+        ORDER BY create_time DESC
+    </select>
+</mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourcerInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourcerInfoMapper.xml
index 510a80b..3049b54 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourcerInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourcerInfoMapper.xml
@@ -7,6 +7,8 @@
         <id column="id" property="id" />
         <result column="outsourcer_no" property="outsourcerNo" />
         <result column="outsourcer_name" property="outsourcerName" />
+        <result column="lab_code" property="labCode" />
+        <result column="group_code" property="groupCode" />
         <result column="outsourcer_brief_name" property="outsourcerBriefName" />
         <result column="outsourcer_size" property="outsourcerSize" />
         <result column="business_size" property="businessSize" />
@@ -55,32 +57,32 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, outsourcer_no, outsourcer_name, outsourcer_brief_name, outsourcer_size, business_size, grade, evaluation, tax_number, bank_account, bank_name, bank_account_number, postal_code, director, phone, fax, mobile, email, website, address_country, address_province, address_city, address_area, full_address, address_country_name, address_province_name, address_city_name, address_area_name, invoice_country, invoice_province, invoice_city, invoice_area, invoice_full_address, invoice_country_name, invoice_province_name, invoice_city_name, invoice_area_name, business_scope, business_content, minio_file_name, approval_status, process_id, remark, create_user_id, create_user_name, create_time, update_time
+        id, outsourcer_no, outsourcer_name, lab_code, group_code, outsourcer_brief_name, outsourcer_size, business_size, grade, evaluation, tax_number, bank_account, bank_name, bank_account_number, postal_code, director, phone, fax, mobile, email, website, address_country, address_province, address_city, address_area, full_address, address_country_name, address_province_name, address_city_name, address_area_name, invoice_country, invoice_province, invoice_city, invoice_area, invoice_full_address, invoice_country_name, invoice_province_name, invoice_city_name, invoice_area_name, business_scope, business_content, minio_file_name, approval_status, process_id, remark, create_user_id, create_user_name, create_time, update_time
     </sql>
 
     <select id="selectBatchForApprovalList" resultMap="BaseResultMap">
         SELECT *
         FROM biz_business_outsourcer_info
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.outsourcerNo != null and request.outsourcerNo !=''">
+        <if test="request != null and request.outsourcerNo != null and request.outsourcerNo !=''">
             and outsourcer_no like concat('%',#{request.outsourcerNo},'%')
         </if>
-        <if test="request.outsourcerName != null and request.outsourcerName !=''">
+        <if test="request != null and request.outsourcerName != null and request.outsourcerName !=''">
             and outsourcer_name like concat('%',#{request.outsourcerName},'%')
         </if>
-        <if test="request.director != null and request.director !=''">
+        <if test="request != null and request.director != null and request.director !=''">
             and director like concat('%',#{request.director},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
@@ -93,6 +95,6 @@
     </select>
 
     <select id="selectMaxNo" resultType="java.lang.Long">
-        SELECT IFNULL(max(RIGHT(outsourcer_no, 12)), 0) from biz_business_outsourcer_info
+        SELECT IFNULL(max(RIGHT(outsourcer_no, 3)), 0) from biz_business_outsourcer_info
     </select>
 </mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessSiteExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessSiteExecutiveInfoMapper.xml
index 135c5d0..3c5ae79 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessSiteExecutiveInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessSiteExecutiveInfoMapper.xml
@@ -38,25 +38,25 @@
         FROM biz_business_site_executive_info bsei
         LEFT JOIN biz_resource_customer_info rci ON bsei.customer_id = rci.id
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and bsei.approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and bsei.create_user_id = #{request.createUserId}
         </if>
-        <if test="request.siteExecutiveNo != null and request.siteExecutiveNo !=''">
+        <if test="request != null and request.siteExecutiveNo != null and request.siteExecutiveNo !=''">
             and bsei.site_executive_no like concat('%',#{request.siteExecutiveNo},'%')
         </if>
-        <if test="request.customerName != null and request.customerName !=''">
+        <if test="request != null and request.customerName != null and request.customerName !=''">
             and rci.outsourcer_name like concat('%',#{request.customerName},'%')
         </if>
-        <if test="request.applyName != null and request.applyName !=''">
+        <if test="request != null and request.applyName != null and request.applyName !=''">
             and bsei.apply_name like concat('%',#{request.applyName},'%')
         </if>
-        <if test="request.applyTimeStart != null and request.applyTimeStart !=''">
+        <if test="request != null and request.applyTimeStart != null and request.applyTimeStart !=''">
             and bsei.apply_time &gt;= #{request.applyTimeStart}
         </if>
-        <if test="request.applyTimeEnd != null and request.applyTimeEnd !=''">
+        <if test="request != null and request.applyTimeEnd != null and request.applyTimeEnd !=''">
             and bsei.apply_time &lt;= #{request.applyTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml
index 84d9e2a..6bd38a9 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml
@@ -105,6 +105,12 @@
         <if test="request.isUrgent != null and request.isUrgent !=''">
             AND bo.is_urgent = #{request.isUrgent}
         </if>
+        <if test="request.ids != null">
+            and blei.id in
+            <foreach collection="request.ids" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
         ORDER BY blei.update_time DESC
     </select>
 
@@ -137,6 +143,12 @@
         <if test="request.isUrgent != null and request.isUrgent !=''">
             AND bo.is_urgent = #{request.isUrgent}
         </if>
+        <if test="request.ids != null">
+            and blei.id in
+            <foreach collection="request.ids" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
         ORDER BY blei.update_time DESC
     </select>
 
diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardInfoMapper.xml
index 1a5551b..2ed8d17 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardInfoMapper.xml
@@ -45,12 +45,6 @@
         FROM biz_equipment_standard_info besi
         LEFT JOIN biz_equipment_standard_technology_relation bestr ON besi.standard_no = bestr.standard_no
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
-            and besi.approval_status = #{request.approvalStatus}
-        </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
-            and besi.create_user_id = #{request.createUserId}
-        </if>
         <if test="request.standardName != null and request.standardName !=''">
             and besi.standard_name like concat('%',#{request.standardName},'%')
         </if>
diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardTechnologyRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardTechnologyRelationMapper.xml
index fc7e16c..cd03c8c 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardTechnologyRelationMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardTechnologyRelationMapper.xml
@@ -6,6 +6,7 @@
     <resultMap id="BaseResultMap" type="com.casic.missiles.model.equipment.BizEquipmentStandardTechnologyRelation">
         <id column="id" property="id" />
         <result column="technology_file_id" property="technologyFileId" />
+        <result column="technology_file_no" property="technologyFileNo" />
         <result column="technology_file_name" property="technologyFileName" />
         <result column="standard_id" property="standardId" />
         <result column="standard_no" property="standardNo" />
@@ -14,7 +15,7 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, technology_file_id, technology_file_name, standard_id, remark
+        id, technology_file_id, technology_file_no, technology_file_name, standard_id, remark
     </sql>
 
 </mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceAuthorizeOrderMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceAuthorizeOrderMapper.xml
index ac5176c..554fe65 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceAuthorizeOrderMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceAuthorizeOrderMapper.xml
@@ -32,22 +32,22 @@
         SELECT *
         FROM biz_resource_authorize_order
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.orderNo != null and request.orderNo !=''">
+        <if test="request != null and request.orderNo != null and request.orderNo !=''">
             and order_no like concat('%',#{request.orderNo},'%')
         </if>
-        <if test="request.createUserName != null and request.createUserName !=''">
+        <if test="request != null and request.createUserName != null and request.createUserName !=''">
             and create_user_name like concat('%',#{request.createUserName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerExamineFormMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerExamineFormMapper.xml
index ab242f6..af7f98f 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerExamineFormMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerExamineFormMapper.xml
@@ -41,28 +41,28 @@
         SELECT *
         FROM biz_resource_customer_examine_form
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.formNo != null and request.formNo !=''">
+        <if test="request != null and request.formNo != null and request.formNo !=''">
             and form_no like concat('%',#{request.formNo},'%')
         </if>
-        <if test="request.labCode != null and request.labCode !=''">
+        <if test="request != null and request.labCode != null and request.labCode !=''">
             and lab_code like concat('%',#{request.labCode},'%')
         </if>
-        <if test="request.groupCode != null and request.groupCode !=''">
+        <if test="request != null and request.groupCode != null and request.groupCode !=''">
             and group_code like concat('%',#{request.groupCode},'%')
         </if>
-        <if test="request.createUserName != null and request.createUserName !=''">
+        <if test="request != null and request.createUserName != null and request.createUserName !=''">
             and create_user_name like concat('%',#{request.createUserName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerInfoMapper.xml
index fa8ffbc..06a2798 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerInfoMapper.xml
@@ -33,25 +33,25 @@
         SELECT *
         FROM biz_resource_customer_info
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.customerNo != null and request.customerNo !=''">
+        <if test="request != null and request.customerNo != null and request.customerNo !=''">
             and customer_no like concat('%',#{request.customerNo},'%')
         </if>
-        <if test="request.customerName != null and request.customerName !=''">
+        <if test="request != null and request.customerName != null and request.customerName !=''">
             and customer_name like concat('%',#{request.customerName},'%')
         </if>
-        <if test="request.contacts != null and request.contacts !=''">
+        <if test="request != null and request.contacts != null and request.contacts !=''">
             and contacts like concat('%',#{request.contacts},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerSuggestFormMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerSuggestFormMapper.xml
index 28f5bb2..1806662 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerSuggestFormMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerSuggestFormMapper.xml
@@ -33,28 +33,28 @@
         SELECT *
         FROM biz_resource_customer_suggest_form
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.formNo != null and request.formNo !=''">
+        <if test="request != null and request.formNo != null and request.formNo !=''">
             and form_no like concat('%',#{request.formNo},'%')
         </if>
-        <if test="request.customerName != null and request.customerName !=''">
+        <if test="request != null and request.customerName != null and request.customerName !=''">
             and customer_name like concat('%',#{request.customerName},'%')
         </if>
-        <if test="request.customerDeptName != null and request.customerDeptName !=''">
+        <if test="request != null and request.customerDeptName != null and request.customerDeptName !=''">
             and customer_dept_name like concat('%',#{request.customerDeptName},'%')
         </if>
-        <if test="request.createUserName != null and request.createUserName !=''">
+        <if test="request != null and request.createUserName != null and request.createUserName !=''">
             and create_user_name like concat('%',#{request.createUserName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSealUseNoteMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSealUseNoteMapper.xml
index ab37bc1..b02bb33 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSealUseNoteMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSealUseNoteMapper.xml
@@ -29,32 +29,32 @@
     </sql>
 
     <select id="selectBatchForApprovalList" resultMap="BaseResultMap">
-        SELECT *
+        SELECT brsun.*, brsi.seal_name, brsi.seal_type, brsi.approver_name
         FROM biz_resource_seal_use_note brsun
         JOIN biz_resource_seal_info brsi ON brsun.seal_id = brsi.id
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and brsun.approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and brsun.create_user_id = #{request.createUserId}
         </if>
-        <if test="request.sealName != null and request.sealName !=''">
+        <if test="request != null and request.sealName != null and request.sealName !=''">
             and brsi.seal_name like concat('%',#{request.sealName},'%')
         </if>
-        <if test="request.sealType != null and request.sealType !=''">
+        <if test="request != null and request.sealType != null and request.sealType !=''">
             and brsi.seal_type = #{request.sealType}
         </if>
-        <if test="request.applyDeptName != null and request.applyDeptName !=''">
+        <if test="request != null and request.applyDeptName != null and request.applyDeptName !=''">
             and brsun.apply_dept_name like concat('%',#{request.applyDeptName},'%')
         </if>
-        <if test="request.applyUserName != null and request.applyUserName !=''">
+        <if test="request != null and request.applyUserName != null and request.applyUserName !=''">
             and brsun.apply_user_name like concat('%',#{request.applyUserName},'%')
         </if>
-        <if test="request.applyTimeStart != null and request.applyTimeStart !=''">
+        <if test="request != null and request.applyTimeStart != null and request.applyTimeStart !=''">
             and brsun.apply_time &gt;= #{request.applyTimeStart}
         </if>
-        <if test="request.applyTimeEnd != null and request.applyTimeEnd !=''">
+        <if test="request != null and request.applyTimeEnd != null and request.applyTimeEnd !=''">
             and brsun.apply_time &lt;= #{request.applyTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml
index 119bf7d..4f8392a 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml
@@ -31,6 +31,12 @@
         <if test="request.deptName != null and request.deptName !=''">
             and brsi.dept_name like concat('%',#{request.deptName},'%')
         </if>
+        <if test="request.ids != null">
+            and brsv.id in
+            <foreach collection="request.ids" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
         ORDER BY brsv.grant_date DESC
     </select>
 
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSupplierInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSupplierInfoMapper.xml
index fe8d399..e8ce7ef 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSupplierInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSupplierInfoMapper.xml
@@ -48,28 +48,28 @@
         SELECT *
         FROM biz_resource_supplier_info
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.supplierNo != null and request.supplierNo !=''">
+        <if test="request != null and request.supplierNo != null and request.supplierNo !=''">
             and supplier_no like concat('%',#{request.supplierNo},'%')
         </if>
-        <if test="request.supplierName != null and request.supplierName !=''">
+        <if test="request != null and request.supplierName != null and request.supplierName !=''">
             and supplier_name like concat('%',#{request.supplierName},'%')
         </if>
-        <if test="request.director != null and request.director !=''">
+        <if test="request != null and request.director != null and request.director !=''">
             and director like concat('%',#{request.director},'%')
         </if>
-        <if test="request.supplierType != null and request.supplierType !=''">
+        <if test="request != null and request.supplierType != null and request.supplierType !=''">
             and supplier_type = #{request.supplierType}
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/EnvLocationInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/EnvLocationInfoMapper.xml
new file mode 100644
index 0000000..68bcf10
--- /dev/null
+++ b/casic-metering-dao/src/main/resources/mapper/resource/EnvLocationInfoMapper.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.mapper.resource.EnvLocationInfoMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.resource.EnvLocationInfo">
+        <id column="id" property="id" />
+        <result column="location_no" property="locationNo" />
+        <result column="location_name" property="locationName" />
+        <result column="location_position" property="locationPosition" />
+        <result column="create_user_id" property="createUserId" />
+        <result column="create_user" property="createUser" />
+        <result column="create_time" property="createTime" />
+        <result column="update_time" property="updateTime" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, location_no, location_name, location_position, create_user_id, create_user, create_time, update_time
+    </sql>
+
+    <select id="selectLocationListPage" resultType="com.casic.missiles.dto.resource.environment.LocationListResponse">
+        SELECT *
+        FROM env_location_info
+        WHERE 1=1
+        <if test="request.locationNo != null and request.locationNo !=''">
+            AND location_no LIKE concat('%',#{request.locationNo},'%')
+        </if>
+        <if test="request.locationName != null and request.locationName !=''">
+            AND location_name LIKE concat('%',#{request.locationName},'%')
+        </if>
+        ORDER BY create_time DESC
+    </select>
+
+</mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml
index b28c18f..8854047 100644
--- a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml
@@ -11,7 +11,6 @@
         <result column="sign_desc" property="signDesc" />
         <result column="sign_director" property="signDirector" />
         <result column="sign_user_id" property="signUserId" />
-        <result column="sign_type" property="signType" />
         <result column="minio_file_name" property="minioFileName" />
         <result column="create_time" property="createTime" />
         <result column="update_time" property="updateTime" />
@@ -28,7 +27,6 @@
         <result column="sign_name" property="signName" />
         <result column="sign_desc" property="signDesc" />
         <result column="sign_director" property="signDirector" />
-        <result column="sign_type" property="signType" />
         <result column="sign_user_id" property="signUserId" />
         <result column="minio_file_name" property="minioFileName" />
         <result column="create_time" property="createTime" />
@@ -62,4 +60,58 @@
         JOIN system_sign_user_relation ssur ON ss.id = ssur.sign_id
         WHERE ssur.user_id = #{userId}
     </select>
+
+    <select id="selectSignListPage" resultMap="BaseResultMap">
+        SELECT ss.*, sd.SIMPLE_NAME AS deptName
+        FROM system_sign ss
+        LEFT JOIN sys_user su ON su.id = ss.sign_user_id
+        LEFT JOIN sys_dept sd ON sd.id = su.dept_id
+        WHERE 1=1
+        <if test="request.signNo != null and request.signNo !=''">
+            AND ss.sign_no LIKE concat('%',#{request.signNo},'%')
+        </if>
+        <if test="request.signName != null and request.signName !=''">
+            AND ss.sign_name LIKE concat('%',#{request.signName},'%')
+        </if>
+        <if test="request.signDirector != null and request.signDirector !=''">
+            AND ss.sign_director LIKE concat('%',#{request.signDirector},'%')
+        </if>
+        <if test="request.signUserId != null and request.signUserId !=''">
+            AND ss.sign_user_id = #{request.signUserId}
+        </if>
+        <if test="request.createStartTime != null and request.createStartTime !=''">
+            AND DATE_FORMAT(ss.create_time,'%Y-%m-%d') &gt;= DATE_FORMAT(#{request.createStartTime},'%Y-%m-%d')
+        </if>
+        <if test="request.createEndTime != null and request.createEndTime !=''">
+            AND DATE_FORMAT(ss.create_time,'%Y-%m-%d')  &lt;= DATE_FORMAT(#{request.createEndTime},'%Y-%m-%d')
+        </if>
+        ORDER BY ss.create_time DESC
+    </select>
+
+    <select id="selectSignList" resultMap="BaseResultMap">
+        SELECT ss.*, sd.SIMPLE_NAME AS deptName
+        FROM system_sign ss
+        LEFT JOIN sys_user su ON su.id = ss.sign_user_id
+        LEFT JOIN sys_dept sd ON sd.id = su.dept_id
+        WHERE 1=1
+        <if test="request.signNo != null and request.signNo !=''">
+            AND ss.sign_no LIKE concat('%',#{request.signNo},'%')
+        </if>
+        <if test="request.signName != null and request.signName !=''">
+            AND ss.sign_name LIKE concat('%',#{request.signName},'%')
+        </if>
+        <if test="request.signDirector != null and request.signDirector !=''">
+            AND ss.sign_director LIKE concat('%',#{request.signDirector},'%')
+        </if>
+        <if test="request.signUserId != null and request.signUserId !=''">
+            AND ss.sign_user_id = #{request.signUserId}
+        </if>
+        <if test="request.createStartTime != null and request.createStartTime !=''">
+            AND DATE_FORMAT(ss.create_time,'%Y-%m-%d') &gt;= DATE_FORMAT(#{request.createStartTime},'%Y-%m-%d')
+        </if>
+        <if test="request.createEndTime != null and request.createEndTime !=''">
+            AND DATE_FORMAT(ss.create_time,'%Y-%m-%d')  &lt;= DATE_FORMAT(#{request.createEndTime},'%Y-%m-%d')
+        </if>
+        ORDER BY ss.create_time DESC
+    </select>
 </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 515050a..60f530b 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
@@ -47,8 +47,8 @@
     String STORAGE_LOCATION = "bizStorageLocation";
     //计量专业
     String MEASURE_MAJOR = "bizMeasureMajor";
-    //管理状态
-    String MANAGER_STATE = "bizManagerState";
+    //标准装置管理状态
+    String STANDARD_MANAGER_STATE = "bizStandardManagerState";
 
     /**
      * 资源管理 字典code
@@ -95,8 +95,6 @@
     String MEASURE_STATUS = "measureStatus";
     //检定方式
     String MEASURE_TYPE = "measureType";
-    //标识打印标志类型
-    String IDENTIFY_PRINT_TYPE = "bizBusinessIdentify";
     //变更类型
     String REPORT_CHANGE_TYPE = "bizCertChangeType";
     //规模类型
@@ -111,19 +109,24 @@
     String MEASURE_CATEGORY = "measureCategory";
     //检定结果
     String MEASURE_RESULT = "measureResult";
+    //分包原因
+    String OUTSOURCE_REASON = "outsourceReason";
+
+    /**
+     * 系统管理
+     */
+    String TEMPLATE_TYPE = "templateType";
+
 
     /**
      * 标准装置 字典code
      */
     //类别
     String STANDARD_CATEGORY = "standardCategory";
-    //管理状态
-    String STANDARD_MANAGER_STATE = "standardManagerState";
     //标准等级
     String STANDARD_LEVEL = "standardLevel";
     //传递范围
     String STANDARD_TRANSMIT_RANGE = "transmitRange";
-
     //资本来源
     String CAPITAL_SOURCE = "capitalSource";
     //标准装置-申请类型
@@ -148,8 +151,6 @@
     String CERTIFICATE_CLASS = "certificationClass";
     //证书管理-检校专业
     String CALIBRATION_MAJOR = "calibrationMajor";
-    //分包原因
-    String OUTSOURCE_REASON = "outsourceReason";
 
     /**
      * 工作台
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/BaseApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/BaseApprovalListRequest.java
index 73c12c1..80d7424 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/BaseApprovalListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/BaseApprovalListRequest.java
@@ -6,6 +6,7 @@
 
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotEmpty;
+import java.util.List;
 
 /**
  * @Description:
@@ -19,14 +20,14 @@
      * 表单id
      */
     @NotBlank(message = "表单id不能为空")
-    @ApiModelProperty(value = "表单id（流程定义对应的表单id，等价于业务id）", dataType = "String")
+    @ApiModelProperty(value = "表单id（流程定义对应的表单id，等价于业务id），导出接口不用传", dataType = "String")
     private String formId;
 
     /**
      * 审批状态类型，对应ApprovalStatusEnum
      */
     @NotEmpty(message = "审批状态类型不能为空")
-    @ApiModelProperty(value = "审批状态类型code", dataType = "String")
+    @ApiModelProperty(value = "审批状态类型code，导出接口不用传", dataType = "String")
     private String approvalStatus;
 
     @ApiModelProperty(hidden = true)
@@ -34,4 +35,7 @@
 
     @ApiModelProperty(hidden = true)
     private Long createUserId;
+
+    @ApiModelProperty(value = "导出ids", dataType = "List")
+    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificatePrintApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificatePrintApprovalListRequest.java
index b93d1c9..3cc2f4e 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificatePrintApprovalListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificatePrintApprovalListRequest.java
@@ -5,8 +5,6 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import java.util.List;
-
 /**
  * @Description:
  * @Author: wangpeng
@@ -38,7 +36,4 @@
 
     @ApiModelProperty(value = "创建结束时间", dataType = "String")
     private String createTimeEnd;
-
-    @ApiModelProperty(value = "导出ids", dataType = "List")
-    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportApprovalListRequest.java
index 4f7a038..c115847 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportApprovalListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportApprovalListRequest.java
@@ -5,8 +5,6 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import java.util.List;
-
 /**
  * @Description:
  * @Author: wangpeng
@@ -15,6 +13,8 @@
 @ApiModel
 @Data
 public class CertificateReportApprovalListRequest extends BaseApprovalListRequest {
+    @ApiModelProperty(value = "委托方id", dataType = "String")
+    private Long customerId;
 
     @ApiModelProperty(value = "证书报告编号", dataType = "String")
     private String certificateReportNo;
@@ -37,6 +37,4 @@
     @ApiModelProperty(value = "检校结束时间", dataType = "String")
     private String calibrationTimeEnd;
 
-    @ApiModelProperty(value = "导出ids", dataType = "List")
-    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/identify/IdentifyListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/identify/IdentifyListRequest.java
index 1b87ae6..f019203 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/identify/IdentifyListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/identify/IdentifyListRequest.java
@@ -4,6 +4,8 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * @Description:
  * @Author: wangpeng
@@ -26,4 +28,7 @@
 
     @ApiModelProperty(value = "打印结束时间", dataType = "String")
     private String createTimeEnd;
+
+    @ApiModelProperty(value = "导出ids", dataType = "List")
+    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListRequest.java
index 1264883..62415fb 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListRequest.java
@@ -7,6 +7,7 @@
 import lombok.Data;
 
 import javax.validation.constraints.NotBlank;
+import java.util.List;
 
 @Data
 @ApiModel
@@ -37,4 +38,6 @@
     @ApiModelProperty(value = "是否加急（1是0否null全部）", dataType = "Integer")
     private String isUrgent;
 
+    @ApiModelProperty(value = "导出ids", dataType = "List")
+    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListRequest.java
index 5201d7b..499760a 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListRequest.java
@@ -17,6 +17,9 @@
     @ApiModelProperty(value = "任务单编号", dataType = "String")
     private String orderNo;
 
+    @ApiModelProperty(value = "委托方id", dataType = "Long")
+    private Long customerId;
+
     @ApiModelProperty(value = "委托方名称", dataType = "String")
     private String customerName;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OrderSampleDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OrderSampleDTO.java
new file mode 100644
index 0000000..796edc0
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OrderSampleDTO.java
@@ -0,0 +1,19 @@
+package com.casic.missiles.dto.business.outsource;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/8/24 11:38
+ */
+@ApiModel
+@Data
+public class OrderSampleDTO {
+    @ApiModelProperty(value = "任务单id", dataType = "Long")
+    private Long orderId;
+    @ApiModelProperty(value = "受检设备id", dataType = "Long")
+    private Long sampleId;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceAssessApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceAssessApprovalListRequest.java
new file mode 100644
index 0000000..9a930c3
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceAssessApprovalListRequest.java
@@ -0,0 +1,30 @@
+package com.casic.missiles.dto.business.outsource;
+
+import com.casic.missiles.dto.BaseApprovalListRequest;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/8/24 11:01
+ */
+@ApiModel
+@Data
+public class OutsourceAssessApprovalListRequest extends BaseApprovalListRequest {
+    @ApiModelProperty(value = "评审表编号", dataType = "String")
+    private String projectNo;
+
+    @ApiModelProperty(value = "分包机构名称", dataType = "String")
+    private String outsourcerName;
+
+    @ApiModelProperty(value = "申请人", dataType = "String")
+    private String applicantName;
+
+    @ApiModelProperty(value = "申请时间开始", dataType = "String")
+    private String applicantTimeStart;
+
+    @ApiModelProperty(value = "申请时间结束", dataType = "String")
+    private String applicantTimeEnd;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceAssessSaveResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceAssessSaveResponse.java
new file mode 100644
index 0000000..8bf9aad
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceAssessSaveResponse.java
@@ -0,0 +1,20 @@
+package com.casic.missiles.dto.business.outsource;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/8/14 16:17
+ */
+@ApiModel
+@Data
+public class OutsourceAssessSaveResponse {
+    @ApiModelProperty(value = "主键id", dataType = "Long")
+    private Long id;
+
+    @ApiModelProperty(value = "编号", dataType = "String")
+    private String projectNo;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProtocolApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProtocolApprovalListRequest.java
new file mode 100644
index 0000000..0f32331
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProtocolApprovalListRequest.java
@@ -0,0 +1,30 @@
+package com.casic.missiles.dto.business.outsource;
+
+import com.casic.missiles.dto.BaseApprovalListRequest;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/8/24 15:01
+ */
+@ApiModel
+@Data
+public class OutsourceProtocolApprovalListRequest extends BaseApprovalListRequest {
+    @ApiModelProperty(value = "协议书编号", dataType = "String")
+    private String protocolNo;
+
+    @ApiModelProperty(value = "分包方名称", dataType = "String")
+    private String outsourcerName;
+
+    @ApiModelProperty(value = "申请人", dataType = "String")
+    private String applicantName;
+
+    @ApiModelProperty(value = "申请时间开始", dataType = "String")
+    private String applicantTimeStart;
+
+    @ApiModelProperty(value = "申请时间结束", dataType = "String")
+    private String applicantTimeEnd;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProtocolSaveResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProtocolSaveResponse.java
new file mode 100644
index 0000000..e324967
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProtocolSaveResponse.java
@@ -0,0 +1,20 @@
+package com.casic.missiles.dto.business.outsource;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/8/14 16:17
+ */
+@ApiModel
+@Data
+public class OutsourceProtocolSaveResponse {
+    @ApiModelProperty(value = "主键id", dataType = "Long")
+    private Long id;
+
+    @ApiModelProperty(value = "编号", dataType = "String")
+    private String protocolNo;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveApprovalListRequest.java
index f29f4e4..7047c28 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveApprovalListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveApprovalListRequest.java
@@ -5,8 +5,6 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import java.util.List;
-
 /**
  * @Description: 现场检测审批列表请求实体
  * @Author: wangpeng
@@ -30,7 +28,4 @@
     @ApiModelProperty(value = "申请时间结束", dataType = "String")
     private String applyTimeEnd;
 
-    @ApiModelProperty(value = "导出ids", dataType = "List")
-    private List<Long> ids;
-
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveDetailResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveDetailResponse.java
index 1f28752..394c934 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveDetailResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveDetailResponse.java
@@ -12,6 +12,18 @@
     @ApiModelProperty(value = "id，更新/删除使用参数", dataType = "Long")
     private Long id;
 
+    @ApiModelProperty(value = "实验室代码(字典code)", dataType = "String")
+    private String labCode;
+
+    @ApiModelProperty(value = "实验室代码(字典value)", dataType = "String")
+    private String labCodeName;
+
+    @ApiModelProperty(value = "组别代码(字典code)", dataType = "String")
+    private String groupCode;
+
+    @ApiModelProperty(value = "组别代码(字典value)", dataType = "String")
+    private String groupCodeName;
+
     @ApiModelProperty(value = "审批编号", dataType = "String")
     private String siteExecutiveNo;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/environment/LocationListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/environment/LocationListRequest.java
new file mode 100644
index 0000000..13d03c3
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/environment/LocationListRequest.java
@@ -0,0 +1,20 @@
+package com.casic.missiles.dto.resource.environment;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/6/8 13:56
+ */
+@ApiModel
+@Data
+public class LocationListRequest {
+    @ApiModelProperty(value = "地点编号", dataType = "String")
+    private String locationNo;
+
+    @ApiModelProperty(value = "地点名称", dataType = "String")
+    private String locationName;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/environment/LocationListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/environment/LocationListResponse.java
new file mode 100644
index 0000000..4c531af
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/environment/LocationListResponse.java
@@ -0,0 +1,78 @@
+package com.casic.missiles.dto.resource.environment;
+
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
+import com.baomidou.mybatisplus.annotation.TableField;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description: 地点列表响应实体
+ * @Author: wangpeng
+ * @Date: 2023/6/8 13:53
+ */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
+@ApiModel
+@Data
+public class LocationListResponse {
+    @ApiModelProperty(value = "主键id", dataType = "Long")
+    private Long id;
+
+    /**
+     * 地点编号
+     */
+    @ExcelProperty("地点编号")
+    @ApiModelProperty(value = "地点编号", dataType = "String")
+    private String locationNo;
+
+    /**
+     * 地点名称
+     */
+    @ExcelProperty("地点名称")
+    @ApiModelProperty(value = "地点名称", dataType = "String")
+    private String locationName;
+
+    /**
+     * 地点位置
+     */
+    @ExcelProperty("地点位置")
+    @ApiModelProperty(value = "地点位置", dataType = "String")
+    private String locationPosition;
+
+    /**
+     * 创建人id
+     */
+    @ApiModelProperty(value = "创建人id", dataType = "Long")
+    private Long createUserId;
+
+    /**
+     * 创建人
+     */
+    @ExcelProperty("创建人")
+    @ApiModelProperty(value = "创建人", dataType = "String")
+    @TableField("create_user")
+    private String createUser;
+
+    /**
+     * 创建时间
+     */
+    @ExcelProperty("创建时间")
+    @ApiModelProperty(value = "创建时间", dataType = "String")
+    private String createTime;
+
+    /**
+     * 更新时间
+     */
+    @ApiModelProperty(value = "更新时间", dataType = "String")
+    private String updateTime;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertRequest.java
index 9a7f6c6..c827915 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertRequest.java
@@ -4,6 +4,8 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * @Description:
  * @Author: wangpeng
@@ -16,4 +18,7 @@
     private String name;
     @ApiModelProperty(value = "部门名", dataType = "String")
     private String deptName;
+
+    @ApiModelProperty(value = "导出ids", dataType = "List")
+    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertResponse.java
index f78b159..8f2f79e 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertResponse.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.dto.resource.staff;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.casic.missiles.annotation.DictCodeField;
 import com.casic.missiles.constants.MeterDictCode;
 import io.swagger.annotations.ApiModel;
@@ -13,12 +20,18 @@
  * @Author: wangpeng
  * @Date: 2023/7/27 15:13
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @ApiModel
 @Data
 public class StaffCertResponse {
     /**
      * 人员编号
      */
+    @ExcelProperty(value = "人员编号",order = 0)
     @NotEmpty(message = "人员编号不能为空")
     @ApiModelProperty(value = "人员编号", dataType = "String")
     private String staffNo;
@@ -26,6 +39,7 @@
     /**
      * 姓名
      */
+    @ExcelProperty(value = "姓名",order = 1)
     @ApiModelProperty(value = "姓名", dataType = "String")
     private String staffName;
 
@@ -54,6 +68,7 @@
     /**
      * 部门名字
      */
+    @ExcelProperty(value = "工作部门",order = 2)
     @ApiModelProperty(value = "部门名字", dataType = "String")
     private String deptName;
 
@@ -66,6 +81,7 @@
     /**
      * 计量专业
      */
+    @ExcelProperty(value = "计量专业",order = 3)
     @ApiModelProperty(value = "计量专业", dataType = "String")
     private String major;
 
@@ -110,6 +126,7 @@
     /**
      * 证书号
      */
+    @ExcelProperty(value = "证号",order = 4)
     @ApiModelProperty(value = "证书号", dataType = "String")
     private String certNo;
 
@@ -122,12 +139,14 @@
     /**
      * 有效日期
      */
+    @ExcelProperty(value = "证书有效期",order = 6)
     @ApiModelProperty(value = "有效日期", dataType = "String")
     private String effectiveDate;
 
     /**
      * 发放日期
      */
+    @ExcelProperty(value = "发证日期",order = 5)
     @ApiModelProperty(value = "发放日期", dataType = "String")
     private String grantDate;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffListRequest.java
index 7c4afb3..0a1194a 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffListRequest.java
@@ -4,6 +4,8 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * @Description:
  * @Author: wangpeng
@@ -18,4 +20,7 @@
     private String deptName;
     @ApiModelProperty(value = "部门id", dataType = "Long")
     private Long deptId;
+
+    @ApiModelProperty(value = "导出ids", dataType = "List")
+    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/TrainListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/TrainListRequest.java
index f68597b..6321f8b 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/TrainListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/TrainListRequest.java
@@ -14,6 +14,8 @@
 public class TrainListRequest {
     @ApiModelProperty(value = "训练登记表编号", dataType = "String")
     private String trainNo;
+    @ApiModelProperty(value = "值班领导", dataType = "String")
+    private String dutyLeader;
     @ApiModelProperty(value = "创建开始时间", dataType = "String")
     private String createTimeStart;
     @ApiModelProperty(value = "创建结束时间", dataType = "String")
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/SignAddRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/SignAddRequest.java
index 117be34..d71055c 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/SignAddRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/SignAddRequest.java
@@ -43,13 +43,6 @@
     private Long signUserId;
 
     /**
-     * 签章或签名-字典code
-     */
-    @NotBlank(message = "类型不能为空")
-    @ApiModelProperty(value = "签名/签章-字典code", dataType = "String", required = true)
-    private String signType;
-
-    /**
      * minio存储文件名
      */
     @ApiModelProperty(value = "上传文件返回名称", dataType = "String")
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateAddRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateAddRequest.java
index aff1265..6316648 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateAddRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateAddRequest.java
@@ -17,30 +17,28 @@
 @Data
 public class TemplateAddRequest extends BaseSystemRequest {
     /**
-     * 原始记录模板/证书报告模板名称
+     * 模板名称
      */
     @ApiModelProperty(value = "名称", dataType = "String", required = true)
     @NotBlank(message = "名称不能为空")
     private String templateName;
 
     /**
-     * 原始记录模板/证书报告模板描述
+     * 模板描述
      */
     @ApiModelProperty(value = "描述", dataType = "String")
     private String templateDesc;
 
     /**
-     * 原始记录模板/证书报告模板创建人
+     * 创建人
      */
     @ApiModelProperty(value = "创建人", dataType = "String", required = true)
     @NotBlank(message = "创建人不能为空")
     private String templateCreator;
 
-    /**
-     * 原始记录模板/证书报告模板-字典code
-     */
-    @NotBlank(message = "类型不能为空")
-    @ApiModelProperty(value = "原始记录模板/证书报告模板-字典code", dataType = "String", required = true)
+
+    @NotBlank(message = "模板类型不能为空")
+    @ApiModelProperty(value = "模板类型(字典code)", dataType = "String", required = true)
     private String templateType;
 
     /**
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateListRequest.java
index eec5a1e..6d17bbe 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateListRequest.java
@@ -1,11 +1,12 @@
 package com.casic.missiles.dto.system;
 
+import com.casic.missiles.annotation.DictCodeField;
+import com.casic.missiles.constants.MeterDictCode;
 import com.casic.missiles.dto.BaseSystemRequest;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import javax.validation.constraints.NotBlank;
 import java.util.List;
 
 /**
@@ -19,8 +20,8 @@
     /**
      * 类型
      */
-//    @ApiModelProperty(value = "类型-字典code", dataType = "String", required = true)
-    @NotBlank(message = "类型不能为空")
+    @DictCodeField(message = "模板类型不合法", cacheName = MeterDictCode.TEMPLATE_TYPE)
+    @ApiModelProperty(value = "模板类型(字典code)", dataType = "String")
     private String templateType;
 
     /**
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificateChangeApply.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificateChangeApply.java
index 9216308..36923fd 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificateChangeApply.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificateChangeApply.java
@@ -1,11 +1,19 @@
 package com.casic.missiles.model.business;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 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 com.casic.missiles.dto.BaseRequest;
+import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -20,6 +28,12 @@
  * @author wangpeng
  * @since 2023-08-15
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
+@ApiModel
 @Data
 @TableName("biz_business_certificate_change_apply")
 public class BizBusinessCertificateChangeApply extends BaseRequest implements Serializable {
@@ -33,6 +47,7 @@
     /**
      * 申请单编号
      */
+    @ExcelProperty(value = "申请单编号", order = 1)
     @ApiModelProperty(value = "申请单编号", dataType = "String")
     @TableField("change_apply_no")
     private String changeApplyNo;
@@ -40,6 +55,7 @@
     /**
      * 申请单名字
      */
+    @ExcelProperty(value = "申请单名称", order = 2)
     @ApiModelProperty(value = "申请单名字", dataType = "String")
     @TableField("change_apply_name")
     private String changeApplyName;
@@ -54,6 +70,7 @@
     /**
      * 更换证书编号
      */
+    @ExcelProperty(value = "更换证书编号", order = 3)
     @ApiModelProperty(value = "更换证书编号", dataType = "String")
     @TableField("change_report_no")
     private String changeReportNo;
@@ -61,7 +78,8 @@
     /**
      * 更换证书名字
      */
-    @ApiModelProperty(value = "更换证书名字", dataType = "String")
+    @ExcelProperty(value = "更换证书/报告名称", order = 4)
+    @ApiModelProperty(value = "更换证书/报告名称", dataType = "String")
     @TableField("change_report_name")
     private String changeReportName;
 
@@ -73,6 +91,7 @@
     @TableField("change_type")
     private String changeType;
 
+    @ExcelProperty(value = "变更类型", order = 5)
     @ApiModelProperty(value = "变更类型(字典value)", dataType = "String")
     @TableField(exist = false)
     private String changeTypeName;
@@ -142,13 +161,15 @@
     /**
      * 创建用户名字
      */
-    @ApiModelProperty(value = "创建用户名字", dataType = "String")
+    @ExcelProperty(value = "创建人", order = 6)
+    @ApiModelProperty(value = "创建人名字", dataType = "String")
     @TableField("create_user_name")
     private String createUserName;
 
     /**
      * 创建时间
      */
+    @ExcelProperty(value = "创建时间", order = 7)
     @ApiModelProperty(value = "创建时间", dataType = "String")
     @TableField("create_time")
     private String createTime;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificateReport.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificateReport.java
index f01db9e..db06018 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificateReport.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificateReport.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.model.business;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -22,6 +29,11 @@
  * @author wangpeng
  * @since 2023-08-14
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @ApiModel
 @Data
 @TableName("biz_business_certificate_report")
@@ -36,6 +48,7 @@
     /**
      * 证书报告编号
      */
+    @ExcelProperty(value = "证书报告编号", order = 1)
     @ApiModelProperty(value = "证书报告编号", dataType = "String")
     @TableField("certificate_report_no")
     private String certificateReportNo;
@@ -43,6 +56,7 @@
     /**
      * 证书报告名称
      */
+    @ExcelProperty(value = "证书报告名称", order = 2)
     @ApiModelProperty(value = "证书报告名称", dataType = "String")
     @TableField("certificate_report_name")
     private String certificateReportName;
@@ -62,6 +76,7 @@
     @TableField("measure_category")
     private String measureCategory;
 
+    @ExcelProperty(value = "检校类别", order = 6)
     @ApiModelProperty(value = "检校类别(字典value)", dataType = "String")
     @TableField(exist = false)
     private String measureCategoryName;
@@ -69,6 +84,7 @@
     /**
      * 检校时间
      */
+    @ExcelProperty(value = "检校时间", order = 8)
     @ApiModelProperty(value = "检校时间", dataType = "String")
     @TableField("calibration_time")
     private String calibrationTime;
@@ -267,18 +283,22 @@
     @TableField(exist = false)
     private Integer decisionItem;
 
-    @ApiModelProperty(value = "设备样品编号（列表返回参数）", dataType = "String")
+    @ExcelProperty(value = "被检设备统一编号", order = 3)
+    @ApiModelProperty(value = "被检设备统一编号（列表返回参数）", dataType = "String")
     @TableField(exist = false)
     private String sampleNo;
 
-    @ApiModelProperty(value = "设备样品名称（列表返回参数）", dataType = "String")
+    @ExcelProperty(value = "被检设备名称", order = 4)
+    @ApiModelProperty(value = "被检设备名称（列表返回参数）", dataType = "String")
     @TableField(exist = false)
     private String sampleName;
 
-    @ApiModelProperty(value = "设备样品规格型号（列表返回参数）", dataType = "String")
+    @ExcelProperty(value = "规格型号", order = 5)
+    @ApiModelProperty(value = "规格型号（列表返回参数）", dataType = "String")
     @TableField(exist = false)
     private String sampleModel;
 
+    @ExcelProperty(value = "检定员", order = 7)
     @ApiModelProperty(value = "检定员名字（列表返回参数）", dataType = "String")
     @TableField(exist = false)
     private String staffName;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessIdentifyInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessIdentifyInfo.java
index 46bfba5..f1a9bec 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessIdentifyInfo.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessIdentifyInfo.java
@@ -1,10 +1,15 @@
 package com.casic.missiles.model.business;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 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;
 
@@ -20,6 +25,11 @@
  * @author wangpeng
  * @since 2023-08-15
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @Data
 @TableName("biz_business_identify_info")
 public class BizBusinessIdentifyInfo implements Serializable {
@@ -33,6 +43,7 @@
     /**
      * 记录编号
      */
+    @ExcelProperty(value = "记录编号", order = 1)
     @ApiModelProperty(value = "记录编号", dataType = "String")
     @TableField("record_no")
     private String recordNo;
@@ -41,20 +52,15 @@
      * 标志类型(字典code)
      */
     @NotEmpty(message = "标志类型不能为空")
-    @ApiModelProperty(value = "标志类型(字典code)", dataType = "String")
-    @DictCodeField(message = "标志类型不合法", cacheName = MeterDictCode.IDENTIFY_PRINT_TYPE)
+    @ApiModelProperty(value = "标志类型(直接存计量标识/使用状态/校准状态的字典value)", dataType = "String")
     @TableField("identify_type")
     private String identifyType;
 
-    @ApiModelProperty(value = "标志类型(字典value)", dataType = "String")
-    @TableField(exist = false)
-    private String identifyTypeName;
-
     /**
      * 设备id(可以是受检设备/设备台账)
      */
     @NotNull(message = "设备id不能为空")
-    @ApiModelProperty(value = "设备id(可以是受检设备/设备台账)", dataType = "String")
+    @ApiModelProperty(value = "设备id(可以是受检设备/设备台账)", dataType = "Long")
     @TableField("device_id")
     private Long deviceId;
 
@@ -66,29 +72,32 @@
     @TableField("device_type")
     private String deviceType;
 
+    @ExcelProperty(value = "统一编号", order = 3)
     @NotEmpty(message = "设备编号不能为空")
-    @ApiModelProperty(value = "设备编号", dataType = "String")
+    @ApiModelProperty(value = "统一编号", dataType = "String")
     @TableField("device_no")
     private String deviceNo;
 
     /**
      * 设备名字
      */
-    @NotEmpty(message = "设备名字不能为空")
-    @ApiModelProperty(value = "设备名字", dataType = "String")
+    @ExcelProperty(value = "设备名称", order = 4)
+    @NotEmpty(message = "设备名称不能为空")
+    @ApiModelProperty(value = "设备名称", dataType = "String")
     @TableField("device_name")
     private String deviceName;
 
     /**
      * 检定员id
      */
-    @ApiModelProperty(value = "检定员id", dataType = "String")
+    @ApiModelProperty(value = "检定员id", dataType = "Long")
     @TableField("measure_person_id")
     private Long measurePersonId;
 
     /**
      * 检定员名字
      */
+    @ExcelProperty(value = "检定员", order = 5)
     @ApiModelProperty(value = "检定员名字", dataType = "String")
     @TableField("measure_person")
     private String measurePerson;
@@ -103,7 +112,8 @@
     /**
      * 更新时间
      */
-    @ApiModelProperty(value = "更新时间", dataType = "String")
+    @ExcelProperty(value = "打印时间", order = 6)
+    @ApiModelProperty(value = "打印时间", dataType = "String")
     @TableField("update_time")
     private String updateTime;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceAssess.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceAssess.java
index 659d9ca..6720b90 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceAssess.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceAssess.java
@@ -1,11 +1,26 @@
 package com.casic.missiles.model.business;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 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 com.casic.missiles.dto.BaseRequest;
+import com.casic.missiles.dto.business.outsource.OrderSampleDTO;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import javax.validation.constraints.NotEmpty;
 import java.io.Serializable;
+import java.util.List;
 
 /**
  * <p>
@@ -15,146 +30,231 @@
  * @author wangpeng
  * @since 2023-08-16
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
+@ApiModel
 @Data
 @TableName("biz_business_outsource_assess")
-public class BizBusinessOutsourceAssess implements Serializable {
+public class BizBusinessOutsourceAssess extends BaseRequest implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
+    @ApiModelProperty(value = "id，更新/删除使用参数", dataType = "Long")
     @TableId("id")
     private Long id;
 
     /**
      * 评审表编号
      */
+    @ExcelProperty(value = "评审表编号", order = 1)
+    @ApiModelProperty(value = "评审表编号(后台生成)", dataType = "String")
     @TableField("project_no")
     private String projectNo;
 
     /**
      * 评审表名称
      */
+    @ExcelProperty(value = "评审表名称", order = 2)
+    @ApiModelProperty(value = "评审表名称", dataType = "String")
     @TableField("project_name")
     private String projectName;
 
+    @NotEmpty(message = "实验室代码不能为空")
+    @DictCodeField(message = "实验室代码描述不合法", cacheName = MeterDictCode.LAB_CODE)
+    @ApiModelProperty(value = "实验室代码(字典code)", dataType = "String")
+    @TableField("lab_code")
+    private String labCode;
+
+    @ApiModelProperty(value = "实验室代码(字典value)", dataType = "String")
+    @TableField(exist = false)
+    private String labCodeName;
+
+    /**
+     * 组别代码
+     */
+    @NotEmpty(message = "组别代码不能为空")
+    @DictCodeField(message = "组别代码描述不合法", cacheName = MeterDictCode.GROUP_CODE)
+    @ApiModelProperty(value = "组别代码(字典code)", dataType = "String")
+    @TableField("group_code")
+    private String groupCode;
+
+    @ApiModelProperty(value = "组别代码(字典value)", dataType = "String")
+    @TableField(exist = false)
+    private String groupCodeName;
+
     /**
      * 申请人id
      */
+    @ApiModelProperty(value = "申请人id", dataType = "String")
     @TableField("applicant_id")
     private Long applicantId;
 
     /**
      * 申请人名字
      */
+    @ExcelProperty(value = "申请人", order = 5)
+    @ApiModelProperty(value = "申请人", dataType = "String")
     @TableField("applicant_name")
     private String applicantName;
 
     /**
      * 申请时间
      */
+    @ExcelProperty(value = "申请时间", order = 6)
+    @ApiModelProperty(value = "申请时间", dataType = "String")
     @TableField("applicant_time")
     private String applicantTime;
 
     /**
      * 附件(minio存储文件名)
      */
+    @ApiModelProperty(value = "附件(minio存储文件名)", dataType = "String")
     @TableField("minio_file_name")
     private String minioFileName;
 
     /**
      * 备注
      */
+    @ApiModelProperty(value = "备注", dataType = "String")
     @TableField("remark")
     private String remark;
 
     /**
      * 创建人id
      */
+    @ApiModelProperty(value = "创建人id", dataType = "String")
     @TableField("create_user_id")
     private Long createUserId;
 
     /**
      * 创建人名字
      */
+    @ApiModelProperty(value = "创建人名字", dataType = "String")
     @TableField("create_user_name")
     private String createUserName;
 
     /**
      * 分包方id
      */
+    @ApiModelProperty(value = "评审表编号", dataType = "String")
     @TableField("outsourcer_id")
     private Long outsourcerId;
 
     /**
      * 预计开始时间
      */
+    @ApiModelProperty(value = "预计开始时间", dataType = "String")
     @TableField("pre_start_time")
     private String preStartTime;
 
     /**
      * 预计结束时间
      */
+    @ApiModelProperty(value = "预计结束时间", dataType = "String")
     @TableField("pre_end_time")
     private String preEndTime;
 
     /**
      * 分包原因-字典
      */
+    @ApiModelProperty(value = "分包原因(字典code)", dataType = "String")
+    @DictCodeField(message = "分包原因描述不合法", cacheName = MeterDictCode.OUTSOURCE_REASON)
     @TableField("outsource_reason")
     private String outsourceReason;
 
+    @ApiModelProperty(value = "分包原因(字典value)", dataType = "String")
+    @TableField(exist = false)
+    private String outsourceReasonName;
+
     /**
      * 预计费用
      */
+    @ApiModelProperty(value = "预计费用", dataType = "String")
     @TableField("pre_cost")
     private String preCost;
 
     /**
      * 审批状态
      */
+    @ApiModelProperty(value = "审批状态", dataType = "String")
+    @DictCodeField(message = "审批状态描述不合法", cacheName = MeterDictCode.APPROVAL_STATUS)
     @TableField("approval_status")
     private String approvalStatus;
 
     /**
      * 流程实例id
      */
+    @ApiModelProperty(value = "流程实例id", dataType = "String")
     @TableField("process_id")
     private String processId;
 
     /**
      * 实验室认可情况
      */
+    @ApiModelProperty(value = "实验室认可情况", dataType = "String")
     @TableField("approve_situation")
     private String approveSituation;
 
     /**
      * 溯源性
      */
+    @ApiModelProperty(value = "溯源性", dataType = "String")
     @TableField("traceability")
     private String traceability;
 
     /**
      * 测试方法
      */
+    @ApiModelProperty(value = "测试方法", dataType = "String")
     @TableField("test_method")
     private String testMethod;
 
     /**
      * 技术能力
      */
+    @ApiModelProperty(value = "技术能力", dataType = "String")
     @TableField("technique_ability")
     private String techniqueAbility;
 
     /**
      * 创建时间
      */
+    @ApiModelProperty(hidden = true)
     @TableField("create_time")
     private String createTime;
 
     /**
      * 更新时间
      */
+    @ApiModelProperty(hidden = true)
     @TableField("update_time")
     private String updateTime;
 
+    @ApiModelProperty(value = "审批状态类型-字典value", dataType = "String")
+    @TableField(exist = false)
+    private String approvalStatusName;
 
+    @ApiModelProperty(value = "任务id（同意、驳回等操作使用）", dataType = "String")
+    @TableField(exist = false)
+    private String taskId;
+
+    @ApiModelProperty(value = "可选决策项（1同意驳回拒绝 2同意驳回 3同意拒绝，用于待审批列表同意/驳回/拒绝按钮展示）", dataType = "Integer")
+    @TableField(exist = false)
+    private Integer decisionItem;
+
+    @NotEmpty(message = "受检设备信息不能为空")
+    @ApiModelProperty(value = "受检设备id列表（新建使用参数）", dataType = "List")
+    @TableField(exist = false)
+    private List<OrderSampleDTO> orderSampleList;
+
+    @ExcelProperty(value = "分包机构名称", order = 3)
+    @ApiModelProperty(value = "分包机构名称（列表返回参数）", dataType = "String")
+    private String outsourcerName;
+
+    @ExcelProperty(value = "机构负责人", order = 4)
+    @ApiModelProperty(value = "机构负责人（列表返回参数）", dataType = "String")
+    private String director;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceProtocol.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceProtocol.java
new file mode 100644
index 0000000..38df697
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceProtocol.java
@@ -0,0 +1,225 @@
+package com.casic.missiles.model.business;
+
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
+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 com.casic.missiles.dto.BaseRequest;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotEmpty;
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 计量检定业务-分包管理-测试、校准或检定工作分包协议书
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-08-24
+ */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
+@Data
+@TableName("biz_business_outsource_protocol")
+public class BizBusinessOutsourceProtocol extends BaseRequest implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "id，更新/删除使用参数", dataType = "Long")
+    @TableId("id")
+    private Long id;
+
+    /**
+     * 协议书编号
+     */
+    @ExcelProperty(value = "协议书编号", order = 1)
+    @ApiModelProperty(value = "协议书编号(后台生成)", dataType = "String")
+    @TableField("protocol_no")
+    private String protocolNo;
+
+    /**
+     * 协议书名称
+     */
+    @ExcelProperty(value = "协议书名称", order = 2)
+    @ApiModelProperty(value = "协议书名称", dataType = "String")
+    @TableField("project_name")
+    private String projectName;
+
+    @NotEmpty(message = "实验室代码不能为空")
+    @DictCodeField(message = "实验室代码描述不合法", cacheName = MeterDictCode.LAB_CODE)
+    @ApiModelProperty(value = "实验室代码(字典code)", dataType = "String")
+    @TableField("lab_code")
+    private String labCode;
+
+    @ApiModelProperty(value = "实验室代码(字典value)", dataType = "String")
+    @TableField(exist = false)
+    private String labCodeName;
+
+    @NotEmpty(message = "组别代码不能为空")
+    @DictCodeField(message = "组别代码描述不合法", cacheName = MeterDictCode.GROUP_CODE)
+    @ApiModelProperty(value = "组别代码(字典code)", dataType = "String")
+    @TableField("group_code")
+    private String groupCode;
+
+    @ApiModelProperty(value = "组别代码(字典value)", dataType = "String")
+    @TableField(exist = false)
+    private String groupCodeName;
+
+    /**
+     * 分包方id
+     */
+    @ApiModelProperty(value = "分包方id", dataType = "Long")
+    @TableField("outsourcer_id")
+    private Long outsourcerId;
+
+    /**
+     * 其他
+     */
+    @ApiModelProperty(value = "其他", dataType = "String")
+    @TableField("remark")
+    private String remark;
+
+    /**
+     * 分包方编号
+     */
+    @ApiModelProperty(value = "分包方编号(新建不用传)", dataType = "String")
+    @TableField("outsource_no")
+    private String outsourceNo;
+
+    /**
+     * 分包方名称
+     */
+    @ExcelProperty(value = "分包方名称", order = 3)
+    @ApiModelProperty(value = "分包方名称(新建不用传)", dataType = "String")
+    @TableField("outsource_name")
+    private String outsourceName;
+
+    /**
+     * 联系人
+     */
+    @ExcelProperty(value = "联系人", order = 4)
+    @ApiModelProperty(value = "联系人", dataType = "String")
+    @TableField("contacts")
+    private String contacts;
+
+    /**
+     * 电话
+     */
+    @ApiModelProperty(value = "电话", dataType = "String")
+    @TableField("mobile")
+    private String mobile;
+
+    /**
+     * 地址
+     */
+    @ApiModelProperty(value = "地址", dataType = "String")
+    @TableField("address")
+    private String address;
+
+    /**
+     * 要求完成日期
+     */
+    @ApiModelProperty(value = "要求完成日期", dataType = "String")
+    @TableField("require_date")
+    private String requireDate;
+
+    /**
+     * 分包费用(元)
+     */
+    @ApiModelProperty(value = "分包费用(元)", dataType = "String")
+    @TableField("outsource_cost")
+    private Double outsourceCost;
+
+    /**
+     * 分包方负责人
+     */
+    @ApiModelProperty(value = "分包方负责人", dataType = "String")
+    @TableField("director")
+    private String director;
+
+    /**
+     * 分包项目
+     */
+    @ApiModelProperty(value = "分包项目", dataType = "String")
+    @TableField("item")
+    private String item;
+
+    /**
+     * 分包要求
+     */
+    @ApiModelProperty(value = "分包要求", dataType = "String")
+    @TableField("requires")
+    private String requires;
+
+    /**
+     * 创建人id
+     */
+    @ApiModelProperty(hidden = true)
+    @TableField("create_user_id")
+    private Long createUserId;
+
+    /**
+     * 创建人名字
+     */
+    @ExcelProperty(value = "申请人", order = 5)
+    @ApiModelProperty(value = "申请人", dataType = "String")
+    @TableField("create_user_name")
+    private String createUserName;
+
+    /**
+     * 审批状态
+     */
+    @ApiModelProperty(value = "审批状态", dataType = "String")
+    @DictCodeField(message = "审批状态描述不合法", cacheName = MeterDictCode.APPROVAL_STATUS)
+    @TableField("approval_status")
+    private String approvalStatus;
+
+    /**
+     * 流程实例id
+     */
+    @ApiModelProperty(value = "流程实例id", dataType = "String")
+    @TableField("process_id")
+    private String processId;
+
+    /**
+     * 创建时间
+     */
+    @ExcelProperty(value = "申请时间", order = 6)
+    @ApiModelProperty(value = "申请时间", dataType = "String")
+    @TableField("create_time")
+    private String createTime;
+
+    /**
+     * 更新时间
+     */
+    @ApiModelProperty(hidden = true)
+    @TableField("update_time")
+    private String updateTime;
+
+    @ApiModelProperty(value = "审批状态类型-字典value", dataType = "String")
+    @TableField(exist = false)
+    private String approvalStatusName;
+
+    @ApiModelProperty(value = "任务id（同意、驳回等操作使用）", dataType = "String")
+    @TableField(exist = false)
+    private String taskId;
+
+    @ApiModelProperty(value = "可选决策项（1同意驳回拒绝 2同意驳回 3同意拒绝，用于待审批列表同意/驳回/拒绝按钮展示）", dataType = "Integer")
+    @TableField(exist = false)
+    private Integer decisionItem;
+
+
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourcerInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourcerInfo.java
index ec4e997..f9aa69e 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourcerInfo.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourcerInfo.java
@@ -17,6 +17,7 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import javax.validation.constraints.NotEmpty;
 import java.io.Serializable;
 
 /**
@@ -59,6 +60,29 @@
     @TableField("outsourcer_name")
     private String outsourcerName;
 
+    @NotEmpty(message = "实验室代码不能为空")
+    @DictCodeField(message = "实验室代码描述不合法", cacheName = MeterDictCode.LAB_CODE)
+    @ApiModelProperty(value = "实验室代码(字典code)", dataType = "String")
+    @TableField("lab_code")
+    private String labCode;
+
+    @ApiModelProperty(value = "实验室代码(字典value)", dataType = "String")
+    @TableField(exist = false)
+    private String labCodeName;
+
+    /**
+     * 组别代码
+     */
+    @NotEmpty(message = "组别代码不能为空")
+    @DictCodeField(message = "组别代码描述不合法", cacheName = MeterDictCode.GROUP_CODE)
+    @ApiModelProperty(value = "组别代码(字典code)", dataType = "String")
+    @TableField("group_code")
+    private String groupCode;
+
+    @ApiModelProperty(value = "组别代码(字典value)", dataType = "String")
+    @TableField(exist = false)
+    private String groupCodeName;
+
     /**
      * 单位简称
      */
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardInfo.java
index c48eed7..dffdfdd 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardInfo.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardInfo.java
@@ -5,6 +5,7 @@
 import com.baomidou.mybatisplus.annotation.TableName;
 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;
 
@@ -18,6 +19,7 @@
  * @author wangpeng
  * @since 2023-08-04
  */
+@ApiModel
 @Data
 @TableName("biz_equipment_standard_info")
 public class BizEquipmentStandardInfo implements Serializable {
@@ -119,7 +121,7 @@
      * 管理状态(字典code)
      */
     @ApiModelProperty(value = "管理状态(字典code)", dataType = "String")
-    @DictCodeField(message = "管理状态不合法", cacheName = MeterDictCode.MANAGER_STATE)
+    @DictCodeField(message = "管理状态不合法", cacheName = MeterDictCode.STANDARD_MANAGER_STATE)
     @TableField("manage_status")
     private String manageStatus;
 
@@ -151,7 +153,7 @@
     /**
      * 温度(℃)
      */
-    @ApiModelProperty(value = "使用状态(字典code)", dataType = "String")
+    @ApiModelProperty(value = "温度(℃)", dataType = "String")
     @TableField("temperature")
     private Double temperature;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardInfoApproval.java b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardInfoApproval.java
index dbd86ab..9f58d83 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardInfoApproval.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardInfoApproval.java
@@ -150,7 +150,7 @@
      * 管理状态(字典code)
      */
     @ApiModelProperty(value = "管理状态(字典code)", dataType = "String")
-    @DictCodeField(message = "管理状态不合法", cacheName = MeterDictCode.MANAGER_STATE)
+    @DictCodeField(message = "管理状态不合法", cacheName = MeterDictCode.STANDARD_MANAGER_STATE)
     @TableField("manage_status")
     private String manageStatus;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardTechnologyRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardTechnologyRelation.java
index 0e612bd..751f26b 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardTechnologyRelation.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardTechnologyRelation.java
@@ -3,6 +3,7 @@
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -16,6 +17,7 @@
  * @author wangpeng
  * @since 2023-08-04
  */
+@ApiModel
 @Data
 @TableName("biz_equipment_standard_technology_relation")
 public class BizEquipmentStandardTechnologyRelation implements Serializable {
@@ -33,6 +35,10 @@
     @TableField("technology_file_id")
     private Long technologyFileId;
 
+    @ApiModelProperty(value = "依据的技术文件编号", dataType = "String")
+    @TableField("technology_file_no")
+    private String technologyFileNo;
+
     /**
      * 依据的技术文件名称(技术文件中现行测试校准检定方法表文件名字段)
      */
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerInfo.java
index d6e8bed..65cd6bc 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerInfo.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerInfo.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.model.resource;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -21,6 +28,11 @@
  * @author wangpeng
  * @since 2023-08-08
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @ApiModel
 @Data
 @TableName("biz_resource_customer_info")
@@ -35,6 +47,7 @@
     /**
      * 委托方编号
      */
+    @ExcelProperty(value = "委托方编号", order = 1)
     @ApiModelProperty(value = "委托方编号", dataType = "String")
     @TableField("customer_no")
     private String customerNo;
@@ -42,6 +55,7 @@
     /**
      * 委托方名称
      */
+    @ExcelProperty(value = "委托方名称", order = 2)
     @ApiModelProperty(value = "委托方名称(新建时为下拉选择一个受检单位组织的名字，传deptId字段，后端获取名称)", dataType = "String")
     @TableField("customer_name")
     private String customerName;
@@ -63,6 +77,7 @@
     /**
      * 联系人
      */
+    @ExcelProperty(value = "联系人", order = 3)
     @ApiModelProperty(value = "联系人", dataType = "String")
     @TableField("contacts")
     private String contacts;
@@ -70,6 +85,7 @@
     /**
      * 座机电话
      */
+    @ExcelProperty(value = "座机电话", order = 4)
     @ApiModelProperty(value = "座机电话", dataType = "String")
     @TableField("mobile")
     private String mobile;
@@ -77,6 +93,7 @@
     /**
      * 手机号码
      */
+    @ExcelProperty(value = "手机号码", order = 5)
     @ApiModelProperty(value = "手机号码", dataType = "String")
     @TableField("phone")
     private String phone;
@@ -91,6 +108,7 @@
     /**
      * 地址
      */
+    @ExcelProperty(value = "地址", order = 6)
     @ApiModelProperty(value = "地址", dataType = "String")
     @TableField("address")
     private String address;
@@ -141,6 +159,7 @@
     /**
      * 创建时间
      */
+    @ExcelProperty(value = "创建时间", order = 7)
     @ApiModelProperty(value = "创建时间", dataType = "String")
     @TableField("create_time")
     private String createTime;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerSuggestForm.java b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerSuggestForm.java
index 7201bbd..701bf8b 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerSuggestForm.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerSuggestForm.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.model.resource;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -22,6 +29,11 @@
  * @author wangpeng
  * @since 2023-08-08
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @ApiModel
 @Data
 @TableName("biz_resource_customer_suggest_form")
@@ -44,7 +56,8 @@
     /**
      * 委托方名称
      */
-    @ApiModelProperty(value = "委托方名称", dataType = "String")
+    @ExcelProperty(value = "意见反馈单位", order = 2)
+    @ApiModelProperty(value = "意见反馈单位", dataType = "String")
     @TableField("customer_name")
     private String customerName;
 
@@ -59,7 +72,8 @@
     /**
      * 委托方意见反馈部门名称
      */
-    @ApiModelProperty(value = "委托方意见反馈部门名称", dataType = "String")
+    @ExcelProperty(value = "委托方意见反馈部门", order = 3)
+    @ApiModelProperty(value = "委托方意见反馈部门", dataType = "String")
     @TableField("customer_dept_name")
     private String customerDeptName;
 
@@ -73,6 +87,7 @@
     /**
      * 表单编号
      */
+    @ExcelProperty(value = "表单编号", order = 1)
     @ApiModelProperty(value = "表单编号", dataType = "String")
     @TableField("form_no")
     private String formNo;
@@ -111,6 +126,7 @@
     /**
      * 创建人名字
      */
+    @ExcelProperty(value = "创建人", order = 4)
     @ApiModelProperty(value = "创建人名字", dataType = "String")
     @TableField("create_user_name")
     private String createUserName;
@@ -147,6 +163,7 @@
     /**
      * 创建时间
      */
+    @ExcelProperty(value = "创建时间", order = 5)
     @ApiModelProperty(value = "创建时间", dataType = "String")
     @TableField("create_time")
     private String createTime;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSealInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSealInfo.java
index cbf05d7..9bf389d 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSealInfo.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSealInfo.java
@@ -106,6 +106,10 @@
     @TableField("minio_file_name")
     private String minioFileName;
 
+    @ApiModelProperty(value = "minio存储文件url", dataType = "String")
+    @TableField(exist = false)
+    private String minioFileUrl;
+
     @ApiModelProperty(value = "创建时间", dataType = "String")
     @TableField("create_time")
     private String createTime;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSealUseNote.java b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSealUseNote.java
index 3f2d9e8..3ce16a8 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSealUseNote.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSealUseNote.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.model.resource;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -20,6 +27,11 @@
  * @author wangpeng
  * @since 2023-07-28
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @ApiModel
 @Data
 @TableName("biz_resource_seal_use_note")
@@ -34,6 +46,7 @@
     /**
      * 登记表编号
      */
+    @ExcelProperty(value = "申请单编号", order = 1)
     @ApiModelProperty(value = "登记表编号(自动生成)", dataType = "String")
     @TableField("note_form_no")
     private String noteFormNo;
@@ -55,6 +68,7 @@
     /**
      * 申请部门
      */
+    @ExcelProperty(value = "申请部门", order = 5)
     @ApiModelProperty(value = "申请部门", dataType = "String")
     @TableField("apply_dept_name")
     private String applyDeptName;
@@ -69,6 +83,7 @@
     /**
      * 申请人
      */
+    @ExcelProperty(value = "申请人", order = 6)
     @ApiModelProperty(value = "申请人", dataType = "String")
     @TableField("apply_user_name")
     private String applyUserName;
@@ -76,6 +91,7 @@
     /**
      * 申请时间
      */
+    @ExcelProperty(value = "申请时间", order = 7)
     @ApiModelProperty(value = "申请时间(新增自动获取当前时间)", dataType = "String")
     @TableField("apply_time")
     private String applyTime;
@@ -130,6 +146,26 @@
     @TableField("update_time")
     private String updateTime;
 
+    @ExcelProperty(value = "印章名称", order = 2)
+    @ApiModelProperty(value = "印章名称(列表返回参数)", dataType = "String")
+    @TableField(exist = false)
+    private String sealName;
+
+    @DictCodeField(message = "印章类型描述不合法", cacheName = MeterDictCode.SEAL_TYPE)
+    @ApiModelProperty(hidden = true)
+    @TableField(exist = false)
+    private String sealType;
+
+    @ExcelProperty(value = "印章类型", order = 3)
+    @ApiModelProperty(value = "印章类型(列表返回参数)", dataType = "String")
+    @TableField(exist = false)
+    private String sealTypeName;
+
+    @ExcelProperty(value = "批准人", order = 4)
+    @ApiModelProperty(value = "批准人(列表返回参数)", dataType = "String")
+    @TableField(exist = false)
+    private String approverName;
+
     @ApiModelProperty(value = "审批状态类型-字典value", dataType = "String")
     @TableField(exist = false)
     private String approvalStatusName;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceStaffInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceStaffInfo.java
index 5ef995b..41563a1 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceStaffInfo.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceStaffInfo.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.model.resource;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -20,6 +27,11 @@
  * @author wangpeng
  * @since 2023-07-25
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @ApiModel
 @Data
 @TableName("biz_resource_staff_info")
@@ -38,6 +50,7 @@
     /**
      * 人员编号
      */
+    @ExcelProperty(value = "人员编号",order = 0)
     @NotEmpty(message = "人员编号不能为空")
     @ApiModelProperty(value = "人员编号", dataType = "String")
     @TableField("staff_no")
@@ -46,6 +59,7 @@
     /**
      * 姓名
      */
+    @ExcelProperty(value = "姓名",order = 1)
     @ApiModelProperty(value = "姓名", dataType = "String")
     @TableField("staff_name")
     private String staffName;
@@ -152,13 +166,15 @@
     /**
      * 部门名字
      */
-    @ApiModelProperty(value = "部门名字", dataType = "String")
+    @ExcelProperty(value = "工作部门",order = 4)
+    @ApiModelProperty(value = "工作部门", dataType = "String")
     @TableField("dept_name")
     private String deptName;
 
     /**
      * 岗位
      */
+    @ExcelProperty(value = "岗位",order = 2)
     @ApiModelProperty(value = "岗位", dataType = "String")
     @TableField("station")
     private String station;
@@ -166,6 +182,7 @@
     /**
      * 计量专业
      */
+    @ExcelProperty(value = "计量专业",order = 5)
     @ApiModelProperty(value = "计量专业", dataType = "String")
     @TableField("major")
     private String major;
@@ -173,6 +190,7 @@
     /**
      * 证号
      */
+    @ExcelProperty(value = "证号",order = 3)
     @ApiModelProperty(value = "证号", dataType = "String")
     @TableField("certificate_number")
     private String certificateNumber;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSupplierInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSupplierInfo.java
index eb5ef01..a1e2697 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSupplierInfo.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSupplierInfo.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.model.resource;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -20,6 +27,11 @@
  * @author wangpeng
  * @since 2023-07-27
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @ApiModel
 @Data
 @TableName("biz_resource_supplier_info")
@@ -34,6 +46,7 @@
     /**
      * 供方编号
      */
+    @ExcelProperty(value = "供方编号", order = 1)
     @ApiModelProperty(value = "供方编号(自动生成)", dataType = "String")
     @TableField("supplier_no")
     private String supplierNo;
@@ -41,6 +54,7 @@
     /**
      * 供方名称
      */
+    @ExcelProperty(value = "供方名称", order = 2)
     @ApiModelProperty(value = "供方名称", dataType = "String")
     @TableField("supplier_name")
     private String supplierName;
@@ -60,6 +74,7 @@
     @TableField("supplier_type")
     private String supplierType;
 
+    @ExcelProperty(value = "供方类型", order = 3)
     @ApiModelProperty(value = "供方类型(字典value)", dataType = "String")
     @TableField(exist = false)
     private String supplierTypeName;
@@ -109,7 +124,8 @@
     /**
      * 电话
      */
-    @ApiModelProperty(value = "电话", dataType = "String")
+    @ExcelProperty(value = "联系电话", order = 4)
+    @ApiModelProperty(value = "联系电话", dataType = "String")
     @TableField("phone")
     private String phone;
 
@@ -158,6 +174,7 @@
     /**
      * 公司地址-省
      */
+    @ExcelProperty(value = "地址-省", order = 6)
     @ApiModelProperty(value = "公司地址-省", dataType = "String")
     @TableField("company_province_name")
     private String companyProvinceName;
@@ -172,6 +189,7 @@
     /**
      * 公司地址-市
      */
+    @ExcelProperty(value = "地址-市", order = 7)
     @ApiModelProperty(value = "公司地址-市", dataType = "String")
     @TableField("company_city_name")
     private String companyCityName;
@@ -186,6 +204,7 @@
     /**
      * 公司地址-区
      */
+    @ExcelProperty(value = "地址-区", order = 8)
     @ApiModelProperty(value = "公司地址-区", dataType = "String")
     @TableField("company_area_name")
     private String companyAreaName;
@@ -193,6 +212,7 @@
     /**
      * 公司地址-详细地址
      */
+    @ExcelProperty(value = "地址-详细地址", order = 9)
     @ApiModelProperty(value = "公司地址-详细地址", dataType = "String")
     @TableField("company_address")
     private String companyAddress;
@@ -200,6 +220,7 @@
     /**
      * 服务和供应的内容
      */
+    @ExcelProperty(value = "服务和供应的内容", order = 5)
     @ApiModelProperty(value = "服务和供应的内容", dataType = "String")
     @TableField("supplier_content")
     private String supplierContent;
@@ -250,6 +271,7 @@
     /**
      * 创建时间
      */
+    @ExcelProperty(value = "创建时间", order = 9)
     @ApiModelProperty(value = "创建时间", dataType = "String")
     @TableField("create_time")
     private String createTime;

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java
index bb0c50f..13a699b 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java
@@ -12,6 +12,7 @@
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.IGeneralApprovalService;
+import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
@@ -19,6 +20,7 @@
 import org.springframework.web.bind.annotation.RequestBody;
 
 import javax.validation.Valid;
+import java.util.List;
 import java.util.Objects;
 
 /**
@@ -117,4 +119,17 @@
         }
         return baseApprovalService.failUpdate(request);
     }
+
+    public List<O> exportList(@RequestBody @Valid R request) throws Exception {
+        List<O> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = baseApprovalService.listExportByIds(request.getIds());
+        } else {
+            list = baseApprovalService.listExport(request);
+        }
+        for (O record : list) {
+            DictCodeUtils.convertDictCodeToName(record);
+        }
+        return list;
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java
index 8a90961..d775831 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java
@@ -5,6 +5,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.business.certificate.CertificateChangeApplyApprovalListRequest;
 import com.casic.missiles.dto.business.certificate.CertificateChangeApplySaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessCertificateChangeApply;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
@@ -20,6 +21,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -48,4 +50,12 @@
         }
         return changeApplyService.saveChangeApply(request);
     }
+
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody CertificateChangeApplyApprovalListRequest request) throws Exception {
+        List<BizBusinessCertificateChangeApply> list = super.exportList(request);
+        super.exportExcel(BizBusinessCertificateChangeApply.class, list, ExportEnum.CERTIFICATE_CHANGE_APPLY.getSheetName());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java
index 5fc4b07..af8230e 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java
@@ -9,6 +9,7 @@
 import com.casic.missiles.dto.business.certificate.CertificatePrintApprovalListRequest;
 import com.casic.missiles.dto.business.certificate.CertificatePrintListResponse;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.enums.business.CertificatePrintStatusEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessCertificatePrintLog;
@@ -18,10 +19,16 @@
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.io.IOException;
+import java.util.List;
 import java.util.Objects;
 
 /**
@@ -98,4 +105,16 @@
         });
         return certificatePrintService.certificatePrintLog(idDTO.getId());
     }
+
+    @ApiOperation("证书打印审批导出")
+    @PostMapping("/listExport")
+    public void exportList(@RequestBody CertificatePrintApprovalListRequest request) throws IOException {
+        List<CertificatePrintListResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = certificatePrintService.listByIds(request.getIds());
+        } else {
+            list = certificatePrintService.list(request);
+        }
+        super.exportExcel(CertificatePrintListResponse.class, list, ExportEnum.CERTIFICATE_PRINT.getSheetName());
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java
index 63b06dc..6b2efd5 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java
@@ -6,6 +6,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.business.certificate.CertificateReportApprovalListRequest;
 import com.casic.missiles.dto.business.certificate.CertificateReportSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessCertificateReport;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
@@ -21,6 +22,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -50,7 +52,7 @@
         return certificateReportService.saveCertificateReport(request);
     }
 
-    @ApiOperation("证书审批详情（基本信息）")
+    @ApiOperation("详情（基本信息）")
     @PostMapping("/detail")
     public ReturnDTO<BizBusinessCertificateReport> detail(@RequestBody @Valid BaseDetailRequest request, BindingResult bindingResult) throws Exception {
         if(bindingResult.hasErrors()){
@@ -59,4 +61,11 @@
         return certificateReportService.detail(request);
     }
 
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody CertificateReportApprovalListRequest request) throws Exception {
+        List<BizBusinessCertificateReport> list = super.exportList(request);
+        super.exportExcel(BizBusinessCertificateReport.class, list, ExportEnum.CERTIFICATE_REPORT.getSheetName());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java
index 46b26bd..57c0809 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java
@@ -10,20 +10,21 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.business.identify.IdentifyListRequest;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessIdentifyInfo;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.business.IBizBusinessIdentifyInfoService;
+import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import javax.validation.Valid;
+import java.util.List;
 import java.util.Objects;
 
 /**
@@ -57,16 +58,13 @@
         return identifyInfoService.addIdentify(identifyInfo);
     }
 
-    @ApiOperation("标识打印更新")
+    @ApiOperation("标识打印更新（更新打印时间）")
     @PostMapping("/update")
-    public ReturnDTO updateIdentify(@RequestBody @Valid BizBusinessIdentifyInfo identifyInfo, BindingResult bindingResult) {
-        Assert.isFalse(Objects.isNull(identifyInfo.getId()), () -> {
+    public ReturnDTO updateIdentify(@RequestBody @Valid IdDTO idDTO) {
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        Assert.isFalse(bindingResult.hasErrors(), () -> {
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        });
-        return identifyInfoService.updateIdentify(identifyInfo);
+        return identifyInfoService.updateIdentify(idDTO.getId());
     }
 
     @ApiOperation("标识打印删除")
@@ -77,4 +75,37 @@
         });
         return identifyInfoService.deleteIdentify(idDTO.getId());
     }
+
+    @ApiOperation("标识打印导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody @Valid IdentifyListRequest request, BindingResult bindingResult) throws Exception {
+        if (bindingResult.hasErrors()) {
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        List<BizBusinessIdentifyInfo> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = identifyInfoService.listByIds(request.getIds());
+        } else {
+            list = identifyInfoService.list(request);
+        }
+        for (BizBusinessIdentifyInfo record : list) {
+            DictCodeUtils.convertDictCodeToName(record);
+        }
+        super.exportExcel(BizBusinessIdentifyInfo.class, list, ExportEnum.IDENTIFY_EXPORT.getSheetName());
+    }
+
+
+    // TODO: 2023/8/23 查询设备信息，4个底部按钮查设备（按钮的作用就是前端用来调不同接口、用来区分中间即将展示的标识），前端弹窗选设备，在确定保存时前端根据底部按钮判断传入设备类型deviceType字典code
+    // TODO: 2023/8/23 接口：查受检设备（第1个按钮），查设备台账（后3个按钮同一接口），查询之后前端根据标志类型的不同加到中间页面时进行判断（按产品给的对应表）
+    // TODO: 2023/8/23 提供二维码接口，前端在加到中间页面时调用一下
+
+    @ApiOperation("设备二维码")
+    @PostMapping("/equipment/qrCode")
+    public ReturnDTO<String> equipmentQrCode(@RequestBody @Valid IdDTO idDTO) {
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return identifyInfoService.equipmentQrCode(idDTO.getId());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java
index 707be6e..7e0453d 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java
@@ -117,7 +117,7 @@
     }
 
     @ApiOperation("任务单导出")
-    @PostMapping("/export")
+    @PostMapping("/listExport")
     public void orderExport(@RequestBody @Valid OrderListRequest request, HttpServletResponse response) {
         businessOrderService.orderExport(request, response);
     }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java
index 529a6ce..51432be 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java
@@ -1,9 +1,28 @@
 package com.casic.missiles.controller.business;
 
+import com.casic.missiles.controller.GeneralApprovalController;
+import com.casic.missiles.dto.BaseApprovalSubmitRequest;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.business.outsource.OutsourceAssessApprovalListRequest;
+import com.casic.missiles.dto.business.outsource.OutsourceAssessSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
+import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.model.business.BizBusinessOutsourceAssess;
+import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
+import com.casic.missiles.service.IGeneralApprovalService;
+import com.casic.missiles.service.business.IBizBusinessOutsourceAssessService;
 import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.BindingResult;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.validation.Valid;
+import java.util.List;
+
 /**
  * <p>
  * 计量检定业务-分包管理-测试、校准或检定工作分包评审表 前端控制器
@@ -15,6 +34,27 @@
 @Api(tags = "分包管理-测试、校准或检定工作分包评审表")
 @RestController
 @RequestMapping("/business/outsource/assess")
-public class BizBusinessOutsourceAssessController {
+public class BizBusinessOutsourceAssessController extends GeneralApprovalController<BizBusinessOutsourceAssess, BizBusinessOutsourceAssess, OutsourceAssessApprovalListRequest, BaseApprovalSubmitRequest> {
+    @Autowired
+    private IBizBusinessOutsourceAssessService outsourceAssessService;
 
+    public BizBusinessOutsourceAssessController(IGeneralApprovalService<BizBusinessOutsourceAssess, BizBusinessOutsourceAssess, OutsourceAssessApprovalListRequest, BaseApprovalSubmitRequest> baseApprovalService) {
+        super(baseApprovalService);
+    }
+
+    @ApiOperation("草稿箱-保存")
+    @PostMapping("/save")
+    public ReturnDTO<OutsourceAssessSaveResponse> saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceAssess request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        return outsourceAssessService.saveOutsourceAssess(request);
+    }
+
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception {
+        List<BizBusinessOutsourceAssess> list = super.exportList(request);
+        super.exportExcel(BizBusinessOutsourceAssess.class, list, ExportEnum.OUTSOURCE_ASSESS.getSheetName());
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java
new file mode 100644
index 0000000..9adef18
--- /dev/null
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java
@@ -0,0 +1,60 @@
+package com.casic.missiles.controller.business;
+
+import com.casic.missiles.controller.GeneralApprovalController;
+import com.casic.missiles.dto.BaseApprovalSubmitRequest;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.business.outsource.OutsourceProtocolApprovalListRequest;
+import com.casic.missiles.dto.business.outsource.OutsourceProtocolSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
+import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.model.business.BizBusinessOutsourceProtocol;
+import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
+import com.casic.missiles.service.IGeneralApprovalService;
+import com.casic.missiles.service.business.IBizBusinessOutsourceProtocolService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.BindingResult;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.validation.Valid;
+import java.util.List;
+
+/**
+ * <p>
+ * 计量检定业务-分包管理-测试、校准或检定工作分包协议书 前端控制器
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-08-24
+ */
+@Api(tags = "分包管理-测试、校准或检定工作分包协议书")
+@RestController
+@RequestMapping("/business/outsource/protocol")
+public class BizBusinessOutsourceProtocolController extends GeneralApprovalController<BizBusinessOutsourceProtocol, BizBusinessOutsourceProtocol, OutsourceProtocolApprovalListRequest, BaseApprovalSubmitRequest> {
+    @Autowired
+    private IBizBusinessOutsourceProtocolService outsourceProtocolService;
+
+    public BizBusinessOutsourceProtocolController(IGeneralApprovalService<BizBusinessOutsourceProtocol, BizBusinessOutsourceProtocol, OutsourceProtocolApprovalListRequest, BaseApprovalSubmitRequest> baseApprovalService) {
+        super(baseApprovalService);
+    }
+
+    @ApiOperation("草稿箱-保存")
+    @PostMapping("/save")
+    public ReturnDTO<OutsourceProtocolSaveResponse> saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceProtocol request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        return outsourceProtocolService.saveOutsourceProtocol(request);
+    }
+
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody OutsourceProtocolApprovalListRequest request) throws Exception {
+        List<BizBusinessOutsourceProtocol> list = super.exportList(request);
+        super.exportExcel(BizBusinessOutsourceProtocol.class, list, ExportEnum.OUTSOURCE_PROTOCOL.getSheetName());
+    }
+}
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java
index 097f645..f0f0943 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java
@@ -17,7 +17,6 @@
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.IGeneralApprovalService;
 import com.casic.missiles.service.business.IBizBusinessOutsourcerInfoService;
-import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -71,19 +70,8 @@
 
     @ApiOperation("分包方导出")
     @PostMapping("/listExport")
-    public void export(@RequestBody @Valid OutsourcerInfoApprovalListRequest request, BindingResult bindingResult) throws Exception {
-        if (bindingResult.hasErrors()) {
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        }
-        List<BizBusinessOutsourcerInfo> list;
-        if (!CollectionUtils.isEmpty(request.getIds())) {
-            list = outsourcerInfoService.listByIds(request.getIds());
-        } else {
-            list = outsourcerInfoService.list(request);
-        }
-        for (BizBusinessOutsourcerInfo record : list) {
-            DictCodeUtils.convertDictCodeToName(record);
-        }
+    public void export(@RequestBody OutsourcerInfoApprovalListRequest request) throws Exception {
+        List<BizBusinessOutsourcerInfo> list = super.exportList(request);
         super.exportExcel(BizBusinessOutsourcerInfo.class, list, ExportEnum.OUTSOURCER_EXPORT.getSheetName());
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java
index c2cbf9f..0410918 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java
@@ -17,11 +17,9 @@
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.IGeneralApprovalService;
 import com.casic.missiles.service.business.IBizBusinessSiteExecutiveInfoService;
-import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -60,7 +58,7 @@
         return siteExecutiveInfoService.saveSiteExecutiveInfo(siteExecutiveInfo);
     }
 
-    @ApiOperation("现场检测详情")
+    @ApiOperation("详情")
     @PostMapping("/detail")
     public ReturnDTO<SiteExecutiveDetailResponse> siteExecutiveDetail(@RequestBody @Valid IdDTO idDTO) throws Exception {
         Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
@@ -69,21 +67,10 @@
         return ReturnUtil.success(siteExecutiveInfoService.detail(idDTO.getId()));
     }
 
-    @ApiOperation("现场检测导出")
+    @ApiOperation("导出")
     @PostMapping("/listExport")
-    public void export(@RequestBody @Valid SiteExecutiveApprovalListRequest request, BindingResult bindingResult) throws Exception {
-        if (bindingResult.hasErrors()) {
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        }
-        List<SiteExecutiveApprovalListResponse> list;
-        if (!CollectionUtils.isEmpty(request.getIds())) {
-            list = siteExecutiveInfoService.listInfoByIds(request.getIds());
-        } else {
-            list = siteExecutiveInfoService.listInfo(request);
-        }
-        for (SiteExecutiveApprovalListResponse record : list) {
-            DictCodeUtils.convertDictCodeToName(record);
-        }
+    public void export(@RequestBody SiteExecutiveApprovalListRequest request) throws Exception {
+        List<SiteExecutiveApprovalListResponse> list = super.exportList(request);
         super.exportExcel(SiteExecutiveApprovalListResponse.class, list, ExportEnum.SITE_EXECUTIVE_EXPORT.getSheetName());
     }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
index 7e793cd..a92e209 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
@@ -55,7 +55,7 @@
 
     @ApiOperation("设备收发列表导出")
     @PostMapping("/export")
-    public void exportList(@RequestBody @Valid SampleDispatchListRequest request) throws IOException {
+    public void exportList(@RequestBody SampleDispatchListRequest request) throws IOException {
         List<SampleDispatchListResponse> list;
         if (!CollectionUtils.isEmpty(request.getIds())) {
             list = dispatchService.listByIds(request.getIds());
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java
index cdc77fc..d120fd4 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java
@@ -7,6 +7,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.business.labExecutive.*;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.business.IBusinessLabExecutiveInfoService;
@@ -14,6 +15,7 @@
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.*;
 
@@ -32,7 +34,7 @@
     @Autowired
     private IBusinessLabExecutiveInfoService labExecutiveInfoService;
 
-    @ApiOperation("实验室检测-部门检测-查询各状态列表（待检测、检测中、检测完）")
+    @ApiOperation("实验室任务-查询各状态列表（待检测、检测中、检测完）")
     @PostMapping("/deptExecutive/List")
     public ReturnDTO<PageInfoBT<SampleLabExecutiveListResponse>> queryDeptExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
@@ -43,10 +45,19 @@
         return ReturnUtil.success(super.packForBT(labExecutiveInfoService.deptLabExecutiveListPage(page, labExecutiveListRequest)));
     }
 
-    /**
-     * 实验室检测-我的检测-查询各状态列表（待检测、检测中、检测完）
-     */
-    @ApiOperation("实验室检测-我的检测-查询各状态列表（待检测、检测中、检测完）")
+    @ApiOperation("实验室任务导出")
+    @PostMapping("/deptExecutive/export")
+    public void deptExportList(@RequestBody @Valid SampleLabExecutiveListRequest request) throws Exception {
+        List<SampleLabExecutiveListResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = labExecutiveInfoService.deptLabExecutiveListByIds(request.getMeasureStatus(), request.getIds());
+        } else {
+            list = labExecutiveInfoService.deptLabExecutiveList(request);
+        }
+        super.exportExcel(SampleLabExecutiveListResponse.class, list, ExportEnum.DEPT_EXECUTIVE_TASK.getSheetName());
+    }
+
+    @ApiOperation("我的任务-查询各状态列表（待检测、检测中、检测完）")
     @PostMapping("/myExecutive/list")
     public ReturnDTO<PageInfoBT<SampleLabExecutiveListResponse>> queryMyExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
@@ -57,19 +68,25 @@
         return ReturnUtil.success(super.packForBT(labExecutiveInfoService.myLabExecutiveListPage(page, labExecutiveListRequest)));
     }
 
-    /**
-     * 实验室检测-我的检测-查询各状态样品数量（待检测、检测中、检测完）
-     */
-    @ApiOperation("实验室检测-我的检测-查询各状态样品数量（待检测、检测中、检测完）")
+    @ApiOperation("我的任务导出")
+    @PostMapping("/myExecutive/export")
+    public void exportList(@RequestBody @Valid SampleLabExecutiveListRequest request) throws Exception {
+        List<SampleLabExecutiveListResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = labExecutiveInfoService.myLabExecutiveListByIds(request.getMeasureStatus(), request.getIds());
+        } else {
+            list = labExecutiveInfoService.myLabExecutiveList(request);
+        }
+        super.exportExcel(SampleLabExecutiveListResponse.class, list, ExportEnum.MY_EXECUTIVE_TASK.getSheetName());
+    }
+
+    @ApiOperation("我的任务-查询各状态样品数量（待检测、检测中、检测完）")
     @GetMapping("/myExecutive/amount")
     public ReturnDTO<List<SampleAmountResponse>> queryMyExecutiveAmount() {
         return ReturnUtil.success(labExecutiveInfoService.myExecutiveAmount());
     }
 
-    /**
-     * 实验室检测-部门检测-分配（分配给具体人员）
-     */
-    @ApiOperation("实验室检测-部门检测-分配按钮（分配给具体人员）")
+    @ApiOperation("实验室任务-分配按钮（分配给具体人员）")
     @PostMapping("/deptExecutive/allocate")
     public ReturnDTO allocateStaff(@RequestBody @Valid SampleAllocateRequest sampleAllocateRequest, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -78,10 +95,7 @@
         return labExecutiveInfoService.allocateStaff(sampleAllocateRequest);
     }
 
-    /**
-     * 实验室检测-我的检测-检定人扫描收入（待检测->检测中）
-     */
-    @ApiOperation("实验室检测-我的检测-检定人扫描收入（待检测->检测中）")
+    @ApiOperation("我的任务-检定人扫描收入（待检测->检测中）")
     @PostMapping("/myExecutive/receive")
     public ReturnDTO sampleReceive(@RequestBody @Valid List<SampleOperateRequest> requestList, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -90,10 +104,7 @@
         return labExecutiveInfoService.sampleReceive(requestList);
     }
 
-    /**
-     * 实验室检测-负责人/检定人扫描检完（检测中->检测完）
-     */
-    @ApiOperation("实验室检测-负责人/检定人扫描检完（检测中->检测完）")
+    @ApiOperation("实验室任务-负责人/检定人扫描检完（检测中->检测完）")
     @PostMapping("/myExecutive/complete")
     public ReturnDTO sampleExecutiveComplete(@RequestBody @Valid List<SampleOperateRequest> requestList, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -102,10 +113,7 @@
         return labExecutiveInfoService.sampleExecutiveComplete(requestList);
     }
 
-    /**
-     * 实验室检测-部门检测/我的检测 编辑（只能修改应出具证书）
-     */
-    @ApiOperation("实验室检测-部门检测/我的检测 编辑（只能修改应出具证书）")
+    @ApiOperation("实验室任务/我的任务 编辑（只能修改应出具证书）")
     @PostMapping("/executive/update")
     public ReturnDTO updateExecutive(@RequestBody @Valid UpdateExecutiveRequest request, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -114,10 +122,7 @@
         return labExecutiveInfoService.updateExecutive(request);
     }
 
-    /**
-     * 实验室检测-部门检测/我的检测 详情
-     */
-    @ApiOperation("实验室检测-部门检测/我的检测 详情")
+    @ApiOperation("实验室任务/我的任务 详情")
     @PostMapping("/executive/detail")
     public ReturnDTO<ExecutiveDetailResponse> executiveDetail(@RequestBody @Valid ExecutiveDetailRequest request, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
@@ -131,7 +136,7 @@
      * 退回后会将下一个要执行的实验室检测状态更新为待分配，将后面的实验室顺序变更为连续（都进行减1）
      * 最后一个检测的实验室退回，等分发员再增加实验室或设备收发中的已收入直接手动点击完成
      */
-    @ApiOperation("实验室检测-部门检测/我的检测 退回（待检测/检测中->退回）")
+    @ApiOperation("实验室任务/我的任务 退回（待检测/检测中->退回）")
     @PostMapping("/executive/sendBack")
     public ReturnDTO executiveSendBack(@RequestBody @Valid ExecutiveSendBackRequest request, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -140,9 +145,6 @@
         return labExecutiveInfoService.sampleExecutiveSendBack(request);
     }
 
-    /**
-     * 分发员编辑实验室检测列表
-     */
     @ApiOperation("分发员编辑实验室检测列表")
     @PostMapping("/handOut/updateList")
     public ReturnDTO updateExecutiveList(@RequestBody @Valid UpdateExecutiveListRequest request, BindingResult bindingResult) {
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java
index 48a67ed..0c04f31 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java
@@ -10,6 +10,7 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.resource.customer.CustomerApprovalListRequest;
 import com.casic.missiles.dto.resource.customer.CustomerSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceCustomerInfo;
@@ -26,6 +27,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -55,6 +57,13 @@
         return customerInfoService.saveCustomerInfo(request);
     }
 
+    @ApiOperation("委托方名录导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody CustomerApprovalListRequest request) throws Exception {
+        List<BizResourceCustomerInfo> list = super.exportList(request);
+        super.exportExcel(BizResourceCustomerInfo.class, list, ExportEnum.CUSTOMER_INFO.getSheetName());
+    }
+
     @ApiOperation("委托方人员列表（分页）")
     @PostMapping("/person/listPage")
     public ReturnDTO<PageInfoBT<BizResourceCustomerStaff>> personListPage(@RequestBody IdDTO idDto) {
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
index 972ed4b..6418ea5 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
@@ -5,6 +5,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.resource.customer.SuggestFormApprovalListRequest;
 import com.casic.missiles.dto.resource.customer.SuggestFormSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceCustomerSuggestForm;
@@ -20,6 +21,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -50,4 +52,11 @@
         return suggestFormService.saveSuggestForm(request);
     }
 
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody SuggestFormApprovalListRequest request) throws Exception {
+        List<BizResourceCustomerSuggestForm> list = super.exportList(request);
+        super.exportExcel(BizResourceCustomerSuggestForm.class, list, ExportEnum.CUSTOMER_SUGGEST_FORM.getSheetName());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java
index 1934d1a..9e07eab 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java
@@ -15,12 +15,16 @@
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.resource.IEnvEnvironmentRecordConfigService;
 import com.casic.missiles.service.resource.IEnvEnvironmentRecordDataService;
+import com.casic.missiles.service.resource.IEnvLocationInfoService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
 import java.util.List;
@@ -39,6 +43,8 @@
     private IEnvEnvironmentRecordDataService environmentRecordDataService;
     @Autowired
     private IEnvEnvironmentRecordConfigService environmentRecordConfigService;
+    @Autowired
+    private IEnvLocationInfoService locationInfoService;
 
     @ApiOperation("环境记录单数据列表/详情")
     @PostMapping("/data/listPage")
@@ -95,4 +101,11 @@
         });
         return environmentRecordConfigService.deleteEnvironmentRecordConfig(idDTO.getId());
     }
+
+    @ApiOperation("地点列表")
+    @PostMapping("/location/listPage")
+    public ReturnDTO<PageInfoBT<LocationListResponse>> locationListPage(@RequestBody @Valid LocationListRequest request) {
+        Page<LocationListResponse> page = PageFactory.defaultPage();
+        return ReturnUtil.success(super.packForBT(locationInfoService.listPage(page, request)));
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java
index 82efe3f..e9561fa 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java
@@ -10,6 +10,7 @@
 import com.casic.missiles.dto.resource.seal.SealLogListRequest;
 import com.casic.missiles.dto.resource.seal.SealNoteApprovalListRequest;
 import com.casic.missiles.dto.resource.seal.SealNoteSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceSealUseLog;
@@ -27,6 +28,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -58,6 +60,13 @@
         return sealUseNoteService.saveSeal(request);
     }
 
+    @ApiOperation("印章使用登记导出（列表和导出中去掉经办人和监印人）")
+    @PostMapping("/listExport")
+    public void export(@RequestBody SealNoteApprovalListRequest request) throws Exception {
+        List<BizResourceSealUseNote> list = super.exportList(request);
+        super.exportExcel(BizResourceSealUseNote.class, list, ExportEnum.SEAL_NOTE.getSheetName());
+    }
+
     // TODO: 2023/7/28 印章使用日志：系统中使用印章时插入数据库
 
     @ApiOperation("印章使用日志列表（分页）")
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java
index 9b674fc..06b6521 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java
@@ -9,16 +9,20 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.resource.staff.StaffCertRequest;
 import com.casic.missiles.dto.resource.staff.StaffCertResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.service.resource.IBizResourceStaffInfoService;
 import com.casic.missiles.service.resource.IBizResourceStaffVerifierService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.List;
+
 /**
  * @Description:
  * @Author: wangpeng
@@ -41,9 +45,21 @@
         return ReturnUtil.success(super.packForBT(responsePage));
     }
 
+    @ApiOperation("证书逾期提醒导出")
+    @PostMapping("/listExport")
+    public void exportList(@RequestBody StaffCertRequest request) throws Exception {
+        List<StaffCertResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = staffInfoService.certListByIds(request.getIds());
+        } else {
+            list = staffInfoService.certList(request);
+        }
+        super.exportExcel(StaffCertResponse.class, list, ExportEnum.STAFF_CERTIFICATE_EXPIRE.getSheetName());
+    }
+
     @ApiOperation("证书逾期提醒")
     @PostMapping("/expirationReminder")
-    public ReturnDTO expirationReminder(@RequestBody IdDTO idDto) {
-        return verifierService.expirationReminder(idDto);
+    public ReturnDTO expirationReminder(@RequestBody IdDTO idDTO) {
+        return verifierService.expirationReminder(idDTO);
     }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java
index 3b251ad..a6e7850 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java
@@ -12,6 +12,7 @@
 import com.casic.missiles.dto.resource.staff.StaffListRequest;
 import com.casic.missiles.dto.resource.staff.TrainListRequest;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.*;
@@ -22,7 +23,10 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
 import java.util.List;
@@ -52,8 +56,19 @@
             throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
         }
         Page<BizResourceStaffInfo> page = PageFactory.defaultPage();
-        Page<BizResourceStaffInfo> responsePage = staffInfoService.listPage(page, request);
-        return ReturnUtil.success(super.packForBT(responsePage));
+        return ReturnUtil.success(super.packForBT(staffInfoService.listPage(page, request)));
+    }
+
+    @ApiOperation("人员登记导出")
+    @PostMapping("/listExport")
+    public void exportList(@RequestBody StaffListRequest request) throws Exception {
+        List<BizResourceStaffInfo> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = staffInfoService.listByIds(request.getIds());
+        } else {
+            list = staffInfoService.list(request);
+        }
+        super.exportExcel(BizResourceStaffInfo.class, list, ExportEnum.STAFF_INFO.getSheetName());
     }
 
     @ApiOperation("人员登记详情基础信息")
@@ -85,9 +100,9 @@
 
     @ApiOperation("科研教育列表（分页）")
     @PostMapping("/education/listPage")
-    public ReturnDTO<PageInfoBT<BizResourceStaffEducation>> educationListPage(@RequestBody IdDTO idDto) {
+    public ReturnDTO<PageInfoBT<BizResourceStaffEducation>> educationListPage(@RequestBody IdDTO idDTO) {
         Page<BizResourceStaffEducation> page = PageFactory.defaultPage();
-        Page<BizResourceStaffEducation> responsePage = staffInfoService.educationListPage(page, idDto);
+        Page<BizResourceStaffEducation> responsePage = staffInfoService.educationListPage(page, idDTO);
         return ReturnUtil.success(super.packForBT(responsePage));
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java
index af6aa86..d85d84a 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java
@@ -9,6 +9,7 @@
 import com.casic.missiles.dto.resource.outsideService.SupplierApprovalListRequest;
 import com.casic.missiles.dto.resource.outsideService.SupplierSaveResponse;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceSupplierAbility;
@@ -67,6 +68,13 @@
         return ReturnUtil.success(supplierInfoService.detail(idDTO.getId()));
     }
 
+    @ApiOperation("合格供方导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody SupplierApprovalListRequest request) throws Exception {
+        List<BizResourceSupplierInfo> list = super.exportList(request);
+        super.exportExcel(BizResourceSupplierInfo.class, list, ExportEnum.SUPPLIER_INFO.getSheetName());
+    }
+
     @ApiOperation("供方人员列表（分页）")
     @PostMapping("/person/listPage")
     public ReturnDTO<PageInfoBT<BizResourceSupplierPerson>> personListPage(@RequestBody IdDTO idDTO) {
diff --git a/casic-metering-api/src/main/resources/config/application.yml b/casic-metering-api/src/main/resources/config/application.yml
index 350db5f..ecff521 100644
--- a/casic-metering-api/src/main/resources/config/application.yml
+++ b/casic-metering-api/src/main/resources/config/application.yml
@@ -126,7 +126,7 @@
     #作者
     author: wangpeng
     #待生成对象表名
-    table-name: biz_equipment_technical_target_approval,biz_equipment_attachment_approval,biz_equipment_checkpoint_approval
+    table-name: biz_business_outsource_protocol
 
 reminder:
   #节点--common模块config包 ReminderNodeConfig配置
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
index 4a19e4e..d47d552 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
@@ -53,6 +53,7 @@
     SUGGEST_FORM_SAVE_FAILED(2509, "委托方意见登记表保存至草稿箱失败"),
     EXAMINE_FORM_SAVE_FAILED(2510, "要求、委托书及合同评审表保存至草稿箱失败"),
     CUSTOMER_EXIST_SAVE_FAILED(2511, "该委托方已存在，请重新选择"),
+    DUPLICATE_LOCATION_NO(2512, "地点编号已存在"),
 
     /**
      * 计量检定业务模块
@@ -68,6 +69,8 @@
     COMPLETE_SAMPLE_NOT_EXIST(2609, "检测中不存在扫描收入的样品"),
     CANNOT_CHANGE_MEASURE_INFO(2610, "无法更改非当前登录用户的检测信息"),
     NON_EXIST_ORDER_OR_SAMPLE(2611, "不存在该委托单或该委托单下的样品"),
+    OUTSOURCE_ACCESS_SAVE_FAILED(2612, "测试、校准或检定工作分包评审表保存至草稿箱失败"),
+    OUTSOURCE_PROTOCOL_SAVE_FAILED(2613, "测试、校准或检定工作分包协议书保存至草稿箱失败"),
 
     /**
      * 历史遗留备用
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
index 5089ad1..81a406b 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
@@ -10,54 +10,38 @@
     /**
      * 资源管理
      */
-    ENVIRONMENT_DATA_EXPORT("environmentData", "environmentData", "环境记录单数据"),
+    ENVIRONMENT_DATA_EXPORT("environmentData", "环境记录单数据", "环境记录单数据"),
+    STAFF_INFO("staffInfo", "人员登记", "人员登记"),
+    STAFF_CERTIFICATE_EXPIRE("certificateExpire", "证书逾期提醒", "证书逾期提醒"),
+    SUPPLIER_INFO("supplierInfo", "合格供方名录", "合格供方名录"),
+    CUSTOMER_INFO("customerInfo", "委托方名录", "委托方名录"),
+    CUSTOMER_SUGGEST_FORM("customerSuggestForm", "委托方意见登记表", "委托方意见登记表"),
+    SEAL_NOTE("sealNote", "印章使用登记", "印章使用登记"),
 
-    FILE_EXPORT("meterFileData", "meterFileData", "计量文件信息"),
-    TRAIN_PLAN_EXPORT("trainPlanData", "trainPlanData", "培训计划"),
-    TRAIN_LOG_EXPORT("trainLogData", "trainLogData", "培训记录"),
-    METER_ORGANIZE_EXPORT("meterOrganizeData", "meterOrganizeData", "计量组织"),
-    TRACE_SUPPLIER_EXPORT("traceSupplierData", "traceSupplierData", "溯源供方"),
-    SIGN_EXPORT("signData", "signData", "签名/签章"),
-    TEMPLATE_EXPORT("templateData", "templateData", "原始记录模板/证书报告模板"),
-    FIXED_ASSETS("meterFixedAssets", "meterFixedAssets", "固定资产"),
-    METER_EQUIPMENT("meterEquipment", "meterEquipment", "测量设备"),
-    CALIBRATION_TEST_EQUIPMENT("calibrationTestEquipment", "calibrationTestEquipment", "校准检定设备"),
-    MEASURE_ACCOUNT("measureAccount", "measureAccount", "测量工装"),
-    STANDARD_SUPPORT_EQUIPMENT("standardSupportEquipment", "standardSupportEquipment", "标准配套设备"),
-    STANDARD_EQUIPMENT("standardEquipment", "standardEquipment", "标准装置"),
-    FLOW_DEF_EXPORT("flowDefData", "flowDefData", "流程定义"),
-    STAFF_CERTIFICATE("certificate", "certificate", "计量人员证书"),
-    CHECK_INFO("checkInfo", "checkInfo", "设备管理点检测"),
-    EQUIPMENT_APPLY("equipmentApply", "equipmentApply", "设备借用"),
-    STANDARD_EQUIPMENT_REMIND("equipmentApplyRemind", "equipmentApplyRemind", "标准装置到期提醒"),
-    METER_PRICE("meterPrice", "meterPrice", "价格库"),
-    METER_STAFF("meterStaff", "meterStaff", "计量人员"),
-    STANDARD_EQUIPMENT_APPLY("standardEquipmentApply", "standardEquipmentApply", "标准装置申请"),
-    STATE_MANAGE_APPLY("stateManage", "stateManage", "状态管理"),
-    METER_ACCEPTANCE_CHECK("acceptanceCheck", "acceptanceCheck", "设备检修保养验收单"),
-    CUSTOMER_EXPORT("customerData", "customerData", "客户信息"),
-    ORDER_EXPORT("orderData", "orderData", "委托书信息"),
-    SAMPLE_EXPORT("sampleData", "sampleData", "样本信息"),
-    EXCHANGE_DATA("exchangeData", "exchangeData", "设备交接单"),
-    DISPATCH_DATA("dispatchData", "dispatchData", "设备收发"),
-    ENVIRONMENT_DATA("environmentData", "environmentData", "环境记录单"),
-    ORIGIN_DATA("originData", "originData", "原始记录"),
-    CERTIFICATE_REPORT("certificateReport", "certificateReport", "证书报告"),
-    ADVICE_EXPORT("adviceData", "adviceData", "客户反馈"),
-    HANDOUT_EXPORT("handoutData", "handoutData", "任务分发列表"),
-    OUTSOURCER_EXPORT("outsourcerData", "outsourcerData", "分包方"),
-    SITE_EXECUTIVE_EXPORT("siteExecutiveData", "siteExecutiveData", "现场测试、校准或检定"),
-    CERTIFICATE_PRINT_EXPORT("certificatePrintData", "certificatePrintData", "证书打印"),
-    DOWNLOAD_TEMPLATE("downloadTemplate", "downloadTemplate", "页面配置"),
-    OUTSOURCER_CERTIFICATE_EXPORT("outsourceCertificateData", "outsourceCertificateData", "分包证书"),
-    SETTLEMENT_INFO_EXPORT("settlementInfoData", "settlementInfoData", "业务结算"),
-    EQUIPMENT_REMIND("equipmentRemind", "equipmentRemind", "设备到期提醒"),
-    AGREEMENT_INFO_EXPORT("agreementInfoData", "agreementInfoData", "合同"),
-    WORK_STATISTICS_EXPORT("workStatisticsData", "workStatisticsData", "实时工作统计"),
-    DEPT_OUTPUT_EXPORT("deptOutputData", "deptOutputData", "部门产值分析"),
-    WORKLOAD_EXPORT("workloadData", "workloadData", "业务工作量分析"),
-    DEPT_COMPREHENSIVE_EXPORT("deptComprehensiveData", "deptComprehensiveData", "部门综合分析"),
-    ENVIRONMENTAL_RECORD("environmentalRecordData", "environmentalRecordData", "现场环境记录");
+    /**
+     * 计量检定业务
+     */
+    OUTSOURCER_EXPORT("outsourcerData", "分包方名录", "分包方名录"),
+    IDENTIFY_EXPORT("identifyData", "计量标识", "计量标识"),
+    ORDER_EXPORT("orderData", "任务单", "任务单"),
+    DISPATCH_DATA("dispatchData", "设备收发", "设备收发"),
+    HANDOUT_EXPORT("handoutData", "任务分发", "任务分发"),
+    SITE_EXECUTIVE_EXPORT("siteExecutiveData", "现场测试、校准或检定", "现场测试、校准或检定"),
+    CERTIFICATE_REPORT("certificateReport", "证书审批", "证书审批"),
+    CERTIFICATE_CHANGE_APPLY("certificateChangeApply", "证书报告补充或更换申请单", "证书报告补充或更换申请单"),
+    CERTIFICATE_PRINT("certificatePrintData", "证书打印审批", "证书打印审批"),
+    DEPT_EXECUTIVE_TASK("deptExecutiveTaskData", "实验室任务", "实验室任务"),
+    MY_EXECUTIVE_TASK("myExecutiveTaskData", "我的任务", "我的任务"),
+    OUTSOURCE_ASSESS("outsourceAssess", "测试、校准或检定工作分包评审表", "测试、校准或检定工作分包评审表"),
+    OUTSOURCE_PROTOCOL("outsourceProtocol", "测试、校准或检定工作分包协议书", "测试、校准或检定工作分包协议书"),
+
+    /**
+     * 系统管理
+     */
+    SIGN_EXPORT("signData", "签名", "签名"),
+    TEMPLATE_EXPORT("templateData", "文件模板", "文件模板"),
+    FLOW_DEF_EXPORT("flowDefData", "流程定义", "流程定义"),
+    DOWNLOAD_TEMPLATE("downloadTemplate", "流程定义", "页面配置");
 
     ExportEnum(String fileName, String sheetName, String description) {
         this.fileName = fileName;
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateRecordTypeCodeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateRecordTypeCodeEnum.java
index 31d913c..a963522 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateRecordTypeCodeEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateRecordTypeCodeEnum.java
@@ -46,4 +46,14 @@
     String SITE_EXECUTIVE_APPROVAL = "01";
     //《现场测试、校准或检定工作记录表》
     String SITE_EXECUTIVE_LOG = "02";
+
+    //测试、校准或检定工作分包协议书
+    String OUTSOURCE_PROTOCOL = "01";
+    //测试、校准或检定工作分包评审表
+    String OUTSOURCE_ACCESS = "02";
+    //测试、校准或检定工作分包通知书
+    String OUTSOURCE_NOTICE = "03";
+    //测试、校准或检定工作分包方名录
+    String OUTSOURCE_INFO = "04";
+
 }
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
index 24b8635..f78bd53 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
@@ -15,6 +15,10 @@
     String CERTIFICATE_CHANGE_APPLY_BEAN_NAME = "certificateChangeApplyBean";
     //现场测试、校准或检定
     String SITE_EXECUTIVE_BEAN_NAME = "siteExecutiveBean";
+    //测试、校准或检定工作分包评审表
+    String OUTSOURCE_ASSESS_BEAN_NAME = "outsourceAssessBean";
+    //测试、校准或检定工作分包协议书
+    String OUTSOURCE_PROTOCOL_BEAN_NAME = "outsourceProtocolBean";
 
     /*********************************设备与装置************************************/
     //设备台账
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 b21c661..6b86fd1 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
@@ -18,6 +18,8 @@
     OUTSOURCER_APPROVAL(OUTSOURCER_BEAN_NAME, ""),
     CERTIFICATE_CHANGE_APPROVAL(CERTIFICATE_CHANGE_APPLY_BEAN_NAME, ""),
     SITE_EXECUTIVE_APPROVAL(SITE_EXECUTIVE_BEAN_NAME, ""),
+    OUTSOURCE_ASSESS_APPROVAL(OUTSOURCE_ASSESS_BEAN_NAME, ""),
+    OUTSOURCE_PROTOCOL_APPROVAL(OUTSOURCE_PROTOCOL_BEAN_NAME, ""),
 
     ACTION_STATUS_MAP(new HashMap<String, AwareActionStatusEnum>() {
         {
@@ -47,6 +49,10 @@
             put(ApplyFromIdEnum.CERTIFICATE_CHANGE_APPROVAL.getCode(), CERTIFICATE_CHANGE_APPROVAL);
             //现场测试、校准或检定审批
             put(ApplyFromIdEnum.SITE_EXECUTIVE_APPROVAL.getCode(), SITE_EXECUTIVE_APPROVAL);
+            //测试、校准或检定工作分包评审表
+            put(ApplyFromIdEnum.OUTSOURCE_ASSESS_APPROVAL.getCode(), OUTSOURCE_ASSESS_APPROVAL);
+            //测试、校准或检定工作分包协议书
+            put(ApplyFromIdEnum.OUTSOURCE_PROTOCOL_APPROVAL.getCode(), OUTSOURCE_PROTOCOL_APPROVAL);
         }
     });
     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 934405e..c7410bd 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
@@ -9,6 +9,8 @@
     CERTIFICATE_CHANGE_APPROVAL("jljdywzsbchghsqd", MessageSourceModuleEnum.BUSINESS.getCode(), "证书/报告补充或更换申请单"),
     OUTSOURCER_APPROVAL("jljdywcsjzhgfbfml", MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定合格分包方名录"),
     SITE_EXECUTIVE_APPROVAL("jljdywxccsjzsp", MessageSourceModuleEnum.BUSINESS.getCode(), "现场测试、校准或检定审批"),
+    OUTSOURCE_ASSESS_APPROVAL("jljdywcsjzfbpsb", MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包评审表"),
+    OUTSOURCE_PROTOCOL_APPROVAL("jljdywcsjzfbxys", MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包协议书"),
 
 
     /*******************************************设备与装置*********************************************/
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/GeneralApprovalMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/GeneralApprovalMapper.java
index 4fb7344..0c9d6ae 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/GeneralApprovalMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/GeneralApprovalMapper.java
@@ -17,8 +17,4 @@
 
     Page<O> selectBatchForApprovalList(Page<O> page, @Param("request") R request, @Param("businessKeys") List<String> businessKeys);
 
-//    Page<O> selectListPage(Page<O> page, @Param("request") R request);
-
-//    Long selectMaxNo();
-
 }
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceAssessMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceAssessMapper.java
index 7867bb8..ba59009 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceAssessMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceAssessMapper.java
@@ -1,7 +1,12 @@
 package com.casic.missiles.mapper.business;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.business.outsource.OutsourceAssessApprovalListRequest;
+import com.casic.missiles.mapper.GeneralApprovalMapper;
 import com.casic.missiles.model.business.BizBusinessOutsourceAssess;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * <p>
@@ -11,6 +16,10 @@
  * @author wangpeng
  * @since 2023-08-16
  */
-public interface BizBusinessOutsourceAssessMapper extends BaseMapper<BizBusinessOutsourceAssess> {
+public interface BizBusinessOutsourceAssessMapper extends GeneralApprovalMapper<BizBusinessOutsourceAssess, BizBusinessOutsourceAssess, OutsourceAssessApprovalListRequest> {
+
+    Page<BizBusinessOutsourceAssess> selectBatchForApprovalList(Page<BizBusinessOutsourceAssess> page, @Param("request") OutsourceAssessApprovalListRequest request, @Param("businessKeys") List<String> businessKeys);
+
+    Long selectMaxProjectNo();
 
 }
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceProtocolMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceProtocolMapper.java
new file mode 100644
index 0000000..e6aba35
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceProtocolMapper.java
@@ -0,0 +1,24 @@
+package com.casic.missiles.mapper.business;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.business.outsource.OutsourceProtocolApprovalListRequest;
+import com.casic.missiles.mapper.GeneralApprovalMapper;
+import com.casic.missiles.model.business.BizBusinessOutsourceProtocol;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 计量检定业务-分包管理-测试、校准或检定工作分包协议书 Mapper 接口
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-08-24
+ */
+public interface BizBusinessOutsourceProtocolMapper extends GeneralApprovalMapper<BizBusinessOutsourceProtocol, BizBusinessOutsourceProtocol, OutsourceProtocolApprovalListRequest> {
+
+    Page<BizBusinessOutsourceProtocol> selectBatchForApprovalList(Page<BizBusinessOutsourceProtocol> page, @Param("request") OutsourceProtocolApprovalListRequest request, @Param("businessKeys") List<String> businessKeys);
+
+    Long selectMaxProtocolNo();
+}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/EnvLocationInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/EnvLocationInfoMapper.java
new file mode 100644
index 0000000..49eff87
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/EnvLocationInfoMapper.java
@@ -0,0 +1,21 @@
+package com.casic.missiles.mapper.resource;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.resource.environment.LocationListRequest;
+import com.casic.missiles.dto.resource.environment.LocationListResponse;
+import com.casic.missiles.model.resource.EnvLocationInfo;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * <p>
+ * 实验室环境监控系统-设备表 Mapper 接口
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-06-07
+ */
+public interface EnvLocationInfoMapper extends BaseMapper<EnvLocationInfo> {
+
+    Page<LocationListResponse> selectLocationListPage(Page<LocationListResponse> page, @Param("request") LocationListRequest request);
+}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java
index de124db..85ed0f7 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java
@@ -1,7 +1,9 @@
 package com.casic.missiles.mapper.system;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.dto.system.SignDetailResponse;
+import com.casic.missiles.dto.system.SignListRequest;
 import com.casic.missiles.model.system.SystemSign;
 import org.apache.ibatis.annotations.Param;
 
@@ -22,4 +24,8 @@
     SignDetailResponse selectSignDetailById(Long id);
 
     List<SystemSign> selectUsableSignList(@Param("userId") Long userId);
+
+    Page<SystemSign> selectSignListPage(Page<SystemSign> page, @Param("request") SignListRequest request);
+
+    List<SystemSign> selectSignList(@Param("request") SignListRequest request);
 }
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateChangeApplyMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateChangeApplyMapper.xml
index d798447..c496092 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateChangeApplyMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateChangeApplyMapper.xml
@@ -30,31 +30,31 @@
         SELECT *
         FROM biz_business_certificate_change_apply
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.changeApplyNo != null and request.changeApplyNo !=''">
+        <if test="request != null and request.changeApplyNo != null and request.changeApplyNo !=''">
             and change_apply_no like concat('%',#{request.changeApplyNo},'%')
         </if>
-        <if test="request.changeReportNo != null and request.changeReportNo !=''">
+        <if test="request != null and request.changeReportNo != null and request.changeReportNo !=''">
             and change_report_no like concat('%',#{request.changeReportNo},'%')
         </if>
-        <if test="request.changeReportName != null and request.changeReportName !=''">
+        <if test="request != null and request.changeReportName != null and request.changeReportName !=''">
             and change_report_name like concat('%',#{request.changeReportName},'%')
         </if>
-        <if test="request.changeType != null and request.changeType !=''">
+        <if test="request != null and request.changeType != null and request.changeType !=''">
             and change_type = #{request.changeType}
         </if>
-        <if test="request.createUserName != null and request.createUserName !=''">
+        <if test="request != null and request.createUserName != null and request.createUserName !=''">
             and create_user_name like concat('%',#{request.createUserName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificatePrintMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificatePrintMapper.xml
index b66cd99..49c0ac8 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificatePrintMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificatePrintMapper.xml
@@ -31,34 +31,34 @@
         LEFT JOIN biz_business_order_sample_relation bosr ON (bosr.order_id = bcr.order_id AND bosr.sample_id = bcr.sample_id)
         LEFT JOIN biz_business_order_info boi ON boi.id = bosr.order_id
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and bcp.approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.printStatus != null and request.printStatus !=''">
+        <if test="request != null and request.printStatus != null and request.printStatus !=''">
             and print_status = #{request.printStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and bcp.create_user_id = #{request.createUserId}
         </if>
-        <if test="request.certificateReportNo != null and request.certificateReportNo !=''">
+        <if test="request != null and request.certificateReportNo != null and request.certificateReportNo !=''">
             and bcr.certificate_report_no like concat('%',#{request.certificateReportNo},'%')
         </if>
-        <if test="request.certificateReportName != null and request.certificateReportName !=''">
+        <if test="request != null and request.certificateReportName != null and request.certificateReportName !=''">
             and bcr.certificate_report_name like concat('%',#{request.certificateReportName},'%')
         </if>
-        <if test="request.customerName != null and request.customerName !=''">
+        <if test="request != null and request.customerName != null and request.customerName !=''">
             and boi.customer_name like concat('%',#{request.customerName},'%')
         </if>
-        <if test="request.sampleNo != null and request.sampleNo !=''">
+        <if test="request != null and request.sampleNo != null and request.sampleNo !=''">
             and bosr.sample_no like concat('%',#{request.sampleNo},'%')
         </if>
-        <if test="request.sampleName != null and request.sampleName !=''">
+        <if test="request != null and request.sampleName != null and request.sampleName !=''">
             and bosr.sample_name like concat('%',#{request.sampleName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and bcp.create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and bcp.create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml
index b366034..767695d 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml
@@ -46,33 +46,37 @@
         SELECT bcr.*, bosr.sample_no, bosr.sample_name, bosr.sample_model, rsi.staff_name
         FROM biz_business_certificate_report bcr
         LEFT JOIN biz_business_order_sample_relation bosr ON (bosr.order_id = bcr.order_id AND bosr.sample_id = bcr.sample_id)
+        LEFT JOIN biz_business_order_info boi ON boi.id = bcr.order_id
         LEFT JOIN biz_resource_staff_info rsi ON rsi.id = bcr.measure_person_id
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and bcr.approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and bcr.create_user_id = #{request.createUserId}
         </if>
-        <if test="request.certificateReportNo != null and request.certificateReportNo !=''">
+        <if test="request != null and request.customerId != null and request.customerId !=''">
+            and boi.customer_id = #{request.customerId}
+        </if>
+        <if test="request != null and request.certificateReportNo != null and request.certificateReportNo !=''">
             and bcr.certificate_report_no like concat('%',#{request.certificateReportNo},'%')
         </if>
-        <if test="request.certificateReportName != null and request.certificateReportName !=''">
+        <if test="request != null and request.certificateReportName != null and request.certificateReportName !=''">
             and bcr.certificate_report_name like concat('%',#{request.certificateReportName},'%')
         </if>
-        <if test="request.sampleNo != null and request.sampleNo !=''">
+        <if test="request != null and request.sampleNo != null and request.sampleNo !=''">
             and bosr.sample_no like concat('%',#{request.sampleNo},'%')
         </if>
-        <if test="request.measureCategory != null and request.measureCategory !=''">
+        <if test="request != null and request.measureCategory != null and request.measureCategory !=''">
             and bcr.measure_category = #{request.measureCategory}
         </if>
-        <if test="request.measurePerson != null and request.measurePerson !=''">
+        <if test="request != null and request.measurePerson != null and request.measurePerson !=''">
             and rsi.staff_name like concat('%',#{request.measurePerson},'%')
         </if>
-        <if test="request.calibrationTimeStart != null and request.calibrationTimeStart !=''">
+        <if test="request != null and request.calibrationTimeStart != null and request.calibrationTimeStart !=''">
             and bcr.calibration_time &gt;= #{request.calibrationTimeStart}
         </if>
-        <if test="request.calibrationTimeEnd != null and request.calibrationTimeEnd !=''">
+        <if test="request != null and request.calibrationTimeEnd != null and request.calibrationTimeEnd !=''">
             and bcr.calibration_time &lt;= #{request.calibrationTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceAssessMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceAssessMapper.xml
index d0fcf8b..c22c101 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceAssessMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceAssessMapper.xml
@@ -7,6 +7,8 @@
         <id column="id" property="id" />
         <result column="project_no" property="projectNo" />
         <result column="project_name" property="projectName" />
+        <result column="lab_code" property="labCode" />
+        <result column="group_code" property="groupCode" />
         <result column="applicant_id" property="applicantId" />
         <result column="applicant_name" property="applicantName" />
         <result column="applicant_time" property="applicantTime" />
@@ -31,7 +33,45 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, project_no, project_name, applicant_id, applicant_name, applicant_time, minio_file_name, remark, create_user_id, create_user_name, outsourcer_id, pre_start_time, pre_end_time, outsource_reason, pre_cost, approval_status, process_id, approve_situation, traceability, test_method, technique_ability, create_time, update_time
+        id, project_no, project_name, lab_code, group_code, applicant_id, applicant_name, applicant_time, minio_file_name, remark, create_user_id, create_user_name, outsourcer_id, pre_start_time, pre_end_time, outsource_reason, pre_cost, approval_status, process_id, approve_situation, traceability, test_method, technique_ability, create_time, update_time
     </sql>
 
+    <select id="selectMaxProjectNo" resultType="java.lang.Long">
+        SELECT IFNULL(max(RIGHT(project_no, 3)), 0) from biz_business_outsource_assess
+    </select>
+
+    <select id="selectBatchForApprovalList" resultMap="BaseResultMap">
+        SELECT bboa.*, bboi.outsourcer_name, bboi.director
+        FROM biz_business_outsource_assess bboa
+        LEFT JOIN biz_business_outsourcer_info bboi ON bboa.outsourcer_id = bboi.id
+        WHERE 1=1
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
+            and bboa.approval_status = #{request.approvalStatus}
+        </if>
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
+            and bboa.create_user_id = #{request.createUserId}
+        </if>
+        <if test="request != null and request.projectNo != null and request.projectNo !=''">
+            and bboa.project_no like concat('%',#{request.projectNo},'%')
+        </if>
+        <if test="request != null and request.outsourcerName != null and request.outsourcerName !=''">
+            and bboi.outsourcer_name like concat('%',#{request.outsourcerName},'%')
+        </if>
+        <if test="request != null and request.applicantName != null and request.applicantName !=''">
+            and bboa.applicant_name like concat('%',#{request.applicantName},'%')
+        </if>
+        <if test="request != null and request.applicantTimeStart != null and request.applicantTimeStart !=''">
+            and bboa.applicant_time &gt;= #{request.applicantTimeStart}
+        </if>
+        <if test="request != null and request.applicantTimeEnd != null and request.applicantTimeEnd !=''">
+            and bboa.applicant_time &lt;= #{request.applicantTimeEnd}
+        </if>
+        <if test="businessKeys != null">
+            and bboa.id in
+            <foreach collection="businessKeys" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
+        ORDER BY bboa.create_time DESC
+    </select>
 </mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceProtocolMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceProtocolMapper.xml
new file mode 100644
index 0000000..b7b2149
--- /dev/null
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceProtocolMapper.xml
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.mapper.business.BizBusinessOutsourceProtocolMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.business.BizBusinessOutsourceProtocol">
+        <id column="id" property="id" />
+        <result column="protocol_no" property="protocolNo" />
+        <result column="project_name" property="projectName" />
+        <result column="lab_code" property="labCode" />
+        <result column="group_code" property="groupCode" />
+        <result column="outsourcer_id" property="outsourcerId" />
+        <result column="remark" property="remark" />
+        <result column="outsource_no" property="outsourceNo" />
+        <result column="outsource_name" property="outsourceName" />
+        <result column="contacts" property="contacts" />
+        <result column="mobile" property="mobile" />
+        <result column="address" property="address" />
+        <result column="require_date" property="requireDate" />
+        <result column="outsource_cost" property="outsourceCost" />
+        <result column="director" property="director" />
+        <result column="item" property="item" />
+        <result column="requires" property="requires" />
+        <result column="create_user_id" property="createUserId" />
+        <result column="create_user_name" property="createUserName" />
+        <result column="approval_status" property="approvalStatus" />
+        <result column="process_id" property="processId" />
+        <result column="create_time" property="createTime" />
+        <result column="update_time" property="updateTime" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, protocol_no, project_name, lab_code, group_code, outsourcer_id, remark, outsource_no, outsource_name, contacts, mobile, address, require_date, outsource_cost, director, item, requires, create_user_id, create_user_name, approval_status, process_id, create_time, update_time
+    </sql>
+
+    <select id="selectMaxProtocolNo" resultType="java.lang.Long">
+        SELECT IFNULL(max(RIGHT(protocol_no, 3)), 0) from biz_business_outsource_protocol
+    </select>
+
+    <select id="selectBatchForApprovalList" resultMap="BaseResultMap">
+        SELECT *
+        FROM biz_business_outsource_protocol
+        WHERE 1=1
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
+            and approval_status = #{request.approvalStatus}
+        </if>
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
+            and create_user_id = #{request.createUserId}
+        </if>
+        <if test="request != null and request.protocolNo != null and request.protocolNo !=''">
+            and protocol_no like concat('%',#{request.protocolNo},'%')
+        </if>
+        <if test="request != null and request.outsourcerName != null and request.outsourcerName !=''">
+            and outsourcer_name like concat('%',#{request.outsourcerName},'%')
+        </if>
+        <if test="request != null and request.applicantName != null and request.applicantName !=''">
+            and create_user_name like concat('%',#{request.applicantName},'%')
+        </if>
+        <if test="request != null and request.applicantTimeStart != null and request.applicantTimeStart !=''">
+            and create_time &gt;= #{request.applicantTimeStart}
+        </if>
+        <if test="request != null and request.applicantTimeEnd != null and request.applicantTimeEnd !=''">
+            and create_time &lt;= #{request.applicantTimeEnd}
+        </if>
+        <if test="businessKeys != null">
+            and id in
+            <foreach collection="businessKeys" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
+        ORDER BY create_time DESC
+    </select>
+</mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourcerInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourcerInfoMapper.xml
index 510a80b..3049b54 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourcerInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourcerInfoMapper.xml
@@ -7,6 +7,8 @@
         <id column="id" property="id" />
         <result column="outsourcer_no" property="outsourcerNo" />
         <result column="outsourcer_name" property="outsourcerName" />
+        <result column="lab_code" property="labCode" />
+        <result column="group_code" property="groupCode" />
         <result column="outsourcer_brief_name" property="outsourcerBriefName" />
         <result column="outsourcer_size" property="outsourcerSize" />
         <result column="business_size" property="businessSize" />
@@ -55,32 +57,32 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, outsourcer_no, outsourcer_name, outsourcer_brief_name, outsourcer_size, business_size, grade, evaluation, tax_number, bank_account, bank_name, bank_account_number, postal_code, director, phone, fax, mobile, email, website, address_country, address_province, address_city, address_area, full_address, address_country_name, address_province_name, address_city_name, address_area_name, invoice_country, invoice_province, invoice_city, invoice_area, invoice_full_address, invoice_country_name, invoice_province_name, invoice_city_name, invoice_area_name, business_scope, business_content, minio_file_name, approval_status, process_id, remark, create_user_id, create_user_name, create_time, update_time
+        id, outsourcer_no, outsourcer_name, lab_code, group_code, outsourcer_brief_name, outsourcer_size, business_size, grade, evaluation, tax_number, bank_account, bank_name, bank_account_number, postal_code, director, phone, fax, mobile, email, website, address_country, address_province, address_city, address_area, full_address, address_country_name, address_province_name, address_city_name, address_area_name, invoice_country, invoice_province, invoice_city, invoice_area, invoice_full_address, invoice_country_name, invoice_province_name, invoice_city_name, invoice_area_name, business_scope, business_content, minio_file_name, approval_status, process_id, remark, create_user_id, create_user_name, create_time, update_time
     </sql>
 
     <select id="selectBatchForApprovalList" resultMap="BaseResultMap">
         SELECT *
         FROM biz_business_outsourcer_info
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.outsourcerNo != null and request.outsourcerNo !=''">
+        <if test="request != null and request.outsourcerNo != null and request.outsourcerNo !=''">
             and outsourcer_no like concat('%',#{request.outsourcerNo},'%')
         </if>
-        <if test="request.outsourcerName != null and request.outsourcerName !=''">
+        <if test="request != null and request.outsourcerName != null and request.outsourcerName !=''">
             and outsourcer_name like concat('%',#{request.outsourcerName},'%')
         </if>
-        <if test="request.director != null and request.director !=''">
+        <if test="request != null and request.director != null and request.director !=''">
             and director like concat('%',#{request.director},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
@@ -93,6 +95,6 @@
     </select>
 
     <select id="selectMaxNo" resultType="java.lang.Long">
-        SELECT IFNULL(max(RIGHT(outsourcer_no, 12)), 0) from biz_business_outsourcer_info
+        SELECT IFNULL(max(RIGHT(outsourcer_no, 3)), 0) from biz_business_outsourcer_info
     </select>
 </mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessSiteExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessSiteExecutiveInfoMapper.xml
index 135c5d0..3c5ae79 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessSiteExecutiveInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessSiteExecutiveInfoMapper.xml
@@ -38,25 +38,25 @@
         FROM biz_business_site_executive_info bsei
         LEFT JOIN biz_resource_customer_info rci ON bsei.customer_id = rci.id
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and bsei.approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and bsei.create_user_id = #{request.createUserId}
         </if>
-        <if test="request.siteExecutiveNo != null and request.siteExecutiveNo !=''">
+        <if test="request != null and request.siteExecutiveNo != null and request.siteExecutiveNo !=''">
             and bsei.site_executive_no like concat('%',#{request.siteExecutiveNo},'%')
         </if>
-        <if test="request.customerName != null and request.customerName !=''">
+        <if test="request != null and request.customerName != null and request.customerName !=''">
             and rci.outsourcer_name like concat('%',#{request.customerName},'%')
         </if>
-        <if test="request.applyName != null and request.applyName !=''">
+        <if test="request != null and request.applyName != null and request.applyName !=''">
             and bsei.apply_name like concat('%',#{request.applyName},'%')
         </if>
-        <if test="request.applyTimeStart != null and request.applyTimeStart !=''">
+        <if test="request != null and request.applyTimeStart != null and request.applyTimeStart !=''">
             and bsei.apply_time &gt;= #{request.applyTimeStart}
         </if>
-        <if test="request.applyTimeEnd != null and request.applyTimeEnd !=''">
+        <if test="request != null and request.applyTimeEnd != null and request.applyTimeEnd !=''">
             and bsei.apply_time &lt;= #{request.applyTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml
index 84d9e2a..6bd38a9 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml
@@ -105,6 +105,12 @@
         <if test="request.isUrgent != null and request.isUrgent !=''">
             AND bo.is_urgent = #{request.isUrgent}
         </if>
+        <if test="request.ids != null">
+            and blei.id in
+            <foreach collection="request.ids" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
         ORDER BY blei.update_time DESC
     </select>
 
@@ -137,6 +143,12 @@
         <if test="request.isUrgent != null and request.isUrgent !=''">
             AND bo.is_urgent = #{request.isUrgent}
         </if>
+        <if test="request.ids != null">
+            and blei.id in
+            <foreach collection="request.ids" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
         ORDER BY blei.update_time DESC
     </select>
 
diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardInfoMapper.xml
index 1a5551b..2ed8d17 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardInfoMapper.xml
@@ -45,12 +45,6 @@
         FROM biz_equipment_standard_info besi
         LEFT JOIN biz_equipment_standard_technology_relation bestr ON besi.standard_no = bestr.standard_no
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
-            and besi.approval_status = #{request.approvalStatus}
-        </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
-            and besi.create_user_id = #{request.createUserId}
-        </if>
         <if test="request.standardName != null and request.standardName !=''">
             and besi.standard_name like concat('%',#{request.standardName},'%')
         </if>
diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardTechnologyRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardTechnologyRelationMapper.xml
index fc7e16c..cd03c8c 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardTechnologyRelationMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardTechnologyRelationMapper.xml
@@ -6,6 +6,7 @@
     <resultMap id="BaseResultMap" type="com.casic.missiles.model.equipment.BizEquipmentStandardTechnologyRelation">
         <id column="id" property="id" />
         <result column="technology_file_id" property="technologyFileId" />
+        <result column="technology_file_no" property="technologyFileNo" />
         <result column="technology_file_name" property="technologyFileName" />
         <result column="standard_id" property="standardId" />
         <result column="standard_no" property="standardNo" />
@@ -14,7 +15,7 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, technology_file_id, technology_file_name, standard_id, remark
+        id, technology_file_id, technology_file_no, technology_file_name, standard_id, remark
     </sql>
 
 </mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceAuthorizeOrderMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceAuthorizeOrderMapper.xml
index ac5176c..554fe65 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceAuthorizeOrderMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceAuthorizeOrderMapper.xml
@@ -32,22 +32,22 @@
         SELECT *
         FROM biz_resource_authorize_order
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.orderNo != null and request.orderNo !=''">
+        <if test="request != null and request.orderNo != null and request.orderNo !=''">
             and order_no like concat('%',#{request.orderNo},'%')
         </if>
-        <if test="request.createUserName != null and request.createUserName !=''">
+        <if test="request != null and request.createUserName != null and request.createUserName !=''">
             and create_user_name like concat('%',#{request.createUserName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerExamineFormMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerExamineFormMapper.xml
index ab242f6..af7f98f 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerExamineFormMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerExamineFormMapper.xml
@@ -41,28 +41,28 @@
         SELECT *
         FROM biz_resource_customer_examine_form
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.formNo != null and request.formNo !=''">
+        <if test="request != null and request.formNo != null and request.formNo !=''">
             and form_no like concat('%',#{request.formNo},'%')
         </if>
-        <if test="request.labCode != null and request.labCode !=''">
+        <if test="request != null and request.labCode != null and request.labCode !=''">
             and lab_code like concat('%',#{request.labCode},'%')
         </if>
-        <if test="request.groupCode != null and request.groupCode !=''">
+        <if test="request != null and request.groupCode != null and request.groupCode !=''">
             and group_code like concat('%',#{request.groupCode},'%')
         </if>
-        <if test="request.createUserName != null and request.createUserName !=''">
+        <if test="request != null and request.createUserName != null and request.createUserName !=''">
             and create_user_name like concat('%',#{request.createUserName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerInfoMapper.xml
index fa8ffbc..06a2798 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerInfoMapper.xml
@@ -33,25 +33,25 @@
         SELECT *
         FROM biz_resource_customer_info
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.customerNo != null and request.customerNo !=''">
+        <if test="request != null and request.customerNo != null and request.customerNo !=''">
             and customer_no like concat('%',#{request.customerNo},'%')
         </if>
-        <if test="request.customerName != null and request.customerName !=''">
+        <if test="request != null and request.customerName != null and request.customerName !=''">
             and customer_name like concat('%',#{request.customerName},'%')
         </if>
-        <if test="request.contacts != null and request.contacts !=''">
+        <if test="request != null and request.contacts != null and request.contacts !=''">
             and contacts like concat('%',#{request.contacts},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerSuggestFormMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerSuggestFormMapper.xml
index 28f5bb2..1806662 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerSuggestFormMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerSuggestFormMapper.xml
@@ -33,28 +33,28 @@
         SELECT *
         FROM biz_resource_customer_suggest_form
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.formNo != null and request.formNo !=''">
+        <if test="request != null and request.formNo != null and request.formNo !=''">
             and form_no like concat('%',#{request.formNo},'%')
         </if>
-        <if test="request.customerName != null and request.customerName !=''">
+        <if test="request != null and request.customerName != null and request.customerName !=''">
             and customer_name like concat('%',#{request.customerName},'%')
         </if>
-        <if test="request.customerDeptName != null and request.customerDeptName !=''">
+        <if test="request != null and request.customerDeptName != null and request.customerDeptName !=''">
             and customer_dept_name like concat('%',#{request.customerDeptName},'%')
         </if>
-        <if test="request.createUserName != null and request.createUserName !=''">
+        <if test="request != null and request.createUserName != null and request.createUserName !=''">
             and create_user_name like concat('%',#{request.createUserName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSealUseNoteMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSealUseNoteMapper.xml
index ab37bc1..b02bb33 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSealUseNoteMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSealUseNoteMapper.xml
@@ -29,32 +29,32 @@
     </sql>
 
     <select id="selectBatchForApprovalList" resultMap="BaseResultMap">
-        SELECT *
+        SELECT brsun.*, brsi.seal_name, brsi.seal_type, brsi.approver_name
         FROM biz_resource_seal_use_note brsun
         JOIN biz_resource_seal_info brsi ON brsun.seal_id = brsi.id
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and brsun.approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and brsun.create_user_id = #{request.createUserId}
         </if>
-        <if test="request.sealName != null and request.sealName !=''">
+        <if test="request != null and request.sealName != null and request.sealName !=''">
             and brsi.seal_name like concat('%',#{request.sealName},'%')
         </if>
-        <if test="request.sealType != null and request.sealType !=''">
+        <if test="request != null and request.sealType != null and request.sealType !=''">
             and brsi.seal_type = #{request.sealType}
         </if>
-        <if test="request.applyDeptName != null and request.applyDeptName !=''">
+        <if test="request != null and request.applyDeptName != null and request.applyDeptName !=''">
             and brsun.apply_dept_name like concat('%',#{request.applyDeptName},'%')
         </if>
-        <if test="request.applyUserName != null and request.applyUserName !=''">
+        <if test="request != null and request.applyUserName != null and request.applyUserName !=''">
             and brsun.apply_user_name like concat('%',#{request.applyUserName},'%')
         </if>
-        <if test="request.applyTimeStart != null and request.applyTimeStart !=''">
+        <if test="request != null and request.applyTimeStart != null and request.applyTimeStart !=''">
             and brsun.apply_time &gt;= #{request.applyTimeStart}
         </if>
-        <if test="request.applyTimeEnd != null and request.applyTimeEnd !=''">
+        <if test="request != null and request.applyTimeEnd != null and request.applyTimeEnd !=''">
             and brsun.apply_time &lt;= #{request.applyTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml
index 119bf7d..4f8392a 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml
@@ -31,6 +31,12 @@
         <if test="request.deptName != null and request.deptName !=''">
             and brsi.dept_name like concat('%',#{request.deptName},'%')
         </if>
+        <if test="request.ids != null">
+            and brsv.id in
+            <foreach collection="request.ids" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
         ORDER BY brsv.grant_date DESC
     </select>
 
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSupplierInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSupplierInfoMapper.xml
index fe8d399..e8ce7ef 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSupplierInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSupplierInfoMapper.xml
@@ -48,28 +48,28 @@
         SELECT *
         FROM biz_resource_supplier_info
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.supplierNo != null and request.supplierNo !=''">
+        <if test="request != null and request.supplierNo != null and request.supplierNo !=''">
             and supplier_no like concat('%',#{request.supplierNo},'%')
         </if>
-        <if test="request.supplierName != null and request.supplierName !=''">
+        <if test="request != null and request.supplierName != null and request.supplierName !=''">
             and supplier_name like concat('%',#{request.supplierName},'%')
         </if>
-        <if test="request.director != null and request.director !=''">
+        <if test="request != null and request.director != null and request.director !=''">
             and director like concat('%',#{request.director},'%')
         </if>
-        <if test="request.supplierType != null and request.supplierType !=''">
+        <if test="request != null and request.supplierType != null and request.supplierType !=''">
             and supplier_type = #{request.supplierType}
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/EnvLocationInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/EnvLocationInfoMapper.xml
new file mode 100644
index 0000000..68bcf10
--- /dev/null
+++ b/casic-metering-dao/src/main/resources/mapper/resource/EnvLocationInfoMapper.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.mapper.resource.EnvLocationInfoMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.resource.EnvLocationInfo">
+        <id column="id" property="id" />
+        <result column="location_no" property="locationNo" />
+        <result column="location_name" property="locationName" />
+        <result column="location_position" property="locationPosition" />
+        <result column="create_user_id" property="createUserId" />
+        <result column="create_user" property="createUser" />
+        <result column="create_time" property="createTime" />
+        <result column="update_time" property="updateTime" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, location_no, location_name, location_position, create_user_id, create_user, create_time, update_time
+    </sql>
+
+    <select id="selectLocationListPage" resultType="com.casic.missiles.dto.resource.environment.LocationListResponse">
+        SELECT *
+        FROM env_location_info
+        WHERE 1=1
+        <if test="request.locationNo != null and request.locationNo !=''">
+            AND location_no LIKE concat('%',#{request.locationNo},'%')
+        </if>
+        <if test="request.locationName != null and request.locationName !=''">
+            AND location_name LIKE concat('%',#{request.locationName},'%')
+        </if>
+        ORDER BY create_time DESC
+    </select>
+
+</mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml
index b28c18f..8854047 100644
--- a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml
@@ -11,7 +11,6 @@
         <result column="sign_desc" property="signDesc" />
         <result column="sign_director" property="signDirector" />
         <result column="sign_user_id" property="signUserId" />
-        <result column="sign_type" property="signType" />
         <result column="minio_file_name" property="minioFileName" />
         <result column="create_time" property="createTime" />
         <result column="update_time" property="updateTime" />
@@ -28,7 +27,6 @@
         <result column="sign_name" property="signName" />
         <result column="sign_desc" property="signDesc" />
         <result column="sign_director" property="signDirector" />
-        <result column="sign_type" property="signType" />
         <result column="sign_user_id" property="signUserId" />
         <result column="minio_file_name" property="minioFileName" />
         <result column="create_time" property="createTime" />
@@ -62,4 +60,58 @@
         JOIN system_sign_user_relation ssur ON ss.id = ssur.sign_id
         WHERE ssur.user_id = #{userId}
     </select>
+
+    <select id="selectSignListPage" resultMap="BaseResultMap">
+        SELECT ss.*, sd.SIMPLE_NAME AS deptName
+        FROM system_sign ss
+        LEFT JOIN sys_user su ON su.id = ss.sign_user_id
+        LEFT JOIN sys_dept sd ON sd.id = su.dept_id
+        WHERE 1=1
+        <if test="request.signNo != null and request.signNo !=''">
+            AND ss.sign_no LIKE concat('%',#{request.signNo},'%')
+        </if>
+        <if test="request.signName != null and request.signName !=''">
+            AND ss.sign_name LIKE concat('%',#{request.signName},'%')
+        </if>
+        <if test="request.signDirector != null and request.signDirector !=''">
+            AND ss.sign_director LIKE concat('%',#{request.signDirector},'%')
+        </if>
+        <if test="request.signUserId != null and request.signUserId !=''">
+            AND ss.sign_user_id = #{request.signUserId}
+        </if>
+        <if test="request.createStartTime != null and request.createStartTime !=''">
+            AND DATE_FORMAT(ss.create_time,'%Y-%m-%d') &gt;= DATE_FORMAT(#{request.createStartTime},'%Y-%m-%d')
+        </if>
+        <if test="request.createEndTime != null and request.createEndTime !=''">
+            AND DATE_FORMAT(ss.create_time,'%Y-%m-%d')  &lt;= DATE_FORMAT(#{request.createEndTime},'%Y-%m-%d')
+        </if>
+        ORDER BY ss.create_time DESC
+    </select>
+
+    <select id="selectSignList" resultMap="BaseResultMap">
+        SELECT ss.*, sd.SIMPLE_NAME AS deptName
+        FROM system_sign ss
+        LEFT JOIN sys_user su ON su.id = ss.sign_user_id
+        LEFT JOIN sys_dept sd ON sd.id = su.dept_id
+        WHERE 1=1
+        <if test="request.signNo != null and request.signNo !=''">
+            AND ss.sign_no LIKE concat('%',#{request.signNo},'%')
+        </if>
+        <if test="request.signName != null and request.signName !=''">
+            AND ss.sign_name LIKE concat('%',#{request.signName},'%')
+        </if>
+        <if test="request.signDirector != null and request.signDirector !=''">
+            AND ss.sign_director LIKE concat('%',#{request.signDirector},'%')
+        </if>
+        <if test="request.signUserId != null and request.signUserId !=''">
+            AND ss.sign_user_id = #{request.signUserId}
+        </if>
+        <if test="request.createStartTime != null and request.createStartTime !=''">
+            AND DATE_FORMAT(ss.create_time,'%Y-%m-%d') &gt;= DATE_FORMAT(#{request.createStartTime},'%Y-%m-%d')
+        </if>
+        <if test="request.createEndTime != null and request.createEndTime !=''">
+            AND DATE_FORMAT(ss.create_time,'%Y-%m-%d')  &lt;= DATE_FORMAT(#{request.createEndTime},'%Y-%m-%d')
+        </if>
+        ORDER BY ss.create_time DESC
+    </select>
 </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 515050a..60f530b 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
@@ -47,8 +47,8 @@
     String STORAGE_LOCATION = "bizStorageLocation";
     //计量专业
     String MEASURE_MAJOR = "bizMeasureMajor";
-    //管理状态
-    String MANAGER_STATE = "bizManagerState";
+    //标准装置管理状态
+    String STANDARD_MANAGER_STATE = "bizStandardManagerState";
 
     /**
      * 资源管理 字典code
@@ -95,8 +95,6 @@
     String MEASURE_STATUS = "measureStatus";
     //检定方式
     String MEASURE_TYPE = "measureType";
-    //标识打印标志类型
-    String IDENTIFY_PRINT_TYPE = "bizBusinessIdentify";
     //变更类型
     String REPORT_CHANGE_TYPE = "bizCertChangeType";
     //规模类型
@@ -111,19 +109,24 @@
     String MEASURE_CATEGORY = "measureCategory";
     //检定结果
     String MEASURE_RESULT = "measureResult";
+    //分包原因
+    String OUTSOURCE_REASON = "outsourceReason";
+
+    /**
+     * 系统管理
+     */
+    String TEMPLATE_TYPE = "templateType";
+
 
     /**
      * 标准装置 字典code
      */
     //类别
     String STANDARD_CATEGORY = "standardCategory";
-    //管理状态
-    String STANDARD_MANAGER_STATE = "standardManagerState";
     //标准等级
     String STANDARD_LEVEL = "standardLevel";
     //传递范围
     String STANDARD_TRANSMIT_RANGE = "transmitRange";
-
     //资本来源
     String CAPITAL_SOURCE = "capitalSource";
     //标准装置-申请类型
@@ -148,8 +151,6 @@
     String CERTIFICATE_CLASS = "certificationClass";
     //证书管理-检校专业
     String CALIBRATION_MAJOR = "calibrationMajor";
-    //分包原因
-    String OUTSOURCE_REASON = "outsourceReason";
 
     /**
      * 工作台
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/BaseApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/BaseApprovalListRequest.java
index 73c12c1..80d7424 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/BaseApprovalListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/BaseApprovalListRequest.java
@@ -6,6 +6,7 @@
 
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotEmpty;
+import java.util.List;
 
 /**
  * @Description:
@@ -19,14 +20,14 @@
      * 表单id
      */
     @NotBlank(message = "表单id不能为空")
-    @ApiModelProperty(value = "表单id（流程定义对应的表单id，等价于业务id）", dataType = "String")
+    @ApiModelProperty(value = "表单id（流程定义对应的表单id，等价于业务id），导出接口不用传", dataType = "String")
     private String formId;
 
     /**
      * 审批状态类型，对应ApprovalStatusEnum
      */
     @NotEmpty(message = "审批状态类型不能为空")
-    @ApiModelProperty(value = "审批状态类型code", dataType = "String")
+    @ApiModelProperty(value = "审批状态类型code，导出接口不用传", dataType = "String")
     private String approvalStatus;
 
     @ApiModelProperty(hidden = true)
@@ -34,4 +35,7 @@
 
     @ApiModelProperty(hidden = true)
     private Long createUserId;
+
+    @ApiModelProperty(value = "导出ids", dataType = "List")
+    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificatePrintApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificatePrintApprovalListRequest.java
index b93d1c9..3cc2f4e 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificatePrintApprovalListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificatePrintApprovalListRequest.java
@@ -5,8 +5,6 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import java.util.List;
-
 /**
  * @Description:
  * @Author: wangpeng
@@ -38,7 +36,4 @@
 
     @ApiModelProperty(value = "创建结束时间", dataType = "String")
     private String createTimeEnd;
-
-    @ApiModelProperty(value = "导出ids", dataType = "List")
-    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportApprovalListRequest.java
index 4f7a038..c115847 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportApprovalListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportApprovalListRequest.java
@@ -5,8 +5,6 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import java.util.List;
-
 /**
  * @Description:
  * @Author: wangpeng
@@ -15,6 +13,8 @@
 @ApiModel
 @Data
 public class CertificateReportApprovalListRequest extends BaseApprovalListRequest {
+    @ApiModelProperty(value = "委托方id", dataType = "String")
+    private Long customerId;
 
     @ApiModelProperty(value = "证书报告编号", dataType = "String")
     private String certificateReportNo;
@@ -37,6 +37,4 @@
     @ApiModelProperty(value = "检校结束时间", dataType = "String")
     private String calibrationTimeEnd;
 
-    @ApiModelProperty(value = "导出ids", dataType = "List")
-    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/identify/IdentifyListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/identify/IdentifyListRequest.java
index 1b87ae6..f019203 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/identify/IdentifyListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/identify/IdentifyListRequest.java
@@ -4,6 +4,8 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * @Description:
  * @Author: wangpeng
@@ -26,4 +28,7 @@
 
     @ApiModelProperty(value = "打印结束时间", dataType = "String")
     private String createTimeEnd;
+
+    @ApiModelProperty(value = "导出ids", dataType = "List")
+    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListRequest.java
index 1264883..62415fb 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListRequest.java
@@ -7,6 +7,7 @@
 import lombok.Data;
 
 import javax.validation.constraints.NotBlank;
+import java.util.List;
 
 @Data
 @ApiModel
@@ -37,4 +38,6 @@
     @ApiModelProperty(value = "是否加急（1是0否null全部）", dataType = "Integer")
     private String isUrgent;
 
+    @ApiModelProperty(value = "导出ids", dataType = "List")
+    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListRequest.java
index 5201d7b..499760a 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListRequest.java
@@ -17,6 +17,9 @@
     @ApiModelProperty(value = "任务单编号", dataType = "String")
     private String orderNo;
 
+    @ApiModelProperty(value = "委托方id", dataType = "Long")
+    private Long customerId;
+
     @ApiModelProperty(value = "委托方名称", dataType = "String")
     private String customerName;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OrderSampleDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OrderSampleDTO.java
new file mode 100644
index 0000000..796edc0
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OrderSampleDTO.java
@@ -0,0 +1,19 @@
+package com.casic.missiles.dto.business.outsource;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/8/24 11:38
+ */
+@ApiModel
+@Data
+public class OrderSampleDTO {
+    @ApiModelProperty(value = "任务单id", dataType = "Long")
+    private Long orderId;
+    @ApiModelProperty(value = "受检设备id", dataType = "Long")
+    private Long sampleId;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceAssessApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceAssessApprovalListRequest.java
new file mode 100644
index 0000000..9a930c3
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceAssessApprovalListRequest.java
@@ -0,0 +1,30 @@
+package com.casic.missiles.dto.business.outsource;
+
+import com.casic.missiles.dto.BaseApprovalListRequest;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/8/24 11:01
+ */
+@ApiModel
+@Data
+public class OutsourceAssessApprovalListRequest extends BaseApprovalListRequest {
+    @ApiModelProperty(value = "评审表编号", dataType = "String")
+    private String projectNo;
+
+    @ApiModelProperty(value = "分包机构名称", dataType = "String")
+    private String outsourcerName;
+
+    @ApiModelProperty(value = "申请人", dataType = "String")
+    private String applicantName;
+
+    @ApiModelProperty(value = "申请时间开始", dataType = "String")
+    private String applicantTimeStart;
+
+    @ApiModelProperty(value = "申请时间结束", dataType = "String")
+    private String applicantTimeEnd;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceAssessSaveResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceAssessSaveResponse.java
new file mode 100644
index 0000000..8bf9aad
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceAssessSaveResponse.java
@@ -0,0 +1,20 @@
+package com.casic.missiles.dto.business.outsource;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/8/14 16:17
+ */
+@ApiModel
+@Data
+public class OutsourceAssessSaveResponse {
+    @ApiModelProperty(value = "主键id", dataType = "Long")
+    private Long id;
+
+    @ApiModelProperty(value = "编号", dataType = "String")
+    private String projectNo;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProtocolApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProtocolApprovalListRequest.java
new file mode 100644
index 0000000..0f32331
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProtocolApprovalListRequest.java
@@ -0,0 +1,30 @@
+package com.casic.missiles.dto.business.outsource;
+
+import com.casic.missiles.dto.BaseApprovalListRequest;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/8/24 15:01
+ */
+@ApiModel
+@Data
+public class OutsourceProtocolApprovalListRequest extends BaseApprovalListRequest {
+    @ApiModelProperty(value = "协议书编号", dataType = "String")
+    private String protocolNo;
+
+    @ApiModelProperty(value = "分包方名称", dataType = "String")
+    private String outsourcerName;
+
+    @ApiModelProperty(value = "申请人", dataType = "String")
+    private String applicantName;
+
+    @ApiModelProperty(value = "申请时间开始", dataType = "String")
+    private String applicantTimeStart;
+
+    @ApiModelProperty(value = "申请时间结束", dataType = "String")
+    private String applicantTimeEnd;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProtocolSaveResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProtocolSaveResponse.java
new file mode 100644
index 0000000..e324967
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProtocolSaveResponse.java
@@ -0,0 +1,20 @@
+package com.casic.missiles.dto.business.outsource;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/8/14 16:17
+ */
+@ApiModel
+@Data
+public class OutsourceProtocolSaveResponse {
+    @ApiModelProperty(value = "主键id", dataType = "Long")
+    private Long id;
+
+    @ApiModelProperty(value = "编号", dataType = "String")
+    private String protocolNo;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveApprovalListRequest.java
index f29f4e4..7047c28 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveApprovalListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveApprovalListRequest.java
@@ -5,8 +5,6 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import java.util.List;
-
 /**
  * @Description: 现场检测审批列表请求实体
  * @Author: wangpeng
@@ -30,7 +28,4 @@
     @ApiModelProperty(value = "申请时间结束", dataType = "String")
     private String applyTimeEnd;
 
-    @ApiModelProperty(value = "导出ids", dataType = "List")
-    private List<Long> ids;
-
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveDetailResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveDetailResponse.java
index 1f28752..394c934 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveDetailResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveDetailResponse.java
@@ -12,6 +12,18 @@
     @ApiModelProperty(value = "id，更新/删除使用参数", dataType = "Long")
     private Long id;
 
+    @ApiModelProperty(value = "实验室代码(字典code)", dataType = "String")
+    private String labCode;
+
+    @ApiModelProperty(value = "实验室代码(字典value)", dataType = "String")
+    private String labCodeName;
+
+    @ApiModelProperty(value = "组别代码(字典code)", dataType = "String")
+    private String groupCode;
+
+    @ApiModelProperty(value = "组别代码(字典value)", dataType = "String")
+    private String groupCodeName;
+
     @ApiModelProperty(value = "审批编号", dataType = "String")
     private String siteExecutiveNo;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/environment/LocationListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/environment/LocationListRequest.java
new file mode 100644
index 0000000..13d03c3
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/environment/LocationListRequest.java
@@ -0,0 +1,20 @@
+package com.casic.missiles.dto.resource.environment;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/6/8 13:56
+ */
+@ApiModel
+@Data
+public class LocationListRequest {
+    @ApiModelProperty(value = "地点编号", dataType = "String")
+    private String locationNo;
+
+    @ApiModelProperty(value = "地点名称", dataType = "String")
+    private String locationName;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/environment/LocationListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/environment/LocationListResponse.java
new file mode 100644
index 0000000..4c531af
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/environment/LocationListResponse.java
@@ -0,0 +1,78 @@
+package com.casic.missiles.dto.resource.environment;
+
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
+import com.baomidou.mybatisplus.annotation.TableField;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description: 地点列表响应实体
+ * @Author: wangpeng
+ * @Date: 2023/6/8 13:53
+ */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
+@ApiModel
+@Data
+public class LocationListResponse {
+    @ApiModelProperty(value = "主键id", dataType = "Long")
+    private Long id;
+
+    /**
+     * 地点编号
+     */
+    @ExcelProperty("地点编号")
+    @ApiModelProperty(value = "地点编号", dataType = "String")
+    private String locationNo;
+
+    /**
+     * 地点名称
+     */
+    @ExcelProperty("地点名称")
+    @ApiModelProperty(value = "地点名称", dataType = "String")
+    private String locationName;
+
+    /**
+     * 地点位置
+     */
+    @ExcelProperty("地点位置")
+    @ApiModelProperty(value = "地点位置", dataType = "String")
+    private String locationPosition;
+
+    /**
+     * 创建人id
+     */
+    @ApiModelProperty(value = "创建人id", dataType = "Long")
+    private Long createUserId;
+
+    /**
+     * 创建人
+     */
+    @ExcelProperty("创建人")
+    @ApiModelProperty(value = "创建人", dataType = "String")
+    @TableField("create_user")
+    private String createUser;
+
+    /**
+     * 创建时间
+     */
+    @ExcelProperty("创建时间")
+    @ApiModelProperty(value = "创建时间", dataType = "String")
+    private String createTime;
+
+    /**
+     * 更新时间
+     */
+    @ApiModelProperty(value = "更新时间", dataType = "String")
+    private String updateTime;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertRequest.java
index 9a7f6c6..c827915 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertRequest.java
@@ -4,6 +4,8 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * @Description:
  * @Author: wangpeng
@@ -16,4 +18,7 @@
     private String name;
     @ApiModelProperty(value = "部门名", dataType = "String")
     private String deptName;
+
+    @ApiModelProperty(value = "导出ids", dataType = "List")
+    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertResponse.java
index f78b159..8f2f79e 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertResponse.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.dto.resource.staff;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.casic.missiles.annotation.DictCodeField;
 import com.casic.missiles.constants.MeterDictCode;
 import io.swagger.annotations.ApiModel;
@@ -13,12 +20,18 @@
  * @Author: wangpeng
  * @Date: 2023/7/27 15:13
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @ApiModel
 @Data
 public class StaffCertResponse {
     /**
      * 人员编号
      */
+    @ExcelProperty(value = "人员编号",order = 0)
     @NotEmpty(message = "人员编号不能为空")
     @ApiModelProperty(value = "人员编号", dataType = "String")
     private String staffNo;
@@ -26,6 +39,7 @@
     /**
      * 姓名
      */
+    @ExcelProperty(value = "姓名",order = 1)
     @ApiModelProperty(value = "姓名", dataType = "String")
     private String staffName;
 
@@ -54,6 +68,7 @@
     /**
      * 部门名字
      */
+    @ExcelProperty(value = "工作部门",order = 2)
     @ApiModelProperty(value = "部门名字", dataType = "String")
     private String deptName;
 
@@ -66,6 +81,7 @@
     /**
      * 计量专业
      */
+    @ExcelProperty(value = "计量专业",order = 3)
     @ApiModelProperty(value = "计量专业", dataType = "String")
     private String major;
 
@@ -110,6 +126,7 @@
     /**
      * 证书号
      */
+    @ExcelProperty(value = "证号",order = 4)
     @ApiModelProperty(value = "证书号", dataType = "String")
     private String certNo;
 
@@ -122,12 +139,14 @@
     /**
      * 有效日期
      */
+    @ExcelProperty(value = "证书有效期",order = 6)
     @ApiModelProperty(value = "有效日期", dataType = "String")
     private String effectiveDate;
 
     /**
      * 发放日期
      */
+    @ExcelProperty(value = "发证日期",order = 5)
     @ApiModelProperty(value = "发放日期", dataType = "String")
     private String grantDate;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffListRequest.java
index 7c4afb3..0a1194a 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffListRequest.java
@@ -4,6 +4,8 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * @Description:
  * @Author: wangpeng
@@ -18,4 +20,7 @@
     private String deptName;
     @ApiModelProperty(value = "部门id", dataType = "Long")
     private Long deptId;
+
+    @ApiModelProperty(value = "导出ids", dataType = "List")
+    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/TrainListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/TrainListRequest.java
index f68597b..6321f8b 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/TrainListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/TrainListRequest.java
@@ -14,6 +14,8 @@
 public class TrainListRequest {
     @ApiModelProperty(value = "训练登记表编号", dataType = "String")
     private String trainNo;
+    @ApiModelProperty(value = "值班领导", dataType = "String")
+    private String dutyLeader;
     @ApiModelProperty(value = "创建开始时间", dataType = "String")
     private String createTimeStart;
     @ApiModelProperty(value = "创建结束时间", dataType = "String")
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/SignAddRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/SignAddRequest.java
index 117be34..d71055c 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/SignAddRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/SignAddRequest.java
@@ -43,13 +43,6 @@
     private Long signUserId;
 
     /**
-     * 签章或签名-字典code
-     */
-    @NotBlank(message = "类型不能为空")
-    @ApiModelProperty(value = "签名/签章-字典code", dataType = "String", required = true)
-    private String signType;
-
-    /**
      * minio存储文件名
      */
     @ApiModelProperty(value = "上传文件返回名称", dataType = "String")
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateAddRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateAddRequest.java
index aff1265..6316648 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateAddRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateAddRequest.java
@@ -17,30 +17,28 @@
 @Data
 public class TemplateAddRequest extends BaseSystemRequest {
     /**
-     * 原始记录模板/证书报告模板名称
+     * 模板名称
      */
     @ApiModelProperty(value = "名称", dataType = "String", required = true)
     @NotBlank(message = "名称不能为空")
     private String templateName;
 
     /**
-     * 原始记录模板/证书报告模板描述
+     * 模板描述
      */
     @ApiModelProperty(value = "描述", dataType = "String")
     private String templateDesc;
 
     /**
-     * 原始记录模板/证书报告模板创建人
+     * 创建人
      */
     @ApiModelProperty(value = "创建人", dataType = "String", required = true)
     @NotBlank(message = "创建人不能为空")
     private String templateCreator;
 
-    /**
-     * 原始记录模板/证书报告模板-字典code
-     */
-    @NotBlank(message = "类型不能为空")
-    @ApiModelProperty(value = "原始记录模板/证书报告模板-字典code", dataType = "String", required = true)
+
+    @NotBlank(message = "模板类型不能为空")
+    @ApiModelProperty(value = "模板类型(字典code)", dataType = "String", required = true)
     private String templateType;
 
     /**
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateListRequest.java
index eec5a1e..6d17bbe 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateListRequest.java
@@ -1,11 +1,12 @@
 package com.casic.missiles.dto.system;
 
+import com.casic.missiles.annotation.DictCodeField;
+import com.casic.missiles.constants.MeterDictCode;
 import com.casic.missiles.dto.BaseSystemRequest;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import javax.validation.constraints.NotBlank;
 import java.util.List;
 
 /**
@@ -19,8 +20,8 @@
     /**
      * 类型
      */
-//    @ApiModelProperty(value = "类型-字典code", dataType = "String", required = true)
-    @NotBlank(message = "类型不能为空")
+    @DictCodeField(message = "模板类型不合法", cacheName = MeterDictCode.TEMPLATE_TYPE)
+    @ApiModelProperty(value = "模板类型(字典code)", dataType = "String")
     private String templateType;
 
     /**
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificateChangeApply.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificateChangeApply.java
index 9216308..36923fd 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificateChangeApply.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificateChangeApply.java
@@ -1,11 +1,19 @@
 package com.casic.missiles.model.business;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 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 com.casic.missiles.dto.BaseRequest;
+import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -20,6 +28,12 @@
  * @author wangpeng
  * @since 2023-08-15
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
+@ApiModel
 @Data
 @TableName("biz_business_certificate_change_apply")
 public class BizBusinessCertificateChangeApply extends BaseRequest implements Serializable {
@@ -33,6 +47,7 @@
     /**
      * 申请单编号
      */
+    @ExcelProperty(value = "申请单编号", order = 1)
     @ApiModelProperty(value = "申请单编号", dataType = "String")
     @TableField("change_apply_no")
     private String changeApplyNo;
@@ -40,6 +55,7 @@
     /**
      * 申请单名字
      */
+    @ExcelProperty(value = "申请单名称", order = 2)
     @ApiModelProperty(value = "申请单名字", dataType = "String")
     @TableField("change_apply_name")
     private String changeApplyName;
@@ -54,6 +70,7 @@
     /**
      * 更换证书编号
      */
+    @ExcelProperty(value = "更换证书编号", order = 3)
     @ApiModelProperty(value = "更换证书编号", dataType = "String")
     @TableField("change_report_no")
     private String changeReportNo;
@@ -61,7 +78,8 @@
     /**
      * 更换证书名字
      */
-    @ApiModelProperty(value = "更换证书名字", dataType = "String")
+    @ExcelProperty(value = "更换证书/报告名称", order = 4)
+    @ApiModelProperty(value = "更换证书/报告名称", dataType = "String")
     @TableField("change_report_name")
     private String changeReportName;
 
@@ -73,6 +91,7 @@
     @TableField("change_type")
     private String changeType;
 
+    @ExcelProperty(value = "变更类型", order = 5)
     @ApiModelProperty(value = "变更类型(字典value)", dataType = "String")
     @TableField(exist = false)
     private String changeTypeName;
@@ -142,13 +161,15 @@
     /**
      * 创建用户名字
      */
-    @ApiModelProperty(value = "创建用户名字", dataType = "String")
+    @ExcelProperty(value = "创建人", order = 6)
+    @ApiModelProperty(value = "创建人名字", dataType = "String")
     @TableField("create_user_name")
     private String createUserName;
 
     /**
      * 创建时间
      */
+    @ExcelProperty(value = "创建时间", order = 7)
     @ApiModelProperty(value = "创建时间", dataType = "String")
     @TableField("create_time")
     private String createTime;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificateReport.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificateReport.java
index f01db9e..db06018 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificateReport.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificateReport.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.model.business;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -22,6 +29,11 @@
  * @author wangpeng
  * @since 2023-08-14
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @ApiModel
 @Data
 @TableName("biz_business_certificate_report")
@@ -36,6 +48,7 @@
     /**
      * 证书报告编号
      */
+    @ExcelProperty(value = "证书报告编号", order = 1)
     @ApiModelProperty(value = "证书报告编号", dataType = "String")
     @TableField("certificate_report_no")
     private String certificateReportNo;
@@ -43,6 +56,7 @@
     /**
      * 证书报告名称
      */
+    @ExcelProperty(value = "证书报告名称", order = 2)
     @ApiModelProperty(value = "证书报告名称", dataType = "String")
     @TableField("certificate_report_name")
     private String certificateReportName;
@@ -62,6 +76,7 @@
     @TableField("measure_category")
     private String measureCategory;
 
+    @ExcelProperty(value = "检校类别", order = 6)
     @ApiModelProperty(value = "检校类别(字典value)", dataType = "String")
     @TableField(exist = false)
     private String measureCategoryName;
@@ -69,6 +84,7 @@
     /**
      * 检校时间
      */
+    @ExcelProperty(value = "检校时间", order = 8)
     @ApiModelProperty(value = "检校时间", dataType = "String")
     @TableField("calibration_time")
     private String calibrationTime;
@@ -267,18 +283,22 @@
     @TableField(exist = false)
     private Integer decisionItem;
 
-    @ApiModelProperty(value = "设备样品编号（列表返回参数）", dataType = "String")
+    @ExcelProperty(value = "被检设备统一编号", order = 3)
+    @ApiModelProperty(value = "被检设备统一编号（列表返回参数）", dataType = "String")
     @TableField(exist = false)
     private String sampleNo;
 
-    @ApiModelProperty(value = "设备样品名称（列表返回参数）", dataType = "String")
+    @ExcelProperty(value = "被检设备名称", order = 4)
+    @ApiModelProperty(value = "被检设备名称（列表返回参数）", dataType = "String")
     @TableField(exist = false)
     private String sampleName;
 
-    @ApiModelProperty(value = "设备样品规格型号（列表返回参数）", dataType = "String")
+    @ExcelProperty(value = "规格型号", order = 5)
+    @ApiModelProperty(value = "规格型号（列表返回参数）", dataType = "String")
     @TableField(exist = false)
     private String sampleModel;
 
+    @ExcelProperty(value = "检定员", order = 7)
     @ApiModelProperty(value = "检定员名字（列表返回参数）", dataType = "String")
     @TableField(exist = false)
     private String staffName;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessIdentifyInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessIdentifyInfo.java
index 46bfba5..f1a9bec 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessIdentifyInfo.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessIdentifyInfo.java
@@ -1,10 +1,15 @@
 package com.casic.missiles.model.business;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 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;
 
@@ -20,6 +25,11 @@
  * @author wangpeng
  * @since 2023-08-15
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @Data
 @TableName("biz_business_identify_info")
 public class BizBusinessIdentifyInfo implements Serializable {
@@ -33,6 +43,7 @@
     /**
      * 记录编号
      */
+    @ExcelProperty(value = "记录编号", order = 1)
     @ApiModelProperty(value = "记录编号", dataType = "String")
     @TableField("record_no")
     private String recordNo;
@@ -41,20 +52,15 @@
      * 标志类型(字典code)
      */
     @NotEmpty(message = "标志类型不能为空")
-    @ApiModelProperty(value = "标志类型(字典code)", dataType = "String")
-    @DictCodeField(message = "标志类型不合法", cacheName = MeterDictCode.IDENTIFY_PRINT_TYPE)
+    @ApiModelProperty(value = "标志类型(直接存计量标识/使用状态/校准状态的字典value)", dataType = "String")
     @TableField("identify_type")
     private String identifyType;
 
-    @ApiModelProperty(value = "标志类型(字典value)", dataType = "String")
-    @TableField(exist = false)
-    private String identifyTypeName;
-
     /**
      * 设备id(可以是受检设备/设备台账)
      */
     @NotNull(message = "设备id不能为空")
-    @ApiModelProperty(value = "设备id(可以是受检设备/设备台账)", dataType = "String")
+    @ApiModelProperty(value = "设备id(可以是受检设备/设备台账)", dataType = "Long")
     @TableField("device_id")
     private Long deviceId;
 
@@ -66,29 +72,32 @@
     @TableField("device_type")
     private String deviceType;
 
+    @ExcelProperty(value = "统一编号", order = 3)
     @NotEmpty(message = "设备编号不能为空")
-    @ApiModelProperty(value = "设备编号", dataType = "String")
+    @ApiModelProperty(value = "统一编号", dataType = "String")
     @TableField("device_no")
     private String deviceNo;
 
     /**
      * 设备名字
      */
-    @NotEmpty(message = "设备名字不能为空")
-    @ApiModelProperty(value = "设备名字", dataType = "String")
+    @ExcelProperty(value = "设备名称", order = 4)
+    @NotEmpty(message = "设备名称不能为空")
+    @ApiModelProperty(value = "设备名称", dataType = "String")
     @TableField("device_name")
     private String deviceName;
 
     /**
      * 检定员id
      */
-    @ApiModelProperty(value = "检定员id", dataType = "String")
+    @ApiModelProperty(value = "检定员id", dataType = "Long")
     @TableField("measure_person_id")
     private Long measurePersonId;
 
     /**
      * 检定员名字
      */
+    @ExcelProperty(value = "检定员", order = 5)
     @ApiModelProperty(value = "检定员名字", dataType = "String")
     @TableField("measure_person")
     private String measurePerson;
@@ -103,7 +112,8 @@
     /**
      * 更新时间
      */
-    @ApiModelProperty(value = "更新时间", dataType = "String")
+    @ExcelProperty(value = "打印时间", order = 6)
+    @ApiModelProperty(value = "打印时间", dataType = "String")
     @TableField("update_time")
     private String updateTime;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceAssess.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceAssess.java
index 659d9ca..6720b90 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceAssess.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceAssess.java
@@ -1,11 +1,26 @@
 package com.casic.missiles.model.business;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 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 com.casic.missiles.dto.BaseRequest;
+import com.casic.missiles.dto.business.outsource.OrderSampleDTO;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import javax.validation.constraints.NotEmpty;
 import java.io.Serializable;
+import java.util.List;
 
 /**
  * <p>
@@ -15,146 +30,231 @@
  * @author wangpeng
  * @since 2023-08-16
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
+@ApiModel
 @Data
 @TableName("biz_business_outsource_assess")
-public class BizBusinessOutsourceAssess implements Serializable {
+public class BizBusinessOutsourceAssess extends BaseRequest implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
+    @ApiModelProperty(value = "id，更新/删除使用参数", dataType = "Long")
     @TableId("id")
     private Long id;
 
     /**
      * 评审表编号
      */
+    @ExcelProperty(value = "评审表编号", order = 1)
+    @ApiModelProperty(value = "评审表编号(后台生成)", dataType = "String")
     @TableField("project_no")
     private String projectNo;
 
     /**
      * 评审表名称
      */
+    @ExcelProperty(value = "评审表名称", order = 2)
+    @ApiModelProperty(value = "评审表名称", dataType = "String")
     @TableField("project_name")
     private String projectName;
 
+    @NotEmpty(message = "实验室代码不能为空")
+    @DictCodeField(message = "实验室代码描述不合法", cacheName = MeterDictCode.LAB_CODE)
+    @ApiModelProperty(value = "实验室代码(字典code)", dataType = "String")
+    @TableField("lab_code")
+    private String labCode;
+
+    @ApiModelProperty(value = "实验室代码(字典value)", dataType = "String")
+    @TableField(exist = false)
+    private String labCodeName;
+
+    /**
+     * 组别代码
+     */
+    @NotEmpty(message = "组别代码不能为空")
+    @DictCodeField(message = "组别代码描述不合法", cacheName = MeterDictCode.GROUP_CODE)
+    @ApiModelProperty(value = "组别代码(字典code)", dataType = "String")
+    @TableField("group_code")
+    private String groupCode;
+
+    @ApiModelProperty(value = "组别代码(字典value)", dataType = "String")
+    @TableField(exist = false)
+    private String groupCodeName;
+
     /**
      * 申请人id
      */
+    @ApiModelProperty(value = "申请人id", dataType = "String")
     @TableField("applicant_id")
     private Long applicantId;
 
     /**
      * 申请人名字
      */
+    @ExcelProperty(value = "申请人", order = 5)
+    @ApiModelProperty(value = "申请人", dataType = "String")
     @TableField("applicant_name")
     private String applicantName;
 
     /**
      * 申请时间
      */
+    @ExcelProperty(value = "申请时间", order = 6)
+    @ApiModelProperty(value = "申请时间", dataType = "String")
     @TableField("applicant_time")
     private String applicantTime;
 
     /**
      * 附件(minio存储文件名)
      */
+    @ApiModelProperty(value = "附件(minio存储文件名)", dataType = "String")
     @TableField("minio_file_name")
     private String minioFileName;
 
     /**
      * 备注
      */
+    @ApiModelProperty(value = "备注", dataType = "String")
     @TableField("remark")
     private String remark;
 
     /**
      * 创建人id
      */
+    @ApiModelProperty(value = "创建人id", dataType = "String")
     @TableField("create_user_id")
     private Long createUserId;
 
     /**
      * 创建人名字
      */
+    @ApiModelProperty(value = "创建人名字", dataType = "String")
     @TableField("create_user_name")
     private String createUserName;
 
     /**
      * 分包方id
      */
+    @ApiModelProperty(value = "评审表编号", dataType = "String")
     @TableField("outsourcer_id")
     private Long outsourcerId;
 
     /**
      * 预计开始时间
      */
+    @ApiModelProperty(value = "预计开始时间", dataType = "String")
     @TableField("pre_start_time")
     private String preStartTime;
 
     /**
      * 预计结束时间
      */
+    @ApiModelProperty(value = "预计结束时间", dataType = "String")
     @TableField("pre_end_time")
     private String preEndTime;
 
     /**
      * 分包原因-字典
      */
+    @ApiModelProperty(value = "分包原因(字典code)", dataType = "String")
+    @DictCodeField(message = "分包原因描述不合法", cacheName = MeterDictCode.OUTSOURCE_REASON)
     @TableField("outsource_reason")
     private String outsourceReason;
 
+    @ApiModelProperty(value = "分包原因(字典value)", dataType = "String")
+    @TableField(exist = false)
+    private String outsourceReasonName;
+
     /**
      * 预计费用
      */
+    @ApiModelProperty(value = "预计费用", dataType = "String")
     @TableField("pre_cost")
     private String preCost;
 
     /**
      * 审批状态
      */
+    @ApiModelProperty(value = "审批状态", dataType = "String")
+    @DictCodeField(message = "审批状态描述不合法", cacheName = MeterDictCode.APPROVAL_STATUS)
     @TableField("approval_status")
     private String approvalStatus;
 
     /**
      * 流程实例id
      */
+    @ApiModelProperty(value = "流程实例id", dataType = "String")
     @TableField("process_id")
     private String processId;
 
     /**
      * 实验室认可情况
      */
+    @ApiModelProperty(value = "实验室认可情况", dataType = "String")
     @TableField("approve_situation")
     private String approveSituation;
 
     /**
      * 溯源性
      */
+    @ApiModelProperty(value = "溯源性", dataType = "String")
     @TableField("traceability")
     private String traceability;
 
     /**
      * 测试方法
      */
+    @ApiModelProperty(value = "测试方法", dataType = "String")
     @TableField("test_method")
     private String testMethod;
 
     /**
      * 技术能力
      */
+    @ApiModelProperty(value = "技术能力", dataType = "String")
     @TableField("technique_ability")
     private String techniqueAbility;
 
     /**
      * 创建时间
      */
+    @ApiModelProperty(hidden = true)
     @TableField("create_time")
     private String createTime;
 
     /**
      * 更新时间
      */
+    @ApiModelProperty(hidden = true)
     @TableField("update_time")
     private String updateTime;
 
+    @ApiModelProperty(value = "审批状态类型-字典value", dataType = "String")
+    @TableField(exist = false)
+    private String approvalStatusName;
 
+    @ApiModelProperty(value = "任务id（同意、驳回等操作使用）", dataType = "String")
+    @TableField(exist = false)
+    private String taskId;
+
+    @ApiModelProperty(value = "可选决策项（1同意驳回拒绝 2同意驳回 3同意拒绝，用于待审批列表同意/驳回/拒绝按钮展示）", dataType = "Integer")
+    @TableField(exist = false)
+    private Integer decisionItem;
+
+    @NotEmpty(message = "受检设备信息不能为空")
+    @ApiModelProperty(value = "受检设备id列表（新建使用参数）", dataType = "List")
+    @TableField(exist = false)
+    private List<OrderSampleDTO> orderSampleList;
+
+    @ExcelProperty(value = "分包机构名称", order = 3)
+    @ApiModelProperty(value = "分包机构名称（列表返回参数）", dataType = "String")
+    private String outsourcerName;
+
+    @ExcelProperty(value = "机构负责人", order = 4)
+    @ApiModelProperty(value = "机构负责人（列表返回参数）", dataType = "String")
+    private String director;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceProtocol.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceProtocol.java
new file mode 100644
index 0000000..38df697
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceProtocol.java
@@ -0,0 +1,225 @@
+package com.casic.missiles.model.business;
+
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
+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 com.casic.missiles.dto.BaseRequest;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotEmpty;
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 计量检定业务-分包管理-测试、校准或检定工作分包协议书
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-08-24
+ */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
+@Data
+@TableName("biz_business_outsource_protocol")
+public class BizBusinessOutsourceProtocol extends BaseRequest implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "id，更新/删除使用参数", dataType = "Long")
+    @TableId("id")
+    private Long id;
+
+    /**
+     * 协议书编号
+     */
+    @ExcelProperty(value = "协议书编号", order = 1)
+    @ApiModelProperty(value = "协议书编号(后台生成)", dataType = "String")
+    @TableField("protocol_no")
+    private String protocolNo;
+
+    /**
+     * 协议书名称
+     */
+    @ExcelProperty(value = "协议书名称", order = 2)
+    @ApiModelProperty(value = "协议书名称", dataType = "String")
+    @TableField("project_name")
+    private String projectName;
+
+    @NotEmpty(message = "实验室代码不能为空")
+    @DictCodeField(message = "实验室代码描述不合法", cacheName = MeterDictCode.LAB_CODE)
+    @ApiModelProperty(value = "实验室代码(字典code)", dataType = "String")
+    @TableField("lab_code")
+    private String labCode;
+
+    @ApiModelProperty(value = "实验室代码(字典value)", dataType = "String")
+    @TableField(exist = false)
+    private String labCodeName;
+
+    @NotEmpty(message = "组别代码不能为空")
+    @DictCodeField(message = "组别代码描述不合法", cacheName = MeterDictCode.GROUP_CODE)
+    @ApiModelProperty(value = "组别代码(字典code)", dataType = "String")
+    @TableField("group_code")
+    private String groupCode;
+
+    @ApiModelProperty(value = "组别代码(字典value)", dataType = "String")
+    @TableField(exist = false)
+    private String groupCodeName;
+
+    /**
+     * 分包方id
+     */
+    @ApiModelProperty(value = "分包方id", dataType = "Long")
+    @TableField("outsourcer_id")
+    private Long outsourcerId;
+
+    /**
+     * 其他
+     */
+    @ApiModelProperty(value = "其他", dataType = "String")
+    @TableField("remark")
+    private String remark;
+
+    /**
+     * 分包方编号
+     */
+    @ApiModelProperty(value = "分包方编号(新建不用传)", dataType = "String")
+    @TableField("outsource_no")
+    private String outsourceNo;
+
+    /**
+     * 分包方名称
+     */
+    @ExcelProperty(value = "分包方名称", order = 3)
+    @ApiModelProperty(value = "分包方名称(新建不用传)", dataType = "String")
+    @TableField("outsource_name")
+    private String outsourceName;
+
+    /**
+     * 联系人
+     */
+    @ExcelProperty(value = "联系人", order = 4)
+    @ApiModelProperty(value = "联系人", dataType = "String")
+    @TableField("contacts")
+    private String contacts;
+
+    /**
+     * 电话
+     */
+    @ApiModelProperty(value = "电话", dataType = "String")
+    @TableField("mobile")
+    private String mobile;
+
+    /**
+     * 地址
+     */
+    @ApiModelProperty(value = "地址", dataType = "String")
+    @TableField("address")
+    private String address;
+
+    /**
+     * 要求完成日期
+     */
+    @ApiModelProperty(value = "要求完成日期", dataType = "String")
+    @TableField("require_date")
+    private String requireDate;
+
+    /**
+     * 分包费用(元)
+     */
+    @ApiModelProperty(value = "分包费用(元)", dataType = "String")
+    @TableField("outsource_cost")
+    private Double outsourceCost;
+
+    /**
+     * 分包方负责人
+     */
+    @ApiModelProperty(value = "分包方负责人", dataType = "String")
+    @TableField("director")
+    private String director;
+
+    /**
+     * 分包项目
+     */
+    @ApiModelProperty(value = "分包项目", dataType = "String")
+    @TableField("item")
+    private String item;
+
+    /**
+     * 分包要求
+     */
+    @ApiModelProperty(value = "分包要求", dataType = "String")
+    @TableField("requires")
+    private String requires;
+
+    /**
+     * 创建人id
+     */
+    @ApiModelProperty(hidden = true)
+    @TableField("create_user_id")
+    private Long createUserId;
+
+    /**
+     * 创建人名字
+     */
+    @ExcelProperty(value = "申请人", order = 5)
+    @ApiModelProperty(value = "申请人", dataType = "String")
+    @TableField("create_user_name")
+    private String createUserName;
+
+    /**
+     * 审批状态
+     */
+    @ApiModelProperty(value = "审批状态", dataType = "String")
+    @DictCodeField(message = "审批状态描述不合法", cacheName = MeterDictCode.APPROVAL_STATUS)
+    @TableField("approval_status")
+    private String approvalStatus;
+
+    /**
+     * 流程实例id
+     */
+    @ApiModelProperty(value = "流程实例id", dataType = "String")
+    @TableField("process_id")
+    private String processId;
+
+    /**
+     * 创建时间
+     */
+    @ExcelProperty(value = "申请时间", order = 6)
+    @ApiModelProperty(value = "申请时间", dataType = "String")
+    @TableField("create_time")
+    private String createTime;
+
+    /**
+     * 更新时间
+     */
+    @ApiModelProperty(hidden = true)
+    @TableField("update_time")
+    private String updateTime;
+
+    @ApiModelProperty(value = "审批状态类型-字典value", dataType = "String")
+    @TableField(exist = false)
+    private String approvalStatusName;
+
+    @ApiModelProperty(value = "任务id（同意、驳回等操作使用）", dataType = "String")
+    @TableField(exist = false)
+    private String taskId;
+
+    @ApiModelProperty(value = "可选决策项（1同意驳回拒绝 2同意驳回 3同意拒绝，用于待审批列表同意/驳回/拒绝按钮展示）", dataType = "Integer")
+    @TableField(exist = false)
+    private Integer decisionItem;
+
+
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourcerInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourcerInfo.java
index ec4e997..f9aa69e 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourcerInfo.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourcerInfo.java
@@ -17,6 +17,7 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import javax.validation.constraints.NotEmpty;
 import java.io.Serializable;
 
 /**
@@ -59,6 +60,29 @@
     @TableField("outsourcer_name")
     private String outsourcerName;
 
+    @NotEmpty(message = "实验室代码不能为空")
+    @DictCodeField(message = "实验室代码描述不合法", cacheName = MeterDictCode.LAB_CODE)
+    @ApiModelProperty(value = "实验室代码(字典code)", dataType = "String")
+    @TableField("lab_code")
+    private String labCode;
+
+    @ApiModelProperty(value = "实验室代码(字典value)", dataType = "String")
+    @TableField(exist = false)
+    private String labCodeName;
+
+    /**
+     * 组别代码
+     */
+    @NotEmpty(message = "组别代码不能为空")
+    @DictCodeField(message = "组别代码描述不合法", cacheName = MeterDictCode.GROUP_CODE)
+    @ApiModelProperty(value = "组别代码(字典code)", dataType = "String")
+    @TableField("group_code")
+    private String groupCode;
+
+    @ApiModelProperty(value = "组别代码(字典value)", dataType = "String")
+    @TableField(exist = false)
+    private String groupCodeName;
+
     /**
      * 单位简称
      */
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardInfo.java
index c48eed7..dffdfdd 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardInfo.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardInfo.java
@@ -5,6 +5,7 @@
 import com.baomidou.mybatisplus.annotation.TableName;
 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;
 
@@ -18,6 +19,7 @@
  * @author wangpeng
  * @since 2023-08-04
  */
+@ApiModel
 @Data
 @TableName("biz_equipment_standard_info")
 public class BizEquipmentStandardInfo implements Serializable {
@@ -119,7 +121,7 @@
      * 管理状态(字典code)
      */
     @ApiModelProperty(value = "管理状态(字典code)", dataType = "String")
-    @DictCodeField(message = "管理状态不合法", cacheName = MeterDictCode.MANAGER_STATE)
+    @DictCodeField(message = "管理状态不合法", cacheName = MeterDictCode.STANDARD_MANAGER_STATE)
     @TableField("manage_status")
     private String manageStatus;
 
@@ -151,7 +153,7 @@
     /**
      * 温度(℃)
      */
-    @ApiModelProperty(value = "使用状态(字典code)", dataType = "String")
+    @ApiModelProperty(value = "温度(℃)", dataType = "String")
     @TableField("temperature")
     private Double temperature;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardInfoApproval.java b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardInfoApproval.java
index dbd86ab..9f58d83 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardInfoApproval.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardInfoApproval.java
@@ -150,7 +150,7 @@
      * 管理状态(字典code)
      */
     @ApiModelProperty(value = "管理状态(字典code)", dataType = "String")
-    @DictCodeField(message = "管理状态不合法", cacheName = MeterDictCode.MANAGER_STATE)
+    @DictCodeField(message = "管理状态不合法", cacheName = MeterDictCode.STANDARD_MANAGER_STATE)
     @TableField("manage_status")
     private String manageStatus;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardTechnologyRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardTechnologyRelation.java
index 0e612bd..751f26b 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardTechnologyRelation.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardTechnologyRelation.java
@@ -3,6 +3,7 @@
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -16,6 +17,7 @@
  * @author wangpeng
  * @since 2023-08-04
  */
+@ApiModel
 @Data
 @TableName("biz_equipment_standard_technology_relation")
 public class BizEquipmentStandardTechnologyRelation implements Serializable {
@@ -33,6 +35,10 @@
     @TableField("technology_file_id")
     private Long technologyFileId;
 
+    @ApiModelProperty(value = "依据的技术文件编号", dataType = "String")
+    @TableField("technology_file_no")
+    private String technologyFileNo;
+
     /**
      * 依据的技术文件名称(技术文件中现行测试校准检定方法表文件名字段)
      */
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerInfo.java
index d6e8bed..65cd6bc 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerInfo.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerInfo.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.model.resource;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -21,6 +28,11 @@
  * @author wangpeng
  * @since 2023-08-08
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @ApiModel
 @Data
 @TableName("biz_resource_customer_info")
@@ -35,6 +47,7 @@
     /**
      * 委托方编号
      */
+    @ExcelProperty(value = "委托方编号", order = 1)
     @ApiModelProperty(value = "委托方编号", dataType = "String")
     @TableField("customer_no")
     private String customerNo;
@@ -42,6 +55,7 @@
     /**
      * 委托方名称
      */
+    @ExcelProperty(value = "委托方名称", order = 2)
     @ApiModelProperty(value = "委托方名称(新建时为下拉选择一个受检单位组织的名字，传deptId字段，后端获取名称)", dataType = "String")
     @TableField("customer_name")
     private String customerName;
@@ -63,6 +77,7 @@
     /**
      * 联系人
      */
+    @ExcelProperty(value = "联系人", order = 3)
     @ApiModelProperty(value = "联系人", dataType = "String")
     @TableField("contacts")
     private String contacts;
@@ -70,6 +85,7 @@
     /**
      * 座机电话
      */
+    @ExcelProperty(value = "座机电话", order = 4)
     @ApiModelProperty(value = "座机电话", dataType = "String")
     @TableField("mobile")
     private String mobile;
@@ -77,6 +93,7 @@
     /**
      * 手机号码
      */
+    @ExcelProperty(value = "手机号码", order = 5)
     @ApiModelProperty(value = "手机号码", dataType = "String")
     @TableField("phone")
     private String phone;
@@ -91,6 +108,7 @@
     /**
      * 地址
      */
+    @ExcelProperty(value = "地址", order = 6)
     @ApiModelProperty(value = "地址", dataType = "String")
     @TableField("address")
     private String address;
@@ -141,6 +159,7 @@
     /**
      * 创建时间
      */
+    @ExcelProperty(value = "创建时间", order = 7)
     @ApiModelProperty(value = "创建时间", dataType = "String")
     @TableField("create_time")
     private String createTime;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerSuggestForm.java b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerSuggestForm.java
index 7201bbd..701bf8b 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerSuggestForm.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerSuggestForm.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.model.resource;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -22,6 +29,11 @@
  * @author wangpeng
  * @since 2023-08-08
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @ApiModel
 @Data
 @TableName("biz_resource_customer_suggest_form")
@@ -44,7 +56,8 @@
     /**
      * 委托方名称
      */
-    @ApiModelProperty(value = "委托方名称", dataType = "String")
+    @ExcelProperty(value = "意见反馈单位", order = 2)
+    @ApiModelProperty(value = "意见反馈单位", dataType = "String")
     @TableField("customer_name")
     private String customerName;
 
@@ -59,7 +72,8 @@
     /**
      * 委托方意见反馈部门名称
      */
-    @ApiModelProperty(value = "委托方意见反馈部门名称", dataType = "String")
+    @ExcelProperty(value = "委托方意见反馈部门", order = 3)
+    @ApiModelProperty(value = "委托方意见反馈部门", dataType = "String")
     @TableField("customer_dept_name")
     private String customerDeptName;
 
@@ -73,6 +87,7 @@
     /**
      * 表单编号
      */
+    @ExcelProperty(value = "表单编号", order = 1)
     @ApiModelProperty(value = "表单编号", dataType = "String")
     @TableField("form_no")
     private String formNo;
@@ -111,6 +126,7 @@
     /**
      * 创建人名字
      */
+    @ExcelProperty(value = "创建人", order = 4)
     @ApiModelProperty(value = "创建人名字", dataType = "String")
     @TableField("create_user_name")
     private String createUserName;
@@ -147,6 +163,7 @@
     /**
      * 创建时间
      */
+    @ExcelProperty(value = "创建时间", order = 5)
     @ApiModelProperty(value = "创建时间", dataType = "String")
     @TableField("create_time")
     private String createTime;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSealInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSealInfo.java
index cbf05d7..9bf389d 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSealInfo.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSealInfo.java
@@ -106,6 +106,10 @@
     @TableField("minio_file_name")
     private String minioFileName;
 
+    @ApiModelProperty(value = "minio存储文件url", dataType = "String")
+    @TableField(exist = false)
+    private String minioFileUrl;
+
     @ApiModelProperty(value = "创建时间", dataType = "String")
     @TableField("create_time")
     private String createTime;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSealUseNote.java b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSealUseNote.java
index 3f2d9e8..3ce16a8 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSealUseNote.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSealUseNote.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.model.resource;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -20,6 +27,11 @@
  * @author wangpeng
  * @since 2023-07-28
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @ApiModel
 @Data
 @TableName("biz_resource_seal_use_note")
@@ -34,6 +46,7 @@
     /**
      * 登记表编号
      */
+    @ExcelProperty(value = "申请单编号", order = 1)
     @ApiModelProperty(value = "登记表编号(自动生成)", dataType = "String")
     @TableField("note_form_no")
     private String noteFormNo;
@@ -55,6 +68,7 @@
     /**
      * 申请部门
      */
+    @ExcelProperty(value = "申请部门", order = 5)
     @ApiModelProperty(value = "申请部门", dataType = "String")
     @TableField("apply_dept_name")
     private String applyDeptName;
@@ -69,6 +83,7 @@
     /**
      * 申请人
      */
+    @ExcelProperty(value = "申请人", order = 6)
     @ApiModelProperty(value = "申请人", dataType = "String")
     @TableField("apply_user_name")
     private String applyUserName;
@@ -76,6 +91,7 @@
     /**
      * 申请时间
      */
+    @ExcelProperty(value = "申请时间", order = 7)
     @ApiModelProperty(value = "申请时间(新增自动获取当前时间)", dataType = "String")
     @TableField("apply_time")
     private String applyTime;
@@ -130,6 +146,26 @@
     @TableField("update_time")
     private String updateTime;
 
+    @ExcelProperty(value = "印章名称", order = 2)
+    @ApiModelProperty(value = "印章名称(列表返回参数)", dataType = "String")
+    @TableField(exist = false)
+    private String sealName;
+
+    @DictCodeField(message = "印章类型描述不合法", cacheName = MeterDictCode.SEAL_TYPE)
+    @ApiModelProperty(hidden = true)
+    @TableField(exist = false)
+    private String sealType;
+
+    @ExcelProperty(value = "印章类型", order = 3)
+    @ApiModelProperty(value = "印章类型(列表返回参数)", dataType = "String")
+    @TableField(exist = false)
+    private String sealTypeName;
+
+    @ExcelProperty(value = "批准人", order = 4)
+    @ApiModelProperty(value = "批准人(列表返回参数)", dataType = "String")
+    @TableField(exist = false)
+    private String approverName;
+
     @ApiModelProperty(value = "审批状态类型-字典value", dataType = "String")
     @TableField(exist = false)
     private String approvalStatusName;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceStaffInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceStaffInfo.java
index 5ef995b..41563a1 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceStaffInfo.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceStaffInfo.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.model.resource;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -20,6 +27,11 @@
  * @author wangpeng
  * @since 2023-07-25
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @ApiModel
 @Data
 @TableName("biz_resource_staff_info")
@@ -38,6 +50,7 @@
     /**
      * 人员编号
      */
+    @ExcelProperty(value = "人员编号",order = 0)
     @NotEmpty(message = "人员编号不能为空")
     @ApiModelProperty(value = "人员编号", dataType = "String")
     @TableField("staff_no")
@@ -46,6 +59,7 @@
     /**
      * 姓名
      */
+    @ExcelProperty(value = "姓名",order = 1)
     @ApiModelProperty(value = "姓名", dataType = "String")
     @TableField("staff_name")
     private String staffName;
@@ -152,13 +166,15 @@
     /**
      * 部门名字
      */
-    @ApiModelProperty(value = "部门名字", dataType = "String")
+    @ExcelProperty(value = "工作部门",order = 4)
+    @ApiModelProperty(value = "工作部门", dataType = "String")
     @TableField("dept_name")
     private String deptName;
 
     /**
      * 岗位
      */
+    @ExcelProperty(value = "岗位",order = 2)
     @ApiModelProperty(value = "岗位", dataType = "String")
     @TableField("station")
     private String station;
@@ -166,6 +182,7 @@
     /**
      * 计量专业
      */
+    @ExcelProperty(value = "计量专业",order = 5)
     @ApiModelProperty(value = "计量专业", dataType = "String")
     @TableField("major")
     private String major;
@@ -173,6 +190,7 @@
     /**
      * 证号
      */
+    @ExcelProperty(value = "证号",order = 3)
     @ApiModelProperty(value = "证号", dataType = "String")
     @TableField("certificate_number")
     private String certificateNumber;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSupplierInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSupplierInfo.java
index eb5ef01..a1e2697 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSupplierInfo.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSupplierInfo.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.model.resource;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -20,6 +27,11 @@
  * @author wangpeng
  * @since 2023-07-27
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @ApiModel
 @Data
 @TableName("biz_resource_supplier_info")
@@ -34,6 +46,7 @@
     /**
      * 供方编号
      */
+    @ExcelProperty(value = "供方编号", order = 1)
     @ApiModelProperty(value = "供方编号(自动生成)", dataType = "String")
     @TableField("supplier_no")
     private String supplierNo;
@@ -41,6 +54,7 @@
     /**
      * 供方名称
      */
+    @ExcelProperty(value = "供方名称", order = 2)
     @ApiModelProperty(value = "供方名称", dataType = "String")
     @TableField("supplier_name")
     private String supplierName;
@@ -60,6 +74,7 @@
     @TableField("supplier_type")
     private String supplierType;
 
+    @ExcelProperty(value = "供方类型", order = 3)
     @ApiModelProperty(value = "供方类型(字典value)", dataType = "String")
     @TableField(exist = false)
     private String supplierTypeName;
@@ -109,7 +124,8 @@
     /**
      * 电话
      */
-    @ApiModelProperty(value = "电话", dataType = "String")
+    @ExcelProperty(value = "联系电话", order = 4)
+    @ApiModelProperty(value = "联系电话", dataType = "String")
     @TableField("phone")
     private String phone;
 
@@ -158,6 +174,7 @@
     /**
      * 公司地址-省
      */
+    @ExcelProperty(value = "地址-省", order = 6)
     @ApiModelProperty(value = "公司地址-省", dataType = "String")
     @TableField("company_province_name")
     private String companyProvinceName;
@@ -172,6 +189,7 @@
     /**
      * 公司地址-市
      */
+    @ExcelProperty(value = "地址-市", order = 7)
     @ApiModelProperty(value = "公司地址-市", dataType = "String")
     @TableField("company_city_name")
     private String companyCityName;
@@ -186,6 +204,7 @@
     /**
      * 公司地址-区
      */
+    @ExcelProperty(value = "地址-区", order = 8)
     @ApiModelProperty(value = "公司地址-区", dataType = "String")
     @TableField("company_area_name")
     private String companyAreaName;
@@ -193,6 +212,7 @@
     /**
      * 公司地址-详细地址
      */
+    @ExcelProperty(value = "地址-详细地址", order = 9)
     @ApiModelProperty(value = "公司地址-详细地址", dataType = "String")
     @TableField("company_address")
     private String companyAddress;
@@ -200,6 +220,7 @@
     /**
      * 服务和供应的内容
      */
+    @ExcelProperty(value = "服务和供应的内容", order = 5)
     @ApiModelProperty(value = "服务和供应的内容", dataType = "String")
     @TableField("supplier_content")
     private String supplierContent;
@@ -250,6 +271,7 @@
     /**
      * 创建时间
      */
+    @ExcelProperty(value = "创建时间", order = 9)
     @ApiModelProperty(value = "创建时间", dataType = "String")
     @TableField("create_time")
     private String createTime;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/EnvLocationInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/EnvLocationInfo.java
new file mode 100644
index 0000000..d8e2d7b
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/EnvLocationInfo.java
@@ -0,0 +1,83 @@
+package com.casic.missiles.model.resource;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotEmpty;
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 实验室环境监控系统-设备表
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-06-07
+ */
+@ApiModel
+@Data
+@TableName("env_location_info")
+public class EnvLocationInfo implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "主键id", dataType = "Long")
+    @TableId("id")
+    private Long id;
+
+    /**
+     * 地点编号
+     */
+    @NotEmpty(message = "地点编号不能为空")
+    @ApiModelProperty(value = "地点编号", dataType = "String")
+    @TableField("location_no")
+    private String locationNo;
+
+    /**
+     * 地点名称
+     */
+    @ApiModelProperty(value = "地点名称", dataType = "String")
+    @TableField("location_name")
+    private String locationName;
+
+    /**
+     * 地点位置
+     */
+    @ApiModelProperty(value = "地点位置", dataType = "String")
+    @TableField("location_position")
+    private String locationPosition;
+
+    /**
+     * 创建人id
+     */
+    @ApiModelProperty(value = "创建人id", dataType = "Long")
+    @TableField("create_user_id")
+    private Long createUserId;
+
+    /**
+     * 创建人
+     */
+    @ApiModelProperty(value = "创建人", dataType = "String")
+    @TableField("create_user")
+    private String createUser;
+
+    /**
+     * 创建时间
+     */
+    @ApiModelProperty(value = "创建时间", dataType = "String")
+    @TableField("create_time")
+    private String createTime;
+
+    /**
+     * 更新时间
+     */
+    @ApiModelProperty(value = "更新时间", dataType = "String")
+    @TableField("update_time")
+    private String updateTime;
+
+
+}

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java
index bb0c50f..13a699b 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java
@@ -12,6 +12,7 @@
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.IGeneralApprovalService;
+import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
@@ -19,6 +20,7 @@
 import org.springframework.web.bind.annotation.RequestBody;
 
 import javax.validation.Valid;
+import java.util.List;
 import java.util.Objects;
 
 /**
@@ -117,4 +119,17 @@
         }
         return baseApprovalService.failUpdate(request);
     }
+
+    public List<O> exportList(@RequestBody @Valid R request) throws Exception {
+        List<O> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = baseApprovalService.listExportByIds(request.getIds());
+        } else {
+            list = baseApprovalService.listExport(request);
+        }
+        for (O record : list) {
+            DictCodeUtils.convertDictCodeToName(record);
+        }
+        return list;
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java
index 8a90961..d775831 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java
@@ -5,6 +5,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.business.certificate.CertificateChangeApplyApprovalListRequest;
 import com.casic.missiles.dto.business.certificate.CertificateChangeApplySaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessCertificateChangeApply;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
@@ -20,6 +21,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -48,4 +50,12 @@
         }
         return changeApplyService.saveChangeApply(request);
     }
+
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody CertificateChangeApplyApprovalListRequest request) throws Exception {
+        List<BizBusinessCertificateChangeApply> list = super.exportList(request);
+        super.exportExcel(BizBusinessCertificateChangeApply.class, list, ExportEnum.CERTIFICATE_CHANGE_APPLY.getSheetName());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java
index 5fc4b07..af8230e 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java
@@ -9,6 +9,7 @@
 import com.casic.missiles.dto.business.certificate.CertificatePrintApprovalListRequest;
 import com.casic.missiles.dto.business.certificate.CertificatePrintListResponse;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.enums.business.CertificatePrintStatusEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessCertificatePrintLog;
@@ -18,10 +19,16 @@
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.io.IOException;
+import java.util.List;
 import java.util.Objects;
 
 /**
@@ -98,4 +105,16 @@
         });
         return certificatePrintService.certificatePrintLog(idDTO.getId());
     }
+
+    @ApiOperation("证书打印审批导出")
+    @PostMapping("/listExport")
+    public void exportList(@RequestBody CertificatePrintApprovalListRequest request) throws IOException {
+        List<CertificatePrintListResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = certificatePrintService.listByIds(request.getIds());
+        } else {
+            list = certificatePrintService.list(request);
+        }
+        super.exportExcel(CertificatePrintListResponse.class, list, ExportEnum.CERTIFICATE_PRINT.getSheetName());
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java
index 63b06dc..6b2efd5 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java
@@ -6,6 +6,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.business.certificate.CertificateReportApprovalListRequest;
 import com.casic.missiles.dto.business.certificate.CertificateReportSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessCertificateReport;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
@@ -21,6 +22,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -50,7 +52,7 @@
         return certificateReportService.saveCertificateReport(request);
     }
 
-    @ApiOperation("证书审批详情（基本信息）")
+    @ApiOperation("详情（基本信息）")
     @PostMapping("/detail")
     public ReturnDTO<BizBusinessCertificateReport> detail(@RequestBody @Valid BaseDetailRequest request, BindingResult bindingResult) throws Exception {
         if(bindingResult.hasErrors()){
@@ -59,4 +61,11 @@
         return certificateReportService.detail(request);
     }
 
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody CertificateReportApprovalListRequest request) throws Exception {
+        List<BizBusinessCertificateReport> list = super.exportList(request);
+        super.exportExcel(BizBusinessCertificateReport.class, list, ExportEnum.CERTIFICATE_REPORT.getSheetName());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java
index 46b26bd..57c0809 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java
@@ -10,20 +10,21 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.business.identify.IdentifyListRequest;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessIdentifyInfo;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.business.IBizBusinessIdentifyInfoService;
+import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import javax.validation.Valid;
+import java.util.List;
 import java.util.Objects;
 
 /**
@@ -57,16 +58,13 @@
         return identifyInfoService.addIdentify(identifyInfo);
     }
 
-    @ApiOperation("标识打印更新")
+    @ApiOperation("标识打印更新（更新打印时间）")
     @PostMapping("/update")
-    public ReturnDTO updateIdentify(@RequestBody @Valid BizBusinessIdentifyInfo identifyInfo, BindingResult bindingResult) {
-        Assert.isFalse(Objects.isNull(identifyInfo.getId()), () -> {
+    public ReturnDTO updateIdentify(@RequestBody @Valid IdDTO idDTO) {
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        Assert.isFalse(bindingResult.hasErrors(), () -> {
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        });
-        return identifyInfoService.updateIdentify(identifyInfo);
+        return identifyInfoService.updateIdentify(idDTO.getId());
     }
 
     @ApiOperation("标识打印删除")
@@ -77,4 +75,37 @@
         });
         return identifyInfoService.deleteIdentify(idDTO.getId());
     }
+
+    @ApiOperation("标识打印导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody @Valid IdentifyListRequest request, BindingResult bindingResult) throws Exception {
+        if (bindingResult.hasErrors()) {
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        List<BizBusinessIdentifyInfo> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = identifyInfoService.listByIds(request.getIds());
+        } else {
+            list = identifyInfoService.list(request);
+        }
+        for (BizBusinessIdentifyInfo record : list) {
+            DictCodeUtils.convertDictCodeToName(record);
+        }
+        super.exportExcel(BizBusinessIdentifyInfo.class, list, ExportEnum.IDENTIFY_EXPORT.getSheetName());
+    }
+
+
+    // TODO: 2023/8/23 查询设备信息，4个底部按钮查设备（按钮的作用就是前端用来调不同接口、用来区分中间即将展示的标识），前端弹窗选设备，在确定保存时前端根据底部按钮判断传入设备类型deviceType字典code
+    // TODO: 2023/8/23 接口：查受检设备（第1个按钮），查设备台账（后3个按钮同一接口），查询之后前端根据标志类型的不同加到中间页面时进行判断（按产品给的对应表）
+    // TODO: 2023/8/23 提供二维码接口，前端在加到中间页面时调用一下
+
+    @ApiOperation("设备二维码")
+    @PostMapping("/equipment/qrCode")
+    public ReturnDTO<String> equipmentQrCode(@RequestBody @Valid IdDTO idDTO) {
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return identifyInfoService.equipmentQrCode(idDTO.getId());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java
index 707be6e..7e0453d 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java
@@ -117,7 +117,7 @@
     }
 
     @ApiOperation("任务单导出")
-    @PostMapping("/export")
+    @PostMapping("/listExport")
     public void orderExport(@RequestBody @Valid OrderListRequest request, HttpServletResponse response) {
         businessOrderService.orderExport(request, response);
     }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java
index 529a6ce..51432be 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java
@@ -1,9 +1,28 @@
 package com.casic.missiles.controller.business;
 
+import com.casic.missiles.controller.GeneralApprovalController;
+import com.casic.missiles.dto.BaseApprovalSubmitRequest;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.business.outsource.OutsourceAssessApprovalListRequest;
+import com.casic.missiles.dto.business.outsource.OutsourceAssessSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
+import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.model.business.BizBusinessOutsourceAssess;
+import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
+import com.casic.missiles.service.IGeneralApprovalService;
+import com.casic.missiles.service.business.IBizBusinessOutsourceAssessService;
 import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.BindingResult;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.validation.Valid;
+import java.util.List;
+
 /**
  * <p>
  * 计量检定业务-分包管理-测试、校准或检定工作分包评审表 前端控制器
@@ -15,6 +34,27 @@
 @Api(tags = "分包管理-测试、校准或检定工作分包评审表")
 @RestController
 @RequestMapping("/business/outsource/assess")
-public class BizBusinessOutsourceAssessController {
+public class BizBusinessOutsourceAssessController extends GeneralApprovalController<BizBusinessOutsourceAssess, BizBusinessOutsourceAssess, OutsourceAssessApprovalListRequest, BaseApprovalSubmitRequest> {
+    @Autowired
+    private IBizBusinessOutsourceAssessService outsourceAssessService;
 
+    public BizBusinessOutsourceAssessController(IGeneralApprovalService<BizBusinessOutsourceAssess, BizBusinessOutsourceAssess, OutsourceAssessApprovalListRequest, BaseApprovalSubmitRequest> baseApprovalService) {
+        super(baseApprovalService);
+    }
+
+    @ApiOperation("草稿箱-保存")
+    @PostMapping("/save")
+    public ReturnDTO<OutsourceAssessSaveResponse> saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceAssess request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        return outsourceAssessService.saveOutsourceAssess(request);
+    }
+
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception {
+        List<BizBusinessOutsourceAssess> list = super.exportList(request);
+        super.exportExcel(BizBusinessOutsourceAssess.class, list, ExportEnum.OUTSOURCE_ASSESS.getSheetName());
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java
new file mode 100644
index 0000000..9adef18
--- /dev/null
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java
@@ -0,0 +1,60 @@
+package com.casic.missiles.controller.business;
+
+import com.casic.missiles.controller.GeneralApprovalController;
+import com.casic.missiles.dto.BaseApprovalSubmitRequest;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.business.outsource.OutsourceProtocolApprovalListRequest;
+import com.casic.missiles.dto.business.outsource.OutsourceProtocolSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
+import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.model.business.BizBusinessOutsourceProtocol;
+import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
+import com.casic.missiles.service.IGeneralApprovalService;
+import com.casic.missiles.service.business.IBizBusinessOutsourceProtocolService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.BindingResult;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.validation.Valid;
+import java.util.List;
+
+/**
+ * <p>
+ * 计量检定业务-分包管理-测试、校准或检定工作分包协议书 前端控制器
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-08-24
+ */
+@Api(tags = "分包管理-测试、校准或检定工作分包协议书")
+@RestController
+@RequestMapping("/business/outsource/protocol")
+public class BizBusinessOutsourceProtocolController extends GeneralApprovalController<BizBusinessOutsourceProtocol, BizBusinessOutsourceProtocol, OutsourceProtocolApprovalListRequest, BaseApprovalSubmitRequest> {
+    @Autowired
+    private IBizBusinessOutsourceProtocolService outsourceProtocolService;
+
+    public BizBusinessOutsourceProtocolController(IGeneralApprovalService<BizBusinessOutsourceProtocol, BizBusinessOutsourceProtocol, OutsourceProtocolApprovalListRequest, BaseApprovalSubmitRequest> baseApprovalService) {
+        super(baseApprovalService);
+    }
+
+    @ApiOperation("草稿箱-保存")
+    @PostMapping("/save")
+    public ReturnDTO<OutsourceProtocolSaveResponse> saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceProtocol request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        return outsourceProtocolService.saveOutsourceProtocol(request);
+    }
+
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody OutsourceProtocolApprovalListRequest request) throws Exception {
+        List<BizBusinessOutsourceProtocol> list = super.exportList(request);
+        super.exportExcel(BizBusinessOutsourceProtocol.class, list, ExportEnum.OUTSOURCE_PROTOCOL.getSheetName());
+    }
+}
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java
index 097f645..f0f0943 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java
@@ -17,7 +17,6 @@
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.IGeneralApprovalService;
 import com.casic.missiles.service.business.IBizBusinessOutsourcerInfoService;
-import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -71,19 +70,8 @@
 
     @ApiOperation("分包方导出")
     @PostMapping("/listExport")
-    public void export(@RequestBody @Valid OutsourcerInfoApprovalListRequest request, BindingResult bindingResult) throws Exception {
-        if (bindingResult.hasErrors()) {
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        }
-        List<BizBusinessOutsourcerInfo> list;
-        if (!CollectionUtils.isEmpty(request.getIds())) {
-            list = outsourcerInfoService.listByIds(request.getIds());
-        } else {
-            list = outsourcerInfoService.list(request);
-        }
-        for (BizBusinessOutsourcerInfo record : list) {
-            DictCodeUtils.convertDictCodeToName(record);
-        }
+    public void export(@RequestBody OutsourcerInfoApprovalListRequest request) throws Exception {
+        List<BizBusinessOutsourcerInfo> list = super.exportList(request);
         super.exportExcel(BizBusinessOutsourcerInfo.class, list, ExportEnum.OUTSOURCER_EXPORT.getSheetName());
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java
index c2cbf9f..0410918 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java
@@ -17,11 +17,9 @@
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.IGeneralApprovalService;
 import com.casic.missiles.service.business.IBizBusinessSiteExecutiveInfoService;
-import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -60,7 +58,7 @@
         return siteExecutiveInfoService.saveSiteExecutiveInfo(siteExecutiveInfo);
     }
 
-    @ApiOperation("现场检测详情")
+    @ApiOperation("详情")
     @PostMapping("/detail")
     public ReturnDTO<SiteExecutiveDetailResponse> siteExecutiveDetail(@RequestBody @Valid IdDTO idDTO) throws Exception {
         Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
@@ -69,21 +67,10 @@
         return ReturnUtil.success(siteExecutiveInfoService.detail(idDTO.getId()));
     }
 
-    @ApiOperation("现场检测导出")
+    @ApiOperation("导出")
     @PostMapping("/listExport")
-    public void export(@RequestBody @Valid SiteExecutiveApprovalListRequest request, BindingResult bindingResult) throws Exception {
-        if (bindingResult.hasErrors()) {
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        }
-        List<SiteExecutiveApprovalListResponse> list;
-        if (!CollectionUtils.isEmpty(request.getIds())) {
-            list = siteExecutiveInfoService.listInfoByIds(request.getIds());
-        } else {
-            list = siteExecutiveInfoService.listInfo(request);
-        }
-        for (SiteExecutiveApprovalListResponse record : list) {
-            DictCodeUtils.convertDictCodeToName(record);
-        }
+    public void export(@RequestBody SiteExecutiveApprovalListRequest request) throws Exception {
+        List<SiteExecutiveApprovalListResponse> list = super.exportList(request);
         super.exportExcel(SiteExecutiveApprovalListResponse.class, list, ExportEnum.SITE_EXECUTIVE_EXPORT.getSheetName());
     }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
index 7e793cd..a92e209 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
@@ -55,7 +55,7 @@
 
     @ApiOperation("设备收发列表导出")
     @PostMapping("/export")
-    public void exportList(@RequestBody @Valid SampleDispatchListRequest request) throws IOException {
+    public void exportList(@RequestBody SampleDispatchListRequest request) throws IOException {
         List<SampleDispatchListResponse> list;
         if (!CollectionUtils.isEmpty(request.getIds())) {
             list = dispatchService.listByIds(request.getIds());
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java
index cdc77fc..d120fd4 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java
@@ -7,6 +7,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.business.labExecutive.*;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.business.IBusinessLabExecutiveInfoService;
@@ -14,6 +15,7 @@
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.*;
 
@@ -32,7 +34,7 @@
     @Autowired
     private IBusinessLabExecutiveInfoService labExecutiveInfoService;
 
-    @ApiOperation("实验室检测-部门检测-查询各状态列表（待检测、检测中、检测完）")
+    @ApiOperation("实验室任务-查询各状态列表（待检测、检测中、检测完）")
     @PostMapping("/deptExecutive/List")
     public ReturnDTO<PageInfoBT<SampleLabExecutiveListResponse>> queryDeptExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
@@ -43,10 +45,19 @@
         return ReturnUtil.success(super.packForBT(labExecutiveInfoService.deptLabExecutiveListPage(page, labExecutiveListRequest)));
     }
 
-    /**
-     * 实验室检测-我的检测-查询各状态列表（待检测、检测中、检测完）
-     */
-    @ApiOperation("实验室检测-我的检测-查询各状态列表（待检测、检测中、检测完）")
+    @ApiOperation("实验室任务导出")
+    @PostMapping("/deptExecutive/export")
+    public void deptExportList(@RequestBody @Valid SampleLabExecutiveListRequest request) throws Exception {
+        List<SampleLabExecutiveListResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = labExecutiveInfoService.deptLabExecutiveListByIds(request.getMeasureStatus(), request.getIds());
+        } else {
+            list = labExecutiveInfoService.deptLabExecutiveList(request);
+        }
+        super.exportExcel(SampleLabExecutiveListResponse.class, list, ExportEnum.DEPT_EXECUTIVE_TASK.getSheetName());
+    }
+
+    @ApiOperation("我的任务-查询各状态列表（待检测、检测中、检测完）")
     @PostMapping("/myExecutive/list")
     public ReturnDTO<PageInfoBT<SampleLabExecutiveListResponse>> queryMyExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
@@ -57,19 +68,25 @@
         return ReturnUtil.success(super.packForBT(labExecutiveInfoService.myLabExecutiveListPage(page, labExecutiveListRequest)));
     }
 
-    /**
-     * 实验室检测-我的检测-查询各状态样品数量（待检测、检测中、检测完）
-     */
-    @ApiOperation("实验室检测-我的检测-查询各状态样品数量（待检测、检测中、检测完）")
+    @ApiOperation("我的任务导出")
+    @PostMapping("/myExecutive/export")
+    public void exportList(@RequestBody @Valid SampleLabExecutiveListRequest request) throws Exception {
+        List<SampleLabExecutiveListResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = labExecutiveInfoService.myLabExecutiveListByIds(request.getMeasureStatus(), request.getIds());
+        } else {
+            list = labExecutiveInfoService.myLabExecutiveList(request);
+        }
+        super.exportExcel(SampleLabExecutiveListResponse.class, list, ExportEnum.MY_EXECUTIVE_TASK.getSheetName());
+    }
+
+    @ApiOperation("我的任务-查询各状态样品数量（待检测、检测中、检测完）")
     @GetMapping("/myExecutive/amount")
     public ReturnDTO<List<SampleAmountResponse>> queryMyExecutiveAmount() {
         return ReturnUtil.success(labExecutiveInfoService.myExecutiveAmount());
     }
 
-    /**
-     * 实验室检测-部门检测-分配（分配给具体人员）
-     */
-    @ApiOperation("实验室检测-部门检测-分配按钮（分配给具体人员）")
+    @ApiOperation("实验室任务-分配按钮（分配给具体人员）")
     @PostMapping("/deptExecutive/allocate")
     public ReturnDTO allocateStaff(@RequestBody @Valid SampleAllocateRequest sampleAllocateRequest, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -78,10 +95,7 @@
         return labExecutiveInfoService.allocateStaff(sampleAllocateRequest);
     }
 
-    /**
-     * 实验室检测-我的检测-检定人扫描收入（待检测->检测中）
-     */
-    @ApiOperation("实验室检测-我的检测-检定人扫描收入（待检测->检测中）")
+    @ApiOperation("我的任务-检定人扫描收入（待检测->检测中）")
     @PostMapping("/myExecutive/receive")
     public ReturnDTO sampleReceive(@RequestBody @Valid List<SampleOperateRequest> requestList, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -90,10 +104,7 @@
         return labExecutiveInfoService.sampleReceive(requestList);
     }
 
-    /**
-     * 实验室检测-负责人/检定人扫描检完（检测中->检测完）
-     */
-    @ApiOperation("实验室检测-负责人/检定人扫描检完（检测中->检测完）")
+    @ApiOperation("实验室任务-负责人/检定人扫描检完（检测中->检测完）")
     @PostMapping("/myExecutive/complete")
     public ReturnDTO sampleExecutiveComplete(@RequestBody @Valid List<SampleOperateRequest> requestList, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -102,10 +113,7 @@
         return labExecutiveInfoService.sampleExecutiveComplete(requestList);
     }
 
-    /**
-     * 实验室检测-部门检测/我的检测 编辑（只能修改应出具证书）
-     */
-    @ApiOperation("实验室检测-部门检测/我的检测 编辑（只能修改应出具证书）")
+    @ApiOperation("实验室任务/我的任务 编辑（只能修改应出具证书）")
     @PostMapping("/executive/update")
     public ReturnDTO updateExecutive(@RequestBody @Valid UpdateExecutiveRequest request, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -114,10 +122,7 @@
         return labExecutiveInfoService.updateExecutive(request);
     }
 
-    /**
-     * 实验室检测-部门检测/我的检测 详情
-     */
-    @ApiOperation("实验室检测-部门检测/我的检测 详情")
+    @ApiOperation("实验室任务/我的任务 详情")
     @PostMapping("/executive/detail")
     public ReturnDTO<ExecutiveDetailResponse> executiveDetail(@RequestBody @Valid ExecutiveDetailRequest request, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
@@ -131,7 +136,7 @@
      * 退回后会将下一个要执行的实验室检测状态更新为待分配，将后面的实验室顺序变更为连续（都进行减1）
      * 最后一个检测的实验室退回，等分发员再增加实验室或设备收发中的已收入直接手动点击完成
      */
-    @ApiOperation("实验室检测-部门检测/我的检测 退回（待检测/检测中->退回）")
+    @ApiOperation("实验室任务/我的任务 退回（待检测/检测中->退回）")
     @PostMapping("/executive/sendBack")
     public ReturnDTO executiveSendBack(@RequestBody @Valid ExecutiveSendBackRequest request, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -140,9 +145,6 @@
         return labExecutiveInfoService.sampleExecutiveSendBack(request);
     }
 
-    /**
-     * 分发员编辑实验室检测列表
-     */
     @ApiOperation("分发员编辑实验室检测列表")
     @PostMapping("/handOut/updateList")
     public ReturnDTO updateExecutiveList(@RequestBody @Valid UpdateExecutiveListRequest request, BindingResult bindingResult) {
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java
index 48a67ed..0c04f31 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java
@@ -10,6 +10,7 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.resource.customer.CustomerApprovalListRequest;
 import com.casic.missiles.dto.resource.customer.CustomerSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceCustomerInfo;
@@ -26,6 +27,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -55,6 +57,13 @@
         return customerInfoService.saveCustomerInfo(request);
     }
 
+    @ApiOperation("委托方名录导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody CustomerApprovalListRequest request) throws Exception {
+        List<BizResourceCustomerInfo> list = super.exportList(request);
+        super.exportExcel(BizResourceCustomerInfo.class, list, ExportEnum.CUSTOMER_INFO.getSheetName());
+    }
+
     @ApiOperation("委托方人员列表（分页）")
     @PostMapping("/person/listPage")
     public ReturnDTO<PageInfoBT<BizResourceCustomerStaff>> personListPage(@RequestBody IdDTO idDto) {
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
index 972ed4b..6418ea5 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
@@ -5,6 +5,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.resource.customer.SuggestFormApprovalListRequest;
 import com.casic.missiles.dto.resource.customer.SuggestFormSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceCustomerSuggestForm;
@@ -20,6 +21,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -50,4 +52,11 @@
         return suggestFormService.saveSuggestForm(request);
     }
 
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody SuggestFormApprovalListRequest request) throws Exception {
+        List<BizResourceCustomerSuggestForm> list = super.exportList(request);
+        super.exportExcel(BizResourceCustomerSuggestForm.class, list, ExportEnum.CUSTOMER_SUGGEST_FORM.getSheetName());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java
index 1934d1a..9e07eab 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java
@@ -15,12 +15,16 @@
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.resource.IEnvEnvironmentRecordConfigService;
 import com.casic.missiles.service.resource.IEnvEnvironmentRecordDataService;
+import com.casic.missiles.service.resource.IEnvLocationInfoService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
 import java.util.List;
@@ -39,6 +43,8 @@
     private IEnvEnvironmentRecordDataService environmentRecordDataService;
     @Autowired
     private IEnvEnvironmentRecordConfigService environmentRecordConfigService;
+    @Autowired
+    private IEnvLocationInfoService locationInfoService;
 
     @ApiOperation("环境记录单数据列表/详情")
     @PostMapping("/data/listPage")
@@ -95,4 +101,11 @@
         });
         return environmentRecordConfigService.deleteEnvironmentRecordConfig(idDTO.getId());
     }
+
+    @ApiOperation("地点列表")
+    @PostMapping("/location/listPage")
+    public ReturnDTO<PageInfoBT<LocationListResponse>> locationListPage(@RequestBody @Valid LocationListRequest request) {
+        Page<LocationListResponse> page = PageFactory.defaultPage();
+        return ReturnUtil.success(super.packForBT(locationInfoService.listPage(page, request)));
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java
index 82efe3f..e9561fa 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java
@@ -10,6 +10,7 @@
 import com.casic.missiles.dto.resource.seal.SealLogListRequest;
 import com.casic.missiles.dto.resource.seal.SealNoteApprovalListRequest;
 import com.casic.missiles.dto.resource.seal.SealNoteSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceSealUseLog;
@@ -27,6 +28,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -58,6 +60,13 @@
         return sealUseNoteService.saveSeal(request);
     }
 
+    @ApiOperation("印章使用登记导出（列表和导出中去掉经办人和监印人）")
+    @PostMapping("/listExport")
+    public void export(@RequestBody SealNoteApprovalListRequest request) throws Exception {
+        List<BizResourceSealUseNote> list = super.exportList(request);
+        super.exportExcel(BizResourceSealUseNote.class, list, ExportEnum.SEAL_NOTE.getSheetName());
+    }
+
     // TODO: 2023/7/28 印章使用日志：系统中使用印章时插入数据库
 
     @ApiOperation("印章使用日志列表（分页）")
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java
index 9b674fc..06b6521 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java
@@ -9,16 +9,20 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.resource.staff.StaffCertRequest;
 import com.casic.missiles.dto.resource.staff.StaffCertResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.service.resource.IBizResourceStaffInfoService;
 import com.casic.missiles.service.resource.IBizResourceStaffVerifierService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.List;
+
 /**
  * @Description:
  * @Author: wangpeng
@@ -41,9 +45,21 @@
         return ReturnUtil.success(super.packForBT(responsePage));
     }
 
+    @ApiOperation("证书逾期提醒导出")
+    @PostMapping("/listExport")
+    public void exportList(@RequestBody StaffCertRequest request) throws Exception {
+        List<StaffCertResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = staffInfoService.certListByIds(request.getIds());
+        } else {
+            list = staffInfoService.certList(request);
+        }
+        super.exportExcel(StaffCertResponse.class, list, ExportEnum.STAFF_CERTIFICATE_EXPIRE.getSheetName());
+    }
+
     @ApiOperation("证书逾期提醒")
     @PostMapping("/expirationReminder")
-    public ReturnDTO expirationReminder(@RequestBody IdDTO idDto) {
-        return verifierService.expirationReminder(idDto);
+    public ReturnDTO expirationReminder(@RequestBody IdDTO idDTO) {
+        return verifierService.expirationReminder(idDTO);
     }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java
index 3b251ad..a6e7850 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java
@@ -12,6 +12,7 @@
 import com.casic.missiles.dto.resource.staff.StaffListRequest;
 import com.casic.missiles.dto.resource.staff.TrainListRequest;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.*;
@@ -22,7 +23,10 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
 import java.util.List;
@@ -52,8 +56,19 @@
             throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
         }
         Page<BizResourceStaffInfo> page = PageFactory.defaultPage();
-        Page<BizResourceStaffInfo> responsePage = staffInfoService.listPage(page, request);
-        return ReturnUtil.success(super.packForBT(responsePage));
+        return ReturnUtil.success(super.packForBT(staffInfoService.listPage(page, request)));
+    }
+
+    @ApiOperation("人员登记导出")
+    @PostMapping("/listExport")
+    public void exportList(@RequestBody StaffListRequest request) throws Exception {
+        List<BizResourceStaffInfo> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = staffInfoService.listByIds(request.getIds());
+        } else {
+            list = staffInfoService.list(request);
+        }
+        super.exportExcel(BizResourceStaffInfo.class, list, ExportEnum.STAFF_INFO.getSheetName());
     }
 
     @ApiOperation("人员登记详情基础信息")
@@ -85,9 +100,9 @@
 
     @ApiOperation("科研教育列表（分页）")
     @PostMapping("/education/listPage")
-    public ReturnDTO<PageInfoBT<BizResourceStaffEducation>> educationListPage(@RequestBody IdDTO idDto) {
+    public ReturnDTO<PageInfoBT<BizResourceStaffEducation>> educationListPage(@RequestBody IdDTO idDTO) {
         Page<BizResourceStaffEducation> page = PageFactory.defaultPage();
-        Page<BizResourceStaffEducation> responsePage = staffInfoService.educationListPage(page, idDto);
+        Page<BizResourceStaffEducation> responsePage = staffInfoService.educationListPage(page, idDTO);
         return ReturnUtil.success(super.packForBT(responsePage));
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java
index af6aa86..d85d84a 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java
@@ -9,6 +9,7 @@
 import com.casic.missiles.dto.resource.outsideService.SupplierApprovalListRequest;
 import com.casic.missiles.dto.resource.outsideService.SupplierSaveResponse;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceSupplierAbility;
@@ -67,6 +68,13 @@
         return ReturnUtil.success(supplierInfoService.detail(idDTO.getId()));
     }
 
+    @ApiOperation("合格供方导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody SupplierApprovalListRequest request) throws Exception {
+        List<BizResourceSupplierInfo> list = super.exportList(request);
+        super.exportExcel(BizResourceSupplierInfo.class, list, ExportEnum.SUPPLIER_INFO.getSheetName());
+    }
+
     @ApiOperation("供方人员列表（分页）")
     @PostMapping("/person/listPage")
     public ReturnDTO<PageInfoBT<BizResourceSupplierPerson>> personListPage(@RequestBody IdDTO idDTO) {
diff --git a/casic-metering-api/src/main/resources/config/application.yml b/casic-metering-api/src/main/resources/config/application.yml
index 350db5f..ecff521 100644
--- a/casic-metering-api/src/main/resources/config/application.yml
+++ b/casic-metering-api/src/main/resources/config/application.yml
@@ -126,7 +126,7 @@
     #作者
     author: wangpeng
     #待生成对象表名
-    table-name: biz_equipment_technical_target_approval,biz_equipment_attachment_approval,biz_equipment_checkpoint_approval
+    table-name: biz_business_outsource_protocol
 
 reminder:
   #节点--common模块config包 ReminderNodeConfig配置
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
index 4a19e4e..d47d552 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
@@ -53,6 +53,7 @@
     SUGGEST_FORM_SAVE_FAILED(2509, "委托方意见登记表保存至草稿箱失败"),
     EXAMINE_FORM_SAVE_FAILED(2510, "要求、委托书及合同评审表保存至草稿箱失败"),
     CUSTOMER_EXIST_SAVE_FAILED(2511, "该委托方已存在，请重新选择"),
+    DUPLICATE_LOCATION_NO(2512, "地点编号已存在"),
 
     /**
      * 计量检定业务模块
@@ -68,6 +69,8 @@
     COMPLETE_SAMPLE_NOT_EXIST(2609, "检测中不存在扫描收入的样品"),
     CANNOT_CHANGE_MEASURE_INFO(2610, "无法更改非当前登录用户的检测信息"),
     NON_EXIST_ORDER_OR_SAMPLE(2611, "不存在该委托单或该委托单下的样品"),
+    OUTSOURCE_ACCESS_SAVE_FAILED(2612, "测试、校准或检定工作分包评审表保存至草稿箱失败"),
+    OUTSOURCE_PROTOCOL_SAVE_FAILED(2613, "测试、校准或检定工作分包协议书保存至草稿箱失败"),
 
     /**
      * 历史遗留备用
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
index 5089ad1..81a406b 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
@@ -10,54 +10,38 @@
     /**
      * 资源管理
      */
-    ENVIRONMENT_DATA_EXPORT("environmentData", "environmentData", "环境记录单数据"),
+    ENVIRONMENT_DATA_EXPORT("environmentData", "环境记录单数据", "环境记录单数据"),
+    STAFF_INFO("staffInfo", "人员登记", "人员登记"),
+    STAFF_CERTIFICATE_EXPIRE("certificateExpire", "证书逾期提醒", "证书逾期提醒"),
+    SUPPLIER_INFO("supplierInfo", "合格供方名录", "合格供方名录"),
+    CUSTOMER_INFO("customerInfo", "委托方名录", "委托方名录"),
+    CUSTOMER_SUGGEST_FORM("customerSuggestForm", "委托方意见登记表", "委托方意见登记表"),
+    SEAL_NOTE("sealNote", "印章使用登记", "印章使用登记"),
 
-    FILE_EXPORT("meterFileData", "meterFileData", "计量文件信息"),
-    TRAIN_PLAN_EXPORT("trainPlanData", "trainPlanData", "培训计划"),
-    TRAIN_LOG_EXPORT("trainLogData", "trainLogData", "培训记录"),
-    METER_ORGANIZE_EXPORT("meterOrganizeData", "meterOrganizeData", "计量组织"),
-    TRACE_SUPPLIER_EXPORT("traceSupplierData", "traceSupplierData", "溯源供方"),
-    SIGN_EXPORT("signData", "signData", "签名/签章"),
-    TEMPLATE_EXPORT("templateData", "templateData", "原始记录模板/证书报告模板"),
-    FIXED_ASSETS("meterFixedAssets", "meterFixedAssets", "固定资产"),
-    METER_EQUIPMENT("meterEquipment", "meterEquipment", "测量设备"),
-    CALIBRATION_TEST_EQUIPMENT("calibrationTestEquipment", "calibrationTestEquipment", "校准检定设备"),
-    MEASURE_ACCOUNT("measureAccount", "measureAccount", "测量工装"),
-    STANDARD_SUPPORT_EQUIPMENT("standardSupportEquipment", "standardSupportEquipment", "标准配套设备"),
-    STANDARD_EQUIPMENT("standardEquipment", "standardEquipment", "标准装置"),
-    FLOW_DEF_EXPORT("flowDefData", "flowDefData", "流程定义"),
-    STAFF_CERTIFICATE("certificate", "certificate", "计量人员证书"),
-    CHECK_INFO("checkInfo", "checkInfo", "设备管理点检测"),
-    EQUIPMENT_APPLY("equipmentApply", "equipmentApply", "设备借用"),
-    STANDARD_EQUIPMENT_REMIND("equipmentApplyRemind", "equipmentApplyRemind", "标准装置到期提醒"),
-    METER_PRICE("meterPrice", "meterPrice", "价格库"),
-    METER_STAFF("meterStaff", "meterStaff", "计量人员"),
-    STANDARD_EQUIPMENT_APPLY("standardEquipmentApply", "standardEquipmentApply", "标准装置申请"),
-    STATE_MANAGE_APPLY("stateManage", "stateManage", "状态管理"),
-    METER_ACCEPTANCE_CHECK("acceptanceCheck", "acceptanceCheck", "设备检修保养验收单"),
-    CUSTOMER_EXPORT("customerData", "customerData", "客户信息"),
-    ORDER_EXPORT("orderData", "orderData", "委托书信息"),
-    SAMPLE_EXPORT("sampleData", "sampleData", "样本信息"),
-    EXCHANGE_DATA("exchangeData", "exchangeData", "设备交接单"),
-    DISPATCH_DATA("dispatchData", "dispatchData", "设备收发"),
-    ENVIRONMENT_DATA("environmentData", "environmentData", "环境记录单"),
-    ORIGIN_DATA("originData", "originData", "原始记录"),
-    CERTIFICATE_REPORT("certificateReport", "certificateReport", "证书报告"),
-    ADVICE_EXPORT("adviceData", "adviceData", "客户反馈"),
-    HANDOUT_EXPORT("handoutData", "handoutData", "任务分发列表"),
-    OUTSOURCER_EXPORT("outsourcerData", "outsourcerData", "分包方"),
-    SITE_EXECUTIVE_EXPORT("siteExecutiveData", "siteExecutiveData", "现场测试、校准或检定"),
-    CERTIFICATE_PRINT_EXPORT("certificatePrintData", "certificatePrintData", "证书打印"),
-    DOWNLOAD_TEMPLATE("downloadTemplate", "downloadTemplate", "页面配置"),
-    OUTSOURCER_CERTIFICATE_EXPORT("outsourceCertificateData", "outsourceCertificateData", "分包证书"),
-    SETTLEMENT_INFO_EXPORT("settlementInfoData", "settlementInfoData", "业务结算"),
-    EQUIPMENT_REMIND("equipmentRemind", "equipmentRemind", "设备到期提醒"),
-    AGREEMENT_INFO_EXPORT("agreementInfoData", "agreementInfoData", "合同"),
-    WORK_STATISTICS_EXPORT("workStatisticsData", "workStatisticsData", "实时工作统计"),
-    DEPT_OUTPUT_EXPORT("deptOutputData", "deptOutputData", "部门产值分析"),
-    WORKLOAD_EXPORT("workloadData", "workloadData", "业务工作量分析"),
-    DEPT_COMPREHENSIVE_EXPORT("deptComprehensiveData", "deptComprehensiveData", "部门综合分析"),
-    ENVIRONMENTAL_RECORD("environmentalRecordData", "environmentalRecordData", "现场环境记录");
+    /**
+     * 计量检定业务
+     */
+    OUTSOURCER_EXPORT("outsourcerData", "分包方名录", "分包方名录"),
+    IDENTIFY_EXPORT("identifyData", "计量标识", "计量标识"),
+    ORDER_EXPORT("orderData", "任务单", "任务单"),
+    DISPATCH_DATA("dispatchData", "设备收发", "设备收发"),
+    HANDOUT_EXPORT("handoutData", "任务分发", "任务分发"),
+    SITE_EXECUTIVE_EXPORT("siteExecutiveData", "现场测试、校准或检定", "现场测试、校准或检定"),
+    CERTIFICATE_REPORT("certificateReport", "证书审批", "证书审批"),
+    CERTIFICATE_CHANGE_APPLY("certificateChangeApply", "证书报告补充或更换申请单", "证书报告补充或更换申请单"),
+    CERTIFICATE_PRINT("certificatePrintData", "证书打印审批", "证书打印审批"),
+    DEPT_EXECUTIVE_TASK("deptExecutiveTaskData", "实验室任务", "实验室任务"),
+    MY_EXECUTIVE_TASK("myExecutiveTaskData", "我的任务", "我的任务"),
+    OUTSOURCE_ASSESS("outsourceAssess", "测试、校准或检定工作分包评审表", "测试、校准或检定工作分包评审表"),
+    OUTSOURCE_PROTOCOL("outsourceProtocol", "测试、校准或检定工作分包协议书", "测试、校准或检定工作分包协议书"),
+
+    /**
+     * 系统管理
+     */
+    SIGN_EXPORT("signData", "签名", "签名"),
+    TEMPLATE_EXPORT("templateData", "文件模板", "文件模板"),
+    FLOW_DEF_EXPORT("flowDefData", "流程定义", "流程定义"),
+    DOWNLOAD_TEMPLATE("downloadTemplate", "流程定义", "页面配置");
 
     ExportEnum(String fileName, String sheetName, String description) {
         this.fileName = fileName;
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateRecordTypeCodeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateRecordTypeCodeEnum.java
index 31d913c..a963522 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateRecordTypeCodeEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateRecordTypeCodeEnum.java
@@ -46,4 +46,14 @@
     String SITE_EXECUTIVE_APPROVAL = "01";
     //《现场测试、校准或检定工作记录表》
     String SITE_EXECUTIVE_LOG = "02";
+
+    //测试、校准或检定工作分包协议书
+    String OUTSOURCE_PROTOCOL = "01";
+    //测试、校准或检定工作分包评审表
+    String OUTSOURCE_ACCESS = "02";
+    //测试、校准或检定工作分包通知书
+    String OUTSOURCE_NOTICE = "03";
+    //测试、校准或检定工作分包方名录
+    String OUTSOURCE_INFO = "04";
+
 }
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
index 24b8635..f78bd53 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
@@ -15,6 +15,10 @@
     String CERTIFICATE_CHANGE_APPLY_BEAN_NAME = "certificateChangeApplyBean";
     //现场测试、校准或检定
     String SITE_EXECUTIVE_BEAN_NAME = "siteExecutiveBean";
+    //测试、校准或检定工作分包评审表
+    String OUTSOURCE_ASSESS_BEAN_NAME = "outsourceAssessBean";
+    //测试、校准或检定工作分包协议书
+    String OUTSOURCE_PROTOCOL_BEAN_NAME = "outsourceProtocolBean";
 
     /*********************************设备与装置************************************/
     //设备台账
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 b21c661..6b86fd1 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
@@ -18,6 +18,8 @@
     OUTSOURCER_APPROVAL(OUTSOURCER_BEAN_NAME, ""),
     CERTIFICATE_CHANGE_APPROVAL(CERTIFICATE_CHANGE_APPLY_BEAN_NAME, ""),
     SITE_EXECUTIVE_APPROVAL(SITE_EXECUTIVE_BEAN_NAME, ""),
+    OUTSOURCE_ASSESS_APPROVAL(OUTSOURCE_ASSESS_BEAN_NAME, ""),
+    OUTSOURCE_PROTOCOL_APPROVAL(OUTSOURCE_PROTOCOL_BEAN_NAME, ""),
 
     ACTION_STATUS_MAP(new HashMap<String, AwareActionStatusEnum>() {
         {
@@ -47,6 +49,10 @@
             put(ApplyFromIdEnum.CERTIFICATE_CHANGE_APPROVAL.getCode(), CERTIFICATE_CHANGE_APPROVAL);
             //现场测试、校准或检定审批
             put(ApplyFromIdEnum.SITE_EXECUTIVE_APPROVAL.getCode(), SITE_EXECUTIVE_APPROVAL);
+            //测试、校准或检定工作分包评审表
+            put(ApplyFromIdEnum.OUTSOURCE_ASSESS_APPROVAL.getCode(), OUTSOURCE_ASSESS_APPROVAL);
+            //测试、校准或检定工作分包协议书
+            put(ApplyFromIdEnum.OUTSOURCE_PROTOCOL_APPROVAL.getCode(), OUTSOURCE_PROTOCOL_APPROVAL);
         }
     });
     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 934405e..c7410bd 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
@@ -9,6 +9,8 @@
     CERTIFICATE_CHANGE_APPROVAL("jljdywzsbchghsqd", MessageSourceModuleEnum.BUSINESS.getCode(), "证书/报告补充或更换申请单"),
     OUTSOURCER_APPROVAL("jljdywcsjzhgfbfml", MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定合格分包方名录"),
     SITE_EXECUTIVE_APPROVAL("jljdywxccsjzsp", MessageSourceModuleEnum.BUSINESS.getCode(), "现场测试、校准或检定审批"),
+    OUTSOURCE_ASSESS_APPROVAL("jljdywcsjzfbpsb", MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包评审表"),
+    OUTSOURCE_PROTOCOL_APPROVAL("jljdywcsjzfbxys", MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包协议书"),
 
 
     /*******************************************设备与装置*********************************************/
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/GeneralApprovalMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/GeneralApprovalMapper.java
index 4fb7344..0c9d6ae 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/GeneralApprovalMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/GeneralApprovalMapper.java
@@ -17,8 +17,4 @@
 
     Page<O> selectBatchForApprovalList(Page<O> page, @Param("request") R request, @Param("businessKeys") List<String> businessKeys);
 
-//    Page<O> selectListPage(Page<O> page, @Param("request") R request);
-
-//    Long selectMaxNo();
-
 }
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceAssessMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceAssessMapper.java
index 7867bb8..ba59009 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceAssessMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceAssessMapper.java
@@ -1,7 +1,12 @@
 package com.casic.missiles.mapper.business;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.business.outsource.OutsourceAssessApprovalListRequest;
+import com.casic.missiles.mapper.GeneralApprovalMapper;
 import com.casic.missiles.model.business.BizBusinessOutsourceAssess;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * <p>
@@ -11,6 +16,10 @@
  * @author wangpeng
  * @since 2023-08-16
  */
-public interface BizBusinessOutsourceAssessMapper extends BaseMapper<BizBusinessOutsourceAssess> {
+public interface BizBusinessOutsourceAssessMapper extends GeneralApprovalMapper<BizBusinessOutsourceAssess, BizBusinessOutsourceAssess, OutsourceAssessApprovalListRequest> {
+
+    Page<BizBusinessOutsourceAssess> selectBatchForApprovalList(Page<BizBusinessOutsourceAssess> page, @Param("request") OutsourceAssessApprovalListRequest request, @Param("businessKeys") List<String> businessKeys);
+
+    Long selectMaxProjectNo();
 
 }
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceProtocolMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceProtocolMapper.java
new file mode 100644
index 0000000..e6aba35
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceProtocolMapper.java
@@ -0,0 +1,24 @@
+package com.casic.missiles.mapper.business;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.business.outsource.OutsourceProtocolApprovalListRequest;
+import com.casic.missiles.mapper.GeneralApprovalMapper;
+import com.casic.missiles.model.business.BizBusinessOutsourceProtocol;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 计量检定业务-分包管理-测试、校准或检定工作分包协议书 Mapper 接口
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-08-24
+ */
+public interface BizBusinessOutsourceProtocolMapper extends GeneralApprovalMapper<BizBusinessOutsourceProtocol, BizBusinessOutsourceProtocol, OutsourceProtocolApprovalListRequest> {
+
+    Page<BizBusinessOutsourceProtocol> selectBatchForApprovalList(Page<BizBusinessOutsourceProtocol> page, @Param("request") OutsourceProtocolApprovalListRequest request, @Param("businessKeys") List<String> businessKeys);
+
+    Long selectMaxProtocolNo();
+}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/EnvLocationInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/EnvLocationInfoMapper.java
new file mode 100644
index 0000000..49eff87
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/EnvLocationInfoMapper.java
@@ -0,0 +1,21 @@
+package com.casic.missiles.mapper.resource;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.resource.environment.LocationListRequest;
+import com.casic.missiles.dto.resource.environment.LocationListResponse;
+import com.casic.missiles.model.resource.EnvLocationInfo;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * <p>
+ * 实验室环境监控系统-设备表 Mapper 接口
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-06-07
+ */
+public interface EnvLocationInfoMapper extends BaseMapper<EnvLocationInfo> {
+
+    Page<LocationListResponse> selectLocationListPage(Page<LocationListResponse> page, @Param("request") LocationListRequest request);
+}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java
index de124db..85ed0f7 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java
@@ -1,7 +1,9 @@
 package com.casic.missiles.mapper.system;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.dto.system.SignDetailResponse;
+import com.casic.missiles.dto.system.SignListRequest;
 import com.casic.missiles.model.system.SystemSign;
 import org.apache.ibatis.annotations.Param;
 
@@ -22,4 +24,8 @@
     SignDetailResponse selectSignDetailById(Long id);
 
     List<SystemSign> selectUsableSignList(@Param("userId") Long userId);
+
+    Page<SystemSign> selectSignListPage(Page<SystemSign> page, @Param("request") SignListRequest request);
+
+    List<SystemSign> selectSignList(@Param("request") SignListRequest request);
 }
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateChangeApplyMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateChangeApplyMapper.xml
index d798447..c496092 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateChangeApplyMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateChangeApplyMapper.xml
@@ -30,31 +30,31 @@
         SELECT *
         FROM biz_business_certificate_change_apply
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.changeApplyNo != null and request.changeApplyNo !=''">
+        <if test="request != null and request.changeApplyNo != null and request.changeApplyNo !=''">
             and change_apply_no like concat('%',#{request.changeApplyNo},'%')
         </if>
-        <if test="request.changeReportNo != null and request.changeReportNo !=''">
+        <if test="request != null and request.changeReportNo != null and request.changeReportNo !=''">
             and change_report_no like concat('%',#{request.changeReportNo},'%')
         </if>
-        <if test="request.changeReportName != null and request.changeReportName !=''">
+        <if test="request != null and request.changeReportName != null and request.changeReportName !=''">
             and change_report_name like concat('%',#{request.changeReportName},'%')
         </if>
-        <if test="request.changeType != null and request.changeType !=''">
+        <if test="request != null and request.changeType != null and request.changeType !=''">
             and change_type = #{request.changeType}
         </if>
-        <if test="request.createUserName != null and request.createUserName !=''">
+        <if test="request != null and request.createUserName != null and request.createUserName !=''">
             and create_user_name like concat('%',#{request.createUserName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificatePrintMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificatePrintMapper.xml
index b66cd99..49c0ac8 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificatePrintMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificatePrintMapper.xml
@@ -31,34 +31,34 @@
         LEFT JOIN biz_business_order_sample_relation bosr ON (bosr.order_id = bcr.order_id AND bosr.sample_id = bcr.sample_id)
         LEFT JOIN biz_business_order_info boi ON boi.id = bosr.order_id
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and bcp.approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.printStatus != null and request.printStatus !=''">
+        <if test="request != null and request.printStatus != null and request.printStatus !=''">
             and print_status = #{request.printStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and bcp.create_user_id = #{request.createUserId}
         </if>
-        <if test="request.certificateReportNo != null and request.certificateReportNo !=''">
+        <if test="request != null and request.certificateReportNo != null and request.certificateReportNo !=''">
             and bcr.certificate_report_no like concat('%',#{request.certificateReportNo},'%')
         </if>
-        <if test="request.certificateReportName != null and request.certificateReportName !=''">
+        <if test="request != null and request.certificateReportName != null and request.certificateReportName !=''">
             and bcr.certificate_report_name like concat('%',#{request.certificateReportName},'%')
         </if>
-        <if test="request.customerName != null and request.customerName !=''">
+        <if test="request != null and request.customerName != null and request.customerName !=''">
             and boi.customer_name like concat('%',#{request.customerName},'%')
         </if>
-        <if test="request.sampleNo != null and request.sampleNo !=''">
+        <if test="request != null and request.sampleNo != null and request.sampleNo !=''">
             and bosr.sample_no like concat('%',#{request.sampleNo},'%')
         </if>
-        <if test="request.sampleName != null and request.sampleName !=''">
+        <if test="request != null and request.sampleName != null and request.sampleName !=''">
             and bosr.sample_name like concat('%',#{request.sampleName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and bcp.create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and bcp.create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml
index b366034..767695d 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml
@@ -46,33 +46,37 @@
         SELECT bcr.*, bosr.sample_no, bosr.sample_name, bosr.sample_model, rsi.staff_name
         FROM biz_business_certificate_report bcr
         LEFT JOIN biz_business_order_sample_relation bosr ON (bosr.order_id = bcr.order_id AND bosr.sample_id = bcr.sample_id)
+        LEFT JOIN biz_business_order_info boi ON boi.id = bcr.order_id
         LEFT JOIN biz_resource_staff_info rsi ON rsi.id = bcr.measure_person_id
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and bcr.approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and bcr.create_user_id = #{request.createUserId}
         </if>
-        <if test="request.certificateReportNo != null and request.certificateReportNo !=''">
+        <if test="request != null and request.customerId != null and request.customerId !=''">
+            and boi.customer_id = #{request.customerId}
+        </if>
+        <if test="request != null and request.certificateReportNo != null and request.certificateReportNo !=''">
             and bcr.certificate_report_no like concat('%',#{request.certificateReportNo},'%')
         </if>
-        <if test="request.certificateReportName != null and request.certificateReportName !=''">
+        <if test="request != null and request.certificateReportName != null and request.certificateReportName !=''">
             and bcr.certificate_report_name like concat('%',#{request.certificateReportName},'%')
         </if>
-        <if test="request.sampleNo != null and request.sampleNo !=''">
+        <if test="request != null and request.sampleNo != null and request.sampleNo !=''">
             and bosr.sample_no like concat('%',#{request.sampleNo},'%')
         </if>
-        <if test="request.measureCategory != null and request.measureCategory !=''">
+        <if test="request != null and request.measureCategory != null and request.measureCategory !=''">
             and bcr.measure_category = #{request.measureCategory}
         </if>
-        <if test="request.measurePerson != null and request.measurePerson !=''">
+        <if test="request != null and request.measurePerson != null and request.measurePerson !=''">
             and rsi.staff_name like concat('%',#{request.measurePerson},'%')
         </if>
-        <if test="request.calibrationTimeStart != null and request.calibrationTimeStart !=''">
+        <if test="request != null and request.calibrationTimeStart != null and request.calibrationTimeStart !=''">
             and bcr.calibration_time &gt;= #{request.calibrationTimeStart}
         </if>
-        <if test="request.calibrationTimeEnd != null and request.calibrationTimeEnd !=''">
+        <if test="request != null and request.calibrationTimeEnd != null and request.calibrationTimeEnd !=''">
             and bcr.calibration_time &lt;= #{request.calibrationTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceAssessMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceAssessMapper.xml
index d0fcf8b..c22c101 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceAssessMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceAssessMapper.xml
@@ -7,6 +7,8 @@
         <id column="id" property="id" />
         <result column="project_no" property="projectNo" />
         <result column="project_name" property="projectName" />
+        <result column="lab_code" property="labCode" />
+        <result column="group_code" property="groupCode" />
         <result column="applicant_id" property="applicantId" />
         <result column="applicant_name" property="applicantName" />
         <result column="applicant_time" property="applicantTime" />
@@ -31,7 +33,45 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, project_no, project_name, applicant_id, applicant_name, applicant_time, minio_file_name, remark, create_user_id, create_user_name, outsourcer_id, pre_start_time, pre_end_time, outsource_reason, pre_cost, approval_status, process_id, approve_situation, traceability, test_method, technique_ability, create_time, update_time
+        id, project_no, project_name, lab_code, group_code, applicant_id, applicant_name, applicant_time, minio_file_name, remark, create_user_id, create_user_name, outsourcer_id, pre_start_time, pre_end_time, outsource_reason, pre_cost, approval_status, process_id, approve_situation, traceability, test_method, technique_ability, create_time, update_time
     </sql>
 
+    <select id="selectMaxProjectNo" resultType="java.lang.Long">
+        SELECT IFNULL(max(RIGHT(project_no, 3)), 0) from biz_business_outsource_assess
+    </select>
+
+    <select id="selectBatchForApprovalList" resultMap="BaseResultMap">
+        SELECT bboa.*, bboi.outsourcer_name, bboi.director
+        FROM biz_business_outsource_assess bboa
+        LEFT JOIN biz_business_outsourcer_info bboi ON bboa.outsourcer_id = bboi.id
+        WHERE 1=1
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
+            and bboa.approval_status = #{request.approvalStatus}
+        </if>
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
+            and bboa.create_user_id = #{request.createUserId}
+        </if>
+        <if test="request != null and request.projectNo != null and request.projectNo !=''">
+            and bboa.project_no like concat('%',#{request.projectNo},'%')
+        </if>
+        <if test="request != null and request.outsourcerName != null and request.outsourcerName !=''">
+            and bboi.outsourcer_name like concat('%',#{request.outsourcerName},'%')
+        </if>
+        <if test="request != null and request.applicantName != null and request.applicantName !=''">
+            and bboa.applicant_name like concat('%',#{request.applicantName},'%')
+        </if>
+        <if test="request != null and request.applicantTimeStart != null and request.applicantTimeStart !=''">
+            and bboa.applicant_time &gt;= #{request.applicantTimeStart}
+        </if>
+        <if test="request != null and request.applicantTimeEnd != null and request.applicantTimeEnd !=''">
+            and bboa.applicant_time &lt;= #{request.applicantTimeEnd}
+        </if>
+        <if test="businessKeys != null">
+            and bboa.id in
+            <foreach collection="businessKeys" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
+        ORDER BY bboa.create_time DESC
+    </select>
 </mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceProtocolMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceProtocolMapper.xml
new file mode 100644
index 0000000..b7b2149
--- /dev/null
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceProtocolMapper.xml
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.mapper.business.BizBusinessOutsourceProtocolMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.business.BizBusinessOutsourceProtocol">
+        <id column="id" property="id" />
+        <result column="protocol_no" property="protocolNo" />
+        <result column="project_name" property="projectName" />
+        <result column="lab_code" property="labCode" />
+        <result column="group_code" property="groupCode" />
+        <result column="outsourcer_id" property="outsourcerId" />
+        <result column="remark" property="remark" />
+        <result column="outsource_no" property="outsourceNo" />
+        <result column="outsource_name" property="outsourceName" />
+        <result column="contacts" property="contacts" />
+        <result column="mobile" property="mobile" />
+        <result column="address" property="address" />
+        <result column="require_date" property="requireDate" />
+        <result column="outsource_cost" property="outsourceCost" />
+        <result column="director" property="director" />
+        <result column="item" property="item" />
+        <result column="requires" property="requires" />
+        <result column="create_user_id" property="createUserId" />
+        <result column="create_user_name" property="createUserName" />
+        <result column="approval_status" property="approvalStatus" />
+        <result column="process_id" property="processId" />
+        <result column="create_time" property="createTime" />
+        <result column="update_time" property="updateTime" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, protocol_no, project_name, lab_code, group_code, outsourcer_id, remark, outsource_no, outsource_name, contacts, mobile, address, require_date, outsource_cost, director, item, requires, create_user_id, create_user_name, approval_status, process_id, create_time, update_time
+    </sql>
+
+    <select id="selectMaxProtocolNo" resultType="java.lang.Long">
+        SELECT IFNULL(max(RIGHT(protocol_no, 3)), 0) from biz_business_outsource_protocol
+    </select>
+
+    <select id="selectBatchForApprovalList" resultMap="BaseResultMap">
+        SELECT *
+        FROM biz_business_outsource_protocol
+        WHERE 1=1
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
+            and approval_status = #{request.approvalStatus}
+        </if>
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
+            and create_user_id = #{request.createUserId}
+        </if>
+        <if test="request != null and request.protocolNo != null and request.protocolNo !=''">
+            and protocol_no like concat('%',#{request.protocolNo},'%')
+        </if>
+        <if test="request != null and request.outsourcerName != null and request.outsourcerName !=''">
+            and outsourcer_name like concat('%',#{request.outsourcerName},'%')
+        </if>
+        <if test="request != null and request.applicantName != null and request.applicantName !=''">
+            and create_user_name like concat('%',#{request.applicantName},'%')
+        </if>
+        <if test="request != null and request.applicantTimeStart != null and request.applicantTimeStart !=''">
+            and create_time &gt;= #{request.applicantTimeStart}
+        </if>
+        <if test="request != null and request.applicantTimeEnd != null and request.applicantTimeEnd !=''">
+            and create_time &lt;= #{request.applicantTimeEnd}
+        </if>
+        <if test="businessKeys != null">
+            and id in
+            <foreach collection="businessKeys" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
+        ORDER BY create_time DESC
+    </select>
+</mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourcerInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourcerInfoMapper.xml
index 510a80b..3049b54 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourcerInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourcerInfoMapper.xml
@@ -7,6 +7,8 @@
         <id column="id" property="id" />
         <result column="outsourcer_no" property="outsourcerNo" />
         <result column="outsourcer_name" property="outsourcerName" />
+        <result column="lab_code" property="labCode" />
+        <result column="group_code" property="groupCode" />
         <result column="outsourcer_brief_name" property="outsourcerBriefName" />
         <result column="outsourcer_size" property="outsourcerSize" />
         <result column="business_size" property="businessSize" />
@@ -55,32 +57,32 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, outsourcer_no, outsourcer_name, outsourcer_brief_name, outsourcer_size, business_size, grade, evaluation, tax_number, bank_account, bank_name, bank_account_number, postal_code, director, phone, fax, mobile, email, website, address_country, address_province, address_city, address_area, full_address, address_country_name, address_province_name, address_city_name, address_area_name, invoice_country, invoice_province, invoice_city, invoice_area, invoice_full_address, invoice_country_name, invoice_province_name, invoice_city_name, invoice_area_name, business_scope, business_content, minio_file_name, approval_status, process_id, remark, create_user_id, create_user_name, create_time, update_time
+        id, outsourcer_no, outsourcer_name, lab_code, group_code, outsourcer_brief_name, outsourcer_size, business_size, grade, evaluation, tax_number, bank_account, bank_name, bank_account_number, postal_code, director, phone, fax, mobile, email, website, address_country, address_province, address_city, address_area, full_address, address_country_name, address_province_name, address_city_name, address_area_name, invoice_country, invoice_province, invoice_city, invoice_area, invoice_full_address, invoice_country_name, invoice_province_name, invoice_city_name, invoice_area_name, business_scope, business_content, minio_file_name, approval_status, process_id, remark, create_user_id, create_user_name, create_time, update_time
     </sql>
 
     <select id="selectBatchForApprovalList" resultMap="BaseResultMap">
         SELECT *
         FROM biz_business_outsourcer_info
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.outsourcerNo != null and request.outsourcerNo !=''">
+        <if test="request != null and request.outsourcerNo != null and request.outsourcerNo !=''">
             and outsourcer_no like concat('%',#{request.outsourcerNo},'%')
         </if>
-        <if test="request.outsourcerName != null and request.outsourcerName !=''">
+        <if test="request != null and request.outsourcerName != null and request.outsourcerName !=''">
             and outsourcer_name like concat('%',#{request.outsourcerName},'%')
         </if>
-        <if test="request.director != null and request.director !=''">
+        <if test="request != null and request.director != null and request.director !=''">
             and director like concat('%',#{request.director},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
@@ -93,6 +95,6 @@
     </select>
 
     <select id="selectMaxNo" resultType="java.lang.Long">
-        SELECT IFNULL(max(RIGHT(outsourcer_no, 12)), 0) from biz_business_outsourcer_info
+        SELECT IFNULL(max(RIGHT(outsourcer_no, 3)), 0) from biz_business_outsourcer_info
     </select>
 </mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessSiteExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessSiteExecutiveInfoMapper.xml
index 135c5d0..3c5ae79 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessSiteExecutiveInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessSiteExecutiveInfoMapper.xml
@@ -38,25 +38,25 @@
         FROM biz_business_site_executive_info bsei
         LEFT JOIN biz_resource_customer_info rci ON bsei.customer_id = rci.id
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and bsei.approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and bsei.create_user_id = #{request.createUserId}
         </if>
-        <if test="request.siteExecutiveNo != null and request.siteExecutiveNo !=''">
+        <if test="request != null and request.siteExecutiveNo != null and request.siteExecutiveNo !=''">
             and bsei.site_executive_no like concat('%',#{request.siteExecutiveNo},'%')
         </if>
-        <if test="request.customerName != null and request.customerName !=''">
+        <if test="request != null and request.customerName != null and request.customerName !=''">
             and rci.outsourcer_name like concat('%',#{request.customerName},'%')
         </if>
-        <if test="request.applyName != null and request.applyName !=''">
+        <if test="request != null and request.applyName != null and request.applyName !=''">
             and bsei.apply_name like concat('%',#{request.applyName},'%')
         </if>
-        <if test="request.applyTimeStart != null and request.applyTimeStart !=''">
+        <if test="request != null and request.applyTimeStart != null and request.applyTimeStart !=''">
             and bsei.apply_time &gt;= #{request.applyTimeStart}
         </if>
-        <if test="request.applyTimeEnd != null and request.applyTimeEnd !=''">
+        <if test="request != null and request.applyTimeEnd != null and request.applyTimeEnd !=''">
             and bsei.apply_time &lt;= #{request.applyTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml
index 84d9e2a..6bd38a9 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml
@@ -105,6 +105,12 @@
         <if test="request.isUrgent != null and request.isUrgent !=''">
             AND bo.is_urgent = #{request.isUrgent}
         </if>
+        <if test="request.ids != null">
+            and blei.id in
+            <foreach collection="request.ids" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
         ORDER BY blei.update_time DESC
     </select>
 
@@ -137,6 +143,12 @@
         <if test="request.isUrgent != null and request.isUrgent !=''">
             AND bo.is_urgent = #{request.isUrgent}
         </if>
+        <if test="request.ids != null">
+            and blei.id in
+            <foreach collection="request.ids" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
         ORDER BY blei.update_time DESC
     </select>
 
diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardInfoMapper.xml
index 1a5551b..2ed8d17 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardInfoMapper.xml
@@ -45,12 +45,6 @@
         FROM biz_equipment_standard_info besi
         LEFT JOIN biz_equipment_standard_technology_relation bestr ON besi.standard_no = bestr.standard_no
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
-            and besi.approval_status = #{request.approvalStatus}
-        </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
-            and besi.create_user_id = #{request.createUserId}
-        </if>
         <if test="request.standardName != null and request.standardName !=''">
             and besi.standard_name like concat('%',#{request.standardName},'%')
         </if>
diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardTechnologyRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardTechnologyRelationMapper.xml
index fc7e16c..cd03c8c 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardTechnologyRelationMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardTechnologyRelationMapper.xml
@@ -6,6 +6,7 @@
     <resultMap id="BaseResultMap" type="com.casic.missiles.model.equipment.BizEquipmentStandardTechnologyRelation">
         <id column="id" property="id" />
         <result column="technology_file_id" property="technologyFileId" />
+        <result column="technology_file_no" property="technologyFileNo" />
         <result column="technology_file_name" property="technologyFileName" />
         <result column="standard_id" property="standardId" />
         <result column="standard_no" property="standardNo" />
@@ -14,7 +15,7 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, technology_file_id, technology_file_name, standard_id, remark
+        id, technology_file_id, technology_file_no, technology_file_name, standard_id, remark
     </sql>
 
 </mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceAuthorizeOrderMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceAuthorizeOrderMapper.xml
index ac5176c..554fe65 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceAuthorizeOrderMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceAuthorizeOrderMapper.xml
@@ -32,22 +32,22 @@
         SELECT *
         FROM biz_resource_authorize_order
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.orderNo != null and request.orderNo !=''">
+        <if test="request != null and request.orderNo != null and request.orderNo !=''">
             and order_no like concat('%',#{request.orderNo},'%')
         </if>
-        <if test="request.createUserName != null and request.createUserName !=''">
+        <if test="request != null and request.createUserName != null and request.createUserName !=''">
             and create_user_name like concat('%',#{request.createUserName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerExamineFormMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerExamineFormMapper.xml
index ab242f6..af7f98f 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerExamineFormMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerExamineFormMapper.xml
@@ -41,28 +41,28 @@
         SELECT *
         FROM biz_resource_customer_examine_form
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.formNo != null and request.formNo !=''">
+        <if test="request != null and request.formNo != null and request.formNo !=''">
             and form_no like concat('%',#{request.formNo},'%')
         </if>
-        <if test="request.labCode != null and request.labCode !=''">
+        <if test="request != null and request.labCode != null and request.labCode !=''">
             and lab_code like concat('%',#{request.labCode},'%')
         </if>
-        <if test="request.groupCode != null and request.groupCode !=''">
+        <if test="request != null and request.groupCode != null and request.groupCode !=''">
             and group_code like concat('%',#{request.groupCode},'%')
         </if>
-        <if test="request.createUserName != null and request.createUserName !=''">
+        <if test="request != null and request.createUserName != null and request.createUserName !=''">
             and create_user_name like concat('%',#{request.createUserName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerInfoMapper.xml
index fa8ffbc..06a2798 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerInfoMapper.xml
@@ -33,25 +33,25 @@
         SELECT *
         FROM biz_resource_customer_info
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.customerNo != null and request.customerNo !=''">
+        <if test="request != null and request.customerNo != null and request.customerNo !=''">
             and customer_no like concat('%',#{request.customerNo},'%')
         </if>
-        <if test="request.customerName != null and request.customerName !=''">
+        <if test="request != null and request.customerName != null and request.customerName !=''">
             and customer_name like concat('%',#{request.customerName},'%')
         </if>
-        <if test="request.contacts != null and request.contacts !=''">
+        <if test="request != null and request.contacts != null and request.contacts !=''">
             and contacts like concat('%',#{request.contacts},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerSuggestFormMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerSuggestFormMapper.xml
index 28f5bb2..1806662 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerSuggestFormMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerSuggestFormMapper.xml
@@ -33,28 +33,28 @@
         SELECT *
         FROM biz_resource_customer_suggest_form
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.formNo != null and request.formNo !=''">
+        <if test="request != null and request.formNo != null and request.formNo !=''">
             and form_no like concat('%',#{request.formNo},'%')
         </if>
-        <if test="request.customerName != null and request.customerName !=''">
+        <if test="request != null and request.customerName != null and request.customerName !=''">
             and customer_name like concat('%',#{request.customerName},'%')
         </if>
-        <if test="request.customerDeptName != null and request.customerDeptName !=''">
+        <if test="request != null and request.customerDeptName != null and request.customerDeptName !=''">
             and customer_dept_name like concat('%',#{request.customerDeptName},'%')
         </if>
-        <if test="request.createUserName != null and request.createUserName !=''">
+        <if test="request != null and request.createUserName != null and request.createUserName !=''">
             and create_user_name like concat('%',#{request.createUserName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSealUseNoteMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSealUseNoteMapper.xml
index ab37bc1..b02bb33 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSealUseNoteMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSealUseNoteMapper.xml
@@ -29,32 +29,32 @@
     </sql>
 
     <select id="selectBatchForApprovalList" resultMap="BaseResultMap">
-        SELECT *
+        SELECT brsun.*, brsi.seal_name, brsi.seal_type, brsi.approver_name
         FROM biz_resource_seal_use_note brsun
         JOIN biz_resource_seal_info brsi ON brsun.seal_id = brsi.id
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and brsun.approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and brsun.create_user_id = #{request.createUserId}
         </if>
-        <if test="request.sealName != null and request.sealName !=''">
+        <if test="request != null and request.sealName != null and request.sealName !=''">
             and brsi.seal_name like concat('%',#{request.sealName},'%')
         </if>
-        <if test="request.sealType != null and request.sealType !=''">
+        <if test="request != null and request.sealType != null and request.sealType !=''">
             and brsi.seal_type = #{request.sealType}
         </if>
-        <if test="request.applyDeptName != null and request.applyDeptName !=''">
+        <if test="request != null and request.applyDeptName != null and request.applyDeptName !=''">
             and brsun.apply_dept_name like concat('%',#{request.applyDeptName},'%')
         </if>
-        <if test="request.applyUserName != null and request.applyUserName !=''">
+        <if test="request != null and request.applyUserName != null and request.applyUserName !=''">
             and brsun.apply_user_name like concat('%',#{request.applyUserName},'%')
         </if>
-        <if test="request.applyTimeStart != null and request.applyTimeStart !=''">
+        <if test="request != null and request.applyTimeStart != null and request.applyTimeStart !=''">
             and brsun.apply_time &gt;= #{request.applyTimeStart}
         </if>
-        <if test="request.applyTimeEnd != null and request.applyTimeEnd !=''">
+        <if test="request != null and request.applyTimeEnd != null and request.applyTimeEnd !=''">
             and brsun.apply_time &lt;= #{request.applyTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml
index 119bf7d..4f8392a 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml
@@ -31,6 +31,12 @@
         <if test="request.deptName != null and request.deptName !=''">
             and brsi.dept_name like concat('%',#{request.deptName},'%')
         </if>
+        <if test="request.ids != null">
+            and brsv.id in
+            <foreach collection="request.ids" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
         ORDER BY brsv.grant_date DESC
     </select>
 
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSupplierInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSupplierInfoMapper.xml
index fe8d399..e8ce7ef 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSupplierInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSupplierInfoMapper.xml
@@ -48,28 +48,28 @@
         SELECT *
         FROM biz_resource_supplier_info
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.supplierNo != null and request.supplierNo !=''">
+        <if test="request != null and request.supplierNo != null and request.supplierNo !=''">
             and supplier_no like concat('%',#{request.supplierNo},'%')
         </if>
-        <if test="request.supplierName != null and request.supplierName !=''">
+        <if test="request != null and request.supplierName != null and request.supplierName !=''">
             and supplier_name like concat('%',#{request.supplierName},'%')
         </if>
-        <if test="request.director != null and request.director !=''">
+        <if test="request != null and request.director != null and request.director !=''">
             and director like concat('%',#{request.director},'%')
         </if>
-        <if test="request.supplierType != null and request.supplierType !=''">
+        <if test="request != null and request.supplierType != null and request.supplierType !=''">
             and supplier_type = #{request.supplierType}
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/EnvLocationInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/EnvLocationInfoMapper.xml
new file mode 100644
index 0000000..68bcf10
--- /dev/null
+++ b/casic-metering-dao/src/main/resources/mapper/resource/EnvLocationInfoMapper.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.mapper.resource.EnvLocationInfoMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.resource.EnvLocationInfo">
+        <id column="id" property="id" />
+        <result column="location_no" property="locationNo" />
+        <result column="location_name" property="locationName" />
+        <result column="location_position" property="locationPosition" />
+        <result column="create_user_id" property="createUserId" />
+        <result column="create_user" property="createUser" />
+        <result column="create_time" property="createTime" />
+        <result column="update_time" property="updateTime" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, location_no, location_name, location_position, create_user_id, create_user, create_time, update_time
+    </sql>
+
+    <select id="selectLocationListPage" resultType="com.casic.missiles.dto.resource.environment.LocationListResponse">
+        SELECT *
+        FROM env_location_info
+        WHERE 1=1
+        <if test="request.locationNo != null and request.locationNo !=''">
+            AND location_no LIKE concat('%',#{request.locationNo},'%')
+        </if>
+        <if test="request.locationName != null and request.locationName !=''">
+            AND location_name LIKE concat('%',#{request.locationName},'%')
+        </if>
+        ORDER BY create_time DESC
+    </select>
+
+</mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml
index b28c18f..8854047 100644
--- a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml
@@ -11,7 +11,6 @@
         <result column="sign_desc" property="signDesc" />
         <result column="sign_director" property="signDirector" />
         <result column="sign_user_id" property="signUserId" />
-        <result column="sign_type" property="signType" />
         <result column="minio_file_name" property="minioFileName" />
         <result column="create_time" property="createTime" />
         <result column="update_time" property="updateTime" />
@@ -28,7 +27,6 @@
         <result column="sign_name" property="signName" />
         <result column="sign_desc" property="signDesc" />
         <result column="sign_director" property="signDirector" />
-        <result column="sign_type" property="signType" />
         <result column="sign_user_id" property="signUserId" />
         <result column="minio_file_name" property="minioFileName" />
         <result column="create_time" property="createTime" />
@@ -62,4 +60,58 @@
         JOIN system_sign_user_relation ssur ON ss.id = ssur.sign_id
         WHERE ssur.user_id = #{userId}
     </select>
+
+    <select id="selectSignListPage" resultMap="BaseResultMap">
+        SELECT ss.*, sd.SIMPLE_NAME AS deptName
+        FROM system_sign ss
+        LEFT JOIN sys_user su ON su.id = ss.sign_user_id
+        LEFT JOIN sys_dept sd ON sd.id = su.dept_id
+        WHERE 1=1
+        <if test="request.signNo != null and request.signNo !=''">
+            AND ss.sign_no LIKE concat('%',#{request.signNo},'%')
+        </if>
+        <if test="request.signName != null and request.signName !=''">
+            AND ss.sign_name LIKE concat('%',#{request.signName},'%')
+        </if>
+        <if test="request.signDirector != null and request.signDirector !=''">
+            AND ss.sign_director LIKE concat('%',#{request.signDirector},'%')
+        </if>
+        <if test="request.signUserId != null and request.signUserId !=''">
+            AND ss.sign_user_id = #{request.signUserId}
+        </if>
+        <if test="request.createStartTime != null and request.createStartTime !=''">
+            AND DATE_FORMAT(ss.create_time,'%Y-%m-%d') &gt;= DATE_FORMAT(#{request.createStartTime},'%Y-%m-%d')
+        </if>
+        <if test="request.createEndTime != null and request.createEndTime !=''">
+            AND DATE_FORMAT(ss.create_time,'%Y-%m-%d')  &lt;= DATE_FORMAT(#{request.createEndTime},'%Y-%m-%d')
+        </if>
+        ORDER BY ss.create_time DESC
+    </select>
+
+    <select id="selectSignList" resultMap="BaseResultMap">
+        SELECT ss.*, sd.SIMPLE_NAME AS deptName
+        FROM system_sign ss
+        LEFT JOIN sys_user su ON su.id = ss.sign_user_id
+        LEFT JOIN sys_dept sd ON sd.id = su.dept_id
+        WHERE 1=1
+        <if test="request.signNo != null and request.signNo !=''">
+            AND ss.sign_no LIKE concat('%',#{request.signNo},'%')
+        </if>
+        <if test="request.signName != null and request.signName !=''">
+            AND ss.sign_name LIKE concat('%',#{request.signName},'%')
+        </if>
+        <if test="request.signDirector != null and request.signDirector !=''">
+            AND ss.sign_director LIKE concat('%',#{request.signDirector},'%')
+        </if>
+        <if test="request.signUserId != null and request.signUserId !=''">
+            AND ss.sign_user_id = #{request.signUserId}
+        </if>
+        <if test="request.createStartTime != null and request.createStartTime !=''">
+            AND DATE_FORMAT(ss.create_time,'%Y-%m-%d') &gt;= DATE_FORMAT(#{request.createStartTime},'%Y-%m-%d')
+        </if>
+        <if test="request.createEndTime != null and request.createEndTime !=''">
+            AND DATE_FORMAT(ss.create_time,'%Y-%m-%d')  &lt;= DATE_FORMAT(#{request.createEndTime},'%Y-%m-%d')
+        </if>
+        ORDER BY ss.create_time DESC
+    </select>
 </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 515050a..60f530b 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
@@ -47,8 +47,8 @@
     String STORAGE_LOCATION = "bizStorageLocation";
     //计量专业
     String MEASURE_MAJOR = "bizMeasureMajor";
-    //管理状态
-    String MANAGER_STATE = "bizManagerState";
+    //标准装置管理状态
+    String STANDARD_MANAGER_STATE = "bizStandardManagerState";
 
     /**
      * 资源管理 字典code
@@ -95,8 +95,6 @@
     String MEASURE_STATUS = "measureStatus";
     //检定方式
     String MEASURE_TYPE = "measureType";
-    //标识打印标志类型
-    String IDENTIFY_PRINT_TYPE = "bizBusinessIdentify";
     //变更类型
     String REPORT_CHANGE_TYPE = "bizCertChangeType";
     //规模类型
@@ -111,19 +109,24 @@
     String MEASURE_CATEGORY = "measureCategory";
     //检定结果
     String MEASURE_RESULT = "measureResult";
+    //分包原因
+    String OUTSOURCE_REASON = "outsourceReason";
+
+    /**
+     * 系统管理
+     */
+    String TEMPLATE_TYPE = "templateType";
+
 
     /**
      * 标准装置 字典code
      */
     //类别
     String STANDARD_CATEGORY = "standardCategory";
-    //管理状态
-    String STANDARD_MANAGER_STATE = "standardManagerState";
     //标准等级
     String STANDARD_LEVEL = "standardLevel";
     //传递范围
     String STANDARD_TRANSMIT_RANGE = "transmitRange";
-
     //资本来源
     String CAPITAL_SOURCE = "capitalSource";
     //标准装置-申请类型
@@ -148,8 +151,6 @@
     String CERTIFICATE_CLASS = "certificationClass";
     //证书管理-检校专业
     String CALIBRATION_MAJOR = "calibrationMajor";
-    //分包原因
-    String OUTSOURCE_REASON = "outsourceReason";
 
     /**
      * 工作台
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/BaseApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/BaseApprovalListRequest.java
index 73c12c1..80d7424 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/BaseApprovalListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/BaseApprovalListRequest.java
@@ -6,6 +6,7 @@
 
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotEmpty;
+import java.util.List;
 
 /**
  * @Description:
@@ -19,14 +20,14 @@
      * 表单id
      */
     @NotBlank(message = "表单id不能为空")
-    @ApiModelProperty(value = "表单id（流程定义对应的表单id，等价于业务id）", dataType = "String")
+    @ApiModelProperty(value = "表单id（流程定义对应的表单id，等价于业务id），导出接口不用传", dataType = "String")
     private String formId;
 
     /**
      * 审批状态类型，对应ApprovalStatusEnum
      */
     @NotEmpty(message = "审批状态类型不能为空")
-    @ApiModelProperty(value = "审批状态类型code", dataType = "String")
+    @ApiModelProperty(value = "审批状态类型code，导出接口不用传", dataType = "String")
     private String approvalStatus;
 
     @ApiModelProperty(hidden = true)
@@ -34,4 +35,7 @@
 
     @ApiModelProperty(hidden = true)
     private Long createUserId;
+
+    @ApiModelProperty(value = "导出ids", dataType = "List")
+    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificatePrintApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificatePrintApprovalListRequest.java
index b93d1c9..3cc2f4e 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificatePrintApprovalListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificatePrintApprovalListRequest.java
@@ -5,8 +5,6 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import java.util.List;
-
 /**
  * @Description:
  * @Author: wangpeng
@@ -38,7 +36,4 @@
 
     @ApiModelProperty(value = "创建结束时间", dataType = "String")
     private String createTimeEnd;
-
-    @ApiModelProperty(value = "导出ids", dataType = "List")
-    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportApprovalListRequest.java
index 4f7a038..c115847 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportApprovalListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportApprovalListRequest.java
@@ -5,8 +5,6 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import java.util.List;
-
 /**
  * @Description:
  * @Author: wangpeng
@@ -15,6 +13,8 @@
 @ApiModel
 @Data
 public class CertificateReportApprovalListRequest extends BaseApprovalListRequest {
+    @ApiModelProperty(value = "委托方id", dataType = "String")
+    private Long customerId;
 
     @ApiModelProperty(value = "证书报告编号", dataType = "String")
     private String certificateReportNo;
@@ -37,6 +37,4 @@
     @ApiModelProperty(value = "检校结束时间", dataType = "String")
     private String calibrationTimeEnd;
 
-    @ApiModelProperty(value = "导出ids", dataType = "List")
-    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/identify/IdentifyListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/identify/IdentifyListRequest.java
index 1b87ae6..f019203 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/identify/IdentifyListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/identify/IdentifyListRequest.java
@@ -4,6 +4,8 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * @Description:
  * @Author: wangpeng
@@ -26,4 +28,7 @@
 
     @ApiModelProperty(value = "打印结束时间", dataType = "String")
     private String createTimeEnd;
+
+    @ApiModelProperty(value = "导出ids", dataType = "List")
+    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListRequest.java
index 1264883..62415fb 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListRequest.java
@@ -7,6 +7,7 @@
 import lombok.Data;
 
 import javax.validation.constraints.NotBlank;
+import java.util.List;
 
 @Data
 @ApiModel
@@ -37,4 +38,6 @@
     @ApiModelProperty(value = "是否加急（1是0否null全部）", dataType = "Integer")
     private String isUrgent;
 
+    @ApiModelProperty(value = "导出ids", dataType = "List")
+    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListRequest.java
index 5201d7b..499760a 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListRequest.java
@@ -17,6 +17,9 @@
     @ApiModelProperty(value = "任务单编号", dataType = "String")
     private String orderNo;
 
+    @ApiModelProperty(value = "委托方id", dataType = "Long")
+    private Long customerId;
+
     @ApiModelProperty(value = "委托方名称", dataType = "String")
     private String customerName;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OrderSampleDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OrderSampleDTO.java
new file mode 100644
index 0000000..796edc0
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OrderSampleDTO.java
@@ -0,0 +1,19 @@
+package com.casic.missiles.dto.business.outsource;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/8/24 11:38
+ */
+@ApiModel
+@Data
+public class OrderSampleDTO {
+    @ApiModelProperty(value = "任务单id", dataType = "Long")
+    private Long orderId;
+    @ApiModelProperty(value = "受检设备id", dataType = "Long")
+    private Long sampleId;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceAssessApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceAssessApprovalListRequest.java
new file mode 100644
index 0000000..9a930c3
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceAssessApprovalListRequest.java
@@ -0,0 +1,30 @@
+package com.casic.missiles.dto.business.outsource;
+
+import com.casic.missiles.dto.BaseApprovalListRequest;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/8/24 11:01
+ */
+@ApiModel
+@Data
+public class OutsourceAssessApprovalListRequest extends BaseApprovalListRequest {
+    @ApiModelProperty(value = "评审表编号", dataType = "String")
+    private String projectNo;
+
+    @ApiModelProperty(value = "分包机构名称", dataType = "String")
+    private String outsourcerName;
+
+    @ApiModelProperty(value = "申请人", dataType = "String")
+    private String applicantName;
+
+    @ApiModelProperty(value = "申请时间开始", dataType = "String")
+    private String applicantTimeStart;
+
+    @ApiModelProperty(value = "申请时间结束", dataType = "String")
+    private String applicantTimeEnd;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceAssessSaveResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceAssessSaveResponse.java
new file mode 100644
index 0000000..8bf9aad
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceAssessSaveResponse.java
@@ -0,0 +1,20 @@
+package com.casic.missiles.dto.business.outsource;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/8/14 16:17
+ */
+@ApiModel
+@Data
+public class OutsourceAssessSaveResponse {
+    @ApiModelProperty(value = "主键id", dataType = "Long")
+    private Long id;
+
+    @ApiModelProperty(value = "编号", dataType = "String")
+    private String projectNo;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProtocolApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProtocolApprovalListRequest.java
new file mode 100644
index 0000000..0f32331
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProtocolApprovalListRequest.java
@@ -0,0 +1,30 @@
+package com.casic.missiles.dto.business.outsource;
+
+import com.casic.missiles.dto.BaseApprovalListRequest;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/8/24 15:01
+ */
+@ApiModel
+@Data
+public class OutsourceProtocolApprovalListRequest extends BaseApprovalListRequest {
+    @ApiModelProperty(value = "协议书编号", dataType = "String")
+    private String protocolNo;
+
+    @ApiModelProperty(value = "分包方名称", dataType = "String")
+    private String outsourcerName;
+
+    @ApiModelProperty(value = "申请人", dataType = "String")
+    private String applicantName;
+
+    @ApiModelProperty(value = "申请时间开始", dataType = "String")
+    private String applicantTimeStart;
+
+    @ApiModelProperty(value = "申请时间结束", dataType = "String")
+    private String applicantTimeEnd;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProtocolSaveResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProtocolSaveResponse.java
new file mode 100644
index 0000000..e324967
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProtocolSaveResponse.java
@@ -0,0 +1,20 @@
+package com.casic.missiles.dto.business.outsource;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/8/14 16:17
+ */
+@ApiModel
+@Data
+public class OutsourceProtocolSaveResponse {
+    @ApiModelProperty(value = "主键id", dataType = "Long")
+    private Long id;
+
+    @ApiModelProperty(value = "编号", dataType = "String")
+    private String protocolNo;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveApprovalListRequest.java
index f29f4e4..7047c28 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveApprovalListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveApprovalListRequest.java
@@ -5,8 +5,6 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import java.util.List;
-
 /**
  * @Description: 现场检测审批列表请求实体
  * @Author: wangpeng
@@ -30,7 +28,4 @@
     @ApiModelProperty(value = "申请时间结束", dataType = "String")
     private String applyTimeEnd;
 
-    @ApiModelProperty(value = "导出ids", dataType = "List")
-    private List<Long> ids;
-
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveDetailResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveDetailResponse.java
index 1f28752..394c934 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveDetailResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveDetailResponse.java
@@ -12,6 +12,18 @@
     @ApiModelProperty(value = "id，更新/删除使用参数", dataType = "Long")
     private Long id;
 
+    @ApiModelProperty(value = "实验室代码(字典code)", dataType = "String")
+    private String labCode;
+
+    @ApiModelProperty(value = "实验室代码(字典value)", dataType = "String")
+    private String labCodeName;
+
+    @ApiModelProperty(value = "组别代码(字典code)", dataType = "String")
+    private String groupCode;
+
+    @ApiModelProperty(value = "组别代码(字典value)", dataType = "String")
+    private String groupCodeName;
+
     @ApiModelProperty(value = "审批编号", dataType = "String")
     private String siteExecutiveNo;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/environment/LocationListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/environment/LocationListRequest.java
new file mode 100644
index 0000000..13d03c3
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/environment/LocationListRequest.java
@@ -0,0 +1,20 @@
+package com.casic.missiles.dto.resource.environment;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/6/8 13:56
+ */
+@ApiModel
+@Data
+public class LocationListRequest {
+    @ApiModelProperty(value = "地点编号", dataType = "String")
+    private String locationNo;
+
+    @ApiModelProperty(value = "地点名称", dataType = "String")
+    private String locationName;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/environment/LocationListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/environment/LocationListResponse.java
new file mode 100644
index 0000000..4c531af
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/environment/LocationListResponse.java
@@ -0,0 +1,78 @@
+package com.casic.missiles.dto.resource.environment;
+
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
+import com.baomidou.mybatisplus.annotation.TableField;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description: 地点列表响应实体
+ * @Author: wangpeng
+ * @Date: 2023/6/8 13:53
+ */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
+@ApiModel
+@Data
+public class LocationListResponse {
+    @ApiModelProperty(value = "主键id", dataType = "Long")
+    private Long id;
+
+    /**
+     * 地点编号
+     */
+    @ExcelProperty("地点编号")
+    @ApiModelProperty(value = "地点编号", dataType = "String")
+    private String locationNo;
+
+    /**
+     * 地点名称
+     */
+    @ExcelProperty("地点名称")
+    @ApiModelProperty(value = "地点名称", dataType = "String")
+    private String locationName;
+
+    /**
+     * 地点位置
+     */
+    @ExcelProperty("地点位置")
+    @ApiModelProperty(value = "地点位置", dataType = "String")
+    private String locationPosition;
+
+    /**
+     * 创建人id
+     */
+    @ApiModelProperty(value = "创建人id", dataType = "Long")
+    private Long createUserId;
+
+    /**
+     * 创建人
+     */
+    @ExcelProperty("创建人")
+    @ApiModelProperty(value = "创建人", dataType = "String")
+    @TableField("create_user")
+    private String createUser;
+
+    /**
+     * 创建时间
+     */
+    @ExcelProperty("创建时间")
+    @ApiModelProperty(value = "创建时间", dataType = "String")
+    private String createTime;
+
+    /**
+     * 更新时间
+     */
+    @ApiModelProperty(value = "更新时间", dataType = "String")
+    private String updateTime;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertRequest.java
index 9a7f6c6..c827915 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertRequest.java
@@ -4,6 +4,8 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * @Description:
  * @Author: wangpeng
@@ -16,4 +18,7 @@
     private String name;
     @ApiModelProperty(value = "部门名", dataType = "String")
     private String deptName;
+
+    @ApiModelProperty(value = "导出ids", dataType = "List")
+    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertResponse.java
index f78b159..8f2f79e 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertResponse.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.dto.resource.staff;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.casic.missiles.annotation.DictCodeField;
 import com.casic.missiles.constants.MeterDictCode;
 import io.swagger.annotations.ApiModel;
@@ -13,12 +20,18 @@
  * @Author: wangpeng
  * @Date: 2023/7/27 15:13
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @ApiModel
 @Data
 public class StaffCertResponse {
     /**
      * 人员编号
      */
+    @ExcelProperty(value = "人员编号",order = 0)
     @NotEmpty(message = "人员编号不能为空")
     @ApiModelProperty(value = "人员编号", dataType = "String")
     private String staffNo;
@@ -26,6 +39,7 @@
     /**
      * 姓名
      */
+    @ExcelProperty(value = "姓名",order = 1)
     @ApiModelProperty(value = "姓名", dataType = "String")
     private String staffName;
 
@@ -54,6 +68,7 @@
     /**
      * 部门名字
      */
+    @ExcelProperty(value = "工作部门",order = 2)
     @ApiModelProperty(value = "部门名字", dataType = "String")
     private String deptName;
 
@@ -66,6 +81,7 @@
     /**
      * 计量专业
      */
+    @ExcelProperty(value = "计量专业",order = 3)
     @ApiModelProperty(value = "计量专业", dataType = "String")
     private String major;
 
@@ -110,6 +126,7 @@
     /**
      * 证书号
      */
+    @ExcelProperty(value = "证号",order = 4)
     @ApiModelProperty(value = "证书号", dataType = "String")
     private String certNo;
 
@@ -122,12 +139,14 @@
     /**
      * 有效日期
      */
+    @ExcelProperty(value = "证书有效期",order = 6)
     @ApiModelProperty(value = "有效日期", dataType = "String")
     private String effectiveDate;
 
     /**
      * 发放日期
      */
+    @ExcelProperty(value = "发证日期",order = 5)
     @ApiModelProperty(value = "发放日期", dataType = "String")
     private String grantDate;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffListRequest.java
index 7c4afb3..0a1194a 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffListRequest.java
@@ -4,6 +4,8 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * @Description:
  * @Author: wangpeng
@@ -18,4 +20,7 @@
     private String deptName;
     @ApiModelProperty(value = "部门id", dataType = "Long")
     private Long deptId;
+
+    @ApiModelProperty(value = "导出ids", dataType = "List")
+    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/TrainListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/TrainListRequest.java
index f68597b..6321f8b 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/TrainListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/TrainListRequest.java
@@ -14,6 +14,8 @@
 public class TrainListRequest {
     @ApiModelProperty(value = "训练登记表编号", dataType = "String")
     private String trainNo;
+    @ApiModelProperty(value = "值班领导", dataType = "String")
+    private String dutyLeader;
     @ApiModelProperty(value = "创建开始时间", dataType = "String")
     private String createTimeStart;
     @ApiModelProperty(value = "创建结束时间", dataType = "String")
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/SignAddRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/SignAddRequest.java
index 117be34..d71055c 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/SignAddRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/SignAddRequest.java
@@ -43,13 +43,6 @@
     private Long signUserId;
 
     /**
-     * 签章或签名-字典code
-     */
-    @NotBlank(message = "类型不能为空")
-    @ApiModelProperty(value = "签名/签章-字典code", dataType = "String", required = true)
-    private String signType;
-
-    /**
      * minio存储文件名
      */
     @ApiModelProperty(value = "上传文件返回名称", dataType = "String")
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateAddRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateAddRequest.java
index aff1265..6316648 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateAddRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateAddRequest.java
@@ -17,30 +17,28 @@
 @Data
 public class TemplateAddRequest extends BaseSystemRequest {
     /**
-     * 原始记录模板/证书报告模板名称
+     * 模板名称
      */
     @ApiModelProperty(value = "名称", dataType = "String", required = true)
     @NotBlank(message = "名称不能为空")
     private String templateName;
 
     /**
-     * 原始记录模板/证书报告模板描述
+     * 模板描述
      */
     @ApiModelProperty(value = "描述", dataType = "String")
     private String templateDesc;
 
     /**
-     * 原始记录模板/证书报告模板创建人
+     * 创建人
      */
     @ApiModelProperty(value = "创建人", dataType = "String", required = true)
     @NotBlank(message = "创建人不能为空")
     private String templateCreator;
 
-    /**
-     * 原始记录模板/证书报告模板-字典code
-     */
-    @NotBlank(message = "类型不能为空")
-    @ApiModelProperty(value = "原始记录模板/证书报告模板-字典code", dataType = "String", required = true)
+
+    @NotBlank(message = "模板类型不能为空")
+    @ApiModelProperty(value = "模板类型(字典code)", dataType = "String", required = true)
     private String templateType;
 
     /**
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateListRequest.java
index eec5a1e..6d17bbe 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateListRequest.java
@@ -1,11 +1,12 @@
 package com.casic.missiles.dto.system;
 
+import com.casic.missiles.annotation.DictCodeField;
+import com.casic.missiles.constants.MeterDictCode;
 import com.casic.missiles.dto.BaseSystemRequest;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import javax.validation.constraints.NotBlank;
 import java.util.List;
 
 /**
@@ -19,8 +20,8 @@
     /**
      * 类型
      */
-//    @ApiModelProperty(value = "类型-字典code", dataType = "String", required = true)
-    @NotBlank(message = "类型不能为空")
+    @DictCodeField(message = "模板类型不合法", cacheName = MeterDictCode.TEMPLATE_TYPE)
+    @ApiModelProperty(value = "模板类型(字典code)", dataType = "String")
     private String templateType;
 
     /**
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificateChangeApply.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificateChangeApply.java
index 9216308..36923fd 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificateChangeApply.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificateChangeApply.java
@@ -1,11 +1,19 @@
 package com.casic.missiles.model.business;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 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 com.casic.missiles.dto.BaseRequest;
+import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -20,6 +28,12 @@
  * @author wangpeng
  * @since 2023-08-15
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
+@ApiModel
 @Data
 @TableName("biz_business_certificate_change_apply")
 public class BizBusinessCertificateChangeApply extends BaseRequest implements Serializable {
@@ -33,6 +47,7 @@
     /**
      * 申请单编号
      */
+    @ExcelProperty(value = "申请单编号", order = 1)
     @ApiModelProperty(value = "申请单编号", dataType = "String")
     @TableField("change_apply_no")
     private String changeApplyNo;
@@ -40,6 +55,7 @@
     /**
      * 申请单名字
      */
+    @ExcelProperty(value = "申请单名称", order = 2)
     @ApiModelProperty(value = "申请单名字", dataType = "String")
     @TableField("change_apply_name")
     private String changeApplyName;
@@ -54,6 +70,7 @@
     /**
      * 更换证书编号
      */
+    @ExcelProperty(value = "更换证书编号", order = 3)
     @ApiModelProperty(value = "更换证书编号", dataType = "String")
     @TableField("change_report_no")
     private String changeReportNo;
@@ -61,7 +78,8 @@
     /**
      * 更换证书名字
      */
-    @ApiModelProperty(value = "更换证书名字", dataType = "String")
+    @ExcelProperty(value = "更换证书/报告名称", order = 4)
+    @ApiModelProperty(value = "更换证书/报告名称", dataType = "String")
     @TableField("change_report_name")
     private String changeReportName;
 
@@ -73,6 +91,7 @@
     @TableField("change_type")
     private String changeType;
 
+    @ExcelProperty(value = "变更类型", order = 5)
     @ApiModelProperty(value = "变更类型(字典value)", dataType = "String")
     @TableField(exist = false)
     private String changeTypeName;
@@ -142,13 +161,15 @@
     /**
      * 创建用户名字
      */
-    @ApiModelProperty(value = "创建用户名字", dataType = "String")
+    @ExcelProperty(value = "创建人", order = 6)
+    @ApiModelProperty(value = "创建人名字", dataType = "String")
     @TableField("create_user_name")
     private String createUserName;
 
     /**
      * 创建时间
      */
+    @ExcelProperty(value = "创建时间", order = 7)
     @ApiModelProperty(value = "创建时间", dataType = "String")
     @TableField("create_time")
     private String createTime;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificateReport.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificateReport.java
index f01db9e..db06018 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificateReport.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificateReport.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.model.business;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -22,6 +29,11 @@
  * @author wangpeng
  * @since 2023-08-14
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @ApiModel
 @Data
 @TableName("biz_business_certificate_report")
@@ -36,6 +48,7 @@
     /**
      * 证书报告编号
      */
+    @ExcelProperty(value = "证书报告编号", order = 1)
     @ApiModelProperty(value = "证书报告编号", dataType = "String")
     @TableField("certificate_report_no")
     private String certificateReportNo;
@@ -43,6 +56,7 @@
     /**
      * 证书报告名称
      */
+    @ExcelProperty(value = "证书报告名称", order = 2)
     @ApiModelProperty(value = "证书报告名称", dataType = "String")
     @TableField("certificate_report_name")
     private String certificateReportName;
@@ -62,6 +76,7 @@
     @TableField("measure_category")
     private String measureCategory;
 
+    @ExcelProperty(value = "检校类别", order = 6)
     @ApiModelProperty(value = "检校类别(字典value)", dataType = "String")
     @TableField(exist = false)
     private String measureCategoryName;
@@ -69,6 +84,7 @@
     /**
      * 检校时间
      */
+    @ExcelProperty(value = "检校时间", order = 8)
     @ApiModelProperty(value = "检校时间", dataType = "String")
     @TableField("calibration_time")
     private String calibrationTime;
@@ -267,18 +283,22 @@
     @TableField(exist = false)
     private Integer decisionItem;
 
-    @ApiModelProperty(value = "设备样品编号（列表返回参数）", dataType = "String")
+    @ExcelProperty(value = "被检设备统一编号", order = 3)
+    @ApiModelProperty(value = "被检设备统一编号（列表返回参数）", dataType = "String")
     @TableField(exist = false)
     private String sampleNo;
 
-    @ApiModelProperty(value = "设备样品名称（列表返回参数）", dataType = "String")
+    @ExcelProperty(value = "被检设备名称", order = 4)
+    @ApiModelProperty(value = "被检设备名称（列表返回参数）", dataType = "String")
     @TableField(exist = false)
     private String sampleName;
 
-    @ApiModelProperty(value = "设备样品规格型号（列表返回参数）", dataType = "String")
+    @ExcelProperty(value = "规格型号", order = 5)
+    @ApiModelProperty(value = "规格型号（列表返回参数）", dataType = "String")
     @TableField(exist = false)
     private String sampleModel;
 
+    @ExcelProperty(value = "检定员", order = 7)
     @ApiModelProperty(value = "检定员名字（列表返回参数）", dataType = "String")
     @TableField(exist = false)
     private String staffName;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessIdentifyInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessIdentifyInfo.java
index 46bfba5..f1a9bec 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessIdentifyInfo.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessIdentifyInfo.java
@@ -1,10 +1,15 @@
 package com.casic.missiles.model.business;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 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;
 
@@ -20,6 +25,11 @@
  * @author wangpeng
  * @since 2023-08-15
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @Data
 @TableName("biz_business_identify_info")
 public class BizBusinessIdentifyInfo implements Serializable {
@@ -33,6 +43,7 @@
     /**
      * 记录编号
      */
+    @ExcelProperty(value = "记录编号", order = 1)
     @ApiModelProperty(value = "记录编号", dataType = "String")
     @TableField("record_no")
     private String recordNo;
@@ -41,20 +52,15 @@
      * 标志类型(字典code)
      */
     @NotEmpty(message = "标志类型不能为空")
-    @ApiModelProperty(value = "标志类型(字典code)", dataType = "String")
-    @DictCodeField(message = "标志类型不合法", cacheName = MeterDictCode.IDENTIFY_PRINT_TYPE)
+    @ApiModelProperty(value = "标志类型(直接存计量标识/使用状态/校准状态的字典value)", dataType = "String")
     @TableField("identify_type")
     private String identifyType;
 
-    @ApiModelProperty(value = "标志类型(字典value)", dataType = "String")
-    @TableField(exist = false)
-    private String identifyTypeName;
-
     /**
      * 设备id(可以是受检设备/设备台账)
      */
     @NotNull(message = "设备id不能为空")
-    @ApiModelProperty(value = "设备id(可以是受检设备/设备台账)", dataType = "String")
+    @ApiModelProperty(value = "设备id(可以是受检设备/设备台账)", dataType = "Long")
     @TableField("device_id")
     private Long deviceId;
 
@@ -66,29 +72,32 @@
     @TableField("device_type")
     private String deviceType;
 
+    @ExcelProperty(value = "统一编号", order = 3)
     @NotEmpty(message = "设备编号不能为空")
-    @ApiModelProperty(value = "设备编号", dataType = "String")
+    @ApiModelProperty(value = "统一编号", dataType = "String")
     @TableField("device_no")
     private String deviceNo;
 
     /**
      * 设备名字
      */
-    @NotEmpty(message = "设备名字不能为空")
-    @ApiModelProperty(value = "设备名字", dataType = "String")
+    @ExcelProperty(value = "设备名称", order = 4)
+    @NotEmpty(message = "设备名称不能为空")
+    @ApiModelProperty(value = "设备名称", dataType = "String")
     @TableField("device_name")
     private String deviceName;
 
     /**
      * 检定员id
      */
-    @ApiModelProperty(value = "检定员id", dataType = "String")
+    @ApiModelProperty(value = "检定员id", dataType = "Long")
     @TableField("measure_person_id")
     private Long measurePersonId;
 
     /**
      * 检定员名字
      */
+    @ExcelProperty(value = "检定员", order = 5)
     @ApiModelProperty(value = "检定员名字", dataType = "String")
     @TableField("measure_person")
     private String measurePerson;
@@ -103,7 +112,8 @@
     /**
      * 更新时间
      */
-    @ApiModelProperty(value = "更新时间", dataType = "String")
+    @ExcelProperty(value = "打印时间", order = 6)
+    @ApiModelProperty(value = "打印时间", dataType = "String")
     @TableField("update_time")
     private String updateTime;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceAssess.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceAssess.java
index 659d9ca..6720b90 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceAssess.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceAssess.java
@@ -1,11 +1,26 @@
 package com.casic.missiles.model.business;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 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 com.casic.missiles.dto.BaseRequest;
+import com.casic.missiles.dto.business.outsource.OrderSampleDTO;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import javax.validation.constraints.NotEmpty;
 import java.io.Serializable;
+import java.util.List;
 
 /**
  * <p>
@@ -15,146 +30,231 @@
  * @author wangpeng
  * @since 2023-08-16
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
+@ApiModel
 @Data
 @TableName("biz_business_outsource_assess")
-public class BizBusinessOutsourceAssess implements Serializable {
+public class BizBusinessOutsourceAssess extends BaseRequest implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
+    @ApiModelProperty(value = "id，更新/删除使用参数", dataType = "Long")
     @TableId("id")
     private Long id;
 
     /**
      * 评审表编号
      */
+    @ExcelProperty(value = "评审表编号", order = 1)
+    @ApiModelProperty(value = "评审表编号(后台生成)", dataType = "String")
     @TableField("project_no")
     private String projectNo;
 
     /**
      * 评审表名称
      */
+    @ExcelProperty(value = "评审表名称", order = 2)
+    @ApiModelProperty(value = "评审表名称", dataType = "String")
     @TableField("project_name")
     private String projectName;
 
+    @NotEmpty(message = "实验室代码不能为空")
+    @DictCodeField(message = "实验室代码描述不合法", cacheName = MeterDictCode.LAB_CODE)
+    @ApiModelProperty(value = "实验室代码(字典code)", dataType = "String")
+    @TableField("lab_code")
+    private String labCode;
+
+    @ApiModelProperty(value = "实验室代码(字典value)", dataType = "String")
+    @TableField(exist = false)
+    private String labCodeName;
+
+    /**
+     * 组别代码
+     */
+    @NotEmpty(message = "组别代码不能为空")
+    @DictCodeField(message = "组别代码描述不合法", cacheName = MeterDictCode.GROUP_CODE)
+    @ApiModelProperty(value = "组别代码(字典code)", dataType = "String")
+    @TableField("group_code")
+    private String groupCode;
+
+    @ApiModelProperty(value = "组别代码(字典value)", dataType = "String")
+    @TableField(exist = false)
+    private String groupCodeName;
+
     /**
      * 申请人id
      */
+    @ApiModelProperty(value = "申请人id", dataType = "String")
     @TableField("applicant_id")
     private Long applicantId;
 
     /**
      * 申请人名字
      */
+    @ExcelProperty(value = "申请人", order = 5)
+    @ApiModelProperty(value = "申请人", dataType = "String")
     @TableField("applicant_name")
     private String applicantName;
 
     /**
      * 申请时间
      */
+    @ExcelProperty(value = "申请时间", order = 6)
+    @ApiModelProperty(value = "申请时间", dataType = "String")
     @TableField("applicant_time")
     private String applicantTime;
 
     /**
      * 附件(minio存储文件名)
      */
+    @ApiModelProperty(value = "附件(minio存储文件名)", dataType = "String")
     @TableField("minio_file_name")
     private String minioFileName;
 
     /**
      * 备注
      */
+    @ApiModelProperty(value = "备注", dataType = "String")
     @TableField("remark")
     private String remark;
 
     /**
      * 创建人id
      */
+    @ApiModelProperty(value = "创建人id", dataType = "String")
     @TableField("create_user_id")
     private Long createUserId;
 
     /**
      * 创建人名字
      */
+    @ApiModelProperty(value = "创建人名字", dataType = "String")
     @TableField("create_user_name")
     private String createUserName;
 
     /**
      * 分包方id
      */
+    @ApiModelProperty(value = "评审表编号", dataType = "String")
     @TableField("outsourcer_id")
     private Long outsourcerId;
 
     /**
      * 预计开始时间
      */
+    @ApiModelProperty(value = "预计开始时间", dataType = "String")
     @TableField("pre_start_time")
     private String preStartTime;
 
     /**
      * 预计结束时间
      */
+    @ApiModelProperty(value = "预计结束时间", dataType = "String")
     @TableField("pre_end_time")
     private String preEndTime;
 
     /**
      * 分包原因-字典
      */
+    @ApiModelProperty(value = "分包原因(字典code)", dataType = "String")
+    @DictCodeField(message = "分包原因描述不合法", cacheName = MeterDictCode.OUTSOURCE_REASON)
     @TableField("outsource_reason")
     private String outsourceReason;
 
+    @ApiModelProperty(value = "分包原因(字典value)", dataType = "String")
+    @TableField(exist = false)
+    private String outsourceReasonName;
+
     /**
      * 预计费用
      */
+    @ApiModelProperty(value = "预计费用", dataType = "String")
     @TableField("pre_cost")
     private String preCost;
 
     /**
      * 审批状态
      */
+    @ApiModelProperty(value = "审批状态", dataType = "String")
+    @DictCodeField(message = "审批状态描述不合法", cacheName = MeterDictCode.APPROVAL_STATUS)
     @TableField("approval_status")
     private String approvalStatus;
 
     /**
      * 流程实例id
      */
+    @ApiModelProperty(value = "流程实例id", dataType = "String")
     @TableField("process_id")
     private String processId;
 
     /**
      * 实验室认可情况
      */
+    @ApiModelProperty(value = "实验室认可情况", dataType = "String")
     @TableField("approve_situation")
     private String approveSituation;
 
     /**
      * 溯源性
      */
+    @ApiModelProperty(value = "溯源性", dataType = "String")
     @TableField("traceability")
     private String traceability;
 
     /**
      * 测试方法
      */
+    @ApiModelProperty(value = "测试方法", dataType = "String")
     @TableField("test_method")
     private String testMethod;
 
     /**
      * 技术能力
      */
+    @ApiModelProperty(value = "技术能力", dataType = "String")
     @TableField("technique_ability")
     private String techniqueAbility;
 
     /**
      * 创建时间
      */
+    @ApiModelProperty(hidden = true)
     @TableField("create_time")
     private String createTime;
 
     /**
      * 更新时间
      */
+    @ApiModelProperty(hidden = true)
     @TableField("update_time")
     private String updateTime;
 
+    @ApiModelProperty(value = "审批状态类型-字典value", dataType = "String")
+    @TableField(exist = false)
+    private String approvalStatusName;
 
+    @ApiModelProperty(value = "任务id（同意、驳回等操作使用）", dataType = "String")
+    @TableField(exist = false)
+    private String taskId;
+
+    @ApiModelProperty(value = "可选决策项（1同意驳回拒绝 2同意驳回 3同意拒绝，用于待审批列表同意/驳回/拒绝按钮展示）", dataType = "Integer")
+    @TableField(exist = false)
+    private Integer decisionItem;
+
+    @NotEmpty(message = "受检设备信息不能为空")
+    @ApiModelProperty(value = "受检设备id列表（新建使用参数）", dataType = "List")
+    @TableField(exist = false)
+    private List<OrderSampleDTO> orderSampleList;
+
+    @ExcelProperty(value = "分包机构名称", order = 3)
+    @ApiModelProperty(value = "分包机构名称（列表返回参数）", dataType = "String")
+    private String outsourcerName;
+
+    @ExcelProperty(value = "机构负责人", order = 4)
+    @ApiModelProperty(value = "机构负责人（列表返回参数）", dataType = "String")
+    private String director;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceProtocol.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceProtocol.java
new file mode 100644
index 0000000..38df697
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceProtocol.java
@@ -0,0 +1,225 @@
+package com.casic.missiles.model.business;
+
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
+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 com.casic.missiles.dto.BaseRequest;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotEmpty;
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 计量检定业务-分包管理-测试、校准或检定工作分包协议书
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-08-24
+ */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
+@Data
+@TableName("biz_business_outsource_protocol")
+public class BizBusinessOutsourceProtocol extends BaseRequest implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "id，更新/删除使用参数", dataType = "Long")
+    @TableId("id")
+    private Long id;
+
+    /**
+     * 协议书编号
+     */
+    @ExcelProperty(value = "协议书编号", order = 1)
+    @ApiModelProperty(value = "协议书编号(后台生成)", dataType = "String")
+    @TableField("protocol_no")
+    private String protocolNo;
+
+    /**
+     * 协议书名称
+     */
+    @ExcelProperty(value = "协议书名称", order = 2)
+    @ApiModelProperty(value = "协议书名称", dataType = "String")
+    @TableField("project_name")
+    private String projectName;
+
+    @NotEmpty(message = "实验室代码不能为空")
+    @DictCodeField(message = "实验室代码描述不合法", cacheName = MeterDictCode.LAB_CODE)
+    @ApiModelProperty(value = "实验室代码(字典code)", dataType = "String")
+    @TableField("lab_code")
+    private String labCode;
+
+    @ApiModelProperty(value = "实验室代码(字典value)", dataType = "String")
+    @TableField(exist = false)
+    private String labCodeName;
+
+    @NotEmpty(message = "组别代码不能为空")
+    @DictCodeField(message = "组别代码描述不合法", cacheName = MeterDictCode.GROUP_CODE)
+    @ApiModelProperty(value = "组别代码(字典code)", dataType = "String")
+    @TableField("group_code")
+    private String groupCode;
+
+    @ApiModelProperty(value = "组别代码(字典value)", dataType = "String")
+    @TableField(exist = false)
+    private String groupCodeName;
+
+    /**
+     * 分包方id
+     */
+    @ApiModelProperty(value = "分包方id", dataType = "Long")
+    @TableField("outsourcer_id")
+    private Long outsourcerId;
+
+    /**
+     * 其他
+     */
+    @ApiModelProperty(value = "其他", dataType = "String")
+    @TableField("remark")
+    private String remark;
+
+    /**
+     * 分包方编号
+     */
+    @ApiModelProperty(value = "分包方编号(新建不用传)", dataType = "String")
+    @TableField("outsource_no")
+    private String outsourceNo;
+
+    /**
+     * 分包方名称
+     */
+    @ExcelProperty(value = "分包方名称", order = 3)
+    @ApiModelProperty(value = "分包方名称(新建不用传)", dataType = "String")
+    @TableField("outsource_name")
+    private String outsourceName;
+
+    /**
+     * 联系人
+     */
+    @ExcelProperty(value = "联系人", order = 4)
+    @ApiModelProperty(value = "联系人", dataType = "String")
+    @TableField("contacts")
+    private String contacts;
+
+    /**
+     * 电话
+     */
+    @ApiModelProperty(value = "电话", dataType = "String")
+    @TableField("mobile")
+    private String mobile;
+
+    /**
+     * 地址
+     */
+    @ApiModelProperty(value = "地址", dataType = "String")
+    @TableField("address")
+    private String address;
+
+    /**
+     * 要求完成日期
+     */
+    @ApiModelProperty(value = "要求完成日期", dataType = "String")
+    @TableField("require_date")
+    private String requireDate;
+
+    /**
+     * 分包费用(元)
+     */
+    @ApiModelProperty(value = "分包费用(元)", dataType = "String")
+    @TableField("outsource_cost")
+    private Double outsourceCost;
+
+    /**
+     * 分包方负责人
+     */
+    @ApiModelProperty(value = "分包方负责人", dataType = "String")
+    @TableField("director")
+    private String director;
+
+    /**
+     * 分包项目
+     */
+    @ApiModelProperty(value = "分包项目", dataType = "String")
+    @TableField("item")
+    private String item;
+
+    /**
+     * 分包要求
+     */
+    @ApiModelProperty(value = "分包要求", dataType = "String")
+    @TableField("requires")
+    private String requires;
+
+    /**
+     * 创建人id
+     */
+    @ApiModelProperty(hidden = true)
+    @TableField("create_user_id")
+    private Long createUserId;
+
+    /**
+     * 创建人名字
+     */
+    @ExcelProperty(value = "申请人", order = 5)
+    @ApiModelProperty(value = "申请人", dataType = "String")
+    @TableField("create_user_name")
+    private String createUserName;
+
+    /**
+     * 审批状态
+     */
+    @ApiModelProperty(value = "审批状态", dataType = "String")
+    @DictCodeField(message = "审批状态描述不合法", cacheName = MeterDictCode.APPROVAL_STATUS)
+    @TableField("approval_status")
+    private String approvalStatus;
+
+    /**
+     * 流程实例id
+     */
+    @ApiModelProperty(value = "流程实例id", dataType = "String")
+    @TableField("process_id")
+    private String processId;
+
+    /**
+     * 创建时间
+     */
+    @ExcelProperty(value = "申请时间", order = 6)
+    @ApiModelProperty(value = "申请时间", dataType = "String")
+    @TableField("create_time")
+    private String createTime;
+
+    /**
+     * 更新时间
+     */
+    @ApiModelProperty(hidden = true)
+    @TableField("update_time")
+    private String updateTime;
+
+    @ApiModelProperty(value = "审批状态类型-字典value", dataType = "String")
+    @TableField(exist = false)
+    private String approvalStatusName;
+
+    @ApiModelProperty(value = "任务id（同意、驳回等操作使用）", dataType = "String")
+    @TableField(exist = false)
+    private String taskId;
+
+    @ApiModelProperty(value = "可选决策项（1同意驳回拒绝 2同意驳回 3同意拒绝，用于待审批列表同意/驳回/拒绝按钮展示）", dataType = "Integer")
+    @TableField(exist = false)
+    private Integer decisionItem;
+
+
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourcerInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourcerInfo.java
index ec4e997..f9aa69e 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourcerInfo.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourcerInfo.java
@@ -17,6 +17,7 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import javax.validation.constraints.NotEmpty;
 import java.io.Serializable;
 
 /**
@@ -59,6 +60,29 @@
     @TableField("outsourcer_name")
     private String outsourcerName;
 
+    @NotEmpty(message = "实验室代码不能为空")
+    @DictCodeField(message = "实验室代码描述不合法", cacheName = MeterDictCode.LAB_CODE)
+    @ApiModelProperty(value = "实验室代码(字典code)", dataType = "String")
+    @TableField("lab_code")
+    private String labCode;
+
+    @ApiModelProperty(value = "实验室代码(字典value)", dataType = "String")
+    @TableField(exist = false)
+    private String labCodeName;
+
+    /**
+     * 组别代码
+     */
+    @NotEmpty(message = "组别代码不能为空")
+    @DictCodeField(message = "组别代码描述不合法", cacheName = MeterDictCode.GROUP_CODE)
+    @ApiModelProperty(value = "组别代码(字典code)", dataType = "String")
+    @TableField("group_code")
+    private String groupCode;
+
+    @ApiModelProperty(value = "组别代码(字典value)", dataType = "String")
+    @TableField(exist = false)
+    private String groupCodeName;
+
     /**
      * 单位简称
      */
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardInfo.java
index c48eed7..dffdfdd 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardInfo.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardInfo.java
@@ -5,6 +5,7 @@
 import com.baomidou.mybatisplus.annotation.TableName;
 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;
 
@@ -18,6 +19,7 @@
  * @author wangpeng
  * @since 2023-08-04
  */
+@ApiModel
 @Data
 @TableName("biz_equipment_standard_info")
 public class BizEquipmentStandardInfo implements Serializable {
@@ -119,7 +121,7 @@
      * 管理状态(字典code)
      */
     @ApiModelProperty(value = "管理状态(字典code)", dataType = "String")
-    @DictCodeField(message = "管理状态不合法", cacheName = MeterDictCode.MANAGER_STATE)
+    @DictCodeField(message = "管理状态不合法", cacheName = MeterDictCode.STANDARD_MANAGER_STATE)
     @TableField("manage_status")
     private String manageStatus;
 
@@ -151,7 +153,7 @@
     /**
      * 温度(℃)
      */
-    @ApiModelProperty(value = "使用状态(字典code)", dataType = "String")
+    @ApiModelProperty(value = "温度(℃)", dataType = "String")
     @TableField("temperature")
     private Double temperature;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardInfoApproval.java b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardInfoApproval.java
index dbd86ab..9f58d83 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardInfoApproval.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardInfoApproval.java
@@ -150,7 +150,7 @@
      * 管理状态(字典code)
      */
     @ApiModelProperty(value = "管理状态(字典code)", dataType = "String")
-    @DictCodeField(message = "管理状态不合法", cacheName = MeterDictCode.MANAGER_STATE)
+    @DictCodeField(message = "管理状态不合法", cacheName = MeterDictCode.STANDARD_MANAGER_STATE)
     @TableField("manage_status")
     private String manageStatus;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardTechnologyRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardTechnologyRelation.java
index 0e612bd..751f26b 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardTechnologyRelation.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardTechnologyRelation.java
@@ -3,6 +3,7 @@
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -16,6 +17,7 @@
  * @author wangpeng
  * @since 2023-08-04
  */
+@ApiModel
 @Data
 @TableName("biz_equipment_standard_technology_relation")
 public class BizEquipmentStandardTechnologyRelation implements Serializable {
@@ -33,6 +35,10 @@
     @TableField("technology_file_id")
     private Long technologyFileId;
 
+    @ApiModelProperty(value = "依据的技术文件编号", dataType = "String")
+    @TableField("technology_file_no")
+    private String technologyFileNo;
+
     /**
      * 依据的技术文件名称(技术文件中现行测试校准检定方法表文件名字段)
      */
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerInfo.java
index d6e8bed..65cd6bc 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerInfo.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerInfo.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.model.resource;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -21,6 +28,11 @@
  * @author wangpeng
  * @since 2023-08-08
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @ApiModel
 @Data
 @TableName("biz_resource_customer_info")
@@ -35,6 +47,7 @@
     /**
      * 委托方编号
      */
+    @ExcelProperty(value = "委托方编号", order = 1)
     @ApiModelProperty(value = "委托方编号", dataType = "String")
     @TableField("customer_no")
     private String customerNo;
@@ -42,6 +55,7 @@
     /**
      * 委托方名称
      */
+    @ExcelProperty(value = "委托方名称", order = 2)
     @ApiModelProperty(value = "委托方名称(新建时为下拉选择一个受检单位组织的名字，传deptId字段，后端获取名称)", dataType = "String")
     @TableField("customer_name")
     private String customerName;
@@ -63,6 +77,7 @@
     /**
      * 联系人
      */
+    @ExcelProperty(value = "联系人", order = 3)
     @ApiModelProperty(value = "联系人", dataType = "String")
     @TableField("contacts")
     private String contacts;
@@ -70,6 +85,7 @@
     /**
      * 座机电话
      */
+    @ExcelProperty(value = "座机电话", order = 4)
     @ApiModelProperty(value = "座机电话", dataType = "String")
     @TableField("mobile")
     private String mobile;
@@ -77,6 +93,7 @@
     /**
      * 手机号码
      */
+    @ExcelProperty(value = "手机号码", order = 5)
     @ApiModelProperty(value = "手机号码", dataType = "String")
     @TableField("phone")
     private String phone;
@@ -91,6 +108,7 @@
     /**
      * 地址
      */
+    @ExcelProperty(value = "地址", order = 6)
     @ApiModelProperty(value = "地址", dataType = "String")
     @TableField("address")
     private String address;
@@ -141,6 +159,7 @@
     /**
      * 创建时间
      */
+    @ExcelProperty(value = "创建时间", order = 7)
     @ApiModelProperty(value = "创建时间", dataType = "String")
     @TableField("create_time")
     private String createTime;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerSuggestForm.java b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerSuggestForm.java
index 7201bbd..701bf8b 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerSuggestForm.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerSuggestForm.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.model.resource;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -22,6 +29,11 @@
  * @author wangpeng
  * @since 2023-08-08
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @ApiModel
 @Data
 @TableName("biz_resource_customer_suggest_form")
@@ -44,7 +56,8 @@
     /**
      * 委托方名称
      */
-    @ApiModelProperty(value = "委托方名称", dataType = "String")
+    @ExcelProperty(value = "意见反馈单位", order = 2)
+    @ApiModelProperty(value = "意见反馈单位", dataType = "String")
     @TableField("customer_name")
     private String customerName;
 
@@ -59,7 +72,8 @@
     /**
      * 委托方意见反馈部门名称
      */
-    @ApiModelProperty(value = "委托方意见反馈部门名称", dataType = "String")
+    @ExcelProperty(value = "委托方意见反馈部门", order = 3)
+    @ApiModelProperty(value = "委托方意见反馈部门", dataType = "String")
     @TableField("customer_dept_name")
     private String customerDeptName;
 
@@ -73,6 +87,7 @@
     /**
      * 表单编号
      */
+    @ExcelProperty(value = "表单编号", order = 1)
     @ApiModelProperty(value = "表单编号", dataType = "String")
     @TableField("form_no")
     private String formNo;
@@ -111,6 +126,7 @@
     /**
      * 创建人名字
      */
+    @ExcelProperty(value = "创建人", order = 4)
     @ApiModelProperty(value = "创建人名字", dataType = "String")
     @TableField("create_user_name")
     private String createUserName;
@@ -147,6 +163,7 @@
     /**
      * 创建时间
      */
+    @ExcelProperty(value = "创建时间", order = 5)
     @ApiModelProperty(value = "创建时间", dataType = "String")
     @TableField("create_time")
     private String createTime;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSealInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSealInfo.java
index cbf05d7..9bf389d 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSealInfo.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSealInfo.java
@@ -106,6 +106,10 @@
     @TableField("minio_file_name")
     private String minioFileName;
 
+    @ApiModelProperty(value = "minio存储文件url", dataType = "String")
+    @TableField(exist = false)
+    private String minioFileUrl;
+
     @ApiModelProperty(value = "创建时间", dataType = "String")
     @TableField("create_time")
     private String createTime;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSealUseNote.java b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSealUseNote.java
index 3f2d9e8..3ce16a8 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSealUseNote.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSealUseNote.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.model.resource;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -20,6 +27,11 @@
  * @author wangpeng
  * @since 2023-07-28
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @ApiModel
 @Data
 @TableName("biz_resource_seal_use_note")
@@ -34,6 +46,7 @@
     /**
      * 登记表编号
      */
+    @ExcelProperty(value = "申请单编号", order = 1)
     @ApiModelProperty(value = "登记表编号(自动生成)", dataType = "String")
     @TableField("note_form_no")
     private String noteFormNo;
@@ -55,6 +68,7 @@
     /**
      * 申请部门
      */
+    @ExcelProperty(value = "申请部门", order = 5)
     @ApiModelProperty(value = "申请部门", dataType = "String")
     @TableField("apply_dept_name")
     private String applyDeptName;
@@ -69,6 +83,7 @@
     /**
      * 申请人
      */
+    @ExcelProperty(value = "申请人", order = 6)
     @ApiModelProperty(value = "申请人", dataType = "String")
     @TableField("apply_user_name")
     private String applyUserName;
@@ -76,6 +91,7 @@
     /**
      * 申请时间
      */
+    @ExcelProperty(value = "申请时间", order = 7)
     @ApiModelProperty(value = "申请时间(新增自动获取当前时间)", dataType = "String")
     @TableField("apply_time")
     private String applyTime;
@@ -130,6 +146,26 @@
     @TableField("update_time")
     private String updateTime;
 
+    @ExcelProperty(value = "印章名称", order = 2)
+    @ApiModelProperty(value = "印章名称(列表返回参数)", dataType = "String")
+    @TableField(exist = false)
+    private String sealName;
+
+    @DictCodeField(message = "印章类型描述不合法", cacheName = MeterDictCode.SEAL_TYPE)
+    @ApiModelProperty(hidden = true)
+    @TableField(exist = false)
+    private String sealType;
+
+    @ExcelProperty(value = "印章类型", order = 3)
+    @ApiModelProperty(value = "印章类型(列表返回参数)", dataType = "String")
+    @TableField(exist = false)
+    private String sealTypeName;
+
+    @ExcelProperty(value = "批准人", order = 4)
+    @ApiModelProperty(value = "批准人(列表返回参数)", dataType = "String")
+    @TableField(exist = false)
+    private String approverName;
+
     @ApiModelProperty(value = "审批状态类型-字典value", dataType = "String")
     @TableField(exist = false)
     private String approvalStatusName;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceStaffInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceStaffInfo.java
index 5ef995b..41563a1 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceStaffInfo.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceStaffInfo.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.model.resource;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -20,6 +27,11 @@
  * @author wangpeng
  * @since 2023-07-25
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @ApiModel
 @Data
 @TableName("biz_resource_staff_info")
@@ -38,6 +50,7 @@
     /**
      * 人员编号
      */
+    @ExcelProperty(value = "人员编号",order = 0)
     @NotEmpty(message = "人员编号不能为空")
     @ApiModelProperty(value = "人员编号", dataType = "String")
     @TableField("staff_no")
@@ -46,6 +59,7 @@
     /**
      * 姓名
      */
+    @ExcelProperty(value = "姓名",order = 1)
     @ApiModelProperty(value = "姓名", dataType = "String")
     @TableField("staff_name")
     private String staffName;
@@ -152,13 +166,15 @@
     /**
      * 部门名字
      */
-    @ApiModelProperty(value = "部门名字", dataType = "String")
+    @ExcelProperty(value = "工作部门",order = 4)
+    @ApiModelProperty(value = "工作部门", dataType = "String")
     @TableField("dept_name")
     private String deptName;
 
     /**
      * 岗位
      */
+    @ExcelProperty(value = "岗位",order = 2)
     @ApiModelProperty(value = "岗位", dataType = "String")
     @TableField("station")
     private String station;
@@ -166,6 +182,7 @@
     /**
      * 计量专业
      */
+    @ExcelProperty(value = "计量专业",order = 5)
     @ApiModelProperty(value = "计量专业", dataType = "String")
     @TableField("major")
     private String major;
@@ -173,6 +190,7 @@
     /**
      * 证号
      */
+    @ExcelProperty(value = "证号",order = 3)
     @ApiModelProperty(value = "证号", dataType = "String")
     @TableField("certificate_number")
     private String certificateNumber;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSupplierInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSupplierInfo.java
index eb5ef01..a1e2697 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSupplierInfo.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSupplierInfo.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.model.resource;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -20,6 +27,11 @@
  * @author wangpeng
  * @since 2023-07-27
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @ApiModel
 @Data
 @TableName("biz_resource_supplier_info")
@@ -34,6 +46,7 @@
     /**
      * 供方编号
      */
+    @ExcelProperty(value = "供方编号", order = 1)
     @ApiModelProperty(value = "供方编号(自动生成)", dataType = "String")
     @TableField("supplier_no")
     private String supplierNo;
@@ -41,6 +54,7 @@
     /**
      * 供方名称
      */
+    @ExcelProperty(value = "供方名称", order = 2)
     @ApiModelProperty(value = "供方名称", dataType = "String")
     @TableField("supplier_name")
     private String supplierName;
@@ -60,6 +74,7 @@
     @TableField("supplier_type")
     private String supplierType;
 
+    @ExcelProperty(value = "供方类型", order = 3)
     @ApiModelProperty(value = "供方类型(字典value)", dataType = "String")
     @TableField(exist = false)
     private String supplierTypeName;
@@ -109,7 +124,8 @@
     /**
      * 电话
      */
-    @ApiModelProperty(value = "电话", dataType = "String")
+    @ExcelProperty(value = "联系电话", order = 4)
+    @ApiModelProperty(value = "联系电话", dataType = "String")
     @TableField("phone")
     private String phone;
 
@@ -158,6 +174,7 @@
     /**
      * 公司地址-省
      */
+    @ExcelProperty(value = "地址-省", order = 6)
     @ApiModelProperty(value = "公司地址-省", dataType = "String")
     @TableField("company_province_name")
     private String companyProvinceName;
@@ -172,6 +189,7 @@
     /**
      * 公司地址-市
      */
+    @ExcelProperty(value = "地址-市", order = 7)
     @ApiModelProperty(value = "公司地址-市", dataType = "String")
     @TableField("company_city_name")
     private String companyCityName;
@@ -186,6 +204,7 @@
     /**
      * 公司地址-区
      */
+    @ExcelProperty(value = "地址-区", order = 8)
     @ApiModelProperty(value = "公司地址-区", dataType = "String")
     @TableField("company_area_name")
     private String companyAreaName;
@@ -193,6 +212,7 @@
     /**
      * 公司地址-详细地址
      */
+    @ExcelProperty(value = "地址-详细地址", order = 9)
     @ApiModelProperty(value = "公司地址-详细地址", dataType = "String")
     @TableField("company_address")
     private String companyAddress;
@@ -200,6 +220,7 @@
     /**
      * 服务和供应的内容
      */
+    @ExcelProperty(value = "服务和供应的内容", order = 5)
     @ApiModelProperty(value = "服务和供应的内容", dataType = "String")
     @TableField("supplier_content")
     private String supplierContent;
@@ -250,6 +271,7 @@
     /**
      * 创建时间
      */
+    @ExcelProperty(value = "创建时间", order = 9)
     @ApiModelProperty(value = "创建时间", dataType = "String")
     @TableField("create_time")
     private String createTime;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/EnvLocationInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/EnvLocationInfo.java
new file mode 100644
index 0000000..d8e2d7b
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/EnvLocationInfo.java
@@ -0,0 +1,83 @@
+package com.casic.missiles.model.resource;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotEmpty;
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 实验室环境监控系统-设备表
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-06-07
+ */
+@ApiModel
+@Data
+@TableName("env_location_info")
+public class EnvLocationInfo implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "主键id", dataType = "Long")
+    @TableId("id")
+    private Long id;
+
+    /**
+     * 地点编号
+     */
+    @NotEmpty(message = "地点编号不能为空")
+    @ApiModelProperty(value = "地点编号", dataType = "String")
+    @TableField("location_no")
+    private String locationNo;
+
+    /**
+     * 地点名称
+     */
+    @ApiModelProperty(value = "地点名称", dataType = "String")
+    @TableField("location_name")
+    private String locationName;
+
+    /**
+     * 地点位置
+     */
+    @ApiModelProperty(value = "地点位置", dataType = "String")
+    @TableField("location_position")
+    private String locationPosition;
+
+    /**
+     * 创建人id
+     */
+    @ApiModelProperty(value = "创建人id", dataType = "Long")
+    @TableField("create_user_id")
+    private Long createUserId;
+
+    /**
+     * 创建人
+     */
+    @ApiModelProperty(value = "创建人", dataType = "String")
+    @TableField("create_user")
+    private String createUser;
+
+    /**
+     * 创建时间
+     */
+    @ApiModelProperty(value = "创建时间", dataType = "String")
+    @TableField("create_time")
+    private String createTime;
+
+    /**
+     * 更新时间
+     */
+    @ApiModelProperty(value = "更新时间", dataType = "String")
+    @TableField("update_time")
+    private String updateTime;
+
+
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemFileConfig.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemFileConfig.java
index 19e6845..86e569c 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemFileConfig.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemFileConfig.java
@@ -30,7 +30,7 @@
     @ApiModelProperty(value = "系统类别(1业务系统2受检系统3环境系统)", dataType = "Integer")
     @NotNull(message = "系统类别不能为空")
     @TableField("system_type")
-    private Integer systemType;
+    private Integer systemType = 1;
 
     @ApiModelProperty("下载编号")
     @TableField("download_no")

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java
index bb0c50f..13a699b 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java
@@ -12,6 +12,7 @@
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.IGeneralApprovalService;
+import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
@@ -19,6 +20,7 @@
 import org.springframework.web.bind.annotation.RequestBody;
 
 import javax.validation.Valid;
+import java.util.List;
 import java.util.Objects;
 
 /**
@@ -117,4 +119,17 @@
         }
         return baseApprovalService.failUpdate(request);
     }
+
+    public List<O> exportList(@RequestBody @Valid R request) throws Exception {
+        List<O> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = baseApprovalService.listExportByIds(request.getIds());
+        } else {
+            list = baseApprovalService.listExport(request);
+        }
+        for (O record : list) {
+            DictCodeUtils.convertDictCodeToName(record);
+        }
+        return list;
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java
index 8a90961..d775831 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java
@@ -5,6 +5,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.business.certificate.CertificateChangeApplyApprovalListRequest;
 import com.casic.missiles.dto.business.certificate.CertificateChangeApplySaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessCertificateChangeApply;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
@@ -20,6 +21,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -48,4 +50,12 @@
         }
         return changeApplyService.saveChangeApply(request);
     }
+
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody CertificateChangeApplyApprovalListRequest request) throws Exception {
+        List<BizBusinessCertificateChangeApply> list = super.exportList(request);
+        super.exportExcel(BizBusinessCertificateChangeApply.class, list, ExportEnum.CERTIFICATE_CHANGE_APPLY.getSheetName());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java
index 5fc4b07..af8230e 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java
@@ -9,6 +9,7 @@
 import com.casic.missiles.dto.business.certificate.CertificatePrintApprovalListRequest;
 import com.casic.missiles.dto.business.certificate.CertificatePrintListResponse;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.enums.business.CertificatePrintStatusEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessCertificatePrintLog;
@@ -18,10 +19,16 @@
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.io.IOException;
+import java.util.List;
 import java.util.Objects;
 
 /**
@@ -98,4 +105,16 @@
         });
         return certificatePrintService.certificatePrintLog(idDTO.getId());
     }
+
+    @ApiOperation("证书打印审批导出")
+    @PostMapping("/listExport")
+    public void exportList(@RequestBody CertificatePrintApprovalListRequest request) throws IOException {
+        List<CertificatePrintListResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = certificatePrintService.listByIds(request.getIds());
+        } else {
+            list = certificatePrintService.list(request);
+        }
+        super.exportExcel(CertificatePrintListResponse.class, list, ExportEnum.CERTIFICATE_PRINT.getSheetName());
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java
index 63b06dc..6b2efd5 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java
@@ -6,6 +6,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.business.certificate.CertificateReportApprovalListRequest;
 import com.casic.missiles.dto.business.certificate.CertificateReportSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessCertificateReport;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
@@ -21,6 +22,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -50,7 +52,7 @@
         return certificateReportService.saveCertificateReport(request);
     }
 
-    @ApiOperation("证书审批详情（基本信息）")
+    @ApiOperation("详情（基本信息）")
     @PostMapping("/detail")
     public ReturnDTO<BizBusinessCertificateReport> detail(@RequestBody @Valid BaseDetailRequest request, BindingResult bindingResult) throws Exception {
         if(bindingResult.hasErrors()){
@@ -59,4 +61,11 @@
         return certificateReportService.detail(request);
     }
 
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody CertificateReportApprovalListRequest request) throws Exception {
+        List<BizBusinessCertificateReport> list = super.exportList(request);
+        super.exportExcel(BizBusinessCertificateReport.class, list, ExportEnum.CERTIFICATE_REPORT.getSheetName());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java
index 46b26bd..57c0809 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java
@@ -10,20 +10,21 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.business.identify.IdentifyListRequest;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessIdentifyInfo;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.business.IBizBusinessIdentifyInfoService;
+import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import javax.validation.Valid;
+import java.util.List;
 import java.util.Objects;
 
 /**
@@ -57,16 +58,13 @@
         return identifyInfoService.addIdentify(identifyInfo);
     }
 
-    @ApiOperation("标识打印更新")
+    @ApiOperation("标识打印更新（更新打印时间）")
     @PostMapping("/update")
-    public ReturnDTO updateIdentify(@RequestBody @Valid BizBusinessIdentifyInfo identifyInfo, BindingResult bindingResult) {
-        Assert.isFalse(Objects.isNull(identifyInfo.getId()), () -> {
+    public ReturnDTO updateIdentify(@RequestBody @Valid IdDTO idDTO) {
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        Assert.isFalse(bindingResult.hasErrors(), () -> {
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        });
-        return identifyInfoService.updateIdentify(identifyInfo);
+        return identifyInfoService.updateIdentify(idDTO.getId());
     }
 
     @ApiOperation("标识打印删除")
@@ -77,4 +75,37 @@
         });
         return identifyInfoService.deleteIdentify(idDTO.getId());
     }
+
+    @ApiOperation("标识打印导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody @Valid IdentifyListRequest request, BindingResult bindingResult) throws Exception {
+        if (bindingResult.hasErrors()) {
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        List<BizBusinessIdentifyInfo> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = identifyInfoService.listByIds(request.getIds());
+        } else {
+            list = identifyInfoService.list(request);
+        }
+        for (BizBusinessIdentifyInfo record : list) {
+            DictCodeUtils.convertDictCodeToName(record);
+        }
+        super.exportExcel(BizBusinessIdentifyInfo.class, list, ExportEnum.IDENTIFY_EXPORT.getSheetName());
+    }
+
+
+    // TODO: 2023/8/23 查询设备信息，4个底部按钮查设备（按钮的作用就是前端用来调不同接口、用来区分中间即将展示的标识），前端弹窗选设备，在确定保存时前端根据底部按钮判断传入设备类型deviceType字典code
+    // TODO: 2023/8/23 接口：查受检设备（第1个按钮），查设备台账（后3个按钮同一接口），查询之后前端根据标志类型的不同加到中间页面时进行判断（按产品给的对应表）
+    // TODO: 2023/8/23 提供二维码接口，前端在加到中间页面时调用一下
+
+    @ApiOperation("设备二维码")
+    @PostMapping("/equipment/qrCode")
+    public ReturnDTO<String> equipmentQrCode(@RequestBody @Valid IdDTO idDTO) {
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return identifyInfoService.equipmentQrCode(idDTO.getId());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java
index 707be6e..7e0453d 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java
@@ -117,7 +117,7 @@
     }
 
     @ApiOperation("任务单导出")
-    @PostMapping("/export")
+    @PostMapping("/listExport")
     public void orderExport(@RequestBody @Valid OrderListRequest request, HttpServletResponse response) {
         businessOrderService.orderExport(request, response);
     }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java
index 529a6ce..51432be 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java
@@ -1,9 +1,28 @@
 package com.casic.missiles.controller.business;
 
+import com.casic.missiles.controller.GeneralApprovalController;
+import com.casic.missiles.dto.BaseApprovalSubmitRequest;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.business.outsource.OutsourceAssessApprovalListRequest;
+import com.casic.missiles.dto.business.outsource.OutsourceAssessSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
+import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.model.business.BizBusinessOutsourceAssess;
+import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
+import com.casic.missiles.service.IGeneralApprovalService;
+import com.casic.missiles.service.business.IBizBusinessOutsourceAssessService;
 import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.BindingResult;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.validation.Valid;
+import java.util.List;
+
 /**
  * <p>
  * 计量检定业务-分包管理-测试、校准或检定工作分包评审表 前端控制器
@@ -15,6 +34,27 @@
 @Api(tags = "分包管理-测试、校准或检定工作分包评审表")
 @RestController
 @RequestMapping("/business/outsource/assess")
-public class BizBusinessOutsourceAssessController {
+public class BizBusinessOutsourceAssessController extends GeneralApprovalController<BizBusinessOutsourceAssess, BizBusinessOutsourceAssess, OutsourceAssessApprovalListRequest, BaseApprovalSubmitRequest> {
+    @Autowired
+    private IBizBusinessOutsourceAssessService outsourceAssessService;
 
+    public BizBusinessOutsourceAssessController(IGeneralApprovalService<BizBusinessOutsourceAssess, BizBusinessOutsourceAssess, OutsourceAssessApprovalListRequest, BaseApprovalSubmitRequest> baseApprovalService) {
+        super(baseApprovalService);
+    }
+
+    @ApiOperation("草稿箱-保存")
+    @PostMapping("/save")
+    public ReturnDTO<OutsourceAssessSaveResponse> saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceAssess request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        return outsourceAssessService.saveOutsourceAssess(request);
+    }
+
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception {
+        List<BizBusinessOutsourceAssess> list = super.exportList(request);
+        super.exportExcel(BizBusinessOutsourceAssess.class, list, ExportEnum.OUTSOURCE_ASSESS.getSheetName());
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java
new file mode 100644
index 0000000..9adef18
--- /dev/null
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java
@@ -0,0 +1,60 @@
+package com.casic.missiles.controller.business;
+
+import com.casic.missiles.controller.GeneralApprovalController;
+import com.casic.missiles.dto.BaseApprovalSubmitRequest;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.business.outsource.OutsourceProtocolApprovalListRequest;
+import com.casic.missiles.dto.business.outsource.OutsourceProtocolSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
+import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.model.business.BizBusinessOutsourceProtocol;
+import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
+import com.casic.missiles.service.IGeneralApprovalService;
+import com.casic.missiles.service.business.IBizBusinessOutsourceProtocolService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.BindingResult;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.validation.Valid;
+import java.util.List;
+
+/**
+ * <p>
+ * 计量检定业务-分包管理-测试、校准或检定工作分包协议书 前端控制器
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-08-24
+ */
+@Api(tags = "分包管理-测试、校准或检定工作分包协议书")
+@RestController
+@RequestMapping("/business/outsource/protocol")
+public class BizBusinessOutsourceProtocolController extends GeneralApprovalController<BizBusinessOutsourceProtocol, BizBusinessOutsourceProtocol, OutsourceProtocolApprovalListRequest, BaseApprovalSubmitRequest> {
+    @Autowired
+    private IBizBusinessOutsourceProtocolService outsourceProtocolService;
+
+    public BizBusinessOutsourceProtocolController(IGeneralApprovalService<BizBusinessOutsourceProtocol, BizBusinessOutsourceProtocol, OutsourceProtocolApprovalListRequest, BaseApprovalSubmitRequest> baseApprovalService) {
+        super(baseApprovalService);
+    }
+
+    @ApiOperation("草稿箱-保存")
+    @PostMapping("/save")
+    public ReturnDTO<OutsourceProtocolSaveResponse> saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceProtocol request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        return outsourceProtocolService.saveOutsourceProtocol(request);
+    }
+
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody OutsourceProtocolApprovalListRequest request) throws Exception {
+        List<BizBusinessOutsourceProtocol> list = super.exportList(request);
+        super.exportExcel(BizBusinessOutsourceProtocol.class, list, ExportEnum.OUTSOURCE_PROTOCOL.getSheetName());
+    }
+}
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java
index 097f645..f0f0943 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java
@@ -17,7 +17,6 @@
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.IGeneralApprovalService;
 import com.casic.missiles.service.business.IBizBusinessOutsourcerInfoService;
-import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -71,19 +70,8 @@
 
     @ApiOperation("分包方导出")
     @PostMapping("/listExport")
-    public void export(@RequestBody @Valid OutsourcerInfoApprovalListRequest request, BindingResult bindingResult) throws Exception {
-        if (bindingResult.hasErrors()) {
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        }
-        List<BizBusinessOutsourcerInfo> list;
-        if (!CollectionUtils.isEmpty(request.getIds())) {
-            list = outsourcerInfoService.listByIds(request.getIds());
-        } else {
-            list = outsourcerInfoService.list(request);
-        }
-        for (BizBusinessOutsourcerInfo record : list) {
-            DictCodeUtils.convertDictCodeToName(record);
-        }
+    public void export(@RequestBody OutsourcerInfoApprovalListRequest request) throws Exception {
+        List<BizBusinessOutsourcerInfo> list = super.exportList(request);
         super.exportExcel(BizBusinessOutsourcerInfo.class, list, ExportEnum.OUTSOURCER_EXPORT.getSheetName());
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java
index c2cbf9f..0410918 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java
@@ -17,11 +17,9 @@
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.IGeneralApprovalService;
 import com.casic.missiles.service.business.IBizBusinessSiteExecutiveInfoService;
-import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -60,7 +58,7 @@
         return siteExecutiveInfoService.saveSiteExecutiveInfo(siteExecutiveInfo);
     }
 
-    @ApiOperation("现场检测详情")
+    @ApiOperation("详情")
     @PostMapping("/detail")
     public ReturnDTO<SiteExecutiveDetailResponse> siteExecutiveDetail(@RequestBody @Valid IdDTO idDTO) throws Exception {
         Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
@@ -69,21 +67,10 @@
         return ReturnUtil.success(siteExecutiveInfoService.detail(idDTO.getId()));
     }
 
-    @ApiOperation("现场检测导出")
+    @ApiOperation("导出")
     @PostMapping("/listExport")
-    public void export(@RequestBody @Valid SiteExecutiveApprovalListRequest request, BindingResult bindingResult) throws Exception {
-        if (bindingResult.hasErrors()) {
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        }
-        List<SiteExecutiveApprovalListResponse> list;
-        if (!CollectionUtils.isEmpty(request.getIds())) {
-            list = siteExecutiveInfoService.listInfoByIds(request.getIds());
-        } else {
-            list = siteExecutiveInfoService.listInfo(request);
-        }
-        for (SiteExecutiveApprovalListResponse record : list) {
-            DictCodeUtils.convertDictCodeToName(record);
-        }
+    public void export(@RequestBody SiteExecutiveApprovalListRequest request) throws Exception {
+        List<SiteExecutiveApprovalListResponse> list = super.exportList(request);
         super.exportExcel(SiteExecutiveApprovalListResponse.class, list, ExportEnum.SITE_EXECUTIVE_EXPORT.getSheetName());
     }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
index 7e793cd..a92e209 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
@@ -55,7 +55,7 @@
 
     @ApiOperation("设备收发列表导出")
     @PostMapping("/export")
-    public void exportList(@RequestBody @Valid SampleDispatchListRequest request) throws IOException {
+    public void exportList(@RequestBody SampleDispatchListRequest request) throws IOException {
         List<SampleDispatchListResponse> list;
         if (!CollectionUtils.isEmpty(request.getIds())) {
             list = dispatchService.listByIds(request.getIds());
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java
index cdc77fc..d120fd4 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java
@@ -7,6 +7,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.business.labExecutive.*;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.business.IBusinessLabExecutiveInfoService;
@@ -14,6 +15,7 @@
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.*;
 
@@ -32,7 +34,7 @@
     @Autowired
     private IBusinessLabExecutiveInfoService labExecutiveInfoService;
 
-    @ApiOperation("实验室检测-部门检测-查询各状态列表（待检测、检测中、检测完）")
+    @ApiOperation("实验室任务-查询各状态列表（待检测、检测中、检测完）")
     @PostMapping("/deptExecutive/List")
     public ReturnDTO<PageInfoBT<SampleLabExecutiveListResponse>> queryDeptExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
@@ -43,10 +45,19 @@
         return ReturnUtil.success(super.packForBT(labExecutiveInfoService.deptLabExecutiveListPage(page, labExecutiveListRequest)));
     }
 
-    /**
-     * 实验室检测-我的检测-查询各状态列表（待检测、检测中、检测完）
-     */
-    @ApiOperation("实验室检测-我的检测-查询各状态列表（待检测、检测中、检测完）")
+    @ApiOperation("实验室任务导出")
+    @PostMapping("/deptExecutive/export")
+    public void deptExportList(@RequestBody @Valid SampleLabExecutiveListRequest request) throws Exception {
+        List<SampleLabExecutiveListResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = labExecutiveInfoService.deptLabExecutiveListByIds(request.getMeasureStatus(), request.getIds());
+        } else {
+            list = labExecutiveInfoService.deptLabExecutiveList(request);
+        }
+        super.exportExcel(SampleLabExecutiveListResponse.class, list, ExportEnum.DEPT_EXECUTIVE_TASK.getSheetName());
+    }
+
+    @ApiOperation("我的任务-查询各状态列表（待检测、检测中、检测完）")
     @PostMapping("/myExecutive/list")
     public ReturnDTO<PageInfoBT<SampleLabExecutiveListResponse>> queryMyExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
@@ -57,19 +68,25 @@
         return ReturnUtil.success(super.packForBT(labExecutiveInfoService.myLabExecutiveListPage(page, labExecutiveListRequest)));
     }
 
-    /**
-     * 实验室检测-我的检测-查询各状态样品数量（待检测、检测中、检测完）
-     */
-    @ApiOperation("实验室检测-我的检测-查询各状态样品数量（待检测、检测中、检测完）")
+    @ApiOperation("我的任务导出")
+    @PostMapping("/myExecutive/export")
+    public void exportList(@RequestBody @Valid SampleLabExecutiveListRequest request) throws Exception {
+        List<SampleLabExecutiveListResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = labExecutiveInfoService.myLabExecutiveListByIds(request.getMeasureStatus(), request.getIds());
+        } else {
+            list = labExecutiveInfoService.myLabExecutiveList(request);
+        }
+        super.exportExcel(SampleLabExecutiveListResponse.class, list, ExportEnum.MY_EXECUTIVE_TASK.getSheetName());
+    }
+
+    @ApiOperation("我的任务-查询各状态样品数量（待检测、检测中、检测完）")
     @GetMapping("/myExecutive/amount")
     public ReturnDTO<List<SampleAmountResponse>> queryMyExecutiveAmount() {
         return ReturnUtil.success(labExecutiveInfoService.myExecutiveAmount());
     }
 
-    /**
-     * 实验室检测-部门检测-分配（分配给具体人员）
-     */
-    @ApiOperation("实验室检测-部门检测-分配按钮（分配给具体人员）")
+    @ApiOperation("实验室任务-分配按钮（分配给具体人员）")
     @PostMapping("/deptExecutive/allocate")
     public ReturnDTO allocateStaff(@RequestBody @Valid SampleAllocateRequest sampleAllocateRequest, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -78,10 +95,7 @@
         return labExecutiveInfoService.allocateStaff(sampleAllocateRequest);
     }
 
-    /**
-     * 实验室检测-我的检测-检定人扫描收入（待检测->检测中）
-     */
-    @ApiOperation("实验室检测-我的检测-检定人扫描收入（待检测->检测中）")
+    @ApiOperation("我的任务-检定人扫描收入（待检测->检测中）")
     @PostMapping("/myExecutive/receive")
     public ReturnDTO sampleReceive(@RequestBody @Valid List<SampleOperateRequest> requestList, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -90,10 +104,7 @@
         return labExecutiveInfoService.sampleReceive(requestList);
     }
 
-    /**
-     * 实验室检测-负责人/检定人扫描检完（检测中->检测完）
-     */
-    @ApiOperation("实验室检测-负责人/检定人扫描检完（检测中->检测完）")
+    @ApiOperation("实验室任务-负责人/检定人扫描检完（检测中->检测完）")
     @PostMapping("/myExecutive/complete")
     public ReturnDTO sampleExecutiveComplete(@RequestBody @Valid List<SampleOperateRequest> requestList, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -102,10 +113,7 @@
         return labExecutiveInfoService.sampleExecutiveComplete(requestList);
     }
 
-    /**
-     * 实验室检测-部门检测/我的检测 编辑（只能修改应出具证书）
-     */
-    @ApiOperation("实验室检测-部门检测/我的检测 编辑（只能修改应出具证书）")
+    @ApiOperation("实验室任务/我的任务 编辑（只能修改应出具证书）")
     @PostMapping("/executive/update")
     public ReturnDTO updateExecutive(@RequestBody @Valid UpdateExecutiveRequest request, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -114,10 +122,7 @@
         return labExecutiveInfoService.updateExecutive(request);
     }
 
-    /**
-     * 实验室检测-部门检测/我的检测 详情
-     */
-    @ApiOperation("实验室检测-部门检测/我的检测 详情")
+    @ApiOperation("实验室任务/我的任务 详情")
     @PostMapping("/executive/detail")
     public ReturnDTO<ExecutiveDetailResponse> executiveDetail(@RequestBody @Valid ExecutiveDetailRequest request, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
@@ -131,7 +136,7 @@
      * 退回后会将下一个要执行的实验室检测状态更新为待分配，将后面的实验室顺序变更为连续（都进行减1）
      * 最后一个检测的实验室退回，等分发员再增加实验室或设备收发中的已收入直接手动点击完成
      */
-    @ApiOperation("实验室检测-部门检测/我的检测 退回（待检测/检测中->退回）")
+    @ApiOperation("实验室任务/我的任务 退回（待检测/检测中->退回）")
     @PostMapping("/executive/sendBack")
     public ReturnDTO executiveSendBack(@RequestBody @Valid ExecutiveSendBackRequest request, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -140,9 +145,6 @@
         return labExecutiveInfoService.sampleExecutiveSendBack(request);
     }
 
-    /**
-     * 分发员编辑实验室检测列表
-     */
     @ApiOperation("分发员编辑实验室检测列表")
     @PostMapping("/handOut/updateList")
     public ReturnDTO updateExecutiveList(@RequestBody @Valid UpdateExecutiveListRequest request, BindingResult bindingResult) {
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java
index 48a67ed..0c04f31 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java
@@ -10,6 +10,7 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.resource.customer.CustomerApprovalListRequest;
 import com.casic.missiles.dto.resource.customer.CustomerSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceCustomerInfo;
@@ -26,6 +27,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -55,6 +57,13 @@
         return customerInfoService.saveCustomerInfo(request);
     }
 
+    @ApiOperation("委托方名录导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody CustomerApprovalListRequest request) throws Exception {
+        List<BizResourceCustomerInfo> list = super.exportList(request);
+        super.exportExcel(BizResourceCustomerInfo.class, list, ExportEnum.CUSTOMER_INFO.getSheetName());
+    }
+
     @ApiOperation("委托方人员列表（分页）")
     @PostMapping("/person/listPage")
     public ReturnDTO<PageInfoBT<BizResourceCustomerStaff>> personListPage(@RequestBody IdDTO idDto) {
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
index 972ed4b..6418ea5 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
@@ -5,6 +5,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.resource.customer.SuggestFormApprovalListRequest;
 import com.casic.missiles.dto.resource.customer.SuggestFormSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceCustomerSuggestForm;
@@ -20,6 +21,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -50,4 +52,11 @@
         return suggestFormService.saveSuggestForm(request);
     }
 
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody SuggestFormApprovalListRequest request) throws Exception {
+        List<BizResourceCustomerSuggestForm> list = super.exportList(request);
+        super.exportExcel(BizResourceCustomerSuggestForm.class, list, ExportEnum.CUSTOMER_SUGGEST_FORM.getSheetName());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java
index 1934d1a..9e07eab 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java
@@ -15,12 +15,16 @@
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.resource.IEnvEnvironmentRecordConfigService;
 import com.casic.missiles.service.resource.IEnvEnvironmentRecordDataService;
+import com.casic.missiles.service.resource.IEnvLocationInfoService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
 import java.util.List;
@@ -39,6 +43,8 @@
     private IEnvEnvironmentRecordDataService environmentRecordDataService;
     @Autowired
     private IEnvEnvironmentRecordConfigService environmentRecordConfigService;
+    @Autowired
+    private IEnvLocationInfoService locationInfoService;
 
     @ApiOperation("环境记录单数据列表/详情")
     @PostMapping("/data/listPage")
@@ -95,4 +101,11 @@
         });
         return environmentRecordConfigService.deleteEnvironmentRecordConfig(idDTO.getId());
     }
+
+    @ApiOperation("地点列表")
+    @PostMapping("/location/listPage")
+    public ReturnDTO<PageInfoBT<LocationListResponse>> locationListPage(@RequestBody @Valid LocationListRequest request) {
+        Page<LocationListResponse> page = PageFactory.defaultPage();
+        return ReturnUtil.success(super.packForBT(locationInfoService.listPage(page, request)));
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java
index 82efe3f..e9561fa 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java
@@ -10,6 +10,7 @@
 import com.casic.missiles.dto.resource.seal.SealLogListRequest;
 import com.casic.missiles.dto.resource.seal.SealNoteApprovalListRequest;
 import com.casic.missiles.dto.resource.seal.SealNoteSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceSealUseLog;
@@ -27,6 +28,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -58,6 +60,13 @@
         return sealUseNoteService.saveSeal(request);
     }
 
+    @ApiOperation("印章使用登记导出（列表和导出中去掉经办人和监印人）")
+    @PostMapping("/listExport")
+    public void export(@RequestBody SealNoteApprovalListRequest request) throws Exception {
+        List<BizResourceSealUseNote> list = super.exportList(request);
+        super.exportExcel(BizResourceSealUseNote.class, list, ExportEnum.SEAL_NOTE.getSheetName());
+    }
+
     // TODO: 2023/7/28 印章使用日志：系统中使用印章时插入数据库
 
     @ApiOperation("印章使用日志列表（分页）")
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java
index 9b674fc..06b6521 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java
@@ -9,16 +9,20 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.resource.staff.StaffCertRequest;
 import com.casic.missiles.dto.resource.staff.StaffCertResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.service.resource.IBizResourceStaffInfoService;
 import com.casic.missiles.service.resource.IBizResourceStaffVerifierService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.List;
+
 /**
  * @Description:
  * @Author: wangpeng
@@ -41,9 +45,21 @@
         return ReturnUtil.success(super.packForBT(responsePage));
     }
 
+    @ApiOperation("证书逾期提醒导出")
+    @PostMapping("/listExport")
+    public void exportList(@RequestBody StaffCertRequest request) throws Exception {
+        List<StaffCertResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = staffInfoService.certListByIds(request.getIds());
+        } else {
+            list = staffInfoService.certList(request);
+        }
+        super.exportExcel(StaffCertResponse.class, list, ExportEnum.STAFF_CERTIFICATE_EXPIRE.getSheetName());
+    }
+
     @ApiOperation("证书逾期提醒")
     @PostMapping("/expirationReminder")
-    public ReturnDTO expirationReminder(@RequestBody IdDTO idDto) {
-        return verifierService.expirationReminder(idDto);
+    public ReturnDTO expirationReminder(@RequestBody IdDTO idDTO) {
+        return verifierService.expirationReminder(idDTO);
     }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java
index 3b251ad..a6e7850 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java
@@ -12,6 +12,7 @@
 import com.casic.missiles.dto.resource.staff.StaffListRequest;
 import com.casic.missiles.dto.resource.staff.TrainListRequest;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.*;
@@ -22,7 +23,10 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
 import java.util.List;
@@ -52,8 +56,19 @@
             throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
         }
         Page<BizResourceStaffInfo> page = PageFactory.defaultPage();
-        Page<BizResourceStaffInfo> responsePage = staffInfoService.listPage(page, request);
-        return ReturnUtil.success(super.packForBT(responsePage));
+        return ReturnUtil.success(super.packForBT(staffInfoService.listPage(page, request)));
+    }
+
+    @ApiOperation("人员登记导出")
+    @PostMapping("/listExport")
+    public void exportList(@RequestBody StaffListRequest request) throws Exception {
+        List<BizResourceStaffInfo> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = staffInfoService.listByIds(request.getIds());
+        } else {
+            list = staffInfoService.list(request);
+        }
+        super.exportExcel(BizResourceStaffInfo.class, list, ExportEnum.STAFF_INFO.getSheetName());
     }
 
     @ApiOperation("人员登记详情基础信息")
@@ -85,9 +100,9 @@
 
     @ApiOperation("科研教育列表（分页）")
     @PostMapping("/education/listPage")
-    public ReturnDTO<PageInfoBT<BizResourceStaffEducation>> educationListPage(@RequestBody IdDTO idDto) {
+    public ReturnDTO<PageInfoBT<BizResourceStaffEducation>> educationListPage(@RequestBody IdDTO idDTO) {
         Page<BizResourceStaffEducation> page = PageFactory.defaultPage();
-        Page<BizResourceStaffEducation> responsePage = staffInfoService.educationListPage(page, idDto);
+        Page<BizResourceStaffEducation> responsePage = staffInfoService.educationListPage(page, idDTO);
         return ReturnUtil.success(super.packForBT(responsePage));
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java
index af6aa86..d85d84a 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java
@@ -9,6 +9,7 @@
 import com.casic.missiles.dto.resource.outsideService.SupplierApprovalListRequest;
 import com.casic.missiles.dto.resource.outsideService.SupplierSaveResponse;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceSupplierAbility;
@@ -67,6 +68,13 @@
         return ReturnUtil.success(supplierInfoService.detail(idDTO.getId()));
     }
 
+    @ApiOperation("合格供方导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody SupplierApprovalListRequest request) throws Exception {
+        List<BizResourceSupplierInfo> list = super.exportList(request);
+        super.exportExcel(BizResourceSupplierInfo.class, list, ExportEnum.SUPPLIER_INFO.getSheetName());
+    }
+
     @ApiOperation("供方人员列表（分页）")
     @PostMapping("/person/listPage")
     public ReturnDTO<PageInfoBT<BizResourceSupplierPerson>> personListPage(@RequestBody IdDTO idDTO) {
diff --git a/casic-metering-api/src/main/resources/config/application.yml b/casic-metering-api/src/main/resources/config/application.yml
index 350db5f..ecff521 100644
--- a/casic-metering-api/src/main/resources/config/application.yml
+++ b/casic-metering-api/src/main/resources/config/application.yml
@@ -126,7 +126,7 @@
     #作者
     author: wangpeng
     #待生成对象表名
-    table-name: biz_equipment_technical_target_approval,biz_equipment_attachment_approval,biz_equipment_checkpoint_approval
+    table-name: biz_business_outsource_protocol
 
 reminder:
   #节点--common模块config包 ReminderNodeConfig配置
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
index 4a19e4e..d47d552 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
@@ -53,6 +53,7 @@
     SUGGEST_FORM_SAVE_FAILED(2509, "委托方意见登记表保存至草稿箱失败"),
     EXAMINE_FORM_SAVE_FAILED(2510, "要求、委托书及合同评审表保存至草稿箱失败"),
     CUSTOMER_EXIST_SAVE_FAILED(2511, "该委托方已存在，请重新选择"),
+    DUPLICATE_LOCATION_NO(2512, "地点编号已存在"),
 
     /**
      * 计量检定业务模块
@@ -68,6 +69,8 @@
     COMPLETE_SAMPLE_NOT_EXIST(2609, "检测中不存在扫描收入的样品"),
     CANNOT_CHANGE_MEASURE_INFO(2610, "无法更改非当前登录用户的检测信息"),
     NON_EXIST_ORDER_OR_SAMPLE(2611, "不存在该委托单或该委托单下的样品"),
+    OUTSOURCE_ACCESS_SAVE_FAILED(2612, "测试、校准或检定工作分包评审表保存至草稿箱失败"),
+    OUTSOURCE_PROTOCOL_SAVE_FAILED(2613, "测试、校准或检定工作分包协议书保存至草稿箱失败"),
 
     /**
      * 历史遗留备用
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
index 5089ad1..81a406b 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
@@ -10,54 +10,38 @@
     /**
      * 资源管理
      */
-    ENVIRONMENT_DATA_EXPORT("environmentData", "environmentData", "环境记录单数据"),
+    ENVIRONMENT_DATA_EXPORT("environmentData", "环境记录单数据", "环境记录单数据"),
+    STAFF_INFO("staffInfo", "人员登记", "人员登记"),
+    STAFF_CERTIFICATE_EXPIRE("certificateExpire", "证书逾期提醒", "证书逾期提醒"),
+    SUPPLIER_INFO("supplierInfo", "合格供方名录", "合格供方名录"),
+    CUSTOMER_INFO("customerInfo", "委托方名录", "委托方名录"),
+    CUSTOMER_SUGGEST_FORM("customerSuggestForm", "委托方意见登记表", "委托方意见登记表"),
+    SEAL_NOTE("sealNote", "印章使用登记", "印章使用登记"),
 
-    FILE_EXPORT("meterFileData", "meterFileData", "计量文件信息"),
-    TRAIN_PLAN_EXPORT("trainPlanData", "trainPlanData", "培训计划"),
-    TRAIN_LOG_EXPORT("trainLogData", "trainLogData", "培训记录"),
-    METER_ORGANIZE_EXPORT("meterOrganizeData", "meterOrganizeData", "计量组织"),
-    TRACE_SUPPLIER_EXPORT("traceSupplierData", "traceSupplierData", "溯源供方"),
-    SIGN_EXPORT("signData", "signData", "签名/签章"),
-    TEMPLATE_EXPORT("templateData", "templateData", "原始记录模板/证书报告模板"),
-    FIXED_ASSETS("meterFixedAssets", "meterFixedAssets", "固定资产"),
-    METER_EQUIPMENT("meterEquipment", "meterEquipment", "测量设备"),
-    CALIBRATION_TEST_EQUIPMENT("calibrationTestEquipment", "calibrationTestEquipment", "校准检定设备"),
-    MEASURE_ACCOUNT("measureAccount", "measureAccount", "测量工装"),
-    STANDARD_SUPPORT_EQUIPMENT("standardSupportEquipment", "standardSupportEquipment", "标准配套设备"),
-    STANDARD_EQUIPMENT("standardEquipment", "standardEquipment", "标准装置"),
-    FLOW_DEF_EXPORT("flowDefData", "flowDefData", "流程定义"),
-    STAFF_CERTIFICATE("certificate", "certificate", "计量人员证书"),
-    CHECK_INFO("checkInfo", "checkInfo", "设备管理点检测"),
-    EQUIPMENT_APPLY("equipmentApply", "equipmentApply", "设备借用"),
-    STANDARD_EQUIPMENT_REMIND("equipmentApplyRemind", "equipmentApplyRemind", "标准装置到期提醒"),
-    METER_PRICE("meterPrice", "meterPrice", "价格库"),
-    METER_STAFF("meterStaff", "meterStaff", "计量人员"),
-    STANDARD_EQUIPMENT_APPLY("standardEquipmentApply", "standardEquipmentApply", "标准装置申请"),
-    STATE_MANAGE_APPLY("stateManage", "stateManage", "状态管理"),
-    METER_ACCEPTANCE_CHECK("acceptanceCheck", "acceptanceCheck", "设备检修保养验收单"),
-    CUSTOMER_EXPORT("customerData", "customerData", "客户信息"),
-    ORDER_EXPORT("orderData", "orderData", "委托书信息"),
-    SAMPLE_EXPORT("sampleData", "sampleData", "样本信息"),
-    EXCHANGE_DATA("exchangeData", "exchangeData", "设备交接单"),
-    DISPATCH_DATA("dispatchData", "dispatchData", "设备收发"),
-    ENVIRONMENT_DATA("environmentData", "environmentData", "环境记录单"),
-    ORIGIN_DATA("originData", "originData", "原始记录"),
-    CERTIFICATE_REPORT("certificateReport", "certificateReport", "证书报告"),
-    ADVICE_EXPORT("adviceData", "adviceData", "客户反馈"),
-    HANDOUT_EXPORT("handoutData", "handoutData", "任务分发列表"),
-    OUTSOURCER_EXPORT("outsourcerData", "outsourcerData", "分包方"),
-    SITE_EXECUTIVE_EXPORT("siteExecutiveData", "siteExecutiveData", "现场测试、校准或检定"),
-    CERTIFICATE_PRINT_EXPORT("certificatePrintData", "certificatePrintData", "证书打印"),
-    DOWNLOAD_TEMPLATE("downloadTemplate", "downloadTemplate", "页面配置"),
-    OUTSOURCER_CERTIFICATE_EXPORT("outsourceCertificateData", "outsourceCertificateData", "分包证书"),
-    SETTLEMENT_INFO_EXPORT("settlementInfoData", "settlementInfoData", "业务结算"),
-    EQUIPMENT_REMIND("equipmentRemind", "equipmentRemind", "设备到期提醒"),
-    AGREEMENT_INFO_EXPORT("agreementInfoData", "agreementInfoData", "合同"),
-    WORK_STATISTICS_EXPORT("workStatisticsData", "workStatisticsData", "实时工作统计"),
-    DEPT_OUTPUT_EXPORT("deptOutputData", "deptOutputData", "部门产值分析"),
-    WORKLOAD_EXPORT("workloadData", "workloadData", "业务工作量分析"),
-    DEPT_COMPREHENSIVE_EXPORT("deptComprehensiveData", "deptComprehensiveData", "部门综合分析"),
-    ENVIRONMENTAL_RECORD("environmentalRecordData", "environmentalRecordData", "现场环境记录");
+    /**
+     * 计量检定业务
+     */
+    OUTSOURCER_EXPORT("outsourcerData", "分包方名录", "分包方名录"),
+    IDENTIFY_EXPORT("identifyData", "计量标识", "计量标识"),
+    ORDER_EXPORT("orderData", "任务单", "任务单"),
+    DISPATCH_DATA("dispatchData", "设备收发", "设备收发"),
+    HANDOUT_EXPORT("handoutData", "任务分发", "任务分发"),
+    SITE_EXECUTIVE_EXPORT("siteExecutiveData", "现场测试、校准或检定", "现场测试、校准或检定"),
+    CERTIFICATE_REPORT("certificateReport", "证书审批", "证书审批"),
+    CERTIFICATE_CHANGE_APPLY("certificateChangeApply", "证书报告补充或更换申请单", "证书报告补充或更换申请单"),
+    CERTIFICATE_PRINT("certificatePrintData", "证书打印审批", "证书打印审批"),
+    DEPT_EXECUTIVE_TASK("deptExecutiveTaskData", "实验室任务", "实验室任务"),
+    MY_EXECUTIVE_TASK("myExecutiveTaskData", "我的任务", "我的任务"),
+    OUTSOURCE_ASSESS("outsourceAssess", "测试、校准或检定工作分包评审表", "测试、校准或检定工作分包评审表"),
+    OUTSOURCE_PROTOCOL("outsourceProtocol", "测试、校准或检定工作分包协议书", "测试、校准或检定工作分包协议书"),
+
+    /**
+     * 系统管理
+     */
+    SIGN_EXPORT("signData", "签名", "签名"),
+    TEMPLATE_EXPORT("templateData", "文件模板", "文件模板"),
+    FLOW_DEF_EXPORT("flowDefData", "流程定义", "流程定义"),
+    DOWNLOAD_TEMPLATE("downloadTemplate", "流程定义", "页面配置");
 
     ExportEnum(String fileName, String sheetName, String description) {
         this.fileName = fileName;
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateRecordTypeCodeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateRecordTypeCodeEnum.java
index 31d913c..a963522 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateRecordTypeCodeEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateRecordTypeCodeEnum.java
@@ -46,4 +46,14 @@
     String SITE_EXECUTIVE_APPROVAL = "01";
     //《现场测试、校准或检定工作记录表》
     String SITE_EXECUTIVE_LOG = "02";
+
+    //测试、校准或检定工作分包协议书
+    String OUTSOURCE_PROTOCOL = "01";
+    //测试、校准或检定工作分包评审表
+    String OUTSOURCE_ACCESS = "02";
+    //测试、校准或检定工作分包通知书
+    String OUTSOURCE_NOTICE = "03";
+    //测试、校准或检定工作分包方名录
+    String OUTSOURCE_INFO = "04";
+
 }
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
index 24b8635..f78bd53 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
@@ -15,6 +15,10 @@
     String CERTIFICATE_CHANGE_APPLY_BEAN_NAME = "certificateChangeApplyBean";
     //现场测试、校准或检定
     String SITE_EXECUTIVE_BEAN_NAME = "siteExecutiveBean";
+    //测试、校准或检定工作分包评审表
+    String OUTSOURCE_ASSESS_BEAN_NAME = "outsourceAssessBean";
+    //测试、校准或检定工作分包协议书
+    String OUTSOURCE_PROTOCOL_BEAN_NAME = "outsourceProtocolBean";
 
     /*********************************设备与装置************************************/
     //设备台账
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 b21c661..6b86fd1 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
@@ -18,6 +18,8 @@
     OUTSOURCER_APPROVAL(OUTSOURCER_BEAN_NAME, ""),
     CERTIFICATE_CHANGE_APPROVAL(CERTIFICATE_CHANGE_APPLY_BEAN_NAME, ""),
     SITE_EXECUTIVE_APPROVAL(SITE_EXECUTIVE_BEAN_NAME, ""),
+    OUTSOURCE_ASSESS_APPROVAL(OUTSOURCE_ASSESS_BEAN_NAME, ""),
+    OUTSOURCE_PROTOCOL_APPROVAL(OUTSOURCE_PROTOCOL_BEAN_NAME, ""),
 
     ACTION_STATUS_MAP(new HashMap<String, AwareActionStatusEnum>() {
         {
@@ -47,6 +49,10 @@
             put(ApplyFromIdEnum.CERTIFICATE_CHANGE_APPROVAL.getCode(), CERTIFICATE_CHANGE_APPROVAL);
             //现场测试、校准或检定审批
             put(ApplyFromIdEnum.SITE_EXECUTIVE_APPROVAL.getCode(), SITE_EXECUTIVE_APPROVAL);
+            //测试、校准或检定工作分包评审表
+            put(ApplyFromIdEnum.OUTSOURCE_ASSESS_APPROVAL.getCode(), OUTSOURCE_ASSESS_APPROVAL);
+            //测试、校准或检定工作分包协议书
+            put(ApplyFromIdEnum.OUTSOURCE_PROTOCOL_APPROVAL.getCode(), OUTSOURCE_PROTOCOL_APPROVAL);
         }
     });
     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 934405e..c7410bd 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
@@ -9,6 +9,8 @@
     CERTIFICATE_CHANGE_APPROVAL("jljdywzsbchghsqd", MessageSourceModuleEnum.BUSINESS.getCode(), "证书/报告补充或更换申请单"),
     OUTSOURCER_APPROVAL("jljdywcsjzhgfbfml", MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定合格分包方名录"),
     SITE_EXECUTIVE_APPROVAL("jljdywxccsjzsp", MessageSourceModuleEnum.BUSINESS.getCode(), "现场测试、校准或检定审批"),
+    OUTSOURCE_ASSESS_APPROVAL("jljdywcsjzfbpsb", MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包评审表"),
+    OUTSOURCE_PROTOCOL_APPROVAL("jljdywcsjzfbxys", MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包协议书"),
 
 
     /*******************************************设备与装置*********************************************/
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/GeneralApprovalMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/GeneralApprovalMapper.java
index 4fb7344..0c9d6ae 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/GeneralApprovalMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/GeneralApprovalMapper.java
@@ -17,8 +17,4 @@
 
     Page<O> selectBatchForApprovalList(Page<O> page, @Param("request") R request, @Param("businessKeys") List<String> businessKeys);
 
-//    Page<O> selectListPage(Page<O> page, @Param("request") R request);
-
-//    Long selectMaxNo();
-
 }
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceAssessMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceAssessMapper.java
index 7867bb8..ba59009 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceAssessMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceAssessMapper.java
@@ -1,7 +1,12 @@
 package com.casic.missiles.mapper.business;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.business.outsource.OutsourceAssessApprovalListRequest;
+import com.casic.missiles.mapper.GeneralApprovalMapper;
 import com.casic.missiles.model.business.BizBusinessOutsourceAssess;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * <p>
@@ -11,6 +16,10 @@
  * @author wangpeng
  * @since 2023-08-16
  */
-public interface BizBusinessOutsourceAssessMapper extends BaseMapper<BizBusinessOutsourceAssess> {
+public interface BizBusinessOutsourceAssessMapper extends GeneralApprovalMapper<BizBusinessOutsourceAssess, BizBusinessOutsourceAssess, OutsourceAssessApprovalListRequest> {
+
+    Page<BizBusinessOutsourceAssess> selectBatchForApprovalList(Page<BizBusinessOutsourceAssess> page, @Param("request") OutsourceAssessApprovalListRequest request, @Param("businessKeys") List<String> businessKeys);
+
+    Long selectMaxProjectNo();
 
 }
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceProtocolMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceProtocolMapper.java
new file mode 100644
index 0000000..e6aba35
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceProtocolMapper.java
@@ -0,0 +1,24 @@
+package com.casic.missiles.mapper.business;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.business.outsource.OutsourceProtocolApprovalListRequest;
+import com.casic.missiles.mapper.GeneralApprovalMapper;
+import com.casic.missiles.model.business.BizBusinessOutsourceProtocol;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 计量检定业务-分包管理-测试、校准或检定工作分包协议书 Mapper 接口
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-08-24
+ */
+public interface BizBusinessOutsourceProtocolMapper extends GeneralApprovalMapper<BizBusinessOutsourceProtocol, BizBusinessOutsourceProtocol, OutsourceProtocolApprovalListRequest> {
+
+    Page<BizBusinessOutsourceProtocol> selectBatchForApprovalList(Page<BizBusinessOutsourceProtocol> page, @Param("request") OutsourceProtocolApprovalListRequest request, @Param("businessKeys") List<String> businessKeys);
+
+    Long selectMaxProtocolNo();
+}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/EnvLocationInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/EnvLocationInfoMapper.java
new file mode 100644
index 0000000..49eff87
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/EnvLocationInfoMapper.java
@@ -0,0 +1,21 @@
+package com.casic.missiles.mapper.resource;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.resource.environment.LocationListRequest;
+import com.casic.missiles.dto.resource.environment.LocationListResponse;
+import com.casic.missiles.model.resource.EnvLocationInfo;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * <p>
+ * 实验室环境监控系统-设备表 Mapper 接口
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-06-07
+ */
+public interface EnvLocationInfoMapper extends BaseMapper<EnvLocationInfo> {
+
+    Page<LocationListResponse> selectLocationListPage(Page<LocationListResponse> page, @Param("request") LocationListRequest request);
+}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java
index de124db..85ed0f7 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java
@@ -1,7 +1,9 @@
 package com.casic.missiles.mapper.system;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.dto.system.SignDetailResponse;
+import com.casic.missiles.dto.system.SignListRequest;
 import com.casic.missiles.model.system.SystemSign;
 import org.apache.ibatis.annotations.Param;
 
@@ -22,4 +24,8 @@
     SignDetailResponse selectSignDetailById(Long id);
 
     List<SystemSign> selectUsableSignList(@Param("userId") Long userId);
+
+    Page<SystemSign> selectSignListPage(Page<SystemSign> page, @Param("request") SignListRequest request);
+
+    List<SystemSign> selectSignList(@Param("request") SignListRequest request);
 }
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateChangeApplyMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateChangeApplyMapper.xml
index d798447..c496092 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateChangeApplyMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateChangeApplyMapper.xml
@@ -30,31 +30,31 @@
         SELECT *
         FROM biz_business_certificate_change_apply
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.changeApplyNo != null and request.changeApplyNo !=''">
+        <if test="request != null and request.changeApplyNo != null and request.changeApplyNo !=''">
             and change_apply_no like concat('%',#{request.changeApplyNo},'%')
         </if>
-        <if test="request.changeReportNo != null and request.changeReportNo !=''">
+        <if test="request != null and request.changeReportNo != null and request.changeReportNo !=''">
             and change_report_no like concat('%',#{request.changeReportNo},'%')
         </if>
-        <if test="request.changeReportName != null and request.changeReportName !=''">
+        <if test="request != null and request.changeReportName != null and request.changeReportName !=''">
             and change_report_name like concat('%',#{request.changeReportName},'%')
         </if>
-        <if test="request.changeType != null and request.changeType !=''">
+        <if test="request != null and request.changeType != null and request.changeType !=''">
             and change_type = #{request.changeType}
         </if>
-        <if test="request.createUserName != null and request.createUserName !=''">
+        <if test="request != null and request.createUserName != null and request.createUserName !=''">
             and create_user_name like concat('%',#{request.createUserName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificatePrintMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificatePrintMapper.xml
index b66cd99..49c0ac8 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificatePrintMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificatePrintMapper.xml
@@ -31,34 +31,34 @@
         LEFT JOIN biz_business_order_sample_relation bosr ON (bosr.order_id = bcr.order_id AND bosr.sample_id = bcr.sample_id)
         LEFT JOIN biz_business_order_info boi ON boi.id = bosr.order_id
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and bcp.approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.printStatus != null and request.printStatus !=''">
+        <if test="request != null and request.printStatus != null and request.printStatus !=''">
             and print_status = #{request.printStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and bcp.create_user_id = #{request.createUserId}
         </if>
-        <if test="request.certificateReportNo != null and request.certificateReportNo !=''">
+        <if test="request != null and request.certificateReportNo != null and request.certificateReportNo !=''">
             and bcr.certificate_report_no like concat('%',#{request.certificateReportNo},'%')
         </if>
-        <if test="request.certificateReportName != null and request.certificateReportName !=''">
+        <if test="request != null and request.certificateReportName != null and request.certificateReportName !=''">
             and bcr.certificate_report_name like concat('%',#{request.certificateReportName},'%')
         </if>
-        <if test="request.customerName != null and request.customerName !=''">
+        <if test="request != null and request.customerName != null and request.customerName !=''">
             and boi.customer_name like concat('%',#{request.customerName},'%')
         </if>
-        <if test="request.sampleNo != null and request.sampleNo !=''">
+        <if test="request != null and request.sampleNo != null and request.sampleNo !=''">
             and bosr.sample_no like concat('%',#{request.sampleNo},'%')
         </if>
-        <if test="request.sampleName != null and request.sampleName !=''">
+        <if test="request != null and request.sampleName != null and request.sampleName !=''">
             and bosr.sample_name like concat('%',#{request.sampleName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and bcp.create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and bcp.create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml
index b366034..767695d 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml
@@ -46,33 +46,37 @@
         SELECT bcr.*, bosr.sample_no, bosr.sample_name, bosr.sample_model, rsi.staff_name
         FROM biz_business_certificate_report bcr
         LEFT JOIN biz_business_order_sample_relation bosr ON (bosr.order_id = bcr.order_id AND bosr.sample_id = bcr.sample_id)
+        LEFT JOIN biz_business_order_info boi ON boi.id = bcr.order_id
         LEFT JOIN biz_resource_staff_info rsi ON rsi.id = bcr.measure_person_id
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and bcr.approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and bcr.create_user_id = #{request.createUserId}
         </if>
-        <if test="request.certificateReportNo != null and request.certificateReportNo !=''">
+        <if test="request != null and request.customerId != null and request.customerId !=''">
+            and boi.customer_id = #{request.customerId}
+        </if>
+        <if test="request != null and request.certificateReportNo != null and request.certificateReportNo !=''">
             and bcr.certificate_report_no like concat('%',#{request.certificateReportNo},'%')
         </if>
-        <if test="request.certificateReportName != null and request.certificateReportName !=''">
+        <if test="request != null and request.certificateReportName != null and request.certificateReportName !=''">
             and bcr.certificate_report_name like concat('%',#{request.certificateReportName},'%')
         </if>
-        <if test="request.sampleNo != null and request.sampleNo !=''">
+        <if test="request != null and request.sampleNo != null and request.sampleNo !=''">
             and bosr.sample_no like concat('%',#{request.sampleNo},'%')
         </if>
-        <if test="request.measureCategory != null and request.measureCategory !=''">
+        <if test="request != null and request.measureCategory != null and request.measureCategory !=''">
             and bcr.measure_category = #{request.measureCategory}
         </if>
-        <if test="request.measurePerson != null and request.measurePerson !=''">
+        <if test="request != null and request.measurePerson != null and request.measurePerson !=''">
             and rsi.staff_name like concat('%',#{request.measurePerson},'%')
         </if>
-        <if test="request.calibrationTimeStart != null and request.calibrationTimeStart !=''">
+        <if test="request != null and request.calibrationTimeStart != null and request.calibrationTimeStart !=''">
             and bcr.calibration_time &gt;= #{request.calibrationTimeStart}
         </if>
-        <if test="request.calibrationTimeEnd != null and request.calibrationTimeEnd !=''">
+        <if test="request != null and request.calibrationTimeEnd != null and request.calibrationTimeEnd !=''">
             and bcr.calibration_time &lt;= #{request.calibrationTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceAssessMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceAssessMapper.xml
index d0fcf8b..c22c101 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceAssessMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceAssessMapper.xml
@@ -7,6 +7,8 @@
         <id column="id" property="id" />
         <result column="project_no" property="projectNo" />
         <result column="project_name" property="projectName" />
+        <result column="lab_code" property="labCode" />
+        <result column="group_code" property="groupCode" />
         <result column="applicant_id" property="applicantId" />
         <result column="applicant_name" property="applicantName" />
         <result column="applicant_time" property="applicantTime" />
@@ -31,7 +33,45 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, project_no, project_name, applicant_id, applicant_name, applicant_time, minio_file_name, remark, create_user_id, create_user_name, outsourcer_id, pre_start_time, pre_end_time, outsource_reason, pre_cost, approval_status, process_id, approve_situation, traceability, test_method, technique_ability, create_time, update_time
+        id, project_no, project_name, lab_code, group_code, applicant_id, applicant_name, applicant_time, minio_file_name, remark, create_user_id, create_user_name, outsourcer_id, pre_start_time, pre_end_time, outsource_reason, pre_cost, approval_status, process_id, approve_situation, traceability, test_method, technique_ability, create_time, update_time
     </sql>
 
+    <select id="selectMaxProjectNo" resultType="java.lang.Long">
+        SELECT IFNULL(max(RIGHT(project_no, 3)), 0) from biz_business_outsource_assess
+    </select>
+
+    <select id="selectBatchForApprovalList" resultMap="BaseResultMap">
+        SELECT bboa.*, bboi.outsourcer_name, bboi.director
+        FROM biz_business_outsource_assess bboa
+        LEFT JOIN biz_business_outsourcer_info bboi ON bboa.outsourcer_id = bboi.id
+        WHERE 1=1
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
+            and bboa.approval_status = #{request.approvalStatus}
+        </if>
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
+            and bboa.create_user_id = #{request.createUserId}
+        </if>
+        <if test="request != null and request.projectNo != null and request.projectNo !=''">
+            and bboa.project_no like concat('%',#{request.projectNo},'%')
+        </if>
+        <if test="request != null and request.outsourcerName != null and request.outsourcerName !=''">
+            and bboi.outsourcer_name like concat('%',#{request.outsourcerName},'%')
+        </if>
+        <if test="request != null and request.applicantName != null and request.applicantName !=''">
+            and bboa.applicant_name like concat('%',#{request.applicantName},'%')
+        </if>
+        <if test="request != null and request.applicantTimeStart != null and request.applicantTimeStart !=''">
+            and bboa.applicant_time &gt;= #{request.applicantTimeStart}
+        </if>
+        <if test="request != null and request.applicantTimeEnd != null and request.applicantTimeEnd !=''">
+            and bboa.applicant_time &lt;= #{request.applicantTimeEnd}
+        </if>
+        <if test="businessKeys != null">
+            and bboa.id in
+            <foreach collection="businessKeys" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
+        ORDER BY bboa.create_time DESC
+    </select>
 </mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceProtocolMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceProtocolMapper.xml
new file mode 100644
index 0000000..b7b2149
--- /dev/null
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceProtocolMapper.xml
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.mapper.business.BizBusinessOutsourceProtocolMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.business.BizBusinessOutsourceProtocol">
+        <id column="id" property="id" />
+        <result column="protocol_no" property="protocolNo" />
+        <result column="project_name" property="projectName" />
+        <result column="lab_code" property="labCode" />
+        <result column="group_code" property="groupCode" />
+        <result column="outsourcer_id" property="outsourcerId" />
+        <result column="remark" property="remark" />
+        <result column="outsource_no" property="outsourceNo" />
+        <result column="outsource_name" property="outsourceName" />
+        <result column="contacts" property="contacts" />
+        <result column="mobile" property="mobile" />
+        <result column="address" property="address" />
+        <result column="require_date" property="requireDate" />
+        <result column="outsource_cost" property="outsourceCost" />
+        <result column="director" property="director" />
+        <result column="item" property="item" />
+        <result column="requires" property="requires" />
+        <result column="create_user_id" property="createUserId" />
+        <result column="create_user_name" property="createUserName" />
+        <result column="approval_status" property="approvalStatus" />
+        <result column="process_id" property="processId" />
+        <result column="create_time" property="createTime" />
+        <result column="update_time" property="updateTime" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, protocol_no, project_name, lab_code, group_code, outsourcer_id, remark, outsource_no, outsource_name, contacts, mobile, address, require_date, outsource_cost, director, item, requires, create_user_id, create_user_name, approval_status, process_id, create_time, update_time
+    </sql>
+
+    <select id="selectMaxProtocolNo" resultType="java.lang.Long">
+        SELECT IFNULL(max(RIGHT(protocol_no, 3)), 0) from biz_business_outsource_protocol
+    </select>
+
+    <select id="selectBatchForApprovalList" resultMap="BaseResultMap">
+        SELECT *
+        FROM biz_business_outsource_protocol
+        WHERE 1=1
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
+            and approval_status = #{request.approvalStatus}
+        </if>
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
+            and create_user_id = #{request.createUserId}
+        </if>
+        <if test="request != null and request.protocolNo != null and request.protocolNo !=''">
+            and protocol_no like concat('%',#{request.protocolNo},'%')
+        </if>
+        <if test="request != null and request.outsourcerName != null and request.outsourcerName !=''">
+            and outsourcer_name like concat('%',#{request.outsourcerName},'%')
+        </if>
+        <if test="request != null and request.applicantName != null and request.applicantName !=''">
+            and create_user_name like concat('%',#{request.applicantName},'%')
+        </if>
+        <if test="request != null and request.applicantTimeStart != null and request.applicantTimeStart !=''">
+            and create_time &gt;= #{request.applicantTimeStart}
+        </if>
+        <if test="request != null and request.applicantTimeEnd != null and request.applicantTimeEnd !=''">
+            and create_time &lt;= #{request.applicantTimeEnd}
+        </if>
+        <if test="businessKeys != null">
+            and id in
+            <foreach collection="businessKeys" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
+        ORDER BY create_time DESC
+    </select>
+</mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourcerInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourcerInfoMapper.xml
index 510a80b..3049b54 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourcerInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourcerInfoMapper.xml
@@ -7,6 +7,8 @@
         <id column="id" property="id" />
         <result column="outsourcer_no" property="outsourcerNo" />
         <result column="outsourcer_name" property="outsourcerName" />
+        <result column="lab_code" property="labCode" />
+        <result column="group_code" property="groupCode" />
         <result column="outsourcer_brief_name" property="outsourcerBriefName" />
         <result column="outsourcer_size" property="outsourcerSize" />
         <result column="business_size" property="businessSize" />
@@ -55,32 +57,32 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, outsourcer_no, outsourcer_name, outsourcer_brief_name, outsourcer_size, business_size, grade, evaluation, tax_number, bank_account, bank_name, bank_account_number, postal_code, director, phone, fax, mobile, email, website, address_country, address_province, address_city, address_area, full_address, address_country_name, address_province_name, address_city_name, address_area_name, invoice_country, invoice_province, invoice_city, invoice_area, invoice_full_address, invoice_country_name, invoice_province_name, invoice_city_name, invoice_area_name, business_scope, business_content, minio_file_name, approval_status, process_id, remark, create_user_id, create_user_name, create_time, update_time
+        id, outsourcer_no, outsourcer_name, lab_code, group_code, outsourcer_brief_name, outsourcer_size, business_size, grade, evaluation, tax_number, bank_account, bank_name, bank_account_number, postal_code, director, phone, fax, mobile, email, website, address_country, address_province, address_city, address_area, full_address, address_country_name, address_province_name, address_city_name, address_area_name, invoice_country, invoice_province, invoice_city, invoice_area, invoice_full_address, invoice_country_name, invoice_province_name, invoice_city_name, invoice_area_name, business_scope, business_content, minio_file_name, approval_status, process_id, remark, create_user_id, create_user_name, create_time, update_time
     </sql>
 
     <select id="selectBatchForApprovalList" resultMap="BaseResultMap">
         SELECT *
         FROM biz_business_outsourcer_info
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.outsourcerNo != null and request.outsourcerNo !=''">
+        <if test="request != null and request.outsourcerNo != null and request.outsourcerNo !=''">
             and outsourcer_no like concat('%',#{request.outsourcerNo},'%')
         </if>
-        <if test="request.outsourcerName != null and request.outsourcerName !=''">
+        <if test="request != null and request.outsourcerName != null and request.outsourcerName !=''">
             and outsourcer_name like concat('%',#{request.outsourcerName},'%')
         </if>
-        <if test="request.director != null and request.director !=''">
+        <if test="request != null and request.director != null and request.director !=''">
             and director like concat('%',#{request.director},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
@@ -93,6 +95,6 @@
     </select>
 
     <select id="selectMaxNo" resultType="java.lang.Long">
-        SELECT IFNULL(max(RIGHT(outsourcer_no, 12)), 0) from biz_business_outsourcer_info
+        SELECT IFNULL(max(RIGHT(outsourcer_no, 3)), 0) from biz_business_outsourcer_info
     </select>
 </mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessSiteExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessSiteExecutiveInfoMapper.xml
index 135c5d0..3c5ae79 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessSiteExecutiveInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessSiteExecutiveInfoMapper.xml
@@ -38,25 +38,25 @@
         FROM biz_business_site_executive_info bsei
         LEFT JOIN biz_resource_customer_info rci ON bsei.customer_id = rci.id
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and bsei.approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and bsei.create_user_id = #{request.createUserId}
         </if>
-        <if test="request.siteExecutiveNo != null and request.siteExecutiveNo !=''">
+        <if test="request != null and request.siteExecutiveNo != null and request.siteExecutiveNo !=''">
             and bsei.site_executive_no like concat('%',#{request.siteExecutiveNo},'%')
         </if>
-        <if test="request.customerName != null and request.customerName !=''">
+        <if test="request != null and request.customerName != null and request.customerName !=''">
             and rci.outsourcer_name like concat('%',#{request.customerName},'%')
         </if>
-        <if test="request.applyName != null and request.applyName !=''">
+        <if test="request != null and request.applyName != null and request.applyName !=''">
             and bsei.apply_name like concat('%',#{request.applyName},'%')
         </if>
-        <if test="request.applyTimeStart != null and request.applyTimeStart !=''">
+        <if test="request != null and request.applyTimeStart != null and request.applyTimeStart !=''">
             and bsei.apply_time &gt;= #{request.applyTimeStart}
         </if>
-        <if test="request.applyTimeEnd != null and request.applyTimeEnd !=''">
+        <if test="request != null and request.applyTimeEnd != null and request.applyTimeEnd !=''">
             and bsei.apply_time &lt;= #{request.applyTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml
index 84d9e2a..6bd38a9 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml
@@ -105,6 +105,12 @@
         <if test="request.isUrgent != null and request.isUrgent !=''">
             AND bo.is_urgent = #{request.isUrgent}
         </if>
+        <if test="request.ids != null">
+            and blei.id in
+            <foreach collection="request.ids" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
         ORDER BY blei.update_time DESC
     </select>
 
@@ -137,6 +143,12 @@
         <if test="request.isUrgent != null and request.isUrgent !=''">
             AND bo.is_urgent = #{request.isUrgent}
         </if>
+        <if test="request.ids != null">
+            and blei.id in
+            <foreach collection="request.ids" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
         ORDER BY blei.update_time DESC
     </select>
 
diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardInfoMapper.xml
index 1a5551b..2ed8d17 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardInfoMapper.xml
@@ -45,12 +45,6 @@
         FROM biz_equipment_standard_info besi
         LEFT JOIN biz_equipment_standard_technology_relation bestr ON besi.standard_no = bestr.standard_no
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
-            and besi.approval_status = #{request.approvalStatus}
-        </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
-            and besi.create_user_id = #{request.createUserId}
-        </if>
         <if test="request.standardName != null and request.standardName !=''">
             and besi.standard_name like concat('%',#{request.standardName},'%')
         </if>
diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardTechnologyRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardTechnologyRelationMapper.xml
index fc7e16c..cd03c8c 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardTechnologyRelationMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardTechnologyRelationMapper.xml
@@ -6,6 +6,7 @@
     <resultMap id="BaseResultMap" type="com.casic.missiles.model.equipment.BizEquipmentStandardTechnologyRelation">
         <id column="id" property="id" />
         <result column="technology_file_id" property="technologyFileId" />
+        <result column="technology_file_no" property="technologyFileNo" />
         <result column="technology_file_name" property="technologyFileName" />
         <result column="standard_id" property="standardId" />
         <result column="standard_no" property="standardNo" />
@@ -14,7 +15,7 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, technology_file_id, technology_file_name, standard_id, remark
+        id, technology_file_id, technology_file_no, technology_file_name, standard_id, remark
     </sql>
 
 </mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceAuthorizeOrderMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceAuthorizeOrderMapper.xml
index ac5176c..554fe65 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceAuthorizeOrderMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceAuthorizeOrderMapper.xml
@@ -32,22 +32,22 @@
         SELECT *
         FROM biz_resource_authorize_order
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.orderNo != null and request.orderNo !=''">
+        <if test="request != null and request.orderNo != null and request.orderNo !=''">
             and order_no like concat('%',#{request.orderNo},'%')
         </if>
-        <if test="request.createUserName != null and request.createUserName !=''">
+        <if test="request != null and request.createUserName != null and request.createUserName !=''">
             and create_user_name like concat('%',#{request.createUserName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerExamineFormMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerExamineFormMapper.xml
index ab242f6..af7f98f 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerExamineFormMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerExamineFormMapper.xml
@@ -41,28 +41,28 @@
         SELECT *
         FROM biz_resource_customer_examine_form
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.formNo != null and request.formNo !=''">
+        <if test="request != null and request.formNo != null and request.formNo !=''">
             and form_no like concat('%',#{request.formNo},'%')
         </if>
-        <if test="request.labCode != null and request.labCode !=''">
+        <if test="request != null and request.labCode != null and request.labCode !=''">
             and lab_code like concat('%',#{request.labCode},'%')
         </if>
-        <if test="request.groupCode != null and request.groupCode !=''">
+        <if test="request != null and request.groupCode != null and request.groupCode !=''">
             and group_code like concat('%',#{request.groupCode},'%')
         </if>
-        <if test="request.createUserName != null and request.createUserName !=''">
+        <if test="request != null and request.createUserName != null and request.createUserName !=''">
             and create_user_name like concat('%',#{request.createUserName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerInfoMapper.xml
index fa8ffbc..06a2798 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerInfoMapper.xml
@@ -33,25 +33,25 @@
         SELECT *
         FROM biz_resource_customer_info
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.customerNo != null and request.customerNo !=''">
+        <if test="request != null and request.customerNo != null and request.customerNo !=''">
             and customer_no like concat('%',#{request.customerNo},'%')
         </if>
-        <if test="request.customerName != null and request.customerName !=''">
+        <if test="request != null and request.customerName != null and request.customerName !=''">
             and customer_name like concat('%',#{request.customerName},'%')
         </if>
-        <if test="request.contacts != null and request.contacts !=''">
+        <if test="request != null and request.contacts != null and request.contacts !=''">
             and contacts like concat('%',#{request.contacts},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerSuggestFormMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerSuggestFormMapper.xml
index 28f5bb2..1806662 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerSuggestFormMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerSuggestFormMapper.xml
@@ -33,28 +33,28 @@
         SELECT *
         FROM biz_resource_customer_suggest_form
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.formNo != null and request.formNo !=''">
+        <if test="request != null and request.formNo != null and request.formNo !=''">
             and form_no like concat('%',#{request.formNo},'%')
         </if>
-        <if test="request.customerName != null and request.customerName !=''">
+        <if test="request != null and request.customerName != null and request.customerName !=''">
             and customer_name like concat('%',#{request.customerName},'%')
         </if>
-        <if test="request.customerDeptName != null and request.customerDeptName !=''">
+        <if test="request != null and request.customerDeptName != null and request.customerDeptName !=''">
             and customer_dept_name like concat('%',#{request.customerDeptName},'%')
         </if>
-        <if test="request.createUserName != null and request.createUserName !=''">
+        <if test="request != null and request.createUserName != null and request.createUserName !=''">
             and create_user_name like concat('%',#{request.createUserName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSealUseNoteMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSealUseNoteMapper.xml
index ab37bc1..b02bb33 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSealUseNoteMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSealUseNoteMapper.xml
@@ -29,32 +29,32 @@
     </sql>
 
     <select id="selectBatchForApprovalList" resultMap="BaseResultMap">
-        SELECT *
+        SELECT brsun.*, brsi.seal_name, brsi.seal_type, brsi.approver_name
         FROM biz_resource_seal_use_note brsun
         JOIN biz_resource_seal_info brsi ON brsun.seal_id = brsi.id
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and brsun.approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and brsun.create_user_id = #{request.createUserId}
         </if>
-        <if test="request.sealName != null and request.sealName !=''">
+        <if test="request != null and request.sealName != null and request.sealName !=''">
             and brsi.seal_name like concat('%',#{request.sealName},'%')
         </if>
-        <if test="request.sealType != null and request.sealType !=''">
+        <if test="request != null and request.sealType != null and request.sealType !=''">
             and brsi.seal_type = #{request.sealType}
         </if>
-        <if test="request.applyDeptName != null and request.applyDeptName !=''">
+        <if test="request != null and request.applyDeptName != null and request.applyDeptName !=''">
             and brsun.apply_dept_name like concat('%',#{request.applyDeptName},'%')
         </if>
-        <if test="request.applyUserName != null and request.applyUserName !=''">
+        <if test="request != null and request.applyUserName != null and request.applyUserName !=''">
             and brsun.apply_user_name like concat('%',#{request.applyUserName},'%')
         </if>
-        <if test="request.applyTimeStart != null and request.applyTimeStart !=''">
+        <if test="request != null and request.applyTimeStart != null and request.applyTimeStart !=''">
             and brsun.apply_time &gt;= #{request.applyTimeStart}
         </if>
-        <if test="request.applyTimeEnd != null and request.applyTimeEnd !=''">
+        <if test="request != null and request.applyTimeEnd != null and request.applyTimeEnd !=''">
             and brsun.apply_time &lt;= #{request.applyTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml
index 119bf7d..4f8392a 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml
@@ -31,6 +31,12 @@
         <if test="request.deptName != null and request.deptName !=''">
             and brsi.dept_name like concat('%',#{request.deptName},'%')
         </if>
+        <if test="request.ids != null">
+            and brsv.id in
+            <foreach collection="request.ids" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
         ORDER BY brsv.grant_date DESC
     </select>
 
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSupplierInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSupplierInfoMapper.xml
index fe8d399..e8ce7ef 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSupplierInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSupplierInfoMapper.xml
@@ -48,28 +48,28 @@
         SELECT *
         FROM biz_resource_supplier_info
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.supplierNo != null and request.supplierNo !=''">
+        <if test="request != null and request.supplierNo != null and request.supplierNo !=''">
             and supplier_no like concat('%',#{request.supplierNo},'%')
         </if>
-        <if test="request.supplierName != null and request.supplierName !=''">
+        <if test="request != null and request.supplierName != null and request.supplierName !=''">
             and supplier_name like concat('%',#{request.supplierName},'%')
         </if>
-        <if test="request.director != null and request.director !=''">
+        <if test="request != null and request.director != null and request.director !=''">
             and director like concat('%',#{request.director},'%')
         </if>
-        <if test="request.supplierType != null and request.supplierType !=''">
+        <if test="request != null and request.supplierType != null and request.supplierType !=''">
             and supplier_type = #{request.supplierType}
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/EnvLocationInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/EnvLocationInfoMapper.xml
new file mode 100644
index 0000000..68bcf10
--- /dev/null
+++ b/casic-metering-dao/src/main/resources/mapper/resource/EnvLocationInfoMapper.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.mapper.resource.EnvLocationInfoMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.resource.EnvLocationInfo">
+        <id column="id" property="id" />
+        <result column="location_no" property="locationNo" />
+        <result column="location_name" property="locationName" />
+        <result column="location_position" property="locationPosition" />
+        <result column="create_user_id" property="createUserId" />
+        <result column="create_user" property="createUser" />
+        <result column="create_time" property="createTime" />
+        <result column="update_time" property="updateTime" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, location_no, location_name, location_position, create_user_id, create_user, create_time, update_time
+    </sql>
+
+    <select id="selectLocationListPage" resultType="com.casic.missiles.dto.resource.environment.LocationListResponse">
+        SELECT *
+        FROM env_location_info
+        WHERE 1=1
+        <if test="request.locationNo != null and request.locationNo !=''">
+            AND location_no LIKE concat('%',#{request.locationNo},'%')
+        </if>
+        <if test="request.locationName != null and request.locationName !=''">
+            AND location_name LIKE concat('%',#{request.locationName},'%')
+        </if>
+        ORDER BY create_time DESC
+    </select>
+
+</mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml
index b28c18f..8854047 100644
--- a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml
@@ -11,7 +11,6 @@
         <result column="sign_desc" property="signDesc" />
         <result column="sign_director" property="signDirector" />
         <result column="sign_user_id" property="signUserId" />
-        <result column="sign_type" property="signType" />
         <result column="minio_file_name" property="minioFileName" />
         <result column="create_time" property="createTime" />
         <result column="update_time" property="updateTime" />
@@ -28,7 +27,6 @@
         <result column="sign_name" property="signName" />
         <result column="sign_desc" property="signDesc" />
         <result column="sign_director" property="signDirector" />
-        <result column="sign_type" property="signType" />
         <result column="sign_user_id" property="signUserId" />
         <result column="minio_file_name" property="minioFileName" />
         <result column="create_time" property="createTime" />
@@ -62,4 +60,58 @@
         JOIN system_sign_user_relation ssur ON ss.id = ssur.sign_id
         WHERE ssur.user_id = #{userId}
     </select>
+
+    <select id="selectSignListPage" resultMap="BaseResultMap">
+        SELECT ss.*, sd.SIMPLE_NAME AS deptName
+        FROM system_sign ss
+        LEFT JOIN sys_user su ON su.id = ss.sign_user_id
+        LEFT JOIN sys_dept sd ON sd.id = su.dept_id
+        WHERE 1=1
+        <if test="request.signNo != null and request.signNo !=''">
+            AND ss.sign_no LIKE concat('%',#{request.signNo},'%')
+        </if>
+        <if test="request.signName != null and request.signName !=''">
+            AND ss.sign_name LIKE concat('%',#{request.signName},'%')
+        </if>
+        <if test="request.signDirector != null and request.signDirector !=''">
+            AND ss.sign_director LIKE concat('%',#{request.signDirector},'%')
+        </if>
+        <if test="request.signUserId != null and request.signUserId !=''">
+            AND ss.sign_user_id = #{request.signUserId}
+        </if>
+        <if test="request.createStartTime != null and request.createStartTime !=''">
+            AND DATE_FORMAT(ss.create_time,'%Y-%m-%d') &gt;= DATE_FORMAT(#{request.createStartTime},'%Y-%m-%d')
+        </if>
+        <if test="request.createEndTime != null and request.createEndTime !=''">
+            AND DATE_FORMAT(ss.create_time,'%Y-%m-%d')  &lt;= DATE_FORMAT(#{request.createEndTime},'%Y-%m-%d')
+        </if>
+        ORDER BY ss.create_time DESC
+    </select>
+
+    <select id="selectSignList" resultMap="BaseResultMap">
+        SELECT ss.*, sd.SIMPLE_NAME AS deptName
+        FROM system_sign ss
+        LEFT JOIN sys_user su ON su.id = ss.sign_user_id
+        LEFT JOIN sys_dept sd ON sd.id = su.dept_id
+        WHERE 1=1
+        <if test="request.signNo != null and request.signNo !=''">
+            AND ss.sign_no LIKE concat('%',#{request.signNo},'%')
+        </if>
+        <if test="request.signName != null and request.signName !=''">
+            AND ss.sign_name LIKE concat('%',#{request.signName},'%')
+        </if>
+        <if test="request.signDirector != null and request.signDirector !=''">
+            AND ss.sign_director LIKE concat('%',#{request.signDirector},'%')
+        </if>
+        <if test="request.signUserId != null and request.signUserId !=''">
+            AND ss.sign_user_id = #{request.signUserId}
+        </if>
+        <if test="request.createStartTime != null and request.createStartTime !=''">
+            AND DATE_FORMAT(ss.create_time,'%Y-%m-%d') &gt;= DATE_FORMAT(#{request.createStartTime},'%Y-%m-%d')
+        </if>
+        <if test="request.createEndTime != null and request.createEndTime !=''">
+            AND DATE_FORMAT(ss.create_time,'%Y-%m-%d')  &lt;= DATE_FORMAT(#{request.createEndTime},'%Y-%m-%d')
+        </if>
+        ORDER BY ss.create_time DESC
+    </select>
 </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 515050a..60f530b 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
@@ -47,8 +47,8 @@
     String STORAGE_LOCATION = "bizStorageLocation";
     //计量专业
     String MEASURE_MAJOR = "bizMeasureMajor";
-    //管理状态
-    String MANAGER_STATE = "bizManagerState";
+    //标准装置管理状态
+    String STANDARD_MANAGER_STATE = "bizStandardManagerState";
 
     /**
      * 资源管理 字典code
@@ -95,8 +95,6 @@
     String MEASURE_STATUS = "measureStatus";
     //检定方式
     String MEASURE_TYPE = "measureType";
-    //标识打印标志类型
-    String IDENTIFY_PRINT_TYPE = "bizBusinessIdentify";
     //变更类型
     String REPORT_CHANGE_TYPE = "bizCertChangeType";
     //规模类型
@@ -111,19 +109,24 @@
     String MEASURE_CATEGORY = "measureCategory";
     //检定结果
     String MEASURE_RESULT = "measureResult";
+    //分包原因
+    String OUTSOURCE_REASON = "outsourceReason";
+
+    /**
+     * 系统管理
+     */
+    String TEMPLATE_TYPE = "templateType";
+
 
     /**
      * 标准装置 字典code
      */
     //类别
     String STANDARD_CATEGORY = "standardCategory";
-    //管理状态
-    String STANDARD_MANAGER_STATE = "standardManagerState";
     //标准等级
     String STANDARD_LEVEL = "standardLevel";
     //传递范围
     String STANDARD_TRANSMIT_RANGE = "transmitRange";
-
     //资本来源
     String CAPITAL_SOURCE = "capitalSource";
     //标准装置-申请类型
@@ -148,8 +151,6 @@
     String CERTIFICATE_CLASS = "certificationClass";
     //证书管理-检校专业
     String CALIBRATION_MAJOR = "calibrationMajor";
-    //分包原因
-    String OUTSOURCE_REASON = "outsourceReason";
 
     /**
      * 工作台
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/BaseApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/BaseApprovalListRequest.java
index 73c12c1..80d7424 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/BaseApprovalListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/BaseApprovalListRequest.java
@@ -6,6 +6,7 @@
 
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotEmpty;
+import java.util.List;
 
 /**
  * @Description:
@@ -19,14 +20,14 @@
      * 表单id
      */
     @NotBlank(message = "表单id不能为空")
-    @ApiModelProperty(value = "表单id（流程定义对应的表单id，等价于业务id）", dataType = "String")
+    @ApiModelProperty(value = "表单id（流程定义对应的表单id，等价于业务id），导出接口不用传", dataType = "String")
     private String formId;
 
     /**
      * 审批状态类型，对应ApprovalStatusEnum
      */
     @NotEmpty(message = "审批状态类型不能为空")
-    @ApiModelProperty(value = "审批状态类型code", dataType = "String")
+    @ApiModelProperty(value = "审批状态类型code，导出接口不用传", dataType = "String")
     private String approvalStatus;
 
     @ApiModelProperty(hidden = true)
@@ -34,4 +35,7 @@
 
     @ApiModelProperty(hidden = true)
     private Long createUserId;
+
+    @ApiModelProperty(value = "导出ids", dataType = "List")
+    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificatePrintApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificatePrintApprovalListRequest.java
index b93d1c9..3cc2f4e 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificatePrintApprovalListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificatePrintApprovalListRequest.java
@@ -5,8 +5,6 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import java.util.List;
-
 /**
  * @Description:
  * @Author: wangpeng
@@ -38,7 +36,4 @@
 
     @ApiModelProperty(value = "创建结束时间", dataType = "String")
     private String createTimeEnd;
-
-    @ApiModelProperty(value = "导出ids", dataType = "List")
-    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportApprovalListRequest.java
index 4f7a038..c115847 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportApprovalListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportApprovalListRequest.java
@@ -5,8 +5,6 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import java.util.List;
-
 /**
  * @Description:
  * @Author: wangpeng
@@ -15,6 +13,8 @@
 @ApiModel
 @Data
 public class CertificateReportApprovalListRequest extends BaseApprovalListRequest {
+    @ApiModelProperty(value = "委托方id", dataType = "String")
+    private Long customerId;
 
     @ApiModelProperty(value = "证书报告编号", dataType = "String")
     private String certificateReportNo;
@@ -37,6 +37,4 @@
     @ApiModelProperty(value = "检校结束时间", dataType = "String")
     private String calibrationTimeEnd;
 
-    @ApiModelProperty(value = "导出ids", dataType = "List")
-    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/identify/IdentifyListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/identify/IdentifyListRequest.java
index 1b87ae6..f019203 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/identify/IdentifyListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/identify/IdentifyListRequest.java
@@ -4,6 +4,8 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * @Description:
  * @Author: wangpeng
@@ -26,4 +28,7 @@
 
     @ApiModelProperty(value = "打印结束时间", dataType = "String")
     private String createTimeEnd;
+
+    @ApiModelProperty(value = "导出ids", dataType = "List")
+    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListRequest.java
index 1264883..62415fb 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListRequest.java
@@ -7,6 +7,7 @@
 import lombok.Data;
 
 import javax.validation.constraints.NotBlank;
+import java.util.List;
 
 @Data
 @ApiModel
@@ -37,4 +38,6 @@
     @ApiModelProperty(value = "是否加急（1是0否null全部）", dataType = "Integer")
     private String isUrgent;
 
+    @ApiModelProperty(value = "导出ids", dataType = "List")
+    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListRequest.java
index 5201d7b..499760a 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListRequest.java
@@ -17,6 +17,9 @@
     @ApiModelProperty(value = "任务单编号", dataType = "String")
     private String orderNo;
 
+    @ApiModelProperty(value = "委托方id", dataType = "Long")
+    private Long customerId;
+
     @ApiModelProperty(value = "委托方名称", dataType = "String")
     private String customerName;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OrderSampleDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OrderSampleDTO.java
new file mode 100644
index 0000000..796edc0
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OrderSampleDTO.java
@@ -0,0 +1,19 @@
+package com.casic.missiles.dto.business.outsource;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/8/24 11:38
+ */
+@ApiModel
+@Data
+public class OrderSampleDTO {
+    @ApiModelProperty(value = "任务单id", dataType = "Long")
+    private Long orderId;
+    @ApiModelProperty(value = "受检设备id", dataType = "Long")
+    private Long sampleId;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceAssessApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceAssessApprovalListRequest.java
new file mode 100644
index 0000000..9a930c3
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceAssessApprovalListRequest.java
@@ -0,0 +1,30 @@
+package com.casic.missiles.dto.business.outsource;
+
+import com.casic.missiles.dto.BaseApprovalListRequest;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/8/24 11:01
+ */
+@ApiModel
+@Data
+public class OutsourceAssessApprovalListRequest extends BaseApprovalListRequest {
+    @ApiModelProperty(value = "评审表编号", dataType = "String")
+    private String projectNo;
+
+    @ApiModelProperty(value = "分包机构名称", dataType = "String")
+    private String outsourcerName;
+
+    @ApiModelProperty(value = "申请人", dataType = "String")
+    private String applicantName;
+
+    @ApiModelProperty(value = "申请时间开始", dataType = "String")
+    private String applicantTimeStart;
+
+    @ApiModelProperty(value = "申请时间结束", dataType = "String")
+    private String applicantTimeEnd;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceAssessSaveResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceAssessSaveResponse.java
new file mode 100644
index 0000000..8bf9aad
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceAssessSaveResponse.java
@@ -0,0 +1,20 @@
+package com.casic.missiles.dto.business.outsource;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/8/14 16:17
+ */
+@ApiModel
+@Data
+public class OutsourceAssessSaveResponse {
+    @ApiModelProperty(value = "主键id", dataType = "Long")
+    private Long id;
+
+    @ApiModelProperty(value = "编号", dataType = "String")
+    private String projectNo;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProtocolApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProtocolApprovalListRequest.java
new file mode 100644
index 0000000..0f32331
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProtocolApprovalListRequest.java
@@ -0,0 +1,30 @@
+package com.casic.missiles.dto.business.outsource;
+
+import com.casic.missiles.dto.BaseApprovalListRequest;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/8/24 15:01
+ */
+@ApiModel
+@Data
+public class OutsourceProtocolApprovalListRequest extends BaseApprovalListRequest {
+    @ApiModelProperty(value = "协议书编号", dataType = "String")
+    private String protocolNo;
+
+    @ApiModelProperty(value = "分包方名称", dataType = "String")
+    private String outsourcerName;
+
+    @ApiModelProperty(value = "申请人", dataType = "String")
+    private String applicantName;
+
+    @ApiModelProperty(value = "申请时间开始", dataType = "String")
+    private String applicantTimeStart;
+
+    @ApiModelProperty(value = "申请时间结束", dataType = "String")
+    private String applicantTimeEnd;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProtocolSaveResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProtocolSaveResponse.java
new file mode 100644
index 0000000..e324967
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProtocolSaveResponse.java
@@ -0,0 +1,20 @@
+package com.casic.missiles.dto.business.outsource;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/8/14 16:17
+ */
+@ApiModel
+@Data
+public class OutsourceProtocolSaveResponse {
+    @ApiModelProperty(value = "主键id", dataType = "Long")
+    private Long id;
+
+    @ApiModelProperty(value = "编号", dataType = "String")
+    private String protocolNo;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveApprovalListRequest.java
index f29f4e4..7047c28 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveApprovalListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveApprovalListRequest.java
@@ -5,8 +5,6 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import java.util.List;
-
 /**
  * @Description: 现场检测审批列表请求实体
  * @Author: wangpeng
@@ -30,7 +28,4 @@
     @ApiModelProperty(value = "申请时间结束", dataType = "String")
     private String applyTimeEnd;
 
-    @ApiModelProperty(value = "导出ids", dataType = "List")
-    private List<Long> ids;
-
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveDetailResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveDetailResponse.java
index 1f28752..394c934 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveDetailResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveDetailResponse.java
@@ -12,6 +12,18 @@
     @ApiModelProperty(value = "id，更新/删除使用参数", dataType = "Long")
     private Long id;
 
+    @ApiModelProperty(value = "实验室代码(字典code)", dataType = "String")
+    private String labCode;
+
+    @ApiModelProperty(value = "实验室代码(字典value)", dataType = "String")
+    private String labCodeName;
+
+    @ApiModelProperty(value = "组别代码(字典code)", dataType = "String")
+    private String groupCode;
+
+    @ApiModelProperty(value = "组别代码(字典value)", dataType = "String")
+    private String groupCodeName;
+
     @ApiModelProperty(value = "审批编号", dataType = "String")
     private String siteExecutiveNo;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/environment/LocationListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/environment/LocationListRequest.java
new file mode 100644
index 0000000..13d03c3
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/environment/LocationListRequest.java
@@ -0,0 +1,20 @@
+package com.casic.missiles.dto.resource.environment;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/6/8 13:56
+ */
+@ApiModel
+@Data
+public class LocationListRequest {
+    @ApiModelProperty(value = "地点编号", dataType = "String")
+    private String locationNo;
+
+    @ApiModelProperty(value = "地点名称", dataType = "String")
+    private String locationName;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/environment/LocationListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/environment/LocationListResponse.java
new file mode 100644
index 0000000..4c531af
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/environment/LocationListResponse.java
@@ -0,0 +1,78 @@
+package com.casic.missiles.dto.resource.environment;
+
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
+import com.baomidou.mybatisplus.annotation.TableField;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description: 地点列表响应实体
+ * @Author: wangpeng
+ * @Date: 2023/6/8 13:53
+ */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
+@ApiModel
+@Data
+public class LocationListResponse {
+    @ApiModelProperty(value = "主键id", dataType = "Long")
+    private Long id;
+
+    /**
+     * 地点编号
+     */
+    @ExcelProperty("地点编号")
+    @ApiModelProperty(value = "地点编号", dataType = "String")
+    private String locationNo;
+
+    /**
+     * 地点名称
+     */
+    @ExcelProperty("地点名称")
+    @ApiModelProperty(value = "地点名称", dataType = "String")
+    private String locationName;
+
+    /**
+     * 地点位置
+     */
+    @ExcelProperty("地点位置")
+    @ApiModelProperty(value = "地点位置", dataType = "String")
+    private String locationPosition;
+
+    /**
+     * 创建人id
+     */
+    @ApiModelProperty(value = "创建人id", dataType = "Long")
+    private Long createUserId;
+
+    /**
+     * 创建人
+     */
+    @ExcelProperty("创建人")
+    @ApiModelProperty(value = "创建人", dataType = "String")
+    @TableField("create_user")
+    private String createUser;
+
+    /**
+     * 创建时间
+     */
+    @ExcelProperty("创建时间")
+    @ApiModelProperty(value = "创建时间", dataType = "String")
+    private String createTime;
+
+    /**
+     * 更新时间
+     */
+    @ApiModelProperty(value = "更新时间", dataType = "String")
+    private String updateTime;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertRequest.java
index 9a7f6c6..c827915 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertRequest.java
@@ -4,6 +4,8 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * @Description:
  * @Author: wangpeng
@@ -16,4 +18,7 @@
     private String name;
     @ApiModelProperty(value = "部门名", dataType = "String")
     private String deptName;
+
+    @ApiModelProperty(value = "导出ids", dataType = "List")
+    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertResponse.java
index f78b159..8f2f79e 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertResponse.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.dto.resource.staff;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.casic.missiles.annotation.DictCodeField;
 import com.casic.missiles.constants.MeterDictCode;
 import io.swagger.annotations.ApiModel;
@@ -13,12 +20,18 @@
  * @Author: wangpeng
  * @Date: 2023/7/27 15:13
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @ApiModel
 @Data
 public class StaffCertResponse {
     /**
      * 人员编号
      */
+    @ExcelProperty(value = "人员编号",order = 0)
     @NotEmpty(message = "人员编号不能为空")
     @ApiModelProperty(value = "人员编号", dataType = "String")
     private String staffNo;
@@ -26,6 +39,7 @@
     /**
      * 姓名
      */
+    @ExcelProperty(value = "姓名",order = 1)
     @ApiModelProperty(value = "姓名", dataType = "String")
     private String staffName;
 
@@ -54,6 +68,7 @@
     /**
      * 部门名字
      */
+    @ExcelProperty(value = "工作部门",order = 2)
     @ApiModelProperty(value = "部门名字", dataType = "String")
     private String deptName;
 
@@ -66,6 +81,7 @@
     /**
      * 计量专业
      */
+    @ExcelProperty(value = "计量专业",order = 3)
     @ApiModelProperty(value = "计量专业", dataType = "String")
     private String major;
 
@@ -110,6 +126,7 @@
     /**
      * 证书号
      */
+    @ExcelProperty(value = "证号",order = 4)
     @ApiModelProperty(value = "证书号", dataType = "String")
     private String certNo;
 
@@ -122,12 +139,14 @@
     /**
      * 有效日期
      */
+    @ExcelProperty(value = "证书有效期",order = 6)
     @ApiModelProperty(value = "有效日期", dataType = "String")
     private String effectiveDate;
 
     /**
      * 发放日期
      */
+    @ExcelProperty(value = "发证日期",order = 5)
     @ApiModelProperty(value = "发放日期", dataType = "String")
     private String grantDate;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffListRequest.java
index 7c4afb3..0a1194a 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffListRequest.java
@@ -4,6 +4,8 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * @Description:
  * @Author: wangpeng
@@ -18,4 +20,7 @@
     private String deptName;
     @ApiModelProperty(value = "部门id", dataType = "Long")
     private Long deptId;
+
+    @ApiModelProperty(value = "导出ids", dataType = "List")
+    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/TrainListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/TrainListRequest.java
index f68597b..6321f8b 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/TrainListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/TrainListRequest.java
@@ -14,6 +14,8 @@
 public class TrainListRequest {
     @ApiModelProperty(value = "训练登记表编号", dataType = "String")
     private String trainNo;
+    @ApiModelProperty(value = "值班领导", dataType = "String")
+    private String dutyLeader;
     @ApiModelProperty(value = "创建开始时间", dataType = "String")
     private String createTimeStart;
     @ApiModelProperty(value = "创建结束时间", dataType = "String")
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/SignAddRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/SignAddRequest.java
index 117be34..d71055c 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/SignAddRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/SignAddRequest.java
@@ -43,13 +43,6 @@
     private Long signUserId;
 
     /**
-     * 签章或签名-字典code
-     */
-    @NotBlank(message = "类型不能为空")
-    @ApiModelProperty(value = "签名/签章-字典code", dataType = "String", required = true)
-    private String signType;
-
-    /**
      * minio存储文件名
      */
     @ApiModelProperty(value = "上传文件返回名称", dataType = "String")
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateAddRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateAddRequest.java
index aff1265..6316648 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateAddRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateAddRequest.java
@@ -17,30 +17,28 @@
 @Data
 public class TemplateAddRequest extends BaseSystemRequest {
     /**
-     * 原始记录模板/证书报告模板名称
+     * 模板名称
      */
     @ApiModelProperty(value = "名称", dataType = "String", required = true)
     @NotBlank(message = "名称不能为空")
     private String templateName;
 
     /**
-     * 原始记录模板/证书报告模板描述
+     * 模板描述
      */
     @ApiModelProperty(value = "描述", dataType = "String")
     private String templateDesc;
 
     /**
-     * 原始记录模板/证书报告模板创建人
+     * 创建人
      */
     @ApiModelProperty(value = "创建人", dataType = "String", required = true)
     @NotBlank(message = "创建人不能为空")
     private String templateCreator;
 
-    /**
-     * 原始记录模板/证书报告模板-字典code
-     */
-    @NotBlank(message = "类型不能为空")
-    @ApiModelProperty(value = "原始记录模板/证书报告模板-字典code", dataType = "String", required = true)
+
+    @NotBlank(message = "模板类型不能为空")
+    @ApiModelProperty(value = "模板类型(字典code)", dataType = "String", required = true)
     private String templateType;
 
     /**
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateListRequest.java
index eec5a1e..6d17bbe 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateListRequest.java
@@ -1,11 +1,12 @@
 package com.casic.missiles.dto.system;
 
+import com.casic.missiles.annotation.DictCodeField;
+import com.casic.missiles.constants.MeterDictCode;
 import com.casic.missiles.dto.BaseSystemRequest;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import javax.validation.constraints.NotBlank;
 import java.util.List;
 
 /**
@@ -19,8 +20,8 @@
     /**
      * 类型
      */
-//    @ApiModelProperty(value = "类型-字典code", dataType = "String", required = true)
-    @NotBlank(message = "类型不能为空")
+    @DictCodeField(message = "模板类型不合法", cacheName = MeterDictCode.TEMPLATE_TYPE)
+    @ApiModelProperty(value = "模板类型(字典code)", dataType = "String")
     private String templateType;
 
     /**
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificateChangeApply.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificateChangeApply.java
index 9216308..36923fd 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificateChangeApply.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificateChangeApply.java
@@ -1,11 +1,19 @@
 package com.casic.missiles.model.business;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 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 com.casic.missiles.dto.BaseRequest;
+import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -20,6 +28,12 @@
  * @author wangpeng
  * @since 2023-08-15
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
+@ApiModel
 @Data
 @TableName("biz_business_certificate_change_apply")
 public class BizBusinessCertificateChangeApply extends BaseRequest implements Serializable {
@@ -33,6 +47,7 @@
     /**
      * 申请单编号
      */
+    @ExcelProperty(value = "申请单编号", order = 1)
     @ApiModelProperty(value = "申请单编号", dataType = "String")
     @TableField("change_apply_no")
     private String changeApplyNo;
@@ -40,6 +55,7 @@
     /**
      * 申请单名字
      */
+    @ExcelProperty(value = "申请单名称", order = 2)
     @ApiModelProperty(value = "申请单名字", dataType = "String")
     @TableField("change_apply_name")
     private String changeApplyName;
@@ -54,6 +70,7 @@
     /**
      * 更换证书编号
      */
+    @ExcelProperty(value = "更换证书编号", order = 3)
     @ApiModelProperty(value = "更换证书编号", dataType = "String")
     @TableField("change_report_no")
     private String changeReportNo;
@@ -61,7 +78,8 @@
     /**
      * 更换证书名字
      */
-    @ApiModelProperty(value = "更换证书名字", dataType = "String")
+    @ExcelProperty(value = "更换证书/报告名称", order = 4)
+    @ApiModelProperty(value = "更换证书/报告名称", dataType = "String")
     @TableField("change_report_name")
     private String changeReportName;
 
@@ -73,6 +91,7 @@
     @TableField("change_type")
     private String changeType;
 
+    @ExcelProperty(value = "变更类型", order = 5)
     @ApiModelProperty(value = "变更类型(字典value)", dataType = "String")
     @TableField(exist = false)
     private String changeTypeName;
@@ -142,13 +161,15 @@
     /**
      * 创建用户名字
      */
-    @ApiModelProperty(value = "创建用户名字", dataType = "String")
+    @ExcelProperty(value = "创建人", order = 6)
+    @ApiModelProperty(value = "创建人名字", dataType = "String")
     @TableField("create_user_name")
     private String createUserName;
 
     /**
      * 创建时间
      */
+    @ExcelProperty(value = "创建时间", order = 7)
     @ApiModelProperty(value = "创建时间", dataType = "String")
     @TableField("create_time")
     private String createTime;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificateReport.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificateReport.java
index f01db9e..db06018 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificateReport.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificateReport.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.model.business;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -22,6 +29,11 @@
  * @author wangpeng
  * @since 2023-08-14
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @ApiModel
 @Data
 @TableName("biz_business_certificate_report")
@@ -36,6 +48,7 @@
     /**
      * 证书报告编号
      */
+    @ExcelProperty(value = "证书报告编号", order = 1)
     @ApiModelProperty(value = "证书报告编号", dataType = "String")
     @TableField("certificate_report_no")
     private String certificateReportNo;
@@ -43,6 +56,7 @@
     /**
      * 证书报告名称
      */
+    @ExcelProperty(value = "证书报告名称", order = 2)
     @ApiModelProperty(value = "证书报告名称", dataType = "String")
     @TableField("certificate_report_name")
     private String certificateReportName;
@@ -62,6 +76,7 @@
     @TableField("measure_category")
     private String measureCategory;
 
+    @ExcelProperty(value = "检校类别", order = 6)
     @ApiModelProperty(value = "检校类别(字典value)", dataType = "String")
     @TableField(exist = false)
     private String measureCategoryName;
@@ -69,6 +84,7 @@
     /**
      * 检校时间
      */
+    @ExcelProperty(value = "检校时间", order = 8)
     @ApiModelProperty(value = "检校时间", dataType = "String")
     @TableField("calibration_time")
     private String calibrationTime;
@@ -267,18 +283,22 @@
     @TableField(exist = false)
     private Integer decisionItem;
 
-    @ApiModelProperty(value = "设备样品编号（列表返回参数）", dataType = "String")
+    @ExcelProperty(value = "被检设备统一编号", order = 3)
+    @ApiModelProperty(value = "被检设备统一编号（列表返回参数）", dataType = "String")
     @TableField(exist = false)
     private String sampleNo;
 
-    @ApiModelProperty(value = "设备样品名称（列表返回参数）", dataType = "String")
+    @ExcelProperty(value = "被检设备名称", order = 4)
+    @ApiModelProperty(value = "被检设备名称（列表返回参数）", dataType = "String")
     @TableField(exist = false)
     private String sampleName;
 
-    @ApiModelProperty(value = "设备样品规格型号（列表返回参数）", dataType = "String")
+    @ExcelProperty(value = "规格型号", order = 5)
+    @ApiModelProperty(value = "规格型号（列表返回参数）", dataType = "String")
     @TableField(exist = false)
     private String sampleModel;
 
+    @ExcelProperty(value = "检定员", order = 7)
     @ApiModelProperty(value = "检定员名字（列表返回参数）", dataType = "String")
     @TableField(exist = false)
     private String staffName;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessIdentifyInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessIdentifyInfo.java
index 46bfba5..f1a9bec 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessIdentifyInfo.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessIdentifyInfo.java
@@ -1,10 +1,15 @@
 package com.casic.missiles.model.business;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 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;
 
@@ -20,6 +25,11 @@
  * @author wangpeng
  * @since 2023-08-15
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @Data
 @TableName("biz_business_identify_info")
 public class BizBusinessIdentifyInfo implements Serializable {
@@ -33,6 +43,7 @@
     /**
      * 记录编号
      */
+    @ExcelProperty(value = "记录编号", order = 1)
     @ApiModelProperty(value = "记录编号", dataType = "String")
     @TableField("record_no")
     private String recordNo;
@@ -41,20 +52,15 @@
      * 标志类型(字典code)
      */
     @NotEmpty(message = "标志类型不能为空")
-    @ApiModelProperty(value = "标志类型(字典code)", dataType = "String")
-    @DictCodeField(message = "标志类型不合法", cacheName = MeterDictCode.IDENTIFY_PRINT_TYPE)
+    @ApiModelProperty(value = "标志类型(直接存计量标识/使用状态/校准状态的字典value)", dataType = "String")
     @TableField("identify_type")
     private String identifyType;
 
-    @ApiModelProperty(value = "标志类型(字典value)", dataType = "String")
-    @TableField(exist = false)
-    private String identifyTypeName;
-
     /**
      * 设备id(可以是受检设备/设备台账)
      */
     @NotNull(message = "设备id不能为空")
-    @ApiModelProperty(value = "设备id(可以是受检设备/设备台账)", dataType = "String")
+    @ApiModelProperty(value = "设备id(可以是受检设备/设备台账)", dataType = "Long")
     @TableField("device_id")
     private Long deviceId;
 
@@ -66,29 +72,32 @@
     @TableField("device_type")
     private String deviceType;
 
+    @ExcelProperty(value = "统一编号", order = 3)
     @NotEmpty(message = "设备编号不能为空")
-    @ApiModelProperty(value = "设备编号", dataType = "String")
+    @ApiModelProperty(value = "统一编号", dataType = "String")
     @TableField("device_no")
     private String deviceNo;
 
     /**
      * 设备名字
      */
-    @NotEmpty(message = "设备名字不能为空")
-    @ApiModelProperty(value = "设备名字", dataType = "String")
+    @ExcelProperty(value = "设备名称", order = 4)
+    @NotEmpty(message = "设备名称不能为空")
+    @ApiModelProperty(value = "设备名称", dataType = "String")
     @TableField("device_name")
     private String deviceName;
 
     /**
      * 检定员id
      */
-    @ApiModelProperty(value = "检定员id", dataType = "String")
+    @ApiModelProperty(value = "检定员id", dataType = "Long")
     @TableField("measure_person_id")
     private Long measurePersonId;
 
     /**
      * 检定员名字
      */
+    @ExcelProperty(value = "检定员", order = 5)
     @ApiModelProperty(value = "检定员名字", dataType = "String")
     @TableField("measure_person")
     private String measurePerson;
@@ -103,7 +112,8 @@
     /**
      * 更新时间
      */
-    @ApiModelProperty(value = "更新时间", dataType = "String")
+    @ExcelProperty(value = "打印时间", order = 6)
+    @ApiModelProperty(value = "打印时间", dataType = "String")
     @TableField("update_time")
     private String updateTime;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceAssess.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceAssess.java
index 659d9ca..6720b90 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceAssess.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceAssess.java
@@ -1,11 +1,26 @@
 package com.casic.missiles.model.business;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 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 com.casic.missiles.dto.BaseRequest;
+import com.casic.missiles.dto.business.outsource.OrderSampleDTO;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import javax.validation.constraints.NotEmpty;
 import java.io.Serializable;
+import java.util.List;
 
 /**
  * <p>
@@ -15,146 +30,231 @@
  * @author wangpeng
  * @since 2023-08-16
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
+@ApiModel
 @Data
 @TableName("biz_business_outsource_assess")
-public class BizBusinessOutsourceAssess implements Serializable {
+public class BizBusinessOutsourceAssess extends BaseRequest implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
+    @ApiModelProperty(value = "id，更新/删除使用参数", dataType = "Long")
     @TableId("id")
     private Long id;
 
     /**
      * 评审表编号
      */
+    @ExcelProperty(value = "评审表编号", order = 1)
+    @ApiModelProperty(value = "评审表编号(后台生成)", dataType = "String")
     @TableField("project_no")
     private String projectNo;
 
     /**
      * 评审表名称
      */
+    @ExcelProperty(value = "评审表名称", order = 2)
+    @ApiModelProperty(value = "评审表名称", dataType = "String")
     @TableField("project_name")
     private String projectName;
 
+    @NotEmpty(message = "实验室代码不能为空")
+    @DictCodeField(message = "实验室代码描述不合法", cacheName = MeterDictCode.LAB_CODE)
+    @ApiModelProperty(value = "实验室代码(字典code)", dataType = "String")
+    @TableField("lab_code")
+    private String labCode;
+
+    @ApiModelProperty(value = "实验室代码(字典value)", dataType = "String")
+    @TableField(exist = false)
+    private String labCodeName;
+
+    /**
+     * 组别代码
+     */
+    @NotEmpty(message = "组别代码不能为空")
+    @DictCodeField(message = "组别代码描述不合法", cacheName = MeterDictCode.GROUP_CODE)
+    @ApiModelProperty(value = "组别代码(字典code)", dataType = "String")
+    @TableField("group_code")
+    private String groupCode;
+
+    @ApiModelProperty(value = "组别代码(字典value)", dataType = "String")
+    @TableField(exist = false)
+    private String groupCodeName;
+
     /**
      * 申请人id
      */
+    @ApiModelProperty(value = "申请人id", dataType = "String")
     @TableField("applicant_id")
     private Long applicantId;
 
     /**
      * 申请人名字
      */
+    @ExcelProperty(value = "申请人", order = 5)
+    @ApiModelProperty(value = "申请人", dataType = "String")
     @TableField("applicant_name")
     private String applicantName;
 
     /**
      * 申请时间
      */
+    @ExcelProperty(value = "申请时间", order = 6)
+    @ApiModelProperty(value = "申请时间", dataType = "String")
     @TableField("applicant_time")
     private String applicantTime;
 
     /**
      * 附件(minio存储文件名)
      */
+    @ApiModelProperty(value = "附件(minio存储文件名)", dataType = "String")
     @TableField("minio_file_name")
     private String minioFileName;
 
     /**
      * 备注
      */
+    @ApiModelProperty(value = "备注", dataType = "String")
     @TableField("remark")
     private String remark;
 
     /**
      * 创建人id
      */
+    @ApiModelProperty(value = "创建人id", dataType = "String")
     @TableField("create_user_id")
     private Long createUserId;
 
     /**
      * 创建人名字
      */
+    @ApiModelProperty(value = "创建人名字", dataType = "String")
     @TableField("create_user_name")
     private String createUserName;
 
     /**
      * 分包方id
      */
+    @ApiModelProperty(value = "评审表编号", dataType = "String")
     @TableField("outsourcer_id")
     private Long outsourcerId;
 
     /**
      * 预计开始时间
      */
+    @ApiModelProperty(value = "预计开始时间", dataType = "String")
     @TableField("pre_start_time")
     private String preStartTime;
 
     /**
      * 预计结束时间
      */
+    @ApiModelProperty(value = "预计结束时间", dataType = "String")
     @TableField("pre_end_time")
     private String preEndTime;
 
     /**
      * 分包原因-字典
      */
+    @ApiModelProperty(value = "分包原因(字典code)", dataType = "String")
+    @DictCodeField(message = "分包原因描述不合法", cacheName = MeterDictCode.OUTSOURCE_REASON)
     @TableField("outsource_reason")
     private String outsourceReason;
 
+    @ApiModelProperty(value = "分包原因(字典value)", dataType = "String")
+    @TableField(exist = false)
+    private String outsourceReasonName;
+
     /**
      * 预计费用
      */
+    @ApiModelProperty(value = "预计费用", dataType = "String")
     @TableField("pre_cost")
     private String preCost;
 
     /**
      * 审批状态
      */
+    @ApiModelProperty(value = "审批状态", dataType = "String")
+    @DictCodeField(message = "审批状态描述不合法", cacheName = MeterDictCode.APPROVAL_STATUS)
     @TableField("approval_status")
     private String approvalStatus;
 
     /**
      * 流程实例id
      */
+    @ApiModelProperty(value = "流程实例id", dataType = "String")
     @TableField("process_id")
     private String processId;
 
     /**
      * 实验室认可情况
      */
+    @ApiModelProperty(value = "实验室认可情况", dataType = "String")
     @TableField("approve_situation")
     private String approveSituation;
 
     /**
      * 溯源性
      */
+    @ApiModelProperty(value = "溯源性", dataType = "String")
     @TableField("traceability")
     private String traceability;
 
     /**
      * 测试方法
      */
+    @ApiModelProperty(value = "测试方法", dataType = "String")
     @TableField("test_method")
     private String testMethod;
 
     /**
      * 技术能力
      */
+    @ApiModelProperty(value = "技术能力", dataType = "String")
     @TableField("technique_ability")
     private String techniqueAbility;
 
     /**
      * 创建时间
      */
+    @ApiModelProperty(hidden = true)
     @TableField("create_time")
     private String createTime;
 
     /**
      * 更新时间
      */
+    @ApiModelProperty(hidden = true)
     @TableField("update_time")
     private String updateTime;
 
+    @ApiModelProperty(value = "审批状态类型-字典value", dataType = "String")
+    @TableField(exist = false)
+    private String approvalStatusName;
 
+    @ApiModelProperty(value = "任务id（同意、驳回等操作使用）", dataType = "String")
+    @TableField(exist = false)
+    private String taskId;
+
+    @ApiModelProperty(value = "可选决策项（1同意驳回拒绝 2同意驳回 3同意拒绝，用于待审批列表同意/驳回/拒绝按钮展示）", dataType = "Integer")
+    @TableField(exist = false)
+    private Integer decisionItem;
+
+    @NotEmpty(message = "受检设备信息不能为空")
+    @ApiModelProperty(value = "受检设备id列表（新建使用参数）", dataType = "List")
+    @TableField(exist = false)
+    private List<OrderSampleDTO> orderSampleList;
+
+    @ExcelProperty(value = "分包机构名称", order = 3)
+    @ApiModelProperty(value = "分包机构名称（列表返回参数）", dataType = "String")
+    private String outsourcerName;
+
+    @ExcelProperty(value = "机构负责人", order = 4)
+    @ApiModelProperty(value = "机构负责人（列表返回参数）", dataType = "String")
+    private String director;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceProtocol.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceProtocol.java
new file mode 100644
index 0000000..38df697
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceProtocol.java
@@ -0,0 +1,225 @@
+package com.casic.missiles.model.business;
+
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
+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 com.casic.missiles.dto.BaseRequest;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotEmpty;
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 计量检定业务-分包管理-测试、校准或检定工作分包协议书
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-08-24
+ */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
+@Data
+@TableName("biz_business_outsource_protocol")
+public class BizBusinessOutsourceProtocol extends BaseRequest implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "id，更新/删除使用参数", dataType = "Long")
+    @TableId("id")
+    private Long id;
+
+    /**
+     * 协议书编号
+     */
+    @ExcelProperty(value = "协议书编号", order = 1)
+    @ApiModelProperty(value = "协议书编号(后台生成)", dataType = "String")
+    @TableField("protocol_no")
+    private String protocolNo;
+
+    /**
+     * 协议书名称
+     */
+    @ExcelProperty(value = "协议书名称", order = 2)
+    @ApiModelProperty(value = "协议书名称", dataType = "String")
+    @TableField("project_name")
+    private String projectName;
+
+    @NotEmpty(message = "实验室代码不能为空")
+    @DictCodeField(message = "实验室代码描述不合法", cacheName = MeterDictCode.LAB_CODE)
+    @ApiModelProperty(value = "实验室代码(字典code)", dataType = "String")
+    @TableField("lab_code")
+    private String labCode;
+
+    @ApiModelProperty(value = "实验室代码(字典value)", dataType = "String")
+    @TableField(exist = false)
+    private String labCodeName;
+
+    @NotEmpty(message = "组别代码不能为空")
+    @DictCodeField(message = "组别代码描述不合法", cacheName = MeterDictCode.GROUP_CODE)
+    @ApiModelProperty(value = "组别代码(字典code)", dataType = "String")
+    @TableField("group_code")
+    private String groupCode;
+
+    @ApiModelProperty(value = "组别代码(字典value)", dataType = "String")
+    @TableField(exist = false)
+    private String groupCodeName;
+
+    /**
+     * 分包方id
+     */
+    @ApiModelProperty(value = "分包方id", dataType = "Long")
+    @TableField("outsourcer_id")
+    private Long outsourcerId;
+
+    /**
+     * 其他
+     */
+    @ApiModelProperty(value = "其他", dataType = "String")
+    @TableField("remark")
+    private String remark;
+
+    /**
+     * 分包方编号
+     */
+    @ApiModelProperty(value = "分包方编号(新建不用传)", dataType = "String")
+    @TableField("outsource_no")
+    private String outsourceNo;
+
+    /**
+     * 分包方名称
+     */
+    @ExcelProperty(value = "分包方名称", order = 3)
+    @ApiModelProperty(value = "分包方名称(新建不用传)", dataType = "String")
+    @TableField("outsource_name")
+    private String outsourceName;
+
+    /**
+     * 联系人
+     */
+    @ExcelProperty(value = "联系人", order = 4)
+    @ApiModelProperty(value = "联系人", dataType = "String")
+    @TableField("contacts")
+    private String contacts;
+
+    /**
+     * 电话
+     */
+    @ApiModelProperty(value = "电话", dataType = "String")
+    @TableField("mobile")
+    private String mobile;
+
+    /**
+     * 地址
+     */
+    @ApiModelProperty(value = "地址", dataType = "String")
+    @TableField("address")
+    private String address;
+
+    /**
+     * 要求完成日期
+     */
+    @ApiModelProperty(value = "要求完成日期", dataType = "String")
+    @TableField("require_date")
+    private String requireDate;
+
+    /**
+     * 分包费用(元)
+     */
+    @ApiModelProperty(value = "分包费用(元)", dataType = "String")
+    @TableField("outsource_cost")
+    private Double outsourceCost;
+
+    /**
+     * 分包方负责人
+     */
+    @ApiModelProperty(value = "分包方负责人", dataType = "String")
+    @TableField("director")
+    private String director;
+
+    /**
+     * 分包项目
+     */
+    @ApiModelProperty(value = "分包项目", dataType = "String")
+    @TableField("item")
+    private String item;
+
+    /**
+     * 分包要求
+     */
+    @ApiModelProperty(value = "分包要求", dataType = "String")
+    @TableField("requires")
+    private String requires;
+
+    /**
+     * 创建人id
+     */
+    @ApiModelProperty(hidden = true)
+    @TableField("create_user_id")
+    private Long createUserId;
+
+    /**
+     * 创建人名字
+     */
+    @ExcelProperty(value = "申请人", order = 5)
+    @ApiModelProperty(value = "申请人", dataType = "String")
+    @TableField("create_user_name")
+    private String createUserName;
+
+    /**
+     * 审批状态
+     */
+    @ApiModelProperty(value = "审批状态", dataType = "String")
+    @DictCodeField(message = "审批状态描述不合法", cacheName = MeterDictCode.APPROVAL_STATUS)
+    @TableField("approval_status")
+    private String approvalStatus;
+
+    /**
+     * 流程实例id
+     */
+    @ApiModelProperty(value = "流程实例id", dataType = "String")
+    @TableField("process_id")
+    private String processId;
+
+    /**
+     * 创建时间
+     */
+    @ExcelProperty(value = "申请时间", order = 6)
+    @ApiModelProperty(value = "申请时间", dataType = "String")
+    @TableField("create_time")
+    private String createTime;
+
+    /**
+     * 更新时间
+     */
+    @ApiModelProperty(hidden = true)
+    @TableField("update_time")
+    private String updateTime;
+
+    @ApiModelProperty(value = "审批状态类型-字典value", dataType = "String")
+    @TableField(exist = false)
+    private String approvalStatusName;
+
+    @ApiModelProperty(value = "任务id（同意、驳回等操作使用）", dataType = "String")
+    @TableField(exist = false)
+    private String taskId;
+
+    @ApiModelProperty(value = "可选决策项（1同意驳回拒绝 2同意驳回 3同意拒绝，用于待审批列表同意/驳回/拒绝按钮展示）", dataType = "Integer")
+    @TableField(exist = false)
+    private Integer decisionItem;
+
+
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourcerInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourcerInfo.java
index ec4e997..f9aa69e 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourcerInfo.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourcerInfo.java
@@ -17,6 +17,7 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import javax.validation.constraints.NotEmpty;
 import java.io.Serializable;
 
 /**
@@ -59,6 +60,29 @@
     @TableField("outsourcer_name")
     private String outsourcerName;
 
+    @NotEmpty(message = "实验室代码不能为空")
+    @DictCodeField(message = "实验室代码描述不合法", cacheName = MeterDictCode.LAB_CODE)
+    @ApiModelProperty(value = "实验室代码(字典code)", dataType = "String")
+    @TableField("lab_code")
+    private String labCode;
+
+    @ApiModelProperty(value = "实验室代码(字典value)", dataType = "String")
+    @TableField(exist = false)
+    private String labCodeName;
+
+    /**
+     * 组别代码
+     */
+    @NotEmpty(message = "组别代码不能为空")
+    @DictCodeField(message = "组别代码描述不合法", cacheName = MeterDictCode.GROUP_CODE)
+    @ApiModelProperty(value = "组别代码(字典code)", dataType = "String")
+    @TableField("group_code")
+    private String groupCode;
+
+    @ApiModelProperty(value = "组别代码(字典value)", dataType = "String")
+    @TableField(exist = false)
+    private String groupCodeName;
+
     /**
      * 单位简称
      */
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardInfo.java
index c48eed7..dffdfdd 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardInfo.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardInfo.java
@@ -5,6 +5,7 @@
 import com.baomidou.mybatisplus.annotation.TableName;
 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;
 
@@ -18,6 +19,7 @@
  * @author wangpeng
  * @since 2023-08-04
  */
+@ApiModel
 @Data
 @TableName("biz_equipment_standard_info")
 public class BizEquipmentStandardInfo implements Serializable {
@@ -119,7 +121,7 @@
      * 管理状态(字典code)
      */
     @ApiModelProperty(value = "管理状态(字典code)", dataType = "String")
-    @DictCodeField(message = "管理状态不合法", cacheName = MeterDictCode.MANAGER_STATE)
+    @DictCodeField(message = "管理状态不合法", cacheName = MeterDictCode.STANDARD_MANAGER_STATE)
     @TableField("manage_status")
     private String manageStatus;
 
@@ -151,7 +153,7 @@
     /**
      * 温度(℃)
      */
-    @ApiModelProperty(value = "使用状态(字典code)", dataType = "String")
+    @ApiModelProperty(value = "温度(℃)", dataType = "String")
     @TableField("temperature")
     private Double temperature;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardInfoApproval.java b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardInfoApproval.java
index dbd86ab..9f58d83 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardInfoApproval.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardInfoApproval.java
@@ -150,7 +150,7 @@
      * 管理状态(字典code)
      */
     @ApiModelProperty(value = "管理状态(字典code)", dataType = "String")
-    @DictCodeField(message = "管理状态不合法", cacheName = MeterDictCode.MANAGER_STATE)
+    @DictCodeField(message = "管理状态不合法", cacheName = MeterDictCode.STANDARD_MANAGER_STATE)
     @TableField("manage_status")
     private String manageStatus;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardTechnologyRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardTechnologyRelation.java
index 0e612bd..751f26b 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardTechnologyRelation.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardTechnologyRelation.java
@@ -3,6 +3,7 @@
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -16,6 +17,7 @@
  * @author wangpeng
  * @since 2023-08-04
  */
+@ApiModel
 @Data
 @TableName("biz_equipment_standard_technology_relation")
 public class BizEquipmentStandardTechnologyRelation implements Serializable {
@@ -33,6 +35,10 @@
     @TableField("technology_file_id")
     private Long technologyFileId;
 
+    @ApiModelProperty(value = "依据的技术文件编号", dataType = "String")
+    @TableField("technology_file_no")
+    private String technologyFileNo;
+
     /**
      * 依据的技术文件名称(技术文件中现行测试校准检定方法表文件名字段)
      */
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerInfo.java
index d6e8bed..65cd6bc 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerInfo.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerInfo.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.model.resource;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -21,6 +28,11 @@
  * @author wangpeng
  * @since 2023-08-08
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @ApiModel
 @Data
 @TableName("biz_resource_customer_info")
@@ -35,6 +47,7 @@
     /**
      * 委托方编号
      */
+    @ExcelProperty(value = "委托方编号", order = 1)
     @ApiModelProperty(value = "委托方编号", dataType = "String")
     @TableField("customer_no")
     private String customerNo;
@@ -42,6 +55,7 @@
     /**
      * 委托方名称
      */
+    @ExcelProperty(value = "委托方名称", order = 2)
     @ApiModelProperty(value = "委托方名称(新建时为下拉选择一个受检单位组织的名字，传deptId字段，后端获取名称)", dataType = "String")
     @TableField("customer_name")
     private String customerName;
@@ -63,6 +77,7 @@
     /**
      * 联系人
      */
+    @ExcelProperty(value = "联系人", order = 3)
     @ApiModelProperty(value = "联系人", dataType = "String")
     @TableField("contacts")
     private String contacts;
@@ -70,6 +85,7 @@
     /**
      * 座机电话
      */
+    @ExcelProperty(value = "座机电话", order = 4)
     @ApiModelProperty(value = "座机电话", dataType = "String")
     @TableField("mobile")
     private String mobile;
@@ -77,6 +93,7 @@
     /**
      * 手机号码
      */
+    @ExcelProperty(value = "手机号码", order = 5)
     @ApiModelProperty(value = "手机号码", dataType = "String")
     @TableField("phone")
     private String phone;
@@ -91,6 +108,7 @@
     /**
      * 地址
      */
+    @ExcelProperty(value = "地址", order = 6)
     @ApiModelProperty(value = "地址", dataType = "String")
     @TableField("address")
     private String address;
@@ -141,6 +159,7 @@
     /**
      * 创建时间
      */
+    @ExcelProperty(value = "创建时间", order = 7)
     @ApiModelProperty(value = "创建时间", dataType = "String")
     @TableField("create_time")
     private String createTime;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerSuggestForm.java b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerSuggestForm.java
index 7201bbd..701bf8b 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerSuggestForm.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerSuggestForm.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.model.resource;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -22,6 +29,11 @@
  * @author wangpeng
  * @since 2023-08-08
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @ApiModel
 @Data
 @TableName("biz_resource_customer_suggest_form")
@@ -44,7 +56,8 @@
     /**
      * 委托方名称
      */
-    @ApiModelProperty(value = "委托方名称", dataType = "String")
+    @ExcelProperty(value = "意见反馈单位", order = 2)
+    @ApiModelProperty(value = "意见反馈单位", dataType = "String")
     @TableField("customer_name")
     private String customerName;
 
@@ -59,7 +72,8 @@
     /**
      * 委托方意见反馈部门名称
      */
-    @ApiModelProperty(value = "委托方意见反馈部门名称", dataType = "String")
+    @ExcelProperty(value = "委托方意见反馈部门", order = 3)
+    @ApiModelProperty(value = "委托方意见反馈部门", dataType = "String")
     @TableField("customer_dept_name")
     private String customerDeptName;
 
@@ -73,6 +87,7 @@
     /**
      * 表单编号
      */
+    @ExcelProperty(value = "表单编号", order = 1)
     @ApiModelProperty(value = "表单编号", dataType = "String")
     @TableField("form_no")
     private String formNo;
@@ -111,6 +126,7 @@
     /**
      * 创建人名字
      */
+    @ExcelProperty(value = "创建人", order = 4)
     @ApiModelProperty(value = "创建人名字", dataType = "String")
     @TableField("create_user_name")
     private String createUserName;
@@ -147,6 +163,7 @@
     /**
      * 创建时间
      */
+    @ExcelProperty(value = "创建时间", order = 5)
     @ApiModelProperty(value = "创建时间", dataType = "String")
     @TableField("create_time")
     private String createTime;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSealInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSealInfo.java
index cbf05d7..9bf389d 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSealInfo.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSealInfo.java
@@ -106,6 +106,10 @@
     @TableField("minio_file_name")
     private String minioFileName;
 
+    @ApiModelProperty(value = "minio存储文件url", dataType = "String")
+    @TableField(exist = false)
+    private String minioFileUrl;
+
     @ApiModelProperty(value = "创建时间", dataType = "String")
     @TableField("create_time")
     private String createTime;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSealUseNote.java b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSealUseNote.java
index 3f2d9e8..3ce16a8 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSealUseNote.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSealUseNote.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.model.resource;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -20,6 +27,11 @@
  * @author wangpeng
  * @since 2023-07-28
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @ApiModel
 @Data
 @TableName("biz_resource_seal_use_note")
@@ -34,6 +46,7 @@
     /**
      * 登记表编号
      */
+    @ExcelProperty(value = "申请单编号", order = 1)
     @ApiModelProperty(value = "登记表编号(自动生成)", dataType = "String")
     @TableField("note_form_no")
     private String noteFormNo;
@@ -55,6 +68,7 @@
     /**
      * 申请部门
      */
+    @ExcelProperty(value = "申请部门", order = 5)
     @ApiModelProperty(value = "申请部门", dataType = "String")
     @TableField("apply_dept_name")
     private String applyDeptName;
@@ -69,6 +83,7 @@
     /**
      * 申请人
      */
+    @ExcelProperty(value = "申请人", order = 6)
     @ApiModelProperty(value = "申请人", dataType = "String")
     @TableField("apply_user_name")
     private String applyUserName;
@@ -76,6 +91,7 @@
     /**
      * 申请时间
      */
+    @ExcelProperty(value = "申请时间", order = 7)
     @ApiModelProperty(value = "申请时间(新增自动获取当前时间)", dataType = "String")
     @TableField("apply_time")
     private String applyTime;
@@ -130,6 +146,26 @@
     @TableField("update_time")
     private String updateTime;
 
+    @ExcelProperty(value = "印章名称", order = 2)
+    @ApiModelProperty(value = "印章名称(列表返回参数)", dataType = "String")
+    @TableField(exist = false)
+    private String sealName;
+
+    @DictCodeField(message = "印章类型描述不合法", cacheName = MeterDictCode.SEAL_TYPE)
+    @ApiModelProperty(hidden = true)
+    @TableField(exist = false)
+    private String sealType;
+
+    @ExcelProperty(value = "印章类型", order = 3)
+    @ApiModelProperty(value = "印章类型(列表返回参数)", dataType = "String")
+    @TableField(exist = false)
+    private String sealTypeName;
+
+    @ExcelProperty(value = "批准人", order = 4)
+    @ApiModelProperty(value = "批准人(列表返回参数)", dataType = "String")
+    @TableField(exist = false)
+    private String approverName;
+
     @ApiModelProperty(value = "审批状态类型-字典value", dataType = "String")
     @TableField(exist = false)
     private String approvalStatusName;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceStaffInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceStaffInfo.java
index 5ef995b..41563a1 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceStaffInfo.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceStaffInfo.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.model.resource;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -20,6 +27,11 @@
  * @author wangpeng
  * @since 2023-07-25
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @ApiModel
 @Data
 @TableName("biz_resource_staff_info")
@@ -38,6 +50,7 @@
     /**
      * 人员编号
      */
+    @ExcelProperty(value = "人员编号",order = 0)
     @NotEmpty(message = "人员编号不能为空")
     @ApiModelProperty(value = "人员编号", dataType = "String")
     @TableField("staff_no")
@@ -46,6 +59,7 @@
     /**
      * 姓名
      */
+    @ExcelProperty(value = "姓名",order = 1)
     @ApiModelProperty(value = "姓名", dataType = "String")
     @TableField("staff_name")
     private String staffName;
@@ -152,13 +166,15 @@
     /**
      * 部门名字
      */
-    @ApiModelProperty(value = "部门名字", dataType = "String")
+    @ExcelProperty(value = "工作部门",order = 4)
+    @ApiModelProperty(value = "工作部门", dataType = "String")
     @TableField("dept_name")
     private String deptName;
 
     /**
      * 岗位
      */
+    @ExcelProperty(value = "岗位",order = 2)
     @ApiModelProperty(value = "岗位", dataType = "String")
     @TableField("station")
     private String station;
@@ -166,6 +182,7 @@
     /**
      * 计量专业
      */
+    @ExcelProperty(value = "计量专业",order = 5)
     @ApiModelProperty(value = "计量专业", dataType = "String")
     @TableField("major")
     private String major;
@@ -173,6 +190,7 @@
     /**
      * 证号
      */
+    @ExcelProperty(value = "证号",order = 3)
     @ApiModelProperty(value = "证号", dataType = "String")
     @TableField("certificate_number")
     private String certificateNumber;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSupplierInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSupplierInfo.java
index eb5ef01..a1e2697 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSupplierInfo.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSupplierInfo.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.model.resource;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -20,6 +27,11 @@
  * @author wangpeng
  * @since 2023-07-27
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @ApiModel
 @Data
 @TableName("biz_resource_supplier_info")
@@ -34,6 +46,7 @@
     /**
      * 供方编号
      */
+    @ExcelProperty(value = "供方编号", order = 1)
     @ApiModelProperty(value = "供方编号(自动生成)", dataType = "String")
     @TableField("supplier_no")
     private String supplierNo;
@@ -41,6 +54,7 @@
     /**
      * 供方名称
      */
+    @ExcelProperty(value = "供方名称", order = 2)
     @ApiModelProperty(value = "供方名称", dataType = "String")
     @TableField("supplier_name")
     private String supplierName;
@@ -60,6 +74,7 @@
     @TableField("supplier_type")
     private String supplierType;
 
+    @ExcelProperty(value = "供方类型", order = 3)
     @ApiModelProperty(value = "供方类型(字典value)", dataType = "String")
     @TableField(exist = false)
     private String supplierTypeName;
@@ -109,7 +124,8 @@
     /**
      * 电话
      */
-    @ApiModelProperty(value = "电话", dataType = "String")
+    @ExcelProperty(value = "联系电话", order = 4)
+    @ApiModelProperty(value = "联系电话", dataType = "String")
     @TableField("phone")
     private String phone;
 
@@ -158,6 +174,7 @@
     /**
      * 公司地址-省
      */
+    @ExcelProperty(value = "地址-省", order = 6)
     @ApiModelProperty(value = "公司地址-省", dataType = "String")
     @TableField("company_province_name")
     private String companyProvinceName;
@@ -172,6 +189,7 @@
     /**
      * 公司地址-市
      */
+    @ExcelProperty(value = "地址-市", order = 7)
     @ApiModelProperty(value = "公司地址-市", dataType = "String")
     @TableField("company_city_name")
     private String companyCityName;
@@ -186,6 +204,7 @@
     /**
      * 公司地址-区
      */
+    @ExcelProperty(value = "地址-区", order = 8)
     @ApiModelProperty(value = "公司地址-区", dataType = "String")
     @TableField("company_area_name")
     private String companyAreaName;
@@ -193,6 +212,7 @@
     /**
      * 公司地址-详细地址
      */
+    @ExcelProperty(value = "地址-详细地址", order = 9)
     @ApiModelProperty(value = "公司地址-详细地址", dataType = "String")
     @TableField("company_address")
     private String companyAddress;
@@ -200,6 +220,7 @@
     /**
      * 服务和供应的内容
      */
+    @ExcelProperty(value = "服务和供应的内容", order = 5)
     @ApiModelProperty(value = "服务和供应的内容", dataType = "String")
     @TableField("supplier_content")
     private String supplierContent;
@@ -250,6 +271,7 @@
     /**
      * 创建时间
      */
+    @ExcelProperty(value = "创建时间", order = 9)
     @ApiModelProperty(value = "创建时间", dataType = "String")
     @TableField("create_time")
     private String createTime;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/EnvLocationInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/EnvLocationInfo.java
new file mode 100644
index 0000000..d8e2d7b
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/EnvLocationInfo.java
@@ -0,0 +1,83 @@
+package com.casic.missiles.model.resource;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotEmpty;
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 实验室环境监控系统-设备表
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-06-07
+ */
+@ApiModel
+@Data
+@TableName("env_location_info")
+public class EnvLocationInfo implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "主键id", dataType = "Long")
+    @TableId("id")
+    private Long id;
+
+    /**
+     * 地点编号
+     */
+    @NotEmpty(message = "地点编号不能为空")
+    @ApiModelProperty(value = "地点编号", dataType = "String")
+    @TableField("location_no")
+    private String locationNo;
+
+    /**
+     * 地点名称
+     */
+    @ApiModelProperty(value = "地点名称", dataType = "String")
+    @TableField("location_name")
+    private String locationName;
+
+    /**
+     * 地点位置
+     */
+    @ApiModelProperty(value = "地点位置", dataType = "String")
+    @TableField("location_position")
+    private String locationPosition;
+
+    /**
+     * 创建人id
+     */
+    @ApiModelProperty(value = "创建人id", dataType = "Long")
+    @TableField("create_user_id")
+    private Long createUserId;
+
+    /**
+     * 创建人
+     */
+    @ApiModelProperty(value = "创建人", dataType = "String")
+    @TableField("create_user")
+    private String createUser;
+
+    /**
+     * 创建时间
+     */
+    @ApiModelProperty(value = "创建时间", dataType = "String")
+    @TableField("create_time")
+    private String createTime;
+
+    /**
+     * 更新时间
+     */
+    @ApiModelProperty(value = "更新时间", dataType = "String")
+    @TableField("update_time")
+    private String updateTime;
+
+
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemFileConfig.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemFileConfig.java
index 19e6845..86e569c 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemFileConfig.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemFileConfig.java
@@ -30,7 +30,7 @@
     @ApiModelProperty(value = "系统类别(1业务系统2受检系统3环境系统)", dataType = "Integer")
     @NotNull(message = "系统类别不能为空")
     @TableField("system_type")
-    private Integer systemType;
+    private Integer systemType = 1;
 
     @ApiModelProperty("下载编号")
     @TableField("download_no")
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemNotice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemNotice.java
index e94297d..06ec37d 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemNotice.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemNotice.java
@@ -34,7 +34,7 @@
     @ApiModelProperty(value = "系统类别(1业务系统2受检系统3环境系统)", dataType = "Integer")
     @NotNull(message = "系统类别不能为空")
     @TableField("system_type")
-    private Integer systemType;
+    private Integer systemType = 1;
 
     /**
      * 通知公告编号

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java
index bb0c50f..13a699b 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java
@@ -12,6 +12,7 @@
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.IGeneralApprovalService;
+import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
@@ -19,6 +20,7 @@
 import org.springframework.web.bind.annotation.RequestBody;
 
 import javax.validation.Valid;
+import java.util.List;
 import java.util.Objects;
 
 /**
@@ -117,4 +119,17 @@
         }
         return baseApprovalService.failUpdate(request);
     }
+
+    public List<O> exportList(@RequestBody @Valid R request) throws Exception {
+        List<O> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = baseApprovalService.listExportByIds(request.getIds());
+        } else {
+            list = baseApprovalService.listExport(request);
+        }
+        for (O record : list) {
+            DictCodeUtils.convertDictCodeToName(record);
+        }
+        return list;
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java
index 8a90961..d775831 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java
@@ -5,6 +5,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.business.certificate.CertificateChangeApplyApprovalListRequest;
 import com.casic.missiles.dto.business.certificate.CertificateChangeApplySaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessCertificateChangeApply;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
@@ -20,6 +21,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -48,4 +50,12 @@
         }
         return changeApplyService.saveChangeApply(request);
     }
+
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody CertificateChangeApplyApprovalListRequest request) throws Exception {
+        List<BizBusinessCertificateChangeApply> list = super.exportList(request);
+        super.exportExcel(BizBusinessCertificateChangeApply.class, list, ExportEnum.CERTIFICATE_CHANGE_APPLY.getSheetName());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java
index 5fc4b07..af8230e 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java
@@ -9,6 +9,7 @@
 import com.casic.missiles.dto.business.certificate.CertificatePrintApprovalListRequest;
 import com.casic.missiles.dto.business.certificate.CertificatePrintListResponse;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.enums.business.CertificatePrintStatusEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessCertificatePrintLog;
@@ -18,10 +19,16 @@
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.io.IOException;
+import java.util.List;
 import java.util.Objects;
 
 /**
@@ -98,4 +105,16 @@
         });
         return certificatePrintService.certificatePrintLog(idDTO.getId());
     }
+
+    @ApiOperation("证书打印审批导出")
+    @PostMapping("/listExport")
+    public void exportList(@RequestBody CertificatePrintApprovalListRequest request) throws IOException {
+        List<CertificatePrintListResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = certificatePrintService.listByIds(request.getIds());
+        } else {
+            list = certificatePrintService.list(request);
+        }
+        super.exportExcel(CertificatePrintListResponse.class, list, ExportEnum.CERTIFICATE_PRINT.getSheetName());
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java
index 63b06dc..6b2efd5 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java
@@ -6,6 +6,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.business.certificate.CertificateReportApprovalListRequest;
 import com.casic.missiles.dto.business.certificate.CertificateReportSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessCertificateReport;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
@@ -21,6 +22,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -50,7 +52,7 @@
         return certificateReportService.saveCertificateReport(request);
     }
 
-    @ApiOperation("证书审批详情（基本信息）")
+    @ApiOperation("详情（基本信息）")
     @PostMapping("/detail")
     public ReturnDTO<BizBusinessCertificateReport> detail(@RequestBody @Valid BaseDetailRequest request, BindingResult bindingResult) throws Exception {
         if(bindingResult.hasErrors()){
@@ -59,4 +61,11 @@
         return certificateReportService.detail(request);
     }
 
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody CertificateReportApprovalListRequest request) throws Exception {
+        List<BizBusinessCertificateReport> list = super.exportList(request);
+        super.exportExcel(BizBusinessCertificateReport.class, list, ExportEnum.CERTIFICATE_REPORT.getSheetName());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java
index 46b26bd..57c0809 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java
@@ -10,20 +10,21 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.business.identify.IdentifyListRequest;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessIdentifyInfo;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.business.IBizBusinessIdentifyInfoService;
+import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import javax.validation.Valid;
+import java.util.List;
 import java.util.Objects;
 
 /**
@@ -57,16 +58,13 @@
         return identifyInfoService.addIdentify(identifyInfo);
     }
 
-    @ApiOperation("标识打印更新")
+    @ApiOperation("标识打印更新（更新打印时间）")
     @PostMapping("/update")
-    public ReturnDTO updateIdentify(@RequestBody @Valid BizBusinessIdentifyInfo identifyInfo, BindingResult bindingResult) {
-        Assert.isFalse(Objects.isNull(identifyInfo.getId()), () -> {
+    public ReturnDTO updateIdentify(@RequestBody @Valid IdDTO idDTO) {
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        Assert.isFalse(bindingResult.hasErrors(), () -> {
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        });
-        return identifyInfoService.updateIdentify(identifyInfo);
+        return identifyInfoService.updateIdentify(idDTO.getId());
     }
 
     @ApiOperation("标识打印删除")
@@ -77,4 +75,37 @@
         });
         return identifyInfoService.deleteIdentify(idDTO.getId());
     }
+
+    @ApiOperation("标识打印导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody @Valid IdentifyListRequest request, BindingResult bindingResult) throws Exception {
+        if (bindingResult.hasErrors()) {
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        List<BizBusinessIdentifyInfo> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = identifyInfoService.listByIds(request.getIds());
+        } else {
+            list = identifyInfoService.list(request);
+        }
+        for (BizBusinessIdentifyInfo record : list) {
+            DictCodeUtils.convertDictCodeToName(record);
+        }
+        super.exportExcel(BizBusinessIdentifyInfo.class, list, ExportEnum.IDENTIFY_EXPORT.getSheetName());
+    }
+
+
+    // TODO: 2023/8/23 查询设备信息，4个底部按钮查设备（按钮的作用就是前端用来调不同接口、用来区分中间即将展示的标识），前端弹窗选设备，在确定保存时前端根据底部按钮判断传入设备类型deviceType字典code
+    // TODO: 2023/8/23 接口：查受检设备（第1个按钮），查设备台账（后3个按钮同一接口），查询之后前端根据标志类型的不同加到中间页面时进行判断（按产品给的对应表）
+    // TODO: 2023/8/23 提供二维码接口，前端在加到中间页面时调用一下
+
+    @ApiOperation("设备二维码")
+    @PostMapping("/equipment/qrCode")
+    public ReturnDTO<String> equipmentQrCode(@RequestBody @Valid IdDTO idDTO) {
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return identifyInfoService.equipmentQrCode(idDTO.getId());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java
index 707be6e..7e0453d 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java
@@ -117,7 +117,7 @@
     }
 
     @ApiOperation("任务单导出")
-    @PostMapping("/export")
+    @PostMapping("/listExport")
     public void orderExport(@RequestBody @Valid OrderListRequest request, HttpServletResponse response) {
         businessOrderService.orderExport(request, response);
     }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java
index 529a6ce..51432be 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java
@@ -1,9 +1,28 @@
 package com.casic.missiles.controller.business;
 
+import com.casic.missiles.controller.GeneralApprovalController;
+import com.casic.missiles.dto.BaseApprovalSubmitRequest;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.business.outsource.OutsourceAssessApprovalListRequest;
+import com.casic.missiles.dto.business.outsource.OutsourceAssessSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
+import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.model.business.BizBusinessOutsourceAssess;
+import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
+import com.casic.missiles.service.IGeneralApprovalService;
+import com.casic.missiles.service.business.IBizBusinessOutsourceAssessService;
 import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.BindingResult;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.validation.Valid;
+import java.util.List;
+
 /**
  * <p>
  * 计量检定业务-分包管理-测试、校准或检定工作分包评审表 前端控制器
@@ -15,6 +34,27 @@
 @Api(tags = "分包管理-测试、校准或检定工作分包评审表")
 @RestController
 @RequestMapping("/business/outsource/assess")
-public class BizBusinessOutsourceAssessController {
+public class BizBusinessOutsourceAssessController extends GeneralApprovalController<BizBusinessOutsourceAssess, BizBusinessOutsourceAssess, OutsourceAssessApprovalListRequest, BaseApprovalSubmitRequest> {
+    @Autowired
+    private IBizBusinessOutsourceAssessService outsourceAssessService;
 
+    public BizBusinessOutsourceAssessController(IGeneralApprovalService<BizBusinessOutsourceAssess, BizBusinessOutsourceAssess, OutsourceAssessApprovalListRequest, BaseApprovalSubmitRequest> baseApprovalService) {
+        super(baseApprovalService);
+    }
+
+    @ApiOperation("草稿箱-保存")
+    @PostMapping("/save")
+    public ReturnDTO<OutsourceAssessSaveResponse> saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceAssess request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        return outsourceAssessService.saveOutsourceAssess(request);
+    }
+
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception {
+        List<BizBusinessOutsourceAssess> list = super.exportList(request);
+        super.exportExcel(BizBusinessOutsourceAssess.class, list, ExportEnum.OUTSOURCE_ASSESS.getSheetName());
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java
new file mode 100644
index 0000000..9adef18
--- /dev/null
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java
@@ -0,0 +1,60 @@
+package com.casic.missiles.controller.business;
+
+import com.casic.missiles.controller.GeneralApprovalController;
+import com.casic.missiles.dto.BaseApprovalSubmitRequest;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.business.outsource.OutsourceProtocolApprovalListRequest;
+import com.casic.missiles.dto.business.outsource.OutsourceProtocolSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
+import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.model.business.BizBusinessOutsourceProtocol;
+import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
+import com.casic.missiles.service.IGeneralApprovalService;
+import com.casic.missiles.service.business.IBizBusinessOutsourceProtocolService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.BindingResult;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.validation.Valid;
+import java.util.List;
+
+/**
+ * <p>
+ * 计量检定业务-分包管理-测试、校准或检定工作分包协议书 前端控制器
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-08-24
+ */
+@Api(tags = "分包管理-测试、校准或检定工作分包协议书")
+@RestController
+@RequestMapping("/business/outsource/protocol")
+public class BizBusinessOutsourceProtocolController extends GeneralApprovalController<BizBusinessOutsourceProtocol, BizBusinessOutsourceProtocol, OutsourceProtocolApprovalListRequest, BaseApprovalSubmitRequest> {
+    @Autowired
+    private IBizBusinessOutsourceProtocolService outsourceProtocolService;
+
+    public BizBusinessOutsourceProtocolController(IGeneralApprovalService<BizBusinessOutsourceProtocol, BizBusinessOutsourceProtocol, OutsourceProtocolApprovalListRequest, BaseApprovalSubmitRequest> baseApprovalService) {
+        super(baseApprovalService);
+    }
+
+    @ApiOperation("草稿箱-保存")
+    @PostMapping("/save")
+    public ReturnDTO<OutsourceProtocolSaveResponse> saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceProtocol request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        return outsourceProtocolService.saveOutsourceProtocol(request);
+    }
+
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody OutsourceProtocolApprovalListRequest request) throws Exception {
+        List<BizBusinessOutsourceProtocol> list = super.exportList(request);
+        super.exportExcel(BizBusinessOutsourceProtocol.class, list, ExportEnum.OUTSOURCE_PROTOCOL.getSheetName());
+    }
+}
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java
index 097f645..f0f0943 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java
@@ -17,7 +17,6 @@
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.IGeneralApprovalService;
 import com.casic.missiles.service.business.IBizBusinessOutsourcerInfoService;
-import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -71,19 +70,8 @@
 
     @ApiOperation("分包方导出")
     @PostMapping("/listExport")
-    public void export(@RequestBody @Valid OutsourcerInfoApprovalListRequest request, BindingResult bindingResult) throws Exception {
-        if (bindingResult.hasErrors()) {
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        }
-        List<BizBusinessOutsourcerInfo> list;
-        if (!CollectionUtils.isEmpty(request.getIds())) {
-            list = outsourcerInfoService.listByIds(request.getIds());
-        } else {
-            list = outsourcerInfoService.list(request);
-        }
-        for (BizBusinessOutsourcerInfo record : list) {
-            DictCodeUtils.convertDictCodeToName(record);
-        }
+    public void export(@RequestBody OutsourcerInfoApprovalListRequest request) throws Exception {
+        List<BizBusinessOutsourcerInfo> list = super.exportList(request);
         super.exportExcel(BizBusinessOutsourcerInfo.class, list, ExportEnum.OUTSOURCER_EXPORT.getSheetName());
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java
index c2cbf9f..0410918 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java
@@ -17,11 +17,9 @@
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.IGeneralApprovalService;
 import com.casic.missiles.service.business.IBizBusinessSiteExecutiveInfoService;
-import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -60,7 +58,7 @@
         return siteExecutiveInfoService.saveSiteExecutiveInfo(siteExecutiveInfo);
     }
 
-    @ApiOperation("现场检测详情")
+    @ApiOperation("详情")
     @PostMapping("/detail")
     public ReturnDTO<SiteExecutiveDetailResponse> siteExecutiveDetail(@RequestBody @Valid IdDTO idDTO) throws Exception {
         Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
@@ -69,21 +67,10 @@
         return ReturnUtil.success(siteExecutiveInfoService.detail(idDTO.getId()));
     }
 
-    @ApiOperation("现场检测导出")
+    @ApiOperation("导出")
     @PostMapping("/listExport")
-    public void export(@RequestBody @Valid SiteExecutiveApprovalListRequest request, BindingResult bindingResult) throws Exception {
-        if (bindingResult.hasErrors()) {
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        }
-        List<SiteExecutiveApprovalListResponse> list;
-        if (!CollectionUtils.isEmpty(request.getIds())) {
-            list = siteExecutiveInfoService.listInfoByIds(request.getIds());
-        } else {
-            list = siteExecutiveInfoService.listInfo(request);
-        }
-        for (SiteExecutiveApprovalListResponse record : list) {
-            DictCodeUtils.convertDictCodeToName(record);
-        }
+    public void export(@RequestBody SiteExecutiveApprovalListRequest request) throws Exception {
+        List<SiteExecutiveApprovalListResponse> list = super.exportList(request);
         super.exportExcel(SiteExecutiveApprovalListResponse.class, list, ExportEnum.SITE_EXECUTIVE_EXPORT.getSheetName());
     }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
index 7e793cd..a92e209 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
@@ -55,7 +55,7 @@
 
     @ApiOperation("设备收发列表导出")
     @PostMapping("/export")
-    public void exportList(@RequestBody @Valid SampleDispatchListRequest request) throws IOException {
+    public void exportList(@RequestBody SampleDispatchListRequest request) throws IOException {
         List<SampleDispatchListResponse> list;
         if (!CollectionUtils.isEmpty(request.getIds())) {
             list = dispatchService.listByIds(request.getIds());
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java
index cdc77fc..d120fd4 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java
@@ -7,6 +7,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.business.labExecutive.*;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.business.IBusinessLabExecutiveInfoService;
@@ -14,6 +15,7 @@
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.*;
 
@@ -32,7 +34,7 @@
     @Autowired
     private IBusinessLabExecutiveInfoService labExecutiveInfoService;
 
-    @ApiOperation("实验室检测-部门检测-查询各状态列表（待检测、检测中、检测完）")
+    @ApiOperation("实验室任务-查询各状态列表（待检测、检测中、检测完）")
     @PostMapping("/deptExecutive/List")
     public ReturnDTO<PageInfoBT<SampleLabExecutiveListResponse>> queryDeptExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
@@ -43,10 +45,19 @@
         return ReturnUtil.success(super.packForBT(labExecutiveInfoService.deptLabExecutiveListPage(page, labExecutiveListRequest)));
     }
 
-    /**
-     * 实验室检测-我的检测-查询各状态列表（待检测、检测中、检测完）
-     */
-    @ApiOperation("实验室检测-我的检测-查询各状态列表（待检测、检测中、检测完）")
+    @ApiOperation("实验室任务导出")
+    @PostMapping("/deptExecutive/export")
+    public void deptExportList(@RequestBody @Valid SampleLabExecutiveListRequest request) throws Exception {
+        List<SampleLabExecutiveListResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = labExecutiveInfoService.deptLabExecutiveListByIds(request.getMeasureStatus(), request.getIds());
+        } else {
+            list = labExecutiveInfoService.deptLabExecutiveList(request);
+        }
+        super.exportExcel(SampleLabExecutiveListResponse.class, list, ExportEnum.DEPT_EXECUTIVE_TASK.getSheetName());
+    }
+
+    @ApiOperation("我的任务-查询各状态列表（待检测、检测中、检测完）")
     @PostMapping("/myExecutive/list")
     public ReturnDTO<PageInfoBT<SampleLabExecutiveListResponse>> queryMyExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
@@ -57,19 +68,25 @@
         return ReturnUtil.success(super.packForBT(labExecutiveInfoService.myLabExecutiveListPage(page, labExecutiveListRequest)));
     }
 
-    /**
-     * 实验室检测-我的检测-查询各状态样品数量（待检测、检测中、检测完）
-     */
-    @ApiOperation("实验室检测-我的检测-查询各状态样品数量（待检测、检测中、检测完）")
+    @ApiOperation("我的任务导出")
+    @PostMapping("/myExecutive/export")
+    public void exportList(@RequestBody @Valid SampleLabExecutiveListRequest request) throws Exception {
+        List<SampleLabExecutiveListResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = labExecutiveInfoService.myLabExecutiveListByIds(request.getMeasureStatus(), request.getIds());
+        } else {
+            list = labExecutiveInfoService.myLabExecutiveList(request);
+        }
+        super.exportExcel(SampleLabExecutiveListResponse.class, list, ExportEnum.MY_EXECUTIVE_TASK.getSheetName());
+    }
+
+    @ApiOperation("我的任务-查询各状态样品数量（待检测、检测中、检测完）")
     @GetMapping("/myExecutive/amount")
     public ReturnDTO<List<SampleAmountResponse>> queryMyExecutiveAmount() {
         return ReturnUtil.success(labExecutiveInfoService.myExecutiveAmount());
     }
 
-    /**
-     * 实验室检测-部门检测-分配（分配给具体人员）
-     */
-    @ApiOperation("实验室检测-部门检测-分配按钮（分配给具体人员）")
+    @ApiOperation("实验室任务-分配按钮（分配给具体人员）")
     @PostMapping("/deptExecutive/allocate")
     public ReturnDTO allocateStaff(@RequestBody @Valid SampleAllocateRequest sampleAllocateRequest, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -78,10 +95,7 @@
         return labExecutiveInfoService.allocateStaff(sampleAllocateRequest);
     }
 
-    /**
-     * 实验室检测-我的检测-检定人扫描收入（待检测->检测中）
-     */
-    @ApiOperation("实验室检测-我的检测-检定人扫描收入（待检测->检测中）")
+    @ApiOperation("我的任务-检定人扫描收入（待检测->检测中）")
     @PostMapping("/myExecutive/receive")
     public ReturnDTO sampleReceive(@RequestBody @Valid List<SampleOperateRequest> requestList, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -90,10 +104,7 @@
         return labExecutiveInfoService.sampleReceive(requestList);
     }
 
-    /**
-     * 实验室检测-负责人/检定人扫描检完（检测中->检测完）
-     */
-    @ApiOperation("实验室检测-负责人/检定人扫描检完（检测中->检测完）")
+    @ApiOperation("实验室任务-负责人/检定人扫描检完（检测中->检测完）")
     @PostMapping("/myExecutive/complete")
     public ReturnDTO sampleExecutiveComplete(@RequestBody @Valid List<SampleOperateRequest> requestList, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -102,10 +113,7 @@
         return labExecutiveInfoService.sampleExecutiveComplete(requestList);
     }
 
-    /**
-     * 实验室检测-部门检测/我的检测 编辑（只能修改应出具证书）
-     */
-    @ApiOperation("实验室检测-部门检测/我的检测 编辑（只能修改应出具证书）")
+    @ApiOperation("实验室任务/我的任务 编辑（只能修改应出具证书）")
     @PostMapping("/executive/update")
     public ReturnDTO updateExecutive(@RequestBody @Valid UpdateExecutiveRequest request, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -114,10 +122,7 @@
         return labExecutiveInfoService.updateExecutive(request);
     }
 
-    /**
-     * 实验室检测-部门检测/我的检测 详情
-     */
-    @ApiOperation("实验室检测-部门检测/我的检测 详情")
+    @ApiOperation("实验室任务/我的任务 详情")
     @PostMapping("/executive/detail")
     public ReturnDTO<ExecutiveDetailResponse> executiveDetail(@RequestBody @Valid ExecutiveDetailRequest request, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
@@ -131,7 +136,7 @@
      * 退回后会将下一个要执行的实验室检测状态更新为待分配，将后面的实验室顺序变更为连续（都进行减1）
      * 最后一个检测的实验室退回，等分发员再增加实验室或设备收发中的已收入直接手动点击完成
      */
-    @ApiOperation("实验室检测-部门检测/我的检测 退回（待检测/检测中->退回）")
+    @ApiOperation("实验室任务/我的任务 退回（待检测/检测中->退回）")
     @PostMapping("/executive/sendBack")
     public ReturnDTO executiveSendBack(@RequestBody @Valid ExecutiveSendBackRequest request, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -140,9 +145,6 @@
         return labExecutiveInfoService.sampleExecutiveSendBack(request);
     }
 
-    /**
-     * 分发员编辑实验室检测列表
-     */
     @ApiOperation("分发员编辑实验室检测列表")
     @PostMapping("/handOut/updateList")
     public ReturnDTO updateExecutiveList(@RequestBody @Valid UpdateExecutiveListRequest request, BindingResult bindingResult) {
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java
index 48a67ed..0c04f31 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java
@@ -10,6 +10,7 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.resource.customer.CustomerApprovalListRequest;
 import com.casic.missiles.dto.resource.customer.CustomerSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceCustomerInfo;
@@ -26,6 +27,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -55,6 +57,13 @@
         return customerInfoService.saveCustomerInfo(request);
     }
 
+    @ApiOperation("委托方名录导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody CustomerApprovalListRequest request) throws Exception {
+        List<BizResourceCustomerInfo> list = super.exportList(request);
+        super.exportExcel(BizResourceCustomerInfo.class, list, ExportEnum.CUSTOMER_INFO.getSheetName());
+    }
+
     @ApiOperation("委托方人员列表（分页）")
     @PostMapping("/person/listPage")
     public ReturnDTO<PageInfoBT<BizResourceCustomerStaff>> personListPage(@RequestBody IdDTO idDto) {
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
index 972ed4b..6418ea5 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
@@ -5,6 +5,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.resource.customer.SuggestFormApprovalListRequest;
 import com.casic.missiles.dto.resource.customer.SuggestFormSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceCustomerSuggestForm;
@@ -20,6 +21,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -50,4 +52,11 @@
         return suggestFormService.saveSuggestForm(request);
     }
 
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody SuggestFormApprovalListRequest request) throws Exception {
+        List<BizResourceCustomerSuggestForm> list = super.exportList(request);
+        super.exportExcel(BizResourceCustomerSuggestForm.class, list, ExportEnum.CUSTOMER_SUGGEST_FORM.getSheetName());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java
index 1934d1a..9e07eab 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java
@@ -15,12 +15,16 @@
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.resource.IEnvEnvironmentRecordConfigService;
 import com.casic.missiles.service.resource.IEnvEnvironmentRecordDataService;
+import com.casic.missiles.service.resource.IEnvLocationInfoService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
 import java.util.List;
@@ -39,6 +43,8 @@
     private IEnvEnvironmentRecordDataService environmentRecordDataService;
     @Autowired
     private IEnvEnvironmentRecordConfigService environmentRecordConfigService;
+    @Autowired
+    private IEnvLocationInfoService locationInfoService;
 
     @ApiOperation("环境记录单数据列表/详情")
     @PostMapping("/data/listPage")
@@ -95,4 +101,11 @@
         });
         return environmentRecordConfigService.deleteEnvironmentRecordConfig(idDTO.getId());
     }
+
+    @ApiOperation("地点列表")
+    @PostMapping("/location/listPage")
+    public ReturnDTO<PageInfoBT<LocationListResponse>> locationListPage(@RequestBody @Valid LocationListRequest request) {
+        Page<LocationListResponse> page = PageFactory.defaultPage();
+        return ReturnUtil.success(super.packForBT(locationInfoService.listPage(page, request)));
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java
index 82efe3f..e9561fa 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java
@@ -10,6 +10,7 @@
 import com.casic.missiles.dto.resource.seal.SealLogListRequest;
 import com.casic.missiles.dto.resource.seal.SealNoteApprovalListRequest;
 import com.casic.missiles.dto.resource.seal.SealNoteSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceSealUseLog;
@@ -27,6 +28,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -58,6 +60,13 @@
         return sealUseNoteService.saveSeal(request);
     }
 
+    @ApiOperation("印章使用登记导出（列表和导出中去掉经办人和监印人）")
+    @PostMapping("/listExport")
+    public void export(@RequestBody SealNoteApprovalListRequest request) throws Exception {
+        List<BizResourceSealUseNote> list = super.exportList(request);
+        super.exportExcel(BizResourceSealUseNote.class, list, ExportEnum.SEAL_NOTE.getSheetName());
+    }
+
     // TODO: 2023/7/28 印章使用日志：系统中使用印章时插入数据库
 
     @ApiOperation("印章使用日志列表（分页）")
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java
index 9b674fc..06b6521 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java
@@ -9,16 +9,20 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.resource.staff.StaffCertRequest;
 import com.casic.missiles.dto.resource.staff.StaffCertResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.service.resource.IBizResourceStaffInfoService;
 import com.casic.missiles.service.resource.IBizResourceStaffVerifierService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.List;
+
 /**
  * @Description:
  * @Author: wangpeng
@@ -41,9 +45,21 @@
         return ReturnUtil.success(super.packForBT(responsePage));
     }
 
+    @ApiOperation("证书逾期提醒导出")
+    @PostMapping("/listExport")
+    public void exportList(@RequestBody StaffCertRequest request) throws Exception {
+        List<StaffCertResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = staffInfoService.certListByIds(request.getIds());
+        } else {
+            list = staffInfoService.certList(request);
+        }
+        super.exportExcel(StaffCertResponse.class, list, ExportEnum.STAFF_CERTIFICATE_EXPIRE.getSheetName());
+    }
+
     @ApiOperation("证书逾期提醒")
     @PostMapping("/expirationReminder")
-    public ReturnDTO expirationReminder(@RequestBody IdDTO idDto) {
-        return verifierService.expirationReminder(idDto);
+    public ReturnDTO expirationReminder(@RequestBody IdDTO idDTO) {
+        return verifierService.expirationReminder(idDTO);
     }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java
index 3b251ad..a6e7850 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java
@@ -12,6 +12,7 @@
 import com.casic.missiles.dto.resource.staff.StaffListRequest;
 import com.casic.missiles.dto.resource.staff.TrainListRequest;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.*;
@@ -22,7 +23,10 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
 import java.util.List;
@@ -52,8 +56,19 @@
             throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
         }
         Page<BizResourceStaffInfo> page = PageFactory.defaultPage();
-        Page<BizResourceStaffInfo> responsePage = staffInfoService.listPage(page, request);
-        return ReturnUtil.success(super.packForBT(responsePage));
+        return ReturnUtil.success(super.packForBT(staffInfoService.listPage(page, request)));
+    }
+
+    @ApiOperation("人员登记导出")
+    @PostMapping("/listExport")
+    public void exportList(@RequestBody StaffListRequest request) throws Exception {
+        List<BizResourceStaffInfo> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = staffInfoService.listByIds(request.getIds());
+        } else {
+            list = staffInfoService.list(request);
+        }
+        super.exportExcel(BizResourceStaffInfo.class, list, ExportEnum.STAFF_INFO.getSheetName());
     }
 
     @ApiOperation("人员登记详情基础信息")
@@ -85,9 +100,9 @@
 
     @ApiOperation("科研教育列表（分页）")
     @PostMapping("/education/listPage")
-    public ReturnDTO<PageInfoBT<BizResourceStaffEducation>> educationListPage(@RequestBody IdDTO idDto) {
+    public ReturnDTO<PageInfoBT<BizResourceStaffEducation>> educationListPage(@RequestBody IdDTO idDTO) {
         Page<BizResourceStaffEducation> page = PageFactory.defaultPage();
-        Page<BizResourceStaffEducation> responsePage = staffInfoService.educationListPage(page, idDto);
+        Page<BizResourceStaffEducation> responsePage = staffInfoService.educationListPage(page, idDTO);
         return ReturnUtil.success(super.packForBT(responsePage));
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java
index af6aa86..d85d84a 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java
@@ -9,6 +9,7 @@
 import com.casic.missiles.dto.resource.outsideService.SupplierApprovalListRequest;
 import com.casic.missiles.dto.resource.outsideService.SupplierSaveResponse;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceSupplierAbility;
@@ -67,6 +68,13 @@
         return ReturnUtil.success(supplierInfoService.detail(idDTO.getId()));
     }
 
+    @ApiOperation("合格供方导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody SupplierApprovalListRequest request) throws Exception {
+        List<BizResourceSupplierInfo> list = super.exportList(request);
+        super.exportExcel(BizResourceSupplierInfo.class, list, ExportEnum.SUPPLIER_INFO.getSheetName());
+    }
+
     @ApiOperation("供方人员列表（分页）")
     @PostMapping("/person/listPage")
     public ReturnDTO<PageInfoBT<BizResourceSupplierPerson>> personListPage(@RequestBody IdDTO idDTO) {
diff --git a/casic-metering-api/src/main/resources/config/application.yml b/casic-metering-api/src/main/resources/config/application.yml
index 350db5f..ecff521 100644
--- a/casic-metering-api/src/main/resources/config/application.yml
+++ b/casic-metering-api/src/main/resources/config/application.yml
@@ -126,7 +126,7 @@
     #作者
     author: wangpeng
     #待生成对象表名
-    table-name: biz_equipment_technical_target_approval,biz_equipment_attachment_approval,biz_equipment_checkpoint_approval
+    table-name: biz_business_outsource_protocol
 
 reminder:
   #节点--common模块config包 ReminderNodeConfig配置
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
index 4a19e4e..d47d552 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
@@ -53,6 +53,7 @@
     SUGGEST_FORM_SAVE_FAILED(2509, "委托方意见登记表保存至草稿箱失败"),
     EXAMINE_FORM_SAVE_FAILED(2510, "要求、委托书及合同评审表保存至草稿箱失败"),
     CUSTOMER_EXIST_SAVE_FAILED(2511, "该委托方已存在，请重新选择"),
+    DUPLICATE_LOCATION_NO(2512, "地点编号已存在"),
 
     /**
      * 计量检定业务模块
@@ -68,6 +69,8 @@
     COMPLETE_SAMPLE_NOT_EXIST(2609, "检测中不存在扫描收入的样品"),
     CANNOT_CHANGE_MEASURE_INFO(2610, "无法更改非当前登录用户的检测信息"),
     NON_EXIST_ORDER_OR_SAMPLE(2611, "不存在该委托单或该委托单下的样品"),
+    OUTSOURCE_ACCESS_SAVE_FAILED(2612, "测试、校准或检定工作分包评审表保存至草稿箱失败"),
+    OUTSOURCE_PROTOCOL_SAVE_FAILED(2613, "测试、校准或检定工作分包协议书保存至草稿箱失败"),
 
     /**
      * 历史遗留备用
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
index 5089ad1..81a406b 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
@@ -10,54 +10,38 @@
     /**
      * 资源管理
      */
-    ENVIRONMENT_DATA_EXPORT("environmentData", "environmentData", "环境记录单数据"),
+    ENVIRONMENT_DATA_EXPORT("environmentData", "环境记录单数据", "环境记录单数据"),
+    STAFF_INFO("staffInfo", "人员登记", "人员登记"),
+    STAFF_CERTIFICATE_EXPIRE("certificateExpire", "证书逾期提醒", "证书逾期提醒"),
+    SUPPLIER_INFO("supplierInfo", "合格供方名录", "合格供方名录"),
+    CUSTOMER_INFO("customerInfo", "委托方名录", "委托方名录"),
+    CUSTOMER_SUGGEST_FORM("customerSuggestForm", "委托方意见登记表", "委托方意见登记表"),
+    SEAL_NOTE("sealNote", "印章使用登记", "印章使用登记"),
 
-    FILE_EXPORT("meterFileData", "meterFileData", "计量文件信息"),
-    TRAIN_PLAN_EXPORT("trainPlanData", "trainPlanData", "培训计划"),
-    TRAIN_LOG_EXPORT("trainLogData", "trainLogData", "培训记录"),
-    METER_ORGANIZE_EXPORT("meterOrganizeData", "meterOrganizeData", "计量组织"),
-    TRACE_SUPPLIER_EXPORT("traceSupplierData", "traceSupplierData", "溯源供方"),
-    SIGN_EXPORT("signData", "signData", "签名/签章"),
-    TEMPLATE_EXPORT("templateData", "templateData", "原始记录模板/证书报告模板"),
-    FIXED_ASSETS("meterFixedAssets", "meterFixedAssets", "固定资产"),
-    METER_EQUIPMENT("meterEquipment", "meterEquipment", "测量设备"),
-    CALIBRATION_TEST_EQUIPMENT("calibrationTestEquipment", "calibrationTestEquipment", "校准检定设备"),
-    MEASURE_ACCOUNT("measureAccount", "measureAccount", "测量工装"),
-    STANDARD_SUPPORT_EQUIPMENT("standardSupportEquipment", "standardSupportEquipment", "标准配套设备"),
-    STANDARD_EQUIPMENT("standardEquipment", "standardEquipment", "标准装置"),
-    FLOW_DEF_EXPORT("flowDefData", "flowDefData", "流程定义"),
-    STAFF_CERTIFICATE("certificate", "certificate", "计量人员证书"),
-    CHECK_INFO("checkInfo", "checkInfo", "设备管理点检测"),
-    EQUIPMENT_APPLY("equipmentApply", "equipmentApply", "设备借用"),
-    STANDARD_EQUIPMENT_REMIND("equipmentApplyRemind", "equipmentApplyRemind", "标准装置到期提醒"),
-    METER_PRICE("meterPrice", "meterPrice", "价格库"),
-    METER_STAFF("meterStaff", "meterStaff", "计量人员"),
-    STANDARD_EQUIPMENT_APPLY("standardEquipmentApply", "standardEquipmentApply", "标准装置申请"),
-    STATE_MANAGE_APPLY("stateManage", "stateManage", "状态管理"),
-    METER_ACCEPTANCE_CHECK("acceptanceCheck", "acceptanceCheck", "设备检修保养验收单"),
-    CUSTOMER_EXPORT("customerData", "customerData", "客户信息"),
-    ORDER_EXPORT("orderData", "orderData", "委托书信息"),
-    SAMPLE_EXPORT("sampleData", "sampleData", "样本信息"),
-    EXCHANGE_DATA("exchangeData", "exchangeData", "设备交接单"),
-    DISPATCH_DATA("dispatchData", "dispatchData", "设备收发"),
-    ENVIRONMENT_DATA("environmentData", "environmentData", "环境记录单"),
-    ORIGIN_DATA("originData", "originData", "原始记录"),
-    CERTIFICATE_REPORT("certificateReport", "certificateReport", "证书报告"),
-    ADVICE_EXPORT("adviceData", "adviceData", "客户反馈"),
-    HANDOUT_EXPORT("handoutData", "handoutData", "任务分发列表"),
-    OUTSOURCER_EXPORT("outsourcerData", "outsourcerData", "分包方"),
-    SITE_EXECUTIVE_EXPORT("siteExecutiveData", "siteExecutiveData", "现场测试、校准或检定"),
-    CERTIFICATE_PRINT_EXPORT("certificatePrintData", "certificatePrintData", "证书打印"),
-    DOWNLOAD_TEMPLATE("downloadTemplate", "downloadTemplate", "页面配置"),
-    OUTSOURCER_CERTIFICATE_EXPORT("outsourceCertificateData", "outsourceCertificateData", "分包证书"),
-    SETTLEMENT_INFO_EXPORT("settlementInfoData", "settlementInfoData", "业务结算"),
-    EQUIPMENT_REMIND("equipmentRemind", "equipmentRemind", "设备到期提醒"),
-    AGREEMENT_INFO_EXPORT("agreementInfoData", "agreementInfoData", "合同"),
-    WORK_STATISTICS_EXPORT("workStatisticsData", "workStatisticsData", "实时工作统计"),
-    DEPT_OUTPUT_EXPORT("deptOutputData", "deptOutputData", "部门产值分析"),
-    WORKLOAD_EXPORT("workloadData", "workloadData", "业务工作量分析"),
-    DEPT_COMPREHENSIVE_EXPORT("deptComprehensiveData", "deptComprehensiveData", "部门综合分析"),
-    ENVIRONMENTAL_RECORD("environmentalRecordData", "environmentalRecordData", "现场环境记录");
+    /**
+     * 计量检定业务
+     */
+    OUTSOURCER_EXPORT("outsourcerData", "分包方名录", "分包方名录"),
+    IDENTIFY_EXPORT("identifyData", "计量标识", "计量标识"),
+    ORDER_EXPORT("orderData", "任务单", "任务单"),
+    DISPATCH_DATA("dispatchData", "设备收发", "设备收发"),
+    HANDOUT_EXPORT("handoutData", "任务分发", "任务分发"),
+    SITE_EXECUTIVE_EXPORT("siteExecutiveData", "现场测试、校准或检定", "现场测试、校准或检定"),
+    CERTIFICATE_REPORT("certificateReport", "证书审批", "证书审批"),
+    CERTIFICATE_CHANGE_APPLY("certificateChangeApply", "证书报告补充或更换申请单", "证书报告补充或更换申请单"),
+    CERTIFICATE_PRINT("certificatePrintData", "证书打印审批", "证书打印审批"),
+    DEPT_EXECUTIVE_TASK("deptExecutiveTaskData", "实验室任务", "实验室任务"),
+    MY_EXECUTIVE_TASK("myExecutiveTaskData", "我的任务", "我的任务"),
+    OUTSOURCE_ASSESS("outsourceAssess", "测试、校准或检定工作分包评审表", "测试、校准或检定工作分包评审表"),
+    OUTSOURCE_PROTOCOL("outsourceProtocol", "测试、校准或检定工作分包协议书", "测试、校准或检定工作分包协议书"),
+
+    /**
+     * 系统管理
+     */
+    SIGN_EXPORT("signData", "签名", "签名"),
+    TEMPLATE_EXPORT("templateData", "文件模板", "文件模板"),
+    FLOW_DEF_EXPORT("flowDefData", "流程定义", "流程定义"),
+    DOWNLOAD_TEMPLATE("downloadTemplate", "流程定义", "页面配置");
 
     ExportEnum(String fileName, String sheetName, String description) {
         this.fileName = fileName;
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateRecordTypeCodeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateRecordTypeCodeEnum.java
index 31d913c..a963522 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateRecordTypeCodeEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateRecordTypeCodeEnum.java
@@ -46,4 +46,14 @@
     String SITE_EXECUTIVE_APPROVAL = "01";
     //《现场测试、校准或检定工作记录表》
     String SITE_EXECUTIVE_LOG = "02";
+
+    //测试、校准或检定工作分包协议书
+    String OUTSOURCE_PROTOCOL = "01";
+    //测试、校准或检定工作分包评审表
+    String OUTSOURCE_ACCESS = "02";
+    //测试、校准或检定工作分包通知书
+    String OUTSOURCE_NOTICE = "03";
+    //测试、校准或检定工作分包方名录
+    String OUTSOURCE_INFO = "04";
+
 }
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
index 24b8635..f78bd53 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
@@ -15,6 +15,10 @@
     String CERTIFICATE_CHANGE_APPLY_BEAN_NAME = "certificateChangeApplyBean";
     //现场测试、校准或检定
     String SITE_EXECUTIVE_BEAN_NAME = "siteExecutiveBean";
+    //测试、校准或检定工作分包评审表
+    String OUTSOURCE_ASSESS_BEAN_NAME = "outsourceAssessBean";
+    //测试、校准或检定工作分包协议书
+    String OUTSOURCE_PROTOCOL_BEAN_NAME = "outsourceProtocolBean";
 
     /*********************************设备与装置************************************/
     //设备台账
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 b21c661..6b86fd1 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
@@ -18,6 +18,8 @@
     OUTSOURCER_APPROVAL(OUTSOURCER_BEAN_NAME, ""),
     CERTIFICATE_CHANGE_APPROVAL(CERTIFICATE_CHANGE_APPLY_BEAN_NAME, ""),
     SITE_EXECUTIVE_APPROVAL(SITE_EXECUTIVE_BEAN_NAME, ""),
+    OUTSOURCE_ASSESS_APPROVAL(OUTSOURCE_ASSESS_BEAN_NAME, ""),
+    OUTSOURCE_PROTOCOL_APPROVAL(OUTSOURCE_PROTOCOL_BEAN_NAME, ""),
 
     ACTION_STATUS_MAP(new HashMap<String, AwareActionStatusEnum>() {
         {
@@ -47,6 +49,10 @@
             put(ApplyFromIdEnum.CERTIFICATE_CHANGE_APPROVAL.getCode(), CERTIFICATE_CHANGE_APPROVAL);
             //现场测试、校准或检定审批
             put(ApplyFromIdEnum.SITE_EXECUTIVE_APPROVAL.getCode(), SITE_EXECUTIVE_APPROVAL);
+            //测试、校准或检定工作分包评审表
+            put(ApplyFromIdEnum.OUTSOURCE_ASSESS_APPROVAL.getCode(), OUTSOURCE_ASSESS_APPROVAL);
+            //测试、校准或检定工作分包协议书
+            put(ApplyFromIdEnum.OUTSOURCE_PROTOCOL_APPROVAL.getCode(), OUTSOURCE_PROTOCOL_APPROVAL);
         }
     });
     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 934405e..c7410bd 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
@@ -9,6 +9,8 @@
     CERTIFICATE_CHANGE_APPROVAL("jljdywzsbchghsqd", MessageSourceModuleEnum.BUSINESS.getCode(), "证书/报告补充或更换申请单"),
     OUTSOURCER_APPROVAL("jljdywcsjzhgfbfml", MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定合格分包方名录"),
     SITE_EXECUTIVE_APPROVAL("jljdywxccsjzsp", MessageSourceModuleEnum.BUSINESS.getCode(), "现场测试、校准或检定审批"),
+    OUTSOURCE_ASSESS_APPROVAL("jljdywcsjzfbpsb", MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包评审表"),
+    OUTSOURCE_PROTOCOL_APPROVAL("jljdywcsjzfbxys", MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包协议书"),
 
 
     /*******************************************设备与装置*********************************************/
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/GeneralApprovalMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/GeneralApprovalMapper.java
index 4fb7344..0c9d6ae 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/GeneralApprovalMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/GeneralApprovalMapper.java
@@ -17,8 +17,4 @@
 
     Page<O> selectBatchForApprovalList(Page<O> page, @Param("request") R request, @Param("businessKeys") List<String> businessKeys);
 
-//    Page<O> selectListPage(Page<O> page, @Param("request") R request);
-
-//    Long selectMaxNo();
-
 }
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceAssessMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceAssessMapper.java
index 7867bb8..ba59009 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceAssessMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceAssessMapper.java
@@ -1,7 +1,12 @@
 package com.casic.missiles.mapper.business;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.business.outsource.OutsourceAssessApprovalListRequest;
+import com.casic.missiles.mapper.GeneralApprovalMapper;
 import com.casic.missiles.model.business.BizBusinessOutsourceAssess;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * <p>
@@ -11,6 +16,10 @@
  * @author wangpeng
  * @since 2023-08-16
  */
-public interface BizBusinessOutsourceAssessMapper extends BaseMapper<BizBusinessOutsourceAssess> {
+public interface BizBusinessOutsourceAssessMapper extends GeneralApprovalMapper<BizBusinessOutsourceAssess, BizBusinessOutsourceAssess, OutsourceAssessApprovalListRequest> {
+
+    Page<BizBusinessOutsourceAssess> selectBatchForApprovalList(Page<BizBusinessOutsourceAssess> page, @Param("request") OutsourceAssessApprovalListRequest request, @Param("businessKeys") List<String> businessKeys);
+
+    Long selectMaxProjectNo();
 
 }
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceProtocolMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceProtocolMapper.java
new file mode 100644
index 0000000..e6aba35
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceProtocolMapper.java
@@ -0,0 +1,24 @@
+package com.casic.missiles.mapper.business;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.business.outsource.OutsourceProtocolApprovalListRequest;
+import com.casic.missiles.mapper.GeneralApprovalMapper;
+import com.casic.missiles.model.business.BizBusinessOutsourceProtocol;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 计量检定业务-分包管理-测试、校准或检定工作分包协议书 Mapper 接口
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-08-24
+ */
+public interface BizBusinessOutsourceProtocolMapper extends GeneralApprovalMapper<BizBusinessOutsourceProtocol, BizBusinessOutsourceProtocol, OutsourceProtocolApprovalListRequest> {
+
+    Page<BizBusinessOutsourceProtocol> selectBatchForApprovalList(Page<BizBusinessOutsourceProtocol> page, @Param("request") OutsourceProtocolApprovalListRequest request, @Param("businessKeys") List<String> businessKeys);
+
+    Long selectMaxProtocolNo();
+}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/EnvLocationInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/EnvLocationInfoMapper.java
new file mode 100644
index 0000000..49eff87
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/EnvLocationInfoMapper.java
@@ -0,0 +1,21 @@
+package com.casic.missiles.mapper.resource;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.resource.environment.LocationListRequest;
+import com.casic.missiles.dto.resource.environment.LocationListResponse;
+import com.casic.missiles.model.resource.EnvLocationInfo;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * <p>
+ * 实验室环境监控系统-设备表 Mapper 接口
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-06-07
+ */
+public interface EnvLocationInfoMapper extends BaseMapper<EnvLocationInfo> {
+
+    Page<LocationListResponse> selectLocationListPage(Page<LocationListResponse> page, @Param("request") LocationListRequest request);
+}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java
index de124db..85ed0f7 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java
@@ -1,7 +1,9 @@
 package com.casic.missiles.mapper.system;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.dto.system.SignDetailResponse;
+import com.casic.missiles.dto.system.SignListRequest;
 import com.casic.missiles.model.system.SystemSign;
 import org.apache.ibatis.annotations.Param;
 
@@ -22,4 +24,8 @@
     SignDetailResponse selectSignDetailById(Long id);
 
     List<SystemSign> selectUsableSignList(@Param("userId") Long userId);
+
+    Page<SystemSign> selectSignListPage(Page<SystemSign> page, @Param("request") SignListRequest request);
+
+    List<SystemSign> selectSignList(@Param("request") SignListRequest request);
 }
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateChangeApplyMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateChangeApplyMapper.xml
index d798447..c496092 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateChangeApplyMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateChangeApplyMapper.xml
@@ -30,31 +30,31 @@
         SELECT *
         FROM biz_business_certificate_change_apply
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.changeApplyNo != null and request.changeApplyNo !=''">
+        <if test="request != null and request.changeApplyNo != null and request.changeApplyNo !=''">
             and change_apply_no like concat('%',#{request.changeApplyNo},'%')
         </if>
-        <if test="request.changeReportNo != null and request.changeReportNo !=''">
+        <if test="request != null and request.changeReportNo != null and request.changeReportNo !=''">
             and change_report_no like concat('%',#{request.changeReportNo},'%')
         </if>
-        <if test="request.changeReportName != null and request.changeReportName !=''">
+        <if test="request != null and request.changeReportName != null and request.changeReportName !=''">
             and change_report_name like concat('%',#{request.changeReportName},'%')
         </if>
-        <if test="request.changeType != null and request.changeType !=''">
+        <if test="request != null and request.changeType != null and request.changeType !=''">
             and change_type = #{request.changeType}
         </if>
-        <if test="request.createUserName != null and request.createUserName !=''">
+        <if test="request != null and request.createUserName != null and request.createUserName !=''">
             and create_user_name like concat('%',#{request.createUserName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificatePrintMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificatePrintMapper.xml
index b66cd99..49c0ac8 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificatePrintMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificatePrintMapper.xml
@@ -31,34 +31,34 @@
         LEFT JOIN biz_business_order_sample_relation bosr ON (bosr.order_id = bcr.order_id AND bosr.sample_id = bcr.sample_id)
         LEFT JOIN biz_business_order_info boi ON boi.id = bosr.order_id
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and bcp.approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.printStatus != null and request.printStatus !=''">
+        <if test="request != null and request.printStatus != null and request.printStatus !=''">
             and print_status = #{request.printStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and bcp.create_user_id = #{request.createUserId}
         </if>
-        <if test="request.certificateReportNo != null and request.certificateReportNo !=''">
+        <if test="request != null and request.certificateReportNo != null and request.certificateReportNo !=''">
             and bcr.certificate_report_no like concat('%',#{request.certificateReportNo},'%')
         </if>
-        <if test="request.certificateReportName != null and request.certificateReportName !=''">
+        <if test="request != null and request.certificateReportName != null and request.certificateReportName !=''">
             and bcr.certificate_report_name like concat('%',#{request.certificateReportName},'%')
         </if>
-        <if test="request.customerName != null and request.customerName !=''">
+        <if test="request != null and request.customerName != null and request.customerName !=''">
             and boi.customer_name like concat('%',#{request.customerName},'%')
         </if>
-        <if test="request.sampleNo != null and request.sampleNo !=''">
+        <if test="request != null and request.sampleNo != null and request.sampleNo !=''">
             and bosr.sample_no like concat('%',#{request.sampleNo},'%')
         </if>
-        <if test="request.sampleName != null and request.sampleName !=''">
+        <if test="request != null and request.sampleName != null and request.sampleName !=''">
             and bosr.sample_name like concat('%',#{request.sampleName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and bcp.create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and bcp.create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml
index b366034..767695d 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml
@@ -46,33 +46,37 @@
         SELECT bcr.*, bosr.sample_no, bosr.sample_name, bosr.sample_model, rsi.staff_name
         FROM biz_business_certificate_report bcr
         LEFT JOIN biz_business_order_sample_relation bosr ON (bosr.order_id = bcr.order_id AND bosr.sample_id = bcr.sample_id)
+        LEFT JOIN biz_business_order_info boi ON boi.id = bcr.order_id
         LEFT JOIN biz_resource_staff_info rsi ON rsi.id = bcr.measure_person_id
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and bcr.approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and bcr.create_user_id = #{request.createUserId}
         </if>
-        <if test="request.certificateReportNo != null and request.certificateReportNo !=''">
+        <if test="request != null and request.customerId != null and request.customerId !=''">
+            and boi.customer_id = #{request.customerId}
+        </if>
+        <if test="request != null and request.certificateReportNo != null and request.certificateReportNo !=''">
             and bcr.certificate_report_no like concat('%',#{request.certificateReportNo},'%')
         </if>
-        <if test="request.certificateReportName != null and request.certificateReportName !=''">
+        <if test="request != null and request.certificateReportName != null and request.certificateReportName !=''">
             and bcr.certificate_report_name like concat('%',#{request.certificateReportName},'%')
         </if>
-        <if test="request.sampleNo != null and request.sampleNo !=''">
+        <if test="request != null and request.sampleNo != null and request.sampleNo !=''">
             and bosr.sample_no like concat('%',#{request.sampleNo},'%')
         </if>
-        <if test="request.measureCategory != null and request.measureCategory !=''">
+        <if test="request != null and request.measureCategory != null and request.measureCategory !=''">
             and bcr.measure_category = #{request.measureCategory}
         </if>
-        <if test="request.measurePerson != null and request.measurePerson !=''">
+        <if test="request != null and request.measurePerson != null and request.measurePerson !=''">
             and rsi.staff_name like concat('%',#{request.measurePerson},'%')
         </if>
-        <if test="request.calibrationTimeStart != null and request.calibrationTimeStart !=''">
+        <if test="request != null and request.calibrationTimeStart != null and request.calibrationTimeStart !=''">
             and bcr.calibration_time &gt;= #{request.calibrationTimeStart}
         </if>
-        <if test="request.calibrationTimeEnd != null and request.calibrationTimeEnd !=''">
+        <if test="request != null and request.calibrationTimeEnd != null and request.calibrationTimeEnd !=''">
             and bcr.calibration_time &lt;= #{request.calibrationTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceAssessMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceAssessMapper.xml
index d0fcf8b..c22c101 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceAssessMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceAssessMapper.xml
@@ -7,6 +7,8 @@
         <id column="id" property="id" />
         <result column="project_no" property="projectNo" />
         <result column="project_name" property="projectName" />
+        <result column="lab_code" property="labCode" />
+        <result column="group_code" property="groupCode" />
         <result column="applicant_id" property="applicantId" />
         <result column="applicant_name" property="applicantName" />
         <result column="applicant_time" property="applicantTime" />
@@ -31,7 +33,45 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, project_no, project_name, applicant_id, applicant_name, applicant_time, minio_file_name, remark, create_user_id, create_user_name, outsourcer_id, pre_start_time, pre_end_time, outsource_reason, pre_cost, approval_status, process_id, approve_situation, traceability, test_method, technique_ability, create_time, update_time
+        id, project_no, project_name, lab_code, group_code, applicant_id, applicant_name, applicant_time, minio_file_name, remark, create_user_id, create_user_name, outsourcer_id, pre_start_time, pre_end_time, outsource_reason, pre_cost, approval_status, process_id, approve_situation, traceability, test_method, technique_ability, create_time, update_time
     </sql>
 
+    <select id="selectMaxProjectNo" resultType="java.lang.Long">
+        SELECT IFNULL(max(RIGHT(project_no, 3)), 0) from biz_business_outsource_assess
+    </select>
+
+    <select id="selectBatchForApprovalList" resultMap="BaseResultMap">
+        SELECT bboa.*, bboi.outsourcer_name, bboi.director
+        FROM biz_business_outsource_assess bboa
+        LEFT JOIN biz_business_outsourcer_info bboi ON bboa.outsourcer_id = bboi.id
+        WHERE 1=1
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
+            and bboa.approval_status = #{request.approvalStatus}
+        </if>
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
+            and bboa.create_user_id = #{request.createUserId}
+        </if>
+        <if test="request != null and request.projectNo != null and request.projectNo !=''">
+            and bboa.project_no like concat('%',#{request.projectNo},'%')
+        </if>
+        <if test="request != null and request.outsourcerName != null and request.outsourcerName !=''">
+            and bboi.outsourcer_name like concat('%',#{request.outsourcerName},'%')
+        </if>
+        <if test="request != null and request.applicantName != null and request.applicantName !=''">
+            and bboa.applicant_name like concat('%',#{request.applicantName},'%')
+        </if>
+        <if test="request != null and request.applicantTimeStart != null and request.applicantTimeStart !=''">
+            and bboa.applicant_time &gt;= #{request.applicantTimeStart}
+        </if>
+        <if test="request != null and request.applicantTimeEnd != null and request.applicantTimeEnd !=''">
+            and bboa.applicant_time &lt;= #{request.applicantTimeEnd}
+        </if>
+        <if test="businessKeys != null">
+            and bboa.id in
+            <foreach collection="businessKeys" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
+        ORDER BY bboa.create_time DESC
+    </select>
 </mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceProtocolMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceProtocolMapper.xml
new file mode 100644
index 0000000..b7b2149
--- /dev/null
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceProtocolMapper.xml
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.mapper.business.BizBusinessOutsourceProtocolMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.business.BizBusinessOutsourceProtocol">
+        <id column="id" property="id" />
+        <result column="protocol_no" property="protocolNo" />
+        <result column="project_name" property="projectName" />
+        <result column="lab_code" property="labCode" />
+        <result column="group_code" property="groupCode" />
+        <result column="outsourcer_id" property="outsourcerId" />
+        <result column="remark" property="remark" />
+        <result column="outsource_no" property="outsourceNo" />
+        <result column="outsource_name" property="outsourceName" />
+        <result column="contacts" property="contacts" />
+        <result column="mobile" property="mobile" />
+        <result column="address" property="address" />
+        <result column="require_date" property="requireDate" />
+        <result column="outsource_cost" property="outsourceCost" />
+        <result column="director" property="director" />
+        <result column="item" property="item" />
+        <result column="requires" property="requires" />
+        <result column="create_user_id" property="createUserId" />
+        <result column="create_user_name" property="createUserName" />
+        <result column="approval_status" property="approvalStatus" />
+        <result column="process_id" property="processId" />
+        <result column="create_time" property="createTime" />
+        <result column="update_time" property="updateTime" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, protocol_no, project_name, lab_code, group_code, outsourcer_id, remark, outsource_no, outsource_name, contacts, mobile, address, require_date, outsource_cost, director, item, requires, create_user_id, create_user_name, approval_status, process_id, create_time, update_time
+    </sql>
+
+    <select id="selectMaxProtocolNo" resultType="java.lang.Long">
+        SELECT IFNULL(max(RIGHT(protocol_no, 3)), 0) from biz_business_outsource_protocol
+    </select>
+
+    <select id="selectBatchForApprovalList" resultMap="BaseResultMap">
+        SELECT *
+        FROM biz_business_outsource_protocol
+        WHERE 1=1
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
+            and approval_status = #{request.approvalStatus}
+        </if>
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
+            and create_user_id = #{request.createUserId}
+        </if>
+        <if test="request != null and request.protocolNo != null and request.protocolNo !=''">
+            and protocol_no like concat('%',#{request.protocolNo},'%')
+        </if>
+        <if test="request != null and request.outsourcerName != null and request.outsourcerName !=''">
+            and outsourcer_name like concat('%',#{request.outsourcerName},'%')
+        </if>
+        <if test="request != null and request.applicantName != null and request.applicantName !=''">
+            and create_user_name like concat('%',#{request.applicantName},'%')
+        </if>
+        <if test="request != null and request.applicantTimeStart != null and request.applicantTimeStart !=''">
+            and create_time &gt;= #{request.applicantTimeStart}
+        </if>
+        <if test="request != null and request.applicantTimeEnd != null and request.applicantTimeEnd !=''">
+            and create_time &lt;= #{request.applicantTimeEnd}
+        </if>
+        <if test="businessKeys != null">
+            and id in
+            <foreach collection="businessKeys" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
+        ORDER BY create_time DESC
+    </select>
+</mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourcerInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourcerInfoMapper.xml
index 510a80b..3049b54 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourcerInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourcerInfoMapper.xml
@@ -7,6 +7,8 @@
         <id column="id" property="id" />
         <result column="outsourcer_no" property="outsourcerNo" />
         <result column="outsourcer_name" property="outsourcerName" />
+        <result column="lab_code" property="labCode" />
+        <result column="group_code" property="groupCode" />
         <result column="outsourcer_brief_name" property="outsourcerBriefName" />
         <result column="outsourcer_size" property="outsourcerSize" />
         <result column="business_size" property="businessSize" />
@@ -55,32 +57,32 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, outsourcer_no, outsourcer_name, outsourcer_brief_name, outsourcer_size, business_size, grade, evaluation, tax_number, bank_account, bank_name, bank_account_number, postal_code, director, phone, fax, mobile, email, website, address_country, address_province, address_city, address_area, full_address, address_country_name, address_province_name, address_city_name, address_area_name, invoice_country, invoice_province, invoice_city, invoice_area, invoice_full_address, invoice_country_name, invoice_province_name, invoice_city_name, invoice_area_name, business_scope, business_content, minio_file_name, approval_status, process_id, remark, create_user_id, create_user_name, create_time, update_time
+        id, outsourcer_no, outsourcer_name, lab_code, group_code, outsourcer_brief_name, outsourcer_size, business_size, grade, evaluation, tax_number, bank_account, bank_name, bank_account_number, postal_code, director, phone, fax, mobile, email, website, address_country, address_province, address_city, address_area, full_address, address_country_name, address_province_name, address_city_name, address_area_name, invoice_country, invoice_province, invoice_city, invoice_area, invoice_full_address, invoice_country_name, invoice_province_name, invoice_city_name, invoice_area_name, business_scope, business_content, minio_file_name, approval_status, process_id, remark, create_user_id, create_user_name, create_time, update_time
     </sql>
 
     <select id="selectBatchForApprovalList" resultMap="BaseResultMap">
         SELECT *
         FROM biz_business_outsourcer_info
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.outsourcerNo != null and request.outsourcerNo !=''">
+        <if test="request != null and request.outsourcerNo != null and request.outsourcerNo !=''">
             and outsourcer_no like concat('%',#{request.outsourcerNo},'%')
         </if>
-        <if test="request.outsourcerName != null and request.outsourcerName !=''">
+        <if test="request != null and request.outsourcerName != null and request.outsourcerName !=''">
             and outsourcer_name like concat('%',#{request.outsourcerName},'%')
         </if>
-        <if test="request.director != null and request.director !=''">
+        <if test="request != null and request.director != null and request.director !=''">
             and director like concat('%',#{request.director},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
@@ -93,6 +95,6 @@
     </select>
 
     <select id="selectMaxNo" resultType="java.lang.Long">
-        SELECT IFNULL(max(RIGHT(outsourcer_no, 12)), 0) from biz_business_outsourcer_info
+        SELECT IFNULL(max(RIGHT(outsourcer_no, 3)), 0) from biz_business_outsourcer_info
     </select>
 </mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessSiteExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessSiteExecutiveInfoMapper.xml
index 135c5d0..3c5ae79 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessSiteExecutiveInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessSiteExecutiveInfoMapper.xml
@@ -38,25 +38,25 @@
         FROM biz_business_site_executive_info bsei
         LEFT JOIN biz_resource_customer_info rci ON bsei.customer_id = rci.id
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and bsei.approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and bsei.create_user_id = #{request.createUserId}
         </if>
-        <if test="request.siteExecutiveNo != null and request.siteExecutiveNo !=''">
+        <if test="request != null and request.siteExecutiveNo != null and request.siteExecutiveNo !=''">
             and bsei.site_executive_no like concat('%',#{request.siteExecutiveNo},'%')
         </if>
-        <if test="request.customerName != null and request.customerName !=''">
+        <if test="request != null and request.customerName != null and request.customerName !=''">
             and rci.outsourcer_name like concat('%',#{request.customerName},'%')
         </if>
-        <if test="request.applyName != null and request.applyName !=''">
+        <if test="request != null and request.applyName != null and request.applyName !=''">
             and bsei.apply_name like concat('%',#{request.applyName},'%')
         </if>
-        <if test="request.applyTimeStart != null and request.applyTimeStart !=''">
+        <if test="request != null and request.applyTimeStart != null and request.applyTimeStart !=''">
             and bsei.apply_time &gt;= #{request.applyTimeStart}
         </if>
-        <if test="request.applyTimeEnd != null and request.applyTimeEnd !=''">
+        <if test="request != null and request.applyTimeEnd != null and request.applyTimeEnd !=''">
             and bsei.apply_time &lt;= #{request.applyTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml
index 84d9e2a..6bd38a9 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml
@@ -105,6 +105,12 @@
         <if test="request.isUrgent != null and request.isUrgent !=''">
             AND bo.is_urgent = #{request.isUrgent}
         </if>
+        <if test="request.ids != null">
+            and blei.id in
+            <foreach collection="request.ids" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
         ORDER BY blei.update_time DESC
     </select>
 
@@ -137,6 +143,12 @@
         <if test="request.isUrgent != null and request.isUrgent !=''">
             AND bo.is_urgent = #{request.isUrgent}
         </if>
+        <if test="request.ids != null">
+            and blei.id in
+            <foreach collection="request.ids" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
         ORDER BY blei.update_time DESC
     </select>
 
diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardInfoMapper.xml
index 1a5551b..2ed8d17 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardInfoMapper.xml
@@ -45,12 +45,6 @@
         FROM biz_equipment_standard_info besi
         LEFT JOIN biz_equipment_standard_technology_relation bestr ON besi.standard_no = bestr.standard_no
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
-            and besi.approval_status = #{request.approvalStatus}
-        </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
-            and besi.create_user_id = #{request.createUserId}
-        </if>
         <if test="request.standardName != null and request.standardName !=''">
             and besi.standard_name like concat('%',#{request.standardName},'%')
         </if>
diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardTechnologyRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardTechnologyRelationMapper.xml
index fc7e16c..cd03c8c 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardTechnologyRelationMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardTechnologyRelationMapper.xml
@@ -6,6 +6,7 @@
     <resultMap id="BaseResultMap" type="com.casic.missiles.model.equipment.BizEquipmentStandardTechnologyRelation">
         <id column="id" property="id" />
         <result column="technology_file_id" property="technologyFileId" />
+        <result column="technology_file_no" property="technologyFileNo" />
         <result column="technology_file_name" property="technologyFileName" />
         <result column="standard_id" property="standardId" />
         <result column="standard_no" property="standardNo" />
@@ -14,7 +15,7 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, technology_file_id, technology_file_name, standard_id, remark
+        id, technology_file_id, technology_file_no, technology_file_name, standard_id, remark
     </sql>
 
 </mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceAuthorizeOrderMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceAuthorizeOrderMapper.xml
index ac5176c..554fe65 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceAuthorizeOrderMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceAuthorizeOrderMapper.xml
@@ -32,22 +32,22 @@
         SELECT *
         FROM biz_resource_authorize_order
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.orderNo != null and request.orderNo !=''">
+        <if test="request != null and request.orderNo != null and request.orderNo !=''">
             and order_no like concat('%',#{request.orderNo},'%')
         </if>
-        <if test="request.createUserName != null and request.createUserName !=''">
+        <if test="request != null and request.createUserName != null and request.createUserName !=''">
             and create_user_name like concat('%',#{request.createUserName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerExamineFormMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerExamineFormMapper.xml
index ab242f6..af7f98f 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerExamineFormMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerExamineFormMapper.xml
@@ -41,28 +41,28 @@
         SELECT *
         FROM biz_resource_customer_examine_form
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.formNo != null and request.formNo !=''">
+        <if test="request != null and request.formNo != null and request.formNo !=''">
             and form_no like concat('%',#{request.formNo},'%')
         </if>
-        <if test="request.labCode != null and request.labCode !=''">
+        <if test="request != null and request.labCode != null and request.labCode !=''">
             and lab_code like concat('%',#{request.labCode},'%')
         </if>
-        <if test="request.groupCode != null and request.groupCode !=''">
+        <if test="request != null and request.groupCode != null and request.groupCode !=''">
             and group_code like concat('%',#{request.groupCode},'%')
         </if>
-        <if test="request.createUserName != null and request.createUserName !=''">
+        <if test="request != null and request.createUserName != null and request.createUserName !=''">
             and create_user_name like concat('%',#{request.createUserName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerInfoMapper.xml
index fa8ffbc..06a2798 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerInfoMapper.xml
@@ -33,25 +33,25 @@
         SELECT *
         FROM biz_resource_customer_info
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.customerNo != null and request.customerNo !=''">
+        <if test="request != null and request.customerNo != null and request.customerNo !=''">
             and customer_no like concat('%',#{request.customerNo},'%')
         </if>
-        <if test="request.customerName != null and request.customerName !=''">
+        <if test="request != null and request.customerName != null and request.customerName !=''">
             and customer_name like concat('%',#{request.customerName},'%')
         </if>
-        <if test="request.contacts != null and request.contacts !=''">
+        <if test="request != null and request.contacts != null and request.contacts !=''">
             and contacts like concat('%',#{request.contacts},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerSuggestFormMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerSuggestFormMapper.xml
index 28f5bb2..1806662 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerSuggestFormMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerSuggestFormMapper.xml
@@ -33,28 +33,28 @@
         SELECT *
         FROM biz_resource_customer_suggest_form
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.formNo != null and request.formNo !=''">
+        <if test="request != null and request.formNo != null and request.formNo !=''">
             and form_no like concat('%',#{request.formNo},'%')
         </if>
-        <if test="request.customerName != null and request.customerName !=''">
+        <if test="request != null and request.customerName != null and request.customerName !=''">
             and customer_name like concat('%',#{request.customerName},'%')
         </if>
-        <if test="request.customerDeptName != null and request.customerDeptName !=''">
+        <if test="request != null and request.customerDeptName != null and request.customerDeptName !=''">
             and customer_dept_name like concat('%',#{request.customerDeptName},'%')
         </if>
-        <if test="request.createUserName != null and request.createUserName !=''">
+        <if test="request != null and request.createUserName != null and request.createUserName !=''">
             and create_user_name like concat('%',#{request.createUserName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSealUseNoteMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSealUseNoteMapper.xml
index ab37bc1..b02bb33 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSealUseNoteMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSealUseNoteMapper.xml
@@ -29,32 +29,32 @@
     </sql>
 
     <select id="selectBatchForApprovalList" resultMap="BaseResultMap">
-        SELECT *
+        SELECT brsun.*, brsi.seal_name, brsi.seal_type, brsi.approver_name
         FROM biz_resource_seal_use_note brsun
         JOIN biz_resource_seal_info brsi ON brsun.seal_id = brsi.id
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and brsun.approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and brsun.create_user_id = #{request.createUserId}
         </if>
-        <if test="request.sealName != null and request.sealName !=''">
+        <if test="request != null and request.sealName != null and request.sealName !=''">
             and brsi.seal_name like concat('%',#{request.sealName},'%')
         </if>
-        <if test="request.sealType != null and request.sealType !=''">
+        <if test="request != null and request.sealType != null and request.sealType !=''">
             and brsi.seal_type = #{request.sealType}
         </if>
-        <if test="request.applyDeptName != null and request.applyDeptName !=''">
+        <if test="request != null and request.applyDeptName != null and request.applyDeptName !=''">
             and brsun.apply_dept_name like concat('%',#{request.applyDeptName},'%')
         </if>
-        <if test="request.applyUserName != null and request.applyUserName !=''">
+        <if test="request != null and request.applyUserName != null and request.applyUserName !=''">
             and brsun.apply_user_name like concat('%',#{request.applyUserName},'%')
         </if>
-        <if test="request.applyTimeStart != null and request.applyTimeStart !=''">
+        <if test="request != null and request.applyTimeStart != null and request.applyTimeStart !=''">
             and brsun.apply_time &gt;= #{request.applyTimeStart}
         </if>
-        <if test="request.applyTimeEnd != null and request.applyTimeEnd !=''">
+        <if test="request != null and request.applyTimeEnd != null and request.applyTimeEnd !=''">
             and brsun.apply_time &lt;= #{request.applyTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml
index 119bf7d..4f8392a 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml
@@ -31,6 +31,12 @@
         <if test="request.deptName != null and request.deptName !=''">
             and brsi.dept_name like concat('%',#{request.deptName},'%')
         </if>
+        <if test="request.ids != null">
+            and brsv.id in
+            <foreach collection="request.ids" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
         ORDER BY brsv.grant_date DESC
     </select>
 
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSupplierInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSupplierInfoMapper.xml
index fe8d399..e8ce7ef 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSupplierInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSupplierInfoMapper.xml
@@ -48,28 +48,28 @@
         SELECT *
         FROM biz_resource_supplier_info
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.supplierNo != null and request.supplierNo !=''">
+        <if test="request != null and request.supplierNo != null and request.supplierNo !=''">
             and supplier_no like concat('%',#{request.supplierNo},'%')
         </if>
-        <if test="request.supplierName != null and request.supplierName !=''">
+        <if test="request != null and request.supplierName != null and request.supplierName !=''">
             and supplier_name like concat('%',#{request.supplierName},'%')
         </if>
-        <if test="request.director != null and request.director !=''">
+        <if test="request != null and request.director != null and request.director !=''">
             and director like concat('%',#{request.director},'%')
         </if>
-        <if test="request.supplierType != null and request.supplierType !=''">
+        <if test="request != null and request.supplierType != null and request.supplierType !=''">
             and supplier_type = #{request.supplierType}
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/EnvLocationInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/EnvLocationInfoMapper.xml
new file mode 100644
index 0000000..68bcf10
--- /dev/null
+++ b/casic-metering-dao/src/main/resources/mapper/resource/EnvLocationInfoMapper.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.mapper.resource.EnvLocationInfoMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.resource.EnvLocationInfo">
+        <id column="id" property="id" />
+        <result column="location_no" property="locationNo" />
+        <result column="location_name" property="locationName" />
+        <result column="location_position" property="locationPosition" />
+        <result column="create_user_id" property="createUserId" />
+        <result column="create_user" property="createUser" />
+        <result column="create_time" property="createTime" />
+        <result column="update_time" property="updateTime" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, location_no, location_name, location_position, create_user_id, create_user, create_time, update_time
+    </sql>
+
+    <select id="selectLocationListPage" resultType="com.casic.missiles.dto.resource.environment.LocationListResponse">
+        SELECT *
+        FROM env_location_info
+        WHERE 1=1
+        <if test="request.locationNo != null and request.locationNo !=''">
+            AND location_no LIKE concat('%',#{request.locationNo},'%')
+        </if>
+        <if test="request.locationName != null and request.locationName !=''">
+            AND location_name LIKE concat('%',#{request.locationName},'%')
+        </if>
+        ORDER BY create_time DESC
+    </select>
+
+</mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml
index b28c18f..8854047 100644
--- a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml
@@ -11,7 +11,6 @@
         <result column="sign_desc" property="signDesc" />
         <result column="sign_director" property="signDirector" />
         <result column="sign_user_id" property="signUserId" />
-        <result column="sign_type" property="signType" />
         <result column="minio_file_name" property="minioFileName" />
         <result column="create_time" property="createTime" />
         <result column="update_time" property="updateTime" />
@@ -28,7 +27,6 @@
         <result column="sign_name" property="signName" />
         <result column="sign_desc" property="signDesc" />
         <result column="sign_director" property="signDirector" />
-        <result column="sign_type" property="signType" />
         <result column="sign_user_id" property="signUserId" />
         <result column="minio_file_name" property="minioFileName" />
         <result column="create_time" property="createTime" />
@@ -62,4 +60,58 @@
         JOIN system_sign_user_relation ssur ON ss.id = ssur.sign_id
         WHERE ssur.user_id = #{userId}
     </select>
+
+    <select id="selectSignListPage" resultMap="BaseResultMap">
+        SELECT ss.*, sd.SIMPLE_NAME AS deptName
+        FROM system_sign ss
+        LEFT JOIN sys_user su ON su.id = ss.sign_user_id
+        LEFT JOIN sys_dept sd ON sd.id = su.dept_id
+        WHERE 1=1
+        <if test="request.signNo != null and request.signNo !=''">
+            AND ss.sign_no LIKE concat('%',#{request.signNo},'%')
+        </if>
+        <if test="request.signName != null and request.signName !=''">
+            AND ss.sign_name LIKE concat('%',#{request.signName},'%')
+        </if>
+        <if test="request.signDirector != null and request.signDirector !=''">
+            AND ss.sign_director LIKE concat('%',#{request.signDirector},'%')
+        </if>
+        <if test="request.signUserId != null and request.signUserId !=''">
+            AND ss.sign_user_id = #{request.signUserId}
+        </if>
+        <if test="request.createStartTime != null and request.createStartTime !=''">
+            AND DATE_FORMAT(ss.create_time,'%Y-%m-%d') &gt;= DATE_FORMAT(#{request.createStartTime},'%Y-%m-%d')
+        </if>
+        <if test="request.createEndTime != null and request.createEndTime !=''">
+            AND DATE_FORMAT(ss.create_time,'%Y-%m-%d')  &lt;= DATE_FORMAT(#{request.createEndTime},'%Y-%m-%d')
+        </if>
+        ORDER BY ss.create_time DESC
+    </select>
+
+    <select id="selectSignList" resultMap="BaseResultMap">
+        SELECT ss.*, sd.SIMPLE_NAME AS deptName
+        FROM system_sign ss
+        LEFT JOIN sys_user su ON su.id = ss.sign_user_id
+        LEFT JOIN sys_dept sd ON sd.id = su.dept_id
+        WHERE 1=1
+        <if test="request.signNo != null and request.signNo !=''">
+            AND ss.sign_no LIKE concat('%',#{request.signNo},'%')
+        </if>
+        <if test="request.signName != null and request.signName !=''">
+            AND ss.sign_name LIKE concat('%',#{request.signName},'%')
+        </if>
+        <if test="request.signDirector != null and request.signDirector !=''">
+            AND ss.sign_director LIKE concat('%',#{request.signDirector},'%')
+        </if>
+        <if test="request.signUserId != null and request.signUserId !=''">
+            AND ss.sign_user_id = #{request.signUserId}
+        </if>
+        <if test="request.createStartTime != null and request.createStartTime !=''">
+            AND DATE_FORMAT(ss.create_time,'%Y-%m-%d') &gt;= DATE_FORMAT(#{request.createStartTime},'%Y-%m-%d')
+        </if>
+        <if test="request.createEndTime != null and request.createEndTime !=''">
+            AND DATE_FORMAT(ss.create_time,'%Y-%m-%d')  &lt;= DATE_FORMAT(#{request.createEndTime},'%Y-%m-%d')
+        </if>
+        ORDER BY ss.create_time DESC
+    </select>
 </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 515050a..60f530b 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
@@ -47,8 +47,8 @@
     String STORAGE_LOCATION = "bizStorageLocation";
     //计量专业
     String MEASURE_MAJOR = "bizMeasureMajor";
-    //管理状态
-    String MANAGER_STATE = "bizManagerState";
+    //标准装置管理状态
+    String STANDARD_MANAGER_STATE = "bizStandardManagerState";
 
     /**
      * 资源管理 字典code
@@ -95,8 +95,6 @@
     String MEASURE_STATUS = "measureStatus";
     //检定方式
     String MEASURE_TYPE = "measureType";
-    //标识打印标志类型
-    String IDENTIFY_PRINT_TYPE = "bizBusinessIdentify";
     //变更类型
     String REPORT_CHANGE_TYPE = "bizCertChangeType";
     //规模类型
@@ -111,19 +109,24 @@
     String MEASURE_CATEGORY = "measureCategory";
     //检定结果
     String MEASURE_RESULT = "measureResult";
+    //分包原因
+    String OUTSOURCE_REASON = "outsourceReason";
+
+    /**
+     * 系统管理
+     */
+    String TEMPLATE_TYPE = "templateType";
+
 
     /**
      * 标准装置 字典code
      */
     //类别
     String STANDARD_CATEGORY = "standardCategory";
-    //管理状态
-    String STANDARD_MANAGER_STATE = "standardManagerState";
     //标准等级
     String STANDARD_LEVEL = "standardLevel";
     //传递范围
     String STANDARD_TRANSMIT_RANGE = "transmitRange";
-
     //资本来源
     String CAPITAL_SOURCE = "capitalSource";
     //标准装置-申请类型
@@ -148,8 +151,6 @@
     String CERTIFICATE_CLASS = "certificationClass";
     //证书管理-检校专业
     String CALIBRATION_MAJOR = "calibrationMajor";
-    //分包原因
-    String OUTSOURCE_REASON = "outsourceReason";
 
     /**
      * 工作台
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/BaseApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/BaseApprovalListRequest.java
index 73c12c1..80d7424 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/BaseApprovalListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/BaseApprovalListRequest.java
@@ -6,6 +6,7 @@
 
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotEmpty;
+import java.util.List;
 
 /**
  * @Description:
@@ -19,14 +20,14 @@
      * 表单id
      */
     @NotBlank(message = "表单id不能为空")
-    @ApiModelProperty(value = "表单id（流程定义对应的表单id，等价于业务id）", dataType = "String")
+    @ApiModelProperty(value = "表单id（流程定义对应的表单id，等价于业务id），导出接口不用传", dataType = "String")
     private String formId;
 
     /**
      * 审批状态类型，对应ApprovalStatusEnum
      */
     @NotEmpty(message = "审批状态类型不能为空")
-    @ApiModelProperty(value = "审批状态类型code", dataType = "String")
+    @ApiModelProperty(value = "审批状态类型code，导出接口不用传", dataType = "String")
     private String approvalStatus;
 
     @ApiModelProperty(hidden = true)
@@ -34,4 +35,7 @@
 
     @ApiModelProperty(hidden = true)
     private Long createUserId;
+
+    @ApiModelProperty(value = "导出ids", dataType = "List")
+    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificatePrintApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificatePrintApprovalListRequest.java
index b93d1c9..3cc2f4e 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificatePrintApprovalListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificatePrintApprovalListRequest.java
@@ -5,8 +5,6 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import java.util.List;
-
 /**
  * @Description:
  * @Author: wangpeng
@@ -38,7 +36,4 @@
 
     @ApiModelProperty(value = "创建结束时间", dataType = "String")
     private String createTimeEnd;
-
-    @ApiModelProperty(value = "导出ids", dataType = "List")
-    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportApprovalListRequest.java
index 4f7a038..c115847 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportApprovalListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportApprovalListRequest.java
@@ -5,8 +5,6 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import java.util.List;
-
 /**
  * @Description:
  * @Author: wangpeng
@@ -15,6 +13,8 @@
 @ApiModel
 @Data
 public class CertificateReportApprovalListRequest extends BaseApprovalListRequest {
+    @ApiModelProperty(value = "委托方id", dataType = "String")
+    private Long customerId;
 
     @ApiModelProperty(value = "证书报告编号", dataType = "String")
     private String certificateReportNo;
@@ -37,6 +37,4 @@
     @ApiModelProperty(value = "检校结束时间", dataType = "String")
     private String calibrationTimeEnd;
 
-    @ApiModelProperty(value = "导出ids", dataType = "List")
-    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/identify/IdentifyListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/identify/IdentifyListRequest.java
index 1b87ae6..f019203 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/identify/IdentifyListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/identify/IdentifyListRequest.java
@@ -4,6 +4,8 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * @Description:
  * @Author: wangpeng
@@ -26,4 +28,7 @@
 
     @ApiModelProperty(value = "打印结束时间", dataType = "String")
     private String createTimeEnd;
+
+    @ApiModelProperty(value = "导出ids", dataType = "List")
+    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListRequest.java
index 1264883..62415fb 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListRequest.java
@@ -7,6 +7,7 @@
 import lombok.Data;
 
 import javax.validation.constraints.NotBlank;
+import java.util.List;
 
 @Data
 @ApiModel
@@ -37,4 +38,6 @@
     @ApiModelProperty(value = "是否加急（1是0否null全部）", dataType = "Integer")
     private String isUrgent;
 
+    @ApiModelProperty(value = "导出ids", dataType = "List")
+    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListRequest.java
index 5201d7b..499760a 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListRequest.java
@@ -17,6 +17,9 @@
     @ApiModelProperty(value = "任务单编号", dataType = "String")
     private String orderNo;
 
+    @ApiModelProperty(value = "委托方id", dataType = "Long")
+    private Long customerId;
+
     @ApiModelProperty(value = "委托方名称", dataType = "String")
     private String customerName;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OrderSampleDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OrderSampleDTO.java
new file mode 100644
index 0000000..796edc0
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OrderSampleDTO.java
@@ -0,0 +1,19 @@
+package com.casic.missiles.dto.business.outsource;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/8/24 11:38
+ */
+@ApiModel
+@Data
+public class OrderSampleDTO {
+    @ApiModelProperty(value = "任务单id", dataType = "Long")
+    private Long orderId;
+    @ApiModelProperty(value = "受检设备id", dataType = "Long")
+    private Long sampleId;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceAssessApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceAssessApprovalListRequest.java
new file mode 100644
index 0000000..9a930c3
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceAssessApprovalListRequest.java
@@ -0,0 +1,30 @@
+package com.casic.missiles.dto.business.outsource;
+
+import com.casic.missiles.dto.BaseApprovalListRequest;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/8/24 11:01
+ */
+@ApiModel
+@Data
+public class OutsourceAssessApprovalListRequest extends BaseApprovalListRequest {
+    @ApiModelProperty(value = "评审表编号", dataType = "String")
+    private String projectNo;
+
+    @ApiModelProperty(value = "分包机构名称", dataType = "String")
+    private String outsourcerName;
+
+    @ApiModelProperty(value = "申请人", dataType = "String")
+    private String applicantName;
+
+    @ApiModelProperty(value = "申请时间开始", dataType = "String")
+    private String applicantTimeStart;
+
+    @ApiModelProperty(value = "申请时间结束", dataType = "String")
+    private String applicantTimeEnd;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceAssessSaveResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceAssessSaveResponse.java
new file mode 100644
index 0000000..8bf9aad
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceAssessSaveResponse.java
@@ -0,0 +1,20 @@
+package com.casic.missiles.dto.business.outsource;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/8/14 16:17
+ */
+@ApiModel
+@Data
+public class OutsourceAssessSaveResponse {
+    @ApiModelProperty(value = "主键id", dataType = "Long")
+    private Long id;
+
+    @ApiModelProperty(value = "编号", dataType = "String")
+    private String projectNo;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProtocolApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProtocolApprovalListRequest.java
new file mode 100644
index 0000000..0f32331
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProtocolApprovalListRequest.java
@@ -0,0 +1,30 @@
+package com.casic.missiles.dto.business.outsource;
+
+import com.casic.missiles.dto.BaseApprovalListRequest;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/8/24 15:01
+ */
+@ApiModel
+@Data
+public class OutsourceProtocolApprovalListRequest extends BaseApprovalListRequest {
+    @ApiModelProperty(value = "协议书编号", dataType = "String")
+    private String protocolNo;
+
+    @ApiModelProperty(value = "分包方名称", dataType = "String")
+    private String outsourcerName;
+
+    @ApiModelProperty(value = "申请人", dataType = "String")
+    private String applicantName;
+
+    @ApiModelProperty(value = "申请时间开始", dataType = "String")
+    private String applicantTimeStart;
+
+    @ApiModelProperty(value = "申请时间结束", dataType = "String")
+    private String applicantTimeEnd;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProtocolSaveResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProtocolSaveResponse.java
new file mode 100644
index 0000000..e324967
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProtocolSaveResponse.java
@@ -0,0 +1,20 @@
+package com.casic.missiles.dto.business.outsource;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/8/14 16:17
+ */
+@ApiModel
+@Data
+public class OutsourceProtocolSaveResponse {
+    @ApiModelProperty(value = "主键id", dataType = "Long")
+    private Long id;
+
+    @ApiModelProperty(value = "编号", dataType = "String")
+    private String protocolNo;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveApprovalListRequest.java
index f29f4e4..7047c28 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveApprovalListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveApprovalListRequest.java
@@ -5,8 +5,6 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import java.util.List;
-
 /**
  * @Description: 现场检测审批列表请求实体
  * @Author: wangpeng
@@ -30,7 +28,4 @@
     @ApiModelProperty(value = "申请时间结束", dataType = "String")
     private String applyTimeEnd;
 
-    @ApiModelProperty(value = "导出ids", dataType = "List")
-    private List<Long> ids;
-
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveDetailResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveDetailResponse.java
index 1f28752..394c934 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveDetailResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveDetailResponse.java
@@ -12,6 +12,18 @@
     @ApiModelProperty(value = "id，更新/删除使用参数", dataType = "Long")
     private Long id;
 
+    @ApiModelProperty(value = "实验室代码(字典code)", dataType = "String")
+    private String labCode;
+
+    @ApiModelProperty(value = "实验室代码(字典value)", dataType = "String")
+    private String labCodeName;
+
+    @ApiModelProperty(value = "组别代码(字典code)", dataType = "String")
+    private String groupCode;
+
+    @ApiModelProperty(value = "组别代码(字典value)", dataType = "String")
+    private String groupCodeName;
+
     @ApiModelProperty(value = "审批编号", dataType = "String")
     private String siteExecutiveNo;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/environment/LocationListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/environment/LocationListRequest.java
new file mode 100644
index 0000000..13d03c3
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/environment/LocationListRequest.java
@@ -0,0 +1,20 @@
+package com.casic.missiles.dto.resource.environment;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/6/8 13:56
+ */
+@ApiModel
+@Data
+public class LocationListRequest {
+    @ApiModelProperty(value = "地点编号", dataType = "String")
+    private String locationNo;
+
+    @ApiModelProperty(value = "地点名称", dataType = "String")
+    private String locationName;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/environment/LocationListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/environment/LocationListResponse.java
new file mode 100644
index 0000000..4c531af
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/environment/LocationListResponse.java
@@ -0,0 +1,78 @@
+package com.casic.missiles.dto.resource.environment;
+
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
+import com.baomidou.mybatisplus.annotation.TableField;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description: 地点列表响应实体
+ * @Author: wangpeng
+ * @Date: 2023/6/8 13:53
+ */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
+@ApiModel
+@Data
+public class LocationListResponse {
+    @ApiModelProperty(value = "主键id", dataType = "Long")
+    private Long id;
+
+    /**
+     * 地点编号
+     */
+    @ExcelProperty("地点编号")
+    @ApiModelProperty(value = "地点编号", dataType = "String")
+    private String locationNo;
+
+    /**
+     * 地点名称
+     */
+    @ExcelProperty("地点名称")
+    @ApiModelProperty(value = "地点名称", dataType = "String")
+    private String locationName;
+
+    /**
+     * 地点位置
+     */
+    @ExcelProperty("地点位置")
+    @ApiModelProperty(value = "地点位置", dataType = "String")
+    private String locationPosition;
+
+    /**
+     * 创建人id
+     */
+    @ApiModelProperty(value = "创建人id", dataType = "Long")
+    private Long createUserId;
+
+    /**
+     * 创建人
+     */
+    @ExcelProperty("创建人")
+    @ApiModelProperty(value = "创建人", dataType = "String")
+    @TableField("create_user")
+    private String createUser;
+
+    /**
+     * 创建时间
+     */
+    @ExcelProperty("创建时间")
+    @ApiModelProperty(value = "创建时间", dataType = "String")
+    private String createTime;
+
+    /**
+     * 更新时间
+     */
+    @ApiModelProperty(value = "更新时间", dataType = "String")
+    private String updateTime;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertRequest.java
index 9a7f6c6..c827915 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertRequest.java
@@ -4,6 +4,8 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * @Description:
  * @Author: wangpeng
@@ -16,4 +18,7 @@
     private String name;
     @ApiModelProperty(value = "部门名", dataType = "String")
     private String deptName;
+
+    @ApiModelProperty(value = "导出ids", dataType = "List")
+    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertResponse.java
index f78b159..8f2f79e 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertResponse.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.dto.resource.staff;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.casic.missiles.annotation.DictCodeField;
 import com.casic.missiles.constants.MeterDictCode;
 import io.swagger.annotations.ApiModel;
@@ -13,12 +20,18 @@
  * @Author: wangpeng
  * @Date: 2023/7/27 15:13
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @ApiModel
 @Data
 public class StaffCertResponse {
     /**
      * 人员编号
      */
+    @ExcelProperty(value = "人员编号",order = 0)
     @NotEmpty(message = "人员编号不能为空")
     @ApiModelProperty(value = "人员编号", dataType = "String")
     private String staffNo;
@@ -26,6 +39,7 @@
     /**
      * 姓名
      */
+    @ExcelProperty(value = "姓名",order = 1)
     @ApiModelProperty(value = "姓名", dataType = "String")
     private String staffName;
 
@@ -54,6 +68,7 @@
     /**
      * 部门名字
      */
+    @ExcelProperty(value = "工作部门",order = 2)
     @ApiModelProperty(value = "部门名字", dataType = "String")
     private String deptName;
 
@@ -66,6 +81,7 @@
     /**
      * 计量专业
      */
+    @ExcelProperty(value = "计量专业",order = 3)
     @ApiModelProperty(value = "计量专业", dataType = "String")
     private String major;
 
@@ -110,6 +126,7 @@
     /**
      * 证书号
      */
+    @ExcelProperty(value = "证号",order = 4)
     @ApiModelProperty(value = "证书号", dataType = "String")
     private String certNo;
 
@@ -122,12 +139,14 @@
     /**
      * 有效日期
      */
+    @ExcelProperty(value = "证书有效期",order = 6)
     @ApiModelProperty(value = "有效日期", dataType = "String")
     private String effectiveDate;
 
     /**
      * 发放日期
      */
+    @ExcelProperty(value = "发证日期",order = 5)
     @ApiModelProperty(value = "发放日期", dataType = "String")
     private String grantDate;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffListRequest.java
index 7c4afb3..0a1194a 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffListRequest.java
@@ -4,6 +4,8 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * @Description:
  * @Author: wangpeng
@@ -18,4 +20,7 @@
     private String deptName;
     @ApiModelProperty(value = "部门id", dataType = "Long")
     private Long deptId;
+
+    @ApiModelProperty(value = "导出ids", dataType = "List")
+    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/TrainListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/TrainListRequest.java
index f68597b..6321f8b 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/TrainListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/TrainListRequest.java
@@ -14,6 +14,8 @@
 public class TrainListRequest {
     @ApiModelProperty(value = "训练登记表编号", dataType = "String")
     private String trainNo;
+    @ApiModelProperty(value = "值班领导", dataType = "String")
+    private String dutyLeader;
     @ApiModelProperty(value = "创建开始时间", dataType = "String")
     private String createTimeStart;
     @ApiModelProperty(value = "创建结束时间", dataType = "String")
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/SignAddRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/SignAddRequest.java
index 117be34..d71055c 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/SignAddRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/SignAddRequest.java
@@ -43,13 +43,6 @@
     private Long signUserId;
 
     /**
-     * 签章或签名-字典code
-     */
-    @NotBlank(message = "类型不能为空")
-    @ApiModelProperty(value = "签名/签章-字典code", dataType = "String", required = true)
-    private String signType;
-
-    /**
      * minio存储文件名
      */
     @ApiModelProperty(value = "上传文件返回名称", dataType = "String")
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateAddRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateAddRequest.java
index aff1265..6316648 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateAddRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateAddRequest.java
@@ -17,30 +17,28 @@
 @Data
 public class TemplateAddRequest extends BaseSystemRequest {
     /**
-     * 原始记录模板/证书报告模板名称
+     * 模板名称
      */
     @ApiModelProperty(value = "名称", dataType = "String", required = true)
     @NotBlank(message = "名称不能为空")
     private String templateName;
 
     /**
-     * 原始记录模板/证书报告模板描述
+     * 模板描述
      */
     @ApiModelProperty(value = "描述", dataType = "String")
     private String templateDesc;
 
     /**
-     * 原始记录模板/证书报告模板创建人
+     * 创建人
      */
     @ApiModelProperty(value = "创建人", dataType = "String", required = true)
     @NotBlank(message = "创建人不能为空")
     private String templateCreator;
 
-    /**
-     * 原始记录模板/证书报告模板-字典code
-     */
-    @NotBlank(message = "类型不能为空")
-    @ApiModelProperty(value = "原始记录模板/证书报告模板-字典code", dataType = "String", required = true)
+
+    @NotBlank(message = "模板类型不能为空")
+    @ApiModelProperty(value = "模板类型(字典code)", dataType = "String", required = true)
     private String templateType;
 
     /**
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateListRequest.java
index eec5a1e..6d17bbe 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateListRequest.java
@@ -1,11 +1,12 @@
 package com.casic.missiles.dto.system;
 
+import com.casic.missiles.annotation.DictCodeField;
+import com.casic.missiles.constants.MeterDictCode;
 import com.casic.missiles.dto.BaseSystemRequest;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import javax.validation.constraints.NotBlank;
 import java.util.List;
 
 /**
@@ -19,8 +20,8 @@
     /**
      * 类型
      */
-//    @ApiModelProperty(value = "类型-字典code", dataType = "String", required = true)
-    @NotBlank(message = "类型不能为空")
+    @DictCodeField(message = "模板类型不合法", cacheName = MeterDictCode.TEMPLATE_TYPE)
+    @ApiModelProperty(value = "模板类型(字典code)", dataType = "String")
     private String templateType;
 
     /**
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificateChangeApply.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificateChangeApply.java
index 9216308..36923fd 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificateChangeApply.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificateChangeApply.java
@@ -1,11 +1,19 @@
 package com.casic.missiles.model.business;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 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 com.casic.missiles.dto.BaseRequest;
+import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -20,6 +28,12 @@
  * @author wangpeng
  * @since 2023-08-15
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
+@ApiModel
 @Data
 @TableName("biz_business_certificate_change_apply")
 public class BizBusinessCertificateChangeApply extends BaseRequest implements Serializable {
@@ -33,6 +47,7 @@
     /**
      * 申请单编号
      */
+    @ExcelProperty(value = "申请单编号", order = 1)
     @ApiModelProperty(value = "申请单编号", dataType = "String")
     @TableField("change_apply_no")
     private String changeApplyNo;
@@ -40,6 +55,7 @@
     /**
      * 申请单名字
      */
+    @ExcelProperty(value = "申请单名称", order = 2)
     @ApiModelProperty(value = "申请单名字", dataType = "String")
     @TableField("change_apply_name")
     private String changeApplyName;
@@ -54,6 +70,7 @@
     /**
      * 更换证书编号
      */
+    @ExcelProperty(value = "更换证书编号", order = 3)
     @ApiModelProperty(value = "更换证书编号", dataType = "String")
     @TableField("change_report_no")
     private String changeReportNo;
@@ -61,7 +78,8 @@
     /**
      * 更换证书名字
      */
-    @ApiModelProperty(value = "更换证书名字", dataType = "String")
+    @ExcelProperty(value = "更换证书/报告名称", order = 4)
+    @ApiModelProperty(value = "更换证书/报告名称", dataType = "String")
     @TableField("change_report_name")
     private String changeReportName;
 
@@ -73,6 +91,7 @@
     @TableField("change_type")
     private String changeType;
 
+    @ExcelProperty(value = "变更类型", order = 5)
     @ApiModelProperty(value = "变更类型(字典value)", dataType = "String")
     @TableField(exist = false)
     private String changeTypeName;
@@ -142,13 +161,15 @@
     /**
      * 创建用户名字
      */
-    @ApiModelProperty(value = "创建用户名字", dataType = "String")
+    @ExcelProperty(value = "创建人", order = 6)
+    @ApiModelProperty(value = "创建人名字", dataType = "String")
     @TableField("create_user_name")
     private String createUserName;
 
     /**
      * 创建时间
      */
+    @ExcelProperty(value = "创建时间", order = 7)
     @ApiModelProperty(value = "创建时间", dataType = "String")
     @TableField("create_time")
     private String createTime;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificateReport.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificateReport.java
index f01db9e..db06018 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificateReport.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificateReport.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.model.business;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -22,6 +29,11 @@
  * @author wangpeng
  * @since 2023-08-14
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @ApiModel
 @Data
 @TableName("biz_business_certificate_report")
@@ -36,6 +48,7 @@
     /**
      * 证书报告编号
      */
+    @ExcelProperty(value = "证书报告编号", order = 1)
     @ApiModelProperty(value = "证书报告编号", dataType = "String")
     @TableField("certificate_report_no")
     private String certificateReportNo;
@@ -43,6 +56,7 @@
     /**
      * 证书报告名称
      */
+    @ExcelProperty(value = "证书报告名称", order = 2)
     @ApiModelProperty(value = "证书报告名称", dataType = "String")
     @TableField("certificate_report_name")
     private String certificateReportName;
@@ -62,6 +76,7 @@
     @TableField("measure_category")
     private String measureCategory;
 
+    @ExcelProperty(value = "检校类别", order = 6)
     @ApiModelProperty(value = "检校类别(字典value)", dataType = "String")
     @TableField(exist = false)
     private String measureCategoryName;
@@ -69,6 +84,7 @@
     /**
      * 检校时间
      */
+    @ExcelProperty(value = "检校时间", order = 8)
     @ApiModelProperty(value = "检校时间", dataType = "String")
     @TableField("calibration_time")
     private String calibrationTime;
@@ -267,18 +283,22 @@
     @TableField(exist = false)
     private Integer decisionItem;
 
-    @ApiModelProperty(value = "设备样品编号（列表返回参数）", dataType = "String")
+    @ExcelProperty(value = "被检设备统一编号", order = 3)
+    @ApiModelProperty(value = "被检设备统一编号（列表返回参数）", dataType = "String")
     @TableField(exist = false)
     private String sampleNo;
 
-    @ApiModelProperty(value = "设备样品名称（列表返回参数）", dataType = "String")
+    @ExcelProperty(value = "被检设备名称", order = 4)
+    @ApiModelProperty(value = "被检设备名称（列表返回参数）", dataType = "String")
     @TableField(exist = false)
     private String sampleName;
 
-    @ApiModelProperty(value = "设备样品规格型号（列表返回参数）", dataType = "String")
+    @ExcelProperty(value = "规格型号", order = 5)
+    @ApiModelProperty(value = "规格型号（列表返回参数）", dataType = "String")
     @TableField(exist = false)
     private String sampleModel;
 
+    @ExcelProperty(value = "检定员", order = 7)
     @ApiModelProperty(value = "检定员名字（列表返回参数）", dataType = "String")
     @TableField(exist = false)
     private String staffName;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessIdentifyInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessIdentifyInfo.java
index 46bfba5..f1a9bec 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessIdentifyInfo.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessIdentifyInfo.java
@@ -1,10 +1,15 @@
 package com.casic.missiles.model.business;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 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;
 
@@ -20,6 +25,11 @@
  * @author wangpeng
  * @since 2023-08-15
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @Data
 @TableName("biz_business_identify_info")
 public class BizBusinessIdentifyInfo implements Serializable {
@@ -33,6 +43,7 @@
     /**
      * 记录编号
      */
+    @ExcelProperty(value = "记录编号", order = 1)
     @ApiModelProperty(value = "记录编号", dataType = "String")
     @TableField("record_no")
     private String recordNo;
@@ -41,20 +52,15 @@
      * 标志类型(字典code)
      */
     @NotEmpty(message = "标志类型不能为空")
-    @ApiModelProperty(value = "标志类型(字典code)", dataType = "String")
-    @DictCodeField(message = "标志类型不合法", cacheName = MeterDictCode.IDENTIFY_PRINT_TYPE)
+    @ApiModelProperty(value = "标志类型(直接存计量标识/使用状态/校准状态的字典value)", dataType = "String")
     @TableField("identify_type")
     private String identifyType;
 
-    @ApiModelProperty(value = "标志类型(字典value)", dataType = "String")
-    @TableField(exist = false)
-    private String identifyTypeName;
-
     /**
      * 设备id(可以是受检设备/设备台账)
      */
     @NotNull(message = "设备id不能为空")
-    @ApiModelProperty(value = "设备id(可以是受检设备/设备台账)", dataType = "String")
+    @ApiModelProperty(value = "设备id(可以是受检设备/设备台账)", dataType = "Long")
     @TableField("device_id")
     private Long deviceId;
 
@@ -66,29 +72,32 @@
     @TableField("device_type")
     private String deviceType;
 
+    @ExcelProperty(value = "统一编号", order = 3)
     @NotEmpty(message = "设备编号不能为空")
-    @ApiModelProperty(value = "设备编号", dataType = "String")
+    @ApiModelProperty(value = "统一编号", dataType = "String")
     @TableField("device_no")
     private String deviceNo;
 
     /**
      * 设备名字
      */
-    @NotEmpty(message = "设备名字不能为空")
-    @ApiModelProperty(value = "设备名字", dataType = "String")
+    @ExcelProperty(value = "设备名称", order = 4)
+    @NotEmpty(message = "设备名称不能为空")
+    @ApiModelProperty(value = "设备名称", dataType = "String")
     @TableField("device_name")
     private String deviceName;
 
     /**
      * 检定员id
      */
-    @ApiModelProperty(value = "检定员id", dataType = "String")
+    @ApiModelProperty(value = "检定员id", dataType = "Long")
     @TableField("measure_person_id")
     private Long measurePersonId;
 
     /**
      * 检定员名字
      */
+    @ExcelProperty(value = "检定员", order = 5)
     @ApiModelProperty(value = "检定员名字", dataType = "String")
     @TableField("measure_person")
     private String measurePerson;
@@ -103,7 +112,8 @@
     /**
      * 更新时间
      */
-    @ApiModelProperty(value = "更新时间", dataType = "String")
+    @ExcelProperty(value = "打印时间", order = 6)
+    @ApiModelProperty(value = "打印时间", dataType = "String")
     @TableField("update_time")
     private String updateTime;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceAssess.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceAssess.java
index 659d9ca..6720b90 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceAssess.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceAssess.java
@@ -1,11 +1,26 @@
 package com.casic.missiles.model.business;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 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 com.casic.missiles.dto.BaseRequest;
+import com.casic.missiles.dto.business.outsource.OrderSampleDTO;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import javax.validation.constraints.NotEmpty;
 import java.io.Serializable;
+import java.util.List;
 
 /**
  * <p>
@@ -15,146 +30,231 @@
  * @author wangpeng
  * @since 2023-08-16
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
+@ApiModel
 @Data
 @TableName("biz_business_outsource_assess")
-public class BizBusinessOutsourceAssess implements Serializable {
+public class BizBusinessOutsourceAssess extends BaseRequest implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
+    @ApiModelProperty(value = "id，更新/删除使用参数", dataType = "Long")
     @TableId("id")
     private Long id;
 
     /**
      * 评审表编号
      */
+    @ExcelProperty(value = "评审表编号", order = 1)
+    @ApiModelProperty(value = "评审表编号(后台生成)", dataType = "String")
     @TableField("project_no")
     private String projectNo;
 
     /**
      * 评审表名称
      */
+    @ExcelProperty(value = "评审表名称", order = 2)
+    @ApiModelProperty(value = "评审表名称", dataType = "String")
     @TableField("project_name")
     private String projectName;
 
+    @NotEmpty(message = "实验室代码不能为空")
+    @DictCodeField(message = "实验室代码描述不合法", cacheName = MeterDictCode.LAB_CODE)
+    @ApiModelProperty(value = "实验室代码(字典code)", dataType = "String")
+    @TableField("lab_code")
+    private String labCode;
+
+    @ApiModelProperty(value = "实验室代码(字典value)", dataType = "String")
+    @TableField(exist = false)
+    private String labCodeName;
+
+    /**
+     * 组别代码
+     */
+    @NotEmpty(message = "组别代码不能为空")
+    @DictCodeField(message = "组别代码描述不合法", cacheName = MeterDictCode.GROUP_CODE)
+    @ApiModelProperty(value = "组别代码(字典code)", dataType = "String")
+    @TableField("group_code")
+    private String groupCode;
+
+    @ApiModelProperty(value = "组别代码(字典value)", dataType = "String")
+    @TableField(exist = false)
+    private String groupCodeName;
+
     /**
      * 申请人id
      */
+    @ApiModelProperty(value = "申请人id", dataType = "String")
     @TableField("applicant_id")
     private Long applicantId;
 
     /**
      * 申请人名字
      */
+    @ExcelProperty(value = "申请人", order = 5)
+    @ApiModelProperty(value = "申请人", dataType = "String")
     @TableField("applicant_name")
     private String applicantName;
 
     /**
      * 申请时间
      */
+    @ExcelProperty(value = "申请时间", order = 6)
+    @ApiModelProperty(value = "申请时间", dataType = "String")
     @TableField("applicant_time")
     private String applicantTime;
 
     /**
      * 附件(minio存储文件名)
      */
+    @ApiModelProperty(value = "附件(minio存储文件名)", dataType = "String")
     @TableField("minio_file_name")
     private String minioFileName;
 
     /**
      * 备注
      */
+    @ApiModelProperty(value = "备注", dataType = "String")
     @TableField("remark")
     private String remark;
 
     /**
      * 创建人id
      */
+    @ApiModelProperty(value = "创建人id", dataType = "String")
     @TableField("create_user_id")
     private Long createUserId;
 
     /**
      * 创建人名字
      */
+    @ApiModelProperty(value = "创建人名字", dataType = "String")
     @TableField("create_user_name")
     private String createUserName;
 
     /**
      * 分包方id
      */
+    @ApiModelProperty(value = "评审表编号", dataType = "String")
     @TableField("outsourcer_id")
     private Long outsourcerId;
 
     /**
      * 预计开始时间
      */
+    @ApiModelProperty(value = "预计开始时间", dataType = "String")
     @TableField("pre_start_time")
     private String preStartTime;
 
     /**
      * 预计结束时间
      */
+    @ApiModelProperty(value = "预计结束时间", dataType = "String")
     @TableField("pre_end_time")
     private String preEndTime;
 
     /**
      * 分包原因-字典
      */
+    @ApiModelProperty(value = "分包原因(字典code)", dataType = "String")
+    @DictCodeField(message = "分包原因描述不合法", cacheName = MeterDictCode.OUTSOURCE_REASON)
     @TableField("outsource_reason")
     private String outsourceReason;
 
+    @ApiModelProperty(value = "分包原因(字典value)", dataType = "String")
+    @TableField(exist = false)
+    private String outsourceReasonName;
+
     /**
      * 预计费用
      */
+    @ApiModelProperty(value = "预计费用", dataType = "String")
     @TableField("pre_cost")
     private String preCost;
 
     /**
      * 审批状态
      */
+    @ApiModelProperty(value = "审批状态", dataType = "String")
+    @DictCodeField(message = "审批状态描述不合法", cacheName = MeterDictCode.APPROVAL_STATUS)
     @TableField("approval_status")
     private String approvalStatus;
 
     /**
      * 流程实例id
      */
+    @ApiModelProperty(value = "流程实例id", dataType = "String")
     @TableField("process_id")
     private String processId;
 
     /**
      * 实验室认可情况
      */
+    @ApiModelProperty(value = "实验室认可情况", dataType = "String")
     @TableField("approve_situation")
     private String approveSituation;
 
     /**
      * 溯源性
      */
+    @ApiModelProperty(value = "溯源性", dataType = "String")
     @TableField("traceability")
     private String traceability;
 
     /**
      * 测试方法
      */
+    @ApiModelProperty(value = "测试方法", dataType = "String")
     @TableField("test_method")
     private String testMethod;
 
     /**
      * 技术能力
      */
+    @ApiModelProperty(value = "技术能力", dataType = "String")
     @TableField("technique_ability")
     private String techniqueAbility;
 
     /**
      * 创建时间
      */
+    @ApiModelProperty(hidden = true)
     @TableField("create_time")
     private String createTime;
 
     /**
      * 更新时间
      */
+    @ApiModelProperty(hidden = true)
     @TableField("update_time")
     private String updateTime;
 
+    @ApiModelProperty(value = "审批状态类型-字典value", dataType = "String")
+    @TableField(exist = false)
+    private String approvalStatusName;
 
+    @ApiModelProperty(value = "任务id（同意、驳回等操作使用）", dataType = "String")
+    @TableField(exist = false)
+    private String taskId;
+
+    @ApiModelProperty(value = "可选决策项（1同意驳回拒绝 2同意驳回 3同意拒绝，用于待审批列表同意/驳回/拒绝按钮展示）", dataType = "Integer")
+    @TableField(exist = false)
+    private Integer decisionItem;
+
+    @NotEmpty(message = "受检设备信息不能为空")
+    @ApiModelProperty(value = "受检设备id列表（新建使用参数）", dataType = "List")
+    @TableField(exist = false)
+    private List<OrderSampleDTO> orderSampleList;
+
+    @ExcelProperty(value = "分包机构名称", order = 3)
+    @ApiModelProperty(value = "分包机构名称（列表返回参数）", dataType = "String")
+    private String outsourcerName;
+
+    @ExcelProperty(value = "机构负责人", order = 4)
+    @ApiModelProperty(value = "机构负责人（列表返回参数）", dataType = "String")
+    private String director;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceProtocol.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceProtocol.java
new file mode 100644
index 0000000..38df697
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceProtocol.java
@@ -0,0 +1,225 @@
+package com.casic.missiles.model.business;
+
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
+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 com.casic.missiles.dto.BaseRequest;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotEmpty;
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 计量检定业务-分包管理-测试、校准或检定工作分包协议书
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-08-24
+ */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
+@Data
+@TableName("biz_business_outsource_protocol")
+public class BizBusinessOutsourceProtocol extends BaseRequest implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "id，更新/删除使用参数", dataType = "Long")
+    @TableId("id")
+    private Long id;
+
+    /**
+     * 协议书编号
+     */
+    @ExcelProperty(value = "协议书编号", order = 1)
+    @ApiModelProperty(value = "协议书编号(后台生成)", dataType = "String")
+    @TableField("protocol_no")
+    private String protocolNo;
+
+    /**
+     * 协议书名称
+     */
+    @ExcelProperty(value = "协议书名称", order = 2)
+    @ApiModelProperty(value = "协议书名称", dataType = "String")
+    @TableField("project_name")
+    private String projectName;
+
+    @NotEmpty(message = "实验室代码不能为空")
+    @DictCodeField(message = "实验室代码描述不合法", cacheName = MeterDictCode.LAB_CODE)
+    @ApiModelProperty(value = "实验室代码(字典code)", dataType = "String")
+    @TableField("lab_code")
+    private String labCode;
+
+    @ApiModelProperty(value = "实验室代码(字典value)", dataType = "String")
+    @TableField(exist = false)
+    private String labCodeName;
+
+    @NotEmpty(message = "组别代码不能为空")
+    @DictCodeField(message = "组别代码描述不合法", cacheName = MeterDictCode.GROUP_CODE)
+    @ApiModelProperty(value = "组别代码(字典code)", dataType = "String")
+    @TableField("group_code")
+    private String groupCode;
+
+    @ApiModelProperty(value = "组别代码(字典value)", dataType = "String")
+    @TableField(exist = false)
+    private String groupCodeName;
+
+    /**
+     * 分包方id
+     */
+    @ApiModelProperty(value = "分包方id", dataType = "Long")
+    @TableField("outsourcer_id")
+    private Long outsourcerId;
+
+    /**
+     * 其他
+     */
+    @ApiModelProperty(value = "其他", dataType = "String")
+    @TableField("remark")
+    private String remark;
+
+    /**
+     * 分包方编号
+     */
+    @ApiModelProperty(value = "分包方编号(新建不用传)", dataType = "String")
+    @TableField("outsource_no")
+    private String outsourceNo;
+
+    /**
+     * 分包方名称
+     */
+    @ExcelProperty(value = "分包方名称", order = 3)
+    @ApiModelProperty(value = "分包方名称(新建不用传)", dataType = "String")
+    @TableField("outsource_name")
+    private String outsourceName;
+
+    /**
+     * 联系人
+     */
+    @ExcelProperty(value = "联系人", order = 4)
+    @ApiModelProperty(value = "联系人", dataType = "String")
+    @TableField("contacts")
+    private String contacts;
+
+    /**
+     * 电话
+     */
+    @ApiModelProperty(value = "电话", dataType = "String")
+    @TableField("mobile")
+    private String mobile;
+
+    /**
+     * 地址
+     */
+    @ApiModelProperty(value = "地址", dataType = "String")
+    @TableField("address")
+    private String address;
+
+    /**
+     * 要求完成日期
+     */
+    @ApiModelProperty(value = "要求完成日期", dataType = "String")
+    @TableField("require_date")
+    private String requireDate;
+
+    /**
+     * 分包费用(元)
+     */
+    @ApiModelProperty(value = "分包费用(元)", dataType = "String")
+    @TableField("outsource_cost")
+    private Double outsourceCost;
+
+    /**
+     * 分包方负责人
+     */
+    @ApiModelProperty(value = "分包方负责人", dataType = "String")
+    @TableField("director")
+    private String director;
+
+    /**
+     * 分包项目
+     */
+    @ApiModelProperty(value = "分包项目", dataType = "String")
+    @TableField("item")
+    private String item;
+
+    /**
+     * 分包要求
+     */
+    @ApiModelProperty(value = "分包要求", dataType = "String")
+    @TableField("requires")
+    private String requires;
+
+    /**
+     * 创建人id
+     */
+    @ApiModelProperty(hidden = true)
+    @TableField("create_user_id")
+    private Long createUserId;
+
+    /**
+     * 创建人名字
+     */
+    @ExcelProperty(value = "申请人", order = 5)
+    @ApiModelProperty(value = "申请人", dataType = "String")
+    @TableField("create_user_name")
+    private String createUserName;
+
+    /**
+     * 审批状态
+     */
+    @ApiModelProperty(value = "审批状态", dataType = "String")
+    @DictCodeField(message = "审批状态描述不合法", cacheName = MeterDictCode.APPROVAL_STATUS)
+    @TableField("approval_status")
+    private String approvalStatus;
+
+    /**
+     * 流程实例id
+     */
+    @ApiModelProperty(value = "流程实例id", dataType = "String")
+    @TableField("process_id")
+    private String processId;
+
+    /**
+     * 创建时间
+     */
+    @ExcelProperty(value = "申请时间", order = 6)
+    @ApiModelProperty(value = "申请时间", dataType = "String")
+    @TableField("create_time")
+    private String createTime;
+
+    /**
+     * 更新时间
+     */
+    @ApiModelProperty(hidden = true)
+    @TableField("update_time")
+    private String updateTime;
+
+    @ApiModelProperty(value = "审批状态类型-字典value", dataType = "String")
+    @TableField(exist = false)
+    private String approvalStatusName;
+
+    @ApiModelProperty(value = "任务id（同意、驳回等操作使用）", dataType = "String")
+    @TableField(exist = false)
+    private String taskId;
+
+    @ApiModelProperty(value = "可选决策项（1同意驳回拒绝 2同意驳回 3同意拒绝，用于待审批列表同意/驳回/拒绝按钮展示）", dataType = "Integer")
+    @TableField(exist = false)
+    private Integer decisionItem;
+
+
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourcerInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourcerInfo.java
index ec4e997..f9aa69e 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourcerInfo.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourcerInfo.java
@@ -17,6 +17,7 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import javax.validation.constraints.NotEmpty;
 import java.io.Serializable;
 
 /**
@@ -59,6 +60,29 @@
     @TableField("outsourcer_name")
     private String outsourcerName;
 
+    @NotEmpty(message = "实验室代码不能为空")
+    @DictCodeField(message = "实验室代码描述不合法", cacheName = MeterDictCode.LAB_CODE)
+    @ApiModelProperty(value = "实验室代码(字典code)", dataType = "String")
+    @TableField("lab_code")
+    private String labCode;
+
+    @ApiModelProperty(value = "实验室代码(字典value)", dataType = "String")
+    @TableField(exist = false)
+    private String labCodeName;
+
+    /**
+     * 组别代码
+     */
+    @NotEmpty(message = "组别代码不能为空")
+    @DictCodeField(message = "组别代码描述不合法", cacheName = MeterDictCode.GROUP_CODE)
+    @ApiModelProperty(value = "组别代码(字典code)", dataType = "String")
+    @TableField("group_code")
+    private String groupCode;
+
+    @ApiModelProperty(value = "组别代码(字典value)", dataType = "String")
+    @TableField(exist = false)
+    private String groupCodeName;
+
     /**
      * 单位简称
      */
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardInfo.java
index c48eed7..dffdfdd 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardInfo.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardInfo.java
@@ -5,6 +5,7 @@
 import com.baomidou.mybatisplus.annotation.TableName;
 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;
 
@@ -18,6 +19,7 @@
  * @author wangpeng
  * @since 2023-08-04
  */
+@ApiModel
 @Data
 @TableName("biz_equipment_standard_info")
 public class BizEquipmentStandardInfo implements Serializable {
@@ -119,7 +121,7 @@
      * 管理状态(字典code)
      */
     @ApiModelProperty(value = "管理状态(字典code)", dataType = "String")
-    @DictCodeField(message = "管理状态不合法", cacheName = MeterDictCode.MANAGER_STATE)
+    @DictCodeField(message = "管理状态不合法", cacheName = MeterDictCode.STANDARD_MANAGER_STATE)
     @TableField("manage_status")
     private String manageStatus;
 
@@ -151,7 +153,7 @@
     /**
      * 温度(℃)
      */
-    @ApiModelProperty(value = "使用状态(字典code)", dataType = "String")
+    @ApiModelProperty(value = "温度(℃)", dataType = "String")
     @TableField("temperature")
     private Double temperature;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardInfoApproval.java b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardInfoApproval.java
index dbd86ab..9f58d83 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardInfoApproval.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardInfoApproval.java
@@ -150,7 +150,7 @@
      * 管理状态(字典code)
      */
     @ApiModelProperty(value = "管理状态(字典code)", dataType = "String")
-    @DictCodeField(message = "管理状态不合法", cacheName = MeterDictCode.MANAGER_STATE)
+    @DictCodeField(message = "管理状态不合法", cacheName = MeterDictCode.STANDARD_MANAGER_STATE)
     @TableField("manage_status")
     private String manageStatus;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardTechnologyRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardTechnologyRelation.java
index 0e612bd..751f26b 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardTechnologyRelation.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardTechnologyRelation.java
@@ -3,6 +3,7 @@
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -16,6 +17,7 @@
  * @author wangpeng
  * @since 2023-08-04
  */
+@ApiModel
 @Data
 @TableName("biz_equipment_standard_technology_relation")
 public class BizEquipmentStandardTechnologyRelation implements Serializable {
@@ -33,6 +35,10 @@
     @TableField("technology_file_id")
     private Long technologyFileId;
 
+    @ApiModelProperty(value = "依据的技术文件编号", dataType = "String")
+    @TableField("technology_file_no")
+    private String technologyFileNo;
+
     /**
      * 依据的技术文件名称(技术文件中现行测试校准检定方法表文件名字段)
      */
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerInfo.java
index d6e8bed..65cd6bc 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerInfo.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerInfo.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.model.resource;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -21,6 +28,11 @@
  * @author wangpeng
  * @since 2023-08-08
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @ApiModel
 @Data
 @TableName("biz_resource_customer_info")
@@ -35,6 +47,7 @@
     /**
      * 委托方编号
      */
+    @ExcelProperty(value = "委托方编号", order = 1)
     @ApiModelProperty(value = "委托方编号", dataType = "String")
     @TableField("customer_no")
     private String customerNo;
@@ -42,6 +55,7 @@
     /**
      * 委托方名称
      */
+    @ExcelProperty(value = "委托方名称", order = 2)
     @ApiModelProperty(value = "委托方名称(新建时为下拉选择一个受检单位组织的名字，传deptId字段，后端获取名称)", dataType = "String")
     @TableField("customer_name")
     private String customerName;
@@ -63,6 +77,7 @@
     /**
      * 联系人
      */
+    @ExcelProperty(value = "联系人", order = 3)
     @ApiModelProperty(value = "联系人", dataType = "String")
     @TableField("contacts")
     private String contacts;
@@ -70,6 +85,7 @@
     /**
      * 座机电话
      */
+    @ExcelProperty(value = "座机电话", order = 4)
     @ApiModelProperty(value = "座机电话", dataType = "String")
     @TableField("mobile")
     private String mobile;
@@ -77,6 +93,7 @@
     /**
      * 手机号码
      */
+    @ExcelProperty(value = "手机号码", order = 5)
     @ApiModelProperty(value = "手机号码", dataType = "String")
     @TableField("phone")
     private String phone;
@@ -91,6 +108,7 @@
     /**
      * 地址
      */
+    @ExcelProperty(value = "地址", order = 6)
     @ApiModelProperty(value = "地址", dataType = "String")
     @TableField("address")
     private String address;
@@ -141,6 +159,7 @@
     /**
      * 创建时间
      */
+    @ExcelProperty(value = "创建时间", order = 7)
     @ApiModelProperty(value = "创建时间", dataType = "String")
     @TableField("create_time")
     private String createTime;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerSuggestForm.java b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerSuggestForm.java
index 7201bbd..701bf8b 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerSuggestForm.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerSuggestForm.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.model.resource;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -22,6 +29,11 @@
  * @author wangpeng
  * @since 2023-08-08
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @ApiModel
 @Data
 @TableName("biz_resource_customer_suggest_form")
@@ -44,7 +56,8 @@
     /**
      * 委托方名称
      */
-    @ApiModelProperty(value = "委托方名称", dataType = "String")
+    @ExcelProperty(value = "意见反馈单位", order = 2)
+    @ApiModelProperty(value = "意见反馈单位", dataType = "String")
     @TableField("customer_name")
     private String customerName;
 
@@ -59,7 +72,8 @@
     /**
      * 委托方意见反馈部门名称
      */
-    @ApiModelProperty(value = "委托方意见反馈部门名称", dataType = "String")
+    @ExcelProperty(value = "委托方意见反馈部门", order = 3)
+    @ApiModelProperty(value = "委托方意见反馈部门", dataType = "String")
     @TableField("customer_dept_name")
     private String customerDeptName;
 
@@ -73,6 +87,7 @@
     /**
      * 表单编号
      */
+    @ExcelProperty(value = "表单编号", order = 1)
     @ApiModelProperty(value = "表单编号", dataType = "String")
     @TableField("form_no")
     private String formNo;
@@ -111,6 +126,7 @@
     /**
      * 创建人名字
      */
+    @ExcelProperty(value = "创建人", order = 4)
     @ApiModelProperty(value = "创建人名字", dataType = "String")
     @TableField("create_user_name")
     private String createUserName;
@@ -147,6 +163,7 @@
     /**
      * 创建时间
      */
+    @ExcelProperty(value = "创建时间", order = 5)
     @ApiModelProperty(value = "创建时间", dataType = "String")
     @TableField("create_time")
     private String createTime;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSealInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSealInfo.java
index cbf05d7..9bf389d 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSealInfo.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSealInfo.java
@@ -106,6 +106,10 @@
     @TableField("minio_file_name")
     private String minioFileName;
 
+    @ApiModelProperty(value = "minio存储文件url", dataType = "String")
+    @TableField(exist = false)
+    private String minioFileUrl;
+
     @ApiModelProperty(value = "创建时间", dataType = "String")
     @TableField("create_time")
     private String createTime;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSealUseNote.java b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSealUseNote.java
index 3f2d9e8..3ce16a8 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSealUseNote.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSealUseNote.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.model.resource;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -20,6 +27,11 @@
  * @author wangpeng
  * @since 2023-07-28
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @ApiModel
 @Data
 @TableName("biz_resource_seal_use_note")
@@ -34,6 +46,7 @@
     /**
      * 登记表编号
      */
+    @ExcelProperty(value = "申请单编号", order = 1)
     @ApiModelProperty(value = "登记表编号(自动生成)", dataType = "String")
     @TableField("note_form_no")
     private String noteFormNo;
@@ -55,6 +68,7 @@
     /**
      * 申请部门
      */
+    @ExcelProperty(value = "申请部门", order = 5)
     @ApiModelProperty(value = "申请部门", dataType = "String")
     @TableField("apply_dept_name")
     private String applyDeptName;
@@ -69,6 +83,7 @@
     /**
      * 申请人
      */
+    @ExcelProperty(value = "申请人", order = 6)
     @ApiModelProperty(value = "申请人", dataType = "String")
     @TableField("apply_user_name")
     private String applyUserName;
@@ -76,6 +91,7 @@
     /**
      * 申请时间
      */
+    @ExcelProperty(value = "申请时间", order = 7)
     @ApiModelProperty(value = "申请时间(新增自动获取当前时间)", dataType = "String")
     @TableField("apply_time")
     private String applyTime;
@@ -130,6 +146,26 @@
     @TableField("update_time")
     private String updateTime;
 
+    @ExcelProperty(value = "印章名称", order = 2)
+    @ApiModelProperty(value = "印章名称(列表返回参数)", dataType = "String")
+    @TableField(exist = false)
+    private String sealName;
+
+    @DictCodeField(message = "印章类型描述不合法", cacheName = MeterDictCode.SEAL_TYPE)
+    @ApiModelProperty(hidden = true)
+    @TableField(exist = false)
+    private String sealType;
+
+    @ExcelProperty(value = "印章类型", order = 3)
+    @ApiModelProperty(value = "印章类型(列表返回参数)", dataType = "String")
+    @TableField(exist = false)
+    private String sealTypeName;
+
+    @ExcelProperty(value = "批准人", order = 4)
+    @ApiModelProperty(value = "批准人(列表返回参数)", dataType = "String")
+    @TableField(exist = false)
+    private String approverName;
+
     @ApiModelProperty(value = "审批状态类型-字典value", dataType = "String")
     @TableField(exist = false)
     private String approvalStatusName;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceStaffInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceStaffInfo.java
index 5ef995b..41563a1 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceStaffInfo.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceStaffInfo.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.model.resource;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -20,6 +27,11 @@
  * @author wangpeng
  * @since 2023-07-25
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @ApiModel
 @Data
 @TableName("biz_resource_staff_info")
@@ -38,6 +50,7 @@
     /**
      * 人员编号
      */
+    @ExcelProperty(value = "人员编号",order = 0)
     @NotEmpty(message = "人员编号不能为空")
     @ApiModelProperty(value = "人员编号", dataType = "String")
     @TableField("staff_no")
@@ -46,6 +59,7 @@
     /**
      * 姓名
      */
+    @ExcelProperty(value = "姓名",order = 1)
     @ApiModelProperty(value = "姓名", dataType = "String")
     @TableField("staff_name")
     private String staffName;
@@ -152,13 +166,15 @@
     /**
      * 部门名字
      */
-    @ApiModelProperty(value = "部门名字", dataType = "String")
+    @ExcelProperty(value = "工作部门",order = 4)
+    @ApiModelProperty(value = "工作部门", dataType = "String")
     @TableField("dept_name")
     private String deptName;
 
     /**
      * 岗位
      */
+    @ExcelProperty(value = "岗位",order = 2)
     @ApiModelProperty(value = "岗位", dataType = "String")
     @TableField("station")
     private String station;
@@ -166,6 +182,7 @@
     /**
      * 计量专业
      */
+    @ExcelProperty(value = "计量专业",order = 5)
     @ApiModelProperty(value = "计量专业", dataType = "String")
     @TableField("major")
     private String major;
@@ -173,6 +190,7 @@
     /**
      * 证号
      */
+    @ExcelProperty(value = "证号",order = 3)
     @ApiModelProperty(value = "证号", dataType = "String")
     @TableField("certificate_number")
     private String certificateNumber;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSupplierInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSupplierInfo.java
index eb5ef01..a1e2697 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSupplierInfo.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSupplierInfo.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.model.resource;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -20,6 +27,11 @@
  * @author wangpeng
  * @since 2023-07-27
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @ApiModel
 @Data
 @TableName("biz_resource_supplier_info")
@@ -34,6 +46,7 @@
     /**
      * 供方编号
      */
+    @ExcelProperty(value = "供方编号", order = 1)
     @ApiModelProperty(value = "供方编号(自动生成)", dataType = "String")
     @TableField("supplier_no")
     private String supplierNo;
@@ -41,6 +54,7 @@
     /**
      * 供方名称
      */
+    @ExcelProperty(value = "供方名称", order = 2)
     @ApiModelProperty(value = "供方名称", dataType = "String")
     @TableField("supplier_name")
     private String supplierName;
@@ -60,6 +74,7 @@
     @TableField("supplier_type")
     private String supplierType;
 
+    @ExcelProperty(value = "供方类型", order = 3)
     @ApiModelProperty(value = "供方类型(字典value)", dataType = "String")
     @TableField(exist = false)
     private String supplierTypeName;
@@ -109,7 +124,8 @@
     /**
      * 电话
      */
-    @ApiModelProperty(value = "电话", dataType = "String")
+    @ExcelProperty(value = "联系电话", order = 4)
+    @ApiModelProperty(value = "联系电话", dataType = "String")
     @TableField("phone")
     private String phone;
 
@@ -158,6 +174,7 @@
     /**
      * 公司地址-省
      */
+    @ExcelProperty(value = "地址-省", order = 6)
     @ApiModelProperty(value = "公司地址-省", dataType = "String")
     @TableField("company_province_name")
     private String companyProvinceName;
@@ -172,6 +189,7 @@
     /**
      * 公司地址-市
      */
+    @ExcelProperty(value = "地址-市", order = 7)
     @ApiModelProperty(value = "公司地址-市", dataType = "String")
     @TableField("company_city_name")
     private String companyCityName;
@@ -186,6 +204,7 @@
     /**
      * 公司地址-区
      */
+    @ExcelProperty(value = "地址-区", order = 8)
     @ApiModelProperty(value = "公司地址-区", dataType = "String")
     @TableField("company_area_name")
     private String companyAreaName;
@@ -193,6 +212,7 @@
     /**
      * 公司地址-详细地址
      */
+    @ExcelProperty(value = "地址-详细地址", order = 9)
     @ApiModelProperty(value = "公司地址-详细地址", dataType = "String")
     @TableField("company_address")
     private String companyAddress;
@@ -200,6 +220,7 @@
     /**
      * 服务和供应的内容
      */
+    @ExcelProperty(value = "服务和供应的内容", order = 5)
     @ApiModelProperty(value = "服务和供应的内容", dataType = "String")
     @TableField("supplier_content")
     private String supplierContent;
@@ -250,6 +271,7 @@
     /**
      * 创建时间
      */
+    @ExcelProperty(value = "创建时间", order = 9)
     @ApiModelProperty(value = "创建时间", dataType = "String")
     @TableField("create_time")
     private String createTime;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/EnvLocationInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/EnvLocationInfo.java
new file mode 100644
index 0000000..d8e2d7b
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/EnvLocationInfo.java
@@ -0,0 +1,83 @@
+package com.casic.missiles.model.resource;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotEmpty;
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 实验室环境监控系统-设备表
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-06-07
+ */
+@ApiModel
+@Data
+@TableName("env_location_info")
+public class EnvLocationInfo implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "主键id", dataType = "Long")
+    @TableId("id")
+    private Long id;
+
+    /**
+     * 地点编号
+     */
+    @NotEmpty(message = "地点编号不能为空")
+    @ApiModelProperty(value = "地点编号", dataType = "String")
+    @TableField("location_no")
+    private String locationNo;
+
+    /**
+     * 地点名称
+     */
+    @ApiModelProperty(value = "地点名称", dataType = "String")
+    @TableField("location_name")
+    private String locationName;
+
+    /**
+     * 地点位置
+     */
+    @ApiModelProperty(value = "地点位置", dataType = "String")
+    @TableField("location_position")
+    private String locationPosition;
+
+    /**
+     * 创建人id
+     */
+    @ApiModelProperty(value = "创建人id", dataType = "Long")
+    @TableField("create_user_id")
+    private Long createUserId;
+
+    /**
+     * 创建人
+     */
+    @ApiModelProperty(value = "创建人", dataType = "String")
+    @TableField("create_user")
+    private String createUser;
+
+    /**
+     * 创建时间
+     */
+    @ApiModelProperty(value = "创建时间", dataType = "String")
+    @TableField("create_time")
+    private String createTime;
+
+    /**
+     * 更新时间
+     */
+    @ApiModelProperty(value = "更新时间", dataType = "String")
+    @TableField("update_time")
+    private String updateTime;
+
+
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemFileConfig.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemFileConfig.java
index 19e6845..86e569c 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemFileConfig.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemFileConfig.java
@@ -30,7 +30,7 @@
     @ApiModelProperty(value = "系统类别(1业务系统2受检系统3环境系统)", dataType = "Integer")
     @NotNull(message = "系统类别不能为空")
     @TableField("system_type")
-    private Integer systemType;
+    private Integer systemType = 1;
 
     @ApiModelProperty("下载编号")
     @TableField("download_no")
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemNotice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemNotice.java
index e94297d..06ec37d 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemNotice.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemNotice.java
@@ -34,7 +34,7 @@
     @ApiModelProperty(value = "系统类别(1业务系统2受检系统3环境系统)", dataType = "Integer")
     @NotNull(message = "系统类别不能为空")
     @TableField("system_type")
-    private Integer systemType;
+    private Integer systemType = 1;
 
     /**
      * 通知公告编号
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSign.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSign.java
index 6c0d7c9..954f4f8 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSign.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSign.java
@@ -51,7 +51,7 @@
     @ApiModelProperty(value = "系统类别(1业务系统2受检系统3环境系统)", dataType = "Integer")
     @NotNull(message = "系统类别不能为空")
     @TableField("system_type")
-    private Integer systemType;
+    private Integer systemType = 1;
 
     /**
      * 签名编号
@@ -130,4 +130,8 @@
     @TableField(exist = false)
     private List<Long> userIdList;
 
+    @ApiModelProperty(hidden = true)
+    @TableField(exist = false)
+    private String deptName;
+
 }

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java
index bb0c50f..13a699b 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java
@@ -12,6 +12,7 @@
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.IGeneralApprovalService;
+import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
@@ -19,6 +20,7 @@
 import org.springframework.web.bind.annotation.RequestBody;
 
 import javax.validation.Valid;
+import java.util.List;
 import java.util.Objects;
 
 /**
@@ -117,4 +119,17 @@
         }
         return baseApprovalService.failUpdate(request);
     }
+
+    public List<O> exportList(@RequestBody @Valid R request) throws Exception {
+        List<O> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = baseApprovalService.listExportByIds(request.getIds());
+        } else {
+            list = baseApprovalService.listExport(request);
+        }
+        for (O record : list) {
+            DictCodeUtils.convertDictCodeToName(record);
+        }
+        return list;
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java
index 8a90961..d775831 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java
@@ -5,6 +5,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.business.certificate.CertificateChangeApplyApprovalListRequest;
 import com.casic.missiles.dto.business.certificate.CertificateChangeApplySaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessCertificateChangeApply;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
@@ -20,6 +21,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -48,4 +50,12 @@
         }
         return changeApplyService.saveChangeApply(request);
     }
+
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody CertificateChangeApplyApprovalListRequest request) throws Exception {
+        List<BizBusinessCertificateChangeApply> list = super.exportList(request);
+        super.exportExcel(BizBusinessCertificateChangeApply.class, list, ExportEnum.CERTIFICATE_CHANGE_APPLY.getSheetName());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java
index 5fc4b07..af8230e 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java
@@ -9,6 +9,7 @@
 import com.casic.missiles.dto.business.certificate.CertificatePrintApprovalListRequest;
 import com.casic.missiles.dto.business.certificate.CertificatePrintListResponse;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.enums.business.CertificatePrintStatusEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessCertificatePrintLog;
@@ -18,10 +19,16 @@
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.io.IOException;
+import java.util.List;
 import java.util.Objects;
 
 /**
@@ -98,4 +105,16 @@
         });
         return certificatePrintService.certificatePrintLog(idDTO.getId());
     }
+
+    @ApiOperation("证书打印审批导出")
+    @PostMapping("/listExport")
+    public void exportList(@RequestBody CertificatePrintApprovalListRequest request) throws IOException {
+        List<CertificatePrintListResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = certificatePrintService.listByIds(request.getIds());
+        } else {
+            list = certificatePrintService.list(request);
+        }
+        super.exportExcel(CertificatePrintListResponse.class, list, ExportEnum.CERTIFICATE_PRINT.getSheetName());
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java
index 63b06dc..6b2efd5 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java
@@ -6,6 +6,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.business.certificate.CertificateReportApprovalListRequest;
 import com.casic.missiles.dto.business.certificate.CertificateReportSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessCertificateReport;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
@@ -21,6 +22,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -50,7 +52,7 @@
         return certificateReportService.saveCertificateReport(request);
     }
 
-    @ApiOperation("证书审批详情（基本信息）")
+    @ApiOperation("详情（基本信息）")
     @PostMapping("/detail")
     public ReturnDTO<BizBusinessCertificateReport> detail(@RequestBody @Valid BaseDetailRequest request, BindingResult bindingResult) throws Exception {
         if(bindingResult.hasErrors()){
@@ -59,4 +61,11 @@
         return certificateReportService.detail(request);
     }
 
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody CertificateReportApprovalListRequest request) throws Exception {
+        List<BizBusinessCertificateReport> list = super.exportList(request);
+        super.exportExcel(BizBusinessCertificateReport.class, list, ExportEnum.CERTIFICATE_REPORT.getSheetName());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java
index 46b26bd..57c0809 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java
@@ -10,20 +10,21 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.business.identify.IdentifyListRequest;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessIdentifyInfo;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.business.IBizBusinessIdentifyInfoService;
+import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import javax.validation.Valid;
+import java.util.List;
 import java.util.Objects;
 
 /**
@@ -57,16 +58,13 @@
         return identifyInfoService.addIdentify(identifyInfo);
     }
 
-    @ApiOperation("标识打印更新")
+    @ApiOperation("标识打印更新（更新打印时间）")
     @PostMapping("/update")
-    public ReturnDTO updateIdentify(@RequestBody @Valid BizBusinessIdentifyInfo identifyInfo, BindingResult bindingResult) {
-        Assert.isFalse(Objects.isNull(identifyInfo.getId()), () -> {
+    public ReturnDTO updateIdentify(@RequestBody @Valid IdDTO idDTO) {
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        Assert.isFalse(bindingResult.hasErrors(), () -> {
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        });
-        return identifyInfoService.updateIdentify(identifyInfo);
+        return identifyInfoService.updateIdentify(idDTO.getId());
     }
 
     @ApiOperation("标识打印删除")
@@ -77,4 +75,37 @@
         });
         return identifyInfoService.deleteIdentify(idDTO.getId());
     }
+
+    @ApiOperation("标识打印导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody @Valid IdentifyListRequest request, BindingResult bindingResult) throws Exception {
+        if (bindingResult.hasErrors()) {
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        List<BizBusinessIdentifyInfo> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = identifyInfoService.listByIds(request.getIds());
+        } else {
+            list = identifyInfoService.list(request);
+        }
+        for (BizBusinessIdentifyInfo record : list) {
+            DictCodeUtils.convertDictCodeToName(record);
+        }
+        super.exportExcel(BizBusinessIdentifyInfo.class, list, ExportEnum.IDENTIFY_EXPORT.getSheetName());
+    }
+
+
+    // TODO: 2023/8/23 查询设备信息，4个底部按钮查设备（按钮的作用就是前端用来调不同接口、用来区分中间即将展示的标识），前端弹窗选设备，在确定保存时前端根据底部按钮判断传入设备类型deviceType字典code
+    // TODO: 2023/8/23 接口：查受检设备（第1个按钮），查设备台账（后3个按钮同一接口），查询之后前端根据标志类型的不同加到中间页面时进行判断（按产品给的对应表）
+    // TODO: 2023/8/23 提供二维码接口，前端在加到中间页面时调用一下
+
+    @ApiOperation("设备二维码")
+    @PostMapping("/equipment/qrCode")
+    public ReturnDTO<String> equipmentQrCode(@RequestBody @Valid IdDTO idDTO) {
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return identifyInfoService.equipmentQrCode(idDTO.getId());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java
index 707be6e..7e0453d 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java
@@ -117,7 +117,7 @@
     }
 
     @ApiOperation("任务单导出")
-    @PostMapping("/export")
+    @PostMapping("/listExport")
     public void orderExport(@RequestBody @Valid OrderListRequest request, HttpServletResponse response) {
         businessOrderService.orderExport(request, response);
     }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java
index 529a6ce..51432be 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java
@@ -1,9 +1,28 @@
 package com.casic.missiles.controller.business;
 
+import com.casic.missiles.controller.GeneralApprovalController;
+import com.casic.missiles.dto.BaseApprovalSubmitRequest;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.business.outsource.OutsourceAssessApprovalListRequest;
+import com.casic.missiles.dto.business.outsource.OutsourceAssessSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
+import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.model.business.BizBusinessOutsourceAssess;
+import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
+import com.casic.missiles.service.IGeneralApprovalService;
+import com.casic.missiles.service.business.IBizBusinessOutsourceAssessService;
 import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.BindingResult;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.validation.Valid;
+import java.util.List;
+
 /**
  * <p>
  * 计量检定业务-分包管理-测试、校准或检定工作分包评审表 前端控制器
@@ -15,6 +34,27 @@
 @Api(tags = "分包管理-测试、校准或检定工作分包评审表")
 @RestController
 @RequestMapping("/business/outsource/assess")
-public class BizBusinessOutsourceAssessController {
+public class BizBusinessOutsourceAssessController extends GeneralApprovalController<BizBusinessOutsourceAssess, BizBusinessOutsourceAssess, OutsourceAssessApprovalListRequest, BaseApprovalSubmitRequest> {
+    @Autowired
+    private IBizBusinessOutsourceAssessService outsourceAssessService;
 
+    public BizBusinessOutsourceAssessController(IGeneralApprovalService<BizBusinessOutsourceAssess, BizBusinessOutsourceAssess, OutsourceAssessApprovalListRequest, BaseApprovalSubmitRequest> baseApprovalService) {
+        super(baseApprovalService);
+    }
+
+    @ApiOperation("草稿箱-保存")
+    @PostMapping("/save")
+    public ReturnDTO<OutsourceAssessSaveResponse> saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceAssess request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        return outsourceAssessService.saveOutsourceAssess(request);
+    }
+
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception {
+        List<BizBusinessOutsourceAssess> list = super.exportList(request);
+        super.exportExcel(BizBusinessOutsourceAssess.class, list, ExportEnum.OUTSOURCE_ASSESS.getSheetName());
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java
new file mode 100644
index 0000000..9adef18
--- /dev/null
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java
@@ -0,0 +1,60 @@
+package com.casic.missiles.controller.business;
+
+import com.casic.missiles.controller.GeneralApprovalController;
+import com.casic.missiles.dto.BaseApprovalSubmitRequest;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.business.outsource.OutsourceProtocolApprovalListRequest;
+import com.casic.missiles.dto.business.outsource.OutsourceProtocolSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
+import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.model.business.BizBusinessOutsourceProtocol;
+import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
+import com.casic.missiles.service.IGeneralApprovalService;
+import com.casic.missiles.service.business.IBizBusinessOutsourceProtocolService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.BindingResult;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.validation.Valid;
+import java.util.List;
+
+/**
+ * <p>
+ * 计量检定业务-分包管理-测试、校准或检定工作分包协议书 前端控制器
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-08-24
+ */
+@Api(tags = "分包管理-测试、校准或检定工作分包协议书")
+@RestController
+@RequestMapping("/business/outsource/protocol")
+public class BizBusinessOutsourceProtocolController extends GeneralApprovalController<BizBusinessOutsourceProtocol, BizBusinessOutsourceProtocol, OutsourceProtocolApprovalListRequest, BaseApprovalSubmitRequest> {
+    @Autowired
+    private IBizBusinessOutsourceProtocolService outsourceProtocolService;
+
+    public BizBusinessOutsourceProtocolController(IGeneralApprovalService<BizBusinessOutsourceProtocol, BizBusinessOutsourceProtocol, OutsourceProtocolApprovalListRequest, BaseApprovalSubmitRequest> baseApprovalService) {
+        super(baseApprovalService);
+    }
+
+    @ApiOperation("草稿箱-保存")
+    @PostMapping("/save")
+    public ReturnDTO<OutsourceProtocolSaveResponse> saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceProtocol request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        return outsourceProtocolService.saveOutsourceProtocol(request);
+    }
+
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody OutsourceProtocolApprovalListRequest request) throws Exception {
+        List<BizBusinessOutsourceProtocol> list = super.exportList(request);
+        super.exportExcel(BizBusinessOutsourceProtocol.class, list, ExportEnum.OUTSOURCE_PROTOCOL.getSheetName());
+    }
+}
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java
index 097f645..f0f0943 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java
@@ -17,7 +17,6 @@
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.IGeneralApprovalService;
 import com.casic.missiles.service.business.IBizBusinessOutsourcerInfoService;
-import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -71,19 +70,8 @@
 
     @ApiOperation("分包方导出")
     @PostMapping("/listExport")
-    public void export(@RequestBody @Valid OutsourcerInfoApprovalListRequest request, BindingResult bindingResult) throws Exception {
-        if (bindingResult.hasErrors()) {
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        }
-        List<BizBusinessOutsourcerInfo> list;
-        if (!CollectionUtils.isEmpty(request.getIds())) {
-            list = outsourcerInfoService.listByIds(request.getIds());
-        } else {
-            list = outsourcerInfoService.list(request);
-        }
-        for (BizBusinessOutsourcerInfo record : list) {
-            DictCodeUtils.convertDictCodeToName(record);
-        }
+    public void export(@RequestBody OutsourcerInfoApprovalListRequest request) throws Exception {
+        List<BizBusinessOutsourcerInfo> list = super.exportList(request);
         super.exportExcel(BizBusinessOutsourcerInfo.class, list, ExportEnum.OUTSOURCER_EXPORT.getSheetName());
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java
index c2cbf9f..0410918 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java
@@ -17,11 +17,9 @@
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.IGeneralApprovalService;
 import com.casic.missiles.service.business.IBizBusinessSiteExecutiveInfoService;
-import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -60,7 +58,7 @@
         return siteExecutiveInfoService.saveSiteExecutiveInfo(siteExecutiveInfo);
     }
 
-    @ApiOperation("现场检测详情")
+    @ApiOperation("详情")
     @PostMapping("/detail")
     public ReturnDTO<SiteExecutiveDetailResponse> siteExecutiveDetail(@RequestBody @Valid IdDTO idDTO) throws Exception {
         Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
@@ -69,21 +67,10 @@
         return ReturnUtil.success(siteExecutiveInfoService.detail(idDTO.getId()));
     }
 
-    @ApiOperation("现场检测导出")
+    @ApiOperation("导出")
     @PostMapping("/listExport")
-    public void export(@RequestBody @Valid SiteExecutiveApprovalListRequest request, BindingResult bindingResult) throws Exception {
-        if (bindingResult.hasErrors()) {
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        }
-        List<SiteExecutiveApprovalListResponse> list;
-        if (!CollectionUtils.isEmpty(request.getIds())) {
-            list = siteExecutiveInfoService.listInfoByIds(request.getIds());
-        } else {
-            list = siteExecutiveInfoService.listInfo(request);
-        }
-        for (SiteExecutiveApprovalListResponse record : list) {
-            DictCodeUtils.convertDictCodeToName(record);
-        }
+    public void export(@RequestBody SiteExecutiveApprovalListRequest request) throws Exception {
+        List<SiteExecutiveApprovalListResponse> list = super.exportList(request);
         super.exportExcel(SiteExecutiveApprovalListResponse.class, list, ExportEnum.SITE_EXECUTIVE_EXPORT.getSheetName());
     }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
index 7e793cd..a92e209 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
@@ -55,7 +55,7 @@
 
     @ApiOperation("设备收发列表导出")
     @PostMapping("/export")
-    public void exportList(@RequestBody @Valid SampleDispatchListRequest request) throws IOException {
+    public void exportList(@RequestBody SampleDispatchListRequest request) throws IOException {
         List<SampleDispatchListResponse> list;
         if (!CollectionUtils.isEmpty(request.getIds())) {
             list = dispatchService.listByIds(request.getIds());
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java
index cdc77fc..d120fd4 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java
@@ -7,6 +7,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.business.labExecutive.*;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.business.IBusinessLabExecutiveInfoService;
@@ -14,6 +15,7 @@
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.*;
 
@@ -32,7 +34,7 @@
     @Autowired
     private IBusinessLabExecutiveInfoService labExecutiveInfoService;
 
-    @ApiOperation("实验室检测-部门检测-查询各状态列表（待检测、检测中、检测完）")
+    @ApiOperation("实验室任务-查询各状态列表（待检测、检测中、检测完）")
     @PostMapping("/deptExecutive/List")
     public ReturnDTO<PageInfoBT<SampleLabExecutiveListResponse>> queryDeptExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
@@ -43,10 +45,19 @@
         return ReturnUtil.success(super.packForBT(labExecutiveInfoService.deptLabExecutiveListPage(page, labExecutiveListRequest)));
     }
 
-    /**
-     * 实验室检测-我的检测-查询各状态列表（待检测、检测中、检测完）
-     */
-    @ApiOperation("实验室检测-我的检测-查询各状态列表（待检测、检测中、检测完）")
+    @ApiOperation("实验室任务导出")
+    @PostMapping("/deptExecutive/export")
+    public void deptExportList(@RequestBody @Valid SampleLabExecutiveListRequest request) throws Exception {
+        List<SampleLabExecutiveListResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = labExecutiveInfoService.deptLabExecutiveListByIds(request.getMeasureStatus(), request.getIds());
+        } else {
+            list = labExecutiveInfoService.deptLabExecutiveList(request);
+        }
+        super.exportExcel(SampleLabExecutiveListResponse.class, list, ExportEnum.DEPT_EXECUTIVE_TASK.getSheetName());
+    }
+
+    @ApiOperation("我的任务-查询各状态列表（待检测、检测中、检测完）")
     @PostMapping("/myExecutive/list")
     public ReturnDTO<PageInfoBT<SampleLabExecutiveListResponse>> queryMyExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
@@ -57,19 +68,25 @@
         return ReturnUtil.success(super.packForBT(labExecutiveInfoService.myLabExecutiveListPage(page, labExecutiveListRequest)));
     }
 
-    /**
-     * 实验室检测-我的检测-查询各状态样品数量（待检测、检测中、检测完）
-     */
-    @ApiOperation("实验室检测-我的检测-查询各状态样品数量（待检测、检测中、检测完）")
+    @ApiOperation("我的任务导出")
+    @PostMapping("/myExecutive/export")
+    public void exportList(@RequestBody @Valid SampleLabExecutiveListRequest request) throws Exception {
+        List<SampleLabExecutiveListResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = labExecutiveInfoService.myLabExecutiveListByIds(request.getMeasureStatus(), request.getIds());
+        } else {
+            list = labExecutiveInfoService.myLabExecutiveList(request);
+        }
+        super.exportExcel(SampleLabExecutiveListResponse.class, list, ExportEnum.MY_EXECUTIVE_TASK.getSheetName());
+    }
+
+    @ApiOperation("我的任务-查询各状态样品数量（待检测、检测中、检测完）")
     @GetMapping("/myExecutive/amount")
     public ReturnDTO<List<SampleAmountResponse>> queryMyExecutiveAmount() {
         return ReturnUtil.success(labExecutiveInfoService.myExecutiveAmount());
     }
 
-    /**
-     * 实验室检测-部门检测-分配（分配给具体人员）
-     */
-    @ApiOperation("实验室检测-部门检测-分配按钮（分配给具体人员）")
+    @ApiOperation("实验室任务-分配按钮（分配给具体人员）")
     @PostMapping("/deptExecutive/allocate")
     public ReturnDTO allocateStaff(@RequestBody @Valid SampleAllocateRequest sampleAllocateRequest, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -78,10 +95,7 @@
         return labExecutiveInfoService.allocateStaff(sampleAllocateRequest);
     }
 
-    /**
-     * 实验室检测-我的检测-检定人扫描收入（待检测->检测中）
-     */
-    @ApiOperation("实验室检测-我的检测-检定人扫描收入（待检测->检测中）")
+    @ApiOperation("我的任务-检定人扫描收入（待检测->检测中）")
     @PostMapping("/myExecutive/receive")
     public ReturnDTO sampleReceive(@RequestBody @Valid List<SampleOperateRequest> requestList, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -90,10 +104,7 @@
         return labExecutiveInfoService.sampleReceive(requestList);
     }
 
-    /**
-     * 实验室检测-负责人/检定人扫描检完（检测中->检测完）
-     */
-    @ApiOperation("实验室检测-负责人/检定人扫描检完（检测中->检测完）")
+    @ApiOperation("实验室任务-负责人/检定人扫描检完（检测中->检测完）")
     @PostMapping("/myExecutive/complete")
     public ReturnDTO sampleExecutiveComplete(@RequestBody @Valid List<SampleOperateRequest> requestList, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -102,10 +113,7 @@
         return labExecutiveInfoService.sampleExecutiveComplete(requestList);
     }
 
-    /**
-     * 实验室检测-部门检测/我的检测 编辑（只能修改应出具证书）
-     */
-    @ApiOperation("实验室检测-部门检测/我的检测 编辑（只能修改应出具证书）")
+    @ApiOperation("实验室任务/我的任务 编辑（只能修改应出具证书）")
     @PostMapping("/executive/update")
     public ReturnDTO updateExecutive(@RequestBody @Valid UpdateExecutiveRequest request, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -114,10 +122,7 @@
         return labExecutiveInfoService.updateExecutive(request);
     }
 
-    /**
-     * 实验室检测-部门检测/我的检测 详情
-     */
-    @ApiOperation("实验室检测-部门检测/我的检测 详情")
+    @ApiOperation("实验室任务/我的任务 详情")
     @PostMapping("/executive/detail")
     public ReturnDTO<ExecutiveDetailResponse> executiveDetail(@RequestBody @Valid ExecutiveDetailRequest request, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
@@ -131,7 +136,7 @@
      * 退回后会将下一个要执行的实验室检测状态更新为待分配，将后面的实验室顺序变更为连续（都进行减1）
      * 最后一个检测的实验室退回，等分发员再增加实验室或设备收发中的已收入直接手动点击完成
      */
-    @ApiOperation("实验室检测-部门检测/我的检测 退回（待检测/检测中->退回）")
+    @ApiOperation("实验室任务/我的任务 退回（待检测/检测中->退回）")
     @PostMapping("/executive/sendBack")
     public ReturnDTO executiveSendBack(@RequestBody @Valid ExecutiveSendBackRequest request, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -140,9 +145,6 @@
         return labExecutiveInfoService.sampleExecutiveSendBack(request);
     }
 
-    /**
-     * 分发员编辑实验室检测列表
-     */
     @ApiOperation("分发员编辑实验室检测列表")
     @PostMapping("/handOut/updateList")
     public ReturnDTO updateExecutiveList(@RequestBody @Valid UpdateExecutiveListRequest request, BindingResult bindingResult) {
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java
index 48a67ed..0c04f31 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java
@@ -10,6 +10,7 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.resource.customer.CustomerApprovalListRequest;
 import com.casic.missiles.dto.resource.customer.CustomerSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceCustomerInfo;
@@ -26,6 +27,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -55,6 +57,13 @@
         return customerInfoService.saveCustomerInfo(request);
     }
 
+    @ApiOperation("委托方名录导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody CustomerApprovalListRequest request) throws Exception {
+        List<BizResourceCustomerInfo> list = super.exportList(request);
+        super.exportExcel(BizResourceCustomerInfo.class, list, ExportEnum.CUSTOMER_INFO.getSheetName());
+    }
+
     @ApiOperation("委托方人员列表（分页）")
     @PostMapping("/person/listPage")
     public ReturnDTO<PageInfoBT<BizResourceCustomerStaff>> personListPage(@RequestBody IdDTO idDto) {
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
index 972ed4b..6418ea5 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
@@ -5,6 +5,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.resource.customer.SuggestFormApprovalListRequest;
 import com.casic.missiles.dto.resource.customer.SuggestFormSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceCustomerSuggestForm;
@@ -20,6 +21,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -50,4 +52,11 @@
         return suggestFormService.saveSuggestForm(request);
     }
 
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody SuggestFormApprovalListRequest request) throws Exception {
+        List<BizResourceCustomerSuggestForm> list = super.exportList(request);
+        super.exportExcel(BizResourceCustomerSuggestForm.class, list, ExportEnum.CUSTOMER_SUGGEST_FORM.getSheetName());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java
index 1934d1a..9e07eab 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java
@@ -15,12 +15,16 @@
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.resource.IEnvEnvironmentRecordConfigService;
 import com.casic.missiles.service.resource.IEnvEnvironmentRecordDataService;
+import com.casic.missiles.service.resource.IEnvLocationInfoService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
 import java.util.List;
@@ -39,6 +43,8 @@
     private IEnvEnvironmentRecordDataService environmentRecordDataService;
     @Autowired
     private IEnvEnvironmentRecordConfigService environmentRecordConfigService;
+    @Autowired
+    private IEnvLocationInfoService locationInfoService;
 
     @ApiOperation("环境记录单数据列表/详情")
     @PostMapping("/data/listPage")
@@ -95,4 +101,11 @@
         });
         return environmentRecordConfigService.deleteEnvironmentRecordConfig(idDTO.getId());
     }
+
+    @ApiOperation("地点列表")
+    @PostMapping("/location/listPage")
+    public ReturnDTO<PageInfoBT<LocationListResponse>> locationListPage(@RequestBody @Valid LocationListRequest request) {
+        Page<LocationListResponse> page = PageFactory.defaultPage();
+        return ReturnUtil.success(super.packForBT(locationInfoService.listPage(page, request)));
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java
index 82efe3f..e9561fa 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java
@@ -10,6 +10,7 @@
 import com.casic.missiles.dto.resource.seal.SealLogListRequest;
 import com.casic.missiles.dto.resource.seal.SealNoteApprovalListRequest;
 import com.casic.missiles.dto.resource.seal.SealNoteSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceSealUseLog;
@@ -27,6 +28,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -58,6 +60,13 @@
         return sealUseNoteService.saveSeal(request);
     }
 
+    @ApiOperation("印章使用登记导出（列表和导出中去掉经办人和监印人）")
+    @PostMapping("/listExport")
+    public void export(@RequestBody SealNoteApprovalListRequest request) throws Exception {
+        List<BizResourceSealUseNote> list = super.exportList(request);
+        super.exportExcel(BizResourceSealUseNote.class, list, ExportEnum.SEAL_NOTE.getSheetName());
+    }
+
     // TODO: 2023/7/28 印章使用日志：系统中使用印章时插入数据库
 
     @ApiOperation("印章使用日志列表（分页）")
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java
index 9b674fc..06b6521 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java
@@ -9,16 +9,20 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.resource.staff.StaffCertRequest;
 import com.casic.missiles.dto.resource.staff.StaffCertResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.service.resource.IBizResourceStaffInfoService;
 import com.casic.missiles.service.resource.IBizResourceStaffVerifierService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.List;
+
 /**
  * @Description:
  * @Author: wangpeng
@@ -41,9 +45,21 @@
         return ReturnUtil.success(super.packForBT(responsePage));
     }
 
+    @ApiOperation("证书逾期提醒导出")
+    @PostMapping("/listExport")
+    public void exportList(@RequestBody StaffCertRequest request) throws Exception {
+        List<StaffCertResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = staffInfoService.certListByIds(request.getIds());
+        } else {
+            list = staffInfoService.certList(request);
+        }
+        super.exportExcel(StaffCertResponse.class, list, ExportEnum.STAFF_CERTIFICATE_EXPIRE.getSheetName());
+    }
+
     @ApiOperation("证书逾期提醒")
     @PostMapping("/expirationReminder")
-    public ReturnDTO expirationReminder(@RequestBody IdDTO idDto) {
-        return verifierService.expirationReminder(idDto);
+    public ReturnDTO expirationReminder(@RequestBody IdDTO idDTO) {
+        return verifierService.expirationReminder(idDTO);
     }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java
index 3b251ad..a6e7850 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java
@@ -12,6 +12,7 @@
 import com.casic.missiles.dto.resource.staff.StaffListRequest;
 import com.casic.missiles.dto.resource.staff.TrainListRequest;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.*;
@@ -22,7 +23,10 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
 import java.util.List;
@@ -52,8 +56,19 @@
             throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
         }
         Page<BizResourceStaffInfo> page = PageFactory.defaultPage();
-        Page<BizResourceStaffInfo> responsePage = staffInfoService.listPage(page, request);
-        return ReturnUtil.success(super.packForBT(responsePage));
+        return ReturnUtil.success(super.packForBT(staffInfoService.listPage(page, request)));
+    }
+
+    @ApiOperation("人员登记导出")
+    @PostMapping("/listExport")
+    public void exportList(@RequestBody StaffListRequest request) throws Exception {
+        List<BizResourceStaffInfo> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = staffInfoService.listByIds(request.getIds());
+        } else {
+            list = staffInfoService.list(request);
+        }
+        super.exportExcel(BizResourceStaffInfo.class, list, ExportEnum.STAFF_INFO.getSheetName());
     }
 
     @ApiOperation("人员登记详情基础信息")
@@ -85,9 +100,9 @@
 
     @ApiOperation("科研教育列表（分页）")
     @PostMapping("/education/listPage")
-    public ReturnDTO<PageInfoBT<BizResourceStaffEducation>> educationListPage(@RequestBody IdDTO idDto) {
+    public ReturnDTO<PageInfoBT<BizResourceStaffEducation>> educationListPage(@RequestBody IdDTO idDTO) {
         Page<BizResourceStaffEducation> page = PageFactory.defaultPage();
-        Page<BizResourceStaffEducation> responsePage = staffInfoService.educationListPage(page, idDto);
+        Page<BizResourceStaffEducation> responsePage = staffInfoService.educationListPage(page, idDTO);
         return ReturnUtil.success(super.packForBT(responsePage));
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java
index af6aa86..d85d84a 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java
@@ -9,6 +9,7 @@
 import com.casic.missiles.dto.resource.outsideService.SupplierApprovalListRequest;
 import com.casic.missiles.dto.resource.outsideService.SupplierSaveResponse;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceSupplierAbility;
@@ -67,6 +68,13 @@
         return ReturnUtil.success(supplierInfoService.detail(idDTO.getId()));
     }
 
+    @ApiOperation("合格供方导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody SupplierApprovalListRequest request) throws Exception {
+        List<BizResourceSupplierInfo> list = super.exportList(request);
+        super.exportExcel(BizResourceSupplierInfo.class, list, ExportEnum.SUPPLIER_INFO.getSheetName());
+    }
+
     @ApiOperation("供方人员列表（分页）")
     @PostMapping("/person/listPage")
     public ReturnDTO<PageInfoBT<BizResourceSupplierPerson>> personListPage(@RequestBody IdDTO idDTO) {
diff --git a/casic-metering-api/src/main/resources/config/application.yml b/casic-metering-api/src/main/resources/config/application.yml
index 350db5f..ecff521 100644
--- a/casic-metering-api/src/main/resources/config/application.yml
+++ b/casic-metering-api/src/main/resources/config/application.yml
@@ -126,7 +126,7 @@
     #作者
     author: wangpeng
     #待生成对象表名
-    table-name: biz_equipment_technical_target_approval,biz_equipment_attachment_approval,biz_equipment_checkpoint_approval
+    table-name: biz_business_outsource_protocol
 
 reminder:
   #节点--common模块config包 ReminderNodeConfig配置
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
index 4a19e4e..d47d552 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
@@ -53,6 +53,7 @@
     SUGGEST_FORM_SAVE_FAILED(2509, "委托方意见登记表保存至草稿箱失败"),
     EXAMINE_FORM_SAVE_FAILED(2510, "要求、委托书及合同评审表保存至草稿箱失败"),
     CUSTOMER_EXIST_SAVE_FAILED(2511, "该委托方已存在，请重新选择"),
+    DUPLICATE_LOCATION_NO(2512, "地点编号已存在"),
 
     /**
      * 计量检定业务模块
@@ -68,6 +69,8 @@
     COMPLETE_SAMPLE_NOT_EXIST(2609, "检测中不存在扫描收入的样品"),
     CANNOT_CHANGE_MEASURE_INFO(2610, "无法更改非当前登录用户的检测信息"),
     NON_EXIST_ORDER_OR_SAMPLE(2611, "不存在该委托单或该委托单下的样品"),
+    OUTSOURCE_ACCESS_SAVE_FAILED(2612, "测试、校准或检定工作分包评审表保存至草稿箱失败"),
+    OUTSOURCE_PROTOCOL_SAVE_FAILED(2613, "测试、校准或检定工作分包协议书保存至草稿箱失败"),
 
     /**
      * 历史遗留备用
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
index 5089ad1..81a406b 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
@@ -10,54 +10,38 @@
     /**
      * 资源管理
      */
-    ENVIRONMENT_DATA_EXPORT("environmentData", "environmentData", "环境记录单数据"),
+    ENVIRONMENT_DATA_EXPORT("environmentData", "环境记录单数据", "环境记录单数据"),
+    STAFF_INFO("staffInfo", "人员登记", "人员登记"),
+    STAFF_CERTIFICATE_EXPIRE("certificateExpire", "证书逾期提醒", "证书逾期提醒"),
+    SUPPLIER_INFO("supplierInfo", "合格供方名录", "合格供方名录"),
+    CUSTOMER_INFO("customerInfo", "委托方名录", "委托方名录"),
+    CUSTOMER_SUGGEST_FORM("customerSuggestForm", "委托方意见登记表", "委托方意见登记表"),
+    SEAL_NOTE("sealNote", "印章使用登记", "印章使用登记"),
 
-    FILE_EXPORT("meterFileData", "meterFileData", "计量文件信息"),
-    TRAIN_PLAN_EXPORT("trainPlanData", "trainPlanData", "培训计划"),
-    TRAIN_LOG_EXPORT("trainLogData", "trainLogData", "培训记录"),
-    METER_ORGANIZE_EXPORT("meterOrganizeData", "meterOrganizeData", "计量组织"),
-    TRACE_SUPPLIER_EXPORT("traceSupplierData", "traceSupplierData", "溯源供方"),
-    SIGN_EXPORT("signData", "signData", "签名/签章"),
-    TEMPLATE_EXPORT("templateData", "templateData", "原始记录模板/证书报告模板"),
-    FIXED_ASSETS("meterFixedAssets", "meterFixedAssets", "固定资产"),
-    METER_EQUIPMENT("meterEquipment", "meterEquipment", "测量设备"),
-    CALIBRATION_TEST_EQUIPMENT("calibrationTestEquipment", "calibrationTestEquipment", "校准检定设备"),
-    MEASURE_ACCOUNT("measureAccount", "measureAccount", "测量工装"),
-    STANDARD_SUPPORT_EQUIPMENT("standardSupportEquipment", "standardSupportEquipment", "标准配套设备"),
-    STANDARD_EQUIPMENT("standardEquipment", "standardEquipment", "标准装置"),
-    FLOW_DEF_EXPORT("flowDefData", "flowDefData", "流程定义"),
-    STAFF_CERTIFICATE("certificate", "certificate", "计量人员证书"),
-    CHECK_INFO("checkInfo", "checkInfo", "设备管理点检测"),
-    EQUIPMENT_APPLY("equipmentApply", "equipmentApply", "设备借用"),
-    STANDARD_EQUIPMENT_REMIND("equipmentApplyRemind", "equipmentApplyRemind", "标准装置到期提醒"),
-    METER_PRICE("meterPrice", "meterPrice", "价格库"),
-    METER_STAFF("meterStaff", "meterStaff", "计量人员"),
-    STANDARD_EQUIPMENT_APPLY("standardEquipmentApply", "standardEquipmentApply", "标准装置申请"),
-    STATE_MANAGE_APPLY("stateManage", "stateManage", "状态管理"),
-    METER_ACCEPTANCE_CHECK("acceptanceCheck", "acceptanceCheck", "设备检修保养验收单"),
-    CUSTOMER_EXPORT("customerData", "customerData", "客户信息"),
-    ORDER_EXPORT("orderData", "orderData", "委托书信息"),
-    SAMPLE_EXPORT("sampleData", "sampleData", "样本信息"),
-    EXCHANGE_DATA("exchangeData", "exchangeData", "设备交接单"),
-    DISPATCH_DATA("dispatchData", "dispatchData", "设备收发"),
-    ENVIRONMENT_DATA("environmentData", "environmentData", "环境记录单"),
-    ORIGIN_DATA("originData", "originData", "原始记录"),
-    CERTIFICATE_REPORT("certificateReport", "certificateReport", "证书报告"),
-    ADVICE_EXPORT("adviceData", "adviceData", "客户反馈"),
-    HANDOUT_EXPORT("handoutData", "handoutData", "任务分发列表"),
-    OUTSOURCER_EXPORT("outsourcerData", "outsourcerData", "分包方"),
-    SITE_EXECUTIVE_EXPORT("siteExecutiveData", "siteExecutiveData", "现场测试、校准或检定"),
-    CERTIFICATE_PRINT_EXPORT("certificatePrintData", "certificatePrintData", "证书打印"),
-    DOWNLOAD_TEMPLATE("downloadTemplate", "downloadTemplate", "页面配置"),
-    OUTSOURCER_CERTIFICATE_EXPORT("outsourceCertificateData", "outsourceCertificateData", "分包证书"),
-    SETTLEMENT_INFO_EXPORT("settlementInfoData", "settlementInfoData", "业务结算"),
-    EQUIPMENT_REMIND("equipmentRemind", "equipmentRemind", "设备到期提醒"),
-    AGREEMENT_INFO_EXPORT("agreementInfoData", "agreementInfoData", "合同"),
-    WORK_STATISTICS_EXPORT("workStatisticsData", "workStatisticsData", "实时工作统计"),
-    DEPT_OUTPUT_EXPORT("deptOutputData", "deptOutputData", "部门产值分析"),
-    WORKLOAD_EXPORT("workloadData", "workloadData", "业务工作量分析"),
-    DEPT_COMPREHENSIVE_EXPORT("deptComprehensiveData", "deptComprehensiveData", "部门综合分析"),
-    ENVIRONMENTAL_RECORD("environmentalRecordData", "environmentalRecordData", "现场环境记录");
+    /**
+     * 计量检定业务
+     */
+    OUTSOURCER_EXPORT("outsourcerData", "分包方名录", "分包方名录"),
+    IDENTIFY_EXPORT("identifyData", "计量标识", "计量标识"),
+    ORDER_EXPORT("orderData", "任务单", "任务单"),
+    DISPATCH_DATA("dispatchData", "设备收发", "设备收发"),
+    HANDOUT_EXPORT("handoutData", "任务分发", "任务分发"),
+    SITE_EXECUTIVE_EXPORT("siteExecutiveData", "现场测试、校准或检定", "现场测试、校准或检定"),
+    CERTIFICATE_REPORT("certificateReport", "证书审批", "证书审批"),
+    CERTIFICATE_CHANGE_APPLY("certificateChangeApply", "证书报告补充或更换申请单", "证书报告补充或更换申请单"),
+    CERTIFICATE_PRINT("certificatePrintData", "证书打印审批", "证书打印审批"),
+    DEPT_EXECUTIVE_TASK("deptExecutiveTaskData", "实验室任务", "实验室任务"),
+    MY_EXECUTIVE_TASK("myExecutiveTaskData", "我的任务", "我的任务"),
+    OUTSOURCE_ASSESS("outsourceAssess", "测试、校准或检定工作分包评审表", "测试、校准或检定工作分包评审表"),
+    OUTSOURCE_PROTOCOL("outsourceProtocol", "测试、校准或检定工作分包协议书", "测试、校准或检定工作分包协议书"),
+
+    /**
+     * 系统管理
+     */
+    SIGN_EXPORT("signData", "签名", "签名"),
+    TEMPLATE_EXPORT("templateData", "文件模板", "文件模板"),
+    FLOW_DEF_EXPORT("flowDefData", "流程定义", "流程定义"),
+    DOWNLOAD_TEMPLATE("downloadTemplate", "流程定义", "页面配置");
 
     ExportEnum(String fileName, String sheetName, String description) {
         this.fileName = fileName;
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateRecordTypeCodeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateRecordTypeCodeEnum.java
index 31d913c..a963522 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateRecordTypeCodeEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateRecordTypeCodeEnum.java
@@ -46,4 +46,14 @@
     String SITE_EXECUTIVE_APPROVAL = "01";
     //《现场测试、校准或检定工作记录表》
     String SITE_EXECUTIVE_LOG = "02";
+
+    //测试、校准或检定工作分包协议书
+    String OUTSOURCE_PROTOCOL = "01";
+    //测试、校准或检定工作分包评审表
+    String OUTSOURCE_ACCESS = "02";
+    //测试、校准或检定工作分包通知书
+    String OUTSOURCE_NOTICE = "03";
+    //测试、校准或检定工作分包方名录
+    String OUTSOURCE_INFO = "04";
+
 }
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
index 24b8635..f78bd53 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
@@ -15,6 +15,10 @@
     String CERTIFICATE_CHANGE_APPLY_BEAN_NAME = "certificateChangeApplyBean";
     //现场测试、校准或检定
     String SITE_EXECUTIVE_BEAN_NAME = "siteExecutiveBean";
+    //测试、校准或检定工作分包评审表
+    String OUTSOURCE_ASSESS_BEAN_NAME = "outsourceAssessBean";
+    //测试、校准或检定工作分包协议书
+    String OUTSOURCE_PROTOCOL_BEAN_NAME = "outsourceProtocolBean";
 
     /*********************************设备与装置************************************/
     //设备台账
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 b21c661..6b86fd1 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
@@ -18,6 +18,8 @@
     OUTSOURCER_APPROVAL(OUTSOURCER_BEAN_NAME, ""),
     CERTIFICATE_CHANGE_APPROVAL(CERTIFICATE_CHANGE_APPLY_BEAN_NAME, ""),
     SITE_EXECUTIVE_APPROVAL(SITE_EXECUTIVE_BEAN_NAME, ""),
+    OUTSOURCE_ASSESS_APPROVAL(OUTSOURCE_ASSESS_BEAN_NAME, ""),
+    OUTSOURCE_PROTOCOL_APPROVAL(OUTSOURCE_PROTOCOL_BEAN_NAME, ""),
 
     ACTION_STATUS_MAP(new HashMap<String, AwareActionStatusEnum>() {
         {
@@ -47,6 +49,10 @@
             put(ApplyFromIdEnum.CERTIFICATE_CHANGE_APPROVAL.getCode(), CERTIFICATE_CHANGE_APPROVAL);
             //现场测试、校准或检定审批
             put(ApplyFromIdEnum.SITE_EXECUTIVE_APPROVAL.getCode(), SITE_EXECUTIVE_APPROVAL);
+            //测试、校准或检定工作分包评审表
+            put(ApplyFromIdEnum.OUTSOURCE_ASSESS_APPROVAL.getCode(), OUTSOURCE_ASSESS_APPROVAL);
+            //测试、校准或检定工作分包协议书
+            put(ApplyFromIdEnum.OUTSOURCE_PROTOCOL_APPROVAL.getCode(), OUTSOURCE_PROTOCOL_APPROVAL);
         }
     });
     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 934405e..c7410bd 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
@@ -9,6 +9,8 @@
     CERTIFICATE_CHANGE_APPROVAL("jljdywzsbchghsqd", MessageSourceModuleEnum.BUSINESS.getCode(), "证书/报告补充或更换申请单"),
     OUTSOURCER_APPROVAL("jljdywcsjzhgfbfml", MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定合格分包方名录"),
     SITE_EXECUTIVE_APPROVAL("jljdywxccsjzsp", MessageSourceModuleEnum.BUSINESS.getCode(), "现场测试、校准或检定审批"),
+    OUTSOURCE_ASSESS_APPROVAL("jljdywcsjzfbpsb", MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包评审表"),
+    OUTSOURCE_PROTOCOL_APPROVAL("jljdywcsjzfbxys", MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包协议书"),
 
 
     /*******************************************设备与装置*********************************************/
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/GeneralApprovalMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/GeneralApprovalMapper.java
index 4fb7344..0c9d6ae 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/GeneralApprovalMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/GeneralApprovalMapper.java
@@ -17,8 +17,4 @@
 
     Page<O> selectBatchForApprovalList(Page<O> page, @Param("request") R request, @Param("businessKeys") List<String> businessKeys);
 
-//    Page<O> selectListPage(Page<O> page, @Param("request") R request);
-
-//    Long selectMaxNo();
-
 }
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceAssessMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceAssessMapper.java
index 7867bb8..ba59009 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceAssessMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceAssessMapper.java
@@ -1,7 +1,12 @@
 package com.casic.missiles.mapper.business;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.business.outsource.OutsourceAssessApprovalListRequest;
+import com.casic.missiles.mapper.GeneralApprovalMapper;
 import com.casic.missiles.model.business.BizBusinessOutsourceAssess;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * <p>
@@ -11,6 +16,10 @@
  * @author wangpeng
  * @since 2023-08-16
  */
-public interface BizBusinessOutsourceAssessMapper extends BaseMapper<BizBusinessOutsourceAssess> {
+public interface BizBusinessOutsourceAssessMapper extends GeneralApprovalMapper<BizBusinessOutsourceAssess, BizBusinessOutsourceAssess, OutsourceAssessApprovalListRequest> {
+
+    Page<BizBusinessOutsourceAssess> selectBatchForApprovalList(Page<BizBusinessOutsourceAssess> page, @Param("request") OutsourceAssessApprovalListRequest request, @Param("businessKeys") List<String> businessKeys);
+
+    Long selectMaxProjectNo();
 
 }
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceProtocolMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceProtocolMapper.java
new file mode 100644
index 0000000..e6aba35
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceProtocolMapper.java
@@ -0,0 +1,24 @@
+package com.casic.missiles.mapper.business;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.business.outsource.OutsourceProtocolApprovalListRequest;
+import com.casic.missiles.mapper.GeneralApprovalMapper;
+import com.casic.missiles.model.business.BizBusinessOutsourceProtocol;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 计量检定业务-分包管理-测试、校准或检定工作分包协议书 Mapper 接口
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-08-24
+ */
+public interface BizBusinessOutsourceProtocolMapper extends GeneralApprovalMapper<BizBusinessOutsourceProtocol, BizBusinessOutsourceProtocol, OutsourceProtocolApprovalListRequest> {
+
+    Page<BizBusinessOutsourceProtocol> selectBatchForApprovalList(Page<BizBusinessOutsourceProtocol> page, @Param("request") OutsourceProtocolApprovalListRequest request, @Param("businessKeys") List<String> businessKeys);
+
+    Long selectMaxProtocolNo();
+}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/EnvLocationInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/EnvLocationInfoMapper.java
new file mode 100644
index 0000000..49eff87
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/EnvLocationInfoMapper.java
@@ -0,0 +1,21 @@
+package com.casic.missiles.mapper.resource;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.resource.environment.LocationListRequest;
+import com.casic.missiles.dto.resource.environment.LocationListResponse;
+import com.casic.missiles.model.resource.EnvLocationInfo;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * <p>
+ * 实验室环境监控系统-设备表 Mapper 接口
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-06-07
+ */
+public interface EnvLocationInfoMapper extends BaseMapper<EnvLocationInfo> {
+
+    Page<LocationListResponse> selectLocationListPage(Page<LocationListResponse> page, @Param("request") LocationListRequest request);
+}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java
index de124db..85ed0f7 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java
@@ -1,7 +1,9 @@
 package com.casic.missiles.mapper.system;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.dto.system.SignDetailResponse;
+import com.casic.missiles.dto.system.SignListRequest;
 import com.casic.missiles.model.system.SystemSign;
 import org.apache.ibatis.annotations.Param;
 
@@ -22,4 +24,8 @@
     SignDetailResponse selectSignDetailById(Long id);
 
     List<SystemSign> selectUsableSignList(@Param("userId") Long userId);
+
+    Page<SystemSign> selectSignListPage(Page<SystemSign> page, @Param("request") SignListRequest request);
+
+    List<SystemSign> selectSignList(@Param("request") SignListRequest request);
 }
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateChangeApplyMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateChangeApplyMapper.xml
index d798447..c496092 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateChangeApplyMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateChangeApplyMapper.xml
@@ -30,31 +30,31 @@
         SELECT *
         FROM biz_business_certificate_change_apply
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.changeApplyNo != null and request.changeApplyNo !=''">
+        <if test="request != null and request.changeApplyNo != null and request.changeApplyNo !=''">
             and change_apply_no like concat('%',#{request.changeApplyNo},'%')
         </if>
-        <if test="request.changeReportNo != null and request.changeReportNo !=''">
+        <if test="request != null and request.changeReportNo != null and request.changeReportNo !=''">
             and change_report_no like concat('%',#{request.changeReportNo},'%')
         </if>
-        <if test="request.changeReportName != null and request.changeReportName !=''">
+        <if test="request != null and request.changeReportName != null and request.changeReportName !=''">
             and change_report_name like concat('%',#{request.changeReportName},'%')
         </if>
-        <if test="request.changeType != null and request.changeType !=''">
+        <if test="request != null and request.changeType != null and request.changeType !=''">
             and change_type = #{request.changeType}
         </if>
-        <if test="request.createUserName != null and request.createUserName !=''">
+        <if test="request != null and request.createUserName != null and request.createUserName !=''">
             and create_user_name like concat('%',#{request.createUserName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificatePrintMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificatePrintMapper.xml
index b66cd99..49c0ac8 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificatePrintMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificatePrintMapper.xml
@@ -31,34 +31,34 @@
         LEFT JOIN biz_business_order_sample_relation bosr ON (bosr.order_id = bcr.order_id AND bosr.sample_id = bcr.sample_id)
         LEFT JOIN biz_business_order_info boi ON boi.id = bosr.order_id
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and bcp.approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.printStatus != null and request.printStatus !=''">
+        <if test="request != null and request.printStatus != null and request.printStatus !=''">
             and print_status = #{request.printStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and bcp.create_user_id = #{request.createUserId}
         </if>
-        <if test="request.certificateReportNo != null and request.certificateReportNo !=''">
+        <if test="request != null and request.certificateReportNo != null and request.certificateReportNo !=''">
             and bcr.certificate_report_no like concat('%',#{request.certificateReportNo},'%')
         </if>
-        <if test="request.certificateReportName != null and request.certificateReportName !=''">
+        <if test="request != null and request.certificateReportName != null and request.certificateReportName !=''">
             and bcr.certificate_report_name like concat('%',#{request.certificateReportName},'%')
         </if>
-        <if test="request.customerName != null and request.customerName !=''">
+        <if test="request != null and request.customerName != null and request.customerName !=''">
             and boi.customer_name like concat('%',#{request.customerName},'%')
         </if>
-        <if test="request.sampleNo != null and request.sampleNo !=''">
+        <if test="request != null and request.sampleNo != null and request.sampleNo !=''">
             and bosr.sample_no like concat('%',#{request.sampleNo},'%')
         </if>
-        <if test="request.sampleName != null and request.sampleName !=''">
+        <if test="request != null and request.sampleName != null and request.sampleName !=''">
             and bosr.sample_name like concat('%',#{request.sampleName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and bcp.create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and bcp.create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml
index b366034..767695d 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml
@@ -46,33 +46,37 @@
         SELECT bcr.*, bosr.sample_no, bosr.sample_name, bosr.sample_model, rsi.staff_name
         FROM biz_business_certificate_report bcr
         LEFT JOIN biz_business_order_sample_relation bosr ON (bosr.order_id = bcr.order_id AND bosr.sample_id = bcr.sample_id)
+        LEFT JOIN biz_business_order_info boi ON boi.id = bcr.order_id
         LEFT JOIN biz_resource_staff_info rsi ON rsi.id = bcr.measure_person_id
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and bcr.approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and bcr.create_user_id = #{request.createUserId}
         </if>
-        <if test="request.certificateReportNo != null and request.certificateReportNo !=''">
+        <if test="request != null and request.customerId != null and request.customerId !=''">
+            and boi.customer_id = #{request.customerId}
+        </if>
+        <if test="request != null and request.certificateReportNo != null and request.certificateReportNo !=''">
             and bcr.certificate_report_no like concat('%',#{request.certificateReportNo},'%')
         </if>
-        <if test="request.certificateReportName != null and request.certificateReportName !=''">
+        <if test="request != null and request.certificateReportName != null and request.certificateReportName !=''">
             and bcr.certificate_report_name like concat('%',#{request.certificateReportName},'%')
         </if>
-        <if test="request.sampleNo != null and request.sampleNo !=''">
+        <if test="request != null and request.sampleNo != null and request.sampleNo !=''">
             and bosr.sample_no like concat('%',#{request.sampleNo},'%')
         </if>
-        <if test="request.measureCategory != null and request.measureCategory !=''">
+        <if test="request != null and request.measureCategory != null and request.measureCategory !=''">
             and bcr.measure_category = #{request.measureCategory}
         </if>
-        <if test="request.measurePerson != null and request.measurePerson !=''">
+        <if test="request != null and request.measurePerson != null and request.measurePerson !=''">
             and rsi.staff_name like concat('%',#{request.measurePerson},'%')
         </if>
-        <if test="request.calibrationTimeStart != null and request.calibrationTimeStart !=''">
+        <if test="request != null and request.calibrationTimeStart != null and request.calibrationTimeStart !=''">
             and bcr.calibration_time &gt;= #{request.calibrationTimeStart}
         </if>
-        <if test="request.calibrationTimeEnd != null and request.calibrationTimeEnd !=''">
+        <if test="request != null and request.calibrationTimeEnd != null and request.calibrationTimeEnd !=''">
             and bcr.calibration_time &lt;= #{request.calibrationTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceAssessMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceAssessMapper.xml
index d0fcf8b..c22c101 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceAssessMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceAssessMapper.xml
@@ -7,6 +7,8 @@
         <id column="id" property="id" />
         <result column="project_no" property="projectNo" />
         <result column="project_name" property="projectName" />
+        <result column="lab_code" property="labCode" />
+        <result column="group_code" property="groupCode" />
         <result column="applicant_id" property="applicantId" />
         <result column="applicant_name" property="applicantName" />
         <result column="applicant_time" property="applicantTime" />
@@ -31,7 +33,45 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, project_no, project_name, applicant_id, applicant_name, applicant_time, minio_file_name, remark, create_user_id, create_user_name, outsourcer_id, pre_start_time, pre_end_time, outsource_reason, pre_cost, approval_status, process_id, approve_situation, traceability, test_method, technique_ability, create_time, update_time
+        id, project_no, project_name, lab_code, group_code, applicant_id, applicant_name, applicant_time, minio_file_name, remark, create_user_id, create_user_name, outsourcer_id, pre_start_time, pre_end_time, outsource_reason, pre_cost, approval_status, process_id, approve_situation, traceability, test_method, technique_ability, create_time, update_time
     </sql>
 
+    <select id="selectMaxProjectNo" resultType="java.lang.Long">
+        SELECT IFNULL(max(RIGHT(project_no, 3)), 0) from biz_business_outsource_assess
+    </select>
+
+    <select id="selectBatchForApprovalList" resultMap="BaseResultMap">
+        SELECT bboa.*, bboi.outsourcer_name, bboi.director
+        FROM biz_business_outsource_assess bboa
+        LEFT JOIN biz_business_outsourcer_info bboi ON bboa.outsourcer_id = bboi.id
+        WHERE 1=1
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
+            and bboa.approval_status = #{request.approvalStatus}
+        </if>
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
+            and bboa.create_user_id = #{request.createUserId}
+        </if>
+        <if test="request != null and request.projectNo != null and request.projectNo !=''">
+            and bboa.project_no like concat('%',#{request.projectNo},'%')
+        </if>
+        <if test="request != null and request.outsourcerName != null and request.outsourcerName !=''">
+            and bboi.outsourcer_name like concat('%',#{request.outsourcerName},'%')
+        </if>
+        <if test="request != null and request.applicantName != null and request.applicantName !=''">
+            and bboa.applicant_name like concat('%',#{request.applicantName},'%')
+        </if>
+        <if test="request != null and request.applicantTimeStart != null and request.applicantTimeStart !=''">
+            and bboa.applicant_time &gt;= #{request.applicantTimeStart}
+        </if>
+        <if test="request != null and request.applicantTimeEnd != null and request.applicantTimeEnd !=''">
+            and bboa.applicant_time &lt;= #{request.applicantTimeEnd}
+        </if>
+        <if test="businessKeys != null">
+            and bboa.id in
+            <foreach collection="businessKeys" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
+        ORDER BY bboa.create_time DESC
+    </select>
 </mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceProtocolMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceProtocolMapper.xml
new file mode 100644
index 0000000..b7b2149
--- /dev/null
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceProtocolMapper.xml
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.mapper.business.BizBusinessOutsourceProtocolMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.business.BizBusinessOutsourceProtocol">
+        <id column="id" property="id" />
+        <result column="protocol_no" property="protocolNo" />
+        <result column="project_name" property="projectName" />
+        <result column="lab_code" property="labCode" />
+        <result column="group_code" property="groupCode" />
+        <result column="outsourcer_id" property="outsourcerId" />
+        <result column="remark" property="remark" />
+        <result column="outsource_no" property="outsourceNo" />
+        <result column="outsource_name" property="outsourceName" />
+        <result column="contacts" property="contacts" />
+        <result column="mobile" property="mobile" />
+        <result column="address" property="address" />
+        <result column="require_date" property="requireDate" />
+        <result column="outsource_cost" property="outsourceCost" />
+        <result column="director" property="director" />
+        <result column="item" property="item" />
+        <result column="requires" property="requires" />
+        <result column="create_user_id" property="createUserId" />
+        <result column="create_user_name" property="createUserName" />
+        <result column="approval_status" property="approvalStatus" />
+        <result column="process_id" property="processId" />
+        <result column="create_time" property="createTime" />
+        <result column="update_time" property="updateTime" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, protocol_no, project_name, lab_code, group_code, outsourcer_id, remark, outsource_no, outsource_name, contacts, mobile, address, require_date, outsource_cost, director, item, requires, create_user_id, create_user_name, approval_status, process_id, create_time, update_time
+    </sql>
+
+    <select id="selectMaxProtocolNo" resultType="java.lang.Long">
+        SELECT IFNULL(max(RIGHT(protocol_no, 3)), 0) from biz_business_outsource_protocol
+    </select>
+
+    <select id="selectBatchForApprovalList" resultMap="BaseResultMap">
+        SELECT *
+        FROM biz_business_outsource_protocol
+        WHERE 1=1
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
+            and approval_status = #{request.approvalStatus}
+        </if>
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
+            and create_user_id = #{request.createUserId}
+        </if>
+        <if test="request != null and request.protocolNo != null and request.protocolNo !=''">
+            and protocol_no like concat('%',#{request.protocolNo},'%')
+        </if>
+        <if test="request != null and request.outsourcerName != null and request.outsourcerName !=''">
+            and outsourcer_name like concat('%',#{request.outsourcerName},'%')
+        </if>
+        <if test="request != null and request.applicantName != null and request.applicantName !=''">
+            and create_user_name like concat('%',#{request.applicantName},'%')
+        </if>
+        <if test="request != null and request.applicantTimeStart != null and request.applicantTimeStart !=''">
+            and create_time &gt;= #{request.applicantTimeStart}
+        </if>
+        <if test="request != null and request.applicantTimeEnd != null and request.applicantTimeEnd !=''">
+            and create_time &lt;= #{request.applicantTimeEnd}
+        </if>
+        <if test="businessKeys != null">
+            and id in
+            <foreach collection="businessKeys" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
+        ORDER BY create_time DESC
+    </select>
+</mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourcerInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourcerInfoMapper.xml
index 510a80b..3049b54 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourcerInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourcerInfoMapper.xml
@@ -7,6 +7,8 @@
         <id column="id" property="id" />
         <result column="outsourcer_no" property="outsourcerNo" />
         <result column="outsourcer_name" property="outsourcerName" />
+        <result column="lab_code" property="labCode" />
+        <result column="group_code" property="groupCode" />
         <result column="outsourcer_brief_name" property="outsourcerBriefName" />
         <result column="outsourcer_size" property="outsourcerSize" />
         <result column="business_size" property="businessSize" />
@@ -55,32 +57,32 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, outsourcer_no, outsourcer_name, outsourcer_brief_name, outsourcer_size, business_size, grade, evaluation, tax_number, bank_account, bank_name, bank_account_number, postal_code, director, phone, fax, mobile, email, website, address_country, address_province, address_city, address_area, full_address, address_country_name, address_province_name, address_city_name, address_area_name, invoice_country, invoice_province, invoice_city, invoice_area, invoice_full_address, invoice_country_name, invoice_province_name, invoice_city_name, invoice_area_name, business_scope, business_content, minio_file_name, approval_status, process_id, remark, create_user_id, create_user_name, create_time, update_time
+        id, outsourcer_no, outsourcer_name, lab_code, group_code, outsourcer_brief_name, outsourcer_size, business_size, grade, evaluation, tax_number, bank_account, bank_name, bank_account_number, postal_code, director, phone, fax, mobile, email, website, address_country, address_province, address_city, address_area, full_address, address_country_name, address_province_name, address_city_name, address_area_name, invoice_country, invoice_province, invoice_city, invoice_area, invoice_full_address, invoice_country_name, invoice_province_name, invoice_city_name, invoice_area_name, business_scope, business_content, minio_file_name, approval_status, process_id, remark, create_user_id, create_user_name, create_time, update_time
     </sql>
 
     <select id="selectBatchForApprovalList" resultMap="BaseResultMap">
         SELECT *
         FROM biz_business_outsourcer_info
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.outsourcerNo != null and request.outsourcerNo !=''">
+        <if test="request != null and request.outsourcerNo != null and request.outsourcerNo !=''">
             and outsourcer_no like concat('%',#{request.outsourcerNo},'%')
         </if>
-        <if test="request.outsourcerName != null and request.outsourcerName !=''">
+        <if test="request != null and request.outsourcerName != null and request.outsourcerName !=''">
             and outsourcer_name like concat('%',#{request.outsourcerName},'%')
         </if>
-        <if test="request.director != null and request.director !=''">
+        <if test="request != null and request.director != null and request.director !=''">
             and director like concat('%',#{request.director},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
@@ -93,6 +95,6 @@
     </select>
 
     <select id="selectMaxNo" resultType="java.lang.Long">
-        SELECT IFNULL(max(RIGHT(outsourcer_no, 12)), 0) from biz_business_outsourcer_info
+        SELECT IFNULL(max(RIGHT(outsourcer_no, 3)), 0) from biz_business_outsourcer_info
     </select>
 </mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessSiteExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessSiteExecutiveInfoMapper.xml
index 135c5d0..3c5ae79 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessSiteExecutiveInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessSiteExecutiveInfoMapper.xml
@@ -38,25 +38,25 @@
         FROM biz_business_site_executive_info bsei
         LEFT JOIN biz_resource_customer_info rci ON bsei.customer_id = rci.id
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and bsei.approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and bsei.create_user_id = #{request.createUserId}
         </if>
-        <if test="request.siteExecutiveNo != null and request.siteExecutiveNo !=''">
+        <if test="request != null and request.siteExecutiveNo != null and request.siteExecutiveNo !=''">
             and bsei.site_executive_no like concat('%',#{request.siteExecutiveNo},'%')
         </if>
-        <if test="request.customerName != null and request.customerName !=''">
+        <if test="request != null and request.customerName != null and request.customerName !=''">
             and rci.outsourcer_name like concat('%',#{request.customerName},'%')
         </if>
-        <if test="request.applyName != null and request.applyName !=''">
+        <if test="request != null and request.applyName != null and request.applyName !=''">
             and bsei.apply_name like concat('%',#{request.applyName},'%')
         </if>
-        <if test="request.applyTimeStart != null and request.applyTimeStart !=''">
+        <if test="request != null and request.applyTimeStart != null and request.applyTimeStart !=''">
             and bsei.apply_time &gt;= #{request.applyTimeStart}
         </if>
-        <if test="request.applyTimeEnd != null and request.applyTimeEnd !=''">
+        <if test="request != null and request.applyTimeEnd != null and request.applyTimeEnd !=''">
             and bsei.apply_time &lt;= #{request.applyTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml
index 84d9e2a..6bd38a9 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml
@@ -105,6 +105,12 @@
         <if test="request.isUrgent != null and request.isUrgent !=''">
             AND bo.is_urgent = #{request.isUrgent}
         </if>
+        <if test="request.ids != null">
+            and blei.id in
+            <foreach collection="request.ids" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
         ORDER BY blei.update_time DESC
     </select>
 
@@ -137,6 +143,12 @@
         <if test="request.isUrgent != null and request.isUrgent !=''">
             AND bo.is_urgent = #{request.isUrgent}
         </if>
+        <if test="request.ids != null">
+            and blei.id in
+            <foreach collection="request.ids" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
         ORDER BY blei.update_time DESC
     </select>
 
diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardInfoMapper.xml
index 1a5551b..2ed8d17 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardInfoMapper.xml
@@ -45,12 +45,6 @@
         FROM biz_equipment_standard_info besi
         LEFT JOIN biz_equipment_standard_technology_relation bestr ON besi.standard_no = bestr.standard_no
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
-            and besi.approval_status = #{request.approvalStatus}
-        </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
-            and besi.create_user_id = #{request.createUserId}
-        </if>
         <if test="request.standardName != null and request.standardName !=''">
             and besi.standard_name like concat('%',#{request.standardName},'%')
         </if>
diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardTechnologyRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardTechnologyRelationMapper.xml
index fc7e16c..cd03c8c 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardTechnologyRelationMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardTechnologyRelationMapper.xml
@@ -6,6 +6,7 @@
     <resultMap id="BaseResultMap" type="com.casic.missiles.model.equipment.BizEquipmentStandardTechnologyRelation">
         <id column="id" property="id" />
         <result column="technology_file_id" property="technologyFileId" />
+        <result column="technology_file_no" property="technologyFileNo" />
         <result column="technology_file_name" property="technologyFileName" />
         <result column="standard_id" property="standardId" />
         <result column="standard_no" property="standardNo" />
@@ -14,7 +15,7 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, technology_file_id, technology_file_name, standard_id, remark
+        id, technology_file_id, technology_file_no, technology_file_name, standard_id, remark
     </sql>
 
 </mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceAuthorizeOrderMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceAuthorizeOrderMapper.xml
index ac5176c..554fe65 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceAuthorizeOrderMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceAuthorizeOrderMapper.xml
@@ -32,22 +32,22 @@
         SELECT *
         FROM biz_resource_authorize_order
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.orderNo != null and request.orderNo !=''">
+        <if test="request != null and request.orderNo != null and request.orderNo !=''">
             and order_no like concat('%',#{request.orderNo},'%')
         </if>
-        <if test="request.createUserName != null and request.createUserName !=''">
+        <if test="request != null and request.createUserName != null and request.createUserName !=''">
             and create_user_name like concat('%',#{request.createUserName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerExamineFormMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerExamineFormMapper.xml
index ab242f6..af7f98f 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerExamineFormMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerExamineFormMapper.xml
@@ -41,28 +41,28 @@
         SELECT *
         FROM biz_resource_customer_examine_form
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.formNo != null and request.formNo !=''">
+        <if test="request != null and request.formNo != null and request.formNo !=''">
             and form_no like concat('%',#{request.formNo},'%')
         </if>
-        <if test="request.labCode != null and request.labCode !=''">
+        <if test="request != null and request.labCode != null and request.labCode !=''">
             and lab_code like concat('%',#{request.labCode},'%')
         </if>
-        <if test="request.groupCode != null and request.groupCode !=''">
+        <if test="request != null and request.groupCode != null and request.groupCode !=''">
             and group_code like concat('%',#{request.groupCode},'%')
         </if>
-        <if test="request.createUserName != null and request.createUserName !=''">
+        <if test="request != null and request.createUserName != null and request.createUserName !=''">
             and create_user_name like concat('%',#{request.createUserName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerInfoMapper.xml
index fa8ffbc..06a2798 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerInfoMapper.xml
@@ -33,25 +33,25 @@
         SELECT *
         FROM biz_resource_customer_info
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.customerNo != null and request.customerNo !=''">
+        <if test="request != null and request.customerNo != null and request.customerNo !=''">
             and customer_no like concat('%',#{request.customerNo},'%')
         </if>
-        <if test="request.customerName != null and request.customerName !=''">
+        <if test="request != null and request.customerName != null and request.customerName !=''">
             and customer_name like concat('%',#{request.customerName},'%')
         </if>
-        <if test="request.contacts != null and request.contacts !=''">
+        <if test="request != null and request.contacts != null and request.contacts !=''">
             and contacts like concat('%',#{request.contacts},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerSuggestFormMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerSuggestFormMapper.xml
index 28f5bb2..1806662 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerSuggestFormMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerSuggestFormMapper.xml
@@ -33,28 +33,28 @@
         SELECT *
         FROM biz_resource_customer_suggest_form
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.formNo != null and request.formNo !=''">
+        <if test="request != null and request.formNo != null and request.formNo !=''">
             and form_no like concat('%',#{request.formNo},'%')
         </if>
-        <if test="request.customerName != null and request.customerName !=''">
+        <if test="request != null and request.customerName != null and request.customerName !=''">
             and customer_name like concat('%',#{request.customerName},'%')
         </if>
-        <if test="request.customerDeptName != null and request.customerDeptName !=''">
+        <if test="request != null and request.customerDeptName != null and request.customerDeptName !=''">
             and customer_dept_name like concat('%',#{request.customerDeptName},'%')
         </if>
-        <if test="request.createUserName != null and request.createUserName !=''">
+        <if test="request != null and request.createUserName != null and request.createUserName !=''">
             and create_user_name like concat('%',#{request.createUserName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSealUseNoteMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSealUseNoteMapper.xml
index ab37bc1..b02bb33 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSealUseNoteMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSealUseNoteMapper.xml
@@ -29,32 +29,32 @@
     </sql>
 
     <select id="selectBatchForApprovalList" resultMap="BaseResultMap">
-        SELECT *
+        SELECT brsun.*, brsi.seal_name, brsi.seal_type, brsi.approver_name
         FROM biz_resource_seal_use_note brsun
         JOIN biz_resource_seal_info brsi ON brsun.seal_id = brsi.id
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and brsun.approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and brsun.create_user_id = #{request.createUserId}
         </if>
-        <if test="request.sealName != null and request.sealName !=''">
+        <if test="request != null and request.sealName != null and request.sealName !=''">
             and brsi.seal_name like concat('%',#{request.sealName},'%')
         </if>
-        <if test="request.sealType != null and request.sealType !=''">
+        <if test="request != null and request.sealType != null and request.sealType !=''">
             and brsi.seal_type = #{request.sealType}
         </if>
-        <if test="request.applyDeptName != null and request.applyDeptName !=''">
+        <if test="request != null and request.applyDeptName != null and request.applyDeptName !=''">
             and brsun.apply_dept_name like concat('%',#{request.applyDeptName},'%')
         </if>
-        <if test="request.applyUserName != null and request.applyUserName !=''">
+        <if test="request != null and request.applyUserName != null and request.applyUserName !=''">
             and brsun.apply_user_name like concat('%',#{request.applyUserName},'%')
         </if>
-        <if test="request.applyTimeStart != null and request.applyTimeStart !=''">
+        <if test="request != null and request.applyTimeStart != null and request.applyTimeStart !=''">
             and brsun.apply_time &gt;= #{request.applyTimeStart}
         </if>
-        <if test="request.applyTimeEnd != null and request.applyTimeEnd !=''">
+        <if test="request != null and request.applyTimeEnd != null and request.applyTimeEnd !=''">
             and brsun.apply_time &lt;= #{request.applyTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml
index 119bf7d..4f8392a 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml
@@ -31,6 +31,12 @@
         <if test="request.deptName != null and request.deptName !=''">
             and brsi.dept_name like concat('%',#{request.deptName},'%')
         </if>
+        <if test="request.ids != null">
+            and brsv.id in
+            <foreach collection="request.ids" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
         ORDER BY brsv.grant_date DESC
     </select>
 
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSupplierInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSupplierInfoMapper.xml
index fe8d399..e8ce7ef 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSupplierInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSupplierInfoMapper.xml
@@ -48,28 +48,28 @@
         SELECT *
         FROM biz_resource_supplier_info
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.supplierNo != null and request.supplierNo !=''">
+        <if test="request != null and request.supplierNo != null and request.supplierNo !=''">
             and supplier_no like concat('%',#{request.supplierNo},'%')
         </if>
-        <if test="request.supplierName != null and request.supplierName !=''">
+        <if test="request != null and request.supplierName != null and request.supplierName !=''">
             and supplier_name like concat('%',#{request.supplierName},'%')
         </if>
-        <if test="request.director != null and request.director !=''">
+        <if test="request != null and request.director != null and request.director !=''">
             and director like concat('%',#{request.director},'%')
         </if>
-        <if test="request.supplierType != null and request.supplierType !=''">
+        <if test="request != null and request.supplierType != null and request.supplierType !=''">
             and supplier_type = #{request.supplierType}
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/EnvLocationInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/EnvLocationInfoMapper.xml
new file mode 100644
index 0000000..68bcf10
--- /dev/null
+++ b/casic-metering-dao/src/main/resources/mapper/resource/EnvLocationInfoMapper.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.mapper.resource.EnvLocationInfoMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.resource.EnvLocationInfo">
+        <id column="id" property="id" />
+        <result column="location_no" property="locationNo" />
+        <result column="location_name" property="locationName" />
+        <result column="location_position" property="locationPosition" />
+        <result column="create_user_id" property="createUserId" />
+        <result column="create_user" property="createUser" />
+        <result column="create_time" property="createTime" />
+        <result column="update_time" property="updateTime" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, location_no, location_name, location_position, create_user_id, create_user, create_time, update_time
+    </sql>
+
+    <select id="selectLocationListPage" resultType="com.casic.missiles.dto.resource.environment.LocationListResponse">
+        SELECT *
+        FROM env_location_info
+        WHERE 1=1
+        <if test="request.locationNo != null and request.locationNo !=''">
+            AND location_no LIKE concat('%',#{request.locationNo},'%')
+        </if>
+        <if test="request.locationName != null and request.locationName !=''">
+            AND location_name LIKE concat('%',#{request.locationName},'%')
+        </if>
+        ORDER BY create_time DESC
+    </select>
+
+</mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml
index b28c18f..8854047 100644
--- a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml
@@ -11,7 +11,6 @@
         <result column="sign_desc" property="signDesc" />
         <result column="sign_director" property="signDirector" />
         <result column="sign_user_id" property="signUserId" />
-        <result column="sign_type" property="signType" />
         <result column="minio_file_name" property="minioFileName" />
         <result column="create_time" property="createTime" />
         <result column="update_time" property="updateTime" />
@@ -28,7 +27,6 @@
         <result column="sign_name" property="signName" />
         <result column="sign_desc" property="signDesc" />
         <result column="sign_director" property="signDirector" />
-        <result column="sign_type" property="signType" />
         <result column="sign_user_id" property="signUserId" />
         <result column="minio_file_name" property="minioFileName" />
         <result column="create_time" property="createTime" />
@@ -62,4 +60,58 @@
         JOIN system_sign_user_relation ssur ON ss.id = ssur.sign_id
         WHERE ssur.user_id = #{userId}
     </select>
+
+    <select id="selectSignListPage" resultMap="BaseResultMap">
+        SELECT ss.*, sd.SIMPLE_NAME AS deptName
+        FROM system_sign ss
+        LEFT JOIN sys_user su ON su.id = ss.sign_user_id
+        LEFT JOIN sys_dept sd ON sd.id = su.dept_id
+        WHERE 1=1
+        <if test="request.signNo != null and request.signNo !=''">
+            AND ss.sign_no LIKE concat('%',#{request.signNo},'%')
+        </if>
+        <if test="request.signName != null and request.signName !=''">
+            AND ss.sign_name LIKE concat('%',#{request.signName},'%')
+        </if>
+        <if test="request.signDirector != null and request.signDirector !=''">
+            AND ss.sign_director LIKE concat('%',#{request.signDirector},'%')
+        </if>
+        <if test="request.signUserId != null and request.signUserId !=''">
+            AND ss.sign_user_id = #{request.signUserId}
+        </if>
+        <if test="request.createStartTime != null and request.createStartTime !=''">
+            AND DATE_FORMAT(ss.create_time,'%Y-%m-%d') &gt;= DATE_FORMAT(#{request.createStartTime},'%Y-%m-%d')
+        </if>
+        <if test="request.createEndTime != null and request.createEndTime !=''">
+            AND DATE_FORMAT(ss.create_time,'%Y-%m-%d')  &lt;= DATE_FORMAT(#{request.createEndTime},'%Y-%m-%d')
+        </if>
+        ORDER BY ss.create_time DESC
+    </select>
+
+    <select id="selectSignList" resultMap="BaseResultMap">
+        SELECT ss.*, sd.SIMPLE_NAME AS deptName
+        FROM system_sign ss
+        LEFT JOIN sys_user su ON su.id = ss.sign_user_id
+        LEFT JOIN sys_dept sd ON sd.id = su.dept_id
+        WHERE 1=1
+        <if test="request.signNo != null and request.signNo !=''">
+            AND ss.sign_no LIKE concat('%',#{request.signNo},'%')
+        </if>
+        <if test="request.signName != null and request.signName !=''">
+            AND ss.sign_name LIKE concat('%',#{request.signName},'%')
+        </if>
+        <if test="request.signDirector != null and request.signDirector !=''">
+            AND ss.sign_director LIKE concat('%',#{request.signDirector},'%')
+        </if>
+        <if test="request.signUserId != null and request.signUserId !=''">
+            AND ss.sign_user_id = #{request.signUserId}
+        </if>
+        <if test="request.createStartTime != null and request.createStartTime !=''">
+            AND DATE_FORMAT(ss.create_time,'%Y-%m-%d') &gt;= DATE_FORMAT(#{request.createStartTime},'%Y-%m-%d')
+        </if>
+        <if test="request.createEndTime != null and request.createEndTime !=''">
+            AND DATE_FORMAT(ss.create_time,'%Y-%m-%d')  &lt;= DATE_FORMAT(#{request.createEndTime},'%Y-%m-%d')
+        </if>
+        ORDER BY ss.create_time DESC
+    </select>
 </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 515050a..60f530b 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
@@ -47,8 +47,8 @@
     String STORAGE_LOCATION = "bizStorageLocation";
     //计量专业
     String MEASURE_MAJOR = "bizMeasureMajor";
-    //管理状态
-    String MANAGER_STATE = "bizManagerState";
+    //标准装置管理状态
+    String STANDARD_MANAGER_STATE = "bizStandardManagerState";
 
     /**
      * 资源管理 字典code
@@ -95,8 +95,6 @@
     String MEASURE_STATUS = "measureStatus";
     //检定方式
     String MEASURE_TYPE = "measureType";
-    //标识打印标志类型
-    String IDENTIFY_PRINT_TYPE = "bizBusinessIdentify";
     //变更类型
     String REPORT_CHANGE_TYPE = "bizCertChangeType";
     //规模类型
@@ -111,19 +109,24 @@
     String MEASURE_CATEGORY = "measureCategory";
     //检定结果
     String MEASURE_RESULT = "measureResult";
+    //分包原因
+    String OUTSOURCE_REASON = "outsourceReason";
+
+    /**
+     * 系统管理
+     */
+    String TEMPLATE_TYPE = "templateType";
+
 
     /**
      * 标准装置 字典code
      */
     //类别
     String STANDARD_CATEGORY = "standardCategory";
-    //管理状态
-    String STANDARD_MANAGER_STATE = "standardManagerState";
     //标准等级
     String STANDARD_LEVEL = "standardLevel";
     //传递范围
     String STANDARD_TRANSMIT_RANGE = "transmitRange";
-
     //资本来源
     String CAPITAL_SOURCE = "capitalSource";
     //标准装置-申请类型
@@ -148,8 +151,6 @@
     String CERTIFICATE_CLASS = "certificationClass";
     //证书管理-检校专业
     String CALIBRATION_MAJOR = "calibrationMajor";
-    //分包原因
-    String OUTSOURCE_REASON = "outsourceReason";
 
     /**
      * 工作台
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/BaseApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/BaseApprovalListRequest.java
index 73c12c1..80d7424 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/BaseApprovalListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/BaseApprovalListRequest.java
@@ -6,6 +6,7 @@
 
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotEmpty;
+import java.util.List;
 
 /**
  * @Description:
@@ -19,14 +20,14 @@
      * 表单id
      */
     @NotBlank(message = "表单id不能为空")
-    @ApiModelProperty(value = "表单id（流程定义对应的表单id，等价于业务id）", dataType = "String")
+    @ApiModelProperty(value = "表单id（流程定义对应的表单id，等价于业务id），导出接口不用传", dataType = "String")
     private String formId;
 
     /**
      * 审批状态类型，对应ApprovalStatusEnum
      */
     @NotEmpty(message = "审批状态类型不能为空")
-    @ApiModelProperty(value = "审批状态类型code", dataType = "String")
+    @ApiModelProperty(value = "审批状态类型code，导出接口不用传", dataType = "String")
     private String approvalStatus;
 
     @ApiModelProperty(hidden = true)
@@ -34,4 +35,7 @@
 
     @ApiModelProperty(hidden = true)
     private Long createUserId;
+
+    @ApiModelProperty(value = "导出ids", dataType = "List")
+    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificatePrintApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificatePrintApprovalListRequest.java
index b93d1c9..3cc2f4e 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificatePrintApprovalListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificatePrintApprovalListRequest.java
@@ -5,8 +5,6 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import java.util.List;
-
 /**
  * @Description:
  * @Author: wangpeng
@@ -38,7 +36,4 @@
 
     @ApiModelProperty(value = "创建结束时间", dataType = "String")
     private String createTimeEnd;
-
-    @ApiModelProperty(value = "导出ids", dataType = "List")
-    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportApprovalListRequest.java
index 4f7a038..c115847 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportApprovalListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportApprovalListRequest.java
@@ -5,8 +5,6 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import java.util.List;
-
 /**
  * @Description:
  * @Author: wangpeng
@@ -15,6 +13,8 @@
 @ApiModel
 @Data
 public class CertificateReportApprovalListRequest extends BaseApprovalListRequest {
+    @ApiModelProperty(value = "委托方id", dataType = "String")
+    private Long customerId;
 
     @ApiModelProperty(value = "证书报告编号", dataType = "String")
     private String certificateReportNo;
@@ -37,6 +37,4 @@
     @ApiModelProperty(value = "检校结束时间", dataType = "String")
     private String calibrationTimeEnd;
 
-    @ApiModelProperty(value = "导出ids", dataType = "List")
-    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/identify/IdentifyListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/identify/IdentifyListRequest.java
index 1b87ae6..f019203 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/identify/IdentifyListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/identify/IdentifyListRequest.java
@@ -4,6 +4,8 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * @Description:
  * @Author: wangpeng
@@ -26,4 +28,7 @@
 
     @ApiModelProperty(value = "打印结束时间", dataType = "String")
     private String createTimeEnd;
+
+    @ApiModelProperty(value = "导出ids", dataType = "List")
+    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListRequest.java
index 1264883..62415fb 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListRequest.java
@@ -7,6 +7,7 @@
 import lombok.Data;
 
 import javax.validation.constraints.NotBlank;
+import java.util.List;
 
 @Data
 @ApiModel
@@ -37,4 +38,6 @@
     @ApiModelProperty(value = "是否加急（1是0否null全部）", dataType = "Integer")
     private String isUrgent;
 
+    @ApiModelProperty(value = "导出ids", dataType = "List")
+    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListRequest.java
index 5201d7b..499760a 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListRequest.java
@@ -17,6 +17,9 @@
     @ApiModelProperty(value = "任务单编号", dataType = "String")
     private String orderNo;
 
+    @ApiModelProperty(value = "委托方id", dataType = "Long")
+    private Long customerId;
+
     @ApiModelProperty(value = "委托方名称", dataType = "String")
     private String customerName;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OrderSampleDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OrderSampleDTO.java
new file mode 100644
index 0000000..796edc0
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OrderSampleDTO.java
@@ -0,0 +1,19 @@
+package com.casic.missiles.dto.business.outsource;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/8/24 11:38
+ */
+@ApiModel
+@Data
+public class OrderSampleDTO {
+    @ApiModelProperty(value = "任务单id", dataType = "Long")
+    private Long orderId;
+    @ApiModelProperty(value = "受检设备id", dataType = "Long")
+    private Long sampleId;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceAssessApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceAssessApprovalListRequest.java
new file mode 100644
index 0000000..9a930c3
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceAssessApprovalListRequest.java
@@ -0,0 +1,30 @@
+package com.casic.missiles.dto.business.outsource;
+
+import com.casic.missiles.dto.BaseApprovalListRequest;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/8/24 11:01
+ */
+@ApiModel
+@Data
+public class OutsourceAssessApprovalListRequest extends BaseApprovalListRequest {
+    @ApiModelProperty(value = "评审表编号", dataType = "String")
+    private String projectNo;
+
+    @ApiModelProperty(value = "分包机构名称", dataType = "String")
+    private String outsourcerName;
+
+    @ApiModelProperty(value = "申请人", dataType = "String")
+    private String applicantName;
+
+    @ApiModelProperty(value = "申请时间开始", dataType = "String")
+    private String applicantTimeStart;
+
+    @ApiModelProperty(value = "申请时间结束", dataType = "String")
+    private String applicantTimeEnd;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceAssessSaveResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceAssessSaveResponse.java
new file mode 100644
index 0000000..8bf9aad
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceAssessSaveResponse.java
@@ -0,0 +1,20 @@
+package com.casic.missiles.dto.business.outsource;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/8/14 16:17
+ */
+@ApiModel
+@Data
+public class OutsourceAssessSaveResponse {
+    @ApiModelProperty(value = "主键id", dataType = "Long")
+    private Long id;
+
+    @ApiModelProperty(value = "编号", dataType = "String")
+    private String projectNo;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProtocolApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProtocolApprovalListRequest.java
new file mode 100644
index 0000000..0f32331
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProtocolApprovalListRequest.java
@@ -0,0 +1,30 @@
+package com.casic.missiles.dto.business.outsource;
+
+import com.casic.missiles.dto.BaseApprovalListRequest;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/8/24 15:01
+ */
+@ApiModel
+@Data
+public class OutsourceProtocolApprovalListRequest extends BaseApprovalListRequest {
+    @ApiModelProperty(value = "协议书编号", dataType = "String")
+    private String protocolNo;
+
+    @ApiModelProperty(value = "分包方名称", dataType = "String")
+    private String outsourcerName;
+
+    @ApiModelProperty(value = "申请人", dataType = "String")
+    private String applicantName;
+
+    @ApiModelProperty(value = "申请时间开始", dataType = "String")
+    private String applicantTimeStart;
+
+    @ApiModelProperty(value = "申请时间结束", dataType = "String")
+    private String applicantTimeEnd;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProtocolSaveResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProtocolSaveResponse.java
new file mode 100644
index 0000000..e324967
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProtocolSaveResponse.java
@@ -0,0 +1,20 @@
+package com.casic.missiles.dto.business.outsource;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/8/14 16:17
+ */
+@ApiModel
+@Data
+public class OutsourceProtocolSaveResponse {
+    @ApiModelProperty(value = "主键id", dataType = "Long")
+    private Long id;
+
+    @ApiModelProperty(value = "编号", dataType = "String")
+    private String protocolNo;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveApprovalListRequest.java
index f29f4e4..7047c28 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveApprovalListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveApprovalListRequest.java
@@ -5,8 +5,6 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import java.util.List;
-
 /**
  * @Description: 现场检测审批列表请求实体
  * @Author: wangpeng
@@ -30,7 +28,4 @@
     @ApiModelProperty(value = "申请时间结束", dataType = "String")
     private String applyTimeEnd;
 
-    @ApiModelProperty(value = "导出ids", dataType = "List")
-    private List<Long> ids;
-
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveDetailResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveDetailResponse.java
index 1f28752..394c934 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveDetailResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveDetailResponse.java
@@ -12,6 +12,18 @@
     @ApiModelProperty(value = "id，更新/删除使用参数", dataType = "Long")
     private Long id;
 
+    @ApiModelProperty(value = "实验室代码(字典code)", dataType = "String")
+    private String labCode;
+
+    @ApiModelProperty(value = "实验室代码(字典value)", dataType = "String")
+    private String labCodeName;
+
+    @ApiModelProperty(value = "组别代码(字典code)", dataType = "String")
+    private String groupCode;
+
+    @ApiModelProperty(value = "组别代码(字典value)", dataType = "String")
+    private String groupCodeName;
+
     @ApiModelProperty(value = "审批编号", dataType = "String")
     private String siteExecutiveNo;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/environment/LocationListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/environment/LocationListRequest.java
new file mode 100644
index 0000000..13d03c3
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/environment/LocationListRequest.java
@@ -0,0 +1,20 @@
+package com.casic.missiles.dto.resource.environment;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/6/8 13:56
+ */
+@ApiModel
+@Data
+public class LocationListRequest {
+    @ApiModelProperty(value = "地点编号", dataType = "String")
+    private String locationNo;
+
+    @ApiModelProperty(value = "地点名称", dataType = "String")
+    private String locationName;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/environment/LocationListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/environment/LocationListResponse.java
new file mode 100644
index 0000000..4c531af
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/environment/LocationListResponse.java
@@ -0,0 +1,78 @@
+package com.casic.missiles.dto.resource.environment;
+
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
+import com.baomidou.mybatisplus.annotation.TableField;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description: 地点列表响应实体
+ * @Author: wangpeng
+ * @Date: 2023/6/8 13:53
+ */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
+@ApiModel
+@Data
+public class LocationListResponse {
+    @ApiModelProperty(value = "主键id", dataType = "Long")
+    private Long id;
+
+    /**
+     * 地点编号
+     */
+    @ExcelProperty("地点编号")
+    @ApiModelProperty(value = "地点编号", dataType = "String")
+    private String locationNo;
+
+    /**
+     * 地点名称
+     */
+    @ExcelProperty("地点名称")
+    @ApiModelProperty(value = "地点名称", dataType = "String")
+    private String locationName;
+
+    /**
+     * 地点位置
+     */
+    @ExcelProperty("地点位置")
+    @ApiModelProperty(value = "地点位置", dataType = "String")
+    private String locationPosition;
+
+    /**
+     * 创建人id
+     */
+    @ApiModelProperty(value = "创建人id", dataType = "Long")
+    private Long createUserId;
+
+    /**
+     * 创建人
+     */
+    @ExcelProperty("创建人")
+    @ApiModelProperty(value = "创建人", dataType = "String")
+    @TableField("create_user")
+    private String createUser;
+
+    /**
+     * 创建时间
+     */
+    @ExcelProperty("创建时间")
+    @ApiModelProperty(value = "创建时间", dataType = "String")
+    private String createTime;
+
+    /**
+     * 更新时间
+     */
+    @ApiModelProperty(value = "更新时间", dataType = "String")
+    private String updateTime;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertRequest.java
index 9a7f6c6..c827915 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertRequest.java
@@ -4,6 +4,8 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * @Description:
  * @Author: wangpeng
@@ -16,4 +18,7 @@
     private String name;
     @ApiModelProperty(value = "部门名", dataType = "String")
     private String deptName;
+
+    @ApiModelProperty(value = "导出ids", dataType = "List")
+    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertResponse.java
index f78b159..8f2f79e 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertResponse.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.dto.resource.staff;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.casic.missiles.annotation.DictCodeField;
 import com.casic.missiles.constants.MeterDictCode;
 import io.swagger.annotations.ApiModel;
@@ -13,12 +20,18 @@
  * @Author: wangpeng
  * @Date: 2023/7/27 15:13
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @ApiModel
 @Data
 public class StaffCertResponse {
     /**
      * 人员编号
      */
+    @ExcelProperty(value = "人员编号",order = 0)
     @NotEmpty(message = "人员编号不能为空")
     @ApiModelProperty(value = "人员编号", dataType = "String")
     private String staffNo;
@@ -26,6 +39,7 @@
     /**
      * 姓名
      */
+    @ExcelProperty(value = "姓名",order = 1)
     @ApiModelProperty(value = "姓名", dataType = "String")
     private String staffName;
 
@@ -54,6 +68,7 @@
     /**
      * 部门名字
      */
+    @ExcelProperty(value = "工作部门",order = 2)
     @ApiModelProperty(value = "部门名字", dataType = "String")
     private String deptName;
 
@@ -66,6 +81,7 @@
     /**
      * 计量专业
      */
+    @ExcelProperty(value = "计量专业",order = 3)
     @ApiModelProperty(value = "计量专业", dataType = "String")
     private String major;
 
@@ -110,6 +126,7 @@
     /**
      * 证书号
      */
+    @ExcelProperty(value = "证号",order = 4)
     @ApiModelProperty(value = "证书号", dataType = "String")
     private String certNo;
 
@@ -122,12 +139,14 @@
     /**
      * 有效日期
      */
+    @ExcelProperty(value = "证书有效期",order = 6)
     @ApiModelProperty(value = "有效日期", dataType = "String")
     private String effectiveDate;
 
     /**
      * 发放日期
      */
+    @ExcelProperty(value = "发证日期",order = 5)
     @ApiModelProperty(value = "发放日期", dataType = "String")
     private String grantDate;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffListRequest.java
index 7c4afb3..0a1194a 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffListRequest.java
@@ -4,6 +4,8 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * @Description:
  * @Author: wangpeng
@@ -18,4 +20,7 @@
     private String deptName;
     @ApiModelProperty(value = "部门id", dataType = "Long")
     private Long deptId;
+
+    @ApiModelProperty(value = "导出ids", dataType = "List")
+    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/TrainListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/TrainListRequest.java
index f68597b..6321f8b 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/TrainListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/TrainListRequest.java
@@ -14,6 +14,8 @@
 public class TrainListRequest {
     @ApiModelProperty(value = "训练登记表编号", dataType = "String")
     private String trainNo;
+    @ApiModelProperty(value = "值班领导", dataType = "String")
+    private String dutyLeader;
     @ApiModelProperty(value = "创建开始时间", dataType = "String")
     private String createTimeStart;
     @ApiModelProperty(value = "创建结束时间", dataType = "String")
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/SignAddRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/SignAddRequest.java
index 117be34..d71055c 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/SignAddRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/SignAddRequest.java
@@ -43,13 +43,6 @@
     private Long signUserId;
 
     /**
-     * 签章或签名-字典code
-     */
-    @NotBlank(message = "类型不能为空")
-    @ApiModelProperty(value = "签名/签章-字典code", dataType = "String", required = true)
-    private String signType;
-
-    /**
      * minio存储文件名
      */
     @ApiModelProperty(value = "上传文件返回名称", dataType = "String")
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateAddRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateAddRequest.java
index aff1265..6316648 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateAddRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateAddRequest.java
@@ -17,30 +17,28 @@
 @Data
 public class TemplateAddRequest extends BaseSystemRequest {
     /**
-     * 原始记录模板/证书报告模板名称
+     * 模板名称
      */
     @ApiModelProperty(value = "名称", dataType = "String", required = true)
     @NotBlank(message = "名称不能为空")
     private String templateName;
 
     /**
-     * 原始记录模板/证书报告模板描述
+     * 模板描述
      */
     @ApiModelProperty(value = "描述", dataType = "String")
     private String templateDesc;
 
     /**
-     * 原始记录模板/证书报告模板创建人
+     * 创建人
      */
     @ApiModelProperty(value = "创建人", dataType = "String", required = true)
     @NotBlank(message = "创建人不能为空")
     private String templateCreator;
 
-    /**
-     * 原始记录模板/证书报告模板-字典code
-     */
-    @NotBlank(message = "类型不能为空")
-    @ApiModelProperty(value = "原始记录模板/证书报告模板-字典code", dataType = "String", required = true)
+
+    @NotBlank(message = "模板类型不能为空")
+    @ApiModelProperty(value = "模板类型(字典code)", dataType = "String", required = true)
     private String templateType;
 
     /**
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateListRequest.java
index eec5a1e..6d17bbe 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateListRequest.java
@@ -1,11 +1,12 @@
 package com.casic.missiles.dto.system;
 
+import com.casic.missiles.annotation.DictCodeField;
+import com.casic.missiles.constants.MeterDictCode;
 import com.casic.missiles.dto.BaseSystemRequest;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import javax.validation.constraints.NotBlank;
 import java.util.List;
 
 /**
@@ -19,8 +20,8 @@
     /**
      * 类型
      */
-//    @ApiModelProperty(value = "类型-字典code", dataType = "String", required = true)
-    @NotBlank(message = "类型不能为空")
+    @DictCodeField(message = "模板类型不合法", cacheName = MeterDictCode.TEMPLATE_TYPE)
+    @ApiModelProperty(value = "模板类型(字典code)", dataType = "String")
     private String templateType;
 
     /**
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificateChangeApply.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificateChangeApply.java
index 9216308..36923fd 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificateChangeApply.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificateChangeApply.java
@@ -1,11 +1,19 @@
 package com.casic.missiles.model.business;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 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 com.casic.missiles.dto.BaseRequest;
+import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -20,6 +28,12 @@
  * @author wangpeng
  * @since 2023-08-15
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
+@ApiModel
 @Data
 @TableName("biz_business_certificate_change_apply")
 public class BizBusinessCertificateChangeApply extends BaseRequest implements Serializable {
@@ -33,6 +47,7 @@
     /**
      * 申请单编号
      */
+    @ExcelProperty(value = "申请单编号", order = 1)
     @ApiModelProperty(value = "申请单编号", dataType = "String")
     @TableField("change_apply_no")
     private String changeApplyNo;
@@ -40,6 +55,7 @@
     /**
      * 申请单名字
      */
+    @ExcelProperty(value = "申请单名称", order = 2)
     @ApiModelProperty(value = "申请单名字", dataType = "String")
     @TableField("change_apply_name")
     private String changeApplyName;
@@ -54,6 +70,7 @@
     /**
      * 更换证书编号
      */
+    @ExcelProperty(value = "更换证书编号", order = 3)
     @ApiModelProperty(value = "更换证书编号", dataType = "String")
     @TableField("change_report_no")
     private String changeReportNo;
@@ -61,7 +78,8 @@
     /**
      * 更换证书名字
      */
-    @ApiModelProperty(value = "更换证书名字", dataType = "String")
+    @ExcelProperty(value = "更换证书/报告名称", order = 4)
+    @ApiModelProperty(value = "更换证书/报告名称", dataType = "String")
     @TableField("change_report_name")
     private String changeReportName;
 
@@ -73,6 +91,7 @@
     @TableField("change_type")
     private String changeType;
 
+    @ExcelProperty(value = "变更类型", order = 5)
     @ApiModelProperty(value = "变更类型(字典value)", dataType = "String")
     @TableField(exist = false)
     private String changeTypeName;
@@ -142,13 +161,15 @@
     /**
      * 创建用户名字
      */
-    @ApiModelProperty(value = "创建用户名字", dataType = "String")
+    @ExcelProperty(value = "创建人", order = 6)
+    @ApiModelProperty(value = "创建人名字", dataType = "String")
     @TableField("create_user_name")
     private String createUserName;
 
     /**
      * 创建时间
      */
+    @ExcelProperty(value = "创建时间", order = 7)
     @ApiModelProperty(value = "创建时间", dataType = "String")
     @TableField("create_time")
     private String createTime;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificateReport.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificateReport.java
index f01db9e..db06018 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificateReport.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificateReport.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.model.business;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -22,6 +29,11 @@
  * @author wangpeng
  * @since 2023-08-14
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @ApiModel
 @Data
 @TableName("biz_business_certificate_report")
@@ -36,6 +48,7 @@
     /**
      * 证书报告编号
      */
+    @ExcelProperty(value = "证书报告编号", order = 1)
     @ApiModelProperty(value = "证书报告编号", dataType = "String")
     @TableField("certificate_report_no")
     private String certificateReportNo;
@@ -43,6 +56,7 @@
     /**
      * 证书报告名称
      */
+    @ExcelProperty(value = "证书报告名称", order = 2)
     @ApiModelProperty(value = "证书报告名称", dataType = "String")
     @TableField("certificate_report_name")
     private String certificateReportName;
@@ -62,6 +76,7 @@
     @TableField("measure_category")
     private String measureCategory;
 
+    @ExcelProperty(value = "检校类别", order = 6)
     @ApiModelProperty(value = "检校类别(字典value)", dataType = "String")
     @TableField(exist = false)
     private String measureCategoryName;
@@ -69,6 +84,7 @@
     /**
      * 检校时间
      */
+    @ExcelProperty(value = "检校时间", order = 8)
     @ApiModelProperty(value = "检校时间", dataType = "String")
     @TableField("calibration_time")
     private String calibrationTime;
@@ -267,18 +283,22 @@
     @TableField(exist = false)
     private Integer decisionItem;
 
-    @ApiModelProperty(value = "设备样品编号（列表返回参数）", dataType = "String")
+    @ExcelProperty(value = "被检设备统一编号", order = 3)
+    @ApiModelProperty(value = "被检设备统一编号（列表返回参数）", dataType = "String")
     @TableField(exist = false)
     private String sampleNo;
 
-    @ApiModelProperty(value = "设备样品名称（列表返回参数）", dataType = "String")
+    @ExcelProperty(value = "被检设备名称", order = 4)
+    @ApiModelProperty(value = "被检设备名称（列表返回参数）", dataType = "String")
     @TableField(exist = false)
     private String sampleName;
 
-    @ApiModelProperty(value = "设备样品规格型号（列表返回参数）", dataType = "String")
+    @ExcelProperty(value = "规格型号", order = 5)
+    @ApiModelProperty(value = "规格型号（列表返回参数）", dataType = "String")
     @TableField(exist = false)
     private String sampleModel;
 
+    @ExcelProperty(value = "检定员", order = 7)
     @ApiModelProperty(value = "检定员名字（列表返回参数）", dataType = "String")
     @TableField(exist = false)
     private String staffName;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessIdentifyInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessIdentifyInfo.java
index 46bfba5..f1a9bec 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessIdentifyInfo.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessIdentifyInfo.java
@@ -1,10 +1,15 @@
 package com.casic.missiles.model.business;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 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;
 
@@ -20,6 +25,11 @@
  * @author wangpeng
  * @since 2023-08-15
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @Data
 @TableName("biz_business_identify_info")
 public class BizBusinessIdentifyInfo implements Serializable {
@@ -33,6 +43,7 @@
     /**
      * 记录编号
      */
+    @ExcelProperty(value = "记录编号", order = 1)
     @ApiModelProperty(value = "记录编号", dataType = "String")
     @TableField("record_no")
     private String recordNo;
@@ -41,20 +52,15 @@
      * 标志类型(字典code)
      */
     @NotEmpty(message = "标志类型不能为空")
-    @ApiModelProperty(value = "标志类型(字典code)", dataType = "String")
-    @DictCodeField(message = "标志类型不合法", cacheName = MeterDictCode.IDENTIFY_PRINT_TYPE)
+    @ApiModelProperty(value = "标志类型(直接存计量标识/使用状态/校准状态的字典value)", dataType = "String")
     @TableField("identify_type")
     private String identifyType;
 
-    @ApiModelProperty(value = "标志类型(字典value)", dataType = "String")
-    @TableField(exist = false)
-    private String identifyTypeName;
-
     /**
      * 设备id(可以是受检设备/设备台账)
      */
     @NotNull(message = "设备id不能为空")
-    @ApiModelProperty(value = "设备id(可以是受检设备/设备台账)", dataType = "String")
+    @ApiModelProperty(value = "设备id(可以是受检设备/设备台账)", dataType = "Long")
     @TableField("device_id")
     private Long deviceId;
 
@@ -66,29 +72,32 @@
     @TableField("device_type")
     private String deviceType;
 
+    @ExcelProperty(value = "统一编号", order = 3)
     @NotEmpty(message = "设备编号不能为空")
-    @ApiModelProperty(value = "设备编号", dataType = "String")
+    @ApiModelProperty(value = "统一编号", dataType = "String")
     @TableField("device_no")
     private String deviceNo;
 
     /**
      * 设备名字
      */
-    @NotEmpty(message = "设备名字不能为空")
-    @ApiModelProperty(value = "设备名字", dataType = "String")
+    @ExcelProperty(value = "设备名称", order = 4)
+    @NotEmpty(message = "设备名称不能为空")
+    @ApiModelProperty(value = "设备名称", dataType = "String")
     @TableField("device_name")
     private String deviceName;
 
     /**
      * 检定员id
      */
-    @ApiModelProperty(value = "检定员id", dataType = "String")
+    @ApiModelProperty(value = "检定员id", dataType = "Long")
     @TableField("measure_person_id")
     private Long measurePersonId;
 
     /**
      * 检定员名字
      */
+    @ExcelProperty(value = "检定员", order = 5)
     @ApiModelProperty(value = "检定员名字", dataType = "String")
     @TableField("measure_person")
     private String measurePerson;
@@ -103,7 +112,8 @@
     /**
      * 更新时间
      */
-    @ApiModelProperty(value = "更新时间", dataType = "String")
+    @ExcelProperty(value = "打印时间", order = 6)
+    @ApiModelProperty(value = "打印时间", dataType = "String")
     @TableField("update_time")
     private String updateTime;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceAssess.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceAssess.java
index 659d9ca..6720b90 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceAssess.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceAssess.java
@@ -1,11 +1,26 @@
 package com.casic.missiles.model.business;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 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 com.casic.missiles.dto.BaseRequest;
+import com.casic.missiles.dto.business.outsource.OrderSampleDTO;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import javax.validation.constraints.NotEmpty;
 import java.io.Serializable;
+import java.util.List;
 
 /**
  * <p>
@@ -15,146 +30,231 @@
  * @author wangpeng
  * @since 2023-08-16
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
+@ApiModel
 @Data
 @TableName("biz_business_outsource_assess")
-public class BizBusinessOutsourceAssess implements Serializable {
+public class BizBusinessOutsourceAssess extends BaseRequest implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
+    @ApiModelProperty(value = "id，更新/删除使用参数", dataType = "Long")
     @TableId("id")
     private Long id;
 
     /**
      * 评审表编号
      */
+    @ExcelProperty(value = "评审表编号", order = 1)
+    @ApiModelProperty(value = "评审表编号(后台生成)", dataType = "String")
     @TableField("project_no")
     private String projectNo;
 
     /**
      * 评审表名称
      */
+    @ExcelProperty(value = "评审表名称", order = 2)
+    @ApiModelProperty(value = "评审表名称", dataType = "String")
     @TableField("project_name")
     private String projectName;
 
+    @NotEmpty(message = "实验室代码不能为空")
+    @DictCodeField(message = "实验室代码描述不合法", cacheName = MeterDictCode.LAB_CODE)
+    @ApiModelProperty(value = "实验室代码(字典code)", dataType = "String")
+    @TableField("lab_code")
+    private String labCode;
+
+    @ApiModelProperty(value = "实验室代码(字典value)", dataType = "String")
+    @TableField(exist = false)
+    private String labCodeName;
+
+    /**
+     * 组别代码
+     */
+    @NotEmpty(message = "组别代码不能为空")
+    @DictCodeField(message = "组别代码描述不合法", cacheName = MeterDictCode.GROUP_CODE)
+    @ApiModelProperty(value = "组别代码(字典code)", dataType = "String")
+    @TableField("group_code")
+    private String groupCode;
+
+    @ApiModelProperty(value = "组别代码(字典value)", dataType = "String")
+    @TableField(exist = false)
+    private String groupCodeName;
+
     /**
      * 申请人id
      */
+    @ApiModelProperty(value = "申请人id", dataType = "String")
     @TableField("applicant_id")
     private Long applicantId;
 
     /**
      * 申请人名字
      */
+    @ExcelProperty(value = "申请人", order = 5)
+    @ApiModelProperty(value = "申请人", dataType = "String")
     @TableField("applicant_name")
     private String applicantName;
 
     /**
      * 申请时间
      */
+    @ExcelProperty(value = "申请时间", order = 6)
+    @ApiModelProperty(value = "申请时间", dataType = "String")
     @TableField("applicant_time")
     private String applicantTime;
 
     /**
      * 附件(minio存储文件名)
      */
+    @ApiModelProperty(value = "附件(minio存储文件名)", dataType = "String")
     @TableField("minio_file_name")
     private String minioFileName;
 
     /**
      * 备注
      */
+    @ApiModelProperty(value = "备注", dataType = "String")
     @TableField("remark")
     private String remark;
 
     /**
      * 创建人id
      */
+    @ApiModelProperty(value = "创建人id", dataType = "String")
     @TableField("create_user_id")
     private Long createUserId;
 
     /**
      * 创建人名字
      */
+    @ApiModelProperty(value = "创建人名字", dataType = "String")
     @TableField("create_user_name")
     private String createUserName;
 
     /**
      * 分包方id
      */
+    @ApiModelProperty(value = "评审表编号", dataType = "String")
     @TableField("outsourcer_id")
     private Long outsourcerId;
 
     /**
      * 预计开始时间
      */
+    @ApiModelProperty(value = "预计开始时间", dataType = "String")
     @TableField("pre_start_time")
     private String preStartTime;
 
     /**
      * 预计结束时间
      */
+    @ApiModelProperty(value = "预计结束时间", dataType = "String")
     @TableField("pre_end_time")
     private String preEndTime;
 
     /**
      * 分包原因-字典
      */
+    @ApiModelProperty(value = "分包原因(字典code)", dataType = "String")
+    @DictCodeField(message = "分包原因描述不合法", cacheName = MeterDictCode.OUTSOURCE_REASON)
     @TableField("outsource_reason")
     private String outsourceReason;
 
+    @ApiModelProperty(value = "分包原因(字典value)", dataType = "String")
+    @TableField(exist = false)
+    private String outsourceReasonName;
+
     /**
      * 预计费用
      */
+    @ApiModelProperty(value = "预计费用", dataType = "String")
     @TableField("pre_cost")
     private String preCost;
 
     /**
      * 审批状态
      */
+    @ApiModelProperty(value = "审批状态", dataType = "String")
+    @DictCodeField(message = "审批状态描述不合法", cacheName = MeterDictCode.APPROVAL_STATUS)
     @TableField("approval_status")
     private String approvalStatus;
 
     /**
      * 流程实例id
      */
+    @ApiModelProperty(value = "流程实例id", dataType = "String")
     @TableField("process_id")
     private String processId;
 
     /**
      * 实验室认可情况
      */
+    @ApiModelProperty(value = "实验室认可情况", dataType = "String")
     @TableField("approve_situation")
     private String approveSituation;
 
     /**
      * 溯源性
      */
+    @ApiModelProperty(value = "溯源性", dataType = "String")
     @TableField("traceability")
     private String traceability;
 
     /**
      * 测试方法
      */
+    @ApiModelProperty(value = "测试方法", dataType = "String")
     @TableField("test_method")
     private String testMethod;
 
     /**
      * 技术能力
      */
+    @ApiModelProperty(value = "技术能力", dataType = "String")
     @TableField("technique_ability")
     private String techniqueAbility;
 
     /**
      * 创建时间
      */
+    @ApiModelProperty(hidden = true)
     @TableField("create_time")
     private String createTime;
 
     /**
      * 更新时间
      */
+    @ApiModelProperty(hidden = true)
     @TableField("update_time")
     private String updateTime;
 
+    @ApiModelProperty(value = "审批状态类型-字典value", dataType = "String")
+    @TableField(exist = false)
+    private String approvalStatusName;
 
+    @ApiModelProperty(value = "任务id（同意、驳回等操作使用）", dataType = "String")
+    @TableField(exist = false)
+    private String taskId;
+
+    @ApiModelProperty(value = "可选决策项（1同意驳回拒绝 2同意驳回 3同意拒绝，用于待审批列表同意/驳回/拒绝按钮展示）", dataType = "Integer")
+    @TableField(exist = false)
+    private Integer decisionItem;
+
+    @NotEmpty(message = "受检设备信息不能为空")
+    @ApiModelProperty(value = "受检设备id列表（新建使用参数）", dataType = "List")
+    @TableField(exist = false)
+    private List<OrderSampleDTO> orderSampleList;
+
+    @ExcelProperty(value = "分包机构名称", order = 3)
+    @ApiModelProperty(value = "分包机构名称（列表返回参数）", dataType = "String")
+    private String outsourcerName;
+
+    @ExcelProperty(value = "机构负责人", order = 4)
+    @ApiModelProperty(value = "机构负责人（列表返回参数）", dataType = "String")
+    private String director;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceProtocol.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceProtocol.java
new file mode 100644
index 0000000..38df697
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceProtocol.java
@@ -0,0 +1,225 @@
+package com.casic.missiles.model.business;
+
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
+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 com.casic.missiles.dto.BaseRequest;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotEmpty;
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 计量检定业务-分包管理-测试、校准或检定工作分包协议书
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-08-24
+ */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
+@Data
+@TableName("biz_business_outsource_protocol")
+public class BizBusinessOutsourceProtocol extends BaseRequest implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "id，更新/删除使用参数", dataType = "Long")
+    @TableId("id")
+    private Long id;
+
+    /**
+     * 协议书编号
+     */
+    @ExcelProperty(value = "协议书编号", order = 1)
+    @ApiModelProperty(value = "协议书编号(后台生成)", dataType = "String")
+    @TableField("protocol_no")
+    private String protocolNo;
+
+    /**
+     * 协议书名称
+     */
+    @ExcelProperty(value = "协议书名称", order = 2)
+    @ApiModelProperty(value = "协议书名称", dataType = "String")
+    @TableField("project_name")
+    private String projectName;
+
+    @NotEmpty(message = "实验室代码不能为空")
+    @DictCodeField(message = "实验室代码描述不合法", cacheName = MeterDictCode.LAB_CODE)
+    @ApiModelProperty(value = "实验室代码(字典code)", dataType = "String")
+    @TableField("lab_code")
+    private String labCode;
+
+    @ApiModelProperty(value = "实验室代码(字典value)", dataType = "String")
+    @TableField(exist = false)
+    private String labCodeName;
+
+    @NotEmpty(message = "组别代码不能为空")
+    @DictCodeField(message = "组别代码描述不合法", cacheName = MeterDictCode.GROUP_CODE)
+    @ApiModelProperty(value = "组别代码(字典code)", dataType = "String")
+    @TableField("group_code")
+    private String groupCode;
+
+    @ApiModelProperty(value = "组别代码(字典value)", dataType = "String")
+    @TableField(exist = false)
+    private String groupCodeName;
+
+    /**
+     * 分包方id
+     */
+    @ApiModelProperty(value = "分包方id", dataType = "Long")
+    @TableField("outsourcer_id")
+    private Long outsourcerId;
+
+    /**
+     * 其他
+     */
+    @ApiModelProperty(value = "其他", dataType = "String")
+    @TableField("remark")
+    private String remark;
+
+    /**
+     * 分包方编号
+     */
+    @ApiModelProperty(value = "分包方编号(新建不用传)", dataType = "String")
+    @TableField("outsource_no")
+    private String outsourceNo;
+
+    /**
+     * 分包方名称
+     */
+    @ExcelProperty(value = "分包方名称", order = 3)
+    @ApiModelProperty(value = "分包方名称(新建不用传)", dataType = "String")
+    @TableField("outsource_name")
+    private String outsourceName;
+
+    /**
+     * 联系人
+     */
+    @ExcelProperty(value = "联系人", order = 4)
+    @ApiModelProperty(value = "联系人", dataType = "String")
+    @TableField("contacts")
+    private String contacts;
+
+    /**
+     * 电话
+     */
+    @ApiModelProperty(value = "电话", dataType = "String")
+    @TableField("mobile")
+    private String mobile;
+
+    /**
+     * 地址
+     */
+    @ApiModelProperty(value = "地址", dataType = "String")
+    @TableField("address")
+    private String address;
+
+    /**
+     * 要求完成日期
+     */
+    @ApiModelProperty(value = "要求完成日期", dataType = "String")
+    @TableField("require_date")
+    private String requireDate;
+
+    /**
+     * 分包费用(元)
+     */
+    @ApiModelProperty(value = "分包费用(元)", dataType = "String")
+    @TableField("outsource_cost")
+    private Double outsourceCost;
+
+    /**
+     * 分包方负责人
+     */
+    @ApiModelProperty(value = "分包方负责人", dataType = "String")
+    @TableField("director")
+    private String director;
+
+    /**
+     * 分包项目
+     */
+    @ApiModelProperty(value = "分包项目", dataType = "String")
+    @TableField("item")
+    private String item;
+
+    /**
+     * 分包要求
+     */
+    @ApiModelProperty(value = "分包要求", dataType = "String")
+    @TableField("requires")
+    private String requires;
+
+    /**
+     * 创建人id
+     */
+    @ApiModelProperty(hidden = true)
+    @TableField("create_user_id")
+    private Long createUserId;
+
+    /**
+     * 创建人名字
+     */
+    @ExcelProperty(value = "申请人", order = 5)
+    @ApiModelProperty(value = "申请人", dataType = "String")
+    @TableField("create_user_name")
+    private String createUserName;
+
+    /**
+     * 审批状态
+     */
+    @ApiModelProperty(value = "审批状态", dataType = "String")
+    @DictCodeField(message = "审批状态描述不合法", cacheName = MeterDictCode.APPROVAL_STATUS)
+    @TableField("approval_status")
+    private String approvalStatus;
+
+    /**
+     * 流程实例id
+     */
+    @ApiModelProperty(value = "流程实例id", dataType = "String")
+    @TableField("process_id")
+    private String processId;
+
+    /**
+     * 创建时间
+     */
+    @ExcelProperty(value = "申请时间", order = 6)
+    @ApiModelProperty(value = "申请时间", dataType = "String")
+    @TableField("create_time")
+    private String createTime;
+
+    /**
+     * 更新时间
+     */
+    @ApiModelProperty(hidden = true)
+    @TableField("update_time")
+    private String updateTime;
+
+    @ApiModelProperty(value = "审批状态类型-字典value", dataType = "String")
+    @TableField(exist = false)
+    private String approvalStatusName;
+
+    @ApiModelProperty(value = "任务id（同意、驳回等操作使用）", dataType = "String")
+    @TableField(exist = false)
+    private String taskId;
+
+    @ApiModelProperty(value = "可选决策项（1同意驳回拒绝 2同意驳回 3同意拒绝，用于待审批列表同意/驳回/拒绝按钮展示）", dataType = "Integer")
+    @TableField(exist = false)
+    private Integer decisionItem;
+
+
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourcerInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourcerInfo.java
index ec4e997..f9aa69e 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourcerInfo.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourcerInfo.java
@@ -17,6 +17,7 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import javax.validation.constraints.NotEmpty;
 import java.io.Serializable;
 
 /**
@@ -59,6 +60,29 @@
     @TableField("outsourcer_name")
     private String outsourcerName;
 
+    @NotEmpty(message = "实验室代码不能为空")
+    @DictCodeField(message = "实验室代码描述不合法", cacheName = MeterDictCode.LAB_CODE)
+    @ApiModelProperty(value = "实验室代码(字典code)", dataType = "String")
+    @TableField("lab_code")
+    private String labCode;
+
+    @ApiModelProperty(value = "实验室代码(字典value)", dataType = "String")
+    @TableField(exist = false)
+    private String labCodeName;
+
+    /**
+     * 组别代码
+     */
+    @NotEmpty(message = "组别代码不能为空")
+    @DictCodeField(message = "组别代码描述不合法", cacheName = MeterDictCode.GROUP_CODE)
+    @ApiModelProperty(value = "组别代码(字典code)", dataType = "String")
+    @TableField("group_code")
+    private String groupCode;
+
+    @ApiModelProperty(value = "组别代码(字典value)", dataType = "String")
+    @TableField(exist = false)
+    private String groupCodeName;
+
     /**
      * 单位简称
      */
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardInfo.java
index c48eed7..dffdfdd 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardInfo.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardInfo.java
@@ -5,6 +5,7 @@
 import com.baomidou.mybatisplus.annotation.TableName;
 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;
 
@@ -18,6 +19,7 @@
  * @author wangpeng
  * @since 2023-08-04
  */
+@ApiModel
 @Data
 @TableName("biz_equipment_standard_info")
 public class BizEquipmentStandardInfo implements Serializable {
@@ -119,7 +121,7 @@
      * 管理状态(字典code)
      */
     @ApiModelProperty(value = "管理状态(字典code)", dataType = "String")
-    @DictCodeField(message = "管理状态不合法", cacheName = MeterDictCode.MANAGER_STATE)
+    @DictCodeField(message = "管理状态不合法", cacheName = MeterDictCode.STANDARD_MANAGER_STATE)
     @TableField("manage_status")
     private String manageStatus;
 
@@ -151,7 +153,7 @@
     /**
      * 温度(℃)
      */
-    @ApiModelProperty(value = "使用状态(字典code)", dataType = "String")
+    @ApiModelProperty(value = "温度(℃)", dataType = "String")
     @TableField("temperature")
     private Double temperature;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardInfoApproval.java b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardInfoApproval.java
index dbd86ab..9f58d83 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardInfoApproval.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardInfoApproval.java
@@ -150,7 +150,7 @@
      * 管理状态(字典code)
      */
     @ApiModelProperty(value = "管理状态(字典code)", dataType = "String")
-    @DictCodeField(message = "管理状态不合法", cacheName = MeterDictCode.MANAGER_STATE)
+    @DictCodeField(message = "管理状态不合法", cacheName = MeterDictCode.STANDARD_MANAGER_STATE)
     @TableField("manage_status")
     private String manageStatus;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardTechnologyRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardTechnologyRelation.java
index 0e612bd..751f26b 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardTechnologyRelation.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardTechnologyRelation.java
@@ -3,6 +3,7 @@
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -16,6 +17,7 @@
  * @author wangpeng
  * @since 2023-08-04
  */
+@ApiModel
 @Data
 @TableName("biz_equipment_standard_technology_relation")
 public class BizEquipmentStandardTechnologyRelation implements Serializable {
@@ -33,6 +35,10 @@
     @TableField("technology_file_id")
     private Long technologyFileId;
 
+    @ApiModelProperty(value = "依据的技术文件编号", dataType = "String")
+    @TableField("technology_file_no")
+    private String technologyFileNo;
+
     /**
      * 依据的技术文件名称(技术文件中现行测试校准检定方法表文件名字段)
      */
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerInfo.java
index d6e8bed..65cd6bc 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerInfo.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerInfo.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.model.resource;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -21,6 +28,11 @@
  * @author wangpeng
  * @since 2023-08-08
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @ApiModel
 @Data
 @TableName("biz_resource_customer_info")
@@ -35,6 +47,7 @@
     /**
      * 委托方编号
      */
+    @ExcelProperty(value = "委托方编号", order = 1)
     @ApiModelProperty(value = "委托方编号", dataType = "String")
     @TableField("customer_no")
     private String customerNo;
@@ -42,6 +55,7 @@
     /**
      * 委托方名称
      */
+    @ExcelProperty(value = "委托方名称", order = 2)
     @ApiModelProperty(value = "委托方名称(新建时为下拉选择一个受检单位组织的名字，传deptId字段，后端获取名称)", dataType = "String")
     @TableField("customer_name")
     private String customerName;
@@ -63,6 +77,7 @@
     /**
      * 联系人
      */
+    @ExcelProperty(value = "联系人", order = 3)
     @ApiModelProperty(value = "联系人", dataType = "String")
     @TableField("contacts")
     private String contacts;
@@ -70,6 +85,7 @@
     /**
      * 座机电话
      */
+    @ExcelProperty(value = "座机电话", order = 4)
     @ApiModelProperty(value = "座机电话", dataType = "String")
     @TableField("mobile")
     private String mobile;
@@ -77,6 +93,7 @@
     /**
      * 手机号码
      */
+    @ExcelProperty(value = "手机号码", order = 5)
     @ApiModelProperty(value = "手机号码", dataType = "String")
     @TableField("phone")
     private String phone;
@@ -91,6 +108,7 @@
     /**
      * 地址
      */
+    @ExcelProperty(value = "地址", order = 6)
     @ApiModelProperty(value = "地址", dataType = "String")
     @TableField("address")
     private String address;
@@ -141,6 +159,7 @@
     /**
      * 创建时间
      */
+    @ExcelProperty(value = "创建时间", order = 7)
     @ApiModelProperty(value = "创建时间", dataType = "String")
     @TableField("create_time")
     private String createTime;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerSuggestForm.java b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerSuggestForm.java
index 7201bbd..701bf8b 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerSuggestForm.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerSuggestForm.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.model.resource;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -22,6 +29,11 @@
  * @author wangpeng
  * @since 2023-08-08
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @ApiModel
 @Data
 @TableName("biz_resource_customer_suggest_form")
@@ -44,7 +56,8 @@
     /**
      * 委托方名称
      */
-    @ApiModelProperty(value = "委托方名称", dataType = "String")
+    @ExcelProperty(value = "意见反馈单位", order = 2)
+    @ApiModelProperty(value = "意见反馈单位", dataType = "String")
     @TableField("customer_name")
     private String customerName;
 
@@ -59,7 +72,8 @@
     /**
      * 委托方意见反馈部门名称
      */
-    @ApiModelProperty(value = "委托方意见反馈部门名称", dataType = "String")
+    @ExcelProperty(value = "委托方意见反馈部门", order = 3)
+    @ApiModelProperty(value = "委托方意见反馈部门", dataType = "String")
     @TableField("customer_dept_name")
     private String customerDeptName;
 
@@ -73,6 +87,7 @@
     /**
      * 表单编号
      */
+    @ExcelProperty(value = "表单编号", order = 1)
     @ApiModelProperty(value = "表单编号", dataType = "String")
     @TableField("form_no")
     private String formNo;
@@ -111,6 +126,7 @@
     /**
      * 创建人名字
      */
+    @ExcelProperty(value = "创建人", order = 4)
     @ApiModelProperty(value = "创建人名字", dataType = "String")
     @TableField("create_user_name")
     private String createUserName;
@@ -147,6 +163,7 @@
     /**
      * 创建时间
      */
+    @ExcelProperty(value = "创建时间", order = 5)
     @ApiModelProperty(value = "创建时间", dataType = "String")
     @TableField("create_time")
     private String createTime;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSealInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSealInfo.java
index cbf05d7..9bf389d 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSealInfo.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSealInfo.java
@@ -106,6 +106,10 @@
     @TableField("minio_file_name")
     private String minioFileName;
 
+    @ApiModelProperty(value = "minio存储文件url", dataType = "String")
+    @TableField(exist = false)
+    private String minioFileUrl;
+
     @ApiModelProperty(value = "创建时间", dataType = "String")
     @TableField("create_time")
     private String createTime;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSealUseNote.java b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSealUseNote.java
index 3f2d9e8..3ce16a8 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSealUseNote.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSealUseNote.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.model.resource;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -20,6 +27,11 @@
  * @author wangpeng
  * @since 2023-07-28
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @ApiModel
 @Data
 @TableName("biz_resource_seal_use_note")
@@ -34,6 +46,7 @@
     /**
      * 登记表编号
      */
+    @ExcelProperty(value = "申请单编号", order = 1)
     @ApiModelProperty(value = "登记表编号(自动生成)", dataType = "String")
     @TableField("note_form_no")
     private String noteFormNo;
@@ -55,6 +68,7 @@
     /**
      * 申请部门
      */
+    @ExcelProperty(value = "申请部门", order = 5)
     @ApiModelProperty(value = "申请部门", dataType = "String")
     @TableField("apply_dept_name")
     private String applyDeptName;
@@ -69,6 +83,7 @@
     /**
      * 申请人
      */
+    @ExcelProperty(value = "申请人", order = 6)
     @ApiModelProperty(value = "申请人", dataType = "String")
     @TableField("apply_user_name")
     private String applyUserName;
@@ -76,6 +91,7 @@
     /**
      * 申请时间
      */
+    @ExcelProperty(value = "申请时间", order = 7)
     @ApiModelProperty(value = "申请时间(新增自动获取当前时间)", dataType = "String")
     @TableField("apply_time")
     private String applyTime;
@@ -130,6 +146,26 @@
     @TableField("update_time")
     private String updateTime;
 
+    @ExcelProperty(value = "印章名称", order = 2)
+    @ApiModelProperty(value = "印章名称(列表返回参数)", dataType = "String")
+    @TableField(exist = false)
+    private String sealName;
+
+    @DictCodeField(message = "印章类型描述不合法", cacheName = MeterDictCode.SEAL_TYPE)
+    @ApiModelProperty(hidden = true)
+    @TableField(exist = false)
+    private String sealType;
+
+    @ExcelProperty(value = "印章类型", order = 3)
+    @ApiModelProperty(value = "印章类型(列表返回参数)", dataType = "String")
+    @TableField(exist = false)
+    private String sealTypeName;
+
+    @ExcelProperty(value = "批准人", order = 4)
+    @ApiModelProperty(value = "批准人(列表返回参数)", dataType = "String")
+    @TableField(exist = false)
+    private String approverName;
+
     @ApiModelProperty(value = "审批状态类型-字典value", dataType = "String")
     @TableField(exist = false)
     private String approvalStatusName;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceStaffInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceStaffInfo.java
index 5ef995b..41563a1 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceStaffInfo.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceStaffInfo.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.model.resource;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -20,6 +27,11 @@
  * @author wangpeng
  * @since 2023-07-25
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @ApiModel
 @Data
 @TableName("biz_resource_staff_info")
@@ -38,6 +50,7 @@
     /**
      * 人员编号
      */
+    @ExcelProperty(value = "人员编号",order = 0)
     @NotEmpty(message = "人员编号不能为空")
     @ApiModelProperty(value = "人员编号", dataType = "String")
     @TableField("staff_no")
@@ -46,6 +59,7 @@
     /**
      * 姓名
      */
+    @ExcelProperty(value = "姓名",order = 1)
     @ApiModelProperty(value = "姓名", dataType = "String")
     @TableField("staff_name")
     private String staffName;
@@ -152,13 +166,15 @@
     /**
      * 部门名字
      */
-    @ApiModelProperty(value = "部门名字", dataType = "String")
+    @ExcelProperty(value = "工作部门",order = 4)
+    @ApiModelProperty(value = "工作部门", dataType = "String")
     @TableField("dept_name")
     private String deptName;
 
     /**
      * 岗位
      */
+    @ExcelProperty(value = "岗位",order = 2)
     @ApiModelProperty(value = "岗位", dataType = "String")
     @TableField("station")
     private String station;
@@ -166,6 +182,7 @@
     /**
      * 计量专业
      */
+    @ExcelProperty(value = "计量专业",order = 5)
     @ApiModelProperty(value = "计量专业", dataType = "String")
     @TableField("major")
     private String major;
@@ -173,6 +190,7 @@
     /**
      * 证号
      */
+    @ExcelProperty(value = "证号",order = 3)
     @ApiModelProperty(value = "证号", dataType = "String")
     @TableField("certificate_number")
     private String certificateNumber;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSupplierInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSupplierInfo.java
index eb5ef01..a1e2697 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSupplierInfo.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSupplierInfo.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.model.resource;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -20,6 +27,11 @@
  * @author wangpeng
  * @since 2023-07-27
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @ApiModel
 @Data
 @TableName("biz_resource_supplier_info")
@@ -34,6 +46,7 @@
     /**
      * 供方编号
      */
+    @ExcelProperty(value = "供方编号", order = 1)
     @ApiModelProperty(value = "供方编号(自动生成)", dataType = "String")
     @TableField("supplier_no")
     private String supplierNo;
@@ -41,6 +54,7 @@
     /**
      * 供方名称
      */
+    @ExcelProperty(value = "供方名称", order = 2)
     @ApiModelProperty(value = "供方名称", dataType = "String")
     @TableField("supplier_name")
     private String supplierName;
@@ -60,6 +74,7 @@
     @TableField("supplier_type")
     private String supplierType;
 
+    @ExcelProperty(value = "供方类型", order = 3)
     @ApiModelProperty(value = "供方类型(字典value)", dataType = "String")
     @TableField(exist = false)
     private String supplierTypeName;
@@ -109,7 +124,8 @@
     /**
      * 电话
      */
-    @ApiModelProperty(value = "电话", dataType = "String")
+    @ExcelProperty(value = "联系电话", order = 4)
+    @ApiModelProperty(value = "联系电话", dataType = "String")
     @TableField("phone")
     private String phone;
 
@@ -158,6 +174,7 @@
     /**
      * 公司地址-省
      */
+    @ExcelProperty(value = "地址-省", order = 6)
     @ApiModelProperty(value = "公司地址-省", dataType = "String")
     @TableField("company_province_name")
     private String companyProvinceName;
@@ -172,6 +189,7 @@
     /**
      * 公司地址-市
      */
+    @ExcelProperty(value = "地址-市", order = 7)
     @ApiModelProperty(value = "公司地址-市", dataType = "String")
     @TableField("company_city_name")
     private String companyCityName;
@@ -186,6 +204,7 @@
     /**
      * 公司地址-区
      */
+    @ExcelProperty(value = "地址-区", order = 8)
     @ApiModelProperty(value = "公司地址-区", dataType = "String")
     @TableField("company_area_name")
     private String companyAreaName;
@@ -193,6 +212,7 @@
     /**
      * 公司地址-详细地址
      */
+    @ExcelProperty(value = "地址-详细地址", order = 9)
     @ApiModelProperty(value = "公司地址-详细地址", dataType = "String")
     @TableField("company_address")
     private String companyAddress;
@@ -200,6 +220,7 @@
     /**
      * 服务和供应的内容
      */
+    @ExcelProperty(value = "服务和供应的内容", order = 5)
     @ApiModelProperty(value = "服务和供应的内容", dataType = "String")
     @TableField("supplier_content")
     private String supplierContent;
@@ -250,6 +271,7 @@
     /**
      * 创建时间
      */
+    @ExcelProperty(value = "创建时间", order = 9)
     @ApiModelProperty(value = "创建时间", dataType = "String")
     @TableField("create_time")
     private String createTime;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/EnvLocationInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/EnvLocationInfo.java
new file mode 100644
index 0000000..d8e2d7b
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/EnvLocationInfo.java
@@ -0,0 +1,83 @@
+package com.casic.missiles.model.resource;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotEmpty;
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 实验室环境监控系统-设备表
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-06-07
+ */
+@ApiModel
+@Data
+@TableName("env_location_info")
+public class EnvLocationInfo implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "主键id", dataType = "Long")
+    @TableId("id")
+    private Long id;
+
+    /**
+     * 地点编号
+     */
+    @NotEmpty(message = "地点编号不能为空")
+    @ApiModelProperty(value = "地点编号", dataType = "String")
+    @TableField("location_no")
+    private String locationNo;
+
+    /**
+     * 地点名称
+     */
+    @ApiModelProperty(value = "地点名称", dataType = "String")
+    @TableField("location_name")
+    private String locationName;
+
+    /**
+     * 地点位置
+     */
+    @ApiModelProperty(value = "地点位置", dataType = "String")
+    @TableField("location_position")
+    private String locationPosition;
+
+    /**
+     * 创建人id
+     */
+    @ApiModelProperty(value = "创建人id", dataType = "Long")
+    @TableField("create_user_id")
+    private Long createUserId;
+
+    /**
+     * 创建人
+     */
+    @ApiModelProperty(value = "创建人", dataType = "String")
+    @TableField("create_user")
+    private String createUser;
+
+    /**
+     * 创建时间
+     */
+    @ApiModelProperty(value = "创建时间", dataType = "String")
+    @TableField("create_time")
+    private String createTime;
+
+    /**
+     * 更新时间
+     */
+    @ApiModelProperty(value = "更新时间", dataType = "String")
+    @TableField("update_time")
+    private String updateTime;
+
+
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemFileConfig.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemFileConfig.java
index 19e6845..86e569c 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemFileConfig.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemFileConfig.java
@@ -30,7 +30,7 @@
     @ApiModelProperty(value = "系统类别(1业务系统2受检系统3环境系统)", dataType = "Integer")
     @NotNull(message = "系统类别不能为空")
     @TableField("system_type")
-    private Integer systemType;
+    private Integer systemType = 1;
 
     @ApiModelProperty("下载编号")
     @TableField("download_no")
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemNotice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemNotice.java
index e94297d..06ec37d 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemNotice.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemNotice.java
@@ -34,7 +34,7 @@
     @ApiModelProperty(value = "系统类别(1业务系统2受检系统3环境系统)", dataType = "Integer")
     @NotNull(message = "系统类别不能为空")
     @TableField("system_type")
-    private Integer systemType;
+    private Integer systemType = 1;
 
     /**
      * 通知公告编号
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSign.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSign.java
index 6c0d7c9..954f4f8 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSign.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSign.java
@@ -51,7 +51,7 @@
     @ApiModelProperty(value = "系统类别(1业务系统2受检系统3环境系统)", dataType = "Integer")
     @NotNull(message = "系统类别不能为空")
     @TableField("system_type")
-    private Integer systemType;
+    private Integer systemType = 1;
 
     /**
      * 签名编号
@@ -130,4 +130,8 @@
     @TableField(exist = false)
     private List<Long> userIdList;
 
+    @ApiModelProperty(hidden = true)
+    @TableField(exist = false)
+    private String deptName;
+
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemTemplate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemTemplate.java
index 503a457..1d27ebe 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemTemplate.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemTemplate.java
@@ -47,7 +47,7 @@
     @ApiModelProperty(value = "系统类别(1业务系统2受检系统3环境系统)", dataType = "Integer")
     @NotNull(message = "系统类别不能为空")
     @TableField("system_type")
-    private Integer systemType;
+    private Integer systemType = 1;
 
     /**
      * 模板编号

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java
index bb0c50f..13a699b 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java
@@ -12,6 +12,7 @@
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.IGeneralApprovalService;
+import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
@@ -19,6 +20,7 @@
 import org.springframework.web.bind.annotation.RequestBody;
 
 import javax.validation.Valid;
+import java.util.List;
 import java.util.Objects;
 
 /**
@@ -117,4 +119,17 @@
         }
         return baseApprovalService.failUpdate(request);
     }
+
+    public List<O> exportList(@RequestBody @Valid R request) throws Exception {
+        List<O> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = baseApprovalService.listExportByIds(request.getIds());
+        } else {
+            list = baseApprovalService.listExport(request);
+        }
+        for (O record : list) {
+            DictCodeUtils.convertDictCodeToName(record);
+        }
+        return list;
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java
index 8a90961..d775831 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java
@@ -5,6 +5,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.business.certificate.CertificateChangeApplyApprovalListRequest;
 import com.casic.missiles.dto.business.certificate.CertificateChangeApplySaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessCertificateChangeApply;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
@@ -20,6 +21,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -48,4 +50,12 @@
         }
         return changeApplyService.saveChangeApply(request);
     }
+
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody CertificateChangeApplyApprovalListRequest request) throws Exception {
+        List<BizBusinessCertificateChangeApply> list = super.exportList(request);
+        super.exportExcel(BizBusinessCertificateChangeApply.class, list, ExportEnum.CERTIFICATE_CHANGE_APPLY.getSheetName());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java
index 5fc4b07..af8230e 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java
@@ -9,6 +9,7 @@
 import com.casic.missiles.dto.business.certificate.CertificatePrintApprovalListRequest;
 import com.casic.missiles.dto.business.certificate.CertificatePrintListResponse;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.enums.business.CertificatePrintStatusEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessCertificatePrintLog;
@@ -18,10 +19,16 @@
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.io.IOException;
+import java.util.List;
 import java.util.Objects;
 
 /**
@@ -98,4 +105,16 @@
         });
         return certificatePrintService.certificatePrintLog(idDTO.getId());
     }
+
+    @ApiOperation("证书打印审批导出")
+    @PostMapping("/listExport")
+    public void exportList(@RequestBody CertificatePrintApprovalListRequest request) throws IOException {
+        List<CertificatePrintListResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = certificatePrintService.listByIds(request.getIds());
+        } else {
+            list = certificatePrintService.list(request);
+        }
+        super.exportExcel(CertificatePrintListResponse.class, list, ExportEnum.CERTIFICATE_PRINT.getSheetName());
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java
index 63b06dc..6b2efd5 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java
@@ -6,6 +6,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.business.certificate.CertificateReportApprovalListRequest;
 import com.casic.missiles.dto.business.certificate.CertificateReportSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessCertificateReport;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
@@ -21,6 +22,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -50,7 +52,7 @@
         return certificateReportService.saveCertificateReport(request);
     }
 
-    @ApiOperation("证书审批详情（基本信息）")
+    @ApiOperation("详情（基本信息）")
     @PostMapping("/detail")
     public ReturnDTO<BizBusinessCertificateReport> detail(@RequestBody @Valid BaseDetailRequest request, BindingResult bindingResult) throws Exception {
         if(bindingResult.hasErrors()){
@@ -59,4 +61,11 @@
         return certificateReportService.detail(request);
     }
 
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody CertificateReportApprovalListRequest request) throws Exception {
+        List<BizBusinessCertificateReport> list = super.exportList(request);
+        super.exportExcel(BizBusinessCertificateReport.class, list, ExportEnum.CERTIFICATE_REPORT.getSheetName());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java
index 46b26bd..57c0809 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java
@@ -10,20 +10,21 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.business.identify.IdentifyListRequest;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessIdentifyInfo;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.business.IBizBusinessIdentifyInfoService;
+import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import javax.validation.Valid;
+import java.util.List;
 import java.util.Objects;
 
 /**
@@ -57,16 +58,13 @@
         return identifyInfoService.addIdentify(identifyInfo);
     }
 
-    @ApiOperation("标识打印更新")
+    @ApiOperation("标识打印更新（更新打印时间）")
     @PostMapping("/update")
-    public ReturnDTO updateIdentify(@RequestBody @Valid BizBusinessIdentifyInfo identifyInfo, BindingResult bindingResult) {
-        Assert.isFalse(Objects.isNull(identifyInfo.getId()), () -> {
+    public ReturnDTO updateIdentify(@RequestBody @Valid IdDTO idDTO) {
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        Assert.isFalse(bindingResult.hasErrors(), () -> {
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        });
-        return identifyInfoService.updateIdentify(identifyInfo);
+        return identifyInfoService.updateIdentify(idDTO.getId());
     }
 
     @ApiOperation("标识打印删除")
@@ -77,4 +75,37 @@
         });
         return identifyInfoService.deleteIdentify(idDTO.getId());
     }
+
+    @ApiOperation("标识打印导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody @Valid IdentifyListRequest request, BindingResult bindingResult) throws Exception {
+        if (bindingResult.hasErrors()) {
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        List<BizBusinessIdentifyInfo> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = identifyInfoService.listByIds(request.getIds());
+        } else {
+            list = identifyInfoService.list(request);
+        }
+        for (BizBusinessIdentifyInfo record : list) {
+            DictCodeUtils.convertDictCodeToName(record);
+        }
+        super.exportExcel(BizBusinessIdentifyInfo.class, list, ExportEnum.IDENTIFY_EXPORT.getSheetName());
+    }
+
+
+    // TODO: 2023/8/23 查询设备信息，4个底部按钮查设备（按钮的作用就是前端用来调不同接口、用来区分中间即将展示的标识），前端弹窗选设备，在确定保存时前端根据底部按钮判断传入设备类型deviceType字典code
+    // TODO: 2023/8/23 接口：查受检设备（第1个按钮），查设备台账（后3个按钮同一接口），查询之后前端根据标志类型的不同加到中间页面时进行判断（按产品给的对应表）
+    // TODO: 2023/8/23 提供二维码接口，前端在加到中间页面时调用一下
+
+    @ApiOperation("设备二维码")
+    @PostMapping("/equipment/qrCode")
+    public ReturnDTO<String> equipmentQrCode(@RequestBody @Valid IdDTO idDTO) {
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return identifyInfoService.equipmentQrCode(idDTO.getId());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java
index 707be6e..7e0453d 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java
@@ -117,7 +117,7 @@
     }
 
     @ApiOperation("任务单导出")
-    @PostMapping("/export")
+    @PostMapping("/listExport")
     public void orderExport(@RequestBody @Valid OrderListRequest request, HttpServletResponse response) {
         businessOrderService.orderExport(request, response);
     }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java
index 529a6ce..51432be 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java
@@ -1,9 +1,28 @@
 package com.casic.missiles.controller.business;
 
+import com.casic.missiles.controller.GeneralApprovalController;
+import com.casic.missiles.dto.BaseApprovalSubmitRequest;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.business.outsource.OutsourceAssessApprovalListRequest;
+import com.casic.missiles.dto.business.outsource.OutsourceAssessSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
+import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.model.business.BizBusinessOutsourceAssess;
+import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
+import com.casic.missiles.service.IGeneralApprovalService;
+import com.casic.missiles.service.business.IBizBusinessOutsourceAssessService;
 import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.BindingResult;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.validation.Valid;
+import java.util.List;
+
 /**
  * <p>
  * 计量检定业务-分包管理-测试、校准或检定工作分包评审表 前端控制器
@@ -15,6 +34,27 @@
 @Api(tags = "分包管理-测试、校准或检定工作分包评审表")
 @RestController
 @RequestMapping("/business/outsource/assess")
-public class BizBusinessOutsourceAssessController {
+public class BizBusinessOutsourceAssessController extends GeneralApprovalController<BizBusinessOutsourceAssess, BizBusinessOutsourceAssess, OutsourceAssessApprovalListRequest, BaseApprovalSubmitRequest> {
+    @Autowired
+    private IBizBusinessOutsourceAssessService outsourceAssessService;
 
+    public BizBusinessOutsourceAssessController(IGeneralApprovalService<BizBusinessOutsourceAssess, BizBusinessOutsourceAssess, OutsourceAssessApprovalListRequest, BaseApprovalSubmitRequest> baseApprovalService) {
+        super(baseApprovalService);
+    }
+
+    @ApiOperation("草稿箱-保存")
+    @PostMapping("/save")
+    public ReturnDTO<OutsourceAssessSaveResponse> saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceAssess request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        return outsourceAssessService.saveOutsourceAssess(request);
+    }
+
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception {
+        List<BizBusinessOutsourceAssess> list = super.exportList(request);
+        super.exportExcel(BizBusinessOutsourceAssess.class, list, ExportEnum.OUTSOURCE_ASSESS.getSheetName());
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java
new file mode 100644
index 0000000..9adef18
--- /dev/null
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java
@@ -0,0 +1,60 @@
+package com.casic.missiles.controller.business;
+
+import com.casic.missiles.controller.GeneralApprovalController;
+import com.casic.missiles.dto.BaseApprovalSubmitRequest;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.business.outsource.OutsourceProtocolApprovalListRequest;
+import com.casic.missiles.dto.business.outsource.OutsourceProtocolSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
+import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.model.business.BizBusinessOutsourceProtocol;
+import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
+import com.casic.missiles.service.IGeneralApprovalService;
+import com.casic.missiles.service.business.IBizBusinessOutsourceProtocolService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.BindingResult;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.validation.Valid;
+import java.util.List;
+
+/**
+ * <p>
+ * 计量检定业务-分包管理-测试、校准或检定工作分包协议书 前端控制器
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-08-24
+ */
+@Api(tags = "分包管理-测试、校准或检定工作分包协议书")
+@RestController
+@RequestMapping("/business/outsource/protocol")
+public class BizBusinessOutsourceProtocolController extends GeneralApprovalController<BizBusinessOutsourceProtocol, BizBusinessOutsourceProtocol, OutsourceProtocolApprovalListRequest, BaseApprovalSubmitRequest> {
+    @Autowired
+    private IBizBusinessOutsourceProtocolService outsourceProtocolService;
+
+    public BizBusinessOutsourceProtocolController(IGeneralApprovalService<BizBusinessOutsourceProtocol, BizBusinessOutsourceProtocol, OutsourceProtocolApprovalListRequest, BaseApprovalSubmitRequest> baseApprovalService) {
+        super(baseApprovalService);
+    }
+
+    @ApiOperation("草稿箱-保存")
+    @PostMapping("/save")
+    public ReturnDTO<OutsourceProtocolSaveResponse> saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceProtocol request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        return outsourceProtocolService.saveOutsourceProtocol(request);
+    }
+
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody OutsourceProtocolApprovalListRequest request) throws Exception {
+        List<BizBusinessOutsourceProtocol> list = super.exportList(request);
+        super.exportExcel(BizBusinessOutsourceProtocol.class, list, ExportEnum.OUTSOURCE_PROTOCOL.getSheetName());
+    }
+}
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java
index 097f645..f0f0943 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java
@@ -17,7 +17,6 @@
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.IGeneralApprovalService;
 import com.casic.missiles.service.business.IBizBusinessOutsourcerInfoService;
-import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -71,19 +70,8 @@
 
     @ApiOperation("分包方导出")
     @PostMapping("/listExport")
-    public void export(@RequestBody @Valid OutsourcerInfoApprovalListRequest request, BindingResult bindingResult) throws Exception {
-        if (bindingResult.hasErrors()) {
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        }
-        List<BizBusinessOutsourcerInfo> list;
-        if (!CollectionUtils.isEmpty(request.getIds())) {
-            list = outsourcerInfoService.listByIds(request.getIds());
-        } else {
-            list = outsourcerInfoService.list(request);
-        }
-        for (BizBusinessOutsourcerInfo record : list) {
-            DictCodeUtils.convertDictCodeToName(record);
-        }
+    public void export(@RequestBody OutsourcerInfoApprovalListRequest request) throws Exception {
+        List<BizBusinessOutsourcerInfo> list = super.exportList(request);
         super.exportExcel(BizBusinessOutsourcerInfo.class, list, ExportEnum.OUTSOURCER_EXPORT.getSheetName());
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java
index c2cbf9f..0410918 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java
@@ -17,11 +17,9 @@
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.IGeneralApprovalService;
 import com.casic.missiles.service.business.IBizBusinessSiteExecutiveInfoService;
-import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -60,7 +58,7 @@
         return siteExecutiveInfoService.saveSiteExecutiveInfo(siteExecutiveInfo);
     }
 
-    @ApiOperation("现场检测详情")
+    @ApiOperation("详情")
     @PostMapping("/detail")
     public ReturnDTO<SiteExecutiveDetailResponse> siteExecutiveDetail(@RequestBody @Valid IdDTO idDTO) throws Exception {
         Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
@@ -69,21 +67,10 @@
         return ReturnUtil.success(siteExecutiveInfoService.detail(idDTO.getId()));
     }
 
-    @ApiOperation("现场检测导出")
+    @ApiOperation("导出")
     @PostMapping("/listExport")
-    public void export(@RequestBody @Valid SiteExecutiveApprovalListRequest request, BindingResult bindingResult) throws Exception {
-        if (bindingResult.hasErrors()) {
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        }
-        List<SiteExecutiveApprovalListResponse> list;
-        if (!CollectionUtils.isEmpty(request.getIds())) {
-            list = siteExecutiveInfoService.listInfoByIds(request.getIds());
-        } else {
-            list = siteExecutiveInfoService.listInfo(request);
-        }
-        for (SiteExecutiveApprovalListResponse record : list) {
-            DictCodeUtils.convertDictCodeToName(record);
-        }
+    public void export(@RequestBody SiteExecutiveApprovalListRequest request) throws Exception {
+        List<SiteExecutiveApprovalListResponse> list = super.exportList(request);
         super.exportExcel(SiteExecutiveApprovalListResponse.class, list, ExportEnum.SITE_EXECUTIVE_EXPORT.getSheetName());
     }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
index 7e793cd..a92e209 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
@@ -55,7 +55,7 @@
 
     @ApiOperation("设备收发列表导出")
     @PostMapping("/export")
-    public void exportList(@RequestBody @Valid SampleDispatchListRequest request) throws IOException {
+    public void exportList(@RequestBody SampleDispatchListRequest request) throws IOException {
         List<SampleDispatchListResponse> list;
         if (!CollectionUtils.isEmpty(request.getIds())) {
             list = dispatchService.listByIds(request.getIds());
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java
index cdc77fc..d120fd4 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java
@@ -7,6 +7,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.business.labExecutive.*;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.business.IBusinessLabExecutiveInfoService;
@@ -14,6 +15,7 @@
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.*;
 
@@ -32,7 +34,7 @@
     @Autowired
     private IBusinessLabExecutiveInfoService labExecutiveInfoService;
 
-    @ApiOperation("实验室检测-部门检测-查询各状态列表（待检测、检测中、检测完）")
+    @ApiOperation("实验室任务-查询各状态列表（待检测、检测中、检测完）")
     @PostMapping("/deptExecutive/List")
     public ReturnDTO<PageInfoBT<SampleLabExecutiveListResponse>> queryDeptExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
@@ -43,10 +45,19 @@
         return ReturnUtil.success(super.packForBT(labExecutiveInfoService.deptLabExecutiveListPage(page, labExecutiveListRequest)));
     }
 
-    /**
-     * 实验室检测-我的检测-查询各状态列表（待检测、检测中、检测完）
-     */
-    @ApiOperation("实验室检测-我的检测-查询各状态列表（待检测、检测中、检测完）")
+    @ApiOperation("实验室任务导出")
+    @PostMapping("/deptExecutive/export")
+    public void deptExportList(@RequestBody @Valid SampleLabExecutiveListRequest request) throws Exception {
+        List<SampleLabExecutiveListResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = labExecutiveInfoService.deptLabExecutiveListByIds(request.getMeasureStatus(), request.getIds());
+        } else {
+            list = labExecutiveInfoService.deptLabExecutiveList(request);
+        }
+        super.exportExcel(SampleLabExecutiveListResponse.class, list, ExportEnum.DEPT_EXECUTIVE_TASK.getSheetName());
+    }
+
+    @ApiOperation("我的任务-查询各状态列表（待检测、检测中、检测完）")
     @PostMapping("/myExecutive/list")
     public ReturnDTO<PageInfoBT<SampleLabExecutiveListResponse>> queryMyExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
@@ -57,19 +68,25 @@
         return ReturnUtil.success(super.packForBT(labExecutiveInfoService.myLabExecutiveListPage(page, labExecutiveListRequest)));
     }
 
-    /**
-     * 实验室检测-我的检测-查询各状态样品数量（待检测、检测中、检测完）
-     */
-    @ApiOperation("实验室检测-我的检测-查询各状态样品数量（待检测、检测中、检测完）")
+    @ApiOperation("我的任务导出")
+    @PostMapping("/myExecutive/export")
+    public void exportList(@RequestBody @Valid SampleLabExecutiveListRequest request) throws Exception {
+        List<SampleLabExecutiveListResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = labExecutiveInfoService.myLabExecutiveListByIds(request.getMeasureStatus(), request.getIds());
+        } else {
+            list = labExecutiveInfoService.myLabExecutiveList(request);
+        }
+        super.exportExcel(SampleLabExecutiveListResponse.class, list, ExportEnum.MY_EXECUTIVE_TASK.getSheetName());
+    }
+
+    @ApiOperation("我的任务-查询各状态样品数量（待检测、检测中、检测完）")
     @GetMapping("/myExecutive/amount")
     public ReturnDTO<List<SampleAmountResponse>> queryMyExecutiveAmount() {
         return ReturnUtil.success(labExecutiveInfoService.myExecutiveAmount());
     }
 
-    /**
-     * 实验室检测-部门检测-分配（分配给具体人员）
-     */
-    @ApiOperation("实验室检测-部门检测-分配按钮（分配给具体人员）")
+    @ApiOperation("实验室任务-分配按钮（分配给具体人员）")
     @PostMapping("/deptExecutive/allocate")
     public ReturnDTO allocateStaff(@RequestBody @Valid SampleAllocateRequest sampleAllocateRequest, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -78,10 +95,7 @@
         return labExecutiveInfoService.allocateStaff(sampleAllocateRequest);
     }
 
-    /**
-     * 实验室检测-我的检测-检定人扫描收入（待检测->检测中）
-     */
-    @ApiOperation("实验室检测-我的检测-检定人扫描收入（待检测->检测中）")
+    @ApiOperation("我的任务-检定人扫描收入（待检测->检测中）")
     @PostMapping("/myExecutive/receive")
     public ReturnDTO sampleReceive(@RequestBody @Valid List<SampleOperateRequest> requestList, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -90,10 +104,7 @@
         return labExecutiveInfoService.sampleReceive(requestList);
     }
 
-    /**
-     * 实验室检测-负责人/检定人扫描检完（检测中->检测完）
-     */
-    @ApiOperation("实验室检测-负责人/检定人扫描检完（检测中->检测完）")
+    @ApiOperation("实验室任务-负责人/检定人扫描检完（检测中->检测完）")
     @PostMapping("/myExecutive/complete")
     public ReturnDTO sampleExecutiveComplete(@RequestBody @Valid List<SampleOperateRequest> requestList, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -102,10 +113,7 @@
         return labExecutiveInfoService.sampleExecutiveComplete(requestList);
     }
 
-    /**
-     * 实验室检测-部门检测/我的检测 编辑（只能修改应出具证书）
-     */
-    @ApiOperation("实验室检测-部门检测/我的检测 编辑（只能修改应出具证书）")
+    @ApiOperation("实验室任务/我的任务 编辑（只能修改应出具证书）")
     @PostMapping("/executive/update")
     public ReturnDTO updateExecutive(@RequestBody @Valid UpdateExecutiveRequest request, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -114,10 +122,7 @@
         return labExecutiveInfoService.updateExecutive(request);
     }
 
-    /**
-     * 实验室检测-部门检测/我的检测 详情
-     */
-    @ApiOperation("实验室检测-部门检测/我的检测 详情")
+    @ApiOperation("实验室任务/我的任务 详情")
     @PostMapping("/executive/detail")
     public ReturnDTO<ExecutiveDetailResponse> executiveDetail(@RequestBody @Valid ExecutiveDetailRequest request, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
@@ -131,7 +136,7 @@
      * 退回后会将下一个要执行的实验室检测状态更新为待分配，将后面的实验室顺序变更为连续（都进行减1）
      * 最后一个检测的实验室退回，等分发员再增加实验室或设备收发中的已收入直接手动点击完成
      */
-    @ApiOperation("实验室检测-部门检测/我的检测 退回（待检测/检测中->退回）")
+    @ApiOperation("实验室任务/我的任务 退回（待检测/检测中->退回）")
     @PostMapping("/executive/sendBack")
     public ReturnDTO executiveSendBack(@RequestBody @Valid ExecutiveSendBackRequest request, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -140,9 +145,6 @@
         return labExecutiveInfoService.sampleExecutiveSendBack(request);
     }
 
-    /**
-     * 分发员编辑实验室检测列表
-     */
     @ApiOperation("分发员编辑实验室检测列表")
     @PostMapping("/handOut/updateList")
     public ReturnDTO updateExecutiveList(@RequestBody @Valid UpdateExecutiveListRequest request, BindingResult bindingResult) {
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java
index 48a67ed..0c04f31 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java
@@ -10,6 +10,7 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.resource.customer.CustomerApprovalListRequest;
 import com.casic.missiles.dto.resource.customer.CustomerSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceCustomerInfo;
@@ -26,6 +27,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -55,6 +57,13 @@
         return customerInfoService.saveCustomerInfo(request);
     }
 
+    @ApiOperation("委托方名录导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody CustomerApprovalListRequest request) throws Exception {
+        List<BizResourceCustomerInfo> list = super.exportList(request);
+        super.exportExcel(BizResourceCustomerInfo.class, list, ExportEnum.CUSTOMER_INFO.getSheetName());
+    }
+
     @ApiOperation("委托方人员列表（分页）")
     @PostMapping("/person/listPage")
     public ReturnDTO<PageInfoBT<BizResourceCustomerStaff>> personListPage(@RequestBody IdDTO idDto) {
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
index 972ed4b..6418ea5 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
@@ -5,6 +5,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.resource.customer.SuggestFormApprovalListRequest;
 import com.casic.missiles.dto.resource.customer.SuggestFormSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceCustomerSuggestForm;
@@ -20,6 +21,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -50,4 +52,11 @@
         return suggestFormService.saveSuggestForm(request);
     }
 
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody SuggestFormApprovalListRequest request) throws Exception {
+        List<BizResourceCustomerSuggestForm> list = super.exportList(request);
+        super.exportExcel(BizResourceCustomerSuggestForm.class, list, ExportEnum.CUSTOMER_SUGGEST_FORM.getSheetName());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java
index 1934d1a..9e07eab 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java
@@ -15,12 +15,16 @@
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.resource.IEnvEnvironmentRecordConfigService;
 import com.casic.missiles.service.resource.IEnvEnvironmentRecordDataService;
+import com.casic.missiles.service.resource.IEnvLocationInfoService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
 import java.util.List;
@@ -39,6 +43,8 @@
     private IEnvEnvironmentRecordDataService environmentRecordDataService;
     @Autowired
     private IEnvEnvironmentRecordConfigService environmentRecordConfigService;
+    @Autowired
+    private IEnvLocationInfoService locationInfoService;
 
     @ApiOperation("环境记录单数据列表/详情")
     @PostMapping("/data/listPage")
@@ -95,4 +101,11 @@
         });
         return environmentRecordConfigService.deleteEnvironmentRecordConfig(idDTO.getId());
     }
+
+    @ApiOperation("地点列表")
+    @PostMapping("/location/listPage")
+    public ReturnDTO<PageInfoBT<LocationListResponse>> locationListPage(@RequestBody @Valid LocationListRequest request) {
+        Page<LocationListResponse> page = PageFactory.defaultPage();
+        return ReturnUtil.success(super.packForBT(locationInfoService.listPage(page, request)));
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java
index 82efe3f..e9561fa 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java
@@ -10,6 +10,7 @@
 import com.casic.missiles.dto.resource.seal.SealLogListRequest;
 import com.casic.missiles.dto.resource.seal.SealNoteApprovalListRequest;
 import com.casic.missiles.dto.resource.seal.SealNoteSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceSealUseLog;
@@ -27,6 +28,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -58,6 +60,13 @@
         return sealUseNoteService.saveSeal(request);
     }
 
+    @ApiOperation("印章使用登记导出（列表和导出中去掉经办人和监印人）")
+    @PostMapping("/listExport")
+    public void export(@RequestBody SealNoteApprovalListRequest request) throws Exception {
+        List<BizResourceSealUseNote> list = super.exportList(request);
+        super.exportExcel(BizResourceSealUseNote.class, list, ExportEnum.SEAL_NOTE.getSheetName());
+    }
+
     // TODO: 2023/7/28 印章使用日志：系统中使用印章时插入数据库
 
     @ApiOperation("印章使用日志列表（分页）")
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java
index 9b674fc..06b6521 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java
@@ -9,16 +9,20 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.resource.staff.StaffCertRequest;
 import com.casic.missiles.dto.resource.staff.StaffCertResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.service.resource.IBizResourceStaffInfoService;
 import com.casic.missiles.service.resource.IBizResourceStaffVerifierService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.List;
+
 /**
  * @Description:
  * @Author: wangpeng
@@ -41,9 +45,21 @@
         return ReturnUtil.success(super.packForBT(responsePage));
     }
 
+    @ApiOperation("证书逾期提醒导出")
+    @PostMapping("/listExport")
+    public void exportList(@RequestBody StaffCertRequest request) throws Exception {
+        List<StaffCertResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = staffInfoService.certListByIds(request.getIds());
+        } else {
+            list = staffInfoService.certList(request);
+        }
+        super.exportExcel(StaffCertResponse.class, list, ExportEnum.STAFF_CERTIFICATE_EXPIRE.getSheetName());
+    }
+
     @ApiOperation("证书逾期提醒")
     @PostMapping("/expirationReminder")
-    public ReturnDTO expirationReminder(@RequestBody IdDTO idDto) {
-        return verifierService.expirationReminder(idDto);
+    public ReturnDTO expirationReminder(@RequestBody IdDTO idDTO) {
+        return verifierService.expirationReminder(idDTO);
     }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java
index 3b251ad..a6e7850 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java
@@ -12,6 +12,7 @@
 import com.casic.missiles.dto.resource.staff.StaffListRequest;
 import com.casic.missiles.dto.resource.staff.TrainListRequest;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.*;
@@ -22,7 +23,10 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
 import java.util.List;
@@ -52,8 +56,19 @@
             throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
         }
         Page<BizResourceStaffInfo> page = PageFactory.defaultPage();
-        Page<BizResourceStaffInfo> responsePage = staffInfoService.listPage(page, request);
-        return ReturnUtil.success(super.packForBT(responsePage));
+        return ReturnUtil.success(super.packForBT(staffInfoService.listPage(page, request)));
+    }
+
+    @ApiOperation("人员登记导出")
+    @PostMapping("/listExport")
+    public void exportList(@RequestBody StaffListRequest request) throws Exception {
+        List<BizResourceStaffInfo> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = staffInfoService.listByIds(request.getIds());
+        } else {
+            list = staffInfoService.list(request);
+        }
+        super.exportExcel(BizResourceStaffInfo.class, list, ExportEnum.STAFF_INFO.getSheetName());
     }
 
     @ApiOperation("人员登记详情基础信息")
@@ -85,9 +100,9 @@
 
     @ApiOperation("科研教育列表（分页）")
     @PostMapping("/education/listPage")
-    public ReturnDTO<PageInfoBT<BizResourceStaffEducation>> educationListPage(@RequestBody IdDTO idDto) {
+    public ReturnDTO<PageInfoBT<BizResourceStaffEducation>> educationListPage(@RequestBody IdDTO idDTO) {
         Page<BizResourceStaffEducation> page = PageFactory.defaultPage();
-        Page<BizResourceStaffEducation> responsePage = staffInfoService.educationListPage(page, idDto);
+        Page<BizResourceStaffEducation> responsePage = staffInfoService.educationListPage(page, idDTO);
         return ReturnUtil.success(super.packForBT(responsePage));
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java
index af6aa86..d85d84a 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java
@@ -9,6 +9,7 @@
 import com.casic.missiles.dto.resource.outsideService.SupplierApprovalListRequest;
 import com.casic.missiles.dto.resource.outsideService.SupplierSaveResponse;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceSupplierAbility;
@@ -67,6 +68,13 @@
         return ReturnUtil.success(supplierInfoService.detail(idDTO.getId()));
     }
 
+    @ApiOperation("合格供方导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody SupplierApprovalListRequest request) throws Exception {
+        List<BizResourceSupplierInfo> list = super.exportList(request);
+        super.exportExcel(BizResourceSupplierInfo.class, list, ExportEnum.SUPPLIER_INFO.getSheetName());
+    }
+
     @ApiOperation("供方人员列表（分页）")
     @PostMapping("/person/listPage")
     public ReturnDTO<PageInfoBT<BizResourceSupplierPerson>> personListPage(@RequestBody IdDTO idDTO) {
diff --git a/casic-metering-api/src/main/resources/config/application.yml b/casic-metering-api/src/main/resources/config/application.yml
index 350db5f..ecff521 100644
--- a/casic-metering-api/src/main/resources/config/application.yml
+++ b/casic-metering-api/src/main/resources/config/application.yml
@@ -126,7 +126,7 @@
     #作者
     author: wangpeng
     #待生成对象表名
-    table-name: biz_equipment_technical_target_approval,biz_equipment_attachment_approval,biz_equipment_checkpoint_approval
+    table-name: biz_business_outsource_protocol
 
 reminder:
   #节点--common模块config包 ReminderNodeConfig配置
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
index 4a19e4e..d47d552 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
@@ -53,6 +53,7 @@
     SUGGEST_FORM_SAVE_FAILED(2509, "委托方意见登记表保存至草稿箱失败"),
     EXAMINE_FORM_SAVE_FAILED(2510, "要求、委托书及合同评审表保存至草稿箱失败"),
     CUSTOMER_EXIST_SAVE_FAILED(2511, "该委托方已存在，请重新选择"),
+    DUPLICATE_LOCATION_NO(2512, "地点编号已存在"),
 
     /**
      * 计量检定业务模块
@@ -68,6 +69,8 @@
     COMPLETE_SAMPLE_NOT_EXIST(2609, "检测中不存在扫描收入的样品"),
     CANNOT_CHANGE_MEASURE_INFO(2610, "无法更改非当前登录用户的检测信息"),
     NON_EXIST_ORDER_OR_SAMPLE(2611, "不存在该委托单或该委托单下的样品"),
+    OUTSOURCE_ACCESS_SAVE_FAILED(2612, "测试、校准或检定工作分包评审表保存至草稿箱失败"),
+    OUTSOURCE_PROTOCOL_SAVE_FAILED(2613, "测试、校准或检定工作分包协议书保存至草稿箱失败"),
 
     /**
      * 历史遗留备用
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
index 5089ad1..81a406b 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
@@ -10,54 +10,38 @@
     /**
      * 资源管理
      */
-    ENVIRONMENT_DATA_EXPORT("environmentData", "environmentData", "环境记录单数据"),
+    ENVIRONMENT_DATA_EXPORT("environmentData", "环境记录单数据", "环境记录单数据"),
+    STAFF_INFO("staffInfo", "人员登记", "人员登记"),
+    STAFF_CERTIFICATE_EXPIRE("certificateExpire", "证书逾期提醒", "证书逾期提醒"),
+    SUPPLIER_INFO("supplierInfo", "合格供方名录", "合格供方名录"),
+    CUSTOMER_INFO("customerInfo", "委托方名录", "委托方名录"),
+    CUSTOMER_SUGGEST_FORM("customerSuggestForm", "委托方意见登记表", "委托方意见登记表"),
+    SEAL_NOTE("sealNote", "印章使用登记", "印章使用登记"),
 
-    FILE_EXPORT("meterFileData", "meterFileData", "计量文件信息"),
-    TRAIN_PLAN_EXPORT("trainPlanData", "trainPlanData", "培训计划"),
-    TRAIN_LOG_EXPORT("trainLogData", "trainLogData", "培训记录"),
-    METER_ORGANIZE_EXPORT("meterOrganizeData", "meterOrganizeData", "计量组织"),
-    TRACE_SUPPLIER_EXPORT("traceSupplierData", "traceSupplierData", "溯源供方"),
-    SIGN_EXPORT("signData", "signData", "签名/签章"),
-    TEMPLATE_EXPORT("templateData", "templateData", "原始记录模板/证书报告模板"),
-    FIXED_ASSETS("meterFixedAssets", "meterFixedAssets", "固定资产"),
-    METER_EQUIPMENT("meterEquipment", "meterEquipment", "测量设备"),
-    CALIBRATION_TEST_EQUIPMENT("calibrationTestEquipment", "calibrationTestEquipment", "校准检定设备"),
-    MEASURE_ACCOUNT("measureAccount", "measureAccount", "测量工装"),
-    STANDARD_SUPPORT_EQUIPMENT("standardSupportEquipment", "standardSupportEquipment", "标准配套设备"),
-    STANDARD_EQUIPMENT("standardEquipment", "standardEquipment", "标准装置"),
-    FLOW_DEF_EXPORT("flowDefData", "flowDefData", "流程定义"),
-    STAFF_CERTIFICATE("certificate", "certificate", "计量人员证书"),
-    CHECK_INFO("checkInfo", "checkInfo", "设备管理点检测"),
-    EQUIPMENT_APPLY("equipmentApply", "equipmentApply", "设备借用"),
-    STANDARD_EQUIPMENT_REMIND("equipmentApplyRemind", "equipmentApplyRemind", "标准装置到期提醒"),
-    METER_PRICE("meterPrice", "meterPrice", "价格库"),
-    METER_STAFF("meterStaff", "meterStaff", "计量人员"),
-    STANDARD_EQUIPMENT_APPLY("standardEquipmentApply", "standardEquipmentApply", "标准装置申请"),
-    STATE_MANAGE_APPLY("stateManage", "stateManage", "状态管理"),
-    METER_ACCEPTANCE_CHECK("acceptanceCheck", "acceptanceCheck", "设备检修保养验收单"),
-    CUSTOMER_EXPORT("customerData", "customerData", "客户信息"),
-    ORDER_EXPORT("orderData", "orderData", "委托书信息"),
-    SAMPLE_EXPORT("sampleData", "sampleData", "样本信息"),
-    EXCHANGE_DATA("exchangeData", "exchangeData", "设备交接单"),
-    DISPATCH_DATA("dispatchData", "dispatchData", "设备收发"),
-    ENVIRONMENT_DATA("environmentData", "environmentData", "环境记录单"),
-    ORIGIN_DATA("originData", "originData", "原始记录"),
-    CERTIFICATE_REPORT("certificateReport", "certificateReport", "证书报告"),
-    ADVICE_EXPORT("adviceData", "adviceData", "客户反馈"),
-    HANDOUT_EXPORT("handoutData", "handoutData", "任务分发列表"),
-    OUTSOURCER_EXPORT("outsourcerData", "outsourcerData", "分包方"),
-    SITE_EXECUTIVE_EXPORT("siteExecutiveData", "siteExecutiveData", "现场测试、校准或检定"),
-    CERTIFICATE_PRINT_EXPORT("certificatePrintData", "certificatePrintData", "证书打印"),
-    DOWNLOAD_TEMPLATE("downloadTemplate", "downloadTemplate", "页面配置"),
-    OUTSOURCER_CERTIFICATE_EXPORT("outsourceCertificateData", "outsourceCertificateData", "分包证书"),
-    SETTLEMENT_INFO_EXPORT("settlementInfoData", "settlementInfoData", "业务结算"),
-    EQUIPMENT_REMIND("equipmentRemind", "equipmentRemind", "设备到期提醒"),
-    AGREEMENT_INFO_EXPORT("agreementInfoData", "agreementInfoData", "合同"),
-    WORK_STATISTICS_EXPORT("workStatisticsData", "workStatisticsData", "实时工作统计"),
-    DEPT_OUTPUT_EXPORT("deptOutputData", "deptOutputData", "部门产值分析"),
-    WORKLOAD_EXPORT("workloadData", "workloadData", "业务工作量分析"),
-    DEPT_COMPREHENSIVE_EXPORT("deptComprehensiveData", "deptComprehensiveData", "部门综合分析"),
-    ENVIRONMENTAL_RECORD("environmentalRecordData", "environmentalRecordData", "现场环境记录");
+    /**
+     * 计量检定业务
+     */
+    OUTSOURCER_EXPORT("outsourcerData", "分包方名录", "分包方名录"),
+    IDENTIFY_EXPORT("identifyData", "计量标识", "计量标识"),
+    ORDER_EXPORT("orderData", "任务单", "任务单"),
+    DISPATCH_DATA("dispatchData", "设备收发", "设备收发"),
+    HANDOUT_EXPORT("handoutData", "任务分发", "任务分发"),
+    SITE_EXECUTIVE_EXPORT("siteExecutiveData", "现场测试、校准或检定", "现场测试、校准或检定"),
+    CERTIFICATE_REPORT("certificateReport", "证书审批", "证书审批"),
+    CERTIFICATE_CHANGE_APPLY("certificateChangeApply", "证书报告补充或更换申请单", "证书报告补充或更换申请单"),
+    CERTIFICATE_PRINT("certificatePrintData", "证书打印审批", "证书打印审批"),
+    DEPT_EXECUTIVE_TASK("deptExecutiveTaskData", "实验室任务", "实验室任务"),
+    MY_EXECUTIVE_TASK("myExecutiveTaskData", "我的任务", "我的任务"),
+    OUTSOURCE_ASSESS("outsourceAssess", "测试、校准或检定工作分包评审表", "测试、校准或检定工作分包评审表"),
+    OUTSOURCE_PROTOCOL("outsourceProtocol", "测试、校准或检定工作分包协议书", "测试、校准或检定工作分包协议书"),
+
+    /**
+     * 系统管理
+     */
+    SIGN_EXPORT("signData", "签名", "签名"),
+    TEMPLATE_EXPORT("templateData", "文件模板", "文件模板"),
+    FLOW_DEF_EXPORT("flowDefData", "流程定义", "流程定义"),
+    DOWNLOAD_TEMPLATE("downloadTemplate", "流程定义", "页面配置");
 
     ExportEnum(String fileName, String sheetName, String description) {
         this.fileName = fileName;
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateRecordTypeCodeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateRecordTypeCodeEnum.java
index 31d913c..a963522 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateRecordTypeCodeEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateRecordTypeCodeEnum.java
@@ -46,4 +46,14 @@
     String SITE_EXECUTIVE_APPROVAL = "01";
     //《现场测试、校准或检定工作记录表》
     String SITE_EXECUTIVE_LOG = "02";
+
+    //测试、校准或检定工作分包协议书
+    String OUTSOURCE_PROTOCOL = "01";
+    //测试、校准或检定工作分包评审表
+    String OUTSOURCE_ACCESS = "02";
+    //测试、校准或检定工作分包通知书
+    String OUTSOURCE_NOTICE = "03";
+    //测试、校准或检定工作分包方名录
+    String OUTSOURCE_INFO = "04";
+
 }
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
index 24b8635..f78bd53 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
@@ -15,6 +15,10 @@
     String CERTIFICATE_CHANGE_APPLY_BEAN_NAME = "certificateChangeApplyBean";
     //现场测试、校准或检定
     String SITE_EXECUTIVE_BEAN_NAME = "siteExecutiveBean";
+    //测试、校准或检定工作分包评审表
+    String OUTSOURCE_ASSESS_BEAN_NAME = "outsourceAssessBean";
+    //测试、校准或检定工作分包协议书
+    String OUTSOURCE_PROTOCOL_BEAN_NAME = "outsourceProtocolBean";
 
     /*********************************设备与装置************************************/
     //设备台账
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 b21c661..6b86fd1 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
@@ -18,6 +18,8 @@
     OUTSOURCER_APPROVAL(OUTSOURCER_BEAN_NAME, ""),
     CERTIFICATE_CHANGE_APPROVAL(CERTIFICATE_CHANGE_APPLY_BEAN_NAME, ""),
     SITE_EXECUTIVE_APPROVAL(SITE_EXECUTIVE_BEAN_NAME, ""),
+    OUTSOURCE_ASSESS_APPROVAL(OUTSOURCE_ASSESS_BEAN_NAME, ""),
+    OUTSOURCE_PROTOCOL_APPROVAL(OUTSOURCE_PROTOCOL_BEAN_NAME, ""),
 
     ACTION_STATUS_MAP(new HashMap<String, AwareActionStatusEnum>() {
         {
@@ -47,6 +49,10 @@
             put(ApplyFromIdEnum.CERTIFICATE_CHANGE_APPROVAL.getCode(), CERTIFICATE_CHANGE_APPROVAL);
             //现场测试、校准或检定审批
             put(ApplyFromIdEnum.SITE_EXECUTIVE_APPROVAL.getCode(), SITE_EXECUTIVE_APPROVAL);
+            //测试、校准或检定工作分包评审表
+            put(ApplyFromIdEnum.OUTSOURCE_ASSESS_APPROVAL.getCode(), OUTSOURCE_ASSESS_APPROVAL);
+            //测试、校准或检定工作分包协议书
+            put(ApplyFromIdEnum.OUTSOURCE_PROTOCOL_APPROVAL.getCode(), OUTSOURCE_PROTOCOL_APPROVAL);
         }
     });
     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 934405e..c7410bd 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
@@ -9,6 +9,8 @@
     CERTIFICATE_CHANGE_APPROVAL("jljdywzsbchghsqd", MessageSourceModuleEnum.BUSINESS.getCode(), "证书/报告补充或更换申请单"),
     OUTSOURCER_APPROVAL("jljdywcsjzhgfbfml", MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定合格分包方名录"),
     SITE_EXECUTIVE_APPROVAL("jljdywxccsjzsp", MessageSourceModuleEnum.BUSINESS.getCode(), "现场测试、校准或检定审批"),
+    OUTSOURCE_ASSESS_APPROVAL("jljdywcsjzfbpsb", MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包评审表"),
+    OUTSOURCE_PROTOCOL_APPROVAL("jljdywcsjzfbxys", MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包协议书"),
 
 
     /*******************************************设备与装置*********************************************/
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/GeneralApprovalMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/GeneralApprovalMapper.java
index 4fb7344..0c9d6ae 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/GeneralApprovalMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/GeneralApprovalMapper.java
@@ -17,8 +17,4 @@
 
     Page<O> selectBatchForApprovalList(Page<O> page, @Param("request") R request, @Param("businessKeys") List<String> businessKeys);
 
-//    Page<O> selectListPage(Page<O> page, @Param("request") R request);
-
-//    Long selectMaxNo();
-
 }
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceAssessMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceAssessMapper.java
index 7867bb8..ba59009 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceAssessMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceAssessMapper.java
@@ -1,7 +1,12 @@
 package com.casic.missiles.mapper.business;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.business.outsource.OutsourceAssessApprovalListRequest;
+import com.casic.missiles.mapper.GeneralApprovalMapper;
 import com.casic.missiles.model.business.BizBusinessOutsourceAssess;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * <p>
@@ -11,6 +16,10 @@
  * @author wangpeng
  * @since 2023-08-16
  */
-public interface BizBusinessOutsourceAssessMapper extends BaseMapper<BizBusinessOutsourceAssess> {
+public interface BizBusinessOutsourceAssessMapper extends GeneralApprovalMapper<BizBusinessOutsourceAssess, BizBusinessOutsourceAssess, OutsourceAssessApprovalListRequest> {
+
+    Page<BizBusinessOutsourceAssess> selectBatchForApprovalList(Page<BizBusinessOutsourceAssess> page, @Param("request") OutsourceAssessApprovalListRequest request, @Param("businessKeys") List<String> businessKeys);
+
+    Long selectMaxProjectNo();
 
 }
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceProtocolMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceProtocolMapper.java
new file mode 100644
index 0000000..e6aba35
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceProtocolMapper.java
@@ -0,0 +1,24 @@
+package com.casic.missiles.mapper.business;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.business.outsource.OutsourceProtocolApprovalListRequest;
+import com.casic.missiles.mapper.GeneralApprovalMapper;
+import com.casic.missiles.model.business.BizBusinessOutsourceProtocol;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 计量检定业务-分包管理-测试、校准或检定工作分包协议书 Mapper 接口
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-08-24
+ */
+public interface BizBusinessOutsourceProtocolMapper extends GeneralApprovalMapper<BizBusinessOutsourceProtocol, BizBusinessOutsourceProtocol, OutsourceProtocolApprovalListRequest> {
+
+    Page<BizBusinessOutsourceProtocol> selectBatchForApprovalList(Page<BizBusinessOutsourceProtocol> page, @Param("request") OutsourceProtocolApprovalListRequest request, @Param("businessKeys") List<String> businessKeys);
+
+    Long selectMaxProtocolNo();
+}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/EnvLocationInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/EnvLocationInfoMapper.java
new file mode 100644
index 0000000..49eff87
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/EnvLocationInfoMapper.java
@@ -0,0 +1,21 @@
+package com.casic.missiles.mapper.resource;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.resource.environment.LocationListRequest;
+import com.casic.missiles.dto.resource.environment.LocationListResponse;
+import com.casic.missiles.model.resource.EnvLocationInfo;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * <p>
+ * 实验室环境监控系统-设备表 Mapper 接口
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-06-07
+ */
+public interface EnvLocationInfoMapper extends BaseMapper<EnvLocationInfo> {
+
+    Page<LocationListResponse> selectLocationListPage(Page<LocationListResponse> page, @Param("request") LocationListRequest request);
+}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java
index de124db..85ed0f7 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java
@@ -1,7 +1,9 @@
 package com.casic.missiles.mapper.system;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.dto.system.SignDetailResponse;
+import com.casic.missiles.dto.system.SignListRequest;
 import com.casic.missiles.model.system.SystemSign;
 import org.apache.ibatis.annotations.Param;
 
@@ -22,4 +24,8 @@
     SignDetailResponse selectSignDetailById(Long id);
 
     List<SystemSign> selectUsableSignList(@Param("userId") Long userId);
+
+    Page<SystemSign> selectSignListPage(Page<SystemSign> page, @Param("request") SignListRequest request);
+
+    List<SystemSign> selectSignList(@Param("request") SignListRequest request);
 }
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateChangeApplyMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateChangeApplyMapper.xml
index d798447..c496092 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateChangeApplyMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateChangeApplyMapper.xml
@@ -30,31 +30,31 @@
         SELECT *
         FROM biz_business_certificate_change_apply
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.changeApplyNo != null and request.changeApplyNo !=''">
+        <if test="request != null and request.changeApplyNo != null and request.changeApplyNo !=''">
             and change_apply_no like concat('%',#{request.changeApplyNo},'%')
         </if>
-        <if test="request.changeReportNo != null and request.changeReportNo !=''">
+        <if test="request != null and request.changeReportNo != null and request.changeReportNo !=''">
             and change_report_no like concat('%',#{request.changeReportNo},'%')
         </if>
-        <if test="request.changeReportName != null and request.changeReportName !=''">
+        <if test="request != null and request.changeReportName != null and request.changeReportName !=''">
             and change_report_name like concat('%',#{request.changeReportName},'%')
         </if>
-        <if test="request.changeType != null and request.changeType !=''">
+        <if test="request != null and request.changeType != null and request.changeType !=''">
             and change_type = #{request.changeType}
         </if>
-        <if test="request.createUserName != null and request.createUserName !=''">
+        <if test="request != null and request.createUserName != null and request.createUserName !=''">
             and create_user_name like concat('%',#{request.createUserName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificatePrintMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificatePrintMapper.xml
index b66cd99..49c0ac8 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificatePrintMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificatePrintMapper.xml
@@ -31,34 +31,34 @@
         LEFT JOIN biz_business_order_sample_relation bosr ON (bosr.order_id = bcr.order_id AND bosr.sample_id = bcr.sample_id)
         LEFT JOIN biz_business_order_info boi ON boi.id = bosr.order_id
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and bcp.approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.printStatus != null and request.printStatus !=''">
+        <if test="request != null and request.printStatus != null and request.printStatus !=''">
             and print_status = #{request.printStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and bcp.create_user_id = #{request.createUserId}
         </if>
-        <if test="request.certificateReportNo != null and request.certificateReportNo !=''">
+        <if test="request != null and request.certificateReportNo != null and request.certificateReportNo !=''">
             and bcr.certificate_report_no like concat('%',#{request.certificateReportNo},'%')
         </if>
-        <if test="request.certificateReportName != null and request.certificateReportName !=''">
+        <if test="request != null and request.certificateReportName != null and request.certificateReportName !=''">
             and bcr.certificate_report_name like concat('%',#{request.certificateReportName},'%')
         </if>
-        <if test="request.customerName != null and request.customerName !=''">
+        <if test="request != null and request.customerName != null and request.customerName !=''">
             and boi.customer_name like concat('%',#{request.customerName},'%')
         </if>
-        <if test="request.sampleNo != null and request.sampleNo !=''">
+        <if test="request != null and request.sampleNo != null and request.sampleNo !=''">
             and bosr.sample_no like concat('%',#{request.sampleNo},'%')
         </if>
-        <if test="request.sampleName != null and request.sampleName !=''">
+        <if test="request != null and request.sampleName != null and request.sampleName !=''">
             and bosr.sample_name like concat('%',#{request.sampleName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and bcp.create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and bcp.create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml
index b366034..767695d 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml
@@ -46,33 +46,37 @@
         SELECT bcr.*, bosr.sample_no, bosr.sample_name, bosr.sample_model, rsi.staff_name
         FROM biz_business_certificate_report bcr
         LEFT JOIN biz_business_order_sample_relation bosr ON (bosr.order_id = bcr.order_id AND bosr.sample_id = bcr.sample_id)
+        LEFT JOIN biz_business_order_info boi ON boi.id = bcr.order_id
         LEFT JOIN biz_resource_staff_info rsi ON rsi.id = bcr.measure_person_id
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and bcr.approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and bcr.create_user_id = #{request.createUserId}
         </if>
-        <if test="request.certificateReportNo != null and request.certificateReportNo !=''">
+        <if test="request != null and request.customerId != null and request.customerId !=''">
+            and boi.customer_id = #{request.customerId}
+        </if>
+        <if test="request != null and request.certificateReportNo != null and request.certificateReportNo !=''">
             and bcr.certificate_report_no like concat('%',#{request.certificateReportNo},'%')
         </if>
-        <if test="request.certificateReportName != null and request.certificateReportName !=''">
+        <if test="request != null and request.certificateReportName != null and request.certificateReportName !=''">
             and bcr.certificate_report_name like concat('%',#{request.certificateReportName},'%')
         </if>
-        <if test="request.sampleNo != null and request.sampleNo !=''">
+        <if test="request != null and request.sampleNo != null and request.sampleNo !=''">
             and bosr.sample_no like concat('%',#{request.sampleNo},'%')
         </if>
-        <if test="request.measureCategory != null and request.measureCategory !=''">
+        <if test="request != null and request.measureCategory != null and request.measureCategory !=''">
             and bcr.measure_category = #{request.measureCategory}
         </if>
-        <if test="request.measurePerson != null and request.measurePerson !=''">
+        <if test="request != null and request.measurePerson != null and request.measurePerson !=''">
             and rsi.staff_name like concat('%',#{request.measurePerson},'%')
         </if>
-        <if test="request.calibrationTimeStart != null and request.calibrationTimeStart !=''">
+        <if test="request != null and request.calibrationTimeStart != null and request.calibrationTimeStart !=''">
             and bcr.calibration_time &gt;= #{request.calibrationTimeStart}
         </if>
-        <if test="request.calibrationTimeEnd != null and request.calibrationTimeEnd !=''">
+        <if test="request != null and request.calibrationTimeEnd != null and request.calibrationTimeEnd !=''">
             and bcr.calibration_time &lt;= #{request.calibrationTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceAssessMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceAssessMapper.xml
index d0fcf8b..c22c101 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceAssessMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceAssessMapper.xml
@@ -7,6 +7,8 @@
         <id column="id" property="id" />
         <result column="project_no" property="projectNo" />
         <result column="project_name" property="projectName" />
+        <result column="lab_code" property="labCode" />
+        <result column="group_code" property="groupCode" />
         <result column="applicant_id" property="applicantId" />
         <result column="applicant_name" property="applicantName" />
         <result column="applicant_time" property="applicantTime" />
@@ -31,7 +33,45 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, project_no, project_name, applicant_id, applicant_name, applicant_time, minio_file_name, remark, create_user_id, create_user_name, outsourcer_id, pre_start_time, pre_end_time, outsource_reason, pre_cost, approval_status, process_id, approve_situation, traceability, test_method, technique_ability, create_time, update_time
+        id, project_no, project_name, lab_code, group_code, applicant_id, applicant_name, applicant_time, minio_file_name, remark, create_user_id, create_user_name, outsourcer_id, pre_start_time, pre_end_time, outsource_reason, pre_cost, approval_status, process_id, approve_situation, traceability, test_method, technique_ability, create_time, update_time
     </sql>
 
+    <select id="selectMaxProjectNo" resultType="java.lang.Long">
+        SELECT IFNULL(max(RIGHT(project_no, 3)), 0) from biz_business_outsource_assess
+    </select>
+
+    <select id="selectBatchForApprovalList" resultMap="BaseResultMap">
+        SELECT bboa.*, bboi.outsourcer_name, bboi.director
+        FROM biz_business_outsource_assess bboa
+        LEFT JOIN biz_business_outsourcer_info bboi ON bboa.outsourcer_id = bboi.id
+        WHERE 1=1
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
+            and bboa.approval_status = #{request.approvalStatus}
+        </if>
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
+            and bboa.create_user_id = #{request.createUserId}
+        </if>
+        <if test="request != null and request.projectNo != null and request.projectNo !=''">
+            and bboa.project_no like concat('%',#{request.projectNo},'%')
+        </if>
+        <if test="request != null and request.outsourcerName != null and request.outsourcerName !=''">
+            and bboi.outsourcer_name like concat('%',#{request.outsourcerName},'%')
+        </if>
+        <if test="request != null and request.applicantName != null and request.applicantName !=''">
+            and bboa.applicant_name like concat('%',#{request.applicantName},'%')
+        </if>
+        <if test="request != null and request.applicantTimeStart != null and request.applicantTimeStart !=''">
+            and bboa.applicant_time &gt;= #{request.applicantTimeStart}
+        </if>
+        <if test="request != null and request.applicantTimeEnd != null and request.applicantTimeEnd !=''">
+            and bboa.applicant_time &lt;= #{request.applicantTimeEnd}
+        </if>
+        <if test="businessKeys != null">
+            and bboa.id in
+            <foreach collection="businessKeys" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
+        ORDER BY bboa.create_time DESC
+    </select>
 </mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceProtocolMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceProtocolMapper.xml
new file mode 100644
index 0000000..b7b2149
--- /dev/null
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceProtocolMapper.xml
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.mapper.business.BizBusinessOutsourceProtocolMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.business.BizBusinessOutsourceProtocol">
+        <id column="id" property="id" />
+        <result column="protocol_no" property="protocolNo" />
+        <result column="project_name" property="projectName" />
+        <result column="lab_code" property="labCode" />
+        <result column="group_code" property="groupCode" />
+        <result column="outsourcer_id" property="outsourcerId" />
+        <result column="remark" property="remark" />
+        <result column="outsource_no" property="outsourceNo" />
+        <result column="outsource_name" property="outsourceName" />
+        <result column="contacts" property="contacts" />
+        <result column="mobile" property="mobile" />
+        <result column="address" property="address" />
+        <result column="require_date" property="requireDate" />
+        <result column="outsource_cost" property="outsourceCost" />
+        <result column="director" property="director" />
+        <result column="item" property="item" />
+        <result column="requires" property="requires" />
+        <result column="create_user_id" property="createUserId" />
+        <result column="create_user_name" property="createUserName" />
+        <result column="approval_status" property="approvalStatus" />
+        <result column="process_id" property="processId" />
+        <result column="create_time" property="createTime" />
+        <result column="update_time" property="updateTime" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, protocol_no, project_name, lab_code, group_code, outsourcer_id, remark, outsource_no, outsource_name, contacts, mobile, address, require_date, outsource_cost, director, item, requires, create_user_id, create_user_name, approval_status, process_id, create_time, update_time
+    </sql>
+
+    <select id="selectMaxProtocolNo" resultType="java.lang.Long">
+        SELECT IFNULL(max(RIGHT(protocol_no, 3)), 0) from biz_business_outsource_protocol
+    </select>
+
+    <select id="selectBatchForApprovalList" resultMap="BaseResultMap">
+        SELECT *
+        FROM biz_business_outsource_protocol
+        WHERE 1=1
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
+            and approval_status = #{request.approvalStatus}
+        </if>
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
+            and create_user_id = #{request.createUserId}
+        </if>
+        <if test="request != null and request.protocolNo != null and request.protocolNo !=''">
+            and protocol_no like concat('%',#{request.protocolNo},'%')
+        </if>
+        <if test="request != null and request.outsourcerName != null and request.outsourcerName !=''">
+            and outsourcer_name like concat('%',#{request.outsourcerName},'%')
+        </if>
+        <if test="request != null and request.applicantName != null and request.applicantName !=''">
+            and create_user_name like concat('%',#{request.applicantName},'%')
+        </if>
+        <if test="request != null and request.applicantTimeStart != null and request.applicantTimeStart !=''">
+            and create_time &gt;= #{request.applicantTimeStart}
+        </if>
+        <if test="request != null and request.applicantTimeEnd != null and request.applicantTimeEnd !=''">
+            and create_time &lt;= #{request.applicantTimeEnd}
+        </if>
+        <if test="businessKeys != null">
+            and id in
+            <foreach collection="businessKeys" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
+        ORDER BY create_time DESC
+    </select>
+</mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourcerInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourcerInfoMapper.xml
index 510a80b..3049b54 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourcerInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourcerInfoMapper.xml
@@ -7,6 +7,8 @@
         <id column="id" property="id" />
         <result column="outsourcer_no" property="outsourcerNo" />
         <result column="outsourcer_name" property="outsourcerName" />
+        <result column="lab_code" property="labCode" />
+        <result column="group_code" property="groupCode" />
         <result column="outsourcer_brief_name" property="outsourcerBriefName" />
         <result column="outsourcer_size" property="outsourcerSize" />
         <result column="business_size" property="businessSize" />
@@ -55,32 +57,32 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, outsourcer_no, outsourcer_name, outsourcer_brief_name, outsourcer_size, business_size, grade, evaluation, tax_number, bank_account, bank_name, bank_account_number, postal_code, director, phone, fax, mobile, email, website, address_country, address_province, address_city, address_area, full_address, address_country_name, address_province_name, address_city_name, address_area_name, invoice_country, invoice_province, invoice_city, invoice_area, invoice_full_address, invoice_country_name, invoice_province_name, invoice_city_name, invoice_area_name, business_scope, business_content, minio_file_name, approval_status, process_id, remark, create_user_id, create_user_name, create_time, update_time
+        id, outsourcer_no, outsourcer_name, lab_code, group_code, outsourcer_brief_name, outsourcer_size, business_size, grade, evaluation, tax_number, bank_account, bank_name, bank_account_number, postal_code, director, phone, fax, mobile, email, website, address_country, address_province, address_city, address_area, full_address, address_country_name, address_province_name, address_city_name, address_area_name, invoice_country, invoice_province, invoice_city, invoice_area, invoice_full_address, invoice_country_name, invoice_province_name, invoice_city_name, invoice_area_name, business_scope, business_content, minio_file_name, approval_status, process_id, remark, create_user_id, create_user_name, create_time, update_time
     </sql>
 
     <select id="selectBatchForApprovalList" resultMap="BaseResultMap">
         SELECT *
         FROM biz_business_outsourcer_info
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.outsourcerNo != null and request.outsourcerNo !=''">
+        <if test="request != null and request.outsourcerNo != null and request.outsourcerNo !=''">
             and outsourcer_no like concat('%',#{request.outsourcerNo},'%')
         </if>
-        <if test="request.outsourcerName != null and request.outsourcerName !=''">
+        <if test="request != null and request.outsourcerName != null and request.outsourcerName !=''">
             and outsourcer_name like concat('%',#{request.outsourcerName},'%')
         </if>
-        <if test="request.director != null and request.director !=''">
+        <if test="request != null and request.director != null and request.director !=''">
             and director like concat('%',#{request.director},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
@@ -93,6 +95,6 @@
     </select>
 
     <select id="selectMaxNo" resultType="java.lang.Long">
-        SELECT IFNULL(max(RIGHT(outsourcer_no, 12)), 0) from biz_business_outsourcer_info
+        SELECT IFNULL(max(RIGHT(outsourcer_no, 3)), 0) from biz_business_outsourcer_info
     </select>
 </mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessSiteExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessSiteExecutiveInfoMapper.xml
index 135c5d0..3c5ae79 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessSiteExecutiveInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessSiteExecutiveInfoMapper.xml
@@ -38,25 +38,25 @@
         FROM biz_business_site_executive_info bsei
         LEFT JOIN biz_resource_customer_info rci ON bsei.customer_id = rci.id
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and bsei.approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and bsei.create_user_id = #{request.createUserId}
         </if>
-        <if test="request.siteExecutiveNo != null and request.siteExecutiveNo !=''">
+        <if test="request != null and request.siteExecutiveNo != null and request.siteExecutiveNo !=''">
             and bsei.site_executive_no like concat('%',#{request.siteExecutiveNo},'%')
         </if>
-        <if test="request.customerName != null and request.customerName !=''">
+        <if test="request != null and request.customerName != null and request.customerName !=''">
             and rci.outsourcer_name like concat('%',#{request.customerName},'%')
         </if>
-        <if test="request.applyName != null and request.applyName !=''">
+        <if test="request != null and request.applyName != null and request.applyName !=''">
             and bsei.apply_name like concat('%',#{request.applyName},'%')
         </if>
-        <if test="request.applyTimeStart != null and request.applyTimeStart !=''">
+        <if test="request != null and request.applyTimeStart != null and request.applyTimeStart !=''">
             and bsei.apply_time &gt;= #{request.applyTimeStart}
         </if>
-        <if test="request.applyTimeEnd != null and request.applyTimeEnd !=''">
+        <if test="request != null and request.applyTimeEnd != null and request.applyTimeEnd !=''">
             and bsei.apply_time &lt;= #{request.applyTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml
index 84d9e2a..6bd38a9 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml
@@ -105,6 +105,12 @@
         <if test="request.isUrgent != null and request.isUrgent !=''">
             AND bo.is_urgent = #{request.isUrgent}
         </if>
+        <if test="request.ids != null">
+            and blei.id in
+            <foreach collection="request.ids" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
         ORDER BY blei.update_time DESC
     </select>
 
@@ -137,6 +143,12 @@
         <if test="request.isUrgent != null and request.isUrgent !=''">
             AND bo.is_urgent = #{request.isUrgent}
         </if>
+        <if test="request.ids != null">
+            and blei.id in
+            <foreach collection="request.ids" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
         ORDER BY blei.update_time DESC
     </select>
 
diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardInfoMapper.xml
index 1a5551b..2ed8d17 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardInfoMapper.xml
@@ -45,12 +45,6 @@
         FROM biz_equipment_standard_info besi
         LEFT JOIN biz_equipment_standard_technology_relation bestr ON besi.standard_no = bestr.standard_no
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
-            and besi.approval_status = #{request.approvalStatus}
-        </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
-            and besi.create_user_id = #{request.createUserId}
-        </if>
         <if test="request.standardName != null and request.standardName !=''">
             and besi.standard_name like concat('%',#{request.standardName},'%')
         </if>
diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardTechnologyRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardTechnologyRelationMapper.xml
index fc7e16c..cd03c8c 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardTechnologyRelationMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardTechnologyRelationMapper.xml
@@ -6,6 +6,7 @@
     <resultMap id="BaseResultMap" type="com.casic.missiles.model.equipment.BizEquipmentStandardTechnologyRelation">
         <id column="id" property="id" />
         <result column="technology_file_id" property="technologyFileId" />
+        <result column="technology_file_no" property="technologyFileNo" />
         <result column="technology_file_name" property="technologyFileName" />
         <result column="standard_id" property="standardId" />
         <result column="standard_no" property="standardNo" />
@@ -14,7 +15,7 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, technology_file_id, technology_file_name, standard_id, remark
+        id, technology_file_id, technology_file_no, technology_file_name, standard_id, remark
     </sql>
 
 </mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceAuthorizeOrderMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceAuthorizeOrderMapper.xml
index ac5176c..554fe65 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceAuthorizeOrderMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceAuthorizeOrderMapper.xml
@@ -32,22 +32,22 @@
         SELECT *
         FROM biz_resource_authorize_order
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.orderNo != null and request.orderNo !=''">
+        <if test="request != null and request.orderNo != null and request.orderNo !=''">
             and order_no like concat('%',#{request.orderNo},'%')
         </if>
-        <if test="request.createUserName != null and request.createUserName !=''">
+        <if test="request != null and request.createUserName != null and request.createUserName !=''">
             and create_user_name like concat('%',#{request.createUserName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerExamineFormMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerExamineFormMapper.xml
index ab242f6..af7f98f 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerExamineFormMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerExamineFormMapper.xml
@@ -41,28 +41,28 @@
         SELECT *
         FROM biz_resource_customer_examine_form
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.formNo != null and request.formNo !=''">
+        <if test="request != null and request.formNo != null and request.formNo !=''">
             and form_no like concat('%',#{request.formNo},'%')
         </if>
-        <if test="request.labCode != null and request.labCode !=''">
+        <if test="request != null and request.labCode != null and request.labCode !=''">
             and lab_code like concat('%',#{request.labCode},'%')
         </if>
-        <if test="request.groupCode != null and request.groupCode !=''">
+        <if test="request != null and request.groupCode != null and request.groupCode !=''">
             and group_code like concat('%',#{request.groupCode},'%')
         </if>
-        <if test="request.createUserName != null and request.createUserName !=''">
+        <if test="request != null and request.createUserName != null and request.createUserName !=''">
             and create_user_name like concat('%',#{request.createUserName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerInfoMapper.xml
index fa8ffbc..06a2798 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerInfoMapper.xml
@@ -33,25 +33,25 @@
         SELECT *
         FROM biz_resource_customer_info
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.customerNo != null and request.customerNo !=''">
+        <if test="request != null and request.customerNo != null and request.customerNo !=''">
             and customer_no like concat('%',#{request.customerNo},'%')
         </if>
-        <if test="request.customerName != null and request.customerName !=''">
+        <if test="request != null and request.customerName != null and request.customerName !=''">
             and customer_name like concat('%',#{request.customerName},'%')
         </if>
-        <if test="request.contacts != null and request.contacts !=''">
+        <if test="request != null and request.contacts != null and request.contacts !=''">
             and contacts like concat('%',#{request.contacts},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerSuggestFormMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerSuggestFormMapper.xml
index 28f5bb2..1806662 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerSuggestFormMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerSuggestFormMapper.xml
@@ -33,28 +33,28 @@
         SELECT *
         FROM biz_resource_customer_suggest_form
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.formNo != null and request.formNo !=''">
+        <if test="request != null and request.formNo != null and request.formNo !=''">
             and form_no like concat('%',#{request.formNo},'%')
         </if>
-        <if test="request.customerName != null and request.customerName !=''">
+        <if test="request != null and request.customerName != null and request.customerName !=''">
             and customer_name like concat('%',#{request.customerName},'%')
         </if>
-        <if test="request.customerDeptName != null and request.customerDeptName !=''">
+        <if test="request != null and request.customerDeptName != null and request.customerDeptName !=''">
             and customer_dept_name like concat('%',#{request.customerDeptName},'%')
         </if>
-        <if test="request.createUserName != null and request.createUserName !=''">
+        <if test="request != null and request.createUserName != null and request.createUserName !=''">
             and create_user_name like concat('%',#{request.createUserName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSealUseNoteMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSealUseNoteMapper.xml
index ab37bc1..b02bb33 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSealUseNoteMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSealUseNoteMapper.xml
@@ -29,32 +29,32 @@
     </sql>
 
     <select id="selectBatchForApprovalList" resultMap="BaseResultMap">
-        SELECT *
+        SELECT brsun.*, brsi.seal_name, brsi.seal_type, brsi.approver_name
         FROM biz_resource_seal_use_note brsun
         JOIN biz_resource_seal_info brsi ON brsun.seal_id = brsi.id
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and brsun.approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and brsun.create_user_id = #{request.createUserId}
         </if>
-        <if test="request.sealName != null and request.sealName !=''">
+        <if test="request != null and request.sealName != null and request.sealName !=''">
             and brsi.seal_name like concat('%',#{request.sealName},'%')
         </if>
-        <if test="request.sealType != null and request.sealType !=''">
+        <if test="request != null and request.sealType != null and request.sealType !=''">
             and brsi.seal_type = #{request.sealType}
         </if>
-        <if test="request.applyDeptName != null and request.applyDeptName !=''">
+        <if test="request != null and request.applyDeptName != null and request.applyDeptName !=''">
             and brsun.apply_dept_name like concat('%',#{request.applyDeptName},'%')
         </if>
-        <if test="request.applyUserName != null and request.applyUserName !=''">
+        <if test="request != null and request.applyUserName != null and request.applyUserName !=''">
             and brsun.apply_user_name like concat('%',#{request.applyUserName},'%')
         </if>
-        <if test="request.applyTimeStart != null and request.applyTimeStart !=''">
+        <if test="request != null and request.applyTimeStart != null and request.applyTimeStart !=''">
             and brsun.apply_time &gt;= #{request.applyTimeStart}
         </if>
-        <if test="request.applyTimeEnd != null and request.applyTimeEnd !=''">
+        <if test="request != null and request.applyTimeEnd != null and request.applyTimeEnd !=''">
             and brsun.apply_time &lt;= #{request.applyTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml
index 119bf7d..4f8392a 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml
@@ -31,6 +31,12 @@
         <if test="request.deptName != null and request.deptName !=''">
             and brsi.dept_name like concat('%',#{request.deptName},'%')
         </if>
+        <if test="request.ids != null">
+            and brsv.id in
+            <foreach collection="request.ids" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
         ORDER BY brsv.grant_date DESC
     </select>
 
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSupplierInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSupplierInfoMapper.xml
index fe8d399..e8ce7ef 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSupplierInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSupplierInfoMapper.xml
@@ -48,28 +48,28 @@
         SELECT *
         FROM biz_resource_supplier_info
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.supplierNo != null and request.supplierNo !=''">
+        <if test="request != null and request.supplierNo != null and request.supplierNo !=''">
             and supplier_no like concat('%',#{request.supplierNo},'%')
         </if>
-        <if test="request.supplierName != null and request.supplierName !=''">
+        <if test="request != null and request.supplierName != null and request.supplierName !=''">
             and supplier_name like concat('%',#{request.supplierName},'%')
         </if>
-        <if test="request.director != null and request.director !=''">
+        <if test="request != null and request.director != null and request.director !=''">
             and director like concat('%',#{request.director},'%')
         </if>
-        <if test="request.supplierType != null and request.supplierType !=''">
+        <if test="request != null and request.supplierType != null and request.supplierType !=''">
             and supplier_type = #{request.supplierType}
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/EnvLocationInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/EnvLocationInfoMapper.xml
new file mode 100644
index 0000000..68bcf10
--- /dev/null
+++ b/casic-metering-dao/src/main/resources/mapper/resource/EnvLocationInfoMapper.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.mapper.resource.EnvLocationInfoMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.resource.EnvLocationInfo">
+        <id column="id" property="id" />
+        <result column="location_no" property="locationNo" />
+        <result column="location_name" property="locationName" />
+        <result column="location_position" property="locationPosition" />
+        <result column="create_user_id" property="createUserId" />
+        <result column="create_user" property="createUser" />
+        <result column="create_time" property="createTime" />
+        <result column="update_time" property="updateTime" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, location_no, location_name, location_position, create_user_id, create_user, create_time, update_time
+    </sql>
+
+    <select id="selectLocationListPage" resultType="com.casic.missiles.dto.resource.environment.LocationListResponse">
+        SELECT *
+        FROM env_location_info
+        WHERE 1=1
+        <if test="request.locationNo != null and request.locationNo !=''">
+            AND location_no LIKE concat('%',#{request.locationNo},'%')
+        </if>
+        <if test="request.locationName != null and request.locationName !=''">
+            AND location_name LIKE concat('%',#{request.locationName},'%')
+        </if>
+        ORDER BY create_time DESC
+    </select>
+
+</mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml
index b28c18f..8854047 100644
--- a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml
@@ -11,7 +11,6 @@
         <result column="sign_desc" property="signDesc" />
         <result column="sign_director" property="signDirector" />
         <result column="sign_user_id" property="signUserId" />
-        <result column="sign_type" property="signType" />
         <result column="minio_file_name" property="minioFileName" />
         <result column="create_time" property="createTime" />
         <result column="update_time" property="updateTime" />
@@ -28,7 +27,6 @@
         <result column="sign_name" property="signName" />
         <result column="sign_desc" property="signDesc" />
         <result column="sign_director" property="signDirector" />
-        <result column="sign_type" property="signType" />
         <result column="sign_user_id" property="signUserId" />
         <result column="minio_file_name" property="minioFileName" />
         <result column="create_time" property="createTime" />
@@ -62,4 +60,58 @@
         JOIN system_sign_user_relation ssur ON ss.id = ssur.sign_id
         WHERE ssur.user_id = #{userId}
     </select>
+
+    <select id="selectSignListPage" resultMap="BaseResultMap">
+        SELECT ss.*, sd.SIMPLE_NAME AS deptName
+        FROM system_sign ss
+        LEFT JOIN sys_user su ON su.id = ss.sign_user_id
+        LEFT JOIN sys_dept sd ON sd.id = su.dept_id
+        WHERE 1=1
+        <if test="request.signNo != null and request.signNo !=''">
+            AND ss.sign_no LIKE concat('%',#{request.signNo},'%')
+        </if>
+        <if test="request.signName != null and request.signName !=''">
+            AND ss.sign_name LIKE concat('%',#{request.signName},'%')
+        </if>
+        <if test="request.signDirector != null and request.signDirector !=''">
+            AND ss.sign_director LIKE concat('%',#{request.signDirector},'%')
+        </if>
+        <if test="request.signUserId != null and request.signUserId !=''">
+            AND ss.sign_user_id = #{request.signUserId}
+        </if>
+        <if test="request.createStartTime != null and request.createStartTime !=''">
+            AND DATE_FORMAT(ss.create_time,'%Y-%m-%d') &gt;= DATE_FORMAT(#{request.createStartTime},'%Y-%m-%d')
+        </if>
+        <if test="request.createEndTime != null and request.createEndTime !=''">
+            AND DATE_FORMAT(ss.create_time,'%Y-%m-%d')  &lt;= DATE_FORMAT(#{request.createEndTime},'%Y-%m-%d')
+        </if>
+        ORDER BY ss.create_time DESC
+    </select>
+
+    <select id="selectSignList" resultMap="BaseResultMap">
+        SELECT ss.*, sd.SIMPLE_NAME AS deptName
+        FROM system_sign ss
+        LEFT JOIN sys_user su ON su.id = ss.sign_user_id
+        LEFT JOIN sys_dept sd ON sd.id = su.dept_id
+        WHERE 1=1
+        <if test="request.signNo != null and request.signNo !=''">
+            AND ss.sign_no LIKE concat('%',#{request.signNo},'%')
+        </if>
+        <if test="request.signName != null and request.signName !=''">
+            AND ss.sign_name LIKE concat('%',#{request.signName},'%')
+        </if>
+        <if test="request.signDirector != null and request.signDirector !=''">
+            AND ss.sign_director LIKE concat('%',#{request.signDirector},'%')
+        </if>
+        <if test="request.signUserId != null and request.signUserId !=''">
+            AND ss.sign_user_id = #{request.signUserId}
+        </if>
+        <if test="request.createStartTime != null and request.createStartTime !=''">
+            AND DATE_FORMAT(ss.create_time,'%Y-%m-%d') &gt;= DATE_FORMAT(#{request.createStartTime},'%Y-%m-%d')
+        </if>
+        <if test="request.createEndTime != null and request.createEndTime !=''">
+            AND DATE_FORMAT(ss.create_time,'%Y-%m-%d')  &lt;= DATE_FORMAT(#{request.createEndTime},'%Y-%m-%d')
+        </if>
+        ORDER BY ss.create_time DESC
+    </select>
 </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 515050a..60f530b 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
@@ -47,8 +47,8 @@
     String STORAGE_LOCATION = "bizStorageLocation";
     //计量专业
     String MEASURE_MAJOR = "bizMeasureMajor";
-    //管理状态
-    String MANAGER_STATE = "bizManagerState";
+    //标准装置管理状态
+    String STANDARD_MANAGER_STATE = "bizStandardManagerState";
 
     /**
      * 资源管理 字典code
@@ -95,8 +95,6 @@
     String MEASURE_STATUS = "measureStatus";
     //检定方式
     String MEASURE_TYPE = "measureType";
-    //标识打印标志类型
-    String IDENTIFY_PRINT_TYPE = "bizBusinessIdentify";
     //变更类型
     String REPORT_CHANGE_TYPE = "bizCertChangeType";
     //规模类型
@@ -111,19 +109,24 @@
     String MEASURE_CATEGORY = "measureCategory";
     //检定结果
     String MEASURE_RESULT = "measureResult";
+    //分包原因
+    String OUTSOURCE_REASON = "outsourceReason";
+
+    /**
+     * 系统管理
+     */
+    String TEMPLATE_TYPE = "templateType";
+
 
     /**
      * 标准装置 字典code
      */
     //类别
     String STANDARD_CATEGORY = "standardCategory";
-    //管理状态
-    String STANDARD_MANAGER_STATE = "standardManagerState";
     //标准等级
     String STANDARD_LEVEL = "standardLevel";
     //传递范围
     String STANDARD_TRANSMIT_RANGE = "transmitRange";
-
     //资本来源
     String CAPITAL_SOURCE = "capitalSource";
     //标准装置-申请类型
@@ -148,8 +151,6 @@
     String CERTIFICATE_CLASS = "certificationClass";
     //证书管理-检校专业
     String CALIBRATION_MAJOR = "calibrationMajor";
-    //分包原因
-    String OUTSOURCE_REASON = "outsourceReason";
 
     /**
      * 工作台
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/BaseApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/BaseApprovalListRequest.java
index 73c12c1..80d7424 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/BaseApprovalListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/BaseApprovalListRequest.java
@@ -6,6 +6,7 @@
 
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotEmpty;
+import java.util.List;
 
 /**
  * @Description:
@@ -19,14 +20,14 @@
      * 表单id
      */
     @NotBlank(message = "表单id不能为空")
-    @ApiModelProperty(value = "表单id（流程定义对应的表单id，等价于业务id）", dataType = "String")
+    @ApiModelProperty(value = "表单id（流程定义对应的表单id，等价于业务id），导出接口不用传", dataType = "String")
     private String formId;
 
     /**
      * 审批状态类型，对应ApprovalStatusEnum
      */
     @NotEmpty(message = "审批状态类型不能为空")
-    @ApiModelProperty(value = "审批状态类型code", dataType = "String")
+    @ApiModelProperty(value = "审批状态类型code，导出接口不用传", dataType = "String")
     private String approvalStatus;
 
     @ApiModelProperty(hidden = true)
@@ -34,4 +35,7 @@
 
     @ApiModelProperty(hidden = true)
     private Long createUserId;
+
+    @ApiModelProperty(value = "导出ids", dataType = "List")
+    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificatePrintApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificatePrintApprovalListRequest.java
index b93d1c9..3cc2f4e 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificatePrintApprovalListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificatePrintApprovalListRequest.java
@@ -5,8 +5,6 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import java.util.List;
-
 /**
  * @Description:
  * @Author: wangpeng
@@ -38,7 +36,4 @@
 
     @ApiModelProperty(value = "创建结束时间", dataType = "String")
     private String createTimeEnd;
-
-    @ApiModelProperty(value = "导出ids", dataType = "List")
-    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportApprovalListRequest.java
index 4f7a038..c115847 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportApprovalListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportApprovalListRequest.java
@@ -5,8 +5,6 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import java.util.List;
-
 /**
  * @Description:
  * @Author: wangpeng
@@ -15,6 +13,8 @@
 @ApiModel
 @Data
 public class CertificateReportApprovalListRequest extends BaseApprovalListRequest {
+    @ApiModelProperty(value = "委托方id", dataType = "String")
+    private Long customerId;
 
     @ApiModelProperty(value = "证书报告编号", dataType = "String")
     private String certificateReportNo;
@@ -37,6 +37,4 @@
     @ApiModelProperty(value = "检校结束时间", dataType = "String")
     private String calibrationTimeEnd;
 
-    @ApiModelProperty(value = "导出ids", dataType = "List")
-    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/identify/IdentifyListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/identify/IdentifyListRequest.java
index 1b87ae6..f019203 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/identify/IdentifyListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/identify/IdentifyListRequest.java
@@ -4,6 +4,8 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * @Description:
  * @Author: wangpeng
@@ -26,4 +28,7 @@
 
     @ApiModelProperty(value = "打印结束时间", dataType = "String")
     private String createTimeEnd;
+
+    @ApiModelProperty(value = "导出ids", dataType = "List")
+    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListRequest.java
index 1264883..62415fb 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListRequest.java
@@ -7,6 +7,7 @@
 import lombok.Data;
 
 import javax.validation.constraints.NotBlank;
+import java.util.List;
 
 @Data
 @ApiModel
@@ -37,4 +38,6 @@
     @ApiModelProperty(value = "是否加急（1是0否null全部）", dataType = "Integer")
     private String isUrgent;
 
+    @ApiModelProperty(value = "导出ids", dataType = "List")
+    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListRequest.java
index 5201d7b..499760a 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListRequest.java
@@ -17,6 +17,9 @@
     @ApiModelProperty(value = "任务单编号", dataType = "String")
     private String orderNo;
 
+    @ApiModelProperty(value = "委托方id", dataType = "Long")
+    private Long customerId;
+
     @ApiModelProperty(value = "委托方名称", dataType = "String")
     private String customerName;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OrderSampleDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OrderSampleDTO.java
new file mode 100644
index 0000000..796edc0
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OrderSampleDTO.java
@@ -0,0 +1,19 @@
+package com.casic.missiles.dto.business.outsource;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/8/24 11:38
+ */
+@ApiModel
+@Data
+public class OrderSampleDTO {
+    @ApiModelProperty(value = "任务单id", dataType = "Long")
+    private Long orderId;
+    @ApiModelProperty(value = "受检设备id", dataType = "Long")
+    private Long sampleId;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceAssessApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceAssessApprovalListRequest.java
new file mode 100644
index 0000000..9a930c3
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceAssessApprovalListRequest.java
@@ -0,0 +1,30 @@
+package com.casic.missiles.dto.business.outsource;
+
+import com.casic.missiles.dto.BaseApprovalListRequest;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/8/24 11:01
+ */
+@ApiModel
+@Data
+public class OutsourceAssessApprovalListRequest extends BaseApprovalListRequest {
+    @ApiModelProperty(value = "评审表编号", dataType = "String")
+    private String projectNo;
+
+    @ApiModelProperty(value = "分包机构名称", dataType = "String")
+    private String outsourcerName;
+
+    @ApiModelProperty(value = "申请人", dataType = "String")
+    private String applicantName;
+
+    @ApiModelProperty(value = "申请时间开始", dataType = "String")
+    private String applicantTimeStart;
+
+    @ApiModelProperty(value = "申请时间结束", dataType = "String")
+    private String applicantTimeEnd;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceAssessSaveResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceAssessSaveResponse.java
new file mode 100644
index 0000000..8bf9aad
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceAssessSaveResponse.java
@@ -0,0 +1,20 @@
+package com.casic.missiles.dto.business.outsource;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/8/14 16:17
+ */
+@ApiModel
+@Data
+public class OutsourceAssessSaveResponse {
+    @ApiModelProperty(value = "主键id", dataType = "Long")
+    private Long id;
+
+    @ApiModelProperty(value = "编号", dataType = "String")
+    private String projectNo;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProtocolApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProtocolApprovalListRequest.java
new file mode 100644
index 0000000..0f32331
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProtocolApprovalListRequest.java
@@ -0,0 +1,30 @@
+package com.casic.missiles.dto.business.outsource;
+
+import com.casic.missiles.dto.BaseApprovalListRequest;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/8/24 15:01
+ */
+@ApiModel
+@Data
+public class OutsourceProtocolApprovalListRequest extends BaseApprovalListRequest {
+    @ApiModelProperty(value = "协议书编号", dataType = "String")
+    private String protocolNo;
+
+    @ApiModelProperty(value = "分包方名称", dataType = "String")
+    private String outsourcerName;
+
+    @ApiModelProperty(value = "申请人", dataType = "String")
+    private String applicantName;
+
+    @ApiModelProperty(value = "申请时间开始", dataType = "String")
+    private String applicantTimeStart;
+
+    @ApiModelProperty(value = "申请时间结束", dataType = "String")
+    private String applicantTimeEnd;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProtocolSaveResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProtocolSaveResponse.java
new file mode 100644
index 0000000..e324967
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProtocolSaveResponse.java
@@ -0,0 +1,20 @@
+package com.casic.missiles.dto.business.outsource;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/8/14 16:17
+ */
+@ApiModel
+@Data
+public class OutsourceProtocolSaveResponse {
+    @ApiModelProperty(value = "主键id", dataType = "Long")
+    private Long id;
+
+    @ApiModelProperty(value = "编号", dataType = "String")
+    private String protocolNo;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveApprovalListRequest.java
index f29f4e4..7047c28 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveApprovalListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveApprovalListRequest.java
@@ -5,8 +5,6 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import java.util.List;
-
 /**
  * @Description: 现场检测审批列表请求实体
  * @Author: wangpeng
@@ -30,7 +28,4 @@
     @ApiModelProperty(value = "申请时间结束", dataType = "String")
     private String applyTimeEnd;
 
-    @ApiModelProperty(value = "导出ids", dataType = "List")
-    private List<Long> ids;
-
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveDetailResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveDetailResponse.java
index 1f28752..394c934 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveDetailResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveDetailResponse.java
@@ -12,6 +12,18 @@
     @ApiModelProperty(value = "id，更新/删除使用参数", dataType = "Long")
     private Long id;
 
+    @ApiModelProperty(value = "实验室代码(字典code)", dataType = "String")
+    private String labCode;
+
+    @ApiModelProperty(value = "实验室代码(字典value)", dataType = "String")
+    private String labCodeName;
+
+    @ApiModelProperty(value = "组别代码(字典code)", dataType = "String")
+    private String groupCode;
+
+    @ApiModelProperty(value = "组别代码(字典value)", dataType = "String")
+    private String groupCodeName;
+
     @ApiModelProperty(value = "审批编号", dataType = "String")
     private String siteExecutiveNo;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/environment/LocationListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/environment/LocationListRequest.java
new file mode 100644
index 0000000..13d03c3
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/environment/LocationListRequest.java
@@ -0,0 +1,20 @@
+package com.casic.missiles.dto.resource.environment;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/6/8 13:56
+ */
+@ApiModel
+@Data
+public class LocationListRequest {
+    @ApiModelProperty(value = "地点编号", dataType = "String")
+    private String locationNo;
+
+    @ApiModelProperty(value = "地点名称", dataType = "String")
+    private String locationName;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/environment/LocationListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/environment/LocationListResponse.java
new file mode 100644
index 0000000..4c531af
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/environment/LocationListResponse.java
@@ -0,0 +1,78 @@
+package com.casic.missiles.dto.resource.environment;
+
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
+import com.baomidou.mybatisplus.annotation.TableField;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description: 地点列表响应实体
+ * @Author: wangpeng
+ * @Date: 2023/6/8 13:53
+ */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
+@ApiModel
+@Data
+public class LocationListResponse {
+    @ApiModelProperty(value = "主键id", dataType = "Long")
+    private Long id;
+
+    /**
+     * 地点编号
+     */
+    @ExcelProperty("地点编号")
+    @ApiModelProperty(value = "地点编号", dataType = "String")
+    private String locationNo;
+
+    /**
+     * 地点名称
+     */
+    @ExcelProperty("地点名称")
+    @ApiModelProperty(value = "地点名称", dataType = "String")
+    private String locationName;
+
+    /**
+     * 地点位置
+     */
+    @ExcelProperty("地点位置")
+    @ApiModelProperty(value = "地点位置", dataType = "String")
+    private String locationPosition;
+
+    /**
+     * 创建人id
+     */
+    @ApiModelProperty(value = "创建人id", dataType = "Long")
+    private Long createUserId;
+
+    /**
+     * 创建人
+     */
+    @ExcelProperty("创建人")
+    @ApiModelProperty(value = "创建人", dataType = "String")
+    @TableField("create_user")
+    private String createUser;
+
+    /**
+     * 创建时间
+     */
+    @ExcelProperty("创建时间")
+    @ApiModelProperty(value = "创建时间", dataType = "String")
+    private String createTime;
+
+    /**
+     * 更新时间
+     */
+    @ApiModelProperty(value = "更新时间", dataType = "String")
+    private String updateTime;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertRequest.java
index 9a7f6c6..c827915 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertRequest.java
@@ -4,6 +4,8 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * @Description:
  * @Author: wangpeng
@@ -16,4 +18,7 @@
     private String name;
     @ApiModelProperty(value = "部门名", dataType = "String")
     private String deptName;
+
+    @ApiModelProperty(value = "导出ids", dataType = "List")
+    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertResponse.java
index f78b159..8f2f79e 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertResponse.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.dto.resource.staff;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.casic.missiles.annotation.DictCodeField;
 import com.casic.missiles.constants.MeterDictCode;
 import io.swagger.annotations.ApiModel;
@@ -13,12 +20,18 @@
  * @Author: wangpeng
  * @Date: 2023/7/27 15:13
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @ApiModel
 @Data
 public class StaffCertResponse {
     /**
      * 人员编号
      */
+    @ExcelProperty(value = "人员编号",order = 0)
     @NotEmpty(message = "人员编号不能为空")
     @ApiModelProperty(value = "人员编号", dataType = "String")
     private String staffNo;
@@ -26,6 +39,7 @@
     /**
      * 姓名
      */
+    @ExcelProperty(value = "姓名",order = 1)
     @ApiModelProperty(value = "姓名", dataType = "String")
     private String staffName;
 
@@ -54,6 +68,7 @@
     /**
      * 部门名字
      */
+    @ExcelProperty(value = "工作部门",order = 2)
     @ApiModelProperty(value = "部门名字", dataType = "String")
     private String deptName;
 
@@ -66,6 +81,7 @@
     /**
      * 计量专业
      */
+    @ExcelProperty(value = "计量专业",order = 3)
     @ApiModelProperty(value = "计量专业", dataType = "String")
     private String major;
 
@@ -110,6 +126,7 @@
     /**
      * 证书号
      */
+    @ExcelProperty(value = "证号",order = 4)
     @ApiModelProperty(value = "证书号", dataType = "String")
     private String certNo;
 
@@ -122,12 +139,14 @@
     /**
      * 有效日期
      */
+    @ExcelProperty(value = "证书有效期",order = 6)
     @ApiModelProperty(value = "有效日期", dataType = "String")
     private String effectiveDate;
 
     /**
      * 发放日期
      */
+    @ExcelProperty(value = "发证日期",order = 5)
     @ApiModelProperty(value = "发放日期", dataType = "String")
     private String grantDate;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffListRequest.java
index 7c4afb3..0a1194a 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffListRequest.java
@@ -4,6 +4,8 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * @Description:
  * @Author: wangpeng
@@ -18,4 +20,7 @@
     private String deptName;
     @ApiModelProperty(value = "部门id", dataType = "Long")
     private Long deptId;
+
+    @ApiModelProperty(value = "导出ids", dataType = "List")
+    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/TrainListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/TrainListRequest.java
index f68597b..6321f8b 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/TrainListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/TrainListRequest.java
@@ -14,6 +14,8 @@
 public class TrainListRequest {
     @ApiModelProperty(value = "训练登记表编号", dataType = "String")
     private String trainNo;
+    @ApiModelProperty(value = "值班领导", dataType = "String")
+    private String dutyLeader;
     @ApiModelProperty(value = "创建开始时间", dataType = "String")
     private String createTimeStart;
     @ApiModelProperty(value = "创建结束时间", dataType = "String")
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/SignAddRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/SignAddRequest.java
index 117be34..d71055c 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/SignAddRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/SignAddRequest.java
@@ -43,13 +43,6 @@
     private Long signUserId;
 
     /**
-     * 签章或签名-字典code
-     */
-    @NotBlank(message = "类型不能为空")
-    @ApiModelProperty(value = "签名/签章-字典code", dataType = "String", required = true)
-    private String signType;
-
-    /**
      * minio存储文件名
      */
     @ApiModelProperty(value = "上传文件返回名称", dataType = "String")
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateAddRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateAddRequest.java
index aff1265..6316648 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateAddRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateAddRequest.java
@@ -17,30 +17,28 @@
 @Data
 public class TemplateAddRequest extends BaseSystemRequest {
     /**
-     * 原始记录模板/证书报告模板名称
+     * 模板名称
      */
     @ApiModelProperty(value = "名称", dataType = "String", required = true)
     @NotBlank(message = "名称不能为空")
     private String templateName;
 
     /**
-     * 原始记录模板/证书报告模板描述
+     * 模板描述
      */
     @ApiModelProperty(value = "描述", dataType = "String")
     private String templateDesc;
 
     /**
-     * 原始记录模板/证书报告模板创建人
+     * 创建人
      */
     @ApiModelProperty(value = "创建人", dataType = "String", required = true)
     @NotBlank(message = "创建人不能为空")
     private String templateCreator;
 
-    /**
-     * 原始记录模板/证书报告模板-字典code
-     */
-    @NotBlank(message = "类型不能为空")
-    @ApiModelProperty(value = "原始记录模板/证书报告模板-字典code", dataType = "String", required = true)
+
+    @NotBlank(message = "模板类型不能为空")
+    @ApiModelProperty(value = "模板类型(字典code)", dataType = "String", required = true)
     private String templateType;
 
     /**
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateListRequest.java
index eec5a1e..6d17bbe 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateListRequest.java
@@ -1,11 +1,12 @@
 package com.casic.missiles.dto.system;
 
+import com.casic.missiles.annotation.DictCodeField;
+import com.casic.missiles.constants.MeterDictCode;
 import com.casic.missiles.dto.BaseSystemRequest;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import javax.validation.constraints.NotBlank;
 import java.util.List;
 
 /**
@@ -19,8 +20,8 @@
     /**
      * 类型
      */
-//    @ApiModelProperty(value = "类型-字典code", dataType = "String", required = true)
-    @NotBlank(message = "类型不能为空")
+    @DictCodeField(message = "模板类型不合法", cacheName = MeterDictCode.TEMPLATE_TYPE)
+    @ApiModelProperty(value = "模板类型(字典code)", dataType = "String")
     private String templateType;
 
     /**
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificateChangeApply.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificateChangeApply.java
index 9216308..36923fd 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificateChangeApply.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificateChangeApply.java
@@ -1,11 +1,19 @@
 package com.casic.missiles.model.business;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 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 com.casic.missiles.dto.BaseRequest;
+import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -20,6 +28,12 @@
  * @author wangpeng
  * @since 2023-08-15
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
+@ApiModel
 @Data
 @TableName("biz_business_certificate_change_apply")
 public class BizBusinessCertificateChangeApply extends BaseRequest implements Serializable {
@@ -33,6 +47,7 @@
     /**
      * 申请单编号
      */
+    @ExcelProperty(value = "申请单编号", order = 1)
     @ApiModelProperty(value = "申请单编号", dataType = "String")
     @TableField("change_apply_no")
     private String changeApplyNo;
@@ -40,6 +55,7 @@
     /**
      * 申请单名字
      */
+    @ExcelProperty(value = "申请单名称", order = 2)
     @ApiModelProperty(value = "申请单名字", dataType = "String")
     @TableField("change_apply_name")
     private String changeApplyName;
@@ -54,6 +70,7 @@
     /**
      * 更换证书编号
      */
+    @ExcelProperty(value = "更换证书编号", order = 3)
     @ApiModelProperty(value = "更换证书编号", dataType = "String")
     @TableField("change_report_no")
     private String changeReportNo;
@@ -61,7 +78,8 @@
     /**
      * 更换证书名字
      */
-    @ApiModelProperty(value = "更换证书名字", dataType = "String")
+    @ExcelProperty(value = "更换证书/报告名称", order = 4)
+    @ApiModelProperty(value = "更换证书/报告名称", dataType = "String")
     @TableField("change_report_name")
     private String changeReportName;
 
@@ -73,6 +91,7 @@
     @TableField("change_type")
     private String changeType;
 
+    @ExcelProperty(value = "变更类型", order = 5)
     @ApiModelProperty(value = "变更类型(字典value)", dataType = "String")
     @TableField(exist = false)
     private String changeTypeName;
@@ -142,13 +161,15 @@
     /**
      * 创建用户名字
      */
-    @ApiModelProperty(value = "创建用户名字", dataType = "String")
+    @ExcelProperty(value = "创建人", order = 6)
+    @ApiModelProperty(value = "创建人名字", dataType = "String")
     @TableField("create_user_name")
     private String createUserName;
 
     /**
      * 创建时间
      */
+    @ExcelProperty(value = "创建时间", order = 7)
     @ApiModelProperty(value = "创建时间", dataType = "String")
     @TableField("create_time")
     private String createTime;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificateReport.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificateReport.java
index f01db9e..db06018 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificateReport.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificateReport.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.model.business;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -22,6 +29,11 @@
  * @author wangpeng
  * @since 2023-08-14
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @ApiModel
 @Data
 @TableName("biz_business_certificate_report")
@@ -36,6 +48,7 @@
     /**
      * 证书报告编号
      */
+    @ExcelProperty(value = "证书报告编号", order = 1)
     @ApiModelProperty(value = "证书报告编号", dataType = "String")
     @TableField("certificate_report_no")
     private String certificateReportNo;
@@ -43,6 +56,7 @@
     /**
      * 证书报告名称
      */
+    @ExcelProperty(value = "证书报告名称", order = 2)
     @ApiModelProperty(value = "证书报告名称", dataType = "String")
     @TableField("certificate_report_name")
     private String certificateReportName;
@@ -62,6 +76,7 @@
     @TableField("measure_category")
     private String measureCategory;
 
+    @ExcelProperty(value = "检校类别", order = 6)
     @ApiModelProperty(value = "检校类别(字典value)", dataType = "String")
     @TableField(exist = false)
     private String measureCategoryName;
@@ -69,6 +84,7 @@
     /**
      * 检校时间
      */
+    @ExcelProperty(value = "检校时间", order = 8)
     @ApiModelProperty(value = "检校时间", dataType = "String")
     @TableField("calibration_time")
     private String calibrationTime;
@@ -267,18 +283,22 @@
     @TableField(exist = false)
     private Integer decisionItem;
 
-    @ApiModelProperty(value = "设备样品编号（列表返回参数）", dataType = "String")
+    @ExcelProperty(value = "被检设备统一编号", order = 3)
+    @ApiModelProperty(value = "被检设备统一编号（列表返回参数）", dataType = "String")
     @TableField(exist = false)
     private String sampleNo;
 
-    @ApiModelProperty(value = "设备样品名称（列表返回参数）", dataType = "String")
+    @ExcelProperty(value = "被检设备名称", order = 4)
+    @ApiModelProperty(value = "被检设备名称（列表返回参数）", dataType = "String")
     @TableField(exist = false)
     private String sampleName;
 
-    @ApiModelProperty(value = "设备样品规格型号（列表返回参数）", dataType = "String")
+    @ExcelProperty(value = "规格型号", order = 5)
+    @ApiModelProperty(value = "规格型号（列表返回参数）", dataType = "String")
     @TableField(exist = false)
     private String sampleModel;
 
+    @ExcelProperty(value = "检定员", order = 7)
     @ApiModelProperty(value = "检定员名字（列表返回参数）", dataType = "String")
     @TableField(exist = false)
     private String staffName;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessIdentifyInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessIdentifyInfo.java
index 46bfba5..f1a9bec 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessIdentifyInfo.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessIdentifyInfo.java
@@ -1,10 +1,15 @@
 package com.casic.missiles.model.business;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 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;
 
@@ -20,6 +25,11 @@
  * @author wangpeng
  * @since 2023-08-15
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @Data
 @TableName("biz_business_identify_info")
 public class BizBusinessIdentifyInfo implements Serializable {
@@ -33,6 +43,7 @@
     /**
      * 记录编号
      */
+    @ExcelProperty(value = "记录编号", order = 1)
     @ApiModelProperty(value = "记录编号", dataType = "String")
     @TableField("record_no")
     private String recordNo;
@@ -41,20 +52,15 @@
      * 标志类型(字典code)
      */
     @NotEmpty(message = "标志类型不能为空")
-    @ApiModelProperty(value = "标志类型(字典code)", dataType = "String")
-    @DictCodeField(message = "标志类型不合法", cacheName = MeterDictCode.IDENTIFY_PRINT_TYPE)
+    @ApiModelProperty(value = "标志类型(直接存计量标识/使用状态/校准状态的字典value)", dataType = "String")
     @TableField("identify_type")
     private String identifyType;
 
-    @ApiModelProperty(value = "标志类型(字典value)", dataType = "String")
-    @TableField(exist = false)
-    private String identifyTypeName;
-
     /**
      * 设备id(可以是受检设备/设备台账)
      */
     @NotNull(message = "设备id不能为空")
-    @ApiModelProperty(value = "设备id(可以是受检设备/设备台账)", dataType = "String")
+    @ApiModelProperty(value = "设备id(可以是受检设备/设备台账)", dataType = "Long")
     @TableField("device_id")
     private Long deviceId;
 
@@ -66,29 +72,32 @@
     @TableField("device_type")
     private String deviceType;
 
+    @ExcelProperty(value = "统一编号", order = 3)
     @NotEmpty(message = "设备编号不能为空")
-    @ApiModelProperty(value = "设备编号", dataType = "String")
+    @ApiModelProperty(value = "统一编号", dataType = "String")
     @TableField("device_no")
     private String deviceNo;
 
     /**
      * 设备名字
      */
-    @NotEmpty(message = "设备名字不能为空")
-    @ApiModelProperty(value = "设备名字", dataType = "String")
+    @ExcelProperty(value = "设备名称", order = 4)
+    @NotEmpty(message = "设备名称不能为空")
+    @ApiModelProperty(value = "设备名称", dataType = "String")
     @TableField("device_name")
     private String deviceName;
 
     /**
      * 检定员id
      */
-    @ApiModelProperty(value = "检定员id", dataType = "String")
+    @ApiModelProperty(value = "检定员id", dataType = "Long")
     @TableField("measure_person_id")
     private Long measurePersonId;
 
     /**
      * 检定员名字
      */
+    @ExcelProperty(value = "检定员", order = 5)
     @ApiModelProperty(value = "检定员名字", dataType = "String")
     @TableField("measure_person")
     private String measurePerson;
@@ -103,7 +112,8 @@
     /**
      * 更新时间
      */
-    @ApiModelProperty(value = "更新时间", dataType = "String")
+    @ExcelProperty(value = "打印时间", order = 6)
+    @ApiModelProperty(value = "打印时间", dataType = "String")
     @TableField("update_time")
     private String updateTime;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceAssess.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceAssess.java
index 659d9ca..6720b90 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceAssess.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceAssess.java
@@ -1,11 +1,26 @@
 package com.casic.missiles.model.business;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 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 com.casic.missiles.dto.BaseRequest;
+import com.casic.missiles.dto.business.outsource.OrderSampleDTO;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import javax.validation.constraints.NotEmpty;
 import java.io.Serializable;
+import java.util.List;
 
 /**
  * <p>
@@ -15,146 +30,231 @@
  * @author wangpeng
  * @since 2023-08-16
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
+@ApiModel
 @Data
 @TableName("biz_business_outsource_assess")
-public class BizBusinessOutsourceAssess implements Serializable {
+public class BizBusinessOutsourceAssess extends BaseRequest implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
+    @ApiModelProperty(value = "id，更新/删除使用参数", dataType = "Long")
     @TableId("id")
     private Long id;
 
     /**
      * 评审表编号
      */
+    @ExcelProperty(value = "评审表编号", order = 1)
+    @ApiModelProperty(value = "评审表编号(后台生成)", dataType = "String")
     @TableField("project_no")
     private String projectNo;
 
     /**
      * 评审表名称
      */
+    @ExcelProperty(value = "评审表名称", order = 2)
+    @ApiModelProperty(value = "评审表名称", dataType = "String")
     @TableField("project_name")
     private String projectName;
 
+    @NotEmpty(message = "实验室代码不能为空")
+    @DictCodeField(message = "实验室代码描述不合法", cacheName = MeterDictCode.LAB_CODE)
+    @ApiModelProperty(value = "实验室代码(字典code)", dataType = "String")
+    @TableField("lab_code")
+    private String labCode;
+
+    @ApiModelProperty(value = "实验室代码(字典value)", dataType = "String")
+    @TableField(exist = false)
+    private String labCodeName;
+
+    /**
+     * 组别代码
+     */
+    @NotEmpty(message = "组别代码不能为空")
+    @DictCodeField(message = "组别代码描述不合法", cacheName = MeterDictCode.GROUP_CODE)
+    @ApiModelProperty(value = "组别代码(字典code)", dataType = "String")
+    @TableField("group_code")
+    private String groupCode;
+
+    @ApiModelProperty(value = "组别代码(字典value)", dataType = "String")
+    @TableField(exist = false)
+    private String groupCodeName;
+
     /**
      * 申请人id
      */
+    @ApiModelProperty(value = "申请人id", dataType = "String")
     @TableField("applicant_id")
     private Long applicantId;
 
     /**
      * 申请人名字
      */
+    @ExcelProperty(value = "申请人", order = 5)
+    @ApiModelProperty(value = "申请人", dataType = "String")
     @TableField("applicant_name")
     private String applicantName;
 
     /**
      * 申请时间
      */
+    @ExcelProperty(value = "申请时间", order = 6)
+    @ApiModelProperty(value = "申请时间", dataType = "String")
     @TableField("applicant_time")
     private String applicantTime;
 
     /**
      * 附件(minio存储文件名)
      */
+    @ApiModelProperty(value = "附件(minio存储文件名)", dataType = "String")
     @TableField("minio_file_name")
     private String minioFileName;
 
     /**
      * 备注
      */
+    @ApiModelProperty(value = "备注", dataType = "String")
     @TableField("remark")
     private String remark;
 
     /**
      * 创建人id
      */
+    @ApiModelProperty(value = "创建人id", dataType = "String")
     @TableField("create_user_id")
     private Long createUserId;
 
     /**
      * 创建人名字
      */
+    @ApiModelProperty(value = "创建人名字", dataType = "String")
     @TableField("create_user_name")
     private String createUserName;
 
     /**
      * 分包方id
      */
+    @ApiModelProperty(value = "评审表编号", dataType = "String")
     @TableField("outsourcer_id")
     private Long outsourcerId;
 
     /**
      * 预计开始时间
      */
+    @ApiModelProperty(value = "预计开始时间", dataType = "String")
     @TableField("pre_start_time")
     private String preStartTime;
 
     /**
      * 预计结束时间
      */
+    @ApiModelProperty(value = "预计结束时间", dataType = "String")
     @TableField("pre_end_time")
     private String preEndTime;
 
     /**
      * 分包原因-字典
      */
+    @ApiModelProperty(value = "分包原因(字典code)", dataType = "String")
+    @DictCodeField(message = "分包原因描述不合法", cacheName = MeterDictCode.OUTSOURCE_REASON)
     @TableField("outsource_reason")
     private String outsourceReason;
 
+    @ApiModelProperty(value = "分包原因(字典value)", dataType = "String")
+    @TableField(exist = false)
+    private String outsourceReasonName;
+
     /**
      * 预计费用
      */
+    @ApiModelProperty(value = "预计费用", dataType = "String")
     @TableField("pre_cost")
     private String preCost;
 
     /**
      * 审批状态
      */
+    @ApiModelProperty(value = "审批状态", dataType = "String")
+    @DictCodeField(message = "审批状态描述不合法", cacheName = MeterDictCode.APPROVAL_STATUS)
     @TableField("approval_status")
     private String approvalStatus;
 
     /**
      * 流程实例id
      */
+    @ApiModelProperty(value = "流程实例id", dataType = "String")
     @TableField("process_id")
     private String processId;
 
     /**
      * 实验室认可情况
      */
+    @ApiModelProperty(value = "实验室认可情况", dataType = "String")
     @TableField("approve_situation")
     private String approveSituation;
 
     /**
      * 溯源性
      */
+    @ApiModelProperty(value = "溯源性", dataType = "String")
     @TableField("traceability")
     private String traceability;
 
     /**
      * 测试方法
      */
+    @ApiModelProperty(value = "测试方法", dataType = "String")
     @TableField("test_method")
     private String testMethod;
 
     /**
      * 技术能力
      */
+    @ApiModelProperty(value = "技术能力", dataType = "String")
     @TableField("technique_ability")
     private String techniqueAbility;
 
     /**
      * 创建时间
      */
+    @ApiModelProperty(hidden = true)
     @TableField("create_time")
     private String createTime;
 
     /**
      * 更新时间
      */
+    @ApiModelProperty(hidden = true)
     @TableField("update_time")
     private String updateTime;
 
+    @ApiModelProperty(value = "审批状态类型-字典value", dataType = "String")
+    @TableField(exist = false)
+    private String approvalStatusName;
 
+    @ApiModelProperty(value = "任务id（同意、驳回等操作使用）", dataType = "String")
+    @TableField(exist = false)
+    private String taskId;
+
+    @ApiModelProperty(value = "可选决策项（1同意驳回拒绝 2同意驳回 3同意拒绝，用于待审批列表同意/驳回/拒绝按钮展示）", dataType = "Integer")
+    @TableField(exist = false)
+    private Integer decisionItem;
+
+    @NotEmpty(message = "受检设备信息不能为空")
+    @ApiModelProperty(value = "受检设备id列表（新建使用参数）", dataType = "List")
+    @TableField(exist = false)
+    private List<OrderSampleDTO> orderSampleList;
+
+    @ExcelProperty(value = "分包机构名称", order = 3)
+    @ApiModelProperty(value = "分包机构名称（列表返回参数）", dataType = "String")
+    private String outsourcerName;
+
+    @ExcelProperty(value = "机构负责人", order = 4)
+    @ApiModelProperty(value = "机构负责人（列表返回参数）", dataType = "String")
+    private String director;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceProtocol.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceProtocol.java
new file mode 100644
index 0000000..38df697
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceProtocol.java
@@ -0,0 +1,225 @@
+package com.casic.missiles.model.business;
+
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
+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 com.casic.missiles.dto.BaseRequest;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotEmpty;
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 计量检定业务-分包管理-测试、校准或检定工作分包协议书
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-08-24
+ */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
+@Data
+@TableName("biz_business_outsource_protocol")
+public class BizBusinessOutsourceProtocol extends BaseRequest implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "id，更新/删除使用参数", dataType = "Long")
+    @TableId("id")
+    private Long id;
+
+    /**
+     * 协议书编号
+     */
+    @ExcelProperty(value = "协议书编号", order = 1)
+    @ApiModelProperty(value = "协议书编号(后台生成)", dataType = "String")
+    @TableField("protocol_no")
+    private String protocolNo;
+
+    /**
+     * 协议书名称
+     */
+    @ExcelProperty(value = "协议书名称", order = 2)
+    @ApiModelProperty(value = "协议书名称", dataType = "String")
+    @TableField("project_name")
+    private String projectName;
+
+    @NotEmpty(message = "实验室代码不能为空")
+    @DictCodeField(message = "实验室代码描述不合法", cacheName = MeterDictCode.LAB_CODE)
+    @ApiModelProperty(value = "实验室代码(字典code)", dataType = "String")
+    @TableField("lab_code")
+    private String labCode;
+
+    @ApiModelProperty(value = "实验室代码(字典value)", dataType = "String")
+    @TableField(exist = false)
+    private String labCodeName;
+
+    @NotEmpty(message = "组别代码不能为空")
+    @DictCodeField(message = "组别代码描述不合法", cacheName = MeterDictCode.GROUP_CODE)
+    @ApiModelProperty(value = "组别代码(字典code)", dataType = "String")
+    @TableField("group_code")
+    private String groupCode;
+
+    @ApiModelProperty(value = "组别代码(字典value)", dataType = "String")
+    @TableField(exist = false)
+    private String groupCodeName;
+
+    /**
+     * 分包方id
+     */
+    @ApiModelProperty(value = "分包方id", dataType = "Long")
+    @TableField("outsourcer_id")
+    private Long outsourcerId;
+
+    /**
+     * 其他
+     */
+    @ApiModelProperty(value = "其他", dataType = "String")
+    @TableField("remark")
+    private String remark;
+
+    /**
+     * 分包方编号
+     */
+    @ApiModelProperty(value = "分包方编号(新建不用传)", dataType = "String")
+    @TableField("outsource_no")
+    private String outsourceNo;
+
+    /**
+     * 分包方名称
+     */
+    @ExcelProperty(value = "分包方名称", order = 3)
+    @ApiModelProperty(value = "分包方名称(新建不用传)", dataType = "String")
+    @TableField("outsource_name")
+    private String outsourceName;
+
+    /**
+     * 联系人
+     */
+    @ExcelProperty(value = "联系人", order = 4)
+    @ApiModelProperty(value = "联系人", dataType = "String")
+    @TableField("contacts")
+    private String contacts;
+
+    /**
+     * 电话
+     */
+    @ApiModelProperty(value = "电话", dataType = "String")
+    @TableField("mobile")
+    private String mobile;
+
+    /**
+     * 地址
+     */
+    @ApiModelProperty(value = "地址", dataType = "String")
+    @TableField("address")
+    private String address;
+
+    /**
+     * 要求完成日期
+     */
+    @ApiModelProperty(value = "要求完成日期", dataType = "String")
+    @TableField("require_date")
+    private String requireDate;
+
+    /**
+     * 分包费用(元)
+     */
+    @ApiModelProperty(value = "分包费用(元)", dataType = "String")
+    @TableField("outsource_cost")
+    private Double outsourceCost;
+
+    /**
+     * 分包方负责人
+     */
+    @ApiModelProperty(value = "分包方负责人", dataType = "String")
+    @TableField("director")
+    private String director;
+
+    /**
+     * 分包项目
+     */
+    @ApiModelProperty(value = "分包项目", dataType = "String")
+    @TableField("item")
+    private String item;
+
+    /**
+     * 分包要求
+     */
+    @ApiModelProperty(value = "分包要求", dataType = "String")
+    @TableField("requires")
+    private String requires;
+
+    /**
+     * 创建人id
+     */
+    @ApiModelProperty(hidden = true)
+    @TableField("create_user_id")
+    private Long createUserId;
+
+    /**
+     * 创建人名字
+     */
+    @ExcelProperty(value = "申请人", order = 5)
+    @ApiModelProperty(value = "申请人", dataType = "String")
+    @TableField("create_user_name")
+    private String createUserName;
+
+    /**
+     * 审批状态
+     */
+    @ApiModelProperty(value = "审批状态", dataType = "String")
+    @DictCodeField(message = "审批状态描述不合法", cacheName = MeterDictCode.APPROVAL_STATUS)
+    @TableField("approval_status")
+    private String approvalStatus;
+
+    /**
+     * 流程实例id
+     */
+    @ApiModelProperty(value = "流程实例id", dataType = "String")
+    @TableField("process_id")
+    private String processId;
+
+    /**
+     * 创建时间
+     */
+    @ExcelProperty(value = "申请时间", order = 6)
+    @ApiModelProperty(value = "申请时间", dataType = "String")
+    @TableField("create_time")
+    private String createTime;
+
+    /**
+     * 更新时间
+     */
+    @ApiModelProperty(hidden = true)
+    @TableField("update_time")
+    private String updateTime;
+
+    @ApiModelProperty(value = "审批状态类型-字典value", dataType = "String")
+    @TableField(exist = false)
+    private String approvalStatusName;
+
+    @ApiModelProperty(value = "任务id（同意、驳回等操作使用）", dataType = "String")
+    @TableField(exist = false)
+    private String taskId;
+
+    @ApiModelProperty(value = "可选决策项（1同意驳回拒绝 2同意驳回 3同意拒绝，用于待审批列表同意/驳回/拒绝按钮展示）", dataType = "Integer")
+    @TableField(exist = false)
+    private Integer decisionItem;
+
+
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourcerInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourcerInfo.java
index ec4e997..f9aa69e 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourcerInfo.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourcerInfo.java
@@ -17,6 +17,7 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import javax.validation.constraints.NotEmpty;
 import java.io.Serializable;
 
 /**
@@ -59,6 +60,29 @@
     @TableField("outsourcer_name")
     private String outsourcerName;
 
+    @NotEmpty(message = "实验室代码不能为空")
+    @DictCodeField(message = "实验室代码描述不合法", cacheName = MeterDictCode.LAB_CODE)
+    @ApiModelProperty(value = "实验室代码(字典code)", dataType = "String")
+    @TableField("lab_code")
+    private String labCode;
+
+    @ApiModelProperty(value = "实验室代码(字典value)", dataType = "String")
+    @TableField(exist = false)
+    private String labCodeName;
+
+    /**
+     * 组别代码
+     */
+    @NotEmpty(message = "组别代码不能为空")
+    @DictCodeField(message = "组别代码描述不合法", cacheName = MeterDictCode.GROUP_CODE)
+    @ApiModelProperty(value = "组别代码(字典code)", dataType = "String")
+    @TableField("group_code")
+    private String groupCode;
+
+    @ApiModelProperty(value = "组别代码(字典value)", dataType = "String")
+    @TableField(exist = false)
+    private String groupCodeName;
+
     /**
      * 单位简称
      */
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardInfo.java
index c48eed7..dffdfdd 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardInfo.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardInfo.java
@@ -5,6 +5,7 @@
 import com.baomidou.mybatisplus.annotation.TableName;
 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;
 
@@ -18,6 +19,7 @@
  * @author wangpeng
  * @since 2023-08-04
  */
+@ApiModel
 @Data
 @TableName("biz_equipment_standard_info")
 public class BizEquipmentStandardInfo implements Serializable {
@@ -119,7 +121,7 @@
      * 管理状态(字典code)
      */
     @ApiModelProperty(value = "管理状态(字典code)", dataType = "String")
-    @DictCodeField(message = "管理状态不合法", cacheName = MeterDictCode.MANAGER_STATE)
+    @DictCodeField(message = "管理状态不合法", cacheName = MeterDictCode.STANDARD_MANAGER_STATE)
     @TableField("manage_status")
     private String manageStatus;
 
@@ -151,7 +153,7 @@
     /**
      * 温度(℃)
      */
-    @ApiModelProperty(value = "使用状态(字典code)", dataType = "String")
+    @ApiModelProperty(value = "温度(℃)", dataType = "String")
     @TableField("temperature")
     private Double temperature;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardInfoApproval.java b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardInfoApproval.java
index dbd86ab..9f58d83 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardInfoApproval.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardInfoApproval.java
@@ -150,7 +150,7 @@
      * 管理状态(字典code)
      */
     @ApiModelProperty(value = "管理状态(字典code)", dataType = "String")
-    @DictCodeField(message = "管理状态不合法", cacheName = MeterDictCode.MANAGER_STATE)
+    @DictCodeField(message = "管理状态不合法", cacheName = MeterDictCode.STANDARD_MANAGER_STATE)
     @TableField("manage_status")
     private String manageStatus;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardTechnologyRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardTechnologyRelation.java
index 0e612bd..751f26b 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardTechnologyRelation.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardTechnologyRelation.java
@@ -3,6 +3,7 @@
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -16,6 +17,7 @@
  * @author wangpeng
  * @since 2023-08-04
  */
+@ApiModel
 @Data
 @TableName("biz_equipment_standard_technology_relation")
 public class BizEquipmentStandardTechnologyRelation implements Serializable {
@@ -33,6 +35,10 @@
     @TableField("technology_file_id")
     private Long technologyFileId;
 
+    @ApiModelProperty(value = "依据的技术文件编号", dataType = "String")
+    @TableField("technology_file_no")
+    private String technologyFileNo;
+
     /**
      * 依据的技术文件名称(技术文件中现行测试校准检定方法表文件名字段)
      */
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerInfo.java
index d6e8bed..65cd6bc 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerInfo.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerInfo.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.model.resource;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -21,6 +28,11 @@
  * @author wangpeng
  * @since 2023-08-08
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @ApiModel
 @Data
 @TableName("biz_resource_customer_info")
@@ -35,6 +47,7 @@
     /**
      * 委托方编号
      */
+    @ExcelProperty(value = "委托方编号", order = 1)
     @ApiModelProperty(value = "委托方编号", dataType = "String")
     @TableField("customer_no")
     private String customerNo;
@@ -42,6 +55,7 @@
     /**
      * 委托方名称
      */
+    @ExcelProperty(value = "委托方名称", order = 2)
     @ApiModelProperty(value = "委托方名称(新建时为下拉选择一个受检单位组织的名字，传deptId字段，后端获取名称)", dataType = "String")
     @TableField("customer_name")
     private String customerName;
@@ -63,6 +77,7 @@
     /**
      * 联系人
      */
+    @ExcelProperty(value = "联系人", order = 3)
     @ApiModelProperty(value = "联系人", dataType = "String")
     @TableField("contacts")
     private String contacts;
@@ -70,6 +85,7 @@
     /**
      * 座机电话
      */
+    @ExcelProperty(value = "座机电话", order = 4)
     @ApiModelProperty(value = "座机电话", dataType = "String")
     @TableField("mobile")
     private String mobile;
@@ -77,6 +93,7 @@
     /**
      * 手机号码
      */
+    @ExcelProperty(value = "手机号码", order = 5)
     @ApiModelProperty(value = "手机号码", dataType = "String")
     @TableField("phone")
     private String phone;
@@ -91,6 +108,7 @@
     /**
      * 地址
      */
+    @ExcelProperty(value = "地址", order = 6)
     @ApiModelProperty(value = "地址", dataType = "String")
     @TableField("address")
     private String address;
@@ -141,6 +159,7 @@
     /**
      * 创建时间
      */
+    @ExcelProperty(value = "创建时间", order = 7)
     @ApiModelProperty(value = "创建时间", dataType = "String")
     @TableField("create_time")
     private String createTime;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerSuggestForm.java b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerSuggestForm.java
index 7201bbd..701bf8b 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerSuggestForm.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerSuggestForm.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.model.resource;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -22,6 +29,11 @@
  * @author wangpeng
  * @since 2023-08-08
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @ApiModel
 @Data
 @TableName("biz_resource_customer_suggest_form")
@@ -44,7 +56,8 @@
     /**
      * 委托方名称
      */
-    @ApiModelProperty(value = "委托方名称", dataType = "String")
+    @ExcelProperty(value = "意见反馈单位", order = 2)
+    @ApiModelProperty(value = "意见反馈单位", dataType = "String")
     @TableField("customer_name")
     private String customerName;
 
@@ -59,7 +72,8 @@
     /**
      * 委托方意见反馈部门名称
      */
-    @ApiModelProperty(value = "委托方意见反馈部门名称", dataType = "String")
+    @ExcelProperty(value = "委托方意见反馈部门", order = 3)
+    @ApiModelProperty(value = "委托方意见反馈部门", dataType = "String")
     @TableField("customer_dept_name")
     private String customerDeptName;
 
@@ -73,6 +87,7 @@
     /**
      * 表单编号
      */
+    @ExcelProperty(value = "表单编号", order = 1)
     @ApiModelProperty(value = "表单编号", dataType = "String")
     @TableField("form_no")
     private String formNo;
@@ -111,6 +126,7 @@
     /**
      * 创建人名字
      */
+    @ExcelProperty(value = "创建人", order = 4)
     @ApiModelProperty(value = "创建人名字", dataType = "String")
     @TableField("create_user_name")
     private String createUserName;
@@ -147,6 +163,7 @@
     /**
      * 创建时间
      */
+    @ExcelProperty(value = "创建时间", order = 5)
     @ApiModelProperty(value = "创建时间", dataType = "String")
     @TableField("create_time")
     private String createTime;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSealInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSealInfo.java
index cbf05d7..9bf389d 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSealInfo.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSealInfo.java
@@ -106,6 +106,10 @@
     @TableField("minio_file_name")
     private String minioFileName;
 
+    @ApiModelProperty(value = "minio存储文件url", dataType = "String")
+    @TableField(exist = false)
+    private String minioFileUrl;
+
     @ApiModelProperty(value = "创建时间", dataType = "String")
     @TableField("create_time")
     private String createTime;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSealUseNote.java b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSealUseNote.java
index 3f2d9e8..3ce16a8 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSealUseNote.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSealUseNote.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.model.resource;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -20,6 +27,11 @@
  * @author wangpeng
  * @since 2023-07-28
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @ApiModel
 @Data
 @TableName("biz_resource_seal_use_note")
@@ -34,6 +46,7 @@
     /**
      * 登记表编号
      */
+    @ExcelProperty(value = "申请单编号", order = 1)
     @ApiModelProperty(value = "登记表编号(自动生成)", dataType = "String")
     @TableField("note_form_no")
     private String noteFormNo;
@@ -55,6 +68,7 @@
     /**
      * 申请部门
      */
+    @ExcelProperty(value = "申请部门", order = 5)
     @ApiModelProperty(value = "申请部门", dataType = "String")
     @TableField("apply_dept_name")
     private String applyDeptName;
@@ -69,6 +83,7 @@
     /**
      * 申请人
      */
+    @ExcelProperty(value = "申请人", order = 6)
     @ApiModelProperty(value = "申请人", dataType = "String")
     @TableField("apply_user_name")
     private String applyUserName;
@@ -76,6 +91,7 @@
     /**
      * 申请时间
      */
+    @ExcelProperty(value = "申请时间", order = 7)
     @ApiModelProperty(value = "申请时间(新增自动获取当前时间)", dataType = "String")
     @TableField("apply_time")
     private String applyTime;
@@ -130,6 +146,26 @@
     @TableField("update_time")
     private String updateTime;
 
+    @ExcelProperty(value = "印章名称", order = 2)
+    @ApiModelProperty(value = "印章名称(列表返回参数)", dataType = "String")
+    @TableField(exist = false)
+    private String sealName;
+
+    @DictCodeField(message = "印章类型描述不合法", cacheName = MeterDictCode.SEAL_TYPE)
+    @ApiModelProperty(hidden = true)
+    @TableField(exist = false)
+    private String sealType;
+
+    @ExcelProperty(value = "印章类型", order = 3)
+    @ApiModelProperty(value = "印章类型(列表返回参数)", dataType = "String")
+    @TableField(exist = false)
+    private String sealTypeName;
+
+    @ExcelProperty(value = "批准人", order = 4)
+    @ApiModelProperty(value = "批准人(列表返回参数)", dataType = "String")
+    @TableField(exist = false)
+    private String approverName;
+
     @ApiModelProperty(value = "审批状态类型-字典value", dataType = "String")
     @TableField(exist = false)
     private String approvalStatusName;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceStaffInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceStaffInfo.java
index 5ef995b..41563a1 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceStaffInfo.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceStaffInfo.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.model.resource;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -20,6 +27,11 @@
  * @author wangpeng
  * @since 2023-07-25
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @ApiModel
 @Data
 @TableName("biz_resource_staff_info")
@@ -38,6 +50,7 @@
     /**
      * 人员编号
      */
+    @ExcelProperty(value = "人员编号",order = 0)
     @NotEmpty(message = "人员编号不能为空")
     @ApiModelProperty(value = "人员编号", dataType = "String")
     @TableField("staff_no")
@@ -46,6 +59,7 @@
     /**
      * 姓名
      */
+    @ExcelProperty(value = "姓名",order = 1)
     @ApiModelProperty(value = "姓名", dataType = "String")
     @TableField("staff_name")
     private String staffName;
@@ -152,13 +166,15 @@
     /**
      * 部门名字
      */
-    @ApiModelProperty(value = "部门名字", dataType = "String")
+    @ExcelProperty(value = "工作部门",order = 4)
+    @ApiModelProperty(value = "工作部门", dataType = "String")
     @TableField("dept_name")
     private String deptName;
 
     /**
      * 岗位
      */
+    @ExcelProperty(value = "岗位",order = 2)
     @ApiModelProperty(value = "岗位", dataType = "String")
     @TableField("station")
     private String station;
@@ -166,6 +182,7 @@
     /**
      * 计量专业
      */
+    @ExcelProperty(value = "计量专业",order = 5)
     @ApiModelProperty(value = "计量专业", dataType = "String")
     @TableField("major")
     private String major;
@@ -173,6 +190,7 @@
     /**
      * 证号
      */
+    @ExcelProperty(value = "证号",order = 3)
     @ApiModelProperty(value = "证号", dataType = "String")
     @TableField("certificate_number")
     private String certificateNumber;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSupplierInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSupplierInfo.java
index eb5ef01..a1e2697 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSupplierInfo.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSupplierInfo.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.model.resource;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -20,6 +27,11 @@
  * @author wangpeng
  * @since 2023-07-27
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @ApiModel
 @Data
 @TableName("biz_resource_supplier_info")
@@ -34,6 +46,7 @@
     /**
      * 供方编号
      */
+    @ExcelProperty(value = "供方编号", order = 1)
     @ApiModelProperty(value = "供方编号(自动生成)", dataType = "String")
     @TableField("supplier_no")
     private String supplierNo;
@@ -41,6 +54,7 @@
     /**
      * 供方名称
      */
+    @ExcelProperty(value = "供方名称", order = 2)
     @ApiModelProperty(value = "供方名称", dataType = "String")
     @TableField("supplier_name")
     private String supplierName;
@@ -60,6 +74,7 @@
     @TableField("supplier_type")
     private String supplierType;
 
+    @ExcelProperty(value = "供方类型", order = 3)
     @ApiModelProperty(value = "供方类型(字典value)", dataType = "String")
     @TableField(exist = false)
     private String supplierTypeName;
@@ -109,7 +124,8 @@
     /**
      * 电话
      */
-    @ApiModelProperty(value = "电话", dataType = "String")
+    @ExcelProperty(value = "联系电话", order = 4)
+    @ApiModelProperty(value = "联系电话", dataType = "String")
     @TableField("phone")
     private String phone;
 
@@ -158,6 +174,7 @@
     /**
      * 公司地址-省
      */
+    @ExcelProperty(value = "地址-省", order = 6)
     @ApiModelProperty(value = "公司地址-省", dataType = "String")
     @TableField("company_province_name")
     private String companyProvinceName;
@@ -172,6 +189,7 @@
     /**
      * 公司地址-市
      */
+    @ExcelProperty(value = "地址-市", order = 7)
     @ApiModelProperty(value = "公司地址-市", dataType = "String")
     @TableField("company_city_name")
     private String companyCityName;
@@ -186,6 +204,7 @@
     /**
      * 公司地址-区
      */
+    @ExcelProperty(value = "地址-区", order = 8)
     @ApiModelProperty(value = "公司地址-区", dataType = "String")
     @TableField("company_area_name")
     private String companyAreaName;
@@ -193,6 +212,7 @@
     /**
      * 公司地址-详细地址
      */
+    @ExcelProperty(value = "地址-详细地址", order = 9)
     @ApiModelProperty(value = "公司地址-详细地址", dataType = "String")
     @TableField("company_address")
     private String companyAddress;
@@ -200,6 +220,7 @@
     /**
      * 服务和供应的内容
      */
+    @ExcelProperty(value = "服务和供应的内容", order = 5)
     @ApiModelProperty(value = "服务和供应的内容", dataType = "String")
     @TableField("supplier_content")
     private String supplierContent;
@@ -250,6 +271,7 @@
     /**
      * 创建时间
      */
+    @ExcelProperty(value = "创建时间", order = 9)
     @ApiModelProperty(value = "创建时间", dataType = "String")
     @TableField("create_time")
     private String createTime;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/EnvLocationInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/EnvLocationInfo.java
new file mode 100644
index 0000000..d8e2d7b
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/EnvLocationInfo.java
@@ -0,0 +1,83 @@
+package com.casic.missiles.model.resource;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotEmpty;
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 实验室环境监控系统-设备表
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-06-07
+ */
+@ApiModel
+@Data
+@TableName("env_location_info")
+public class EnvLocationInfo implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "主键id", dataType = "Long")
+    @TableId("id")
+    private Long id;
+
+    /**
+     * 地点编号
+     */
+    @NotEmpty(message = "地点编号不能为空")
+    @ApiModelProperty(value = "地点编号", dataType = "String")
+    @TableField("location_no")
+    private String locationNo;
+
+    /**
+     * 地点名称
+     */
+    @ApiModelProperty(value = "地点名称", dataType = "String")
+    @TableField("location_name")
+    private String locationName;
+
+    /**
+     * 地点位置
+     */
+    @ApiModelProperty(value = "地点位置", dataType = "String")
+    @TableField("location_position")
+    private String locationPosition;
+
+    /**
+     * 创建人id
+     */
+    @ApiModelProperty(value = "创建人id", dataType = "Long")
+    @TableField("create_user_id")
+    private Long createUserId;
+
+    /**
+     * 创建人
+     */
+    @ApiModelProperty(value = "创建人", dataType = "String")
+    @TableField("create_user")
+    private String createUser;
+
+    /**
+     * 创建时间
+     */
+    @ApiModelProperty(value = "创建时间", dataType = "String")
+    @TableField("create_time")
+    private String createTime;
+
+    /**
+     * 更新时间
+     */
+    @ApiModelProperty(value = "更新时间", dataType = "String")
+    @TableField("update_time")
+    private String updateTime;
+
+
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemFileConfig.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemFileConfig.java
index 19e6845..86e569c 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemFileConfig.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemFileConfig.java
@@ -30,7 +30,7 @@
     @ApiModelProperty(value = "系统类别(1业务系统2受检系统3环境系统)", dataType = "Integer")
     @NotNull(message = "系统类别不能为空")
     @TableField("system_type")
-    private Integer systemType;
+    private Integer systemType = 1;
 
     @ApiModelProperty("下载编号")
     @TableField("download_no")
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemNotice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemNotice.java
index e94297d..06ec37d 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemNotice.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemNotice.java
@@ -34,7 +34,7 @@
     @ApiModelProperty(value = "系统类别(1业务系统2受检系统3环境系统)", dataType = "Integer")
     @NotNull(message = "系统类别不能为空")
     @TableField("system_type")
-    private Integer systemType;
+    private Integer systemType = 1;
 
     /**
      * 通知公告编号
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSign.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSign.java
index 6c0d7c9..954f4f8 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSign.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSign.java
@@ -51,7 +51,7 @@
     @ApiModelProperty(value = "系统类别(1业务系统2受检系统3环境系统)", dataType = "Integer")
     @NotNull(message = "系统类别不能为空")
     @TableField("system_type")
-    private Integer systemType;
+    private Integer systemType = 1;
 
     /**
      * 签名编号
@@ -130,4 +130,8 @@
     @TableField(exist = false)
     private List<Long> userIdList;
 
+    @ApiModelProperty(hidden = true)
+    @TableField(exist = false)
+    private String deptName;
+
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemTemplate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemTemplate.java
index 503a457..1d27ebe 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemTemplate.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemTemplate.java
@@ -47,7 +47,7 @@
     @ApiModelProperty(value = "系统类别(1业务系统2受检系统3环境系统)", dataType = "Integer")
     @NotNull(message = "系统类别不能为空")
     @TableField("system_type")
-    private Integer systemType;
+    private Integer systemType = 1;
 
     /**
      * 模板编号
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java
index 8c21cb0..f61e4a8 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java
@@ -32,4 +32,8 @@
     ReturnDTO approvalDelete(ApprovalDeleteRequest request);
 
     ReturnDTO failUpdate(T request);
+
+    List<O> listExport(R request);
+
+    List<O> listExportByIds(List<Long> ids);
 }

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java
index bb0c50f..13a699b 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java
@@ -12,6 +12,7 @@
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.IGeneralApprovalService;
+import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
@@ -19,6 +20,7 @@
 import org.springframework.web.bind.annotation.RequestBody;
 
 import javax.validation.Valid;
+import java.util.List;
 import java.util.Objects;
 
 /**
@@ -117,4 +119,17 @@
         }
         return baseApprovalService.failUpdate(request);
     }
+
+    public List<O> exportList(@RequestBody @Valid R request) throws Exception {
+        List<O> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = baseApprovalService.listExportByIds(request.getIds());
+        } else {
+            list = baseApprovalService.listExport(request);
+        }
+        for (O record : list) {
+            DictCodeUtils.convertDictCodeToName(record);
+        }
+        return list;
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java
index 8a90961..d775831 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java
@@ -5,6 +5,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.business.certificate.CertificateChangeApplyApprovalListRequest;
 import com.casic.missiles.dto.business.certificate.CertificateChangeApplySaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessCertificateChangeApply;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
@@ -20,6 +21,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -48,4 +50,12 @@
         }
         return changeApplyService.saveChangeApply(request);
     }
+
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody CertificateChangeApplyApprovalListRequest request) throws Exception {
+        List<BizBusinessCertificateChangeApply> list = super.exportList(request);
+        super.exportExcel(BizBusinessCertificateChangeApply.class, list, ExportEnum.CERTIFICATE_CHANGE_APPLY.getSheetName());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java
index 5fc4b07..af8230e 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java
@@ -9,6 +9,7 @@
 import com.casic.missiles.dto.business.certificate.CertificatePrintApprovalListRequest;
 import com.casic.missiles.dto.business.certificate.CertificatePrintListResponse;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.enums.business.CertificatePrintStatusEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessCertificatePrintLog;
@@ -18,10 +19,16 @@
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.io.IOException;
+import java.util.List;
 import java.util.Objects;
 
 /**
@@ -98,4 +105,16 @@
         });
         return certificatePrintService.certificatePrintLog(idDTO.getId());
     }
+
+    @ApiOperation("证书打印审批导出")
+    @PostMapping("/listExport")
+    public void exportList(@RequestBody CertificatePrintApprovalListRequest request) throws IOException {
+        List<CertificatePrintListResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = certificatePrintService.listByIds(request.getIds());
+        } else {
+            list = certificatePrintService.list(request);
+        }
+        super.exportExcel(CertificatePrintListResponse.class, list, ExportEnum.CERTIFICATE_PRINT.getSheetName());
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java
index 63b06dc..6b2efd5 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java
@@ -6,6 +6,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.business.certificate.CertificateReportApprovalListRequest;
 import com.casic.missiles.dto.business.certificate.CertificateReportSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessCertificateReport;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
@@ -21,6 +22,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -50,7 +52,7 @@
         return certificateReportService.saveCertificateReport(request);
     }
 
-    @ApiOperation("证书审批详情（基本信息）")
+    @ApiOperation("详情（基本信息）")
     @PostMapping("/detail")
     public ReturnDTO<BizBusinessCertificateReport> detail(@RequestBody @Valid BaseDetailRequest request, BindingResult bindingResult) throws Exception {
         if(bindingResult.hasErrors()){
@@ -59,4 +61,11 @@
         return certificateReportService.detail(request);
     }
 
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody CertificateReportApprovalListRequest request) throws Exception {
+        List<BizBusinessCertificateReport> list = super.exportList(request);
+        super.exportExcel(BizBusinessCertificateReport.class, list, ExportEnum.CERTIFICATE_REPORT.getSheetName());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java
index 46b26bd..57c0809 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java
@@ -10,20 +10,21 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.business.identify.IdentifyListRequest;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessIdentifyInfo;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.business.IBizBusinessIdentifyInfoService;
+import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import javax.validation.Valid;
+import java.util.List;
 import java.util.Objects;
 
 /**
@@ -57,16 +58,13 @@
         return identifyInfoService.addIdentify(identifyInfo);
     }
 
-    @ApiOperation("标识打印更新")
+    @ApiOperation("标识打印更新（更新打印时间）")
     @PostMapping("/update")
-    public ReturnDTO updateIdentify(@RequestBody @Valid BizBusinessIdentifyInfo identifyInfo, BindingResult bindingResult) {
-        Assert.isFalse(Objects.isNull(identifyInfo.getId()), () -> {
+    public ReturnDTO updateIdentify(@RequestBody @Valid IdDTO idDTO) {
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        Assert.isFalse(bindingResult.hasErrors(), () -> {
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        });
-        return identifyInfoService.updateIdentify(identifyInfo);
+        return identifyInfoService.updateIdentify(idDTO.getId());
     }
 
     @ApiOperation("标识打印删除")
@@ -77,4 +75,37 @@
         });
         return identifyInfoService.deleteIdentify(idDTO.getId());
     }
+
+    @ApiOperation("标识打印导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody @Valid IdentifyListRequest request, BindingResult bindingResult) throws Exception {
+        if (bindingResult.hasErrors()) {
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        List<BizBusinessIdentifyInfo> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = identifyInfoService.listByIds(request.getIds());
+        } else {
+            list = identifyInfoService.list(request);
+        }
+        for (BizBusinessIdentifyInfo record : list) {
+            DictCodeUtils.convertDictCodeToName(record);
+        }
+        super.exportExcel(BizBusinessIdentifyInfo.class, list, ExportEnum.IDENTIFY_EXPORT.getSheetName());
+    }
+
+
+    // TODO: 2023/8/23 查询设备信息，4个底部按钮查设备（按钮的作用就是前端用来调不同接口、用来区分中间即将展示的标识），前端弹窗选设备，在确定保存时前端根据底部按钮判断传入设备类型deviceType字典code
+    // TODO: 2023/8/23 接口：查受检设备（第1个按钮），查设备台账（后3个按钮同一接口），查询之后前端根据标志类型的不同加到中间页面时进行判断（按产品给的对应表）
+    // TODO: 2023/8/23 提供二维码接口，前端在加到中间页面时调用一下
+
+    @ApiOperation("设备二维码")
+    @PostMapping("/equipment/qrCode")
+    public ReturnDTO<String> equipmentQrCode(@RequestBody @Valid IdDTO idDTO) {
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return identifyInfoService.equipmentQrCode(idDTO.getId());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java
index 707be6e..7e0453d 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java
@@ -117,7 +117,7 @@
     }
 
     @ApiOperation("任务单导出")
-    @PostMapping("/export")
+    @PostMapping("/listExport")
     public void orderExport(@RequestBody @Valid OrderListRequest request, HttpServletResponse response) {
         businessOrderService.orderExport(request, response);
     }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java
index 529a6ce..51432be 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java
@@ -1,9 +1,28 @@
 package com.casic.missiles.controller.business;
 
+import com.casic.missiles.controller.GeneralApprovalController;
+import com.casic.missiles.dto.BaseApprovalSubmitRequest;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.business.outsource.OutsourceAssessApprovalListRequest;
+import com.casic.missiles.dto.business.outsource.OutsourceAssessSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
+import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.model.business.BizBusinessOutsourceAssess;
+import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
+import com.casic.missiles.service.IGeneralApprovalService;
+import com.casic.missiles.service.business.IBizBusinessOutsourceAssessService;
 import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.BindingResult;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.validation.Valid;
+import java.util.List;
+
 /**
  * <p>
  * 计量检定业务-分包管理-测试、校准或检定工作分包评审表 前端控制器
@@ -15,6 +34,27 @@
 @Api(tags = "分包管理-测试、校准或检定工作分包评审表")
 @RestController
 @RequestMapping("/business/outsource/assess")
-public class BizBusinessOutsourceAssessController {
+public class BizBusinessOutsourceAssessController extends GeneralApprovalController<BizBusinessOutsourceAssess, BizBusinessOutsourceAssess, OutsourceAssessApprovalListRequest, BaseApprovalSubmitRequest> {
+    @Autowired
+    private IBizBusinessOutsourceAssessService outsourceAssessService;
 
+    public BizBusinessOutsourceAssessController(IGeneralApprovalService<BizBusinessOutsourceAssess, BizBusinessOutsourceAssess, OutsourceAssessApprovalListRequest, BaseApprovalSubmitRequest> baseApprovalService) {
+        super(baseApprovalService);
+    }
+
+    @ApiOperation("草稿箱-保存")
+    @PostMapping("/save")
+    public ReturnDTO<OutsourceAssessSaveResponse> saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceAssess request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        return outsourceAssessService.saveOutsourceAssess(request);
+    }
+
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception {
+        List<BizBusinessOutsourceAssess> list = super.exportList(request);
+        super.exportExcel(BizBusinessOutsourceAssess.class, list, ExportEnum.OUTSOURCE_ASSESS.getSheetName());
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java
new file mode 100644
index 0000000..9adef18
--- /dev/null
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java
@@ -0,0 +1,60 @@
+package com.casic.missiles.controller.business;
+
+import com.casic.missiles.controller.GeneralApprovalController;
+import com.casic.missiles.dto.BaseApprovalSubmitRequest;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.business.outsource.OutsourceProtocolApprovalListRequest;
+import com.casic.missiles.dto.business.outsource.OutsourceProtocolSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
+import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.model.business.BizBusinessOutsourceProtocol;
+import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
+import com.casic.missiles.service.IGeneralApprovalService;
+import com.casic.missiles.service.business.IBizBusinessOutsourceProtocolService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.BindingResult;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.validation.Valid;
+import java.util.List;
+
+/**
+ * <p>
+ * 计量检定业务-分包管理-测试、校准或检定工作分包协议书 前端控制器
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-08-24
+ */
+@Api(tags = "分包管理-测试、校准或检定工作分包协议书")
+@RestController
+@RequestMapping("/business/outsource/protocol")
+public class BizBusinessOutsourceProtocolController extends GeneralApprovalController<BizBusinessOutsourceProtocol, BizBusinessOutsourceProtocol, OutsourceProtocolApprovalListRequest, BaseApprovalSubmitRequest> {
+    @Autowired
+    private IBizBusinessOutsourceProtocolService outsourceProtocolService;
+
+    public BizBusinessOutsourceProtocolController(IGeneralApprovalService<BizBusinessOutsourceProtocol, BizBusinessOutsourceProtocol, OutsourceProtocolApprovalListRequest, BaseApprovalSubmitRequest> baseApprovalService) {
+        super(baseApprovalService);
+    }
+
+    @ApiOperation("草稿箱-保存")
+    @PostMapping("/save")
+    public ReturnDTO<OutsourceProtocolSaveResponse> saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceProtocol request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        return outsourceProtocolService.saveOutsourceProtocol(request);
+    }
+
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody OutsourceProtocolApprovalListRequest request) throws Exception {
+        List<BizBusinessOutsourceProtocol> list = super.exportList(request);
+        super.exportExcel(BizBusinessOutsourceProtocol.class, list, ExportEnum.OUTSOURCE_PROTOCOL.getSheetName());
+    }
+}
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java
index 097f645..f0f0943 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java
@@ -17,7 +17,6 @@
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.IGeneralApprovalService;
 import com.casic.missiles.service.business.IBizBusinessOutsourcerInfoService;
-import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -71,19 +70,8 @@
 
     @ApiOperation("分包方导出")
     @PostMapping("/listExport")
-    public void export(@RequestBody @Valid OutsourcerInfoApprovalListRequest request, BindingResult bindingResult) throws Exception {
-        if (bindingResult.hasErrors()) {
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        }
-        List<BizBusinessOutsourcerInfo> list;
-        if (!CollectionUtils.isEmpty(request.getIds())) {
-            list = outsourcerInfoService.listByIds(request.getIds());
-        } else {
-            list = outsourcerInfoService.list(request);
-        }
-        for (BizBusinessOutsourcerInfo record : list) {
-            DictCodeUtils.convertDictCodeToName(record);
-        }
+    public void export(@RequestBody OutsourcerInfoApprovalListRequest request) throws Exception {
+        List<BizBusinessOutsourcerInfo> list = super.exportList(request);
         super.exportExcel(BizBusinessOutsourcerInfo.class, list, ExportEnum.OUTSOURCER_EXPORT.getSheetName());
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java
index c2cbf9f..0410918 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java
@@ -17,11 +17,9 @@
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.IGeneralApprovalService;
 import com.casic.missiles.service.business.IBizBusinessSiteExecutiveInfoService;
-import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -60,7 +58,7 @@
         return siteExecutiveInfoService.saveSiteExecutiveInfo(siteExecutiveInfo);
     }
 
-    @ApiOperation("现场检测详情")
+    @ApiOperation("详情")
     @PostMapping("/detail")
     public ReturnDTO<SiteExecutiveDetailResponse> siteExecutiveDetail(@RequestBody @Valid IdDTO idDTO) throws Exception {
         Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
@@ -69,21 +67,10 @@
         return ReturnUtil.success(siteExecutiveInfoService.detail(idDTO.getId()));
     }
 
-    @ApiOperation("现场检测导出")
+    @ApiOperation("导出")
     @PostMapping("/listExport")
-    public void export(@RequestBody @Valid SiteExecutiveApprovalListRequest request, BindingResult bindingResult) throws Exception {
-        if (bindingResult.hasErrors()) {
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        }
-        List<SiteExecutiveApprovalListResponse> list;
-        if (!CollectionUtils.isEmpty(request.getIds())) {
-            list = siteExecutiveInfoService.listInfoByIds(request.getIds());
-        } else {
-            list = siteExecutiveInfoService.listInfo(request);
-        }
-        for (SiteExecutiveApprovalListResponse record : list) {
-            DictCodeUtils.convertDictCodeToName(record);
-        }
+    public void export(@RequestBody SiteExecutiveApprovalListRequest request) throws Exception {
+        List<SiteExecutiveApprovalListResponse> list = super.exportList(request);
         super.exportExcel(SiteExecutiveApprovalListResponse.class, list, ExportEnum.SITE_EXECUTIVE_EXPORT.getSheetName());
     }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
index 7e793cd..a92e209 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
@@ -55,7 +55,7 @@
 
     @ApiOperation("设备收发列表导出")
     @PostMapping("/export")
-    public void exportList(@RequestBody @Valid SampleDispatchListRequest request) throws IOException {
+    public void exportList(@RequestBody SampleDispatchListRequest request) throws IOException {
         List<SampleDispatchListResponse> list;
         if (!CollectionUtils.isEmpty(request.getIds())) {
             list = dispatchService.listByIds(request.getIds());
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java
index cdc77fc..d120fd4 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java
@@ -7,6 +7,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.business.labExecutive.*;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.business.IBusinessLabExecutiveInfoService;
@@ -14,6 +15,7 @@
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.*;
 
@@ -32,7 +34,7 @@
     @Autowired
     private IBusinessLabExecutiveInfoService labExecutiveInfoService;
 
-    @ApiOperation("实验室检测-部门检测-查询各状态列表（待检测、检测中、检测完）")
+    @ApiOperation("实验室任务-查询各状态列表（待检测、检测中、检测完）")
     @PostMapping("/deptExecutive/List")
     public ReturnDTO<PageInfoBT<SampleLabExecutiveListResponse>> queryDeptExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
@@ -43,10 +45,19 @@
         return ReturnUtil.success(super.packForBT(labExecutiveInfoService.deptLabExecutiveListPage(page, labExecutiveListRequest)));
     }
 
-    /**
-     * 实验室检测-我的检测-查询各状态列表（待检测、检测中、检测完）
-     */
-    @ApiOperation("实验室检测-我的检测-查询各状态列表（待检测、检测中、检测完）")
+    @ApiOperation("实验室任务导出")
+    @PostMapping("/deptExecutive/export")
+    public void deptExportList(@RequestBody @Valid SampleLabExecutiveListRequest request) throws Exception {
+        List<SampleLabExecutiveListResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = labExecutiveInfoService.deptLabExecutiveListByIds(request.getMeasureStatus(), request.getIds());
+        } else {
+            list = labExecutiveInfoService.deptLabExecutiveList(request);
+        }
+        super.exportExcel(SampleLabExecutiveListResponse.class, list, ExportEnum.DEPT_EXECUTIVE_TASK.getSheetName());
+    }
+
+    @ApiOperation("我的任务-查询各状态列表（待检测、检测中、检测完）")
     @PostMapping("/myExecutive/list")
     public ReturnDTO<PageInfoBT<SampleLabExecutiveListResponse>> queryMyExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
@@ -57,19 +68,25 @@
         return ReturnUtil.success(super.packForBT(labExecutiveInfoService.myLabExecutiveListPage(page, labExecutiveListRequest)));
     }
 
-    /**
-     * 实验室检测-我的检测-查询各状态样品数量（待检测、检测中、检测完）
-     */
-    @ApiOperation("实验室检测-我的检测-查询各状态样品数量（待检测、检测中、检测完）")
+    @ApiOperation("我的任务导出")
+    @PostMapping("/myExecutive/export")
+    public void exportList(@RequestBody @Valid SampleLabExecutiveListRequest request) throws Exception {
+        List<SampleLabExecutiveListResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = labExecutiveInfoService.myLabExecutiveListByIds(request.getMeasureStatus(), request.getIds());
+        } else {
+            list = labExecutiveInfoService.myLabExecutiveList(request);
+        }
+        super.exportExcel(SampleLabExecutiveListResponse.class, list, ExportEnum.MY_EXECUTIVE_TASK.getSheetName());
+    }
+
+    @ApiOperation("我的任务-查询各状态样品数量（待检测、检测中、检测完）")
     @GetMapping("/myExecutive/amount")
     public ReturnDTO<List<SampleAmountResponse>> queryMyExecutiveAmount() {
         return ReturnUtil.success(labExecutiveInfoService.myExecutiveAmount());
     }
 
-    /**
-     * 实验室检测-部门检测-分配（分配给具体人员）
-     */
-    @ApiOperation("实验室检测-部门检测-分配按钮（分配给具体人员）")
+    @ApiOperation("实验室任务-分配按钮（分配给具体人员）")
     @PostMapping("/deptExecutive/allocate")
     public ReturnDTO allocateStaff(@RequestBody @Valid SampleAllocateRequest sampleAllocateRequest, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -78,10 +95,7 @@
         return labExecutiveInfoService.allocateStaff(sampleAllocateRequest);
     }
 
-    /**
-     * 实验室检测-我的检测-检定人扫描收入（待检测->检测中）
-     */
-    @ApiOperation("实验室检测-我的检测-检定人扫描收入（待检测->检测中）")
+    @ApiOperation("我的任务-检定人扫描收入（待检测->检测中）")
     @PostMapping("/myExecutive/receive")
     public ReturnDTO sampleReceive(@RequestBody @Valid List<SampleOperateRequest> requestList, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -90,10 +104,7 @@
         return labExecutiveInfoService.sampleReceive(requestList);
     }
 
-    /**
-     * 实验室检测-负责人/检定人扫描检完（检测中->检测完）
-     */
-    @ApiOperation("实验室检测-负责人/检定人扫描检完（检测中->检测完）")
+    @ApiOperation("实验室任务-负责人/检定人扫描检完（检测中->检测完）")
     @PostMapping("/myExecutive/complete")
     public ReturnDTO sampleExecutiveComplete(@RequestBody @Valid List<SampleOperateRequest> requestList, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -102,10 +113,7 @@
         return labExecutiveInfoService.sampleExecutiveComplete(requestList);
     }
 
-    /**
-     * 实验室检测-部门检测/我的检测 编辑（只能修改应出具证书）
-     */
-    @ApiOperation("实验室检测-部门检测/我的检测 编辑（只能修改应出具证书）")
+    @ApiOperation("实验室任务/我的任务 编辑（只能修改应出具证书）")
     @PostMapping("/executive/update")
     public ReturnDTO updateExecutive(@RequestBody @Valid UpdateExecutiveRequest request, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -114,10 +122,7 @@
         return labExecutiveInfoService.updateExecutive(request);
     }
 
-    /**
-     * 实验室检测-部门检测/我的检测 详情
-     */
-    @ApiOperation("实验室检测-部门检测/我的检测 详情")
+    @ApiOperation("实验室任务/我的任务 详情")
     @PostMapping("/executive/detail")
     public ReturnDTO<ExecutiveDetailResponse> executiveDetail(@RequestBody @Valid ExecutiveDetailRequest request, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
@@ -131,7 +136,7 @@
      * 退回后会将下一个要执行的实验室检测状态更新为待分配，将后面的实验室顺序变更为连续（都进行减1）
      * 最后一个检测的实验室退回，等分发员再增加实验室或设备收发中的已收入直接手动点击完成
      */
-    @ApiOperation("实验室检测-部门检测/我的检测 退回（待检测/检测中->退回）")
+    @ApiOperation("实验室任务/我的任务 退回（待检测/检测中->退回）")
     @PostMapping("/executive/sendBack")
     public ReturnDTO executiveSendBack(@RequestBody @Valid ExecutiveSendBackRequest request, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -140,9 +145,6 @@
         return labExecutiveInfoService.sampleExecutiveSendBack(request);
     }
 
-    /**
-     * 分发员编辑实验室检测列表
-     */
     @ApiOperation("分发员编辑实验室检测列表")
     @PostMapping("/handOut/updateList")
     public ReturnDTO updateExecutiveList(@RequestBody @Valid UpdateExecutiveListRequest request, BindingResult bindingResult) {
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java
index 48a67ed..0c04f31 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java
@@ -10,6 +10,7 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.resource.customer.CustomerApprovalListRequest;
 import com.casic.missiles.dto.resource.customer.CustomerSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceCustomerInfo;
@@ -26,6 +27,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -55,6 +57,13 @@
         return customerInfoService.saveCustomerInfo(request);
     }
 
+    @ApiOperation("委托方名录导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody CustomerApprovalListRequest request) throws Exception {
+        List<BizResourceCustomerInfo> list = super.exportList(request);
+        super.exportExcel(BizResourceCustomerInfo.class, list, ExportEnum.CUSTOMER_INFO.getSheetName());
+    }
+
     @ApiOperation("委托方人员列表（分页）")
     @PostMapping("/person/listPage")
     public ReturnDTO<PageInfoBT<BizResourceCustomerStaff>> personListPage(@RequestBody IdDTO idDto) {
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
index 972ed4b..6418ea5 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
@@ -5,6 +5,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.resource.customer.SuggestFormApprovalListRequest;
 import com.casic.missiles.dto.resource.customer.SuggestFormSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceCustomerSuggestForm;
@@ -20,6 +21,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -50,4 +52,11 @@
         return suggestFormService.saveSuggestForm(request);
     }
 
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody SuggestFormApprovalListRequest request) throws Exception {
+        List<BizResourceCustomerSuggestForm> list = super.exportList(request);
+        super.exportExcel(BizResourceCustomerSuggestForm.class, list, ExportEnum.CUSTOMER_SUGGEST_FORM.getSheetName());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java
index 1934d1a..9e07eab 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java
@@ -15,12 +15,16 @@
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.resource.IEnvEnvironmentRecordConfigService;
 import com.casic.missiles.service.resource.IEnvEnvironmentRecordDataService;
+import com.casic.missiles.service.resource.IEnvLocationInfoService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
 import java.util.List;
@@ -39,6 +43,8 @@
     private IEnvEnvironmentRecordDataService environmentRecordDataService;
     @Autowired
     private IEnvEnvironmentRecordConfigService environmentRecordConfigService;
+    @Autowired
+    private IEnvLocationInfoService locationInfoService;
 
     @ApiOperation("环境记录单数据列表/详情")
     @PostMapping("/data/listPage")
@@ -95,4 +101,11 @@
         });
         return environmentRecordConfigService.deleteEnvironmentRecordConfig(idDTO.getId());
     }
+
+    @ApiOperation("地点列表")
+    @PostMapping("/location/listPage")
+    public ReturnDTO<PageInfoBT<LocationListResponse>> locationListPage(@RequestBody @Valid LocationListRequest request) {
+        Page<LocationListResponse> page = PageFactory.defaultPage();
+        return ReturnUtil.success(super.packForBT(locationInfoService.listPage(page, request)));
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java
index 82efe3f..e9561fa 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java
@@ -10,6 +10,7 @@
 import com.casic.missiles.dto.resource.seal.SealLogListRequest;
 import com.casic.missiles.dto.resource.seal.SealNoteApprovalListRequest;
 import com.casic.missiles.dto.resource.seal.SealNoteSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceSealUseLog;
@@ -27,6 +28,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -58,6 +60,13 @@
         return sealUseNoteService.saveSeal(request);
     }
 
+    @ApiOperation("印章使用登记导出（列表和导出中去掉经办人和监印人）")
+    @PostMapping("/listExport")
+    public void export(@RequestBody SealNoteApprovalListRequest request) throws Exception {
+        List<BizResourceSealUseNote> list = super.exportList(request);
+        super.exportExcel(BizResourceSealUseNote.class, list, ExportEnum.SEAL_NOTE.getSheetName());
+    }
+
     // TODO: 2023/7/28 印章使用日志：系统中使用印章时插入数据库
 
     @ApiOperation("印章使用日志列表（分页）")
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java
index 9b674fc..06b6521 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java
@@ -9,16 +9,20 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.resource.staff.StaffCertRequest;
 import com.casic.missiles.dto.resource.staff.StaffCertResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.service.resource.IBizResourceStaffInfoService;
 import com.casic.missiles.service.resource.IBizResourceStaffVerifierService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.List;
+
 /**
  * @Description:
  * @Author: wangpeng
@@ -41,9 +45,21 @@
         return ReturnUtil.success(super.packForBT(responsePage));
     }
 
+    @ApiOperation("证书逾期提醒导出")
+    @PostMapping("/listExport")
+    public void exportList(@RequestBody StaffCertRequest request) throws Exception {
+        List<StaffCertResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = staffInfoService.certListByIds(request.getIds());
+        } else {
+            list = staffInfoService.certList(request);
+        }
+        super.exportExcel(StaffCertResponse.class, list, ExportEnum.STAFF_CERTIFICATE_EXPIRE.getSheetName());
+    }
+
     @ApiOperation("证书逾期提醒")
     @PostMapping("/expirationReminder")
-    public ReturnDTO expirationReminder(@RequestBody IdDTO idDto) {
-        return verifierService.expirationReminder(idDto);
+    public ReturnDTO expirationReminder(@RequestBody IdDTO idDTO) {
+        return verifierService.expirationReminder(idDTO);
     }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java
index 3b251ad..a6e7850 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java
@@ -12,6 +12,7 @@
 import com.casic.missiles.dto.resource.staff.StaffListRequest;
 import com.casic.missiles.dto.resource.staff.TrainListRequest;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.*;
@@ -22,7 +23,10 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
 import java.util.List;
@@ -52,8 +56,19 @@
             throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
         }
         Page<BizResourceStaffInfo> page = PageFactory.defaultPage();
-        Page<BizResourceStaffInfo> responsePage = staffInfoService.listPage(page, request);
-        return ReturnUtil.success(super.packForBT(responsePage));
+        return ReturnUtil.success(super.packForBT(staffInfoService.listPage(page, request)));
+    }
+
+    @ApiOperation("人员登记导出")
+    @PostMapping("/listExport")
+    public void exportList(@RequestBody StaffListRequest request) throws Exception {
+        List<BizResourceStaffInfo> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = staffInfoService.listByIds(request.getIds());
+        } else {
+            list = staffInfoService.list(request);
+        }
+        super.exportExcel(BizResourceStaffInfo.class, list, ExportEnum.STAFF_INFO.getSheetName());
     }
 
     @ApiOperation("人员登记详情基础信息")
@@ -85,9 +100,9 @@
 
     @ApiOperation("科研教育列表（分页）")
     @PostMapping("/education/listPage")
-    public ReturnDTO<PageInfoBT<BizResourceStaffEducation>> educationListPage(@RequestBody IdDTO idDto) {
+    public ReturnDTO<PageInfoBT<BizResourceStaffEducation>> educationListPage(@RequestBody IdDTO idDTO) {
         Page<BizResourceStaffEducation> page = PageFactory.defaultPage();
-        Page<BizResourceStaffEducation> responsePage = staffInfoService.educationListPage(page, idDto);
+        Page<BizResourceStaffEducation> responsePage = staffInfoService.educationListPage(page, idDTO);
         return ReturnUtil.success(super.packForBT(responsePage));
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java
index af6aa86..d85d84a 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java
@@ -9,6 +9,7 @@
 import com.casic.missiles.dto.resource.outsideService.SupplierApprovalListRequest;
 import com.casic.missiles.dto.resource.outsideService.SupplierSaveResponse;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceSupplierAbility;
@@ -67,6 +68,13 @@
         return ReturnUtil.success(supplierInfoService.detail(idDTO.getId()));
     }
 
+    @ApiOperation("合格供方导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody SupplierApprovalListRequest request) throws Exception {
+        List<BizResourceSupplierInfo> list = super.exportList(request);
+        super.exportExcel(BizResourceSupplierInfo.class, list, ExportEnum.SUPPLIER_INFO.getSheetName());
+    }
+
     @ApiOperation("供方人员列表（分页）")
     @PostMapping("/person/listPage")
     public ReturnDTO<PageInfoBT<BizResourceSupplierPerson>> personListPage(@RequestBody IdDTO idDTO) {
diff --git a/casic-metering-api/src/main/resources/config/application.yml b/casic-metering-api/src/main/resources/config/application.yml
index 350db5f..ecff521 100644
--- a/casic-metering-api/src/main/resources/config/application.yml
+++ b/casic-metering-api/src/main/resources/config/application.yml
@@ -126,7 +126,7 @@
     #作者
     author: wangpeng
     #待生成对象表名
-    table-name: biz_equipment_technical_target_approval,biz_equipment_attachment_approval,biz_equipment_checkpoint_approval
+    table-name: biz_business_outsource_protocol
 
 reminder:
   #节点--common模块config包 ReminderNodeConfig配置
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
index 4a19e4e..d47d552 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
@@ -53,6 +53,7 @@
     SUGGEST_FORM_SAVE_FAILED(2509, "委托方意见登记表保存至草稿箱失败"),
     EXAMINE_FORM_SAVE_FAILED(2510, "要求、委托书及合同评审表保存至草稿箱失败"),
     CUSTOMER_EXIST_SAVE_FAILED(2511, "该委托方已存在，请重新选择"),
+    DUPLICATE_LOCATION_NO(2512, "地点编号已存在"),
 
     /**
      * 计量检定业务模块
@@ -68,6 +69,8 @@
     COMPLETE_SAMPLE_NOT_EXIST(2609, "检测中不存在扫描收入的样品"),
     CANNOT_CHANGE_MEASURE_INFO(2610, "无法更改非当前登录用户的检测信息"),
     NON_EXIST_ORDER_OR_SAMPLE(2611, "不存在该委托单或该委托单下的样品"),
+    OUTSOURCE_ACCESS_SAVE_FAILED(2612, "测试、校准或检定工作分包评审表保存至草稿箱失败"),
+    OUTSOURCE_PROTOCOL_SAVE_FAILED(2613, "测试、校准或检定工作分包协议书保存至草稿箱失败"),
 
     /**
      * 历史遗留备用
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
index 5089ad1..81a406b 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
@@ -10,54 +10,38 @@
     /**
      * 资源管理
      */
-    ENVIRONMENT_DATA_EXPORT("environmentData", "environmentData", "环境记录单数据"),
+    ENVIRONMENT_DATA_EXPORT("environmentData", "环境记录单数据", "环境记录单数据"),
+    STAFF_INFO("staffInfo", "人员登记", "人员登记"),
+    STAFF_CERTIFICATE_EXPIRE("certificateExpire", "证书逾期提醒", "证书逾期提醒"),
+    SUPPLIER_INFO("supplierInfo", "合格供方名录", "合格供方名录"),
+    CUSTOMER_INFO("customerInfo", "委托方名录", "委托方名录"),
+    CUSTOMER_SUGGEST_FORM("customerSuggestForm", "委托方意见登记表", "委托方意见登记表"),
+    SEAL_NOTE("sealNote", "印章使用登记", "印章使用登记"),
 
-    FILE_EXPORT("meterFileData", "meterFileData", "计量文件信息"),
-    TRAIN_PLAN_EXPORT("trainPlanData", "trainPlanData", "培训计划"),
-    TRAIN_LOG_EXPORT("trainLogData", "trainLogData", "培训记录"),
-    METER_ORGANIZE_EXPORT("meterOrganizeData", "meterOrganizeData", "计量组织"),
-    TRACE_SUPPLIER_EXPORT("traceSupplierData", "traceSupplierData", "溯源供方"),
-    SIGN_EXPORT("signData", "signData", "签名/签章"),
-    TEMPLATE_EXPORT("templateData", "templateData", "原始记录模板/证书报告模板"),
-    FIXED_ASSETS("meterFixedAssets", "meterFixedAssets", "固定资产"),
-    METER_EQUIPMENT("meterEquipment", "meterEquipment", "测量设备"),
-    CALIBRATION_TEST_EQUIPMENT("calibrationTestEquipment", "calibrationTestEquipment", "校准检定设备"),
-    MEASURE_ACCOUNT("measureAccount", "measureAccount", "测量工装"),
-    STANDARD_SUPPORT_EQUIPMENT("standardSupportEquipment", "standardSupportEquipment", "标准配套设备"),
-    STANDARD_EQUIPMENT("standardEquipment", "standardEquipment", "标准装置"),
-    FLOW_DEF_EXPORT("flowDefData", "flowDefData", "流程定义"),
-    STAFF_CERTIFICATE("certificate", "certificate", "计量人员证书"),
-    CHECK_INFO("checkInfo", "checkInfo", "设备管理点检测"),
-    EQUIPMENT_APPLY("equipmentApply", "equipmentApply", "设备借用"),
-    STANDARD_EQUIPMENT_REMIND("equipmentApplyRemind", "equipmentApplyRemind", "标准装置到期提醒"),
-    METER_PRICE("meterPrice", "meterPrice", "价格库"),
-    METER_STAFF("meterStaff", "meterStaff", "计量人员"),
-    STANDARD_EQUIPMENT_APPLY("standardEquipmentApply", "standardEquipmentApply", "标准装置申请"),
-    STATE_MANAGE_APPLY("stateManage", "stateManage", "状态管理"),
-    METER_ACCEPTANCE_CHECK("acceptanceCheck", "acceptanceCheck", "设备检修保养验收单"),
-    CUSTOMER_EXPORT("customerData", "customerData", "客户信息"),
-    ORDER_EXPORT("orderData", "orderData", "委托书信息"),
-    SAMPLE_EXPORT("sampleData", "sampleData", "样本信息"),
-    EXCHANGE_DATA("exchangeData", "exchangeData", "设备交接单"),
-    DISPATCH_DATA("dispatchData", "dispatchData", "设备收发"),
-    ENVIRONMENT_DATA("environmentData", "environmentData", "环境记录单"),
-    ORIGIN_DATA("originData", "originData", "原始记录"),
-    CERTIFICATE_REPORT("certificateReport", "certificateReport", "证书报告"),
-    ADVICE_EXPORT("adviceData", "adviceData", "客户反馈"),
-    HANDOUT_EXPORT("handoutData", "handoutData", "任务分发列表"),
-    OUTSOURCER_EXPORT("outsourcerData", "outsourcerData", "分包方"),
-    SITE_EXECUTIVE_EXPORT("siteExecutiveData", "siteExecutiveData", "现场测试、校准或检定"),
-    CERTIFICATE_PRINT_EXPORT("certificatePrintData", "certificatePrintData", "证书打印"),
-    DOWNLOAD_TEMPLATE("downloadTemplate", "downloadTemplate", "页面配置"),
-    OUTSOURCER_CERTIFICATE_EXPORT("outsourceCertificateData", "outsourceCertificateData", "分包证书"),
-    SETTLEMENT_INFO_EXPORT("settlementInfoData", "settlementInfoData", "业务结算"),
-    EQUIPMENT_REMIND("equipmentRemind", "equipmentRemind", "设备到期提醒"),
-    AGREEMENT_INFO_EXPORT("agreementInfoData", "agreementInfoData", "合同"),
-    WORK_STATISTICS_EXPORT("workStatisticsData", "workStatisticsData", "实时工作统计"),
-    DEPT_OUTPUT_EXPORT("deptOutputData", "deptOutputData", "部门产值分析"),
-    WORKLOAD_EXPORT("workloadData", "workloadData", "业务工作量分析"),
-    DEPT_COMPREHENSIVE_EXPORT("deptComprehensiveData", "deptComprehensiveData", "部门综合分析"),
-    ENVIRONMENTAL_RECORD("environmentalRecordData", "environmentalRecordData", "现场环境记录");
+    /**
+     * 计量检定业务
+     */
+    OUTSOURCER_EXPORT("outsourcerData", "分包方名录", "分包方名录"),
+    IDENTIFY_EXPORT("identifyData", "计量标识", "计量标识"),
+    ORDER_EXPORT("orderData", "任务单", "任务单"),
+    DISPATCH_DATA("dispatchData", "设备收发", "设备收发"),
+    HANDOUT_EXPORT("handoutData", "任务分发", "任务分发"),
+    SITE_EXECUTIVE_EXPORT("siteExecutiveData", "现场测试、校准或检定", "现场测试、校准或检定"),
+    CERTIFICATE_REPORT("certificateReport", "证书审批", "证书审批"),
+    CERTIFICATE_CHANGE_APPLY("certificateChangeApply", "证书报告补充或更换申请单", "证书报告补充或更换申请单"),
+    CERTIFICATE_PRINT("certificatePrintData", "证书打印审批", "证书打印审批"),
+    DEPT_EXECUTIVE_TASK("deptExecutiveTaskData", "实验室任务", "实验室任务"),
+    MY_EXECUTIVE_TASK("myExecutiveTaskData", "我的任务", "我的任务"),
+    OUTSOURCE_ASSESS("outsourceAssess", "测试、校准或检定工作分包评审表", "测试、校准或检定工作分包评审表"),
+    OUTSOURCE_PROTOCOL("outsourceProtocol", "测试、校准或检定工作分包协议书", "测试、校准或检定工作分包协议书"),
+
+    /**
+     * 系统管理
+     */
+    SIGN_EXPORT("signData", "签名", "签名"),
+    TEMPLATE_EXPORT("templateData", "文件模板", "文件模板"),
+    FLOW_DEF_EXPORT("flowDefData", "流程定义", "流程定义"),
+    DOWNLOAD_TEMPLATE("downloadTemplate", "流程定义", "页面配置");
 
     ExportEnum(String fileName, String sheetName, String description) {
         this.fileName = fileName;
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateRecordTypeCodeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateRecordTypeCodeEnum.java
index 31d913c..a963522 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateRecordTypeCodeEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateRecordTypeCodeEnum.java
@@ -46,4 +46,14 @@
     String SITE_EXECUTIVE_APPROVAL = "01";
     //《现场测试、校准或检定工作记录表》
     String SITE_EXECUTIVE_LOG = "02";
+
+    //测试、校准或检定工作分包协议书
+    String OUTSOURCE_PROTOCOL = "01";
+    //测试、校准或检定工作分包评审表
+    String OUTSOURCE_ACCESS = "02";
+    //测试、校准或检定工作分包通知书
+    String OUTSOURCE_NOTICE = "03";
+    //测试、校准或检定工作分包方名录
+    String OUTSOURCE_INFO = "04";
+
 }
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
index 24b8635..f78bd53 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
@@ -15,6 +15,10 @@
     String CERTIFICATE_CHANGE_APPLY_BEAN_NAME = "certificateChangeApplyBean";
     //现场测试、校准或检定
     String SITE_EXECUTIVE_BEAN_NAME = "siteExecutiveBean";
+    //测试、校准或检定工作分包评审表
+    String OUTSOURCE_ASSESS_BEAN_NAME = "outsourceAssessBean";
+    //测试、校准或检定工作分包协议书
+    String OUTSOURCE_PROTOCOL_BEAN_NAME = "outsourceProtocolBean";
 
     /*********************************设备与装置************************************/
     //设备台账
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 b21c661..6b86fd1 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
@@ -18,6 +18,8 @@
     OUTSOURCER_APPROVAL(OUTSOURCER_BEAN_NAME, ""),
     CERTIFICATE_CHANGE_APPROVAL(CERTIFICATE_CHANGE_APPLY_BEAN_NAME, ""),
     SITE_EXECUTIVE_APPROVAL(SITE_EXECUTIVE_BEAN_NAME, ""),
+    OUTSOURCE_ASSESS_APPROVAL(OUTSOURCE_ASSESS_BEAN_NAME, ""),
+    OUTSOURCE_PROTOCOL_APPROVAL(OUTSOURCE_PROTOCOL_BEAN_NAME, ""),
 
     ACTION_STATUS_MAP(new HashMap<String, AwareActionStatusEnum>() {
         {
@@ -47,6 +49,10 @@
             put(ApplyFromIdEnum.CERTIFICATE_CHANGE_APPROVAL.getCode(), CERTIFICATE_CHANGE_APPROVAL);
             //现场测试、校准或检定审批
             put(ApplyFromIdEnum.SITE_EXECUTIVE_APPROVAL.getCode(), SITE_EXECUTIVE_APPROVAL);
+            //测试、校准或检定工作分包评审表
+            put(ApplyFromIdEnum.OUTSOURCE_ASSESS_APPROVAL.getCode(), OUTSOURCE_ASSESS_APPROVAL);
+            //测试、校准或检定工作分包协议书
+            put(ApplyFromIdEnum.OUTSOURCE_PROTOCOL_APPROVAL.getCode(), OUTSOURCE_PROTOCOL_APPROVAL);
         }
     });
     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 934405e..c7410bd 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
@@ -9,6 +9,8 @@
     CERTIFICATE_CHANGE_APPROVAL("jljdywzsbchghsqd", MessageSourceModuleEnum.BUSINESS.getCode(), "证书/报告补充或更换申请单"),
     OUTSOURCER_APPROVAL("jljdywcsjzhgfbfml", MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定合格分包方名录"),
     SITE_EXECUTIVE_APPROVAL("jljdywxccsjzsp", MessageSourceModuleEnum.BUSINESS.getCode(), "现场测试、校准或检定审批"),
+    OUTSOURCE_ASSESS_APPROVAL("jljdywcsjzfbpsb", MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包评审表"),
+    OUTSOURCE_PROTOCOL_APPROVAL("jljdywcsjzfbxys", MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包协议书"),
 
 
     /*******************************************设备与装置*********************************************/
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/GeneralApprovalMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/GeneralApprovalMapper.java
index 4fb7344..0c9d6ae 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/GeneralApprovalMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/GeneralApprovalMapper.java
@@ -17,8 +17,4 @@
 
     Page<O> selectBatchForApprovalList(Page<O> page, @Param("request") R request, @Param("businessKeys") List<String> businessKeys);
 
-//    Page<O> selectListPage(Page<O> page, @Param("request") R request);
-
-//    Long selectMaxNo();
-
 }
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceAssessMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceAssessMapper.java
index 7867bb8..ba59009 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceAssessMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceAssessMapper.java
@@ -1,7 +1,12 @@
 package com.casic.missiles.mapper.business;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.business.outsource.OutsourceAssessApprovalListRequest;
+import com.casic.missiles.mapper.GeneralApprovalMapper;
 import com.casic.missiles.model.business.BizBusinessOutsourceAssess;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * <p>
@@ -11,6 +16,10 @@
  * @author wangpeng
  * @since 2023-08-16
  */
-public interface BizBusinessOutsourceAssessMapper extends BaseMapper<BizBusinessOutsourceAssess> {
+public interface BizBusinessOutsourceAssessMapper extends GeneralApprovalMapper<BizBusinessOutsourceAssess, BizBusinessOutsourceAssess, OutsourceAssessApprovalListRequest> {
+
+    Page<BizBusinessOutsourceAssess> selectBatchForApprovalList(Page<BizBusinessOutsourceAssess> page, @Param("request") OutsourceAssessApprovalListRequest request, @Param("businessKeys") List<String> businessKeys);
+
+    Long selectMaxProjectNo();
 
 }
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceProtocolMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceProtocolMapper.java
new file mode 100644
index 0000000..e6aba35
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceProtocolMapper.java
@@ -0,0 +1,24 @@
+package com.casic.missiles.mapper.business;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.business.outsource.OutsourceProtocolApprovalListRequest;
+import com.casic.missiles.mapper.GeneralApprovalMapper;
+import com.casic.missiles.model.business.BizBusinessOutsourceProtocol;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 计量检定业务-分包管理-测试、校准或检定工作分包协议书 Mapper 接口
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-08-24
+ */
+public interface BizBusinessOutsourceProtocolMapper extends GeneralApprovalMapper<BizBusinessOutsourceProtocol, BizBusinessOutsourceProtocol, OutsourceProtocolApprovalListRequest> {
+
+    Page<BizBusinessOutsourceProtocol> selectBatchForApprovalList(Page<BizBusinessOutsourceProtocol> page, @Param("request") OutsourceProtocolApprovalListRequest request, @Param("businessKeys") List<String> businessKeys);
+
+    Long selectMaxProtocolNo();
+}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/EnvLocationInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/EnvLocationInfoMapper.java
new file mode 100644
index 0000000..49eff87
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/EnvLocationInfoMapper.java
@@ -0,0 +1,21 @@
+package com.casic.missiles.mapper.resource;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.resource.environment.LocationListRequest;
+import com.casic.missiles.dto.resource.environment.LocationListResponse;
+import com.casic.missiles.model.resource.EnvLocationInfo;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * <p>
+ * 实验室环境监控系统-设备表 Mapper 接口
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-06-07
+ */
+public interface EnvLocationInfoMapper extends BaseMapper<EnvLocationInfo> {
+
+    Page<LocationListResponse> selectLocationListPage(Page<LocationListResponse> page, @Param("request") LocationListRequest request);
+}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java
index de124db..85ed0f7 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java
@@ -1,7 +1,9 @@
 package com.casic.missiles.mapper.system;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.dto.system.SignDetailResponse;
+import com.casic.missiles.dto.system.SignListRequest;
 import com.casic.missiles.model.system.SystemSign;
 import org.apache.ibatis.annotations.Param;
 
@@ -22,4 +24,8 @@
     SignDetailResponse selectSignDetailById(Long id);
 
     List<SystemSign> selectUsableSignList(@Param("userId") Long userId);
+
+    Page<SystemSign> selectSignListPage(Page<SystemSign> page, @Param("request") SignListRequest request);
+
+    List<SystemSign> selectSignList(@Param("request") SignListRequest request);
 }
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateChangeApplyMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateChangeApplyMapper.xml
index d798447..c496092 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateChangeApplyMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateChangeApplyMapper.xml
@@ -30,31 +30,31 @@
         SELECT *
         FROM biz_business_certificate_change_apply
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.changeApplyNo != null and request.changeApplyNo !=''">
+        <if test="request != null and request.changeApplyNo != null and request.changeApplyNo !=''">
             and change_apply_no like concat('%',#{request.changeApplyNo},'%')
         </if>
-        <if test="request.changeReportNo != null and request.changeReportNo !=''">
+        <if test="request != null and request.changeReportNo != null and request.changeReportNo !=''">
             and change_report_no like concat('%',#{request.changeReportNo},'%')
         </if>
-        <if test="request.changeReportName != null and request.changeReportName !=''">
+        <if test="request != null and request.changeReportName != null and request.changeReportName !=''">
             and change_report_name like concat('%',#{request.changeReportName},'%')
         </if>
-        <if test="request.changeType != null and request.changeType !=''">
+        <if test="request != null and request.changeType != null and request.changeType !=''">
             and change_type = #{request.changeType}
         </if>
-        <if test="request.createUserName != null and request.createUserName !=''">
+        <if test="request != null and request.createUserName != null and request.createUserName !=''">
             and create_user_name like concat('%',#{request.createUserName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificatePrintMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificatePrintMapper.xml
index b66cd99..49c0ac8 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificatePrintMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificatePrintMapper.xml
@@ -31,34 +31,34 @@
         LEFT JOIN biz_business_order_sample_relation bosr ON (bosr.order_id = bcr.order_id AND bosr.sample_id = bcr.sample_id)
         LEFT JOIN biz_business_order_info boi ON boi.id = bosr.order_id
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and bcp.approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.printStatus != null and request.printStatus !=''">
+        <if test="request != null and request.printStatus != null and request.printStatus !=''">
             and print_status = #{request.printStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and bcp.create_user_id = #{request.createUserId}
         </if>
-        <if test="request.certificateReportNo != null and request.certificateReportNo !=''">
+        <if test="request != null and request.certificateReportNo != null and request.certificateReportNo !=''">
             and bcr.certificate_report_no like concat('%',#{request.certificateReportNo},'%')
         </if>
-        <if test="request.certificateReportName != null and request.certificateReportName !=''">
+        <if test="request != null and request.certificateReportName != null and request.certificateReportName !=''">
             and bcr.certificate_report_name like concat('%',#{request.certificateReportName},'%')
         </if>
-        <if test="request.customerName != null and request.customerName !=''">
+        <if test="request != null and request.customerName != null and request.customerName !=''">
             and boi.customer_name like concat('%',#{request.customerName},'%')
         </if>
-        <if test="request.sampleNo != null and request.sampleNo !=''">
+        <if test="request != null and request.sampleNo != null and request.sampleNo !=''">
             and bosr.sample_no like concat('%',#{request.sampleNo},'%')
         </if>
-        <if test="request.sampleName != null and request.sampleName !=''">
+        <if test="request != null and request.sampleName != null and request.sampleName !=''">
             and bosr.sample_name like concat('%',#{request.sampleName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and bcp.create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and bcp.create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml
index b366034..767695d 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml
@@ -46,33 +46,37 @@
         SELECT bcr.*, bosr.sample_no, bosr.sample_name, bosr.sample_model, rsi.staff_name
         FROM biz_business_certificate_report bcr
         LEFT JOIN biz_business_order_sample_relation bosr ON (bosr.order_id = bcr.order_id AND bosr.sample_id = bcr.sample_id)
+        LEFT JOIN biz_business_order_info boi ON boi.id = bcr.order_id
         LEFT JOIN biz_resource_staff_info rsi ON rsi.id = bcr.measure_person_id
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and bcr.approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and bcr.create_user_id = #{request.createUserId}
         </if>
-        <if test="request.certificateReportNo != null and request.certificateReportNo !=''">
+        <if test="request != null and request.customerId != null and request.customerId !=''">
+            and boi.customer_id = #{request.customerId}
+        </if>
+        <if test="request != null and request.certificateReportNo != null and request.certificateReportNo !=''">
             and bcr.certificate_report_no like concat('%',#{request.certificateReportNo},'%')
         </if>
-        <if test="request.certificateReportName != null and request.certificateReportName !=''">
+        <if test="request != null and request.certificateReportName != null and request.certificateReportName !=''">
             and bcr.certificate_report_name like concat('%',#{request.certificateReportName},'%')
         </if>
-        <if test="request.sampleNo != null and request.sampleNo !=''">
+        <if test="request != null and request.sampleNo != null and request.sampleNo !=''">
             and bosr.sample_no like concat('%',#{request.sampleNo},'%')
         </if>
-        <if test="request.measureCategory != null and request.measureCategory !=''">
+        <if test="request != null and request.measureCategory != null and request.measureCategory !=''">
             and bcr.measure_category = #{request.measureCategory}
         </if>
-        <if test="request.measurePerson != null and request.measurePerson !=''">
+        <if test="request != null and request.measurePerson != null and request.measurePerson !=''">
             and rsi.staff_name like concat('%',#{request.measurePerson},'%')
         </if>
-        <if test="request.calibrationTimeStart != null and request.calibrationTimeStart !=''">
+        <if test="request != null and request.calibrationTimeStart != null and request.calibrationTimeStart !=''">
             and bcr.calibration_time &gt;= #{request.calibrationTimeStart}
         </if>
-        <if test="request.calibrationTimeEnd != null and request.calibrationTimeEnd !=''">
+        <if test="request != null and request.calibrationTimeEnd != null and request.calibrationTimeEnd !=''">
             and bcr.calibration_time &lt;= #{request.calibrationTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceAssessMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceAssessMapper.xml
index d0fcf8b..c22c101 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceAssessMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceAssessMapper.xml
@@ -7,6 +7,8 @@
         <id column="id" property="id" />
         <result column="project_no" property="projectNo" />
         <result column="project_name" property="projectName" />
+        <result column="lab_code" property="labCode" />
+        <result column="group_code" property="groupCode" />
         <result column="applicant_id" property="applicantId" />
         <result column="applicant_name" property="applicantName" />
         <result column="applicant_time" property="applicantTime" />
@@ -31,7 +33,45 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, project_no, project_name, applicant_id, applicant_name, applicant_time, minio_file_name, remark, create_user_id, create_user_name, outsourcer_id, pre_start_time, pre_end_time, outsource_reason, pre_cost, approval_status, process_id, approve_situation, traceability, test_method, technique_ability, create_time, update_time
+        id, project_no, project_name, lab_code, group_code, applicant_id, applicant_name, applicant_time, minio_file_name, remark, create_user_id, create_user_name, outsourcer_id, pre_start_time, pre_end_time, outsource_reason, pre_cost, approval_status, process_id, approve_situation, traceability, test_method, technique_ability, create_time, update_time
     </sql>
 
+    <select id="selectMaxProjectNo" resultType="java.lang.Long">
+        SELECT IFNULL(max(RIGHT(project_no, 3)), 0) from biz_business_outsource_assess
+    </select>
+
+    <select id="selectBatchForApprovalList" resultMap="BaseResultMap">
+        SELECT bboa.*, bboi.outsourcer_name, bboi.director
+        FROM biz_business_outsource_assess bboa
+        LEFT JOIN biz_business_outsourcer_info bboi ON bboa.outsourcer_id = bboi.id
+        WHERE 1=1
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
+            and bboa.approval_status = #{request.approvalStatus}
+        </if>
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
+            and bboa.create_user_id = #{request.createUserId}
+        </if>
+        <if test="request != null and request.projectNo != null and request.projectNo !=''">
+            and bboa.project_no like concat('%',#{request.projectNo},'%')
+        </if>
+        <if test="request != null and request.outsourcerName != null and request.outsourcerName !=''">
+            and bboi.outsourcer_name like concat('%',#{request.outsourcerName},'%')
+        </if>
+        <if test="request != null and request.applicantName != null and request.applicantName !=''">
+            and bboa.applicant_name like concat('%',#{request.applicantName},'%')
+        </if>
+        <if test="request != null and request.applicantTimeStart != null and request.applicantTimeStart !=''">
+            and bboa.applicant_time &gt;= #{request.applicantTimeStart}
+        </if>
+        <if test="request != null and request.applicantTimeEnd != null and request.applicantTimeEnd !=''">
+            and bboa.applicant_time &lt;= #{request.applicantTimeEnd}
+        </if>
+        <if test="businessKeys != null">
+            and bboa.id in
+            <foreach collection="businessKeys" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
+        ORDER BY bboa.create_time DESC
+    </select>
 </mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceProtocolMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceProtocolMapper.xml
new file mode 100644
index 0000000..b7b2149
--- /dev/null
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceProtocolMapper.xml
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.mapper.business.BizBusinessOutsourceProtocolMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.business.BizBusinessOutsourceProtocol">
+        <id column="id" property="id" />
+        <result column="protocol_no" property="protocolNo" />
+        <result column="project_name" property="projectName" />
+        <result column="lab_code" property="labCode" />
+        <result column="group_code" property="groupCode" />
+        <result column="outsourcer_id" property="outsourcerId" />
+        <result column="remark" property="remark" />
+        <result column="outsource_no" property="outsourceNo" />
+        <result column="outsource_name" property="outsourceName" />
+        <result column="contacts" property="contacts" />
+        <result column="mobile" property="mobile" />
+        <result column="address" property="address" />
+        <result column="require_date" property="requireDate" />
+        <result column="outsource_cost" property="outsourceCost" />
+        <result column="director" property="director" />
+        <result column="item" property="item" />
+        <result column="requires" property="requires" />
+        <result column="create_user_id" property="createUserId" />
+        <result column="create_user_name" property="createUserName" />
+        <result column="approval_status" property="approvalStatus" />
+        <result column="process_id" property="processId" />
+        <result column="create_time" property="createTime" />
+        <result column="update_time" property="updateTime" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, protocol_no, project_name, lab_code, group_code, outsourcer_id, remark, outsource_no, outsource_name, contacts, mobile, address, require_date, outsource_cost, director, item, requires, create_user_id, create_user_name, approval_status, process_id, create_time, update_time
+    </sql>
+
+    <select id="selectMaxProtocolNo" resultType="java.lang.Long">
+        SELECT IFNULL(max(RIGHT(protocol_no, 3)), 0) from biz_business_outsource_protocol
+    </select>
+
+    <select id="selectBatchForApprovalList" resultMap="BaseResultMap">
+        SELECT *
+        FROM biz_business_outsource_protocol
+        WHERE 1=1
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
+            and approval_status = #{request.approvalStatus}
+        </if>
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
+            and create_user_id = #{request.createUserId}
+        </if>
+        <if test="request != null and request.protocolNo != null and request.protocolNo !=''">
+            and protocol_no like concat('%',#{request.protocolNo},'%')
+        </if>
+        <if test="request != null and request.outsourcerName != null and request.outsourcerName !=''">
+            and outsourcer_name like concat('%',#{request.outsourcerName},'%')
+        </if>
+        <if test="request != null and request.applicantName != null and request.applicantName !=''">
+            and create_user_name like concat('%',#{request.applicantName},'%')
+        </if>
+        <if test="request != null and request.applicantTimeStart != null and request.applicantTimeStart !=''">
+            and create_time &gt;= #{request.applicantTimeStart}
+        </if>
+        <if test="request != null and request.applicantTimeEnd != null and request.applicantTimeEnd !=''">
+            and create_time &lt;= #{request.applicantTimeEnd}
+        </if>
+        <if test="businessKeys != null">
+            and id in
+            <foreach collection="businessKeys" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
+        ORDER BY create_time DESC
+    </select>
+</mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourcerInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourcerInfoMapper.xml
index 510a80b..3049b54 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourcerInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourcerInfoMapper.xml
@@ -7,6 +7,8 @@
         <id column="id" property="id" />
         <result column="outsourcer_no" property="outsourcerNo" />
         <result column="outsourcer_name" property="outsourcerName" />
+        <result column="lab_code" property="labCode" />
+        <result column="group_code" property="groupCode" />
         <result column="outsourcer_brief_name" property="outsourcerBriefName" />
         <result column="outsourcer_size" property="outsourcerSize" />
         <result column="business_size" property="businessSize" />
@@ -55,32 +57,32 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, outsourcer_no, outsourcer_name, outsourcer_brief_name, outsourcer_size, business_size, grade, evaluation, tax_number, bank_account, bank_name, bank_account_number, postal_code, director, phone, fax, mobile, email, website, address_country, address_province, address_city, address_area, full_address, address_country_name, address_province_name, address_city_name, address_area_name, invoice_country, invoice_province, invoice_city, invoice_area, invoice_full_address, invoice_country_name, invoice_province_name, invoice_city_name, invoice_area_name, business_scope, business_content, minio_file_name, approval_status, process_id, remark, create_user_id, create_user_name, create_time, update_time
+        id, outsourcer_no, outsourcer_name, lab_code, group_code, outsourcer_brief_name, outsourcer_size, business_size, grade, evaluation, tax_number, bank_account, bank_name, bank_account_number, postal_code, director, phone, fax, mobile, email, website, address_country, address_province, address_city, address_area, full_address, address_country_name, address_province_name, address_city_name, address_area_name, invoice_country, invoice_province, invoice_city, invoice_area, invoice_full_address, invoice_country_name, invoice_province_name, invoice_city_name, invoice_area_name, business_scope, business_content, minio_file_name, approval_status, process_id, remark, create_user_id, create_user_name, create_time, update_time
     </sql>
 
     <select id="selectBatchForApprovalList" resultMap="BaseResultMap">
         SELECT *
         FROM biz_business_outsourcer_info
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.outsourcerNo != null and request.outsourcerNo !=''">
+        <if test="request != null and request.outsourcerNo != null and request.outsourcerNo !=''">
             and outsourcer_no like concat('%',#{request.outsourcerNo},'%')
         </if>
-        <if test="request.outsourcerName != null and request.outsourcerName !=''">
+        <if test="request != null and request.outsourcerName != null and request.outsourcerName !=''">
             and outsourcer_name like concat('%',#{request.outsourcerName},'%')
         </if>
-        <if test="request.director != null and request.director !=''">
+        <if test="request != null and request.director != null and request.director !=''">
             and director like concat('%',#{request.director},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
@@ -93,6 +95,6 @@
     </select>
 
     <select id="selectMaxNo" resultType="java.lang.Long">
-        SELECT IFNULL(max(RIGHT(outsourcer_no, 12)), 0) from biz_business_outsourcer_info
+        SELECT IFNULL(max(RIGHT(outsourcer_no, 3)), 0) from biz_business_outsourcer_info
     </select>
 </mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessSiteExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessSiteExecutiveInfoMapper.xml
index 135c5d0..3c5ae79 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessSiteExecutiveInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessSiteExecutiveInfoMapper.xml
@@ -38,25 +38,25 @@
         FROM biz_business_site_executive_info bsei
         LEFT JOIN biz_resource_customer_info rci ON bsei.customer_id = rci.id
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and bsei.approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and bsei.create_user_id = #{request.createUserId}
         </if>
-        <if test="request.siteExecutiveNo != null and request.siteExecutiveNo !=''">
+        <if test="request != null and request.siteExecutiveNo != null and request.siteExecutiveNo !=''">
             and bsei.site_executive_no like concat('%',#{request.siteExecutiveNo},'%')
         </if>
-        <if test="request.customerName != null and request.customerName !=''">
+        <if test="request != null and request.customerName != null and request.customerName !=''">
             and rci.outsourcer_name like concat('%',#{request.customerName},'%')
         </if>
-        <if test="request.applyName != null and request.applyName !=''">
+        <if test="request != null and request.applyName != null and request.applyName !=''">
             and bsei.apply_name like concat('%',#{request.applyName},'%')
         </if>
-        <if test="request.applyTimeStart != null and request.applyTimeStart !=''">
+        <if test="request != null and request.applyTimeStart != null and request.applyTimeStart !=''">
             and bsei.apply_time &gt;= #{request.applyTimeStart}
         </if>
-        <if test="request.applyTimeEnd != null and request.applyTimeEnd !=''">
+        <if test="request != null and request.applyTimeEnd != null and request.applyTimeEnd !=''">
             and bsei.apply_time &lt;= #{request.applyTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml
index 84d9e2a..6bd38a9 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml
@@ -105,6 +105,12 @@
         <if test="request.isUrgent != null and request.isUrgent !=''">
             AND bo.is_urgent = #{request.isUrgent}
         </if>
+        <if test="request.ids != null">
+            and blei.id in
+            <foreach collection="request.ids" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
         ORDER BY blei.update_time DESC
     </select>
 
@@ -137,6 +143,12 @@
         <if test="request.isUrgent != null and request.isUrgent !=''">
             AND bo.is_urgent = #{request.isUrgent}
         </if>
+        <if test="request.ids != null">
+            and blei.id in
+            <foreach collection="request.ids" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
         ORDER BY blei.update_time DESC
     </select>
 
diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardInfoMapper.xml
index 1a5551b..2ed8d17 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardInfoMapper.xml
@@ -45,12 +45,6 @@
         FROM biz_equipment_standard_info besi
         LEFT JOIN biz_equipment_standard_technology_relation bestr ON besi.standard_no = bestr.standard_no
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
-            and besi.approval_status = #{request.approvalStatus}
-        </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
-            and besi.create_user_id = #{request.createUserId}
-        </if>
         <if test="request.standardName != null and request.standardName !=''">
             and besi.standard_name like concat('%',#{request.standardName},'%')
         </if>
diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardTechnologyRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardTechnologyRelationMapper.xml
index fc7e16c..cd03c8c 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardTechnologyRelationMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardTechnologyRelationMapper.xml
@@ -6,6 +6,7 @@
     <resultMap id="BaseResultMap" type="com.casic.missiles.model.equipment.BizEquipmentStandardTechnologyRelation">
         <id column="id" property="id" />
         <result column="technology_file_id" property="technologyFileId" />
+        <result column="technology_file_no" property="technologyFileNo" />
         <result column="technology_file_name" property="technologyFileName" />
         <result column="standard_id" property="standardId" />
         <result column="standard_no" property="standardNo" />
@@ -14,7 +15,7 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, technology_file_id, technology_file_name, standard_id, remark
+        id, technology_file_id, technology_file_no, technology_file_name, standard_id, remark
     </sql>
 
 </mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceAuthorizeOrderMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceAuthorizeOrderMapper.xml
index ac5176c..554fe65 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceAuthorizeOrderMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceAuthorizeOrderMapper.xml
@@ -32,22 +32,22 @@
         SELECT *
         FROM biz_resource_authorize_order
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.orderNo != null and request.orderNo !=''">
+        <if test="request != null and request.orderNo != null and request.orderNo !=''">
             and order_no like concat('%',#{request.orderNo},'%')
         </if>
-        <if test="request.createUserName != null and request.createUserName !=''">
+        <if test="request != null and request.createUserName != null and request.createUserName !=''">
             and create_user_name like concat('%',#{request.createUserName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerExamineFormMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerExamineFormMapper.xml
index ab242f6..af7f98f 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerExamineFormMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerExamineFormMapper.xml
@@ -41,28 +41,28 @@
         SELECT *
         FROM biz_resource_customer_examine_form
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.formNo != null and request.formNo !=''">
+        <if test="request != null and request.formNo != null and request.formNo !=''">
             and form_no like concat('%',#{request.formNo},'%')
         </if>
-        <if test="request.labCode != null and request.labCode !=''">
+        <if test="request != null and request.labCode != null and request.labCode !=''">
             and lab_code like concat('%',#{request.labCode},'%')
         </if>
-        <if test="request.groupCode != null and request.groupCode !=''">
+        <if test="request != null and request.groupCode != null and request.groupCode !=''">
             and group_code like concat('%',#{request.groupCode},'%')
         </if>
-        <if test="request.createUserName != null and request.createUserName !=''">
+        <if test="request != null and request.createUserName != null and request.createUserName !=''">
             and create_user_name like concat('%',#{request.createUserName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerInfoMapper.xml
index fa8ffbc..06a2798 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerInfoMapper.xml
@@ -33,25 +33,25 @@
         SELECT *
         FROM biz_resource_customer_info
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.customerNo != null and request.customerNo !=''">
+        <if test="request != null and request.customerNo != null and request.customerNo !=''">
             and customer_no like concat('%',#{request.customerNo},'%')
         </if>
-        <if test="request.customerName != null and request.customerName !=''">
+        <if test="request != null and request.customerName != null and request.customerName !=''">
             and customer_name like concat('%',#{request.customerName},'%')
         </if>
-        <if test="request.contacts != null and request.contacts !=''">
+        <if test="request != null and request.contacts != null and request.contacts !=''">
             and contacts like concat('%',#{request.contacts},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerSuggestFormMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerSuggestFormMapper.xml
index 28f5bb2..1806662 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerSuggestFormMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerSuggestFormMapper.xml
@@ -33,28 +33,28 @@
         SELECT *
         FROM biz_resource_customer_suggest_form
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.formNo != null and request.formNo !=''">
+        <if test="request != null and request.formNo != null and request.formNo !=''">
             and form_no like concat('%',#{request.formNo},'%')
         </if>
-        <if test="request.customerName != null and request.customerName !=''">
+        <if test="request != null and request.customerName != null and request.customerName !=''">
             and customer_name like concat('%',#{request.customerName},'%')
         </if>
-        <if test="request.customerDeptName != null and request.customerDeptName !=''">
+        <if test="request != null and request.customerDeptName != null and request.customerDeptName !=''">
             and customer_dept_name like concat('%',#{request.customerDeptName},'%')
         </if>
-        <if test="request.createUserName != null and request.createUserName !=''">
+        <if test="request != null and request.createUserName != null and request.createUserName !=''">
             and create_user_name like concat('%',#{request.createUserName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSealUseNoteMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSealUseNoteMapper.xml
index ab37bc1..b02bb33 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSealUseNoteMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSealUseNoteMapper.xml
@@ -29,32 +29,32 @@
     </sql>
 
     <select id="selectBatchForApprovalList" resultMap="BaseResultMap">
-        SELECT *
+        SELECT brsun.*, brsi.seal_name, brsi.seal_type, brsi.approver_name
         FROM biz_resource_seal_use_note brsun
         JOIN biz_resource_seal_info brsi ON brsun.seal_id = brsi.id
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and brsun.approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and brsun.create_user_id = #{request.createUserId}
         </if>
-        <if test="request.sealName != null and request.sealName !=''">
+        <if test="request != null and request.sealName != null and request.sealName !=''">
             and brsi.seal_name like concat('%',#{request.sealName},'%')
         </if>
-        <if test="request.sealType != null and request.sealType !=''">
+        <if test="request != null and request.sealType != null and request.sealType !=''">
             and brsi.seal_type = #{request.sealType}
         </if>
-        <if test="request.applyDeptName != null and request.applyDeptName !=''">
+        <if test="request != null and request.applyDeptName != null and request.applyDeptName !=''">
             and brsun.apply_dept_name like concat('%',#{request.applyDeptName},'%')
         </if>
-        <if test="request.applyUserName != null and request.applyUserName !=''">
+        <if test="request != null and request.applyUserName != null and request.applyUserName !=''">
             and brsun.apply_user_name like concat('%',#{request.applyUserName},'%')
         </if>
-        <if test="request.applyTimeStart != null and request.applyTimeStart !=''">
+        <if test="request != null and request.applyTimeStart != null and request.applyTimeStart !=''">
             and brsun.apply_time &gt;= #{request.applyTimeStart}
         </if>
-        <if test="request.applyTimeEnd != null and request.applyTimeEnd !=''">
+        <if test="request != null and request.applyTimeEnd != null and request.applyTimeEnd !=''">
             and brsun.apply_time &lt;= #{request.applyTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml
index 119bf7d..4f8392a 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml
@@ -31,6 +31,12 @@
         <if test="request.deptName != null and request.deptName !=''">
             and brsi.dept_name like concat('%',#{request.deptName},'%')
         </if>
+        <if test="request.ids != null">
+            and brsv.id in
+            <foreach collection="request.ids" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
         ORDER BY brsv.grant_date DESC
     </select>
 
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSupplierInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSupplierInfoMapper.xml
index fe8d399..e8ce7ef 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSupplierInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSupplierInfoMapper.xml
@@ -48,28 +48,28 @@
         SELECT *
         FROM biz_resource_supplier_info
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.supplierNo != null and request.supplierNo !=''">
+        <if test="request != null and request.supplierNo != null and request.supplierNo !=''">
             and supplier_no like concat('%',#{request.supplierNo},'%')
         </if>
-        <if test="request.supplierName != null and request.supplierName !=''">
+        <if test="request != null and request.supplierName != null and request.supplierName !=''">
             and supplier_name like concat('%',#{request.supplierName},'%')
         </if>
-        <if test="request.director != null and request.director !=''">
+        <if test="request != null and request.director != null and request.director !=''">
             and director like concat('%',#{request.director},'%')
         </if>
-        <if test="request.supplierType != null and request.supplierType !=''">
+        <if test="request != null and request.supplierType != null and request.supplierType !=''">
             and supplier_type = #{request.supplierType}
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/EnvLocationInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/EnvLocationInfoMapper.xml
new file mode 100644
index 0000000..68bcf10
--- /dev/null
+++ b/casic-metering-dao/src/main/resources/mapper/resource/EnvLocationInfoMapper.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.mapper.resource.EnvLocationInfoMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.resource.EnvLocationInfo">
+        <id column="id" property="id" />
+        <result column="location_no" property="locationNo" />
+        <result column="location_name" property="locationName" />
+        <result column="location_position" property="locationPosition" />
+        <result column="create_user_id" property="createUserId" />
+        <result column="create_user" property="createUser" />
+        <result column="create_time" property="createTime" />
+        <result column="update_time" property="updateTime" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, location_no, location_name, location_position, create_user_id, create_user, create_time, update_time
+    </sql>
+
+    <select id="selectLocationListPage" resultType="com.casic.missiles.dto.resource.environment.LocationListResponse">
+        SELECT *
+        FROM env_location_info
+        WHERE 1=1
+        <if test="request.locationNo != null and request.locationNo !=''">
+            AND location_no LIKE concat('%',#{request.locationNo},'%')
+        </if>
+        <if test="request.locationName != null and request.locationName !=''">
+            AND location_name LIKE concat('%',#{request.locationName},'%')
+        </if>
+        ORDER BY create_time DESC
+    </select>
+
+</mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml
index b28c18f..8854047 100644
--- a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml
@@ -11,7 +11,6 @@
         <result column="sign_desc" property="signDesc" />
         <result column="sign_director" property="signDirector" />
         <result column="sign_user_id" property="signUserId" />
-        <result column="sign_type" property="signType" />
         <result column="minio_file_name" property="minioFileName" />
         <result column="create_time" property="createTime" />
         <result column="update_time" property="updateTime" />
@@ -28,7 +27,6 @@
         <result column="sign_name" property="signName" />
         <result column="sign_desc" property="signDesc" />
         <result column="sign_director" property="signDirector" />
-        <result column="sign_type" property="signType" />
         <result column="sign_user_id" property="signUserId" />
         <result column="minio_file_name" property="minioFileName" />
         <result column="create_time" property="createTime" />
@@ -62,4 +60,58 @@
         JOIN system_sign_user_relation ssur ON ss.id = ssur.sign_id
         WHERE ssur.user_id = #{userId}
     </select>
+
+    <select id="selectSignListPage" resultMap="BaseResultMap">
+        SELECT ss.*, sd.SIMPLE_NAME AS deptName
+        FROM system_sign ss
+        LEFT JOIN sys_user su ON su.id = ss.sign_user_id
+        LEFT JOIN sys_dept sd ON sd.id = su.dept_id
+        WHERE 1=1
+        <if test="request.signNo != null and request.signNo !=''">
+            AND ss.sign_no LIKE concat('%',#{request.signNo},'%')
+        </if>
+        <if test="request.signName != null and request.signName !=''">
+            AND ss.sign_name LIKE concat('%',#{request.signName},'%')
+        </if>
+        <if test="request.signDirector != null and request.signDirector !=''">
+            AND ss.sign_director LIKE concat('%',#{request.signDirector},'%')
+        </if>
+        <if test="request.signUserId != null and request.signUserId !=''">
+            AND ss.sign_user_id = #{request.signUserId}
+        </if>
+        <if test="request.createStartTime != null and request.createStartTime !=''">
+            AND DATE_FORMAT(ss.create_time,'%Y-%m-%d') &gt;= DATE_FORMAT(#{request.createStartTime},'%Y-%m-%d')
+        </if>
+        <if test="request.createEndTime != null and request.createEndTime !=''">
+            AND DATE_FORMAT(ss.create_time,'%Y-%m-%d')  &lt;= DATE_FORMAT(#{request.createEndTime},'%Y-%m-%d')
+        </if>
+        ORDER BY ss.create_time DESC
+    </select>
+
+    <select id="selectSignList" resultMap="BaseResultMap">
+        SELECT ss.*, sd.SIMPLE_NAME AS deptName
+        FROM system_sign ss
+        LEFT JOIN sys_user su ON su.id = ss.sign_user_id
+        LEFT JOIN sys_dept sd ON sd.id = su.dept_id
+        WHERE 1=1
+        <if test="request.signNo != null and request.signNo !=''">
+            AND ss.sign_no LIKE concat('%',#{request.signNo},'%')
+        </if>
+        <if test="request.signName != null and request.signName !=''">
+            AND ss.sign_name LIKE concat('%',#{request.signName},'%')
+        </if>
+        <if test="request.signDirector != null and request.signDirector !=''">
+            AND ss.sign_director LIKE concat('%',#{request.signDirector},'%')
+        </if>
+        <if test="request.signUserId != null and request.signUserId !=''">
+            AND ss.sign_user_id = #{request.signUserId}
+        </if>
+        <if test="request.createStartTime != null and request.createStartTime !=''">
+            AND DATE_FORMAT(ss.create_time,'%Y-%m-%d') &gt;= DATE_FORMAT(#{request.createStartTime},'%Y-%m-%d')
+        </if>
+        <if test="request.createEndTime != null and request.createEndTime !=''">
+            AND DATE_FORMAT(ss.create_time,'%Y-%m-%d')  &lt;= DATE_FORMAT(#{request.createEndTime},'%Y-%m-%d')
+        </if>
+        ORDER BY ss.create_time DESC
+    </select>
 </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 515050a..60f530b 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
@@ -47,8 +47,8 @@
     String STORAGE_LOCATION = "bizStorageLocation";
     //计量专业
     String MEASURE_MAJOR = "bizMeasureMajor";
-    //管理状态
-    String MANAGER_STATE = "bizManagerState";
+    //标准装置管理状态
+    String STANDARD_MANAGER_STATE = "bizStandardManagerState";
 
     /**
      * 资源管理 字典code
@@ -95,8 +95,6 @@
     String MEASURE_STATUS = "measureStatus";
     //检定方式
     String MEASURE_TYPE = "measureType";
-    //标识打印标志类型
-    String IDENTIFY_PRINT_TYPE = "bizBusinessIdentify";
     //变更类型
     String REPORT_CHANGE_TYPE = "bizCertChangeType";
     //规模类型
@@ -111,19 +109,24 @@
     String MEASURE_CATEGORY = "measureCategory";
     //检定结果
     String MEASURE_RESULT = "measureResult";
+    //分包原因
+    String OUTSOURCE_REASON = "outsourceReason";
+
+    /**
+     * 系统管理
+     */
+    String TEMPLATE_TYPE = "templateType";
+
 
     /**
      * 标准装置 字典code
      */
     //类别
     String STANDARD_CATEGORY = "standardCategory";
-    //管理状态
-    String STANDARD_MANAGER_STATE = "standardManagerState";
     //标准等级
     String STANDARD_LEVEL = "standardLevel";
     //传递范围
     String STANDARD_TRANSMIT_RANGE = "transmitRange";
-
     //资本来源
     String CAPITAL_SOURCE = "capitalSource";
     //标准装置-申请类型
@@ -148,8 +151,6 @@
     String CERTIFICATE_CLASS = "certificationClass";
     //证书管理-检校专业
     String CALIBRATION_MAJOR = "calibrationMajor";
-    //分包原因
-    String OUTSOURCE_REASON = "outsourceReason";
 
     /**
      * 工作台
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/BaseApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/BaseApprovalListRequest.java
index 73c12c1..80d7424 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/BaseApprovalListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/BaseApprovalListRequest.java
@@ -6,6 +6,7 @@
 
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotEmpty;
+import java.util.List;
 
 /**
  * @Description:
@@ -19,14 +20,14 @@
      * 表单id
      */
     @NotBlank(message = "表单id不能为空")
-    @ApiModelProperty(value = "表单id（流程定义对应的表单id，等价于业务id）", dataType = "String")
+    @ApiModelProperty(value = "表单id（流程定义对应的表单id，等价于业务id），导出接口不用传", dataType = "String")
     private String formId;
 
     /**
      * 审批状态类型，对应ApprovalStatusEnum
      */
     @NotEmpty(message = "审批状态类型不能为空")
-    @ApiModelProperty(value = "审批状态类型code", dataType = "String")
+    @ApiModelProperty(value = "审批状态类型code，导出接口不用传", dataType = "String")
     private String approvalStatus;
 
     @ApiModelProperty(hidden = true)
@@ -34,4 +35,7 @@
 
     @ApiModelProperty(hidden = true)
     private Long createUserId;
+
+    @ApiModelProperty(value = "导出ids", dataType = "List")
+    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificatePrintApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificatePrintApprovalListRequest.java
index b93d1c9..3cc2f4e 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificatePrintApprovalListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificatePrintApprovalListRequest.java
@@ -5,8 +5,6 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import java.util.List;
-
 /**
  * @Description:
  * @Author: wangpeng
@@ -38,7 +36,4 @@
 
     @ApiModelProperty(value = "创建结束时间", dataType = "String")
     private String createTimeEnd;
-
-    @ApiModelProperty(value = "导出ids", dataType = "List")
-    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportApprovalListRequest.java
index 4f7a038..c115847 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportApprovalListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportApprovalListRequest.java
@@ -5,8 +5,6 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import java.util.List;
-
 /**
  * @Description:
  * @Author: wangpeng
@@ -15,6 +13,8 @@
 @ApiModel
 @Data
 public class CertificateReportApprovalListRequest extends BaseApprovalListRequest {
+    @ApiModelProperty(value = "委托方id", dataType = "String")
+    private Long customerId;
 
     @ApiModelProperty(value = "证书报告编号", dataType = "String")
     private String certificateReportNo;
@@ -37,6 +37,4 @@
     @ApiModelProperty(value = "检校结束时间", dataType = "String")
     private String calibrationTimeEnd;
 
-    @ApiModelProperty(value = "导出ids", dataType = "List")
-    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/identify/IdentifyListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/identify/IdentifyListRequest.java
index 1b87ae6..f019203 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/identify/IdentifyListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/identify/IdentifyListRequest.java
@@ -4,6 +4,8 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * @Description:
  * @Author: wangpeng
@@ -26,4 +28,7 @@
 
     @ApiModelProperty(value = "打印结束时间", dataType = "String")
     private String createTimeEnd;
+
+    @ApiModelProperty(value = "导出ids", dataType = "List")
+    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListRequest.java
index 1264883..62415fb 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListRequest.java
@@ -7,6 +7,7 @@
 import lombok.Data;
 
 import javax.validation.constraints.NotBlank;
+import java.util.List;
 
 @Data
 @ApiModel
@@ -37,4 +38,6 @@
     @ApiModelProperty(value = "是否加急（1是0否null全部）", dataType = "Integer")
     private String isUrgent;
 
+    @ApiModelProperty(value = "导出ids", dataType = "List")
+    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListRequest.java
index 5201d7b..499760a 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListRequest.java
@@ -17,6 +17,9 @@
     @ApiModelProperty(value = "任务单编号", dataType = "String")
     private String orderNo;
 
+    @ApiModelProperty(value = "委托方id", dataType = "Long")
+    private Long customerId;
+
     @ApiModelProperty(value = "委托方名称", dataType = "String")
     private String customerName;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OrderSampleDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OrderSampleDTO.java
new file mode 100644
index 0000000..796edc0
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OrderSampleDTO.java
@@ -0,0 +1,19 @@
+package com.casic.missiles.dto.business.outsource;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/8/24 11:38
+ */
+@ApiModel
+@Data
+public class OrderSampleDTO {
+    @ApiModelProperty(value = "任务单id", dataType = "Long")
+    private Long orderId;
+    @ApiModelProperty(value = "受检设备id", dataType = "Long")
+    private Long sampleId;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceAssessApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceAssessApprovalListRequest.java
new file mode 100644
index 0000000..9a930c3
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceAssessApprovalListRequest.java
@@ -0,0 +1,30 @@
+package com.casic.missiles.dto.business.outsource;
+
+import com.casic.missiles.dto.BaseApprovalListRequest;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/8/24 11:01
+ */
+@ApiModel
+@Data
+public class OutsourceAssessApprovalListRequest extends BaseApprovalListRequest {
+    @ApiModelProperty(value = "评审表编号", dataType = "String")
+    private String projectNo;
+
+    @ApiModelProperty(value = "分包机构名称", dataType = "String")
+    private String outsourcerName;
+
+    @ApiModelProperty(value = "申请人", dataType = "String")
+    private String applicantName;
+
+    @ApiModelProperty(value = "申请时间开始", dataType = "String")
+    private String applicantTimeStart;
+
+    @ApiModelProperty(value = "申请时间结束", dataType = "String")
+    private String applicantTimeEnd;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceAssessSaveResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceAssessSaveResponse.java
new file mode 100644
index 0000000..8bf9aad
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceAssessSaveResponse.java
@@ -0,0 +1,20 @@
+package com.casic.missiles.dto.business.outsource;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/8/14 16:17
+ */
+@ApiModel
+@Data
+public class OutsourceAssessSaveResponse {
+    @ApiModelProperty(value = "主键id", dataType = "Long")
+    private Long id;
+
+    @ApiModelProperty(value = "编号", dataType = "String")
+    private String projectNo;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProtocolApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProtocolApprovalListRequest.java
new file mode 100644
index 0000000..0f32331
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProtocolApprovalListRequest.java
@@ -0,0 +1,30 @@
+package com.casic.missiles.dto.business.outsource;
+
+import com.casic.missiles.dto.BaseApprovalListRequest;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/8/24 15:01
+ */
+@ApiModel
+@Data
+public class OutsourceProtocolApprovalListRequest extends BaseApprovalListRequest {
+    @ApiModelProperty(value = "协议书编号", dataType = "String")
+    private String protocolNo;
+
+    @ApiModelProperty(value = "分包方名称", dataType = "String")
+    private String outsourcerName;
+
+    @ApiModelProperty(value = "申请人", dataType = "String")
+    private String applicantName;
+
+    @ApiModelProperty(value = "申请时间开始", dataType = "String")
+    private String applicantTimeStart;
+
+    @ApiModelProperty(value = "申请时间结束", dataType = "String")
+    private String applicantTimeEnd;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProtocolSaveResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProtocolSaveResponse.java
new file mode 100644
index 0000000..e324967
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProtocolSaveResponse.java
@@ -0,0 +1,20 @@
+package com.casic.missiles.dto.business.outsource;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/8/14 16:17
+ */
+@ApiModel
+@Data
+public class OutsourceProtocolSaveResponse {
+    @ApiModelProperty(value = "主键id", dataType = "Long")
+    private Long id;
+
+    @ApiModelProperty(value = "编号", dataType = "String")
+    private String protocolNo;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveApprovalListRequest.java
index f29f4e4..7047c28 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveApprovalListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveApprovalListRequest.java
@@ -5,8 +5,6 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import java.util.List;
-
 /**
  * @Description: 现场检测审批列表请求实体
  * @Author: wangpeng
@@ -30,7 +28,4 @@
     @ApiModelProperty(value = "申请时间结束", dataType = "String")
     private String applyTimeEnd;
 
-    @ApiModelProperty(value = "导出ids", dataType = "List")
-    private List<Long> ids;
-
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveDetailResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveDetailResponse.java
index 1f28752..394c934 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveDetailResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveDetailResponse.java
@@ -12,6 +12,18 @@
     @ApiModelProperty(value = "id，更新/删除使用参数", dataType = "Long")
     private Long id;
 
+    @ApiModelProperty(value = "实验室代码(字典code)", dataType = "String")
+    private String labCode;
+
+    @ApiModelProperty(value = "实验室代码(字典value)", dataType = "String")
+    private String labCodeName;
+
+    @ApiModelProperty(value = "组别代码(字典code)", dataType = "String")
+    private String groupCode;
+
+    @ApiModelProperty(value = "组别代码(字典value)", dataType = "String")
+    private String groupCodeName;
+
     @ApiModelProperty(value = "审批编号", dataType = "String")
     private String siteExecutiveNo;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/environment/LocationListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/environment/LocationListRequest.java
new file mode 100644
index 0000000..13d03c3
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/environment/LocationListRequest.java
@@ -0,0 +1,20 @@
+package com.casic.missiles.dto.resource.environment;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/6/8 13:56
+ */
+@ApiModel
+@Data
+public class LocationListRequest {
+    @ApiModelProperty(value = "地点编号", dataType = "String")
+    private String locationNo;
+
+    @ApiModelProperty(value = "地点名称", dataType = "String")
+    private String locationName;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/environment/LocationListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/environment/LocationListResponse.java
new file mode 100644
index 0000000..4c531af
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/environment/LocationListResponse.java
@@ -0,0 +1,78 @@
+package com.casic.missiles.dto.resource.environment;
+
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
+import com.baomidou.mybatisplus.annotation.TableField;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description: 地点列表响应实体
+ * @Author: wangpeng
+ * @Date: 2023/6/8 13:53
+ */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
+@ApiModel
+@Data
+public class LocationListResponse {
+    @ApiModelProperty(value = "主键id", dataType = "Long")
+    private Long id;
+
+    /**
+     * 地点编号
+     */
+    @ExcelProperty("地点编号")
+    @ApiModelProperty(value = "地点编号", dataType = "String")
+    private String locationNo;
+
+    /**
+     * 地点名称
+     */
+    @ExcelProperty("地点名称")
+    @ApiModelProperty(value = "地点名称", dataType = "String")
+    private String locationName;
+
+    /**
+     * 地点位置
+     */
+    @ExcelProperty("地点位置")
+    @ApiModelProperty(value = "地点位置", dataType = "String")
+    private String locationPosition;
+
+    /**
+     * 创建人id
+     */
+    @ApiModelProperty(value = "创建人id", dataType = "Long")
+    private Long createUserId;
+
+    /**
+     * 创建人
+     */
+    @ExcelProperty("创建人")
+    @ApiModelProperty(value = "创建人", dataType = "String")
+    @TableField("create_user")
+    private String createUser;
+
+    /**
+     * 创建时间
+     */
+    @ExcelProperty("创建时间")
+    @ApiModelProperty(value = "创建时间", dataType = "String")
+    private String createTime;
+
+    /**
+     * 更新时间
+     */
+    @ApiModelProperty(value = "更新时间", dataType = "String")
+    private String updateTime;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertRequest.java
index 9a7f6c6..c827915 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertRequest.java
@@ -4,6 +4,8 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * @Description:
  * @Author: wangpeng
@@ -16,4 +18,7 @@
     private String name;
     @ApiModelProperty(value = "部门名", dataType = "String")
     private String deptName;
+
+    @ApiModelProperty(value = "导出ids", dataType = "List")
+    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertResponse.java
index f78b159..8f2f79e 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertResponse.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.dto.resource.staff;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.casic.missiles.annotation.DictCodeField;
 import com.casic.missiles.constants.MeterDictCode;
 import io.swagger.annotations.ApiModel;
@@ -13,12 +20,18 @@
  * @Author: wangpeng
  * @Date: 2023/7/27 15:13
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @ApiModel
 @Data
 public class StaffCertResponse {
     /**
      * 人员编号
      */
+    @ExcelProperty(value = "人员编号",order = 0)
     @NotEmpty(message = "人员编号不能为空")
     @ApiModelProperty(value = "人员编号", dataType = "String")
     private String staffNo;
@@ -26,6 +39,7 @@
     /**
      * 姓名
      */
+    @ExcelProperty(value = "姓名",order = 1)
     @ApiModelProperty(value = "姓名", dataType = "String")
     private String staffName;
 
@@ -54,6 +68,7 @@
     /**
      * 部门名字
      */
+    @ExcelProperty(value = "工作部门",order = 2)
     @ApiModelProperty(value = "部门名字", dataType = "String")
     private String deptName;
 
@@ -66,6 +81,7 @@
     /**
      * 计量专业
      */
+    @ExcelProperty(value = "计量专业",order = 3)
     @ApiModelProperty(value = "计量专业", dataType = "String")
     private String major;
 
@@ -110,6 +126,7 @@
     /**
      * 证书号
      */
+    @ExcelProperty(value = "证号",order = 4)
     @ApiModelProperty(value = "证书号", dataType = "String")
     private String certNo;
 
@@ -122,12 +139,14 @@
     /**
      * 有效日期
      */
+    @ExcelProperty(value = "证书有效期",order = 6)
     @ApiModelProperty(value = "有效日期", dataType = "String")
     private String effectiveDate;
 
     /**
      * 发放日期
      */
+    @ExcelProperty(value = "发证日期",order = 5)
     @ApiModelProperty(value = "发放日期", dataType = "String")
     private String grantDate;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffListRequest.java
index 7c4afb3..0a1194a 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffListRequest.java
@@ -4,6 +4,8 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * @Description:
  * @Author: wangpeng
@@ -18,4 +20,7 @@
     private String deptName;
     @ApiModelProperty(value = "部门id", dataType = "Long")
     private Long deptId;
+
+    @ApiModelProperty(value = "导出ids", dataType = "List")
+    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/TrainListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/TrainListRequest.java
index f68597b..6321f8b 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/TrainListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/TrainListRequest.java
@@ -14,6 +14,8 @@
 public class TrainListRequest {
     @ApiModelProperty(value = "训练登记表编号", dataType = "String")
     private String trainNo;
+    @ApiModelProperty(value = "值班领导", dataType = "String")
+    private String dutyLeader;
     @ApiModelProperty(value = "创建开始时间", dataType = "String")
     private String createTimeStart;
     @ApiModelProperty(value = "创建结束时间", dataType = "String")
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/SignAddRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/SignAddRequest.java
index 117be34..d71055c 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/SignAddRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/SignAddRequest.java
@@ -43,13 +43,6 @@
     private Long signUserId;
 
     /**
-     * 签章或签名-字典code
-     */
-    @NotBlank(message = "类型不能为空")
-    @ApiModelProperty(value = "签名/签章-字典code", dataType = "String", required = true)
-    private String signType;
-
-    /**
      * minio存储文件名
      */
     @ApiModelProperty(value = "上传文件返回名称", dataType = "String")
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateAddRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateAddRequest.java
index aff1265..6316648 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateAddRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateAddRequest.java
@@ -17,30 +17,28 @@
 @Data
 public class TemplateAddRequest extends BaseSystemRequest {
     /**
-     * 原始记录模板/证书报告模板名称
+     * 模板名称
      */
     @ApiModelProperty(value = "名称", dataType = "String", required = true)
     @NotBlank(message = "名称不能为空")
     private String templateName;
 
     /**
-     * 原始记录模板/证书报告模板描述
+     * 模板描述
      */
     @ApiModelProperty(value = "描述", dataType = "String")
     private String templateDesc;
 
     /**
-     * 原始记录模板/证书报告模板创建人
+     * 创建人
      */
     @ApiModelProperty(value = "创建人", dataType = "String", required = true)
     @NotBlank(message = "创建人不能为空")
     private String templateCreator;
 
-    /**
-     * 原始记录模板/证书报告模板-字典code
-     */
-    @NotBlank(message = "类型不能为空")
-    @ApiModelProperty(value = "原始记录模板/证书报告模板-字典code", dataType = "String", required = true)
+
+    @NotBlank(message = "模板类型不能为空")
+    @ApiModelProperty(value = "模板类型(字典code)", dataType = "String", required = true)
     private String templateType;
 
     /**
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateListRequest.java
index eec5a1e..6d17bbe 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateListRequest.java
@@ -1,11 +1,12 @@
 package com.casic.missiles.dto.system;
 
+import com.casic.missiles.annotation.DictCodeField;
+import com.casic.missiles.constants.MeterDictCode;
 import com.casic.missiles.dto.BaseSystemRequest;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import javax.validation.constraints.NotBlank;
 import java.util.List;
 
 /**
@@ -19,8 +20,8 @@
     /**
      * 类型
      */
-//    @ApiModelProperty(value = "类型-字典code", dataType = "String", required = true)
-    @NotBlank(message = "类型不能为空")
+    @DictCodeField(message = "模板类型不合法", cacheName = MeterDictCode.TEMPLATE_TYPE)
+    @ApiModelProperty(value = "模板类型(字典code)", dataType = "String")
     private String templateType;
 
     /**
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificateChangeApply.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificateChangeApply.java
index 9216308..36923fd 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificateChangeApply.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificateChangeApply.java
@@ -1,11 +1,19 @@
 package com.casic.missiles.model.business;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 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 com.casic.missiles.dto.BaseRequest;
+import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -20,6 +28,12 @@
  * @author wangpeng
  * @since 2023-08-15
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
+@ApiModel
 @Data
 @TableName("biz_business_certificate_change_apply")
 public class BizBusinessCertificateChangeApply extends BaseRequest implements Serializable {
@@ -33,6 +47,7 @@
     /**
      * 申请单编号
      */
+    @ExcelProperty(value = "申请单编号", order = 1)
     @ApiModelProperty(value = "申请单编号", dataType = "String")
     @TableField("change_apply_no")
     private String changeApplyNo;
@@ -40,6 +55,7 @@
     /**
      * 申请单名字
      */
+    @ExcelProperty(value = "申请单名称", order = 2)
     @ApiModelProperty(value = "申请单名字", dataType = "String")
     @TableField("change_apply_name")
     private String changeApplyName;
@@ -54,6 +70,7 @@
     /**
      * 更换证书编号
      */
+    @ExcelProperty(value = "更换证书编号", order = 3)
     @ApiModelProperty(value = "更换证书编号", dataType = "String")
     @TableField("change_report_no")
     private String changeReportNo;
@@ -61,7 +78,8 @@
     /**
      * 更换证书名字
      */
-    @ApiModelProperty(value = "更换证书名字", dataType = "String")
+    @ExcelProperty(value = "更换证书/报告名称", order = 4)
+    @ApiModelProperty(value = "更换证书/报告名称", dataType = "String")
     @TableField("change_report_name")
     private String changeReportName;
 
@@ -73,6 +91,7 @@
     @TableField("change_type")
     private String changeType;
 
+    @ExcelProperty(value = "变更类型", order = 5)
     @ApiModelProperty(value = "变更类型(字典value)", dataType = "String")
     @TableField(exist = false)
     private String changeTypeName;
@@ -142,13 +161,15 @@
     /**
      * 创建用户名字
      */
-    @ApiModelProperty(value = "创建用户名字", dataType = "String")
+    @ExcelProperty(value = "创建人", order = 6)
+    @ApiModelProperty(value = "创建人名字", dataType = "String")
     @TableField("create_user_name")
     private String createUserName;
 
     /**
      * 创建时间
      */
+    @ExcelProperty(value = "创建时间", order = 7)
     @ApiModelProperty(value = "创建时间", dataType = "String")
     @TableField("create_time")
     private String createTime;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificateReport.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificateReport.java
index f01db9e..db06018 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificateReport.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificateReport.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.model.business;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -22,6 +29,11 @@
  * @author wangpeng
  * @since 2023-08-14
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @ApiModel
 @Data
 @TableName("biz_business_certificate_report")
@@ -36,6 +48,7 @@
     /**
      * 证书报告编号
      */
+    @ExcelProperty(value = "证书报告编号", order = 1)
     @ApiModelProperty(value = "证书报告编号", dataType = "String")
     @TableField("certificate_report_no")
     private String certificateReportNo;
@@ -43,6 +56,7 @@
     /**
      * 证书报告名称
      */
+    @ExcelProperty(value = "证书报告名称", order = 2)
     @ApiModelProperty(value = "证书报告名称", dataType = "String")
     @TableField("certificate_report_name")
     private String certificateReportName;
@@ -62,6 +76,7 @@
     @TableField("measure_category")
     private String measureCategory;
 
+    @ExcelProperty(value = "检校类别", order = 6)
     @ApiModelProperty(value = "检校类别(字典value)", dataType = "String")
     @TableField(exist = false)
     private String measureCategoryName;
@@ -69,6 +84,7 @@
     /**
      * 检校时间
      */
+    @ExcelProperty(value = "检校时间", order = 8)
     @ApiModelProperty(value = "检校时间", dataType = "String")
     @TableField("calibration_time")
     private String calibrationTime;
@@ -267,18 +283,22 @@
     @TableField(exist = false)
     private Integer decisionItem;
 
-    @ApiModelProperty(value = "设备样品编号（列表返回参数）", dataType = "String")
+    @ExcelProperty(value = "被检设备统一编号", order = 3)
+    @ApiModelProperty(value = "被检设备统一编号（列表返回参数）", dataType = "String")
     @TableField(exist = false)
     private String sampleNo;
 
-    @ApiModelProperty(value = "设备样品名称（列表返回参数）", dataType = "String")
+    @ExcelProperty(value = "被检设备名称", order = 4)
+    @ApiModelProperty(value = "被检设备名称（列表返回参数）", dataType = "String")
     @TableField(exist = false)
     private String sampleName;
 
-    @ApiModelProperty(value = "设备样品规格型号（列表返回参数）", dataType = "String")
+    @ExcelProperty(value = "规格型号", order = 5)
+    @ApiModelProperty(value = "规格型号（列表返回参数）", dataType = "String")
     @TableField(exist = false)
     private String sampleModel;
 
+    @ExcelProperty(value = "检定员", order = 7)
     @ApiModelProperty(value = "检定员名字（列表返回参数）", dataType = "String")
     @TableField(exist = false)
     private String staffName;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessIdentifyInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessIdentifyInfo.java
index 46bfba5..f1a9bec 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessIdentifyInfo.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessIdentifyInfo.java
@@ -1,10 +1,15 @@
 package com.casic.missiles.model.business;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 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;
 
@@ -20,6 +25,11 @@
  * @author wangpeng
  * @since 2023-08-15
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @Data
 @TableName("biz_business_identify_info")
 public class BizBusinessIdentifyInfo implements Serializable {
@@ -33,6 +43,7 @@
     /**
      * 记录编号
      */
+    @ExcelProperty(value = "记录编号", order = 1)
     @ApiModelProperty(value = "记录编号", dataType = "String")
     @TableField("record_no")
     private String recordNo;
@@ -41,20 +52,15 @@
      * 标志类型(字典code)
      */
     @NotEmpty(message = "标志类型不能为空")
-    @ApiModelProperty(value = "标志类型(字典code)", dataType = "String")
-    @DictCodeField(message = "标志类型不合法", cacheName = MeterDictCode.IDENTIFY_PRINT_TYPE)
+    @ApiModelProperty(value = "标志类型(直接存计量标识/使用状态/校准状态的字典value)", dataType = "String")
     @TableField("identify_type")
     private String identifyType;
 
-    @ApiModelProperty(value = "标志类型(字典value)", dataType = "String")
-    @TableField(exist = false)
-    private String identifyTypeName;
-
     /**
      * 设备id(可以是受检设备/设备台账)
      */
     @NotNull(message = "设备id不能为空")
-    @ApiModelProperty(value = "设备id(可以是受检设备/设备台账)", dataType = "String")
+    @ApiModelProperty(value = "设备id(可以是受检设备/设备台账)", dataType = "Long")
     @TableField("device_id")
     private Long deviceId;
 
@@ -66,29 +72,32 @@
     @TableField("device_type")
     private String deviceType;
 
+    @ExcelProperty(value = "统一编号", order = 3)
     @NotEmpty(message = "设备编号不能为空")
-    @ApiModelProperty(value = "设备编号", dataType = "String")
+    @ApiModelProperty(value = "统一编号", dataType = "String")
     @TableField("device_no")
     private String deviceNo;
 
     /**
      * 设备名字
      */
-    @NotEmpty(message = "设备名字不能为空")
-    @ApiModelProperty(value = "设备名字", dataType = "String")
+    @ExcelProperty(value = "设备名称", order = 4)
+    @NotEmpty(message = "设备名称不能为空")
+    @ApiModelProperty(value = "设备名称", dataType = "String")
     @TableField("device_name")
     private String deviceName;
 
     /**
      * 检定员id
      */
-    @ApiModelProperty(value = "检定员id", dataType = "String")
+    @ApiModelProperty(value = "检定员id", dataType = "Long")
     @TableField("measure_person_id")
     private Long measurePersonId;
 
     /**
      * 检定员名字
      */
+    @ExcelProperty(value = "检定员", order = 5)
     @ApiModelProperty(value = "检定员名字", dataType = "String")
     @TableField("measure_person")
     private String measurePerson;
@@ -103,7 +112,8 @@
     /**
      * 更新时间
      */
-    @ApiModelProperty(value = "更新时间", dataType = "String")
+    @ExcelProperty(value = "打印时间", order = 6)
+    @ApiModelProperty(value = "打印时间", dataType = "String")
     @TableField("update_time")
     private String updateTime;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceAssess.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceAssess.java
index 659d9ca..6720b90 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceAssess.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceAssess.java
@@ -1,11 +1,26 @@
 package com.casic.missiles.model.business;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 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 com.casic.missiles.dto.BaseRequest;
+import com.casic.missiles.dto.business.outsource.OrderSampleDTO;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import javax.validation.constraints.NotEmpty;
 import java.io.Serializable;
+import java.util.List;
 
 /**
  * <p>
@@ -15,146 +30,231 @@
  * @author wangpeng
  * @since 2023-08-16
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
+@ApiModel
 @Data
 @TableName("biz_business_outsource_assess")
-public class BizBusinessOutsourceAssess implements Serializable {
+public class BizBusinessOutsourceAssess extends BaseRequest implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
+    @ApiModelProperty(value = "id，更新/删除使用参数", dataType = "Long")
     @TableId("id")
     private Long id;
 
     /**
      * 评审表编号
      */
+    @ExcelProperty(value = "评审表编号", order = 1)
+    @ApiModelProperty(value = "评审表编号(后台生成)", dataType = "String")
     @TableField("project_no")
     private String projectNo;
 
     /**
      * 评审表名称
      */
+    @ExcelProperty(value = "评审表名称", order = 2)
+    @ApiModelProperty(value = "评审表名称", dataType = "String")
     @TableField("project_name")
     private String projectName;
 
+    @NotEmpty(message = "实验室代码不能为空")
+    @DictCodeField(message = "实验室代码描述不合法", cacheName = MeterDictCode.LAB_CODE)
+    @ApiModelProperty(value = "实验室代码(字典code)", dataType = "String")
+    @TableField("lab_code")
+    private String labCode;
+
+    @ApiModelProperty(value = "实验室代码(字典value)", dataType = "String")
+    @TableField(exist = false)
+    private String labCodeName;
+
+    /**
+     * 组别代码
+     */
+    @NotEmpty(message = "组别代码不能为空")
+    @DictCodeField(message = "组别代码描述不合法", cacheName = MeterDictCode.GROUP_CODE)
+    @ApiModelProperty(value = "组别代码(字典code)", dataType = "String")
+    @TableField("group_code")
+    private String groupCode;
+
+    @ApiModelProperty(value = "组别代码(字典value)", dataType = "String")
+    @TableField(exist = false)
+    private String groupCodeName;
+
     /**
      * 申请人id
      */
+    @ApiModelProperty(value = "申请人id", dataType = "String")
     @TableField("applicant_id")
     private Long applicantId;
 
     /**
      * 申请人名字
      */
+    @ExcelProperty(value = "申请人", order = 5)
+    @ApiModelProperty(value = "申请人", dataType = "String")
     @TableField("applicant_name")
     private String applicantName;
 
     /**
      * 申请时间
      */
+    @ExcelProperty(value = "申请时间", order = 6)
+    @ApiModelProperty(value = "申请时间", dataType = "String")
     @TableField("applicant_time")
     private String applicantTime;
 
     /**
      * 附件(minio存储文件名)
      */
+    @ApiModelProperty(value = "附件(minio存储文件名)", dataType = "String")
     @TableField("minio_file_name")
     private String minioFileName;
 
     /**
      * 备注
      */
+    @ApiModelProperty(value = "备注", dataType = "String")
     @TableField("remark")
     private String remark;
 
     /**
      * 创建人id
      */
+    @ApiModelProperty(value = "创建人id", dataType = "String")
     @TableField("create_user_id")
     private Long createUserId;
 
     /**
      * 创建人名字
      */
+    @ApiModelProperty(value = "创建人名字", dataType = "String")
     @TableField("create_user_name")
     private String createUserName;
 
     /**
      * 分包方id
      */
+    @ApiModelProperty(value = "评审表编号", dataType = "String")
     @TableField("outsourcer_id")
     private Long outsourcerId;
 
     /**
      * 预计开始时间
      */
+    @ApiModelProperty(value = "预计开始时间", dataType = "String")
     @TableField("pre_start_time")
     private String preStartTime;
 
     /**
      * 预计结束时间
      */
+    @ApiModelProperty(value = "预计结束时间", dataType = "String")
     @TableField("pre_end_time")
     private String preEndTime;
 
     /**
      * 分包原因-字典
      */
+    @ApiModelProperty(value = "分包原因(字典code)", dataType = "String")
+    @DictCodeField(message = "分包原因描述不合法", cacheName = MeterDictCode.OUTSOURCE_REASON)
     @TableField("outsource_reason")
     private String outsourceReason;
 
+    @ApiModelProperty(value = "分包原因(字典value)", dataType = "String")
+    @TableField(exist = false)
+    private String outsourceReasonName;
+
     /**
      * 预计费用
      */
+    @ApiModelProperty(value = "预计费用", dataType = "String")
     @TableField("pre_cost")
     private String preCost;
 
     /**
      * 审批状态
      */
+    @ApiModelProperty(value = "审批状态", dataType = "String")
+    @DictCodeField(message = "审批状态描述不合法", cacheName = MeterDictCode.APPROVAL_STATUS)
     @TableField("approval_status")
     private String approvalStatus;
 
     /**
      * 流程实例id
      */
+    @ApiModelProperty(value = "流程实例id", dataType = "String")
     @TableField("process_id")
     private String processId;
 
     /**
      * 实验室认可情况
      */
+    @ApiModelProperty(value = "实验室认可情况", dataType = "String")
     @TableField("approve_situation")
     private String approveSituation;
 
     /**
      * 溯源性
      */
+    @ApiModelProperty(value = "溯源性", dataType = "String")
     @TableField("traceability")
     private String traceability;
 
     /**
      * 测试方法
      */
+    @ApiModelProperty(value = "测试方法", dataType = "String")
     @TableField("test_method")
     private String testMethod;
 
     /**
      * 技术能力
      */
+    @ApiModelProperty(value = "技术能力", dataType = "String")
     @TableField("technique_ability")
     private String techniqueAbility;
 
     /**
      * 创建时间
      */
+    @ApiModelProperty(hidden = true)
     @TableField("create_time")
     private String createTime;
 
     /**
      * 更新时间
      */
+    @ApiModelProperty(hidden = true)
     @TableField("update_time")
     private String updateTime;
 
+    @ApiModelProperty(value = "审批状态类型-字典value", dataType = "String")
+    @TableField(exist = false)
+    private String approvalStatusName;
 
+    @ApiModelProperty(value = "任务id（同意、驳回等操作使用）", dataType = "String")
+    @TableField(exist = false)
+    private String taskId;
+
+    @ApiModelProperty(value = "可选决策项（1同意驳回拒绝 2同意驳回 3同意拒绝，用于待审批列表同意/驳回/拒绝按钮展示）", dataType = "Integer")
+    @TableField(exist = false)
+    private Integer decisionItem;
+
+    @NotEmpty(message = "受检设备信息不能为空")
+    @ApiModelProperty(value = "受检设备id列表（新建使用参数）", dataType = "List")
+    @TableField(exist = false)
+    private List<OrderSampleDTO> orderSampleList;
+
+    @ExcelProperty(value = "分包机构名称", order = 3)
+    @ApiModelProperty(value = "分包机构名称（列表返回参数）", dataType = "String")
+    private String outsourcerName;
+
+    @ExcelProperty(value = "机构负责人", order = 4)
+    @ApiModelProperty(value = "机构负责人（列表返回参数）", dataType = "String")
+    private String director;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceProtocol.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceProtocol.java
new file mode 100644
index 0000000..38df697
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceProtocol.java
@@ -0,0 +1,225 @@
+package com.casic.missiles.model.business;
+
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
+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 com.casic.missiles.dto.BaseRequest;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotEmpty;
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 计量检定业务-分包管理-测试、校准或检定工作分包协议书
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-08-24
+ */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
+@Data
+@TableName("biz_business_outsource_protocol")
+public class BizBusinessOutsourceProtocol extends BaseRequest implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "id，更新/删除使用参数", dataType = "Long")
+    @TableId("id")
+    private Long id;
+
+    /**
+     * 协议书编号
+     */
+    @ExcelProperty(value = "协议书编号", order = 1)
+    @ApiModelProperty(value = "协议书编号(后台生成)", dataType = "String")
+    @TableField("protocol_no")
+    private String protocolNo;
+
+    /**
+     * 协议书名称
+     */
+    @ExcelProperty(value = "协议书名称", order = 2)
+    @ApiModelProperty(value = "协议书名称", dataType = "String")
+    @TableField("project_name")
+    private String projectName;
+
+    @NotEmpty(message = "实验室代码不能为空")
+    @DictCodeField(message = "实验室代码描述不合法", cacheName = MeterDictCode.LAB_CODE)
+    @ApiModelProperty(value = "实验室代码(字典code)", dataType = "String")
+    @TableField("lab_code")
+    private String labCode;
+
+    @ApiModelProperty(value = "实验室代码(字典value)", dataType = "String")
+    @TableField(exist = false)
+    private String labCodeName;
+
+    @NotEmpty(message = "组别代码不能为空")
+    @DictCodeField(message = "组别代码描述不合法", cacheName = MeterDictCode.GROUP_CODE)
+    @ApiModelProperty(value = "组别代码(字典code)", dataType = "String")
+    @TableField("group_code")
+    private String groupCode;
+
+    @ApiModelProperty(value = "组别代码(字典value)", dataType = "String")
+    @TableField(exist = false)
+    private String groupCodeName;
+
+    /**
+     * 分包方id
+     */
+    @ApiModelProperty(value = "分包方id", dataType = "Long")
+    @TableField("outsourcer_id")
+    private Long outsourcerId;
+
+    /**
+     * 其他
+     */
+    @ApiModelProperty(value = "其他", dataType = "String")
+    @TableField("remark")
+    private String remark;
+
+    /**
+     * 分包方编号
+     */
+    @ApiModelProperty(value = "分包方编号(新建不用传)", dataType = "String")
+    @TableField("outsource_no")
+    private String outsourceNo;
+
+    /**
+     * 分包方名称
+     */
+    @ExcelProperty(value = "分包方名称", order = 3)
+    @ApiModelProperty(value = "分包方名称(新建不用传)", dataType = "String")
+    @TableField("outsource_name")
+    private String outsourceName;
+
+    /**
+     * 联系人
+     */
+    @ExcelProperty(value = "联系人", order = 4)
+    @ApiModelProperty(value = "联系人", dataType = "String")
+    @TableField("contacts")
+    private String contacts;
+
+    /**
+     * 电话
+     */
+    @ApiModelProperty(value = "电话", dataType = "String")
+    @TableField("mobile")
+    private String mobile;
+
+    /**
+     * 地址
+     */
+    @ApiModelProperty(value = "地址", dataType = "String")
+    @TableField("address")
+    private String address;
+
+    /**
+     * 要求完成日期
+     */
+    @ApiModelProperty(value = "要求完成日期", dataType = "String")
+    @TableField("require_date")
+    private String requireDate;
+
+    /**
+     * 分包费用(元)
+     */
+    @ApiModelProperty(value = "分包费用(元)", dataType = "String")
+    @TableField("outsource_cost")
+    private Double outsourceCost;
+
+    /**
+     * 分包方负责人
+     */
+    @ApiModelProperty(value = "分包方负责人", dataType = "String")
+    @TableField("director")
+    private String director;
+
+    /**
+     * 分包项目
+     */
+    @ApiModelProperty(value = "分包项目", dataType = "String")
+    @TableField("item")
+    private String item;
+
+    /**
+     * 分包要求
+     */
+    @ApiModelProperty(value = "分包要求", dataType = "String")
+    @TableField("requires")
+    private String requires;
+
+    /**
+     * 创建人id
+     */
+    @ApiModelProperty(hidden = true)
+    @TableField("create_user_id")
+    private Long createUserId;
+
+    /**
+     * 创建人名字
+     */
+    @ExcelProperty(value = "申请人", order = 5)
+    @ApiModelProperty(value = "申请人", dataType = "String")
+    @TableField("create_user_name")
+    private String createUserName;
+
+    /**
+     * 审批状态
+     */
+    @ApiModelProperty(value = "审批状态", dataType = "String")
+    @DictCodeField(message = "审批状态描述不合法", cacheName = MeterDictCode.APPROVAL_STATUS)
+    @TableField("approval_status")
+    private String approvalStatus;
+
+    /**
+     * 流程实例id
+     */
+    @ApiModelProperty(value = "流程实例id", dataType = "String")
+    @TableField("process_id")
+    private String processId;
+
+    /**
+     * 创建时间
+     */
+    @ExcelProperty(value = "申请时间", order = 6)
+    @ApiModelProperty(value = "申请时间", dataType = "String")
+    @TableField("create_time")
+    private String createTime;
+
+    /**
+     * 更新时间
+     */
+    @ApiModelProperty(hidden = true)
+    @TableField("update_time")
+    private String updateTime;
+
+    @ApiModelProperty(value = "审批状态类型-字典value", dataType = "String")
+    @TableField(exist = false)
+    private String approvalStatusName;
+
+    @ApiModelProperty(value = "任务id（同意、驳回等操作使用）", dataType = "String")
+    @TableField(exist = false)
+    private String taskId;
+
+    @ApiModelProperty(value = "可选决策项（1同意驳回拒绝 2同意驳回 3同意拒绝，用于待审批列表同意/驳回/拒绝按钮展示）", dataType = "Integer")
+    @TableField(exist = false)
+    private Integer decisionItem;
+
+
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourcerInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourcerInfo.java
index ec4e997..f9aa69e 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourcerInfo.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourcerInfo.java
@@ -17,6 +17,7 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import javax.validation.constraints.NotEmpty;
 import java.io.Serializable;
 
 /**
@@ -59,6 +60,29 @@
     @TableField("outsourcer_name")
     private String outsourcerName;
 
+    @NotEmpty(message = "实验室代码不能为空")
+    @DictCodeField(message = "实验室代码描述不合法", cacheName = MeterDictCode.LAB_CODE)
+    @ApiModelProperty(value = "实验室代码(字典code)", dataType = "String")
+    @TableField("lab_code")
+    private String labCode;
+
+    @ApiModelProperty(value = "实验室代码(字典value)", dataType = "String")
+    @TableField(exist = false)
+    private String labCodeName;
+
+    /**
+     * 组别代码
+     */
+    @NotEmpty(message = "组别代码不能为空")
+    @DictCodeField(message = "组别代码描述不合法", cacheName = MeterDictCode.GROUP_CODE)
+    @ApiModelProperty(value = "组别代码(字典code)", dataType = "String")
+    @TableField("group_code")
+    private String groupCode;
+
+    @ApiModelProperty(value = "组别代码(字典value)", dataType = "String")
+    @TableField(exist = false)
+    private String groupCodeName;
+
     /**
      * 单位简称
      */
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardInfo.java
index c48eed7..dffdfdd 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardInfo.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardInfo.java
@@ -5,6 +5,7 @@
 import com.baomidou.mybatisplus.annotation.TableName;
 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;
 
@@ -18,6 +19,7 @@
  * @author wangpeng
  * @since 2023-08-04
  */
+@ApiModel
 @Data
 @TableName("biz_equipment_standard_info")
 public class BizEquipmentStandardInfo implements Serializable {
@@ -119,7 +121,7 @@
      * 管理状态(字典code)
      */
     @ApiModelProperty(value = "管理状态(字典code)", dataType = "String")
-    @DictCodeField(message = "管理状态不合法", cacheName = MeterDictCode.MANAGER_STATE)
+    @DictCodeField(message = "管理状态不合法", cacheName = MeterDictCode.STANDARD_MANAGER_STATE)
     @TableField("manage_status")
     private String manageStatus;
 
@@ -151,7 +153,7 @@
     /**
      * 温度(℃)
      */
-    @ApiModelProperty(value = "使用状态(字典code)", dataType = "String")
+    @ApiModelProperty(value = "温度(℃)", dataType = "String")
     @TableField("temperature")
     private Double temperature;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardInfoApproval.java b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardInfoApproval.java
index dbd86ab..9f58d83 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardInfoApproval.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardInfoApproval.java
@@ -150,7 +150,7 @@
      * 管理状态(字典code)
      */
     @ApiModelProperty(value = "管理状态(字典code)", dataType = "String")
-    @DictCodeField(message = "管理状态不合法", cacheName = MeterDictCode.MANAGER_STATE)
+    @DictCodeField(message = "管理状态不合法", cacheName = MeterDictCode.STANDARD_MANAGER_STATE)
     @TableField("manage_status")
     private String manageStatus;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardTechnologyRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardTechnologyRelation.java
index 0e612bd..751f26b 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardTechnologyRelation.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardTechnologyRelation.java
@@ -3,6 +3,7 @@
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -16,6 +17,7 @@
  * @author wangpeng
  * @since 2023-08-04
  */
+@ApiModel
 @Data
 @TableName("biz_equipment_standard_technology_relation")
 public class BizEquipmentStandardTechnologyRelation implements Serializable {
@@ -33,6 +35,10 @@
     @TableField("technology_file_id")
     private Long technologyFileId;
 
+    @ApiModelProperty(value = "依据的技术文件编号", dataType = "String")
+    @TableField("technology_file_no")
+    private String technologyFileNo;
+
     /**
      * 依据的技术文件名称(技术文件中现行测试校准检定方法表文件名字段)
      */
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerInfo.java
index d6e8bed..65cd6bc 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerInfo.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerInfo.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.model.resource;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -21,6 +28,11 @@
  * @author wangpeng
  * @since 2023-08-08
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @ApiModel
 @Data
 @TableName("biz_resource_customer_info")
@@ -35,6 +47,7 @@
     /**
      * 委托方编号
      */
+    @ExcelProperty(value = "委托方编号", order = 1)
     @ApiModelProperty(value = "委托方编号", dataType = "String")
     @TableField("customer_no")
     private String customerNo;
@@ -42,6 +55,7 @@
     /**
      * 委托方名称
      */
+    @ExcelProperty(value = "委托方名称", order = 2)
     @ApiModelProperty(value = "委托方名称(新建时为下拉选择一个受检单位组织的名字，传deptId字段，后端获取名称)", dataType = "String")
     @TableField("customer_name")
     private String customerName;
@@ -63,6 +77,7 @@
     /**
      * 联系人
      */
+    @ExcelProperty(value = "联系人", order = 3)
     @ApiModelProperty(value = "联系人", dataType = "String")
     @TableField("contacts")
     private String contacts;
@@ -70,6 +85,7 @@
     /**
      * 座机电话
      */
+    @ExcelProperty(value = "座机电话", order = 4)
     @ApiModelProperty(value = "座机电话", dataType = "String")
     @TableField("mobile")
     private String mobile;
@@ -77,6 +93,7 @@
     /**
      * 手机号码
      */
+    @ExcelProperty(value = "手机号码", order = 5)
     @ApiModelProperty(value = "手机号码", dataType = "String")
     @TableField("phone")
     private String phone;
@@ -91,6 +108,7 @@
     /**
      * 地址
      */
+    @ExcelProperty(value = "地址", order = 6)
     @ApiModelProperty(value = "地址", dataType = "String")
     @TableField("address")
     private String address;
@@ -141,6 +159,7 @@
     /**
      * 创建时间
      */
+    @ExcelProperty(value = "创建时间", order = 7)
     @ApiModelProperty(value = "创建时间", dataType = "String")
     @TableField("create_time")
     private String createTime;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerSuggestForm.java b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerSuggestForm.java
index 7201bbd..701bf8b 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerSuggestForm.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerSuggestForm.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.model.resource;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -22,6 +29,11 @@
  * @author wangpeng
  * @since 2023-08-08
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @ApiModel
 @Data
 @TableName("biz_resource_customer_suggest_form")
@@ -44,7 +56,8 @@
     /**
      * 委托方名称
      */
-    @ApiModelProperty(value = "委托方名称", dataType = "String")
+    @ExcelProperty(value = "意见反馈单位", order = 2)
+    @ApiModelProperty(value = "意见反馈单位", dataType = "String")
     @TableField("customer_name")
     private String customerName;
 
@@ -59,7 +72,8 @@
     /**
      * 委托方意见反馈部门名称
      */
-    @ApiModelProperty(value = "委托方意见反馈部门名称", dataType = "String")
+    @ExcelProperty(value = "委托方意见反馈部门", order = 3)
+    @ApiModelProperty(value = "委托方意见反馈部门", dataType = "String")
     @TableField("customer_dept_name")
     private String customerDeptName;
 
@@ -73,6 +87,7 @@
     /**
      * 表单编号
      */
+    @ExcelProperty(value = "表单编号", order = 1)
     @ApiModelProperty(value = "表单编号", dataType = "String")
     @TableField("form_no")
     private String formNo;
@@ -111,6 +126,7 @@
     /**
      * 创建人名字
      */
+    @ExcelProperty(value = "创建人", order = 4)
     @ApiModelProperty(value = "创建人名字", dataType = "String")
     @TableField("create_user_name")
     private String createUserName;
@@ -147,6 +163,7 @@
     /**
      * 创建时间
      */
+    @ExcelProperty(value = "创建时间", order = 5)
     @ApiModelProperty(value = "创建时间", dataType = "String")
     @TableField("create_time")
     private String createTime;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSealInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSealInfo.java
index cbf05d7..9bf389d 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSealInfo.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSealInfo.java
@@ -106,6 +106,10 @@
     @TableField("minio_file_name")
     private String minioFileName;
 
+    @ApiModelProperty(value = "minio存储文件url", dataType = "String")
+    @TableField(exist = false)
+    private String minioFileUrl;
+
     @ApiModelProperty(value = "创建时间", dataType = "String")
     @TableField("create_time")
     private String createTime;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSealUseNote.java b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSealUseNote.java
index 3f2d9e8..3ce16a8 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSealUseNote.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSealUseNote.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.model.resource;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -20,6 +27,11 @@
  * @author wangpeng
  * @since 2023-07-28
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @ApiModel
 @Data
 @TableName("biz_resource_seal_use_note")
@@ -34,6 +46,7 @@
     /**
      * 登记表编号
      */
+    @ExcelProperty(value = "申请单编号", order = 1)
     @ApiModelProperty(value = "登记表编号(自动生成)", dataType = "String")
     @TableField("note_form_no")
     private String noteFormNo;
@@ -55,6 +68,7 @@
     /**
      * 申请部门
      */
+    @ExcelProperty(value = "申请部门", order = 5)
     @ApiModelProperty(value = "申请部门", dataType = "String")
     @TableField("apply_dept_name")
     private String applyDeptName;
@@ -69,6 +83,7 @@
     /**
      * 申请人
      */
+    @ExcelProperty(value = "申请人", order = 6)
     @ApiModelProperty(value = "申请人", dataType = "String")
     @TableField("apply_user_name")
     private String applyUserName;
@@ -76,6 +91,7 @@
     /**
      * 申请时间
      */
+    @ExcelProperty(value = "申请时间", order = 7)
     @ApiModelProperty(value = "申请时间(新增自动获取当前时间)", dataType = "String")
     @TableField("apply_time")
     private String applyTime;
@@ -130,6 +146,26 @@
     @TableField("update_time")
     private String updateTime;
 
+    @ExcelProperty(value = "印章名称", order = 2)
+    @ApiModelProperty(value = "印章名称(列表返回参数)", dataType = "String")
+    @TableField(exist = false)
+    private String sealName;
+
+    @DictCodeField(message = "印章类型描述不合法", cacheName = MeterDictCode.SEAL_TYPE)
+    @ApiModelProperty(hidden = true)
+    @TableField(exist = false)
+    private String sealType;
+
+    @ExcelProperty(value = "印章类型", order = 3)
+    @ApiModelProperty(value = "印章类型(列表返回参数)", dataType = "String")
+    @TableField(exist = false)
+    private String sealTypeName;
+
+    @ExcelProperty(value = "批准人", order = 4)
+    @ApiModelProperty(value = "批准人(列表返回参数)", dataType = "String")
+    @TableField(exist = false)
+    private String approverName;
+
     @ApiModelProperty(value = "审批状态类型-字典value", dataType = "String")
     @TableField(exist = false)
     private String approvalStatusName;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceStaffInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceStaffInfo.java
index 5ef995b..41563a1 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceStaffInfo.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceStaffInfo.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.model.resource;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -20,6 +27,11 @@
  * @author wangpeng
  * @since 2023-07-25
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @ApiModel
 @Data
 @TableName("biz_resource_staff_info")
@@ -38,6 +50,7 @@
     /**
      * 人员编号
      */
+    @ExcelProperty(value = "人员编号",order = 0)
     @NotEmpty(message = "人员编号不能为空")
     @ApiModelProperty(value = "人员编号", dataType = "String")
     @TableField("staff_no")
@@ -46,6 +59,7 @@
     /**
      * 姓名
      */
+    @ExcelProperty(value = "姓名",order = 1)
     @ApiModelProperty(value = "姓名", dataType = "String")
     @TableField("staff_name")
     private String staffName;
@@ -152,13 +166,15 @@
     /**
      * 部门名字
      */
-    @ApiModelProperty(value = "部门名字", dataType = "String")
+    @ExcelProperty(value = "工作部门",order = 4)
+    @ApiModelProperty(value = "工作部门", dataType = "String")
     @TableField("dept_name")
     private String deptName;
 
     /**
      * 岗位
      */
+    @ExcelProperty(value = "岗位",order = 2)
     @ApiModelProperty(value = "岗位", dataType = "String")
     @TableField("station")
     private String station;
@@ -166,6 +182,7 @@
     /**
      * 计量专业
      */
+    @ExcelProperty(value = "计量专业",order = 5)
     @ApiModelProperty(value = "计量专业", dataType = "String")
     @TableField("major")
     private String major;
@@ -173,6 +190,7 @@
     /**
      * 证号
      */
+    @ExcelProperty(value = "证号",order = 3)
     @ApiModelProperty(value = "证号", dataType = "String")
     @TableField("certificate_number")
     private String certificateNumber;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSupplierInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSupplierInfo.java
index eb5ef01..a1e2697 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSupplierInfo.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSupplierInfo.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.model.resource;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -20,6 +27,11 @@
  * @author wangpeng
  * @since 2023-07-27
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @ApiModel
 @Data
 @TableName("biz_resource_supplier_info")
@@ -34,6 +46,7 @@
     /**
      * 供方编号
      */
+    @ExcelProperty(value = "供方编号", order = 1)
     @ApiModelProperty(value = "供方编号(自动生成)", dataType = "String")
     @TableField("supplier_no")
     private String supplierNo;
@@ -41,6 +54,7 @@
     /**
      * 供方名称
      */
+    @ExcelProperty(value = "供方名称", order = 2)
     @ApiModelProperty(value = "供方名称", dataType = "String")
     @TableField("supplier_name")
     private String supplierName;
@@ -60,6 +74,7 @@
     @TableField("supplier_type")
     private String supplierType;
 
+    @ExcelProperty(value = "供方类型", order = 3)
     @ApiModelProperty(value = "供方类型(字典value)", dataType = "String")
     @TableField(exist = false)
     private String supplierTypeName;
@@ -109,7 +124,8 @@
     /**
      * 电话
      */
-    @ApiModelProperty(value = "电话", dataType = "String")
+    @ExcelProperty(value = "联系电话", order = 4)
+    @ApiModelProperty(value = "联系电话", dataType = "String")
     @TableField("phone")
     private String phone;
 
@@ -158,6 +174,7 @@
     /**
      * 公司地址-省
      */
+    @ExcelProperty(value = "地址-省", order = 6)
     @ApiModelProperty(value = "公司地址-省", dataType = "String")
     @TableField("company_province_name")
     private String companyProvinceName;
@@ -172,6 +189,7 @@
     /**
      * 公司地址-市
      */
+    @ExcelProperty(value = "地址-市", order = 7)
     @ApiModelProperty(value = "公司地址-市", dataType = "String")
     @TableField("company_city_name")
     private String companyCityName;
@@ -186,6 +204,7 @@
     /**
      * 公司地址-区
      */
+    @ExcelProperty(value = "地址-区", order = 8)
     @ApiModelProperty(value = "公司地址-区", dataType = "String")
     @TableField("company_area_name")
     private String companyAreaName;
@@ -193,6 +212,7 @@
     /**
      * 公司地址-详细地址
      */
+    @ExcelProperty(value = "地址-详细地址", order = 9)
     @ApiModelProperty(value = "公司地址-详细地址", dataType = "String")
     @TableField("company_address")
     private String companyAddress;
@@ -200,6 +220,7 @@
     /**
      * 服务和供应的内容
      */
+    @ExcelProperty(value = "服务和供应的内容", order = 5)
     @ApiModelProperty(value = "服务和供应的内容", dataType = "String")
     @TableField("supplier_content")
     private String supplierContent;
@@ -250,6 +271,7 @@
     /**
      * 创建时间
      */
+    @ExcelProperty(value = "创建时间", order = 9)
     @ApiModelProperty(value = "创建时间", dataType = "String")
     @TableField("create_time")
     private String createTime;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/EnvLocationInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/EnvLocationInfo.java
new file mode 100644
index 0000000..d8e2d7b
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/EnvLocationInfo.java
@@ -0,0 +1,83 @@
+package com.casic.missiles.model.resource;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotEmpty;
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 实验室环境监控系统-设备表
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-06-07
+ */
+@ApiModel
+@Data
+@TableName("env_location_info")
+public class EnvLocationInfo implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "主键id", dataType = "Long")
+    @TableId("id")
+    private Long id;
+
+    /**
+     * 地点编号
+     */
+    @NotEmpty(message = "地点编号不能为空")
+    @ApiModelProperty(value = "地点编号", dataType = "String")
+    @TableField("location_no")
+    private String locationNo;
+
+    /**
+     * 地点名称
+     */
+    @ApiModelProperty(value = "地点名称", dataType = "String")
+    @TableField("location_name")
+    private String locationName;
+
+    /**
+     * 地点位置
+     */
+    @ApiModelProperty(value = "地点位置", dataType = "String")
+    @TableField("location_position")
+    private String locationPosition;
+
+    /**
+     * 创建人id
+     */
+    @ApiModelProperty(value = "创建人id", dataType = "Long")
+    @TableField("create_user_id")
+    private Long createUserId;
+
+    /**
+     * 创建人
+     */
+    @ApiModelProperty(value = "创建人", dataType = "String")
+    @TableField("create_user")
+    private String createUser;
+
+    /**
+     * 创建时间
+     */
+    @ApiModelProperty(value = "创建时间", dataType = "String")
+    @TableField("create_time")
+    private String createTime;
+
+    /**
+     * 更新时间
+     */
+    @ApiModelProperty(value = "更新时间", dataType = "String")
+    @TableField("update_time")
+    private String updateTime;
+
+
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemFileConfig.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemFileConfig.java
index 19e6845..86e569c 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemFileConfig.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemFileConfig.java
@@ -30,7 +30,7 @@
     @ApiModelProperty(value = "系统类别(1业务系统2受检系统3环境系统)", dataType = "Integer")
     @NotNull(message = "系统类别不能为空")
     @TableField("system_type")
-    private Integer systemType;
+    private Integer systemType = 1;
 
     @ApiModelProperty("下载编号")
     @TableField("download_no")
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemNotice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemNotice.java
index e94297d..06ec37d 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemNotice.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemNotice.java
@@ -34,7 +34,7 @@
     @ApiModelProperty(value = "系统类别(1业务系统2受检系统3环境系统)", dataType = "Integer")
     @NotNull(message = "系统类别不能为空")
     @TableField("system_type")
-    private Integer systemType;
+    private Integer systemType = 1;
 
     /**
      * 通知公告编号
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSign.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSign.java
index 6c0d7c9..954f4f8 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSign.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSign.java
@@ -51,7 +51,7 @@
     @ApiModelProperty(value = "系统类别(1业务系统2受检系统3环境系统)", dataType = "Integer")
     @NotNull(message = "系统类别不能为空")
     @TableField("system_type")
-    private Integer systemType;
+    private Integer systemType = 1;
 
     /**
      * 签名编号
@@ -130,4 +130,8 @@
     @TableField(exist = false)
     private List<Long> userIdList;
 
+    @ApiModelProperty(hidden = true)
+    @TableField(exist = false)
+    private String deptName;
+
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemTemplate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemTemplate.java
index 503a457..1d27ebe 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemTemplate.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemTemplate.java
@@ -47,7 +47,7 @@
     @ApiModelProperty(value = "系统类别(1业务系统2受检系统3环境系统)", dataType = "Integer")
     @NotNull(message = "系统类别不能为空")
     @TableField("system_type")
-    private Integer systemType;
+    private Integer systemType = 1;
 
     /**
      * 模板编号
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java
index 8c21cb0..f61e4a8 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java
@@ -32,4 +32,8 @@
     ReturnDTO approvalDelete(ApprovalDeleteRequest request);
 
     ReturnDTO failUpdate(T request);
+
+    List<O> listExport(R request);
+
+    List<O> listExportByIds(List<Long> ids);
 }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java
index 724166f..9bce15b 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java
@@ -157,6 +157,29 @@
         throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
     }
 
+    @Override
+    public List<O> listExport(R request) {
+        request.setCreateUserId(null);
+        request.setApprovalStatus(ApprovalStatusEnum.PASSED);
+        Page<O> page = PageFactory.defaultPage();
+        page.setCurrent(1);
+        page.setSearchCount(false);
+        page.setSize(Integer.MAX_VALUE);
+        Page<O> resultPage = this.baseMapper.selectBatchForApprovalList(page, request, null);
+        return resultPage.getRecords();
+    }
+
+    @Override
+    public List<O> listExportByIds(List<Long> ids) {
+        Page<O> page = PageFactory.defaultPage();
+        page.setCurrent(1);
+        page.setSearchCount(false);
+        page.setSize(Integer.MAX_VALUE);
+        List<String> businessKeys = ids.stream().map(String::valueOf).collect(Collectors.toList());
+        Page<O> resultPage = this.baseMapper.selectBatchForApprovalList(page, null, businessKeys);
+        return resultPage.getRecords();
+    }
+
     protected ReturnDTO updateApprovalStatus(Long id, String processId, String approvalStatus) {
         UpdateWrapper<T> updateWrapper = new UpdateWrapper<>();
         updateWrapper.eq("id", id);

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java
index bb0c50f..13a699b 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java
@@ -12,6 +12,7 @@
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.IGeneralApprovalService;
+import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
@@ -19,6 +20,7 @@
 import org.springframework.web.bind.annotation.RequestBody;
 
 import javax.validation.Valid;
+import java.util.List;
 import java.util.Objects;
 
 /**
@@ -117,4 +119,17 @@
         }
         return baseApprovalService.failUpdate(request);
     }
+
+    public List<O> exportList(@RequestBody @Valid R request) throws Exception {
+        List<O> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = baseApprovalService.listExportByIds(request.getIds());
+        } else {
+            list = baseApprovalService.listExport(request);
+        }
+        for (O record : list) {
+            DictCodeUtils.convertDictCodeToName(record);
+        }
+        return list;
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java
index 8a90961..d775831 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java
@@ -5,6 +5,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.business.certificate.CertificateChangeApplyApprovalListRequest;
 import com.casic.missiles.dto.business.certificate.CertificateChangeApplySaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessCertificateChangeApply;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
@@ -20,6 +21,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -48,4 +50,12 @@
         }
         return changeApplyService.saveChangeApply(request);
     }
+
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody CertificateChangeApplyApprovalListRequest request) throws Exception {
+        List<BizBusinessCertificateChangeApply> list = super.exportList(request);
+        super.exportExcel(BizBusinessCertificateChangeApply.class, list, ExportEnum.CERTIFICATE_CHANGE_APPLY.getSheetName());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java
index 5fc4b07..af8230e 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java
@@ -9,6 +9,7 @@
 import com.casic.missiles.dto.business.certificate.CertificatePrintApprovalListRequest;
 import com.casic.missiles.dto.business.certificate.CertificatePrintListResponse;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.enums.business.CertificatePrintStatusEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessCertificatePrintLog;
@@ -18,10 +19,16 @@
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.io.IOException;
+import java.util.List;
 import java.util.Objects;
 
 /**
@@ -98,4 +105,16 @@
         });
         return certificatePrintService.certificatePrintLog(idDTO.getId());
     }
+
+    @ApiOperation("证书打印审批导出")
+    @PostMapping("/listExport")
+    public void exportList(@RequestBody CertificatePrintApprovalListRequest request) throws IOException {
+        List<CertificatePrintListResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = certificatePrintService.listByIds(request.getIds());
+        } else {
+            list = certificatePrintService.list(request);
+        }
+        super.exportExcel(CertificatePrintListResponse.class, list, ExportEnum.CERTIFICATE_PRINT.getSheetName());
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java
index 63b06dc..6b2efd5 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java
@@ -6,6 +6,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.business.certificate.CertificateReportApprovalListRequest;
 import com.casic.missiles.dto.business.certificate.CertificateReportSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessCertificateReport;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
@@ -21,6 +22,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -50,7 +52,7 @@
         return certificateReportService.saveCertificateReport(request);
     }
 
-    @ApiOperation("证书审批详情（基本信息）")
+    @ApiOperation("详情（基本信息）")
     @PostMapping("/detail")
     public ReturnDTO<BizBusinessCertificateReport> detail(@RequestBody @Valid BaseDetailRequest request, BindingResult bindingResult) throws Exception {
         if(bindingResult.hasErrors()){
@@ -59,4 +61,11 @@
         return certificateReportService.detail(request);
     }
 
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody CertificateReportApprovalListRequest request) throws Exception {
+        List<BizBusinessCertificateReport> list = super.exportList(request);
+        super.exportExcel(BizBusinessCertificateReport.class, list, ExportEnum.CERTIFICATE_REPORT.getSheetName());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java
index 46b26bd..57c0809 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java
@@ -10,20 +10,21 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.business.identify.IdentifyListRequest;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessIdentifyInfo;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.business.IBizBusinessIdentifyInfoService;
+import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import javax.validation.Valid;
+import java.util.List;
 import java.util.Objects;
 
 /**
@@ -57,16 +58,13 @@
         return identifyInfoService.addIdentify(identifyInfo);
     }
 
-    @ApiOperation("标识打印更新")
+    @ApiOperation("标识打印更新（更新打印时间）")
     @PostMapping("/update")
-    public ReturnDTO updateIdentify(@RequestBody @Valid BizBusinessIdentifyInfo identifyInfo, BindingResult bindingResult) {
-        Assert.isFalse(Objects.isNull(identifyInfo.getId()), () -> {
+    public ReturnDTO updateIdentify(@RequestBody @Valid IdDTO idDTO) {
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        Assert.isFalse(bindingResult.hasErrors(), () -> {
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        });
-        return identifyInfoService.updateIdentify(identifyInfo);
+        return identifyInfoService.updateIdentify(idDTO.getId());
     }
 
     @ApiOperation("标识打印删除")
@@ -77,4 +75,37 @@
         });
         return identifyInfoService.deleteIdentify(idDTO.getId());
     }
+
+    @ApiOperation("标识打印导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody @Valid IdentifyListRequest request, BindingResult bindingResult) throws Exception {
+        if (bindingResult.hasErrors()) {
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        List<BizBusinessIdentifyInfo> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = identifyInfoService.listByIds(request.getIds());
+        } else {
+            list = identifyInfoService.list(request);
+        }
+        for (BizBusinessIdentifyInfo record : list) {
+            DictCodeUtils.convertDictCodeToName(record);
+        }
+        super.exportExcel(BizBusinessIdentifyInfo.class, list, ExportEnum.IDENTIFY_EXPORT.getSheetName());
+    }
+
+
+    // TODO: 2023/8/23 查询设备信息，4个底部按钮查设备（按钮的作用就是前端用来调不同接口、用来区分中间即将展示的标识），前端弹窗选设备，在确定保存时前端根据底部按钮判断传入设备类型deviceType字典code
+    // TODO: 2023/8/23 接口：查受检设备（第1个按钮），查设备台账（后3个按钮同一接口），查询之后前端根据标志类型的不同加到中间页面时进行判断（按产品给的对应表）
+    // TODO: 2023/8/23 提供二维码接口，前端在加到中间页面时调用一下
+
+    @ApiOperation("设备二维码")
+    @PostMapping("/equipment/qrCode")
+    public ReturnDTO<String> equipmentQrCode(@RequestBody @Valid IdDTO idDTO) {
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return identifyInfoService.equipmentQrCode(idDTO.getId());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java
index 707be6e..7e0453d 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java
@@ -117,7 +117,7 @@
     }
 
     @ApiOperation("任务单导出")
-    @PostMapping("/export")
+    @PostMapping("/listExport")
     public void orderExport(@RequestBody @Valid OrderListRequest request, HttpServletResponse response) {
         businessOrderService.orderExport(request, response);
     }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java
index 529a6ce..51432be 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java
@@ -1,9 +1,28 @@
 package com.casic.missiles.controller.business;
 
+import com.casic.missiles.controller.GeneralApprovalController;
+import com.casic.missiles.dto.BaseApprovalSubmitRequest;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.business.outsource.OutsourceAssessApprovalListRequest;
+import com.casic.missiles.dto.business.outsource.OutsourceAssessSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
+import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.model.business.BizBusinessOutsourceAssess;
+import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
+import com.casic.missiles.service.IGeneralApprovalService;
+import com.casic.missiles.service.business.IBizBusinessOutsourceAssessService;
 import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.BindingResult;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.validation.Valid;
+import java.util.List;
+
 /**
  * <p>
  * 计量检定业务-分包管理-测试、校准或检定工作分包评审表 前端控制器
@@ -15,6 +34,27 @@
 @Api(tags = "分包管理-测试、校准或检定工作分包评审表")
 @RestController
 @RequestMapping("/business/outsource/assess")
-public class BizBusinessOutsourceAssessController {
+public class BizBusinessOutsourceAssessController extends GeneralApprovalController<BizBusinessOutsourceAssess, BizBusinessOutsourceAssess, OutsourceAssessApprovalListRequest, BaseApprovalSubmitRequest> {
+    @Autowired
+    private IBizBusinessOutsourceAssessService outsourceAssessService;
 
+    public BizBusinessOutsourceAssessController(IGeneralApprovalService<BizBusinessOutsourceAssess, BizBusinessOutsourceAssess, OutsourceAssessApprovalListRequest, BaseApprovalSubmitRequest> baseApprovalService) {
+        super(baseApprovalService);
+    }
+
+    @ApiOperation("草稿箱-保存")
+    @PostMapping("/save")
+    public ReturnDTO<OutsourceAssessSaveResponse> saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceAssess request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        return outsourceAssessService.saveOutsourceAssess(request);
+    }
+
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception {
+        List<BizBusinessOutsourceAssess> list = super.exportList(request);
+        super.exportExcel(BizBusinessOutsourceAssess.class, list, ExportEnum.OUTSOURCE_ASSESS.getSheetName());
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java
new file mode 100644
index 0000000..9adef18
--- /dev/null
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java
@@ -0,0 +1,60 @@
+package com.casic.missiles.controller.business;
+
+import com.casic.missiles.controller.GeneralApprovalController;
+import com.casic.missiles.dto.BaseApprovalSubmitRequest;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.business.outsource.OutsourceProtocolApprovalListRequest;
+import com.casic.missiles.dto.business.outsource.OutsourceProtocolSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
+import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.model.business.BizBusinessOutsourceProtocol;
+import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
+import com.casic.missiles.service.IGeneralApprovalService;
+import com.casic.missiles.service.business.IBizBusinessOutsourceProtocolService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.BindingResult;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.validation.Valid;
+import java.util.List;
+
+/**
+ * <p>
+ * 计量检定业务-分包管理-测试、校准或检定工作分包协议书 前端控制器
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-08-24
+ */
+@Api(tags = "分包管理-测试、校准或检定工作分包协议书")
+@RestController
+@RequestMapping("/business/outsource/protocol")
+public class BizBusinessOutsourceProtocolController extends GeneralApprovalController<BizBusinessOutsourceProtocol, BizBusinessOutsourceProtocol, OutsourceProtocolApprovalListRequest, BaseApprovalSubmitRequest> {
+    @Autowired
+    private IBizBusinessOutsourceProtocolService outsourceProtocolService;
+
+    public BizBusinessOutsourceProtocolController(IGeneralApprovalService<BizBusinessOutsourceProtocol, BizBusinessOutsourceProtocol, OutsourceProtocolApprovalListRequest, BaseApprovalSubmitRequest> baseApprovalService) {
+        super(baseApprovalService);
+    }
+
+    @ApiOperation("草稿箱-保存")
+    @PostMapping("/save")
+    public ReturnDTO<OutsourceProtocolSaveResponse> saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceProtocol request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        return outsourceProtocolService.saveOutsourceProtocol(request);
+    }
+
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody OutsourceProtocolApprovalListRequest request) throws Exception {
+        List<BizBusinessOutsourceProtocol> list = super.exportList(request);
+        super.exportExcel(BizBusinessOutsourceProtocol.class, list, ExportEnum.OUTSOURCE_PROTOCOL.getSheetName());
+    }
+}
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java
index 097f645..f0f0943 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java
@@ -17,7 +17,6 @@
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.IGeneralApprovalService;
 import com.casic.missiles.service.business.IBizBusinessOutsourcerInfoService;
-import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -71,19 +70,8 @@
 
     @ApiOperation("分包方导出")
     @PostMapping("/listExport")
-    public void export(@RequestBody @Valid OutsourcerInfoApprovalListRequest request, BindingResult bindingResult) throws Exception {
-        if (bindingResult.hasErrors()) {
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        }
-        List<BizBusinessOutsourcerInfo> list;
-        if (!CollectionUtils.isEmpty(request.getIds())) {
-            list = outsourcerInfoService.listByIds(request.getIds());
-        } else {
-            list = outsourcerInfoService.list(request);
-        }
-        for (BizBusinessOutsourcerInfo record : list) {
-            DictCodeUtils.convertDictCodeToName(record);
-        }
+    public void export(@RequestBody OutsourcerInfoApprovalListRequest request) throws Exception {
+        List<BizBusinessOutsourcerInfo> list = super.exportList(request);
         super.exportExcel(BizBusinessOutsourcerInfo.class, list, ExportEnum.OUTSOURCER_EXPORT.getSheetName());
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java
index c2cbf9f..0410918 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java
@@ -17,11 +17,9 @@
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.IGeneralApprovalService;
 import com.casic.missiles.service.business.IBizBusinessSiteExecutiveInfoService;
-import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -60,7 +58,7 @@
         return siteExecutiveInfoService.saveSiteExecutiveInfo(siteExecutiveInfo);
     }
 
-    @ApiOperation("现场检测详情")
+    @ApiOperation("详情")
     @PostMapping("/detail")
     public ReturnDTO<SiteExecutiveDetailResponse> siteExecutiveDetail(@RequestBody @Valid IdDTO idDTO) throws Exception {
         Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
@@ -69,21 +67,10 @@
         return ReturnUtil.success(siteExecutiveInfoService.detail(idDTO.getId()));
     }
 
-    @ApiOperation("现场检测导出")
+    @ApiOperation("导出")
     @PostMapping("/listExport")
-    public void export(@RequestBody @Valid SiteExecutiveApprovalListRequest request, BindingResult bindingResult) throws Exception {
-        if (bindingResult.hasErrors()) {
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        }
-        List<SiteExecutiveApprovalListResponse> list;
-        if (!CollectionUtils.isEmpty(request.getIds())) {
-            list = siteExecutiveInfoService.listInfoByIds(request.getIds());
-        } else {
-            list = siteExecutiveInfoService.listInfo(request);
-        }
-        for (SiteExecutiveApprovalListResponse record : list) {
-            DictCodeUtils.convertDictCodeToName(record);
-        }
+    public void export(@RequestBody SiteExecutiveApprovalListRequest request) throws Exception {
+        List<SiteExecutiveApprovalListResponse> list = super.exportList(request);
         super.exportExcel(SiteExecutiveApprovalListResponse.class, list, ExportEnum.SITE_EXECUTIVE_EXPORT.getSheetName());
     }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
index 7e793cd..a92e209 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
@@ -55,7 +55,7 @@
 
     @ApiOperation("设备收发列表导出")
     @PostMapping("/export")
-    public void exportList(@RequestBody @Valid SampleDispatchListRequest request) throws IOException {
+    public void exportList(@RequestBody SampleDispatchListRequest request) throws IOException {
         List<SampleDispatchListResponse> list;
         if (!CollectionUtils.isEmpty(request.getIds())) {
             list = dispatchService.listByIds(request.getIds());
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java
index cdc77fc..d120fd4 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java
@@ -7,6 +7,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.business.labExecutive.*;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.business.IBusinessLabExecutiveInfoService;
@@ -14,6 +15,7 @@
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.*;
 
@@ -32,7 +34,7 @@
     @Autowired
     private IBusinessLabExecutiveInfoService labExecutiveInfoService;
 
-    @ApiOperation("实验室检测-部门检测-查询各状态列表（待检测、检测中、检测完）")
+    @ApiOperation("实验室任务-查询各状态列表（待检测、检测中、检测完）")
     @PostMapping("/deptExecutive/List")
     public ReturnDTO<PageInfoBT<SampleLabExecutiveListResponse>> queryDeptExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
@@ -43,10 +45,19 @@
         return ReturnUtil.success(super.packForBT(labExecutiveInfoService.deptLabExecutiveListPage(page, labExecutiveListRequest)));
     }
 
-    /**
-     * 实验室检测-我的检测-查询各状态列表（待检测、检测中、检测完）
-     */
-    @ApiOperation("实验室检测-我的检测-查询各状态列表（待检测、检测中、检测完）")
+    @ApiOperation("实验室任务导出")
+    @PostMapping("/deptExecutive/export")
+    public void deptExportList(@RequestBody @Valid SampleLabExecutiveListRequest request) throws Exception {
+        List<SampleLabExecutiveListResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = labExecutiveInfoService.deptLabExecutiveListByIds(request.getMeasureStatus(), request.getIds());
+        } else {
+            list = labExecutiveInfoService.deptLabExecutiveList(request);
+        }
+        super.exportExcel(SampleLabExecutiveListResponse.class, list, ExportEnum.DEPT_EXECUTIVE_TASK.getSheetName());
+    }
+
+    @ApiOperation("我的任务-查询各状态列表（待检测、检测中、检测完）")
     @PostMapping("/myExecutive/list")
     public ReturnDTO<PageInfoBT<SampleLabExecutiveListResponse>> queryMyExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
@@ -57,19 +68,25 @@
         return ReturnUtil.success(super.packForBT(labExecutiveInfoService.myLabExecutiveListPage(page, labExecutiveListRequest)));
     }
 
-    /**
-     * 实验室检测-我的检测-查询各状态样品数量（待检测、检测中、检测完）
-     */
-    @ApiOperation("实验室检测-我的检测-查询各状态样品数量（待检测、检测中、检测完）")
+    @ApiOperation("我的任务导出")
+    @PostMapping("/myExecutive/export")
+    public void exportList(@RequestBody @Valid SampleLabExecutiveListRequest request) throws Exception {
+        List<SampleLabExecutiveListResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = labExecutiveInfoService.myLabExecutiveListByIds(request.getMeasureStatus(), request.getIds());
+        } else {
+            list = labExecutiveInfoService.myLabExecutiveList(request);
+        }
+        super.exportExcel(SampleLabExecutiveListResponse.class, list, ExportEnum.MY_EXECUTIVE_TASK.getSheetName());
+    }
+
+    @ApiOperation("我的任务-查询各状态样品数量（待检测、检测中、检测完）")
     @GetMapping("/myExecutive/amount")
     public ReturnDTO<List<SampleAmountResponse>> queryMyExecutiveAmount() {
         return ReturnUtil.success(labExecutiveInfoService.myExecutiveAmount());
     }
 
-    /**
-     * 实验室检测-部门检测-分配（分配给具体人员）
-     */
-    @ApiOperation("实验室检测-部门检测-分配按钮（分配给具体人员）")
+    @ApiOperation("实验室任务-分配按钮（分配给具体人员）")
     @PostMapping("/deptExecutive/allocate")
     public ReturnDTO allocateStaff(@RequestBody @Valid SampleAllocateRequest sampleAllocateRequest, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -78,10 +95,7 @@
         return labExecutiveInfoService.allocateStaff(sampleAllocateRequest);
     }
 
-    /**
-     * 实验室检测-我的检测-检定人扫描收入（待检测->检测中）
-     */
-    @ApiOperation("实验室检测-我的检测-检定人扫描收入（待检测->检测中）")
+    @ApiOperation("我的任务-检定人扫描收入（待检测->检测中）")
     @PostMapping("/myExecutive/receive")
     public ReturnDTO sampleReceive(@RequestBody @Valid List<SampleOperateRequest> requestList, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -90,10 +104,7 @@
         return labExecutiveInfoService.sampleReceive(requestList);
     }
 
-    /**
-     * 实验室检测-负责人/检定人扫描检完（检测中->检测完）
-     */
-    @ApiOperation("实验室检测-负责人/检定人扫描检完（检测中->检测完）")
+    @ApiOperation("实验室任务-负责人/检定人扫描检完（检测中->检测完）")
     @PostMapping("/myExecutive/complete")
     public ReturnDTO sampleExecutiveComplete(@RequestBody @Valid List<SampleOperateRequest> requestList, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -102,10 +113,7 @@
         return labExecutiveInfoService.sampleExecutiveComplete(requestList);
     }
 
-    /**
-     * 实验室检测-部门检测/我的检测 编辑（只能修改应出具证书）
-     */
-    @ApiOperation("实验室检测-部门检测/我的检测 编辑（只能修改应出具证书）")
+    @ApiOperation("实验室任务/我的任务 编辑（只能修改应出具证书）")
     @PostMapping("/executive/update")
     public ReturnDTO updateExecutive(@RequestBody @Valid UpdateExecutiveRequest request, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -114,10 +122,7 @@
         return labExecutiveInfoService.updateExecutive(request);
     }
 
-    /**
-     * 实验室检测-部门检测/我的检测 详情
-     */
-    @ApiOperation("实验室检测-部门检测/我的检测 详情")
+    @ApiOperation("实验室任务/我的任务 详情")
     @PostMapping("/executive/detail")
     public ReturnDTO<ExecutiveDetailResponse> executiveDetail(@RequestBody @Valid ExecutiveDetailRequest request, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
@@ -131,7 +136,7 @@
      * 退回后会将下一个要执行的实验室检测状态更新为待分配，将后面的实验室顺序变更为连续（都进行减1）
      * 最后一个检测的实验室退回，等分发员再增加实验室或设备收发中的已收入直接手动点击完成
      */
-    @ApiOperation("实验室检测-部门检测/我的检测 退回（待检测/检测中->退回）")
+    @ApiOperation("实验室任务/我的任务 退回（待检测/检测中->退回）")
     @PostMapping("/executive/sendBack")
     public ReturnDTO executiveSendBack(@RequestBody @Valid ExecutiveSendBackRequest request, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -140,9 +145,6 @@
         return labExecutiveInfoService.sampleExecutiveSendBack(request);
     }
 
-    /**
-     * 分发员编辑实验室检测列表
-     */
     @ApiOperation("分发员编辑实验室检测列表")
     @PostMapping("/handOut/updateList")
     public ReturnDTO updateExecutiveList(@RequestBody @Valid UpdateExecutiveListRequest request, BindingResult bindingResult) {
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java
index 48a67ed..0c04f31 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java
@@ -10,6 +10,7 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.resource.customer.CustomerApprovalListRequest;
 import com.casic.missiles.dto.resource.customer.CustomerSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceCustomerInfo;
@@ -26,6 +27,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -55,6 +57,13 @@
         return customerInfoService.saveCustomerInfo(request);
     }
 
+    @ApiOperation("委托方名录导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody CustomerApprovalListRequest request) throws Exception {
+        List<BizResourceCustomerInfo> list = super.exportList(request);
+        super.exportExcel(BizResourceCustomerInfo.class, list, ExportEnum.CUSTOMER_INFO.getSheetName());
+    }
+
     @ApiOperation("委托方人员列表（分页）")
     @PostMapping("/person/listPage")
     public ReturnDTO<PageInfoBT<BizResourceCustomerStaff>> personListPage(@RequestBody IdDTO idDto) {
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
index 972ed4b..6418ea5 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
@@ -5,6 +5,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.resource.customer.SuggestFormApprovalListRequest;
 import com.casic.missiles.dto.resource.customer.SuggestFormSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceCustomerSuggestForm;
@@ -20,6 +21,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -50,4 +52,11 @@
         return suggestFormService.saveSuggestForm(request);
     }
 
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody SuggestFormApprovalListRequest request) throws Exception {
+        List<BizResourceCustomerSuggestForm> list = super.exportList(request);
+        super.exportExcel(BizResourceCustomerSuggestForm.class, list, ExportEnum.CUSTOMER_SUGGEST_FORM.getSheetName());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java
index 1934d1a..9e07eab 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java
@@ -15,12 +15,16 @@
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.resource.IEnvEnvironmentRecordConfigService;
 import com.casic.missiles.service.resource.IEnvEnvironmentRecordDataService;
+import com.casic.missiles.service.resource.IEnvLocationInfoService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
 import java.util.List;
@@ -39,6 +43,8 @@
     private IEnvEnvironmentRecordDataService environmentRecordDataService;
     @Autowired
     private IEnvEnvironmentRecordConfigService environmentRecordConfigService;
+    @Autowired
+    private IEnvLocationInfoService locationInfoService;
 
     @ApiOperation("环境记录单数据列表/详情")
     @PostMapping("/data/listPage")
@@ -95,4 +101,11 @@
         });
         return environmentRecordConfigService.deleteEnvironmentRecordConfig(idDTO.getId());
     }
+
+    @ApiOperation("地点列表")
+    @PostMapping("/location/listPage")
+    public ReturnDTO<PageInfoBT<LocationListResponse>> locationListPage(@RequestBody @Valid LocationListRequest request) {
+        Page<LocationListResponse> page = PageFactory.defaultPage();
+        return ReturnUtil.success(super.packForBT(locationInfoService.listPage(page, request)));
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java
index 82efe3f..e9561fa 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java
@@ -10,6 +10,7 @@
 import com.casic.missiles.dto.resource.seal.SealLogListRequest;
 import com.casic.missiles.dto.resource.seal.SealNoteApprovalListRequest;
 import com.casic.missiles.dto.resource.seal.SealNoteSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceSealUseLog;
@@ -27,6 +28,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -58,6 +60,13 @@
         return sealUseNoteService.saveSeal(request);
     }
 
+    @ApiOperation("印章使用登记导出（列表和导出中去掉经办人和监印人）")
+    @PostMapping("/listExport")
+    public void export(@RequestBody SealNoteApprovalListRequest request) throws Exception {
+        List<BizResourceSealUseNote> list = super.exportList(request);
+        super.exportExcel(BizResourceSealUseNote.class, list, ExportEnum.SEAL_NOTE.getSheetName());
+    }
+
     // TODO: 2023/7/28 印章使用日志：系统中使用印章时插入数据库
 
     @ApiOperation("印章使用日志列表（分页）")
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java
index 9b674fc..06b6521 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java
@@ -9,16 +9,20 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.resource.staff.StaffCertRequest;
 import com.casic.missiles.dto.resource.staff.StaffCertResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.service.resource.IBizResourceStaffInfoService;
 import com.casic.missiles.service.resource.IBizResourceStaffVerifierService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.List;
+
 /**
  * @Description:
  * @Author: wangpeng
@@ -41,9 +45,21 @@
         return ReturnUtil.success(super.packForBT(responsePage));
     }
 
+    @ApiOperation("证书逾期提醒导出")
+    @PostMapping("/listExport")
+    public void exportList(@RequestBody StaffCertRequest request) throws Exception {
+        List<StaffCertResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = staffInfoService.certListByIds(request.getIds());
+        } else {
+            list = staffInfoService.certList(request);
+        }
+        super.exportExcel(StaffCertResponse.class, list, ExportEnum.STAFF_CERTIFICATE_EXPIRE.getSheetName());
+    }
+
     @ApiOperation("证书逾期提醒")
     @PostMapping("/expirationReminder")
-    public ReturnDTO expirationReminder(@RequestBody IdDTO idDto) {
-        return verifierService.expirationReminder(idDto);
+    public ReturnDTO expirationReminder(@RequestBody IdDTO idDTO) {
+        return verifierService.expirationReminder(idDTO);
     }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java
index 3b251ad..a6e7850 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java
@@ -12,6 +12,7 @@
 import com.casic.missiles.dto.resource.staff.StaffListRequest;
 import com.casic.missiles.dto.resource.staff.TrainListRequest;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.*;
@@ -22,7 +23,10 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
 import java.util.List;
@@ -52,8 +56,19 @@
             throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
         }
         Page<BizResourceStaffInfo> page = PageFactory.defaultPage();
-        Page<BizResourceStaffInfo> responsePage = staffInfoService.listPage(page, request);
-        return ReturnUtil.success(super.packForBT(responsePage));
+        return ReturnUtil.success(super.packForBT(staffInfoService.listPage(page, request)));
+    }
+
+    @ApiOperation("人员登记导出")
+    @PostMapping("/listExport")
+    public void exportList(@RequestBody StaffListRequest request) throws Exception {
+        List<BizResourceStaffInfo> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = staffInfoService.listByIds(request.getIds());
+        } else {
+            list = staffInfoService.list(request);
+        }
+        super.exportExcel(BizResourceStaffInfo.class, list, ExportEnum.STAFF_INFO.getSheetName());
     }
 
     @ApiOperation("人员登记详情基础信息")
@@ -85,9 +100,9 @@
 
     @ApiOperation("科研教育列表（分页）")
     @PostMapping("/education/listPage")
-    public ReturnDTO<PageInfoBT<BizResourceStaffEducation>> educationListPage(@RequestBody IdDTO idDto) {
+    public ReturnDTO<PageInfoBT<BizResourceStaffEducation>> educationListPage(@RequestBody IdDTO idDTO) {
         Page<BizResourceStaffEducation> page = PageFactory.defaultPage();
-        Page<BizResourceStaffEducation> responsePage = staffInfoService.educationListPage(page, idDto);
+        Page<BizResourceStaffEducation> responsePage = staffInfoService.educationListPage(page, idDTO);
         return ReturnUtil.success(super.packForBT(responsePage));
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java
index af6aa86..d85d84a 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java
@@ -9,6 +9,7 @@
 import com.casic.missiles.dto.resource.outsideService.SupplierApprovalListRequest;
 import com.casic.missiles.dto.resource.outsideService.SupplierSaveResponse;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceSupplierAbility;
@@ -67,6 +68,13 @@
         return ReturnUtil.success(supplierInfoService.detail(idDTO.getId()));
     }
 
+    @ApiOperation("合格供方导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody SupplierApprovalListRequest request) throws Exception {
+        List<BizResourceSupplierInfo> list = super.exportList(request);
+        super.exportExcel(BizResourceSupplierInfo.class, list, ExportEnum.SUPPLIER_INFO.getSheetName());
+    }
+
     @ApiOperation("供方人员列表（分页）")
     @PostMapping("/person/listPage")
     public ReturnDTO<PageInfoBT<BizResourceSupplierPerson>> personListPage(@RequestBody IdDTO idDTO) {
diff --git a/casic-metering-api/src/main/resources/config/application.yml b/casic-metering-api/src/main/resources/config/application.yml
index 350db5f..ecff521 100644
--- a/casic-metering-api/src/main/resources/config/application.yml
+++ b/casic-metering-api/src/main/resources/config/application.yml
@@ -126,7 +126,7 @@
     #作者
     author: wangpeng
     #待生成对象表名
-    table-name: biz_equipment_technical_target_approval,biz_equipment_attachment_approval,biz_equipment_checkpoint_approval
+    table-name: biz_business_outsource_protocol
 
 reminder:
   #节点--common模块config包 ReminderNodeConfig配置
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
index 4a19e4e..d47d552 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
@@ -53,6 +53,7 @@
     SUGGEST_FORM_SAVE_FAILED(2509, "委托方意见登记表保存至草稿箱失败"),
     EXAMINE_FORM_SAVE_FAILED(2510, "要求、委托书及合同评审表保存至草稿箱失败"),
     CUSTOMER_EXIST_SAVE_FAILED(2511, "该委托方已存在，请重新选择"),
+    DUPLICATE_LOCATION_NO(2512, "地点编号已存在"),
 
     /**
      * 计量检定业务模块
@@ -68,6 +69,8 @@
     COMPLETE_SAMPLE_NOT_EXIST(2609, "检测中不存在扫描收入的样品"),
     CANNOT_CHANGE_MEASURE_INFO(2610, "无法更改非当前登录用户的检测信息"),
     NON_EXIST_ORDER_OR_SAMPLE(2611, "不存在该委托单或该委托单下的样品"),
+    OUTSOURCE_ACCESS_SAVE_FAILED(2612, "测试、校准或检定工作分包评审表保存至草稿箱失败"),
+    OUTSOURCE_PROTOCOL_SAVE_FAILED(2613, "测试、校准或检定工作分包协议书保存至草稿箱失败"),
 
     /**
      * 历史遗留备用
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
index 5089ad1..81a406b 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
@@ -10,54 +10,38 @@
     /**
      * 资源管理
      */
-    ENVIRONMENT_DATA_EXPORT("environmentData", "environmentData", "环境记录单数据"),
+    ENVIRONMENT_DATA_EXPORT("environmentData", "环境记录单数据", "环境记录单数据"),
+    STAFF_INFO("staffInfo", "人员登记", "人员登记"),
+    STAFF_CERTIFICATE_EXPIRE("certificateExpire", "证书逾期提醒", "证书逾期提醒"),
+    SUPPLIER_INFO("supplierInfo", "合格供方名录", "合格供方名录"),
+    CUSTOMER_INFO("customerInfo", "委托方名录", "委托方名录"),
+    CUSTOMER_SUGGEST_FORM("customerSuggestForm", "委托方意见登记表", "委托方意见登记表"),
+    SEAL_NOTE("sealNote", "印章使用登记", "印章使用登记"),
 
-    FILE_EXPORT("meterFileData", "meterFileData", "计量文件信息"),
-    TRAIN_PLAN_EXPORT("trainPlanData", "trainPlanData", "培训计划"),
-    TRAIN_LOG_EXPORT("trainLogData", "trainLogData", "培训记录"),
-    METER_ORGANIZE_EXPORT("meterOrganizeData", "meterOrganizeData", "计量组织"),
-    TRACE_SUPPLIER_EXPORT("traceSupplierData", "traceSupplierData", "溯源供方"),
-    SIGN_EXPORT("signData", "signData", "签名/签章"),
-    TEMPLATE_EXPORT("templateData", "templateData", "原始记录模板/证书报告模板"),
-    FIXED_ASSETS("meterFixedAssets", "meterFixedAssets", "固定资产"),
-    METER_EQUIPMENT("meterEquipment", "meterEquipment", "测量设备"),
-    CALIBRATION_TEST_EQUIPMENT("calibrationTestEquipment", "calibrationTestEquipment", "校准检定设备"),
-    MEASURE_ACCOUNT("measureAccount", "measureAccount", "测量工装"),
-    STANDARD_SUPPORT_EQUIPMENT("standardSupportEquipment", "standardSupportEquipment", "标准配套设备"),
-    STANDARD_EQUIPMENT("standardEquipment", "standardEquipment", "标准装置"),
-    FLOW_DEF_EXPORT("flowDefData", "flowDefData", "流程定义"),
-    STAFF_CERTIFICATE("certificate", "certificate", "计量人员证书"),
-    CHECK_INFO("checkInfo", "checkInfo", "设备管理点检测"),
-    EQUIPMENT_APPLY("equipmentApply", "equipmentApply", "设备借用"),
-    STANDARD_EQUIPMENT_REMIND("equipmentApplyRemind", "equipmentApplyRemind", "标准装置到期提醒"),
-    METER_PRICE("meterPrice", "meterPrice", "价格库"),
-    METER_STAFF("meterStaff", "meterStaff", "计量人员"),
-    STANDARD_EQUIPMENT_APPLY("standardEquipmentApply", "standardEquipmentApply", "标准装置申请"),
-    STATE_MANAGE_APPLY("stateManage", "stateManage", "状态管理"),
-    METER_ACCEPTANCE_CHECK("acceptanceCheck", "acceptanceCheck", "设备检修保养验收单"),
-    CUSTOMER_EXPORT("customerData", "customerData", "客户信息"),
-    ORDER_EXPORT("orderData", "orderData", "委托书信息"),
-    SAMPLE_EXPORT("sampleData", "sampleData", "样本信息"),
-    EXCHANGE_DATA("exchangeData", "exchangeData", "设备交接单"),
-    DISPATCH_DATA("dispatchData", "dispatchData", "设备收发"),
-    ENVIRONMENT_DATA("environmentData", "environmentData", "环境记录单"),
-    ORIGIN_DATA("originData", "originData", "原始记录"),
-    CERTIFICATE_REPORT("certificateReport", "certificateReport", "证书报告"),
-    ADVICE_EXPORT("adviceData", "adviceData", "客户反馈"),
-    HANDOUT_EXPORT("handoutData", "handoutData", "任务分发列表"),
-    OUTSOURCER_EXPORT("outsourcerData", "outsourcerData", "分包方"),
-    SITE_EXECUTIVE_EXPORT("siteExecutiveData", "siteExecutiveData", "现场测试、校准或检定"),
-    CERTIFICATE_PRINT_EXPORT("certificatePrintData", "certificatePrintData", "证书打印"),
-    DOWNLOAD_TEMPLATE("downloadTemplate", "downloadTemplate", "页面配置"),
-    OUTSOURCER_CERTIFICATE_EXPORT("outsourceCertificateData", "outsourceCertificateData", "分包证书"),
-    SETTLEMENT_INFO_EXPORT("settlementInfoData", "settlementInfoData", "业务结算"),
-    EQUIPMENT_REMIND("equipmentRemind", "equipmentRemind", "设备到期提醒"),
-    AGREEMENT_INFO_EXPORT("agreementInfoData", "agreementInfoData", "合同"),
-    WORK_STATISTICS_EXPORT("workStatisticsData", "workStatisticsData", "实时工作统计"),
-    DEPT_OUTPUT_EXPORT("deptOutputData", "deptOutputData", "部门产值分析"),
-    WORKLOAD_EXPORT("workloadData", "workloadData", "业务工作量分析"),
-    DEPT_COMPREHENSIVE_EXPORT("deptComprehensiveData", "deptComprehensiveData", "部门综合分析"),
-    ENVIRONMENTAL_RECORD("environmentalRecordData", "environmentalRecordData", "现场环境记录");
+    /**
+     * 计量检定业务
+     */
+    OUTSOURCER_EXPORT("outsourcerData", "分包方名录", "分包方名录"),
+    IDENTIFY_EXPORT("identifyData", "计量标识", "计量标识"),
+    ORDER_EXPORT("orderData", "任务单", "任务单"),
+    DISPATCH_DATA("dispatchData", "设备收发", "设备收发"),
+    HANDOUT_EXPORT("handoutData", "任务分发", "任务分发"),
+    SITE_EXECUTIVE_EXPORT("siteExecutiveData", "现场测试、校准或检定", "现场测试、校准或检定"),
+    CERTIFICATE_REPORT("certificateReport", "证书审批", "证书审批"),
+    CERTIFICATE_CHANGE_APPLY("certificateChangeApply", "证书报告补充或更换申请单", "证书报告补充或更换申请单"),
+    CERTIFICATE_PRINT("certificatePrintData", "证书打印审批", "证书打印审批"),
+    DEPT_EXECUTIVE_TASK("deptExecutiveTaskData", "实验室任务", "实验室任务"),
+    MY_EXECUTIVE_TASK("myExecutiveTaskData", "我的任务", "我的任务"),
+    OUTSOURCE_ASSESS("outsourceAssess", "测试、校准或检定工作分包评审表", "测试、校准或检定工作分包评审表"),
+    OUTSOURCE_PROTOCOL("outsourceProtocol", "测试、校准或检定工作分包协议书", "测试、校准或检定工作分包协议书"),
+
+    /**
+     * 系统管理
+     */
+    SIGN_EXPORT("signData", "签名", "签名"),
+    TEMPLATE_EXPORT("templateData", "文件模板", "文件模板"),
+    FLOW_DEF_EXPORT("flowDefData", "流程定义", "流程定义"),
+    DOWNLOAD_TEMPLATE("downloadTemplate", "流程定义", "页面配置");
 
     ExportEnum(String fileName, String sheetName, String description) {
         this.fileName = fileName;
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateRecordTypeCodeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateRecordTypeCodeEnum.java
index 31d913c..a963522 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateRecordTypeCodeEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateRecordTypeCodeEnum.java
@@ -46,4 +46,14 @@
     String SITE_EXECUTIVE_APPROVAL = "01";
     //《现场测试、校准或检定工作记录表》
     String SITE_EXECUTIVE_LOG = "02";
+
+    //测试、校准或检定工作分包协议书
+    String OUTSOURCE_PROTOCOL = "01";
+    //测试、校准或检定工作分包评审表
+    String OUTSOURCE_ACCESS = "02";
+    //测试、校准或检定工作分包通知书
+    String OUTSOURCE_NOTICE = "03";
+    //测试、校准或检定工作分包方名录
+    String OUTSOURCE_INFO = "04";
+
 }
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
index 24b8635..f78bd53 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
@@ -15,6 +15,10 @@
     String CERTIFICATE_CHANGE_APPLY_BEAN_NAME = "certificateChangeApplyBean";
     //现场测试、校准或检定
     String SITE_EXECUTIVE_BEAN_NAME = "siteExecutiveBean";
+    //测试、校准或检定工作分包评审表
+    String OUTSOURCE_ASSESS_BEAN_NAME = "outsourceAssessBean";
+    //测试、校准或检定工作分包协议书
+    String OUTSOURCE_PROTOCOL_BEAN_NAME = "outsourceProtocolBean";
 
     /*********************************设备与装置************************************/
     //设备台账
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 b21c661..6b86fd1 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
@@ -18,6 +18,8 @@
     OUTSOURCER_APPROVAL(OUTSOURCER_BEAN_NAME, ""),
     CERTIFICATE_CHANGE_APPROVAL(CERTIFICATE_CHANGE_APPLY_BEAN_NAME, ""),
     SITE_EXECUTIVE_APPROVAL(SITE_EXECUTIVE_BEAN_NAME, ""),
+    OUTSOURCE_ASSESS_APPROVAL(OUTSOURCE_ASSESS_BEAN_NAME, ""),
+    OUTSOURCE_PROTOCOL_APPROVAL(OUTSOURCE_PROTOCOL_BEAN_NAME, ""),
 
     ACTION_STATUS_MAP(new HashMap<String, AwareActionStatusEnum>() {
         {
@@ -47,6 +49,10 @@
             put(ApplyFromIdEnum.CERTIFICATE_CHANGE_APPROVAL.getCode(), CERTIFICATE_CHANGE_APPROVAL);
             //现场测试、校准或检定审批
             put(ApplyFromIdEnum.SITE_EXECUTIVE_APPROVAL.getCode(), SITE_EXECUTIVE_APPROVAL);
+            //测试、校准或检定工作分包评审表
+            put(ApplyFromIdEnum.OUTSOURCE_ASSESS_APPROVAL.getCode(), OUTSOURCE_ASSESS_APPROVAL);
+            //测试、校准或检定工作分包协议书
+            put(ApplyFromIdEnum.OUTSOURCE_PROTOCOL_APPROVAL.getCode(), OUTSOURCE_PROTOCOL_APPROVAL);
         }
     });
     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 934405e..c7410bd 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
@@ -9,6 +9,8 @@
     CERTIFICATE_CHANGE_APPROVAL("jljdywzsbchghsqd", MessageSourceModuleEnum.BUSINESS.getCode(), "证书/报告补充或更换申请单"),
     OUTSOURCER_APPROVAL("jljdywcsjzhgfbfml", MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定合格分包方名录"),
     SITE_EXECUTIVE_APPROVAL("jljdywxccsjzsp", MessageSourceModuleEnum.BUSINESS.getCode(), "现场测试、校准或检定审批"),
+    OUTSOURCE_ASSESS_APPROVAL("jljdywcsjzfbpsb", MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包评审表"),
+    OUTSOURCE_PROTOCOL_APPROVAL("jljdywcsjzfbxys", MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包协议书"),
 
 
     /*******************************************设备与装置*********************************************/
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/GeneralApprovalMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/GeneralApprovalMapper.java
index 4fb7344..0c9d6ae 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/GeneralApprovalMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/GeneralApprovalMapper.java
@@ -17,8 +17,4 @@
 
     Page<O> selectBatchForApprovalList(Page<O> page, @Param("request") R request, @Param("businessKeys") List<String> businessKeys);
 
-//    Page<O> selectListPage(Page<O> page, @Param("request") R request);
-
-//    Long selectMaxNo();
-
 }
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceAssessMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceAssessMapper.java
index 7867bb8..ba59009 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceAssessMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceAssessMapper.java
@@ -1,7 +1,12 @@
 package com.casic.missiles.mapper.business;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.business.outsource.OutsourceAssessApprovalListRequest;
+import com.casic.missiles.mapper.GeneralApprovalMapper;
 import com.casic.missiles.model.business.BizBusinessOutsourceAssess;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * <p>
@@ -11,6 +16,10 @@
  * @author wangpeng
  * @since 2023-08-16
  */
-public interface BizBusinessOutsourceAssessMapper extends BaseMapper<BizBusinessOutsourceAssess> {
+public interface BizBusinessOutsourceAssessMapper extends GeneralApprovalMapper<BizBusinessOutsourceAssess, BizBusinessOutsourceAssess, OutsourceAssessApprovalListRequest> {
+
+    Page<BizBusinessOutsourceAssess> selectBatchForApprovalList(Page<BizBusinessOutsourceAssess> page, @Param("request") OutsourceAssessApprovalListRequest request, @Param("businessKeys") List<String> businessKeys);
+
+    Long selectMaxProjectNo();
 
 }
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceProtocolMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceProtocolMapper.java
new file mode 100644
index 0000000..e6aba35
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceProtocolMapper.java
@@ -0,0 +1,24 @@
+package com.casic.missiles.mapper.business;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.business.outsource.OutsourceProtocolApprovalListRequest;
+import com.casic.missiles.mapper.GeneralApprovalMapper;
+import com.casic.missiles.model.business.BizBusinessOutsourceProtocol;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 计量检定业务-分包管理-测试、校准或检定工作分包协议书 Mapper 接口
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-08-24
+ */
+public interface BizBusinessOutsourceProtocolMapper extends GeneralApprovalMapper<BizBusinessOutsourceProtocol, BizBusinessOutsourceProtocol, OutsourceProtocolApprovalListRequest> {
+
+    Page<BizBusinessOutsourceProtocol> selectBatchForApprovalList(Page<BizBusinessOutsourceProtocol> page, @Param("request") OutsourceProtocolApprovalListRequest request, @Param("businessKeys") List<String> businessKeys);
+
+    Long selectMaxProtocolNo();
+}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/EnvLocationInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/EnvLocationInfoMapper.java
new file mode 100644
index 0000000..49eff87
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/EnvLocationInfoMapper.java
@@ -0,0 +1,21 @@
+package com.casic.missiles.mapper.resource;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.resource.environment.LocationListRequest;
+import com.casic.missiles.dto.resource.environment.LocationListResponse;
+import com.casic.missiles.model.resource.EnvLocationInfo;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * <p>
+ * 实验室环境监控系统-设备表 Mapper 接口
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-06-07
+ */
+public interface EnvLocationInfoMapper extends BaseMapper<EnvLocationInfo> {
+
+    Page<LocationListResponse> selectLocationListPage(Page<LocationListResponse> page, @Param("request") LocationListRequest request);
+}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java
index de124db..85ed0f7 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java
@@ -1,7 +1,9 @@
 package com.casic.missiles.mapper.system;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.dto.system.SignDetailResponse;
+import com.casic.missiles.dto.system.SignListRequest;
 import com.casic.missiles.model.system.SystemSign;
 import org.apache.ibatis.annotations.Param;
 
@@ -22,4 +24,8 @@
     SignDetailResponse selectSignDetailById(Long id);
 
     List<SystemSign> selectUsableSignList(@Param("userId") Long userId);
+
+    Page<SystemSign> selectSignListPage(Page<SystemSign> page, @Param("request") SignListRequest request);
+
+    List<SystemSign> selectSignList(@Param("request") SignListRequest request);
 }
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateChangeApplyMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateChangeApplyMapper.xml
index d798447..c496092 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateChangeApplyMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateChangeApplyMapper.xml
@@ -30,31 +30,31 @@
         SELECT *
         FROM biz_business_certificate_change_apply
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.changeApplyNo != null and request.changeApplyNo !=''">
+        <if test="request != null and request.changeApplyNo != null and request.changeApplyNo !=''">
             and change_apply_no like concat('%',#{request.changeApplyNo},'%')
         </if>
-        <if test="request.changeReportNo != null and request.changeReportNo !=''">
+        <if test="request != null and request.changeReportNo != null and request.changeReportNo !=''">
             and change_report_no like concat('%',#{request.changeReportNo},'%')
         </if>
-        <if test="request.changeReportName != null and request.changeReportName !=''">
+        <if test="request != null and request.changeReportName != null and request.changeReportName !=''">
             and change_report_name like concat('%',#{request.changeReportName},'%')
         </if>
-        <if test="request.changeType != null and request.changeType !=''">
+        <if test="request != null and request.changeType != null and request.changeType !=''">
             and change_type = #{request.changeType}
         </if>
-        <if test="request.createUserName != null and request.createUserName !=''">
+        <if test="request != null and request.createUserName != null and request.createUserName !=''">
             and create_user_name like concat('%',#{request.createUserName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificatePrintMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificatePrintMapper.xml
index b66cd99..49c0ac8 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificatePrintMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificatePrintMapper.xml
@@ -31,34 +31,34 @@
         LEFT JOIN biz_business_order_sample_relation bosr ON (bosr.order_id = bcr.order_id AND bosr.sample_id = bcr.sample_id)
         LEFT JOIN biz_business_order_info boi ON boi.id = bosr.order_id
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and bcp.approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.printStatus != null and request.printStatus !=''">
+        <if test="request != null and request.printStatus != null and request.printStatus !=''">
             and print_status = #{request.printStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and bcp.create_user_id = #{request.createUserId}
         </if>
-        <if test="request.certificateReportNo != null and request.certificateReportNo !=''">
+        <if test="request != null and request.certificateReportNo != null and request.certificateReportNo !=''">
             and bcr.certificate_report_no like concat('%',#{request.certificateReportNo},'%')
         </if>
-        <if test="request.certificateReportName != null and request.certificateReportName !=''">
+        <if test="request != null and request.certificateReportName != null and request.certificateReportName !=''">
             and bcr.certificate_report_name like concat('%',#{request.certificateReportName},'%')
         </if>
-        <if test="request.customerName != null and request.customerName !=''">
+        <if test="request != null and request.customerName != null and request.customerName !=''">
             and boi.customer_name like concat('%',#{request.customerName},'%')
         </if>
-        <if test="request.sampleNo != null and request.sampleNo !=''">
+        <if test="request != null and request.sampleNo != null and request.sampleNo !=''">
             and bosr.sample_no like concat('%',#{request.sampleNo},'%')
         </if>
-        <if test="request.sampleName != null and request.sampleName !=''">
+        <if test="request != null and request.sampleName != null and request.sampleName !=''">
             and bosr.sample_name like concat('%',#{request.sampleName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and bcp.create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and bcp.create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml
index b366034..767695d 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml
@@ -46,33 +46,37 @@
         SELECT bcr.*, bosr.sample_no, bosr.sample_name, bosr.sample_model, rsi.staff_name
         FROM biz_business_certificate_report bcr
         LEFT JOIN biz_business_order_sample_relation bosr ON (bosr.order_id = bcr.order_id AND bosr.sample_id = bcr.sample_id)
+        LEFT JOIN biz_business_order_info boi ON boi.id = bcr.order_id
         LEFT JOIN biz_resource_staff_info rsi ON rsi.id = bcr.measure_person_id
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and bcr.approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and bcr.create_user_id = #{request.createUserId}
         </if>
-        <if test="request.certificateReportNo != null and request.certificateReportNo !=''">
+        <if test="request != null and request.customerId != null and request.customerId !=''">
+            and boi.customer_id = #{request.customerId}
+        </if>
+        <if test="request != null and request.certificateReportNo != null and request.certificateReportNo !=''">
             and bcr.certificate_report_no like concat('%',#{request.certificateReportNo},'%')
         </if>
-        <if test="request.certificateReportName != null and request.certificateReportName !=''">
+        <if test="request != null and request.certificateReportName != null and request.certificateReportName !=''">
             and bcr.certificate_report_name like concat('%',#{request.certificateReportName},'%')
         </if>
-        <if test="request.sampleNo != null and request.sampleNo !=''">
+        <if test="request != null and request.sampleNo != null and request.sampleNo !=''">
             and bosr.sample_no like concat('%',#{request.sampleNo},'%')
         </if>
-        <if test="request.measureCategory != null and request.measureCategory !=''">
+        <if test="request != null and request.measureCategory != null and request.measureCategory !=''">
             and bcr.measure_category = #{request.measureCategory}
         </if>
-        <if test="request.measurePerson != null and request.measurePerson !=''">
+        <if test="request != null and request.measurePerson != null and request.measurePerson !=''">
             and rsi.staff_name like concat('%',#{request.measurePerson},'%')
         </if>
-        <if test="request.calibrationTimeStart != null and request.calibrationTimeStart !=''">
+        <if test="request != null and request.calibrationTimeStart != null and request.calibrationTimeStart !=''">
             and bcr.calibration_time &gt;= #{request.calibrationTimeStart}
         </if>
-        <if test="request.calibrationTimeEnd != null and request.calibrationTimeEnd !=''">
+        <if test="request != null and request.calibrationTimeEnd != null and request.calibrationTimeEnd !=''">
             and bcr.calibration_time &lt;= #{request.calibrationTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceAssessMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceAssessMapper.xml
index d0fcf8b..c22c101 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceAssessMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceAssessMapper.xml
@@ -7,6 +7,8 @@
         <id column="id" property="id" />
         <result column="project_no" property="projectNo" />
         <result column="project_name" property="projectName" />
+        <result column="lab_code" property="labCode" />
+        <result column="group_code" property="groupCode" />
         <result column="applicant_id" property="applicantId" />
         <result column="applicant_name" property="applicantName" />
         <result column="applicant_time" property="applicantTime" />
@@ -31,7 +33,45 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, project_no, project_name, applicant_id, applicant_name, applicant_time, minio_file_name, remark, create_user_id, create_user_name, outsourcer_id, pre_start_time, pre_end_time, outsource_reason, pre_cost, approval_status, process_id, approve_situation, traceability, test_method, technique_ability, create_time, update_time
+        id, project_no, project_name, lab_code, group_code, applicant_id, applicant_name, applicant_time, minio_file_name, remark, create_user_id, create_user_name, outsourcer_id, pre_start_time, pre_end_time, outsource_reason, pre_cost, approval_status, process_id, approve_situation, traceability, test_method, technique_ability, create_time, update_time
     </sql>
 
+    <select id="selectMaxProjectNo" resultType="java.lang.Long">
+        SELECT IFNULL(max(RIGHT(project_no, 3)), 0) from biz_business_outsource_assess
+    </select>
+
+    <select id="selectBatchForApprovalList" resultMap="BaseResultMap">
+        SELECT bboa.*, bboi.outsourcer_name, bboi.director
+        FROM biz_business_outsource_assess bboa
+        LEFT JOIN biz_business_outsourcer_info bboi ON bboa.outsourcer_id = bboi.id
+        WHERE 1=1
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
+            and bboa.approval_status = #{request.approvalStatus}
+        </if>
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
+            and bboa.create_user_id = #{request.createUserId}
+        </if>
+        <if test="request != null and request.projectNo != null and request.projectNo !=''">
+            and bboa.project_no like concat('%',#{request.projectNo},'%')
+        </if>
+        <if test="request != null and request.outsourcerName != null and request.outsourcerName !=''">
+            and bboi.outsourcer_name like concat('%',#{request.outsourcerName},'%')
+        </if>
+        <if test="request != null and request.applicantName != null and request.applicantName !=''">
+            and bboa.applicant_name like concat('%',#{request.applicantName},'%')
+        </if>
+        <if test="request != null and request.applicantTimeStart != null and request.applicantTimeStart !=''">
+            and bboa.applicant_time &gt;= #{request.applicantTimeStart}
+        </if>
+        <if test="request != null and request.applicantTimeEnd != null and request.applicantTimeEnd !=''">
+            and bboa.applicant_time &lt;= #{request.applicantTimeEnd}
+        </if>
+        <if test="businessKeys != null">
+            and bboa.id in
+            <foreach collection="businessKeys" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
+        ORDER BY bboa.create_time DESC
+    </select>
 </mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceProtocolMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceProtocolMapper.xml
new file mode 100644
index 0000000..b7b2149
--- /dev/null
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceProtocolMapper.xml
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.mapper.business.BizBusinessOutsourceProtocolMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.business.BizBusinessOutsourceProtocol">
+        <id column="id" property="id" />
+        <result column="protocol_no" property="protocolNo" />
+        <result column="project_name" property="projectName" />
+        <result column="lab_code" property="labCode" />
+        <result column="group_code" property="groupCode" />
+        <result column="outsourcer_id" property="outsourcerId" />
+        <result column="remark" property="remark" />
+        <result column="outsource_no" property="outsourceNo" />
+        <result column="outsource_name" property="outsourceName" />
+        <result column="contacts" property="contacts" />
+        <result column="mobile" property="mobile" />
+        <result column="address" property="address" />
+        <result column="require_date" property="requireDate" />
+        <result column="outsource_cost" property="outsourceCost" />
+        <result column="director" property="director" />
+        <result column="item" property="item" />
+        <result column="requires" property="requires" />
+        <result column="create_user_id" property="createUserId" />
+        <result column="create_user_name" property="createUserName" />
+        <result column="approval_status" property="approvalStatus" />
+        <result column="process_id" property="processId" />
+        <result column="create_time" property="createTime" />
+        <result column="update_time" property="updateTime" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, protocol_no, project_name, lab_code, group_code, outsourcer_id, remark, outsource_no, outsource_name, contacts, mobile, address, require_date, outsource_cost, director, item, requires, create_user_id, create_user_name, approval_status, process_id, create_time, update_time
+    </sql>
+
+    <select id="selectMaxProtocolNo" resultType="java.lang.Long">
+        SELECT IFNULL(max(RIGHT(protocol_no, 3)), 0) from biz_business_outsource_protocol
+    </select>
+
+    <select id="selectBatchForApprovalList" resultMap="BaseResultMap">
+        SELECT *
+        FROM biz_business_outsource_protocol
+        WHERE 1=1
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
+            and approval_status = #{request.approvalStatus}
+        </if>
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
+            and create_user_id = #{request.createUserId}
+        </if>
+        <if test="request != null and request.protocolNo != null and request.protocolNo !=''">
+            and protocol_no like concat('%',#{request.protocolNo},'%')
+        </if>
+        <if test="request != null and request.outsourcerName != null and request.outsourcerName !=''">
+            and outsourcer_name like concat('%',#{request.outsourcerName},'%')
+        </if>
+        <if test="request != null and request.applicantName != null and request.applicantName !=''">
+            and create_user_name like concat('%',#{request.applicantName},'%')
+        </if>
+        <if test="request != null and request.applicantTimeStart != null and request.applicantTimeStart !=''">
+            and create_time &gt;= #{request.applicantTimeStart}
+        </if>
+        <if test="request != null and request.applicantTimeEnd != null and request.applicantTimeEnd !=''">
+            and create_time &lt;= #{request.applicantTimeEnd}
+        </if>
+        <if test="businessKeys != null">
+            and id in
+            <foreach collection="businessKeys" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
+        ORDER BY create_time DESC
+    </select>
+</mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourcerInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourcerInfoMapper.xml
index 510a80b..3049b54 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourcerInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourcerInfoMapper.xml
@@ -7,6 +7,8 @@
         <id column="id" property="id" />
         <result column="outsourcer_no" property="outsourcerNo" />
         <result column="outsourcer_name" property="outsourcerName" />
+        <result column="lab_code" property="labCode" />
+        <result column="group_code" property="groupCode" />
         <result column="outsourcer_brief_name" property="outsourcerBriefName" />
         <result column="outsourcer_size" property="outsourcerSize" />
         <result column="business_size" property="businessSize" />
@@ -55,32 +57,32 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, outsourcer_no, outsourcer_name, outsourcer_brief_name, outsourcer_size, business_size, grade, evaluation, tax_number, bank_account, bank_name, bank_account_number, postal_code, director, phone, fax, mobile, email, website, address_country, address_province, address_city, address_area, full_address, address_country_name, address_province_name, address_city_name, address_area_name, invoice_country, invoice_province, invoice_city, invoice_area, invoice_full_address, invoice_country_name, invoice_province_name, invoice_city_name, invoice_area_name, business_scope, business_content, minio_file_name, approval_status, process_id, remark, create_user_id, create_user_name, create_time, update_time
+        id, outsourcer_no, outsourcer_name, lab_code, group_code, outsourcer_brief_name, outsourcer_size, business_size, grade, evaluation, tax_number, bank_account, bank_name, bank_account_number, postal_code, director, phone, fax, mobile, email, website, address_country, address_province, address_city, address_area, full_address, address_country_name, address_province_name, address_city_name, address_area_name, invoice_country, invoice_province, invoice_city, invoice_area, invoice_full_address, invoice_country_name, invoice_province_name, invoice_city_name, invoice_area_name, business_scope, business_content, minio_file_name, approval_status, process_id, remark, create_user_id, create_user_name, create_time, update_time
     </sql>
 
     <select id="selectBatchForApprovalList" resultMap="BaseResultMap">
         SELECT *
         FROM biz_business_outsourcer_info
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.outsourcerNo != null and request.outsourcerNo !=''">
+        <if test="request != null and request.outsourcerNo != null and request.outsourcerNo !=''">
             and outsourcer_no like concat('%',#{request.outsourcerNo},'%')
         </if>
-        <if test="request.outsourcerName != null and request.outsourcerName !=''">
+        <if test="request != null and request.outsourcerName != null and request.outsourcerName !=''">
             and outsourcer_name like concat('%',#{request.outsourcerName},'%')
         </if>
-        <if test="request.director != null and request.director !=''">
+        <if test="request != null and request.director != null and request.director !=''">
             and director like concat('%',#{request.director},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
@@ -93,6 +95,6 @@
     </select>
 
     <select id="selectMaxNo" resultType="java.lang.Long">
-        SELECT IFNULL(max(RIGHT(outsourcer_no, 12)), 0) from biz_business_outsourcer_info
+        SELECT IFNULL(max(RIGHT(outsourcer_no, 3)), 0) from biz_business_outsourcer_info
     </select>
 </mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessSiteExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessSiteExecutiveInfoMapper.xml
index 135c5d0..3c5ae79 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessSiteExecutiveInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessSiteExecutiveInfoMapper.xml
@@ -38,25 +38,25 @@
         FROM biz_business_site_executive_info bsei
         LEFT JOIN biz_resource_customer_info rci ON bsei.customer_id = rci.id
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and bsei.approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and bsei.create_user_id = #{request.createUserId}
         </if>
-        <if test="request.siteExecutiveNo != null and request.siteExecutiveNo !=''">
+        <if test="request != null and request.siteExecutiveNo != null and request.siteExecutiveNo !=''">
             and bsei.site_executive_no like concat('%',#{request.siteExecutiveNo},'%')
         </if>
-        <if test="request.customerName != null and request.customerName !=''">
+        <if test="request != null and request.customerName != null and request.customerName !=''">
             and rci.outsourcer_name like concat('%',#{request.customerName},'%')
         </if>
-        <if test="request.applyName != null and request.applyName !=''">
+        <if test="request != null and request.applyName != null and request.applyName !=''">
             and bsei.apply_name like concat('%',#{request.applyName},'%')
         </if>
-        <if test="request.applyTimeStart != null and request.applyTimeStart !=''">
+        <if test="request != null and request.applyTimeStart != null and request.applyTimeStart !=''">
             and bsei.apply_time &gt;= #{request.applyTimeStart}
         </if>
-        <if test="request.applyTimeEnd != null and request.applyTimeEnd !=''">
+        <if test="request != null and request.applyTimeEnd != null and request.applyTimeEnd !=''">
             and bsei.apply_time &lt;= #{request.applyTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml
index 84d9e2a..6bd38a9 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml
@@ -105,6 +105,12 @@
         <if test="request.isUrgent != null and request.isUrgent !=''">
             AND bo.is_urgent = #{request.isUrgent}
         </if>
+        <if test="request.ids != null">
+            and blei.id in
+            <foreach collection="request.ids" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
         ORDER BY blei.update_time DESC
     </select>
 
@@ -137,6 +143,12 @@
         <if test="request.isUrgent != null and request.isUrgent !=''">
             AND bo.is_urgent = #{request.isUrgent}
         </if>
+        <if test="request.ids != null">
+            and blei.id in
+            <foreach collection="request.ids" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
         ORDER BY blei.update_time DESC
     </select>
 
diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardInfoMapper.xml
index 1a5551b..2ed8d17 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardInfoMapper.xml
@@ -45,12 +45,6 @@
         FROM biz_equipment_standard_info besi
         LEFT JOIN biz_equipment_standard_technology_relation bestr ON besi.standard_no = bestr.standard_no
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
-            and besi.approval_status = #{request.approvalStatus}
-        </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
-            and besi.create_user_id = #{request.createUserId}
-        </if>
         <if test="request.standardName != null and request.standardName !=''">
             and besi.standard_name like concat('%',#{request.standardName},'%')
         </if>
diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardTechnologyRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardTechnologyRelationMapper.xml
index fc7e16c..cd03c8c 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardTechnologyRelationMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardTechnologyRelationMapper.xml
@@ -6,6 +6,7 @@
     <resultMap id="BaseResultMap" type="com.casic.missiles.model.equipment.BizEquipmentStandardTechnologyRelation">
         <id column="id" property="id" />
         <result column="technology_file_id" property="technologyFileId" />
+        <result column="technology_file_no" property="technologyFileNo" />
         <result column="technology_file_name" property="technologyFileName" />
         <result column="standard_id" property="standardId" />
         <result column="standard_no" property="standardNo" />
@@ -14,7 +15,7 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, technology_file_id, technology_file_name, standard_id, remark
+        id, technology_file_id, technology_file_no, technology_file_name, standard_id, remark
     </sql>
 
 </mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceAuthorizeOrderMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceAuthorizeOrderMapper.xml
index ac5176c..554fe65 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceAuthorizeOrderMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceAuthorizeOrderMapper.xml
@@ -32,22 +32,22 @@
         SELECT *
         FROM biz_resource_authorize_order
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.orderNo != null and request.orderNo !=''">
+        <if test="request != null and request.orderNo != null and request.orderNo !=''">
             and order_no like concat('%',#{request.orderNo},'%')
         </if>
-        <if test="request.createUserName != null and request.createUserName !=''">
+        <if test="request != null and request.createUserName != null and request.createUserName !=''">
             and create_user_name like concat('%',#{request.createUserName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerExamineFormMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerExamineFormMapper.xml
index ab242f6..af7f98f 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerExamineFormMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerExamineFormMapper.xml
@@ -41,28 +41,28 @@
         SELECT *
         FROM biz_resource_customer_examine_form
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.formNo != null and request.formNo !=''">
+        <if test="request != null and request.formNo != null and request.formNo !=''">
             and form_no like concat('%',#{request.formNo},'%')
         </if>
-        <if test="request.labCode != null and request.labCode !=''">
+        <if test="request != null and request.labCode != null and request.labCode !=''">
             and lab_code like concat('%',#{request.labCode},'%')
         </if>
-        <if test="request.groupCode != null and request.groupCode !=''">
+        <if test="request != null and request.groupCode != null and request.groupCode !=''">
             and group_code like concat('%',#{request.groupCode},'%')
         </if>
-        <if test="request.createUserName != null and request.createUserName !=''">
+        <if test="request != null and request.createUserName != null and request.createUserName !=''">
             and create_user_name like concat('%',#{request.createUserName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerInfoMapper.xml
index fa8ffbc..06a2798 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerInfoMapper.xml
@@ -33,25 +33,25 @@
         SELECT *
         FROM biz_resource_customer_info
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.customerNo != null and request.customerNo !=''">
+        <if test="request != null and request.customerNo != null and request.customerNo !=''">
             and customer_no like concat('%',#{request.customerNo},'%')
         </if>
-        <if test="request.customerName != null and request.customerName !=''">
+        <if test="request != null and request.customerName != null and request.customerName !=''">
             and customer_name like concat('%',#{request.customerName},'%')
         </if>
-        <if test="request.contacts != null and request.contacts !=''">
+        <if test="request != null and request.contacts != null and request.contacts !=''">
             and contacts like concat('%',#{request.contacts},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerSuggestFormMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerSuggestFormMapper.xml
index 28f5bb2..1806662 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerSuggestFormMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerSuggestFormMapper.xml
@@ -33,28 +33,28 @@
         SELECT *
         FROM biz_resource_customer_suggest_form
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.formNo != null and request.formNo !=''">
+        <if test="request != null and request.formNo != null and request.formNo !=''">
             and form_no like concat('%',#{request.formNo},'%')
         </if>
-        <if test="request.customerName != null and request.customerName !=''">
+        <if test="request != null and request.customerName != null and request.customerName !=''">
             and customer_name like concat('%',#{request.customerName},'%')
         </if>
-        <if test="request.customerDeptName != null and request.customerDeptName !=''">
+        <if test="request != null and request.customerDeptName != null and request.customerDeptName !=''">
             and customer_dept_name like concat('%',#{request.customerDeptName},'%')
         </if>
-        <if test="request.createUserName != null and request.createUserName !=''">
+        <if test="request != null and request.createUserName != null and request.createUserName !=''">
             and create_user_name like concat('%',#{request.createUserName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSealUseNoteMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSealUseNoteMapper.xml
index ab37bc1..b02bb33 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSealUseNoteMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSealUseNoteMapper.xml
@@ -29,32 +29,32 @@
     </sql>
 
     <select id="selectBatchForApprovalList" resultMap="BaseResultMap">
-        SELECT *
+        SELECT brsun.*, brsi.seal_name, brsi.seal_type, brsi.approver_name
         FROM biz_resource_seal_use_note brsun
         JOIN biz_resource_seal_info brsi ON brsun.seal_id = brsi.id
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and brsun.approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and brsun.create_user_id = #{request.createUserId}
         </if>
-        <if test="request.sealName != null and request.sealName !=''">
+        <if test="request != null and request.sealName != null and request.sealName !=''">
             and brsi.seal_name like concat('%',#{request.sealName},'%')
         </if>
-        <if test="request.sealType != null and request.sealType !=''">
+        <if test="request != null and request.sealType != null and request.sealType !=''">
             and brsi.seal_type = #{request.sealType}
         </if>
-        <if test="request.applyDeptName != null and request.applyDeptName !=''">
+        <if test="request != null and request.applyDeptName != null and request.applyDeptName !=''">
             and brsun.apply_dept_name like concat('%',#{request.applyDeptName},'%')
         </if>
-        <if test="request.applyUserName != null and request.applyUserName !=''">
+        <if test="request != null and request.applyUserName != null and request.applyUserName !=''">
             and brsun.apply_user_name like concat('%',#{request.applyUserName},'%')
         </if>
-        <if test="request.applyTimeStart != null and request.applyTimeStart !=''">
+        <if test="request != null and request.applyTimeStart != null and request.applyTimeStart !=''">
             and brsun.apply_time &gt;= #{request.applyTimeStart}
         </if>
-        <if test="request.applyTimeEnd != null and request.applyTimeEnd !=''">
+        <if test="request != null and request.applyTimeEnd != null and request.applyTimeEnd !=''">
             and brsun.apply_time &lt;= #{request.applyTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml
index 119bf7d..4f8392a 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml
@@ -31,6 +31,12 @@
         <if test="request.deptName != null and request.deptName !=''">
             and brsi.dept_name like concat('%',#{request.deptName},'%')
         </if>
+        <if test="request.ids != null">
+            and brsv.id in
+            <foreach collection="request.ids" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
         ORDER BY brsv.grant_date DESC
     </select>
 
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSupplierInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSupplierInfoMapper.xml
index fe8d399..e8ce7ef 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSupplierInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSupplierInfoMapper.xml
@@ -48,28 +48,28 @@
         SELECT *
         FROM biz_resource_supplier_info
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.supplierNo != null and request.supplierNo !=''">
+        <if test="request != null and request.supplierNo != null and request.supplierNo !=''">
             and supplier_no like concat('%',#{request.supplierNo},'%')
         </if>
-        <if test="request.supplierName != null and request.supplierName !=''">
+        <if test="request != null and request.supplierName != null and request.supplierName !=''">
             and supplier_name like concat('%',#{request.supplierName},'%')
         </if>
-        <if test="request.director != null and request.director !=''">
+        <if test="request != null and request.director != null and request.director !=''">
             and director like concat('%',#{request.director},'%')
         </if>
-        <if test="request.supplierType != null and request.supplierType !=''">
+        <if test="request != null and request.supplierType != null and request.supplierType !=''">
             and supplier_type = #{request.supplierType}
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/EnvLocationInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/EnvLocationInfoMapper.xml
new file mode 100644
index 0000000..68bcf10
--- /dev/null
+++ b/casic-metering-dao/src/main/resources/mapper/resource/EnvLocationInfoMapper.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.mapper.resource.EnvLocationInfoMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.resource.EnvLocationInfo">
+        <id column="id" property="id" />
+        <result column="location_no" property="locationNo" />
+        <result column="location_name" property="locationName" />
+        <result column="location_position" property="locationPosition" />
+        <result column="create_user_id" property="createUserId" />
+        <result column="create_user" property="createUser" />
+        <result column="create_time" property="createTime" />
+        <result column="update_time" property="updateTime" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, location_no, location_name, location_position, create_user_id, create_user, create_time, update_time
+    </sql>
+
+    <select id="selectLocationListPage" resultType="com.casic.missiles.dto.resource.environment.LocationListResponse">
+        SELECT *
+        FROM env_location_info
+        WHERE 1=1
+        <if test="request.locationNo != null and request.locationNo !=''">
+            AND location_no LIKE concat('%',#{request.locationNo},'%')
+        </if>
+        <if test="request.locationName != null and request.locationName !=''">
+            AND location_name LIKE concat('%',#{request.locationName},'%')
+        </if>
+        ORDER BY create_time DESC
+    </select>
+
+</mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml
index b28c18f..8854047 100644
--- a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml
@@ -11,7 +11,6 @@
         <result column="sign_desc" property="signDesc" />
         <result column="sign_director" property="signDirector" />
         <result column="sign_user_id" property="signUserId" />
-        <result column="sign_type" property="signType" />
         <result column="minio_file_name" property="minioFileName" />
         <result column="create_time" property="createTime" />
         <result column="update_time" property="updateTime" />
@@ -28,7 +27,6 @@
         <result column="sign_name" property="signName" />
         <result column="sign_desc" property="signDesc" />
         <result column="sign_director" property="signDirector" />
-        <result column="sign_type" property="signType" />
         <result column="sign_user_id" property="signUserId" />
         <result column="minio_file_name" property="minioFileName" />
         <result column="create_time" property="createTime" />
@@ -62,4 +60,58 @@
         JOIN system_sign_user_relation ssur ON ss.id = ssur.sign_id
         WHERE ssur.user_id = #{userId}
     </select>
+
+    <select id="selectSignListPage" resultMap="BaseResultMap">
+        SELECT ss.*, sd.SIMPLE_NAME AS deptName
+        FROM system_sign ss
+        LEFT JOIN sys_user su ON su.id = ss.sign_user_id
+        LEFT JOIN sys_dept sd ON sd.id = su.dept_id
+        WHERE 1=1
+        <if test="request.signNo != null and request.signNo !=''">
+            AND ss.sign_no LIKE concat('%',#{request.signNo},'%')
+        </if>
+        <if test="request.signName != null and request.signName !=''">
+            AND ss.sign_name LIKE concat('%',#{request.signName},'%')
+        </if>
+        <if test="request.signDirector != null and request.signDirector !=''">
+            AND ss.sign_director LIKE concat('%',#{request.signDirector},'%')
+        </if>
+        <if test="request.signUserId != null and request.signUserId !=''">
+            AND ss.sign_user_id = #{request.signUserId}
+        </if>
+        <if test="request.createStartTime != null and request.createStartTime !=''">
+            AND DATE_FORMAT(ss.create_time,'%Y-%m-%d') &gt;= DATE_FORMAT(#{request.createStartTime},'%Y-%m-%d')
+        </if>
+        <if test="request.createEndTime != null and request.createEndTime !=''">
+            AND DATE_FORMAT(ss.create_time,'%Y-%m-%d')  &lt;= DATE_FORMAT(#{request.createEndTime},'%Y-%m-%d')
+        </if>
+        ORDER BY ss.create_time DESC
+    </select>
+
+    <select id="selectSignList" resultMap="BaseResultMap">
+        SELECT ss.*, sd.SIMPLE_NAME AS deptName
+        FROM system_sign ss
+        LEFT JOIN sys_user su ON su.id = ss.sign_user_id
+        LEFT JOIN sys_dept sd ON sd.id = su.dept_id
+        WHERE 1=1
+        <if test="request.signNo != null and request.signNo !=''">
+            AND ss.sign_no LIKE concat('%',#{request.signNo},'%')
+        </if>
+        <if test="request.signName != null and request.signName !=''">
+            AND ss.sign_name LIKE concat('%',#{request.signName},'%')
+        </if>
+        <if test="request.signDirector != null and request.signDirector !=''">
+            AND ss.sign_director LIKE concat('%',#{request.signDirector},'%')
+        </if>
+        <if test="request.signUserId != null and request.signUserId !=''">
+            AND ss.sign_user_id = #{request.signUserId}
+        </if>
+        <if test="request.createStartTime != null and request.createStartTime !=''">
+            AND DATE_FORMAT(ss.create_time,'%Y-%m-%d') &gt;= DATE_FORMAT(#{request.createStartTime},'%Y-%m-%d')
+        </if>
+        <if test="request.createEndTime != null and request.createEndTime !=''">
+            AND DATE_FORMAT(ss.create_time,'%Y-%m-%d')  &lt;= DATE_FORMAT(#{request.createEndTime},'%Y-%m-%d')
+        </if>
+        ORDER BY ss.create_time DESC
+    </select>
 </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 515050a..60f530b 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
@@ -47,8 +47,8 @@
     String STORAGE_LOCATION = "bizStorageLocation";
     //计量专业
     String MEASURE_MAJOR = "bizMeasureMajor";
-    //管理状态
-    String MANAGER_STATE = "bizManagerState";
+    //标准装置管理状态
+    String STANDARD_MANAGER_STATE = "bizStandardManagerState";
 
     /**
      * 资源管理 字典code
@@ -95,8 +95,6 @@
     String MEASURE_STATUS = "measureStatus";
     //检定方式
     String MEASURE_TYPE = "measureType";
-    //标识打印标志类型
-    String IDENTIFY_PRINT_TYPE = "bizBusinessIdentify";
     //变更类型
     String REPORT_CHANGE_TYPE = "bizCertChangeType";
     //规模类型
@@ -111,19 +109,24 @@
     String MEASURE_CATEGORY = "measureCategory";
     //检定结果
     String MEASURE_RESULT = "measureResult";
+    //分包原因
+    String OUTSOURCE_REASON = "outsourceReason";
+
+    /**
+     * 系统管理
+     */
+    String TEMPLATE_TYPE = "templateType";
+
 
     /**
      * 标准装置 字典code
      */
     //类别
     String STANDARD_CATEGORY = "standardCategory";
-    //管理状态
-    String STANDARD_MANAGER_STATE = "standardManagerState";
     //标准等级
     String STANDARD_LEVEL = "standardLevel";
     //传递范围
     String STANDARD_TRANSMIT_RANGE = "transmitRange";
-
     //资本来源
     String CAPITAL_SOURCE = "capitalSource";
     //标准装置-申请类型
@@ -148,8 +151,6 @@
     String CERTIFICATE_CLASS = "certificationClass";
     //证书管理-检校专业
     String CALIBRATION_MAJOR = "calibrationMajor";
-    //分包原因
-    String OUTSOURCE_REASON = "outsourceReason";
 
     /**
      * 工作台
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/BaseApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/BaseApprovalListRequest.java
index 73c12c1..80d7424 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/BaseApprovalListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/BaseApprovalListRequest.java
@@ -6,6 +6,7 @@
 
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotEmpty;
+import java.util.List;
 
 /**
  * @Description:
@@ -19,14 +20,14 @@
      * 表单id
      */
     @NotBlank(message = "表单id不能为空")
-    @ApiModelProperty(value = "表单id（流程定义对应的表单id，等价于业务id）", dataType = "String")
+    @ApiModelProperty(value = "表单id（流程定义对应的表单id，等价于业务id），导出接口不用传", dataType = "String")
     private String formId;
 
     /**
      * 审批状态类型，对应ApprovalStatusEnum
      */
     @NotEmpty(message = "审批状态类型不能为空")
-    @ApiModelProperty(value = "审批状态类型code", dataType = "String")
+    @ApiModelProperty(value = "审批状态类型code，导出接口不用传", dataType = "String")
     private String approvalStatus;
 
     @ApiModelProperty(hidden = true)
@@ -34,4 +35,7 @@
 
     @ApiModelProperty(hidden = true)
     private Long createUserId;
+
+    @ApiModelProperty(value = "导出ids", dataType = "List")
+    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificatePrintApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificatePrintApprovalListRequest.java
index b93d1c9..3cc2f4e 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificatePrintApprovalListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificatePrintApprovalListRequest.java
@@ -5,8 +5,6 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import java.util.List;
-
 /**
  * @Description:
  * @Author: wangpeng
@@ -38,7 +36,4 @@
 
     @ApiModelProperty(value = "创建结束时间", dataType = "String")
     private String createTimeEnd;
-
-    @ApiModelProperty(value = "导出ids", dataType = "List")
-    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportApprovalListRequest.java
index 4f7a038..c115847 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportApprovalListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportApprovalListRequest.java
@@ -5,8 +5,6 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import java.util.List;
-
 /**
  * @Description:
  * @Author: wangpeng
@@ -15,6 +13,8 @@
 @ApiModel
 @Data
 public class CertificateReportApprovalListRequest extends BaseApprovalListRequest {
+    @ApiModelProperty(value = "委托方id", dataType = "String")
+    private Long customerId;
 
     @ApiModelProperty(value = "证书报告编号", dataType = "String")
     private String certificateReportNo;
@@ -37,6 +37,4 @@
     @ApiModelProperty(value = "检校结束时间", dataType = "String")
     private String calibrationTimeEnd;
 
-    @ApiModelProperty(value = "导出ids", dataType = "List")
-    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/identify/IdentifyListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/identify/IdentifyListRequest.java
index 1b87ae6..f019203 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/identify/IdentifyListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/identify/IdentifyListRequest.java
@@ -4,6 +4,8 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * @Description:
  * @Author: wangpeng
@@ -26,4 +28,7 @@
 
     @ApiModelProperty(value = "打印结束时间", dataType = "String")
     private String createTimeEnd;
+
+    @ApiModelProperty(value = "导出ids", dataType = "List")
+    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListRequest.java
index 1264883..62415fb 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListRequest.java
@@ -7,6 +7,7 @@
 import lombok.Data;
 
 import javax.validation.constraints.NotBlank;
+import java.util.List;
 
 @Data
 @ApiModel
@@ -37,4 +38,6 @@
     @ApiModelProperty(value = "是否加急（1是0否null全部）", dataType = "Integer")
     private String isUrgent;
 
+    @ApiModelProperty(value = "导出ids", dataType = "List")
+    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListRequest.java
index 5201d7b..499760a 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListRequest.java
@@ -17,6 +17,9 @@
     @ApiModelProperty(value = "任务单编号", dataType = "String")
     private String orderNo;
 
+    @ApiModelProperty(value = "委托方id", dataType = "Long")
+    private Long customerId;
+
     @ApiModelProperty(value = "委托方名称", dataType = "String")
     private String customerName;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OrderSampleDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OrderSampleDTO.java
new file mode 100644
index 0000000..796edc0
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OrderSampleDTO.java
@@ -0,0 +1,19 @@
+package com.casic.missiles.dto.business.outsource;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/8/24 11:38
+ */
+@ApiModel
+@Data
+public class OrderSampleDTO {
+    @ApiModelProperty(value = "任务单id", dataType = "Long")
+    private Long orderId;
+    @ApiModelProperty(value = "受检设备id", dataType = "Long")
+    private Long sampleId;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceAssessApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceAssessApprovalListRequest.java
new file mode 100644
index 0000000..9a930c3
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceAssessApprovalListRequest.java
@@ -0,0 +1,30 @@
+package com.casic.missiles.dto.business.outsource;
+
+import com.casic.missiles.dto.BaseApprovalListRequest;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/8/24 11:01
+ */
+@ApiModel
+@Data
+public class OutsourceAssessApprovalListRequest extends BaseApprovalListRequest {
+    @ApiModelProperty(value = "评审表编号", dataType = "String")
+    private String projectNo;
+
+    @ApiModelProperty(value = "分包机构名称", dataType = "String")
+    private String outsourcerName;
+
+    @ApiModelProperty(value = "申请人", dataType = "String")
+    private String applicantName;
+
+    @ApiModelProperty(value = "申请时间开始", dataType = "String")
+    private String applicantTimeStart;
+
+    @ApiModelProperty(value = "申请时间结束", dataType = "String")
+    private String applicantTimeEnd;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceAssessSaveResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceAssessSaveResponse.java
new file mode 100644
index 0000000..8bf9aad
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceAssessSaveResponse.java
@@ -0,0 +1,20 @@
+package com.casic.missiles.dto.business.outsource;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/8/14 16:17
+ */
+@ApiModel
+@Data
+public class OutsourceAssessSaveResponse {
+    @ApiModelProperty(value = "主键id", dataType = "Long")
+    private Long id;
+
+    @ApiModelProperty(value = "编号", dataType = "String")
+    private String projectNo;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProtocolApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProtocolApprovalListRequest.java
new file mode 100644
index 0000000..0f32331
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProtocolApprovalListRequest.java
@@ -0,0 +1,30 @@
+package com.casic.missiles.dto.business.outsource;
+
+import com.casic.missiles.dto.BaseApprovalListRequest;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/8/24 15:01
+ */
+@ApiModel
+@Data
+public class OutsourceProtocolApprovalListRequest extends BaseApprovalListRequest {
+    @ApiModelProperty(value = "协议书编号", dataType = "String")
+    private String protocolNo;
+
+    @ApiModelProperty(value = "分包方名称", dataType = "String")
+    private String outsourcerName;
+
+    @ApiModelProperty(value = "申请人", dataType = "String")
+    private String applicantName;
+
+    @ApiModelProperty(value = "申请时间开始", dataType = "String")
+    private String applicantTimeStart;
+
+    @ApiModelProperty(value = "申请时间结束", dataType = "String")
+    private String applicantTimeEnd;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProtocolSaveResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProtocolSaveResponse.java
new file mode 100644
index 0000000..e324967
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProtocolSaveResponse.java
@@ -0,0 +1,20 @@
+package com.casic.missiles.dto.business.outsource;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/8/14 16:17
+ */
+@ApiModel
+@Data
+public class OutsourceProtocolSaveResponse {
+    @ApiModelProperty(value = "主键id", dataType = "Long")
+    private Long id;
+
+    @ApiModelProperty(value = "编号", dataType = "String")
+    private String protocolNo;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveApprovalListRequest.java
index f29f4e4..7047c28 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveApprovalListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveApprovalListRequest.java
@@ -5,8 +5,6 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import java.util.List;
-
 /**
  * @Description: 现场检测审批列表请求实体
  * @Author: wangpeng
@@ -30,7 +28,4 @@
     @ApiModelProperty(value = "申请时间结束", dataType = "String")
     private String applyTimeEnd;
 
-    @ApiModelProperty(value = "导出ids", dataType = "List")
-    private List<Long> ids;
-
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveDetailResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveDetailResponse.java
index 1f28752..394c934 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveDetailResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveDetailResponse.java
@@ -12,6 +12,18 @@
     @ApiModelProperty(value = "id，更新/删除使用参数", dataType = "Long")
     private Long id;
 
+    @ApiModelProperty(value = "实验室代码(字典code)", dataType = "String")
+    private String labCode;
+
+    @ApiModelProperty(value = "实验室代码(字典value)", dataType = "String")
+    private String labCodeName;
+
+    @ApiModelProperty(value = "组别代码(字典code)", dataType = "String")
+    private String groupCode;
+
+    @ApiModelProperty(value = "组别代码(字典value)", dataType = "String")
+    private String groupCodeName;
+
     @ApiModelProperty(value = "审批编号", dataType = "String")
     private String siteExecutiveNo;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/environment/LocationListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/environment/LocationListRequest.java
new file mode 100644
index 0000000..13d03c3
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/environment/LocationListRequest.java
@@ -0,0 +1,20 @@
+package com.casic.missiles.dto.resource.environment;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/6/8 13:56
+ */
+@ApiModel
+@Data
+public class LocationListRequest {
+    @ApiModelProperty(value = "地点编号", dataType = "String")
+    private String locationNo;
+
+    @ApiModelProperty(value = "地点名称", dataType = "String")
+    private String locationName;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/environment/LocationListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/environment/LocationListResponse.java
new file mode 100644
index 0000000..4c531af
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/environment/LocationListResponse.java
@@ -0,0 +1,78 @@
+package com.casic.missiles.dto.resource.environment;
+
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
+import com.baomidou.mybatisplus.annotation.TableField;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description: 地点列表响应实体
+ * @Author: wangpeng
+ * @Date: 2023/6/8 13:53
+ */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
+@ApiModel
+@Data
+public class LocationListResponse {
+    @ApiModelProperty(value = "主键id", dataType = "Long")
+    private Long id;
+
+    /**
+     * 地点编号
+     */
+    @ExcelProperty("地点编号")
+    @ApiModelProperty(value = "地点编号", dataType = "String")
+    private String locationNo;
+
+    /**
+     * 地点名称
+     */
+    @ExcelProperty("地点名称")
+    @ApiModelProperty(value = "地点名称", dataType = "String")
+    private String locationName;
+
+    /**
+     * 地点位置
+     */
+    @ExcelProperty("地点位置")
+    @ApiModelProperty(value = "地点位置", dataType = "String")
+    private String locationPosition;
+
+    /**
+     * 创建人id
+     */
+    @ApiModelProperty(value = "创建人id", dataType = "Long")
+    private Long createUserId;
+
+    /**
+     * 创建人
+     */
+    @ExcelProperty("创建人")
+    @ApiModelProperty(value = "创建人", dataType = "String")
+    @TableField("create_user")
+    private String createUser;
+
+    /**
+     * 创建时间
+     */
+    @ExcelProperty("创建时间")
+    @ApiModelProperty(value = "创建时间", dataType = "String")
+    private String createTime;
+
+    /**
+     * 更新时间
+     */
+    @ApiModelProperty(value = "更新时间", dataType = "String")
+    private String updateTime;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertRequest.java
index 9a7f6c6..c827915 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertRequest.java
@@ -4,6 +4,8 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * @Description:
  * @Author: wangpeng
@@ -16,4 +18,7 @@
     private String name;
     @ApiModelProperty(value = "部门名", dataType = "String")
     private String deptName;
+
+    @ApiModelProperty(value = "导出ids", dataType = "List")
+    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertResponse.java
index f78b159..8f2f79e 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertResponse.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.dto.resource.staff;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.casic.missiles.annotation.DictCodeField;
 import com.casic.missiles.constants.MeterDictCode;
 import io.swagger.annotations.ApiModel;
@@ -13,12 +20,18 @@
  * @Author: wangpeng
  * @Date: 2023/7/27 15:13
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @ApiModel
 @Data
 public class StaffCertResponse {
     /**
      * 人员编号
      */
+    @ExcelProperty(value = "人员编号",order = 0)
     @NotEmpty(message = "人员编号不能为空")
     @ApiModelProperty(value = "人员编号", dataType = "String")
     private String staffNo;
@@ -26,6 +39,7 @@
     /**
      * 姓名
      */
+    @ExcelProperty(value = "姓名",order = 1)
     @ApiModelProperty(value = "姓名", dataType = "String")
     private String staffName;
 
@@ -54,6 +68,7 @@
     /**
      * 部门名字
      */
+    @ExcelProperty(value = "工作部门",order = 2)
     @ApiModelProperty(value = "部门名字", dataType = "String")
     private String deptName;
 
@@ -66,6 +81,7 @@
     /**
      * 计量专业
      */
+    @ExcelProperty(value = "计量专业",order = 3)
     @ApiModelProperty(value = "计量专业", dataType = "String")
     private String major;
 
@@ -110,6 +126,7 @@
     /**
      * 证书号
      */
+    @ExcelProperty(value = "证号",order = 4)
     @ApiModelProperty(value = "证书号", dataType = "String")
     private String certNo;
 
@@ -122,12 +139,14 @@
     /**
      * 有效日期
      */
+    @ExcelProperty(value = "证书有效期",order = 6)
     @ApiModelProperty(value = "有效日期", dataType = "String")
     private String effectiveDate;
 
     /**
      * 发放日期
      */
+    @ExcelProperty(value = "发证日期",order = 5)
     @ApiModelProperty(value = "发放日期", dataType = "String")
     private String grantDate;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffListRequest.java
index 7c4afb3..0a1194a 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffListRequest.java
@@ -4,6 +4,8 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * @Description:
  * @Author: wangpeng
@@ -18,4 +20,7 @@
     private String deptName;
     @ApiModelProperty(value = "部门id", dataType = "Long")
     private Long deptId;
+
+    @ApiModelProperty(value = "导出ids", dataType = "List")
+    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/TrainListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/TrainListRequest.java
index f68597b..6321f8b 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/TrainListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/TrainListRequest.java
@@ -14,6 +14,8 @@
 public class TrainListRequest {
     @ApiModelProperty(value = "训练登记表编号", dataType = "String")
     private String trainNo;
+    @ApiModelProperty(value = "值班领导", dataType = "String")
+    private String dutyLeader;
     @ApiModelProperty(value = "创建开始时间", dataType = "String")
     private String createTimeStart;
     @ApiModelProperty(value = "创建结束时间", dataType = "String")
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/SignAddRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/SignAddRequest.java
index 117be34..d71055c 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/SignAddRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/SignAddRequest.java
@@ -43,13 +43,6 @@
     private Long signUserId;
 
     /**
-     * 签章或签名-字典code
-     */
-    @NotBlank(message = "类型不能为空")
-    @ApiModelProperty(value = "签名/签章-字典code", dataType = "String", required = true)
-    private String signType;
-
-    /**
      * minio存储文件名
      */
     @ApiModelProperty(value = "上传文件返回名称", dataType = "String")
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateAddRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateAddRequest.java
index aff1265..6316648 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateAddRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateAddRequest.java
@@ -17,30 +17,28 @@
 @Data
 public class TemplateAddRequest extends BaseSystemRequest {
     /**
-     * 原始记录模板/证书报告模板名称
+     * 模板名称
      */
     @ApiModelProperty(value = "名称", dataType = "String", required = true)
     @NotBlank(message = "名称不能为空")
     private String templateName;
 
     /**
-     * 原始记录模板/证书报告模板描述
+     * 模板描述
      */
     @ApiModelProperty(value = "描述", dataType = "String")
     private String templateDesc;
 
     /**
-     * 原始记录模板/证书报告模板创建人
+     * 创建人
      */
     @ApiModelProperty(value = "创建人", dataType = "String", required = true)
     @NotBlank(message = "创建人不能为空")
     private String templateCreator;
 
-    /**
-     * 原始记录模板/证书报告模板-字典code
-     */
-    @NotBlank(message = "类型不能为空")
-    @ApiModelProperty(value = "原始记录模板/证书报告模板-字典code", dataType = "String", required = true)
+
+    @NotBlank(message = "模板类型不能为空")
+    @ApiModelProperty(value = "模板类型(字典code)", dataType = "String", required = true)
     private String templateType;
 
     /**
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateListRequest.java
index eec5a1e..6d17bbe 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateListRequest.java
@@ -1,11 +1,12 @@
 package com.casic.missiles.dto.system;
 
+import com.casic.missiles.annotation.DictCodeField;
+import com.casic.missiles.constants.MeterDictCode;
 import com.casic.missiles.dto.BaseSystemRequest;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import javax.validation.constraints.NotBlank;
 import java.util.List;
 
 /**
@@ -19,8 +20,8 @@
     /**
      * 类型
      */
-//    @ApiModelProperty(value = "类型-字典code", dataType = "String", required = true)
-    @NotBlank(message = "类型不能为空")
+    @DictCodeField(message = "模板类型不合法", cacheName = MeterDictCode.TEMPLATE_TYPE)
+    @ApiModelProperty(value = "模板类型(字典code)", dataType = "String")
     private String templateType;
 
     /**
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificateChangeApply.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificateChangeApply.java
index 9216308..36923fd 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificateChangeApply.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificateChangeApply.java
@@ -1,11 +1,19 @@
 package com.casic.missiles.model.business;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 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 com.casic.missiles.dto.BaseRequest;
+import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -20,6 +28,12 @@
  * @author wangpeng
  * @since 2023-08-15
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
+@ApiModel
 @Data
 @TableName("biz_business_certificate_change_apply")
 public class BizBusinessCertificateChangeApply extends BaseRequest implements Serializable {
@@ -33,6 +47,7 @@
     /**
      * 申请单编号
      */
+    @ExcelProperty(value = "申请单编号", order = 1)
     @ApiModelProperty(value = "申请单编号", dataType = "String")
     @TableField("change_apply_no")
     private String changeApplyNo;
@@ -40,6 +55,7 @@
     /**
      * 申请单名字
      */
+    @ExcelProperty(value = "申请单名称", order = 2)
     @ApiModelProperty(value = "申请单名字", dataType = "String")
     @TableField("change_apply_name")
     private String changeApplyName;
@@ -54,6 +70,7 @@
     /**
      * 更换证书编号
      */
+    @ExcelProperty(value = "更换证书编号", order = 3)
     @ApiModelProperty(value = "更换证书编号", dataType = "String")
     @TableField("change_report_no")
     private String changeReportNo;
@@ -61,7 +78,8 @@
     /**
      * 更换证书名字
      */
-    @ApiModelProperty(value = "更换证书名字", dataType = "String")
+    @ExcelProperty(value = "更换证书/报告名称", order = 4)
+    @ApiModelProperty(value = "更换证书/报告名称", dataType = "String")
     @TableField("change_report_name")
     private String changeReportName;
 
@@ -73,6 +91,7 @@
     @TableField("change_type")
     private String changeType;
 
+    @ExcelProperty(value = "变更类型", order = 5)
     @ApiModelProperty(value = "变更类型(字典value)", dataType = "String")
     @TableField(exist = false)
     private String changeTypeName;
@@ -142,13 +161,15 @@
     /**
      * 创建用户名字
      */
-    @ApiModelProperty(value = "创建用户名字", dataType = "String")
+    @ExcelProperty(value = "创建人", order = 6)
+    @ApiModelProperty(value = "创建人名字", dataType = "String")
     @TableField("create_user_name")
     private String createUserName;
 
     /**
      * 创建时间
      */
+    @ExcelProperty(value = "创建时间", order = 7)
     @ApiModelProperty(value = "创建时间", dataType = "String")
     @TableField("create_time")
     private String createTime;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificateReport.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificateReport.java
index f01db9e..db06018 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificateReport.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificateReport.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.model.business;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -22,6 +29,11 @@
  * @author wangpeng
  * @since 2023-08-14
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @ApiModel
 @Data
 @TableName("biz_business_certificate_report")
@@ -36,6 +48,7 @@
     /**
      * 证书报告编号
      */
+    @ExcelProperty(value = "证书报告编号", order = 1)
     @ApiModelProperty(value = "证书报告编号", dataType = "String")
     @TableField("certificate_report_no")
     private String certificateReportNo;
@@ -43,6 +56,7 @@
     /**
      * 证书报告名称
      */
+    @ExcelProperty(value = "证书报告名称", order = 2)
     @ApiModelProperty(value = "证书报告名称", dataType = "String")
     @TableField("certificate_report_name")
     private String certificateReportName;
@@ -62,6 +76,7 @@
     @TableField("measure_category")
     private String measureCategory;
 
+    @ExcelProperty(value = "检校类别", order = 6)
     @ApiModelProperty(value = "检校类别(字典value)", dataType = "String")
     @TableField(exist = false)
     private String measureCategoryName;
@@ -69,6 +84,7 @@
     /**
      * 检校时间
      */
+    @ExcelProperty(value = "检校时间", order = 8)
     @ApiModelProperty(value = "检校时间", dataType = "String")
     @TableField("calibration_time")
     private String calibrationTime;
@@ -267,18 +283,22 @@
     @TableField(exist = false)
     private Integer decisionItem;
 
-    @ApiModelProperty(value = "设备样品编号（列表返回参数）", dataType = "String")
+    @ExcelProperty(value = "被检设备统一编号", order = 3)
+    @ApiModelProperty(value = "被检设备统一编号（列表返回参数）", dataType = "String")
     @TableField(exist = false)
     private String sampleNo;
 
-    @ApiModelProperty(value = "设备样品名称（列表返回参数）", dataType = "String")
+    @ExcelProperty(value = "被检设备名称", order = 4)
+    @ApiModelProperty(value = "被检设备名称（列表返回参数）", dataType = "String")
     @TableField(exist = false)
     private String sampleName;
 
-    @ApiModelProperty(value = "设备样品规格型号（列表返回参数）", dataType = "String")
+    @ExcelProperty(value = "规格型号", order = 5)
+    @ApiModelProperty(value = "规格型号（列表返回参数）", dataType = "String")
     @TableField(exist = false)
     private String sampleModel;
 
+    @ExcelProperty(value = "检定员", order = 7)
     @ApiModelProperty(value = "检定员名字（列表返回参数）", dataType = "String")
     @TableField(exist = false)
     private String staffName;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessIdentifyInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessIdentifyInfo.java
index 46bfba5..f1a9bec 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessIdentifyInfo.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessIdentifyInfo.java
@@ -1,10 +1,15 @@
 package com.casic.missiles.model.business;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 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;
 
@@ -20,6 +25,11 @@
  * @author wangpeng
  * @since 2023-08-15
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @Data
 @TableName("biz_business_identify_info")
 public class BizBusinessIdentifyInfo implements Serializable {
@@ -33,6 +43,7 @@
     /**
      * 记录编号
      */
+    @ExcelProperty(value = "记录编号", order = 1)
     @ApiModelProperty(value = "记录编号", dataType = "String")
     @TableField("record_no")
     private String recordNo;
@@ -41,20 +52,15 @@
      * 标志类型(字典code)
      */
     @NotEmpty(message = "标志类型不能为空")
-    @ApiModelProperty(value = "标志类型(字典code)", dataType = "String")
-    @DictCodeField(message = "标志类型不合法", cacheName = MeterDictCode.IDENTIFY_PRINT_TYPE)
+    @ApiModelProperty(value = "标志类型(直接存计量标识/使用状态/校准状态的字典value)", dataType = "String")
     @TableField("identify_type")
     private String identifyType;
 
-    @ApiModelProperty(value = "标志类型(字典value)", dataType = "String")
-    @TableField(exist = false)
-    private String identifyTypeName;
-
     /**
      * 设备id(可以是受检设备/设备台账)
      */
     @NotNull(message = "设备id不能为空")
-    @ApiModelProperty(value = "设备id(可以是受检设备/设备台账)", dataType = "String")
+    @ApiModelProperty(value = "设备id(可以是受检设备/设备台账)", dataType = "Long")
     @TableField("device_id")
     private Long deviceId;
 
@@ -66,29 +72,32 @@
     @TableField("device_type")
     private String deviceType;
 
+    @ExcelProperty(value = "统一编号", order = 3)
     @NotEmpty(message = "设备编号不能为空")
-    @ApiModelProperty(value = "设备编号", dataType = "String")
+    @ApiModelProperty(value = "统一编号", dataType = "String")
     @TableField("device_no")
     private String deviceNo;
 
     /**
      * 设备名字
      */
-    @NotEmpty(message = "设备名字不能为空")
-    @ApiModelProperty(value = "设备名字", dataType = "String")
+    @ExcelProperty(value = "设备名称", order = 4)
+    @NotEmpty(message = "设备名称不能为空")
+    @ApiModelProperty(value = "设备名称", dataType = "String")
     @TableField("device_name")
     private String deviceName;
 
     /**
      * 检定员id
      */
-    @ApiModelProperty(value = "检定员id", dataType = "String")
+    @ApiModelProperty(value = "检定员id", dataType = "Long")
     @TableField("measure_person_id")
     private Long measurePersonId;
 
     /**
      * 检定员名字
      */
+    @ExcelProperty(value = "检定员", order = 5)
     @ApiModelProperty(value = "检定员名字", dataType = "String")
     @TableField("measure_person")
     private String measurePerson;
@@ -103,7 +112,8 @@
     /**
      * 更新时间
      */
-    @ApiModelProperty(value = "更新时间", dataType = "String")
+    @ExcelProperty(value = "打印时间", order = 6)
+    @ApiModelProperty(value = "打印时间", dataType = "String")
     @TableField("update_time")
     private String updateTime;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceAssess.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceAssess.java
index 659d9ca..6720b90 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceAssess.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceAssess.java
@@ -1,11 +1,26 @@
 package com.casic.missiles.model.business;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 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 com.casic.missiles.dto.BaseRequest;
+import com.casic.missiles.dto.business.outsource.OrderSampleDTO;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import javax.validation.constraints.NotEmpty;
 import java.io.Serializable;
+import java.util.List;
 
 /**
  * <p>
@@ -15,146 +30,231 @@
  * @author wangpeng
  * @since 2023-08-16
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
+@ApiModel
 @Data
 @TableName("biz_business_outsource_assess")
-public class BizBusinessOutsourceAssess implements Serializable {
+public class BizBusinessOutsourceAssess extends BaseRequest implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
+    @ApiModelProperty(value = "id，更新/删除使用参数", dataType = "Long")
     @TableId("id")
     private Long id;
 
     /**
      * 评审表编号
      */
+    @ExcelProperty(value = "评审表编号", order = 1)
+    @ApiModelProperty(value = "评审表编号(后台生成)", dataType = "String")
     @TableField("project_no")
     private String projectNo;
 
     /**
      * 评审表名称
      */
+    @ExcelProperty(value = "评审表名称", order = 2)
+    @ApiModelProperty(value = "评审表名称", dataType = "String")
     @TableField("project_name")
     private String projectName;
 
+    @NotEmpty(message = "实验室代码不能为空")
+    @DictCodeField(message = "实验室代码描述不合法", cacheName = MeterDictCode.LAB_CODE)
+    @ApiModelProperty(value = "实验室代码(字典code)", dataType = "String")
+    @TableField("lab_code")
+    private String labCode;
+
+    @ApiModelProperty(value = "实验室代码(字典value)", dataType = "String")
+    @TableField(exist = false)
+    private String labCodeName;
+
+    /**
+     * 组别代码
+     */
+    @NotEmpty(message = "组别代码不能为空")
+    @DictCodeField(message = "组别代码描述不合法", cacheName = MeterDictCode.GROUP_CODE)
+    @ApiModelProperty(value = "组别代码(字典code)", dataType = "String")
+    @TableField("group_code")
+    private String groupCode;
+
+    @ApiModelProperty(value = "组别代码(字典value)", dataType = "String")
+    @TableField(exist = false)
+    private String groupCodeName;
+
     /**
      * 申请人id
      */
+    @ApiModelProperty(value = "申请人id", dataType = "String")
     @TableField("applicant_id")
     private Long applicantId;
 
     /**
      * 申请人名字
      */
+    @ExcelProperty(value = "申请人", order = 5)
+    @ApiModelProperty(value = "申请人", dataType = "String")
     @TableField("applicant_name")
     private String applicantName;
 
     /**
      * 申请时间
      */
+    @ExcelProperty(value = "申请时间", order = 6)
+    @ApiModelProperty(value = "申请时间", dataType = "String")
     @TableField("applicant_time")
     private String applicantTime;
 
     /**
      * 附件(minio存储文件名)
      */
+    @ApiModelProperty(value = "附件(minio存储文件名)", dataType = "String")
     @TableField("minio_file_name")
     private String minioFileName;
 
     /**
      * 备注
      */
+    @ApiModelProperty(value = "备注", dataType = "String")
     @TableField("remark")
     private String remark;
 
     /**
      * 创建人id
      */
+    @ApiModelProperty(value = "创建人id", dataType = "String")
     @TableField("create_user_id")
     private Long createUserId;
 
     /**
      * 创建人名字
      */
+    @ApiModelProperty(value = "创建人名字", dataType = "String")
     @TableField("create_user_name")
     private String createUserName;
 
     /**
      * 分包方id
      */
+    @ApiModelProperty(value = "评审表编号", dataType = "String")
     @TableField("outsourcer_id")
     private Long outsourcerId;
 
     /**
      * 预计开始时间
      */
+    @ApiModelProperty(value = "预计开始时间", dataType = "String")
     @TableField("pre_start_time")
     private String preStartTime;
 
     /**
      * 预计结束时间
      */
+    @ApiModelProperty(value = "预计结束时间", dataType = "String")
     @TableField("pre_end_time")
     private String preEndTime;
 
     /**
      * 分包原因-字典
      */
+    @ApiModelProperty(value = "分包原因(字典code)", dataType = "String")
+    @DictCodeField(message = "分包原因描述不合法", cacheName = MeterDictCode.OUTSOURCE_REASON)
     @TableField("outsource_reason")
     private String outsourceReason;
 
+    @ApiModelProperty(value = "分包原因(字典value)", dataType = "String")
+    @TableField(exist = false)
+    private String outsourceReasonName;
+
     /**
      * 预计费用
      */
+    @ApiModelProperty(value = "预计费用", dataType = "String")
     @TableField("pre_cost")
     private String preCost;
 
     /**
      * 审批状态
      */
+    @ApiModelProperty(value = "审批状态", dataType = "String")
+    @DictCodeField(message = "审批状态描述不合法", cacheName = MeterDictCode.APPROVAL_STATUS)
     @TableField("approval_status")
     private String approvalStatus;
 
     /**
      * 流程实例id
      */
+    @ApiModelProperty(value = "流程实例id", dataType = "String")
     @TableField("process_id")
     private String processId;
 
     /**
      * 实验室认可情况
      */
+    @ApiModelProperty(value = "实验室认可情况", dataType = "String")
     @TableField("approve_situation")
     private String approveSituation;
 
     /**
      * 溯源性
      */
+    @ApiModelProperty(value = "溯源性", dataType = "String")
     @TableField("traceability")
     private String traceability;
 
     /**
      * 测试方法
      */
+    @ApiModelProperty(value = "测试方法", dataType = "String")
     @TableField("test_method")
     private String testMethod;
 
     /**
      * 技术能力
      */
+    @ApiModelProperty(value = "技术能力", dataType = "String")
     @TableField("technique_ability")
     private String techniqueAbility;
 
     /**
      * 创建时间
      */
+    @ApiModelProperty(hidden = true)
     @TableField("create_time")
     private String createTime;
 
     /**
      * 更新时间
      */
+    @ApiModelProperty(hidden = true)
     @TableField("update_time")
     private String updateTime;
 
+    @ApiModelProperty(value = "审批状态类型-字典value", dataType = "String")
+    @TableField(exist = false)
+    private String approvalStatusName;
 
+    @ApiModelProperty(value = "任务id（同意、驳回等操作使用）", dataType = "String")
+    @TableField(exist = false)
+    private String taskId;
+
+    @ApiModelProperty(value = "可选决策项（1同意驳回拒绝 2同意驳回 3同意拒绝，用于待审批列表同意/驳回/拒绝按钮展示）", dataType = "Integer")
+    @TableField(exist = false)
+    private Integer decisionItem;
+
+    @NotEmpty(message = "受检设备信息不能为空")
+    @ApiModelProperty(value = "受检设备id列表（新建使用参数）", dataType = "List")
+    @TableField(exist = false)
+    private List<OrderSampleDTO> orderSampleList;
+
+    @ExcelProperty(value = "分包机构名称", order = 3)
+    @ApiModelProperty(value = "分包机构名称（列表返回参数）", dataType = "String")
+    private String outsourcerName;
+
+    @ExcelProperty(value = "机构负责人", order = 4)
+    @ApiModelProperty(value = "机构负责人（列表返回参数）", dataType = "String")
+    private String director;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceProtocol.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceProtocol.java
new file mode 100644
index 0000000..38df697
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceProtocol.java
@@ -0,0 +1,225 @@
+package com.casic.missiles.model.business;
+
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
+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 com.casic.missiles.dto.BaseRequest;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotEmpty;
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 计量检定业务-分包管理-测试、校准或检定工作分包协议书
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-08-24
+ */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
+@Data
+@TableName("biz_business_outsource_protocol")
+public class BizBusinessOutsourceProtocol extends BaseRequest implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "id，更新/删除使用参数", dataType = "Long")
+    @TableId("id")
+    private Long id;
+
+    /**
+     * 协议书编号
+     */
+    @ExcelProperty(value = "协议书编号", order = 1)
+    @ApiModelProperty(value = "协议书编号(后台生成)", dataType = "String")
+    @TableField("protocol_no")
+    private String protocolNo;
+
+    /**
+     * 协议书名称
+     */
+    @ExcelProperty(value = "协议书名称", order = 2)
+    @ApiModelProperty(value = "协议书名称", dataType = "String")
+    @TableField("project_name")
+    private String projectName;
+
+    @NotEmpty(message = "实验室代码不能为空")
+    @DictCodeField(message = "实验室代码描述不合法", cacheName = MeterDictCode.LAB_CODE)
+    @ApiModelProperty(value = "实验室代码(字典code)", dataType = "String")
+    @TableField("lab_code")
+    private String labCode;
+
+    @ApiModelProperty(value = "实验室代码(字典value)", dataType = "String")
+    @TableField(exist = false)
+    private String labCodeName;
+
+    @NotEmpty(message = "组别代码不能为空")
+    @DictCodeField(message = "组别代码描述不合法", cacheName = MeterDictCode.GROUP_CODE)
+    @ApiModelProperty(value = "组别代码(字典code)", dataType = "String")
+    @TableField("group_code")
+    private String groupCode;
+
+    @ApiModelProperty(value = "组别代码(字典value)", dataType = "String")
+    @TableField(exist = false)
+    private String groupCodeName;
+
+    /**
+     * 分包方id
+     */
+    @ApiModelProperty(value = "分包方id", dataType = "Long")
+    @TableField("outsourcer_id")
+    private Long outsourcerId;
+
+    /**
+     * 其他
+     */
+    @ApiModelProperty(value = "其他", dataType = "String")
+    @TableField("remark")
+    private String remark;
+
+    /**
+     * 分包方编号
+     */
+    @ApiModelProperty(value = "分包方编号(新建不用传)", dataType = "String")
+    @TableField("outsource_no")
+    private String outsourceNo;
+
+    /**
+     * 分包方名称
+     */
+    @ExcelProperty(value = "分包方名称", order = 3)
+    @ApiModelProperty(value = "分包方名称(新建不用传)", dataType = "String")
+    @TableField("outsource_name")
+    private String outsourceName;
+
+    /**
+     * 联系人
+     */
+    @ExcelProperty(value = "联系人", order = 4)
+    @ApiModelProperty(value = "联系人", dataType = "String")
+    @TableField("contacts")
+    private String contacts;
+
+    /**
+     * 电话
+     */
+    @ApiModelProperty(value = "电话", dataType = "String")
+    @TableField("mobile")
+    private String mobile;
+
+    /**
+     * 地址
+     */
+    @ApiModelProperty(value = "地址", dataType = "String")
+    @TableField("address")
+    private String address;
+
+    /**
+     * 要求完成日期
+     */
+    @ApiModelProperty(value = "要求完成日期", dataType = "String")
+    @TableField("require_date")
+    private String requireDate;
+
+    /**
+     * 分包费用(元)
+     */
+    @ApiModelProperty(value = "分包费用(元)", dataType = "String")
+    @TableField("outsource_cost")
+    private Double outsourceCost;
+
+    /**
+     * 分包方负责人
+     */
+    @ApiModelProperty(value = "分包方负责人", dataType = "String")
+    @TableField("director")
+    private String director;
+
+    /**
+     * 分包项目
+     */
+    @ApiModelProperty(value = "分包项目", dataType = "String")
+    @TableField("item")
+    private String item;
+
+    /**
+     * 分包要求
+     */
+    @ApiModelProperty(value = "分包要求", dataType = "String")
+    @TableField("requires")
+    private String requires;
+
+    /**
+     * 创建人id
+     */
+    @ApiModelProperty(hidden = true)
+    @TableField("create_user_id")
+    private Long createUserId;
+
+    /**
+     * 创建人名字
+     */
+    @ExcelProperty(value = "申请人", order = 5)
+    @ApiModelProperty(value = "申请人", dataType = "String")
+    @TableField("create_user_name")
+    private String createUserName;
+
+    /**
+     * 审批状态
+     */
+    @ApiModelProperty(value = "审批状态", dataType = "String")
+    @DictCodeField(message = "审批状态描述不合法", cacheName = MeterDictCode.APPROVAL_STATUS)
+    @TableField("approval_status")
+    private String approvalStatus;
+
+    /**
+     * 流程实例id
+     */
+    @ApiModelProperty(value = "流程实例id", dataType = "String")
+    @TableField("process_id")
+    private String processId;
+
+    /**
+     * 创建时间
+     */
+    @ExcelProperty(value = "申请时间", order = 6)
+    @ApiModelProperty(value = "申请时间", dataType = "String")
+    @TableField("create_time")
+    private String createTime;
+
+    /**
+     * 更新时间
+     */
+    @ApiModelProperty(hidden = true)
+    @TableField("update_time")
+    private String updateTime;
+
+    @ApiModelProperty(value = "审批状态类型-字典value", dataType = "String")
+    @TableField(exist = false)
+    private String approvalStatusName;
+
+    @ApiModelProperty(value = "任务id（同意、驳回等操作使用）", dataType = "String")
+    @TableField(exist = false)
+    private String taskId;
+
+    @ApiModelProperty(value = "可选决策项（1同意驳回拒绝 2同意驳回 3同意拒绝，用于待审批列表同意/驳回/拒绝按钮展示）", dataType = "Integer")
+    @TableField(exist = false)
+    private Integer decisionItem;
+
+
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourcerInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourcerInfo.java
index ec4e997..f9aa69e 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourcerInfo.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourcerInfo.java
@@ -17,6 +17,7 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import javax.validation.constraints.NotEmpty;
 import java.io.Serializable;
 
 /**
@@ -59,6 +60,29 @@
     @TableField("outsourcer_name")
     private String outsourcerName;
 
+    @NotEmpty(message = "实验室代码不能为空")
+    @DictCodeField(message = "实验室代码描述不合法", cacheName = MeterDictCode.LAB_CODE)
+    @ApiModelProperty(value = "实验室代码(字典code)", dataType = "String")
+    @TableField("lab_code")
+    private String labCode;
+
+    @ApiModelProperty(value = "实验室代码(字典value)", dataType = "String")
+    @TableField(exist = false)
+    private String labCodeName;
+
+    /**
+     * 组别代码
+     */
+    @NotEmpty(message = "组别代码不能为空")
+    @DictCodeField(message = "组别代码描述不合法", cacheName = MeterDictCode.GROUP_CODE)
+    @ApiModelProperty(value = "组别代码(字典code)", dataType = "String")
+    @TableField("group_code")
+    private String groupCode;
+
+    @ApiModelProperty(value = "组别代码(字典value)", dataType = "String")
+    @TableField(exist = false)
+    private String groupCodeName;
+
     /**
      * 单位简称
      */
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardInfo.java
index c48eed7..dffdfdd 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardInfo.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardInfo.java
@@ -5,6 +5,7 @@
 import com.baomidou.mybatisplus.annotation.TableName;
 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;
 
@@ -18,6 +19,7 @@
  * @author wangpeng
  * @since 2023-08-04
  */
+@ApiModel
 @Data
 @TableName("biz_equipment_standard_info")
 public class BizEquipmentStandardInfo implements Serializable {
@@ -119,7 +121,7 @@
      * 管理状态(字典code)
      */
     @ApiModelProperty(value = "管理状态(字典code)", dataType = "String")
-    @DictCodeField(message = "管理状态不合法", cacheName = MeterDictCode.MANAGER_STATE)
+    @DictCodeField(message = "管理状态不合法", cacheName = MeterDictCode.STANDARD_MANAGER_STATE)
     @TableField("manage_status")
     private String manageStatus;
 
@@ -151,7 +153,7 @@
     /**
      * 温度(℃)
      */
-    @ApiModelProperty(value = "使用状态(字典code)", dataType = "String")
+    @ApiModelProperty(value = "温度(℃)", dataType = "String")
     @TableField("temperature")
     private Double temperature;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardInfoApproval.java b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardInfoApproval.java
index dbd86ab..9f58d83 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardInfoApproval.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardInfoApproval.java
@@ -150,7 +150,7 @@
      * 管理状态(字典code)
      */
     @ApiModelProperty(value = "管理状态(字典code)", dataType = "String")
-    @DictCodeField(message = "管理状态不合法", cacheName = MeterDictCode.MANAGER_STATE)
+    @DictCodeField(message = "管理状态不合法", cacheName = MeterDictCode.STANDARD_MANAGER_STATE)
     @TableField("manage_status")
     private String manageStatus;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardTechnologyRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardTechnologyRelation.java
index 0e612bd..751f26b 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardTechnologyRelation.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardTechnologyRelation.java
@@ -3,6 +3,7 @@
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -16,6 +17,7 @@
  * @author wangpeng
  * @since 2023-08-04
  */
+@ApiModel
 @Data
 @TableName("biz_equipment_standard_technology_relation")
 public class BizEquipmentStandardTechnologyRelation implements Serializable {
@@ -33,6 +35,10 @@
     @TableField("technology_file_id")
     private Long technologyFileId;
 
+    @ApiModelProperty(value = "依据的技术文件编号", dataType = "String")
+    @TableField("technology_file_no")
+    private String technologyFileNo;
+
     /**
      * 依据的技术文件名称(技术文件中现行测试校准检定方法表文件名字段)
      */
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerInfo.java
index d6e8bed..65cd6bc 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerInfo.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerInfo.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.model.resource;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -21,6 +28,11 @@
  * @author wangpeng
  * @since 2023-08-08
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @ApiModel
 @Data
 @TableName("biz_resource_customer_info")
@@ -35,6 +47,7 @@
     /**
      * 委托方编号
      */
+    @ExcelProperty(value = "委托方编号", order = 1)
     @ApiModelProperty(value = "委托方编号", dataType = "String")
     @TableField("customer_no")
     private String customerNo;
@@ -42,6 +55,7 @@
     /**
      * 委托方名称
      */
+    @ExcelProperty(value = "委托方名称", order = 2)
     @ApiModelProperty(value = "委托方名称(新建时为下拉选择一个受检单位组织的名字，传deptId字段，后端获取名称)", dataType = "String")
     @TableField("customer_name")
     private String customerName;
@@ -63,6 +77,7 @@
     /**
      * 联系人
      */
+    @ExcelProperty(value = "联系人", order = 3)
     @ApiModelProperty(value = "联系人", dataType = "String")
     @TableField("contacts")
     private String contacts;
@@ -70,6 +85,7 @@
     /**
      * 座机电话
      */
+    @ExcelProperty(value = "座机电话", order = 4)
     @ApiModelProperty(value = "座机电话", dataType = "String")
     @TableField("mobile")
     private String mobile;
@@ -77,6 +93,7 @@
     /**
      * 手机号码
      */
+    @ExcelProperty(value = "手机号码", order = 5)
     @ApiModelProperty(value = "手机号码", dataType = "String")
     @TableField("phone")
     private String phone;
@@ -91,6 +108,7 @@
     /**
      * 地址
      */
+    @ExcelProperty(value = "地址", order = 6)
     @ApiModelProperty(value = "地址", dataType = "String")
     @TableField("address")
     private String address;
@@ -141,6 +159,7 @@
     /**
      * 创建时间
      */
+    @ExcelProperty(value = "创建时间", order = 7)
     @ApiModelProperty(value = "创建时间", dataType = "String")
     @TableField("create_time")
     private String createTime;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerSuggestForm.java b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerSuggestForm.java
index 7201bbd..701bf8b 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerSuggestForm.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerSuggestForm.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.model.resource;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -22,6 +29,11 @@
  * @author wangpeng
  * @since 2023-08-08
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @ApiModel
 @Data
 @TableName("biz_resource_customer_suggest_form")
@@ -44,7 +56,8 @@
     /**
      * 委托方名称
      */
-    @ApiModelProperty(value = "委托方名称", dataType = "String")
+    @ExcelProperty(value = "意见反馈单位", order = 2)
+    @ApiModelProperty(value = "意见反馈单位", dataType = "String")
     @TableField("customer_name")
     private String customerName;
 
@@ -59,7 +72,8 @@
     /**
      * 委托方意见反馈部门名称
      */
-    @ApiModelProperty(value = "委托方意见反馈部门名称", dataType = "String")
+    @ExcelProperty(value = "委托方意见反馈部门", order = 3)
+    @ApiModelProperty(value = "委托方意见反馈部门", dataType = "String")
     @TableField("customer_dept_name")
     private String customerDeptName;
 
@@ -73,6 +87,7 @@
     /**
      * 表单编号
      */
+    @ExcelProperty(value = "表单编号", order = 1)
     @ApiModelProperty(value = "表单编号", dataType = "String")
     @TableField("form_no")
     private String formNo;
@@ -111,6 +126,7 @@
     /**
      * 创建人名字
      */
+    @ExcelProperty(value = "创建人", order = 4)
     @ApiModelProperty(value = "创建人名字", dataType = "String")
     @TableField("create_user_name")
     private String createUserName;
@@ -147,6 +163,7 @@
     /**
      * 创建时间
      */
+    @ExcelProperty(value = "创建时间", order = 5)
     @ApiModelProperty(value = "创建时间", dataType = "String")
     @TableField("create_time")
     private String createTime;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSealInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSealInfo.java
index cbf05d7..9bf389d 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSealInfo.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSealInfo.java
@@ -106,6 +106,10 @@
     @TableField("minio_file_name")
     private String minioFileName;
 
+    @ApiModelProperty(value = "minio存储文件url", dataType = "String")
+    @TableField(exist = false)
+    private String minioFileUrl;
+
     @ApiModelProperty(value = "创建时间", dataType = "String")
     @TableField("create_time")
     private String createTime;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSealUseNote.java b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSealUseNote.java
index 3f2d9e8..3ce16a8 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSealUseNote.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSealUseNote.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.model.resource;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -20,6 +27,11 @@
  * @author wangpeng
  * @since 2023-07-28
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @ApiModel
 @Data
 @TableName("biz_resource_seal_use_note")
@@ -34,6 +46,7 @@
     /**
      * 登记表编号
      */
+    @ExcelProperty(value = "申请单编号", order = 1)
     @ApiModelProperty(value = "登记表编号(自动生成)", dataType = "String")
     @TableField("note_form_no")
     private String noteFormNo;
@@ -55,6 +68,7 @@
     /**
      * 申请部门
      */
+    @ExcelProperty(value = "申请部门", order = 5)
     @ApiModelProperty(value = "申请部门", dataType = "String")
     @TableField("apply_dept_name")
     private String applyDeptName;
@@ -69,6 +83,7 @@
     /**
      * 申请人
      */
+    @ExcelProperty(value = "申请人", order = 6)
     @ApiModelProperty(value = "申请人", dataType = "String")
     @TableField("apply_user_name")
     private String applyUserName;
@@ -76,6 +91,7 @@
     /**
      * 申请时间
      */
+    @ExcelProperty(value = "申请时间", order = 7)
     @ApiModelProperty(value = "申请时间(新增自动获取当前时间)", dataType = "String")
     @TableField("apply_time")
     private String applyTime;
@@ -130,6 +146,26 @@
     @TableField("update_time")
     private String updateTime;
 
+    @ExcelProperty(value = "印章名称", order = 2)
+    @ApiModelProperty(value = "印章名称(列表返回参数)", dataType = "String")
+    @TableField(exist = false)
+    private String sealName;
+
+    @DictCodeField(message = "印章类型描述不合法", cacheName = MeterDictCode.SEAL_TYPE)
+    @ApiModelProperty(hidden = true)
+    @TableField(exist = false)
+    private String sealType;
+
+    @ExcelProperty(value = "印章类型", order = 3)
+    @ApiModelProperty(value = "印章类型(列表返回参数)", dataType = "String")
+    @TableField(exist = false)
+    private String sealTypeName;
+
+    @ExcelProperty(value = "批准人", order = 4)
+    @ApiModelProperty(value = "批准人(列表返回参数)", dataType = "String")
+    @TableField(exist = false)
+    private String approverName;
+
     @ApiModelProperty(value = "审批状态类型-字典value", dataType = "String")
     @TableField(exist = false)
     private String approvalStatusName;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceStaffInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceStaffInfo.java
index 5ef995b..41563a1 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceStaffInfo.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceStaffInfo.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.model.resource;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -20,6 +27,11 @@
  * @author wangpeng
  * @since 2023-07-25
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @ApiModel
 @Data
 @TableName("biz_resource_staff_info")
@@ -38,6 +50,7 @@
     /**
      * 人员编号
      */
+    @ExcelProperty(value = "人员编号",order = 0)
     @NotEmpty(message = "人员编号不能为空")
     @ApiModelProperty(value = "人员编号", dataType = "String")
     @TableField("staff_no")
@@ -46,6 +59,7 @@
     /**
      * 姓名
      */
+    @ExcelProperty(value = "姓名",order = 1)
     @ApiModelProperty(value = "姓名", dataType = "String")
     @TableField("staff_name")
     private String staffName;
@@ -152,13 +166,15 @@
     /**
      * 部门名字
      */
-    @ApiModelProperty(value = "部门名字", dataType = "String")
+    @ExcelProperty(value = "工作部门",order = 4)
+    @ApiModelProperty(value = "工作部门", dataType = "String")
     @TableField("dept_name")
     private String deptName;
 
     /**
      * 岗位
      */
+    @ExcelProperty(value = "岗位",order = 2)
     @ApiModelProperty(value = "岗位", dataType = "String")
     @TableField("station")
     private String station;
@@ -166,6 +182,7 @@
     /**
      * 计量专业
      */
+    @ExcelProperty(value = "计量专业",order = 5)
     @ApiModelProperty(value = "计量专业", dataType = "String")
     @TableField("major")
     private String major;
@@ -173,6 +190,7 @@
     /**
      * 证号
      */
+    @ExcelProperty(value = "证号",order = 3)
     @ApiModelProperty(value = "证号", dataType = "String")
     @TableField("certificate_number")
     private String certificateNumber;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSupplierInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSupplierInfo.java
index eb5ef01..a1e2697 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSupplierInfo.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSupplierInfo.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.model.resource;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -20,6 +27,11 @@
  * @author wangpeng
  * @since 2023-07-27
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @ApiModel
 @Data
 @TableName("biz_resource_supplier_info")
@@ -34,6 +46,7 @@
     /**
      * 供方编号
      */
+    @ExcelProperty(value = "供方编号", order = 1)
     @ApiModelProperty(value = "供方编号(自动生成)", dataType = "String")
     @TableField("supplier_no")
     private String supplierNo;
@@ -41,6 +54,7 @@
     /**
      * 供方名称
      */
+    @ExcelProperty(value = "供方名称", order = 2)
     @ApiModelProperty(value = "供方名称", dataType = "String")
     @TableField("supplier_name")
     private String supplierName;
@@ -60,6 +74,7 @@
     @TableField("supplier_type")
     private String supplierType;
 
+    @ExcelProperty(value = "供方类型", order = 3)
     @ApiModelProperty(value = "供方类型(字典value)", dataType = "String")
     @TableField(exist = false)
     private String supplierTypeName;
@@ -109,7 +124,8 @@
     /**
      * 电话
      */
-    @ApiModelProperty(value = "电话", dataType = "String")
+    @ExcelProperty(value = "联系电话", order = 4)
+    @ApiModelProperty(value = "联系电话", dataType = "String")
     @TableField("phone")
     private String phone;
 
@@ -158,6 +174,7 @@
     /**
      * 公司地址-省
      */
+    @ExcelProperty(value = "地址-省", order = 6)
     @ApiModelProperty(value = "公司地址-省", dataType = "String")
     @TableField("company_province_name")
     private String companyProvinceName;
@@ -172,6 +189,7 @@
     /**
      * 公司地址-市
      */
+    @ExcelProperty(value = "地址-市", order = 7)
     @ApiModelProperty(value = "公司地址-市", dataType = "String")
     @TableField("company_city_name")
     private String companyCityName;
@@ -186,6 +204,7 @@
     /**
      * 公司地址-区
      */
+    @ExcelProperty(value = "地址-区", order = 8)
     @ApiModelProperty(value = "公司地址-区", dataType = "String")
     @TableField("company_area_name")
     private String companyAreaName;
@@ -193,6 +212,7 @@
     /**
      * 公司地址-详细地址
      */
+    @ExcelProperty(value = "地址-详细地址", order = 9)
     @ApiModelProperty(value = "公司地址-详细地址", dataType = "String")
     @TableField("company_address")
     private String companyAddress;
@@ -200,6 +220,7 @@
     /**
      * 服务和供应的内容
      */
+    @ExcelProperty(value = "服务和供应的内容", order = 5)
     @ApiModelProperty(value = "服务和供应的内容", dataType = "String")
     @TableField("supplier_content")
     private String supplierContent;
@@ -250,6 +271,7 @@
     /**
      * 创建时间
      */
+    @ExcelProperty(value = "创建时间", order = 9)
     @ApiModelProperty(value = "创建时间", dataType = "String")
     @TableField("create_time")
     private String createTime;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/EnvLocationInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/EnvLocationInfo.java
new file mode 100644
index 0000000..d8e2d7b
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/EnvLocationInfo.java
@@ -0,0 +1,83 @@
+package com.casic.missiles.model.resource;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotEmpty;
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 实验室环境监控系统-设备表
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-06-07
+ */
+@ApiModel
+@Data
+@TableName("env_location_info")
+public class EnvLocationInfo implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "主键id", dataType = "Long")
+    @TableId("id")
+    private Long id;
+
+    /**
+     * 地点编号
+     */
+    @NotEmpty(message = "地点编号不能为空")
+    @ApiModelProperty(value = "地点编号", dataType = "String")
+    @TableField("location_no")
+    private String locationNo;
+
+    /**
+     * 地点名称
+     */
+    @ApiModelProperty(value = "地点名称", dataType = "String")
+    @TableField("location_name")
+    private String locationName;
+
+    /**
+     * 地点位置
+     */
+    @ApiModelProperty(value = "地点位置", dataType = "String")
+    @TableField("location_position")
+    private String locationPosition;
+
+    /**
+     * 创建人id
+     */
+    @ApiModelProperty(value = "创建人id", dataType = "Long")
+    @TableField("create_user_id")
+    private Long createUserId;
+
+    /**
+     * 创建人
+     */
+    @ApiModelProperty(value = "创建人", dataType = "String")
+    @TableField("create_user")
+    private String createUser;
+
+    /**
+     * 创建时间
+     */
+    @ApiModelProperty(value = "创建时间", dataType = "String")
+    @TableField("create_time")
+    private String createTime;
+
+    /**
+     * 更新时间
+     */
+    @ApiModelProperty(value = "更新时间", dataType = "String")
+    @TableField("update_time")
+    private String updateTime;
+
+
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemFileConfig.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemFileConfig.java
index 19e6845..86e569c 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemFileConfig.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemFileConfig.java
@@ -30,7 +30,7 @@
     @ApiModelProperty(value = "系统类别(1业务系统2受检系统3环境系统)", dataType = "Integer")
     @NotNull(message = "系统类别不能为空")
     @TableField("system_type")
-    private Integer systemType;
+    private Integer systemType = 1;
 
     @ApiModelProperty("下载编号")
     @TableField("download_no")
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemNotice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemNotice.java
index e94297d..06ec37d 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemNotice.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemNotice.java
@@ -34,7 +34,7 @@
     @ApiModelProperty(value = "系统类别(1业务系统2受检系统3环境系统)", dataType = "Integer")
     @NotNull(message = "系统类别不能为空")
     @TableField("system_type")
-    private Integer systemType;
+    private Integer systemType = 1;
 
     /**
      * 通知公告编号
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSign.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSign.java
index 6c0d7c9..954f4f8 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSign.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSign.java
@@ -51,7 +51,7 @@
     @ApiModelProperty(value = "系统类别(1业务系统2受检系统3环境系统)", dataType = "Integer")
     @NotNull(message = "系统类别不能为空")
     @TableField("system_type")
-    private Integer systemType;
+    private Integer systemType = 1;
 
     /**
      * 签名编号
@@ -130,4 +130,8 @@
     @TableField(exist = false)
     private List<Long> userIdList;
 
+    @ApiModelProperty(hidden = true)
+    @TableField(exist = false)
+    private String deptName;
+
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemTemplate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemTemplate.java
index 503a457..1d27ebe 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemTemplate.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemTemplate.java
@@ -47,7 +47,7 @@
     @ApiModelProperty(value = "系统类别(1业务系统2受检系统3环境系统)", dataType = "Integer")
     @NotNull(message = "系统类别不能为空")
     @TableField("system_type")
-    private Integer systemType;
+    private Integer systemType = 1;
 
     /**
      * 模板编号
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java
index 8c21cb0..f61e4a8 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java
@@ -32,4 +32,8 @@
     ReturnDTO approvalDelete(ApprovalDeleteRequest request);
 
     ReturnDTO failUpdate(T request);
+
+    List<O> listExport(R request);
+
+    List<O> listExportByIds(List<Long> ids);
 }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java
index 724166f..9bce15b 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java
@@ -157,6 +157,29 @@
         throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
     }
 
+    @Override
+    public List<O> listExport(R request) {
+        request.setCreateUserId(null);
+        request.setApprovalStatus(ApprovalStatusEnum.PASSED);
+        Page<O> page = PageFactory.defaultPage();
+        page.setCurrent(1);
+        page.setSearchCount(false);
+        page.setSize(Integer.MAX_VALUE);
+        Page<O> resultPage = this.baseMapper.selectBatchForApprovalList(page, request, null);
+        return resultPage.getRecords();
+    }
+
+    @Override
+    public List<O> listExportByIds(List<Long> ids) {
+        Page<O> page = PageFactory.defaultPage();
+        page.setCurrent(1);
+        page.setSearchCount(false);
+        page.setSize(Integer.MAX_VALUE);
+        List<String> businessKeys = ids.stream().map(String::valueOf).collect(Collectors.toList());
+        Page<O> resultPage = this.baseMapper.selectBatchForApprovalList(page, null, businessKeys);
+        return resultPage.getRecords();
+    }
+
     protected ReturnDTO updateApprovalStatus(Long id, String processId, String approvalStatus) {
         UpdateWrapper<T> updateWrapper = new UpdateWrapper<>();
         updateWrapper.eq("id", id);
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificatePrintServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificatePrintServiceImpl.java
index f6e4706..3228497 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificatePrintServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificatePrintServiceImpl.java
@@ -162,6 +162,30 @@
         return ReturnUtil.success(printLogMapper.selectList(wrapper));
     }
 
+    @Override
+    public List<CertificatePrintListResponse> listByIds(List<Long> ids) {
+        Page<CertificatePrintListResponse> page = PageFactory.defaultPage();
+        page.setCurrent(1);
+        page.setSearchCount(false);
+        page.setSize(Integer.MAX_VALUE);
+        List<String> businessKeys = ids.stream().map(String::valueOf).collect(Collectors.toList());
+        Page<CertificatePrintListResponse> resultPage = this.baseMapper.selectBatchForApprovalList(page, null, businessKeys);
+        return resultPage.getRecords();
+    }
+
+    @Override
+    public List<CertificatePrintListResponse> list(CertificatePrintApprovalListRequest request) {
+        request.setCreateUserId(null);
+        request.setApprovalStatus(null);
+        request.setPrintStatus(null);
+        Page<CertificatePrintListResponse> page = PageFactory.defaultPage();
+        page.setCurrent(1);
+        page.setSearchCount(false);
+        page.setSize(Integer.MAX_VALUE);
+        Page<CertificatePrintListResponse> resultPage = certificatePrintMapper.selectBatchForApprovalList(page, request, null);
+        return resultPage.getRecords();
+    }
+
     private void savePrintLog(Long id) {
         BizBusinessCertificatePrintLog printLog = new BizBusinessCertificatePrintLog();
         BizBusinessCertificatePrint certificatePrint = certificatePrintMapper.selectById(id);

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java
index bb0c50f..13a699b 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java
@@ -12,6 +12,7 @@
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.IGeneralApprovalService;
+import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
@@ -19,6 +20,7 @@
 import org.springframework.web.bind.annotation.RequestBody;
 
 import javax.validation.Valid;
+import java.util.List;
 import java.util.Objects;
 
 /**
@@ -117,4 +119,17 @@
         }
         return baseApprovalService.failUpdate(request);
     }
+
+    public List<O> exportList(@RequestBody @Valid R request) throws Exception {
+        List<O> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = baseApprovalService.listExportByIds(request.getIds());
+        } else {
+            list = baseApprovalService.listExport(request);
+        }
+        for (O record : list) {
+            DictCodeUtils.convertDictCodeToName(record);
+        }
+        return list;
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java
index 8a90961..d775831 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java
@@ -5,6 +5,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.business.certificate.CertificateChangeApplyApprovalListRequest;
 import com.casic.missiles.dto.business.certificate.CertificateChangeApplySaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessCertificateChangeApply;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
@@ -20,6 +21,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -48,4 +50,12 @@
         }
         return changeApplyService.saveChangeApply(request);
     }
+
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody CertificateChangeApplyApprovalListRequest request) throws Exception {
+        List<BizBusinessCertificateChangeApply> list = super.exportList(request);
+        super.exportExcel(BizBusinessCertificateChangeApply.class, list, ExportEnum.CERTIFICATE_CHANGE_APPLY.getSheetName());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java
index 5fc4b07..af8230e 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java
@@ -9,6 +9,7 @@
 import com.casic.missiles.dto.business.certificate.CertificatePrintApprovalListRequest;
 import com.casic.missiles.dto.business.certificate.CertificatePrintListResponse;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.enums.business.CertificatePrintStatusEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessCertificatePrintLog;
@@ -18,10 +19,16 @@
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.io.IOException;
+import java.util.List;
 import java.util.Objects;
 
 /**
@@ -98,4 +105,16 @@
         });
         return certificatePrintService.certificatePrintLog(idDTO.getId());
     }
+
+    @ApiOperation("证书打印审批导出")
+    @PostMapping("/listExport")
+    public void exportList(@RequestBody CertificatePrintApprovalListRequest request) throws IOException {
+        List<CertificatePrintListResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = certificatePrintService.listByIds(request.getIds());
+        } else {
+            list = certificatePrintService.list(request);
+        }
+        super.exportExcel(CertificatePrintListResponse.class, list, ExportEnum.CERTIFICATE_PRINT.getSheetName());
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java
index 63b06dc..6b2efd5 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java
@@ -6,6 +6,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.business.certificate.CertificateReportApprovalListRequest;
 import com.casic.missiles.dto.business.certificate.CertificateReportSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessCertificateReport;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
@@ -21,6 +22,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -50,7 +52,7 @@
         return certificateReportService.saveCertificateReport(request);
     }
 
-    @ApiOperation("证书审批详情（基本信息）")
+    @ApiOperation("详情（基本信息）")
     @PostMapping("/detail")
     public ReturnDTO<BizBusinessCertificateReport> detail(@RequestBody @Valid BaseDetailRequest request, BindingResult bindingResult) throws Exception {
         if(bindingResult.hasErrors()){
@@ -59,4 +61,11 @@
         return certificateReportService.detail(request);
     }
 
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody CertificateReportApprovalListRequest request) throws Exception {
+        List<BizBusinessCertificateReport> list = super.exportList(request);
+        super.exportExcel(BizBusinessCertificateReport.class, list, ExportEnum.CERTIFICATE_REPORT.getSheetName());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java
index 46b26bd..57c0809 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java
@@ -10,20 +10,21 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.business.identify.IdentifyListRequest;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessIdentifyInfo;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.business.IBizBusinessIdentifyInfoService;
+import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import javax.validation.Valid;
+import java.util.List;
 import java.util.Objects;
 
 /**
@@ -57,16 +58,13 @@
         return identifyInfoService.addIdentify(identifyInfo);
     }
 
-    @ApiOperation("标识打印更新")
+    @ApiOperation("标识打印更新（更新打印时间）")
     @PostMapping("/update")
-    public ReturnDTO updateIdentify(@RequestBody @Valid BizBusinessIdentifyInfo identifyInfo, BindingResult bindingResult) {
-        Assert.isFalse(Objects.isNull(identifyInfo.getId()), () -> {
+    public ReturnDTO updateIdentify(@RequestBody @Valid IdDTO idDTO) {
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        Assert.isFalse(bindingResult.hasErrors(), () -> {
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        });
-        return identifyInfoService.updateIdentify(identifyInfo);
+        return identifyInfoService.updateIdentify(idDTO.getId());
     }
 
     @ApiOperation("标识打印删除")
@@ -77,4 +75,37 @@
         });
         return identifyInfoService.deleteIdentify(idDTO.getId());
     }
+
+    @ApiOperation("标识打印导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody @Valid IdentifyListRequest request, BindingResult bindingResult) throws Exception {
+        if (bindingResult.hasErrors()) {
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        List<BizBusinessIdentifyInfo> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = identifyInfoService.listByIds(request.getIds());
+        } else {
+            list = identifyInfoService.list(request);
+        }
+        for (BizBusinessIdentifyInfo record : list) {
+            DictCodeUtils.convertDictCodeToName(record);
+        }
+        super.exportExcel(BizBusinessIdentifyInfo.class, list, ExportEnum.IDENTIFY_EXPORT.getSheetName());
+    }
+
+
+    // TODO: 2023/8/23 查询设备信息，4个底部按钮查设备（按钮的作用就是前端用来调不同接口、用来区分中间即将展示的标识），前端弹窗选设备，在确定保存时前端根据底部按钮判断传入设备类型deviceType字典code
+    // TODO: 2023/8/23 接口：查受检设备（第1个按钮），查设备台账（后3个按钮同一接口），查询之后前端根据标志类型的不同加到中间页面时进行判断（按产品给的对应表）
+    // TODO: 2023/8/23 提供二维码接口，前端在加到中间页面时调用一下
+
+    @ApiOperation("设备二维码")
+    @PostMapping("/equipment/qrCode")
+    public ReturnDTO<String> equipmentQrCode(@RequestBody @Valid IdDTO idDTO) {
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return identifyInfoService.equipmentQrCode(idDTO.getId());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java
index 707be6e..7e0453d 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java
@@ -117,7 +117,7 @@
     }
 
     @ApiOperation("任务单导出")
-    @PostMapping("/export")
+    @PostMapping("/listExport")
     public void orderExport(@RequestBody @Valid OrderListRequest request, HttpServletResponse response) {
         businessOrderService.orderExport(request, response);
     }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java
index 529a6ce..51432be 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java
@@ -1,9 +1,28 @@
 package com.casic.missiles.controller.business;
 
+import com.casic.missiles.controller.GeneralApprovalController;
+import com.casic.missiles.dto.BaseApprovalSubmitRequest;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.business.outsource.OutsourceAssessApprovalListRequest;
+import com.casic.missiles.dto.business.outsource.OutsourceAssessSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
+import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.model.business.BizBusinessOutsourceAssess;
+import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
+import com.casic.missiles.service.IGeneralApprovalService;
+import com.casic.missiles.service.business.IBizBusinessOutsourceAssessService;
 import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.BindingResult;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.validation.Valid;
+import java.util.List;
+
 /**
  * <p>
  * 计量检定业务-分包管理-测试、校准或检定工作分包评审表 前端控制器
@@ -15,6 +34,27 @@
 @Api(tags = "分包管理-测试、校准或检定工作分包评审表")
 @RestController
 @RequestMapping("/business/outsource/assess")
-public class BizBusinessOutsourceAssessController {
+public class BizBusinessOutsourceAssessController extends GeneralApprovalController<BizBusinessOutsourceAssess, BizBusinessOutsourceAssess, OutsourceAssessApprovalListRequest, BaseApprovalSubmitRequest> {
+    @Autowired
+    private IBizBusinessOutsourceAssessService outsourceAssessService;
 
+    public BizBusinessOutsourceAssessController(IGeneralApprovalService<BizBusinessOutsourceAssess, BizBusinessOutsourceAssess, OutsourceAssessApprovalListRequest, BaseApprovalSubmitRequest> baseApprovalService) {
+        super(baseApprovalService);
+    }
+
+    @ApiOperation("草稿箱-保存")
+    @PostMapping("/save")
+    public ReturnDTO<OutsourceAssessSaveResponse> saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceAssess request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        return outsourceAssessService.saveOutsourceAssess(request);
+    }
+
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception {
+        List<BizBusinessOutsourceAssess> list = super.exportList(request);
+        super.exportExcel(BizBusinessOutsourceAssess.class, list, ExportEnum.OUTSOURCE_ASSESS.getSheetName());
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java
new file mode 100644
index 0000000..9adef18
--- /dev/null
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java
@@ -0,0 +1,60 @@
+package com.casic.missiles.controller.business;
+
+import com.casic.missiles.controller.GeneralApprovalController;
+import com.casic.missiles.dto.BaseApprovalSubmitRequest;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.business.outsource.OutsourceProtocolApprovalListRequest;
+import com.casic.missiles.dto.business.outsource.OutsourceProtocolSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
+import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.model.business.BizBusinessOutsourceProtocol;
+import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
+import com.casic.missiles.service.IGeneralApprovalService;
+import com.casic.missiles.service.business.IBizBusinessOutsourceProtocolService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.BindingResult;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.validation.Valid;
+import java.util.List;
+
+/**
+ * <p>
+ * 计量检定业务-分包管理-测试、校准或检定工作分包协议书 前端控制器
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-08-24
+ */
+@Api(tags = "分包管理-测试、校准或检定工作分包协议书")
+@RestController
+@RequestMapping("/business/outsource/protocol")
+public class BizBusinessOutsourceProtocolController extends GeneralApprovalController<BizBusinessOutsourceProtocol, BizBusinessOutsourceProtocol, OutsourceProtocolApprovalListRequest, BaseApprovalSubmitRequest> {
+    @Autowired
+    private IBizBusinessOutsourceProtocolService outsourceProtocolService;
+
+    public BizBusinessOutsourceProtocolController(IGeneralApprovalService<BizBusinessOutsourceProtocol, BizBusinessOutsourceProtocol, OutsourceProtocolApprovalListRequest, BaseApprovalSubmitRequest> baseApprovalService) {
+        super(baseApprovalService);
+    }
+
+    @ApiOperation("草稿箱-保存")
+    @PostMapping("/save")
+    public ReturnDTO<OutsourceProtocolSaveResponse> saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceProtocol request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        return outsourceProtocolService.saveOutsourceProtocol(request);
+    }
+
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody OutsourceProtocolApprovalListRequest request) throws Exception {
+        List<BizBusinessOutsourceProtocol> list = super.exportList(request);
+        super.exportExcel(BizBusinessOutsourceProtocol.class, list, ExportEnum.OUTSOURCE_PROTOCOL.getSheetName());
+    }
+}
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java
index 097f645..f0f0943 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java
@@ -17,7 +17,6 @@
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.IGeneralApprovalService;
 import com.casic.missiles.service.business.IBizBusinessOutsourcerInfoService;
-import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -71,19 +70,8 @@
 
     @ApiOperation("分包方导出")
     @PostMapping("/listExport")
-    public void export(@RequestBody @Valid OutsourcerInfoApprovalListRequest request, BindingResult bindingResult) throws Exception {
-        if (bindingResult.hasErrors()) {
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        }
-        List<BizBusinessOutsourcerInfo> list;
-        if (!CollectionUtils.isEmpty(request.getIds())) {
-            list = outsourcerInfoService.listByIds(request.getIds());
-        } else {
-            list = outsourcerInfoService.list(request);
-        }
-        for (BizBusinessOutsourcerInfo record : list) {
-            DictCodeUtils.convertDictCodeToName(record);
-        }
+    public void export(@RequestBody OutsourcerInfoApprovalListRequest request) throws Exception {
+        List<BizBusinessOutsourcerInfo> list = super.exportList(request);
         super.exportExcel(BizBusinessOutsourcerInfo.class, list, ExportEnum.OUTSOURCER_EXPORT.getSheetName());
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java
index c2cbf9f..0410918 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java
@@ -17,11 +17,9 @@
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.IGeneralApprovalService;
 import com.casic.missiles.service.business.IBizBusinessSiteExecutiveInfoService;
-import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -60,7 +58,7 @@
         return siteExecutiveInfoService.saveSiteExecutiveInfo(siteExecutiveInfo);
     }
 
-    @ApiOperation("现场检测详情")
+    @ApiOperation("详情")
     @PostMapping("/detail")
     public ReturnDTO<SiteExecutiveDetailResponse> siteExecutiveDetail(@RequestBody @Valid IdDTO idDTO) throws Exception {
         Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
@@ -69,21 +67,10 @@
         return ReturnUtil.success(siteExecutiveInfoService.detail(idDTO.getId()));
     }
 
-    @ApiOperation("现场检测导出")
+    @ApiOperation("导出")
     @PostMapping("/listExport")
-    public void export(@RequestBody @Valid SiteExecutiveApprovalListRequest request, BindingResult bindingResult) throws Exception {
-        if (bindingResult.hasErrors()) {
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        }
-        List<SiteExecutiveApprovalListResponse> list;
-        if (!CollectionUtils.isEmpty(request.getIds())) {
-            list = siteExecutiveInfoService.listInfoByIds(request.getIds());
-        } else {
-            list = siteExecutiveInfoService.listInfo(request);
-        }
-        for (SiteExecutiveApprovalListResponse record : list) {
-            DictCodeUtils.convertDictCodeToName(record);
-        }
+    public void export(@RequestBody SiteExecutiveApprovalListRequest request) throws Exception {
+        List<SiteExecutiveApprovalListResponse> list = super.exportList(request);
         super.exportExcel(SiteExecutiveApprovalListResponse.class, list, ExportEnum.SITE_EXECUTIVE_EXPORT.getSheetName());
     }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
index 7e793cd..a92e209 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
@@ -55,7 +55,7 @@
 
     @ApiOperation("设备收发列表导出")
     @PostMapping("/export")
-    public void exportList(@RequestBody @Valid SampleDispatchListRequest request) throws IOException {
+    public void exportList(@RequestBody SampleDispatchListRequest request) throws IOException {
         List<SampleDispatchListResponse> list;
         if (!CollectionUtils.isEmpty(request.getIds())) {
             list = dispatchService.listByIds(request.getIds());
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java
index cdc77fc..d120fd4 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java
@@ -7,6 +7,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.business.labExecutive.*;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.business.IBusinessLabExecutiveInfoService;
@@ -14,6 +15,7 @@
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.*;
 
@@ -32,7 +34,7 @@
     @Autowired
     private IBusinessLabExecutiveInfoService labExecutiveInfoService;
 
-    @ApiOperation("实验室检测-部门检测-查询各状态列表（待检测、检测中、检测完）")
+    @ApiOperation("实验室任务-查询各状态列表（待检测、检测中、检测完）")
     @PostMapping("/deptExecutive/List")
     public ReturnDTO<PageInfoBT<SampleLabExecutiveListResponse>> queryDeptExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
@@ -43,10 +45,19 @@
         return ReturnUtil.success(super.packForBT(labExecutiveInfoService.deptLabExecutiveListPage(page, labExecutiveListRequest)));
     }
 
-    /**
-     * 实验室检测-我的检测-查询各状态列表（待检测、检测中、检测完）
-     */
-    @ApiOperation("实验室检测-我的检测-查询各状态列表（待检测、检测中、检测完）")
+    @ApiOperation("实验室任务导出")
+    @PostMapping("/deptExecutive/export")
+    public void deptExportList(@RequestBody @Valid SampleLabExecutiveListRequest request) throws Exception {
+        List<SampleLabExecutiveListResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = labExecutiveInfoService.deptLabExecutiveListByIds(request.getMeasureStatus(), request.getIds());
+        } else {
+            list = labExecutiveInfoService.deptLabExecutiveList(request);
+        }
+        super.exportExcel(SampleLabExecutiveListResponse.class, list, ExportEnum.DEPT_EXECUTIVE_TASK.getSheetName());
+    }
+
+    @ApiOperation("我的任务-查询各状态列表（待检测、检测中、检测完）")
     @PostMapping("/myExecutive/list")
     public ReturnDTO<PageInfoBT<SampleLabExecutiveListResponse>> queryMyExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
@@ -57,19 +68,25 @@
         return ReturnUtil.success(super.packForBT(labExecutiveInfoService.myLabExecutiveListPage(page, labExecutiveListRequest)));
     }
 
-    /**
-     * 实验室检测-我的检测-查询各状态样品数量（待检测、检测中、检测完）
-     */
-    @ApiOperation("实验室检测-我的检测-查询各状态样品数量（待检测、检测中、检测完）")
+    @ApiOperation("我的任务导出")
+    @PostMapping("/myExecutive/export")
+    public void exportList(@RequestBody @Valid SampleLabExecutiveListRequest request) throws Exception {
+        List<SampleLabExecutiveListResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = labExecutiveInfoService.myLabExecutiveListByIds(request.getMeasureStatus(), request.getIds());
+        } else {
+            list = labExecutiveInfoService.myLabExecutiveList(request);
+        }
+        super.exportExcel(SampleLabExecutiveListResponse.class, list, ExportEnum.MY_EXECUTIVE_TASK.getSheetName());
+    }
+
+    @ApiOperation("我的任务-查询各状态样品数量（待检测、检测中、检测完）")
     @GetMapping("/myExecutive/amount")
     public ReturnDTO<List<SampleAmountResponse>> queryMyExecutiveAmount() {
         return ReturnUtil.success(labExecutiveInfoService.myExecutiveAmount());
     }
 
-    /**
-     * 实验室检测-部门检测-分配（分配给具体人员）
-     */
-    @ApiOperation("实验室检测-部门检测-分配按钮（分配给具体人员）")
+    @ApiOperation("实验室任务-分配按钮（分配给具体人员）")
     @PostMapping("/deptExecutive/allocate")
     public ReturnDTO allocateStaff(@RequestBody @Valid SampleAllocateRequest sampleAllocateRequest, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -78,10 +95,7 @@
         return labExecutiveInfoService.allocateStaff(sampleAllocateRequest);
     }
 
-    /**
-     * 实验室检测-我的检测-检定人扫描收入（待检测->检测中）
-     */
-    @ApiOperation("实验室检测-我的检测-检定人扫描收入（待检测->检测中）")
+    @ApiOperation("我的任务-检定人扫描收入（待检测->检测中）")
     @PostMapping("/myExecutive/receive")
     public ReturnDTO sampleReceive(@RequestBody @Valid List<SampleOperateRequest> requestList, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -90,10 +104,7 @@
         return labExecutiveInfoService.sampleReceive(requestList);
     }
 
-    /**
-     * 实验室检测-负责人/检定人扫描检完（检测中->检测完）
-     */
-    @ApiOperation("实验室检测-负责人/检定人扫描检完（检测中->检测完）")
+    @ApiOperation("实验室任务-负责人/检定人扫描检完（检测中->检测完）")
     @PostMapping("/myExecutive/complete")
     public ReturnDTO sampleExecutiveComplete(@RequestBody @Valid List<SampleOperateRequest> requestList, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -102,10 +113,7 @@
         return labExecutiveInfoService.sampleExecutiveComplete(requestList);
     }
 
-    /**
-     * 实验室检测-部门检测/我的检测 编辑（只能修改应出具证书）
-     */
-    @ApiOperation("实验室检测-部门检测/我的检测 编辑（只能修改应出具证书）")
+    @ApiOperation("实验室任务/我的任务 编辑（只能修改应出具证书）")
     @PostMapping("/executive/update")
     public ReturnDTO updateExecutive(@RequestBody @Valid UpdateExecutiveRequest request, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -114,10 +122,7 @@
         return labExecutiveInfoService.updateExecutive(request);
     }
 
-    /**
-     * 实验室检测-部门检测/我的检测 详情
-     */
-    @ApiOperation("实验室检测-部门检测/我的检测 详情")
+    @ApiOperation("实验室任务/我的任务 详情")
     @PostMapping("/executive/detail")
     public ReturnDTO<ExecutiveDetailResponse> executiveDetail(@RequestBody @Valid ExecutiveDetailRequest request, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
@@ -131,7 +136,7 @@
      * 退回后会将下一个要执行的实验室检测状态更新为待分配，将后面的实验室顺序变更为连续（都进行减1）
      * 最后一个检测的实验室退回，等分发员再增加实验室或设备收发中的已收入直接手动点击完成
      */
-    @ApiOperation("实验室检测-部门检测/我的检测 退回（待检测/检测中->退回）")
+    @ApiOperation("实验室任务/我的任务 退回（待检测/检测中->退回）")
     @PostMapping("/executive/sendBack")
     public ReturnDTO executiveSendBack(@RequestBody @Valid ExecutiveSendBackRequest request, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -140,9 +145,6 @@
         return labExecutiveInfoService.sampleExecutiveSendBack(request);
     }
 
-    /**
-     * 分发员编辑实验室检测列表
-     */
     @ApiOperation("分发员编辑实验室检测列表")
     @PostMapping("/handOut/updateList")
     public ReturnDTO updateExecutiveList(@RequestBody @Valid UpdateExecutiveListRequest request, BindingResult bindingResult) {
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java
index 48a67ed..0c04f31 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java
@@ -10,6 +10,7 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.resource.customer.CustomerApprovalListRequest;
 import com.casic.missiles.dto.resource.customer.CustomerSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceCustomerInfo;
@@ -26,6 +27,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -55,6 +57,13 @@
         return customerInfoService.saveCustomerInfo(request);
     }
 
+    @ApiOperation("委托方名录导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody CustomerApprovalListRequest request) throws Exception {
+        List<BizResourceCustomerInfo> list = super.exportList(request);
+        super.exportExcel(BizResourceCustomerInfo.class, list, ExportEnum.CUSTOMER_INFO.getSheetName());
+    }
+
     @ApiOperation("委托方人员列表（分页）")
     @PostMapping("/person/listPage")
     public ReturnDTO<PageInfoBT<BizResourceCustomerStaff>> personListPage(@RequestBody IdDTO idDto) {
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
index 972ed4b..6418ea5 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
@@ -5,6 +5,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.resource.customer.SuggestFormApprovalListRequest;
 import com.casic.missiles.dto.resource.customer.SuggestFormSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceCustomerSuggestForm;
@@ -20,6 +21,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -50,4 +52,11 @@
         return suggestFormService.saveSuggestForm(request);
     }
 
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody SuggestFormApprovalListRequest request) throws Exception {
+        List<BizResourceCustomerSuggestForm> list = super.exportList(request);
+        super.exportExcel(BizResourceCustomerSuggestForm.class, list, ExportEnum.CUSTOMER_SUGGEST_FORM.getSheetName());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java
index 1934d1a..9e07eab 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java
@@ -15,12 +15,16 @@
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.resource.IEnvEnvironmentRecordConfigService;
 import com.casic.missiles.service.resource.IEnvEnvironmentRecordDataService;
+import com.casic.missiles.service.resource.IEnvLocationInfoService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
 import java.util.List;
@@ -39,6 +43,8 @@
     private IEnvEnvironmentRecordDataService environmentRecordDataService;
     @Autowired
     private IEnvEnvironmentRecordConfigService environmentRecordConfigService;
+    @Autowired
+    private IEnvLocationInfoService locationInfoService;
 
     @ApiOperation("环境记录单数据列表/详情")
     @PostMapping("/data/listPage")
@@ -95,4 +101,11 @@
         });
         return environmentRecordConfigService.deleteEnvironmentRecordConfig(idDTO.getId());
     }
+
+    @ApiOperation("地点列表")
+    @PostMapping("/location/listPage")
+    public ReturnDTO<PageInfoBT<LocationListResponse>> locationListPage(@RequestBody @Valid LocationListRequest request) {
+        Page<LocationListResponse> page = PageFactory.defaultPage();
+        return ReturnUtil.success(super.packForBT(locationInfoService.listPage(page, request)));
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java
index 82efe3f..e9561fa 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java
@@ -10,6 +10,7 @@
 import com.casic.missiles.dto.resource.seal.SealLogListRequest;
 import com.casic.missiles.dto.resource.seal.SealNoteApprovalListRequest;
 import com.casic.missiles.dto.resource.seal.SealNoteSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceSealUseLog;
@@ -27,6 +28,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -58,6 +60,13 @@
         return sealUseNoteService.saveSeal(request);
     }
 
+    @ApiOperation("印章使用登记导出（列表和导出中去掉经办人和监印人）")
+    @PostMapping("/listExport")
+    public void export(@RequestBody SealNoteApprovalListRequest request) throws Exception {
+        List<BizResourceSealUseNote> list = super.exportList(request);
+        super.exportExcel(BizResourceSealUseNote.class, list, ExportEnum.SEAL_NOTE.getSheetName());
+    }
+
     // TODO: 2023/7/28 印章使用日志：系统中使用印章时插入数据库
 
     @ApiOperation("印章使用日志列表（分页）")
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java
index 9b674fc..06b6521 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java
@@ -9,16 +9,20 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.resource.staff.StaffCertRequest;
 import com.casic.missiles.dto.resource.staff.StaffCertResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.service.resource.IBizResourceStaffInfoService;
 import com.casic.missiles.service.resource.IBizResourceStaffVerifierService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.List;
+
 /**
  * @Description:
  * @Author: wangpeng
@@ -41,9 +45,21 @@
         return ReturnUtil.success(super.packForBT(responsePage));
     }
 
+    @ApiOperation("证书逾期提醒导出")
+    @PostMapping("/listExport")
+    public void exportList(@RequestBody StaffCertRequest request) throws Exception {
+        List<StaffCertResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = staffInfoService.certListByIds(request.getIds());
+        } else {
+            list = staffInfoService.certList(request);
+        }
+        super.exportExcel(StaffCertResponse.class, list, ExportEnum.STAFF_CERTIFICATE_EXPIRE.getSheetName());
+    }
+
     @ApiOperation("证书逾期提醒")
     @PostMapping("/expirationReminder")
-    public ReturnDTO expirationReminder(@RequestBody IdDTO idDto) {
-        return verifierService.expirationReminder(idDto);
+    public ReturnDTO expirationReminder(@RequestBody IdDTO idDTO) {
+        return verifierService.expirationReminder(idDTO);
     }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java
index 3b251ad..a6e7850 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java
@@ -12,6 +12,7 @@
 import com.casic.missiles.dto.resource.staff.StaffListRequest;
 import com.casic.missiles.dto.resource.staff.TrainListRequest;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.*;
@@ -22,7 +23,10 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
 import java.util.List;
@@ -52,8 +56,19 @@
             throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
         }
         Page<BizResourceStaffInfo> page = PageFactory.defaultPage();
-        Page<BizResourceStaffInfo> responsePage = staffInfoService.listPage(page, request);
-        return ReturnUtil.success(super.packForBT(responsePage));
+        return ReturnUtil.success(super.packForBT(staffInfoService.listPage(page, request)));
+    }
+
+    @ApiOperation("人员登记导出")
+    @PostMapping("/listExport")
+    public void exportList(@RequestBody StaffListRequest request) throws Exception {
+        List<BizResourceStaffInfo> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = staffInfoService.listByIds(request.getIds());
+        } else {
+            list = staffInfoService.list(request);
+        }
+        super.exportExcel(BizResourceStaffInfo.class, list, ExportEnum.STAFF_INFO.getSheetName());
     }
 
     @ApiOperation("人员登记详情基础信息")
@@ -85,9 +100,9 @@
 
     @ApiOperation("科研教育列表（分页）")
     @PostMapping("/education/listPage")
-    public ReturnDTO<PageInfoBT<BizResourceStaffEducation>> educationListPage(@RequestBody IdDTO idDto) {
+    public ReturnDTO<PageInfoBT<BizResourceStaffEducation>> educationListPage(@RequestBody IdDTO idDTO) {
         Page<BizResourceStaffEducation> page = PageFactory.defaultPage();
-        Page<BizResourceStaffEducation> responsePage = staffInfoService.educationListPage(page, idDto);
+        Page<BizResourceStaffEducation> responsePage = staffInfoService.educationListPage(page, idDTO);
         return ReturnUtil.success(super.packForBT(responsePage));
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java
index af6aa86..d85d84a 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java
@@ -9,6 +9,7 @@
 import com.casic.missiles.dto.resource.outsideService.SupplierApprovalListRequest;
 import com.casic.missiles.dto.resource.outsideService.SupplierSaveResponse;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceSupplierAbility;
@@ -67,6 +68,13 @@
         return ReturnUtil.success(supplierInfoService.detail(idDTO.getId()));
     }
 
+    @ApiOperation("合格供方导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody SupplierApprovalListRequest request) throws Exception {
+        List<BizResourceSupplierInfo> list = super.exportList(request);
+        super.exportExcel(BizResourceSupplierInfo.class, list, ExportEnum.SUPPLIER_INFO.getSheetName());
+    }
+
     @ApiOperation("供方人员列表（分页）")
     @PostMapping("/person/listPage")
     public ReturnDTO<PageInfoBT<BizResourceSupplierPerson>> personListPage(@RequestBody IdDTO idDTO) {
diff --git a/casic-metering-api/src/main/resources/config/application.yml b/casic-metering-api/src/main/resources/config/application.yml
index 350db5f..ecff521 100644
--- a/casic-metering-api/src/main/resources/config/application.yml
+++ b/casic-metering-api/src/main/resources/config/application.yml
@@ -126,7 +126,7 @@
     #作者
     author: wangpeng
     #待生成对象表名
-    table-name: biz_equipment_technical_target_approval,biz_equipment_attachment_approval,biz_equipment_checkpoint_approval
+    table-name: biz_business_outsource_protocol
 
 reminder:
   #节点--common模块config包 ReminderNodeConfig配置
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
index 4a19e4e..d47d552 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
@@ -53,6 +53,7 @@
     SUGGEST_FORM_SAVE_FAILED(2509, "委托方意见登记表保存至草稿箱失败"),
     EXAMINE_FORM_SAVE_FAILED(2510, "要求、委托书及合同评审表保存至草稿箱失败"),
     CUSTOMER_EXIST_SAVE_FAILED(2511, "该委托方已存在，请重新选择"),
+    DUPLICATE_LOCATION_NO(2512, "地点编号已存在"),
 
     /**
      * 计量检定业务模块
@@ -68,6 +69,8 @@
     COMPLETE_SAMPLE_NOT_EXIST(2609, "检测中不存在扫描收入的样品"),
     CANNOT_CHANGE_MEASURE_INFO(2610, "无法更改非当前登录用户的检测信息"),
     NON_EXIST_ORDER_OR_SAMPLE(2611, "不存在该委托单或该委托单下的样品"),
+    OUTSOURCE_ACCESS_SAVE_FAILED(2612, "测试、校准或检定工作分包评审表保存至草稿箱失败"),
+    OUTSOURCE_PROTOCOL_SAVE_FAILED(2613, "测试、校准或检定工作分包协议书保存至草稿箱失败"),
 
     /**
      * 历史遗留备用
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
index 5089ad1..81a406b 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
@@ -10,54 +10,38 @@
     /**
      * 资源管理
      */
-    ENVIRONMENT_DATA_EXPORT("environmentData", "environmentData", "环境记录单数据"),
+    ENVIRONMENT_DATA_EXPORT("environmentData", "环境记录单数据", "环境记录单数据"),
+    STAFF_INFO("staffInfo", "人员登记", "人员登记"),
+    STAFF_CERTIFICATE_EXPIRE("certificateExpire", "证书逾期提醒", "证书逾期提醒"),
+    SUPPLIER_INFO("supplierInfo", "合格供方名录", "合格供方名录"),
+    CUSTOMER_INFO("customerInfo", "委托方名录", "委托方名录"),
+    CUSTOMER_SUGGEST_FORM("customerSuggestForm", "委托方意见登记表", "委托方意见登记表"),
+    SEAL_NOTE("sealNote", "印章使用登记", "印章使用登记"),
 
-    FILE_EXPORT("meterFileData", "meterFileData", "计量文件信息"),
-    TRAIN_PLAN_EXPORT("trainPlanData", "trainPlanData", "培训计划"),
-    TRAIN_LOG_EXPORT("trainLogData", "trainLogData", "培训记录"),
-    METER_ORGANIZE_EXPORT("meterOrganizeData", "meterOrganizeData", "计量组织"),
-    TRACE_SUPPLIER_EXPORT("traceSupplierData", "traceSupplierData", "溯源供方"),
-    SIGN_EXPORT("signData", "signData", "签名/签章"),
-    TEMPLATE_EXPORT("templateData", "templateData", "原始记录模板/证书报告模板"),
-    FIXED_ASSETS("meterFixedAssets", "meterFixedAssets", "固定资产"),
-    METER_EQUIPMENT("meterEquipment", "meterEquipment", "测量设备"),
-    CALIBRATION_TEST_EQUIPMENT("calibrationTestEquipment", "calibrationTestEquipment", "校准检定设备"),
-    MEASURE_ACCOUNT("measureAccount", "measureAccount", "测量工装"),
-    STANDARD_SUPPORT_EQUIPMENT("standardSupportEquipment", "standardSupportEquipment", "标准配套设备"),
-    STANDARD_EQUIPMENT("standardEquipment", "standardEquipment", "标准装置"),
-    FLOW_DEF_EXPORT("flowDefData", "flowDefData", "流程定义"),
-    STAFF_CERTIFICATE("certificate", "certificate", "计量人员证书"),
-    CHECK_INFO("checkInfo", "checkInfo", "设备管理点检测"),
-    EQUIPMENT_APPLY("equipmentApply", "equipmentApply", "设备借用"),
-    STANDARD_EQUIPMENT_REMIND("equipmentApplyRemind", "equipmentApplyRemind", "标准装置到期提醒"),
-    METER_PRICE("meterPrice", "meterPrice", "价格库"),
-    METER_STAFF("meterStaff", "meterStaff", "计量人员"),
-    STANDARD_EQUIPMENT_APPLY("standardEquipmentApply", "standardEquipmentApply", "标准装置申请"),
-    STATE_MANAGE_APPLY("stateManage", "stateManage", "状态管理"),
-    METER_ACCEPTANCE_CHECK("acceptanceCheck", "acceptanceCheck", "设备检修保养验收单"),
-    CUSTOMER_EXPORT("customerData", "customerData", "客户信息"),
-    ORDER_EXPORT("orderData", "orderData", "委托书信息"),
-    SAMPLE_EXPORT("sampleData", "sampleData", "样本信息"),
-    EXCHANGE_DATA("exchangeData", "exchangeData", "设备交接单"),
-    DISPATCH_DATA("dispatchData", "dispatchData", "设备收发"),
-    ENVIRONMENT_DATA("environmentData", "environmentData", "环境记录单"),
-    ORIGIN_DATA("originData", "originData", "原始记录"),
-    CERTIFICATE_REPORT("certificateReport", "certificateReport", "证书报告"),
-    ADVICE_EXPORT("adviceData", "adviceData", "客户反馈"),
-    HANDOUT_EXPORT("handoutData", "handoutData", "任务分发列表"),
-    OUTSOURCER_EXPORT("outsourcerData", "outsourcerData", "分包方"),
-    SITE_EXECUTIVE_EXPORT("siteExecutiveData", "siteExecutiveData", "现场测试、校准或检定"),
-    CERTIFICATE_PRINT_EXPORT("certificatePrintData", "certificatePrintData", "证书打印"),
-    DOWNLOAD_TEMPLATE("downloadTemplate", "downloadTemplate", "页面配置"),
-    OUTSOURCER_CERTIFICATE_EXPORT("outsourceCertificateData", "outsourceCertificateData", "分包证书"),
-    SETTLEMENT_INFO_EXPORT("settlementInfoData", "settlementInfoData", "业务结算"),
-    EQUIPMENT_REMIND("equipmentRemind", "equipmentRemind", "设备到期提醒"),
-    AGREEMENT_INFO_EXPORT("agreementInfoData", "agreementInfoData", "合同"),
-    WORK_STATISTICS_EXPORT("workStatisticsData", "workStatisticsData", "实时工作统计"),
-    DEPT_OUTPUT_EXPORT("deptOutputData", "deptOutputData", "部门产值分析"),
-    WORKLOAD_EXPORT("workloadData", "workloadData", "业务工作量分析"),
-    DEPT_COMPREHENSIVE_EXPORT("deptComprehensiveData", "deptComprehensiveData", "部门综合分析"),
-    ENVIRONMENTAL_RECORD("environmentalRecordData", "environmentalRecordData", "现场环境记录");
+    /**
+     * 计量检定业务
+     */
+    OUTSOURCER_EXPORT("outsourcerData", "分包方名录", "分包方名录"),
+    IDENTIFY_EXPORT("identifyData", "计量标识", "计量标识"),
+    ORDER_EXPORT("orderData", "任务单", "任务单"),
+    DISPATCH_DATA("dispatchData", "设备收发", "设备收发"),
+    HANDOUT_EXPORT("handoutData", "任务分发", "任务分发"),
+    SITE_EXECUTIVE_EXPORT("siteExecutiveData", "现场测试、校准或检定", "现场测试、校准或检定"),
+    CERTIFICATE_REPORT("certificateReport", "证书审批", "证书审批"),
+    CERTIFICATE_CHANGE_APPLY("certificateChangeApply", "证书报告补充或更换申请单", "证书报告补充或更换申请单"),
+    CERTIFICATE_PRINT("certificatePrintData", "证书打印审批", "证书打印审批"),
+    DEPT_EXECUTIVE_TASK("deptExecutiveTaskData", "实验室任务", "实验室任务"),
+    MY_EXECUTIVE_TASK("myExecutiveTaskData", "我的任务", "我的任务"),
+    OUTSOURCE_ASSESS("outsourceAssess", "测试、校准或检定工作分包评审表", "测试、校准或检定工作分包评审表"),
+    OUTSOURCE_PROTOCOL("outsourceProtocol", "测试、校准或检定工作分包协议书", "测试、校准或检定工作分包协议书"),
+
+    /**
+     * 系统管理
+     */
+    SIGN_EXPORT("signData", "签名", "签名"),
+    TEMPLATE_EXPORT("templateData", "文件模板", "文件模板"),
+    FLOW_DEF_EXPORT("flowDefData", "流程定义", "流程定义"),
+    DOWNLOAD_TEMPLATE("downloadTemplate", "流程定义", "页面配置");
 
     ExportEnum(String fileName, String sheetName, String description) {
         this.fileName = fileName;
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateRecordTypeCodeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateRecordTypeCodeEnum.java
index 31d913c..a963522 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateRecordTypeCodeEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateRecordTypeCodeEnum.java
@@ -46,4 +46,14 @@
     String SITE_EXECUTIVE_APPROVAL = "01";
     //《现场测试、校准或检定工作记录表》
     String SITE_EXECUTIVE_LOG = "02";
+
+    //测试、校准或检定工作分包协议书
+    String OUTSOURCE_PROTOCOL = "01";
+    //测试、校准或检定工作分包评审表
+    String OUTSOURCE_ACCESS = "02";
+    //测试、校准或检定工作分包通知书
+    String OUTSOURCE_NOTICE = "03";
+    //测试、校准或检定工作分包方名录
+    String OUTSOURCE_INFO = "04";
+
 }
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
index 24b8635..f78bd53 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
@@ -15,6 +15,10 @@
     String CERTIFICATE_CHANGE_APPLY_BEAN_NAME = "certificateChangeApplyBean";
     //现场测试、校准或检定
     String SITE_EXECUTIVE_BEAN_NAME = "siteExecutiveBean";
+    //测试、校准或检定工作分包评审表
+    String OUTSOURCE_ASSESS_BEAN_NAME = "outsourceAssessBean";
+    //测试、校准或检定工作分包协议书
+    String OUTSOURCE_PROTOCOL_BEAN_NAME = "outsourceProtocolBean";
 
     /*********************************设备与装置************************************/
     //设备台账
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 b21c661..6b86fd1 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
@@ -18,6 +18,8 @@
     OUTSOURCER_APPROVAL(OUTSOURCER_BEAN_NAME, ""),
     CERTIFICATE_CHANGE_APPROVAL(CERTIFICATE_CHANGE_APPLY_BEAN_NAME, ""),
     SITE_EXECUTIVE_APPROVAL(SITE_EXECUTIVE_BEAN_NAME, ""),
+    OUTSOURCE_ASSESS_APPROVAL(OUTSOURCE_ASSESS_BEAN_NAME, ""),
+    OUTSOURCE_PROTOCOL_APPROVAL(OUTSOURCE_PROTOCOL_BEAN_NAME, ""),
 
     ACTION_STATUS_MAP(new HashMap<String, AwareActionStatusEnum>() {
         {
@@ -47,6 +49,10 @@
             put(ApplyFromIdEnum.CERTIFICATE_CHANGE_APPROVAL.getCode(), CERTIFICATE_CHANGE_APPROVAL);
             //现场测试、校准或检定审批
             put(ApplyFromIdEnum.SITE_EXECUTIVE_APPROVAL.getCode(), SITE_EXECUTIVE_APPROVAL);
+            //测试、校准或检定工作分包评审表
+            put(ApplyFromIdEnum.OUTSOURCE_ASSESS_APPROVAL.getCode(), OUTSOURCE_ASSESS_APPROVAL);
+            //测试、校准或检定工作分包协议书
+            put(ApplyFromIdEnum.OUTSOURCE_PROTOCOL_APPROVAL.getCode(), OUTSOURCE_PROTOCOL_APPROVAL);
         }
     });
     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 934405e..c7410bd 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
@@ -9,6 +9,8 @@
     CERTIFICATE_CHANGE_APPROVAL("jljdywzsbchghsqd", MessageSourceModuleEnum.BUSINESS.getCode(), "证书/报告补充或更换申请单"),
     OUTSOURCER_APPROVAL("jljdywcsjzhgfbfml", MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定合格分包方名录"),
     SITE_EXECUTIVE_APPROVAL("jljdywxccsjzsp", MessageSourceModuleEnum.BUSINESS.getCode(), "现场测试、校准或检定审批"),
+    OUTSOURCE_ASSESS_APPROVAL("jljdywcsjzfbpsb", MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包评审表"),
+    OUTSOURCE_PROTOCOL_APPROVAL("jljdywcsjzfbxys", MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包协议书"),
 
 
     /*******************************************设备与装置*********************************************/
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/GeneralApprovalMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/GeneralApprovalMapper.java
index 4fb7344..0c9d6ae 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/GeneralApprovalMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/GeneralApprovalMapper.java
@@ -17,8 +17,4 @@
 
     Page<O> selectBatchForApprovalList(Page<O> page, @Param("request") R request, @Param("businessKeys") List<String> businessKeys);
 
-//    Page<O> selectListPage(Page<O> page, @Param("request") R request);
-
-//    Long selectMaxNo();
-
 }
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceAssessMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceAssessMapper.java
index 7867bb8..ba59009 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceAssessMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceAssessMapper.java
@@ -1,7 +1,12 @@
 package com.casic.missiles.mapper.business;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.business.outsource.OutsourceAssessApprovalListRequest;
+import com.casic.missiles.mapper.GeneralApprovalMapper;
 import com.casic.missiles.model.business.BizBusinessOutsourceAssess;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * <p>
@@ -11,6 +16,10 @@
  * @author wangpeng
  * @since 2023-08-16
  */
-public interface BizBusinessOutsourceAssessMapper extends BaseMapper<BizBusinessOutsourceAssess> {
+public interface BizBusinessOutsourceAssessMapper extends GeneralApprovalMapper<BizBusinessOutsourceAssess, BizBusinessOutsourceAssess, OutsourceAssessApprovalListRequest> {
+
+    Page<BizBusinessOutsourceAssess> selectBatchForApprovalList(Page<BizBusinessOutsourceAssess> page, @Param("request") OutsourceAssessApprovalListRequest request, @Param("businessKeys") List<String> businessKeys);
+
+    Long selectMaxProjectNo();
 
 }
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceProtocolMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceProtocolMapper.java
new file mode 100644
index 0000000..e6aba35
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceProtocolMapper.java
@@ -0,0 +1,24 @@
+package com.casic.missiles.mapper.business;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.business.outsource.OutsourceProtocolApprovalListRequest;
+import com.casic.missiles.mapper.GeneralApprovalMapper;
+import com.casic.missiles.model.business.BizBusinessOutsourceProtocol;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 计量检定业务-分包管理-测试、校准或检定工作分包协议书 Mapper 接口
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-08-24
+ */
+public interface BizBusinessOutsourceProtocolMapper extends GeneralApprovalMapper<BizBusinessOutsourceProtocol, BizBusinessOutsourceProtocol, OutsourceProtocolApprovalListRequest> {
+
+    Page<BizBusinessOutsourceProtocol> selectBatchForApprovalList(Page<BizBusinessOutsourceProtocol> page, @Param("request") OutsourceProtocolApprovalListRequest request, @Param("businessKeys") List<String> businessKeys);
+
+    Long selectMaxProtocolNo();
+}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/EnvLocationInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/EnvLocationInfoMapper.java
new file mode 100644
index 0000000..49eff87
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/EnvLocationInfoMapper.java
@@ -0,0 +1,21 @@
+package com.casic.missiles.mapper.resource;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.resource.environment.LocationListRequest;
+import com.casic.missiles.dto.resource.environment.LocationListResponse;
+import com.casic.missiles.model.resource.EnvLocationInfo;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * <p>
+ * 实验室环境监控系统-设备表 Mapper 接口
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-06-07
+ */
+public interface EnvLocationInfoMapper extends BaseMapper<EnvLocationInfo> {
+
+    Page<LocationListResponse> selectLocationListPage(Page<LocationListResponse> page, @Param("request") LocationListRequest request);
+}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java
index de124db..85ed0f7 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java
@@ -1,7 +1,9 @@
 package com.casic.missiles.mapper.system;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.dto.system.SignDetailResponse;
+import com.casic.missiles.dto.system.SignListRequest;
 import com.casic.missiles.model.system.SystemSign;
 import org.apache.ibatis.annotations.Param;
 
@@ -22,4 +24,8 @@
     SignDetailResponse selectSignDetailById(Long id);
 
     List<SystemSign> selectUsableSignList(@Param("userId") Long userId);
+
+    Page<SystemSign> selectSignListPage(Page<SystemSign> page, @Param("request") SignListRequest request);
+
+    List<SystemSign> selectSignList(@Param("request") SignListRequest request);
 }
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateChangeApplyMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateChangeApplyMapper.xml
index d798447..c496092 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateChangeApplyMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateChangeApplyMapper.xml
@@ -30,31 +30,31 @@
         SELECT *
         FROM biz_business_certificate_change_apply
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.changeApplyNo != null and request.changeApplyNo !=''">
+        <if test="request != null and request.changeApplyNo != null and request.changeApplyNo !=''">
             and change_apply_no like concat('%',#{request.changeApplyNo},'%')
         </if>
-        <if test="request.changeReportNo != null and request.changeReportNo !=''">
+        <if test="request != null and request.changeReportNo != null and request.changeReportNo !=''">
             and change_report_no like concat('%',#{request.changeReportNo},'%')
         </if>
-        <if test="request.changeReportName != null and request.changeReportName !=''">
+        <if test="request != null and request.changeReportName != null and request.changeReportName !=''">
             and change_report_name like concat('%',#{request.changeReportName},'%')
         </if>
-        <if test="request.changeType != null and request.changeType !=''">
+        <if test="request != null and request.changeType != null and request.changeType !=''">
             and change_type = #{request.changeType}
         </if>
-        <if test="request.createUserName != null and request.createUserName !=''">
+        <if test="request != null and request.createUserName != null and request.createUserName !=''">
             and create_user_name like concat('%',#{request.createUserName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificatePrintMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificatePrintMapper.xml
index b66cd99..49c0ac8 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificatePrintMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificatePrintMapper.xml
@@ -31,34 +31,34 @@
         LEFT JOIN biz_business_order_sample_relation bosr ON (bosr.order_id = bcr.order_id AND bosr.sample_id = bcr.sample_id)
         LEFT JOIN biz_business_order_info boi ON boi.id = bosr.order_id
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and bcp.approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.printStatus != null and request.printStatus !=''">
+        <if test="request != null and request.printStatus != null and request.printStatus !=''">
             and print_status = #{request.printStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and bcp.create_user_id = #{request.createUserId}
         </if>
-        <if test="request.certificateReportNo != null and request.certificateReportNo !=''">
+        <if test="request != null and request.certificateReportNo != null and request.certificateReportNo !=''">
             and bcr.certificate_report_no like concat('%',#{request.certificateReportNo},'%')
         </if>
-        <if test="request.certificateReportName != null and request.certificateReportName !=''">
+        <if test="request != null and request.certificateReportName != null and request.certificateReportName !=''">
             and bcr.certificate_report_name like concat('%',#{request.certificateReportName},'%')
         </if>
-        <if test="request.customerName != null and request.customerName !=''">
+        <if test="request != null and request.customerName != null and request.customerName !=''">
             and boi.customer_name like concat('%',#{request.customerName},'%')
         </if>
-        <if test="request.sampleNo != null and request.sampleNo !=''">
+        <if test="request != null and request.sampleNo != null and request.sampleNo !=''">
             and bosr.sample_no like concat('%',#{request.sampleNo},'%')
         </if>
-        <if test="request.sampleName != null and request.sampleName !=''">
+        <if test="request != null and request.sampleName != null and request.sampleName !=''">
             and bosr.sample_name like concat('%',#{request.sampleName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and bcp.create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and bcp.create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml
index b366034..767695d 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml
@@ -46,33 +46,37 @@
         SELECT bcr.*, bosr.sample_no, bosr.sample_name, bosr.sample_model, rsi.staff_name
         FROM biz_business_certificate_report bcr
         LEFT JOIN biz_business_order_sample_relation bosr ON (bosr.order_id = bcr.order_id AND bosr.sample_id = bcr.sample_id)
+        LEFT JOIN biz_business_order_info boi ON boi.id = bcr.order_id
         LEFT JOIN biz_resource_staff_info rsi ON rsi.id = bcr.measure_person_id
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and bcr.approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and bcr.create_user_id = #{request.createUserId}
         </if>
-        <if test="request.certificateReportNo != null and request.certificateReportNo !=''">
+        <if test="request != null and request.customerId != null and request.customerId !=''">
+            and boi.customer_id = #{request.customerId}
+        </if>
+        <if test="request != null and request.certificateReportNo != null and request.certificateReportNo !=''">
             and bcr.certificate_report_no like concat('%',#{request.certificateReportNo},'%')
         </if>
-        <if test="request.certificateReportName != null and request.certificateReportName !=''">
+        <if test="request != null and request.certificateReportName != null and request.certificateReportName !=''">
             and bcr.certificate_report_name like concat('%',#{request.certificateReportName},'%')
         </if>
-        <if test="request.sampleNo != null and request.sampleNo !=''">
+        <if test="request != null and request.sampleNo != null and request.sampleNo !=''">
             and bosr.sample_no like concat('%',#{request.sampleNo},'%')
         </if>
-        <if test="request.measureCategory != null and request.measureCategory !=''">
+        <if test="request != null and request.measureCategory != null and request.measureCategory !=''">
             and bcr.measure_category = #{request.measureCategory}
         </if>
-        <if test="request.measurePerson != null and request.measurePerson !=''">
+        <if test="request != null and request.measurePerson != null and request.measurePerson !=''">
             and rsi.staff_name like concat('%',#{request.measurePerson},'%')
         </if>
-        <if test="request.calibrationTimeStart != null and request.calibrationTimeStart !=''">
+        <if test="request != null and request.calibrationTimeStart != null and request.calibrationTimeStart !=''">
             and bcr.calibration_time &gt;= #{request.calibrationTimeStart}
         </if>
-        <if test="request.calibrationTimeEnd != null and request.calibrationTimeEnd !=''">
+        <if test="request != null and request.calibrationTimeEnd != null and request.calibrationTimeEnd !=''">
             and bcr.calibration_time &lt;= #{request.calibrationTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceAssessMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceAssessMapper.xml
index d0fcf8b..c22c101 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceAssessMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceAssessMapper.xml
@@ -7,6 +7,8 @@
         <id column="id" property="id" />
         <result column="project_no" property="projectNo" />
         <result column="project_name" property="projectName" />
+        <result column="lab_code" property="labCode" />
+        <result column="group_code" property="groupCode" />
         <result column="applicant_id" property="applicantId" />
         <result column="applicant_name" property="applicantName" />
         <result column="applicant_time" property="applicantTime" />
@@ -31,7 +33,45 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, project_no, project_name, applicant_id, applicant_name, applicant_time, minio_file_name, remark, create_user_id, create_user_name, outsourcer_id, pre_start_time, pre_end_time, outsource_reason, pre_cost, approval_status, process_id, approve_situation, traceability, test_method, technique_ability, create_time, update_time
+        id, project_no, project_name, lab_code, group_code, applicant_id, applicant_name, applicant_time, minio_file_name, remark, create_user_id, create_user_name, outsourcer_id, pre_start_time, pre_end_time, outsource_reason, pre_cost, approval_status, process_id, approve_situation, traceability, test_method, technique_ability, create_time, update_time
     </sql>
 
+    <select id="selectMaxProjectNo" resultType="java.lang.Long">
+        SELECT IFNULL(max(RIGHT(project_no, 3)), 0) from biz_business_outsource_assess
+    </select>
+
+    <select id="selectBatchForApprovalList" resultMap="BaseResultMap">
+        SELECT bboa.*, bboi.outsourcer_name, bboi.director
+        FROM biz_business_outsource_assess bboa
+        LEFT JOIN biz_business_outsourcer_info bboi ON bboa.outsourcer_id = bboi.id
+        WHERE 1=1
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
+            and bboa.approval_status = #{request.approvalStatus}
+        </if>
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
+            and bboa.create_user_id = #{request.createUserId}
+        </if>
+        <if test="request != null and request.projectNo != null and request.projectNo !=''">
+            and bboa.project_no like concat('%',#{request.projectNo},'%')
+        </if>
+        <if test="request != null and request.outsourcerName != null and request.outsourcerName !=''">
+            and bboi.outsourcer_name like concat('%',#{request.outsourcerName},'%')
+        </if>
+        <if test="request != null and request.applicantName != null and request.applicantName !=''">
+            and bboa.applicant_name like concat('%',#{request.applicantName},'%')
+        </if>
+        <if test="request != null and request.applicantTimeStart != null and request.applicantTimeStart !=''">
+            and bboa.applicant_time &gt;= #{request.applicantTimeStart}
+        </if>
+        <if test="request != null and request.applicantTimeEnd != null and request.applicantTimeEnd !=''">
+            and bboa.applicant_time &lt;= #{request.applicantTimeEnd}
+        </if>
+        <if test="businessKeys != null">
+            and bboa.id in
+            <foreach collection="businessKeys" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
+        ORDER BY bboa.create_time DESC
+    </select>
 </mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceProtocolMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceProtocolMapper.xml
new file mode 100644
index 0000000..b7b2149
--- /dev/null
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceProtocolMapper.xml
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.mapper.business.BizBusinessOutsourceProtocolMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.business.BizBusinessOutsourceProtocol">
+        <id column="id" property="id" />
+        <result column="protocol_no" property="protocolNo" />
+        <result column="project_name" property="projectName" />
+        <result column="lab_code" property="labCode" />
+        <result column="group_code" property="groupCode" />
+        <result column="outsourcer_id" property="outsourcerId" />
+        <result column="remark" property="remark" />
+        <result column="outsource_no" property="outsourceNo" />
+        <result column="outsource_name" property="outsourceName" />
+        <result column="contacts" property="contacts" />
+        <result column="mobile" property="mobile" />
+        <result column="address" property="address" />
+        <result column="require_date" property="requireDate" />
+        <result column="outsource_cost" property="outsourceCost" />
+        <result column="director" property="director" />
+        <result column="item" property="item" />
+        <result column="requires" property="requires" />
+        <result column="create_user_id" property="createUserId" />
+        <result column="create_user_name" property="createUserName" />
+        <result column="approval_status" property="approvalStatus" />
+        <result column="process_id" property="processId" />
+        <result column="create_time" property="createTime" />
+        <result column="update_time" property="updateTime" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, protocol_no, project_name, lab_code, group_code, outsourcer_id, remark, outsource_no, outsource_name, contacts, mobile, address, require_date, outsource_cost, director, item, requires, create_user_id, create_user_name, approval_status, process_id, create_time, update_time
+    </sql>
+
+    <select id="selectMaxProtocolNo" resultType="java.lang.Long">
+        SELECT IFNULL(max(RIGHT(protocol_no, 3)), 0) from biz_business_outsource_protocol
+    </select>
+
+    <select id="selectBatchForApprovalList" resultMap="BaseResultMap">
+        SELECT *
+        FROM biz_business_outsource_protocol
+        WHERE 1=1
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
+            and approval_status = #{request.approvalStatus}
+        </if>
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
+            and create_user_id = #{request.createUserId}
+        </if>
+        <if test="request != null and request.protocolNo != null and request.protocolNo !=''">
+            and protocol_no like concat('%',#{request.protocolNo},'%')
+        </if>
+        <if test="request != null and request.outsourcerName != null and request.outsourcerName !=''">
+            and outsourcer_name like concat('%',#{request.outsourcerName},'%')
+        </if>
+        <if test="request != null and request.applicantName != null and request.applicantName !=''">
+            and create_user_name like concat('%',#{request.applicantName},'%')
+        </if>
+        <if test="request != null and request.applicantTimeStart != null and request.applicantTimeStart !=''">
+            and create_time &gt;= #{request.applicantTimeStart}
+        </if>
+        <if test="request != null and request.applicantTimeEnd != null and request.applicantTimeEnd !=''">
+            and create_time &lt;= #{request.applicantTimeEnd}
+        </if>
+        <if test="businessKeys != null">
+            and id in
+            <foreach collection="businessKeys" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
+        ORDER BY create_time DESC
+    </select>
+</mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourcerInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourcerInfoMapper.xml
index 510a80b..3049b54 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourcerInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourcerInfoMapper.xml
@@ -7,6 +7,8 @@
         <id column="id" property="id" />
         <result column="outsourcer_no" property="outsourcerNo" />
         <result column="outsourcer_name" property="outsourcerName" />
+        <result column="lab_code" property="labCode" />
+        <result column="group_code" property="groupCode" />
         <result column="outsourcer_brief_name" property="outsourcerBriefName" />
         <result column="outsourcer_size" property="outsourcerSize" />
         <result column="business_size" property="businessSize" />
@@ -55,32 +57,32 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, outsourcer_no, outsourcer_name, outsourcer_brief_name, outsourcer_size, business_size, grade, evaluation, tax_number, bank_account, bank_name, bank_account_number, postal_code, director, phone, fax, mobile, email, website, address_country, address_province, address_city, address_area, full_address, address_country_name, address_province_name, address_city_name, address_area_name, invoice_country, invoice_province, invoice_city, invoice_area, invoice_full_address, invoice_country_name, invoice_province_name, invoice_city_name, invoice_area_name, business_scope, business_content, minio_file_name, approval_status, process_id, remark, create_user_id, create_user_name, create_time, update_time
+        id, outsourcer_no, outsourcer_name, lab_code, group_code, outsourcer_brief_name, outsourcer_size, business_size, grade, evaluation, tax_number, bank_account, bank_name, bank_account_number, postal_code, director, phone, fax, mobile, email, website, address_country, address_province, address_city, address_area, full_address, address_country_name, address_province_name, address_city_name, address_area_name, invoice_country, invoice_province, invoice_city, invoice_area, invoice_full_address, invoice_country_name, invoice_province_name, invoice_city_name, invoice_area_name, business_scope, business_content, minio_file_name, approval_status, process_id, remark, create_user_id, create_user_name, create_time, update_time
     </sql>
 
     <select id="selectBatchForApprovalList" resultMap="BaseResultMap">
         SELECT *
         FROM biz_business_outsourcer_info
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.outsourcerNo != null and request.outsourcerNo !=''">
+        <if test="request != null and request.outsourcerNo != null and request.outsourcerNo !=''">
             and outsourcer_no like concat('%',#{request.outsourcerNo},'%')
         </if>
-        <if test="request.outsourcerName != null and request.outsourcerName !=''">
+        <if test="request != null and request.outsourcerName != null and request.outsourcerName !=''">
             and outsourcer_name like concat('%',#{request.outsourcerName},'%')
         </if>
-        <if test="request.director != null and request.director !=''">
+        <if test="request != null and request.director != null and request.director !=''">
             and director like concat('%',#{request.director},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
@@ -93,6 +95,6 @@
     </select>
 
     <select id="selectMaxNo" resultType="java.lang.Long">
-        SELECT IFNULL(max(RIGHT(outsourcer_no, 12)), 0) from biz_business_outsourcer_info
+        SELECT IFNULL(max(RIGHT(outsourcer_no, 3)), 0) from biz_business_outsourcer_info
     </select>
 </mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessSiteExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessSiteExecutiveInfoMapper.xml
index 135c5d0..3c5ae79 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessSiteExecutiveInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessSiteExecutiveInfoMapper.xml
@@ -38,25 +38,25 @@
         FROM biz_business_site_executive_info bsei
         LEFT JOIN biz_resource_customer_info rci ON bsei.customer_id = rci.id
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and bsei.approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and bsei.create_user_id = #{request.createUserId}
         </if>
-        <if test="request.siteExecutiveNo != null and request.siteExecutiveNo !=''">
+        <if test="request != null and request.siteExecutiveNo != null and request.siteExecutiveNo !=''">
             and bsei.site_executive_no like concat('%',#{request.siteExecutiveNo},'%')
         </if>
-        <if test="request.customerName != null and request.customerName !=''">
+        <if test="request != null and request.customerName != null and request.customerName !=''">
             and rci.outsourcer_name like concat('%',#{request.customerName},'%')
         </if>
-        <if test="request.applyName != null and request.applyName !=''">
+        <if test="request != null and request.applyName != null and request.applyName !=''">
             and bsei.apply_name like concat('%',#{request.applyName},'%')
         </if>
-        <if test="request.applyTimeStart != null and request.applyTimeStart !=''">
+        <if test="request != null and request.applyTimeStart != null and request.applyTimeStart !=''">
             and bsei.apply_time &gt;= #{request.applyTimeStart}
         </if>
-        <if test="request.applyTimeEnd != null and request.applyTimeEnd !=''">
+        <if test="request != null and request.applyTimeEnd != null and request.applyTimeEnd !=''">
             and bsei.apply_time &lt;= #{request.applyTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml
index 84d9e2a..6bd38a9 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml
@@ -105,6 +105,12 @@
         <if test="request.isUrgent != null and request.isUrgent !=''">
             AND bo.is_urgent = #{request.isUrgent}
         </if>
+        <if test="request.ids != null">
+            and blei.id in
+            <foreach collection="request.ids" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
         ORDER BY blei.update_time DESC
     </select>
 
@@ -137,6 +143,12 @@
         <if test="request.isUrgent != null and request.isUrgent !=''">
             AND bo.is_urgent = #{request.isUrgent}
         </if>
+        <if test="request.ids != null">
+            and blei.id in
+            <foreach collection="request.ids" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
         ORDER BY blei.update_time DESC
     </select>
 
diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardInfoMapper.xml
index 1a5551b..2ed8d17 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardInfoMapper.xml
@@ -45,12 +45,6 @@
         FROM biz_equipment_standard_info besi
         LEFT JOIN biz_equipment_standard_technology_relation bestr ON besi.standard_no = bestr.standard_no
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
-            and besi.approval_status = #{request.approvalStatus}
-        </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
-            and besi.create_user_id = #{request.createUserId}
-        </if>
         <if test="request.standardName != null and request.standardName !=''">
             and besi.standard_name like concat('%',#{request.standardName},'%')
         </if>
diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardTechnologyRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardTechnologyRelationMapper.xml
index fc7e16c..cd03c8c 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardTechnologyRelationMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardTechnologyRelationMapper.xml
@@ -6,6 +6,7 @@
     <resultMap id="BaseResultMap" type="com.casic.missiles.model.equipment.BizEquipmentStandardTechnologyRelation">
         <id column="id" property="id" />
         <result column="technology_file_id" property="technologyFileId" />
+        <result column="technology_file_no" property="technologyFileNo" />
         <result column="technology_file_name" property="technologyFileName" />
         <result column="standard_id" property="standardId" />
         <result column="standard_no" property="standardNo" />
@@ -14,7 +15,7 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, technology_file_id, technology_file_name, standard_id, remark
+        id, technology_file_id, technology_file_no, technology_file_name, standard_id, remark
     </sql>
 
 </mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceAuthorizeOrderMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceAuthorizeOrderMapper.xml
index ac5176c..554fe65 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceAuthorizeOrderMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceAuthorizeOrderMapper.xml
@@ -32,22 +32,22 @@
         SELECT *
         FROM biz_resource_authorize_order
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.orderNo != null and request.orderNo !=''">
+        <if test="request != null and request.orderNo != null and request.orderNo !=''">
             and order_no like concat('%',#{request.orderNo},'%')
         </if>
-        <if test="request.createUserName != null and request.createUserName !=''">
+        <if test="request != null and request.createUserName != null and request.createUserName !=''">
             and create_user_name like concat('%',#{request.createUserName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerExamineFormMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerExamineFormMapper.xml
index ab242f6..af7f98f 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerExamineFormMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerExamineFormMapper.xml
@@ -41,28 +41,28 @@
         SELECT *
         FROM biz_resource_customer_examine_form
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.formNo != null and request.formNo !=''">
+        <if test="request != null and request.formNo != null and request.formNo !=''">
             and form_no like concat('%',#{request.formNo},'%')
         </if>
-        <if test="request.labCode != null and request.labCode !=''">
+        <if test="request != null and request.labCode != null and request.labCode !=''">
             and lab_code like concat('%',#{request.labCode},'%')
         </if>
-        <if test="request.groupCode != null and request.groupCode !=''">
+        <if test="request != null and request.groupCode != null and request.groupCode !=''">
             and group_code like concat('%',#{request.groupCode},'%')
         </if>
-        <if test="request.createUserName != null and request.createUserName !=''">
+        <if test="request != null and request.createUserName != null and request.createUserName !=''">
             and create_user_name like concat('%',#{request.createUserName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerInfoMapper.xml
index fa8ffbc..06a2798 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerInfoMapper.xml
@@ -33,25 +33,25 @@
         SELECT *
         FROM biz_resource_customer_info
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.customerNo != null and request.customerNo !=''">
+        <if test="request != null and request.customerNo != null and request.customerNo !=''">
             and customer_no like concat('%',#{request.customerNo},'%')
         </if>
-        <if test="request.customerName != null and request.customerName !=''">
+        <if test="request != null and request.customerName != null and request.customerName !=''">
             and customer_name like concat('%',#{request.customerName},'%')
         </if>
-        <if test="request.contacts != null and request.contacts !=''">
+        <if test="request != null and request.contacts != null and request.contacts !=''">
             and contacts like concat('%',#{request.contacts},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerSuggestFormMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerSuggestFormMapper.xml
index 28f5bb2..1806662 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerSuggestFormMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerSuggestFormMapper.xml
@@ -33,28 +33,28 @@
         SELECT *
         FROM biz_resource_customer_suggest_form
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.formNo != null and request.formNo !=''">
+        <if test="request != null and request.formNo != null and request.formNo !=''">
             and form_no like concat('%',#{request.formNo},'%')
         </if>
-        <if test="request.customerName != null and request.customerName !=''">
+        <if test="request != null and request.customerName != null and request.customerName !=''">
             and customer_name like concat('%',#{request.customerName},'%')
         </if>
-        <if test="request.customerDeptName != null and request.customerDeptName !=''">
+        <if test="request != null and request.customerDeptName != null and request.customerDeptName !=''">
             and customer_dept_name like concat('%',#{request.customerDeptName},'%')
         </if>
-        <if test="request.createUserName != null and request.createUserName !=''">
+        <if test="request != null and request.createUserName != null and request.createUserName !=''">
             and create_user_name like concat('%',#{request.createUserName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSealUseNoteMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSealUseNoteMapper.xml
index ab37bc1..b02bb33 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSealUseNoteMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSealUseNoteMapper.xml
@@ -29,32 +29,32 @@
     </sql>
 
     <select id="selectBatchForApprovalList" resultMap="BaseResultMap">
-        SELECT *
+        SELECT brsun.*, brsi.seal_name, brsi.seal_type, brsi.approver_name
         FROM biz_resource_seal_use_note brsun
         JOIN biz_resource_seal_info brsi ON brsun.seal_id = brsi.id
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and brsun.approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and brsun.create_user_id = #{request.createUserId}
         </if>
-        <if test="request.sealName != null and request.sealName !=''">
+        <if test="request != null and request.sealName != null and request.sealName !=''">
             and brsi.seal_name like concat('%',#{request.sealName},'%')
         </if>
-        <if test="request.sealType != null and request.sealType !=''">
+        <if test="request != null and request.sealType != null and request.sealType !=''">
             and brsi.seal_type = #{request.sealType}
         </if>
-        <if test="request.applyDeptName != null and request.applyDeptName !=''">
+        <if test="request != null and request.applyDeptName != null and request.applyDeptName !=''">
             and brsun.apply_dept_name like concat('%',#{request.applyDeptName},'%')
         </if>
-        <if test="request.applyUserName != null and request.applyUserName !=''">
+        <if test="request != null and request.applyUserName != null and request.applyUserName !=''">
             and brsun.apply_user_name like concat('%',#{request.applyUserName},'%')
         </if>
-        <if test="request.applyTimeStart != null and request.applyTimeStart !=''">
+        <if test="request != null and request.applyTimeStart != null and request.applyTimeStart !=''">
             and brsun.apply_time &gt;= #{request.applyTimeStart}
         </if>
-        <if test="request.applyTimeEnd != null and request.applyTimeEnd !=''">
+        <if test="request != null and request.applyTimeEnd != null and request.applyTimeEnd !=''">
             and brsun.apply_time &lt;= #{request.applyTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml
index 119bf7d..4f8392a 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml
@@ -31,6 +31,12 @@
         <if test="request.deptName != null and request.deptName !=''">
             and brsi.dept_name like concat('%',#{request.deptName},'%')
         </if>
+        <if test="request.ids != null">
+            and brsv.id in
+            <foreach collection="request.ids" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
         ORDER BY brsv.grant_date DESC
     </select>
 
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSupplierInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSupplierInfoMapper.xml
index fe8d399..e8ce7ef 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSupplierInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSupplierInfoMapper.xml
@@ -48,28 +48,28 @@
         SELECT *
         FROM biz_resource_supplier_info
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.supplierNo != null and request.supplierNo !=''">
+        <if test="request != null and request.supplierNo != null and request.supplierNo !=''">
             and supplier_no like concat('%',#{request.supplierNo},'%')
         </if>
-        <if test="request.supplierName != null and request.supplierName !=''">
+        <if test="request != null and request.supplierName != null and request.supplierName !=''">
             and supplier_name like concat('%',#{request.supplierName},'%')
         </if>
-        <if test="request.director != null and request.director !=''">
+        <if test="request != null and request.director != null and request.director !=''">
             and director like concat('%',#{request.director},'%')
         </if>
-        <if test="request.supplierType != null and request.supplierType !=''">
+        <if test="request != null and request.supplierType != null and request.supplierType !=''">
             and supplier_type = #{request.supplierType}
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/EnvLocationInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/EnvLocationInfoMapper.xml
new file mode 100644
index 0000000..68bcf10
--- /dev/null
+++ b/casic-metering-dao/src/main/resources/mapper/resource/EnvLocationInfoMapper.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.mapper.resource.EnvLocationInfoMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.resource.EnvLocationInfo">
+        <id column="id" property="id" />
+        <result column="location_no" property="locationNo" />
+        <result column="location_name" property="locationName" />
+        <result column="location_position" property="locationPosition" />
+        <result column="create_user_id" property="createUserId" />
+        <result column="create_user" property="createUser" />
+        <result column="create_time" property="createTime" />
+        <result column="update_time" property="updateTime" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, location_no, location_name, location_position, create_user_id, create_user, create_time, update_time
+    </sql>
+
+    <select id="selectLocationListPage" resultType="com.casic.missiles.dto.resource.environment.LocationListResponse">
+        SELECT *
+        FROM env_location_info
+        WHERE 1=1
+        <if test="request.locationNo != null and request.locationNo !=''">
+            AND location_no LIKE concat('%',#{request.locationNo},'%')
+        </if>
+        <if test="request.locationName != null and request.locationName !=''">
+            AND location_name LIKE concat('%',#{request.locationName},'%')
+        </if>
+        ORDER BY create_time DESC
+    </select>
+
+</mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml
index b28c18f..8854047 100644
--- a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml
@@ -11,7 +11,6 @@
         <result column="sign_desc" property="signDesc" />
         <result column="sign_director" property="signDirector" />
         <result column="sign_user_id" property="signUserId" />
-        <result column="sign_type" property="signType" />
         <result column="minio_file_name" property="minioFileName" />
         <result column="create_time" property="createTime" />
         <result column="update_time" property="updateTime" />
@@ -28,7 +27,6 @@
         <result column="sign_name" property="signName" />
         <result column="sign_desc" property="signDesc" />
         <result column="sign_director" property="signDirector" />
-        <result column="sign_type" property="signType" />
         <result column="sign_user_id" property="signUserId" />
         <result column="minio_file_name" property="minioFileName" />
         <result column="create_time" property="createTime" />
@@ -62,4 +60,58 @@
         JOIN system_sign_user_relation ssur ON ss.id = ssur.sign_id
         WHERE ssur.user_id = #{userId}
     </select>
+
+    <select id="selectSignListPage" resultMap="BaseResultMap">
+        SELECT ss.*, sd.SIMPLE_NAME AS deptName
+        FROM system_sign ss
+        LEFT JOIN sys_user su ON su.id = ss.sign_user_id
+        LEFT JOIN sys_dept sd ON sd.id = su.dept_id
+        WHERE 1=1
+        <if test="request.signNo != null and request.signNo !=''">
+            AND ss.sign_no LIKE concat('%',#{request.signNo},'%')
+        </if>
+        <if test="request.signName != null and request.signName !=''">
+            AND ss.sign_name LIKE concat('%',#{request.signName},'%')
+        </if>
+        <if test="request.signDirector != null and request.signDirector !=''">
+            AND ss.sign_director LIKE concat('%',#{request.signDirector},'%')
+        </if>
+        <if test="request.signUserId != null and request.signUserId !=''">
+            AND ss.sign_user_id = #{request.signUserId}
+        </if>
+        <if test="request.createStartTime != null and request.createStartTime !=''">
+            AND DATE_FORMAT(ss.create_time,'%Y-%m-%d') &gt;= DATE_FORMAT(#{request.createStartTime},'%Y-%m-%d')
+        </if>
+        <if test="request.createEndTime != null and request.createEndTime !=''">
+            AND DATE_FORMAT(ss.create_time,'%Y-%m-%d')  &lt;= DATE_FORMAT(#{request.createEndTime},'%Y-%m-%d')
+        </if>
+        ORDER BY ss.create_time DESC
+    </select>
+
+    <select id="selectSignList" resultMap="BaseResultMap">
+        SELECT ss.*, sd.SIMPLE_NAME AS deptName
+        FROM system_sign ss
+        LEFT JOIN sys_user su ON su.id = ss.sign_user_id
+        LEFT JOIN sys_dept sd ON sd.id = su.dept_id
+        WHERE 1=1
+        <if test="request.signNo != null and request.signNo !=''">
+            AND ss.sign_no LIKE concat('%',#{request.signNo},'%')
+        </if>
+        <if test="request.signName != null and request.signName !=''">
+            AND ss.sign_name LIKE concat('%',#{request.signName},'%')
+        </if>
+        <if test="request.signDirector != null and request.signDirector !=''">
+            AND ss.sign_director LIKE concat('%',#{request.signDirector},'%')
+        </if>
+        <if test="request.signUserId != null and request.signUserId !=''">
+            AND ss.sign_user_id = #{request.signUserId}
+        </if>
+        <if test="request.createStartTime != null and request.createStartTime !=''">
+            AND DATE_FORMAT(ss.create_time,'%Y-%m-%d') &gt;= DATE_FORMAT(#{request.createStartTime},'%Y-%m-%d')
+        </if>
+        <if test="request.createEndTime != null and request.createEndTime !=''">
+            AND DATE_FORMAT(ss.create_time,'%Y-%m-%d')  &lt;= DATE_FORMAT(#{request.createEndTime},'%Y-%m-%d')
+        </if>
+        ORDER BY ss.create_time DESC
+    </select>
 </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 515050a..60f530b 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
@@ -47,8 +47,8 @@
     String STORAGE_LOCATION = "bizStorageLocation";
     //计量专业
     String MEASURE_MAJOR = "bizMeasureMajor";
-    //管理状态
-    String MANAGER_STATE = "bizManagerState";
+    //标准装置管理状态
+    String STANDARD_MANAGER_STATE = "bizStandardManagerState";
 
     /**
      * 资源管理 字典code
@@ -95,8 +95,6 @@
     String MEASURE_STATUS = "measureStatus";
     //检定方式
     String MEASURE_TYPE = "measureType";
-    //标识打印标志类型
-    String IDENTIFY_PRINT_TYPE = "bizBusinessIdentify";
     //变更类型
     String REPORT_CHANGE_TYPE = "bizCertChangeType";
     //规模类型
@@ -111,19 +109,24 @@
     String MEASURE_CATEGORY = "measureCategory";
     //检定结果
     String MEASURE_RESULT = "measureResult";
+    //分包原因
+    String OUTSOURCE_REASON = "outsourceReason";
+
+    /**
+     * 系统管理
+     */
+    String TEMPLATE_TYPE = "templateType";
+
 
     /**
      * 标准装置 字典code
      */
     //类别
     String STANDARD_CATEGORY = "standardCategory";
-    //管理状态
-    String STANDARD_MANAGER_STATE = "standardManagerState";
     //标准等级
     String STANDARD_LEVEL = "standardLevel";
     //传递范围
     String STANDARD_TRANSMIT_RANGE = "transmitRange";
-
     //资本来源
     String CAPITAL_SOURCE = "capitalSource";
     //标准装置-申请类型
@@ -148,8 +151,6 @@
     String CERTIFICATE_CLASS = "certificationClass";
     //证书管理-检校专业
     String CALIBRATION_MAJOR = "calibrationMajor";
-    //分包原因
-    String OUTSOURCE_REASON = "outsourceReason";
 
     /**
      * 工作台
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/BaseApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/BaseApprovalListRequest.java
index 73c12c1..80d7424 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/BaseApprovalListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/BaseApprovalListRequest.java
@@ -6,6 +6,7 @@
 
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotEmpty;
+import java.util.List;
 
 /**
  * @Description:
@@ -19,14 +20,14 @@
      * 表单id
      */
     @NotBlank(message = "表单id不能为空")
-    @ApiModelProperty(value = "表单id（流程定义对应的表单id，等价于业务id）", dataType = "String")
+    @ApiModelProperty(value = "表单id（流程定义对应的表单id，等价于业务id），导出接口不用传", dataType = "String")
     private String formId;
 
     /**
      * 审批状态类型，对应ApprovalStatusEnum
      */
     @NotEmpty(message = "审批状态类型不能为空")
-    @ApiModelProperty(value = "审批状态类型code", dataType = "String")
+    @ApiModelProperty(value = "审批状态类型code，导出接口不用传", dataType = "String")
     private String approvalStatus;
 
     @ApiModelProperty(hidden = true)
@@ -34,4 +35,7 @@
 
     @ApiModelProperty(hidden = true)
     private Long createUserId;
+
+    @ApiModelProperty(value = "导出ids", dataType = "List")
+    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificatePrintApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificatePrintApprovalListRequest.java
index b93d1c9..3cc2f4e 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificatePrintApprovalListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificatePrintApprovalListRequest.java
@@ -5,8 +5,6 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import java.util.List;
-
 /**
  * @Description:
  * @Author: wangpeng
@@ -38,7 +36,4 @@
 
     @ApiModelProperty(value = "创建结束时间", dataType = "String")
     private String createTimeEnd;
-
-    @ApiModelProperty(value = "导出ids", dataType = "List")
-    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportApprovalListRequest.java
index 4f7a038..c115847 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportApprovalListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportApprovalListRequest.java
@@ -5,8 +5,6 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import java.util.List;
-
 /**
  * @Description:
  * @Author: wangpeng
@@ -15,6 +13,8 @@
 @ApiModel
 @Data
 public class CertificateReportApprovalListRequest extends BaseApprovalListRequest {
+    @ApiModelProperty(value = "委托方id", dataType = "String")
+    private Long customerId;
 
     @ApiModelProperty(value = "证书报告编号", dataType = "String")
     private String certificateReportNo;
@@ -37,6 +37,4 @@
     @ApiModelProperty(value = "检校结束时间", dataType = "String")
     private String calibrationTimeEnd;
 
-    @ApiModelProperty(value = "导出ids", dataType = "List")
-    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/identify/IdentifyListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/identify/IdentifyListRequest.java
index 1b87ae6..f019203 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/identify/IdentifyListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/identify/IdentifyListRequest.java
@@ -4,6 +4,8 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * @Description:
  * @Author: wangpeng
@@ -26,4 +28,7 @@
 
     @ApiModelProperty(value = "打印结束时间", dataType = "String")
     private String createTimeEnd;
+
+    @ApiModelProperty(value = "导出ids", dataType = "List")
+    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListRequest.java
index 1264883..62415fb 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListRequest.java
@@ -7,6 +7,7 @@
 import lombok.Data;
 
 import javax.validation.constraints.NotBlank;
+import java.util.List;
 
 @Data
 @ApiModel
@@ -37,4 +38,6 @@
     @ApiModelProperty(value = "是否加急（1是0否null全部）", dataType = "Integer")
     private String isUrgent;
 
+    @ApiModelProperty(value = "导出ids", dataType = "List")
+    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListRequest.java
index 5201d7b..499760a 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListRequest.java
@@ -17,6 +17,9 @@
     @ApiModelProperty(value = "任务单编号", dataType = "String")
     private String orderNo;
 
+    @ApiModelProperty(value = "委托方id", dataType = "Long")
+    private Long customerId;
+
     @ApiModelProperty(value = "委托方名称", dataType = "String")
     private String customerName;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OrderSampleDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OrderSampleDTO.java
new file mode 100644
index 0000000..796edc0
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OrderSampleDTO.java
@@ -0,0 +1,19 @@
+package com.casic.missiles.dto.business.outsource;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/8/24 11:38
+ */
+@ApiModel
+@Data
+public class OrderSampleDTO {
+    @ApiModelProperty(value = "任务单id", dataType = "Long")
+    private Long orderId;
+    @ApiModelProperty(value = "受检设备id", dataType = "Long")
+    private Long sampleId;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceAssessApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceAssessApprovalListRequest.java
new file mode 100644
index 0000000..9a930c3
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceAssessApprovalListRequest.java
@@ -0,0 +1,30 @@
+package com.casic.missiles.dto.business.outsource;
+
+import com.casic.missiles.dto.BaseApprovalListRequest;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/8/24 11:01
+ */
+@ApiModel
+@Data
+public class OutsourceAssessApprovalListRequest extends BaseApprovalListRequest {
+    @ApiModelProperty(value = "评审表编号", dataType = "String")
+    private String projectNo;
+
+    @ApiModelProperty(value = "分包机构名称", dataType = "String")
+    private String outsourcerName;
+
+    @ApiModelProperty(value = "申请人", dataType = "String")
+    private String applicantName;
+
+    @ApiModelProperty(value = "申请时间开始", dataType = "String")
+    private String applicantTimeStart;
+
+    @ApiModelProperty(value = "申请时间结束", dataType = "String")
+    private String applicantTimeEnd;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceAssessSaveResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceAssessSaveResponse.java
new file mode 100644
index 0000000..8bf9aad
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceAssessSaveResponse.java
@@ -0,0 +1,20 @@
+package com.casic.missiles.dto.business.outsource;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/8/14 16:17
+ */
+@ApiModel
+@Data
+public class OutsourceAssessSaveResponse {
+    @ApiModelProperty(value = "主键id", dataType = "Long")
+    private Long id;
+
+    @ApiModelProperty(value = "编号", dataType = "String")
+    private String projectNo;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProtocolApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProtocolApprovalListRequest.java
new file mode 100644
index 0000000..0f32331
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProtocolApprovalListRequest.java
@@ -0,0 +1,30 @@
+package com.casic.missiles.dto.business.outsource;
+
+import com.casic.missiles.dto.BaseApprovalListRequest;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/8/24 15:01
+ */
+@ApiModel
+@Data
+public class OutsourceProtocolApprovalListRequest extends BaseApprovalListRequest {
+    @ApiModelProperty(value = "协议书编号", dataType = "String")
+    private String protocolNo;
+
+    @ApiModelProperty(value = "分包方名称", dataType = "String")
+    private String outsourcerName;
+
+    @ApiModelProperty(value = "申请人", dataType = "String")
+    private String applicantName;
+
+    @ApiModelProperty(value = "申请时间开始", dataType = "String")
+    private String applicantTimeStart;
+
+    @ApiModelProperty(value = "申请时间结束", dataType = "String")
+    private String applicantTimeEnd;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProtocolSaveResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProtocolSaveResponse.java
new file mode 100644
index 0000000..e324967
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProtocolSaveResponse.java
@@ -0,0 +1,20 @@
+package com.casic.missiles.dto.business.outsource;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/8/14 16:17
+ */
+@ApiModel
+@Data
+public class OutsourceProtocolSaveResponse {
+    @ApiModelProperty(value = "主键id", dataType = "Long")
+    private Long id;
+
+    @ApiModelProperty(value = "编号", dataType = "String")
+    private String protocolNo;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveApprovalListRequest.java
index f29f4e4..7047c28 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveApprovalListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveApprovalListRequest.java
@@ -5,8 +5,6 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import java.util.List;
-
 /**
  * @Description: 现场检测审批列表请求实体
  * @Author: wangpeng
@@ -30,7 +28,4 @@
     @ApiModelProperty(value = "申请时间结束", dataType = "String")
     private String applyTimeEnd;
 
-    @ApiModelProperty(value = "导出ids", dataType = "List")
-    private List<Long> ids;
-
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveDetailResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveDetailResponse.java
index 1f28752..394c934 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveDetailResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveDetailResponse.java
@@ -12,6 +12,18 @@
     @ApiModelProperty(value = "id，更新/删除使用参数", dataType = "Long")
     private Long id;
 
+    @ApiModelProperty(value = "实验室代码(字典code)", dataType = "String")
+    private String labCode;
+
+    @ApiModelProperty(value = "实验室代码(字典value)", dataType = "String")
+    private String labCodeName;
+
+    @ApiModelProperty(value = "组别代码(字典code)", dataType = "String")
+    private String groupCode;
+
+    @ApiModelProperty(value = "组别代码(字典value)", dataType = "String")
+    private String groupCodeName;
+
     @ApiModelProperty(value = "审批编号", dataType = "String")
     private String siteExecutiveNo;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/environment/LocationListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/environment/LocationListRequest.java
new file mode 100644
index 0000000..13d03c3
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/environment/LocationListRequest.java
@@ -0,0 +1,20 @@
+package com.casic.missiles.dto.resource.environment;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/6/8 13:56
+ */
+@ApiModel
+@Data
+public class LocationListRequest {
+    @ApiModelProperty(value = "地点编号", dataType = "String")
+    private String locationNo;
+
+    @ApiModelProperty(value = "地点名称", dataType = "String")
+    private String locationName;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/environment/LocationListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/environment/LocationListResponse.java
new file mode 100644
index 0000000..4c531af
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/environment/LocationListResponse.java
@@ -0,0 +1,78 @@
+package com.casic.missiles.dto.resource.environment;
+
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
+import com.baomidou.mybatisplus.annotation.TableField;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description: 地点列表响应实体
+ * @Author: wangpeng
+ * @Date: 2023/6/8 13:53
+ */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
+@ApiModel
+@Data
+public class LocationListResponse {
+    @ApiModelProperty(value = "主键id", dataType = "Long")
+    private Long id;
+
+    /**
+     * 地点编号
+     */
+    @ExcelProperty("地点编号")
+    @ApiModelProperty(value = "地点编号", dataType = "String")
+    private String locationNo;
+
+    /**
+     * 地点名称
+     */
+    @ExcelProperty("地点名称")
+    @ApiModelProperty(value = "地点名称", dataType = "String")
+    private String locationName;
+
+    /**
+     * 地点位置
+     */
+    @ExcelProperty("地点位置")
+    @ApiModelProperty(value = "地点位置", dataType = "String")
+    private String locationPosition;
+
+    /**
+     * 创建人id
+     */
+    @ApiModelProperty(value = "创建人id", dataType = "Long")
+    private Long createUserId;
+
+    /**
+     * 创建人
+     */
+    @ExcelProperty("创建人")
+    @ApiModelProperty(value = "创建人", dataType = "String")
+    @TableField("create_user")
+    private String createUser;
+
+    /**
+     * 创建时间
+     */
+    @ExcelProperty("创建时间")
+    @ApiModelProperty(value = "创建时间", dataType = "String")
+    private String createTime;
+
+    /**
+     * 更新时间
+     */
+    @ApiModelProperty(value = "更新时间", dataType = "String")
+    private String updateTime;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertRequest.java
index 9a7f6c6..c827915 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertRequest.java
@@ -4,6 +4,8 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * @Description:
  * @Author: wangpeng
@@ -16,4 +18,7 @@
     private String name;
     @ApiModelProperty(value = "部门名", dataType = "String")
     private String deptName;
+
+    @ApiModelProperty(value = "导出ids", dataType = "List")
+    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertResponse.java
index f78b159..8f2f79e 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertResponse.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.dto.resource.staff;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.casic.missiles.annotation.DictCodeField;
 import com.casic.missiles.constants.MeterDictCode;
 import io.swagger.annotations.ApiModel;
@@ -13,12 +20,18 @@
  * @Author: wangpeng
  * @Date: 2023/7/27 15:13
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @ApiModel
 @Data
 public class StaffCertResponse {
     /**
      * 人员编号
      */
+    @ExcelProperty(value = "人员编号",order = 0)
     @NotEmpty(message = "人员编号不能为空")
     @ApiModelProperty(value = "人员编号", dataType = "String")
     private String staffNo;
@@ -26,6 +39,7 @@
     /**
      * 姓名
      */
+    @ExcelProperty(value = "姓名",order = 1)
     @ApiModelProperty(value = "姓名", dataType = "String")
     private String staffName;
 
@@ -54,6 +68,7 @@
     /**
      * 部门名字
      */
+    @ExcelProperty(value = "工作部门",order = 2)
     @ApiModelProperty(value = "部门名字", dataType = "String")
     private String deptName;
 
@@ -66,6 +81,7 @@
     /**
      * 计量专业
      */
+    @ExcelProperty(value = "计量专业",order = 3)
     @ApiModelProperty(value = "计量专业", dataType = "String")
     private String major;
 
@@ -110,6 +126,7 @@
     /**
      * 证书号
      */
+    @ExcelProperty(value = "证号",order = 4)
     @ApiModelProperty(value = "证书号", dataType = "String")
     private String certNo;
 
@@ -122,12 +139,14 @@
     /**
      * 有效日期
      */
+    @ExcelProperty(value = "证书有效期",order = 6)
     @ApiModelProperty(value = "有效日期", dataType = "String")
     private String effectiveDate;
 
     /**
      * 发放日期
      */
+    @ExcelProperty(value = "发证日期",order = 5)
     @ApiModelProperty(value = "发放日期", dataType = "String")
     private String grantDate;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffListRequest.java
index 7c4afb3..0a1194a 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffListRequest.java
@@ -4,6 +4,8 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * @Description:
  * @Author: wangpeng
@@ -18,4 +20,7 @@
     private String deptName;
     @ApiModelProperty(value = "部门id", dataType = "Long")
     private Long deptId;
+
+    @ApiModelProperty(value = "导出ids", dataType = "List")
+    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/TrainListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/TrainListRequest.java
index f68597b..6321f8b 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/TrainListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/TrainListRequest.java
@@ -14,6 +14,8 @@
 public class TrainListRequest {
     @ApiModelProperty(value = "训练登记表编号", dataType = "String")
     private String trainNo;
+    @ApiModelProperty(value = "值班领导", dataType = "String")
+    private String dutyLeader;
     @ApiModelProperty(value = "创建开始时间", dataType = "String")
     private String createTimeStart;
     @ApiModelProperty(value = "创建结束时间", dataType = "String")
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/SignAddRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/SignAddRequest.java
index 117be34..d71055c 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/SignAddRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/SignAddRequest.java
@@ -43,13 +43,6 @@
     private Long signUserId;
 
     /**
-     * 签章或签名-字典code
-     */
-    @NotBlank(message = "类型不能为空")
-    @ApiModelProperty(value = "签名/签章-字典code", dataType = "String", required = true)
-    private String signType;
-
-    /**
      * minio存储文件名
      */
     @ApiModelProperty(value = "上传文件返回名称", dataType = "String")
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateAddRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateAddRequest.java
index aff1265..6316648 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateAddRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateAddRequest.java
@@ -17,30 +17,28 @@
 @Data
 public class TemplateAddRequest extends BaseSystemRequest {
     /**
-     * 原始记录模板/证书报告模板名称
+     * 模板名称
      */
     @ApiModelProperty(value = "名称", dataType = "String", required = true)
     @NotBlank(message = "名称不能为空")
     private String templateName;
 
     /**
-     * 原始记录模板/证书报告模板描述
+     * 模板描述
      */
     @ApiModelProperty(value = "描述", dataType = "String")
     private String templateDesc;
 
     /**
-     * 原始记录模板/证书报告模板创建人
+     * 创建人
      */
     @ApiModelProperty(value = "创建人", dataType = "String", required = true)
     @NotBlank(message = "创建人不能为空")
     private String templateCreator;
 
-    /**
-     * 原始记录模板/证书报告模板-字典code
-     */
-    @NotBlank(message = "类型不能为空")
-    @ApiModelProperty(value = "原始记录模板/证书报告模板-字典code", dataType = "String", required = true)
+
+    @NotBlank(message = "模板类型不能为空")
+    @ApiModelProperty(value = "模板类型(字典code)", dataType = "String", required = true)
     private String templateType;
 
     /**
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateListRequest.java
index eec5a1e..6d17bbe 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateListRequest.java
@@ -1,11 +1,12 @@
 package com.casic.missiles.dto.system;
 
+import com.casic.missiles.annotation.DictCodeField;
+import com.casic.missiles.constants.MeterDictCode;
 import com.casic.missiles.dto.BaseSystemRequest;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import javax.validation.constraints.NotBlank;
 import java.util.List;
 
 /**
@@ -19,8 +20,8 @@
     /**
      * 类型
      */
-//    @ApiModelProperty(value = "类型-字典code", dataType = "String", required = true)
-    @NotBlank(message = "类型不能为空")
+    @DictCodeField(message = "模板类型不合法", cacheName = MeterDictCode.TEMPLATE_TYPE)
+    @ApiModelProperty(value = "模板类型(字典code)", dataType = "String")
     private String templateType;
 
     /**
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificateChangeApply.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificateChangeApply.java
index 9216308..36923fd 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificateChangeApply.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificateChangeApply.java
@@ -1,11 +1,19 @@
 package com.casic.missiles.model.business;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 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 com.casic.missiles.dto.BaseRequest;
+import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -20,6 +28,12 @@
  * @author wangpeng
  * @since 2023-08-15
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
+@ApiModel
 @Data
 @TableName("biz_business_certificate_change_apply")
 public class BizBusinessCertificateChangeApply extends BaseRequest implements Serializable {
@@ -33,6 +47,7 @@
     /**
      * 申请单编号
      */
+    @ExcelProperty(value = "申请单编号", order = 1)
     @ApiModelProperty(value = "申请单编号", dataType = "String")
     @TableField("change_apply_no")
     private String changeApplyNo;
@@ -40,6 +55,7 @@
     /**
      * 申请单名字
      */
+    @ExcelProperty(value = "申请单名称", order = 2)
     @ApiModelProperty(value = "申请单名字", dataType = "String")
     @TableField("change_apply_name")
     private String changeApplyName;
@@ -54,6 +70,7 @@
     /**
      * 更换证书编号
      */
+    @ExcelProperty(value = "更换证书编号", order = 3)
     @ApiModelProperty(value = "更换证书编号", dataType = "String")
     @TableField("change_report_no")
     private String changeReportNo;
@@ -61,7 +78,8 @@
     /**
      * 更换证书名字
      */
-    @ApiModelProperty(value = "更换证书名字", dataType = "String")
+    @ExcelProperty(value = "更换证书/报告名称", order = 4)
+    @ApiModelProperty(value = "更换证书/报告名称", dataType = "String")
     @TableField("change_report_name")
     private String changeReportName;
 
@@ -73,6 +91,7 @@
     @TableField("change_type")
     private String changeType;
 
+    @ExcelProperty(value = "变更类型", order = 5)
     @ApiModelProperty(value = "变更类型(字典value)", dataType = "String")
     @TableField(exist = false)
     private String changeTypeName;
@@ -142,13 +161,15 @@
     /**
      * 创建用户名字
      */
-    @ApiModelProperty(value = "创建用户名字", dataType = "String")
+    @ExcelProperty(value = "创建人", order = 6)
+    @ApiModelProperty(value = "创建人名字", dataType = "String")
     @TableField("create_user_name")
     private String createUserName;
 
     /**
      * 创建时间
      */
+    @ExcelProperty(value = "创建时间", order = 7)
     @ApiModelProperty(value = "创建时间", dataType = "String")
     @TableField("create_time")
     private String createTime;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificateReport.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificateReport.java
index f01db9e..db06018 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificateReport.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificateReport.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.model.business;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -22,6 +29,11 @@
  * @author wangpeng
  * @since 2023-08-14
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @ApiModel
 @Data
 @TableName("biz_business_certificate_report")
@@ -36,6 +48,7 @@
     /**
      * 证书报告编号
      */
+    @ExcelProperty(value = "证书报告编号", order = 1)
     @ApiModelProperty(value = "证书报告编号", dataType = "String")
     @TableField("certificate_report_no")
     private String certificateReportNo;
@@ -43,6 +56,7 @@
     /**
      * 证书报告名称
      */
+    @ExcelProperty(value = "证书报告名称", order = 2)
     @ApiModelProperty(value = "证书报告名称", dataType = "String")
     @TableField("certificate_report_name")
     private String certificateReportName;
@@ -62,6 +76,7 @@
     @TableField("measure_category")
     private String measureCategory;
 
+    @ExcelProperty(value = "检校类别", order = 6)
     @ApiModelProperty(value = "检校类别(字典value)", dataType = "String")
     @TableField(exist = false)
     private String measureCategoryName;
@@ -69,6 +84,7 @@
     /**
      * 检校时间
      */
+    @ExcelProperty(value = "检校时间", order = 8)
     @ApiModelProperty(value = "检校时间", dataType = "String")
     @TableField("calibration_time")
     private String calibrationTime;
@@ -267,18 +283,22 @@
     @TableField(exist = false)
     private Integer decisionItem;
 
-    @ApiModelProperty(value = "设备样品编号（列表返回参数）", dataType = "String")
+    @ExcelProperty(value = "被检设备统一编号", order = 3)
+    @ApiModelProperty(value = "被检设备统一编号（列表返回参数）", dataType = "String")
     @TableField(exist = false)
     private String sampleNo;
 
-    @ApiModelProperty(value = "设备样品名称（列表返回参数）", dataType = "String")
+    @ExcelProperty(value = "被检设备名称", order = 4)
+    @ApiModelProperty(value = "被检设备名称（列表返回参数）", dataType = "String")
     @TableField(exist = false)
     private String sampleName;
 
-    @ApiModelProperty(value = "设备样品规格型号（列表返回参数）", dataType = "String")
+    @ExcelProperty(value = "规格型号", order = 5)
+    @ApiModelProperty(value = "规格型号（列表返回参数）", dataType = "String")
     @TableField(exist = false)
     private String sampleModel;
 
+    @ExcelProperty(value = "检定员", order = 7)
     @ApiModelProperty(value = "检定员名字（列表返回参数）", dataType = "String")
     @TableField(exist = false)
     private String staffName;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessIdentifyInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessIdentifyInfo.java
index 46bfba5..f1a9bec 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessIdentifyInfo.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessIdentifyInfo.java
@@ -1,10 +1,15 @@
 package com.casic.missiles.model.business;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 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;
 
@@ -20,6 +25,11 @@
  * @author wangpeng
  * @since 2023-08-15
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @Data
 @TableName("biz_business_identify_info")
 public class BizBusinessIdentifyInfo implements Serializable {
@@ -33,6 +43,7 @@
     /**
      * 记录编号
      */
+    @ExcelProperty(value = "记录编号", order = 1)
     @ApiModelProperty(value = "记录编号", dataType = "String")
     @TableField("record_no")
     private String recordNo;
@@ -41,20 +52,15 @@
      * 标志类型(字典code)
      */
     @NotEmpty(message = "标志类型不能为空")
-    @ApiModelProperty(value = "标志类型(字典code)", dataType = "String")
-    @DictCodeField(message = "标志类型不合法", cacheName = MeterDictCode.IDENTIFY_PRINT_TYPE)
+    @ApiModelProperty(value = "标志类型(直接存计量标识/使用状态/校准状态的字典value)", dataType = "String")
     @TableField("identify_type")
     private String identifyType;
 
-    @ApiModelProperty(value = "标志类型(字典value)", dataType = "String")
-    @TableField(exist = false)
-    private String identifyTypeName;
-
     /**
      * 设备id(可以是受检设备/设备台账)
      */
     @NotNull(message = "设备id不能为空")
-    @ApiModelProperty(value = "设备id(可以是受检设备/设备台账)", dataType = "String")
+    @ApiModelProperty(value = "设备id(可以是受检设备/设备台账)", dataType = "Long")
     @TableField("device_id")
     private Long deviceId;
 
@@ -66,29 +72,32 @@
     @TableField("device_type")
     private String deviceType;
 
+    @ExcelProperty(value = "统一编号", order = 3)
     @NotEmpty(message = "设备编号不能为空")
-    @ApiModelProperty(value = "设备编号", dataType = "String")
+    @ApiModelProperty(value = "统一编号", dataType = "String")
     @TableField("device_no")
     private String deviceNo;
 
     /**
      * 设备名字
      */
-    @NotEmpty(message = "设备名字不能为空")
-    @ApiModelProperty(value = "设备名字", dataType = "String")
+    @ExcelProperty(value = "设备名称", order = 4)
+    @NotEmpty(message = "设备名称不能为空")
+    @ApiModelProperty(value = "设备名称", dataType = "String")
     @TableField("device_name")
     private String deviceName;
 
     /**
      * 检定员id
      */
-    @ApiModelProperty(value = "检定员id", dataType = "String")
+    @ApiModelProperty(value = "检定员id", dataType = "Long")
     @TableField("measure_person_id")
     private Long measurePersonId;
 
     /**
      * 检定员名字
      */
+    @ExcelProperty(value = "检定员", order = 5)
     @ApiModelProperty(value = "检定员名字", dataType = "String")
     @TableField("measure_person")
     private String measurePerson;
@@ -103,7 +112,8 @@
     /**
      * 更新时间
      */
-    @ApiModelProperty(value = "更新时间", dataType = "String")
+    @ExcelProperty(value = "打印时间", order = 6)
+    @ApiModelProperty(value = "打印时间", dataType = "String")
     @TableField("update_time")
     private String updateTime;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceAssess.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceAssess.java
index 659d9ca..6720b90 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceAssess.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceAssess.java
@@ -1,11 +1,26 @@
 package com.casic.missiles.model.business;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 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 com.casic.missiles.dto.BaseRequest;
+import com.casic.missiles.dto.business.outsource.OrderSampleDTO;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import javax.validation.constraints.NotEmpty;
 import java.io.Serializable;
+import java.util.List;
 
 /**
  * <p>
@@ -15,146 +30,231 @@
  * @author wangpeng
  * @since 2023-08-16
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
+@ApiModel
 @Data
 @TableName("biz_business_outsource_assess")
-public class BizBusinessOutsourceAssess implements Serializable {
+public class BizBusinessOutsourceAssess extends BaseRequest implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
+    @ApiModelProperty(value = "id，更新/删除使用参数", dataType = "Long")
     @TableId("id")
     private Long id;
 
     /**
      * 评审表编号
      */
+    @ExcelProperty(value = "评审表编号", order = 1)
+    @ApiModelProperty(value = "评审表编号(后台生成)", dataType = "String")
     @TableField("project_no")
     private String projectNo;
 
     /**
      * 评审表名称
      */
+    @ExcelProperty(value = "评审表名称", order = 2)
+    @ApiModelProperty(value = "评审表名称", dataType = "String")
     @TableField("project_name")
     private String projectName;
 
+    @NotEmpty(message = "实验室代码不能为空")
+    @DictCodeField(message = "实验室代码描述不合法", cacheName = MeterDictCode.LAB_CODE)
+    @ApiModelProperty(value = "实验室代码(字典code)", dataType = "String")
+    @TableField("lab_code")
+    private String labCode;
+
+    @ApiModelProperty(value = "实验室代码(字典value)", dataType = "String")
+    @TableField(exist = false)
+    private String labCodeName;
+
+    /**
+     * 组别代码
+     */
+    @NotEmpty(message = "组别代码不能为空")
+    @DictCodeField(message = "组别代码描述不合法", cacheName = MeterDictCode.GROUP_CODE)
+    @ApiModelProperty(value = "组别代码(字典code)", dataType = "String")
+    @TableField("group_code")
+    private String groupCode;
+
+    @ApiModelProperty(value = "组别代码(字典value)", dataType = "String")
+    @TableField(exist = false)
+    private String groupCodeName;
+
     /**
      * 申请人id
      */
+    @ApiModelProperty(value = "申请人id", dataType = "String")
     @TableField("applicant_id")
     private Long applicantId;
 
     /**
      * 申请人名字
      */
+    @ExcelProperty(value = "申请人", order = 5)
+    @ApiModelProperty(value = "申请人", dataType = "String")
     @TableField("applicant_name")
     private String applicantName;
 
     /**
      * 申请时间
      */
+    @ExcelProperty(value = "申请时间", order = 6)
+    @ApiModelProperty(value = "申请时间", dataType = "String")
     @TableField("applicant_time")
     private String applicantTime;
 
     /**
      * 附件(minio存储文件名)
      */
+    @ApiModelProperty(value = "附件(minio存储文件名)", dataType = "String")
     @TableField("minio_file_name")
     private String minioFileName;
 
     /**
      * 备注
      */
+    @ApiModelProperty(value = "备注", dataType = "String")
     @TableField("remark")
     private String remark;
 
     /**
      * 创建人id
      */
+    @ApiModelProperty(value = "创建人id", dataType = "String")
     @TableField("create_user_id")
     private Long createUserId;
 
     /**
      * 创建人名字
      */
+    @ApiModelProperty(value = "创建人名字", dataType = "String")
     @TableField("create_user_name")
     private String createUserName;
 
     /**
      * 分包方id
      */
+    @ApiModelProperty(value = "评审表编号", dataType = "String")
     @TableField("outsourcer_id")
     private Long outsourcerId;
 
     /**
      * 预计开始时间
      */
+    @ApiModelProperty(value = "预计开始时间", dataType = "String")
     @TableField("pre_start_time")
     private String preStartTime;
 
     /**
      * 预计结束时间
      */
+    @ApiModelProperty(value = "预计结束时间", dataType = "String")
     @TableField("pre_end_time")
     private String preEndTime;
 
     /**
      * 分包原因-字典
      */
+    @ApiModelProperty(value = "分包原因(字典code)", dataType = "String")
+    @DictCodeField(message = "分包原因描述不合法", cacheName = MeterDictCode.OUTSOURCE_REASON)
     @TableField("outsource_reason")
     private String outsourceReason;
 
+    @ApiModelProperty(value = "分包原因(字典value)", dataType = "String")
+    @TableField(exist = false)
+    private String outsourceReasonName;
+
     /**
      * 预计费用
      */
+    @ApiModelProperty(value = "预计费用", dataType = "String")
     @TableField("pre_cost")
     private String preCost;
 
     /**
      * 审批状态
      */
+    @ApiModelProperty(value = "审批状态", dataType = "String")
+    @DictCodeField(message = "审批状态描述不合法", cacheName = MeterDictCode.APPROVAL_STATUS)
     @TableField("approval_status")
     private String approvalStatus;
 
     /**
      * 流程实例id
      */
+    @ApiModelProperty(value = "流程实例id", dataType = "String")
     @TableField("process_id")
     private String processId;
 
     /**
      * 实验室认可情况
      */
+    @ApiModelProperty(value = "实验室认可情况", dataType = "String")
     @TableField("approve_situation")
     private String approveSituation;
 
     /**
      * 溯源性
      */
+    @ApiModelProperty(value = "溯源性", dataType = "String")
     @TableField("traceability")
     private String traceability;
 
     /**
      * 测试方法
      */
+    @ApiModelProperty(value = "测试方法", dataType = "String")
     @TableField("test_method")
     private String testMethod;
 
     /**
      * 技术能力
      */
+    @ApiModelProperty(value = "技术能力", dataType = "String")
     @TableField("technique_ability")
     private String techniqueAbility;
 
     /**
      * 创建时间
      */
+    @ApiModelProperty(hidden = true)
     @TableField("create_time")
     private String createTime;
 
     /**
      * 更新时间
      */
+    @ApiModelProperty(hidden = true)
     @TableField("update_time")
     private String updateTime;
 
+    @ApiModelProperty(value = "审批状态类型-字典value", dataType = "String")
+    @TableField(exist = false)
+    private String approvalStatusName;
 
+    @ApiModelProperty(value = "任务id（同意、驳回等操作使用）", dataType = "String")
+    @TableField(exist = false)
+    private String taskId;
+
+    @ApiModelProperty(value = "可选决策项（1同意驳回拒绝 2同意驳回 3同意拒绝，用于待审批列表同意/驳回/拒绝按钮展示）", dataType = "Integer")
+    @TableField(exist = false)
+    private Integer decisionItem;
+
+    @NotEmpty(message = "受检设备信息不能为空")
+    @ApiModelProperty(value = "受检设备id列表（新建使用参数）", dataType = "List")
+    @TableField(exist = false)
+    private List<OrderSampleDTO> orderSampleList;
+
+    @ExcelProperty(value = "分包机构名称", order = 3)
+    @ApiModelProperty(value = "分包机构名称（列表返回参数）", dataType = "String")
+    private String outsourcerName;
+
+    @ExcelProperty(value = "机构负责人", order = 4)
+    @ApiModelProperty(value = "机构负责人（列表返回参数）", dataType = "String")
+    private String director;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceProtocol.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceProtocol.java
new file mode 100644
index 0000000..38df697
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceProtocol.java
@@ -0,0 +1,225 @@
+package com.casic.missiles.model.business;
+
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
+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 com.casic.missiles.dto.BaseRequest;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotEmpty;
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 计量检定业务-分包管理-测试、校准或检定工作分包协议书
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-08-24
+ */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
+@Data
+@TableName("biz_business_outsource_protocol")
+public class BizBusinessOutsourceProtocol extends BaseRequest implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "id，更新/删除使用参数", dataType = "Long")
+    @TableId("id")
+    private Long id;
+
+    /**
+     * 协议书编号
+     */
+    @ExcelProperty(value = "协议书编号", order = 1)
+    @ApiModelProperty(value = "协议书编号(后台生成)", dataType = "String")
+    @TableField("protocol_no")
+    private String protocolNo;
+
+    /**
+     * 协议书名称
+     */
+    @ExcelProperty(value = "协议书名称", order = 2)
+    @ApiModelProperty(value = "协议书名称", dataType = "String")
+    @TableField("project_name")
+    private String projectName;
+
+    @NotEmpty(message = "实验室代码不能为空")
+    @DictCodeField(message = "实验室代码描述不合法", cacheName = MeterDictCode.LAB_CODE)
+    @ApiModelProperty(value = "实验室代码(字典code)", dataType = "String")
+    @TableField("lab_code")
+    private String labCode;
+
+    @ApiModelProperty(value = "实验室代码(字典value)", dataType = "String")
+    @TableField(exist = false)
+    private String labCodeName;
+
+    @NotEmpty(message = "组别代码不能为空")
+    @DictCodeField(message = "组别代码描述不合法", cacheName = MeterDictCode.GROUP_CODE)
+    @ApiModelProperty(value = "组别代码(字典code)", dataType = "String")
+    @TableField("group_code")
+    private String groupCode;
+
+    @ApiModelProperty(value = "组别代码(字典value)", dataType = "String")
+    @TableField(exist = false)
+    private String groupCodeName;
+
+    /**
+     * 分包方id
+     */
+    @ApiModelProperty(value = "分包方id", dataType = "Long")
+    @TableField("outsourcer_id")
+    private Long outsourcerId;
+
+    /**
+     * 其他
+     */
+    @ApiModelProperty(value = "其他", dataType = "String")
+    @TableField("remark")
+    private String remark;
+
+    /**
+     * 分包方编号
+     */
+    @ApiModelProperty(value = "分包方编号(新建不用传)", dataType = "String")
+    @TableField("outsource_no")
+    private String outsourceNo;
+
+    /**
+     * 分包方名称
+     */
+    @ExcelProperty(value = "分包方名称", order = 3)
+    @ApiModelProperty(value = "分包方名称(新建不用传)", dataType = "String")
+    @TableField("outsource_name")
+    private String outsourceName;
+
+    /**
+     * 联系人
+     */
+    @ExcelProperty(value = "联系人", order = 4)
+    @ApiModelProperty(value = "联系人", dataType = "String")
+    @TableField("contacts")
+    private String contacts;
+
+    /**
+     * 电话
+     */
+    @ApiModelProperty(value = "电话", dataType = "String")
+    @TableField("mobile")
+    private String mobile;
+
+    /**
+     * 地址
+     */
+    @ApiModelProperty(value = "地址", dataType = "String")
+    @TableField("address")
+    private String address;
+
+    /**
+     * 要求完成日期
+     */
+    @ApiModelProperty(value = "要求完成日期", dataType = "String")
+    @TableField("require_date")
+    private String requireDate;
+
+    /**
+     * 分包费用(元)
+     */
+    @ApiModelProperty(value = "分包费用(元)", dataType = "String")
+    @TableField("outsource_cost")
+    private Double outsourceCost;
+
+    /**
+     * 分包方负责人
+     */
+    @ApiModelProperty(value = "分包方负责人", dataType = "String")
+    @TableField("director")
+    private String director;
+
+    /**
+     * 分包项目
+     */
+    @ApiModelProperty(value = "分包项目", dataType = "String")
+    @TableField("item")
+    private String item;
+
+    /**
+     * 分包要求
+     */
+    @ApiModelProperty(value = "分包要求", dataType = "String")
+    @TableField("requires")
+    private String requires;
+
+    /**
+     * 创建人id
+     */
+    @ApiModelProperty(hidden = true)
+    @TableField("create_user_id")
+    private Long createUserId;
+
+    /**
+     * 创建人名字
+     */
+    @ExcelProperty(value = "申请人", order = 5)
+    @ApiModelProperty(value = "申请人", dataType = "String")
+    @TableField("create_user_name")
+    private String createUserName;
+
+    /**
+     * 审批状态
+     */
+    @ApiModelProperty(value = "审批状态", dataType = "String")
+    @DictCodeField(message = "审批状态描述不合法", cacheName = MeterDictCode.APPROVAL_STATUS)
+    @TableField("approval_status")
+    private String approvalStatus;
+
+    /**
+     * 流程实例id
+     */
+    @ApiModelProperty(value = "流程实例id", dataType = "String")
+    @TableField("process_id")
+    private String processId;
+
+    /**
+     * 创建时间
+     */
+    @ExcelProperty(value = "申请时间", order = 6)
+    @ApiModelProperty(value = "申请时间", dataType = "String")
+    @TableField("create_time")
+    private String createTime;
+
+    /**
+     * 更新时间
+     */
+    @ApiModelProperty(hidden = true)
+    @TableField("update_time")
+    private String updateTime;
+
+    @ApiModelProperty(value = "审批状态类型-字典value", dataType = "String")
+    @TableField(exist = false)
+    private String approvalStatusName;
+
+    @ApiModelProperty(value = "任务id（同意、驳回等操作使用）", dataType = "String")
+    @TableField(exist = false)
+    private String taskId;
+
+    @ApiModelProperty(value = "可选决策项（1同意驳回拒绝 2同意驳回 3同意拒绝，用于待审批列表同意/驳回/拒绝按钮展示）", dataType = "Integer")
+    @TableField(exist = false)
+    private Integer decisionItem;
+
+
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourcerInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourcerInfo.java
index ec4e997..f9aa69e 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourcerInfo.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourcerInfo.java
@@ -17,6 +17,7 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import javax.validation.constraints.NotEmpty;
 import java.io.Serializable;
 
 /**
@@ -59,6 +60,29 @@
     @TableField("outsourcer_name")
     private String outsourcerName;
 
+    @NotEmpty(message = "实验室代码不能为空")
+    @DictCodeField(message = "实验室代码描述不合法", cacheName = MeterDictCode.LAB_CODE)
+    @ApiModelProperty(value = "实验室代码(字典code)", dataType = "String")
+    @TableField("lab_code")
+    private String labCode;
+
+    @ApiModelProperty(value = "实验室代码(字典value)", dataType = "String")
+    @TableField(exist = false)
+    private String labCodeName;
+
+    /**
+     * 组别代码
+     */
+    @NotEmpty(message = "组别代码不能为空")
+    @DictCodeField(message = "组别代码描述不合法", cacheName = MeterDictCode.GROUP_CODE)
+    @ApiModelProperty(value = "组别代码(字典code)", dataType = "String")
+    @TableField("group_code")
+    private String groupCode;
+
+    @ApiModelProperty(value = "组别代码(字典value)", dataType = "String")
+    @TableField(exist = false)
+    private String groupCodeName;
+
     /**
      * 单位简称
      */
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardInfo.java
index c48eed7..dffdfdd 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardInfo.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardInfo.java
@@ -5,6 +5,7 @@
 import com.baomidou.mybatisplus.annotation.TableName;
 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;
 
@@ -18,6 +19,7 @@
  * @author wangpeng
  * @since 2023-08-04
  */
+@ApiModel
 @Data
 @TableName("biz_equipment_standard_info")
 public class BizEquipmentStandardInfo implements Serializable {
@@ -119,7 +121,7 @@
      * 管理状态(字典code)
      */
     @ApiModelProperty(value = "管理状态(字典code)", dataType = "String")
-    @DictCodeField(message = "管理状态不合法", cacheName = MeterDictCode.MANAGER_STATE)
+    @DictCodeField(message = "管理状态不合法", cacheName = MeterDictCode.STANDARD_MANAGER_STATE)
     @TableField("manage_status")
     private String manageStatus;
 
@@ -151,7 +153,7 @@
     /**
      * 温度(℃)
      */
-    @ApiModelProperty(value = "使用状态(字典code)", dataType = "String")
+    @ApiModelProperty(value = "温度(℃)", dataType = "String")
     @TableField("temperature")
     private Double temperature;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardInfoApproval.java b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardInfoApproval.java
index dbd86ab..9f58d83 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardInfoApproval.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardInfoApproval.java
@@ -150,7 +150,7 @@
      * 管理状态(字典code)
      */
     @ApiModelProperty(value = "管理状态(字典code)", dataType = "String")
-    @DictCodeField(message = "管理状态不合法", cacheName = MeterDictCode.MANAGER_STATE)
+    @DictCodeField(message = "管理状态不合法", cacheName = MeterDictCode.STANDARD_MANAGER_STATE)
     @TableField("manage_status")
     private String manageStatus;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardTechnologyRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardTechnologyRelation.java
index 0e612bd..751f26b 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardTechnologyRelation.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardTechnologyRelation.java
@@ -3,6 +3,7 @@
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -16,6 +17,7 @@
  * @author wangpeng
  * @since 2023-08-04
  */
+@ApiModel
 @Data
 @TableName("biz_equipment_standard_technology_relation")
 public class BizEquipmentStandardTechnologyRelation implements Serializable {
@@ -33,6 +35,10 @@
     @TableField("technology_file_id")
     private Long technologyFileId;
 
+    @ApiModelProperty(value = "依据的技术文件编号", dataType = "String")
+    @TableField("technology_file_no")
+    private String technologyFileNo;
+
     /**
      * 依据的技术文件名称(技术文件中现行测试校准检定方法表文件名字段)
      */
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerInfo.java
index d6e8bed..65cd6bc 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerInfo.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerInfo.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.model.resource;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -21,6 +28,11 @@
  * @author wangpeng
  * @since 2023-08-08
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @ApiModel
 @Data
 @TableName("biz_resource_customer_info")
@@ -35,6 +47,7 @@
     /**
      * 委托方编号
      */
+    @ExcelProperty(value = "委托方编号", order = 1)
     @ApiModelProperty(value = "委托方编号", dataType = "String")
     @TableField("customer_no")
     private String customerNo;
@@ -42,6 +55,7 @@
     /**
      * 委托方名称
      */
+    @ExcelProperty(value = "委托方名称", order = 2)
     @ApiModelProperty(value = "委托方名称(新建时为下拉选择一个受检单位组织的名字，传deptId字段，后端获取名称)", dataType = "String")
     @TableField("customer_name")
     private String customerName;
@@ -63,6 +77,7 @@
     /**
      * 联系人
      */
+    @ExcelProperty(value = "联系人", order = 3)
     @ApiModelProperty(value = "联系人", dataType = "String")
     @TableField("contacts")
     private String contacts;
@@ -70,6 +85,7 @@
     /**
      * 座机电话
      */
+    @ExcelProperty(value = "座机电话", order = 4)
     @ApiModelProperty(value = "座机电话", dataType = "String")
     @TableField("mobile")
     private String mobile;
@@ -77,6 +93,7 @@
     /**
      * 手机号码
      */
+    @ExcelProperty(value = "手机号码", order = 5)
     @ApiModelProperty(value = "手机号码", dataType = "String")
     @TableField("phone")
     private String phone;
@@ -91,6 +108,7 @@
     /**
      * 地址
      */
+    @ExcelProperty(value = "地址", order = 6)
     @ApiModelProperty(value = "地址", dataType = "String")
     @TableField("address")
     private String address;
@@ -141,6 +159,7 @@
     /**
      * 创建时间
      */
+    @ExcelProperty(value = "创建时间", order = 7)
     @ApiModelProperty(value = "创建时间", dataType = "String")
     @TableField("create_time")
     private String createTime;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerSuggestForm.java b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerSuggestForm.java
index 7201bbd..701bf8b 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerSuggestForm.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerSuggestForm.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.model.resource;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -22,6 +29,11 @@
  * @author wangpeng
  * @since 2023-08-08
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @ApiModel
 @Data
 @TableName("biz_resource_customer_suggest_form")
@@ -44,7 +56,8 @@
     /**
      * 委托方名称
      */
-    @ApiModelProperty(value = "委托方名称", dataType = "String")
+    @ExcelProperty(value = "意见反馈单位", order = 2)
+    @ApiModelProperty(value = "意见反馈单位", dataType = "String")
     @TableField("customer_name")
     private String customerName;
 
@@ -59,7 +72,8 @@
     /**
      * 委托方意见反馈部门名称
      */
-    @ApiModelProperty(value = "委托方意见反馈部门名称", dataType = "String")
+    @ExcelProperty(value = "委托方意见反馈部门", order = 3)
+    @ApiModelProperty(value = "委托方意见反馈部门", dataType = "String")
     @TableField("customer_dept_name")
     private String customerDeptName;
 
@@ -73,6 +87,7 @@
     /**
      * 表单编号
      */
+    @ExcelProperty(value = "表单编号", order = 1)
     @ApiModelProperty(value = "表单编号", dataType = "String")
     @TableField("form_no")
     private String formNo;
@@ -111,6 +126,7 @@
     /**
      * 创建人名字
      */
+    @ExcelProperty(value = "创建人", order = 4)
     @ApiModelProperty(value = "创建人名字", dataType = "String")
     @TableField("create_user_name")
     private String createUserName;
@@ -147,6 +163,7 @@
     /**
      * 创建时间
      */
+    @ExcelProperty(value = "创建时间", order = 5)
     @ApiModelProperty(value = "创建时间", dataType = "String")
     @TableField("create_time")
     private String createTime;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSealInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSealInfo.java
index cbf05d7..9bf389d 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSealInfo.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSealInfo.java
@@ -106,6 +106,10 @@
     @TableField("minio_file_name")
     private String minioFileName;
 
+    @ApiModelProperty(value = "minio存储文件url", dataType = "String")
+    @TableField(exist = false)
+    private String minioFileUrl;
+
     @ApiModelProperty(value = "创建时间", dataType = "String")
     @TableField("create_time")
     private String createTime;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSealUseNote.java b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSealUseNote.java
index 3f2d9e8..3ce16a8 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSealUseNote.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSealUseNote.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.model.resource;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -20,6 +27,11 @@
  * @author wangpeng
  * @since 2023-07-28
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @ApiModel
 @Data
 @TableName("biz_resource_seal_use_note")
@@ -34,6 +46,7 @@
     /**
      * 登记表编号
      */
+    @ExcelProperty(value = "申请单编号", order = 1)
     @ApiModelProperty(value = "登记表编号(自动生成)", dataType = "String")
     @TableField("note_form_no")
     private String noteFormNo;
@@ -55,6 +68,7 @@
     /**
      * 申请部门
      */
+    @ExcelProperty(value = "申请部门", order = 5)
     @ApiModelProperty(value = "申请部门", dataType = "String")
     @TableField("apply_dept_name")
     private String applyDeptName;
@@ -69,6 +83,7 @@
     /**
      * 申请人
      */
+    @ExcelProperty(value = "申请人", order = 6)
     @ApiModelProperty(value = "申请人", dataType = "String")
     @TableField("apply_user_name")
     private String applyUserName;
@@ -76,6 +91,7 @@
     /**
      * 申请时间
      */
+    @ExcelProperty(value = "申请时间", order = 7)
     @ApiModelProperty(value = "申请时间(新增自动获取当前时间)", dataType = "String")
     @TableField("apply_time")
     private String applyTime;
@@ -130,6 +146,26 @@
     @TableField("update_time")
     private String updateTime;
 
+    @ExcelProperty(value = "印章名称", order = 2)
+    @ApiModelProperty(value = "印章名称(列表返回参数)", dataType = "String")
+    @TableField(exist = false)
+    private String sealName;
+
+    @DictCodeField(message = "印章类型描述不合法", cacheName = MeterDictCode.SEAL_TYPE)
+    @ApiModelProperty(hidden = true)
+    @TableField(exist = false)
+    private String sealType;
+
+    @ExcelProperty(value = "印章类型", order = 3)
+    @ApiModelProperty(value = "印章类型(列表返回参数)", dataType = "String")
+    @TableField(exist = false)
+    private String sealTypeName;
+
+    @ExcelProperty(value = "批准人", order = 4)
+    @ApiModelProperty(value = "批准人(列表返回参数)", dataType = "String")
+    @TableField(exist = false)
+    private String approverName;
+
     @ApiModelProperty(value = "审批状态类型-字典value", dataType = "String")
     @TableField(exist = false)
     private String approvalStatusName;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceStaffInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceStaffInfo.java
index 5ef995b..41563a1 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceStaffInfo.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceStaffInfo.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.model.resource;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -20,6 +27,11 @@
  * @author wangpeng
  * @since 2023-07-25
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @ApiModel
 @Data
 @TableName("biz_resource_staff_info")
@@ -38,6 +50,7 @@
     /**
      * 人员编号
      */
+    @ExcelProperty(value = "人员编号",order = 0)
     @NotEmpty(message = "人员编号不能为空")
     @ApiModelProperty(value = "人员编号", dataType = "String")
     @TableField("staff_no")
@@ -46,6 +59,7 @@
     /**
      * 姓名
      */
+    @ExcelProperty(value = "姓名",order = 1)
     @ApiModelProperty(value = "姓名", dataType = "String")
     @TableField("staff_name")
     private String staffName;
@@ -152,13 +166,15 @@
     /**
      * 部门名字
      */
-    @ApiModelProperty(value = "部门名字", dataType = "String")
+    @ExcelProperty(value = "工作部门",order = 4)
+    @ApiModelProperty(value = "工作部门", dataType = "String")
     @TableField("dept_name")
     private String deptName;
 
     /**
      * 岗位
      */
+    @ExcelProperty(value = "岗位",order = 2)
     @ApiModelProperty(value = "岗位", dataType = "String")
     @TableField("station")
     private String station;
@@ -166,6 +182,7 @@
     /**
      * 计量专业
      */
+    @ExcelProperty(value = "计量专业",order = 5)
     @ApiModelProperty(value = "计量专业", dataType = "String")
     @TableField("major")
     private String major;
@@ -173,6 +190,7 @@
     /**
      * 证号
      */
+    @ExcelProperty(value = "证号",order = 3)
     @ApiModelProperty(value = "证号", dataType = "String")
     @TableField("certificate_number")
     private String certificateNumber;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSupplierInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSupplierInfo.java
index eb5ef01..a1e2697 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSupplierInfo.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSupplierInfo.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.model.resource;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -20,6 +27,11 @@
  * @author wangpeng
  * @since 2023-07-27
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @ApiModel
 @Data
 @TableName("biz_resource_supplier_info")
@@ -34,6 +46,7 @@
     /**
      * 供方编号
      */
+    @ExcelProperty(value = "供方编号", order = 1)
     @ApiModelProperty(value = "供方编号(自动生成)", dataType = "String")
     @TableField("supplier_no")
     private String supplierNo;
@@ -41,6 +54,7 @@
     /**
      * 供方名称
      */
+    @ExcelProperty(value = "供方名称", order = 2)
     @ApiModelProperty(value = "供方名称", dataType = "String")
     @TableField("supplier_name")
     private String supplierName;
@@ -60,6 +74,7 @@
     @TableField("supplier_type")
     private String supplierType;
 
+    @ExcelProperty(value = "供方类型", order = 3)
     @ApiModelProperty(value = "供方类型(字典value)", dataType = "String")
     @TableField(exist = false)
     private String supplierTypeName;
@@ -109,7 +124,8 @@
     /**
      * 电话
      */
-    @ApiModelProperty(value = "电话", dataType = "String")
+    @ExcelProperty(value = "联系电话", order = 4)
+    @ApiModelProperty(value = "联系电话", dataType = "String")
     @TableField("phone")
     private String phone;
 
@@ -158,6 +174,7 @@
     /**
      * 公司地址-省
      */
+    @ExcelProperty(value = "地址-省", order = 6)
     @ApiModelProperty(value = "公司地址-省", dataType = "String")
     @TableField("company_province_name")
     private String companyProvinceName;
@@ -172,6 +189,7 @@
     /**
      * 公司地址-市
      */
+    @ExcelProperty(value = "地址-市", order = 7)
     @ApiModelProperty(value = "公司地址-市", dataType = "String")
     @TableField("company_city_name")
     private String companyCityName;
@@ -186,6 +204,7 @@
     /**
      * 公司地址-区
      */
+    @ExcelProperty(value = "地址-区", order = 8)
     @ApiModelProperty(value = "公司地址-区", dataType = "String")
     @TableField("company_area_name")
     private String companyAreaName;
@@ -193,6 +212,7 @@
     /**
      * 公司地址-详细地址
      */
+    @ExcelProperty(value = "地址-详细地址", order = 9)
     @ApiModelProperty(value = "公司地址-详细地址", dataType = "String")
     @TableField("company_address")
     private String companyAddress;
@@ -200,6 +220,7 @@
     /**
      * 服务和供应的内容
      */
+    @ExcelProperty(value = "服务和供应的内容", order = 5)
     @ApiModelProperty(value = "服务和供应的内容", dataType = "String")
     @TableField("supplier_content")
     private String supplierContent;
@@ -250,6 +271,7 @@
     /**
      * 创建时间
      */
+    @ExcelProperty(value = "创建时间", order = 9)
     @ApiModelProperty(value = "创建时间", dataType = "String")
     @TableField("create_time")
     private String createTime;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/EnvLocationInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/EnvLocationInfo.java
new file mode 100644
index 0000000..d8e2d7b
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/EnvLocationInfo.java
@@ -0,0 +1,83 @@
+package com.casic.missiles.model.resource;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotEmpty;
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 实验室环境监控系统-设备表
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-06-07
+ */
+@ApiModel
+@Data
+@TableName("env_location_info")
+public class EnvLocationInfo implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "主键id", dataType = "Long")
+    @TableId("id")
+    private Long id;
+
+    /**
+     * 地点编号
+     */
+    @NotEmpty(message = "地点编号不能为空")
+    @ApiModelProperty(value = "地点编号", dataType = "String")
+    @TableField("location_no")
+    private String locationNo;
+
+    /**
+     * 地点名称
+     */
+    @ApiModelProperty(value = "地点名称", dataType = "String")
+    @TableField("location_name")
+    private String locationName;
+
+    /**
+     * 地点位置
+     */
+    @ApiModelProperty(value = "地点位置", dataType = "String")
+    @TableField("location_position")
+    private String locationPosition;
+
+    /**
+     * 创建人id
+     */
+    @ApiModelProperty(value = "创建人id", dataType = "Long")
+    @TableField("create_user_id")
+    private Long createUserId;
+
+    /**
+     * 创建人
+     */
+    @ApiModelProperty(value = "创建人", dataType = "String")
+    @TableField("create_user")
+    private String createUser;
+
+    /**
+     * 创建时间
+     */
+    @ApiModelProperty(value = "创建时间", dataType = "String")
+    @TableField("create_time")
+    private String createTime;
+
+    /**
+     * 更新时间
+     */
+    @ApiModelProperty(value = "更新时间", dataType = "String")
+    @TableField("update_time")
+    private String updateTime;
+
+
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemFileConfig.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemFileConfig.java
index 19e6845..86e569c 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemFileConfig.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemFileConfig.java
@@ -30,7 +30,7 @@
     @ApiModelProperty(value = "系统类别(1业务系统2受检系统3环境系统)", dataType = "Integer")
     @NotNull(message = "系统类别不能为空")
     @TableField("system_type")
-    private Integer systemType;
+    private Integer systemType = 1;
 
     @ApiModelProperty("下载编号")
     @TableField("download_no")
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemNotice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemNotice.java
index e94297d..06ec37d 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemNotice.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemNotice.java
@@ -34,7 +34,7 @@
     @ApiModelProperty(value = "系统类别(1业务系统2受检系统3环境系统)", dataType = "Integer")
     @NotNull(message = "系统类别不能为空")
     @TableField("system_type")
-    private Integer systemType;
+    private Integer systemType = 1;
 
     /**
      * 通知公告编号
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSign.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSign.java
index 6c0d7c9..954f4f8 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSign.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSign.java
@@ -51,7 +51,7 @@
     @ApiModelProperty(value = "系统类别(1业务系统2受检系统3环境系统)", dataType = "Integer")
     @NotNull(message = "系统类别不能为空")
     @TableField("system_type")
-    private Integer systemType;
+    private Integer systemType = 1;
 
     /**
      * 签名编号
@@ -130,4 +130,8 @@
     @TableField(exist = false)
     private List<Long> userIdList;
 
+    @ApiModelProperty(hidden = true)
+    @TableField(exist = false)
+    private String deptName;
+
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemTemplate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemTemplate.java
index 503a457..1d27ebe 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemTemplate.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemTemplate.java
@@ -47,7 +47,7 @@
     @ApiModelProperty(value = "系统类别(1业务系统2受检系统3环境系统)", dataType = "Integer")
     @NotNull(message = "系统类别不能为空")
     @TableField("system_type")
-    private Integer systemType;
+    private Integer systemType = 1;
 
     /**
      * 模板编号
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java
index 8c21cb0..f61e4a8 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java
@@ -32,4 +32,8 @@
     ReturnDTO approvalDelete(ApprovalDeleteRequest request);
 
     ReturnDTO failUpdate(T request);
+
+    List<O> listExport(R request);
+
+    List<O> listExportByIds(List<Long> ids);
 }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java
index 724166f..9bce15b 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java
@@ -157,6 +157,29 @@
         throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
     }
 
+    @Override
+    public List<O> listExport(R request) {
+        request.setCreateUserId(null);
+        request.setApprovalStatus(ApprovalStatusEnum.PASSED);
+        Page<O> page = PageFactory.defaultPage();
+        page.setCurrent(1);
+        page.setSearchCount(false);
+        page.setSize(Integer.MAX_VALUE);
+        Page<O> resultPage = this.baseMapper.selectBatchForApprovalList(page, request, null);
+        return resultPage.getRecords();
+    }
+
+    @Override
+    public List<O> listExportByIds(List<Long> ids) {
+        Page<O> page = PageFactory.defaultPage();
+        page.setCurrent(1);
+        page.setSearchCount(false);
+        page.setSize(Integer.MAX_VALUE);
+        List<String> businessKeys = ids.stream().map(String::valueOf).collect(Collectors.toList());
+        Page<O> resultPage = this.baseMapper.selectBatchForApprovalList(page, null, businessKeys);
+        return resultPage.getRecords();
+    }
+
     protected ReturnDTO updateApprovalStatus(Long id, String processId, String approvalStatus) {
         UpdateWrapper<T> updateWrapper = new UpdateWrapper<>();
         updateWrapper.eq("id", id);
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificatePrintServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificatePrintServiceImpl.java
index f6e4706..3228497 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificatePrintServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificatePrintServiceImpl.java
@@ -162,6 +162,30 @@
         return ReturnUtil.success(printLogMapper.selectList(wrapper));
     }
 
+    @Override
+    public List<CertificatePrintListResponse> listByIds(List<Long> ids) {
+        Page<CertificatePrintListResponse> page = PageFactory.defaultPage();
+        page.setCurrent(1);
+        page.setSearchCount(false);
+        page.setSize(Integer.MAX_VALUE);
+        List<String> businessKeys = ids.stream().map(String::valueOf).collect(Collectors.toList());
+        Page<CertificatePrintListResponse> resultPage = this.baseMapper.selectBatchForApprovalList(page, null, businessKeys);
+        return resultPage.getRecords();
+    }
+
+    @Override
+    public List<CertificatePrintListResponse> list(CertificatePrintApprovalListRequest request) {
+        request.setCreateUserId(null);
+        request.setApprovalStatus(null);
+        request.setPrintStatus(null);
+        Page<CertificatePrintListResponse> page = PageFactory.defaultPage();
+        page.setCurrent(1);
+        page.setSearchCount(false);
+        page.setSize(Integer.MAX_VALUE);
+        Page<CertificatePrintListResponse> resultPage = certificatePrintMapper.selectBatchForApprovalList(page, request, null);
+        return resultPage.getRecords();
+    }
+
     private void savePrintLog(Long id) {
         BizBusinessCertificatePrintLog printLog = new BizBusinessCertificatePrintLog();
         BizBusinessCertificatePrint certificatePrint = certificatePrintMapper.selectById(id);
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificateReportServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificateReportServiceImpl.java
index 457555f..24146be 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificateReportServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificateReportServiceImpl.java
@@ -158,8 +158,8 @@
         QueryWrapper<BizBusinessCertificateMeasureResultData> mWrapper = new QueryWrapper<>();
         mWrapper.eq("report_id", reportId);
         boolean mRemove = certificateMeasureResultDataService.remove(mWrapper);
-        Assert.isFalse(eRemove || mRemove, () -> {
+        if(!eRemove || !mRemove){
             throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
-        });
+        }
     }
 }

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java
index bb0c50f..13a699b 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java
@@ -12,6 +12,7 @@
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.IGeneralApprovalService;
+import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
@@ -19,6 +20,7 @@
 import org.springframework.web.bind.annotation.RequestBody;
 
 import javax.validation.Valid;
+import java.util.List;
 import java.util.Objects;
 
 /**
@@ -117,4 +119,17 @@
         }
         return baseApprovalService.failUpdate(request);
     }
+
+    public List<O> exportList(@RequestBody @Valid R request) throws Exception {
+        List<O> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = baseApprovalService.listExportByIds(request.getIds());
+        } else {
+            list = baseApprovalService.listExport(request);
+        }
+        for (O record : list) {
+            DictCodeUtils.convertDictCodeToName(record);
+        }
+        return list;
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java
index 8a90961..d775831 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java
@@ -5,6 +5,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.business.certificate.CertificateChangeApplyApprovalListRequest;
 import com.casic.missiles.dto.business.certificate.CertificateChangeApplySaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessCertificateChangeApply;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
@@ -20,6 +21,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -48,4 +50,12 @@
         }
         return changeApplyService.saveChangeApply(request);
     }
+
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody CertificateChangeApplyApprovalListRequest request) throws Exception {
+        List<BizBusinessCertificateChangeApply> list = super.exportList(request);
+        super.exportExcel(BizBusinessCertificateChangeApply.class, list, ExportEnum.CERTIFICATE_CHANGE_APPLY.getSheetName());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java
index 5fc4b07..af8230e 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java
@@ -9,6 +9,7 @@
 import com.casic.missiles.dto.business.certificate.CertificatePrintApprovalListRequest;
 import com.casic.missiles.dto.business.certificate.CertificatePrintListResponse;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.enums.business.CertificatePrintStatusEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessCertificatePrintLog;
@@ -18,10 +19,16 @@
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.io.IOException;
+import java.util.List;
 import java.util.Objects;
 
 /**
@@ -98,4 +105,16 @@
         });
         return certificatePrintService.certificatePrintLog(idDTO.getId());
     }
+
+    @ApiOperation("证书打印审批导出")
+    @PostMapping("/listExport")
+    public void exportList(@RequestBody CertificatePrintApprovalListRequest request) throws IOException {
+        List<CertificatePrintListResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = certificatePrintService.listByIds(request.getIds());
+        } else {
+            list = certificatePrintService.list(request);
+        }
+        super.exportExcel(CertificatePrintListResponse.class, list, ExportEnum.CERTIFICATE_PRINT.getSheetName());
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java
index 63b06dc..6b2efd5 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java
@@ -6,6 +6,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.business.certificate.CertificateReportApprovalListRequest;
 import com.casic.missiles.dto.business.certificate.CertificateReportSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessCertificateReport;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
@@ -21,6 +22,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -50,7 +52,7 @@
         return certificateReportService.saveCertificateReport(request);
     }
 
-    @ApiOperation("证书审批详情（基本信息）")
+    @ApiOperation("详情（基本信息）")
     @PostMapping("/detail")
     public ReturnDTO<BizBusinessCertificateReport> detail(@RequestBody @Valid BaseDetailRequest request, BindingResult bindingResult) throws Exception {
         if(bindingResult.hasErrors()){
@@ -59,4 +61,11 @@
         return certificateReportService.detail(request);
     }
 
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody CertificateReportApprovalListRequest request) throws Exception {
+        List<BizBusinessCertificateReport> list = super.exportList(request);
+        super.exportExcel(BizBusinessCertificateReport.class, list, ExportEnum.CERTIFICATE_REPORT.getSheetName());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java
index 46b26bd..57c0809 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java
@@ -10,20 +10,21 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.business.identify.IdentifyListRequest;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessIdentifyInfo;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.business.IBizBusinessIdentifyInfoService;
+import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import javax.validation.Valid;
+import java.util.List;
 import java.util.Objects;
 
 /**
@@ -57,16 +58,13 @@
         return identifyInfoService.addIdentify(identifyInfo);
     }
 
-    @ApiOperation("标识打印更新")
+    @ApiOperation("标识打印更新（更新打印时间）")
     @PostMapping("/update")
-    public ReturnDTO updateIdentify(@RequestBody @Valid BizBusinessIdentifyInfo identifyInfo, BindingResult bindingResult) {
-        Assert.isFalse(Objects.isNull(identifyInfo.getId()), () -> {
+    public ReturnDTO updateIdentify(@RequestBody @Valid IdDTO idDTO) {
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        Assert.isFalse(bindingResult.hasErrors(), () -> {
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        });
-        return identifyInfoService.updateIdentify(identifyInfo);
+        return identifyInfoService.updateIdentify(idDTO.getId());
     }
 
     @ApiOperation("标识打印删除")
@@ -77,4 +75,37 @@
         });
         return identifyInfoService.deleteIdentify(idDTO.getId());
     }
+
+    @ApiOperation("标识打印导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody @Valid IdentifyListRequest request, BindingResult bindingResult) throws Exception {
+        if (bindingResult.hasErrors()) {
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        List<BizBusinessIdentifyInfo> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = identifyInfoService.listByIds(request.getIds());
+        } else {
+            list = identifyInfoService.list(request);
+        }
+        for (BizBusinessIdentifyInfo record : list) {
+            DictCodeUtils.convertDictCodeToName(record);
+        }
+        super.exportExcel(BizBusinessIdentifyInfo.class, list, ExportEnum.IDENTIFY_EXPORT.getSheetName());
+    }
+
+
+    // TODO: 2023/8/23 查询设备信息，4个底部按钮查设备（按钮的作用就是前端用来调不同接口、用来区分中间即将展示的标识），前端弹窗选设备，在确定保存时前端根据底部按钮判断传入设备类型deviceType字典code
+    // TODO: 2023/8/23 接口：查受检设备（第1个按钮），查设备台账（后3个按钮同一接口），查询之后前端根据标志类型的不同加到中间页面时进行判断（按产品给的对应表）
+    // TODO: 2023/8/23 提供二维码接口，前端在加到中间页面时调用一下
+
+    @ApiOperation("设备二维码")
+    @PostMapping("/equipment/qrCode")
+    public ReturnDTO<String> equipmentQrCode(@RequestBody @Valid IdDTO idDTO) {
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return identifyInfoService.equipmentQrCode(idDTO.getId());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java
index 707be6e..7e0453d 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java
@@ -117,7 +117,7 @@
     }
 
     @ApiOperation("任务单导出")
-    @PostMapping("/export")
+    @PostMapping("/listExport")
     public void orderExport(@RequestBody @Valid OrderListRequest request, HttpServletResponse response) {
         businessOrderService.orderExport(request, response);
     }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java
index 529a6ce..51432be 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java
@@ -1,9 +1,28 @@
 package com.casic.missiles.controller.business;
 
+import com.casic.missiles.controller.GeneralApprovalController;
+import com.casic.missiles.dto.BaseApprovalSubmitRequest;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.business.outsource.OutsourceAssessApprovalListRequest;
+import com.casic.missiles.dto.business.outsource.OutsourceAssessSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
+import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.model.business.BizBusinessOutsourceAssess;
+import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
+import com.casic.missiles.service.IGeneralApprovalService;
+import com.casic.missiles.service.business.IBizBusinessOutsourceAssessService;
 import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.BindingResult;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.validation.Valid;
+import java.util.List;
+
 /**
  * <p>
  * 计量检定业务-分包管理-测试、校准或检定工作分包评审表 前端控制器
@@ -15,6 +34,27 @@
 @Api(tags = "分包管理-测试、校准或检定工作分包评审表")
 @RestController
 @RequestMapping("/business/outsource/assess")
-public class BizBusinessOutsourceAssessController {
+public class BizBusinessOutsourceAssessController extends GeneralApprovalController<BizBusinessOutsourceAssess, BizBusinessOutsourceAssess, OutsourceAssessApprovalListRequest, BaseApprovalSubmitRequest> {
+    @Autowired
+    private IBizBusinessOutsourceAssessService outsourceAssessService;
 
+    public BizBusinessOutsourceAssessController(IGeneralApprovalService<BizBusinessOutsourceAssess, BizBusinessOutsourceAssess, OutsourceAssessApprovalListRequest, BaseApprovalSubmitRequest> baseApprovalService) {
+        super(baseApprovalService);
+    }
+
+    @ApiOperation("草稿箱-保存")
+    @PostMapping("/save")
+    public ReturnDTO<OutsourceAssessSaveResponse> saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceAssess request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        return outsourceAssessService.saveOutsourceAssess(request);
+    }
+
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception {
+        List<BizBusinessOutsourceAssess> list = super.exportList(request);
+        super.exportExcel(BizBusinessOutsourceAssess.class, list, ExportEnum.OUTSOURCE_ASSESS.getSheetName());
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java
new file mode 100644
index 0000000..9adef18
--- /dev/null
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java
@@ -0,0 +1,60 @@
+package com.casic.missiles.controller.business;
+
+import com.casic.missiles.controller.GeneralApprovalController;
+import com.casic.missiles.dto.BaseApprovalSubmitRequest;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.business.outsource.OutsourceProtocolApprovalListRequest;
+import com.casic.missiles.dto.business.outsource.OutsourceProtocolSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
+import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.model.business.BizBusinessOutsourceProtocol;
+import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
+import com.casic.missiles.service.IGeneralApprovalService;
+import com.casic.missiles.service.business.IBizBusinessOutsourceProtocolService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.BindingResult;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.validation.Valid;
+import java.util.List;
+
+/**
+ * <p>
+ * 计量检定业务-分包管理-测试、校准或检定工作分包协议书 前端控制器
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-08-24
+ */
+@Api(tags = "分包管理-测试、校准或检定工作分包协议书")
+@RestController
+@RequestMapping("/business/outsource/protocol")
+public class BizBusinessOutsourceProtocolController extends GeneralApprovalController<BizBusinessOutsourceProtocol, BizBusinessOutsourceProtocol, OutsourceProtocolApprovalListRequest, BaseApprovalSubmitRequest> {
+    @Autowired
+    private IBizBusinessOutsourceProtocolService outsourceProtocolService;
+
+    public BizBusinessOutsourceProtocolController(IGeneralApprovalService<BizBusinessOutsourceProtocol, BizBusinessOutsourceProtocol, OutsourceProtocolApprovalListRequest, BaseApprovalSubmitRequest> baseApprovalService) {
+        super(baseApprovalService);
+    }
+
+    @ApiOperation("草稿箱-保存")
+    @PostMapping("/save")
+    public ReturnDTO<OutsourceProtocolSaveResponse> saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceProtocol request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        return outsourceProtocolService.saveOutsourceProtocol(request);
+    }
+
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody OutsourceProtocolApprovalListRequest request) throws Exception {
+        List<BizBusinessOutsourceProtocol> list = super.exportList(request);
+        super.exportExcel(BizBusinessOutsourceProtocol.class, list, ExportEnum.OUTSOURCE_PROTOCOL.getSheetName());
+    }
+}
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java
index 097f645..f0f0943 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java
@@ -17,7 +17,6 @@
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.IGeneralApprovalService;
 import com.casic.missiles.service.business.IBizBusinessOutsourcerInfoService;
-import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -71,19 +70,8 @@
 
     @ApiOperation("分包方导出")
     @PostMapping("/listExport")
-    public void export(@RequestBody @Valid OutsourcerInfoApprovalListRequest request, BindingResult bindingResult) throws Exception {
-        if (bindingResult.hasErrors()) {
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        }
-        List<BizBusinessOutsourcerInfo> list;
-        if (!CollectionUtils.isEmpty(request.getIds())) {
-            list = outsourcerInfoService.listByIds(request.getIds());
-        } else {
-            list = outsourcerInfoService.list(request);
-        }
-        for (BizBusinessOutsourcerInfo record : list) {
-            DictCodeUtils.convertDictCodeToName(record);
-        }
+    public void export(@RequestBody OutsourcerInfoApprovalListRequest request) throws Exception {
+        List<BizBusinessOutsourcerInfo> list = super.exportList(request);
         super.exportExcel(BizBusinessOutsourcerInfo.class, list, ExportEnum.OUTSOURCER_EXPORT.getSheetName());
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java
index c2cbf9f..0410918 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java
@@ -17,11 +17,9 @@
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.IGeneralApprovalService;
 import com.casic.missiles.service.business.IBizBusinessSiteExecutiveInfoService;
-import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -60,7 +58,7 @@
         return siteExecutiveInfoService.saveSiteExecutiveInfo(siteExecutiveInfo);
     }
 
-    @ApiOperation("现场检测详情")
+    @ApiOperation("详情")
     @PostMapping("/detail")
     public ReturnDTO<SiteExecutiveDetailResponse> siteExecutiveDetail(@RequestBody @Valid IdDTO idDTO) throws Exception {
         Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
@@ -69,21 +67,10 @@
         return ReturnUtil.success(siteExecutiveInfoService.detail(idDTO.getId()));
     }
 
-    @ApiOperation("现场检测导出")
+    @ApiOperation("导出")
     @PostMapping("/listExport")
-    public void export(@RequestBody @Valid SiteExecutiveApprovalListRequest request, BindingResult bindingResult) throws Exception {
-        if (bindingResult.hasErrors()) {
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        }
-        List<SiteExecutiveApprovalListResponse> list;
-        if (!CollectionUtils.isEmpty(request.getIds())) {
-            list = siteExecutiveInfoService.listInfoByIds(request.getIds());
-        } else {
-            list = siteExecutiveInfoService.listInfo(request);
-        }
-        for (SiteExecutiveApprovalListResponse record : list) {
-            DictCodeUtils.convertDictCodeToName(record);
-        }
+    public void export(@RequestBody SiteExecutiveApprovalListRequest request) throws Exception {
+        List<SiteExecutiveApprovalListResponse> list = super.exportList(request);
         super.exportExcel(SiteExecutiveApprovalListResponse.class, list, ExportEnum.SITE_EXECUTIVE_EXPORT.getSheetName());
     }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
index 7e793cd..a92e209 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
@@ -55,7 +55,7 @@
 
     @ApiOperation("设备收发列表导出")
     @PostMapping("/export")
-    public void exportList(@RequestBody @Valid SampleDispatchListRequest request) throws IOException {
+    public void exportList(@RequestBody SampleDispatchListRequest request) throws IOException {
         List<SampleDispatchListResponse> list;
         if (!CollectionUtils.isEmpty(request.getIds())) {
             list = dispatchService.listByIds(request.getIds());
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java
index cdc77fc..d120fd4 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java
@@ -7,6 +7,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.business.labExecutive.*;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.business.IBusinessLabExecutiveInfoService;
@@ -14,6 +15,7 @@
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.*;
 
@@ -32,7 +34,7 @@
     @Autowired
     private IBusinessLabExecutiveInfoService labExecutiveInfoService;
 
-    @ApiOperation("实验室检测-部门检测-查询各状态列表（待检测、检测中、检测完）")
+    @ApiOperation("实验室任务-查询各状态列表（待检测、检测中、检测完）")
     @PostMapping("/deptExecutive/List")
     public ReturnDTO<PageInfoBT<SampleLabExecutiveListResponse>> queryDeptExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
@@ -43,10 +45,19 @@
         return ReturnUtil.success(super.packForBT(labExecutiveInfoService.deptLabExecutiveListPage(page, labExecutiveListRequest)));
     }
 
-    /**
-     * 实验室检测-我的检测-查询各状态列表（待检测、检测中、检测完）
-     */
-    @ApiOperation("实验室检测-我的检测-查询各状态列表（待检测、检测中、检测完）")
+    @ApiOperation("实验室任务导出")
+    @PostMapping("/deptExecutive/export")
+    public void deptExportList(@RequestBody @Valid SampleLabExecutiveListRequest request) throws Exception {
+        List<SampleLabExecutiveListResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = labExecutiveInfoService.deptLabExecutiveListByIds(request.getMeasureStatus(), request.getIds());
+        } else {
+            list = labExecutiveInfoService.deptLabExecutiveList(request);
+        }
+        super.exportExcel(SampleLabExecutiveListResponse.class, list, ExportEnum.DEPT_EXECUTIVE_TASK.getSheetName());
+    }
+
+    @ApiOperation("我的任务-查询各状态列表（待检测、检测中、检测完）")
     @PostMapping("/myExecutive/list")
     public ReturnDTO<PageInfoBT<SampleLabExecutiveListResponse>> queryMyExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
@@ -57,19 +68,25 @@
         return ReturnUtil.success(super.packForBT(labExecutiveInfoService.myLabExecutiveListPage(page, labExecutiveListRequest)));
     }
 
-    /**
-     * 实验室检测-我的检测-查询各状态样品数量（待检测、检测中、检测完）
-     */
-    @ApiOperation("实验室检测-我的检测-查询各状态样品数量（待检测、检测中、检测完）")
+    @ApiOperation("我的任务导出")
+    @PostMapping("/myExecutive/export")
+    public void exportList(@RequestBody @Valid SampleLabExecutiveListRequest request) throws Exception {
+        List<SampleLabExecutiveListResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = labExecutiveInfoService.myLabExecutiveListByIds(request.getMeasureStatus(), request.getIds());
+        } else {
+            list = labExecutiveInfoService.myLabExecutiveList(request);
+        }
+        super.exportExcel(SampleLabExecutiveListResponse.class, list, ExportEnum.MY_EXECUTIVE_TASK.getSheetName());
+    }
+
+    @ApiOperation("我的任务-查询各状态样品数量（待检测、检测中、检测完）")
     @GetMapping("/myExecutive/amount")
     public ReturnDTO<List<SampleAmountResponse>> queryMyExecutiveAmount() {
         return ReturnUtil.success(labExecutiveInfoService.myExecutiveAmount());
     }
 
-    /**
-     * 实验室检测-部门检测-分配（分配给具体人员）
-     */
-    @ApiOperation("实验室检测-部门检测-分配按钮（分配给具体人员）")
+    @ApiOperation("实验室任务-分配按钮（分配给具体人员）")
     @PostMapping("/deptExecutive/allocate")
     public ReturnDTO allocateStaff(@RequestBody @Valid SampleAllocateRequest sampleAllocateRequest, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -78,10 +95,7 @@
         return labExecutiveInfoService.allocateStaff(sampleAllocateRequest);
     }
 
-    /**
-     * 实验室检测-我的检测-检定人扫描收入（待检测->检测中）
-     */
-    @ApiOperation("实验室检测-我的检测-检定人扫描收入（待检测->检测中）")
+    @ApiOperation("我的任务-检定人扫描收入（待检测->检测中）")
     @PostMapping("/myExecutive/receive")
     public ReturnDTO sampleReceive(@RequestBody @Valid List<SampleOperateRequest> requestList, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -90,10 +104,7 @@
         return labExecutiveInfoService.sampleReceive(requestList);
     }
 
-    /**
-     * 实验室检测-负责人/检定人扫描检完（检测中->检测完）
-     */
-    @ApiOperation("实验室检测-负责人/检定人扫描检完（检测中->检测完）")
+    @ApiOperation("实验室任务-负责人/检定人扫描检完（检测中->检测完）")
     @PostMapping("/myExecutive/complete")
     public ReturnDTO sampleExecutiveComplete(@RequestBody @Valid List<SampleOperateRequest> requestList, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -102,10 +113,7 @@
         return labExecutiveInfoService.sampleExecutiveComplete(requestList);
     }
 
-    /**
-     * 实验室检测-部门检测/我的检测 编辑（只能修改应出具证书）
-     */
-    @ApiOperation("实验室检测-部门检测/我的检测 编辑（只能修改应出具证书）")
+    @ApiOperation("实验室任务/我的任务 编辑（只能修改应出具证书）")
     @PostMapping("/executive/update")
     public ReturnDTO updateExecutive(@RequestBody @Valid UpdateExecutiveRequest request, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -114,10 +122,7 @@
         return labExecutiveInfoService.updateExecutive(request);
     }
 
-    /**
-     * 实验室检测-部门检测/我的检测 详情
-     */
-    @ApiOperation("实验室检测-部门检测/我的检测 详情")
+    @ApiOperation("实验室任务/我的任务 详情")
     @PostMapping("/executive/detail")
     public ReturnDTO<ExecutiveDetailResponse> executiveDetail(@RequestBody @Valid ExecutiveDetailRequest request, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
@@ -131,7 +136,7 @@
      * 退回后会将下一个要执行的实验室检测状态更新为待分配，将后面的实验室顺序变更为连续（都进行减1）
      * 最后一个检测的实验室退回，等分发员再增加实验室或设备收发中的已收入直接手动点击完成
      */
-    @ApiOperation("实验室检测-部门检测/我的检测 退回（待检测/检测中->退回）")
+    @ApiOperation("实验室任务/我的任务 退回（待检测/检测中->退回）")
     @PostMapping("/executive/sendBack")
     public ReturnDTO executiveSendBack(@RequestBody @Valid ExecutiveSendBackRequest request, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -140,9 +145,6 @@
         return labExecutiveInfoService.sampleExecutiveSendBack(request);
     }
 
-    /**
-     * 分发员编辑实验室检测列表
-     */
     @ApiOperation("分发员编辑实验室检测列表")
     @PostMapping("/handOut/updateList")
     public ReturnDTO updateExecutiveList(@RequestBody @Valid UpdateExecutiveListRequest request, BindingResult bindingResult) {
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java
index 48a67ed..0c04f31 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java
@@ -10,6 +10,7 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.resource.customer.CustomerApprovalListRequest;
 import com.casic.missiles.dto.resource.customer.CustomerSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceCustomerInfo;
@@ -26,6 +27,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -55,6 +57,13 @@
         return customerInfoService.saveCustomerInfo(request);
     }
 
+    @ApiOperation("委托方名录导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody CustomerApprovalListRequest request) throws Exception {
+        List<BizResourceCustomerInfo> list = super.exportList(request);
+        super.exportExcel(BizResourceCustomerInfo.class, list, ExportEnum.CUSTOMER_INFO.getSheetName());
+    }
+
     @ApiOperation("委托方人员列表（分页）")
     @PostMapping("/person/listPage")
     public ReturnDTO<PageInfoBT<BizResourceCustomerStaff>> personListPage(@RequestBody IdDTO idDto) {
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
index 972ed4b..6418ea5 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
@@ -5,6 +5,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.resource.customer.SuggestFormApprovalListRequest;
 import com.casic.missiles.dto.resource.customer.SuggestFormSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceCustomerSuggestForm;
@@ -20,6 +21,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -50,4 +52,11 @@
         return suggestFormService.saveSuggestForm(request);
     }
 
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody SuggestFormApprovalListRequest request) throws Exception {
+        List<BizResourceCustomerSuggestForm> list = super.exportList(request);
+        super.exportExcel(BizResourceCustomerSuggestForm.class, list, ExportEnum.CUSTOMER_SUGGEST_FORM.getSheetName());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java
index 1934d1a..9e07eab 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java
@@ -15,12 +15,16 @@
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.resource.IEnvEnvironmentRecordConfigService;
 import com.casic.missiles.service.resource.IEnvEnvironmentRecordDataService;
+import com.casic.missiles.service.resource.IEnvLocationInfoService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
 import java.util.List;
@@ -39,6 +43,8 @@
     private IEnvEnvironmentRecordDataService environmentRecordDataService;
     @Autowired
     private IEnvEnvironmentRecordConfigService environmentRecordConfigService;
+    @Autowired
+    private IEnvLocationInfoService locationInfoService;
 
     @ApiOperation("环境记录单数据列表/详情")
     @PostMapping("/data/listPage")
@@ -95,4 +101,11 @@
         });
         return environmentRecordConfigService.deleteEnvironmentRecordConfig(idDTO.getId());
     }
+
+    @ApiOperation("地点列表")
+    @PostMapping("/location/listPage")
+    public ReturnDTO<PageInfoBT<LocationListResponse>> locationListPage(@RequestBody @Valid LocationListRequest request) {
+        Page<LocationListResponse> page = PageFactory.defaultPage();
+        return ReturnUtil.success(super.packForBT(locationInfoService.listPage(page, request)));
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java
index 82efe3f..e9561fa 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java
@@ -10,6 +10,7 @@
 import com.casic.missiles.dto.resource.seal.SealLogListRequest;
 import com.casic.missiles.dto.resource.seal.SealNoteApprovalListRequest;
 import com.casic.missiles.dto.resource.seal.SealNoteSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceSealUseLog;
@@ -27,6 +28,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -58,6 +60,13 @@
         return sealUseNoteService.saveSeal(request);
     }
 
+    @ApiOperation("印章使用登记导出（列表和导出中去掉经办人和监印人）")
+    @PostMapping("/listExport")
+    public void export(@RequestBody SealNoteApprovalListRequest request) throws Exception {
+        List<BizResourceSealUseNote> list = super.exportList(request);
+        super.exportExcel(BizResourceSealUseNote.class, list, ExportEnum.SEAL_NOTE.getSheetName());
+    }
+
     // TODO: 2023/7/28 印章使用日志：系统中使用印章时插入数据库
 
     @ApiOperation("印章使用日志列表（分页）")
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java
index 9b674fc..06b6521 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java
@@ -9,16 +9,20 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.resource.staff.StaffCertRequest;
 import com.casic.missiles.dto.resource.staff.StaffCertResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.service.resource.IBizResourceStaffInfoService;
 import com.casic.missiles.service.resource.IBizResourceStaffVerifierService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.List;
+
 /**
  * @Description:
  * @Author: wangpeng
@@ -41,9 +45,21 @@
         return ReturnUtil.success(super.packForBT(responsePage));
     }
 
+    @ApiOperation("证书逾期提醒导出")
+    @PostMapping("/listExport")
+    public void exportList(@RequestBody StaffCertRequest request) throws Exception {
+        List<StaffCertResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = staffInfoService.certListByIds(request.getIds());
+        } else {
+            list = staffInfoService.certList(request);
+        }
+        super.exportExcel(StaffCertResponse.class, list, ExportEnum.STAFF_CERTIFICATE_EXPIRE.getSheetName());
+    }
+
     @ApiOperation("证书逾期提醒")
     @PostMapping("/expirationReminder")
-    public ReturnDTO expirationReminder(@RequestBody IdDTO idDto) {
-        return verifierService.expirationReminder(idDto);
+    public ReturnDTO expirationReminder(@RequestBody IdDTO idDTO) {
+        return verifierService.expirationReminder(idDTO);
     }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java
index 3b251ad..a6e7850 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java
@@ -12,6 +12,7 @@
 import com.casic.missiles.dto.resource.staff.StaffListRequest;
 import com.casic.missiles.dto.resource.staff.TrainListRequest;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.*;
@@ -22,7 +23,10 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
 import java.util.List;
@@ -52,8 +56,19 @@
             throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
         }
         Page<BizResourceStaffInfo> page = PageFactory.defaultPage();
-        Page<BizResourceStaffInfo> responsePage = staffInfoService.listPage(page, request);
-        return ReturnUtil.success(super.packForBT(responsePage));
+        return ReturnUtil.success(super.packForBT(staffInfoService.listPage(page, request)));
+    }
+
+    @ApiOperation("人员登记导出")
+    @PostMapping("/listExport")
+    public void exportList(@RequestBody StaffListRequest request) throws Exception {
+        List<BizResourceStaffInfo> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = staffInfoService.listByIds(request.getIds());
+        } else {
+            list = staffInfoService.list(request);
+        }
+        super.exportExcel(BizResourceStaffInfo.class, list, ExportEnum.STAFF_INFO.getSheetName());
     }
 
     @ApiOperation("人员登记详情基础信息")
@@ -85,9 +100,9 @@
 
     @ApiOperation("科研教育列表（分页）")
     @PostMapping("/education/listPage")
-    public ReturnDTO<PageInfoBT<BizResourceStaffEducation>> educationListPage(@RequestBody IdDTO idDto) {
+    public ReturnDTO<PageInfoBT<BizResourceStaffEducation>> educationListPage(@RequestBody IdDTO idDTO) {
         Page<BizResourceStaffEducation> page = PageFactory.defaultPage();
-        Page<BizResourceStaffEducation> responsePage = staffInfoService.educationListPage(page, idDto);
+        Page<BizResourceStaffEducation> responsePage = staffInfoService.educationListPage(page, idDTO);
         return ReturnUtil.success(super.packForBT(responsePage));
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java
index af6aa86..d85d84a 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java
@@ -9,6 +9,7 @@
 import com.casic.missiles.dto.resource.outsideService.SupplierApprovalListRequest;
 import com.casic.missiles.dto.resource.outsideService.SupplierSaveResponse;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceSupplierAbility;
@@ -67,6 +68,13 @@
         return ReturnUtil.success(supplierInfoService.detail(idDTO.getId()));
     }
 
+    @ApiOperation("合格供方导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody SupplierApprovalListRequest request) throws Exception {
+        List<BizResourceSupplierInfo> list = super.exportList(request);
+        super.exportExcel(BizResourceSupplierInfo.class, list, ExportEnum.SUPPLIER_INFO.getSheetName());
+    }
+
     @ApiOperation("供方人员列表（分页）")
     @PostMapping("/person/listPage")
     public ReturnDTO<PageInfoBT<BizResourceSupplierPerson>> personListPage(@RequestBody IdDTO idDTO) {
diff --git a/casic-metering-api/src/main/resources/config/application.yml b/casic-metering-api/src/main/resources/config/application.yml
index 350db5f..ecff521 100644
--- a/casic-metering-api/src/main/resources/config/application.yml
+++ b/casic-metering-api/src/main/resources/config/application.yml
@@ -126,7 +126,7 @@
     #作者
     author: wangpeng
     #待生成对象表名
-    table-name: biz_equipment_technical_target_approval,biz_equipment_attachment_approval,biz_equipment_checkpoint_approval
+    table-name: biz_business_outsource_protocol
 
 reminder:
   #节点--common模块config包 ReminderNodeConfig配置
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
index 4a19e4e..d47d552 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
@@ -53,6 +53,7 @@
     SUGGEST_FORM_SAVE_FAILED(2509, "委托方意见登记表保存至草稿箱失败"),
     EXAMINE_FORM_SAVE_FAILED(2510, "要求、委托书及合同评审表保存至草稿箱失败"),
     CUSTOMER_EXIST_SAVE_FAILED(2511, "该委托方已存在，请重新选择"),
+    DUPLICATE_LOCATION_NO(2512, "地点编号已存在"),
 
     /**
      * 计量检定业务模块
@@ -68,6 +69,8 @@
     COMPLETE_SAMPLE_NOT_EXIST(2609, "检测中不存在扫描收入的样品"),
     CANNOT_CHANGE_MEASURE_INFO(2610, "无法更改非当前登录用户的检测信息"),
     NON_EXIST_ORDER_OR_SAMPLE(2611, "不存在该委托单或该委托单下的样品"),
+    OUTSOURCE_ACCESS_SAVE_FAILED(2612, "测试、校准或检定工作分包评审表保存至草稿箱失败"),
+    OUTSOURCE_PROTOCOL_SAVE_FAILED(2613, "测试、校准或检定工作分包协议书保存至草稿箱失败"),
 
     /**
      * 历史遗留备用
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
index 5089ad1..81a406b 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
@@ -10,54 +10,38 @@
     /**
      * 资源管理
      */
-    ENVIRONMENT_DATA_EXPORT("environmentData", "environmentData", "环境记录单数据"),
+    ENVIRONMENT_DATA_EXPORT("environmentData", "环境记录单数据", "环境记录单数据"),
+    STAFF_INFO("staffInfo", "人员登记", "人员登记"),
+    STAFF_CERTIFICATE_EXPIRE("certificateExpire", "证书逾期提醒", "证书逾期提醒"),
+    SUPPLIER_INFO("supplierInfo", "合格供方名录", "合格供方名录"),
+    CUSTOMER_INFO("customerInfo", "委托方名录", "委托方名录"),
+    CUSTOMER_SUGGEST_FORM("customerSuggestForm", "委托方意见登记表", "委托方意见登记表"),
+    SEAL_NOTE("sealNote", "印章使用登记", "印章使用登记"),
 
-    FILE_EXPORT("meterFileData", "meterFileData", "计量文件信息"),
-    TRAIN_PLAN_EXPORT("trainPlanData", "trainPlanData", "培训计划"),
-    TRAIN_LOG_EXPORT("trainLogData", "trainLogData", "培训记录"),
-    METER_ORGANIZE_EXPORT("meterOrganizeData", "meterOrganizeData", "计量组织"),
-    TRACE_SUPPLIER_EXPORT("traceSupplierData", "traceSupplierData", "溯源供方"),
-    SIGN_EXPORT("signData", "signData", "签名/签章"),
-    TEMPLATE_EXPORT("templateData", "templateData", "原始记录模板/证书报告模板"),
-    FIXED_ASSETS("meterFixedAssets", "meterFixedAssets", "固定资产"),
-    METER_EQUIPMENT("meterEquipment", "meterEquipment", "测量设备"),
-    CALIBRATION_TEST_EQUIPMENT("calibrationTestEquipment", "calibrationTestEquipment", "校准检定设备"),
-    MEASURE_ACCOUNT("measureAccount", "measureAccount", "测量工装"),
-    STANDARD_SUPPORT_EQUIPMENT("standardSupportEquipment", "standardSupportEquipment", "标准配套设备"),
-    STANDARD_EQUIPMENT("standardEquipment", "standardEquipment", "标准装置"),
-    FLOW_DEF_EXPORT("flowDefData", "flowDefData", "流程定义"),
-    STAFF_CERTIFICATE("certificate", "certificate", "计量人员证书"),
-    CHECK_INFO("checkInfo", "checkInfo", "设备管理点检测"),
-    EQUIPMENT_APPLY("equipmentApply", "equipmentApply", "设备借用"),
-    STANDARD_EQUIPMENT_REMIND("equipmentApplyRemind", "equipmentApplyRemind", "标准装置到期提醒"),
-    METER_PRICE("meterPrice", "meterPrice", "价格库"),
-    METER_STAFF("meterStaff", "meterStaff", "计量人员"),
-    STANDARD_EQUIPMENT_APPLY("standardEquipmentApply", "standardEquipmentApply", "标准装置申请"),
-    STATE_MANAGE_APPLY("stateManage", "stateManage", "状态管理"),
-    METER_ACCEPTANCE_CHECK("acceptanceCheck", "acceptanceCheck", "设备检修保养验收单"),
-    CUSTOMER_EXPORT("customerData", "customerData", "客户信息"),
-    ORDER_EXPORT("orderData", "orderData", "委托书信息"),
-    SAMPLE_EXPORT("sampleData", "sampleData", "样本信息"),
-    EXCHANGE_DATA("exchangeData", "exchangeData", "设备交接单"),
-    DISPATCH_DATA("dispatchData", "dispatchData", "设备收发"),
-    ENVIRONMENT_DATA("environmentData", "environmentData", "环境记录单"),
-    ORIGIN_DATA("originData", "originData", "原始记录"),
-    CERTIFICATE_REPORT("certificateReport", "certificateReport", "证书报告"),
-    ADVICE_EXPORT("adviceData", "adviceData", "客户反馈"),
-    HANDOUT_EXPORT("handoutData", "handoutData", "任务分发列表"),
-    OUTSOURCER_EXPORT("outsourcerData", "outsourcerData", "分包方"),
-    SITE_EXECUTIVE_EXPORT("siteExecutiveData", "siteExecutiveData", "现场测试、校准或检定"),
-    CERTIFICATE_PRINT_EXPORT("certificatePrintData", "certificatePrintData", "证书打印"),
-    DOWNLOAD_TEMPLATE("downloadTemplate", "downloadTemplate", "页面配置"),
-    OUTSOURCER_CERTIFICATE_EXPORT("outsourceCertificateData", "outsourceCertificateData", "分包证书"),
-    SETTLEMENT_INFO_EXPORT("settlementInfoData", "settlementInfoData", "业务结算"),
-    EQUIPMENT_REMIND("equipmentRemind", "equipmentRemind", "设备到期提醒"),
-    AGREEMENT_INFO_EXPORT("agreementInfoData", "agreementInfoData", "合同"),
-    WORK_STATISTICS_EXPORT("workStatisticsData", "workStatisticsData", "实时工作统计"),
-    DEPT_OUTPUT_EXPORT("deptOutputData", "deptOutputData", "部门产值分析"),
-    WORKLOAD_EXPORT("workloadData", "workloadData", "业务工作量分析"),
-    DEPT_COMPREHENSIVE_EXPORT("deptComprehensiveData", "deptComprehensiveData", "部门综合分析"),
-    ENVIRONMENTAL_RECORD("environmentalRecordData", "environmentalRecordData", "现场环境记录");
+    /**
+     * 计量检定业务
+     */
+    OUTSOURCER_EXPORT("outsourcerData", "分包方名录", "分包方名录"),
+    IDENTIFY_EXPORT("identifyData", "计量标识", "计量标识"),
+    ORDER_EXPORT("orderData", "任务单", "任务单"),
+    DISPATCH_DATA("dispatchData", "设备收发", "设备收发"),
+    HANDOUT_EXPORT("handoutData", "任务分发", "任务分发"),
+    SITE_EXECUTIVE_EXPORT("siteExecutiveData", "现场测试、校准或检定", "现场测试、校准或检定"),
+    CERTIFICATE_REPORT("certificateReport", "证书审批", "证书审批"),
+    CERTIFICATE_CHANGE_APPLY("certificateChangeApply", "证书报告补充或更换申请单", "证书报告补充或更换申请单"),
+    CERTIFICATE_PRINT("certificatePrintData", "证书打印审批", "证书打印审批"),
+    DEPT_EXECUTIVE_TASK("deptExecutiveTaskData", "实验室任务", "实验室任务"),
+    MY_EXECUTIVE_TASK("myExecutiveTaskData", "我的任务", "我的任务"),
+    OUTSOURCE_ASSESS("outsourceAssess", "测试、校准或检定工作分包评审表", "测试、校准或检定工作分包评审表"),
+    OUTSOURCE_PROTOCOL("outsourceProtocol", "测试、校准或检定工作分包协议书", "测试、校准或检定工作分包协议书"),
+
+    /**
+     * 系统管理
+     */
+    SIGN_EXPORT("signData", "签名", "签名"),
+    TEMPLATE_EXPORT("templateData", "文件模板", "文件模板"),
+    FLOW_DEF_EXPORT("flowDefData", "流程定义", "流程定义"),
+    DOWNLOAD_TEMPLATE("downloadTemplate", "流程定义", "页面配置");
 
     ExportEnum(String fileName, String sheetName, String description) {
         this.fileName = fileName;
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateRecordTypeCodeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateRecordTypeCodeEnum.java
index 31d913c..a963522 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateRecordTypeCodeEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateRecordTypeCodeEnum.java
@@ -46,4 +46,14 @@
     String SITE_EXECUTIVE_APPROVAL = "01";
     //《现场测试、校准或检定工作记录表》
     String SITE_EXECUTIVE_LOG = "02";
+
+    //测试、校准或检定工作分包协议书
+    String OUTSOURCE_PROTOCOL = "01";
+    //测试、校准或检定工作分包评审表
+    String OUTSOURCE_ACCESS = "02";
+    //测试、校准或检定工作分包通知书
+    String OUTSOURCE_NOTICE = "03";
+    //测试、校准或检定工作分包方名录
+    String OUTSOURCE_INFO = "04";
+
 }
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
index 24b8635..f78bd53 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
@@ -15,6 +15,10 @@
     String CERTIFICATE_CHANGE_APPLY_BEAN_NAME = "certificateChangeApplyBean";
     //现场测试、校准或检定
     String SITE_EXECUTIVE_BEAN_NAME = "siteExecutiveBean";
+    //测试、校准或检定工作分包评审表
+    String OUTSOURCE_ASSESS_BEAN_NAME = "outsourceAssessBean";
+    //测试、校准或检定工作分包协议书
+    String OUTSOURCE_PROTOCOL_BEAN_NAME = "outsourceProtocolBean";
 
     /*********************************设备与装置************************************/
     //设备台账
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 b21c661..6b86fd1 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
@@ -18,6 +18,8 @@
     OUTSOURCER_APPROVAL(OUTSOURCER_BEAN_NAME, ""),
     CERTIFICATE_CHANGE_APPROVAL(CERTIFICATE_CHANGE_APPLY_BEAN_NAME, ""),
     SITE_EXECUTIVE_APPROVAL(SITE_EXECUTIVE_BEAN_NAME, ""),
+    OUTSOURCE_ASSESS_APPROVAL(OUTSOURCE_ASSESS_BEAN_NAME, ""),
+    OUTSOURCE_PROTOCOL_APPROVAL(OUTSOURCE_PROTOCOL_BEAN_NAME, ""),
 
     ACTION_STATUS_MAP(new HashMap<String, AwareActionStatusEnum>() {
         {
@@ -47,6 +49,10 @@
             put(ApplyFromIdEnum.CERTIFICATE_CHANGE_APPROVAL.getCode(), CERTIFICATE_CHANGE_APPROVAL);
             //现场测试、校准或检定审批
             put(ApplyFromIdEnum.SITE_EXECUTIVE_APPROVAL.getCode(), SITE_EXECUTIVE_APPROVAL);
+            //测试、校准或检定工作分包评审表
+            put(ApplyFromIdEnum.OUTSOURCE_ASSESS_APPROVAL.getCode(), OUTSOURCE_ASSESS_APPROVAL);
+            //测试、校准或检定工作分包协议书
+            put(ApplyFromIdEnum.OUTSOURCE_PROTOCOL_APPROVAL.getCode(), OUTSOURCE_PROTOCOL_APPROVAL);
         }
     });
     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 934405e..c7410bd 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
@@ -9,6 +9,8 @@
     CERTIFICATE_CHANGE_APPROVAL("jljdywzsbchghsqd", MessageSourceModuleEnum.BUSINESS.getCode(), "证书/报告补充或更换申请单"),
     OUTSOURCER_APPROVAL("jljdywcsjzhgfbfml", MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定合格分包方名录"),
     SITE_EXECUTIVE_APPROVAL("jljdywxccsjzsp", MessageSourceModuleEnum.BUSINESS.getCode(), "现场测试、校准或检定审批"),
+    OUTSOURCE_ASSESS_APPROVAL("jljdywcsjzfbpsb", MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包评审表"),
+    OUTSOURCE_PROTOCOL_APPROVAL("jljdywcsjzfbxys", MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包协议书"),
 
 
     /*******************************************设备与装置*********************************************/
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/GeneralApprovalMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/GeneralApprovalMapper.java
index 4fb7344..0c9d6ae 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/GeneralApprovalMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/GeneralApprovalMapper.java
@@ -17,8 +17,4 @@
 
     Page<O> selectBatchForApprovalList(Page<O> page, @Param("request") R request, @Param("businessKeys") List<String> businessKeys);
 
-//    Page<O> selectListPage(Page<O> page, @Param("request") R request);
-
-//    Long selectMaxNo();
-
 }
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceAssessMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceAssessMapper.java
index 7867bb8..ba59009 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceAssessMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceAssessMapper.java
@@ -1,7 +1,12 @@
 package com.casic.missiles.mapper.business;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.business.outsource.OutsourceAssessApprovalListRequest;
+import com.casic.missiles.mapper.GeneralApprovalMapper;
 import com.casic.missiles.model.business.BizBusinessOutsourceAssess;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * <p>
@@ -11,6 +16,10 @@
  * @author wangpeng
  * @since 2023-08-16
  */
-public interface BizBusinessOutsourceAssessMapper extends BaseMapper<BizBusinessOutsourceAssess> {
+public interface BizBusinessOutsourceAssessMapper extends GeneralApprovalMapper<BizBusinessOutsourceAssess, BizBusinessOutsourceAssess, OutsourceAssessApprovalListRequest> {
+
+    Page<BizBusinessOutsourceAssess> selectBatchForApprovalList(Page<BizBusinessOutsourceAssess> page, @Param("request") OutsourceAssessApprovalListRequest request, @Param("businessKeys") List<String> businessKeys);
+
+    Long selectMaxProjectNo();
 
 }
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceProtocolMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceProtocolMapper.java
new file mode 100644
index 0000000..e6aba35
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceProtocolMapper.java
@@ -0,0 +1,24 @@
+package com.casic.missiles.mapper.business;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.business.outsource.OutsourceProtocolApprovalListRequest;
+import com.casic.missiles.mapper.GeneralApprovalMapper;
+import com.casic.missiles.model.business.BizBusinessOutsourceProtocol;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 计量检定业务-分包管理-测试、校准或检定工作分包协议书 Mapper 接口
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-08-24
+ */
+public interface BizBusinessOutsourceProtocolMapper extends GeneralApprovalMapper<BizBusinessOutsourceProtocol, BizBusinessOutsourceProtocol, OutsourceProtocolApprovalListRequest> {
+
+    Page<BizBusinessOutsourceProtocol> selectBatchForApprovalList(Page<BizBusinessOutsourceProtocol> page, @Param("request") OutsourceProtocolApprovalListRequest request, @Param("businessKeys") List<String> businessKeys);
+
+    Long selectMaxProtocolNo();
+}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/EnvLocationInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/EnvLocationInfoMapper.java
new file mode 100644
index 0000000..49eff87
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/EnvLocationInfoMapper.java
@@ -0,0 +1,21 @@
+package com.casic.missiles.mapper.resource;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.resource.environment.LocationListRequest;
+import com.casic.missiles.dto.resource.environment.LocationListResponse;
+import com.casic.missiles.model.resource.EnvLocationInfo;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * <p>
+ * 实验室环境监控系统-设备表 Mapper 接口
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-06-07
+ */
+public interface EnvLocationInfoMapper extends BaseMapper<EnvLocationInfo> {
+
+    Page<LocationListResponse> selectLocationListPage(Page<LocationListResponse> page, @Param("request") LocationListRequest request);
+}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java
index de124db..85ed0f7 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java
@@ -1,7 +1,9 @@
 package com.casic.missiles.mapper.system;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.dto.system.SignDetailResponse;
+import com.casic.missiles.dto.system.SignListRequest;
 import com.casic.missiles.model.system.SystemSign;
 import org.apache.ibatis.annotations.Param;
 
@@ -22,4 +24,8 @@
     SignDetailResponse selectSignDetailById(Long id);
 
     List<SystemSign> selectUsableSignList(@Param("userId") Long userId);
+
+    Page<SystemSign> selectSignListPage(Page<SystemSign> page, @Param("request") SignListRequest request);
+
+    List<SystemSign> selectSignList(@Param("request") SignListRequest request);
 }
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateChangeApplyMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateChangeApplyMapper.xml
index d798447..c496092 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateChangeApplyMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateChangeApplyMapper.xml
@@ -30,31 +30,31 @@
         SELECT *
         FROM biz_business_certificate_change_apply
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.changeApplyNo != null and request.changeApplyNo !=''">
+        <if test="request != null and request.changeApplyNo != null and request.changeApplyNo !=''">
             and change_apply_no like concat('%',#{request.changeApplyNo},'%')
         </if>
-        <if test="request.changeReportNo != null and request.changeReportNo !=''">
+        <if test="request != null and request.changeReportNo != null and request.changeReportNo !=''">
             and change_report_no like concat('%',#{request.changeReportNo},'%')
         </if>
-        <if test="request.changeReportName != null and request.changeReportName !=''">
+        <if test="request != null and request.changeReportName != null and request.changeReportName !=''">
             and change_report_name like concat('%',#{request.changeReportName},'%')
         </if>
-        <if test="request.changeType != null and request.changeType !=''">
+        <if test="request != null and request.changeType != null and request.changeType !=''">
             and change_type = #{request.changeType}
         </if>
-        <if test="request.createUserName != null and request.createUserName !=''">
+        <if test="request != null and request.createUserName != null and request.createUserName !=''">
             and create_user_name like concat('%',#{request.createUserName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificatePrintMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificatePrintMapper.xml
index b66cd99..49c0ac8 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificatePrintMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificatePrintMapper.xml
@@ -31,34 +31,34 @@
         LEFT JOIN biz_business_order_sample_relation bosr ON (bosr.order_id = bcr.order_id AND bosr.sample_id = bcr.sample_id)
         LEFT JOIN biz_business_order_info boi ON boi.id = bosr.order_id
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and bcp.approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.printStatus != null and request.printStatus !=''">
+        <if test="request != null and request.printStatus != null and request.printStatus !=''">
             and print_status = #{request.printStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and bcp.create_user_id = #{request.createUserId}
         </if>
-        <if test="request.certificateReportNo != null and request.certificateReportNo !=''">
+        <if test="request != null and request.certificateReportNo != null and request.certificateReportNo !=''">
             and bcr.certificate_report_no like concat('%',#{request.certificateReportNo},'%')
         </if>
-        <if test="request.certificateReportName != null and request.certificateReportName !=''">
+        <if test="request != null and request.certificateReportName != null and request.certificateReportName !=''">
             and bcr.certificate_report_name like concat('%',#{request.certificateReportName},'%')
         </if>
-        <if test="request.customerName != null and request.customerName !=''">
+        <if test="request != null and request.customerName != null and request.customerName !=''">
             and boi.customer_name like concat('%',#{request.customerName},'%')
         </if>
-        <if test="request.sampleNo != null and request.sampleNo !=''">
+        <if test="request != null and request.sampleNo != null and request.sampleNo !=''">
             and bosr.sample_no like concat('%',#{request.sampleNo},'%')
         </if>
-        <if test="request.sampleName != null and request.sampleName !=''">
+        <if test="request != null and request.sampleName != null and request.sampleName !=''">
             and bosr.sample_name like concat('%',#{request.sampleName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and bcp.create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and bcp.create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml
index b366034..767695d 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml
@@ -46,33 +46,37 @@
         SELECT bcr.*, bosr.sample_no, bosr.sample_name, bosr.sample_model, rsi.staff_name
         FROM biz_business_certificate_report bcr
         LEFT JOIN biz_business_order_sample_relation bosr ON (bosr.order_id = bcr.order_id AND bosr.sample_id = bcr.sample_id)
+        LEFT JOIN biz_business_order_info boi ON boi.id = bcr.order_id
         LEFT JOIN biz_resource_staff_info rsi ON rsi.id = bcr.measure_person_id
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and bcr.approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and bcr.create_user_id = #{request.createUserId}
         </if>
-        <if test="request.certificateReportNo != null and request.certificateReportNo !=''">
+        <if test="request != null and request.customerId != null and request.customerId !=''">
+            and boi.customer_id = #{request.customerId}
+        </if>
+        <if test="request != null and request.certificateReportNo != null and request.certificateReportNo !=''">
             and bcr.certificate_report_no like concat('%',#{request.certificateReportNo},'%')
         </if>
-        <if test="request.certificateReportName != null and request.certificateReportName !=''">
+        <if test="request != null and request.certificateReportName != null and request.certificateReportName !=''">
             and bcr.certificate_report_name like concat('%',#{request.certificateReportName},'%')
         </if>
-        <if test="request.sampleNo != null and request.sampleNo !=''">
+        <if test="request != null and request.sampleNo != null and request.sampleNo !=''">
             and bosr.sample_no like concat('%',#{request.sampleNo},'%')
         </if>
-        <if test="request.measureCategory != null and request.measureCategory !=''">
+        <if test="request != null and request.measureCategory != null and request.measureCategory !=''">
             and bcr.measure_category = #{request.measureCategory}
         </if>
-        <if test="request.measurePerson != null and request.measurePerson !=''">
+        <if test="request != null and request.measurePerson != null and request.measurePerson !=''">
             and rsi.staff_name like concat('%',#{request.measurePerson},'%')
         </if>
-        <if test="request.calibrationTimeStart != null and request.calibrationTimeStart !=''">
+        <if test="request != null and request.calibrationTimeStart != null and request.calibrationTimeStart !=''">
             and bcr.calibration_time &gt;= #{request.calibrationTimeStart}
         </if>
-        <if test="request.calibrationTimeEnd != null and request.calibrationTimeEnd !=''">
+        <if test="request != null and request.calibrationTimeEnd != null and request.calibrationTimeEnd !=''">
             and bcr.calibration_time &lt;= #{request.calibrationTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceAssessMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceAssessMapper.xml
index d0fcf8b..c22c101 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceAssessMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceAssessMapper.xml
@@ -7,6 +7,8 @@
         <id column="id" property="id" />
         <result column="project_no" property="projectNo" />
         <result column="project_name" property="projectName" />
+        <result column="lab_code" property="labCode" />
+        <result column="group_code" property="groupCode" />
         <result column="applicant_id" property="applicantId" />
         <result column="applicant_name" property="applicantName" />
         <result column="applicant_time" property="applicantTime" />
@@ -31,7 +33,45 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, project_no, project_name, applicant_id, applicant_name, applicant_time, minio_file_name, remark, create_user_id, create_user_name, outsourcer_id, pre_start_time, pre_end_time, outsource_reason, pre_cost, approval_status, process_id, approve_situation, traceability, test_method, technique_ability, create_time, update_time
+        id, project_no, project_name, lab_code, group_code, applicant_id, applicant_name, applicant_time, minio_file_name, remark, create_user_id, create_user_name, outsourcer_id, pre_start_time, pre_end_time, outsource_reason, pre_cost, approval_status, process_id, approve_situation, traceability, test_method, technique_ability, create_time, update_time
     </sql>
 
+    <select id="selectMaxProjectNo" resultType="java.lang.Long">
+        SELECT IFNULL(max(RIGHT(project_no, 3)), 0) from biz_business_outsource_assess
+    </select>
+
+    <select id="selectBatchForApprovalList" resultMap="BaseResultMap">
+        SELECT bboa.*, bboi.outsourcer_name, bboi.director
+        FROM biz_business_outsource_assess bboa
+        LEFT JOIN biz_business_outsourcer_info bboi ON bboa.outsourcer_id = bboi.id
+        WHERE 1=1
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
+            and bboa.approval_status = #{request.approvalStatus}
+        </if>
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
+            and bboa.create_user_id = #{request.createUserId}
+        </if>
+        <if test="request != null and request.projectNo != null and request.projectNo !=''">
+            and bboa.project_no like concat('%',#{request.projectNo},'%')
+        </if>
+        <if test="request != null and request.outsourcerName != null and request.outsourcerName !=''">
+            and bboi.outsourcer_name like concat('%',#{request.outsourcerName},'%')
+        </if>
+        <if test="request != null and request.applicantName != null and request.applicantName !=''">
+            and bboa.applicant_name like concat('%',#{request.applicantName},'%')
+        </if>
+        <if test="request != null and request.applicantTimeStart != null and request.applicantTimeStart !=''">
+            and bboa.applicant_time &gt;= #{request.applicantTimeStart}
+        </if>
+        <if test="request != null and request.applicantTimeEnd != null and request.applicantTimeEnd !=''">
+            and bboa.applicant_time &lt;= #{request.applicantTimeEnd}
+        </if>
+        <if test="businessKeys != null">
+            and bboa.id in
+            <foreach collection="businessKeys" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
+        ORDER BY bboa.create_time DESC
+    </select>
 </mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceProtocolMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceProtocolMapper.xml
new file mode 100644
index 0000000..b7b2149
--- /dev/null
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceProtocolMapper.xml
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.mapper.business.BizBusinessOutsourceProtocolMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.business.BizBusinessOutsourceProtocol">
+        <id column="id" property="id" />
+        <result column="protocol_no" property="protocolNo" />
+        <result column="project_name" property="projectName" />
+        <result column="lab_code" property="labCode" />
+        <result column="group_code" property="groupCode" />
+        <result column="outsourcer_id" property="outsourcerId" />
+        <result column="remark" property="remark" />
+        <result column="outsource_no" property="outsourceNo" />
+        <result column="outsource_name" property="outsourceName" />
+        <result column="contacts" property="contacts" />
+        <result column="mobile" property="mobile" />
+        <result column="address" property="address" />
+        <result column="require_date" property="requireDate" />
+        <result column="outsource_cost" property="outsourceCost" />
+        <result column="director" property="director" />
+        <result column="item" property="item" />
+        <result column="requires" property="requires" />
+        <result column="create_user_id" property="createUserId" />
+        <result column="create_user_name" property="createUserName" />
+        <result column="approval_status" property="approvalStatus" />
+        <result column="process_id" property="processId" />
+        <result column="create_time" property="createTime" />
+        <result column="update_time" property="updateTime" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, protocol_no, project_name, lab_code, group_code, outsourcer_id, remark, outsource_no, outsource_name, contacts, mobile, address, require_date, outsource_cost, director, item, requires, create_user_id, create_user_name, approval_status, process_id, create_time, update_time
+    </sql>
+
+    <select id="selectMaxProtocolNo" resultType="java.lang.Long">
+        SELECT IFNULL(max(RIGHT(protocol_no, 3)), 0) from biz_business_outsource_protocol
+    </select>
+
+    <select id="selectBatchForApprovalList" resultMap="BaseResultMap">
+        SELECT *
+        FROM biz_business_outsource_protocol
+        WHERE 1=1
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
+            and approval_status = #{request.approvalStatus}
+        </if>
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
+            and create_user_id = #{request.createUserId}
+        </if>
+        <if test="request != null and request.protocolNo != null and request.protocolNo !=''">
+            and protocol_no like concat('%',#{request.protocolNo},'%')
+        </if>
+        <if test="request != null and request.outsourcerName != null and request.outsourcerName !=''">
+            and outsourcer_name like concat('%',#{request.outsourcerName},'%')
+        </if>
+        <if test="request != null and request.applicantName != null and request.applicantName !=''">
+            and create_user_name like concat('%',#{request.applicantName},'%')
+        </if>
+        <if test="request != null and request.applicantTimeStart != null and request.applicantTimeStart !=''">
+            and create_time &gt;= #{request.applicantTimeStart}
+        </if>
+        <if test="request != null and request.applicantTimeEnd != null and request.applicantTimeEnd !=''">
+            and create_time &lt;= #{request.applicantTimeEnd}
+        </if>
+        <if test="businessKeys != null">
+            and id in
+            <foreach collection="businessKeys" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
+        ORDER BY create_time DESC
+    </select>
+</mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourcerInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourcerInfoMapper.xml
index 510a80b..3049b54 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourcerInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourcerInfoMapper.xml
@@ -7,6 +7,8 @@
         <id column="id" property="id" />
         <result column="outsourcer_no" property="outsourcerNo" />
         <result column="outsourcer_name" property="outsourcerName" />
+        <result column="lab_code" property="labCode" />
+        <result column="group_code" property="groupCode" />
         <result column="outsourcer_brief_name" property="outsourcerBriefName" />
         <result column="outsourcer_size" property="outsourcerSize" />
         <result column="business_size" property="businessSize" />
@@ -55,32 +57,32 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, outsourcer_no, outsourcer_name, outsourcer_brief_name, outsourcer_size, business_size, grade, evaluation, tax_number, bank_account, bank_name, bank_account_number, postal_code, director, phone, fax, mobile, email, website, address_country, address_province, address_city, address_area, full_address, address_country_name, address_province_name, address_city_name, address_area_name, invoice_country, invoice_province, invoice_city, invoice_area, invoice_full_address, invoice_country_name, invoice_province_name, invoice_city_name, invoice_area_name, business_scope, business_content, minio_file_name, approval_status, process_id, remark, create_user_id, create_user_name, create_time, update_time
+        id, outsourcer_no, outsourcer_name, lab_code, group_code, outsourcer_brief_name, outsourcer_size, business_size, grade, evaluation, tax_number, bank_account, bank_name, bank_account_number, postal_code, director, phone, fax, mobile, email, website, address_country, address_province, address_city, address_area, full_address, address_country_name, address_province_name, address_city_name, address_area_name, invoice_country, invoice_province, invoice_city, invoice_area, invoice_full_address, invoice_country_name, invoice_province_name, invoice_city_name, invoice_area_name, business_scope, business_content, minio_file_name, approval_status, process_id, remark, create_user_id, create_user_name, create_time, update_time
     </sql>
 
     <select id="selectBatchForApprovalList" resultMap="BaseResultMap">
         SELECT *
         FROM biz_business_outsourcer_info
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.outsourcerNo != null and request.outsourcerNo !=''">
+        <if test="request != null and request.outsourcerNo != null and request.outsourcerNo !=''">
             and outsourcer_no like concat('%',#{request.outsourcerNo},'%')
         </if>
-        <if test="request.outsourcerName != null and request.outsourcerName !=''">
+        <if test="request != null and request.outsourcerName != null and request.outsourcerName !=''">
             and outsourcer_name like concat('%',#{request.outsourcerName},'%')
         </if>
-        <if test="request.director != null and request.director !=''">
+        <if test="request != null and request.director != null and request.director !=''">
             and director like concat('%',#{request.director},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
@@ -93,6 +95,6 @@
     </select>
 
     <select id="selectMaxNo" resultType="java.lang.Long">
-        SELECT IFNULL(max(RIGHT(outsourcer_no, 12)), 0) from biz_business_outsourcer_info
+        SELECT IFNULL(max(RIGHT(outsourcer_no, 3)), 0) from biz_business_outsourcer_info
     </select>
 </mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessSiteExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessSiteExecutiveInfoMapper.xml
index 135c5d0..3c5ae79 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessSiteExecutiveInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessSiteExecutiveInfoMapper.xml
@@ -38,25 +38,25 @@
         FROM biz_business_site_executive_info bsei
         LEFT JOIN biz_resource_customer_info rci ON bsei.customer_id = rci.id
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and bsei.approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and bsei.create_user_id = #{request.createUserId}
         </if>
-        <if test="request.siteExecutiveNo != null and request.siteExecutiveNo !=''">
+        <if test="request != null and request.siteExecutiveNo != null and request.siteExecutiveNo !=''">
             and bsei.site_executive_no like concat('%',#{request.siteExecutiveNo},'%')
         </if>
-        <if test="request.customerName != null and request.customerName !=''">
+        <if test="request != null and request.customerName != null and request.customerName !=''">
             and rci.outsourcer_name like concat('%',#{request.customerName},'%')
         </if>
-        <if test="request.applyName != null and request.applyName !=''">
+        <if test="request != null and request.applyName != null and request.applyName !=''">
             and bsei.apply_name like concat('%',#{request.applyName},'%')
         </if>
-        <if test="request.applyTimeStart != null and request.applyTimeStart !=''">
+        <if test="request != null and request.applyTimeStart != null and request.applyTimeStart !=''">
             and bsei.apply_time &gt;= #{request.applyTimeStart}
         </if>
-        <if test="request.applyTimeEnd != null and request.applyTimeEnd !=''">
+        <if test="request != null and request.applyTimeEnd != null and request.applyTimeEnd !=''">
             and bsei.apply_time &lt;= #{request.applyTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml
index 84d9e2a..6bd38a9 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml
@@ -105,6 +105,12 @@
         <if test="request.isUrgent != null and request.isUrgent !=''">
             AND bo.is_urgent = #{request.isUrgent}
         </if>
+        <if test="request.ids != null">
+            and blei.id in
+            <foreach collection="request.ids" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
         ORDER BY blei.update_time DESC
     </select>
 
@@ -137,6 +143,12 @@
         <if test="request.isUrgent != null and request.isUrgent !=''">
             AND bo.is_urgent = #{request.isUrgent}
         </if>
+        <if test="request.ids != null">
+            and blei.id in
+            <foreach collection="request.ids" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
         ORDER BY blei.update_time DESC
     </select>
 
diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardInfoMapper.xml
index 1a5551b..2ed8d17 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardInfoMapper.xml
@@ -45,12 +45,6 @@
         FROM biz_equipment_standard_info besi
         LEFT JOIN biz_equipment_standard_technology_relation bestr ON besi.standard_no = bestr.standard_no
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
-            and besi.approval_status = #{request.approvalStatus}
-        </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
-            and besi.create_user_id = #{request.createUserId}
-        </if>
         <if test="request.standardName != null and request.standardName !=''">
             and besi.standard_name like concat('%',#{request.standardName},'%')
         </if>
diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardTechnologyRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardTechnologyRelationMapper.xml
index fc7e16c..cd03c8c 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardTechnologyRelationMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardTechnologyRelationMapper.xml
@@ -6,6 +6,7 @@
     <resultMap id="BaseResultMap" type="com.casic.missiles.model.equipment.BizEquipmentStandardTechnologyRelation">
         <id column="id" property="id" />
         <result column="technology_file_id" property="technologyFileId" />
+        <result column="technology_file_no" property="technologyFileNo" />
         <result column="technology_file_name" property="technologyFileName" />
         <result column="standard_id" property="standardId" />
         <result column="standard_no" property="standardNo" />
@@ -14,7 +15,7 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, technology_file_id, technology_file_name, standard_id, remark
+        id, technology_file_id, technology_file_no, technology_file_name, standard_id, remark
     </sql>
 
 </mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceAuthorizeOrderMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceAuthorizeOrderMapper.xml
index ac5176c..554fe65 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceAuthorizeOrderMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceAuthorizeOrderMapper.xml
@@ -32,22 +32,22 @@
         SELECT *
         FROM biz_resource_authorize_order
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.orderNo != null and request.orderNo !=''">
+        <if test="request != null and request.orderNo != null and request.orderNo !=''">
             and order_no like concat('%',#{request.orderNo},'%')
         </if>
-        <if test="request.createUserName != null and request.createUserName !=''">
+        <if test="request != null and request.createUserName != null and request.createUserName !=''">
             and create_user_name like concat('%',#{request.createUserName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerExamineFormMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerExamineFormMapper.xml
index ab242f6..af7f98f 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerExamineFormMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerExamineFormMapper.xml
@@ -41,28 +41,28 @@
         SELECT *
         FROM biz_resource_customer_examine_form
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.formNo != null and request.formNo !=''">
+        <if test="request != null and request.formNo != null and request.formNo !=''">
             and form_no like concat('%',#{request.formNo},'%')
         </if>
-        <if test="request.labCode != null and request.labCode !=''">
+        <if test="request != null and request.labCode != null and request.labCode !=''">
             and lab_code like concat('%',#{request.labCode},'%')
         </if>
-        <if test="request.groupCode != null and request.groupCode !=''">
+        <if test="request != null and request.groupCode != null and request.groupCode !=''">
             and group_code like concat('%',#{request.groupCode},'%')
         </if>
-        <if test="request.createUserName != null and request.createUserName !=''">
+        <if test="request != null and request.createUserName != null and request.createUserName !=''">
             and create_user_name like concat('%',#{request.createUserName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerInfoMapper.xml
index fa8ffbc..06a2798 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerInfoMapper.xml
@@ -33,25 +33,25 @@
         SELECT *
         FROM biz_resource_customer_info
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.customerNo != null and request.customerNo !=''">
+        <if test="request != null and request.customerNo != null and request.customerNo !=''">
             and customer_no like concat('%',#{request.customerNo},'%')
         </if>
-        <if test="request.customerName != null and request.customerName !=''">
+        <if test="request != null and request.customerName != null and request.customerName !=''">
             and customer_name like concat('%',#{request.customerName},'%')
         </if>
-        <if test="request.contacts != null and request.contacts !=''">
+        <if test="request != null and request.contacts != null and request.contacts !=''">
             and contacts like concat('%',#{request.contacts},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerSuggestFormMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerSuggestFormMapper.xml
index 28f5bb2..1806662 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerSuggestFormMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerSuggestFormMapper.xml
@@ -33,28 +33,28 @@
         SELECT *
         FROM biz_resource_customer_suggest_form
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.formNo != null and request.formNo !=''">
+        <if test="request != null and request.formNo != null and request.formNo !=''">
             and form_no like concat('%',#{request.formNo},'%')
         </if>
-        <if test="request.customerName != null and request.customerName !=''">
+        <if test="request != null and request.customerName != null and request.customerName !=''">
             and customer_name like concat('%',#{request.customerName},'%')
         </if>
-        <if test="request.customerDeptName != null and request.customerDeptName !=''">
+        <if test="request != null and request.customerDeptName != null and request.customerDeptName !=''">
             and customer_dept_name like concat('%',#{request.customerDeptName},'%')
         </if>
-        <if test="request.createUserName != null and request.createUserName !=''">
+        <if test="request != null and request.createUserName != null and request.createUserName !=''">
             and create_user_name like concat('%',#{request.createUserName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSealUseNoteMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSealUseNoteMapper.xml
index ab37bc1..b02bb33 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSealUseNoteMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSealUseNoteMapper.xml
@@ -29,32 +29,32 @@
     </sql>
 
     <select id="selectBatchForApprovalList" resultMap="BaseResultMap">
-        SELECT *
+        SELECT brsun.*, brsi.seal_name, brsi.seal_type, brsi.approver_name
         FROM biz_resource_seal_use_note brsun
         JOIN biz_resource_seal_info brsi ON brsun.seal_id = brsi.id
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and brsun.approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and brsun.create_user_id = #{request.createUserId}
         </if>
-        <if test="request.sealName != null and request.sealName !=''">
+        <if test="request != null and request.sealName != null and request.sealName !=''">
             and brsi.seal_name like concat('%',#{request.sealName},'%')
         </if>
-        <if test="request.sealType != null and request.sealType !=''">
+        <if test="request != null and request.sealType != null and request.sealType !=''">
             and brsi.seal_type = #{request.sealType}
         </if>
-        <if test="request.applyDeptName != null and request.applyDeptName !=''">
+        <if test="request != null and request.applyDeptName != null and request.applyDeptName !=''">
             and brsun.apply_dept_name like concat('%',#{request.applyDeptName},'%')
         </if>
-        <if test="request.applyUserName != null and request.applyUserName !=''">
+        <if test="request != null and request.applyUserName != null and request.applyUserName !=''">
             and brsun.apply_user_name like concat('%',#{request.applyUserName},'%')
         </if>
-        <if test="request.applyTimeStart != null and request.applyTimeStart !=''">
+        <if test="request != null and request.applyTimeStart != null and request.applyTimeStart !=''">
             and brsun.apply_time &gt;= #{request.applyTimeStart}
         </if>
-        <if test="request.applyTimeEnd != null and request.applyTimeEnd !=''">
+        <if test="request != null and request.applyTimeEnd != null and request.applyTimeEnd !=''">
             and brsun.apply_time &lt;= #{request.applyTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml
index 119bf7d..4f8392a 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml
@@ -31,6 +31,12 @@
         <if test="request.deptName != null and request.deptName !=''">
             and brsi.dept_name like concat('%',#{request.deptName},'%')
         </if>
+        <if test="request.ids != null">
+            and brsv.id in
+            <foreach collection="request.ids" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
         ORDER BY brsv.grant_date DESC
     </select>
 
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSupplierInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSupplierInfoMapper.xml
index fe8d399..e8ce7ef 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSupplierInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSupplierInfoMapper.xml
@@ -48,28 +48,28 @@
         SELECT *
         FROM biz_resource_supplier_info
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.supplierNo != null and request.supplierNo !=''">
+        <if test="request != null and request.supplierNo != null and request.supplierNo !=''">
             and supplier_no like concat('%',#{request.supplierNo},'%')
         </if>
-        <if test="request.supplierName != null and request.supplierName !=''">
+        <if test="request != null and request.supplierName != null and request.supplierName !=''">
             and supplier_name like concat('%',#{request.supplierName},'%')
         </if>
-        <if test="request.director != null and request.director !=''">
+        <if test="request != null and request.director != null and request.director !=''">
             and director like concat('%',#{request.director},'%')
         </if>
-        <if test="request.supplierType != null and request.supplierType !=''">
+        <if test="request != null and request.supplierType != null and request.supplierType !=''">
             and supplier_type = #{request.supplierType}
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/EnvLocationInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/EnvLocationInfoMapper.xml
new file mode 100644
index 0000000..68bcf10
--- /dev/null
+++ b/casic-metering-dao/src/main/resources/mapper/resource/EnvLocationInfoMapper.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.mapper.resource.EnvLocationInfoMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.resource.EnvLocationInfo">
+        <id column="id" property="id" />
+        <result column="location_no" property="locationNo" />
+        <result column="location_name" property="locationName" />
+        <result column="location_position" property="locationPosition" />
+        <result column="create_user_id" property="createUserId" />
+        <result column="create_user" property="createUser" />
+        <result column="create_time" property="createTime" />
+        <result column="update_time" property="updateTime" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, location_no, location_name, location_position, create_user_id, create_user, create_time, update_time
+    </sql>
+
+    <select id="selectLocationListPage" resultType="com.casic.missiles.dto.resource.environment.LocationListResponse">
+        SELECT *
+        FROM env_location_info
+        WHERE 1=1
+        <if test="request.locationNo != null and request.locationNo !=''">
+            AND location_no LIKE concat('%',#{request.locationNo},'%')
+        </if>
+        <if test="request.locationName != null and request.locationName !=''">
+            AND location_name LIKE concat('%',#{request.locationName},'%')
+        </if>
+        ORDER BY create_time DESC
+    </select>
+
+</mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml
index b28c18f..8854047 100644
--- a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml
@@ -11,7 +11,6 @@
         <result column="sign_desc" property="signDesc" />
         <result column="sign_director" property="signDirector" />
         <result column="sign_user_id" property="signUserId" />
-        <result column="sign_type" property="signType" />
         <result column="minio_file_name" property="minioFileName" />
         <result column="create_time" property="createTime" />
         <result column="update_time" property="updateTime" />
@@ -28,7 +27,6 @@
         <result column="sign_name" property="signName" />
         <result column="sign_desc" property="signDesc" />
         <result column="sign_director" property="signDirector" />
-        <result column="sign_type" property="signType" />
         <result column="sign_user_id" property="signUserId" />
         <result column="minio_file_name" property="minioFileName" />
         <result column="create_time" property="createTime" />
@@ -62,4 +60,58 @@
         JOIN system_sign_user_relation ssur ON ss.id = ssur.sign_id
         WHERE ssur.user_id = #{userId}
     </select>
+
+    <select id="selectSignListPage" resultMap="BaseResultMap">
+        SELECT ss.*, sd.SIMPLE_NAME AS deptName
+        FROM system_sign ss
+        LEFT JOIN sys_user su ON su.id = ss.sign_user_id
+        LEFT JOIN sys_dept sd ON sd.id = su.dept_id
+        WHERE 1=1
+        <if test="request.signNo != null and request.signNo !=''">
+            AND ss.sign_no LIKE concat('%',#{request.signNo},'%')
+        </if>
+        <if test="request.signName != null and request.signName !=''">
+            AND ss.sign_name LIKE concat('%',#{request.signName},'%')
+        </if>
+        <if test="request.signDirector != null and request.signDirector !=''">
+            AND ss.sign_director LIKE concat('%',#{request.signDirector},'%')
+        </if>
+        <if test="request.signUserId != null and request.signUserId !=''">
+            AND ss.sign_user_id = #{request.signUserId}
+        </if>
+        <if test="request.createStartTime != null and request.createStartTime !=''">
+            AND DATE_FORMAT(ss.create_time,'%Y-%m-%d') &gt;= DATE_FORMAT(#{request.createStartTime},'%Y-%m-%d')
+        </if>
+        <if test="request.createEndTime != null and request.createEndTime !=''">
+            AND DATE_FORMAT(ss.create_time,'%Y-%m-%d')  &lt;= DATE_FORMAT(#{request.createEndTime},'%Y-%m-%d')
+        </if>
+        ORDER BY ss.create_time DESC
+    </select>
+
+    <select id="selectSignList" resultMap="BaseResultMap">
+        SELECT ss.*, sd.SIMPLE_NAME AS deptName
+        FROM system_sign ss
+        LEFT JOIN sys_user su ON su.id = ss.sign_user_id
+        LEFT JOIN sys_dept sd ON sd.id = su.dept_id
+        WHERE 1=1
+        <if test="request.signNo != null and request.signNo !=''">
+            AND ss.sign_no LIKE concat('%',#{request.signNo},'%')
+        </if>
+        <if test="request.signName != null and request.signName !=''">
+            AND ss.sign_name LIKE concat('%',#{request.signName},'%')
+        </if>
+        <if test="request.signDirector != null and request.signDirector !=''">
+            AND ss.sign_director LIKE concat('%',#{request.signDirector},'%')
+        </if>
+        <if test="request.signUserId != null and request.signUserId !=''">
+            AND ss.sign_user_id = #{request.signUserId}
+        </if>
+        <if test="request.createStartTime != null and request.createStartTime !=''">
+            AND DATE_FORMAT(ss.create_time,'%Y-%m-%d') &gt;= DATE_FORMAT(#{request.createStartTime},'%Y-%m-%d')
+        </if>
+        <if test="request.createEndTime != null and request.createEndTime !=''">
+            AND DATE_FORMAT(ss.create_time,'%Y-%m-%d')  &lt;= DATE_FORMAT(#{request.createEndTime},'%Y-%m-%d')
+        </if>
+        ORDER BY ss.create_time DESC
+    </select>
 </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 515050a..60f530b 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
@@ -47,8 +47,8 @@
     String STORAGE_LOCATION = "bizStorageLocation";
     //计量专业
     String MEASURE_MAJOR = "bizMeasureMajor";
-    //管理状态
-    String MANAGER_STATE = "bizManagerState";
+    //标准装置管理状态
+    String STANDARD_MANAGER_STATE = "bizStandardManagerState";
 
     /**
      * 资源管理 字典code
@@ -95,8 +95,6 @@
     String MEASURE_STATUS = "measureStatus";
     //检定方式
     String MEASURE_TYPE = "measureType";
-    //标识打印标志类型
-    String IDENTIFY_PRINT_TYPE = "bizBusinessIdentify";
     //变更类型
     String REPORT_CHANGE_TYPE = "bizCertChangeType";
     //规模类型
@@ -111,19 +109,24 @@
     String MEASURE_CATEGORY = "measureCategory";
     //检定结果
     String MEASURE_RESULT = "measureResult";
+    //分包原因
+    String OUTSOURCE_REASON = "outsourceReason";
+
+    /**
+     * 系统管理
+     */
+    String TEMPLATE_TYPE = "templateType";
+
 
     /**
      * 标准装置 字典code
      */
     //类别
     String STANDARD_CATEGORY = "standardCategory";
-    //管理状态
-    String STANDARD_MANAGER_STATE = "standardManagerState";
     //标准等级
     String STANDARD_LEVEL = "standardLevel";
     //传递范围
     String STANDARD_TRANSMIT_RANGE = "transmitRange";
-
     //资本来源
     String CAPITAL_SOURCE = "capitalSource";
     //标准装置-申请类型
@@ -148,8 +151,6 @@
     String CERTIFICATE_CLASS = "certificationClass";
     //证书管理-检校专业
     String CALIBRATION_MAJOR = "calibrationMajor";
-    //分包原因
-    String OUTSOURCE_REASON = "outsourceReason";
 
     /**
      * 工作台
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/BaseApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/BaseApprovalListRequest.java
index 73c12c1..80d7424 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/BaseApprovalListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/BaseApprovalListRequest.java
@@ -6,6 +6,7 @@
 
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotEmpty;
+import java.util.List;
 
 /**
  * @Description:
@@ -19,14 +20,14 @@
      * 表单id
      */
     @NotBlank(message = "表单id不能为空")
-    @ApiModelProperty(value = "表单id（流程定义对应的表单id，等价于业务id）", dataType = "String")
+    @ApiModelProperty(value = "表单id（流程定义对应的表单id，等价于业务id），导出接口不用传", dataType = "String")
     private String formId;
 
     /**
      * 审批状态类型，对应ApprovalStatusEnum
      */
     @NotEmpty(message = "审批状态类型不能为空")
-    @ApiModelProperty(value = "审批状态类型code", dataType = "String")
+    @ApiModelProperty(value = "审批状态类型code，导出接口不用传", dataType = "String")
     private String approvalStatus;
 
     @ApiModelProperty(hidden = true)
@@ -34,4 +35,7 @@
 
     @ApiModelProperty(hidden = true)
     private Long createUserId;
+
+    @ApiModelProperty(value = "导出ids", dataType = "List")
+    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificatePrintApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificatePrintApprovalListRequest.java
index b93d1c9..3cc2f4e 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificatePrintApprovalListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificatePrintApprovalListRequest.java
@@ -5,8 +5,6 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import java.util.List;
-
 /**
  * @Description:
  * @Author: wangpeng
@@ -38,7 +36,4 @@
 
     @ApiModelProperty(value = "创建结束时间", dataType = "String")
     private String createTimeEnd;
-
-    @ApiModelProperty(value = "导出ids", dataType = "List")
-    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportApprovalListRequest.java
index 4f7a038..c115847 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportApprovalListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportApprovalListRequest.java
@@ -5,8 +5,6 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import java.util.List;
-
 /**
  * @Description:
  * @Author: wangpeng
@@ -15,6 +13,8 @@
 @ApiModel
 @Data
 public class CertificateReportApprovalListRequest extends BaseApprovalListRequest {
+    @ApiModelProperty(value = "委托方id", dataType = "String")
+    private Long customerId;
 
     @ApiModelProperty(value = "证书报告编号", dataType = "String")
     private String certificateReportNo;
@@ -37,6 +37,4 @@
     @ApiModelProperty(value = "检校结束时间", dataType = "String")
     private String calibrationTimeEnd;
 
-    @ApiModelProperty(value = "导出ids", dataType = "List")
-    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/identify/IdentifyListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/identify/IdentifyListRequest.java
index 1b87ae6..f019203 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/identify/IdentifyListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/identify/IdentifyListRequest.java
@@ -4,6 +4,8 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * @Description:
  * @Author: wangpeng
@@ -26,4 +28,7 @@
 
     @ApiModelProperty(value = "打印结束时间", dataType = "String")
     private String createTimeEnd;
+
+    @ApiModelProperty(value = "导出ids", dataType = "List")
+    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListRequest.java
index 1264883..62415fb 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListRequest.java
@@ -7,6 +7,7 @@
 import lombok.Data;
 
 import javax.validation.constraints.NotBlank;
+import java.util.List;
 
 @Data
 @ApiModel
@@ -37,4 +38,6 @@
     @ApiModelProperty(value = "是否加急（1是0否null全部）", dataType = "Integer")
     private String isUrgent;
 
+    @ApiModelProperty(value = "导出ids", dataType = "List")
+    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListRequest.java
index 5201d7b..499760a 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListRequest.java
@@ -17,6 +17,9 @@
     @ApiModelProperty(value = "任务单编号", dataType = "String")
     private String orderNo;
 
+    @ApiModelProperty(value = "委托方id", dataType = "Long")
+    private Long customerId;
+
     @ApiModelProperty(value = "委托方名称", dataType = "String")
     private String customerName;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OrderSampleDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OrderSampleDTO.java
new file mode 100644
index 0000000..796edc0
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OrderSampleDTO.java
@@ -0,0 +1,19 @@
+package com.casic.missiles.dto.business.outsource;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/8/24 11:38
+ */
+@ApiModel
+@Data
+public class OrderSampleDTO {
+    @ApiModelProperty(value = "任务单id", dataType = "Long")
+    private Long orderId;
+    @ApiModelProperty(value = "受检设备id", dataType = "Long")
+    private Long sampleId;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceAssessApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceAssessApprovalListRequest.java
new file mode 100644
index 0000000..9a930c3
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceAssessApprovalListRequest.java
@@ -0,0 +1,30 @@
+package com.casic.missiles.dto.business.outsource;
+
+import com.casic.missiles.dto.BaseApprovalListRequest;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/8/24 11:01
+ */
+@ApiModel
+@Data
+public class OutsourceAssessApprovalListRequest extends BaseApprovalListRequest {
+    @ApiModelProperty(value = "评审表编号", dataType = "String")
+    private String projectNo;
+
+    @ApiModelProperty(value = "分包机构名称", dataType = "String")
+    private String outsourcerName;
+
+    @ApiModelProperty(value = "申请人", dataType = "String")
+    private String applicantName;
+
+    @ApiModelProperty(value = "申请时间开始", dataType = "String")
+    private String applicantTimeStart;
+
+    @ApiModelProperty(value = "申请时间结束", dataType = "String")
+    private String applicantTimeEnd;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceAssessSaveResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceAssessSaveResponse.java
new file mode 100644
index 0000000..8bf9aad
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceAssessSaveResponse.java
@@ -0,0 +1,20 @@
+package com.casic.missiles.dto.business.outsource;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/8/14 16:17
+ */
+@ApiModel
+@Data
+public class OutsourceAssessSaveResponse {
+    @ApiModelProperty(value = "主键id", dataType = "Long")
+    private Long id;
+
+    @ApiModelProperty(value = "编号", dataType = "String")
+    private String projectNo;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProtocolApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProtocolApprovalListRequest.java
new file mode 100644
index 0000000..0f32331
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProtocolApprovalListRequest.java
@@ -0,0 +1,30 @@
+package com.casic.missiles.dto.business.outsource;
+
+import com.casic.missiles.dto.BaseApprovalListRequest;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/8/24 15:01
+ */
+@ApiModel
+@Data
+public class OutsourceProtocolApprovalListRequest extends BaseApprovalListRequest {
+    @ApiModelProperty(value = "协议书编号", dataType = "String")
+    private String protocolNo;
+
+    @ApiModelProperty(value = "分包方名称", dataType = "String")
+    private String outsourcerName;
+
+    @ApiModelProperty(value = "申请人", dataType = "String")
+    private String applicantName;
+
+    @ApiModelProperty(value = "申请时间开始", dataType = "String")
+    private String applicantTimeStart;
+
+    @ApiModelProperty(value = "申请时间结束", dataType = "String")
+    private String applicantTimeEnd;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProtocolSaveResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProtocolSaveResponse.java
new file mode 100644
index 0000000..e324967
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProtocolSaveResponse.java
@@ -0,0 +1,20 @@
+package com.casic.missiles.dto.business.outsource;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/8/14 16:17
+ */
+@ApiModel
+@Data
+public class OutsourceProtocolSaveResponse {
+    @ApiModelProperty(value = "主键id", dataType = "Long")
+    private Long id;
+
+    @ApiModelProperty(value = "编号", dataType = "String")
+    private String protocolNo;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveApprovalListRequest.java
index f29f4e4..7047c28 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveApprovalListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveApprovalListRequest.java
@@ -5,8 +5,6 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import java.util.List;
-
 /**
  * @Description: 现场检测审批列表请求实体
  * @Author: wangpeng
@@ -30,7 +28,4 @@
     @ApiModelProperty(value = "申请时间结束", dataType = "String")
     private String applyTimeEnd;
 
-    @ApiModelProperty(value = "导出ids", dataType = "List")
-    private List<Long> ids;
-
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveDetailResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveDetailResponse.java
index 1f28752..394c934 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveDetailResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveDetailResponse.java
@@ -12,6 +12,18 @@
     @ApiModelProperty(value = "id，更新/删除使用参数", dataType = "Long")
     private Long id;
 
+    @ApiModelProperty(value = "实验室代码(字典code)", dataType = "String")
+    private String labCode;
+
+    @ApiModelProperty(value = "实验室代码(字典value)", dataType = "String")
+    private String labCodeName;
+
+    @ApiModelProperty(value = "组别代码(字典code)", dataType = "String")
+    private String groupCode;
+
+    @ApiModelProperty(value = "组别代码(字典value)", dataType = "String")
+    private String groupCodeName;
+
     @ApiModelProperty(value = "审批编号", dataType = "String")
     private String siteExecutiveNo;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/environment/LocationListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/environment/LocationListRequest.java
new file mode 100644
index 0000000..13d03c3
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/environment/LocationListRequest.java
@@ -0,0 +1,20 @@
+package com.casic.missiles.dto.resource.environment;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/6/8 13:56
+ */
+@ApiModel
+@Data
+public class LocationListRequest {
+    @ApiModelProperty(value = "地点编号", dataType = "String")
+    private String locationNo;
+
+    @ApiModelProperty(value = "地点名称", dataType = "String")
+    private String locationName;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/environment/LocationListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/environment/LocationListResponse.java
new file mode 100644
index 0000000..4c531af
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/environment/LocationListResponse.java
@@ -0,0 +1,78 @@
+package com.casic.missiles.dto.resource.environment;
+
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
+import com.baomidou.mybatisplus.annotation.TableField;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description: 地点列表响应实体
+ * @Author: wangpeng
+ * @Date: 2023/6/8 13:53
+ */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
+@ApiModel
+@Data
+public class LocationListResponse {
+    @ApiModelProperty(value = "主键id", dataType = "Long")
+    private Long id;
+
+    /**
+     * 地点编号
+     */
+    @ExcelProperty("地点编号")
+    @ApiModelProperty(value = "地点编号", dataType = "String")
+    private String locationNo;
+
+    /**
+     * 地点名称
+     */
+    @ExcelProperty("地点名称")
+    @ApiModelProperty(value = "地点名称", dataType = "String")
+    private String locationName;
+
+    /**
+     * 地点位置
+     */
+    @ExcelProperty("地点位置")
+    @ApiModelProperty(value = "地点位置", dataType = "String")
+    private String locationPosition;
+
+    /**
+     * 创建人id
+     */
+    @ApiModelProperty(value = "创建人id", dataType = "Long")
+    private Long createUserId;
+
+    /**
+     * 创建人
+     */
+    @ExcelProperty("创建人")
+    @ApiModelProperty(value = "创建人", dataType = "String")
+    @TableField("create_user")
+    private String createUser;
+
+    /**
+     * 创建时间
+     */
+    @ExcelProperty("创建时间")
+    @ApiModelProperty(value = "创建时间", dataType = "String")
+    private String createTime;
+
+    /**
+     * 更新时间
+     */
+    @ApiModelProperty(value = "更新时间", dataType = "String")
+    private String updateTime;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertRequest.java
index 9a7f6c6..c827915 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertRequest.java
@@ -4,6 +4,8 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * @Description:
  * @Author: wangpeng
@@ -16,4 +18,7 @@
     private String name;
     @ApiModelProperty(value = "部门名", dataType = "String")
     private String deptName;
+
+    @ApiModelProperty(value = "导出ids", dataType = "List")
+    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertResponse.java
index f78b159..8f2f79e 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertResponse.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.dto.resource.staff;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.casic.missiles.annotation.DictCodeField;
 import com.casic.missiles.constants.MeterDictCode;
 import io.swagger.annotations.ApiModel;
@@ -13,12 +20,18 @@
  * @Author: wangpeng
  * @Date: 2023/7/27 15:13
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @ApiModel
 @Data
 public class StaffCertResponse {
     /**
      * 人员编号
      */
+    @ExcelProperty(value = "人员编号",order = 0)
     @NotEmpty(message = "人员编号不能为空")
     @ApiModelProperty(value = "人员编号", dataType = "String")
     private String staffNo;
@@ -26,6 +39,7 @@
     /**
      * 姓名
      */
+    @ExcelProperty(value = "姓名",order = 1)
     @ApiModelProperty(value = "姓名", dataType = "String")
     private String staffName;
 
@@ -54,6 +68,7 @@
     /**
      * 部门名字
      */
+    @ExcelProperty(value = "工作部门",order = 2)
     @ApiModelProperty(value = "部门名字", dataType = "String")
     private String deptName;
 
@@ -66,6 +81,7 @@
     /**
      * 计量专业
      */
+    @ExcelProperty(value = "计量专业",order = 3)
     @ApiModelProperty(value = "计量专业", dataType = "String")
     private String major;
 
@@ -110,6 +126,7 @@
     /**
      * 证书号
      */
+    @ExcelProperty(value = "证号",order = 4)
     @ApiModelProperty(value = "证书号", dataType = "String")
     private String certNo;
 
@@ -122,12 +139,14 @@
     /**
      * 有效日期
      */
+    @ExcelProperty(value = "证书有效期",order = 6)
     @ApiModelProperty(value = "有效日期", dataType = "String")
     private String effectiveDate;
 
     /**
      * 发放日期
      */
+    @ExcelProperty(value = "发证日期",order = 5)
     @ApiModelProperty(value = "发放日期", dataType = "String")
     private String grantDate;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffListRequest.java
index 7c4afb3..0a1194a 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffListRequest.java
@@ -4,6 +4,8 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * @Description:
  * @Author: wangpeng
@@ -18,4 +20,7 @@
     private String deptName;
     @ApiModelProperty(value = "部门id", dataType = "Long")
     private Long deptId;
+
+    @ApiModelProperty(value = "导出ids", dataType = "List")
+    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/TrainListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/TrainListRequest.java
index f68597b..6321f8b 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/TrainListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/TrainListRequest.java
@@ -14,6 +14,8 @@
 public class TrainListRequest {
     @ApiModelProperty(value = "训练登记表编号", dataType = "String")
     private String trainNo;
+    @ApiModelProperty(value = "值班领导", dataType = "String")
+    private String dutyLeader;
     @ApiModelProperty(value = "创建开始时间", dataType = "String")
     private String createTimeStart;
     @ApiModelProperty(value = "创建结束时间", dataType = "String")
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/SignAddRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/SignAddRequest.java
index 117be34..d71055c 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/SignAddRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/SignAddRequest.java
@@ -43,13 +43,6 @@
     private Long signUserId;
 
     /**
-     * 签章或签名-字典code
-     */
-    @NotBlank(message = "类型不能为空")
-    @ApiModelProperty(value = "签名/签章-字典code", dataType = "String", required = true)
-    private String signType;
-
-    /**
      * minio存储文件名
      */
     @ApiModelProperty(value = "上传文件返回名称", dataType = "String")
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateAddRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateAddRequest.java
index aff1265..6316648 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateAddRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateAddRequest.java
@@ -17,30 +17,28 @@
 @Data
 public class TemplateAddRequest extends BaseSystemRequest {
     /**
-     * 原始记录模板/证书报告模板名称
+     * 模板名称
      */
     @ApiModelProperty(value = "名称", dataType = "String", required = true)
     @NotBlank(message = "名称不能为空")
     private String templateName;
 
     /**
-     * 原始记录模板/证书报告模板描述
+     * 模板描述
      */
     @ApiModelProperty(value = "描述", dataType = "String")
     private String templateDesc;
 
     /**
-     * 原始记录模板/证书报告模板创建人
+     * 创建人
      */
     @ApiModelProperty(value = "创建人", dataType = "String", required = true)
     @NotBlank(message = "创建人不能为空")
     private String templateCreator;
 
-    /**
-     * 原始记录模板/证书报告模板-字典code
-     */
-    @NotBlank(message = "类型不能为空")
-    @ApiModelProperty(value = "原始记录模板/证书报告模板-字典code", dataType = "String", required = true)
+
+    @NotBlank(message = "模板类型不能为空")
+    @ApiModelProperty(value = "模板类型(字典code)", dataType = "String", required = true)
     private String templateType;
 
     /**
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateListRequest.java
index eec5a1e..6d17bbe 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateListRequest.java
@@ -1,11 +1,12 @@
 package com.casic.missiles.dto.system;
 
+import com.casic.missiles.annotation.DictCodeField;
+import com.casic.missiles.constants.MeterDictCode;
 import com.casic.missiles.dto.BaseSystemRequest;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import javax.validation.constraints.NotBlank;
 import java.util.List;
 
 /**
@@ -19,8 +20,8 @@
     /**
      * 类型
      */
-//    @ApiModelProperty(value = "类型-字典code", dataType = "String", required = true)
-    @NotBlank(message = "类型不能为空")
+    @DictCodeField(message = "模板类型不合法", cacheName = MeterDictCode.TEMPLATE_TYPE)
+    @ApiModelProperty(value = "模板类型(字典code)", dataType = "String")
     private String templateType;
 
     /**
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificateChangeApply.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificateChangeApply.java
index 9216308..36923fd 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificateChangeApply.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificateChangeApply.java
@@ -1,11 +1,19 @@
 package com.casic.missiles.model.business;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 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 com.casic.missiles.dto.BaseRequest;
+import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -20,6 +28,12 @@
  * @author wangpeng
  * @since 2023-08-15
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
+@ApiModel
 @Data
 @TableName("biz_business_certificate_change_apply")
 public class BizBusinessCertificateChangeApply extends BaseRequest implements Serializable {
@@ -33,6 +47,7 @@
     /**
      * 申请单编号
      */
+    @ExcelProperty(value = "申请单编号", order = 1)
     @ApiModelProperty(value = "申请单编号", dataType = "String")
     @TableField("change_apply_no")
     private String changeApplyNo;
@@ -40,6 +55,7 @@
     /**
      * 申请单名字
      */
+    @ExcelProperty(value = "申请单名称", order = 2)
     @ApiModelProperty(value = "申请单名字", dataType = "String")
     @TableField("change_apply_name")
     private String changeApplyName;
@@ -54,6 +70,7 @@
     /**
      * 更换证书编号
      */
+    @ExcelProperty(value = "更换证书编号", order = 3)
     @ApiModelProperty(value = "更换证书编号", dataType = "String")
     @TableField("change_report_no")
     private String changeReportNo;
@@ -61,7 +78,8 @@
     /**
      * 更换证书名字
      */
-    @ApiModelProperty(value = "更换证书名字", dataType = "String")
+    @ExcelProperty(value = "更换证书/报告名称", order = 4)
+    @ApiModelProperty(value = "更换证书/报告名称", dataType = "String")
     @TableField("change_report_name")
     private String changeReportName;
 
@@ -73,6 +91,7 @@
     @TableField("change_type")
     private String changeType;
 
+    @ExcelProperty(value = "变更类型", order = 5)
     @ApiModelProperty(value = "变更类型(字典value)", dataType = "String")
     @TableField(exist = false)
     private String changeTypeName;
@@ -142,13 +161,15 @@
     /**
      * 创建用户名字
      */
-    @ApiModelProperty(value = "创建用户名字", dataType = "String")
+    @ExcelProperty(value = "创建人", order = 6)
+    @ApiModelProperty(value = "创建人名字", dataType = "String")
     @TableField("create_user_name")
     private String createUserName;
 
     /**
      * 创建时间
      */
+    @ExcelProperty(value = "创建时间", order = 7)
     @ApiModelProperty(value = "创建时间", dataType = "String")
     @TableField("create_time")
     private String createTime;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificateReport.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificateReport.java
index f01db9e..db06018 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificateReport.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificateReport.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.model.business;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -22,6 +29,11 @@
  * @author wangpeng
  * @since 2023-08-14
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @ApiModel
 @Data
 @TableName("biz_business_certificate_report")
@@ -36,6 +48,7 @@
     /**
      * 证书报告编号
      */
+    @ExcelProperty(value = "证书报告编号", order = 1)
     @ApiModelProperty(value = "证书报告编号", dataType = "String")
     @TableField("certificate_report_no")
     private String certificateReportNo;
@@ -43,6 +56,7 @@
     /**
      * 证书报告名称
      */
+    @ExcelProperty(value = "证书报告名称", order = 2)
     @ApiModelProperty(value = "证书报告名称", dataType = "String")
     @TableField("certificate_report_name")
     private String certificateReportName;
@@ -62,6 +76,7 @@
     @TableField("measure_category")
     private String measureCategory;
 
+    @ExcelProperty(value = "检校类别", order = 6)
     @ApiModelProperty(value = "检校类别(字典value)", dataType = "String")
     @TableField(exist = false)
     private String measureCategoryName;
@@ -69,6 +84,7 @@
     /**
      * 检校时间
      */
+    @ExcelProperty(value = "检校时间", order = 8)
     @ApiModelProperty(value = "检校时间", dataType = "String")
     @TableField("calibration_time")
     private String calibrationTime;
@@ -267,18 +283,22 @@
     @TableField(exist = false)
     private Integer decisionItem;
 
-    @ApiModelProperty(value = "设备样品编号（列表返回参数）", dataType = "String")
+    @ExcelProperty(value = "被检设备统一编号", order = 3)
+    @ApiModelProperty(value = "被检设备统一编号（列表返回参数）", dataType = "String")
     @TableField(exist = false)
     private String sampleNo;
 
-    @ApiModelProperty(value = "设备样品名称（列表返回参数）", dataType = "String")
+    @ExcelProperty(value = "被检设备名称", order = 4)
+    @ApiModelProperty(value = "被检设备名称（列表返回参数）", dataType = "String")
     @TableField(exist = false)
     private String sampleName;
 
-    @ApiModelProperty(value = "设备样品规格型号（列表返回参数）", dataType = "String")
+    @ExcelProperty(value = "规格型号", order = 5)
+    @ApiModelProperty(value = "规格型号（列表返回参数）", dataType = "String")
     @TableField(exist = false)
     private String sampleModel;
 
+    @ExcelProperty(value = "检定员", order = 7)
     @ApiModelProperty(value = "检定员名字（列表返回参数）", dataType = "String")
     @TableField(exist = false)
     private String staffName;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessIdentifyInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessIdentifyInfo.java
index 46bfba5..f1a9bec 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessIdentifyInfo.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessIdentifyInfo.java
@@ -1,10 +1,15 @@
 package com.casic.missiles.model.business;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 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;
 
@@ -20,6 +25,11 @@
  * @author wangpeng
  * @since 2023-08-15
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @Data
 @TableName("biz_business_identify_info")
 public class BizBusinessIdentifyInfo implements Serializable {
@@ -33,6 +43,7 @@
     /**
      * 记录编号
      */
+    @ExcelProperty(value = "记录编号", order = 1)
     @ApiModelProperty(value = "记录编号", dataType = "String")
     @TableField("record_no")
     private String recordNo;
@@ -41,20 +52,15 @@
      * 标志类型(字典code)
      */
     @NotEmpty(message = "标志类型不能为空")
-    @ApiModelProperty(value = "标志类型(字典code)", dataType = "String")
-    @DictCodeField(message = "标志类型不合法", cacheName = MeterDictCode.IDENTIFY_PRINT_TYPE)
+    @ApiModelProperty(value = "标志类型(直接存计量标识/使用状态/校准状态的字典value)", dataType = "String")
     @TableField("identify_type")
     private String identifyType;
 
-    @ApiModelProperty(value = "标志类型(字典value)", dataType = "String")
-    @TableField(exist = false)
-    private String identifyTypeName;
-
     /**
      * 设备id(可以是受检设备/设备台账)
      */
     @NotNull(message = "设备id不能为空")
-    @ApiModelProperty(value = "设备id(可以是受检设备/设备台账)", dataType = "String")
+    @ApiModelProperty(value = "设备id(可以是受检设备/设备台账)", dataType = "Long")
     @TableField("device_id")
     private Long deviceId;
 
@@ -66,29 +72,32 @@
     @TableField("device_type")
     private String deviceType;
 
+    @ExcelProperty(value = "统一编号", order = 3)
     @NotEmpty(message = "设备编号不能为空")
-    @ApiModelProperty(value = "设备编号", dataType = "String")
+    @ApiModelProperty(value = "统一编号", dataType = "String")
     @TableField("device_no")
     private String deviceNo;
 
     /**
      * 设备名字
      */
-    @NotEmpty(message = "设备名字不能为空")
-    @ApiModelProperty(value = "设备名字", dataType = "String")
+    @ExcelProperty(value = "设备名称", order = 4)
+    @NotEmpty(message = "设备名称不能为空")
+    @ApiModelProperty(value = "设备名称", dataType = "String")
     @TableField("device_name")
     private String deviceName;
 
     /**
      * 检定员id
      */
-    @ApiModelProperty(value = "检定员id", dataType = "String")
+    @ApiModelProperty(value = "检定员id", dataType = "Long")
     @TableField("measure_person_id")
     private Long measurePersonId;
 
     /**
      * 检定员名字
      */
+    @ExcelProperty(value = "检定员", order = 5)
     @ApiModelProperty(value = "检定员名字", dataType = "String")
     @TableField("measure_person")
     private String measurePerson;
@@ -103,7 +112,8 @@
     /**
      * 更新时间
      */
-    @ApiModelProperty(value = "更新时间", dataType = "String")
+    @ExcelProperty(value = "打印时间", order = 6)
+    @ApiModelProperty(value = "打印时间", dataType = "String")
     @TableField("update_time")
     private String updateTime;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceAssess.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceAssess.java
index 659d9ca..6720b90 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceAssess.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceAssess.java
@@ -1,11 +1,26 @@
 package com.casic.missiles.model.business;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 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 com.casic.missiles.dto.BaseRequest;
+import com.casic.missiles.dto.business.outsource.OrderSampleDTO;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import javax.validation.constraints.NotEmpty;
 import java.io.Serializable;
+import java.util.List;
 
 /**
  * <p>
@@ -15,146 +30,231 @@
  * @author wangpeng
  * @since 2023-08-16
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
+@ApiModel
 @Data
 @TableName("biz_business_outsource_assess")
-public class BizBusinessOutsourceAssess implements Serializable {
+public class BizBusinessOutsourceAssess extends BaseRequest implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
+    @ApiModelProperty(value = "id，更新/删除使用参数", dataType = "Long")
     @TableId("id")
     private Long id;
 
     /**
      * 评审表编号
      */
+    @ExcelProperty(value = "评审表编号", order = 1)
+    @ApiModelProperty(value = "评审表编号(后台生成)", dataType = "String")
     @TableField("project_no")
     private String projectNo;
 
     /**
      * 评审表名称
      */
+    @ExcelProperty(value = "评审表名称", order = 2)
+    @ApiModelProperty(value = "评审表名称", dataType = "String")
     @TableField("project_name")
     private String projectName;
 
+    @NotEmpty(message = "实验室代码不能为空")
+    @DictCodeField(message = "实验室代码描述不合法", cacheName = MeterDictCode.LAB_CODE)
+    @ApiModelProperty(value = "实验室代码(字典code)", dataType = "String")
+    @TableField("lab_code")
+    private String labCode;
+
+    @ApiModelProperty(value = "实验室代码(字典value)", dataType = "String")
+    @TableField(exist = false)
+    private String labCodeName;
+
+    /**
+     * 组别代码
+     */
+    @NotEmpty(message = "组别代码不能为空")
+    @DictCodeField(message = "组别代码描述不合法", cacheName = MeterDictCode.GROUP_CODE)
+    @ApiModelProperty(value = "组别代码(字典code)", dataType = "String")
+    @TableField("group_code")
+    private String groupCode;
+
+    @ApiModelProperty(value = "组别代码(字典value)", dataType = "String")
+    @TableField(exist = false)
+    private String groupCodeName;
+
     /**
      * 申请人id
      */
+    @ApiModelProperty(value = "申请人id", dataType = "String")
     @TableField("applicant_id")
     private Long applicantId;
 
     /**
      * 申请人名字
      */
+    @ExcelProperty(value = "申请人", order = 5)
+    @ApiModelProperty(value = "申请人", dataType = "String")
     @TableField("applicant_name")
     private String applicantName;
 
     /**
      * 申请时间
      */
+    @ExcelProperty(value = "申请时间", order = 6)
+    @ApiModelProperty(value = "申请时间", dataType = "String")
     @TableField("applicant_time")
     private String applicantTime;
 
     /**
      * 附件(minio存储文件名)
      */
+    @ApiModelProperty(value = "附件(minio存储文件名)", dataType = "String")
     @TableField("minio_file_name")
     private String minioFileName;
 
     /**
      * 备注
      */
+    @ApiModelProperty(value = "备注", dataType = "String")
     @TableField("remark")
     private String remark;
 
     /**
      * 创建人id
      */
+    @ApiModelProperty(value = "创建人id", dataType = "String")
     @TableField("create_user_id")
     private Long createUserId;
 
     /**
      * 创建人名字
      */
+    @ApiModelProperty(value = "创建人名字", dataType = "String")
     @TableField("create_user_name")
     private String createUserName;
 
     /**
      * 分包方id
      */
+    @ApiModelProperty(value = "评审表编号", dataType = "String")
     @TableField("outsourcer_id")
     private Long outsourcerId;
 
     /**
      * 预计开始时间
      */
+    @ApiModelProperty(value = "预计开始时间", dataType = "String")
     @TableField("pre_start_time")
     private String preStartTime;
 
     /**
      * 预计结束时间
      */
+    @ApiModelProperty(value = "预计结束时间", dataType = "String")
     @TableField("pre_end_time")
     private String preEndTime;
 
     /**
      * 分包原因-字典
      */
+    @ApiModelProperty(value = "分包原因(字典code)", dataType = "String")
+    @DictCodeField(message = "分包原因描述不合法", cacheName = MeterDictCode.OUTSOURCE_REASON)
     @TableField("outsource_reason")
     private String outsourceReason;
 
+    @ApiModelProperty(value = "分包原因(字典value)", dataType = "String")
+    @TableField(exist = false)
+    private String outsourceReasonName;
+
     /**
      * 预计费用
      */
+    @ApiModelProperty(value = "预计费用", dataType = "String")
     @TableField("pre_cost")
     private String preCost;
 
     /**
      * 审批状态
      */
+    @ApiModelProperty(value = "审批状态", dataType = "String")
+    @DictCodeField(message = "审批状态描述不合法", cacheName = MeterDictCode.APPROVAL_STATUS)
     @TableField("approval_status")
     private String approvalStatus;
 
     /**
      * 流程实例id
      */
+    @ApiModelProperty(value = "流程实例id", dataType = "String")
     @TableField("process_id")
     private String processId;
 
     /**
      * 实验室认可情况
      */
+    @ApiModelProperty(value = "实验室认可情况", dataType = "String")
     @TableField("approve_situation")
     private String approveSituation;
 
     /**
      * 溯源性
      */
+    @ApiModelProperty(value = "溯源性", dataType = "String")
     @TableField("traceability")
     private String traceability;
 
     /**
      * 测试方法
      */
+    @ApiModelProperty(value = "测试方法", dataType = "String")
     @TableField("test_method")
     private String testMethod;
 
     /**
      * 技术能力
      */
+    @ApiModelProperty(value = "技术能力", dataType = "String")
     @TableField("technique_ability")
     private String techniqueAbility;
 
     /**
      * 创建时间
      */
+    @ApiModelProperty(hidden = true)
     @TableField("create_time")
     private String createTime;
 
     /**
      * 更新时间
      */
+    @ApiModelProperty(hidden = true)
     @TableField("update_time")
     private String updateTime;
 
+    @ApiModelProperty(value = "审批状态类型-字典value", dataType = "String")
+    @TableField(exist = false)
+    private String approvalStatusName;
 
+    @ApiModelProperty(value = "任务id（同意、驳回等操作使用）", dataType = "String")
+    @TableField(exist = false)
+    private String taskId;
+
+    @ApiModelProperty(value = "可选决策项（1同意驳回拒绝 2同意驳回 3同意拒绝，用于待审批列表同意/驳回/拒绝按钮展示）", dataType = "Integer")
+    @TableField(exist = false)
+    private Integer decisionItem;
+
+    @NotEmpty(message = "受检设备信息不能为空")
+    @ApiModelProperty(value = "受检设备id列表（新建使用参数）", dataType = "List")
+    @TableField(exist = false)
+    private List<OrderSampleDTO> orderSampleList;
+
+    @ExcelProperty(value = "分包机构名称", order = 3)
+    @ApiModelProperty(value = "分包机构名称（列表返回参数）", dataType = "String")
+    private String outsourcerName;
+
+    @ExcelProperty(value = "机构负责人", order = 4)
+    @ApiModelProperty(value = "机构负责人（列表返回参数）", dataType = "String")
+    private String director;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceProtocol.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceProtocol.java
new file mode 100644
index 0000000..38df697
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceProtocol.java
@@ -0,0 +1,225 @@
+package com.casic.missiles.model.business;
+
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
+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 com.casic.missiles.dto.BaseRequest;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotEmpty;
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 计量检定业务-分包管理-测试、校准或检定工作分包协议书
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-08-24
+ */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
+@Data
+@TableName("biz_business_outsource_protocol")
+public class BizBusinessOutsourceProtocol extends BaseRequest implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "id，更新/删除使用参数", dataType = "Long")
+    @TableId("id")
+    private Long id;
+
+    /**
+     * 协议书编号
+     */
+    @ExcelProperty(value = "协议书编号", order = 1)
+    @ApiModelProperty(value = "协议书编号(后台生成)", dataType = "String")
+    @TableField("protocol_no")
+    private String protocolNo;
+
+    /**
+     * 协议书名称
+     */
+    @ExcelProperty(value = "协议书名称", order = 2)
+    @ApiModelProperty(value = "协议书名称", dataType = "String")
+    @TableField("project_name")
+    private String projectName;
+
+    @NotEmpty(message = "实验室代码不能为空")
+    @DictCodeField(message = "实验室代码描述不合法", cacheName = MeterDictCode.LAB_CODE)
+    @ApiModelProperty(value = "实验室代码(字典code)", dataType = "String")
+    @TableField("lab_code")
+    private String labCode;
+
+    @ApiModelProperty(value = "实验室代码(字典value)", dataType = "String")
+    @TableField(exist = false)
+    private String labCodeName;
+
+    @NotEmpty(message = "组别代码不能为空")
+    @DictCodeField(message = "组别代码描述不合法", cacheName = MeterDictCode.GROUP_CODE)
+    @ApiModelProperty(value = "组别代码(字典code)", dataType = "String")
+    @TableField("group_code")
+    private String groupCode;
+
+    @ApiModelProperty(value = "组别代码(字典value)", dataType = "String")
+    @TableField(exist = false)
+    private String groupCodeName;
+
+    /**
+     * 分包方id
+     */
+    @ApiModelProperty(value = "分包方id", dataType = "Long")
+    @TableField("outsourcer_id")
+    private Long outsourcerId;
+
+    /**
+     * 其他
+     */
+    @ApiModelProperty(value = "其他", dataType = "String")
+    @TableField("remark")
+    private String remark;
+
+    /**
+     * 分包方编号
+     */
+    @ApiModelProperty(value = "分包方编号(新建不用传)", dataType = "String")
+    @TableField("outsource_no")
+    private String outsourceNo;
+
+    /**
+     * 分包方名称
+     */
+    @ExcelProperty(value = "分包方名称", order = 3)
+    @ApiModelProperty(value = "分包方名称(新建不用传)", dataType = "String")
+    @TableField("outsource_name")
+    private String outsourceName;
+
+    /**
+     * 联系人
+     */
+    @ExcelProperty(value = "联系人", order = 4)
+    @ApiModelProperty(value = "联系人", dataType = "String")
+    @TableField("contacts")
+    private String contacts;
+
+    /**
+     * 电话
+     */
+    @ApiModelProperty(value = "电话", dataType = "String")
+    @TableField("mobile")
+    private String mobile;
+
+    /**
+     * 地址
+     */
+    @ApiModelProperty(value = "地址", dataType = "String")
+    @TableField("address")
+    private String address;
+
+    /**
+     * 要求完成日期
+     */
+    @ApiModelProperty(value = "要求完成日期", dataType = "String")
+    @TableField("require_date")
+    private String requireDate;
+
+    /**
+     * 分包费用(元)
+     */
+    @ApiModelProperty(value = "分包费用(元)", dataType = "String")
+    @TableField("outsource_cost")
+    private Double outsourceCost;
+
+    /**
+     * 分包方负责人
+     */
+    @ApiModelProperty(value = "分包方负责人", dataType = "String")
+    @TableField("director")
+    private String director;
+
+    /**
+     * 分包项目
+     */
+    @ApiModelProperty(value = "分包项目", dataType = "String")
+    @TableField("item")
+    private String item;
+
+    /**
+     * 分包要求
+     */
+    @ApiModelProperty(value = "分包要求", dataType = "String")
+    @TableField("requires")
+    private String requires;
+
+    /**
+     * 创建人id
+     */
+    @ApiModelProperty(hidden = true)
+    @TableField("create_user_id")
+    private Long createUserId;
+
+    /**
+     * 创建人名字
+     */
+    @ExcelProperty(value = "申请人", order = 5)
+    @ApiModelProperty(value = "申请人", dataType = "String")
+    @TableField("create_user_name")
+    private String createUserName;
+
+    /**
+     * 审批状态
+     */
+    @ApiModelProperty(value = "审批状态", dataType = "String")
+    @DictCodeField(message = "审批状态描述不合法", cacheName = MeterDictCode.APPROVAL_STATUS)
+    @TableField("approval_status")
+    private String approvalStatus;
+
+    /**
+     * 流程实例id
+     */
+    @ApiModelProperty(value = "流程实例id", dataType = "String")
+    @TableField("process_id")
+    private String processId;
+
+    /**
+     * 创建时间
+     */
+    @ExcelProperty(value = "申请时间", order = 6)
+    @ApiModelProperty(value = "申请时间", dataType = "String")
+    @TableField("create_time")
+    private String createTime;
+
+    /**
+     * 更新时间
+     */
+    @ApiModelProperty(hidden = true)
+    @TableField("update_time")
+    private String updateTime;
+
+    @ApiModelProperty(value = "审批状态类型-字典value", dataType = "String")
+    @TableField(exist = false)
+    private String approvalStatusName;
+
+    @ApiModelProperty(value = "任务id（同意、驳回等操作使用）", dataType = "String")
+    @TableField(exist = false)
+    private String taskId;
+
+    @ApiModelProperty(value = "可选决策项（1同意驳回拒绝 2同意驳回 3同意拒绝，用于待审批列表同意/驳回/拒绝按钮展示）", dataType = "Integer")
+    @TableField(exist = false)
+    private Integer decisionItem;
+
+
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourcerInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourcerInfo.java
index ec4e997..f9aa69e 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourcerInfo.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourcerInfo.java
@@ -17,6 +17,7 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import javax.validation.constraints.NotEmpty;
 import java.io.Serializable;
 
 /**
@@ -59,6 +60,29 @@
     @TableField("outsourcer_name")
     private String outsourcerName;
 
+    @NotEmpty(message = "实验室代码不能为空")
+    @DictCodeField(message = "实验室代码描述不合法", cacheName = MeterDictCode.LAB_CODE)
+    @ApiModelProperty(value = "实验室代码(字典code)", dataType = "String")
+    @TableField("lab_code")
+    private String labCode;
+
+    @ApiModelProperty(value = "实验室代码(字典value)", dataType = "String")
+    @TableField(exist = false)
+    private String labCodeName;
+
+    /**
+     * 组别代码
+     */
+    @NotEmpty(message = "组别代码不能为空")
+    @DictCodeField(message = "组别代码描述不合法", cacheName = MeterDictCode.GROUP_CODE)
+    @ApiModelProperty(value = "组别代码(字典code)", dataType = "String")
+    @TableField("group_code")
+    private String groupCode;
+
+    @ApiModelProperty(value = "组别代码(字典value)", dataType = "String")
+    @TableField(exist = false)
+    private String groupCodeName;
+
     /**
      * 单位简称
      */
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardInfo.java
index c48eed7..dffdfdd 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardInfo.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardInfo.java
@@ -5,6 +5,7 @@
 import com.baomidou.mybatisplus.annotation.TableName;
 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;
 
@@ -18,6 +19,7 @@
  * @author wangpeng
  * @since 2023-08-04
  */
+@ApiModel
 @Data
 @TableName("biz_equipment_standard_info")
 public class BizEquipmentStandardInfo implements Serializable {
@@ -119,7 +121,7 @@
      * 管理状态(字典code)
      */
     @ApiModelProperty(value = "管理状态(字典code)", dataType = "String")
-    @DictCodeField(message = "管理状态不合法", cacheName = MeterDictCode.MANAGER_STATE)
+    @DictCodeField(message = "管理状态不合法", cacheName = MeterDictCode.STANDARD_MANAGER_STATE)
     @TableField("manage_status")
     private String manageStatus;
 
@@ -151,7 +153,7 @@
     /**
      * 温度(℃)
      */
-    @ApiModelProperty(value = "使用状态(字典code)", dataType = "String")
+    @ApiModelProperty(value = "温度(℃)", dataType = "String")
     @TableField("temperature")
     private Double temperature;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardInfoApproval.java b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardInfoApproval.java
index dbd86ab..9f58d83 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardInfoApproval.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardInfoApproval.java
@@ -150,7 +150,7 @@
      * 管理状态(字典code)
      */
     @ApiModelProperty(value = "管理状态(字典code)", dataType = "String")
-    @DictCodeField(message = "管理状态不合法", cacheName = MeterDictCode.MANAGER_STATE)
+    @DictCodeField(message = "管理状态不合法", cacheName = MeterDictCode.STANDARD_MANAGER_STATE)
     @TableField("manage_status")
     private String manageStatus;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardTechnologyRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardTechnologyRelation.java
index 0e612bd..751f26b 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardTechnologyRelation.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardTechnologyRelation.java
@@ -3,6 +3,7 @@
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -16,6 +17,7 @@
  * @author wangpeng
  * @since 2023-08-04
  */
+@ApiModel
 @Data
 @TableName("biz_equipment_standard_technology_relation")
 public class BizEquipmentStandardTechnologyRelation implements Serializable {
@@ -33,6 +35,10 @@
     @TableField("technology_file_id")
     private Long technologyFileId;
 
+    @ApiModelProperty(value = "依据的技术文件编号", dataType = "String")
+    @TableField("technology_file_no")
+    private String technologyFileNo;
+
     /**
      * 依据的技术文件名称(技术文件中现行测试校准检定方法表文件名字段)
      */
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerInfo.java
index d6e8bed..65cd6bc 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerInfo.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerInfo.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.model.resource;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -21,6 +28,11 @@
  * @author wangpeng
  * @since 2023-08-08
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @ApiModel
 @Data
 @TableName("biz_resource_customer_info")
@@ -35,6 +47,7 @@
     /**
      * 委托方编号
      */
+    @ExcelProperty(value = "委托方编号", order = 1)
     @ApiModelProperty(value = "委托方编号", dataType = "String")
     @TableField("customer_no")
     private String customerNo;
@@ -42,6 +55,7 @@
     /**
      * 委托方名称
      */
+    @ExcelProperty(value = "委托方名称", order = 2)
     @ApiModelProperty(value = "委托方名称(新建时为下拉选择一个受检单位组织的名字，传deptId字段，后端获取名称)", dataType = "String")
     @TableField("customer_name")
     private String customerName;
@@ -63,6 +77,7 @@
     /**
      * 联系人
      */
+    @ExcelProperty(value = "联系人", order = 3)
     @ApiModelProperty(value = "联系人", dataType = "String")
     @TableField("contacts")
     private String contacts;
@@ -70,6 +85,7 @@
     /**
      * 座机电话
      */
+    @ExcelProperty(value = "座机电话", order = 4)
     @ApiModelProperty(value = "座机电话", dataType = "String")
     @TableField("mobile")
     private String mobile;
@@ -77,6 +93,7 @@
     /**
      * 手机号码
      */
+    @ExcelProperty(value = "手机号码", order = 5)
     @ApiModelProperty(value = "手机号码", dataType = "String")
     @TableField("phone")
     private String phone;
@@ -91,6 +108,7 @@
     /**
      * 地址
      */
+    @ExcelProperty(value = "地址", order = 6)
     @ApiModelProperty(value = "地址", dataType = "String")
     @TableField("address")
     private String address;
@@ -141,6 +159,7 @@
     /**
      * 创建时间
      */
+    @ExcelProperty(value = "创建时间", order = 7)
     @ApiModelProperty(value = "创建时间", dataType = "String")
     @TableField("create_time")
     private String createTime;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerSuggestForm.java b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerSuggestForm.java
index 7201bbd..701bf8b 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerSuggestForm.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerSuggestForm.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.model.resource;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -22,6 +29,11 @@
  * @author wangpeng
  * @since 2023-08-08
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @ApiModel
 @Data
 @TableName("biz_resource_customer_suggest_form")
@@ -44,7 +56,8 @@
     /**
      * 委托方名称
      */
-    @ApiModelProperty(value = "委托方名称", dataType = "String")
+    @ExcelProperty(value = "意见反馈单位", order = 2)
+    @ApiModelProperty(value = "意见反馈单位", dataType = "String")
     @TableField("customer_name")
     private String customerName;
 
@@ -59,7 +72,8 @@
     /**
      * 委托方意见反馈部门名称
      */
-    @ApiModelProperty(value = "委托方意见反馈部门名称", dataType = "String")
+    @ExcelProperty(value = "委托方意见反馈部门", order = 3)
+    @ApiModelProperty(value = "委托方意见反馈部门", dataType = "String")
     @TableField("customer_dept_name")
     private String customerDeptName;
 
@@ -73,6 +87,7 @@
     /**
      * 表单编号
      */
+    @ExcelProperty(value = "表单编号", order = 1)
     @ApiModelProperty(value = "表单编号", dataType = "String")
     @TableField("form_no")
     private String formNo;
@@ -111,6 +126,7 @@
     /**
      * 创建人名字
      */
+    @ExcelProperty(value = "创建人", order = 4)
     @ApiModelProperty(value = "创建人名字", dataType = "String")
     @TableField("create_user_name")
     private String createUserName;
@@ -147,6 +163,7 @@
     /**
      * 创建时间
      */
+    @ExcelProperty(value = "创建时间", order = 5)
     @ApiModelProperty(value = "创建时间", dataType = "String")
     @TableField("create_time")
     private String createTime;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSealInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSealInfo.java
index cbf05d7..9bf389d 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSealInfo.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSealInfo.java
@@ -106,6 +106,10 @@
     @TableField("minio_file_name")
     private String minioFileName;
 
+    @ApiModelProperty(value = "minio存储文件url", dataType = "String")
+    @TableField(exist = false)
+    private String minioFileUrl;
+
     @ApiModelProperty(value = "创建时间", dataType = "String")
     @TableField("create_time")
     private String createTime;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSealUseNote.java b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSealUseNote.java
index 3f2d9e8..3ce16a8 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSealUseNote.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSealUseNote.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.model.resource;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -20,6 +27,11 @@
  * @author wangpeng
  * @since 2023-07-28
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @ApiModel
 @Data
 @TableName("biz_resource_seal_use_note")
@@ -34,6 +46,7 @@
     /**
      * 登记表编号
      */
+    @ExcelProperty(value = "申请单编号", order = 1)
     @ApiModelProperty(value = "登记表编号(自动生成)", dataType = "String")
     @TableField("note_form_no")
     private String noteFormNo;
@@ -55,6 +68,7 @@
     /**
      * 申请部门
      */
+    @ExcelProperty(value = "申请部门", order = 5)
     @ApiModelProperty(value = "申请部门", dataType = "String")
     @TableField("apply_dept_name")
     private String applyDeptName;
@@ -69,6 +83,7 @@
     /**
      * 申请人
      */
+    @ExcelProperty(value = "申请人", order = 6)
     @ApiModelProperty(value = "申请人", dataType = "String")
     @TableField("apply_user_name")
     private String applyUserName;
@@ -76,6 +91,7 @@
     /**
      * 申请时间
      */
+    @ExcelProperty(value = "申请时间", order = 7)
     @ApiModelProperty(value = "申请时间(新增自动获取当前时间)", dataType = "String")
     @TableField("apply_time")
     private String applyTime;
@@ -130,6 +146,26 @@
     @TableField("update_time")
     private String updateTime;
 
+    @ExcelProperty(value = "印章名称", order = 2)
+    @ApiModelProperty(value = "印章名称(列表返回参数)", dataType = "String")
+    @TableField(exist = false)
+    private String sealName;
+
+    @DictCodeField(message = "印章类型描述不合法", cacheName = MeterDictCode.SEAL_TYPE)
+    @ApiModelProperty(hidden = true)
+    @TableField(exist = false)
+    private String sealType;
+
+    @ExcelProperty(value = "印章类型", order = 3)
+    @ApiModelProperty(value = "印章类型(列表返回参数)", dataType = "String")
+    @TableField(exist = false)
+    private String sealTypeName;
+
+    @ExcelProperty(value = "批准人", order = 4)
+    @ApiModelProperty(value = "批准人(列表返回参数)", dataType = "String")
+    @TableField(exist = false)
+    private String approverName;
+
     @ApiModelProperty(value = "审批状态类型-字典value", dataType = "String")
     @TableField(exist = false)
     private String approvalStatusName;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceStaffInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceStaffInfo.java
index 5ef995b..41563a1 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceStaffInfo.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceStaffInfo.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.model.resource;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -20,6 +27,11 @@
  * @author wangpeng
  * @since 2023-07-25
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @ApiModel
 @Data
 @TableName("biz_resource_staff_info")
@@ -38,6 +50,7 @@
     /**
      * 人员编号
      */
+    @ExcelProperty(value = "人员编号",order = 0)
     @NotEmpty(message = "人员编号不能为空")
     @ApiModelProperty(value = "人员编号", dataType = "String")
     @TableField("staff_no")
@@ -46,6 +59,7 @@
     /**
      * 姓名
      */
+    @ExcelProperty(value = "姓名",order = 1)
     @ApiModelProperty(value = "姓名", dataType = "String")
     @TableField("staff_name")
     private String staffName;
@@ -152,13 +166,15 @@
     /**
      * 部门名字
      */
-    @ApiModelProperty(value = "部门名字", dataType = "String")
+    @ExcelProperty(value = "工作部门",order = 4)
+    @ApiModelProperty(value = "工作部门", dataType = "String")
     @TableField("dept_name")
     private String deptName;
 
     /**
      * 岗位
      */
+    @ExcelProperty(value = "岗位",order = 2)
     @ApiModelProperty(value = "岗位", dataType = "String")
     @TableField("station")
     private String station;
@@ -166,6 +182,7 @@
     /**
      * 计量专业
      */
+    @ExcelProperty(value = "计量专业",order = 5)
     @ApiModelProperty(value = "计量专业", dataType = "String")
     @TableField("major")
     private String major;
@@ -173,6 +190,7 @@
     /**
      * 证号
      */
+    @ExcelProperty(value = "证号",order = 3)
     @ApiModelProperty(value = "证号", dataType = "String")
     @TableField("certificate_number")
     private String certificateNumber;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSupplierInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSupplierInfo.java
index eb5ef01..a1e2697 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSupplierInfo.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSupplierInfo.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.model.resource;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -20,6 +27,11 @@
  * @author wangpeng
  * @since 2023-07-27
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @ApiModel
 @Data
 @TableName("biz_resource_supplier_info")
@@ -34,6 +46,7 @@
     /**
      * 供方编号
      */
+    @ExcelProperty(value = "供方编号", order = 1)
     @ApiModelProperty(value = "供方编号(自动生成)", dataType = "String")
     @TableField("supplier_no")
     private String supplierNo;
@@ -41,6 +54,7 @@
     /**
      * 供方名称
      */
+    @ExcelProperty(value = "供方名称", order = 2)
     @ApiModelProperty(value = "供方名称", dataType = "String")
     @TableField("supplier_name")
     private String supplierName;
@@ -60,6 +74,7 @@
     @TableField("supplier_type")
     private String supplierType;
 
+    @ExcelProperty(value = "供方类型", order = 3)
     @ApiModelProperty(value = "供方类型(字典value)", dataType = "String")
     @TableField(exist = false)
     private String supplierTypeName;
@@ -109,7 +124,8 @@
     /**
      * 电话
      */
-    @ApiModelProperty(value = "电话", dataType = "String")
+    @ExcelProperty(value = "联系电话", order = 4)
+    @ApiModelProperty(value = "联系电话", dataType = "String")
     @TableField("phone")
     private String phone;
 
@@ -158,6 +174,7 @@
     /**
      * 公司地址-省
      */
+    @ExcelProperty(value = "地址-省", order = 6)
     @ApiModelProperty(value = "公司地址-省", dataType = "String")
     @TableField("company_province_name")
     private String companyProvinceName;
@@ -172,6 +189,7 @@
     /**
      * 公司地址-市
      */
+    @ExcelProperty(value = "地址-市", order = 7)
     @ApiModelProperty(value = "公司地址-市", dataType = "String")
     @TableField("company_city_name")
     private String companyCityName;
@@ -186,6 +204,7 @@
     /**
      * 公司地址-区
      */
+    @ExcelProperty(value = "地址-区", order = 8)
     @ApiModelProperty(value = "公司地址-区", dataType = "String")
     @TableField("company_area_name")
     private String companyAreaName;
@@ -193,6 +212,7 @@
     /**
      * 公司地址-详细地址
      */
+    @ExcelProperty(value = "地址-详细地址", order = 9)
     @ApiModelProperty(value = "公司地址-详细地址", dataType = "String")
     @TableField("company_address")
     private String companyAddress;
@@ -200,6 +220,7 @@
     /**
      * 服务和供应的内容
      */
+    @ExcelProperty(value = "服务和供应的内容", order = 5)
     @ApiModelProperty(value = "服务和供应的内容", dataType = "String")
     @TableField("supplier_content")
     private String supplierContent;
@@ -250,6 +271,7 @@
     /**
      * 创建时间
      */
+    @ExcelProperty(value = "创建时间", order = 9)
     @ApiModelProperty(value = "创建时间", dataType = "String")
     @TableField("create_time")
     private String createTime;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/EnvLocationInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/EnvLocationInfo.java
new file mode 100644
index 0000000..d8e2d7b
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/EnvLocationInfo.java
@@ -0,0 +1,83 @@
+package com.casic.missiles.model.resource;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotEmpty;
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 实验室环境监控系统-设备表
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-06-07
+ */
+@ApiModel
+@Data
+@TableName("env_location_info")
+public class EnvLocationInfo implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "主键id", dataType = "Long")
+    @TableId("id")
+    private Long id;
+
+    /**
+     * 地点编号
+     */
+    @NotEmpty(message = "地点编号不能为空")
+    @ApiModelProperty(value = "地点编号", dataType = "String")
+    @TableField("location_no")
+    private String locationNo;
+
+    /**
+     * 地点名称
+     */
+    @ApiModelProperty(value = "地点名称", dataType = "String")
+    @TableField("location_name")
+    private String locationName;
+
+    /**
+     * 地点位置
+     */
+    @ApiModelProperty(value = "地点位置", dataType = "String")
+    @TableField("location_position")
+    private String locationPosition;
+
+    /**
+     * 创建人id
+     */
+    @ApiModelProperty(value = "创建人id", dataType = "Long")
+    @TableField("create_user_id")
+    private Long createUserId;
+
+    /**
+     * 创建人
+     */
+    @ApiModelProperty(value = "创建人", dataType = "String")
+    @TableField("create_user")
+    private String createUser;
+
+    /**
+     * 创建时间
+     */
+    @ApiModelProperty(value = "创建时间", dataType = "String")
+    @TableField("create_time")
+    private String createTime;
+
+    /**
+     * 更新时间
+     */
+    @ApiModelProperty(value = "更新时间", dataType = "String")
+    @TableField("update_time")
+    private String updateTime;
+
+
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemFileConfig.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemFileConfig.java
index 19e6845..86e569c 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemFileConfig.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemFileConfig.java
@@ -30,7 +30,7 @@
     @ApiModelProperty(value = "系统类别(1业务系统2受检系统3环境系统)", dataType = "Integer")
     @NotNull(message = "系统类别不能为空")
     @TableField("system_type")
-    private Integer systemType;
+    private Integer systemType = 1;
 
     @ApiModelProperty("下载编号")
     @TableField("download_no")
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemNotice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemNotice.java
index e94297d..06ec37d 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemNotice.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemNotice.java
@@ -34,7 +34,7 @@
     @ApiModelProperty(value = "系统类别(1业务系统2受检系统3环境系统)", dataType = "Integer")
     @NotNull(message = "系统类别不能为空")
     @TableField("system_type")
-    private Integer systemType;
+    private Integer systemType = 1;
 
     /**
      * 通知公告编号
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSign.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSign.java
index 6c0d7c9..954f4f8 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSign.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSign.java
@@ -51,7 +51,7 @@
     @ApiModelProperty(value = "系统类别(1业务系统2受检系统3环境系统)", dataType = "Integer")
     @NotNull(message = "系统类别不能为空")
     @TableField("system_type")
-    private Integer systemType;
+    private Integer systemType = 1;
 
     /**
      * 签名编号
@@ -130,4 +130,8 @@
     @TableField(exist = false)
     private List<Long> userIdList;
 
+    @ApiModelProperty(hidden = true)
+    @TableField(exist = false)
+    private String deptName;
+
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemTemplate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemTemplate.java
index 503a457..1d27ebe 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemTemplate.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemTemplate.java
@@ -47,7 +47,7 @@
     @ApiModelProperty(value = "系统类别(1业务系统2受检系统3环境系统)", dataType = "Integer")
     @NotNull(message = "系统类别不能为空")
     @TableField("system_type")
-    private Integer systemType;
+    private Integer systemType = 1;
 
     /**
      * 模板编号
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java
index 8c21cb0..f61e4a8 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java
@@ -32,4 +32,8 @@
     ReturnDTO approvalDelete(ApprovalDeleteRequest request);
 
     ReturnDTO failUpdate(T request);
+
+    List<O> listExport(R request);
+
+    List<O> listExportByIds(List<Long> ids);
 }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java
index 724166f..9bce15b 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java
@@ -157,6 +157,29 @@
         throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
     }
 
+    @Override
+    public List<O> listExport(R request) {
+        request.setCreateUserId(null);
+        request.setApprovalStatus(ApprovalStatusEnum.PASSED);
+        Page<O> page = PageFactory.defaultPage();
+        page.setCurrent(1);
+        page.setSearchCount(false);
+        page.setSize(Integer.MAX_VALUE);
+        Page<O> resultPage = this.baseMapper.selectBatchForApprovalList(page, request, null);
+        return resultPage.getRecords();
+    }
+
+    @Override
+    public List<O> listExportByIds(List<Long> ids) {
+        Page<O> page = PageFactory.defaultPage();
+        page.setCurrent(1);
+        page.setSearchCount(false);
+        page.setSize(Integer.MAX_VALUE);
+        List<String> businessKeys = ids.stream().map(String::valueOf).collect(Collectors.toList());
+        Page<O> resultPage = this.baseMapper.selectBatchForApprovalList(page, null, businessKeys);
+        return resultPage.getRecords();
+    }
+
     protected ReturnDTO updateApprovalStatus(Long id, String processId, String approvalStatus) {
         UpdateWrapper<T> updateWrapper = new UpdateWrapper<>();
         updateWrapper.eq("id", id);
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificatePrintServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificatePrintServiceImpl.java
index f6e4706..3228497 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificatePrintServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificatePrintServiceImpl.java
@@ -162,6 +162,30 @@
         return ReturnUtil.success(printLogMapper.selectList(wrapper));
     }
 
+    @Override
+    public List<CertificatePrintListResponse> listByIds(List<Long> ids) {
+        Page<CertificatePrintListResponse> page = PageFactory.defaultPage();
+        page.setCurrent(1);
+        page.setSearchCount(false);
+        page.setSize(Integer.MAX_VALUE);
+        List<String> businessKeys = ids.stream().map(String::valueOf).collect(Collectors.toList());
+        Page<CertificatePrintListResponse> resultPage = this.baseMapper.selectBatchForApprovalList(page, null, businessKeys);
+        return resultPage.getRecords();
+    }
+
+    @Override
+    public List<CertificatePrintListResponse> list(CertificatePrintApprovalListRequest request) {
+        request.setCreateUserId(null);
+        request.setApprovalStatus(null);
+        request.setPrintStatus(null);
+        Page<CertificatePrintListResponse> page = PageFactory.defaultPage();
+        page.setCurrent(1);
+        page.setSearchCount(false);
+        page.setSize(Integer.MAX_VALUE);
+        Page<CertificatePrintListResponse> resultPage = certificatePrintMapper.selectBatchForApprovalList(page, request, null);
+        return resultPage.getRecords();
+    }
+
     private void savePrintLog(Long id) {
         BizBusinessCertificatePrintLog printLog = new BizBusinessCertificatePrintLog();
         BizBusinessCertificatePrint certificatePrint = certificatePrintMapper.selectById(id);
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificateReportServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificateReportServiceImpl.java
index 457555f..24146be 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificateReportServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificateReportServiceImpl.java
@@ -158,8 +158,8 @@
         QueryWrapper<BizBusinessCertificateMeasureResultData> mWrapper = new QueryWrapper<>();
         mWrapper.eq("report_id", reportId);
         boolean mRemove = certificateMeasureResultDataService.remove(mWrapper);
-        Assert.isFalse(eRemove || mRemove, () -> {
+        if(!eRemove || !mRemove){
             throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
-        });
+        }
     }
 }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessIdentifyInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessIdentifyInfoServiceImpl.java
index 4c8e190..f7e63ca 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessIdentifyInfoServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessIdentifyInfoServiceImpl.java
@@ -1,8 +1,10 @@
 package com.casic.missiles.service.Impl.business;
 
+import cn.hutool.core.date.DateUtil;
 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.core.page.PageFactory;
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.business.identify.IdentifyListRequest;
@@ -14,11 +16,14 @@
 import com.casic.missiles.service.business.IBizBusinessIdentifyInfoService;
 import com.casic.missiles.utils.DictCodeUtils;
 import com.casic.missiles.utils.NumberGeneratorUtil;
+import com.casic.missiles.utils.QRCodeUtil;
 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.List;
+
 /**
  * <p>
  * 计量检定业务-任务计量管理-标识打印 服务实现类
@@ -35,9 +40,9 @@
     @Override
     public Page<BizBusinessIdentifyInfo> identifyListPage(Page<BizBusinessIdentifyInfo> page, IdentifyListRequest request) throws Exception {
         QueryWrapper<BizBusinessIdentifyInfo> wrapper = new QueryWrapper<>();
-        wrapper.eq("identify_type", request.getIdentifyType());
-        wrapper.like("device_no", request.getDeviceNo());
-        wrapper.like("device_name", request.getDeviceName());
+        wrapper.eq(StringUtils.isNotEmpty(request.getIdentifyType()), "identify_type", request.getIdentifyType());
+        wrapper.like(StringUtils.isNotEmpty(request.getDeviceNo()),"device_no", request.getDeviceNo());
+        wrapper.like(StringUtils.isNotEmpty(request.getDeviceName()), "device_name", request.getDeviceName());
         wrapper.apply(StringUtils.isNotBlank(request.getCreateTimeStart()),
                 "{0} <= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getCreateTimeStart().split(" ")[0]);
         wrapper.apply(StringUtils.isNotBlank(request.getCreateTimeEnd()),
@@ -64,8 +69,11 @@
     }
 
     @Override
-    public ReturnDTO updateIdentify(BizBusinessIdentifyInfo identifyInfo) {
-        if(identifyInfoMapper.updateById(identifyInfo) > 0){
+    public ReturnDTO updateIdentify(Long id) {
+        BizBusinessIdentifyInfo info = new BizBusinessIdentifyInfo();
+        info.setId(id);
+        info.setUpdateTime(DateUtil.now());
+        if(identifyInfoMapper.updateById(info) > 0){
             return ReturnUtil.success();
         }
         throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
@@ -79,4 +87,20 @@
         throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
     }
 
+    @Override
+    public List<BizBusinessIdentifyInfo> list(IdentifyListRequest request) throws Exception {
+        Page<BizBusinessIdentifyInfo> page = PageFactory.defaultPage();
+        page.setCurrent(1);
+        page.setSearchCount(false);
+        page.setSize(Integer.MAX_VALUE);
+        Page<BizBusinessIdentifyInfo> resultPage = this.identifyListPage(page, request);
+        return resultPage.getRecords();
+    }
+
+    @Override
+    public ReturnDTO<String> equipmentQrCode(Long id) {
+        String base64QRCode = QRCodeUtil.getBase64QRCode(String.valueOf(id));
+        return ReturnUtil.success(base64QRCode);
+    }
+
 }

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java
index bb0c50f..13a699b 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java
@@ -12,6 +12,7 @@
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.IGeneralApprovalService;
+import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
@@ -19,6 +20,7 @@
 import org.springframework.web.bind.annotation.RequestBody;
 
 import javax.validation.Valid;
+import java.util.List;
 import java.util.Objects;
 
 /**
@@ -117,4 +119,17 @@
         }
         return baseApprovalService.failUpdate(request);
     }
+
+    public List<O> exportList(@RequestBody @Valid R request) throws Exception {
+        List<O> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = baseApprovalService.listExportByIds(request.getIds());
+        } else {
+            list = baseApprovalService.listExport(request);
+        }
+        for (O record : list) {
+            DictCodeUtils.convertDictCodeToName(record);
+        }
+        return list;
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java
index 8a90961..d775831 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java
@@ -5,6 +5,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.business.certificate.CertificateChangeApplyApprovalListRequest;
 import com.casic.missiles.dto.business.certificate.CertificateChangeApplySaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessCertificateChangeApply;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
@@ -20,6 +21,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -48,4 +50,12 @@
         }
         return changeApplyService.saveChangeApply(request);
     }
+
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody CertificateChangeApplyApprovalListRequest request) throws Exception {
+        List<BizBusinessCertificateChangeApply> list = super.exportList(request);
+        super.exportExcel(BizBusinessCertificateChangeApply.class, list, ExportEnum.CERTIFICATE_CHANGE_APPLY.getSheetName());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java
index 5fc4b07..af8230e 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java
@@ -9,6 +9,7 @@
 import com.casic.missiles.dto.business.certificate.CertificatePrintApprovalListRequest;
 import com.casic.missiles.dto.business.certificate.CertificatePrintListResponse;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.enums.business.CertificatePrintStatusEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessCertificatePrintLog;
@@ -18,10 +19,16 @@
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.io.IOException;
+import java.util.List;
 import java.util.Objects;
 
 /**
@@ -98,4 +105,16 @@
         });
         return certificatePrintService.certificatePrintLog(idDTO.getId());
     }
+
+    @ApiOperation("证书打印审批导出")
+    @PostMapping("/listExport")
+    public void exportList(@RequestBody CertificatePrintApprovalListRequest request) throws IOException {
+        List<CertificatePrintListResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = certificatePrintService.listByIds(request.getIds());
+        } else {
+            list = certificatePrintService.list(request);
+        }
+        super.exportExcel(CertificatePrintListResponse.class, list, ExportEnum.CERTIFICATE_PRINT.getSheetName());
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java
index 63b06dc..6b2efd5 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java
@@ -6,6 +6,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.business.certificate.CertificateReportApprovalListRequest;
 import com.casic.missiles.dto.business.certificate.CertificateReportSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessCertificateReport;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
@@ -21,6 +22,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -50,7 +52,7 @@
         return certificateReportService.saveCertificateReport(request);
     }
 
-    @ApiOperation("证书审批详情（基本信息）")
+    @ApiOperation("详情（基本信息）")
     @PostMapping("/detail")
     public ReturnDTO<BizBusinessCertificateReport> detail(@RequestBody @Valid BaseDetailRequest request, BindingResult bindingResult) throws Exception {
         if(bindingResult.hasErrors()){
@@ -59,4 +61,11 @@
         return certificateReportService.detail(request);
     }
 
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody CertificateReportApprovalListRequest request) throws Exception {
+        List<BizBusinessCertificateReport> list = super.exportList(request);
+        super.exportExcel(BizBusinessCertificateReport.class, list, ExportEnum.CERTIFICATE_REPORT.getSheetName());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java
index 46b26bd..57c0809 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java
@@ -10,20 +10,21 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.business.identify.IdentifyListRequest;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessIdentifyInfo;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.business.IBizBusinessIdentifyInfoService;
+import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import javax.validation.Valid;
+import java.util.List;
 import java.util.Objects;
 
 /**
@@ -57,16 +58,13 @@
         return identifyInfoService.addIdentify(identifyInfo);
     }
 
-    @ApiOperation("标识打印更新")
+    @ApiOperation("标识打印更新（更新打印时间）")
     @PostMapping("/update")
-    public ReturnDTO updateIdentify(@RequestBody @Valid BizBusinessIdentifyInfo identifyInfo, BindingResult bindingResult) {
-        Assert.isFalse(Objects.isNull(identifyInfo.getId()), () -> {
+    public ReturnDTO updateIdentify(@RequestBody @Valid IdDTO idDTO) {
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        Assert.isFalse(bindingResult.hasErrors(), () -> {
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        });
-        return identifyInfoService.updateIdentify(identifyInfo);
+        return identifyInfoService.updateIdentify(idDTO.getId());
     }
 
     @ApiOperation("标识打印删除")
@@ -77,4 +75,37 @@
         });
         return identifyInfoService.deleteIdentify(idDTO.getId());
     }
+
+    @ApiOperation("标识打印导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody @Valid IdentifyListRequest request, BindingResult bindingResult) throws Exception {
+        if (bindingResult.hasErrors()) {
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        List<BizBusinessIdentifyInfo> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = identifyInfoService.listByIds(request.getIds());
+        } else {
+            list = identifyInfoService.list(request);
+        }
+        for (BizBusinessIdentifyInfo record : list) {
+            DictCodeUtils.convertDictCodeToName(record);
+        }
+        super.exportExcel(BizBusinessIdentifyInfo.class, list, ExportEnum.IDENTIFY_EXPORT.getSheetName());
+    }
+
+
+    // TODO: 2023/8/23 查询设备信息，4个底部按钮查设备（按钮的作用就是前端用来调不同接口、用来区分中间即将展示的标识），前端弹窗选设备，在确定保存时前端根据底部按钮判断传入设备类型deviceType字典code
+    // TODO: 2023/8/23 接口：查受检设备（第1个按钮），查设备台账（后3个按钮同一接口），查询之后前端根据标志类型的不同加到中间页面时进行判断（按产品给的对应表）
+    // TODO: 2023/8/23 提供二维码接口，前端在加到中间页面时调用一下
+
+    @ApiOperation("设备二维码")
+    @PostMapping("/equipment/qrCode")
+    public ReturnDTO<String> equipmentQrCode(@RequestBody @Valid IdDTO idDTO) {
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return identifyInfoService.equipmentQrCode(idDTO.getId());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java
index 707be6e..7e0453d 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java
@@ -117,7 +117,7 @@
     }
 
     @ApiOperation("任务单导出")
-    @PostMapping("/export")
+    @PostMapping("/listExport")
     public void orderExport(@RequestBody @Valid OrderListRequest request, HttpServletResponse response) {
         businessOrderService.orderExport(request, response);
     }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java
index 529a6ce..51432be 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java
@@ -1,9 +1,28 @@
 package com.casic.missiles.controller.business;
 
+import com.casic.missiles.controller.GeneralApprovalController;
+import com.casic.missiles.dto.BaseApprovalSubmitRequest;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.business.outsource.OutsourceAssessApprovalListRequest;
+import com.casic.missiles.dto.business.outsource.OutsourceAssessSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
+import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.model.business.BizBusinessOutsourceAssess;
+import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
+import com.casic.missiles.service.IGeneralApprovalService;
+import com.casic.missiles.service.business.IBizBusinessOutsourceAssessService;
 import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.BindingResult;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.validation.Valid;
+import java.util.List;
+
 /**
  * <p>
  * 计量检定业务-分包管理-测试、校准或检定工作分包评审表 前端控制器
@@ -15,6 +34,27 @@
 @Api(tags = "分包管理-测试、校准或检定工作分包评审表")
 @RestController
 @RequestMapping("/business/outsource/assess")
-public class BizBusinessOutsourceAssessController {
+public class BizBusinessOutsourceAssessController extends GeneralApprovalController<BizBusinessOutsourceAssess, BizBusinessOutsourceAssess, OutsourceAssessApprovalListRequest, BaseApprovalSubmitRequest> {
+    @Autowired
+    private IBizBusinessOutsourceAssessService outsourceAssessService;
 
+    public BizBusinessOutsourceAssessController(IGeneralApprovalService<BizBusinessOutsourceAssess, BizBusinessOutsourceAssess, OutsourceAssessApprovalListRequest, BaseApprovalSubmitRequest> baseApprovalService) {
+        super(baseApprovalService);
+    }
+
+    @ApiOperation("草稿箱-保存")
+    @PostMapping("/save")
+    public ReturnDTO<OutsourceAssessSaveResponse> saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceAssess request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        return outsourceAssessService.saveOutsourceAssess(request);
+    }
+
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception {
+        List<BizBusinessOutsourceAssess> list = super.exportList(request);
+        super.exportExcel(BizBusinessOutsourceAssess.class, list, ExportEnum.OUTSOURCE_ASSESS.getSheetName());
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java
new file mode 100644
index 0000000..9adef18
--- /dev/null
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java
@@ -0,0 +1,60 @@
+package com.casic.missiles.controller.business;
+
+import com.casic.missiles.controller.GeneralApprovalController;
+import com.casic.missiles.dto.BaseApprovalSubmitRequest;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.business.outsource.OutsourceProtocolApprovalListRequest;
+import com.casic.missiles.dto.business.outsource.OutsourceProtocolSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
+import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.model.business.BizBusinessOutsourceProtocol;
+import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
+import com.casic.missiles.service.IGeneralApprovalService;
+import com.casic.missiles.service.business.IBizBusinessOutsourceProtocolService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.BindingResult;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.validation.Valid;
+import java.util.List;
+
+/**
+ * <p>
+ * 计量检定业务-分包管理-测试、校准或检定工作分包协议书 前端控制器
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-08-24
+ */
+@Api(tags = "分包管理-测试、校准或检定工作分包协议书")
+@RestController
+@RequestMapping("/business/outsource/protocol")
+public class BizBusinessOutsourceProtocolController extends GeneralApprovalController<BizBusinessOutsourceProtocol, BizBusinessOutsourceProtocol, OutsourceProtocolApprovalListRequest, BaseApprovalSubmitRequest> {
+    @Autowired
+    private IBizBusinessOutsourceProtocolService outsourceProtocolService;
+
+    public BizBusinessOutsourceProtocolController(IGeneralApprovalService<BizBusinessOutsourceProtocol, BizBusinessOutsourceProtocol, OutsourceProtocolApprovalListRequest, BaseApprovalSubmitRequest> baseApprovalService) {
+        super(baseApprovalService);
+    }
+
+    @ApiOperation("草稿箱-保存")
+    @PostMapping("/save")
+    public ReturnDTO<OutsourceProtocolSaveResponse> saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceProtocol request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        return outsourceProtocolService.saveOutsourceProtocol(request);
+    }
+
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody OutsourceProtocolApprovalListRequest request) throws Exception {
+        List<BizBusinessOutsourceProtocol> list = super.exportList(request);
+        super.exportExcel(BizBusinessOutsourceProtocol.class, list, ExportEnum.OUTSOURCE_PROTOCOL.getSheetName());
+    }
+}
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java
index 097f645..f0f0943 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java
@@ -17,7 +17,6 @@
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.IGeneralApprovalService;
 import com.casic.missiles.service.business.IBizBusinessOutsourcerInfoService;
-import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -71,19 +70,8 @@
 
     @ApiOperation("分包方导出")
     @PostMapping("/listExport")
-    public void export(@RequestBody @Valid OutsourcerInfoApprovalListRequest request, BindingResult bindingResult) throws Exception {
-        if (bindingResult.hasErrors()) {
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        }
-        List<BizBusinessOutsourcerInfo> list;
-        if (!CollectionUtils.isEmpty(request.getIds())) {
-            list = outsourcerInfoService.listByIds(request.getIds());
-        } else {
-            list = outsourcerInfoService.list(request);
-        }
-        for (BizBusinessOutsourcerInfo record : list) {
-            DictCodeUtils.convertDictCodeToName(record);
-        }
+    public void export(@RequestBody OutsourcerInfoApprovalListRequest request) throws Exception {
+        List<BizBusinessOutsourcerInfo> list = super.exportList(request);
         super.exportExcel(BizBusinessOutsourcerInfo.class, list, ExportEnum.OUTSOURCER_EXPORT.getSheetName());
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java
index c2cbf9f..0410918 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java
@@ -17,11 +17,9 @@
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.IGeneralApprovalService;
 import com.casic.missiles.service.business.IBizBusinessSiteExecutiveInfoService;
-import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -60,7 +58,7 @@
         return siteExecutiveInfoService.saveSiteExecutiveInfo(siteExecutiveInfo);
     }
 
-    @ApiOperation("现场检测详情")
+    @ApiOperation("详情")
     @PostMapping("/detail")
     public ReturnDTO<SiteExecutiveDetailResponse> siteExecutiveDetail(@RequestBody @Valid IdDTO idDTO) throws Exception {
         Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
@@ -69,21 +67,10 @@
         return ReturnUtil.success(siteExecutiveInfoService.detail(idDTO.getId()));
     }
 
-    @ApiOperation("现场检测导出")
+    @ApiOperation("导出")
     @PostMapping("/listExport")
-    public void export(@RequestBody @Valid SiteExecutiveApprovalListRequest request, BindingResult bindingResult) throws Exception {
-        if (bindingResult.hasErrors()) {
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        }
-        List<SiteExecutiveApprovalListResponse> list;
-        if (!CollectionUtils.isEmpty(request.getIds())) {
-            list = siteExecutiveInfoService.listInfoByIds(request.getIds());
-        } else {
-            list = siteExecutiveInfoService.listInfo(request);
-        }
-        for (SiteExecutiveApprovalListResponse record : list) {
-            DictCodeUtils.convertDictCodeToName(record);
-        }
+    public void export(@RequestBody SiteExecutiveApprovalListRequest request) throws Exception {
+        List<SiteExecutiveApprovalListResponse> list = super.exportList(request);
         super.exportExcel(SiteExecutiveApprovalListResponse.class, list, ExportEnum.SITE_EXECUTIVE_EXPORT.getSheetName());
     }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
index 7e793cd..a92e209 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
@@ -55,7 +55,7 @@
 
     @ApiOperation("设备收发列表导出")
     @PostMapping("/export")
-    public void exportList(@RequestBody @Valid SampleDispatchListRequest request) throws IOException {
+    public void exportList(@RequestBody SampleDispatchListRequest request) throws IOException {
         List<SampleDispatchListResponse> list;
         if (!CollectionUtils.isEmpty(request.getIds())) {
             list = dispatchService.listByIds(request.getIds());
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java
index cdc77fc..d120fd4 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java
@@ -7,6 +7,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.business.labExecutive.*;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.business.IBusinessLabExecutiveInfoService;
@@ -14,6 +15,7 @@
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.*;
 
@@ -32,7 +34,7 @@
     @Autowired
     private IBusinessLabExecutiveInfoService labExecutiveInfoService;
 
-    @ApiOperation("实验室检测-部门检测-查询各状态列表（待检测、检测中、检测完）")
+    @ApiOperation("实验室任务-查询各状态列表（待检测、检测中、检测完）")
     @PostMapping("/deptExecutive/List")
     public ReturnDTO<PageInfoBT<SampleLabExecutiveListResponse>> queryDeptExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
@@ -43,10 +45,19 @@
         return ReturnUtil.success(super.packForBT(labExecutiveInfoService.deptLabExecutiveListPage(page, labExecutiveListRequest)));
     }
 
-    /**
-     * 实验室检测-我的检测-查询各状态列表（待检测、检测中、检测完）
-     */
-    @ApiOperation("实验室检测-我的检测-查询各状态列表（待检测、检测中、检测完）")
+    @ApiOperation("实验室任务导出")
+    @PostMapping("/deptExecutive/export")
+    public void deptExportList(@RequestBody @Valid SampleLabExecutiveListRequest request) throws Exception {
+        List<SampleLabExecutiveListResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = labExecutiveInfoService.deptLabExecutiveListByIds(request.getMeasureStatus(), request.getIds());
+        } else {
+            list = labExecutiveInfoService.deptLabExecutiveList(request);
+        }
+        super.exportExcel(SampleLabExecutiveListResponse.class, list, ExportEnum.DEPT_EXECUTIVE_TASK.getSheetName());
+    }
+
+    @ApiOperation("我的任务-查询各状态列表（待检测、检测中、检测完）")
     @PostMapping("/myExecutive/list")
     public ReturnDTO<PageInfoBT<SampleLabExecutiveListResponse>> queryMyExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
@@ -57,19 +68,25 @@
         return ReturnUtil.success(super.packForBT(labExecutiveInfoService.myLabExecutiveListPage(page, labExecutiveListRequest)));
     }
 
-    /**
-     * 实验室检测-我的检测-查询各状态样品数量（待检测、检测中、检测完）
-     */
-    @ApiOperation("实验室检测-我的检测-查询各状态样品数量（待检测、检测中、检测完）")
+    @ApiOperation("我的任务导出")
+    @PostMapping("/myExecutive/export")
+    public void exportList(@RequestBody @Valid SampleLabExecutiveListRequest request) throws Exception {
+        List<SampleLabExecutiveListResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = labExecutiveInfoService.myLabExecutiveListByIds(request.getMeasureStatus(), request.getIds());
+        } else {
+            list = labExecutiveInfoService.myLabExecutiveList(request);
+        }
+        super.exportExcel(SampleLabExecutiveListResponse.class, list, ExportEnum.MY_EXECUTIVE_TASK.getSheetName());
+    }
+
+    @ApiOperation("我的任务-查询各状态样品数量（待检测、检测中、检测完）")
     @GetMapping("/myExecutive/amount")
     public ReturnDTO<List<SampleAmountResponse>> queryMyExecutiveAmount() {
         return ReturnUtil.success(labExecutiveInfoService.myExecutiveAmount());
     }
 
-    /**
-     * 实验室检测-部门检测-分配（分配给具体人员）
-     */
-    @ApiOperation("实验室检测-部门检测-分配按钮（分配给具体人员）")
+    @ApiOperation("实验室任务-分配按钮（分配给具体人员）")
     @PostMapping("/deptExecutive/allocate")
     public ReturnDTO allocateStaff(@RequestBody @Valid SampleAllocateRequest sampleAllocateRequest, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -78,10 +95,7 @@
         return labExecutiveInfoService.allocateStaff(sampleAllocateRequest);
     }
 
-    /**
-     * 实验室检测-我的检测-检定人扫描收入（待检测->检测中）
-     */
-    @ApiOperation("实验室检测-我的检测-检定人扫描收入（待检测->检测中）")
+    @ApiOperation("我的任务-检定人扫描收入（待检测->检测中）")
     @PostMapping("/myExecutive/receive")
     public ReturnDTO sampleReceive(@RequestBody @Valid List<SampleOperateRequest> requestList, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -90,10 +104,7 @@
         return labExecutiveInfoService.sampleReceive(requestList);
     }
 
-    /**
-     * 实验室检测-负责人/检定人扫描检完（检测中->检测完）
-     */
-    @ApiOperation("实验室检测-负责人/检定人扫描检完（检测中->检测完）")
+    @ApiOperation("实验室任务-负责人/检定人扫描检完（检测中->检测完）")
     @PostMapping("/myExecutive/complete")
     public ReturnDTO sampleExecutiveComplete(@RequestBody @Valid List<SampleOperateRequest> requestList, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -102,10 +113,7 @@
         return labExecutiveInfoService.sampleExecutiveComplete(requestList);
     }
 
-    /**
-     * 实验室检测-部门检测/我的检测 编辑（只能修改应出具证书）
-     */
-    @ApiOperation("实验室检测-部门检测/我的检测 编辑（只能修改应出具证书）")
+    @ApiOperation("实验室任务/我的任务 编辑（只能修改应出具证书）")
     @PostMapping("/executive/update")
     public ReturnDTO updateExecutive(@RequestBody @Valid UpdateExecutiveRequest request, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -114,10 +122,7 @@
         return labExecutiveInfoService.updateExecutive(request);
     }
 
-    /**
-     * 实验室检测-部门检测/我的检测 详情
-     */
-    @ApiOperation("实验室检测-部门检测/我的检测 详情")
+    @ApiOperation("实验室任务/我的任务 详情")
     @PostMapping("/executive/detail")
     public ReturnDTO<ExecutiveDetailResponse> executiveDetail(@RequestBody @Valid ExecutiveDetailRequest request, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
@@ -131,7 +136,7 @@
      * 退回后会将下一个要执行的实验室检测状态更新为待分配，将后面的实验室顺序变更为连续（都进行减1）
      * 最后一个检测的实验室退回，等分发员再增加实验室或设备收发中的已收入直接手动点击完成
      */
-    @ApiOperation("实验室检测-部门检测/我的检测 退回（待检测/检测中->退回）")
+    @ApiOperation("实验室任务/我的任务 退回（待检测/检测中->退回）")
     @PostMapping("/executive/sendBack")
     public ReturnDTO executiveSendBack(@RequestBody @Valid ExecutiveSendBackRequest request, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -140,9 +145,6 @@
         return labExecutiveInfoService.sampleExecutiveSendBack(request);
     }
 
-    /**
-     * 分发员编辑实验室检测列表
-     */
     @ApiOperation("分发员编辑实验室检测列表")
     @PostMapping("/handOut/updateList")
     public ReturnDTO updateExecutiveList(@RequestBody @Valid UpdateExecutiveListRequest request, BindingResult bindingResult) {
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java
index 48a67ed..0c04f31 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java
@@ -10,6 +10,7 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.resource.customer.CustomerApprovalListRequest;
 import com.casic.missiles.dto.resource.customer.CustomerSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceCustomerInfo;
@@ -26,6 +27,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -55,6 +57,13 @@
         return customerInfoService.saveCustomerInfo(request);
     }
 
+    @ApiOperation("委托方名录导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody CustomerApprovalListRequest request) throws Exception {
+        List<BizResourceCustomerInfo> list = super.exportList(request);
+        super.exportExcel(BizResourceCustomerInfo.class, list, ExportEnum.CUSTOMER_INFO.getSheetName());
+    }
+
     @ApiOperation("委托方人员列表（分页）")
     @PostMapping("/person/listPage")
     public ReturnDTO<PageInfoBT<BizResourceCustomerStaff>> personListPage(@RequestBody IdDTO idDto) {
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
index 972ed4b..6418ea5 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
@@ -5,6 +5,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.resource.customer.SuggestFormApprovalListRequest;
 import com.casic.missiles.dto.resource.customer.SuggestFormSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceCustomerSuggestForm;
@@ -20,6 +21,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -50,4 +52,11 @@
         return suggestFormService.saveSuggestForm(request);
     }
 
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody SuggestFormApprovalListRequest request) throws Exception {
+        List<BizResourceCustomerSuggestForm> list = super.exportList(request);
+        super.exportExcel(BizResourceCustomerSuggestForm.class, list, ExportEnum.CUSTOMER_SUGGEST_FORM.getSheetName());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java
index 1934d1a..9e07eab 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java
@@ -15,12 +15,16 @@
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.resource.IEnvEnvironmentRecordConfigService;
 import com.casic.missiles.service.resource.IEnvEnvironmentRecordDataService;
+import com.casic.missiles.service.resource.IEnvLocationInfoService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
 import java.util.List;
@@ -39,6 +43,8 @@
     private IEnvEnvironmentRecordDataService environmentRecordDataService;
     @Autowired
     private IEnvEnvironmentRecordConfigService environmentRecordConfigService;
+    @Autowired
+    private IEnvLocationInfoService locationInfoService;
 
     @ApiOperation("环境记录单数据列表/详情")
     @PostMapping("/data/listPage")
@@ -95,4 +101,11 @@
         });
         return environmentRecordConfigService.deleteEnvironmentRecordConfig(idDTO.getId());
     }
+
+    @ApiOperation("地点列表")
+    @PostMapping("/location/listPage")
+    public ReturnDTO<PageInfoBT<LocationListResponse>> locationListPage(@RequestBody @Valid LocationListRequest request) {
+        Page<LocationListResponse> page = PageFactory.defaultPage();
+        return ReturnUtil.success(super.packForBT(locationInfoService.listPage(page, request)));
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java
index 82efe3f..e9561fa 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java
@@ -10,6 +10,7 @@
 import com.casic.missiles.dto.resource.seal.SealLogListRequest;
 import com.casic.missiles.dto.resource.seal.SealNoteApprovalListRequest;
 import com.casic.missiles.dto.resource.seal.SealNoteSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceSealUseLog;
@@ -27,6 +28,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -58,6 +60,13 @@
         return sealUseNoteService.saveSeal(request);
     }
 
+    @ApiOperation("印章使用登记导出（列表和导出中去掉经办人和监印人）")
+    @PostMapping("/listExport")
+    public void export(@RequestBody SealNoteApprovalListRequest request) throws Exception {
+        List<BizResourceSealUseNote> list = super.exportList(request);
+        super.exportExcel(BizResourceSealUseNote.class, list, ExportEnum.SEAL_NOTE.getSheetName());
+    }
+
     // TODO: 2023/7/28 印章使用日志：系统中使用印章时插入数据库
 
     @ApiOperation("印章使用日志列表（分页）")
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java
index 9b674fc..06b6521 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java
@@ -9,16 +9,20 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.resource.staff.StaffCertRequest;
 import com.casic.missiles.dto.resource.staff.StaffCertResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.service.resource.IBizResourceStaffInfoService;
 import com.casic.missiles.service.resource.IBizResourceStaffVerifierService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.List;
+
 /**
  * @Description:
  * @Author: wangpeng
@@ -41,9 +45,21 @@
         return ReturnUtil.success(super.packForBT(responsePage));
     }
 
+    @ApiOperation("证书逾期提醒导出")
+    @PostMapping("/listExport")
+    public void exportList(@RequestBody StaffCertRequest request) throws Exception {
+        List<StaffCertResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = staffInfoService.certListByIds(request.getIds());
+        } else {
+            list = staffInfoService.certList(request);
+        }
+        super.exportExcel(StaffCertResponse.class, list, ExportEnum.STAFF_CERTIFICATE_EXPIRE.getSheetName());
+    }
+
     @ApiOperation("证书逾期提醒")
     @PostMapping("/expirationReminder")
-    public ReturnDTO expirationReminder(@RequestBody IdDTO idDto) {
-        return verifierService.expirationReminder(idDto);
+    public ReturnDTO expirationReminder(@RequestBody IdDTO idDTO) {
+        return verifierService.expirationReminder(idDTO);
     }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java
index 3b251ad..a6e7850 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java
@@ -12,6 +12,7 @@
 import com.casic.missiles.dto.resource.staff.StaffListRequest;
 import com.casic.missiles.dto.resource.staff.TrainListRequest;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.*;
@@ -22,7 +23,10 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
 import java.util.List;
@@ -52,8 +56,19 @@
             throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
         }
         Page<BizResourceStaffInfo> page = PageFactory.defaultPage();
-        Page<BizResourceStaffInfo> responsePage = staffInfoService.listPage(page, request);
-        return ReturnUtil.success(super.packForBT(responsePage));
+        return ReturnUtil.success(super.packForBT(staffInfoService.listPage(page, request)));
+    }
+
+    @ApiOperation("人员登记导出")
+    @PostMapping("/listExport")
+    public void exportList(@RequestBody StaffListRequest request) throws Exception {
+        List<BizResourceStaffInfo> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = staffInfoService.listByIds(request.getIds());
+        } else {
+            list = staffInfoService.list(request);
+        }
+        super.exportExcel(BizResourceStaffInfo.class, list, ExportEnum.STAFF_INFO.getSheetName());
     }
 
     @ApiOperation("人员登记详情基础信息")
@@ -85,9 +100,9 @@
 
     @ApiOperation("科研教育列表（分页）")
     @PostMapping("/education/listPage")
-    public ReturnDTO<PageInfoBT<BizResourceStaffEducation>> educationListPage(@RequestBody IdDTO idDto) {
+    public ReturnDTO<PageInfoBT<BizResourceStaffEducation>> educationListPage(@RequestBody IdDTO idDTO) {
         Page<BizResourceStaffEducation> page = PageFactory.defaultPage();
-        Page<BizResourceStaffEducation> responsePage = staffInfoService.educationListPage(page, idDto);
+        Page<BizResourceStaffEducation> responsePage = staffInfoService.educationListPage(page, idDTO);
         return ReturnUtil.success(super.packForBT(responsePage));
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java
index af6aa86..d85d84a 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java
@@ -9,6 +9,7 @@
 import com.casic.missiles.dto.resource.outsideService.SupplierApprovalListRequest;
 import com.casic.missiles.dto.resource.outsideService.SupplierSaveResponse;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceSupplierAbility;
@@ -67,6 +68,13 @@
         return ReturnUtil.success(supplierInfoService.detail(idDTO.getId()));
     }
 
+    @ApiOperation("合格供方导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody SupplierApprovalListRequest request) throws Exception {
+        List<BizResourceSupplierInfo> list = super.exportList(request);
+        super.exportExcel(BizResourceSupplierInfo.class, list, ExportEnum.SUPPLIER_INFO.getSheetName());
+    }
+
     @ApiOperation("供方人员列表（分页）")
     @PostMapping("/person/listPage")
     public ReturnDTO<PageInfoBT<BizResourceSupplierPerson>> personListPage(@RequestBody IdDTO idDTO) {
diff --git a/casic-metering-api/src/main/resources/config/application.yml b/casic-metering-api/src/main/resources/config/application.yml
index 350db5f..ecff521 100644
--- a/casic-metering-api/src/main/resources/config/application.yml
+++ b/casic-metering-api/src/main/resources/config/application.yml
@@ -126,7 +126,7 @@
     #作者
     author: wangpeng
     #待生成对象表名
-    table-name: biz_equipment_technical_target_approval,biz_equipment_attachment_approval,biz_equipment_checkpoint_approval
+    table-name: biz_business_outsource_protocol
 
 reminder:
   #节点--common模块config包 ReminderNodeConfig配置
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
index 4a19e4e..d47d552 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
@@ -53,6 +53,7 @@
     SUGGEST_FORM_SAVE_FAILED(2509, "委托方意见登记表保存至草稿箱失败"),
     EXAMINE_FORM_SAVE_FAILED(2510, "要求、委托书及合同评审表保存至草稿箱失败"),
     CUSTOMER_EXIST_SAVE_FAILED(2511, "该委托方已存在，请重新选择"),
+    DUPLICATE_LOCATION_NO(2512, "地点编号已存在"),
 
     /**
      * 计量检定业务模块
@@ -68,6 +69,8 @@
     COMPLETE_SAMPLE_NOT_EXIST(2609, "检测中不存在扫描收入的样品"),
     CANNOT_CHANGE_MEASURE_INFO(2610, "无法更改非当前登录用户的检测信息"),
     NON_EXIST_ORDER_OR_SAMPLE(2611, "不存在该委托单或该委托单下的样品"),
+    OUTSOURCE_ACCESS_SAVE_FAILED(2612, "测试、校准或检定工作分包评审表保存至草稿箱失败"),
+    OUTSOURCE_PROTOCOL_SAVE_FAILED(2613, "测试、校准或检定工作分包协议书保存至草稿箱失败"),
 
     /**
      * 历史遗留备用
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
index 5089ad1..81a406b 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
@@ -10,54 +10,38 @@
     /**
      * 资源管理
      */
-    ENVIRONMENT_DATA_EXPORT("environmentData", "environmentData", "环境记录单数据"),
+    ENVIRONMENT_DATA_EXPORT("environmentData", "环境记录单数据", "环境记录单数据"),
+    STAFF_INFO("staffInfo", "人员登记", "人员登记"),
+    STAFF_CERTIFICATE_EXPIRE("certificateExpire", "证书逾期提醒", "证书逾期提醒"),
+    SUPPLIER_INFO("supplierInfo", "合格供方名录", "合格供方名录"),
+    CUSTOMER_INFO("customerInfo", "委托方名录", "委托方名录"),
+    CUSTOMER_SUGGEST_FORM("customerSuggestForm", "委托方意见登记表", "委托方意见登记表"),
+    SEAL_NOTE("sealNote", "印章使用登记", "印章使用登记"),
 
-    FILE_EXPORT("meterFileData", "meterFileData", "计量文件信息"),
-    TRAIN_PLAN_EXPORT("trainPlanData", "trainPlanData", "培训计划"),
-    TRAIN_LOG_EXPORT("trainLogData", "trainLogData", "培训记录"),
-    METER_ORGANIZE_EXPORT("meterOrganizeData", "meterOrganizeData", "计量组织"),
-    TRACE_SUPPLIER_EXPORT("traceSupplierData", "traceSupplierData", "溯源供方"),
-    SIGN_EXPORT("signData", "signData", "签名/签章"),
-    TEMPLATE_EXPORT("templateData", "templateData", "原始记录模板/证书报告模板"),
-    FIXED_ASSETS("meterFixedAssets", "meterFixedAssets", "固定资产"),
-    METER_EQUIPMENT("meterEquipment", "meterEquipment", "测量设备"),
-    CALIBRATION_TEST_EQUIPMENT("calibrationTestEquipment", "calibrationTestEquipment", "校准检定设备"),
-    MEASURE_ACCOUNT("measureAccount", "measureAccount", "测量工装"),
-    STANDARD_SUPPORT_EQUIPMENT("standardSupportEquipment", "standardSupportEquipment", "标准配套设备"),
-    STANDARD_EQUIPMENT("standardEquipment", "standardEquipment", "标准装置"),
-    FLOW_DEF_EXPORT("flowDefData", "flowDefData", "流程定义"),
-    STAFF_CERTIFICATE("certificate", "certificate", "计量人员证书"),
-    CHECK_INFO("checkInfo", "checkInfo", "设备管理点检测"),
-    EQUIPMENT_APPLY("equipmentApply", "equipmentApply", "设备借用"),
-    STANDARD_EQUIPMENT_REMIND("equipmentApplyRemind", "equipmentApplyRemind", "标准装置到期提醒"),
-    METER_PRICE("meterPrice", "meterPrice", "价格库"),
-    METER_STAFF("meterStaff", "meterStaff", "计量人员"),
-    STANDARD_EQUIPMENT_APPLY("standardEquipmentApply", "standardEquipmentApply", "标准装置申请"),
-    STATE_MANAGE_APPLY("stateManage", "stateManage", "状态管理"),
-    METER_ACCEPTANCE_CHECK("acceptanceCheck", "acceptanceCheck", "设备检修保养验收单"),
-    CUSTOMER_EXPORT("customerData", "customerData", "客户信息"),
-    ORDER_EXPORT("orderData", "orderData", "委托书信息"),
-    SAMPLE_EXPORT("sampleData", "sampleData", "样本信息"),
-    EXCHANGE_DATA("exchangeData", "exchangeData", "设备交接单"),
-    DISPATCH_DATA("dispatchData", "dispatchData", "设备收发"),
-    ENVIRONMENT_DATA("environmentData", "environmentData", "环境记录单"),
-    ORIGIN_DATA("originData", "originData", "原始记录"),
-    CERTIFICATE_REPORT("certificateReport", "certificateReport", "证书报告"),
-    ADVICE_EXPORT("adviceData", "adviceData", "客户反馈"),
-    HANDOUT_EXPORT("handoutData", "handoutData", "任务分发列表"),
-    OUTSOURCER_EXPORT("outsourcerData", "outsourcerData", "分包方"),
-    SITE_EXECUTIVE_EXPORT("siteExecutiveData", "siteExecutiveData", "现场测试、校准或检定"),
-    CERTIFICATE_PRINT_EXPORT("certificatePrintData", "certificatePrintData", "证书打印"),
-    DOWNLOAD_TEMPLATE("downloadTemplate", "downloadTemplate", "页面配置"),
-    OUTSOURCER_CERTIFICATE_EXPORT("outsourceCertificateData", "outsourceCertificateData", "分包证书"),
-    SETTLEMENT_INFO_EXPORT("settlementInfoData", "settlementInfoData", "业务结算"),
-    EQUIPMENT_REMIND("equipmentRemind", "equipmentRemind", "设备到期提醒"),
-    AGREEMENT_INFO_EXPORT("agreementInfoData", "agreementInfoData", "合同"),
-    WORK_STATISTICS_EXPORT("workStatisticsData", "workStatisticsData", "实时工作统计"),
-    DEPT_OUTPUT_EXPORT("deptOutputData", "deptOutputData", "部门产值分析"),
-    WORKLOAD_EXPORT("workloadData", "workloadData", "业务工作量分析"),
-    DEPT_COMPREHENSIVE_EXPORT("deptComprehensiveData", "deptComprehensiveData", "部门综合分析"),
-    ENVIRONMENTAL_RECORD("environmentalRecordData", "environmentalRecordData", "现场环境记录");
+    /**
+     * 计量检定业务
+     */
+    OUTSOURCER_EXPORT("outsourcerData", "分包方名录", "分包方名录"),
+    IDENTIFY_EXPORT("identifyData", "计量标识", "计量标识"),
+    ORDER_EXPORT("orderData", "任务单", "任务单"),
+    DISPATCH_DATA("dispatchData", "设备收发", "设备收发"),
+    HANDOUT_EXPORT("handoutData", "任务分发", "任务分发"),
+    SITE_EXECUTIVE_EXPORT("siteExecutiveData", "现场测试、校准或检定", "现场测试、校准或检定"),
+    CERTIFICATE_REPORT("certificateReport", "证书审批", "证书审批"),
+    CERTIFICATE_CHANGE_APPLY("certificateChangeApply", "证书报告补充或更换申请单", "证书报告补充或更换申请单"),
+    CERTIFICATE_PRINT("certificatePrintData", "证书打印审批", "证书打印审批"),
+    DEPT_EXECUTIVE_TASK("deptExecutiveTaskData", "实验室任务", "实验室任务"),
+    MY_EXECUTIVE_TASK("myExecutiveTaskData", "我的任务", "我的任务"),
+    OUTSOURCE_ASSESS("outsourceAssess", "测试、校准或检定工作分包评审表", "测试、校准或检定工作分包评审表"),
+    OUTSOURCE_PROTOCOL("outsourceProtocol", "测试、校准或检定工作分包协议书", "测试、校准或检定工作分包协议书"),
+
+    /**
+     * 系统管理
+     */
+    SIGN_EXPORT("signData", "签名", "签名"),
+    TEMPLATE_EXPORT("templateData", "文件模板", "文件模板"),
+    FLOW_DEF_EXPORT("flowDefData", "流程定义", "流程定义"),
+    DOWNLOAD_TEMPLATE("downloadTemplate", "流程定义", "页面配置");
 
     ExportEnum(String fileName, String sheetName, String description) {
         this.fileName = fileName;
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateRecordTypeCodeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateRecordTypeCodeEnum.java
index 31d913c..a963522 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateRecordTypeCodeEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateRecordTypeCodeEnum.java
@@ -46,4 +46,14 @@
     String SITE_EXECUTIVE_APPROVAL = "01";
     //《现场测试、校准或检定工作记录表》
     String SITE_EXECUTIVE_LOG = "02";
+
+    //测试、校准或检定工作分包协议书
+    String OUTSOURCE_PROTOCOL = "01";
+    //测试、校准或检定工作分包评审表
+    String OUTSOURCE_ACCESS = "02";
+    //测试、校准或检定工作分包通知书
+    String OUTSOURCE_NOTICE = "03";
+    //测试、校准或检定工作分包方名录
+    String OUTSOURCE_INFO = "04";
+
 }
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
index 24b8635..f78bd53 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
@@ -15,6 +15,10 @@
     String CERTIFICATE_CHANGE_APPLY_BEAN_NAME = "certificateChangeApplyBean";
     //现场测试、校准或检定
     String SITE_EXECUTIVE_BEAN_NAME = "siteExecutiveBean";
+    //测试、校准或检定工作分包评审表
+    String OUTSOURCE_ASSESS_BEAN_NAME = "outsourceAssessBean";
+    //测试、校准或检定工作分包协议书
+    String OUTSOURCE_PROTOCOL_BEAN_NAME = "outsourceProtocolBean";
 
     /*********************************设备与装置************************************/
     //设备台账
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 b21c661..6b86fd1 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
@@ -18,6 +18,8 @@
     OUTSOURCER_APPROVAL(OUTSOURCER_BEAN_NAME, ""),
     CERTIFICATE_CHANGE_APPROVAL(CERTIFICATE_CHANGE_APPLY_BEAN_NAME, ""),
     SITE_EXECUTIVE_APPROVAL(SITE_EXECUTIVE_BEAN_NAME, ""),
+    OUTSOURCE_ASSESS_APPROVAL(OUTSOURCE_ASSESS_BEAN_NAME, ""),
+    OUTSOURCE_PROTOCOL_APPROVAL(OUTSOURCE_PROTOCOL_BEAN_NAME, ""),
 
     ACTION_STATUS_MAP(new HashMap<String, AwareActionStatusEnum>() {
         {
@@ -47,6 +49,10 @@
             put(ApplyFromIdEnum.CERTIFICATE_CHANGE_APPROVAL.getCode(), CERTIFICATE_CHANGE_APPROVAL);
             //现场测试、校准或检定审批
             put(ApplyFromIdEnum.SITE_EXECUTIVE_APPROVAL.getCode(), SITE_EXECUTIVE_APPROVAL);
+            //测试、校准或检定工作分包评审表
+            put(ApplyFromIdEnum.OUTSOURCE_ASSESS_APPROVAL.getCode(), OUTSOURCE_ASSESS_APPROVAL);
+            //测试、校准或检定工作分包协议书
+            put(ApplyFromIdEnum.OUTSOURCE_PROTOCOL_APPROVAL.getCode(), OUTSOURCE_PROTOCOL_APPROVAL);
         }
     });
     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 934405e..c7410bd 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
@@ -9,6 +9,8 @@
     CERTIFICATE_CHANGE_APPROVAL("jljdywzsbchghsqd", MessageSourceModuleEnum.BUSINESS.getCode(), "证书/报告补充或更换申请单"),
     OUTSOURCER_APPROVAL("jljdywcsjzhgfbfml", MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定合格分包方名录"),
     SITE_EXECUTIVE_APPROVAL("jljdywxccsjzsp", MessageSourceModuleEnum.BUSINESS.getCode(), "现场测试、校准或检定审批"),
+    OUTSOURCE_ASSESS_APPROVAL("jljdywcsjzfbpsb", MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包评审表"),
+    OUTSOURCE_PROTOCOL_APPROVAL("jljdywcsjzfbxys", MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包协议书"),
 
 
     /*******************************************设备与装置*********************************************/
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/GeneralApprovalMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/GeneralApprovalMapper.java
index 4fb7344..0c9d6ae 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/GeneralApprovalMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/GeneralApprovalMapper.java
@@ -17,8 +17,4 @@
 
     Page<O> selectBatchForApprovalList(Page<O> page, @Param("request") R request, @Param("businessKeys") List<String> businessKeys);
 
-//    Page<O> selectListPage(Page<O> page, @Param("request") R request);
-
-//    Long selectMaxNo();
-
 }
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceAssessMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceAssessMapper.java
index 7867bb8..ba59009 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceAssessMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceAssessMapper.java
@@ -1,7 +1,12 @@
 package com.casic.missiles.mapper.business;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.business.outsource.OutsourceAssessApprovalListRequest;
+import com.casic.missiles.mapper.GeneralApprovalMapper;
 import com.casic.missiles.model.business.BizBusinessOutsourceAssess;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * <p>
@@ -11,6 +16,10 @@
  * @author wangpeng
  * @since 2023-08-16
  */
-public interface BizBusinessOutsourceAssessMapper extends BaseMapper<BizBusinessOutsourceAssess> {
+public interface BizBusinessOutsourceAssessMapper extends GeneralApprovalMapper<BizBusinessOutsourceAssess, BizBusinessOutsourceAssess, OutsourceAssessApprovalListRequest> {
+
+    Page<BizBusinessOutsourceAssess> selectBatchForApprovalList(Page<BizBusinessOutsourceAssess> page, @Param("request") OutsourceAssessApprovalListRequest request, @Param("businessKeys") List<String> businessKeys);
+
+    Long selectMaxProjectNo();
 
 }
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceProtocolMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceProtocolMapper.java
new file mode 100644
index 0000000..e6aba35
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceProtocolMapper.java
@@ -0,0 +1,24 @@
+package com.casic.missiles.mapper.business;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.business.outsource.OutsourceProtocolApprovalListRequest;
+import com.casic.missiles.mapper.GeneralApprovalMapper;
+import com.casic.missiles.model.business.BizBusinessOutsourceProtocol;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 计量检定业务-分包管理-测试、校准或检定工作分包协议书 Mapper 接口
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-08-24
+ */
+public interface BizBusinessOutsourceProtocolMapper extends GeneralApprovalMapper<BizBusinessOutsourceProtocol, BizBusinessOutsourceProtocol, OutsourceProtocolApprovalListRequest> {
+
+    Page<BizBusinessOutsourceProtocol> selectBatchForApprovalList(Page<BizBusinessOutsourceProtocol> page, @Param("request") OutsourceProtocolApprovalListRequest request, @Param("businessKeys") List<String> businessKeys);
+
+    Long selectMaxProtocolNo();
+}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/EnvLocationInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/EnvLocationInfoMapper.java
new file mode 100644
index 0000000..49eff87
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/EnvLocationInfoMapper.java
@@ -0,0 +1,21 @@
+package com.casic.missiles.mapper.resource;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.resource.environment.LocationListRequest;
+import com.casic.missiles.dto.resource.environment.LocationListResponse;
+import com.casic.missiles.model.resource.EnvLocationInfo;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * <p>
+ * 实验室环境监控系统-设备表 Mapper 接口
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-06-07
+ */
+public interface EnvLocationInfoMapper extends BaseMapper<EnvLocationInfo> {
+
+    Page<LocationListResponse> selectLocationListPage(Page<LocationListResponse> page, @Param("request") LocationListRequest request);
+}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java
index de124db..85ed0f7 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java
@@ -1,7 +1,9 @@
 package com.casic.missiles.mapper.system;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.dto.system.SignDetailResponse;
+import com.casic.missiles.dto.system.SignListRequest;
 import com.casic.missiles.model.system.SystemSign;
 import org.apache.ibatis.annotations.Param;
 
@@ -22,4 +24,8 @@
     SignDetailResponse selectSignDetailById(Long id);
 
     List<SystemSign> selectUsableSignList(@Param("userId") Long userId);
+
+    Page<SystemSign> selectSignListPage(Page<SystemSign> page, @Param("request") SignListRequest request);
+
+    List<SystemSign> selectSignList(@Param("request") SignListRequest request);
 }
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateChangeApplyMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateChangeApplyMapper.xml
index d798447..c496092 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateChangeApplyMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateChangeApplyMapper.xml
@@ -30,31 +30,31 @@
         SELECT *
         FROM biz_business_certificate_change_apply
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.changeApplyNo != null and request.changeApplyNo !=''">
+        <if test="request != null and request.changeApplyNo != null and request.changeApplyNo !=''">
             and change_apply_no like concat('%',#{request.changeApplyNo},'%')
         </if>
-        <if test="request.changeReportNo != null and request.changeReportNo !=''">
+        <if test="request != null and request.changeReportNo != null and request.changeReportNo !=''">
             and change_report_no like concat('%',#{request.changeReportNo},'%')
         </if>
-        <if test="request.changeReportName != null and request.changeReportName !=''">
+        <if test="request != null and request.changeReportName != null and request.changeReportName !=''">
             and change_report_name like concat('%',#{request.changeReportName},'%')
         </if>
-        <if test="request.changeType != null and request.changeType !=''">
+        <if test="request != null and request.changeType != null and request.changeType !=''">
             and change_type = #{request.changeType}
         </if>
-        <if test="request.createUserName != null and request.createUserName !=''">
+        <if test="request != null and request.createUserName != null and request.createUserName !=''">
             and create_user_name like concat('%',#{request.createUserName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificatePrintMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificatePrintMapper.xml
index b66cd99..49c0ac8 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificatePrintMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificatePrintMapper.xml
@@ -31,34 +31,34 @@
         LEFT JOIN biz_business_order_sample_relation bosr ON (bosr.order_id = bcr.order_id AND bosr.sample_id = bcr.sample_id)
         LEFT JOIN biz_business_order_info boi ON boi.id = bosr.order_id
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and bcp.approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.printStatus != null and request.printStatus !=''">
+        <if test="request != null and request.printStatus != null and request.printStatus !=''">
             and print_status = #{request.printStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and bcp.create_user_id = #{request.createUserId}
         </if>
-        <if test="request.certificateReportNo != null and request.certificateReportNo !=''">
+        <if test="request != null and request.certificateReportNo != null and request.certificateReportNo !=''">
             and bcr.certificate_report_no like concat('%',#{request.certificateReportNo},'%')
         </if>
-        <if test="request.certificateReportName != null and request.certificateReportName !=''">
+        <if test="request != null and request.certificateReportName != null and request.certificateReportName !=''">
             and bcr.certificate_report_name like concat('%',#{request.certificateReportName},'%')
         </if>
-        <if test="request.customerName != null and request.customerName !=''">
+        <if test="request != null and request.customerName != null and request.customerName !=''">
             and boi.customer_name like concat('%',#{request.customerName},'%')
         </if>
-        <if test="request.sampleNo != null and request.sampleNo !=''">
+        <if test="request != null and request.sampleNo != null and request.sampleNo !=''">
             and bosr.sample_no like concat('%',#{request.sampleNo},'%')
         </if>
-        <if test="request.sampleName != null and request.sampleName !=''">
+        <if test="request != null and request.sampleName != null and request.sampleName !=''">
             and bosr.sample_name like concat('%',#{request.sampleName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and bcp.create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and bcp.create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml
index b366034..767695d 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml
@@ -46,33 +46,37 @@
         SELECT bcr.*, bosr.sample_no, bosr.sample_name, bosr.sample_model, rsi.staff_name
         FROM biz_business_certificate_report bcr
         LEFT JOIN biz_business_order_sample_relation bosr ON (bosr.order_id = bcr.order_id AND bosr.sample_id = bcr.sample_id)
+        LEFT JOIN biz_business_order_info boi ON boi.id = bcr.order_id
         LEFT JOIN biz_resource_staff_info rsi ON rsi.id = bcr.measure_person_id
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and bcr.approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and bcr.create_user_id = #{request.createUserId}
         </if>
-        <if test="request.certificateReportNo != null and request.certificateReportNo !=''">
+        <if test="request != null and request.customerId != null and request.customerId !=''">
+            and boi.customer_id = #{request.customerId}
+        </if>
+        <if test="request != null and request.certificateReportNo != null and request.certificateReportNo !=''">
             and bcr.certificate_report_no like concat('%',#{request.certificateReportNo},'%')
         </if>
-        <if test="request.certificateReportName != null and request.certificateReportName !=''">
+        <if test="request != null and request.certificateReportName != null and request.certificateReportName !=''">
             and bcr.certificate_report_name like concat('%',#{request.certificateReportName},'%')
         </if>
-        <if test="request.sampleNo != null and request.sampleNo !=''">
+        <if test="request != null and request.sampleNo != null and request.sampleNo !=''">
             and bosr.sample_no like concat('%',#{request.sampleNo},'%')
         </if>
-        <if test="request.measureCategory != null and request.measureCategory !=''">
+        <if test="request != null and request.measureCategory != null and request.measureCategory !=''">
             and bcr.measure_category = #{request.measureCategory}
         </if>
-        <if test="request.measurePerson != null and request.measurePerson !=''">
+        <if test="request != null and request.measurePerson != null and request.measurePerson !=''">
             and rsi.staff_name like concat('%',#{request.measurePerson},'%')
         </if>
-        <if test="request.calibrationTimeStart != null and request.calibrationTimeStart !=''">
+        <if test="request != null and request.calibrationTimeStart != null and request.calibrationTimeStart !=''">
             and bcr.calibration_time &gt;= #{request.calibrationTimeStart}
         </if>
-        <if test="request.calibrationTimeEnd != null and request.calibrationTimeEnd !=''">
+        <if test="request != null and request.calibrationTimeEnd != null and request.calibrationTimeEnd !=''">
             and bcr.calibration_time &lt;= #{request.calibrationTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceAssessMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceAssessMapper.xml
index d0fcf8b..c22c101 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceAssessMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceAssessMapper.xml
@@ -7,6 +7,8 @@
         <id column="id" property="id" />
         <result column="project_no" property="projectNo" />
         <result column="project_name" property="projectName" />
+        <result column="lab_code" property="labCode" />
+        <result column="group_code" property="groupCode" />
         <result column="applicant_id" property="applicantId" />
         <result column="applicant_name" property="applicantName" />
         <result column="applicant_time" property="applicantTime" />
@@ -31,7 +33,45 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, project_no, project_name, applicant_id, applicant_name, applicant_time, minio_file_name, remark, create_user_id, create_user_name, outsourcer_id, pre_start_time, pre_end_time, outsource_reason, pre_cost, approval_status, process_id, approve_situation, traceability, test_method, technique_ability, create_time, update_time
+        id, project_no, project_name, lab_code, group_code, applicant_id, applicant_name, applicant_time, minio_file_name, remark, create_user_id, create_user_name, outsourcer_id, pre_start_time, pre_end_time, outsource_reason, pre_cost, approval_status, process_id, approve_situation, traceability, test_method, technique_ability, create_time, update_time
     </sql>
 
+    <select id="selectMaxProjectNo" resultType="java.lang.Long">
+        SELECT IFNULL(max(RIGHT(project_no, 3)), 0) from biz_business_outsource_assess
+    </select>
+
+    <select id="selectBatchForApprovalList" resultMap="BaseResultMap">
+        SELECT bboa.*, bboi.outsourcer_name, bboi.director
+        FROM biz_business_outsource_assess bboa
+        LEFT JOIN biz_business_outsourcer_info bboi ON bboa.outsourcer_id = bboi.id
+        WHERE 1=1
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
+            and bboa.approval_status = #{request.approvalStatus}
+        </if>
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
+            and bboa.create_user_id = #{request.createUserId}
+        </if>
+        <if test="request != null and request.projectNo != null and request.projectNo !=''">
+            and bboa.project_no like concat('%',#{request.projectNo},'%')
+        </if>
+        <if test="request != null and request.outsourcerName != null and request.outsourcerName !=''">
+            and bboi.outsourcer_name like concat('%',#{request.outsourcerName},'%')
+        </if>
+        <if test="request != null and request.applicantName != null and request.applicantName !=''">
+            and bboa.applicant_name like concat('%',#{request.applicantName},'%')
+        </if>
+        <if test="request != null and request.applicantTimeStart != null and request.applicantTimeStart !=''">
+            and bboa.applicant_time &gt;= #{request.applicantTimeStart}
+        </if>
+        <if test="request != null and request.applicantTimeEnd != null and request.applicantTimeEnd !=''">
+            and bboa.applicant_time &lt;= #{request.applicantTimeEnd}
+        </if>
+        <if test="businessKeys != null">
+            and bboa.id in
+            <foreach collection="businessKeys" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
+        ORDER BY bboa.create_time DESC
+    </select>
 </mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceProtocolMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceProtocolMapper.xml
new file mode 100644
index 0000000..b7b2149
--- /dev/null
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceProtocolMapper.xml
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.mapper.business.BizBusinessOutsourceProtocolMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.business.BizBusinessOutsourceProtocol">
+        <id column="id" property="id" />
+        <result column="protocol_no" property="protocolNo" />
+        <result column="project_name" property="projectName" />
+        <result column="lab_code" property="labCode" />
+        <result column="group_code" property="groupCode" />
+        <result column="outsourcer_id" property="outsourcerId" />
+        <result column="remark" property="remark" />
+        <result column="outsource_no" property="outsourceNo" />
+        <result column="outsource_name" property="outsourceName" />
+        <result column="contacts" property="contacts" />
+        <result column="mobile" property="mobile" />
+        <result column="address" property="address" />
+        <result column="require_date" property="requireDate" />
+        <result column="outsource_cost" property="outsourceCost" />
+        <result column="director" property="director" />
+        <result column="item" property="item" />
+        <result column="requires" property="requires" />
+        <result column="create_user_id" property="createUserId" />
+        <result column="create_user_name" property="createUserName" />
+        <result column="approval_status" property="approvalStatus" />
+        <result column="process_id" property="processId" />
+        <result column="create_time" property="createTime" />
+        <result column="update_time" property="updateTime" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, protocol_no, project_name, lab_code, group_code, outsourcer_id, remark, outsource_no, outsource_name, contacts, mobile, address, require_date, outsource_cost, director, item, requires, create_user_id, create_user_name, approval_status, process_id, create_time, update_time
+    </sql>
+
+    <select id="selectMaxProtocolNo" resultType="java.lang.Long">
+        SELECT IFNULL(max(RIGHT(protocol_no, 3)), 0) from biz_business_outsource_protocol
+    </select>
+
+    <select id="selectBatchForApprovalList" resultMap="BaseResultMap">
+        SELECT *
+        FROM biz_business_outsource_protocol
+        WHERE 1=1
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
+            and approval_status = #{request.approvalStatus}
+        </if>
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
+            and create_user_id = #{request.createUserId}
+        </if>
+        <if test="request != null and request.protocolNo != null and request.protocolNo !=''">
+            and protocol_no like concat('%',#{request.protocolNo},'%')
+        </if>
+        <if test="request != null and request.outsourcerName != null and request.outsourcerName !=''">
+            and outsourcer_name like concat('%',#{request.outsourcerName},'%')
+        </if>
+        <if test="request != null and request.applicantName != null and request.applicantName !=''">
+            and create_user_name like concat('%',#{request.applicantName},'%')
+        </if>
+        <if test="request != null and request.applicantTimeStart != null and request.applicantTimeStart !=''">
+            and create_time &gt;= #{request.applicantTimeStart}
+        </if>
+        <if test="request != null and request.applicantTimeEnd != null and request.applicantTimeEnd !=''">
+            and create_time &lt;= #{request.applicantTimeEnd}
+        </if>
+        <if test="businessKeys != null">
+            and id in
+            <foreach collection="businessKeys" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
+        ORDER BY create_time DESC
+    </select>
+</mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourcerInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourcerInfoMapper.xml
index 510a80b..3049b54 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourcerInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourcerInfoMapper.xml
@@ -7,6 +7,8 @@
         <id column="id" property="id" />
         <result column="outsourcer_no" property="outsourcerNo" />
         <result column="outsourcer_name" property="outsourcerName" />
+        <result column="lab_code" property="labCode" />
+        <result column="group_code" property="groupCode" />
         <result column="outsourcer_brief_name" property="outsourcerBriefName" />
         <result column="outsourcer_size" property="outsourcerSize" />
         <result column="business_size" property="businessSize" />
@@ -55,32 +57,32 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, outsourcer_no, outsourcer_name, outsourcer_brief_name, outsourcer_size, business_size, grade, evaluation, tax_number, bank_account, bank_name, bank_account_number, postal_code, director, phone, fax, mobile, email, website, address_country, address_province, address_city, address_area, full_address, address_country_name, address_province_name, address_city_name, address_area_name, invoice_country, invoice_province, invoice_city, invoice_area, invoice_full_address, invoice_country_name, invoice_province_name, invoice_city_name, invoice_area_name, business_scope, business_content, minio_file_name, approval_status, process_id, remark, create_user_id, create_user_name, create_time, update_time
+        id, outsourcer_no, outsourcer_name, lab_code, group_code, outsourcer_brief_name, outsourcer_size, business_size, grade, evaluation, tax_number, bank_account, bank_name, bank_account_number, postal_code, director, phone, fax, mobile, email, website, address_country, address_province, address_city, address_area, full_address, address_country_name, address_province_name, address_city_name, address_area_name, invoice_country, invoice_province, invoice_city, invoice_area, invoice_full_address, invoice_country_name, invoice_province_name, invoice_city_name, invoice_area_name, business_scope, business_content, minio_file_name, approval_status, process_id, remark, create_user_id, create_user_name, create_time, update_time
     </sql>
 
     <select id="selectBatchForApprovalList" resultMap="BaseResultMap">
         SELECT *
         FROM biz_business_outsourcer_info
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.outsourcerNo != null and request.outsourcerNo !=''">
+        <if test="request != null and request.outsourcerNo != null and request.outsourcerNo !=''">
             and outsourcer_no like concat('%',#{request.outsourcerNo},'%')
         </if>
-        <if test="request.outsourcerName != null and request.outsourcerName !=''">
+        <if test="request != null and request.outsourcerName != null and request.outsourcerName !=''">
             and outsourcer_name like concat('%',#{request.outsourcerName},'%')
         </if>
-        <if test="request.director != null and request.director !=''">
+        <if test="request != null and request.director != null and request.director !=''">
             and director like concat('%',#{request.director},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
@@ -93,6 +95,6 @@
     </select>
 
     <select id="selectMaxNo" resultType="java.lang.Long">
-        SELECT IFNULL(max(RIGHT(outsourcer_no, 12)), 0) from biz_business_outsourcer_info
+        SELECT IFNULL(max(RIGHT(outsourcer_no, 3)), 0) from biz_business_outsourcer_info
     </select>
 </mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessSiteExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessSiteExecutiveInfoMapper.xml
index 135c5d0..3c5ae79 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessSiteExecutiveInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessSiteExecutiveInfoMapper.xml
@@ -38,25 +38,25 @@
         FROM biz_business_site_executive_info bsei
         LEFT JOIN biz_resource_customer_info rci ON bsei.customer_id = rci.id
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and bsei.approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and bsei.create_user_id = #{request.createUserId}
         </if>
-        <if test="request.siteExecutiveNo != null and request.siteExecutiveNo !=''">
+        <if test="request != null and request.siteExecutiveNo != null and request.siteExecutiveNo !=''">
             and bsei.site_executive_no like concat('%',#{request.siteExecutiveNo},'%')
         </if>
-        <if test="request.customerName != null and request.customerName !=''">
+        <if test="request != null and request.customerName != null and request.customerName !=''">
             and rci.outsourcer_name like concat('%',#{request.customerName},'%')
         </if>
-        <if test="request.applyName != null and request.applyName !=''">
+        <if test="request != null and request.applyName != null and request.applyName !=''">
             and bsei.apply_name like concat('%',#{request.applyName},'%')
         </if>
-        <if test="request.applyTimeStart != null and request.applyTimeStart !=''">
+        <if test="request != null and request.applyTimeStart != null and request.applyTimeStart !=''">
             and bsei.apply_time &gt;= #{request.applyTimeStart}
         </if>
-        <if test="request.applyTimeEnd != null and request.applyTimeEnd !=''">
+        <if test="request != null and request.applyTimeEnd != null and request.applyTimeEnd !=''">
             and bsei.apply_time &lt;= #{request.applyTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml
index 84d9e2a..6bd38a9 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml
@@ -105,6 +105,12 @@
         <if test="request.isUrgent != null and request.isUrgent !=''">
             AND bo.is_urgent = #{request.isUrgent}
         </if>
+        <if test="request.ids != null">
+            and blei.id in
+            <foreach collection="request.ids" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
         ORDER BY blei.update_time DESC
     </select>
 
@@ -137,6 +143,12 @@
         <if test="request.isUrgent != null and request.isUrgent !=''">
             AND bo.is_urgent = #{request.isUrgent}
         </if>
+        <if test="request.ids != null">
+            and blei.id in
+            <foreach collection="request.ids" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
         ORDER BY blei.update_time DESC
     </select>
 
diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardInfoMapper.xml
index 1a5551b..2ed8d17 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardInfoMapper.xml
@@ -45,12 +45,6 @@
         FROM biz_equipment_standard_info besi
         LEFT JOIN biz_equipment_standard_technology_relation bestr ON besi.standard_no = bestr.standard_no
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
-            and besi.approval_status = #{request.approvalStatus}
-        </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
-            and besi.create_user_id = #{request.createUserId}
-        </if>
         <if test="request.standardName != null and request.standardName !=''">
             and besi.standard_name like concat('%',#{request.standardName},'%')
         </if>
diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardTechnologyRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardTechnologyRelationMapper.xml
index fc7e16c..cd03c8c 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardTechnologyRelationMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardTechnologyRelationMapper.xml
@@ -6,6 +6,7 @@
     <resultMap id="BaseResultMap" type="com.casic.missiles.model.equipment.BizEquipmentStandardTechnologyRelation">
         <id column="id" property="id" />
         <result column="technology_file_id" property="technologyFileId" />
+        <result column="technology_file_no" property="technologyFileNo" />
         <result column="technology_file_name" property="technologyFileName" />
         <result column="standard_id" property="standardId" />
         <result column="standard_no" property="standardNo" />
@@ -14,7 +15,7 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, technology_file_id, technology_file_name, standard_id, remark
+        id, technology_file_id, technology_file_no, technology_file_name, standard_id, remark
     </sql>
 
 </mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceAuthorizeOrderMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceAuthorizeOrderMapper.xml
index ac5176c..554fe65 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceAuthorizeOrderMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceAuthorizeOrderMapper.xml
@@ -32,22 +32,22 @@
         SELECT *
         FROM biz_resource_authorize_order
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.orderNo != null and request.orderNo !=''">
+        <if test="request != null and request.orderNo != null and request.orderNo !=''">
             and order_no like concat('%',#{request.orderNo},'%')
         </if>
-        <if test="request.createUserName != null and request.createUserName !=''">
+        <if test="request != null and request.createUserName != null and request.createUserName !=''">
             and create_user_name like concat('%',#{request.createUserName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerExamineFormMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerExamineFormMapper.xml
index ab242f6..af7f98f 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerExamineFormMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerExamineFormMapper.xml
@@ -41,28 +41,28 @@
         SELECT *
         FROM biz_resource_customer_examine_form
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.formNo != null and request.formNo !=''">
+        <if test="request != null and request.formNo != null and request.formNo !=''">
             and form_no like concat('%',#{request.formNo},'%')
         </if>
-        <if test="request.labCode != null and request.labCode !=''">
+        <if test="request != null and request.labCode != null and request.labCode !=''">
             and lab_code like concat('%',#{request.labCode},'%')
         </if>
-        <if test="request.groupCode != null and request.groupCode !=''">
+        <if test="request != null and request.groupCode != null and request.groupCode !=''">
             and group_code like concat('%',#{request.groupCode},'%')
         </if>
-        <if test="request.createUserName != null and request.createUserName !=''">
+        <if test="request != null and request.createUserName != null and request.createUserName !=''">
             and create_user_name like concat('%',#{request.createUserName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerInfoMapper.xml
index fa8ffbc..06a2798 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerInfoMapper.xml
@@ -33,25 +33,25 @@
         SELECT *
         FROM biz_resource_customer_info
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.customerNo != null and request.customerNo !=''">
+        <if test="request != null and request.customerNo != null and request.customerNo !=''">
             and customer_no like concat('%',#{request.customerNo},'%')
         </if>
-        <if test="request.customerName != null and request.customerName !=''">
+        <if test="request != null and request.customerName != null and request.customerName !=''">
             and customer_name like concat('%',#{request.customerName},'%')
         </if>
-        <if test="request.contacts != null and request.contacts !=''">
+        <if test="request != null and request.contacts != null and request.contacts !=''">
             and contacts like concat('%',#{request.contacts},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerSuggestFormMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerSuggestFormMapper.xml
index 28f5bb2..1806662 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerSuggestFormMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerSuggestFormMapper.xml
@@ -33,28 +33,28 @@
         SELECT *
         FROM biz_resource_customer_suggest_form
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.formNo != null and request.formNo !=''">
+        <if test="request != null and request.formNo != null and request.formNo !=''">
             and form_no like concat('%',#{request.formNo},'%')
         </if>
-        <if test="request.customerName != null and request.customerName !=''">
+        <if test="request != null and request.customerName != null and request.customerName !=''">
             and customer_name like concat('%',#{request.customerName},'%')
         </if>
-        <if test="request.customerDeptName != null and request.customerDeptName !=''">
+        <if test="request != null and request.customerDeptName != null and request.customerDeptName !=''">
             and customer_dept_name like concat('%',#{request.customerDeptName},'%')
         </if>
-        <if test="request.createUserName != null and request.createUserName !=''">
+        <if test="request != null and request.createUserName != null and request.createUserName !=''">
             and create_user_name like concat('%',#{request.createUserName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSealUseNoteMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSealUseNoteMapper.xml
index ab37bc1..b02bb33 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSealUseNoteMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSealUseNoteMapper.xml
@@ -29,32 +29,32 @@
     </sql>
 
     <select id="selectBatchForApprovalList" resultMap="BaseResultMap">
-        SELECT *
+        SELECT brsun.*, brsi.seal_name, brsi.seal_type, brsi.approver_name
         FROM biz_resource_seal_use_note brsun
         JOIN biz_resource_seal_info brsi ON brsun.seal_id = brsi.id
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and brsun.approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and brsun.create_user_id = #{request.createUserId}
         </if>
-        <if test="request.sealName != null and request.sealName !=''">
+        <if test="request != null and request.sealName != null and request.sealName !=''">
             and brsi.seal_name like concat('%',#{request.sealName},'%')
         </if>
-        <if test="request.sealType != null and request.sealType !=''">
+        <if test="request != null and request.sealType != null and request.sealType !=''">
             and brsi.seal_type = #{request.sealType}
         </if>
-        <if test="request.applyDeptName != null and request.applyDeptName !=''">
+        <if test="request != null and request.applyDeptName != null and request.applyDeptName !=''">
             and brsun.apply_dept_name like concat('%',#{request.applyDeptName},'%')
         </if>
-        <if test="request.applyUserName != null and request.applyUserName !=''">
+        <if test="request != null and request.applyUserName != null and request.applyUserName !=''">
             and brsun.apply_user_name like concat('%',#{request.applyUserName},'%')
         </if>
-        <if test="request.applyTimeStart != null and request.applyTimeStart !=''">
+        <if test="request != null and request.applyTimeStart != null and request.applyTimeStart !=''">
             and brsun.apply_time &gt;= #{request.applyTimeStart}
         </if>
-        <if test="request.applyTimeEnd != null and request.applyTimeEnd !=''">
+        <if test="request != null and request.applyTimeEnd != null and request.applyTimeEnd !=''">
             and brsun.apply_time &lt;= #{request.applyTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml
index 119bf7d..4f8392a 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml
@@ -31,6 +31,12 @@
         <if test="request.deptName != null and request.deptName !=''">
             and brsi.dept_name like concat('%',#{request.deptName},'%')
         </if>
+        <if test="request.ids != null">
+            and brsv.id in
+            <foreach collection="request.ids" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
         ORDER BY brsv.grant_date DESC
     </select>
 
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSupplierInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSupplierInfoMapper.xml
index fe8d399..e8ce7ef 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSupplierInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSupplierInfoMapper.xml
@@ -48,28 +48,28 @@
         SELECT *
         FROM biz_resource_supplier_info
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.supplierNo != null and request.supplierNo !=''">
+        <if test="request != null and request.supplierNo != null and request.supplierNo !=''">
             and supplier_no like concat('%',#{request.supplierNo},'%')
         </if>
-        <if test="request.supplierName != null and request.supplierName !=''">
+        <if test="request != null and request.supplierName != null and request.supplierName !=''">
             and supplier_name like concat('%',#{request.supplierName},'%')
         </if>
-        <if test="request.director != null and request.director !=''">
+        <if test="request != null and request.director != null and request.director !=''">
             and director like concat('%',#{request.director},'%')
         </if>
-        <if test="request.supplierType != null and request.supplierType !=''">
+        <if test="request != null and request.supplierType != null and request.supplierType !=''">
             and supplier_type = #{request.supplierType}
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/EnvLocationInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/EnvLocationInfoMapper.xml
new file mode 100644
index 0000000..68bcf10
--- /dev/null
+++ b/casic-metering-dao/src/main/resources/mapper/resource/EnvLocationInfoMapper.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.mapper.resource.EnvLocationInfoMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.resource.EnvLocationInfo">
+        <id column="id" property="id" />
+        <result column="location_no" property="locationNo" />
+        <result column="location_name" property="locationName" />
+        <result column="location_position" property="locationPosition" />
+        <result column="create_user_id" property="createUserId" />
+        <result column="create_user" property="createUser" />
+        <result column="create_time" property="createTime" />
+        <result column="update_time" property="updateTime" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, location_no, location_name, location_position, create_user_id, create_user, create_time, update_time
+    </sql>
+
+    <select id="selectLocationListPage" resultType="com.casic.missiles.dto.resource.environment.LocationListResponse">
+        SELECT *
+        FROM env_location_info
+        WHERE 1=1
+        <if test="request.locationNo != null and request.locationNo !=''">
+            AND location_no LIKE concat('%',#{request.locationNo},'%')
+        </if>
+        <if test="request.locationName != null and request.locationName !=''">
+            AND location_name LIKE concat('%',#{request.locationName},'%')
+        </if>
+        ORDER BY create_time DESC
+    </select>
+
+</mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml
index b28c18f..8854047 100644
--- a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml
@@ -11,7 +11,6 @@
         <result column="sign_desc" property="signDesc" />
         <result column="sign_director" property="signDirector" />
         <result column="sign_user_id" property="signUserId" />
-        <result column="sign_type" property="signType" />
         <result column="minio_file_name" property="minioFileName" />
         <result column="create_time" property="createTime" />
         <result column="update_time" property="updateTime" />
@@ -28,7 +27,6 @@
         <result column="sign_name" property="signName" />
         <result column="sign_desc" property="signDesc" />
         <result column="sign_director" property="signDirector" />
-        <result column="sign_type" property="signType" />
         <result column="sign_user_id" property="signUserId" />
         <result column="minio_file_name" property="minioFileName" />
         <result column="create_time" property="createTime" />
@@ -62,4 +60,58 @@
         JOIN system_sign_user_relation ssur ON ss.id = ssur.sign_id
         WHERE ssur.user_id = #{userId}
     </select>
+
+    <select id="selectSignListPage" resultMap="BaseResultMap">
+        SELECT ss.*, sd.SIMPLE_NAME AS deptName
+        FROM system_sign ss
+        LEFT JOIN sys_user su ON su.id = ss.sign_user_id
+        LEFT JOIN sys_dept sd ON sd.id = su.dept_id
+        WHERE 1=1
+        <if test="request.signNo != null and request.signNo !=''">
+            AND ss.sign_no LIKE concat('%',#{request.signNo},'%')
+        </if>
+        <if test="request.signName != null and request.signName !=''">
+            AND ss.sign_name LIKE concat('%',#{request.signName},'%')
+        </if>
+        <if test="request.signDirector != null and request.signDirector !=''">
+            AND ss.sign_director LIKE concat('%',#{request.signDirector},'%')
+        </if>
+        <if test="request.signUserId != null and request.signUserId !=''">
+            AND ss.sign_user_id = #{request.signUserId}
+        </if>
+        <if test="request.createStartTime != null and request.createStartTime !=''">
+            AND DATE_FORMAT(ss.create_time,'%Y-%m-%d') &gt;= DATE_FORMAT(#{request.createStartTime},'%Y-%m-%d')
+        </if>
+        <if test="request.createEndTime != null and request.createEndTime !=''">
+            AND DATE_FORMAT(ss.create_time,'%Y-%m-%d')  &lt;= DATE_FORMAT(#{request.createEndTime},'%Y-%m-%d')
+        </if>
+        ORDER BY ss.create_time DESC
+    </select>
+
+    <select id="selectSignList" resultMap="BaseResultMap">
+        SELECT ss.*, sd.SIMPLE_NAME AS deptName
+        FROM system_sign ss
+        LEFT JOIN sys_user su ON su.id = ss.sign_user_id
+        LEFT JOIN sys_dept sd ON sd.id = su.dept_id
+        WHERE 1=1
+        <if test="request.signNo != null and request.signNo !=''">
+            AND ss.sign_no LIKE concat('%',#{request.signNo},'%')
+        </if>
+        <if test="request.signName != null and request.signName !=''">
+            AND ss.sign_name LIKE concat('%',#{request.signName},'%')
+        </if>
+        <if test="request.signDirector != null and request.signDirector !=''">
+            AND ss.sign_director LIKE concat('%',#{request.signDirector},'%')
+        </if>
+        <if test="request.signUserId != null and request.signUserId !=''">
+            AND ss.sign_user_id = #{request.signUserId}
+        </if>
+        <if test="request.createStartTime != null and request.createStartTime !=''">
+            AND DATE_FORMAT(ss.create_time,'%Y-%m-%d') &gt;= DATE_FORMAT(#{request.createStartTime},'%Y-%m-%d')
+        </if>
+        <if test="request.createEndTime != null and request.createEndTime !=''">
+            AND DATE_FORMAT(ss.create_time,'%Y-%m-%d')  &lt;= DATE_FORMAT(#{request.createEndTime},'%Y-%m-%d')
+        </if>
+        ORDER BY ss.create_time DESC
+    </select>
 </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 515050a..60f530b 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
@@ -47,8 +47,8 @@
     String STORAGE_LOCATION = "bizStorageLocation";
     //计量专业
     String MEASURE_MAJOR = "bizMeasureMajor";
-    //管理状态
-    String MANAGER_STATE = "bizManagerState";
+    //标准装置管理状态
+    String STANDARD_MANAGER_STATE = "bizStandardManagerState";
 
     /**
      * 资源管理 字典code
@@ -95,8 +95,6 @@
     String MEASURE_STATUS = "measureStatus";
     //检定方式
     String MEASURE_TYPE = "measureType";
-    //标识打印标志类型
-    String IDENTIFY_PRINT_TYPE = "bizBusinessIdentify";
     //变更类型
     String REPORT_CHANGE_TYPE = "bizCertChangeType";
     //规模类型
@@ -111,19 +109,24 @@
     String MEASURE_CATEGORY = "measureCategory";
     //检定结果
     String MEASURE_RESULT = "measureResult";
+    //分包原因
+    String OUTSOURCE_REASON = "outsourceReason";
+
+    /**
+     * 系统管理
+     */
+    String TEMPLATE_TYPE = "templateType";
+
 
     /**
      * 标准装置 字典code
      */
     //类别
     String STANDARD_CATEGORY = "standardCategory";
-    //管理状态
-    String STANDARD_MANAGER_STATE = "standardManagerState";
     //标准等级
     String STANDARD_LEVEL = "standardLevel";
     //传递范围
     String STANDARD_TRANSMIT_RANGE = "transmitRange";
-
     //资本来源
     String CAPITAL_SOURCE = "capitalSource";
     //标准装置-申请类型
@@ -148,8 +151,6 @@
     String CERTIFICATE_CLASS = "certificationClass";
     //证书管理-检校专业
     String CALIBRATION_MAJOR = "calibrationMajor";
-    //分包原因
-    String OUTSOURCE_REASON = "outsourceReason";
 
     /**
      * 工作台
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/BaseApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/BaseApprovalListRequest.java
index 73c12c1..80d7424 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/BaseApprovalListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/BaseApprovalListRequest.java
@@ -6,6 +6,7 @@
 
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotEmpty;
+import java.util.List;
 
 /**
  * @Description:
@@ -19,14 +20,14 @@
      * 表单id
      */
     @NotBlank(message = "表单id不能为空")
-    @ApiModelProperty(value = "表单id（流程定义对应的表单id，等价于业务id）", dataType = "String")
+    @ApiModelProperty(value = "表单id（流程定义对应的表单id，等价于业务id），导出接口不用传", dataType = "String")
     private String formId;
 
     /**
      * 审批状态类型，对应ApprovalStatusEnum
      */
     @NotEmpty(message = "审批状态类型不能为空")
-    @ApiModelProperty(value = "审批状态类型code", dataType = "String")
+    @ApiModelProperty(value = "审批状态类型code，导出接口不用传", dataType = "String")
     private String approvalStatus;
 
     @ApiModelProperty(hidden = true)
@@ -34,4 +35,7 @@
 
     @ApiModelProperty(hidden = true)
     private Long createUserId;
+
+    @ApiModelProperty(value = "导出ids", dataType = "List")
+    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificatePrintApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificatePrintApprovalListRequest.java
index b93d1c9..3cc2f4e 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificatePrintApprovalListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificatePrintApprovalListRequest.java
@@ -5,8 +5,6 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import java.util.List;
-
 /**
  * @Description:
  * @Author: wangpeng
@@ -38,7 +36,4 @@
 
     @ApiModelProperty(value = "创建结束时间", dataType = "String")
     private String createTimeEnd;
-
-    @ApiModelProperty(value = "导出ids", dataType = "List")
-    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportApprovalListRequest.java
index 4f7a038..c115847 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportApprovalListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportApprovalListRequest.java
@@ -5,8 +5,6 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import java.util.List;
-
 /**
  * @Description:
  * @Author: wangpeng
@@ -15,6 +13,8 @@
 @ApiModel
 @Data
 public class CertificateReportApprovalListRequest extends BaseApprovalListRequest {
+    @ApiModelProperty(value = "委托方id", dataType = "String")
+    private Long customerId;
 
     @ApiModelProperty(value = "证书报告编号", dataType = "String")
     private String certificateReportNo;
@@ -37,6 +37,4 @@
     @ApiModelProperty(value = "检校结束时间", dataType = "String")
     private String calibrationTimeEnd;
 
-    @ApiModelProperty(value = "导出ids", dataType = "List")
-    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/identify/IdentifyListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/identify/IdentifyListRequest.java
index 1b87ae6..f019203 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/identify/IdentifyListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/identify/IdentifyListRequest.java
@@ -4,6 +4,8 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * @Description:
  * @Author: wangpeng
@@ -26,4 +28,7 @@
 
     @ApiModelProperty(value = "打印结束时间", dataType = "String")
     private String createTimeEnd;
+
+    @ApiModelProperty(value = "导出ids", dataType = "List")
+    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListRequest.java
index 1264883..62415fb 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListRequest.java
@@ -7,6 +7,7 @@
 import lombok.Data;
 
 import javax.validation.constraints.NotBlank;
+import java.util.List;
 
 @Data
 @ApiModel
@@ -37,4 +38,6 @@
     @ApiModelProperty(value = "是否加急（1是0否null全部）", dataType = "Integer")
     private String isUrgent;
 
+    @ApiModelProperty(value = "导出ids", dataType = "List")
+    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListRequest.java
index 5201d7b..499760a 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListRequest.java
@@ -17,6 +17,9 @@
     @ApiModelProperty(value = "任务单编号", dataType = "String")
     private String orderNo;
 
+    @ApiModelProperty(value = "委托方id", dataType = "Long")
+    private Long customerId;
+
     @ApiModelProperty(value = "委托方名称", dataType = "String")
     private String customerName;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OrderSampleDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OrderSampleDTO.java
new file mode 100644
index 0000000..796edc0
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OrderSampleDTO.java
@@ -0,0 +1,19 @@
+package com.casic.missiles.dto.business.outsource;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/8/24 11:38
+ */
+@ApiModel
+@Data
+public class OrderSampleDTO {
+    @ApiModelProperty(value = "任务单id", dataType = "Long")
+    private Long orderId;
+    @ApiModelProperty(value = "受检设备id", dataType = "Long")
+    private Long sampleId;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceAssessApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceAssessApprovalListRequest.java
new file mode 100644
index 0000000..9a930c3
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceAssessApprovalListRequest.java
@@ -0,0 +1,30 @@
+package com.casic.missiles.dto.business.outsource;
+
+import com.casic.missiles.dto.BaseApprovalListRequest;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/8/24 11:01
+ */
+@ApiModel
+@Data
+public class OutsourceAssessApprovalListRequest extends BaseApprovalListRequest {
+    @ApiModelProperty(value = "评审表编号", dataType = "String")
+    private String projectNo;
+
+    @ApiModelProperty(value = "分包机构名称", dataType = "String")
+    private String outsourcerName;
+
+    @ApiModelProperty(value = "申请人", dataType = "String")
+    private String applicantName;
+
+    @ApiModelProperty(value = "申请时间开始", dataType = "String")
+    private String applicantTimeStart;
+
+    @ApiModelProperty(value = "申请时间结束", dataType = "String")
+    private String applicantTimeEnd;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceAssessSaveResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceAssessSaveResponse.java
new file mode 100644
index 0000000..8bf9aad
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceAssessSaveResponse.java
@@ -0,0 +1,20 @@
+package com.casic.missiles.dto.business.outsource;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/8/14 16:17
+ */
+@ApiModel
+@Data
+public class OutsourceAssessSaveResponse {
+    @ApiModelProperty(value = "主键id", dataType = "Long")
+    private Long id;
+
+    @ApiModelProperty(value = "编号", dataType = "String")
+    private String projectNo;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProtocolApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProtocolApprovalListRequest.java
new file mode 100644
index 0000000..0f32331
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProtocolApprovalListRequest.java
@@ -0,0 +1,30 @@
+package com.casic.missiles.dto.business.outsource;
+
+import com.casic.missiles.dto.BaseApprovalListRequest;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/8/24 15:01
+ */
+@ApiModel
+@Data
+public class OutsourceProtocolApprovalListRequest extends BaseApprovalListRequest {
+    @ApiModelProperty(value = "协议书编号", dataType = "String")
+    private String protocolNo;
+
+    @ApiModelProperty(value = "分包方名称", dataType = "String")
+    private String outsourcerName;
+
+    @ApiModelProperty(value = "申请人", dataType = "String")
+    private String applicantName;
+
+    @ApiModelProperty(value = "申请时间开始", dataType = "String")
+    private String applicantTimeStart;
+
+    @ApiModelProperty(value = "申请时间结束", dataType = "String")
+    private String applicantTimeEnd;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProtocolSaveResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProtocolSaveResponse.java
new file mode 100644
index 0000000..e324967
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProtocolSaveResponse.java
@@ -0,0 +1,20 @@
+package com.casic.missiles.dto.business.outsource;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/8/14 16:17
+ */
+@ApiModel
+@Data
+public class OutsourceProtocolSaveResponse {
+    @ApiModelProperty(value = "主键id", dataType = "Long")
+    private Long id;
+
+    @ApiModelProperty(value = "编号", dataType = "String")
+    private String protocolNo;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveApprovalListRequest.java
index f29f4e4..7047c28 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveApprovalListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveApprovalListRequest.java
@@ -5,8 +5,6 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import java.util.List;
-
 /**
  * @Description: 现场检测审批列表请求实体
  * @Author: wangpeng
@@ -30,7 +28,4 @@
     @ApiModelProperty(value = "申请时间结束", dataType = "String")
     private String applyTimeEnd;
 
-    @ApiModelProperty(value = "导出ids", dataType = "List")
-    private List<Long> ids;
-
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveDetailResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveDetailResponse.java
index 1f28752..394c934 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveDetailResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveDetailResponse.java
@@ -12,6 +12,18 @@
     @ApiModelProperty(value = "id，更新/删除使用参数", dataType = "Long")
     private Long id;
 
+    @ApiModelProperty(value = "实验室代码(字典code)", dataType = "String")
+    private String labCode;
+
+    @ApiModelProperty(value = "实验室代码(字典value)", dataType = "String")
+    private String labCodeName;
+
+    @ApiModelProperty(value = "组别代码(字典code)", dataType = "String")
+    private String groupCode;
+
+    @ApiModelProperty(value = "组别代码(字典value)", dataType = "String")
+    private String groupCodeName;
+
     @ApiModelProperty(value = "审批编号", dataType = "String")
     private String siteExecutiveNo;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/environment/LocationListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/environment/LocationListRequest.java
new file mode 100644
index 0000000..13d03c3
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/environment/LocationListRequest.java
@@ -0,0 +1,20 @@
+package com.casic.missiles.dto.resource.environment;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/6/8 13:56
+ */
+@ApiModel
+@Data
+public class LocationListRequest {
+    @ApiModelProperty(value = "地点编号", dataType = "String")
+    private String locationNo;
+
+    @ApiModelProperty(value = "地点名称", dataType = "String")
+    private String locationName;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/environment/LocationListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/environment/LocationListResponse.java
new file mode 100644
index 0000000..4c531af
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/environment/LocationListResponse.java
@@ -0,0 +1,78 @@
+package com.casic.missiles.dto.resource.environment;
+
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
+import com.baomidou.mybatisplus.annotation.TableField;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description: 地点列表响应实体
+ * @Author: wangpeng
+ * @Date: 2023/6/8 13:53
+ */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
+@ApiModel
+@Data
+public class LocationListResponse {
+    @ApiModelProperty(value = "主键id", dataType = "Long")
+    private Long id;
+
+    /**
+     * 地点编号
+     */
+    @ExcelProperty("地点编号")
+    @ApiModelProperty(value = "地点编号", dataType = "String")
+    private String locationNo;
+
+    /**
+     * 地点名称
+     */
+    @ExcelProperty("地点名称")
+    @ApiModelProperty(value = "地点名称", dataType = "String")
+    private String locationName;
+
+    /**
+     * 地点位置
+     */
+    @ExcelProperty("地点位置")
+    @ApiModelProperty(value = "地点位置", dataType = "String")
+    private String locationPosition;
+
+    /**
+     * 创建人id
+     */
+    @ApiModelProperty(value = "创建人id", dataType = "Long")
+    private Long createUserId;
+
+    /**
+     * 创建人
+     */
+    @ExcelProperty("创建人")
+    @ApiModelProperty(value = "创建人", dataType = "String")
+    @TableField("create_user")
+    private String createUser;
+
+    /**
+     * 创建时间
+     */
+    @ExcelProperty("创建时间")
+    @ApiModelProperty(value = "创建时间", dataType = "String")
+    private String createTime;
+
+    /**
+     * 更新时间
+     */
+    @ApiModelProperty(value = "更新时间", dataType = "String")
+    private String updateTime;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertRequest.java
index 9a7f6c6..c827915 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertRequest.java
@@ -4,6 +4,8 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * @Description:
  * @Author: wangpeng
@@ -16,4 +18,7 @@
     private String name;
     @ApiModelProperty(value = "部门名", dataType = "String")
     private String deptName;
+
+    @ApiModelProperty(value = "导出ids", dataType = "List")
+    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertResponse.java
index f78b159..8f2f79e 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertResponse.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.dto.resource.staff;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.casic.missiles.annotation.DictCodeField;
 import com.casic.missiles.constants.MeterDictCode;
 import io.swagger.annotations.ApiModel;
@@ -13,12 +20,18 @@
  * @Author: wangpeng
  * @Date: 2023/7/27 15:13
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @ApiModel
 @Data
 public class StaffCertResponse {
     /**
      * 人员编号
      */
+    @ExcelProperty(value = "人员编号",order = 0)
     @NotEmpty(message = "人员编号不能为空")
     @ApiModelProperty(value = "人员编号", dataType = "String")
     private String staffNo;
@@ -26,6 +39,7 @@
     /**
      * 姓名
      */
+    @ExcelProperty(value = "姓名",order = 1)
     @ApiModelProperty(value = "姓名", dataType = "String")
     private String staffName;
 
@@ -54,6 +68,7 @@
     /**
      * 部门名字
      */
+    @ExcelProperty(value = "工作部门",order = 2)
     @ApiModelProperty(value = "部门名字", dataType = "String")
     private String deptName;
 
@@ -66,6 +81,7 @@
     /**
      * 计量专业
      */
+    @ExcelProperty(value = "计量专业",order = 3)
     @ApiModelProperty(value = "计量专业", dataType = "String")
     private String major;
 
@@ -110,6 +126,7 @@
     /**
      * 证书号
      */
+    @ExcelProperty(value = "证号",order = 4)
     @ApiModelProperty(value = "证书号", dataType = "String")
     private String certNo;
 
@@ -122,12 +139,14 @@
     /**
      * 有效日期
      */
+    @ExcelProperty(value = "证书有效期",order = 6)
     @ApiModelProperty(value = "有效日期", dataType = "String")
     private String effectiveDate;
 
     /**
      * 发放日期
      */
+    @ExcelProperty(value = "发证日期",order = 5)
     @ApiModelProperty(value = "发放日期", dataType = "String")
     private String grantDate;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffListRequest.java
index 7c4afb3..0a1194a 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffListRequest.java
@@ -4,6 +4,8 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * @Description:
  * @Author: wangpeng
@@ -18,4 +20,7 @@
     private String deptName;
     @ApiModelProperty(value = "部门id", dataType = "Long")
     private Long deptId;
+
+    @ApiModelProperty(value = "导出ids", dataType = "List")
+    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/TrainListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/TrainListRequest.java
index f68597b..6321f8b 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/TrainListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/TrainListRequest.java
@@ -14,6 +14,8 @@
 public class TrainListRequest {
     @ApiModelProperty(value = "训练登记表编号", dataType = "String")
     private String trainNo;
+    @ApiModelProperty(value = "值班领导", dataType = "String")
+    private String dutyLeader;
     @ApiModelProperty(value = "创建开始时间", dataType = "String")
     private String createTimeStart;
     @ApiModelProperty(value = "创建结束时间", dataType = "String")
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/SignAddRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/SignAddRequest.java
index 117be34..d71055c 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/SignAddRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/SignAddRequest.java
@@ -43,13 +43,6 @@
     private Long signUserId;
 
     /**
-     * 签章或签名-字典code
-     */
-    @NotBlank(message = "类型不能为空")
-    @ApiModelProperty(value = "签名/签章-字典code", dataType = "String", required = true)
-    private String signType;
-
-    /**
      * minio存储文件名
      */
     @ApiModelProperty(value = "上传文件返回名称", dataType = "String")
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateAddRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateAddRequest.java
index aff1265..6316648 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateAddRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateAddRequest.java
@@ -17,30 +17,28 @@
 @Data
 public class TemplateAddRequest extends BaseSystemRequest {
     /**
-     * 原始记录模板/证书报告模板名称
+     * 模板名称
      */
     @ApiModelProperty(value = "名称", dataType = "String", required = true)
     @NotBlank(message = "名称不能为空")
     private String templateName;
 
     /**
-     * 原始记录模板/证书报告模板描述
+     * 模板描述
      */
     @ApiModelProperty(value = "描述", dataType = "String")
     private String templateDesc;
 
     /**
-     * 原始记录模板/证书报告模板创建人
+     * 创建人
      */
     @ApiModelProperty(value = "创建人", dataType = "String", required = true)
     @NotBlank(message = "创建人不能为空")
     private String templateCreator;
 
-    /**
-     * 原始记录模板/证书报告模板-字典code
-     */
-    @NotBlank(message = "类型不能为空")
-    @ApiModelProperty(value = "原始记录模板/证书报告模板-字典code", dataType = "String", required = true)
+
+    @NotBlank(message = "模板类型不能为空")
+    @ApiModelProperty(value = "模板类型(字典code)", dataType = "String", required = true)
     private String templateType;
 
     /**
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateListRequest.java
index eec5a1e..6d17bbe 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateListRequest.java
@@ -1,11 +1,12 @@
 package com.casic.missiles.dto.system;
 
+import com.casic.missiles.annotation.DictCodeField;
+import com.casic.missiles.constants.MeterDictCode;
 import com.casic.missiles.dto.BaseSystemRequest;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import javax.validation.constraints.NotBlank;
 import java.util.List;
 
 /**
@@ -19,8 +20,8 @@
     /**
      * 类型
      */
-//    @ApiModelProperty(value = "类型-字典code", dataType = "String", required = true)
-    @NotBlank(message = "类型不能为空")
+    @DictCodeField(message = "模板类型不合法", cacheName = MeterDictCode.TEMPLATE_TYPE)
+    @ApiModelProperty(value = "模板类型(字典code)", dataType = "String")
     private String templateType;
 
     /**
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificateChangeApply.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificateChangeApply.java
index 9216308..36923fd 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificateChangeApply.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificateChangeApply.java
@@ -1,11 +1,19 @@
 package com.casic.missiles.model.business;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 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 com.casic.missiles.dto.BaseRequest;
+import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -20,6 +28,12 @@
  * @author wangpeng
  * @since 2023-08-15
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
+@ApiModel
 @Data
 @TableName("biz_business_certificate_change_apply")
 public class BizBusinessCertificateChangeApply extends BaseRequest implements Serializable {
@@ -33,6 +47,7 @@
     /**
      * 申请单编号
      */
+    @ExcelProperty(value = "申请单编号", order = 1)
     @ApiModelProperty(value = "申请单编号", dataType = "String")
     @TableField("change_apply_no")
     private String changeApplyNo;
@@ -40,6 +55,7 @@
     /**
      * 申请单名字
      */
+    @ExcelProperty(value = "申请单名称", order = 2)
     @ApiModelProperty(value = "申请单名字", dataType = "String")
     @TableField("change_apply_name")
     private String changeApplyName;
@@ -54,6 +70,7 @@
     /**
      * 更换证书编号
      */
+    @ExcelProperty(value = "更换证书编号", order = 3)
     @ApiModelProperty(value = "更换证书编号", dataType = "String")
     @TableField("change_report_no")
     private String changeReportNo;
@@ -61,7 +78,8 @@
     /**
      * 更换证书名字
      */
-    @ApiModelProperty(value = "更换证书名字", dataType = "String")
+    @ExcelProperty(value = "更换证书/报告名称", order = 4)
+    @ApiModelProperty(value = "更换证书/报告名称", dataType = "String")
     @TableField("change_report_name")
     private String changeReportName;
 
@@ -73,6 +91,7 @@
     @TableField("change_type")
     private String changeType;
 
+    @ExcelProperty(value = "变更类型", order = 5)
     @ApiModelProperty(value = "变更类型(字典value)", dataType = "String")
     @TableField(exist = false)
     private String changeTypeName;
@@ -142,13 +161,15 @@
     /**
      * 创建用户名字
      */
-    @ApiModelProperty(value = "创建用户名字", dataType = "String")
+    @ExcelProperty(value = "创建人", order = 6)
+    @ApiModelProperty(value = "创建人名字", dataType = "String")
     @TableField("create_user_name")
     private String createUserName;
 
     /**
      * 创建时间
      */
+    @ExcelProperty(value = "创建时间", order = 7)
     @ApiModelProperty(value = "创建时间", dataType = "String")
     @TableField("create_time")
     private String createTime;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificateReport.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificateReport.java
index f01db9e..db06018 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificateReport.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificateReport.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.model.business;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -22,6 +29,11 @@
  * @author wangpeng
  * @since 2023-08-14
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @ApiModel
 @Data
 @TableName("biz_business_certificate_report")
@@ -36,6 +48,7 @@
     /**
      * 证书报告编号
      */
+    @ExcelProperty(value = "证书报告编号", order = 1)
     @ApiModelProperty(value = "证书报告编号", dataType = "String")
     @TableField("certificate_report_no")
     private String certificateReportNo;
@@ -43,6 +56,7 @@
     /**
      * 证书报告名称
      */
+    @ExcelProperty(value = "证书报告名称", order = 2)
     @ApiModelProperty(value = "证书报告名称", dataType = "String")
     @TableField("certificate_report_name")
     private String certificateReportName;
@@ -62,6 +76,7 @@
     @TableField("measure_category")
     private String measureCategory;
 
+    @ExcelProperty(value = "检校类别", order = 6)
     @ApiModelProperty(value = "检校类别(字典value)", dataType = "String")
     @TableField(exist = false)
     private String measureCategoryName;
@@ -69,6 +84,7 @@
     /**
      * 检校时间
      */
+    @ExcelProperty(value = "检校时间", order = 8)
     @ApiModelProperty(value = "检校时间", dataType = "String")
     @TableField("calibration_time")
     private String calibrationTime;
@@ -267,18 +283,22 @@
     @TableField(exist = false)
     private Integer decisionItem;
 
-    @ApiModelProperty(value = "设备样品编号（列表返回参数）", dataType = "String")
+    @ExcelProperty(value = "被检设备统一编号", order = 3)
+    @ApiModelProperty(value = "被检设备统一编号（列表返回参数）", dataType = "String")
     @TableField(exist = false)
     private String sampleNo;
 
-    @ApiModelProperty(value = "设备样品名称（列表返回参数）", dataType = "String")
+    @ExcelProperty(value = "被检设备名称", order = 4)
+    @ApiModelProperty(value = "被检设备名称（列表返回参数）", dataType = "String")
     @TableField(exist = false)
     private String sampleName;
 
-    @ApiModelProperty(value = "设备样品规格型号（列表返回参数）", dataType = "String")
+    @ExcelProperty(value = "规格型号", order = 5)
+    @ApiModelProperty(value = "规格型号（列表返回参数）", dataType = "String")
     @TableField(exist = false)
     private String sampleModel;
 
+    @ExcelProperty(value = "检定员", order = 7)
     @ApiModelProperty(value = "检定员名字（列表返回参数）", dataType = "String")
     @TableField(exist = false)
     private String staffName;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessIdentifyInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessIdentifyInfo.java
index 46bfba5..f1a9bec 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessIdentifyInfo.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessIdentifyInfo.java
@@ -1,10 +1,15 @@
 package com.casic.missiles.model.business;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 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;
 
@@ -20,6 +25,11 @@
  * @author wangpeng
  * @since 2023-08-15
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @Data
 @TableName("biz_business_identify_info")
 public class BizBusinessIdentifyInfo implements Serializable {
@@ -33,6 +43,7 @@
     /**
      * 记录编号
      */
+    @ExcelProperty(value = "记录编号", order = 1)
     @ApiModelProperty(value = "记录编号", dataType = "String")
     @TableField("record_no")
     private String recordNo;
@@ -41,20 +52,15 @@
      * 标志类型(字典code)
      */
     @NotEmpty(message = "标志类型不能为空")
-    @ApiModelProperty(value = "标志类型(字典code)", dataType = "String")
-    @DictCodeField(message = "标志类型不合法", cacheName = MeterDictCode.IDENTIFY_PRINT_TYPE)
+    @ApiModelProperty(value = "标志类型(直接存计量标识/使用状态/校准状态的字典value)", dataType = "String")
     @TableField("identify_type")
     private String identifyType;
 
-    @ApiModelProperty(value = "标志类型(字典value)", dataType = "String")
-    @TableField(exist = false)
-    private String identifyTypeName;
-
     /**
      * 设备id(可以是受检设备/设备台账)
      */
     @NotNull(message = "设备id不能为空")
-    @ApiModelProperty(value = "设备id(可以是受检设备/设备台账)", dataType = "String")
+    @ApiModelProperty(value = "设备id(可以是受检设备/设备台账)", dataType = "Long")
     @TableField("device_id")
     private Long deviceId;
 
@@ -66,29 +72,32 @@
     @TableField("device_type")
     private String deviceType;
 
+    @ExcelProperty(value = "统一编号", order = 3)
     @NotEmpty(message = "设备编号不能为空")
-    @ApiModelProperty(value = "设备编号", dataType = "String")
+    @ApiModelProperty(value = "统一编号", dataType = "String")
     @TableField("device_no")
     private String deviceNo;
 
     /**
      * 设备名字
      */
-    @NotEmpty(message = "设备名字不能为空")
-    @ApiModelProperty(value = "设备名字", dataType = "String")
+    @ExcelProperty(value = "设备名称", order = 4)
+    @NotEmpty(message = "设备名称不能为空")
+    @ApiModelProperty(value = "设备名称", dataType = "String")
     @TableField("device_name")
     private String deviceName;
 
     /**
      * 检定员id
      */
-    @ApiModelProperty(value = "检定员id", dataType = "String")
+    @ApiModelProperty(value = "检定员id", dataType = "Long")
     @TableField("measure_person_id")
     private Long measurePersonId;
 
     /**
      * 检定员名字
      */
+    @ExcelProperty(value = "检定员", order = 5)
     @ApiModelProperty(value = "检定员名字", dataType = "String")
     @TableField("measure_person")
     private String measurePerson;
@@ -103,7 +112,8 @@
     /**
      * 更新时间
      */
-    @ApiModelProperty(value = "更新时间", dataType = "String")
+    @ExcelProperty(value = "打印时间", order = 6)
+    @ApiModelProperty(value = "打印时间", dataType = "String")
     @TableField("update_time")
     private String updateTime;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceAssess.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceAssess.java
index 659d9ca..6720b90 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceAssess.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceAssess.java
@@ -1,11 +1,26 @@
 package com.casic.missiles.model.business;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 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 com.casic.missiles.dto.BaseRequest;
+import com.casic.missiles.dto.business.outsource.OrderSampleDTO;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import javax.validation.constraints.NotEmpty;
 import java.io.Serializable;
+import java.util.List;
 
 /**
  * <p>
@@ -15,146 +30,231 @@
  * @author wangpeng
  * @since 2023-08-16
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
+@ApiModel
 @Data
 @TableName("biz_business_outsource_assess")
-public class BizBusinessOutsourceAssess implements Serializable {
+public class BizBusinessOutsourceAssess extends BaseRequest implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
+    @ApiModelProperty(value = "id，更新/删除使用参数", dataType = "Long")
     @TableId("id")
     private Long id;
 
     /**
      * 评审表编号
      */
+    @ExcelProperty(value = "评审表编号", order = 1)
+    @ApiModelProperty(value = "评审表编号(后台生成)", dataType = "String")
     @TableField("project_no")
     private String projectNo;
 
     /**
      * 评审表名称
      */
+    @ExcelProperty(value = "评审表名称", order = 2)
+    @ApiModelProperty(value = "评审表名称", dataType = "String")
     @TableField("project_name")
     private String projectName;
 
+    @NotEmpty(message = "实验室代码不能为空")
+    @DictCodeField(message = "实验室代码描述不合法", cacheName = MeterDictCode.LAB_CODE)
+    @ApiModelProperty(value = "实验室代码(字典code)", dataType = "String")
+    @TableField("lab_code")
+    private String labCode;
+
+    @ApiModelProperty(value = "实验室代码(字典value)", dataType = "String")
+    @TableField(exist = false)
+    private String labCodeName;
+
+    /**
+     * 组别代码
+     */
+    @NotEmpty(message = "组别代码不能为空")
+    @DictCodeField(message = "组别代码描述不合法", cacheName = MeterDictCode.GROUP_CODE)
+    @ApiModelProperty(value = "组别代码(字典code)", dataType = "String")
+    @TableField("group_code")
+    private String groupCode;
+
+    @ApiModelProperty(value = "组别代码(字典value)", dataType = "String")
+    @TableField(exist = false)
+    private String groupCodeName;
+
     /**
      * 申请人id
      */
+    @ApiModelProperty(value = "申请人id", dataType = "String")
     @TableField("applicant_id")
     private Long applicantId;
 
     /**
      * 申请人名字
      */
+    @ExcelProperty(value = "申请人", order = 5)
+    @ApiModelProperty(value = "申请人", dataType = "String")
     @TableField("applicant_name")
     private String applicantName;
 
     /**
      * 申请时间
      */
+    @ExcelProperty(value = "申请时间", order = 6)
+    @ApiModelProperty(value = "申请时间", dataType = "String")
     @TableField("applicant_time")
     private String applicantTime;
 
     /**
      * 附件(minio存储文件名)
      */
+    @ApiModelProperty(value = "附件(minio存储文件名)", dataType = "String")
     @TableField("minio_file_name")
     private String minioFileName;
 
     /**
      * 备注
      */
+    @ApiModelProperty(value = "备注", dataType = "String")
     @TableField("remark")
     private String remark;
 
     /**
      * 创建人id
      */
+    @ApiModelProperty(value = "创建人id", dataType = "String")
     @TableField("create_user_id")
     private Long createUserId;
 
     /**
      * 创建人名字
      */
+    @ApiModelProperty(value = "创建人名字", dataType = "String")
     @TableField("create_user_name")
     private String createUserName;
 
     /**
      * 分包方id
      */
+    @ApiModelProperty(value = "评审表编号", dataType = "String")
     @TableField("outsourcer_id")
     private Long outsourcerId;
 
     /**
      * 预计开始时间
      */
+    @ApiModelProperty(value = "预计开始时间", dataType = "String")
     @TableField("pre_start_time")
     private String preStartTime;
 
     /**
      * 预计结束时间
      */
+    @ApiModelProperty(value = "预计结束时间", dataType = "String")
     @TableField("pre_end_time")
     private String preEndTime;
 
     /**
      * 分包原因-字典
      */
+    @ApiModelProperty(value = "分包原因(字典code)", dataType = "String")
+    @DictCodeField(message = "分包原因描述不合法", cacheName = MeterDictCode.OUTSOURCE_REASON)
     @TableField("outsource_reason")
     private String outsourceReason;
 
+    @ApiModelProperty(value = "分包原因(字典value)", dataType = "String")
+    @TableField(exist = false)
+    private String outsourceReasonName;
+
     /**
      * 预计费用
      */
+    @ApiModelProperty(value = "预计费用", dataType = "String")
     @TableField("pre_cost")
     private String preCost;
 
     /**
      * 审批状态
      */
+    @ApiModelProperty(value = "审批状态", dataType = "String")
+    @DictCodeField(message = "审批状态描述不合法", cacheName = MeterDictCode.APPROVAL_STATUS)
     @TableField("approval_status")
     private String approvalStatus;
 
     /**
      * 流程实例id
      */
+    @ApiModelProperty(value = "流程实例id", dataType = "String")
     @TableField("process_id")
     private String processId;
 
     /**
      * 实验室认可情况
      */
+    @ApiModelProperty(value = "实验室认可情况", dataType = "String")
     @TableField("approve_situation")
     private String approveSituation;
 
     /**
      * 溯源性
      */
+    @ApiModelProperty(value = "溯源性", dataType = "String")
     @TableField("traceability")
     private String traceability;
 
     /**
      * 测试方法
      */
+    @ApiModelProperty(value = "测试方法", dataType = "String")
     @TableField("test_method")
     private String testMethod;
 
     /**
      * 技术能力
      */
+    @ApiModelProperty(value = "技术能力", dataType = "String")
     @TableField("technique_ability")
     private String techniqueAbility;
 
     /**
      * 创建时间
      */
+    @ApiModelProperty(hidden = true)
     @TableField("create_time")
     private String createTime;
 
     /**
      * 更新时间
      */
+    @ApiModelProperty(hidden = true)
     @TableField("update_time")
     private String updateTime;
 
+    @ApiModelProperty(value = "审批状态类型-字典value", dataType = "String")
+    @TableField(exist = false)
+    private String approvalStatusName;
 
+    @ApiModelProperty(value = "任务id（同意、驳回等操作使用）", dataType = "String")
+    @TableField(exist = false)
+    private String taskId;
+
+    @ApiModelProperty(value = "可选决策项（1同意驳回拒绝 2同意驳回 3同意拒绝，用于待审批列表同意/驳回/拒绝按钮展示）", dataType = "Integer")
+    @TableField(exist = false)
+    private Integer decisionItem;
+
+    @NotEmpty(message = "受检设备信息不能为空")
+    @ApiModelProperty(value = "受检设备id列表（新建使用参数）", dataType = "List")
+    @TableField(exist = false)
+    private List<OrderSampleDTO> orderSampleList;
+
+    @ExcelProperty(value = "分包机构名称", order = 3)
+    @ApiModelProperty(value = "分包机构名称（列表返回参数）", dataType = "String")
+    private String outsourcerName;
+
+    @ExcelProperty(value = "机构负责人", order = 4)
+    @ApiModelProperty(value = "机构负责人（列表返回参数）", dataType = "String")
+    private String director;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceProtocol.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceProtocol.java
new file mode 100644
index 0000000..38df697
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceProtocol.java
@@ -0,0 +1,225 @@
+package com.casic.missiles.model.business;
+
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
+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 com.casic.missiles.dto.BaseRequest;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotEmpty;
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 计量检定业务-分包管理-测试、校准或检定工作分包协议书
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-08-24
+ */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
+@Data
+@TableName("biz_business_outsource_protocol")
+public class BizBusinessOutsourceProtocol extends BaseRequest implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "id，更新/删除使用参数", dataType = "Long")
+    @TableId("id")
+    private Long id;
+
+    /**
+     * 协议书编号
+     */
+    @ExcelProperty(value = "协议书编号", order = 1)
+    @ApiModelProperty(value = "协议书编号(后台生成)", dataType = "String")
+    @TableField("protocol_no")
+    private String protocolNo;
+
+    /**
+     * 协议书名称
+     */
+    @ExcelProperty(value = "协议书名称", order = 2)
+    @ApiModelProperty(value = "协议书名称", dataType = "String")
+    @TableField("project_name")
+    private String projectName;
+
+    @NotEmpty(message = "实验室代码不能为空")
+    @DictCodeField(message = "实验室代码描述不合法", cacheName = MeterDictCode.LAB_CODE)
+    @ApiModelProperty(value = "实验室代码(字典code)", dataType = "String")
+    @TableField("lab_code")
+    private String labCode;
+
+    @ApiModelProperty(value = "实验室代码(字典value)", dataType = "String")
+    @TableField(exist = false)
+    private String labCodeName;
+
+    @NotEmpty(message = "组别代码不能为空")
+    @DictCodeField(message = "组别代码描述不合法", cacheName = MeterDictCode.GROUP_CODE)
+    @ApiModelProperty(value = "组别代码(字典code)", dataType = "String")
+    @TableField("group_code")
+    private String groupCode;
+
+    @ApiModelProperty(value = "组别代码(字典value)", dataType = "String")
+    @TableField(exist = false)
+    private String groupCodeName;
+
+    /**
+     * 分包方id
+     */
+    @ApiModelProperty(value = "分包方id", dataType = "Long")
+    @TableField("outsourcer_id")
+    private Long outsourcerId;
+
+    /**
+     * 其他
+     */
+    @ApiModelProperty(value = "其他", dataType = "String")
+    @TableField("remark")
+    private String remark;
+
+    /**
+     * 分包方编号
+     */
+    @ApiModelProperty(value = "分包方编号(新建不用传)", dataType = "String")
+    @TableField("outsource_no")
+    private String outsourceNo;
+
+    /**
+     * 分包方名称
+     */
+    @ExcelProperty(value = "分包方名称", order = 3)
+    @ApiModelProperty(value = "分包方名称(新建不用传)", dataType = "String")
+    @TableField("outsource_name")
+    private String outsourceName;
+
+    /**
+     * 联系人
+     */
+    @ExcelProperty(value = "联系人", order = 4)
+    @ApiModelProperty(value = "联系人", dataType = "String")
+    @TableField("contacts")
+    private String contacts;
+
+    /**
+     * 电话
+     */
+    @ApiModelProperty(value = "电话", dataType = "String")
+    @TableField("mobile")
+    private String mobile;
+
+    /**
+     * 地址
+     */
+    @ApiModelProperty(value = "地址", dataType = "String")
+    @TableField("address")
+    private String address;
+
+    /**
+     * 要求完成日期
+     */
+    @ApiModelProperty(value = "要求完成日期", dataType = "String")
+    @TableField("require_date")
+    private String requireDate;
+
+    /**
+     * 分包费用(元)
+     */
+    @ApiModelProperty(value = "分包费用(元)", dataType = "String")
+    @TableField("outsource_cost")
+    private Double outsourceCost;
+
+    /**
+     * 分包方负责人
+     */
+    @ApiModelProperty(value = "分包方负责人", dataType = "String")
+    @TableField("director")
+    private String director;
+
+    /**
+     * 分包项目
+     */
+    @ApiModelProperty(value = "分包项目", dataType = "String")
+    @TableField("item")
+    private String item;
+
+    /**
+     * 分包要求
+     */
+    @ApiModelProperty(value = "分包要求", dataType = "String")
+    @TableField("requires")
+    private String requires;
+
+    /**
+     * 创建人id
+     */
+    @ApiModelProperty(hidden = true)
+    @TableField("create_user_id")
+    private Long createUserId;
+
+    /**
+     * 创建人名字
+     */
+    @ExcelProperty(value = "申请人", order = 5)
+    @ApiModelProperty(value = "申请人", dataType = "String")
+    @TableField("create_user_name")
+    private String createUserName;
+
+    /**
+     * 审批状态
+     */
+    @ApiModelProperty(value = "审批状态", dataType = "String")
+    @DictCodeField(message = "审批状态描述不合法", cacheName = MeterDictCode.APPROVAL_STATUS)
+    @TableField("approval_status")
+    private String approvalStatus;
+
+    /**
+     * 流程实例id
+     */
+    @ApiModelProperty(value = "流程实例id", dataType = "String")
+    @TableField("process_id")
+    private String processId;
+
+    /**
+     * 创建时间
+     */
+    @ExcelProperty(value = "申请时间", order = 6)
+    @ApiModelProperty(value = "申请时间", dataType = "String")
+    @TableField("create_time")
+    private String createTime;
+
+    /**
+     * 更新时间
+     */
+    @ApiModelProperty(hidden = true)
+    @TableField("update_time")
+    private String updateTime;
+
+    @ApiModelProperty(value = "审批状态类型-字典value", dataType = "String")
+    @TableField(exist = false)
+    private String approvalStatusName;
+
+    @ApiModelProperty(value = "任务id（同意、驳回等操作使用）", dataType = "String")
+    @TableField(exist = false)
+    private String taskId;
+
+    @ApiModelProperty(value = "可选决策项（1同意驳回拒绝 2同意驳回 3同意拒绝，用于待审批列表同意/驳回/拒绝按钮展示）", dataType = "Integer")
+    @TableField(exist = false)
+    private Integer decisionItem;
+
+
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourcerInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourcerInfo.java
index ec4e997..f9aa69e 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourcerInfo.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourcerInfo.java
@@ -17,6 +17,7 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import javax.validation.constraints.NotEmpty;
 import java.io.Serializable;
 
 /**
@@ -59,6 +60,29 @@
     @TableField("outsourcer_name")
     private String outsourcerName;
 
+    @NotEmpty(message = "实验室代码不能为空")
+    @DictCodeField(message = "实验室代码描述不合法", cacheName = MeterDictCode.LAB_CODE)
+    @ApiModelProperty(value = "实验室代码(字典code)", dataType = "String")
+    @TableField("lab_code")
+    private String labCode;
+
+    @ApiModelProperty(value = "实验室代码(字典value)", dataType = "String")
+    @TableField(exist = false)
+    private String labCodeName;
+
+    /**
+     * 组别代码
+     */
+    @NotEmpty(message = "组别代码不能为空")
+    @DictCodeField(message = "组别代码描述不合法", cacheName = MeterDictCode.GROUP_CODE)
+    @ApiModelProperty(value = "组别代码(字典code)", dataType = "String")
+    @TableField("group_code")
+    private String groupCode;
+
+    @ApiModelProperty(value = "组别代码(字典value)", dataType = "String")
+    @TableField(exist = false)
+    private String groupCodeName;
+
     /**
      * 单位简称
      */
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardInfo.java
index c48eed7..dffdfdd 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardInfo.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardInfo.java
@@ -5,6 +5,7 @@
 import com.baomidou.mybatisplus.annotation.TableName;
 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;
 
@@ -18,6 +19,7 @@
  * @author wangpeng
  * @since 2023-08-04
  */
+@ApiModel
 @Data
 @TableName("biz_equipment_standard_info")
 public class BizEquipmentStandardInfo implements Serializable {
@@ -119,7 +121,7 @@
      * 管理状态(字典code)
      */
     @ApiModelProperty(value = "管理状态(字典code)", dataType = "String")
-    @DictCodeField(message = "管理状态不合法", cacheName = MeterDictCode.MANAGER_STATE)
+    @DictCodeField(message = "管理状态不合法", cacheName = MeterDictCode.STANDARD_MANAGER_STATE)
     @TableField("manage_status")
     private String manageStatus;
 
@@ -151,7 +153,7 @@
     /**
      * 温度(℃)
      */
-    @ApiModelProperty(value = "使用状态(字典code)", dataType = "String")
+    @ApiModelProperty(value = "温度(℃)", dataType = "String")
     @TableField("temperature")
     private Double temperature;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardInfoApproval.java b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardInfoApproval.java
index dbd86ab..9f58d83 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardInfoApproval.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardInfoApproval.java
@@ -150,7 +150,7 @@
      * 管理状态(字典code)
      */
     @ApiModelProperty(value = "管理状态(字典code)", dataType = "String")
-    @DictCodeField(message = "管理状态不合法", cacheName = MeterDictCode.MANAGER_STATE)
+    @DictCodeField(message = "管理状态不合法", cacheName = MeterDictCode.STANDARD_MANAGER_STATE)
     @TableField("manage_status")
     private String manageStatus;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardTechnologyRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardTechnologyRelation.java
index 0e612bd..751f26b 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardTechnologyRelation.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardTechnologyRelation.java
@@ -3,6 +3,7 @@
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -16,6 +17,7 @@
  * @author wangpeng
  * @since 2023-08-04
  */
+@ApiModel
 @Data
 @TableName("biz_equipment_standard_technology_relation")
 public class BizEquipmentStandardTechnologyRelation implements Serializable {
@@ -33,6 +35,10 @@
     @TableField("technology_file_id")
     private Long technologyFileId;
 
+    @ApiModelProperty(value = "依据的技术文件编号", dataType = "String")
+    @TableField("technology_file_no")
+    private String technologyFileNo;
+
     /**
      * 依据的技术文件名称(技术文件中现行测试校准检定方法表文件名字段)
      */
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerInfo.java
index d6e8bed..65cd6bc 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerInfo.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerInfo.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.model.resource;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -21,6 +28,11 @@
  * @author wangpeng
  * @since 2023-08-08
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @ApiModel
 @Data
 @TableName("biz_resource_customer_info")
@@ -35,6 +47,7 @@
     /**
      * 委托方编号
      */
+    @ExcelProperty(value = "委托方编号", order = 1)
     @ApiModelProperty(value = "委托方编号", dataType = "String")
     @TableField("customer_no")
     private String customerNo;
@@ -42,6 +55,7 @@
     /**
      * 委托方名称
      */
+    @ExcelProperty(value = "委托方名称", order = 2)
     @ApiModelProperty(value = "委托方名称(新建时为下拉选择一个受检单位组织的名字，传deptId字段，后端获取名称)", dataType = "String")
     @TableField("customer_name")
     private String customerName;
@@ -63,6 +77,7 @@
     /**
      * 联系人
      */
+    @ExcelProperty(value = "联系人", order = 3)
     @ApiModelProperty(value = "联系人", dataType = "String")
     @TableField("contacts")
     private String contacts;
@@ -70,6 +85,7 @@
     /**
      * 座机电话
      */
+    @ExcelProperty(value = "座机电话", order = 4)
     @ApiModelProperty(value = "座机电话", dataType = "String")
     @TableField("mobile")
     private String mobile;
@@ -77,6 +93,7 @@
     /**
      * 手机号码
      */
+    @ExcelProperty(value = "手机号码", order = 5)
     @ApiModelProperty(value = "手机号码", dataType = "String")
     @TableField("phone")
     private String phone;
@@ -91,6 +108,7 @@
     /**
      * 地址
      */
+    @ExcelProperty(value = "地址", order = 6)
     @ApiModelProperty(value = "地址", dataType = "String")
     @TableField("address")
     private String address;
@@ -141,6 +159,7 @@
     /**
      * 创建时间
      */
+    @ExcelProperty(value = "创建时间", order = 7)
     @ApiModelProperty(value = "创建时间", dataType = "String")
     @TableField("create_time")
     private String createTime;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerSuggestForm.java b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerSuggestForm.java
index 7201bbd..701bf8b 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerSuggestForm.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerSuggestForm.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.model.resource;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -22,6 +29,11 @@
  * @author wangpeng
  * @since 2023-08-08
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @ApiModel
 @Data
 @TableName("biz_resource_customer_suggest_form")
@@ -44,7 +56,8 @@
     /**
      * 委托方名称
      */
-    @ApiModelProperty(value = "委托方名称", dataType = "String")
+    @ExcelProperty(value = "意见反馈单位", order = 2)
+    @ApiModelProperty(value = "意见反馈单位", dataType = "String")
     @TableField("customer_name")
     private String customerName;
 
@@ -59,7 +72,8 @@
     /**
      * 委托方意见反馈部门名称
      */
-    @ApiModelProperty(value = "委托方意见反馈部门名称", dataType = "String")
+    @ExcelProperty(value = "委托方意见反馈部门", order = 3)
+    @ApiModelProperty(value = "委托方意见反馈部门", dataType = "String")
     @TableField("customer_dept_name")
     private String customerDeptName;
 
@@ -73,6 +87,7 @@
     /**
      * 表单编号
      */
+    @ExcelProperty(value = "表单编号", order = 1)
     @ApiModelProperty(value = "表单编号", dataType = "String")
     @TableField("form_no")
     private String formNo;
@@ -111,6 +126,7 @@
     /**
      * 创建人名字
      */
+    @ExcelProperty(value = "创建人", order = 4)
     @ApiModelProperty(value = "创建人名字", dataType = "String")
     @TableField("create_user_name")
     private String createUserName;
@@ -147,6 +163,7 @@
     /**
      * 创建时间
      */
+    @ExcelProperty(value = "创建时间", order = 5)
     @ApiModelProperty(value = "创建时间", dataType = "String")
     @TableField("create_time")
     private String createTime;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSealInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSealInfo.java
index cbf05d7..9bf389d 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSealInfo.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSealInfo.java
@@ -106,6 +106,10 @@
     @TableField("minio_file_name")
     private String minioFileName;
 
+    @ApiModelProperty(value = "minio存储文件url", dataType = "String")
+    @TableField(exist = false)
+    private String minioFileUrl;
+
     @ApiModelProperty(value = "创建时间", dataType = "String")
     @TableField("create_time")
     private String createTime;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSealUseNote.java b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSealUseNote.java
index 3f2d9e8..3ce16a8 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSealUseNote.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSealUseNote.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.model.resource;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -20,6 +27,11 @@
  * @author wangpeng
  * @since 2023-07-28
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @ApiModel
 @Data
 @TableName("biz_resource_seal_use_note")
@@ -34,6 +46,7 @@
     /**
      * 登记表编号
      */
+    @ExcelProperty(value = "申请单编号", order = 1)
     @ApiModelProperty(value = "登记表编号(自动生成)", dataType = "String")
     @TableField("note_form_no")
     private String noteFormNo;
@@ -55,6 +68,7 @@
     /**
      * 申请部门
      */
+    @ExcelProperty(value = "申请部门", order = 5)
     @ApiModelProperty(value = "申请部门", dataType = "String")
     @TableField("apply_dept_name")
     private String applyDeptName;
@@ -69,6 +83,7 @@
     /**
      * 申请人
      */
+    @ExcelProperty(value = "申请人", order = 6)
     @ApiModelProperty(value = "申请人", dataType = "String")
     @TableField("apply_user_name")
     private String applyUserName;
@@ -76,6 +91,7 @@
     /**
      * 申请时间
      */
+    @ExcelProperty(value = "申请时间", order = 7)
     @ApiModelProperty(value = "申请时间(新增自动获取当前时间)", dataType = "String")
     @TableField("apply_time")
     private String applyTime;
@@ -130,6 +146,26 @@
     @TableField("update_time")
     private String updateTime;
 
+    @ExcelProperty(value = "印章名称", order = 2)
+    @ApiModelProperty(value = "印章名称(列表返回参数)", dataType = "String")
+    @TableField(exist = false)
+    private String sealName;
+
+    @DictCodeField(message = "印章类型描述不合法", cacheName = MeterDictCode.SEAL_TYPE)
+    @ApiModelProperty(hidden = true)
+    @TableField(exist = false)
+    private String sealType;
+
+    @ExcelProperty(value = "印章类型", order = 3)
+    @ApiModelProperty(value = "印章类型(列表返回参数)", dataType = "String")
+    @TableField(exist = false)
+    private String sealTypeName;
+
+    @ExcelProperty(value = "批准人", order = 4)
+    @ApiModelProperty(value = "批准人(列表返回参数)", dataType = "String")
+    @TableField(exist = false)
+    private String approverName;
+
     @ApiModelProperty(value = "审批状态类型-字典value", dataType = "String")
     @TableField(exist = false)
     private String approvalStatusName;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceStaffInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceStaffInfo.java
index 5ef995b..41563a1 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceStaffInfo.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceStaffInfo.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.model.resource;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -20,6 +27,11 @@
  * @author wangpeng
  * @since 2023-07-25
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @ApiModel
 @Data
 @TableName("biz_resource_staff_info")
@@ -38,6 +50,7 @@
     /**
      * 人员编号
      */
+    @ExcelProperty(value = "人员编号",order = 0)
     @NotEmpty(message = "人员编号不能为空")
     @ApiModelProperty(value = "人员编号", dataType = "String")
     @TableField("staff_no")
@@ -46,6 +59,7 @@
     /**
      * 姓名
      */
+    @ExcelProperty(value = "姓名",order = 1)
     @ApiModelProperty(value = "姓名", dataType = "String")
     @TableField("staff_name")
     private String staffName;
@@ -152,13 +166,15 @@
     /**
      * 部门名字
      */
-    @ApiModelProperty(value = "部门名字", dataType = "String")
+    @ExcelProperty(value = "工作部门",order = 4)
+    @ApiModelProperty(value = "工作部门", dataType = "String")
     @TableField("dept_name")
     private String deptName;
 
     /**
      * 岗位
      */
+    @ExcelProperty(value = "岗位",order = 2)
     @ApiModelProperty(value = "岗位", dataType = "String")
     @TableField("station")
     private String station;
@@ -166,6 +182,7 @@
     /**
      * 计量专业
      */
+    @ExcelProperty(value = "计量专业",order = 5)
     @ApiModelProperty(value = "计量专业", dataType = "String")
     @TableField("major")
     private String major;
@@ -173,6 +190,7 @@
     /**
      * 证号
      */
+    @ExcelProperty(value = "证号",order = 3)
     @ApiModelProperty(value = "证号", dataType = "String")
     @TableField("certificate_number")
     private String certificateNumber;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSupplierInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSupplierInfo.java
index eb5ef01..a1e2697 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSupplierInfo.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSupplierInfo.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.model.resource;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -20,6 +27,11 @@
  * @author wangpeng
  * @since 2023-07-27
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @ApiModel
 @Data
 @TableName("biz_resource_supplier_info")
@@ -34,6 +46,7 @@
     /**
      * 供方编号
      */
+    @ExcelProperty(value = "供方编号", order = 1)
     @ApiModelProperty(value = "供方编号(自动生成)", dataType = "String")
     @TableField("supplier_no")
     private String supplierNo;
@@ -41,6 +54,7 @@
     /**
      * 供方名称
      */
+    @ExcelProperty(value = "供方名称", order = 2)
     @ApiModelProperty(value = "供方名称", dataType = "String")
     @TableField("supplier_name")
     private String supplierName;
@@ -60,6 +74,7 @@
     @TableField("supplier_type")
     private String supplierType;
 
+    @ExcelProperty(value = "供方类型", order = 3)
     @ApiModelProperty(value = "供方类型(字典value)", dataType = "String")
     @TableField(exist = false)
     private String supplierTypeName;
@@ -109,7 +124,8 @@
     /**
      * 电话
      */
-    @ApiModelProperty(value = "电话", dataType = "String")
+    @ExcelProperty(value = "联系电话", order = 4)
+    @ApiModelProperty(value = "联系电话", dataType = "String")
     @TableField("phone")
     private String phone;
 
@@ -158,6 +174,7 @@
     /**
      * 公司地址-省
      */
+    @ExcelProperty(value = "地址-省", order = 6)
     @ApiModelProperty(value = "公司地址-省", dataType = "String")
     @TableField("company_province_name")
     private String companyProvinceName;
@@ -172,6 +189,7 @@
     /**
      * 公司地址-市
      */
+    @ExcelProperty(value = "地址-市", order = 7)
     @ApiModelProperty(value = "公司地址-市", dataType = "String")
     @TableField("company_city_name")
     private String companyCityName;
@@ -186,6 +204,7 @@
     /**
      * 公司地址-区
      */
+    @ExcelProperty(value = "地址-区", order = 8)
     @ApiModelProperty(value = "公司地址-区", dataType = "String")
     @TableField("company_area_name")
     private String companyAreaName;
@@ -193,6 +212,7 @@
     /**
      * 公司地址-详细地址
      */
+    @ExcelProperty(value = "地址-详细地址", order = 9)
     @ApiModelProperty(value = "公司地址-详细地址", dataType = "String")
     @TableField("company_address")
     private String companyAddress;
@@ -200,6 +220,7 @@
     /**
      * 服务和供应的内容
      */
+    @ExcelProperty(value = "服务和供应的内容", order = 5)
     @ApiModelProperty(value = "服务和供应的内容", dataType = "String")
     @TableField("supplier_content")
     private String supplierContent;
@@ -250,6 +271,7 @@
     /**
      * 创建时间
      */
+    @ExcelProperty(value = "创建时间", order = 9)
     @ApiModelProperty(value = "创建时间", dataType = "String")
     @TableField("create_time")
     private String createTime;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/EnvLocationInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/EnvLocationInfo.java
new file mode 100644
index 0000000..d8e2d7b
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/EnvLocationInfo.java
@@ -0,0 +1,83 @@
+package com.casic.missiles.model.resource;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotEmpty;
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 实验室环境监控系统-设备表
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-06-07
+ */
+@ApiModel
+@Data
+@TableName("env_location_info")
+public class EnvLocationInfo implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "主键id", dataType = "Long")
+    @TableId("id")
+    private Long id;
+
+    /**
+     * 地点编号
+     */
+    @NotEmpty(message = "地点编号不能为空")
+    @ApiModelProperty(value = "地点编号", dataType = "String")
+    @TableField("location_no")
+    private String locationNo;
+
+    /**
+     * 地点名称
+     */
+    @ApiModelProperty(value = "地点名称", dataType = "String")
+    @TableField("location_name")
+    private String locationName;
+
+    /**
+     * 地点位置
+     */
+    @ApiModelProperty(value = "地点位置", dataType = "String")
+    @TableField("location_position")
+    private String locationPosition;
+
+    /**
+     * 创建人id
+     */
+    @ApiModelProperty(value = "创建人id", dataType = "Long")
+    @TableField("create_user_id")
+    private Long createUserId;
+
+    /**
+     * 创建人
+     */
+    @ApiModelProperty(value = "创建人", dataType = "String")
+    @TableField("create_user")
+    private String createUser;
+
+    /**
+     * 创建时间
+     */
+    @ApiModelProperty(value = "创建时间", dataType = "String")
+    @TableField("create_time")
+    private String createTime;
+
+    /**
+     * 更新时间
+     */
+    @ApiModelProperty(value = "更新时间", dataType = "String")
+    @TableField("update_time")
+    private String updateTime;
+
+
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemFileConfig.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemFileConfig.java
index 19e6845..86e569c 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemFileConfig.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemFileConfig.java
@@ -30,7 +30,7 @@
     @ApiModelProperty(value = "系统类别(1业务系统2受检系统3环境系统)", dataType = "Integer")
     @NotNull(message = "系统类别不能为空")
     @TableField("system_type")
-    private Integer systemType;
+    private Integer systemType = 1;
 
     @ApiModelProperty("下载编号")
     @TableField("download_no")
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemNotice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemNotice.java
index e94297d..06ec37d 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemNotice.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemNotice.java
@@ -34,7 +34,7 @@
     @ApiModelProperty(value = "系统类别(1业务系统2受检系统3环境系统)", dataType = "Integer")
     @NotNull(message = "系统类别不能为空")
     @TableField("system_type")
-    private Integer systemType;
+    private Integer systemType = 1;
 
     /**
      * 通知公告编号
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSign.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSign.java
index 6c0d7c9..954f4f8 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSign.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSign.java
@@ -51,7 +51,7 @@
     @ApiModelProperty(value = "系统类别(1业务系统2受检系统3环境系统)", dataType = "Integer")
     @NotNull(message = "系统类别不能为空")
     @TableField("system_type")
-    private Integer systemType;
+    private Integer systemType = 1;
 
     /**
      * 签名编号
@@ -130,4 +130,8 @@
     @TableField(exist = false)
     private List<Long> userIdList;
 
+    @ApiModelProperty(hidden = true)
+    @TableField(exist = false)
+    private String deptName;
+
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemTemplate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemTemplate.java
index 503a457..1d27ebe 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemTemplate.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemTemplate.java
@@ -47,7 +47,7 @@
     @ApiModelProperty(value = "系统类别(1业务系统2受检系统3环境系统)", dataType = "Integer")
     @NotNull(message = "系统类别不能为空")
     @TableField("system_type")
-    private Integer systemType;
+    private Integer systemType = 1;
 
     /**
      * 模板编号
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java
index 8c21cb0..f61e4a8 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java
@@ -32,4 +32,8 @@
     ReturnDTO approvalDelete(ApprovalDeleteRequest request);
 
     ReturnDTO failUpdate(T request);
+
+    List<O> listExport(R request);
+
+    List<O> listExportByIds(List<Long> ids);
 }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java
index 724166f..9bce15b 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java
@@ -157,6 +157,29 @@
         throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
     }
 
+    @Override
+    public List<O> listExport(R request) {
+        request.setCreateUserId(null);
+        request.setApprovalStatus(ApprovalStatusEnum.PASSED);
+        Page<O> page = PageFactory.defaultPage();
+        page.setCurrent(1);
+        page.setSearchCount(false);
+        page.setSize(Integer.MAX_VALUE);
+        Page<O> resultPage = this.baseMapper.selectBatchForApprovalList(page, request, null);
+        return resultPage.getRecords();
+    }
+
+    @Override
+    public List<O> listExportByIds(List<Long> ids) {
+        Page<O> page = PageFactory.defaultPage();
+        page.setCurrent(1);
+        page.setSearchCount(false);
+        page.setSize(Integer.MAX_VALUE);
+        List<String> businessKeys = ids.stream().map(String::valueOf).collect(Collectors.toList());
+        Page<O> resultPage = this.baseMapper.selectBatchForApprovalList(page, null, businessKeys);
+        return resultPage.getRecords();
+    }
+
     protected ReturnDTO updateApprovalStatus(Long id, String processId, String approvalStatus) {
         UpdateWrapper<T> updateWrapper = new UpdateWrapper<>();
         updateWrapper.eq("id", id);
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificatePrintServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificatePrintServiceImpl.java
index f6e4706..3228497 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificatePrintServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificatePrintServiceImpl.java
@@ -162,6 +162,30 @@
         return ReturnUtil.success(printLogMapper.selectList(wrapper));
     }
 
+    @Override
+    public List<CertificatePrintListResponse> listByIds(List<Long> ids) {
+        Page<CertificatePrintListResponse> page = PageFactory.defaultPage();
+        page.setCurrent(1);
+        page.setSearchCount(false);
+        page.setSize(Integer.MAX_VALUE);
+        List<String> businessKeys = ids.stream().map(String::valueOf).collect(Collectors.toList());
+        Page<CertificatePrintListResponse> resultPage = this.baseMapper.selectBatchForApprovalList(page, null, businessKeys);
+        return resultPage.getRecords();
+    }
+
+    @Override
+    public List<CertificatePrintListResponse> list(CertificatePrintApprovalListRequest request) {
+        request.setCreateUserId(null);
+        request.setApprovalStatus(null);
+        request.setPrintStatus(null);
+        Page<CertificatePrintListResponse> page = PageFactory.defaultPage();
+        page.setCurrent(1);
+        page.setSearchCount(false);
+        page.setSize(Integer.MAX_VALUE);
+        Page<CertificatePrintListResponse> resultPage = certificatePrintMapper.selectBatchForApprovalList(page, request, null);
+        return resultPage.getRecords();
+    }
+
     private void savePrintLog(Long id) {
         BizBusinessCertificatePrintLog printLog = new BizBusinessCertificatePrintLog();
         BizBusinessCertificatePrint certificatePrint = certificatePrintMapper.selectById(id);
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificateReportServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificateReportServiceImpl.java
index 457555f..24146be 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificateReportServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificateReportServiceImpl.java
@@ -158,8 +158,8 @@
         QueryWrapper<BizBusinessCertificateMeasureResultData> mWrapper = new QueryWrapper<>();
         mWrapper.eq("report_id", reportId);
         boolean mRemove = certificateMeasureResultDataService.remove(mWrapper);
-        Assert.isFalse(eRemove || mRemove, () -> {
+        if(!eRemove || !mRemove){
             throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
-        });
+        }
     }
 }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessIdentifyInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessIdentifyInfoServiceImpl.java
index 4c8e190..f7e63ca 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessIdentifyInfoServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessIdentifyInfoServiceImpl.java
@@ -1,8 +1,10 @@
 package com.casic.missiles.service.Impl.business;
 
+import cn.hutool.core.date.DateUtil;
 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.core.page.PageFactory;
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.business.identify.IdentifyListRequest;
@@ -14,11 +16,14 @@
 import com.casic.missiles.service.business.IBizBusinessIdentifyInfoService;
 import com.casic.missiles.utils.DictCodeUtils;
 import com.casic.missiles.utils.NumberGeneratorUtil;
+import com.casic.missiles.utils.QRCodeUtil;
 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.List;
+
 /**
  * <p>
  * 计量检定业务-任务计量管理-标识打印 服务实现类
@@ -35,9 +40,9 @@
     @Override
     public Page<BizBusinessIdentifyInfo> identifyListPage(Page<BizBusinessIdentifyInfo> page, IdentifyListRequest request) throws Exception {
         QueryWrapper<BizBusinessIdentifyInfo> wrapper = new QueryWrapper<>();
-        wrapper.eq("identify_type", request.getIdentifyType());
-        wrapper.like("device_no", request.getDeviceNo());
-        wrapper.like("device_name", request.getDeviceName());
+        wrapper.eq(StringUtils.isNotEmpty(request.getIdentifyType()), "identify_type", request.getIdentifyType());
+        wrapper.like(StringUtils.isNotEmpty(request.getDeviceNo()),"device_no", request.getDeviceNo());
+        wrapper.like(StringUtils.isNotEmpty(request.getDeviceName()), "device_name", request.getDeviceName());
         wrapper.apply(StringUtils.isNotBlank(request.getCreateTimeStart()),
                 "{0} <= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getCreateTimeStart().split(" ")[0]);
         wrapper.apply(StringUtils.isNotBlank(request.getCreateTimeEnd()),
@@ -64,8 +69,11 @@
     }
 
     @Override
-    public ReturnDTO updateIdentify(BizBusinessIdentifyInfo identifyInfo) {
-        if(identifyInfoMapper.updateById(identifyInfo) > 0){
+    public ReturnDTO updateIdentify(Long id) {
+        BizBusinessIdentifyInfo info = new BizBusinessIdentifyInfo();
+        info.setId(id);
+        info.setUpdateTime(DateUtil.now());
+        if(identifyInfoMapper.updateById(info) > 0){
             return ReturnUtil.success();
         }
         throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
@@ -79,4 +87,20 @@
         throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
     }
 
+    @Override
+    public List<BizBusinessIdentifyInfo> list(IdentifyListRequest request) throws Exception {
+        Page<BizBusinessIdentifyInfo> page = PageFactory.defaultPage();
+        page.setCurrent(1);
+        page.setSearchCount(false);
+        page.setSize(Integer.MAX_VALUE);
+        Page<BizBusinessIdentifyInfo> resultPage = this.identifyListPage(page, request);
+        return resultPage.getRecords();
+    }
+
+    @Override
+    public ReturnDTO<String> equipmentQrCode(Long id) {
+        String base64QRCode = QRCodeUtil.getBase64QRCode(String.valueOf(id));
+        return ReturnUtil.success(base64QRCode);
+    }
+
 }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOrderInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOrderInfoServiceImpl.java
index 82952ad..d8d2c6a 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOrderInfoServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOrderInfoServiceImpl.java
@@ -35,6 +35,7 @@
 import javax.servlet.http.HttpServletResponse;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 import java.util.stream.Collectors;
 
 /**
@@ -209,13 +210,16 @@
     private QueryWrapper<OrderListResponse> listParamWrapperBuilder(OrderListRequest request) {
         QueryWrapper<OrderListResponse> wrapper = new QueryWrapper<>();
         wrapper.like(StringUtils.isNotBlank(request.getOrderNo()), "order_no", request.getOrderNo());
+        wrapper.like(Objects.nonNull(request.getCustomerId()), "customer_id", request.getCustomerId());
         wrapper.like(StringUtils.isNotBlank(request.getCustomerName()), "customer_name", request.getCustomerName());
         wrapper.like(StringUtils.isNotBlank(request.getDeliverer()), "deliverer", request.getDeliverer());
         wrapper.like(StringUtils.isNotBlank(request.getCreateUserName()), "create_user_name", request.getCreateUserName());
-        wrapper.apply(StringUtils.isNotBlank(request.getCreateStartTime()),
-                "{0} <= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getCreateStartTime().split(" ")[0]);
-        wrapper.apply(StringUtils.isNotBlank(request.getCreateEndTime()),
-                "{0} >= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getCreateEndTime().split(" ")[0]);
+        if(StringUtils.isNotBlank(request.getCreateStartTime())){
+            wrapper.apply("{0} <= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getCreateStartTime().split(" ")[0]);
+        }
+        if(StringUtils.isNotBlank(request.getCreateEndTime())){
+            wrapper.apply("{0} >= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getCreateEndTime().split(" ")[0]);
+        }
         wrapper.orderByDesc("create_time");
         return wrapper;
     }

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java
index bb0c50f..13a699b 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java
@@ -12,6 +12,7 @@
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.IGeneralApprovalService;
+import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
@@ -19,6 +20,7 @@
 import org.springframework.web.bind.annotation.RequestBody;
 
 import javax.validation.Valid;
+import java.util.List;
 import java.util.Objects;
 
 /**
@@ -117,4 +119,17 @@
         }
         return baseApprovalService.failUpdate(request);
     }
+
+    public List<O> exportList(@RequestBody @Valid R request) throws Exception {
+        List<O> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = baseApprovalService.listExportByIds(request.getIds());
+        } else {
+            list = baseApprovalService.listExport(request);
+        }
+        for (O record : list) {
+            DictCodeUtils.convertDictCodeToName(record);
+        }
+        return list;
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java
index 8a90961..d775831 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java
@@ -5,6 +5,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.business.certificate.CertificateChangeApplyApprovalListRequest;
 import com.casic.missiles.dto.business.certificate.CertificateChangeApplySaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessCertificateChangeApply;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
@@ -20,6 +21,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -48,4 +50,12 @@
         }
         return changeApplyService.saveChangeApply(request);
     }
+
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody CertificateChangeApplyApprovalListRequest request) throws Exception {
+        List<BizBusinessCertificateChangeApply> list = super.exportList(request);
+        super.exportExcel(BizBusinessCertificateChangeApply.class, list, ExportEnum.CERTIFICATE_CHANGE_APPLY.getSheetName());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java
index 5fc4b07..af8230e 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java
@@ -9,6 +9,7 @@
 import com.casic.missiles.dto.business.certificate.CertificatePrintApprovalListRequest;
 import com.casic.missiles.dto.business.certificate.CertificatePrintListResponse;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.enums.business.CertificatePrintStatusEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessCertificatePrintLog;
@@ -18,10 +19,16 @@
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.io.IOException;
+import java.util.List;
 import java.util.Objects;
 
 /**
@@ -98,4 +105,16 @@
         });
         return certificatePrintService.certificatePrintLog(idDTO.getId());
     }
+
+    @ApiOperation("证书打印审批导出")
+    @PostMapping("/listExport")
+    public void exportList(@RequestBody CertificatePrintApprovalListRequest request) throws IOException {
+        List<CertificatePrintListResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = certificatePrintService.listByIds(request.getIds());
+        } else {
+            list = certificatePrintService.list(request);
+        }
+        super.exportExcel(CertificatePrintListResponse.class, list, ExportEnum.CERTIFICATE_PRINT.getSheetName());
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java
index 63b06dc..6b2efd5 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java
@@ -6,6 +6,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.business.certificate.CertificateReportApprovalListRequest;
 import com.casic.missiles.dto.business.certificate.CertificateReportSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessCertificateReport;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
@@ -21,6 +22,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -50,7 +52,7 @@
         return certificateReportService.saveCertificateReport(request);
     }
 
-    @ApiOperation("证书审批详情（基本信息）")
+    @ApiOperation("详情（基本信息）")
     @PostMapping("/detail")
     public ReturnDTO<BizBusinessCertificateReport> detail(@RequestBody @Valid BaseDetailRequest request, BindingResult bindingResult) throws Exception {
         if(bindingResult.hasErrors()){
@@ -59,4 +61,11 @@
         return certificateReportService.detail(request);
     }
 
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody CertificateReportApprovalListRequest request) throws Exception {
+        List<BizBusinessCertificateReport> list = super.exportList(request);
+        super.exportExcel(BizBusinessCertificateReport.class, list, ExportEnum.CERTIFICATE_REPORT.getSheetName());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java
index 46b26bd..57c0809 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java
@@ -10,20 +10,21 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.business.identify.IdentifyListRequest;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessIdentifyInfo;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.business.IBizBusinessIdentifyInfoService;
+import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import javax.validation.Valid;
+import java.util.List;
 import java.util.Objects;
 
 /**
@@ -57,16 +58,13 @@
         return identifyInfoService.addIdentify(identifyInfo);
     }
 
-    @ApiOperation("标识打印更新")
+    @ApiOperation("标识打印更新（更新打印时间）")
     @PostMapping("/update")
-    public ReturnDTO updateIdentify(@RequestBody @Valid BizBusinessIdentifyInfo identifyInfo, BindingResult bindingResult) {
-        Assert.isFalse(Objects.isNull(identifyInfo.getId()), () -> {
+    public ReturnDTO updateIdentify(@RequestBody @Valid IdDTO idDTO) {
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        Assert.isFalse(bindingResult.hasErrors(), () -> {
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        });
-        return identifyInfoService.updateIdentify(identifyInfo);
+        return identifyInfoService.updateIdentify(idDTO.getId());
     }
 
     @ApiOperation("标识打印删除")
@@ -77,4 +75,37 @@
         });
         return identifyInfoService.deleteIdentify(idDTO.getId());
     }
+
+    @ApiOperation("标识打印导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody @Valid IdentifyListRequest request, BindingResult bindingResult) throws Exception {
+        if (bindingResult.hasErrors()) {
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        List<BizBusinessIdentifyInfo> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = identifyInfoService.listByIds(request.getIds());
+        } else {
+            list = identifyInfoService.list(request);
+        }
+        for (BizBusinessIdentifyInfo record : list) {
+            DictCodeUtils.convertDictCodeToName(record);
+        }
+        super.exportExcel(BizBusinessIdentifyInfo.class, list, ExportEnum.IDENTIFY_EXPORT.getSheetName());
+    }
+
+
+    // TODO: 2023/8/23 查询设备信息，4个底部按钮查设备（按钮的作用就是前端用来调不同接口、用来区分中间即将展示的标识），前端弹窗选设备，在确定保存时前端根据底部按钮判断传入设备类型deviceType字典code
+    // TODO: 2023/8/23 接口：查受检设备（第1个按钮），查设备台账（后3个按钮同一接口），查询之后前端根据标志类型的不同加到中间页面时进行判断（按产品给的对应表）
+    // TODO: 2023/8/23 提供二维码接口，前端在加到中间页面时调用一下
+
+    @ApiOperation("设备二维码")
+    @PostMapping("/equipment/qrCode")
+    public ReturnDTO<String> equipmentQrCode(@RequestBody @Valid IdDTO idDTO) {
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return identifyInfoService.equipmentQrCode(idDTO.getId());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java
index 707be6e..7e0453d 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java
@@ -117,7 +117,7 @@
     }
 
     @ApiOperation("任务单导出")
-    @PostMapping("/export")
+    @PostMapping("/listExport")
     public void orderExport(@RequestBody @Valid OrderListRequest request, HttpServletResponse response) {
         businessOrderService.orderExport(request, response);
     }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java
index 529a6ce..51432be 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java
@@ -1,9 +1,28 @@
 package com.casic.missiles.controller.business;
 
+import com.casic.missiles.controller.GeneralApprovalController;
+import com.casic.missiles.dto.BaseApprovalSubmitRequest;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.business.outsource.OutsourceAssessApprovalListRequest;
+import com.casic.missiles.dto.business.outsource.OutsourceAssessSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
+import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.model.business.BizBusinessOutsourceAssess;
+import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
+import com.casic.missiles.service.IGeneralApprovalService;
+import com.casic.missiles.service.business.IBizBusinessOutsourceAssessService;
 import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.BindingResult;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.validation.Valid;
+import java.util.List;
+
 /**
  * <p>
  * 计量检定业务-分包管理-测试、校准或检定工作分包评审表 前端控制器
@@ -15,6 +34,27 @@
 @Api(tags = "分包管理-测试、校准或检定工作分包评审表")
 @RestController
 @RequestMapping("/business/outsource/assess")
-public class BizBusinessOutsourceAssessController {
+public class BizBusinessOutsourceAssessController extends GeneralApprovalController<BizBusinessOutsourceAssess, BizBusinessOutsourceAssess, OutsourceAssessApprovalListRequest, BaseApprovalSubmitRequest> {
+    @Autowired
+    private IBizBusinessOutsourceAssessService outsourceAssessService;
 
+    public BizBusinessOutsourceAssessController(IGeneralApprovalService<BizBusinessOutsourceAssess, BizBusinessOutsourceAssess, OutsourceAssessApprovalListRequest, BaseApprovalSubmitRequest> baseApprovalService) {
+        super(baseApprovalService);
+    }
+
+    @ApiOperation("草稿箱-保存")
+    @PostMapping("/save")
+    public ReturnDTO<OutsourceAssessSaveResponse> saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceAssess request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        return outsourceAssessService.saveOutsourceAssess(request);
+    }
+
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception {
+        List<BizBusinessOutsourceAssess> list = super.exportList(request);
+        super.exportExcel(BizBusinessOutsourceAssess.class, list, ExportEnum.OUTSOURCE_ASSESS.getSheetName());
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java
new file mode 100644
index 0000000..9adef18
--- /dev/null
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java
@@ -0,0 +1,60 @@
+package com.casic.missiles.controller.business;
+
+import com.casic.missiles.controller.GeneralApprovalController;
+import com.casic.missiles.dto.BaseApprovalSubmitRequest;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.business.outsource.OutsourceProtocolApprovalListRequest;
+import com.casic.missiles.dto.business.outsource.OutsourceProtocolSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
+import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.model.business.BizBusinessOutsourceProtocol;
+import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
+import com.casic.missiles.service.IGeneralApprovalService;
+import com.casic.missiles.service.business.IBizBusinessOutsourceProtocolService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.BindingResult;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.validation.Valid;
+import java.util.List;
+
+/**
+ * <p>
+ * 计量检定业务-分包管理-测试、校准或检定工作分包协议书 前端控制器
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-08-24
+ */
+@Api(tags = "分包管理-测试、校准或检定工作分包协议书")
+@RestController
+@RequestMapping("/business/outsource/protocol")
+public class BizBusinessOutsourceProtocolController extends GeneralApprovalController<BizBusinessOutsourceProtocol, BizBusinessOutsourceProtocol, OutsourceProtocolApprovalListRequest, BaseApprovalSubmitRequest> {
+    @Autowired
+    private IBizBusinessOutsourceProtocolService outsourceProtocolService;
+
+    public BizBusinessOutsourceProtocolController(IGeneralApprovalService<BizBusinessOutsourceProtocol, BizBusinessOutsourceProtocol, OutsourceProtocolApprovalListRequest, BaseApprovalSubmitRequest> baseApprovalService) {
+        super(baseApprovalService);
+    }
+
+    @ApiOperation("草稿箱-保存")
+    @PostMapping("/save")
+    public ReturnDTO<OutsourceProtocolSaveResponse> saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceProtocol request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        return outsourceProtocolService.saveOutsourceProtocol(request);
+    }
+
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody OutsourceProtocolApprovalListRequest request) throws Exception {
+        List<BizBusinessOutsourceProtocol> list = super.exportList(request);
+        super.exportExcel(BizBusinessOutsourceProtocol.class, list, ExportEnum.OUTSOURCE_PROTOCOL.getSheetName());
+    }
+}
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java
index 097f645..f0f0943 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java
@@ -17,7 +17,6 @@
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.IGeneralApprovalService;
 import com.casic.missiles.service.business.IBizBusinessOutsourcerInfoService;
-import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -71,19 +70,8 @@
 
     @ApiOperation("分包方导出")
     @PostMapping("/listExport")
-    public void export(@RequestBody @Valid OutsourcerInfoApprovalListRequest request, BindingResult bindingResult) throws Exception {
-        if (bindingResult.hasErrors()) {
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        }
-        List<BizBusinessOutsourcerInfo> list;
-        if (!CollectionUtils.isEmpty(request.getIds())) {
-            list = outsourcerInfoService.listByIds(request.getIds());
-        } else {
-            list = outsourcerInfoService.list(request);
-        }
-        for (BizBusinessOutsourcerInfo record : list) {
-            DictCodeUtils.convertDictCodeToName(record);
-        }
+    public void export(@RequestBody OutsourcerInfoApprovalListRequest request) throws Exception {
+        List<BizBusinessOutsourcerInfo> list = super.exportList(request);
         super.exportExcel(BizBusinessOutsourcerInfo.class, list, ExportEnum.OUTSOURCER_EXPORT.getSheetName());
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java
index c2cbf9f..0410918 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java
@@ -17,11 +17,9 @@
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.IGeneralApprovalService;
 import com.casic.missiles.service.business.IBizBusinessSiteExecutiveInfoService;
-import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -60,7 +58,7 @@
         return siteExecutiveInfoService.saveSiteExecutiveInfo(siteExecutiveInfo);
     }
 
-    @ApiOperation("现场检测详情")
+    @ApiOperation("详情")
     @PostMapping("/detail")
     public ReturnDTO<SiteExecutiveDetailResponse> siteExecutiveDetail(@RequestBody @Valid IdDTO idDTO) throws Exception {
         Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
@@ -69,21 +67,10 @@
         return ReturnUtil.success(siteExecutiveInfoService.detail(idDTO.getId()));
     }
 
-    @ApiOperation("现场检测导出")
+    @ApiOperation("导出")
     @PostMapping("/listExport")
-    public void export(@RequestBody @Valid SiteExecutiveApprovalListRequest request, BindingResult bindingResult) throws Exception {
-        if (bindingResult.hasErrors()) {
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        }
-        List<SiteExecutiveApprovalListResponse> list;
-        if (!CollectionUtils.isEmpty(request.getIds())) {
-            list = siteExecutiveInfoService.listInfoByIds(request.getIds());
-        } else {
-            list = siteExecutiveInfoService.listInfo(request);
-        }
-        for (SiteExecutiveApprovalListResponse record : list) {
-            DictCodeUtils.convertDictCodeToName(record);
-        }
+    public void export(@RequestBody SiteExecutiveApprovalListRequest request) throws Exception {
+        List<SiteExecutiveApprovalListResponse> list = super.exportList(request);
         super.exportExcel(SiteExecutiveApprovalListResponse.class, list, ExportEnum.SITE_EXECUTIVE_EXPORT.getSheetName());
     }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
index 7e793cd..a92e209 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
@@ -55,7 +55,7 @@
 
     @ApiOperation("设备收发列表导出")
     @PostMapping("/export")
-    public void exportList(@RequestBody @Valid SampleDispatchListRequest request) throws IOException {
+    public void exportList(@RequestBody SampleDispatchListRequest request) throws IOException {
         List<SampleDispatchListResponse> list;
         if (!CollectionUtils.isEmpty(request.getIds())) {
             list = dispatchService.listByIds(request.getIds());
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java
index cdc77fc..d120fd4 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java
@@ -7,6 +7,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.business.labExecutive.*;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.business.IBusinessLabExecutiveInfoService;
@@ -14,6 +15,7 @@
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.*;
 
@@ -32,7 +34,7 @@
     @Autowired
     private IBusinessLabExecutiveInfoService labExecutiveInfoService;
 
-    @ApiOperation("实验室检测-部门检测-查询各状态列表（待检测、检测中、检测完）")
+    @ApiOperation("实验室任务-查询各状态列表（待检测、检测中、检测完）")
     @PostMapping("/deptExecutive/List")
     public ReturnDTO<PageInfoBT<SampleLabExecutiveListResponse>> queryDeptExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
@@ -43,10 +45,19 @@
         return ReturnUtil.success(super.packForBT(labExecutiveInfoService.deptLabExecutiveListPage(page, labExecutiveListRequest)));
     }
 
-    /**
-     * 实验室检测-我的检测-查询各状态列表（待检测、检测中、检测完）
-     */
-    @ApiOperation("实验室检测-我的检测-查询各状态列表（待检测、检测中、检测完）")
+    @ApiOperation("实验室任务导出")
+    @PostMapping("/deptExecutive/export")
+    public void deptExportList(@RequestBody @Valid SampleLabExecutiveListRequest request) throws Exception {
+        List<SampleLabExecutiveListResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = labExecutiveInfoService.deptLabExecutiveListByIds(request.getMeasureStatus(), request.getIds());
+        } else {
+            list = labExecutiveInfoService.deptLabExecutiveList(request);
+        }
+        super.exportExcel(SampleLabExecutiveListResponse.class, list, ExportEnum.DEPT_EXECUTIVE_TASK.getSheetName());
+    }
+
+    @ApiOperation("我的任务-查询各状态列表（待检测、检测中、检测完）")
     @PostMapping("/myExecutive/list")
     public ReturnDTO<PageInfoBT<SampleLabExecutiveListResponse>> queryMyExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
@@ -57,19 +68,25 @@
         return ReturnUtil.success(super.packForBT(labExecutiveInfoService.myLabExecutiveListPage(page, labExecutiveListRequest)));
     }
 
-    /**
-     * 实验室检测-我的检测-查询各状态样品数量（待检测、检测中、检测完）
-     */
-    @ApiOperation("实验室检测-我的检测-查询各状态样品数量（待检测、检测中、检测完）")
+    @ApiOperation("我的任务导出")
+    @PostMapping("/myExecutive/export")
+    public void exportList(@RequestBody @Valid SampleLabExecutiveListRequest request) throws Exception {
+        List<SampleLabExecutiveListResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = labExecutiveInfoService.myLabExecutiveListByIds(request.getMeasureStatus(), request.getIds());
+        } else {
+            list = labExecutiveInfoService.myLabExecutiveList(request);
+        }
+        super.exportExcel(SampleLabExecutiveListResponse.class, list, ExportEnum.MY_EXECUTIVE_TASK.getSheetName());
+    }
+
+    @ApiOperation("我的任务-查询各状态样品数量（待检测、检测中、检测完）")
     @GetMapping("/myExecutive/amount")
     public ReturnDTO<List<SampleAmountResponse>> queryMyExecutiveAmount() {
         return ReturnUtil.success(labExecutiveInfoService.myExecutiveAmount());
     }
 
-    /**
-     * 实验室检测-部门检测-分配（分配给具体人员）
-     */
-    @ApiOperation("实验室检测-部门检测-分配按钮（分配给具体人员）")
+    @ApiOperation("实验室任务-分配按钮（分配给具体人员）")
     @PostMapping("/deptExecutive/allocate")
     public ReturnDTO allocateStaff(@RequestBody @Valid SampleAllocateRequest sampleAllocateRequest, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -78,10 +95,7 @@
         return labExecutiveInfoService.allocateStaff(sampleAllocateRequest);
     }
 
-    /**
-     * 实验室检测-我的检测-检定人扫描收入（待检测->检测中）
-     */
-    @ApiOperation("实验室检测-我的检测-检定人扫描收入（待检测->检测中）")
+    @ApiOperation("我的任务-检定人扫描收入（待检测->检测中）")
     @PostMapping("/myExecutive/receive")
     public ReturnDTO sampleReceive(@RequestBody @Valid List<SampleOperateRequest> requestList, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -90,10 +104,7 @@
         return labExecutiveInfoService.sampleReceive(requestList);
     }
 
-    /**
-     * 实验室检测-负责人/检定人扫描检完（检测中->检测完）
-     */
-    @ApiOperation("实验室检测-负责人/检定人扫描检完（检测中->检测完）")
+    @ApiOperation("实验室任务-负责人/检定人扫描检完（检测中->检测完）")
     @PostMapping("/myExecutive/complete")
     public ReturnDTO sampleExecutiveComplete(@RequestBody @Valid List<SampleOperateRequest> requestList, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -102,10 +113,7 @@
         return labExecutiveInfoService.sampleExecutiveComplete(requestList);
     }
 
-    /**
-     * 实验室检测-部门检测/我的检测 编辑（只能修改应出具证书）
-     */
-    @ApiOperation("实验室检测-部门检测/我的检测 编辑（只能修改应出具证书）")
+    @ApiOperation("实验室任务/我的任务 编辑（只能修改应出具证书）")
     @PostMapping("/executive/update")
     public ReturnDTO updateExecutive(@RequestBody @Valid UpdateExecutiveRequest request, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -114,10 +122,7 @@
         return labExecutiveInfoService.updateExecutive(request);
     }
 
-    /**
-     * 实验室检测-部门检测/我的检测 详情
-     */
-    @ApiOperation("实验室检测-部门检测/我的检测 详情")
+    @ApiOperation("实验室任务/我的任务 详情")
     @PostMapping("/executive/detail")
     public ReturnDTO<ExecutiveDetailResponse> executiveDetail(@RequestBody @Valid ExecutiveDetailRequest request, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
@@ -131,7 +136,7 @@
      * 退回后会将下一个要执行的实验室检测状态更新为待分配，将后面的实验室顺序变更为连续（都进行减1）
      * 最后一个检测的实验室退回，等分发员再增加实验室或设备收发中的已收入直接手动点击完成
      */
-    @ApiOperation("实验室检测-部门检测/我的检测 退回（待检测/检测中->退回）")
+    @ApiOperation("实验室任务/我的任务 退回（待检测/检测中->退回）")
     @PostMapping("/executive/sendBack")
     public ReturnDTO executiveSendBack(@RequestBody @Valid ExecutiveSendBackRequest request, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -140,9 +145,6 @@
         return labExecutiveInfoService.sampleExecutiveSendBack(request);
     }
 
-    /**
-     * 分发员编辑实验室检测列表
-     */
     @ApiOperation("分发员编辑实验室检测列表")
     @PostMapping("/handOut/updateList")
     public ReturnDTO updateExecutiveList(@RequestBody @Valid UpdateExecutiveListRequest request, BindingResult bindingResult) {
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java
index 48a67ed..0c04f31 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java
@@ -10,6 +10,7 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.resource.customer.CustomerApprovalListRequest;
 import com.casic.missiles.dto.resource.customer.CustomerSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceCustomerInfo;
@@ -26,6 +27,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -55,6 +57,13 @@
         return customerInfoService.saveCustomerInfo(request);
     }
 
+    @ApiOperation("委托方名录导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody CustomerApprovalListRequest request) throws Exception {
+        List<BizResourceCustomerInfo> list = super.exportList(request);
+        super.exportExcel(BizResourceCustomerInfo.class, list, ExportEnum.CUSTOMER_INFO.getSheetName());
+    }
+
     @ApiOperation("委托方人员列表（分页）")
     @PostMapping("/person/listPage")
     public ReturnDTO<PageInfoBT<BizResourceCustomerStaff>> personListPage(@RequestBody IdDTO idDto) {
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
index 972ed4b..6418ea5 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
@@ -5,6 +5,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.resource.customer.SuggestFormApprovalListRequest;
 import com.casic.missiles.dto.resource.customer.SuggestFormSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceCustomerSuggestForm;
@@ -20,6 +21,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -50,4 +52,11 @@
         return suggestFormService.saveSuggestForm(request);
     }
 
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody SuggestFormApprovalListRequest request) throws Exception {
+        List<BizResourceCustomerSuggestForm> list = super.exportList(request);
+        super.exportExcel(BizResourceCustomerSuggestForm.class, list, ExportEnum.CUSTOMER_SUGGEST_FORM.getSheetName());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java
index 1934d1a..9e07eab 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java
@@ -15,12 +15,16 @@
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.resource.IEnvEnvironmentRecordConfigService;
 import com.casic.missiles.service.resource.IEnvEnvironmentRecordDataService;
+import com.casic.missiles.service.resource.IEnvLocationInfoService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
 import java.util.List;
@@ -39,6 +43,8 @@
     private IEnvEnvironmentRecordDataService environmentRecordDataService;
     @Autowired
     private IEnvEnvironmentRecordConfigService environmentRecordConfigService;
+    @Autowired
+    private IEnvLocationInfoService locationInfoService;
 
     @ApiOperation("环境记录单数据列表/详情")
     @PostMapping("/data/listPage")
@@ -95,4 +101,11 @@
         });
         return environmentRecordConfigService.deleteEnvironmentRecordConfig(idDTO.getId());
     }
+
+    @ApiOperation("地点列表")
+    @PostMapping("/location/listPage")
+    public ReturnDTO<PageInfoBT<LocationListResponse>> locationListPage(@RequestBody @Valid LocationListRequest request) {
+        Page<LocationListResponse> page = PageFactory.defaultPage();
+        return ReturnUtil.success(super.packForBT(locationInfoService.listPage(page, request)));
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java
index 82efe3f..e9561fa 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java
@@ -10,6 +10,7 @@
 import com.casic.missiles.dto.resource.seal.SealLogListRequest;
 import com.casic.missiles.dto.resource.seal.SealNoteApprovalListRequest;
 import com.casic.missiles.dto.resource.seal.SealNoteSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceSealUseLog;
@@ -27,6 +28,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -58,6 +60,13 @@
         return sealUseNoteService.saveSeal(request);
     }
 
+    @ApiOperation("印章使用登记导出（列表和导出中去掉经办人和监印人）")
+    @PostMapping("/listExport")
+    public void export(@RequestBody SealNoteApprovalListRequest request) throws Exception {
+        List<BizResourceSealUseNote> list = super.exportList(request);
+        super.exportExcel(BizResourceSealUseNote.class, list, ExportEnum.SEAL_NOTE.getSheetName());
+    }
+
     // TODO: 2023/7/28 印章使用日志：系统中使用印章时插入数据库
 
     @ApiOperation("印章使用日志列表（分页）")
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java
index 9b674fc..06b6521 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java
@@ -9,16 +9,20 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.resource.staff.StaffCertRequest;
 import com.casic.missiles.dto.resource.staff.StaffCertResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.service.resource.IBizResourceStaffInfoService;
 import com.casic.missiles.service.resource.IBizResourceStaffVerifierService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.List;
+
 /**
  * @Description:
  * @Author: wangpeng
@@ -41,9 +45,21 @@
         return ReturnUtil.success(super.packForBT(responsePage));
     }
 
+    @ApiOperation("证书逾期提醒导出")
+    @PostMapping("/listExport")
+    public void exportList(@RequestBody StaffCertRequest request) throws Exception {
+        List<StaffCertResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = staffInfoService.certListByIds(request.getIds());
+        } else {
+            list = staffInfoService.certList(request);
+        }
+        super.exportExcel(StaffCertResponse.class, list, ExportEnum.STAFF_CERTIFICATE_EXPIRE.getSheetName());
+    }
+
     @ApiOperation("证书逾期提醒")
     @PostMapping("/expirationReminder")
-    public ReturnDTO expirationReminder(@RequestBody IdDTO idDto) {
-        return verifierService.expirationReminder(idDto);
+    public ReturnDTO expirationReminder(@RequestBody IdDTO idDTO) {
+        return verifierService.expirationReminder(idDTO);
     }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java
index 3b251ad..a6e7850 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java
@@ -12,6 +12,7 @@
 import com.casic.missiles.dto.resource.staff.StaffListRequest;
 import com.casic.missiles.dto.resource.staff.TrainListRequest;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.*;
@@ -22,7 +23,10 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
 import java.util.List;
@@ -52,8 +56,19 @@
             throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
         }
         Page<BizResourceStaffInfo> page = PageFactory.defaultPage();
-        Page<BizResourceStaffInfo> responsePage = staffInfoService.listPage(page, request);
-        return ReturnUtil.success(super.packForBT(responsePage));
+        return ReturnUtil.success(super.packForBT(staffInfoService.listPage(page, request)));
+    }
+
+    @ApiOperation("人员登记导出")
+    @PostMapping("/listExport")
+    public void exportList(@RequestBody StaffListRequest request) throws Exception {
+        List<BizResourceStaffInfo> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = staffInfoService.listByIds(request.getIds());
+        } else {
+            list = staffInfoService.list(request);
+        }
+        super.exportExcel(BizResourceStaffInfo.class, list, ExportEnum.STAFF_INFO.getSheetName());
     }
 
     @ApiOperation("人员登记详情基础信息")
@@ -85,9 +100,9 @@
 
     @ApiOperation("科研教育列表（分页）")
     @PostMapping("/education/listPage")
-    public ReturnDTO<PageInfoBT<BizResourceStaffEducation>> educationListPage(@RequestBody IdDTO idDto) {
+    public ReturnDTO<PageInfoBT<BizResourceStaffEducation>> educationListPage(@RequestBody IdDTO idDTO) {
         Page<BizResourceStaffEducation> page = PageFactory.defaultPage();
-        Page<BizResourceStaffEducation> responsePage = staffInfoService.educationListPage(page, idDto);
+        Page<BizResourceStaffEducation> responsePage = staffInfoService.educationListPage(page, idDTO);
         return ReturnUtil.success(super.packForBT(responsePage));
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java
index af6aa86..d85d84a 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java
@@ -9,6 +9,7 @@
 import com.casic.missiles.dto.resource.outsideService.SupplierApprovalListRequest;
 import com.casic.missiles.dto.resource.outsideService.SupplierSaveResponse;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceSupplierAbility;
@@ -67,6 +68,13 @@
         return ReturnUtil.success(supplierInfoService.detail(idDTO.getId()));
     }
 
+    @ApiOperation("合格供方导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody SupplierApprovalListRequest request) throws Exception {
+        List<BizResourceSupplierInfo> list = super.exportList(request);
+        super.exportExcel(BizResourceSupplierInfo.class, list, ExportEnum.SUPPLIER_INFO.getSheetName());
+    }
+
     @ApiOperation("供方人员列表（分页）")
     @PostMapping("/person/listPage")
     public ReturnDTO<PageInfoBT<BizResourceSupplierPerson>> personListPage(@RequestBody IdDTO idDTO) {
diff --git a/casic-metering-api/src/main/resources/config/application.yml b/casic-metering-api/src/main/resources/config/application.yml
index 350db5f..ecff521 100644
--- a/casic-metering-api/src/main/resources/config/application.yml
+++ b/casic-metering-api/src/main/resources/config/application.yml
@@ -126,7 +126,7 @@
     #作者
     author: wangpeng
     #待生成对象表名
-    table-name: biz_equipment_technical_target_approval,biz_equipment_attachment_approval,biz_equipment_checkpoint_approval
+    table-name: biz_business_outsource_protocol
 
 reminder:
   #节点--common模块config包 ReminderNodeConfig配置
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
index 4a19e4e..d47d552 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
@@ -53,6 +53,7 @@
     SUGGEST_FORM_SAVE_FAILED(2509, "委托方意见登记表保存至草稿箱失败"),
     EXAMINE_FORM_SAVE_FAILED(2510, "要求、委托书及合同评审表保存至草稿箱失败"),
     CUSTOMER_EXIST_SAVE_FAILED(2511, "该委托方已存在，请重新选择"),
+    DUPLICATE_LOCATION_NO(2512, "地点编号已存在"),
 
     /**
      * 计量检定业务模块
@@ -68,6 +69,8 @@
     COMPLETE_SAMPLE_NOT_EXIST(2609, "检测中不存在扫描收入的样品"),
     CANNOT_CHANGE_MEASURE_INFO(2610, "无法更改非当前登录用户的检测信息"),
     NON_EXIST_ORDER_OR_SAMPLE(2611, "不存在该委托单或该委托单下的样品"),
+    OUTSOURCE_ACCESS_SAVE_FAILED(2612, "测试、校准或检定工作分包评审表保存至草稿箱失败"),
+    OUTSOURCE_PROTOCOL_SAVE_FAILED(2613, "测试、校准或检定工作分包协议书保存至草稿箱失败"),
 
     /**
      * 历史遗留备用
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
index 5089ad1..81a406b 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
@@ -10,54 +10,38 @@
     /**
      * 资源管理
      */
-    ENVIRONMENT_DATA_EXPORT("environmentData", "environmentData", "环境记录单数据"),
+    ENVIRONMENT_DATA_EXPORT("environmentData", "环境记录单数据", "环境记录单数据"),
+    STAFF_INFO("staffInfo", "人员登记", "人员登记"),
+    STAFF_CERTIFICATE_EXPIRE("certificateExpire", "证书逾期提醒", "证书逾期提醒"),
+    SUPPLIER_INFO("supplierInfo", "合格供方名录", "合格供方名录"),
+    CUSTOMER_INFO("customerInfo", "委托方名录", "委托方名录"),
+    CUSTOMER_SUGGEST_FORM("customerSuggestForm", "委托方意见登记表", "委托方意见登记表"),
+    SEAL_NOTE("sealNote", "印章使用登记", "印章使用登记"),
 
-    FILE_EXPORT("meterFileData", "meterFileData", "计量文件信息"),
-    TRAIN_PLAN_EXPORT("trainPlanData", "trainPlanData", "培训计划"),
-    TRAIN_LOG_EXPORT("trainLogData", "trainLogData", "培训记录"),
-    METER_ORGANIZE_EXPORT("meterOrganizeData", "meterOrganizeData", "计量组织"),
-    TRACE_SUPPLIER_EXPORT("traceSupplierData", "traceSupplierData", "溯源供方"),
-    SIGN_EXPORT("signData", "signData", "签名/签章"),
-    TEMPLATE_EXPORT("templateData", "templateData", "原始记录模板/证书报告模板"),
-    FIXED_ASSETS("meterFixedAssets", "meterFixedAssets", "固定资产"),
-    METER_EQUIPMENT("meterEquipment", "meterEquipment", "测量设备"),
-    CALIBRATION_TEST_EQUIPMENT("calibrationTestEquipment", "calibrationTestEquipment", "校准检定设备"),
-    MEASURE_ACCOUNT("measureAccount", "measureAccount", "测量工装"),
-    STANDARD_SUPPORT_EQUIPMENT("standardSupportEquipment", "standardSupportEquipment", "标准配套设备"),
-    STANDARD_EQUIPMENT("standardEquipment", "standardEquipment", "标准装置"),
-    FLOW_DEF_EXPORT("flowDefData", "flowDefData", "流程定义"),
-    STAFF_CERTIFICATE("certificate", "certificate", "计量人员证书"),
-    CHECK_INFO("checkInfo", "checkInfo", "设备管理点检测"),
-    EQUIPMENT_APPLY("equipmentApply", "equipmentApply", "设备借用"),
-    STANDARD_EQUIPMENT_REMIND("equipmentApplyRemind", "equipmentApplyRemind", "标准装置到期提醒"),
-    METER_PRICE("meterPrice", "meterPrice", "价格库"),
-    METER_STAFF("meterStaff", "meterStaff", "计量人员"),
-    STANDARD_EQUIPMENT_APPLY("standardEquipmentApply", "standardEquipmentApply", "标准装置申请"),
-    STATE_MANAGE_APPLY("stateManage", "stateManage", "状态管理"),
-    METER_ACCEPTANCE_CHECK("acceptanceCheck", "acceptanceCheck", "设备检修保养验收单"),
-    CUSTOMER_EXPORT("customerData", "customerData", "客户信息"),
-    ORDER_EXPORT("orderData", "orderData", "委托书信息"),
-    SAMPLE_EXPORT("sampleData", "sampleData", "样本信息"),
-    EXCHANGE_DATA("exchangeData", "exchangeData", "设备交接单"),
-    DISPATCH_DATA("dispatchData", "dispatchData", "设备收发"),
-    ENVIRONMENT_DATA("environmentData", "environmentData", "环境记录单"),
-    ORIGIN_DATA("originData", "originData", "原始记录"),
-    CERTIFICATE_REPORT("certificateReport", "certificateReport", "证书报告"),
-    ADVICE_EXPORT("adviceData", "adviceData", "客户反馈"),
-    HANDOUT_EXPORT("handoutData", "handoutData", "任务分发列表"),
-    OUTSOURCER_EXPORT("outsourcerData", "outsourcerData", "分包方"),
-    SITE_EXECUTIVE_EXPORT("siteExecutiveData", "siteExecutiveData", "现场测试、校准或检定"),
-    CERTIFICATE_PRINT_EXPORT("certificatePrintData", "certificatePrintData", "证书打印"),
-    DOWNLOAD_TEMPLATE("downloadTemplate", "downloadTemplate", "页面配置"),
-    OUTSOURCER_CERTIFICATE_EXPORT("outsourceCertificateData", "outsourceCertificateData", "分包证书"),
-    SETTLEMENT_INFO_EXPORT("settlementInfoData", "settlementInfoData", "业务结算"),
-    EQUIPMENT_REMIND("equipmentRemind", "equipmentRemind", "设备到期提醒"),
-    AGREEMENT_INFO_EXPORT("agreementInfoData", "agreementInfoData", "合同"),
-    WORK_STATISTICS_EXPORT("workStatisticsData", "workStatisticsData", "实时工作统计"),
-    DEPT_OUTPUT_EXPORT("deptOutputData", "deptOutputData", "部门产值分析"),
-    WORKLOAD_EXPORT("workloadData", "workloadData", "业务工作量分析"),
-    DEPT_COMPREHENSIVE_EXPORT("deptComprehensiveData", "deptComprehensiveData", "部门综合分析"),
-    ENVIRONMENTAL_RECORD("environmentalRecordData", "environmentalRecordData", "现场环境记录");
+    /**
+     * 计量检定业务
+     */
+    OUTSOURCER_EXPORT("outsourcerData", "分包方名录", "分包方名录"),
+    IDENTIFY_EXPORT("identifyData", "计量标识", "计量标识"),
+    ORDER_EXPORT("orderData", "任务单", "任务单"),
+    DISPATCH_DATA("dispatchData", "设备收发", "设备收发"),
+    HANDOUT_EXPORT("handoutData", "任务分发", "任务分发"),
+    SITE_EXECUTIVE_EXPORT("siteExecutiveData", "现场测试、校准或检定", "现场测试、校准或检定"),
+    CERTIFICATE_REPORT("certificateReport", "证书审批", "证书审批"),
+    CERTIFICATE_CHANGE_APPLY("certificateChangeApply", "证书报告补充或更换申请单", "证书报告补充或更换申请单"),
+    CERTIFICATE_PRINT("certificatePrintData", "证书打印审批", "证书打印审批"),
+    DEPT_EXECUTIVE_TASK("deptExecutiveTaskData", "实验室任务", "实验室任务"),
+    MY_EXECUTIVE_TASK("myExecutiveTaskData", "我的任务", "我的任务"),
+    OUTSOURCE_ASSESS("outsourceAssess", "测试、校准或检定工作分包评审表", "测试、校准或检定工作分包评审表"),
+    OUTSOURCE_PROTOCOL("outsourceProtocol", "测试、校准或检定工作分包协议书", "测试、校准或检定工作分包协议书"),
+
+    /**
+     * 系统管理
+     */
+    SIGN_EXPORT("signData", "签名", "签名"),
+    TEMPLATE_EXPORT("templateData", "文件模板", "文件模板"),
+    FLOW_DEF_EXPORT("flowDefData", "流程定义", "流程定义"),
+    DOWNLOAD_TEMPLATE("downloadTemplate", "流程定义", "页面配置");
 
     ExportEnum(String fileName, String sheetName, String description) {
         this.fileName = fileName;
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateRecordTypeCodeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateRecordTypeCodeEnum.java
index 31d913c..a963522 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateRecordTypeCodeEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateRecordTypeCodeEnum.java
@@ -46,4 +46,14 @@
     String SITE_EXECUTIVE_APPROVAL = "01";
     //《现场测试、校准或检定工作记录表》
     String SITE_EXECUTIVE_LOG = "02";
+
+    //测试、校准或检定工作分包协议书
+    String OUTSOURCE_PROTOCOL = "01";
+    //测试、校准或检定工作分包评审表
+    String OUTSOURCE_ACCESS = "02";
+    //测试、校准或检定工作分包通知书
+    String OUTSOURCE_NOTICE = "03";
+    //测试、校准或检定工作分包方名录
+    String OUTSOURCE_INFO = "04";
+
 }
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
index 24b8635..f78bd53 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
@@ -15,6 +15,10 @@
     String CERTIFICATE_CHANGE_APPLY_BEAN_NAME = "certificateChangeApplyBean";
     //现场测试、校准或检定
     String SITE_EXECUTIVE_BEAN_NAME = "siteExecutiveBean";
+    //测试、校准或检定工作分包评审表
+    String OUTSOURCE_ASSESS_BEAN_NAME = "outsourceAssessBean";
+    //测试、校准或检定工作分包协议书
+    String OUTSOURCE_PROTOCOL_BEAN_NAME = "outsourceProtocolBean";
 
     /*********************************设备与装置************************************/
     //设备台账
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 b21c661..6b86fd1 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
@@ -18,6 +18,8 @@
     OUTSOURCER_APPROVAL(OUTSOURCER_BEAN_NAME, ""),
     CERTIFICATE_CHANGE_APPROVAL(CERTIFICATE_CHANGE_APPLY_BEAN_NAME, ""),
     SITE_EXECUTIVE_APPROVAL(SITE_EXECUTIVE_BEAN_NAME, ""),
+    OUTSOURCE_ASSESS_APPROVAL(OUTSOURCE_ASSESS_BEAN_NAME, ""),
+    OUTSOURCE_PROTOCOL_APPROVAL(OUTSOURCE_PROTOCOL_BEAN_NAME, ""),
 
     ACTION_STATUS_MAP(new HashMap<String, AwareActionStatusEnum>() {
         {
@@ -47,6 +49,10 @@
             put(ApplyFromIdEnum.CERTIFICATE_CHANGE_APPROVAL.getCode(), CERTIFICATE_CHANGE_APPROVAL);
             //现场测试、校准或检定审批
             put(ApplyFromIdEnum.SITE_EXECUTIVE_APPROVAL.getCode(), SITE_EXECUTIVE_APPROVAL);
+            //测试、校准或检定工作分包评审表
+            put(ApplyFromIdEnum.OUTSOURCE_ASSESS_APPROVAL.getCode(), OUTSOURCE_ASSESS_APPROVAL);
+            //测试、校准或检定工作分包协议书
+            put(ApplyFromIdEnum.OUTSOURCE_PROTOCOL_APPROVAL.getCode(), OUTSOURCE_PROTOCOL_APPROVAL);
         }
     });
     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 934405e..c7410bd 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
@@ -9,6 +9,8 @@
     CERTIFICATE_CHANGE_APPROVAL("jljdywzsbchghsqd", MessageSourceModuleEnum.BUSINESS.getCode(), "证书/报告补充或更换申请单"),
     OUTSOURCER_APPROVAL("jljdywcsjzhgfbfml", MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定合格分包方名录"),
     SITE_EXECUTIVE_APPROVAL("jljdywxccsjzsp", MessageSourceModuleEnum.BUSINESS.getCode(), "现场测试、校准或检定审批"),
+    OUTSOURCE_ASSESS_APPROVAL("jljdywcsjzfbpsb", MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包评审表"),
+    OUTSOURCE_PROTOCOL_APPROVAL("jljdywcsjzfbxys", MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包协议书"),
 
 
     /*******************************************设备与装置*********************************************/
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/GeneralApprovalMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/GeneralApprovalMapper.java
index 4fb7344..0c9d6ae 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/GeneralApprovalMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/GeneralApprovalMapper.java
@@ -17,8 +17,4 @@
 
     Page<O> selectBatchForApprovalList(Page<O> page, @Param("request") R request, @Param("businessKeys") List<String> businessKeys);
 
-//    Page<O> selectListPage(Page<O> page, @Param("request") R request);
-
-//    Long selectMaxNo();
-
 }
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceAssessMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceAssessMapper.java
index 7867bb8..ba59009 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceAssessMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceAssessMapper.java
@@ -1,7 +1,12 @@
 package com.casic.missiles.mapper.business;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.business.outsource.OutsourceAssessApprovalListRequest;
+import com.casic.missiles.mapper.GeneralApprovalMapper;
 import com.casic.missiles.model.business.BizBusinessOutsourceAssess;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * <p>
@@ -11,6 +16,10 @@
  * @author wangpeng
  * @since 2023-08-16
  */
-public interface BizBusinessOutsourceAssessMapper extends BaseMapper<BizBusinessOutsourceAssess> {
+public interface BizBusinessOutsourceAssessMapper extends GeneralApprovalMapper<BizBusinessOutsourceAssess, BizBusinessOutsourceAssess, OutsourceAssessApprovalListRequest> {
+
+    Page<BizBusinessOutsourceAssess> selectBatchForApprovalList(Page<BizBusinessOutsourceAssess> page, @Param("request") OutsourceAssessApprovalListRequest request, @Param("businessKeys") List<String> businessKeys);
+
+    Long selectMaxProjectNo();
 
 }
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceProtocolMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceProtocolMapper.java
new file mode 100644
index 0000000..e6aba35
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceProtocolMapper.java
@@ -0,0 +1,24 @@
+package com.casic.missiles.mapper.business;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.business.outsource.OutsourceProtocolApprovalListRequest;
+import com.casic.missiles.mapper.GeneralApprovalMapper;
+import com.casic.missiles.model.business.BizBusinessOutsourceProtocol;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 计量检定业务-分包管理-测试、校准或检定工作分包协议书 Mapper 接口
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-08-24
+ */
+public interface BizBusinessOutsourceProtocolMapper extends GeneralApprovalMapper<BizBusinessOutsourceProtocol, BizBusinessOutsourceProtocol, OutsourceProtocolApprovalListRequest> {
+
+    Page<BizBusinessOutsourceProtocol> selectBatchForApprovalList(Page<BizBusinessOutsourceProtocol> page, @Param("request") OutsourceProtocolApprovalListRequest request, @Param("businessKeys") List<String> businessKeys);
+
+    Long selectMaxProtocolNo();
+}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/EnvLocationInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/EnvLocationInfoMapper.java
new file mode 100644
index 0000000..49eff87
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/EnvLocationInfoMapper.java
@@ -0,0 +1,21 @@
+package com.casic.missiles.mapper.resource;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.resource.environment.LocationListRequest;
+import com.casic.missiles.dto.resource.environment.LocationListResponse;
+import com.casic.missiles.model.resource.EnvLocationInfo;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * <p>
+ * 实验室环境监控系统-设备表 Mapper 接口
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-06-07
+ */
+public interface EnvLocationInfoMapper extends BaseMapper<EnvLocationInfo> {
+
+    Page<LocationListResponse> selectLocationListPage(Page<LocationListResponse> page, @Param("request") LocationListRequest request);
+}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java
index de124db..85ed0f7 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java
@@ -1,7 +1,9 @@
 package com.casic.missiles.mapper.system;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.dto.system.SignDetailResponse;
+import com.casic.missiles.dto.system.SignListRequest;
 import com.casic.missiles.model.system.SystemSign;
 import org.apache.ibatis.annotations.Param;
 
@@ -22,4 +24,8 @@
     SignDetailResponse selectSignDetailById(Long id);
 
     List<SystemSign> selectUsableSignList(@Param("userId") Long userId);
+
+    Page<SystemSign> selectSignListPage(Page<SystemSign> page, @Param("request") SignListRequest request);
+
+    List<SystemSign> selectSignList(@Param("request") SignListRequest request);
 }
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateChangeApplyMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateChangeApplyMapper.xml
index d798447..c496092 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateChangeApplyMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateChangeApplyMapper.xml
@@ -30,31 +30,31 @@
         SELECT *
         FROM biz_business_certificate_change_apply
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.changeApplyNo != null and request.changeApplyNo !=''">
+        <if test="request != null and request.changeApplyNo != null and request.changeApplyNo !=''">
             and change_apply_no like concat('%',#{request.changeApplyNo},'%')
         </if>
-        <if test="request.changeReportNo != null and request.changeReportNo !=''">
+        <if test="request != null and request.changeReportNo != null and request.changeReportNo !=''">
             and change_report_no like concat('%',#{request.changeReportNo},'%')
         </if>
-        <if test="request.changeReportName != null and request.changeReportName !=''">
+        <if test="request != null and request.changeReportName != null and request.changeReportName !=''">
             and change_report_name like concat('%',#{request.changeReportName},'%')
         </if>
-        <if test="request.changeType != null and request.changeType !=''">
+        <if test="request != null and request.changeType != null and request.changeType !=''">
             and change_type = #{request.changeType}
         </if>
-        <if test="request.createUserName != null and request.createUserName !=''">
+        <if test="request != null and request.createUserName != null and request.createUserName !=''">
             and create_user_name like concat('%',#{request.createUserName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificatePrintMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificatePrintMapper.xml
index b66cd99..49c0ac8 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificatePrintMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificatePrintMapper.xml
@@ -31,34 +31,34 @@
         LEFT JOIN biz_business_order_sample_relation bosr ON (bosr.order_id = bcr.order_id AND bosr.sample_id = bcr.sample_id)
         LEFT JOIN biz_business_order_info boi ON boi.id = bosr.order_id
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and bcp.approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.printStatus != null and request.printStatus !=''">
+        <if test="request != null and request.printStatus != null and request.printStatus !=''">
             and print_status = #{request.printStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and bcp.create_user_id = #{request.createUserId}
         </if>
-        <if test="request.certificateReportNo != null and request.certificateReportNo !=''">
+        <if test="request != null and request.certificateReportNo != null and request.certificateReportNo !=''">
             and bcr.certificate_report_no like concat('%',#{request.certificateReportNo},'%')
         </if>
-        <if test="request.certificateReportName != null and request.certificateReportName !=''">
+        <if test="request != null and request.certificateReportName != null and request.certificateReportName !=''">
             and bcr.certificate_report_name like concat('%',#{request.certificateReportName},'%')
         </if>
-        <if test="request.customerName != null and request.customerName !=''">
+        <if test="request != null and request.customerName != null and request.customerName !=''">
             and boi.customer_name like concat('%',#{request.customerName},'%')
         </if>
-        <if test="request.sampleNo != null and request.sampleNo !=''">
+        <if test="request != null and request.sampleNo != null and request.sampleNo !=''">
             and bosr.sample_no like concat('%',#{request.sampleNo},'%')
         </if>
-        <if test="request.sampleName != null and request.sampleName !=''">
+        <if test="request != null and request.sampleName != null and request.sampleName !=''">
             and bosr.sample_name like concat('%',#{request.sampleName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and bcp.create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and bcp.create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml
index b366034..767695d 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml
@@ -46,33 +46,37 @@
         SELECT bcr.*, bosr.sample_no, bosr.sample_name, bosr.sample_model, rsi.staff_name
         FROM biz_business_certificate_report bcr
         LEFT JOIN biz_business_order_sample_relation bosr ON (bosr.order_id = bcr.order_id AND bosr.sample_id = bcr.sample_id)
+        LEFT JOIN biz_business_order_info boi ON boi.id = bcr.order_id
         LEFT JOIN biz_resource_staff_info rsi ON rsi.id = bcr.measure_person_id
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and bcr.approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and bcr.create_user_id = #{request.createUserId}
         </if>
-        <if test="request.certificateReportNo != null and request.certificateReportNo !=''">
+        <if test="request != null and request.customerId != null and request.customerId !=''">
+            and boi.customer_id = #{request.customerId}
+        </if>
+        <if test="request != null and request.certificateReportNo != null and request.certificateReportNo !=''">
             and bcr.certificate_report_no like concat('%',#{request.certificateReportNo},'%')
         </if>
-        <if test="request.certificateReportName != null and request.certificateReportName !=''">
+        <if test="request != null and request.certificateReportName != null and request.certificateReportName !=''">
             and bcr.certificate_report_name like concat('%',#{request.certificateReportName},'%')
         </if>
-        <if test="request.sampleNo != null and request.sampleNo !=''">
+        <if test="request != null and request.sampleNo != null and request.sampleNo !=''">
             and bosr.sample_no like concat('%',#{request.sampleNo},'%')
         </if>
-        <if test="request.measureCategory != null and request.measureCategory !=''">
+        <if test="request != null and request.measureCategory != null and request.measureCategory !=''">
             and bcr.measure_category = #{request.measureCategory}
         </if>
-        <if test="request.measurePerson != null and request.measurePerson !=''">
+        <if test="request != null and request.measurePerson != null and request.measurePerson !=''">
             and rsi.staff_name like concat('%',#{request.measurePerson},'%')
         </if>
-        <if test="request.calibrationTimeStart != null and request.calibrationTimeStart !=''">
+        <if test="request != null and request.calibrationTimeStart != null and request.calibrationTimeStart !=''">
             and bcr.calibration_time &gt;= #{request.calibrationTimeStart}
         </if>
-        <if test="request.calibrationTimeEnd != null and request.calibrationTimeEnd !=''">
+        <if test="request != null and request.calibrationTimeEnd != null and request.calibrationTimeEnd !=''">
             and bcr.calibration_time &lt;= #{request.calibrationTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceAssessMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceAssessMapper.xml
index d0fcf8b..c22c101 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceAssessMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceAssessMapper.xml
@@ -7,6 +7,8 @@
         <id column="id" property="id" />
         <result column="project_no" property="projectNo" />
         <result column="project_name" property="projectName" />
+        <result column="lab_code" property="labCode" />
+        <result column="group_code" property="groupCode" />
         <result column="applicant_id" property="applicantId" />
         <result column="applicant_name" property="applicantName" />
         <result column="applicant_time" property="applicantTime" />
@@ -31,7 +33,45 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, project_no, project_name, applicant_id, applicant_name, applicant_time, minio_file_name, remark, create_user_id, create_user_name, outsourcer_id, pre_start_time, pre_end_time, outsource_reason, pre_cost, approval_status, process_id, approve_situation, traceability, test_method, technique_ability, create_time, update_time
+        id, project_no, project_name, lab_code, group_code, applicant_id, applicant_name, applicant_time, minio_file_name, remark, create_user_id, create_user_name, outsourcer_id, pre_start_time, pre_end_time, outsource_reason, pre_cost, approval_status, process_id, approve_situation, traceability, test_method, technique_ability, create_time, update_time
     </sql>
 
+    <select id="selectMaxProjectNo" resultType="java.lang.Long">
+        SELECT IFNULL(max(RIGHT(project_no, 3)), 0) from biz_business_outsource_assess
+    </select>
+
+    <select id="selectBatchForApprovalList" resultMap="BaseResultMap">
+        SELECT bboa.*, bboi.outsourcer_name, bboi.director
+        FROM biz_business_outsource_assess bboa
+        LEFT JOIN biz_business_outsourcer_info bboi ON bboa.outsourcer_id = bboi.id
+        WHERE 1=1
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
+            and bboa.approval_status = #{request.approvalStatus}
+        </if>
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
+            and bboa.create_user_id = #{request.createUserId}
+        </if>
+        <if test="request != null and request.projectNo != null and request.projectNo !=''">
+            and bboa.project_no like concat('%',#{request.projectNo},'%')
+        </if>
+        <if test="request != null and request.outsourcerName != null and request.outsourcerName !=''">
+            and bboi.outsourcer_name like concat('%',#{request.outsourcerName},'%')
+        </if>
+        <if test="request != null and request.applicantName != null and request.applicantName !=''">
+            and bboa.applicant_name like concat('%',#{request.applicantName},'%')
+        </if>
+        <if test="request != null and request.applicantTimeStart != null and request.applicantTimeStart !=''">
+            and bboa.applicant_time &gt;= #{request.applicantTimeStart}
+        </if>
+        <if test="request != null and request.applicantTimeEnd != null and request.applicantTimeEnd !=''">
+            and bboa.applicant_time &lt;= #{request.applicantTimeEnd}
+        </if>
+        <if test="businessKeys != null">
+            and bboa.id in
+            <foreach collection="businessKeys" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
+        ORDER BY bboa.create_time DESC
+    </select>
 </mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceProtocolMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceProtocolMapper.xml
new file mode 100644
index 0000000..b7b2149
--- /dev/null
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceProtocolMapper.xml
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.mapper.business.BizBusinessOutsourceProtocolMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.business.BizBusinessOutsourceProtocol">
+        <id column="id" property="id" />
+        <result column="protocol_no" property="protocolNo" />
+        <result column="project_name" property="projectName" />
+        <result column="lab_code" property="labCode" />
+        <result column="group_code" property="groupCode" />
+        <result column="outsourcer_id" property="outsourcerId" />
+        <result column="remark" property="remark" />
+        <result column="outsource_no" property="outsourceNo" />
+        <result column="outsource_name" property="outsourceName" />
+        <result column="contacts" property="contacts" />
+        <result column="mobile" property="mobile" />
+        <result column="address" property="address" />
+        <result column="require_date" property="requireDate" />
+        <result column="outsource_cost" property="outsourceCost" />
+        <result column="director" property="director" />
+        <result column="item" property="item" />
+        <result column="requires" property="requires" />
+        <result column="create_user_id" property="createUserId" />
+        <result column="create_user_name" property="createUserName" />
+        <result column="approval_status" property="approvalStatus" />
+        <result column="process_id" property="processId" />
+        <result column="create_time" property="createTime" />
+        <result column="update_time" property="updateTime" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, protocol_no, project_name, lab_code, group_code, outsourcer_id, remark, outsource_no, outsource_name, contacts, mobile, address, require_date, outsource_cost, director, item, requires, create_user_id, create_user_name, approval_status, process_id, create_time, update_time
+    </sql>
+
+    <select id="selectMaxProtocolNo" resultType="java.lang.Long">
+        SELECT IFNULL(max(RIGHT(protocol_no, 3)), 0) from biz_business_outsource_protocol
+    </select>
+
+    <select id="selectBatchForApprovalList" resultMap="BaseResultMap">
+        SELECT *
+        FROM biz_business_outsource_protocol
+        WHERE 1=1
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
+            and approval_status = #{request.approvalStatus}
+        </if>
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
+            and create_user_id = #{request.createUserId}
+        </if>
+        <if test="request != null and request.protocolNo != null and request.protocolNo !=''">
+            and protocol_no like concat('%',#{request.protocolNo},'%')
+        </if>
+        <if test="request != null and request.outsourcerName != null and request.outsourcerName !=''">
+            and outsourcer_name like concat('%',#{request.outsourcerName},'%')
+        </if>
+        <if test="request != null and request.applicantName != null and request.applicantName !=''">
+            and create_user_name like concat('%',#{request.applicantName},'%')
+        </if>
+        <if test="request != null and request.applicantTimeStart != null and request.applicantTimeStart !=''">
+            and create_time &gt;= #{request.applicantTimeStart}
+        </if>
+        <if test="request != null and request.applicantTimeEnd != null and request.applicantTimeEnd !=''">
+            and create_time &lt;= #{request.applicantTimeEnd}
+        </if>
+        <if test="businessKeys != null">
+            and id in
+            <foreach collection="businessKeys" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
+        ORDER BY create_time DESC
+    </select>
+</mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourcerInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourcerInfoMapper.xml
index 510a80b..3049b54 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourcerInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourcerInfoMapper.xml
@@ -7,6 +7,8 @@
         <id column="id" property="id" />
         <result column="outsourcer_no" property="outsourcerNo" />
         <result column="outsourcer_name" property="outsourcerName" />
+        <result column="lab_code" property="labCode" />
+        <result column="group_code" property="groupCode" />
         <result column="outsourcer_brief_name" property="outsourcerBriefName" />
         <result column="outsourcer_size" property="outsourcerSize" />
         <result column="business_size" property="businessSize" />
@@ -55,32 +57,32 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, outsourcer_no, outsourcer_name, outsourcer_brief_name, outsourcer_size, business_size, grade, evaluation, tax_number, bank_account, bank_name, bank_account_number, postal_code, director, phone, fax, mobile, email, website, address_country, address_province, address_city, address_area, full_address, address_country_name, address_province_name, address_city_name, address_area_name, invoice_country, invoice_province, invoice_city, invoice_area, invoice_full_address, invoice_country_name, invoice_province_name, invoice_city_name, invoice_area_name, business_scope, business_content, minio_file_name, approval_status, process_id, remark, create_user_id, create_user_name, create_time, update_time
+        id, outsourcer_no, outsourcer_name, lab_code, group_code, outsourcer_brief_name, outsourcer_size, business_size, grade, evaluation, tax_number, bank_account, bank_name, bank_account_number, postal_code, director, phone, fax, mobile, email, website, address_country, address_province, address_city, address_area, full_address, address_country_name, address_province_name, address_city_name, address_area_name, invoice_country, invoice_province, invoice_city, invoice_area, invoice_full_address, invoice_country_name, invoice_province_name, invoice_city_name, invoice_area_name, business_scope, business_content, minio_file_name, approval_status, process_id, remark, create_user_id, create_user_name, create_time, update_time
     </sql>
 
     <select id="selectBatchForApprovalList" resultMap="BaseResultMap">
         SELECT *
         FROM biz_business_outsourcer_info
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.outsourcerNo != null and request.outsourcerNo !=''">
+        <if test="request != null and request.outsourcerNo != null and request.outsourcerNo !=''">
             and outsourcer_no like concat('%',#{request.outsourcerNo},'%')
         </if>
-        <if test="request.outsourcerName != null and request.outsourcerName !=''">
+        <if test="request != null and request.outsourcerName != null and request.outsourcerName !=''">
             and outsourcer_name like concat('%',#{request.outsourcerName},'%')
         </if>
-        <if test="request.director != null and request.director !=''">
+        <if test="request != null and request.director != null and request.director !=''">
             and director like concat('%',#{request.director},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
@@ -93,6 +95,6 @@
     </select>
 
     <select id="selectMaxNo" resultType="java.lang.Long">
-        SELECT IFNULL(max(RIGHT(outsourcer_no, 12)), 0) from biz_business_outsourcer_info
+        SELECT IFNULL(max(RIGHT(outsourcer_no, 3)), 0) from biz_business_outsourcer_info
     </select>
 </mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessSiteExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessSiteExecutiveInfoMapper.xml
index 135c5d0..3c5ae79 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessSiteExecutiveInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessSiteExecutiveInfoMapper.xml
@@ -38,25 +38,25 @@
         FROM biz_business_site_executive_info bsei
         LEFT JOIN biz_resource_customer_info rci ON bsei.customer_id = rci.id
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and bsei.approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and bsei.create_user_id = #{request.createUserId}
         </if>
-        <if test="request.siteExecutiveNo != null and request.siteExecutiveNo !=''">
+        <if test="request != null and request.siteExecutiveNo != null and request.siteExecutiveNo !=''">
             and bsei.site_executive_no like concat('%',#{request.siteExecutiveNo},'%')
         </if>
-        <if test="request.customerName != null and request.customerName !=''">
+        <if test="request != null and request.customerName != null and request.customerName !=''">
             and rci.outsourcer_name like concat('%',#{request.customerName},'%')
         </if>
-        <if test="request.applyName != null and request.applyName !=''">
+        <if test="request != null and request.applyName != null and request.applyName !=''">
             and bsei.apply_name like concat('%',#{request.applyName},'%')
         </if>
-        <if test="request.applyTimeStart != null and request.applyTimeStart !=''">
+        <if test="request != null and request.applyTimeStart != null and request.applyTimeStart !=''">
             and bsei.apply_time &gt;= #{request.applyTimeStart}
         </if>
-        <if test="request.applyTimeEnd != null and request.applyTimeEnd !=''">
+        <if test="request != null and request.applyTimeEnd != null and request.applyTimeEnd !=''">
             and bsei.apply_time &lt;= #{request.applyTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml
index 84d9e2a..6bd38a9 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml
@@ -105,6 +105,12 @@
         <if test="request.isUrgent != null and request.isUrgent !=''">
             AND bo.is_urgent = #{request.isUrgent}
         </if>
+        <if test="request.ids != null">
+            and blei.id in
+            <foreach collection="request.ids" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
         ORDER BY blei.update_time DESC
     </select>
 
@@ -137,6 +143,12 @@
         <if test="request.isUrgent != null and request.isUrgent !=''">
             AND bo.is_urgent = #{request.isUrgent}
         </if>
+        <if test="request.ids != null">
+            and blei.id in
+            <foreach collection="request.ids" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
         ORDER BY blei.update_time DESC
     </select>
 
diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardInfoMapper.xml
index 1a5551b..2ed8d17 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardInfoMapper.xml
@@ -45,12 +45,6 @@
         FROM biz_equipment_standard_info besi
         LEFT JOIN biz_equipment_standard_technology_relation bestr ON besi.standard_no = bestr.standard_no
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
-            and besi.approval_status = #{request.approvalStatus}
-        </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
-            and besi.create_user_id = #{request.createUserId}
-        </if>
         <if test="request.standardName != null and request.standardName !=''">
             and besi.standard_name like concat('%',#{request.standardName},'%')
         </if>
diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardTechnologyRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardTechnologyRelationMapper.xml
index fc7e16c..cd03c8c 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardTechnologyRelationMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardTechnologyRelationMapper.xml
@@ -6,6 +6,7 @@
     <resultMap id="BaseResultMap" type="com.casic.missiles.model.equipment.BizEquipmentStandardTechnologyRelation">
         <id column="id" property="id" />
         <result column="technology_file_id" property="technologyFileId" />
+        <result column="technology_file_no" property="technologyFileNo" />
         <result column="technology_file_name" property="technologyFileName" />
         <result column="standard_id" property="standardId" />
         <result column="standard_no" property="standardNo" />
@@ -14,7 +15,7 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, technology_file_id, technology_file_name, standard_id, remark
+        id, technology_file_id, technology_file_no, technology_file_name, standard_id, remark
     </sql>
 
 </mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceAuthorizeOrderMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceAuthorizeOrderMapper.xml
index ac5176c..554fe65 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceAuthorizeOrderMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceAuthorizeOrderMapper.xml
@@ -32,22 +32,22 @@
         SELECT *
         FROM biz_resource_authorize_order
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.orderNo != null and request.orderNo !=''">
+        <if test="request != null and request.orderNo != null and request.orderNo !=''">
             and order_no like concat('%',#{request.orderNo},'%')
         </if>
-        <if test="request.createUserName != null and request.createUserName !=''">
+        <if test="request != null and request.createUserName != null and request.createUserName !=''">
             and create_user_name like concat('%',#{request.createUserName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerExamineFormMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerExamineFormMapper.xml
index ab242f6..af7f98f 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerExamineFormMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerExamineFormMapper.xml
@@ -41,28 +41,28 @@
         SELECT *
         FROM biz_resource_customer_examine_form
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.formNo != null and request.formNo !=''">
+        <if test="request != null and request.formNo != null and request.formNo !=''">
             and form_no like concat('%',#{request.formNo},'%')
         </if>
-        <if test="request.labCode != null and request.labCode !=''">
+        <if test="request != null and request.labCode != null and request.labCode !=''">
             and lab_code like concat('%',#{request.labCode},'%')
         </if>
-        <if test="request.groupCode != null and request.groupCode !=''">
+        <if test="request != null and request.groupCode != null and request.groupCode !=''">
             and group_code like concat('%',#{request.groupCode},'%')
         </if>
-        <if test="request.createUserName != null and request.createUserName !=''">
+        <if test="request != null and request.createUserName != null and request.createUserName !=''">
             and create_user_name like concat('%',#{request.createUserName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerInfoMapper.xml
index fa8ffbc..06a2798 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerInfoMapper.xml
@@ -33,25 +33,25 @@
         SELECT *
         FROM biz_resource_customer_info
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.customerNo != null and request.customerNo !=''">
+        <if test="request != null and request.customerNo != null and request.customerNo !=''">
             and customer_no like concat('%',#{request.customerNo},'%')
         </if>
-        <if test="request.customerName != null and request.customerName !=''">
+        <if test="request != null and request.customerName != null and request.customerName !=''">
             and customer_name like concat('%',#{request.customerName},'%')
         </if>
-        <if test="request.contacts != null and request.contacts !=''">
+        <if test="request != null and request.contacts != null and request.contacts !=''">
             and contacts like concat('%',#{request.contacts},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerSuggestFormMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerSuggestFormMapper.xml
index 28f5bb2..1806662 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerSuggestFormMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerSuggestFormMapper.xml
@@ -33,28 +33,28 @@
         SELECT *
         FROM biz_resource_customer_suggest_form
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.formNo != null and request.formNo !=''">
+        <if test="request != null and request.formNo != null and request.formNo !=''">
             and form_no like concat('%',#{request.formNo},'%')
         </if>
-        <if test="request.customerName != null and request.customerName !=''">
+        <if test="request != null and request.customerName != null and request.customerName !=''">
             and customer_name like concat('%',#{request.customerName},'%')
         </if>
-        <if test="request.customerDeptName != null and request.customerDeptName !=''">
+        <if test="request != null and request.customerDeptName != null and request.customerDeptName !=''">
             and customer_dept_name like concat('%',#{request.customerDeptName},'%')
         </if>
-        <if test="request.createUserName != null and request.createUserName !=''">
+        <if test="request != null and request.createUserName != null and request.createUserName !=''">
             and create_user_name like concat('%',#{request.createUserName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSealUseNoteMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSealUseNoteMapper.xml
index ab37bc1..b02bb33 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSealUseNoteMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSealUseNoteMapper.xml
@@ -29,32 +29,32 @@
     </sql>
 
     <select id="selectBatchForApprovalList" resultMap="BaseResultMap">
-        SELECT *
+        SELECT brsun.*, brsi.seal_name, brsi.seal_type, brsi.approver_name
         FROM biz_resource_seal_use_note brsun
         JOIN biz_resource_seal_info brsi ON brsun.seal_id = brsi.id
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and brsun.approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and brsun.create_user_id = #{request.createUserId}
         </if>
-        <if test="request.sealName != null and request.sealName !=''">
+        <if test="request != null and request.sealName != null and request.sealName !=''">
             and brsi.seal_name like concat('%',#{request.sealName},'%')
         </if>
-        <if test="request.sealType != null and request.sealType !=''">
+        <if test="request != null and request.sealType != null and request.sealType !=''">
             and brsi.seal_type = #{request.sealType}
         </if>
-        <if test="request.applyDeptName != null and request.applyDeptName !=''">
+        <if test="request != null and request.applyDeptName != null and request.applyDeptName !=''">
             and brsun.apply_dept_name like concat('%',#{request.applyDeptName},'%')
         </if>
-        <if test="request.applyUserName != null and request.applyUserName !=''">
+        <if test="request != null and request.applyUserName != null and request.applyUserName !=''">
             and brsun.apply_user_name like concat('%',#{request.applyUserName},'%')
         </if>
-        <if test="request.applyTimeStart != null and request.applyTimeStart !=''">
+        <if test="request != null and request.applyTimeStart != null and request.applyTimeStart !=''">
             and brsun.apply_time &gt;= #{request.applyTimeStart}
         </if>
-        <if test="request.applyTimeEnd != null and request.applyTimeEnd !=''">
+        <if test="request != null and request.applyTimeEnd != null and request.applyTimeEnd !=''">
             and brsun.apply_time &lt;= #{request.applyTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml
index 119bf7d..4f8392a 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml
@@ -31,6 +31,12 @@
         <if test="request.deptName != null and request.deptName !=''">
             and brsi.dept_name like concat('%',#{request.deptName},'%')
         </if>
+        <if test="request.ids != null">
+            and brsv.id in
+            <foreach collection="request.ids" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
         ORDER BY brsv.grant_date DESC
     </select>
 
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSupplierInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSupplierInfoMapper.xml
index fe8d399..e8ce7ef 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSupplierInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSupplierInfoMapper.xml
@@ -48,28 +48,28 @@
         SELECT *
         FROM biz_resource_supplier_info
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.supplierNo != null and request.supplierNo !=''">
+        <if test="request != null and request.supplierNo != null and request.supplierNo !=''">
             and supplier_no like concat('%',#{request.supplierNo},'%')
         </if>
-        <if test="request.supplierName != null and request.supplierName !=''">
+        <if test="request != null and request.supplierName != null and request.supplierName !=''">
             and supplier_name like concat('%',#{request.supplierName},'%')
         </if>
-        <if test="request.director != null and request.director !=''">
+        <if test="request != null and request.director != null and request.director !=''">
             and director like concat('%',#{request.director},'%')
         </if>
-        <if test="request.supplierType != null and request.supplierType !=''">
+        <if test="request != null and request.supplierType != null and request.supplierType !=''">
             and supplier_type = #{request.supplierType}
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/EnvLocationInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/EnvLocationInfoMapper.xml
new file mode 100644
index 0000000..68bcf10
--- /dev/null
+++ b/casic-metering-dao/src/main/resources/mapper/resource/EnvLocationInfoMapper.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.mapper.resource.EnvLocationInfoMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.resource.EnvLocationInfo">
+        <id column="id" property="id" />
+        <result column="location_no" property="locationNo" />
+        <result column="location_name" property="locationName" />
+        <result column="location_position" property="locationPosition" />
+        <result column="create_user_id" property="createUserId" />
+        <result column="create_user" property="createUser" />
+        <result column="create_time" property="createTime" />
+        <result column="update_time" property="updateTime" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, location_no, location_name, location_position, create_user_id, create_user, create_time, update_time
+    </sql>
+
+    <select id="selectLocationListPage" resultType="com.casic.missiles.dto.resource.environment.LocationListResponse">
+        SELECT *
+        FROM env_location_info
+        WHERE 1=1
+        <if test="request.locationNo != null and request.locationNo !=''">
+            AND location_no LIKE concat('%',#{request.locationNo},'%')
+        </if>
+        <if test="request.locationName != null and request.locationName !=''">
+            AND location_name LIKE concat('%',#{request.locationName},'%')
+        </if>
+        ORDER BY create_time DESC
+    </select>
+
+</mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml
index b28c18f..8854047 100644
--- a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml
@@ -11,7 +11,6 @@
         <result column="sign_desc" property="signDesc" />
         <result column="sign_director" property="signDirector" />
         <result column="sign_user_id" property="signUserId" />
-        <result column="sign_type" property="signType" />
         <result column="minio_file_name" property="minioFileName" />
         <result column="create_time" property="createTime" />
         <result column="update_time" property="updateTime" />
@@ -28,7 +27,6 @@
         <result column="sign_name" property="signName" />
         <result column="sign_desc" property="signDesc" />
         <result column="sign_director" property="signDirector" />
-        <result column="sign_type" property="signType" />
         <result column="sign_user_id" property="signUserId" />
         <result column="minio_file_name" property="minioFileName" />
         <result column="create_time" property="createTime" />
@@ -62,4 +60,58 @@
         JOIN system_sign_user_relation ssur ON ss.id = ssur.sign_id
         WHERE ssur.user_id = #{userId}
     </select>
+
+    <select id="selectSignListPage" resultMap="BaseResultMap">
+        SELECT ss.*, sd.SIMPLE_NAME AS deptName
+        FROM system_sign ss
+        LEFT JOIN sys_user su ON su.id = ss.sign_user_id
+        LEFT JOIN sys_dept sd ON sd.id = su.dept_id
+        WHERE 1=1
+        <if test="request.signNo != null and request.signNo !=''">
+            AND ss.sign_no LIKE concat('%',#{request.signNo},'%')
+        </if>
+        <if test="request.signName != null and request.signName !=''">
+            AND ss.sign_name LIKE concat('%',#{request.signName},'%')
+        </if>
+        <if test="request.signDirector != null and request.signDirector !=''">
+            AND ss.sign_director LIKE concat('%',#{request.signDirector},'%')
+        </if>
+        <if test="request.signUserId != null and request.signUserId !=''">
+            AND ss.sign_user_id = #{request.signUserId}
+        </if>
+        <if test="request.createStartTime != null and request.createStartTime !=''">
+            AND DATE_FORMAT(ss.create_time,'%Y-%m-%d') &gt;= DATE_FORMAT(#{request.createStartTime},'%Y-%m-%d')
+        </if>
+        <if test="request.createEndTime != null and request.createEndTime !=''">
+            AND DATE_FORMAT(ss.create_time,'%Y-%m-%d')  &lt;= DATE_FORMAT(#{request.createEndTime},'%Y-%m-%d')
+        </if>
+        ORDER BY ss.create_time DESC
+    </select>
+
+    <select id="selectSignList" resultMap="BaseResultMap">
+        SELECT ss.*, sd.SIMPLE_NAME AS deptName
+        FROM system_sign ss
+        LEFT JOIN sys_user su ON su.id = ss.sign_user_id
+        LEFT JOIN sys_dept sd ON sd.id = su.dept_id
+        WHERE 1=1
+        <if test="request.signNo != null and request.signNo !=''">
+            AND ss.sign_no LIKE concat('%',#{request.signNo},'%')
+        </if>
+        <if test="request.signName != null and request.signName !=''">
+            AND ss.sign_name LIKE concat('%',#{request.signName},'%')
+        </if>
+        <if test="request.signDirector != null and request.signDirector !=''">
+            AND ss.sign_director LIKE concat('%',#{request.signDirector},'%')
+        </if>
+        <if test="request.signUserId != null and request.signUserId !=''">
+            AND ss.sign_user_id = #{request.signUserId}
+        </if>
+        <if test="request.createStartTime != null and request.createStartTime !=''">
+            AND DATE_FORMAT(ss.create_time,'%Y-%m-%d') &gt;= DATE_FORMAT(#{request.createStartTime},'%Y-%m-%d')
+        </if>
+        <if test="request.createEndTime != null and request.createEndTime !=''">
+            AND DATE_FORMAT(ss.create_time,'%Y-%m-%d')  &lt;= DATE_FORMAT(#{request.createEndTime},'%Y-%m-%d')
+        </if>
+        ORDER BY ss.create_time DESC
+    </select>
 </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 515050a..60f530b 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
@@ -47,8 +47,8 @@
     String STORAGE_LOCATION = "bizStorageLocation";
     //计量专业
     String MEASURE_MAJOR = "bizMeasureMajor";
-    //管理状态
-    String MANAGER_STATE = "bizManagerState";
+    //标准装置管理状态
+    String STANDARD_MANAGER_STATE = "bizStandardManagerState";
 
     /**
      * 资源管理 字典code
@@ -95,8 +95,6 @@
     String MEASURE_STATUS = "measureStatus";
     //检定方式
     String MEASURE_TYPE = "measureType";
-    //标识打印标志类型
-    String IDENTIFY_PRINT_TYPE = "bizBusinessIdentify";
     //变更类型
     String REPORT_CHANGE_TYPE = "bizCertChangeType";
     //规模类型
@@ -111,19 +109,24 @@
     String MEASURE_CATEGORY = "measureCategory";
     //检定结果
     String MEASURE_RESULT = "measureResult";
+    //分包原因
+    String OUTSOURCE_REASON = "outsourceReason";
+
+    /**
+     * 系统管理
+     */
+    String TEMPLATE_TYPE = "templateType";
+
 
     /**
      * 标准装置 字典code
      */
     //类别
     String STANDARD_CATEGORY = "standardCategory";
-    //管理状态
-    String STANDARD_MANAGER_STATE = "standardManagerState";
     //标准等级
     String STANDARD_LEVEL = "standardLevel";
     //传递范围
     String STANDARD_TRANSMIT_RANGE = "transmitRange";
-
     //资本来源
     String CAPITAL_SOURCE = "capitalSource";
     //标准装置-申请类型
@@ -148,8 +151,6 @@
     String CERTIFICATE_CLASS = "certificationClass";
     //证书管理-检校专业
     String CALIBRATION_MAJOR = "calibrationMajor";
-    //分包原因
-    String OUTSOURCE_REASON = "outsourceReason";
 
     /**
      * 工作台
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/BaseApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/BaseApprovalListRequest.java
index 73c12c1..80d7424 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/BaseApprovalListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/BaseApprovalListRequest.java
@@ -6,6 +6,7 @@
 
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotEmpty;
+import java.util.List;
 
 /**
  * @Description:
@@ -19,14 +20,14 @@
      * 表单id
      */
     @NotBlank(message = "表单id不能为空")
-    @ApiModelProperty(value = "表单id（流程定义对应的表单id，等价于业务id）", dataType = "String")
+    @ApiModelProperty(value = "表单id（流程定义对应的表单id，等价于业务id），导出接口不用传", dataType = "String")
     private String formId;
 
     /**
      * 审批状态类型，对应ApprovalStatusEnum
      */
     @NotEmpty(message = "审批状态类型不能为空")
-    @ApiModelProperty(value = "审批状态类型code", dataType = "String")
+    @ApiModelProperty(value = "审批状态类型code，导出接口不用传", dataType = "String")
     private String approvalStatus;
 
     @ApiModelProperty(hidden = true)
@@ -34,4 +35,7 @@
 
     @ApiModelProperty(hidden = true)
     private Long createUserId;
+
+    @ApiModelProperty(value = "导出ids", dataType = "List")
+    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificatePrintApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificatePrintApprovalListRequest.java
index b93d1c9..3cc2f4e 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificatePrintApprovalListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificatePrintApprovalListRequest.java
@@ -5,8 +5,6 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import java.util.List;
-
 /**
  * @Description:
  * @Author: wangpeng
@@ -38,7 +36,4 @@
 
     @ApiModelProperty(value = "创建结束时间", dataType = "String")
     private String createTimeEnd;
-
-    @ApiModelProperty(value = "导出ids", dataType = "List")
-    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportApprovalListRequest.java
index 4f7a038..c115847 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportApprovalListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportApprovalListRequest.java
@@ -5,8 +5,6 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import java.util.List;
-
 /**
  * @Description:
  * @Author: wangpeng
@@ -15,6 +13,8 @@
 @ApiModel
 @Data
 public class CertificateReportApprovalListRequest extends BaseApprovalListRequest {
+    @ApiModelProperty(value = "委托方id", dataType = "String")
+    private Long customerId;
 
     @ApiModelProperty(value = "证书报告编号", dataType = "String")
     private String certificateReportNo;
@@ -37,6 +37,4 @@
     @ApiModelProperty(value = "检校结束时间", dataType = "String")
     private String calibrationTimeEnd;
 
-    @ApiModelProperty(value = "导出ids", dataType = "List")
-    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/identify/IdentifyListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/identify/IdentifyListRequest.java
index 1b87ae6..f019203 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/identify/IdentifyListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/identify/IdentifyListRequest.java
@@ -4,6 +4,8 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * @Description:
  * @Author: wangpeng
@@ -26,4 +28,7 @@
 
     @ApiModelProperty(value = "打印结束时间", dataType = "String")
     private String createTimeEnd;
+
+    @ApiModelProperty(value = "导出ids", dataType = "List")
+    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListRequest.java
index 1264883..62415fb 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListRequest.java
@@ -7,6 +7,7 @@
 import lombok.Data;
 
 import javax.validation.constraints.NotBlank;
+import java.util.List;
 
 @Data
 @ApiModel
@@ -37,4 +38,6 @@
     @ApiModelProperty(value = "是否加急（1是0否null全部）", dataType = "Integer")
     private String isUrgent;
 
+    @ApiModelProperty(value = "导出ids", dataType = "List")
+    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListRequest.java
index 5201d7b..499760a 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListRequest.java
@@ -17,6 +17,9 @@
     @ApiModelProperty(value = "任务单编号", dataType = "String")
     private String orderNo;
 
+    @ApiModelProperty(value = "委托方id", dataType = "Long")
+    private Long customerId;
+
     @ApiModelProperty(value = "委托方名称", dataType = "String")
     private String customerName;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OrderSampleDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OrderSampleDTO.java
new file mode 100644
index 0000000..796edc0
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OrderSampleDTO.java
@@ -0,0 +1,19 @@
+package com.casic.missiles.dto.business.outsource;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/8/24 11:38
+ */
+@ApiModel
+@Data
+public class OrderSampleDTO {
+    @ApiModelProperty(value = "任务单id", dataType = "Long")
+    private Long orderId;
+    @ApiModelProperty(value = "受检设备id", dataType = "Long")
+    private Long sampleId;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceAssessApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceAssessApprovalListRequest.java
new file mode 100644
index 0000000..9a930c3
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceAssessApprovalListRequest.java
@@ -0,0 +1,30 @@
+package com.casic.missiles.dto.business.outsource;
+
+import com.casic.missiles.dto.BaseApprovalListRequest;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/8/24 11:01
+ */
+@ApiModel
+@Data
+public class OutsourceAssessApprovalListRequest extends BaseApprovalListRequest {
+    @ApiModelProperty(value = "评审表编号", dataType = "String")
+    private String projectNo;
+
+    @ApiModelProperty(value = "分包机构名称", dataType = "String")
+    private String outsourcerName;
+
+    @ApiModelProperty(value = "申请人", dataType = "String")
+    private String applicantName;
+
+    @ApiModelProperty(value = "申请时间开始", dataType = "String")
+    private String applicantTimeStart;
+
+    @ApiModelProperty(value = "申请时间结束", dataType = "String")
+    private String applicantTimeEnd;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceAssessSaveResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceAssessSaveResponse.java
new file mode 100644
index 0000000..8bf9aad
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceAssessSaveResponse.java
@@ -0,0 +1,20 @@
+package com.casic.missiles.dto.business.outsource;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/8/14 16:17
+ */
+@ApiModel
+@Data
+public class OutsourceAssessSaveResponse {
+    @ApiModelProperty(value = "主键id", dataType = "Long")
+    private Long id;
+
+    @ApiModelProperty(value = "编号", dataType = "String")
+    private String projectNo;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProtocolApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProtocolApprovalListRequest.java
new file mode 100644
index 0000000..0f32331
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProtocolApprovalListRequest.java
@@ -0,0 +1,30 @@
+package com.casic.missiles.dto.business.outsource;
+
+import com.casic.missiles.dto.BaseApprovalListRequest;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/8/24 15:01
+ */
+@ApiModel
+@Data
+public class OutsourceProtocolApprovalListRequest extends BaseApprovalListRequest {
+    @ApiModelProperty(value = "协议书编号", dataType = "String")
+    private String protocolNo;
+
+    @ApiModelProperty(value = "分包方名称", dataType = "String")
+    private String outsourcerName;
+
+    @ApiModelProperty(value = "申请人", dataType = "String")
+    private String applicantName;
+
+    @ApiModelProperty(value = "申请时间开始", dataType = "String")
+    private String applicantTimeStart;
+
+    @ApiModelProperty(value = "申请时间结束", dataType = "String")
+    private String applicantTimeEnd;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProtocolSaveResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProtocolSaveResponse.java
new file mode 100644
index 0000000..e324967
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProtocolSaveResponse.java
@@ -0,0 +1,20 @@
+package com.casic.missiles.dto.business.outsource;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/8/14 16:17
+ */
+@ApiModel
+@Data
+public class OutsourceProtocolSaveResponse {
+    @ApiModelProperty(value = "主键id", dataType = "Long")
+    private Long id;
+
+    @ApiModelProperty(value = "编号", dataType = "String")
+    private String protocolNo;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveApprovalListRequest.java
index f29f4e4..7047c28 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveApprovalListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveApprovalListRequest.java
@@ -5,8 +5,6 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import java.util.List;
-
 /**
  * @Description: 现场检测审批列表请求实体
  * @Author: wangpeng
@@ -30,7 +28,4 @@
     @ApiModelProperty(value = "申请时间结束", dataType = "String")
     private String applyTimeEnd;
 
-    @ApiModelProperty(value = "导出ids", dataType = "List")
-    private List<Long> ids;
-
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveDetailResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveDetailResponse.java
index 1f28752..394c934 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveDetailResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveDetailResponse.java
@@ -12,6 +12,18 @@
     @ApiModelProperty(value = "id，更新/删除使用参数", dataType = "Long")
     private Long id;
 
+    @ApiModelProperty(value = "实验室代码(字典code)", dataType = "String")
+    private String labCode;
+
+    @ApiModelProperty(value = "实验室代码(字典value)", dataType = "String")
+    private String labCodeName;
+
+    @ApiModelProperty(value = "组别代码(字典code)", dataType = "String")
+    private String groupCode;
+
+    @ApiModelProperty(value = "组别代码(字典value)", dataType = "String")
+    private String groupCodeName;
+
     @ApiModelProperty(value = "审批编号", dataType = "String")
     private String siteExecutiveNo;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/environment/LocationListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/environment/LocationListRequest.java
new file mode 100644
index 0000000..13d03c3
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/environment/LocationListRequest.java
@@ -0,0 +1,20 @@
+package com.casic.missiles.dto.resource.environment;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/6/8 13:56
+ */
+@ApiModel
+@Data
+public class LocationListRequest {
+    @ApiModelProperty(value = "地点编号", dataType = "String")
+    private String locationNo;
+
+    @ApiModelProperty(value = "地点名称", dataType = "String")
+    private String locationName;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/environment/LocationListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/environment/LocationListResponse.java
new file mode 100644
index 0000000..4c531af
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/environment/LocationListResponse.java
@@ -0,0 +1,78 @@
+package com.casic.missiles.dto.resource.environment;
+
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
+import com.baomidou.mybatisplus.annotation.TableField;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description: 地点列表响应实体
+ * @Author: wangpeng
+ * @Date: 2023/6/8 13:53
+ */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
+@ApiModel
+@Data
+public class LocationListResponse {
+    @ApiModelProperty(value = "主键id", dataType = "Long")
+    private Long id;
+
+    /**
+     * 地点编号
+     */
+    @ExcelProperty("地点编号")
+    @ApiModelProperty(value = "地点编号", dataType = "String")
+    private String locationNo;
+
+    /**
+     * 地点名称
+     */
+    @ExcelProperty("地点名称")
+    @ApiModelProperty(value = "地点名称", dataType = "String")
+    private String locationName;
+
+    /**
+     * 地点位置
+     */
+    @ExcelProperty("地点位置")
+    @ApiModelProperty(value = "地点位置", dataType = "String")
+    private String locationPosition;
+
+    /**
+     * 创建人id
+     */
+    @ApiModelProperty(value = "创建人id", dataType = "Long")
+    private Long createUserId;
+
+    /**
+     * 创建人
+     */
+    @ExcelProperty("创建人")
+    @ApiModelProperty(value = "创建人", dataType = "String")
+    @TableField("create_user")
+    private String createUser;
+
+    /**
+     * 创建时间
+     */
+    @ExcelProperty("创建时间")
+    @ApiModelProperty(value = "创建时间", dataType = "String")
+    private String createTime;
+
+    /**
+     * 更新时间
+     */
+    @ApiModelProperty(value = "更新时间", dataType = "String")
+    private String updateTime;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertRequest.java
index 9a7f6c6..c827915 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertRequest.java
@@ -4,6 +4,8 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * @Description:
  * @Author: wangpeng
@@ -16,4 +18,7 @@
     private String name;
     @ApiModelProperty(value = "部门名", dataType = "String")
     private String deptName;
+
+    @ApiModelProperty(value = "导出ids", dataType = "List")
+    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertResponse.java
index f78b159..8f2f79e 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertResponse.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.dto.resource.staff;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.casic.missiles.annotation.DictCodeField;
 import com.casic.missiles.constants.MeterDictCode;
 import io.swagger.annotations.ApiModel;
@@ -13,12 +20,18 @@
  * @Author: wangpeng
  * @Date: 2023/7/27 15:13
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @ApiModel
 @Data
 public class StaffCertResponse {
     /**
      * 人员编号
      */
+    @ExcelProperty(value = "人员编号",order = 0)
     @NotEmpty(message = "人员编号不能为空")
     @ApiModelProperty(value = "人员编号", dataType = "String")
     private String staffNo;
@@ -26,6 +39,7 @@
     /**
      * 姓名
      */
+    @ExcelProperty(value = "姓名",order = 1)
     @ApiModelProperty(value = "姓名", dataType = "String")
     private String staffName;
 
@@ -54,6 +68,7 @@
     /**
      * 部门名字
      */
+    @ExcelProperty(value = "工作部门",order = 2)
     @ApiModelProperty(value = "部门名字", dataType = "String")
     private String deptName;
 
@@ -66,6 +81,7 @@
     /**
      * 计量专业
      */
+    @ExcelProperty(value = "计量专业",order = 3)
     @ApiModelProperty(value = "计量专业", dataType = "String")
     private String major;
 
@@ -110,6 +126,7 @@
     /**
      * 证书号
      */
+    @ExcelProperty(value = "证号",order = 4)
     @ApiModelProperty(value = "证书号", dataType = "String")
     private String certNo;
 
@@ -122,12 +139,14 @@
     /**
      * 有效日期
      */
+    @ExcelProperty(value = "证书有效期",order = 6)
     @ApiModelProperty(value = "有效日期", dataType = "String")
     private String effectiveDate;
 
     /**
      * 发放日期
      */
+    @ExcelProperty(value = "发证日期",order = 5)
     @ApiModelProperty(value = "发放日期", dataType = "String")
     private String grantDate;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffListRequest.java
index 7c4afb3..0a1194a 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffListRequest.java
@@ -4,6 +4,8 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * @Description:
  * @Author: wangpeng
@@ -18,4 +20,7 @@
     private String deptName;
     @ApiModelProperty(value = "部门id", dataType = "Long")
     private Long deptId;
+
+    @ApiModelProperty(value = "导出ids", dataType = "List")
+    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/TrainListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/TrainListRequest.java
index f68597b..6321f8b 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/TrainListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/TrainListRequest.java
@@ -14,6 +14,8 @@
 public class TrainListRequest {
     @ApiModelProperty(value = "训练登记表编号", dataType = "String")
     private String trainNo;
+    @ApiModelProperty(value = "值班领导", dataType = "String")
+    private String dutyLeader;
     @ApiModelProperty(value = "创建开始时间", dataType = "String")
     private String createTimeStart;
     @ApiModelProperty(value = "创建结束时间", dataType = "String")
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/SignAddRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/SignAddRequest.java
index 117be34..d71055c 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/SignAddRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/SignAddRequest.java
@@ -43,13 +43,6 @@
     private Long signUserId;
 
     /**
-     * 签章或签名-字典code
-     */
-    @NotBlank(message = "类型不能为空")
-    @ApiModelProperty(value = "签名/签章-字典code", dataType = "String", required = true)
-    private String signType;
-
-    /**
      * minio存储文件名
      */
     @ApiModelProperty(value = "上传文件返回名称", dataType = "String")
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateAddRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateAddRequest.java
index aff1265..6316648 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateAddRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateAddRequest.java
@@ -17,30 +17,28 @@
 @Data
 public class TemplateAddRequest extends BaseSystemRequest {
     /**
-     * 原始记录模板/证书报告模板名称
+     * 模板名称
      */
     @ApiModelProperty(value = "名称", dataType = "String", required = true)
     @NotBlank(message = "名称不能为空")
     private String templateName;
 
     /**
-     * 原始记录模板/证书报告模板描述
+     * 模板描述
      */
     @ApiModelProperty(value = "描述", dataType = "String")
     private String templateDesc;
 
     /**
-     * 原始记录模板/证书报告模板创建人
+     * 创建人
      */
     @ApiModelProperty(value = "创建人", dataType = "String", required = true)
     @NotBlank(message = "创建人不能为空")
     private String templateCreator;
 
-    /**
-     * 原始记录模板/证书报告模板-字典code
-     */
-    @NotBlank(message = "类型不能为空")
-    @ApiModelProperty(value = "原始记录模板/证书报告模板-字典code", dataType = "String", required = true)
+
+    @NotBlank(message = "模板类型不能为空")
+    @ApiModelProperty(value = "模板类型(字典code)", dataType = "String", required = true)
     private String templateType;
 
     /**
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateListRequest.java
index eec5a1e..6d17bbe 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateListRequest.java
@@ -1,11 +1,12 @@
 package com.casic.missiles.dto.system;
 
+import com.casic.missiles.annotation.DictCodeField;
+import com.casic.missiles.constants.MeterDictCode;
 import com.casic.missiles.dto.BaseSystemRequest;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import javax.validation.constraints.NotBlank;
 import java.util.List;
 
 /**
@@ -19,8 +20,8 @@
     /**
      * 类型
      */
-//    @ApiModelProperty(value = "类型-字典code", dataType = "String", required = true)
-    @NotBlank(message = "类型不能为空")
+    @DictCodeField(message = "模板类型不合法", cacheName = MeterDictCode.TEMPLATE_TYPE)
+    @ApiModelProperty(value = "模板类型(字典code)", dataType = "String")
     private String templateType;
 
     /**
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificateChangeApply.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificateChangeApply.java
index 9216308..36923fd 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificateChangeApply.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificateChangeApply.java
@@ -1,11 +1,19 @@
 package com.casic.missiles.model.business;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 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 com.casic.missiles.dto.BaseRequest;
+import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -20,6 +28,12 @@
  * @author wangpeng
  * @since 2023-08-15
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
+@ApiModel
 @Data
 @TableName("biz_business_certificate_change_apply")
 public class BizBusinessCertificateChangeApply extends BaseRequest implements Serializable {
@@ -33,6 +47,7 @@
     /**
      * 申请单编号
      */
+    @ExcelProperty(value = "申请单编号", order = 1)
     @ApiModelProperty(value = "申请单编号", dataType = "String")
     @TableField("change_apply_no")
     private String changeApplyNo;
@@ -40,6 +55,7 @@
     /**
      * 申请单名字
      */
+    @ExcelProperty(value = "申请单名称", order = 2)
     @ApiModelProperty(value = "申请单名字", dataType = "String")
     @TableField("change_apply_name")
     private String changeApplyName;
@@ -54,6 +70,7 @@
     /**
      * 更换证书编号
      */
+    @ExcelProperty(value = "更换证书编号", order = 3)
     @ApiModelProperty(value = "更换证书编号", dataType = "String")
     @TableField("change_report_no")
     private String changeReportNo;
@@ -61,7 +78,8 @@
     /**
      * 更换证书名字
      */
-    @ApiModelProperty(value = "更换证书名字", dataType = "String")
+    @ExcelProperty(value = "更换证书/报告名称", order = 4)
+    @ApiModelProperty(value = "更换证书/报告名称", dataType = "String")
     @TableField("change_report_name")
     private String changeReportName;
 
@@ -73,6 +91,7 @@
     @TableField("change_type")
     private String changeType;
 
+    @ExcelProperty(value = "变更类型", order = 5)
     @ApiModelProperty(value = "变更类型(字典value)", dataType = "String")
     @TableField(exist = false)
     private String changeTypeName;
@@ -142,13 +161,15 @@
     /**
      * 创建用户名字
      */
-    @ApiModelProperty(value = "创建用户名字", dataType = "String")
+    @ExcelProperty(value = "创建人", order = 6)
+    @ApiModelProperty(value = "创建人名字", dataType = "String")
     @TableField("create_user_name")
     private String createUserName;
 
     /**
      * 创建时间
      */
+    @ExcelProperty(value = "创建时间", order = 7)
     @ApiModelProperty(value = "创建时间", dataType = "String")
     @TableField("create_time")
     private String createTime;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificateReport.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificateReport.java
index f01db9e..db06018 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificateReport.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificateReport.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.model.business;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -22,6 +29,11 @@
  * @author wangpeng
  * @since 2023-08-14
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @ApiModel
 @Data
 @TableName("biz_business_certificate_report")
@@ -36,6 +48,7 @@
     /**
      * 证书报告编号
      */
+    @ExcelProperty(value = "证书报告编号", order = 1)
     @ApiModelProperty(value = "证书报告编号", dataType = "String")
     @TableField("certificate_report_no")
     private String certificateReportNo;
@@ -43,6 +56,7 @@
     /**
      * 证书报告名称
      */
+    @ExcelProperty(value = "证书报告名称", order = 2)
     @ApiModelProperty(value = "证书报告名称", dataType = "String")
     @TableField("certificate_report_name")
     private String certificateReportName;
@@ -62,6 +76,7 @@
     @TableField("measure_category")
     private String measureCategory;
 
+    @ExcelProperty(value = "检校类别", order = 6)
     @ApiModelProperty(value = "检校类别(字典value)", dataType = "String")
     @TableField(exist = false)
     private String measureCategoryName;
@@ -69,6 +84,7 @@
     /**
      * 检校时间
      */
+    @ExcelProperty(value = "检校时间", order = 8)
     @ApiModelProperty(value = "检校时间", dataType = "String")
     @TableField("calibration_time")
     private String calibrationTime;
@@ -267,18 +283,22 @@
     @TableField(exist = false)
     private Integer decisionItem;
 
-    @ApiModelProperty(value = "设备样品编号（列表返回参数）", dataType = "String")
+    @ExcelProperty(value = "被检设备统一编号", order = 3)
+    @ApiModelProperty(value = "被检设备统一编号（列表返回参数）", dataType = "String")
     @TableField(exist = false)
     private String sampleNo;
 
-    @ApiModelProperty(value = "设备样品名称（列表返回参数）", dataType = "String")
+    @ExcelProperty(value = "被检设备名称", order = 4)
+    @ApiModelProperty(value = "被检设备名称（列表返回参数）", dataType = "String")
     @TableField(exist = false)
     private String sampleName;
 
-    @ApiModelProperty(value = "设备样品规格型号（列表返回参数）", dataType = "String")
+    @ExcelProperty(value = "规格型号", order = 5)
+    @ApiModelProperty(value = "规格型号（列表返回参数）", dataType = "String")
     @TableField(exist = false)
     private String sampleModel;
 
+    @ExcelProperty(value = "检定员", order = 7)
     @ApiModelProperty(value = "检定员名字（列表返回参数）", dataType = "String")
     @TableField(exist = false)
     private String staffName;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessIdentifyInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessIdentifyInfo.java
index 46bfba5..f1a9bec 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessIdentifyInfo.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessIdentifyInfo.java
@@ -1,10 +1,15 @@
 package com.casic.missiles.model.business;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 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;
 
@@ -20,6 +25,11 @@
  * @author wangpeng
  * @since 2023-08-15
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @Data
 @TableName("biz_business_identify_info")
 public class BizBusinessIdentifyInfo implements Serializable {
@@ -33,6 +43,7 @@
     /**
      * 记录编号
      */
+    @ExcelProperty(value = "记录编号", order = 1)
     @ApiModelProperty(value = "记录编号", dataType = "String")
     @TableField("record_no")
     private String recordNo;
@@ -41,20 +52,15 @@
      * 标志类型(字典code)
      */
     @NotEmpty(message = "标志类型不能为空")
-    @ApiModelProperty(value = "标志类型(字典code)", dataType = "String")
-    @DictCodeField(message = "标志类型不合法", cacheName = MeterDictCode.IDENTIFY_PRINT_TYPE)
+    @ApiModelProperty(value = "标志类型(直接存计量标识/使用状态/校准状态的字典value)", dataType = "String")
     @TableField("identify_type")
     private String identifyType;
 
-    @ApiModelProperty(value = "标志类型(字典value)", dataType = "String")
-    @TableField(exist = false)
-    private String identifyTypeName;
-
     /**
      * 设备id(可以是受检设备/设备台账)
      */
     @NotNull(message = "设备id不能为空")
-    @ApiModelProperty(value = "设备id(可以是受检设备/设备台账)", dataType = "String")
+    @ApiModelProperty(value = "设备id(可以是受检设备/设备台账)", dataType = "Long")
     @TableField("device_id")
     private Long deviceId;
 
@@ -66,29 +72,32 @@
     @TableField("device_type")
     private String deviceType;
 
+    @ExcelProperty(value = "统一编号", order = 3)
     @NotEmpty(message = "设备编号不能为空")
-    @ApiModelProperty(value = "设备编号", dataType = "String")
+    @ApiModelProperty(value = "统一编号", dataType = "String")
     @TableField("device_no")
     private String deviceNo;
 
     /**
      * 设备名字
      */
-    @NotEmpty(message = "设备名字不能为空")
-    @ApiModelProperty(value = "设备名字", dataType = "String")
+    @ExcelProperty(value = "设备名称", order = 4)
+    @NotEmpty(message = "设备名称不能为空")
+    @ApiModelProperty(value = "设备名称", dataType = "String")
     @TableField("device_name")
     private String deviceName;
 
     /**
      * 检定员id
      */
-    @ApiModelProperty(value = "检定员id", dataType = "String")
+    @ApiModelProperty(value = "检定员id", dataType = "Long")
     @TableField("measure_person_id")
     private Long measurePersonId;
 
     /**
      * 检定员名字
      */
+    @ExcelProperty(value = "检定员", order = 5)
     @ApiModelProperty(value = "检定员名字", dataType = "String")
     @TableField("measure_person")
     private String measurePerson;
@@ -103,7 +112,8 @@
     /**
      * 更新时间
      */
-    @ApiModelProperty(value = "更新时间", dataType = "String")
+    @ExcelProperty(value = "打印时间", order = 6)
+    @ApiModelProperty(value = "打印时间", dataType = "String")
     @TableField("update_time")
     private String updateTime;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceAssess.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceAssess.java
index 659d9ca..6720b90 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceAssess.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceAssess.java
@@ -1,11 +1,26 @@
 package com.casic.missiles.model.business;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 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 com.casic.missiles.dto.BaseRequest;
+import com.casic.missiles.dto.business.outsource.OrderSampleDTO;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import javax.validation.constraints.NotEmpty;
 import java.io.Serializable;
+import java.util.List;
 
 /**
  * <p>
@@ -15,146 +30,231 @@
  * @author wangpeng
  * @since 2023-08-16
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
+@ApiModel
 @Data
 @TableName("biz_business_outsource_assess")
-public class BizBusinessOutsourceAssess implements Serializable {
+public class BizBusinessOutsourceAssess extends BaseRequest implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
+    @ApiModelProperty(value = "id，更新/删除使用参数", dataType = "Long")
     @TableId("id")
     private Long id;
 
     /**
      * 评审表编号
      */
+    @ExcelProperty(value = "评审表编号", order = 1)
+    @ApiModelProperty(value = "评审表编号(后台生成)", dataType = "String")
     @TableField("project_no")
     private String projectNo;
 
     /**
      * 评审表名称
      */
+    @ExcelProperty(value = "评审表名称", order = 2)
+    @ApiModelProperty(value = "评审表名称", dataType = "String")
     @TableField("project_name")
     private String projectName;
 
+    @NotEmpty(message = "实验室代码不能为空")
+    @DictCodeField(message = "实验室代码描述不合法", cacheName = MeterDictCode.LAB_CODE)
+    @ApiModelProperty(value = "实验室代码(字典code)", dataType = "String")
+    @TableField("lab_code")
+    private String labCode;
+
+    @ApiModelProperty(value = "实验室代码(字典value)", dataType = "String")
+    @TableField(exist = false)
+    private String labCodeName;
+
+    /**
+     * 组别代码
+     */
+    @NotEmpty(message = "组别代码不能为空")
+    @DictCodeField(message = "组别代码描述不合法", cacheName = MeterDictCode.GROUP_CODE)
+    @ApiModelProperty(value = "组别代码(字典code)", dataType = "String")
+    @TableField("group_code")
+    private String groupCode;
+
+    @ApiModelProperty(value = "组别代码(字典value)", dataType = "String")
+    @TableField(exist = false)
+    private String groupCodeName;
+
     /**
      * 申请人id
      */
+    @ApiModelProperty(value = "申请人id", dataType = "String")
     @TableField("applicant_id")
     private Long applicantId;
 
     /**
      * 申请人名字
      */
+    @ExcelProperty(value = "申请人", order = 5)
+    @ApiModelProperty(value = "申请人", dataType = "String")
     @TableField("applicant_name")
     private String applicantName;
 
     /**
      * 申请时间
      */
+    @ExcelProperty(value = "申请时间", order = 6)
+    @ApiModelProperty(value = "申请时间", dataType = "String")
     @TableField("applicant_time")
     private String applicantTime;
 
     /**
      * 附件(minio存储文件名)
      */
+    @ApiModelProperty(value = "附件(minio存储文件名)", dataType = "String")
     @TableField("minio_file_name")
     private String minioFileName;
 
     /**
      * 备注
      */
+    @ApiModelProperty(value = "备注", dataType = "String")
     @TableField("remark")
     private String remark;
 
     /**
      * 创建人id
      */
+    @ApiModelProperty(value = "创建人id", dataType = "String")
     @TableField("create_user_id")
     private Long createUserId;
 
     /**
      * 创建人名字
      */
+    @ApiModelProperty(value = "创建人名字", dataType = "String")
     @TableField("create_user_name")
     private String createUserName;
 
     /**
      * 分包方id
      */
+    @ApiModelProperty(value = "评审表编号", dataType = "String")
     @TableField("outsourcer_id")
     private Long outsourcerId;
 
     /**
      * 预计开始时间
      */
+    @ApiModelProperty(value = "预计开始时间", dataType = "String")
     @TableField("pre_start_time")
     private String preStartTime;
 
     /**
      * 预计结束时间
      */
+    @ApiModelProperty(value = "预计结束时间", dataType = "String")
     @TableField("pre_end_time")
     private String preEndTime;
 
     /**
      * 分包原因-字典
      */
+    @ApiModelProperty(value = "分包原因(字典code)", dataType = "String")
+    @DictCodeField(message = "分包原因描述不合法", cacheName = MeterDictCode.OUTSOURCE_REASON)
     @TableField("outsource_reason")
     private String outsourceReason;
 
+    @ApiModelProperty(value = "分包原因(字典value)", dataType = "String")
+    @TableField(exist = false)
+    private String outsourceReasonName;
+
     /**
      * 预计费用
      */
+    @ApiModelProperty(value = "预计费用", dataType = "String")
     @TableField("pre_cost")
     private String preCost;
 
     /**
      * 审批状态
      */
+    @ApiModelProperty(value = "审批状态", dataType = "String")
+    @DictCodeField(message = "审批状态描述不合法", cacheName = MeterDictCode.APPROVAL_STATUS)
     @TableField("approval_status")
     private String approvalStatus;
 
     /**
      * 流程实例id
      */
+    @ApiModelProperty(value = "流程实例id", dataType = "String")
     @TableField("process_id")
     private String processId;
 
     /**
      * 实验室认可情况
      */
+    @ApiModelProperty(value = "实验室认可情况", dataType = "String")
     @TableField("approve_situation")
     private String approveSituation;
 
     /**
      * 溯源性
      */
+    @ApiModelProperty(value = "溯源性", dataType = "String")
     @TableField("traceability")
     private String traceability;
 
     /**
      * 测试方法
      */
+    @ApiModelProperty(value = "测试方法", dataType = "String")
     @TableField("test_method")
     private String testMethod;
 
     /**
      * 技术能力
      */
+    @ApiModelProperty(value = "技术能力", dataType = "String")
     @TableField("technique_ability")
     private String techniqueAbility;
 
     /**
      * 创建时间
      */
+    @ApiModelProperty(hidden = true)
     @TableField("create_time")
     private String createTime;
 
     /**
      * 更新时间
      */
+    @ApiModelProperty(hidden = true)
     @TableField("update_time")
     private String updateTime;
 
+    @ApiModelProperty(value = "审批状态类型-字典value", dataType = "String")
+    @TableField(exist = false)
+    private String approvalStatusName;
 
+    @ApiModelProperty(value = "任务id（同意、驳回等操作使用）", dataType = "String")
+    @TableField(exist = false)
+    private String taskId;
+
+    @ApiModelProperty(value = "可选决策项（1同意驳回拒绝 2同意驳回 3同意拒绝，用于待审批列表同意/驳回/拒绝按钮展示）", dataType = "Integer")
+    @TableField(exist = false)
+    private Integer decisionItem;
+
+    @NotEmpty(message = "受检设备信息不能为空")
+    @ApiModelProperty(value = "受检设备id列表（新建使用参数）", dataType = "List")
+    @TableField(exist = false)
+    private List<OrderSampleDTO> orderSampleList;
+
+    @ExcelProperty(value = "分包机构名称", order = 3)
+    @ApiModelProperty(value = "分包机构名称（列表返回参数）", dataType = "String")
+    private String outsourcerName;
+
+    @ExcelProperty(value = "机构负责人", order = 4)
+    @ApiModelProperty(value = "机构负责人（列表返回参数）", dataType = "String")
+    private String director;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceProtocol.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceProtocol.java
new file mode 100644
index 0000000..38df697
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceProtocol.java
@@ -0,0 +1,225 @@
+package com.casic.missiles.model.business;
+
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
+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 com.casic.missiles.dto.BaseRequest;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotEmpty;
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 计量检定业务-分包管理-测试、校准或检定工作分包协议书
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-08-24
+ */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
+@Data
+@TableName("biz_business_outsource_protocol")
+public class BizBusinessOutsourceProtocol extends BaseRequest implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "id，更新/删除使用参数", dataType = "Long")
+    @TableId("id")
+    private Long id;
+
+    /**
+     * 协议书编号
+     */
+    @ExcelProperty(value = "协议书编号", order = 1)
+    @ApiModelProperty(value = "协议书编号(后台生成)", dataType = "String")
+    @TableField("protocol_no")
+    private String protocolNo;
+
+    /**
+     * 协议书名称
+     */
+    @ExcelProperty(value = "协议书名称", order = 2)
+    @ApiModelProperty(value = "协议书名称", dataType = "String")
+    @TableField("project_name")
+    private String projectName;
+
+    @NotEmpty(message = "实验室代码不能为空")
+    @DictCodeField(message = "实验室代码描述不合法", cacheName = MeterDictCode.LAB_CODE)
+    @ApiModelProperty(value = "实验室代码(字典code)", dataType = "String")
+    @TableField("lab_code")
+    private String labCode;
+
+    @ApiModelProperty(value = "实验室代码(字典value)", dataType = "String")
+    @TableField(exist = false)
+    private String labCodeName;
+
+    @NotEmpty(message = "组别代码不能为空")
+    @DictCodeField(message = "组别代码描述不合法", cacheName = MeterDictCode.GROUP_CODE)
+    @ApiModelProperty(value = "组别代码(字典code)", dataType = "String")
+    @TableField("group_code")
+    private String groupCode;
+
+    @ApiModelProperty(value = "组别代码(字典value)", dataType = "String")
+    @TableField(exist = false)
+    private String groupCodeName;
+
+    /**
+     * 分包方id
+     */
+    @ApiModelProperty(value = "分包方id", dataType = "Long")
+    @TableField("outsourcer_id")
+    private Long outsourcerId;
+
+    /**
+     * 其他
+     */
+    @ApiModelProperty(value = "其他", dataType = "String")
+    @TableField("remark")
+    private String remark;
+
+    /**
+     * 分包方编号
+     */
+    @ApiModelProperty(value = "分包方编号(新建不用传)", dataType = "String")
+    @TableField("outsource_no")
+    private String outsourceNo;
+
+    /**
+     * 分包方名称
+     */
+    @ExcelProperty(value = "分包方名称", order = 3)
+    @ApiModelProperty(value = "分包方名称(新建不用传)", dataType = "String")
+    @TableField("outsource_name")
+    private String outsourceName;
+
+    /**
+     * 联系人
+     */
+    @ExcelProperty(value = "联系人", order = 4)
+    @ApiModelProperty(value = "联系人", dataType = "String")
+    @TableField("contacts")
+    private String contacts;
+
+    /**
+     * 电话
+     */
+    @ApiModelProperty(value = "电话", dataType = "String")
+    @TableField("mobile")
+    private String mobile;
+
+    /**
+     * 地址
+     */
+    @ApiModelProperty(value = "地址", dataType = "String")
+    @TableField("address")
+    private String address;
+
+    /**
+     * 要求完成日期
+     */
+    @ApiModelProperty(value = "要求完成日期", dataType = "String")
+    @TableField("require_date")
+    private String requireDate;
+
+    /**
+     * 分包费用(元)
+     */
+    @ApiModelProperty(value = "分包费用(元)", dataType = "String")
+    @TableField("outsource_cost")
+    private Double outsourceCost;
+
+    /**
+     * 分包方负责人
+     */
+    @ApiModelProperty(value = "分包方负责人", dataType = "String")
+    @TableField("director")
+    private String director;
+
+    /**
+     * 分包项目
+     */
+    @ApiModelProperty(value = "分包项目", dataType = "String")
+    @TableField("item")
+    private String item;
+
+    /**
+     * 分包要求
+     */
+    @ApiModelProperty(value = "分包要求", dataType = "String")
+    @TableField("requires")
+    private String requires;
+
+    /**
+     * 创建人id
+     */
+    @ApiModelProperty(hidden = true)
+    @TableField("create_user_id")
+    private Long createUserId;
+
+    /**
+     * 创建人名字
+     */
+    @ExcelProperty(value = "申请人", order = 5)
+    @ApiModelProperty(value = "申请人", dataType = "String")
+    @TableField("create_user_name")
+    private String createUserName;
+
+    /**
+     * 审批状态
+     */
+    @ApiModelProperty(value = "审批状态", dataType = "String")
+    @DictCodeField(message = "审批状态描述不合法", cacheName = MeterDictCode.APPROVAL_STATUS)
+    @TableField("approval_status")
+    private String approvalStatus;
+
+    /**
+     * 流程实例id
+     */
+    @ApiModelProperty(value = "流程实例id", dataType = "String")
+    @TableField("process_id")
+    private String processId;
+
+    /**
+     * 创建时间
+     */
+    @ExcelProperty(value = "申请时间", order = 6)
+    @ApiModelProperty(value = "申请时间", dataType = "String")
+    @TableField("create_time")
+    private String createTime;
+
+    /**
+     * 更新时间
+     */
+    @ApiModelProperty(hidden = true)
+    @TableField("update_time")
+    private String updateTime;
+
+    @ApiModelProperty(value = "审批状态类型-字典value", dataType = "String")
+    @TableField(exist = false)
+    private String approvalStatusName;
+
+    @ApiModelProperty(value = "任务id（同意、驳回等操作使用）", dataType = "String")
+    @TableField(exist = false)
+    private String taskId;
+
+    @ApiModelProperty(value = "可选决策项（1同意驳回拒绝 2同意驳回 3同意拒绝，用于待审批列表同意/驳回/拒绝按钮展示）", dataType = "Integer")
+    @TableField(exist = false)
+    private Integer decisionItem;
+
+
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourcerInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourcerInfo.java
index ec4e997..f9aa69e 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourcerInfo.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourcerInfo.java
@@ -17,6 +17,7 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import javax.validation.constraints.NotEmpty;
 import java.io.Serializable;
 
 /**
@@ -59,6 +60,29 @@
     @TableField("outsourcer_name")
     private String outsourcerName;
 
+    @NotEmpty(message = "实验室代码不能为空")
+    @DictCodeField(message = "实验室代码描述不合法", cacheName = MeterDictCode.LAB_CODE)
+    @ApiModelProperty(value = "实验室代码(字典code)", dataType = "String")
+    @TableField("lab_code")
+    private String labCode;
+
+    @ApiModelProperty(value = "实验室代码(字典value)", dataType = "String")
+    @TableField(exist = false)
+    private String labCodeName;
+
+    /**
+     * 组别代码
+     */
+    @NotEmpty(message = "组别代码不能为空")
+    @DictCodeField(message = "组别代码描述不合法", cacheName = MeterDictCode.GROUP_CODE)
+    @ApiModelProperty(value = "组别代码(字典code)", dataType = "String")
+    @TableField("group_code")
+    private String groupCode;
+
+    @ApiModelProperty(value = "组别代码(字典value)", dataType = "String")
+    @TableField(exist = false)
+    private String groupCodeName;
+
     /**
      * 单位简称
      */
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardInfo.java
index c48eed7..dffdfdd 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardInfo.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardInfo.java
@@ -5,6 +5,7 @@
 import com.baomidou.mybatisplus.annotation.TableName;
 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;
 
@@ -18,6 +19,7 @@
  * @author wangpeng
  * @since 2023-08-04
  */
+@ApiModel
 @Data
 @TableName("biz_equipment_standard_info")
 public class BizEquipmentStandardInfo implements Serializable {
@@ -119,7 +121,7 @@
      * 管理状态(字典code)
      */
     @ApiModelProperty(value = "管理状态(字典code)", dataType = "String")
-    @DictCodeField(message = "管理状态不合法", cacheName = MeterDictCode.MANAGER_STATE)
+    @DictCodeField(message = "管理状态不合法", cacheName = MeterDictCode.STANDARD_MANAGER_STATE)
     @TableField("manage_status")
     private String manageStatus;
 
@@ -151,7 +153,7 @@
     /**
      * 温度(℃)
      */
-    @ApiModelProperty(value = "使用状态(字典code)", dataType = "String")
+    @ApiModelProperty(value = "温度(℃)", dataType = "String")
     @TableField("temperature")
     private Double temperature;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardInfoApproval.java b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardInfoApproval.java
index dbd86ab..9f58d83 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardInfoApproval.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardInfoApproval.java
@@ -150,7 +150,7 @@
      * 管理状态(字典code)
      */
     @ApiModelProperty(value = "管理状态(字典code)", dataType = "String")
-    @DictCodeField(message = "管理状态不合法", cacheName = MeterDictCode.MANAGER_STATE)
+    @DictCodeField(message = "管理状态不合法", cacheName = MeterDictCode.STANDARD_MANAGER_STATE)
     @TableField("manage_status")
     private String manageStatus;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardTechnologyRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardTechnologyRelation.java
index 0e612bd..751f26b 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardTechnologyRelation.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardTechnologyRelation.java
@@ -3,6 +3,7 @@
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -16,6 +17,7 @@
  * @author wangpeng
  * @since 2023-08-04
  */
+@ApiModel
 @Data
 @TableName("biz_equipment_standard_technology_relation")
 public class BizEquipmentStandardTechnologyRelation implements Serializable {
@@ -33,6 +35,10 @@
     @TableField("technology_file_id")
     private Long technologyFileId;
 
+    @ApiModelProperty(value = "依据的技术文件编号", dataType = "String")
+    @TableField("technology_file_no")
+    private String technologyFileNo;
+
     /**
      * 依据的技术文件名称(技术文件中现行测试校准检定方法表文件名字段)
      */
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerInfo.java
index d6e8bed..65cd6bc 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerInfo.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerInfo.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.model.resource;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -21,6 +28,11 @@
  * @author wangpeng
  * @since 2023-08-08
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @ApiModel
 @Data
 @TableName("biz_resource_customer_info")
@@ -35,6 +47,7 @@
     /**
      * 委托方编号
      */
+    @ExcelProperty(value = "委托方编号", order = 1)
     @ApiModelProperty(value = "委托方编号", dataType = "String")
     @TableField("customer_no")
     private String customerNo;
@@ -42,6 +55,7 @@
     /**
      * 委托方名称
      */
+    @ExcelProperty(value = "委托方名称", order = 2)
     @ApiModelProperty(value = "委托方名称(新建时为下拉选择一个受检单位组织的名字，传deptId字段，后端获取名称)", dataType = "String")
     @TableField("customer_name")
     private String customerName;
@@ -63,6 +77,7 @@
     /**
      * 联系人
      */
+    @ExcelProperty(value = "联系人", order = 3)
     @ApiModelProperty(value = "联系人", dataType = "String")
     @TableField("contacts")
     private String contacts;
@@ -70,6 +85,7 @@
     /**
      * 座机电话
      */
+    @ExcelProperty(value = "座机电话", order = 4)
     @ApiModelProperty(value = "座机电话", dataType = "String")
     @TableField("mobile")
     private String mobile;
@@ -77,6 +93,7 @@
     /**
      * 手机号码
      */
+    @ExcelProperty(value = "手机号码", order = 5)
     @ApiModelProperty(value = "手机号码", dataType = "String")
     @TableField("phone")
     private String phone;
@@ -91,6 +108,7 @@
     /**
      * 地址
      */
+    @ExcelProperty(value = "地址", order = 6)
     @ApiModelProperty(value = "地址", dataType = "String")
     @TableField("address")
     private String address;
@@ -141,6 +159,7 @@
     /**
      * 创建时间
      */
+    @ExcelProperty(value = "创建时间", order = 7)
     @ApiModelProperty(value = "创建时间", dataType = "String")
     @TableField("create_time")
     private String createTime;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerSuggestForm.java b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerSuggestForm.java
index 7201bbd..701bf8b 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerSuggestForm.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerSuggestForm.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.model.resource;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -22,6 +29,11 @@
  * @author wangpeng
  * @since 2023-08-08
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @ApiModel
 @Data
 @TableName("biz_resource_customer_suggest_form")
@@ -44,7 +56,8 @@
     /**
      * 委托方名称
      */
-    @ApiModelProperty(value = "委托方名称", dataType = "String")
+    @ExcelProperty(value = "意见反馈单位", order = 2)
+    @ApiModelProperty(value = "意见反馈单位", dataType = "String")
     @TableField("customer_name")
     private String customerName;
 
@@ -59,7 +72,8 @@
     /**
      * 委托方意见反馈部门名称
      */
-    @ApiModelProperty(value = "委托方意见反馈部门名称", dataType = "String")
+    @ExcelProperty(value = "委托方意见反馈部门", order = 3)
+    @ApiModelProperty(value = "委托方意见反馈部门", dataType = "String")
     @TableField("customer_dept_name")
     private String customerDeptName;
 
@@ -73,6 +87,7 @@
     /**
      * 表单编号
      */
+    @ExcelProperty(value = "表单编号", order = 1)
     @ApiModelProperty(value = "表单编号", dataType = "String")
     @TableField("form_no")
     private String formNo;
@@ -111,6 +126,7 @@
     /**
      * 创建人名字
      */
+    @ExcelProperty(value = "创建人", order = 4)
     @ApiModelProperty(value = "创建人名字", dataType = "String")
     @TableField("create_user_name")
     private String createUserName;
@@ -147,6 +163,7 @@
     /**
      * 创建时间
      */
+    @ExcelProperty(value = "创建时间", order = 5)
     @ApiModelProperty(value = "创建时间", dataType = "String")
     @TableField("create_time")
     private String createTime;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSealInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSealInfo.java
index cbf05d7..9bf389d 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSealInfo.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSealInfo.java
@@ -106,6 +106,10 @@
     @TableField("minio_file_name")
     private String minioFileName;
 
+    @ApiModelProperty(value = "minio存储文件url", dataType = "String")
+    @TableField(exist = false)
+    private String minioFileUrl;
+
     @ApiModelProperty(value = "创建时间", dataType = "String")
     @TableField("create_time")
     private String createTime;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSealUseNote.java b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSealUseNote.java
index 3f2d9e8..3ce16a8 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSealUseNote.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSealUseNote.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.model.resource;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -20,6 +27,11 @@
  * @author wangpeng
  * @since 2023-07-28
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @ApiModel
 @Data
 @TableName("biz_resource_seal_use_note")
@@ -34,6 +46,7 @@
     /**
      * 登记表编号
      */
+    @ExcelProperty(value = "申请单编号", order = 1)
     @ApiModelProperty(value = "登记表编号(自动生成)", dataType = "String")
     @TableField("note_form_no")
     private String noteFormNo;
@@ -55,6 +68,7 @@
     /**
      * 申请部门
      */
+    @ExcelProperty(value = "申请部门", order = 5)
     @ApiModelProperty(value = "申请部门", dataType = "String")
     @TableField("apply_dept_name")
     private String applyDeptName;
@@ -69,6 +83,7 @@
     /**
      * 申请人
      */
+    @ExcelProperty(value = "申请人", order = 6)
     @ApiModelProperty(value = "申请人", dataType = "String")
     @TableField("apply_user_name")
     private String applyUserName;
@@ -76,6 +91,7 @@
     /**
      * 申请时间
      */
+    @ExcelProperty(value = "申请时间", order = 7)
     @ApiModelProperty(value = "申请时间(新增自动获取当前时间)", dataType = "String")
     @TableField("apply_time")
     private String applyTime;
@@ -130,6 +146,26 @@
     @TableField("update_time")
     private String updateTime;
 
+    @ExcelProperty(value = "印章名称", order = 2)
+    @ApiModelProperty(value = "印章名称(列表返回参数)", dataType = "String")
+    @TableField(exist = false)
+    private String sealName;
+
+    @DictCodeField(message = "印章类型描述不合法", cacheName = MeterDictCode.SEAL_TYPE)
+    @ApiModelProperty(hidden = true)
+    @TableField(exist = false)
+    private String sealType;
+
+    @ExcelProperty(value = "印章类型", order = 3)
+    @ApiModelProperty(value = "印章类型(列表返回参数)", dataType = "String")
+    @TableField(exist = false)
+    private String sealTypeName;
+
+    @ExcelProperty(value = "批准人", order = 4)
+    @ApiModelProperty(value = "批准人(列表返回参数)", dataType = "String")
+    @TableField(exist = false)
+    private String approverName;
+
     @ApiModelProperty(value = "审批状态类型-字典value", dataType = "String")
     @TableField(exist = false)
     private String approvalStatusName;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceStaffInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceStaffInfo.java
index 5ef995b..41563a1 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceStaffInfo.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceStaffInfo.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.model.resource;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -20,6 +27,11 @@
  * @author wangpeng
  * @since 2023-07-25
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @ApiModel
 @Data
 @TableName("biz_resource_staff_info")
@@ -38,6 +50,7 @@
     /**
      * 人员编号
      */
+    @ExcelProperty(value = "人员编号",order = 0)
     @NotEmpty(message = "人员编号不能为空")
     @ApiModelProperty(value = "人员编号", dataType = "String")
     @TableField("staff_no")
@@ -46,6 +59,7 @@
     /**
      * 姓名
      */
+    @ExcelProperty(value = "姓名",order = 1)
     @ApiModelProperty(value = "姓名", dataType = "String")
     @TableField("staff_name")
     private String staffName;
@@ -152,13 +166,15 @@
     /**
      * 部门名字
      */
-    @ApiModelProperty(value = "部门名字", dataType = "String")
+    @ExcelProperty(value = "工作部门",order = 4)
+    @ApiModelProperty(value = "工作部门", dataType = "String")
     @TableField("dept_name")
     private String deptName;
 
     /**
      * 岗位
      */
+    @ExcelProperty(value = "岗位",order = 2)
     @ApiModelProperty(value = "岗位", dataType = "String")
     @TableField("station")
     private String station;
@@ -166,6 +182,7 @@
     /**
      * 计量专业
      */
+    @ExcelProperty(value = "计量专业",order = 5)
     @ApiModelProperty(value = "计量专业", dataType = "String")
     @TableField("major")
     private String major;
@@ -173,6 +190,7 @@
     /**
      * 证号
      */
+    @ExcelProperty(value = "证号",order = 3)
     @ApiModelProperty(value = "证号", dataType = "String")
     @TableField("certificate_number")
     private String certificateNumber;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSupplierInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSupplierInfo.java
index eb5ef01..a1e2697 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSupplierInfo.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSupplierInfo.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.model.resource;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -20,6 +27,11 @@
  * @author wangpeng
  * @since 2023-07-27
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @ApiModel
 @Data
 @TableName("biz_resource_supplier_info")
@@ -34,6 +46,7 @@
     /**
      * 供方编号
      */
+    @ExcelProperty(value = "供方编号", order = 1)
     @ApiModelProperty(value = "供方编号(自动生成)", dataType = "String")
     @TableField("supplier_no")
     private String supplierNo;
@@ -41,6 +54,7 @@
     /**
      * 供方名称
      */
+    @ExcelProperty(value = "供方名称", order = 2)
     @ApiModelProperty(value = "供方名称", dataType = "String")
     @TableField("supplier_name")
     private String supplierName;
@@ -60,6 +74,7 @@
     @TableField("supplier_type")
     private String supplierType;
 
+    @ExcelProperty(value = "供方类型", order = 3)
     @ApiModelProperty(value = "供方类型(字典value)", dataType = "String")
     @TableField(exist = false)
     private String supplierTypeName;
@@ -109,7 +124,8 @@
     /**
      * 电话
      */
-    @ApiModelProperty(value = "电话", dataType = "String")
+    @ExcelProperty(value = "联系电话", order = 4)
+    @ApiModelProperty(value = "联系电话", dataType = "String")
     @TableField("phone")
     private String phone;
 
@@ -158,6 +174,7 @@
     /**
      * 公司地址-省
      */
+    @ExcelProperty(value = "地址-省", order = 6)
     @ApiModelProperty(value = "公司地址-省", dataType = "String")
     @TableField("company_province_name")
     private String companyProvinceName;
@@ -172,6 +189,7 @@
     /**
      * 公司地址-市
      */
+    @ExcelProperty(value = "地址-市", order = 7)
     @ApiModelProperty(value = "公司地址-市", dataType = "String")
     @TableField("company_city_name")
     private String companyCityName;
@@ -186,6 +204,7 @@
     /**
      * 公司地址-区
      */
+    @ExcelProperty(value = "地址-区", order = 8)
     @ApiModelProperty(value = "公司地址-区", dataType = "String")
     @TableField("company_area_name")
     private String companyAreaName;
@@ -193,6 +212,7 @@
     /**
      * 公司地址-详细地址
      */
+    @ExcelProperty(value = "地址-详细地址", order = 9)
     @ApiModelProperty(value = "公司地址-详细地址", dataType = "String")
     @TableField("company_address")
     private String companyAddress;
@@ -200,6 +220,7 @@
     /**
      * 服务和供应的内容
      */
+    @ExcelProperty(value = "服务和供应的内容", order = 5)
     @ApiModelProperty(value = "服务和供应的内容", dataType = "String")
     @TableField("supplier_content")
     private String supplierContent;
@@ -250,6 +271,7 @@
     /**
      * 创建时间
      */
+    @ExcelProperty(value = "创建时间", order = 9)
     @ApiModelProperty(value = "创建时间", dataType = "String")
     @TableField("create_time")
     private String createTime;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/EnvLocationInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/EnvLocationInfo.java
new file mode 100644
index 0000000..d8e2d7b
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/EnvLocationInfo.java
@@ -0,0 +1,83 @@
+package com.casic.missiles.model.resource;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotEmpty;
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 实验室环境监控系统-设备表
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-06-07
+ */
+@ApiModel
+@Data
+@TableName("env_location_info")
+public class EnvLocationInfo implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "主键id", dataType = "Long")
+    @TableId("id")
+    private Long id;
+
+    /**
+     * 地点编号
+     */
+    @NotEmpty(message = "地点编号不能为空")
+    @ApiModelProperty(value = "地点编号", dataType = "String")
+    @TableField("location_no")
+    private String locationNo;
+
+    /**
+     * 地点名称
+     */
+    @ApiModelProperty(value = "地点名称", dataType = "String")
+    @TableField("location_name")
+    private String locationName;
+
+    /**
+     * 地点位置
+     */
+    @ApiModelProperty(value = "地点位置", dataType = "String")
+    @TableField("location_position")
+    private String locationPosition;
+
+    /**
+     * 创建人id
+     */
+    @ApiModelProperty(value = "创建人id", dataType = "Long")
+    @TableField("create_user_id")
+    private Long createUserId;
+
+    /**
+     * 创建人
+     */
+    @ApiModelProperty(value = "创建人", dataType = "String")
+    @TableField("create_user")
+    private String createUser;
+
+    /**
+     * 创建时间
+     */
+    @ApiModelProperty(value = "创建时间", dataType = "String")
+    @TableField("create_time")
+    private String createTime;
+
+    /**
+     * 更新时间
+     */
+    @ApiModelProperty(value = "更新时间", dataType = "String")
+    @TableField("update_time")
+    private String updateTime;
+
+
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemFileConfig.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemFileConfig.java
index 19e6845..86e569c 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemFileConfig.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemFileConfig.java
@@ -30,7 +30,7 @@
     @ApiModelProperty(value = "系统类别(1业务系统2受检系统3环境系统)", dataType = "Integer")
     @NotNull(message = "系统类别不能为空")
     @TableField("system_type")
-    private Integer systemType;
+    private Integer systemType = 1;
 
     @ApiModelProperty("下载编号")
     @TableField("download_no")
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemNotice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemNotice.java
index e94297d..06ec37d 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemNotice.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemNotice.java
@@ -34,7 +34,7 @@
     @ApiModelProperty(value = "系统类别(1业务系统2受检系统3环境系统)", dataType = "Integer")
     @NotNull(message = "系统类别不能为空")
     @TableField("system_type")
-    private Integer systemType;
+    private Integer systemType = 1;
 
     /**
      * 通知公告编号
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSign.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSign.java
index 6c0d7c9..954f4f8 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSign.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSign.java
@@ -51,7 +51,7 @@
     @ApiModelProperty(value = "系统类别(1业务系统2受检系统3环境系统)", dataType = "Integer")
     @NotNull(message = "系统类别不能为空")
     @TableField("system_type")
-    private Integer systemType;
+    private Integer systemType = 1;
 
     /**
      * 签名编号
@@ -130,4 +130,8 @@
     @TableField(exist = false)
     private List<Long> userIdList;
 
+    @ApiModelProperty(hidden = true)
+    @TableField(exist = false)
+    private String deptName;
+
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemTemplate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemTemplate.java
index 503a457..1d27ebe 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemTemplate.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemTemplate.java
@@ -47,7 +47,7 @@
     @ApiModelProperty(value = "系统类别(1业务系统2受检系统3环境系统)", dataType = "Integer")
     @NotNull(message = "系统类别不能为空")
     @TableField("system_type")
-    private Integer systemType;
+    private Integer systemType = 1;
 
     /**
      * 模板编号
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java
index 8c21cb0..f61e4a8 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java
@@ -32,4 +32,8 @@
     ReturnDTO approvalDelete(ApprovalDeleteRequest request);
 
     ReturnDTO failUpdate(T request);
+
+    List<O> listExport(R request);
+
+    List<O> listExportByIds(List<Long> ids);
 }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java
index 724166f..9bce15b 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java
@@ -157,6 +157,29 @@
         throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
     }
 
+    @Override
+    public List<O> listExport(R request) {
+        request.setCreateUserId(null);
+        request.setApprovalStatus(ApprovalStatusEnum.PASSED);
+        Page<O> page = PageFactory.defaultPage();
+        page.setCurrent(1);
+        page.setSearchCount(false);
+        page.setSize(Integer.MAX_VALUE);
+        Page<O> resultPage = this.baseMapper.selectBatchForApprovalList(page, request, null);
+        return resultPage.getRecords();
+    }
+
+    @Override
+    public List<O> listExportByIds(List<Long> ids) {
+        Page<O> page = PageFactory.defaultPage();
+        page.setCurrent(1);
+        page.setSearchCount(false);
+        page.setSize(Integer.MAX_VALUE);
+        List<String> businessKeys = ids.stream().map(String::valueOf).collect(Collectors.toList());
+        Page<O> resultPage = this.baseMapper.selectBatchForApprovalList(page, null, businessKeys);
+        return resultPage.getRecords();
+    }
+
     protected ReturnDTO updateApprovalStatus(Long id, String processId, String approvalStatus) {
         UpdateWrapper<T> updateWrapper = new UpdateWrapper<>();
         updateWrapper.eq("id", id);
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificatePrintServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificatePrintServiceImpl.java
index f6e4706..3228497 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificatePrintServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificatePrintServiceImpl.java
@@ -162,6 +162,30 @@
         return ReturnUtil.success(printLogMapper.selectList(wrapper));
     }
 
+    @Override
+    public List<CertificatePrintListResponse> listByIds(List<Long> ids) {
+        Page<CertificatePrintListResponse> page = PageFactory.defaultPage();
+        page.setCurrent(1);
+        page.setSearchCount(false);
+        page.setSize(Integer.MAX_VALUE);
+        List<String> businessKeys = ids.stream().map(String::valueOf).collect(Collectors.toList());
+        Page<CertificatePrintListResponse> resultPage = this.baseMapper.selectBatchForApprovalList(page, null, businessKeys);
+        return resultPage.getRecords();
+    }
+
+    @Override
+    public List<CertificatePrintListResponse> list(CertificatePrintApprovalListRequest request) {
+        request.setCreateUserId(null);
+        request.setApprovalStatus(null);
+        request.setPrintStatus(null);
+        Page<CertificatePrintListResponse> page = PageFactory.defaultPage();
+        page.setCurrent(1);
+        page.setSearchCount(false);
+        page.setSize(Integer.MAX_VALUE);
+        Page<CertificatePrintListResponse> resultPage = certificatePrintMapper.selectBatchForApprovalList(page, request, null);
+        return resultPage.getRecords();
+    }
+
     private void savePrintLog(Long id) {
         BizBusinessCertificatePrintLog printLog = new BizBusinessCertificatePrintLog();
         BizBusinessCertificatePrint certificatePrint = certificatePrintMapper.selectById(id);
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificateReportServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificateReportServiceImpl.java
index 457555f..24146be 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificateReportServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificateReportServiceImpl.java
@@ -158,8 +158,8 @@
         QueryWrapper<BizBusinessCertificateMeasureResultData> mWrapper = new QueryWrapper<>();
         mWrapper.eq("report_id", reportId);
         boolean mRemove = certificateMeasureResultDataService.remove(mWrapper);
-        Assert.isFalse(eRemove || mRemove, () -> {
+        if(!eRemove || !mRemove){
             throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
-        });
+        }
     }
 }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessIdentifyInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessIdentifyInfoServiceImpl.java
index 4c8e190..f7e63ca 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessIdentifyInfoServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessIdentifyInfoServiceImpl.java
@@ -1,8 +1,10 @@
 package com.casic.missiles.service.Impl.business;
 
+import cn.hutool.core.date.DateUtil;
 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.core.page.PageFactory;
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.business.identify.IdentifyListRequest;
@@ -14,11 +16,14 @@
 import com.casic.missiles.service.business.IBizBusinessIdentifyInfoService;
 import com.casic.missiles.utils.DictCodeUtils;
 import com.casic.missiles.utils.NumberGeneratorUtil;
+import com.casic.missiles.utils.QRCodeUtil;
 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.List;
+
 /**
  * <p>
  * 计量检定业务-任务计量管理-标识打印 服务实现类
@@ -35,9 +40,9 @@
     @Override
     public Page<BizBusinessIdentifyInfo> identifyListPage(Page<BizBusinessIdentifyInfo> page, IdentifyListRequest request) throws Exception {
         QueryWrapper<BizBusinessIdentifyInfo> wrapper = new QueryWrapper<>();
-        wrapper.eq("identify_type", request.getIdentifyType());
-        wrapper.like("device_no", request.getDeviceNo());
-        wrapper.like("device_name", request.getDeviceName());
+        wrapper.eq(StringUtils.isNotEmpty(request.getIdentifyType()), "identify_type", request.getIdentifyType());
+        wrapper.like(StringUtils.isNotEmpty(request.getDeviceNo()),"device_no", request.getDeviceNo());
+        wrapper.like(StringUtils.isNotEmpty(request.getDeviceName()), "device_name", request.getDeviceName());
         wrapper.apply(StringUtils.isNotBlank(request.getCreateTimeStart()),
                 "{0} <= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getCreateTimeStart().split(" ")[0]);
         wrapper.apply(StringUtils.isNotBlank(request.getCreateTimeEnd()),
@@ -64,8 +69,11 @@
     }
 
     @Override
-    public ReturnDTO updateIdentify(BizBusinessIdentifyInfo identifyInfo) {
-        if(identifyInfoMapper.updateById(identifyInfo) > 0){
+    public ReturnDTO updateIdentify(Long id) {
+        BizBusinessIdentifyInfo info = new BizBusinessIdentifyInfo();
+        info.setId(id);
+        info.setUpdateTime(DateUtil.now());
+        if(identifyInfoMapper.updateById(info) > 0){
             return ReturnUtil.success();
         }
         throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
@@ -79,4 +87,20 @@
         throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
     }
 
+    @Override
+    public List<BizBusinessIdentifyInfo> list(IdentifyListRequest request) throws Exception {
+        Page<BizBusinessIdentifyInfo> page = PageFactory.defaultPage();
+        page.setCurrent(1);
+        page.setSearchCount(false);
+        page.setSize(Integer.MAX_VALUE);
+        Page<BizBusinessIdentifyInfo> resultPage = this.identifyListPage(page, request);
+        return resultPage.getRecords();
+    }
+
+    @Override
+    public ReturnDTO<String> equipmentQrCode(Long id) {
+        String base64QRCode = QRCodeUtil.getBase64QRCode(String.valueOf(id));
+        return ReturnUtil.success(base64QRCode);
+    }
+
 }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOrderInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOrderInfoServiceImpl.java
index 82952ad..d8d2c6a 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOrderInfoServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOrderInfoServiceImpl.java
@@ -35,6 +35,7 @@
 import javax.servlet.http.HttpServletResponse;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 import java.util.stream.Collectors;
 
 /**
@@ -209,13 +210,16 @@
     private QueryWrapper<OrderListResponse> listParamWrapperBuilder(OrderListRequest request) {
         QueryWrapper<OrderListResponse> wrapper = new QueryWrapper<>();
         wrapper.like(StringUtils.isNotBlank(request.getOrderNo()), "order_no", request.getOrderNo());
+        wrapper.like(Objects.nonNull(request.getCustomerId()), "customer_id", request.getCustomerId());
         wrapper.like(StringUtils.isNotBlank(request.getCustomerName()), "customer_name", request.getCustomerName());
         wrapper.like(StringUtils.isNotBlank(request.getDeliverer()), "deliverer", request.getDeliverer());
         wrapper.like(StringUtils.isNotBlank(request.getCreateUserName()), "create_user_name", request.getCreateUserName());
-        wrapper.apply(StringUtils.isNotBlank(request.getCreateStartTime()),
-                "{0} <= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getCreateStartTime().split(" ")[0]);
-        wrapper.apply(StringUtils.isNotBlank(request.getCreateEndTime()),
-                "{0} >= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getCreateEndTime().split(" ")[0]);
+        if(StringUtils.isNotBlank(request.getCreateStartTime())){
+            wrapper.apply("{0} <= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getCreateStartTime().split(" ")[0]);
+        }
+        if(StringUtils.isNotBlank(request.getCreateEndTime())){
+            wrapper.apply("{0} >= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getCreateEndTime().split(" ")[0]);
+        }
         wrapper.orderByDesc("create_time");
         return wrapper;
     }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceAssessServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceAssessServiceImpl.java
index c6af980..ce40138 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceAssessServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceAssessServiceImpl.java
@@ -1,10 +1,33 @@
 package com.casic.missiles.service.Impl.business;
 
-import com.casic.missiles.model.business.BizBusinessOutsourceAssess;
+import cn.hutool.core.lang.Assert;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.casic.missiles.core.model.auth.AuthUser;
+import com.casic.missiles.core.shiro.ShiroKit;
+import com.casic.missiles.dto.BaseApprovalSubmitRequest;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.ReturnUtil;
+import com.casic.missiles.dto.business.outsource.OutsourceAssessApprovalListRequest;
+import com.casic.missiles.dto.business.outsource.OutsourceAssessSaveResponse;
+import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.NoGenerateFileCodeEnum;
+import com.casic.missiles.enums.NoGenerateRecordTypeCodeEnum;
+import com.casic.missiles.enums.system.ApprovalStatusEnum;
+import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.mapper.business.BizBusinessOutsourceAssessMapper;
+import com.casic.missiles.model.business.BizBusinessOutsourceAssess;
+import com.casic.missiles.model.business.BizBusinessOutsourceAssessSampleRelation;
+import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl;
+import com.casic.missiles.service.business.IBizBusinessOutsourceAssessSampleRelationService;
 import com.casic.missiles.service.business.IBizBusinessOutsourceAssessService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.casic.missiles.utils.NoGeneratorUtil;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Objects;
 
 /**
  * <p>
@@ -15,6 +38,103 @@
  * @since 2023-08-16
  */
 @Service
-public class BizBusinessOutsourceAssessServiceImpl extends ServiceImpl<BizBusinessOutsourceAssessMapper, BizBusinessOutsourceAssess> implements IBizBusinessOutsourceAssessService {
+public class BizBusinessOutsourceAssessServiceImpl extends GeneralApprovalServiceImpl<BizBusinessOutsourceAssessMapper, BizBusinessOutsourceAssess, BizBusinessOutsourceAssess, OutsourceAssessApprovalListRequest, BaseApprovalSubmitRequest> implements IBizBusinessOutsourceAssessService {
+    @Autowired
+    private IBizBusinessOutsourceAssessSampleRelationService outsourceAssessSampleRelationService;
 
+    @Override
+    public ReturnDTO<OutsourceAssessSaveResponse> saveOutsourceAssess(BizBusinessOutsourceAssess request) {
+        //生成编号
+        String labCode = request.getLabCode();
+        String groupCode = request.getGroupCode();
+        Long maxNo = this.baseMapper.selectMaxProjectNo();
+        String projectNo = NoGeneratorUtil.getCode(NoGenerateFileCodeEnum.D, labCode, NoGenerateRecordTypeCodeEnum.OUTSOURCE_ACCESS, groupCode, maxNo);
+        request.setCreateUserId(request.getUserId());
+        request.setCreateUserName(request.getUserName());
+        request.setApprovalStatus(ApprovalStatusEnum.DRAFT); //草稿箱状态
+        request.setProjectNo(projectNo);
+        int row = this.baseMapper.insert(request);
+        Assert.isFalse(row <= 0, () -> {
+            throw new BusinessException(BusinessExceptionEnum.OUTSOURCE_ACCESS_SAVE_FAILED);
+        });
+        //关联表
+        saveRelationData(request);
+        OutsourceAssessSaveResponse saveResponse = new OutsourceAssessSaveResponse();
+        saveResponse.setId(request.getId());
+        saveResponse.setProjectNo(projectNo);
+        return ReturnUtil.success(saveResponse);
+    }
+
+    @Override
+    @Transactional
+    public ReturnDTO draftUpdate(BizBusinessOutsourceAssess request) {
+        if (this.baseMapper.updateById(request) > 0) {
+            //关联表删除、增加
+            removeRelationData(request.getId());
+            saveRelationData(request);
+            return ReturnUtil.success();
+        }
+        throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
+    }
+
+    @Override
+    public ReturnDTO draftDelete(Long id) {
+        if (this.baseMapper.deleteById(id) > 0) {
+            //关联表删除
+            removeRelationData(id);
+            return ReturnUtil.success();
+        }
+        throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
+    }
+
+    @Override
+    public ReturnDTO draftBatchDelete(List<Long> ids) {
+        if (this.baseMapper.deleteBatchIds(ids) >= 0) {
+            ids.forEach(id -> removeRelationData(id));
+            return ReturnUtil.success();
+        }
+        throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
+    }
+
+    @Override
+    @Transactional
+    public ReturnDTO failUpdate(BizBusinessOutsourceAssess request) {
+        AuthUser user = ShiroKit.getUser();
+        Assert.isFalse(Objects.isNull(user), () -> {
+            throw new BusinessException(BusinessExceptionEnum.LOGIN_USER_ACQUIRE_FAILED);
+        });
+        request.setApprovalStatus(ApprovalStatusEnum.IN_APPROVED);
+        if (this.baseMapper.updateById(request) > 0) {
+            //关联表删除、增加
+            removeRelationData(request.getId());
+            saveRelationData(request);
+            baseApprovalService.failUpdate(request.getProcessId());
+            return ReturnUtil.success();
+        }
+        throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
+    }
+
+    private void saveRelationData(BizBusinessOutsourceAssess request) {
+        List<BizBusinessOutsourceAssessSampleRelation> sampleRelations = new ArrayList<>();
+        request.getOrderSampleList().forEach(dto -> {
+            BizBusinessOutsourceAssessSampleRelation relation = new BizBusinessOutsourceAssessSampleRelation();
+            relation.setOrderId(dto.getOrderId());
+            relation.setSampleId(dto.getSampleId());
+            relation.setAccessId(request.getId());
+            sampleRelations.add(relation);
+        });
+        if(outsourceAssessSampleRelationService.saveBatch(sampleRelations)){
+            return;
+        }
+        throw new BusinessException(BusinessExceptionEnum.OUTSOURCE_ACCESS_SAVE_FAILED);
+    }
+
+    private void removeRelationData(Long assessId) {
+        QueryWrapper<BizBusinessOutsourceAssessSampleRelation> wrapper = new QueryWrapper<>();
+        wrapper.eq("access_id", assessId);
+        if(outsourceAssessSampleRelationService.remove(wrapper)){
+            return;
+        }
+        throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
+    }
 }

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java
index bb0c50f..13a699b 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java
@@ -12,6 +12,7 @@
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.IGeneralApprovalService;
+import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
@@ -19,6 +20,7 @@
 import org.springframework.web.bind.annotation.RequestBody;
 
 import javax.validation.Valid;
+import java.util.List;
 import java.util.Objects;
 
 /**
@@ -117,4 +119,17 @@
         }
         return baseApprovalService.failUpdate(request);
     }
+
+    public List<O> exportList(@RequestBody @Valid R request) throws Exception {
+        List<O> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = baseApprovalService.listExportByIds(request.getIds());
+        } else {
+            list = baseApprovalService.listExport(request);
+        }
+        for (O record : list) {
+            DictCodeUtils.convertDictCodeToName(record);
+        }
+        return list;
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java
index 8a90961..d775831 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java
@@ -5,6 +5,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.business.certificate.CertificateChangeApplyApprovalListRequest;
 import com.casic.missiles.dto.business.certificate.CertificateChangeApplySaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessCertificateChangeApply;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
@@ -20,6 +21,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -48,4 +50,12 @@
         }
         return changeApplyService.saveChangeApply(request);
     }
+
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody CertificateChangeApplyApprovalListRequest request) throws Exception {
+        List<BizBusinessCertificateChangeApply> list = super.exportList(request);
+        super.exportExcel(BizBusinessCertificateChangeApply.class, list, ExportEnum.CERTIFICATE_CHANGE_APPLY.getSheetName());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java
index 5fc4b07..af8230e 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java
@@ -9,6 +9,7 @@
 import com.casic.missiles.dto.business.certificate.CertificatePrintApprovalListRequest;
 import com.casic.missiles.dto.business.certificate.CertificatePrintListResponse;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.enums.business.CertificatePrintStatusEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessCertificatePrintLog;
@@ -18,10 +19,16 @@
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.io.IOException;
+import java.util.List;
 import java.util.Objects;
 
 /**
@@ -98,4 +105,16 @@
         });
         return certificatePrintService.certificatePrintLog(idDTO.getId());
     }
+
+    @ApiOperation("证书打印审批导出")
+    @PostMapping("/listExport")
+    public void exportList(@RequestBody CertificatePrintApprovalListRequest request) throws IOException {
+        List<CertificatePrintListResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = certificatePrintService.listByIds(request.getIds());
+        } else {
+            list = certificatePrintService.list(request);
+        }
+        super.exportExcel(CertificatePrintListResponse.class, list, ExportEnum.CERTIFICATE_PRINT.getSheetName());
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java
index 63b06dc..6b2efd5 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java
@@ -6,6 +6,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.business.certificate.CertificateReportApprovalListRequest;
 import com.casic.missiles.dto.business.certificate.CertificateReportSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessCertificateReport;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
@@ -21,6 +22,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -50,7 +52,7 @@
         return certificateReportService.saveCertificateReport(request);
     }
 
-    @ApiOperation("证书审批详情（基本信息）")
+    @ApiOperation("详情（基本信息）")
     @PostMapping("/detail")
     public ReturnDTO<BizBusinessCertificateReport> detail(@RequestBody @Valid BaseDetailRequest request, BindingResult bindingResult) throws Exception {
         if(bindingResult.hasErrors()){
@@ -59,4 +61,11 @@
         return certificateReportService.detail(request);
     }
 
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody CertificateReportApprovalListRequest request) throws Exception {
+        List<BizBusinessCertificateReport> list = super.exportList(request);
+        super.exportExcel(BizBusinessCertificateReport.class, list, ExportEnum.CERTIFICATE_REPORT.getSheetName());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java
index 46b26bd..57c0809 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java
@@ -10,20 +10,21 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.business.identify.IdentifyListRequest;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessIdentifyInfo;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.business.IBizBusinessIdentifyInfoService;
+import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import javax.validation.Valid;
+import java.util.List;
 import java.util.Objects;
 
 /**
@@ -57,16 +58,13 @@
         return identifyInfoService.addIdentify(identifyInfo);
     }
 
-    @ApiOperation("标识打印更新")
+    @ApiOperation("标识打印更新（更新打印时间）")
     @PostMapping("/update")
-    public ReturnDTO updateIdentify(@RequestBody @Valid BizBusinessIdentifyInfo identifyInfo, BindingResult bindingResult) {
-        Assert.isFalse(Objects.isNull(identifyInfo.getId()), () -> {
+    public ReturnDTO updateIdentify(@RequestBody @Valid IdDTO idDTO) {
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        Assert.isFalse(bindingResult.hasErrors(), () -> {
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        });
-        return identifyInfoService.updateIdentify(identifyInfo);
+        return identifyInfoService.updateIdentify(idDTO.getId());
     }
 
     @ApiOperation("标识打印删除")
@@ -77,4 +75,37 @@
         });
         return identifyInfoService.deleteIdentify(idDTO.getId());
     }
+
+    @ApiOperation("标识打印导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody @Valid IdentifyListRequest request, BindingResult bindingResult) throws Exception {
+        if (bindingResult.hasErrors()) {
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        List<BizBusinessIdentifyInfo> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = identifyInfoService.listByIds(request.getIds());
+        } else {
+            list = identifyInfoService.list(request);
+        }
+        for (BizBusinessIdentifyInfo record : list) {
+            DictCodeUtils.convertDictCodeToName(record);
+        }
+        super.exportExcel(BizBusinessIdentifyInfo.class, list, ExportEnum.IDENTIFY_EXPORT.getSheetName());
+    }
+
+
+    // TODO: 2023/8/23 查询设备信息，4个底部按钮查设备（按钮的作用就是前端用来调不同接口、用来区分中间即将展示的标识），前端弹窗选设备，在确定保存时前端根据底部按钮判断传入设备类型deviceType字典code
+    // TODO: 2023/8/23 接口：查受检设备（第1个按钮），查设备台账（后3个按钮同一接口），查询之后前端根据标志类型的不同加到中间页面时进行判断（按产品给的对应表）
+    // TODO: 2023/8/23 提供二维码接口，前端在加到中间页面时调用一下
+
+    @ApiOperation("设备二维码")
+    @PostMapping("/equipment/qrCode")
+    public ReturnDTO<String> equipmentQrCode(@RequestBody @Valid IdDTO idDTO) {
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return identifyInfoService.equipmentQrCode(idDTO.getId());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java
index 707be6e..7e0453d 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java
@@ -117,7 +117,7 @@
     }
 
     @ApiOperation("任务单导出")
-    @PostMapping("/export")
+    @PostMapping("/listExport")
     public void orderExport(@RequestBody @Valid OrderListRequest request, HttpServletResponse response) {
         businessOrderService.orderExport(request, response);
     }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java
index 529a6ce..51432be 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java
@@ -1,9 +1,28 @@
 package com.casic.missiles.controller.business;
 
+import com.casic.missiles.controller.GeneralApprovalController;
+import com.casic.missiles.dto.BaseApprovalSubmitRequest;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.business.outsource.OutsourceAssessApprovalListRequest;
+import com.casic.missiles.dto.business.outsource.OutsourceAssessSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
+import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.model.business.BizBusinessOutsourceAssess;
+import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
+import com.casic.missiles.service.IGeneralApprovalService;
+import com.casic.missiles.service.business.IBizBusinessOutsourceAssessService;
 import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.BindingResult;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.validation.Valid;
+import java.util.List;
+
 /**
  * <p>
  * 计量检定业务-分包管理-测试、校准或检定工作分包评审表 前端控制器
@@ -15,6 +34,27 @@
 @Api(tags = "分包管理-测试、校准或检定工作分包评审表")
 @RestController
 @RequestMapping("/business/outsource/assess")
-public class BizBusinessOutsourceAssessController {
+public class BizBusinessOutsourceAssessController extends GeneralApprovalController<BizBusinessOutsourceAssess, BizBusinessOutsourceAssess, OutsourceAssessApprovalListRequest, BaseApprovalSubmitRequest> {
+    @Autowired
+    private IBizBusinessOutsourceAssessService outsourceAssessService;
 
+    public BizBusinessOutsourceAssessController(IGeneralApprovalService<BizBusinessOutsourceAssess, BizBusinessOutsourceAssess, OutsourceAssessApprovalListRequest, BaseApprovalSubmitRequest> baseApprovalService) {
+        super(baseApprovalService);
+    }
+
+    @ApiOperation("草稿箱-保存")
+    @PostMapping("/save")
+    public ReturnDTO<OutsourceAssessSaveResponse> saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceAssess request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        return outsourceAssessService.saveOutsourceAssess(request);
+    }
+
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception {
+        List<BizBusinessOutsourceAssess> list = super.exportList(request);
+        super.exportExcel(BizBusinessOutsourceAssess.class, list, ExportEnum.OUTSOURCE_ASSESS.getSheetName());
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java
new file mode 100644
index 0000000..9adef18
--- /dev/null
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java
@@ -0,0 +1,60 @@
+package com.casic.missiles.controller.business;
+
+import com.casic.missiles.controller.GeneralApprovalController;
+import com.casic.missiles.dto.BaseApprovalSubmitRequest;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.business.outsource.OutsourceProtocolApprovalListRequest;
+import com.casic.missiles.dto.business.outsource.OutsourceProtocolSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
+import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.model.business.BizBusinessOutsourceProtocol;
+import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
+import com.casic.missiles.service.IGeneralApprovalService;
+import com.casic.missiles.service.business.IBizBusinessOutsourceProtocolService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.BindingResult;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.validation.Valid;
+import java.util.List;
+
+/**
+ * <p>
+ * 计量检定业务-分包管理-测试、校准或检定工作分包协议书 前端控制器
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-08-24
+ */
+@Api(tags = "分包管理-测试、校准或检定工作分包协议书")
+@RestController
+@RequestMapping("/business/outsource/protocol")
+public class BizBusinessOutsourceProtocolController extends GeneralApprovalController<BizBusinessOutsourceProtocol, BizBusinessOutsourceProtocol, OutsourceProtocolApprovalListRequest, BaseApprovalSubmitRequest> {
+    @Autowired
+    private IBizBusinessOutsourceProtocolService outsourceProtocolService;
+
+    public BizBusinessOutsourceProtocolController(IGeneralApprovalService<BizBusinessOutsourceProtocol, BizBusinessOutsourceProtocol, OutsourceProtocolApprovalListRequest, BaseApprovalSubmitRequest> baseApprovalService) {
+        super(baseApprovalService);
+    }
+
+    @ApiOperation("草稿箱-保存")
+    @PostMapping("/save")
+    public ReturnDTO<OutsourceProtocolSaveResponse> saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceProtocol request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        return outsourceProtocolService.saveOutsourceProtocol(request);
+    }
+
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody OutsourceProtocolApprovalListRequest request) throws Exception {
+        List<BizBusinessOutsourceProtocol> list = super.exportList(request);
+        super.exportExcel(BizBusinessOutsourceProtocol.class, list, ExportEnum.OUTSOURCE_PROTOCOL.getSheetName());
+    }
+}
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java
index 097f645..f0f0943 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java
@@ -17,7 +17,6 @@
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.IGeneralApprovalService;
 import com.casic.missiles.service.business.IBizBusinessOutsourcerInfoService;
-import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -71,19 +70,8 @@
 
     @ApiOperation("分包方导出")
     @PostMapping("/listExport")
-    public void export(@RequestBody @Valid OutsourcerInfoApprovalListRequest request, BindingResult bindingResult) throws Exception {
-        if (bindingResult.hasErrors()) {
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        }
-        List<BizBusinessOutsourcerInfo> list;
-        if (!CollectionUtils.isEmpty(request.getIds())) {
-            list = outsourcerInfoService.listByIds(request.getIds());
-        } else {
-            list = outsourcerInfoService.list(request);
-        }
-        for (BizBusinessOutsourcerInfo record : list) {
-            DictCodeUtils.convertDictCodeToName(record);
-        }
+    public void export(@RequestBody OutsourcerInfoApprovalListRequest request) throws Exception {
+        List<BizBusinessOutsourcerInfo> list = super.exportList(request);
         super.exportExcel(BizBusinessOutsourcerInfo.class, list, ExportEnum.OUTSOURCER_EXPORT.getSheetName());
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java
index c2cbf9f..0410918 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java
@@ -17,11 +17,9 @@
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.IGeneralApprovalService;
 import com.casic.missiles.service.business.IBizBusinessSiteExecutiveInfoService;
-import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -60,7 +58,7 @@
         return siteExecutiveInfoService.saveSiteExecutiveInfo(siteExecutiveInfo);
     }
 
-    @ApiOperation("现场检测详情")
+    @ApiOperation("详情")
     @PostMapping("/detail")
     public ReturnDTO<SiteExecutiveDetailResponse> siteExecutiveDetail(@RequestBody @Valid IdDTO idDTO) throws Exception {
         Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
@@ -69,21 +67,10 @@
         return ReturnUtil.success(siteExecutiveInfoService.detail(idDTO.getId()));
     }
 
-    @ApiOperation("现场检测导出")
+    @ApiOperation("导出")
     @PostMapping("/listExport")
-    public void export(@RequestBody @Valid SiteExecutiveApprovalListRequest request, BindingResult bindingResult) throws Exception {
-        if (bindingResult.hasErrors()) {
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        }
-        List<SiteExecutiveApprovalListResponse> list;
-        if (!CollectionUtils.isEmpty(request.getIds())) {
-            list = siteExecutiveInfoService.listInfoByIds(request.getIds());
-        } else {
-            list = siteExecutiveInfoService.listInfo(request);
-        }
-        for (SiteExecutiveApprovalListResponse record : list) {
-            DictCodeUtils.convertDictCodeToName(record);
-        }
+    public void export(@RequestBody SiteExecutiveApprovalListRequest request) throws Exception {
+        List<SiteExecutiveApprovalListResponse> list = super.exportList(request);
         super.exportExcel(SiteExecutiveApprovalListResponse.class, list, ExportEnum.SITE_EXECUTIVE_EXPORT.getSheetName());
     }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
index 7e793cd..a92e209 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
@@ -55,7 +55,7 @@
 
     @ApiOperation("设备收发列表导出")
     @PostMapping("/export")
-    public void exportList(@RequestBody @Valid SampleDispatchListRequest request) throws IOException {
+    public void exportList(@RequestBody SampleDispatchListRequest request) throws IOException {
         List<SampleDispatchListResponse> list;
         if (!CollectionUtils.isEmpty(request.getIds())) {
             list = dispatchService.listByIds(request.getIds());
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java
index cdc77fc..d120fd4 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java
@@ -7,6 +7,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.business.labExecutive.*;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.business.IBusinessLabExecutiveInfoService;
@@ -14,6 +15,7 @@
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.*;
 
@@ -32,7 +34,7 @@
     @Autowired
     private IBusinessLabExecutiveInfoService labExecutiveInfoService;
 
-    @ApiOperation("实验室检测-部门检测-查询各状态列表（待检测、检测中、检测完）")
+    @ApiOperation("实验室任务-查询各状态列表（待检测、检测中、检测完）")
     @PostMapping("/deptExecutive/List")
     public ReturnDTO<PageInfoBT<SampleLabExecutiveListResponse>> queryDeptExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
@@ -43,10 +45,19 @@
         return ReturnUtil.success(super.packForBT(labExecutiveInfoService.deptLabExecutiveListPage(page, labExecutiveListRequest)));
     }
 
-    /**
-     * 实验室检测-我的检测-查询各状态列表（待检测、检测中、检测完）
-     */
-    @ApiOperation("实验室检测-我的检测-查询各状态列表（待检测、检测中、检测完）")
+    @ApiOperation("实验室任务导出")
+    @PostMapping("/deptExecutive/export")
+    public void deptExportList(@RequestBody @Valid SampleLabExecutiveListRequest request) throws Exception {
+        List<SampleLabExecutiveListResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = labExecutiveInfoService.deptLabExecutiveListByIds(request.getMeasureStatus(), request.getIds());
+        } else {
+            list = labExecutiveInfoService.deptLabExecutiveList(request);
+        }
+        super.exportExcel(SampleLabExecutiveListResponse.class, list, ExportEnum.DEPT_EXECUTIVE_TASK.getSheetName());
+    }
+
+    @ApiOperation("我的任务-查询各状态列表（待检测、检测中、检测完）")
     @PostMapping("/myExecutive/list")
     public ReturnDTO<PageInfoBT<SampleLabExecutiveListResponse>> queryMyExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
@@ -57,19 +68,25 @@
         return ReturnUtil.success(super.packForBT(labExecutiveInfoService.myLabExecutiveListPage(page, labExecutiveListRequest)));
     }
 
-    /**
-     * 实验室检测-我的检测-查询各状态样品数量（待检测、检测中、检测完）
-     */
-    @ApiOperation("实验室检测-我的检测-查询各状态样品数量（待检测、检测中、检测完）")
+    @ApiOperation("我的任务导出")
+    @PostMapping("/myExecutive/export")
+    public void exportList(@RequestBody @Valid SampleLabExecutiveListRequest request) throws Exception {
+        List<SampleLabExecutiveListResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = labExecutiveInfoService.myLabExecutiveListByIds(request.getMeasureStatus(), request.getIds());
+        } else {
+            list = labExecutiveInfoService.myLabExecutiveList(request);
+        }
+        super.exportExcel(SampleLabExecutiveListResponse.class, list, ExportEnum.MY_EXECUTIVE_TASK.getSheetName());
+    }
+
+    @ApiOperation("我的任务-查询各状态样品数量（待检测、检测中、检测完）")
     @GetMapping("/myExecutive/amount")
     public ReturnDTO<List<SampleAmountResponse>> queryMyExecutiveAmount() {
         return ReturnUtil.success(labExecutiveInfoService.myExecutiveAmount());
     }
 
-    /**
-     * 实验室检测-部门检测-分配（分配给具体人员）
-     */
-    @ApiOperation("实验室检测-部门检测-分配按钮（分配给具体人员）")
+    @ApiOperation("实验室任务-分配按钮（分配给具体人员）")
     @PostMapping("/deptExecutive/allocate")
     public ReturnDTO allocateStaff(@RequestBody @Valid SampleAllocateRequest sampleAllocateRequest, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -78,10 +95,7 @@
         return labExecutiveInfoService.allocateStaff(sampleAllocateRequest);
     }
 
-    /**
-     * 实验室检测-我的检测-检定人扫描收入（待检测->检测中）
-     */
-    @ApiOperation("实验室检测-我的检测-检定人扫描收入（待检测->检测中）")
+    @ApiOperation("我的任务-检定人扫描收入（待检测->检测中）")
     @PostMapping("/myExecutive/receive")
     public ReturnDTO sampleReceive(@RequestBody @Valid List<SampleOperateRequest> requestList, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -90,10 +104,7 @@
         return labExecutiveInfoService.sampleReceive(requestList);
     }
 
-    /**
-     * 实验室检测-负责人/检定人扫描检完（检测中->检测完）
-     */
-    @ApiOperation("实验室检测-负责人/检定人扫描检完（检测中->检测完）")
+    @ApiOperation("实验室任务-负责人/检定人扫描检完（检测中->检测完）")
     @PostMapping("/myExecutive/complete")
     public ReturnDTO sampleExecutiveComplete(@RequestBody @Valid List<SampleOperateRequest> requestList, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -102,10 +113,7 @@
         return labExecutiveInfoService.sampleExecutiveComplete(requestList);
     }
 
-    /**
-     * 实验室检测-部门检测/我的检测 编辑（只能修改应出具证书）
-     */
-    @ApiOperation("实验室检测-部门检测/我的检测 编辑（只能修改应出具证书）")
+    @ApiOperation("实验室任务/我的任务 编辑（只能修改应出具证书）")
     @PostMapping("/executive/update")
     public ReturnDTO updateExecutive(@RequestBody @Valid UpdateExecutiveRequest request, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -114,10 +122,7 @@
         return labExecutiveInfoService.updateExecutive(request);
     }
 
-    /**
-     * 实验室检测-部门检测/我的检测 详情
-     */
-    @ApiOperation("实验室检测-部门检测/我的检测 详情")
+    @ApiOperation("实验室任务/我的任务 详情")
     @PostMapping("/executive/detail")
     public ReturnDTO<ExecutiveDetailResponse> executiveDetail(@RequestBody @Valid ExecutiveDetailRequest request, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
@@ -131,7 +136,7 @@
      * 退回后会将下一个要执行的实验室检测状态更新为待分配，将后面的实验室顺序变更为连续（都进行减1）
      * 最后一个检测的实验室退回，等分发员再增加实验室或设备收发中的已收入直接手动点击完成
      */
-    @ApiOperation("实验室检测-部门检测/我的检测 退回（待检测/检测中->退回）")
+    @ApiOperation("实验室任务/我的任务 退回（待检测/检测中->退回）")
     @PostMapping("/executive/sendBack")
     public ReturnDTO executiveSendBack(@RequestBody @Valid ExecutiveSendBackRequest request, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -140,9 +145,6 @@
         return labExecutiveInfoService.sampleExecutiveSendBack(request);
     }
 
-    /**
-     * 分发员编辑实验室检测列表
-     */
     @ApiOperation("分发员编辑实验室检测列表")
     @PostMapping("/handOut/updateList")
     public ReturnDTO updateExecutiveList(@RequestBody @Valid UpdateExecutiveListRequest request, BindingResult bindingResult) {
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java
index 48a67ed..0c04f31 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java
@@ -10,6 +10,7 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.resource.customer.CustomerApprovalListRequest;
 import com.casic.missiles.dto.resource.customer.CustomerSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceCustomerInfo;
@@ -26,6 +27,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -55,6 +57,13 @@
         return customerInfoService.saveCustomerInfo(request);
     }
 
+    @ApiOperation("委托方名录导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody CustomerApprovalListRequest request) throws Exception {
+        List<BizResourceCustomerInfo> list = super.exportList(request);
+        super.exportExcel(BizResourceCustomerInfo.class, list, ExportEnum.CUSTOMER_INFO.getSheetName());
+    }
+
     @ApiOperation("委托方人员列表（分页）")
     @PostMapping("/person/listPage")
     public ReturnDTO<PageInfoBT<BizResourceCustomerStaff>> personListPage(@RequestBody IdDTO idDto) {
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
index 972ed4b..6418ea5 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
@@ -5,6 +5,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.resource.customer.SuggestFormApprovalListRequest;
 import com.casic.missiles.dto.resource.customer.SuggestFormSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceCustomerSuggestForm;
@@ -20,6 +21,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -50,4 +52,11 @@
         return suggestFormService.saveSuggestForm(request);
     }
 
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody SuggestFormApprovalListRequest request) throws Exception {
+        List<BizResourceCustomerSuggestForm> list = super.exportList(request);
+        super.exportExcel(BizResourceCustomerSuggestForm.class, list, ExportEnum.CUSTOMER_SUGGEST_FORM.getSheetName());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java
index 1934d1a..9e07eab 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java
@@ -15,12 +15,16 @@
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.resource.IEnvEnvironmentRecordConfigService;
 import com.casic.missiles.service.resource.IEnvEnvironmentRecordDataService;
+import com.casic.missiles.service.resource.IEnvLocationInfoService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
 import java.util.List;
@@ -39,6 +43,8 @@
     private IEnvEnvironmentRecordDataService environmentRecordDataService;
     @Autowired
     private IEnvEnvironmentRecordConfigService environmentRecordConfigService;
+    @Autowired
+    private IEnvLocationInfoService locationInfoService;
 
     @ApiOperation("环境记录单数据列表/详情")
     @PostMapping("/data/listPage")
@@ -95,4 +101,11 @@
         });
         return environmentRecordConfigService.deleteEnvironmentRecordConfig(idDTO.getId());
     }
+
+    @ApiOperation("地点列表")
+    @PostMapping("/location/listPage")
+    public ReturnDTO<PageInfoBT<LocationListResponse>> locationListPage(@RequestBody @Valid LocationListRequest request) {
+        Page<LocationListResponse> page = PageFactory.defaultPage();
+        return ReturnUtil.success(super.packForBT(locationInfoService.listPage(page, request)));
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java
index 82efe3f..e9561fa 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java
@@ -10,6 +10,7 @@
 import com.casic.missiles.dto.resource.seal.SealLogListRequest;
 import com.casic.missiles.dto.resource.seal.SealNoteApprovalListRequest;
 import com.casic.missiles.dto.resource.seal.SealNoteSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceSealUseLog;
@@ -27,6 +28,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -58,6 +60,13 @@
         return sealUseNoteService.saveSeal(request);
     }
 
+    @ApiOperation("印章使用登记导出（列表和导出中去掉经办人和监印人）")
+    @PostMapping("/listExport")
+    public void export(@RequestBody SealNoteApprovalListRequest request) throws Exception {
+        List<BizResourceSealUseNote> list = super.exportList(request);
+        super.exportExcel(BizResourceSealUseNote.class, list, ExportEnum.SEAL_NOTE.getSheetName());
+    }
+
     // TODO: 2023/7/28 印章使用日志：系统中使用印章时插入数据库
 
     @ApiOperation("印章使用日志列表（分页）")
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java
index 9b674fc..06b6521 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java
@@ -9,16 +9,20 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.resource.staff.StaffCertRequest;
 import com.casic.missiles.dto.resource.staff.StaffCertResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.service.resource.IBizResourceStaffInfoService;
 import com.casic.missiles.service.resource.IBizResourceStaffVerifierService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.List;
+
 /**
  * @Description:
  * @Author: wangpeng
@@ -41,9 +45,21 @@
         return ReturnUtil.success(super.packForBT(responsePage));
     }
 
+    @ApiOperation("证书逾期提醒导出")
+    @PostMapping("/listExport")
+    public void exportList(@RequestBody StaffCertRequest request) throws Exception {
+        List<StaffCertResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = staffInfoService.certListByIds(request.getIds());
+        } else {
+            list = staffInfoService.certList(request);
+        }
+        super.exportExcel(StaffCertResponse.class, list, ExportEnum.STAFF_CERTIFICATE_EXPIRE.getSheetName());
+    }
+
     @ApiOperation("证书逾期提醒")
     @PostMapping("/expirationReminder")
-    public ReturnDTO expirationReminder(@RequestBody IdDTO idDto) {
-        return verifierService.expirationReminder(idDto);
+    public ReturnDTO expirationReminder(@RequestBody IdDTO idDTO) {
+        return verifierService.expirationReminder(idDTO);
     }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java
index 3b251ad..a6e7850 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java
@@ -12,6 +12,7 @@
 import com.casic.missiles.dto.resource.staff.StaffListRequest;
 import com.casic.missiles.dto.resource.staff.TrainListRequest;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.*;
@@ -22,7 +23,10 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
 import java.util.List;
@@ -52,8 +56,19 @@
             throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
         }
         Page<BizResourceStaffInfo> page = PageFactory.defaultPage();
-        Page<BizResourceStaffInfo> responsePage = staffInfoService.listPage(page, request);
-        return ReturnUtil.success(super.packForBT(responsePage));
+        return ReturnUtil.success(super.packForBT(staffInfoService.listPage(page, request)));
+    }
+
+    @ApiOperation("人员登记导出")
+    @PostMapping("/listExport")
+    public void exportList(@RequestBody StaffListRequest request) throws Exception {
+        List<BizResourceStaffInfo> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = staffInfoService.listByIds(request.getIds());
+        } else {
+            list = staffInfoService.list(request);
+        }
+        super.exportExcel(BizResourceStaffInfo.class, list, ExportEnum.STAFF_INFO.getSheetName());
     }
 
     @ApiOperation("人员登记详情基础信息")
@@ -85,9 +100,9 @@
 
     @ApiOperation("科研教育列表（分页）")
     @PostMapping("/education/listPage")
-    public ReturnDTO<PageInfoBT<BizResourceStaffEducation>> educationListPage(@RequestBody IdDTO idDto) {
+    public ReturnDTO<PageInfoBT<BizResourceStaffEducation>> educationListPage(@RequestBody IdDTO idDTO) {
         Page<BizResourceStaffEducation> page = PageFactory.defaultPage();
-        Page<BizResourceStaffEducation> responsePage = staffInfoService.educationListPage(page, idDto);
+        Page<BizResourceStaffEducation> responsePage = staffInfoService.educationListPage(page, idDTO);
         return ReturnUtil.success(super.packForBT(responsePage));
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java
index af6aa86..d85d84a 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java
@@ -9,6 +9,7 @@
 import com.casic.missiles.dto.resource.outsideService.SupplierApprovalListRequest;
 import com.casic.missiles.dto.resource.outsideService.SupplierSaveResponse;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceSupplierAbility;
@@ -67,6 +68,13 @@
         return ReturnUtil.success(supplierInfoService.detail(idDTO.getId()));
     }
 
+    @ApiOperation("合格供方导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody SupplierApprovalListRequest request) throws Exception {
+        List<BizResourceSupplierInfo> list = super.exportList(request);
+        super.exportExcel(BizResourceSupplierInfo.class, list, ExportEnum.SUPPLIER_INFO.getSheetName());
+    }
+
     @ApiOperation("供方人员列表（分页）")
     @PostMapping("/person/listPage")
     public ReturnDTO<PageInfoBT<BizResourceSupplierPerson>> personListPage(@RequestBody IdDTO idDTO) {
diff --git a/casic-metering-api/src/main/resources/config/application.yml b/casic-metering-api/src/main/resources/config/application.yml
index 350db5f..ecff521 100644
--- a/casic-metering-api/src/main/resources/config/application.yml
+++ b/casic-metering-api/src/main/resources/config/application.yml
@@ -126,7 +126,7 @@
     #作者
     author: wangpeng
     #待生成对象表名
-    table-name: biz_equipment_technical_target_approval,biz_equipment_attachment_approval,biz_equipment_checkpoint_approval
+    table-name: biz_business_outsource_protocol
 
 reminder:
   #节点--common模块config包 ReminderNodeConfig配置
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
index 4a19e4e..d47d552 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
@@ -53,6 +53,7 @@
     SUGGEST_FORM_SAVE_FAILED(2509, "委托方意见登记表保存至草稿箱失败"),
     EXAMINE_FORM_SAVE_FAILED(2510, "要求、委托书及合同评审表保存至草稿箱失败"),
     CUSTOMER_EXIST_SAVE_FAILED(2511, "该委托方已存在，请重新选择"),
+    DUPLICATE_LOCATION_NO(2512, "地点编号已存在"),
 
     /**
      * 计量检定业务模块
@@ -68,6 +69,8 @@
     COMPLETE_SAMPLE_NOT_EXIST(2609, "检测中不存在扫描收入的样品"),
     CANNOT_CHANGE_MEASURE_INFO(2610, "无法更改非当前登录用户的检测信息"),
     NON_EXIST_ORDER_OR_SAMPLE(2611, "不存在该委托单或该委托单下的样品"),
+    OUTSOURCE_ACCESS_SAVE_FAILED(2612, "测试、校准或检定工作分包评审表保存至草稿箱失败"),
+    OUTSOURCE_PROTOCOL_SAVE_FAILED(2613, "测试、校准或检定工作分包协议书保存至草稿箱失败"),
 
     /**
      * 历史遗留备用
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
index 5089ad1..81a406b 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
@@ -10,54 +10,38 @@
     /**
      * 资源管理
      */
-    ENVIRONMENT_DATA_EXPORT("environmentData", "environmentData", "环境记录单数据"),
+    ENVIRONMENT_DATA_EXPORT("environmentData", "环境记录单数据", "环境记录单数据"),
+    STAFF_INFO("staffInfo", "人员登记", "人员登记"),
+    STAFF_CERTIFICATE_EXPIRE("certificateExpire", "证书逾期提醒", "证书逾期提醒"),
+    SUPPLIER_INFO("supplierInfo", "合格供方名录", "合格供方名录"),
+    CUSTOMER_INFO("customerInfo", "委托方名录", "委托方名录"),
+    CUSTOMER_SUGGEST_FORM("customerSuggestForm", "委托方意见登记表", "委托方意见登记表"),
+    SEAL_NOTE("sealNote", "印章使用登记", "印章使用登记"),
 
-    FILE_EXPORT("meterFileData", "meterFileData", "计量文件信息"),
-    TRAIN_PLAN_EXPORT("trainPlanData", "trainPlanData", "培训计划"),
-    TRAIN_LOG_EXPORT("trainLogData", "trainLogData", "培训记录"),
-    METER_ORGANIZE_EXPORT("meterOrganizeData", "meterOrganizeData", "计量组织"),
-    TRACE_SUPPLIER_EXPORT("traceSupplierData", "traceSupplierData", "溯源供方"),
-    SIGN_EXPORT("signData", "signData", "签名/签章"),
-    TEMPLATE_EXPORT("templateData", "templateData", "原始记录模板/证书报告模板"),
-    FIXED_ASSETS("meterFixedAssets", "meterFixedAssets", "固定资产"),
-    METER_EQUIPMENT("meterEquipment", "meterEquipment", "测量设备"),
-    CALIBRATION_TEST_EQUIPMENT("calibrationTestEquipment", "calibrationTestEquipment", "校准检定设备"),
-    MEASURE_ACCOUNT("measureAccount", "measureAccount", "测量工装"),
-    STANDARD_SUPPORT_EQUIPMENT("standardSupportEquipment", "standardSupportEquipment", "标准配套设备"),
-    STANDARD_EQUIPMENT("standardEquipment", "standardEquipment", "标准装置"),
-    FLOW_DEF_EXPORT("flowDefData", "flowDefData", "流程定义"),
-    STAFF_CERTIFICATE("certificate", "certificate", "计量人员证书"),
-    CHECK_INFO("checkInfo", "checkInfo", "设备管理点检测"),
-    EQUIPMENT_APPLY("equipmentApply", "equipmentApply", "设备借用"),
-    STANDARD_EQUIPMENT_REMIND("equipmentApplyRemind", "equipmentApplyRemind", "标准装置到期提醒"),
-    METER_PRICE("meterPrice", "meterPrice", "价格库"),
-    METER_STAFF("meterStaff", "meterStaff", "计量人员"),
-    STANDARD_EQUIPMENT_APPLY("standardEquipmentApply", "standardEquipmentApply", "标准装置申请"),
-    STATE_MANAGE_APPLY("stateManage", "stateManage", "状态管理"),
-    METER_ACCEPTANCE_CHECK("acceptanceCheck", "acceptanceCheck", "设备检修保养验收单"),
-    CUSTOMER_EXPORT("customerData", "customerData", "客户信息"),
-    ORDER_EXPORT("orderData", "orderData", "委托书信息"),
-    SAMPLE_EXPORT("sampleData", "sampleData", "样本信息"),
-    EXCHANGE_DATA("exchangeData", "exchangeData", "设备交接单"),
-    DISPATCH_DATA("dispatchData", "dispatchData", "设备收发"),
-    ENVIRONMENT_DATA("environmentData", "environmentData", "环境记录单"),
-    ORIGIN_DATA("originData", "originData", "原始记录"),
-    CERTIFICATE_REPORT("certificateReport", "certificateReport", "证书报告"),
-    ADVICE_EXPORT("adviceData", "adviceData", "客户反馈"),
-    HANDOUT_EXPORT("handoutData", "handoutData", "任务分发列表"),
-    OUTSOURCER_EXPORT("outsourcerData", "outsourcerData", "分包方"),
-    SITE_EXECUTIVE_EXPORT("siteExecutiveData", "siteExecutiveData", "现场测试、校准或检定"),
-    CERTIFICATE_PRINT_EXPORT("certificatePrintData", "certificatePrintData", "证书打印"),
-    DOWNLOAD_TEMPLATE("downloadTemplate", "downloadTemplate", "页面配置"),
-    OUTSOURCER_CERTIFICATE_EXPORT("outsourceCertificateData", "outsourceCertificateData", "分包证书"),
-    SETTLEMENT_INFO_EXPORT("settlementInfoData", "settlementInfoData", "业务结算"),
-    EQUIPMENT_REMIND("equipmentRemind", "equipmentRemind", "设备到期提醒"),
-    AGREEMENT_INFO_EXPORT("agreementInfoData", "agreementInfoData", "合同"),
-    WORK_STATISTICS_EXPORT("workStatisticsData", "workStatisticsData", "实时工作统计"),
-    DEPT_OUTPUT_EXPORT("deptOutputData", "deptOutputData", "部门产值分析"),
-    WORKLOAD_EXPORT("workloadData", "workloadData", "业务工作量分析"),
-    DEPT_COMPREHENSIVE_EXPORT("deptComprehensiveData", "deptComprehensiveData", "部门综合分析"),
-    ENVIRONMENTAL_RECORD("environmentalRecordData", "environmentalRecordData", "现场环境记录");
+    /**
+     * 计量检定业务
+     */
+    OUTSOURCER_EXPORT("outsourcerData", "分包方名录", "分包方名录"),
+    IDENTIFY_EXPORT("identifyData", "计量标识", "计量标识"),
+    ORDER_EXPORT("orderData", "任务单", "任务单"),
+    DISPATCH_DATA("dispatchData", "设备收发", "设备收发"),
+    HANDOUT_EXPORT("handoutData", "任务分发", "任务分发"),
+    SITE_EXECUTIVE_EXPORT("siteExecutiveData", "现场测试、校准或检定", "现场测试、校准或检定"),
+    CERTIFICATE_REPORT("certificateReport", "证书审批", "证书审批"),
+    CERTIFICATE_CHANGE_APPLY("certificateChangeApply", "证书报告补充或更换申请单", "证书报告补充或更换申请单"),
+    CERTIFICATE_PRINT("certificatePrintData", "证书打印审批", "证书打印审批"),
+    DEPT_EXECUTIVE_TASK("deptExecutiveTaskData", "实验室任务", "实验室任务"),
+    MY_EXECUTIVE_TASK("myExecutiveTaskData", "我的任务", "我的任务"),
+    OUTSOURCE_ASSESS("outsourceAssess", "测试、校准或检定工作分包评审表", "测试、校准或检定工作分包评审表"),
+    OUTSOURCE_PROTOCOL("outsourceProtocol", "测试、校准或检定工作分包协议书", "测试、校准或检定工作分包协议书"),
+
+    /**
+     * 系统管理
+     */
+    SIGN_EXPORT("signData", "签名", "签名"),
+    TEMPLATE_EXPORT("templateData", "文件模板", "文件模板"),
+    FLOW_DEF_EXPORT("flowDefData", "流程定义", "流程定义"),
+    DOWNLOAD_TEMPLATE("downloadTemplate", "流程定义", "页面配置");
 
     ExportEnum(String fileName, String sheetName, String description) {
         this.fileName = fileName;
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateRecordTypeCodeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateRecordTypeCodeEnum.java
index 31d913c..a963522 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateRecordTypeCodeEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateRecordTypeCodeEnum.java
@@ -46,4 +46,14 @@
     String SITE_EXECUTIVE_APPROVAL = "01";
     //《现场测试、校准或检定工作记录表》
     String SITE_EXECUTIVE_LOG = "02";
+
+    //测试、校准或检定工作分包协议书
+    String OUTSOURCE_PROTOCOL = "01";
+    //测试、校准或检定工作分包评审表
+    String OUTSOURCE_ACCESS = "02";
+    //测试、校准或检定工作分包通知书
+    String OUTSOURCE_NOTICE = "03";
+    //测试、校准或检定工作分包方名录
+    String OUTSOURCE_INFO = "04";
+
 }
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
index 24b8635..f78bd53 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
@@ -15,6 +15,10 @@
     String CERTIFICATE_CHANGE_APPLY_BEAN_NAME = "certificateChangeApplyBean";
     //现场测试、校准或检定
     String SITE_EXECUTIVE_BEAN_NAME = "siteExecutiveBean";
+    //测试、校准或检定工作分包评审表
+    String OUTSOURCE_ASSESS_BEAN_NAME = "outsourceAssessBean";
+    //测试、校准或检定工作分包协议书
+    String OUTSOURCE_PROTOCOL_BEAN_NAME = "outsourceProtocolBean";
 
     /*********************************设备与装置************************************/
     //设备台账
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 b21c661..6b86fd1 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
@@ -18,6 +18,8 @@
     OUTSOURCER_APPROVAL(OUTSOURCER_BEAN_NAME, ""),
     CERTIFICATE_CHANGE_APPROVAL(CERTIFICATE_CHANGE_APPLY_BEAN_NAME, ""),
     SITE_EXECUTIVE_APPROVAL(SITE_EXECUTIVE_BEAN_NAME, ""),
+    OUTSOURCE_ASSESS_APPROVAL(OUTSOURCE_ASSESS_BEAN_NAME, ""),
+    OUTSOURCE_PROTOCOL_APPROVAL(OUTSOURCE_PROTOCOL_BEAN_NAME, ""),
 
     ACTION_STATUS_MAP(new HashMap<String, AwareActionStatusEnum>() {
         {
@@ -47,6 +49,10 @@
             put(ApplyFromIdEnum.CERTIFICATE_CHANGE_APPROVAL.getCode(), CERTIFICATE_CHANGE_APPROVAL);
             //现场测试、校准或检定审批
             put(ApplyFromIdEnum.SITE_EXECUTIVE_APPROVAL.getCode(), SITE_EXECUTIVE_APPROVAL);
+            //测试、校准或检定工作分包评审表
+            put(ApplyFromIdEnum.OUTSOURCE_ASSESS_APPROVAL.getCode(), OUTSOURCE_ASSESS_APPROVAL);
+            //测试、校准或检定工作分包协议书
+            put(ApplyFromIdEnum.OUTSOURCE_PROTOCOL_APPROVAL.getCode(), OUTSOURCE_PROTOCOL_APPROVAL);
         }
     });
     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 934405e..c7410bd 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
@@ -9,6 +9,8 @@
     CERTIFICATE_CHANGE_APPROVAL("jljdywzsbchghsqd", MessageSourceModuleEnum.BUSINESS.getCode(), "证书/报告补充或更换申请单"),
     OUTSOURCER_APPROVAL("jljdywcsjzhgfbfml", MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定合格分包方名录"),
     SITE_EXECUTIVE_APPROVAL("jljdywxccsjzsp", MessageSourceModuleEnum.BUSINESS.getCode(), "现场测试、校准或检定审批"),
+    OUTSOURCE_ASSESS_APPROVAL("jljdywcsjzfbpsb", MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包评审表"),
+    OUTSOURCE_PROTOCOL_APPROVAL("jljdywcsjzfbxys", MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包协议书"),
 
 
     /*******************************************设备与装置*********************************************/
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/GeneralApprovalMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/GeneralApprovalMapper.java
index 4fb7344..0c9d6ae 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/GeneralApprovalMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/GeneralApprovalMapper.java
@@ -17,8 +17,4 @@
 
     Page<O> selectBatchForApprovalList(Page<O> page, @Param("request") R request, @Param("businessKeys") List<String> businessKeys);
 
-//    Page<O> selectListPage(Page<O> page, @Param("request") R request);
-
-//    Long selectMaxNo();
-
 }
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceAssessMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceAssessMapper.java
index 7867bb8..ba59009 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceAssessMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceAssessMapper.java
@@ -1,7 +1,12 @@
 package com.casic.missiles.mapper.business;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.business.outsource.OutsourceAssessApprovalListRequest;
+import com.casic.missiles.mapper.GeneralApprovalMapper;
 import com.casic.missiles.model.business.BizBusinessOutsourceAssess;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * <p>
@@ -11,6 +16,10 @@
  * @author wangpeng
  * @since 2023-08-16
  */
-public interface BizBusinessOutsourceAssessMapper extends BaseMapper<BizBusinessOutsourceAssess> {
+public interface BizBusinessOutsourceAssessMapper extends GeneralApprovalMapper<BizBusinessOutsourceAssess, BizBusinessOutsourceAssess, OutsourceAssessApprovalListRequest> {
+
+    Page<BizBusinessOutsourceAssess> selectBatchForApprovalList(Page<BizBusinessOutsourceAssess> page, @Param("request") OutsourceAssessApprovalListRequest request, @Param("businessKeys") List<String> businessKeys);
+
+    Long selectMaxProjectNo();
 
 }
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceProtocolMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceProtocolMapper.java
new file mode 100644
index 0000000..e6aba35
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceProtocolMapper.java
@@ -0,0 +1,24 @@
+package com.casic.missiles.mapper.business;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.business.outsource.OutsourceProtocolApprovalListRequest;
+import com.casic.missiles.mapper.GeneralApprovalMapper;
+import com.casic.missiles.model.business.BizBusinessOutsourceProtocol;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 计量检定业务-分包管理-测试、校准或检定工作分包协议书 Mapper 接口
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-08-24
+ */
+public interface BizBusinessOutsourceProtocolMapper extends GeneralApprovalMapper<BizBusinessOutsourceProtocol, BizBusinessOutsourceProtocol, OutsourceProtocolApprovalListRequest> {
+
+    Page<BizBusinessOutsourceProtocol> selectBatchForApprovalList(Page<BizBusinessOutsourceProtocol> page, @Param("request") OutsourceProtocolApprovalListRequest request, @Param("businessKeys") List<String> businessKeys);
+
+    Long selectMaxProtocolNo();
+}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/EnvLocationInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/EnvLocationInfoMapper.java
new file mode 100644
index 0000000..49eff87
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/EnvLocationInfoMapper.java
@@ -0,0 +1,21 @@
+package com.casic.missiles.mapper.resource;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.resource.environment.LocationListRequest;
+import com.casic.missiles.dto.resource.environment.LocationListResponse;
+import com.casic.missiles.model.resource.EnvLocationInfo;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * <p>
+ * 实验室环境监控系统-设备表 Mapper 接口
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-06-07
+ */
+public interface EnvLocationInfoMapper extends BaseMapper<EnvLocationInfo> {
+
+    Page<LocationListResponse> selectLocationListPage(Page<LocationListResponse> page, @Param("request") LocationListRequest request);
+}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java
index de124db..85ed0f7 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java
@@ -1,7 +1,9 @@
 package com.casic.missiles.mapper.system;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.dto.system.SignDetailResponse;
+import com.casic.missiles.dto.system.SignListRequest;
 import com.casic.missiles.model.system.SystemSign;
 import org.apache.ibatis.annotations.Param;
 
@@ -22,4 +24,8 @@
     SignDetailResponse selectSignDetailById(Long id);
 
     List<SystemSign> selectUsableSignList(@Param("userId") Long userId);
+
+    Page<SystemSign> selectSignListPage(Page<SystemSign> page, @Param("request") SignListRequest request);
+
+    List<SystemSign> selectSignList(@Param("request") SignListRequest request);
 }
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateChangeApplyMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateChangeApplyMapper.xml
index d798447..c496092 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateChangeApplyMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateChangeApplyMapper.xml
@@ -30,31 +30,31 @@
         SELECT *
         FROM biz_business_certificate_change_apply
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.changeApplyNo != null and request.changeApplyNo !=''">
+        <if test="request != null and request.changeApplyNo != null and request.changeApplyNo !=''">
             and change_apply_no like concat('%',#{request.changeApplyNo},'%')
         </if>
-        <if test="request.changeReportNo != null and request.changeReportNo !=''">
+        <if test="request != null and request.changeReportNo != null and request.changeReportNo !=''">
             and change_report_no like concat('%',#{request.changeReportNo},'%')
         </if>
-        <if test="request.changeReportName != null and request.changeReportName !=''">
+        <if test="request != null and request.changeReportName != null and request.changeReportName !=''">
             and change_report_name like concat('%',#{request.changeReportName},'%')
         </if>
-        <if test="request.changeType != null and request.changeType !=''">
+        <if test="request != null and request.changeType != null and request.changeType !=''">
             and change_type = #{request.changeType}
         </if>
-        <if test="request.createUserName != null and request.createUserName !=''">
+        <if test="request != null and request.createUserName != null and request.createUserName !=''">
             and create_user_name like concat('%',#{request.createUserName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificatePrintMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificatePrintMapper.xml
index b66cd99..49c0ac8 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificatePrintMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificatePrintMapper.xml
@@ -31,34 +31,34 @@
         LEFT JOIN biz_business_order_sample_relation bosr ON (bosr.order_id = bcr.order_id AND bosr.sample_id = bcr.sample_id)
         LEFT JOIN biz_business_order_info boi ON boi.id = bosr.order_id
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and bcp.approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.printStatus != null and request.printStatus !=''">
+        <if test="request != null and request.printStatus != null and request.printStatus !=''">
             and print_status = #{request.printStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and bcp.create_user_id = #{request.createUserId}
         </if>
-        <if test="request.certificateReportNo != null and request.certificateReportNo !=''">
+        <if test="request != null and request.certificateReportNo != null and request.certificateReportNo !=''">
             and bcr.certificate_report_no like concat('%',#{request.certificateReportNo},'%')
         </if>
-        <if test="request.certificateReportName != null and request.certificateReportName !=''">
+        <if test="request != null and request.certificateReportName != null and request.certificateReportName !=''">
             and bcr.certificate_report_name like concat('%',#{request.certificateReportName},'%')
         </if>
-        <if test="request.customerName != null and request.customerName !=''">
+        <if test="request != null and request.customerName != null and request.customerName !=''">
             and boi.customer_name like concat('%',#{request.customerName},'%')
         </if>
-        <if test="request.sampleNo != null and request.sampleNo !=''">
+        <if test="request != null and request.sampleNo != null and request.sampleNo !=''">
             and bosr.sample_no like concat('%',#{request.sampleNo},'%')
         </if>
-        <if test="request.sampleName != null and request.sampleName !=''">
+        <if test="request != null and request.sampleName != null and request.sampleName !=''">
             and bosr.sample_name like concat('%',#{request.sampleName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and bcp.create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and bcp.create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml
index b366034..767695d 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml
@@ -46,33 +46,37 @@
         SELECT bcr.*, bosr.sample_no, bosr.sample_name, bosr.sample_model, rsi.staff_name
         FROM biz_business_certificate_report bcr
         LEFT JOIN biz_business_order_sample_relation bosr ON (bosr.order_id = bcr.order_id AND bosr.sample_id = bcr.sample_id)
+        LEFT JOIN biz_business_order_info boi ON boi.id = bcr.order_id
         LEFT JOIN biz_resource_staff_info rsi ON rsi.id = bcr.measure_person_id
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and bcr.approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and bcr.create_user_id = #{request.createUserId}
         </if>
-        <if test="request.certificateReportNo != null and request.certificateReportNo !=''">
+        <if test="request != null and request.customerId != null and request.customerId !=''">
+            and boi.customer_id = #{request.customerId}
+        </if>
+        <if test="request != null and request.certificateReportNo != null and request.certificateReportNo !=''">
             and bcr.certificate_report_no like concat('%',#{request.certificateReportNo},'%')
         </if>
-        <if test="request.certificateReportName != null and request.certificateReportName !=''">
+        <if test="request != null and request.certificateReportName != null and request.certificateReportName !=''">
             and bcr.certificate_report_name like concat('%',#{request.certificateReportName},'%')
         </if>
-        <if test="request.sampleNo != null and request.sampleNo !=''">
+        <if test="request != null and request.sampleNo != null and request.sampleNo !=''">
             and bosr.sample_no like concat('%',#{request.sampleNo},'%')
         </if>
-        <if test="request.measureCategory != null and request.measureCategory !=''">
+        <if test="request != null and request.measureCategory != null and request.measureCategory !=''">
             and bcr.measure_category = #{request.measureCategory}
         </if>
-        <if test="request.measurePerson != null and request.measurePerson !=''">
+        <if test="request != null and request.measurePerson != null and request.measurePerson !=''">
             and rsi.staff_name like concat('%',#{request.measurePerson},'%')
         </if>
-        <if test="request.calibrationTimeStart != null and request.calibrationTimeStart !=''">
+        <if test="request != null and request.calibrationTimeStart != null and request.calibrationTimeStart !=''">
             and bcr.calibration_time &gt;= #{request.calibrationTimeStart}
         </if>
-        <if test="request.calibrationTimeEnd != null and request.calibrationTimeEnd !=''">
+        <if test="request != null and request.calibrationTimeEnd != null and request.calibrationTimeEnd !=''">
             and bcr.calibration_time &lt;= #{request.calibrationTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceAssessMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceAssessMapper.xml
index d0fcf8b..c22c101 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceAssessMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceAssessMapper.xml
@@ -7,6 +7,8 @@
         <id column="id" property="id" />
         <result column="project_no" property="projectNo" />
         <result column="project_name" property="projectName" />
+        <result column="lab_code" property="labCode" />
+        <result column="group_code" property="groupCode" />
         <result column="applicant_id" property="applicantId" />
         <result column="applicant_name" property="applicantName" />
         <result column="applicant_time" property="applicantTime" />
@@ -31,7 +33,45 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, project_no, project_name, applicant_id, applicant_name, applicant_time, minio_file_name, remark, create_user_id, create_user_name, outsourcer_id, pre_start_time, pre_end_time, outsource_reason, pre_cost, approval_status, process_id, approve_situation, traceability, test_method, technique_ability, create_time, update_time
+        id, project_no, project_name, lab_code, group_code, applicant_id, applicant_name, applicant_time, minio_file_name, remark, create_user_id, create_user_name, outsourcer_id, pre_start_time, pre_end_time, outsource_reason, pre_cost, approval_status, process_id, approve_situation, traceability, test_method, technique_ability, create_time, update_time
     </sql>
 
+    <select id="selectMaxProjectNo" resultType="java.lang.Long">
+        SELECT IFNULL(max(RIGHT(project_no, 3)), 0) from biz_business_outsource_assess
+    </select>
+
+    <select id="selectBatchForApprovalList" resultMap="BaseResultMap">
+        SELECT bboa.*, bboi.outsourcer_name, bboi.director
+        FROM biz_business_outsource_assess bboa
+        LEFT JOIN biz_business_outsourcer_info bboi ON bboa.outsourcer_id = bboi.id
+        WHERE 1=1
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
+            and bboa.approval_status = #{request.approvalStatus}
+        </if>
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
+            and bboa.create_user_id = #{request.createUserId}
+        </if>
+        <if test="request != null and request.projectNo != null and request.projectNo !=''">
+            and bboa.project_no like concat('%',#{request.projectNo},'%')
+        </if>
+        <if test="request != null and request.outsourcerName != null and request.outsourcerName !=''">
+            and bboi.outsourcer_name like concat('%',#{request.outsourcerName},'%')
+        </if>
+        <if test="request != null and request.applicantName != null and request.applicantName !=''">
+            and bboa.applicant_name like concat('%',#{request.applicantName},'%')
+        </if>
+        <if test="request != null and request.applicantTimeStart != null and request.applicantTimeStart !=''">
+            and bboa.applicant_time &gt;= #{request.applicantTimeStart}
+        </if>
+        <if test="request != null and request.applicantTimeEnd != null and request.applicantTimeEnd !=''">
+            and bboa.applicant_time &lt;= #{request.applicantTimeEnd}
+        </if>
+        <if test="businessKeys != null">
+            and bboa.id in
+            <foreach collection="businessKeys" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
+        ORDER BY bboa.create_time DESC
+    </select>
 </mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceProtocolMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceProtocolMapper.xml
new file mode 100644
index 0000000..b7b2149
--- /dev/null
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceProtocolMapper.xml
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.mapper.business.BizBusinessOutsourceProtocolMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.business.BizBusinessOutsourceProtocol">
+        <id column="id" property="id" />
+        <result column="protocol_no" property="protocolNo" />
+        <result column="project_name" property="projectName" />
+        <result column="lab_code" property="labCode" />
+        <result column="group_code" property="groupCode" />
+        <result column="outsourcer_id" property="outsourcerId" />
+        <result column="remark" property="remark" />
+        <result column="outsource_no" property="outsourceNo" />
+        <result column="outsource_name" property="outsourceName" />
+        <result column="contacts" property="contacts" />
+        <result column="mobile" property="mobile" />
+        <result column="address" property="address" />
+        <result column="require_date" property="requireDate" />
+        <result column="outsource_cost" property="outsourceCost" />
+        <result column="director" property="director" />
+        <result column="item" property="item" />
+        <result column="requires" property="requires" />
+        <result column="create_user_id" property="createUserId" />
+        <result column="create_user_name" property="createUserName" />
+        <result column="approval_status" property="approvalStatus" />
+        <result column="process_id" property="processId" />
+        <result column="create_time" property="createTime" />
+        <result column="update_time" property="updateTime" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, protocol_no, project_name, lab_code, group_code, outsourcer_id, remark, outsource_no, outsource_name, contacts, mobile, address, require_date, outsource_cost, director, item, requires, create_user_id, create_user_name, approval_status, process_id, create_time, update_time
+    </sql>
+
+    <select id="selectMaxProtocolNo" resultType="java.lang.Long">
+        SELECT IFNULL(max(RIGHT(protocol_no, 3)), 0) from biz_business_outsource_protocol
+    </select>
+
+    <select id="selectBatchForApprovalList" resultMap="BaseResultMap">
+        SELECT *
+        FROM biz_business_outsource_protocol
+        WHERE 1=1
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
+            and approval_status = #{request.approvalStatus}
+        </if>
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
+            and create_user_id = #{request.createUserId}
+        </if>
+        <if test="request != null and request.protocolNo != null and request.protocolNo !=''">
+            and protocol_no like concat('%',#{request.protocolNo},'%')
+        </if>
+        <if test="request != null and request.outsourcerName != null and request.outsourcerName !=''">
+            and outsourcer_name like concat('%',#{request.outsourcerName},'%')
+        </if>
+        <if test="request != null and request.applicantName != null and request.applicantName !=''">
+            and create_user_name like concat('%',#{request.applicantName},'%')
+        </if>
+        <if test="request != null and request.applicantTimeStart != null and request.applicantTimeStart !=''">
+            and create_time &gt;= #{request.applicantTimeStart}
+        </if>
+        <if test="request != null and request.applicantTimeEnd != null and request.applicantTimeEnd !=''">
+            and create_time &lt;= #{request.applicantTimeEnd}
+        </if>
+        <if test="businessKeys != null">
+            and id in
+            <foreach collection="businessKeys" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
+        ORDER BY create_time DESC
+    </select>
+</mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourcerInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourcerInfoMapper.xml
index 510a80b..3049b54 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourcerInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourcerInfoMapper.xml
@@ -7,6 +7,8 @@
         <id column="id" property="id" />
         <result column="outsourcer_no" property="outsourcerNo" />
         <result column="outsourcer_name" property="outsourcerName" />
+        <result column="lab_code" property="labCode" />
+        <result column="group_code" property="groupCode" />
         <result column="outsourcer_brief_name" property="outsourcerBriefName" />
         <result column="outsourcer_size" property="outsourcerSize" />
         <result column="business_size" property="businessSize" />
@@ -55,32 +57,32 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, outsourcer_no, outsourcer_name, outsourcer_brief_name, outsourcer_size, business_size, grade, evaluation, tax_number, bank_account, bank_name, bank_account_number, postal_code, director, phone, fax, mobile, email, website, address_country, address_province, address_city, address_area, full_address, address_country_name, address_province_name, address_city_name, address_area_name, invoice_country, invoice_province, invoice_city, invoice_area, invoice_full_address, invoice_country_name, invoice_province_name, invoice_city_name, invoice_area_name, business_scope, business_content, minio_file_name, approval_status, process_id, remark, create_user_id, create_user_name, create_time, update_time
+        id, outsourcer_no, outsourcer_name, lab_code, group_code, outsourcer_brief_name, outsourcer_size, business_size, grade, evaluation, tax_number, bank_account, bank_name, bank_account_number, postal_code, director, phone, fax, mobile, email, website, address_country, address_province, address_city, address_area, full_address, address_country_name, address_province_name, address_city_name, address_area_name, invoice_country, invoice_province, invoice_city, invoice_area, invoice_full_address, invoice_country_name, invoice_province_name, invoice_city_name, invoice_area_name, business_scope, business_content, minio_file_name, approval_status, process_id, remark, create_user_id, create_user_name, create_time, update_time
     </sql>
 
     <select id="selectBatchForApprovalList" resultMap="BaseResultMap">
         SELECT *
         FROM biz_business_outsourcer_info
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.outsourcerNo != null and request.outsourcerNo !=''">
+        <if test="request != null and request.outsourcerNo != null and request.outsourcerNo !=''">
             and outsourcer_no like concat('%',#{request.outsourcerNo},'%')
         </if>
-        <if test="request.outsourcerName != null and request.outsourcerName !=''">
+        <if test="request != null and request.outsourcerName != null and request.outsourcerName !=''">
             and outsourcer_name like concat('%',#{request.outsourcerName},'%')
         </if>
-        <if test="request.director != null and request.director !=''">
+        <if test="request != null and request.director != null and request.director !=''">
             and director like concat('%',#{request.director},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
@@ -93,6 +95,6 @@
     </select>
 
     <select id="selectMaxNo" resultType="java.lang.Long">
-        SELECT IFNULL(max(RIGHT(outsourcer_no, 12)), 0) from biz_business_outsourcer_info
+        SELECT IFNULL(max(RIGHT(outsourcer_no, 3)), 0) from biz_business_outsourcer_info
     </select>
 </mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessSiteExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessSiteExecutiveInfoMapper.xml
index 135c5d0..3c5ae79 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessSiteExecutiveInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessSiteExecutiveInfoMapper.xml
@@ -38,25 +38,25 @@
         FROM biz_business_site_executive_info bsei
         LEFT JOIN biz_resource_customer_info rci ON bsei.customer_id = rci.id
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and bsei.approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and bsei.create_user_id = #{request.createUserId}
         </if>
-        <if test="request.siteExecutiveNo != null and request.siteExecutiveNo !=''">
+        <if test="request != null and request.siteExecutiveNo != null and request.siteExecutiveNo !=''">
             and bsei.site_executive_no like concat('%',#{request.siteExecutiveNo},'%')
         </if>
-        <if test="request.customerName != null and request.customerName !=''">
+        <if test="request != null and request.customerName != null and request.customerName !=''">
             and rci.outsourcer_name like concat('%',#{request.customerName},'%')
         </if>
-        <if test="request.applyName != null and request.applyName !=''">
+        <if test="request != null and request.applyName != null and request.applyName !=''">
             and bsei.apply_name like concat('%',#{request.applyName},'%')
         </if>
-        <if test="request.applyTimeStart != null and request.applyTimeStart !=''">
+        <if test="request != null and request.applyTimeStart != null and request.applyTimeStart !=''">
             and bsei.apply_time &gt;= #{request.applyTimeStart}
         </if>
-        <if test="request.applyTimeEnd != null and request.applyTimeEnd !=''">
+        <if test="request != null and request.applyTimeEnd != null and request.applyTimeEnd !=''">
             and bsei.apply_time &lt;= #{request.applyTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml
index 84d9e2a..6bd38a9 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml
@@ -105,6 +105,12 @@
         <if test="request.isUrgent != null and request.isUrgent !=''">
             AND bo.is_urgent = #{request.isUrgent}
         </if>
+        <if test="request.ids != null">
+            and blei.id in
+            <foreach collection="request.ids" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
         ORDER BY blei.update_time DESC
     </select>
 
@@ -137,6 +143,12 @@
         <if test="request.isUrgent != null and request.isUrgent !=''">
             AND bo.is_urgent = #{request.isUrgent}
         </if>
+        <if test="request.ids != null">
+            and blei.id in
+            <foreach collection="request.ids" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
         ORDER BY blei.update_time DESC
     </select>
 
diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardInfoMapper.xml
index 1a5551b..2ed8d17 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardInfoMapper.xml
@@ -45,12 +45,6 @@
         FROM biz_equipment_standard_info besi
         LEFT JOIN biz_equipment_standard_technology_relation bestr ON besi.standard_no = bestr.standard_no
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
-            and besi.approval_status = #{request.approvalStatus}
-        </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
-            and besi.create_user_id = #{request.createUserId}
-        </if>
         <if test="request.standardName != null and request.standardName !=''">
             and besi.standard_name like concat('%',#{request.standardName},'%')
         </if>
diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardTechnologyRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardTechnologyRelationMapper.xml
index fc7e16c..cd03c8c 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardTechnologyRelationMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardTechnologyRelationMapper.xml
@@ -6,6 +6,7 @@
     <resultMap id="BaseResultMap" type="com.casic.missiles.model.equipment.BizEquipmentStandardTechnologyRelation">
         <id column="id" property="id" />
         <result column="technology_file_id" property="technologyFileId" />
+        <result column="technology_file_no" property="technologyFileNo" />
         <result column="technology_file_name" property="technologyFileName" />
         <result column="standard_id" property="standardId" />
         <result column="standard_no" property="standardNo" />
@@ -14,7 +15,7 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, technology_file_id, technology_file_name, standard_id, remark
+        id, technology_file_id, technology_file_no, technology_file_name, standard_id, remark
     </sql>
 
 </mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceAuthorizeOrderMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceAuthorizeOrderMapper.xml
index ac5176c..554fe65 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceAuthorizeOrderMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceAuthorizeOrderMapper.xml
@@ -32,22 +32,22 @@
         SELECT *
         FROM biz_resource_authorize_order
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.orderNo != null and request.orderNo !=''">
+        <if test="request != null and request.orderNo != null and request.orderNo !=''">
             and order_no like concat('%',#{request.orderNo},'%')
         </if>
-        <if test="request.createUserName != null and request.createUserName !=''">
+        <if test="request != null and request.createUserName != null and request.createUserName !=''">
             and create_user_name like concat('%',#{request.createUserName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerExamineFormMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerExamineFormMapper.xml
index ab242f6..af7f98f 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerExamineFormMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerExamineFormMapper.xml
@@ -41,28 +41,28 @@
         SELECT *
         FROM biz_resource_customer_examine_form
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.formNo != null and request.formNo !=''">
+        <if test="request != null and request.formNo != null and request.formNo !=''">
             and form_no like concat('%',#{request.formNo},'%')
         </if>
-        <if test="request.labCode != null and request.labCode !=''">
+        <if test="request != null and request.labCode != null and request.labCode !=''">
             and lab_code like concat('%',#{request.labCode},'%')
         </if>
-        <if test="request.groupCode != null and request.groupCode !=''">
+        <if test="request != null and request.groupCode != null and request.groupCode !=''">
             and group_code like concat('%',#{request.groupCode},'%')
         </if>
-        <if test="request.createUserName != null and request.createUserName !=''">
+        <if test="request != null and request.createUserName != null and request.createUserName !=''">
             and create_user_name like concat('%',#{request.createUserName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerInfoMapper.xml
index fa8ffbc..06a2798 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerInfoMapper.xml
@@ -33,25 +33,25 @@
         SELECT *
         FROM biz_resource_customer_info
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.customerNo != null and request.customerNo !=''">
+        <if test="request != null and request.customerNo != null and request.customerNo !=''">
             and customer_no like concat('%',#{request.customerNo},'%')
         </if>
-        <if test="request.customerName != null and request.customerName !=''">
+        <if test="request != null and request.customerName != null and request.customerName !=''">
             and customer_name like concat('%',#{request.customerName},'%')
         </if>
-        <if test="request.contacts != null and request.contacts !=''">
+        <if test="request != null and request.contacts != null and request.contacts !=''">
             and contacts like concat('%',#{request.contacts},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerSuggestFormMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerSuggestFormMapper.xml
index 28f5bb2..1806662 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerSuggestFormMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerSuggestFormMapper.xml
@@ -33,28 +33,28 @@
         SELECT *
         FROM biz_resource_customer_suggest_form
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.formNo != null and request.formNo !=''">
+        <if test="request != null and request.formNo != null and request.formNo !=''">
             and form_no like concat('%',#{request.formNo},'%')
         </if>
-        <if test="request.customerName != null and request.customerName !=''">
+        <if test="request != null and request.customerName != null and request.customerName !=''">
             and customer_name like concat('%',#{request.customerName},'%')
         </if>
-        <if test="request.customerDeptName != null and request.customerDeptName !=''">
+        <if test="request != null and request.customerDeptName != null and request.customerDeptName !=''">
             and customer_dept_name like concat('%',#{request.customerDeptName},'%')
         </if>
-        <if test="request.createUserName != null and request.createUserName !=''">
+        <if test="request != null and request.createUserName != null and request.createUserName !=''">
             and create_user_name like concat('%',#{request.createUserName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSealUseNoteMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSealUseNoteMapper.xml
index ab37bc1..b02bb33 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSealUseNoteMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSealUseNoteMapper.xml
@@ -29,32 +29,32 @@
     </sql>
 
     <select id="selectBatchForApprovalList" resultMap="BaseResultMap">
-        SELECT *
+        SELECT brsun.*, brsi.seal_name, brsi.seal_type, brsi.approver_name
         FROM biz_resource_seal_use_note brsun
         JOIN biz_resource_seal_info brsi ON brsun.seal_id = brsi.id
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and brsun.approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and brsun.create_user_id = #{request.createUserId}
         </if>
-        <if test="request.sealName != null and request.sealName !=''">
+        <if test="request != null and request.sealName != null and request.sealName !=''">
             and brsi.seal_name like concat('%',#{request.sealName},'%')
         </if>
-        <if test="request.sealType != null and request.sealType !=''">
+        <if test="request != null and request.sealType != null and request.sealType !=''">
             and brsi.seal_type = #{request.sealType}
         </if>
-        <if test="request.applyDeptName != null and request.applyDeptName !=''">
+        <if test="request != null and request.applyDeptName != null and request.applyDeptName !=''">
             and brsun.apply_dept_name like concat('%',#{request.applyDeptName},'%')
         </if>
-        <if test="request.applyUserName != null and request.applyUserName !=''">
+        <if test="request != null and request.applyUserName != null and request.applyUserName !=''">
             and brsun.apply_user_name like concat('%',#{request.applyUserName},'%')
         </if>
-        <if test="request.applyTimeStart != null and request.applyTimeStart !=''">
+        <if test="request != null and request.applyTimeStart != null and request.applyTimeStart !=''">
             and brsun.apply_time &gt;= #{request.applyTimeStart}
         </if>
-        <if test="request.applyTimeEnd != null and request.applyTimeEnd !=''">
+        <if test="request != null and request.applyTimeEnd != null and request.applyTimeEnd !=''">
             and brsun.apply_time &lt;= #{request.applyTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml
index 119bf7d..4f8392a 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml
@@ -31,6 +31,12 @@
         <if test="request.deptName != null and request.deptName !=''">
             and brsi.dept_name like concat('%',#{request.deptName},'%')
         </if>
+        <if test="request.ids != null">
+            and brsv.id in
+            <foreach collection="request.ids" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
         ORDER BY brsv.grant_date DESC
     </select>
 
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSupplierInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSupplierInfoMapper.xml
index fe8d399..e8ce7ef 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSupplierInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSupplierInfoMapper.xml
@@ -48,28 +48,28 @@
         SELECT *
         FROM biz_resource_supplier_info
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.supplierNo != null and request.supplierNo !=''">
+        <if test="request != null and request.supplierNo != null and request.supplierNo !=''">
             and supplier_no like concat('%',#{request.supplierNo},'%')
         </if>
-        <if test="request.supplierName != null and request.supplierName !=''">
+        <if test="request != null and request.supplierName != null and request.supplierName !=''">
             and supplier_name like concat('%',#{request.supplierName},'%')
         </if>
-        <if test="request.director != null and request.director !=''">
+        <if test="request != null and request.director != null and request.director !=''">
             and director like concat('%',#{request.director},'%')
         </if>
-        <if test="request.supplierType != null and request.supplierType !=''">
+        <if test="request != null and request.supplierType != null and request.supplierType !=''">
             and supplier_type = #{request.supplierType}
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/EnvLocationInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/EnvLocationInfoMapper.xml
new file mode 100644
index 0000000..68bcf10
--- /dev/null
+++ b/casic-metering-dao/src/main/resources/mapper/resource/EnvLocationInfoMapper.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.mapper.resource.EnvLocationInfoMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.resource.EnvLocationInfo">
+        <id column="id" property="id" />
+        <result column="location_no" property="locationNo" />
+        <result column="location_name" property="locationName" />
+        <result column="location_position" property="locationPosition" />
+        <result column="create_user_id" property="createUserId" />
+        <result column="create_user" property="createUser" />
+        <result column="create_time" property="createTime" />
+        <result column="update_time" property="updateTime" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, location_no, location_name, location_position, create_user_id, create_user, create_time, update_time
+    </sql>
+
+    <select id="selectLocationListPage" resultType="com.casic.missiles.dto.resource.environment.LocationListResponse">
+        SELECT *
+        FROM env_location_info
+        WHERE 1=1
+        <if test="request.locationNo != null and request.locationNo !=''">
+            AND location_no LIKE concat('%',#{request.locationNo},'%')
+        </if>
+        <if test="request.locationName != null and request.locationName !=''">
+            AND location_name LIKE concat('%',#{request.locationName},'%')
+        </if>
+        ORDER BY create_time DESC
+    </select>
+
+</mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml
index b28c18f..8854047 100644
--- a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml
@@ -11,7 +11,6 @@
         <result column="sign_desc" property="signDesc" />
         <result column="sign_director" property="signDirector" />
         <result column="sign_user_id" property="signUserId" />
-        <result column="sign_type" property="signType" />
         <result column="minio_file_name" property="minioFileName" />
         <result column="create_time" property="createTime" />
         <result column="update_time" property="updateTime" />
@@ -28,7 +27,6 @@
         <result column="sign_name" property="signName" />
         <result column="sign_desc" property="signDesc" />
         <result column="sign_director" property="signDirector" />
-        <result column="sign_type" property="signType" />
         <result column="sign_user_id" property="signUserId" />
         <result column="minio_file_name" property="minioFileName" />
         <result column="create_time" property="createTime" />
@@ -62,4 +60,58 @@
         JOIN system_sign_user_relation ssur ON ss.id = ssur.sign_id
         WHERE ssur.user_id = #{userId}
     </select>
+
+    <select id="selectSignListPage" resultMap="BaseResultMap">
+        SELECT ss.*, sd.SIMPLE_NAME AS deptName
+        FROM system_sign ss
+        LEFT JOIN sys_user su ON su.id = ss.sign_user_id
+        LEFT JOIN sys_dept sd ON sd.id = su.dept_id
+        WHERE 1=1
+        <if test="request.signNo != null and request.signNo !=''">
+            AND ss.sign_no LIKE concat('%',#{request.signNo},'%')
+        </if>
+        <if test="request.signName != null and request.signName !=''">
+            AND ss.sign_name LIKE concat('%',#{request.signName},'%')
+        </if>
+        <if test="request.signDirector != null and request.signDirector !=''">
+            AND ss.sign_director LIKE concat('%',#{request.signDirector},'%')
+        </if>
+        <if test="request.signUserId != null and request.signUserId !=''">
+            AND ss.sign_user_id = #{request.signUserId}
+        </if>
+        <if test="request.createStartTime != null and request.createStartTime !=''">
+            AND DATE_FORMAT(ss.create_time,'%Y-%m-%d') &gt;= DATE_FORMAT(#{request.createStartTime},'%Y-%m-%d')
+        </if>
+        <if test="request.createEndTime != null and request.createEndTime !=''">
+            AND DATE_FORMAT(ss.create_time,'%Y-%m-%d')  &lt;= DATE_FORMAT(#{request.createEndTime},'%Y-%m-%d')
+        </if>
+        ORDER BY ss.create_time DESC
+    </select>
+
+    <select id="selectSignList" resultMap="BaseResultMap">
+        SELECT ss.*, sd.SIMPLE_NAME AS deptName
+        FROM system_sign ss
+        LEFT JOIN sys_user su ON su.id = ss.sign_user_id
+        LEFT JOIN sys_dept sd ON sd.id = su.dept_id
+        WHERE 1=1
+        <if test="request.signNo != null and request.signNo !=''">
+            AND ss.sign_no LIKE concat('%',#{request.signNo},'%')
+        </if>
+        <if test="request.signName != null and request.signName !=''">
+            AND ss.sign_name LIKE concat('%',#{request.signName},'%')
+        </if>
+        <if test="request.signDirector != null and request.signDirector !=''">
+            AND ss.sign_director LIKE concat('%',#{request.signDirector},'%')
+        </if>
+        <if test="request.signUserId != null and request.signUserId !=''">
+            AND ss.sign_user_id = #{request.signUserId}
+        </if>
+        <if test="request.createStartTime != null and request.createStartTime !=''">
+            AND DATE_FORMAT(ss.create_time,'%Y-%m-%d') &gt;= DATE_FORMAT(#{request.createStartTime},'%Y-%m-%d')
+        </if>
+        <if test="request.createEndTime != null and request.createEndTime !=''">
+            AND DATE_FORMAT(ss.create_time,'%Y-%m-%d')  &lt;= DATE_FORMAT(#{request.createEndTime},'%Y-%m-%d')
+        </if>
+        ORDER BY ss.create_time DESC
+    </select>
 </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 515050a..60f530b 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
@@ -47,8 +47,8 @@
     String STORAGE_LOCATION = "bizStorageLocation";
     //计量专业
     String MEASURE_MAJOR = "bizMeasureMajor";
-    //管理状态
-    String MANAGER_STATE = "bizManagerState";
+    //标准装置管理状态
+    String STANDARD_MANAGER_STATE = "bizStandardManagerState";
 
     /**
      * 资源管理 字典code
@@ -95,8 +95,6 @@
     String MEASURE_STATUS = "measureStatus";
     //检定方式
     String MEASURE_TYPE = "measureType";
-    //标识打印标志类型
-    String IDENTIFY_PRINT_TYPE = "bizBusinessIdentify";
     //变更类型
     String REPORT_CHANGE_TYPE = "bizCertChangeType";
     //规模类型
@@ -111,19 +109,24 @@
     String MEASURE_CATEGORY = "measureCategory";
     //检定结果
     String MEASURE_RESULT = "measureResult";
+    //分包原因
+    String OUTSOURCE_REASON = "outsourceReason";
+
+    /**
+     * 系统管理
+     */
+    String TEMPLATE_TYPE = "templateType";
+
 
     /**
      * 标准装置 字典code
      */
     //类别
     String STANDARD_CATEGORY = "standardCategory";
-    //管理状态
-    String STANDARD_MANAGER_STATE = "standardManagerState";
     //标准等级
     String STANDARD_LEVEL = "standardLevel";
     //传递范围
     String STANDARD_TRANSMIT_RANGE = "transmitRange";
-
     //资本来源
     String CAPITAL_SOURCE = "capitalSource";
     //标准装置-申请类型
@@ -148,8 +151,6 @@
     String CERTIFICATE_CLASS = "certificationClass";
     //证书管理-检校专业
     String CALIBRATION_MAJOR = "calibrationMajor";
-    //分包原因
-    String OUTSOURCE_REASON = "outsourceReason";
 
     /**
      * 工作台
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/BaseApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/BaseApprovalListRequest.java
index 73c12c1..80d7424 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/BaseApprovalListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/BaseApprovalListRequest.java
@@ -6,6 +6,7 @@
 
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotEmpty;
+import java.util.List;
 
 /**
  * @Description:
@@ -19,14 +20,14 @@
      * 表单id
      */
     @NotBlank(message = "表单id不能为空")
-    @ApiModelProperty(value = "表单id（流程定义对应的表单id，等价于业务id）", dataType = "String")
+    @ApiModelProperty(value = "表单id（流程定义对应的表单id，等价于业务id），导出接口不用传", dataType = "String")
     private String formId;
 
     /**
      * 审批状态类型，对应ApprovalStatusEnum
      */
     @NotEmpty(message = "审批状态类型不能为空")
-    @ApiModelProperty(value = "审批状态类型code", dataType = "String")
+    @ApiModelProperty(value = "审批状态类型code，导出接口不用传", dataType = "String")
     private String approvalStatus;
 
     @ApiModelProperty(hidden = true)
@@ -34,4 +35,7 @@
 
     @ApiModelProperty(hidden = true)
     private Long createUserId;
+
+    @ApiModelProperty(value = "导出ids", dataType = "List")
+    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificatePrintApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificatePrintApprovalListRequest.java
index b93d1c9..3cc2f4e 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificatePrintApprovalListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificatePrintApprovalListRequest.java
@@ -5,8 +5,6 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import java.util.List;
-
 /**
  * @Description:
  * @Author: wangpeng
@@ -38,7 +36,4 @@
 
     @ApiModelProperty(value = "创建结束时间", dataType = "String")
     private String createTimeEnd;
-
-    @ApiModelProperty(value = "导出ids", dataType = "List")
-    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportApprovalListRequest.java
index 4f7a038..c115847 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportApprovalListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportApprovalListRequest.java
@@ -5,8 +5,6 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import java.util.List;
-
 /**
  * @Description:
  * @Author: wangpeng
@@ -15,6 +13,8 @@
 @ApiModel
 @Data
 public class CertificateReportApprovalListRequest extends BaseApprovalListRequest {
+    @ApiModelProperty(value = "委托方id", dataType = "String")
+    private Long customerId;
 
     @ApiModelProperty(value = "证书报告编号", dataType = "String")
     private String certificateReportNo;
@@ -37,6 +37,4 @@
     @ApiModelProperty(value = "检校结束时间", dataType = "String")
     private String calibrationTimeEnd;
 
-    @ApiModelProperty(value = "导出ids", dataType = "List")
-    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/identify/IdentifyListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/identify/IdentifyListRequest.java
index 1b87ae6..f019203 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/identify/IdentifyListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/identify/IdentifyListRequest.java
@@ -4,6 +4,8 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * @Description:
  * @Author: wangpeng
@@ -26,4 +28,7 @@
 
     @ApiModelProperty(value = "打印结束时间", dataType = "String")
     private String createTimeEnd;
+
+    @ApiModelProperty(value = "导出ids", dataType = "List")
+    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListRequest.java
index 1264883..62415fb 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListRequest.java
@@ -7,6 +7,7 @@
 import lombok.Data;
 
 import javax.validation.constraints.NotBlank;
+import java.util.List;
 
 @Data
 @ApiModel
@@ -37,4 +38,6 @@
     @ApiModelProperty(value = "是否加急（1是0否null全部）", dataType = "Integer")
     private String isUrgent;
 
+    @ApiModelProperty(value = "导出ids", dataType = "List")
+    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListRequest.java
index 5201d7b..499760a 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListRequest.java
@@ -17,6 +17,9 @@
     @ApiModelProperty(value = "任务单编号", dataType = "String")
     private String orderNo;
 
+    @ApiModelProperty(value = "委托方id", dataType = "Long")
+    private Long customerId;
+
     @ApiModelProperty(value = "委托方名称", dataType = "String")
     private String customerName;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OrderSampleDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OrderSampleDTO.java
new file mode 100644
index 0000000..796edc0
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OrderSampleDTO.java
@@ -0,0 +1,19 @@
+package com.casic.missiles.dto.business.outsource;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/8/24 11:38
+ */
+@ApiModel
+@Data
+public class OrderSampleDTO {
+    @ApiModelProperty(value = "任务单id", dataType = "Long")
+    private Long orderId;
+    @ApiModelProperty(value = "受检设备id", dataType = "Long")
+    private Long sampleId;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceAssessApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceAssessApprovalListRequest.java
new file mode 100644
index 0000000..9a930c3
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceAssessApprovalListRequest.java
@@ -0,0 +1,30 @@
+package com.casic.missiles.dto.business.outsource;
+
+import com.casic.missiles.dto.BaseApprovalListRequest;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/8/24 11:01
+ */
+@ApiModel
+@Data
+public class OutsourceAssessApprovalListRequest extends BaseApprovalListRequest {
+    @ApiModelProperty(value = "评审表编号", dataType = "String")
+    private String projectNo;
+
+    @ApiModelProperty(value = "分包机构名称", dataType = "String")
+    private String outsourcerName;
+
+    @ApiModelProperty(value = "申请人", dataType = "String")
+    private String applicantName;
+
+    @ApiModelProperty(value = "申请时间开始", dataType = "String")
+    private String applicantTimeStart;
+
+    @ApiModelProperty(value = "申请时间结束", dataType = "String")
+    private String applicantTimeEnd;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceAssessSaveResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceAssessSaveResponse.java
new file mode 100644
index 0000000..8bf9aad
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceAssessSaveResponse.java
@@ -0,0 +1,20 @@
+package com.casic.missiles.dto.business.outsource;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/8/14 16:17
+ */
+@ApiModel
+@Data
+public class OutsourceAssessSaveResponse {
+    @ApiModelProperty(value = "主键id", dataType = "Long")
+    private Long id;
+
+    @ApiModelProperty(value = "编号", dataType = "String")
+    private String projectNo;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProtocolApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProtocolApprovalListRequest.java
new file mode 100644
index 0000000..0f32331
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProtocolApprovalListRequest.java
@@ -0,0 +1,30 @@
+package com.casic.missiles.dto.business.outsource;
+
+import com.casic.missiles.dto.BaseApprovalListRequest;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/8/24 15:01
+ */
+@ApiModel
+@Data
+public class OutsourceProtocolApprovalListRequest extends BaseApprovalListRequest {
+    @ApiModelProperty(value = "协议书编号", dataType = "String")
+    private String protocolNo;
+
+    @ApiModelProperty(value = "分包方名称", dataType = "String")
+    private String outsourcerName;
+
+    @ApiModelProperty(value = "申请人", dataType = "String")
+    private String applicantName;
+
+    @ApiModelProperty(value = "申请时间开始", dataType = "String")
+    private String applicantTimeStart;
+
+    @ApiModelProperty(value = "申请时间结束", dataType = "String")
+    private String applicantTimeEnd;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProtocolSaveResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProtocolSaveResponse.java
new file mode 100644
index 0000000..e324967
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProtocolSaveResponse.java
@@ -0,0 +1,20 @@
+package com.casic.missiles.dto.business.outsource;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/8/14 16:17
+ */
+@ApiModel
+@Data
+public class OutsourceProtocolSaveResponse {
+    @ApiModelProperty(value = "主键id", dataType = "Long")
+    private Long id;
+
+    @ApiModelProperty(value = "编号", dataType = "String")
+    private String protocolNo;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveApprovalListRequest.java
index f29f4e4..7047c28 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveApprovalListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveApprovalListRequest.java
@@ -5,8 +5,6 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import java.util.List;
-
 /**
  * @Description: 现场检测审批列表请求实体
  * @Author: wangpeng
@@ -30,7 +28,4 @@
     @ApiModelProperty(value = "申请时间结束", dataType = "String")
     private String applyTimeEnd;
 
-    @ApiModelProperty(value = "导出ids", dataType = "List")
-    private List<Long> ids;
-
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveDetailResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveDetailResponse.java
index 1f28752..394c934 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveDetailResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveDetailResponse.java
@@ -12,6 +12,18 @@
     @ApiModelProperty(value = "id，更新/删除使用参数", dataType = "Long")
     private Long id;
 
+    @ApiModelProperty(value = "实验室代码(字典code)", dataType = "String")
+    private String labCode;
+
+    @ApiModelProperty(value = "实验室代码(字典value)", dataType = "String")
+    private String labCodeName;
+
+    @ApiModelProperty(value = "组别代码(字典code)", dataType = "String")
+    private String groupCode;
+
+    @ApiModelProperty(value = "组别代码(字典value)", dataType = "String")
+    private String groupCodeName;
+
     @ApiModelProperty(value = "审批编号", dataType = "String")
     private String siteExecutiveNo;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/environment/LocationListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/environment/LocationListRequest.java
new file mode 100644
index 0000000..13d03c3
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/environment/LocationListRequest.java
@@ -0,0 +1,20 @@
+package com.casic.missiles.dto.resource.environment;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/6/8 13:56
+ */
+@ApiModel
+@Data
+public class LocationListRequest {
+    @ApiModelProperty(value = "地点编号", dataType = "String")
+    private String locationNo;
+
+    @ApiModelProperty(value = "地点名称", dataType = "String")
+    private String locationName;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/environment/LocationListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/environment/LocationListResponse.java
new file mode 100644
index 0000000..4c531af
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/environment/LocationListResponse.java
@@ -0,0 +1,78 @@
+package com.casic.missiles.dto.resource.environment;
+
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
+import com.baomidou.mybatisplus.annotation.TableField;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description: 地点列表响应实体
+ * @Author: wangpeng
+ * @Date: 2023/6/8 13:53
+ */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
+@ApiModel
+@Data
+public class LocationListResponse {
+    @ApiModelProperty(value = "主键id", dataType = "Long")
+    private Long id;
+
+    /**
+     * 地点编号
+     */
+    @ExcelProperty("地点编号")
+    @ApiModelProperty(value = "地点编号", dataType = "String")
+    private String locationNo;
+
+    /**
+     * 地点名称
+     */
+    @ExcelProperty("地点名称")
+    @ApiModelProperty(value = "地点名称", dataType = "String")
+    private String locationName;
+
+    /**
+     * 地点位置
+     */
+    @ExcelProperty("地点位置")
+    @ApiModelProperty(value = "地点位置", dataType = "String")
+    private String locationPosition;
+
+    /**
+     * 创建人id
+     */
+    @ApiModelProperty(value = "创建人id", dataType = "Long")
+    private Long createUserId;
+
+    /**
+     * 创建人
+     */
+    @ExcelProperty("创建人")
+    @ApiModelProperty(value = "创建人", dataType = "String")
+    @TableField("create_user")
+    private String createUser;
+
+    /**
+     * 创建时间
+     */
+    @ExcelProperty("创建时间")
+    @ApiModelProperty(value = "创建时间", dataType = "String")
+    private String createTime;
+
+    /**
+     * 更新时间
+     */
+    @ApiModelProperty(value = "更新时间", dataType = "String")
+    private String updateTime;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertRequest.java
index 9a7f6c6..c827915 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertRequest.java
@@ -4,6 +4,8 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * @Description:
  * @Author: wangpeng
@@ -16,4 +18,7 @@
     private String name;
     @ApiModelProperty(value = "部门名", dataType = "String")
     private String deptName;
+
+    @ApiModelProperty(value = "导出ids", dataType = "List")
+    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertResponse.java
index f78b159..8f2f79e 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertResponse.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.dto.resource.staff;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.casic.missiles.annotation.DictCodeField;
 import com.casic.missiles.constants.MeterDictCode;
 import io.swagger.annotations.ApiModel;
@@ -13,12 +20,18 @@
  * @Author: wangpeng
  * @Date: 2023/7/27 15:13
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @ApiModel
 @Data
 public class StaffCertResponse {
     /**
      * 人员编号
      */
+    @ExcelProperty(value = "人员编号",order = 0)
     @NotEmpty(message = "人员编号不能为空")
     @ApiModelProperty(value = "人员编号", dataType = "String")
     private String staffNo;
@@ -26,6 +39,7 @@
     /**
      * 姓名
      */
+    @ExcelProperty(value = "姓名",order = 1)
     @ApiModelProperty(value = "姓名", dataType = "String")
     private String staffName;
 
@@ -54,6 +68,7 @@
     /**
      * 部门名字
      */
+    @ExcelProperty(value = "工作部门",order = 2)
     @ApiModelProperty(value = "部门名字", dataType = "String")
     private String deptName;
 
@@ -66,6 +81,7 @@
     /**
      * 计量专业
      */
+    @ExcelProperty(value = "计量专业",order = 3)
     @ApiModelProperty(value = "计量专业", dataType = "String")
     private String major;
 
@@ -110,6 +126,7 @@
     /**
      * 证书号
      */
+    @ExcelProperty(value = "证号",order = 4)
     @ApiModelProperty(value = "证书号", dataType = "String")
     private String certNo;
 
@@ -122,12 +139,14 @@
     /**
      * 有效日期
      */
+    @ExcelProperty(value = "证书有效期",order = 6)
     @ApiModelProperty(value = "有效日期", dataType = "String")
     private String effectiveDate;
 
     /**
      * 发放日期
      */
+    @ExcelProperty(value = "发证日期",order = 5)
     @ApiModelProperty(value = "发放日期", dataType = "String")
     private String grantDate;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffListRequest.java
index 7c4afb3..0a1194a 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffListRequest.java
@@ -4,6 +4,8 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * @Description:
  * @Author: wangpeng
@@ -18,4 +20,7 @@
     private String deptName;
     @ApiModelProperty(value = "部门id", dataType = "Long")
     private Long deptId;
+
+    @ApiModelProperty(value = "导出ids", dataType = "List")
+    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/TrainListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/TrainListRequest.java
index f68597b..6321f8b 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/TrainListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/TrainListRequest.java
@@ -14,6 +14,8 @@
 public class TrainListRequest {
     @ApiModelProperty(value = "训练登记表编号", dataType = "String")
     private String trainNo;
+    @ApiModelProperty(value = "值班领导", dataType = "String")
+    private String dutyLeader;
     @ApiModelProperty(value = "创建开始时间", dataType = "String")
     private String createTimeStart;
     @ApiModelProperty(value = "创建结束时间", dataType = "String")
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/SignAddRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/SignAddRequest.java
index 117be34..d71055c 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/SignAddRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/SignAddRequest.java
@@ -43,13 +43,6 @@
     private Long signUserId;
 
     /**
-     * 签章或签名-字典code
-     */
-    @NotBlank(message = "类型不能为空")
-    @ApiModelProperty(value = "签名/签章-字典code", dataType = "String", required = true)
-    private String signType;
-
-    /**
      * minio存储文件名
      */
     @ApiModelProperty(value = "上传文件返回名称", dataType = "String")
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateAddRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateAddRequest.java
index aff1265..6316648 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateAddRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateAddRequest.java
@@ -17,30 +17,28 @@
 @Data
 public class TemplateAddRequest extends BaseSystemRequest {
     /**
-     * 原始记录模板/证书报告模板名称
+     * 模板名称
      */
     @ApiModelProperty(value = "名称", dataType = "String", required = true)
     @NotBlank(message = "名称不能为空")
     private String templateName;
 
     /**
-     * 原始记录模板/证书报告模板描述
+     * 模板描述
      */
     @ApiModelProperty(value = "描述", dataType = "String")
     private String templateDesc;
 
     /**
-     * 原始记录模板/证书报告模板创建人
+     * 创建人
      */
     @ApiModelProperty(value = "创建人", dataType = "String", required = true)
     @NotBlank(message = "创建人不能为空")
     private String templateCreator;
 
-    /**
-     * 原始记录模板/证书报告模板-字典code
-     */
-    @NotBlank(message = "类型不能为空")
-    @ApiModelProperty(value = "原始记录模板/证书报告模板-字典code", dataType = "String", required = true)
+
+    @NotBlank(message = "模板类型不能为空")
+    @ApiModelProperty(value = "模板类型(字典code)", dataType = "String", required = true)
     private String templateType;
 
     /**
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateListRequest.java
index eec5a1e..6d17bbe 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateListRequest.java
@@ -1,11 +1,12 @@
 package com.casic.missiles.dto.system;
 
+import com.casic.missiles.annotation.DictCodeField;
+import com.casic.missiles.constants.MeterDictCode;
 import com.casic.missiles.dto.BaseSystemRequest;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import javax.validation.constraints.NotBlank;
 import java.util.List;
 
 /**
@@ -19,8 +20,8 @@
     /**
      * 类型
      */
-//    @ApiModelProperty(value = "类型-字典code", dataType = "String", required = true)
-    @NotBlank(message = "类型不能为空")
+    @DictCodeField(message = "模板类型不合法", cacheName = MeterDictCode.TEMPLATE_TYPE)
+    @ApiModelProperty(value = "模板类型(字典code)", dataType = "String")
     private String templateType;
 
     /**
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificateChangeApply.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificateChangeApply.java
index 9216308..36923fd 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificateChangeApply.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificateChangeApply.java
@@ -1,11 +1,19 @@
 package com.casic.missiles.model.business;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 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 com.casic.missiles.dto.BaseRequest;
+import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -20,6 +28,12 @@
  * @author wangpeng
  * @since 2023-08-15
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
+@ApiModel
 @Data
 @TableName("biz_business_certificate_change_apply")
 public class BizBusinessCertificateChangeApply extends BaseRequest implements Serializable {
@@ -33,6 +47,7 @@
     /**
      * 申请单编号
      */
+    @ExcelProperty(value = "申请单编号", order = 1)
     @ApiModelProperty(value = "申请单编号", dataType = "String")
     @TableField("change_apply_no")
     private String changeApplyNo;
@@ -40,6 +55,7 @@
     /**
      * 申请单名字
      */
+    @ExcelProperty(value = "申请单名称", order = 2)
     @ApiModelProperty(value = "申请单名字", dataType = "String")
     @TableField("change_apply_name")
     private String changeApplyName;
@@ -54,6 +70,7 @@
     /**
      * 更换证书编号
      */
+    @ExcelProperty(value = "更换证书编号", order = 3)
     @ApiModelProperty(value = "更换证书编号", dataType = "String")
     @TableField("change_report_no")
     private String changeReportNo;
@@ -61,7 +78,8 @@
     /**
      * 更换证书名字
      */
-    @ApiModelProperty(value = "更换证书名字", dataType = "String")
+    @ExcelProperty(value = "更换证书/报告名称", order = 4)
+    @ApiModelProperty(value = "更换证书/报告名称", dataType = "String")
     @TableField("change_report_name")
     private String changeReportName;
 
@@ -73,6 +91,7 @@
     @TableField("change_type")
     private String changeType;
 
+    @ExcelProperty(value = "变更类型", order = 5)
     @ApiModelProperty(value = "变更类型(字典value)", dataType = "String")
     @TableField(exist = false)
     private String changeTypeName;
@@ -142,13 +161,15 @@
     /**
      * 创建用户名字
      */
-    @ApiModelProperty(value = "创建用户名字", dataType = "String")
+    @ExcelProperty(value = "创建人", order = 6)
+    @ApiModelProperty(value = "创建人名字", dataType = "String")
     @TableField("create_user_name")
     private String createUserName;
 
     /**
      * 创建时间
      */
+    @ExcelProperty(value = "创建时间", order = 7)
     @ApiModelProperty(value = "创建时间", dataType = "String")
     @TableField("create_time")
     private String createTime;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificateReport.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificateReport.java
index f01db9e..db06018 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificateReport.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificateReport.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.model.business;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -22,6 +29,11 @@
  * @author wangpeng
  * @since 2023-08-14
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @ApiModel
 @Data
 @TableName("biz_business_certificate_report")
@@ -36,6 +48,7 @@
     /**
      * 证书报告编号
      */
+    @ExcelProperty(value = "证书报告编号", order = 1)
     @ApiModelProperty(value = "证书报告编号", dataType = "String")
     @TableField("certificate_report_no")
     private String certificateReportNo;
@@ -43,6 +56,7 @@
     /**
      * 证书报告名称
      */
+    @ExcelProperty(value = "证书报告名称", order = 2)
     @ApiModelProperty(value = "证书报告名称", dataType = "String")
     @TableField("certificate_report_name")
     private String certificateReportName;
@@ -62,6 +76,7 @@
     @TableField("measure_category")
     private String measureCategory;
 
+    @ExcelProperty(value = "检校类别", order = 6)
     @ApiModelProperty(value = "检校类别(字典value)", dataType = "String")
     @TableField(exist = false)
     private String measureCategoryName;
@@ -69,6 +84,7 @@
     /**
      * 检校时间
      */
+    @ExcelProperty(value = "检校时间", order = 8)
     @ApiModelProperty(value = "检校时间", dataType = "String")
     @TableField("calibration_time")
     private String calibrationTime;
@@ -267,18 +283,22 @@
     @TableField(exist = false)
     private Integer decisionItem;
 
-    @ApiModelProperty(value = "设备样品编号（列表返回参数）", dataType = "String")
+    @ExcelProperty(value = "被检设备统一编号", order = 3)
+    @ApiModelProperty(value = "被检设备统一编号（列表返回参数）", dataType = "String")
     @TableField(exist = false)
     private String sampleNo;
 
-    @ApiModelProperty(value = "设备样品名称（列表返回参数）", dataType = "String")
+    @ExcelProperty(value = "被检设备名称", order = 4)
+    @ApiModelProperty(value = "被检设备名称（列表返回参数）", dataType = "String")
     @TableField(exist = false)
     private String sampleName;
 
-    @ApiModelProperty(value = "设备样品规格型号（列表返回参数）", dataType = "String")
+    @ExcelProperty(value = "规格型号", order = 5)
+    @ApiModelProperty(value = "规格型号（列表返回参数）", dataType = "String")
     @TableField(exist = false)
     private String sampleModel;
 
+    @ExcelProperty(value = "检定员", order = 7)
     @ApiModelProperty(value = "检定员名字（列表返回参数）", dataType = "String")
     @TableField(exist = false)
     private String staffName;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessIdentifyInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessIdentifyInfo.java
index 46bfba5..f1a9bec 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessIdentifyInfo.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessIdentifyInfo.java
@@ -1,10 +1,15 @@
 package com.casic.missiles.model.business;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 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;
 
@@ -20,6 +25,11 @@
  * @author wangpeng
  * @since 2023-08-15
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @Data
 @TableName("biz_business_identify_info")
 public class BizBusinessIdentifyInfo implements Serializable {
@@ -33,6 +43,7 @@
     /**
      * 记录编号
      */
+    @ExcelProperty(value = "记录编号", order = 1)
     @ApiModelProperty(value = "记录编号", dataType = "String")
     @TableField("record_no")
     private String recordNo;
@@ -41,20 +52,15 @@
      * 标志类型(字典code)
      */
     @NotEmpty(message = "标志类型不能为空")
-    @ApiModelProperty(value = "标志类型(字典code)", dataType = "String")
-    @DictCodeField(message = "标志类型不合法", cacheName = MeterDictCode.IDENTIFY_PRINT_TYPE)
+    @ApiModelProperty(value = "标志类型(直接存计量标识/使用状态/校准状态的字典value)", dataType = "String")
     @TableField("identify_type")
     private String identifyType;
 
-    @ApiModelProperty(value = "标志类型(字典value)", dataType = "String")
-    @TableField(exist = false)
-    private String identifyTypeName;
-
     /**
      * 设备id(可以是受检设备/设备台账)
      */
     @NotNull(message = "设备id不能为空")
-    @ApiModelProperty(value = "设备id(可以是受检设备/设备台账)", dataType = "String")
+    @ApiModelProperty(value = "设备id(可以是受检设备/设备台账)", dataType = "Long")
     @TableField("device_id")
     private Long deviceId;
 
@@ -66,29 +72,32 @@
     @TableField("device_type")
     private String deviceType;
 
+    @ExcelProperty(value = "统一编号", order = 3)
     @NotEmpty(message = "设备编号不能为空")
-    @ApiModelProperty(value = "设备编号", dataType = "String")
+    @ApiModelProperty(value = "统一编号", dataType = "String")
     @TableField("device_no")
     private String deviceNo;
 
     /**
      * 设备名字
      */
-    @NotEmpty(message = "设备名字不能为空")
-    @ApiModelProperty(value = "设备名字", dataType = "String")
+    @ExcelProperty(value = "设备名称", order = 4)
+    @NotEmpty(message = "设备名称不能为空")
+    @ApiModelProperty(value = "设备名称", dataType = "String")
     @TableField("device_name")
     private String deviceName;
 
     /**
      * 检定员id
      */
-    @ApiModelProperty(value = "检定员id", dataType = "String")
+    @ApiModelProperty(value = "检定员id", dataType = "Long")
     @TableField("measure_person_id")
     private Long measurePersonId;
 
     /**
      * 检定员名字
      */
+    @ExcelProperty(value = "检定员", order = 5)
     @ApiModelProperty(value = "检定员名字", dataType = "String")
     @TableField("measure_person")
     private String measurePerson;
@@ -103,7 +112,8 @@
     /**
      * 更新时间
      */
-    @ApiModelProperty(value = "更新时间", dataType = "String")
+    @ExcelProperty(value = "打印时间", order = 6)
+    @ApiModelProperty(value = "打印时间", dataType = "String")
     @TableField("update_time")
     private String updateTime;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceAssess.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceAssess.java
index 659d9ca..6720b90 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceAssess.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceAssess.java
@@ -1,11 +1,26 @@
 package com.casic.missiles.model.business;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 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 com.casic.missiles.dto.BaseRequest;
+import com.casic.missiles.dto.business.outsource.OrderSampleDTO;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import javax.validation.constraints.NotEmpty;
 import java.io.Serializable;
+import java.util.List;
 
 /**
  * <p>
@@ -15,146 +30,231 @@
  * @author wangpeng
  * @since 2023-08-16
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
+@ApiModel
 @Data
 @TableName("biz_business_outsource_assess")
-public class BizBusinessOutsourceAssess implements Serializable {
+public class BizBusinessOutsourceAssess extends BaseRequest implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
+    @ApiModelProperty(value = "id，更新/删除使用参数", dataType = "Long")
     @TableId("id")
     private Long id;
 
     /**
      * 评审表编号
      */
+    @ExcelProperty(value = "评审表编号", order = 1)
+    @ApiModelProperty(value = "评审表编号(后台生成)", dataType = "String")
     @TableField("project_no")
     private String projectNo;
 
     /**
      * 评审表名称
      */
+    @ExcelProperty(value = "评审表名称", order = 2)
+    @ApiModelProperty(value = "评审表名称", dataType = "String")
     @TableField("project_name")
     private String projectName;
 
+    @NotEmpty(message = "实验室代码不能为空")
+    @DictCodeField(message = "实验室代码描述不合法", cacheName = MeterDictCode.LAB_CODE)
+    @ApiModelProperty(value = "实验室代码(字典code)", dataType = "String")
+    @TableField("lab_code")
+    private String labCode;
+
+    @ApiModelProperty(value = "实验室代码(字典value)", dataType = "String")
+    @TableField(exist = false)
+    private String labCodeName;
+
+    /**
+     * 组别代码
+     */
+    @NotEmpty(message = "组别代码不能为空")
+    @DictCodeField(message = "组别代码描述不合法", cacheName = MeterDictCode.GROUP_CODE)
+    @ApiModelProperty(value = "组别代码(字典code)", dataType = "String")
+    @TableField("group_code")
+    private String groupCode;
+
+    @ApiModelProperty(value = "组别代码(字典value)", dataType = "String")
+    @TableField(exist = false)
+    private String groupCodeName;
+
     /**
      * 申请人id
      */
+    @ApiModelProperty(value = "申请人id", dataType = "String")
     @TableField("applicant_id")
     private Long applicantId;
 
     /**
      * 申请人名字
      */
+    @ExcelProperty(value = "申请人", order = 5)
+    @ApiModelProperty(value = "申请人", dataType = "String")
     @TableField("applicant_name")
     private String applicantName;
 
     /**
      * 申请时间
      */
+    @ExcelProperty(value = "申请时间", order = 6)
+    @ApiModelProperty(value = "申请时间", dataType = "String")
     @TableField("applicant_time")
     private String applicantTime;
 
     /**
      * 附件(minio存储文件名)
      */
+    @ApiModelProperty(value = "附件(minio存储文件名)", dataType = "String")
     @TableField("minio_file_name")
     private String minioFileName;
 
     /**
      * 备注
      */
+    @ApiModelProperty(value = "备注", dataType = "String")
     @TableField("remark")
     private String remark;
 
     /**
      * 创建人id
      */
+    @ApiModelProperty(value = "创建人id", dataType = "String")
     @TableField("create_user_id")
     private Long createUserId;
 
     /**
      * 创建人名字
      */
+    @ApiModelProperty(value = "创建人名字", dataType = "String")
     @TableField("create_user_name")
     private String createUserName;
 
     /**
      * 分包方id
      */
+    @ApiModelProperty(value = "评审表编号", dataType = "String")
     @TableField("outsourcer_id")
     private Long outsourcerId;
 
     /**
      * 预计开始时间
      */
+    @ApiModelProperty(value = "预计开始时间", dataType = "String")
     @TableField("pre_start_time")
     private String preStartTime;
 
     /**
      * 预计结束时间
      */
+    @ApiModelProperty(value = "预计结束时间", dataType = "String")
     @TableField("pre_end_time")
     private String preEndTime;
 
     /**
      * 分包原因-字典
      */
+    @ApiModelProperty(value = "分包原因(字典code)", dataType = "String")
+    @DictCodeField(message = "分包原因描述不合法", cacheName = MeterDictCode.OUTSOURCE_REASON)
     @TableField("outsource_reason")
     private String outsourceReason;
 
+    @ApiModelProperty(value = "分包原因(字典value)", dataType = "String")
+    @TableField(exist = false)
+    private String outsourceReasonName;
+
     /**
      * 预计费用
      */
+    @ApiModelProperty(value = "预计费用", dataType = "String")
     @TableField("pre_cost")
     private String preCost;
 
     /**
      * 审批状态
      */
+    @ApiModelProperty(value = "审批状态", dataType = "String")
+    @DictCodeField(message = "审批状态描述不合法", cacheName = MeterDictCode.APPROVAL_STATUS)
     @TableField("approval_status")
     private String approvalStatus;
 
     /**
      * 流程实例id
      */
+    @ApiModelProperty(value = "流程实例id", dataType = "String")
     @TableField("process_id")
     private String processId;
 
     /**
      * 实验室认可情况
      */
+    @ApiModelProperty(value = "实验室认可情况", dataType = "String")
     @TableField("approve_situation")
     private String approveSituation;
 
     /**
      * 溯源性
      */
+    @ApiModelProperty(value = "溯源性", dataType = "String")
     @TableField("traceability")
     private String traceability;
 
     /**
      * 测试方法
      */
+    @ApiModelProperty(value = "测试方法", dataType = "String")
     @TableField("test_method")
     private String testMethod;
 
     /**
      * 技术能力
      */
+    @ApiModelProperty(value = "技术能力", dataType = "String")
     @TableField("technique_ability")
     private String techniqueAbility;
 
     /**
      * 创建时间
      */
+    @ApiModelProperty(hidden = true)
     @TableField("create_time")
     private String createTime;
 
     /**
      * 更新时间
      */
+    @ApiModelProperty(hidden = true)
     @TableField("update_time")
     private String updateTime;
 
+    @ApiModelProperty(value = "审批状态类型-字典value", dataType = "String")
+    @TableField(exist = false)
+    private String approvalStatusName;
 
+    @ApiModelProperty(value = "任务id（同意、驳回等操作使用）", dataType = "String")
+    @TableField(exist = false)
+    private String taskId;
+
+    @ApiModelProperty(value = "可选决策项（1同意驳回拒绝 2同意驳回 3同意拒绝，用于待审批列表同意/驳回/拒绝按钮展示）", dataType = "Integer")
+    @TableField(exist = false)
+    private Integer decisionItem;
+
+    @NotEmpty(message = "受检设备信息不能为空")
+    @ApiModelProperty(value = "受检设备id列表（新建使用参数）", dataType = "List")
+    @TableField(exist = false)
+    private List<OrderSampleDTO> orderSampleList;
+
+    @ExcelProperty(value = "分包机构名称", order = 3)
+    @ApiModelProperty(value = "分包机构名称（列表返回参数）", dataType = "String")
+    private String outsourcerName;
+
+    @ExcelProperty(value = "机构负责人", order = 4)
+    @ApiModelProperty(value = "机构负责人（列表返回参数）", dataType = "String")
+    private String director;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceProtocol.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceProtocol.java
new file mode 100644
index 0000000..38df697
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceProtocol.java
@@ -0,0 +1,225 @@
+package com.casic.missiles.model.business;
+
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
+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 com.casic.missiles.dto.BaseRequest;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotEmpty;
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 计量检定业务-分包管理-测试、校准或检定工作分包协议书
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-08-24
+ */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
+@Data
+@TableName("biz_business_outsource_protocol")
+public class BizBusinessOutsourceProtocol extends BaseRequest implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "id，更新/删除使用参数", dataType = "Long")
+    @TableId("id")
+    private Long id;
+
+    /**
+     * 协议书编号
+     */
+    @ExcelProperty(value = "协议书编号", order = 1)
+    @ApiModelProperty(value = "协议书编号(后台生成)", dataType = "String")
+    @TableField("protocol_no")
+    private String protocolNo;
+
+    /**
+     * 协议书名称
+     */
+    @ExcelProperty(value = "协议书名称", order = 2)
+    @ApiModelProperty(value = "协议书名称", dataType = "String")
+    @TableField("project_name")
+    private String projectName;
+
+    @NotEmpty(message = "实验室代码不能为空")
+    @DictCodeField(message = "实验室代码描述不合法", cacheName = MeterDictCode.LAB_CODE)
+    @ApiModelProperty(value = "实验室代码(字典code)", dataType = "String")
+    @TableField("lab_code")
+    private String labCode;
+
+    @ApiModelProperty(value = "实验室代码(字典value)", dataType = "String")
+    @TableField(exist = false)
+    private String labCodeName;
+
+    @NotEmpty(message = "组别代码不能为空")
+    @DictCodeField(message = "组别代码描述不合法", cacheName = MeterDictCode.GROUP_CODE)
+    @ApiModelProperty(value = "组别代码(字典code)", dataType = "String")
+    @TableField("group_code")
+    private String groupCode;
+
+    @ApiModelProperty(value = "组别代码(字典value)", dataType = "String")
+    @TableField(exist = false)
+    private String groupCodeName;
+
+    /**
+     * 分包方id
+     */
+    @ApiModelProperty(value = "分包方id", dataType = "Long")
+    @TableField("outsourcer_id")
+    private Long outsourcerId;
+
+    /**
+     * 其他
+     */
+    @ApiModelProperty(value = "其他", dataType = "String")
+    @TableField("remark")
+    private String remark;
+
+    /**
+     * 分包方编号
+     */
+    @ApiModelProperty(value = "分包方编号(新建不用传)", dataType = "String")
+    @TableField("outsource_no")
+    private String outsourceNo;
+
+    /**
+     * 分包方名称
+     */
+    @ExcelProperty(value = "分包方名称", order = 3)
+    @ApiModelProperty(value = "分包方名称(新建不用传)", dataType = "String")
+    @TableField("outsource_name")
+    private String outsourceName;
+
+    /**
+     * 联系人
+     */
+    @ExcelProperty(value = "联系人", order = 4)
+    @ApiModelProperty(value = "联系人", dataType = "String")
+    @TableField("contacts")
+    private String contacts;
+
+    /**
+     * 电话
+     */
+    @ApiModelProperty(value = "电话", dataType = "String")
+    @TableField("mobile")
+    private String mobile;
+
+    /**
+     * 地址
+     */
+    @ApiModelProperty(value = "地址", dataType = "String")
+    @TableField("address")
+    private String address;
+
+    /**
+     * 要求完成日期
+     */
+    @ApiModelProperty(value = "要求完成日期", dataType = "String")
+    @TableField("require_date")
+    private String requireDate;
+
+    /**
+     * 分包费用(元)
+     */
+    @ApiModelProperty(value = "分包费用(元)", dataType = "String")
+    @TableField("outsource_cost")
+    private Double outsourceCost;
+
+    /**
+     * 分包方负责人
+     */
+    @ApiModelProperty(value = "分包方负责人", dataType = "String")
+    @TableField("director")
+    private String director;
+
+    /**
+     * 分包项目
+     */
+    @ApiModelProperty(value = "分包项目", dataType = "String")
+    @TableField("item")
+    private String item;
+
+    /**
+     * 分包要求
+     */
+    @ApiModelProperty(value = "分包要求", dataType = "String")
+    @TableField("requires")
+    private String requires;
+
+    /**
+     * 创建人id
+     */
+    @ApiModelProperty(hidden = true)
+    @TableField("create_user_id")
+    private Long createUserId;
+
+    /**
+     * 创建人名字
+     */
+    @ExcelProperty(value = "申请人", order = 5)
+    @ApiModelProperty(value = "申请人", dataType = "String")
+    @TableField("create_user_name")
+    private String createUserName;
+
+    /**
+     * 审批状态
+     */
+    @ApiModelProperty(value = "审批状态", dataType = "String")
+    @DictCodeField(message = "审批状态描述不合法", cacheName = MeterDictCode.APPROVAL_STATUS)
+    @TableField("approval_status")
+    private String approvalStatus;
+
+    /**
+     * 流程实例id
+     */
+    @ApiModelProperty(value = "流程实例id", dataType = "String")
+    @TableField("process_id")
+    private String processId;
+
+    /**
+     * 创建时间
+     */
+    @ExcelProperty(value = "申请时间", order = 6)
+    @ApiModelProperty(value = "申请时间", dataType = "String")
+    @TableField("create_time")
+    private String createTime;
+
+    /**
+     * 更新时间
+     */
+    @ApiModelProperty(hidden = true)
+    @TableField("update_time")
+    private String updateTime;
+
+    @ApiModelProperty(value = "审批状态类型-字典value", dataType = "String")
+    @TableField(exist = false)
+    private String approvalStatusName;
+
+    @ApiModelProperty(value = "任务id（同意、驳回等操作使用）", dataType = "String")
+    @TableField(exist = false)
+    private String taskId;
+
+    @ApiModelProperty(value = "可选决策项（1同意驳回拒绝 2同意驳回 3同意拒绝，用于待审批列表同意/驳回/拒绝按钮展示）", dataType = "Integer")
+    @TableField(exist = false)
+    private Integer decisionItem;
+
+
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourcerInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourcerInfo.java
index ec4e997..f9aa69e 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourcerInfo.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourcerInfo.java
@@ -17,6 +17,7 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import javax.validation.constraints.NotEmpty;
 import java.io.Serializable;
 
 /**
@@ -59,6 +60,29 @@
     @TableField("outsourcer_name")
     private String outsourcerName;
 
+    @NotEmpty(message = "实验室代码不能为空")
+    @DictCodeField(message = "实验室代码描述不合法", cacheName = MeterDictCode.LAB_CODE)
+    @ApiModelProperty(value = "实验室代码(字典code)", dataType = "String")
+    @TableField("lab_code")
+    private String labCode;
+
+    @ApiModelProperty(value = "实验室代码(字典value)", dataType = "String")
+    @TableField(exist = false)
+    private String labCodeName;
+
+    /**
+     * 组别代码
+     */
+    @NotEmpty(message = "组别代码不能为空")
+    @DictCodeField(message = "组别代码描述不合法", cacheName = MeterDictCode.GROUP_CODE)
+    @ApiModelProperty(value = "组别代码(字典code)", dataType = "String")
+    @TableField("group_code")
+    private String groupCode;
+
+    @ApiModelProperty(value = "组别代码(字典value)", dataType = "String")
+    @TableField(exist = false)
+    private String groupCodeName;
+
     /**
      * 单位简称
      */
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardInfo.java
index c48eed7..dffdfdd 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardInfo.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardInfo.java
@@ -5,6 +5,7 @@
 import com.baomidou.mybatisplus.annotation.TableName;
 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;
 
@@ -18,6 +19,7 @@
  * @author wangpeng
  * @since 2023-08-04
  */
+@ApiModel
 @Data
 @TableName("biz_equipment_standard_info")
 public class BizEquipmentStandardInfo implements Serializable {
@@ -119,7 +121,7 @@
      * 管理状态(字典code)
      */
     @ApiModelProperty(value = "管理状态(字典code)", dataType = "String")
-    @DictCodeField(message = "管理状态不合法", cacheName = MeterDictCode.MANAGER_STATE)
+    @DictCodeField(message = "管理状态不合法", cacheName = MeterDictCode.STANDARD_MANAGER_STATE)
     @TableField("manage_status")
     private String manageStatus;
 
@@ -151,7 +153,7 @@
     /**
      * 温度(℃)
      */
-    @ApiModelProperty(value = "使用状态(字典code)", dataType = "String")
+    @ApiModelProperty(value = "温度(℃)", dataType = "String")
     @TableField("temperature")
     private Double temperature;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardInfoApproval.java b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardInfoApproval.java
index dbd86ab..9f58d83 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardInfoApproval.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardInfoApproval.java
@@ -150,7 +150,7 @@
      * 管理状态(字典code)
      */
     @ApiModelProperty(value = "管理状态(字典code)", dataType = "String")
-    @DictCodeField(message = "管理状态不合法", cacheName = MeterDictCode.MANAGER_STATE)
+    @DictCodeField(message = "管理状态不合法", cacheName = MeterDictCode.STANDARD_MANAGER_STATE)
     @TableField("manage_status")
     private String manageStatus;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardTechnologyRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardTechnologyRelation.java
index 0e612bd..751f26b 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardTechnologyRelation.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardTechnologyRelation.java
@@ -3,6 +3,7 @@
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -16,6 +17,7 @@
  * @author wangpeng
  * @since 2023-08-04
  */
+@ApiModel
 @Data
 @TableName("biz_equipment_standard_technology_relation")
 public class BizEquipmentStandardTechnologyRelation implements Serializable {
@@ -33,6 +35,10 @@
     @TableField("technology_file_id")
     private Long technologyFileId;
 
+    @ApiModelProperty(value = "依据的技术文件编号", dataType = "String")
+    @TableField("technology_file_no")
+    private String technologyFileNo;
+
     /**
      * 依据的技术文件名称(技术文件中现行测试校准检定方法表文件名字段)
      */
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerInfo.java
index d6e8bed..65cd6bc 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerInfo.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerInfo.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.model.resource;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -21,6 +28,11 @@
  * @author wangpeng
  * @since 2023-08-08
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @ApiModel
 @Data
 @TableName("biz_resource_customer_info")
@@ -35,6 +47,7 @@
     /**
      * 委托方编号
      */
+    @ExcelProperty(value = "委托方编号", order = 1)
     @ApiModelProperty(value = "委托方编号", dataType = "String")
     @TableField("customer_no")
     private String customerNo;
@@ -42,6 +55,7 @@
     /**
      * 委托方名称
      */
+    @ExcelProperty(value = "委托方名称", order = 2)
     @ApiModelProperty(value = "委托方名称(新建时为下拉选择一个受检单位组织的名字，传deptId字段，后端获取名称)", dataType = "String")
     @TableField("customer_name")
     private String customerName;
@@ -63,6 +77,7 @@
     /**
      * 联系人
      */
+    @ExcelProperty(value = "联系人", order = 3)
     @ApiModelProperty(value = "联系人", dataType = "String")
     @TableField("contacts")
     private String contacts;
@@ -70,6 +85,7 @@
     /**
      * 座机电话
      */
+    @ExcelProperty(value = "座机电话", order = 4)
     @ApiModelProperty(value = "座机电话", dataType = "String")
     @TableField("mobile")
     private String mobile;
@@ -77,6 +93,7 @@
     /**
      * 手机号码
      */
+    @ExcelProperty(value = "手机号码", order = 5)
     @ApiModelProperty(value = "手机号码", dataType = "String")
     @TableField("phone")
     private String phone;
@@ -91,6 +108,7 @@
     /**
      * 地址
      */
+    @ExcelProperty(value = "地址", order = 6)
     @ApiModelProperty(value = "地址", dataType = "String")
     @TableField("address")
     private String address;
@@ -141,6 +159,7 @@
     /**
      * 创建时间
      */
+    @ExcelProperty(value = "创建时间", order = 7)
     @ApiModelProperty(value = "创建时间", dataType = "String")
     @TableField("create_time")
     private String createTime;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerSuggestForm.java b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerSuggestForm.java
index 7201bbd..701bf8b 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerSuggestForm.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerSuggestForm.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.model.resource;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -22,6 +29,11 @@
  * @author wangpeng
  * @since 2023-08-08
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @ApiModel
 @Data
 @TableName("biz_resource_customer_suggest_form")
@@ -44,7 +56,8 @@
     /**
      * 委托方名称
      */
-    @ApiModelProperty(value = "委托方名称", dataType = "String")
+    @ExcelProperty(value = "意见反馈单位", order = 2)
+    @ApiModelProperty(value = "意见反馈单位", dataType = "String")
     @TableField("customer_name")
     private String customerName;
 
@@ -59,7 +72,8 @@
     /**
      * 委托方意见反馈部门名称
      */
-    @ApiModelProperty(value = "委托方意见反馈部门名称", dataType = "String")
+    @ExcelProperty(value = "委托方意见反馈部门", order = 3)
+    @ApiModelProperty(value = "委托方意见反馈部门", dataType = "String")
     @TableField("customer_dept_name")
     private String customerDeptName;
 
@@ -73,6 +87,7 @@
     /**
      * 表单编号
      */
+    @ExcelProperty(value = "表单编号", order = 1)
     @ApiModelProperty(value = "表单编号", dataType = "String")
     @TableField("form_no")
     private String formNo;
@@ -111,6 +126,7 @@
     /**
      * 创建人名字
      */
+    @ExcelProperty(value = "创建人", order = 4)
     @ApiModelProperty(value = "创建人名字", dataType = "String")
     @TableField("create_user_name")
     private String createUserName;
@@ -147,6 +163,7 @@
     /**
      * 创建时间
      */
+    @ExcelProperty(value = "创建时间", order = 5)
     @ApiModelProperty(value = "创建时间", dataType = "String")
     @TableField("create_time")
     private String createTime;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSealInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSealInfo.java
index cbf05d7..9bf389d 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSealInfo.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSealInfo.java
@@ -106,6 +106,10 @@
     @TableField("minio_file_name")
     private String minioFileName;
 
+    @ApiModelProperty(value = "minio存储文件url", dataType = "String")
+    @TableField(exist = false)
+    private String minioFileUrl;
+
     @ApiModelProperty(value = "创建时间", dataType = "String")
     @TableField("create_time")
     private String createTime;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSealUseNote.java b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSealUseNote.java
index 3f2d9e8..3ce16a8 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSealUseNote.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSealUseNote.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.model.resource;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -20,6 +27,11 @@
  * @author wangpeng
  * @since 2023-07-28
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @ApiModel
 @Data
 @TableName("biz_resource_seal_use_note")
@@ -34,6 +46,7 @@
     /**
      * 登记表编号
      */
+    @ExcelProperty(value = "申请单编号", order = 1)
     @ApiModelProperty(value = "登记表编号(自动生成)", dataType = "String")
     @TableField("note_form_no")
     private String noteFormNo;
@@ -55,6 +68,7 @@
     /**
      * 申请部门
      */
+    @ExcelProperty(value = "申请部门", order = 5)
     @ApiModelProperty(value = "申请部门", dataType = "String")
     @TableField("apply_dept_name")
     private String applyDeptName;
@@ -69,6 +83,7 @@
     /**
      * 申请人
      */
+    @ExcelProperty(value = "申请人", order = 6)
     @ApiModelProperty(value = "申请人", dataType = "String")
     @TableField("apply_user_name")
     private String applyUserName;
@@ -76,6 +91,7 @@
     /**
      * 申请时间
      */
+    @ExcelProperty(value = "申请时间", order = 7)
     @ApiModelProperty(value = "申请时间(新增自动获取当前时间)", dataType = "String")
     @TableField("apply_time")
     private String applyTime;
@@ -130,6 +146,26 @@
     @TableField("update_time")
     private String updateTime;
 
+    @ExcelProperty(value = "印章名称", order = 2)
+    @ApiModelProperty(value = "印章名称(列表返回参数)", dataType = "String")
+    @TableField(exist = false)
+    private String sealName;
+
+    @DictCodeField(message = "印章类型描述不合法", cacheName = MeterDictCode.SEAL_TYPE)
+    @ApiModelProperty(hidden = true)
+    @TableField(exist = false)
+    private String sealType;
+
+    @ExcelProperty(value = "印章类型", order = 3)
+    @ApiModelProperty(value = "印章类型(列表返回参数)", dataType = "String")
+    @TableField(exist = false)
+    private String sealTypeName;
+
+    @ExcelProperty(value = "批准人", order = 4)
+    @ApiModelProperty(value = "批准人(列表返回参数)", dataType = "String")
+    @TableField(exist = false)
+    private String approverName;
+
     @ApiModelProperty(value = "审批状态类型-字典value", dataType = "String")
     @TableField(exist = false)
     private String approvalStatusName;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceStaffInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceStaffInfo.java
index 5ef995b..41563a1 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceStaffInfo.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceStaffInfo.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.model.resource;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -20,6 +27,11 @@
  * @author wangpeng
  * @since 2023-07-25
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @ApiModel
 @Data
 @TableName("biz_resource_staff_info")
@@ -38,6 +50,7 @@
     /**
      * 人员编号
      */
+    @ExcelProperty(value = "人员编号",order = 0)
     @NotEmpty(message = "人员编号不能为空")
     @ApiModelProperty(value = "人员编号", dataType = "String")
     @TableField("staff_no")
@@ -46,6 +59,7 @@
     /**
      * 姓名
      */
+    @ExcelProperty(value = "姓名",order = 1)
     @ApiModelProperty(value = "姓名", dataType = "String")
     @TableField("staff_name")
     private String staffName;
@@ -152,13 +166,15 @@
     /**
      * 部门名字
      */
-    @ApiModelProperty(value = "部门名字", dataType = "String")
+    @ExcelProperty(value = "工作部门",order = 4)
+    @ApiModelProperty(value = "工作部门", dataType = "String")
     @TableField("dept_name")
     private String deptName;
 
     /**
      * 岗位
      */
+    @ExcelProperty(value = "岗位",order = 2)
     @ApiModelProperty(value = "岗位", dataType = "String")
     @TableField("station")
     private String station;
@@ -166,6 +182,7 @@
     /**
      * 计量专业
      */
+    @ExcelProperty(value = "计量专业",order = 5)
     @ApiModelProperty(value = "计量专业", dataType = "String")
     @TableField("major")
     private String major;
@@ -173,6 +190,7 @@
     /**
      * 证号
      */
+    @ExcelProperty(value = "证号",order = 3)
     @ApiModelProperty(value = "证号", dataType = "String")
     @TableField("certificate_number")
     private String certificateNumber;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSupplierInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSupplierInfo.java
index eb5ef01..a1e2697 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSupplierInfo.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSupplierInfo.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.model.resource;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -20,6 +27,11 @@
  * @author wangpeng
  * @since 2023-07-27
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @ApiModel
 @Data
 @TableName("biz_resource_supplier_info")
@@ -34,6 +46,7 @@
     /**
      * 供方编号
      */
+    @ExcelProperty(value = "供方编号", order = 1)
     @ApiModelProperty(value = "供方编号(自动生成)", dataType = "String")
     @TableField("supplier_no")
     private String supplierNo;
@@ -41,6 +54,7 @@
     /**
      * 供方名称
      */
+    @ExcelProperty(value = "供方名称", order = 2)
     @ApiModelProperty(value = "供方名称", dataType = "String")
     @TableField("supplier_name")
     private String supplierName;
@@ -60,6 +74,7 @@
     @TableField("supplier_type")
     private String supplierType;
 
+    @ExcelProperty(value = "供方类型", order = 3)
     @ApiModelProperty(value = "供方类型(字典value)", dataType = "String")
     @TableField(exist = false)
     private String supplierTypeName;
@@ -109,7 +124,8 @@
     /**
      * 电话
      */
-    @ApiModelProperty(value = "电话", dataType = "String")
+    @ExcelProperty(value = "联系电话", order = 4)
+    @ApiModelProperty(value = "联系电话", dataType = "String")
     @TableField("phone")
     private String phone;
 
@@ -158,6 +174,7 @@
     /**
      * 公司地址-省
      */
+    @ExcelProperty(value = "地址-省", order = 6)
     @ApiModelProperty(value = "公司地址-省", dataType = "String")
     @TableField("company_province_name")
     private String companyProvinceName;
@@ -172,6 +189,7 @@
     /**
      * 公司地址-市
      */
+    @ExcelProperty(value = "地址-市", order = 7)
     @ApiModelProperty(value = "公司地址-市", dataType = "String")
     @TableField("company_city_name")
     private String companyCityName;
@@ -186,6 +204,7 @@
     /**
      * 公司地址-区
      */
+    @ExcelProperty(value = "地址-区", order = 8)
     @ApiModelProperty(value = "公司地址-区", dataType = "String")
     @TableField("company_area_name")
     private String companyAreaName;
@@ -193,6 +212,7 @@
     /**
      * 公司地址-详细地址
      */
+    @ExcelProperty(value = "地址-详细地址", order = 9)
     @ApiModelProperty(value = "公司地址-详细地址", dataType = "String")
     @TableField("company_address")
     private String companyAddress;
@@ -200,6 +220,7 @@
     /**
      * 服务和供应的内容
      */
+    @ExcelProperty(value = "服务和供应的内容", order = 5)
     @ApiModelProperty(value = "服务和供应的内容", dataType = "String")
     @TableField("supplier_content")
     private String supplierContent;
@@ -250,6 +271,7 @@
     /**
      * 创建时间
      */
+    @ExcelProperty(value = "创建时间", order = 9)
     @ApiModelProperty(value = "创建时间", dataType = "String")
     @TableField("create_time")
     private String createTime;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/EnvLocationInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/EnvLocationInfo.java
new file mode 100644
index 0000000..d8e2d7b
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/EnvLocationInfo.java
@@ -0,0 +1,83 @@
+package com.casic.missiles.model.resource;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotEmpty;
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 实验室环境监控系统-设备表
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-06-07
+ */
+@ApiModel
+@Data
+@TableName("env_location_info")
+public class EnvLocationInfo implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "主键id", dataType = "Long")
+    @TableId("id")
+    private Long id;
+
+    /**
+     * 地点编号
+     */
+    @NotEmpty(message = "地点编号不能为空")
+    @ApiModelProperty(value = "地点编号", dataType = "String")
+    @TableField("location_no")
+    private String locationNo;
+
+    /**
+     * 地点名称
+     */
+    @ApiModelProperty(value = "地点名称", dataType = "String")
+    @TableField("location_name")
+    private String locationName;
+
+    /**
+     * 地点位置
+     */
+    @ApiModelProperty(value = "地点位置", dataType = "String")
+    @TableField("location_position")
+    private String locationPosition;
+
+    /**
+     * 创建人id
+     */
+    @ApiModelProperty(value = "创建人id", dataType = "Long")
+    @TableField("create_user_id")
+    private Long createUserId;
+
+    /**
+     * 创建人
+     */
+    @ApiModelProperty(value = "创建人", dataType = "String")
+    @TableField("create_user")
+    private String createUser;
+
+    /**
+     * 创建时间
+     */
+    @ApiModelProperty(value = "创建时间", dataType = "String")
+    @TableField("create_time")
+    private String createTime;
+
+    /**
+     * 更新时间
+     */
+    @ApiModelProperty(value = "更新时间", dataType = "String")
+    @TableField("update_time")
+    private String updateTime;
+
+
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemFileConfig.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemFileConfig.java
index 19e6845..86e569c 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemFileConfig.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemFileConfig.java
@@ -30,7 +30,7 @@
     @ApiModelProperty(value = "系统类别(1业务系统2受检系统3环境系统)", dataType = "Integer")
     @NotNull(message = "系统类别不能为空")
     @TableField("system_type")
-    private Integer systemType;
+    private Integer systemType = 1;
 
     @ApiModelProperty("下载编号")
     @TableField("download_no")
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemNotice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemNotice.java
index e94297d..06ec37d 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemNotice.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemNotice.java
@@ -34,7 +34,7 @@
     @ApiModelProperty(value = "系统类别(1业务系统2受检系统3环境系统)", dataType = "Integer")
     @NotNull(message = "系统类别不能为空")
     @TableField("system_type")
-    private Integer systemType;
+    private Integer systemType = 1;
 
     /**
      * 通知公告编号
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSign.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSign.java
index 6c0d7c9..954f4f8 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSign.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSign.java
@@ -51,7 +51,7 @@
     @ApiModelProperty(value = "系统类别(1业务系统2受检系统3环境系统)", dataType = "Integer")
     @NotNull(message = "系统类别不能为空")
     @TableField("system_type")
-    private Integer systemType;
+    private Integer systemType = 1;
 
     /**
      * 签名编号
@@ -130,4 +130,8 @@
     @TableField(exist = false)
     private List<Long> userIdList;
 
+    @ApiModelProperty(hidden = true)
+    @TableField(exist = false)
+    private String deptName;
+
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemTemplate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemTemplate.java
index 503a457..1d27ebe 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemTemplate.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemTemplate.java
@@ -47,7 +47,7 @@
     @ApiModelProperty(value = "系统类别(1业务系统2受检系统3环境系统)", dataType = "Integer")
     @NotNull(message = "系统类别不能为空")
     @TableField("system_type")
-    private Integer systemType;
+    private Integer systemType = 1;
 
     /**
      * 模板编号
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java
index 8c21cb0..f61e4a8 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java
@@ -32,4 +32,8 @@
     ReturnDTO approvalDelete(ApprovalDeleteRequest request);
 
     ReturnDTO failUpdate(T request);
+
+    List<O> listExport(R request);
+
+    List<O> listExportByIds(List<Long> ids);
 }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java
index 724166f..9bce15b 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java
@@ -157,6 +157,29 @@
         throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
     }
 
+    @Override
+    public List<O> listExport(R request) {
+        request.setCreateUserId(null);
+        request.setApprovalStatus(ApprovalStatusEnum.PASSED);
+        Page<O> page = PageFactory.defaultPage();
+        page.setCurrent(1);
+        page.setSearchCount(false);
+        page.setSize(Integer.MAX_VALUE);
+        Page<O> resultPage = this.baseMapper.selectBatchForApprovalList(page, request, null);
+        return resultPage.getRecords();
+    }
+
+    @Override
+    public List<O> listExportByIds(List<Long> ids) {
+        Page<O> page = PageFactory.defaultPage();
+        page.setCurrent(1);
+        page.setSearchCount(false);
+        page.setSize(Integer.MAX_VALUE);
+        List<String> businessKeys = ids.stream().map(String::valueOf).collect(Collectors.toList());
+        Page<O> resultPage = this.baseMapper.selectBatchForApprovalList(page, null, businessKeys);
+        return resultPage.getRecords();
+    }
+
     protected ReturnDTO updateApprovalStatus(Long id, String processId, String approvalStatus) {
         UpdateWrapper<T> updateWrapper = new UpdateWrapper<>();
         updateWrapper.eq("id", id);
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificatePrintServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificatePrintServiceImpl.java
index f6e4706..3228497 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificatePrintServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificatePrintServiceImpl.java
@@ -162,6 +162,30 @@
         return ReturnUtil.success(printLogMapper.selectList(wrapper));
     }
 
+    @Override
+    public List<CertificatePrintListResponse> listByIds(List<Long> ids) {
+        Page<CertificatePrintListResponse> page = PageFactory.defaultPage();
+        page.setCurrent(1);
+        page.setSearchCount(false);
+        page.setSize(Integer.MAX_VALUE);
+        List<String> businessKeys = ids.stream().map(String::valueOf).collect(Collectors.toList());
+        Page<CertificatePrintListResponse> resultPage = this.baseMapper.selectBatchForApprovalList(page, null, businessKeys);
+        return resultPage.getRecords();
+    }
+
+    @Override
+    public List<CertificatePrintListResponse> list(CertificatePrintApprovalListRequest request) {
+        request.setCreateUserId(null);
+        request.setApprovalStatus(null);
+        request.setPrintStatus(null);
+        Page<CertificatePrintListResponse> page = PageFactory.defaultPage();
+        page.setCurrent(1);
+        page.setSearchCount(false);
+        page.setSize(Integer.MAX_VALUE);
+        Page<CertificatePrintListResponse> resultPage = certificatePrintMapper.selectBatchForApprovalList(page, request, null);
+        return resultPage.getRecords();
+    }
+
     private void savePrintLog(Long id) {
         BizBusinessCertificatePrintLog printLog = new BizBusinessCertificatePrintLog();
         BizBusinessCertificatePrint certificatePrint = certificatePrintMapper.selectById(id);
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificateReportServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificateReportServiceImpl.java
index 457555f..24146be 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificateReportServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificateReportServiceImpl.java
@@ -158,8 +158,8 @@
         QueryWrapper<BizBusinessCertificateMeasureResultData> mWrapper = new QueryWrapper<>();
         mWrapper.eq("report_id", reportId);
         boolean mRemove = certificateMeasureResultDataService.remove(mWrapper);
-        Assert.isFalse(eRemove || mRemove, () -> {
+        if(!eRemove || !mRemove){
             throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
-        });
+        }
     }
 }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessIdentifyInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessIdentifyInfoServiceImpl.java
index 4c8e190..f7e63ca 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessIdentifyInfoServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessIdentifyInfoServiceImpl.java
@@ -1,8 +1,10 @@
 package com.casic.missiles.service.Impl.business;
 
+import cn.hutool.core.date.DateUtil;
 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.core.page.PageFactory;
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.business.identify.IdentifyListRequest;
@@ -14,11 +16,14 @@
 import com.casic.missiles.service.business.IBizBusinessIdentifyInfoService;
 import com.casic.missiles.utils.DictCodeUtils;
 import com.casic.missiles.utils.NumberGeneratorUtil;
+import com.casic.missiles.utils.QRCodeUtil;
 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.List;
+
 /**
  * <p>
  * 计量检定业务-任务计量管理-标识打印 服务实现类
@@ -35,9 +40,9 @@
     @Override
     public Page<BizBusinessIdentifyInfo> identifyListPage(Page<BizBusinessIdentifyInfo> page, IdentifyListRequest request) throws Exception {
         QueryWrapper<BizBusinessIdentifyInfo> wrapper = new QueryWrapper<>();
-        wrapper.eq("identify_type", request.getIdentifyType());
-        wrapper.like("device_no", request.getDeviceNo());
-        wrapper.like("device_name", request.getDeviceName());
+        wrapper.eq(StringUtils.isNotEmpty(request.getIdentifyType()), "identify_type", request.getIdentifyType());
+        wrapper.like(StringUtils.isNotEmpty(request.getDeviceNo()),"device_no", request.getDeviceNo());
+        wrapper.like(StringUtils.isNotEmpty(request.getDeviceName()), "device_name", request.getDeviceName());
         wrapper.apply(StringUtils.isNotBlank(request.getCreateTimeStart()),
                 "{0} <= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getCreateTimeStart().split(" ")[0]);
         wrapper.apply(StringUtils.isNotBlank(request.getCreateTimeEnd()),
@@ -64,8 +69,11 @@
     }
 
     @Override
-    public ReturnDTO updateIdentify(BizBusinessIdentifyInfo identifyInfo) {
-        if(identifyInfoMapper.updateById(identifyInfo) > 0){
+    public ReturnDTO updateIdentify(Long id) {
+        BizBusinessIdentifyInfo info = new BizBusinessIdentifyInfo();
+        info.setId(id);
+        info.setUpdateTime(DateUtil.now());
+        if(identifyInfoMapper.updateById(info) > 0){
             return ReturnUtil.success();
         }
         throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
@@ -79,4 +87,20 @@
         throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
     }
 
+    @Override
+    public List<BizBusinessIdentifyInfo> list(IdentifyListRequest request) throws Exception {
+        Page<BizBusinessIdentifyInfo> page = PageFactory.defaultPage();
+        page.setCurrent(1);
+        page.setSearchCount(false);
+        page.setSize(Integer.MAX_VALUE);
+        Page<BizBusinessIdentifyInfo> resultPage = this.identifyListPage(page, request);
+        return resultPage.getRecords();
+    }
+
+    @Override
+    public ReturnDTO<String> equipmentQrCode(Long id) {
+        String base64QRCode = QRCodeUtil.getBase64QRCode(String.valueOf(id));
+        return ReturnUtil.success(base64QRCode);
+    }
+
 }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOrderInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOrderInfoServiceImpl.java
index 82952ad..d8d2c6a 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOrderInfoServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOrderInfoServiceImpl.java
@@ -35,6 +35,7 @@
 import javax.servlet.http.HttpServletResponse;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 import java.util.stream.Collectors;
 
 /**
@@ -209,13 +210,16 @@
     private QueryWrapper<OrderListResponse> listParamWrapperBuilder(OrderListRequest request) {
         QueryWrapper<OrderListResponse> wrapper = new QueryWrapper<>();
         wrapper.like(StringUtils.isNotBlank(request.getOrderNo()), "order_no", request.getOrderNo());
+        wrapper.like(Objects.nonNull(request.getCustomerId()), "customer_id", request.getCustomerId());
         wrapper.like(StringUtils.isNotBlank(request.getCustomerName()), "customer_name", request.getCustomerName());
         wrapper.like(StringUtils.isNotBlank(request.getDeliverer()), "deliverer", request.getDeliverer());
         wrapper.like(StringUtils.isNotBlank(request.getCreateUserName()), "create_user_name", request.getCreateUserName());
-        wrapper.apply(StringUtils.isNotBlank(request.getCreateStartTime()),
-                "{0} <= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getCreateStartTime().split(" ")[0]);
-        wrapper.apply(StringUtils.isNotBlank(request.getCreateEndTime()),
-                "{0} >= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getCreateEndTime().split(" ")[0]);
+        if(StringUtils.isNotBlank(request.getCreateStartTime())){
+            wrapper.apply("{0} <= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getCreateStartTime().split(" ")[0]);
+        }
+        if(StringUtils.isNotBlank(request.getCreateEndTime())){
+            wrapper.apply("{0} >= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getCreateEndTime().split(" ")[0]);
+        }
         wrapper.orderByDesc("create_time");
         return wrapper;
     }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceAssessServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceAssessServiceImpl.java
index c6af980..ce40138 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceAssessServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceAssessServiceImpl.java
@@ -1,10 +1,33 @@
 package com.casic.missiles.service.Impl.business;
 
-import com.casic.missiles.model.business.BizBusinessOutsourceAssess;
+import cn.hutool.core.lang.Assert;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.casic.missiles.core.model.auth.AuthUser;
+import com.casic.missiles.core.shiro.ShiroKit;
+import com.casic.missiles.dto.BaseApprovalSubmitRequest;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.ReturnUtil;
+import com.casic.missiles.dto.business.outsource.OutsourceAssessApprovalListRequest;
+import com.casic.missiles.dto.business.outsource.OutsourceAssessSaveResponse;
+import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.NoGenerateFileCodeEnum;
+import com.casic.missiles.enums.NoGenerateRecordTypeCodeEnum;
+import com.casic.missiles.enums.system.ApprovalStatusEnum;
+import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.mapper.business.BizBusinessOutsourceAssessMapper;
+import com.casic.missiles.model.business.BizBusinessOutsourceAssess;
+import com.casic.missiles.model.business.BizBusinessOutsourceAssessSampleRelation;
+import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl;
+import com.casic.missiles.service.business.IBizBusinessOutsourceAssessSampleRelationService;
 import com.casic.missiles.service.business.IBizBusinessOutsourceAssessService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.casic.missiles.utils.NoGeneratorUtil;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Objects;
 
 /**
  * <p>
@@ -15,6 +38,103 @@
  * @since 2023-08-16
  */
 @Service
-public class BizBusinessOutsourceAssessServiceImpl extends ServiceImpl<BizBusinessOutsourceAssessMapper, BizBusinessOutsourceAssess> implements IBizBusinessOutsourceAssessService {
+public class BizBusinessOutsourceAssessServiceImpl extends GeneralApprovalServiceImpl<BizBusinessOutsourceAssessMapper, BizBusinessOutsourceAssess, BizBusinessOutsourceAssess, OutsourceAssessApprovalListRequest, BaseApprovalSubmitRequest> implements IBizBusinessOutsourceAssessService {
+    @Autowired
+    private IBizBusinessOutsourceAssessSampleRelationService outsourceAssessSampleRelationService;
 
+    @Override
+    public ReturnDTO<OutsourceAssessSaveResponse> saveOutsourceAssess(BizBusinessOutsourceAssess request) {
+        //生成编号
+        String labCode = request.getLabCode();
+        String groupCode = request.getGroupCode();
+        Long maxNo = this.baseMapper.selectMaxProjectNo();
+        String projectNo = NoGeneratorUtil.getCode(NoGenerateFileCodeEnum.D, labCode, NoGenerateRecordTypeCodeEnum.OUTSOURCE_ACCESS, groupCode, maxNo);
+        request.setCreateUserId(request.getUserId());
+        request.setCreateUserName(request.getUserName());
+        request.setApprovalStatus(ApprovalStatusEnum.DRAFT); //草稿箱状态
+        request.setProjectNo(projectNo);
+        int row = this.baseMapper.insert(request);
+        Assert.isFalse(row <= 0, () -> {
+            throw new BusinessException(BusinessExceptionEnum.OUTSOURCE_ACCESS_SAVE_FAILED);
+        });
+        //关联表
+        saveRelationData(request);
+        OutsourceAssessSaveResponse saveResponse = new OutsourceAssessSaveResponse();
+        saveResponse.setId(request.getId());
+        saveResponse.setProjectNo(projectNo);
+        return ReturnUtil.success(saveResponse);
+    }
+
+    @Override
+    @Transactional
+    public ReturnDTO draftUpdate(BizBusinessOutsourceAssess request) {
+        if (this.baseMapper.updateById(request) > 0) {
+            //关联表删除、增加
+            removeRelationData(request.getId());
+            saveRelationData(request);
+            return ReturnUtil.success();
+        }
+        throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
+    }
+
+    @Override
+    public ReturnDTO draftDelete(Long id) {
+        if (this.baseMapper.deleteById(id) > 0) {
+            //关联表删除
+            removeRelationData(id);
+            return ReturnUtil.success();
+        }
+        throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
+    }
+
+    @Override
+    public ReturnDTO draftBatchDelete(List<Long> ids) {
+        if (this.baseMapper.deleteBatchIds(ids) >= 0) {
+            ids.forEach(id -> removeRelationData(id));
+            return ReturnUtil.success();
+        }
+        throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
+    }
+
+    @Override
+    @Transactional
+    public ReturnDTO failUpdate(BizBusinessOutsourceAssess request) {
+        AuthUser user = ShiroKit.getUser();
+        Assert.isFalse(Objects.isNull(user), () -> {
+            throw new BusinessException(BusinessExceptionEnum.LOGIN_USER_ACQUIRE_FAILED);
+        });
+        request.setApprovalStatus(ApprovalStatusEnum.IN_APPROVED);
+        if (this.baseMapper.updateById(request) > 0) {
+            //关联表删除、增加
+            removeRelationData(request.getId());
+            saveRelationData(request);
+            baseApprovalService.failUpdate(request.getProcessId());
+            return ReturnUtil.success();
+        }
+        throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
+    }
+
+    private void saveRelationData(BizBusinessOutsourceAssess request) {
+        List<BizBusinessOutsourceAssessSampleRelation> sampleRelations = new ArrayList<>();
+        request.getOrderSampleList().forEach(dto -> {
+            BizBusinessOutsourceAssessSampleRelation relation = new BizBusinessOutsourceAssessSampleRelation();
+            relation.setOrderId(dto.getOrderId());
+            relation.setSampleId(dto.getSampleId());
+            relation.setAccessId(request.getId());
+            sampleRelations.add(relation);
+        });
+        if(outsourceAssessSampleRelationService.saveBatch(sampleRelations)){
+            return;
+        }
+        throw new BusinessException(BusinessExceptionEnum.OUTSOURCE_ACCESS_SAVE_FAILED);
+    }
+
+    private void removeRelationData(Long assessId) {
+        QueryWrapper<BizBusinessOutsourceAssessSampleRelation> wrapper = new QueryWrapper<>();
+        wrapper.eq("access_id", assessId);
+        if(outsourceAssessSampleRelationService.remove(wrapper)){
+            return;
+        }
+        throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
+    }
 }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceProtocolServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceProtocolServiceImpl.java
new file mode 100644
index 0000000..821e728
--- /dev/null
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceProtocolServiceImpl.java
@@ -0,0 +1,60 @@
+package com.casic.missiles.service.Impl.business;
+
+import cn.hutool.core.lang.Assert;
+import com.casic.missiles.dto.BaseApprovalSubmitRequest;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.ReturnUtil;
+import com.casic.missiles.dto.business.outsource.OutsourceProtocolApprovalListRequest;
+import com.casic.missiles.dto.business.outsource.OutsourceProtocolSaveResponse;
+import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.NoGenerateFileCodeEnum;
+import com.casic.missiles.enums.NoGenerateRecordTypeCodeEnum;
+import com.casic.missiles.enums.system.ApprovalStatusEnum;
+import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.mapper.business.BizBusinessOutsourceProtocolMapper;
+import com.casic.missiles.mapper.business.BizBusinessOutsourcerInfoMapper;
+import com.casic.missiles.model.business.BizBusinessOutsourceProtocol;
+import com.casic.missiles.model.business.BizBusinessOutsourcerInfo;
+import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl;
+import com.casic.missiles.service.business.IBizBusinessOutsourceProtocolService;
+import com.casic.missiles.utils.NoGeneratorUtil;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 计量检定业务-分包管理-测试、校准或检定工作分包协议书 服务实现类
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-08-24
+ */
+@Service
+public class BizBusinessOutsourceProtocolServiceImpl extends GeneralApprovalServiceImpl<BizBusinessOutsourceProtocolMapper, BizBusinessOutsourceProtocol, BizBusinessOutsourceProtocol, OutsourceProtocolApprovalListRequest, BaseApprovalSubmitRequest> implements IBizBusinessOutsourceProtocolService {
+    @Autowired
+    private BizBusinessOutsourcerInfoMapper outsourcerInfoMapper;
+
+    @Override
+    public ReturnDTO<OutsourceProtocolSaveResponse> saveOutsourceProtocol(BizBusinessOutsourceProtocol request) {
+        //生成编号
+        String labCode = request.getLabCode();
+        String groupCode = request.getGroupCode();
+        Long maxNo = this.baseMapper.selectMaxProtocolNo();
+        String protocolNo = NoGeneratorUtil.getCode(NoGenerateFileCodeEnum.D, labCode, NoGenerateRecordTypeCodeEnum.OUTSOURCE_PROTOCOL, groupCode, maxNo);
+        request.setCreateUserId(request.getUserId());
+        request.setCreateUserName(request.getUserName());
+        request.setApprovalStatus(ApprovalStatusEnum.DRAFT); //草稿箱状态
+        request.setProtocolNo(protocolNo);
+        BizBusinessOutsourcerInfo outsourcerInfo = outsourcerInfoMapper.selectById(request.getOutsourcerId());
+        request.setOutsourceNo(outsourcerInfo.getOutsourcerNo());
+        request.setOutsourceName(outsourcerInfo.getOutsourcerName());
+        int row = this.baseMapper.insert(request);
+        Assert.isFalse(row <= 0, () -> {
+            throw new BusinessException(BusinessExceptionEnum.OUTSOURCE_PROTOCOL_SAVE_FAILED);
+        });
+        OutsourceProtocolSaveResponse saveResponse = new OutsourceProtocolSaveResponse();
+        saveResponse.setId(request.getId());
+        saveResponse.setProtocolNo(protocolNo);
+        return ReturnUtil.success(saveResponse);
+    }
+}

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java
index bb0c50f..13a699b 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java
@@ -12,6 +12,7 @@
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.IGeneralApprovalService;
+import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
@@ -19,6 +20,7 @@
 import org.springframework.web.bind.annotation.RequestBody;
 
 import javax.validation.Valid;
+import java.util.List;
 import java.util.Objects;
 
 /**
@@ -117,4 +119,17 @@
         }
         return baseApprovalService.failUpdate(request);
     }
+
+    public List<O> exportList(@RequestBody @Valid R request) throws Exception {
+        List<O> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = baseApprovalService.listExportByIds(request.getIds());
+        } else {
+            list = baseApprovalService.listExport(request);
+        }
+        for (O record : list) {
+            DictCodeUtils.convertDictCodeToName(record);
+        }
+        return list;
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java
index 8a90961..d775831 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java
@@ -5,6 +5,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.business.certificate.CertificateChangeApplyApprovalListRequest;
 import com.casic.missiles.dto.business.certificate.CertificateChangeApplySaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessCertificateChangeApply;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
@@ -20,6 +21,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -48,4 +50,12 @@
         }
         return changeApplyService.saveChangeApply(request);
     }
+
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody CertificateChangeApplyApprovalListRequest request) throws Exception {
+        List<BizBusinessCertificateChangeApply> list = super.exportList(request);
+        super.exportExcel(BizBusinessCertificateChangeApply.class, list, ExportEnum.CERTIFICATE_CHANGE_APPLY.getSheetName());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java
index 5fc4b07..af8230e 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java
@@ -9,6 +9,7 @@
 import com.casic.missiles.dto.business.certificate.CertificatePrintApprovalListRequest;
 import com.casic.missiles.dto.business.certificate.CertificatePrintListResponse;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.enums.business.CertificatePrintStatusEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessCertificatePrintLog;
@@ -18,10 +19,16 @@
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.io.IOException;
+import java.util.List;
 import java.util.Objects;
 
 /**
@@ -98,4 +105,16 @@
         });
         return certificatePrintService.certificatePrintLog(idDTO.getId());
     }
+
+    @ApiOperation("证书打印审批导出")
+    @PostMapping("/listExport")
+    public void exportList(@RequestBody CertificatePrintApprovalListRequest request) throws IOException {
+        List<CertificatePrintListResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = certificatePrintService.listByIds(request.getIds());
+        } else {
+            list = certificatePrintService.list(request);
+        }
+        super.exportExcel(CertificatePrintListResponse.class, list, ExportEnum.CERTIFICATE_PRINT.getSheetName());
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java
index 63b06dc..6b2efd5 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java
@@ -6,6 +6,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.business.certificate.CertificateReportApprovalListRequest;
 import com.casic.missiles.dto.business.certificate.CertificateReportSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessCertificateReport;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
@@ -21,6 +22,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -50,7 +52,7 @@
         return certificateReportService.saveCertificateReport(request);
     }
 
-    @ApiOperation("证书审批详情（基本信息）")
+    @ApiOperation("详情（基本信息）")
     @PostMapping("/detail")
     public ReturnDTO<BizBusinessCertificateReport> detail(@RequestBody @Valid BaseDetailRequest request, BindingResult bindingResult) throws Exception {
         if(bindingResult.hasErrors()){
@@ -59,4 +61,11 @@
         return certificateReportService.detail(request);
     }
 
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody CertificateReportApprovalListRequest request) throws Exception {
+        List<BizBusinessCertificateReport> list = super.exportList(request);
+        super.exportExcel(BizBusinessCertificateReport.class, list, ExportEnum.CERTIFICATE_REPORT.getSheetName());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java
index 46b26bd..57c0809 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java
@@ -10,20 +10,21 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.business.identify.IdentifyListRequest;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessIdentifyInfo;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.business.IBizBusinessIdentifyInfoService;
+import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import javax.validation.Valid;
+import java.util.List;
 import java.util.Objects;
 
 /**
@@ -57,16 +58,13 @@
         return identifyInfoService.addIdentify(identifyInfo);
     }
 
-    @ApiOperation("标识打印更新")
+    @ApiOperation("标识打印更新（更新打印时间）")
     @PostMapping("/update")
-    public ReturnDTO updateIdentify(@RequestBody @Valid BizBusinessIdentifyInfo identifyInfo, BindingResult bindingResult) {
-        Assert.isFalse(Objects.isNull(identifyInfo.getId()), () -> {
+    public ReturnDTO updateIdentify(@RequestBody @Valid IdDTO idDTO) {
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        Assert.isFalse(bindingResult.hasErrors(), () -> {
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        });
-        return identifyInfoService.updateIdentify(identifyInfo);
+        return identifyInfoService.updateIdentify(idDTO.getId());
     }
 
     @ApiOperation("标识打印删除")
@@ -77,4 +75,37 @@
         });
         return identifyInfoService.deleteIdentify(idDTO.getId());
     }
+
+    @ApiOperation("标识打印导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody @Valid IdentifyListRequest request, BindingResult bindingResult) throws Exception {
+        if (bindingResult.hasErrors()) {
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        List<BizBusinessIdentifyInfo> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = identifyInfoService.listByIds(request.getIds());
+        } else {
+            list = identifyInfoService.list(request);
+        }
+        for (BizBusinessIdentifyInfo record : list) {
+            DictCodeUtils.convertDictCodeToName(record);
+        }
+        super.exportExcel(BizBusinessIdentifyInfo.class, list, ExportEnum.IDENTIFY_EXPORT.getSheetName());
+    }
+
+
+    // TODO: 2023/8/23 查询设备信息，4个底部按钮查设备（按钮的作用就是前端用来调不同接口、用来区分中间即将展示的标识），前端弹窗选设备，在确定保存时前端根据底部按钮判断传入设备类型deviceType字典code
+    // TODO: 2023/8/23 接口：查受检设备（第1个按钮），查设备台账（后3个按钮同一接口），查询之后前端根据标志类型的不同加到中间页面时进行判断（按产品给的对应表）
+    // TODO: 2023/8/23 提供二维码接口，前端在加到中间页面时调用一下
+
+    @ApiOperation("设备二维码")
+    @PostMapping("/equipment/qrCode")
+    public ReturnDTO<String> equipmentQrCode(@RequestBody @Valid IdDTO idDTO) {
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return identifyInfoService.equipmentQrCode(idDTO.getId());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java
index 707be6e..7e0453d 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java
@@ -117,7 +117,7 @@
     }
 
     @ApiOperation("任务单导出")
-    @PostMapping("/export")
+    @PostMapping("/listExport")
     public void orderExport(@RequestBody @Valid OrderListRequest request, HttpServletResponse response) {
         businessOrderService.orderExport(request, response);
     }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java
index 529a6ce..51432be 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java
@@ -1,9 +1,28 @@
 package com.casic.missiles.controller.business;
 
+import com.casic.missiles.controller.GeneralApprovalController;
+import com.casic.missiles.dto.BaseApprovalSubmitRequest;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.business.outsource.OutsourceAssessApprovalListRequest;
+import com.casic.missiles.dto.business.outsource.OutsourceAssessSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
+import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.model.business.BizBusinessOutsourceAssess;
+import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
+import com.casic.missiles.service.IGeneralApprovalService;
+import com.casic.missiles.service.business.IBizBusinessOutsourceAssessService;
 import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.BindingResult;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.validation.Valid;
+import java.util.List;
+
 /**
  * <p>
  * 计量检定业务-分包管理-测试、校准或检定工作分包评审表 前端控制器
@@ -15,6 +34,27 @@
 @Api(tags = "分包管理-测试、校准或检定工作分包评审表")
 @RestController
 @RequestMapping("/business/outsource/assess")
-public class BizBusinessOutsourceAssessController {
+public class BizBusinessOutsourceAssessController extends GeneralApprovalController<BizBusinessOutsourceAssess, BizBusinessOutsourceAssess, OutsourceAssessApprovalListRequest, BaseApprovalSubmitRequest> {
+    @Autowired
+    private IBizBusinessOutsourceAssessService outsourceAssessService;
 
+    public BizBusinessOutsourceAssessController(IGeneralApprovalService<BizBusinessOutsourceAssess, BizBusinessOutsourceAssess, OutsourceAssessApprovalListRequest, BaseApprovalSubmitRequest> baseApprovalService) {
+        super(baseApprovalService);
+    }
+
+    @ApiOperation("草稿箱-保存")
+    @PostMapping("/save")
+    public ReturnDTO<OutsourceAssessSaveResponse> saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceAssess request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        return outsourceAssessService.saveOutsourceAssess(request);
+    }
+
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception {
+        List<BizBusinessOutsourceAssess> list = super.exportList(request);
+        super.exportExcel(BizBusinessOutsourceAssess.class, list, ExportEnum.OUTSOURCE_ASSESS.getSheetName());
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java
new file mode 100644
index 0000000..9adef18
--- /dev/null
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java
@@ -0,0 +1,60 @@
+package com.casic.missiles.controller.business;
+
+import com.casic.missiles.controller.GeneralApprovalController;
+import com.casic.missiles.dto.BaseApprovalSubmitRequest;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.business.outsource.OutsourceProtocolApprovalListRequest;
+import com.casic.missiles.dto.business.outsource.OutsourceProtocolSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
+import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.model.business.BizBusinessOutsourceProtocol;
+import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
+import com.casic.missiles.service.IGeneralApprovalService;
+import com.casic.missiles.service.business.IBizBusinessOutsourceProtocolService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.BindingResult;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.validation.Valid;
+import java.util.List;
+
+/**
+ * <p>
+ * 计量检定业务-分包管理-测试、校准或检定工作分包协议书 前端控制器
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-08-24
+ */
+@Api(tags = "分包管理-测试、校准或检定工作分包协议书")
+@RestController
+@RequestMapping("/business/outsource/protocol")
+public class BizBusinessOutsourceProtocolController extends GeneralApprovalController<BizBusinessOutsourceProtocol, BizBusinessOutsourceProtocol, OutsourceProtocolApprovalListRequest, BaseApprovalSubmitRequest> {
+    @Autowired
+    private IBizBusinessOutsourceProtocolService outsourceProtocolService;
+
+    public BizBusinessOutsourceProtocolController(IGeneralApprovalService<BizBusinessOutsourceProtocol, BizBusinessOutsourceProtocol, OutsourceProtocolApprovalListRequest, BaseApprovalSubmitRequest> baseApprovalService) {
+        super(baseApprovalService);
+    }
+
+    @ApiOperation("草稿箱-保存")
+    @PostMapping("/save")
+    public ReturnDTO<OutsourceProtocolSaveResponse> saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceProtocol request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        return outsourceProtocolService.saveOutsourceProtocol(request);
+    }
+
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody OutsourceProtocolApprovalListRequest request) throws Exception {
+        List<BizBusinessOutsourceProtocol> list = super.exportList(request);
+        super.exportExcel(BizBusinessOutsourceProtocol.class, list, ExportEnum.OUTSOURCE_PROTOCOL.getSheetName());
+    }
+}
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java
index 097f645..f0f0943 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java
@@ -17,7 +17,6 @@
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.IGeneralApprovalService;
 import com.casic.missiles.service.business.IBizBusinessOutsourcerInfoService;
-import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -71,19 +70,8 @@
 
     @ApiOperation("分包方导出")
     @PostMapping("/listExport")
-    public void export(@RequestBody @Valid OutsourcerInfoApprovalListRequest request, BindingResult bindingResult) throws Exception {
-        if (bindingResult.hasErrors()) {
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        }
-        List<BizBusinessOutsourcerInfo> list;
-        if (!CollectionUtils.isEmpty(request.getIds())) {
-            list = outsourcerInfoService.listByIds(request.getIds());
-        } else {
-            list = outsourcerInfoService.list(request);
-        }
-        for (BizBusinessOutsourcerInfo record : list) {
-            DictCodeUtils.convertDictCodeToName(record);
-        }
+    public void export(@RequestBody OutsourcerInfoApprovalListRequest request) throws Exception {
+        List<BizBusinessOutsourcerInfo> list = super.exportList(request);
         super.exportExcel(BizBusinessOutsourcerInfo.class, list, ExportEnum.OUTSOURCER_EXPORT.getSheetName());
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java
index c2cbf9f..0410918 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java
@@ -17,11 +17,9 @@
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.IGeneralApprovalService;
 import com.casic.missiles.service.business.IBizBusinessSiteExecutiveInfoService;
-import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -60,7 +58,7 @@
         return siteExecutiveInfoService.saveSiteExecutiveInfo(siteExecutiveInfo);
     }
 
-    @ApiOperation("现场检测详情")
+    @ApiOperation("详情")
     @PostMapping("/detail")
     public ReturnDTO<SiteExecutiveDetailResponse> siteExecutiveDetail(@RequestBody @Valid IdDTO idDTO) throws Exception {
         Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
@@ -69,21 +67,10 @@
         return ReturnUtil.success(siteExecutiveInfoService.detail(idDTO.getId()));
     }
 
-    @ApiOperation("现场检测导出")
+    @ApiOperation("导出")
     @PostMapping("/listExport")
-    public void export(@RequestBody @Valid SiteExecutiveApprovalListRequest request, BindingResult bindingResult) throws Exception {
-        if (bindingResult.hasErrors()) {
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        }
-        List<SiteExecutiveApprovalListResponse> list;
-        if (!CollectionUtils.isEmpty(request.getIds())) {
-            list = siteExecutiveInfoService.listInfoByIds(request.getIds());
-        } else {
-            list = siteExecutiveInfoService.listInfo(request);
-        }
-        for (SiteExecutiveApprovalListResponse record : list) {
-            DictCodeUtils.convertDictCodeToName(record);
-        }
+    public void export(@RequestBody SiteExecutiveApprovalListRequest request) throws Exception {
+        List<SiteExecutiveApprovalListResponse> list = super.exportList(request);
         super.exportExcel(SiteExecutiveApprovalListResponse.class, list, ExportEnum.SITE_EXECUTIVE_EXPORT.getSheetName());
     }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
index 7e793cd..a92e209 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
@@ -55,7 +55,7 @@
 
     @ApiOperation("设备收发列表导出")
     @PostMapping("/export")
-    public void exportList(@RequestBody @Valid SampleDispatchListRequest request) throws IOException {
+    public void exportList(@RequestBody SampleDispatchListRequest request) throws IOException {
         List<SampleDispatchListResponse> list;
         if (!CollectionUtils.isEmpty(request.getIds())) {
             list = dispatchService.listByIds(request.getIds());
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java
index cdc77fc..d120fd4 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java
@@ -7,6 +7,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.business.labExecutive.*;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.business.IBusinessLabExecutiveInfoService;
@@ -14,6 +15,7 @@
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.*;
 
@@ -32,7 +34,7 @@
     @Autowired
     private IBusinessLabExecutiveInfoService labExecutiveInfoService;
 
-    @ApiOperation("实验室检测-部门检测-查询各状态列表（待检测、检测中、检测完）")
+    @ApiOperation("实验室任务-查询各状态列表（待检测、检测中、检测完）")
     @PostMapping("/deptExecutive/List")
     public ReturnDTO<PageInfoBT<SampleLabExecutiveListResponse>> queryDeptExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
@@ -43,10 +45,19 @@
         return ReturnUtil.success(super.packForBT(labExecutiveInfoService.deptLabExecutiveListPage(page, labExecutiveListRequest)));
     }
 
-    /**
-     * 实验室检测-我的检测-查询各状态列表（待检测、检测中、检测完）
-     */
-    @ApiOperation("实验室检测-我的检测-查询各状态列表（待检测、检测中、检测完）")
+    @ApiOperation("实验室任务导出")
+    @PostMapping("/deptExecutive/export")
+    public void deptExportList(@RequestBody @Valid SampleLabExecutiveListRequest request) throws Exception {
+        List<SampleLabExecutiveListResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = labExecutiveInfoService.deptLabExecutiveListByIds(request.getMeasureStatus(), request.getIds());
+        } else {
+            list = labExecutiveInfoService.deptLabExecutiveList(request);
+        }
+        super.exportExcel(SampleLabExecutiveListResponse.class, list, ExportEnum.DEPT_EXECUTIVE_TASK.getSheetName());
+    }
+
+    @ApiOperation("我的任务-查询各状态列表（待检测、检测中、检测完）")
     @PostMapping("/myExecutive/list")
     public ReturnDTO<PageInfoBT<SampleLabExecutiveListResponse>> queryMyExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
@@ -57,19 +68,25 @@
         return ReturnUtil.success(super.packForBT(labExecutiveInfoService.myLabExecutiveListPage(page, labExecutiveListRequest)));
     }
 
-    /**
-     * 实验室检测-我的检测-查询各状态样品数量（待检测、检测中、检测完）
-     */
-    @ApiOperation("实验室检测-我的检测-查询各状态样品数量（待检测、检测中、检测完）")
+    @ApiOperation("我的任务导出")
+    @PostMapping("/myExecutive/export")
+    public void exportList(@RequestBody @Valid SampleLabExecutiveListRequest request) throws Exception {
+        List<SampleLabExecutiveListResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = labExecutiveInfoService.myLabExecutiveListByIds(request.getMeasureStatus(), request.getIds());
+        } else {
+            list = labExecutiveInfoService.myLabExecutiveList(request);
+        }
+        super.exportExcel(SampleLabExecutiveListResponse.class, list, ExportEnum.MY_EXECUTIVE_TASK.getSheetName());
+    }
+
+    @ApiOperation("我的任务-查询各状态样品数量（待检测、检测中、检测完）")
     @GetMapping("/myExecutive/amount")
     public ReturnDTO<List<SampleAmountResponse>> queryMyExecutiveAmount() {
         return ReturnUtil.success(labExecutiveInfoService.myExecutiveAmount());
     }
 
-    /**
-     * 实验室检测-部门检测-分配（分配给具体人员）
-     */
-    @ApiOperation("实验室检测-部门检测-分配按钮（分配给具体人员）")
+    @ApiOperation("实验室任务-分配按钮（分配给具体人员）")
     @PostMapping("/deptExecutive/allocate")
     public ReturnDTO allocateStaff(@RequestBody @Valid SampleAllocateRequest sampleAllocateRequest, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -78,10 +95,7 @@
         return labExecutiveInfoService.allocateStaff(sampleAllocateRequest);
     }
 
-    /**
-     * 实验室检测-我的检测-检定人扫描收入（待检测->检测中）
-     */
-    @ApiOperation("实验室检测-我的检测-检定人扫描收入（待检测->检测中）")
+    @ApiOperation("我的任务-检定人扫描收入（待检测->检测中）")
     @PostMapping("/myExecutive/receive")
     public ReturnDTO sampleReceive(@RequestBody @Valid List<SampleOperateRequest> requestList, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -90,10 +104,7 @@
         return labExecutiveInfoService.sampleReceive(requestList);
     }
 
-    /**
-     * 实验室检测-负责人/检定人扫描检完（检测中->检测完）
-     */
-    @ApiOperation("实验室检测-负责人/检定人扫描检完（检测中->检测完）")
+    @ApiOperation("实验室任务-负责人/检定人扫描检完（检测中->检测完）")
     @PostMapping("/myExecutive/complete")
     public ReturnDTO sampleExecutiveComplete(@RequestBody @Valid List<SampleOperateRequest> requestList, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -102,10 +113,7 @@
         return labExecutiveInfoService.sampleExecutiveComplete(requestList);
     }
 
-    /**
-     * 实验室检测-部门检测/我的检测 编辑（只能修改应出具证书）
-     */
-    @ApiOperation("实验室检测-部门检测/我的检测 编辑（只能修改应出具证书）")
+    @ApiOperation("实验室任务/我的任务 编辑（只能修改应出具证书）")
     @PostMapping("/executive/update")
     public ReturnDTO updateExecutive(@RequestBody @Valid UpdateExecutiveRequest request, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -114,10 +122,7 @@
         return labExecutiveInfoService.updateExecutive(request);
     }
 
-    /**
-     * 实验室检测-部门检测/我的检测 详情
-     */
-    @ApiOperation("实验室检测-部门检测/我的检测 详情")
+    @ApiOperation("实验室任务/我的任务 详情")
     @PostMapping("/executive/detail")
     public ReturnDTO<ExecutiveDetailResponse> executiveDetail(@RequestBody @Valid ExecutiveDetailRequest request, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
@@ -131,7 +136,7 @@
      * 退回后会将下一个要执行的实验室检测状态更新为待分配，将后面的实验室顺序变更为连续（都进行减1）
      * 最后一个检测的实验室退回，等分发员再增加实验室或设备收发中的已收入直接手动点击完成
      */
-    @ApiOperation("实验室检测-部门检测/我的检测 退回（待检测/检测中->退回）")
+    @ApiOperation("实验室任务/我的任务 退回（待检测/检测中->退回）")
     @PostMapping("/executive/sendBack")
     public ReturnDTO executiveSendBack(@RequestBody @Valid ExecutiveSendBackRequest request, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -140,9 +145,6 @@
         return labExecutiveInfoService.sampleExecutiveSendBack(request);
     }
 
-    /**
-     * 分发员编辑实验室检测列表
-     */
     @ApiOperation("分发员编辑实验室检测列表")
     @PostMapping("/handOut/updateList")
     public ReturnDTO updateExecutiveList(@RequestBody @Valid UpdateExecutiveListRequest request, BindingResult bindingResult) {
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java
index 48a67ed..0c04f31 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java
@@ -10,6 +10,7 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.resource.customer.CustomerApprovalListRequest;
 import com.casic.missiles.dto.resource.customer.CustomerSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceCustomerInfo;
@@ -26,6 +27,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -55,6 +57,13 @@
         return customerInfoService.saveCustomerInfo(request);
     }
 
+    @ApiOperation("委托方名录导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody CustomerApprovalListRequest request) throws Exception {
+        List<BizResourceCustomerInfo> list = super.exportList(request);
+        super.exportExcel(BizResourceCustomerInfo.class, list, ExportEnum.CUSTOMER_INFO.getSheetName());
+    }
+
     @ApiOperation("委托方人员列表（分页）")
     @PostMapping("/person/listPage")
     public ReturnDTO<PageInfoBT<BizResourceCustomerStaff>> personListPage(@RequestBody IdDTO idDto) {
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
index 972ed4b..6418ea5 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
@@ -5,6 +5,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.resource.customer.SuggestFormApprovalListRequest;
 import com.casic.missiles.dto.resource.customer.SuggestFormSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceCustomerSuggestForm;
@@ -20,6 +21,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -50,4 +52,11 @@
         return suggestFormService.saveSuggestForm(request);
     }
 
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody SuggestFormApprovalListRequest request) throws Exception {
+        List<BizResourceCustomerSuggestForm> list = super.exportList(request);
+        super.exportExcel(BizResourceCustomerSuggestForm.class, list, ExportEnum.CUSTOMER_SUGGEST_FORM.getSheetName());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java
index 1934d1a..9e07eab 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java
@@ -15,12 +15,16 @@
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.resource.IEnvEnvironmentRecordConfigService;
 import com.casic.missiles.service.resource.IEnvEnvironmentRecordDataService;
+import com.casic.missiles.service.resource.IEnvLocationInfoService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
 import java.util.List;
@@ -39,6 +43,8 @@
     private IEnvEnvironmentRecordDataService environmentRecordDataService;
     @Autowired
     private IEnvEnvironmentRecordConfigService environmentRecordConfigService;
+    @Autowired
+    private IEnvLocationInfoService locationInfoService;
 
     @ApiOperation("环境记录单数据列表/详情")
     @PostMapping("/data/listPage")
@@ -95,4 +101,11 @@
         });
         return environmentRecordConfigService.deleteEnvironmentRecordConfig(idDTO.getId());
     }
+
+    @ApiOperation("地点列表")
+    @PostMapping("/location/listPage")
+    public ReturnDTO<PageInfoBT<LocationListResponse>> locationListPage(@RequestBody @Valid LocationListRequest request) {
+        Page<LocationListResponse> page = PageFactory.defaultPage();
+        return ReturnUtil.success(super.packForBT(locationInfoService.listPage(page, request)));
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java
index 82efe3f..e9561fa 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java
@@ -10,6 +10,7 @@
 import com.casic.missiles.dto.resource.seal.SealLogListRequest;
 import com.casic.missiles.dto.resource.seal.SealNoteApprovalListRequest;
 import com.casic.missiles.dto.resource.seal.SealNoteSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceSealUseLog;
@@ -27,6 +28,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -58,6 +60,13 @@
         return sealUseNoteService.saveSeal(request);
     }
 
+    @ApiOperation("印章使用登记导出（列表和导出中去掉经办人和监印人）")
+    @PostMapping("/listExport")
+    public void export(@RequestBody SealNoteApprovalListRequest request) throws Exception {
+        List<BizResourceSealUseNote> list = super.exportList(request);
+        super.exportExcel(BizResourceSealUseNote.class, list, ExportEnum.SEAL_NOTE.getSheetName());
+    }
+
     // TODO: 2023/7/28 印章使用日志：系统中使用印章时插入数据库
 
     @ApiOperation("印章使用日志列表（分页）")
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java
index 9b674fc..06b6521 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java
@@ -9,16 +9,20 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.resource.staff.StaffCertRequest;
 import com.casic.missiles.dto.resource.staff.StaffCertResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.service.resource.IBizResourceStaffInfoService;
 import com.casic.missiles.service.resource.IBizResourceStaffVerifierService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.List;
+
 /**
  * @Description:
  * @Author: wangpeng
@@ -41,9 +45,21 @@
         return ReturnUtil.success(super.packForBT(responsePage));
     }
 
+    @ApiOperation("证书逾期提醒导出")
+    @PostMapping("/listExport")
+    public void exportList(@RequestBody StaffCertRequest request) throws Exception {
+        List<StaffCertResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = staffInfoService.certListByIds(request.getIds());
+        } else {
+            list = staffInfoService.certList(request);
+        }
+        super.exportExcel(StaffCertResponse.class, list, ExportEnum.STAFF_CERTIFICATE_EXPIRE.getSheetName());
+    }
+
     @ApiOperation("证书逾期提醒")
     @PostMapping("/expirationReminder")
-    public ReturnDTO expirationReminder(@RequestBody IdDTO idDto) {
-        return verifierService.expirationReminder(idDto);
+    public ReturnDTO expirationReminder(@RequestBody IdDTO idDTO) {
+        return verifierService.expirationReminder(idDTO);
     }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java
index 3b251ad..a6e7850 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java
@@ -12,6 +12,7 @@
 import com.casic.missiles.dto.resource.staff.StaffListRequest;
 import com.casic.missiles.dto.resource.staff.TrainListRequest;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.*;
@@ -22,7 +23,10 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
 import java.util.List;
@@ -52,8 +56,19 @@
             throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
         }
         Page<BizResourceStaffInfo> page = PageFactory.defaultPage();
-        Page<BizResourceStaffInfo> responsePage = staffInfoService.listPage(page, request);
-        return ReturnUtil.success(super.packForBT(responsePage));
+        return ReturnUtil.success(super.packForBT(staffInfoService.listPage(page, request)));
+    }
+
+    @ApiOperation("人员登记导出")
+    @PostMapping("/listExport")
+    public void exportList(@RequestBody StaffListRequest request) throws Exception {
+        List<BizResourceStaffInfo> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = staffInfoService.listByIds(request.getIds());
+        } else {
+            list = staffInfoService.list(request);
+        }
+        super.exportExcel(BizResourceStaffInfo.class, list, ExportEnum.STAFF_INFO.getSheetName());
     }
 
     @ApiOperation("人员登记详情基础信息")
@@ -85,9 +100,9 @@
 
     @ApiOperation("科研教育列表（分页）")
     @PostMapping("/education/listPage")
-    public ReturnDTO<PageInfoBT<BizResourceStaffEducation>> educationListPage(@RequestBody IdDTO idDto) {
+    public ReturnDTO<PageInfoBT<BizResourceStaffEducation>> educationListPage(@RequestBody IdDTO idDTO) {
         Page<BizResourceStaffEducation> page = PageFactory.defaultPage();
-        Page<BizResourceStaffEducation> responsePage = staffInfoService.educationListPage(page, idDto);
+        Page<BizResourceStaffEducation> responsePage = staffInfoService.educationListPage(page, idDTO);
         return ReturnUtil.success(super.packForBT(responsePage));
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java
index af6aa86..d85d84a 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java
@@ -9,6 +9,7 @@
 import com.casic.missiles.dto.resource.outsideService.SupplierApprovalListRequest;
 import com.casic.missiles.dto.resource.outsideService.SupplierSaveResponse;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceSupplierAbility;
@@ -67,6 +68,13 @@
         return ReturnUtil.success(supplierInfoService.detail(idDTO.getId()));
     }
 
+    @ApiOperation("合格供方导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody SupplierApprovalListRequest request) throws Exception {
+        List<BizResourceSupplierInfo> list = super.exportList(request);
+        super.exportExcel(BizResourceSupplierInfo.class, list, ExportEnum.SUPPLIER_INFO.getSheetName());
+    }
+
     @ApiOperation("供方人员列表（分页）")
     @PostMapping("/person/listPage")
     public ReturnDTO<PageInfoBT<BizResourceSupplierPerson>> personListPage(@RequestBody IdDTO idDTO) {
diff --git a/casic-metering-api/src/main/resources/config/application.yml b/casic-metering-api/src/main/resources/config/application.yml
index 350db5f..ecff521 100644
--- a/casic-metering-api/src/main/resources/config/application.yml
+++ b/casic-metering-api/src/main/resources/config/application.yml
@@ -126,7 +126,7 @@
     #作者
     author: wangpeng
     #待生成对象表名
-    table-name: biz_equipment_technical_target_approval,biz_equipment_attachment_approval,biz_equipment_checkpoint_approval
+    table-name: biz_business_outsource_protocol
 
 reminder:
   #节点--common模块config包 ReminderNodeConfig配置
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
index 4a19e4e..d47d552 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
@@ -53,6 +53,7 @@
     SUGGEST_FORM_SAVE_FAILED(2509, "委托方意见登记表保存至草稿箱失败"),
     EXAMINE_FORM_SAVE_FAILED(2510, "要求、委托书及合同评审表保存至草稿箱失败"),
     CUSTOMER_EXIST_SAVE_FAILED(2511, "该委托方已存在，请重新选择"),
+    DUPLICATE_LOCATION_NO(2512, "地点编号已存在"),
 
     /**
      * 计量检定业务模块
@@ -68,6 +69,8 @@
     COMPLETE_SAMPLE_NOT_EXIST(2609, "检测中不存在扫描收入的样品"),
     CANNOT_CHANGE_MEASURE_INFO(2610, "无法更改非当前登录用户的检测信息"),
     NON_EXIST_ORDER_OR_SAMPLE(2611, "不存在该委托单或该委托单下的样品"),
+    OUTSOURCE_ACCESS_SAVE_FAILED(2612, "测试、校准或检定工作分包评审表保存至草稿箱失败"),
+    OUTSOURCE_PROTOCOL_SAVE_FAILED(2613, "测试、校准或检定工作分包协议书保存至草稿箱失败"),
 
     /**
      * 历史遗留备用
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
index 5089ad1..81a406b 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
@@ -10,54 +10,38 @@
     /**
      * 资源管理
      */
-    ENVIRONMENT_DATA_EXPORT("environmentData", "environmentData", "环境记录单数据"),
+    ENVIRONMENT_DATA_EXPORT("environmentData", "环境记录单数据", "环境记录单数据"),
+    STAFF_INFO("staffInfo", "人员登记", "人员登记"),
+    STAFF_CERTIFICATE_EXPIRE("certificateExpire", "证书逾期提醒", "证书逾期提醒"),
+    SUPPLIER_INFO("supplierInfo", "合格供方名录", "合格供方名录"),
+    CUSTOMER_INFO("customerInfo", "委托方名录", "委托方名录"),
+    CUSTOMER_SUGGEST_FORM("customerSuggestForm", "委托方意见登记表", "委托方意见登记表"),
+    SEAL_NOTE("sealNote", "印章使用登记", "印章使用登记"),
 
-    FILE_EXPORT("meterFileData", "meterFileData", "计量文件信息"),
-    TRAIN_PLAN_EXPORT("trainPlanData", "trainPlanData", "培训计划"),
-    TRAIN_LOG_EXPORT("trainLogData", "trainLogData", "培训记录"),
-    METER_ORGANIZE_EXPORT("meterOrganizeData", "meterOrganizeData", "计量组织"),
-    TRACE_SUPPLIER_EXPORT("traceSupplierData", "traceSupplierData", "溯源供方"),
-    SIGN_EXPORT("signData", "signData", "签名/签章"),
-    TEMPLATE_EXPORT("templateData", "templateData", "原始记录模板/证书报告模板"),
-    FIXED_ASSETS("meterFixedAssets", "meterFixedAssets", "固定资产"),
-    METER_EQUIPMENT("meterEquipment", "meterEquipment", "测量设备"),
-    CALIBRATION_TEST_EQUIPMENT("calibrationTestEquipment", "calibrationTestEquipment", "校准检定设备"),
-    MEASURE_ACCOUNT("measureAccount", "measureAccount", "测量工装"),
-    STANDARD_SUPPORT_EQUIPMENT("standardSupportEquipment", "standardSupportEquipment", "标准配套设备"),
-    STANDARD_EQUIPMENT("standardEquipment", "standardEquipment", "标准装置"),
-    FLOW_DEF_EXPORT("flowDefData", "flowDefData", "流程定义"),
-    STAFF_CERTIFICATE("certificate", "certificate", "计量人员证书"),
-    CHECK_INFO("checkInfo", "checkInfo", "设备管理点检测"),
-    EQUIPMENT_APPLY("equipmentApply", "equipmentApply", "设备借用"),
-    STANDARD_EQUIPMENT_REMIND("equipmentApplyRemind", "equipmentApplyRemind", "标准装置到期提醒"),
-    METER_PRICE("meterPrice", "meterPrice", "价格库"),
-    METER_STAFF("meterStaff", "meterStaff", "计量人员"),
-    STANDARD_EQUIPMENT_APPLY("standardEquipmentApply", "standardEquipmentApply", "标准装置申请"),
-    STATE_MANAGE_APPLY("stateManage", "stateManage", "状态管理"),
-    METER_ACCEPTANCE_CHECK("acceptanceCheck", "acceptanceCheck", "设备检修保养验收单"),
-    CUSTOMER_EXPORT("customerData", "customerData", "客户信息"),
-    ORDER_EXPORT("orderData", "orderData", "委托书信息"),
-    SAMPLE_EXPORT("sampleData", "sampleData", "样本信息"),
-    EXCHANGE_DATA("exchangeData", "exchangeData", "设备交接单"),
-    DISPATCH_DATA("dispatchData", "dispatchData", "设备收发"),
-    ENVIRONMENT_DATA("environmentData", "environmentData", "环境记录单"),
-    ORIGIN_DATA("originData", "originData", "原始记录"),
-    CERTIFICATE_REPORT("certificateReport", "certificateReport", "证书报告"),
-    ADVICE_EXPORT("adviceData", "adviceData", "客户反馈"),
-    HANDOUT_EXPORT("handoutData", "handoutData", "任务分发列表"),
-    OUTSOURCER_EXPORT("outsourcerData", "outsourcerData", "分包方"),
-    SITE_EXECUTIVE_EXPORT("siteExecutiveData", "siteExecutiveData", "现场测试、校准或检定"),
-    CERTIFICATE_PRINT_EXPORT("certificatePrintData", "certificatePrintData", "证书打印"),
-    DOWNLOAD_TEMPLATE("downloadTemplate", "downloadTemplate", "页面配置"),
-    OUTSOURCER_CERTIFICATE_EXPORT("outsourceCertificateData", "outsourceCertificateData", "分包证书"),
-    SETTLEMENT_INFO_EXPORT("settlementInfoData", "settlementInfoData", "业务结算"),
-    EQUIPMENT_REMIND("equipmentRemind", "equipmentRemind", "设备到期提醒"),
-    AGREEMENT_INFO_EXPORT("agreementInfoData", "agreementInfoData", "合同"),
-    WORK_STATISTICS_EXPORT("workStatisticsData", "workStatisticsData", "实时工作统计"),
-    DEPT_OUTPUT_EXPORT("deptOutputData", "deptOutputData", "部门产值分析"),
-    WORKLOAD_EXPORT("workloadData", "workloadData", "业务工作量分析"),
-    DEPT_COMPREHENSIVE_EXPORT("deptComprehensiveData", "deptComprehensiveData", "部门综合分析"),
-    ENVIRONMENTAL_RECORD("environmentalRecordData", "environmentalRecordData", "现场环境记录");
+    /**
+     * 计量检定业务
+     */
+    OUTSOURCER_EXPORT("outsourcerData", "分包方名录", "分包方名录"),
+    IDENTIFY_EXPORT("identifyData", "计量标识", "计量标识"),
+    ORDER_EXPORT("orderData", "任务单", "任务单"),
+    DISPATCH_DATA("dispatchData", "设备收发", "设备收发"),
+    HANDOUT_EXPORT("handoutData", "任务分发", "任务分发"),
+    SITE_EXECUTIVE_EXPORT("siteExecutiveData", "现场测试、校准或检定", "现场测试、校准或检定"),
+    CERTIFICATE_REPORT("certificateReport", "证书审批", "证书审批"),
+    CERTIFICATE_CHANGE_APPLY("certificateChangeApply", "证书报告补充或更换申请单", "证书报告补充或更换申请单"),
+    CERTIFICATE_PRINT("certificatePrintData", "证书打印审批", "证书打印审批"),
+    DEPT_EXECUTIVE_TASK("deptExecutiveTaskData", "实验室任务", "实验室任务"),
+    MY_EXECUTIVE_TASK("myExecutiveTaskData", "我的任务", "我的任务"),
+    OUTSOURCE_ASSESS("outsourceAssess", "测试、校准或检定工作分包评审表", "测试、校准或检定工作分包评审表"),
+    OUTSOURCE_PROTOCOL("outsourceProtocol", "测试、校准或检定工作分包协议书", "测试、校准或检定工作分包协议书"),
+
+    /**
+     * 系统管理
+     */
+    SIGN_EXPORT("signData", "签名", "签名"),
+    TEMPLATE_EXPORT("templateData", "文件模板", "文件模板"),
+    FLOW_DEF_EXPORT("flowDefData", "流程定义", "流程定义"),
+    DOWNLOAD_TEMPLATE("downloadTemplate", "流程定义", "页面配置");
 
     ExportEnum(String fileName, String sheetName, String description) {
         this.fileName = fileName;
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateRecordTypeCodeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateRecordTypeCodeEnum.java
index 31d913c..a963522 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateRecordTypeCodeEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateRecordTypeCodeEnum.java
@@ -46,4 +46,14 @@
     String SITE_EXECUTIVE_APPROVAL = "01";
     //《现场测试、校准或检定工作记录表》
     String SITE_EXECUTIVE_LOG = "02";
+
+    //测试、校准或检定工作分包协议书
+    String OUTSOURCE_PROTOCOL = "01";
+    //测试、校准或检定工作分包评审表
+    String OUTSOURCE_ACCESS = "02";
+    //测试、校准或检定工作分包通知书
+    String OUTSOURCE_NOTICE = "03";
+    //测试、校准或检定工作分包方名录
+    String OUTSOURCE_INFO = "04";
+
 }
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
index 24b8635..f78bd53 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
@@ -15,6 +15,10 @@
     String CERTIFICATE_CHANGE_APPLY_BEAN_NAME = "certificateChangeApplyBean";
     //现场测试、校准或检定
     String SITE_EXECUTIVE_BEAN_NAME = "siteExecutiveBean";
+    //测试、校准或检定工作分包评审表
+    String OUTSOURCE_ASSESS_BEAN_NAME = "outsourceAssessBean";
+    //测试、校准或检定工作分包协议书
+    String OUTSOURCE_PROTOCOL_BEAN_NAME = "outsourceProtocolBean";
 
     /*********************************设备与装置************************************/
     //设备台账
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 b21c661..6b86fd1 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
@@ -18,6 +18,8 @@
     OUTSOURCER_APPROVAL(OUTSOURCER_BEAN_NAME, ""),
     CERTIFICATE_CHANGE_APPROVAL(CERTIFICATE_CHANGE_APPLY_BEAN_NAME, ""),
     SITE_EXECUTIVE_APPROVAL(SITE_EXECUTIVE_BEAN_NAME, ""),
+    OUTSOURCE_ASSESS_APPROVAL(OUTSOURCE_ASSESS_BEAN_NAME, ""),
+    OUTSOURCE_PROTOCOL_APPROVAL(OUTSOURCE_PROTOCOL_BEAN_NAME, ""),
 
     ACTION_STATUS_MAP(new HashMap<String, AwareActionStatusEnum>() {
         {
@@ -47,6 +49,10 @@
             put(ApplyFromIdEnum.CERTIFICATE_CHANGE_APPROVAL.getCode(), CERTIFICATE_CHANGE_APPROVAL);
             //现场测试、校准或检定审批
             put(ApplyFromIdEnum.SITE_EXECUTIVE_APPROVAL.getCode(), SITE_EXECUTIVE_APPROVAL);
+            //测试、校准或检定工作分包评审表
+            put(ApplyFromIdEnum.OUTSOURCE_ASSESS_APPROVAL.getCode(), OUTSOURCE_ASSESS_APPROVAL);
+            //测试、校准或检定工作分包协议书
+            put(ApplyFromIdEnum.OUTSOURCE_PROTOCOL_APPROVAL.getCode(), OUTSOURCE_PROTOCOL_APPROVAL);
         }
     });
     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 934405e..c7410bd 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
@@ -9,6 +9,8 @@
     CERTIFICATE_CHANGE_APPROVAL("jljdywzsbchghsqd", MessageSourceModuleEnum.BUSINESS.getCode(), "证书/报告补充或更换申请单"),
     OUTSOURCER_APPROVAL("jljdywcsjzhgfbfml", MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定合格分包方名录"),
     SITE_EXECUTIVE_APPROVAL("jljdywxccsjzsp", MessageSourceModuleEnum.BUSINESS.getCode(), "现场测试、校准或检定审批"),
+    OUTSOURCE_ASSESS_APPROVAL("jljdywcsjzfbpsb", MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包评审表"),
+    OUTSOURCE_PROTOCOL_APPROVAL("jljdywcsjzfbxys", MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包协议书"),
 
 
     /*******************************************设备与装置*********************************************/
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/GeneralApprovalMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/GeneralApprovalMapper.java
index 4fb7344..0c9d6ae 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/GeneralApprovalMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/GeneralApprovalMapper.java
@@ -17,8 +17,4 @@
 
     Page<O> selectBatchForApprovalList(Page<O> page, @Param("request") R request, @Param("businessKeys") List<String> businessKeys);
 
-//    Page<O> selectListPage(Page<O> page, @Param("request") R request);
-
-//    Long selectMaxNo();
-
 }
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceAssessMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceAssessMapper.java
index 7867bb8..ba59009 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceAssessMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceAssessMapper.java
@@ -1,7 +1,12 @@
 package com.casic.missiles.mapper.business;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.business.outsource.OutsourceAssessApprovalListRequest;
+import com.casic.missiles.mapper.GeneralApprovalMapper;
 import com.casic.missiles.model.business.BizBusinessOutsourceAssess;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * <p>
@@ -11,6 +16,10 @@
  * @author wangpeng
  * @since 2023-08-16
  */
-public interface BizBusinessOutsourceAssessMapper extends BaseMapper<BizBusinessOutsourceAssess> {
+public interface BizBusinessOutsourceAssessMapper extends GeneralApprovalMapper<BizBusinessOutsourceAssess, BizBusinessOutsourceAssess, OutsourceAssessApprovalListRequest> {
+
+    Page<BizBusinessOutsourceAssess> selectBatchForApprovalList(Page<BizBusinessOutsourceAssess> page, @Param("request") OutsourceAssessApprovalListRequest request, @Param("businessKeys") List<String> businessKeys);
+
+    Long selectMaxProjectNo();
 
 }
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceProtocolMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceProtocolMapper.java
new file mode 100644
index 0000000..e6aba35
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceProtocolMapper.java
@@ -0,0 +1,24 @@
+package com.casic.missiles.mapper.business;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.business.outsource.OutsourceProtocolApprovalListRequest;
+import com.casic.missiles.mapper.GeneralApprovalMapper;
+import com.casic.missiles.model.business.BizBusinessOutsourceProtocol;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 计量检定业务-分包管理-测试、校准或检定工作分包协议书 Mapper 接口
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-08-24
+ */
+public interface BizBusinessOutsourceProtocolMapper extends GeneralApprovalMapper<BizBusinessOutsourceProtocol, BizBusinessOutsourceProtocol, OutsourceProtocolApprovalListRequest> {
+
+    Page<BizBusinessOutsourceProtocol> selectBatchForApprovalList(Page<BizBusinessOutsourceProtocol> page, @Param("request") OutsourceProtocolApprovalListRequest request, @Param("businessKeys") List<String> businessKeys);
+
+    Long selectMaxProtocolNo();
+}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/EnvLocationInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/EnvLocationInfoMapper.java
new file mode 100644
index 0000000..49eff87
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/EnvLocationInfoMapper.java
@@ -0,0 +1,21 @@
+package com.casic.missiles.mapper.resource;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.resource.environment.LocationListRequest;
+import com.casic.missiles.dto.resource.environment.LocationListResponse;
+import com.casic.missiles.model.resource.EnvLocationInfo;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * <p>
+ * 实验室环境监控系统-设备表 Mapper 接口
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-06-07
+ */
+public interface EnvLocationInfoMapper extends BaseMapper<EnvLocationInfo> {
+
+    Page<LocationListResponse> selectLocationListPage(Page<LocationListResponse> page, @Param("request") LocationListRequest request);
+}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java
index de124db..85ed0f7 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java
@@ -1,7 +1,9 @@
 package com.casic.missiles.mapper.system;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.dto.system.SignDetailResponse;
+import com.casic.missiles.dto.system.SignListRequest;
 import com.casic.missiles.model.system.SystemSign;
 import org.apache.ibatis.annotations.Param;
 
@@ -22,4 +24,8 @@
     SignDetailResponse selectSignDetailById(Long id);
 
     List<SystemSign> selectUsableSignList(@Param("userId") Long userId);
+
+    Page<SystemSign> selectSignListPage(Page<SystemSign> page, @Param("request") SignListRequest request);
+
+    List<SystemSign> selectSignList(@Param("request") SignListRequest request);
 }
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateChangeApplyMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateChangeApplyMapper.xml
index d798447..c496092 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateChangeApplyMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateChangeApplyMapper.xml
@@ -30,31 +30,31 @@
         SELECT *
         FROM biz_business_certificate_change_apply
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.changeApplyNo != null and request.changeApplyNo !=''">
+        <if test="request != null and request.changeApplyNo != null and request.changeApplyNo !=''">
             and change_apply_no like concat('%',#{request.changeApplyNo},'%')
         </if>
-        <if test="request.changeReportNo != null and request.changeReportNo !=''">
+        <if test="request != null and request.changeReportNo != null and request.changeReportNo !=''">
             and change_report_no like concat('%',#{request.changeReportNo},'%')
         </if>
-        <if test="request.changeReportName != null and request.changeReportName !=''">
+        <if test="request != null and request.changeReportName != null and request.changeReportName !=''">
             and change_report_name like concat('%',#{request.changeReportName},'%')
         </if>
-        <if test="request.changeType != null and request.changeType !=''">
+        <if test="request != null and request.changeType != null and request.changeType !=''">
             and change_type = #{request.changeType}
         </if>
-        <if test="request.createUserName != null and request.createUserName !=''">
+        <if test="request != null and request.createUserName != null and request.createUserName !=''">
             and create_user_name like concat('%',#{request.createUserName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificatePrintMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificatePrintMapper.xml
index b66cd99..49c0ac8 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificatePrintMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificatePrintMapper.xml
@@ -31,34 +31,34 @@
         LEFT JOIN biz_business_order_sample_relation bosr ON (bosr.order_id = bcr.order_id AND bosr.sample_id = bcr.sample_id)
         LEFT JOIN biz_business_order_info boi ON boi.id = bosr.order_id
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and bcp.approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.printStatus != null and request.printStatus !=''">
+        <if test="request != null and request.printStatus != null and request.printStatus !=''">
             and print_status = #{request.printStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and bcp.create_user_id = #{request.createUserId}
         </if>
-        <if test="request.certificateReportNo != null and request.certificateReportNo !=''">
+        <if test="request != null and request.certificateReportNo != null and request.certificateReportNo !=''">
             and bcr.certificate_report_no like concat('%',#{request.certificateReportNo},'%')
         </if>
-        <if test="request.certificateReportName != null and request.certificateReportName !=''">
+        <if test="request != null and request.certificateReportName != null and request.certificateReportName !=''">
             and bcr.certificate_report_name like concat('%',#{request.certificateReportName},'%')
         </if>
-        <if test="request.customerName != null and request.customerName !=''">
+        <if test="request != null and request.customerName != null and request.customerName !=''">
             and boi.customer_name like concat('%',#{request.customerName},'%')
         </if>
-        <if test="request.sampleNo != null and request.sampleNo !=''">
+        <if test="request != null and request.sampleNo != null and request.sampleNo !=''">
             and bosr.sample_no like concat('%',#{request.sampleNo},'%')
         </if>
-        <if test="request.sampleName != null and request.sampleName !=''">
+        <if test="request != null and request.sampleName != null and request.sampleName !=''">
             and bosr.sample_name like concat('%',#{request.sampleName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and bcp.create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and bcp.create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml
index b366034..767695d 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml
@@ -46,33 +46,37 @@
         SELECT bcr.*, bosr.sample_no, bosr.sample_name, bosr.sample_model, rsi.staff_name
         FROM biz_business_certificate_report bcr
         LEFT JOIN biz_business_order_sample_relation bosr ON (bosr.order_id = bcr.order_id AND bosr.sample_id = bcr.sample_id)
+        LEFT JOIN biz_business_order_info boi ON boi.id = bcr.order_id
         LEFT JOIN biz_resource_staff_info rsi ON rsi.id = bcr.measure_person_id
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and bcr.approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and bcr.create_user_id = #{request.createUserId}
         </if>
-        <if test="request.certificateReportNo != null and request.certificateReportNo !=''">
+        <if test="request != null and request.customerId != null and request.customerId !=''">
+            and boi.customer_id = #{request.customerId}
+        </if>
+        <if test="request != null and request.certificateReportNo != null and request.certificateReportNo !=''">
             and bcr.certificate_report_no like concat('%',#{request.certificateReportNo},'%')
         </if>
-        <if test="request.certificateReportName != null and request.certificateReportName !=''">
+        <if test="request != null and request.certificateReportName != null and request.certificateReportName !=''">
             and bcr.certificate_report_name like concat('%',#{request.certificateReportName},'%')
         </if>
-        <if test="request.sampleNo != null and request.sampleNo !=''">
+        <if test="request != null and request.sampleNo != null and request.sampleNo !=''">
             and bosr.sample_no like concat('%',#{request.sampleNo},'%')
         </if>
-        <if test="request.measureCategory != null and request.measureCategory !=''">
+        <if test="request != null and request.measureCategory != null and request.measureCategory !=''">
             and bcr.measure_category = #{request.measureCategory}
         </if>
-        <if test="request.measurePerson != null and request.measurePerson !=''">
+        <if test="request != null and request.measurePerson != null and request.measurePerson !=''">
             and rsi.staff_name like concat('%',#{request.measurePerson},'%')
         </if>
-        <if test="request.calibrationTimeStart != null and request.calibrationTimeStart !=''">
+        <if test="request != null and request.calibrationTimeStart != null and request.calibrationTimeStart !=''">
             and bcr.calibration_time &gt;= #{request.calibrationTimeStart}
         </if>
-        <if test="request.calibrationTimeEnd != null and request.calibrationTimeEnd !=''">
+        <if test="request != null and request.calibrationTimeEnd != null and request.calibrationTimeEnd !=''">
             and bcr.calibration_time &lt;= #{request.calibrationTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceAssessMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceAssessMapper.xml
index d0fcf8b..c22c101 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceAssessMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceAssessMapper.xml
@@ -7,6 +7,8 @@
         <id column="id" property="id" />
         <result column="project_no" property="projectNo" />
         <result column="project_name" property="projectName" />
+        <result column="lab_code" property="labCode" />
+        <result column="group_code" property="groupCode" />
         <result column="applicant_id" property="applicantId" />
         <result column="applicant_name" property="applicantName" />
         <result column="applicant_time" property="applicantTime" />
@@ -31,7 +33,45 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, project_no, project_name, applicant_id, applicant_name, applicant_time, minio_file_name, remark, create_user_id, create_user_name, outsourcer_id, pre_start_time, pre_end_time, outsource_reason, pre_cost, approval_status, process_id, approve_situation, traceability, test_method, technique_ability, create_time, update_time
+        id, project_no, project_name, lab_code, group_code, applicant_id, applicant_name, applicant_time, minio_file_name, remark, create_user_id, create_user_name, outsourcer_id, pre_start_time, pre_end_time, outsource_reason, pre_cost, approval_status, process_id, approve_situation, traceability, test_method, technique_ability, create_time, update_time
     </sql>
 
+    <select id="selectMaxProjectNo" resultType="java.lang.Long">
+        SELECT IFNULL(max(RIGHT(project_no, 3)), 0) from biz_business_outsource_assess
+    </select>
+
+    <select id="selectBatchForApprovalList" resultMap="BaseResultMap">
+        SELECT bboa.*, bboi.outsourcer_name, bboi.director
+        FROM biz_business_outsource_assess bboa
+        LEFT JOIN biz_business_outsourcer_info bboi ON bboa.outsourcer_id = bboi.id
+        WHERE 1=1
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
+            and bboa.approval_status = #{request.approvalStatus}
+        </if>
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
+            and bboa.create_user_id = #{request.createUserId}
+        </if>
+        <if test="request != null and request.projectNo != null and request.projectNo !=''">
+            and bboa.project_no like concat('%',#{request.projectNo},'%')
+        </if>
+        <if test="request != null and request.outsourcerName != null and request.outsourcerName !=''">
+            and bboi.outsourcer_name like concat('%',#{request.outsourcerName},'%')
+        </if>
+        <if test="request != null and request.applicantName != null and request.applicantName !=''">
+            and bboa.applicant_name like concat('%',#{request.applicantName},'%')
+        </if>
+        <if test="request != null and request.applicantTimeStart != null and request.applicantTimeStart !=''">
+            and bboa.applicant_time &gt;= #{request.applicantTimeStart}
+        </if>
+        <if test="request != null and request.applicantTimeEnd != null and request.applicantTimeEnd !=''">
+            and bboa.applicant_time &lt;= #{request.applicantTimeEnd}
+        </if>
+        <if test="businessKeys != null">
+            and bboa.id in
+            <foreach collection="businessKeys" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
+        ORDER BY bboa.create_time DESC
+    </select>
 </mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceProtocolMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceProtocolMapper.xml
new file mode 100644
index 0000000..b7b2149
--- /dev/null
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceProtocolMapper.xml
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.mapper.business.BizBusinessOutsourceProtocolMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.business.BizBusinessOutsourceProtocol">
+        <id column="id" property="id" />
+        <result column="protocol_no" property="protocolNo" />
+        <result column="project_name" property="projectName" />
+        <result column="lab_code" property="labCode" />
+        <result column="group_code" property="groupCode" />
+        <result column="outsourcer_id" property="outsourcerId" />
+        <result column="remark" property="remark" />
+        <result column="outsource_no" property="outsourceNo" />
+        <result column="outsource_name" property="outsourceName" />
+        <result column="contacts" property="contacts" />
+        <result column="mobile" property="mobile" />
+        <result column="address" property="address" />
+        <result column="require_date" property="requireDate" />
+        <result column="outsource_cost" property="outsourceCost" />
+        <result column="director" property="director" />
+        <result column="item" property="item" />
+        <result column="requires" property="requires" />
+        <result column="create_user_id" property="createUserId" />
+        <result column="create_user_name" property="createUserName" />
+        <result column="approval_status" property="approvalStatus" />
+        <result column="process_id" property="processId" />
+        <result column="create_time" property="createTime" />
+        <result column="update_time" property="updateTime" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, protocol_no, project_name, lab_code, group_code, outsourcer_id, remark, outsource_no, outsource_name, contacts, mobile, address, require_date, outsource_cost, director, item, requires, create_user_id, create_user_name, approval_status, process_id, create_time, update_time
+    </sql>
+
+    <select id="selectMaxProtocolNo" resultType="java.lang.Long">
+        SELECT IFNULL(max(RIGHT(protocol_no, 3)), 0) from biz_business_outsource_protocol
+    </select>
+
+    <select id="selectBatchForApprovalList" resultMap="BaseResultMap">
+        SELECT *
+        FROM biz_business_outsource_protocol
+        WHERE 1=1
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
+            and approval_status = #{request.approvalStatus}
+        </if>
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
+            and create_user_id = #{request.createUserId}
+        </if>
+        <if test="request != null and request.protocolNo != null and request.protocolNo !=''">
+            and protocol_no like concat('%',#{request.protocolNo},'%')
+        </if>
+        <if test="request != null and request.outsourcerName != null and request.outsourcerName !=''">
+            and outsourcer_name like concat('%',#{request.outsourcerName},'%')
+        </if>
+        <if test="request != null and request.applicantName != null and request.applicantName !=''">
+            and create_user_name like concat('%',#{request.applicantName},'%')
+        </if>
+        <if test="request != null and request.applicantTimeStart != null and request.applicantTimeStart !=''">
+            and create_time &gt;= #{request.applicantTimeStart}
+        </if>
+        <if test="request != null and request.applicantTimeEnd != null and request.applicantTimeEnd !=''">
+            and create_time &lt;= #{request.applicantTimeEnd}
+        </if>
+        <if test="businessKeys != null">
+            and id in
+            <foreach collection="businessKeys" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
+        ORDER BY create_time DESC
+    </select>
+</mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourcerInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourcerInfoMapper.xml
index 510a80b..3049b54 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourcerInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourcerInfoMapper.xml
@@ -7,6 +7,8 @@
         <id column="id" property="id" />
         <result column="outsourcer_no" property="outsourcerNo" />
         <result column="outsourcer_name" property="outsourcerName" />
+        <result column="lab_code" property="labCode" />
+        <result column="group_code" property="groupCode" />
         <result column="outsourcer_brief_name" property="outsourcerBriefName" />
         <result column="outsourcer_size" property="outsourcerSize" />
         <result column="business_size" property="businessSize" />
@@ -55,32 +57,32 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, outsourcer_no, outsourcer_name, outsourcer_brief_name, outsourcer_size, business_size, grade, evaluation, tax_number, bank_account, bank_name, bank_account_number, postal_code, director, phone, fax, mobile, email, website, address_country, address_province, address_city, address_area, full_address, address_country_name, address_province_name, address_city_name, address_area_name, invoice_country, invoice_province, invoice_city, invoice_area, invoice_full_address, invoice_country_name, invoice_province_name, invoice_city_name, invoice_area_name, business_scope, business_content, minio_file_name, approval_status, process_id, remark, create_user_id, create_user_name, create_time, update_time
+        id, outsourcer_no, outsourcer_name, lab_code, group_code, outsourcer_brief_name, outsourcer_size, business_size, grade, evaluation, tax_number, bank_account, bank_name, bank_account_number, postal_code, director, phone, fax, mobile, email, website, address_country, address_province, address_city, address_area, full_address, address_country_name, address_province_name, address_city_name, address_area_name, invoice_country, invoice_province, invoice_city, invoice_area, invoice_full_address, invoice_country_name, invoice_province_name, invoice_city_name, invoice_area_name, business_scope, business_content, minio_file_name, approval_status, process_id, remark, create_user_id, create_user_name, create_time, update_time
     </sql>
 
     <select id="selectBatchForApprovalList" resultMap="BaseResultMap">
         SELECT *
         FROM biz_business_outsourcer_info
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.outsourcerNo != null and request.outsourcerNo !=''">
+        <if test="request != null and request.outsourcerNo != null and request.outsourcerNo !=''">
             and outsourcer_no like concat('%',#{request.outsourcerNo},'%')
         </if>
-        <if test="request.outsourcerName != null and request.outsourcerName !=''">
+        <if test="request != null and request.outsourcerName != null and request.outsourcerName !=''">
             and outsourcer_name like concat('%',#{request.outsourcerName},'%')
         </if>
-        <if test="request.director != null and request.director !=''">
+        <if test="request != null and request.director != null and request.director !=''">
             and director like concat('%',#{request.director},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
@@ -93,6 +95,6 @@
     </select>
 
     <select id="selectMaxNo" resultType="java.lang.Long">
-        SELECT IFNULL(max(RIGHT(outsourcer_no, 12)), 0) from biz_business_outsourcer_info
+        SELECT IFNULL(max(RIGHT(outsourcer_no, 3)), 0) from biz_business_outsourcer_info
     </select>
 </mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessSiteExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessSiteExecutiveInfoMapper.xml
index 135c5d0..3c5ae79 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessSiteExecutiveInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessSiteExecutiveInfoMapper.xml
@@ -38,25 +38,25 @@
         FROM biz_business_site_executive_info bsei
         LEFT JOIN biz_resource_customer_info rci ON bsei.customer_id = rci.id
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and bsei.approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and bsei.create_user_id = #{request.createUserId}
         </if>
-        <if test="request.siteExecutiveNo != null and request.siteExecutiveNo !=''">
+        <if test="request != null and request.siteExecutiveNo != null and request.siteExecutiveNo !=''">
             and bsei.site_executive_no like concat('%',#{request.siteExecutiveNo},'%')
         </if>
-        <if test="request.customerName != null and request.customerName !=''">
+        <if test="request != null and request.customerName != null and request.customerName !=''">
             and rci.outsourcer_name like concat('%',#{request.customerName},'%')
         </if>
-        <if test="request.applyName != null and request.applyName !=''">
+        <if test="request != null and request.applyName != null and request.applyName !=''">
             and bsei.apply_name like concat('%',#{request.applyName},'%')
         </if>
-        <if test="request.applyTimeStart != null and request.applyTimeStart !=''">
+        <if test="request != null and request.applyTimeStart != null and request.applyTimeStart !=''">
             and bsei.apply_time &gt;= #{request.applyTimeStart}
         </if>
-        <if test="request.applyTimeEnd != null and request.applyTimeEnd !=''">
+        <if test="request != null and request.applyTimeEnd != null and request.applyTimeEnd !=''">
             and bsei.apply_time &lt;= #{request.applyTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml
index 84d9e2a..6bd38a9 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml
@@ -105,6 +105,12 @@
         <if test="request.isUrgent != null and request.isUrgent !=''">
             AND bo.is_urgent = #{request.isUrgent}
         </if>
+        <if test="request.ids != null">
+            and blei.id in
+            <foreach collection="request.ids" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
         ORDER BY blei.update_time DESC
     </select>
 
@@ -137,6 +143,12 @@
         <if test="request.isUrgent != null and request.isUrgent !=''">
             AND bo.is_urgent = #{request.isUrgent}
         </if>
+        <if test="request.ids != null">
+            and blei.id in
+            <foreach collection="request.ids" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
         ORDER BY blei.update_time DESC
     </select>
 
diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardInfoMapper.xml
index 1a5551b..2ed8d17 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardInfoMapper.xml
@@ -45,12 +45,6 @@
         FROM biz_equipment_standard_info besi
         LEFT JOIN biz_equipment_standard_technology_relation bestr ON besi.standard_no = bestr.standard_no
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
-            and besi.approval_status = #{request.approvalStatus}
-        </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
-            and besi.create_user_id = #{request.createUserId}
-        </if>
         <if test="request.standardName != null and request.standardName !=''">
             and besi.standard_name like concat('%',#{request.standardName},'%')
         </if>
diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardTechnologyRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardTechnologyRelationMapper.xml
index fc7e16c..cd03c8c 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardTechnologyRelationMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardTechnologyRelationMapper.xml
@@ -6,6 +6,7 @@
     <resultMap id="BaseResultMap" type="com.casic.missiles.model.equipment.BizEquipmentStandardTechnologyRelation">
         <id column="id" property="id" />
         <result column="technology_file_id" property="technologyFileId" />
+        <result column="technology_file_no" property="technologyFileNo" />
         <result column="technology_file_name" property="technologyFileName" />
         <result column="standard_id" property="standardId" />
         <result column="standard_no" property="standardNo" />
@@ -14,7 +15,7 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, technology_file_id, technology_file_name, standard_id, remark
+        id, technology_file_id, technology_file_no, technology_file_name, standard_id, remark
     </sql>
 
 </mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceAuthorizeOrderMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceAuthorizeOrderMapper.xml
index ac5176c..554fe65 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceAuthorizeOrderMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceAuthorizeOrderMapper.xml
@@ -32,22 +32,22 @@
         SELECT *
         FROM biz_resource_authorize_order
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.orderNo != null and request.orderNo !=''">
+        <if test="request != null and request.orderNo != null and request.orderNo !=''">
             and order_no like concat('%',#{request.orderNo},'%')
         </if>
-        <if test="request.createUserName != null and request.createUserName !=''">
+        <if test="request != null and request.createUserName != null and request.createUserName !=''">
             and create_user_name like concat('%',#{request.createUserName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerExamineFormMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerExamineFormMapper.xml
index ab242f6..af7f98f 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerExamineFormMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerExamineFormMapper.xml
@@ -41,28 +41,28 @@
         SELECT *
         FROM biz_resource_customer_examine_form
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.formNo != null and request.formNo !=''">
+        <if test="request != null and request.formNo != null and request.formNo !=''">
             and form_no like concat('%',#{request.formNo},'%')
         </if>
-        <if test="request.labCode != null and request.labCode !=''">
+        <if test="request != null and request.labCode != null and request.labCode !=''">
             and lab_code like concat('%',#{request.labCode},'%')
         </if>
-        <if test="request.groupCode != null and request.groupCode !=''">
+        <if test="request != null and request.groupCode != null and request.groupCode !=''">
             and group_code like concat('%',#{request.groupCode},'%')
         </if>
-        <if test="request.createUserName != null and request.createUserName !=''">
+        <if test="request != null and request.createUserName != null and request.createUserName !=''">
             and create_user_name like concat('%',#{request.createUserName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerInfoMapper.xml
index fa8ffbc..06a2798 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerInfoMapper.xml
@@ -33,25 +33,25 @@
         SELECT *
         FROM biz_resource_customer_info
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.customerNo != null and request.customerNo !=''">
+        <if test="request != null and request.customerNo != null and request.customerNo !=''">
             and customer_no like concat('%',#{request.customerNo},'%')
         </if>
-        <if test="request.customerName != null and request.customerName !=''">
+        <if test="request != null and request.customerName != null and request.customerName !=''">
             and customer_name like concat('%',#{request.customerName},'%')
         </if>
-        <if test="request.contacts != null and request.contacts !=''">
+        <if test="request != null and request.contacts != null and request.contacts !=''">
             and contacts like concat('%',#{request.contacts},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerSuggestFormMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerSuggestFormMapper.xml
index 28f5bb2..1806662 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerSuggestFormMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerSuggestFormMapper.xml
@@ -33,28 +33,28 @@
         SELECT *
         FROM biz_resource_customer_suggest_form
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.formNo != null and request.formNo !=''">
+        <if test="request != null and request.formNo != null and request.formNo !=''">
             and form_no like concat('%',#{request.formNo},'%')
         </if>
-        <if test="request.customerName != null and request.customerName !=''">
+        <if test="request != null and request.customerName != null and request.customerName !=''">
             and customer_name like concat('%',#{request.customerName},'%')
         </if>
-        <if test="request.customerDeptName != null and request.customerDeptName !=''">
+        <if test="request != null and request.customerDeptName != null and request.customerDeptName !=''">
             and customer_dept_name like concat('%',#{request.customerDeptName},'%')
         </if>
-        <if test="request.createUserName != null and request.createUserName !=''">
+        <if test="request != null and request.createUserName != null and request.createUserName !=''">
             and create_user_name like concat('%',#{request.createUserName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSealUseNoteMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSealUseNoteMapper.xml
index ab37bc1..b02bb33 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSealUseNoteMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSealUseNoteMapper.xml
@@ -29,32 +29,32 @@
     </sql>
 
     <select id="selectBatchForApprovalList" resultMap="BaseResultMap">
-        SELECT *
+        SELECT brsun.*, brsi.seal_name, brsi.seal_type, brsi.approver_name
         FROM biz_resource_seal_use_note brsun
         JOIN biz_resource_seal_info brsi ON brsun.seal_id = brsi.id
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and brsun.approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and brsun.create_user_id = #{request.createUserId}
         </if>
-        <if test="request.sealName != null and request.sealName !=''">
+        <if test="request != null and request.sealName != null and request.sealName !=''">
             and brsi.seal_name like concat('%',#{request.sealName},'%')
         </if>
-        <if test="request.sealType != null and request.sealType !=''">
+        <if test="request != null and request.sealType != null and request.sealType !=''">
             and brsi.seal_type = #{request.sealType}
         </if>
-        <if test="request.applyDeptName != null and request.applyDeptName !=''">
+        <if test="request != null and request.applyDeptName != null and request.applyDeptName !=''">
             and brsun.apply_dept_name like concat('%',#{request.applyDeptName},'%')
         </if>
-        <if test="request.applyUserName != null and request.applyUserName !=''">
+        <if test="request != null and request.applyUserName != null and request.applyUserName !=''">
             and brsun.apply_user_name like concat('%',#{request.applyUserName},'%')
         </if>
-        <if test="request.applyTimeStart != null and request.applyTimeStart !=''">
+        <if test="request != null and request.applyTimeStart != null and request.applyTimeStart !=''">
             and brsun.apply_time &gt;= #{request.applyTimeStart}
         </if>
-        <if test="request.applyTimeEnd != null and request.applyTimeEnd !=''">
+        <if test="request != null and request.applyTimeEnd != null and request.applyTimeEnd !=''">
             and brsun.apply_time &lt;= #{request.applyTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml
index 119bf7d..4f8392a 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml
@@ -31,6 +31,12 @@
         <if test="request.deptName != null and request.deptName !=''">
             and brsi.dept_name like concat('%',#{request.deptName},'%')
         </if>
+        <if test="request.ids != null">
+            and brsv.id in
+            <foreach collection="request.ids" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
         ORDER BY brsv.grant_date DESC
     </select>
 
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSupplierInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSupplierInfoMapper.xml
index fe8d399..e8ce7ef 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSupplierInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSupplierInfoMapper.xml
@@ -48,28 +48,28 @@
         SELECT *
         FROM biz_resource_supplier_info
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.supplierNo != null and request.supplierNo !=''">
+        <if test="request != null and request.supplierNo != null and request.supplierNo !=''">
             and supplier_no like concat('%',#{request.supplierNo},'%')
         </if>
-        <if test="request.supplierName != null and request.supplierName !=''">
+        <if test="request != null and request.supplierName != null and request.supplierName !=''">
             and supplier_name like concat('%',#{request.supplierName},'%')
         </if>
-        <if test="request.director != null and request.director !=''">
+        <if test="request != null and request.director != null and request.director !=''">
             and director like concat('%',#{request.director},'%')
         </if>
-        <if test="request.supplierType != null and request.supplierType !=''">
+        <if test="request != null and request.supplierType != null and request.supplierType !=''">
             and supplier_type = #{request.supplierType}
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/EnvLocationInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/EnvLocationInfoMapper.xml
new file mode 100644
index 0000000..68bcf10
--- /dev/null
+++ b/casic-metering-dao/src/main/resources/mapper/resource/EnvLocationInfoMapper.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.mapper.resource.EnvLocationInfoMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.resource.EnvLocationInfo">
+        <id column="id" property="id" />
+        <result column="location_no" property="locationNo" />
+        <result column="location_name" property="locationName" />
+        <result column="location_position" property="locationPosition" />
+        <result column="create_user_id" property="createUserId" />
+        <result column="create_user" property="createUser" />
+        <result column="create_time" property="createTime" />
+        <result column="update_time" property="updateTime" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, location_no, location_name, location_position, create_user_id, create_user, create_time, update_time
+    </sql>
+
+    <select id="selectLocationListPage" resultType="com.casic.missiles.dto.resource.environment.LocationListResponse">
+        SELECT *
+        FROM env_location_info
+        WHERE 1=1
+        <if test="request.locationNo != null and request.locationNo !=''">
+            AND location_no LIKE concat('%',#{request.locationNo},'%')
+        </if>
+        <if test="request.locationName != null and request.locationName !=''">
+            AND location_name LIKE concat('%',#{request.locationName},'%')
+        </if>
+        ORDER BY create_time DESC
+    </select>
+
+</mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml
index b28c18f..8854047 100644
--- a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml
@@ -11,7 +11,6 @@
         <result column="sign_desc" property="signDesc" />
         <result column="sign_director" property="signDirector" />
         <result column="sign_user_id" property="signUserId" />
-        <result column="sign_type" property="signType" />
         <result column="minio_file_name" property="minioFileName" />
         <result column="create_time" property="createTime" />
         <result column="update_time" property="updateTime" />
@@ -28,7 +27,6 @@
         <result column="sign_name" property="signName" />
         <result column="sign_desc" property="signDesc" />
         <result column="sign_director" property="signDirector" />
-        <result column="sign_type" property="signType" />
         <result column="sign_user_id" property="signUserId" />
         <result column="minio_file_name" property="minioFileName" />
         <result column="create_time" property="createTime" />
@@ -62,4 +60,58 @@
         JOIN system_sign_user_relation ssur ON ss.id = ssur.sign_id
         WHERE ssur.user_id = #{userId}
     </select>
+
+    <select id="selectSignListPage" resultMap="BaseResultMap">
+        SELECT ss.*, sd.SIMPLE_NAME AS deptName
+        FROM system_sign ss
+        LEFT JOIN sys_user su ON su.id = ss.sign_user_id
+        LEFT JOIN sys_dept sd ON sd.id = su.dept_id
+        WHERE 1=1
+        <if test="request.signNo != null and request.signNo !=''">
+            AND ss.sign_no LIKE concat('%',#{request.signNo},'%')
+        </if>
+        <if test="request.signName != null and request.signName !=''">
+            AND ss.sign_name LIKE concat('%',#{request.signName},'%')
+        </if>
+        <if test="request.signDirector != null and request.signDirector !=''">
+            AND ss.sign_director LIKE concat('%',#{request.signDirector},'%')
+        </if>
+        <if test="request.signUserId != null and request.signUserId !=''">
+            AND ss.sign_user_id = #{request.signUserId}
+        </if>
+        <if test="request.createStartTime != null and request.createStartTime !=''">
+            AND DATE_FORMAT(ss.create_time,'%Y-%m-%d') &gt;= DATE_FORMAT(#{request.createStartTime},'%Y-%m-%d')
+        </if>
+        <if test="request.createEndTime != null and request.createEndTime !=''">
+            AND DATE_FORMAT(ss.create_time,'%Y-%m-%d')  &lt;= DATE_FORMAT(#{request.createEndTime},'%Y-%m-%d')
+        </if>
+        ORDER BY ss.create_time DESC
+    </select>
+
+    <select id="selectSignList" resultMap="BaseResultMap">
+        SELECT ss.*, sd.SIMPLE_NAME AS deptName
+        FROM system_sign ss
+        LEFT JOIN sys_user su ON su.id = ss.sign_user_id
+        LEFT JOIN sys_dept sd ON sd.id = su.dept_id
+        WHERE 1=1
+        <if test="request.signNo != null and request.signNo !=''">
+            AND ss.sign_no LIKE concat('%',#{request.signNo},'%')
+        </if>
+        <if test="request.signName != null and request.signName !=''">
+            AND ss.sign_name LIKE concat('%',#{request.signName},'%')
+        </if>
+        <if test="request.signDirector != null and request.signDirector !=''">
+            AND ss.sign_director LIKE concat('%',#{request.signDirector},'%')
+        </if>
+        <if test="request.signUserId != null and request.signUserId !=''">
+            AND ss.sign_user_id = #{request.signUserId}
+        </if>
+        <if test="request.createStartTime != null and request.createStartTime !=''">
+            AND DATE_FORMAT(ss.create_time,'%Y-%m-%d') &gt;= DATE_FORMAT(#{request.createStartTime},'%Y-%m-%d')
+        </if>
+        <if test="request.createEndTime != null and request.createEndTime !=''">
+            AND DATE_FORMAT(ss.create_time,'%Y-%m-%d')  &lt;= DATE_FORMAT(#{request.createEndTime},'%Y-%m-%d')
+        </if>
+        ORDER BY ss.create_time DESC
+    </select>
 </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 515050a..60f530b 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
@@ -47,8 +47,8 @@
     String STORAGE_LOCATION = "bizStorageLocation";
     //计量专业
     String MEASURE_MAJOR = "bizMeasureMajor";
-    //管理状态
-    String MANAGER_STATE = "bizManagerState";
+    //标准装置管理状态
+    String STANDARD_MANAGER_STATE = "bizStandardManagerState";
 
     /**
      * 资源管理 字典code
@@ -95,8 +95,6 @@
     String MEASURE_STATUS = "measureStatus";
     //检定方式
     String MEASURE_TYPE = "measureType";
-    //标识打印标志类型
-    String IDENTIFY_PRINT_TYPE = "bizBusinessIdentify";
     //变更类型
     String REPORT_CHANGE_TYPE = "bizCertChangeType";
     //规模类型
@@ -111,19 +109,24 @@
     String MEASURE_CATEGORY = "measureCategory";
     //检定结果
     String MEASURE_RESULT = "measureResult";
+    //分包原因
+    String OUTSOURCE_REASON = "outsourceReason";
+
+    /**
+     * 系统管理
+     */
+    String TEMPLATE_TYPE = "templateType";
+
 
     /**
      * 标准装置 字典code
      */
     //类别
     String STANDARD_CATEGORY = "standardCategory";
-    //管理状态
-    String STANDARD_MANAGER_STATE = "standardManagerState";
     //标准等级
     String STANDARD_LEVEL = "standardLevel";
     //传递范围
     String STANDARD_TRANSMIT_RANGE = "transmitRange";
-
     //资本来源
     String CAPITAL_SOURCE = "capitalSource";
     //标准装置-申请类型
@@ -148,8 +151,6 @@
     String CERTIFICATE_CLASS = "certificationClass";
     //证书管理-检校专业
     String CALIBRATION_MAJOR = "calibrationMajor";
-    //分包原因
-    String OUTSOURCE_REASON = "outsourceReason";
 
     /**
      * 工作台
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/BaseApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/BaseApprovalListRequest.java
index 73c12c1..80d7424 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/BaseApprovalListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/BaseApprovalListRequest.java
@@ -6,6 +6,7 @@
 
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotEmpty;
+import java.util.List;
 
 /**
  * @Description:
@@ -19,14 +20,14 @@
      * 表单id
      */
     @NotBlank(message = "表单id不能为空")
-    @ApiModelProperty(value = "表单id（流程定义对应的表单id，等价于业务id）", dataType = "String")
+    @ApiModelProperty(value = "表单id（流程定义对应的表单id，等价于业务id），导出接口不用传", dataType = "String")
     private String formId;
 
     /**
      * 审批状态类型，对应ApprovalStatusEnum
      */
     @NotEmpty(message = "审批状态类型不能为空")
-    @ApiModelProperty(value = "审批状态类型code", dataType = "String")
+    @ApiModelProperty(value = "审批状态类型code，导出接口不用传", dataType = "String")
     private String approvalStatus;
 
     @ApiModelProperty(hidden = true)
@@ -34,4 +35,7 @@
 
     @ApiModelProperty(hidden = true)
     private Long createUserId;
+
+    @ApiModelProperty(value = "导出ids", dataType = "List")
+    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificatePrintApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificatePrintApprovalListRequest.java
index b93d1c9..3cc2f4e 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificatePrintApprovalListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificatePrintApprovalListRequest.java
@@ -5,8 +5,6 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import java.util.List;
-
 /**
  * @Description:
  * @Author: wangpeng
@@ -38,7 +36,4 @@
 
     @ApiModelProperty(value = "创建结束时间", dataType = "String")
     private String createTimeEnd;
-
-    @ApiModelProperty(value = "导出ids", dataType = "List")
-    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportApprovalListRequest.java
index 4f7a038..c115847 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportApprovalListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportApprovalListRequest.java
@@ -5,8 +5,6 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import java.util.List;
-
 /**
  * @Description:
  * @Author: wangpeng
@@ -15,6 +13,8 @@
 @ApiModel
 @Data
 public class CertificateReportApprovalListRequest extends BaseApprovalListRequest {
+    @ApiModelProperty(value = "委托方id", dataType = "String")
+    private Long customerId;
 
     @ApiModelProperty(value = "证书报告编号", dataType = "String")
     private String certificateReportNo;
@@ -37,6 +37,4 @@
     @ApiModelProperty(value = "检校结束时间", dataType = "String")
     private String calibrationTimeEnd;
 
-    @ApiModelProperty(value = "导出ids", dataType = "List")
-    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/identify/IdentifyListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/identify/IdentifyListRequest.java
index 1b87ae6..f019203 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/identify/IdentifyListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/identify/IdentifyListRequest.java
@@ -4,6 +4,8 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * @Description:
  * @Author: wangpeng
@@ -26,4 +28,7 @@
 
     @ApiModelProperty(value = "打印结束时间", dataType = "String")
     private String createTimeEnd;
+
+    @ApiModelProperty(value = "导出ids", dataType = "List")
+    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListRequest.java
index 1264883..62415fb 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListRequest.java
@@ -7,6 +7,7 @@
 import lombok.Data;
 
 import javax.validation.constraints.NotBlank;
+import java.util.List;
 
 @Data
 @ApiModel
@@ -37,4 +38,6 @@
     @ApiModelProperty(value = "是否加急（1是0否null全部）", dataType = "Integer")
     private String isUrgent;
 
+    @ApiModelProperty(value = "导出ids", dataType = "List")
+    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListRequest.java
index 5201d7b..499760a 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListRequest.java
@@ -17,6 +17,9 @@
     @ApiModelProperty(value = "任务单编号", dataType = "String")
     private String orderNo;
 
+    @ApiModelProperty(value = "委托方id", dataType = "Long")
+    private Long customerId;
+
     @ApiModelProperty(value = "委托方名称", dataType = "String")
     private String customerName;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OrderSampleDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OrderSampleDTO.java
new file mode 100644
index 0000000..796edc0
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OrderSampleDTO.java
@@ -0,0 +1,19 @@
+package com.casic.missiles.dto.business.outsource;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/8/24 11:38
+ */
+@ApiModel
+@Data
+public class OrderSampleDTO {
+    @ApiModelProperty(value = "任务单id", dataType = "Long")
+    private Long orderId;
+    @ApiModelProperty(value = "受检设备id", dataType = "Long")
+    private Long sampleId;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceAssessApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceAssessApprovalListRequest.java
new file mode 100644
index 0000000..9a930c3
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceAssessApprovalListRequest.java
@@ -0,0 +1,30 @@
+package com.casic.missiles.dto.business.outsource;
+
+import com.casic.missiles.dto.BaseApprovalListRequest;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/8/24 11:01
+ */
+@ApiModel
+@Data
+public class OutsourceAssessApprovalListRequest extends BaseApprovalListRequest {
+    @ApiModelProperty(value = "评审表编号", dataType = "String")
+    private String projectNo;
+
+    @ApiModelProperty(value = "分包机构名称", dataType = "String")
+    private String outsourcerName;
+
+    @ApiModelProperty(value = "申请人", dataType = "String")
+    private String applicantName;
+
+    @ApiModelProperty(value = "申请时间开始", dataType = "String")
+    private String applicantTimeStart;
+
+    @ApiModelProperty(value = "申请时间结束", dataType = "String")
+    private String applicantTimeEnd;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceAssessSaveResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceAssessSaveResponse.java
new file mode 100644
index 0000000..8bf9aad
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceAssessSaveResponse.java
@@ -0,0 +1,20 @@
+package com.casic.missiles.dto.business.outsource;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/8/14 16:17
+ */
+@ApiModel
+@Data
+public class OutsourceAssessSaveResponse {
+    @ApiModelProperty(value = "主键id", dataType = "Long")
+    private Long id;
+
+    @ApiModelProperty(value = "编号", dataType = "String")
+    private String projectNo;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProtocolApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProtocolApprovalListRequest.java
new file mode 100644
index 0000000..0f32331
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProtocolApprovalListRequest.java
@@ -0,0 +1,30 @@
+package com.casic.missiles.dto.business.outsource;
+
+import com.casic.missiles.dto.BaseApprovalListRequest;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/8/24 15:01
+ */
+@ApiModel
+@Data
+public class OutsourceProtocolApprovalListRequest extends BaseApprovalListRequest {
+    @ApiModelProperty(value = "协议书编号", dataType = "String")
+    private String protocolNo;
+
+    @ApiModelProperty(value = "分包方名称", dataType = "String")
+    private String outsourcerName;
+
+    @ApiModelProperty(value = "申请人", dataType = "String")
+    private String applicantName;
+
+    @ApiModelProperty(value = "申请时间开始", dataType = "String")
+    private String applicantTimeStart;
+
+    @ApiModelProperty(value = "申请时间结束", dataType = "String")
+    private String applicantTimeEnd;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProtocolSaveResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProtocolSaveResponse.java
new file mode 100644
index 0000000..e324967
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProtocolSaveResponse.java
@@ -0,0 +1,20 @@
+package com.casic.missiles.dto.business.outsource;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/8/14 16:17
+ */
+@ApiModel
+@Data
+public class OutsourceProtocolSaveResponse {
+    @ApiModelProperty(value = "主键id", dataType = "Long")
+    private Long id;
+
+    @ApiModelProperty(value = "编号", dataType = "String")
+    private String protocolNo;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveApprovalListRequest.java
index f29f4e4..7047c28 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveApprovalListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveApprovalListRequest.java
@@ -5,8 +5,6 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import java.util.List;
-
 /**
  * @Description: 现场检测审批列表请求实体
  * @Author: wangpeng
@@ -30,7 +28,4 @@
     @ApiModelProperty(value = "申请时间结束", dataType = "String")
     private String applyTimeEnd;
 
-    @ApiModelProperty(value = "导出ids", dataType = "List")
-    private List<Long> ids;
-
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveDetailResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveDetailResponse.java
index 1f28752..394c934 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveDetailResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveDetailResponse.java
@@ -12,6 +12,18 @@
     @ApiModelProperty(value = "id，更新/删除使用参数", dataType = "Long")
     private Long id;
 
+    @ApiModelProperty(value = "实验室代码(字典code)", dataType = "String")
+    private String labCode;
+
+    @ApiModelProperty(value = "实验室代码(字典value)", dataType = "String")
+    private String labCodeName;
+
+    @ApiModelProperty(value = "组别代码(字典code)", dataType = "String")
+    private String groupCode;
+
+    @ApiModelProperty(value = "组别代码(字典value)", dataType = "String")
+    private String groupCodeName;
+
     @ApiModelProperty(value = "审批编号", dataType = "String")
     private String siteExecutiveNo;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/environment/LocationListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/environment/LocationListRequest.java
new file mode 100644
index 0000000..13d03c3
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/environment/LocationListRequest.java
@@ -0,0 +1,20 @@
+package com.casic.missiles.dto.resource.environment;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/6/8 13:56
+ */
+@ApiModel
+@Data
+public class LocationListRequest {
+    @ApiModelProperty(value = "地点编号", dataType = "String")
+    private String locationNo;
+
+    @ApiModelProperty(value = "地点名称", dataType = "String")
+    private String locationName;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/environment/LocationListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/environment/LocationListResponse.java
new file mode 100644
index 0000000..4c531af
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/environment/LocationListResponse.java
@@ -0,0 +1,78 @@
+package com.casic.missiles.dto.resource.environment;
+
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
+import com.baomidou.mybatisplus.annotation.TableField;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description: 地点列表响应实体
+ * @Author: wangpeng
+ * @Date: 2023/6/8 13:53
+ */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
+@ApiModel
+@Data
+public class LocationListResponse {
+    @ApiModelProperty(value = "主键id", dataType = "Long")
+    private Long id;
+
+    /**
+     * 地点编号
+     */
+    @ExcelProperty("地点编号")
+    @ApiModelProperty(value = "地点编号", dataType = "String")
+    private String locationNo;
+
+    /**
+     * 地点名称
+     */
+    @ExcelProperty("地点名称")
+    @ApiModelProperty(value = "地点名称", dataType = "String")
+    private String locationName;
+
+    /**
+     * 地点位置
+     */
+    @ExcelProperty("地点位置")
+    @ApiModelProperty(value = "地点位置", dataType = "String")
+    private String locationPosition;
+
+    /**
+     * 创建人id
+     */
+    @ApiModelProperty(value = "创建人id", dataType = "Long")
+    private Long createUserId;
+
+    /**
+     * 创建人
+     */
+    @ExcelProperty("创建人")
+    @ApiModelProperty(value = "创建人", dataType = "String")
+    @TableField("create_user")
+    private String createUser;
+
+    /**
+     * 创建时间
+     */
+    @ExcelProperty("创建时间")
+    @ApiModelProperty(value = "创建时间", dataType = "String")
+    private String createTime;
+
+    /**
+     * 更新时间
+     */
+    @ApiModelProperty(value = "更新时间", dataType = "String")
+    private String updateTime;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertRequest.java
index 9a7f6c6..c827915 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertRequest.java
@@ -4,6 +4,8 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * @Description:
  * @Author: wangpeng
@@ -16,4 +18,7 @@
     private String name;
     @ApiModelProperty(value = "部门名", dataType = "String")
     private String deptName;
+
+    @ApiModelProperty(value = "导出ids", dataType = "List")
+    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertResponse.java
index f78b159..8f2f79e 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertResponse.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.dto.resource.staff;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.casic.missiles.annotation.DictCodeField;
 import com.casic.missiles.constants.MeterDictCode;
 import io.swagger.annotations.ApiModel;
@@ -13,12 +20,18 @@
  * @Author: wangpeng
  * @Date: 2023/7/27 15:13
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @ApiModel
 @Data
 public class StaffCertResponse {
     /**
      * 人员编号
      */
+    @ExcelProperty(value = "人员编号",order = 0)
     @NotEmpty(message = "人员编号不能为空")
     @ApiModelProperty(value = "人员编号", dataType = "String")
     private String staffNo;
@@ -26,6 +39,7 @@
     /**
      * 姓名
      */
+    @ExcelProperty(value = "姓名",order = 1)
     @ApiModelProperty(value = "姓名", dataType = "String")
     private String staffName;
 
@@ -54,6 +68,7 @@
     /**
      * 部门名字
      */
+    @ExcelProperty(value = "工作部门",order = 2)
     @ApiModelProperty(value = "部门名字", dataType = "String")
     private String deptName;
 
@@ -66,6 +81,7 @@
     /**
      * 计量专业
      */
+    @ExcelProperty(value = "计量专业",order = 3)
     @ApiModelProperty(value = "计量专业", dataType = "String")
     private String major;
 
@@ -110,6 +126,7 @@
     /**
      * 证书号
      */
+    @ExcelProperty(value = "证号",order = 4)
     @ApiModelProperty(value = "证书号", dataType = "String")
     private String certNo;
 
@@ -122,12 +139,14 @@
     /**
      * 有效日期
      */
+    @ExcelProperty(value = "证书有效期",order = 6)
     @ApiModelProperty(value = "有效日期", dataType = "String")
     private String effectiveDate;
 
     /**
      * 发放日期
      */
+    @ExcelProperty(value = "发证日期",order = 5)
     @ApiModelProperty(value = "发放日期", dataType = "String")
     private String grantDate;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffListRequest.java
index 7c4afb3..0a1194a 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffListRequest.java
@@ -4,6 +4,8 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * @Description:
  * @Author: wangpeng
@@ -18,4 +20,7 @@
     private String deptName;
     @ApiModelProperty(value = "部门id", dataType = "Long")
     private Long deptId;
+
+    @ApiModelProperty(value = "导出ids", dataType = "List")
+    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/TrainListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/TrainListRequest.java
index f68597b..6321f8b 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/TrainListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/TrainListRequest.java
@@ -14,6 +14,8 @@
 public class TrainListRequest {
     @ApiModelProperty(value = "训练登记表编号", dataType = "String")
     private String trainNo;
+    @ApiModelProperty(value = "值班领导", dataType = "String")
+    private String dutyLeader;
     @ApiModelProperty(value = "创建开始时间", dataType = "String")
     private String createTimeStart;
     @ApiModelProperty(value = "创建结束时间", dataType = "String")
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/SignAddRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/SignAddRequest.java
index 117be34..d71055c 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/SignAddRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/SignAddRequest.java
@@ -43,13 +43,6 @@
     private Long signUserId;
 
     /**
-     * 签章或签名-字典code
-     */
-    @NotBlank(message = "类型不能为空")
-    @ApiModelProperty(value = "签名/签章-字典code", dataType = "String", required = true)
-    private String signType;
-
-    /**
      * minio存储文件名
      */
     @ApiModelProperty(value = "上传文件返回名称", dataType = "String")
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateAddRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateAddRequest.java
index aff1265..6316648 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateAddRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateAddRequest.java
@@ -17,30 +17,28 @@
 @Data
 public class TemplateAddRequest extends BaseSystemRequest {
     /**
-     * 原始记录模板/证书报告模板名称
+     * 模板名称
      */
     @ApiModelProperty(value = "名称", dataType = "String", required = true)
     @NotBlank(message = "名称不能为空")
     private String templateName;
 
     /**
-     * 原始记录模板/证书报告模板描述
+     * 模板描述
      */
     @ApiModelProperty(value = "描述", dataType = "String")
     private String templateDesc;
 
     /**
-     * 原始记录模板/证书报告模板创建人
+     * 创建人
      */
     @ApiModelProperty(value = "创建人", dataType = "String", required = true)
     @NotBlank(message = "创建人不能为空")
     private String templateCreator;
 
-    /**
-     * 原始记录模板/证书报告模板-字典code
-     */
-    @NotBlank(message = "类型不能为空")
-    @ApiModelProperty(value = "原始记录模板/证书报告模板-字典code", dataType = "String", required = true)
+
+    @NotBlank(message = "模板类型不能为空")
+    @ApiModelProperty(value = "模板类型(字典code)", dataType = "String", required = true)
     private String templateType;
 
     /**
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateListRequest.java
index eec5a1e..6d17bbe 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateListRequest.java
@@ -1,11 +1,12 @@
 package com.casic.missiles.dto.system;
 
+import com.casic.missiles.annotation.DictCodeField;
+import com.casic.missiles.constants.MeterDictCode;
 import com.casic.missiles.dto.BaseSystemRequest;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import javax.validation.constraints.NotBlank;
 import java.util.List;
 
 /**
@@ -19,8 +20,8 @@
     /**
      * 类型
      */
-//    @ApiModelProperty(value = "类型-字典code", dataType = "String", required = true)
-    @NotBlank(message = "类型不能为空")
+    @DictCodeField(message = "模板类型不合法", cacheName = MeterDictCode.TEMPLATE_TYPE)
+    @ApiModelProperty(value = "模板类型(字典code)", dataType = "String")
     private String templateType;
 
     /**
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificateChangeApply.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificateChangeApply.java
index 9216308..36923fd 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificateChangeApply.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificateChangeApply.java
@@ -1,11 +1,19 @@
 package com.casic.missiles.model.business;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 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 com.casic.missiles.dto.BaseRequest;
+import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -20,6 +28,12 @@
  * @author wangpeng
  * @since 2023-08-15
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
+@ApiModel
 @Data
 @TableName("biz_business_certificate_change_apply")
 public class BizBusinessCertificateChangeApply extends BaseRequest implements Serializable {
@@ -33,6 +47,7 @@
     /**
      * 申请单编号
      */
+    @ExcelProperty(value = "申请单编号", order = 1)
     @ApiModelProperty(value = "申请单编号", dataType = "String")
     @TableField("change_apply_no")
     private String changeApplyNo;
@@ -40,6 +55,7 @@
     /**
      * 申请单名字
      */
+    @ExcelProperty(value = "申请单名称", order = 2)
     @ApiModelProperty(value = "申请单名字", dataType = "String")
     @TableField("change_apply_name")
     private String changeApplyName;
@@ -54,6 +70,7 @@
     /**
      * 更换证书编号
      */
+    @ExcelProperty(value = "更换证书编号", order = 3)
     @ApiModelProperty(value = "更换证书编号", dataType = "String")
     @TableField("change_report_no")
     private String changeReportNo;
@@ -61,7 +78,8 @@
     /**
      * 更换证书名字
      */
-    @ApiModelProperty(value = "更换证书名字", dataType = "String")
+    @ExcelProperty(value = "更换证书/报告名称", order = 4)
+    @ApiModelProperty(value = "更换证书/报告名称", dataType = "String")
     @TableField("change_report_name")
     private String changeReportName;
 
@@ -73,6 +91,7 @@
     @TableField("change_type")
     private String changeType;
 
+    @ExcelProperty(value = "变更类型", order = 5)
     @ApiModelProperty(value = "变更类型(字典value)", dataType = "String")
     @TableField(exist = false)
     private String changeTypeName;
@@ -142,13 +161,15 @@
     /**
      * 创建用户名字
      */
-    @ApiModelProperty(value = "创建用户名字", dataType = "String")
+    @ExcelProperty(value = "创建人", order = 6)
+    @ApiModelProperty(value = "创建人名字", dataType = "String")
     @TableField("create_user_name")
     private String createUserName;
 
     /**
      * 创建时间
      */
+    @ExcelProperty(value = "创建时间", order = 7)
     @ApiModelProperty(value = "创建时间", dataType = "String")
     @TableField("create_time")
     private String createTime;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificateReport.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificateReport.java
index f01db9e..db06018 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificateReport.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificateReport.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.model.business;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -22,6 +29,11 @@
  * @author wangpeng
  * @since 2023-08-14
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @ApiModel
 @Data
 @TableName("biz_business_certificate_report")
@@ -36,6 +48,7 @@
     /**
      * 证书报告编号
      */
+    @ExcelProperty(value = "证书报告编号", order = 1)
     @ApiModelProperty(value = "证书报告编号", dataType = "String")
     @TableField("certificate_report_no")
     private String certificateReportNo;
@@ -43,6 +56,7 @@
     /**
      * 证书报告名称
      */
+    @ExcelProperty(value = "证书报告名称", order = 2)
     @ApiModelProperty(value = "证书报告名称", dataType = "String")
     @TableField("certificate_report_name")
     private String certificateReportName;
@@ -62,6 +76,7 @@
     @TableField("measure_category")
     private String measureCategory;
 
+    @ExcelProperty(value = "检校类别", order = 6)
     @ApiModelProperty(value = "检校类别(字典value)", dataType = "String")
     @TableField(exist = false)
     private String measureCategoryName;
@@ -69,6 +84,7 @@
     /**
      * 检校时间
      */
+    @ExcelProperty(value = "检校时间", order = 8)
     @ApiModelProperty(value = "检校时间", dataType = "String")
     @TableField("calibration_time")
     private String calibrationTime;
@@ -267,18 +283,22 @@
     @TableField(exist = false)
     private Integer decisionItem;
 
-    @ApiModelProperty(value = "设备样品编号（列表返回参数）", dataType = "String")
+    @ExcelProperty(value = "被检设备统一编号", order = 3)
+    @ApiModelProperty(value = "被检设备统一编号（列表返回参数）", dataType = "String")
     @TableField(exist = false)
     private String sampleNo;
 
-    @ApiModelProperty(value = "设备样品名称（列表返回参数）", dataType = "String")
+    @ExcelProperty(value = "被检设备名称", order = 4)
+    @ApiModelProperty(value = "被检设备名称（列表返回参数）", dataType = "String")
     @TableField(exist = false)
     private String sampleName;
 
-    @ApiModelProperty(value = "设备样品规格型号（列表返回参数）", dataType = "String")
+    @ExcelProperty(value = "规格型号", order = 5)
+    @ApiModelProperty(value = "规格型号（列表返回参数）", dataType = "String")
     @TableField(exist = false)
     private String sampleModel;
 
+    @ExcelProperty(value = "检定员", order = 7)
     @ApiModelProperty(value = "检定员名字（列表返回参数）", dataType = "String")
     @TableField(exist = false)
     private String staffName;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessIdentifyInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessIdentifyInfo.java
index 46bfba5..f1a9bec 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessIdentifyInfo.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessIdentifyInfo.java
@@ -1,10 +1,15 @@
 package com.casic.missiles.model.business;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 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;
 
@@ -20,6 +25,11 @@
  * @author wangpeng
  * @since 2023-08-15
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @Data
 @TableName("biz_business_identify_info")
 public class BizBusinessIdentifyInfo implements Serializable {
@@ -33,6 +43,7 @@
     /**
      * 记录编号
      */
+    @ExcelProperty(value = "记录编号", order = 1)
     @ApiModelProperty(value = "记录编号", dataType = "String")
     @TableField("record_no")
     private String recordNo;
@@ -41,20 +52,15 @@
      * 标志类型(字典code)
      */
     @NotEmpty(message = "标志类型不能为空")
-    @ApiModelProperty(value = "标志类型(字典code)", dataType = "String")
-    @DictCodeField(message = "标志类型不合法", cacheName = MeterDictCode.IDENTIFY_PRINT_TYPE)
+    @ApiModelProperty(value = "标志类型(直接存计量标识/使用状态/校准状态的字典value)", dataType = "String")
     @TableField("identify_type")
     private String identifyType;
 
-    @ApiModelProperty(value = "标志类型(字典value)", dataType = "String")
-    @TableField(exist = false)
-    private String identifyTypeName;
-
     /**
      * 设备id(可以是受检设备/设备台账)
      */
     @NotNull(message = "设备id不能为空")
-    @ApiModelProperty(value = "设备id(可以是受检设备/设备台账)", dataType = "String")
+    @ApiModelProperty(value = "设备id(可以是受检设备/设备台账)", dataType = "Long")
     @TableField("device_id")
     private Long deviceId;
 
@@ -66,29 +72,32 @@
     @TableField("device_type")
     private String deviceType;
 
+    @ExcelProperty(value = "统一编号", order = 3)
     @NotEmpty(message = "设备编号不能为空")
-    @ApiModelProperty(value = "设备编号", dataType = "String")
+    @ApiModelProperty(value = "统一编号", dataType = "String")
     @TableField("device_no")
     private String deviceNo;
 
     /**
      * 设备名字
      */
-    @NotEmpty(message = "设备名字不能为空")
-    @ApiModelProperty(value = "设备名字", dataType = "String")
+    @ExcelProperty(value = "设备名称", order = 4)
+    @NotEmpty(message = "设备名称不能为空")
+    @ApiModelProperty(value = "设备名称", dataType = "String")
     @TableField("device_name")
     private String deviceName;
 
     /**
      * 检定员id
      */
-    @ApiModelProperty(value = "检定员id", dataType = "String")
+    @ApiModelProperty(value = "检定员id", dataType = "Long")
     @TableField("measure_person_id")
     private Long measurePersonId;
 
     /**
      * 检定员名字
      */
+    @ExcelProperty(value = "检定员", order = 5)
     @ApiModelProperty(value = "检定员名字", dataType = "String")
     @TableField("measure_person")
     private String measurePerson;
@@ -103,7 +112,8 @@
     /**
      * 更新时间
      */
-    @ApiModelProperty(value = "更新时间", dataType = "String")
+    @ExcelProperty(value = "打印时间", order = 6)
+    @ApiModelProperty(value = "打印时间", dataType = "String")
     @TableField("update_time")
     private String updateTime;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceAssess.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceAssess.java
index 659d9ca..6720b90 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceAssess.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceAssess.java
@@ -1,11 +1,26 @@
 package com.casic.missiles.model.business;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 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 com.casic.missiles.dto.BaseRequest;
+import com.casic.missiles.dto.business.outsource.OrderSampleDTO;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import javax.validation.constraints.NotEmpty;
 import java.io.Serializable;
+import java.util.List;
 
 /**
  * <p>
@@ -15,146 +30,231 @@
  * @author wangpeng
  * @since 2023-08-16
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
+@ApiModel
 @Data
 @TableName("biz_business_outsource_assess")
-public class BizBusinessOutsourceAssess implements Serializable {
+public class BizBusinessOutsourceAssess extends BaseRequest implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
+    @ApiModelProperty(value = "id，更新/删除使用参数", dataType = "Long")
     @TableId("id")
     private Long id;
 
     /**
      * 评审表编号
      */
+    @ExcelProperty(value = "评审表编号", order = 1)
+    @ApiModelProperty(value = "评审表编号(后台生成)", dataType = "String")
     @TableField("project_no")
     private String projectNo;
 
     /**
      * 评审表名称
      */
+    @ExcelProperty(value = "评审表名称", order = 2)
+    @ApiModelProperty(value = "评审表名称", dataType = "String")
     @TableField("project_name")
     private String projectName;
 
+    @NotEmpty(message = "实验室代码不能为空")
+    @DictCodeField(message = "实验室代码描述不合法", cacheName = MeterDictCode.LAB_CODE)
+    @ApiModelProperty(value = "实验室代码(字典code)", dataType = "String")
+    @TableField("lab_code")
+    private String labCode;
+
+    @ApiModelProperty(value = "实验室代码(字典value)", dataType = "String")
+    @TableField(exist = false)
+    private String labCodeName;
+
+    /**
+     * 组别代码
+     */
+    @NotEmpty(message = "组别代码不能为空")
+    @DictCodeField(message = "组别代码描述不合法", cacheName = MeterDictCode.GROUP_CODE)
+    @ApiModelProperty(value = "组别代码(字典code)", dataType = "String")
+    @TableField("group_code")
+    private String groupCode;
+
+    @ApiModelProperty(value = "组别代码(字典value)", dataType = "String")
+    @TableField(exist = false)
+    private String groupCodeName;
+
     /**
      * 申请人id
      */
+    @ApiModelProperty(value = "申请人id", dataType = "String")
     @TableField("applicant_id")
     private Long applicantId;
 
     /**
      * 申请人名字
      */
+    @ExcelProperty(value = "申请人", order = 5)
+    @ApiModelProperty(value = "申请人", dataType = "String")
     @TableField("applicant_name")
     private String applicantName;
 
     /**
      * 申请时间
      */
+    @ExcelProperty(value = "申请时间", order = 6)
+    @ApiModelProperty(value = "申请时间", dataType = "String")
     @TableField("applicant_time")
     private String applicantTime;
 
     /**
      * 附件(minio存储文件名)
      */
+    @ApiModelProperty(value = "附件(minio存储文件名)", dataType = "String")
     @TableField("minio_file_name")
     private String minioFileName;
 
     /**
      * 备注
      */
+    @ApiModelProperty(value = "备注", dataType = "String")
     @TableField("remark")
     private String remark;
 
     /**
      * 创建人id
      */
+    @ApiModelProperty(value = "创建人id", dataType = "String")
     @TableField("create_user_id")
     private Long createUserId;
 
     /**
      * 创建人名字
      */
+    @ApiModelProperty(value = "创建人名字", dataType = "String")
     @TableField("create_user_name")
     private String createUserName;
 
     /**
      * 分包方id
      */
+    @ApiModelProperty(value = "评审表编号", dataType = "String")
     @TableField("outsourcer_id")
     private Long outsourcerId;
 
     /**
      * 预计开始时间
      */
+    @ApiModelProperty(value = "预计开始时间", dataType = "String")
     @TableField("pre_start_time")
     private String preStartTime;
 
     /**
      * 预计结束时间
      */
+    @ApiModelProperty(value = "预计结束时间", dataType = "String")
     @TableField("pre_end_time")
     private String preEndTime;
 
     /**
      * 分包原因-字典
      */
+    @ApiModelProperty(value = "分包原因(字典code)", dataType = "String")
+    @DictCodeField(message = "分包原因描述不合法", cacheName = MeterDictCode.OUTSOURCE_REASON)
     @TableField("outsource_reason")
     private String outsourceReason;
 
+    @ApiModelProperty(value = "分包原因(字典value)", dataType = "String")
+    @TableField(exist = false)
+    private String outsourceReasonName;
+
     /**
      * 预计费用
      */
+    @ApiModelProperty(value = "预计费用", dataType = "String")
     @TableField("pre_cost")
     private String preCost;
 
     /**
      * 审批状态
      */
+    @ApiModelProperty(value = "审批状态", dataType = "String")
+    @DictCodeField(message = "审批状态描述不合法", cacheName = MeterDictCode.APPROVAL_STATUS)
     @TableField("approval_status")
     private String approvalStatus;
 
     /**
      * 流程实例id
      */
+    @ApiModelProperty(value = "流程实例id", dataType = "String")
     @TableField("process_id")
     private String processId;
 
     /**
      * 实验室认可情况
      */
+    @ApiModelProperty(value = "实验室认可情况", dataType = "String")
     @TableField("approve_situation")
     private String approveSituation;
 
     /**
      * 溯源性
      */
+    @ApiModelProperty(value = "溯源性", dataType = "String")
     @TableField("traceability")
     private String traceability;
 
     /**
      * 测试方法
      */
+    @ApiModelProperty(value = "测试方法", dataType = "String")
     @TableField("test_method")
     private String testMethod;
 
     /**
      * 技术能力
      */
+    @ApiModelProperty(value = "技术能力", dataType = "String")
     @TableField("technique_ability")
     private String techniqueAbility;
 
     /**
      * 创建时间
      */
+    @ApiModelProperty(hidden = true)
     @TableField("create_time")
     private String createTime;
 
     /**
      * 更新时间
      */
+    @ApiModelProperty(hidden = true)
     @TableField("update_time")
     private String updateTime;
 
+    @ApiModelProperty(value = "审批状态类型-字典value", dataType = "String")
+    @TableField(exist = false)
+    private String approvalStatusName;
 
+    @ApiModelProperty(value = "任务id（同意、驳回等操作使用）", dataType = "String")
+    @TableField(exist = false)
+    private String taskId;
+
+    @ApiModelProperty(value = "可选决策项（1同意驳回拒绝 2同意驳回 3同意拒绝，用于待审批列表同意/驳回/拒绝按钮展示）", dataType = "Integer")
+    @TableField(exist = false)
+    private Integer decisionItem;
+
+    @NotEmpty(message = "受检设备信息不能为空")
+    @ApiModelProperty(value = "受检设备id列表（新建使用参数）", dataType = "List")
+    @TableField(exist = false)
+    private List<OrderSampleDTO> orderSampleList;
+
+    @ExcelProperty(value = "分包机构名称", order = 3)
+    @ApiModelProperty(value = "分包机构名称（列表返回参数）", dataType = "String")
+    private String outsourcerName;
+
+    @ExcelProperty(value = "机构负责人", order = 4)
+    @ApiModelProperty(value = "机构负责人（列表返回参数）", dataType = "String")
+    private String director;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceProtocol.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceProtocol.java
new file mode 100644
index 0000000..38df697
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceProtocol.java
@@ -0,0 +1,225 @@
+package com.casic.missiles.model.business;
+
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
+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 com.casic.missiles.dto.BaseRequest;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotEmpty;
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 计量检定业务-分包管理-测试、校准或检定工作分包协议书
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-08-24
+ */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
+@Data
+@TableName("biz_business_outsource_protocol")
+public class BizBusinessOutsourceProtocol extends BaseRequest implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "id，更新/删除使用参数", dataType = "Long")
+    @TableId("id")
+    private Long id;
+
+    /**
+     * 协议书编号
+     */
+    @ExcelProperty(value = "协议书编号", order = 1)
+    @ApiModelProperty(value = "协议书编号(后台生成)", dataType = "String")
+    @TableField("protocol_no")
+    private String protocolNo;
+
+    /**
+     * 协议书名称
+     */
+    @ExcelProperty(value = "协议书名称", order = 2)
+    @ApiModelProperty(value = "协议书名称", dataType = "String")
+    @TableField("project_name")
+    private String projectName;
+
+    @NotEmpty(message = "实验室代码不能为空")
+    @DictCodeField(message = "实验室代码描述不合法", cacheName = MeterDictCode.LAB_CODE)
+    @ApiModelProperty(value = "实验室代码(字典code)", dataType = "String")
+    @TableField("lab_code")
+    private String labCode;
+
+    @ApiModelProperty(value = "实验室代码(字典value)", dataType = "String")
+    @TableField(exist = false)
+    private String labCodeName;
+
+    @NotEmpty(message = "组别代码不能为空")
+    @DictCodeField(message = "组别代码描述不合法", cacheName = MeterDictCode.GROUP_CODE)
+    @ApiModelProperty(value = "组别代码(字典code)", dataType = "String")
+    @TableField("group_code")
+    private String groupCode;
+
+    @ApiModelProperty(value = "组别代码(字典value)", dataType = "String")
+    @TableField(exist = false)
+    private String groupCodeName;
+
+    /**
+     * 分包方id
+     */
+    @ApiModelProperty(value = "分包方id", dataType = "Long")
+    @TableField("outsourcer_id")
+    private Long outsourcerId;
+
+    /**
+     * 其他
+     */
+    @ApiModelProperty(value = "其他", dataType = "String")
+    @TableField("remark")
+    private String remark;
+
+    /**
+     * 分包方编号
+     */
+    @ApiModelProperty(value = "分包方编号(新建不用传)", dataType = "String")
+    @TableField("outsource_no")
+    private String outsourceNo;
+
+    /**
+     * 分包方名称
+     */
+    @ExcelProperty(value = "分包方名称", order = 3)
+    @ApiModelProperty(value = "分包方名称(新建不用传)", dataType = "String")
+    @TableField("outsource_name")
+    private String outsourceName;
+
+    /**
+     * 联系人
+     */
+    @ExcelProperty(value = "联系人", order = 4)
+    @ApiModelProperty(value = "联系人", dataType = "String")
+    @TableField("contacts")
+    private String contacts;
+
+    /**
+     * 电话
+     */
+    @ApiModelProperty(value = "电话", dataType = "String")
+    @TableField("mobile")
+    private String mobile;
+
+    /**
+     * 地址
+     */
+    @ApiModelProperty(value = "地址", dataType = "String")
+    @TableField("address")
+    private String address;
+
+    /**
+     * 要求完成日期
+     */
+    @ApiModelProperty(value = "要求完成日期", dataType = "String")
+    @TableField("require_date")
+    private String requireDate;
+
+    /**
+     * 分包费用(元)
+     */
+    @ApiModelProperty(value = "分包费用(元)", dataType = "String")
+    @TableField("outsource_cost")
+    private Double outsourceCost;
+
+    /**
+     * 分包方负责人
+     */
+    @ApiModelProperty(value = "分包方负责人", dataType = "String")
+    @TableField("director")
+    private String director;
+
+    /**
+     * 分包项目
+     */
+    @ApiModelProperty(value = "分包项目", dataType = "String")
+    @TableField("item")
+    private String item;
+
+    /**
+     * 分包要求
+     */
+    @ApiModelProperty(value = "分包要求", dataType = "String")
+    @TableField("requires")
+    private String requires;
+
+    /**
+     * 创建人id
+     */
+    @ApiModelProperty(hidden = true)
+    @TableField("create_user_id")
+    private Long createUserId;
+
+    /**
+     * 创建人名字
+     */
+    @ExcelProperty(value = "申请人", order = 5)
+    @ApiModelProperty(value = "申请人", dataType = "String")
+    @TableField("create_user_name")
+    private String createUserName;
+
+    /**
+     * 审批状态
+     */
+    @ApiModelProperty(value = "审批状态", dataType = "String")
+    @DictCodeField(message = "审批状态描述不合法", cacheName = MeterDictCode.APPROVAL_STATUS)
+    @TableField("approval_status")
+    private String approvalStatus;
+
+    /**
+     * 流程实例id
+     */
+    @ApiModelProperty(value = "流程实例id", dataType = "String")
+    @TableField("process_id")
+    private String processId;
+
+    /**
+     * 创建时间
+     */
+    @ExcelProperty(value = "申请时间", order = 6)
+    @ApiModelProperty(value = "申请时间", dataType = "String")
+    @TableField("create_time")
+    private String createTime;
+
+    /**
+     * 更新时间
+     */
+    @ApiModelProperty(hidden = true)
+    @TableField("update_time")
+    private String updateTime;
+
+    @ApiModelProperty(value = "审批状态类型-字典value", dataType = "String")
+    @TableField(exist = false)
+    private String approvalStatusName;
+
+    @ApiModelProperty(value = "任务id（同意、驳回等操作使用）", dataType = "String")
+    @TableField(exist = false)
+    private String taskId;
+
+    @ApiModelProperty(value = "可选决策项（1同意驳回拒绝 2同意驳回 3同意拒绝，用于待审批列表同意/驳回/拒绝按钮展示）", dataType = "Integer")
+    @TableField(exist = false)
+    private Integer decisionItem;
+
+
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourcerInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourcerInfo.java
index ec4e997..f9aa69e 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourcerInfo.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourcerInfo.java
@@ -17,6 +17,7 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import javax.validation.constraints.NotEmpty;
 import java.io.Serializable;
 
 /**
@@ -59,6 +60,29 @@
     @TableField("outsourcer_name")
     private String outsourcerName;
 
+    @NotEmpty(message = "实验室代码不能为空")
+    @DictCodeField(message = "实验室代码描述不合法", cacheName = MeterDictCode.LAB_CODE)
+    @ApiModelProperty(value = "实验室代码(字典code)", dataType = "String")
+    @TableField("lab_code")
+    private String labCode;
+
+    @ApiModelProperty(value = "实验室代码(字典value)", dataType = "String")
+    @TableField(exist = false)
+    private String labCodeName;
+
+    /**
+     * 组别代码
+     */
+    @NotEmpty(message = "组别代码不能为空")
+    @DictCodeField(message = "组别代码描述不合法", cacheName = MeterDictCode.GROUP_CODE)
+    @ApiModelProperty(value = "组别代码(字典code)", dataType = "String")
+    @TableField("group_code")
+    private String groupCode;
+
+    @ApiModelProperty(value = "组别代码(字典value)", dataType = "String")
+    @TableField(exist = false)
+    private String groupCodeName;
+
     /**
      * 单位简称
      */
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardInfo.java
index c48eed7..dffdfdd 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardInfo.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardInfo.java
@@ -5,6 +5,7 @@
 import com.baomidou.mybatisplus.annotation.TableName;
 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;
 
@@ -18,6 +19,7 @@
  * @author wangpeng
  * @since 2023-08-04
  */
+@ApiModel
 @Data
 @TableName("biz_equipment_standard_info")
 public class BizEquipmentStandardInfo implements Serializable {
@@ -119,7 +121,7 @@
      * 管理状态(字典code)
      */
     @ApiModelProperty(value = "管理状态(字典code)", dataType = "String")
-    @DictCodeField(message = "管理状态不合法", cacheName = MeterDictCode.MANAGER_STATE)
+    @DictCodeField(message = "管理状态不合法", cacheName = MeterDictCode.STANDARD_MANAGER_STATE)
     @TableField("manage_status")
     private String manageStatus;
 
@@ -151,7 +153,7 @@
     /**
      * 温度(℃)
      */
-    @ApiModelProperty(value = "使用状态(字典code)", dataType = "String")
+    @ApiModelProperty(value = "温度(℃)", dataType = "String")
     @TableField("temperature")
     private Double temperature;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardInfoApproval.java b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardInfoApproval.java
index dbd86ab..9f58d83 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardInfoApproval.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardInfoApproval.java
@@ -150,7 +150,7 @@
      * 管理状态(字典code)
      */
     @ApiModelProperty(value = "管理状态(字典code)", dataType = "String")
-    @DictCodeField(message = "管理状态不合法", cacheName = MeterDictCode.MANAGER_STATE)
+    @DictCodeField(message = "管理状态不合法", cacheName = MeterDictCode.STANDARD_MANAGER_STATE)
     @TableField("manage_status")
     private String manageStatus;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardTechnologyRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardTechnologyRelation.java
index 0e612bd..751f26b 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardTechnologyRelation.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardTechnologyRelation.java
@@ -3,6 +3,7 @@
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -16,6 +17,7 @@
  * @author wangpeng
  * @since 2023-08-04
  */
+@ApiModel
 @Data
 @TableName("biz_equipment_standard_technology_relation")
 public class BizEquipmentStandardTechnologyRelation implements Serializable {
@@ -33,6 +35,10 @@
     @TableField("technology_file_id")
     private Long technologyFileId;
 
+    @ApiModelProperty(value = "依据的技术文件编号", dataType = "String")
+    @TableField("technology_file_no")
+    private String technologyFileNo;
+
     /**
      * 依据的技术文件名称(技术文件中现行测试校准检定方法表文件名字段)
      */
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerInfo.java
index d6e8bed..65cd6bc 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerInfo.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerInfo.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.model.resource;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -21,6 +28,11 @@
  * @author wangpeng
  * @since 2023-08-08
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @ApiModel
 @Data
 @TableName("biz_resource_customer_info")
@@ -35,6 +47,7 @@
     /**
      * 委托方编号
      */
+    @ExcelProperty(value = "委托方编号", order = 1)
     @ApiModelProperty(value = "委托方编号", dataType = "String")
     @TableField("customer_no")
     private String customerNo;
@@ -42,6 +55,7 @@
     /**
      * 委托方名称
      */
+    @ExcelProperty(value = "委托方名称", order = 2)
     @ApiModelProperty(value = "委托方名称(新建时为下拉选择一个受检单位组织的名字，传deptId字段，后端获取名称)", dataType = "String")
     @TableField("customer_name")
     private String customerName;
@@ -63,6 +77,7 @@
     /**
      * 联系人
      */
+    @ExcelProperty(value = "联系人", order = 3)
     @ApiModelProperty(value = "联系人", dataType = "String")
     @TableField("contacts")
     private String contacts;
@@ -70,6 +85,7 @@
     /**
      * 座机电话
      */
+    @ExcelProperty(value = "座机电话", order = 4)
     @ApiModelProperty(value = "座机电话", dataType = "String")
     @TableField("mobile")
     private String mobile;
@@ -77,6 +93,7 @@
     /**
      * 手机号码
      */
+    @ExcelProperty(value = "手机号码", order = 5)
     @ApiModelProperty(value = "手机号码", dataType = "String")
     @TableField("phone")
     private String phone;
@@ -91,6 +108,7 @@
     /**
      * 地址
      */
+    @ExcelProperty(value = "地址", order = 6)
     @ApiModelProperty(value = "地址", dataType = "String")
     @TableField("address")
     private String address;
@@ -141,6 +159,7 @@
     /**
      * 创建时间
      */
+    @ExcelProperty(value = "创建时间", order = 7)
     @ApiModelProperty(value = "创建时间", dataType = "String")
     @TableField("create_time")
     private String createTime;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerSuggestForm.java b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerSuggestForm.java
index 7201bbd..701bf8b 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerSuggestForm.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerSuggestForm.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.model.resource;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -22,6 +29,11 @@
  * @author wangpeng
  * @since 2023-08-08
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @ApiModel
 @Data
 @TableName("biz_resource_customer_suggest_form")
@@ -44,7 +56,8 @@
     /**
      * 委托方名称
      */
-    @ApiModelProperty(value = "委托方名称", dataType = "String")
+    @ExcelProperty(value = "意见反馈单位", order = 2)
+    @ApiModelProperty(value = "意见反馈单位", dataType = "String")
     @TableField("customer_name")
     private String customerName;
 
@@ -59,7 +72,8 @@
     /**
      * 委托方意见反馈部门名称
      */
-    @ApiModelProperty(value = "委托方意见反馈部门名称", dataType = "String")
+    @ExcelProperty(value = "委托方意见反馈部门", order = 3)
+    @ApiModelProperty(value = "委托方意见反馈部门", dataType = "String")
     @TableField("customer_dept_name")
     private String customerDeptName;
 
@@ -73,6 +87,7 @@
     /**
      * 表单编号
      */
+    @ExcelProperty(value = "表单编号", order = 1)
     @ApiModelProperty(value = "表单编号", dataType = "String")
     @TableField("form_no")
     private String formNo;
@@ -111,6 +126,7 @@
     /**
      * 创建人名字
      */
+    @ExcelProperty(value = "创建人", order = 4)
     @ApiModelProperty(value = "创建人名字", dataType = "String")
     @TableField("create_user_name")
     private String createUserName;
@@ -147,6 +163,7 @@
     /**
      * 创建时间
      */
+    @ExcelProperty(value = "创建时间", order = 5)
     @ApiModelProperty(value = "创建时间", dataType = "String")
     @TableField("create_time")
     private String createTime;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSealInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSealInfo.java
index cbf05d7..9bf389d 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSealInfo.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSealInfo.java
@@ -106,6 +106,10 @@
     @TableField("minio_file_name")
     private String minioFileName;
 
+    @ApiModelProperty(value = "minio存储文件url", dataType = "String")
+    @TableField(exist = false)
+    private String minioFileUrl;
+
     @ApiModelProperty(value = "创建时间", dataType = "String")
     @TableField("create_time")
     private String createTime;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSealUseNote.java b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSealUseNote.java
index 3f2d9e8..3ce16a8 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSealUseNote.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSealUseNote.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.model.resource;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -20,6 +27,11 @@
  * @author wangpeng
  * @since 2023-07-28
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @ApiModel
 @Data
 @TableName("biz_resource_seal_use_note")
@@ -34,6 +46,7 @@
     /**
      * 登记表编号
      */
+    @ExcelProperty(value = "申请单编号", order = 1)
     @ApiModelProperty(value = "登记表编号(自动生成)", dataType = "String")
     @TableField("note_form_no")
     private String noteFormNo;
@@ -55,6 +68,7 @@
     /**
      * 申请部门
      */
+    @ExcelProperty(value = "申请部门", order = 5)
     @ApiModelProperty(value = "申请部门", dataType = "String")
     @TableField("apply_dept_name")
     private String applyDeptName;
@@ -69,6 +83,7 @@
     /**
      * 申请人
      */
+    @ExcelProperty(value = "申请人", order = 6)
     @ApiModelProperty(value = "申请人", dataType = "String")
     @TableField("apply_user_name")
     private String applyUserName;
@@ -76,6 +91,7 @@
     /**
      * 申请时间
      */
+    @ExcelProperty(value = "申请时间", order = 7)
     @ApiModelProperty(value = "申请时间(新增自动获取当前时间)", dataType = "String")
     @TableField("apply_time")
     private String applyTime;
@@ -130,6 +146,26 @@
     @TableField("update_time")
     private String updateTime;
 
+    @ExcelProperty(value = "印章名称", order = 2)
+    @ApiModelProperty(value = "印章名称(列表返回参数)", dataType = "String")
+    @TableField(exist = false)
+    private String sealName;
+
+    @DictCodeField(message = "印章类型描述不合法", cacheName = MeterDictCode.SEAL_TYPE)
+    @ApiModelProperty(hidden = true)
+    @TableField(exist = false)
+    private String sealType;
+
+    @ExcelProperty(value = "印章类型", order = 3)
+    @ApiModelProperty(value = "印章类型(列表返回参数)", dataType = "String")
+    @TableField(exist = false)
+    private String sealTypeName;
+
+    @ExcelProperty(value = "批准人", order = 4)
+    @ApiModelProperty(value = "批准人(列表返回参数)", dataType = "String")
+    @TableField(exist = false)
+    private String approverName;
+
     @ApiModelProperty(value = "审批状态类型-字典value", dataType = "String")
     @TableField(exist = false)
     private String approvalStatusName;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceStaffInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceStaffInfo.java
index 5ef995b..41563a1 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceStaffInfo.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceStaffInfo.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.model.resource;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -20,6 +27,11 @@
  * @author wangpeng
  * @since 2023-07-25
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @ApiModel
 @Data
 @TableName("biz_resource_staff_info")
@@ -38,6 +50,7 @@
     /**
      * 人员编号
      */
+    @ExcelProperty(value = "人员编号",order = 0)
     @NotEmpty(message = "人员编号不能为空")
     @ApiModelProperty(value = "人员编号", dataType = "String")
     @TableField("staff_no")
@@ -46,6 +59,7 @@
     /**
      * 姓名
      */
+    @ExcelProperty(value = "姓名",order = 1)
     @ApiModelProperty(value = "姓名", dataType = "String")
     @TableField("staff_name")
     private String staffName;
@@ -152,13 +166,15 @@
     /**
      * 部门名字
      */
-    @ApiModelProperty(value = "部门名字", dataType = "String")
+    @ExcelProperty(value = "工作部门",order = 4)
+    @ApiModelProperty(value = "工作部门", dataType = "String")
     @TableField("dept_name")
     private String deptName;
 
     /**
      * 岗位
      */
+    @ExcelProperty(value = "岗位",order = 2)
     @ApiModelProperty(value = "岗位", dataType = "String")
     @TableField("station")
     private String station;
@@ -166,6 +182,7 @@
     /**
      * 计量专业
      */
+    @ExcelProperty(value = "计量专业",order = 5)
     @ApiModelProperty(value = "计量专业", dataType = "String")
     @TableField("major")
     private String major;
@@ -173,6 +190,7 @@
     /**
      * 证号
      */
+    @ExcelProperty(value = "证号",order = 3)
     @ApiModelProperty(value = "证号", dataType = "String")
     @TableField("certificate_number")
     private String certificateNumber;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSupplierInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSupplierInfo.java
index eb5ef01..a1e2697 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSupplierInfo.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSupplierInfo.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.model.resource;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -20,6 +27,11 @@
  * @author wangpeng
  * @since 2023-07-27
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @ApiModel
 @Data
 @TableName("biz_resource_supplier_info")
@@ -34,6 +46,7 @@
     /**
      * 供方编号
      */
+    @ExcelProperty(value = "供方编号", order = 1)
     @ApiModelProperty(value = "供方编号(自动生成)", dataType = "String")
     @TableField("supplier_no")
     private String supplierNo;
@@ -41,6 +54,7 @@
     /**
      * 供方名称
      */
+    @ExcelProperty(value = "供方名称", order = 2)
     @ApiModelProperty(value = "供方名称", dataType = "String")
     @TableField("supplier_name")
     private String supplierName;
@@ -60,6 +74,7 @@
     @TableField("supplier_type")
     private String supplierType;
 
+    @ExcelProperty(value = "供方类型", order = 3)
     @ApiModelProperty(value = "供方类型(字典value)", dataType = "String")
     @TableField(exist = false)
     private String supplierTypeName;
@@ -109,7 +124,8 @@
     /**
      * 电话
      */
-    @ApiModelProperty(value = "电话", dataType = "String")
+    @ExcelProperty(value = "联系电话", order = 4)
+    @ApiModelProperty(value = "联系电话", dataType = "String")
     @TableField("phone")
     private String phone;
 
@@ -158,6 +174,7 @@
     /**
      * 公司地址-省
      */
+    @ExcelProperty(value = "地址-省", order = 6)
     @ApiModelProperty(value = "公司地址-省", dataType = "String")
     @TableField("company_province_name")
     private String companyProvinceName;
@@ -172,6 +189,7 @@
     /**
      * 公司地址-市
      */
+    @ExcelProperty(value = "地址-市", order = 7)
     @ApiModelProperty(value = "公司地址-市", dataType = "String")
     @TableField("company_city_name")
     private String companyCityName;
@@ -186,6 +204,7 @@
     /**
      * 公司地址-区
      */
+    @ExcelProperty(value = "地址-区", order = 8)
     @ApiModelProperty(value = "公司地址-区", dataType = "String")
     @TableField("company_area_name")
     private String companyAreaName;
@@ -193,6 +212,7 @@
     /**
      * 公司地址-详细地址
      */
+    @ExcelProperty(value = "地址-详细地址", order = 9)
     @ApiModelProperty(value = "公司地址-详细地址", dataType = "String")
     @TableField("company_address")
     private String companyAddress;
@@ -200,6 +220,7 @@
     /**
      * 服务和供应的内容
      */
+    @ExcelProperty(value = "服务和供应的内容", order = 5)
     @ApiModelProperty(value = "服务和供应的内容", dataType = "String")
     @TableField("supplier_content")
     private String supplierContent;
@@ -250,6 +271,7 @@
     /**
      * 创建时间
      */
+    @ExcelProperty(value = "创建时间", order = 9)
     @ApiModelProperty(value = "创建时间", dataType = "String")
     @TableField("create_time")
     private String createTime;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/EnvLocationInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/EnvLocationInfo.java
new file mode 100644
index 0000000..d8e2d7b
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/EnvLocationInfo.java
@@ -0,0 +1,83 @@
+package com.casic.missiles.model.resource;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotEmpty;
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 实验室环境监控系统-设备表
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-06-07
+ */
+@ApiModel
+@Data
+@TableName("env_location_info")
+public class EnvLocationInfo implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "主键id", dataType = "Long")
+    @TableId("id")
+    private Long id;
+
+    /**
+     * 地点编号
+     */
+    @NotEmpty(message = "地点编号不能为空")
+    @ApiModelProperty(value = "地点编号", dataType = "String")
+    @TableField("location_no")
+    private String locationNo;
+
+    /**
+     * 地点名称
+     */
+    @ApiModelProperty(value = "地点名称", dataType = "String")
+    @TableField("location_name")
+    private String locationName;
+
+    /**
+     * 地点位置
+     */
+    @ApiModelProperty(value = "地点位置", dataType = "String")
+    @TableField("location_position")
+    private String locationPosition;
+
+    /**
+     * 创建人id
+     */
+    @ApiModelProperty(value = "创建人id", dataType = "Long")
+    @TableField("create_user_id")
+    private Long createUserId;
+
+    /**
+     * 创建人
+     */
+    @ApiModelProperty(value = "创建人", dataType = "String")
+    @TableField("create_user")
+    private String createUser;
+
+    /**
+     * 创建时间
+     */
+    @ApiModelProperty(value = "创建时间", dataType = "String")
+    @TableField("create_time")
+    private String createTime;
+
+    /**
+     * 更新时间
+     */
+    @ApiModelProperty(value = "更新时间", dataType = "String")
+    @TableField("update_time")
+    private String updateTime;
+
+
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemFileConfig.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemFileConfig.java
index 19e6845..86e569c 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemFileConfig.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemFileConfig.java
@@ -30,7 +30,7 @@
     @ApiModelProperty(value = "系统类别(1业务系统2受检系统3环境系统)", dataType = "Integer")
     @NotNull(message = "系统类别不能为空")
     @TableField("system_type")
-    private Integer systemType;
+    private Integer systemType = 1;
 
     @ApiModelProperty("下载编号")
     @TableField("download_no")
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemNotice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemNotice.java
index e94297d..06ec37d 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemNotice.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemNotice.java
@@ -34,7 +34,7 @@
     @ApiModelProperty(value = "系统类别(1业务系统2受检系统3环境系统)", dataType = "Integer")
     @NotNull(message = "系统类别不能为空")
     @TableField("system_type")
-    private Integer systemType;
+    private Integer systemType = 1;
 
     /**
      * 通知公告编号
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSign.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSign.java
index 6c0d7c9..954f4f8 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSign.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSign.java
@@ -51,7 +51,7 @@
     @ApiModelProperty(value = "系统类别(1业务系统2受检系统3环境系统)", dataType = "Integer")
     @NotNull(message = "系统类别不能为空")
     @TableField("system_type")
-    private Integer systemType;
+    private Integer systemType = 1;
 
     /**
      * 签名编号
@@ -130,4 +130,8 @@
     @TableField(exist = false)
     private List<Long> userIdList;
 
+    @ApiModelProperty(hidden = true)
+    @TableField(exist = false)
+    private String deptName;
+
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemTemplate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemTemplate.java
index 503a457..1d27ebe 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemTemplate.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemTemplate.java
@@ -47,7 +47,7 @@
     @ApiModelProperty(value = "系统类别(1业务系统2受检系统3环境系统)", dataType = "Integer")
     @NotNull(message = "系统类别不能为空")
     @TableField("system_type")
-    private Integer systemType;
+    private Integer systemType = 1;
 
     /**
      * 模板编号
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java
index 8c21cb0..f61e4a8 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java
@@ -32,4 +32,8 @@
     ReturnDTO approvalDelete(ApprovalDeleteRequest request);
 
     ReturnDTO failUpdate(T request);
+
+    List<O> listExport(R request);
+
+    List<O> listExportByIds(List<Long> ids);
 }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java
index 724166f..9bce15b 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java
@@ -157,6 +157,29 @@
         throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
     }
 
+    @Override
+    public List<O> listExport(R request) {
+        request.setCreateUserId(null);
+        request.setApprovalStatus(ApprovalStatusEnum.PASSED);
+        Page<O> page = PageFactory.defaultPage();
+        page.setCurrent(1);
+        page.setSearchCount(false);
+        page.setSize(Integer.MAX_VALUE);
+        Page<O> resultPage = this.baseMapper.selectBatchForApprovalList(page, request, null);
+        return resultPage.getRecords();
+    }
+
+    @Override
+    public List<O> listExportByIds(List<Long> ids) {
+        Page<O> page = PageFactory.defaultPage();
+        page.setCurrent(1);
+        page.setSearchCount(false);
+        page.setSize(Integer.MAX_VALUE);
+        List<String> businessKeys = ids.stream().map(String::valueOf).collect(Collectors.toList());
+        Page<O> resultPage = this.baseMapper.selectBatchForApprovalList(page, null, businessKeys);
+        return resultPage.getRecords();
+    }
+
     protected ReturnDTO updateApprovalStatus(Long id, String processId, String approvalStatus) {
         UpdateWrapper<T> updateWrapper = new UpdateWrapper<>();
         updateWrapper.eq("id", id);
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificatePrintServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificatePrintServiceImpl.java
index f6e4706..3228497 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificatePrintServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificatePrintServiceImpl.java
@@ -162,6 +162,30 @@
         return ReturnUtil.success(printLogMapper.selectList(wrapper));
     }
 
+    @Override
+    public List<CertificatePrintListResponse> listByIds(List<Long> ids) {
+        Page<CertificatePrintListResponse> page = PageFactory.defaultPage();
+        page.setCurrent(1);
+        page.setSearchCount(false);
+        page.setSize(Integer.MAX_VALUE);
+        List<String> businessKeys = ids.stream().map(String::valueOf).collect(Collectors.toList());
+        Page<CertificatePrintListResponse> resultPage = this.baseMapper.selectBatchForApprovalList(page, null, businessKeys);
+        return resultPage.getRecords();
+    }
+
+    @Override
+    public List<CertificatePrintListResponse> list(CertificatePrintApprovalListRequest request) {
+        request.setCreateUserId(null);
+        request.setApprovalStatus(null);
+        request.setPrintStatus(null);
+        Page<CertificatePrintListResponse> page = PageFactory.defaultPage();
+        page.setCurrent(1);
+        page.setSearchCount(false);
+        page.setSize(Integer.MAX_VALUE);
+        Page<CertificatePrintListResponse> resultPage = certificatePrintMapper.selectBatchForApprovalList(page, request, null);
+        return resultPage.getRecords();
+    }
+
     private void savePrintLog(Long id) {
         BizBusinessCertificatePrintLog printLog = new BizBusinessCertificatePrintLog();
         BizBusinessCertificatePrint certificatePrint = certificatePrintMapper.selectById(id);
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificateReportServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificateReportServiceImpl.java
index 457555f..24146be 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificateReportServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificateReportServiceImpl.java
@@ -158,8 +158,8 @@
         QueryWrapper<BizBusinessCertificateMeasureResultData> mWrapper = new QueryWrapper<>();
         mWrapper.eq("report_id", reportId);
         boolean mRemove = certificateMeasureResultDataService.remove(mWrapper);
-        Assert.isFalse(eRemove || mRemove, () -> {
+        if(!eRemove || !mRemove){
             throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
-        });
+        }
     }
 }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessIdentifyInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessIdentifyInfoServiceImpl.java
index 4c8e190..f7e63ca 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessIdentifyInfoServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessIdentifyInfoServiceImpl.java
@@ -1,8 +1,10 @@
 package com.casic.missiles.service.Impl.business;
 
+import cn.hutool.core.date.DateUtil;
 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.core.page.PageFactory;
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.business.identify.IdentifyListRequest;
@@ -14,11 +16,14 @@
 import com.casic.missiles.service.business.IBizBusinessIdentifyInfoService;
 import com.casic.missiles.utils.DictCodeUtils;
 import com.casic.missiles.utils.NumberGeneratorUtil;
+import com.casic.missiles.utils.QRCodeUtil;
 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.List;
+
 /**
  * <p>
  * 计量检定业务-任务计量管理-标识打印 服务实现类
@@ -35,9 +40,9 @@
     @Override
     public Page<BizBusinessIdentifyInfo> identifyListPage(Page<BizBusinessIdentifyInfo> page, IdentifyListRequest request) throws Exception {
         QueryWrapper<BizBusinessIdentifyInfo> wrapper = new QueryWrapper<>();
-        wrapper.eq("identify_type", request.getIdentifyType());
-        wrapper.like("device_no", request.getDeviceNo());
-        wrapper.like("device_name", request.getDeviceName());
+        wrapper.eq(StringUtils.isNotEmpty(request.getIdentifyType()), "identify_type", request.getIdentifyType());
+        wrapper.like(StringUtils.isNotEmpty(request.getDeviceNo()),"device_no", request.getDeviceNo());
+        wrapper.like(StringUtils.isNotEmpty(request.getDeviceName()), "device_name", request.getDeviceName());
         wrapper.apply(StringUtils.isNotBlank(request.getCreateTimeStart()),
                 "{0} <= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getCreateTimeStart().split(" ")[0]);
         wrapper.apply(StringUtils.isNotBlank(request.getCreateTimeEnd()),
@@ -64,8 +69,11 @@
     }
 
     @Override
-    public ReturnDTO updateIdentify(BizBusinessIdentifyInfo identifyInfo) {
-        if(identifyInfoMapper.updateById(identifyInfo) > 0){
+    public ReturnDTO updateIdentify(Long id) {
+        BizBusinessIdentifyInfo info = new BizBusinessIdentifyInfo();
+        info.setId(id);
+        info.setUpdateTime(DateUtil.now());
+        if(identifyInfoMapper.updateById(info) > 0){
             return ReturnUtil.success();
         }
         throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
@@ -79,4 +87,20 @@
         throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
     }
 
+    @Override
+    public List<BizBusinessIdentifyInfo> list(IdentifyListRequest request) throws Exception {
+        Page<BizBusinessIdentifyInfo> page = PageFactory.defaultPage();
+        page.setCurrent(1);
+        page.setSearchCount(false);
+        page.setSize(Integer.MAX_VALUE);
+        Page<BizBusinessIdentifyInfo> resultPage = this.identifyListPage(page, request);
+        return resultPage.getRecords();
+    }
+
+    @Override
+    public ReturnDTO<String> equipmentQrCode(Long id) {
+        String base64QRCode = QRCodeUtil.getBase64QRCode(String.valueOf(id));
+        return ReturnUtil.success(base64QRCode);
+    }
+
 }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOrderInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOrderInfoServiceImpl.java
index 82952ad..d8d2c6a 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOrderInfoServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOrderInfoServiceImpl.java
@@ -35,6 +35,7 @@
 import javax.servlet.http.HttpServletResponse;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 import java.util.stream.Collectors;
 
 /**
@@ -209,13 +210,16 @@
     private QueryWrapper<OrderListResponse> listParamWrapperBuilder(OrderListRequest request) {
         QueryWrapper<OrderListResponse> wrapper = new QueryWrapper<>();
         wrapper.like(StringUtils.isNotBlank(request.getOrderNo()), "order_no", request.getOrderNo());
+        wrapper.like(Objects.nonNull(request.getCustomerId()), "customer_id", request.getCustomerId());
         wrapper.like(StringUtils.isNotBlank(request.getCustomerName()), "customer_name", request.getCustomerName());
         wrapper.like(StringUtils.isNotBlank(request.getDeliverer()), "deliverer", request.getDeliverer());
         wrapper.like(StringUtils.isNotBlank(request.getCreateUserName()), "create_user_name", request.getCreateUserName());
-        wrapper.apply(StringUtils.isNotBlank(request.getCreateStartTime()),
-                "{0} <= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getCreateStartTime().split(" ")[0]);
-        wrapper.apply(StringUtils.isNotBlank(request.getCreateEndTime()),
-                "{0} >= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getCreateEndTime().split(" ")[0]);
+        if(StringUtils.isNotBlank(request.getCreateStartTime())){
+            wrapper.apply("{0} <= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getCreateStartTime().split(" ")[0]);
+        }
+        if(StringUtils.isNotBlank(request.getCreateEndTime())){
+            wrapper.apply("{0} >= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getCreateEndTime().split(" ")[0]);
+        }
         wrapper.orderByDesc("create_time");
         return wrapper;
     }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceAssessServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceAssessServiceImpl.java
index c6af980..ce40138 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceAssessServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceAssessServiceImpl.java
@@ -1,10 +1,33 @@
 package com.casic.missiles.service.Impl.business;
 
-import com.casic.missiles.model.business.BizBusinessOutsourceAssess;
+import cn.hutool.core.lang.Assert;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.casic.missiles.core.model.auth.AuthUser;
+import com.casic.missiles.core.shiro.ShiroKit;
+import com.casic.missiles.dto.BaseApprovalSubmitRequest;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.ReturnUtil;
+import com.casic.missiles.dto.business.outsource.OutsourceAssessApprovalListRequest;
+import com.casic.missiles.dto.business.outsource.OutsourceAssessSaveResponse;
+import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.NoGenerateFileCodeEnum;
+import com.casic.missiles.enums.NoGenerateRecordTypeCodeEnum;
+import com.casic.missiles.enums.system.ApprovalStatusEnum;
+import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.mapper.business.BizBusinessOutsourceAssessMapper;
+import com.casic.missiles.model.business.BizBusinessOutsourceAssess;
+import com.casic.missiles.model.business.BizBusinessOutsourceAssessSampleRelation;
+import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl;
+import com.casic.missiles.service.business.IBizBusinessOutsourceAssessSampleRelationService;
 import com.casic.missiles.service.business.IBizBusinessOutsourceAssessService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.casic.missiles.utils.NoGeneratorUtil;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Objects;
 
 /**
  * <p>
@@ -15,6 +38,103 @@
  * @since 2023-08-16
  */
 @Service
-public class BizBusinessOutsourceAssessServiceImpl extends ServiceImpl<BizBusinessOutsourceAssessMapper, BizBusinessOutsourceAssess> implements IBizBusinessOutsourceAssessService {
+public class BizBusinessOutsourceAssessServiceImpl extends GeneralApprovalServiceImpl<BizBusinessOutsourceAssessMapper, BizBusinessOutsourceAssess, BizBusinessOutsourceAssess, OutsourceAssessApprovalListRequest, BaseApprovalSubmitRequest> implements IBizBusinessOutsourceAssessService {
+    @Autowired
+    private IBizBusinessOutsourceAssessSampleRelationService outsourceAssessSampleRelationService;
 
+    @Override
+    public ReturnDTO<OutsourceAssessSaveResponse> saveOutsourceAssess(BizBusinessOutsourceAssess request) {
+        //生成编号
+        String labCode = request.getLabCode();
+        String groupCode = request.getGroupCode();
+        Long maxNo = this.baseMapper.selectMaxProjectNo();
+        String projectNo = NoGeneratorUtil.getCode(NoGenerateFileCodeEnum.D, labCode, NoGenerateRecordTypeCodeEnum.OUTSOURCE_ACCESS, groupCode, maxNo);
+        request.setCreateUserId(request.getUserId());
+        request.setCreateUserName(request.getUserName());
+        request.setApprovalStatus(ApprovalStatusEnum.DRAFT); //草稿箱状态
+        request.setProjectNo(projectNo);
+        int row = this.baseMapper.insert(request);
+        Assert.isFalse(row <= 0, () -> {
+            throw new BusinessException(BusinessExceptionEnum.OUTSOURCE_ACCESS_SAVE_FAILED);
+        });
+        //关联表
+        saveRelationData(request);
+        OutsourceAssessSaveResponse saveResponse = new OutsourceAssessSaveResponse();
+        saveResponse.setId(request.getId());
+        saveResponse.setProjectNo(projectNo);
+        return ReturnUtil.success(saveResponse);
+    }
+
+    @Override
+    @Transactional
+    public ReturnDTO draftUpdate(BizBusinessOutsourceAssess request) {
+        if (this.baseMapper.updateById(request) > 0) {
+            //关联表删除、增加
+            removeRelationData(request.getId());
+            saveRelationData(request);
+            return ReturnUtil.success();
+        }
+        throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
+    }
+
+    @Override
+    public ReturnDTO draftDelete(Long id) {
+        if (this.baseMapper.deleteById(id) > 0) {
+            //关联表删除
+            removeRelationData(id);
+            return ReturnUtil.success();
+        }
+        throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
+    }
+
+    @Override
+    public ReturnDTO draftBatchDelete(List<Long> ids) {
+        if (this.baseMapper.deleteBatchIds(ids) >= 0) {
+            ids.forEach(id -> removeRelationData(id));
+            return ReturnUtil.success();
+        }
+        throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
+    }
+
+    @Override
+    @Transactional
+    public ReturnDTO failUpdate(BizBusinessOutsourceAssess request) {
+        AuthUser user = ShiroKit.getUser();
+        Assert.isFalse(Objects.isNull(user), () -> {
+            throw new BusinessException(BusinessExceptionEnum.LOGIN_USER_ACQUIRE_FAILED);
+        });
+        request.setApprovalStatus(ApprovalStatusEnum.IN_APPROVED);
+        if (this.baseMapper.updateById(request) > 0) {
+            //关联表删除、增加
+            removeRelationData(request.getId());
+            saveRelationData(request);
+            baseApprovalService.failUpdate(request.getProcessId());
+            return ReturnUtil.success();
+        }
+        throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
+    }
+
+    private void saveRelationData(BizBusinessOutsourceAssess request) {
+        List<BizBusinessOutsourceAssessSampleRelation> sampleRelations = new ArrayList<>();
+        request.getOrderSampleList().forEach(dto -> {
+            BizBusinessOutsourceAssessSampleRelation relation = new BizBusinessOutsourceAssessSampleRelation();
+            relation.setOrderId(dto.getOrderId());
+            relation.setSampleId(dto.getSampleId());
+            relation.setAccessId(request.getId());
+            sampleRelations.add(relation);
+        });
+        if(outsourceAssessSampleRelationService.saveBatch(sampleRelations)){
+            return;
+        }
+        throw new BusinessException(BusinessExceptionEnum.OUTSOURCE_ACCESS_SAVE_FAILED);
+    }
+
+    private void removeRelationData(Long assessId) {
+        QueryWrapper<BizBusinessOutsourceAssessSampleRelation> wrapper = new QueryWrapper<>();
+        wrapper.eq("access_id", assessId);
+        if(outsourceAssessSampleRelationService.remove(wrapper)){
+            return;
+        }
+        throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
+    }
 }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceProtocolServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceProtocolServiceImpl.java
new file mode 100644
index 0000000..821e728
--- /dev/null
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceProtocolServiceImpl.java
@@ -0,0 +1,60 @@
+package com.casic.missiles.service.Impl.business;
+
+import cn.hutool.core.lang.Assert;
+import com.casic.missiles.dto.BaseApprovalSubmitRequest;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.ReturnUtil;
+import com.casic.missiles.dto.business.outsource.OutsourceProtocolApprovalListRequest;
+import com.casic.missiles.dto.business.outsource.OutsourceProtocolSaveResponse;
+import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.NoGenerateFileCodeEnum;
+import com.casic.missiles.enums.NoGenerateRecordTypeCodeEnum;
+import com.casic.missiles.enums.system.ApprovalStatusEnum;
+import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.mapper.business.BizBusinessOutsourceProtocolMapper;
+import com.casic.missiles.mapper.business.BizBusinessOutsourcerInfoMapper;
+import com.casic.missiles.model.business.BizBusinessOutsourceProtocol;
+import com.casic.missiles.model.business.BizBusinessOutsourcerInfo;
+import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl;
+import com.casic.missiles.service.business.IBizBusinessOutsourceProtocolService;
+import com.casic.missiles.utils.NoGeneratorUtil;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 计量检定业务-分包管理-测试、校准或检定工作分包协议书 服务实现类
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-08-24
+ */
+@Service
+public class BizBusinessOutsourceProtocolServiceImpl extends GeneralApprovalServiceImpl<BizBusinessOutsourceProtocolMapper, BizBusinessOutsourceProtocol, BizBusinessOutsourceProtocol, OutsourceProtocolApprovalListRequest, BaseApprovalSubmitRequest> implements IBizBusinessOutsourceProtocolService {
+    @Autowired
+    private BizBusinessOutsourcerInfoMapper outsourcerInfoMapper;
+
+    @Override
+    public ReturnDTO<OutsourceProtocolSaveResponse> saveOutsourceProtocol(BizBusinessOutsourceProtocol request) {
+        //生成编号
+        String labCode = request.getLabCode();
+        String groupCode = request.getGroupCode();
+        Long maxNo = this.baseMapper.selectMaxProtocolNo();
+        String protocolNo = NoGeneratorUtil.getCode(NoGenerateFileCodeEnum.D, labCode, NoGenerateRecordTypeCodeEnum.OUTSOURCE_PROTOCOL, groupCode, maxNo);
+        request.setCreateUserId(request.getUserId());
+        request.setCreateUserName(request.getUserName());
+        request.setApprovalStatus(ApprovalStatusEnum.DRAFT); //草稿箱状态
+        request.setProtocolNo(protocolNo);
+        BizBusinessOutsourcerInfo outsourcerInfo = outsourcerInfoMapper.selectById(request.getOutsourcerId());
+        request.setOutsourceNo(outsourcerInfo.getOutsourcerNo());
+        request.setOutsourceName(outsourcerInfo.getOutsourcerName());
+        int row = this.baseMapper.insert(request);
+        Assert.isFalse(row <= 0, () -> {
+            throw new BusinessException(BusinessExceptionEnum.OUTSOURCE_PROTOCOL_SAVE_FAILED);
+        });
+        OutsourceProtocolSaveResponse saveResponse = new OutsourceProtocolSaveResponse();
+        saveResponse.setId(request.getId());
+        saveResponse.setProtocolNo(protocolNo);
+        return ReturnUtil.success(saveResponse);
+    }
+}
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourcerInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourcerInfoServiceImpl.java
index 75f639d..8aadad7 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourcerInfoServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourcerInfoServiceImpl.java
@@ -3,12 +3,12 @@
 import cn.hutool.core.lang.Assert;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.dto.*;
 import com.casic.missiles.dto.business.outsource.OutsourcerInfoApprovalListRequest;
 import com.casic.missiles.dto.business.outsource.OutsourcerSaveResponse;
 import com.casic.missiles.enums.BusinessExceptionEnum;
-import com.casic.missiles.enums.PrefixCodeEnum;
+import com.casic.missiles.enums.NoGenerateFileCodeEnum;
+import com.casic.missiles.enums.NoGenerateRecordTypeCodeEnum;
 import com.casic.missiles.enums.system.ApprovalStatusEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.mapper.business.BizBusinessOutsourcerInfoMapper;
@@ -20,7 +20,7 @@
 import com.casic.missiles.service.business.IBizBusinessOutsourcerInfoService;
 import com.casic.missiles.service.business.IBizBusinessOutsourcerUserInfoService;
 import com.casic.missiles.utils.DictCodeUtils;
-import com.casic.missiles.utils.NumberGeneratorUtil;
+import com.casic.missiles.utils.NoGeneratorUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -42,22 +42,12 @@
     private IBizBusinessOutsourcerUserInfoService outsourcerUserInfoService;
 
     @Override
-    public List<BizBusinessOutsourcerInfo> list(OutsourcerInfoApprovalListRequest request) {
-        request.setCreateUserId(null);
-        request.setApprovalStatus(ApprovalStatusEnum.PASSED);
-        Page<BizBusinessOutsourcerInfo> page = PageFactory.defaultPage();
-        page.setCurrent(1);
-        page.setSearchCount(false);
-        page.setSize(Integer.MAX_VALUE);
-        Page<BizBusinessOutsourcerInfo> resultPage = this.baseMapper.selectBatchForApprovalList(page, request, null);
-        return resultPage.getRecords();
-    }
-
-    @Override
     public ReturnDTO<OutsourcerSaveResponse> saveOutsourcer(BizBusinessOutsourcerInfo request) {
         //生成编号
+        String labCode = request.getLabCode();
+        String groupCode = request.getGroupCode();
         Long maxNo = this.baseMapper.selectMaxNo();
-        String outsourcerNo = NumberGeneratorUtil.getContactNo(PrefixCodeEnum.OUTSOURCER_PREFIX, maxNo);
+        String outsourcerNo = NoGeneratorUtil.getCode(NoGenerateFileCodeEnum.D, labCode, NoGenerateRecordTypeCodeEnum.OUTSOURCE_INFO, groupCode, maxNo);
         request.setOutsourcerNo(outsourcerNo);
         request.setCreateUserId(request.getUserId());
         request.setCreateUserName(request.getUserName());

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java
index bb0c50f..13a699b 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java
@@ -12,6 +12,7 @@
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.IGeneralApprovalService;
+import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
@@ -19,6 +20,7 @@
 import org.springframework.web.bind.annotation.RequestBody;
 
 import javax.validation.Valid;
+import java.util.List;
 import java.util.Objects;
 
 /**
@@ -117,4 +119,17 @@
         }
         return baseApprovalService.failUpdate(request);
     }
+
+    public List<O> exportList(@RequestBody @Valid R request) throws Exception {
+        List<O> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = baseApprovalService.listExportByIds(request.getIds());
+        } else {
+            list = baseApprovalService.listExport(request);
+        }
+        for (O record : list) {
+            DictCodeUtils.convertDictCodeToName(record);
+        }
+        return list;
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java
index 8a90961..d775831 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java
@@ -5,6 +5,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.business.certificate.CertificateChangeApplyApprovalListRequest;
 import com.casic.missiles.dto.business.certificate.CertificateChangeApplySaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessCertificateChangeApply;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
@@ -20,6 +21,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -48,4 +50,12 @@
         }
         return changeApplyService.saveChangeApply(request);
     }
+
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody CertificateChangeApplyApprovalListRequest request) throws Exception {
+        List<BizBusinessCertificateChangeApply> list = super.exportList(request);
+        super.exportExcel(BizBusinessCertificateChangeApply.class, list, ExportEnum.CERTIFICATE_CHANGE_APPLY.getSheetName());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java
index 5fc4b07..af8230e 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java
@@ -9,6 +9,7 @@
 import com.casic.missiles.dto.business.certificate.CertificatePrintApprovalListRequest;
 import com.casic.missiles.dto.business.certificate.CertificatePrintListResponse;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.enums.business.CertificatePrintStatusEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessCertificatePrintLog;
@@ -18,10 +19,16 @@
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.io.IOException;
+import java.util.List;
 import java.util.Objects;
 
 /**
@@ -98,4 +105,16 @@
         });
         return certificatePrintService.certificatePrintLog(idDTO.getId());
     }
+
+    @ApiOperation("证书打印审批导出")
+    @PostMapping("/listExport")
+    public void exportList(@RequestBody CertificatePrintApprovalListRequest request) throws IOException {
+        List<CertificatePrintListResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = certificatePrintService.listByIds(request.getIds());
+        } else {
+            list = certificatePrintService.list(request);
+        }
+        super.exportExcel(CertificatePrintListResponse.class, list, ExportEnum.CERTIFICATE_PRINT.getSheetName());
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java
index 63b06dc..6b2efd5 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java
@@ -6,6 +6,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.business.certificate.CertificateReportApprovalListRequest;
 import com.casic.missiles.dto.business.certificate.CertificateReportSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessCertificateReport;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
@@ -21,6 +22,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -50,7 +52,7 @@
         return certificateReportService.saveCertificateReport(request);
     }
 
-    @ApiOperation("证书审批详情（基本信息）")
+    @ApiOperation("详情（基本信息）")
     @PostMapping("/detail")
     public ReturnDTO<BizBusinessCertificateReport> detail(@RequestBody @Valid BaseDetailRequest request, BindingResult bindingResult) throws Exception {
         if(bindingResult.hasErrors()){
@@ -59,4 +61,11 @@
         return certificateReportService.detail(request);
     }
 
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody CertificateReportApprovalListRequest request) throws Exception {
+        List<BizBusinessCertificateReport> list = super.exportList(request);
+        super.exportExcel(BizBusinessCertificateReport.class, list, ExportEnum.CERTIFICATE_REPORT.getSheetName());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java
index 46b26bd..57c0809 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java
@@ -10,20 +10,21 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.business.identify.IdentifyListRequest;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessIdentifyInfo;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.business.IBizBusinessIdentifyInfoService;
+import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import javax.validation.Valid;
+import java.util.List;
 import java.util.Objects;
 
 /**
@@ -57,16 +58,13 @@
         return identifyInfoService.addIdentify(identifyInfo);
     }
 
-    @ApiOperation("标识打印更新")
+    @ApiOperation("标识打印更新（更新打印时间）")
     @PostMapping("/update")
-    public ReturnDTO updateIdentify(@RequestBody @Valid BizBusinessIdentifyInfo identifyInfo, BindingResult bindingResult) {
-        Assert.isFalse(Objects.isNull(identifyInfo.getId()), () -> {
+    public ReturnDTO updateIdentify(@RequestBody @Valid IdDTO idDTO) {
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        Assert.isFalse(bindingResult.hasErrors(), () -> {
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        });
-        return identifyInfoService.updateIdentify(identifyInfo);
+        return identifyInfoService.updateIdentify(idDTO.getId());
     }
 
     @ApiOperation("标识打印删除")
@@ -77,4 +75,37 @@
         });
         return identifyInfoService.deleteIdentify(idDTO.getId());
     }
+
+    @ApiOperation("标识打印导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody @Valid IdentifyListRequest request, BindingResult bindingResult) throws Exception {
+        if (bindingResult.hasErrors()) {
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        List<BizBusinessIdentifyInfo> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = identifyInfoService.listByIds(request.getIds());
+        } else {
+            list = identifyInfoService.list(request);
+        }
+        for (BizBusinessIdentifyInfo record : list) {
+            DictCodeUtils.convertDictCodeToName(record);
+        }
+        super.exportExcel(BizBusinessIdentifyInfo.class, list, ExportEnum.IDENTIFY_EXPORT.getSheetName());
+    }
+
+
+    // TODO: 2023/8/23 查询设备信息，4个底部按钮查设备（按钮的作用就是前端用来调不同接口、用来区分中间即将展示的标识），前端弹窗选设备，在确定保存时前端根据底部按钮判断传入设备类型deviceType字典code
+    // TODO: 2023/8/23 接口：查受检设备（第1个按钮），查设备台账（后3个按钮同一接口），查询之后前端根据标志类型的不同加到中间页面时进行判断（按产品给的对应表）
+    // TODO: 2023/8/23 提供二维码接口，前端在加到中间页面时调用一下
+
+    @ApiOperation("设备二维码")
+    @PostMapping("/equipment/qrCode")
+    public ReturnDTO<String> equipmentQrCode(@RequestBody @Valid IdDTO idDTO) {
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return identifyInfoService.equipmentQrCode(idDTO.getId());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java
index 707be6e..7e0453d 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java
@@ -117,7 +117,7 @@
     }
 
     @ApiOperation("任务单导出")
-    @PostMapping("/export")
+    @PostMapping("/listExport")
     public void orderExport(@RequestBody @Valid OrderListRequest request, HttpServletResponse response) {
         businessOrderService.orderExport(request, response);
     }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java
index 529a6ce..51432be 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java
@@ -1,9 +1,28 @@
 package com.casic.missiles.controller.business;
 
+import com.casic.missiles.controller.GeneralApprovalController;
+import com.casic.missiles.dto.BaseApprovalSubmitRequest;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.business.outsource.OutsourceAssessApprovalListRequest;
+import com.casic.missiles.dto.business.outsource.OutsourceAssessSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
+import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.model.business.BizBusinessOutsourceAssess;
+import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
+import com.casic.missiles.service.IGeneralApprovalService;
+import com.casic.missiles.service.business.IBizBusinessOutsourceAssessService;
 import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.BindingResult;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.validation.Valid;
+import java.util.List;
+
 /**
  * <p>
  * 计量检定业务-分包管理-测试、校准或检定工作分包评审表 前端控制器
@@ -15,6 +34,27 @@
 @Api(tags = "分包管理-测试、校准或检定工作分包评审表")
 @RestController
 @RequestMapping("/business/outsource/assess")
-public class BizBusinessOutsourceAssessController {
+public class BizBusinessOutsourceAssessController extends GeneralApprovalController<BizBusinessOutsourceAssess, BizBusinessOutsourceAssess, OutsourceAssessApprovalListRequest, BaseApprovalSubmitRequest> {
+    @Autowired
+    private IBizBusinessOutsourceAssessService outsourceAssessService;
 
+    public BizBusinessOutsourceAssessController(IGeneralApprovalService<BizBusinessOutsourceAssess, BizBusinessOutsourceAssess, OutsourceAssessApprovalListRequest, BaseApprovalSubmitRequest> baseApprovalService) {
+        super(baseApprovalService);
+    }
+
+    @ApiOperation("草稿箱-保存")
+    @PostMapping("/save")
+    public ReturnDTO<OutsourceAssessSaveResponse> saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceAssess request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        return outsourceAssessService.saveOutsourceAssess(request);
+    }
+
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception {
+        List<BizBusinessOutsourceAssess> list = super.exportList(request);
+        super.exportExcel(BizBusinessOutsourceAssess.class, list, ExportEnum.OUTSOURCE_ASSESS.getSheetName());
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java
new file mode 100644
index 0000000..9adef18
--- /dev/null
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java
@@ -0,0 +1,60 @@
+package com.casic.missiles.controller.business;
+
+import com.casic.missiles.controller.GeneralApprovalController;
+import com.casic.missiles.dto.BaseApprovalSubmitRequest;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.business.outsource.OutsourceProtocolApprovalListRequest;
+import com.casic.missiles.dto.business.outsource.OutsourceProtocolSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
+import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.model.business.BizBusinessOutsourceProtocol;
+import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
+import com.casic.missiles.service.IGeneralApprovalService;
+import com.casic.missiles.service.business.IBizBusinessOutsourceProtocolService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.BindingResult;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.validation.Valid;
+import java.util.List;
+
+/**
+ * <p>
+ * 计量检定业务-分包管理-测试、校准或检定工作分包协议书 前端控制器
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-08-24
+ */
+@Api(tags = "分包管理-测试、校准或检定工作分包协议书")
+@RestController
+@RequestMapping("/business/outsource/protocol")
+public class BizBusinessOutsourceProtocolController extends GeneralApprovalController<BizBusinessOutsourceProtocol, BizBusinessOutsourceProtocol, OutsourceProtocolApprovalListRequest, BaseApprovalSubmitRequest> {
+    @Autowired
+    private IBizBusinessOutsourceProtocolService outsourceProtocolService;
+
+    public BizBusinessOutsourceProtocolController(IGeneralApprovalService<BizBusinessOutsourceProtocol, BizBusinessOutsourceProtocol, OutsourceProtocolApprovalListRequest, BaseApprovalSubmitRequest> baseApprovalService) {
+        super(baseApprovalService);
+    }
+
+    @ApiOperation("草稿箱-保存")
+    @PostMapping("/save")
+    public ReturnDTO<OutsourceProtocolSaveResponse> saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceProtocol request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        return outsourceProtocolService.saveOutsourceProtocol(request);
+    }
+
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody OutsourceProtocolApprovalListRequest request) throws Exception {
+        List<BizBusinessOutsourceProtocol> list = super.exportList(request);
+        super.exportExcel(BizBusinessOutsourceProtocol.class, list, ExportEnum.OUTSOURCE_PROTOCOL.getSheetName());
+    }
+}
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java
index 097f645..f0f0943 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java
@@ -17,7 +17,6 @@
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.IGeneralApprovalService;
 import com.casic.missiles.service.business.IBizBusinessOutsourcerInfoService;
-import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -71,19 +70,8 @@
 
     @ApiOperation("分包方导出")
     @PostMapping("/listExport")
-    public void export(@RequestBody @Valid OutsourcerInfoApprovalListRequest request, BindingResult bindingResult) throws Exception {
-        if (bindingResult.hasErrors()) {
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        }
-        List<BizBusinessOutsourcerInfo> list;
-        if (!CollectionUtils.isEmpty(request.getIds())) {
-            list = outsourcerInfoService.listByIds(request.getIds());
-        } else {
-            list = outsourcerInfoService.list(request);
-        }
-        for (BizBusinessOutsourcerInfo record : list) {
-            DictCodeUtils.convertDictCodeToName(record);
-        }
+    public void export(@RequestBody OutsourcerInfoApprovalListRequest request) throws Exception {
+        List<BizBusinessOutsourcerInfo> list = super.exportList(request);
         super.exportExcel(BizBusinessOutsourcerInfo.class, list, ExportEnum.OUTSOURCER_EXPORT.getSheetName());
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java
index c2cbf9f..0410918 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java
@@ -17,11 +17,9 @@
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.IGeneralApprovalService;
 import com.casic.missiles.service.business.IBizBusinessSiteExecutiveInfoService;
-import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -60,7 +58,7 @@
         return siteExecutiveInfoService.saveSiteExecutiveInfo(siteExecutiveInfo);
     }
 
-    @ApiOperation("现场检测详情")
+    @ApiOperation("详情")
     @PostMapping("/detail")
     public ReturnDTO<SiteExecutiveDetailResponse> siteExecutiveDetail(@RequestBody @Valid IdDTO idDTO) throws Exception {
         Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
@@ -69,21 +67,10 @@
         return ReturnUtil.success(siteExecutiveInfoService.detail(idDTO.getId()));
     }
 
-    @ApiOperation("现场检测导出")
+    @ApiOperation("导出")
     @PostMapping("/listExport")
-    public void export(@RequestBody @Valid SiteExecutiveApprovalListRequest request, BindingResult bindingResult) throws Exception {
-        if (bindingResult.hasErrors()) {
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        }
-        List<SiteExecutiveApprovalListResponse> list;
-        if (!CollectionUtils.isEmpty(request.getIds())) {
-            list = siteExecutiveInfoService.listInfoByIds(request.getIds());
-        } else {
-            list = siteExecutiveInfoService.listInfo(request);
-        }
-        for (SiteExecutiveApprovalListResponse record : list) {
-            DictCodeUtils.convertDictCodeToName(record);
-        }
+    public void export(@RequestBody SiteExecutiveApprovalListRequest request) throws Exception {
+        List<SiteExecutiveApprovalListResponse> list = super.exportList(request);
         super.exportExcel(SiteExecutiveApprovalListResponse.class, list, ExportEnum.SITE_EXECUTIVE_EXPORT.getSheetName());
     }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
index 7e793cd..a92e209 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
@@ -55,7 +55,7 @@
 
     @ApiOperation("设备收发列表导出")
     @PostMapping("/export")
-    public void exportList(@RequestBody @Valid SampleDispatchListRequest request) throws IOException {
+    public void exportList(@RequestBody SampleDispatchListRequest request) throws IOException {
         List<SampleDispatchListResponse> list;
         if (!CollectionUtils.isEmpty(request.getIds())) {
             list = dispatchService.listByIds(request.getIds());
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java
index cdc77fc..d120fd4 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java
@@ -7,6 +7,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.business.labExecutive.*;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.business.IBusinessLabExecutiveInfoService;
@@ -14,6 +15,7 @@
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.*;
 
@@ -32,7 +34,7 @@
     @Autowired
     private IBusinessLabExecutiveInfoService labExecutiveInfoService;
 
-    @ApiOperation("实验室检测-部门检测-查询各状态列表（待检测、检测中、检测完）")
+    @ApiOperation("实验室任务-查询各状态列表（待检测、检测中、检测完）")
     @PostMapping("/deptExecutive/List")
     public ReturnDTO<PageInfoBT<SampleLabExecutiveListResponse>> queryDeptExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
@@ -43,10 +45,19 @@
         return ReturnUtil.success(super.packForBT(labExecutiveInfoService.deptLabExecutiveListPage(page, labExecutiveListRequest)));
     }
 
-    /**
-     * 实验室检测-我的检测-查询各状态列表（待检测、检测中、检测完）
-     */
-    @ApiOperation("实验室检测-我的检测-查询各状态列表（待检测、检测中、检测完）")
+    @ApiOperation("实验室任务导出")
+    @PostMapping("/deptExecutive/export")
+    public void deptExportList(@RequestBody @Valid SampleLabExecutiveListRequest request) throws Exception {
+        List<SampleLabExecutiveListResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = labExecutiveInfoService.deptLabExecutiveListByIds(request.getMeasureStatus(), request.getIds());
+        } else {
+            list = labExecutiveInfoService.deptLabExecutiveList(request);
+        }
+        super.exportExcel(SampleLabExecutiveListResponse.class, list, ExportEnum.DEPT_EXECUTIVE_TASK.getSheetName());
+    }
+
+    @ApiOperation("我的任务-查询各状态列表（待检测、检测中、检测完）")
     @PostMapping("/myExecutive/list")
     public ReturnDTO<PageInfoBT<SampleLabExecutiveListResponse>> queryMyExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
@@ -57,19 +68,25 @@
         return ReturnUtil.success(super.packForBT(labExecutiveInfoService.myLabExecutiveListPage(page, labExecutiveListRequest)));
     }
 
-    /**
-     * 实验室检测-我的检测-查询各状态样品数量（待检测、检测中、检测完）
-     */
-    @ApiOperation("实验室检测-我的检测-查询各状态样品数量（待检测、检测中、检测完）")
+    @ApiOperation("我的任务导出")
+    @PostMapping("/myExecutive/export")
+    public void exportList(@RequestBody @Valid SampleLabExecutiveListRequest request) throws Exception {
+        List<SampleLabExecutiveListResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = labExecutiveInfoService.myLabExecutiveListByIds(request.getMeasureStatus(), request.getIds());
+        } else {
+            list = labExecutiveInfoService.myLabExecutiveList(request);
+        }
+        super.exportExcel(SampleLabExecutiveListResponse.class, list, ExportEnum.MY_EXECUTIVE_TASK.getSheetName());
+    }
+
+    @ApiOperation("我的任务-查询各状态样品数量（待检测、检测中、检测完）")
     @GetMapping("/myExecutive/amount")
     public ReturnDTO<List<SampleAmountResponse>> queryMyExecutiveAmount() {
         return ReturnUtil.success(labExecutiveInfoService.myExecutiveAmount());
     }
 
-    /**
-     * 实验室检测-部门检测-分配（分配给具体人员）
-     */
-    @ApiOperation("实验室检测-部门检测-分配按钮（分配给具体人员）")
+    @ApiOperation("实验室任务-分配按钮（分配给具体人员）")
     @PostMapping("/deptExecutive/allocate")
     public ReturnDTO allocateStaff(@RequestBody @Valid SampleAllocateRequest sampleAllocateRequest, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -78,10 +95,7 @@
         return labExecutiveInfoService.allocateStaff(sampleAllocateRequest);
     }
 
-    /**
-     * 实验室检测-我的检测-检定人扫描收入（待检测->检测中）
-     */
-    @ApiOperation("实验室检测-我的检测-检定人扫描收入（待检测->检测中）")
+    @ApiOperation("我的任务-检定人扫描收入（待检测->检测中）")
     @PostMapping("/myExecutive/receive")
     public ReturnDTO sampleReceive(@RequestBody @Valid List<SampleOperateRequest> requestList, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -90,10 +104,7 @@
         return labExecutiveInfoService.sampleReceive(requestList);
     }
 
-    /**
-     * 实验室检测-负责人/检定人扫描检完（检测中->检测完）
-     */
-    @ApiOperation("实验室检测-负责人/检定人扫描检完（检测中->检测完）")
+    @ApiOperation("实验室任务-负责人/检定人扫描检完（检测中->检测完）")
     @PostMapping("/myExecutive/complete")
     public ReturnDTO sampleExecutiveComplete(@RequestBody @Valid List<SampleOperateRequest> requestList, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -102,10 +113,7 @@
         return labExecutiveInfoService.sampleExecutiveComplete(requestList);
     }
 
-    /**
-     * 实验室检测-部门检测/我的检测 编辑（只能修改应出具证书）
-     */
-    @ApiOperation("实验室检测-部门检测/我的检测 编辑（只能修改应出具证书）")
+    @ApiOperation("实验室任务/我的任务 编辑（只能修改应出具证书）")
     @PostMapping("/executive/update")
     public ReturnDTO updateExecutive(@RequestBody @Valid UpdateExecutiveRequest request, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -114,10 +122,7 @@
         return labExecutiveInfoService.updateExecutive(request);
     }
 
-    /**
-     * 实验室检测-部门检测/我的检测 详情
-     */
-    @ApiOperation("实验室检测-部门检测/我的检测 详情")
+    @ApiOperation("实验室任务/我的任务 详情")
     @PostMapping("/executive/detail")
     public ReturnDTO<ExecutiveDetailResponse> executiveDetail(@RequestBody @Valid ExecutiveDetailRequest request, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
@@ -131,7 +136,7 @@
      * 退回后会将下一个要执行的实验室检测状态更新为待分配，将后面的实验室顺序变更为连续（都进行减1）
      * 最后一个检测的实验室退回，等分发员再增加实验室或设备收发中的已收入直接手动点击完成
      */
-    @ApiOperation("实验室检测-部门检测/我的检测 退回（待检测/检测中->退回）")
+    @ApiOperation("实验室任务/我的任务 退回（待检测/检测中->退回）")
     @PostMapping("/executive/sendBack")
     public ReturnDTO executiveSendBack(@RequestBody @Valid ExecutiveSendBackRequest request, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -140,9 +145,6 @@
         return labExecutiveInfoService.sampleExecutiveSendBack(request);
     }
 
-    /**
-     * 分发员编辑实验室检测列表
-     */
     @ApiOperation("分发员编辑实验室检测列表")
     @PostMapping("/handOut/updateList")
     public ReturnDTO updateExecutiveList(@RequestBody @Valid UpdateExecutiveListRequest request, BindingResult bindingResult) {
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java
index 48a67ed..0c04f31 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java
@@ -10,6 +10,7 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.resource.customer.CustomerApprovalListRequest;
 import com.casic.missiles.dto.resource.customer.CustomerSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceCustomerInfo;
@@ -26,6 +27,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -55,6 +57,13 @@
         return customerInfoService.saveCustomerInfo(request);
     }
 
+    @ApiOperation("委托方名录导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody CustomerApprovalListRequest request) throws Exception {
+        List<BizResourceCustomerInfo> list = super.exportList(request);
+        super.exportExcel(BizResourceCustomerInfo.class, list, ExportEnum.CUSTOMER_INFO.getSheetName());
+    }
+
     @ApiOperation("委托方人员列表（分页）")
     @PostMapping("/person/listPage")
     public ReturnDTO<PageInfoBT<BizResourceCustomerStaff>> personListPage(@RequestBody IdDTO idDto) {
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
index 972ed4b..6418ea5 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
@@ -5,6 +5,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.resource.customer.SuggestFormApprovalListRequest;
 import com.casic.missiles.dto.resource.customer.SuggestFormSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceCustomerSuggestForm;
@@ -20,6 +21,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -50,4 +52,11 @@
         return suggestFormService.saveSuggestForm(request);
     }
 
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody SuggestFormApprovalListRequest request) throws Exception {
+        List<BizResourceCustomerSuggestForm> list = super.exportList(request);
+        super.exportExcel(BizResourceCustomerSuggestForm.class, list, ExportEnum.CUSTOMER_SUGGEST_FORM.getSheetName());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java
index 1934d1a..9e07eab 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java
@@ -15,12 +15,16 @@
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.resource.IEnvEnvironmentRecordConfigService;
 import com.casic.missiles.service.resource.IEnvEnvironmentRecordDataService;
+import com.casic.missiles.service.resource.IEnvLocationInfoService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
 import java.util.List;
@@ -39,6 +43,8 @@
     private IEnvEnvironmentRecordDataService environmentRecordDataService;
     @Autowired
     private IEnvEnvironmentRecordConfigService environmentRecordConfigService;
+    @Autowired
+    private IEnvLocationInfoService locationInfoService;
 
     @ApiOperation("环境记录单数据列表/详情")
     @PostMapping("/data/listPage")
@@ -95,4 +101,11 @@
         });
         return environmentRecordConfigService.deleteEnvironmentRecordConfig(idDTO.getId());
     }
+
+    @ApiOperation("地点列表")
+    @PostMapping("/location/listPage")
+    public ReturnDTO<PageInfoBT<LocationListResponse>> locationListPage(@RequestBody @Valid LocationListRequest request) {
+        Page<LocationListResponse> page = PageFactory.defaultPage();
+        return ReturnUtil.success(super.packForBT(locationInfoService.listPage(page, request)));
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java
index 82efe3f..e9561fa 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java
@@ -10,6 +10,7 @@
 import com.casic.missiles.dto.resource.seal.SealLogListRequest;
 import com.casic.missiles.dto.resource.seal.SealNoteApprovalListRequest;
 import com.casic.missiles.dto.resource.seal.SealNoteSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceSealUseLog;
@@ -27,6 +28,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -58,6 +60,13 @@
         return sealUseNoteService.saveSeal(request);
     }
 
+    @ApiOperation("印章使用登记导出（列表和导出中去掉经办人和监印人）")
+    @PostMapping("/listExport")
+    public void export(@RequestBody SealNoteApprovalListRequest request) throws Exception {
+        List<BizResourceSealUseNote> list = super.exportList(request);
+        super.exportExcel(BizResourceSealUseNote.class, list, ExportEnum.SEAL_NOTE.getSheetName());
+    }
+
     // TODO: 2023/7/28 印章使用日志：系统中使用印章时插入数据库
 
     @ApiOperation("印章使用日志列表（分页）")
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java
index 9b674fc..06b6521 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java
@@ -9,16 +9,20 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.resource.staff.StaffCertRequest;
 import com.casic.missiles.dto.resource.staff.StaffCertResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.service.resource.IBizResourceStaffInfoService;
 import com.casic.missiles.service.resource.IBizResourceStaffVerifierService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.List;
+
 /**
  * @Description:
  * @Author: wangpeng
@@ -41,9 +45,21 @@
         return ReturnUtil.success(super.packForBT(responsePage));
     }
 
+    @ApiOperation("证书逾期提醒导出")
+    @PostMapping("/listExport")
+    public void exportList(@RequestBody StaffCertRequest request) throws Exception {
+        List<StaffCertResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = staffInfoService.certListByIds(request.getIds());
+        } else {
+            list = staffInfoService.certList(request);
+        }
+        super.exportExcel(StaffCertResponse.class, list, ExportEnum.STAFF_CERTIFICATE_EXPIRE.getSheetName());
+    }
+
     @ApiOperation("证书逾期提醒")
     @PostMapping("/expirationReminder")
-    public ReturnDTO expirationReminder(@RequestBody IdDTO idDto) {
-        return verifierService.expirationReminder(idDto);
+    public ReturnDTO expirationReminder(@RequestBody IdDTO idDTO) {
+        return verifierService.expirationReminder(idDTO);
     }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java
index 3b251ad..a6e7850 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java
@@ -12,6 +12,7 @@
 import com.casic.missiles.dto.resource.staff.StaffListRequest;
 import com.casic.missiles.dto.resource.staff.TrainListRequest;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.*;
@@ -22,7 +23,10 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
 import java.util.List;
@@ -52,8 +56,19 @@
             throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
         }
         Page<BizResourceStaffInfo> page = PageFactory.defaultPage();
-        Page<BizResourceStaffInfo> responsePage = staffInfoService.listPage(page, request);
-        return ReturnUtil.success(super.packForBT(responsePage));
+        return ReturnUtil.success(super.packForBT(staffInfoService.listPage(page, request)));
+    }
+
+    @ApiOperation("人员登记导出")
+    @PostMapping("/listExport")
+    public void exportList(@RequestBody StaffListRequest request) throws Exception {
+        List<BizResourceStaffInfo> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = staffInfoService.listByIds(request.getIds());
+        } else {
+            list = staffInfoService.list(request);
+        }
+        super.exportExcel(BizResourceStaffInfo.class, list, ExportEnum.STAFF_INFO.getSheetName());
     }
 
     @ApiOperation("人员登记详情基础信息")
@@ -85,9 +100,9 @@
 
     @ApiOperation("科研教育列表（分页）")
     @PostMapping("/education/listPage")
-    public ReturnDTO<PageInfoBT<BizResourceStaffEducation>> educationListPage(@RequestBody IdDTO idDto) {
+    public ReturnDTO<PageInfoBT<BizResourceStaffEducation>> educationListPage(@RequestBody IdDTO idDTO) {
         Page<BizResourceStaffEducation> page = PageFactory.defaultPage();
-        Page<BizResourceStaffEducation> responsePage = staffInfoService.educationListPage(page, idDto);
+        Page<BizResourceStaffEducation> responsePage = staffInfoService.educationListPage(page, idDTO);
         return ReturnUtil.success(super.packForBT(responsePage));
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java
index af6aa86..d85d84a 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java
@@ -9,6 +9,7 @@
 import com.casic.missiles.dto.resource.outsideService.SupplierApprovalListRequest;
 import com.casic.missiles.dto.resource.outsideService.SupplierSaveResponse;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceSupplierAbility;
@@ -67,6 +68,13 @@
         return ReturnUtil.success(supplierInfoService.detail(idDTO.getId()));
     }
 
+    @ApiOperation("合格供方导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody SupplierApprovalListRequest request) throws Exception {
+        List<BizResourceSupplierInfo> list = super.exportList(request);
+        super.exportExcel(BizResourceSupplierInfo.class, list, ExportEnum.SUPPLIER_INFO.getSheetName());
+    }
+
     @ApiOperation("供方人员列表（分页）")
     @PostMapping("/person/listPage")
     public ReturnDTO<PageInfoBT<BizResourceSupplierPerson>> personListPage(@RequestBody IdDTO idDTO) {
diff --git a/casic-metering-api/src/main/resources/config/application.yml b/casic-metering-api/src/main/resources/config/application.yml
index 350db5f..ecff521 100644
--- a/casic-metering-api/src/main/resources/config/application.yml
+++ b/casic-metering-api/src/main/resources/config/application.yml
@@ -126,7 +126,7 @@
     #作者
     author: wangpeng
     #待生成对象表名
-    table-name: biz_equipment_technical_target_approval,biz_equipment_attachment_approval,biz_equipment_checkpoint_approval
+    table-name: biz_business_outsource_protocol
 
 reminder:
   #节点--common模块config包 ReminderNodeConfig配置
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
index 4a19e4e..d47d552 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
@@ -53,6 +53,7 @@
     SUGGEST_FORM_SAVE_FAILED(2509, "委托方意见登记表保存至草稿箱失败"),
     EXAMINE_FORM_SAVE_FAILED(2510, "要求、委托书及合同评审表保存至草稿箱失败"),
     CUSTOMER_EXIST_SAVE_FAILED(2511, "该委托方已存在，请重新选择"),
+    DUPLICATE_LOCATION_NO(2512, "地点编号已存在"),
 
     /**
      * 计量检定业务模块
@@ -68,6 +69,8 @@
     COMPLETE_SAMPLE_NOT_EXIST(2609, "检测中不存在扫描收入的样品"),
     CANNOT_CHANGE_MEASURE_INFO(2610, "无法更改非当前登录用户的检测信息"),
     NON_EXIST_ORDER_OR_SAMPLE(2611, "不存在该委托单或该委托单下的样品"),
+    OUTSOURCE_ACCESS_SAVE_FAILED(2612, "测试、校准或检定工作分包评审表保存至草稿箱失败"),
+    OUTSOURCE_PROTOCOL_SAVE_FAILED(2613, "测试、校准或检定工作分包协议书保存至草稿箱失败"),
 
     /**
      * 历史遗留备用
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
index 5089ad1..81a406b 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
@@ -10,54 +10,38 @@
     /**
      * 资源管理
      */
-    ENVIRONMENT_DATA_EXPORT("environmentData", "environmentData", "环境记录单数据"),
+    ENVIRONMENT_DATA_EXPORT("environmentData", "环境记录单数据", "环境记录单数据"),
+    STAFF_INFO("staffInfo", "人员登记", "人员登记"),
+    STAFF_CERTIFICATE_EXPIRE("certificateExpire", "证书逾期提醒", "证书逾期提醒"),
+    SUPPLIER_INFO("supplierInfo", "合格供方名录", "合格供方名录"),
+    CUSTOMER_INFO("customerInfo", "委托方名录", "委托方名录"),
+    CUSTOMER_SUGGEST_FORM("customerSuggestForm", "委托方意见登记表", "委托方意见登记表"),
+    SEAL_NOTE("sealNote", "印章使用登记", "印章使用登记"),
 
-    FILE_EXPORT("meterFileData", "meterFileData", "计量文件信息"),
-    TRAIN_PLAN_EXPORT("trainPlanData", "trainPlanData", "培训计划"),
-    TRAIN_LOG_EXPORT("trainLogData", "trainLogData", "培训记录"),
-    METER_ORGANIZE_EXPORT("meterOrganizeData", "meterOrganizeData", "计量组织"),
-    TRACE_SUPPLIER_EXPORT("traceSupplierData", "traceSupplierData", "溯源供方"),
-    SIGN_EXPORT("signData", "signData", "签名/签章"),
-    TEMPLATE_EXPORT("templateData", "templateData", "原始记录模板/证书报告模板"),
-    FIXED_ASSETS("meterFixedAssets", "meterFixedAssets", "固定资产"),
-    METER_EQUIPMENT("meterEquipment", "meterEquipment", "测量设备"),
-    CALIBRATION_TEST_EQUIPMENT("calibrationTestEquipment", "calibrationTestEquipment", "校准检定设备"),
-    MEASURE_ACCOUNT("measureAccount", "measureAccount", "测量工装"),
-    STANDARD_SUPPORT_EQUIPMENT("standardSupportEquipment", "standardSupportEquipment", "标准配套设备"),
-    STANDARD_EQUIPMENT("standardEquipment", "standardEquipment", "标准装置"),
-    FLOW_DEF_EXPORT("flowDefData", "flowDefData", "流程定义"),
-    STAFF_CERTIFICATE("certificate", "certificate", "计量人员证书"),
-    CHECK_INFO("checkInfo", "checkInfo", "设备管理点检测"),
-    EQUIPMENT_APPLY("equipmentApply", "equipmentApply", "设备借用"),
-    STANDARD_EQUIPMENT_REMIND("equipmentApplyRemind", "equipmentApplyRemind", "标准装置到期提醒"),
-    METER_PRICE("meterPrice", "meterPrice", "价格库"),
-    METER_STAFF("meterStaff", "meterStaff", "计量人员"),
-    STANDARD_EQUIPMENT_APPLY("standardEquipmentApply", "standardEquipmentApply", "标准装置申请"),
-    STATE_MANAGE_APPLY("stateManage", "stateManage", "状态管理"),
-    METER_ACCEPTANCE_CHECK("acceptanceCheck", "acceptanceCheck", "设备检修保养验收单"),
-    CUSTOMER_EXPORT("customerData", "customerData", "客户信息"),
-    ORDER_EXPORT("orderData", "orderData", "委托书信息"),
-    SAMPLE_EXPORT("sampleData", "sampleData", "样本信息"),
-    EXCHANGE_DATA("exchangeData", "exchangeData", "设备交接单"),
-    DISPATCH_DATA("dispatchData", "dispatchData", "设备收发"),
-    ENVIRONMENT_DATA("environmentData", "environmentData", "环境记录单"),
-    ORIGIN_DATA("originData", "originData", "原始记录"),
-    CERTIFICATE_REPORT("certificateReport", "certificateReport", "证书报告"),
-    ADVICE_EXPORT("adviceData", "adviceData", "客户反馈"),
-    HANDOUT_EXPORT("handoutData", "handoutData", "任务分发列表"),
-    OUTSOURCER_EXPORT("outsourcerData", "outsourcerData", "分包方"),
-    SITE_EXECUTIVE_EXPORT("siteExecutiveData", "siteExecutiveData", "现场测试、校准或检定"),
-    CERTIFICATE_PRINT_EXPORT("certificatePrintData", "certificatePrintData", "证书打印"),
-    DOWNLOAD_TEMPLATE("downloadTemplate", "downloadTemplate", "页面配置"),
-    OUTSOURCER_CERTIFICATE_EXPORT("outsourceCertificateData", "outsourceCertificateData", "分包证书"),
-    SETTLEMENT_INFO_EXPORT("settlementInfoData", "settlementInfoData", "业务结算"),
-    EQUIPMENT_REMIND("equipmentRemind", "equipmentRemind", "设备到期提醒"),
-    AGREEMENT_INFO_EXPORT("agreementInfoData", "agreementInfoData", "合同"),
-    WORK_STATISTICS_EXPORT("workStatisticsData", "workStatisticsData", "实时工作统计"),
-    DEPT_OUTPUT_EXPORT("deptOutputData", "deptOutputData", "部门产值分析"),
-    WORKLOAD_EXPORT("workloadData", "workloadData", "业务工作量分析"),
-    DEPT_COMPREHENSIVE_EXPORT("deptComprehensiveData", "deptComprehensiveData", "部门综合分析"),
-    ENVIRONMENTAL_RECORD("environmentalRecordData", "environmentalRecordData", "现场环境记录");
+    /**
+     * 计量检定业务
+     */
+    OUTSOURCER_EXPORT("outsourcerData", "分包方名录", "分包方名录"),
+    IDENTIFY_EXPORT("identifyData", "计量标识", "计量标识"),
+    ORDER_EXPORT("orderData", "任务单", "任务单"),
+    DISPATCH_DATA("dispatchData", "设备收发", "设备收发"),
+    HANDOUT_EXPORT("handoutData", "任务分发", "任务分发"),
+    SITE_EXECUTIVE_EXPORT("siteExecutiveData", "现场测试、校准或检定", "现场测试、校准或检定"),
+    CERTIFICATE_REPORT("certificateReport", "证书审批", "证书审批"),
+    CERTIFICATE_CHANGE_APPLY("certificateChangeApply", "证书报告补充或更换申请单", "证书报告补充或更换申请单"),
+    CERTIFICATE_PRINT("certificatePrintData", "证书打印审批", "证书打印审批"),
+    DEPT_EXECUTIVE_TASK("deptExecutiveTaskData", "实验室任务", "实验室任务"),
+    MY_EXECUTIVE_TASK("myExecutiveTaskData", "我的任务", "我的任务"),
+    OUTSOURCE_ASSESS("outsourceAssess", "测试、校准或检定工作分包评审表", "测试、校准或检定工作分包评审表"),
+    OUTSOURCE_PROTOCOL("outsourceProtocol", "测试、校准或检定工作分包协议书", "测试、校准或检定工作分包协议书"),
+
+    /**
+     * 系统管理
+     */
+    SIGN_EXPORT("signData", "签名", "签名"),
+    TEMPLATE_EXPORT("templateData", "文件模板", "文件模板"),
+    FLOW_DEF_EXPORT("flowDefData", "流程定义", "流程定义"),
+    DOWNLOAD_TEMPLATE("downloadTemplate", "流程定义", "页面配置");
 
     ExportEnum(String fileName, String sheetName, String description) {
         this.fileName = fileName;
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateRecordTypeCodeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateRecordTypeCodeEnum.java
index 31d913c..a963522 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateRecordTypeCodeEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateRecordTypeCodeEnum.java
@@ -46,4 +46,14 @@
     String SITE_EXECUTIVE_APPROVAL = "01";
     //《现场测试、校准或检定工作记录表》
     String SITE_EXECUTIVE_LOG = "02";
+
+    //测试、校准或检定工作分包协议书
+    String OUTSOURCE_PROTOCOL = "01";
+    //测试、校准或检定工作分包评审表
+    String OUTSOURCE_ACCESS = "02";
+    //测试、校准或检定工作分包通知书
+    String OUTSOURCE_NOTICE = "03";
+    //测试、校准或检定工作分包方名录
+    String OUTSOURCE_INFO = "04";
+
 }
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
index 24b8635..f78bd53 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
@@ -15,6 +15,10 @@
     String CERTIFICATE_CHANGE_APPLY_BEAN_NAME = "certificateChangeApplyBean";
     //现场测试、校准或检定
     String SITE_EXECUTIVE_BEAN_NAME = "siteExecutiveBean";
+    //测试、校准或检定工作分包评审表
+    String OUTSOURCE_ASSESS_BEAN_NAME = "outsourceAssessBean";
+    //测试、校准或检定工作分包协议书
+    String OUTSOURCE_PROTOCOL_BEAN_NAME = "outsourceProtocolBean";
 
     /*********************************设备与装置************************************/
     //设备台账
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 b21c661..6b86fd1 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
@@ -18,6 +18,8 @@
     OUTSOURCER_APPROVAL(OUTSOURCER_BEAN_NAME, ""),
     CERTIFICATE_CHANGE_APPROVAL(CERTIFICATE_CHANGE_APPLY_BEAN_NAME, ""),
     SITE_EXECUTIVE_APPROVAL(SITE_EXECUTIVE_BEAN_NAME, ""),
+    OUTSOURCE_ASSESS_APPROVAL(OUTSOURCE_ASSESS_BEAN_NAME, ""),
+    OUTSOURCE_PROTOCOL_APPROVAL(OUTSOURCE_PROTOCOL_BEAN_NAME, ""),
 
     ACTION_STATUS_MAP(new HashMap<String, AwareActionStatusEnum>() {
         {
@@ -47,6 +49,10 @@
             put(ApplyFromIdEnum.CERTIFICATE_CHANGE_APPROVAL.getCode(), CERTIFICATE_CHANGE_APPROVAL);
             //现场测试、校准或检定审批
             put(ApplyFromIdEnum.SITE_EXECUTIVE_APPROVAL.getCode(), SITE_EXECUTIVE_APPROVAL);
+            //测试、校准或检定工作分包评审表
+            put(ApplyFromIdEnum.OUTSOURCE_ASSESS_APPROVAL.getCode(), OUTSOURCE_ASSESS_APPROVAL);
+            //测试、校准或检定工作分包协议书
+            put(ApplyFromIdEnum.OUTSOURCE_PROTOCOL_APPROVAL.getCode(), OUTSOURCE_PROTOCOL_APPROVAL);
         }
     });
     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 934405e..c7410bd 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
@@ -9,6 +9,8 @@
     CERTIFICATE_CHANGE_APPROVAL("jljdywzsbchghsqd", MessageSourceModuleEnum.BUSINESS.getCode(), "证书/报告补充或更换申请单"),
     OUTSOURCER_APPROVAL("jljdywcsjzhgfbfml", MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定合格分包方名录"),
     SITE_EXECUTIVE_APPROVAL("jljdywxccsjzsp", MessageSourceModuleEnum.BUSINESS.getCode(), "现场测试、校准或检定审批"),
+    OUTSOURCE_ASSESS_APPROVAL("jljdywcsjzfbpsb", MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包评审表"),
+    OUTSOURCE_PROTOCOL_APPROVAL("jljdywcsjzfbxys", MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包协议书"),
 
 
     /*******************************************设备与装置*********************************************/
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/GeneralApprovalMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/GeneralApprovalMapper.java
index 4fb7344..0c9d6ae 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/GeneralApprovalMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/GeneralApprovalMapper.java
@@ -17,8 +17,4 @@
 
     Page<O> selectBatchForApprovalList(Page<O> page, @Param("request") R request, @Param("businessKeys") List<String> businessKeys);
 
-//    Page<O> selectListPage(Page<O> page, @Param("request") R request);
-
-//    Long selectMaxNo();
-
 }
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceAssessMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceAssessMapper.java
index 7867bb8..ba59009 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceAssessMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceAssessMapper.java
@@ -1,7 +1,12 @@
 package com.casic.missiles.mapper.business;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.business.outsource.OutsourceAssessApprovalListRequest;
+import com.casic.missiles.mapper.GeneralApprovalMapper;
 import com.casic.missiles.model.business.BizBusinessOutsourceAssess;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * <p>
@@ -11,6 +16,10 @@
  * @author wangpeng
  * @since 2023-08-16
  */
-public interface BizBusinessOutsourceAssessMapper extends BaseMapper<BizBusinessOutsourceAssess> {
+public interface BizBusinessOutsourceAssessMapper extends GeneralApprovalMapper<BizBusinessOutsourceAssess, BizBusinessOutsourceAssess, OutsourceAssessApprovalListRequest> {
+
+    Page<BizBusinessOutsourceAssess> selectBatchForApprovalList(Page<BizBusinessOutsourceAssess> page, @Param("request") OutsourceAssessApprovalListRequest request, @Param("businessKeys") List<String> businessKeys);
+
+    Long selectMaxProjectNo();
 
 }
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceProtocolMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceProtocolMapper.java
new file mode 100644
index 0000000..e6aba35
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceProtocolMapper.java
@@ -0,0 +1,24 @@
+package com.casic.missiles.mapper.business;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.business.outsource.OutsourceProtocolApprovalListRequest;
+import com.casic.missiles.mapper.GeneralApprovalMapper;
+import com.casic.missiles.model.business.BizBusinessOutsourceProtocol;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 计量检定业务-分包管理-测试、校准或检定工作分包协议书 Mapper 接口
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-08-24
+ */
+public interface BizBusinessOutsourceProtocolMapper extends GeneralApprovalMapper<BizBusinessOutsourceProtocol, BizBusinessOutsourceProtocol, OutsourceProtocolApprovalListRequest> {
+
+    Page<BizBusinessOutsourceProtocol> selectBatchForApprovalList(Page<BizBusinessOutsourceProtocol> page, @Param("request") OutsourceProtocolApprovalListRequest request, @Param("businessKeys") List<String> businessKeys);
+
+    Long selectMaxProtocolNo();
+}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/EnvLocationInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/EnvLocationInfoMapper.java
new file mode 100644
index 0000000..49eff87
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/EnvLocationInfoMapper.java
@@ -0,0 +1,21 @@
+package com.casic.missiles.mapper.resource;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.resource.environment.LocationListRequest;
+import com.casic.missiles.dto.resource.environment.LocationListResponse;
+import com.casic.missiles.model.resource.EnvLocationInfo;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * <p>
+ * 实验室环境监控系统-设备表 Mapper 接口
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-06-07
+ */
+public interface EnvLocationInfoMapper extends BaseMapper<EnvLocationInfo> {
+
+    Page<LocationListResponse> selectLocationListPage(Page<LocationListResponse> page, @Param("request") LocationListRequest request);
+}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java
index de124db..85ed0f7 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java
@@ -1,7 +1,9 @@
 package com.casic.missiles.mapper.system;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.dto.system.SignDetailResponse;
+import com.casic.missiles.dto.system.SignListRequest;
 import com.casic.missiles.model.system.SystemSign;
 import org.apache.ibatis.annotations.Param;
 
@@ -22,4 +24,8 @@
     SignDetailResponse selectSignDetailById(Long id);
 
     List<SystemSign> selectUsableSignList(@Param("userId") Long userId);
+
+    Page<SystemSign> selectSignListPage(Page<SystemSign> page, @Param("request") SignListRequest request);
+
+    List<SystemSign> selectSignList(@Param("request") SignListRequest request);
 }
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateChangeApplyMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateChangeApplyMapper.xml
index d798447..c496092 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateChangeApplyMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateChangeApplyMapper.xml
@@ -30,31 +30,31 @@
         SELECT *
         FROM biz_business_certificate_change_apply
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.changeApplyNo != null and request.changeApplyNo !=''">
+        <if test="request != null and request.changeApplyNo != null and request.changeApplyNo !=''">
             and change_apply_no like concat('%',#{request.changeApplyNo},'%')
         </if>
-        <if test="request.changeReportNo != null and request.changeReportNo !=''">
+        <if test="request != null and request.changeReportNo != null and request.changeReportNo !=''">
             and change_report_no like concat('%',#{request.changeReportNo},'%')
         </if>
-        <if test="request.changeReportName != null and request.changeReportName !=''">
+        <if test="request != null and request.changeReportName != null and request.changeReportName !=''">
             and change_report_name like concat('%',#{request.changeReportName},'%')
         </if>
-        <if test="request.changeType != null and request.changeType !=''">
+        <if test="request != null and request.changeType != null and request.changeType !=''">
             and change_type = #{request.changeType}
         </if>
-        <if test="request.createUserName != null and request.createUserName !=''">
+        <if test="request != null and request.createUserName != null and request.createUserName !=''">
             and create_user_name like concat('%',#{request.createUserName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificatePrintMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificatePrintMapper.xml
index b66cd99..49c0ac8 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificatePrintMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificatePrintMapper.xml
@@ -31,34 +31,34 @@
         LEFT JOIN biz_business_order_sample_relation bosr ON (bosr.order_id = bcr.order_id AND bosr.sample_id = bcr.sample_id)
         LEFT JOIN biz_business_order_info boi ON boi.id = bosr.order_id
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and bcp.approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.printStatus != null and request.printStatus !=''">
+        <if test="request != null and request.printStatus != null and request.printStatus !=''">
             and print_status = #{request.printStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and bcp.create_user_id = #{request.createUserId}
         </if>
-        <if test="request.certificateReportNo != null and request.certificateReportNo !=''">
+        <if test="request != null and request.certificateReportNo != null and request.certificateReportNo !=''">
             and bcr.certificate_report_no like concat('%',#{request.certificateReportNo},'%')
         </if>
-        <if test="request.certificateReportName != null and request.certificateReportName !=''">
+        <if test="request != null and request.certificateReportName != null and request.certificateReportName !=''">
             and bcr.certificate_report_name like concat('%',#{request.certificateReportName},'%')
         </if>
-        <if test="request.customerName != null and request.customerName !=''">
+        <if test="request != null and request.customerName != null and request.customerName !=''">
             and boi.customer_name like concat('%',#{request.customerName},'%')
         </if>
-        <if test="request.sampleNo != null and request.sampleNo !=''">
+        <if test="request != null and request.sampleNo != null and request.sampleNo !=''">
             and bosr.sample_no like concat('%',#{request.sampleNo},'%')
         </if>
-        <if test="request.sampleName != null and request.sampleName !=''">
+        <if test="request != null and request.sampleName != null and request.sampleName !=''">
             and bosr.sample_name like concat('%',#{request.sampleName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and bcp.create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and bcp.create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml
index b366034..767695d 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml
@@ -46,33 +46,37 @@
         SELECT bcr.*, bosr.sample_no, bosr.sample_name, bosr.sample_model, rsi.staff_name
         FROM biz_business_certificate_report bcr
         LEFT JOIN biz_business_order_sample_relation bosr ON (bosr.order_id = bcr.order_id AND bosr.sample_id = bcr.sample_id)
+        LEFT JOIN biz_business_order_info boi ON boi.id = bcr.order_id
         LEFT JOIN biz_resource_staff_info rsi ON rsi.id = bcr.measure_person_id
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and bcr.approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and bcr.create_user_id = #{request.createUserId}
         </if>
-        <if test="request.certificateReportNo != null and request.certificateReportNo !=''">
+        <if test="request != null and request.customerId != null and request.customerId !=''">
+            and boi.customer_id = #{request.customerId}
+        </if>
+        <if test="request != null and request.certificateReportNo != null and request.certificateReportNo !=''">
             and bcr.certificate_report_no like concat('%',#{request.certificateReportNo},'%')
         </if>
-        <if test="request.certificateReportName != null and request.certificateReportName !=''">
+        <if test="request != null and request.certificateReportName != null and request.certificateReportName !=''">
             and bcr.certificate_report_name like concat('%',#{request.certificateReportName},'%')
         </if>
-        <if test="request.sampleNo != null and request.sampleNo !=''">
+        <if test="request != null and request.sampleNo != null and request.sampleNo !=''">
             and bosr.sample_no like concat('%',#{request.sampleNo},'%')
         </if>
-        <if test="request.measureCategory != null and request.measureCategory !=''">
+        <if test="request != null and request.measureCategory != null and request.measureCategory !=''">
             and bcr.measure_category = #{request.measureCategory}
         </if>
-        <if test="request.measurePerson != null and request.measurePerson !=''">
+        <if test="request != null and request.measurePerson != null and request.measurePerson !=''">
             and rsi.staff_name like concat('%',#{request.measurePerson},'%')
         </if>
-        <if test="request.calibrationTimeStart != null and request.calibrationTimeStart !=''">
+        <if test="request != null and request.calibrationTimeStart != null and request.calibrationTimeStart !=''">
             and bcr.calibration_time &gt;= #{request.calibrationTimeStart}
         </if>
-        <if test="request.calibrationTimeEnd != null and request.calibrationTimeEnd !=''">
+        <if test="request != null and request.calibrationTimeEnd != null and request.calibrationTimeEnd !=''">
             and bcr.calibration_time &lt;= #{request.calibrationTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceAssessMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceAssessMapper.xml
index d0fcf8b..c22c101 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceAssessMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceAssessMapper.xml
@@ -7,6 +7,8 @@
         <id column="id" property="id" />
         <result column="project_no" property="projectNo" />
         <result column="project_name" property="projectName" />
+        <result column="lab_code" property="labCode" />
+        <result column="group_code" property="groupCode" />
         <result column="applicant_id" property="applicantId" />
         <result column="applicant_name" property="applicantName" />
         <result column="applicant_time" property="applicantTime" />
@@ -31,7 +33,45 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, project_no, project_name, applicant_id, applicant_name, applicant_time, minio_file_name, remark, create_user_id, create_user_name, outsourcer_id, pre_start_time, pre_end_time, outsource_reason, pre_cost, approval_status, process_id, approve_situation, traceability, test_method, technique_ability, create_time, update_time
+        id, project_no, project_name, lab_code, group_code, applicant_id, applicant_name, applicant_time, minio_file_name, remark, create_user_id, create_user_name, outsourcer_id, pre_start_time, pre_end_time, outsource_reason, pre_cost, approval_status, process_id, approve_situation, traceability, test_method, technique_ability, create_time, update_time
     </sql>
 
+    <select id="selectMaxProjectNo" resultType="java.lang.Long">
+        SELECT IFNULL(max(RIGHT(project_no, 3)), 0) from biz_business_outsource_assess
+    </select>
+
+    <select id="selectBatchForApprovalList" resultMap="BaseResultMap">
+        SELECT bboa.*, bboi.outsourcer_name, bboi.director
+        FROM biz_business_outsource_assess bboa
+        LEFT JOIN biz_business_outsourcer_info bboi ON bboa.outsourcer_id = bboi.id
+        WHERE 1=1
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
+            and bboa.approval_status = #{request.approvalStatus}
+        </if>
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
+            and bboa.create_user_id = #{request.createUserId}
+        </if>
+        <if test="request != null and request.projectNo != null and request.projectNo !=''">
+            and bboa.project_no like concat('%',#{request.projectNo},'%')
+        </if>
+        <if test="request != null and request.outsourcerName != null and request.outsourcerName !=''">
+            and bboi.outsourcer_name like concat('%',#{request.outsourcerName},'%')
+        </if>
+        <if test="request != null and request.applicantName != null and request.applicantName !=''">
+            and bboa.applicant_name like concat('%',#{request.applicantName},'%')
+        </if>
+        <if test="request != null and request.applicantTimeStart != null and request.applicantTimeStart !=''">
+            and bboa.applicant_time &gt;= #{request.applicantTimeStart}
+        </if>
+        <if test="request != null and request.applicantTimeEnd != null and request.applicantTimeEnd !=''">
+            and bboa.applicant_time &lt;= #{request.applicantTimeEnd}
+        </if>
+        <if test="businessKeys != null">
+            and bboa.id in
+            <foreach collection="businessKeys" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
+        ORDER BY bboa.create_time DESC
+    </select>
 </mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceProtocolMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceProtocolMapper.xml
new file mode 100644
index 0000000..b7b2149
--- /dev/null
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceProtocolMapper.xml
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.mapper.business.BizBusinessOutsourceProtocolMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.business.BizBusinessOutsourceProtocol">
+        <id column="id" property="id" />
+        <result column="protocol_no" property="protocolNo" />
+        <result column="project_name" property="projectName" />
+        <result column="lab_code" property="labCode" />
+        <result column="group_code" property="groupCode" />
+        <result column="outsourcer_id" property="outsourcerId" />
+        <result column="remark" property="remark" />
+        <result column="outsource_no" property="outsourceNo" />
+        <result column="outsource_name" property="outsourceName" />
+        <result column="contacts" property="contacts" />
+        <result column="mobile" property="mobile" />
+        <result column="address" property="address" />
+        <result column="require_date" property="requireDate" />
+        <result column="outsource_cost" property="outsourceCost" />
+        <result column="director" property="director" />
+        <result column="item" property="item" />
+        <result column="requires" property="requires" />
+        <result column="create_user_id" property="createUserId" />
+        <result column="create_user_name" property="createUserName" />
+        <result column="approval_status" property="approvalStatus" />
+        <result column="process_id" property="processId" />
+        <result column="create_time" property="createTime" />
+        <result column="update_time" property="updateTime" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, protocol_no, project_name, lab_code, group_code, outsourcer_id, remark, outsource_no, outsource_name, contacts, mobile, address, require_date, outsource_cost, director, item, requires, create_user_id, create_user_name, approval_status, process_id, create_time, update_time
+    </sql>
+
+    <select id="selectMaxProtocolNo" resultType="java.lang.Long">
+        SELECT IFNULL(max(RIGHT(protocol_no, 3)), 0) from biz_business_outsource_protocol
+    </select>
+
+    <select id="selectBatchForApprovalList" resultMap="BaseResultMap">
+        SELECT *
+        FROM biz_business_outsource_protocol
+        WHERE 1=1
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
+            and approval_status = #{request.approvalStatus}
+        </if>
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
+            and create_user_id = #{request.createUserId}
+        </if>
+        <if test="request != null and request.protocolNo != null and request.protocolNo !=''">
+            and protocol_no like concat('%',#{request.protocolNo},'%')
+        </if>
+        <if test="request != null and request.outsourcerName != null and request.outsourcerName !=''">
+            and outsourcer_name like concat('%',#{request.outsourcerName},'%')
+        </if>
+        <if test="request != null and request.applicantName != null and request.applicantName !=''">
+            and create_user_name like concat('%',#{request.applicantName},'%')
+        </if>
+        <if test="request != null and request.applicantTimeStart != null and request.applicantTimeStart !=''">
+            and create_time &gt;= #{request.applicantTimeStart}
+        </if>
+        <if test="request != null and request.applicantTimeEnd != null and request.applicantTimeEnd !=''">
+            and create_time &lt;= #{request.applicantTimeEnd}
+        </if>
+        <if test="businessKeys != null">
+            and id in
+            <foreach collection="businessKeys" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
+        ORDER BY create_time DESC
+    </select>
+</mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourcerInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourcerInfoMapper.xml
index 510a80b..3049b54 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourcerInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourcerInfoMapper.xml
@@ -7,6 +7,8 @@
         <id column="id" property="id" />
         <result column="outsourcer_no" property="outsourcerNo" />
         <result column="outsourcer_name" property="outsourcerName" />
+        <result column="lab_code" property="labCode" />
+        <result column="group_code" property="groupCode" />
         <result column="outsourcer_brief_name" property="outsourcerBriefName" />
         <result column="outsourcer_size" property="outsourcerSize" />
         <result column="business_size" property="businessSize" />
@@ -55,32 +57,32 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, outsourcer_no, outsourcer_name, outsourcer_brief_name, outsourcer_size, business_size, grade, evaluation, tax_number, bank_account, bank_name, bank_account_number, postal_code, director, phone, fax, mobile, email, website, address_country, address_province, address_city, address_area, full_address, address_country_name, address_province_name, address_city_name, address_area_name, invoice_country, invoice_province, invoice_city, invoice_area, invoice_full_address, invoice_country_name, invoice_province_name, invoice_city_name, invoice_area_name, business_scope, business_content, minio_file_name, approval_status, process_id, remark, create_user_id, create_user_name, create_time, update_time
+        id, outsourcer_no, outsourcer_name, lab_code, group_code, outsourcer_brief_name, outsourcer_size, business_size, grade, evaluation, tax_number, bank_account, bank_name, bank_account_number, postal_code, director, phone, fax, mobile, email, website, address_country, address_province, address_city, address_area, full_address, address_country_name, address_province_name, address_city_name, address_area_name, invoice_country, invoice_province, invoice_city, invoice_area, invoice_full_address, invoice_country_name, invoice_province_name, invoice_city_name, invoice_area_name, business_scope, business_content, minio_file_name, approval_status, process_id, remark, create_user_id, create_user_name, create_time, update_time
     </sql>
 
     <select id="selectBatchForApprovalList" resultMap="BaseResultMap">
         SELECT *
         FROM biz_business_outsourcer_info
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.outsourcerNo != null and request.outsourcerNo !=''">
+        <if test="request != null and request.outsourcerNo != null and request.outsourcerNo !=''">
             and outsourcer_no like concat('%',#{request.outsourcerNo},'%')
         </if>
-        <if test="request.outsourcerName != null and request.outsourcerName !=''">
+        <if test="request != null and request.outsourcerName != null and request.outsourcerName !=''">
             and outsourcer_name like concat('%',#{request.outsourcerName},'%')
         </if>
-        <if test="request.director != null and request.director !=''">
+        <if test="request != null and request.director != null and request.director !=''">
             and director like concat('%',#{request.director},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
@@ -93,6 +95,6 @@
     </select>
 
     <select id="selectMaxNo" resultType="java.lang.Long">
-        SELECT IFNULL(max(RIGHT(outsourcer_no, 12)), 0) from biz_business_outsourcer_info
+        SELECT IFNULL(max(RIGHT(outsourcer_no, 3)), 0) from biz_business_outsourcer_info
     </select>
 </mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessSiteExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessSiteExecutiveInfoMapper.xml
index 135c5d0..3c5ae79 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessSiteExecutiveInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessSiteExecutiveInfoMapper.xml
@@ -38,25 +38,25 @@
         FROM biz_business_site_executive_info bsei
         LEFT JOIN biz_resource_customer_info rci ON bsei.customer_id = rci.id
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and bsei.approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and bsei.create_user_id = #{request.createUserId}
         </if>
-        <if test="request.siteExecutiveNo != null and request.siteExecutiveNo !=''">
+        <if test="request != null and request.siteExecutiveNo != null and request.siteExecutiveNo !=''">
             and bsei.site_executive_no like concat('%',#{request.siteExecutiveNo},'%')
         </if>
-        <if test="request.customerName != null and request.customerName !=''">
+        <if test="request != null and request.customerName != null and request.customerName !=''">
             and rci.outsourcer_name like concat('%',#{request.customerName},'%')
         </if>
-        <if test="request.applyName != null and request.applyName !=''">
+        <if test="request != null and request.applyName != null and request.applyName !=''">
             and bsei.apply_name like concat('%',#{request.applyName},'%')
         </if>
-        <if test="request.applyTimeStart != null and request.applyTimeStart !=''">
+        <if test="request != null and request.applyTimeStart != null and request.applyTimeStart !=''">
             and bsei.apply_time &gt;= #{request.applyTimeStart}
         </if>
-        <if test="request.applyTimeEnd != null and request.applyTimeEnd !=''">
+        <if test="request != null and request.applyTimeEnd != null and request.applyTimeEnd !=''">
             and bsei.apply_time &lt;= #{request.applyTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml
index 84d9e2a..6bd38a9 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml
@@ -105,6 +105,12 @@
         <if test="request.isUrgent != null and request.isUrgent !=''">
             AND bo.is_urgent = #{request.isUrgent}
         </if>
+        <if test="request.ids != null">
+            and blei.id in
+            <foreach collection="request.ids" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
         ORDER BY blei.update_time DESC
     </select>
 
@@ -137,6 +143,12 @@
         <if test="request.isUrgent != null and request.isUrgent !=''">
             AND bo.is_urgent = #{request.isUrgent}
         </if>
+        <if test="request.ids != null">
+            and blei.id in
+            <foreach collection="request.ids" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
         ORDER BY blei.update_time DESC
     </select>
 
diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardInfoMapper.xml
index 1a5551b..2ed8d17 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardInfoMapper.xml
@@ -45,12 +45,6 @@
         FROM biz_equipment_standard_info besi
         LEFT JOIN biz_equipment_standard_technology_relation bestr ON besi.standard_no = bestr.standard_no
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
-            and besi.approval_status = #{request.approvalStatus}
-        </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
-            and besi.create_user_id = #{request.createUserId}
-        </if>
         <if test="request.standardName != null and request.standardName !=''">
             and besi.standard_name like concat('%',#{request.standardName},'%')
         </if>
diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardTechnologyRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardTechnologyRelationMapper.xml
index fc7e16c..cd03c8c 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardTechnologyRelationMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardTechnologyRelationMapper.xml
@@ -6,6 +6,7 @@
     <resultMap id="BaseResultMap" type="com.casic.missiles.model.equipment.BizEquipmentStandardTechnologyRelation">
         <id column="id" property="id" />
         <result column="technology_file_id" property="technologyFileId" />
+        <result column="technology_file_no" property="technologyFileNo" />
         <result column="technology_file_name" property="technologyFileName" />
         <result column="standard_id" property="standardId" />
         <result column="standard_no" property="standardNo" />
@@ -14,7 +15,7 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, technology_file_id, technology_file_name, standard_id, remark
+        id, technology_file_id, technology_file_no, technology_file_name, standard_id, remark
     </sql>
 
 </mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceAuthorizeOrderMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceAuthorizeOrderMapper.xml
index ac5176c..554fe65 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceAuthorizeOrderMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceAuthorizeOrderMapper.xml
@@ -32,22 +32,22 @@
         SELECT *
         FROM biz_resource_authorize_order
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.orderNo != null and request.orderNo !=''">
+        <if test="request != null and request.orderNo != null and request.orderNo !=''">
             and order_no like concat('%',#{request.orderNo},'%')
         </if>
-        <if test="request.createUserName != null and request.createUserName !=''">
+        <if test="request != null and request.createUserName != null and request.createUserName !=''">
             and create_user_name like concat('%',#{request.createUserName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerExamineFormMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerExamineFormMapper.xml
index ab242f6..af7f98f 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerExamineFormMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerExamineFormMapper.xml
@@ -41,28 +41,28 @@
         SELECT *
         FROM biz_resource_customer_examine_form
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.formNo != null and request.formNo !=''">
+        <if test="request != null and request.formNo != null and request.formNo !=''">
             and form_no like concat('%',#{request.formNo},'%')
         </if>
-        <if test="request.labCode != null and request.labCode !=''">
+        <if test="request != null and request.labCode != null and request.labCode !=''">
             and lab_code like concat('%',#{request.labCode},'%')
         </if>
-        <if test="request.groupCode != null and request.groupCode !=''">
+        <if test="request != null and request.groupCode != null and request.groupCode !=''">
             and group_code like concat('%',#{request.groupCode},'%')
         </if>
-        <if test="request.createUserName != null and request.createUserName !=''">
+        <if test="request != null and request.createUserName != null and request.createUserName !=''">
             and create_user_name like concat('%',#{request.createUserName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerInfoMapper.xml
index fa8ffbc..06a2798 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerInfoMapper.xml
@@ -33,25 +33,25 @@
         SELECT *
         FROM biz_resource_customer_info
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.customerNo != null and request.customerNo !=''">
+        <if test="request != null and request.customerNo != null and request.customerNo !=''">
             and customer_no like concat('%',#{request.customerNo},'%')
         </if>
-        <if test="request.customerName != null and request.customerName !=''">
+        <if test="request != null and request.customerName != null and request.customerName !=''">
             and customer_name like concat('%',#{request.customerName},'%')
         </if>
-        <if test="request.contacts != null and request.contacts !=''">
+        <if test="request != null and request.contacts != null and request.contacts !=''">
             and contacts like concat('%',#{request.contacts},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerSuggestFormMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerSuggestFormMapper.xml
index 28f5bb2..1806662 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerSuggestFormMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerSuggestFormMapper.xml
@@ -33,28 +33,28 @@
         SELECT *
         FROM biz_resource_customer_suggest_form
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.formNo != null and request.formNo !=''">
+        <if test="request != null and request.formNo != null and request.formNo !=''">
             and form_no like concat('%',#{request.formNo},'%')
         </if>
-        <if test="request.customerName != null and request.customerName !=''">
+        <if test="request != null and request.customerName != null and request.customerName !=''">
             and customer_name like concat('%',#{request.customerName},'%')
         </if>
-        <if test="request.customerDeptName != null and request.customerDeptName !=''">
+        <if test="request != null and request.customerDeptName != null and request.customerDeptName !=''">
             and customer_dept_name like concat('%',#{request.customerDeptName},'%')
         </if>
-        <if test="request.createUserName != null and request.createUserName !=''">
+        <if test="request != null and request.createUserName != null and request.createUserName !=''">
             and create_user_name like concat('%',#{request.createUserName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSealUseNoteMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSealUseNoteMapper.xml
index ab37bc1..b02bb33 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSealUseNoteMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSealUseNoteMapper.xml
@@ -29,32 +29,32 @@
     </sql>
 
     <select id="selectBatchForApprovalList" resultMap="BaseResultMap">
-        SELECT *
+        SELECT brsun.*, brsi.seal_name, brsi.seal_type, brsi.approver_name
         FROM biz_resource_seal_use_note brsun
         JOIN biz_resource_seal_info brsi ON brsun.seal_id = brsi.id
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and brsun.approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and brsun.create_user_id = #{request.createUserId}
         </if>
-        <if test="request.sealName != null and request.sealName !=''">
+        <if test="request != null and request.sealName != null and request.sealName !=''">
             and brsi.seal_name like concat('%',#{request.sealName},'%')
         </if>
-        <if test="request.sealType != null and request.sealType !=''">
+        <if test="request != null and request.sealType != null and request.sealType !=''">
             and brsi.seal_type = #{request.sealType}
         </if>
-        <if test="request.applyDeptName != null and request.applyDeptName !=''">
+        <if test="request != null and request.applyDeptName != null and request.applyDeptName !=''">
             and brsun.apply_dept_name like concat('%',#{request.applyDeptName},'%')
         </if>
-        <if test="request.applyUserName != null and request.applyUserName !=''">
+        <if test="request != null and request.applyUserName != null and request.applyUserName !=''">
             and brsun.apply_user_name like concat('%',#{request.applyUserName},'%')
         </if>
-        <if test="request.applyTimeStart != null and request.applyTimeStart !=''">
+        <if test="request != null and request.applyTimeStart != null and request.applyTimeStart !=''">
             and brsun.apply_time &gt;= #{request.applyTimeStart}
         </if>
-        <if test="request.applyTimeEnd != null and request.applyTimeEnd !=''">
+        <if test="request != null and request.applyTimeEnd != null and request.applyTimeEnd !=''">
             and brsun.apply_time &lt;= #{request.applyTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml
index 119bf7d..4f8392a 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml
@@ -31,6 +31,12 @@
         <if test="request.deptName != null and request.deptName !=''">
             and brsi.dept_name like concat('%',#{request.deptName},'%')
         </if>
+        <if test="request.ids != null">
+            and brsv.id in
+            <foreach collection="request.ids" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
         ORDER BY brsv.grant_date DESC
     </select>
 
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSupplierInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSupplierInfoMapper.xml
index fe8d399..e8ce7ef 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSupplierInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSupplierInfoMapper.xml
@@ -48,28 +48,28 @@
         SELECT *
         FROM biz_resource_supplier_info
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.supplierNo != null and request.supplierNo !=''">
+        <if test="request != null and request.supplierNo != null and request.supplierNo !=''">
             and supplier_no like concat('%',#{request.supplierNo},'%')
         </if>
-        <if test="request.supplierName != null and request.supplierName !=''">
+        <if test="request != null and request.supplierName != null and request.supplierName !=''">
             and supplier_name like concat('%',#{request.supplierName},'%')
         </if>
-        <if test="request.director != null and request.director !=''">
+        <if test="request != null and request.director != null and request.director !=''">
             and director like concat('%',#{request.director},'%')
         </if>
-        <if test="request.supplierType != null and request.supplierType !=''">
+        <if test="request != null and request.supplierType != null and request.supplierType !=''">
             and supplier_type = #{request.supplierType}
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/EnvLocationInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/EnvLocationInfoMapper.xml
new file mode 100644
index 0000000..68bcf10
--- /dev/null
+++ b/casic-metering-dao/src/main/resources/mapper/resource/EnvLocationInfoMapper.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.mapper.resource.EnvLocationInfoMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.resource.EnvLocationInfo">
+        <id column="id" property="id" />
+        <result column="location_no" property="locationNo" />
+        <result column="location_name" property="locationName" />
+        <result column="location_position" property="locationPosition" />
+        <result column="create_user_id" property="createUserId" />
+        <result column="create_user" property="createUser" />
+        <result column="create_time" property="createTime" />
+        <result column="update_time" property="updateTime" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, location_no, location_name, location_position, create_user_id, create_user, create_time, update_time
+    </sql>
+
+    <select id="selectLocationListPage" resultType="com.casic.missiles.dto.resource.environment.LocationListResponse">
+        SELECT *
+        FROM env_location_info
+        WHERE 1=1
+        <if test="request.locationNo != null and request.locationNo !=''">
+            AND location_no LIKE concat('%',#{request.locationNo},'%')
+        </if>
+        <if test="request.locationName != null and request.locationName !=''">
+            AND location_name LIKE concat('%',#{request.locationName},'%')
+        </if>
+        ORDER BY create_time DESC
+    </select>
+
+</mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml
index b28c18f..8854047 100644
--- a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml
@@ -11,7 +11,6 @@
         <result column="sign_desc" property="signDesc" />
         <result column="sign_director" property="signDirector" />
         <result column="sign_user_id" property="signUserId" />
-        <result column="sign_type" property="signType" />
         <result column="minio_file_name" property="minioFileName" />
         <result column="create_time" property="createTime" />
         <result column="update_time" property="updateTime" />
@@ -28,7 +27,6 @@
         <result column="sign_name" property="signName" />
         <result column="sign_desc" property="signDesc" />
         <result column="sign_director" property="signDirector" />
-        <result column="sign_type" property="signType" />
         <result column="sign_user_id" property="signUserId" />
         <result column="minio_file_name" property="minioFileName" />
         <result column="create_time" property="createTime" />
@@ -62,4 +60,58 @@
         JOIN system_sign_user_relation ssur ON ss.id = ssur.sign_id
         WHERE ssur.user_id = #{userId}
     </select>
+
+    <select id="selectSignListPage" resultMap="BaseResultMap">
+        SELECT ss.*, sd.SIMPLE_NAME AS deptName
+        FROM system_sign ss
+        LEFT JOIN sys_user su ON su.id = ss.sign_user_id
+        LEFT JOIN sys_dept sd ON sd.id = su.dept_id
+        WHERE 1=1
+        <if test="request.signNo != null and request.signNo !=''">
+            AND ss.sign_no LIKE concat('%',#{request.signNo},'%')
+        </if>
+        <if test="request.signName != null and request.signName !=''">
+            AND ss.sign_name LIKE concat('%',#{request.signName},'%')
+        </if>
+        <if test="request.signDirector != null and request.signDirector !=''">
+            AND ss.sign_director LIKE concat('%',#{request.signDirector},'%')
+        </if>
+        <if test="request.signUserId != null and request.signUserId !=''">
+            AND ss.sign_user_id = #{request.signUserId}
+        </if>
+        <if test="request.createStartTime != null and request.createStartTime !=''">
+            AND DATE_FORMAT(ss.create_time,'%Y-%m-%d') &gt;= DATE_FORMAT(#{request.createStartTime},'%Y-%m-%d')
+        </if>
+        <if test="request.createEndTime != null and request.createEndTime !=''">
+            AND DATE_FORMAT(ss.create_time,'%Y-%m-%d')  &lt;= DATE_FORMAT(#{request.createEndTime},'%Y-%m-%d')
+        </if>
+        ORDER BY ss.create_time DESC
+    </select>
+
+    <select id="selectSignList" resultMap="BaseResultMap">
+        SELECT ss.*, sd.SIMPLE_NAME AS deptName
+        FROM system_sign ss
+        LEFT JOIN sys_user su ON su.id = ss.sign_user_id
+        LEFT JOIN sys_dept sd ON sd.id = su.dept_id
+        WHERE 1=1
+        <if test="request.signNo != null and request.signNo !=''">
+            AND ss.sign_no LIKE concat('%',#{request.signNo},'%')
+        </if>
+        <if test="request.signName != null and request.signName !=''">
+            AND ss.sign_name LIKE concat('%',#{request.signName},'%')
+        </if>
+        <if test="request.signDirector != null and request.signDirector !=''">
+            AND ss.sign_director LIKE concat('%',#{request.signDirector},'%')
+        </if>
+        <if test="request.signUserId != null and request.signUserId !=''">
+            AND ss.sign_user_id = #{request.signUserId}
+        </if>
+        <if test="request.createStartTime != null and request.createStartTime !=''">
+            AND DATE_FORMAT(ss.create_time,'%Y-%m-%d') &gt;= DATE_FORMAT(#{request.createStartTime},'%Y-%m-%d')
+        </if>
+        <if test="request.createEndTime != null and request.createEndTime !=''">
+            AND DATE_FORMAT(ss.create_time,'%Y-%m-%d')  &lt;= DATE_FORMAT(#{request.createEndTime},'%Y-%m-%d')
+        </if>
+        ORDER BY ss.create_time DESC
+    </select>
 </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 515050a..60f530b 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
@@ -47,8 +47,8 @@
     String STORAGE_LOCATION = "bizStorageLocation";
     //计量专业
     String MEASURE_MAJOR = "bizMeasureMajor";
-    //管理状态
-    String MANAGER_STATE = "bizManagerState";
+    //标准装置管理状态
+    String STANDARD_MANAGER_STATE = "bizStandardManagerState";
 
     /**
      * 资源管理 字典code
@@ -95,8 +95,6 @@
     String MEASURE_STATUS = "measureStatus";
     //检定方式
     String MEASURE_TYPE = "measureType";
-    //标识打印标志类型
-    String IDENTIFY_PRINT_TYPE = "bizBusinessIdentify";
     //变更类型
     String REPORT_CHANGE_TYPE = "bizCertChangeType";
     //规模类型
@@ -111,19 +109,24 @@
     String MEASURE_CATEGORY = "measureCategory";
     //检定结果
     String MEASURE_RESULT = "measureResult";
+    //分包原因
+    String OUTSOURCE_REASON = "outsourceReason";
+
+    /**
+     * 系统管理
+     */
+    String TEMPLATE_TYPE = "templateType";
+
 
     /**
      * 标准装置 字典code
      */
     //类别
     String STANDARD_CATEGORY = "standardCategory";
-    //管理状态
-    String STANDARD_MANAGER_STATE = "standardManagerState";
     //标准等级
     String STANDARD_LEVEL = "standardLevel";
     //传递范围
     String STANDARD_TRANSMIT_RANGE = "transmitRange";
-
     //资本来源
     String CAPITAL_SOURCE = "capitalSource";
     //标准装置-申请类型
@@ -148,8 +151,6 @@
     String CERTIFICATE_CLASS = "certificationClass";
     //证书管理-检校专业
     String CALIBRATION_MAJOR = "calibrationMajor";
-    //分包原因
-    String OUTSOURCE_REASON = "outsourceReason";
 
     /**
      * 工作台
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/BaseApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/BaseApprovalListRequest.java
index 73c12c1..80d7424 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/BaseApprovalListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/BaseApprovalListRequest.java
@@ -6,6 +6,7 @@
 
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotEmpty;
+import java.util.List;
 
 /**
  * @Description:
@@ -19,14 +20,14 @@
      * 表单id
      */
     @NotBlank(message = "表单id不能为空")
-    @ApiModelProperty(value = "表单id（流程定义对应的表单id，等价于业务id）", dataType = "String")
+    @ApiModelProperty(value = "表单id（流程定义对应的表单id，等价于业务id），导出接口不用传", dataType = "String")
     private String formId;
 
     /**
      * 审批状态类型，对应ApprovalStatusEnum
      */
     @NotEmpty(message = "审批状态类型不能为空")
-    @ApiModelProperty(value = "审批状态类型code", dataType = "String")
+    @ApiModelProperty(value = "审批状态类型code，导出接口不用传", dataType = "String")
     private String approvalStatus;
 
     @ApiModelProperty(hidden = true)
@@ -34,4 +35,7 @@
 
     @ApiModelProperty(hidden = true)
     private Long createUserId;
+
+    @ApiModelProperty(value = "导出ids", dataType = "List")
+    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificatePrintApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificatePrintApprovalListRequest.java
index b93d1c9..3cc2f4e 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificatePrintApprovalListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificatePrintApprovalListRequest.java
@@ -5,8 +5,6 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import java.util.List;
-
 /**
  * @Description:
  * @Author: wangpeng
@@ -38,7 +36,4 @@
 
     @ApiModelProperty(value = "创建结束时间", dataType = "String")
     private String createTimeEnd;
-
-    @ApiModelProperty(value = "导出ids", dataType = "List")
-    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportApprovalListRequest.java
index 4f7a038..c115847 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportApprovalListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportApprovalListRequest.java
@@ -5,8 +5,6 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import java.util.List;
-
 /**
  * @Description:
  * @Author: wangpeng
@@ -15,6 +13,8 @@
 @ApiModel
 @Data
 public class CertificateReportApprovalListRequest extends BaseApprovalListRequest {
+    @ApiModelProperty(value = "委托方id", dataType = "String")
+    private Long customerId;
 
     @ApiModelProperty(value = "证书报告编号", dataType = "String")
     private String certificateReportNo;
@@ -37,6 +37,4 @@
     @ApiModelProperty(value = "检校结束时间", dataType = "String")
     private String calibrationTimeEnd;
 
-    @ApiModelProperty(value = "导出ids", dataType = "List")
-    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/identify/IdentifyListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/identify/IdentifyListRequest.java
index 1b87ae6..f019203 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/identify/IdentifyListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/identify/IdentifyListRequest.java
@@ -4,6 +4,8 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * @Description:
  * @Author: wangpeng
@@ -26,4 +28,7 @@
 
     @ApiModelProperty(value = "打印结束时间", dataType = "String")
     private String createTimeEnd;
+
+    @ApiModelProperty(value = "导出ids", dataType = "List")
+    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListRequest.java
index 1264883..62415fb 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListRequest.java
@@ -7,6 +7,7 @@
 import lombok.Data;
 
 import javax.validation.constraints.NotBlank;
+import java.util.List;
 
 @Data
 @ApiModel
@@ -37,4 +38,6 @@
     @ApiModelProperty(value = "是否加急（1是0否null全部）", dataType = "Integer")
     private String isUrgent;
 
+    @ApiModelProperty(value = "导出ids", dataType = "List")
+    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListRequest.java
index 5201d7b..499760a 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListRequest.java
@@ -17,6 +17,9 @@
     @ApiModelProperty(value = "任务单编号", dataType = "String")
     private String orderNo;
 
+    @ApiModelProperty(value = "委托方id", dataType = "Long")
+    private Long customerId;
+
     @ApiModelProperty(value = "委托方名称", dataType = "String")
     private String customerName;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OrderSampleDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OrderSampleDTO.java
new file mode 100644
index 0000000..796edc0
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OrderSampleDTO.java
@@ -0,0 +1,19 @@
+package com.casic.missiles.dto.business.outsource;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/8/24 11:38
+ */
+@ApiModel
+@Data
+public class OrderSampleDTO {
+    @ApiModelProperty(value = "任务单id", dataType = "Long")
+    private Long orderId;
+    @ApiModelProperty(value = "受检设备id", dataType = "Long")
+    private Long sampleId;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceAssessApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceAssessApprovalListRequest.java
new file mode 100644
index 0000000..9a930c3
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceAssessApprovalListRequest.java
@@ -0,0 +1,30 @@
+package com.casic.missiles.dto.business.outsource;
+
+import com.casic.missiles.dto.BaseApprovalListRequest;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/8/24 11:01
+ */
+@ApiModel
+@Data
+public class OutsourceAssessApprovalListRequest extends BaseApprovalListRequest {
+    @ApiModelProperty(value = "评审表编号", dataType = "String")
+    private String projectNo;
+
+    @ApiModelProperty(value = "分包机构名称", dataType = "String")
+    private String outsourcerName;
+
+    @ApiModelProperty(value = "申请人", dataType = "String")
+    private String applicantName;
+
+    @ApiModelProperty(value = "申请时间开始", dataType = "String")
+    private String applicantTimeStart;
+
+    @ApiModelProperty(value = "申请时间结束", dataType = "String")
+    private String applicantTimeEnd;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceAssessSaveResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceAssessSaveResponse.java
new file mode 100644
index 0000000..8bf9aad
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceAssessSaveResponse.java
@@ -0,0 +1,20 @@
+package com.casic.missiles.dto.business.outsource;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/8/14 16:17
+ */
+@ApiModel
+@Data
+public class OutsourceAssessSaveResponse {
+    @ApiModelProperty(value = "主键id", dataType = "Long")
+    private Long id;
+
+    @ApiModelProperty(value = "编号", dataType = "String")
+    private String projectNo;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProtocolApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProtocolApprovalListRequest.java
new file mode 100644
index 0000000..0f32331
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProtocolApprovalListRequest.java
@@ -0,0 +1,30 @@
+package com.casic.missiles.dto.business.outsource;
+
+import com.casic.missiles.dto.BaseApprovalListRequest;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/8/24 15:01
+ */
+@ApiModel
+@Data
+public class OutsourceProtocolApprovalListRequest extends BaseApprovalListRequest {
+    @ApiModelProperty(value = "协议书编号", dataType = "String")
+    private String protocolNo;
+
+    @ApiModelProperty(value = "分包方名称", dataType = "String")
+    private String outsourcerName;
+
+    @ApiModelProperty(value = "申请人", dataType = "String")
+    private String applicantName;
+
+    @ApiModelProperty(value = "申请时间开始", dataType = "String")
+    private String applicantTimeStart;
+
+    @ApiModelProperty(value = "申请时间结束", dataType = "String")
+    private String applicantTimeEnd;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProtocolSaveResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProtocolSaveResponse.java
new file mode 100644
index 0000000..e324967
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProtocolSaveResponse.java
@@ -0,0 +1,20 @@
+package com.casic.missiles.dto.business.outsource;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/8/14 16:17
+ */
+@ApiModel
+@Data
+public class OutsourceProtocolSaveResponse {
+    @ApiModelProperty(value = "主键id", dataType = "Long")
+    private Long id;
+
+    @ApiModelProperty(value = "编号", dataType = "String")
+    private String protocolNo;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveApprovalListRequest.java
index f29f4e4..7047c28 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveApprovalListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveApprovalListRequest.java
@@ -5,8 +5,6 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import java.util.List;
-
 /**
  * @Description: 现场检测审批列表请求实体
  * @Author: wangpeng
@@ -30,7 +28,4 @@
     @ApiModelProperty(value = "申请时间结束", dataType = "String")
     private String applyTimeEnd;
 
-    @ApiModelProperty(value = "导出ids", dataType = "List")
-    private List<Long> ids;
-
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveDetailResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveDetailResponse.java
index 1f28752..394c934 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveDetailResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveDetailResponse.java
@@ -12,6 +12,18 @@
     @ApiModelProperty(value = "id，更新/删除使用参数", dataType = "Long")
     private Long id;
 
+    @ApiModelProperty(value = "实验室代码(字典code)", dataType = "String")
+    private String labCode;
+
+    @ApiModelProperty(value = "实验室代码(字典value)", dataType = "String")
+    private String labCodeName;
+
+    @ApiModelProperty(value = "组别代码(字典code)", dataType = "String")
+    private String groupCode;
+
+    @ApiModelProperty(value = "组别代码(字典value)", dataType = "String")
+    private String groupCodeName;
+
     @ApiModelProperty(value = "审批编号", dataType = "String")
     private String siteExecutiveNo;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/environment/LocationListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/environment/LocationListRequest.java
new file mode 100644
index 0000000..13d03c3
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/environment/LocationListRequest.java
@@ -0,0 +1,20 @@
+package com.casic.missiles.dto.resource.environment;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/6/8 13:56
+ */
+@ApiModel
+@Data
+public class LocationListRequest {
+    @ApiModelProperty(value = "地点编号", dataType = "String")
+    private String locationNo;
+
+    @ApiModelProperty(value = "地点名称", dataType = "String")
+    private String locationName;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/environment/LocationListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/environment/LocationListResponse.java
new file mode 100644
index 0000000..4c531af
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/environment/LocationListResponse.java
@@ -0,0 +1,78 @@
+package com.casic.missiles.dto.resource.environment;
+
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
+import com.baomidou.mybatisplus.annotation.TableField;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description: 地点列表响应实体
+ * @Author: wangpeng
+ * @Date: 2023/6/8 13:53
+ */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
+@ApiModel
+@Data
+public class LocationListResponse {
+    @ApiModelProperty(value = "主键id", dataType = "Long")
+    private Long id;
+
+    /**
+     * 地点编号
+     */
+    @ExcelProperty("地点编号")
+    @ApiModelProperty(value = "地点编号", dataType = "String")
+    private String locationNo;
+
+    /**
+     * 地点名称
+     */
+    @ExcelProperty("地点名称")
+    @ApiModelProperty(value = "地点名称", dataType = "String")
+    private String locationName;
+
+    /**
+     * 地点位置
+     */
+    @ExcelProperty("地点位置")
+    @ApiModelProperty(value = "地点位置", dataType = "String")
+    private String locationPosition;
+
+    /**
+     * 创建人id
+     */
+    @ApiModelProperty(value = "创建人id", dataType = "Long")
+    private Long createUserId;
+
+    /**
+     * 创建人
+     */
+    @ExcelProperty("创建人")
+    @ApiModelProperty(value = "创建人", dataType = "String")
+    @TableField("create_user")
+    private String createUser;
+
+    /**
+     * 创建时间
+     */
+    @ExcelProperty("创建时间")
+    @ApiModelProperty(value = "创建时间", dataType = "String")
+    private String createTime;
+
+    /**
+     * 更新时间
+     */
+    @ApiModelProperty(value = "更新时间", dataType = "String")
+    private String updateTime;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertRequest.java
index 9a7f6c6..c827915 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertRequest.java
@@ -4,6 +4,8 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * @Description:
  * @Author: wangpeng
@@ -16,4 +18,7 @@
     private String name;
     @ApiModelProperty(value = "部门名", dataType = "String")
     private String deptName;
+
+    @ApiModelProperty(value = "导出ids", dataType = "List")
+    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertResponse.java
index f78b159..8f2f79e 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertResponse.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.dto.resource.staff;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.casic.missiles.annotation.DictCodeField;
 import com.casic.missiles.constants.MeterDictCode;
 import io.swagger.annotations.ApiModel;
@@ -13,12 +20,18 @@
  * @Author: wangpeng
  * @Date: 2023/7/27 15:13
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @ApiModel
 @Data
 public class StaffCertResponse {
     /**
      * 人员编号
      */
+    @ExcelProperty(value = "人员编号",order = 0)
     @NotEmpty(message = "人员编号不能为空")
     @ApiModelProperty(value = "人员编号", dataType = "String")
     private String staffNo;
@@ -26,6 +39,7 @@
     /**
      * 姓名
      */
+    @ExcelProperty(value = "姓名",order = 1)
     @ApiModelProperty(value = "姓名", dataType = "String")
     private String staffName;
 
@@ -54,6 +68,7 @@
     /**
      * 部门名字
      */
+    @ExcelProperty(value = "工作部门",order = 2)
     @ApiModelProperty(value = "部门名字", dataType = "String")
     private String deptName;
 
@@ -66,6 +81,7 @@
     /**
      * 计量专业
      */
+    @ExcelProperty(value = "计量专业",order = 3)
     @ApiModelProperty(value = "计量专业", dataType = "String")
     private String major;
 
@@ -110,6 +126,7 @@
     /**
      * 证书号
      */
+    @ExcelProperty(value = "证号",order = 4)
     @ApiModelProperty(value = "证书号", dataType = "String")
     private String certNo;
 
@@ -122,12 +139,14 @@
     /**
      * 有效日期
      */
+    @ExcelProperty(value = "证书有效期",order = 6)
     @ApiModelProperty(value = "有效日期", dataType = "String")
     private String effectiveDate;
 
     /**
      * 发放日期
      */
+    @ExcelProperty(value = "发证日期",order = 5)
     @ApiModelProperty(value = "发放日期", dataType = "String")
     private String grantDate;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffListRequest.java
index 7c4afb3..0a1194a 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffListRequest.java
@@ -4,6 +4,8 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * @Description:
  * @Author: wangpeng
@@ -18,4 +20,7 @@
     private String deptName;
     @ApiModelProperty(value = "部门id", dataType = "Long")
     private Long deptId;
+
+    @ApiModelProperty(value = "导出ids", dataType = "List")
+    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/TrainListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/TrainListRequest.java
index f68597b..6321f8b 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/TrainListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/TrainListRequest.java
@@ -14,6 +14,8 @@
 public class TrainListRequest {
     @ApiModelProperty(value = "训练登记表编号", dataType = "String")
     private String trainNo;
+    @ApiModelProperty(value = "值班领导", dataType = "String")
+    private String dutyLeader;
     @ApiModelProperty(value = "创建开始时间", dataType = "String")
     private String createTimeStart;
     @ApiModelProperty(value = "创建结束时间", dataType = "String")
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/SignAddRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/SignAddRequest.java
index 117be34..d71055c 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/SignAddRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/SignAddRequest.java
@@ -43,13 +43,6 @@
     private Long signUserId;
 
     /**
-     * 签章或签名-字典code
-     */
-    @NotBlank(message = "类型不能为空")
-    @ApiModelProperty(value = "签名/签章-字典code", dataType = "String", required = true)
-    private String signType;
-
-    /**
      * minio存储文件名
      */
     @ApiModelProperty(value = "上传文件返回名称", dataType = "String")
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateAddRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateAddRequest.java
index aff1265..6316648 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateAddRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateAddRequest.java
@@ -17,30 +17,28 @@
 @Data
 public class TemplateAddRequest extends BaseSystemRequest {
     /**
-     * 原始记录模板/证书报告模板名称
+     * 模板名称
      */
     @ApiModelProperty(value = "名称", dataType = "String", required = true)
     @NotBlank(message = "名称不能为空")
     private String templateName;
 
     /**
-     * 原始记录模板/证书报告模板描述
+     * 模板描述
      */
     @ApiModelProperty(value = "描述", dataType = "String")
     private String templateDesc;
 
     /**
-     * 原始记录模板/证书报告模板创建人
+     * 创建人
      */
     @ApiModelProperty(value = "创建人", dataType = "String", required = true)
     @NotBlank(message = "创建人不能为空")
     private String templateCreator;
 
-    /**
-     * 原始记录模板/证书报告模板-字典code
-     */
-    @NotBlank(message = "类型不能为空")
-    @ApiModelProperty(value = "原始记录模板/证书报告模板-字典code", dataType = "String", required = true)
+
+    @NotBlank(message = "模板类型不能为空")
+    @ApiModelProperty(value = "模板类型(字典code)", dataType = "String", required = true)
     private String templateType;
 
     /**
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateListRequest.java
index eec5a1e..6d17bbe 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateListRequest.java
@@ -1,11 +1,12 @@
 package com.casic.missiles.dto.system;
 
+import com.casic.missiles.annotation.DictCodeField;
+import com.casic.missiles.constants.MeterDictCode;
 import com.casic.missiles.dto.BaseSystemRequest;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import javax.validation.constraints.NotBlank;
 import java.util.List;
 
 /**
@@ -19,8 +20,8 @@
     /**
      * 类型
      */
-//    @ApiModelProperty(value = "类型-字典code", dataType = "String", required = true)
-    @NotBlank(message = "类型不能为空")
+    @DictCodeField(message = "模板类型不合法", cacheName = MeterDictCode.TEMPLATE_TYPE)
+    @ApiModelProperty(value = "模板类型(字典code)", dataType = "String")
     private String templateType;
 
     /**
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificateChangeApply.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificateChangeApply.java
index 9216308..36923fd 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificateChangeApply.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificateChangeApply.java
@@ -1,11 +1,19 @@
 package com.casic.missiles.model.business;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 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 com.casic.missiles.dto.BaseRequest;
+import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -20,6 +28,12 @@
  * @author wangpeng
  * @since 2023-08-15
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
+@ApiModel
 @Data
 @TableName("biz_business_certificate_change_apply")
 public class BizBusinessCertificateChangeApply extends BaseRequest implements Serializable {
@@ -33,6 +47,7 @@
     /**
      * 申请单编号
      */
+    @ExcelProperty(value = "申请单编号", order = 1)
     @ApiModelProperty(value = "申请单编号", dataType = "String")
     @TableField("change_apply_no")
     private String changeApplyNo;
@@ -40,6 +55,7 @@
     /**
      * 申请单名字
      */
+    @ExcelProperty(value = "申请单名称", order = 2)
     @ApiModelProperty(value = "申请单名字", dataType = "String")
     @TableField("change_apply_name")
     private String changeApplyName;
@@ -54,6 +70,7 @@
     /**
      * 更换证书编号
      */
+    @ExcelProperty(value = "更换证书编号", order = 3)
     @ApiModelProperty(value = "更换证书编号", dataType = "String")
     @TableField("change_report_no")
     private String changeReportNo;
@@ -61,7 +78,8 @@
     /**
      * 更换证书名字
      */
-    @ApiModelProperty(value = "更换证书名字", dataType = "String")
+    @ExcelProperty(value = "更换证书/报告名称", order = 4)
+    @ApiModelProperty(value = "更换证书/报告名称", dataType = "String")
     @TableField("change_report_name")
     private String changeReportName;
 
@@ -73,6 +91,7 @@
     @TableField("change_type")
     private String changeType;
 
+    @ExcelProperty(value = "变更类型", order = 5)
     @ApiModelProperty(value = "变更类型(字典value)", dataType = "String")
     @TableField(exist = false)
     private String changeTypeName;
@@ -142,13 +161,15 @@
     /**
      * 创建用户名字
      */
-    @ApiModelProperty(value = "创建用户名字", dataType = "String")
+    @ExcelProperty(value = "创建人", order = 6)
+    @ApiModelProperty(value = "创建人名字", dataType = "String")
     @TableField("create_user_name")
     private String createUserName;
 
     /**
      * 创建时间
      */
+    @ExcelProperty(value = "创建时间", order = 7)
     @ApiModelProperty(value = "创建时间", dataType = "String")
     @TableField("create_time")
     private String createTime;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificateReport.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificateReport.java
index f01db9e..db06018 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificateReport.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificateReport.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.model.business;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -22,6 +29,11 @@
  * @author wangpeng
  * @since 2023-08-14
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @ApiModel
 @Data
 @TableName("biz_business_certificate_report")
@@ -36,6 +48,7 @@
     /**
      * 证书报告编号
      */
+    @ExcelProperty(value = "证书报告编号", order = 1)
     @ApiModelProperty(value = "证书报告编号", dataType = "String")
     @TableField("certificate_report_no")
     private String certificateReportNo;
@@ -43,6 +56,7 @@
     /**
      * 证书报告名称
      */
+    @ExcelProperty(value = "证书报告名称", order = 2)
     @ApiModelProperty(value = "证书报告名称", dataType = "String")
     @TableField("certificate_report_name")
     private String certificateReportName;
@@ -62,6 +76,7 @@
     @TableField("measure_category")
     private String measureCategory;
 
+    @ExcelProperty(value = "检校类别", order = 6)
     @ApiModelProperty(value = "检校类别(字典value)", dataType = "String")
     @TableField(exist = false)
     private String measureCategoryName;
@@ -69,6 +84,7 @@
     /**
      * 检校时间
      */
+    @ExcelProperty(value = "检校时间", order = 8)
     @ApiModelProperty(value = "检校时间", dataType = "String")
     @TableField("calibration_time")
     private String calibrationTime;
@@ -267,18 +283,22 @@
     @TableField(exist = false)
     private Integer decisionItem;
 
-    @ApiModelProperty(value = "设备样品编号（列表返回参数）", dataType = "String")
+    @ExcelProperty(value = "被检设备统一编号", order = 3)
+    @ApiModelProperty(value = "被检设备统一编号（列表返回参数）", dataType = "String")
     @TableField(exist = false)
     private String sampleNo;
 
-    @ApiModelProperty(value = "设备样品名称（列表返回参数）", dataType = "String")
+    @ExcelProperty(value = "被检设备名称", order = 4)
+    @ApiModelProperty(value = "被检设备名称（列表返回参数）", dataType = "String")
     @TableField(exist = false)
     private String sampleName;
 
-    @ApiModelProperty(value = "设备样品规格型号（列表返回参数）", dataType = "String")
+    @ExcelProperty(value = "规格型号", order = 5)
+    @ApiModelProperty(value = "规格型号（列表返回参数）", dataType = "String")
     @TableField(exist = false)
     private String sampleModel;
 
+    @ExcelProperty(value = "检定员", order = 7)
     @ApiModelProperty(value = "检定员名字（列表返回参数）", dataType = "String")
     @TableField(exist = false)
     private String staffName;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessIdentifyInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessIdentifyInfo.java
index 46bfba5..f1a9bec 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessIdentifyInfo.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessIdentifyInfo.java
@@ -1,10 +1,15 @@
 package com.casic.missiles.model.business;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 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;
 
@@ -20,6 +25,11 @@
  * @author wangpeng
  * @since 2023-08-15
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @Data
 @TableName("biz_business_identify_info")
 public class BizBusinessIdentifyInfo implements Serializable {
@@ -33,6 +43,7 @@
     /**
      * 记录编号
      */
+    @ExcelProperty(value = "记录编号", order = 1)
     @ApiModelProperty(value = "记录编号", dataType = "String")
     @TableField("record_no")
     private String recordNo;
@@ -41,20 +52,15 @@
      * 标志类型(字典code)
      */
     @NotEmpty(message = "标志类型不能为空")
-    @ApiModelProperty(value = "标志类型(字典code)", dataType = "String")
-    @DictCodeField(message = "标志类型不合法", cacheName = MeterDictCode.IDENTIFY_PRINT_TYPE)
+    @ApiModelProperty(value = "标志类型(直接存计量标识/使用状态/校准状态的字典value)", dataType = "String")
     @TableField("identify_type")
     private String identifyType;
 
-    @ApiModelProperty(value = "标志类型(字典value)", dataType = "String")
-    @TableField(exist = false)
-    private String identifyTypeName;
-
     /**
      * 设备id(可以是受检设备/设备台账)
      */
     @NotNull(message = "设备id不能为空")
-    @ApiModelProperty(value = "设备id(可以是受检设备/设备台账)", dataType = "String")
+    @ApiModelProperty(value = "设备id(可以是受检设备/设备台账)", dataType = "Long")
     @TableField("device_id")
     private Long deviceId;
 
@@ -66,29 +72,32 @@
     @TableField("device_type")
     private String deviceType;
 
+    @ExcelProperty(value = "统一编号", order = 3)
     @NotEmpty(message = "设备编号不能为空")
-    @ApiModelProperty(value = "设备编号", dataType = "String")
+    @ApiModelProperty(value = "统一编号", dataType = "String")
     @TableField("device_no")
     private String deviceNo;
 
     /**
      * 设备名字
      */
-    @NotEmpty(message = "设备名字不能为空")
-    @ApiModelProperty(value = "设备名字", dataType = "String")
+    @ExcelProperty(value = "设备名称", order = 4)
+    @NotEmpty(message = "设备名称不能为空")
+    @ApiModelProperty(value = "设备名称", dataType = "String")
     @TableField("device_name")
     private String deviceName;
 
     /**
      * 检定员id
      */
-    @ApiModelProperty(value = "检定员id", dataType = "String")
+    @ApiModelProperty(value = "检定员id", dataType = "Long")
     @TableField("measure_person_id")
     private Long measurePersonId;
 
     /**
      * 检定员名字
      */
+    @ExcelProperty(value = "检定员", order = 5)
     @ApiModelProperty(value = "检定员名字", dataType = "String")
     @TableField("measure_person")
     private String measurePerson;
@@ -103,7 +112,8 @@
     /**
      * 更新时间
      */
-    @ApiModelProperty(value = "更新时间", dataType = "String")
+    @ExcelProperty(value = "打印时间", order = 6)
+    @ApiModelProperty(value = "打印时间", dataType = "String")
     @TableField("update_time")
     private String updateTime;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceAssess.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceAssess.java
index 659d9ca..6720b90 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceAssess.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceAssess.java
@@ -1,11 +1,26 @@
 package com.casic.missiles.model.business;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 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 com.casic.missiles.dto.BaseRequest;
+import com.casic.missiles.dto.business.outsource.OrderSampleDTO;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import javax.validation.constraints.NotEmpty;
 import java.io.Serializable;
+import java.util.List;
 
 /**
  * <p>
@@ -15,146 +30,231 @@
  * @author wangpeng
  * @since 2023-08-16
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
+@ApiModel
 @Data
 @TableName("biz_business_outsource_assess")
-public class BizBusinessOutsourceAssess implements Serializable {
+public class BizBusinessOutsourceAssess extends BaseRequest implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
+    @ApiModelProperty(value = "id，更新/删除使用参数", dataType = "Long")
     @TableId("id")
     private Long id;
 
     /**
      * 评审表编号
      */
+    @ExcelProperty(value = "评审表编号", order = 1)
+    @ApiModelProperty(value = "评审表编号(后台生成)", dataType = "String")
     @TableField("project_no")
     private String projectNo;
 
     /**
      * 评审表名称
      */
+    @ExcelProperty(value = "评审表名称", order = 2)
+    @ApiModelProperty(value = "评审表名称", dataType = "String")
     @TableField("project_name")
     private String projectName;
 
+    @NotEmpty(message = "实验室代码不能为空")
+    @DictCodeField(message = "实验室代码描述不合法", cacheName = MeterDictCode.LAB_CODE)
+    @ApiModelProperty(value = "实验室代码(字典code)", dataType = "String")
+    @TableField("lab_code")
+    private String labCode;
+
+    @ApiModelProperty(value = "实验室代码(字典value)", dataType = "String")
+    @TableField(exist = false)
+    private String labCodeName;
+
+    /**
+     * 组别代码
+     */
+    @NotEmpty(message = "组别代码不能为空")
+    @DictCodeField(message = "组别代码描述不合法", cacheName = MeterDictCode.GROUP_CODE)
+    @ApiModelProperty(value = "组别代码(字典code)", dataType = "String")
+    @TableField("group_code")
+    private String groupCode;
+
+    @ApiModelProperty(value = "组别代码(字典value)", dataType = "String")
+    @TableField(exist = false)
+    private String groupCodeName;
+
     /**
      * 申请人id
      */
+    @ApiModelProperty(value = "申请人id", dataType = "String")
     @TableField("applicant_id")
     private Long applicantId;
 
     /**
      * 申请人名字
      */
+    @ExcelProperty(value = "申请人", order = 5)
+    @ApiModelProperty(value = "申请人", dataType = "String")
     @TableField("applicant_name")
     private String applicantName;
 
     /**
      * 申请时间
      */
+    @ExcelProperty(value = "申请时间", order = 6)
+    @ApiModelProperty(value = "申请时间", dataType = "String")
     @TableField("applicant_time")
     private String applicantTime;
 
     /**
      * 附件(minio存储文件名)
      */
+    @ApiModelProperty(value = "附件(minio存储文件名)", dataType = "String")
     @TableField("minio_file_name")
     private String minioFileName;
 
     /**
      * 备注
      */
+    @ApiModelProperty(value = "备注", dataType = "String")
     @TableField("remark")
     private String remark;
 
     /**
      * 创建人id
      */
+    @ApiModelProperty(value = "创建人id", dataType = "String")
     @TableField("create_user_id")
     private Long createUserId;
 
     /**
      * 创建人名字
      */
+    @ApiModelProperty(value = "创建人名字", dataType = "String")
     @TableField("create_user_name")
     private String createUserName;
 
     /**
      * 分包方id
      */
+    @ApiModelProperty(value = "评审表编号", dataType = "String")
     @TableField("outsourcer_id")
     private Long outsourcerId;
 
     /**
      * 预计开始时间
      */
+    @ApiModelProperty(value = "预计开始时间", dataType = "String")
     @TableField("pre_start_time")
     private String preStartTime;
 
     /**
      * 预计结束时间
      */
+    @ApiModelProperty(value = "预计结束时间", dataType = "String")
     @TableField("pre_end_time")
     private String preEndTime;
 
     /**
      * 分包原因-字典
      */
+    @ApiModelProperty(value = "分包原因(字典code)", dataType = "String")
+    @DictCodeField(message = "分包原因描述不合法", cacheName = MeterDictCode.OUTSOURCE_REASON)
     @TableField("outsource_reason")
     private String outsourceReason;
 
+    @ApiModelProperty(value = "分包原因(字典value)", dataType = "String")
+    @TableField(exist = false)
+    private String outsourceReasonName;
+
     /**
      * 预计费用
      */
+    @ApiModelProperty(value = "预计费用", dataType = "String")
     @TableField("pre_cost")
     private String preCost;
 
     /**
      * 审批状态
      */
+    @ApiModelProperty(value = "审批状态", dataType = "String")
+    @DictCodeField(message = "审批状态描述不合法", cacheName = MeterDictCode.APPROVAL_STATUS)
     @TableField("approval_status")
     private String approvalStatus;
 
     /**
      * 流程实例id
      */
+    @ApiModelProperty(value = "流程实例id", dataType = "String")
     @TableField("process_id")
     private String processId;
 
     /**
      * 实验室认可情况
      */
+    @ApiModelProperty(value = "实验室认可情况", dataType = "String")
     @TableField("approve_situation")
     private String approveSituation;
 
     /**
      * 溯源性
      */
+    @ApiModelProperty(value = "溯源性", dataType = "String")
     @TableField("traceability")
     private String traceability;
 
     /**
      * 测试方法
      */
+    @ApiModelProperty(value = "测试方法", dataType = "String")
     @TableField("test_method")
     private String testMethod;
 
     /**
      * 技术能力
      */
+    @ApiModelProperty(value = "技术能力", dataType = "String")
     @TableField("technique_ability")
     private String techniqueAbility;
 
     /**
      * 创建时间
      */
+    @ApiModelProperty(hidden = true)
     @TableField("create_time")
     private String createTime;
 
     /**
      * 更新时间
      */
+    @ApiModelProperty(hidden = true)
     @TableField("update_time")
     private String updateTime;
 
+    @ApiModelProperty(value = "审批状态类型-字典value", dataType = "String")
+    @TableField(exist = false)
+    private String approvalStatusName;
 
+    @ApiModelProperty(value = "任务id（同意、驳回等操作使用）", dataType = "String")
+    @TableField(exist = false)
+    private String taskId;
+
+    @ApiModelProperty(value = "可选决策项（1同意驳回拒绝 2同意驳回 3同意拒绝，用于待审批列表同意/驳回/拒绝按钮展示）", dataType = "Integer")
+    @TableField(exist = false)
+    private Integer decisionItem;
+
+    @NotEmpty(message = "受检设备信息不能为空")
+    @ApiModelProperty(value = "受检设备id列表（新建使用参数）", dataType = "List")
+    @TableField(exist = false)
+    private List<OrderSampleDTO> orderSampleList;
+
+    @ExcelProperty(value = "分包机构名称", order = 3)
+    @ApiModelProperty(value = "分包机构名称（列表返回参数）", dataType = "String")
+    private String outsourcerName;
+
+    @ExcelProperty(value = "机构负责人", order = 4)
+    @ApiModelProperty(value = "机构负责人（列表返回参数）", dataType = "String")
+    private String director;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceProtocol.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceProtocol.java
new file mode 100644
index 0000000..38df697
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceProtocol.java
@@ -0,0 +1,225 @@
+package com.casic.missiles.model.business;
+
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
+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 com.casic.missiles.dto.BaseRequest;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotEmpty;
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 计量检定业务-分包管理-测试、校准或检定工作分包协议书
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-08-24
+ */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
+@Data
+@TableName("biz_business_outsource_protocol")
+public class BizBusinessOutsourceProtocol extends BaseRequest implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "id，更新/删除使用参数", dataType = "Long")
+    @TableId("id")
+    private Long id;
+
+    /**
+     * 协议书编号
+     */
+    @ExcelProperty(value = "协议书编号", order = 1)
+    @ApiModelProperty(value = "协议书编号(后台生成)", dataType = "String")
+    @TableField("protocol_no")
+    private String protocolNo;
+
+    /**
+     * 协议书名称
+     */
+    @ExcelProperty(value = "协议书名称", order = 2)
+    @ApiModelProperty(value = "协议书名称", dataType = "String")
+    @TableField("project_name")
+    private String projectName;
+
+    @NotEmpty(message = "实验室代码不能为空")
+    @DictCodeField(message = "实验室代码描述不合法", cacheName = MeterDictCode.LAB_CODE)
+    @ApiModelProperty(value = "实验室代码(字典code)", dataType = "String")
+    @TableField("lab_code")
+    private String labCode;
+
+    @ApiModelProperty(value = "实验室代码(字典value)", dataType = "String")
+    @TableField(exist = false)
+    private String labCodeName;
+
+    @NotEmpty(message = "组别代码不能为空")
+    @DictCodeField(message = "组别代码描述不合法", cacheName = MeterDictCode.GROUP_CODE)
+    @ApiModelProperty(value = "组别代码(字典code)", dataType = "String")
+    @TableField("group_code")
+    private String groupCode;
+
+    @ApiModelProperty(value = "组别代码(字典value)", dataType = "String")
+    @TableField(exist = false)
+    private String groupCodeName;
+
+    /**
+     * 分包方id
+     */
+    @ApiModelProperty(value = "分包方id", dataType = "Long")
+    @TableField("outsourcer_id")
+    private Long outsourcerId;
+
+    /**
+     * 其他
+     */
+    @ApiModelProperty(value = "其他", dataType = "String")
+    @TableField("remark")
+    private String remark;
+
+    /**
+     * 分包方编号
+     */
+    @ApiModelProperty(value = "分包方编号(新建不用传)", dataType = "String")
+    @TableField("outsource_no")
+    private String outsourceNo;
+
+    /**
+     * 分包方名称
+     */
+    @ExcelProperty(value = "分包方名称", order = 3)
+    @ApiModelProperty(value = "分包方名称(新建不用传)", dataType = "String")
+    @TableField("outsource_name")
+    private String outsourceName;
+
+    /**
+     * 联系人
+     */
+    @ExcelProperty(value = "联系人", order = 4)
+    @ApiModelProperty(value = "联系人", dataType = "String")
+    @TableField("contacts")
+    private String contacts;
+
+    /**
+     * 电话
+     */
+    @ApiModelProperty(value = "电话", dataType = "String")
+    @TableField("mobile")
+    private String mobile;
+
+    /**
+     * 地址
+     */
+    @ApiModelProperty(value = "地址", dataType = "String")
+    @TableField("address")
+    private String address;
+
+    /**
+     * 要求完成日期
+     */
+    @ApiModelProperty(value = "要求完成日期", dataType = "String")
+    @TableField("require_date")
+    private String requireDate;
+
+    /**
+     * 分包费用(元)
+     */
+    @ApiModelProperty(value = "分包费用(元)", dataType = "String")
+    @TableField("outsource_cost")
+    private Double outsourceCost;
+
+    /**
+     * 分包方负责人
+     */
+    @ApiModelProperty(value = "分包方负责人", dataType = "String")
+    @TableField("director")
+    private String director;
+
+    /**
+     * 分包项目
+     */
+    @ApiModelProperty(value = "分包项目", dataType = "String")
+    @TableField("item")
+    private String item;
+
+    /**
+     * 分包要求
+     */
+    @ApiModelProperty(value = "分包要求", dataType = "String")
+    @TableField("requires")
+    private String requires;
+
+    /**
+     * 创建人id
+     */
+    @ApiModelProperty(hidden = true)
+    @TableField("create_user_id")
+    private Long createUserId;
+
+    /**
+     * 创建人名字
+     */
+    @ExcelProperty(value = "申请人", order = 5)
+    @ApiModelProperty(value = "申请人", dataType = "String")
+    @TableField("create_user_name")
+    private String createUserName;
+
+    /**
+     * 审批状态
+     */
+    @ApiModelProperty(value = "审批状态", dataType = "String")
+    @DictCodeField(message = "审批状态描述不合法", cacheName = MeterDictCode.APPROVAL_STATUS)
+    @TableField("approval_status")
+    private String approvalStatus;
+
+    /**
+     * 流程实例id
+     */
+    @ApiModelProperty(value = "流程实例id", dataType = "String")
+    @TableField("process_id")
+    private String processId;
+
+    /**
+     * 创建时间
+     */
+    @ExcelProperty(value = "申请时间", order = 6)
+    @ApiModelProperty(value = "申请时间", dataType = "String")
+    @TableField("create_time")
+    private String createTime;
+
+    /**
+     * 更新时间
+     */
+    @ApiModelProperty(hidden = true)
+    @TableField("update_time")
+    private String updateTime;
+
+    @ApiModelProperty(value = "审批状态类型-字典value", dataType = "String")
+    @TableField(exist = false)
+    private String approvalStatusName;
+
+    @ApiModelProperty(value = "任务id（同意、驳回等操作使用）", dataType = "String")
+    @TableField(exist = false)
+    private String taskId;
+
+    @ApiModelProperty(value = "可选决策项（1同意驳回拒绝 2同意驳回 3同意拒绝，用于待审批列表同意/驳回/拒绝按钮展示）", dataType = "Integer")
+    @TableField(exist = false)
+    private Integer decisionItem;
+
+
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourcerInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourcerInfo.java
index ec4e997..f9aa69e 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourcerInfo.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourcerInfo.java
@@ -17,6 +17,7 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import javax.validation.constraints.NotEmpty;
 import java.io.Serializable;
 
 /**
@@ -59,6 +60,29 @@
     @TableField("outsourcer_name")
     private String outsourcerName;
 
+    @NotEmpty(message = "实验室代码不能为空")
+    @DictCodeField(message = "实验室代码描述不合法", cacheName = MeterDictCode.LAB_CODE)
+    @ApiModelProperty(value = "实验室代码(字典code)", dataType = "String")
+    @TableField("lab_code")
+    private String labCode;
+
+    @ApiModelProperty(value = "实验室代码(字典value)", dataType = "String")
+    @TableField(exist = false)
+    private String labCodeName;
+
+    /**
+     * 组别代码
+     */
+    @NotEmpty(message = "组别代码不能为空")
+    @DictCodeField(message = "组别代码描述不合法", cacheName = MeterDictCode.GROUP_CODE)
+    @ApiModelProperty(value = "组别代码(字典code)", dataType = "String")
+    @TableField("group_code")
+    private String groupCode;
+
+    @ApiModelProperty(value = "组别代码(字典value)", dataType = "String")
+    @TableField(exist = false)
+    private String groupCodeName;
+
     /**
      * 单位简称
      */
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardInfo.java
index c48eed7..dffdfdd 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardInfo.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardInfo.java
@@ -5,6 +5,7 @@
 import com.baomidou.mybatisplus.annotation.TableName;
 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;
 
@@ -18,6 +19,7 @@
  * @author wangpeng
  * @since 2023-08-04
  */
+@ApiModel
 @Data
 @TableName("biz_equipment_standard_info")
 public class BizEquipmentStandardInfo implements Serializable {
@@ -119,7 +121,7 @@
      * 管理状态(字典code)
      */
     @ApiModelProperty(value = "管理状态(字典code)", dataType = "String")
-    @DictCodeField(message = "管理状态不合法", cacheName = MeterDictCode.MANAGER_STATE)
+    @DictCodeField(message = "管理状态不合法", cacheName = MeterDictCode.STANDARD_MANAGER_STATE)
     @TableField("manage_status")
     private String manageStatus;
 
@@ -151,7 +153,7 @@
     /**
      * 温度(℃)
      */
-    @ApiModelProperty(value = "使用状态(字典code)", dataType = "String")
+    @ApiModelProperty(value = "温度(℃)", dataType = "String")
     @TableField("temperature")
     private Double temperature;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardInfoApproval.java b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardInfoApproval.java
index dbd86ab..9f58d83 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardInfoApproval.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardInfoApproval.java
@@ -150,7 +150,7 @@
      * 管理状态(字典code)
      */
     @ApiModelProperty(value = "管理状态(字典code)", dataType = "String")
-    @DictCodeField(message = "管理状态不合法", cacheName = MeterDictCode.MANAGER_STATE)
+    @DictCodeField(message = "管理状态不合法", cacheName = MeterDictCode.STANDARD_MANAGER_STATE)
     @TableField("manage_status")
     private String manageStatus;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardTechnologyRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardTechnologyRelation.java
index 0e612bd..751f26b 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardTechnologyRelation.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardTechnologyRelation.java
@@ -3,6 +3,7 @@
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -16,6 +17,7 @@
  * @author wangpeng
  * @since 2023-08-04
  */
+@ApiModel
 @Data
 @TableName("biz_equipment_standard_technology_relation")
 public class BizEquipmentStandardTechnologyRelation implements Serializable {
@@ -33,6 +35,10 @@
     @TableField("technology_file_id")
     private Long technologyFileId;
 
+    @ApiModelProperty(value = "依据的技术文件编号", dataType = "String")
+    @TableField("technology_file_no")
+    private String technologyFileNo;
+
     /**
      * 依据的技术文件名称(技术文件中现行测试校准检定方法表文件名字段)
      */
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerInfo.java
index d6e8bed..65cd6bc 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerInfo.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerInfo.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.model.resource;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -21,6 +28,11 @@
  * @author wangpeng
  * @since 2023-08-08
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @ApiModel
 @Data
 @TableName("biz_resource_customer_info")
@@ -35,6 +47,7 @@
     /**
      * 委托方编号
      */
+    @ExcelProperty(value = "委托方编号", order = 1)
     @ApiModelProperty(value = "委托方编号", dataType = "String")
     @TableField("customer_no")
     private String customerNo;
@@ -42,6 +55,7 @@
     /**
      * 委托方名称
      */
+    @ExcelProperty(value = "委托方名称", order = 2)
     @ApiModelProperty(value = "委托方名称(新建时为下拉选择一个受检单位组织的名字，传deptId字段，后端获取名称)", dataType = "String")
     @TableField("customer_name")
     private String customerName;
@@ -63,6 +77,7 @@
     /**
      * 联系人
      */
+    @ExcelProperty(value = "联系人", order = 3)
     @ApiModelProperty(value = "联系人", dataType = "String")
     @TableField("contacts")
     private String contacts;
@@ -70,6 +85,7 @@
     /**
      * 座机电话
      */
+    @ExcelProperty(value = "座机电话", order = 4)
     @ApiModelProperty(value = "座机电话", dataType = "String")
     @TableField("mobile")
     private String mobile;
@@ -77,6 +93,7 @@
     /**
      * 手机号码
      */
+    @ExcelProperty(value = "手机号码", order = 5)
     @ApiModelProperty(value = "手机号码", dataType = "String")
     @TableField("phone")
     private String phone;
@@ -91,6 +108,7 @@
     /**
      * 地址
      */
+    @ExcelProperty(value = "地址", order = 6)
     @ApiModelProperty(value = "地址", dataType = "String")
     @TableField("address")
     private String address;
@@ -141,6 +159,7 @@
     /**
      * 创建时间
      */
+    @ExcelProperty(value = "创建时间", order = 7)
     @ApiModelProperty(value = "创建时间", dataType = "String")
     @TableField("create_time")
     private String createTime;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerSuggestForm.java b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerSuggestForm.java
index 7201bbd..701bf8b 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerSuggestForm.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerSuggestForm.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.model.resource;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -22,6 +29,11 @@
  * @author wangpeng
  * @since 2023-08-08
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @ApiModel
 @Data
 @TableName("biz_resource_customer_suggest_form")
@@ -44,7 +56,8 @@
     /**
      * 委托方名称
      */
-    @ApiModelProperty(value = "委托方名称", dataType = "String")
+    @ExcelProperty(value = "意见反馈单位", order = 2)
+    @ApiModelProperty(value = "意见反馈单位", dataType = "String")
     @TableField("customer_name")
     private String customerName;
 
@@ -59,7 +72,8 @@
     /**
      * 委托方意见反馈部门名称
      */
-    @ApiModelProperty(value = "委托方意见反馈部门名称", dataType = "String")
+    @ExcelProperty(value = "委托方意见反馈部门", order = 3)
+    @ApiModelProperty(value = "委托方意见反馈部门", dataType = "String")
     @TableField("customer_dept_name")
     private String customerDeptName;
 
@@ -73,6 +87,7 @@
     /**
      * 表单编号
      */
+    @ExcelProperty(value = "表单编号", order = 1)
     @ApiModelProperty(value = "表单编号", dataType = "String")
     @TableField("form_no")
     private String formNo;
@@ -111,6 +126,7 @@
     /**
      * 创建人名字
      */
+    @ExcelProperty(value = "创建人", order = 4)
     @ApiModelProperty(value = "创建人名字", dataType = "String")
     @TableField("create_user_name")
     private String createUserName;
@@ -147,6 +163,7 @@
     /**
      * 创建时间
      */
+    @ExcelProperty(value = "创建时间", order = 5)
     @ApiModelProperty(value = "创建时间", dataType = "String")
     @TableField("create_time")
     private String createTime;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSealInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSealInfo.java
index cbf05d7..9bf389d 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSealInfo.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSealInfo.java
@@ -106,6 +106,10 @@
     @TableField("minio_file_name")
     private String minioFileName;
 
+    @ApiModelProperty(value = "minio存储文件url", dataType = "String")
+    @TableField(exist = false)
+    private String minioFileUrl;
+
     @ApiModelProperty(value = "创建时间", dataType = "String")
     @TableField("create_time")
     private String createTime;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSealUseNote.java b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSealUseNote.java
index 3f2d9e8..3ce16a8 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSealUseNote.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSealUseNote.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.model.resource;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -20,6 +27,11 @@
  * @author wangpeng
  * @since 2023-07-28
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @ApiModel
 @Data
 @TableName("biz_resource_seal_use_note")
@@ -34,6 +46,7 @@
     /**
      * 登记表编号
      */
+    @ExcelProperty(value = "申请单编号", order = 1)
     @ApiModelProperty(value = "登记表编号(自动生成)", dataType = "String")
     @TableField("note_form_no")
     private String noteFormNo;
@@ -55,6 +68,7 @@
     /**
      * 申请部门
      */
+    @ExcelProperty(value = "申请部门", order = 5)
     @ApiModelProperty(value = "申请部门", dataType = "String")
     @TableField("apply_dept_name")
     private String applyDeptName;
@@ -69,6 +83,7 @@
     /**
      * 申请人
      */
+    @ExcelProperty(value = "申请人", order = 6)
     @ApiModelProperty(value = "申请人", dataType = "String")
     @TableField("apply_user_name")
     private String applyUserName;
@@ -76,6 +91,7 @@
     /**
      * 申请时间
      */
+    @ExcelProperty(value = "申请时间", order = 7)
     @ApiModelProperty(value = "申请时间(新增自动获取当前时间)", dataType = "String")
     @TableField("apply_time")
     private String applyTime;
@@ -130,6 +146,26 @@
     @TableField("update_time")
     private String updateTime;
 
+    @ExcelProperty(value = "印章名称", order = 2)
+    @ApiModelProperty(value = "印章名称(列表返回参数)", dataType = "String")
+    @TableField(exist = false)
+    private String sealName;
+
+    @DictCodeField(message = "印章类型描述不合法", cacheName = MeterDictCode.SEAL_TYPE)
+    @ApiModelProperty(hidden = true)
+    @TableField(exist = false)
+    private String sealType;
+
+    @ExcelProperty(value = "印章类型", order = 3)
+    @ApiModelProperty(value = "印章类型(列表返回参数)", dataType = "String")
+    @TableField(exist = false)
+    private String sealTypeName;
+
+    @ExcelProperty(value = "批准人", order = 4)
+    @ApiModelProperty(value = "批准人(列表返回参数)", dataType = "String")
+    @TableField(exist = false)
+    private String approverName;
+
     @ApiModelProperty(value = "审批状态类型-字典value", dataType = "String")
     @TableField(exist = false)
     private String approvalStatusName;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceStaffInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceStaffInfo.java
index 5ef995b..41563a1 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceStaffInfo.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceStaffInfo.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.model.resource;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -20,6 +27,11 @@
  * @author wangpeng
  * @since 2023-07-25
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @ApiModel
 @Data
 @TableName("biz_resource_staff_info")
@@ -38,6 +50,7 @@
     /**
      * 人员编号
      */
+    @ExcelProperty(value = "人员编号",order = 0)
     @NotEmpty(message = "人员编号不能为空")
     @ApiModelProperty(value = "人员编号", dataType = "String")
     @TableField("staff_no")
@@ -46,6 +59,7 @@
     /**
      * 姓名
      */
+    @ExcelProperty(value = "姓名",order = 1)
     @ApiModelProperty(value = "姓名", dataType = "String")
     @TableField("staff_name")
     private String staffName;
@@ -152,13 +166,15 @@
     /**
      * 部门名字
      */
-    @ApiModelProperty(value = "部门名字", dataType = "String")
+    @ExcelProperty(value = "工作部门",order = 4)
+    @ApiModelProperty(value = "工作部门", dataType = "String")
     @TableField("dept_name")
     private String deptName;
 
     /**
      * 岗位
      */
+    @ExcelProperty(value = "岗位",order = 2)
     @ApiModelProperty(value = "岗位", dataType = "String")
     @TableField("station")
     private String station;
@@ -166,6 +182,7 @@
     /**
      * 计量专业
      */
+    @ExcelProperty(value = "计量专业",order = 5)
     @ApiModelProperty(value = "计量专业", dataType = "String")
     @TableField("major")
     private String major;
@@ -173,6 +190,7 @@
     /**
      * 证号
      */
+    @ExcelProperty(value = "证号",order = 3)
     @ApiModelProperty(value = "证号", dataType = "String")
     @TableField("certificate_number")
     private String certificateNumber;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSupplierInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSupplierInfo.java
index eb5ef01..a1e2697 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSupplierInfo.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSupplierInfo.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.model.resource;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -20,6 +27,11 @@
  * @author wangpeng
  * @since 2023-07-27
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @ApiModel
 @Data
 @TableName("biz_resource_supplier_info")
@@ -34,6 +46,7 @@
     /**
      * 供方编号
      */
+    @ExcelProperty(value = "供方编号", order = 1)
     @ApiModelProperty(value = "供方编号(自动生成)", dataType = "String")
     @TableField("supplier_no")
     private String supplierNo;
@@ -41,6 +54,7 @@
     /**
      * 供方名称
      */
+    @ExcelProperty(value = "供方名称", order = 2)
     @ApiModelProperty(value = "供方名称", dataType = "String")
     @TableField("supplier_name")
     private String supplierName;
@@ -60,6 +74,7 @@
     @TableField("supplier_type")
     private String supplierType;
 
+    @ExcelProperty(value = "供方类型", order = 3)
     @ApiModelProperty(value = "供方类型(字典value)", dataType = "String")
     @TableField(exist = false)
     private String supplierTypeName;
@@ -109,7 +124,8 @@
     /**
      * 电话
      */
-    @ApiModelProperty(value = "电话", dataType = "String")
+    @ExcelProperty(value = "联系电话", order = 4)
+    @ApiModelProperty(value = "联系电话", dataType = "String")
     @TableField("phone")
     private String phone;
 
@@ -158,6 +174,7 @@
     /**
      * 公司地址-省
      */
+    @ExcelProperty(value = "地址-省", order = 6)
     @ApiModelProperty(value = "公司地址-省", dataType = "String")
     @TableField("company_province_name")
     private String companyProvinceName;
@@ -172,6 +189,7 @@
     /**
      * 公司地址-市
      */
+    @ExcelProperty(value = "地址-市", order = 7)
     @ApiModelProperty(value = "公司地址-市", dataType = "String")
     @TableField("company_city_name")
     private String companyCityName;
@@ -186,6 +204,7 @@
     /**
      * 公司地址-区
      */
+    @ExcelProperty(value = "地址-区", order = 8)
     @ApiModelProperty(value = "公司地址-区", dataType = "String")
     @TableField("company_area_name")
     private String companyAreaName;
@@ -193,6 +212,7 @@
     /**
      * 公司地址-详细地址
      */
+    @ExcelProperty(value = "地址-详细地址", order = 9)
     @ApiModelProperty(value = "公司地址-详细地址", dataType = "String")
     @TableField("company_address")
     private String companyAddress;
@@ -200,6 +220,7 @@
     /**
      * 服务和供应的内容
      */
+    @ExcelProperty(value = "服务和供应的内容", order = 5)
     @ApiModelProperty(value = "服务和供应的内容", dataType = "String")
     @TableField("supplier_content")
     private String supplierContent;
@@ -250,6 +271,7 @@
     /**
      * 创建时间
      */
+    @ExcelProperty(value = "创建时间", order = 9)
     @ApiModelProperty(value = "创建时间", dataType = "String")
     @TableField("create_time")
     private String createTime;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/EnvLocationInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/EnvLocationInfo.java
new file mode 100644
index 0000000..d8e2d7b
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/EnvLocationInfo.java
@@ -0,0 +1,83 @@
+package com.casic.missiles.model.resource;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotEmpty;
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 实验室环境监控系统-设备表
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-06-07
+ */
+@ApiModel
+@Data
+@TableName("env_location_info")
+public class EnvLocationInfo implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "主键id", dataType = "Long")
+    @TableId("id")
+    private Long id;
+
+    /**
+     * 地点编号
+     */
+    @NotEmpty(message = "地点编号不能为空")
+    @ApiModelProperty(value = "地点编号", dataType = "String")
+    @TableField("location_no")
+    private String locationNo;
+
+    /**
+     * 地点名称
+     */
+    @ApiModelProperty(value = "地点名称", dataType = "String")
+    @TableField("location_name")
+    private String locationName;
+
+    /**
+     * 地点位置
+     */
+    @ApiModelProperty(value = "地点位置", dataType = "String")
+    @TableField("location_position")
+    private String locationPosition;
+
+    /**
+     * 创建人id
+     */
+    @ApiModelProperty(value = "创建人id", dataType = "Long")
+    @TableField("create_user_id")
+    private Long createUserId;
+
+    /**
+     * 创建人
+     */
+    @ApiModelProperty(value = "创建人", dataType = "String")
+    @TableField("create_user")
+    private String createUser;
+
+    /**
+     * 创建时间
+     */
+    @ApiModelProperty(value = "创建时间", dataType = "String")
+    @TableField("create_time")
+    private String createTime;
+
+    /**
+     * 更新时间
+     */
+    @ApiModelProperty(value = "更新时间", dataType = "String")
+    @TableField("update_time")
+    private String updateTime;
+
+
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemFileConfig.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemFileConfig.java
index 19e6845..86e569c 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemFileConfig.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemFileConfig.java
@@ -30,7 +30,7 @@
     @ApiModelProperty(value = "系统类别(1业务系统2受检系统3环境系统)", dataType = "Integer")
     @NotNull(message = "系统类别不能为空")
     @TableField("system_type")
-    private Integer systemType;
+    private Integer systemType = 1;
 
     @ApiModelProperty("下载编号")
     @TableField("download_no")
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemNotice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemNotice.java
index e94297d..06ec37d 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemNotice.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemNotice.java
@@ -34,7 +34,7 @@
     @ApiModelProperty(value = "系统类别(1业务系统2受检系统3环境系统)", dataType = "Integer")
     @NotNull(message = "系统类别不能为空")
     @TableField("system_type")
-    private Integer systemType;
+    private Integer systemType = 1;
 
     /**
      * 通知公告编号
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSign.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSign.java
index 6c0d7c9..954f4f8 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSign.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSign.java
@@ -51,7 +51,7 @@
     @ApiModelProperty(value = "系统类别(1业务系统2受检系统3环境系统)", dataType = "Integer")
     @NotNull(message = "系统类别不能为空")
     @TableField("system_type")
-    private Integer systemType;
+    private Integer systemType = 1;
 
     /**
      * 签名编号
@@ -130,4 +130,8 @@
     @TableField(exist = false)
     private List<Long> userIdList;
 
+    @ApiModelProperty(hidden = true)
+    @TableField(exist = false)
+    private String deptName;
+
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemTemplate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemTemplate.java
index 503a457..1d27ebe 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemTemplate.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemTemplate.java
@@ -47,7 +47,7 @@
     @ApiModelProperty(value = "系统类别(1业务系统2受检系统3环境系统)", dataType = "Integer")
     @NotNull(message = "系统类别不能为空")
     @TableField("system_type")
-    private Integer systemType;
+    private Integer systemType = 1;
 
     /**
      * 模板编号
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java
index 8c21cb0..f61e4a8 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java
@@ -32,4 +32,8 @@
     ReturnDTO approvalDelete(ApprovalDeleteRequest request);
 
     ReturnDTO failUpdate(T request);
+
+    List<O> listExport(R request);
+
+    List<O> listExportByIds(List<Long> ids);
 }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java
index 724166f..9bce15b 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java
@@ -157,6 +157,29 @@
         throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
     }
 
+    @Override
+    public List<O> listExport(R request) {
+        request.setCreateUserId(null);
+        request.setApprovalStatus(ApprovalStatusEnum.PASSED);
+        Page<O> page = PageFactory.defaultPage();
+        page.setCurrent(1);
+        page.setSearchCount(false);
+        page.setSize(Integer.MAX_VALUE);
+        Page<O> resultPage = this.baseMapper.selectBatchForApprovalList(page, request, null);
+        return resultPage.getRecords();
+    }
+
+    @Override
+    public List<O> listExportByIds(List<Long> ids) {
+        Page<O> page = PageFactory.defaultPage();
+        page.setCurrent(1);
+        page.setSearchCount(false);
+        page.setSize(Integer.MAX_VALUE);
+        List<String> businessKeys = ids.stream().map(String::valueOf).collect(Collectors.toList());
+        Page<O> resultPage = this.baseMapper.selectBatchForApprovalList(page, null, businessKeys);
+        return resultPage.getRecords();
+    }
+
     protected ReturnDTO updateApprovalStatus(Long id, String processId, String approvalStatus) {
         UpdateWrapper<T> updateWrapper = new UpdateWrapper<>();
         updateWrapper.eq("id", id);
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificatePrintServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificatePrintServiceImpl.java
index f6e4706..3228497 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificatePrintServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificatePrintServiceImpl.java
@@ -162,6 +162,30 @@
         return ReturnUtil.success(printLogMapper.selectList(wrapper));
     }
 
+    @Override
+    public List<CertificatePrintListResponse> listByIds(List<Long> ids) {
+        Page<CertificatePrintListResponse> page = PageFactory.defaultPage();
+        page.setCurrent(1);
+        page.setSearchCount(false);
+        page.setSize(Integer.MAX_VALUE);
+        List<String> businessKeys = ids.stream().map(String::valueOf).collect(Collectors.toList());
+        Page<CertificatePrintListResponse> resultPage = this.baseMapper.selectBatchForApprovalList(page, null, businessKeys);
+        return resultPage.getRecords();
+    }
+
+    @Override
+    public List<CertificatePrintListResponse> list(CertificatePrintApprovalListRequest request) {
+        request.setCreateUserId(null);
+        request.setApprovalStatus(null);
+        request.setPrintStatus(null);
+        Page<CertificatePrintListResponse> page = PageFactory.defaultPage();
+        page.setCurrent(1);
+        page.setSearchCount(false);
+        page.setSize(Integer.MAX_VALUE);
+        Page<CertificatePrintListResponse> resultPage = certificatePrintMapper.selectBatchForApprovalList(page, request, null);
+        return resultPage.getRecords();
+    }
+
     private void savePrintLog(Long id) {
         BizBusinessCertificatePrintLog printLog = new BizBusinessCertificatePrintLog();
         BizBusinessCertificatePrint certificatePrint = certificatePrintMapper.selectById(id);
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificateReportServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificateReportServiceImpl.java
index 457555f..24146be 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificateReportServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificateReportServiceImpl.java
@@ -158,8 +158,8 @@
         QueryWrapper<BizBusinessCertificateMeasureResultData> mWrapper = new QueryWrapper<>();
         mWrapper.eq("report_id", reportId);
         boolean mRemove = certificateMeasureResultDataService.remove(mWrapper);
-        Assert.isFalse(eRemove || mRemove, () -> {
+        if(!eRemove || !mRemove){
             throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
-        });
+        }
     }
 }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessIdentifyInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessIdentifyInfoServiceImpl.java
index 4c8e190..f7e63ca 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessIdentifyInfoServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessIdentifyInfoServiceImpl.java
@@ -1,8 +1,10 @@
 package com.casic.missiles.service.Impl.business;
 
+import cn.hutool.core.date.DateUtil;
 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.core.page.PageFactory;
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.business.identify.IdentifyListRequest;
@@ -14,11 +16,14 @@
 import com.casic.missiles.service.business.IBizBusinessIdentifyInfoService;
 import com.casic.missiles.utils.DictCodeUtils;
 import com.casic.missiles.utils.NumberGeneratorUtil;
+import com.casic.missiles.utils.QRCodeUtil;
 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.List;
+
 /**
  * <p>
  * 计量检定业务-任务计量管理-标识打印 服务实现类
@@ -35,9 +40,9 @@
     @Override
     public Page<BizBusinessIdentifyInfo> identifyListPage(Page<BizBusinessIdentifyInfo> page, IdentifyListRequest request) throws Exception {
         QueryWrapper<BizBusinessIdentifyInfo> wrapper = new QueryWrapper<>();
-        wrapper.eq("identify_type", request.getIdentifyType());
-        wrapper.like("device_no", request.getDeviceNo());
-        wrapper.like("device_name", request.getDeviceName());
+        wrapper.eq(StringUtils.isNotEmpty(request.getIdentifyType()), "identify_type", request.getIdentifyType());
+        wrapper.like(StringUtils.isNotEmpty(request.getDeviceNo()),"device_no", request.getDeviceNo());
+        wrapper.like(StringUtils.isNotEmpty(request.getDeviceName()), "device_name", request.getDeviceName());
         wrapper.apply(StringUtils.isNotBlank(request.getCreateTimeStart()),
                 "{0} <= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getCreateTimeStart().split(" ")[0]);
         wrapper.apply(StringUtils.isNotBlank(request.getCreateTimeEnd()),
@@ -64,8 +69,11 @@
     }
 
     @Override
-    public ReturnDTO updateIdentify(BizBusinessIdentifyInfo identifyInfo) {
-        if(identifyInfoMapper.updateById(identifyInfo) > 0){
+    public ReturnDTO updateIdentify(Long id) {
+        BizBusinessIdentifyInfo info = new BizBusinessIdentifyInfo();
+        info.setId(id);
+        info.setUpdateTime(DateUtil.now());
+        if(identifyInfoMapper.updateById(info) > 0){
             return ReturnUtil.success();
         }
         throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
@@ -79,4 +87,20 @@
         throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
     }
 
+    @Override
+    public List<BizBusinessIdentifyInfo> list(IdentifyListRequest request) throws Exception {
+        Page<BizBusinessIdentifyInfo> page = PageFactory.defaultPage();
+        page.setCurrent(1);
+        page.setSearchCount(false);
+        page.setSize(Integer.MAX_VALUE);
+        Page<BizBusinessIdentifyInfo> resultPage = this.identifyListPage(page, request);
+        return resultPage.getRecords();
+    }
+
+    @Override
+    public ReturnDTO<String> equipmentQrCode(Long id) {
+        String base64QRCode = QRCodeUtil.getBase64QRCode(String.valueOf(id));
+        return ReturnUtil.success(base64QRCode);
+    }
+
 }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOrderInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOrderInfoServiceImpl.java
index 82952ad..d8d2c6a 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOrderInfoServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOrderInfoServiceImpl.java
@@ -35,6 +35,7 @@
 import javax.servlet.http.HttpServletResponse;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 import java.util.stream.Collectors;
 
 /**
@@ -209,13 +210,16 @@
     private QueryWrapper<OrderListResponse> listParamWrapperBuilder(OrderListRequest request) {
         QueryWrapper<OrderListResponse> wrapper = new QueryWrapper<>();
         wrapper.like(StringUtils.isNotBlank(request.getOrderNo()), "order_no", request.getOrderNo());
+        wrapper.like(Objects.nonNull(request.getCustomerId()), "customer_id", request.getCustomerId());
         wrapper.like(StringUtils.isNotBlank(request.getCustomerName()), "customer_name", request.getCustomerName());
         wrapper.like(StringUtils.isNotBlank(request.getDeliverer()), "deliverer", request.getDeliverer());
         wrapper.like(StringUtils.isNotBlank(request.getCreateUserName()), "create_user_name", request.getCreateUserName());
-        wrapper.apply(StringUtils.isNotBlank(request.getCreateStartTime()),
-                "{0} <= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getCreateStartTime().split(" ")[0]);
-        wrapper.apply(StringUtils.isNotBlank(request.getCreateEndTime()),
-                "{0} >= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getCreateEndTime().split(" ")[0]);
+        if(StringUtils.isNotBlank(request.getCreateStartTime())){
+            wrapper.apply("{0} <= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getCreateStartTime().split(" ")[0]);
+        }
+        if(StringUtils.isNotBlank(request.getCreateEndTime())){
+            wrapper.apply("{0} >= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getCreateEndTime().split(" ")[0]);
+        }
         wrapper.orderByDesc("create_time");
         return wrapper;
     }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceAssessServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceAssessServiceImpl.java
index c6af980..ce40138 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceAssessServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceAssessServiceImpl.java
@@ -1,10 +1,33 @@
 package com.casic.missiles.service.Impl.business;
 
-import com.casic.missiles.model.business.BizBusinessOutsourceAssess;
+import cn.hutool.core.lang.Assert;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.casic.missiles.core.model.auth.AuthUser;
+import com.casic.missiles.core.shiro.ShiroKit;
+import com.casic.missiles.dto.BaseApprovalSubmitRequest;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.ReturnUtil;
+import com.casic.missiles.dto.business.outsource.OutsourceAssessApprovalListRequest;
+import com.casic.missiles.dto.business.outsource.OutsourceAssessSaveResponse;
+import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.NoGenerateFileCodeEnum;
+import com.casic.missiles.enums.NoGenerateRecordTypeCodeEnum;
+import com.casic.missiles.enums.system.ApprovalStatusEnum;
+import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.mapper.business.BizBusinessOutsourceAssessMapper;
+import com.casic.missiles.model.business.BizBusinessOutsourceAssess;
+import com.casic.missiles.model.business.BizBusinessOutsourceAssessSampleRelation;
+import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl;
+import com.casic.missiles.service.business.IBizBusinessOutsourceAssessSampleRelationService;
 import com.casic.missiles.service.business.IBizBusinessOutsourceAssessService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.casic.missiles.utils.NoGeneratorUtil;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Objects;
 
 /**
  * <p>
@@ -15,6 +38,103 @@
  * @since 2023-08-16
  */
 @Service
-public class BizBusinessOutsourceAssessServiceImpl extends ServiceImpl<BizBusinessOutsourceAssessMapper, BizBusinessOutsourceAssess> implements IBizBusinessOutsourceAssessService {
+public class BizBusinessOutsourceAssessServiceImpl extends GeneralApprovalServiceImpl<BizBusinessOutsourceAssessMapper, BizBusinessOutsourceAssess, BizBusinessOutsourceAssess, OutsourceAssessApprovalListRequest, BaseApprovalSubmitRequest> implements IBizBusinessOutsourceAssessService {
+    @Autowired
+    private IBizBusinessOutsourceAssessSampleRelationService outsourceAssessSampleRelationService;
 
+    @Override
+    public ReturnDTO<OutsourceAssessSaveResponse> saveOutsourceAssess(BizBusinessOutsourceAssess request) {
+        //生成编号
+        String labCode = request.getLabCode();
+        String groupCode = request.getGroupCode();
+        Long maxNo = this.baseMapper.selectMaxProjectNo();
+        String projectNo = NoGeneratorUtil.getCode(NoGenerateFileCodeEnum.D, labCode, NoGenerateRecordTypeCodeEnum.OUTSOURCE_ACCESS, groupCode, maxNo);
+        request.setCreateUserId(request.getUserId());
+        request.setCreateUserName(request.getUserName());
+        request.setApprovalStatus(ApprovalStatusEnum.DRAFT); //草稿箱状态
+        request.setProjectNo(projectNo);
+        int row = this.baseMapper.insert(request);
+        Assert.isFalse(row <= 0, () -> {
+            throw new BusinessException(BusinessExceptionEnum.OUTSOURCE_ACCESS_SAVE_FAILED);
+        });
+        //关联表
+        saveRelationData(request);
+        OutsourceAssessSaveResponse saveResponse = new OutsourceAssessSaveResponse();
+        saveResponse.setId(request.getId());
+        saveResponse.setProjectNo(projectNo);
+        return ReturnUtil.success(saveResponse);
+    }
+
+    @Override
+    @Transactional
+    public ReturnDTO draftUpdate(BizBusinessOutsourceAssess request) {
+        if (this.baseMapper.updateById(request) > 0) {
+            //关联表删除、增加
+            removeRelationData(request.getId());
+            saveRelationData(request);
+            return ReturnUtil.success();
+        }
+        throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
+    }
+
+    @Override
+    public ReturnDTO draftDelete(Long id) {
+        if (this.baseMapper.deleteById(id) > 0) {
+            //关联表删除
+            removeRelationData(id);
+            return ReturnUtil.success();
+        }
+        throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
+    }
+
+    @Override
+    public ReturnDTO draftBatchDelete(List<Long> ids) {
+        if (this.baseMapper.deleteBatchIds(ids) >= 0) {
+            ids.forEach(id -> removeRelationData(id));
+            return ReturnUtil.success();
+        }
+        throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
+    }
+
+    @Override
+    @Transactional
+    public ReturnDTO failUpdate(BizBusinessOutsourceAssess request) {
+        AuthUser user = ShiroKit.getUser();
+        Assert.isFalse(Objects.isNull(user), () -> {
+            throw new BusinessException(BusinessExceptionEnum.LOGIN_USER_ACQUIRE_FAILED);
+        });
+        request.setApprovalStatus(ApprovalStatusEnum.IN_APPROVED);
+        if (this.baseMapper.updateById(request) > 0) {
+            //关联表删除、增加
+            removeRelationData(request.getId());
+            saveRelationData(request);
+            baseApprovalService.failUpdate(request.getProcessId());
+            return ReturnUtil.success();
+        }
+        throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
+    }
+
+    private void saveRelationData(BizBusinessOutsourceAssess request) {
+        List<BizBusinessOutsourceAssessSampleRelation> sampleRelations = new ArrayList<>();
+        request.getOrderSampleList().forEach(dto -> {
+            BizBusinessOutsourceAssessSampleRelation relation = new BizBusinessOutsourceAssessSampleRelation();
+            relation.setOrderId(dto.getOrderId());
+            relation.setSampleId(dto.getSampleId());
+            relation.setAccessId(request.getId());
+            sampleRelations.add(relation);
+        });
+        if(outsourceAssessSampleRelationService.saveBatch(sampleRelations)){
+            return;
+        }
+        throw new BusinessException(BusinessExceptionEnum.OUTSOURCE_ACCESS_SAVE_FAILED);
+    }
+
+    private void removeRelationData(Long assessId) {
+        QueryWrapper<BizBusinessOutsourceAssessSampleRelation> wrapper = new QueryWrapper<>();
+        wrapper.eq("access_id", assessId);
+        if(outsourceAssessSampleRelationService.remove(wrapper)){
+            return;
+        }
+        throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
+    }
 }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceProtocolServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceProtocolServiceImpl.java
new file mode 100644
index 0000000..821e728
--- /dev/null
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceProtocolServiceImpl.java
@@ -0,0 +1,60 @@
+package com.casic.missiles.service.Impl.business;
+
+import cn.hutool.core.lang.Assert;
+import com.casic.missiles.dto.BaseApprovalSubmitRequest;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.ReturnUtil;
+import com.casic.missiles.dto.business.outsource.OutsourceProtocolApprovalListRequest;
+import com.casic.missiles.dto.business.outsource.OutsourceProtocolSaveResponse;
+import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.NoGenerateFileCodeEnum;
+import com.casic.missiles.enums.NoGenerateRecordTypeCodeEnum;
+import com.casic.missiles.enums.system.ApprovalStatusEnum;
+import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.mapper.business.BizBusinessOutsourceProtocolMapper;
+import com.casic.missiles.mapper.business.BizBusinessOutsourcerInfoMapper;
+import com.casic.missiles.model.business.BizBusinessOutsourceProtocol;
+import com.casic.missiles.model.business.BizBusinessOutsourcerInfo;
+import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl;
+import com.casic.missiles.service.business.IBizBusinessOutsourceProtocolService;
+import com.casic.missiles.utils.NoGeneratorUtil;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 计量检定业务-分包管理-测试、校准或检定工作分包协议书 服务实现类
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-08-24
+ */
+@Service
+public class BizBusinessOutsourceProtocolServiceImpl extends GeneralApprovalServiceImpl<BizBusinessOutsourceProtocolMapper, BizBusinessOutsourceProtocol, BizBusinessOutsourceProtocol, OutsourceProtocolApprovalListRequest, BaseApprovalSubmitRequest> implements IBizBusinessOutsourceProtocolService {
+    @Autowired
+    private BizBusinessOutsourcerInfoMapper outsourcerInfoMapper;
+
+    @Override
+    public ReturnDTO<OutsourceProtocolSaveResponse> saveOutsourceProtocol(BizBusinessOutsourceProtocol request) {
+        //生成编号
+        String labCode = request.getLabCode();
+        String groupCode = request.getGroupCode();
+        Long maxNo = this.baseMapper.selectMaxProtocolNo();
+        String protocolNo = NoGeneratorUtil.getCode(NoGenerateFileCodeEnum.D, labCode, NoGenerateRecordTypeCodeEnum.OUTSOURCE_PROTOCOL, groupCode, maxNo);
+        request.setCreateUserId(request.getUserId());
+        request.setCreateUserName(request.getUserName());
+        request.setApprovalStatus(ApprovalStatusEnum.DRAFT); //草稿箱状态
+        request.setProtocolNo(protocolNo);
+        BizBusinessOutsourcerInfo outsourcerInfo = outsourcerInfoMapper.selectById(request.getOutsourcerId());
+        request.setOutsourceNo(outsourcerInfo.getOutsourcerNo());
+        request.setOutsourceName(outsourcerInfo.getOutsourcerName());
+        int row = this.baseMapper.insert(request);
+        Assert.isFalse(row <= 0, () -> {
+            throw new BusinessException(BusinessExceptionEnum.OUTSOURCE_PROTOCOL_SAVE_FAILED);
+        });
+        OutsourceProtocolSaveResponse saveResponse = new OutsourceProtocolSaveResponse();
+        saveResponse.setId(request.getId());
+        saveResponse.setProtocolNo(protocolNo);
+        return ReturnUtil.success(saveResponse);
+    }
+}
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourcerInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourcerInfoServiceImpl.java
index 75f639d..8aadad7 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourcerInfoServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourcerInfoServiceImpl.java
@@ -3,12 +3,12 @@
 import cn.hutool.core.lang.Assert;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.dto.*;
 import com.casic.missiles.dto.business.outsource.OutsourcerInfoApprovalListRequest;
 import com.casic.missiles.dto.business.outsource.OutsourcerSaveResponse;
 import com.casic.missiles.enums.BusinessExceptionEnum;
-import com.casic.missiles.enums.PrefixCodeEnum;
+import com.casic.missiles.enums.NoGenerateFileCodeEnum;
+import com.casic.missiles.enums.NoGenerateRecordTypeCodeEnum;
 import com.casic.missiles.enums.system.ApprovalStatusEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.mapper.business.BizBusinessOutsourcerInfoMapper;
@@ -20,7 +20,7 @@
 import com.casic.missiles.service.business.IBizBusinessOutsourcerInfoService;
 import com.casic.missiles.service.business.IBizBusinessOutsourcerUserInfoService;
 import com.casic.missiles.utils.DictCodeUtils;
-import com.casic.missiles.utils.NumberGeneratorUtil;
+import com.casic.missiles.utils.NoGeneratorUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -42,22 +42,12 @@
     private IBizBusinessOutsourcerUserInfoService outsourcerUserInfoService;
 
     @Override
-    public List<BizBusinessOutsourcerInfo> list(OutsourcerInfoApprovalListRequest request) {
-        request.setCreateUserId(null);
-        request.setApprovalStatus(ApprovalStatusEnum.PASSED);
-        Page<BizBusinessOutsourcerInfo> page = PageFactory.defaultPage();
-        page.setCurrent(1);
-        page.setSearchCount(false);
-        page.setSize(Integer.MAX_VALUE);
-        Page<BizBusinessOutsourcerInfo> resultPage = this.baseMapper.selectBatchForApprovalList(page, request, null);
-        return resultPage.getRecords();
-    }
-
-    @Override
     public ReturnDTO<OutsourcerSaveResponse> saveOutsourcer(BizBusinessOutsourcerInfo request) {
         //生成编号
+        String labCode = request.getLabCode();
+        String groupCode = request.getGroupCode();
         Long maxNo = this.baseMapper.selectMaxNo();
-        String outsourcerNo = NumberGeneratorUtil.getContactNo(PrefixCodeEnum.OUTSOURCER_PREFIX, maxNo);
+        String outsourcerNo = NoGeneratorUtil.getCode(NoGenerateFileCodeEnum.D, labCode, NoGenerateRecordTypeCodeEnum.OUTSOURCE_INFO, groupCode, maxNo);
         request.setOutsourcerNo(outsourcerNo);
         request.setCreateUserId(request.getUserId());
         request.setCreateUserName(request.getUserName());
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessSiteExecutiveInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessSiteExecutiveInfoServiceImpl.java
index ebab3e6..6c6a129 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessSiteExecutiveInfoServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessSiteExecutiveInfoServiceImpl.java
@@ -189,9 +189,9 @@
         QueryWrapper<BizBusinessSiteExecutiveStaffRelation> mWrapper = new QueryWrapper<>();
         mWrapper.eq("site_executive_id", siteExecutiveId);
         boolean mRemove = siteExecutiveStaffRelationService.remove(mWrapper);
-        Assert.isFalse(eRemove || mRemove, () -> {
+        if(!eRemove || !mRemove){
             throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
-        });
+        }
     }
 
     private void doPopulateSiteExecutive(SiteExecutiveDetailResponse detailResponse) {

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java
index bb0c50f..13a699b 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java
@@ -12,6 +12,7 @@
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.IGeneralApprovalService;
+import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
@@ -19,6 +20,7 @@
 import org.springframework.web.bind.annotation.RequestBody;
 
 import javax.validation.Valid;
+import java.util.List;
 import java.util.Objects;
 
 /**
@@ -117,4 +119,17 @@
         }
         return baseApprovalService.failUpdate(request);
     }
+
+    public List<O> exportList(@RequestBody @Valid R request) throws Exception {
+        List<O> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = baseApprovalService.listExportByIds(request.getIds());
+        } else {
+            list = baseApprovalService.listExport(request);
+        }
+        for (O record : list) {
+            DictCodeUtils.convertDictCodeToName(record);
+        }
+        return list;
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java
index 8a90961..d775831 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java
@@ -5,6 +5,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.business.certificate.CertificateChangeApplyApprovalListRequest;
 import com.casic.missiles.dto.business.certificate.CertificateChangeApplySaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessCertificateChangeApply;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
@@ -20,6 +21,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -48,4 +50,12 @@
         }
         return changeApplyService.saveChangeApply(request);
     }
+
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody CertificateChangeApplyApprovalListRequest request) throws Exception {
+        List<BizBusinessCertificateChangeApply> list = super.exportList(request);
+        super.exportExcel(BizBusinessCertificateChangeApply.class, list, ExportEnum.CERTIFICATE_CHANGE_APPLY.getSheetName());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java
index 5fc4b07..af8230e 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java
@@ -9,6 +9,7 @@
 import com.casic.missiles.dto.business.certificate.CertificatePrintApprovalListRequest;
 import com.casic.missiles.dto.business.certificate.CertificatePrintListResponse;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.enums.business.CertificatePrintStatusEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessCertificatePrintLog;
@@ -18,10 +19,16 @@
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.io.IOException;
+import java.util.List;
 import java.util.Objects;
 
 /**
@@ -98,4 +105,16 @@
         });
         return certificatePrintService.certificatePrintLog(idDTO.getId());
     }
+
+    @ApiOperation("证书打印审批导出")
+    @PostMapping("/listExport")
+    public void exportList(@RequestBody CertificatePrintApprovalListRequest request) throws IOException {
+        List<CertificatePrintListResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = certificatePrintService.listByIds(request.getIds());
+        } else {
+            list = certificatePrintService.list(request);
+        }
+        super.exportExcel(CertificatePrintListResponse.class, list, ExportEnum.CERTIFICATE_PRINT.getSheetName());
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java
index 63b06dc..6b2efd5 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java
@@ -6,6 +6,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.business.certificate.CertificateReportApprovalListRequest;
 import com.casic.missiles.dto.business.certificate.CertificateReportSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessCertificateReport;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
@@ -21,6 +22,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -50,7 +52,7 @@
         return certificateReportService.saveCertificateReport(request);
     }
 
-    @ApiOperation("证书审批详情（基本信息）")
+    @ApiOperation("详情（基本信息）")
     @PostMapping("/detail")
     public ReturnDTO<BizBusinessCertificateReport> detail(@RequestBody @Valid BaseDetailRequest request, BindingResult bindingResult) throws Exception {
         if(bindingResult.hasErrors()){
@@ -59,4 +61,11 @@
         return certificateReportService.detail(request);
     }
 
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody CertificateReportApprovalListRequest request) throws Exception {
+        List<BizBusinessCertificateReport> list = super.exportList(request);
+        super.exportExcel(BizBusinessCertificateReport.class, list, ExportEnum.CERTIFICATE_REPORT.getSheetName());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java
index 46b26bd..57c0809 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java
@@ -10,20 +10,21 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.business.identify.IdentifyListRequest;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessIdentifyInfo;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.business.IBizBusinessIdentifyInfoService;
+import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import javax.validation.Valid;
+import java.util.List;
 import java.util.Objects;
 
 /**
@@ -57,16 +58,13 @@
         return identifyInfoService.addIdentify(identifyInfo);
     }
 
-    @ApiOperation("标识打印更新")
+    @ApiOperation("标识打印更新（更新打印时间）")
     @PostMapping("/update")
-    public ReturnDTO updateIdentify(@RequestBody @Valid BizBusinessIdentifyInfo identifyInfo, BindingResult bindingResult) {
-        Assert.isFalse(Objects.isNull(identifyInfo.getId()), () -> {
+    public ReturnDTO updateIdentify(@RequestBody @Valid IdDTO idDTO) {
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        Assert.isFalse(bindingResult.hasErrors(), () -> {
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        });
-        return identifyInfoService.updateIdentify(identifyInfo);
+        return identifyInfoService.updateIdentify(idDTO.getId());
     }
 
     @ApiOperation("标识打印删除")
@@ -77,4 +75,37 @@
         });
         return identifyInfoService.deleteIdentify(idDTO.getId());
     }
+
+    @ApiOperation("标识打印导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody @Valid IdentifyListRequest request, BindingResult bindingResult) throws Exception {
+        if (bindingResult.hasErrors()) {
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        List<BizBusinessIdentifyInfo> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = identifyInfoService.listByIds(request.getIds());
+        } else {
+            list = identifyInfoService.list(request);
+        }
+        for (BizBusinessIdentifyInfo record : list) {
+            DictCodeUtils.convertDictCodeToName(record);
+        }
+        super.exportExcel(BizBusinessIdentifyInfo.class, list, ExportEnum.IDENTIFY_EXPORT.getSheetName());
+    }
+
+
+    // TODO: 2023/8/23 查询设备信息，4个底部按钮查设备（按钮的作用就是前端用来调不同接口、用来区分中间即将展示的标识），前端弹窗选设备，在确定保存时前端根据底部按钮判断传入设备类型deviceType字典code
+    // TODO: 2023/8/23 接口：查受检设备（第1个按钮），查设备台账（后3个按钮同一接口），查询之后前端根据标志类型的不同加到中间页面时进行判断（按产品给的对应表）
+    // TODO: 2023/8/23 提供二维码接口，前端在加到中间页面时调用一下
+
+    @ApiOperation("设备二维码")
+    @PostMapping("/equipment/qrCode")
+    public ReturnDTO<String> equipmentQrCode(@RequestBody @Valid IdDTO idDTO) {
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return identifyInfoService.equipmentQrCode(idDTO.getId());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java
index 707be6e..7e0453d 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java
@@ -117,7 +117,7 @@
     }
 
     @ApiOperation("任务单导出")
-    @PostMapping("/export")
+    @PostMapping("/listExport")
     public void orderExport(@RequestBody @Valid OrderListRequest request, HttpServletResponse response) {
         businessOrderService.orderExport(request, response);
     }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java
index 529a6ce..51432be 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java
@@ -1,9 +1,28 @@
 package com.casic.missiles.controller.business;
 
+import com.casic.missiles.controller.GeneralApprovalController;
+import com.casic.missiles.dto.BaseApprovalSubmitRequest;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.business.outsource.OutsourceAssessApprovalListRequest;
+import com.casic.missiles.dto.business.outsource.OutsourceAssessSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
+import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.model.business.BizBusinessOutsourceAssess;
+import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
+import com.casic.missiles.service.IGeneralApprovalService;
+import com.casic.missiles.service.business.IBizBusinessOutsourceAssessService;
 import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.BindingResult;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.validation.Valid;
+import java.util.List;
+
 /**
  * <p>
  * 计量检定业务-分包管理-测试、校准或检定工作分包评审表 前端控制器
@@ -15,6 +34,27 @@
 @Api(tags = "分包管理-测试、校准或检定工作分包评审表")
 @RestController
 @RequestMapping("/business/outsource/assess")
-public class BizBusinessOutsourceAssessController {
+public class BizBusinessOutsourceAssessController extends GeneralApprovalController<BizBusinessOutsourceAssess, BizBusinessOutsourceAssess, OutsourceAssessApprovalListRequest, BaseApprovalSubmitRequest> {
+    @Autowired
+    private IBizBusinessOutsourceAssessService outsourceAssessService;
 
+    public BizBusinessOutsourceAssessController(IGeneralApprovalService<BizBusinessOutsourceAssess, BizBusinessOutsourceAssess, OutsourceAssessApprovalListRequest, BaseApprovalSubmitRequest> baseApprovalService) {
+        super(baseApprovalService);
+    }
+
+    @ApiOperation("草稿箱-保存")
+    @PostMapping("/save")
+    public ReturnDTO<OutsourceAssessSaveResponse> saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceAssess request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        return outsourceAssessService.saveOutsourceAssess(request);
+    }
+
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception {
+        List<BizBusinessOutsourceAssess> list = super.exportList(request);
+        super.exportExcel(BizBusinessOutsourceAssess.class, list, ExportEnum.OUTSOURCE_ASSESS.getSheetName());
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java
new file mode 100644
index 0000000..9adef18
--- /dev/null
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java
@@ -0,0 +1,60 @@
+package com.casic.missiles.controller.business;
+
+import com.casic.missiles.controller.GeneralApprovalController;
+import com.casic.missiles.dto.BaseApprovalSubmitRequest;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.business.outsource.OutsourceProtocolApprovalListRequest;
+import com.casic.missiles.dto.business.outsource.OutsourceProtocolSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
+import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.model.business.BizBusinessOutsourceProtocol;
+import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
+import com.casic.missiles.service.IGeneralApprovalService;
+import com.casic.missiles.service.business.IBizBusinessOutsourceProtocolService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.BindingResult;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.validation.Valid;
+import java.util.List;
+
+/**
+ * <p>
+ * 计量检定业务-分包管理-测试、校准或检定工作分包协议书 前端控制器
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-08-24
+ */
+@Api(tags = "分包管理-测试、校准或检定工作分包协议书")
+@RestController
+@RequestMapping("/business/outsource/protocol")
+public class BizBusinessOutsourceProtocolController extends GeneralApprovalController<BizBusinessOutsourceProtocol, BizBusinessOutsourceProtocol, OutsourceProtocolApprovalListRequest, BaseApprovalSubmitRequest> {
+    @Autowired
+    private IBizBusinessOutsourceProtocolService outsourceProtocolService;
+
+    public BizBusinessOutsourceProtocolController(IGeneralApprovalService<BizBusinessOutsourceProtocol, BizBusinessOutsourceProtocol, OutsourceProtocolApprovalListRequest, BaseApprovalSubmitRequest> baseApprovalService) {
+        super(baseApprovalService);
+    }
+
+    @ApiOperation("草稿箱-保存")
+    @PostMapping("/save")
+    public ReturnDTO<OutsourceProtocolSaveResponse> saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceProtocol request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        return outsourceProtocolService.saveOutsourceProtocol(request);
+    }
+
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody OutsourceProtocolApprovalListRequest request) throws Exception {
+        List<BizBusinessOutsourceProtocol> list = super.exportList(request);
+        super.exportExcel(BizBusinessOutsourceProtocol.class, list, ExportEnum.OUTSOURCE_PROTOCOL.getSheetName());
+    }
+}
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java
index 097f645..f0f0943 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java
@@ -17,7 +17,6 @@
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.IGeneralApprovalService;
 import com.casic.missiles.service.business.IBizBusinessOutsourcerInfoService;
-import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -71,19 +70,8 @@
 
     @ApiOperation("分包方导出")
     @PostMapping("/listExport")
-    public void export(@RequestBody @Valid OutsourcerInfoApprovalListRequest request, BindingResult bindingResult) throws Exception {
-        if (bindingResult.hasErrors()) {
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        }
-        List<BizBusinessOutsourcerInfo> list;
-        if (!CollectionUtils.isEmpty(request.getIds())) {
-            list = outsourcerInfoService.listByIds(request.getIds());
-        } else {
-            list = outsourcerInfoService.list(request);
-        }
-        for (BizBusinessOutsourcerInfo record : list) {
-            DictCodeUtils.convertDictCodeToName(record);
-        }
+    public void export(@RequestBody OutsourcerInfoApprovalListRequest request) throws Exception {
+        List<BizBusinessOutsourcerInfo> list = super.exportList(request);
         super.exportExcel(BizBusinessOutsourcerInfo.class, list, ExportEnum.OUTSOURCER_EXPORT.getSheetName());
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java
index c2cbf9f..0410918 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java
@@ -17,11 +17,9 @@
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.IGeneralApprovalService;
 import com.casic.missiles.service.business.IBizBusinessSiteExecutiveInfoService;
-import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -60,7 +58,7 @@
         return siteExecutiveInfoService.saveSiteExecutiveInfo(siteExecutiveInfo);
     }
 
-    @ApiOperation("现场检测详情")
+    @ApiOperation("详情")
     @PostMapping("/detail")
     public ReturnDTO<SiteExecutiveDetailResponse> siteExecutiveDetail(@RequestBody @Valid IdDTO idDTO) throws Exception {
         Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
@@ -69,21 +67,10 @@
         return ReturnUtil.success(siteExecutiveInfoService.detail(idDTO.getId()));
     }
 
-    @ApiOperation("现场检测导出")
+    @ApiOperation("导出")
     @PostMapping("/listExport")
-    public void export(@RequestBody @Valid SiteExecutiveApprovalListRequest request, BindingResult bindingResult) throws Exception {
-        if (bindingResult.hasErrors()) {
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        }
-        List<SiteExecutiveApprovalListResponse> list;
-        if (!CollectionUtils.isEmpty(request.getIds())) {
-            list = siteExecutiveInfoService.listInfoByIds(request.getIds());
-        } else {
-            list = siteExecutiveInfoService.listInfo(request);
-        }
-        for (SiteExecutiveApprovalListResponse record : list) {
-            DictCodeUtils.convertDictCodeToName(record);
-        }
+    public void export(@RequestBody SiteExecutiveApprovalListRequest request) throws Exception {
+        List<SiteExecutiveApprovalListResponse> list = super.exportList(request);
         super.exportExcel(SiteExecutiveApprovalListResponse.class, list, ExportEnum.SITE_EXECUTIVE_EXPORT.getSheetName());
     }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
index 7e793cd..a92e209 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
@@ -55,7 +55,7 @@
 
     @ApiOperation("设备收发列表导出")
     @PostMapping("/export")
-    public void exportList(@RequestBody @Valid SampleDispatchListRequest request) throws IOException {
+    public void exportList(@RequestBody SampleDispatchListRequest request) throws IOException {
         List<SampleDispatchListResponse> list;
         if (!CollectionUtils.isEmpty(request.getIds())) {
             list = dispatchService.listByIds(request.getIds());
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java
index cdc77fc..d120fd4 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java
@@ -7,6 +7,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.business.labExecutive.*;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.business.IBusinessLabExecutiveInfoService;
@@ -14,6 +15,7 @@
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.*;
 
@@ -32,7 +34,7 @@
     @Autowired
     private IBusinessLabExecutiveInfoService labExecutiveInfoService;
 
-    @ApiOperation("实验室检测-部门检测-查询各状态列表（待检测、检测中、检测完）")
+    @ApiOperation("实验室任务-查询各状态列表（待检测、检测中、检测完）")
     @PostMapping("/deptExecutive/List")
     public ReturnDTO<PageInfoBT<SampleLabExecutiveListResponse>> queryDeptExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
@@ -43,10 +45,19 @@
         return ReturnUtil.success(super.packForBT(labExecutiveInfoService.deptLabExecutiveListPage(page, labExecutiveListRequest)));
     }
 
-    /**
-     * 实验室检测-我的检测-查询各状态列表（待检测、检测中、检测完）
-     */
-    @ApiOperation("实验室检测-我的检测-查询各状态列表（待检测、检测中、检测完）")
+    @ApiOperation("实验室任务导出")
+    @PostMapping("/deptExecutive/export")
+    public void deptExportList(@RequestBody @Valid SampleLabExecutiveListRequest request) throws Exception {
+        List<SampleLabExecutiveListResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = labExecutiveInfoService.deptLabExecutiveListByIds(request.getMeasureStatus(), request.getIds());
+        } else {
+            list = labExecutiveInfoService.deptLabExecutiveList(request);
+        }
+        super.exportExcel(SampleLabExecutiveListResponse.class, list, ExportEnum.DEPT_EXECUTIVE_TASK.getSheetName());
+    }
+
+    @ApiOperation("我的任务-查询各状态列表（待检测、检测中、检测完）")
     @PostMapping("/myExecutive/list")
     public ReturnDTO<PageInfoBT<SampleLabExecutiveListResponse>> queryMyExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
@@ -57,19 +68,25 @@
         return ReturnUtil.success(super.packForBT(labExecutiveInfoService.myLabExecutiveListPage(page, labExecutiveListRequest)));
     }
 
-    /**
-     * 实验室检测-我的检测-查询各状态样品数量（待检测、检测中、检测完）
-     */
-    @ApiOperation("实验室检测-我的检测-查询各状态样品数量（待检测、检测中、检测完）")
+    @ApiOperation("我的任务导出")
+    @PostMapping("/myExecutive/export")
+    public void exportList(@RequestBody @Valid SampleLabExecutiveListRequest request) throws Exception {
+        List<SampleLabExecutiveListResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = labExecutiveInfoService.myLabExecutiveListByIds(request.getMeasureStatus(), request.getIds());
+        } else {
+            list = labExecutiveInfoService.myLabExecutiveList(request);
+        }
+        super.exportExcel(SampleLabExecutiveListResponse.class, list, ExportEnum.MY_EXECUTIVE_TASK.getSheetName());
+    }
+
+    @ApiOperation("我的任务-查询各状态样品数量（待检测、检测中、检测完）")
     @GetMapping("/myExecutive/amount")
     public ReturnDTO<List<SampleAmountResponse>> queryMyExecutiveAmount() {
         return ReturnUtil.success(labExecutiveInfoService.myExecutiveAmount());
     }
 
-    /**
-     * 实验室检测-部门检测-分配（分配给具体人员）
-     */
-    @ApiOperation("实验室检测-部门检测-分配按钮（分配给具体人员）")
+    @ApiOperation("实验室任务-分配按钮（分配给具体人员）")
     @PostMapping("/deptExecutive/allocate")
     public ReturnDTO allocateStaff(@RequestBody @Valid SampleAllocateRequest sampleAllocateRequest, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -78,10 +95,7 @@
         return labExecutiveInfoService.allocateStaff(sampleAllocateRequest);
     }
 
-    /**
-     * 实验室检测-我的检测-检定人扫描收入（待检测->检测中）
-     */
-    @ApiOperation("实验室检测-我的检测-检定人扫描收入（待检测->检测中）")
+    @ApiOperation("我的任务-检定人扫描收入（待检测->检测中）")
     @PostMapping("/myExecutive/receive")
     public ReturnDTO sampleReceive(@RequestBody @Valid List<SampleOperateRequest> requestList, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -90,10 +104,7 @@
         return labExecutiveInfoService.sampleReceive(requestList);
     }
 
-    /**
-     * 实验室检测-负责人/检定人扫描检完（检测中->检测完）
-     */
-    @ApiOperation("实验室检测-负责人/检定人扫描检完（检测中->检测完）")
+    @ApiOperation("实验室任务-负责人/检定人扫描检完（检测中->检测完）")
     @PostMapping("/myExecutive/complete")
     public ReturnDTO sampleExecutiveComplete(@RequestBody @Valid List<SampleOperateRequest> requestList, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -102,10 +113,7 @@
         return labExecutiveInfoService.sampleExecutiveComplete(requestList);
     }
 
-    /**
-     * 实验室检测-部门检测/我的检测 编辑（只能修改应出具证书）
-     */
-    @ApiOperation("实验室检测-部门检测/我的检测 编辑（只能修改应出具证书）")
+    @ApiOperation("实验室任务/我的任务 编辑（只能修改应出具证书）")
     @PostMapping("/executive/update")
     public ReturnDTO updateExecutive(@RequestBody @Valid UpdateExecutiveRequest request, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -114,10 +122,7 @@
         return labExecutiveInfoService.updateExecutive(request);
     }
 
-    /**
-     * 实验室检测-部门检测/我的检测 详情
-     */
-    @ApiOperation("实验室检测-部门检测/我的检测 详情")
+    @ApiOperation("实验室任务/我的任务 详情")
     @PostMapping("/executive/detail")
     public ReturnDTO<ExecutiveDetailResponse> executiveDetail(@RequestBody @Valid ExecutiveDetailRequest request, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
@@ -131,7 +136,7 @@
      * 退回后会将下一个要执行的实验室检测状态更新为待分配，将后面的实验室顺序变更为连续（都进行减1）
      * 最后一个检测的实验室退回，等分发员再增加实验室或设备收发中的已收入直接手动点击完成
      */
-    @ApiOperation("实验室检测-部门检测/我的检测 退回（待检测/检测中->退回）")
+    @ApiOperation("实验室任务/我的任务 退回（待检测/检测中->退回）")
     @PostMapping("/executive/sendBack")
     public ReturnDTO executiveSendBack(@RequestBody @Valid ExecutiveSendBackRequest request, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -140,9 +145,6 @@
         return labExecutiveInfoService.sampleExecutiveSendBack(request);
     }
 
-    /**
-     * 分发员编辑实验室检测列表
-     */
     @ApiOperation("分发员编辑实验室检测列表")
     @PostMapping("/handOut/updateList")
     public ReturnDTO updateExecutiveList(@RequestBody @Valid UpdateExecutiveListRequest request, BindingResult bindingResult) {
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java
index 48a67ed..0c04f31 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java
@@ -10,6 +10,7 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.resource.customer.CustomerApprovalListRequest;
 import com.casic.missiles.dto.resource.customer.CustomerSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceCustomerInfo;
@@ -26,6 +27,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -55,6 +57,13 @@
         return customerInfoService.saveCustomerInfo(request);
     }
 
+    @ApiOperation("委托方名录导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody CustomerApprovalListRequest request) throws Exception {
+        List<BizResourceCustomerInfo> list = super.exportList(request);
+        super.exportExcel(BizResourceCustomerInfo.class, list, ExportEnum.CUSTOMER_INFO.getSheetName());
+    }
+
     @ApiOperation("委托方人员列表（分页）")
     @PostMapping("/person/listPage")
     public ReturnDTO<PageInfoBT<BizResourceCustomerStaff>> personListPage(@RequestBody IdDTO idDto) {
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
index 972ed4b..6418ea5 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
@@ -5,6 +5,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.resource.customer.SuggestFormApprovalListRequest;
 import com.casic.missiles.dto.resource.customer.SuggestFormSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceCustomerSuggestForm;
@@ -20,6 +21,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -50,4 +52,11 @@
         return suggestFormService.saveSuggestForm(request);
     }
 
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody SuggestFormApprovalListRequest request) throws Exception {
+        List<BizResourceCustomerSuggestForm> list = super.exportList(request);
+        super.exportExcel(BizResourceCustomerSuggestForm.class, list, ExportEnum.CUSTOMER_SUGGEST_FORM.getSheetName());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java
index 1934d1a..9e07eab 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java
@@ -15,12 +15,16 @@
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.resource.IEnvEnvironmentRecordConfigService;
 import com.casic.missiles.service.resource.IEnvEnvironmentRecordDataService;
+import com.casic.missiles.service.resource.IEnvLocationInfoService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
 import java.util.List;
@@ -39,6 +43,8 @@
     private IEnvEnvironmentRecordDataService environmentRecordDataService;
     @Autowired
     private IEnvEnvironmentRecordConfigService environmentRecordConfigService;
+    @Autowired
+    private IEnvLocationInfoService locationInfoService;
 
     @ApiOperation("环境记录单数据列表/详情")
     @PostMapping("/data/listPage")
@@ -95,4 +101,11 @@
         });
         return environmentRecordConfigService.deleteEnvironmentRecordConfig(idDTO.getId());
     }
+
+    @ApiOperation("地点列表")
+    @PostMapping("/location/listPage")
+    public ReturnDTO<PageInfoBT<LocationListResponse>> locationListPage(@RequestBody @Valid LocationListRequest request) {
+        Page<LocationListResponse> page = PageFactory.defaultPage();
+        return ReturnUtil.success(super.packForBT(locationInfoService.listPage(page, request)));
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java
index 82efe3f..e9561fa 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java
@@ -10,6 +10,7 @@
 import com.casic.missiles.dto.resource.seal.SealLogListRequest;
 import com.casic.missiles.dto.resource.seal.SealNoteApprovalListRequest;
 import com.casic.missiles.dto.resource.seal.SealNoteSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceSealUseLog;
@@ -27,6 +28,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -58,6 +60,13 @@
         return sealUseNoteService.saveSeal(request);
     }
 
+    @ApiOperation("印章使用登记导出（列表和导出中去掉经办人和监印人）")
+    @PostMapping("/listExport")
+    public void export(@RequestBody SealNoteApprovalListRequest request) throws Exception {
+        List<BizResourceSealUseNote> list = super.exportList(request);
+        super.exportExcel(BizResourceSealUseNote.class, list, ExportEnum.SEAL_NOTE.getSheetName());
+    }
+
     // TODO: 2023/7/28 印章使用日志：系统中使用印章时插入数据库
 
     @ApiOperation("印章使用日志列表（分页）")
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java
index 9b674fc..06b6521 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java
@@ -9,16 +9,20 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.resource.staff.StaffCertRequest;
 import com.casic.missiles.dto.resource.staff.StaffCertResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.service.resource.IBizResourceStaffInfoService;
 import com.casic.missiles.service.resource.IBizResourceStaffVerifierService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.List;
+
 /**
  * @Description:
  * @Author: wangpeng
@@ -41,9 +45,21 @@
         return ReturnUtil.success(super.packForBT(responsePage));
     }
 
+    @ApiOperation("证书逾期提醒导出")
+    @PostMapping("/listExport")
+    public void exportList(@RequestBody StaffCertRequest request) throws Exception {
+        List<StaffCertResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = staffInfoService.certListByIds(request.getIds());
+        } else {
+            list = staffInfoService.certList(request);
+        }
+        super.exportExcel(StaffCertResponse.class, list, ExportEnum.STAFF_CERTIFICATE_EXPIRE.getSheetName());
+    }
+
     @ApiOperation("证书逾期提醒")
     @PostMapping("/expirationReminder")
-    public ReturnDTO expirationReminder(@RequestBody IdDTO idDto) {
-        return verifierService.expirationReminder(idDto);
+    public ReturnDTO expirationReminder(@RequestBody IdDTO idDTO) {
+        return verifierService.expirationReminder(idDTO);
     }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java
index 3b251ad..a6e7850 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java
@@ -12,6 +12,7 @@
 import com.casic.missiles.dto.resource.staff.StaffListRequest;
 import com.casic.missiles.dto.resource.staff.TrainListRequest;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.*;
@@ -22,7 +23,10 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
 import java.util.List;
@@ -52,8 +56,19 @@
             throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
         }
         Page<BizResourceStaffInfo> page = PageFactory.defaultPage();
-        Page<BizResourceStaffInfo> responsePage = staffInfoService.listPage(page, request);
-        return ReturnUtil.success(super.packForBT(responsePage));
+        return ReturnUtil.success(super.packForBT(staffInfoService.listPage(page, request)));
+    }
+
+    @ApiOperation("人员登记导出")
+    @PostMapping("/listExport")
+    public void exportList(@RequestBody StaffListRequest request) throws Exception {
+        List<BizResourceStaffInfo> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = staffInfoService.listByIds(request.getIds());
+        } else {
+            list = staffInfoService.list(request);
+        }
+        super.exportExcel(BizResourceStaffInfo.class, list, ExportEnum.STAFF_INFO.getSheetName());
     }
 
     @ApiOperation("人员登记详情基础信息")
@@ -85,9 +100,9 @@
 
     @ApiOperation("科研教育列表（分页）")
     @PostMapping("/education/listPage")
-    public ReturnDTO<PageInfoBT<BizResourceStaffEducation>> educationListPage(@RequestBody IdDTO idDto) {
+    public ReturnDTO<PageInfoBT<BizResourceStaffEducation>> educationListPage(@RequestBody IdDTO idDTO) {
         Page<BizResourceStaffEducation> page = PageFactory.defaultPage();
-        Page<BizResourceStaffEducation> responsePage = staffInfoService.educationListPage(page, idDto);
+        Page<BizResourceStaffEducation> responsePage = staffInfoService.educationListPage(page, idDTO);
         return ReturnUtil.success(super.packForBT(responsePage));
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java
index af6aa86..d85d84a 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java
@@ -9,6 +9,7 @@
 import com.casic.missiles.dto.resource.outsideService.SupplierApprovalListRequest;
 import com.casic.missiles.dto.resource.outsideService.SupplierSaveResponse;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceSupplierAbility;
@@ -67,6 +68,13 @@
         return ReturnUtil.success(supplierInfoService.detail(idDTO.getId()));
     }
 
+    @ApiOperation("合格供方导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody SupplierApprovalListRequest request) throws Exception {
+        List<BizResourceSupplierInfo> list = super.exportList(request);
+        super.exportExcel(BizResourceSupplierInfo.class, list, ExportEnum.SUPPLIER_INFO.getSheetName());
+    }
+
     @ApiOperation("供方人员列表（分页）")
     @PostMapping("/person/listPage")
     public ReturnDTO<PageInfoBT<BizResourceSupplierPerson>> personListPage(@RequestBody IdDTO idDTO) {
diff --git a/casic-metering-api/src/main/resources/config/application.yml b/casic-metering-api/src/main/resources/config/application.yml
index 350db5f..ecff521 100644
--- a/casic-metering-api/src/main/resources/config/application.yml
+++ b/casic-metering-api/src/main/resources/config/application.yml
@@ -126,7 +126,7 @@
     #作者
     author: wangpeng
     #待生成对象表名
-    table-name: biz_equipment_technical_target_approval,biz_equipment_attachment_approval,biz_equipment_checkpoint_approval
+    table-name: biz_business_outsource_protocol
 
 reminder:
   #节点--common模块config包 ReminderNodeConfig配置
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
index 4a19e4e..d47d552 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
@@ -53,6 +53,7 @@
     SUGGEST_FORM_SAVE_FAILED(2509, "委托方意见登记表保存至草稿箱失败"),
     EXAMINE_FORM_SAVE_FAILED(2510, "要求、委托书及合同评审表保存至草稿箱失败"),
     CUSTOMER_EXIST_SAVE_FAILED(2511, "该委托方已存在，请重新选择"),
+    DUPLICATE_LOCATION_NO(2512, "地点编号已存在"),
 
     /**
      * 计量检定业务模块
@@ -68,6 +69,8 @@
     COMPLETE_SAMPLE_NOT_EXIST(2609, "检测中不存在扫描收入的样品"),
     CANNOT_CHANGE_MEASURE_INFO(2610, "无法更改非当前登录用户的检测信息"),
     NON_EXIST_ORDER_OR_SAMPLE(2611, "不存在该委托单或该委托单下的样品"),
+    OUTSOURCE_ACCESS_SAVE_FAILED(2612, "测试、校准或检定工作分包评审表保存至草稿箱失败"),
+    OUTSOURCE_PROTOCOL_SAVE_FAILED(2613, "测试、校准或检定工作分包协议书保存至草稿箱失败"),
 
     /**
      * 历史遗留备用
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
index 5089ad1..81a406b 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
@@ -10,54 +10,38 @@
     /**
      * 资源管理
      */
-    ENVIRONMENT_DATA_EXPORT("environmentData", "environmentData", "环境记录单数据"),
+    ENVIRONMENT_DATA_EXPORT("environmentData", "环境记录单数据", "环境记录单数据"),
+    STAFF_INFO("staffInfo", "人员登记", "人员登记"),
+    STAFF_CERTIFICATE_EXPIRE("certificateExpire", "证书逾期提醒", "证书逾期提醒"),
+    SUPPLIER_INFO("supplierInfo", "合格供方名录", "合格供方名录"),
+    CUSTOMER_INFO("customerInfo", "委托方名录", "委托方名录"),
+    CUSTOMER_SUGGEST_FORM("customerSuggestForm", "委托方意见登记表", "委托方意见登记表"),
+    SEAL_NOTE("sealNote", "印章使用登记", "印章使用登记"),
 
-    FILE_EXPORT("meterFileData", "meterFileData", "计量文件信息"),
-    TRAIN_PLAN_EXPORT("trainPlanData", "trainPlanData", "培训计划"),
-    TRAIN_LOG_EXPORT("trainLogData", "trainLogData", "培训记录"),
-    METER_ORGANIZE_EXPORT("meterOrganizeData", "meterOrganizeData", "计量组织"),
-    TRACE_SUPPLIER_EXPORT("traceSupplierData", "traceSupplierData", "溯源供方"),
-    SIGN_EXPORT("signData", "signData", "签名/签章"),
-    TEMPLATE_EXPORT("templateData", "templateData", "原始记录模板/证书报告模板"),
-    FIXED_ASSETS("meterFixedAssets", "meterFixedAssets", "固定资产"),
-    METER_EQUIPMENT("meterEquipment", "meterEquipment", "测量设备"),
-    CALIBRATION_TEST_EQUIPMENT("calibrationTestEquipment", "calibrationTestEquipment", "校准检定设备"),
-    MEASURE_ACCOUNT("measureAccount", "measureAccount", "测量工装"),
-    STANDARD_SUPPORT_EQUIPMENT("standardSupportEquipment", "standardSupportEquipment", "标准配套设备"),
-    STANDARD_EQUIPMENT("standardEquipment", "standardEquipment", "标准装置"),
-    FLOW_DEF_EXPORT("flowDefData", "flowDefData", "流程定义"),
-    STAFF_CERTIFICATE("certificate", "certificate", "计量人员证书"),
-    CHECK_INFO("checkInfo", "checkInfo", "设备管理点检测"),
-    EQUIPMENT_APPLY("equipmentApply", "equipmentApply", "设备借用"),
-    STANDARD_EQUIPMENT_REMIND("equipmentApplyRemind", "equipmentApplyRemind", "标准装置到期提醒"),
-    METER_PRICE("meterPrice", "meterPrice", "价格库"),
-    METER_STAFF("meterStaff", "meterStaff", "计量人员"),
-    STANDARD_EQUIPMENT_APPLY("standardEquipmentApply", "standardEquipmentApply", "标准装置申请"),
-    STATE_MANAGE_APPLY("stateManage", "stateManage", "状态管理"),
-    METER_ACCEPTANCE_CHECK("acceptanceCheck", "acceptanceCheck", "设备检修保养验收单"),
-    CUSTOMER_EXPORT("customerData", "customerData", "客户信息"),
-    ORDER_EXPORT("orderData", "orderData", "委托书信息"),
-    SAMPLE_EXPORT("sampleData", "sampleData", "样本信息"),
-    EXCHANGE_DATA("exchangeData", "exchangeData", "设备交接单"),
-    DISPATCH_DATA("dispatchData", "dispatchData", "设备收发"),
-    ENVIRONMENT_DATA("environmentData", "environmentData", "环境记录单"),
-    ORIGIN_DATA("originData", "originData", "原始记录"),
-    CERTIFICATE_REPORT("certificateReport", "certificateReport", "证书报告"),
-    ADVICE_EXPORT("adviceData", "adviceData", "客户反馈"),
-    HANDOUT_EXPORT("handoutData", "handoutData", "任务分发列表"),
-    OUTSOURCER_EXPORT("outsourcerData", "outsourcerData", "分包方"),
-    SITE_EXECUTIVE_EXPORT("siteExecutiveData", "siteExecutiveData", "现场测试、校准或检定"),
-    CERTIFICATE_PRINT_EXPORT("certificatePrintData", "certificatePrintData", "证书打印"),
-    DOWNLOAD_TEMPLATE("downloadTemplate", "downloadTemplate", "页面配置"),
-    OUTSOURCER_CERTIFICATE_EXPORT("outsourceCertificateData", "outsourceCertificateData", "分包证书"),
-    SETTLEMENT_INFO_EXPORT("settlementInfoData", "settlementInfoData", "业务结算"),
-    EQUIPMENT_REMIND("equipmentRemind", "equipmentRemind", "设备到期提醒"),
-    AGREEMENT_INFO_EXPORT("agreementInfoData", "agreementInfoData", "合同"),
-    WORK_STATISTICS_EXPORT("workStatisticsData", "workStatisticsData", "实时工作统计"),
-    DEPT_OUTPUT_EXPORT("deptOutputData", "deptOutputData", "部门产值分析"),
-    WORKLOAD_EXPORT("workloadData", "workloadData", "业务工作量分析"),
-    DEPT_COMPREHENSIVE_EXPORT("deptComprehensiveData", "deptComprehensiveData", "部门综合分析"),
-    ENVIRONMENTAL_RECORD("environmentalRecordData", "environmentalRecordData", "现场环境记录");
+    /**
+     * 计量检定业务
+     */
+    OUTSOURCER_EXPORT("outsourcerData", "分包方名录", "分包方名录"),
+    IDENTIFY_EXPORT("identifyData", "计量标识", "计量标识"),
+    ORDER_EXPORT("orderData", "任务单", "任务单"),
+    DISPATCH_DATA("dispatchData", "设备收发", "设备收发"),
+    HANDOUT_EXPORT("handoutData", "任务分发", "任务分发"),
+    SITE_EXECUTIVE_EXPORT("siteExecutiveData", "现场测试、校准或检定", "现场测试、校准或检定"),
+    CERTIFICATE_REPORT("certificateReport", "证书审批", "证书审批"),
+    CERTIFICATE_CHANGE_APPLY("certificateChangeApply", "证书报告补充或更换申请单", "证书报告补充或更换申请单"),
+    CERTIFICATE_PRINT("certificatePrintData", "证书打印审批", "证书打印审批"),
+    DEPT_EXECUTIVE_TASK("deptExecutiveTaskData", "实验室任务", "实验室任务"),
+    MY_EXECUTIVE_TASK("myExecutiveTaskData", "我的任务", "我的任务"),
+    OUTSOURCE_ASSESS("outsourceAssess", "测试、校准或检定工作分包评审表", "测试、校准或检定工作分包评审表"),
+    OUTSOURCE_PROTOCOL("outsourceProtocol", "测试、校准或检定工作分包协议书", "测试、校准或检定工作分包协议书"),
+
+    /**
+     * 系统管理
+     */
+    SIGN_EXPORT("signData", "签名", "签名"),
+    TEMPLATE_EXPORT("templateData", "文件模板", "文件模板"),
+    FLOW_DEF_EXPORT("flowDefData", "流程定义", "流程定义"),
+    DOWNLOAD_TEMPLATE("downloadTemplate", "流程定义", "页面配置");
 
     ExportEnum(String fileName, String sheetName, String description) {
         this.fileName = fileName;
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateRecordTypeCodeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateRecordTypeCodeEnum.java
index 31d913c..a963522 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateRecordTypeCodeEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateRecordTypeCodeEnum.java
@@ -46,4 +46,14 @@
     String SITE_EXECUTIVE_APPROVAL = "01";
     //《现场测试、校准或检定工作记录表》
     String SITE_EXECUTIVE_LOG = "02";
+
+    //测试、校准或检定工作分包协议书
+    String OUTSOURCE_PROTOCOL = "01";
+    //测试、校准或检定工作分包评审表
+    String OUTSOURCE_ACCESS = "02";
+    //测试、校准或检定工作分包通知书
+    String OUTSOURCE_NOTICE = "03";
+    //测试、校准或检定工作分包方名录
+    String OUTSOURCE_INFO = "04";
+
 }
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
index 24b8635..f78bd53 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
@@ -15,6 +15,10 @@
     String CERTIFICATE_CHANGE_APPLY_BEAN_NAME = "certificateChangeApplyBean";
     //现场测试、校准或检定
     String SITE_EXECUTIVE_BEAN_NAME = "siteExecutiveBean";
+    //测试、校准或检定工作分包评审表
+    String OUTSOURCE_ASSESS_BEAN_NAME = "outsourceAssessBean";
+    //测试、校准或检定工作分包协议书
+    String OUTSOURCE_PROTOCOL_BEAN_NAME = "outsourceProtocolBean";
 
     /*********************************设备与装置************************************/
     //设备台账
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 b21c661..6b86fd1 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
@@ -18,6 +18,8 @@
     OUTSOURCER_APPROVAL(OUTSOURCER_BEAN_NAME, ""),
     CERTIFICATE_CHANGE_APPROVAL(CERTIFICATE_CHANGE_APPLY_BEAN_NAME, ""),
     SITE_EXECUTIVE_APPROVAL(SITE_EXECUTIVE_BEAN_NAME, ""),
+    OUTSOURCE_ASSESS_APPROVAL(OUTSOURCE_ASSESS_BEAN_NAME, ""),
+    OUTSOURCE_PROTOCOL_APPROVAL(OUTSOURCE_PROTOCOL_BEAN_NAME, ""),
 
     ACTION_STATUS_MAP(new HashMap<String, AwareActionStatusEnum>() {
         {
@@ -47,6 +49,10 @@
             put(ApplyFromIdEnum.CERTIFICATE_CHANGE_APPROVAL.getCode(), CERTIFICATE_CHANGE_APPROVAL);
             //现场测试、校准或检定审批
             put(ApplyFromIdEnum.SITE_EXECUTIVE_APPROVAL.getCode(), SITE_EXECUTIVE_APPROVAL);
+            //测试、校准或检定工作分包评审表
+            put(ApplyFromIdEnum.OUTSOURCE_ASSESS_APPROVAL.getCode(), OUTSOURCE_ASSESS_APPROVAL);
+            //测试、校准或检定工作分包协议书
+            put(ApplyFromIdEnum.OUTSOURCE_PROTOCOL_APPROVAL.getCode(), OUTSOURCE_PROTOCOL_APPROVAL);
         }
     });
     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 934405e..c7410bd 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
@@ -9,6 +9,8 @@
     CERTIFICATE_CHANGE_APPROVAL("jljdywzsbchghsqd", MessageSourceModuleEnum.BUSINESS.getCode(), "证书/报告补充或更换申请单"),
     OUTSOURCER_APPROVAL("jljdywcsjzhgfbfml", MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定合格分包方名录"),
     SITE_EXECUTIVE_APPROVAL("jljdywxccsjzsp", MessageSourceModuleEnum.BUSINESS.getCode(), "现场测试、校准或检定审批"),
+    OUTSOURCE_ASSESS_APPROVAL("jljdywcsjzfbpsb", MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包评审表"),
+    OUTSOURCE_PROTOCOL_APPROVAL("jljdywcsjzfbxys", MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包协议书"),
 
 
     /*******************************************设备与装置*********************************************/
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/GeneralApprovalMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/GeneralApprovalMapper.java
index 4fb7344..0c9d6ae 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/GeneralApprovalMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/GeneralApprovalMapper.java
@@ -17,8 +17,4 @@
 
     Page<O> selectBatchForApprovalList(Page<O> page, @Param("request") R request, @Param("businessKeys") List<String> businessKeys);
 
-//    Page<O> selectListPage(Page<O> page, @Param("request") R request);
-
-//    Long selectMaxNo();
-
 }
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceAssessMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceAssessMapper.java
index 7867bb8..ba59009 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceAssessMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceAssessMapper.java
@@ -1,7 +1,12 @@
 package com.casic.missiles.mapper.business;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.business.outsource.OutsourceAssessApprovalListRequest;
+import com.casic.missiles.mapper.GeneralApprovalMapper;
 import com.casic.missiles.model.business.BizBusinessOutsourceAssess;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * <p>
@@ -11,6 +16,10 @@
  * @author wangpeng
  * @since 2023-08-16
  */
-public interface BizBusinessOutsourceAssessMapper extends BaseMapper<BizBusinessOutsourceAssess> {
+public interface BizBusinessOutsourceAssessMapper extends GeneralApprovalMapper<BizBusinessOutsourceAssess, BizBusinessOutsourceAssess, OutsourceAssessApprovalListRequest> {
+
+    Page<BizBusinessOutsourceAssess> selectBatchForApprovalList(Page<BizBusinessOutsourceAssess> page, @Param("request") OutsourceAssessApprovalListRequest request, @Param("businessKeys") List<String> businessKeys);
+
+    Long selectMaxProjectNo();
 
 }
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceProtocolMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceProtocolMapper.java
new file mode 100644
index 0000000..e6aba35
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceProtocolMapper.java
@@ -0,0 +1,24 @@
+package com.casic.missiles.mapper.business;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.business.outsource.OutsourceProtocolApprovalListRequest;
+import com.casic.missiles.mapper.GeneralApprovalMapper;
+import com.casic.missiles.model.business.BizBusinessOutsourceProtocol;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 计量检定业务-分包管理-测试、校准或检定工作分包协议书 Mapper 接口
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-08-24
+ */
+public interface BizBusinessOutsourceProtocolMapper extends GeneralApprovalMapper<BizBusinessOutsourceProtocol, BizBusinessOutsourceProtocol, OutsourceProtocolApprovalListRequest> {
+
+    Page<BizBusinessOutsourceProtocol> selectBatchForApprovalList(Page<BizBusinessOutsourceProtocol> page, @Param("request") OutsourceProtocolApprovalListRequest request, @Param("businessKeys") List<String> businessKeys);
+
+    Long selectMaxProtocolNo();
+}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/EnvLocationInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/EnvLocationInfoMapper.java
new file mode 100644
index 0000000..49eff87
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/EnvLocationInfoMapper.java
@@ -0,0 +1,21 @@
+package com.casic.missiles.mapper.resource;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.resource.environment.LocationListRequest;
+import com.casic.missiles.dto.resource.environment.LocationListResponse;
+import com.casic.missiles.model.resource.EnvLocationInfo;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * <p>
+ * 实验室环境监控系统-设备表 Mapper 接口
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-06-07
+ */
+public interface EnvLocationInfoMapper extends BaseMapper<EnvLocationInfo> {
+
+    Page<LocationListResponse> selectLocationListPage(Page<LocationListResponse> page, @Param("request") LocationListRequest request);
+}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java
index de124db..85ed0f7 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java
@@ -1,7 +1,9 @@
 package com.casic.missiles.mapper.system;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.dto.system.SignDetailResponse;
+import com.casic.missiles.dto.system.SignListRequest;
 import com.casic.missiles.model.system.SystemSign;
 import org.apache.ibatis.annotations.Param;
 
@@ -22,4 +24,8 @@
     SignDetailResponse selectSignDetailById(Long id);
 
     List<SystemSign> selectUsableSignList(@Param("userId") Long userId);
+
+    Page<SystemSign> selectSignListPage(Page<SystemSign> page, @Param("request") SignListRequest request);
+
+    List<SystemSign> selectSignList(@Param("request") SignListRequest request);
 }
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateChangeApplyMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateChangeApplyMapper.xml
index d798447..c496092 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateChangeApplyMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateChangeApplyMapper.xml
@@ -30,31 +30,31 @@
         SELECT *
         FROM biz_business_certificate_change_apply
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.changeApplyNo != null and request.changeApplyNo !=''">
+        <if test="request != null and request.changeApplyNo != null and request.changeApplyNo !=''">
             and change_apply_no like concat('%',#{request.changeApplyNo},'%')
         </if>
-        <if test="request.changeReportNo != null and request.changeReportNo !=''">
+        <if test="request != null and request.changeReportNo != null and request.changeReportNo !=''">
             and change_report_no like concat('%',#{request.changeReportNo},'%')
         </if>
-        <if test="request.changeReportName != null and request.changeReportName !=''">
+        <if test="request != null and request.changeReportName != null and request.changeReportName !=''">
             and change_report_name like concat('%',#{request.changeReportName},'%')
         </if>
-        <if test="request.changeType != null and request.changeType !=''">
+        <if test="request != null and request.changeType != null and request.changeType !=''">
             and change_type = #{request.changeType}
         </if>
-        <if test="request.createUserName != null and request.createUserName !=''">
+        <if test="request != null and request.createUserName != null and request.createUserName !=''">
             and create_user_name like concat('%',#{request.createUserName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificatePrintMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificatePrintMapper.xml
index b66cd99..49c0ac8 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificatePrintMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificatePrintMapper.xml
@@ -31,34 +31,34 @@
         LEFT JOIN biz_business_order_sample_relation bosr ON (bosr.order_id = bcr.order_id AND bosr.sample_id = bcr.sample_id)
         LEFT JOIN biz_business_order_info boi ON boi.id = bosr.order_id
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and bcp.approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.printStatus != null and request.printStatus !=''">
+        <if test="request != null and request.printStatus != null and request.printStatus !=''">
             and print_status = #{request.printStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and bcp.create_user_id = #{request.createUserId}
         </if>
-        <if test="request.certificateReportNo != null and request.certificateReportNo !=''">
+        <if test="request != null and request.certificateReportNo != null and request.certificateReportNo !=''">
             and bcr.certificate_report_no like concat('%',#{request.certificateReportNo},'%')
         </if>
-        <if test="request.certificateReportName != null and request.certificateReportName !=''">
+        <if test="request != null and request.certificateReportName != null and request.certificateReportName !=''">
             and bcr.certificate_report_name like concat('%',#{request.certificateReportName},'%')
         </if>
-        <if test="request.customerName != null and request.customerName !=''">
+        <if test="request != null and request.customerName != null and request.customerName !=''">
             and boi.customer_name like concat('%',#{request.customerName},'%')
         </if>
-        <if test="request.sampleNo != null and request.sampleNo !=''">
+        <if test="request != null and request.sampleNo != null and request.sampleNo !=''">
             and bosr.sample_no like concat('%',#{request.sampleNo},'%')
         </if>
-        <if test="request.sampleName != null and request.sampleName !=''">
+        <if test="request != null and request.sampleName != null and request.sampleName !=''">
             and bosr.sample_name like concat('%',#{request.sampleName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and bcp.create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and bcp.create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml
index b366034..767695d 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml
@@ -46,33 +46,37 @@
         SELECT bcr.*, bosr.sample_no, bosr.sample_name, bosr.sample_model, rsi.staff_name
         FROM biz_business_certificate_report bcr
         LEFT JOIN biz_business_order_sample_relation bosr ON (bosr.order_id = bcr.order_id AND bosr.sample_id = bcr.sample_id)
+        LEFT JOIN biz_business_order_info boi ON boi.id = bcr.order_id
         LEFT JOIN biz_resource_staff_info rsi ON rsi.id = bcr.measure_person_id
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and bcr.approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and bcr.create_user_id = #{request.createUserId}
         </if>
-        <if test="request.certificateReportNo != null and request.certificateReportNo !=''">
+        <if test="request != null and request.customerId != null and request.customerId !=''">
+            and boi.customer_id = #{request.customerId}
+        </if>
+        <if test="request != null and request.certificateReportNo != null and request.certificateReportNo !=''">
             and bcr.certificate_report_no like concat('%',#{request.certificateReportNo},'%')
         </if>
-        <if test="request.certificateReportName != null and request.certificateReportName !=''">
+        <if test="request != null and request.certificateReportName != null and request.certificateReportName !=''">
             and bcr.certificate_report_name like concat('%',#{request.certificateReportName},'%')
         </if>
-        <if test="request.sampleNo != null and request.sampleNo !=''">
+        <if test="request != null and request.sampleNo != null and request.sampleNo !=''">
             and bosr.sample_no like concat('%',#{request.sampleNo},'%')
         </if>
-        <if test="request.measureCategory != null and request.measureCategory !=''">
+        <if test="request != null and request.measureCategory != null and request.measureCategory !=''">
             and bcr.measure_category = #{request.measureCategory}
         </if>
-        <if test="request.measurePerson != null and request.measurePerson !=''">
+        <if test="request != null and request.measurePerson != null and request.measurePerson !=''">
             and rsi.staff_name like concat('%',#{request.measurePerson},'%')
         </if>
-        <if test="request.calibrationTimeStart != null and request.calibrationTimeStart !=''">
+        <if test="request != null and request.calibrationTimeStart != null and request.calibrationTimeStart !=''">
             and bcr.calibration_time &gt;= #{request.calibrationTimeStart}
         </if>
-        <if test="request.calibrationTimeEnd != null and request.calibrationTimeEnd !=''">
+        <if test="request != null and request.calibrationTimeEnd != null and request.calibrationTimeEnd !=''">
             and bcr.calibration_time &lt;= #{request.calibrationTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceAssessMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceAssessMapper.xml
index d0fcf8b..c22c101 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceAssessMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceAssessMapper.xml
@@ -7,6 +7,8 @@
         <id column="id" property="id" />
         <result column="project_no" property="projectNo" />
         <result column="project_name" property="projectName" />
+        <result column="lab_code" property="labCode" />
+        <result column="group_code" property="groupCode" />
         <result column="applicant_id" property="applicantId" />
         <result column="applicant_name" property="applicantName" />
         <result column="applicant_time" property="applicantTime" />
@@ -31,7 +33,45 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, project_no, project_name, applicant_id, applicant_name, applicant_time, minio_file_name, remark, create_user_id, create_user_name, outsourcer_id, pre_start_time, pre_end_time, outsource_reason, pre_cost, approval_status, process_id, approve_situation, traceability, test_method, technique_ability, create_time, update_time
+        id, project_no, project_name, lab_code, group_code, applicant_id, applicant_name, applicant_time, minio_file_name, remark, create_user_id, create_user_name, outsourcer_id, pre_start_time, pre_end_time, outsource_reason, pre_cost, approval_status, process_id, approve_situation, traceability, test_method, technique_ability, create_time, update_time
     </sql>
 
+    <select id="selectMaxProjectNo" resultType="java.lang.Long">
+        SELECT IFNULL(max(RIGHT(project_no, 3)), 0) from biz_business_outsource_assess
+    </select>
+
+    <select id="selectBatchForApprovalList" resultMap="BaseResultMap">
+        SELECT bboa.*, bboi.outsourcer_name, bboi.director
+        FROM biz_business_outsource_assess bboa
+        LEFT JOIN biz_business_outsourcer_info bboi ON bboa.outsourcer_id = bboi.id
+        WHERE 1=1
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
+            and bboa.approval_status = #{request.approvalStatus}
+        </if>
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
+            and bboa.create_user_id = #{request.createUserId}
+        </if>
+        <if test="request != null and request.projectNo != null and request.projectNo !=''">
+            and bboa.project_no like concat('%',#{request.projectNo},'%')
+        </if>
+        <if test="request != null and request.outsourcerName != null and request.outsourcerName !=''">
+            and bboi.outsourcer_name like concat('%',#{request.outsourcerName},'%')
+        </if>
+        <if test="request != null and request.applicantName != null and request.applicantName !=''">
+            and bboa.applicant_name like concat('%',#{request.applicantName},'%')
+        </if>
+        <if test="request != null and request.applicantTimeStart != null and request.applicantTimeStart !=''">
+            and bboa.applicant_time &gt;= #{request.applicantTimeStart}
+        </if>
+        <if test="request != null and request.applicantTimeEnd != null and request.applicantTimeEnd !=''">
+            and bboa.applicant_time &lt;= #{request.applicantTimeEnd}
+        </if>
+        <if test="businessKeys != null">
+            and bboa.id in
+            <foreach collection="businessKeys" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
+        ORDER BY bboa.create_time DESC
+    </select>
 </mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceProtocolMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceProtocolMapper.xml
new file mode 100644
index 0000000..b7b2149
--- /dev/null
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceProtocolMapper.xml
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.mapper.business.BizBusinessOutsourceProtocolMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.business.BizBusinessOutsourceProtocol">
+        <id column="id" property="id" />
+        <result column="protocol_no" property="protocolNo" />
+        <result column="project_name" property="projectName" />
+        <result column="lab_code" property="labCode" />
+        <result column="group_code" property="groupCode" />
+        <result column="outsourcer_id" property="outsourcerId" />
+        <result column="remark" property="remark" />
+        <result column="outsource_no" property="outsourceNo" />
+        <result column="outsource_name" property="outsourceName" />
+        <result column="contacts" property="contacts" />
+        <result column="mobile" property="mobile" />
+        <result column="address" property="address" />
+        <result column="require_date" property="requireDate" />
+        <result column="outsource_cost" property="outsourceCost" />
+        <result column="director" property="director" />
+        <result column="item" property="item" />
+        <result column="requires" property="requires" />
+        <result column="create_user_id" property="createUserId" />
+        <result column="create_user_name" property="createUserName" />
+        <result column="approval_status" property="approvalStatus" />
+        <result column="process_id" property="processId" />
+        <result column="create_time" property="createTime" />
+        <result column="update_time" property="updateTime" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, protocol_no, project_name, lab_code, group_code, outsourcer_id, remark, outsource_no, outsource_name, contacts, mobile, address, require_date, outsource_cost, director, item, requires, create_user_id, create_user_name, approval_status, process_id, create_time, update_time
+    </sql>
+
+    <select id="selectMaxProtocolNo" resultType="java.lang.Long">
+        SELECT IFNULL(max(RIGHT(protocol_no, 3)), 0) from biz_business_outsource_protocol
+    </select>
+
+    <select id="selectBatchForApprovalList" resultMap="BaseResultMap">
+        SELECT *
+        FROM biz_business_outsource_protocol
+        WHERE 1=1
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
+            and approval_status = #{request.approvalStatus}
+        </if>
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
+            and create_user_id = #{request.createUserId}
+        </if>
+        <if test="request != null and request.protocolNo != null and request.protocolNo !=''">
+            and protocol_no like concat('%',#{request.protocolNo},'%')
+        </if>
+        <if test="request != null and request.outsourcerName != null and request.outsourcerName !=''">
+            and outsourcer_name like concat('%',#{request.outsourcerName},'%')
+        </if>
+        <if test="request != null and request.applicantName != null and request.applicantName !=''">
+            and create_user_name like concat('%',#{request.applicantName},'%')
+        </if>
+        <if test="request != null and request.applicantTimeStart != null and request.applicantTimeStart !=''">
+            and create_time &gt;= #{request.applicantTimeStart}
+        </if>
+        <if test="request != null and request.applicantTimeEnd != null and request.applicantTimeEnd !=''">
+            and create_time &lt;= #{request.applicantTimeEnd}
+        </if>
+        <if test="businessKeys != null">
+            and id in
+            <foreach collection="businessKeys" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
+        ORDER BY create_time DESC
+    </select>
+</mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourcerInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourcerInfoMapper.xml
index 510a80b..3049b54 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourcerInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourcerInfoMapper.xml
@@ -7,6 +7,8 @@
         <id column="id" property="id" />
         <result column="outsourcer_no" property="outsourcerNo" />
         <result column="outsourcer_name" property="outsourcerName" />
+        <result column="lab_code" property="labCode" />
+        <result column="group_code" property="groupCode" />
         <result column="outsourcer_brief_name" property="outsourcerBriefName" />
         <result column="outsourcer_size" property="outsourcerSize" />
         <result column="business_size" property="businessSize" />
@@ -55,32 +57,32 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, outsourcer_no, outsourcer_name, outsourcer_brief_name, outsourcer_size, business_size, grade, evaluation, tax_number, bank_account, bank_name, bank_account_number, postal_code, director, phone, fax, mobile, email, website, address_country, address_province, address_city, address_area, full_address, address_country_name, address_province_name, address_city_name, address_area_name, invoice_country, invoice_province, invoice_city, invoice_area, invoice_full_address, invoice_country_name, invoice_province_name, invoice_city_name, invoice_area_name, business_scope, business_content, minio_file_name, approval_status, process_id, remark, create_user_id, create_user_name, create_time, update_time
+        id, outsourcer_no, outsourcer_name, lab_code, group_code, outsourcer_brief_name, outsourcer_size, business_size, grade, evaluation, tax_number, bank_account, bank_name, bank_account_number, postal_code, director, phone, fax, mobile, email, website, address_country, address_province, address_city, address_area, full_address, address_country_name, address_province_name, address_city_name, address_area_name, invoice_country, invoice_province, invoice_city, invoice_area, invoice_full_address, invoice_country_name, invoice_province_name, invoice_city_name, invoice_area_name, business_scope, business_content, minio_file_name, approval_status, process_id, remark, create_user_id, create_user_name, create_time, update_time
     </sql>
 
     <select id="selectBatchForApprovalList" resultMap="BaseResultMap">
         SELECT *
         FROM biz_business_outsourcer_info
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.outsourcerNo != null and request.outsourcerNo !=''">
+        <if test="request != null and request.outsourcerNo != null and request.outsourcerNo !=''">
             and outsourcer_no like concat('%',#{request.outsourcerNo},'%')
         </if>
-        <if test="request.outsourcerName != null and request.outsourcerName !=''">
+        <if test="request != null and request.outsourcerName != null and request.outsourcerName !=''">
             and outsourcer_name like concat('%',#{request.outsourcerName},'%')
         </if>
-        <if test="request.director != null and request.director !=''">
+        <if test="request != null and request.director != null and request.director !=''">
             and director like concat('%',#{request.director},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
@@ -93,6 +95,6 @@
     </select>
 
     <select id="selectMaxNo" resultType="java.lang.Long">
-        SELECT IFNULL(max(RIGHT(outsourcer_no, 12)), 0) from biz_business_outsourcer_info
+        SELECT IFNULL(max(RIGHT(outsourcer_no, 3)), 0) from biz_business_outsourcer_info
     </select>
 </mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessSiteExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessSiteExecutiveInfoMapper.xml
index 135c5d0..3c5ae79 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessSiteExecutiveInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessSiteExecutiveInfoMapper.xml
@@ -38,25 +38,25 @@
         FROM biz_business_site_executive_info bsei
         LEFT JOIN biz_resource_customer_info rci ON bsei.customer_id = rci.id
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and bsei.approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and bsei.create_user_id = #{request.createUserId}
         </if>
-        <if test="request.siteExecutiveNo != null and request.siteExecutiveNo !=''">
+        <if test="request != null and request.siteExecutiveNo != null and request.siteExecutiveNo !=''">
             and bsei.site_executive_no like concat('%',#{request.siteExecutiveNo},'%')
         </if>
-        <if test="request.customerName != null and request.customerName !=''">
+        <if test="request != null and request.customerName != null and request.customerName !=''">
             and rci.outsourcer_name like concat('%',#{request.customerName},'%')
         </if>
-        <if test="request.applyName != null and request.applyName !=''">
+        <if test="request != null and request.applyName != null and request.applyName !=''">
             and bsei.apply_name like concat('%',#{request.applyName},'%')
         </if>
-        <if test="request.applyTimeStart != null and request.applyTimeStart !=''">
+        <if test="request != null and request.applyTimeStart != null and request.applyTimeStart !=''">
             and bsei.apply_time &gt;= #{request.applyTimeStart}
         </if>
-        <if test="request.applyTimeEnd != null and request.applyTimeEnd !=''">
+        <if test="request != null and request.applyTimeEnd != null and request.applyTimeEnd !=''">
             and bsei.apply_time &lt;= #{request.applyTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml
index 84d9e2a..6bd38a9 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml
@@ -105,6 +105,12 @@
         <if test="request.isUrgent != null and request.isUrgent !=''">
             AND bo.is_urgent = #{request.isUrgent}
         </if>
+        <if test="request.ids != null">
+            and blei.id in
+            <foreach collection="request.ids" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
         ORDER BY blei.update_time DESC
     </select>
 
@@ -137,6 +143,12 @@
         <if test="request.isUrgent != null and request.isUrgent !=''">
             AND bo.is_urgent = #{request.isUrgent}
         </if>
+        <if test="request.ids != null">
+            and blei.id in
+            <foreach collection="request.ids" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
         ORDER BY blei.update_time DESC
     </select>
 
diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardInfoMapper.xml
index 1a5551b..2ed8d17 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardInfoMapper.xml
@@ -45,12 +45,6 @@
         FROM biz_equipment_standard_info besi
         LEFT JOIN biz_equipment_standard_technology_relation bestr ON besi.standard_no = bestr.standard_no
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
-            and besi.approval_status = #{request.approvalStatus}
-        </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
-            and besi.create_user_id = #{request.createUserId}
-        </if>
         <if test="request.standardName != null and request.standardName !=''">
             and besi.standard_name like concat('%',#{request.standardName},'%')
         </if>
diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardTechnologyRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardTechnologyRelationMapper.xml
index fc7e16c..cd03c8c 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardTechnologyRelationMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardTechnologyRelationMapper.xml
@@ -6,6 +6,7 @@
     <resultMap id="BaseResultMap" type="com.casic.missiles.model.equipment.BizEquipmentStandardTechnologyRelation">
         <id column="id" property="id" />
         <result column="technology_file_id" property="technologyFileId" />
+        <result column="technology_file_no" property="technologyFileNo" />
         <result column="technology_file_name" property="technologyFileName" />
         <result column="standard_id" property="standardId" />
         <result column="standard_no" property="standardNo" />
@@ -14,7 +15,7 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, technology_file_id, technology_file_name, standard_id, remark
+        id, technology_file_id, technology_file_no, technology_file_name, standard_id, remark
     </sql>
 
 </mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceAuthorizeOrderMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceAuthorizeOrderMapper.xml
index ac5176c..554fe65 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceAuthorizeOrderMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceAuthorizeOrderMapper.xml
@@ -32,22 +32,22 @@
         SELECT *
         FROM biz_resource_authorize_order
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.orderNo != null and request.orderNo !=''">
+        <if test="request != null and request.orderNo != null and request.orderNo !=''">
             and order_no like concat('%',#{request.orderNo},'%')
         </if>
-        <if test="request.createUserName != null and request.createUserName !=''">
+        <if test="request != null and request.createUserName != null and request.createUserName !=''">
             and create_user_name like concat('%',#{request.createUserName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerExamineFormMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerExamineFormMapper.xml
index ab242f6..af7f98f 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerExamineFormMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerExamineFormMapper.xml
@@ -41,28 +41,28 @@
         SELECT *
         FROM biz_resource_customer_examine_form
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.formNo != null and request.formNo !=''">
+        <if test="request != null and request.formNo != null and request.formNo !=''">
             and form_no like concat('%',#{request.formNo},'%')
         </if>
-        <if test="request.labCode != null and request.labCode !=''">
+        <if test="request != null and request.labCode != null and request.labCode !=''">
             and lab_code like concat('%',#{request.labCode},'%')
         </if>
-        <if test="request.groupCode != null and request.groupCode !=''">
+        <if test="request != null and request.groupCode != null and request.groupCode !=''">
             and group_code like concat('%',#{request.groupCode},'%')
         </if>
-        <if test="request.createUserName != null and request.createUserName !=''">
+        <if test="request != null and request.createUserName != null and request.createUserName !=''">
             and create_user_name like concat('%',#{request.createUserName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerInfoMapper.xml
index fa8ffbc..06a2798 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerInfoMapper.xml
@@ -33,25 +33,25 @@
         SELECT *
         FROM biz_resource_customer_info
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.customerNo != null and request.customerNo !=''">
+        <if test="request != null and request.customerNo != null and request.customerNo !=''">
             and customer_no like concat('%',#{request.customerNo},'%')
         </if>
-        <if test="request.customerName != null and request.customerName !=''">
+        <if test="request != null and request.customerName != null and request.customerName !=''">
             and customer_name like concat('%',#{request.customerName},'%')
         </if>
-        <if test="request.contacts != null and request.contacts !=''">
+        <if test="request != null and request.contacts != null and request.contacts !=''">
             and contacts like concat('%',#{request.contacts},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerSuggestFormMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerSuggestFormMapper.xml
index 28f5bb2..1806662 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerSuggestFormMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerSuggestFormMapper.xml
@@ -33,28 +33,28 @@
         SELECT *
         FROM biz_resource_customer_suggest_form
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.formNo != null and request.formNo !=''">
+        <if test="request != null and request.formNo != null and request.formNo !=''">
             and form_no like concat('%',#{request.formNo},'%')
         </if>
-        <if test="request.customerName != null and request.customerName !=''">
+        <if test="request != null and request.customerName != null and request.customerName !=''">
             and customer_name like concat('%',#{request.customerName},'%')
         </if>
-        <if test="request.customerDeptName != null and request.customerDeptName !=''">
+        <if test="request != null and request.customerDeptName != null and request.customerDeptName !=''">
             and customer_dept_name like concat('%',#{request.customerDeptName},'%')
         </if>
-        <if test="request.createUserName != null and request.createUserName !=''">
+        <if test="request != null and request.createUserName != null and request.createUserName !=''">
             and create_user_name like concat('%',#{request.createUserName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSealUseNoteMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSealUseNoteMapper.xml
index ab37bc1..b02bb33 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSealUseNoteMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSealUseNoteMapper.xml
@@ -29,32 +29,32 @@
     </sql>
 
     <select id="selectBatchForApprovalList" resultMap="BaseResultMap">
-        SELECT *
+        SELECT brsun.*, brsi.seal_name, brsi.seal_type, brsi.approver_name
         FROM biz_resource_seal_use_note brsun
         JOIN biz_resource_seal_info brsi ON brsun.seal_id = brsi.id
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and brsun.approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and brsun.create_user_id = #{request.createUserId}
         </if>
-        <if test="request.sealName != null and request.sealName !=''">
+        <if test="request != null and request.sealName != null and request.sealName !=''">
             and brsi.seal_name like concat('%',#{request.sealName},'%')
         </if>
-        <if test="request.sealType != null and request.sealType !=''">
+        <if test="request != null and request.sealType != null and request.sealType !=''">
             and brsi.seal_type = #{request.sealType}
         </if>
-        <if test="request.applyDeptName != null and request.applyDeptName !=''">
+        <if test="request != null and request.applyDeptName != null and request.applyDeptName !=''">
             and brsun.apply_dept_name like concat('%',#{request.applyDeptName},'%')
         </if>
-        <if test="request.applyUserName != null and request.applyUserName !=''">
+        <if test="request != null and request.applyUserName != null and request.applyUserName !=''">
             and brsun.apply_user_name like concat('%',#{request.applyUserName},'%')
         </if>
-        <if test="request.applyTimeStart != null and request.applyTimeStart !=''">
+        <if test="request != null and request.applyTimeStart != null and request.applyTimeStart !=''">
             and brsun.apply_time &gt;= #{request.applyTimeStart}
         </if>
-        <if test="request.applyTimeEnd != null and request.applyTimeEnd !=''">
+        <if test="request != null and request.applyTimeEnd != null and request.applyTimeEnd !=''">
             and brsun.apply_time &lt;= #{request.applyTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml
index 119bf7d..4f8392a 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml
@@ -31,6 +31,12 @@
         <if test="request.deptName != null and request.deptName !=''">
             and brsi.dept_name like concat('%',#{request.deptName},'%')
         </if>
+        <if test="request.ids != null">
+            and brsv.id in
+            <foreach collection="request.ids" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
         ORDER BY brsv.grant_date DESC
     </select>
 
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSupplierInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSupplierInfoMapper.xml
index fe8d399..e8ce7ef 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSupplierInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSupplierInfoMapper.xml
@@ -48,28 +48,28 @@
         SELECT *
         FROM biz_resource_supplier_info
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.supplierNo != null and request.supplierNo !=''">
+        <if test="request != null and request.supplierNo != null and request.supplierNo !=''">
             and supplier_no like concat('%',#{request.supplierNo},'%')
         </if>
-        <if test="request.supplierName != null and request.supplierName !=''">
+        <if test="request != null and request.supplierName != null and request.supplierName !=''">
             and supplier_name like concat('%',#{request.supplierName},'%')
         </if>
-        <if test="request.director != null and request.director !=''">
+        <if test="request != null and request.director != null and request.director !=''">
             and director like concat('%',#{request.director},'%')
         </if>
-        <if test="request.supplierType != null and request.supplierType !=''">
+        <if test="request != null and request.supplierType != null and request.supplierType !=''">
             and supplier_type = #{request.supplierType}
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/EnvLocationInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/EnvLocationInfoMapper.xml
new file mode 100644
index 0000000..68bcf10
--- /dev/null
+++ b/casic-metering-dao/src/main/resources/mapper/resource/EnvLocationInfoMapper.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.mapper.resource.EnvLocationInfoMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.resource.EnvLocationInfo">
+        <id column="id" property="id" />
+        <result column="location_no" property="locationNo" />
+        <result column="location_name" property="locationName" />
+        <result column="location_position" property="locationPosition" />
+        <result column="create_user_id" property="createUserId" />
+        <result column="create_user" property="createUser" />
+        <result column="create_time" property="createTime" />
+        <result column="update_time" property="updateTime" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, location_no, location_name, location_position, create_user_id, create_user, create_time, update_time
+    </sql>
+
+    <select id="selectLocationListPage" resultType="com.casic.missiles.dto.resource.environment.LocationListResponse">
+        SELECT *
+        FROM env_location_info
+        WHERE 1=1
+        <if test="request.locationNo != null and request.locationNo !=''">
+            AND location_no LIKE concat('%',#{request.locationNo},'%')
+        </if>
+        <if test="request.locationName != null and request.locationName !=''">
+            AND location_name LIKE concat('%',#{request.locationName},'%')
+        </if>
+        ORDER BY create_time DESC
+    </select>
+
+</mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml
index b28c18f..8854047 100644
--- a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml
@@ -11,7 +11,6 @@
         <result column="sign_desc" property="signDesc" />
         <result column="sign_director" property="signDirector" />
         <result column="sign_user_id" property="signUserId" />
-        <result column="sign_type" property="signType" />
         <result column="minio_file_name" property="minioFileName" />
         <result column="create_time" property="createTime" />
         <result column="update_time" property="updateTime" />
@@ -28,7 +27,6 @@
         <result column="sign_name" property="signName" />
         <result column="sign_desc" property="signDesc" />
         <result column="sign_director" property="signDirector" />
-        <result column="sign_type" property="signType" />
         <result column="sign_user_id" property="signUserId" />
         <result column="minio_file_name" property="minioFileName" />
         <result column="create_time" property="createTime" />
@@ -62,4 +60,58 @@
         JOIN system_sign_user_relation ssur ON ss.id = ssur.sign_id
         WHERE ssur.user_id = #{userId}
     </select>
+
+    <select id="selectSignListPage" resultMap="BaseResultMap">
+        SELECT ss.*, sd.SIMPLE_NAME AS deptName
+        FROM system_sign ss
+        LEFT JOIN sys_user su ON su.id = ss.sign_user_id
+        LEFT JOIN sys_dept sd ON sd.id = su.dept_id
+        WHERE 1=1
+        <if test="request.signNo != null and request.signNo !=''">
+            AND ss.sign_no LIKE concat('%',#{request.signNo},'%')
+        </if>
+        <if test="request.signName != null and request.signName !=''">
+            AND ss.sign_name LIKE concat('%',#{request.signName},'%')
+        </if>
+        <if test="request.signDirector != null and request.signDirector !=''">
+            AND ss.sign_director LIKE concat('%',#{request.signDirector},'%')
+        </if>
+        <if test="request.signUserId != null and request.signUserId !=''">
+            AND ss.sign_user_id = #{request.signUserId}
+        </if>
+        <if test="request.createStartTime != null and request.createStartTime !=''">
+            AND DATE_FORMAT(ss.create_time,'%Y-%m-%d') &gt;= DATE_FORMAT(#{request.createStartTime},'%Y-%m-%d')
+        </if>
+        <if test="request.createEndTime != null and request.createEndTime !=''">
+            AND DATE_FORMAT(ss.create_time,'%Y-%m-%d')  &lt;= DATE_FORMAT(#{request.createEndTime},'%Y-%m-%d')
+        </if>
+        ORDER BY ss.create_time DESC
+    </select>
+
+    <select id="selectSignList" resultMap="BaseResultMap">
+        SELECT ss.*, sd.SIMPLE_NAME AS deptName
+        FROM system_sign ss
+        LEFT JOIN sys_user su ON su.id = ss.sign_user_id
+        LEFT JOIN sys_dept sd ON sd.id = su.dept_id
+        WHERE 1=1
+        <if test="request.signNo != null and request.signNo !=''">
+            AND ss.sign_no LIKE concat('%',#{request.signNo},'%')
+        </if>
+        <if test="request.signName != null and request.signName !=''">
+            AND ss.sign_name LIKE concat('%',#{request.signName},'%')
+        </if>
+        <if test="request.signDirector != null and request.signDirector !=''">
+            AND ss.sign_director LIKE concat('%',#{request.signDirector},'%')
+        </if>
+        <if test="request.signUserId != null and request.signUserId !=''">
+            AND ss.sign_user_id = #{request.signUserId}
+        </if>
+        <if test="request.createStartTime != null and request.createStartTime !=''">
+            AND DATE_FORMAT(ss.create_time,'%Y-%m-%d') &gt;= DATE_FORMAT(#{request.createStartTime},'%Y-%m-%d')
+        </if>
+        <if test="request.createEndTime != null and request.createEndTime !=''">
+            AND DATE_FORMAT(ss.create_time,'%Y-%m-%d')  &lt;= DATE_FORMAT(#{request.createEndTime},'%Y-%m-%d')
+        </if>
+        ORDER BY ss.create_time DESC
+    </select>
 </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 515050a..60f530b 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
@@ -47,8 +47,8 @@
     String STORAGE_LOCATION = "bizStorageLocation";
     //计量专业
     String MEASURE_MAJOR = "bizMeasureMajor";
-    //管理状态
-    String MANAGER_STATE = "bizManagerState";
+    //标准装置管理状态
+    String STANDARD_MANAGER_STATE = "bizStandardManagerState";
 
     /**
      * 资源管理 字典code
@@ -95,8 +95,6 @@
     String MEASURE_STATUS = "measureStatus";
     //检定方式
     String MEASURE_TYPE = "measureType";
-    //标识打印标志类型
-    String IDENTIFY_PRINT_TYPE = "bizBusinessIdentify";
     //变更类型
     String REPORT_CHANGE_TYPE = "bizCertChangeType";
     //规模类型
@@ -111,19 +109,24 @@
     String MEASURE_CATEGORY = "measureCategory";
     //检定结果
     String MEASURE_RESULT = "measureResult";
+    //分包原因
+    String OUTSOURCE_REASON = "outsourceReason";
+
+    /**
+     * 系统管理
+     */
+    String TEMPLATE_TYPE = "templateType";
+
 
     /**
      * 标准装置 字典code
      */
     //类别
     String STANDARD_CATEGORY = "standardCategory";
-    //管理状态
-    String STANDARD_MANAGER_STATE = "standardManagerState";
     //标准等级
     String STANDARD_LEVEL = "standardLevel";
     //传递范围
     String STANDARD_TRANSMIT_RANGE = "transmitRange";
-
     //资本来源
     String CAPITAL_SOURCE = "capitalSource";
     //标准装置-申请类型
@@ -148,8 +151,6 @@
     String CERTIFICATE_CLASS = "certificationClass";
     //证书管理-检校专业
     String CALIBRATION_MAJOR = "calibrationMajor";
-    //分包原因
-    String OUTSOURCE_REASON = "outsourceReason";
 
     /**
      * 工作台
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/BaseApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/BaseApprovalListRequest.java
index 73c12c1..80d7424 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/BaseApprovalListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/BaseApprovalListRequest.java
@@ -6,6 +6,7 @@
 
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotEmpty;
+import java.util.List;
 
 /**
  * @Description:
@@ -19,14 +20,14 @@
      * 表单id
      */
     @NotBlank(message = "表单id不能为空")
-    @ApiModelProperty(value = "表单id（流程定义对应的表单id，等价于业务id）", dataType = "String")
+    @ApiModelProperty(value = "表单id（流程定义对应的表单id，等价于业务id），导出接口不用传", dataType = "String")
     private String formId;
 
     /**
      * 审批状态类型，对应ApprovalStatusEnum
      */
     @NotEmpty(message = "审批状态类型不能为空")
-    @ApiModelProperty(value = "审批状态类型code", dataType = "String")
+    @ApiModelProperty(value = "审批状态类型code，导出接口不用传", dataType = "String")
     private String approvalStatus;
 
     @ApiModelProperty(hidden = true)
@@ -34,4 +35,7 @@
 
     @ApiModelProperty(hidden = true)
     private Long createUserId;
+
+    @ApiModelProperty(value = "导出ids", dataType = "List")
+    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificatePrintApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificatePrintApprovalListRequest.java
index b93d1c9..3cc2f4e 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificatePrintApprovalListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificatePrintApprovalListRequest.java
@@ -5,8 +5,6 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import java.util.List;
-
 /**
  * @Description:
  * @Author: wangpeng
@@ -38,7 +36,4 @@
 
     @ApiModelProperty(value = "创建结束时间", dataType = "String")
     private String createTimeEnd;
-
-    @ApiModelProperty(value = "导出ids", dataType = "List")
-    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportApprovalListRequest.java
index 4f7a038..c115847 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportApprovalListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportApprovalListRequest.java
@@ -5,8 +5,6 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import java.util.List;
-
 /**
  * @Description:
  * @Author: wangpeng
@@ -15,6 +13,8 @@
 @ApiModel
 @Data
 public class CertificateReportApprovalListRequest extends BaseApprovalListRequest {
+    @ApiModelProperty(value = "委托方id", dataType = "String")
+    private Long customerId;
 
     @ApiModelProperty(value = "证书报告编号", dataType = "String")
     private String certificateReportNo;
@@ -37,6 +37,4 @@
     @ApiModelProperty(value = "检校结束时间", dataType = "String")
     private String calibrationTimeEnd;
 
-    @ApiModelProperty(value = "导出ids", dataType = "List")
-    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/identify/IdentifyListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/identify/IdentifyListRequest.java
index 1b87ae6..f019203 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/identify/IdentifyListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/identify/IdentifyListRequest.java
@@ -4,6 +4,8 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * @Description:
  * @Author: wangpeng
@@ -26,4 +28,7 @@
 
     @ApiModelProperty(value = "打印结束时间", dataType = "String")
     private String createTimeEnd;
+
+    @ApiModelProperty(value = "导出ids", dataType = "List")
+    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListRequest.java
index 1264883..62415fb 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListRequest.java
@@ -7,6 +7,7 @@
 import lombok.Data;
 
 import javax.validation.constraints.NotBlank;
+import java.util.List;
 
 @Data
 @ApiModel
@@ -37,4 +38,6 @@
     @ApiModelProperty(value = "是否加急（1是0否null全部）", dataType = "Integer")
     private String isUrgent;
 
+    @ApiModelProperty(value = "导出ids", dataType = "List")
+    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListRequest.java
index 5201d7b..499760a 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListRequest.java
@@ -17,6 +17,9 @@
     @ApiModelProperty(value = "任务单编号", dataType = "String")
     private String orderNo;
 
+    @ApiModelProperty(value = "委托方id", dataType = "Long")
+    private Long customerId;
+
     @ApiModelProperty(value = "委托方名称", dataType = "String")
     private String customerName;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OrderSampleDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OrderSampleDTO.java
new file mode 100644
index 0000000..796edc0
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OrderSampleDTO.java
@@ -0,0 +1,19 @@
+package com.casic.missiles.dto.business.outsource;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/8/24 11:38
+ */
+@ApiModel
+@Data
+public class OrderSampleDTO {
+    @ApiModelProperty(value = "任务单id", dataType = "Long")
+    private Long orderId;
+    @ApiModelProperty(value = "受检设备id", dataType = "Long")
+    private Long sampleId;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceAssessApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceAssessApprovalListRequest.java
new file mode 100644
index 0000000..9a930c3
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceAssessApprovalListRequest.java
@@ -0,0 +1,30 @@
+package com.casic.missiles.dto.business.outsource;
+
+import com.casic.missiles.dto.BaseApprovalListRequest;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/8/24 11:01
+ */
+@ApiModel
+@Data
+public class OutsourceAssessApprovalListRequest extends BaseApprovalListRequest {
+    @ApiModelProperty(value = "评审表编号", dataType = "String")
+    private String projectNo;
+
+    @ApiModelProperty(value = "分包机构名称", dataType = "String")
+    private String outsourcerName;
+
+    @ApiModelProperty(value = "申请人", dataType = "String")
+    private String applicantName;
+
+    @ApiModelProperty(value = "申请时间开始", dataType = "String")
+    private String applicantTimeStart;
+
+    @ApiModelProperty(value = "申请时间结束", dataType = "String")
+    private String applicantTimeEnd;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceAssessSaveResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceAssessSaveResponse.java
new file mode 100644
index 0000000..8bf9aad
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceAssessSaveResponse.java
@@ -0,0 +1,20 @@
+package com.casic.missiles.dto.business.outsource;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/8/14 16:17
+ */
+@ApiModel
+@Data
+public class OutsourceAssessSaveResponse {
+    @ApiModelProperty(value = "主键id", dataType = "Long")
+    private Long id;
+
+    @ApiModelProperty(value = "编号", dataType = "String")
+    private String projectNo;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProtocolApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProtocolApprovalListRequest.java
new file mode 100644
index 0000000..0f32331
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProtocolApprovalListRequest.java
@@ -0,0 +1,30 @@
+package com.casic.missiles.dto.business.outsource;
+
+import com.casic.missiles.dto.BaseApprovalListRequest;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/8/24 15:01
+ */
+@ApiModel
+@Data
+public class OutsourceProtocolApprovalListRequest extends BaseApprovalListRequest {
+    @ApiModelProperty(value = "协议书编号", dataType = "String")
+    private String protocolNo;
+
+    @ApiModelProperty(value = "分包方名称", dataType = "String")
+    private String outsourcerName;
+
+    @ApiModelProperty(value = "申请人", dataType = "String")
+    private String applicantName;
+
+    @ApiModelProperty(value = "申请时间开始", dataType = "String")
+    private String applicantTimeStart;
+
+    @ApiModelProperty(value = "申请时间结束", dataType = "String")
+    private String applicantTimeEnd;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProtocolSaveResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProtocolSaveResponse.java
new file mode 100644
index 0000000..e324967
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProtocolSaveResponse.java
@@ -0,0 +1,20 @@
+package com.casic.missiles.dto.business.outsource;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/8/14 16:17
+ */
+@ApiModel
+@Data
+public class OutsourceProtocolSaveResponse {
+    @ApiModelProperty(value = "主键id", dataType = "Long")
+    private Long id;
+
+    @ApiModelProperty(value = "编号", dataType = "String")
+    private String protocolNo;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveApprovalListRequest.java
index f29f4e4..7047c28 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveApprovalListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveApprovalListRequest.java
@@ -5,8 +5,6 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import java.util.List;
-
 /**
  * @Description: 现场检测审批列表请求实体
  * @Author: wangpeng
@@ -30,7 +28,4 @@
     @ApiModelProperty(value = "申请时间结束", dataType = "String")
     private String applyTimeEnd;
 
-    @ApiModelProperty(value = "导出ids", dataType = "List")
-    private List<Long> ids;
-
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveDetailResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveDetailResponse.java
index 1f28752..394c934 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveDetailResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveDetailResponse.java
@@ -12,6 +12,18 @@
     @ApiModelProperty(value = "id，更新/删除使用参数", dataType = "Long")
     private Long id;
 
+    @ApiModelProperty(value = "实验室代码(字典code)", dataType = "String")
+    private String labCode;
+
+    @ApiModelProperty(value = "实验室代码(字典value)", dataType = "String")
+    private String labCodeName;
+
+    @ApiModelProperty(value = "组别代码(字典code)", dataType = "String")
+    private String groupCode;
+
+    @ApiModelProperty(value = "组别代码(字典value)", dataType = "String")
+    private String groupCodeName;
+
     @ApiModelProperty(value = "审批编号", dataType = "String")
     private String siteExecutiveNo;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/environment/LocationListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/environment/LocationListRequest.java
new file mode 100644
index 0000000..13d03c3
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/environment/LocationListRequest.java
@@ -0,0 +1,20 @@
+package com.casic.missiles.dto.resource.environment;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/6/8 13:56
+ */
+@ApiModel
+@Data
+public class LocationListRequest {
+    @ApiModelProperty(value = "地点编号", dataType = "String")
+    private String locationNo;
+
+    @ApiModelProperty(value = "地点名称", dataType = "String")
+    private String locationName;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/environment/LocationListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/environment/LocationListResponse.java
new file mode 100644
index 0000000..4c531af
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/environment/LocationListResponse.java
@@ -0,0 +1,78 @@
+package com.casic.missiles.dto.resource.environment;
+
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
+import com.baomidou.mybatisplus.annotation.TableField;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description: 地点列表响应实体
+ * @Author: wangpeng
+ * @Date: 2023/6/8 13:53
+ */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
+@ApiModel
+@Data
+public class LocationListResponse {
+    @ApiModelProperty(value = "主键id", dataType = "Long")
+    private Long id;
+
+    /**
+     * 地点编号
+     */
+    @ExcelProperty("地点编号")
+    @ApiModelProperty(value = "地点编号", dataType = "String")
+    private String locationNo;
+
+    /**
+     * 地点名称
+     */
+    @ExcelProperty("地点名称")
+    @ApiModelProperty(value = "地点名称", dataType = "String")
+    private String locationName;
+
+    /**
+     * 地点位置
+     */
+    @ExcelProperty("地点位置")
+    @ApiModelProperty(value = "地点位置", dataType = "String")
+    private String locationPosition;
+
+    /**
+     * 创建人id
+     */
+    @ApiModelProperty(value = "创建人id", dataType = "Long")
+    private Long createUserId;
+
+    /**
+     * 创建人
+     */
+    @ExcelProperty("创建人")
+    @ApiModelProperty(value = "创建人", dataType = "String")
+    @TableField("create_user")
+    private String createUser;
+
+    /**
+     * 创建时间
+     */
+    @ExcelProperty("创建时间")
+    @ApiModelProperty(value = "创建时间", dataType = "String")
+    private String createTime;
+
+    /**
+     * 更新时间
+     */
+    @ApiModelProperty(value = "更新时间", dataType = "String")
+    private String updateTime;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertRequest.java
index 9a7f6c6..c827915 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertRequest.java
@@ -4,6 +4,8 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * @Description:
  * @Author: wangpeng
@@ -16,4 +18,7 @@
     private String name;
     @ApiModelProperty(value = "部门名", dataType = "String")
     private String deptName;
+
+    @ApiModelProperty(value = "导出ids", dataType = "List")
+    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertResponse.java
index f78b159..8f2f79e 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertResponse.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.dto.resource.staff;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.casic.missiles.annotation.DictCodeField;
 import com.casic.missiles.constants.MeterDictCode;
 import io.swagger.annotations.ApiModel;
@@ -13,12 +20,18 @@
  * @Author: wangpeng
  * @Date: 2023/7/27 15:13
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @ApiModel
 @Data
 public class StaffCertResponse {
     /**
      * 人员编号
      */
+    @ExcelProperty(value = "人员编号",order = 0)
     @NotEmpty(message = "人员编号不能为空")
     @ApiModelProperty(value = "人员编号", dataType = "String")
     private String staffNo;
@@ -26,6 +39,7 @@
     /**
      * 姓名
      */
+    @ExcelProperty(value = "姓名",order = 1)
     @ApiModelProperty(value = "姓名", dataType = "String")
     private String staffName;
 
@@ -54,6 +68,7 @@
     /**
      * 部门名字
      */
+    @ExcelProperty(value = "工作部门",order = 2)
     @ApiModelProperty(value = "部门名字", dataType = "String")
     private String deptName;
 
@@ -66,6 +81,7 @@
     /**
      * 计量专业
      */
+    @ExcelProperty(value = "计量专业",order = 3)
     @ApiModelProperty(value = "计量专业", dataType = "String")
     private String major;
 
@@ -110,6 +126,7 @@
     /**
      * 证书号
      */
+    @ExcelProperty(value = "证号",order = 4)
     @ApiModelProperty(value = "证书号", dataType = "String")
     private String certNo;
 
@@ -122,12 +139,14 @@
     /**
      * 有效日期
      */
+    @ExcelProperty(value = "证书有效期",order = 6)
     @ApiModelProperty(value = "有效日期", dataType = "String")
     private String effectiveDate;
 
     /**
      * 发放日期
      */
+    @ExcelProperty(value = "发证日期",order = 5)
     @ApiModelProperty(value = "发放日期", dataType = "String")
     private String grantDate;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffListRequest.java
index 7c4afb3..0a1194a 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffListRequest.java
@@ -4,6 +4,8 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * @Description:
  * @Author: wangpeng
@@ -18,4 +20,7 @@
     private String deptName;
     @ApiModelProperty(value = "部门id", dataType = "Long")
     private Long deptId;
+
+    @ApiModelProperty(value = "导出ids", dataType = "List")
+    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/TrainListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/TrainListRequest.java
index f68597b..6321f8b 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/TrainListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/TrainListRequest.java
@@ -14,6 +14,8 @@
 public class TrainListRequest {
     @ApiModelProperty(value = "训练登记表编号", dataType = "String")
     private String trainNo;
+    @ApiModelProperty(value = "值班领导", dataType = "String")
+    private String dutyLeader;
     @ApiModelProperty(value = "创建开始时间", dataType = "String")
     private String createTimeStart;
     @ApiModelProperty(value = "创建结束时间", dataType = "String")
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/SignAddRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/SignAddRequest.java
index 117be34..d71055c 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/SignAddRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/SignAddRequest.java
@@ -43,13 +43,6 @@
     private Long signUserId;
 
     /**
-     * 签章或签名-字典code
-     */
-    @NotBlank(message = "类型不能为空")
-    @ApiModelProperty(value = "签名/签章-字典code", dataType = "String", required = true)
-    private String signType;
-
-    /**
      * minio存储文件名
      */
     @ApiModelProperty(value = "上传文件返回名称", dataType = "String")
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateAddRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateAddRequest.java
index aff1265..6316648 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateAddRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateAddRequest.java
@@ -17,30 +17,28 @@
 @Data
 public class TemplateAddRequest extends BaseSystemRequest {
     /**
-     * 原始记录模板/证书报告模板名称
+     * 模板名称
      */
     @ApiModelProperty(value = "名称", dataType = "String", required = true)
     @NotBlank(message = "名称不能为空")
     private String templateName;
 
     /**
-     * 原始记录模板/证书报告模板描述
+     * 模板描述
      */
     @ApiModelProperty(value = "描述", dataType = "String")
     private String templateDesc;
 
     /**
-     * 原始记录模板/证书报告模板创建人
+     * 创建人
      */
     @ApiModelProperty(value = "创建人", dataType = "String", required = true)
     @NotBlank(message = "创建人不能为空")
     private String templateCreator;
 
-    /**
-     * 原始记录模板/证书报告模板-字典code
-     */
-    @NotBlank(message = "类型不能为空")
-    @ApiModelProperty(value = "原始记录模板/证书报告模板-字典code", dataType = "String", required = true)
+
+    @NotBlank(message = "模板类型不能为空")
+    @ApiModelProperty(value = "模板类型(字典code)", dataType = "String", required = true)
     private String templateType;
 
     /**
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateListRequest.java
index eec5a1e..6d17bbe 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateListRequest.java
@@ -1,11 +1,12 @@
 package com.casic.missiles.dto.system;
 
+import com.casic.missiles.annotation.DictCodeField;
+import com.casic.missiles.constants.MeterDictCode;
 import com.casic.missiles.dto.BaseSystemRequest;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import javax.validation.constraints.NotBlank;
 import java.util.List;
 
 /**
@@ -19,8 +20,8 @@
     /**
      * 类型
      */
-//    @ApiModelProperty(value = "类型-字典code", dataType = "String", required = true)
-    @NotBlank(message = "类型不能为空")
+    @DictCodeField(message = "模板类型不合法", cacheName = MeterDictCode.TEMPLATE_TYPE)
+    @ApiModelProperty(value = "模板类型(字典code)", dataType = "String")
     private String templateType;
 
     /**
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificateChangeApply.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificateChangeApply.java
index 9216308..36923fd 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificateChangeApply.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificateChangeApply.java
@@ -1,11 +1,19 @@
 package com.casic.missiles.model.business;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 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 com.casic.missiles.dto.BaseRequest;
+import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -20,6 +28,12 @@
  * @author wangpeng
  * @since 2023-08-15
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
+@ApiModel
 @Data
 @TableName("biz_business_certificate_change_apply")
 public class BizBusinessCertificateChangeApply extends BaseRequest implements Serializable {
@@ -33,6 +47,7 @@
     /**
      * 申请单编号
      */
+    @ExcelProperty(value = "申请单编号", order = 1)
     @ApiModelProperty(value = "申请单编号", dataType = "String")
     @TableField("change_apply_no")
     private String changeApplyNo;
@@ -40,6 +55,7 @@
     /**
      * 申请单名字
      */
+    @ExcelProperty(value = "申请单名称", order = 2)
     @ApiModelProperty(value = "申请单名字", dataType = "String")
     @TableField("change_apply_name")
     private String changeApplyName;
@@ -54,6 +70,7 @@
     /**
      * 更换证书编号
      */
+    @ExcelProperty(value = "更换证书编号", order = 3)
     @ApiModelProperty(value = "更换证书编号", dataType = "String")
     @TableField("change_report_no")
     private String changeReportNo;
@@ -61,7 +78,8 @@
     /**
      * 更换证书名字
      */
-    @ApiModelProperty(value = "更换证书名字", dataType = "String")
+    @ExcelProperty(value = "更换证书/报告名称", order = 4)
+    @ApiModelProperty(value = "更换证书/报告名称", dataType = "String")
     @TableField("change_report_name")
     private String changeReportName;
 
@@ -73,6 +91,7 @@
     @TableField("change_type")
     private String changeType;
 
+    @ExcelProperty(value = "变更类型", order = 5)
     @ApiModelProperty(value = "变更类型(字典value)", dataType = "String")
     @TableField(exist = false)
     private String changeTypeName;
@@ -142,13 +161,15 @@
     /**
      * 创建用户名字
      */
-    @ApiModelProperty(value = "创建用户名字", dataType = "String")
+    @ExcelProperty(value = "创建人", order = 6)
+    @ApiModelProperty(value = "创建人名字", dataType = "String")
     @TableField("create_user_name")
     private String createUserName;
 
     /**
      * 创建时间
      */
+    @ExcelProperty(value = "创建时间", order = 7)
     @ApiModelProperty(value = "创建时间", dataType = "String")
     @TableField("create_time")
     private String createTime;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificateReport.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificateReport.java
index f01db9e..db06018 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificateReport.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificateReport.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.model.business;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -22,6 +29,11 @@
  * @author wangpeng
  * @since 2023-08-14
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @ApiModel
 @Data
 @TableName("biz_business_certificate_report")
@@ -36,6 +48,7 @@
     /**
      * 证书报告编号
      */
+    @ExcelProperty(value = "证书报告编号", order = 1)
     @ApiModelProperty(value = "证书报告编号", dataType = "String")
     @TableField("certificate_report_no")
     private String certificateReportNo;
@@ -43,6 +56,7 @@
     /**
      * 证书报告名称
      */
+    @ExcelProperty(value = "证书报告名称", order = 2)
     @ApiModelProperty(value = "证书报告名称", dataType = "String")
     @TableField("certificate_report_name")
     private String certificateReportName;
@@ -62,6 +76,7 @@
     @TableField("measure_category")
     private String measureCategory;
 
+    @ExcelProperty(value = "检校类别", order = 6)
     @ApiModelProperty(value = "检校类别(字典value)", dataType = "String")
     @TableField(exist = false)
     private String measureCategoryName;
@@ -69,6 +84,7 @@
     /**
      * 检校时间
      */
+    @ExcelProperty(value = "检校时间", order = 8)
     @ApiModelProperty(value = "检校时间", dataType = "String")
     @TableField("calibration_time")
     private String calibrationTime;
@@ -267,18 +283,22 @@
     @TableField(exist = false)
     private Integer decisionItem;
 
-    @ApiModelProperty(value = "设备样品编号（列表返回参数）", dataType = "String")
+    @ExcelProperty(value = "被检设备统一编号", order = 3)
+    @ApiModelProperty(value = "被检设备统一编号（列表返回参数）", dataType = "String")
     @TableField(exist = false)
     private String sampleNo;
 
-    @ApiModelProperty(value = "设备样品名称（列表返回参数）", dataType = "String")
+    @ExcelProperty(value = "被检设备名称", order = 4)
+    @ApiModelProperty(value = "被检设备名称（列表返回参数）", dataType = "String")
     @TableField(exist = false)
     private String sampleName;
 
-    @ApiModelProperty(value = "设备样品规格型号（列表返回参数）", dataType = "String")
+    @ExcelProperty(value = "规格型号", order = 5)
+    @ApiModelProperty(value = "规格型号（列表返回参数）", dataType = "String")
     @TableField(exist = false)
     private String sampleModel;
 
+    @ExcelProperty(value = "检定员", order = 7)
     @ApiModelProperty(value = "检定员名字（列表返回参数）", dataType = "String")
     @TableField(exist = false)
     private String staffName;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessIdentifyInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessIdentifyInfo.java
index 46bfba5..f1a9bec 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessIdentifyInfo.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessIdentifyInfo.java
@@ -1,10 +1,15 @@
 package com.casic.missiles.model.business;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 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;
 
@@ -20,6 +25,11 @@
  * @author wangpeng
  * @since 2023-08-15
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @Data
 @TableName("biz_business_identify_info")
 public class BizBusinessIdentifyInfo implements Serializable {
@@ -33,6 +43,7 @@
     /**
      * 记录编号
      */
+    @ExcelProperty(value = "记录编号", order = 1)
     @ApiModelProperty(value = "记录编号", dataType = "String")
     @TableField("record_no")
     private String recordNo;
@@ -41,20 +52,15 @@
      * 标志类型(字典code)
      */
     @NotEmpty(message = "标志类型不能为空")
-    @ApiModelProperty(value = "标志类型(字典code)", dataType = "String")
-    @DictCodeField(message = "标志类型不合法", cacheName = MeterDictCode.IDENTIFY_PRINT_TYPE)
+    @ApiModelProperty(value = "标志类型(直接存计量标识/使用状态/校准状态的字典value)", dataType = "String")
     @TableField("identify_type")
     private String identifyType;
 
-    @ApiModelProperty(value = "标志类型(字典value)", dataType = "String")
-    @TableField(exist = false)
-    private String identifyTypeName;
-
     /**
      * 设备id(可以是受检设备/设备台账)
      */
     @NotNull(message = "设备id不能为空")
-    @ApiModelProperty(value = "设备id(可以是受检设备/设备台账)", dataType = "String")
+    @ApiModelProperty(value = "设备id(可以是受检设备/设备台账)", dataType = "Long")
     @TableField("device_id")
     private Long deviceId;
 
@@ -66,29 +72,32 @@
     @TableField("device_type")
     private String deviceType;
 
+    @ExcelProperty(value = "统一编号", order = 3)
     @NotEmpty(message = "设备编号不能为空")
-    @ApiModelProperty(value = "设备编号", dataType = "String")
+    @ApiModelProperty(value = "统一编号", dataType = "String")
     @TableField("device_no")
     private String deviceNo;
 
     /**
      * 设备名字
      */
-    @NotEmpty(message = "设备名字不能为空")
-    @ApiModelProperty(value = "设备名字", dataType = "String")
+    @ExcelProperty(value = "设备名称", order = 4)
+    @NotEmpty(message = "设备名称不能为空")
+    @ApiModelProperty(value = "设备名称", dataType = "String")
     @TableField("device_name")
     private String deviceName;
 
     /**
      * 检定员id
      */
-    @ApiModelProperty(value = "检定员id", dataType = "String")
+    @ApiModelProperty(value = "检定员id", dataType = "Long")
     @TableField("measure_person_id")
     private Long measurePersonId;
 
     /**
      * 检定员名字
      */
+    @ExcelProperty(value = "检定员", order = 5)
     @ApiModelProperty(value = "检定员名字", dataType = "String")
     @TableField("measure_person")
     private String measurePerson;
@@ -103,7 +112,8 @@
     /**
      * 更新时间
      */
-    @ApiModelProperty(value = "更新时间", dataType = "String")
+    @ExcelProperty(value = "打印时间", order = 6)
+    @ApiModelProperty(value = "打印时间", dataType = "String")
     @TableField("update_time")
     private String updateTime;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceAssess.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceAssess.java
index 659d9ca..6720b90 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceAssess.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceAssess.java
@@ -1,11 +1,26 @@
 package com.casic.missiles.model.business;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 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 com.casic.missiles.dto.BaseRequest;
+import com.casic.missiles.dto.business.outsource.OrderSampleDTO;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import javax.validation.constraints.NotEmpty;
 import java.io.Serializable;
+import java.util.List;
 
 /**
  * <p>
@@ -15,146 +30,231 @@
  * @author wangpeng
  * @since 2023-08-16
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
+@ApiModel
 @Data
 @TableName("biz_business_outsource_assess")
-public class BizBusinessOutsourceAssess implements Serializable {
+public class BizBusinessOutsourceAssess extends BaseRequest implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
+    @ApiModelProperty(value = "id，更新/删除使用参数", dataType = "Long")
     @TableId("id")
     private Long id;
 
     /**
      * 评审表编号
      */
+    @ExcelProperty(value = "评审表编号", order = 1)
+    @ApiModelProperty(value = "评审表编号(后台生成)", dataType = "String")
     @TableField("project_no")
     private String projectNo;
 
     /**
      * 评审表名称
      */
+    @ExcelProperty(value = "评审表名称", order = 2)
+    @ApiModelProperty(value = "评审表名称", dataType = "String")
     @TableField("project_name")
     private String projectName;
 
+    @NotEmpty(message = "实验室代码不能为空")
+    @DictCodeField(message = "实验室代码描述不合法", cacheName = MeterDictCode.LAB_CODE)
+    @ApiModelProperty(value = "实验室代码(字典code)", dataType = "String")
+    @TableField("lab_code")
+    private String labCode;
+
+    @ApiModelProperty(value = "实验室代码(字典value)", dataType = "String")
+    @TableField(exist = false)
+    private String labCodeName;
+
+    /**
+     * 组别代码
+     */
+    @NotEmpty(message = "组别代码不能为空")
+    @DictCodeField(message = "组别代码描述不合法", cacheName = MeterDictCode.GROUP_CODE)
+    @ApiModelProperty(value = "组别代码(字典code)", dataType = "String")
+    @TableField("group_code")
+    private String groupCode;
+
+    @ApiModelProperty(value = "组别代码(字典value)", dataType = "String")
+    @TableField(exist = false)
+    private String groupCodeName;
+
     /**
      * 申请人id
      */
+    @ApiModelProperty(value = "申请人id", dataType = "String")
     @TableField("applicant_id")
     private Long applicantId;
 
     /**
      * 申请人名字
      */
+    @ExcelProperty(value = "申请人", order = 5)
+    @ApiModelProperty(value = "申请人", dataType = "String")
     @TableField("applicant_name")
     private String applicantName;
 
     /**
      * 申请时间
      */
+    @ExcelProperty(value = "申请时间", order = 6)
+    @ApiModelProperty(value = "申请时间", dataType = "String")
     @TableField("applicant_time")
     private String applicantTime;
 
     /**
      * 附件(minio存储文件名)
      */
+    @ApiModelProperty(value = "附件(minio存储文件名)", dataType = "String")
     @TableField("minio_file_name")
     private String minioFileName;
 
     /**
      * 备注
      */
+    @ApiModelProperty(value = "备注", dataType = "String")
     @TableField("remark")
     private String remark;
 
     /**
      * 创建人id
      */
+    @ApiModelProperty(value = "创建人id", dataType = "String")
     @TableField("create_user_id")
     private Long createUserId;
 
     /**
      * 创建人名字
      */
+    @ApiModelProperty(value = "创建人名字", dataType = "String")
     @TableField("create_user_name")
     private String createUserName;
 
     /**
      * 分包方id
      */
+    @ApiModelProperty(value = "评审表编号", dataType = "String")
     @TableField("outsourcer_id")
     private Long outsourcerId;
 
     /**
      * 预计开始时间
      */
+    @ApiModelProperty(value = "预计开始时间", dataType = "String")
     @TableField("pre_start_time")
     private String preStartTime;
 
     /**
      * 预计结束时间
      */
+    @ApiModelProperty(value = "预计结束时间", dataType = "String")
     @TableField("pre_end_time")
     private String preEndTime;
 
     /**
      * 分包原因-字典
      */
+    @ApiModelProperty(value = "分包原因(字典code)", dataType = "String")
+    @DictCodeField(message = "分包原因描述不合法", cacheName = MeterDictCode.OUTSOURCE_REASON)
     @TableField("outsource_reason")
     private String outsourceReason;
 
+    @ApiModelProperty(value = "分包原因(字典value)", dataType = "String")
+    @TableField(exist = false)
+    private String outsourceReasonName;
+
     /**
      * 预计费用
      */
+    @ApiModelProperty(value = "预计费用", dataType = "String")
     @TableField("pre_cost")
     private String preCost;
 
     /**
      * 审批状态
      */
+    @ApiModelProperty(value = "审批状态", dataType = "String")
+    @DictCodeField(message = "审批状态描述不合法", cacheName = MeterDictCode.APPROVAL_STATUS)
     @TableField("approval_status")
     private String approvalStatus;
 
     /**
      * 流程实例id
      */
+    @ApiModelProperty(value = "流程实例id", dataType = "String")
     @TableField("process_id")
     private String processId;
 
     /**
      * 实验室认可情况
      */
+    @ApiModelProperty(value = "实验室认可情况", dataType = "String")
     @TableField("approve_situation")
     private String approveSituation;
 
     /**
      * 溯源性
      */
+    @ApiModelProperty(value = "溯源性", dataType = "String")
     @TableField("traceability")
     private String traceability;
 
     /**
      * 测试方法
      */
+    @ApiModelProperty(value = "测试方法", dataType = "String")
     @TableField("test_method")
     private String testMethod;
 
     /**
      * 技术能力
      */
+    @ApiModelProperty(value = "技术能力", dataType = "String")
     @TableField("technique_ability")
     private String techniqueAbility;
 
     /**
      * 创建时间
      */
+    @ApiModelProperty(hidden = true)
     @TableField("create_time")
     private String createTime;
 
     /**
      * 更新时间
      */
+    @ApiModelProperty(hidden = true)
     @TableField("update_time")
     private String updateTime;
 
+    @ApiModelProperty(value = "审批状态类型-字典value", dataType = "String")
+    @TableField(exist = false)
+    private String approvalStatusName;
 
+    @ApiModelProperty(value = "任务id（同意、驳回等操作使用）", dataType = "String")
+    @TableField(exist = false)
+    private String taskId;
+
+    @ApiModelProperty(value = "可选决策项（1同意驳回拒绝 2同意驳回 3同意拒绝，用于待审批列表同意/驳回/拒绝按钮展示）", dataType = "Integer")
+    @TableField(exist = false)
+    private Integer decisionItem;
+
+    @NotEmpty(message = "受检设备信息不能为空")
+    @ApiModelProperty(value = "受检设备id列表（新建使用参数）", dataType = "List")
+    @TableField(exist = false)
+    private List<OrderSampleDTO> orderSampleList;
+
+    @ExcelProperty(value = "分包机构名称", order = 3)
+    @ApiModelProperty(value = "分包机构名称（列表返回参数）", dataType = "String")
+    private String outsourcerName;
+
+    @ExcelProperty(value = "机构负责人", order = 4)
+    @ApiModelProperty(value = "机构负责人（列表返回参数）", dataType = "String")
+    private String director;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceProtocol.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceProtocol.java
new file mode 100644
index 0000000..38df697
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceProtocol.java
@@ -0,0 +1,225 @@
+package com.casic.missiles.model.business;
+
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
+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 com.casic.missiles.dto.BaseRequest;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotEmpty;
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 计量检定业务-分包管理-测试、校准或检定工作分包协议书
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-08-24
+ */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
+@Data
+@TableName("biz_business_outsource_protocol")
+public class BizBusinessOutsourceProtocol extends BaseRequest implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "id，更新/删除使用参数", dataType = "Long")
+    @TableId("id")
+    private Long id;
+
+    /**
+     * 协议书编号
+     */
+    @ExcelProperty(value = "协议书编号", order = 1)
+    @ApiModelProperty(value = "协议书编号(后台生成)", dataType = "String")
+    @TableField("protocol_no")
+    private String protocolNo;
+
+    /**
+     * 协议书名称
+     */
+    @ExcelProperty(value = "协议书名称", order = 2)
+    @ApiModelProperty(value = "协议书名称", dataType = "String")
+    @TableField("project_name")
+    private String projectName;
+
+    @NotEmpty(message = "实验室代码不能为空")
+    @DictCodeField(message = "实验室代码描述不合法", cacheName = MeterDictCode.LAB_CODE)
+    @ApiModelProperty(value = "实验室代码(字典code)", dataType = "String")
+    @TableField("lab_code")
+    private String labCode;
+
+    @ApiModelProperty(value = "实验室代码(字典value)", dataType = "String")
+    @TableField(exist = false)
+    private String labCodeName;
+
+    @NotEmpty(message = "组别代码不能为空")
+    @DictCodeField(message = "组别代码描述不合法", cacheName = MeterDictCode.GROUP_CODE)
+    @ApiModelProperty(value = "组别代码(字典code)", dataType = "String")
+    @TableField("group_code")
+    private String groupCode;
+
+    @ApiModelProperty(value = "组别代码(字典value)", dataType = "String")
+    @TableField(exist = false)
+    private String groupCodeName;
+
+    /**
+     * 分包方id
+     */
+    @ApiModelProperty(value = "分包方id", dataType = "Long")
+    @TableField("outsourcer_id")
+    private Long outsourcerId;
+
+    /**
+     * 其他
+     */
+    @ApiModelProperty(value = "其他", dataType = "String")
+    @TableField("remark")
+    private String remark;
+
+    /**
+     * 分包方编号
+     */
+    @ApiModelProperty(value = "分包方编号(新建不用传)", dataType = "String")
+    @TableField("outsource_no")
+    private String outsourceNo;
+
+    /**
+     * 分包方名称
+     */
+    @ExcelProperty(value = "分包方名称", order = 3)
+    @ApiModelProperty(value = "分包方名称(新建不用传)", dataType = "String")
+    @TableField("outsource_name")
+    private String outsourceName;
+
+    /**
+     * 联系人
+     */
+    @ExcelProperty(value = "联系人", order = 4)
+    @ApiModelProperty(value = "联系人", dataType = "String")
+    @TableField("contacts")
+    private String contacts;
+
+    /**
+     * 电话
+     */
+    @ApiModelProperty(value = "电话", dataType = "String")
+    @TableField("mobile")
+    private String mobile;
+
+    /**
+     * 地址
+     */
+    @ApiModelProperty(value = "地址", dataType = "String")
+    @TableField("address")
+    private String address;
+
+    /**
+     * 要求完成日期
+     */
+    @ApiModelProperty(value = "要求完成日期", dataType = "String")
+    @TableField("require_date")
+    private String requireDate;
+
+    /**
+     * 分包费用(元)
+     */
+    @ApiModelProperty(value = "分包费用(元)", dataType = "String")
+    @TableField("outsource_cost")
+    private Double outsourceCost;
+
+    /**
+     * 分包方负责人
+     */
+    @ApiModelProperty(value = "分包方负责人", dataType = "String")
+    @TableField("director")
+    private String director;
+
+    /**
+     * 分包项目
+     */
+    @ApiModelProperty(value = "分包项目", dataType = "String")
+    @TableField("item")
+    private String item;
+
+    /**
+     * 分包要求
+     */
+    @ApiModelProperty(value = "分包要求", dataType = "String")
+    @TableField("requires")
+    private String requires;
+
+    /**
+     * 创建人id
+     */
+    @ApiModelProperty(hidden = true)
+    @TableField("create_user_id")
+    private Long createUserId;
+
+    /**
+     * 创建人名字
+     */
+    @ExcelProperty(value = "申请人", order = 5)
+    @ApiModelProperty(value = "申请人", dataType = "String")
+    @TableField("create_user_name")
+    private String createUserName;
+
+    /**
+     * 审批状态
+     */
+    @ApiModelProperty(value = "审批状态", dataType = "String")
+    @DictCodeField(message = "审批状态描述不合法", cacheName = MeterDictCode.APPROVAL_STATUS)
+    @TableField("approval_status")
+    private String approvalStatus;
+
+    /**
+     * 流程实例id
+     */
+    @ApiModelProperty(value = "流程实例id", dataType = "String")
+    @TableField("process_id")
+    private String processId;
+
+    /**
+     * 创建时间
+     */
+    @ExcelProperty(value = "申请时间", order = 6)
+    @ApiModelProperty(value = "申请时间", dataType = "String")
+    @TableField("create_time")
+    private String createTime;
+
+    /**
+     * 更新时间
+     */
+    @ApiModelProperty(hidden = true)
+    @TableField("update_time")
+    private String updateTime;
+
+    @ApiModelProperty(value = "审批状态类型-字典value", dataType = "String")
+    @TableField(exist = false)
+    private String approvalStatusName;
+
+    @ApiModelProperty(value = "任务id（同意、驳回等操作使用）", dataType = "String")
+    @TableField(exist = false)
+    private String taskId;
+
+    @ApiModelProperty(value = "可选决策项（1同意驳回拒绝 2同意驳回 3同意拒绝，用于待审批列表同意/驳回/拒绝按钮展示）", dataType = "Integer")
+    @TableField(exist = false)
+    private Integer decisionItem;
+
+
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourcerInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourcerInfo.java
index ec4e997..f9aa69e 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourcerInfo.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourcerInfo.java
@@ -17,6 +17,7 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import javax.validation.constraints.NotEmpty;
 import java.io.Serializable;
 
 /**
@@ -59,6 +60,29 @@
     @TableField("outsourcer_name")
     private String outsourcerName;
 
+    @NotEmpty(message = "实验室代码不能为空")
+    @DictCodeField(message = "实验室代码描述不合法", cacheName = MeterDictCode.LAB_CODE)
+    @ApiModelProperty(value = "实验室代码(字典code)", dataType = "String")
+    @TableField("lab_code")
+    private String labCode;
+
+    @ApiModelProperty(value = "实验室代码(字典value)", dataType = "String")
+    @TableField(exist = false)
+    private String labCodeName;
+
+    /**
+     * 组别代码
+     */
+    @NotEmpty(message = "组别代码不能为空")
+    @DictCodeField(message = "组别代码描述不合法", cacheName = MeterDictCode.GROUP_CODE)
+    @ApiModelProperty(value = "组别代码(字典code)", dataType = "String")
+    @TableField("group_code")
+    private String groupCode;
+
+    @ApiModelProperty(value = "组别代码(字典value)", dataType = "String")
+    @TableField(exist = false)
+    private String groupCodeName;
+
     /**
      * 单位简称
      */
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardInfo.java
index c48eed7..dffdfdd 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardInfo.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardInfo.java
@@ -5,6 +5,7 @@
 import com.baomidou.mybatisplus.annotation.TableName;
 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;
 
@@ -18,6 +19,7 @@
  * @author wangpeng
  * @since 2023-08-04
  */
+@ApiModel
 @Data
 @TableName("biz_equipment_standard_info")
 public class BizEquipmentStandardInfo implements Serializable {
@@ -119,7 +121,7 @@
      * 管理状态(字典code)
      */
     @ApiModelProperty(value = "管理状态(字典code)", dataType = "String")
-    @DictCodeField(message = "管理状态不合法", cacheName = MeterDictCode.MANAGER_STATE)
+    @DictCodeField(message = "管理状态不合法", cacheName = MeterDictCode.STANDARD_MANAGER_STATE)
     @TableField("manage_status")
     private String manageStatus;
 
@@ -151,7 +153,7 @@
     /**
      * 温度(℃)
      */
-    @ApiModelProperty(value = "使用状态(字典code)", dataType = "String")
+    @ApiModelProperty(value = "温度(℃)", dataType = "String")
     @TableField("temperature")
     private Double temperature;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardInfoApproval.java b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardInfoApproval.java
index dbd86ab..9f58d83 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardInfoApproval.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardInfoApproval.java
@@ -150,7 +150,7 @@
      * 管理状态(字典code)
      */
     @ApiModelProperty(value = "管理状态(字典code)", dataType = "String")
-    @DictCodeField(message = "管理状态不合法", cacheName = MeterDictCode.MANAGER_STATE)
+    @DictCodeField(message = "管理状态不合法", cacheName = MeterDictCode.STANDARD_MANAGER_STATE)
     @TableField("manage_status")
     private String manageStatus;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardTechnologyRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardTechnologyRelation.java
index 0e612bd..751f26b 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardTechnologyRelation.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardTechnologyRelation.java
@@ -3,6 +3,7 @@
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -16,6 +17,7 @@
  * @author wangpeng
  * @since 2023-08-04
  */
+@ApiModel
 @Data
 @TableName("biz_equipment_standard_technology_relation")
 public class BizEquipmentStandardTechnologyRelation implements Serializable {
@@ -33,6 +35,10 @@
     @TableField("technology_file_id")
     private Long technologyFileId;
 
+    @ApiModelProperty(value = "依据的技术文件编号", dataType = "String")
+    @TableField("technology_file_no")
+    private String technologyFileNo;
+
     /**
      * 依据的技术文件名称(技术文件中现行测试校准检定方法表文件名字段)
      */
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerInfo.java
index d6e8bed..65cd6bc 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerInfo.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerInfo.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.model.resource;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -21,6 +28,11 @@
  * @author wangpeng
  * @since 2023-08-08
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @ApiModel
 @Data
 @TableName("biz_resource_customer_info")
@@ -35,6 +47,7 @@
     /**
      * 委托方编号
      */
+    @ExcelProperty(value = "委托方编号", order = 1)
     @ApiModelProperty(value = "委托方编号", dataType = "String")
     @TableField("customer_no")
     private String customerNo;
@@ -42,6 +55,7 @@
     /**
      * 委托方名称
      */
+    @ExcelProperty(value = "委托方名称", order = 2)
     @ApiModelProperty(value = "委托方名称(新建时为下拉选择一个受检单位组织的名字，传deptId字段，后端获取名称)", dataType = "String")
     @TableField("customer_name")
     private String customerName;
@@ -63,6 +77,7 @@
     /**
      * 联系人
      */
+    @ExcelProperty(value = "联系人", order = 3)
     @ApiModelProperty(value = "联系人", dataType = "String")
     @TableField("contacts")
     private String contacts;
@@ -70,6 +85,7 @@
     /**
      * 座机电话
      */
+    @ExcelProperty(value = "座机电话", order = 4)
     @ApiModelProperty(value = "座机电话", dataType = "String")
     @TableField("mobile")
     private String mobile;
@@ -77,6 +93,7 @@
     /**
      * 手机号码
      */
+    @ExcelProperty(value = "手机号码", order = 5)
     @ApiModelProperty(value = "手机号码", dataType = "String")
     @TableField("phone")
     private String phone;
@@ -91,6 +108,7 @@
     /**
      * 地址
      */
+    @ExcelProperty(value = "地址", order = 6)
     @ApiModelProperty(value = "地址", dataType = "String")
     @TableField("address")
     private String address;
@@ -141,6 +159,7 @@
     /**
      * 创建时间
      */
+    @ExcelProperty(value = "创建时间", order = 7)
     @ApiModelProperty(value = "创建时间", dataType = "String")
     @TableField("create_time")
     private String createTime;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerSuggestForm.java b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerSuggestForm.java
index 7201bbd..701bf8b 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerSuggestForm.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerSuggestForm.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.model.resource;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -22,6 +29,11 @@
  * @author wangpeng
  * @since 2023-08-08
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @ApiModel
 @Data
 @TableName("biz_resource_customer_suggest_form")
@@ -44,7 +56,8 @@
     /**
      * 委托方名称
      */
-    @ApiModelProperty(value = "委托方名称", dataType = "String")
+    @ExcelProperty(value = "意见反馈单位", order = 2)
+    @ApiModelProperty(value = "意见反馈单位", dataType = "String")
     @TableField("customer_name")
     private String customerName;
 
@@ -59,7 +72,8 @@
     /**
      * 委托方意见反馈部门名称
      */
-    @ApiModelProperty(value = "委托方意见反馈部门名称", dataType = "String")
+    @ExcelProperty(value = "委托方意见反馈部门", order = 3)
+    @ApiModelProperty(value = "委托方意见反馈部门", dataType = "String")
     @TableField("customer_dept_name")
     private String customerDeptName;
 
@@ -73,6 +87,7 @@
     /**
      * 表单编号
      */
+    @ExcelProperty(value = "表单编号", order = 1)
     @ApiModelProperty(value = "表单编号", dataType = "String")
     @TableField("form_no")
     private String formNo;
@@ -111,6 +126,7 @@
     /**
      * 创建人名字
      */
+    @ExcelProperty(value = "创建人", order = 4)
     @ApiModelProperty(value = "创建人名字", dataType = "String")
     @TableField("create_user_name")
     private String createUserName;
@@ -147,6 +163,7 @@
     /**
      * 创建时间
      */
+    @ExcelProperty(value = "创建时间", order = 5)
     @ApiModelProperty(value = "创建时间", dataType = "String")
     @TableField("create_time")
     private String createTime;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSealInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSealInfo.java
index cbf05d7..9bf389d 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSealInfo.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSealInfo.java
@@ -106,6 +106,10 @@
     @TableField("minio_file_name")
     private String minioFileName;
 
+    @ApiModelProperty(value = "minio存储文件url", dataType = "String")
+    @TableField(exist = false)
+    private String minioFileUrl;
+
     @ApiModelProperty(value = "创建时间", dataType = "String")
     @TableField("create_time")
     private String createTime;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSealUseNote.java b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSealUseNote.java
index 3f2d9e8..3ce16a8 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSealUseNote.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSealUseNote.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.model.resource;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -20,6 +27,11 @@
  * @author wangpeng
  * @since 2023-07-28
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @ApiModel
 @Data
 @TableName("biz_resource_seal_use_note")
@@ -34,6 +46,7 @@
     /**
      * 登记表编号
      */
+    @ExcelProperty(value = "申请单编号", order = 1)
     @ApiModelProperty(value = "登记表编号(自动生成)", dataType = "String")
     @TableField("note_form_no")
     private String noteFormNo;
@@ -55,6 +68,7 @@
     /**
      * 申请部门
      */
+    @ExcelProperty(value = "申请部门", order = 5)
     @ApiModelProperty(value = "申请部门", dataType = "String")
     @TableField("apply_dept_name")
     private String applyDeptName;
@@ -69,6 +83,7 @@
     /**
      * 申请人
      */
+    @ExcelProperty(value = "申请人", order = 6)
     @ApiModelProperty(value = "申请人", dataType = "String")
     @TableField("apply_user_name")
     private String applyUserName;
@@ -76,6 +91,7 @@
     /**
      * 申请时间
      */
+    @ExcelProperty(value = "申请时间", order = 7)
     @ApiModelProperty(value = "申请时间(新增自动获取当前时间)", dataType = "String")
     @TableField("apply_time")
     private String applyTime;
@@ -130,6 +146,26 @@
     @TableField("update_time")
     private String updateTime;
 
+    @ExcelProperty(value = "印章名称", order = 2)
+    @ApiModelProperty(value = "印章名称(列表返回参数)", dataType = "String")
+    @TableField(exist = false)
+    private String sealName;
+
+    @DictCodeField(message = "印章类型描述不合法", cacheName = MeterDictCode.SEAL_TYPE)
+    @ApiModelProperty(hidden = true)
+    @TableField(exist = false)
+    private String sealType;
+
+    @ExcelProperty(value = "印章类型", order = 3)
+    @ApiModelProperty(value = "印章类型(列表返回参数)", dataType = "String")
+    @TableField(exist = false)
+    private String sealTypeName;
+
+    @ExcelProperty(value = "批准人", order = 4)
+    @ApiModelProperty(value = "批准人(列表返回参数)", dataType = "String")
+    @TableField(exist = false)
+    private String approverName;
+
     @ApiModelProperty(value = "审批状态类型-字典value", dataType = "String")
     @TableField(exist = false)
     private String approvalStatusName;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceStaffInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceStaffInfo.java
index 5ef995b..41563a1 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceStaffInfo.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceStaffInfo.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.model.resource;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -20,6 +27,11 @@
  * @author wangpeng
  * @since 2023-07-25
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @ApiModel
 @Data
 @TableName("biz_resource_staff_info")
@@ -38,6 +50,7 @@
     /**
      * 人员编号
      */
+    @ExcelProperty(value = "人员编号",order = 0)
     @NotEmpty(message = "人员编号不能为空")
     @ApiModelProperty(value = "人员编号", dataType = "String")
     @TableField("staff_no")
@@ -46,6 +59,7 @@
     /**
      * 姓名
      */
+    @ExcelProperty(value = "姓名",order = 1)
     @ApiModelProperty(value = "姓名", dataType = "String")
     @TableField("staff_name")
     private String staffName;
@@ -152,13 +166,15 @@
     /**
      * 部门名字
      */
-    @ApiModelProperty(value = "部门名字", dataType = "String")
+    @ExcelProperty(value = "工作部门",order = 4)
+    @ApiModelProperty(value = "工作部门", dataType = "String")
     @TableField("dept_name")
     private String deptName;
 
     /**
      * 岗位
      */
+    @ExcelProperty(value = "岗位",order = 2)
     @ApiModelProperty(value = "岗位", dataType = "String")
     @TableField("station")
     private String station;
@@ -166,6 +182,7 @@
     /**
      * 计量专业
      */
+    @ExcelProperty(value = "计量专业",order = 5)
     @ApiModelProperty(value = "计量专业", dataType = "String")
     @TableField("major")
     private String major;
@@ -173,6 +190,7 @@
     /**
      * 证号
      */
+    @ExcelProperty(value = "证号",order = 3)
     @ApiModelProperty(value = "证号", dataType = "String")
     @TableField("certificate_number")
     private String certificateNumber;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSupplierInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSupplierInfo.java
index eb5ef01..a1e2697 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSupplierInfo.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSupplierInfo.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.model.resource;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -20,6 +27,11 @@
  * @author wangpeng
  * @since 2023-07-27
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @ApiModel
 @Data
 @TableName("biz_resource_supplier_info")
@@ -34,6 +46,7 @@
     /**
      * 供方编号
      */
+    @ExcelProperty(value = "供方编号", order = 1)
     @ApiModelProperty(value = "供方编号(自动生成)", dataType = "String")
     @TableField("supplier_no")
     private String supplierNo;
@@ -41,6 +54,7 @@
     /**
      * 供方名称
      */
+    @ExcelProperty(value = "供方名称", order = 2)
     @ApiModelProperty(value = "供方名称", dataType = "String")
     @TableField("supplier_name")
     private String supplierName;
@@ -60,6 +74,7 @@
     @TableField("supplier_type")
     private String supplierType;
 
+    @ExcelProperty(value = "供方类型", order = 3)
     @ApiModelProperty(value = "供方类型(字典value)", dataType = "String")
     @TableField(exist = false)
     private String supplierTypeName;
@@ -109,7 +124,8 @@
     /**
      * 电话
      */
-    @ApiModelProperty(value = "电话", dataType = "String")
+    @ExcelProperty(value = "联系电话", order = 4)
+    @ApiModelProperty(value = "联系电话", dataType = "String")
     @TableField("phone")
     private String phone;
 
@@ -158,6 +174,7 @@
     /**
      * 公司地址-省
      */
+    @ExcelProperty(value = "地址-省", order = 6)
     @ApiModelProperty(value = "公司地址-省", dataType = "String")
     @TableField("company_province_name")
     private String companyProvinceName;
@@ -172,6 +189,7 @@
     /**
      * 公司地址-市
      */
+    @ExcelProperty(value = "地址-市", order = 7)
     @ApiModelProperty(value = "公司地址-市", dataType = "String")
     @TableField("company_city_name")
     private String companyCityName;
@@ -186,6 +204,7 @@
     /**
      * 公司地址-区
      */
+    @ExcelProperty(value = "地址-区", order = 8)
     @ApiModelProperty(value = "公司地址-区", dataType = "String")
     @TableField("company_area_name")
     private String companyAreaName;
@@ -193,6 +212,7 @@
     /**
      * 公司地址-详细地址
      */
+    @ExcelProperty(value = "地址-详细地址", order = 9)
     @ApiModelProperty(value = "公司地址-详细地址", dataType = "String")
     @TableField("company_address")
     private String companyAddress;
@@ -200,6 +220,7 @@
     /**
      * 服务和供应的内容
      */
+    @ExcelProperty(value = "服务和供应的内容", order = 5)
     @ApiModelProperty(value = "服务和供应的内容", dataType = "String")
     @TableField("supplier_content")
     private String supplierContent;
@@ -250,6 +271,7 @@
     /**
      * 创建时间
      */
+    @ExcelProperty(value = "创建时间", order = 9)
     @ApiModelProperty(value = "创建时间", dataType = "String")
     @TableField("create_time")
     private String createTime;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/EnvLocationInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/EnvLocationInfo.java
new file mode 100644
index 0000000..d8e2d7b
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/EnvLocationInfo.java
@@ -0,0 +1,83 @@
+package com.casic.missiles.model.resource;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotEmpty;
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 实验室环境监控系统-设备表
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-06-07
+ */
+@ApiModel
+@Data
+@TableName("env_location_info")
+public class EnvLocationInfo implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "主键id", dataType = "Long")
+    @TableId("id")
+    private Long id;
+
+    /**
+     * 地点编号
+     */
+    @NotEmpty(message = "地点编号不能为空")
+    @ApiModelProperty(value = "地点编号", dataType = "String")
+    @TableField("location_no")
+    private String locationNo;
+
+    /**
+     * 地点名称
+     */
+    @ApiModelProperty(value = "地点名称", dataType = "String")
+    @TableField("location_name")
+    private String locationName;
+
+    /**
+     * 地点位置
+     */
+    @ApiModelProperty(value = "地点位置", dataType = "String")
+    @TableField("location_position")
+    private String locationPosition;
+
+    /**
+     * 创建人id
+     */
+    @ApiModelProperty(value = "创建人id", dataType = "Long")
+    @TableField("create_user_id")
+    private Long createUserId;
+
+    /**
+     * 创建人
+     */
+    @ApiModelProperty(value = "创建人", dataType = "String")
+    @TableField("create_user")
+    private String createUser;
+
+    /**
+     * 创建时间
+     */
+    @ApiModelProperty(value = "创建时间", dataType = "String")
+    @TableField("create_time")
+    private String createTime;
+
+    /**
+     * 更新时间
+     */
+    @ApiModelProperty(value = "更新时间", dataType = "String")
+    @TableField("update_time")
+    private String updateTime;
+
+
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemFileConfig.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemFileConfig.java
index 19e6845..86e569c 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemFileConfig.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemFileConfig.java
@@ -30,7 +30,7 @@
     @ApiModelProperty(value = "系统类别(1业务系统2受检系统3环境系统)", dataType = "Integer")
     @NotNull(message = "系统类别不能为空")
     @TableField("system_type")
-    private Integer systemType;
+    private Integer systemType = 1;
 
     @ApiModelProperty("下载编号")
     @TableField("download_no")
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemNotice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemNotice.java
index e94297d..06ec37d 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemNotice.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemNotice.java
@@ -34,7 +34,7 @@
     @ApiModelProperty(value = "系统类别(1业务系统2受检系统3环境系统)", dataType = "Integer")
     @NotNull(message = "系统类别不能为空")
     @TableField("system_type")
-    private Integer systemType;
+    private Integer systemType = 1;
 
     /**
      * 通知公告编号
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSign.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSign.java
index 6c0d7c9..954f4f8 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSign.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSign.java
@@ -51,7 +51,7 @@
     @ApiModelProperty(value = "系统类别(1业务系统2受检系统3环境系统)", dataType = "Integer")
     @NotNull(message = "系统类别不能为空")
     @TableField("system_type")
-    private Integer systemType;
+    private Integer systemType = 1;
 
     /**
      * 签名编号
@@ -130,4 +130,8 @@
     @TableField(exist = false)
     private List<Long> userIdList;
 
+    @ApiModelProperty(hidden = true)
+    @TableField(exist = false)
+    private String deptName;
+
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemTemplate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemTemplate.java
index 503a457..1d27ebe 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemTemplate.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemTemplate.java
@@ -47,7 +47,7 @@
     @ApiModelProperty(value = "系统类别(1业务系统2受检系统3环境系统)", dataType = "Integer")
     @NotNull(message = "系统类别不能为空")
     @TableField("system_type")
-    private Integer systemType;
+    private Integer systemType = 1;
 
     /**
      * 模板编号
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java
index 8c21cb0..f61e4a8 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java
@@ -32,4 +32,8 @@
     ReturnDTO approvalDelete(ApprovalDeleteRequest request);
 
     ReturnDTO failUpdate(T request);
+
+    List<O> listExport(R request);
+
+    List<O> listExportByIds(List<Long> ids);
 }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java
index 724166f..9bce15b 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java
@@ -157,6 +157,29 @@
         throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
     }
 
+    @Override
+    public List<O> listExport(R request) {
+        request.setCreateUserId(null);
+        request.setApprovalStatus(ApprovalStatusEnum.PASSED);
+        Page<O> page = PageFactory.defaultPage();
+        page.setCurrent(1);
+        page.setSearchCount(false);
+        page.setSize(Integer.MAX_VALUE);
+        Page<O> resultPage = this.baseMapper.selectBatchForApprovalList(page, request, null);
+        return resultPage.getRecords();
+    }
+
+    @Override
+    public List<O> listExportByIds(List<Long> ids) {
+        Page<O> page = PageFactory.defaultPage();
+        page.setCurrent(1);
+        page.setSearchCount(false);
+        page.setSize(Integer.MAX_VALUE);
+        List<String> businessKeys = ids.stream().map(String::valueOf).collect(Collectors.toList());
+        Page<O> resultPage = this.baseMapper.selectBatchForApprovalList(page, null, businessKeys);
+        return resultPage.getRecords();
+    }
+
     protected ReturnDTO updateApprovalStatus(Long id, String processId, String approvalStatus) {
         UpdateWrapper<T> updateWrapper = new UpdateWrapper<>();
         updateWrapper.eq("id", id);
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificatePrintServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificatePrintServiceImpl.java
index f6e4706..3228497 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificatePrintServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificatePrintServiceImpl.java
@@ -162,6 +162,30 @@
         return ReturnUtil.success(printLogMapper.selectList(wrapper));
     }
 
+    @Override
+    public List<CertificatePrintListResponse> listByIds(List<Long> ids) {
+        Page<CertificatePrintListResponse> page = PageFactory.defaultPage();
+        page.setCurrent(1);
+        page.setSearchCount(false);
+        page.setSize(Integer.MAX_VALUE);
+        List<String> businessKeys = ids.stream().map(String::valueOf).collect(Collectors.toList());
+        Page<CertificatePrintListResponse> resultPage = this.baseMapper.selectBatchForApprovalList(page, null, businessKeys);
+        return resultPage.getRecords();
+    }
+
+    @Override
+    public List<CertificatePrintListResponse> list(CertificatePrintApprovalListRequest request) {
+        request.setCreateUserId(null);
+        request.setApprovalStatus(null);
+        request.setPrintStatus(null);
+        Page<CertificatePrintListResponse> page = PageFactory.defaultPage();
+        page.setCurrent(1);
+        page.setSearchCount(false);
+        page.setSize(Integer.MAX_VALUE);
+        Page<CertificatePrintListResponse> resultPage = certificatePrintMapper.selectBatchForApprovalList(page, request, null);
+        return resultPage.getRecords();
+    }
+
     private void savePrintLog(Long id) {
         BizBusinessCertificatePrintLog printLog = new BizBusinessCertificatePrintLog();
         BizBusinessCertificatePrint certificatePrint = certificatePrintMapper.selectById(id);
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificateReportServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificateReportServiceImpl.java
index 457555f..24146be 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificateReportServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificateReportServiceImpl.java
@@ -158,8 +158,8 @@
         QueryWrapper<BizBusinessCertificateMeasureResultData> mWrapper = new QueryWrapper<>();
         mWrapper.eq("report_id", reportId);
         boolean mRemove = certificateMeasureResultDataService.remove(mWrapper);
-        Assert.isFalse(eRemove || mRemove, () -> {
+        if(!eRemove || !mRemove){
             throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
-        });
+        }
     }
 }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessIdentifyInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessIdentifyInfoServiceImpl.java
index 4c8e190..f7e63ca 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessIdentifyInfoServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessIdentifyInfoServiceImpl.java
@@ -1,8 +1,10 @@
 package com.casic.missiles.service.Impl.business;
 
+import cn.hutool.core.date.DateUtil;
 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.core.page.PageFactory;
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.business.identify.IdentifyListRequest;
@@ -14,11 +16,14 @@
 import com.casic.missiles.service.business.IBizBusinessIdentifyInfoService;
 import com.casic.missiles.utils.DictCodeUtils;
 import com.casic.missiles.utils.NumberGeneratorUtil;
+import com.casic.missiles.utils.QRCodeUtil;
 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.List;
+
 /**
  * <p>
  * 计量检定业务-任务计量管理-标识打印 服务实现类
@@ -35,9 +40,9 @@
     @Override
     public Page<BizBusinessIdentifyInfo> identifyListPage(Page<BizBusinessIdentifyInfo> page, IdentifyListRequest request) throws Exception {
         QueryWrapper<BizBusinessIdentifyInfo> wrapper = new QueryWrapper<>();
-        wrapper.eq("identify_type", request.getIdentifyType());
-        wrapper.like("device_no", request.getDeviceNo());
-        wrapper.like("device_name", request.getDeviceName());
+        wrapper.eq(StringUtils.isNotEmpty(request.getIdentifyType()), "identify_type", request.getIdentifyType());
+        wrapper.like(StringUtils.isNotEmpty(request.getDeviceNo()),"device_no", request.getDeviceNo());
+        wrapper.like(StringUtils.isNotEmpty(request.getDeviceName()), "device_name", request.getDeviceName());
         wrapper.apply(StringUtils.isNotBlank(request.getCreateTimeStart()),
                 "{0} <= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getCreateTimeStart().split(" ")[0]);
         wrapper.apply(StringUtils.isNotBlank(request.getCreateTimeEnd()),
@@ -64,8 +69,11 @@
     }
 
     @Override
-    public ReturnDTO updateIdentify(BizBusinessIdentifyInfo identifyInfo) {
-        if(identifyInfoMapper.updateById(identifyInfo) > 0){
+    public ReturnDTO updateIdentify(Long id) {
+        BizBusinessIdentifyInfo info = new BizBusinessIdentifyInfo();
+        info.setId(id);
+        info.setUpdateTime(DateUtil.now());
+        if(identifyInfoMapper.updateById(info) > 0){
             return ReturnUtil.success();
         }
         throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
@@ -79,4 +87,20 @@
         throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
     }
 
+    @Override
+    public List<BizBusinessIdentifyInfo> list(IdentifyListRequest request) throws Exception {
+        Page<BizBusinessIdentifyInfo> page = PageFactory.defaultPage();
+        page.setCurrent(1);
+        page.setSearchCount(false);
+        page.setSize(Integer.MAX_VALUE);
+        Page<BizBusinessIdentifyInfo> resultPage = this.identifyListPage(page, request);
+        return resultPage.getRecords();
+    }
+
+    @Override
+    public ReturnDTO<String> equipmentQrCode(Long id) {
+        String base64QRCode = QRCodeUtil.getBase64QRCode(String.valueOf(id));
+        return ReturnUtil.success(base64QRCode);
+    }
+
 }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOrderInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOrderInfoServiceImpl.java
index 82952ad..d8d2c6a 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOrderInfoServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOrderInfoServiceImpl.java
@@ -35,6 +35,7 @@
 import javax.servlet.http.HttpServletResponse;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 import java.util.stream.Collectors;
 
 /**
@@ -209,13 +210,16 @@
     private QueryWrapper<OrderListResponse> listParamWrapperBuilder(OrderListRequest request) {
         QueryWrapper<OrderListResponse> wrapper = new QueryWrapper<>();
         wrapper.like(StringUtils.isNotBlank(request.getOrderNo()), "order_no", request.getOrderNo());
+        wrapper.like(Objects.nonNull(request.getCustomerId()), "customer_id", request.getCustomerId());
         wrapper.like(StringUtils.isNotBlank(request.getCustomerName()), "customer_name", request.getCustomerName());
         wrapper.like(StringUtils.isNotBlank(request.getDeliverer()), "deliverer", request.getDeliverer());
         wrapper.like(StringUtils.isNotBlank(request.getCreateUserName()), "create_user_name", request.getCreateUserName());
-        wrapper.apply(StringUtils.isNotBlank(request.getCreateStartTime()),
-                "{0} <= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getCreateStartTime().split(" ")[0]);
-        wrapper.apply(StringUtils.isNotBlank(request.getCreateEndTime()),
-                "{0} >= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getCreateEndTime().split(" ")[0]);
+        if(StringUtils.isNotBlank(request.getCreateStartTime())){
+            wrapper.apply("{0} <= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getCreateStartTime().split(" ")[0]);
+        }
+        if(StringUtils.isNotBlank(request.getCreateEndTime())){
+            wrapper.apply("{0} >= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getCreateEndTime().split(" ")[0]);
+        }
         wrapper.orderByDesc("create_time");
         return wrapper;
     }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceAssessServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceAssessServiceImpl.java
index c6af980..ce40138 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceAssessServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceAssessServiceImpl.java
@@ -1,10 +1,33 @@
 package com.casic.missiles.service.Impl.business;
 
-import com.casic.missiles.model.business.BizBusinessOutsourceAssess;
+import cn.hutool.core.lang.Assert;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.casic.missiles.core.model.auth.AuthUser;
+import com.casic.missiles.core.shiro.ShiroKit;
+import com.casic.missiles.dto.BaseApprovalSubmitRequest;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.ReturnUtil;
+import com.casic.missiles.dto.business.outsource.OutsourceAssessApprovalListRequest;
+import com.casic.missiles.dto.business.outsource.OutsourceAssessSaveResponse;
+import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.NoGenerateFileCodeEnum;
+import com.casic.missiles.enums.NoGenerateRecordTypeCodeEnum;
+import com.casic.missiles.enums.system.ApprovalStatusEnum;
+import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.mapper.business.BizBusinessOutsourceAssessMapper;
+import com.casic.missiles.model.business.BizBusinessOutsourceAssess;
+import com.casic.missiles.model.business.BizBusinessOutsourceAssessSampleRelation;
+import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl;
+import com.casic.missiles.service.business.IBizBusinessOutsourceAssessSampleRelationService;
 import com.casic.missiles.service.business.IBizBusinessOutsourceAssessService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.casic.missiles.utils.NoGeneratorUtil;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Objects;
 
 /**
  * <p>
@@ -15,6 +38,103 @@
  * @since 2023-08-16
  */
 @Service
-public class BizBusinessOutsourceAssessServiceImpl extends ServiceImpl<BizBusinessOutsourceAssessMapper, BizBusinessOutsourceAssess> implements IBizBusinessOutsourceAssessService {
+public class BizBusinessOutsourceAssessServiceImpl extends GeneralApprovalServiceImpl<BizBusinessOutsourceAssessMapper, BizBusinessOutsourceAssess, BizBusinessOutsourceAssess, OutsourceAssessApprovalListRequest, BaseApprovalSubmitRequest> implements IBizBusinessOutsourceAssessService {
+    @Autowired
+    private IBizBusinessOutsourceAssessSampleRelationService outsourceAssessSampleRelationService;
 
+    @Override
+    public ReturnDTO<OutsourceAssessSaveResponse> saveOutsourceAssess(BizBusinessOutsourceAssess request) {
+        //生成编号
+        String labCode = request.getLabCode();
+        String groupCode = request.getGroupCode();
+        Long maxNo = this.baseMapper.selectMaxProjectNo();
+        String projectNo = NoGeneratorUtil.getCode(NoGenerateFileCodeEnum.D, labCode, NoGenerateRecordTypeCodeEnum.OUTSOURCE_ACCESS, groupCode, maxNo);
+        request.setCreateUserId(request.getUserId());
+        request.setCreateUserName(request.getUserName());
+        request.setApprovalStatus(ApprovalStatusEnum.DRAFT); //草稿箱状态
+        request.setProjectNo(projectNo);
+        int row = this.baseMapper.insert(request);
+        Assert.isFalse(row <= 0, () -> {
+            throw new BusinessException(BusinessExceptionEnum.OUTSOURCE_ACCESS_SAVE_FAILED);
+        });
+        //关联表
+        saveRelationData(request);
+        OutsourceAssessSaveResponse saveResponse = new OutsourceAssessSaveResponse();
+        saveResponse.setId(request.getId());
+        saveResponse.setProjectNo(projectNo);
+        return ReturnUtil.success(saveResponse);
+    }
+
+    @Override
+    @Transactional
+    public ReturnDTO draftUpdate(BizBusinessOutsourceAssess request) {
+        if (this.baseMapper.updateById(request) > 0) {
+            //关联表删除、增加
+            removeRelationData(request.getId());
+            saveRelationData(request);
+            return ReturnUtil.success();
+        }
+        throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
+    }
+
+    @Override
+    public ReturnDTO draftDelete(Long id) {
+        if (this.baseMapper.deleteById(id) > 0) {
+            //关联表删除
+            removeRelationData(id);
+            return ReturnUtil.success();
+        }
+        throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
+    }
+
+    @Override
+    public ReturnDTO draftBatchDelete(List<Long> ids) {
+        if (this.baseMapper.deleteBatchIds(ids) >= 0) {
+            ids.forEach(id -> removeRelationData(id));
+            return ReturnUtil.success();
+        }
+        throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
+    }
+
+    @Override
+    @Transactional
+    public ReturnDTO failUpdate(BizBusinessOutsourceAssess request) {
+        AuthUser user = ShiroKit.getUser();
+        Assert.isFalse(Objects.isNull(user), () -> {
+            throw new BusinessException(BusinessExceptionEnum.LOGIN_USER_ACQUIRE_FAILED);
+        });
+        request.setApprovalStatus(ApprovalStatusEnum.IN_APPROVED);
+        if (this.baseMapper.updateById(request) > 0) {
+            //关联表删除、增加
+            removeRelationData(request.getId());
+            saveRelationData(request);
+            baseApprovalService.failUpdate(request.getProcessId());
+            return ReturnUtil.success();
+        }
+        throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
+    }
+
+    private void saveRelationData(BizBusinessOutsourceAssess request) {
+        List<BizBusinessOutsourceAssessSampleRelation> sampleRelations = new ArrayList<>();
+        request.getOrderSampleList().forEach(dto -> {
+            BizBusinessOutsourceAssessSampleRelation relation = new BizBusinessOutsourceAssessSampleRelation();
+            relation.setOrderId(dto.getOrderId());
+            relation.setSampleId(dto.getSampleId());
+            relation.setAccessId(request.getId());
+            sampleRelations.add(relation);
+        });
+        if(outsourceAssessSampleRelationService.saveBatch(sampleRelations)){
+            return;
+        }
+        throw new BusinessException(BusinessExceptionEnum.OUTSOURCE_ACCESS_SAVE_FAILED);
+    }
+
+    private void removeRelationData(Long assessId) {
+        QueryWrapper<BizBusinessOutsourceAssessSampleRelation> wrapper = new QueryWrapper<>();
+        wrapper.eq("access_id", assessId);
+        if(outsourceAssessSampleRelationService.remove(wrapper)){
+            return;
+        }
+        throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
+    }
 }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceProtocolServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceProtocolServiceImpl.java
new file mode 100644
index 0000000..821e728
--- /dev/null
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceProtocolServiceImpl.java
@@ -0,0 +1,60 @@
+package com.casic.missiles.service.Impl.business;
+
+import cn.hutool.core.lang.Assert;
+import com.casic.missiles.dto.BaseApprovalSubmitRequest;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.ReturnUtil;
+import com.casic.missiles.dto.business.outsource.OutsourceProtocolApprovalListRequest;
+import com.casic.missiles.dto.business.outsource.OutsourceProtocolSaveResponse;
+import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.NoGenerateFileCodeEnum;
+import com.casic.missiles.enums.NoGenerateRecordTypeCodeEnum;
+import com.casic.missiles.enums.system.ApprovalStatusEnum;
+import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.mapper.business.BizBusinessOutsourceProtocolMapper;
+import com.casic.missiles.mapper.business.BizBusinessOutsourcerInfoMapper;
+import com.casic.missiles.model.business.BizBusinessOutsourceProtocol;
+import com.casic.missiles.model.business.BizBusinessOutsourcerInfo;
+import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl;
+import com.casic.missiles.service.business.IBizBusinessOutsourceProtocolService;
+import com.casic.missiles.utils.NoGeneratorUtil;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 计量检定业务-分包管理-测试、校准或检定工作分包协议书 服务实现类
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-08-24
+ */
+@Service
+public class BizBusinessOutsourceProtocolServiceImpl extends GeneralApprovalServiceImpl<BizBusinessOutsourceProtocolMapper, BizBusinessOutsourceProtocol, BizBusinessOutsourceProtocol, OutsourceProtocolApprovalListRequest, BaseApprovalSubmitRequest> implements IBizBusinessOutsourceProtocolService {
+    @Autowired
+    private BizBusinessOutsourcerInfoMapper outsourcerInfoMapper;
+
+    @Override
+    public ReturnDTO<OutsourceProtocolSaveResponse> saveOutsourceProtocol(BizBusinessOutsourceProtocol request) {
+        //生成编号
+        String labCode = request.getLabCode();
+        String groupCode = request.getGroupCode();
+        Long maxNo = this.baseMapper.selectMaxProtocolNo();
+        String protocolNo = NoGeneratorUtil.getCode(NoGenerateFileCodeEnum.D, labCode, NoGenerateRecordTypeCodeEnum.OUTSOURCE_PROTOCOL, groupCode, maxNo);
+        request.setCreateUserId(request.getUserId());
+        request.setCreateUserName(request.getUserName());
+        request.setApprovalStatus(ApprovalStatusEnum.DRAFT); //草稿箱状态
+        request.setProtocolNo(protocolNo);
+        BizBusinessOutsourcerInfo outsourcerInfo = outsourcerInfoMapper.selectById(request.getOutsourcerId());
+        request.setOutsourceNo(outsourcerInfo.getOutsourcerNo());
+        request.setOutsourceName(outsourcerInfo.getOutsourcerName());
+        int row = this.baseMapper.insert(request);
+        Assert.isFalse(row <= 0, () -> {
+            throw new BusinessException(BusinessExceptionEnum.OUTSOURCE_PROTOCOL_SAVE_FAILED);
+        });
+        OutsourceProtocolSaveResponse saveResponse = new OutsourceProtocolSaveResponse();
+        saveResponse.setId(request.getId());
+        saveResponse.setProtocolNo(protocolNo);
+        return ReturnUtil.success(saveResponse);
+    }
+}
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourcerInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourcerInfoServiceImpl.java
index 75f639d..8aadad7 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourcerInfoServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourcerInfoServiceImpl.java
@@ -3,12 +3,12 @@
 import cn.hutool.core.lang.Assert;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.dto.*;
 import com.casic.missiles.dto.business.outsource.OutsourcerInfoApprovalListRequest;
 import com.casic.missiles.dto.business.outsource.OutsourcerSaveResponse;
 import com.casic.missiles.enums.BusinessExceptionEnum;
-import com.casic.missiles.enums.PrefixCodeEnum;
+import com.casic.missiles.enums.NoGenerateFileCodeEnum;
+import com.casic.missiles.enums.NoGenerateRecordTypeCodeEnum;
 import com.casic.missiles.enums.system.ApprovalStatusEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.mapper.business.BizBusinessOutsourcerInfoMapper;
@@ -20,7 +20,7 @@
 import com.casic.missiles.service.business.IBizBusinessOutsourcerInfoService;
 import com.casic.missiles.service.business.IBizBusinessOutsourcerUserInfoService;
 import com.casic.missiles.utils.DictCodeUtils;
-import com.casic.missiles.utils.NumberGeneratorUtil;
+import com.casic.missiles.utils.NoGeneratorUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -42,22 +42,12 @@
     private IBizBusinessOutsourcerUserInfoService outsourcerUserInfoService;
 
     @Override
-    public List<BizBusinessOutsourcerInfo> list(OutsourcerInfoApprovalListRequest request) {
-        request.setCreateUserId(null);
-        request.setApprovalStatus(ApprovalStatusEnum.PASSED);
-        Page<BizBusinessOutsourcerInfo> page = PageFactory.defaultPage();
-        page.setCurrent(1);
-        page.setSearchCount(false);
-        page.setSize(Integer.MAX_VALUE);
-        Page<BizBusinessOutsourcerInfo> resultPage = this.baseMapper.selectBatchForApprovalList(page, request, null);
-        return resultPage.getRecords();
-    }
-
-    @Override
     public ReturnDTO<OutsourcerSaveResponse> saveOutsourcer(BizBusinessOutsourcerInfo request) {
         //生成编号
+        String labCode = request.getLabCode();
+        String groupCode = request.getGroupCode();
         Long maxNo = this.baseMapper.selectMaxNo();
-        String outsourcerNo = NumberGeneratorUtil.getContactNo(PrefixCodeEnum.OUTSOURCER_PREFIX, maxNo);
+        String outsourcerNo = NoGeneratorUtil.getCode(NoGenerateFileCodeEnum.D, labCode, NoGenerateRecordTypeCodeEnum.OUTSOURCE_INFO, groupCode, maxNo);
         request.setOutsourcerNo(outsourcerNo);
         request.setCreateUserId(request.getUserId());
         request.setCreateUserName(request.getUserName());
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessSiteExecutiveInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessSiteExecutiveInfoServiceImpl.java
index ebab3e6..6c6a129 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessSiteExecutiveInfoServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessSiteExecutiveInfoServiceImpl.java
@@ -189,9 +189,9 @@
         QueryWrapper<BizBusinessSiteExecutiveStaffRelation> mWrapper = new QueryWrapper<>();
         mWrapper.eq("site_executive_id", siteExecutiveId);
         boolean mRemove = siteExecutiveStaffRelationService.remove(mWrapper);
-        Assert.isFalse(eRemove || mRemove, () -> {
+        if(!eRemove || !mRemove){
             throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
-        });
+        }
     }
 
     private void doPopulateSiteExecutive(SiteExecutiveDetailResponse detailResponse) {
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessLabExecutiveInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessLabExecutiveInfoServiceImpl.java
index 50c5616..0242fcf 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessLabExecutiveInfoServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessLabExecutiveInfoServiceImpl.java
@@ -297,6 +297,29 @@
     }
 
     @Override
+    public List<SampleLabExecutiveListResponse> deptLabExecutiveList(SampleLabExecutiveListRequest request) throws Exception {
+        Page<SampleLabExecutiveListResponse> page = PageFactory.defaultPage();
+        page.setCurrent(1);
+        page.setSearchCount(false);
+        page.setSize(Integer.MAX_VALUE);
+        Page<SampleLabExecutiveListResponse> resultPage = this.deptLabExecutiveListPage(page, request);
+        return resultPage.getRecords();
+    }
+
+    @Override
+    public List<SampleLabExecutiveListResponse> deptLabExecutiveListByIds(String measureStatus, List<Long> ids) throws Exception {
+        Page<SampleLabExecutiveListResponse> page = PageFactory.defaultPage();
+        page.setCurrent(1);
+        page.setSearchCount(false);
+        page.setSize(Integer.MAX_VALUE);
+        SampleLabExecutiveListRequest request = new SampleLabExecutiveListRequest();
+        request.setIds(ids);
+        request.setMeasureStatus(measureStatus);
+        Page<SampleLabExecutiveListResponse> resultPage = this.deptLabExecutiveListPage(page, request);
+        return resultPage.getRecords();
+    }
+
+    @Override
     public Page<SampleLabExecutiveListResponse> myLabExecutiveListPage(Page<SampleLabExecutiveListResponse> page, SampleLabExecutiveListRequest labExecutiveListRequest) throws Exception{
         AuthUser user = ShiroKit.getUser();
         Assert.isFalse(Objects.isNull(user), () -> {
@@ -350,6 +373,29 @@
     }
 
     @Override
+    public List<SampleLabExecutiveListResponse> myLabExecutiveList(SampleLabExecutiveListRequest request) throws Exception {
+        Page<SampleLabExecutiveListResponse> page = PageFactory.defaultPage();
+        page.setCurrent(1);
+        page.setSearchCount(false);
+        page.setSize(Integer.MAX_VALUE);
+        Page<SampleLabExecutiveListResponse> resultPage = this.myLabExecutiveListPage(page, request);
+        return resultPage.getRecords();
+    }
+
+    @Override
+    public List<SampleLabExecutiveListResponse> myLabExecutiveListByIds(String measureStatus, List<Long> ids) throws Exception {
+        Page<SampleLabExecutiveListResponse> page = PageFactory.defaultPage();
+        page.setCurrent(1);
+        page.setSearchCount(false);
+        page.setSize(Integer.MAX_VALUE);
+        SampleLabExecutiveListRequest request = new SampleLabExecutiveListRequest();
+        request.setIds(ids);
+        request.setMeasureStatus(measureStatus);
+        Page<SampleLabExecutiveListResponse> resultPage = this.myLabExecutiveListPage(page, request);
+        return resultPage.getRecords();
+    }
+
+    @Override
     public List<SampleAmountResponse> myExecutiveAmount() {
         //登录用户id获取计量人员id，实验室检测信息中存储的是计量人员id
         AuthUser user = ShiroKit.getUser();

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java
index bb0c50f..13a699b 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java
@@ -12,6 +12,7 @@
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.IGeneralApprovalService;
+import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
@@ -19,6 +20,7 @@
 import org.springframework.web.bind.annotation.RequestBody;
 
 import javax.validation.Valid;
+import java.util.List;
 import java.util.Objects;
 
 /**
@@ -117,4 +119,17 @@
         }
         return baseApprovalService.failUpdate(request);
     }
+
+    public List<O> exportList(@RequestBody @Valid R request) throws Exception {
+        List<O> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = baseApprovalService.listExportByIds(request.getIds());
+        } else {
+            list = baseApprovalService.listExport(request);
+        }
+        for (O record : list) {
+            DictCodeUtils.convertDictCodeToName(record);
+        }
+        return list;
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java
index 8a90961..d775831 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java
@@ -5,6 +5,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.business.certificate.CertificateChangeApplyApprovalListRequest;
 import com.casic.missiles.dto.business.certificate.CertificateChangeApplySaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessCertificateChangeApply;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
@@ -20,6 +21,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -48,4 +50,12 @@
         }
         return changeApplyService.saveChangeApply(request);
     }
+
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody CertificateChangeApplyApprovalListRequest request) throws Exception {
+        List<BizBusinessCertificateChangeApply> list = super.exportList(request);
+        super.exportExcel(BizBusinessCertificateChangeApply.class, list, ExportEnum.CERTIFICATE_CHANGE_APPLY.getSheetName());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java
index 5fc4b07..af8230e 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java
@@ -9,6 +9,7 @@
 import com.casic.missiles.dto.business.certificate.CertificatePrintApprovalListRequest;
 import com.casic.missiles.dto.business.certificate.CertificatePrintListResponse;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.enums.business.CertificatePrintStatusEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessCertificatePrintLog;
@@ -18,10 +19,16 @@
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.io.IOException;
+import java.util.List;
 import java.util.Objects;
 
 /**
@@ -98,4 +105,16 @@
         });
         return certificatePrintService.certificatePrintLog(idDTO.getId());
     }
+
+    @ApiOperation("证书打印审批导出")
+    @PostMapping("/listExport")
+    public void exportList(@RequestBody CertificatePrintApprovalListRequest request) throws IOException {
+        List<CertificatePrintListResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = certificatePrintService.listByIds(request.getIds());
+        } else {
+            list = certificatePrintService.list(request);
+        }
+        super.exportExcel(CertificatePrintListResponse.class, list, ExportEnum.CERTIFICATE_PRINT.getSheetName());
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java
index 63b06dc..6b2efd5 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java
@@ -6,6 +6,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.business.certificate.CertificateReportApprovalListRequest;
 import com.casic.missiles.dto.business.certificate.CertificateReportSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessCertificateReport;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
@@ -21,6 +22,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -50,7 +52,7 @@
         return certificateReportService.saveCertificateReport(request);
     }
 
-    @ApiOperation("证书审批详情（基本信息）")
+    @ApiOperation("详情（基本信息）")
     @PostMapping("/detail")
     public ReturnDTO<BizBusinessCertificateReport> detail(@RequestBody @Valid BaseDetailRequest request, BindingResult bindingResult) throws Exception {
         if(bindingResult.hasErrors()){
@@ -59,4 +61,11 @@
         return certificateReportService.detail(request);
     }
 
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody CertificateReportApprovalListRequest request) throws Exception {
+        List<BizBusinessCertificateReport> list = super.exportList(request);
+        super.exportExcel(BizBusinessCertificateReport.class, list, ExportEnum.CERTIFICATE_REPORT.getSheetName());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java
index 46b26bd..57c0809 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java
@@ -10,20 +10,21 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.business.identify.IdentifyListRequest;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessIdentifyInfo;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.business.IBizBusinessIdentifyInfoService;
+import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import javax.validation.Valid;
+import java.util.List;
 import java.util.Objects;
 
 /**
@@ -57,16 +58,13 @@
         return identifyInfoService.addIdentify(identifyInfo);
     }
 
-    @ApiOperation("标识打印更新")
+    @ApiOperation("标识打印更新（更新打印时间）")
     @PostMapping("/update")
-    public ReturnDTO updateIdentify(@RequestBody @Valid BizBusinessIdentifyInfo identifyInfo, BindingResult bindingResult) {
-        Assert.isFalse(Objects.isNull(identifyInfo.getId()), () -> {
+    public ReturnDTO updateIdentify(@RequestBody @Valid IdDTO idDTO) {
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        Assert.isFalse(bindingResult.hasErrors(), () -> {
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        });
-        return identifyInfoService.updateIdentify(identifyInfo);
+        return identifyInfoService.updateIdentify(idDTO.getId());
     }
 
     @ApiOperation("标识打印删除")
@@ -77,4 +75,37 @@
         });
         return identifyInfoService.deleteIdentify(idDTO.getId());
     }
+
+    @ApiOperation("标识打印导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody @Valid IdentifyListRequest request, BindingResult bindingResult) throws Exception {
+        if (bindingResult.hasErrors()) {
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        List<BizBusinessIdentifyInfo> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = identifyInfoService.listByIds(request.getIds());
+        } else {
+            list = identifyInfoService.list(request);
+        }
+        for (BizBusinessIdentifyInfo record : list) {
+            DictCodeUtils.convertDictCodeToName(record);
+        }
+        super.exportExcel(BizBusinessIdentifyInfo.class, list, ExportEnum.IDENTIFY_EXPORT.getSheetName());
+    }
+
+
+    // TODO: 2023/8/23 查询设备信息，4个底部按钮查设备（按钮的作用就是前端用来调不同接口、用来区分中间即将展示的标识），前端弹窗选设备，在确定保存时前端根据底部按钮判断传入设备类型deviceType字典code
+    // TODO: 2023/8/23 接口：查受检设备（第1个按钮），查设备台账（后3个按钮同一接口），查询之后前端根据标志类型的不同加到中间页面时进行判断（按产品给的对应表）
+    // TODO: 2023/8/23 提供二维码接口，前端在加到中间页面时调用一下
+
+    @ApiOperation("设备二维码")
+    @PostMapping("/equipment/qrCode")
+    public ReturnDTO<String> equipmentQrCode(@RequestBody @Valid IdDTO idDTO) {
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return identifyInfoService.equipmentQrCode(idDTO.getId());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java
index 707be6e..7e0453d 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java
@@ -117,7 +117,7 @@
     }
 
     @ApiOperation("任务单导出")
-    @PostMapping("/export")
+    @PostMapping("/listExport")
     public void orderExport(@RequestBody @Valid OrderListRequest request, HttpServletResponse response) {
         businessOrderService.orderExport(request, response);
     }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java
index 529a6ce..51432be 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java
@@ -1,9 +1,28 @@
 package com.casic.missiles.controller.business;
 
+import com.casic.missiles.controller.GeneralApprovalController;
+import com.casic.missiles.dto.BaseApprovalSubmitRequest;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.business.outsource.OutsourceAssessApprovalListRequest;
+import com.casic.missiles.dto.business.outsource.OutsourceAssessSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
+import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.model.business.BizBusinessOutsourceAssess;
+import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
+import com.casic.missiles.service.IGeneralApprovalService;
+import com.casic.missiles.service.business.IBizBusinessOutsourceAssessService;
 import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.BindingResult;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.validation.Valid;
+import java.util.List;
+
 /**
  * <p>
  * 计量检定业务-分包管理-测试、校准或检定工作分包评审表 前端控制器
@@ -15,6 +34,27 @@
 @Api(tags = "分包管理-测试、校准或检定工作分包评审表")
 @RestController
 @RequestMapping("/business/outsource/assess")
-public class BizBusinessOutsourceAssessController {
+public class BizBusinessOutsourceAssessController extends GeneralApprovalController<BizBusinessOutsourceAssess, BizBusinessOutsourceAssess, OutsourceAssessApprovalListRequest, BaseApprovalSubmitRequest> {
+    @Autowired
+    private IBizBusinessOutsourceAssessService outsourceAssessService;
 
+    public BizBusinessOutsourceAssessController(IGeneralApprovalService<BizBusinessOutsourceAssess, BizBusinessOutsourceAssess, OutsourceAssessApprovalListRequest, BaseApprovalSubmitRequest> baseApprovalService) {
+        super(baseApprovalService);
+    }
+
+    @ApiOperation("草稿箱-保存")
+    @PostMapping("/save")
+    public ReturnDTO<OutsourceAssessSaveResponse> saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceAssess request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        return outsourceAssessService.saveOutsourceAssess(request);
+    }
+
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception {
+        List<BizBusinessOutsourceAssess> list = super.exportList(request);
+        super.exportExcel(BizBusinessOutsourceAssess.class, list, ExportEnum.OUTSOURCE_ASSESS.getSheetName());
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java
new file mode 100644
index 0000000..9adef18
--- /dev/null
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java
@@ -0,0 +1,60 @@
+package com.casic.missiles.controller.business;
+
+import com.casic.missiles.controller.GeneralApprovalController;
+import com.casic.missiles.dto.BaseApprovalSubmitRequest;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.business.outsource.OutsourceProtocolApprovalListRequest;
+import com.casic.missiles.dto.business.outsource.OutsourceProtocolSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
+import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.model.business.BizBusinessOutsourceProtocol;
+import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
+import com.casic.missiles.service.IGeneralApprovalService;
+import com.casic.missiles.service.business.IBizBusinessOutsourceProtocolService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.BindingResult;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.validation.Valid;
+import java.util.List;
+
+/**
+ * <p>
+ * 计量检定业务-分包管理-测试、校准或检定工作分包协议书 前端控制器
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-08-24
+ */
+@Api(tags = "分包管理-测试、校准或检定工作分包协议书")
+@RestController
+@RequestMapping("/business/outsource/protocol")
+public class BizBusinessOutsourceProtocolController extends GeneralApprovalController<BizBusinessOutsourceProtocol, BizBusinessOutsourceProtocol, OutsourceProtocolApprovalListRequest, BaseApprovalSubmitRequest> {
+    @Autowired
+    private IBizBusinessOutsourceProtocolService outsourceProtocolService;
+
+    public BizBusinessOutsourceProtocolController(IGeneralApprovalService<BizBusinessOutsourceProtocol, BizBusinessOutsourceProtocol, OutsourceProtocolApprovalListRequest, BaseApprovalSubmitRequest> baseApprovalService) {
+        super(baseApprovalService);
+    }
+
+    @ApiOperation("草稿箱-保存")
+    @PostMapping("/save")
+    public ReturnDTO<OutsourceProtocolSaveResponse> saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceProtocol request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        return outsourceProtocolService.saveOutsourceProtocol(request);
+    }
+
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody OutsourceProtocolApprovalListRequest request) throws Exception {
+        List<BizBusinessOutsourceProtocol> list = super.exportList(request);
+        super.exportExcel(BizBusinessOutsourceProtocol.class, list, ExportEnum.OUTSOURCE_PROTOCOL.getSheetName());
+    }
+}
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java
index 097f645..f0f0943 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java
@@ -17,7 +17,6 @@
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.IGeneralApprovalService;
 import com.casic.missiles.service.business.IBizBusinessOutsourcerInfoService;
-import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -71,19 +70,8 @@
 
     @ApiOperation("分包方导出")
     @PostMapping("/listExport")
-    public void export(@RequestBody @Valid OutsourcerInfoApprovalListRequest request, BindingResult bindingResult) throws Exception {
-        if (bindingResult.hasErrors()) {
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        }
-        List<BizBusinessOutsourcerInfo> list;
-        if (!CollectionUtils.isEmpty(request.getIds())) {
-            list = outsourcerInfoService.listByIds(request.getIds());
-        } else {
-            list = outsourcerInfoService.list(request);
-        }
-        for (BizBusinessOutsourcerInfo record : list) {
-            DictCodeUtils.convertDictCodeToName(record);
-        }
+    public void export(@RequestBody OutsourcerInfoApprovalListRequest request) throws Exception {
+        List<BizBusinessOutsourcerInfo> list = super.exportList(request);
         super.exportExcel(BizBusinessOutsourcerInfo.class, list, ExportEnum.OUTSOURCER_EXPORT.getSheetName());
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java
index c2cbf9f..0410918 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java
@@ -17,11 +17,9 @@
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.IGeneralApprovalService;
 import com.casic.missiles.service.business.IBizBusinessSiteExecutiveInfoService;
-import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -60,7 +58,7 @@
         return siteExecutiveInfoService.saveSiteExecutiveInfo(siteExecutiveInfo);
     }
 
-    @ApiOperation("现场检测详情")
+    @ApiOperation("详情")
     @PostMapping("/detail")
     public ReturnDTO<SiteExecutiveDetailResponse> siteExecutiveDetail(@RequestBody @Valid IdDTO idDTO) throws Exception {
         Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
@@ -69,21 +67,10 @@
         return ReturnUtil.success(siteExecutiveInfoService.detail(idDTO.getId()));
     }
 
-    @ApiOperation("现场检测导出")
+    @ApiOperation("导出")
     @PostMapping("/listExport")
-    public void export(@RequestBody @Valid SiteExecutiveApprovalListRequest request, BindingResult bindingResult) throws Exception {
-        if (bindingResult.hasErrors()) {
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        }
-        List<SiteExecutiveApprovalListResponse> list;
-        if (!CollectionUtils.isEmpty(request.getIds())) {
-            list = siteExecutiveInfoService.listInfoByIds(request.getIds());
-        } else {
-            list = siteExecutiveInfoService.listInfo(request);
-        }
-        for (SiteExecutiveApprovalListResponse record : list) {
-            DictCodeUtils.convertDictCodeToName(record);
-        }
+    public void export(@RequestBody SiteExecutiveApprovalListRequest request) throws Exception {
+        List<SiteExecutiveApprovalListResponse> list = super.exportList(request);
         super.exportExcel(SiteExecutiveApprovalListResponse.class, list, ExportEnum.SITE_EXECUTIVE_EXPORT.getSheetName());
     }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
index 7e793cd..a92e209 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
@@ -55,7 +55,7 @@
 
     @ApiOperation("设备收发列表导出")
     @PostMapping("/export")
-    public void exportList(@RequestBody @Valid SampleDispatchListRequest request) throws IOException {
+    public void exportList(@RequestBody SampleDispatchListRequest request) throws IOException {
         List<SampleDispatchListResponse> list;
         if (!CollectionUtils.isEmpty(request.getIds())) {
             list = dispatchService.listByIds(request.getIds());
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java
index cdc77fc..d120fd4 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java
@@ -7,6 +7,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.business.labExecutive.*;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.business.IBusinessLabExecutiveInfoService;
@@ -14,6 +15,7 @@
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.*;
 
@@ -32,7 +34,7 @@
     @Autowired
     private IBusinessLabExecutiveInfoService labExecutiveInfoService;
 
-    @ApiOperation("实验室检测-部门检测-查询各状态列表（待检测、检测中、检测完）")
+    @ApiOperation("实验室任务-查询各状态列表（待检测、检测中、检测完）")
     @PostMapping("/deptExecutive/List")
     public ReturnDTO<PageInfoBT<SampleLabExecutiveListResponse>> queryDeptExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
@@ -43,10 +45,19 @@
         return ReturnUtil.success(super.packForBT(labExecutiveInfoService.deptLabExecutiveListPage(page, labExecutiveListRequest)));
     }
 
-    /**
-     * 实验室检测-我的检测-查询各状态列表（待检测、检测中、检测完）
-     */
-    @ApiOperation("实验室检测-我的检测-查询各状态列表（待检测、检测中、检测完）")
+    @ApiOperation("实验室任务导出")
+    @PostMapping("/deptExecutive/export")
+    public void deptExportList(@RequestBody @Valid SampleLabExecutiveListRequest request) throws Exception {
+        List<SampleLabExecutiveListResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = labExecutiveInfoService.deptLabExecutiveListByIds(request.getMeasureStatus(), request.getIds());
+        } else {
+            list = labExecutiveInfoService.deptLabExecutiveList(request);
+        }
+        super.exportExcel(SampleLabExecutiveListResponse.class, list, ExportEnum.DEPT_EXECUTIVE_TASK.getSheetName());
+    }
+
+    @ApiOperation("我的任务-查询各状态列表（待检测、检测中、检测完）")
     @PostMapping("/myExecutive/list")
     public ReturnDTO<PageInfoBT<SampleLabExecutiveListResponse>> queryMyExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
@@ -57,19 +68,25 @@
         return ReturnUtil.success(super.packForBT(labExecutiveInfoService.myLabExecutiveListPage(page, labExecutiveListRequest)));
     }
 
-    /**
-     * 实验室检测-我的检测-查询各状态样品数量（待检测、检测中、检测完）
-     */
-    @ApiOperation("实验室检测-我的检测-查询各状态样品数量（待检测、检测中、检测完）")
+    @ApiOperation("我的任务导出")
+    @PostMapping("/myExecutive/export")
+    public void exportList(@RequestBody @Valid SampleLabExecutiveListRequest request) throws Exception {
+        List<SampleLabExecutiveListResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = labExecutiveInfoService.myLabExecutiveListByIds(request.getMeasureStatus(), request.getIds());
+        } else {
+            list = labExecutiveInfoService.myLabExecutiveList(request);
+        }
+        super.exportExcel(SampleLabExecutiveListResponse.class, list, ExportEnum.MY_EXECUTIVE_TASK.getSheetName());
+    }
+
+    @ApiOperation("我的任务-查询各状态样品数量（待检测、检测中、检测完）")
     @GetMapping("/myExecutive/amount")
     public ReturnDTO<List<SampleAmountResponse>> queryMyExecutiveAmount() {
         return ReturnUtil.success(labExecutiveInfoService.myExecutiveAmount());
     }
 
-    /**
-     * 实验室检测-部门检测-分配（分配给具体人员）
-     */
-    @ApiOperation("实验室检测-部门检测-分配按钮（分配给具体人员）")
+    @ApiOperation("实验室任务-分配按钮（分配给具体人员）")
     @PostMapping("/deptExecutive/allocate")
     public ReturnDTO allocateStaff(@RequestBody @Valid SampleAllocateRequest sampleAllocateRequest, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -78,10 +95,7 @@
         return labExecutiveInfoService.allocateStaff(sampleAllocateRequest);
     }
 
-    /**
-     * 实验室检测-我的检测-检定人扫描收入（待检测->检测中）
-     */
-    @ApiOperation("实验室检测-我的检测-检定人扫描收入（待检测->检测中）")
+    @ApiOperation("我的任务-检定人扫描收入（待检测->检测中）")
     @PostMapping("/myExecutive/receive")
     public ReturnDTO sampleReceive(@RequestBody @Valid List<SampleOperateRequest> requestList, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -90,10 +104,7 @@
         return labExecutiveInfoService.sampleReceive(requestList);
     }
 
-    /**
-     * 实验室检测-负责人/检定人扫描检完（检测中->检测完）
-     */
-    @ApiOperation("实验室检测-负责人/检定人扫描检完（检测中->检测完）")
+    @ApiOperation("实验室任务-负责人/检定人扫描检完（检测中->检测完）")
     @PostMapping("/myExecutive/complete")
     public ReturnDTO sampleExecutiveComplete(@RequestBody @Valid List<SampleOperateRequest> requestList, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -102,10 +113,7 @@
         return labExecutiveInfoService.sampleExecutiveComplete(requestList);
     }
 
-    /**
-     * 实验室检测-部门检测/我的检测 编辑（只能修改应出具证书）
-     */
-    @ApiOperation("实验室检测-部门检测/我的检测 编辑（只能修改应出具证书）")
+    @ApiOperation("实验室任务/我的任务 编辑（只能修改应出具证书）")
     @PostMapping("/executive/update")
     public ReturnDTO updateExecutive(@RequestBody @Valid UpdateExecutiveRequest request, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -114,10 +122,7 @@
         return labExecutiveInfoService.updateExecutive(request);
     }
 
-    /**
-     * 实验室检测-部门检测/我的检测 详情
-     */
-    @ApiOperation("实验室检测-部门检测/我的检测 详情")
+    @ApiOperation("实验室任务/我的任务 详情")
     @PostMapping("/executive/detail")
     public ReturnDTO<ExecutiveDetailResponse> executiveDetail(@RequestBody @Valid ExecutiveDetailRequest request, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
@@ -131,7 +136,7 @@
      * 退回后会将下一个要执行的实验室检测状态更新为待分配，将后面的实验室顺序变更为连续（都进行减1）
      * 最后一个检测的实验室退回，等分发员再增加实验室或设备收发中的已收入直接手动点击完成
      */
-    @ApiOperation("实验室检测-部门检测/我的检测 退回（待检测/检测中->退回）")
+    @ApiOperation("实验室任务/我的任务 退回（待检测/检测中->退回）")
     @PostMapping("/executive/sendBack")
     public ReturnDTO executiveSendBack(@RequestBody @Valid ExecutiveSendBackRequest request, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -140,9 +145,6 @@
         return labExecutiveInfoService.sampleExecutiveSendBack(request);
     }
 
-    /**
-     * 分发员编辑实验室检测列表
-     */
     @ApiOperation("分发员编辑实验室检测列表")
     @PostMapping("/handOut/updateList")
     public ReturnDTO updateExecutiveList(@RequestBody @Valid UpdateExecutiveListRequest request, BindingResult bindingResult) {
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java
index 48a67ed..0c04f31 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java
@@ -10,6 +10,7 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.resource.customer.CustomerApprovalListRequest;
 import com.casic.missiles.dto.resource.customer.CustomerSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceCustomerInfo;
@@ -26,6 +27,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -55,6 +57,13 @@
         return customerInfoService.saveCustomerInfo(request);
     }
 
+    @ApiOperation("委托方名录导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody CustomerApprovalListRequest request) throws Exception {
+        List<BizResourceCustomerInfo> list = super.exportList(request);
+        super.exportExcel(BizResourceCustomerInfo.class, list, ExportEnum.CUSTOMER_INFO.getSheetName());
+    }
+
     @ApiOperation("委托方人员列表（分页）")
     @PostMapping("/person/listPage")
     public ReturnDTO<PageInfoBT<BizResourceCustomerStaff>> personListPage(@RequestBody IdDTO idDto) {
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
index 972ed4b..6418ea5 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
@@ -5,6 +5,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.resource.customer.SuggestFormApprovalListRequest;
 import com.casic.missiles.dto.resource.customer.SuggestFormSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceCustomerSuggestForm;
@@ -20,6 +21,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -50,4 +52,11 @@
         return suggestFormService.saveSuggestForm(request);
     }
 
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody SuggestFormApprovalListRequest request) throws Exception {
+        List<BizResourceCustomerSuggestForm> list = super.exportList(request);
+        super.exportExcel(BizResourceCustomerSuggestForm.class, list, ExportEnum.CUSTOMER_SUGGEST_FORM.getSheetName());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java
index 1934d1a..9e07eab 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java
@@ -15,12 +15,16 @@
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.resource.IEnvEnvironmentRecordConfigService;
 import com.casic.missiles.service.resource.IEnvEnvironmentRecordDataService;
+import com.casic.missiles.service.resource.IEnvLocationInfoService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
 import java.util.List;
@@ -39,6 +43,8 @@
     private IEnvEnvironmentRecordDataService environmentRecordDataService;
     @Autowired
     private IEnvEnvironmentRecordConfigService environmentRecordConfigService;
+    @Autowired
+    private IEnvLocationInfoService locationInfoService;
 
     @ApiOperation("环境记录单数据列表/详情")
     @PostMapping("/data/listPage")
@@ -95,4 +101,11 @@
         });
         return environmentRecordConfigService.deleteEnvironmentRecordConfig(idDTO.getId());
     }
+
+    @ApiOperation("地点列表")
+    @PostMapping("/location/listPage")
+    public ReturnDTO<PageInfoBT<LocationListResponse>> locationListPage(@RequestBody @Valid LocationListRequest request) {
+        Page<LocationListResponse> page = PageFactory.defaultPage();
+        return ReturnUtil.success(super.packForBT(locationInfoService.listPage(page, request)));
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java
index 82efe3f..e9561fa 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java
@@ -10,6 +10,7 @@
 import com.casic.missiles.dto.resource.seal.SealLogListRequest;
 import com.casic.missiles.dto.resource.seal.SealNoteApprovalListRequest;
 import com.casic.missiles.dto.resource.seal.SealNoteSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceSealUseLog;
@@ -27,6 +28,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -58,6 +60,13 @@
         return sealUseNoteService.saveSeal(request);
     }
 
+    @ApiOperation("印章使用登记导出（列表和导出中去掉经办人和监印人）")
+    @PostMapping("/listExport")
+    public void export(@RequestBody SealNoteApprovalListRequest request) throws Exception {
+        List<BizResourceSealUseNote> list = super.exportList(request);
+        super.exportExcel(BizResourceSealUseNote.class, list, ExportEnum.SEAL_NOTE.getSheetName());
+    }
+
     // TODO: 2023/7/28 印章使用日志：系统中使用印章时插入数据库
 
     @ApiOperation("印章使用日志列表（分页）")
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java
index 9b674fc..06b6521 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java
@@ -9,16 +9,20 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.resource.staff.StaffCertRequest;
 import com.casic.missiles.dto.resource.staff.StaffCertResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.service.resource.IBizResourceStaffInfoService;
 import com.casic.missiles.service.resource.IBizResourceStaffVerifierService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.List;
+
 /**
  * @Description:
  * @Author: wangpeng
@@ -41,9 +45,21 @@
         return ReturnUtil.success(super.packForBT(responsePage));
     }
 
+    @ApiOperation("证书逾期提醒导出")
+    @PostMapping("/listExport")
+    public void exportList(@RequestBody StaffCertRequest request) throws Exception {
+        List<StaffCertResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = staffInfoService.certListByIds(request.getIds());
+        } else {
+            list = staffInfoService.certList(request);
+        }
+        super.exportExcel(StaffCertResponse.class, list, ExportEnum.STAFF_CERTIFICATE_EXPIRE.getSheetName());
+    }
+
     @ApiOperation("证书逾期提醒")
     @PostMapping("/expirationReminder")
-    public ReturnDTO expirationReminder(@RequestBody IdDTO idDto) {
-        return verifierService.expirationReminder(idDto);
+    public ReturnDTO expirationReminder(@RequestBody IdDTO idDTO) {
+        return verifierService.expirationReminder(idDTO);
     }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java
index 3b251ad..a6e7850 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java
@@ -12,6 +12,7 @@
 import com.casic.missiles.dto.resource.staff.StaffListRequest;
 import com.casic.missiles.dto.resource.staff.TrainListRequest;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.*;
@@ -22,7 +23,10 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
 import java.util.List;
@@ -52,8 +56,19 @@
             throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
         }
         Page<BizResourceStaffInfo> page = PageFactory.defaultPage();
-        Page<BizResourceStaffInfo> responsePage = staffInfoService.listPage(page, request);
-        return ReturnUtil.success(super.packForBT(responsePage));
+        return ReturnUtil.success(super.packForBT(staffInfoService.listPage(page, request)));
+    }
+
+    @ApiOperation("人员登记导出")
+    @PostMapping("/listExport")
+    public void exportList(@RequestBody StaffListRequest request) throws Exception {
+        List<BizResourceStaffInfo> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = staffInfoService.listByIds(request.getIds());
+        } else {
+            list = staffInfoService.list(request);
+        }
+        super.exportExcel(BizResourceStaffInfo.class, list, ExportEnum.STAFF_INFO.getSheetName());
     }
 
     @ApiOperation("人员登记详情基础信息")
@@ -85,9 +100,9 @@
 
     @ApiOperation("科研教育列表（分页）")
     @PostMapping("/education/listPage")
-    public ReturnDTO<PageInfoBT<BizResourceStaffEducation>> educationListPage(@RequestBody IdDTO idDto) {
+    public ReturnDTO<PageInfoBT<BizResourceStaffEducation>> educationListPage(@RequestBody IdDTO idDTO) {
         Page<BizResourceStaffEducation> page = PageFactory.defaultPage();
-        Page<BizResourceStaffEducation> responsePage = staffInfoService.educationListPage(page, idDto);
+        Page<BizResourceStaffEducation> responsePage = staffInfoService.educationListPage(page, idDTO);
         return ReturnUtil.success(super.packForBT(responsePage));
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java
index af6aa86..d85d84a 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java
@@ -9,6 +9,7 @@
 import com.casic.missiles.dto.resource.outsideService.SupplierApprovalListRequest;
 import com.casic.missiles.dto.resource.outsideService.SupplierSaveResponse;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceSupplierAbility;
@@ -67,6 +68,13 @@
         return ReturnUtil.success(supplierInfoService.detail(idDTO.getId()));
     }
 
+    @ApiOperation("合格供方导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody SupplierApprovalListRequest request) throws Exception {
+        List<BizResourceSupplierInfo> list = super.exportList(request);
+        super.exportExcel(BizResourceSupplierInfo.class, list, ExportEnum.SUPPLIER_INFO.getSheetName());
+    }
+
     @ApiOperation("供方人员列表（分页）")
     @PostMapping("/person/listPage")
     public ReturnDTO<PageInfoBT<BizResourceSupplierPerson>> personListPage(@RequestBody IdDTO idDTO) {
diff --git a/casic-metering-api/src/main/resources/config/application.yml b/casic-metering-api/src/main/resources/config/application.yml
index 350db5f..ecff521 100644
--- a/casic-metering-api/src/main/resources/config/application.yml
+++ b/casic-metering-api/src/main/resources/config/application.yml
@@ -126,7 +126,7 @@
     #作者
     author: wangpeng
     #待生成对象表名
-    table-name: biz_equipment_technical_target_approval,biz_equipment_attachment_approval,biz_equipment_checkpoint_approval
+    table-name: biz_business_outsource_protocol
 
 reminder:
   #节点--common模块config包 ReminderNodeConfig配置
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
index 4a19e4e..d47d552 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
@@ -53,6 +53,7 @@
     SUGGEST_FORM_SAVE_FAILED(2509, "委托方意见登记表保存至草稿箱失败"),
     EXAMINE_FORM_SAVE_FAILED(2510, "要求、委托书及合同评审表保存至草稿箱失败"),
     CUSTOMER_EXIST_SAVE_FAILED(2511, "该委托方已存在，请重新选择"),
+    DUPLICATE_LOCATION_NO(2512, "地点编号已存在"),
 
     /**
      * 计量检定业务模块
@@ -68,6 +69,8 @@
     COMPLETE_SAMPLE_NOT_EXIST(2609, "检测中不存在扫描收入的样品"),
     CANNOT_CHANGE_MEASURE_INFO(2610, "无法更改非当前登录用户的检测信息"),
     NON_EXIST_ORDER_OR_SAMPLE(2611, "不存在该委托单或该委托单下的样品"),
+    OUTSOURCE_ACCESS_SAVE_FAILED(2612, "测试、校准或检定工作分包评审表保存至草稿箱失败"),
+    OUTSOURCE_PROTOCOL_SAVE_FAILED(2613, "测试、校准或检定工作分包协议书保存至草稿箱失败"),
 
     /**
      * 历史遗留备用
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
index 5089ad1..81a406b 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
@@ -10,54 +10,38 @@
     /**
      * 资源管理
      */
-    ENVIRONMENT_DATA_EXPORT("environmentData", "environmentData", "环境记录单数据"),
+    ENVIRONMENT_DATA_EXPORT("environmentData", "环境记录单数据", "环境记录单数据"),
+    STAFF_INFO("staffInfo", "人员登记", "人员登记"),
+    STAFF_CERTIFICATE_EXPIRE("certificateExpire", "证书逾期提醒", "证书逾期提醒"),
+    SUPPLIER_INFO("supplierInfo", "合格供方名录", "合格供方名录"),
+    CUSTOMER_INFO("customerInfo", "委托方名录", "委托方名录"),
+    CUSTOMER_SUGGEST_FORM("customerSuggestForm", "委托方意见登记表", "委托方意见登记表"),
+    SEAL_NOTE("sealNote", "印章使用登记", "印章使用登记"),
 
-    FILE_EXPORT("meterFileData", "meterFileData", "计量文件信息"),
-    TRAIN_PLAN_EXPORT("trainPlanData", "trainPlanData", "培训计划"),
-    TRAIN_LOG_EXPORT("trainLogData", "trainLogData", "培训记录"),
-    METER_ORGANIZE_EXPORT("meterOrganizeData", "meterOrganizeData", "计量组织"),
-    TRACE_SUPPLIER_EXPORT("traceSupplierData", "traceSupplierData", "溯源供方"),
-    SIGN_EXPORT("signData", "signData", "签名/签章"),
-    TEMPLATE_EXPORT("templateData", "templateData", "原始记录模板/证书报告模板"),
-    FIXED_ASSETS("meterFixedAssets", "meterFixedAssets", "固定资产"),
-    METER_EQUIPMENT("meterEquipment", "meterEquipment", "测量设备"),
-    CALIBRATION_TEST_EQUIPMENT("calibrationTestEquipment", "calibrationTestEquipment", "校准检定设备"),
-    MEASURE_ACCOUNT("measureAccount", "measureAccount", "测量工装"),
-    STANDARD_SUPPORT_EQUIPMENT("standardSupportEquipment", "standardSupportEquipment", "标准配套设备"),
-    STANDARD_EQUIPMENT("standardEquipment", "standardEquipment", "标准装置"),
-    FLOW_DEF_EXPORT("flowDefData", "flowDefData", "流程定义"),
-    STAFF_CERTIFICATE("certificate", "certificate", "计量人员证书"),
-    CHECK_INFO("checkInfo", "checkInfo", "设备管理点检测"),
-    EQUIPMENT_APPLY("equipmentApply", "equipmentApply", "设备借用"),
-    STANDARD_EQUIPMENT_REMIND("equipmentApplyRemind", "equipmentApplyRemind", "标准装置到期提醒"),
-    METER_PRICE("meterPrice", "meterPrice", "价格库"),
-    METER_STAFF("meterStaff", "meterStaff", "计量人员"),
-    STANDARD_EQUIPMENT_APPLY("standardEquipmentApply", "standardEquipmentApply", "标准装置申请"),
-    STATE_MANAGE_APPLY("stateManage", "stateManage", "状态管理"),
-    METER_ACCEPTANCE_CHECK("acceptanceCheck", "acceptanceCheck", "设备检修保养验收单"),
-    CUSTOMER_EXPORT("customerData", "customerData", "客户信息"),
-    ORDER_EXPORT("orderData", "orderData", "委托书信息"),
-    SAMPLE_EXPORT("sampleData", "sampleData", "样本信息"),
-    EXCHANGE_DATA("exchangeData", "exchangeData", "设备交接单"),
-    DISPATCH_DATA("dispatchData", "dispatchData", "设备收发"),
-    ENVIRONMENT_DATA("environmentData", "environmentData", "环境记录单"),
-    ORIGIN_DATA("originData", "originData", "原始记录"),
-    CERTIFICATE_REPORT("certificateReport", "certificateReport", "证书报告"),
-    ADVICE_EXPORT("adviceData", "adviceData", "客户反馈"),
-    HANDOUT_EXPORT("handoutData", "handoutData", "任务分发列表"),
-    OUTSOURCER_EXPORT("outsourcerData", "outsourcerData", "分包方"),
-    SITE_EXECUTIVE_EXPORT("siteExecutiveData", "siteExecutiveData", "现场测试、校准或检定"),
-    CERTIFICATE_PRINT_EXPORT("certificatePrintData", "certificatePrintData", "证书打印"),
-    DOWNLOAD_TEMPLATE("downloadTemplate", "downloadTemplate", "页面配置"),
-    OUTSOURCER_CERTIFICATE_EXPORT("outsourceCertificateData", "outsourceCertificateData", "分包证书"),
-    SETTLEMENT_INFO_EXPORT("settlementInfoData", "settlementInfoData", "业务结算"),
-    EQUIPMENT_REMIND("equipmentRemind", "equipmentRemind", "设备到期提醒"),
-    AGREEMENT_INFO_EXPORT("agreementInfoData", "agreementInfoData", "合同"),
-    WORK_STATISTICS_EXPORT("workStatisticsData", "workStatisticsData", "实时工作统计"),
-    DEPT_OUTPUT_EXPORT("deptOutputData", "deptOutputData", "部门产值分析"),
-    WORKLOAD_EXPORT("workloadData", "workloadData", "业务工作量分析"),
-    DEPT_COMPREHENSIVE_EXPORT("deptComprehensiveData", "deptComprehensiveData", "部门综合分析"),
-    ENVIRONMENTAL_RECORD("environmentalRecordData", "environmentalRecordData", "现场环境记录");
+    /**
+     * 计量检定业务
+     */
+    OUTSOURCER_EXPORT("outsourcerData", "分包方名录", "分包方名录"),
+    IDENTIFY_EXPORT("identifyData", "计量标识", "计量标识"),
+    ORDER_EXPORT("orderData", "任务单", "任务单"),
+    DISPATCH_DATA("dispatchData", "设备收发", "设备收发"),
+    HANDOUT_EXPORT("handoutData", "任务分发", "任务分发"),
+    SITE_EXECUTIVE_EXPORT("siteExecutiveData", "现场测试、校准或检定", "现场测试、校准或检定"),
+    CERTIFICATE_REPORT("certificateReport", "证书审批", "证书审批"),
+    CERTIFICATE_CHANGE_APPLY("certificateChangeApply", "证书报告补充或更换申请单", "证书报告补充或更换申请单"),
+    CERTIFICATE_PRINT("certificatePrintData", "证书打印审批", "证书打印审批"),
+    DEPT_EXECUTIVE_TASK("deptExecutiveTaskData", "实验室任务", "实验室任务"),
+    MY_EXECUTIVE_TASK("myExecutiveTaskData", "我的任务", "我的任务"),
+    OUTSOURCE_ASSESS("outsourceAssess", "测试、校准或检定工作分包评审表", "测试、校准或检定工作分包评审表"),
+    OUTSOURCE_PROTOCOL("outsourceProtocol", "测试、校准或检定工作分包协议书", "测试、校准或检定工作分包协议书"),
+
+    /**
+     * 系统管理
+     */
+    SIGN_EXPORT("signData", "签名", "签名"),
+    TEMPLATE_EXPORT("templateData", "文件模板", "文件模板"),
+    FLOW_DEF_EXPORT("flowDefData", "流程定义", "流程定义"),
+    DOWNLOAD_TEMPLATE("downloadTemplate", "流程定义", "页面配置");
 
     ExportEnum(String fileName, String sheetName, String description) {
         this.fileName = fileName;
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateRecordTypeCodeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateRecordTypeCodeEnum.java
index 31d913c..a963522 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateRecordTypeCodeEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateRecordTypeCodeEnum.java
@@ -46,4 +46,14 @@
     String SITE_EXECUTIVE_APPROVAL = "01";
     //《现场测试、校准或检定工作记录表》
     String SITE_EXECUTIVE_LOG = "02";
+
+    //测试、校准或检定工作分包协议书
+    String OUTSOURCE_PROTOCOL = "01";
+    //测试、校准或检定工作分包评审表
+    String OUTSOURCE_ACCESS = "02";
+    //测试、校准或检定工作分包通知书
+    String OUTSOURCE_NOTICE = "03";
+    //测试、校准或检定工作分包方名录
+    String OUTSOURCE_INFO = "04";
+
 }
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
index 24b8635..f78bd53 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
@@ -15,6 +15,10 @@
     String CERTIFICATE_CHANGE_APPLY_BEAN_NAME = "certificateChangeApplyBean";
     //现场测试、校准或检定
     String SITE_EXECUTIVE_BEAN_NAME = "siteExecutiveBean";
+    //测试、校准或检定工作分包评审表
+    String OUTSOURCE_ASSESS_BEAN_NAME = "outsourceAssessBean";
+    //测试、校准或检定工作分包协议书
+    String OUTSOURCE_PROTOCOL_BEAN_NAME = "outsourceProtocolBean";
 
     /*********************************设备与装置************************************/
     //设备台账
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 b21c661..6b86fd1 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
@@ -18,6 +18,8 @@
     OUTSOURCER_APPROVAL(OUTSOURCER_BEAN_NAME, ""),
     CERTIFICATE_CHANGE_APPROVAL(CERTIFICATE_CHANGE_APPLY_BEAN_NAME, ""),
     SITE_EXECUTIVE_APPROVAL(SITE_EXECUTIVE_BEAN_NAME, ""),
+    OUTSOURCE_ASSESS_APPROVAL(OUTSOURCE_ASSESS_BEAN_NAME, ""),
+    OUTSOURCE_PROTOCOL_APPROVAL(OUTSOURCE_PROTOCOL_BEAN_NAME, ""),
 
     ACTION_STATUS_MAP(new HashMap<String, AwareActionStatusEnum>() {
         {
@@ -47,6 +49,10 @@
             put(ApplyFromIdEnum.CERTIFICATE_CHANGE_APPROVAL.getCode(), CERTIFICATE_CHANGE_APPROVAL);
             //现场测试、校准或检定审批
             put(ApplyFromIdEnum.SITE_EXECUTIVE_APPROVAL.getCode(), SITE_EXECUTIVE_APPROVAL);
+            //测试、校准或检定工作分包评审表
+            put(ApplyFromIdEnum.OUTSOURCE_ASSESS_APPROVAL.getCode(), OUTSOURCE_ASSESS_APPROVAL);
+            //测试、校准或检定工作分包协议书
+            put(ApplyFromIdEnum.OUTSOURCE_PROTOCOL_APPROVAL.getCode(), OUTSOURCE_PROTOCOL_APPROVAL);
         }
     });
     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 934405e..c7410bd 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
@@ -9,6 +9,8 @@
     CERTIFICATE_CHANGE_APPROVAL("jljdywzsbchghsqd", MessageSourceModuleEnum.BUSINESS.getCode(), "证书/报告补充或更换申请单"),
     OUTSOURCER_APPROVAL("jljdywcsjzhgfbfml", MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定合格分包方名录"),
     SITE_EXECUTIVE_APPROVAL("jljdywxccsjzsp", MessageSourceModuleEnum.BUSINESS.getCode(), "现场测试、校准或检定审批"),
+    OUTSOURCE_ASSESS_APPROVAL("jljdywcsjzfbpsb", MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包评审表"),
+    OUTSOURCE_PROTOCOL_APPROVAL("jljdywcsjzfbxys", MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包协议书"),
 
 
     /*******************************************设备与装置*********************************************/
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/GeneralApprovalMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/GeneralApprovalMapper.java
index 4fb7344..0c9d6ae 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/GeneralApprovalMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/GeneralApprovalMapper.java
@@ -17,8 +17,4 @@
 
     Page<O> selectBatchForApprovalList(Page<O> page, @Param("request") R request, @Param("businessKeys") List<String> businessKeys);
 
-//    Page<O> selectListPage(Page<O> page, @Param("request") R request);
-
-//    Long selectMaxNo();
-
 }
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceAssessMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceAssessMapper.java
index 7867bb8..ba59009 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceAssessMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceAssessMapper.java
@@ -1,7 +1,12 @@
 package com.casic.missiles.mapper.business;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.business.outsource.OutsourceAssessApprovalListRequest;
+import com.casic.missiles.mapper.GeneralApprovalMapper;
 import com.casic.missiles.model.business.BizBusinessOutsourceAssess;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * <p>
@@ -11,6 +16,10 @@
  * @author wangpeng
  * @since 2023-08-16
  */
-public interface BizBusinessOutsourceAssessMapper extends BaseMapper<BizBusinessOutsourceAssess> {
+public interface BizBusinessOutsourceAssessMapper extends GeneralApprovalMapper<BizBusinessOutsourceAssess, BizBusinessOutsourceAssess, OutsourceAssessApprovalListRequest> {
+
+    Page<BizBusinessOutsourceAssess> selectBatchForApprovalList(Page<BizBusinessOutsourceAssess> page, @Param("request") OutsourceAssessApprovalListRequest request, @Param("businessKeys") List<String> businessKeys);
+
+    Long selectMaxProjectNo();
 
 }
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceProtocolMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceProtocolMapper.java
new file mode 100644
index 0000000..e6aba35
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceProtocolMapper.java
@@ -0,0 +1,24 @@
+package com.casic.missiles.mapper.business;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.business.outsource.OutsourceProtocolApprovalListRequest;
+import com.casic.missiles.mapper.GeneralApprovalMapper;
+import com.casic.missiles.model.business.BizBusinessOutsourceProtocol;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 计量检定业务-分包管理-测试、校准或检定工作分包协议书 Mapper 接口
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-08-24
+ */
+public interface BizBusinessOutsourceProtocolMapper extends GeneralApprovalMapper<BizBusinessOutsourceProtocol, BizBusinessOutsourceProtocol, OutsourceProtocolApprovalListRequest> {
+
+    Page<BizBusinessOutsourceProtocol> selectBatchForApprovalList(Page<BizBusinessOutsourceProtocol> page, @Param("request") OutsourceProtocolApprovalListRequest request, @Param("businessKeys") List<String> businessKeys);
+
+    Long selectMaxProtocolNo();
+}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/EnvLocationInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/EnvLocationInfoMapper.java
new file mode 100644
index 0000000..49eff87
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/EnvLocationInfoMapper.java
@@ -0,0 +1,21 @@
+package com.casic.missiles.mapper.resource;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.resource.environment.LocationListRequest;
+import com.casic.missiles.dto.resource.environment.LocationListResponse;
+import com.casic.missiles.model.resource.EnvLocationInfo;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * <p>
+ * 实验室环境监控系统-设备表 Mapper 接口
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-06-07
+ */
+public interface EnvLocationInfoMapper extends BaseMapper<EnvLocationInfo> {
+
+    Page<LocationListResponse> selectLocationListPage(Page<LocationListResponse> page, @Param("request") LocationListRequest request);
+}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java
index de124db..85ed0f7 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java
@@ -1,7 +1,9 @@
 package com.casic.missiles.mapper.system;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.dto.system.SignDetailResponse;
+import com.casic.missiles.dto.system.SignListRequest;
 import com.casic.missiles.model.system.SystemSign;
 import org.apache.ibatis.annotations.Param;
 
@@ -22,4 +24,8 @@
     SignDetailResponse selectSignDetailById(Long id);
 
     List<SystemSign> selectUsableSignList(@Param("userId") Long userId);
+
+    Page<SystemSign> selectSignListPage(Page<SystemSign> page, @Param("request") SignListRequest request);
+
+    List<SystemSign> selectSignList(@Param("request") SignListRequest request);
 }
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateChangeApplyMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateChangeApplyMapper.xml
index d798447..c496092 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateChangeApplyMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateChangeApplyMapper.xml
@@ -30,31 +30,31 @@
         SELECT *
         FROM biz_business_certificate_change_apply
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.changeApplyNo != null and request.changeApplyNo !=''">
+        <if test="request != null and request.changeApplyNo != null and request.changeApplyNo !=''">
             and change_apply_no like concat('%',#{request.changeApplyNo},'%')
         </if>
-        <if test="request.changeReportNo != null and request.changeReportNo !=''">
+        <if test="request != null and request.changeReportNo != null and request.changeReportNo !=''">
             and change_report_no like concat('%',#{request.changeReportNo},'%')
         </if>
-        <if test="request.changeReportName != null and request.changeReportName !=''">
+        <if test="request != null and request.changeReportName != null and request.changeReportName !=''">
             and change_report_name like concat('%',#{request.changeReportName},'%')
         </if>
-        <if test="request.changeType != null and request.changeType !=''">
+        <if test="request != null and request.changeType != null and request.changeType !=''">
             and change_type = #{request.changeType}
         </if>
-        <if test="request.createUserName != null and request.createUserName !=''">
+        <if test="request != null and request.createUserName != null and request.createUserName !=''">
             and create_user_name like concat('%',#{request.createUserName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificatePrintMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificatePrintMapper.xml
index b66cd99..49c0ac8 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificatePrintMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificatePrintMapper.xml
@@ -31,34 +31,34 @@
         LEFT JOIN biz_business_order_sample_relation bosr ON (bosr.order_id = bcr.order_id AND bosr.sample_id = bcr.sample_id)
         LEFT JOIN biz_business_order_info boi ON boi.id = bosr.order_id
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and bcp.approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.printStatus != null and request.printStatus !=''">
+        <if test="request != null and request.printStatus != null and request.printStatus !=''">
             and print_status = #{request.printStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and bcp.create_user_id = #{request.createUserId}
         </if>
-        <if test="request.certificateReportNo != null and request.certificateReportNo !=''">
+        <if test="request != null and request.certificateReportNo != null and request.certificateReportNo !=''">
             and bcr.certificate_report_no like concat('%',#{request.certificateReportNo},'%')
         </if>
-        <if test="request.certificateReportName != null and request.certificateReportName !=''">
+        <if test="request != null and request.certificateReportName != null and request.certificateReportName !=''">
             and bcr.certificate_report_name like concat('%',#{request.certificateReportName},'%')
         </if>
-        <if test="request.customerName != null and request.customerName !=''">
+        <if test="request != null and request.customerName != null and request.customerName !=''">
             and boi.customer_name like concat('%',#{request.customerName},'%')
         </if>
-        <if test="request.sampleNo != null and request.sampleNo !=''">
+        <if test="request != null and request.sampleNo != null and request.sampleNo !=''">
             and bosr.sample_no like concat('%',#{request.sampleNo},'%')
         </if>
-        <if test="request.sampleName != null and request.sampleName !=''">
+        <if test="request != null and request.sampleName != null and request.sampleName !=''">
             and bosr.sample_name like concat('%',#{request.sampleName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and bcp.create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and bcp.create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml
index b366034..767695d 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml
@@ -46,33 +46,37 @@
         SELECT bcr.*, bosr.sample_no, bosr.sample_name, bosr.sample_model, rsi.staff_name
         FROM biz_business_certificate_report bcr
         LEFT JOIN biz_business_order_sample_relation bosr ON (bosr.order_id = bcr.order_id AND bosr.sample_id = bcr.sample_id)
+        LEFT JOIN biz_business_order_info boi ON boi.id = bcr.order_id
         LEFT JOIN biz_resource_staff_info rsi ON rsi.id = bcr.measure_person_id
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and bcr.approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and bcr.create_user_id = #{request.createUserId}
         </if>
-        <if test="request.certificateReportNo != null and request.certificateReportNo !=''">
+        <if test="request != null and request.customerId != null and request.customerId !=''">
+            and boi.customer_id = #{request.customerId}
+        </if>
+        <if test="request != null and request.certificateReportNo != null and request.certificateReportNo !=''">
             and bcr.certificate_report_no like concat('%',#{request.certificateReportNo},'%')
         </if>
-        <if test="request.certificateReportName != null and request.certificateReportName !=''">
+        <if test="request != null and request.certificateReportName != null and request.certificateReportName !=''">
             and bcr.certificate_report_name like concat('%',#{request.certificateReportName},'%')
         </if>
-        <if test="request.sampleNo != null and request.sampleNo !=''">
+        <if test="request != null and request.sampleNo != null and request.sampleNo !=''">
             and bosr.sample_no like concat('%',#{request.sampleNo},'%')
         </if>
-        <if test="request.measureCategory != null and request.measureCategory !=''">
+        <if test="request != null and request.measureCategory != null and request.measureCategory !=''">
             and bcr.measure_category = #{request.measureCategory}
         </if>
-        <if test="request.measurePerson != null and request.measurePerson !=''">
+        <if test="request != null and request.measurePerson != null and request.measurePerson !=''">
             and rsi.staff_name like concat('%',#{request.measurePerson},'%')
         </if>
-        <if test="request.calibrationTimeStart != null and request.calibrationTimeStart !=''">
+        <if test="request != null and request.calibrationTimeStart != null and request.calibrationTimeStart !=''">
             and bcr.calibration_time &gt;= #{request.calibrationTimeStart}
         </if>
-        <if test="request.calibrationTimeEnd != null and request.calibrationTimeEnd !=''">
+        <if test="request != null and request.calibrationTimeEnd != null and request.calibrationTimeEnd !=''">
             and bcr.calibration_time &lt;= #{request.calibrationTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceAssessMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceAssessMapper.xml
index d0fcf8b..c22c101 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceAssessMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceAssessMapper.xml
@@ -7,6 +7,8 @@
         <id column="id" property="id" />
         <result column="project_no" property="projectNo" />
         <result column="project_name" property="projectName" />
+        <result column="lab_code" property="labCode" />
+        <result column="group_code" property="groupCode" />
         <result column="applicant_id" property="applicantId" />
         <result column="applicant_name" property="applicantName" />
         <result column="applicant_time" property="applicantTime" />
@@ -31,7 +33,45 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, project_no, project_name, applicant_id, applicant_name, applicant_time, minio_file_name, remark, create_user_id, create_user_name, outsourcer_id, pre_start_time, pre_end_time, outsource_reason, pre_cost, approval_status, process_id, approve_situation, traceability, test_method, technique_ability, create_time, update_time
+        id, project_no, project_name, lab_code, group_code, applicant_id, applicant_name, applicant_time, minio_file_name, remark, create_user_id, create_user_name, outsourcer_id, pre_start_time, pre_end_time, outsource_reason, pre_cost, approval_status, process_id, approve_situation, traceability, test_method, technique_ability, create_time, update_time
     </sql>
 
+    <select id="selectMaxProjectNo" resultType="java.lang.Long">
+        SELECT IFNULL(max(RIGHT(project_no, 3)), 0) from biz_business_outsource_assess
+    </select>
+
+    <select id="selectBatchForApprovalList" resultMap="BaseResultMap">
+        SELECT bboa.*, bboi.outsourcer_name, bboi.director
+        FROM biz_business_outsource_assess bboa
+        LEFT JOIN biz_business_outsourcer_info bboi ON bboa.outsourcer_id = bboi.id
+        WHERE 1=1
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
+            and bboa.approval_status = #{request.approvalStatus}
+        </if>
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
+            and bboa.create_user_id = #{request.createUserId}
+        </if>
+        <if test="request != null and request.projectNo != null and request.projectNo !=''">
+            and bboa.project_no like concat('%',#{request.projectNo},'%')
+        </if>
+        <if test="request != null and request.outsourcerName != null and request.outsourcerName !=''">
+            and bboi.outsourcer_name like concat('%',#{request.outsourcerName},'%')
+        </if>
+        <if test="request != null and request.applicantName != null and request.applicantName !=''">
+            and bboa.applicant_name like concat('%',#{request.applicantName},'%')
+        </if>
+        <if test="request != null and request.applicantTimeStart != null and request.applicantTimeStart !=''">
+            and bboa.applicant_time &gt;= #{request.applicantTimeStart}
+        </if>
+        <if test="request != null and request.applicantTimeEnd != null and request.applicantTimeEnd !=''">
+            and bboa.applicant_time &lt;= #{request.applicantTimeEnd}
+        </if>
+        <if test="businessKeys != null">
+            and bboa.id in
+            <foreach collection="businessKeys" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
+        ORDER BY bboa.create_time DESC
+    </select>
 </mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceProtocolMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceProtocolMapper.xml
new file mode 100644
index 0000000..b7b2149
--- /dev/null
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceProtocolMapper.xml
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.mapper.business.BizBusinessOutsourceProtocolMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.business.BizBusinessOutsourceProtocol">
+        <id column="id" property="id" />
+        <result column="protocol_no" property="protocolNo" />
+        <result column="project_name" property="projectName" />
+        <result column="lab_code" property="labCode" />
+        <result column="group_code" property="groupCode" />
+        <result column="outsourcer_id" property="outsourcerId" />
+        <result column="remark" property="remark" />
+        <result column="outsource_no" property="outsourceNo" />
+        <result column="outsource_name" property="outsourceName" />
+        <result column="contacts" property="contacts" />
+        <result column="mobile" property="mobile" />
+        <result column="address" property="address" />
+        <result column="require_date" property="requireDate" />
+        <result column="outsource_cost" property="outsourceCost" />
+        <result column="director" property="director" />
+        <result column="item" property="item" />
+        <result column="requires" property="requires" />
+        <result column="create_user_id" property="createUserId" />
+        <result column="create_user_name" property="createUserName" />
+        <result column="approval_status" property="approvalStatus" />
+        <result column="process_id" property="processId" />
+        <result column="create_time" property="createTime" />
+        <result column="update_time" property="updateTime" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, protocol_no, project_name, lab_code, group_code, outsourcer_id, remark, outsource_no, outsource_name, contacts, mobile, address, require_date, outsource_cost, director, item, requires, create_user_id, create_user_name, approval_status, process_id, create_time, update_time
+    </sql>
+
+    <select id="selectMaxProtocolNo" resultType="java.lang.Long">
+        SELECT IFNULL(max(RIGHT(protocol_no, 3)), 0) from biz_business_outsource_protocol
+    </select>
+
+    <select id="selectBatchForApprovalList" resultMap="BaseResultMap">
+        SELECT *
+        FROM biz_business_outsource_protocol
+        WHERE 1=1
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
+            and approval_status = #{request.approvalStatus}
+        </if>
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
+            and create_user_id = #{request.createUserId}
+        </if>
+        <if test="request != null and request.protocolNo != null and request.protocolNo !=''">
+            and protocol_no like concat('%',#{request.protocolNo},'%')
+        </if>
+        <if test="request != null and request.outsourcerName != null and request.outsourcerName !=''">
+            and outsourcer_name like concat('%',#{request.outsourcerName},'%')
+        </if>
+        <if test="request != null and request.applicantName != null and request.applicantName !=''">
+            and create_user_name like concat('%',#{request.applicantName},'%')
+        </if>
+        <if test="request != null and request.applicantTimeStart != null and request.applicantTimeStart !=''">
+            and create_time &gt;= #{request.applicantTimeStart}
+        </if>
+        <if test="request != null and request.applicantTimeEnd != null and request.applicantTimeEnd !=''">
+            and create_time &lt;= #{request.applicantTimeEnd}
+        </if>
+        <if test="businessKeys != null">
+            and id in
+            <foreach collection="businessKeys" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
+        ORDER BY create_time DESC
+    </select>
+</mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourcerInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourcerInfoMapper.xml
index 510a80b..3049b54 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourcerInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourcerInfoMapper.xml
@@ -7,6 +7,8 @@
         <id column="id" property="id" />
         <result column="outsourcer_no" property="outsourcerNo" />
         <result column="outsourcer_name" property="outsourcerName" />
+        <result column="lab_code" property="labCode" />
+        <result column="group_code" property="groupCode" />
         <result column="outsourcer_brief_name" property="outsourcerBriefName" />
         <result column="outsourcer_size" property="outsourcerSize" />
         <result column="business_size" property="businessSize" />
@@ -55,32 +57,32 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, outsourcer_no, outsourcer_name, outsourcer_brief_name, outsourcer_size, business_size, grade, evaluation, tax_number, bank_account, bank_name, bank_account_number, postal_code, director, phone, fax, mobile, email, website, address_country, address_province, address_city, address_area, full_address, address_country_name, address_province_name, address_city_name, address_area_name, invoice_country, invoice_province, invoice_city, invoice_area, invoice_full_address, invoice_country_name, invoice_province_name, invoice_city_name, invoice_area_name, business_scope, business_content, minio_file_name, approval_status, process_id, remark, create_user_id, create_user_name, create_time, update_time
+        id, outsourcer_no, outsourcer_name, lab_code, group_code, outsourcer_brief_name, outsourcer_size, business_size, grade, evaluation, tax_number, bank_account, bank_name, bank_account_number, postal_code, director, phone, fax, mobile, email, website, address_country, address_province, address_city, address_area, full_address, address_country_name, address_province_name, address_city_name, address_area_name, invoice_country, invoice_province, invoice_city, invoice_area, invoice_full_address, invoice_country_name, invoice_province_name, invoice_city_name, invoice_area_name, business_scope, business_content, minio_file_name, approval_status, process_id, remark, create_user_id, create_user_name, create_time, update_time
     </sql>
 
     <select id="selectBatchForApprovalList" resultMap="BaseResultMap">
         SELECT *
         FROM biz_business_outsourcer_info
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.outsourcerNo != null and request.outsourcerNo !=''">
+        <if test="request != null and request.outsourcerNo != null and request.outsourcerNo !=''">
             and outsourcer_no like concat('%',#{request.outsourcerNo},'%')
         </if>
-        <if test="request.outsourcerName != null and request.outsourcerName !=''">
+        <if test="request != null and request.outsourcerName != null and request.outsourcerName !=''">
             and outsourcer_name like concat('%',#{request.outsourcerName},'%')
         </if>
-        <if test="request.director != null and request.director !=''">
+        <if test="request != null and request.director != null and request.director !=''">
             and director like concat('%',#{request.director},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
@@ -93,6 +95,6 @@
     </select>
 
     <select id="selectMaxNo" resultType="java.lang.Long">
-        SELECT IFNULL(max(RIGHT(outsourcer_no, 12)), 0) from biz_business_outsourcer_info
+        SELECT IFNULL(max(RIGHT(outsourcer_no, 3)), 0) from biz_business_outsourcer_info
     </select>
 </mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessSiteExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessSiteExecutiveInfoMapper.xml
index 135c5d0..3c5ae79 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessSiteExecutiveInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessSiteExecutiveInfoMapper.xml
@@ -38,25 +38,25 @@
         FROM biz_business_site_executive_info bsei
         LEFT JOIN biz_resource_customer_info rci ON bsei.customer_id = rci.id
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and bsei.approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and bsei.create_user_id = #{request.createUserId}
         </if>
-        <if test="request.siteExecutiveNo != null and request.siteExecutiveNo !=''">
+        <if test="request != null and request.siteExecutiveNo != null and request.siteExecutiveNo !=''">
             and bsei.site_executive_no like concat('%',#{request.siteExecutiveNo},'%')
         </if>
-        <if test="request.customerName != null and request.customerName !=''">
+        <if test="request != null and request.customerName != null and request.customerName !=''">
             and rci.outsourcer_name like concat('%',#{request.customerName},'%')
         </if>
-        <if test="request.applyName != null and request.applyName !=''">
+        <if test="request != null and request.applyName != null and request.applyName !=''">
             and bsei.apply_name like concat('%',#{request.applyName},'%')
         </if>
-        <if test="request.applyTimeStart != null and request.applyTimeStart !=''">
+        <if test="request != null and request.applyTimeStart != null and request.applyTimeStart !=''">
             and bsei.apply_time &gt;= #{request.applyTimeStart}
         </if>
-        <if test="request.applyTimeEnd != null and request.applyTimeEnd !=''">
+        <if test="request != null and request.applyTimeEnd != null and request.applyTimeEnd !=''">
             and bsei.apply_time &lt;= #{request.applyTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml
index 84d9e2a..6bd38a9 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml
@@ -105,6 +105,12 @@
         <if test="request.isUrgent != null and request.isUrgent !=''">
             AND bo.is_urgent = #{request.isUrgent}
         </if>
+        <if test="request.ids != null">
+            and blei.id in
+            <foreach collection="request.ids" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
         ORDER BY blei.update_time DESC
     </select>
 
@@ -137,6 +143,12 @@
         <if test="request.isUrgent != null and request.isUrgent !=''">
             AND bo.is_urgent = #{request.isUrgent}
         </if>
+        <if test="request.ids != null">
+            and blei.id in
+            <foreach collection="request.ids" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
         ORDER BY blei.update_time DESC
     </select>
 
diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardInfoMapper.xml
index 1a5551b..2ed8d17 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardInfoMapper.xml
@@ -45,12 +45,6 @@
         FROM biz_equipment_standard_info besi
         LEFT JOIN biz_equipment_standard_technology_relation bestr ON besi.standard_no = bestr.standard_no
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
-            and besi.approval_status = #{request.approvalStatus}
-        </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
-            and besi.create_user_id = #{request.createUserId}
-        </if>
         <if test="request.standardName != null and request.standardName !=''">
             and besi.standard_name like concat('%',#{request.standardName},'%')
         </if>
diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardTechnologyRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardTechnologyRelationMapper.xml
index fc7e16c..cd03c8c 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardTechnologyRelationMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardTechnologyRelationMapper.xml
@@ -6,6 +6,7 @@
     <resultMap id="BaseResultMap" type="com.casic.missiles.model.equipment.BizEquipmentStandardTechnologyRelation">
         <id column="id" property="id" />
         <result column="technology_file_id" property="technologyFileId" />
+        <result column="technology_file_no" property="technologyFileNo" />
         <result column="technology_file_name" property="technologyFileName" />
         <result column="standard_id" property="standardId" />
         <result column="standard_no" property="standardNo" />
@@ -14,7 +15,7 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, technology_file_id, technology_file_name, standard_id, remark
+        id, technology_file_id, technology_file_no, technology_file_name, standard_id, remark
     </sql>
 
 </mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceAuthorizeOrderMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceAuthorizeOrderMapper.xml
index ac5176c..554fe65 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceAuthorizeOrderMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceAuthorizeOrderMapper.xml
@@ -32,22 +32,22 @@
         SELECT *
         FROM biz_resource_authorize_order
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.orderNo != null and request.orderNo !=''">
+        <if test="request != null and request.orderNo != null and request.orderNo !=''">
             and order_no like concat('%',#{request.orderNo},'%')
         </if>
-        <if test="request.createUserName != null and request.createUserName !=''">
+        <if test="request != null and request.createUserName != null and request.createUserName !=''">
             and create_user_name like concat('%',#{request.createUserName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerExamineFormMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerExamineFormMapper.xml
index ab242f6..af7f98f 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerExamineFormMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerExamineFormMapper.xml
@@ -41,28 +41,28 @@
         SELECT *
         FROM biz_resource_customer_examine_form
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.formNo != null and request.formNo !=''">
+        <if test="request != null and request.formNo != null and request.formNo !=''">
             and form_no like concat('%',#{request.formNo},'%')
         </if>
-        <if test="request.labCode != null and request.labCode !=''">
+        <if test="request != null and request.labCode != null and request.labCode !=''">
             and lab_code like concat('%',#{request.labCode},'%')
         </if>
-        <if test="request.groupCode != null and request.groupCode !=''">
+        <if test="request != null and request.groupCode != null and request.groupCode !=''">
             and group_code like concat('%',#{request.groupCode},'%')
         </if>
-        <if test="request.createUserName != null and request.createUserName !=''">
+        <if test="request != null and request.createUserName != null and request.createUserName !=''">
             and create_user_name like concat('%',#{request.createUserName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerInfoMapper.xml
index fa8ffbc..06a2798 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerInfoMapper.xml
@@ -33,25 +33,25 @@
         SELECT *
         FROM biz_resource_customer_info
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.customerNo != null and request.customerNo !=''">
+        <if test="request != null and request.customerNo != null and request.customerNo !=''">
             and customer_no like concat('%',#{request.customerNo},'%')
         </if>
-        <if test="request.customerName != null and request.customerName !=''">
+        <if test="request != null and request.customerName != null and request.customerName !=''">
             and customer_name like concat('%',#{request.customerName},'%')
         </if>
-        <if test="request.contacts != null and request.contacts !=''">
+        <if test="request != null and request.contacts != null and request.contacts !=''">
             and contacts like concat('%',#{request.contacts},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerSuggestFormMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerSuggestFormMapper.xml
index 28f5bb2..1806662 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerSuggestFormMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerSuggestFormMapper.xml
@@ -33,28 +33,28 @@
         SELECT *
         FROM biz_resource_customer_suggest_form
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.formNo != null and request.formNo !=''">
+        <if test="request != null and request.formNo != null and request.formNo !=''">
             and form_no like concat('%',#{request.formNo},'%')
         </if>
-        <if test="request.customerName != null and request.customerName !=''">
+        <if test="request != null and request.customerName != null and request.customerName !=''">
             and customer_name like concat('%',#{request.customerName},'%')
         </if>
-        <if test="request.customerDeptName != null and request.customerDeptName !=''">
+        <if test="request != null and request.customerDeptName != null and request.customerDeptName !=''">
             and customer_dept_name like concat('%',#{request.customerDeptName},'%')
         </if>
-        <if test="request.createUserName != null and request.createUserName !=''">
+        <if test="request != null and request.createUserName != null and request.createUserName !=''">
             and create_user_name like concat('%',#{request.createUserName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSealUseNoteMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSealUseNoteMapper.xml
index ab37bc1..b02bb33 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSealUseNoteMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSealUseNoteMapper.xml
@@ -29,32 +29,32 @@
     </sql>
 
     <select id="selectBatchForApprovalList" resultMap="BaseResultMap">
-        SELECT *
+        SELECT brsun.*, brsi.seal_name, brsi.seal_type, brsi.approver_name
         FROM biz_resource_seal_use_note brsun
         JOIN biz_resource_seal_info brsi ON brsun.seal_id = brsi.id
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and brsun.approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and brsun.create_user_id = #{request.createUserId}
         </if>
-        <if test="request.sealName != null and request.sealName !=''">
+        <if test="request != null and request.sealName != null and request.sealName !=''">
             and brsi.seal_name like concat('%',#{request.sealName},'%')
         </if>
-        <if test="request.sealType != null and request.sealType !=''">
+        <if test="request != null and request.sealType != null and request.sealType !=''">
             and brsi.seal_type = #{request.sealType}
         </if>
-        <if test="request.applyDeptName != null and request.applyDeptName !=''">
+        <if test="request != null and request.applyDeptName != null and request.applyDeptName !=''">
             and brsun.apply_dept_name like concat('%',#{request.applyDeptName},'%')
         </if>
-        <if test="request.applyUserName != null and request.applyUserName !=''">
+        <if test="request != null and request.applyUserName != null and request.applyUserName !=''">
             and brsun.apply_user_name like concat('%',#{request.applyUserName},'%')
         </if>
-        <if test="request.applyTimeStart != null and request.applyTimeStart !=''">
+        <if test="request != null and request.applyTimeStart != null and request.applyTimeStart !=''">
             and brsun.apply_time &gt;= #{request.applyTimeStart}
         </if>
-        <if test="request.applyTimeEnd != null and request.applyTimeEnd !=''">
+        <if test="request != null and request.applyTimeEnd != null and request.applyTimeEnd !=''">
             and brsun.apply_time &lt;= #{request.applyTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml
index 119bf7d..4f8392a 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml
@@ -31,6 +31,12 @@
         <if test="request.deptName != null and request.deptName !=''">
             and brsi.dept_name like concat('%',#{request.deptName},'%')
         </if>
+        <if test="request.ids != null">
+            and brsv.id in
+            <foreach collection="request.ids" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
         ORDER BY brsv.grant_date DESC
     </select>
 
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSupplierInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSupplierInfoMapper.xml
index fe8d399..e8ce7ef 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSupplierInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSupplierInfoMapper.xml
@@ -48,28 +48,28 @@
         SELECT *
         FROM biz_resource_supplier_info
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.supplierNo != null and request.supplierNo !=''">
+        <if test="request != null and request.supplierNo != null and request.supplierNo !=''">
             and supplier_no like concat('%',#{request.supplierNo},'%')
         </if>
-        <if test="request.supplierName != null and request.supplierName !=''">
+        <if test="request != null and request.supplierName != null and request.supplierName !=''">
             and supplier_name like concat('%',#{request.supplierName},'%')
         </if>
-        <if test="request.director != null and request.director !=''">
+        <if test="request != null and request.director != null and request.director !=''">
             and director like concat('%',#{request.director},'%')
         </if>
-        <if test="request.supplierType != null and request.supplierType !=''">
+        <if test="request != null and request.supplierType != null and request.supplierType !=''">
             and supplier_type = #{request.supplierType}
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/EnvLocationInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/EnvLocationInfoMapper.xml
new file mode 100644
index 0000000..68bcf10
--- /dev/null
+++ b/casic-metering-dao/src/main/resources/mapper/resource/EnvLocationInfoMapper.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.mapper.resource.EnvLocationInfoMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.resource.EnvLocationInfo">
+        <id column="id" property="id" />
+        <result column="location_no" property="locationNo" />
+        <result column="location_name" property="locationName" />
+        <result column="location_position" property="locationPosition" />
+        <result column="create_user_id" property="createUserId" />
+        <result column="create_user" property="createUser" />
+        <result column="create_time" property="createTime" />
+        <result column="update_time" property="updateTime" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, location_no, location_name, location_position, create_user_id, create_user, create_time, update_time
+    </sql>
+
+    <select id="selectLocationListPage" resultType="com.casic.missiles.dto.resource.environment.LocationListResponse">
+        SELECT *
+        FROM env_location_info
+        WHERE 1=1
+        <if test="request.locationNo != null and request.locationNo !=''">
+            AND location_no LIKE concat('%',#{request.locationNo},'%')
+        </if>
+        <if test="request.locationName != null and request.locationName !=''">
+            AND location_name LIKE concat('%',#{request.locationName},'%')
+        </if>
+        ORDER BY create_time DESC
+    </select>
+
+</mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml
index b28c18f..8854047 100644
--- a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml
@@ -11,7 +11,6 @@
         <result column="sign_desc" property="signDesc" />
         <result column="sign_director" property="signDirector" />
         <result column="sign_user_id" property="signUserId" />
-        <result column="sign_type" property="signType" />
         <result column="minio_file_name" property="minioFileName" />
         <result column="create_time" property="createTime" />
         <result column="update_time" property="updateTime" />
@@ -28,7 +27,6 @@
         <result column="sign_name" property="signName" />
         <result column="sign_desc" property="signDesc" />
         <result column="sign_director" property="signDirector" />
-        <result column="sign_type" property="signType" />
         <result column="sign_user_id" property="signUserId" />
         <result column="minio_file_name" property="minioFileName" />
         <result column="create_time" property="createTime" />
@@ -62,4 +60,58 @@
         JOIN system_sign_user_relation ssur ON ss.id = ssur.sign_id
         WHERE ssur.user_id = #{userId}
     </select>
+
+    <select id="selectSignListPage" resultMap="BaseResultMap">
+        SELECT ss.*, sd.SIMPLE_NAME AS deptName
+        FROM system_sign ss
+        LEFT JOIN sys_user su ON su.id = ss.sign_user_id
+        LEFT JOIN sys_dept sd ON sd.id = su.dept_id
+        WHERE 1=1
+        <if test="request.signNo != null and request.signNo !=''">
+            AND ss.sign_no LIKE concat('%',#{request.signNo},'%')
+        </if>
+        <if test="request.signName != null and request.signName !=''">
+            AND ss.sign_name LIKE concat('%',#{request.signName},'%')
+        </if>
+        <if test="request.signDirector != null and request.signDirector !=''">
+            AND ss.sign_director LIKE concat('%',#{request.signDirector},'%')
+        </if>
+        <if test="request.signUserId != null and request.signUserId !=''">
+            AND ss.sign_user_id = #{request.signUserId}
+        </if>
+        <if test="request.createStartTime != null and request.createStartTime !=''">
+            AND DATE_FORMAT(ss.create_time,'%Y-%m-%d') &gt;= DATE_FORMAT(#{request.createStartTime},'%Y-%m-%d')
+        </if>
+        <if test="request.createEndTime != null and request.createEndTime !=''">
+            AND DATE_FORMAT(ss.create_time,'%Y-%m-%d')  &lt;= DATE_FORMAT(#{request.createEndTime},'%Y-%m-%d')
+        </if>
+        ORDER BY ss.create_time DESC
+    </select>
+
+    <select id="selectSignList" resultMap="BaseResultMap">
+        SELECT ss.*, sd.SIMPLE_NAME AS deptName
+        FROM system_sign ss
+        LEFT JOIN sys_user su ON su.id = ss.sign_user_id
+        LEFT JOIN sys_dept sd ON sd.id = su.dept_id
+        WHERE 1=1
+        <if test="request.signNo != null and request.signNo !=''">
+            AND ss.sign_no LIKE concat('%',#{request.signNo},'%')
+        </if>
+        <if test="request.signName != null and request.signName !=''">
+            AND ss.sign_name LIKE concat('%',#{request.signName},'%')
+        </if>
+        <if test="request.signDirector != null and request.signDirector !=''">
+            AND ss.sign_director LIKE concat('%',#{request.signDirector},'%')
+        </if>
+        <if test="request.signUserId != null and request.signUserId !=''">
+            AND ss.sign_user_id = #{request.signUserId}
+        </if>
+        <if test="request.createStartTime != null and request.createStartTime !=''">
+            AND DATE_FORMAT(ss.create_time,'%Y-%m-%d') &gt;= DATE_FORMAT(#{request.createStartTime},'%Y-%m-%d')
+        </if>
+        <if test="request.createEndTime != null and request.createEndTime !=''">
+            AND DATE_FORMAT(ss.create_time,'%Y-%m-%d')  &lt;= DATE_FORMAT(#{request.createEndTime},'%Y-%m-%d')
+        </if>
+        ORDER BY ss.create_time DESC
+    </select>
 </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 515050a..60f530b 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
@@ -47,8 +47,8 @@
     String STORAGE_LOCATION = "bizStorageLocation";
     //计量专业
     String MEASURE_MAJOR = "bizMeasureMajor";
-    //管理状态
-    String MANAGER_STATE = "bizManagerState";
+    //标准装置管理状态
+    String STANDARD_MANAGER_STATE = "bizStandardManagerState";
 
     /**
      * 资源管理 字典code
@@ -95,8 +95,6 @@
     String MEASURE_STATUS = "measureStatus";
     //检定方式
     String MEASURE_TYPE = "measureType";
-    //标识打印标志类型
-    String IDENTIFY_PRINT_TYPE = "bizBusinessIdentify";
     //变更类型
     String REPORT_CHANGE_TYPE = "bizCertChangeType";
     //规模类型
@@ -111,19 +109,24 @@
     String MEASURE_CATEGORY = "measureCategory";
     //检定结果
     String MEASURE_RESULT = "measureResult";
+    //分包原因
+    String OUTSOURCE_REASON = "outsourceReason";
+
+    /**
+     * 系统管理
+     */
+    String TEMPLATE_TYPE = "templateType";
+
 
     /**
      * 标准装置 字典code
      */
     //类别
     String STANDARD_CATEGORY = "standardCategory";
-    //管理状态
-    String STANDARD_MANAGER_STATE = "standardManagerState";
     //标准等级
     String STANDARD_LEVEL = "standardLevel";
     //传递范围
     String STANDARD_TRANSMIT_RANGE = "transmitRange";
-
     //资本来源
     String CAPITAL_SOURCE = "capitalSource";
     //标准装置-申请类型
@@ -148,8 +151,6 @@
     String CERTIFICATE_CLASS = "certificationClass";
     //证书管理-检校专业
     String CALIBRATION_MAJOR = "calibrationMajor";
-    //分包原因
-    String OUTSOURCE_REASON = "outsourceReason";
 
     /**
      * 工作台
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/BaseApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/BaseApprovalListRequest.java
index 73c12c1..80d7424 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/BaseApprovalListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/BaseApprovalListRequest.java
@@ -6,6 +6,7 @@
 
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotEmpty;
+import java.util.List;
 
 /**
  * @Description:
@@ -19,14 +20,14 @@
      * 表单id
      */
     @NotBlank(message = "表单id不能为空")
-    @ApiModelProperty(value = "表单id（流程定义对应的表单id，等价于业务id）", dataType = "String")
+    @ApiModelProperty(value = "表单id（流程定义对应的表单id，等价于业务id），导出接口不用传", dataType = "String")
     private String formId;
 
     /**
      * 审批状态类型，对应ApprovalStatusEnum
      */
     @NotEmpty(message = "审批状态类型不能为空")
-    @ApiModelProperty(value = "审批状态类型code", dataType = "String")
+    @ApiModelProperty(value = "审批状态类型code，导出接口不用传", dataType = "String")
     private String approvalStatus;
 
     @ApiModelProperty(hidden = true)
@@ -34,4 +35,7 @@
 
     @ApiModelProperty(hidden = true)
     private Long createUserId;
+
+    @ApiModelProperty(value = "导出ids", dataType = "List")
+    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificatePrintApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificatePrintApprovalListRequest.java
index b93d1c9..3cc2f4e 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificatePrintApprovalListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificatePrintApprovalListRequest.java
@@ -5,8 +5,6 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import java.util.List;
-
 /**
  * @Description:
  * @Author: wangpeng
@@ -38,7 +36,4 @@
 
     @ApiModelProperty(value = "创建结束时间", dataType = "String")
     private String createTimeEnd;
-
-    @ApiModelProperty(value = "导出ids", dataType = "List")
-    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportApprovalListRequest.java
index 4f7a038..c115847 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportApprovalListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportApprovalListRequest.java
@@ -5,8 +5,6 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import java.util.List;
-
 /**
  * @Description:
  * @Author: wangpeng
@@ -15,6 +13,8 @@
 @ApiModel
 @Data
 public class CertificateReportApprovalListRequest extends BaseApprovalListRequest {
+    @ApiModelProperty(value = "委托方id", dataType = "String")
+    private Long customerId;
 
     @ApiModelProperty(value = "证书报告编号", dataType = "String")
     private String certificateReportNo;
@@ -37,6 +37,4 @@
     @ApiModelProperty(value = "检校结束时间", dataType = "String")
     private String calibrationTimeEnd;
 
-    @ApiModelProperty(value = "导出ids", dataType = "List")
-    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/identify/IdentifyListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/identify/IdentifyListRequest.java
index 1b87ae6..f019203 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/identify/IdentifyListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/identify/IdentifyListRequest.java
@@ -4,6 +4,8 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * @Description:
  * @Author: wangpeng
@@ -26,4 +28,7 @@
 
     @ApiModelProperty(value = "打印结束时间", dataType = "String")
     private String createTimeEnd;
+
+    @ApiModelProperty(value = "导出ids", dataType = "List")
+    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListRequest.java
index 1264883..62415fb 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListRequest.java
@@ -7,6 +7,7 @@
 import lombok.Data;
 
 import javax.validation.constraints.NotBlank;
+import java.util.List;
 
 @Data
 @ApiModel
@@ -37,4 +38,6 @@
     @ApiModelProperty(value = "是否加急（1是0否null全部）", dataType = "Integer")
     private String isUrgent;
 
+    @ApiModelProperty(value = "导出ids", dataType = "List")
+    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListRequest.java
index 5201d7b..499760a 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListRequest.java
@@ -17,6 +17,9 @@
     @ApiModelProperty(value = "任务单编号", dataType = "String")
     private String orderNo;
 
+    @ApiModelProperty(value = "委托方id", dataType = "Long")
+    private Long customerId;
+
     @ApiModelProperty(value = "委托方名称", dataType = "String")
     private String customerName;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OrderSampleDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OrderSampleDTO.java
new file mode 100644
index 0000000..796edc0
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OrderSampleDTO.java
@@ -0,0 +1,19 @@
+package com.casic.missiles.dto.business.outsource;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/8/24 11:38
+ */
+@ApiModel
+@Data
+public class OrderSampleDTO {
+    @ApiModelProperty(value = "任务单id", dataType = "Long")
+    private Long orderId;
+    @ApiModelProperty(value = "受检设备id", dataType = "Long")
+    private Long sampleId;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceAssessApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceAssessApprovalListRequest.java
new file mode 100644
index 0000000..9a930c3
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceAssessApprovalListRequest.java
@@ -0,0 +1,30 @@
+package com.casic.missiles.dto.business.outsource;
+
+import com.casic.missiles.dto.BaseApprovalListRequest;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/8/24 11:01
+ */
+@ApiModel
+@Data
+public class OutsourceAssessApprovalListRequest extends BaseApprovalListRequest {
+    @ApiModelProperty(value = "评审表编号", dataType = "String")
+    private String projectNo;
+
+    @ApiModelProperty(value = "分包机构名称", dataType = "String")
+    private String outsourcerName;
+
+    @ApiModelProperty(value = "申请人", dataType = "String")
+    private String applicantName;
+
+    @ApiModelProperty(value = "申请时间开始", dataType = "String")
+    private String applicantTimeStart;
+
+    @ApiModelProperty(value = "申请时间结束", dataType = "String")
+    private String applicantTimeEnd;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceAssessSaveResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceAssessSaveResponse.java
new file mode 100644
index 0000000..8bf9aad
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceAssessSaveResponse.java
@@ -0,0 +1,20 @@
+package com.casic.missiles.dto.business.outsource;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/8/14 16:17
+ */
+@ApiModel
+@Data
+public class OutsourceAssessSaveResponse {
+    @ApiModelProperty(value = "主键id", dataType = "Long")
+    private Long id;
+
+    @ApiModelProperty(value = "编号", dataType = "String")
+    private String projectNo;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProtocolApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProtocolApprovalListRequest.java
new file mode 100644
index 0000000..0f32331
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProtocolApprovalListRequest.java
@@ -0,0 +1,30 @@
+package com.casic.missiles.dto.business.outsource;
+
+import com.casic.missiles.dto.BaseApprovalListRequest;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/8/24 15:01
+ */
+@ApiModel
+@Data
+public class OutsourceProtocolApprovalListRequest extends BaseApprovalListRequest {
+    @ApiModelProperty(value = "协议书编号", dataType = "String")
+    private String protocolNo;
+
+    @ApiModelProperty(value = "分包方名称", dataType = "String")
+    private String outsourcerName;
+
+    @ApiModelProperty(value = "申请人", dataType = "String")
+    private String applicantName;
+
+    @ApiModelProperty(value = "申请时间开始", dataType = "String")
+    private String applicantTimeStart;
+
+    @ApiModelProperty(value = "申请时间结束", dataType = "String")
+    private String applicantTimeEnd;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProtocolSaveResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProtocolSaveResponse.java
new file mode 100644
index 0000000..e324967
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProtocolSaveResponse.java
@@ -0,0 +1,20 @@
+package com.casic.missiles.dto.business.outsource;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/8/14 16:17
+ */
+@ApiModel
+@Data
+public class OutsourceProtocolSaveResponse {
+    @ApiModelProperty(value = "主键id", dataType = "Long")
+    private Long id;
+
+    @ApiModelProperty(value = "编号", dataType = "String")
+    private String protocolNo;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveApprovalListRequest.java
index f29f4e4..7047c28 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveApprovalListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveApprovalListRequest.java
@@ -5,8 +5,6 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import java.util.List;
-
 /**
  * @Description: 现场检测审批列表请求实体
  * @Author: wangpeng
@@ -30,7 +28,4 @@
     @ApiModelProperty(value = "申请时间结束", dataType = "String")
     private String applyTimeEnd;
 
-    @ApiModelProperty(value = "导出ids", dataType = "List")
-    private List<Long> ids;
-
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveDetailResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveDetailResponse.java
index 1f28752..394c934 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveDetailResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveDetailResponse.java
@@ -12,6 +12,18 @@
     @ApiModelProperty(value = "id，更新/删除使用参数", dataType = "Long")
     private Long id;
 
+    @ApiModelProperty(value = "实验室代码(字典code)", dataType = "String")
+    private String labCode;
+
+    @ApiModelProperty(value = "实验室代码(字典value)", dataType = "String")
+    private String labCodeName;
+
+    @ApiModelProperty(value = "组别代码(字典code)", dataType = "String")
+    private String groupCode;
+
+    @ApiModelProperty(value = "组别代码(字典value)", dataType = "String")
+    private String groupCodeName;
+
     @ApiModelProperty(value = "审批编号", dataType = "String")
     private String siteExecutiveNo;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/environment/LocationListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/environment/LocationListRequest.java
new file mode 100644
index 0000000..13d03c3
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/environment/LocationListRequest.java
@@ -0,0 +1,20 @@
+package com.casic.missiles.dto.resource.environment;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/6/8 13:56
+ */
+@ApiModel
+@Data
+public class LocationListRequest {
+    @ApiModelProperty(value = "地点编号", dataType = "String")
+    private String locationNo;
+
+    @ApiModelProperty(value = "地点名称", dataType = "String")
+    private String locationName;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/environment/LocationListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/environment/LocationListResponse.java
new file mode 100644
index 0000000..4c531af
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/environment/LocationListResponse.java
@@ -0,0 +1,78 @@
+package com.casic.missiles.dto.resource.environment;
+
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
+import com.baomidou.mybatisplus.annotation.TableField;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description: 地点列表响应实体
+ * @Author: wangpeng
+ * @Date: 2023/6/8 13:53
+ */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
+@ApiModel
+@Data
+public class LocationListResponse {
+    @ApiModelProperty(value = "主键id", dataType = "Long")
+    private Long id;
+
+    /**
+     * 地点编号
+     */
+    @ExcelProperty("地点编号")
+    @ApiModelProperty(value = "地点编号", dataType = "String")
+    private String locationNo;
+
+    /**
+     * 地点名称
+     */
+    @ExcelProperty("地点名称")
+    @ApiModelProperty(value = "地点名称", dataType = "String")
+    private String locationName;
+
+    /**
+     * 地点位置
+     */
+    @ExcelProperty("地点位置")
+    @ApiModelProperty(value = "地点位置", dataType = "String")
+    private String locationPosition;
+
+    /**
+     * 创建人id
+     */
+    @ApiModelProperty(value = "创建人id", dataType = "Long")
+    private Long createUserId;
+
+    /**
+     * 创建人
+     */
+    @ExcelProperty("创建人")
+    @ApiModelProperty(value = "创建人", dataType = "String")
+    @TableField("create_user")
+    private String createUser;
+
+    /**
+     * 创建时间
+     */
+    @ExcelProperty("创建时间")
+    @ApiModelProperty(value = "创建时间", dataType = "String")
+    private String createTime;
+
+    /**
+     * 更新时间
+     */
+    @ApiModelProperty(value = "更新时间", dataType = "String")
+    private String updateTime;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertRequest.java
index 9a7f6c6..c827915 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertRequest.java
@@ -4,6 +4,8 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * @Description:
  * @Author: wangpeng
@@ -16,4 +18,7 @@
     private String name;
     @ApiModelProperty(value = "部门名", dataType = "String")
     private String deptName;
+
+    @ApiModelProperty(value = "导出ids", dataType = "List")
+    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertResponse.java
index f78b159..8f2f79e 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertResponse.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.dto.resource.staff;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.casic.missiles.annotation.DictCodeField;
 import com.casic.missiles.constants.MeterDictCode;
 import io.swagger.annotations.ApiModel;
@@ -13,12 +20,18 @@
  * @Author: wangpeng
  * @Date: 2023/7/27 15:13
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @ApiModel
 @Data
 public class StaffCertResponse {
     /**
      * 人员编号
      */
+    @ExcelProperty(value = "人员编号",order = 0)
     @NotEmpty(message = "人员编号不能为空")
     @ApiModelProperty(value = "人员编号", dataType = "String")
     private String staffNo;
@@ -26,6 +39,7 @@
     /**
      * 姓名
      */
+    @ExcelProperty(value = "姓名",order = 1)
     @ApiModelProperty(value = "姓名", dataType = "String")
     private String staffName;
 
@@ -54,6 +68,7 @@
     /**
      * 部门名字
      */
+    @ExcelProperty(value = "工作部门",order = 2)
     @ApiModelProperty(value = "部门名字", dataType = "String")
     private String deptName;
 
@@ -66,6 +81,7 @@
     /**
      * 计量专业
      */
+    @ExcelProperty(value = "计量专业",order = 3)
     @ApiModelProperty(value = "计量专业", dataType = "String")
     private String major;
 
@@ -110,6 +126,7 @@
     /**
      * 证书号
      */
+    @ExcelProperty(value = "证号",order = 4)
     @ApiModelProperty(value = "证书号", dataType = "String")
     private String certNo;
 
@@ -122,12 +139,14 @@
     /**
      * 有效日期
      */
+    @ExcelProperty(value = "证书有效期",order = 6)
     @ApiModelProperty(value = "有效日期", dataType = "String")
     private String effectiveDate;
 
     /**
      * 发放日期
      */
+    @ExcelProperty(value = "发证日期",order = 5)
     @ApiModelProperty(value = "发放日期", dataType = "String")
     private String grantDate;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffListRequest.java
index 7c4afb3..0a1194a 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffListRequest.java
@@ -4,6 +4,8 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * @Description:
  * @Author: wangpeng
@@ -18,4 +20,7 @@
     private String deptName;
     @ApiModelProperty(value = "部门id", dataType = "Long")
     private Long deptId;
+
+    @ApiModelProperty(value = "导出ids", dataType = "List")
+    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/TrainListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/TrainListRequest.java
index f68597b..6321f8b 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/TrainListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/TrainListRequest.java
@@ -14,6 +14,8 @@
 public class TrainListRequest {
     @ApiModelProperty(value = "训练登记表编号", dataType = "String")
     private String trainNo;
+    @ApiModelProperty(value = "值班领导", dataType = "String")
+    private String dutyLeader;
     @ApiModelProperty(value = "创建开始时间", dataType = "String")
     private String createTimeStart;
     @ApiModelProperty(value = "创建结束时间", dataType = "String")
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/SignAddRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/SignAddRequest.java
index 117be34..d71055c 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/SignAddRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/SignAddRequest.java
@@ -43,13 +43,6 @@
     private Long signUserId;
 
     /**
-     * 签章或签名-字典code
-     */
-    @NotBlank(message = "类型不能为空")
-    @ApiModelProperty(value = "签名/签章-字典code", dataType = "String", required = true)
-    private String signType;
-
-    /**
      * minio存储文件名
      */
     @ApiModelProperty(value = "上传文件返回名称", dataType = "String")
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateAddRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateAddRequest.java
index aff1265..6316648 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateAddRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateAddRequest.java
@@ -17,30 +17,28 @@
 @Data
 public class TemplateAddRequest extends BaseSystemRequest {
     /**
-     * 原始记录模板/证书报告模板名称
+     * 模板名称
      */
     @ApiModelProperty(value = "名称", dataType = "String", required = true)
     @NotBlank(message = "名称不能为空")
     private String templateName;
 
     /**
-     * 原始记录模板/证书报告模板描述
+     * 模板描述
      */
     @ApiModelProperty(value = "描述", dataType = "String")
     private String templateDesc;
 
     /**
-     * 原始记录模板/证书报告模板创建人
+     * 创建人
      */
     @ApiModelProperty(value = "创建人", dataType = "String", required = true)
     @NotBlank(message = "创建人不能为空")
     private String templateCreator;
 
-    /**
-     * 原始记录模板/证书报告模板-字典code
-     */
-    @NotBlank(message = "类型不能为空")
-    @ApiModelProperty(value = "原始记录模板/证书报告模板-字典code", dataType = "String", required = true)
+
+    @NotBlank(message = "模板类型不能为空")
+    @ApiModelProperty(value = "模板类型(字典code)", dataType = "String", required = true)
     private String templateType;
 
     /**
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateListRequest.java
index eec5a1e..6d17bbe 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateListRequest.java
@@ -1,11 +1,12 @@
 package com.casic.missiles.dto.system;
 
+import com.casic.missiles.annotation.DictCodeField;
+import com.casic.missiles.constants.MeterDictCode;
 import com.casic.missiles.dto.BaseSystemRequest;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import javax.validation.constraints.NotBlank;
 import java.util.List;
 
 /**
@@ -19,8 +20,8 @@
     /**
      * 类型
      */
-//    @ApiModelProperty(value = "类型-字典code", dataType = "String", required = true)
-    @NotBlank(message = "类型不能为空")
+    @DictCodeField(message = "模板类型不合法", cacheName = MeterDictCode.TEMPLATE_TYPE)
+    @ApiModelProperty(value = "模板类型(字典code)", dataType = "String")
     private String templateType;
 
     /**
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificateChangeApply.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificateChangeApply.java
index 9216308..36923fd 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificateChangeApply.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificateChangeApply.java
@@ -1,11 +1,19 @@
 package com.casic.missiles.model.business;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 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 com.casic.missiles.dto.BaseRequest;
+import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -20,6 +28,12 @@
  * @author wangpeng
  * @since 2023-08-15
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
+@ApiModel
 @Data
 @TableName("biz_business_certificate_change_apply")
 public class BizBusinessCertificateChangeApply extends BaseRequest implements Serializable {
@@ -33,6 +47,7 @@
     /**
      * 申请单编号
      */
+    @ExcelProperty(value = "申请单编号", order = 1)
     @ApiModelProperty(value = "申请单编号", dataType = "String")
     @TableField("change_apply_no")
     private String changeApplyNo;
@@ -40,6 +55,7 @@
     /**
      * 申请单名字
      */
+    @ExcelProperty(value = "申请单名称", order = 2)
     @ApiModelProperty(value = "申请单名字", dataType = "String")
     @TableField("change_apply_name")
     private String changeApplyName;
@@ -54,6 +70,7 @@
     /**
      * 更换证书编号
      */
+    @ExcelProperty(value = "更换证书编号", order = 3)
     @ApiModelProperty(value = "更换证书编号", dataType = "String")
     @TableField("change_report_no")
     private String changeReportNo;
@@ -61,7 +78,8 @@
     /**
      * 更换证书名字
      */
-    @ApiModelProperty(value = "更换证书名字", dataType = "String")
+    @ExcelProperty(value = "更换证书/报告名称", order = 4)
+    @ApiModelProperty(value = "更换证书/报告名称", dataType = "String")
     @TableField("change_report_name")
     private String changeReportName;
 
@@ -73,6 +91,7 @@
     @TableField("change_type")
     private String changeType;
 
+    @ExcelProperty(value = "变更类型", order = 5)
     @ApiModelProperty(value = "变更类型(字典value)", dataType = "String")
     @TableField(exist = false)
     private String changeTypeName;
@@ -142,13 +161,15 @@
     /**
      * 创建用户名字
      */
-    @ApiModelProperty(value = "创建用户名字", dataType = "String")
+    @ExcelProperty(value = "创建人", order = 6)
+    @ApiModelProperty(value = "创建人名字", dataType = "String")
     @TableField("create_user_name")
     private String createUserName;
 
     /**
      * 创建时间
      */
+    @ExcelProperty(value = "创建时间", order = 7)
     @ApiModelProperty(value = "创建时间", dataType = "String")
     @TableField("create_time")
     private String createTime;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificateReport.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificateReport.java
index f01db9e..db06018 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificateReport.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificateReport.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.model.business;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -22,6 +29,11 @@
  * @author wangpeng
  * @since 2023-08-14
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @ApiModel
 @Data
 @TableName("biz_business_certificate_report")
@@ -36,6 +48,7 @@
     /**
      * 证书报告编号
      */
+    @ExcelProperty(value = "证书报告编号", order = 1)
     @ApiModelProperty(value = "证书报告编号", dataType = "String")
     @TableField("certificate_report_no")
     private String certificateReportNo;
@@ -43,6 +56,7 @@
     /**
      * 证书报告名称
      */
+    @ExcelProperty(value = "证书报告名称", order = 2)
     @ApiModelProperty(value = "证书报告名称", dataType = "String")
     @TableField("certificate_report_name")
     private String certificateReportName;
@@ -62,6 +76,7 @@
     @TableField("measure_category")
     private String measureCategory;
 
+    @ExcelProperty(value = "检校类别", order = 6)
     @ApiModelProperty(value = "检校类别(字典value)", dataType = "String")
     @TableField(exist = false)
     private String measureCategoryName;
@@ -69,6 +84,7 @@
     /**
      * 检校时间
      */
+    @ExcelProperty(value = "检校时间", order = 8)
     @ApiModelProperty(value = "检校时间", dataType = "String")
     @TableField("calibration_time")
     private String calibrationTime;
@@ -267,18 +283,22 @@
     @TableField(exist = false)
     private Integer decisionItem;
 
-    @ApiModelProperty(value = "设备样品编号（列表返回参数）", dataType = "String")
+    @ExcelProperty(value = "被检设备统一编号", order = 3)
+    @ApiModelProperty(value = "被检设备统一编号（列表返回参数）", dataType = "String")
     @TableField(exist = false)
     private String sampleNo;
 
-    @ApiModelProperty(value = "设备样品名称（列表返回参数）", dataType = "String")
+    @ExcelProperty(value = "被检设备名称", order = 4)
+    @ApiModelProperty(value = "被检设备名称（列表返回参数）", dataType = "String")
     @TableField(exist = false)
     private String sampleName;
 
-    @ApiModelProperty(value = "设备样品规格型号（列表返回参数）", dataType = "String")
+    @ExcelProperty(value = "规格型号", order = 5)
+    @ApiModelProperty(value = "规格型号（列表返回参数）", dataType = "String")
     @TableField(exist = false)
     private String sampleModel;
 
+    @ExcelProperty(value = "检定员", order = 7)
     @ApiModelProperty(value = "检定员名字（列表返回参数）", dataType = "String")
     @TableField(exist = false)
     private String staffName;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessIdentifyInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessIdentifyInfo.java
index 46bfba5..f1a9bec 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessIdentifyInfo.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessIdentifyInfo.java
@@ -1,10 +1,15 @@
 package com.casic.missiles.model.business;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 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;
 
@@ -20,6 +25,11 @@
  * @author wangpeng
  * @since 2023-08-15
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @Data
 @TableName("biz_business_identify_info")
 public class BizBusinessIdentifyInfo implements Serializable {
@@ -33,6 +43,7 @@
     /**
      * 记录编号
      */
+    @ExcelProperty(value = "记录编号", order = 1)
     @ApiModelProperty(value = "记录编号", dataType = "String")
     @TableField("record_no")
     private String recordNo;
@@ -41,20 +52,15 @@
      * 标志类型(字典code)
      */
     @NotEmpty(message = "标志类型不能为空")
-    @ApiModelProperty(value = "标志类型(字典code)", dataType = "String")
-    @DictCodeField(message = "标志类型不合法", cacheName = MeterDictCode.IDENTIFY_PRINT_TYPE)
+    @ApiModelProperty(value = "标志类型(直接存计量标识/使用状态/校准状态的字典value)", dataType = "String")
     @TableField("identify_type")
     private String identifyType;
 
-    @ApiModelProperty(value = "标志类型(字典value)", dataType = "String")
-    @TableField(exist = false)
-    private String identifyTypeName;
-
     /**
      * 设备id(可以是受检设备/设备台账)
      */
     @NotNull(message = "设备id不能为空")
-    @ApiModelProperty(value = "设备id(可以是受检设备/设备台账)", dataType = "String")
+    @ApiModelProperty(value = "设备id(可以是受检设备/设备台账)", dataType = "Long")
     @TableField("device_id")
     private Long deviceId;
 
@@ -66,29 +72,32 @@
     @TableField("device_type")
     private String deviceType;
 
+    @ExcelProperty(value = "统一编号", order = 3)
     @NotEmpty(message = "设备编号不能为空")
-    @ApiModelProperty(value = "设备编号", dataType = "String")
+    @ApiModelProperty(value = "统一编号", dataType = "String")
     @TableField("device_no")
     private String deviceNo;
 
     /**
      * 设备名字
      */
-    @NotEmpty(message = "设备名字不能为空")
-    @ApiModelProperty(value = "设备名字", dataType = "String")
+    @ExcelProperty(value = "设备名称", order = 4)
+    @NotEmpty(message = "设备名称不能为空")
+    @ApiModelProperty(value = "设备名称", dataType = "String")
     @TableField("device_name")
     private String deviceName;
 
     /**
      * 检定员id
      */
-    @ApiModelProperty(value = "检定员id", dataType = "String")
+    @ApiModelProperty(value = "检定员id", dataType = "Long")
     @TableField("measure_person_id")
     private Long measurePersonId;
 
     /**
      * 检定员名字
      */
+    @ExcelProperty(value = "检定员", order = 5)
     @ApiModelProperty(value = "检定员名字", dataType = "String")
     @TableField("measure_person")
     private String measurePerson;
@@ -103,7 +112,8 @@
     /**
      * 更新时间
      */
-    @ApiModelProperty(value = "更新时间", dataType = "String")
+    @ExcelProperty(value = "打印时间", order = 6)
+    @ApiModelProperty(value = "打印时间", dataType = "String")
     @TableField("update_time")
     private String updateTime;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceAssess.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceAssess.java
index 659d9ca..6720b90 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceAssess.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceAssess.java
@@ -1,11 +1,26 @@
 package com.casic.missiles.model.business;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 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 com.casic.missiles.dto.BaseRequest;
+import com.casic.missiles.dto.business.outsource.OrderSampleDTO;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import javax.validation.constraints.NotEmpty;
 import java.io.Serializable;
+import java.util.List;
 
 /**
  * <p>
@@ -15,146 +30,231 @@
  * @author wangpeng
  * @since 2023-08-16
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
+@ApiModel
 @Data
 @TableName("biz_business_outsource_assess")
-public class BizBusinessOutsourceAssess implements Serializable {
+public class BizBusinessOutsourceAssess extends BaseRequest implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
+    @ApiModelProperty(value = "id，更新/删除使用参数", dataType = "Long")
     @TableId("id")
     private Long id;
 
     /**
      * 评审表编号
      */
+    @ExcelProperty(value = "评审表编号", order = 1)
+    @ApiModelProperty(value = "评审表编号(后台生成)", dataType = "String")
     @TableField("project_no")
     private String projectNo;
 
     /**
      * 评审表名称
      */
+    @ExcelProperty(value = "评审表名称", order = 2)
+    @ApiModelProperty(value = "评审表名称", dataType = "String")
     @TableField("project_name")
     private String projectName;
 
+    @NotEmpty(message = "实验室代码不能为空")
+    @DictCodeField(message = "实验室代码描述不合法", cacheName = MeterDictCode.LAB_CODE)
+    @ApiModelProperty(value = "实验室代码(字典code)", dataType = "String")
+    @TableField("lab_code")
+    private String labCode;
+
+    @ApiModelProperty(value = "实验室代码(字典value)", dataType = "String")
+    @TableField(exist = false)
+    private String labCodeName;
+
+    /**
+     * 组别代码
+     */
+    @NotEmpty(message = "组别代码不能为空")
+    @DictCodeField(message = "组别代码描述不合法", cacheName = MeterDictCode.GROUP_CODE)
+    @ApiModelProperty(value = "组别代码(字典code)", dataType = "String")
+    @TableField("group_code")
+    private String groupCode;
+
+    @ApiModelProperty(value = "组别代码(字典value)", dataType = "String")
+    @TableField(exist = false)
+    private String groupCodeName;
+
     /**
      * 申请人id
      */
+    @ApiModelProperty(value = "申请人id", dataType = "String")
     @TableField("applicant_id")
     private Long applicantId;
 
     /**
      * 申请人名字
      */
+    @ExcelProperty(value = "申请人", order = 5)
+    @ApiModelProperty(value = "申请人", dataType = "String")
     @TableField("applicant_name")
     private String applicantName;
 
     /**
      * 申请时间
      */
+    @ExcelProperty(value = "申请时间", order = 6)
+    @ApiModelProperty(value = "申请时间", dataType = "String")
     @TableField("applicant_time")
     private String applicantTime;
 
     /**
      * 附件(minio存储文件名)
      */
+    @ApiModelProperty(value = "附件(minio存储文件名)", dataType = "String")
     @TableField("minio_file_name")
     private String minioFileName;
 
     /**
      * 备注
      */
+    @ApiModelProperty(value = "备注", dataType = "String")
     @TableField("remark")
     private String remark;
 
     /**
      * 创建人id
      */
+    @ApiModelProperty(value = "创建人id", dataType = "String")
     @TableField("create_user_id")
     private Long createUserId;
 
     /**
      * 创建人名字
      */
+    @ApiModelProperty(value = "创建人名字", dataType = "String")
     @TableField("create_user_name")
     private String createUserName;
 
     /**
      * 分包方id
      */
+    @ApiModelProperty(value = "评审表编号", dataType = "String")
     @TableField("outsourcer_id")
     private Long outsourcerId;
 
     /**
      * 预计开始时间
      */
+    @ApiModelProperty(value = "预计开始时间", dataType = "String")
     @TableField("pre_start_time")
     private String preStartTime;
 
     /**
      * 预计结束时间
      */
+    @ApiModelProperty(value = "预计结束时间", dataType = "String")
     @TableField("pre_end_time")
     private String preEndTime;
 
     /**
      * 分包原因-字典
      */
+    @ApiModelProperty(value = "分包原因(字典code)", dataType = "String")
+    @DictCodeField(message = "分包原因描述不合法", cacheName = MeterDictCode.OUTSOURCE_REASON)
     @TableField("outsource_reason")
     private String outsourceReason;
 
+    @ApiModelProperty(value = "分包原因(字典value)", dataType = "String")
+    @TableField(exist = false)
+    private String outsourceReasonName;
+
     /**
      * 预计费用
      */
+    @ApiModelProperty(value = "预计费用", dataType = "String")
     @TableField("pre_cost")
     private String preCost;
 
     /**
      * 审批状态
      */
+    @ApiModelProperty(value = "审批状态", dataType = "String")
+    @DictCodeField(message = "审批状态描述不合法", cacheName = MeterDictCode.APPROVAL_STATUS)
     @TableField("approval_status")
     private String approvalStatus;
 
     /**
      * 流程实例id
      */
+    @ApiModelProperty(value = "流程实例id", dataType = "String")
     @TableField("process_id")
     private String processId;
 
     /**
      * 实验室认可情况
      */
+    @ApiModelProperty(value = "实验室认可情况", dataType = "String")
     @TableField("approve_situation")
     private String approveSituation;
 
     /**
      * 溯源性
      */
+    @ApiModelProperty(value = "溯源性", dataType = "String")
     @TableField("traceability")
     private String traceability;
 
     /**
      * 测试方法
      */
+    @ApiModelProperty(value = "测试方法", dataType = "String")
     @TableField("test_method")
     private String testMethod;
 
     /**
      * 技术能力
      */
+    @ApiModelProperty(value = "技术能力", dataType = "String")
     @TableField("technique_ability")
     private String techniqueAbility;
 
     /**
      * 创建时间
      */
+    @ApiModelProperty(hidden = true)
     @TableField("create_time")
     private String createTime;
 
     /**
      * 更新时间
      */
+    @ApiModelProperty(hidden = true)
     @TableField("update_time")
     private String updateTime;
 
+    @ApiModelProperty(value = "审批状态类型-字典value", dataType = "String")
+    @TableField(exist = false)
+    private String approvalStatusName;
 
+    @ApiModelProperty(value = "任务id（同意、驳回等操作使用）", dataType = "String")
+    @TableField(exist = false)
+    private String taskId;
+
+    @ApiModelProperty(value = "可选决策项（1同意驳回拒绝 2同意驳回 3同意拒绝，用于待审批列表同意/驳回/拒绝按钮展示）", dataType = "Integer")
+    @TableField(exist = false)
+    private Integer decisionItem;
+
+    @NotEmpty(message = "受检设备信息不能为空")
+    @ApiModelProperty(value = "受检设备id列表（新建使用参数）", dataType = "List")
+    @TableField(exist = false)
+    private List<OrderSampleDTO> orderSampleList;
+
+    @ExcelProperty(value = "分包机构名称", order = 3)
+    @ApiModelProperty(value = "分包机构名称（列表返回参数）", dataType = "String")
+    private String outsourcerName;
+
+    @ExcelProperty(value = "机构负责人", order = 4)
+    @ApiModelProperty(value = "机构负责人（列表返回参数）", dataType = "String")
+    private String director;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceProtocol.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceProtocol.java
new file mode 100644
index 0000000..38df697
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceProtocol.java
@@ -0,0 +1,225 @@
+package com.casic.missiles.model.business;
+
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
+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 com.casic.missiles.dto.BaseRequest;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotEmpty;
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 计量检定业务-分包管理-测试、校准或检定工作分包协议书
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-08-24
+ */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
+@Data
+@TableName("biz_business_outsource_protocol")
+public class BizBusinessOutsourceProtocol extends BaseRequest implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "id，更新/删除使用参数", dataType = "Long")
+    @TableId("id")
+    private Long id;
+
+    /**
+     * 协议书编号
+     */
+    @ExcelProperty(value = "协议书编号", order = 1)
+    @ApiModelProperty(value = "协议书编号(后台生成)", dataType = "String")
+    @TableField("protocol_no")
+    private String protocolNo;
+
+    /**
+     * 协议书名称
+     */
+    @ExcelProperty(value = "协议书名称", order = 2)
+    @ApiModelProperty(value = "协议书名称", dataType = "String")
+    @TableField("project_name")
+    private String projectName;
+
+    @NotEmpty(message = "实验室代码不能为空")
+    @DictCodeField(message = "实验室代码描述不合法", cacheName = MeterDictCode.LAB_CODE)
+    @ApiModelProperty(value = "实验室代码(字典code)", dataType = "String")
+    @TableField("lab_code")
+    private String labCode;
+
+    @ApiModelProperty(value = "实验室代码(字典value)", dataType = "String")
+    @TableField(exist = false)
+    private String labCodeName;
+
+    @NotEmpty(message = "组别代码不能为空")
+    @DictCodeField(message = "组别代码描述不合法", cacheName = MeterDictCode.GROUP_CODE)
+    @ApiModelProperty(value = "组别代码(字典code)", dataType = "String")
+    @TableField("group_code")
+    private String groupCode;
+
+    @ApiModelProperty(value = "组别代码(字典value)", dataType = "String")
+    @TableField(exist = false)
+    private String groupCodeName;
+
+    /**
+     * 分包方id
+     */
+    @ApiModelProperty(value = "分包方id", dataType = "Long")
+    @TableField("outsourcer_id")
+    private Long outsourcerId;
+
+    /**
+     * 其他
+     */
+    @ApiModelProperty(value = "其他", dataType = "String")
+    @TableField("remark")
+    private String remark;
+
+    /**
+     * 分包方编号
+     */
+    @ApiModelProperty(value = "分包方编号(新建不用传)", dataType = "String")
+    @TableField("outsource_no")
+    private String outsourceNo;
+
+    /**
+     * 分包方名称
+     */
+    @ExcelProperty(value = "分包方名称", order = 3)
+    @ApiModelProperty(value = "分包方名称(新建不用传)", dataType = "String")
+    @TableField("outsource_name")
+    private String outsourceName;
+
+    /**
+     * 联系人
+     */
+    @ExcelProperty(value = "联系人", order = 4)
+    @ApiModelProperty(value = "联系人", dataType = "String")
+    @TableField("contacts")
+    private String contacts;
+
+    /**
+     * 电话
+     */
+    @ApiModelProperty(value = "电话", dataType = "String")
+    @TableField("mobile")
+    private String mobile;
+
+    /**
+     * 地址
+     */
+    @ApiModelProperty(value = "地址", dataType = "String")
+    @TableField("address")
+    private String address;
+
+    /**
+     * 要求完成日期
+     */
+    @ApiModelProperty(value = "要求完成日期", dataType = "String")
+    @TableField("require_date")
+    private String requireDate;
+
+    /**
+     * 分包费用(元)
+     */
+    @ApiModelProperty(value = "分包费用(元)", dataType = "String")
+    @TableField("outsource_cost")
+    private Double outsourceCost;
+
+    /**
+     * 分包方负责人
+     */
+    @ApiModelProperty(value = "分包方负责人", dataType = "String")
+    @TableField("director")
+    private String director;
+
+    /**
+     * 分包项目
+     */
+    @ApiModelProperty(value = "分包项目", dataType = "String")
+    @TableField("item")
+    private String item;
+
+    /**
+     * 分包要求
+     */
+    @ApiModelProperty(value = "分包要求", dataType = "String")
+    @TableField("requires")
+    private String requires;
+
+    /**
+     * 创建人id
+     */
+    @ApiModelProperty(hidden = true)
+    @TableField("create_user_id")
+    private Long createUserId;
+
+    /**
+     * 创建人名字
+     */
+    @ExcelProperty(value = "申请人", order = 5)
+    @ApiModelProperty(value = "申请人", dataType = "String")
+    @TableField("create_user_name")
+    private String createUserName;
+
+    /**
+     * 审批状态
+     */
+    @ApiModelProperty(value = "审批状态", dataType = "String")
+    @DictCodeField(message = "审批状态描述不合法", cacheName = MeterDictCode.APPROVAL_STATUS)
+    @TableField("approval_status")
+    private String approvalStatus;
+
+    /**
+     * 流程实例id
+     */
+    @ApiModelProperty(value = "流程实例id", dataType = "String")
+    @TableField("process_id")
+    private String processId;
+
+    /**
+     * 创建时间
+     */
+    @ExcelProperty(value = "申请时间", order = 6)
+    @ApiModelProperty(value = "申请时间", dataType = "String")
+    @TableField("create_time")
+    private String createTime;
+
+    /**
+     * 更新时间
+     */
+    @ApiModelProperty(hidden = true)
+    @TableField("update_time")
+    private String updateTime;
+
+    @ApiModelProperty(value = "审批状态类型-字典value", dataType = "String")
+    @TableField(exist = false)
+    private String approvalStatusName;
+
+    @ApiModelProperty(value = "任务id（同意、驳回等操作使用）", dataType = "String")
+    @TableField(exist = false)
+    private String taskId;
+
+    @ApiModelProperty(value = "可选决策项（1同意驳回拒绝 2同意驳回 3同意拒绝，用于待审批列表同意/驳回/拒绝按钮展示）", dataType = "Integer")
+    @TableField(exist = false)
+    private Integer decisionItem;
+
+
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourcerInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourcerInfo.java
index ec4e997..f9aa69e 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourcerInfo.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourcerInfo.java
@@ -17,6 +17,7 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import javax.validation.constraints.NotEmpty;
 import java.io.Serializable;
 
 /**
@@ -59,6 +60,29 @@
     @TableField("outsourcer_name")
     private String outsourcerName;
 
+    @NotEmpty(message = "实验室代码不能为空")
+    @DictCodeField(message = "实验室代码描述不合法", cacheName = MeterDictCode.LAB_CODE)
+    @ApiModelProperty(value = "实验室代码(字典code)", dataType = "String")
+    @TableField("lab_code")
+    private String labCode;
+
+    @ApiModelProperty(value = "实验室代码(字典value)", dataType = "String")
+    @TableField(exist = false)
+    private String labCodeName;
+
+    /**
+     * 组别代码
+     */
+    @NotEmpty(message = "组别代码不能为空")
+    @DictCodeField(message = "组别代码描述不合法", cacheName = MeterDictCode.GROUP_CODE)
+    @ApiModelProperty(value = "组别代码(字典code)", dataType = "String")
+    @TableField("group_code")
+    private String groupCode;
+
+    @ApiModelProperty(value = "组别代码(字典value)", dataType = "String")
+    @TableField(exist = false)
+    private String groupCodeName;
+
     /**
      * 单位简称
      */
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardInfo.java
index c48eed7..dffdfdd 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardInfo.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardInfo.java
@@ -5,6 +5,7 @@
 import com.baomidou.mybatisplus.annotation.TableName;
 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;
 
@@ -18,6 +19,7 @@
  * @author wangpeng
  * @since 2023-08-04
  */
+@ApiModel
 @Data
 @TableName("biz_equipment_standard_info")
 public class BizEquipmentStandardInfo implements Serializable {
@@ -119,7 +121,7 @@
      * 管理状态(字典code)
      */
     @ApiModelProperty(value = "管理状态(字典code)", dataType = "String")
-    @DictCodeField(message = "管理状态不合法", cacheName = MeterDictCode.MANAGER_STATE)
+    @DictCodeField(message = "管理状态不合法", cacheName = MeterDictCode.STANDARD_MANAGER_STATE)
     @TableField("manage_status")
     private String manageStatus;
 
@@ -151,7 +153,7 @@
     /**
      * 温度(℃)
      */
-    @ApiModelProperty(value = "使用状态(字典code)", dataType = "String")
+    @ApiModelProperty(value = "温度(℃)", dataType = "String")
     @TableField("temperature")
     private Double temperature;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardInfoApproval.java b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardInfoApproval.java
index dbd86ab..9f58d83 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardInfoApproval.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardInfoApproval.java
@@ -150,7 +150,7 @@
      * 管理状态(字典code)
      */
     @ApiModelProperty(value = "管理状态(字典code)", dataType = "String")
-    @DictCodeField(message = "管理状态不合法", cacheName = MeterDictCode.MANAGER_STATE)
+    @DictCodeField(message = "管理状态不合法", cacheName = MeterDictCode.STANDARD_MANAGER_STATE)
     @TableField("manage_status")
     private String manageStatus;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardTechnologyRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardTechnologyRelation.java
index 0e612bd..751f26b 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardTechnologyRelation.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardTechnologyRelation.java
@@ -3,6 +3,7 @@
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -16,6 +17,7 @@
  * @author wangpeng
  * @since 2023-08-04
  */
+@ApiModel
 @Data
 @TableName("biz_equipment_standard_technology_relation")
 public class BizEquipmentStandardTechnologyRelation implements Serializable {
@@ -33,6 +35,10 @@
     @TableField("technology_file_id")
     private Long technologyFileId;
 
+    @ApiModelProperty(value = "依据的技术文件编号", dataType = "String")
+    @TableField("technology_file_no")
+    private String technologyFileNo;
+
     /**
      * 依据的技术文件名称(技术文件中现行测试校准检定方法表文件名字段)
      */
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerInfo.java
index d6e8bed..65cd6bc 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerInfo.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerInfo.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.model.resource;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -21,6 +28,11 @@
  * @author wangpeng
  * @since 2023-08-08
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @ApiModel
 @Data
 @TableName("biz_resource_customer_info")
@@ -35,6 +47,7 @@
     /**
      * 委托方编号
      */
+    @ExcelProperty(value = "委托方编号", order = 1)
     @ApiModelProperty(value = "委托方编号", dataType = "String")
     @TableField("customer_no")
     private String customerNo;
@@ -42,6 +55,7 @@
     /**
      * 委托方名称
      */
+    @ExcelProperty(value = "委托方名称", order = 2)
     @ApiModelProperty(value = "委托方名称(新建时为下拉选择一个受检单位组织的名字，传deptId字段，后端获取名称)", dataType = "String")
     @TableField("customer_name")
     private String customerName;
@@ -63,6 +77,7 @@
     /**
      * 联系人
      */
+    @ExcelProperty(value = "联系人", order = 3)
     @ApiModelProperty(value = "联系人", dataType = "String")
     @TableField("contacts")
     private String contacts;
@@ -70,6 +85,7 @@
     /**
      * 座机电话
      */
+    @ExcelProperty(value = "座机电话", order = 4)
     @ApiModelProperty(value = "座机电话", dataType = "String")
     @TableField("mobile")
     private String mobile;
@@ -77,6 +93,7 @@
     /**
      * 手机号码
      */
+    @ExcelProperty(value = "手机号码", order = 5)
     @ApiModelProperty(value = "手机号码", dataType = "String")
     @TableField("phone")
     private String phone;
@@ -91,6 +108,7 @@
     /**
      * 地址
      */
+    @ExcelProperty(value = "地址", order = 6)
     @ApiModelProperty(value = "地址", dataType = "String")
     @TableField("address")
     private String address;
@@ -141,6 +159,7 @@
     /**
      * 创建时间
      */
+    @ExcelProperty(value = "创建时间", order = 7)
     @ApiModelProperty(value = "创建时间", dataType = "String")
     @TableField("create_time")
     private String createTime;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerSuggestForm.java b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerSuggestForm.java
index 7201bbd..701bf8b 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerSuggestForm.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerSuggestForm.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.model.resource;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -22,6 +29,11 @@
  * @author wangpeng
  * @since 2023-08-08
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @ApiModel
 @Data
 @TableName("biz_resource_customer_suggest_form")
@@ -44,7 +56,8 @@
     /**
      * 委托方名称
      */
-    @ApiModelProperty(value = "委托方名称", dataType = "String")
+    @ExcelProperty(value = "意见反馈单位", order = 2)
+    @ApiModelProperty(value = "意见反馈单位", dataType = "String")
     @TableField("customer_name")
     private String customerName;
 
@@ -59,7 +72,8 @@
     /**
      * 委托方意见反馈部门名称
      */
-    @ApiModelProperty(value = "委托方意见反馈部门名称", dataType = "String")
+    @ExcelProperty(value = "委托方意见反馈部门", order = 3)
+    @ApiModelProperty(value = "委托方意见反馈部门", dataType = "String")
     @TableField("customer_dept_name")
     private String customerDeptName;
 
@@ -73,6 +87,7 @@
     /**
      * 表单编号
      */
+    @ExcelProperty(value = "表单编号", order = 1)
     @ApiModelProperty(value = "表单编号", dataType = "String")
     @TableField("form_no")
     private String formNo;
@@ -111,6 +126,7 @@
     /**
      * 创建人名字
      */
+    @ExcelProperty(value = "创建人", order = 4)
     @ApiModelProperty(value = "创建人名字", dataType = "String")
     @TableField("create_user_name")
     private String createUserName;
@@ -147,6 +163,7 @@
     /**
      * 创建时间
      */
+    @ExcelProperty(value = "创建时间", order = 5)
     @ApiModelProperty(value = "创建时间", dataType = "String")
     @TableField("create_time")
     private String createTime;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSealInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSealInfo.java
index cbf05d7..9bf389d 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSealInfo.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSealInfo.java
@@ -106,6 +106,10 @@
     @TableField("minio_file_name")
     private String minioFileName;
 
+    @ApiModelProperty(value = "minio存储文件url", dataType = "String")
+    @TableField(exist = false)
+    private String minioFileUrl;
+
     @ApiModelProperty(value = "创建时间", dataType = "String")
     @TableField("create_time")
     private String createTime;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSealUseNote.java b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSealUseNote.java
index 3f2d9e8..3ce16a8 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSealUseNote.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSealUseNote.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.model.resource;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -20,6 +27,11 @@
  * @author wangpeng
  * @since 2023-07-28
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @ApiModel
 @Data
 @TableName("biz_resource_seal_use_note")
@@ -34,6 +46,7 @@
     /**
      * 登记表编号
      */
+    @ExcelProperty(value = "申请单编号", order = 1)
     @ApiModelProperty(value = "登记表编号(自动生成)", dataType = "String")
     @TableField("note_form_no")
     private String noteFormNo;
@@ -55,6 +68,7 @@
     /**
      * 申请部门
      */
+    @ExcelProperty(value = "申请部门", order = 5)
     @ApiModelProperty(value = "申请部门", dataType = "String")
     @TableField("apply_dept_name")
     private String applyDeptName;
@@ -69,6 +83,7 @@
     /**
      * 申请人
      */
+    @ExcelProperty(value = "申请人", order = 6)
     @ApiModelProperty(value = "申请人", dataType = "String")
     @TableField("apply_user_name")
     private String applyUserName;
@@ -76,6 +91,7 @@
     /**
      * 申请时间
      */
+    @ExcelProperty(value = "申请时间", order = 7)
     @ApiModelProperty(value = "申请时间(新增自动获取当前时间)", dataType = "String")
     @TableField("apply_time")
     private String applyTime;
@@ -130,6 +146,26 @@
     @TableField("update_time")
     private String updateTime;
 
+    @ExcelProperty(value = "印章名称", order = 2)
+    @ApiModelProperty(value = "印章名称(列表返回参数)", dataType = "String")
+    @TableField(exist = false)
+    private String sealName;
+
+    @DictCodeField(message = "印章类型描述不合法", cacheName = MeterDictCode.SEAL_TYPE)
+    @ApiModelProperty(hidden = true)
+    @TableField(exist = false)
+    private String sealType;
+
+    @ExcelProperty(value = "印章类型", order = 3)
+    @ApiModelProperty(value = "印章类型(列表返回参数)", dataType = "String")
+    @TableField(exist = false)
+    private String sealTypeName;
+
+    @ExcelProperty(value = "批准人", order = 4)
+    @ApiModelProperty(value = "批准人(列表返回参数)", dataType = "String")
+    @TableField(exist = false)
+    private String approverName;
+
     @ApiModelProperty(value = "审批状态类型-字典value", dataType = "String")
     @TableField(exist = false)
     private String approvalStatusName;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceStaffInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceStaffInfo.java
index 5ef995b..41563a1 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceStaffInfo.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceStaffInfo.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.model.resource;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -20,6 +27,11 @@
  * @author wangpeng
  * @since 2023-07-25
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @ApiModel
 @Data
 @TableName("biz_resource_staff_info")
@@ -38,6 +50,7 @@
     /**
      * 人员编号
      */
+    @ExcelProperty(value = "人员编号",order = 0)
     @NotEmpty(message = "人员编号不能为空")
     @ApiModelProperty(value = "人员编号", dataType = "String")
     @TableField("staff_no")
@@ -46,6 +59,7 @@
     /**
      * 姓名
      */
+    @ExcelProperty(value = "姓名",order = 1)
     @ApiModelProperty(value = "姓名", dataType = "String")
     @TableField("staff_name")
     private String staffName;
@@ -152,13 +166,15 @@
     /**
      * 部门名字
      */
-    @ApiModelProperty(value = "部门名字", dataType = "String")
+    @ExcelProperty(value = "工作部门",order = 4)
+    @ApiModelProperty(value = "工作部门", dataType = "String")
     @TableField("dept_name")
     private String deptName;
 
     /**
      * 岗位
      */
+    @ExcelProperty(value = "岗位",order = 2)
     @ApiModelProperty(value = "岗位", dataType = "String")
     @TableField("station")
     private String station;
@@ -166,6 +182,7 @@
     /**
      * 计量专业
      */
+    @ExcelProperty(value = "计量专业",order = 5)
     @ApiModelProperty(value = "计量专业", dataType = "String")
     @TableField("major")
     private String major;
@@ -173,6 +190,7 @@
     /**
      * 证号
      */
+    @ExcelProperty(value = "证号",order = 3)
     @ApiModelProperty(value = "证号", dataType = "String")
     @TableField("certificate_number")
     private String certificateNumber;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSupplierInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSupplierInfo.java
index eb5ef01..a1e2697 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSupplierInfo.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSupplierInfo.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.model.resource;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -20,6 +27,11 @@
  * @author wangpeng
  * @since 2023-07-27
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @ApiModel
 @Data
 @TableName("biz_resource_supplier_info")
@@ -34,6 +46,7 @@
     /**
      * 供方编号
      */
+    @ExcelProperty(value = "供方编号", order = 1)
     @ApiModelProperty(value = "供方编号(自动生成)", dataType = "String")
     @TableField("supplier_no")
     private String supplierNo;
@@ -41,6 +54,7 @@
     /**
      * 供方名称
      */
+    @ExcelProperty(value = "供方名称", order = 2)
     @ApiModelProperty(value = "供方名称", dataType = "String")
     @TableField("supplier_name")
     private String supplierName;
@@ -60,6 +74,7 @@
     @TableField("supplier_type")
     private String supplierType;
 
+    @ExcelProperty(value = "供方类型", order = 3)
     @ApiModelProperty(value = "供方类型(字典value)", dataType = "String")
     @TableField(exist = false)
     private String supplierTypeName;
@@ -109,7 +124,8 @@
     /**
      * 电话
      */
-    @ApiModelProperty(value = "电话", dataType = "String")
+    @ExcelProperty(value = "联系电话", order = 4)
+    @ApiModelProperty(value = "联系电话", dataType = "String")
     @TableField("phone")
     private String phone;
 
@@ -158,6 +174,7 @@
     /**
      * 公司地址-省
      */
+    @ExcelProperty(value = "地址-省", order = 6)
     @ApiModelProperty(value = "公司地址-省", dataType = "String")
     @TableField("company_province_name")
     private String companyProvinceName;
@@ -172,6 +189,7 @@
     /**
      * 公司地址-市
      */
+    @ExcelProperty(value = "地址-市", order = 7)
     @ApiModelProperty(value = "公司地址-市", dataType = "String")
     @TableField("company_city_name")
     private String companyCityName;
@@ -186,6 +204,7 @@
     /**
      * 公司地址-区
      */
+    @ExcelProperty(value = "地址-区", order = 8)
     @ApiModelProperty(value = "公司地址-区", dataType = "String")
     @TableField("company_area_name")
     private String companyAreaName;
@@ -193,6 +212,7 @@
     /**
      * 公司地址-详细地址
      */
+    @ExcelProperty(value = "地址-详细地址", order = 9)
     @ApiModelProperty(value = "公司地址-详细地址", dataType = "String")
     @TableField("company_address")
     private String companyAddress;
@@ -200,6 +220,7 @@
     /**
      * 服务和供应的内容
      */
+    @ExcelProperty(value = "服务和供应的内容", order = 5)
     @ApiModelProperty(value = "服务和供应的内容", dataType = "String")
     @TableField("supplier_content")
     private String supplierContent;
@@ -250,6 +271,7 @@
     /**
      * 创建时间
      */
+    @ExcelProperty(value = "创建时间", order = 9)
     @ApiModelProperty(value = "创建时间", dataType = "String")
     @TableField("create_time")
     private String createTime;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/EnvLocationInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/EnvLocationInfo.java
new file mode 100644
index 0000000..d8e2d7b
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/EnvLocationInfo.java
@@ -0,0 +1,83 @@
+package com.casic.missiles.model.resource;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotEmpty;
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 实验室环境监控系统-设备表
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-06-07
+ */
+@ApiModel
+@Data
+@TableName("env_location_info")
+public class EnvLocationInfo implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "主键id", dataType = "Long")
+    @TableId("id")
+    private Long id;
+
+    /**
+     * 地点编号
+     */
+    @NotEmpty(message = "地点编号不能为空")
+    @ApiModelProperty(value = "地点编号", dataType = "String")
+    @TableField("location_no")
+    private String locationNo;
+
+    /**
+     * 地点名称
+     */
+    @ApiModelProperty(value = "地点名称", dataType = "String")
+    @TableField("location_name")
+    private String locationName;
+
+    /**
+     * 地点位置
+     */
+    @ApiModelProperty(value = "地点位置", dataType = "String")
+    @TableField("location_position")
+    private String locationPosition;
+
+    /**
+     * 创建人id
+     */
+    @ApiModelProperty(value = "创建人id", dataType = "Long")
+    @TableField("create_user_id")
+    private Long createUserId;
+
+    /**
+     * 创建人
+     */
+    @ApiModelProperty(value = "创建人", dataType = "String")
+    @TableField("create_user")
+    private String createUser;
+
+    /**
+     * 创建时间
+     */
+    @ApiModelProperty(value = "创建时间", dataType = "String")
+    @TableField("create_time")
+    private String createTime;
+
+    /**
+     * 更新时间
+     */
+    @ApiModelProperty(value = "更新时间", dataType = "String")
+    @TableField("update_time")
+    private String updateTime;
+
+
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemFileConfig.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemFileConfig.java
index 19e6845..86e569c 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemFileConfig.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemFileConfig.java
@@ -30,7 +30,7 @@
     @ApiModelProperty(value = "系统类别(1业务系统2受检系统3环境系统)", dataType = "Integer")
     @NotNull(message = "系统类别不能为空")
     @TableField("system_type")
-    private Integer systemType;
+    private Integer systemType = 1;
 
     @ApiModelProperty("下载编号")
     @TableField("download_no")
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemNotice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemNotice.java
index e94297d..06ec37d 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemNotice.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemNotice.java
@@ -34,7 +34,7 @@
     @ApiModelProperty(value = "系统类别(1业务系统2受检系统3环境系统)", dataType = "Integer")
     @NotNull(message = "系统类别不能为空")
     @TableField("system_type")
-    private Integer systemType;
+    private Integer systemType = 1;
 
     /**
      * 通知公告编号
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSign.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSign.java
index 6c0d7c9..954f4f8 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSign.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSign.java
@@ -51,7 +51,7 @@
     @ApiModelProperty(value = "系统类别(1业务系统2受检系统3环境系统)", dataType = "Integer")
     @NotNull(message = "系统类别不能为空")
     @TableField("system_type")
-    private Integer systemType;
+    private Integer systemType = 1;
 
     /**
      * 签名编号
@@ -130,4 +130,8 @@
     @TableField(exist = false)
     private List<Long> userIdList;
 
+    @ApiModelProperty(hidden = true)
+    @TableField(exist = false)
+    private String deptName;
+
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemTemplate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemTemplate.java
index 503a457..1d27ebe 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemTemplate.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemTemplate.java
@@ -47,7 +47,7 @@
     @ApiModelProperty(value = "系统类别(1业务系统2受检系统3环境系统)", dataType = "Integer")
     @NotNull(message = "系统类别不能为空")
     @TableField("system_type")
-    private Integer systemType;
+    private Integer systemType = 1;
 
     /**
      * 模板编号
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java
index 8c21cb0..f61e4a8 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java
@@ -32,4 +32,8 @@
     ReturnDTO approvalDelete(ApprovalDeleteRequest request);
 
     ReturnDTO failUpdate(T request);
+
+    List<O> listExport(R request);
+
+    List<O> listExportByIds(List<Long> ids);
 }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java
index 724166f..9bce15b 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java
@@ -157,6 +157,29 @@
         throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
     }
 
+    @Override
+    public List<O> listExport(R request) {
+        request.setCreateUserId(null);
+        request.setApprovalStatus(ApprovalStatusEnum.PASSED);
+        Page<O> page = PageFactory.defaultPage();
+        page.setCurrent(1);
+        page.setSearchCount(false);
+        page.setSize(Integer.MAX_VALUE);
+        Page<O> resultPage = this.baseMapper.selectBatchForApprovalList(page, request, null);
+        return resultPage.getRecords();
+    }
+
+    @Override
+    public List<O> listExportByIds(List<Long> ids) {
+        Page<O> page = PageFactory.defaultPage();
+        page.setCurrent(1);
+        page.setSearchCount(false);
+        page.setSize(Integer.MAX_VALUE);
+        List<String> businessKeys = ids.stream().map(String::valueOf).collect(Collectors.toList());
+        Page<O> resultPage = this.baseMapper.selectBatchForApprovalList(page, null, businessKeys);
+        return resultPage.getRecords();
+    }
+
     protected ReturnDTO updateApprovalStatus(Long id, String processId, String approvalStatus) {
         UpdateWrapper<T> updateWrapper = new UpdateWrapper<>();
         updateWrapper.eq("id", id);
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificatePrintServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificatePrintServiceImpl.java
index f6e4706..3228497 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificatePrintServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificatePrintServiceImpl.java
@@ -162,6 +162,30 @@
         return ReturnUtil.success(printLogMapper.selectList(wrapper));
     }
 
+    @Override
+    public List<CertificatePrintListResponse> listByIds(List<Long> ids) {
+        Page<CertificatePrintListResponse> page = PageFactory.defaultPage();
+        page.setCurrent(1);
+        page.setSearchCount(false);
+        page.setSize(Integer.MAX_VALUE);
+        List<String> businessKeys = ids.stream().map(String::valueOf).collect(Collectors.toList());
+        Page<CertificatePrintListResponse> resultPage = this.baseMapper.selectBatchForApprovalList(page, null, businessKeys);
+        return resultPage.getRecords();
+    }
+
+    @Override
+    public List<CertificatePrintListResponse> list(CertificatePrintApprovalListRequest request) {
+        request.setCreateUserId(null);
+        request.setApprovalStatus(null);
+        request.setPrintStatus(null);
+        Page<CertificatePrintListResponse> page = PageFactory.defaultPage();
+        page.setCurrent(1);
+        page.setSearchCount(false);
+        page.setSize(Integer.MAX_VALUE);
+        Page<CertificatePrintListResponse> resultPage = certificatePrintMapper.selectBatchForApprovalList(page, request, null);
+        return resultPage.getRecords();
+    }
+
     private void savePrintLog(Long id) {
         BizBusinessCertificatePrintLog printLog = new BizBusinessCertificatePrintLog();
         BizBusinessCertificatePrint certificatePrint = certificatePrintMapper.selectById(id);
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificateReportServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificateReportServiceImpl.java
index 457555f..24146be 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificateReportServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificateReportServiceImpl.java
@@ -158,8 +158,8 @@
         QueryWrapper<BizBusinessCertificateMeasureResultData> mWrapper = new QueryWrapper<>();
         mWrapper.eq("report_id", reportId);
         boolean mRemove = certificateMeasureResultDataService.remove(mWrapper);
-        Assert.isFalse(eRemove || mRemove, () -> {
+        if(!eRemove || !mRemove){
             throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
-        });
+        }
     }
 }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessIdentifyInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessIdentifyInfoServiceImpl.java
index 4c8e190..f7e63ca 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessIdentifyInfoServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessIdentifyInfoServiceImpl.java
@@ -1,8 +1,10 @@
 package com.casic.missiles.service.Impl.business;
 
+import cn.hutool.core.date.DateUtil;
 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.core.page.PageFactory;
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.business.identify.IdentifyListRequest;
@@ -14,11 +16,14 @@
 import com.casic.missiles.service.business.IBizBusinessIdentifyInfoService;
 import com.casic.missiles.utils.DictCodeUtils;
 import com.casic.missiles.utils.NumberGeneratorUtil;
+import com.casic.missiles.utils.QRCodeUtil;
 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.List;
+
 /**
  * <p>
  * 计量检定业务-任务计量管理-标识打印 服务实现类
@@ -35,9 +40,9 @@
     @Override
     public Page<BizBusinessIdentifyInfo> identifyListPage(Page<BizBusinessIdentifyInfo> page, IdentifyListRequest request) throws Exception {
         QueryWrapper<BizBusinessIdentifyInfo> wrapper = new QueryWrapper<>();
-        wrapper.eq("identify_type", request.getIdentifyType());
-        wrapper.like("device_no", request.getDeviceNo());
-        wrapper.like("device_name", request.getDeviceName());
+        wrapper.eq(StringUtils.isNotEmpty(request.getIdentifyType()), "identify_type", request.getIdentifyType());
+        wrapper.like(StringUtils.isNotEmpty(request.getDeviceNo()),"device_no", request.getDeviceNo());
+        wrapper.like(StringUtils.isNotEmpty(request.getDeviceName()), "device_name", request.getDeviceName());
         wrapper.apply(StringUtils.isNotBlank(request.getCreateTimeStart()),
                 "{0} <= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getCreateTimeStart().split(" ")[0]);
         wrapper.apply(StringUtils.isNotBlank(request.getCreateTimeEnd()),
@@ -64,8 +69,11 @@
     }
 
     @Override
-    public ReturnDTO updateIdentify(BizBusinessIdentifyInfo identifyInfo) {
-        if(identifyInfoMapper.updateById(identifyInfo) > 0){
+    public ReturnDTO updateIdentify(Long id) {
+        BizBusinessIdentifyInfo info = new BizBusinessIdentifyInfo();
+        info.setId(id);
+        info.setUpdateTime(DateUtil.now());
+        if(identifyInfoMapper.updateById(info) > 0){
             return ReturnUtil.success();
         }
         throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
@@ -79,4 +87,20 @@
         throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
     }
 
+    @Override
+    public List<BizBusinessIdentifyInfo> list(IdentifyListRequest request) throws Exception {
+        Page<BizBusinessIdentifyInfo> page = PageFactory.defaultPage();
+        page.setCurrent(1);
+        page.setSearchCount(false);
+        page.setSize(Integer.MAX_VALUE);
+        Page<BizBusinessIdentifyInfo> resultPage = this.identifyListPage(page, request);
+        return resultPage.getRecords();
+    }
+
+    @Override
+    public ReturnDTO<String> equipmentQrCode(Long id) {
+        String base64QRCode = QRCodeUtil.getBase64QRCode(String.valueOf(id));
+        return ReturnUtil.success(base64QRCode);
+    }
+
 }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOrderInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOrderInfoServiceImpl.java
index 82952ad..d8d2c6a 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOrderInfoServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOrderInfoServiceImpl.java
@@ -35,6 +35,7 @@
 import javax.servlet.http.HttpServletResponse;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 import java.util.stream.Collectors;
 
 /**
@@ -209,13 +210,16 @@
     private QueryWrapper<OrderListResponse> listParamWrapperBuilder(OrderListRequest request) {
         QueryWrapper<OrderListResponse> wrapper = new QueryWrapper<>();
         wrapper.like(StringUtils.isNotBlank(request.getOrderNo()), "order_no", request.getOrderNo());
+        wrapper.like(Objects.nonNull(request.getCustomerId()), "customer_id", request.getCustomerId());
         wrapper.like(StringUtils.isNotBlank(request.getCustomerName()), "customer_name", request.getCustomerName());
         wrapper.like(StringUtils.isNotBlank(request.getDeliverer()), "deliverer", request.getDeliverer());
         wrapper.like(StringUtils.isNotBlank(request.getCreateUserName()), "create_user_name", request.getCreateUserName());
-        wrapper.apply(StringUtils.isNotBlank(request.getCreateStartTime()),
-                "{0} <= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getCreateStartTime().split(" ")[0]);
-        wrapper.apply(StringUtils.isNotBlank(request.getCreateEndTime()),
-                "{0} >= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getCreateEndTime().split(" ")[0]);
+        if(StringUtils.isNotBlank(request.getCreateStartTime())){
+            wrapper.apply("{0} <= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getCreateStartTime().split(" ")[0]);
+        }
+        if(StringUtils.isNotBlank(request.getCreateEndTime())){
+            wrapper.apply("{0} >= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getCreateEndTime().split(" ")[0]);
+        }
         wrapper.orderByDesc("create_time");
         return wrapper;
     }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceAssessServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceAssessServiceImpl.java
index c6af980..ce40138 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceAssessServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceAssessServiceImpl.java
@@ -1,10 +1,33 @@
 package com.casic.missiles.service.Impl.business;
 
-import com.casic.missiles.model.business.BizBusinessOutsourceAssess;
+import cn.hutool.core.lang.Assert;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.casic.missiles.core.model.auth.AuthUser;
+import com.casic.missiles.core.shiro.ShiroKit;
+import com.casic.missiles.dto.BaseApprovalSubmitRequest;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.ReturnUtil;
+import com.casic.missiles.dto.business.outsource.OutsourceAssessApprovalListRequest;
+import com.casic.missiles.dto.business.outsource.OutsourceAssessSaveResponse;
+import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.NoGenerateFileCodeEnum;
+import com.casic.missiles.enums.NoGenerateRecordTypeCodeEnum;
+import com.casic.missiles.enums.system.ApprovalStatusEnum;
+import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.mapper.business.BizBusinessOutsourceAssessMapper;
+import com.casic.missiles.model.business.BizBusinessOutsourceAssess;
+import com.casic.missiles.model.business.BizBusinessOutsourceAssessSampleRelation;
+import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl;
+import com.casic.missiles.service.business.IBizBusinessOutsourceAssessSampleRelationService;
 import com.casic.missiles.service.business.IBizBusinessOutsourceAssessService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.casic.missiles.utils.NoGeneratorUtil;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Objects;
 
 /**
  * <p>
@@ -15,6 +38,103 @@
  * @since 2023-08-16
  */
 @Service
-public class BizBusinessOutsourceAssessServiceImpl extends ServiceImpl<BizBusinessOutsourceAssessMapper, BizBusinessOutsourceAssess> implements IBizBusinessOutsourceAssessService {
+public class BizBusinessOutsourceAssessServiceImpl extends GeneralApprovalServiceImpl<BizBusinessOutsourceAssessMapper, BizBusinessOutsourceAssess, BizBusinessOutsourceAssess, OutsourceAssessApprovalListRequest, BaseApprovalSubmitRequest> implements IBizBusinessOutsourceAssessService {
+    @Autowired
+    private IBizBusinessOutsourceAssessSampleRelationService outsourceAssessSampleRelationService;
 
+    @Override
+    public ReturnDTO<OutsourceAssessSaveResponse> saveOutsourceAssess(BizBusinessOutsourceAssess request) {
+        //生成编号
+        String labCode = request.getLabCode();
+        String groupCode = request.getGroupCode();
+        Long maxNo = this.baseMapper.selectMaxProjectNo();
+        String projectNo = NoGeneratorUtil.getCode(NoGenerateFileCodeEnum.D, labCode, NoGenerateRecordTypeCodeEnum.OUTSOURCE_ACCESS, groupCode, maxNo);
+        request.setCreateUserId(request.getUserId());
+        request.setCreateUserName(request.getUserName());
+        request.setApprovalStatus(ApprovalStatusEnum.DRAFT); //草稿箱状态
+        request.setProjectNo(projectNo);
+        int row = this.baseMapper.insert(request);
+        Assert.isFalse(row <= 0, () -> {
+            throw new BusinessException(BusinessExceptionEnum.OUTSOURCE_ACCESS_SAVE_FAILED);
+        });
+        //关联表
+        saveRelationData(request);
+        OutsourceAssessSaveResponse saveResponse = new OutsourceAssessSaveResponse();
+        saveResponse.setId(request.getId());
+        saveResponse.setProjectNo(projectNo);
+        return ReturnUtil.success(saveResponse);
+    }
+
+    @Override
+    @Transactional
+    public ReturnDTO draftUpdate(BizBusinessOutsourceAssess request) {
+        if (this.baseMapper.updateById(request) > 0) {
+            //关联表删除、增加
+            removeRelationData(request.getId());
+            saveRelationData(request);
+            return ReturnUtil.success();
+        }
+        throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
+    }
+
+    @Override
+    public ReturnDTO draftDelete(Long id) {
+        if (this.baseMapper.deleteById(id) > 0) {
+            //关联表删除
+            removeRelationData(id);
+            return ReturnUtil.success();
+        }
+        throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
+    }
+
+    @Override
+    public ReturnDTO draftBatchDelete(List<Long> ids) {
+        if (this.baseMapper.deleteBatchIds(ids) >= 0) {
+            ids.forEach(id -> removeRelationData(id));
+            return ReturnUtil.success();
+        }
+        throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
+    }
+
+    @Override
+    @Transactional
+    public ReturnDTO failUpdate(BizBusinessOutsourceAssess request) {
+        AuthUser user = ShiroKit.getUser();
+        Assert.isFalse(Objects.isNull(user), () -> {
+            throw new BusinessException(BusinessExceptionEnum.LOGIN_USER_ACQUIRE_FAILED);
+        });
+        request.setApprovalStatus(ApprovalStatusEnum.IN_APPROVED);
+        if (this.baseMapper.updateById(request) > 0) {
+            //关联表删除、增加
+            removeRelationData(request.getId());
+            saveRelationData(request);
+            baseApprovalService.failUpdate(request.getProcessId());
+            return ReturnUtil.success();
+        }
+        throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
+    }
+
+    private void saveRelationData(BizBusinessOutsourceAssess request) {
+        List<BizBusinessOutsourceAssessSampleRelation> sampleRelations = new ArrayList<>();
+        request.getOrderSampleList().forEach(dto -> {
+            BizBusinessOutsourceAssessSampleRelation relation = new BizBusinessOutsourceAssessSampleRelation();
+            relation.setOrderId(dto.getOrderId());
+            relation.setSampleId(dto.getSampleId());
+            relation.setAccessId(request.getId());
+            sampleRelations.add(relation);
+        });
+        if(outsourceAssessSampleRelationService.saveBatch(sampleRelations)){
+            return;
+        }
+        throw new BusinessException(BusinessExceptionEnum.OUTSOURCE_ACCESS_SAVE_FAILED);
+    }
+
+    private void removeRelationData(Long assessId) {
+        QueryWrapper<BizBusinessOutsourceAssessSampleRelation> wrapper = new QueryWrapper<>();
+        wrapper.eq("access_id", assessId);
+        if(outsourceAssessSampleRelationService.remove(wrapper)){
+            return;
+        }
+        throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
+    }
 }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceProtocolServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceProtocolServiceImpl.java
new file mode 100644
index 0000000..821e728
--- /dev/null
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceProtocolServiceImpl.java
@@ -0,0 +1,60 @@
+package com.casic.missiles.service.Impl.business;
+
+import cn.hutool.core.lang.Assert;
+import com.casic.missiles.dto.BaseApprovalSubmitRequest;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.ReturnUtil;
+import com.casic.missiles.dto.business.outsource.OutsourceProtocolApprovalListRequest;
+import com.casic.missiles.dto.business.outsource.OutsourceProtocolSaveResponse;
+import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.NoGenerateFileCodeEnum;
+import com.casic.missiles.enums.NoGenerateRecordTypeCodeEnum;
+import com.casic.missiles.enums.system.ApprovalStatusEnum;
+import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.mapper.business.BizBusinessOutsourceProtocolMapper;
+import com.casic.missiles.mapper.business.BizBusinessOutsourcerInfoMapper;
+import com.casic.missiles.model.business.BizBusinessOutsourceProtocol;
+import com.casic.missiles.model.business.BizBusinessOutsourcerInfo;
+import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl;
+import com.casic.missiles.service.business.IBizBusinessOutsourceProtocolService;
+import com.casic.missiles.utils.NoGeneratorUtil;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 计量检定业务-分包管理-测试、校准或检定工作分包协议书 服务实现类
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-08-24
+ */
+@Service
+public class BizBusinessOutsourceProtocolServiceImpl extends GeneralApprovalServiceImpl<BizBusinessOutsourceProtocolMapper, BizBusinessOutsourceProtocol, BizBusinessOutsourceProtocol, OutsourceProtocolApprovalListRequest, BaseApprovalSubmitRequest> implements IBizBusinessOutsourceProtocolService {
+    @Autowired
+    private BizBusinessOutsourcerInfoMapper outsourcerInfoMapper;
+
+    @Override
+    public ReturnDTO<OutsourceProtocolSaveResponse> saveOutsourceProtocol(BizBusinessOutsourceProtocol request) {
+        //生成编号
+        String labCode = request.getLabCode();
+        String groupCode = request.getGroupCode();
+        Long maxNo = this.baseMapper.selectMaxProtocolNo();
+        String protocolNo = NoGeneratorUtil.getCode(NoGenerateFileCodeEnum.D, labCode, NoGenerateRecordTypeCodeEnum.OUTSOURCE_PROTOCOL, groupCode, maxNo);
+        request.setCreateUserId(request.getUserId());
+        request.setCreateUserName(request.getUserName());
+        request.setApprovalStatus(ApprovalStatusEnum.DRAFT); //草稿箱状态
+        request.setProtocolNo(protocolNo);
+        BizBusinessOutsourcerInfo outsourcerInfo = outsourcerInfoMapper.selectById(request.getOutsourcerId());
+        request.setOutsourceNo(outsourcerInfo.getOutsourcerNo());
+        request.setOutsourceName(outsourcerInfo.getOutsourcerName());
+        int row = this.baseMapper.insert(request);
+        Assert.isFalse(row <= 0, () -> {
+            throw new BusinessException(BusinessExceptionEnum.OUTSOURCE_PROTOCOL_SAVE_FAILED);
+        });
+        OutsourceProtocolSaveResponse saveResponse = new OutsourceProtocolSaveResponse();
+        saveResponse.setId(request.getId());
+        saveResponse.setProtocolNo(protocolNo);
+        return ReturnUtil.success(saveResponse);
+    }
+}
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourcerInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourcerInfoServiceImpl.java
index 75f639d..8aadad7 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourcerInfoServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourcerInfoServiceImpl.java
@@ -3,12 +3,12 @@
 import cn.hutool.core.lang.Assert;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.dto.*;
 import com.casic.missiles.dto.business.outsource.OutsourcerInfoApprovalListRequest;
 import com.casic.missiles.dto.business.outsource.OutsourcerSaveResponse;
 import com.casic.missiles.enums.BusinessExceptionEnum;
-import com.casic.missiles.enums.PrefixCodeEnum;
+import com.casic.missiles.enums.NoGenerateFileCodeEnum;
+import com.casic.missiles.enums.NoGenerateRecordTypeCodeEnum;
 import com.casic.missiles.enums.system.ApprovalStatusEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.mapper.business.BizBusinessOutsourcerInfoMapper;
@@ -20,7 +20,7 @@
 import com.casic.missiles.service.business.IBizBusinessOutsourcerInfoService;
 import com.casic.missiles.service.business.IBizBusinessOutsourcerUserInfoService;
 import com.casic.missiles.utils.DictCodeUtils;
-import com.casic.missiles.utils.NumberGeneratorUtil;
+import com.casic.missiles.utils.NoGeneratorUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -42,22 +42,12 @@
     private IBizBusinessOutsourcerUserInfoService outsourcerUserInfoService;
 
     @Override
-    public List<BizBusinessOutsourcerInfo> list(OutsourcerInfoApprovalListRequest request) {
-        request.setCreateUserId(null);
-        request.setApprovalStatus(ApprovalStatusEnum.PASSED);
-        Page<BizBusinessOutsourcerInfo> page = PageFactory.defaultPage();
-        page.setCurrent(1);
-        page.setSearchCount(false);
-        page.setSize(Integer.MAX_VALUE);
-        Page<BizBusinessOutsourcerInfo> resultPage = this.baseMapper.selectBatchForApprovalList(page, request, null);
-        return resultPage.getRecords();
-    }
-
-    @Override
     public ReturnDTO<OutsourcerSaveResponse> saveOutsourcer(BizBusinessOutsourcerInfo request) {
         //生成编号
+        String labCode = request.getLabCode();
+        String groupCode = request.getGroupCode();
         Long maxNo = this.baseMapper.selectMaxNo();
-        String outsourcerNo = NumberGeneratorUtil.getContactNo(PrefixCodeEnum.OUTSOURCER_PREFIX, maxNo);
+        String outsourcerNo = NoGeneratorUtil.getCode(NoGenerateFileCodeEnum.D, labCode, NoGenerateRecordTypeCodeEnum.OUTSOURCE_INFO, groupCode, maxNo);
         request.setOutsourcerNo(outsourcerNo);
         request.setCreateUserId(request.getUserId());
         request.setCreateUserName(request.getUserName());
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessSiteExecutiveInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessSiteExecutiveInfoServiceImpl.java
index ebab3e6..6c6a129 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessSiteExecutiveInfoServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessSiteExecutiveInfoServiceImpl.java
@@ -189,9 +189,9 @@
         QueryWrapper<BizBusinessSiteExecutiveStaffRelation> mWrapper = new QueryWrapper<>();
         mWrapper.eq("site_executive_id", siteExecutiveId);
         boolean mRemove = siteExecutiveStaffRelationService.remove(mWrapper);
-        Assert.isFalse(eRemove || mRemove, () -> {
+        if(!eRemove || !mRemove){
             throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
-        });
+        }
     }
 
     private void doPopulateSiteExecutive(SiteExecutiveDetailResponse detailResponse) {
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessLabExecutiveInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessLabExecutiveInfoServiceImpl.java
index 50c5616..0242fcf 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessLabExecutiveInfoServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessLabExecutiveInfoServiceImpl.java
@@ -297,6 +297,29 @@
     }
 
     @Override
+    public List<SampleLabExecutiveListResponse> deptLabExecutiveList(SampleLabExecutiveListRequest request) throws Exception {
+        Page<SampleLabExecutiveListResponse> page = PageFactory.defaultPage();
+        page.setCurrent(1);
+        page.setSearchCount(false);
+        page.setSize(Integer.MAX_VALUE);
+        Page<SampleLabExecutiveListResponse> resultPage = this.deptLabExecutiveListPage(page, request);
+        return resultPage.getRecords();
+    }
+
+    @Override
+    public List<SampleLabExecutiveListResponse> deptLabExecutiveListByIds(String measureStatus, List<Long> ids) throws Exception {
+        Page<SampleLabExecutiveListResponse> page = PageFactory.defaultPage();
+        page.setCurrent(1);
+        page.setSearchCount(false);
+        page.setSize(Integer.MAX_VALUE);
+        SampleLabExecutiveListRequest request = new SampleLabExecutiveListRequest();
+        request.setIds(ids);
+        request.setMeasureStatus(measureStatus);
+        Page<SampleLabExecutiveListResponse> resultPage = this.deptLabExecutiveListPage(page, request);
+        return resultPage.getRecords();
+    }
+
+    @Override
     public Page<SampleLabExecutiveListResponse> myLabExecutiveListPage(Page<SampleLabExecutiveListResponse> page, SampleLabExecutiveListRequest labExecutiveListRequest) throws Exception{
         AuthUser user = ShiroKit.getUser();
         Assert.isFalse(Objects.isNull(user), () -> {
@@ -350,6 +373,29 @@
     }
 
     @Override
+    public List<SampleLabExecutiveListResponse> myLabExecutiveList(SampleLabExecutiveListRequest request) throws Exception {
+        Page<SampleLabExecutiveListResponse> page = PageFactory.defaultPage();
+        page.setCurrent(1);
+        page.setSearchCount(false);
+        page.setSize(Integer.MAX_VALUE);
+        Page<SampleLabExecutiveListResponse> resultPage = this.myLabExecutiveListPage(page, request);
+        return resultPage.getRecords();
+    }
+
+    @Override
+    public List<SampleLabExecutiveListResponse> myLabExecutiveListByIds(String measureStatus, List<Long> ids) throws Exception {
+        Page<SampleLabExecutiveListResponse> page = PageFactory.defaultPage();
+        page.setCurrent(1);
+        page.setSearchCount(false);
+        page.setSize(Integer.MAX_VALUE);
+        SampleLabExecutiveListRequest request = new SampleLabExecutiveListRequest();
+        request.setIds(ids);
+        request.setMeasureStatus(measureStatus);
+        Page<SampleLabExecutiveListResponse> resultPage = this.myLabExecutiveListPage(page, request);
+        return resultPage.getRecords();
+    }
+
+    @Override
     public List<SampleAmountResponse> myExecutiveAmount() {
         //登录用户id获取计量人员id，实验室检测信息中存储的是计量人员id
         AuthUser user = ShiroKit.getUser();
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentInfoServiceImpl.java
index 864b05e..db8cad4 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentInfoServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentInfoServiceImpl.java
@@ -35,7 +35,6 @@
 import com.casic.missiles.utils.ConvertUtils;
 import com.casic.missiles.utils.DictCodeUtils;
 import com.casic.missiles.utils.NumberGeneratorUtil;
-import org.flowable.engine.RuntimeService;
 import org.flowable.engine.runtime.ProcessInstance;
 import org.jetbrains.annotations.NotNull;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -43,7 +42,6 @@
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
 
-import javax.annotation.Resource;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
@@ -81,8 +79,6 @@
     private IBizEquipmentAttachmentService attachmentService;
     @Autowired
     private IBizEquipmentCheckpointService checkpointService;
-    @Resource
-    private RuntimeService runtimeService;
     @Autowired
     private ApprovalOperateService approvalOperateService;
 
@@ -235,18 +231,18 @@
     private void updateRelationInfo(EquipmentAddRequest request, BizEquipmentInfoApproval equipmentInfoApproval) {
         QueryWrapper<BizEquipmentTechnicalTarget> targetWrapper = new QueryWrapper<>();
         targetWrapper.eq("equipment_no", equipmentInfoApproval.getEquipmentNo());
-        boolean removeTargetFlag = technicalTargetService.remove(targetWrapper);
-        boolean saveTargetFlag = technicalTargetService.saveBatch(request.getTechnicalTargetList());
+        technicalTargetService.remove(targetWrapper);
+        technicalTargetService.saveBatch(request.getTechnicalTargetList());
 
         QueryWrapper<BizEquipmentAttachment> attachmentWrapper = new QueryWrapper<>();
         attachmentWrapper.eq("equipment_no", equipmentInfoApproval.getEquipmentNo());
-        boolean removeAttachmentFlag = attachmentService.remove(attachmentWrapper);
-        boolean saveAttachmentFlag = attachmentService.saveBatch(request.getAttachmentList());
+        attachmentService.remove(attachmentWrapper);
+        attachmentService.saveBatch(request.getAttachmentList());
 
         QueryWrapper<BizEquipmentCheckpoint> checkpointWrapper = new QueryWrapper<>();
         checkpointWrapper.eq("equipment_no", equipmentInfoApproval.getEquipmentNo());
-        boolean removeCheckpointFlag = checkpointService.remove(checkpointWrapper);
-        boolean saveCheckpointFlag = checkpointService.saveBatch(request.getCheckpointList());
+        checkpointService.remove(checkpointWrapper);
+        checkpointService.saveBatch(request.getCheckpointList());
     }
 
     @Override

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java
index bb0c50f..13a699b 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java
@@ -12,6 +12,7 @@
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.IGeneralApprovalService;
+import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
@@ -19,6 +20,7 @@
 import org.springframework.web.bind.annotation.RequestBody;
 
 import javax.validation.Valid;
+import java.util.List;
 import java.util.Objects;
 
 /**
@@ -117,4 +119,17 @@
         }
         return baseApprovalService.failUpdate(request);
     }
+
+    public List<O> exportList(@RequestBody @Valid R request) throws Exception {
+        List<O> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = baseApprovalService.listExportByIds(request.getIds());
+        } else {
+            list = baseApprovalService.listExport(request);
+        }
+        for (O record : list) {
+            DictCodeUtils.convertDictCodeToName(record);
+        }
+        return list;
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java
index 8a90961..d775831 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java
@@ -5,6 +5,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.business.certificate.CertificateChangeApplyApprovalListRequest;
 import com.casic.missiles.dto.business.certificate.CertificateChangeApplySaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessCertificateChangeApply;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
@@ -20,6 +21,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -48,4 +50,12 @@
         }
         return changeApplyService.saveChangeApply(request);
     }
+
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody CertificateChangeApplyApprovalListRequest request) throws Exception {
+        List<BizBusinessCertificateChangeApply> list = super.exportList(request);
+        super.exportExcel(BizBusinessCertificateChangeApply.class, list, ExportEnum.CERTIFICATE_CHANGE_APPLY.getSheetName());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java
index 5fc4b07..af8230e 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java
@@ -9,6 +9,7 @@
 import com.casic.missiles.dto.business.certificate.CertificatePrintApprovalListRequest;
 import com.casic.missiles.dto.business.certificate.CertificatePrintListResponse;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.enums.business.CertificatePrintStatusEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessCertificatePrintLog;
@@ -18,10 +19,16 @@
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.io.IOException;
+import java.util.List;
 import java.util.Objects;
 
 /**
@@ -98,4 +105,16 @@
         });
         return certificatePrintService.certificatePrintLog(idDTO.getId());
     }
+
+    @ApiOperation("证书打印审批导出")
+    @PostMapping("/listExport")
+    public void exportList(@RequestBody CertificatePrintApprovalListRequest request) throws IOException {
+        List<CertificatePrintListResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = certificatePrintService.listByIds(request.getIds());
+        } else {
+            list = certificatePrintService.list(request);
+        }
+        super.exportExcel(CertificatePrintListResponse.class, list, ExportEnum.CERTIFICATE_PRINT.getSheetName());
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java
index 63b06dc..6b2efd5 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java
@@ -6,6 +6,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.business.certificate.CertificateReportApprovalListRequest;
 import com.casic.missiles.dto.business.certificate.CertificateReportSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessCertificateReport;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
@@ -21,6 +22,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -50,7 +52,7 @@
         return certificateReportService.saveCertificateReport(request);
     }
 
-    @ApiOperation("证书审批详情（基本信息）")
+    @ApiOperation("详情（基本信息）")
     @PostMapping("/detail")
     public ReturnDTO<BizBusinessCertificateReport> detail(@RequestBody @Valid BaseDetailRequest request, BindingResult bindingResult) throws Exception {
         if(bindingResult.hasErrors()){
@@ -59,4 +61,11 @@
         return certificateReportService.detail(request);
     }
 
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody CertificateReportApprovalListRequest request) throws Exception {
+        List<BizBusinessCertificateReport> list = super.exportList(request);
+        super.exportExcel(BizBusinessCertificateReport.class, list, ExportEnum.CERTIFICATE_REPORT.getSheetName());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java
index 46b26bd..57c0809 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java
@@ -10,20 +10,21 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.business.identify.IdentifyListRequest;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessIdentifyInfo;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.business.IBizBusinessIdentifyInfoService;
+import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import javax.validation.Valid;
+import java.util.List;
 import java.util.Objects;
 
 /**
@@ -57,16 +58,13 @@
         return identifyInfoService.addIdentify(identifyInfo);
     }
 
-    @ApiOperation("标识打印更新")
+    @ApiOperation("标识打印更新（更新打印时间）")
     @PostMapping("/update")
-    public ReturnDTO updateIdentify(@RequestBody @Valid BizBusinessIdentifyInfo identifyInfo, BindingResult bindingResult) {
-        Assert.isFalse(Objects.isNull(identifyInfo.getId()), () -> {
+    public ReturnDTO updateIdentify(@RequestBody @Valid IdDTO idDTO) {
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        Assert.isFalse(bindingResult.hasErrors(), () -> {
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        });
-        return identifyInfoService.updateIdentify(identifyInfo);
+        return identifyInfoService.updateIdentify(idDTO.getId());
     }
 
     @ApiOperation("标识打印删除")
@@ -77,4 +75,37 @@
         });
         return identifyInfoService.deleteIdentify(idDTO.getId());
     }
+
+    @ApiOperation("标识打印导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody @Valid IdentifyListRequest request, BindingResult bindingResult) throws Exception {
+        if (bindingResult.hasErrors()) {
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        List<BizBusinessIdentifyInfo> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = identifyInfoService.listByIds(request.getIds());
+        } else {
+            list = identifyInfoService.list(request);
+        }
+        for (BizBusinessIdentifyInfo record : list) {
+            DictCodeUtils.convertDictCodeToName(record);
+        }
+        super.exportExcel(BizBusinessIdentifyInfo.class, list, ExportEnum.IDENTIFY_EXPORT.getSheetName());
+    }
+
+
+    // TODO: 2023/8/23 查询设备信息，4个底部按钮查设备（按钮的作用就是前端用来调不同接口、用来区分中间即将展示的标识），前端弹窗选设备，在确定保存时前端根据底部按钮判断传入设备类型deviceType字典code
+    // TODO: 2023/8/23 接口：查受检设备（第1个按钮），查设备台账（后3个按钮同一接口），查询之后前端根据标志类型的不同加到中间页面时进行判断（按产品给的对应表）
+    // TODO: 2023/8/23 提供二维码接口，前端在加到中间页面时调用一下
+
+    @ApiOperation("设备二维码")
+    @PostMapping("/equipment/qrCode")
+    public ReturnDTO<String> equipmentQrCode(@RequestBody @Valid IdDTO idDTO) {
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return identifyInfoService.equipmentQrCode(idDTO.getId());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java
index 707be6e..7e0453d 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java
@@ -117,7 +117,7 @@
     }
 
     @ApiOperation("任务单导出")
-    @PostMapping("/export")
+    @PostMapping("/listExport")
     public void orderExport(@RequestBody @Valid OrderListRequest request, HttpServletResponse response) {
         businessOrderService.orderExport(request, response);
     }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java
index 529a6ce..51432be 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java
@@ -1,9 +1,28 @@
 package com.casic.missiles.controller.business;
 
+import com.casic.missiles.controller.GeneralApprovalController;
+import com.casic.missiles.dto.BaseApprovalSubmitRequest;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.business.outsource.OutsourceAssessApprovalListRequest;
+import com.casic.missiles.dto.business.outsource.OutsourceAssessSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
+import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.model.business.BizBusinessOutsourceAssess;
+import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
+import com.casic.missiles.service.IGeneralApprovalService;
+import com.casic.missiles.service.business.IBizBusinessOutsourceAssessService;
 import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.BindingResult;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.validation.Valid;
+import java.util.List;
+
 /**
  * <p>
  * 计量检定业务-分包管理-测试、校准或检定工作分包评审表 前端控制器
@@ -15,6 +34,27 @@
 @Api(tags = "分包管理-测试、校准或检定工作分包评审表")
 @RestController
 @RequestMapping("/business/outsource/assess")
-public class BizBusinessOutsourceAssessController {
+public class BizBusinessOutsourceAssessController extends GeneralApprovalController<BizBusinessOutsourceAssess, BizBusinessOutsourceAssess, OutsourceAssessApprovalListRequest, BaseApprovalSubmitRequest> {
+    @Autowired
+    private IBizBusinessOutsourceAssessService outsourceAssessService;
 
+    public BizBusinessOutsourceAssessController(IGeneralApprovalService<BizBusinessOutsourceAssess, BizBusinessOutsourceAssess, OutsourceAssessApprovalListRequest, BaseApprovalSubmitRequest> baseApprovalService) {
+        super(baseApprovalService);
+    }
+
+    @ApiOperation("草稿箱-保存")
+    @PostMapping("/save")
+    public ReturnDTO<OutsourceAssessSaveResponse> saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceAssess request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        return outsourceAssessService.saveOutsourceAssess(request);
+    }
+
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception {
+        List<BizBusinessOutsourceAssess> list = super.exportList(request);
+        super.exportExcel(BizBusinessOutsourceAssess.class, list, ExportEnum.OUTSOURCE_ASSESS.getSheetName());
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java
new file mode 100644
index 0000000..9adef18
--- /dev/null
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java
@@ -0,0 +1,60 @@
+package com.casic.missiles.controller.business;
+
+import com.casic.missiles.controller.GeneralApprovalController;
+import com.casic.missiles.dto.BaseApprovalSubmitRequest;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.business.outsource.OutsourceProtocolApprovalListRequest;
+import com.casic.missiles.dto.business.outsource.OutsourceProtocolSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
+import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.model.business.BizBusinessOutsourceProtocol;
+import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
+import com.casic.missiles.service.IGeneralApprovalService;
+import com.casic.missiles.service.business.IBizBusinessOutsourceProtocolService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.BindingResult;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.validation.Valid;
+import java.util.List;
+
+/**
+ * <p>
+ * 计量检定业务-分包管理-测试、校准或检定工作分包协议书 前端控制器
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-08-24
+ */
+@Api(tags = "分包管理-测试、校准或检定工作分包协议书")
+@RestController
+@RequestMapping("/business/outsource/protocol")
+public class BizBusinessOutsourceProtocolController extends GeneralApprovalController<BizBusinessOutsourceProtocol, BizBusinessOutsourceProtocol, OutsourceProtocolApprovalListRequest, BaseApprovalSubmitRequest> {
+    @Autowired
+    private IBizBusinessOutsourceProtocolService outsourceProtocolService;
+
+    public BizBusinessOutsourceProtocolController(IGeneralApprovalService<BizBusinessOutsourceProtocol, BizBusinessOutsourceProtocol, OutsourceProtocolApprovalListRequest, BaseApprovalSubmitRequest> baseApprovalService) {
+        super(baseApprovalService);
+    }
+
+    @ApiOperation("草稿箱-保存")
+    @PostMapping("/save")
+    public ReturnDTO<OutsourceProtocolSaveResponse> saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceProtocol request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        return outsourceProtocolService.saveOutsourceProtocol(request);
+    }
+
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody OutsourceProtocolApprovalListRequest request) throws Exception {
+        List<BizBusinessOutsourceProtocol> list = super.exportList(request);
+        super.exportExcel(BizBusinessOutsourceProtocol.class, list, ExportEnum.OUTSOURCE_PROTOCOL.getSheetName());
+    }
+}
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java
index 097f645..f0f0943 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java
@@ -17,7 +17,6 @@
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.IGeneralApprovalService;
 import com.casic.missiles.service.business.IBizBusinessOutsourcerInfoService;
-import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -71,19 +70,8 @@
 
     @ApiOperation("分包方导出")
     @PostMapping("/listExport")
-    public void export(@RequestBody @Valid OutsourcerInfoApprovalListRequest request, BindingResult bindingResult) throws Exception {
-        if (bindingResult.hasErrors()) {
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        }
-        List<BizBusinessOutsourcerInfo> list;
-        if (!CollectionUtils.isEmpty(request.getIds())) {
-            list = outsourcerInfoService.listByIds(request.getIds());
-        } else {
-            list = outsourcerInfoService.list(request);
-        }
-        for (BizBusinessOutsourcerInfo record : list) {
-            DictCodeUtils.convertDictCodeToName(record);
-        }
+    public void export(@RequestBody OutsourcerInfoApprovalListRequest request) throws Exception {
+        List<BizBusinessOutsourcerInfo> list = super.exportList(request);
         super.exportExcel(BizBusinessOutsourcerInfo.class, list, ExportEnum.OUTSOURCER_EXPORT.getSheetName());
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java
index c2cbf9f..0410918 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java
@@ -17,11 +17,9 @@
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.IGeneralApprovalService;
 import com.casic.missiles.service.business.IBizBusinessSiteExecutiveInfoService;
-import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -60,7 +58,7 @@
         return siteExecutiveInfoService.saveSiteExecutiveInfo(siteExecutiveInfo);
     }
 
-    @ApiOperation("现场检测详情")
+    @ApiOperation("详情")
     @PostMapping("/detail")
     public ReturnDTO<SiteExecutiveDetailResponse> siteExecutiveDetail(@RequestBody @Valid IdDTO idDTO) throws Exception {
         Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
@@ -69,21 +67,10 @@
         return ReturnUtil.success(siteExecutiveInfoService.detail(idDTO.getId()));
     }
 
-    @ApiOperation("现场检测导出")
+    @ApiOperation("导出")
     @PostMapping("/listExport")
-    public void export(@RequestBody @Valid SiteExecutiveApprovalListRequest request, BindingResult bindingResult) throws Exception {
-        if (bindingResult.hasErrors()) {
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        }
-        List<SiteExecutiveApprovalListResponse> list;
-        if (!CollectionUtils.isEmpty(request.getIds())) {
-            list = siteExecutiveInfoService.listInfoByIds(request.getIds());
-        } else {
-            list = siteExecutiveInfoService.listInfo(request);
-        }
-        for (SiteExecutiveApprovalListResponse record : list) {
-            DictCodeUtils.convertDictCodeToName(record);
-        }
+    public void export(@RequestBody SiteExecutiveApprovalListRequest request) throws Exception {
+        List<SiteExecutiveApprovalListResponse> list = super.exportList(request);
         super.exportExcel(SiteExecutiveApprovalListResponse.class, list, ExportEnum.SITE_EXECUTIVE_EXPORT.getSheetName());
     }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
index 7e793cd..a92e209 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
@@ -55,7 +55,7 @@
 
     @ApiOperation("设备收发列表导出")
     @PostMapping("/export")
-    public void exportList(@RequestBody @Valid SampleDispatchListRequest request) throws IOException {
+    public void exportList(@RequestBody SampleDispatchListRequest request) throws IOException {
         List<SampleDispatchListResponse> list;
         if (!CollectionUtils.isEmpty(request.getIds())) {
             list = dispatchService.listByIds(request.getIds());
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java
index cdc77fc..d120fd4 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java
@@ -7,6 +7,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.business.labExecutive.*;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.business.IBusinessLabExecutiveInfoService;
@@ -14,6 +15,7 @@
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.*;
 
@@ -32,7 +34,7 @@
     @Autowired
     private IBusinessLabExecutiveInfoService labExecutiveInfoService;
 
-    @ApiOperation("实验室检测-部门检测-查询各状态列表（待检测、检测中、检测完）")
+    @ApiOperation("实验室任务-查询各状态列表（待检测、检测中、检测完）")
     @PostMapping("/deptExecutive/List")
     public ReturnDTO<PageInfoBT<SampleLabExecutiveListResponse>> queryDeptExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
@@ -43,10 +45,19 @@
         return ReturnUtil.success(super.packForBT(labExecutiveInfoService.deptLabExecutiveListPage(page, labExecutiveListRequest)));
     }
 
-    /**
-     * 实验室检测-我的检测-查询各状态列表（待检测、检测中、检测完）
-     */
-    @ApiOperation("实验室检测-我的检测-查询各状态列表（待检测、检测中、检测完）")
+    @ApiOperation("实验室任务导出")
+    @PostMapping("/deptExecutive/export")
+    public void deptExportList(@RequestBody @Valid SampleLabExecutiveListRequest request) throws Exception {
+        List<SampleLabExecutiveListResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = labExecutiveInfoService.deptLabExecutiveListByIds(request.getMeasureStatus(), request.getIds());
+        } else {
+            list = labExecutiveInfoService.deptLabExecutiveList(request);
+        }
+        super.exportExcel(SampleLabExecutiveListResponse.class, list, ExportEnum.DEPT_EXECUTIVE_TASK.getSheetName());
+    }
+
+    @ApiOperation("我的任务-查询各状态列表（待检测、检测中、检测完）")
     @PostMapping("/myExecutive/list")
     public ReturnDTO<PageInfoBT<SampleLabExecutiveListResponse>> queryMyExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
@@ -57,19 +68,25 @@
         return ReturnUtil.success(super.packForBT(labExecutiveInfoService.myLabExecutiveListPage(page, labExecutiveListRequest)));
     }
 
-    /**
-     * 实验室检测-我的检测-查询各状态样品数量（待检测、检测中、检测完）
-     */
-    @ApiOperation("实验室检测-我的检测-查询各状态样品数量（待检测、检测中、检测完）")
+    @ApiOperation("我的任务导出")
+    @PostMapping("/myExecutive/export")
+    public void exportList(@RequestBody @Valid SampleLabExecutiveListRequest request) throws Exception {
+        List<SampleLabExecutiveListResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = labExecutiveInfoService.myLabExecutiveListByIds(request.getMeasureStatus(), request.getIds());
+        } else {
+            list = labExecutiveInfoService.myLabExecutiveList(request);
+        }
+        super.exportExcel(SampleLabExecutiveListResponse.class, list, ExportEnum.MY_EXECUTIVE_TASK.getSheetName());
+    }
+
+    @ApiOperation("我的任务-查询各状态样品数量（待检测、检测中、检测完）")
     @GetMapping("/myExecutive/amount")
     public ReturnDTO<List<SampleAmountResponse>> queryMyExecutiveAmount() {
         return ReturnUtil.success(labExecutiveInfoService.myExecutiveAmount());
     }
 
-    /**
-     * 实验室检测-部门检测-分配（分配给具体人员）
-     */
-    @ApiOperation("实验室检测-部门检测-分配按钮（分配给具体人员）")
+    @ApiOperation("实验室任务-分配按钮（分配给具体人员）")
     @PostMapping("/deptExecutive/allocate")
     public ReturnDTO allocateStaff(@RequestBody @Valid SampleAllocateRequest sampleAllocateRequest, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -78,10 +95,7 @@
         return labExecutiveInfoService.allocateStaff(sampleAllocateRequest);
     }
 
-    /**
-     * 实验室检测-我的检测-检定人扫描收入（待检测->检测中）
-     */
-    @ApiOperation("实验室检测-我的检测-检定人扫描收入（待检测->检测中）")
+    @ApiOperation("我的任务-检定人扫描收入（待检测->检测中）")
     @PostMapping("/myExecutive/receive")
     public ReturnDTO sampleReceive(@RequestBody @Valid List<SampleOperateRequest> requestList, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -90,10 +104,7 @@
         return labExecutiveInfoService.sampleReceive(requestList);
     }
 
-    /**
-     * 实验室检测-负责人/检定人扫描检完（检测中->检测完）
-     */
-    @ApiOperation("实验室检测-负责人/检定人扫描检完（检测中->检测完）")
+    @ApiOperation("实验室任务-负责人/检定人扫描检完（检测中->检测完）")
     @PostMapping("/myExecutive/complete")
     public ReturnDTO sampleExecutiveComplete(@RequestBody @Valid List<SampleOperateRequest> requestList, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -102,10 +113,7 @@
         return labExecutiveInfoService.sampleExecutiveComplete(requestList);
     }
 
-    /**
-     * 实验室检测-部门检测/我的检测 编辑（只能修改应出具证书）
-     */
-    @ApiOperation("实验室检测-部门检测/我的检测 编辑（只能修改应出具证书）")
+    @ApiOperation("实验室任务/我的任务 编辑（只能修改应出具证书）")
     @PostMapping("/executive/update")
     public ReturnDTO updateExecutive(@RequestBody @Valid UpdateExecutiveRequest request, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -114,10 +122,7 @@
         return labExecutiveInfoService.updateExecutive(request);
     }
 
-    /**
-     * 实验室检测-部门检测/我的检测 详情
-     */
-    @ApiOperation("实验室检测-部门检测/我的检测 详情")
+    @ApiOperation("实验室任务/我的任务 详情")
     @PostMapping("/executive/detail")
     public ReturnDTO<ExecutiveDetailResponse> executiveDetail(@RequestBody @Valid ExecutiveDetailRequest request, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
@@ -131,7 +136,7 @@
      * 退回后会将下一个要执行的实验室检测状态更新为待分配，将后面的实验室顺序变更为连续（都进行减1）
      * 最后一个检测的实验室退回，等分发员再增加实验室或设备收发中的已收入直接手动点击完成
      */
-    @ApiOperation("实验室检测-部门检测/我的检测 退回（待检测/检测中->退回）")
+    @ApiOperation("实验室任务/我的任务 退回（待检测/检测中->退回）")
     @PostMapping("/executive/sendBack")
     public ReturnDTO executiveSendBack(@RequestBody @Valid ExecutiveSendBackRequest request, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -140,9 +145,6 @@
         return labExecutiveInfoService.sampleExecutiveSendBack(request);
     }
 
-    /**
-     * 分发员编辑实验室检测列表
-     */
     @ApiOperation("分发员编辑实验室检测列表")
     @PostMapping("/handOut/updateList")
     public ReturnDTO updateExecutiveList(@RequestBody @Valid UpdateExecutiveListRequest request, BindingResult bindingResult) {
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java
index 48a67ed..0c04f31 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java
@@ -10,6 +10,7 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.resource.customer.CustomerApprovalListRequest;
 import com.casic.missiles.dto.resource.customer.CustomerSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceCustomerInfo;
@@ -26,6 +27,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -55,6 +57,13 @@
         return customerInfoService.saveCustomerInfo(request);
     }
 
+    @ApiOperation("委托方名录导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody CustomerApprovalListRequest request) throws Exception {
+        List<BizResourceCustomerInfo> list = super.exportList(request);
+        super.exportExcel(BizResourceCustomerInfo.class, list, ExportEnum.CUSTOMER_INFO.getSheetName());
+    }
+
     @ApiOperation("委托方人员列表（分页）")
     @PostMapping("/person/listPage")
     public ReturnDTO<PageInfoBT<BizResourceCustomerStaff>> personListPage(@RequestBody IdDTO idDto) {
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
index 972ed4b..6418ea5 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
@@ -5,6 +5,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.resource.customer.SuggestFormApprovalListRequest;
 import com.casic.missiles.dto.resource.customer.SuggestFormSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceCustomerSuggestForm;
@@ -20,6 +21,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -50,4 +52,11 @@
         return suggestFormService.saveSuggestForm(request);
     }
 
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody SuggestFormApprovalListRequest request) throws Exception {
+        List<BizResourceCustomerSuggestForm> list = super.exportList(request);
+        super.exportExcel(BizResourceCustomerSuggestForm.class, list, ExportEnum.CUSTOMER_SUGGEST_FORM.getSheetName());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java
index 1934d1a..9e07eab 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java
@@ -15,12 +15,16 @@
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.resource.IEnvEnvironmentRecordConfigService;
 import com.casic.missiles.service.resource.IEnvEnvironmentRecordDataService;
+import com.casic.missiles.service.resource.IEnvLocationInfoService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
 import java.util.List;
@@ -39,6 +43,8 @@
     private IEnvEnvironmentRecordDataService environmentRecordDataService;
     @Autowired
     private IEnvEnvironmentRecordConfigService environmentRecordConfigService;
+    @Autowired
+    private IEnvLocationInfoService locationInfoService;
 
     @ApiOperation("环境记录单数据列表/详情")
     @PostMapping("/data/listPage")
@@ -95,4 +101,11 @@
         });
         return environmentRecordConfigService.deleteEnvironmentRecordConfig(idDTO.getId());
     }
+
+    @ApiOperation("地点列表")
+    @PostMapping("/location/listPage")
+    public ReturnDTO<PageInfoBT<LocationListResponse>> locationListPage(@RequestBody @Valid LocationListRequest request) {
+        Page<LocationListResponse> page = PageFactory.defaultPage();
+        return ReturnUtil.success(super.packForBT(locationInfoService.listPage(page, request)));
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java
index 82efe3f..e9561fa 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java
@@ -10,6 +10,7 @@
 import com.casic.missiles.dto.resource.seal.SealLogListRequest;
 import com.casic.missiles.dto.resource.seal.SealNoteApprovalListRequest;
 import com.casic.missiles.dto.resource.seal.SealNoteSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceSealUseLog;
@@ -27,6 +28,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -58,6 +60,13 @@
         return sealUseNoteService.saveSeal(request);
     }
 
+    @ApiOperation("印章使用登记导出（列表和导出中去掉经办人和监印人）")
+    @PostMapping("/listExport")
+    public void export(@RequestBody SealNoteApprovalListRequest request) throws Exception {
+        List<BizResourceSealUseNote> list = super.exportList(request);
+        super.exportExcel(BizResourceSealUseNote.class, list, ExportEnum.SEAL_NOTE.getSheetName());
+    }
+
     // TODO: 2023/7/28 印章使用日志：系统中使用印章时插入数据库
 
     @ApiOperation("印章使用日志列表（分页）")
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java
index 9b674fc..06b6521 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java
@@ -9,16 +9,20 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.resource.staff.StaffCertRequest;
 import com.casic.missiles.dto.resource.staff.StaffCertResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.service.resource.IBizResourceStaffInfoService;
 import com.casic.missiles.service.resource.IBizResourceStaffVerifierService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.List;
+
 /**
  * @Description:
  * @Author: wangpeng
@@ -41,9 +45,21 @@
         return ReturnUtil.success(super.packForBT(responsePage));
     }
 
+    @ApiOperation("证书逾期提醒导出")
+    @PostMapping("/listExport")
+    public void exportList(@RequestBody StaffCertRequest request) throws Exception {
+        List<StaffCertResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = staffInfoService.certListByIds(request.getIds());
+        } else {
+            list = staffInfoService.certList(request);
+        }
+        super.exportExcel(StaffCertResponse.class, list, ExportEnum.STAFF_CERTIFICATE_EXPIRE.getSheetName());
+    }
+
     @ApiOperation("证书逾期提醒")
     @PostMapping("/expirationReminder")
-    public ReturnDTO expirationReminder(@RequestBody IdDTO idDto) {
-        return verifierService.expirationReminder(idDto);
+    public ReturnDTO expirationReminder(@RequestBody IdDTO idDTO) {
+        return verifierService.expirationReminder(idDTO);
     }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java
index 3b251ad..a6e7850 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java
@@ -12,6 +12,7 @@
 import com.casic.missiles.dto.resource.staff.StaffListRequest;
 import com.casic.missiles.dto.resource.staff.TrainListRequest;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.*;
@@ -22,7 +23,10 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
 import java.util.List;
@@ -52,8 +56,19 @@
             throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
         }
         Page<BizResourceStaffInfo> page = PageFactory.defaultPage();
-        Page<BizResourceStaffInfo> responsePage = staffInfoService.listPage(page, request);
-        return ReturnUtil.success(super.packForBT(responsePage));
+        return ReturnUtil.success(super.packForBT(staffInfoService.listPage(page, request)));
+    }
+
+    @ApiOperation("人员登记导出")
+    @PostMapping("/listExport")
+    public void exportList(@RequestBody StaffListRequest request) throws Exception {
+        List<BizResourceStaffInfo> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = staffInfoService.listByIds(request.getIds());
+        } else {
+            list = staffInfoService.list(request);
+        }
+        super.exportExcel(BizResourceStaffInfo.class, list, ExportEnum.STAFF_INFO.getSheetName());
     }
 
     @ApiOperation("人员登记详情基础信息")
@@ -85,9 +100,9 @@
 
     @ApiOperation("科研教育列表（分页）")
     @PostMapping("/education/listPage")
-    public ReturnDTO<PageInfoBT<BizResourceStaffEducation>> educationListPage(@RequestBody IdDTO idDto) {
+    public ReturnDTO<PageInfoBT<BizResourceStaffEducation>> educationListPage(@RequestBody IdDTO idDTO) {
         Page<BizResourceStaffEducation> page = PageFactory.defaultPage();
-        Page<BizResourceStaffEducation> responsePage = staffInfoService.educationListPage(page, idDto);
+        Page<BizResourceStaffEducation> responsePage = staffInfoService.educationListPage(page, idDTO);
         return ReturnUtil.success(super.packForBT(responsePage));
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java
index af6aa86..d85d84a 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java
@@ -9,6 +9,7 @@
 import com.casic.missiles.dto.resource.outsideService.SupplierApprovalListRequest;
 import com.casic.missiles.dto.resource.outsideService.SupplierSaveResponse;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceSupplierAbility;
@@ -67,6 +68,13 @@
         return ReturnUtil.success(supplierInfoService.detail(idDTO.getId()));
     }
 
+    @ApiOperation("合格供方导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody SupplierApprovalListRequest request) throws Exception {
+        List<BizResourceSupplierInfo> list = super.exportList(request);
+        super.exportExcel(BizResourceSupplierInfo.class, list, ExportEnum.SUPPLIER_INFO.getSheetName());
+    }
+
     @ApiOperation("供方人员列表（分页）")
     @PostMapping("/person/listPage")
     public ReturnDTO<PageInfoBT<BizResourceSupplierPerson>> personListPage(@RequestBody IdDTO idDTO) {
diff --git a/casic-metering-api/src/main/resources/config/application.yml b/casic-metering-api/src/main/resources/config/application.yml
index 350db5f..ecff521 100644
--- a/casic-metering-api/src/main/resources/config/application.yml
+++ b/casic-metering-api/src/main/resources/config/application.yml
@@ -126,7 +126,7 @@
     #作者
     author: wangpeng
     #待生成对象表名
-    table-name: biz_equipment_technical_target_approval,biz_equipment_attachment_approval,biz_equipment_checkpoint_approval
+    table-name: biz_business_outsource_protocol
 
 reminder:
   #节点--common模块config包 ReminderNodeConfig配置
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
index 4a19e4e..d47d552 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
@@ -53,6 +53,7 @@
     SUGGEST_FORM_SAVE_FAILED(2509, "委托方意见登记表保存至草稿箱失败"),
     EXAMINE_FORM_SAVE_FAILED(2510, "要求、委托书及合同评审表保存至草稿箱失败"),
     CUSTOMER_EXIST_SAVE_FAILED(2511, "该委托方已存在，请重新选择"),
+    DUPLICATE_LOCATION_NO(2512, "地点编号已存在"),
 
     /**
      * 计量检定业务模块
@@ -68,6 +69,8 @@
     COMPLETE_SAMPLE_NOT_EXIST(2609, "检测中不存在扫描收入的样品"),
     CANNOT_CHANGE_MEASURE_INFO(2610, "无法更改非当前登录用户的检测信息"),
     NON_EXIST_ORDER_OR_SAMPLE(2611, "不存在该委托单或该委托单下的样品"),
+    OUTSOURCE_ACCESS_SAVE_FAILED(2612, "测试、校准或检定工作分包评审表保存至草稿箱失败"),
+    OUTSOURCE_PROTOCOL_SAVE_FAILED(2613, "测试、校准或检定工作分包协议书保存至草稿箱失败"),
 
     /**
      * 历史遗留备用
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
index 5089ad1..81a406b 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
@@ -10,54 +10,38 @@
     /**
      * 资源管理
      */
-    ENVIRONMENT_DATA_EXPORT("environmentData", "environmentData", "环境记录单数据"),
+    ENVIRONMENT_DATA_EXPORT("environmentData", "环境记录单数据", "环境记录单数据"),
+    STAFF_INFO("staffInfo", "人员登记", "人员登记"),
+    STAFF_CERTIFICATE_EXPIRE("certificateExpire", "证书逾期提醒", "证书逾期提醒"),
+    SUPPLIER_INFO("supplierInfo", "合格供方名录", "合格供方名录"),
+    CUSTOMER_INFO("customerInfo", "委托方名录", "委托方名录"),
+    CUSTOMER_SUGGEST_FORM("customerSuggestForm", "委托方意见登记表", "委托方意见登记表"),
+    SEAL_NOTE("sealNote", "印章使用登记", "印章使用登记"),
 
-    FILE_EXPORT("meterFileData", "meterFileData", "计量文件信息"),
-    TRAIN_PLAN_EXPORT("trainPlanData", "trainPlanData", "培训计划"),
-    TRAIN_LOG_EXPORT("trainLogData", "trainLogData", "培训记录"),
-    METER_ORGANIZE_EXPORT("meterOrganizeData", "meterOrganizeData", "计量组织"),
-    TRACE_SUPPLIER_EXPORT("traceSupplierData", "traceSupplierData", "溯源供方"),
-    SIGN_EXPORT("signData", "signData", "签名/签章"),
-    TEMPLATE_EXPORT("templateData", "templateData", "原始记录模板/证书报告模板"),
-    FIXED_ASSETS("meterFixedAssets", "meterFixedAssets", "固定资产"),
-    METER_EQUIPMENT("meterEquipment", "meterEquipment", "测量设备"),
-    CALIBRATION_TEST_EQUIPMENT("calibrationTestEquipment", "calibrationTestEquipment", "校准检定设备"),
-    MEASURE_ACCOUNT("measureAccount", "measureAccount", "测量工装"),
-    STANDARD_SUPPORT_EQUIPMENT("standardSupportEquipment", "standardSupportEquipment", "标准配套设备"),
-    STANDARD_EQUIPMENT("standardEquipment", "standardEquipment", "标准装置"),
-    FLOW_DEF_EXPORT("flowDefData", "flowDefData", "流程定义"),
-    STAFF_CERTIFICATE("certificate", "certificate", "计量人员证书"),
-    CHECK_INFO("checkInfo", "checkInfo", "设备管理点检测"),
-    EQUIPMENT_APPLY("equipmentApply", "equipmentApply", "设备借用"),
-    STANDARD_EQUIPMENT_REMIND("equipmentApplyRemind", "equipmentApplyRemind", "标准装置到期提醒"),
-    METER_PRICE("meterPrice", "meterPrice", "价格库"),
-    METER_STAFF("meterStaff", "meterStaff", "计量人员"),
-    STANDARD_EQUIPMENT_APPLY("standardEquipmentApply", "standardEquipmentApply", "标准装置申请"),
-    STATE_MANAGE_APPLY("stateManage", "stateManage", "状态管理"),
-    METER_ACCEPTANCE_CHECK("acceptanceCheck", "acceptanceCheck", "设备检修保养验收单"),
-    CUSTOMER_EXPORT("customerData", "customerData", "客户信息"),
-    ORDER_EXPORT("orderData", "orderData", "委托书信息"),
-    SAMPLE_EXPORT("sampleData", "sampleData", "样本信息"),
-    EXCHANGE_DATA("exchangeData", "exchangeData", "设备交接单"),
-    DISPATCH_DATA("dispatchData", "dispatchData", "设备收发"),
-    ENVIRONMENT_DATA("environmentData", "environmentData", "环境记录单"),
-    ORIGIN_DATA("originData", "originData", "原始记录"),
-    CERTIFICATE_REPORT("certificateReport", "certificateReport", "证书报告"),
-    ADVICE_EXPORT("adviceData", "adviceData", "客户反馈"),
-    HANDOUT_EXPORT("handoutData", "handoutData", "任务分发列表"),
-    OUTSOURCER_EXPORT("outsourcerData", "outsourcerData", "分包方"),
-    SITE_EXECUTIVE_EXPORT("siteExecutiveData", "siteExecutiveData", "现场测试、校准或检定"),
-    CERTIFICATE_PRINT_EXPORT("certificatePrintData", "certificatePrintData", "证书打印"),
-    DOWNLOAD_TEMPLATE("downloadTemplate", "downloadTemplate", "页面配置"),
-    OUTSOURCER_CERTIFICATE_EXPORT("outsourceCertificateData", "outsourceCertificateData", "分包证书"),
-    SETTLEMENT_INFO_EXPORT("settlementInfoData", "settlementInfoData", "业务结算"),
-    EQUIPMENT_REMIND("equipmentRemind", "equipmentRemind", "设备到期提醒"),
-    AGREEMENT_INFO_EXPORT("agreementInfoData", "agreementInfoData", "合同"),
-    WORK_STATISTICS_EXPORT("workStatisticsData", "workStatisticsData", "实时工作统计"),
-    DEPT_OUTPUT_EXPORT("deptOutputData", "deptOutputData", "部门产值分析"),
-    WORKLOAD_EXPORT("workloadData", "workloadData", "业务工作量分析"),
-    DEPT_COMPREHENSIVE_EXPORT("deptComprehensiveData", "deptComprehensiveData", "部门综合分析"),
-    ENVIRONMENTAL_RECORD("environmentalRecordData", "environmentalRecordData", "现场环境记录");
+    /**
+     * 计量检定业务
+     */
+    OUTSOURCER_EXPORT("outsourcerData", "分包方名录", "分包方名录"),
+    IDENTIFY_EXPORT("identifyData", "计量标识", "计量标识"),
+    ORDER_EXPORT("orderData", "任务单", "任务单"),
+    DISPATCH_DATA("dispatchData", "设备收发", "设备收发"),
+    HANDOUT_EXPORT("handoutData", "任务分发", "任务分发"),
+    SITE_EXECUTIVE_EXPORT("siteExecutiveData", "现场测试、校准或检定", "现场测试、校准或检定"),
+    CERTIFICATE_REPORT("certificateReport", "证书审批", "证书审批"),
+    CERTIFICATE_CHANGE_APPLY("certificateChangeApply", "证书报告补充或更换申请单", "证书报告补充或更换申请单"),
+    CERTIFICATE_PRINT("certificatePrintData", "证书打印审批", "证书打印审批"),
+    DEPT_EXECUTIVE_TASK("deptExecutiveTaskData", "实验室任务", "实验室任务"),
+    MY_EXECUTIVE_TASK("myExecutiveTaskData", "我的任务", "我的任务"),
+    OUTSOURCE_ASSESS("outsourceAssess", "测试、校准或检定工作分包评审表", "测试、校准或检定工作分包评审表"),
+    OUTSOURCE_PROTOCOL("outsourceProtocol", "测试、校准或检定工作分包协议书", "测试、校准或检定工作分包协议书"),
+
+    /**
+     * 系统管理
+     */
+    SIGN_EXPORT("signData", "签名", "签名"),
+    TEMPLATE_EXPORT("templateData", "文件模板", "文件模板"),
+    FLOW_DEF_EXPORT("flowDefData", "流程定义", "流程定义"),
+    DOWNLOAD_TEMPLATE("downloadTemplate", "流程定义", "页面配置");
 
     ExportEnum(String fileName, String sheetName, String description) {
         this.fileName = fileName;
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateRecordTypeCodeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateRecordTypeCodeEnum.java
index 31d913c..a963522 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateRecordTypeCodeEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateRecordTypeCodeEnum.java
@@ -46,4 +46,14 @@
     String SITE_EXECUTIVE_APPROVAL = "01";
     //《现场测试、校准或检定工作记录表》
     String SITE_EXECUTIVE_LOG = "02";
+
+    //测试、校准或检定工作分包协议书
+    String OUTSOURCE_PROTOCOL = "01";
+    //测试、校准或检定工作分包评审表
+    String OUTSOURCE_ACCESS = "02";
+    //测试、校准或检定工作分包通知书
+    String OUTSOURCE_NOTICE = "03";
+    //测试、校准或检定工作分包方名录
+    String OUTSOURCE_INFO = "04";
+
 }
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
index 24b8635..f78bd53 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
@@ -15,6 +15,10 @@
     String CERTIFICATE_CHANGE_APPLY_BEAN_NAME = "certificateChangeApplyBean";
     //现场测试、校准或检定
     String SITE_EXECUTIVE_BEAN_NAME = "siteExecutiveBean";
+    //测试、校准或检定工作分包评审表
+    String OUTSOURCE_ASSESS_BEAN_NAME = "outsourceAssessBean";
+    //测试、校准或检定工作分包协议书
+    String OUTSOURCE_PROTOCOL_BEAN_NAME = "outsourceProtocolBean";
 
     /*********************************设备与装置************************************/
     //设备台账
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 b21c661..6b86fd1 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
@@ -18,6 +18,8 @@
     OUTSOURCER_APPROVAL(OUTSOURCER_BEAN_NAME, ""),
     CERTIFICATE_CHANGE_APPROVAL(CERTIFICATE_CHANGE_APPLY_BEAN_NAME, ""),
     SITE_EXECUTIVE_APPROVAL(SITE_EXECUTIVE_BEAN_NAME, ""),
+    OUTSOURCE_ASSESS_APPROVAL(OUTSOURCE_ASSESS_BEAN_NAME, ""),
+    OUTSOURCE_PROTOCOL_APPROVAL(OUTSOURCE_PROTOCOL_BEAN_NAME, ""),
 
     ACTION_STATUS_MAP(new HashMap<String, AwareActionStatusEnum>() {
         {
@@ -47,6 +49,10 @@
             put(ApplyFromIdEnum.CERTIFICATE_CHANGE_APPROVAL.getCode(), CERTIFICATE_CHANGE_APPROVAL);
             //现场测试、校准或检定审批
             put(ApplyFromIdEnum.SITE_EXECUTIVE_APPROVAL.getCode(), SITE_EXECUTIVE_APPROVAL);
+            //测试、校准或检定工作分包评审表
+            put(ApplyFromIdEnum.OUTSOURCE_ASSESS_APPROVAL.getCode(), OUTSOURCE_ASSESS_APPROVAL);
+            //测试、校准或检定工作分包协议书
+            put(ApplyFromIdEnum.OUTSOURCE_PROTOCOL_APPROVAL.getCode(), OUTSOURCE_PROTOCOL_APPROVAL);
         }
     });
     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 934405e..c7410bd 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
@@ -9,6 +9,8 @@
     CERTIFICATE_CHANGE_APPROVAL("jljdywzsbchghsqd", MessageSourceModuleEnum.BUSINESS.getCode(), "证书/报告补充或更换申请单"),
     OUTSOURCER_APPROVAL("jljdywcsjzhgfbfml", MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定合格分包方名录"),
     SITE_EXECUTIVE_APPROVAL("jljdywxccsjzsp", MessageSourceModuleEnum.BUSINESS.getCode(), "现场测试、校准或检定审批"),
+    OUTSOURCE_ASSESS_APPROVAL("jljdywcsjzfbpsb", MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包评审表"),
+    OUTSOURCE_PROTOCOL_APPROVAL("jljdywcsjzfbxys", MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包协议书"),
 
 
     /*******************************************设备与装置*********************************************/
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/GeneralApprovalMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/GeneralApprovalMapper.java
index 4fb7344..0c9d6ae 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/GeneralApprovalMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/GeneralApprovalMapper.java
@@ -17,8 +17,4 @@
 
     Page<O> selectBatchForApprovalList(Page<O> page, @Param("request") R request, @Param("businessKeys") List<String> businessKeys);
 
-//    Page<O> selectListPage(Page<O> page, @Param("request") R request);
-
-//    Long selectMaxNo();
-
 }
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceAssessMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceAssessMapper.java
index 7867bb8..ba59009 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceAssessMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceAssessMapper.java
@@ -1,7 +1,12 @@
 package com.casic.missiles.mapper.business;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.business.outsource.OutsourceAssessApprovalListRequest;
+import com.casic.missiles.mapper.GeneralApprovalMapper;
 import com.casic.missiles.model.business.BizBusinessOutsourceAssess;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * <p>
@@ -11,6 +16,10 @@
  * @author wangpeng
  * @since 2023-08-16
  */
-public interface BizBusinessOutsourceAssessMapper extends BaseMapper<BizBusinessOutsourceAssess> {
+public interface BizBusinessOutsourceAssessMapper extends GeneralApprovalMapper<BizBusinessOutsourceAssess, BizBusinessOutsourceAssess, OutsourceAssessApprovalListRequest> {
+
+    Page<BizBusinessOutsourceAssess> selectBatchForApprovalList(Page<BizBusinessOutsourceAssess> page, @Param("request") OutsourceAssessApprovalListRequest request, @Param("businessKeys") List<String> businessKeys);
+
+    Long selectMaxProjectNo();
 
 }
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceProtocolMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceProtocolMapper.java
new file mode 100644
index 0000000..e6aba35
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceProtocolMapper.java
@@ -0,0 +1,24 @@
+package com.casic.missiles.mapper.business;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.business.outsource.OutsourceProtocolApprovalListRequest;
+import com.casic.missiles.mapper.GeneralApprovalMapper;
+import com.casic.missiles.model.business.BizBusinessOutsourceProtocol;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 计量检定业务-分包管理-测试、校准或检定工作分包协议书 Mapper 接口
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-08-24
+ */
+public interface BizBusinessOutsourceProtocolMapper extends GeneralApprovalMapper<BizBusinessOutsourceProtocol, BizBusinessOutsourceProtocol, OutsourceProtocolApprovalListRequest> {
+
+    Page<BizBusinessOutsourceProtocol> selectBatchForApprovalList(Page<BizBusinessOutsourceProtocol> page, @Param("request") OutsourceProtocolApprovalListRequest request, @Param("businessKeys") List<String> businessKeys);
+
+    Long selectMaxProtocolNo();
+}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/EnvLocationInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/EnvLocationInfoMapper.java
new file mode 100644
index 0000000..49eff87
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/EnvLocationInfoMapper.java
@@ -0,0 +1,21 @@
+package com.casic.missiles.mapper.resource;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.resource.environment.LocationListRequest;
+import com.casic.missiles.dto.resource.environment.LocationListResponse;
+import com.casic.missiles.model.resource.EnvLocationInfo;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * <p>
+ * 实验室环境监控系统-设备表 Mapper 接口
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-06-07
+ */
+public interface EnvLocationInfoMapper extends BaseMapper<EnvLocationInfo> {
+
+    Page<LocationListResponse> selectLocationListPage(Page<LocationListResponse> page, @Param("request") LocationListRequest request);
+}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java
index de124db..85ed0f7 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java
@@ -1,7 +1,9 @@
 package com.casic.missiles.mapper.system;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.dto.system.SignDetailResponse;
+import com.casic.missiles.dto.system.SignListRequest;
 import com.casic.missiles.model.system.SystemSign;
 import org.apache.ibatis.annotations.Param;
 
@@ -22,4 +24,8 @@
     SignDetailResponse selectSignDetailById(Long id);
 
     List<SystemSign> selectUsableSignList(@Param("userId") Long userId);
+
+    Page<SystemSign> selectSignListPage(Page<SystemSign> page, @Param("request") SignListRequest request);
+
+    List<SystemSign> selectSignList(@Param("request") SignListRequest request);
 }
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateChangeApplyMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateChangeApplyMapper.xml
index d798447..c496092 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateChangeApplyMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateChangeApplyMapper.xml
@@ -30,31 +30,31 @@
         SELECT *
         FROM biz_business_certificate_change_apply
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.changeApplyNo != null and request.changeApplyNo !=''">
+        <if test="request != null and request.changeApplyNo != null and request.changeApplyNo !=''">
             and change_apply_no like concat('%',#{request.changeApplyNo},'%')
         </if>
-        <if test="request.changeReportNo != null and request.changeReportNo !=''">
+        <if test="request != null and request.changeReportNo != null and request.changeReportNo !=''">
             and change_report_no like concat('%',#{request.changeReportNo},'%')
         </if>
-        <if test="request.changeReportName != null and request.changeReportName !=''">
+        <if test="request != null and request.changeReportName != null and request.changeReportName !=''">
             and change_report_name like concat('%',#{request.changeReportName},'%')
         </if>
-        <if test="request.changeType != null and request.changeType !=''">
+        <if test="request != null and request.changeType != null and request.changeType !=''">
             and change_type = #{request.changeType}
         </if>
-        <if test="request.createUserName != null and request.createUserName !=''">
+        <if test="request != null and request.createUserName != null and request.createUserName !=''">
             and create_user_name like concat('%',#{request.createUserName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificatePrintMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificatePrintMapper.xml
index b66cd99..49c0ac8 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificatePrintMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificatePrintMapper.xml
@@ -31,34 +31,34 @@
         LEFT JOIN biz_business_order_sample_relation bosr ON (bosr.order_id = bcr.order_id AND bosr.sample_id = bcr.sample_id)
         LEFT JOIN biz_business_order_info boi ON boi.id = bosr.order_id
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and bcp.approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.printStatus != null and request.printStatus !=''">
+        <if test="request != null and request.printStatus != null and request.printStatus !=''">
             and print_status = #{request.printStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and bcp.create_user_id = #{request.createUserId}
         </if>
-        <if test="request.certificateReportNo != null and request.certificateReportNo !=''">
+        <if test="request != null and request.certificateReportNo != null and request.certificateReportNo !=''">
             and bcr.certificate_report_no like concat('%',#{request.certificateReportNo},'%')
         </if>
-        <if test="request.certificateReportName != null and request.certificateReportName !=''">
+        <if test="request != null and request.certificateReportName != null and request.certificateReportName !=''">
             and bcr.certificate_report_name like concat('%',#{request.certificateReportName},'%')
         </if>
-        <if test="request.customerName != null and request.customerName !=''">
+        <if test="request != null and request.customerName != null and request.customerName !=''">
             and boi.customer_name like concat('%',#{request.customerName},'%')
         </if>
-        <if test="request.sampleNo != null and request.sampleNo !=''">
+        <if test="request != null and request.sampleNo != null and request.sampleNo !=''">
             and bosr.sample_no like concat('%',#{request.sampleNo},'%')
         </if>
-        <if test="request.sampleName != null and request.sampleName !=''">
+        <if test="request != null and request.sampleName != null and request.sampleName !=''">
             and bosr.sample_name like concat('%',#{request.sampleName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and bcp.create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and bcp.create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml
index b366034..767695d 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml
@@ -46,33 +46,37 @@
         SELECT bcr.*, bosr.sample_no, bosr.sample_name, bosr.sample_model, rsi.staff_name
         FROM biz_business_certificate_report bcr
         LEFT JOIN biz_business_order_sample_relation bosr ON (bosr.order_id = bcr.order_id AND bosr.sample_id = bcr.sample_id)
+        LEFT JOIN biz_business_order_info boi ON boi.id = bcr.order_id
         LEFT JOIN biz_resource_staff_info rsi ON rsi.id = bcr.measure_person_id
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and bcr.approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and bcr.create_user_id = #{request.createUserId}
         </if>
-        <if test="request.certificateReportNo != null and request.certificateReportNo !=''">
+        <if test="request != null and request.customerId != null and request.customerId !=''">
+            and boi.customer_id = #{request.customerId}
+        </if>
+        <if test="request != null and request.certificateReportNo != null and request.certificateReportNo !=''">
             and bcr.certificate_report_no like concat('%',#{request.certificateReportNo},'%')
         </if>
-        <if test="request.certificateReportName != null and request.certificateReportName !=''">
+        <if test="request != null and request.certificateReportName != null and request.certificateReportName !=''">
             and bcr.certificate_report_name like concat('%',#{request.certificateReportName},'%')
         </if>
-        <if test="request.sampleNo != null and request.sampleNo !=''">
+        <if test="request != null and request.sampleNo != null and request.sampleNo !=''">
             and bosr.sample_no like concat('%',#{request.sampleNo},'%')
         </if>
-        <if test="request.measureCategory != null and request.measureCategory !=''">
+        <if test="request != null and request.measureCategory != null and request.measureCategory !=''">
             and bcr.measure_category = #{request.measureCategory}
         </if>
-        <if test="request.measurePerson != null and request.measurePerson !=''">
+        <if test="request != null and request.measurePerson != null and request.measurePerson !=''">
             and rsi.staff_name like concat('%',#{request.measurePerson},'%')
         </if>
-        <if test="request.calibrationTimeStart != null and request.calibrationTimeStart !=''">
+        <if test="request != null and request.calibrationTimeStart != null and request.calibrationTimeStart !=''">
             and bcr.calibration_time &gt;= #{request.calibrationTimeStart}
         </if>
-        <if test="request.calibrationTimeEnd != null and request.calibrationTimeEnd !=''">
+        <if test="request != null and request.calibrationTimeEnd != null and request.calibrationTimeEnd !=''">
             and bcr.calibration_time &lt;= #{request.calibrationTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceAssessMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceAssessMapper.xml
index d0fcf8b..c22c101 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceAssessMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceAssessMapper.xml
@@ -7,6 +7,8 @@
         <id column="id" property="id" />
         <result column="project_no" property="projectNo" />
         <result column="project_name" property="projectName" />
+        <result column="lab_code" property="labCode" />
+        <result column="group_code" property="groupCode" />
         <result column="applicant_id" property="applicantId" />
         <result column="applicant_name" property="applicantName" />
         <result column="applicant_time" property="applicantTime" />
@@ -31,7 +33,45 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, project_no, project_name, applicant_id, applicant_name, applicant_time, minio_file_name, remark, create_user_id, create_user_name, outsourcer_id, pre_start_time, pre_end_time, outsource_reason, pre_cost, approval_status, process_id, approve_situation, traceability, test_method, technique_ability, create_time, update_time
+        id, project_no, project_name, lab_code, group_code, applicant_id, applicant_name, applicant_time, minio_file_name, remark, create_user_id, create_user_name, outsourcer_id, pre_start_time, pre_end_time, outsource_reason, pre_cost, approval_status, process_id, approve_situation, traceability, test_method, technique_ability, create_time, update_time
     </sql>
 
+    <select id="selectMaxProjectNo" resultType="java.lang.Long">
+        SELECT IFNULL(max(RIGHT(project_no, 3)), 0) from biz_business_outsource_assess
+    </select>
+
+    <select id="selectBatchForApprovalList" resultMap="BaseResultMap">
+        SELECT bboa.*, bboi.outsourcer_name, bboi.director
+        FROM biz_business_outsource_assess bboa
+        LEFT JOIN biz_business_outsourcer_info bboi ON bboa.outsourcer_id = bboi.id
+        WHERE 1=1
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
+            and bboa.approval_status = #{request.approvalStatus}
+        </if>
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
+            and bboa.create_user_id = #{request.createUserId}
+        </if>
+        <if test="request != null and request.projectNo != null and request.projectNo !=''">
+            and bboa.project_no like concat('%',#{request.projectNo},'%')
+        </if>
+        <if test="request != null and request.outsourcerName != null and request.outsourcerName !=''">
+            and bboi.outsourcer_name like concat('%',#{request.outsourcerName},'%')
+        </if>
+        <if test="request != null and request.applicantName != null and request.applicantName !=''">
+            and bboa.applicant_name like concat('%',#{request.applicantName},'%')
+        </if>
+        <if test="request != null and request.applicantTimeStart != null and request.applicantTimeStart !=''">
+            and bboa.applicant_time &gt;= #{request.applicantTimeStart}
+        </if>
+        <if test="request != null and request.applicantTimeEnd != null and request.applicantTimeEnd !=''">
+            and bboa.applicant_time &lt;= #{request.applicantTimeEnd}
+        </if>
+        <if test="businessKeys != null">
+            and bboa.id in
+            <foreach collection="businessKeys" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
+        ORDER BY bboa.create_time DESC
+    </select>
 </mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceProtocolMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceProtocolMapper.xml
new file mode 100644
index 0000000..b7b2149
--- /dev/null
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceProtocolMapper.xml
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.mapper.business.BizBusinessOutsourceProtocolMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.business.BizBusinessOutsourceProtocol">
+        <id column="id" property="id" />
+        <result column="protocol_no" property="protocolNo" />
+        <result column="project_name" property="projectName" />
+        <result column="lab_code" property="labCode" />
+        <result column="group_code" property="groupCode" />
+        <result column="outsourcer_id" property="outsourcerId" />
+        <result column="remark" property="remark" />
+        <result column="outsource_no" property="outsourceNo" />
+        <result column="outsource_name" property="outsourceName" />
+        <result column="contacts" property="contacts" />
+        <result column="mobile" property="mobile" />
+        <result column="address" property="address" />
+        <result column="require_date" property="requireDate" />
+        <result column="outsource_cost" property="outsourceCost" />
+        <result column="director" property="director" />
+        <result column="item" property="item" />
+        <result column="requires" property="requires" />
+        <result column="create_user_id" property="createUserId" />
+        <result column="create_user_name" property="createUserName" />
+        <result column="approval_status" property="approvalStatus" />
+        <result column="process_id" property="processId" />
+        <result column="create_time" property="createTime" />
+        <result column="update_time" property="updateTime" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, protocol_no, project_name, lab_code, group_code, outsourcer_id, remark, outsource_no, outsource_name, contacts, mobile, address, require_date, outsource_cost, director, item, requires, create_user_id, create_user_name, approval_status, process_id, create_time, update_time
+    </sql>
+
+    <select id="selectMaxProtocolNo" resultType="java.lang.Long">
+        SELECT IFNULL(max(RIGHT(protocol_no, 3)), 0) from biz_business_outsource_protocol
+    </select>
+
+    <select id="selectBatchForApprovalList" resultMap="BaseResultMap">
+        SELECT *
+        FROM biz_business_outsource_protocol
+        WHERE 1=1
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
+            and approval_status = #{request.approvalStatus}
+        </if>
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
+            and create_user_id = #{request.createUserId}
+        </if>
+        <if test="request != null and request.protocolNo != null and request.protocolNo !=''">
+            and protocol_no like concat('%',#{request.protocolNo},'%')
+        </if>
+        <if test="request != null and request.outsourcerName != null and request.outsourcerName !=''">
+            and outsourcer_name like concat('%',#{request.outsourcerName},'%')
+        </if>
+        <if test="request != null and request.applicantName != null and request.applicantName !=''">
+            and create_user_name like concat('%',#{request.applicantName},'%')
+        </if>
+        <if test="request != null and request.applicantTimeStart != null and request.applicantTimeStart !=''">
+            and create_time &gt;= #{request.applicantTimeStart}
+        </if>
+        <if test="request != null and request.applicantTimeEnd != null and request.applicantTimeEnd !=''">
+            and create_time &lt;= #{request.applicantTimeEnd}
+        </if>
+        <if test="businessKeys != null">
+            and id in
+            <foreach collection="businessKeys" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
+        ORDER BY create_time DESC
+    </select>
+</mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourcerInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourcerInfoMapper.xml
index 510a80b..3049b54 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourcerInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourcerInfoMapper.xml
@@ -7,6 +7,8 @@
         <id column="id" property="id" />
         <result column="outsourcer_no" property="outsourcerNo" />
         <result column="outsourcer_name" property="outsourcerName" />
+        <result column="lab_code" property="labCode" />
+        <result column="group_code" property="groupCode" />
         <result column="outsourcer_brief_name" property="outsourcerBriefName" />
         <result column="outsourcer_size" property="outsourcerSize" />
         <result column="business_size" property="businessSize" />
@@ -55,32 +57,32 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, outsourcer_no, outsourcer_name, outsourcer_brief_name, outsourcer_size, business_size, grade, evaluation, tax_number, bank_account, bank_name, bank_account_number, postal_code, director, phone, fax, mobile, email, website, address_country, address_province, address_city, address_area, full_address, address_country_name, address_province_name, address_city_name, address_area_name, invoice_country, invoice_province, invoice_city, invoice_area, invoice_full_address, invoice_country_name, invoice_province_name, invoice_city_name, invoice_area_name, business_scope, business_content, minio_file_name, approval_status, process_id, remark, create_user_id, create_user_name, create_time, update_time
+        id, outsourcer_no, outsourcer_name, lab_code, group_code, outsourcer_brief_name, outsourcer_size, business_size, grade, evaluation, tax_number, bank_account, bank_name, bank_account_number, postal_code, director, phone, fax, mobile, email, website, address_country, address_province, address_city, address_area, full_address, address_country_name, address_province_name, address_city_name, address_area_name, invoice_country, invoice_province, invoice_city, invoice_area, invoice_full_address, invoice_country_name, invoice_province_name, invoice_city_name, invoice_area_name, business_scope, business_content, minio_file_name, approval_status, process_id, remark, create_user_id, create_user_name, create_time, update_time
     </sql>
 
     <select id="selectBatchForApprovalList" resultMap="BaseResultMap">
         SELECT *
         FROM biz_business_outsourcer_info
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.outsourcerNo != null and request.outsourcerNo !=''">
+        <if test="request != null and request.outsourcerNo != null and request.outsourcerNo !=''">
             and outsourcer_no like concat('%',#{request.outsourcerNo},'%')
         </if>
-        <if test="request.outsourcerName != null and request.outsourcerName !=''">
+        <if test="request != null and request.outsourcerName != null and request.outsourcerName !=''">
             and outsourcer_name like concat('%',#{request.outsourcerName},'%')
         </if>
-        <if test="request.director != null and request.director !=''">
+        <if test="request != null and request.director != null and request.director !=''">
             and director like concat('%',#{request.director},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
@@ -93,6 +95,6 @@
     </select>
 
     <select id="selectMaxNo" resultType="java.lang.Long">
-        SELECT IFNULL(max(RIGHT(outsourcer_no, 12)), 0) from biz_business_outsourcer_info
+        SELECT IFNULL(max(RIGHT(outsourcer_no, 3)), 0) from biz_business_outsourcer_info
     </select>
 </mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessSiteExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessSiteExecutiveInfoMapper.xml
index 135c5d0..3c5ae79 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessSiteExecutiveInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessSiteExecutiveInfoMapper.xml
@@ -38,25 +38,25 @@
         FROM biz_business_site_executive_info bsei
         LEFT JOIN biz_resource_customer_info rci ON bsei.customer_id = rci.id
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and bsei.approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and bsei.create_user_id = #{request.createUserId}
         </if>
-        <if test="request.siteExecutiveNo != null and request.siteExecutiveNo !=''">
+        <if test="request != null and request.siteExecutiveNo != null and request.siteExecutiveNo !=''">
             and bsei.site_executive_no like concat('%',#{request.siteExecutiveNo},'%')
         </if>
-        <if test="request.customerName != null and request.customerName !=''">
+        <if test="request != null and request.customerName != null and request.customerName !=''">
             and rci.outsourcer_name like concat('%',#{request.customerName},'%')
         </if>
-        <if test="request.applyName != null and request.applyName !=''">
+        <if test="request != null and request.applyName != null and request.applyName !=''">
             and bsei.apply_name like concat('%',#{request.applyName},'%')
         </if>
-        <if test="request.applyTimeStart != null and request.applyTimeStart !=''">
+        <if test="request != null and request.applyTimeStart != null and request.applyTimeStart !=''">
             and bsei.apply_time &gt;= #{request.applyTimeStart}
         </if>
-        <if test="request.applyTimeEnd != null and request.applyTimeEnd !=''">
+        <if test="request != null and request.applyTimeEnd != null and request.applyTimeEnd !=''">
             and bsei.apply_time &lt;= #{request.applyTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml
index 84d9e2a..6bd38a9 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml
@@ -105,6 +105,12 @@
         <if test="request.isUrgent != null and request.isUrgent !=''">
             AND bo.is_urgent = #{request.isUrgent}
         </if>
+        <if test="request.ids != null">
+            and blei.id in
+            <foreach collection="request.ids" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
         ORDER BY blei.update_time DESC
     </select>
 
@@ -137,6 +143,12 @@
         <if test="request.isUrgent != null and request.isUrgent !=''">
             AND bo.is_urgent = #{request.isUrgent}
         </if>
+        <if test="request.ids != null">
+            and blei.id in
+            <foreach collection="request.ids" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
         ORDER BY blei.update_time DESC
     </select>
 
diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardInfoMapper.xml
index 1a5551b..2ed8d17 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardInfoMapper.xml
@@ -45,12 +45,6 @@
         FROM biz_equipment_standard_info besi
         LEFT JOIN biz_equipment_standard_technology_relation bestr ON besi.standard_no = bestr.standard_no
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
-            and besi.approval_status = #{request.approvalStatus}
-        </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
-            and besi.create_user_id = #{request.createUserId}
-        </if>
         <if test="request.standardName != null and request.standardName !=''">
             and besi.standard_name like concat('%',#{request.standardName},'%')
         </if>
diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardTechnologyRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardTechnologyRelationMapper.xml
index fc7e16c..cd03c8c 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardTechnologyRelationMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardTechnologyRelationMapper.xml
@@ -6,6 +6,7 @@
     <resultMap id="BaseResultMap" type="com.casic.missiles.model.equipment.BizEquipmentStandardTechnologyRelation">
         <id column="id" property="id" />
         <result column="technology_file_id" property="technologyFileId" />
+        <result column="technology_file_no" property="technologyFileNo" />
         <result column="technology_file_name" property="technologyFileName" />
         <result column="standard_id" property="standardId" />
         <result column="standard_no" property="standardNo" />
@@ -14,7 +15,7 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, technology_file_id, technology_file_name, standard_id, remark
+        id, technology_file_id, technology_file_no, technology_file_name, standard_id, remark
     </sql>
 
 </mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceAuthorizeOrderMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceAuthorizeOrderMapper.xml
index ac5176c..554fe65 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceAuthorizeOrderMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceAuthorizeOrderMapper.xml
@@ -32,22 +32,22 @@
         SELECT *
         FROM biz_resource_authorize_order
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.orderNo != null and request.orderNo !=''">
+        <if test="request != null and request.orderNo != null and request.orderNo !=''">
             and order_no like concat('%',#{request.orderNo},'%')
         </if>
-        <if test="request.createUserName != null and request.createUserName !=''">
+        <if test="request != null and request.createUserName != null and request.createUserName !=''">
             and create_user_name like concat('%',#{request.createUserName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerExamineFormMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerExamineFormMapper.xml
index ab242f6..af7f98f 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerExamineFormMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerExamineFormMapper.xml
@@ -41,28 +41,28 @@
         SELECT *
         FROM biz_resource_customer_examine_form
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.formNo != null and request.formNo !=''">
+        <if test="request != null and request.formNo != null and request.formNo !=''">
             and form_no like concat('%',#{request.formNo},'%')
         </if>
-        <if test="request.labCode != null and request.labCode !=''">
+        <if test="request != null and request.labCode != null and request.labCode !=''">
             and lab_code like concat('%',#{request.labCode},'%')
         </if>
-        <if test="request.groupCode != null and request.groupCode !=''">
+        <if test="request != null and request.groupCode != null and request.groupCode !=''">
             and group_code like concat('%',#{request.groupCode},'%')
         </if>
-        <if test="request.createUserName != null and request.createUserName !=''">
+        <if test="request != null and request.createUserName != null and request.createUserName !=''">
             and create_user_name like concat('%',#{request.createUserName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerInfoMapper.xml
index fa8ffbc..06a2798 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerInfoMapper.xml
@@ -33,25 +33,25 @@
         SELECT *
         FROM biz_resource_customer_info
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.customerNo != null and request.customerNo !=''">
+        <if test="request != null and request.customerNo != null and request.customerNo !=''">
             and customer_no like concat('%',#{request.customerNo},'%')
         </if>
-        <if test="request.customerName != null and request.customerName !=''">
+        <if test="request != null and request.customerName != null and request.customerName !=''">
             and customer_name like concat('%',#{request.customerName},'%')
         </if>
-        <if test="request.contacts != null and request.contacts !=''">
+        <if test="request != null and request.contacts != null and request.contacts !=''">
             and contacts like concat('%',#{request.contacts},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerSuggestFormMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerSuggestFormMapper.xml
index 28f5bb2..1806662 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerSuggestFormMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerSuggestFormMapper.xml
@@ -33,28 +33,28 @@
         SELECT *
         FROM biz_resource_customer_suggest_form
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.formNo != null and request.formNo !=''">
+        <if test="request != null and request.formNo != null and request.formNo !=''">
             and form_no like concat('%',#{request.formNo},'%')
         </if>
-        <if test="request.customerName != null and request.customerName !=''">
+        <if test="request != null and request.customerName != null and request.customerName !=''">
             and customer_name like concat('%',#{request.customerName},'%')
         </if>
-        <if test="request.customerDeptName != null and request.customerDeptName !=''">
+        <if test="request != null and request.customerDeptName != null and request.customerDeptName !=''">
             and customer_dept_name like concat('%',#{request.customerDeptName},'%')
         </if>
-        <if test="request.createUserName != null and request.createUserName !=''">
+        <if test="request != null and request.createUserName != null and request.createUserName !=''">
             and create_user_name like concat('%',#{request.createUserName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSealUseNoteMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSealUseNoteMapper.xml
index ab37bc1..b02bb33 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSealUseNoteMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSealUseNoteMapper.xml
@@ -29,32 +29,32 @@
     </sql>
 
     <select id="selectBatchForApprovalList" resultMap="BaseResultMap">
-        SELECT *
+        SELECT brsun.*, brsi.seal_name, brsi.seal_type, brsi.approver_name
         FROM biz_resource_seal_use_note brsun
         JOIN biz_resource_seal_info brsi ON brsun.seal_id = brsi.id
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and brsun.approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and brsun.create_user_id = #{request.createUserId}
         </if>
-        <if test="request.sealName != null and request.sealName !=''">
+        <if test="request != null and request.sealName != null and request.sealName !=''">
             and brsi.seal_name like concat('%',#{request.sealName},'%')
         </if>
-        <if test="request.sealType != null and request.sealType !=''">
+        <if test="request != null and request.sealType != null and request.sealType !=''">
             and brsi.seal_type = #{request.sealType}
         </if>
-        <if test="request.applyDeptName != null and request.applyDeptName !=''">
+        <if test="request != null and request.applyDeptName != null and request.applyDeptName !=''">
             and brsun.apply_dept_name like concat('%',#{request.applyDeptName},'%')
         </if>
-        <if test="request.applyUserName != null and request.applyUserName !=''">
+        <if test="request != null and request.applyUserName != null and request.applyUserName !=''">
             and brsun.apply_user_name like concat('%',#{request.applyUserName},'%')
         </if>
-        <if test="request.applyTimeStart != null and request.applyTimeStart !=''">
+        <if test="request != null and request.applyTimeStart != null and request.applyTimeStart !=''">
             and brsun.apply_time &gt;= #{request.applyTimeStart}
         </if>
-        <if test="request.applyTimeEnd != null and request.applyTimeEnd !=''">
+        <if test="request != null and request.applyTimeEnd != null and request.applyTimeEnd !=''">
             and brsun.apply_time &lt;= #{request.applyTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml
index 119bf7d..4f8392a 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml
@@ -31,6 +31,12 @@
         <if test="request.deptName != null and request.deptName !=''">
             and brsi.dept_name like concat('%',#{request.deptName},'%')
         </if>
+        <if test="request.ids != null">
+            and brsv.id in
+            <foreach collection="request.ids" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
         ORDER BY brsv.grant_date DESC
     </select>
 
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSupplierInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSupplierInfoMapper.xml
index fe8d399..e8ce7ef 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSupplierInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSupplierInfoMapper.xml
@@ -48,28 +48,28 @@
         SELECT *
         FROM biz_resource_supplier_info
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.supplierNo != null and request.supplierNo !=''">
+        <if test="request != null and request.supplierNo != null and request.supplierNo !=''">
             and supplier_no like concat('%',#{request.supplierNo},'%')
         </if>
-        <if test="request.supplierName != null and request.supplierName !=''">
+        <if test="request != null and request.supplierName != null and request.supplierName !=''">
             and supplier_name like concat('%',#{request.supplierName},'%')
         </if>
-        <if test="request.director != null and request.director !=''">
+        <if test="request != null and request.director != null and request.director !=''">
             and director like concat('%',#{request.director},'%')
         </if>
-        <if test="request.supplierType != null and request.supplierType !=''">
+        <if test="request != null and request.supplierType != null and request.supplierType !=''">
             and supplier_type = #{request.supplierType}
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/EnvLocationInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/EnvLocationInfoMapper.xml
new file mode 100644
index 0000000..68bcf10
--- /dev/null
+++ b/casic-metering-dao/src/main/resources/mapper/resource/EnvLocationInfoMapper.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.mapper.resource.EnvLocationInfoMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.resource.EnvLocationInfo">
+        <id column="id" property="id" />
+        <result column="location_no" property="locationNo" />
+        <result column="location_name" property="locationName" />
+        <result column="location_position" property="locationPosition" />
+        <result column="create_user_id" property="createUserId" />
+        <result column="create_user" property="createUser" />
+        <result column="create_time" property="createTime" />
+        <result column="update_time" property="updateTime" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, location_no, location_name, location_position, create_user_id, create_user, create_time, update_time
+    </sql>
+
+    <select id="selectLocationListPage" resultType="com.casic.missiles.dto.resource.environment.LocationListResponse">
+        SELECT *
+        FROM env_location_info
+        WHERE 1=1
+        <if test="request.locationNo != null and request.locationNo !=''">
+            AND location_no LIKE concat('%',#{request.locationNo},'%')
+        </if>
+        <if test="request.locationName != null and request.locationName !=''">
+            AND location_name LIKE concat('%',#{request.locationName},'%')
+        </if>
+        ORDER BY create_time DESC
+    </select>
+
+</mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml
index b28c18f..8854047 100644
--- a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml
@@ -11,7 +11,6 @@
         <result column="sign_desc" property="signDesc" />
         <result column="sign_director" property="signDirector" />
         <result column="sign_user_id" property="signUserId" />
-        <result column="sign_type" property="signType" />
         <result column="minio_file_name" property="minioFileName" />
         <result column="create_time" property="createTime" />
         <result column="update_time" property="updateTime" />
@@ -28,7 +27,6 @@
         <result column="sign_name" property="signName" />
         <result column="sign_desc" property="signDesc" />
         <result column="sign_director" property="signDirector" />
-        <result column="sign_type" property="signType" />
         <result column="sign_user_id" property="signUserId" />
         <result column="minio_file_name" property="minioFileName" />
         <result column="create_time" property="createTime" />
@@ -62,4 +60,58 @@
         JOIN system_sign_user_relation ssur ON ss.id = ssur.sign_id
         WHERE ssur.user_id = #{userId}
     </select>
+
+    <select id="selectSignListPage" resultMap="BaseResultMap">
+        SELECT ss.*, sd.SIMPLE_NAME AS deptName
+        FROM system_sign ss
+        LEFT JOIN sys_user su ON su.id = ss.sign_user_id
+        LEFT JOIN sys_dept sd ON sd.id = su.dept_id
+        WHERE 1=1
+        <if test="request.signNo != null and request.signNo !=''">
+            AND ss.sign_no LIKE concat('%',#{request.signNo},'%')
+        </if>
+        <if test="request.signName != null and request.signName !=''">
+            AND ss.sign_name LIKE concat('%',#{request.signName},'%')
+        </if>
+        <if test="request.signDirector != null and request.signDirector !=''">
+            AND ss.sign_director LIKE concat('%',#{request.signDirector},'%')
+        </if>
+        <if test="request.signUserId != null and request.signUserId !=''">
+            AND ss.sign_user_id = #{request.signUserId}
+        </if>
+        <if test="request.createStartTime != null and request.createStartTime !=''">
+            AND DATE_FORMAT(ss.create_time,'%Y-%m-%d') &gt;= DATE_FORMAT(#{request.createStartTime},'%Y-%m-%d')
+        </if>
+        <if test="request.createEndTime != null and request.createEndTime !=''">
+            AND DATE_FORMAT(ss.create_time,'%Y-%m-%d')  &lt;= DATE_FORMAT(#{request.createEndTime},'%Y-%m-%d')
+        </if>
+        ORDER BY ss.create_time DESC
+    </select>
+
+    <select id="selectSignList" resultMap="BaseResultMap">
+        SELECT ss.*, sd.SIMPLE_NAME AS deptName
+        FROM system_sign ss
+        LEFT JOIN sys_user su ON su.id = ss.sign_user_id
+        LEFT JOIN sys_dept sd ON sd.id = su.dept_id
+        WHERE 1=1
+        <if test="request.signNo != null and request.signNo !=''">
+            AND ss.sign_no LIKE concat('%',#{request.signNo},'%')
+        </if>
+        <if test="request.signName != null and request.signName !=''">
+            AND ss.sign_name LIKE concat('%',#{request.signName},'%')
+        </if>
+        <if test="request.signDirector != null and request.signDirector !=''">
+            AND ss.sign_director LIKE concat('%',#{request.signDirector},'%')
+        </if>
+        <if test="request.signUserId != null and request.signUserId !=''">
+            AND ss.sign_user_id = #{request.signUserId}
+        </if>
+        <if test="request.createStartTime != null and request.createStartTime !=''">
+            AND DATE_FORMAT(ss.create_time,'%Y-%m-%d') &gt;= DATE_FORMAT(#{request.createStartTime},'%Y-%m-%d')
+        </if>
+        <if test="request.createEndTime != null and request.createEndTime !=''">
+            AND DATE_FORMAT(ss.create_time,'%Y-%m-%d')  &lt;= DATE_FORMAT(#{request.createEndTime},'%Y-%m-%d')
+        </if>
+        ORDER BY ss.create_time DESC
+    </select>
 </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 515050a..60f530b 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
@@ -47,8 +47,8 @@
     String STORAGE_LOCATION = "bizStorageLocation";
     //计量专业
     String MEASURE_MAJOR = "bizMeasureMajor";
-    //管理状态
-    String MANAGER_STATE = "bizManagerState";
+    //标准装置管理状态
+    String STANDARD_MANAGER_STATE = "bizStandardManagerState";
 
     /**
      * 资源管理 字典code
@@ -95,8 +95,6 @@
     String MEASURE_STATUS = "measureStatus";
     //检定方式
     String MEASURE_TYPE = "measureType";
-    //标识打印标志类型
-    String IDENTIFY_PRINT_TYPE = "bizBusinessIdentify";
     //变更类型
     String REPORT_CHANGE_TYPE = "bizCertChangeType";
     //规模类型
@@ -111,19 +109,24 @@
     String MEASURE_CATEGORY = "measureCategory";
     //检定结果
     String MEASURE_RESULT = "measureResult";
+    //分包原因
+    String OUTSOURCE_REASON = "outsourceReason";
+
+    /**
+     * 系统管理
+     */
+    String TEMPLATE_TYPE = "templateType";
+
 
     /**
      * 标准装置 字典code
      */
     //类别
     String STANDARD_CATEGORY = "standardCategory";
-    //管理状态
-    String STANDARD_MANAGER_STATE = "standardManagerState";
     //标准等级
     String STANDARD_LEVEL = "standardLevel";
     //传递范围
     String STANDARD_TRANSMIT_RANGE = "transmitRange";
-
     //资本来源
     String CAPITAL_SOURCE = "capitalSource";
     //标准装置-申请类型
@@ -148,8 +151,6 @@
     String CERTIFICATE_CLASS = "certificationClass";
     //证书管理-检校专业
     String CALIBRATION_MAJOR = "calibrationMajor";
-    //分包原因
-    String OUTSOURCE_REASON = "outsourceReason";
 
     /**
      * 工作台
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/BaseApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/BaseApprovalListRequest.java
index 73c12c1..80d7424 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/BaseApprovalListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/BaseApprovalListRequest.java
@@ -6,6 +6,7 @@
 
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotEmpty;
+import java.util.List;
 
 /**
  * @Description:
@@ -19,14 +20,14 @@
      * 表单id
      */
     @NotBlank(message = "表单id不能为空")
-    @ApiModelProperty(value = "表单id（流程定义对应的表单id，等价于业务id）", dataType = "String")
+    @ApiModelProperty(value = "表单id（流程定义对应的表单id，等价于业务id），导出接口不用传", dataType = "String")
     private String formId;
 
     /**
      * 审批状态类型，对应ApprovalStatusEnum
      */
     @NotEmpty(message = "审批状态类型不能为空")
-    @ApiModelProperty(value = "审批状态类型code", dataType = "String")
+    @ApiModelProperty(value = "审批状态类型code，导出接口不用传", dataType = "String")
     private String approvalStatus;
 
     @ApiModelProperty(hidden = true)
@@ -34,4 +35,7 @@
 
     @ApiModelProperty(hidden = true)
     private Long createUserId;
+
+    @ApiModelProperty(value = "导出ids", dataType = "List")
+    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificatePrintApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificatePrintApprovalListRequest.java
index b93d1c9..3cc2f4e 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificatePrintApprovalListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificatePrintApprovalListRequest.java
@@ -5,8 +5,6 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import java.util.List;
-
 /**
  * @Description:
  * @Author: wangpeng
@@ -38,7 +36,4 @@
 
     @ApiModelProperty(value = "创建结束时间", dataType = "String")
     private String createTimeEnd;
-
-    @ApiModelProperty(value = "导出ids", dataType = "List")
-    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportApprovalListRequest.java
index 4f7a038..c115847 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportApprovalListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportApprovalListRequest.java
@@ -5,8 +5,6 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import java.util.List;
-
 /**
  * @Description:
  * @Author: wangpeng
@@ -15,6 +13,8 @@
 @ApiModel
 @Data
 public class CertificateReportApprovalListRequest extends BaseApprovalListRequest {
+    @ApiModelProperty(value = "委托方id", dataType = "String")
+    private Long customerId;
 
     @ApiModelProperty(value = "证书报告编号", dataType = "String")
     private String certificateReportNo;
@@ -37,6 +37,4 @@
     @ApiModelProperty(value = "检校结束时间", dataType = "String")
     private String calibrationTimeEnd;
 
-    @ApiModelProperty(value = "导出ids", dataType = "List")
-    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/identify/IdentifyListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/identify/IdentifyListRequest.java
index 1b87ae6..f019203 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/identify/IdentifyListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/identify/IdentifyListRequest.java
@@ -4,6 +4,8 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * @Description:
  * @Author: wangpeng
@@ -26,4 +28,7 @@
 
     @ApiModelProperty(value = "打印结束时间", dataType = "String")
     private String createTimeEnd;
+
+    @ApiModelProperty(value = "导出ids", dataType = "List")
+    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListRequest.java
index 1264883..62415fb 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListRequest.java
@@ -7,6 +7,7 @@
 import lombok.Data;
 
 import javax.validation.constraints.NotBlank;
+import java.util.List;
 
 @Data
 @ApiModel
@@ -37,4 +38,6 @@
     @ApiModelProperty(value = "是否加急（1是0否null全部）", dataType = "Integer")
     private String isUrgent;
 
+    @ApiModelProperty(value = "导出ids", dataType = "List")
+    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListRequest.java
index 5201d7b..499760a 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListRequest.java
@@ -17,6 +17,9 @@
     @ApiModelProperty(value = "任务单编号", dataType = "String")
     private String orderNo;
 
+    @ApiModelProperty(value = "委托方id", dataType = "Long")
+    private Long customerId;
+
     @ApiModelProperty(value = "委托方名称", dataType = "String")
     private String customerName;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OrderSampleDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OrderSampleDTO.java
new file mode 100644
index 0000000..796edc0
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OrderSampleDTO.java
@@ -0,0 +1,19 @@
+package com.casic.missiles.dto.business.outsource;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/8/24 11:38
+ */
+@ApiModel
+@Data
+public class OrderSampleDTO {
+    @ApiModelProperty(value = "任务单id", dataType = "Long")
+    private Long orderId;
+    @ApiModelProperty(value = "受检设备id", dataType = "Long")
+    private Long sampleId;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceAssessApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceAssessApprovalListRequest.java
new file mode 100644
index 0000000..9a930c3
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceAssessApprovalListRequest.java
@@ -0,0 +1,30 @@
+package com.casic.missiles.dto.business.outsource;
+
+import com.casic.missiles.dto.BaseApprovalListRequest;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/8/24 11:01
+ */
+@ApiModel
+@Data
+public class OutsourceAssessApprovalListRequest extends BaseApprovalListRequest {
+    @ApiModelProperty(value = "评审表编号", dataType = "String")
+    private String projectNo;
+
+    @ApiModelProperty(value = "分包机构名称", dataType = "String")
+    private String outsourcerName;
+
+    @ApiModelProperty(value = "申请人", dataType = "String")
+    private String applicantName;
+
+    @ApiModelProperty(value = "申请时间开始", dataType = "String")
+    private String applicantTimeStart;
+
+    @ApiModelProperty(value = "申请时间结束", dataType = "String")
+    private String applicantTimeEnd;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceAssessSaveResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceAssessSaveResponse.java
new file mode 100644
index 0000000..8bf9aad
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceAssessSaveResponse.java
@@ -0,0 +1,20 @@
+package com.casic.missiles.dto.business.outsource;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/8/14 16:17
+ */
+@ApiModel
+@Data
+public class OutsourceAssessSaveResponse {
+    @ApiModelProperty(value = "主键id", dataType = "Long")
+    private Long id;
+
+    @ApiModelProperty(value = "编号", dataType = "String")
+    private String projectNo;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProtocolApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProtocolApprovalListRequest.java
new file mode 100644
index 0000000..0f32331
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProtocolApprovalListRequest.java
@@ -0,0 +1,30 @@
+package com.casic.missiles.dto.business.outsource;
+
+import com.casic.missiles.dto.BaseApprovalListRequest;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/8/24 15:01
+ */
+@ApiModel
+@Data
+public class OutsourceProtocolApprovalListRequest extends BaseApprovalListRequest {
+    @ApiModelProperty(value = "协议书编号", dataType = "String")
+    private String protocolNo;
+
+    @ApiModelProperty(value = "分包方名称", dataType = "String")
+    private String outsourcerName;
+
+    @ApiModelProperty(value = "申请人", dataType = "String")
+    private String applicantName;
+
+    @ApiModelProperty(value = "申请时间开始", dataType = "String")
+    private String applicantTimeStart;
+
+    @ApiModelProperty(value = "申请时间结束", dataType = "String")
+    private String applicantTimeEnd;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProtocolSaveResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProtocolSaveResponse.java
new file mode 100644
index 0000000..e324967
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProtocolSaveResponse.java
@@ -0,0 +1,20 @@
+package com.casic.missiles.dto.business.outsource;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/8/14 16:17
+ */
+@ApiModel
+@Data
+public class OutsourceProtocolSaveResponse {
+    @ApiModelProperty(value = "主键id", dataType = "Long")
+    private Long id;
+
+    @ApiModelProperty(value = "编号", dataType = "String")
+    private String protocolNo;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveApprovalListRequest.java
index f29f4e4..7047c28 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveApprovalListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveApprovalListRequest.java
@@ -5,8 +5,6 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import java.util.List;
-
 /**
  * @Description: 现场检测审批列表请求实体
  * @Author: wangpeng
@@ -30,7 +28,4 @@
     @ApiModelProperty(value = "申请时间结束", dataType = "String")
     private String applyTimeEnd;
 
-    @ApiModelProperty(value = "导出ids", dataType = "List")
-    private List<Long> ids;
-
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveDetailResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveDetailResponse.java
index 1f28752..394c934 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveDetailResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveDetailResponse.java
@@ -12,6 +12,18 @@
     @ApiModelProperty(value = "id，更新/删除使用参数", dataType = "Long")
     private Long id;
 
+    @ApiModelProperty(value = "实验室代码(字典code)", dataType = "String")
+    private String labCode;
+
+    @ApiModelProperty(value = "实验室代码(字典value)", dataType = "String")
+    private String labCodeName;
+
+    @ApiModelProperty(value = "组别代码(字典code)", dataType = "String")
+    private String groupCode;
+
+    @ApiModelProperty(value = "组别代码(字典value)", dataType = "String")
+    private String groupCodeName;
+
     @ApiModelProperty(value = "审批编号", dataType = "String")
     private String siteExecutiveNo;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/environment/LocationListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/environment/LocationListRequest.java
new file mode 100644
index 0000000..13d03c3
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/environment/LocationListRequest.java
@@ -0,0 +1,20 @@
+package com.casic.missiles.dto.resource.environment;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/6/8 13:56
+ */
+@ApiModel
+@Data
+public class LocationListRequest {
+    @ApiModelProperty(value = "地点编号", dataType = "String")
+    private String locationNo;
+
+    @ApiModelProperty(value = "地点名称", dataType = "String")
+    private String locationName;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/environment/LocationListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/environment/LocationListResponse.java
new file mode 100644
index 0000000..4c531af
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/environment/LocationListResponse.java
@@ -0,0 +1,78 @@
+package com.casic.missiles.dto.resource.environment;
+
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
+import com.baomidou.mybatisplus.annotation.TableField;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description: 地点列表响应实体
+ * @Author: wangpeng
+ * @Date: 2023/6/8 13:53
+ */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
+@ApiModel
+@Data
+public class LocationListResponse {
+    @ApiModelProperty(value = "主键id", dataType = "Long")
+    private Long id;
+
+    /**
+     * 地点编号
+     */
+    @ExcelProperty("地点编号")
+    @ApiModelProperty(value = "地点编号", dataType = "String")
+    private String locationNo;
+
+    /**
+     * 地点名称
+     */
+    @ExcelProperty("地点名称")
+    @ApiModelProperty(value = "地点名称", dataType = "String")
+    private String locationName;
+
+    /**
+     * 地点位置
+     */
+    @ExcelProperty("地点位置")
+    @ApiModelProperty(value = "地点位置", dataType = "String")
+    private String locationPosition;
+
+    /**
+     * 创建人id
+     */
+    @ApiModelProperty(value = "创建人id", dataType = "Long")
+    private Long createUserId;
+
+    /**
+     * 创建人
+     */
+    @ExcelProperty("创建人")
+    @ApiModelProperty(value = "创建人", dataType = "String")
+    @TableField("create_user")
+    private String createUser;
+
+    /**
+     * 创建时间
+     */
+    @ExcelProperty("创建时间")
+    @ApiModelProperty(value = "创建时间", dataType = "String")
+    private String createTime;
+
+    /**
+     * 更新时间
+     */
+    @ApiModelProperty(value = "更新时间", dataType = "String")
+    private String updateTime;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertRequest.java
index 9a7f6c6..c827915 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertRequest.java
@@ -4,6 +4,8 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * @Description:
  * @Author: wangpeng
@@ -16,4 +18,7 @@
     private String name;
     @ApiModelProperty(value = "部门名", dataType = "String")
     private String deptName;
+
+    @ApiModelProperty(value = "导出ids", dataType = "List")
+    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertResponse.java
index f78b159..8f2f79e 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertResponse.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.dto.resource.staff;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.casic.missiles.annotation.DictCodeField;
 import com.casic.missiles.constants.MeterDictCode;
 import io.swagger.annotations.ApiModel;
@@ -13,12 +20,18 @@
  * @Author: wangpeng
  * @Date: 2023/7/27 15:13
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @ApiModel
 @Data
 public class StaffCertResponse {
     /**
      * 人员编号
      */
+    @ExcelProperty(value = "人员编号",order = 0)
     @NotEmpty(message = "人员编号不能为空")
     @ApiModelProperty(value = "人员编号", dataType = "String")
     private String staffNo;
@@ -26,6 +39,7 @@
     /**
      * 姓名
      */
+    @ExcelProperty(value = "姓名",order = 1)
     @ApiModelProperty(value = "姓名", dataType = "String")
     private String staffName;
 
@@ -54,6 +68,7 @@
     /**
      * 部门名字
      */
+    @ExcelProperty(value = "工作部门",order = 2)
     @ApiModelProperty(value = "部门名字", dataType = "String")
     private String deptName;
 
@@ -66,6 +81,7 @@
     /**
      * 计量专业
      */
+    @ExcelProperty(value = "计量专业",order = 3)
     @ApiModelProperty(value = "计量专业", dataType = "String")
     private String major;
 
@@ -110,6 +126,7 @@
     /**
      * 证书号
      */
+    @ExcelProperty(value = "证号",order = 4)
     @ApiModelProperty(value = "证书号", dataType = "String")
     private String certNo;
 
@@ -122,12 +139,14 @@
     /**
      * 有效日期
      */
+    @ExcelProperty(value = "证书有效期",order = 6)
     @ApiModelProperty(value = "有效日期", dataType = "String")
     private String effectiveDate;
 
     /**
      * 发放日期
      */
+    @ExcelProperty(value = "发证日期",order = 5)
     @ApiModelProperty(value = "发放日期", dataType = "String")
     private String grantDate;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffListRequest.java
index 7c4afb3..0a1194a 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffListRequest.java
@@ -4,6 +4,8 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * @Description:
  * @Author: wangpeng
@@ -18,4 +20,7 @@
     private String deptName;
     @ApiModelProperty(value = "部门id", dataType = "Long")
     private Long deptId;
+
+    @ApiModelProperty(value = "导出ids", dataType = "List")
+    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/TrainListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/TrainListRequest.java
index f68597b..6321f8b 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/TrainListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/TrainListRequest.java
@@ -14,6 +14,8 @@
 public class TrainListRequest {
     @ApiModelProperty(value = "训练登记表编号", dataType = "String")
     private String trainNo;
+    @ApiModelProperty(value = "值班领导", dataType = "String")
+    private String dutyLeader;
     @ApiModelProperty(value = "创建开始时间", dataType = "String")
     private String createTimeStart;
     @ApiModelProperty(value = "创建结束时间", dataType = "String")
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/SignAddRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/SignAddRequest.java
index 117be34..d71055c 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/SignAddRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/SignAddRequest.java
@@ -43,13 +43,6 @@
     private Long signUserId;
 
     /**
-     * 签章或签名-字典code
-     */
-    @NotBlank(message = "类型不能为空")
-    @ApiModelProperty(value = "签名/签章-字典code", dataType = "String", required = true)
-    private String signType;
-
-    /**
      * minio存储文件名
      */
     @ApiModelProperty(value = "上传文件返回名称", dataType = "String")
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateAddRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateAddRequest.java
index aff1265..6316648 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateAddRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateAddRequest.java
@@ -17,30 +17,28 @@
 @Data
 public class TemplateAddRequest extends BaseSystemRequest {
     /**
-     * 原始记录模板/证书报告模板名称
+     * 模板名称
      */
     @ApiModelProperty(value = "名称", dataType = "String", required = true)
     @NotBlank(message = "名称不能为空")
     private String templateName;
 
     /**
-     * 原始记录模板/证书报告模板描述
+     * 模板描述
      */
     @ApiModelProperty(value = "描述", dataType = "String")
     private String templateDesc;
 
     /**
-     * 原始记录模板/证书报告模板创建人
+     * 创建人
      */
     @ApiModelProperty(value = "创建人", dataType = "String", required = true)
     @NotBlank(message = "创建人不能为空")
     private String templateCreator;
 
-    /**
-     * 原始记录模板/证书报告模板-字典code
-     */
-    @NotBlank(message = "类型不能为空")
-    @ApiModelProperty(value = "原始记录模板/证书报告模板-字典code", dataType = "String", required = true)
+
+    @NotBlank(message = "模板类型不能为空")
+    @ApiModelProperty(value = "模板类型(字典code)", dataType = "String", required = true)
     private String templateType;
 
     /**
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateListRequest.java
index eec5a1e..6d17bbe 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateListRequest.java
@@ -1,11 +1,12 @@
 package com.casic.missiles.dto.system;
 
+import com.casic.missiles.annotation.DictCodeField;
+import com.casic.missiles.constants.MeterDictCode;
 import com.casic.missiles.dto.BaseSystemRequest;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import javax.validation.constraints.NotBlank;
 import java.util.List;
 
 /**
@@ -19,8 +20,8 @@
     /**
      * 类型
      */
-//    @ApiModelProperty(value = "类型-字典code", dataType = "String", required = true)
-    @NotBlank(message = "类型不能为空")
+    @DictCodeField(message = "模板类型不合法", cacheName = MeterDictCode.TEMPLATE_TYPE)
+    @ApiModelProperty(value = "模板类型(字典code)", dataType = "String")
     private String templateType;
 
     /**
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificateChangeApply.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificateChangeApply.java
index 9216308..36923fd 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificateChangeApply.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificateChangeApply.java
@@ -1,11 +1,19 @@
 package com.casic.missiles.model.business;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 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 com.casic.missiles.dto.BaseRequest;
+import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -20,6 +28,12 @@
  * @author wangpeng
  * @since 2023-08-15
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
+@ApiModel
 @Data
 @TableName("biz_business_certificate_change_apply")
 public class BizBusinessCertificateChangeApply extends BaseRequest implements Serializable {
@@ -33,6 +47,7 @@
     /**
      * 申请单编号
      */
+    @ExcelProperty(value = "申请单编号", order = 1)
     @ApiModelProperty(value = "申请单编号", dataType = "String")
     @TableField("change_apply_no")
     private String changeApplyNo;
@@ -40,6 +55,7 @@
     /**
      * 申请单名字
      */
+    @ExcelProperty(value = "申请单名称", order = 2)
     @ApiModelProperty(value = "申请单名字", dataType = "String")
     @TableField("change_apply_name")
     private String changeApplyName;
@@ -54,6 +70,7 @@
     /**
      * 更换证书编号
      */
+    @ExcelProperty(value = "更换证书编号", order = 3)
     @ApiModelProperty(value = "更换证书编号", dataType = "String")
     @TableField("change_report_no")
     private String changeReportNo;
@@ -61,7 +78,8 @@
     /**
      * 更换证书名字
      */
-    @ApiModelProperty(value = "更换证书名字", dataType = "String")
+    @ExcelProperty(value = "更换证书/报告名称", order = 4)
+    @ApiModelProperty(value = "更换证书/报告名称", dataType = "String")
     @TableField("change_report_name")
     private String changeReportName;
 
@@ -73,6 +91,7 @@
     @TableField("change_type")
     private String changeType;
 
+    @ExcelProperty(value = "变更类型", order = 5)
     @ApiModelProperty(value = "变更类型(字典value)", dataType = "String")
     @TableField(exist = false)
     private String changeTypeName;
@@ -142,13 +161,15 @@
     /**
      * 创建用户名字
      */
-    @ApiModelProperty(value = "创建用户名字", dataType = "String")
+    @ExcelProperty(value = "创建人", order = 6)
+    @ApiModelProperty(value = "创建人名字", dataType = "String")
     @TableField("create_user_name")
     private String createUserName;
 
     /**
      * 创建时间
      */
+    @ExcelProperty(value = "创建时间", order = 7)
     @ApiModelProperty(value = "创建时间", dataType = "String")
     @TableField("create_time")
     private String createTime;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificateReport.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificateReport.java
index f01db9e..db06018 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificateReport.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificateReport.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.model.business;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -22,6 +29,11 @@
  * @author wangpeng
  * @since 2023-08-14
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @ApiModel
 @Data
 @TableName("biz_business_certificate_report")
@@ -36,6 +48,7 @@
     /**
      * 证书报告编号
      */
+    @ExcelProperty(value = "证书报告编号", order = 1)
     @ApiModelProperty(value = "证书报告编号", dataType = "String")
     @TableField("certificate_report_no")
     private String certificateReportNo;
@@ -43,6 +56,7 @@
     /**
      * 证书报告名称
      */
+    @ExcelProperty(value = "证书报告名称", order = 2)
     @ApiModelProperty(value = "证书报告名称", dataType = "String")
     @TableField("certificate_report_name")
     private String certificateReportName;
@@ -62,6 +76,7 @@
     @TableField("measure_category")
     private String measureCategory;
 
+    @ExcelProperty(value = "检校类别", order = 6)
     @ApiModelProperty(value = "检校类别(字典value)", dataType = "String")
     @TableField(exist = false)
     private String measureCategoryName;
@@ -69,6 +84,7 @@
     /**
      * 检校时间
      */
+    @ExcelProperty(value = "检校时间", order = 8)
     @ApiModelProperty(value = "检校时间", dataType = "String")
     @TableField("calibration_time")
     private String calibrationTime;
@@ -267,18 +283,22 @@
     @TableField(exist = false)
     private Integer decisionItem;
 
-    @ApiModelProperty(value = "设备样品编号（列表返回参数）", dataType = "String")
+    @ExcelProperty(value = "被检设备统一编号", order = 3)
+    @ApiModelProperty(value = "被检设备统一编号（列表返回参数）", dataType = "String")
     @TableField(exist = false)
     private String sampleNo;
 
-    @ApiModelProperty(value = "设备样品名称（列表返回参数）", dataType = "String")
+    @ExcelProperty(value = "被检设备名称", order = 4)
+    @ApiModelProperty(value = "被检设备名称（列表返回参数）", dataType = "String")
     @TableField(exist = false)
     private String sampleName;
 
-    @ApiModelProperty(value = "设备样品规格型号（列表返回参数）", dataType = "String")
+    @ExcelProperty(value = "规格型号", order = 5)
+    @ApiModelProperty(value = "规格型号（列表返回参数）", dataType = "String")
     @TableField(exist = false)
     private String sampleModel;
 
+    @ExcelProperty(value = "检定员", order = 7)
     @ApiModelProperty(value = "检定员名字（列表返回参数）", dataType = "String")
     @TableField(exist = false)
     private String staffName;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessIdentifyInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessIdentifyInfo.java
index 46bfba5..f1a9bec 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessIdentifyInfo.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessIdentifyInfo.java
@@ -1,10 +1,15 @@
 package com.casic.missiles.model.business;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 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;
 
@@ -20,6 +25,11 @@
  * @author wangpeng
  * @since 2023-08-15
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @Data
 @TableName("biz_business_identify_info")
 public class BizBusinessIdentifyInfo implements Serializable {
@@ -33,6 +43,7 @@
     /**
      * 记录编号
      */
+    @ExcelProperty(value = "记录编号", order = 1)
     @ApiModelProperty(value = "记录编号", dataType = "String")
     @TableField("record_no")
     private String recordNo;
@@ -41,20 +52,15 @@
      * 标志类型(字典code)
      */
     @NotEmpty(message = "标志类型不能为空")
-    @ApiModelProperty(value = "标志类型(字典code)", dataType = "String")
-    @DictCodeField(message = "标志类型不合法", cacheName = MeterDictCode.IDENTIFY_PRINT_TYPE)
+    @ApiModelProperty(value = "标志类型(直接存计量标识/使用状态/校准状态的字典value)", dataType = "String")
     @TableField("identify_type")
     private String identifyType;
 
-    @ApiModelProperty(value = "标志类型(字典value)", dataType = "String")
-    @TableField(exist = false)
-    private String identifyTypeName;
-
     /**
      * 设备id(可以是受检设备/设备台账)
      */
     @NotNull(message = "设备id不能为空")
-    @ApiModelProperty(value = "设备id(可以是受检设备/设备台账)", dataType = "String")
+    @ApiModelProperty(value = "设备id(可以是受检设备/设备台账)", dataType = "Long")
     @TableField("device_id")
     private Long deviceId;
 
@@ -66,29 +72,32 @@
     @TableField("device_type")
     private String deviceType;
 
+    @ExcelProperty(value = "统一编号", order = 3)
     @NotEmpty(message = "设备编号不能为空")
-    @ApiModelProperty(value = "设备编号", dataType = "String")
+    @ApiModelProperty(value = "统一编号", dataType = "String")
     @TableField("device_no")
     private String deviceNo;
 
     /**
      * 设备名字
      */
-    @NotEmpty(message = "设备名字不能为空")
-    @ApiModelProperty(value = "设备名字", dataType = "String")
+    @ExcelProperty(value = "设备名称", order = 4)
+    @NotEmpty(message = "设备名称不能为空")
+    @ApiModelProperty(value = "设备名称", dataType = "String")
     @TableField("device_name")
     private String deviceName;
 
     /**
      * 检定员id
      */
-    @ApiModelProperty(value = "检定员id", dataType = "String")
+    @ApiModelProperty(value = "检定员id", dataType = "Long")
     @TableField("measure_person_id")
     private Long measurePersonId;
 
     /**
      * 检定员名字
      */
+    @ExcelProperty(value = "检定员", order = 5)
     @ApiModelProperty(value = "检定员名字", dataType = "String")
     @TableField("measure_person")
     private String measurePerson;
@@ -103,7 +112,8 @@
     /**
      * 更新时间
      */
-    @ApiModelProperty(value = "更新时间", dataType = "String")
+    @ExcelProperty(value = "打印时间", order = 6)
+    @ApiModelProperty(value = "打印时间", dataType = "String")
     @TableField("update_time")
     private String updateTime;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceAssess.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceAssess.java
index 659d9ca..6720b90 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceAssess.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceAssess.java
@@ -1,11 +1,26 @@
 package com.casic.missiles.model.business;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 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 com.casic.missiles.dto.BaseRequest;
+import com.casic.missiles.dto.business.outsource.OrderSampleDTO;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import javax.validation.constraints.NotEmpty;
 import java.io.Serializable;
+import java.util.List;
 
 /**
  * <p>
@@ -15,146 +30,231 @@
  * @author wangpeng
  * @since 2023-08-16
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
+@ApiModel
 @Data
 @TableName("biz_business_outsource_assess")
-public class BizBusinessOutsourceAssess implements Serializable {
+public class BizBusinessOutsourceAssess extends BaseRequest implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
+    @ApiModelProperty(value = "id，更新/删除使用参数", dataType = "Long")
     @TableId("id")
     private Long id;
 
     /**
      * 评审表编号
      */
+    @ExcelProperty(value = "评审表编号", order = 1)
+    @ApiModelProperty(value = "评审表编号(后台生成)", dataType = "String")
     @TableField("project_no")
     private String projectNo;
 
     /**
      * 评审表名称
      */
+    @ExcelProperty(value = "评审表名称", order = 2)
+    @ApiModelProperty(value = "评审表名称", dataType = "String")
     @TableField("project_name")
     private String projectName;
 
+    @NotEmpty(message = "实验室代码不能为空")
+    @DictCodeField(message = "实验室代码描述不合法", cacheName = MeterDictCode.LAB_CODE)
+    @ApiModelProperty(value = "实验室代码(字典code)", dataType = "String")
+    @TableField("lab_code")
+    private String labCode;
+
+    @ApiModelProperty(value = "实验室代码(字典value)", dataType = "String")
+    @TableField(exist = false)
+    private String labCodeName;
+
+    /**
+     * 组别代码
+     */
+    @NotEmpty(message = "组别代码不能为空")
+    @DictCodeField(message = "组别代码描述不合法", cacheName = MeterDictCode.GROUP_CODE)
+    @ApiModelProperty(value = "组别代码(字典code)", dataType = "String")
+    @TableField("group_code")
+    private String groupCode;
+
+    @ApiModelProperty(value = "组别代码(字典value)", dataType = "String")
+    @TableField(exist = false)
+    private String groupCodeName;
+
     /**
      * 申请人id
      */
+    @ApiModelProperty(value = "申请人id", dataType = "String")
     @TableField("applicant_id")
     private Long applicantId;
 
     /**
      * 申请人名字
      */
+    @ExcelProperty(value = "申请人", order = 5)
+    @ApiModelProperty(value = "申请人", dataType = "String")
     @TableField("applicant_name")
     private String applicantName;
 
     /**
      * 申请时间
      */
+    @ExcelProperty(value = "申请时间", order = 6)
+    @ApiModelProperty(value = "申请时间", dataType = "String")
     @TableField("applicant_time")
     private String applicantTime;
 
     /**
      * 附件(minio存储文件名)
      */
+    @ApiModelProperty(value = "附件(minio存储文件名)", dataType = "String")
     @TableField("minio_file_name")
     private String minioFileName;
 
     /**
      * 备注
      */
+    @ApiModelProperty(value = "备注", dataType = "String")
     @TableField("remark")
     private String remark;
 
     /**
      * 创建人id
      */
+    @ApiModelProperty(value = "创建人id", dataType = "String")
     @TableField("create_user_id")
     private Long createUserId;
 
     /**
      * 创建人名字
      */
+    @ApiModelProperty(value = "创建人名字", dataType = "String")
     @TableField("create_user_name")
     private String createUserName;
 
     /**
      * 分包方id
      */
+    @ApiModelProperty(value = "评审表编号", dataType = "String")
     @TableField("outsourcer_id")
     private Long outsourcerId;
 
     /**
      * 预计开始时间
      */
+    @ApiModelProperty(value = "预计开始时间", dataType = "String")
     @TableField("pre_start_time")
     private String preStartTime;
 
     /**
      * 预计结束时间
      */
+    @ApiModelProperty(value = "预计结束时间", dataType = "String")
     @TableField("pre_end_time")
     private String preEndTime;
 
     /**
      * 分包原因-字典
      */
+    @ApiModelProperty(value = "分包原因(字典code)", dataType = "String")
+    @DictCodeField(message = "分包原因描述不合法", cacheName = MeterDictCode.OUTSOURCE_REASON)
     @TableField("outsource_reason")
     private String outsourceReason;
 
+    @ApiModelProperty(value = "分包原因(字典value)", dataType = "String")
+    @TableField(exist = false)
+    private String outsourceReasonName;
+
     /**
      * 预计费用
      */
+    @ApiModelProperty(value = "预计费用", dataType = "String")
     @TableField("pre_cost")
     private String preCost;
 
     /**
      * 审批状态
      */
+    @ApiModelProperty(value = "审批状态", dataType = "String")
+    @DictCodeField(message = "审批状态描述不合法", cacheName = MeterDictCode.APPROVAL_STATUS)
     @TableField("approval_status")
     private String approvalStatus;
 
     /**
      * 流程实例id
      */
+    @ApiModelProperty(value = "流程实例id", dataType = "String")
     @TableField("process_id")
     private String processId;
 
     /**
      * 实验室认可情况
      */
+    @ApiModelProperty(value = "实验室认可情况", dataType = "String")
     @TableField("approve_situation")
     private String approveSituation;
 
     /**
      * 溯源性
      */
+    @ApiModelProperty(value = "溯源性", dataType = "String")
     @TableField("traceability")
     private String traceability;
 
     /**
      * 测试方法
      */
+    @ApiModelProperty(value = "测试方法", dataType = "String")
     @TableField("test_method")
     private String testMethod;
 
     /**
      * 技术能力
      */
+    @ApiModelProperty(value = "技术能力", dataType = "String")
     @TableField("technique_ability")
     private String techniqueAbility;
 
     /**
      * 创建时间
      */
+    @ApiModelProperty(hidden = true)
     @TableField("create_time")
     private String createTime;
 
     /**
      * 更新时间
      */
+    @ApiModelProperty(hidden = true)
     @TableField("update_time")
     private String updateTime;
 
+    @ApiModelProperty(value = "审批状态类型-字典value", dataType = "String")
+    @TableField(exist = false)
+    private String approvalStatusName;
 
+    @ApiModelProperty(value = "任务id（同意、驳回等操作使用）", dataType = "String")
+    @TableField(exist = false)
+    private String taskId;
+
+    @ApiModelProperty(value = "可选决策项（1同意驳回拒绝 2同意驳回 3同意拒绝，用于待审批列表同意/驳回/拒绝按钮展示）", dataType = "Integer")
+    @TableField(exist = false)
+    private Integer decisionItem;
+
+    @NotEmpty(message = "受检设备信息不能为空")
+    @ApiModelProperty(value = "受检设备id列表（新建使用参数）", dataType = "List")
+    @TableField(exist = false)
+    private List<OrderSampleDTO> orderSampleList;
+
+    @ExcelProperty(value = "分包机构名称", order = 3)
+    @ApiModelProperty(value = "分包机构名称（列表返回参数）", dataType = "String")
+    private String outsourcerName;
+
+    @ExcelProperty(value = "机构负责人", order = 4)
+    @ApiModelProperty(value = "机构负责人（列表返回参数）", dataType = "String")
+    private String director;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceProtocol.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceProtocol.java
new file mode 100644
index 0000000..38df697
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceProtocol.java
@@ -0,0 +1,225 @@
+package com.casic.missiles.model.business;
+
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
+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 com.casic.missiles.dto.BaseRequest;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotEmpty;
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 计量检定业务-分包管理-测试、校准或检定工作分包协议书
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-08-24
+ */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
+@Data
+@TableName("biz_business_outsource_protocol")
+public class BizBusinessOutsourceProtocol extends BaseRequest implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "id，更新/删除使用参数", dataType = "Long")
+    @TableId("id")
+    private Long id;
+
+    /**
+     * 协议书编号
+     */
+    @ExcelProperty(value = "协议书编号", order = 1)
+    @ApiModelProperty(value = "协议书编号(后台生成)", dataType = "String")
+    @TableField("protocol_no")
+    private String protocolNo;
+
+    /**
+     * 协议书名称
+     */
+    @ExcelProperty(value = "协议书名称", order = 2)
+    @ApiModelProperty(value = "协议书名称", dataType = "String")
+    @TableField("project_name")
+    private String projectName;
+
+    @NotEmpty(message = "实验室代码不能为空")
+    @DictCodeField(message = "实验室代码描述不合法", cacheName = MeterDictCode.LAB_CODE)
+    @ApiModelProperty(value = "实验室代码(字典code)", dataType = "String")
+    @TableField("lab_code")
+    private String labCode;
+
+    @ApiModelProperty(value = "实验室代码(字典value)", dataType = "String")
+    @TableField(exist = false)
+    private String labCodeName;
+
+    @NotEmpty(message = "组别代码不能为空")
+    @DictCodeField(message = "组别代码描述不合法", cacheName = MeterDictCode.GROUP_CODE)
+    @ApiModelProperty(value = "组别代码(字典code)", dataType = "String")
+    @TableField("group_code")
+    private String groupCode;
+
+    @ApiModelProperty(value = "组别代码(字典value)", dataType = "String")
+    @TableField(exist = false)
+    private String groupCodeName;
+
+    /**
+     * 分包方id
+     */
+    @ApiModelProperty(value = "分包方id", dataType = "Long")
+    @TableField("outsourcer_id")
+    private Long outsourcerId;
+
+    /**
+     * 其他
+     */
+    @ApiModelProperty(value = "其他", dataType = "String")
+    @TableField("remark")
+    private String remark;
+
+    /**
+     * 分包方编号
+     */
+    @ApiModelProperty(value = "分包方编号(新建不用传)", dataType = "String")
+    @TableField("outsource_no")
+    private String outsourceNo;
+
+    /**
+     * 分包方名称
+     */
+    @ExcelProperty(value = "分包方名称", order = 3)
+    @ApiModelProperty(value = "分包方名称(新建不用传)", dataType = "String")
+    @TableField("outsource_name")
+    private String outsourceName;
+
+    /**
+     * 联系人
+     */
+    @ExcelProperty(value = "联系人", order = 4)
+    @ApiModelProperty(value = "联系人", dataType = "String")
+    @TableField("contacts")
+    private String contacts;
+
+    /**
+     * 电话
+     */
+    @ApiModelProperty(value = "电话", dataType = "String")
+    @TableField("mobile")
+    private String mobile;
+
+    /**
+     * 地址
+     */
+    @ApiModelProperty(value = "地址", dataType = "String")
+    @TableField("address")
+    private String address;
+
+    /**
+     * 要求完成日期
+     */
+    @ApiModelProperty(value = "要求完成日期", dataType = "String")
+    @TableField("require_date")
+    private String requireDate;
+
+    /**
+     * 分包费用(元)
+     */
+    @ApiModelProperty(value = "分包费用(元)", dataType = "String")
+    @TableField("outsource_cost")
+    private Double outsourceCost;
+
+    /**
+     * 分包方负责人
+     */
+    @ApiModelProperty(value = "分包方负责人", dataType = "String")
+    @TableField("director")
+    private String director;
+
+    /**
+     * 分包项目
+     */
+    @ApiModelProperty(value = "分包项目", dataType = "String")
+    @TableField("item")
+    private String item;
+
+    /**
+     * 分包要求
+     */
+    @ApiModelProperty(value = "分包要求", dataType = "String")
+    @TableField("requires")
+    private String requires;
+
+    /**
+     * 创建人id
+     */
+    @ApiModelProperty(hidden = true)
+    @TableField("create_user_id")
+    private Long createUserId;
+
+    /**
+     * 创建人名字
+     */
+    @ExcelProperty(value = "申请人", order = 5)
+    @ApiModelProperty(value = "申请人", dataType = "String")
+    @TableField("create_user_name")
+    private String createUserName;
+
+    /**
+     * 审批状态
+     */
+    @ApiModelProperty(value = "审批状态", dataType = "String")
+    @DictCodeField(message = "审批状态描述不合法", cacheName = MeterDictCode.APPROVAL_STATUS)
+    @TableField("approval_status")
+    private String approvalStatus;
+
+    /**
+     * 流程实例id
+     */
+    @ApiModelProperty(value = "流程实例id", dataType = "String")
+    @TableField("process_id")
+    private String processId;
+
+    /**
+     * 创建时间
+     */
+    @ExcelProperty(value = "申请时间", order = 6)
+    @ApiModelProperty(value = "申请时间", dataType = "String")
+    @TableField("create_time")
+    private String createTime;
+
+    /**
+     * 更新时间
+     */
+    @ApiModelProperty(hidden = true)
+    @TableField("update_time")
+    private String updateTime;
+
+    @ApiModelProperty(value = "审批状态类型-字典value", dataType = "String")
+    @TableField(exist = false)
+    private String approvalStatusName;
+
+    @ApiModelProperty(value = "任务id（同意、驳回等操作使用）", dataType = "String")
+    @TableField(exist = false)
+    private String taskId;
+
+    @ApiModelProperty(value = "可选决策项（1同意驳回拒绝 2同意驳回 3同意拒绝，用于待审批列表同意/驳回/拒绝按钮展示）", dataType = "Integer")
+    @TableField(exist = false)
+    private Integer decisionItem;
+
+
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourcerInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourcerInfo.java
index ec4e997..f9aa69e 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourcerInfo.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourcerInfo.java
@@ -17,6 +17,7 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import javax.validation.constraints.NotEmpty;
 import java.io.Serializable;
 
 /**
@@ -59,6 +60,29 @@
     @TableField("outsourcer_name")
     private String outsourcerName;
 
+    @NotEmpty(message = "实验室代码不能为空")
+    @DictCodeField(message = "实验室代码描述不合法", cacheName = MeterDictCode.LAB_CODE)
+    @ApiModelProperty(value = "实验室代码(字典code)", dataType = "String")
+    @TableField("lab_code")
+    private String labCode;
+
+    @ApiModelProperty(value = "实验室代码(字典value)", dataType = "String")
+    @TableField(exist = false)
+    private String labCodeName;
+
+    /**
+     * 组别代码
+     */
+    @NotEmpty(message = "组别代码不能为空")
+    @DictCodeField(message = "组别代码描述不合法", cacheName = MeterDictCode.GROUP_CODE)
+    @ApiModelProperty(value = "组别代码(字典code)", dataType = "String")
+    @TableField("group_code")
+    private String groupCode;
+
+    @ApiModelProperty(value = "组别代码(字典value)", dataType = "String")
+    @TableField(exist = false)
+    private String groupCodeName;
+
     /**
      * 单位简称
      */
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardInfo.java
index c48eed7..dffdfdd 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardInfo.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardInfo.java
@@ -5,6 +5,7 @@
 import com.baomidou.mybatisplus.annotation.TableName;
 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;
 
@@ -18,6 +19,7 @@
  * @author wangpeng
  * @since 2023-08-04
  */
+@ApiModel
 @Data
 @TableName("biz_equipment_standard_info")
 public class BizEquipmentStandardInfo implements Serializable {
@@ -119,7 +121,7 @@
      * 管理状态(字典code)
      */
     @ApiModelProperty(value = "管理状态(字典code)", dataType = "String")
-    @DictCodeField(message = "管理状态不合法", cacheName = MeterDictCode.MANAGER_STATE)
+    @DictCodeField(message = "管理状态不合法", cacheName = MeterDictCode.STANDARD_MANAGER_STATE)
     @TableField("manage_status")
     private String manageStatus;
 
@@ -151,7 +153,7 @@
     /**
      * 温度(℃)
      */
-    @ApiModelProperty(value = "使用状态(字典code)", dataType = "String")
+    @ApiModelProperty(value = "温度(℃)", dataType = "String")
     @TableField("temperature")
     private Double temperature;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardInfoApproval.java b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardInfoApproval.java
index dbd86ab..9f58d83 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardInfoApproval.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardInfoApproval.java
@@ -150,7 +150,7 @@
      * 管理状态(字典code)
      */
     @ApiModelProperty(value = "管理状态(字典code)", dataType = "String")
-    @DictCodeField(message = "管理状态不合法", cacheName = MeterDictCode.MANAGER_STATE)
+    @DictCodeField(message = "管理状态不合法", cacheName = MeterDictCode.STANDARD_MANAGER_STATE)
     @TableField("manage_status")
     private String manageStatus;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardTechnologyRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardTechnologyRelation.java
index 0e612bd..751f26b 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardTechnologyRelation.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardTechnologyRelation.java
@@ -3,6 +3,7 @@
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -16,6 +17,7 @@
  * @author wangpeng
  * @since 2023-08-04
  */
+@ApiModel
 @Data
 @TableName("biz_equipment_standard_technology_relation")
 public class BizEquipmentStandardTechnologyRelation implements Serializable {
@@ -33,6 +35,10 @@
     @TableField("technology_file_id")
     private Long technologyFileId;
 
+    @ApiModelProperty(value = "依据的技术文件编号", dataType = "String")
+    @TableField("technology_file_no")
+    private String technologyFileNo;
+
     /**
      * 依据的技术文件名称(技术文件中现行测试校准检定方法表文件名字段)
      */
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerInfo.java
index d6e8bed..65cd6bc 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerInfo.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerInfo.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.model.resource;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -21,6 +28,11 @@
  * @author wangpeng
  * @since 2023-08-08
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @ApiModel
 @Data
 @TableName("biz_resource_customer_info")
@@ -35,6 +47,7 @@
     /**
      * 委托方编号
      */
+    @ExcelProperty(value = "委托方编号", order = 1)
     @ApiModelProperty(value = "委托方编号", dataType = "String")
     @TableField("customer_no")
     private String customerNo;
@@ -42,6 +55,7 @@
     /**
      * 委托方名称
      */
+    @ExcelProperty(value = "委托方名称", order = 2)
     @ApiModelProperty(value = "委托方名称(新建时为下拉选择一个受检单位组织的名字，传deptId字段，后端获取名称)", dataType = "String")
     @TableField("customer_name")
     private String customerName;
@@ -63,6 +77,7 @@
     /**
      * 联系人
      */
+    @ExcelProperty(value = "联系人", order = 3)
     @ApiModelProperty(value = "联系人", dataType = "String")
     @TableField("contacts")
     private String contacts;
@@ -70,6 +85,7 @@
     /**
      * 座机电话
      */
+    @ExcelProperty(value = "座机电话", order = 4)
     @ApiModelProperty(value = "座机电话", dataType = "String")
     @TableField("mobile")
     private String mobile;
@@ -77,6 +93,7 @@
     /**
      * 手机号码
      */
+    @ExcelProperty(value = "手机号码", order = 5)
     @ApiModelProperty(value = "手机号码", dataType = "String")
     @TableField("phone")
     private String phone;
@@ -91,6 +108,7 @@
     /**
      * 地址
      */
+    @ExcelProperty(value = "地址", order = 6)
     @ApiModelProperty(value = "地址", dataType = "String")
     @TableField("address")
     private String address;
@@ -141,6 +159,7 @@
     /**
      * 创建时间
      */
+    @ExcelProperty(value = "创建时间", order = 7)
     @ApiModelProperty(value = "创建时间", dataType = "String")
     @TableField("create_time")
     private String createTime;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerSuggestForm.java b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerSuggestForm.java
index 7201bbd..701bf8b 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerSuggestForm.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerSuggestForm.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.model.resource;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -22,6 +29,11 @@
  * @author wangpeng
  * @since 2023-08-08
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @ApiModel
 @Data
 @TableName("biz_resource_customer_suggest_form")
@@ -44,7 +56,8 @@
     /**
      * 委托方名称
      */
-    @ApiModelProperty(value = "委托方名称", dataType = "String")
+    @ExcelProperty(value = "意见反馈单位", order = 2)
+    @ApiModelProperty(value = "意见反馈单位", dataType = "String")
     @TableField("customer_name")
     private String customerName;
 
@@ -59,7 +72,8 @@
     /**
      * 委托方意见反馈部门名称
      */
-    @ApiModelProperty(value = "委托方意见反馈部门名称", dataType = "String")
+    @ExcelProperty(value = "委托方意见反馈部门", order = 3)
+    @ApiModelProperty(value = "委托方意见反馈部门", dataType = "String")
     @TableField("customer_dept_name")
     private String customerDeptName;
 
@@ -73,6 +87,7 @@
     /**
      * 表单编号
      */
+    @ExcelProperty(value = "表单编号", order = 1)
     @ApiModelProperty(value = "表单编号", dataType = "String")
     @TableField("form_no")
     private String formNo;
@@ -111,6 +126,7 @@
     /**
      * 创建人名字
      */
+    @ExcelProperty(value = "创建人", order = 4)
     @ApiModelProperty(value = "创建人名字", dataType = "String")
     @TableField("create_user_name")
     private String createUserName;
@@ -147,6 +163,7 @@
     /**
      * 创建时间
      */
+    @ExcelProperty(value = "创建时间", order = 5)
     @ApiModelProperty(value = "创建时间", dataType = "String")
     @TableField("create_time")
     private String createTime;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSealInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSealInfo.java
index cbf05d7..9bf389d 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSealInfo.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSealInfo.java
@@ -106,6 +106,10 @@
     @TableField("minio_file_name")
     private String minioFileName;
 
+    @ApiModelProperty(value = "minio存储文件url", dataType = "String")
+    @TableField(exist = false)
+    private String minioFileUrl;
+
     @ApiModelProperty(value = "创建时间", dataType = "String")
     @TableField("create_time")
     private String createTime;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSealUseNote.java b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSealUseNote.java
index 3f2d9e8..3ce16a8 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSealUseNote.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSealUseNote.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.model.resource;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -20,6 +27,11 @@
  * @author wangpeng
  * @since 2023-07-28
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @ApiModel
 @Data
 @TableName("biz_resource_seal_use_note")
@@ -34,6 +46,7 @@
     /**
      * 登记表编号
      */
+    @ExcelProperty(value = "申请单编号", order = 1)
     @ApiModelProperty(value = "登记表编号(自动生成)", dataType = "String")
     @TableField("note_form_no")
     private String noteFormNo;
@@ -55,6 +68,7 @@
     /**
      * 申请部门
      */
+    @ExcelProperty(value = "申请部门", order = 5)
     @ApiModelProperty(value = "申请部门", dataType = "String")
     @TableField("apply_dept_name")
     private String applyDeptName;
@@ -69,6 +83,7 @@
     /**
      * 申请人
      */
+    @ExcelProperty(value = "申请人", order = 6)
     @ApiModelProperty(value = "申请人", dataType = "String")
     @TableField("apply_user_name")
     private String applyUserName;
@@ -76,6 +91,7 @@
     /**
      * 申请时间
      */
+    @ExcelProperty(value = "申请时间", order = 7)
     @ApiModelProperty(value = "申请时间(新增自动获取当前时间)", dataType = "String")
     @TableField("apply_time")
     private String applyTime;
@@ -130,6 +146,26 @@
     @TableField("update_time")
     private String updateTime;
 
+    @ExcelProperty(value = "印章名称", order = 2)
+    @ApiModelProperty(value = "印章名称(列表返回参数)", dataType = "String")
+    @TableField(exist = false)
+    private String sealName;
+
+    @DictCodeField(message = "印章类型描述不合法", cacheName = MeterDictCode.SEAL_TYPE)
+    @ApiModelProperty(hidden = true)
+    @TableField(exist = false)
+    private String sealType;
+
+    @ExcelProperty(value = "印章类型", order = 3)
+    @ApiModelProperty(value = "印章类型(列表返回参数)", dataType = "String")
+    @TableField(exist = false)
+    private String sealTypeName;
+
+    @ExcelProperty(value = "批准人", order = 4)
+    @ApiModelProperty(value = "批准人(列表返回参数)", dataType = "String")
+    @TableField(exist = false)
+    private String approverName;
+
     @ApiModelProperty(value = "审批状态类型-字典value", dataType = "String")
     @TableField(exist = false)
     private String approvalStatusName;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceStaffInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceStaffInfo.java
index 5ef995b..41563a1 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceStaffInfo.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceStaffInfo.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.model.resource;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -20,6 +27,11 @@
  * @author wangpeng
  * @since 2023-07-25
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @ApiModel
 @Data
 @TableName("biz_resource_staff_info")
@@ -38,6 +50,7 @@
     /**
      * 人员编号
      */
+    @ExcelProperty(value = "人员编号",order = 0)
     @NotEmpty(message = "人员编号不能为空")
     @ApiModelProperty(value = "人员编号", dataType = "String")
     @TableField("staff_no")
@@ -46,6 +59,7 @@
     /**
      * 姓名
      */
+    @ExcelProperty(value = "姓名",order = 1)
     @ApiModelProperty(value = "姓名", dataType = "String")
     @TableField("staff_name")
     private String staffName;
@@ -152,13 +166,15 @@
     /**
      * 部门名字
      */
-    @ApiModelProperty(value = "部门名字", dataType = "String")
+    @ExcelProperty(value = "工作部门",order = 4)
+    @ApiModelProperty(value = "工作部门", dataType = "String")
     @TableField("dept_name")
     private String deptName;
 
     /**
      * 岗位
      */
+    @ExcelProperty(value = "岗位",order = 2)
     @ApiModelProperty(value = "岗位", dataType = "String")
     @TableField("station")
     private String station;
@@ -166,6 +182,7 @@
     /**
      * 计量专业
      */
+    @ExcelProperty(value = "计量专业",order = 5)
     @ApiModelProperty(value = "计量专业", dataType = "String")
     @TableField("major")
     private String major;
@@ -173,6 +190,7 @@
     /**
      * 证号
      */
+    @ExcelProperty(value = "证号",order = 3)
     @ApiModelProperty(value = "证号", dataType = "String")
     @TableField("certificate_number")
     private String certificateNumber;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSupplierInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSupplierInfo.java
index eb5ef01..a1e2697 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSupplierInfo.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSupplierInfo.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.model.resource;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -20,6 +27,11 @@
  * @author wangpeng
  * @since 2023-07-27
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @ApiModel
 @Data
 @TableName("biz_resource_supplier_info")
@@ -34,6 +46,7 @@
     /**
      * 供方编号
      */
+    @ExcelProperty(value = "供方编号", order = 1)
     @ApiModelProperty(value = "供方编号(自动生成)", dataType = "String")
     @TableField("supplier_no")
     private String supplierNo;
@@ -41,6 +54,7 @@
     /**
      * 供方名称
      */
+    @ExcelProperty(value = "供方名称", order = 2)
     @ApiModelProperty(value = "供方名称", dataType = "String")
     @TableField("supplier_name")
     private String supplierName;
@@ -60,6 +74,7 @@
     @TableField("supplier_type")
     private String supplierType;
 
+    @ExcelProperty(value = "供方类型", order = 3)
     @ApiModelProperty(value = "供方类型(字典value)", dataType = "String")
     @TableField(exist = false)
     private String supplierTypeName;
@@ -109,7 +124,8 @@
     /**
      * 电话
      */
-    @ApiModelProperty(value = "电话", dataType = "String")
+    @ExcelProperty(value = "联系电话", order = 4)
+    @ApiModelProperty(value = "联系电话", dataType = "String")
     @TableField("phone")
     private String phone;
 
@@ -158,6 +174,7 @@
     /**
      * 公司地址-省
      */
+    @ExcelProperty(value = "地址-省", order = 6)
     @ApiModelProperty(value = "公司地址-省", dataType = "String")
     @TableField("company_province_name")
     private String companyProvinceName;
@@ -172,6 +189,7 @@
     /**
      * 公司地址-市
      */
+    @ExcelProperty(value = "地址-市", order = 7)
     @ApiModelProperty(value = "公司地址-市", dataType = "String")
     @TableField("company_city_name")
     private String companyCityName;
@@ -186,6 +204,7 @@
     /**
      * 公司地址-区
      */
+    @ExcelProperty(value = "地址-区", order = 8)
     @ApiModelProperty(value = "公司地址-区", dataType = "String")
     @TableField("company_area_name")
     private String companyAreaName;
@@ -193,6 +212,7 @@
     /**
      * 公司地址-详细地址
      */
+    @ExcelProperty(value = "地址-详细地址", order = 9)
     @ApiModelProperty(value = "公司地址-详细地址", dataType = "String")
     @TableField("company_address")
     private String companyAddress;
@@ -200,6 +220,7 @@
     /**
      * 服务和供应的内容
      */
+    @ExcelProperty(value = "服务和供应的内容", order = 5)
     @ApiModelProperty(value = "服务和供应的内容", dataType = "String")
     @TableField("supplier_content")
     private String supplierContent;
@@ -250,6 +271,7 @@
     /**
      * 创建时间
      */
+    @ExcelProperty(value = "创建时间", order = 9)
     @ApiModelProperty(value = "创建时间", dataType = "String")
     @TableField("create_time")
     private String createTime;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/EnvLocationInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/EnvLocationInfo.java
new file mode 100644
index 0000000..d8e2d7b
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/EnvLocationInfo.java
@@ -0,0 +1,83 @@
+package com.casic.missiles.model.resource;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotEmpty;
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 实验室环境监控系统-设备表
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-06-07
+ */
+@ApiModel
+@Data
+@TableName("env_location_info")
+public class EnvLocationInfo implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "主键id", dataType = "Long")
+    @TableId("id")
+    private Long id;
+
+    /**
+     * 地点编号
+     */
+    @NotEmpty(message = "地点编号不能为空")
+    @ApiModelProperty(value = "地点编号", dataType = "String")
+    @TableField("location_no")
+    private String locationNo;
+
+    /**
+     * 地点名称
+     */
+    @ApiModelProperty(value = "地点名称", dataType = "String")
+    @TableField("location_name")
+    private String locationName;
+
+    /**
+     * 地点位置
+     */
+    @ApiModelProperty(value = "地点位置", dataType = "String")
+    @TableField("location_position")
+    private String locationPosition;
+
+    /**
+     * 创建人id
+     */
+    @ApiModelProperty(value = "创建人id", dataType = "Long")
+    @TableField("create_user_id")
+    private Long createUserId;
+
+    /**
+     * 创建人
+     */
+    @ApiModelProperty(value = "创建人", dataType = "String")
+    @TableField("create_user")
+    private String createUser;
+
+    /**
+     * 创建时间
+     */
+    @ApiModelProperty(value = "创建时间", dataType = "String")
+    @TableField("create_time")
+    private String createTime;
+
+    /**
+     * 更新时间
+     */
+    @ApiModelProperty(value = "更新时间", dataType = "String")
+    @TableField("update_time")
+    private String updateTime;
+
+
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemFileConfig.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemFileConfig.java
index 19e6845..86e569c 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemFileConfig.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemFileConfig.java
@@ -30,7 +30,7 @@
     @ApiModelProperty(value = "系统类别(1业务系统2受检系统3环境系统)", dataType = "Integer")
     @NotNull(message = "系统类别不能为空")
     @TableField("system_type")
-    private Integer systemType;
+    private Integer systemType = 1;
 
     @ApiModelProperty("下载编号")
     @TableField("download_no")
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemNotice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemNotice.java
index e94297d..06ec37d 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemNotice.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemNotice.java
@@ -34,7 +34,7 @@
     @ApiModelProperty(value = "系统类别(1业务系统2受检系统3环境系统)", dataType = "Integer")
     @NotNull(message = "系统类别不能为空")
     @TableField("system_type")
-    private Integer systemType;
+    private Integer systemType = 1;
 
     /**
      * 通知公告编号
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSign.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSign.java
index 6c0d7c9..954f4f8 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSign.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSign.java
@@ -51,7 +51,7 @@
     @ApiModelProperty(value = "系统类别(1业务系统2受检系统3环境系统)", dataType = "Integer")
     @NotNull(message = "系统类别不能为空")
     @TableField("system_type")
-    private Integer systemType;
+    private Integer systemType = 1;
 
     /**
      * 签名编号
@@ -130,4 +130,8 @@
     @TableField(exist = false)
     private List<Long> userIdList;
 
+    @ApiModelProperty(hidden = true)
+    @TableField(exist = false)
+    private String deptName;
+
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemTemplate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemTemplate.java
index 503a457..1d27ebe 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemTemplate.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemTemplate.java
@@ -47,7 +47,7 @@
     @ApiModelProperty(value = "系统类别(1业务系统2受检系统3环境系统)", dataType = "Integer")
     @NotNull(message = "系统类别不能为空")
     @TableField("system_type")
-    private Integer systemType;
+    private Integer systemType = 1;
 
     /**
      * 模板编号
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java
index 8c21cb0..f61e4a8 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java
@@ -32,4 +32,8 @@
     ReturnDTO approvalDelete(ApprovalDeleteRequest request);
 
     ReturnDTO failUpdate(T request);
+
+    List<O> listExport(R request);
+
+    List<O> listExportByIds(List<Long> ids);
 }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java
index 724166f..9bce15b 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java
@@ -157,6 +157,29 @@
         throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
     }
 
+    @Override
+    public List<O> listExport(R request) {
+        request.setCreateUserId(null);
+        request.setApprovalStatus(ApprovalStatusEnum.PASSED);
+        Page<O> page = PageFactory.defaultPage();
+        page.setCurrent(1);
+        page.setSearchCount(false);
+        page.setSize(Integer.MAX_VALUE);
+        Page<O> resultPage = this.baseMapper.selectBatchForApprovalList(page, request, null);
+        return resultPage.getRecords();
+    }
+
+    @Override
+    public List<O> listExportByIds(List<Long> ids) {
+        Page<O> page = PageFactory.defaultPage();
+        page.setCurrent(1);
+        page.setSearchCount(false);
+        page.setSize(Integer.MAX_VALUE);
+        List<String> businessKeys = ids.stream().map(String::valueOf).collect(Collectors.toList());
+        Page<O> resultPage = this.baseMapper.selectBatchForApprovalList(page, null, businessKeys);
+        return resultPage.getRecords();
+    }
+
     protected ReturnDTO updateApprovalStatus(Long id, String processId, String approvalStatus) {
         UpdateWrapper<T> updateWrapper = new UpdateWrapper<>();
         updateWrapper.eq("id", id);
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificatePrintServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificatePrintServiceImpl.java
index f6e4706..3228497 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificatePrintServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificatePrintServiceImpl.java
@@ -162,6 +162,30 @@
         return ReturnUtil.success(printLogMapper.selectList(wrapper));
     }
 
+    @Override
+    public List<CertificatePrintListResponse> listByIds(List<Long> ids) {
+        Page<CertificatePrintListResponse> page = PageFactory.defaultPage();
+        page.setCurrent(1);
+        page.setSearchCount(false);
+        page.setSize(Integer.MAX_VALUE);
+        List<String> businessKeys = ids.stream().map(String::valueOf).collect(Collectors.toList());
+        Page<CertificatePrintListResponse> resultPage = this.baseMapper.selectBatchForApprovalList(page, null, businessKeys);
+        return resultPage.getRecords();
+    }
+
+    @Override
+    public List<CertificatePrintListResponse> list(CertificatePrintApprovalListRequest request) {
+        request.setCreateUserId(null);
+        request.setApprovalStatus(null);
+        request.setPrintStatus(null);
+        Page<CertificatePrintListResponse> page = PageFactory.defaultPage();
+        page.setCurrent(1);
+        page.setSearchCount(false);
+        page.setSize(Integer.MAX_VALUE);
+        Page<CertificatePrintListResponse> resultPage = certificatePrintMapper.selectBatchForApprovalList(page, request, null);
+        return resultPage.getRecords();
+    }
+
     private void savePrintLog(Long id) {
         BizBusinessCertificatePrintLog printLog = new BizBusinessCertificatePrintLog();
         BizBusinessCertificatePrint certificatePrint = certificatePrintMapper.selectById(id);
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificateReportServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificateReportServiceImpl.java
index 457555f..24146be 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificateReportServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificateReportServiceImpl.java
@@ -158,8 +158,8 @@
         QueryWrapper<BizBusinessCertificateMeasureResultData> mWrapper = new QueryWrapper<>();
         mWrapper.eq("report_id", reportId);
         boolean mRemove = certificateMeasureResultDataService.remove(mWrapper);
-        Assert.isFalse(eRemove || mRemove, () -> {
+        if(!eRemove || !mRemove){
             throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
-        });
+        }
     }
 }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessIdentifyInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessIdentifyInfoServiceImpl.java
index 4c8e190..f7e63ca 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessIdentifyInfoServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessIdentifyInfoServiceImpl.java
@@ -1,8 +1,10 @@
 package com.casic.missiles.service.Impl.business;
 
+import cn.hutool.core.date.DateUtil;
 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.core.page.PageFactory;
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.business.identify.IdentifyListRequest;
@@ -14,11 +16,14 @@
 import com.casic.missiles.service.business.IBizBusinessIdentifyInfoService;
 import com.casic.missiles.utils.DictCodeUtils;
 import com.casic.missiles.utils.NumberGeneratorUtil;
+import com.casic.missiles.utils.QRCodeUtil;
 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.List;
+
 /**
  * <p>
  * 计量检定业务-任务计量管理-标识打印 服务实现类
@@ -35,9 +40,9 @@
     @Override
     public Page<BizBusinessIdentifyInfo> identifyListPage(Page<BizBusinessIdentifyInfo> page, IdentifyListRequest request) throws Exception {
         QueryWrapper<BizBusinessIdentifyInfo> wrapper = new QueryWrapper<>();
-        wrapper.eq("identify_type", request.getIdentifyType());
-        wrapper.like("device_no", request.getDeviceNo());
-        wrapper.like("device_name", request.getDeviceName());
+        wrapper.eq(StringUtils.isNotEmpty(request.getIdentifyType()), "identify_type", request.getIdentifyType());
+        wrapper.like(StringUtils.isNotEmpty(request.getDeviceNo()),"device_no", request.getDeviceNo());
+        wrapper.like(StringUtils.isNotEmpty(request.getDeviceName()), "device_name", request.getDeviceName());
         wrapper.apply(StringUtils.isNotBlank(request.getCreateTimeStart()),
                 "{0} <= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getCreateTimeStart().split(" ")[0]);
         wrapper.apply(StringUtils.isNotBlank(request.getCreateTimeEnd()),
@@ -64,8 +69,11 @@
     }
 
     @Override
-    public ReturnDTO updateIdentify(BizBusinessIdentifyInfo identifyInfo) {
-        if(identifyInfoMapper.updateById(identifyInfo) > 0){
+    public ReturnDTO updateIdentify(Long id) {
+        BizBusinessIdentifyInfo info = new BizBusinessIdentifyInfo();
+        info.setId(id);
+        info.setUpdateTime(DateUtil.now());
+        if(identifyInfoMapper.updateById(info) > 0){
             return ReturnUtil.success();
         }
         throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
@@ -79,4 +87,20 @@
         throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
     }
 
+    @Override
+    public List<BizBusinessIdentifyInfo> list(IdentifyListRequest request) throws Exception {
+        Page<BizBusinessIdentifyInfo> page = PageFactory.defaultPage();
+        page.setCurrent(1);
+        page.setSearchCount(false);
+        page.setSize(Integer.MAX_VALUE);
+        Page<BizBusinessIdentifyInfo> resultPage = this.identifyListPage(page, request);
+        return resultPage.getRecords();
+    }
+
+    @Override
+    public ReturnDTO<String> equipmentQrCode(Long id) {
+        String base64QRCode = QRCodeUtil.getBase64QRCode(String.valueOf(id));
+        return ReturnUtil.success(base64QRCode);
+    }
+
 }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOrderInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOrderInfoServiceImpl.java
index 82952ad..d8d2c6a 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOrderInfoServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOrderInfoServiceImpl.java
@@ -35,6 +35,7 @@
 import javax.servlet.http.HttpServletResponse;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 import java.util.stream.Collectors;
 
 /**
@@ -209,13 +210,16 @@
     private QueryWrapper<OrderListResponse> listParamWrapperBuilder(OrderListRequest request) {
         QueryWrapper<OrderListResponse> wrapper = new QueryWrapper<>();
         wrapper.like(StringUtils.isNotBlank(request.getOrderNo()), "order_no", request.getOrderNo());
+        wrapper.like(Objects.nonNull(request.getCustomerId()), "customer_id", request.getCustomerId());
         wrapper.like(StringUtils.isNotBlank(request.getCustomerName()), "customer_name", request.getCustomerName());
         wrapper.like(StringUtils.isNotBlank(request.getDeliverer()), "deliverer", request.getDeliverer());
         wrapper.like(StringUtils.isNotBlank(request.getCreateUserName()), "create_user_name", request.getCreateUserName());
-        wrapper.apply(StringUtils.isNotBlank(request.getCreateStartTime()),
-                "{0} <= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getCreateStartTime().split(" ")[0]);
-        wrapper.apply(StringUtils.isNotBlank(request.getCreateEndTime()),
-                "{0} >= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getCreateEndTime().split(" ")[0]);
+        if(StringUtils.isNotBlank(request.getCreateStartTime())){
+            wrapper.apply("{0} <= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getCreateStartTime().split(" ")[0]);
+        }
+        if(StringUtils.isNotBlank(request.getCreateEndTime())){
+            wrapper.apply("{0} >= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getCreateEndTime().split(" ")[0]);
+        }
         wrapper.orderByDesc("create_time");
         return wrapper;
     }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceAssessServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceAssessServiceImpl.java
index c6af980..ce40138 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceAssessServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceAssessServiceImpl.java
@@ -1,10 +1,33 @@
 package com.casic.missiles.service.Impl.business;
 
-import com.casic.missiles.model.business.BizBusinessOutsourceAssess;
+import cn.hutool.core.lang.Assert;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.casic.missiles.core.model.auth.AuthUser;
+import com.casic.missiles.core.shiro.ShiroKit;
+import com.casic.missiles.dto.BaseApprovalSubmitRequest;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.ReturnUtil;
+import com.casic.missiles.dto.business.outsource.OutsourceAssessApprovalListRequest;
+import com.casic.missiles.dto.business.outsource.OutsourceAssessSaveResponse;
+import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.NoGenerateFileCodeEnum;
+import com.casic.missiles.enums.NoGenerateRecordTypeCodeEnum;
+import com.casic.missiles.enums.system.ApprovalStatusEnum;
+import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.mapper.business.BizBusinessOutsourceAssessMapper;
+import com.casic.missiles.model.business.BizBusinessOutsourceAssess;
+import com.casic.missiles.model.business.BizBusinessOutsourceAssessSampleRelation;
+import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl;
+import com.casic.missiles.service.business.IBizBusinessOutsourceAssessSampleRelationService;
 import com.casic.missiles.service.business.IBizBusinessOutsourceAssessService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.casic.missiles.utils.NoGeneratorUtil;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Objects;
 
 /**
  * <p>
@@ -15,6 +38,103 @@
  * @since 2023-08-16
  */
 @Service
-public class BizBusinessOutsourceAssessServiceImpl extends ServiceImpl<BizBusinessOutsourceAssessMapper, BizBusinessOutsourceAssess> implements IBizBusinessOutsourceAssessService {
+public class BizBusinessOutsourceAssessServiceImpl extends GeneralApprovalServiceImpl<BizBusinessOutsourceAssessMapper, BizBusinessOutsourceAssess, BizBusinessOutsourceAssess, OutsourceAssessApprovalListRequest, BaseApprovalSubmitRequest> implements IBizBusinessOutsourceAssessService {
+    @Autowired
+    private IBizBusinessOutsourceAssessSampleRelationService outsourceAssessSampleRelationService;
 
+    @Override
+    public ReturnDTO<OutsourceAssessSaveResponse> saveOutsourceAssess(BizBusinessOutsourceAssess request) {
+        //生成编号
+        String labCode = request.getLabCode();
+        String groupCode = request.getGroupCode();
+        Long maxNo = this.baseMapper.selectMaxProjectNo();
+        String projectNo = NoGeneratorUtil.getCode(NoGenerateFileCodeEnum.D, labCode, NoGenerateRecordTypeCodeEnum.OUTSOURCE_ACCESS, groupCode, maxNo);
+        request.setCreateUserId(request.getUserId());
+        request.setCreateUserName(request.getUserName());
+        request.setApprovalStatus(ApprovalStatusEnum.DRAFT); //草稿箱状态
+        request.setProjectNo(projectNo);
+        int row = this.baseMapper.insert(request);
+        Assert.isFalse(row <= 0, () -> {
+            throw new BusinessException(BusinessExceptionEnum.OUTSOURCE_ACCESS_SAVE_FAILED);
+        });
+        //关联表
+        saveRelationData(request);
+        OutsourceAssessSaveResponse saveResponse = new OutsourceAssessSaveResponse();
+        saveResponse.setId(request.getId());
+        saveResponse.setProjectNo(projectNo);
+        return ReturnUtil.success(saveResponse);
+    }
+
+    @Override
+    @Transactional
+    public ReturnDTO draftUpdate(BizBusinessOutsourceAssess request) {
+        if (this.baseMapper.updateById(request) > 0) {
+            //关联表删除、增加
+            removeRelationData(request.getId());
+            saveRelationData(request);
+            return ReturnUtil.success();
+        }
+        throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
+    }
+
+    @Override
+    public ReturnDTO draftDelete(Long id) {
+        if (this.baseMapper.deleteById(id) > 0) {
+            //关联表删除
+            removeRelationData(id);
+            return ReturnUtil.success();
+        }
+        throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
+    }
+
+    @Override
+    public ReturnDTO draftBatchDelete(List<Long> ids) {
+        if (this.baseMapper.deleteBatchIds(ids) >= 0) {
+            ids.forEach(id -> removeRelationData(id));
+            return ReturnUtil.success();
+        }
+        throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
+    }
+
+    @Override
+    @Transactional
+    public ReturnDTO failUpdate(BizBusinessOutsourceAssess request) {
+        AuthUser user = ShiroKit.getUser();
+        Assert.isFalse(Objects.isNull(user), () -> {
+            throw new BusinessException(BusinessExceptionEnum.LOGIN_USER_ACQUIRE_FAILED);
+        });
+        request.setApprovalStatus(ApprovalStatusEnum.IN_APPROVED);
+        if (this.baseMapper.updateById(request) > 0) {
+            //关联表删除、增加
+            removeRelationData(request.getId());
+            saveRelationData(request);
+            baseApprovalService.failUpdate(request.getProcessId());
+            return ReturnUtil.success();
+        }
+        throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
+    }
+
+    private void saveRelationData(BizBusinessOutsourceAssess request) {
+        List<BizBusinessOutsourceAssessSampleRelation> sampleRelations = new ArrayList<>();
+        request.getOrderSampleList().forEach(dto -> {
+            BizBusinessOutsourceAssessSampleRelation relation = new BizBusinessOutsourceAssessSampleRelation();
+            relation.setOrderId(dto.getOrderId());
+            relation.setSampleId(dto.getSampleId());
+            relation.setAccessId(request.getId());
+            sampleRelations.add(relation);
+        });
+        if(outsourceAssessSampleRelationService.saveBatch(sampleRelations)){
+            return;
+        }
+        throw new BusinessException(BusinessExceptionEnum.OUTSOURCE_ACCESS_SAVE_FAILED);
+    }
+
+    private void removeRelationData(Long assessId) {
+        QueryWrapper<BizBusinessOutsourceAssessSampleRelation> wrapper = new QueryWrapper<>();
+        wrapper.eq("access_id", assessId);
+        if(outsourceAssessSampleRelationService.remove(wrapper)){
+            return;
+        }
+        throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
+    }
 }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceProtocolServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceProtocolServiceImpl.java
new file mode 100644
index 0000000..821e728
--- /dev/null
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceProtocolServiceImpl.java
@@ -0,0 +1,60 @@
+package com.casic.missiles.service.Impl.business;
+
+import cn.hutool.core.lang.Assert;
+import com.casic.missiles.dto.BaseApprovalSubmitRequest;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.ReturnUtil;
+import com.casic.missiles.dto.business.outsource.OutsourceProtocolApprovalListRequest;
+import com.casic.missiles.dto.business.outsource.OutsourceProtocolSaveResponse;
+import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.NoGenerateFileCodeEnum;
+import com.casic.missiles.enums.NoGenerateRecordTypeCodeEnum;
+import com.casic.missiles.enums.system.ApprovalStatusEnum;
+import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.mapper.business.BizBusinessOutsourceProtocolMapper;
+import com.casic.missiles.mapper.business.BizBusinessOutsourcerInfoMapper;
+import com.casic.missiles.model.business.BizBusinessOutsourceProtocol;
+import com.casic.missiles.model.business.BizBusinessOutsourcerInfo;
+import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl;
+import com.casic.missiles.service.business.IBizBusinessOutsourceProtocolService;
+import com.casic.missiles.utils.NoGeneratorUtil;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 计量检定业务-分包管理-测试、校准或检定工作分包协议书 服务实现类
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-08-24
+ */
+@Service
+public class BizBusinessOutsourceProtocolServiceImpl extends GeneralApprovalServiceImpl<BizBusinessOutsourceProtocolMapper, BizBusinessOutsourceProtocol, BizBusinessOutsourceProtocol, OutsourceProtocolApprovalListRequest, BaseApprovalSubmitRequest> implements IBizBusinessOutsourceProtocolService {
+    @Autowired
+    private BizBusinessOutsourcerInfoMapper outsourcerInfoMapper;
+
+    @Override
+    public ReturnDTO<OutsourceProtocolSaveResponse> saveOutsourceProtocol(BizBusinessOutsourceProtocol request) {
+        //生成编号
+        String labCode = request.getLabCode();
+        String groupCode = request.getGroupCode();
+        Long maxNo = this.baseMapper.selectMaxProtocolNo();
+        String protocolNo = NoGeneratorUtil.getCode(NoGenerateFileCodeEnum.D, labCode, NoGenerateRecordTypeCodeEnum.OUTSOURCE_PROTOCOL, groupCode, maxNo);
+        request.setCreateUserId(request.getUserId());
+        request.setCreateUserName(request.getUserName());
+        request.setApprovalStatus(ApprovalStatusEnum.DRAFT); //草稿箱状态
+        request.setProtocolNo(protocolNo);
+        BizBusinessOutsourcerInfo outsourcerInfo = outsourcerInfoMapper.selectById(request.getOutsourcerId());
+        request.setOutsourceNo(outsourcerInfo.getOutsourcerNo());
+        request.setOutsourceName(outsourcerInfo.getOutsourcerName());
+        int row = this.baseMapper.insert(request);
+        Assert.isFalse(row <= 0, () -> {
+            throw new BusinessException(BusinessExceptionEnum.OUTSOURCE_PROTOCOL_SAVE_FAILED);
+        });
+        OutsourceProtocolSaveResponse saveResponse = new OutsourceProtocolSaveResponse();
+        saveResponse.setId(request.getId());
+        saveResponse.setProtocolNo(protocolNo);
+        return ReturnUtil.success(saveResponse);
+    }
+}
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourcerInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourcerInfoServiceImpl.java
index 75f639d..8aadad7 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourcerInfoServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourcerInfoServiceImpl.java
@@ -3,12 +3,12 @@
 import cn.hutool.core.lang.Assert;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.dto.*;
 import com.casic.missiles.dto.business.outsource.OutsourcerInfoApprovalListRequest;
 import com.casic.missiles.dto.business.outsource.OutsourcerSaveResponse;
 import com.casic.missiles.enums.BusinessExceptionEnum;
-import com.casic.missiles.enums.PrefixCodeEnum;
+import com.casic.missiles.enums.NoGenerateFileCodeEnum;
+import com.casic.missiles.enums.NoGenerateRecordTypeCodeEnum;
 import com.casic.missiles.enums.system.ApprovalStatusEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.mapper.business.BizBusinessOutsourcerInfoMapper;
@@ -20,7 +20,7 @@
 import com.casic.missiles.service.business.IBizBusinessOutsourcerInfoService;
 import com.casic.missiles.service.business.IBizBusinessOutsourcerUserInfoService;
 import com.casic.missiles.utils.DictCodeUtils;
-import com.casic.missiles.utils.NumberGeneratorUtil;
+import com.casic.missiles.utils.NoGeneratorUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -42,22 +42,12 @@
     private IBizBusinessOutsourcerUserInfoService outsourcerUserInfoService;
 
     @Override
-    public List<BizBusinessOutsourcerInfo> list(OutsourcerInfoApprovalListRequest request) {
-        request.setCreateUserId(null);
-        request.setApprovalStatus(ApprovalStatusEnum.PASSED);
-        Page<BizBusinessOutsourcerInfo> page = PageFactory.defaultPage();
-        page.setCurrent(1);
-        page.setSearchCount(false);
-        page.setSize(Integer.MAX_VALUE);
-        Page<BizBusinessOutsourcerInfo> resultPage = this.baseMapper.selectBatchForApprovalList(page, request, null);
-        return resultPage.getRecords();
-    }
-
-    @Override
     public ReturnDTO<OutsourcerSaveResponse> saveOutsourcer(BizBusinessOutsourcerInfo request) {
         //生成编号
+        String labCode = request.getLabCode();
+        String groupCode = request.getGroupCode();
         Long maxNo = this.baseMapper.selectMaxNo();
-        String outsourcerNo = NumberGeneratorUtil.getContactNo(PrefixCodeEnum.OUTSOURCER_PREFIX, maxNo);
+        String outsourcerNo = NoGeneratorUtil.getCode(NoGenerateFileCodeEnum.D, labCode, NoGenerateRecordTypeCodeEnum.OUTSOURCE_INFO, groupCode, maxNo);
         request.setOutsourcerNo(outsourcerNo);
         request.setCreateUserId(request.getUserId());
         request.setCreateUserName(request.getUserName());
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessSiteExecutiveInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessSiteExecutiveInfoServiceImpl.java
index ebab3e6..6c6a129 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessSiteExecutiveInfoServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessSiteExecutiveInfoServiceImpl.java
@@ -189,9 +189,9 @@
         QueryWrapper<BizBusinessSiteExecutiveStaffRelation> mWrapper = new QueryWrapper<>();
         mWrapper.eq("site_executive_id", siteExecutiveId);
         boolean mRemove = siteExecutiveStaffRelationService.remove(mWrapper);
-        Assert.isFalse(eRemove || mRemove, () -> {
+        if(!eRemove || !mRemove){
             throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
-        });
+        }
     }
 
     private void doPopulateSiteExecutive(SiteExecutiveDetailResponse detailResponse) {
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessLabExecutiveInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessLabExecutiveInfoServiceImpl.java
index 50c5616..0242fcf 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessLabExecutiveInfoServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessLabExecutiveInfoServiceImpl.java
@@ -297,6 +297,29 @@
     }
 
     @Override
+    public List<SampleLabExecutiveListResponse> deptLabExecutiveList(SampleLabExecutiveListRequest request) throws Exception {
+        Page<SampleLabExecutiveListResponse> page = PageFactory.defaultPage();
+        page.setCurrent(1);
+        page.setSearchCount(false);
+        page.setSize(Integer.MAX_VALUE);
+        Page<SampleLabExecutiveListResponse> resultPage = this.deptLabExecutiveListPage(page, request);
+        return resultPage.getRecords();
+    }
+
+    @Override
+    public List<SampleLabExecutiveListResponse> deptLabExecutiveListByIds(String measureStatus, List<Long> ids) throws Exception {
+        Page<SampleLabExecutiveListResponse> page = PageFactory.defaultPage();
+        page.setCurrent(1);
+        page.setSearchCount(false);
+        page.setSize(Integer.MAX_VALUE);
+        SampleLabExecutiveListRequest request = new SampleLabExecutiveListRequest();
+        request.setIds(ids);
+        request.setMeasureStatus(measureStatus);
+        Page<SampleLabExecutiveListResponse> resultPage = this.deptLabExecutiveListPage(page, request);
+        return resultPage.getRecords();
+    }
+
+    @Override
     public Page<SampleLabExecutiveListResponse> myLabExecutiveListPage(Page<SampleLabExecutiveListResponse> page, SampleLabExecutiveListRequest labExecutiveListRequest) throws Exception{
         AuthUser user = ShiroKit.getUser();
         Assert.isFalse(Objects.isNull(user), () -> {
@@ -350,6 +373,29 @@
     }
 
     @Override
+    public List<SampleLabExecutiveListResponse> myLabExecutiveList(SampleLabExecutiveListRequest request) throws Exception {
+        Page<SampleLabExecutiveListResponse> page = PageFactory.defaultPage();
+        page.setCurrent(1);
+        page.setSearchCount(false);
+        page.setSize(Integer.MAX_VALUE);
+        Page<SampleLabExecutiveListResponse> resultPage = this.myLabExecutiveListPage(page, request);
+        return resultPage.getRecords();
+    }
+
+    @Override
+    public List<SampleLabExecutiveListResponse> myLabExecutiveListByIds(String measureStatus, List<Long> ids) throws Exception {
+        Page<SampleLabExecutiveListResponse> page = PageFactory.defaultPage();
+        page.setCurrent(1);
+        page.setSearchCount(false);
+        page.setSize(Integer.MAX_VALUE);
+        SampleLabExecutiveListRequest request = new SampleLabExecutiveListRequest();
+        request.setIds(ids);
+        request.setMeasureStatus(measureStatus);
+        Page<SampleLabExecutiveListResponse> resultPage = this.myLabExecutiveListPage(page, request);
+        return resultPage.getRecords();
+    }
+
+    @Override
     public List<SampleAmountResponse> myExecutiveAmount() {
         //登录用户id获取计量人员id，实验室检测信息中存储的是计量人员id
         AuthUser user = ShiroKit.getUser();
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentInfoServiceImpl.java
index 864b05e..db8cad4 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentInfoServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentInfoServiceImpl.java
@@ -35,7 +35,6 @@
 import com.casic.missiles.utils.ConvertUtils;
 import com.casic.missiles.utils.DictCodeUtils;
 import com.casic.missiles.utils.NumberGeneratorUtil;
-import org.flowable.engine.RuntimeService;
 import org.flowable.engine.runtime.ProcessInstance;
 import org.jetbrains.annotations.NotNull;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -43,7 +42,6 @@
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
 
-import javax.annotation.Resource;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
@@ -81,8 +79,6 @@
     private IBizEquipmentAttachmentService attachmentService;
     @Autowired
     private IBizEquipmentCheckpointService checkpointService;
-    @Resource
-    private RuntimeService runtimeService;
     @Autowired
     private ApprovalOperateService approvalOperateService;
 
@@ -235,18 +231,18 @@
     private void updateRelationInfo(EquipmentAddRequest request, BizEquipmentInfoApproval equipmentInfoApproval) {
         QueryWrapper<BizEquipmentTechnicalTarget> targetWrapper = new QueryWrapper<>();
         targetWrapper.eq("equipment_no", equipmentInfoApproval.getEquipmentNo());
-        boolean removeTargetFlag = technicalTargetService.remove(targetWrapper);
-        boolean saveTargetFlag = technicalTargetService.saveBatch(request.getTechnicalTargetList());
+        technicalTargetService.remove(targetWrapper);
+        technicalTargetService.saveBatch(request.getTechnicalTargetList());
 
         QueryWrapper<BizEquipmentAttachment> attachmentWrapper = new QueryWrapper<>();
         attachmentWrapper.eq("equipment_no", equipmentInfoApproval.getEquipmentNo());
-        boolean removeAttachmentFlag = attachmentService.remove(attachmentWrapper);
-        boolean saveAttachmentFlag = attachmentService.saveBatch(request.getAttachmentList());
+        attachmentService.remove(attachmentWrapper);
+        attachmentService.saveBatch(request.getAttachmentList());
 
         QueryWrapper<BizEquipmentCheckpoint> checkpointWrapper = new QueryWrapper<>();
         checkpointWrapper.eq("equipment_no", equipmentInfoApproval.getEquipmentNo());
-        boolean removeCheckpointFlag = checkpointService.remove(checkpointWrapper);
-        boolean saveCheckpointFlag = checkpointService.saveBatch(request.getCheckpointList());
+        checkpointService.remove(checkpointWrapper);
+        checkpointService.saveBatch(request.getCheckpointList());
     }
 
     @Override
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardInfoServiceImpl.java
index faff1ae..c50a5b3 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardInfoServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardInfoServiceImpl.java
@@ -22,7 +22,9 @@
 import com.casic.missiles.mapper.equipment.BizEquipmentStandardInfoMapper;
 import com.casic.missiles.mapper.equipment.BizEquipmentStandardTechnologyRelationMapper;
 import com.casic.missiles.mapper.resource.BizResourceStaffInfoMapper;
-import com.casic.missiles.model.equipment.*;
+import com.casic.missiles.model.equipment.BizEquipmentStandardInfo;
+import com.casic.missiles.model.equipment.BizEquipmentStandardInfoApproval;
+import com.casic.missiles.model.equipment.BizEquipmentStandardTechnologyRelation;
 import com.casic.missiles.model.resource.BizResourceStaffInfo;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.dao.DeptMapper;
@@ -33,14 +35,12 @@
 import com.casic.missiles.service.flowable.ApprovalOperateService;
 import com.casic.missiles.utils.ConvertUtils;
 import com.casic.missiles.utils.DictCodeUtils;
-import org.flowable.engine.RuntimeService;
 import org.flowable.engine.runtime.ProcessInstance;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
 
-import javax.annotation.Resource;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
@@ -62,8 +62,6 @@
     private BizResourceStaffInfoMapper staffInfoMapper;
     @Autowired
     private IBaseApprovalService baseApprovalService;
-    @Resource
-    private RuntimeService runtimeService;
     @Autowired
     private ApprovalOperateService approvalOperateService;
     @Autowired

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java
index bb0c50f..13a699b 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java
@@ -12,6 +12,7 @@
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.IGeneralApprovalService;
+import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
@@ -19,6 +20,7 @@
 import org.springframework.web.bind.annotation.RequestBody;
 
 import javax.validation.Valid;
+import java.util.List;
 import java.util.Objects;
 
 /**
@@ -117,4 +119,17 @@
         }
         return baseApprovalService.failUpdate(request);
     }
+
+    public List<O> exportList(@RequestBody @Valid R request) throws Exception {
+        List<O> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = baseApprovalService.listExportByIds(request.getIds());
+        } else {
+            list = baseApprovalService.listExport(request);
+        }
+        for (O record : list) {
+            DictCodeUtils.convertDictCodeToName(record);
+        }
+        return list;
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java
index 8a90961..d775831 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java
@@ -5,6 +5,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.business.certificate.CertificateChangeApplyApprovalListRequest;
 import com.casic.missiles.dto.business.certificate.CertificateChangeApplySaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessCertificateChangeApply;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
@@ -20,6 +21,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -48,4 +50,12 @@
         }
         return changeApplyService.saveChangeApply(request);
     }
+
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody CertificateChangeApplyApprovalListRequest request) throws Exception {
+        List<BizBusinessCertificateChangeApply> list = super.exportList(request);
+        super.exportExcel(BizBusinessCertificateChangeApply.class, list, ExportEnum.CERTIFICATE_CHANGE_APPLY.getSheetName());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java
index 5fc4b07..af8230e 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java
@@ -9,6 +9,7 @@
 import com.casic.missiles.dto.business.certificate.CertificatePrintApprovalListRequest;
 import com.casic.missiles.dto.business.certificate.CertificatePrintListResponse;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.enums.business.CertificatePrintStatusEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessCertificatePrintLog;
@@ -18,10 +19,16 @@
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.io.IOException;
+import java.util.List;
 import java.util.Objects;
 
 /**
@@ -98,4 +105,16 @@
         });
         return certificatePrintService.certificatePrintLog(idDTO.getId());
     }
+
+    @ApiOperation("证书打印审批导出")
+    @PostMapping("/listExport")
+    public void exportList(@RequestBody CertificatePrintApprovalListRequest request) throws IOException {
+        List<CertificatePrintListResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = certificatePrintService.listByIds(request.getIds());
+        } else {
+            list = certificatePrintService.list(request);
+        }
+        super.exportExcel(CertificatePrintListResponse.class, list, ExportEnum.CERTIFICATE_PRINT.getSheetName());
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java
index 63b06dc..6b2efd5 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java
@@ -6,6 +6,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.business.certificate.CertificateReportApprovalListRequest;
 import com.casic.missiles.dto.business.certificate.CertificateReportSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessCertificateReport;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
@@ -21,6 +22,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -50,7 +52,7 @@
         return certificateReportService.saveCertificateReport(request);
     }
 
-    @ApiOperation("证书审批详情（基本信息）")
+    @ApiOperation("详情（基本信息）")
     @PostMapping("/detail")
     public ReturnDTO<BizBusinessCertificateReport> detail(@RequestBody @Valid BaseDetailRequest request, BindingResult bindingResult) throws Exception {
         if(bindingResult.hasErrors()){
@@ -59,4 +61,11 @@
         return certificateReportService.detail(request);
     }
 
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody CertificateReportApprovalListRequest request) throws Exception {
+        List<BizBusinessCertificateReport> list = super.exportList(request);
+        super.exportExcel(BizBusinessCertificateReport.class, list, ExportEnum.CERTIFICATE_REPORT.getSheetName());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java
index 46b26bd..57c0809 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java
@@ -10,20 +10,21 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.business.identify.IdentifyListRequest;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessIdentifyInfo;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.business.IBizBusinessIdentifyInfoService;
+import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import javax.validation.Valid;
+import java.util.List;
 import java.util.Objects;
 
 /**
@@ -57,16 +58,13 @@
         return identifyInfoService.addIdentify(identifyInfo);
     }
 
-    @ApiOperation("标识打印更新")
+    @ApiOperation("标识打印更新（更新打印时间）")
     @PostMapping("/update")
-    public ReturnDTO updateIdentify(@RequestBody @Valid BizBusinessIdentifyInfo identifyInfo, BindingResult bindingResult) {
-        Assert.isFalse(Objects.isNull(identifyInfo.getId()), () -> {
+    public ReturnDTO updateIdentify(@RequestBody @Valid IdDTO idDTO) {
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        Assert.isFalse(bindingResult.hasErrors(), () -> {
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        });
-        return identifyInfoService.updateIdentify(identifyInfo);
+        return identifyInfoService.updateIdentify(idDTO.getId());
     }
 
     @ApiOperation("标识打印删除")
@@ -77,4 +75,37 @@
         });
         return identifyInfoService.deleteIdentify(idDTO.getId());
     }
+
+    @ApiOperation("标识打印导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody @Valid IdentifyListRequest request, BindingResult bindingResult) throws Exception {
+        if (bindingResult.hasErrors()) {
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        List<BizBusinessIdentifyInfo> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = identifyInfoService.listByIds(request.getIds());
+        } else {
+            list = identifyInfoService.list(request);
+        }
+        for (BizBusinessIdentifyInfo record : list) {
+            DictCodeUtils.convertDictCodeToName(record);
+        }
+        super.exportExcel(BizBusinessIdentifyInfo.class, list, ExportEnum.IDENTIFY_EXPORT.getSheetName());
+    }
+
+
+    // TODO: 2023/8/23 查询设备信息，4个底部按钮查设备（按钮的作用就是前端用来调不同接口、用来区分中间即将展示的标识），前端弹窗选设备，在确定保存时前端根据底部按钮判断传入设备类型deviceType字典code
+    // TODO: 2023/8/23 接口：查受检设备（第1个按钮），查设备台账（后3个按钮同一接口），查询之后前端根据标志类型的不同加到中间页面时进行判断（按产品给的对应表）
+    // TODO: 2023/8/23 提供二维码接口，前端在加到中间页面时调用一下
+
+    @ApiOperation("设备二维码")
+    @PostMapping("/equipment/qrCode")
+    public ReturnDTO<String> equipmentQrCode(@RequestBody @Valid IdDTO idDTO) {
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return identifyInfoService.equipmentQrCode(idDTO.getId());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java
index 707be6e..7e0453d 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java
@@ -117,7 +117,7 @@
     }
 
     @ApiOperation("任务单导出")
-    @PostMapping("/export")
+    @PostMapping("/listExport")
     public void orderExport(@RequestBody @Valid OrderListRequest request, HttpServletResponse response) {
         businessOrderService.orderExport(request, response);
     }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java
index 529a6ce..51432be 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java
@@ -1,9 +1,28 @@
 package com.casic.missiles.controller.business;
 
+import com.casic.missiles.controller.GeneralApprovalController;
+import com.casic.missiles.dto.BaseApprovalSubmitRequest;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.business.outsource.OutsourceAssessApprovalListRequest;
+import com.casic.missiles.dto.business.outsource.OutsourceAssessSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
+import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.model.business.BizBusinessOutsourceAssess;
+import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
+import com.casic.missiles.service.IGeneralApprovalService;
+import com.casic.missiles.service.business.IBizBusinessOutsourceAssessService;
 import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.BindingResult;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.validation.Valid;
+import java.util.List;
+
 /**
  * <p>
  * 计量检定业务-分包管理-测试、校准或检定工作分包评审表 前端控制器
@@ -15,6 +34,27 @@
 @Api(tags = "分包管理-测试、校准或检定工作分包评审表")
 @RestController
 @RequestMapping("/business/outsource/assess")
-public class BizBusinessOutsourceAssessController {
+public class BizBusinessOutsourceAssessController extends GeneralApprovalController<BizBusinessOutsourceAssess, BizBusinessOutsourceAssess, OutsourceAssessApprovalListRequest, BaseApprovalSubmitRequest> {
+    @Autowired
+    private IBizBusinessOutsourceAssessService outsourceAssessService;
 
+    public BizBusinessOutsourceAssessController(IGeneralApprovalService<BizBusinessOutsourceAssess, BizBusinessOutsourceAssess, OutsourceAssessApprovalListRequest, BaseApprovalSubmitRequest> baseApprovalService) {
+        super(baseApprovalService);
+    }
+
+    @ApiOperation("草稿箱-保存")
+    @PostMapping("/save")
+    public ReturnDTO<OutsourceAssessSaveResponse> saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceAssess request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        return outsourceAssessService.saveOutsourceAssess(request);
+    }
+
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception {
+        List<BizBusinessOutsourceAssess> list = super.exportList(request);
+        super.exportExcel(BizBusinessOutsourceAssess.class, list, ExportEnum.OUTSOURCE_ASSESS.getSheetName());
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java
new file mode 100644
index 0000000..9adef18
--- /dev/null
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java
@@ -0,0 +1,60 @@
+package com.casic.missiles.controller.business;
+
+import com.casic.missiles.controller.GeneralApprovalController;
+import com.casic.missiles.dto.BaseApprovalSubmitRequest;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.business.outsource.OutsourceProtocolApprovalListRequest;
+import com.casic.missiles.dto.business.outsource.OutsourceProtocolSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
+import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.model.business.BizBusinessOutsourceProtocol;
+import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
+import com.casic.missiles.service.IGeneralApprovalService;
+import com.casic.missiles.service.business.IBizBusinessOutsourceProtocolService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.BindingResult;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.validation.Valid;
+import java.util.List;
+
+/**
+ * <p>
+ * 计量检定业务-分包管理-测试、校准或检定工作分包协议书 前端控制器
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-08-24
+ */
+@Api(tags = "分包管理-测试、校准或检定工作分包协议书")
+@RestController
+@RequestMapping("/business/outsource/protocol")
+public class BizBusinessOutsourceProtocolController extends GeneralApprovalController<BizBusinessOutsourceProtocol, BizBusinessOutsourceProtocol, OutsourceProtocolApprovalListRequest, BaseApprovalSubmitRequest> {
+    @Autowired
+    private IBizBusinessOutsourceProtocolService outsourceProtocolService;
+
+    public BizBusinessOutsourceProtocolController(IGeneralApprovalService<BizBusinessOutsourceProtocol, BizBusinessOutsourceProtocol, OutsourceProtocolApprovalListRequest, BaseApprovalSubmitRequest> baseApprovalService) {
+        super(baseApprovalService);
+    }
+
+    @ApiOperation("草稿箱-保存")
+    @PostMapping("/save")
+    public ReturnDTO<OutsourceProtocolSaveResponse> saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceProtocol request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        return outsourceProtocolService.saveOutsourceProtocol(request);
+    }
+
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody OutsourceProtocolApprovalListRequest request) throws Exception {
+        List<BizBusinessOutsourceProtocol> list = super.exportList(request);
+        super.exportExcel(BizBusinessOutsourceProtocol.class, list, ExportEnum.OUTSOURCE_PROTOCOL.getSheetName());
+    }
+}
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java
index 097f645..f0f0943 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java
@@ -17,7 +17,6 @@
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.IGeneralApprovalService;
 import com.casic.missiles.service.business.IBizBusinessOutsourcerInfoService;
-import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -71,19 +70,8 @@
 
     @ApiOperation("分包方导出")
     @PostMapping("/listExport")
-    public void export(@RequestBody @Valid OutsourcerInfoApprovalListRequest request, BindingResult bindingResult) throws Exception {
-        if (bindingResult.hasErrors()) {
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        }
-        List<BizBusinessOutsourcerInfo> list;
-        if (!CollectionUtils.isEmpty(request.getIds())) {
-            list = outsourcerInfoService.listByIds(request.getIds());
-        } else {
-            list = outsourcerInfoService.list(request);
-        }
-        for (BizBusinessOutsourcerInfo record : list) {
-            DictCodeUtils.convertDictCodeToName(record);
-        }
+    public void export(@RequestBody OutsourcerInfoApprovalListRequest request) throws Exception {
+        List<BizBusinessOutsourcerInfo> list = super.exportList(request);
         super.exportExcel(BizBusinessOutsourcerInfo.class, list, ExportEnum.OUTSOURCER_EXPORT.getSheetName());
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java
index c2cbf9f..0410918 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java
@@ -17,11 +17,9 @@
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.IGeneralApprovalService;
 import com.casic.missiles.service.business.IBizBusinessSiteExecutiveInfoService;
-import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -60,7 +58,7 @@
         return siteExecutiveInfoService.saveSiteExecutiveInfo(siteExecutiveInfo);
     }
 
-    @ApiOperation("现场检测详情")
+    @ApiOperation("详情")
     @PostMapping("/detail")
     public ReturnDTO<SiteExecutiveDetailResponse> siteExecutiveDetail(@RequestBody @Valid IdDTO idDTO) throws Exception {
         Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
@@ -69,21 +67,10 @@
         return ReturnUtil.success(siteExecutiveInfoService.detail(idDTO.getId()));
     }
 
-    @ApiOperation("现场检测导出")
+    @ApiOperation("导出")
     @PostMapping("/listExport")
-    public void export(@RequestBody @Valid SiteExecutiveApprovalListRequest request, BindingResult bindingResult) throws Exception {
-        if (bindingResult.hasErrors()) {
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        }
-        List<SiteExecutiveApprovalListResponse> list;
-        if (!CollectionUtils.isEmpty(request.getIds())) {
-            list = siteExecutiveInfoService.listInfoByIds(request.getIds());
-        } else {
-            list = siteExecutiveInfoService.listInfo(request);
-        }
-        for (SiteExecutiveApprovalListResponse record : list) {
-            DictCodeUtils.convertDictCodeToName(record);
-        }
+    public void export(@RequestBody SiteExecutiveApprovalListRequest request) throws Exception {
+        List<SiteExecutiveApprovalListResponse> list = super.exportList(request);
         super.exportExcel(SiteExecutiveApprovalListResponse.class, list, ExportEnum.SITE_EXECUTIVE_EXPORT.getSheetName());
     }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
index 7e793cd..a92e209 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
@@ -55,7 +55,7 @@
 
     @ApiOperation("设备收发列表导出")
     @PostMapping("/export")
-    public void exportList(@RequestBody @Valid SampleDispatchListRequest request) throws IOException {
+    public void exportList(@RequestBody SampleDispatchListRequest request) throws IOException {
         List<SampleDispatchListResponse> list;
         if (!CollectionUtils.isEmpty(request.getIds())) {
             list = dispatchService.listByIds(request.getIds());
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java
index cdc77fc..d120fd4 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java
@@ -7,6 +7,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.business.labExecutive.*;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.business.IBusinessLabExecutiveInfoService;
@@ -14,6 +15,7 @@
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.*;
 
@@ -32,7 +34,7 @@
     @Autowired
     private IBusinessLabExecutiveInfoService labExecutiveInfoService;
 
-    @ApiOperation("实验室检测-部门检测-查询各状态列表（待检测、检测中、检测完）")
+    @ApiOperation("实验室任务-查询各状态列表（待检测、检测中、检测完）")
     @PostMapping("/deptExecutive/List")
     public ReturnDTO<PageInfoBT<SampleLabExecutiveListResponse>> queryDeptExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
@@ -43,10 +45,19 @@
         return ReturnUtil.success(super.packForBT(labExecutiveInfoService.deptLabExecutiveListPage(page, labExecutiveListRequest)));
     }
 
-    /**
-     * 实验室检测-我的检测-查询各状态列表（待检测、检测中、检测完）
-     */
-    @ApiOperation("实验室检测-我的检测-查询各状态列表（待检测、检测中、检测完）")
+    @ApiOperation("实验室任务导出")
+    @PostMapping("/deptExecutive/export")
+    public void deptExportList(@RequestBody @Valid SampleLabExecutiveListRequest request) throws Exception {
+        List<SampleLabExecutiveListResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = labExecutiveInfoService.deptLabExecutiveListByIds(request.getMeasureStatus(), request.getIds());
+        } else {
+            list = labExecutiveInfoService.deptLabExecutiveList(request);
+        }
+        super.exportExcel(SampleLabExecutiveListResponse.class, list, ExportEnum.DEPT_EXECUTIVE_TASK.getSheetName());
+    }
+
+    @ApiOperation("我的任务-查询各状态列表（待检测、检测中、检测完）")
     @PostMapping("/myExecutive/list")
     public ReturnDTO<PageInfoBT<SampleLabExecutiveListResponse>> queryMyExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
@@ -57,19 +68,25 @@
         return ReturnUtil.success(super.packForBT(labExecutiveInfoService.myLabExecutiveListPage(page, labExecutiveListRequest)));
     }
 
-    /**
-     * 实验室检测-我的检测-查询各状态样品数量（待检测、检测中、检测完）
-     */
-    @ApiOperation("实验室检测-我的检测-查询各状态样品数量（待检测、检测中、检测完）")
+    @ApiOperation("我的任务导出")
+    @PostMapping("/myExecutive/export")
+    public void exportList(@RequestBody @Valid SampleLabExecutiveListRequest request) throws Exception {
+        List<SampleLabExecutiveListResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = labExecutiveInfoService.myLabExecutiveListByIds(request.getMeasureStatus(), request.getIds());
+        } else {
+            list = labExecutiveInfoService.myLabExecutiveList(request);
+        }
+        super.exportExcel(SampleLabExecutiveListResponse.class, list, ExportEnum.MY_EXECUTIVE_TASK.getSheetName());
+    }
+
+    @ApiOperation("我的任务-查询各状态样品数量（待检测、检测中、检测完）")
     @GetMapping("/myExecutive/amount")
     public ReturnDTO<List<SampleAmountResponse>> queryMyExecutiveAmount() {
         return ReturnUtil.success(labExecutiveInfoService.myExecutiveAmount());
     }
 
-    /**
-     * 实验室检测-部门检测-分配（分配给具体人员）
-     */
-    @ApiOperation("实验室检测-部门检测-分配按钮（分配给具体人员）")
+    @ApiOperation("实验室任务-分配按钮（分配给具体人员）")
     @PostMapping("/deptExecutive/allocate")
     public ReturnDTO allocateStaff(@RequestBody @Valid SampleAllocateRequest sampleAllocateRequest, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -78,10 +95,7 @@
         return labExecutiveInfoService.allocateStaff(sampleAllocateRequest);
     }
 
-    /**
-     * 实验室检测-我的检测-检定人扫描收入（待检测->检测中）
-     */
-    @ApiOperation("实验室检测-我的检测-检定人扫描收入（待检测->检测中）")
+    @ApiOperation("我的任务-检定人扫描收入（待检测->检测中）")
     @PostMapping("/myExecutive/receive")
     public ReturnDTO sampleReceive(@RequestBody @Valid List<SampleOperateRequest> requestList, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -90,10 +104,7 @@
         return labExecutiveInfoService.sampleReceive(requestList);
     }
 
-    /**
-     * 实验室检测-负责人/检定人扫描检完（检测中->检测完）
-     */
-    @ApiOperation("实验室检测-负责人/检定人扫描检完（检测中->检测完）")
+    @ApiOperation("实验室任务-负责人/检定人扫描检完（检测中->检测完）")
     @PostMapping("/myExecutive/complete")
     public ReturnDTO sampleExecutiveComplete(@RequestBody @Valid List<SampleOperateRequest> requestList, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -102,10 +113,7 @@
         return labExecutiveInfoService.sampleExecutiveComplete(requestList);
     }
 
-    /**
-     * 实验室检测-部门检测/我的检测 编辑（只能修改应出具证书）
-     */
-    @ApiOperation("实验室检测-部门检测/我的检测 编辑（只能修改应出具证书）")
+    @ApiOperation("实验室任务/我的任务 编辑（只能修改应出具证书）")
     @PostMapping("/executive/update")
     public ReturnDTO updateExecutive(@RequestBody @Valid UpdateExecutiveRequest request, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -114,10 +122,7 @@
         return labExecutiveInfoService.updateExecutive(request);
     }
 
-    /**
-     * 实验室检测-部门检测/我的检测 详情
-     */
-    @ApiOperation("实验室检测-部门检测/我的检测 详情")
+    @ApiOperation("实验室任务/我的任务 详情")
     @PostMapping("/executive/detail")
     public ReturnDTO<ExecutiveDetailResponse> executiveDetail(@RequestBody @Valid ExecutiveDetailRequest request, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
@@ -131,7 +136,7 @@
      * 退回后会将下一个要执行的实验室检测状态更新为待分配，将后面的实验室顺序变更为连续（都进行减1）
      * 最后一个检测的实验室退回，等分发员再增加实验室或设备收发中的已收入直接手动点击完成
      */
-    @ApiOperation("实验室检测-部门检测/我的检测 退回（待检测/检测中->退回）")
+    @ApiOperation("实验室任务/我的任务 退回（待检测/检测中->退回）")
     @PostMapping("/executive/sendBack")
     public ReturnDTO executiveSendBack(@RequestBody @Valid ExecutiveSendBackRequest request, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -140,9 +145,6 @@
         return labExecutiveInfoService.sampleExecutiveSendBack(request);
     }
 
-    /**
-     * 分发员编辑实验室检测列表
-     */
     @ApiOperation("分发员编辑实验室检测列表")
     @PostMapping("/handOut/updateList")
     public ReturnDTO updateExecutiveList(@RequestBody @Valid UpdateExecutiveListRequest request, BindingResult bindingResult) {
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java
index 48a67ed..0c04f31 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java
@@ -10,6 +10,7 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.resource.customer.CustomerApprovalListRequest;
 import com.casic.missiles.dto.resource.customer.CustomerSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceCustomerInfo;
@@ -26,6 +27,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -55,6 +57,13 @@
         return customerInfoService.saveCustomerInfo(request);
     }
 
+    @ApiOperation("委托方名录导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody CustomerApprovalListRequest request) throws Exception {
+        List<BizResourceCustomerInfo> list = super.exportList(request);
+        super.exportExcel(BizResourceCustomerInfo.class, list, ExportEnum.CUSTOMER_INFO.getSheetName());
+    }
+
     @ApiOperation("委托方人员列表（分页）")
     @PostMapping("/person/listPage")
     public ReturnDTO<PageInfoBT<BizResourceCustomerStaff>> personListPage(@RequestBody IdDTO idDto) {
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
index 972ed4b..6418ea5 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
@@ -5,6 +5,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.resource.customer.SuggestFormApprovalListRequest;
 import com.casic.missiles.dto.resource.customer.SuggestFormSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceCustomerSuggestForm;
@@ -20,6 +21,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -50,4 +52,11 @@
         return suggestFormService.saveSuggestForm(request);
     }
 
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody SuggestFormApprovalListRequest request) throws Exception {
+        List<BizResourceCustomerSuggestForm> list = super.exportList(request);
+        super.exportExcel(BizResourceCustomerSuggestForm.class, list, ExportEnum.CUSTOMER_SUGGEST_FORM.getSheetName());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java
index 1934d1a..9e07eab 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java
@@ -15,12 +15,16 @@
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.resource.IEnvEnvironmentRecordConfigService;
 import com.casic.missiles.service.resource.IEnvEnvironmentRecordDataService;
+import com.casic.missiles.service.resource.IEnvLocationInfoService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
 import java.util.List;
@@ -39,6 +43,8 @@
     private IEnvEnvironmentRecordDataService environmentRecordDataService;
     @Autowired
     private IEnvEnvironmentRecordConfigService environmentRecordConfigService;
+    @Autowired
+    private IEnvLocationInfoService locationInfoService;
 
     @ApiOperation("环境记录单数据列表/详情")
     @PostMapping("/data/listPage")
@@ -95,4 +101,11 @@
         });
         return environmentRecordConfigService.deleteEnvironmentRecordConfig(idDTO.getId());
     }
+
+    @ApiOperation("地点列表")
+    @PostMapping("/location/listPage")
+    public ReturnDTO<PageInfoBT<LocationListResponse>> locationListPage(@RequestBody @Valid LocationListRequest request) {
+        Page<LocationListResponse> page = PageFactory.defaultPage();
+        return ReturnUtil.success(super.packForBT(locationInfoService.listPage(page, request)));
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java
index 82efe3f..e9561fa 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java
@@ -10,6 +10,7 @@
 import com.casic.missiles.dto.resource.seal.SealLogListRequest;
 import com.casic.missiles.dto.resource.seal.SealNoteApprovalListRequest;
 import com.casic.missiles.dto.resource.seal.SealNoteSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceSealUseLog;
@@ -27,6 +28,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -58,6 +60,13 @@
         return sealUseNoteService.saveSeal(request);
     }
 
+    @ApiOperation("印章使用登记导出（列表和导出中去掉经办人和监印人）")
+    @PostMapping("/listExport")
+    public void export(@RequestBody SealNoteApprovalListRequest request) throws Exception {
+        List<BizResourceSealUseNote> list = super.exportList(request);
+        super.exportExcel(BizResourceSealUseNote.class, list, ExportEnum.SEAL_NOTE.getSheetName());
+    }
+
     // TODO: 2023/7/28 印章使用日志：系统中使用印章时插入数据库
 
     @ApiOperation("印章使用日志列表（分页）")
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java
index 9b674fc..06b6521 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java
@@ -9,16 +9,20 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.resource.staff.StaffCertRequest;
 import com.casic.missiles.dto.resource.staff.StaffCertResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.service.resource.IBizResourceStaffInfoService;
 import com.casic.missiles.service.resource.IBizResourceStaffVerifierService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.List;
+
 /**
  * @Description:
  * @Author: wangpeng
@@ -41,9 +45,21 @@
         return ReturnUtil.success(super.packForBT(responsePage));
     }
 
+    @ApiOperation("证书逾期提醒导出")
+    @PostMapping("/listExport")
+    public void exportList(@RequestBody StaffCertRequest request) throws Exception {
+        List<StaffCertResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = staffInfoService.certListByIds(request.getIds());
+        } else {
+            list = staffInfoService.certList(request);
+        }
+        super.exportExcel(StaffCertResponse.class, list, ExportEnum.STAFF_CERTIFICATE_EXPIRE.getSheetName());
+    }
+
     @ApiOperation("证书逾期提醒")
     @PostMapping("/expirationReminder")
-    public ReturnDTO expirationReminder(@RequestBody IdDTO idDto) {
-        return verifierService.expirationReminder(idDto);
+    public ReturnDTO expirationReminder(@RequestBody IdDTO idDTO) {
+        return verifierService.expirationReminder(idDTO);
     }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java
index 3b251ad..a6e7850 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java
@@ -12,6 +12,7 @@
 import com.casic.missiles.dto.resource.staff.StaffListRequest;
 import com.casic.missiles.dto.resource.staff.TrainListRequest;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.*;
@@ -22,7 +23,10 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
 import java.util.List;
@@ -52,8 +56,19 @@
             throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
         }
         Page<BizResourceStaffInfo> page = PageFactory.defaultPage();
-        Page<BizResourceStaffInfo> responsePage = staffInfoService.listPage(page, request);
-        return ReturnUtil.success(super.packForBT(responsePage));
+        return ReturnUtil.success(super.packForBT(staffInfoService.listPage(page, request)));
+    }
+
+    @ApiOperation("人员登记导出")
+    @PostMapping("/listExport")
+    public void exportList(@RequestBody StaffListRequest request) throws Exception {
+        List<BizResourceStaffInfo> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = staffInfoService.listByIds(request.getIds());
+        } else {
+            list = staffInfoService.list(request);
+        }
+        super.exportExcel(BizResourceStaffInfo.class, list, ExportEnum.STAFF_INFO.getSheetName());
     }
 
     @ApiOperation("人员登记详情基础信息")
@@ -85,9 +100,9 @@
 
     @ApiOperation("科研教育列表（分页）")
     @PostMapping("/education/listPage")
-    public ReturnDTO<PageInfoBT<BizResourceStaffEducation>> educationListPage(@RequestBody IdDTO idDto) {
+    public ReturnDTO<PageInfoBT<BizResourceStaffEducation>> educationListPage(@RequestBody IdDTO idDTO) {
         Page<BizResourceStaffEducation> page = PageFactory.defaultPage();
-        Page<BizResourceStaffEducation> responsePage = staffInfoService.educationListPage(page, idDto);
+        Page<BizResourceStaffEducation> responsePage = staffInfoService.educationListPage(page, idDTO);
         return ReturnUtil.success(super.packForBT(responsePage));
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java
index af6aa86..d85d84a 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java
@@ -9,6 +9,7 @@
 import com.casic.missiles.dto.resource.outsideService.SupplierApprovalListRequest;
 import com.casic.missiles.dto.resource.outsideService.SupplierSaveResponse;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceSupplierAbility;
@@ -67,6 +68,13 @@
         return ReturnUtil.success(supplierInfoService.detail(idDTO.getId()));
     }
 
+    @ApiOperation("合格供方导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody SupplierApprovalListRequest request) throws Exception {
+        List<BizResourceSupplierInfo> list = super.exportList(request);
+        super.exportExcel(BizResourceSupplierInfo.class, list, ExportEnum.SUPPLIER_INFO.getSheetName());
+    }
+
     @ApiOperation("供方人员列表（分页）")
     @PostMapping("/person/listPage")
     public ReturnDTO<PageInfoBT<BizResourceSupplierPerson>> personListPage(@RequestBody IdDTO idDTO) {
diff --git a/casic-metering-api/src/main/resources/config/application.yml b/casic-metering-api/src/main/resources/config/application.yml
index 350db5f..ecff521 100644
--- a/casic-metering-api/src/main/resources/config/application.yml
+++ b/casic-metering-api/src/main/resources/config/application.yml
@@ -126,7 +126,7 @@
     #作者
     author: wangpeng
     #待生成对象表名
-    table-name: biz_equipment_technical_target_approval,biz_equipment_attachment_approval,biz_equipment_checkpoint_approval
+    table-name: biz_business_outsource_protocol
 
 reminder:
   #节点--common模块config包 ReminderNodeConfig配置
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
index 4a19e4e..d47d552 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
@@ -53,6 +53,7 @@
     SUGGEST_FORM_SAVE_FAILED(2509, "委托方意见登记表保存至草稿箱失败"),
     EXAMINE_FORM_SAVE_FAILED(2510, "要求、委托书及合同评审表保存至草稿箱失败"),
     CUSTOMER_EXIST_SAVE_FAILED(2511, "该委托方已存在，请重新选择"),
+    DUPLICATE_LOCATION_NO(2512, "地点编号已存在"),
 
     /**
      * 计量检定业务模块
@@ -68,6 +69,8 @@
     COMPLETE_SAMPLE_NOT_EXIST(2609, "检测中不存在扫描收入的样品"),
     CANNOT_CHANGE_MEASURE_INFO(2610, "无法更改非当前登录用户的检测信息"),
     NON_EXIST_ORDER_OR_SAMPLE(2611, "不存在该委托单或该委托单下的样品"),
+    OUTSOURCE_ACCESS_SAVE_FAILED(2612, "测试、校准或检定工作分包评审表保存至草稿箱失败"),
+    OUTSOURCE_PROTOCOL_SAVE_FAILED(2613, "测试、校准或检定工作分包协议书保存至草稿箱失败"),
 
     /**
      * 历史遗留备用
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
index 5089ad1..81a406b 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
@@ -10,54 +10,38 @@
     /**
      * 资源管理
      */
-    ENVIRONMENT_DATA_EXPORT("environmentData", "environmentData", "环境记录单数据"),
+    ENVIRONMENT_DATA_EXPORT("environmentData", "环境记录单数据", "环境记录单数据"),
+    STAFF_INFO("staffInfo", "人员登记", "人员登记"),
+    STAFF_CERTIFICATE_EXPIRE("certificateExpire", "证书逾期提醒", "证书逾期提醒"),
+    SUPPLIER_INFO("supplierInfo", "合格供方名录", "合格供方名录"),
+    CUSTOMER_INFO("customerInfo", "委托方名录", "委托方名录"),
+    CUSTOMER_SUGGEST_FORM("customerSuggestForm", "委托方意见登记表", "委托方意见登记表"),
+    SEAL_NOTE("sealNote", "印章使用登记", "印章使用登记"),
 
-    FILE_EXPORT("meterFileData", "meterFileData", "计量文件信息"),
-    TRAIN_PLAN_EXPORT("trainPlanData", "trainPlanData", "培训计划"),
-    TRAIN_LOG_EXPORT("trainLogData", "trainLogData", "培训记录"),
-    METER_ORGANIZE_EXPORT("meterOrganizeData", "meterOrganizeData", "计量组织"),
-    TRACE_SUPPLIER_EXPORT("traceSupplierData", "traceSupplierData", "溯源供方"),
-    SIGN_EXPORT("signData", "signData", "签名/签章"),
-    TEMPLATE_EXPORT("templateData", "templateData", "原始记录模板/证书报告模板"),
-    FIXED_ASSETS("meterFixedAssets", "meterFixedAssets", "固定资产"),
-    METER_EQUIPMENT("meterEquipment", "meterEquipment", "测量设备"),
-    CALIBRATION_TEST_EQUIPMENT("calibrationTestEquipment", "calibrationTestEquipment", "校准检定设备"),
-    MEASURE_ACCOUNT("measureAccount", "measureAccount", "测量工装"),
-    STANDARD_SUPPORT_EQUIPMENT("standardSupportEquipment", "standardSupportEquipment", "标准配套设备"),
-    STANDARD_EQUIPMENT("standardEquipment", "standardEquipment", "标准装置"),
-    FLOW_DEF_EXPORT("flowDefData", "flowDefData", "流程定义"),
-    STAFF_CERTIFICATE("certificate", "certificate", "计量人员证书"),
-    CHECK_INFO("checkInfo", "checkInfo", "设备管理点检测"),
-    EQUIPMENT_APPLY("equipmentApply", "equipmentApply", "设备借用"),
-    STANDARD_EQUIPMENT_REMIND("equipmentApplyRemind", "equipmentApplyRemind", "标准装置到期提醒"),
-    METER_PRICE("meterPrice", "meterPrice", "价格库"),
-    METER_STAFF("meterStaff", "meterStaff", "计量人员"),
-    STANDARD_EQUIPMENT_APPLY("standardEquipmentApply", "standardEquipmentApply", "标准装置申请"),
-    STATE_MANAGE_APPLY("stateManage", "stateManage", "状态管理"),
-    METER_ACCEPTANCE_CHECK("acceptanceCheck", "acceptanceCheck", "设备检修保养验收单"),
-    CUSTOMER_EXPORT("customerData", "customerData", "客户信息"),
-    ORDER_EXPORT("orderData", "orderData", "委托书信息"),
-    SAMPLE_EXPORT("sampleData", "sampleData", "样本信息"),
-    EXCHANGE_DATA("exchangeData", "exchangeData", "设备交接单"),
-    DISPATCH_DATA("dispatchData", "dispatchData", "设备收发"),
-    ENVIRONMENT_DATA("environmentData", "environmentData", "环境记录单"),
-    ORIGIN_DATA("originData", "originData", "原始记录"),
-    CERTIFICATE_REPORT("certificateReport", "certificateReport", "证书报告"),
-    ADVICE_EXPORT("adviceData", "adviceData", "客户反馈"),
-    HANDOUT_EXPORT("handoutData", "handoutData", "任务分发列表"),
-    OUTSOURCER_EXPORT("outsourcerData", "outsourcerData", "分包方"),
-    SITE_EXECUTIVE_EXPORT("siteExecutiveData", "siteExecutiveData", "现场测试、校准或检定"),
-    CERTIFICATE_PRINT_EXPORT("certificatePrintData", "certificatePrintData", "证书打印"),
-    DOWNLOAD_TEMPLATE("downloadTemplate", "downloadTemplate", "页面配置"),
-    OUTSOURCER_CERTIFICATE_EXPORT("outsourceCertificateData", "outsourceCertificateData", "分包证书"),
-    SETTLEMENT_INFO_EXPORT("settlementInfoData", "settlementInfoData", "业务结算"),
-    EQUIPMENT_REMIND("equipmentRemind", "equipmentRemind", "设备到期提醒"),
-    AGREEMENT_INFO_EXPORT("agreementInfoData", "agreementInfoData", "合同"),
-    WORK_STATISTICS_EXPORT("workStatisticsData", "workStatisticsData", "实时工作统计"),
-    DEPT_OUTPUT_EXPORT("deptOutputData", "deptOutputData", "部门产值分析"),
-    WORKLOAD_EXPORT("workloadData", "workloadData", "业务工作量分析"),
-    DEPT_COMPREHENSIVE_EXPORT("deptComprehensiveData", "deptComprehensiveData", "部门综合分析"),
-    ENVIRONMENTAL_RECORD("environmentalRecordData", "environmentalRecordData", "现场环境记录");
+    /**
+     * 计量检定业务
+     */
+    OUTSOURCER_EXPORT("outsourcerData", "分包方名录", "分包方名录"),
+    IDENTIFY_EXPORT("identifyData", "计量标识", "计量标识"),
+    ORDER_EXPORT("orderData", "任务单", "任务单"),
+    DISPATCH_DATA("dispatchData", "设备收发", "设备收发"),
+    HANDOUT_EXPORT("handoutData", "任务分发", "任务分发"),
+    SITE_EXECUTIVE_EXPORT("siteExecutiveData", "现场测试、校准或检定", "现场测试、校准或检定"),
+    CERTIFICATE_REPORT("certificateReport", "证书审批", "证书审批"),
+    CERTIFICATE_CHANGE_APPLY("certificateChangeApply", "证书报告补充或更换申请单", "证书报告补充或更换申请单"),
+    CERTIFICATE_PRINT("certificatePrintData", "证书打印审批", "证书打印审批"),
+    DEPT_EXECUTIVE_TASK("deptExecutiveTaskData", "实验室任务", "实验室任务"),
+    MY_EXECUTIVE_TASK("myExecutiveTaskData", "我的任务", "我的任务"),
+    OUTSOURCE_ASSESS("outsourceAssess", "测试、校准或检定工作分包评审表", "测试、校准或检定工作分包评审表"),
+    OUTSOURCE_PROTOCOL("outsourceProtocol", "测试、校准或检定工作分包协议书", "测试、校准或检定工作分包协议书"),
+
+    /**
+     * 系统管理
+     */
+    SIGN_EXPORT("signData", "签名", "签名"),
+    TEMPLATE_EXPORT("templateData", "文件模板", "文件模板"),
+    FLOW_DEF_EXPORT("flowDefData", "流程定义", "流程定义"),
+    DOWNLOAD_TEMPLATE("downloadTemplate", "流程定义", "页面配置");
 
     ExportEnum(String fileName, String sheetName, String description) {
         this.fileName = fileName;
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateRecordTypeCodeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateRecordTypeCodeEnum.java
index 31d913c..a963522 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateRecordTypeCodeEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateRecordTypeCodeEnum.java
@@ -46,4 +46,14 @@
     String SITE_EXECUTIVE_APPROVAL = "01";
     //《现场测试、校准或检定工作记录表》
     String SITE_EXECUTIVE_LOG = "02";
+
+    //测试、校准或检定工作分包协议书
+    String OUTSOURCE_PROTOCOL = "01";
+    //测试、校准或检定工作分包评审表
+    String OUTSOURCE_ACCESS = "02";
+    //测试、校准或检定工作分包通知书
+    String OUTSOURCE_NOTICE = "03";
+    //测试、校准或检定工作分包方名录
+    String OUTSOURCE_INFO = "04";
+
 }
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
index 24b8635..f78bd53 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
@@ -15,6 +15,10 @@
     String CERTIFICATE_CHANGE_APPLY_BEAN_NAME = "certificateChangeApplyBean";
     //现场测试、校准或检定
     String SITE_EXECUTIVE_BEAN_NAME = "siteExecutiveBean";
+    //测试、校准或检定工作分包评审表
+    String OUTSOURCE_ASSESS_BEAN_NAME = "outsourceAssessBean";
+    //测试、校准或检定工作分包协议书
+    String OUTSOURCE_PROTOCOL_BEAN_NAME = "outsourceProtocolBean";
 
     /*********************************设备与装置************************************/
     //设备台账
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 b21c661..6b86fd1 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
@@ -18,6 +18,8 @@
     OUTSOURCER_APPROVAL(OUTSOURCER_BEAN_NAME, ""),
     CERTIFICATE_CHANGE_APPROVAL(CERTIFICATE_CHANGE_APPLY_BEAN_NAME, ""),
     SITE_EXECUTIVE_APPROVAL(SITE_EXECUTIVE_BEAN_NAME, ""),
+    OUTSOURCE_ASSESS_APPROVAL(OUTSOURCE_ASSESS_BEAN_NAME, ""),
+    OUTSOURCE_PROTOCOL_APPROVAL(OUTSOURCE_PROTOCOL_BEAN_NAME, ""),
 
     ACTION_STATUS_MAP(new HashMap<String, AwareActionStatusEnum>() {
         {
@@ -47,6 +49,10 @@
             put(ApplyFromIdEnum.CERTIFICATE_CHANGE_APPROVAL.getCode(), CERTIFICATE_CHANGE_APPROVAL);
             //现场测试、校准或检定审批
             put(ApplyFromIdEnum.SITE_EXECUTIVE_APPROVAL.getCode(), SITE_EXECUTIVE_APPROVAL);
+            //测试、校准或检定工作分包评审表
+            put(ApplyFromIdEnum.OUTSOURCE_ASSESS_APPROVAL.getCode(), OUTSOURCE_ASSESS_APPROVAL);
+            //测试、校准或检定工作分包协议书
+            put(ApplyFromIdEnum.OUTSOURCE_PROTOCOL_APPROVAL.getCode(), OUTSOURCE_PROTOCOL_APPROVAL);
         }
     });
     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 934405e..c7410bd 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
@@ -9,6 +9,8 @@
     CERTIFICATE_CHANGE_APPROVAL("jljdywzsbchghsqd", MessageSourceModuleEnum.BUSINESS.getCode(), "证书/报告补充或更换申请单"),
     OUTSOURCER_APPROVAL("jljdywcsjzhgfbfml", MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定合格分包方名录"),
     SITE_EXECUTIVE_APPROVAL("jljdywxccsjzsp", MessageSourceModuleEnum.BUSINESS.getCode(), "现场测试、校准或检定审批"),
+    OUTSOURCE_ASSESS_APPROVAL("jljdywcsjzfbpsb", MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包评审表"),
+    OUTSOURCE_PROTOCOL_APPROVAL("jljdywcsjzfbxys", MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包协议书"),
 
 
     /*******************************************设备与装置*********************************************/
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/GeneralApprovalMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/GeneralApprovalMapper.java
index 4fb7344..0c9d6ae 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/GeneralApprovalMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/GeneralApprovalMapper.java
@@ -17,8 +17,4 @@
 
     Page<O> selectBatchForApprovalList(Page<O> page, @Param("request") R request, @Param("businessKeys") List<String> businessKeys);
 
-//    Page<O> selectListPage(Page<O> page, @Param("request") R request);
-
-//    Long selectMaxNo();
-
 }
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceAssessMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceAssessMapper.java
index 7867bb8..ba59009 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceAssessMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceAssessMapper.java
@@ -1,7 +1,12 @@
 package com.casic.missiles.mapper.business;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.business.outsource.OutsourceAssessApprovalListRequest;
+import com.casic.missiles.mapper.GeneralApprovalMapper;
 import com.casic.missiles.model.business.BizBusinessOutsourceAssess;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * <p>
@@ -11,6 +16,10 @@
  * @author wangpeng
  * @since 2023-08-16
  */
-public interface BizBusinessOutsourceAssessMapper extends BaseMapper<BizBusinessOutsourceAssess> {
+public interface BizBusinessOutsourceAssessMapper extends GeneralApprovalMapper<BizBusinessOutsourceAssess, BizBusinessOutsourceAssess, OutsourceAssessApprovalListRequest> {
+
+    Page<BizBusinessOutsourceAssess> selectBatchForApprovalList(Page<BizBusinessOutsourceAssess> page, @Param("request") OutsourceAssessApprovalListRequest request, @Param("businessKeys") List<String> businessKeys);
+
+    Long selectMaxProjectNo();
 
 }
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceProtocolMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceProtocolMapper.java
new file mode 100644
index 0000000..e6aba35
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceProtocolMapper.java
@@ -0,0 +1,24 @@
+package com.casic.missiles.mapper.business;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.business.outsource.OutsourceProtocolApprovalListRequest;
+import com.casic.missiles.mapper.GeneralApprovalMapper;
+import com.casic.missiles.model.business.BizBusinessOutsourceProtocol;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 计量检定业务-分包管理-测试、校准或检定工作分包协议书 Mapper 接口
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-08-24
+ */
+public interface BizBusinessOutsourceProtocolMapper extends GeneralApprovalMapper<BizBusinessOutsourceProtocol, BizBusinessOutsourceProtocol, OutsourceProtocolApprovalListRequest> {
+
+    Page<BizBusinessOutsourceProtocol> selectBatchForApprovalList(Page<BizBusinessOutsourceProtocol> page, @Param("request") OutsourceProtocolApprovalListRequest request, @Param("businessKeys") List<String> businessKeys);
+
+    Long selectMaxProtocolNo();
+}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/EnvLocationInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/EnvLocationInfoMapper.java
new file mode 100644
index 0000000..49eff87
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/EnvLocationInfoMapper.java
@@ -0,0 +1,21 @@
+package com.casic.missiles.mapper.resource;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.resource.environment.LocationListRequest;
+import com.casic.missiles.dto.resource.environment.LocationListResponse;
+import com.casic.missiles.model.resource.EnvLocationInfo;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * <p>
+ * 实验室环境监控系统-设备表 Mapper 接口
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-06-07
+ */
+public interface EnvLocationInfoMapper extends BaseMapper<EnvLocationInfo> {
+
+    Page<LocationListResponse> selectLocationListPage(Page<LocationListResponse> page, @Param("request") LocationListRequest request);
+}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java
index de124db..85ed0f7 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java
@@ -1,7 +1,9 @@
 package com.casic.missiles.mapper.system;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.dto.system.SignDetailResponse;
+import com.casic.missiles.dto.system.SignListRequest;
 import com.casic.missiles.model.system.SystemSign;
 import org.apache.ibatis.annotations.Param;
 
@@ -22,4 +24,8 @@
     SignDetailResponse selectSignDetailById(Long id);
 
     List<SystemSign> selectUsableSignList(@Param("userId") Long userId);
+
+    Page<SystemSign> selectSignListPage(Page<SystemSign> page, @Param("request") SignListRequest request);
+
+    List<SystemSign> selectSignList(@Param("request") SignListRequest request);
 }
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateChangeApplyMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateChangeApplyMapper.xml
index d798447..c496092 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateChangeApplyMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateChangeApplyMapper.xml
@@ -30,31 +30,31 @@
         SELECT *
         FROM biz_business_certificate_change_apply
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.changeApplyNo != null and request.changeApplyNo !=''">
+        <if test="request != null and request.changeApplyNo != null and request.changeApplyNo !=''">
             and change_apply_no like concat('%',#{request.changeApplyNo},'%')
         </if>
-        <if test="request.changeReportNo != null and request.changeReportNo !=''">
+        <if test="request != null and request.changeReportNo != null and request.changeReportNo !=''">
             and change_report_no like concat('%',#{request.changeReportNo},'%')
         </if>
-        <if test="request.changeReportName != null and request.changeReportName !=''">
+        <if test="request != null and request.changeReportName != null and request.changeReportName !=''">
             and change_report_name like concat('%',#{request.changeReportName},'%')
         </if>
-        <if test="request.changeType != null and request.changeType !=''">
+        <if test="request != null and request.changeType != null and request.changeType !=''">
             and change_type = #{request.changeType}
         </if>
-        <if test="request.createUserName != null and request.createUserName !=''">
+        <if test="request != null and request.createUserName != null and request.createUserName !=''">
             and create_user_name like concat('%',#{request.createUserName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificatePrintMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificatePrintMapper.xml
index b66cd99..49c0ac8 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificatePrintMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificatePrintMapper.xml
@@ -31,34 +31,34 @@
         LEFT JOIN biz_business_order_sample_relation bosr ON (bosr.order_id = bcr.order_id AND bosr.sample_id = bcr.sample_id)
         LEFT JOIN biz_business_order_info boi ON boi.id = bosr.order_id
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and bcp.approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.printStatus != null and request.printStatus !=''">
+        <if test="request != null and request.printStatus != null and request.printStatus !=''">
             and print_status = #{request.printStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and bcp.create_user_id = #{request.createUserId}
         </if>
-        <if test="request.certificateReportNo != null and request.certificateReportNo !=''">
+        <if test="request != null and request.certificateReportNo != null and request.certificateReportNo !=''">
             and bcr.certificate_report_no like concat('%',#{request.certificateReportNo},'%')
         </if>
-        <if test="request.certificateReportName != null and request.certificateReportName !=''">
+        <if test="request != null and request.certificateReportName != null and request.certificateReportName !=''">
             and bcr.certificate_report_name like concat('%',#{request.certificateReportName},'%')
         </if>
-        <if test="request.customerName != null and request.customerName !=''">
+        <if test="request != null and request.customerName != null and request.customerName !=''">
             and boi.customer_name like concat('%',#{request.customerName},'%')
         </if>
-        <if test="request.sampleNo != null and request.sampleNo !=''">
+        <if test="request != null and request.sampleNo != null and request.sampleNo !=''">
             and bosr.sample_no like concat('%',#{request.sampleNo},'%')
         </if>
-        <if test="request.sampleName != null and request.sampleName !=''">
+        <if test="request != null and request.sampleName != null and request.sampleName !=''">
             and bosr.sample_name like concat('%',#{request.sampleName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and bcp.create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and bcp.create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml
index b366034..767695d 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml
@@ -46,33 +46,37 @@
         SELECT bcr.*, bosr.sample_no, bosr.sample_name, bosr.sample_model, rsi.staff_name
         FROM biz_business_certificate_report bcr
         LEFT JOIN biz_business_order_sample_relation bosr ON (bosr.order_id = bcr.order_id AND bosr.sample_id = bcr.sample_id)
+        LEFT JOIN biz_business_order_info boi ON boi.id = bcr.order_id
         LEFT JOIN biz_resource_staff_info rsi ON rsi.id = bcr.measure_person_id
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and bcr.approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and bcr.create_user_id = #{request.createUserId}
         </if>
-        <if test="request.certificateReportNo != null and request.certificateReportNo !=''">
+        <if test="request != null and request.customerId != null and request.customerId !=''">
+            and boi.customer_id = #{request.customerId}
+        </if>
+        <if test="request != null and request.certificateReportNo != null and request.certificateReportNo !=''">
             and bcr.certificate_report_no like concat('%',#{request.certificateReportNo},'%')
         </if>
-        <if test="request.certificateReportName != null and request.certificateReportName !=''">
+        <if test="request != null and request.certificateReportName != null and request.certificateReportName !=''">
             and bcr.certificate_report_name like concat('%',#{request.certificateReportName},'%')
         </if>
-        <if test="request.sampleNo != null and request.sampleNo !=''">
+        <if test="request != null and request.sampleNo != null and request.sampleNo !=''">
             and bosr.sample_no like concat('%',#{request.sampleNo},'%')
         </if>
-        <if test="request.measureCategory != null and request.measureCategory !=''">
+        <if test="request != null and request.measureCategory != null and request.measureCategory !=''">
             and bcr.measure_category = #{request.measureCategory}
         </if>
-        <if test="request.measurePerson != null and request.measurePerson !=''">
+        <if test="request != null and request.measurePerson != null and request.measurePerson !=''">
             and rsi.staff_name like concat('%',#{request.measurePerson},'%')
         </if>
-        <if test="request.calibrationTimeStart != null and request.calibrationTimeStart !=''">
+        <if test="request != null and request.calibrationTimeStart != null and request.calibrationTimeStart !=''">
             and bcr.calibration_time &gt;= #{request.calibrationTimeStart}
         </if>
-        <if test="request.calibrationTimeEnd != null and request.calibrationTimeEnd !=''">
+        <if test="request != null and request.calibrationTimeEnd != null and request.calibrationTimeEnd !=''">
             and bcr.calibration_time &lt;= #{request.calibrationTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceAssessMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceAssessMapper.xml
index d0fcf8b..c22c101 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceAssessMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceAssessMapper.xml
@@ -7,6 +7,8 @@
         <id column="id" property="id" />
         <result column="project_no" property="projectNo" />
         <result column="project_name" property="projectName" />
+        <result column="lab_code" property="labCode" />
+        <result column="group_code" property="groupCode" />
         <result column="applicant_id" property="applicantId" />
         <result column="applicant_name" property="applicantName" />
         <result column="applicant_time" property="applicantTime" />
@@ -31,7 +33,45 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, project_no, project_name, applicant_id, applicant_name, applicant_time, minio_file_name, remark, create_user_id, create_user_name, outsourcer_id, pre_start_time, pre_end_time, outsource_reason, pre_cost, approval_status, process_id, approve_situation, traceability, test_method, technique_ability, create_time, update_time
+        id, project_no, project_name, lab_code, group_code, applicant_id, applicant_name, applicant_time, minio_file_name, remark, create_user_id, create_user_name, outsourcer_id, pre_start_time, pre_end_time, outsource_reason, pre_cost, approval_status, process_id, approve_situation, traceability, test_method, technique_ability, create_time, update_time
     </sql>
 
+    <select id="selectMaxProjectNo" resultType="java.lang.Long">
+        SELECT IFNULL(max(RIGHT(project_no, 3)), 0) from biz_business_outsource_assess
+    </select>
+
+    <select id="selectBatchForApprovalList" resultMap="BaseResultMap">
+        SELECT bboa.*, bboi.outsourcer_name, bboi.director
+        FROM biz_business_outsource_assess bboa
+        LEFT JOIN biz_business_outsourcer_info bboi ON bboa.outsourcer_id = bboi.id
+        WHERE 1=1
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
+            and bboa.approval_status = #{request.approvalStatus}
+        </if>
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
+            and bboa.create_user_id = #{request.createUserId}
+        </if>
+        <if test="request != null and request.projectNo != null and request.projectNo !=''">
+            and bboa.project_no like concat('%',#{request.projectNo},'%')
+        </if>
+        <if test="request != null and request.outsourcerName != null and request.outsourcerName !=''">
+            and bboi.outsourcer_name like concat('%',#{request.outsourcerName},'%')
+        </if>
+        <if test="request != null and request.applicantName != null and request.applicantName !=''">
+            and bboa.applicant_name like concat('%',#{request.applicantName},'%')
+        </if>
+        <if test="request != null and request.applicantTimeStart != null and request.applicantTimeStart !=''">
+            and bboa.applicant_time &gt;= #{request.applicantTimeStart}
+        </if>
+        <if test="request != null and request.applicantTimeEnd != null and request.applicantTimeEnd !=''">
+            and bboa.applicant_time &lt;= #{request.applicantTimeEnd}
+        </if>
+        <if test="businessKeys != null">
+            and bboa.id in
+            <foreach collection="businessKeys" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
+        ORDER BY bboa.create_time DESC
+    </select>
 </mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceProtocolMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceProtocolMapper.xml
new file mode 100644
index 0000000..b7b2149
--- /dev/null
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceProtocolMapper.xml
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.mapper.business.BizBusinessOutsourceProtocolMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.business.BizBusinessOutsourceProtocol">
+        <id column="id" property="id" />
+        <result column="protocol_no" property="protocolNo" />
+        <result column="project_name" property="projectName" />
+        <result column="lab_code" property="labCode" />
+        <result column="group_code" property="groupCode" />
+        <result column="outsourcer_id" property="outsourcerId" />
+        <result column="remark" property="remark" />
+        <result column="outsource_no" property="outsourceNo" />
+        <result column="outsource_name" property="outsourceName" />
+        <result column="contacts" property="contacts" />
+        <result column="mobile" property="mobile" />
+        <result column="address" property="address" />
+        <result column="require_date" property="requireDate" />
+        <result column="outsource_cost" property="outsourceCost" />
+        <result column="director" property="director" />
+        <result column="item" property="item" />
+        <result column="requires" property="requires" />
+        <result column="create_user_id" property="createUserId" />
+        <result column="create_user_name" property="createUserName" />
+        <result column="approval_status" property="approvalStatus" />
+        <result column="process_id" property="processId" />
+        <result column="create_time" property="createTime" />
+        <result column="update_time" property="updateTime" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, protocol_no, project_name, lab_code, group_code, outsourcer_id, remark, outsource_no, outsource_name, contacts, mobile, address, require_date, outsource_cost, director, item, requires, create_user_id, create_user_name, approval_status, process_id, create_time, update_time
+    </sql>
+
+    <select id="selectMaxProtocolNo" resultType="java.lang.Long">
+        SELECT IFNULL(max(RIGHT(protocol_no, 3)), 0) from biz_business_outsource_protocol
+    </select>
+
+    <select id="selectBatchForApprovalList" resultMap="BaseResultMap">
+        SELECT *
+        FROM biz_business_outsource_protocol
+        WHERE 1=1
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
+            and approval_status = #{request.approvalStatus}
+        </if>
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
+            and create_user_id = #{request.createUserId}
+        </if>
+        <if test="request != null and request.protocolNo != null and request.protocolNo !=''">
+            and protocol_no like concat('%',#{request.protocolNo},'%')
+        </if>
+        <if test="request != null and request.outsourcerName != null and request.outsourcerName !=''">
+            and outsourcer_name like concat('%',#{request.outsourcerName},'%')
+        </if>
+        <if test="request != null and request.applicantName != null and request.applicantName !=''">
+            and create_user_name like concat('%',#{request.applicantName},'%')
+        </if>
+        <if test="request != null and request.applicantTimeStart != null and request.applicantTimeStart !=''">
+            and create_time &gt;= #{request.applicantTimeStart}
+        </if>
+        <if test="request != null and request.applicantTimeEnd != null and request.applicantTimeEnd !=''">
+            and create_time &lt;= #{request.applicantTimeEnd}
+        </if>
+        <if test="businessKeys != null">
+            and id in
+            <foreach collection="businessKeys" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
+        ORDER BY create_time DESC
+    </select>
+</mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourcerInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourcerInfoMapper.xml
index 510a80b..3049b54 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourcerInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourcerInfoMapper.xml
@@ -7,6 +7,8 @@
         <id column="id" property="id" />
         <result column="outsourcer_no" property="outsourcerNo" />
         <result column="outsourcer_name" property="outsourcerName" />
+        <result column="lab_code" property="labCode" />
+        <result column="group_code" property="groupCode" />
         <result column="outsourcer_brief_name" property="outsourcerBriefName" />
         <result column="outsourcer_size" property="outsourcerSize" />
         <result column="business_size" property="businessSize" />
@@ -55,32 +57,32 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, outsourcer_no, outsourcer_name, outsourcer_brief_name, outsourcer_size, business_size, grade, evaluation, tax_number, bank_account, bank_name, bank_account_number, postal_code, director, phone, fax, mobile, email, website, address_country, address_province, address_city, address_area, full_address, address_country_name, address_province_name, address_city_name, address_area_name, invoice_country, invoice_province, invoice_city, invoice_area, invoice_full_address, invoice_country_name, invoice_province_name, invoice_city_name, invoice_area_name, business_scope, business_content, minio_file_name, approval_status, process_id, remark, create_user_id, create_user_name, create_time, update_time
+        id, outsourcer_no, outsourcer_name, lab_code, group_code, outsourcer_brief_name, outsourcer_size, business_size, grade, evaluation, tax_number, bank_account, bank_name, bank_account_number, postal_code, director, phone, fax, mobile, email, website, address_country, address_province, address_city, address_area, full_address, address_country_name, address_province_name, address_city_name, address_area_name, invoice_country, invoice_province, invoice_city, invoice_area, invoice_full_address, invoice_country_name, invoice_province_name, invoice_city_name, invoice_area_name, business_scope, business_content, minio_file_name, approval_status, process_id, remark, create_user_id, create_user_name, create_time, update_time
     </sql>
 
     <select id="selectBatchForApprovalList" resultMap="BaseResultMap">
         SELECT *
         FROM biz_business_outsourcer_info
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.outsourcerNo != null and request.outsourcerNo !=''">
+        <if test="request != null and request.outsourcerNo != null and request.outsourcerNo !=''">
             and outsourcer_no like concat('%',#{request.outsourcerNo},'%')
         </if>
-        <if test="request.outsourcerName != null and request.outsourcerName !=''">
+        <if test="request != null and request.outsourcerName != null and request.outsourcerName !=''">
             and outsourcer_name like concat('%',#{request.outsourcerName},'%')
         </if>
-        <if test="request.director != null and request.director !=''">
+        <if test="request != null and request.director != null and request.director !=''">
             and director like concat('%',#{request.director},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
@@ -93,6 +95,6 @@
     </select>
 
     <select id="selectMaxNo" resultType="java.lang.Long">
-        SELECT IFNULL(max(RIGHT(outsourcer_no, 12)), 0) from biz_business_outsourcer_info
+        SELECT IFNULL(max(RIGHT(outsourcer_no, 3)), 0) from biz_business_outsourcer_info
     </select>
 </mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessSiteExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessSiteExecutiveInfoMapper.xml
index 135c5d0..3c5ae79 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessSiteExecutiveInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessSiteExecutiveInfoMapper.xml
@@ -38,25 +38,25 @@
         FROM biz_business_site_executive_info bsei
         LEFT JOIN biz_resource_customer_info rci ON bsei.customer_id = rci.id
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and bsei.approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and bsei.create_user_id = #{request.createUserId}
         </if>
-        <if test="request.siteExecutiveNo != null and request.siteExecutiveNo !=''">
+        <if test="request != null and request.siteExecutiveNo != null and request.siteExecutiveNo !=''">
             and bsei.site_executive_no like concat('%',#{request.siteExecutiveNo},'%')
         </if>
-        <if test="request.customerName != null and request.customerName !=''">
+        <if test="request != null and request.customerName != null and request.customerName !=''">
             and rci.outsourcer_name like concat('%',#{request.customerName},'%')
         </if>
-        <if test="request.applyName != null and request.applyName !=''">
+        <if test="request != null and request.applyName != null and request.applyName !=''">
             and bsei.apply_name like concat('%',#{request.applyName},'%')
         </if>
-        <if test="request.applyTimeStart != null and request.applyTimeStart !=''">
+        <if test="request != null and request.applyTimeStart != null and request.applyTimeStart !=''">
             and bsei.apply_time &gt;= #{request.applyTimeStart}
         </if>
-        <if test="request.applyTimeEnd != null and request.applyTimeEnd !=''">
+        <if test="request != null and request.applyTimeEnd != null and request.applyTimeEnd !=''">
             and bsei.apply_time &lt;= #{request.applyTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml
index 84d9e2a..6bd38a9 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml
@@ -105,6 +105,12 @@
         <if test="request.isUrgent != null and request.isUrgent !=''">
             AND bo.is_urgent = #{request.isUrgent}
         </if>
+        <if test="request.ids != null">
+            and blei.id in
+            <foreach collection="request.ids" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
         ORDER BY blei.update_time DESC
     </select>
 
@@ -137,6 +143,12 @@
         <if test="request.isUrgent != null and request.isUrgent !=''">
             AND bo.is_urgent = #{request.isUrgent}
         </if>
+        <if test="request.ids != null">
+            and blei.id in
+            <foreach collection="request.ids" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
         ORDER BY blei.update_time DESC
     </select>
 
diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardInfoMapper.xml
index 1a5551b..2ed8d17 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardInfoMapper.xml
@@ -45,12 +45,6 @@
         FROM biz_equipment_standard_info besi
         LEFT JOIN biz_equipment_standard_technology_relation bestr ON besi.standard_no = bestr.standard_no
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
-            and besi.approval_status = #{request.approvalStatus}
-        </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
-            and besi.create_user_id = #{request.createUserId}
-        </if>
         <if test="request.standardName != null and request.standardName !=''">
             and besi.standard_name like concat('%',#{request.standardName},'%')
         </if>
diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardTechnologyRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardTechnologyRelationMapper.xml
index fc7e16c..cd03c8c 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardTechnologyRelationMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardTechnologyRelationMapper.xml
@@ -6,6 +6,7 @@
     <resultMap id="BaseResultMap" type="com.casic.missiles.model.equipment.BizEquipmentStandardTechnologyRelation">
         <id column="id" property="id" />
         <result column="technology_file_id" property="technologyFileId" />
+        <result column="technology_file_no" property="technologyFileNo" />
         <result column="technology_file_name" property="technologyFileName" />
         <result column="standard_id" property="standardId" />
         <result column="standard_no" property="standardNo" />
@@ -14,7 +15,7 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, technology_file_id, technology_file_name, standard_id, remark
+        id, technology_file_id, technology_file_no, technology_file_name, standard_id, remark
     </sql>
 
 </mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceAuthorizeOrderMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceAuthorizeOrderMapper.xml
index ac5176c..554fe65 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceAuthorizeOrderMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceAuthorizeOrderMapper.xml
@@ -32,22 +32,22 @@
         SELECT *
         FROM biz_resource_authorize_order
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.orderNo != null and request.orderNo !=''">
+        <if test="request != null and request.orderNo != null and request.orderNo !=''">
             and order_no like concat('%',#{request.orderNo},'%')
         </if>
-        <if test="request.createUserName != null and request.createUserName !=''">
+        <if test="request != null and request.createUserName != null and request.createUserName !=''">
             and create_user_name like concat('%',#{request.createUserName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerExamineFormMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerExamineFormMapper.xml
index ab242f6..af7f98f 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerExamineFormMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerExamineFormMapper.xml
@@ -41,28 +41,28 @@
         SELECT *
         FROM biz_resource_customer_examine_form
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.formNo != null and request.formNo !=''">
+        <if test="request != null and request.formNo != null and request.formNo !=''">
             and form_no like concat('%',#{request.formNo},'%')
         </if>
-        <if test="request.labCode != null and request.labCode !=''">
+        <if test="request != null and request.labCode != null and request.labCode !=''">
             and lab_code like concat('%',#{request.labCode},'%')
         </if>
-        <if test="request.groupCode != null and request.groupCode !=''">
+        <if test="request != null and request.groupCode != null and request.groupCode !=''">
             and group_code like concat('%',#{request.groupCode},'%')
         </if>
-        <if test="request.createUserName != null and request.createUserName !=''">
+        <if test="request != null and request.createUserName != null and request.createUserName !=''">
             and create_user_name like concat('%',#{request.createUserName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerInfoMapper.xml
index fa8ffbc..06a2798 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerInfoMapper.xml
@@ -33,25 +33,25 @@
         SELECT *
         FROM biz_resource_customer_info
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.customerNo != null and request.customerNo !=''">
+        <if test="request != null and request.customerNo != null and request.customerNo !=''">
             and customer_no like concat('%',#{request.customerNo},'%')
         </if>
-        <if test="request.customerName != null and request.customerName !=''">
+        <if test="request != null and request.customerName != null and request.customerName !=''">
             and customer_name like concat('%',#{request.customerName},'%')
         </if>
-        <if test="request.contacts != null and request.contacts !=''">
+        <if test="request != null and request.contacts != null and request.contacts !=''">
             and contacts like concat('%',#{request.contacts},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerSuggestFormMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerSuggestFormMapper.xml
index 28f5bb2..1806662 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerSuggestFormMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerSuggestFormMapper.xml
@@ -33,28 +33,28 @@
         SELECT *
         FROM biz_resource_customer_suggest_form
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.formNo != null and request.formNo !=''">
+        <if test="request != null and request.formNo != null and request.formNo !=''">
             and form_no like concat('%',#{request.formNo},'%')
         </if>
-        <if test="request.customerName != null and request.customerName !=''">
+        <if test="request != null and request.customerName != null and request.customerName !=''">
             and customer_name like concat('%',#{request.customerName},'%')
         </if>
-        <if test="request.customerDeptName != null and request.customerDeptName !=''">
+        <if test="request != null and request.customerDeptName != null and request.customerDeptName !=''">
             and customer_dept_name like concat('%',#{request.customerDeptName},'%')
         </if>
-        <if test="request.createUserName != null and request.createUserName !=''">
+        <if test="request != null and request.createUserName != null and request.createUserName !=''">
             and create_user_name like concat('%',#{request.createUserName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSealUseNoteMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSealUseNoteMapper.xml
index ab37bc1..b02bb33 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSealUseNoteMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSealUseNoteMapper.xml
@@ -29,32 +29,32 @@
     </sql>
 
     <select id="selectBatchForApprovalList" resultMap="BaseResultMap">
-        SELECT *
+        SELECT brsun.*, brsi.seal_name, brsi.seal_type, brsi.approver_name
         FROM biz_resource_seal_use_note brsun
         JOIN biz_resource_seal_info brsi ON brsun.seal_id = brsi.id
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and brsun.approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and brsun.create_user_id = #{request.createUserId}
         </if>
-        <if test="request.sealName != null and request.sealName !=''">
+        <if test="request != null and request.sealName != null and request.sealName !=''">
             and brsi.seal_name like concat('%',#{request.sealName},'%')
         </if>
-        <if test="request.sealType != null and request.sealType !=''">
+        <if test="request != null and request.sealType != null and request.sealType !=''">
             and brsi.seal_type = #{request.sealType}
         </if>
-        <if test="request.applyDeptName != null and request.applyDeptName !=''">
+        <if test="request != null and request.applyDeptName != null and request.applyDeptName !=''">
             and brsun.apply_dept_name like concat('%',#{request.applyDeptName},'%')
         </if>
-        <if test="request.applyUserName != null and request.applyUserName !=''">
+        <if test="request != null and request.applyUserName != null and request.applyUserName !=''">
             and brsun.apply_user_name like concat('%',#{request.applyUserName},'%')
         </if>
-        <if test="request.applyTimeStart != null and request.applyTimeStart !=''">
+        <if test="request != null and request.applyTimeStart != null and request.applyTimeStart !=''">
             and brsun.apply_time &gt;= #{request.applyTimeStart}
         </if>
-        <if test="request.applyTimeEnd != null and request.applyTimeEnd !=''">
+        <if test="request != null and request.applyTimeEnd != null and request.applyTimeEnd !=''">
             and brsun.apply_time &lt;= #{request.applyTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml
index 119bf7d..4f8392a 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml
@@ -31,6 +31,12 @@
         <if test="request.deptName != null and request.deptName !=''">
             and brsi.dept_name like concat('%',#{request.deptName},'%')
         </if>
+        <if test="request.ids != null">
+            and brsv.id in
+            <foreach collection="request.ids" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
         ORDER BY brsv.grant_date DESC
     </select>
 
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSupplierInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSupplierInfoMapper.xml
index fe8d399..e8ce7ef 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSupplierInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSupplierInfoMapper.xml
@@ -48,28 +48,28 @@
         SELECT *
         FROM biz_resource_supplier_info
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.supplierNo != null and request.supplierNo !=''">
+        <if test="request != null and request.supplierNo != null and request.supplierNo !=''">
             and supplier_no like concat('%',#{request.supplierNo},'%')
         </if>
-        <if test="request.supplierName != null and request.supplierName !=''">
+        <if test="request != null and request.supplierName != null and request.supplierName !=''">
             and supplier_name like concat('%',#{request.supplierName},'%')
         </if>
-        <if test="request.director != null and request.director !=''">
+        <if test="request != null and request.director != null and request.director !=''">
             and director like concat('%',#{request.director},'%')
         </if>
-        <if test="request.supplierType != null and request.supplierType !=''">
+        <if test="request != null and request.supplierType != null and request.supplierType !=''">
             and supplier_type = #{request.supplierType}
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/EnvLocationInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/EnvLocationInfoMapper.xml
new file mode 100644
index 0000000..68bcf10
--- /dev/null
+++ b/casic-metering-dao/src/main/resources/mapper/resource/EnvLocationInfoMapper.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.mapper.resource.EnvLocationInfoMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.resource.EnvLocationInfo">
+        <id column="id" property="id" />
+        <result column="location_no" property="locationNo" />
+        <result column="location_name" property="locationName" />
+        <result column="location_position" property="locationPosition" />
+        <result column="create_user_id" property="createUserId" />
+        <result column="create_user" property="createUser" />
+        <result column="create_time" property="createTime" />
+        <result column="update_time" property="updateTime" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, location_no, location_name, location_position, create_user_id, create_user, create_time, update_time
+    </sql>
+
+    <select id="selectLocationListPage" resultType="com.casic.missiles.dto.resource.environment.LocationListResponse">
+        SELECT *
+        FROM env_location_info
+        WHERE 1=1
+        <if test="request.locationNo != null and request.locationNo !=''">
+            AND location_no LIKE concat('%',#{request.locationNo},'%')
+        </if>
+        <if test="request.locationName != null and request.locationName !=''">
+            AND location_name LIKE concat('%',#{request.locationName},'%')
+        </if>
+        ORDER BY create_time DESC
+    </select>
+
+</mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml
index b28c18f..8854047 100644
--- a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml
@@ -11,7 +11,6 @@
         <result column="sign_desc" property="signDesc" />
         <result column="sign_director" property="signDirector" />
         <result column="sign_user_id" property="signUserId" />
-        <result column="sign_type" property="signType" />
         <result column="minio_file_name" property="minioFileName" />
         <result column="create_time" property="createTime" />
         <result column="update_time" property="updateTime" />
@@ -28,7 +27,6 @@
         <result column="sign_name" property="signName" />
         <result column="sign_desc" property="signDesc" />
         <result column="sign_director" property="signDirector" />
-        <result column="sign_type" property="signType" />
         <result column="sign_user_id" property="signUserId" />
         <result column="minio_file_name" property="minioFileName" />
         <result column="create_time" property="createTime" />
@@ -62,4 +60,58 @@
         JOIN system_sign_user_relation ssur ON ss.id = ssur.sign_id
         WHERE ssur.user_id = #{userId}
     </select>
+
+    <select id="selectSignListPage" resultMap="BaseResultMap">
+        SELECT ss.*, sd.SIMPLE_NAME AS deptName
+        FROM system_sign ss
+        LEFT JOIN sys_user su ON su.id = ss.sign_user_id
+        LEFT JOIN sys_dept sd ON sd.id = su.dept_id
+        WHERE 1=1
+        <if test="request.signNo != null and request.signNo !=''">
+            AND ss.sign_no LIKE concat('%',#{request.signNo},'%')
+        </if>
+        <if test="request.signName != null and request.signName !=''">
+            AND ss.sign_name LIKE concat('%',#{request.signName},'%')
+        </if>
+        <if test="request.signDirector != null and request.signDirector !=''">
+            AND ss.sign_director LIKE concat('%',#{request.signDirector},'%')
+        </if>
+        <if test="request.signUserId != null and request.signUserId !=''">
+            AND ss.sign_user_id = #{request.signUserId}
+        </if>
+        <if test="request.createStartTime != null and request.createStartTime !=''">
+            AND DATE_FORMAT(ss.create_time,'%Y-%m-%d') &gt;= DATE_FORMAT(#{request.createStartTime},'%Y-%m-%d')
+        </if>
+        <if test="request.createEndTime != null and request.createEndTime !=''">
+            AND DATE_FORMAT(ss.create_time,'%Y-%m-%d')  &lt;= DATE_FORMAT(#{request.createEndTime},'%Y-%m-%d')
+        </if>
+        ORDER BY ss.create_time DESC
+    </select>
+
+    <select id="selectSignList" resultMap="BaseResultMap">
+        SELECT ss.*, sd.SIMPLE_NAME AS deptName
+        FROM system_sign ss
+        LEFT JOIN sys_user su ON su.id = ss.sign_user_id
+        LEFT JOIN sys_dept sd ON sd.id = su.dept_id
+        WHERE 1=1
+        <if test="request.signNo != null and request.signNo !=''">
+            AND ss.sign_no LIKE concat('%',#{request.signNo},'%')
+        </if>
+        <if test="request.signName != null and request.signName !=''">
+            AND ss.sign_name LIKE concat('%',#{request.signName},'%')
+        </if>
+        <if test="request.signDirector != null and request.signDirector !=''">
+            AND ss.sign_director LIKE concat('%',#{request.signDirector},'%')
+        </if>
+        <if test="request.signUserId != null and request.signUserId !=''">
+            AND ss.sign_user_id = #{request.signUserId}
+        </if>
+        <if test="request.createStartTime != null and request.createStartTime !=''">
+            AND DATE_FORMAT(ss.create_time,'%Y-%m-%d') &gt;= DATE_FORMAT(#{request.createStartTime},'%Y-%m-%d')
+        </if>
+        <if test="request.createEndTime != null and request.createEndTime !=''">
+            AND DATE_FORMAT(ss.create_time,'%Y-%m-%d')  &lt;= DATE_FORMAT(#{request.createEndTime},'%Y-%m-%d')
+        </if>
+        ORDER BY ss.create_time DESC
+    </select>
 </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 515050a..60f530b 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
@@ -47,8 +47,8 @@
     String STORAGE_LOCATION = "bizStorageLocation";
     //计量专业
     String MEASURE_MAJOR = "bizMeasureMajor";
-    //管理状态
-    String MANAGER_STATE = "bizManagerState";
+    //标准装置管理状态
+    String STANDARD_MANAGER_STATE = "bizStandardManagerState";
 
     /**
      * 资源管理 字典code
@@ -95,8 +95,6 @@
     String MEASURE_STATUS = "measureStatus";
     //检定方式
     String MEASURE_TYPE = "measureType";
-    //标识打印标志类型
-    String IDENTIFY_PRINT_TYPE = "bizBusinessIdentify";
     //变更类型
     String REPORT_CHANGE_TYPE = "bizCertChangeType";
     //规模类型
@@ -111,19 +109,24 @@
     String MEASURE_CATEGORY = "measureCategory";
     //检定结果
     String MEASURE_RESULT = "measureResult";
+    //分包原因
+    String OUTSOURCE_REASON = "outsourceReason";
+
+    /**
+     * 系统管理
+     */
+    String TEMPLATE_TYPE = "templateType";
+
 
     /**
      * 标准装置 字典code
      */
     //类别
     String STANDARD_CATEGORY = "standardCategory";
-    //管理状态
-    String STANDARD_MANAGER_STATE = "standardManagerState";
     //标准等级
     String STANDARD_LEVEL = "standardLevel";
     //传递范围
     String STANDARD_TRANSMIT_RANGE = "transmitRange";
-
     //资本来源
     String CAPITAL_SOURCE = "capitalSource";
     //标准装置-申请类型
@@ -148,8 +151,6 @@
     String CERTIFICATE_CLASS = "certificationClass";
     //证书管理-检校专业
     String CALIBRATION_MAJOR = "calibrationMajor";
-    //分包原因
-    String OUTSOURCE_REASON = "outsourceReason";
 
     /**
      * 工作台
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/BaseApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/BaseApprovalListRequest.java
index 73c12c1..80d7424 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/BaseApprovalListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/BaseApprovalListRequest.java
@@ -6,6 +6,7 @@
 
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotEmpty;
+import java.util.List;
 
 /**
  * @Description:
@@ -19,14 +20,14 @@
      * 表单id
      */
     @NotBlank(message = "表单id不能为空")
-    @ApiModelProperty(value = "表单id（流程定义对应的表单id，等价于业务id）", dataType = "String")
+    @ApiModelProperty(value = "表单id（流程定义对应的表单id，等价于业务id），导出接口不用传", dataType = "String")
     private String formId;
 
     /**
      * 审批状态类型，对应ApprovalStatusEnum
      */
     @NotEmpty(message = "审批状态类型不能为空")
-    @ApiModelProperty(value = "审批状态类型code", dataType = "String")
+    @ApiModelProperty(value = "审批状态类型code，导出接口不用传", dataType = "String")
     private String approvalStatus;
 
     @ApiModelProperty(hidden = true)
@@ -34,4 +35,7 @@
 
     @ApiModelProperty(hidden = true)
     private Long createUserId;
+
+    @ApiModelProperty(value = "导出ids", dataType = "List")
+    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificatePrintApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificatePrintApprovalListRequest.java
index b93d1c9..3cc2f4e 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificatePrintApprovalListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificatePrintApprovalListRequest.java
@@ -5,8 +5,6 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import java.util.List;
-
 /**
  * @Description:
  * @Author: wangpeng
@@ -38,7 +36,4 @@
 
     @ApiModelProperty(value = "创建结束时间", dataType = "String")
     private String createTimeEnd;
-
-    @ApiModelProperty(value = "导出ids", dataType = "List")
-    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportApprovalListRequest.java
index 4f7a038..c115847 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportApprovalListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportApprovalListRequest.java
@@ -5,8 +5,6 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import java.util.List;
-
 /**
  * @Description:
  * @Author: wangpeng
@@ -15,6 +13,8 @@
 @ApiModel
 @Data
 public class CertificateReportApprovalListRequest extends BaseApprovalListRequest {
+    @ApiModelProperty(value = "委托方id", dataType = "String")
+    private Long customerId;
 
     @ApiModelProperty(value = "证书报告编号", dataType = "String")
     private String certificateReportNo;
@@ -37,6 +37,4 @@
     @ApiModelProperty(value = "检校结束时间", dataType = "String")
     private String calibrationTimeEnd;
 
-    @ApiModelProperty(value = "导出ids", dataType = "List")
-    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/identify/IdentifyListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/identify/IdentifyListRequest.java
index 1b87ae6..f019203 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/identify/IdentifyListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/identify/IdentifyListRequest.java
@@ -4,6 +4,8 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * @Description:
  * @Author: wangpeng
@@ -26,4 +28,7 @@
 
     @ApiModelProperty(value = "打印结束时间", dataType = "String")
     private String createTimeEnd;
+
+    @ApiModelProperty(value = "导出ids", dataType = "List")
+    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListRequest.java
index 1264883..62415fb 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListRequest.java
@@ -7,6 +7,7 @@
 import lombok.Data;
 
 import javax.validation.constraints.NotBlank;
+import java.util.List;
 
 @Data
 @ApiModel
@@ -37,4 +38,6 @@
     @ApiModelProperty(value = "是否加急（1是0否null全部）", dataType = "Integer")
     private String isUrgent;
 
+    @ApiModelProperty(value = "导出ids", dataType = "List")
+    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListRequest.java
index 5201d7b..499760a 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListRequest.java
@@ -17,6 +17,9 @@
     @ApiModelProperty(value = "任务单编号", dataType = "String")
     private String orderNo;
 
+    @ApiModelProperty(value = "委托方id", dataType = "Long")
+    private Long customerId;
+
     @ApiModelProperty(value = "委托方名称", dataType = "String")
     private String customerName;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OrderSampleDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OrderSampleDTO.java
new file mode 100644
index 0000000..796edc0
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OrderSampleDTO.java
@@ -0,0 +1,19 @@
+package com.casic.missiles.dto.business.outsource;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/8/24 11:38
+ */
+@ApiModel
+@Data
+public class OrderSampleDTO {
+    @ApiModelProperty(value = "任务单id", dataType = "Long")
+    private Long orderId;
+    @ApiModelProperty(value = "受检设备id", dataType = "Long")
+    private Long sampleId;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceAssessApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceAssessApprovalListRequest.java
new file mode 100644
index 0000000..9a930c3
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceAssessApprovalListRequest.java
@@ -0,0 +1,30 @@
+package com.casic.missiles.dto.business.outsource;
+
+import com.casic.missiles.dto.BaseApprovalListRequest;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/8/24 11:01
+ */
+@ApiModel
+@Data
+public class OutsourceAssessApprovalListRequest extends BaseApprovalListRequest {
+    @ApiModelProperty(value = "评审表编号", dataType = "String")
+    private String projectNo;
+
+    @ApiModelProperty(value = "分包机构名称", dataType = "String")
+    private String outsourcerName;
+
+    @ApiModelProperty(value = "申请人", dataType = "String")
+    private String applicantName;
+
+    @ApiModelProperty(value = "申请时间开始", dataType = "String")
+    private String applicantTimeStart;
+
+    @ApiModelProperty(value = "申请时间结束", dataType = "String")
+    private String applicantTimeEnd;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceAssessSaveResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceAssessSaveResponse.java
new file mode 100644
index 0000000..8bf9aad
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceAssessSaveResponse.java
@@ -0,0 +1,20 @@
+package com.casic.missiles.dto.business.outsource;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/8/14 16:17
+ */
+@ApiModel
+@Data
+public class OutsourceAssessSaveResponse {
+    @ApiModelProperty(value = "主键id", dataType = "Long")
+    private Long id;
+
+    @ApiModelProperty(value = "编号", dataType = "String")
+    private String projectNo;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProtocolApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProtocolApprovalListRequest.java
new file mode 100644
index 0000000..0f32331
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProtocolApprovalListRequest.java
@@ -0,0 +1,30 @@
+package com.casic.missiles.dto.business.outsource;
+
+import com.casic.missiles.dto.BaseApprovalListRequest;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/8/24 15:01
+ */
+@ApiModel
+@Data
+public class OutsourceProtocolApprovalListRequest extends BaseApprovalListRequest {
+    @ApiModelProperty(value = "协议书编号", dataType = "String")
+    private String protocolNo;
+
+    @ApiModelProperty(value = "分包方名称", dataType = "String")
+    private String outsourcerName;
+
+    @ApiModelProperty(value = "申请人", dataType = "String")
+    private String applicantName;
+
+    @ApiModelProperty(value = "申请时间开始", dataType = "String")
+    private String applicantTimeStart;
+
+    @ApiModelProperty(value = "申请时间结束", dataType = "String")
+    private String applicantTimeEnd;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProtocolSaveResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProtocolSaveResponse.java
new file mode 100644
index 0000000..e324967
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProtocolSaveResponse.java
@@ -0,0 +1,20 @@
+package com.casic.missiles.dto.business.outsource;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/8/14 16:17
+ */
+@ApiModel
+@Data
+public class OutsourceProtocolSaveResponse {
+    @ApiModelProperty(value = "主键id", dataType = "Long")
+    private Long id;
+
+    @ApiModelProperty(value = "编号", dataType = "String")
+    private String protocolNo;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveApprovalListRequest.java
index f29f4e4..7047c28 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveApprovalListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveApprovalListRequest.java
@@ -5,8 +5,6 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import java.util.List;
-
 /**
  * @Description: 现场检测审批列表请求实体
  * @Author: wangpeng
@@ -30,7 +28,4 @@
     @ApiModelProperty(value = "申请时间结束", dataType = "String")
     private String applyTimeEnd;
 
-    @ApiModelProperty(value = "导出ids", dataType = "List")
-    private List<Long> ids;
-
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveDetailResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveDetailResponse.java
index 1f28752..394c934 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveDetailResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveDetailResponse.java
@@ -12,6 +12,18 @@
     @ApiModelProperty(value = "id，更新/删除使用参数", dataType = "Long")
     private Long id;
 
+    @ApiModelProperty(value = "实验室代码(字典code)", dataType = "String")
+    private String labCode;
+
+    @ApiModelProperty(value = "实验室代码(字典value)", dataType = "String")
+    private String labCodeName;
+
+    @ApiModelProperty(value = "组别代码(字典code)", dataType = "String")
+    private String groupCode;
+
+    @ApiModelProperty(value = "组别代码(字典value)", dataType = "String")
+    private String groupCodeName;
+
     @ApiModelProperty(value = "审批编号", dataType = "String")
     private String siteExecutiveNo;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/environment/LocationListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/environment/LocationListRequest.java
new file mode 100644
index 0000000..13d03c3
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/environment/LocationListRequest.java
@@ -0,0 +1,20 @@
+package com.casic.missiles.dto.resource.environment;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/6/8 13:56
+ */
+@ApiModel
+@Data
+public class LocationListRequest {
+    @ApiModelProperty(value = "地点编号", dataType = "String")
+    private String locationNo;
+
+    @ApiModelProperty(value = "地点名称", dataType = "String")
+    private String locationName;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/environment/LocationListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/environment/LocationListResponse.java
new file mode 100644
index 0000000..4c531af
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/environment/LocationListResponse.java
@@ -0,0 +1,78 @@
+package com.casic.missiles.dto.resource.environment;
+
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
+import com.baomidou.mybatisplus.annotation.TableField;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description: 地点列表响应实体
+ * @Author: wangpeng
+ * @Date: 2023/6/8 13:53
+ */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
+@ApiModel
+@Data
+public class LocationListResponse {
+    @ApiModelProperty(value = "主键id", dataType = "Long")
+    private Long id;
+
+    /**
+     * 地点编号
+     */
+    @ExcelProperty("地点编号")
+    @ApiModelProperty(value = "地点编号", dataType = "String")
+    private String locationNo;
+
+    /**
+     * 地点名称
+     */
+    @ExcelProperty("地点名称")
+    @ApiModelProperty(value = "地点名称", dataType = "String")
+    private String locationName;
+
+    /**
+     * 地点位置
+     */
+    @ExcelProperty("地点位置")
+    @ApiModelProperty(value = "地点位置", dataType = "String")
+    private String locationPosition;
+
+    /**
+     * 创建人id
+     */
+    @ApiModelProperty(value = "创建人id", dataType = "Long")
+    private Long createUserId;
+
+    /**
+     * 创建人
+     */
+    @ExcelProperty("创建人")
+    @ApiModelProperty(value = "创建人", dataType = "String")
+    @TableField("create_user")
+    private String createUser;
+
+    /**
+     * 创建时间
+     */
+    @ExcelProperty("创建时间")
+    @ApiModelProperty(value = "创建时间", dataType = "String")
+    private String createTime;
+
+    /**
+     * 更新时间
+     */
+    @ApiModelProperty(value = "更新时间", dataType = "String")
+    private String updateTime;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertRequest.java
index 9a7f6c6..c827915 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertRequest.java
@@ -4,6 +4,8 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * @Description:
  * @Author: wangpeng
@@ -16,4 +18,7 @@
     private String name;
     @ApiModelProperty(value = "部门名", dataType = "String")
     private String deptName;
+
+    @ApiModelProperty(value = "导出ids", dataType = "List")
+    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertResponse.java
index f78b159..8f2f79e 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertResponse.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.dto.resource.staff;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.casic.missiles.annotation.DictCodeField;
 import com.casic.missiles.constants.MeterDictCode;
 import io.swagger.annotations.ApiModel;
@@ -13,12 +20,18 @@
  * @Author: wangpeng
  * @Date: 2023/7/27 15:13
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @ApiModel
 @Data
 public class StaffCertResponse {
     /**
      * 人员编号
      */
+    @ExcelProperty(value = "人员编号",order = 0)
     @NotEmpty(message = "人员编号不能为空")
     @ApiModelProperty(value = "人员编号", dataType = "String")
     private String staffNo;
@@ -26,6 +39,7 @@
     /**
      * 姓名
      */
+    @ExcelProperty(value = "姓名",order = 1)
     @ApiModelProperty(value = "姓名", dataType = "String")
     private String staffName;
 
@@ -54,6 +68,7 @@
     /**
      * 部门名字
      */
+    @ExcelProperty(value = "工作部门",order = 2)
     @ApiModelProperty(value = "部门名字", dataType = "String")
     private String deptName;
 
@@ -66,6 +81,7 @@
     /**
      * 计量专业
      */
+    @ExcelProperty(value = "计量专业",order = 3)
     @ApiModelProperty(value = "计量专业", dataType = "String")
     private String major;
 
@@ -110,6 +126,7 @@
     /**
      * 证书号
      */
+    @ExcelProperty(value = "证号",order = 4)
     @ApiModelProperty(value = "证书号", dataType = "String")
     private String certNo;
 
@@ -122,12 +139,14 @@
     /**
      * 有效日期
      */
+    @ExcelProperty(value = "证书有效期",order = 6)
     @ApiModelProperty(value = "有效日期", dataType = "String")
     private String effectiveDate;
 
     /**
      * 发放日期
      */
+    @ExcelProperty(value = "发证日期",order = 5)
     @ApiModelProperty(value = "发放日期", dataType = "String")
     private String grantDate;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffListRequest.java
index 7c4afb3..0a1194a 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffListRequest.java
@@ -4,6 +4,8 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * @Description:
  * @Author: wangpeng
@@ -18,4 +20,7 @@
     private String deptName;
     @ApiModelProperty(value = "部门id", dataType = "Long")
     private Long deptId;
+
+    @ApiModelProperty(value = "导出ids", dataType = "List")
+    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/TrainListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/TrainListRequest.java
index f68597b..6321f8b 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/TrainListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/TrainListRequest.java
@@ -14,6 +14,8 @@
 public class TrainListRequest {
     @ApiModelProperty(value = "训练登记表编号", dataType = "String")
     private String trainNo;
+    @ApiModelProperty(value = "值班领导", dataType = "String")
+    private String dutyLeader;
     @ApiModelProperty(value = "创建开始时间", dataType = "String")
     private String createTimeStart;
     @ApiModelProperty(value = "创建结束时间", dataType = "String")
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/SignAddRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/SignAddRequest.java
index 117be34..d71055c 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/SignAddRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/SignAddRequest.java
@@ -43,13 +43,6 @@
     private Long signUserId;
 
     /**
-     * 签章或签名-字典code
-     */
-    @NotBlank(message = "类型不能为空")
-    @ApiModelProperty(value = "签名/签章-字典code", dataType = "String", required = true)
-    private String signType;
-
-    /**
      * minio存储文件名
      */
     @ApiModelProperty(value = "上传文件返回名称", dataType = "String")
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateAddRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateAddRequest.java
index aff1265..6316648 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateAddRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateAddRequest.java
@@ -17,30 +17,28 @@
 @Data
 public class TemplateAddRequest extends BaseSystemRequest {
     /**
-     * 原始记录模板/证书报告模板名称
+     * 模板名称
      */
     @ApiModelProperty(value = "名称", dataType = "String", required = true)
     @NotBlank(message = "名称不能为空")
     private String templateName;
 
     /**
-     * 原始记录模板/证书报告模板描述
+     * 模板描述
      */
     @ApiModelProperty(value = "描述", dataType = "String")
     private String templateDesc;
 
     /**
-     * 原始记录模板/证书报告模板创建人
+     * 创建人
      */
     @ApiModelProperty(value = "创建人", dataType = "String", required = true)
     @NotBlank(message = "创建人不能为空")
     private String templateCreator;
 
-    /**
-     * 原始记录模板/证书报告模板-字典code
-     */
-    @NotBlank(message = "类型不能为空")
-    @ApiModelProperty(value = "原始记录模板/证书报告模板-字典code", dataType = "String", required = true)
+
+    @NotBlank(message = "模板类型不能为空")
+    @ApiModelProperty(value = "模板类型(字典code)", dataType = "String", required = true)
     private String templateType;
 
     /**
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateListRequest.java
index eec5a1e..6d17bbe 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateListRequest.java
@@ -1,11 +1,12 @@
 package com.casic.missiles.dto.system;
 
+import com.casic.missiles.annotation.DictCodeField;
+import com.casic.missiles.constants.MeterDictCode;
 import com.casic.missiles.dto.BaseSystemRequest;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import javax.validation.constraints.NotBlank;
 import java.util.List;
 
 /**
@@ -19,8 +20,8 @@
     /**
      * 类型
      */
-//    @ApiModelProperty(value = "类型-字典code", dataType = "String", required = true)
-    @NotBlank(message = "类型不能为空")
+    @DictCodeField(message = "模板类型不合法", cacheName = MeterDictCode.TEMPLATE_TYPE)
+    @ApiModelProperty(value = "模板类型(字典code)", dataType = "String")
     private String templateType;
 
     /**
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificateChangeApply.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificateChangeApply.java
index 9216308..36923fd 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificateChangeApply.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificateChangeApply.java
@@ -1,11 +1,19 @@
 package com.casic.missiles.model.business;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 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 com.casic.missiles.dto.BaseRequest;
+import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -20,6 +28,12 @@
  * @author wangpeng
  * @since 2023-08-15
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
+@ApiModel
 @Data
 @TableName("biz_business_certificate_change_apply")
 public class BizBusinessCertificateChangeApply extends BaseRequest implements Serializable {
@@ -33,6 +47,7 @@
     /**
      * 申请单编号
      */
+    @ExcelProperty(value = "申请单编号", order = 1)
     @ApiModelProperty(value = "申请单编号", dataType = "String")
     @TableField("change_apply_no")
     private String changeApplyNo;
@@ -40,6 +55,7 @@
     /**
      * 申请单名字
      */
+    @ExcelProperty(value = "申请单名称", order = 2)
     @ApiModelProperty(value = "申请单名字", dataType = "String")
     @TableField("change_apply_name")
     private String changeApplyName;
@@ -54,6 +70,7 @@
     /**
      * 更换证书编号
      */
+    @ExcelProperty(value = "更换证书编号", order = 3)
     @ApiModelProperty(value = "更换证书编号", dataType = "String")
     @TableField("change_report_no")
     private String changeReportNo;
@@ -61,7 +78,8 @@
     /**
      * 更换证书名字
      */
-    @ApiModelProperty(value = "更换证书名字", dataType = "String")
+    @ExcelProperty(value = "更换证书/报告名称", order = 4)
+    @ApiModelProperty(value = "更换证书/报告名称", dataType = "String")
     @TableField("change_report_name")
     private String changeReportName;
 
@@ -73,6 +91,7 @@
     @TableField("change_type")
     private String changeType;
 
+    @ExcelProperty(value = "变更类型", order = 5)
     @ApiModelProperty(value = "变更类型(字典value)", dataType = "String")
     @TableField(exist = false)
     private String changeTypeName;
@@ -142,13 +161,15 @@
     /**
      * 创建用户名字
      */
-    @ApiModelProperty(value = "创建用户名字", dataType = "String")
+    @ExcelProperty(value = "创建人", order = 6)
+    @ApiModelProperty(value = "创建人名字", dataType = "String")
     @TableField("create_user_name")
     private String createUserName;
 
     /**
      * 创建时间
      */
+    @ExcelProperty(value = "创建时间", order = 7)
     @ApiModelProperty(value = "创建时间", dataType = "String")
     @TableField("create_time")
     private String createTime;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificateReport.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificateReport.java
index f01db9e..db06018 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificateReport.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificateReport.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.model.business;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -22,6 +29,11 @@
  * @author wangpeng
  * @since 2023-08-14
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @ApiModel
 @Data
 @TableName("biz_business_certificate_report")
@@ -36,6 +48,7 @@
     /**
      * 证书报告编号
      */
+    @ExcelProperty(value = "证书报告编号", order = 1)
     @ApiModelProperty(value = "证书报告编号", dataType = "String")
     @TableField("certificate_report_no")
     private String certificateReportNo;
@@ -43,6 +56,7 @@
     /**
      * 证书报告名称
      */
+    @ExcelProperty(value = "证书报告名称", order = 2)
     @ApiModelProperty(value = "证书报告名称", dataType = "String")
     @TableField("certificate_report_name")
     private String certificateReportName;
@@ -62,6 +76,7 @@
     @TableField("measure_category")
     private String measureCategory;
 
+    @ExcelProperty(value = "检校类别", order = 6)
     @ApiModelProperty(value = "检校类别(字典value)", dataType = "String")
     @TableField(exist = false)
     private String measureCategoryName;
@@ -69,6 +84,7 @@
     /**
      * 检校时间
      */
+    @ExcelProperty(value = "检校时间", order = 8)
     @ApiModelProperty(value = "检校时间", dataType = "String")
     @TableField("calibration_time")
     private String calibrationTime;
@@ -267,18 +283,22 @@
     @TableField(exist = false)
     private Integer decisionItem;
 
-    @ApiModelProperty(value = "设备样品编号（列表返回参数）", dataType = "String")
+    @ExcelProperty(value = "被检设备统一编号", order = 3)
+    @ApiModelProperty(value = "被检设备统一编号（列表返回参数）", dataType = "String")
     @TableField(exist = false)
     private String sampleNo;
 
-    @ApiModelProperty(value = "设备样品名称（列表返回参数）", dataType = "String")
+    @ExcelProperty(value = "被检设备名称", order = 4)
+    @ApiModelProperty(value = "被检设备名称（列表返回参数）", dataType = "String")
     @TableField(exist = false)
     private String sampleName;
 
-    @ApiModelProperty(value = "设备样品规格型号（列表返回参数）", dataType = "String")
+    @ExcelProperty(value = "规格型号", order = 5)
+    @ApiModelProperty(value = "规格型号（列表返回参数）", dataType = "String")
     @TableField(exist = false)
     private String sampleModel;
 
+    @ExcelProperty(value = "检定员", order = 7)
     @ApiModelProperty(value = "检定员名字（列表返回参数）", dataType = "String")
     @TableField(exist = false)
     private String staffName;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessIdentifyInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessIdentifyInfo.java
index 46bfba5..f1a9bec 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessIdentifyInfo.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessIdentifyInfo.java
@@ -1,10 +1,15 @@
 package com.casic.missiles.model.business;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 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;
 
@@ -20,6 +25,11 @@
  * @author wangpeng
  * @since 2023-08-15
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @Data
 @TableName("biz_business_identify_info")
 public class BizBusinessIdentifyInfo implements Serializable {
@@ -33,6 +43,7 @@
     /**
      * 记录编号
      */
+    @ExcelProperty(value = "记录编号", order = 1)
     @ApiModelProperty(value = "记录编号", dataType = "String")
     @TableField("record_no")
     private String recordNo;
@@ -41,20 +52,15 @@
      * 标志类型(字典code)
      */
     @NotEmpty(message = "标志类型不能为空")
-    @ApiModelProperty(value = "标志类型(字典code)", dataType = "String")
-    @DictCodeField(message = "标志类型不合法", cacheName = MeterDictCode.IDENTIFY_PRINT_TYPE)
+    @ApiModelProperty(value = "标志类型(直接存计量标识/使用状态/校准状态的字典value)", dataType = "String")
     @TableField("identify_type")
     private String identifyType;
 
-    @ApiModelProperty(value = "标志类型(字典value)", dataType = "String")
-    @TableField(exist = false)
-    private String identifyTypeName;
-
     /**
      * 设备id(可以是受检设备/设备台账)
      */
     @NotNull(message = "设备id不能为空")
-    @ApiModelProperty(value = "设备id(可以是受检设备/设备台账)", dataType = "String")
+    @ApiModelProperty(value = "设备id(可以是受检设备/设备台账)", dataType = "Long")
     @TableField("device_id")
     private Long deviceId;
 
@@ -66,29 +72,32 @@
     @TableField("device_type")
     private String deviceType;
 
+    @ExcelProperty(value = "统一编号", order = 3)
     @NotEmpty(message = "设备编号不能为空")
-    @ApiModelProperty(value = "设备编号", dataType = "String")
+    @ApiModelProperty(value = "统一编号", dataType = "String")
     @TableField("device_no")
     private String deviceNo;
 
     /**
      * 设备名字
      */
-    @NotEmpty(message = "设备名字不能为空")
-    @ApiModelProperty(value = "设备名字", dataType = "String")
+    @ExcelProperty(value = "设备名称", order = 4)
+    @NotEmpty(message = "设备名称不能为空")
+    @ApiModelProperty(value = "设备名称", dataType = "String")
     @TableField("device_name")
     private String deviceName;
 
     /**
      * 检定员id
      */
-    @ApiModelProperty(value = "检定员id", dataType = "String")
+    @ApiModelProperty(value = "检定员id", dataType = "Long")
     @TableField("measure_person_id")
     private Long measurePersonId;
 
     /**
      * 检定员名字
      */
+    @ExcelProperty(value = "检定员", order = 5)
     @ApiModelProperty(value = "检定员名字", dataType = "String")
     @TableField("measure_person")
     private String measurePerson;
@@ -103,7 +112,8 @@
     /**
      * 更新时间
      */
-    @ApiModelProperty(value = "更新时间", dataType = "String")
+    @ExcelProperty(value = "打印时间", order = 6)
+    @ApiModelProperty(value = "打印时间", dataType = "String")
     @TableField("update_time")
     private String updateTime;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceAssess.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceAssess.java
index 659d9ca..6720b90 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceAssess.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceAssess.java
@@ -1,11 +1,26 @@
 package com.casic.missiles.model.business;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 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 com.casic.missiles.dto.BaseRequest;
+import com.casic.missiles.dto.business.outsource.OrderSampleDTO;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import javax.validation.constraints.NotEmpty;
 import java.io.Serializable;
+import java.util.List;
 
 /**
  * <p>
@@ -15,146 +30,231 @@
  * @author wangpeng
  * @since 2023-08-16
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
+@ApiModel
 @Data
 @TableName("biz_business_outsource_assess")
-public class BizBusinessOutsourceAssess implements Serializable {
+public class BizBusinessOutsourceAssess extends BaseRequest implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
+    @ApiModelProperty(value = "id，更新/删除使用参数", dataType = "Long")
     @TableId("id")
     private Long id;
 
     /**
      * 评审表编号
      */
+    @ExcelProperty(value = "评审表编号", order = 1)
+    @ApiModelProperty(value = "评审表编号(后台生成)", dataType = "String")
     @TableField("project_no")
     private String projectNo;
 
     /**
      * 评审表名称
      */
+    @ExcelProperty(value = "评审表名称", order = 2)
+    @ApiModelProperty(value = "评审表名称", dataType = "String")
     @TableField("project_name")
     private String projectName;
 
+    @NotEmpty(message = "实验室代码不能为空")
+    @DictCodeField(message = "实验室代码描述不合法", cacheName = MeterDictCode.LAB_CODE)
+    @ApiModelProperty(value = "实验室代码(字典code)", dataType = "String")
+    @TableField("lab_code")
+    private String labCode;
+
+    @ApiModelProperty(value = "实验室代码(字典value)", dataType = "String")
+    @TableField(exist = false)
+    private String labCodeName;
+
+    /**
+     * 组别代码
+     */
+    @NotEmpty(message = "组别代码不能为空")
+    @DictCodeField(message = "组别代码描述不合法", cacheName = MeterDictCode.GROUP_CODE)
+    @ApiModelProperty(value = "组别代码(字典code)", dataType = "String")
+    @TableField("group_code")
+    private String groupCode;
+
+    @ApiModelProperty(value = "组别代码(字典value)", dataType = "String")
+    @TableField(exist = false)
+    private String groupCodeName;
+
     /**
      * 申请人id
      */
+    @ApiModelProperty(value = "申请人id", dataType = "String")
     @TableField("applicant_id")
     private Long applicantId;
 
     /**
      * 申请人名字
      */
+    @ExcelProperty(value = "申请人", order = 5)
+    @ApiModelProperty(value = "申请人", dataType = "String")
     @TableField("applicant_name")
     private String applicantName;
 
     /**
      * 申请时间
      */
+    @ExcelProperty(value = "申请时间", order = 6)
+    @ApiModelProperty(value = "申请时间", dataType = "String")
     @TableField("applicant_time")
     private String applicantTime;
 
     /**
      * 附件(minio存储文件名)
      */
+    @ApiModelProperty(value = "附件(minio存储文件名)", dataType = "String")
     @TableField("minio_file_name")
     private String minioFileName;
 
     /**
      * 备注
      */
+    @ApiModelProperty(value = "备注", dataType = "String")
     @TableField("remark")
     private String remark;
 
     /**
      * 创建人id
      */
+    @ApiModelProperty(value = "创建人id", dataType = "String")
     @TableField("create_user_id")
     private Long createUserId;
 
     /**
      * 创建人名字
      */
+    @ApiModelProperty(value = "创建人名字", dataType = "String")
     @TableField("create_user_name")
     private String createUserName;
 
     /**
      * 分包方id
      */
+    @ApiModelProperty(value = "评审表编号", dataType = "String")
     @TableField("outsourcer_id")
     private Long outsourcerId;
 
     /**
      * 预计开始时间
      */
+    @ApiModelProperty(value = "预计开始时间", dataType = "String")
     @TableField("pre_start_time")
     private String preStartTime;
 
     /**
      * 预计结束时间
      */
+    @ApiModelProperty(value = "预计结束时间", dataType = "String")
     @TableField("pre_end_time")
     private String preEndTime;
 
     /**
      * 分包原因-字典
      */
+    @ApiModelProperty(value = "分包原因(字典code)", dataType = "String")
+    @DictCodeField(message = "分包原因描述不合法", cacheName = MeterDictCode.OUTSOURCE_REASON)
     @TableField("outsource_reason")
     private String outsourceReason;
 
+    @ApiModelProperty(value = "分包原因(字典value)", dataType = "String")
+    @TableField(exist = false)
+    private String outsourceReasonName;
+
     /**
      * 预计费用
      */
+    @ApiModelProperty(value = "预计费用", dataType = "String")
     @TableField("pre_cost")
     private String preCost;
 
     /**
      * 审批状态
      */
+    @ApiModelProperty(value = "审批状态", dataType = "String")
+    @DictCodeField(message = "审批状态描述不合法", cacheName = MeterDictCode.APPROVAL_STATUS)
     @TableField("approval_status")
     private String approvalStatus;
 
     /**
      * 流程实例id
      */
+    @ApiModelProperty(value = "流程实例id", dataType = "String")
     @TableField("process_id")
     private String processId;
 
     /**
      * 实验室认可情况
      */
+    @ApiModelProperty(value = "实验室认可情况", dataType = "String")
     @TableField("approve_situation")
     private String approveSituation;
 
     /**
      * 溯源性
      */
+    @ApiModelProperty(value = "溯源性", dataType = "String")
     @TableField("traceability")
     private String traceability;
 
     /**
      * 测试方法
      */
+    @ApiModelProperty(value = "测试方法", dataType = "String")
     @TableField("test_method")
     private String testMethod;
 
     /**
      * 技术能力
      */
+    @ApiModelProperty(value = "技术能力", dataType = "String")
     @TableField("technique_ability")
     private String techniqueAbility;
 
     /**
      * 创建时间
      */
+    @ApiModelProperty(hidden = true)
     @TableField("create_time")
     private String createTime;
 
     /**
      * 更新时间
      */
+    @ApiModelProperty(hidden = true)
     @TableField("update_time")
     private String updateTime;
 
+    @ApiModelProperty(value = "审批状态类型-字典value", dataType = "String")
+    @TableField(exist = false)
+    private String approvalStatusName;
 
+    @ApiModelProperty(value = "任务id（同意、驳回等操作使用）", dataType = "String")
+    @TableField(exist = false)
+    private String taskId;
+
+    @ApiModelProperty(value = "可选决策项（1同意驳回拒绝 2同意驳回 3同意拒绝，用于待审批列表同意/驳回/拒绝按钮展示）", dataType = "Integer")
+    @TableField(exist = false)
+    private Integer decisionItem;
+
+    @NotEmpty(message = "受检设备信息不能为空")
+    @ApiModelProperty(value = "受检设备id列表（新建使用参数）", dataType = "List")
+    @TableField(exist = false)
+    private List<OrderSampleDTO> orderSampleList;
+
+    @ExcelProperty(value = "分包机构名称", order = 3)
+    @ApiModelProperty(value = "分包机构名称（列表返回参数）", dataType = "String")
+    private String outsourcerName;
+
+    @ExcelProperty(value = "机构负责人", order = 4)
+    @ApiModelProperty(value = "机构负责人（列表返回参数）", dataType = "String")
+    private String director;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceProtocol.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceProtocol.java
new file mode 100644
index 0000000..38df697
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceProtocol.java
@@ -0,0 +1,225 @@
+package com.casic.missiles.model.business;
+
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
+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 com.casic.missiles.dto.BaseRequest;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotEmpty;
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 计量检定业务-分包管理-测试、校准或检定工作分包协议书
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-08-24
+ */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
+@Data
+@TableName("biz_business_outsource_protocol")
+public class BizBusinessOutsourceProtocol extends BaseRequest implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "id，更新/删除使用参数", dataType = "Long")
+    @TableId("id")
+    private Long id;
+
+    /**
+     * 协议书编号
+     */
+    @ExcelProperty(value = "协议书编号", order = 1)
+    @ApiModelProperty(value = "协议书编号(后台生成)", dataType = "String")
+    @TableField("protocol_no")
+    private String protocolNo;
+
+    /**
+     * 协议书名称
+     */
+    @ExcelProperty(value = "协议书名称", order = 2)
+    @ApiModelProperty(value = "协议书名称", dataType = "String")
+    @TableField("project_name")
+    private String projectName;
+
+    @NotEmpty(message = "实验室代码不能为空")
+    @DictCodeField(message = "实验室代码描述不合法", cacheName = MeterDictCode.LAB_CODE)
+    @ApiModelProperty(value = "实验室代码(字典code)", dataType = "String")
+    @TableField("lab_code")
+    private String labCode;
+
+    @ApiModelProperty(value = "实验室代码(字典value)", dataType = "String")
+    @TableField(exist = false)
+    private String labCodeName;
+
+    @NotEmpty(message = "组别代码不能为空")
+    @DictCodeField(message = "组别代码描述不合法", cacheName = MeterDictCode.GROUP_CODE)
+    @ApiModelProperty(value = "组别代码(字典code)", dataType = "String")
+    @TableField("group_code")
+    private String groupCode;
+
+    @ApiModelProperty(value = "组别代码(字典value)", dataType = "String")
+    @TableField(exist = false)
+    private String groupCodeName;
+
+    /**
+     * 分包方id
+     */
+    @ApiModelProperty(value = "分包方id", dataType = "Long")
+    @TableField("outsourcer_id")
+    private Long outsourcerId;
+
+    /**
+     * 其他
+     */
+    @ApiModelProperty(value = "其他", dataType = "String")
+    @TableField("remark")
+    private String remark;
+
+    /**
+     * 分包方编号
+     */
+    @ApiModelProperty(value = "分包方编号(新建不用传)", dataType = "String")
+    @TableField("outsource_no")
+    private String outsourceNo;
+
+    /**
+     * 分包方名称
+     */
+    @ExcelProperty(value = "分包方名称", order = 3)
+    @ApiModelProperty(value = "分包方名称(新建不用传)", dataType = "String")
+    @TableField("outsource_name")
+    private String outsourceName;
+
+    /**
+     * 联系人
+     */
+    @ExcelProperty(value = "联系人", order = 4)
+    @ApiModelProperty(value = "联系人", dataType = "String")
+    @TableField("contacts")
+    private String contacts;
+
+    /**
+     * 电话
+     */
+    @ApiModelProperty(value = "电话", dataType = "String")
+    @TableField("mobile")
+    private String mobile;
+
+    /**
+     * 地址
+     */
+    @ApiModelProperty(value = "地址", dataType = "String")
+    @TableField("address")
+    private String address;
+
+    /**
+     * 要求完成日期
+     */
+    @ApiModelProperty(value = "要求完成日期", dataType = "String")
+    @TableField("require_date")
+    private String requireDate;
+
+    /**
+     * 分包费用(元)
+     */
+    @ApiModelProperty(value = "分包费用(元)", dataType = "String")
+    @TableField("outsource_cost")
+    private Double outsourceCost;
+
+    /**
+     * 分包方负责人
+     */
+    @ApiModelProperty(value = "分包方负责人", dataType = "String")
+    @TableField("director")
+    private String director;
+
+    /**
+     * 分包项目
+     */
+    @ApiModelProperty(value = "分包项目", dataType = "String")
+    @TableField("item")
+    private String item;
+
+    /**
+     * 分包要求
+     */
+    @ApiModelProperty(value = "分包要求", dataType = "String")
+    @TableField("requires")
+    private String requires;
+
+    /**
+     * 创建人id
+     */
+    @ApiModelProperty(hidden = true)
+    @TableField("create_user_id")
+    private Long createUserId;
+
+    /**
+     * 创建人名字
+     */
+    @ExcelProperty(value = "申请人", order = 5)
+    @ApiModelProperty(value = "申请人", dataType = "String")
+    @TableField("create_user_name")
+    private String createUserName;
+
+    /**
+     * 审批状态
+     */
+    @ApiModelProperty(value = "审批状态", dataType = "String")
+    @DictCodeField(message = "审批状态描述不合法", cacheName = MeterDictCode.APPROVAL_STATUS)
+    @TableField("approval_status")
+    private String approvalStatus;
+
+    /**
+     * 流程实例id
+     */
+    @ApiModelProperty(value = "流程实例id", dataType = "String")
+    @TableField("process_id")
+    private String processId;
+
+    /**
+     * 创建时间
+     */
+    @ExcelProperty(value = "申请时间", order = 6)
+    @ApiModelProperty(value = "申请时间", dataType = "String")
+    @TableField("create_time")
+    private String createTime;
+
+    /**
+     * 更新时间
+     */
+    @ApiModelProperty(hidden = true)
+    @TableField("update_time")
+    private String updateTime;
+
+    @ApiModelProperty(value = "审批状态类型-字典value", dataType = "String")
+    @TableField(exist = false)
+    private String approvalStatusName;
+
+    @ApiModelProperty(value = "任务id（同意、驳回等操作使用）", dataType = "String")
+    @TableField(exist = false)
+    private String taskId;
+
+    @ApiModelProperty(value = "可选决策项（1同意驳回拒绝 2同意驳回 3同意拒绝，用于待审批列表同意/驳回/拒绝按钮展示）", dataType = "Integer")
+    @TableField(exist = false)
+    private Integer decisionItem;
+
+
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourcerInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourcerInfo.java
index ec4e997..f9aa69e 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourcerInfo.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourcerInfo.java
@@ -17,6 +17,7 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import javax.validation.constraints.NotEmpty;
 import java.io.Serializable;
 
 /**
@@ -59,6 +60,29 @@
     @TableField("outsourcer_name")
     private String outsourcerName;
 
+    @NotEmpty(message = "实验室代码不能为空")
+    @DictCodeField(message = "实验室代码描述不合法", cacheName = MeterDictCode.LAB_CODE)
+    @ApiModelProperty(value = "实验室代码(字典code)", dataType = "String")
+    @TableField("lab_code")
+    private String labCode;
+
+    @ApiModelProperty(value = "实验室代码(字典value)", dataType = "String")
+    @TableField(exist = false)
+    private String labCodeName;
+
+    /**
+     * 组别代码
+     */
+    @NotEmpty(message = "组别代码不能为空")
+    @DictCodeField(message = "组别代码描述不合法", cacheName = MeterDictCode.GROUP_CODE)
+    @ApiModelProperty(value = "组别代码(字典code)", dataType = "String")
+    @TableField("group_code")
+    private String groupCode;
+
+    @ApiModelProperty(value = "组别代码(字典value)", dataType = "String")
+    @TableField(exist = false)
+    private String groupCodeName;
+
     /**
      * 单位简称
      */
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardInfo.java
index c48eed7..dffdfdd 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardInfo.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardInfo.java
@@ -5,6 +5,7 @@
 import com.baomidou.mybatisplus.annotation.TableName;
 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;
 
@@ -18,6 +19,7 @@
  * @author wangpeng
  * @since 2023-08-04
  */
+@ApiModel
 @Data
 @TableName("biz_equipment_standard_info")
 public class BizEquipmentStandardInfo implements Serializable {
@@ -119,7 +121,7 @@
      * 管理状态(字典code)
      */
     @ApiModelProperty(value = "管理状态(字典code)", dataType = "String")
-    @DictCodeField(message = "管理状态不合法", cacheName = MeterDictCode.MANAGER_STATE)
+    @DictCodeField(message = "管理状态不合法", cacheName = MeterDictCode.STANDARD_MANAGER_STATE)
     @TableField("manage_status")
     private String manageStatus;
 
@@ -151,7 +153,7 @@
     /**
      * 温度(℃)
      */
-    @ApiModelProperty(value = "使用状态(字典code)", dataType = "String")
+    @ApiModelProperty(value = "温度(℃)", dataType = "String")
     @TableField("temperature")
     private Double temperature;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardInfoApproval.java b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardInfoApproval.java
index dbd86ab..9f58d83 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardInfoApproval.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardInfoApproval.java
@@ -150,7 +150,7 @@
      * 管理状态(字典code)
      */
     @ApiModelProperty(value = "管理状态(字典code)", dataType = "String")
-    @DictCodeField(message = "管理状态不合法", cacheName = MeterDictCode.MANAGER_STATE)
+    @DictCodeField(message = "管理状态不合法", cacheName = MeterDictCode.STANDARD_MANAGER_STATE)
     @TableField("manage_status")
     private String manageStatus;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardTechnologyRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardTechnologyRelation.java
index 0e612bd..751f26b 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardTechnologyRelation.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardTechnologyRelation.java
@@ -3,6 +3,7 @@
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -16,6 +17,7 @@
  * @author wangpeng
  * @since 2023-08-04
  */
+@ApiModel
 @Data
 @TableName("biz_equipment_standard_technology_relation")
 public class BizEquipmentStandardTechnologyRelation implements Serializable {
@@ -33,6 +35,10 @@
     @TableField("technology_file_id")
     private Long technologyFileId;
 
+    @ApiModelProperty(value = "依据的技术文件编号", dataType = "String")
+    @TableField("technology_file_no")
+    private String technologyFileNo;
+
     /**
      * 依据的技术文件名称(技术文件中现行测试校准检定方法表文件名字段)
      */
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerInfo.java
index d6e8bed..65cd6bc 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerInfo.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerInfo.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.model.resource;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -21,6 +28,11 @@
  * @author wangpeng
  * @since 2023-08-08
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @ApiModel
 @Data
 @TableName("biz_resource_customer_info")
@@ -35,6 +47,7 @@
     /**
      * 委托方编号
      */
+    @ExcelProperty(value = "委托方编号", order = 1)
     @ApiModelProperty(value = "委托方编号", dataType = "String")
     @TableField("customer_no")
     private String customerNo;
@@ -42,6 +55,7 @@
     /**
      * 委托方名称
      */
+    @ExcelProperty(value = "委托方名称", order = 2)
     @ApiModelProperty(value = "委托方名称(新建时为下拉选择一个受检单位组织的名字，传deptId字段，后端获取名称)", dataType = "String")
     @TableField("customer_name")
     private String customerName;
@@ -63,6 +77,7 @@
     /**
      * 联系人
      */
+    @ExcelProperty(value = "联系人", order = 3)
     @ApiModelProperty(value = "联系人", dataType = "String")
     @TableField("contacts")
     private String contacts;
@@ -70,6 +85,7 @@
     /**
      * 座机电话
      */
+    @ExcelProperty(value = "座机电话", order = 4)
     @ApiModelProperty(value = "座机电话", dataType = "String")
     @TableField("mobile")
     private String mobile;
@@ -77,6 +93,7 @@
     /**
      * 手机号码
      */
+    @ExcelProperty(value = "手机号码", order = 5)
     @ApiModelProperty(value = "手机号码", dataType = "String")
     @TableField("phone")
     private String phone;
@@ -91,6 +108,7 @@
     /**
      * 地址
      */
+    @ExcelProperty(value = "地址", order = 6)
     @ApiModelProperty(value = "地址", dataType = "String")
     @TableField("address")
     private String address;
@@ -141,6 +159,7 @@
     /**
      * 创建时间
      */
+    @ExcelProperty(value = "创建时间", order = 7)
     @ApiModelProperty(value = "创建时间", dataType = "String")
     @TableField("create_time")
     private String createTime;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerSuggestForm.java b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerSuggestForm.java
index 7201bbd..701bf8b 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerSuggestForm.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerSuggestForm.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.model.resource;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -22,6 +29,11 @@
  * @author wangpeng
  * @since 2023-08-08
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @ApiModel
 @Data
 @TableName("biz_resource_customer_suggest_form")
@@ -44,7 +56,8 @@
     /**
      * 委托方名称
      */
-    @ApiModelProperty(value = "委托方名称", dataType = "String")
+    @ExcelProperty(value = "意见反馈单位", order = 2)
+    @ApiModelProperty(value = "意见反馈单位", dataType = "String")
     @TableField("customer_name")
     private String customerName;
 
@@ -59,7 +72,8 @@
     /**
      * 委托方意见反馈部门名称
      */
-    @ApiModelProperty(value = "委托方意见反馈部门名称", dataType = "String")
+    @ExcelProperty(value = "委托方意见反馈部门", order = 3)
+    @ApiModelProperty(value = "委托方意见反馈部门", dataType = "String")
     @TableField("customer_dept_name")
     private String customerDeptName;
 
@@ -73,6 +87,7 @@
     /**
      * 表单编号
      */
+    @ExcelProperty(value = "表单编号", order = 1)
     @ApiModelProperty(value = "表单编号", dataType = "String")
     @TableField("form_no")
     private String formNo;
@@ -111,6 +126,7 @@
     /**
      * 创建人名字
      */
+    @ExcelProperty(value = "创建人", order = 4)
     @ApiModelProperty(value = "创建人名字", dataType = "String")
     @TableField("create_user_name")
     private String createUserName;
@@ -147,6 +163,7 @@
     /**
      * 创建时间
      */
+    @ExcelProperty(value = "创建时间", order = 5)
     @ApiModelProperty(value = "创建时间", dataType = "String")
     @TableField("create_time")
     private String createTime;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSealInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSealInfo.java
index cbf05d7..9bf389d 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSealInfo.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSealInfo.java
@@ -106,6 +106,10 @@
     @TableField("minio_file_name")
     private String minioFileName;
 
+    @ApiModelProperty(value = "minio存储文件url", dataType = "String")
+    @TableField(exist = false)
+    private String minioFileUrl;
+
     @ApiModelProperty(value = "创建时间", dataType = "String")
     @TableField("create_time")
     private String createTime;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSealUseNote.java b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSealUseNote.java
index 3f2d9e8..3ce16a8 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSealUseNote.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSealUseNote.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.model.resource;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -20,6 +27,11 @@
  * @author wangpeng
  * @since 2023-07-28
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @ApiModel
 @Data
 @TableName("biz_resource_seal_use_note")
@@ -34,6 +46,7 @@
     /**
      * 登记表编号
      */
+    @ExcelProperty(value = "申请单编号", order = 1)
     @ApiModelProperty(value = "登记表编号(自动生成)", dataType = "String")
     @TableField("note_form_no")
     private String noteFormNo;
@@ -55,6 +68,7 @@
     /**
      * 申请部门
      */
+    @ExcelProperty(value = "申请部门", order = 5)
     @ApiModelProperty(value = "申请部门", dataType = "String")
     @TableField("apply_dept_name")
     private String applyDeptName;
@@ -69,6 +83,7 @@
     /**
      * 申请人
      */
+    @ExcelProperty(value = "申请人", order = 6)
     @ApiModelProperty(value = "申请人", dataType = "String")
     @TableField("apply_user_name")
     private String applyUserName;
@@ -76,6 +91,7 @@
     /**
      * 申请时间
      */
+    @ExcelProperty(value = "申请时间", order = 7)
     @ApiModelProperty(value = "申请时间(新增自动获取当前时间)", dataType = "String")
     @TableField("apply_time")
     private String applyTime;
@@ -130,6 +146,26 @@
     @TableField("update_time")
     private String updateTime;
 
+    @ExcelProperty(value = "印章名称", order = 2)
+    @ApiModelProperty(value = "印章名称(列表返回参数)", dataType = "String")
+    @TableField(exist = false)
+    private String sealName;
+
+    @DictCodeField(message = "印章类型描述不合法", cacheName = MeterDictCode.SEAL_TYPE)
+    @ApiModelProperty(hidden = true)
+    @TableField(exist = false)
+    private String sealType;
+
+    @ExcelProperty(value = "印章类型", order = 3)
+    @ApiModelProperty(value = "印章类型(列表返回参数)", dataType = "String")
+    @TableField(exist = false)
+    private String sealTypeName;
+
+    @ExcelProperty(value = "批准人", order = 4)
+    @ApiModelProperty(value = "批准人(列表返回参数)", dataType = "String")
+    @TableField(exist = false)
+    private String approverName;
+
     @ApiModelProperty(value = "审批状态类型-字典value", dataType = "String")
     @TableField(exist = false)
     private String approvalStatusName;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceStaffInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceStaffInfo.java
index 5ef995b..41563a1 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceStaffInfo.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceStaffInfo.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.model.resource;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -20,6 +27,11 @@
  * @author wangpeng
  * @since 2023-07-25
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @ApiModel
 @Data
 @TableName("biz_resource_staff_info")
@@ -38,6 +50,7 @@
     /**
      * 人员编号
      */
+    @ExcelProperty(value = "人员编号",order = 0)
     @NotEmpty(message = "人员编号不能为空")
     @ApiModelProperty(value = "人员编号", dataType = "String")
     @TableField("staff_no")
@@ -46,6 +59,7 @@
     /**
      * 姓名
      */
+    @ExcelProperty(value = "姓名",order = 1)
     @ApiModelProperty(value = "姓名", dataType = "String")
     @TableField("staff_name")
     private String staffName;
@@ -152,13 +166,15 @@
     /**
      * 部门名字
      */
-    @ApiModelProperty(value = "部门名字", dataType = "String")
+    @ExcelProperty(value = "工作部门",order = 4)
+    @ApiModelProperty(value = "工作部门", dataType = "String")
     @TableField("dept_name")
     private String deptName;
 
     /**
      * 岗位
      */
+    @ExcelProperty(value = "岗位",order = 2)
     @ApiModelProperty(value = "岗位", dataType = "String")
     @TableField("station")
     private String station;
@@ -166,6 +182,7 @@
     /**
      * 计量专业
      */
+    @ExcelProperty(value = "计量专业",order = 5)
     @ApiModelProperty(value = "计量专业", dataType = "String")
     @TableField("major")
     private String major;
@@ -173,6 +190,7 @@
     /**
      * 证号
      */
+    @ExcelProperty(value = "证号",order = 3)
     @ApiModelProperty(value = "证号", dataType = "String")
     @TableField("certificate_number")
     private String certificateNumber;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSupplierInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSupplierInfo.java
index eb5ef01..a1e2697 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSupplierInfo.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSupplierInfo.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.model.resource;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -20,6 +27,11 @@
  * @author wangpeng
  * @since 2023-07-27
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @ApiModel
 @Data
 @TableName("biz_resource_supplier_info")
@@ -34,6 +46,7 @@
     /**
      * 供方编号
      */
+    @ExcelProperty(value = "供方编号", order = 1)
     @ApiModelProperty(value = "供方编号(自动生成)", dataType = "String")
     @TableField("supplier_no")
     private String supplierNo;
@@ -41,6 +54,7 @@
     /**
      * 供方名称
      */
+    @ExcelProperty(value = "供方名称", order = 2)
     @ApiModelProperty(value = "供方名称", dataType = "String")
     @TableField("supplier_name")
     private String supplierName;
@@ -60,6 +74,7 @@
     @TableField("supplier_type")
     private String supplierType;
 
+    @ExcelProperty(value = "供方类型", order = 3)
     @ApiModelProperty(value = "供方类型(字典value)", dataType = "String")
     @TableField(exist = false)
     private String supplierTypeName;
@@ -109,7 +124,8 @@
     /**
      * 电话
      */
-    @ApiModelProperty(value = "电话", dataType = "String")
+    @ExcelProperty(value = "联系电话", order = 4)
+    @ApiModelProperty(value = "联系电话", dataType = "String")
     @TableField("phone")
     private String phone;
 
@@ -158,6 +174,7 @@
     /**
      * 公司地址-省
      */
+    @ExcelProperty(value = "地址-省", order = 6)
     @ApiModelProperty(value = "公司地址-省", dataType = "String")
     @TableField("company_province_name")
     private String companyProvinceName;
@@ -172,6 +189,7 @@
     /**
      * 公司地址-市
      */
+    @ExcelProperty(value = "地址-市", order = 7)
     @ApiModelProperty(value = "公司地址-市", dataType = "String")
     @TableField("company_city_name")
     private String companyCityName;
@@ -186,6 +204,7 @@
     /**
      * 公司地址-区
      */
+    @ExcelProperty(value = "地址-区", order = 8)
     @ApiModelProperty(value = "公司地址-区", dataType = "String")
     @TableField("company_area_name")
     private String companyAreaName;
@@ -193,6 +212,7 @@
     /**
      * 公司地址-详细地址
      */
+    @ExcelProperty(value = "地址-详细地址", order = 9)
     @ApiModelProperty(value = "公司地址-详细地址", dataType = "String")
     @TableField("company_address")
     private String companyAddress;
@@ -200,6 +220,7 @@
     /**
      * 服务和供应的内容
      */
+    @ExcelProperty(value = "服务和供应的内容", order = 5)
     @ApiModelProperty(value = "服务和供应的内容", dataType = "String")
     @TableField("supplier_content")
     private String supplierContent;
@@ -250,6 +271,7 @@
     /**
      * 创建时间
      */
+    @ExcelProperty(value = "创建时间", order = 9)
     @ApiModelProperty(value = "创建时间", dataType = "String")
     @TableField("create_time")
     private String createTime;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/EnvLocationInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/EnvLocationInfo.java
new file mode 100644
index 0000000..d8e2d7b
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/EnvLocationInfo.java
@@ -0,0 +1,83 @@
+package com.casic.missiles.model.resource;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotEmpty;
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 实验室环境监控系统-设备表
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-06-07
+ */
+@ApiModel
+@Data
+@TableName("env_location_info")
+public class EnvLocationInfo implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "主键id", dataType = "Long")
+    @TableId("id")
+    private Long id;
+
+    /**
+     * 地点编号
+     */
+    @NotEmpty(message = "地点编号不能为空")
+    @ApiModelProperty(value = "地点编号", dataType = "String")
+    @TableField("location_no")
+    private String locationNo;
+
+    /**
+     * 地点名称
+     */
+    @ApiModelProperty(value = "地点名称", dataType = "String")
+    @TableField("location_name")
+    private String locationName;
+
+    /**
+     * 地点位置
+     */
+    @ApiModelProperty(value = "地点位置", dataType = "String")
+    @TableField("location_position")
+    private String locationPosition;
+
+    /**
+     * 创建人id
+     */
+    @ApiModelProperty(value = "创建人id", dataType = "Long")
+    @TableField("create_user_id")
+    private Long createUserId;
+
+    /**
+     * 创建人
+     */
+    @ApiModelProperty(value = "创建人", dataType = "String")
+    @TableField("create_user")
+    private String createUser;
+
+    /**
+     * 创建时间
+     */
+    @ApiModelProperty(value = "创建时间", dataType = "String")
+    @TableField("create_time")
+    private String createTime;
+
+    /**
+     * 更新时间
+     */
+    @ApiModelProperty(value = "更新时间", dataType = "String")
+    @TableField("update_time")
+    private String updateTime;
+
+
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemFileConfig.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemFileConfig.java
index 19e6845..86e569c 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemFileConfig.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemFileConfig.java
@@ -30,7 +30,7 @@
     @ApiModelProperty(value = "系统类别(1业务系统2受检系统3环境系统)", dataType = "Integer")
     @NotNull(message = "系统类别不能为空")
     @TableField("system_type")
-    private Integer systemType;
+    private Integer systemType = 1;
 
     @ApiModelProperty("下载编号")
     @TableField("download_no")
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemNotice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemNotice.java
index e94297d..06ec37d 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemNotice.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemNotice.java
@@ -34,7 +34,7 @@
     @ApiModelProperty(value = "系统类别(1业务系统2受检系统3环境系统)", dataType = "Integer")
     @NotNull(message = "系统类别不能为空")
     @TableField("system_type")
-    private Integer systemType;
+    private Integer systemType = 1;
 
     /**
      * 通知公告编号
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSign.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSign.java
index 6c0d7c9..954f4f8 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSign.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSign.java
@@ -51,7 +51,7 @@
     @ApiModelProperty(value = "系统类别(1业务系统2受检系统3环境系统)", dataType = "Integer")
     @NotNull(message = "系统类别不能为空")
     @TableField("system_type")
-    private Integer systemType;
+    private Integer systemType = 1;
 
     /**
      * 签名编号
@@ -130,4 +130,8 @@
     @TableField(exist = false)
     private List<Long> userIdList;
 
+    @ApiModelProperty(hidden = true)
+    @TableField(exist = false)
+    private String deptName;
+
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemTemplate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemTemplate.java
index 503a457..1d27ebe 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemTemplate.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemTemplate.java
@@ -47,7 +47,7 @@
     @ApiModelProperty(value = "系统类别(1业务系统2受检系统3环境系统)", dataType = "Integer")
     @NotNull(message = "系统类别不能为空")
     @TableField("system_type")
-    private Integer systemType;
+    private Integer systemType = 1;
 
     /**
      * 模板编号
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java
index 8c21cb0..f61e4a8 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java
@@ -32,4 +32,8 @@
     ReturnDTO approvalDelete(ApprovalDeleteRequest request);
 
     ReturnDTO failUpdate(T request);
+
+    List<O> listExport(R request);
+
+    List<O> listExportByIds(List<Long> ids);
 }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java
index 724166f..9bce15b 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java
@@ -157,6 +157,29 @@
         throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
     }
 
+    @Override
+    public List<O> listExport(R request) {
+        request.setCreateUserId(null);
+        request.setApprovalStatus(ApprovalStatusEnum.PASSED);
+        Page<O> page = PageFactory.defaultPage();
+        page.setCurrent(1);
+        page.setSearchCount(false);
+        page.setSize(Integer.MAX_VALUE);
+        Page<O> resultPage = this.baseMapper.selectBatchForApprovalList(page, request, null);
+        return resultPage.getRecords();
+    }
+
+    @Override
+    public List<O> listExportByIds(List<Long> ids) {
+        Page<O> page = PageFactory.defaultPage();
+        page.setCurrent(1);
+        page.setSearchCount(false);
+        page.setSize(Integer.MAX_VALUE);
+        List<String> businessKeys = ids.stream().map(String::valueOf).collect(Collectors.toList());
+        Page<O> resultPage = this.baseMapper.selectBatchForApprovalList(page, null, businessKeys);
+        return resultPage.getRecords();
+    }
+
     protected ReturnDTO updateApprovalStatus(Long id, String processId, String approvalStatus) {
         UpdateWrapper<T> updateWrapper = new UpdateWrapper<>();
         updateWrapper.eq("id", id);
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificatePrintServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificatePrintServiceImpl.java
index f6e4706..3228497 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificatePrintServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificatePrintServiceImpl.java
@@ -162,6 +162,30 @@
         return ReturnUtil.success(printLogMapper.selectList(wrapper));
     }
 
+    @Override
+    public List<CertificatePrintListResponse> listByIds(List<Long> ids) {
+        Page<CertificatePrintListResponse> page = PageFactory.defaultPage();
+        page.setCurrent(1);
+        page.setSearchCount(false);
+        page.setSize(Integer.MAX_VALUE);
+        List<String> businessKeys = ids.stream().map(String::valueOf).collect(Collectors.toList());
+        Page<CertificatePrintListResponse> resultPage = this.baseMapper.selectBatchForApprovalList(page, null, businessKeys);
+        return resultPage.getRecords();
+    }
+
+    @Override
+    public List<CertificatePrintListResponse> list(CertificatePrintApprovalListRequest request) {
+        request.setCreateUserId(null);
+        request.setApprovalStatus(null);
+        request.setPrintStatus(null);
+        Page<CertificatePrintListResponse> page = PageFactory.defaultPage();
+        page.setCurrent(1);
+        page.setSearchCount(false);
+        page.setSize(Integer.MAX_VALUE);
+        Page<CertificatePrintListResponse> resultPage = certificatePrintMapper.selectBatchForApprovalList(page, request, null);
+        return resultPage.getRecords();
+    }
+
     private void savePrintLog(Long id) {
         BizBusinessCertificatePrintLog printLog = new BizBusinessCertificatePrintLog();
         BizBusinessCertificatePrint certificatePrint = certificatePrintMapper.selectById(id);
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificateReportServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificateReportServiceImpl.java
index 457555f..24146be 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificateReportServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificateReportServiceImpl.java
@@ -158,8 +158,8 @@
         QueryWrapper<BizBusinessCertificateMeasureResultData> mWrapper = new QueryWrapper<>();
         mWrapper.eq("report_id", reportId);
         boolean mRemove = certificateMeasureResultDataService.remove(mWrapper);
-        Assert.isFalse(eRemove || mRemove, () -> {
+        if(!eRemove || !mRemove){
             throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
-        });
+        }
     }
 }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessIdentifyInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessIdentifyInfoServiceImpl.java
index 4c8e190..f7e63ca 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessIdentifyInfoServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessIdentifyInfoServiceImpl.java
@@ -1,8 +1,10 @@
 package com.casic.missiles.service.Impl.business;
 
+import cn.hutool.core.date.DateUtil;
 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.core.page.PageFactory;
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.business.identify.IdentifyListRequest;
@@ -14,11 +16,14 @@
 import com.casic.missiles.service.business.IBizBusinessIdentifyInfoService;
 import com.casic.missiles.utils.DictCodeUtils;
 import com.casic.missiles.utils.NumberGeneratorUtil;
+import com.casic.missiles.utils.QRCodeUtil;
 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.List;
+
 /**
  * <p>
  * 计量检定业务-任务计量管理-标识打印 服务实现类
@@ -35,9 +40,9 @@
     @Override
     public Page<BizBusinessIdentifyInfo> identifyListPage(Page<BizBusinessIdentifyInfo> page, IdentifyListRequest request) throws Exception {
         QueryWrapper<BizBusinessIdentifyInfo> wrapper = new QueryWrapper<>();
-        wrapper.eq("identify_type", request.getIdentifyType());
-        wrapper.like("device_no", request.getDeviceNo());
-        wrapper.like("device_name", request.getDeviceName());
+        wrapper.eq(StringUtils.isNotEmpty(request.getIdentifyType()), "identify_type", request.getIdentifyType());
+        wrapper.like(StringUtils.isNotEmpty(request.getDeviceNo()),"device_no", request.getDeviceNo());
+        wrapper.like(StringUtils.isNotEmpty(request.getDeviceName()), "device_name", request.getDeviceName());
         wrapper.apply(StringUtils.isNotBlank(request.getCreateTimeStart()),
                 "{0} <= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getCreateTimeStart().split(" ")[0]);
         wrapper.apply(StringUtils.isNotBlank(request.getCreateTimeEnd()),
@@ -64,8 +69,11 @@
     }
 
     @Override
-    public ReturnDTO updateIdentify(BizBusinessIdentifyInfo identifyInfo) {
-        if(identifyInfoMapper.updateById(identifyInfo) > 0){
+    public ReturnDTO updateIdentify(Long id) {
+        BizBusinessIdentifyInfo info = new BizBusinessIdentifyInfo();
+        info.setId(id);
+        info.setUpdateTime(DateUtil.now());
+        if(identifyInfoMapper.updateById(info) > 0){
             return ReturnUtil.success();
         }
         throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
@@ -79,4 +87,20 @@
         throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
     }
 
+    @Override
+    public List<BizBusinessIdentifyInfo> list(IdentifyListRequest request) throws Exception {
+        Page<BizBusinessIdentifyInfo> page = PageFactory.defaultPage();
+        page.setCurrent(1);
+        page.setSearchCount(false);
+        page.setSize(Integer.MAX_VALUE);
+        Page<BizBusinessIdentifyInfo> resultPage = this.identifyListPage(page, request);
+        return resultPage.getRecords();
+    }
+
+    @Override
+    public ReturnDTO<String> equipmentQrCode(Long id) {
+        String base64QRCode = QRCodeUtil.getBase64QRCode(String.valueOf(id));
+        return ReturnUtil.success(base64QRCode);
+    }
+
 }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOrderInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOrderInfoServiceImpl.java
index 82952ad..d8d2c6a 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOrderInfoServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOrderInfoServiceImpl.java
@@ -35,6 +35,7 @@
 import javax.servlet.http.HttpServletResponse;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 import java.util.stream.Collectors;
 
 /**
@@ -209,13 +210,16 @@
     private QueryWrapper<OrderListResponse> listParamWrapperBuilder(OrderListRequest request) {
         QueryWrapper<OrderListResponse> wrapper = new QueryWrapper<>();
         wrapper.like(StringUtils.isNotBlank(request.getOrderNo()), "order_no", request.getOrderNo());
+        wrapper.like(Objects.nonNull(request.getCustomerId()), "customer_id", request.getCustomerId());
         wrapper.like(StringUtils.isNotBlank(request.getCustomerName()), "customer_name", request.getCustomerName());
         wrapper.like(StringUtils.isNotBlank(request.getDeliverer()), "deliverer", request.getDeliverer());
         wrapper.like(StringUtils.isNotBlank(request.getCreateUserName()), "create_user_name", request.getCreateUserName());
-        wrapper.apply(StringUtils.isNotBlank(request.getCreateStartTime()),
-                "{0} <= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getCreateStartTime().split(" ")[0]);
-        wrapper.apply(StringUtils.isNotBlank(request.getCreateEndTime()),
-                "{0} >= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getCreateEndTime().split(" ")[0]);
+        if(StringUtils.isNotBlank(request.getCreateStartTime())){
+            wrapper.apply("{0} <= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getCreateStartTime().split(" ")[0]);
+        }
+        if(StringUtils.isNotBlank(request.getCreateEndTime())){
+            wrapper.apply("{0} >= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getCreateEndTime().split(" ")[0]);
+        }
         wrapper.orderByDesc("create_time");
         return wrapper;
     }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceAssessServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceAssessServiceImpl.java
index c6af980..ce40138 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceAssessServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceAssessServiceImpl.java
@@ -1,10 +1,33 @@
 package com.casic.missiles.service.Impl.business;
 
-import com.casic.missiles.model.business.BizBusinessOutsourceAssess;
+import cn.hutool.core.lang.Assert;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.casic.missiles.core.model.auth.AuthUser;
+import com.casic.missiles.core.shiro.ShiroKit;
+import com.casic.missiles.dto.BaseApprovalSubmitRequest;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.ReturnUtil;
+import com.casic.missiles.dto.business.outsource.OutsourceAssessApprovalListRequest;
+import com.casic.missiles.dto.business.outsource.OutsourceAssessSaveResponse;
+import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.NoGenerateFileCodeEnum;
+import com.casic.missiles.enums.NoGenerateRecordTypeCodeEnum;
+import com.casic.missiles.enums.system.ApprovalStatusEnum;
+import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.mapper.business.BizBusinessOutsourceAssessMapper;
+import com.casic.missiles.model.business.BizBusinessOutsourceAssess;
+import com.casic.missiles.model.business.BizBusinessOutsourceAssessSampleRelation;
+import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl;
+import com.casic.missiles.service.business.IBizBusinessOutsourceAssessSampleRelationService;
 import com.casic.missiles.service.business.IBizBusinessOutsourceAssessService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.casic.missiles.utils.NoGeneratorUtil;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Objects;
 
 /**
  * <p>
@@ -15,6 +38,103 @@
  * @since 2023-08-16
  */
 @Service
-public class BizBusinessOutsourceAssessServiceImpl extends ServiceImpl<BizBusinessOutsourceAssessMapper, BizBusinessOutsourceAssess> implements IBizBusinessOutsourceAssessService {
+public class BizBusinessOutsourceAssessServiceImpl extends GeneralApprovalServiceImpl<BizBusinessOutsourceAssessMapper, BizBusinessOutsourceAssess, BizBusinessOutsourceAssess, OutsourceAssessApprovalListRequest, BaseApprovalSubmitRequest> implements IBizBusinessOutsourceAssessService {
+    @Autowired
+    private IBizBusinessOutsourceAssessSampleRelationService outsourceAssessSampleRelationService;
 
+    @Override
+    public ReturnDTO<OutsourceAssessSaveResponse> saveOutsourceAssess(BizBusinessOutsourceAssess request) {
+        //生成编号
+        String labCode = request.getLabCode();
+        String groupCode = request.getGroupCode();
+        Long maxNo = this.baseMapper.selectMaxProjectNo();
+        String projectNo = NoGeneratorUtil.getCode(NoGenerateFileCodeEnum.D, labCode, NoGenerateRecordTypeCodeEnum.OUTSOURCE_ACCESS, groupCode, maxNo);
+        request.setCreateUserId(request.getUserId());
+        request.setCreateUserName(request.getUserName());
+        request.setApprovalStatus(ApprovalStatusEnum.DRAFT); //草稿箱状态
+        request.setProjectNo(projectNo);
+        int row = this.baseMapper.insert(request);
+        Assert.isFalse(row <= 0, () -> {
+            throw new BusinessException(BusinessExceptionEnum.OUTSOURCE_ACCESS_SAVE_FAILED);
+        });
+        //关联表
+        saveRelationData(request);
+        OutsourceAssessSaveResponse saveResponse = new OutsourceAssessSaveResponse();
+        saveResponse.setId(request.getId());
+        saveResponse.setProjectNo(projectNo);
+        return ReturnUtil.success(saveResponse);
+    }
+
+    @Override
+    @Transactional
+    public ReturnDTO draftUpdate(BizBusinessOutsourceAssess request) {
+        if (this.baseMapper.updateById(request) > 0) {
+            //关联表删除、增加
+            removeRelationData(request.getId());
+            saveRelationData(request);
+            return ReturnUtil.success();
+        }
+        throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
+    }
+
+    @Override
+    public ReturnDTO draftDelete(Long id) {
+        if (this.baseMapper.deleteById(id) > 0) {
+            //关联表删除
+            removeRelationData(id);
+            return ReturnUtil.success();
+        }
+        throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
+    }
+
+    @Override
+    public ReturnDTO draftBatchDelete(List<Long> ids) {
+        if (this.baseMapper.deleteBatchIds(ids) >= 0) {
+            ids.forEach(id -> removeRelationData(id));
+            return ReturnUtil.success();
+        }
+        throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
+    }
+
+    @Override
+    @Transactional
+    public ReturnDTO failUpdate(BizBusinessOutsourceAssess request) {
+        AuthUser user = ShiroKit.getUser();
+        Assert.isFalse(Objects.isNull(user), () -> {
+            throw new BusinessException(BusinessExceptionEnum.LOGIN_USER_ACQUIRE_FAILED);
+        });
+        request.setApprovalStatus(ApprovalStatusEnum.IN_APPROVED);
+        if (this.baseMapper.updateById(request) > 0) {
+            //关联表删除、增加
+            removeRelationData(request.getId());
+            saveRelationData(request);
+            baseApprovalService.failUpdate(request.getProcessId());
+            return ReturnUtil.success();
+        }
+        throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
+    }
+
+    private void saveRelationData(BizBusinessOutsourceAssess request) {
+        List<BizBusinessOutsourceAssessSampleRelation> sampleRelations = new ArrayList<>();
+        request.getOrderSampleList().forEach(dto -> {
+            BizBusinessOutsourceAssessSampleRelation relation = new BizBusinessOutsourceAssessSampleRelation();
+            relation.setOrderId(dto.getOrderId());
+            relation.setSampleId(dto.getSampleId());
+            relation.setAccessId(request.getId());
+            sampleRelations.add(relation);
+        });
+        if(outsourceAssessSampleRelationService.saveBatch(sampleRelations)){
+            return;
+        }
+        throw new BusinessException(BusinessExceptionEnum.OUTSOURCE_ACCESS_SAVE_FAILED);
+    }
+
+    private void removeRelationData(Long assessId) {
+        QueryWrapper<BizBusinessOutsourceAssessSampleRelation> wrapper = new QueryWrapper<>();
+        wrapper.eq("access_id", assessId);
+        if(outsourceAssessSampleRelationService.remove(wrapper)){
+            return;
+        }
+        throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
+    }
 }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceProtocolServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceProtocolServiceImpl.java
new file mode 100644
index 0000000..821e728
--- /dev/null
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceProtocolServiceImpl.java
@@ -0,0 +1,60 @@
+package com.casic.missiles.service.Impl.business;
+
+import cn.hutool.core.lang.Assert;
+import com.casic.missiles.dto.BaseApprovalSubmitRequest;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.ReturnUtil;
+import com.casic.missiles.dto.business.outsource.OutsourceProtocolApprovalListRequest;
+import com.casic.missiles.dto.business.outsource.OutsourceProtocolSaveResponse;
+import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.NoGenerateFileCodeEnum;
+import com.casic.missiles.enums.NoGenerateRecordTypeCodeEnum;
+import com.casic.missiles.enums.system.ApprovalStatusEnum;
+import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.mapper.business.BizBusinessOutsourceProtocolMapper;
+import com.casic.missiles.mapper.business.BizBusinessOutsourcerInfoMapper;
+import com.casic.missiles.model.business.BizBusinessOutsourceProtocol;
+import com.casic.missiles.model.business.BizBusinessOutsourcerInfo;
+import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl;
+import com.casic.missiles.service.business.IBizBusinessOutsourceProtocolService;
+import com.casic.missiles.utils.NoGeneratorUtil;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 计量检定业务-分包管理-测试、校准或检定工作分包协议书 服务实现类
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-08-24
+ */
+@Service
+public class BizBusinessOutsourceProtocolServiceImpl extends GeneralApprovalServiceImpl<BizBusinessOutsourceProtocolMapper, BizBusinessOutsourceProtocol, BizBusinessOutsourceProtocol, OutsourceProtocolApprovalListRequest, BaseApprovalSubmitRequest> implements IBizBusinessOutsourceProtocolService {
+    @Autowired
+    private BizBusinessOutsourcerInfoMapper outsourcerInfoMapper;
+
+    @Override
+    public ReturnDTO<OutsourceProtocolSaveResponse> saveOutsourceProtocol(BizBusinessOutsourceProtocol request) {
+        //生成编号
+        String labCode = request.getLabCode();
+        String groupCode = request.getGroupCode();
+        Long maxNo = this.baseMapper.selectMaxProtocolNo();
+        String protocolNo = NoGeneratorUtil.getCode(NoGenerateFileCodeEnum.D, labCode, NoGenerateRecordTypeCodeEnum.OUTSOURCE_PROTOCOL, groupCode, maxNo);
+        request.setCreateUserId(request.getUserId());
+        request.setCreateUserName(request.getUserName());
+        request.setApprovalStatus(ApprovalStatusEnum.DRAFT); //草稿箱状态
+        request.setProtocolNo(protocolNo);
+        BizBusinessOutsourcerInfo outsourcerInfo = outsourcerInfoMapper.selectById(request.getOutsourcerId());
+        request.setOutsourceNo(outsourcerInfo.getOutsourcerNo());
+        request.setOutsourceName(outsourcerInfo.getOutsourcerName());
+        int row = this.baseMapper.insert(request);
+        Assert.isFalse(row <= 0, () -> {
+            throw new BusinessException(BusinessExceptionEnum.OUTSOURCE_PROTOCOL_SAVE_FAILED);
+        });
+        OutsourceProtocolSaveResponse saveResponse = new OutsourceProtocolSaveResponse();
+        saveResponse.setId(request.getId());
+        saveResponse.setProtocolNo(protocolNo);
+        return ReturnUtil.success(saveResponse);
+    }
+}
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourcerInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourcerInfoServiceImpl.java
index 75f639d..8aadad7 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourcerInfoServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourcerInfoServiceImpl.java
@@ -3,12 +3,12 @@
 import cn.hutool.core.lang.Assert;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.dto.*;
 import com.casic.missiles.dto.business.outsource.OutsourcerInfoApprovalListRequest;
 import com.casic.missiles.dto.business.outsource.OutsourcerSaveResponse;
 import com.casic.missiles.enums.BusinessExceptionEnum;
-import com.casic.missiles.enums.PrefixCodeEnum;
+import com.casic.missiles.enums.NoGenerateFileCodeEnum;
+import com.casic.missiles.enums.NoGenerateRecordTypeCodeEnum;
 import com.casic.missiles.enums.system.ApprovalStatusEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.mapper.business.BizBusinessOutsourcerInfoMapper;
@@ -20,7 +20,7 @@
 import com.casic.missiles.service.business.IBizBusinessOutsourcerInfoService;
 import com.casic.missiles.service.business.IBizBusinessOutsourcerUserInfoService;
 import com.casic.missiles.utils.DictCodeUtils;
-import com.casic.missiles.utils.NumberGeneratorUtil;
+import com.casic.missiles.utils.NoGeneratorUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -42,22 +42,12 @@
     private IBizBusinessOutsourcerUserInfoService outsourcerUserInfoService;
 
     @Override
-    public List<BizBusinessOutsourcerInfo> list(OutsourcerInfoApprovalListRequest request) {
-        request.setCreateUserId(null);
-        request.setApprovalStatus(ApprovalStatusEnum.PASSED);
-        Page<BizBusinessOutsourcerInfo> page = PageFactory.defaultPage();
-        page.setCurrent(1);
-        page.setSearchCount(false);
-        page.setSize(Integer.MAX_VALUE);
-        Page<BizBusinessOutsourcerInfo> resultPage = this.baseMapper.selectBatchForApprovalList(page, request, null);
-        return resultPage.getRecords();
-    }
-
-    @Override
     public ReturnDTO<OutsourcerSaveResponse> saveOutsourcer(BizBusinessOutsourcerInfo request) {
         //生成编号
+        String labCode = request.getLabCode();
+        String groupCode = request.getGroupCode();
         Long maxNo = this.baseMapper.selectMaxNo();
-        String outsourcerNo = NumberGeneratorUtil.getContactNo(PrefixCodeEnum.OUTSOURCER_PREFIX, maxNo);
+        String outsourcerNo = NoGeneratorUtil.getCode(NoGenerateFileCodeEnum.D, labCode, NoGenerateRecordTypeCodeEnum.OUTSOURCE_INFO, groupCode, maxNo);
         request.setOutsourcerNo(outsourcerNo);
         request.setCreateUserId(request.getUserId());
         request.setCreateUserName(request.getUserName());
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessSiteExecutiveInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessSiteExecutiveInfoServiceImpl.java
index ebab3e6..6c6a129 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessSiteExecutiveInfoServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessSiteExecutiveInfoServiceImpl.java
@@ -189,9 +189,9 @@
         QueryWrapper<BizBusinessSiteExecutiveStaffRelation> mWrapper = new QueryWrapper<>();
         mWrapper.eq("site_executive_id", siteExecutiveId);
         boolean mRemove = siteExecutiveStaffRelationService.remove(mWrapper);
-        Assert.isFalse(eRemove || mRemove, () -> {
+        if(!eRemove || !mRemove){
             throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
-        });
+        }
     }
 
     private void doPopulateSiteExecutive(SiteExecutiveDetailResponse detailResponse) {
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessLabExecutiveInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessLabExecutiveInfoServiceImpl.java
index 50c5616..0242fcf 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessLabExecutiveInfoServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessLabExecutiveInfoServiceImpl.java
@@ -297,6 +297,29 @@
     }
 
     @Override
+    public List<SampleLabExecutiveListResponse> deptLabExecutiveList(SampleLabExecutiveListRequest request) throws Exception {
+        Page<SampleLabExecutiveListResponse> page = PageFactory.defaultPage();
+        page.setCurrent(1);
+        page.setSearchCount(false);
+        page.setSize(Integer.MAX_VALUE);
+        Page<SampleLabExecutiveListResponse> resultPage = this.deptLabExecutiveListPage(page, request);
+        return resultPage.getRecords();
+    }
+
+    @Override
+    public List<SampleLabExecutiveListResponse> deptLabExecutiveListByIds(String measureStatus, List<Long> ids) throws Exception {
+        Page<SampleLabExecutiveListResponse> page = PageFactory.defaultPage();
+        page.setCurrent(1);
+        page.setSearchCount(false);
+        page.setSize(Integer.MAX_VALUE);
+        SampleLabExecutiveListRequest request = new SampleLabExecutiveListRequest();
+        request.setIds(ids);
+        request.setMeasureStatus(measureStatus);
+        Page<SampleLabExecutiveListResponse> resultPage = this.deptLabExecutiveListPage(page, request);
+        return resultPage.getRecords();
+    }
+
+    @Override
     public Page<SampleLabExecutiveListResponse> myLabExecutiveListPage(Page<SampleLabExecutiveListResponse> page, SampleLabExecutiveListRequest labExecutiveListRequest) throws Exception{
         AuthUser user = ShiroKit.getUser();
         Assert.isFalse(Objects.isNull(user), () -> {
@@ -350,6 +373,29 @@
     }
 
     @Override
+    public List<SampleLabExecutiveListResponse> myLabExecutiveList(SampleLabExecutiveListRequest request) throws Exception {
+        Page<SampleLabExecutiveListResponse> page = PageFactory.defaultPage();
+        page.setCurrent(1);
+        page.setSearchCount(false);
+        page.setSize(Integer.MAX_VALUE);
+        Page<SampleLabExecutiveListResponse> resultPage = this.myLabExecutiveListPage(page, request);
+        return resultPage.getRecords();
+    }
+
+    @Override
+    public List<SampleLabExecutiveListResponse> myLabExecutiveListByIds(String measureStatus, List<Long> ids) throws Exception {
+        Page<SampleLabExecutiveListResponse> page = PageFactory.defaultPage();
+        page.setCurrent(1);
+        page.setSearchCount(false);
+        page.setSize(Integer.MAX_VALUE);
+        SampleLabExecutiveListRequest request = new SampleLabExecutiveListRequest();
+        request.setIds(ids);
+        request.setMeasureStatus(measureStatus);
+        Page<SampleLabExecutiveListResponse> resultPage = this.myLabExecutiveListPage(page, request);
+        return resultPage.getRecords();
+    }
+
+    @Override
     public List<SampleAmountResponse> myExecutiveAmount() {
         //登录用户id获取计量人员id，实验室检测信息中存储的是计量人员id
         AuthUser user = ShiroKit.getUser();
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentInfoServiceImpl.java
index 864b05e..db8cad4 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentInfoServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentInfoServiceImpl.java
@@ -35,7 +35,6 @@
 import com.casic.missiles.utils.ConvertUtils;
 import com.casic.missiles.utils.DictCodeUtils;
 import com.casic.missiles.utils.NumberGeneratorUtil;
-import org.flowable.engine.RuntimeService;
 import org.flowable.engine.runtime.ProcessInstance;
 import org.jetbrains.annotations.NotNull;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -43,7 +42,6 @@
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
 
-import javax.annotation.Resource;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
@@ -81,8 +79,6 @@
     private IBizEquipmentAttachmentService attachmentService;
     @Autowired
     private IBizEquipmentCheckpointService checkpointService;
-    @Resource
-    private RuntimeService runtimeService;
     @Autowired
     private ApprovalOperateService approvalOperateService;
 
@@ -235,18 +231,18 @@
     private void updateRelationInfo(EquipmentAddRequest request, BizEquipmentInfoApproval equipmentInfoApproval) {
         QueryWrapper<BizEquipmentTechnicalTarget> targetWrapper = new QueryWrapper<>();
         targetWrapper.eq("equipment_no", equipmentInfoApproval.getEquipmentNo());
-        boolean removeTargetFlag = technicalTargetService.remove(targetWrapper);
-        boolean saveTargetFlag = technicalTargetService.saveBatch(request.getTechnicalTargetList());
+        technicalTargetService.remove(targetWrapper);
+        technicalTargetService.saveBatch(request.getTechnicalTargetList());
 
         QueryWrapper<BizEquipmentAttachment> attachmentWrapper = new QueryWrapper<>();
         attachmentWrapper.eq("equipment_no", equipmentInfoApproval.getEquipmentNo());
-        boolean removeAttachmentFlag = attachmentService.remove(attachmentWrapper);
-        boolean saveAttachmentFlag = attachmentService.saveBatch(request.getAttachmentList());
+        attachmentService.remove(attachmentWrapper);
+        attachmentService.saveBatch(request.getAttachmentList());
 
         QueryWrapper<BizEquipmentCheckpoint> checkpointWrapper = new QueryWrapper<>();
         checkpointWrapper.eq("equipment_no", equipmentInfoApproval.getEquipmentNo());
-        boolean removeCheckpointFlag = checkpointService.remove(checkpointWrapper);
-        boolean saveCheckpointFlag = checkpointService.saveBatch(request.getCheckpointList());
+        checkpointService.remove(checkpointWrapper);
+        checkpointService.saveBatch(request.getCheckpointList());
     }
 
     @Override
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardInfoServiceImpl.java
index faff1ae..c50a5b3 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardInfoServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardInfoServiceImpl.java
@@ -22,7 +22,9 @@
 import com.casic.missiles.mapper.equipment.BizEquipmentStandardInfoMapper;
 import com.casic.missiles.mapper.equipment.BizEquipmentStandardTechnologyRelationMapper;
 import com.casic.missiles.mapper.resource.BizResourceStaffInfoMapper;
-import com.casic.missiles.model.equipment.*;
+import com.casic.missiles.model.equipment.BizEquipmentStandardInfo;
+import com.casic.missiles.model.equipment.BizEquipmentStandardInfoApproval;
+import com.casic.missiles.model.equipment.BizEquipmentStandardTechnologyRelation;
 import com.casic.missiles.model.resource.BizResourceStaffInfo;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.dao.DeptMapper;
@@ -33,14 +35,12 @@
 import com.casic.missiles.service.flowable.ApprovalOperateService;
 import com.casic.missiles.utils.ConvertUtils;
 import com.casic.missiles.utils.DictCodeUtils;
-import org.flowable.engine.RuntimeService;
 import org.flowable.engine.runtime.ProcessInstance;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
 
-import javax.annotation.Resource;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
@@ -62,8 +62,6 @@
     private BizResourceStaffInfoMapper staffInfoMapper;
     @Autowired
     private IBaseApprovalService baseApprovalService;
-    @Resource
-    private RuntimeService runtimeService;
     @Autowired
     private ApprovalOperateService approvalOperateService;
     @Autowired
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSealInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSealInfoServiceImpl.java
index 7c91fa2..00040d6 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSealInfoServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSealInfoServiceImpl.java
@@ -15,6 +15,7 @@
 import com.casic.missiles.modular.system.model.User;
 import com.casic.missiles.service.resource.IBizResourceSealInfoService;
 import com.casic.missiles.utils.DictCodeUtils;
+import com.casic.missiles.utils.MinioUtil;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -33,6 +34,8 @@
     private BizResourceSealInfoMapper sealInfoMapper;
     @Autowired
     private UserMapper userMapper;
+    @Autowired
+    private MinioUtil minioUtil;
 
     @Override
     public Page<BizResourceSealInfo> listPage(Page<BizResourceSealInfo> page, SealInfoListRequest request) throws Exception {
@@ -44,6 +47,7 @@
         Page<BizResourceSealInfo> sealInfoPage = sealInfoMapper.selectPage(page, wrapper);
         for (BizResourceSealInfo record : sealInfoPage.getRecords()) {
             DictCodeUtils.convertDictCodeToName(record);
+            record.setMinioFileUrl(minioUtil.getFileUrl(record.getMinioFileName()));
         }
         return sealInfoPage;
     }

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java
index bb0c50f..13a699b 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java
@@ -12,6 +12,7 @@
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.IGeneralApprovalService;
+import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
@@ -19,6 +20,7 @@
 import org.springframework.web.bind.annotation.RequestBody;
 
 import javax.validation.Valid;
+import java.util.List;
 import java.util.Objects;
 
 /**
@@ -117,4 +119,17 @@
         }
         return baseApprovalService.failUpdate(request);
     }
+
+    public List<O> exportList(@RequestBody @Valid R request) throws Exception {
+        List<O> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = baseApprovalService.listExportByIds(request.getIds());
+        } else {
+            list = baseApprovalService.listExport(request);
+        }
+        for (O record : list) {
+            DictCodeUtils.convertDictCodeToName(record);
+        }
+        return list;
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java
index 8a90961..d775831 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java
@@ -5,6 +5,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.business.certificate.CertificateChangeApplyApprovalListRequest;
 import com.casic.missiles.dto.business.certificate.CertificateChangeApplySaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessCertificateChangeApply;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
@@ -20,6 +21,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -48,4 +50,12 @@
         }
         return changeApplyService.saveChangeApply(request);
     }
+
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody CertificateChangeApplyApprovalListRequest request) throws Exception {
+        List<BizBusinessCertificateChangeApply> list = super.exportList(request);
+        super.exportExcel(BizBusinessCertificateChangeApply.class, list, ExportEnum.CERTIFICATE_CHANGE_APPLY.getSheetName());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java
index 5fc4b07..af8230e 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java
@@ -9,6 +9,7 @@
 import com.casic.missiles.dto.business.certificate.CertificatePrintApprovalListRequest;
 import com.casic.missiles.dto.business.certificate.CertificatePrintListResponse;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.enums.business.CertificatePrintStatusEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessCertificatePrintLog;
@@ -18,10 +19,16 @@
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.io.IOException;
+import java.util.List;
 import java.util.Objects;
 
 /**
@@ -98,4 +105,16 @@
         });
         return certificatePrintService.certificatePrintLog(idDTO.getId());
     }
+
+    @ApiOperation("证书打印审批导出")
+    @PostMapping("/listExport")
+    public void exportList(@RequestBody CertificatePrintApprovalListRequest request) throws IOException {
+        List<CertificatePrintListResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = certificatePrintService.listByIds(request.getIds());
+        } else {
+            list = certificatePrintService.list(request);
+        }
+        super.exportExcel(CertificatePrintListResponse.class, list, ExportEnum.CERTIFICATE_PRINT.getSheetName());
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java
index 63b06dc..6b2efd5 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java
@@ -6,6 +6,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.business.certificate.CertificateReportApprovalListRequest;
 import com.casic.missiles.dto.business.certificate.CertificateReportSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessCertificateReport;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
@@ -21,6 +22,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -50,7 +52,7 @@
         return certificateReportService.saveCertificateReport(request);
     }
 
-    @ApiOperation("证书审批详情（基本信息）")
+    @ApiOperation("详情（基本信息）")
     @PostMapping("/detail")
     public ReturnDTO<BizBusinessCertificateReport> detail(@RequestBody @Valid BaseDetailRequest request, BindingResult bindingResult) throws Exception {
         if(bindingResult.hasErrors()){
@@ -59,4 +61,11 @@
         return certificateReportService.detail(request);
     }
 
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody CertificateReportApprovalListRequest request) throws Exception {
+        List<BizBusinessCertificateReport> list = super.exportList(request);
+        super.exportExcel(BizBusinessCertificateReport.class, list, ExportEnum.CERTIFICATE_REPORT.getSheetName());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java
index 46b26bd..57c0809 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java
@@ -10,20 +10,21 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.business.identify.IdentifyListRequest;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessIdentifyInfo;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.business.IBizBusinessIdentifyInfoService;
+import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import javax.validation.Valid;
+import java.util.List;
 import java.util.Objects;
 
 /**
@@ -57,16 +58,13 @@
         return identifyInfoService.addIdentify(identifyInfo);
     }
 
-    @ApiOperation("标识打印更新")
+    @ApiOperation("标识打印更新（更新打印时间）")
     @PostMapping("/update")
-    public ReturnDTO updateIdentify(@RequestBody @Valid BizBusinessIdentifyInfo identifyInfo, BindingResult bindingResult) {
-        Assert.isFalse(Objects.isNull(identifyInfo.getId()), () -> {
+    public ReturnDTO updateIdentify(@RequestBody @Valid IdDTO idDTO) {
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        Assert.isFalse(bindingResult.hasErrors(), () -> {
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        });
-        return identifyInfoService.updateIdentify(identifyInfo);
+        return identifyInfoService.updateIdentify(idDTO.getId());
     }
 
     @ApiOperation("标识打印删除")
@@ -77,4 +75,37 @@
         });
         return identifyInfoService.deleteIdentify(idDTO.getId());
     }
+
+    @ApiOperation("标识打印导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody @Valid IdentifyListRequest request, BindingResult bindingResult) throws Exception {
+        if (bindingResult.hasErrors()) {
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        List<BizBusinessIdentifyInfo> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = identifyInfoService.listByIds(request.getIds());
+        } else {
+            list = identifyInfoService.list(request);
+        }
+        for (BizBusinessIdentifyInfo record : list) {
+            DictCodeUtils.convertDictCodeToName(record);
+        }
+        super.exportExcel(BizBusinessIdentifyInfo.class, list, ExportEnum.IDENTIFY_EXPORT.getSheetName());
+    }
+
+
+    // TODO: 2023/8/23 查询设备信息，4个底部按钮查设备（按钮的作用就是前端用来调不同接口、用来区分中间即将展示的标识），前端弹窗选设备，在确定保存时前端根据底部按钮判断传入设备类型deviceType字典code
+    // TODO: 2023/8/23 接口：查受检设备（第1个按钮），查设备台账（后3个按钮同一接口），查询之后前端根据标志类型的不同加到中间页面时进行判断（按产品给的对应表）
+    // TODO: 2023/8/23 提供二维码接口，前端在加到中间页面时调用一下
+
+    @ApiOperation("设备二维码")
+    @PostMapping("/equipment/qrCode")
+    public ReturnDTO<String> equipmentQrCode(@RequestBody @Valid IdDTO idDTO) {
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return identifyInfoService.equipmentQrCode(idDTO.getId());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java
index 707be6e..7e0453d 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java
@@ -117,7 +117,7 @@
     }
 
     @ApiOperation("任务单导出")
-    @PostMapping("/export")
+    @PostMapping("/listExport")
     public void orderExport(@RequestBody @Valid OrderListRequest request, HttpServletResponse response) {
         businessOrderService.orderExport(request, response);
     }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java
index 529a6ce..51432be 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java
@@ -1,9 +1,28 @@
 package com.casic.missiles.controller.business;
 
+import com.casic.missiles.controller.GeneralApprovalController;
+import com.casic.missiles.dto.BaseApprovalSubmitRequest;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.business.outsource.OutsourceAssessApprovalListRequest;
+import com.casic.missiles.dto.business.outsource.OutsourceAssessSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
+import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.model.business.BizBusinessOutsourceAssess;
+import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
+import com.casic.missiles.service.IGeneralApprovalService;
+import com.casic.missiles.service.business.IBizBusinessOutsourceAssessService;
 import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.BindingResult;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.validation.Valid;
+import java.util.List;
+
 /**
  * <p>
  * 计量检定业务-分包管理-测试、校准或检定工作分包评审表 前端控制器
@@ -15,6 +34,27 @@
 @Api(tags = "分包管理-测试、校准或检定工作分包评审表")
 @RestController
 @RequestMapping("/business/outsource/assess")
-public class BizBusinessOutsourceAssessController {
+public class BizBusinessOutsourceAssessController extends GeneralApprovalController<BizBusinessOutsourceAssess, BizBusinessOutsourceAssess, OutsourceAssessApprovalListRequest, BaseApprovalSubmitRequest> {
+    @Autowired
+    private IBizBusinessOutsourceAssessService outsourceAssessService;
 
+    public BizBusinessOutsourceAssessController(IGeneralApprovalService<BizBusinessOutsourceAssess, BizBusinessOutsourceAssess, OutsourceAssessApprovalListRequest, BaseApprovalSubmitRequest> baseApprovalService) {
+        super(baseApprovalService);
+    }
+
+    @ApiOperation("草稿箱-保存")
+    @PostMapping("/save")
+    public ReturnDTO<OutsourceAssessSaveResponse> saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceAssess request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        return outsourceAssessService.saveOutsourceAssess(request);
+    }
+
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception {
+        List<BizBusinessOutsourceAssess> list = super.exportList(request);
+        super.exportExcel(BizBusinessOutsourceAssess.class, list, ExportEnum.OUTSOURCE_ASSESS.getSheetName());
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java
new file mode 100644
index 0000000..9adef18
--- /dev/null
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java
@@ -0,0 +1,60 @@
+package com.casic.missiles.controller.business;
+
+import com.casic.missiles.controller.GeneralApprovalController;
+import com.casic.missiles.dto.BaseApprovalSubmitRequest;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.business.outsource.OutsourceProtocolApprovalListRequest;
+import com.casic.missiles.dto.business.outsource.OutsourceProtocolSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
+import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.model.business.BizBusinessOutsourceProtocol;
+import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
+import com.casic.missiles.service.IGeneralApprovalService;
+import com.casic.missiles.service.business.IBizBusinessOutsourceProtocolService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.BindingResult;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.validation.Valid;
+import java.util.List;
+
+/**
+ * <p>
+ * 计量检定业务-分包管理-测试、校准或检定工作分包协议书 前端控制器
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-08-24
+ */
+@Api(tags = "分包管理-测试、校准或检定工作分包协议书")
+@RestController
+@RequestMapping("/business/outsource/protocol")
+public class BizBusinessOutsourceProtocolController extends GeneralApprovalController<BizBusinessOutsourceProtocol, BizBusinessOutsourceProtocol, OutsourceProtocolApprovalListRequest, BaseApprovalSubmitRequest> {
+    @Autowired
+    private IBizBusinessOutsourceProtocolService outsourceProtocolService;
+
+    public BizBusinessOutsourceProtocolController(IGeneralApprovalService<BizBusinessOutsourceProtocol, BizBusinessOutsourceProtocol, OutsourceProtocolApprovalListRequest, BaseApprovalSubmitRequest> baseApprovalService) {
+        super(baseApprovalService);
+    }
+
+    @ApiOperation("草稿箱-保存")
+    @PostMapping("/save")
+    public ReturnDTO<OutsourceProtocolSaveResponse> saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceProtocol request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        return outsourceProtocolService.saveOutsourceProtocol(request);
+    }
+
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody OutsourceProtocolApprovalListRequest request) throws Exception {
+        List<BizBusinessOutsourceProtocol> list = super.exportList(request);
+        super.exportExcel(BizBusinessOutsourceProtocol.class, list, ExportEnum.OUTSOURCE_PROTOCOL.getSheetName());
+    }
+}
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java
index 097f645..f0f0943 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java
@@ -17,7 +17,6 @@
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.IGeneralApprovalService;
 import com.casic.missiles.service.business.IBizBusinessOutsourcerInfoService;
-import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -71,19 +70,8 @@
 
     @ApiOperation("分包方导出")
     @PostMapping("/listExport")
-    public void export(@RequestBody @Valid OutsourcerInfoApprovalListRequest request, BindingResult bindingResult) throws Exception {
-        if (bindingResult.hasErrors()) {
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        }
-        List<BizBusinessOutsourcerInfo> list;
-        if (!CollectionUtils.isEmpty(request.getIds())) {
-            list = outsourcerInfoService.listByIds(request.getIds());
-        } else {
-            list = outsourcerInfoService.list(request);
-        }
-        for (BizBusinessOutsourcerInfo record : list) {
-            DictCodeUtils.convertDictCodeToName(record);
-        }
+    public void export(@RequestBody OutsourcerInfoApprovalListRequest request) throws Exception {
+        List<BizBusinessOutsourcerInfo> list = super.exportList(request);
         super.exportExcel(BizBusinessOutsourcerInfo.class, list, ExportEnum.OUTSOURCER_EXPORT.getSheetName());
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java
index c2cbf9f..0410918 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java
@@ -17,11 +17,9 @@
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.IGeneralApprovalService;
 import com.casic.missiles.service.business.IBizBusinessSiteExecutiveInfoService;
-import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -60,7 +58,7 @@
         return siteExecutiveInfoService.saveSiteExecutiveInfo(siteExecutiveInfo);
     }
 
-    @ApiOperation("现场检测详情")
+    @ApiOperation("详情")
     @PostMapping("/detail")
     public ReturnDTO<SiteExecutiveDetailResponse> siteExecutiveDetail(@RequestBody @Valid IdDTO idDTO) throws Exception {
         Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
@@ -69,21 +67,10 @@
         return ReturnUtil.success(siteExecutiveInfoService.detail(idDTO.getId()));
     }
 
-    @ApiOperation("现场检测导出")
+    @ApiOperation("导出")
     @PostMapping("/listExport")
-    public void export(@RequestBody @Valid SiteExecutiveApprovalListRequest request, BindingResult bindingResult) throws Exception {
-        if (bindingResult.hasErrors()) {
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        }
-        List<SiteExecutiveApprovalListResponse> list;
-        if (!CollectionUtils.isEmpty(request.getIds())) {
-            list = siteExecutiveInfoService.listInfoByIds(request.getIds());
-        } else {
-            list = siteExecutiveInfoService.listInfo(request);
-        }
-        for (SiteExecutiveApprovalListResponse record : list) {
-            DictCodeUtils.convertDictCodeToName(record);
-        }
+    public void export(@RequestBody SiteExecutiveApprovalListRequest request) throws Exception {
+        List<SiteExecutiveApprovalListResponse> list = super.exportList(request);
         super.exportExcel(SiteExecutiveApprovalListResponse.class, list, ExportEnum.SITE_EXECUTIVE_EXPORT.getSheetName());
     }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
index 7e793cd..a92e209 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
@@ -55,7 +55,7 @@
 
     @ApiOperation("设备收发列表导出")
     @PostMapping("/export")
-    public void exportList(@RequestBody @Valid SampleDispatchListRequest request) throws IOException {
+    public void exportList(@RequestBody SampleDispatchListRequest request) throws IOException {
         List<SampleDispatchListResponse> list;
         if (!CollectionUtils.isEmpty(request.getIds())) {
             list = dispatchService.listByIds(request.getIds());
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java
index cdc77fc..d120fd4 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java
@@ -7,6 +7,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.business.labExecutive.*;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.business.IBusinessLabExecutiveInfoService;
@@ -14,6 +15,7 @@
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.*;
 
@@ -32,7 +34,7 @@
     @Autowired
     private IBusinessLabExecutiveInfoService labExecutiveInfoService;
 
-    @ApiOperation("实验室检测-部门检测-查询各状态列表（待检测、检测中、检测完）")
+    @ApiOperation("实验室任务-查询各状态列表（待检测、检测中、检测完）")
     @PostMapping("/deptExecutive/List")
     public ReturnDTO<PageInfoBT<SampleLabExecutiveListResponse>> queryDeptExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
@@ -43,10 +45,19 @@
         return ReturnUtil.success(super.packForBT(labExecutiveInfoService.deptLabExecutiveListPage(page, labExecutiveListRequest)));
     }
 
-    /**
-     * 实验室检测-我的检测-查询各状态列表（待检测、检测中、检测完）
-     */
-    @ApiOperation("实验室检测-我的检测-查询各状态列表（待检测、检测中、检测完）")
+    @ApiOperation("实验室任务导出")
+    @PostMapping("/deptExecutive/export")
+    public void deptExportList(@RequestBody @Valid SampleLabExecutiveListRequest request) throws Exception {
+        List<SampleLabExecutiveListResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = labExecutiveInfoService.deptLabExecutiveListByIds(request.getMeasureStatus(), request.getIds());
+        } else {
+            list = labExecutiveInfoService.deptLabExecutiveList(request);
+        }
+        super.exportExcel(SampleLabExecutiveListResponse.class, list, ExportEnum.DEPT_EXECUTIVE_TASK.getSheetName());
+    }
+
+    @ApiOperation("我的任务-查询各状态列表（待检测、检测中、检测完）")
     @PostMapping("/myExecutive/list")
     public ReturnDTO<PageInfoBT<SampleLabExecutiveListResponse>> queryMyExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
@@ -57,19 +68,25 @@
         return ReturnUtil.success(super.packForBT(labExecutiveInfoService.myLabExecutiveListPage(page, labExecutiveListRequest)));
     }
 
-    /**
-     * 实验室检测-我的检测-查询各状态样品数量（待检测、检测中、检测完）
-     */
-    @ApiOperation("实验室检测-我的检测-查询各状态样品数量（待检测、检测中、检测完）")
+    @ApiOperation("我的任务导出")
+    @PostMapping("/myExecutive/export")
+    public void exportList(@RequestBody @Valid SampleLabExecutiveListRequest request) throws Exception {
+        List<SampleLabExecutiveListResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = labExecutiveInfoService.myLabExecutiveListByIds(request.getMeasureStatus(), request.getIds());
+        } else {
+            list = labExecutiveInfoService.myLabExecutiveList(request);
+        }
+        super.exportExcel(SampleLabExecutiveListResponse.class, list, ExportEnum.MY_EXECUTIVE_TASK.getSheetName());
+    }
+
+    @ApiOperation("我的任务-查询各状态样品数量（待检测、检测中、检测完）")
     @GetMapping("/myExecutive/amount")
     public ReturnDTO<List<SampleAmountResponse>> queryMyExecutiveAmount() {
         return ReturnUtil.success(labExecutiveInfoService.myExecutiveAmount());
     }
 
-    /**
-     * 实验室检测-部门检测-分配（分配给具体人员）
-     */
-    @ApiOperation("实验室检测-部门检测-分配按钮（分配给具体人员）")
+    @ApiOperation("实验室任务-分配按钮（分配给具体人员）")
     @PostMapping("/deptExecutive/allocate")
     public ReturnDTO allocateStaff(@RequestBody @Valid SampleAllocateRequest sampleAllocateRequest, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -78,10 +95,7 @@
         return labExecutiveInfoService.allocateStaff(sampleAllocateRequest);
     }
 
-    /**
-     * 实验室检测-我的检测-检定人扫描收入（待检测->检测中）
-     */
-    @ApiOperation("实验室检测-我的检测-检定人扫描收入（待检测->检测中）")
+    @ApiOperation("我的任务-检定人扫描收入（待检测->检测中）")
     @PostMapping("/myExecutive/receive")
     public ReturnDTO sampleReceive(@RequestBody @Valid List<SampleOperateRequest> requestList, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -90,10 +104,7 @@
         return labExecutiveInfoService.sampleReceive(requestList);
     }
 
-    /**
-     * 实验室检测-负责人/检定人扫描检完（检测中->检测完）
-     */
-    @ApiOperation("实验室检测-负责人/检定人扫描检完（检测中->检测完）")
+    @ApiOperation("实验室任务-负责人/检定人扫描检完（检测中->检测完）")
     @PostMapping("/myExecutive/complete")
     public ReturnDTO sampleExecutiveComplete(@RequestBody @Valid List<SampleOperateRequest> requestList, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -102,10 +113,7 @@
         return labExecutiveInfoService.sampleExecutiveComplete(requestList);
     }
 
-    /**
-     * 实验室检测-部门检测/我的检测 编辑（只能修改应出具证书）
-     */
-    @ApiOperation("实验室检测-部门检测/我的检测 编辑（只能修改应出具证书）")
+    @ApiOperation("实验室任务/我的任务 编辑（只能修改应出具证书）")
     @PostMapping("/executive/update")
     public ReturnDTO updateExecutive(@RequestBody @Valid UpdateExecutiveRequest request, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -114,10 +122,7 @@
         return labExecutiveInfoService.updateExecutive(request);
     }
 
-    /**
-     * 实验室检测-部门检测/我的检测 详情
-     */
-    @ApiOperation("实验室检测-部门检测/我的检测 详情")
+    @ApiOperation("实验室任务/我的任务 详情")
     @PostMapping("/executive/detail")
     public ReturnDTO<ExecutiveDetailResponse> executiveDetail(@RequestBody @Valid ExecutiveDetailRequest request, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
@@ -131,7 +136,7 @@
      * 退回后会将下一个要执行的实验室检测状态更新为待分配，将后面的实验室顺序变更为连续（都进行减1）
      * 最后一个检测的实验室退回，等分发员再增加实验室或设备收发中的已收入直接手动点击完成
      */
-    @ApiOperation("实验室检测-部门检测/我的检测 退回（待检测/检测中->退回）")
+    @ApiOperation("实验室任务/我的任务 退回（待检测/检测中->退回）")
     @PostMapping("/executive/sendBack")
     public ReturnDTO executiveSendBack(@RequestBody @Valid ExecutiveSendBackRequest request, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -140,9 +145,6 @@
         return labExecutiveInfoService.sampleExecutiveSendBack(request);
     }
 
-    /**
-     * 分发员编辑实验室检测列表
-     */
     @ApiOperation("分发员编辑实验室检测列表")
     @PostMapping("/handOut/updateList")
     public ReturnDTO updateExecutiveList(@RequestBody @Valid UpdateExecutiveListRequest request, BindingResult bindingResult) {
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java
index 48a67ed..0c04f31 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java
@@ -10,6 +10,7 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.resource.customer.CustomerApprovalListRequest;
 import com.casic.missiles.dto.resource.customer.CustomerSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceCustomerInfo;
@@ -26,6 +27,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -55,6 +57,13 @@
         return customerInfoService.saveCustomerInfo(request);
     }
 
+    @ApiOperation("委托方名录导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody CustomerApprovalListRequest request) throws Exception {
+        List<BizResourceCustomerInfo> list = super.exportList(request);
+        super.exportExcel(BizResourceCustomerInfo.class, list, ExportEnum.CUSTOMER_INFO.getSheetName());
+    }
+
     @ApiOperation("委托方人员列表（分页）")
     @PostMapping("/person/listPage")
     public ReturnDTO<PageInfoBT<BizResourceCustomerStaff>> personListPage(@RequestBody IdDTO idDto) {
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
index 972ed4b..6418ea5 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
@@ -5,6 +5,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.resource.customer.SuggestFormApprovalListRequest;
 import com.casic.missiles.dto.resource.customer.SuggestFormSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceCustomerSuggestForm;
@@ -20,6 +21,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -50,4 +52,11 @@
         return suggestFormService.saveSuggestForm(request);
     }
 
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody SuggestFormApprovalListRequest request) throws Exception {
+        List<BizResourceCustomerSuggestForm> list = super.exportList(request);
+        super.exportExcel(BizResourceCustomerSuggestForm.class, list, ExportEnum.CUSTOMER_SUGGEST_FORM.getSheetName());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java
index 1934d1a..9e07eab 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java
@@ -15,12 +15,16 @@
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.resource.IEnvEnvironmentRecordConfigService;
 import com.casic.missiles.service.resource.IEnvEnvironmentRecordDataService;
+import com.casic.missiles.service.resource.IEnvLocationInfoService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
 import java.util.List;
@@ -39,6 +43,8 @@
     private IEnvEnvironmentRecordDataService environmentRecordDataService;
     @Autowired
     private IEnvEnvironmentRecordConfigService environmentRecordConfigService;
+    @Autowired
+    private IEnvLocationInfoService locationInfoService;
 
     @ApiOperation("环境记录单数据列表/详情")
     @PostMapping("/data/listPage")
@@ -95,4 +101,11 @@
         });
         return environmentRecordConfigService.deleteEnvironmentRecordConfig(idDTO.getId());
     }
+
+    @ApiOperation("地点列表")
+    @PostMapping("/location/listPage")
+    public ReturnDTO<PageInfoBT<LocationListResponse>> locationListPage(@RequestBody @Valid LocationListRequest request) {
+        Page<LocationListResponse> page = PageFactory.defaultPage();
+        return ReturnUtil.success(super.packForBT(locationInfoService.listPage(page, request)));
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java
index 82efe3f..e9561fa 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java
@@ -10,6 +10,7 @@
 import com.casic.missiles.dto.resource.seal.SealLogListRequest;
 import com.casic.missiles.dto.resource.seal.SealNoteApprovalListRequest;
 import com.casic.missiles.dto.resource.seal.SealNoteSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceSealUseLog;
@@ -27,6 +28,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -58,6 +60,13 @@
         return sealUseNoteService.saveSeal(request);
     }
 
+    @ApiOperation("印章使用登记导出（列表和导出中去掉经办人和监印人）")
+    @PostMapping("/listExport")
+    public void export(@RequestBody SealNoteApprovalListRequest request) throws Exception {
+        List<BizResourceSealUseNote> list = super.exportList(request);
+        super.exportExcel(BizResourceSealUseNote.class, list, ExportEnum.SEAL_NOTE.getSheetName());
+    }
+
     // TODO: 2023/7/28 印章使用日志：系统中使用印章时插入数据库
 
     @ApiOperation("印章使用日志列表（分页）")
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java
index 9b674fc..06b6521 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java
@@ -9,16 +9,20 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.resource.staff.StaffCertRequest;
 import com.casic.missiles.dto.resource.staff.StaffCertResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.service.resource.IBizResourceStaffInfoService;
 import com.casic.missiles.service.resource.IBizResourceStaffVerifierService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.List;
+
 /**
  * @Description:
  * @Author: wangpeng
@@ -41,9 +45,21 @@
         return ReturnUtil.success(super.packForBT(responsePage));
     }
 
+    @ApiOperation("证书逾期提醒导出")
+    @PostMapping("/listExport")
+    public void exportList(@RequestBody StaffCertRequest request) throws Exception {
+        List<StaffCertResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = staffInfoService.certListByIds(request.getIds());
+        } else {
+            list = staffInfoService.certList(request);
+        }
+        super.exportExcel(StaffCertResponse.class, list, ExportEnum.STAFF_CERTIFICATE_EXPIRE.getSheetName());
+    }
+
     @ApiOperation("证书逾期提醒")
     @PostMapping("/expirationReminder")
-    public ReturnDTO expirationReminder(@RequestBody IdDTO idDto) {
-        return verifierService.expirationReminder(idDto);
+    public ReturnDTO expirationReminder(@RequestBody IdDTO idDTO) {
+        return verifierService.expirationReminder(idDTO);
     }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java
index 3b251ad..a6e7850 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java
@@ -12,6 +12,7 @@
 import com.casic.missiles.dto.resource.staff.StaffListRequest;
 import com.casic.missiles.dto.resource.staff.TrainListRequest;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.*;
@@ -22,7 +23,10 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
 import java.util.List;
@@ -52,8 +56,19 @@
             throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
         }
         Page<BizResourceStaffInfo> page = PageFactory.defaultPage();
-        Page<BizResourceStaffInfo> responsePage = staffInfoService.listPage(page, request);
-        return ReturnUtil.success(super.packForBT(responsePage));
+        return ReturnUtil.success(super.packForBT(staffInfoService.listPage(page, request)));
+    }
+
+    @ApiOperation("人员登记导出")
+    @PostMapping("/listExport")
+    public void exportList(@RequestBody StaffListRequest request) throws Exception {
+        List<BizResourceStaffInfo> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = staffInfoService.listByIds(request.getIds());
+        } else {
+            list = staffInfoService.list(request);
+        }
+        super.exportExcel(BizResourceStaffInfo.class, list, ExportEnum.STAFF_INFO.getSheetName());
     }
 
     @ApiOperation("人员登记详情基础信息")
@@ -85,9 +100,9 @@
 
     @ApiOperation("科研教育列表（分页）")
     @PostMapping("/education/listPage")
-    public ReturnDTO<PageInfoBT<BizResourceStaffEducation>> educationListPage(@RequestBody IdDTO idDto) {
+    public ReturnDTO<PageInfoBT<BizResourceStaffEducation>> educationListPage(@RequestBody IdDTO idDTO) {
         Page<BizResourceStaffEducation> page = PageFactory.defaultPage();
-        Page<BizResourceStaffEducation> responsePage = staffInfoService.educationListPage(page, idDto);
+        Page<BizResourceStaffEducation> responsePage = staffInfoService.educationListPage(page, idDTO);
         return ReturnUtil.success(super.packForBT(responsePage));
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java
index af6aa86..d85d84a 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java
@@ -9,6 +9,7 @@
 import com.casic.missiles.dto.resource.outsideService.SupplierApprovalListRequest;
 import com.casic.missiles.dto.resource.outsideService.SupplierSaveResponse;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceSupplierAbility;
@@ -67,6 +68,13 @@
         return ReturnUtil.success(supplierInfoService.detail(idDTO.getId()));
     }
 
+    @ApiOperation("合格供方导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody SupplierApprovalListRequest request) throws Exception {
+        List<BizResourceSupplierInfo> list = super.exportList(request);
+        super.exportExcel(BizResourceSupplierInfo.class, list, ExportEnum.SUPPLIER_INFO.getSheetName());
+    }
+
     @ApiOperation("供方人员列表（分页）")
     @PostMapping("/person/listPage")
     public ReturnDTO<PageInfoBT<BizResourceSupplierPerson>> personListPage(@RequestBody IdDTO idDTO) {
diff --git a/casic-metering-api/src/main/resources/config/application.yml b/casic-metering-api/src/main/resources/config/application.yml
index 350db5f..ecff521 100644
--- a/casic-metering-api/src/main/resources/config/application.yml
+++ b/casic-metering-api/src/main/resources/config/application.yml
@@ -126,7 +126,7 @@
     #作者
     author: wangpeng
     #待生成对象表名
-    table-name: biz_equipment_technical_target_approval,biz_equipment_attachment_approval,biz_equipment_checkpoint_approval
+    table-name: biz_business_outsource_protocol
 
 reminder:
   #节点--common模块config包 ReminderNodeConfig配置
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
index 4a19e4e..d47d552 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
@@ -53,6 +53,7 @@
     SUGGEST_FORM_SAVE_FAILED(2509, "委托方意见登记表保存至草稿箱失败"),
     EXAMINE_FORM_SAVE_FAILED(2510, "要求、委托书及合同评审表保存至草稿箱失败"),
     CUSTOMER_EXIST_SAVE_FAILED(2511, "该委托方已存在，请重新选择"),
+    DUPLICATE_LOCATION_NO(2512, "地点编号已存在"),
 
     /**
      * 计量检定业务模块
@@ -68,6 +69,8 @@
     COMPLETE_SAMPLE_NOT_EXIST(2609, "检测中不存在扫描收入的样品"),
     CANNOT_CHANGE_MEASURE_INFO(2610, "无法更改非当前登录用户的检测信息"),
     NON_EXIST_ORDER_OR_SAMPLE(2611, "不存在该委托单或该委托单下的样品"),
+    OUTSOURCE_ACCESS_SAVE_FAILED(2612, "测试、校准或检定工作分包评审表保存至草稿箱失败"),
+    OUTSOURCE_PROTOCOL_SAVE_FAILED(2613, "测试、校准或检定工作分包协议书保存至草稿箱失败"),
 
     /**
      * 历史遗留备用
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
index 5089ad1..81a406b 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
@@ -10,54 +10,38 @@
     /**
      * 资源管理
      */
-    ENVIRONMENT_DATA_EXPORT("environmentData", "environmentData", "环境记录单数据"),
+    ENVIRONMENT_DATA_EXPORT("environmentData", "环境记录单数据", "环境记录单数据"),
+    STAFF_INFO("staffInfo", "人员登记", "人员登记"),
+    STAFF_CERTIFICATE_EXPIRE("certificateExpire", "证书逾期提醒", "证书逾期提醒"),
+    SUPPLIER_INFO("supplierInfo", "合格供方名录", "合格供方名录"),
+    CUSTOMER_INFO("customerInfo", "委托方名录", "委托方名录"),
+    CUSTOMER_SUGGEST_FORM("customerSuggestForm", "委托方意见登记表", "委托方意见登记表"),
+    SEAL_NOTE("sealNote", "印章使用登记", "印章使用登记"),
 
-    FILE_EXPORT("meterFileData", "meterFileData", "计量文件信息"),
-    TRAIN_PLAN_EXPORT("trainPlanData", "trainPlanData", "培训计划"),
-    TRAIN_LOG_EXPORT("trainLogData", "trainLogData", "培训记录"),
-    METER_ORGANIZE_EXPORT("meterOrganizeData", "meterOrganizeData", "计量组织"),
-    TRACE_SUPPLIER_EXPORT("traceSupplierData", "traceSupplierData", "溯源供方"),
-    SIGN_EXPORT("signData", "signData", "签名/签章"),
-    TEMPLATE_EXPORT("templateData", "templateData", "原始记录模板/证书报告模板"),
-    FIXED_ASSETS("meterFixedAssets", "meterFixedAssets", "固定资产"),
-    METER_EQUIPMENT("meterEquipment", "meterEquipment", "测量设备"),
-    CALIBRATION_TEST_EQUIPMENT("calibrationTestEquipment", "calibrationTestEquipment", "校准检定设备"),
-    MEASURE_ACCOUNT("measureAccount", "measureAccount", "测量工装"),
-    STANDARD_SUPPORT_EQUIPMENT("standardSupportEquipment", "standardSupportEquipment", "标准配套设备"),
-    STANDARD_EQUIPMENT("standardEquipment", "standardEquipment", "标准装置"),
-    FLOW_DEF_EXPORT("flowDefData", "flowDefData", "流程定义"),
-    STAFF_CERTIFICATE("certificate", "certificate", "计量人员证书"),
-    CHECK_INFO("checkInfo", "checkInfo", "设备管理点检测"),
-    EQUIPMENT_APPLY("equipmentApply", "equipmentApply", "设备借用"),
-    STANDARD_EQUIPMENT_REMIND("equipmentApplyRemind", "equipmentApplyRemind", "标准装置到期提醒"),
-    METER_PRICE("meterPrice", "meterPrice", "价格库"),
-    METER_STAFF("meterStaff", "meterStaff", "计量人员"),
-    STANDARD_EQUIPMENT_APPLY("standardEquipmentApply", "standardEquipmentApply", "标准装置申请"),
-    STATE_MANAGE_APPLY("stateManage", "stateManage", "状态管理"),
-    METER_ACCEPTANCE_CHECK("acceptanceCheck", "acceptanceCheck", "设备检修保养验收单"),
-    CUSTOMER_EXPORT("customerData", "customerData", "客户信息"),
-    ORDER_EXPORT("orderData", "orderData", "委托书信息"),
-    SAMPLE_EXPORT("sampleData", "sampleData", "样本信息"),
-    EXCHANGE_DATA("exchangeData", "exchangeData", "设备交接单"),
-    DISPATCH_DATA("dispatchData", "dispatchData", "设备收发"),
-    ENVIRONMENT_DATA("environmentData", "environmentData", "环境记录单"),
-    ORIGIN_DATA("originData", "originData", "原始记录"),
-    CERTIFICATE_REPORT("certificateReport", "certificateReport", "证书报告"),
-    ADVICE_EXPORT("adviceData", "adviceData", "客户反馈"),
-    HANDOUT_EXPORT("handoutData", "handoutData", "任务分发列表"),
-    OUTSOURCER_EXPORT("outsourcerData", "outsourcerData", "分包方"),
-    SITE_EXECUTIVE_EXPORT("siteExecutiveData", "siteExecutiveData", "现场测试、校准或检定"),
-    CERTIFICATE_PRINT_EXPORT("certificatePrintData", "certificatePrintData", "证书打印"),
-    DOWNLOAD_TEMPLATE("downloadTemplate", "downloadTemplate", "页面配置"),
-    OUTSOURCER_CERTIFICATE_EXPORT("outsourceCertificateData", "outsourceCertificateData", "分包证书"),
-    SETTLEMENT_INFO_EXPORT("settlementInfoData", "settlementInfoData", "业务结算"),
-    EQUIPMENT_REMIND("equipmentRemind", "equipmentRemind", "设备到期提醒"),
-    AGREEMENT_INFO_EXPORT("agreementInfoData", "agreementInfoData", "合同"),
-    WORK_STATISTICS_EXPORT("workStatisticsData", "workStatisticsData", "实时工作统计"),
-    DEPT_OUTPUT_EXPORT("deptOutputData", "deptOutputData", "部门产值分析"),
-    WORKLOAD_EXPORT("workloadData", "workloadData", "业务工作量分析"),
-    DEPT_COMPREHENSIVE_EXPORT("deptComprehensiveData", "deptComprehensiveData", "部门综合分析"),
-    ENVIRONMENTAL_RECORD("environmentalRecordData", "environmentalRecordData", "现场环境记录");
+    /**
+     * 计量检定业务
+     */
+    OUTSOURCER_EXPORT("outsourcerData", "分包方名录", "分包方名录"),
+    IDENTIFY_EXPORT("identifyData", "计量标识", "计量标识"),
+    ORDER_EXPORT("orderData", "任务单", "任务单"),
+    DISPATCH_DATA("dispatchData", "设备收发", "设备收发"),
+    HANDOUT_EXPORT("handoutData", "任务分发", "任务分发"),
+    SITE_EXECUTIVE_EXPORT("siteExecutiveData", "现场测试、校准或检定", "现场测试、校准或检定"),
+    CERTIFICATE_REPORT("certificateReport", "证书审批", "证书审批"),
+    CERTIFICATE_CHANGE_APPLY("certificateChangeApply", "证书报告补充或更换申请单", "证书报告补充或更换申请单"),
+    CERTIFICATE_PRINT("certificatePrintData", "证书打印审批", "证书打印审批"),
+    DEPT_EXECUTIVE_TASK("deptExecutiveTaskData", "实验室任务", "实验室任务"),
+    MY_EXECUTIVE_TASK("myExecutiveTaskData", "我的任务", "我的任务"),
+    OUTSOURCE_ASSESS("outsourceAssess", "测试、校准或检定工作分包评审表", "测试、校准或检定工作分包评审表"),
+    OUTSOURCE_PROTOCOL("outsourceProtocol", "测试、校准或检定工作分包协议书", "测试、校准或检定工作分包协议书"),
+
+    /**
+     * 系统管理
+     */
+    SIGN_EXPORT("signData", "签名", "签名"),
+    TEMPLATE_EXPORT("templateData", "文件模板", "文件模板"),
+    FLOW_DEF_EXPORT("flowDefData", "流程定义", "流程定义"),
+    DOWNLOAD_TEMPLATE("downloadTemplate", "流程定义", "页面配置");
 
     ExportEnum(String fileName, String sheetName, String description) {
         this.fileName = fileName;
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateRecordTypeCodeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateRecordTypeCodeEnum.java
index 31d913c..a963522 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateRecordTypeCodeEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateRecordTypeCodeEnum.java
@@ -46,4 +46,14 @@
     String SITE_EXECUTIVE_APPROVAL = "01";
     //《现场测试、校准或检定工作记录表》
     String SITE_EXECUTIVE_LOG = "02";
+
+    //测试、校准或检定工作分包协议书
+    String OUTSOURCE_PROTOCOL = "01";
+    //测试、校准或检定工作分包评审表
+    String OUTSOURCE_ACCESS = "02";
+    //测试、校准或检定工作分包通知书
+    String OUTSOURCE_NOTICE = "03";
+    //测试、校准或检定工作分包方名录
+    String OUTSOURCE_INFO = "04";
+
 }
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
index 24b8635..f78bd53 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
@@ -15,6 +15,10 @@
     String CERTIFICATE_CHANGE_APPLY_BEAN_NAME = "certificateChangeApplyBean";
     //现场测试、校准或检定
     String SITE_EXECUTIVE_BEAN_NAME = "siteExecutiveBean";
+    //测试、校准或检定工作分包评审表
+    String OUTSOURCE_ASSESS_BEAN_NAME = "outsourceAssessBean";
+    //测试、校准或检定工作分包协议书
+    String OUTSOURCE_PROTOCOL_BEAN_NAME = "outsourceProtocolBean";
 
     /*********************************设备与装置************************************/
     //设备台账
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 b21c661..6b86fd1 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
@@ -18,6 +18,8 @@
     OUTSOURCER_APPROVAL(OUTSOURCER_BEAN_NAME, ""),
     CERTIFICATE_CHANGE_APPROVAL(CERTIFICATE_CHANGE_APPLY_BEAN_NAME, ""),
     SITE_EXECUTIVE_APPROVAL(SITE_EXECUTIVE_BEAN_NAME, ""),
+    OUTSOURCE_ASSESS_APPROVAL(OUTSOURCE_ASSESS_BEAN_NAME, ""),
+    OUTSOURCE_PROTOCOL_APPROVAL(OUTSOURCE_PROTOCOL_BEAN_NAME, ""),
 
     ACTION_STATUS_MAP(new HashMap<String, AwareActionStatusEnum>() {
         {
@@ -47,6 +49,10 @@
             put(ApplyFromIdEnum.CERTIFICATE_CHANGE_APPROVAL.getCode(), CERTIFICATE_CHANGE_APPROVAL);
             //现场测试、校准或检定审批
             put(ApplyFromIdEnum.SITE_EXECUTIVE_APPROVAL.getCode(), SITE_EXECUTIVE_APPROVAL);
+            //测试、校准或检定工作分包评审表
+            put(ApplyFromIdEnum.OUTSOURCE_ASSESS_APPROVAL.getCode(), OUTSOURCE_ASSESS_APPROVAL);
+            //测试、校准或检定工作分包协议书
+            put(ApplyFromIdEnum.OUTSOURCE_PROTOCOL_APPROVAL.getCode(), OUTSOURCE_PROTOCOL_APPROVAL);
         }
     });
     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 934405e..c7410bd 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
@@ -9,6 +9,8 @@
     CERTIFICATE_CHANGE_APPROVAL("jljdywzsbchghsqd", MessageSourceModuleEnum.BUSINESS.getCode(), "证书/报告补充或更换申请单"),
     OUTSOURCER_APPROVAL("jljdywcsjzhgfbfml", MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定合格分包方名录"),
     SITE_EXECUTIVE_APPROVAL("jljdywxccsjzsp", MessageSourceModuleEnum.BUSINESS.getCode(), "现场测试、校准或检定审批"),
+    OUTSOURCE_ASSESS_APPROVAL("jljdywcsjzfbpsb", MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包评审表"),
+    OUTSOURCE_PROTOCOL_APPROVAL("jljdywcsjzfbxys", MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包协议书"),
 
 
     /*******************************************设备与装置*********************************************/
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/GeneralApprovalMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/GeneralApprovalMapper.java
index 4fb7344..0c9d6ae 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/GeneralApprovalMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/GeneralApprovalMapper.java
@@ -17,8 +17,4 @@
 
     Page<O> selectBatchForApprovalList(Page<O> page, @Param("request") R request, @Param("businessKeys") List<String> businessKeys);
 
-//    Page<O> selectListPage(Page<O> page, @Param("request") R request);
-
-//    Long selectMaxNo();
-
 }
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceAssessMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceAssessMapper.java
index 7867bb8..ba59009 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceAssessMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceAssessMapper.java
@@ -1,7 +1,12 @@
 package com.casic.missiles.mapper.business;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.business.outsource.OutsourceAssessApprovalListRequest;
+import com.casic.missiles.mapper.GeneralApprovalMapper;
 import com.casic.missiles.model.business.BizBusinessOutsourceAssess;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * <p>
@@ -11,6 +16,10 @@
  * @author wangpeng
  * @since 2023-08-16
  */
-public interface BizBusinessOutsourceAssessMapper extends BaseMapper<BizBusinessOutsourceAssess> {
+public interface BizBusinessOutsourceAssessMapper extends GeneralApprovalMapper<BizBusinessOutsourceAssess, BizBusinessOutsourceAssess, OutsourceAssessApprovalListRequest> {
+
+    Page<BizBusinessOutsourceAssess> selectBatchForApprovalList(Page<BizBusinessOutsourceAssess> page, @Param("request") OutsourceAssessApprovalListRequest request, @Param("businessKeys") List<String> businessKeys);
+
+    Long selectMaxProjectNo();
 
 }
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceProtocolMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceProtocolMapper.java
new file mode 100644
index 0000000..e6aba35
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceProtocolMapper.java
@@ -0,0 +1,24 @@
+package com.casic.missiles.mapper.business;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.business.outsource.OutsourceProtocolApprovalListRequest;
+import com.casic.missiles.mapper.GeneralApprovalMapper;
+import com.casic.missiles.model.business.BizBusinessOutsourceProtocol;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 计量检定业务-分包管理-测试、校准或检定工作分包协议书 Mapper 接口
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-08-24
+ */
+public interface BizBusinessOutsourceProtocolMapper extends GeneralApprovalMapper<BizBusinessOutsourceProtocol, BizBusinessOutsourceProtocol, OutsourceProtocolApprovalListRequest> {
+
+    Page<BizBusinessOutsourceProtocol> selectBatchForApprovalList(Page<BizBusinessOutsourceProtocol> page, @Param("request") OutsourceProtocolApprovalListRequest request, @Param("businessKeys") List<String> businessKeys);
+
+    Long selectMaxProtocolNo();
+}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/EnvLocationInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/EnvLocationInfoMapper.java
new file mode 100644
index 0000000..49eff87
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/EnvLocationInfoMapper.java
@@ -0,0 +1,21 @@
+package com.casic.missiles.mapper.resource;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.resource.environment.LocationListRequest;
+import com.casic.missiles.dto.resource.environment.LocationListResponse;
+import com.casic.missiles.model.resource.EnvLocationInfo;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * <p>
+ * 实验室环境监控系统-设备表 Mapper 接口
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-06-07
+ */
+public interface EnvLocationInfoMapper extends BaseMapper<EnvLocationInfo> {
+
+    Page<LocationListResponse> selectLocationListPage(Page<LocationListResponse> page, @Param("request") LocationListRequest request);
+}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java
index de124db..85ed0f7 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java
@@ -1,7 +1,9 @@
 package com.casic.missiles.mapper.system;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.dto.system.SignDetailResponse;
+import com.casic.missiles.dto.system.SignListRequest;
 import com.casic.missiles.model.system.SystemSign;
 import org.apache.ibatis.annotations.Param;
 
@@ -22,4 +24,8 @@
     SignDetailResponse selectSignDetailById(Long id);
 
     List<SystemSign> selectUsableSignList(@Param("userId") Long userId);
+
+    Page<SystemSign> selectSignListPage(Page<SystemSign> page, @Param("request") SignListRequest request);
+
+    List<SystemSign> selectSignList(@Param("request") SignListRequest request);
 }
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateChangeApplyMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateChangeApplyMapper.xml
index d798447..c496092 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateChangeApplyMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateChangeApplyMapper.xml
@@ -30,31 +30,31 @@
         SELECT *
         FROM biz_business_certificate_change_apply
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.changeApplyNo != null and request.changeApplyNo !=''">
+        <if test="request != null and request.changeApplyNo != null and request.changeApplyNo !=''">
             and change_apply_no like concat('%',#{request.changeApplyNo},'%')
         </if>
-        <if test="request.changeReportNo != null and request.changeReportNo !=''">
+        <if test="request != null and request.changeReportNo != null and request.changeReportNo !=''">
             and change_report_no like concat('%',#{request.changeReportNo},'%')
         </if>
-        <if test="request.changeReportName != null and request.changeReportName !=''">
+        <if test="request != null and request.changeReportName != null and request.changeReportName !=''">
             and change_report_name like concat('%',#{request.changeReportName},'%')
         </if>
-        <if test="request.changeType != null and request.changeType !=''">
+        <if test="request != null and request.changeType != null and request.changeType !=''">
             and change_type = #{request.changeType}
         </if>
-        <if test="request.createUserName != null and request.createUserName !=''">
+        <if test="request != null and request.createUserName != null and request.createUserName !=''">
             and create_user_name like concat('%',#{request.createUserName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificatePrintMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificatePrintMapper.xml
index b66cd99..49c0ac8 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificatePrintMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificatePrintMapper.xml
@@ -31,34 +31,34 @@
         LEFT JOIN biz_business_order_sample_relation bosr ON (bosr.order_id = bcr.order_id AND bosr.sample_id = bcr.sample_id)
         LEFT JOIN biz_business_order_info boi ON boi.id = bosr.order_id
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and bcp.approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.printStatus != null and request.printStatus !=''">
+        <if test="request != null and request.printStatus != null and request.printStatus !=''">
             and print_status = #{request.printStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and bcp.create_user_id = #{request.createUserId}
         </if>
-        <if test="request.certificateReportNo != null and request.certificateReportNo !=''">
+        <if test="request != null and request.certificateReportNo != null and request.certificateReportNo !=''">
             and bcr.certificate_report_no like concat('%',#{request.certificateReportNo},'%')
         </if>
-        <if test="request.certificateReportName != null and request.certificateReportName !=''">
+        <if test="request != null and request.certificateReportName != null and request.certificateReportName !=''">
             and bcr.certificate_report_name like concat('%',#{request.certificateReportName},'%')
         </if>
-        <if test="request.customerName != null and request.customerName !=''">
+        <if test="request != null and request.customerName != null and request.customerName !=''">
             and boi.customer_name like concat('%',#{request.customerName},'%')
         </if>
-        <if test="request.sampleNo != null and request.sampleNo !=''">
+        <if test="request != null and request.sampleNo != null and request.sampleNo !=''">
             and bosr.sample_no like concat('%',#{request.sampleNo},'%')
         </if>
-        <if test="request.sampleName != null and request.sampleName !=''">
+        <if test="request != null and request.sampleName != null and request.sampleName !=''">
             and bosr.sample_name like concat('%',#{request.sampleName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and bcp.create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and bcp.create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml
index b366034..767695d 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml
@@ -46,33 +46,37 @@
         SELECT bcr.*, bosr.sample_no, bosr.sample_name, bosr.sample_model, rsi.staff_name
         FROM biz_business_certificate_report bcr
         LEFT JOIN biz_business_order_sample_relation bosr ON (bosr.order_id = bcr.order_id AND bosr.sample_id = bcr.sample_id)
+        LEFT JOIN biz_business_order_info boi ON boi.id = bcr.order_id
         LEFT JOIN biz_resource_staff_info rsi ON rsi.id = bcr.measure_person_id
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and bcr.approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and bcr.create_user_id = #{request.createUserId}
         </if>
-        <if test="request.certificateReportNo != null and request.certificateReportNo !=''">
+        <if test="request != null and request.customerId != null and request.customerId !=''">
+            and boi.customer_id = #{request.customerId}
+        </if>
+        <if test="request != null and request.certificateReportNo != null and request.certificateReportNo !=''">
             and bcr.certificate_report_no like concat('%',#{request.certificateReportNo},'%')
         </if>
-        <if test="request.certificateReportName != null and request.certificateReportName !=''">
+        <if test="request != null and request.certificateReportName != null and request.certificateReportName !=''">
             and bcr.certificate_report_name like concat('%',#{request.certificateReportName},'%')
         </if>
-        <if test="request.sampleNo != null and request.sampleNo !=''">
+        <if test="request != null and request.sampleNo != null and request.sampleNo !=''">
             and bosr.sample_no like concat('%',#{request.sampleNo},'%')
         </if>
-        <if test="request.measureCategory != null and request.measureCategory !=''">
+        <if test="request != null and request.measureCategory != null and request.measureCategory !=''">
             and bcr.measure_category = #{request.measureCategory}
         </if>
-        <if test="request.measurePerson != null and request.measurePerson !=''">
+        <if test="request != null and request.measurePerson != null and request.measurePerson !=''">
             and rsi.staff_name like concat('%',#{request.measurePerson},'%')
         </if>
-        <if test="request.calibrationTimeStart != null and request.calibrationTimeStart !=''">
+        <if test="request != null and request.calibrationTimeStart != null and request.calibrationTimeStart !=''">
             and bcr.calibration_time &gt;= #{request.calibrationTimeStart}
         </if>
-        <if test="request.calibrationTimeEnd != null and request.calibrationTimeEnd !=''">
+        <if test="request != null and request.calibrationTimeEnd != null and request.calibrationTimeEnd !=''">
             and bcr.calibration_time &lt;= #{request.calibrationTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceAssessMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceAssessMapper.xml
index d0fcf8b..c22c101 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceAssessMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceAssessMapper.xml
@@ -7,6 +7,8 @@
         <id column="id" property="id" />
         <result column="project_no" property="projectNo" />
         <result column="project_name" property="projectName" />
+        <result column="lab_code" property="labCode" />
+        <result column="group_code" property="groupCode" />
         <result column="applicant_id" property="applicantId" />
         <result column="applicant_name" property="applicantName" />
         <result column="applicant_time" property="applicantTime" />
@@ -31,7 +33,45 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, project_no, project_name, applicant_id, applicant_name, applicant_time, minio_file_name, remark, create_user_id, create_user_name, outsourcer_id, pre_start_time, pre_end_time, outsource_reason, pre_cost, approval_status, process_id, approve_situation, traceability, test_method, technique_ability, create_time, update_time
+        id, project_no, project_name, lab_code, group_code, applicant_id, applicant_name, applicant_time, minio_file_name, remark, create_user_id, create_user_name, outsourcer_id, pre_start_time, pre_end_time, outsource_reason, pre_cost, approval_status, process_id, approve_situation, traceability, test_method, technique_ability, create_time, update_time
     </sql>
 
+    <select id="selectMaxProjectNo" resultType="java.lang.Long">
+        SELECT IFNULL(max(RIGHT(project_no, 3)), 0) from biz_business_outsource_assess
+    </select>
+
+    <select id="selectBatchForApprovalList" resultMap="BaseResultMap">
+        SELECT bboa.*, bboi.outsourcer_name, bboi.director
+        FROM biz_business_outsource_assess bboa
+        LEFT JOIN biz_business_outsourcer_info bboi ON bboa.outsourcer_id = bboi.id
+        WHERE 1=1
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
+            and bboa.approval_status = #{request.approvalStatus}
+        </if>
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
+            and bboa.create_user_id = #{request.createUserId}
+        </if>
+        <if test="request != null and request.projectNo != null and request.projectNo !=''">
+            and bboa.project_no like concat('%',#{request.projectNo},'%')
+        </if>
+        <if test="request != null and request.outsourcerName != null and request.outsourcerName !=''">
+            and bboi.outsourcer_name like concat('%',#{request.outsourcerName},'%')
+        </if>
+        <if test="request != null and request.applicantName != null and request.applicantName !=''">
+            and bboa.applicant_name like concat('%',#{request.applicantName},'%')
+        </if>
+        <if test="request != null and request.applicantTimeStart != null and request.applicantTimeStart !=''">
+            and bboa.applicant_time &gt;= #{request.applicantTimeStart}
+        </if>
+        <if test="request != null and request.applicantTimeEnd != null and request.applicantTimeEnd !=''">
+            and bboa.applicant_time &lt;= #{request.applicantTimeEnd}
+        </if>
+        <if test="businessKeys != null">
+            and bboa.id in
+            <foreach collection="businessKeys" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
+        ORDER BY bboa.create_time DESC
+    </select>
 </mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceProtocolMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceProtocolMapper.xml
new file mode 100644
index 0000000..b7b2149
--- /dev/null
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceProtocolMapper.xml
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.mapper.business.BizBusinessOutsourceProtocolMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.business.BizBusinessOutsourceProtocol">
+        <id column="id" property="id" />
+        <result column="protocol_no" property="protocolNo" />
+        <result column="project_name" property="projectName" />
+        <result column="lab_code" property="labCode" />
+        <result column="group_code" property="groupCode" />
+        <result column="outsourcer_id" property="outsourcerId" />
+        <result column="remark" property="remark" />
+        <result column="outsource_no" property="outsourceNo" />
+        <result column="outsource_name" property="outsourceName" />
+        <result column="contacts" property="contacts" />
+        <result column="mobile" property="mobile" />
+        <result column="address" property="address" />
+        <result column="require_date" property="requireDate" />
+        <result column="outsource_cost" property="outsourceCost" />
+        <result column="director" property="director" />
+        <result column="item" property="item" />
+        <result column="requires" property="requires" />
+        <result column="create_user_id" property="createUserId" />
+        <result column="create_user_name" property="createUserName" />
+        <result column="approval_status" property="approvalStatus" />
+        <result column="process_id" property="processId" />
+        <result column="create_time" property="createTime" />
+        <result column="update_time" property="updateTime" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, protocol_no, project_name, lab_code, group_code, outsourcer_id, remark, outsource_no, outsource_name, contacts, mobile, address, require_date, outsource_cost, director, item, requires, create_user_id, create_user_name, approval_status, process_id, create_time, update_time
+    </sql>
+
+    <select id="selectMaxProtocolNo" resultType="java.lang.Long">
+        SELECT IFNULL(max(RIGHT(protocol_no, 3)), 0) from biz_business_outsource_protocol
+    </select>
+
+    <select id="selectBatchForApprovalList" resultMap="BaseResultMap">
+        SELECT *
+        FROM biz_business_outsource_protocol
+        WHERE 1=1
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
+            and approval_status = #{request.approvalStatus}
+        </if>
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
+            and create_user_id = #{request.createUserId}
+        </if>
+        <if test="request != null and request.protocolNo != null and request.protocolNo !=''">
+            and protocol_no like concat('%',#{request.protocolNo},'%')
+        </if>
+        <if test="request != null and request.outsourcerName != null and request.outsourcerName !=''">
+            and outsourcer_name like concat('%',#{request.outsourcerName},'%')
+        </if>
+        <if test="request != null and request.applicantName != null and request.applicantName !=''">
+            and create_user_name like concat('%',#{request.applicantName},'%')
+        </if>
+        <if test="request != null and request.applicantTimeStart != null and request.applicantTimeStart !=''">
+            and create_time &gt;= #{request.applicantTimeStart}
+        </if>
+        <if test="request != null and request.applicantTimeEnd != null and request.applicantTimeEnd !=''">
+            and create_time &lt;= #{request.applicantTimeEnd}
+        </if>
+        <if test="businessKeys != null">
+            and id in
+            <foreach collection="businessKeys" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
+        ORDER BY create_time DESC
+    </select>
+</mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourcerInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourcerInfoMapper.xml
index 510a80b..3049b54 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourcerInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourcerInfoMapper.xml
@@ -7,6 +7,8 @@
         <id column="id" property="id" />
         <result column="outsourcer_no" property="outsourcerNo" />
         <result column="outsourcer_name" property="outsourcerName" />
+        <result column="lab_code" property="labCode" />
+        <result column="group_code" property="groupCode" />
         <result column="outsourcer_brief_name" property="outsourcerBriefName" />
         <result column="outsourcer_size" property="outsourcerSize" />
         <result column="business_size" property="businessSize" />
@@ -55,32 +57,32 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, outsourcer_no, outsourcer_name, outsourcer_brief_name, outsourcer_size, business_size, grade, evaluation, tax_number, bank_account, bank_name, bank_account_number, postal_code, director, phone, fax, mobile, email, website, address_country, address_province, address_city, address_area, full_address, address_country_name, address_province_name, address_city_name, address_area_name, invoice_country, invoice_province, invoice_city, invoice_area, invoice_full_address, invoice_country_name, invoice_province_name, invoice_city_name, invoice_area_name, business_scope, business_content, minio_file_name, approval_status, process_id, remark, create_user_id, create_user_name, create_time, update_time
+        id, outsourcer_no, outsourcer_name, lab_code, group_code, outsourcer_brief_name, outsourcer_size, business_size, grade, evaluation, tax_number, bank_account, bank_name, bank_account_number, postal_code, director, phone, fax, mobile, email, website, address_country, address_province, address_city, address_area, full_address, address_country_name, address_province_name, address_city_name, address_area_name, invoice_country, invoice_province, invoice_city, invoice_area, invoice_full_address, invoice_country_name, invoice_province_name, invoice_city_name, invoice_area_name, business_scope, business_content, minio_file_name, approval_status, process_id, remark, create_user_id, create_user_name, create_time, update_time
     </sql>
 
     <select id="selectBatchForApprovalList" resultMap="BaseResultMap">
         SELECT *
         FROM biz_business_outsourcer_info
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.outsourcerNo != null and request.outsourcerNo !=''">
+        <if test="request != null and request.outsourcerNo != null and request.outsourcerNo !=''">
             and outsourcer_no like concat('%',#{request.outsourcerNo},'%')
         </if>
-        <if test="request.outsourcerName != null and request.outsourcerName !=''">
+        <if test="request != null and request.outsourcerName != null and request.outsourcerName !=''">
             and outsourcer_name like concat('%',#{request.outsourcerName},'%')
         </if>
-        <if test="request.director != null and request.director !=''">
+        <if test="request != null and request.director != null and request.director !=''">
             and director like concat('%',#{request.director},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
@@ -93,6 +95,6 @@
     </select>
 
     <select id="selectMaxNo" resultType="java.lang.Long">
-        SELECT IFNULL(max(RIGHT(outsourcer_no, 12)), 0) from biz_business_outsourcer_info
+        SELECT IFNULL(max(RIGHT(outsourcer_no, 3)), 0) from biz_business_outsourcer_info
     </select>
 </mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessSiteExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessSiteExecutiveInfoMapper.xml
index 135c5d0..3c5ae79 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessSiteExecutiveInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessSiteExecutiveInfoMapper.xml
@@ -38,25 +38,25 @@
         FROM biz_business_site_executive_info bsei
         LEFT JOIN biz_resource_customer_info rci ON bsei.customer_id = rci.id
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and bsei.approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and bsei.create_user_id = #{request.createUserId}
         </if>
-        <if test="request.siteExecutiveNo != null and request.siteExecutiveNo !=''">
+        <if test="request != null and request.siteExecutiveNo != null and request.siteExecutiveNo !=''">
             and bsei.site_executive_no like concat('%',#{request.siteExecutiveNo},'%')
         </if>
-        <if test="request.customerName != null and request.customerName !=''">
+        <if test="request != null and request.customerName != null and request.customerName !=''">
             and rci.outsourcer_name like concat('%',#{request.customerName},'%')
         </if>
-        <if test="request.applyName != null and request.applyName !=''">
+        <if test="request != null and request.applyName != null and request.applyName !=''">
             and bsei.apply_name like concat('%',#{request.applyName},'%')
         </if>
-        <if test="request.applyTimeStart != null and request.applyTimeStart !=''">
+        <if test="request != null and request.applyTimeStart != null and request.applyTimeStart !=''">
             and bsei.apply_time &gt;= #{request.applyTimeStart}
         </if>
-        <if test="request.applyTimeEnd != null and request.applyTimeEnd !=''">
+        <if test="request != null and request.applyTimeEnd != null and request.applyTimeEnd !=''">
             and bsei.apply_time &lt;= #{request.applyTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml
index 84d9e2a..6bd38a9 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml
@@ -105,6 +105,12 @@
         <if test="request.isUrgent != null and request.isUrgent !=''">
             AND bo.is_urgent = #{request.isUrgent}
         </if>
+        <if test="request.ids != null">
+            and blei.id in
+            <foreach collection="request.ids" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
         ORDER BY blei.update_time DESC
     </select>
 
@@ -137,6 +143,12 @@
         <if test="request.isUrgent != null and request.isUrgent !=''">
             AND bo.is_urgent = #{request.isUrgent}
         </if>
+        <if test="request.ids != null">
+            and blei.id in
+            <foreach collection="request.ids" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
         ORDER BY blei.update_time DESC
     </select>
 
diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardInfoMapper.xml
index 1a5551b..2ed8d17 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardInfoMapper.xml
@@ -45,12 +45,6 @@
         FROM biz_equipment_standard_info besi
         LEFT JOIN biz_equipment_standard_technology_relation bestr ON besi.standard_no = bestr.standard_no
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
-            and besi.approval_status = #{request.approvalStatus}
-        </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
-            and besi.create_user_id = #{request.createUserId}
-        </if>
         <if test="request.standardName != null and request.standardName !=''">
             and besi.standard_name like concat('%',#{request.standardName},'%')
         </if>
diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardTechnologyRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardTechnologyRelationMapper.xml
index fc7e16c..cd03c8c 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardTechnologyRelationMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardTechnologyRelationMapper.xml
@@ -6,6 +6,7 @@
     <resultMap id="BaseResultMap" type="com.casic.missiles.model.equipment.BizEquipmentStandardTechnologyRelation">
         <id column="id" property="id" />
         <result column="technology_file_id" property="technologyFileId" />
+        <result column="technology_file_no" property="technologyFileNo" />
         <result column="technology_file_name" property="technologyFileName" />
         <result column="standard_id" property="standardId" />
         <result column="standard_no" property="standardNo" />
@@ -14,7 +15,7 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, technology_file_id, technology_file_name, standard_id, remark
+        id, technology_file_id, technology_file_no, technology_file_name, standard_id, remark
     </sql>
 
 </mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceAuthorizeOrderMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceAuthorizeOrderMapper.xml
index ac5176c..554fe65 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceAuthorizeOrderMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceAuthorizeOrderMapper.xml
@@ -32,22 +32,22 @@
         SELECT *
         FROM biz_resource_authorize_order
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.orderNo != null and request.orderNo !=''">
+        <if test="request != null and request.orderNo != null and request.orderNo !=''">
             and order_no like concat('%',#{request.orderNo},'%')
         </if>
-        <if test="request.createUserName != null and request.createUserName !=''">
+        <if test="request != null and request.createUserName != null and request.createUserName !=''">
             and create_user_name like concat('%',#{request.createUserName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerExamineFormMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerExamineFormMapper.xml
index ab242f6..af7f98f 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerExamineFormMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerExamineFormMapper.xml
@@ -41,28 +41,28 @@
         SELECT *
         FROM biz_resource_customer_examine_form
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.formNo != null and request.formNo !=''">
+        <if test="request != null and request.formNo != null and request.formNo !=''">
             and form_no like concat('%',#{request.formNo},'%')
         </if>
-        <if test="request.labCode != null and request.labCode !=''">
+        <if test="request != null and request.labCode != null and request.labCode !=''">
             and lab_code like concat('%',#{request.labCode},'%')
         </if>
-        <if test="request.groupCode != null and request.groupCode !=''">
+        <if test="request != null and request.groupCode != null and request.groupCode !=''">
             and group_code like concat('%',#{request.groupCode},'%')
         </if>
-        <if test="request.createUserName != null and request.createUserName !=''">
+        <if test="request != null and request.createUserName != null and request.createUserName !=''">
             and create_user_name like concat('%',#{request.createUserName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerInfoMapper.xml
index fa8ffbc..06a2798 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerInfoMapper.xml
@@ -33,25 +33,25 @@
         SELECT *
         FROM biz_resource_customer_info
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.customerNo != null and request.customerNo !=''">
+        <if test="request != null and request.customerNo != null and request.customerNo !=''">
             and customer_no like concat('%',#{request.customerNo},'%')
         </if>
-        <if test="request.customerName != null and request.customerName !=''">
+        <if test="request != null and request.customerName != null and request.customerName !=''">
             and customer_name like concat('%',#{request.customerName},'%')
         </if>
-        <if test="request.contacts != null and request.contacts !=''">
+        <if test="request != null and request.contacts != null and request.contacts !=''">
             and contacts like concat('%',#{request.contacts},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerSuggestFormMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerSuggestFormMapper.xml
index 28f5bb2..1806662 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerSuggestFormMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerSuggestFormMapper.xml
@@ -33,28 +33,28 @@
         SELECT *
         FROM biz_resource_customer_suggest_form
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.formNo != null and request.formNo !=''">
+        <if test="request != null and request.formNo != null and request.formNo !=''">
             and form_no like concat('%',#{request.formNo},'%')
         </if>
-        <if test="request.customerName != null and request.customerName !=''">
+        <if test="request != null and request.customerName != null and request.customerName !=''">
             and customer_name like concat('%',#{request.customerName},'%')
         </if>
-        <if test="request.customerDeptName != null and request.customerDeptName !=''">
+        <if test="request != null and request.customerDeptName != null and request.customerDeptName !=''">
             and customer_dept_name like concat('%',#{request.customerDeptName},'%')
         </if>
-        <if test="request.createUserName != null and request.createUserName !=''">
+        <if test="request != null and request.createUserName != null and request.createUserName !=''">
             and create_user_name like concat('%',#{request.createUserName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSealUseNoteMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSealUseNoteMapper.xml
index ab37bc1..b02bb33 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSealUseNoteMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSealUseNoteMapper.xml
@@ -29,32 +29,32 @@
     </sql>
 
     <select id="selectBatchForApprovalList" resultMap="BaseResultMap">
-        SELECT *
+        SELECT brsun.*, brsi.seal_name, brsi.seal_type, brsi.approver_name
         FROM biz_resource_seal_use_note brsun
         JOIN biz_resource_seal_info brsi ON brsun.seal_id = brsi.id
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and brsun.approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and brsun.create_user_id = #{request.createUserId}
         </if>
-        <if test="request.sealName != null and request.sealName !=''">
+        <if test="request != null and request.sealName != null and request.sealName !=''">
             and brsi.seal_name like concat('%',#{request.sealName},'%')
         </if>
-        <if test="request.sealType != null and request.sealType !=''">
+        <if test="request != null and request.sealType != null and request.sealType !=''">
             and brsi.seal_type = #{request.sealType}
         </if>
-        <if test="request.applyDeptName != null and request.applyDeptName !=''">
+        <if test="request != null and request.applyDeptName != null and request.applyDeptName !=''">
             and brsun.apply_dept_name like concat('%',#{request.applyDeptName},'%')
         </if>
-        <if test="request.applyUserName != null and request.applyUserName !=''">
+        <if test="request != null and request.applyUserName != null and request.applyUserName !=''">
             and brsun.apply_user_name like concat('%',#{request.applyUserName},'%')
         </if>
-        <if test="request.applyTimeStart != null and request.applyTimeStart !=''">
+        <if test="request != null and request.applyTimeStart != null and request.applyTimeStart !=''">
             and brsun.apply_time &gt;= #{request.applyTimeStart}
         </if>
-        <if test="request.applyTimeEnd != null and request.applyTimeEnd !=''">
+        <if test="request != null and request.applyTimeEnd != null and request.applyTimeEnd !=''">
             and brsun.apply_time &lt;= #{request.applyTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml
index 119bf7d..4f8392a 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml
@@ -31,6 +31,12 @@
         <if test="request.deptName != null and request.deptName !=''">
             and brsi.dept_name like concat('%',#{request.deptName},'%')
         </if>
+        <if test="request.ids != null">
+            and brsv.id in
+            <foreach collection="request.ids" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
         ORDER BY brsv.grant_date DESC
     </select>
 
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSupplierInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSupplierInfoMapper.xml
index fe8d399..e8ce7ef 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSupplierInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSupplierInfoMapper.xml
@@ -48,28 +48,28 @@
         SELECT *
         FROM biz_resource_supplier_info
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.supplierNo != null and request.supplierNo !=''">
+        <if test="request != null and request.supplierNo != null and request.supplierNo !=''">
             and supplier_no like concat('%',#{request.supplierNo},'%')
         </if>
-        <if test="request.supplierName != null and request.supplierName !=''">
+        <if test="request != null and request.supplierName != null and request.supplierName !=''">
             and supplier_name like concat('%',#{request.supplierName},'%')
         </if>
-        <if test="request.director != null and request.director !=''">
+        <if test="request != null and request.director != null and request.director !=''">
             and director like concat('%',#{request.director},'%')
         </if>
-        <if test="request.supplierType != null and request.supplierType !=''">
+        <if test="request != null and request.supplierType != null and request.supplierType !=''">
             and supplier_type = #{request.supplierType}
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/EnvLocationInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/EnvLocationInfoMapper.xml
new file mode 100644
index 0000000..68bcf10
--- /dev/null
+++ b/casic-metering-dao/src/main/resources/mapper/resource/EnvLocationInfoMapper.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.mapper.resource.EnvLocationInfoMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.resource.EnvLocationInfo">
+        <id column="id" property="id" />
+        <result column="location_no" property="locationNo" />
+        <result column="location_name" property="locationName" />
+        <result column="location_position" property="locationPosition" />
+        <result column="create_user_id" property="createUserId" />
+        <result column="create_user" property="createUser" />
+        <result column="create_time" property="createTime" />
+        <result column="update_time" property="updateTime" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, location_no, location_name, location_position, create_user_id, create_user, create_time, update_time
+    </sql>
+
+    <select id="selectLocationListPage" resultType="com.casic.missiles.dto.resource.environment.LocationListResponse">
+        SELECT *
+        FROM env_location_info
+        WHERE 1=1
+        <if test="request.locationNo != null and request.locationNo !=''">
+            AND location_no LIKE concat('%',#{request.locationNo},'%')
+        </if>
+        <if test="request.locationName != null and request.locationName !=''">
+            AND location_name LIKE concat('%',#{request.locationName},'%')
+        </if>
+        ORDER BY create_time DESC
+    </select>
+
+</mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml
index b28c18f..8854047 100644
--- a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml
@@ -11,7 +11,6 @@
         <result column="sign_desc" property="signDesc" />
         <result column="sign_director" property="signDirector" />
         <result column="sign_user_id" property="signUserId" />
-        <result column="sign_type" property="signType" />
         <result column="minio_file_name" property="minioFileName" />
         <result column="create_time" property="createTime" />
         <result column="update_time" property="updateTime" />
@@ -28,7 +27,6 @@
         <result column="sign_name" property="signName" />
         <result column="sign_desc" property="signDesc" />
         <result column="sign_director" property="signDirector" />
-        <result column="sign_type" property="signType" />
         <result column="sign_user_id" property="signUserId" />
         <result column="minio_file_name" property="minioFileName" />
         <result column="create_time" property="createTime" />
@@ -62,4 +60,58 @@
         JOIN system_sign_user_relation ssur ON ss.id = ssur.sign_id
         WHERE ssur.user_id = #{userId}
     </select>
+
+    <select id="selectSignListPage" resultMap="BaseResultMap">
+        SELECT ss.*, sd.SIMPLE_NAME AS deptName
+        FROM system_sign ss
+        LEFT JOIN sys_user su ON su.id = ss.sign_user_id
+        LEFT JOIN sys_dept sd ON sd.id = su.dept_id
+        WHERE 1=1
+        <if test="request.signNo != null and request.signNo !=''">
+            AND ss.sign_no LIKE concat('%',#{request.signNo},'%')
+        </if>
+        <if test="request.signName != null and request.signName !=''">
+            AND ss.sign_name LIKE concat('%',#{request.signName},'%')
+        </if>
+        <if test="request.signDirector != null and request.signDirector !=''">
+            AND ss.sign_director LIKE concat('%',#{request.signDirector},'%')
+        </if>
+        <if test="request.signUserId != null and request.signUserId !=''">
+            AND ss.sign_user_id = #{request.signUserId}
+        </if>
+        <if test="request.createStartTime != null and request.createStartTime !=''">
+            AND DATE_FORMAT(ss.create_time,'%Y-%m-%d') &gt;= DATE_FORMAT(#{request.createStartTime},'%Y-%m-%d')
+        </if>
+        <if test="request.createEndTime != null and request.createEndTime !=''">
+            AND DATE_FORMAT(ss.create_time,'%Y-%m-%d')  &lt;= DATE_FORMAT(#{request.createEndTime},'%Y-%m-%d')
+        </if>
+        ORDER BY ss.create_time DESC
+    </select>
+
+    <select id="selectSignList" resultMap="BaseResultMap">
+        SELECT ss.*, sd.SIMPLE_NAME AS deptName
+        FROM system_sign ss
+        LEFT JOIN sys_user su ON su.id = ss.sign_user_id
+        LEFT JOIN sys_dept sd ON sd.id = su.dept_id
+        WHERE 1=1
+        <if test="request.signNo != null and request.signNo !=''">
+            AND ss.sign_no LIKE concat('%',#{request.signNo},'%')
+        </if>
+        <if test="request.signName != null and request.signName !=''">
+            AND ss.sign_name LIKE concat('%',#{request.signName},'%')
+        </if>
+        <if test="request.signDirector != null and request.signDirector !=''">
+            AND ss.sign_director LIKE concat('%',#{request.signDirector},'%')
+        </if>
+        <if test="request.signUserId != null and request.signUserId !=''">
+            AND ss.sign_user_id = #{request.signUserId}
+        </if>
+        <if test="request.createStartTime != null and request.createStartTime !=''">
+            AND DATE_FORMAT(ss.create_time,'%Y-%m-%d') &gt;= DATE_FORMAT(#{request.createStartTime},'%Y-%m-%d')
+        </if>
+        <if test="request.createEndTime != null and request.createEndTime !=''">
+            AND DATE_FORMAT(ss.create_time,'%Y-%m-%d')  &lt;= DATE_FORMAT(#{request.createEndTime},'%Y-%m-%d')
+        </if>
+        ORDER BY ss.create_time DESC
+    </select>
 </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 515050a..60f530b 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
@@ -47,8 +47,8 @@
     String STORAGE_LOCATION = "bizStorageLocation";
     //计量专业
     String MEASURE_MAJOR = "bizMeasureMajor";
-    //管理状态
-    String MANAGER_STATE = "bizManagerState";
+    //标准装置管理状态
+    String STANDARD_MANAGER_STATE = "bizStandardManagerState";
 
     /**
      * 资源管理 字典code
@@ -95,8 +95,6 @@
     String MEASURE_STATUS = "measureStatus";
     //检定方式
     String MEASURE_TYPE = "measureType";
-    //标识打印标志类型
-    String IDENTIFY_PRINT_TYPE = "bizBusinessIdentify";
     //变更类型
     String REPORT_CHANGE_TYPE = "bizCertChangeType";
     //规模类型
@@ -111,19 +109,24 @@
     String MEASURE_CATEGORY = "measureCategory";
     //检定结果
     String MEASURE_RESULT = "measureResult";
+    //分包原因
+    String OUTSOURCE_REASON = "outsourceReason";
+
+    /**
+     * 系统管理
+     */
+    String TEMPLATE_TYPE = "templateType";
+
 
     /**
      * 标准装置 字典code
      */
     //类别
     String STANDARD_CATEGORY = "standardCategory";
-    //管理状态
-    String STANDARD_MANAGER_STATE = "standardManagerState";
     //标准等级
     String STANDARD_LEVEL = "standardLevel";
     //传递范围
     String STANDARD_TRANSMIT_RANGE = "transmitRange";
-
     //资本来源
     String CAPITAL_SOURCE = "capitalSource";
     //标准装置-申请类型
@@ -148,8 +151,6 @@
     String CERTIFICATE_CLASS = "certificationClass";
     //证书管理-检校专业
     String CALIBRATION_MAJOR = "calibrationMajor";
-    //分包原因
-    String OUTSOURCE_REASON = "outsourceReason";
 
     /**
      * 工作台
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/BaseApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/BaseApprovalListRequest.java
index 73c12c1..80d7424 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/BaseApprovalListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/BaseApprovalListRequest.java
@@ -6,6 +6,7 @@
 
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotEmpty;
+import java.util.List;
 
 /**
  * @Description:
@@ -19,14 +20,14 @@
      * 表单id
      */
     @NotBlank(message = "表单id不能为空")
-    @ApiModelProperty(value = "表单id（流程定义对应的表单id，等价于业务id）", dataType = "String")
+    @ApiModelProperty(value = "表单id（流程定义对应的表单id，等价于业务id），导出接口不用传", dataType = "String")
     private String formId;
 
     /**
      * 审批状态类型，对应ApprovalStatusEnum
      */
     @NotEmpty(message = "审批状态类型不能为空")
-    @ApiModelProperty(value = "审批状态类型code", dataType = "String")
+    @ApiModelProperty(value = "审批状态类型code，导出接口不用传", dataType = "String")
     private String approvalStatus;
 
     @ApiModelProperty(hidden = true)
@@ -34,4 +35,7 @@
 
     @ApiModelProperty(hidden = true)
     private Long createUserId;
+
+    @ApiModelProperty(value = "导出ids", dataType = "List")
+    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificatePrintApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificatePrintApprovalListRequest.java
index b93d1c9..3cc2f4e 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificatePrintApprovalListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificatePrintApprovalListRequest.java
@@ -5,8 +5,6 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import java.util.List;
-
 /**
  * @Description:
  * @Author: wangpeng
@@ -38,7 +36,4 @@
 
     @ApiModelProperty(value = "创建结束时间", dataType = "String")
     private String createTimeEnd;
-
-    @ApiModelProperty(value = "导出ids", dataType = "List")
-    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportApprovalListRequest.java
index 4f7a038..c115847 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportApprovalListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportApprovalListRequest.java
@@ -5,8 +5,6 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import java.util.List;
-
 /**
  * @Description:
  * @Author: wangpeng
@@ -15,6 +13,8 @@
 @ApiModel
 @Data
 public class CertificateReportApprovalListRequest extends BaseApprovalListRequest {
+    @ApiModelProperty(value = "委托方id", dataType = "String")
+    private Long customerId;
 
     @ApiModelProperty(value = "证书报告编号", dataType = "String")
     private String certificateReportNo;
@@ -37,6 +37,4 @@
     @ApiModelProperty(value = "检校结束时间", dataType = "String")
     private String calibrationTimeEnd;
 
-    @ApiModelProperty(value = "导出ids", dataType = "List")
-    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/identify/IdentifyListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/identify/IdentifyListRequest.java
index 1b87ae6..f019203 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/identify/IdentifyListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/identify/IdentifyListRequest.java
@@ -4,6 +4,8 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * @Description:
  * @Author: wangpeng
@@ -26,4 +28,7 @@
 
     @ApiModelProperty(value = "打印结束时间", dataType = "String")
     private String createTimeEnd;
+
+    @ApiModelProperty(value = "导出ids", dataType = "List")
+    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListRequest.java
index 1264883..62415fb 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListRequest.java
@@ -7,6 +7,7 @@
 import lombok.Data;
 
 import javax.validation.constraints.NotBlank;
+import java.util.List;
 
 @Data
 @ApiModel
@@ -37,4 +38,6 @@
     @ApiModelProperty(value = "是否加急（1是0否null全部）", dataType = "Integer")
     private String isUrgent;
 
+    @ApiModelProperty(value = "导出ids", dataType = "List")
+    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListRequest.java
index 5201d7b..499760a 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListRequest.java
@@ -17,6 +17,9 @@
     @ApiModelProperty(value = "任务单编号", dataType = "String")
     private String orderNo;
 
+    @ApiModelProperty(value = "委托方id", dataType = "Long")
+    private Long customerId;
+
     @ApiModelProperty(value = "委托方名称", dataType = "String")
     private String customerName;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OrderSampleDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OrderSampleDTO.java
new file mode 100644
index 0000000..796edc0
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OrderSampleDTO.java
@@ -0,0 +1,19 @@
+package com.casic.missiles.dto.business.outsource;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/8/24 11:38
+ */
+@ApiModel
+@Data
+public class OrderSampleDTO {
+    @ApiModelProperty(value = "任务单id", dataType = "Long")
+    private Long orderId;
+    @ApiModelProperty(value = "受检设备id", dataType = "Long")
+    private Long sampleId;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceAssessApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceAssessApprovalListRequest.java
new file mode 100644
index 0000000..9a930c3
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceAssessApprovalListRequest.java
@@ -0,0 +1,30 @@
+package com.casic.missiles.dto.business.outsource;
+
+import com.casic.missiles.dto.BaseApprovalListRequest;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/8/24 11:01
+ */
+@ApiModel
+@Data
+public class OutsourceAssessApprovalListRequest extends BaseApprovalListRequest {
+    @ApiModelProperty(value = "评审表编号", dataType = "String")
+    private String projectNo;
+
+    @ApiModelProperty(value = "分包机构名称", dataType = "String")
+    private String outsourcerName;
+
+    @ApiModelProperty(value = "申请人", dataType = "String")
+    private String applicantName;
+
+    @ApiModelProperty(value = "申请时间开始", dataType = "String")
+    private String applicantTimeStart;
+
+    @ApiModelProperty(value = "申请时间结束", dataType = "String")
+    private String applicantTimeEnd;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceAssessSaveResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceAssessSaveResponse.java
new file mode 100644
index 0000000..8bf9aad
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceAssessSaveResponse.java
@@ -0,0 +1,20 @@
+package com.casic.missiles.dto.business.outsource;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/8/14 16:17
+ */
+@ApiModel
+@Data
+public class OutsourceAssessSaveResponse {
+    @ApiModelProperty(value = "主键id", dataType = "Long")
+    private Long id;
+
+    @ApiModelProperty(value = "编号", dataType = "String")
+    private String projectNo;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProtocolApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProtocolApprovalListRequest.java
new file mode 100644
index 0000000..0f32331
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProtocolApprovalListRequest.java
@@ -0,0 +1,30 @@
+package com.casic.missiles.dto.business.outsource;
+
+import com.casic.missiles.dto.BaseApprovalListRequest;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/8/24 15:01
+ */
+@ApiModel
+@Data
+public class OutsourceProtocolApprovalListRequest extends BaseApprovalListRequest {
+    @ApiModelProperty(value = "协议书编号", dataType = "String")
+    private String protocolNo;
+
+    @ApiModelProperty(value = "分包方名称", dataType = "String")
+    private String outsourcerName;
+
+    @ApiModelProperty(value = "申请人", dataType = "String")
+    private String applicantName;
+
+    @ApiModelProperty(value = "申请时间开始", dataType = "String")
+    private String applicantTimeStart;
+
+    @ApiModelProperty(value = "申请时间结束", dataType = "String")
+    private String applicantTimeEnd;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProtocolSaveResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProtocolSaveResponse.java
new file mode 100644
index 0000000..e324967
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProtocolSaveResponse.java
@@ -0,0 +1,20 @@
+package com.casic.missiles.dto.business.outsource;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/8/14 16:17
+ */
+@ApiModel
+@Data
+public class OutsourceProtocolSaveResponse {
+    @ApiModelProperty(value = "主键id", dataType = "Long")
+    private Long id;
+
+    @ApiModelProperty(value = "编号", dataType = "String")
+    private String protocolNo;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveApprovalListRequest.java
index f29f4e4..7047c28 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveApprovalListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveApprovalListRequest.java
@@ -5,8 +5,6 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import java.util.List;
-
 /**
  * @Description: 现场检测审批列表请求实体
  * @Author: wangpeng
@@ -30,7 +28,4 @@
     @ApiModelProperty(value = "申请时间结束", dataType = "String")
     private String applyTimeEnd;
 
-    @ApiModelProperty(value = "导出ids", dataType = "List")
-    private List<Long> ids;
-
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveDetailResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveDetailResponse.java
index 1f28752..394c934 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveDetailResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveDetailResponse.java
@@ -12,6 +12,18 @@
     @ApiModelProperty(value = "id，更新/删除使用参数", dataType = "Long")
     private Long id;
 
+    @ApiModelProperty(value = "实验室代码(字典code)", dataType = "String")
+    private String labCode;
+
+    @ApiModelProperty(value = "实验室代码(字典value)", dataType = "String")
+    private String labCodeName;
+
+    @ApiModelProperty(value = "组别代码(字典code)", dataType = "String")
+    private String groupCode;
+
+    @ApiModelProperty(value = "组别代码(字典value)", dataType = "String")
+    private String groupCodeName;
+
     @ApiModelProperty(value = "审批编号", dataType = "String")
     private String siteExecutiveNo;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/environment/LocationListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/environment/LocationListRequest.java
new file mode 100644
index 0000000..13d03c3
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/environment/LocationListRequest.java
@@ -0,0 +1,20 @@
+package com.casic.missiles.dto.resource.environment;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/6/8 13:56
+ */
+@ApiModel
+@Data
+public class LocationListRequest {
+    @ApiModelProperty(value = "地点编号", dataType = "String")
+    private String locationNo;
+
+    @ApiModelProperty(value = "地点名称", dataType = "String")
+    private String locationName;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/environment/LocationListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/environment/LocationListResponse.java
new file mode 100644
index 0000000..4c531af
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/environment/LocationListResponse.java
@@ -0,0 +1,78 @@
+package com.casic.missiles.dto.resource.environment;
+
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
+import com.baomidou.mybatisplus.annotation.TableField;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description: 地点列表响应实体
+ * @Author: wangpeng
+ * @Date: 2023/6/8 13:53
+ */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
+@ApiModel
+@Data
+public class LocationListResponse {
+    @ApiModelProperty(value = "主键id", dataType = "Long")
+    private Long id;
+
+    /**
+     * 地点编号
+     */
+    @ExcelProperty("地点编号")
+    @ApiModelProperty(value = "地点编号", dataType = "String")
+    private String locationNo;
+
+    /**
+     * 地点名称
+     */
+    @ExcelProperty("地点名称")
+    @ApiModelProperty(value = "地点名称", dataType = "String")
+    private String locationName;
+
+    /**
+     * 地点位置
+     */
+    @ExcelProperty("地点位置")
+    @ApiModelProperty(value = "地点位置", dataType = "String")
+    private String locationPosition;
+
+    /**
+     * 创建人id
+     */
+    @ApiModelProperty(value = "创建人id", dataType = "Long")
+    private Long createUserId;
+
+    /**
+     * 创建人
+     */
+    @ExcelProperty("创建人")
+    @ApiModelProperty(value = "创建人", dataType = "String")
+    @TableField("create_user")
+    private String createUser;
+
+    /**
+     * 创建时间
+     */
+    @ExcelProperty("创建时间")
+    @ApiModelProperty(value = "创建时间", dataType = "String")
+    private String createTime;
+
+    /**
+     * 更新时间
+     */
+    @ApiModelProperty(value = "更新时间", dataType = "String")
+    private String updateTime;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertRequest.java
index 9a7f6c6..c827915 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertRequest.java
@@ -4,6 +4,8 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * @Description:
  * @Author: wangpeng
@@ -16,4 +18,7 @@
     private String name;
     @ApiModelProperty(value = "部门名", dataType = "String")
     private String deptName;
+
+    @ApiModelProperty(value = "导出ids", dataType = "List")
+    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertResponse.java
index f78b159..8f2f79e 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertResponse.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.dto.resource.staff;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.casic.missiles.annotation.DictCodeField;
 import com.casic.missiles.constants.MeterDictCode;
 import io.swagger.annotations.ApiModel;
@@ -13,12 +20,18 @@
  * @Author: wangpeng
  * @Date: 2023/7/27 15:13
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @ApiModel
 @Data
 public class StaffCertResponse {
     /**
      * 人员编号
      */
+    @ExcelProperty(value = "人员编号",order = 0)
     @NotEmpty(message = "人员编号不能为空")
     @ApiModelProperty(value = "人员编号", dataType = "String")
     private String staffNo;
@@ -26,6 +39,7 @@
     /**
      * 姓名
      */
+    @ExcelProperty(value = "姓名",order = 1)
     @ApiModelProperty(value = "姓名", dataType = "String")
     private String staffName;
 
@@ -54,6 +68,7 @@
     /**
      * 部门名字
      */
+    @ExcelProperty(value = "工作部门",order = 2)
     @ApiModelProperty(value = "部门名字", dataType = "String")
     private String deptName;
 
@@ -66,6 +81,7 @@
     /**
      * 计量专业
      */
+    @ExcelProperty(value = "计量专业",order = 3)
     @ApiModelProperty(value = "计量专业", dataType = "String")
     private String major;
 
@@ -110,6 +126,7 @@
     /**
      * 证书号
      */
+    @ExcelProperty(value = "证号",order = 4)
     @ApiModelProperty(value = "证书号", dataType = "String")
     private String certNo;
 
@@ -122,12 +139,14 @@
     /**
      * 有效日期
      */
+    @ExcelProperty(value = "证书有效期",order = 6)
     @ApiModelProperty(value = "有效日期", dataType = "String")
     private String effectiveDate;
 
     /**
      * 发放日期
      */
+    @ExcelProperty(value = "发证日期",order = 5)
     @ApiModelProperty(value = "发放日期", dataType = "String")
     private String grantDate;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffListRequest.java
index 7c4afb3..0a1194a 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffListRequest.java
@@ -4,6 +4,8 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * @Description:
  * @Author: wangpeng
@@ -18,4 +20,7 @@
     private String deptName;
     @ApiModelProperty(value = "部门id", dataType = "Long")
     private Long deptId;
+
+    @ApiModelProperty(value = "导出ids", dataType = "List")
+    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/TrainListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/TrainListRequest.java
index f68597b..6321f8b 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/TrainListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/TrainListRequest.java
@@ -14,6 +14,8 @@
 public class TrainListRequest {
     @ApiModelProperty(value = "训练登记表编号", dataType = "String")
     private String trainNo;
+    @ApiModelProperty(value = "值班领导", dataType = "String")
+    private String dutyLeader;
     @ApiModelProperty(value = "创建开始时间", dataType = "String")
     private String createTimeStart;
     @ApiModelProperty(value = "创建结束时间", dataType = "String")
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/SignAddRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/SignAddRequest.java
index 117be34..d71055c 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/SignAddRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/SignAddRequest.java
@@ -43,13 +43,6 @@
     private Long signUserId;
 
     /**
-     * 签章或签名-字典code
-     */
-    @NotBlank(message = "类型不能为空")
-    @ApiModelProperty(value = "签名/签章-字典code", dataType = "String", required = true)
-    private String signType;
-
-    /**
      * minio存储文件名
      */
     @ApiModelProperty(value = "上传文件返回名称", dataType = "String")
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateAddRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateAddRequest.java
index aff1265..6316648 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateAddRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateAddRequest.java
@@ -17,30 +17,28 @@
 @Data
 public class TemplateAddRequest extends BaseSystemRequest {
     /**
-     * 原始记录模板/证书报告模板名称
+     * 模板名称
      */
     @ApiModelProperty(value = "名称", dataType = "String", required = true)
     @NotBlank(message = "名称不能为空")
     private String templateName;
 
     /**
-     * 原始记录模板/证书报告模板描述
+     * 模板描述
      */
     @ApiModelProperty(value = "描述", dataType = "String")
     private String templateDesc;
 
     /**
-     * 原始记录模板/证书报告模板创建人
+     * 创建人
      */
     @ApiModelProperty(value = "创建人", dataType = "String", required = true)
     @NotBlank(message = "创建人不能为空")
     private String templateCreator;
 
-    /**
-     * 原始记录模板/证书报告模板-字典code
-     */
-    @NotBlank(message = "类型不能为空")
-    @ApiModelProperty(value = "原始记录模板/证书报告模板-字典code", dataType = "String", required = true)
+
+    @NotBlank(message = "模板类型不能为空")
+    @ApiModelProperty(value = "模板类型(字典code)", dataType = "String", required = true)
     private String templateType;
 
     /**
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateListRequest.java
index eec5a1e..6d17bbe 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateListRequest.java
@@ -1,11 +1,12 @@
 package com.casic.missiles.dto.system;
 
+import com.casic.missiles.annotation.DictCodeField;
+import com.casic.missiles.constants.MeterDictCode;
 import com.casic.missiles.dto.BaseSystemRequest;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import javax.validation.constraints.NotBlank;
 import java.util.List;
 
 /**
@@ -19,8 +20,8 @@
     /**
      * 类型
      */
-//    @ApiModelProperty(value = "类型-字典code", dataType = "String", required = true)
-    @NotBlank(message = "类型不能为空")
+    @DictCodeField(message = "模板类型不合法", cacheName = MeterDictCode.TEMPLATE_TYPE)
+    @ApiModelProperty(value = "模板类型(字典code)", dataType = "String")
     private String templateType;
 
     /**
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificateChangeApply.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificateChangeApply.java
index 9216308..36923fd 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificateChangeApply.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificateChangeApply.java
@@ -1,11 +1,19 @@
 package com.casic.missiles.model.business;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 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 com.casic.missiles.dto.BaseRequest;
+import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -20,6 +28,12 @@
  * @author wangpeng
  * @since 2023-08-15
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
+@ApiModel
 @Data
 @TableName("biz_business_certificate_change_apply")
 public class BizBusinessCertificateChangeApply extends BaseRequest implements Serializable {
@@ -33,6 +47,7 @@
     /**
      * 申请单编号
      */
+    @ExcelProperty(value = "申请单编号", order = 1)
     @ApiModelProperty(value = "申请单编号", dataType = "String")
     @TableField("change_apply_no")
     private String changeApplyNo;
@@ -40,6 +55,7 @@
     /**
      * 申请单名字
      */
+    @ExcelProperty(value = "申请单名称", order = 2)
     @ApiModelProperty(value = "申请单名字", dataType = "String")
     @TableField("change_apply_name")
     private String changeApplyName;
@@ -54,6 +70,7 @@
     /**
      * 更换证书编号
      */
+    @ExcelProperty(value = "更换证书编号", order = 3)
     @ApiModelProperty(value = "更换证书编号", dataType = "String")
     @TableField("change_report_no")
     private String changeReportNo;
@@ -61,7 +78,8 @@
     /**
      * 更换证书名字
      */
-    @ApiModelProperty(value = "更换证书名字", dataType = "String")
+    @ExcelProperty(value = "更换证书/报告名称", order = 4)
+    @ApiModelProperty(value = "更换证书/报告名称", dataType = "String")
     @TableField("change_report_name")
     private String changeReportName;
 
@@ -73,6 +91,7 @@
     @TableField("change_type")
     private String changeType;
 
+    @ExcelProperty(value = "变更类型", order = 5)
     @ApiModelProperty(value = "变更类型(字典value)", dataType = "String")
     @TableField(exist = false)
     private String changeTypeName;
@@ -142,13 +161,15 @@
     /**
      * 创建用户名字
      */
-    @ApiModelProperty(value = "创建用户名字", dataType = "String")
+    @ExcelProperty(value = "创建人", order = 6)
+    @ApiModelProperty(value = "创建人名字", dataType = "String")
     @TableField("create_user_name")
     private String createUserName;
 
     /**
      * 创建时间
      */
+    @ExcelProperty(value = "创建时间", order = 7)
     @ApiModelProperty(value = "创建时间", dataType = "String")
     @TableField("create_time")
     private String createTime;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificateReport.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificateReport.java
index f01db9e..db06018 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificateReport.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificateReport.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.model.business;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -22,6 +29,11 @@
  * @author wangpeng
  * @since 2023-08-14
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @ApiModel
 @Data
 @TableName("biz_business_certificate_report")
@@ -36,6 +48,7 @@
     /**
      * 证书报告编号
      */
+    @ExcelProperty(value = "证书报告编号", order = 1)
     @ApiModelProperty(value = "证书报告编号", dataType = "String")
     @TableField("certificate_report_no")
     private String certificateReportNo;
@@ -43,6 +56,7 @@
     /**
      * 证书报告名称
      */
+    @ExcelProperty(value = "证书报告名称", order = 2)
     @ApiModelProperty(value = "证书报告名称", dataType = "String")
     @TableField("certificate_report_name")
     private String certificateReportName;
@@ -62,6 +76,7 @@
     @TableField("measure_category")
     private String measureCategory;
 
+    @ExcelProperty(value = "检校类别", order = 6)
     @ApiModelProperty(value = "检校类别(字典value)", dataType = "String")
     @TableField(exist = false)
     private String measureCategoryName;
@@ -69,6 +84,7 @@
     /**
      * 检校时间
      */
+    @ExcelProperty(value = "检校时间", order = 8)
     @ApiModelProperty(value = "检校时间", dataType = "String")
     @TableField("calibration_time")
     private String calibrationTime;
@@ -267,18 +283,22 @@
     @TableField(exist = false)
     private Integer decisionItem;
 
-    @ApiModelProperty(value = "设备样品编号（列表返回参数）", dataType = "String")
+    @ExcelProperty(value = "被检设备统一编号", order = 3)
+    @ApiModelProperty(value = "被检设备统一编号（列表返回参数）", dataType = "String")
     @TableField(exist = false)
     private String sampleNo;
 
-    @ApiModelProperty(value = "设备样品名称（列表返回参数）", dataType = "String")
+    @ExcelProperty(value = "被检设备名称", order = 4)
+    @ApiModelProperty(value = "被检设备名称（列表返回参数）", dataType = "String")
     @TableField(exist = false)
     private String sampleName;
 
-    @ApiModelProperty(value = "设备样品规格型号（列表返回参数）", dataType = "String")
+    @ExcelProperty(value = "规格型号", order = 5)
+    @ApiModelProperty(value = "规格型号（列表返回参数）", dataType = "String")
     @TableField(exist = false)
     private String sampleModel;
 
+    @ExcelProperty(value = "检定员", order = 7)
     @ApiModelProperty(value = "检定员名字（列表返回参数）", dataType = "String")
     @TableField(exist = false)
     private String staffName;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessIdentifyInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessIdentifyInfo.java
index 46bfba5..f1a9bec 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessIdentifyInfo.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessIdentifyInfo.java
@@ -1,10 +1,15 @@
 package com.casic.missiles.model.business;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 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;
 
@@ -20,6 +25,11 @@
  * @author wangpeng
  * @since 2023-08-15
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @Data
 @TableName("biz_business_identify_info")
 public class BizBusinessIdentifyInfo implements Serializable {
@@ -33,6 +43,7 @@
     /**
      * 记录编号
      */
+    @ExcelProperty(value = "记录编号", order = 1)
     @ApiModelProperty(value = "记录编号", dataType = "String")
     @TableField("record_no")
     private String recordNo;
@@ -41,20 +52,15 @@
      * 标志类型(字典code)
      */
     @NotEmpty(message = "标志类型不能为空")
-    @ApiModelProperty(value = "标志类型(字典code)", dataType = "String")
-    @DictCodeField(message = "标志类型不合法", cacheName = MeterDictCode.IDENTIFY_PRINT_TYPE)
+    @ApiModelProperty(value = "标志类型(直接存计量标识/使用状态/校准状态的字典value)", dataType = "String")
     @TableField("identify_type")
     private String identifyType;
 
-    @ApiModelProperty(value = "标志类型(字典value)", dataType = "String")
-    @TableField(exist = false)
-    private String identifyTypeName;
-
     /**
      * 设备id(可以是受检设备/设备台账)
      */
     @NotNull(message = "设备id不能为空")
-    @ApiModelProperty(value = "设备id(可以是受检设备/设备台账)", dataType = "String")
+    @ApiModelProperty(value = "设备id(可以是受检设备/设备台账)", dataType = "Long")
     @TableField("device_id")
     private Long deviceId;
 
@@ -66,29 +72,32 @@
     @TableField("device_type")
     private String deviceType;
 
+    @ExcelProperty(value = "统一编号", order = 3)
     @NotEmpty(message = "设备编号不能为空")
-    @ApiModelProperty(value = "设备编号", dataType = "String")
+    @ApiModelProperty(value = "统一编号", dataType = "String")
     @TableField("device_no")
     private String deviceNo;
 
     /**
      * 设备名字
      */
-    @NotEmpty(message = "设备名字不能为空")
-    @ApiModelProperty(value = "设备名字", dataType = "String")
+    @ExcelProperty(value = "设备名称", order = 4)
+    @NotEmpty(message = "设备名称不能为空")
+    @ApiModelProperty(value = "设备名称", dataType = "String")
     @TableField("device_name")
     private String deviceName;
 
     /**
      * 检定员id
      */
-    @ApiModelProperty(value = "检定员id", dataType = "String")
+    @ApiModelProperty(value = "检定员id", dataType = "Long")
     @TableField("measure_person_id")
     private Long measurePersonId;
 
     /**
      * 检定员名字
      */
+    @ExcelProperty(value = "检定员", order = 5)
     @ApiModelProperty(value = "检定员名字", dataType = "String")
     @TableField("measure_person")
     private String measurePerson;
@@ -103,7 +112,8 @@
     /**
      * 更新时间
      */
-    @ApiModelProperty(value = "更新时间", dataType = "String")
+    @ExcelProperty(value = "打印时间", order = 6)
+    @ApiModelProperty(value = "打印时间", dataType = "String")
     @TableField("update_time")
     private String updateTime;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceAssess.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceAssess.java
index 659d9ca..6720b90 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceAssess.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceAssess.java
@@ -1,11 +1,26 @@
 package com.casic.missiles.model.business;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 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 com.casic.missiles.dto.BaseRequest;
+import com.casic.missiles.dto.business.outsource.OrderSampleDTO;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import javax.validation.constraints.NotEmpty;
 import java.io.Serializable;
+import java.util.List;
 
 /**
  * <p>
@@ -15,146 +30,231 @@
  * @author wangpeng
  * @since 2023-08-16
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
+@ApiModel
 @Data
 @TableName("biz_business_outsource_assess")
-public class BizBusinessOutsourceAssess implements Serializable {
+public class BizBusinessOutsourceAssess extends BaseRequest implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
+    @ApiModelProperty(value = "id，更新/删除使用参数", dataType = "Long")
     @TableId("id")
     private Long id;
 
     /**
      * 评审表编号
      */
+    @ExcelProperty(value = "评审表编号", order = 1)
+    @ApiModelProperty(value = "评审表编号(后台生成)", dataType = "String")
     @TableField("project_no")
     private String projectNo;
 
     /**
      * 评审表名称
      */
+    @ExcelProperty(value = "评审表名称", order = 2)
+    @ApiModelProperty(value = "评审表名称", dataType = "String")
     @TableField("project_name")
     private String projectName;
 
+    @NotEmpty(message = "实验室代码不能为空")
+    @DictCodeField(message = "实验室代码描述不合法", cacheName = MeterDictCode.LAB_CODE)
+    @ApiModelProperty(value = "实验室代码(字典code)", dataType = "String")
+    @TableField("lab_code")
+    private String labCode;
+
+    @ApiModelProperty(value = "实验室代码(字典value)", dataType = "String")
+    @TableField(exist = false)
+    private String labCodeName;
+
+    /**
+     * 组别代码
+     */
+    @NotEmpty(message = "组别代码不能为空")
+    @DictCodeField(message = "组别代码描述不合法", cacheName = MeterDictCode.GROUP_CODE)
+    @ApiModelProperty(value = "组别代码(字典code)", dataType = "String")
+    @TableField("group_code")
+    private String groupCode;
+
+    @ApiModelProperty(value = "组别代码(字典value)", dataType = "String")
+    @TableField(exist = false)
+    private String groupCodeName;
+
     /**
      * 申请人id
      */
+    @ApiModelProperty(value = "申请人id", dataType = "String")
     @TableField("applicant_id")
     private Long applicantId;
 
     /**
      * 申请人名字
      */
+    @ExcelProperty(value = "申请人", order = 5)
+    @ApiModelProperty(value = "申请人", dataType = "String")
     @TableField("applicant_name")
     private String applicantName;
 
     /**
      * 申请时间
      */
+    @ExcelProperty(value = "申请时间", order = 6)
+    @ApiModelProperty(value = "申请时间", dataType = "String")
     @TableField("applicant_time")
     private String applicantTime;
 
     /**
      * 附件(minio存储文件名)
      */
+    @ApiModelProperty(value = "附件(minio存储文件名)", dataType = "String")
     @TableField("minio_file_name")
     private String minioFileName;
 
     /**
      * 备注
      */
+    @ApiModelProperty(value = "备注", dataType = "String")
     @TableField("remark")
     private String remark;
 
     /**
      * 创建人id
      */
+    @ApiModelProperty(value = "创建人id", dataType = "String")
     @TableField("create_user_id")
     private Long createUserId;
 
     /**
      * 创建人名字
      */
+    @ApiModelProperty(value = "创建人名字", dataType = "String")
     @TableField("create_user_name")
     private String createUserName;
 
     /**
      * 分包方id
      */
+    @ApiModelProperty(value = "评审表编号", dataType = "String")
     @TableField("outsourcer_id")
     private Long outsourcerId;
 
     /**
      * 预计开始时间
      */
+    @ApiModelProperty(value = "预计开始时间", dataType = "String")
     @TableField("pre_start_time")
     private String preStartTime;
 
     /**
      * 预计结束时间
      */
+    @ApiModelProperty(value = "预计结束时间", dataType = "String")
     @TableField("pre_end_time")
     private String preEndTime;
 
     /**
      * 分包原因-字典
      */
+    @ApiModelProperty(value = "分包原因(字典code)", dataType = "String")
+    @DictCodeField(message = "分包原因描述不合法", cacheName = MeterDictCode.OUTSOURCE_REASON)
     @TableField("outsource_reason")
     private String outsourceReason;
 
+    @ApiModelProperty(value = "分包原因(字典value)", dataType = "String")
+    @TableField(exist = false)
+    private String outsourceReasonName;
+
     /**
      * 预计费用
      */
+    @ApiModelProperty(value = "预计费用", dataType = "String")
     @TableField("pre_cost")
     private String preCost;
 
     /**
      * 审批状态
      */
+    @ApiModelProperty(value = "审批状态", dataType = "String")
+    @DictCodeField(message = "审批状态描述不合法", cacheName = MeterDictCode.APPROVAL_STATUS)
     @TableField("approval_status")
     private String approvalStatus;
 
     /**
      * 流程实例id
      */
+    @ApiModelProperty(value = "流程实例id", dataType = "String")
     @TableField("process_id")
     private String processId;
 
     /**
      * 实验室认可情况
      */
+    @ApiModelProperty(value = "实验室认可情况", dataType = "String")
     @TableField("approve_situation")
     private String approveSituation;
 
     /**
      * 溯源性
      */
+    @ApiModelProperty(value = "溯源性", dataType = "String")
     @TableField("traceability")
     private String traceability;
 
     /**
      * 测试方法
      */
+    @ApiModelProperty(value = "测试方法", dataType = "String")
     @TableField("test_method")
     private String testMethod;
 
     /**
      * 技术能力
      */
+    @ApiModelProperty(value = "技术能力", dataType = "String")
     @TableField("technique_ability")
     private String techniqueAbility;
 
     /**
      * 创建时间
      */
+    @ApiModelProperty(hidden = true)
     @TableField("create_time")
     private String createTime;
 
     /**
      * 更新时间
      */
+    @ApiModelProperty(hidden = true)
     @TableField("update_time")
     private String updateTime;
 
+    @ApiModelProperty(value = "审批状态类型-字典value", dataType = "String")
+    @TableField(exist = false)
+    private String approvalStatusName;
 
+    @ApiModelProperty(value = "任务id（同意、驳回等操作使用）", dataType = "String")
+    @TableField(exist = false)
+    private String taskId;
+
+    @ApiModelProperty(value = "可选决策项（1同意驳回拒绝 2同意驳回 3同意拒绝，用于待审批列表同意/驳回/拒绝按钮展示）", dataType = "Integer")
+    @TableField(exist = false)
+    private Integer decisionItem;
+
+    @NotEmpty(message = "受检设备信息不能为空")
+    @ApiModelProperty(value = "受检设备id列表（新建使用参数）", dataType = "List")
+    @TableField(exist = false)
+    private List<OrderSampleDTO> orderSampleList;
+
+    @ExcelProperty(value = "分包机构名称", order = 3)
+    @ApiModelProperty(value = "分包机构名称（列表返回参数）", dataType = "String")
+    private String outsourcerName;
+
+    @ExcelProperty(value = "机构负责人", order = 4)
+    @ApiModelProperty(value = "机构负责人（列表返回参数）", dataType = "String")
+    private String director;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceProtocol.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceProtocol.java
new file mode 100644
index 0000000..38df697
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceProtocol.java
@@ -0,0 +1,225 @@
+package com.casic.missiles.model.business;
+
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
+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 com.casic.missiles.dto.BaseRequest;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotEmpty;
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 计量检定业务-分包管理-测试、校准或检定工作分包协议书
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-08-24
+ */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
+@Data
+@TableName("biz_business_outsource_protocol")
+public class BizBusinessOutsourceProtocol extends BaseRequest implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "id，更新/删除使用参数", dataType = "Long")
+    @TableId("id")
+    private Long id;
+
+    /**
+     * 协议书编号
+     */
+    @ExcelProperty(value = "协议书编号", order = 1)
+    @ApiModelProperty(value = "协议书编号(后台生成)", dataType = "String")
+    @TableField("protocol_no")
+    private String protocolNo;
+
+    /**
+     * 协议书名称
+     */
+    @ExcelProperty(value = "协议书名称", order = 2)
+    @ApiModelProperty(value = "协议书名称", dataType = "String")
+    @TableField("project_name")
+    private String projectName;
+
+    @NotEmpty(message = "实验室代码不能为空")
+    @DictCodeField(message = "实验室代码描述不合法", cacheName = MeterDictCode.LAB_CODE)
+    @ApiModelProperty(value = "实验室代码(字典code)", dataType = "String")
+    @TableField("lab_code")
+    private String labCode;
+
+    @ApiModelProperty(value = "实验室代码(字典value)", dataType = "String")
+    @TableField(exist = false)
+    private String labCodeName;
+
+    @NotEmpty(message = "组别代码不能为空")
+    @DictCodeField(message = "组别代码描述不合法", cacheName = MeterDictCode.GROUP_CODE)
+    @ApiModelProperty(value = "组别代码(字典code)", dataType = "String")
+    @TableField("group_code")
+    private String groupCode;
+
+    @ApiModelProperty(value = "组别代码(字典value)", dataType = "String")
+    @TableField(exist = false)
+    private String groupCodeName;
+
+    /**
+     * 分包方id
+     */
+    @ApiModelProperty(value = "分包方id", dataType = "Long")
+    @TableField("outsourcer_id")
+    private Long outsourcerId;
+
+    /**
+     * 其他
+     */
+    @ApiModelProperty(value = "其他", dataType = "String")
+    @TableField("remark")
+    private String remark;
+
+    /**
+     * 分包方编号
+     */
+    @ApiModelProperty(value = "分包方编号(新建不用传)", dataType = "String")
+    @TableField("outsource_no")
+    private String outsourceNo;
+
+    /**
+     * 分包方名称
+     */
+    @ExcelProperty(value = "分包方名称", order = 3)
+    @ApiModelProperty(value = "分包方名称(新建不用传)", dataType = "String")
+    @TableField("outsource_name")
+    private String outsourceName;
+
+    /**
+     * 联系人
+     */
+    @ExcelProperty(value = "联系人", order = 4)
+    @ApiModelProperty(value = "联系人", dataType = "String")
+    @TableField("contacts")
+    private String contacts;
+
+    /**
+     * 电话
+     */
+    @ApiModelProperty(value = "电话", dataType = "String")
+    @TableField("mobile")
+    private String mobile;
+
+    /**
+     * 地址
+     */
+    @ApiModelProperty(value = "地址", dataType = "String")
+    @TableField("address")
+    private String address;
+
+    /**
+     * 要求完成日期
+     */
+    @ApiModelProperty(value = "要求完成日期", dataType = "String")
+    @TableField("require_date")
+    private String requireDate;
+
+    /**
+     * 分包费用(元)
+     */
+    @ApiModelProperty(value = "分包费用(元)", dataType = "String")
+    @TableField("outsource_cost")
+    private Double outsourceCost;
+
+    /**
+     * 分包方负责人
+     */
+    @ApiModelProperty(value = "分包方负责人", dataType = "String")
+    @TableField("director")
+    private String director;
+
+    /**
+     * 分包项目
+     */
+    @ApiModelProperty(value = "分包项目", dataType = "String")
+    @TableField("item")
+    private String item;
+
+    /**
+     * 分包要求
+     */
+    @ApiModelProperty(value = "分包要求", dataType = "String")
+    @TableField("requires")
+    private String requires;
+
+    /**
+     * 创建人id
+     */
+    @ApiModelProperty(hidden = true)
+    @TableField("create_user_id")
+    private Long createUserId;
+
+    /**
+     * 创建人名字
+     */
+    @ExcelProperty(value = "申请人", order = 5)
+    @ApiModelProperty(value = "申请人", dataType = "String")
+    @TableField("create_user_name")
+    private String createUserName;
+
+    /**
+     * 审批状态
+     */
+    @ApiModelProperty(value = "审批状态", dataType = "String")
+    @DictCodeField(message = "审批状态描述不合法", cacheName = MeterDictCode.APPROVAL_STATUS)
+    @TableField("approval_status")
+    private String approvalStatus;
+
+    /**
+     * 流程实例id
+     */
+    @ApiModelProperty(value = "流程实例id", dataType = "String")
+    @TableField("process_id")
+    private String processId;
+
+    /**
+     * 创建时间
+     */
+    @ExcelProperty(value = "申请时间", order = 6)
+    @ApiModelProperty(value = "申请时间", dataType = "String")
+    @TableField("create_time")
+    private String createTime;
+
+    /**
+     * 更新时间
+     */
+    @ApiModelProperty(hidden = true)
+    @TableField("update_time")
+    private String updateTime;
+
+    @ApiModelProperty(value = "审批状态类型-字典value", dataType = "String")
+    @TableField(exist = false)
+    private String approvalStatusName;
+
+    @ApiModelProperty(value = "任务id（同意、驳回等操作使用）", dataType = "String")
+    @TableField(exist = false)
+    private String taskId;
+
+    @ApiModelProperty(value = "可选决策项（1同意驳回拒绝 2同意驳回 3同意拒绝，用于待审批列表同意/驳回/拒绝按钮展示）", dataType = "Integer")
+    @TableField(exist = false)
+    private Integer decisionItem;
+
+
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourcerInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourcerInfo.java
index ec4e997..f9aa69e 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourcerInfo.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourcerInfo.java
@@ -17,6 +17,7 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import javax.validation.constraints.NotEmpty;
 import java.io.Serializable;
 
 /**
@@ -59,6 +60,29 @@
     @TableField("outsourcer_name")
     private String outsourcerName;
 
+    @NotEmpty(message = "实验室代码不能为空")
+    @DictCodeField(message = "实验室代码描述不合法", cacheName = MeterDictCode.LAB_CODE)
+    @ApiModelProperty(value = "实验室代码(字典code)", dataType = "String")
+    @TableField("lab_code")
+    private String labCode;
+
+    @ApiModelProperty(value = "实验室代码(字典value)", dataType = "String")
+    @TableField(exist = false)
+    private String labCodeName;
+
+    /**
+     * 组别代码
+     */
+    @NotEmpty(message = "组别代码不能为空")
+    @DictCodeField(message = "组别代码描述不合法", cacheName = MeterDictCode.GROUP_CODE)
+    @ApiModelProperty(value = "组别代码(字典code)", dataType = "String")
+    @TableField("group_code")
+    private String groupCode;
+
+    @ApiModelProperty(value = "组别代码(字典value)", dataType = "String")
+    @TableField(exist = false)
+    private String groupCodeName;
+
     /**
      * 单位简称
      */
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardInfo.java
index c48eed7..dffdfdd 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardInfo.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardInfo.java
@@ -5,6 +5,7 @@
 import com.baomidou.mybatisplus.annotation.TableName;
 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;
 
@@ -18,6 +19,7 @@
  * @author wangpeng
  * @since 2023-08-04
  */
+@ApiModel
 @Data
 @TableName("biz_equipment_standard_info")
 public class BizEquipmentStandardInfo implements Serializable {
@@ -119,7 +121,7 @@
      * 管理状态(字典code)
      */
     @ApiModelProperty(value = "管理状态(字典code)", dataType = "String")
-    @DictCodeField(message = "管理状态不合法", cacheName = MeterDictCode.MANAGER_STATE)
+    @DictCodeField(message = "管理状态不合法", cacheName = MeterDictCode.STANDARD_MANAGER_STATE)
     @TableField("manage_status")
     private String manageStatus;
 
@@ -151,7 +153,7 @@
     /**
      * 温度(℃)
      */
-    @ApiModelProperty(value = "使用状态(字典code)", dataType = "String")
+    @ApiModelProperty(value = "温度(℃)", dataType = "String")
     @TableField("temperature")
     private Double temperature;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardInfoApproval.java b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardInfoApproval.java
index dbd86ab..9f58d83 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardInfoApproval.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardInfoApproval.java
@@ -150,7 +150,7 @@
      * 管理状态(字典code)
      */
     @ApiModelProperty(value = "管理状态(字典code)", dataType = "String")
-    @DictCodeField(message = "管理状态不合法", cacheName = MeterDictCode.MANAGER_STATE)
+    @DictCodeField(message = "管理状态不合法", cacheName = MeterDictCode.STANDARD_MANAGER_STATE)
     @TableField("manage_status")
     private String manageStatus;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardTechnologyRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardTechnologyRelation.java
index 0e612bd..751f26b 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardTechnologyRelation.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardTechnologyRelation.java
@@ -3,6 +3,7 @@
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -16,6 +17,7 @@
  * @author wangpeng
  * @since 2023-08-04
  */
+@ApiModel
 @Data
 @TableName("biz_equipment_standard_technology_relation")
 public class BizEquipmentStandardTechnologyRelation implements Serializable {
@@ -33,6 +35,10 @@
     @TableField("technology_file_id")
     private Long technologyFileId;
 
+    @ApiModelProperty(value = "依据的技术文件编号", dataType = "String")
+    @TableField("technology_file_no")
+    private String technologyFileNo;
+
     /**
      * 依据的技术文件名称(技术文件中现行测试校准检定方法表文件名字段)
      */
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerInfo.java
index d6e8bed..65cd6bc 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerInfo.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerInfo.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.model.resource;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -21,6 +28,11 @@
  * @author wangpeng
  * @since 2023-08-08
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @ApiModel
 @Data
 @TableName("biz_resource_customer_info")
@@ -35,6 +47,7 @@
     /**
      * 委托方编号
      */
+    @ExcelProperty(value = "委托方编号", order = 1)
     @ApiModelProperty(value = "委托方编号", dataType = "String")
     @TableField("customer_no")
     private String customerNo;
@@ -42,6 +55,7 @@
     /**
      * 委托方名称
      */
+    @ExcelProperty(value = "委托方名称", order = 2)
     @ApiModelProperty(value = "委托方名称(新建时为下拉选择一个受检单位组织的名字，传deptId字段，后端获取名称)", dataType = "String")
     @TableField("customer_name")
     private String customerName;
@@ -63,6 +77,7 @@
     /**
      * 联系人
      */
+    @ExcelProperty(value = "联系人", order = 3)
     @ApiModelProperty(value = "联系人", dataType = "String")
     @TableField("contacts")
     private String contacts;
@@ -70,6 +85,7 @@
     /**
      * 座机电话
      */
+    @ExcelProperty(value = "座机电话", order = 4)
     @ApiModelProperty(value = "座机电话", dataType = "String")
     @TableField("mobile")
     private String mobile;
@@ -77,6 +93,7 @@
     /**
      * 手机号码
      */
+    @ExcelProperty(value = "手机号码", order = 5)
     @ApiModelProperty(value = "手机号码", dataType = "String")
     @TableField("phone")
     private String phone;
@@ -91,6 +108,7 @@
     /**
      * 地址
      */
+    @ExcelProperty(value = "地址", order = 6)
     @ApiModelProperty(value = "地址", dataType = "String")
     @TableField("address")
     private String address;
@@ -141,6 +159,7 @@
     /**
      * 创建时间
      */
+    @ExcelProperty(value = "创建时间", order = 7)
     @ApiModelProperty(value = "创建时间", dataType = "String")
     @TableField("create_time")
     private String createTime;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerSuggestForm.java b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerSuggestForm.java
index 7201bbd..701bf8b 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerSuggestForm.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerSuggestForm.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.model.resource;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -22,6 +29,11 @@
  * @author wangpeng
  * @since 2023-08-08
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @ApiModel
 @Data
 @TableName("biz_resource_customer_suggest_form")
@@ -44,7 +56,8 @@
     /**
      * 委托方名称
      */
-    @ApiModelProperty(value = "委托方名称", dataType = "String")
+    @ExcelProperty(value = "意见反馈单位", order = 2)
+    @ApiModelProperty(value = "意见反馈单位", dataType = "String")
     @TableField("customer_name")
     private String customerName;
 
@@ -59,7 +72,8 @@
     /**
      * 委托方意见反馈部门名称
      */
-    @ApiModelProperty(value = "委托方意见反馈部门名称", dataType = "String")
+    @ExcelProperty(value = "委托方意见反馈部门", order = 3)
+    @ApiModelProperty(value = "委托方意见反馈部门", dataType = "String")
     @TableField("customer_dept_name")
     private String customerDeptName;
 
@@ -73,6 +87,7 @@
     /**
      * 表单编号
      */
+    @ExcelProperty(value = "表单编号", order = 1)
     @ApiModelProperty(value = "表单编号", dataType = "String")
     @TableField("form_no")
     private String formNo;
@@ -111,6 +126,7 @@
     /**
      * 创建人名字
      */
+    @ExcelProperty(value = "创建人", order = 4)
     @ApiModelProperty(value = "创建人名字", dataType = "String")
     @TableField("create_user_name")
     private String createUserName;
@@ -147,6 +163,7 @@
     /**
      * 创建时间
      */
+    @ExcelProperty(value = "创建时间", order = 5)
     @ApiModelProperty(value = "创建时间", dataType = "String")
     @TableField("create_time")
     private String createTime;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSealInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSealInfo.java
index cbf05d7..9bf389d 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSealInfo.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSealInfo.java
@@ -106,6 +106,10 @@
     @TableField("minio_file_name")
     private String minioFileName;
 
+    @ApiModelProperty(value = "minio存储文件url", dataType = "String")
+    @TableField(exist = false)
+    private String minioFileUrl;
+
     @ApiModelProperty(value = "创建时间", dataType = "String")
     @TableField("create_time")
     private String createTime;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSealUseNote.java b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSealUseNote.java
index 3f2d9e8..3ce16a8 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSealUseNote.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSealUseNote.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.model.resource;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -20,6 +27,11 @@
  * @author wangpeng
  * @since 2023-07-28
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @ApiModel
 @Data
 @TableName("biz_resource_seal_use_note")
@@ -34,6 +46,7 @@
     /**
      * 登记表编号
      */
+    @ExcelProperty(value = "申请单编号", order = 1)
     @ApiModelProperty(value = "登记表编号(自动生成)", dataType = "String")
     @TableField("note_form_no")
     private String noteFormNo;
@@ -55,6 +68,7 @@
     /**
      * 申请部门
      */
+    @ExcelProperty(value = "申请部门", order = 5)
     @ApiModelProperty(value = "申请部门", dataType = "String")
     @TableField("apply_dept_name")
     private String applyDeptName;
@@ -69,6 +83,7 @@
     /**
      * 申请人
      */
+    @ExcelProperty(value = "申请人", order = 6)
     @ApiModelProperty(value = "申请人", dataType = "String")
     @TableField("apply_user_name")
     private String applyUserName;
@@ -76,6 +91,7 @@
     /**
      * 申请时间
      */
+    @ExcelProperty(value = "申请时间", order = 7)
     @ApiModelProperty(value = "申请时间(新增自动获取当前时间)", dataType = "String")
     @TableField("apply_time")
     private String applyTime;
@@ -130,6 +146,26 @@
     @TableField("update_time")
     private String updateTime;
 
+    @ExcelProperty(value = "印章名称", order = 2)
+    @ApiModelProperty(value = "印章名称(列表返回参数)", dataType = "String")
+    @TableField(exist = false)
+    private String sealName;
+
+    @DictCodeField(message = "印章类型描述不合法", cacheName = MeterDictCode.SEAL_TYPE)
+    @ApiModelProperty(hidden = true)
+    @TableField(exist = false)
+    private String sealType;
+
+    @ExcelProperty(value = "印章类型", order = 3)
+    @ApiModelProperty(value = "印章类型(列表返回参数)", dataType = "String")
+    @TableField(exist = false)
+    private String sealTypeName;
+
+    @ExcelProperty(value = "批准人", order = 4)
+    @ApiModelProperty(value = "批准人(列表返回参数)", dataType = "String")
+    @TableField(exist = false)
+    private String approverName;
+
     @ApiModelProperty(value = "审批状态类型-字典value", dataType = "String")
     @TableField(exist = false)
     private String approvalStatusName;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceStaffInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceStaffInfo.java
index 5ef995b..41563a1 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceStaffInfo.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceStaffInfo.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.model.resource;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -20,6 +27,11 @@
  * @author wangpeng
  * @since 2023-07-25
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @ApiModel
 @Data
 @TableName("biz_resource_staff_info")
@@ -38,6 +50,7 @@
     /**
      * 人员编号
      */
+    @ExcelProperty(value = "人员编号",order = 0)
     @NotEmpty(message = "人员编号不能为空")
     @ApiModelProperty(value = "人员编号", dataType = "String")
     @TableField("staff_no")
@@ -46,6 +59,7 @@
     /**
      * 姓名
      */
+    @ExcelProperty(value = "姓名",order = 1)
     @ApiModelProperty(value = "姓名", dataType = "String")
     @TableField("staff_name")
     private String staffName;
@@ -152,13 +166,15 @@
     /**
      * 部门名字
      */
-    @ApiModelProperty(value = "部门名字", dataType = "String")
+    @ExcelProperty(value = "工作部门",order = 4)
+    @ApiModelProperty(value = "工作部门", dataType = "String")
     @TableField("dept_name")
     private String deptName;
 
     /**
      * 岗位
      */
+    @ExcelProperty(value = "岗位",order = 2)
     @ApiModelProperty(value = "岗位", dataType = "String")
     @TableField("station")
     private String station;
@@ -166,6 +182,7 @@
     /**
      * 计量专业
      */
+    @ExcelProperty(value = "计量专业",order = 5)
     @ApiModelProperty(value = "计量专业", dataType = "String")
     @TableField("major")
     private String major;
@@ -173,6 +190,7 @@
     /**
      * 证号
      */
+    @ExcelProperty(value = "证号",order = 3)
     @ApiModelProperty(value = "证号", dataType = "String")
     @TableField("certificate_number")
     private String certificateNumber;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSupplierInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSupplierInfo.java
index eb5ef01..a1e2697 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSupplierInfo.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSupplierInfo.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.model.resource;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -20,6 +27,11 @@
  * @author wangpeng
  * @since 2023-07-27
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @ApiModel
 @Data
 @TableName("biz_resource_supplier_info")
@@ -34,6 +46,7 @@
     /**
      * 供方编号
      */
+    @ExcelProperty(value = "供方编号", order = 1)
     @ApiModelProperty(value = "供方编号(自动生成)", dataType = "String")
     @TableField("supplier_no")
     private String supplierNo;
@@ -41,6 +54,7 @@
     /**
      * 供方名称
      */
+    @ExcelProperty(value = "供方名称", order = 2)
     @ApiModelProperty(value = "供方名称", dataType = "String")
     @TableField("supplier_name")
     private String supplierName;
@@ -60,6 +74,7 @@
     @TableField("supplier_type")
     private String supplierType;
 
+    @ExcelProperty(value = "供方类型", order = 3)
     @ApiModelProperty(value = "供方类型(字典value)", dataType = "String")
     @TableField(exist = false)
     private String supplierTypeName;
@@ -109,7 +124,8 @@
     /**
      * 电话
      */
-    @ApiModelProperty(value = "电话", dataType = "String")
+    @ExcelProperty(value = "联系电话", order = 4)
+    @ApiModelProperty(value = "联系电话", dataType = "String")
     @TableField("phone")
     private String phone;
 
@@ -158,6 +174,7 @@
     /**
      * 公司地址-省
      */
+    @ExcelProperty(value = "地址-省", order = 6)
     @ApiModelProperty(value = "公司地址-省", dataType = "String")
     @TableField("company_province_name")
     private String companyProvinceName;
@@ -172,6 +189,7 @@
     /**
      * 公司地址-市
      */
+    @ExcelProperty(value = "地址-市", order = 7)
     @ApiModelProperty(value = "公司地址-市", dataType = "String")
     @TableField("company_city_name")
     private String companyCityName;
@@ -186,6 +204,7 @@
     /**
      * 公司地址-区
      */
+    @ExcelProperty(value = "地址-区", order = 8)
     @ApiModelProperty(value = "公司地址-区", dataType = "String")
     @TableField("company_area_name")
     private String companyAreaName;
@@ -193,6 +212,7 @@
     /**
      * 公司地址-详细地址
      */
+    @ExcelProperty(value = "地址-详细地址", order = 9)
     @ApiModelProperty(value = "公司地址-详细地址", dataType = "String")
     @TableField("company_address")
     private String companyAddress;
@@ -200,6 +220,7 @@
     /**
      * 服务和供应的内容
      */
+    @ExcelProperty(value = "服务和供应的内容", order = 5)
     @ApiModelProperty(value = "服务和供应的内容", dataType = "String")
     @TableField("supplier_content")
     private String supplierContent;
@@ -250,6 +271,7 @@
     /**
      * 创建时间
      */
+    @ExcelProperty(value = "创建时间", order = 9)
     @ApiModelProperty(value = "创建时间", dataType = "String")
     @TableField("create_time")
     private String createTime;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/EnvLocationInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/EnvLocationInfo.java
new file mode 100644
index 0000000..d8e2d7b
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/EnvLocationInfo.java
@@ -0,0 +1,83 @@
+package com.casic.missiles.model.resource;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotEmpty;
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 实验室环境监控系统-设备表
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-06-07
+ */
+@ApiModel
+@Data
+@TableName("env_location_info")
+public class EnvLocationInfo implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "主键id", dataType = "Long")
+    @TableId("id")
+    private Long id;
+
+    /**
+     * 地点编号
+     */
+    @NotEmpty(message = "地点编号不能为空")
+    @ApiModelProperty(value = "地点编号", dataType = "String")
+    @TableField("location_no")
+    private String locationNo;
+
+    /**
+     * 地点名称
+     */
+    @ApiModelProperty(value = "地点名称", dataType = "String")
+    @TableField("location_name")
+    private String locationName;
+
+    /**
+     * 地点位置
+     */
+    @ApiModelProperty(value = "地点位置", dataType = "String")
+    @TableField("location_position")
+    private String locationPosition;
+
+    /**
+     * 创建人id
+     */
+    @ApiModelProperty(value = "创建人id", dataType = "Long")
+    @TableField("create_user_id")
+    private Long createUserId;
+
+    /**
+     * 创建人
+     */
+    @ApiModelProperty(value = "创建人", dataType = "String")
+    @TableField("create_user")
+    private String createUser;
+
+    /**
+     * 创建时间
+     */
+    @ApiModelProperty(value = "创建时间", dataType = "String")
+    @TableField("create_time")
+    private String createTime;
+
+    /**
+     * 更新时间
+     */
+    @ApiModelProperty(value = "更新时间", dataType = "String")
+    @TableField("update_time")
+    private String updateTime;
+
+
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemFileConfig.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemFileConfig.java
index 19e6845..86e569c 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemFileConfig.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemFileConfig.java
@@ -30,7 +30,7 @@
     @ApiModelProperty(value = "系统类别(1业务系统2受检系统3环境系统)", dataType = "Integer")
     @NotNull(message = "系统类别不能为空")
     @TableField("system_type")
-    private Integer systemType;
+    private Integer systemType = 1;
 
     @ApiModelProperty("下载编号")
     @TableField("download_no")
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemNotice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemNotice.java
index e94297d..06ec37d 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemNotice.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemNotice.java
@@ -34,7 +34,7 @@
     @ApiModelProperty(value = "系统类别(1业务系统2受检系统3环境系统)", dataType = "Integer")
     @NotNull(message = "系统类别不能为空")
     @TableField("system_type")
-    private Integer systemType;
+    private Integer systemType = 1;
 
     /**
      * 通知公告编号
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSign.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSign.java
index 6c0d7c9..954f4f8 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSign.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSign.java
@@ -51,7 +51,7 @@
     @ApiModelProperty(value = "系统类别(1业务系统2受检系统3环境系统)", dataType = "Integer")
     @NotNull(message = "系统类别不能为空")
     @TableField("system_type")
-    private Integer systemType;
+    private Integer systemType = 1;
 
     /**
      * 签名编号
@@ -130,4 +130,8 @@
     @TableField(exist = false)
     private List<Long> userIdList;
 
+    @ApiModelProperty(hidden = true)
+    @TableField(exist = false)
+    private String deptName;
+
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemTemplate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemTemplate.java
index 503a457..1d27ebe 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemTemplate.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemTemplate.java
@@ -47,7 +47,7 @@
     @ApiModelProperty(value = "系统类别(1业务系统2受检系统3环境系统)", dataType = "Integer")
     @NotNull(message = "系统类别不能为空")
     @TableField("system_type")
-    private Integer systemType;
+    private Integer systemType = 1;
 
     /**
      * 模板编号
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java
index 8c21cb0..f61e4a8 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java
@@ -32,4 +32,8 @@
     ReturnDTO approvalDelete(ApprovalDeleteRequest request);
 
     ReturnDTO failUpdate(T request);
+
+    List<O> listExport(R request);
+
+    List<O> listExportByIds(List<Long> ids);
 }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java
index 724166f..9bce15b 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java
@@ -157,6 +157,29 @@
         throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
     }
 
+    @Override
+    public List<O> listExport(R request) {
+        request.setCreateUserId(null);
+        request.setApprovalStatus(ApprovalStatusEnum.PASSED);
+        Page<O> page = PageFactory.defaultPage();
+        page.setCurrent(1);
+        page.setSearchCount(false);
+        page.setSize(Integer.MAX_VALUE);
+        Page<O> resultPage = this.baseMapper.selectBatchForApprovalList(page, request, null);
+        return resultPage.getRecords();
+    }
+
+    @Override
+    public List<O> listExportByIds(List<Long> ids) {
+        Page<O> page = PageFactory.defaultPage();
+        page.setCurrent(1);
+        page.setSearchCount(false);
+        page.setSize(Integer.MAX_VALUE);
+        List<String> businessKeys = ids.stream().map(String::valueOf).collect(Collectors.toList());
+        Page<O> resultPage = this.baseMapper.selectBatchForApprovalList(page, null, businessKeys);
+        return resultPage.getRecords();
+    }
+
     protected ReturnDTO updateApprovalStatus(Long id, String processId, String approvalStatus) {
         UpdateWrapper<T> updateWrapper = new UpdateWrapper<>();
         updateWrapper.eq("id", id);
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificatePrintServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificatePrintServiceImpl.java
index f6e4706..3228497 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificatePrintServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificatePrintServiceImpl.java
@@ -162,6 +162,30 @@
         return ReturnUtil.success(printLogMapper.selectList(wrapper));
     }
 
+    @Override
+    public List<CertificatePrintListResponse> listByIds(List<Long> ids) {
+        Page<CertificatePrintListResponse> page = PageFactory.defaultPage();
+        page.setCurrent(1);
+        page.setSearchCount(false);
+        page.setSize(Integer.MAX_VALUE);
+        List<String> businessKeys = ids.stream().map(String::valueOf).collect(Collectors.toList());
+        Page<CertificatePrintListResponse> resultPage = this.baseMapper.selectBatchForApprovalList(page, null, businessKeys);
+        return resultPage.getRecords();
+    }
+
+    @Override
+    public List<CertificatePrintListResponse> list(CertificatePrintApprovalListRequest request) {
+        request.setCreateUserId(null);
+        request.setApprovalStatus(null);
+        request.setPrintStatus(null);
+        Page<CertificatePrintListResponse> page = PageFactory.defaultPage();
+        page.setCurrent(1);
+        page.setSearchCount(false);
+        page.setSize(Integer.MAX_VALUE);
+        Page<CertificatePrintListResponse> resultPage = certificatePrintMapper.selectBatchForApprovalList(page, request, null);
+        return resultPage.getRecords();
+    }
+
     private void savePrintLog(Long id) {
         BizBusinessCertificatePrintLog printLog = new BizBusinessCertificatePrintLog();
         BizBusinessCertificatePrint certificatePrint = certificatePrintMapper.selectById(id);
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificateReportServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificateReportServiceImpl.java
index 457555f..24146be 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificateReportServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificateReportServiceImpl.java
@@ -158,8 +158,8 @@
         QueryWrapper<BizBusinessCertificateMeasureResultData> mWrapper = new QueryWrapper<>();
         mWrapper.eq("report_id", reportId);
         boolean mRemove = certificateMeasureResultDataService.remove(mWrapper);
-        Assert.isFalse(eRemove || mRemove, () -> {
+        if(!eRemove || !mRemove){
             throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
-        });
+        }
     }
 }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessIdentifyInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessIdentifyInfoServiceImpl.java
index 4c8e190..f7e63ca 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessIdentifyInfoServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessIdentifyInfoServiceImpl.java
@@ -1,8 +1,10 @@
 package com.casic.missiles.service.Impl.business;
 
+import cn.hutool.core.date.DateUtil;
 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.core.page.PageFactory;
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.business.identify.IdentifyListRequest;
@@ -14,11 +16,14 @@
 import com.casic.missiles.service.business.IBizBusinessIdentifyInfoService;
 import com.casic.missiles.utils.DictCodeUtils;
 import com.casic.missiles.utils.NumberGeneratorUtil;
+import com.casic.missiles.utils.QRCodeUtil;
 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.List;
+
 /**
  * <p>
  * 计量检定业务-任务计量管理-标识打印 服务实现类
@@ -35,9 +40,9 @@
     @Override
     public Page<BizBusinessIdentifyInfo> identifyListPage(Page<BizBusinessIdentifyInfo> page, IdentifyListRequest request) throws Exception {
         QueryWrapper<BizBusinessIdentifyInfo> wrapper = new QueryWrapper<>();
-        wrapper.eq("identify_type", request.getIdentifyType());
-        wrapper.like("device_no", request.getDeviceNo());
-        wrapper.like("device_name", request.getDeviceName());
+        wrapper.eq(StringUtils.isNotEmpty(request.getIdentifyType()), "identify_type", request.getIdentifyType());
+        wrapper.like(StringUtils.isNotEmpty(request.getDeviceNo()),"device_no", request.getDeviceNo());
+        wrapper.like(StringUtils.isNotEmpty(request.getDeviceName()), "device_name", request.getDeviceName());
         wrapper.apply(StringUtils.isNotBlank(request.getCreateTimeStart()),
                 "{0} <= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getCreateTimeStart().split(" ")[0]);
         wrapper.apply(StringUtils.isNotBlank(request.getCreateTimeEnd()),
@@ -64,8 +69,11 @@
     }
 
     @Override
-    public ReturnDTO updateIdentify(BizBusinessIdentifyInfo identifyInfo) {
-        if(identifyInfoMapper.updateById(identifyInfo) > 0){
+    public ReturnDTO updateIdentify(Long id) {
+        BizBusinessIdentifyInfo info = new BizBusinessIdentifyInfo();
+        info.setId(id);
+        info.setUpdateTime(DateUtil.now());
+        if(identifyInfoMapper.updateById(info) > 0){
             return ReturnUtil.success();
         }
         throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
@@ -79,4 +87,20 @@
         throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
     }
 
+    @Override
+    public List<BizBusinessIdentifyInfo> list(IdentifyListRequest request) throws Exception {
+        Page<BizBusinessIdentifyInfo> page = PageFactory.defaultPage();
+        page.setCurrent(1);
+        page.setSearchCount(false);
+        page.setSize(Integer.MAX_VALUE);
+        Page<BizBusinessIdentifyInfo> resultPage = this.identifyListPage(page, request);
+        return resultPage.getRecords();
+    }
+
+    @Override
+    public ReturnDTO<String> equipmentQrCode(Long id) {
+        String base64QRCode = QRCodeUtil.getBase64QRCode(String.valueOf(id));
+        return ReturnUtil.success(base64QRCode);
+    }
+
 }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOrderInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOrderInfoServiceImpl.java
index 82952ad..d8d2c6a 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOrderInfoServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOrderInfoServiceImpl.java
@@ -35,6 +35,7 @@
 import javax.servlet.http.HttpServletResponse;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 import java.util.stream.Collectors;
 
 /**
@@ -209,13 +210,16 @@
     private QueryWrapper<OrderListResponse> listParamWrapperBuilder(OrderListRequest request) {
         QueryWrapper<OrderListResponse> wrapper = new QueryWrapper<>();
         wrapper.like(StringUtils.isNotBlank(request.getOrderNo()), "order_no", request.getOrderNo());
+        wrapper.like(Objects.nonNull(request.getCustomerId()), "customer_id", request.getCustomerId());
         wrapper.like(StringUtils.isNotBlank(request.getCustomerName()), "customer_name", request.getCustomerName());
         wrapper.like(StringUtils.isNotBlank(request.getDeliverer()), "deliverer", request.getDeliverer());
         wrapper.like(StringUtils.isNotBlank(request.getCreateUserName()), "create_user_name", request.getCreateUserName());
-        wrapper.apply(StringUtils.isNotBlank(request.getCreateStartTime()),
-                "{0} <= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getCreateStartTime().split(" ")[0]);
-        wrapper.apply(StringUtils.isNotBlank(request.getCreateEndTime()),
-                "{0} >= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getCreateEndTime().split(" ")[0]);
+        if(StringUtils.isNotBlank(request.getCreateStartTime())){
+            wrapper.apply("{0} <= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getCreateStartTime().split(" ")[0]);
+        }
+        if(StringUtils.isNotBlank(request.getCreateEndTime())){
+            wrapper.apply("{0} >= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getCreateEndTime().split(" ")[0]);
+        }
         wrapper.orderByDesc("create_time");
         return wrapper;
     }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceAssessServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceAssessServiceImpl.java
index c6af980..ce40138 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceAssessServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceAssessServiceImpl.java
@@ -1,10 +1,33 @@
 package com.casic.missiles.service.Impl.business;
 
-import com.casic.missiles.model.business.BizBusinessOutsourceAssess;
+import cn.hutool.core.lang.Assert;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.casic.missiles.core.model.auth.AuthUser;
+import com.casic.missiles.core.shiro.ShiroKit;
+import com.casic.missiles.dto.BaseApprovalSubmitRequest;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.ReturnUtil;
+import com.casic.missiles.dto.business.outsource.OutsourceAssessApprovalListRequest;
+import com.casic.missiles.dto.business.outsource.OutsourceAssessSaveResponse;
+import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.NoGenerateFileCodeEnum;
+import com.casic.missiles.enums.NoGenerateRecordTypeCodeEnum;
+import com.casic.missiles.enums.system.ApprovalStatusEnum;
+import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.mapper.business.BizBusinessOutsourceAssessMapper;
+import com.casic.missiles.model.business.BizBusinessOutsourceAssess;
+import com.casic.missiles.model.business.BizBusinessOutsourceAssessSampleRelation;
+import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl;
+import com.casic.missiles.service.business.IBizBusinessOutsourceAssessSampleRelationService;
 import com.casic.missiles.service.business.IBizBusinessOutsourceAssessService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.casic.missiles.utils.NoGeneratorUtil;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Objects;
 
 /**
  * <p>
@@ -15,6 +38,103 @@
  * @since 2023-08-16
  */
 @Service
-public class BizBusinessOutsourceAssessServiceImpl extends ServiceImpl<BizBusinessOutsourceAssessMapper, BizBusinessOutsourceAssess> implements IBizBusinessOutsourceAssessService {
+public class BizBusinessOutsourceAssessServiceImpl extends GeneralApprovalServiceImpl<BizBusinessOutsourceAssessMapper, BizBusinessOutsourceAssess, BizBusinessOutsourceAssess, OutsourceAssessApprovalListRequest, BaseApprovalSubmitRequest> implements IBizBusinessOutsourceAssessService {
+    @Autowired
+    private IBizBusinessOutsourceAssessSampleRelationService outsourceAssessSampleRelationService;
 
+    @Override
+    public ReturnDTO<OutsourceAssessSaveResponse> saveOutsourceAssess(BizBusinessOutsourceAssess request) {
+        //生成编号
+        String labCode = request.getLabCode();
+        String groupCode = request.getGroupCode();
+        Long maxNo = this.baseMapper.selectMaxProjectNo();
+        String projectNo = NoGeneratorUtil.getCode(NoGenerateFileCodeEnum.D, labCode, NoGenerateRecordTypeCodeEnum.OUTSOURCE_ACCESS, groupCode, maxNo);
+        request.setCreateUserId(request.getUserId());
+        request.setCreateUserName(request.getUserName());
+        request.setApprovalStatus(ApprovalStatusEnum.DRAFT); //草稿箱状态
+        request.setProjectNo(projectNo);
+        int row = this.baseMapper.insert(request);
+        Assert.isFalse(row <= 0, () -> {
+            throw new BusinessException(BusinessExceptionEnum.OUTSOURCE_ACCESS_SAVE_FAILED);
+        });
+        //关联表
+        saveRelationData(request);
+        OutsourceAssessSaveResponse saveResponse = new OutsourceAssessSaveResponse();
+        saveResponse.setId(request.getId());
+        saveResponse.setProjectNo(projectNo);
+        return ReturnUtil.success(saveResponse);
+    }
+
+    @Override
+    @Transactional
+    public ReturnDTO draftUpdate(BizBusinessOutsourceAssess request) {
+        if (this.baseMapper.updateById(request) > 0) {
+            //关联表删除、增加
+            removeRelationData(request.getId());
+            saveRelationData(request);
+            return ReturnUtil.success();
+        }
+        throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
+    }
+
+    @Override
+    public ReturnDTO draftDelete(Long id) {
+        if (this.baseMapper.deleteById(id) > 0) {
+            //关联表删除
+            removeRelationData(id);
+            return ReturnUtil.success();
+        }
+        throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
+    }
+
+    @Override
+    public ReturnDTO draftBatchDelete(List<Long> ids) {
+        if (this.baseMapper.deleteBatchIds(ids) >= 0) {
+            ids.forEach(id -> removeRelationData(id));
+            return ReturnUtil.success();
+        }
+        throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
+    }
+
+    @Override
+    @Transactional
+    public ReturnDTO failUpdate(BizBusinessOutsourceAssess request) {
+        AuthUser user = ShiroKit.getUser();
+        Assert.isFalse(Objects.isNull(user), () -> {
+            throw new BusinessException(BusinessExceptionEnum.LOGIN_USER_ACQUIRE_FAILED);
+        });
+        request.setApprovalStatus(ApprovalStatusEnum.IN_APPROVED);
+        if (this.baseMapper.updateById(request) > 0) {
+            //关联表删除、增加
+            removeRelationData(request.getId());
+            saveRelationData(request);
+            baseApprovalService.failUpdate(request.getProcessId());
+            return ReturnUtil.success();
+        }
+        throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
+    }
+
+    private void saveRelationData(BizBusinessOutsourceAssess request) {
+        List<BizBusinessOutsourceAssessSampleRelation> sampleRelations = new ArrayList<>();
+        request.getOrderSampleList().forEach(dto -> {
+            BizBusinessOutsourceAssessSampleRelation relation = new BizBusinessOutsourceAssessSampleRelation();
+            relation.setOrderId(dto.getOrderId());
+            relation.setSampleId(dto.getSampleId());
+            relation.setAccessId(request.getId());
+            sampleRelations.add(relation);
+        });
+        if(outsourceAssessSampleRelationService.saveBatch(sampleRelations)){
+            return;
+        }
+        throw new BusinessException(BusinessExceptionEnum.OUTSOURCE_ACCESS_SAVE_FAILED);
+    }
+
+    private void removeRelationData(Long assessId) {
+        QueryWrapper<BizBusinessOutsourceAssessSampleRelation> wrapper = new QueryWrapper<>();
+        wrapper.eq("access_id", assessId);
+        if(outsourceAssessSampleRelationService.remove(wrapper)){
+            return;
+        }
+        throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
+    }
 }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceProtocolServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceProtocolServiceImpl.java
new file mode 100644
index 0000000..821e728
--- /dev/null
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceProtocolServiceImpl.java
@@ -0,0 +1,60 @@
+package com.casic.missiles.service.Impl.business;
+
+import cn.hutool.core.lang.Assert;
+import com.casic.missiles.dto.BaseApprovalSubmitRequest;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.ReturnUtil;
+import com.casic.missiles.dto.business.outsource.OutsourceProtocolApprovalListRequest;
+import com.casic.missiles.dto.business.outsource.OutsourceProtocolSaveResponse;
+import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.NoGenerateFileCodeEnum;
+import com.casic.missiles.enums.NoGenerateRecordTypeCodeEnum;
+import com.casic.missiles.enums.system.ApprovalStatusEnum;
+import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.mapper.business.BizBusinessOutsourceProtocolMapper;
+import com.casic.missiles.mapper.business.BizBusinessOutsourcerInfoMapper;
+import com.casic.missiles.model.business.BizBusinessOutsourceProtocol;
+import com.casic.missiles.model.business.BizBusinessOutsourcerInfo;
+import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl;
+import com.casic.missiles.service.business.IBizBusinessOutsourceProtocolService;
+import com.casic.missiles.utils.NoGeneratorUtil;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 计量检定业务-分包管理-测试、校准或检定工作分包协议书 服务实现类
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-08-24
+ */
+@Service
+public class BizBusinessOutsourceProtocolServiceImpl extends GeneralApprovalServiceImpl<BizBusinessOutsourceProtocolMapper, BizBusinessOutsourceProtocol, BizBusinessOutsourceProtocol, OutsourceProtocolApprovalListRequest, BaseApprovalSubmitRequest> implements IBizBusinessOutsourceProtocolService {
+    @Autowired
+    private BizBusinessOutsourcerInfoMapper outsourcerInfoMapper;
+
+    @Override
+    public ReturnDTO<OutsourceProtocolSaveResponse> saveOutsourceProtocol(BizBusinessOutsourceProtocol request) {
+        //生成编号
+        String labCode = request.getLabCode();
+        String groupCode = request.getGroupCode();
+        Long maxNo = this.baseMapper.selectMaxProtocolNo();
+        String protocolNo = NoGeneratorUtil.getCode(NoGenerateFileCodeEnum.D, labCode, NoGenerateRecordTypeCodeEnum.OUTSOURCE_PROTOCOL, groupCode, maxNo);
+        request.setCreateUserId(request.getUserId());
+        request.setCreateUserName(request.getUserName());
+        request.setApprovalStatus(ApprovalStatusEnum.DRAFT); //草稿箱状态
+        request.setProtocolNo(protocolNo);
+        BizBusinessOutsourcerInfo outsourcerInfo = outsourcerInfoMapper.selectById(request.getOutsourcerId());
+        request.setOutsourceNo(outsourcerInfo.getOutsourcerNo());
+        request.setOutsourceName(outsourcerInfo.getOutsourcerName());
+        int row = this.baseMapper.insert(request);
+        Assert.isFalse(row <= 0, () -> {
+            throw new BusinessException(BusinessExceptionEnum.OUTSOURCE_PROTOCOL_SAVE_FAILED);
+        });
+        OutsourceProtocolSaveResponse saveResponse = new OutsourceProtocolSaveResponse();
+        saveResponse.setId(request.getId());
+        saveResponse.setProtocolNo(protocolNo);
+        return ReturnUtil.success(saveResponse);
+    }
+}
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourcerInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourcerInfoServiceImpl.java
index 75f639d..8aadad7 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourcerInfoServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourcerInfoServiceImpl.java
@@ -3,12 +3,12 @@
 import cn.hutool.core.lang.Assert;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.dto.*;
 import com.casic.missiles.dto.business.outsource.OutsourcerInfoApprovalListRequest;
 import com.casic.missiles.dto.business.outsource.OutsourcerSaveResponse;
 import com.casic.missiles.enums.BusinessExceptionEnum;
-import com.casic.missiles.enums.PrefixCodeEnum;
+import com.casic.missiles.enums.NoGenerateFileCodeEnum;
+import com.casic.missiles.enums.NoGenerateRecordTypeCodeEnum;
 import com.casic.missiles.enums.system.ApprovalStatusEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.mapper.business.BizBusinessOutsourcerInfoMapper;
@@ -20,7 +20,7 @@
 import com.casic.missiles.service.business.IBizBusinessOutsourcerInfoService;
 import com.casic.missiles.service.business.IBizBusinessOutsourcerUserInfoService;
 import com.casic.missiles.utils.DictCodeUtils;
-import com.casic.missiles.utils.NumberGeneratorUtil;
+import com.casic.missiles.utils.NoGeneratorUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -42,22 +42,12 @@
     private IBizBusinessOutsourcerUserInfoService outsourcerUserInfoService;
 
     @Override
-    public List<BizBusinessOutsourcerInfo> list(OutsourcerInfoApprovalListRequest request) {
-        request.setCreateUserId(null);
-        request.setApprovalStatus(ApprovalStatusEnum.PASSED);
-        Page<BizBusinessOutsourcerInfo> page = PageFactory.defaultPage();
-        page.setCurrent(1);
-        page.setSearchCount(false);
-        page.setSize(Integer.MAX_VALUE);
-        Page<BizBusinessOutsourcerInfo> resultPage = this.baseMapper.selectBatchForApprovalList(page, request, null);
-        return resultPage.getRecords();
-    }
-
-    @Override
     public ReturnDTO<OutsourcerSaveResponse> saveOutsourcer(BizBusinessOutsourcerInfo request) {
         //生成编号
+        String labCode = request.getLabCode();
+        String groupCode = request.getGroupCode();
         Long maxNo = this.baseMapper.selectMaxNo();
-        String outsourcerNo = NumberGeneratorUtil.getContactNo(PrefixCodeEnum.OUTSOURCER_PREFIX, maxNo);
+        String outsourcerNo = NoGeneratorUtil.getCode(NoGenerateFileCodeEnum.D, labCode, NoGenerateRecordTypeCodeEnum.OUTSOURCE_INFO, groupCode, maxNo);
         request.setOutsourcerNo(outsourcerNo);
         request.setCreateUserId(request.getUserId());
         request.setCreateUserName(request.getUserName());
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessSiteExecutiveInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessSiteExecutiveInfoServiceImpl.java
index ebab3e6..6c6a129 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessSiteExecutiveInfoServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessSiteExecutiveInfoServiceImpl.java
@@ -189,9 +189,9 @@
         QueryWrapper<BizBusinessSiteExecutiveStaffRelation> mWrapper = new QueryWrapper<>();
         mWrapper.eq("site_executive_id", siteExecutiveId);
         boolean mRemove = siteExecutiveStaffRelationService.remove(mWrapper);
-        Assert.isFalse(eRemove || mRemove, () -> {
+        if(!eRemove || !mRemove){
             throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
-        });
+        }
     }
 
     private void doPopulateSiteExecutive(SiteExecutiveDetailResponse detailResponse) {
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessLabExecutiveInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessLabExecutiveInfoServiceImpl.java
index 50c5616..0242fcf 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessLabExecutiveInfoServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessLabExecutiveInfoServiceImpl.java
@@ -297,6 +297,29 @@
     }
 
     @Override
+    public List<SampleLabExecutiveListResponse> deptLabExecutiveList(SampleLabExecutiveListRequest request) throws Exception {
+        Page<SampleLabExecutiveListResponse> page = PageFactory.defaultPage();
+        page.setCurrent(1);
+        page.setSearchCount(false);
+        page.setSize(Integer.MAX_VALUE);
+        Page<SampleLabExecutiveListResponse> resultPage = this.deptLabExecutiveListPage(page, request);
+        return resultPage.getRecords();
+    }
+
+    @Override
+    public List<SampleLabExecutiveListResponse> deptLabExecutiveListByIds(String measureStatus, List<Long> ids) throws Exception {
+        Page<SampleLabExecutiveListResponse> page = PageFactory.defaultPage();
+        page.setCurrent(1);
+        page.setSearchCount(false);
+        page.setSize(Integer.MAX_VALUE);
+        SampleLabExecutiveListRequest request = new SampleLabExecutiveListRequest();
+        request.setIds(ids);
+        request.setMeasureStatus(measureStatus);
+        Page<SampleLabExecutiveListResponse> resultPage = this.deptLabExecutiveListPage(page, request);
+        return resultPage.getRecords();
+    }
+
+    @Override
     public Page<SampleLabExecutiveListResponse> myLabExecutiveListPage(Page<SampleLabExecutiveListResponse> page, SampleLabExecutiveListRequest labExecutiveListRequest) throws Exception{
         AuthUser user = ShiroKit.getUser();
         Assert.isFalse(Objects.isNull(user), () -> {
@@ -350,6 +373,29 @@
     }
 
     @Override
+    public List<SampleLabExecutiveListResponse> myLabExecutiveList(SampleLabExecutiveListRequest request) throws Exception {
+        Page<SampleLabExecutiveListResponse> page = PageFactory.defaultPage();
+        page.setCurrent(1);
+        page.setSearchCount(false);
+        page.setSize(Integer.MAX_VALUE);
+        Page<SampleLabExecutiveListResponse> resultPage = this.myLabExecutiveListPage(page, request);
+        return resultPage.getRecords();
+    }
+
+    @Override
+    public List<SampleLabExecutiveListResponse> myLabExecutiveListByIds(String measureStatus, List<Long> ids) throws Exception {
+        Page<SampleLabExecutiveListResponse> page = PageFactory.defaultPage();
+        page.setCurrent(1);
+        page.setSearchCount(false);
+        page.setSize(Integer.MAX_VALUE);
+        SampleLabExecutiveListRequest request = new SampleLabExecutiveListRequest();
+        request.setIds(ids);
+        request.setMeasureStatus(measureStatus);
+        Page<SampleLabExecutiveListResponse> resultPage = this.myLabExecutiveListPage(page, request);
+        return resultPage.getRecords();
+    }
+
+    @Override
     public List<SampleAmountResponse> myExecutiveAmount() {
         //登录用户id获取计量人员id，实验室检测信息中存储的是计量人员id
         AuthUser user = ShiroKit.getUser();
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentInfoServiceImpl.java
index 864b05e..db8cad4 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentInfoServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentInfoServiceImpl.java
@@ -35,7 +35,6 @@
 import com.casic.missiles.utils.ConvertUtils;
 import com.casic.missiles.utils.DictCodeUtils;
 import com.casic.missiles.utils.NumberGeneratorUtil;
-import org.flowable.engine.RuntimeService;
 import org.flowable.engine.runtime.ProcessInstance;
 import org.jetbrains.annotations.NotNull;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -43,7 +42,6 @@
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
 
-import javax.annotation.Resource;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
@@ -81,8 +79,6 @@
     private IBizEquipmentAttachmentService attachmentService;
     @Autowired
     private IBizEquipmentCheckpointService checkpointService;
-    @Resource
-    private RuntimeService runtimeService;
     @Autowired
     private ApprovalOperateService approvalOperateService;
 
@@ -235,18 +231,18 @@
     private void updateRelationInfo(EquipmentAddRequest request, BizEquipmentInfoApproval equipmentInfoApproval) {
         QueryWrapper<BizEquipmentTechnicalTarget> targetWrapper = new QueryWrapper<>();
         targetWrapper.eq("equipment_no", equipmentInfoApproval.getEquipmentNo());
-        boolean removeTargetFlag = technicalTargetService.remove(targetWrapper);
-        boolean saveTargetFlag = technicalTargetService.saveBatch(request.getTechnicalTargetList());
+        technicalTargetService.remove(targetWrapper);
+        technicalTargetService.saveBatch(request.getTechnicalTargetList());
 
         QueryWrapper<BizEquipmentAttachment> attachmentWrapper = new QueryWrapper<>();
         attachmentWrapper.eq("equipment_no", equipmentInfoApproval.getEquipmentNo());
-        boolean removeAttachmentFlag = attachmentService.remove(attachmentWrapper);
-        boolean saveAttachmentFlag = attachmentService.saveBatch(request.getAttachmentList());
+        attachmentService.remove(attachmentWrapper);
+        attachmentService.saveBatch(request.getAttachmentList());
 
         QueryWrapper<BizEquipmentCheckpoint> checkpointWrapper = new QueryWrapper<>();
         checkpointWrapper.eq("equipment_no", equipmentInfoApproval.getEquipmentNo());
-        boolean removeCheckpointFlag = checkpointService.remove(checkpointWrapper);
-        boolean saveCheckpointFlag = checkpointService.saveBatch(request.getCheckpointList());
+        checkpointService.remove(checkpointWrapper);
+        checkpointService.saveBatch(request.getCheckpointList());
     }
 
     @Override
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardInfoServiceImpl.java
index faff1ae..c50a5b3 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardInfoServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardInfoServiceImpl.java
@@ -22,7 +22,9 @@
 import com.casic.missiles.mapper.equipment.BizEquipmentStandardInfoMapper;
 import com.casic.missiles.mapper.equipment.BizEquipmentStandardTechnologyRelationMapper;
 import com.casic.missiles.mapper.resource.BizResourceStaffInfoMapper;
-import com.casic.missiles.model.equipment.*;
+import com.casic.missiles.model.equipment.BizEquipmentStandardInfo;
+import com.casic.missiles.model.equipment.BizEquipmentStandardInfoApproval;
+import com.casic.missiles.model.equipment.BizEquipmentStandardTechnologyRelation;
 import com.casic.missiles.model.resource.BizResourceStaffInfo;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.dao.DeptMapper;
@@ -33,14 +35,12 @@
 import com.casic.missiles.service.flowable.ApprovalOperateService;
 import com.casic.missiles.utils.ConvertUtils;
 import com.casic.missiles.utils.DictCodeUtils;
-import org.flowable.engine.RuntimeService;
 import org.flowable.engine.runtime.ProcessInstance;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
 
-import javax.annotation.Resource;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
@@ -62,8 +62,6 @@
     private BizResourceStaffInfoMapper staffInfoMapper;
     @Autowired
     private IBaseApprovalService baseApprovalService;
-    @Resource
-    private RuntimeService runtimeService;
     @Autowired
     private ApprovalOperateService approvalOperateService;
     @Autowired
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSealInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSealInfoServiceImpl.java
index 7c91fa2..00040d6 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSealInfoServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSealInfoServiceImpl.java
@@ -15,6 +15,7 @@
 import com.casic.missiles.modular.system.model.User;
 import com.casic.missiles.service.resource.IBizResourceSealInfoService;
 import com.casic.missiles.utils.DictCodeUtils;
+import com.casic.missiles.utils.MinioUtil;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -33,6 +34,8 @@
     private BizResourceSealInfoMapper sealInfoMapper;
     @Autowired
     private UserMapper userMapper;
+    @Autowired
+    private MinioUtil minioUtil;
 
     @Override
     public Page<BizResourceSealInfo> listPage(Page<BizResourceSealInfo> page, SealInfoListRequest request) throws Exception {
@@ -44,6 +47,7 @@
         Page<BizResourceSealInfo> sealInfoPage = sealInfoMapper.selectPage(page, wrapper);
         for (BizResourceSealInfo record : sealInfoPage.getRecords()) {
             DictCodeUtils.convertDictCodeToName(record);
+            record.setMinioFileUrl(minioUtil.getFileUrl(record.getMinioFileName()));
         }
         return sealInfoPage;
     }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceStaffInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceStaffInfoServiceImpl.java
index f058cf5..09203ac 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceStaffInfoServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceStaffInfoServiceImpl.java
@@ -3,6 +3,7 @@
 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.core.page.PageFactory;
 import com.casic.missiles.dto.IdDTO;
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
@@ -86,6 +87,13 @@
     }
 
     @Override
+    public List<BizResourceStaffInfo> list(StaffListRequest request) throws Exception {
+        Page<BizResourceStaffInfo> page = PageFactory.defaultPage();
+        Page<BizResourceStaffInfo> staffInfoPage = this.listPage(page, request);
+        return staffInfoPage.getRecords();
+    }
+
+    @Override
     @Transactional
     public ReturnDTO<IdDTO> staffBaseAdd(BizResourceStaffInfo staffInfo) {
         //登录账号查重
@@ -495,6 +503,28 @@
         return certResponsePage;
     }
 
+    @Override
+    public List<StaffCertResponse> certListByIds(List<Long> ids) throws Exception {
+        Page<StaffCertResponse> page = PageFactory.defaultPage();
+        page.setCurrent(1);
+        page.setSearchCount(false);
+        page.setSize(Integer.MAX_VALUE);
+        StaffCertRequest request = new StaffCertRequest();
+        request.setIds(ids);
+        Page<StaffCertResponse> resultPage = this.certListPage(page, request);
+        return resultPage.getRecords();
+    }
+
+    @Override
+    public List<StaffCertResponse> certList(StaffCertRequest request) throws Exception {
+        Page<StaffCertResponse> page = PageFactory.defaultPage();
+        page.setCurrent(1);
+        page.setSearchCount(false);
+        page.setSize(Integer.MAX_VALUE);
+        Page<StaffCertResponse> resultPage = this.certListPage(page, request);
+        return resultPage.getRecords();
+    }
+
     @Async
     public void deleteRelationInfo(Long staffId){
         QueryWrapper<BizResourceStaffEducation> educationWrapper = new QueryWrapper<>();

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java
index bb0c50f..13a699b 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java
@@ -12,6 +12,7 @@
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.IGeneralApprovalService;
+import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
@@ -19,6 +20,7 @@
 import org.springframework.web.bind.annotation.RequestBody;
 
 import javax.validation.Valid;
+import java.util.List;
 import java.util.Objects;
 
 /**
@@ -117,4 +119,17 @@
         }
         return baseApprovalService.failUpdate(request);
     }
+
+    public List<O> exportList(@RequestBody @Valid R request) throws Exception {
+        List<O> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = baseApprovalService.listExportByIds(request.getIds());
+        } else {
+            list = baseApprovalService.listExport(request);
+        }
+        for (O record : list) {
+            DictCodeUtils.convertDictCodeToName(record);
+        }
+        return list;
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java
index 8a90961..d775831 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java
@@ -5,6 +5,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.business.certificate.CertificateChangeApplyApprovalListRequest;
 import com.casic.missiles.dto.business.certificate.CertificateChangeApplySaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessCertificateChangeApply;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
@@ -20,6 +21,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -48,4 +50,12 @@
         }
         return changeApplyService.saveChangeApply(request);
     }
+
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody CertificateChangeApplyApprovalListRequest request) throws Exception {
+        List<BizBusinessCertificateChangeApply> list = super.exportList(request);
+        super.exportExcel(BizBusinessCertificateChangeApply.class, list, ExportEnum.CERTIFICATE_CHANGE_APPLY.getSheetName());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java
index 5fc4b07..af8230e 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java
@@ -9,6 +9,7 @@
 import com.casic.missiles.dto.business.certificate.CertificatePrintApprovalListRequest;
 import com.casic.missiles.dto.business.certificate.CertificatePrintListResponse;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.enums.business.CertificatePrintStatusEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessCertificatePrintLog;
@@ -18,10 +19,16 @@
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.io.IOException;
+import java.util.List;
 import java.util.Objects;
 
 /**
@@ -98,4 +105,16 @@
         });
         return certificatePrintService.certificatePrintLog(idDTO.getId());
     }
+
+    @ApiOperation("证书打印审批导出")
+    @PostMapping("/listExport")
+    public void exportList(@RequestBody CertificatePrintApprovalListRequest request) throws IOException {
+        List<CertificatePrintListResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = certificatePrintService.listByIds(request.getIds());
+        } else {
+            list = certificatePrintService.list(request);
+        }
+        super.exportExcel(CertificatePrintListResponse.class, list, ExportEnum.CERTIFICATE_PRINT.getSheetName());
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java
index 63b06dc..6b2efd5 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java
@@ -6,6 +6,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.business.certificate.CertificateReportApprovalListRequest;
 import com.casic.missiles.dto.business.certificate.CertificateReportSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessCertificateReport;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
@@ -21,6 +22,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -50,7 +52,7 @@
         return certificateReportService.saveCertificateReport(request);
     }
 
-    @ApiOperation("证书审批详情（基本信息）")
+    @ApiOperation("详情（基本信息）")
     @PostMapping("/detail")
     public ReturnDTO<BizBusinessCertificateReport> detail(@RequestBody @Valid BaseDetailRequest request, BindingResult bindingResult) throws Exception {
         if(bindingResult.hasErrors()){
@@ -59,4 +61,11 @@
         return certificateReportService.detail(request);
     }
 
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody CertificateReportApprovalListRequest request) throws Exception {
+        List<BizBusinessCertificateReport> list = super.exportList(request);
+        super.exportExcel(BizBusinessCertificateReport.class, list, ExportEnum.CERTIFICATE_REPORT.getSheetName());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java
index 46b26bd..57c0809 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java
@@ -10,20 +10,21 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.business.identify.IdentifyListRequest;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessIdentifyInfo;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.business.IBizBusinessIdentifyInfoService;
+import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import javax.validation.Valid;
+import java.util.List;
 import java.util.Objects;
 
 /**
@@ -57,16 +58,13 @@
         return identifyInfoService.addIdentify(identifyInfo);
     }
 
-    @ApiOperation("标识打印更新")
+    @ApiOperation("标识打印更新（更新打印时间）")
     @PostMapping("/update")
-    public ReturnDTO updateIdentify(@RequestBody @Valid BizBusinessIdentifyInfo identifyInfo, BindingResult bindingResult) {
-        Assert.isFalse(Objects.isNull(identifyInfo.getId()), () -> {
+    public ReturnDTO updateIdentify(@RequestBody @Valid IdDTO idDTO) {
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        Assert.isFalse(bindingResult.hasErrors(), () -> {
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        });
-        return identifyInfoService.updateIdentify(identifyInfo);
+        return identifyInfoService.updateIdentify(idDTO.getId());
     }
 
     @ApiOperation("标识打印删除")
@@ -77,4 +75,37 @@
         });
         return identifyInfoService.deleteIdentify(idDTO.getId());
     }
+
+    @ApiOperation("标识打印导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody @Valid IdentifyListRequest request, BindingResult bindingResult) throws Exception {
+        if (bindingResult.hasErrors()) {
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        List<BizBusinessIdentifyInfo> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = identifyInfoService.listByIds(request.getIds());
+        } else {
+            list = identifyInfoService.list(request);
+        }
+        for (BizBusinessIdentifyInfo record : list) {
+            DictCodeUtils.convertDictCodeToName(record);
+        }
+        super.exportExcel(BizBusinessIdentifyInfo.class, list, ExportEnum.IDENTIFY_EXPORT.getSheetName());
+    }
+
+
+    // TODO: 2023/8/23 查询设备信息，4个底部按钮查设备（按钮的作用就是前端用来调不同接口、用来区分中间即将展示的标识），前端弹窗选设备，在确定保存时前端根据底部按钮判断传入设备类型deviceType字典code
+    // TODO: 2023/8/23 接口：查受检设备（第1个按钮），查设备台账（后3个按钮同一接口），查询之后前端根据标志类型的不同加到中间页面时进行判断（按产品给的对应表）
+    // TODO: 2023/8/23 提供二维码接口，前端在加到中间页面时调用一下
+
+    @ApiOperation("设备二维码")
+    @PostMapping("/equipment/qrCode")
+    public ReturnDTO<String> equipmentQrCode(@RequestBody @Valid IdDTO idDTO) {
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return identifyInfoService.equipmentQrCode(idDTO.getId());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java
index 707be6e..7e0453d 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java
@@ -117,7 +117,7 @@
     }
 
     @ApiOperation("任务单导出")
-    @PostMapping("/export")
+    @PostMapping("/listExport")
     public void orderExport(@RequestBody @Valid OrderListRequest request, HttpServletResponse response) {
         businessOrderService.orderExport(request, response);
     }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java
index 529a6ce..51432be 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java
@@ -1,9 +1,28 @@
 package com.casic.missiles.controller.business;
 
+import com.casic.missiles.controller.GeneralApprovalController;
+import com.casic.missiles.dto.BaseApprovalSubmitRequest;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.business.outsource.OutsourceAssessApprovalListRequest;
+import com.casic.missiles.dto.business.outsource.OutsourceAssessSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
+import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.model.business.BizBusinessOutsourceAssess;
+import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
+import com.casic.missiles.service.IGeneralApprovalService;
+import com.casic.missiles.service.business.IBizBusinessOutsourceAssessService;
 import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.BindingResult;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.validation.Valid;
+import java.util.List;
+
 /**
  * <p>
  * 计量检定业务-分包管理-测试、校准或检定工作分包评审表 前端控制器
@@ -15,6 +34,27 @@
 @Api(tags = "分包管理-测试、校准或检定工作分包评审表")
 @RestController
 @RequestMapping("/business/outsource/assess")
-public class BizBusinessOutsourceAssessController {
+public class BizBusinessOutsourceAssessController extends GeneralApprovalController<BizBusinessOutsourceAssess, BizBusinessOutsourceAssess, OutsourceAssessApprovalListRequest, BaseApprovalSubmitRequest> {
+    @Autowired
+    private IBizBusinessOutsourceAssessService outsourceAssessService;
 
+    public BizBusinessOutsourceAssessController(IGeneralApprovalService<BizBusinessOutsourceAssess, BizBusinessOutsourceAssess, OutsourceAssessApprovalListRequest, BaseApprovalSubmitRequest> baseApprovalService) {
+        super(baseApprovalService);
+    }
+
+    @ApiOperation("草稿箱-保存")
+    @PostMapping("/save")
+    public ReturnDTO<OutsourceAssessSaveResponse> saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceAssess request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        return outsourceAssessService.saveOutsourceAssess(request);
+    }
+
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception {
+        List<BizBusinessOutsourceAssess> list = super.exportList(request);
+        super.exportExcel(BizBusinessOutsourceAssess.class, list, ExportEnum.OUTSOURCE_ASSESS.getSheetName());
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java
new file mode 100644
index 0000000..9adef18
--- /dev/null
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java
@@ -0,0 +1,60 @@
+package com.casic.missiles.controller.business;
+
+import com.casic.missiles.controller.GeneralApprovalController;
+import com.casic.missiles.dto.BaseApprovalSubmitRequest;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.business.outsource.OutsourceProtocolApprovalListRequest;
+import com.casic.missiles.dto.business.outsource.OutsourceProtocolSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
+import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.model.business.BizBusinessOutsourceProtocol;
+import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
+import com.casic.missiles.service.IGeneralApprovalService;
+import com.casic.missiles.service.business.IBizBusinessOutsourceProtocolService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.BindingResult;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.validation.Valid;
+import java.util.List;
+
+/**
+ * <p>
+ * 计量检定业务-分包管理-测试、校准或检定工作分包协议书 前端控制器
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-08-24
+ */
+@Api(tags = "分包管理-测试、校准或检定工作分包协议书")
+@RestController
+@RequestMapping("/business/outsource/protocol")
+public class BizBusinessOutsourceProtocolController extends GeneralApprovalController<BizBusinessOutsourceProtocol, BizBusinessOutsourceProtocol, OutsourceProtocolApprovalListRequest, BaseApprovalSubmitRequest> {
+    @Autowired
+    private IBizBusinessOutsourceProtocolService outsourceProtocolService;
+
+    public BizBusinessOutsourceProtocolController(IGeneralApprovalService<BizBusinessOutsourceProtocol, BizBusinessOutsourceProtocol, OutsourceProtocolApprovalListRequest, BaseApprovalSubmitRequest> baseApprovalService) {
+        super(baseApprovalService);
+    }
+
+    @ApiOperation("草稿箱-保存")
+    @PostMapping("/save")
+    public ReturnDTO<OutsourceProtocolSaveResponse> saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceProtocol request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        return outsourceProtocolService.saveOutsourceProtocol(request);
+    }
+
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody OutsourceProtocolApprovalListRequest request) throws Exception {
+        List<BizBusinessOutsourceProtocol> list = super.exportList(request);
+        super.exportExcel(BizBusinessOutsourceProtocol.class, list, ExportEnum.OUTSOURCE_PROTOCOL.getSheetName());
+    }
+}
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java
index 097f645..f0f0943 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java
@@ -17,7 +17,6 @@
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.IGeneralApprovalService;
 import com.casic.missiles.service.business.IBizBusinessOutsourcerInfoService;
-import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -71,19 +70,8 @@
 
     @ApiOperation("分包方导出")
     @PostMapping("/listExport")
-    public void export(@RequestBody @Valid OutsourcerInfoApprovalListRequest request, BindingResult bindingResult) throws Exception {
-        if (bindingResult.hasErrors()) {
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        }
-        List<BizBusinessOutsourcerInfo> list;
-        if (!CollectionUtils.isEmpty(request.getIds())) {
-            list = outsourcerInfoService.listByIds(request.getIds());
-        } else {
-            list = outsourcerInfoService.list(request);
-        }
-        for (BizBusinessOutsourcerInfo record : list) {
-            DictCodeUtils.convertDictCodeToName(record);
-        }
+    public void export(@RequestBody OutsourcerInfoApprovalListRequest request) throws Exception {
+        List<BizBusinessOutsourcerInfo> list = super.exportList(request);
         super.exportExcel(BizBusinessOutsourcerInfo.class, list, ExportEnum.OUTSOURCER_EXPORT.getSheetName());
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java
index c2cbf9f..0410918 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java
@@ -17,11 +17,9 @@
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.IGeneralApprovalService;
 import com.casic.missiles.service.business.IBizBusinessSiteExecutiveInfoService;
-import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -60,7 +58,7 @@
         return siteExecutiveInfoService.saveSiteExecutiveInfo(siteExecutiveInfo);
     }
 
-    @ApiOperation("现场检测详情")
+    @ApiOperation("详情")
     @PostMapping("/detail")
     public ReturnDTO<SiteExecutiveDetailResponse> siteExecutiveDetail(@RequestBody @Valid IdDTO idDTO) throws Exception {
         Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
@@ -69,21 +67,10 @@
         return ReturnUtil.success(siteExecutiveInfoService.detail(idDTO.getId()));
     }
 
-    @ApiOperation("现场检测导出")
+    @ApiOperation("导出")
     @PostMapping("/listExport")
-    public void export(@RequestBody @Valid SiteExecutiveApprovalListRequest request, BindingResult bindingResult) throws Exception {
-        if (bindingResult.hasErrors()) {
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        }
-        List<SiteExecutiveApprovalListResponse> list;
-        if (!CollectionUtils.isEmpty(request.getIds())) {
-            list = siteExecutiveInfoService.listInfoByIds(request.getIds());
-        } else {
-            list = siteExecutiveInfoService.listInfo(request);
-        }
-        for (SiteExecutiveApprovalListResponse record : list) {
-            DictCodeUtils.convertDictCodeToName(record);
-        }
+    public void export(@RequestBody SiteExecutiveApprovalListRequest request) throws Exception {
+        List<SiteExecutiveApprovalListResponse> list = super.exportList(request);
         super.exportExcel(SiteExecutiveApprovalListResponse.class, list, ExportEnum.SITE_EXECUTIVE_EXPORT.getSheetName());
     }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
index 7e793cd..a92e209 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
@@ -55,7 +55,7 @@
 
     @ApiOperation("设备收发列表导出")
     @PostMapping("/export")
-    public void exportList(@RequestBody @Valid SampleDispatchListRequest request) throws IOException {
+    public void exportList(@RequestBody SampleDispatchListRequest request) throws IOException {
         List<SampleDispatchListResponse> list;
         if (!CollectionUtils.isEmpty(request.getIds())) {
             list = dispatchService.listByIds(request.getIds());
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java
index cdc77fc..d120fd4 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java
@@ -7,6 +7,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.business.labExecutive.*;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.business.IBusinessLabExecutiveInfoService;
@@ -14,6 +15,7 @@
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.*;
 
@@ -32,7 +34,7 @@
     @Autowired
     private IBusinessLabExecutiveInfoService labExecutiveInfoService;
 
-    @ApiOperation("实验室检测-部门检测-查询各状态列表（待检测、检测中、检测完）")
+    @ApiOperation("实验室任务-查询各状态列表（待检测、检测中、检测完）")
     @PostMapping("/deptExecutive/List")
     public ReturnDTO<PageInfoBT<SampleLabExecutiveListResponse>> queryDeptExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
@@ -43,10 +45,19 @@
         return ReturnUtil.success(super.packForBT(labExecutiveInfoService.deptLabExecutiveListPage(page, labExecutiveListRequest)));
     }
 
-    /**
-     * 实验室检测-我的检测-查询各状态列表（待检测、检测中、检测完）
-     */
-    @ApiOperation("实验室检测-我的检测-查询各状态列表（待检测、检测中、检测完）")
+    @ApiOperation("实验室任务导出")
+    @PostMapping("/deptExecutive/export")
+    public void deptExportList(@RequestBody @Valid SampleLabExecutiveListRequest request) throws Exception {
+        List<SampleLabExecutiveListResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = labExecutiveInfoService.deptLabExecutiveListByIds(request.getMeasureStatus(), request.getIds());
+        } else {
+            list = labExecutiveInfoService.deptLabExecutiveList(request);
+        }
+        super.exportExcel(SampleLabExecutiveListResponse.class, list, ExportEnum.DEPT_EXECUTIVE_TASK.getSheetName());
+    }
+
+    @ApiOperation("我的任务-查询各状态列表（待检测、检测中、检测完）")
     @PostMapping("/myExecutive/list")
     public ReturnDTO<PageInfoBT<SampleLabExecutiveListResponse>> queryMyExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
@@ -57,19 +68,25 @@
         return ReturnUtil.success(super.packForBT(labExecutiveInfoService.myLabExecutiveListPage(page, labExecutiveListRequest)));
     }
 
-    /**
-     * 实验室检测-我的检测-查询各状态样品数量（待检测、检测中、检测完）
-     */
-    @ApiOperation("实验室检测-我的检测-查询各状态样品数量（待检测、检测中、检测完）")
+    @ApiOperation("我的任务导出")
+    @PostMapping("/myExecutive/export")
+    public void exportList(@RequestBody @Valid SampleLabExecutiveListRequest request) throws Exception {
+        List<SampleLabExecutiveListResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = labExecutiveInfoService.myLabExecutiveListByIds(request.getMeasureStatus(), request.getIds());
+        } else {
+            list = labExecutiveInfoService.myLabExecutiveList(request);
+        }
+        super.exportExcel(SampleLabExecutiveListResponse.class, list, ExportEnum.MY_EXECUTIVE_TASK.getSheetName());
+    }
+
+    @ApiOperation("我的任务-查询各状态样品数量（待检测、检测中、检测完）")
     @GetMapping("/myExecutive/amount")
     public ReturnDTO<List<SampleAmountResponse>> queryMyExecutiveAmount() {
         return ReturnUtil.success(labExecutiveInfoService.myExecutiveAmount());
     }
 
-    /**
-     * 实验室检测-部门检测-分配（分配给具体人员）
-     */
-    @ApiOperation("实验室检测-部门检测-分配按钮（分配给具体人员）")
+    @ApiOperation("实验室任务-分配按钮（分配给具体人员）")
     @PostMapping("/deptExecutive/allocate")
     public ReturnDTO allocateStaff(@RequestBody @Valid SampleAllocateRequest sampleAllocateRequest, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -78,10 +95,7 @@
         return labExecutiveInfoService.allocateStaff(sampleAllocateRequest);
     }
 
-    /**
-     * 实验室检测-我的检测-检定人扫描收入（待检测->检测中）
-     */
-    @ApiOperation("实验室检测-我的检测-检定人扫描收入（待检测->检测中）")
+    @ApiOperation("我的任务-检定人扫描收入（待检测->检测中）")
     @PostMapping("/myExecutive/receive")
     public ReturnDTO sampleReceive(@RequestBody @Valid List<SampleOperateRequest> requestList, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -90,10 +104,7 @@
         return labExecutiveInfoService.sampleReceive(requestList);
     }
 
-    /**
-     * 实验室检测-负责人/检定人扫描检完（检测中->检测完）
-     */
-    @ApiOperation("实验室检测-负责人/检定人扫描检完（检测中->检测完）")
+    @ApiOperation("实验室任务-负责人/检定人扫描检完（检测中->检测完）")
     @PostMapping("/myExecutive/complete")
     public ReturnDTO sampleExecutiveComplete(@RequestBody @Valid List<SampleOperateRequest> requestList, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -102,10 +113,7 @@
         return labExecutiveInfoService.sampleExecutiveComplete(requestList);
     }
 
-    /**
-     * 实验室检测-部门检测/我的检测 编辑（只能修改应出具证书）
-     */
-    @ApiOperation("实验室检测-部门检测/我的检测 编辑（只能修改应出具证书）")
+    @ApiOperation("实验室任务/我的任务 编辑（只能修改应出具证书）")
     @PostMapping("/executive/update")
     public ReturnDTO updateExecutive(@RequestBody @Valid UpdateExecutiveRequest request, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -114,10 +122,7 @@
         return labExecutiveInfoService.updateExecutive(request);
     }
 
-    /**
-     * 实验室检测-部门检测/我的检测 详情
-     */
-    @ApiOperation("实验室检测-部门检测/我的检测 详情")
+    @ApiOperation("实验室任务/我的任务 详情")
     @PostMapping("/executive/detail")
     public ReturnDTO<ExecutiveDetailResponse> executiveDetail(@RequestBody @Valid ExecutiveDetailRequest request, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
@@ -131,7 +136,7 @@
      * 退回后会将下一个要执行的实验室检测状态更新为待分配，将后面的实验室顺序变更为连续（都进行减1）
      * 最后一个检测的实验室退回，等分发员再增加实验室或设备收发中的已收入直接手动点击完成
      */
-    @ApiOperation("实验室检测-部门检测/我的检测 退回（待检测/检测中->退回）")
+    @ApiOperation("实验室任务/我的任务 退回（待检测/检测中->退回）")
     @PostMapping("/executive/sendBack")
     public ReturnDTO executiveSendBack(@RequestBody @Valid ExecutiveSendBackRequest request, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -140,9 +145,6 @@
         return labExecutiveInfoService.sampleExecutiveSendBack(request);
     }
 
-    /**
-     * 分发员编辑实验室检测列表
-     */
     @ApiOperation("分发员编辑实验室检测列表")
     @PostMapping("/handOut/updateList")
     public ReturnDTO updateExecutiveList(@RequestBody @Valid UpdateExecutiveListRequest request, BindingResult bindingResult) {
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java
index 48a67ed..0c04f31 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java
@@ -10,6 +10,7 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.resource.customer.CustomerApprovalListRequest;
 import com.casic.missiles.dto.resource.customer.CustomerSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceCustomerInfo;
@@ -26,6 +27,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -55,6 +57,13 @@
         return customerInfoService.saveCustomerInfo(request);
     }
 
+    @ApiOperation("委托方名录导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody CustomerApprovalListRequest request) throws Exception {
+        List<BizResourceCustomerInfo> list = super.exportList(request);
+        super.exportExcel(BizResourceCustomerInfo.class, list, ExportEnum.CUSTOMER_INFO.getSheetName());
+    }
+
     @ApiOperation("委托方人员列表（分页）")
     @PostMapping("/person/listPage")
     public ReturnDTO<PageInfoBT<BizResourceCustomerStaff>> personListPage(@RequestBody IdDTO idDto) {
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
index 972ed4b..6418ea5 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
@@ -5,6 +5,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.resource.customer.SuggestFormApprovalListRequest;
 import com.casic.missiles.dto.resource.customer.SuggestFormSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceCustomerSuggestForm;
@@ -20,6 +21,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -50,4 +52,11 @@
         return suggestFormService.saveSuggestForm(request);
     }
 
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody SuggestFormApprovalListRequest request) throws Exception {
+        List<BizResourceCustomerSuggestForm> list = super.exportList(request);
+        super.exportExcel(BizResourceCustomerSuggestForm.class, list, ExportEnum.CUSTOMER_SUGGEST_FORM.getSheetName());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java
index 1934d1a..9e07eab 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java
@@ -15,12 +15,16 @@
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.resource.IEnvEnvironmentRecordConfigService;
 import com.casic.missiles.service.resource.IEnvEnvironmentRecordDataService;
+import com.casic.missiles.service.resource.IEnvLocationInfoService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
 import java.util.List;
@@ -39,6 +43,8 @@
     private IEnvEnvironmentRecordDataService environmentRecordDataService;
     @Autowired
     private IEnvEnvironmentRecordConfigService environmentRecordConfigService;
+    @Autowired
+    private IEnvLocationInfoService locationInfoService;
 
     @ApiOperation("环境记录单数据列表/详情")
     @PostMapping("/data/listPage")
@@ -95,4 +101,11 @@
         });
         return environmentRecordConfigService.deleteEnvironmentRecordConfig(idDTO.getId());
     }
+
+    @ApiOperation("地点列表")
+    @PostMapping("/location/listPage")
+    public ReturnDTO<PageInfoBT<LocationListResponse>> locationListPage(@RequestBody @Valid LocationListRequest request) {
+        Page<LocationListResponse> page = PageFactory.defaultPage();
+        return ReturnUtil.success(super.packForBT(locationInfoService.listPage(page, request)));
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java
index 82efe3f..e9561fa 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java
@@ -10,6 +10,7 @@
 import com.casic.missiles.dto.resource.seal.SealLogListRequest;
 import com.casic.missiles.dto.resource.seal.SealNoteApprovalListRequest;
 import com.casic.missiles.dto.resource.seal.SealNoteSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceSealUseLog;
@@ -27,6 +28,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -58,6 +60,13 @@
         return sealUseNoteService.saveSeal(request);
     }
 
+    @ApiOperation("印章使用登记导出（列表和导出中去掉经办人和监印人）")
+    @PostMapping("/listExport")
+    public void export(@RequestBody SealNoteApprovalListRequest request) throws Exception {
+        List<BizResourceSealUseNote> list = super.exportList(request);
+        super.exportExcel(BizResourceSealUseNote.class, list, ExportEnum.SEAL_NOTE.getSheetName());
+    }
+
     // TODO: 2023/7/28 印章使用日志：系统中使用印章时插入数据库
 
     @ApiOperation("印章使用日志列表（分页）")
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java
index 9b674fc..06b6521 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java
@@ -9,16 +9,20 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.resource.staff.StaffCertRequest;
 import com.casic.missiles.dto.resource.staff.StaffCertResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.service.resource.IBizResourceStaffInfoService;
 import com.casic.missiles.service.resource.IBizResourceStaffVerifierService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.List;
+
 /**
  * @Description:
  * @Author: wangpeng
@@ -41,9 +45,21 @@
         return ReturnUtil.success(super.packForBT(responsePage));
     }
 
+    @ApiOperation("证书逾期提醒导出")
+    @PostMapping("/listExport")
+    public void exportList(@RequestBody StaffCertRequest request) throws Exception {
+        List<StaffCertResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = staffInfoService.certListByIds(request.getIds());
+        } else {
+            list = staffInfoService.certList(request);
+        }
+        super.exportExcel(StaffCertResponse.class, list, ExportEnum.STAFF_CERTIFICATE_EXPIRE.getSheetName());
+    }
+
     @ApiOperation("证书逾期提醒")
     @PostMapping("/expirationReminder")
-    public ReturnDTO expirationReminder(@RequestBody IdDTO idDto) {
-        return verifierService.expirationReminder(idDto);
+    public ReturnDTO expirationReminder(@RequestBody IdDTO idDTO) {
+        return verifierService.expirationReminder(idDTO);
     }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java
index 3b251ad..a6e7850 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java
@@ -12,6 +12,7 @@
 import com.casic.missiles.dto.resource.staff.StaffListRequest;
 import com.casic.missiles.dto.resource.staff.TrainListRequest;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.*;
@@ -22,7 +23,10 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
 import java.util.List;
@@ -52,8 +56,19 @@
             throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
         }
         Page<BizResourceStaffInfo> page = PageFactory.defaultPage();
-        Page<BizResourceStaffInfo> responsePage = staffInfoService.listPage(page, request);
-        return ReturnUtil.success(super.packForBT(responsePage));
+        return ReturnUtil.success(super.packForBT(staffInfoService.listPage(page, request)));
+    }
+
+    @ApiOperation("人员登记导出")
+    @PostMapping("/listExport")
+    public void exportList(@RequestBody StaffListRequest request) throws Exception {
+        List<BizResourceStaffInfo> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = staffInfoService.listByIds(request.getIds());
+        } else {
+            list = staffInfoService.list(request);
+        }
+        super.exportExcel(BizResourceStaffInfo.class, list, ExportEnum.STAFF_INFO.getSheetName());
     }
 
     @ApiOperation("人员登记详情基础信息")
@@ -85,9 +100,9 @@
 
     @ApiOperation("科研教育列表（分页）")
     @PostMapping("/education/listPage")
-    public ReturnDTO<PageInfoBT<BizResourceStaffEducation>> educationListPage(@RequestBody IdDTO idDto) {
+    public ReturnDTO<PageInfoBT<BizResourceStaffEducation>> educationListPage(@RequestBody IdDTO idDTO) {
         Page<BizResourceStaffEducation> page = PageFactory.defaultPage();
-        Page<BizResourceStaffEducation> responsePage = staffInfoService.educationListPage(page, idDto);
+        Page<BizResourceStaffEducation> responsePage = staffInfoService.educationListPage(page, idDTO);
         return ReturnUtil.success(super.packForBT(responsePage));
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java
index af6aa86..d85d84a 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java
@@ -9,6 +9,7 @@
 import com.casic.missiles.dto.resource.outsideService.SupplierApprovalListRequest;
 import com.casic.missiles.dto.resource.outsideService.SupplierSaveResponse;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceSupplierAbility;
@@ -67,6 +68,13 @@
         return ReturnUtil.success(supplierInfoService.detail(idDTO.getId()));
     }
 
+    @ApiOperation("合格供方导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody SupplierApprovalListRequest request) throws Exception {
+        List<BizResourceSupplierInfo> list = super.exportList(request);
+        super.exportExcel(BizResourceSupplierInfo.class, list, ExportEnum.SUPPLIER_INFO.getSheetName());
+    }
+
     @ApiOperation("供方人员列表（分页）")
     @PostMapping("/person/listPage")
     public ReturnDTO<PageInfoBT<BizResourceSupplierPerson>> personListPage(@RequestBody IdDTO idDTO) {
diff --git a/casic-metering-api/src/main/resources/config/application.yml b/casic-metering-api/src/main/resources/config/application.yml
index 350db5f..ecff521 100644
--- a/casic-metering-api/src/main/resources/config/application.yml
+++ b/casic-metering-api/src/main/resources/config/application.yml
@@ -126,7 +126,7 @@
     #作者
     author: wangpeng
     #待生成对象表名
-    table-name: biz_equipment_technical_target_approval,biz_equipment_attachment_approval,biz_equipment_checkpoint_approval
+    table-name: biz_business_outsource_protocol
 
 reminder:
   #节点--common模块config包 ReminderNodeConfig配置
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
index 4a19e4e..d47d552 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
@@ -53,6 +53,7 @@
     SUGGEST_FORM_SAVE_FAILED(2509, "委托方意见登记表保存至草稿箱失败"),
     EXAMINE_FORM_SAVE_FAILED(2510, "要求、委托书及合同评审表保存至草稿箱失败"),
     CUSTOMER_EXIST_SAVE_FAILED(2511, "该委托方已存在，请重新选择"),
+    DUPLICATE_LOCATION_NO(2512, "地点编号已存在"),
 
     /**
      * 计量检定业务模块
@@ -68,6 +69,8 @@
     COMPLETE_SAMPLE_NOT_EXIST(2609, "检测中不存在扫描收入的样品"),
     CANNOT_CHANGE_MEASURE_INFO(2610, "无法更改非当前登录用户的检测信息"),
     NON_EXIST_ORDER_OR_SAMPLE(2611, "不存在该委托单或该委托单下的样品"),
+    OUTSOURCE_ACCESS_SAVE_FAILED(2612, "测试、校准或检定工作分包评审表保存至草稿箱失败"),
+    OUTSOURCE_PROTOCOL_SAVE_FAILED(2613, "测试、校准或检定工作分包协议书保存至草稿箱失败"),
 
     /**
      * 历史遗留备用
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
index 5089ad1..81a406b 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
@@ -10,54 +10,38 @@
     /**
      * 资源管理
      */
-    ENVIRONMENT_DATA_EXPORT("environmentData", "environmentData", "环境记录单数据"),
+    ENVIRONMENT_DATA_EXPORT("environmentData", "环境记录单数据", "环境记录单数据"),
+    STAFF_INFO("staffInfo", "人员登记", "人员登记"),
+    STAFF_CERTIFICATE_EXPIRE("certificateExpire", "证书逾期提醒", "证书逾期提醒"),
+    SUPPLIER_INFO("supplierInfo", "合格供方名录", "合格供方名录"),
+    CUSTOMER_INFO("customerInfo", "委托方名录", "委托方名录"),
+    CUSTOMER_SUGGEST_FORM("customerSuggestForm", "委托方意见登记表", "委托方意见登记表"),
+    SEAL_NOTE("sealNote", "印章使用登记", "印章使用登记"),
 
-    FILE_EXPORT("meterFileData", "meterFileData", "计量文件信息"),
-    TRAIN_PLAN_EXPORT("trainPlanData", "trainPlanData", "培训计划"),
-    TRAIN_LOG_EXPORT("trainLogData", "trainLogData", "培训记录"),
-    METER_ORGANIZE_EXPORT("meterOrganizeData", "meterOrganizeData", "计量组织"),
-    TRACE_SUPPLIER_EXPORT("traceSupplierData", "traceSupplierData", "溯源供方"),
-    SIGN_EXPORT("signData", "signData", "签名/签章"),
-    TEMPLATE_EXPORT("templateData", "templateData", "原始记录模板/证书报告模板"),
-    FIXED_ASSETS("meterFixedAssets", "meterFixedAssets", "固定资产"),
-    METER_EQUIPMENT("meterEquipment", "meterEquipment", "测量设备"),
-    CALIBRATION_TEST_EQUIPMENT("calibrationTestEquipment", "calibrationTestEquipment", "校准检定设备"),
-    MEASURE_ACCOUNT("measureAccount", "measureAccount", "测量工装"),
-    STANDARD_SUPPORT_EQUIPMENT("standardSupportEquipment", "standardSupportEquipment", "标准配套设备"),
-    STANDARD_EQUIPMENT("standardEquipment", "standardEquipment", "标准装置"),
-    FLOW_DEF_EXPORT("flowDefData", "flowDefData", "流程定义"),
-    STAFF_CERTIFICATE("certificate", "certificate", "计量人员证书"),
-    CHECK_INFO("checkInfo", "checkInfo", "设备管理点检测"),
-    EQUIPMENT_APPLY("equipmentApply", "equipmentApply", "设备借用"),
-    STANDARD_EQUIPMENT_REMIND("equipmentApplyRemind", "equipmentApplyRemind", "标准装置到期提醒"),
-    METER_PRICE("meterPrice", "meterPrice", "价格库"),
-    METER_STAFF("meterStaff", "meterStaff", "计量人员"),
-    STANDARD_EQUIPMENT_APPLY("standardEquipmentApply", "standardEquipmentApply", "标准装置申请"),
-    STATE_MANAGE_APPLY("stateManage", "stateManage", "状态管理"),
-    METER_ACCEPTANCE_CHECK("acceptanceCheck", "acceptanceCheck", "设备检修保养验收单"),
-    CUSTOMER_EXPORT("customerData", "customerData", "客户信息"),
-    ORDER_EXPORT("orderData", "orderData", "委托书信息"),
-    SAMPLE_EXPORT("sampleData", "sampleData", "样本信息"),
-    EXCHANGE_DATA("exchangeData", "exchangeData", "设备交接单"),
-    DISPATCH_DATA("dispatchData", "dispatchData", "设备收发"),
-    ENVIRONMENT_DATA("environmentData", "environmentData", "环境记录单"),
-    ORIGIN_DATA("originData", "originData", "原始记录"),
-    CERTIFICATE_REPORT("certificateReport", "certificateReport", "证书报告"),
-    ADVICE_EXPORT("adviceData", "adviceData", "客户反馈"),
-    HANDOUT_EXPORT("handoutData", "handoutData", "任务分发列表"),
-    OUTSOURCER_EXPORT("outsourcerData", "outsourcerData", "分包方"),
-    SITE_EXECUTIVE_EXPORT("siteExecutiveData", "siteExecutiveData", "现场测试、校准或检定"),
-    CERTIFICATE_PRINT_EXPORT("certificatePrintData", "certificatePrintData", "证书打印"),
-    DOWNLOAD_TEMPLATE("downloadTemplate", "downloadTemplate", "页面配置"),
-    OUTSOURCER_CERTIFICATE_EXPORT("outsourceCertificateData", "outsourceCertificateData", "分包证书"),
-    SETTLEMENT_INFO_EXPORT("settlementInfoData", "settlementInfoData", "业务结算"),
-    EQUIPMENT_REMIND("equipmentRemind", "equipmentRemind", "设备到期提醒"),
-    AGREEMENT_INFO_EXPORT("agreementInfoData", "agreementInfoData", "合同"),
-    WORK_STATISTICS_EXPORT("workStatisticsData", "workStatisticsData", "实时工作统计"),
-    DEPT_OUTPUT_EXPORT("deptOutputData", "deptOutputData", "部门产值分析"),
-    WORKLOAD_EXPORT("workloadData", "workloadData", "业务工作量分析"),
-    DEPT_COMPREHENSIVE_EXPORT("deptComprehensiveData", "deptComprehensiveData", "部门综合分析"),
-    ENVIRONMENTAL_RECORD("environmentalRecordData", "environmentalRecordData", "现场环境记录");
+    /**
+     * 计量检定业务
+     */
+    OUTSOURCER_EXPORT("outsourcerData", "分包方名录", "分包方名录"),
+    IDENTIFY_EXPORT("identifyData", "计量标识", "计量标识"),
+    ORDER_EXPORT("orderData", "任务单", "任务单"),
+    DISPATCH_DATA("dispatchData", "设备收发", "设备收发"),
+    HANDOUT_EXPORT("handoutData", "任务分发", "任务分发"),
+    SITE_EXECUTIVE_EXPORT("siteExecutiveData", "现场测试、校准或检定", "现场测试、校准或检定"),
+    CERTIFICATE_REPORT("certificateReport", "证书审批", "证书审批"),
+    CERTIFICATE_CHANGE_APPLY("certificateChangeApply", "证书报告补充或更换申请单", "证书报告补充或更换申请单"),
+    CERTIFICATE_PRINT("certificatePrintData", "证书打印审批", "证书打印审批"),
+    DEPT_EXECUTIVE_TASK("deptExecutiveTaskData", "实验室任务", "实验室任务"),
+    MY_EXECUTIVE_TASK("myExecutiveTaskData", "我的任务", "我的任务"),
+    OUTSOURCE_ASSESS("outsourceAssess", "测试、校准或检定工作分包评审表", "测试、校准或检定工作分包评审表"),
+    OUTSOURCE_PROTOCOL("outsourceProtocol", "测试、校准或检定工作分包协议书", "测试、校准或检定工作分包协议书"),
+
+    /**
+     * 系统管理
+     */
+    SIGN_EXPORT("signData", "签名", "签名"),
+    TEMPLATE_EXPORT("templateData", "文件模板", "文件模板"),
+    FLOW_DEF_EXPORT("flowDefData", "流程定义", "流程定义"),
+    DOWNLOAD_TEMPLATE("downloadTemplate", "流程定义", "页面配置");
 
     ExportEnum(String fileName, String sheetName, String description) {
         this.fileName = fileName;
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateRecordTypeCodeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateRecordTypeCodeEnum.java
index 31d913c..a963522 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateRecordTypeCodeEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateRecordTypeCodeEnum.java
@@ -46,4 +46,14 @@
     String SITE_EXECUTIVE_APPROVAL = "01";
     //《现场测试、校准或检定工作记录表》
     String SITE_EXECUTIVE_LOG = "02";
+
+    //测试、校准或检定工作分包协议书
+    String OUTSOURCE_PROTOCOL = "01";
+    //测试、校准或检定工作分包评审表
+    String OUTSOURCE_ACCESS = "02";
+    //测试、校准或检定工作分包通知书
+    String OUTSOURCE_NOTICE = "03";
+    //测试、校准或检定工作分包方名录
+    String OUTSOURCE_INFO = "04";
+
 }
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
index 24b8635..f78bd53 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
@@ -15,6 +15,10 @@
     String CERTIFICATE_CHANGE_APPLY_BEAN_NAME = "certificateChangeApplyBean";
     //现场测试、校准或检定
     String SITE_EXECUTIVE_BEAN_NAME = "siteExecutiveBean";
+    //测试、校准或检定工作分包评审表
+    String OUTSOURCE_ASSESS_BEAN_NAME = "outsourceAssessBean";
+    //测试、校准或检定工作分包协议书
+    String OUTSOURCE_PROTOCOL_BEAN_NAME = "outsourceProtocolBean";
 
     /*********************************设备与装置************************************/
     //设备台账
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 b21c661..6b86fd1 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
@@ -18,6 +18,8 @@
     OUTSOURCER_APPROVAL(OUTSOURCER_BEAN_NAME, ""),
     CERTIFICATE_CHANGE_APPROVAL(CERTIFICATE_CHANGE_APPLY_BEAN_NAME, ""),
     SITE_EXECUTIVE_APPROVAL(SITE_EXECUTIVE_BEAN_NAME, ""),
+    OUTSOURCE_ASSESS_APPROVAL(OUTSOURCE_ASSESS_BEAN_NAME, ""),
+    OUTSOURCE_PROTOCOL_APPROVAL(OUTSOURCE_PROTOCOL_BEAN_NAME, ""),
 
     ACTION_STATUS_MAP(new HashMap<String, AwareActionStatusEnum>() {
         {
@@ -47,6 +49,10 @@
             put(ApplyFromIdEnum.CERTIFICATE_CHANGE_APPROVAL.getCode(), CERTIFICATE_CHANGE_APPROVAL);
             //现场测试、校准或检定审批
             put(ApplyFromIdEnum.SITE_EXECUTIVE_APPROVAL.getCode(), SITE_EXECUTIVE_APPROVAL);
+            //测试、校准或检定工作分包评审表
+            put(ApplyFromIdEnum.OUTSOURCE_ASSESS_APPROVAL.getCode(), OUTSOURCE_ASSESS_APPROVAL);
+            //测试、校准或检定工作分包协议书
+            put(ApplyFromIdEnum.OUTSOURCE_PROTOCOL_APPROVAL.getCode(), OUTSOURCE_PROTOCOL_APPROVAL);
         }
     });
     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 934405e..c7410bd 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
@@ -9,6 +9,8 @@
     CERTIFICATE_CHANGE_APPROVAL("jljdywzsbchghsqd", MessageSourceModuleEnum.BUSINESS.getCode(), "证书/报告补充或更换申请单"),
     OUTSOURCER_APPROVAL("jljdywcsjzhgfbfml", MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定合格分包方名录"),
     SITE_EXECUTIVE_APPROVAL("jljdywxccsjzsp", MessageSourceModuleEnum.BUSINESS.getCode(), "现场测试、校准或检定审批"),
+    OUTSOURCE_ASSESS_APPROVAL("jljdywcsjzfbpsb", MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包评审表"),
+    OUTSOURCE_PROTOCOL_APPROVAL("jljdywcsjzfbxys", MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包协议书"),
 
 
     /*******************************************设备与装置*********************************************/
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/GeneralApprovalMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/GeneralApprovalMapper.java
index 4fb7344..0c9d6ae 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/GeneralApprovalMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/GeneralApprovalMapper.java
@@ -17,8 +17,4 @@
 
     Page<O> selectBatchForApprovalList(Page<O> page, @Param("request") R request, @Param("businessKeys") List<String> businessKeys);
 
-//    Page<O> selectListPage(Page<O> page, @Param("request") R request);
-
-//    Long selectMaxNo();
-
 }
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceAssessMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceAssessMapper.java
index 7867bb8..ba59009 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceAssessMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceAssessMapper.java
@@ -1,7 +1,12 @@
 package com.casic.missiles.mapper.business;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.business.outsource.OutsourceAssessApprovalListRequest;
+import com.casic.missiles.mapper.GeneralApprovalMapper;
 import com.casic.missiles.model.business.BizBusinessOutsourceAssess;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * <p>
@@ -11,6 +16,10 @@
  * @author wangpeng
  * @since 2023-08-16
  */
-public interface BizBusinessOutsourceAssessMapper extends BaseMapper<BizBusinessOutsourceAssess> {
+public interface BizBusinessOutsourceAssessMapper extends GeneralApprovalMapper<BizBusinessOutsourceAssess, BizBusinessOutsourceAssess, OutsourceAssessApprovalListRequest> {
+
+    Page<BizBusinessOutsourceAssess> selectBatchForApprovalList(Page<BizBusinessOutsourceAssess> page, @Param("request") OutsourceAssessApprovalListRequest request, @Param("businessKeys") List<String> businessKeys);
+
+    Long selectMaxProjectNo();
 
 }
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceProtocolMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceProtocolMapper.java
new file mode 100644
index 0000000..e6aba35
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceProtocolMapper.java
@@ -0,0 +1,24 @@
+package com.casic.missiles.mapper.business;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.business.outsource.OutsourceProtocolApprovalListRequest;
+import com.casic.missiles.mapper.GeneralApprovalMapper;
+import com.casic.missiles.model.business.BizBusinessOutsourceProtocol;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 计量检定业务-分包管理-测试、校准或检定工作分包协议书 Mapper 接口
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-08-24
+ */
+public interface BizBusinessOutsourceProtocolMapper extends GeneralApprovalMapper<BizBusinessOutsourceProtocol, BizBusinessOutsourceProtocol, OutsourceProtocolApprovalListRequest> {
+
+    Page<BizBusinessOutsourceProtocol> selectBatchForApprovalList(Page<BizBusinessOutsourceProtocol> page, @Param("request") OutsourceProtocolApprovalListRequest request, @Param("businessKeys") List<String> businessKeys);
+
+    Long selectMaxProtocolNo();
+}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/EnvLocationInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/EnvLocationInfoMapper.java
new file mode 100644
index 0000000..49eff87
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/EnvLocationInfoMapper.java
@@ -0,0 +1,21 @@
+package com.casic.missiles.mapper.resource;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.resource.environment.LocationListRequest;
+import com.casic.missiles.dto.resource.environment.LocationListResponse;
+import com.casic.missiles.model.resource.EnvLocationInfo;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * <p>
+ * 实验室环境监控系统-设备表 Mapper 接口
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-06-07
+ */
+public interface EnvLocationInfoMapper extends BaseMapper<EnvLocationInfo> {
+
+    Page<LocationListResponse> selectLocationListPage(Page<LocationListResponse> page, @Param("request") LocationListRequest request);
+}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java
index de124db..85ed0f7 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java
@@ -1,7 +1,9 @@
 package com.casic.missiles.mapper.system;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.dto.system.SignDetailResponse;
+import com.casic.missiles.dto.system.SignListRequest;
 import com.casic.missiles.model.system.SystemSign;
 import org.apache.ibatis.annotations.Param;
 
@@ -22,4 +24,8 @@
     SignDetailResponse selectSignDetailById(Long id);
 
     List<SystemSign> selectUsableSignList(@Param("userId") Long userId);
+
+    Page<SystemSign> selectSignListPage(Page<SystemSign> page, @Param("request") SignListRequest request);
+
+    List<SystemSign> selectSignList(@Param("request") SignListRequest request);
 }
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateChangeApplyMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateChangeApplyMapper.xml
index d798447..c496092 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateChangeApplyMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateChangeApplyMapper.xml
@@ -30,31 +30,31 @@
         SELECT *
         FROM biz_business_certificate_change_apply
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.changeApplyNo != null and request.changeApplyNo !=''">
+        <if test="request != null and request.changeApplyNo != null and request.changeApplyNo !=''">
             and change_apply_no like concat('%',#{request.changeApplyNo},'%')
         </if>
-        <if test="request.changeReportNo != null and request.changeReportNo !=''">
+        <if test="request != null and request.changeReportNo != null and request.changeReportNo !=''">
             and change_report_no like concat('%',#{request.changeReportNo},'%')
         </if>
-        <if test="request.changeReportName != null and request.changeReportName !=''">
+        <if test="request != null and request.changeReportName != null and request.changeReportName !=''">
             and change_report_name like concat('%',#{request.changeReportName},'%')
         </if>
-        <if test="request.changeType != null and request.changeType !=''">
+        <if test="request != null and request.changeType != null and request.changeType !=''">
             and change_type = #{request.changeType}
         </if>
-        <if test="request.createUserName != null and request.createUserName !=''">
+        <if test="request != null and request.createUserName != null and request.createUserName !=''">
             and create_user_name like concat('%',#{request.createUserName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificatePrintMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificatePrintMapper.xml
index b66cd99..49c0ac8 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificatePrintMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificatePrintMapper.xml
@@ -31,34 +31,34 @@
         LEFT JOIN biz_business_order_sample_relation bosr ON (bosr.order_id = bcr.order_id AND bosr.sample_id = bcr.sample_id)
         LEFT JOIN biz_business_order_info boi ON boi.id = bosr.order_id
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and bcp.approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.printStatus != null and request.printStatus !=''">
+        <if test="request != null and request.printStatus != null and request.printStatus !=''">
             and print_status = #{request.printStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and bcp.create_user_id = #{request.createUserId}
         </if>
-        <if test="request.certificateReportNo != null and request.certificateReportNo !=''">
+        <if test="request != null and request.certificateReportNo != null and request.certificateReportNo !=''">
             and bcr.certificate_report_no like concat('%',#{request.certificateReportNo},'%')
         </if>
-        <if test="request.certificateReportName != null and request.certificateReportName !=''">
+        <if test="request != null and request.certificateReportName != null and request.certificateReportName !=''">
             and bcr.certificate_report_name like concat('%',#{request.certificateReportName},'%')
         </if>
-        <if test="request.customerName != null and request.customerName !=''">
+        <if test="request != null and request.customerName != null and request.customerName !=''">
             and boi.customer_name like concat('%',#{request.customerName},'%')
         </if>
-        <if test="request.sampleNo != null and request.sampleNo !=''">
+        <if test="request != null and request.sampleNo != null and request.sampleNo !=''">
             and bosr.sample_no like concat('%',#{request.sampleNo},'%')
         </if>
-        <if test="request.sampleName != null and request.sampleName !=''">
+        <if test="request != null and request.sampleName != null and request.sampleName !=''">
             and bosr.sample_name like concat('%',#{request.sampleName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and bcp.create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and bcp.create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml
index b366034..767695d 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml
@@ -46,33 +46,37 @@
         SELECT bcr.*, bosr.sample_no, bosr.sample_name, bosr.sample_model, rsi.staff_name
         FROM biz_business_certificate_report bcr
         LEFT JOIN biz_business_order_sample_relation bosr ON (bosr.order_id = bcr.order_id AND bosr.sample_id = bcr.sample_id)
+        LEFT JOIN biz_business_order_info boi ON boi.id = bcr.order_id
         LEFT JOIN biz_resource_staff_info rsi ON rsi.id = bcr.measure_person_id
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and bcr.approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and bcr.create_user_id = #{request.createUserId}
         </if>
-        <if test="request.certificateReportNo != null and request.certificateReportNo !=''">
+        <if test="request != null and request.customerId != null and request.customerId !=''">
+            and boi.customer_id = #{request.customerId}
+        </if>
+        <if test="request != null and request.certificateReportNo != null and request.certificateReportNo !=''">
             and bcr.certificate_report_no like concat('%',#{request.certificateReportNo},'%')
         </if>
-        <if test="request.certificateReportName != null and request.certificateReportName !=''">
+        <if test="request != null and request.certificateReportName != null and request.certificateReportName !=''">
             and bcr.certificate_report_name like concat('%',#{request.certificateReportName},'%')
         </if>
-        <if test="request.sampleNo != null and request.sampleNo !=''">
+        <if test="request != null and request.sampleNo != null and request.sampleNo !=''">
             and bosr.sample_no like concat('%',#{request.sampleNo},'%')
         </if>
-        <if test="request.measureCategory != null and request.measureCategory !=''">
+        <if test="request != null and request.measureCategory != null and request.measureCategory !=''">
             and bcr.measure_category = #{request.measureCategory}
         </if>
-        <if test="request.measurePerson != null and request.measurePerson !=''">
+        <if test="request != null and request.measurePerson != null and request.measurePerson !=''">
             and rsi.staff_name like concat('%',#{request.measurePerson},'%')
         </if>
-        <if test="request.calibrationTimeStart != null and request.calibrationTimeStart !=''">
+        <if test="request != null and request.calibrationTimeStart != null and request.calibrationTimeStart !=''">
             and bcr.calibration_time &gt;= #{request.calibrationTimeStart}
         </if>
-        <if test="request.calibrationTimeEnd != null and request.calibrationTimeEnd !=''">
+        <if test="request != null and request.calibrationTimeEnd != null and request.calibrationTimeEnd !=''">
             and bcr.calibration_time &lt;= #{request.calibrationTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceAssessMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceAssessMapper.xml
index d0fcf8b..c22c101 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceAssessMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceAssessMapper.xml
@@ -7,6 +7,8 @@
         <id column="id" property="id" />
         <result column="project_no" property="projectNo" />
         <result column="project_name" property="projectName" />
+        <result column="lab_code" property="labCode" />
+        <result column="group_code" property="groupCode" />
         <result column="applicant_id" property="applicantId" />
         <result column="applicant_name" property="applicantName" />
         <result column="applicant_time" property="applicantTime" />
@@ -31,7 +33,45 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, project_no, project_name, applicant_id, applicant_name, applicant_time, minio_file_name, remark, create_user_id, create_user_name, outsourcer_id, pre_start_time, pre_end_time, outsource_reason, pre_cost, approval_status, process_id, approve_situation, traceability, test_method, technique_ability, create_time, update_time
+        id, project_no, project_name, lab_code, group_code, applicant_id, applicant_name, applicant_time, minio_file_name, remark, create_user_id, create_user_name, outsourcer_id, pre_start_time, pre_end_time, outsource_reason, pre_cost, approval_status, process_id, approve_situation, traceability, test_method, technique_ability, create_time, update_time
     </sql>
 
+    <select id="selectMaxProjectNo" resultType="java.lang.Long">
+        SELECT IFNULL(max(RIGHT(project_no, 3)), 0) from biz_business_outsource_assess
+    </select>
+
+    <select id="selectBatchForApprovalList" resultMap="BaseResultMap">
+        SELECT bboa.*, bboi.outsourcer_name, bboi.director
+        FROM biz_business_outsource_assess bboa
+        LEFT JOIN biz_business_outsourcer_info bboi ON bboa.outsourcer_id = bboi.id
+        WHERE 1=1
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
+            and bboa.approval_status = #{request.approvalStatus}
+        </if>
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
+            and bboa.create_user_id = #{request.createUserId}
+        </if>
+        <if test="request != null and request.projectNo != null and request.projectNo !=''">
+            and bboa.project_no like concat('%',#{request.projectNo},'%')
+        </if>
+        <if test="request != null and request.outsourcerName != null and request.outsourcerName !=''">
+            and bboi.outsourcer_name like concat('%',#{request.outsourcerName},'%')
+        </if>
+        <if test="request != null and request.applicantName != null and request.applicantName !=''">
+            and bboa.applicant_name like concat('%',#{request.applicantName},'%')
+        </if>
+        <if test="request != null and request.applicantTimeStart != null and request.applicantTimeStart !=''">
+            and bboa.applicant_time &gt;= #{request.applicantTimeStart}
+        </if>
+        <if test="request != null and request.applicantTimeEnd != null and request.applicantTimeEnd !=''">
+            and bboa.applicant_time &lt;= #{request.applicantTimeEnd}
+        </if>
+        <if test="businessKeys != null">
+            and bboa.id in
+            <foreach collection="businessKeys" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
+        ORDER BY bboa.create_time DESC
+    </select>
 </mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceProtocolMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceProtocolMapper.xml
new file mode 100644
index 0000000..b7b2149
--- /dev/null
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceProtocolMapper.xml
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.mapper.business.BizBusinessOutsourceProtocolMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.business.BizBusinessOutsourceProtocol">
+        <id column="id" property="id" />
+        <result column="protocol_no" property="protocolNo" />
+        <result column="project_name" property="projectName" />
+        <result column="lab_code" property="labCode" />
+        <result column="group_code" property="groupCode" />
+        <result column="outsourcer_id" property="outsourcerId" />
+        <result column="remark" property="remark" />
+        <result column="outsource_no" property="outsourceNo" />
+        <result column="outsource_name" property="outsourceName" />
+        <result column="contacts" property="contacts" />
+        <result column="mobile" property="mobile" />
+        <result column="address" property="address" />
+        <result column="require_date" property="requireDate" />
+        <result column="outsource_cost" property="outsourceCost" />
+        <result column="director" property="director" />
+        <result column="item" property="item" />
+        <result column="requires" property="requires" />
+        <result column="create_user_id" property="createUserId" />
+        <result column="create_user_name" property="createUserName" />
+        <result column="approval_status" property="approvalStatus" />
+        <result column="process_id" property="processId" />
+        <result column="create_time" property="createTime" />
+        <result column="update_time" property="updateTime" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, protocol_no, project_name, lab_code, group_code, outsourcer_id, remark, outsource_no, outsource_name, contacts, mobile, address, require_date, outsource_cost, director, item, requires, create_user_id, create_user_name, approval_status, process_id, create_time, update_time
+    </sql>
+
+    <select id="selectMaxProtocolNo" resultType="java.lang.Long">
+        SELECT IFNULL(max(RIGHT(protocol_no, 3)), 0) from biz_business_outsource_protocol
+    </select>
+
+    <select id="selectBatchForApprovalList" resultMap="BaseResultMap">
+        SELECT *
+        FROM biz_business_outsource_protocol
+        WHERE 1=1
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
+            and approval_status = #{request.approvalStatus}
+        </if>
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
+            and create_user_id = #{request.createUserId}
+        </if>
+        <if test="request != null and request.protocolNo != null and request.protocolNo !=''">
+            and protocol_no like concat('%',#{request.protocolNo},'%')
+        </if>
+        <if test="request != null and request.outsourcerName != null and request.outsourcerName !=''">
+            and outsourcer_name like concat('%',#{request.outsourcerName},'%')
+        </if>
+        <if test="request != null and request.applicantName != null and request.applicantName !=''">
+            and create_user_name like concat('%',#{request.applicantName},'%')
+        </if>
+        <if test="request != null and request.applicantTimeStart != null and request.applicantTimeStart !=''">
+            and create_time &gt;= #{request.applicantTimeStart}
+        </if>
+        <if test="request != null and request.applicantTimeEnd != null and request.applicantTimeEnd !=''">
+            and create_time &lt;= #{request.applicantTimeEnd}
+        </if>
+        <if test="businessKeys != null">
+            and id in
+            <foreach collection="businessKeys" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
+        ORDER BY create_time DESC
+    </select>
+</mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourcerInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourcerInfoMapper.xml
index 510a80b..3049b54 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourcerInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourcerInfoMapper.xml
@@ -7,6 +7,8 @@
         <id column="id" property="id" />
         <result column="outsourcer_no" property="outsourcerNo" />
         <result column="outsourcer_name" property="outsourcerName" />
+        <result column="lab_code" property="labCode" />
+        <result column="group_code" property="groupCode" />
         <result column="outsourcer_brief_name" property="outsourcerBriefName" />
         <result column="outsourcer_size" property="outsourcerSize" />
         <result column="business_size" property="businessSize" />
@@ -55,32 +57,32 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, outsourcer_no, outsourcer_name, outsourcer_brief_name, outsourcer_size, business_size, grade, evaluation, tax_number, bank_account, bank_name, bank_account_number, postal_code, director, phone, fax, mobile, email, website, address_country, address_province, address_city, address_area, full_address, address_country_name, address_province_name, address_city_name, address_area_name, invoice_country, invoice_province, invoice_city, invoice_area, invoice_full_address, invoice_country_name, invoice_province_name, invoice_city_name, invoice_area_name, business_scope, business_content, minio_file_name, approval_status, process_id, remark, create_user_id, create_user_name, create_time, update_time
+        id, outsourcer_no, outsourcer_name, lab_code, group_code, outsourcer_brief_name, outsourcer_size, business_size, grade, evaluation, tax_number, bank_account, bank_name, bank_account_number, postal_code, director, phone, fax, mobile, email, website, address_country, address_province, address_city, address_area, full_address, address_country_name, address_province_name, address_city_name, address_area_name, invoice_country, invoice_province, invoice_city, invoice_area, invoice_full_address, invoice_country_name, invoice_province_name, invoice_city_name, invoice_area_name, business_scope, business_content, minio_file_name, approval_status, process_id, remark, create_user_id, create_user_name, create_time, update_time
     </sql>
 
     <select id="selectBatchForApprovalList" resultMap="BaseResultMap">
         SELECT *
         FROM biz_business_outsourcer_info
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.outsourcerNo != null and request.outsourcerNo !=''">
+        <if test="request != null and request.outsourcerNo != null and request.outsourcerNo !=''">
             and outsourcer_no like concat('%',#{request.outsourcerNo},'%')
         </if>
-        <if test="request.outsourcerName != null and request.outsourcerName !=''">
+        <if test="request != null and request.outsourcerName != null and request.outsourcerName !=''">
             and outsourcer_name like concat('%',#{request.outsourcerName},'%')
         </if>
-        <if test="request.director != null and request.director !=''">
+        <if test="request != null and request.director != null and request.director !=''">
             and director like concat('%',#{request.director},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
@@ -93,6 +95,6 @@
     </select>
 
     <select id="selectMaxNo" resultType="java.lang.Long">
-        SELECT IFNULL(max(RIGHT(outsourcer_no, 12)), 0) from biz_business_outsourcer_info
+        SELECT IFNULL(max(RIGHT(outsourcer_no, 3)), 0) from biz_business_outsourcer_info
     </select>
 </mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessSiteExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessSiteExecutiveInfoMapper.xml
index 135c5d0..3c5ae79 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessSiteExecutiveInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessSiteExecutiveInfoMapper.xml
@@ -38,25 +38,25 @@
         FROM biz_business_site_executive_info bsei
         LEFT JOIN biz_resource_customer_info rci ON bsei.customer_id = rci.id
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and bsei.approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and bsei.create_user_id = #{request.createUserId}
         </if>
-        <if test="request.siteExecutiveNo != null and request.siteExecutiveNo !=''">
+        <if test="request != null and request.siteExecutiveNo != null and request.siteExecutiveNo !=''">
             and bsei.site_executive_no like concat('%',#{request.siteExecutiveNo},'%')
         </if>
-        <if test="request.customerName != null and request.customerName !=''">
+        <if test="request != null and request.customerName != null and request.customerName !=''">
             and rci.outsourcer_name like concat('%',#{request.customerName},'%')
         </if>
-        <if test="request.applyName != null and request.applyName !=''">
+        <if test="request != null and request.applyName != null and request.applyName !=''">
             and bsei.apply_name like concat('%',#{request.applyName},'%')
         </if>
-        <if test="request.applyTimeStart != null and request.applyTimeStart !=''">
+        <if test="request != null and request.applyTimeStart != null and request.applyTimeStart !=''">
             and bsei.apply_time &gt;= #{request.applyTimeStart}
         </if>
-        <if test="request.applyTimeEnd != null and request.applyTimeEnd !=''">
+        <if test="request != null and request.applyTimeEnd != null and request.applyTimeEnd !=''">
             and bsei.apply_time &lt;= #{request.applyTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml
index 84d9e2a..6bd38a9 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml
@@ -105,6 +105,12 @@
         <if test="request.isUrgent != null and request.isUrgent !=''">
             AND bo.is_urgent = #{request.isUrgent}
         </if>
+        <if test="request.ids != null">
+            and blei.id in
+            <foreach collection="request.ids" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
         ORDER BY blei.update_time DESC
     </select>
 
@@ -137,6 +143,12 @@
         <if test="request.isUrgent != null and request.isUrgent !=''">
             AND bo.is_urgent = #{request.isUrgent}
         </if>
+        <if test="request.ids != null">
+            and blei.id in
+            <foreach collection="request.ids" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
         ORDER BY blei.update_time DESC
     </select>
 
diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardInfoMapper.xml
index 1a5551b..2ed8d17 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardInfoMapper.xml
@@ -45,12 +45,6 @@
         FROM biz_equipment_standard_info besi
         LEFT JOIN biz_equipment_standard_technology_relation bestr ON besi.standard_no = bestr.standard_no
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
-            and besi.approval_status = #{request.approvalStatus}
-        </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
-            and besi.create_user_id = #{request.createUserId}
-        </if>
         <if test="request.standardName != null and request.standardName !=''">
             and besi.standard_name like concat('%',#{request.standardName},'%')
         </if>
diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardTechnologyRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardTechnologyRelationMapper.xml
index fc7e16c..cd03c8c 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardTechnologyRelationMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardTechnologyRelationMapper.xml
@@ -6,6 +6,7 @@
     <resultMap id="BaseResultMap" type="com.casic.missiles.model.equipment.BizEquipmentStandardTechnologyRelation">
         <id column="id" property="id" />
         <result column="technology_file_id" property="technologyFileId" />
+        <result column="technology_file_no" property="technologyFileNo" />
         <result column="technology_file_name" property="technologyFileName" />
         <result column="standard_id" property="standardId" />
         <result column="standard_no" property="standardNo" />
@@ -14,7 +15,7 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, technology_file_id, technology_file_name, standard_id, remark
+        id, technology_file_id, technology_file_no, technology_file_name, standard_id, remark
     </sql>
 
 </mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceAuthorizeOrderMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceAuthorizeOrderMapper.xml
index ac5176c..554fe65 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceAuthorizeOrderMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceAuthorizeOrderMapper.xml
@@ -32,22 +32,22 @@
         SELECT *
         FROM biz_resource_authorize_order
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.orderNo != null and request.orderNo !=''">
+        <if test="request != null and request.orderNo != null and request.orderNo !=''">
             and order_no like concat('%',#{request.orderNo},'%')
         </if>
-        <if test="request.createUserName != null and request.createUserName !=''">
+        <if test="request != null and request.createUserName != null and request.createUserName !=''">
             and create_user_name like concat('%',#{request.createUserName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerExamineFormMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerExamineFormMapper.xml
index ab242f6..af7f98f 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerExamineFormMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerExamineFormMapper.xml
@@ -41,28 +41,28 @@
         SELECT *
         FROM biz_resource_customer_examine_form
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.formNo != null and request.formNo !=''">
+        <if test="request != null and request.formNo != null and request.formNo !=''">
             and form_no like concat('%',#{request.formNo},'%')
         </if>
-        <if test="request.labCode != null and request.labCode !=''">
+        <if test="request != null and request.labCode != null and request.labCode !=''">
             and lab_code like concat('%',#{request.labCode},'%')
         </if>
-        <if test="request.groupCode != null and request.groupCode !=''">
+        <if test="request != null and request.groupCode != null and request.groupCode !=''">
             and group_code like concat('%',#{request.groupCode},'%')
         </if>
-        <if test="request.createUserName != null and request.createUserName !=''">
+        <if test="request != null and request.createUserName != null and request.createUserName !=''">
             and create_user_name like concat('%',#{request.createUserName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerInfoMapper.xml
index fa8ffbc..06a2798 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerInfoMapper.xml
@@ -33,25 +33,25 @@
         SELECT *
         FROM biz_resource_customer_info
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.customerNo != null and request.customerNo !=''">
+        <if test="request != null and request.customerNo != null and request.customerNo !=''">
             and customer_no like concat('%',#{request.customerNo},'%')
         </if>
-        <if test="request.customerName != null and request.customerName !=''">
+        <if test="request != null and request.customerName != null and request.customerName !=''">
             and customer_name like concat('%',#{request.customerName},'%')
         </if>
-        <if test="request.contacts != null and request.contacts !=''">
+        <if test="request != null and request.contacts != null and request.contacts !=''">
             and contacts like concat('%',#{request.contacts},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerSuggestFormMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerSuggestFormMapper.xml
index 28f5bb2..1806662 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerSuggestFormMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerSuggestFormMapper.xml
@@ -33,28 +33,28 @@
         SELECT *
         FROM biz_resource_customer_suggest_form
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.formNo != null and request.formNo !=''">
+        <if test="request != null and request.formNo != null and request.formNo !=''">
             and form_no like concat('%',#{request.formNo},'%')
         </if>
-        <if test="request.customerName != null and request.customerName !=''">
+        <if test="request != null and request.customerName != null and request.customerName !=''">
             and customer_name like concat('%',#{request.customerName},'%')
         </if>
-        <if test="request.customerDeptName != null and request.customerDeptName !=''">
+        <if test="request != null and request.customerDeptName != null and request.customerDeptName !=''">
             and customer_dept_name like concat('%',#{request.customerDeptName},'%')
         </if>
-        <if test="request.createUserName != null and request.createUserName !=''">
+        <if test="request != null and request.createUserName != null and request.createUserName !=''">
             and create_user_name like concat('%',#{request.createUserName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSealUseNoteMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSealUseNoteMapper.xml
index ab37bc1..b02bb33 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSealUseNoteMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSealUseNoteMapper.xml
@@ -29,32 +29,32 @@
     </sql>
 
     <select id="selectBatchForApprovalList" resultMap="BaseResultMap">
-        SELECT *
+        SELECT brsun.*, brsi.seal_name, brsi.seal_type, brsi.approver_name
         FROM biz_resource_seal_use_note brsun
         JOIN biz_resource_seal_info brsi ON brsun.seal_id = brsi.id
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and brsun.approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and brsun.create_user_id = #{request.createUserId}
         </if>
-        <if test="request.sealName != null and request.sealName !=''">
+        <if test="request != null and request.sealName != null and request.sealName !=''">
             and brsi.seal_name like concat('%',#{request.sealName},'%')
         </if>
-        <if test="request.sealType != null and request.sealType !=''">
+        <if test="request != null and request.sealType != null and request.sealType !=''">
             and brsi.seal_type = #{request.sealType}
         </if>
-        <if test="request.applyDeptName != null and request.applyDeptName !=''">
+        <if test="request != null and request.applyDeptName != null and request.applyDeptName !=''">
             and brsun.apply_dept_name like concat('%',#{request.applyDeptName},'%')
         </if>
-        <if test="request.applyUserName != null and request.applyUserName !=''">
+        <if test="request != null and request.applyUserName != null and request.applyUserName !=''">
             and brsun.apply_user_name like concat('%',#{request.applyUserName},'%')
         </if>
-        <if test="request.applyTimeStart != null and request.applyTimeStart !=''">
+        <if test="request != null and request.applyTimeStart != null and request.applyTimeStart !=''">
             and brsun.apply_time &gt;= #{request.applyTimeStart}
         </if>
-        <if test="request.applyTimeEnd != null and request.applyTimeEnd !=''">
+        <if test="request != null and request.applyTimeEnd != null and request.applyTimeEnd !=''">
             and brsun.apply_time &lt;= #{request.applyTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml
index 119bf7d..4f8392a 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml
@@ -31,6 +31,12 @@
         <if test="request.deptName != null and request.deptName !=''">
             and brsi.dept_name like concat('%',#{request.deptName},'%')
         </if>
+        <if test="request.ids != null">
+            and brsv.id in
+            <foreach collection="request.ids" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
         ORDER BY brsv.grant_date DESC
     </select>
 
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSupplierInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSupplierInfoMapper.xml
index fe8d399..e8ce7ef 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSupplierInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSupplierInfoMapper.xml
@@ -48,28 +48,28 @@
         SELECT *
         FROM biz_resource_supplier_info
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.supplierNo != null and request.supplierNo !=''">
+        <if test="request != null and request.supplierNo != null and request.supplierNo !=''">
             and supplier_no like concat('%',#{request.supplierNo},'%')
         </if>
-        <if test="request.supplierName != null and request.supplierName !=''">
+        <if test="request != null and request.supplierName != null and request.supplierName !=''">
             and supplier_name like concat('%',#{request.supplierName},'%')
         </if>
-        <if test="request.director != null and request.director !=''">
+        <if test="request != null and request.director != null and request.director !=''">
             and director like concat('%',#{request.director},'%')
         </if>
-        <if test="request.supplierType != null and request.supplierType !=''">
+        <if test="request != null and request.supplierType != null and request.supplierType !=''">
             and supplier_type = #{request.supplierType}
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/EnvLocationInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/EnvLocationInfoMapper.xml
new file mode 100644
index 0000000..68bcf10
--- /dev/null
+++ b/casic-metering-dao/src/main/resources/mapper/resource/EnvLocationInfoMapper.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.mapper.resource.EnvLocationInfoMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.resource.EnvLocationInfo">
+        <id column="id" property="id" />
+        <result column="location_no" property="locationNo" />
+        <result column="location_name" property="locationName" />
+        <result column="location_position" property="locationPosition" />
+        <result column="create_user_id" property="createUserId" />
+        <result column="create_user" property="createUser" />
+        <result column="create_time" property="createTime" />
+        <result column="update_time" property="updateTime" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, location_no, location_name, location_position, create_user_id, create_user, create_time, update_time
+    </sql>
+
+    <select id="selectLocationListPage" resultType="com.casic.missiles.dto.resource.environment.LocationListResponse">
+        SELECT *
+        FROM env_location_info
+        WHERE 1=1
+        <if test="request.locationNo != null and request.locationNo !=''">
+            AND location_no LIKE concat('%',#{request.locationNo},'%')
+        </if>
+        <if test="request.locationName != null and request.locationName !=''">
+            AND location_name LIKE concat('%',#{request.locationName},'%')
+        </if>
+        ORDER BY create_time DESC
+    </select>
+
+</mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml
index b28c18f..8854047 100644
--- a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml
@@ -11,7 +11,6 @@
         <result column="sign_desc" property="signDesc" />
         <result column="sign_director" property="signDirector" />
         <result column="sign_user_id" property="signUserId" />
-        <result column="sign_type" property="signType" />
         <result column="minio_file_name" property="minioFileName" />
         <result column="create_time" property="createTime" />
         <result column="update_time" property="updateTime" />
@@ -28,7 +27,6 @@
         <result column="sign_name" property="signName" />
         <result column="sign_desc" property="signDesc" />
         <result column="sign_director" property="signDirector" />
-        <result column="sign_type" property="signType" />
         <result column="sign_user_id" property="signUserId" />
         <result column="minio_file_name" property="minioFileName" />
         <result column="create_time" property="createTime" />
@@ -62,4 +60,58 @@
         JOIN system_sign_user_relation ssur ON ss.id = ssur.sign_id
         WHERE ssur.user_id = #{userId}
     </select>
+
+    <select id="selectSignListPage" resultMap="BaseResultMap">
+        SELECT ss.*, sd.SIMPLE_NAME AS deptName
+        FROM system_sign ss
+        LEFT JOIN sys_user su ON su.id = ss.sign_user_id
+        LEFT JOIN sys_dept sd ON sd.id = su.dept_id
+        WHERE 1=1
+        <if test="request.signNo != null and request.signNo !=''">
+            AND ss.sign_no LIKE concat('%',#{request.signNo},'%')
+        </if>
+        <if test="request.signName != null and request.signName !=''">
+            AND ss.sign_name LIKE concat('%',#{request.signName},'%')
+        </if>
+        <if test="request.signDirector != null and request.signDirector !=''">
+            AND ss.sign_director LIKE concat('%',#{request.signDirector},'%')
+        </if>
+        <if test="request.signUserId != null and request.signUserId !=''">
+            AND ss.sign_user_id = #{request.signUserId}
+        </if>
+        <if test="request.createStartTime != null and request.createStartTime !=''">
+            AND DATE_FORMAT(ss.create_time,'%Y-%m-%d') &gt;= DATE_FORMAT(#{request.createStartTime},'%Y-%m-%d')
+        </if>
+        <if test="request.createEndTime != null and request.createEndTime !=''">
+            AND DATE_FORMAT(ss.create_time,'%Y-%m-%d')  &lt;= DATE_FORMAT(#{request.createEndTime},'%Y-%m-%d')
+        </if>
+        ORDER BY ss.create_time DESC
+    </select>
+
+    <select id="selectSignList" resultMap="BaseResultMap">
+        SELECT ss.*, sd.SIMPLE_NAME AS deptName
+        FROM system_sign ss
+        LEFT JOIN sys_user su ON su.id = ss.sign_user_id
+        LEFT JOIN sys_dept sd ON sd.id = su.dept_id
+        WHERE 1=1
+        <if test="request.signNo != null and request.signNo !=''">
+            AND ss.sign_no LIKE concat('%',#{request.signNo},'%')
+        </if>
+        <if test="request.signName != null and request.signName !=''">
+            AND ss.sign_name LIKE concat('%',#{request.signName},'%')
+        </if>
+        <if test="request.signDirector != null and request.signDirector !=''">
+            AND ss.sign_director LIKE concat('%',#{request.signDirector},'%')
+        </if>
+        <if test="request.signUserId != null and request.signUserId !=''">
+            AND ss.sign_user_id = #{request.signUserId}
+        </if>
+        <if test="request.createStartTime != null and request.createStartTime !=''">
+            AND DATE_FORMAT(ss.create_time,'%Y-%m-%d') &gt;= DATE_FORMAT(#{request.createStartTime},'%Y-%m-%d')
+        </if>
+        <if test="request.createEndTime != null and request.createEndTime !=''">
+            AND DATE_FORMAT(ss.create_time,'%Y-%m-%d')  &lt;= DATE_FORMAT(#{request.createEndTime},'%Y-%m-%d')
+        </if>
+        ORDER BY ss.create_time DESC
+    </select>
 </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 515050a..60f530b 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
@@ -47,8 +47,8 @@
     String STORAGE_LOCATION = "bizStorageLocation";
     //计量专业
     String MEASURE_MAJOR = "bizMeasureMajor";
-    //管理状态
-    String MANAGER_STATE = "bizManagerState";
+    //标准装置管理状态
+    String STANDARD_MANAGER_STATE = "bizStandardManagerState";
 
     /**
      * 资源管理 字典code
@@ -95,8 +95,6 @@
     String MEASURE_STATUS = "measureStatus";
     //检定方式
     String MEASURE_TYPE = "measureType";
-    //标识打印标志类型
-    String IDENTIFY_PRINT_TYPE = "bizBusinessIdentify";
     //变更类型
     String REPORT_CHANGE_TYPE = "bizCertChangeType";
     //规模类型
@@ -111,19 +109,24 @@
     String MEASURE_CATEGORY = "measureCategory";
     //检定结果
     String MEASURE_RESULT = "measureResult";
+    //分包原因
+    String OUTSOURCE_REASON = "outsourceReason";
+
+    /**
+     * 系统管理
+     */
+    String TEMPLATE_TYPE = "templateType";
+
 
     /**
      * 标准装置 字典code
      */
     //类别
     String STANDARD_CATEGORY = "standardCategory";
-    //管理状态
-    String STANDARD_MANAGER_STATE = "standardManagerState";
     //标准等级
     String STANDARD_LEVEL = "standardLevel";
     //传递范围
     String STANDARD_TRANSMIT_RANGE = "transmitRange";
-
     //资本来源
     String CAPITAL_SOURCE = "capitalSource";
     //标准装置-申请类型
@@ -148,8 +151,6 @@
     String CERTIFICATE_CLASS = "certificationClass";
     //证书管理-检校专业
     String CALIBRATION_MAJOR = "calibrationMajor";
-    //分包原因
-    String OUTSOURCE_REASON = "outsourceReason";
 
     /**
      * 工作台
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/BaseApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/BaseApprovalListRequest.java
index 73c12c1..80d7424 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/BaseApprovalListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/BaseApprovalListRequest.java
@@ -6,6 +6,7 @@
 
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotEmpty;
+import java.util.List;
 
 /**
  * @Description:
@@ -19,14 +20,14 @@
      * 表单id
      */
     @NotBlank(message = "表单id不能为空")
-    @ApiModelProperty(value = "表单id（流程定义对应的表单id，等价于业务id）", dataType = "String")
+    @ApiModelProperty(value = "表单id（流程定义对应的表单id，等价于业务id），导出接口不用传", dataType = "String")
     private String formId;
 
     /**
      * 审批状态类型，对应ApprovalStatusEnum
      */
     @NotEmpty(message = "审批状态类型不能为空")
-    @ApiModelProperty(value = "审批状态类型code", dataType = "String")
+    @ApiModelProperty(value = "审批状态类型code，导出接口不用传", dataType = "String")
     private String approvalStatus;
 
     @ApiModelProperty(hidden = true)
@@ -34,4 +35,7 @@
 
     @ApiModelProperty(hidden = true)
     private Long createUserId;
+
+    @ApiModelProperty(value = "导出ids", dataType = "List")
+    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificatePrintApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificatePrintApprovalListRequest.java
index b93d1c9..3cc2f4e 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificatePrintApprovalListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificatePrintApprovalListRequest.java
@@ -5,8 +5,6 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import java.util.List;
-
 /**
  * @Description:
  * @Author: wangpeng
@@ -38,7 +36,4 @@
 
     @ApiModelProperty(value = "创建结束时间", dataType = "String")
     private String createTimeEnd;
-
-    @ApiModelProperty(value = "导出ids", dataType = "List")
-    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportApprovalListRequest.java
index 4f7a038..c115847 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportApprovalListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportApprovalListRequest.java
@@ -5,8 +5,6 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import java.util.List;
-
 /**
  * @Description:
  * @Author: wangpeng
@@ -15,6 +13,8 @@
 @ApiModel
 @Data
 public class CertificateReportApprovalListRequest extends BaseApprovalListRequest {
+    @ApiModelProperty(value = "委托方id", dataType = "String")
+    private Long customerId;
 
     @ApiModelProperty(value = "证书报告编号", dataType = "String")
     private String certificateReportNo;
@@ -37,6 +37,4 @@
     @ApiModelProperty(value = "检校结束时间", dataType = "String")
     private String calibrationTimeEnd;
 
-    @ApiModelProperty(value = "导出ids", dataType = "List")
-    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/identify/IdentifyListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/identify/IdentifyListRequest.java
index 1b87ae6..f019203 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/identify/IdentifyListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/identify/IdentifyListRequest.java
@@ -4,6 +4,8 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * @Description:
  * @Author: wangpeng
@@ -26,4 +28,7 @@
 
     @ApiModelProperty(value = "打印结束时间", dataType = "String")
     private String createTimeEnd;
+
+    @ApiModelProperty(value = "导出ids", dataType = "List")
+    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListRequest.java
index 1264883..62415fb 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListRequest.java
@@ -7,6 +7,7 @@
 import lombok.Data;
 
 import javax.validation.constraints.NotBlank;
+import java.util.List;
 
 @Data
 @ApiModel
@@ -37,4 +38,6 @@
     @ApiModelProperty(value = "是否加急（1是0否null全部）", dataType = "Integer")
     private String isUrgent;
 
+    @ApiModelProperty(value = "导出ids", dataType = "List")
+    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListRequest.java
index 5201d7b..499760a 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListRequest.java
@@ -17,6 +17,9 @@
     @ApiModelProperty(value = "任务单编号", dataType = "String")
     private String orderNo;
 
+    @ApiModelProperty(value = "委托方id", dataType = "Long")
+    private Long customerId;
+
     @ApiModelProperty(value = "委托方名称", dataType = "String")
     private String customerName;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OrderSampleDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OrderSampleDTO.java
new file mode 100644
index 0000000..796edc0
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OrderSampleDTO.java
@@ -0,0 +1,19 @@
+package com.casic.missiles.dto.business.outsource;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/8/24 11:38
+ */
+@ApiModel
+@Data
+public class OrderSampleDTO {
+    @ApiModelProperty(value = "任务单id", dataType = "Long")
+    private Long orderId;
+    @ApiModelProperty(value = "受检设备id", dataType = "Long")
+    private Long sampleId;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceAssessApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceAssessApprovalListRequest.java
new file mode 100644
index 0000000..9a930c3
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceAssessApprovalListRequest.java
@@ -0,0 +1,30 @@
+package com.casic.missiles.dto.business.outsource;
+
+import com.casic.missiles.dto.BaseApprovalListRequest;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/8/24 11:01
+ */
+@ApiModel
+@Data
+public class OutsourceAssessApprovalListRequest extends BaseApprovalListRequest {
+    @ApiModelProperty(value = "评审表编号", dataType = "String")
+    private String projectNo;
+
+    @ApiModelProperty(value = "分包机构名称", dataType = "String")
+    private String outsourcerName;
+
+    @ApiModelProperty(value = "申请人", dataType = "String")
+    private String applicantName;
+
+    @ApiModelProperty(value = "申请时间开始", dataType = "String")
+    private String applicantTimeStart;
+
+    @ApiModelProperty(value = "申请时间结束", dataType = "String")
+    private String applicantTimeEnd;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceAssessSaveResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceAssessSaveResponse.java
new file mode 100644
index 0000000..8bf9aad
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceAssessSaveResponse.java
@@ -0,0 +1,20 @@
+package com.casic.missiles.dto.business.outsource;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/8/14 16:17
+ */
+@ApiModel
+@Data
+public class OutsourceAssessSaveResponse {
+    @ApiModelProperty(value = "主键id", dataType = "Long")
+    private Long id;
+
+    @ApiModelProperty(value = "编号", dataType = "String")
+    private String projectNo;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProtocolApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProtocolApprovalListRequest.java
new file mode 100644
index 0000000..0f32331
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProtocolApprovalListRequest.java
@@ -0,0 +1,30 @@
+package com.casic.missiles.dto.business.outsource;
+
+import com.casic.missiles.dto.BaseApprovalListRequest;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/8/24 15:01
+ */
+@ApiModel
+@Data
+public class OutsourceProtocolApprovalListRequest extends BaseApprovalListRequest {
+    @ApiModelProperty(value = "协议书编号", dataType = "String")
+    private String protocolNo;
+
+    @ApiModelProperty(value = "分包方名称", dataType = "String")
+    private String outsourcerName;
+
+    @ApiModelProperty(value = "申请人", dataType = "String")
+    private String applicantName;
+
+    @ApiModelProperty(value = "申请时间开始", dataType = "String")
+    private String applicantTimeStart;
+
+    @ApiModelProperty(value = "申请时间结束", dataType = "String")
+    private String applicantTimeEnd;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProtocolSaveResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProtocolSaveResponse.java
new file mode 100644
index 0000000..e324967
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProtocolSaveResponse.java
@@ -0,0 +1,20 @@
+package com.casic.missiles.dto.business.outsource;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/8/14 16:17
+ */
+@ApiModel
+@Data
+public class OutsourceProtocolSaveResponse {
+    @ApiModelProperty(value = "主键id", dataType = "Long")
+    private Long id;
+
+    @ApiModelProperty(value = "编号", dataType = "String")
+    private String protocolNo;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveApprovalListRequest.java
index f29f4e4..7047c28 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveApprovalListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveApprovalListRequest.java
@@ -5,8 +5,6 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import java.util.List;
-
 /**
  * @Description: 现场检测审批列表请求实体
  * @Author: wangpeng
@@ -30,7 +28,4 @@
     @ApiModelProperty(value = "申请时间结束", dataType = "String")
     private String applyTimeEnd;
 
-    @ApiModelProperty(value = "导出ids", dataType = "List")
-    private List<Long> ids;
-
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveDetailResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveDetailResponse.java
index 1f28752..394c934 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveDetailResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveDetailResponse.java
@@ -12,6 +12,18 @@
     @ApiModelProperty(value = "id，更新/删除使用参数", dataType = "Long")
     private Long id;
 
+    @ApiModelProperty(value = "实验室代码(字典code)", dataType = "String")
+    private String labCode;
+
+    @ApiModelProperty(value = "实验室代码(字典value)", dataType = "String")
+    private String labCodeName;
+
+    @ApiModelProperty(value = "组别代码(字典code)", dataType = "String")
+    private String groupCode;
+
+    @ApiModelProperty(value = "组别代码(字典value)", dataType = "String")
+    private String groupCodeName;
+
     @ApiModelProperty(value = "审批编号", dataType = "String")
     private String siteExecutiveNo;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/environment/LocationListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/environment/LocationListRequest.java
new file mode 100644
index 0000000..13d03c3
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/environment/LocationListRequest.java
@@ -0,0 +1,20 @@
+package com.casic.missiles.dto.resource.environment;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/6/8 13:56
+ */
+@ApiModel
+@Data
+public class LocationListRequest {
+    @ApiModelProperty(value = "地点编号", dataType = "String")
+    private String locationNo;
+
+    @ApiModelProperty(value = "地点名称", dataType = "String")
+    private String locationName;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/environment/LocationListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/environment/LocationListResponse.java
new file mode 100644
index 0000000..4c531af
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/environment/LocationListResponse.java
@@ -0,0 +1,78 @@
+package com.casic.missiles.dto.resource.environment;
+
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
+import com.baomidou.mybatisplus.annotation.TableField;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description: 地点列表响应实体
+ * @Author: wangpeng
+ * @Date: 2023/6/8 13:53
+ */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
+@ApiModel
+@Data
+public class LocationListResponse {
+    @ApiModelProperty(value = "主键id", dataType = "Long")
+    private Long id;
+
+    /**
+     * 地点编号
+     */
+    @ExcelProperty("地点编号")
+    @ApiModelProperty(value = "地点编号", dataType = "String")
+    private String locationNo;
+
+    /**
+     * 地点名称
+     */
+    @ExcelProperty("地点名称")
+    @ApiModelProperty(value = "地点名称", dataType = "String")
+    private String locationName;
+
+    /**
+     * 地点位置
+     */
+    @ExcelProperty("地点位置")
+    @ApiModelProperty(value = "地点位置", dataType = "String")
+    private String locationPosition;
+
+    /**
+     * 创建人id
+     */
+    @ApiModelProperty(value = "创建人id", dataType = "Long")
+    private Long createUserId;
+
+    /**
+     * 创建人
+     */
+    @ExcelProperty("创建人")
+    @ApiModelProperty(value = "创建人", dataType = "String")
+    @TableField("create_user")
+    private String createUser;
+
+    /**
+     * 创建时间
+     */
+    @ExcelProperty("创建时间")
+    @ApiModelProperty(value = "创建时间", dataType = "String")
+    private String createTime;
+
+    /**
+     * 更新时间
+     */
+    @ApiModelProperty(value = "更新时间", dataType = "String")
+    private String updateTime;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertRequest.java
index 9a7f6c6..c827915 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertRequest.java
@@ -4,6 +4,8 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * @Description:
  * @Author: wangpeng
@@ -16,4 +18,7 @@
     private String name;
     @ApiModelProperty(value = "部门名", dataType = "String")
     private String deptName;
+
+    @ApiModelProperty(value = "导出ids", dataType = "List")
+    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertResponse.java
index f78b159..8f2f79e 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertResponse.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.dto.resource.staff;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.casic.missiles.annotation.DictCodeField;
 import com.casic.missiles.constants.MeterDictCode;
 import io.swagger.annotations.ApiModel;
@@ -13,12 +20,18 @@
  * @Author: wangpeng
  * @Date: 2023/7/27 15:13
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @ApiModel
 @Data
 public class StaffCertResponse {
     /**
      * 人员编号
      */
+    @ExcelProperty(value = "人员编号",order = 0)
     @NotEmpty(message = "人员编号不能为空")
     @ApiModelProperty(value = "人员编号", dataType = "String")
     private String staffNo;
@@ -26,6 +39,7 @@
     /**
      * 姓名
      */
+    @ExcelProperty(value = "姓名",order = 1)
     @ApiModelProperty(value = "姓名", dataType = "String")
     private String staffName;
 
@@ -54,6 +68,7 @@
     /**
      * 部门名字
      */
+    @ExcelProperty(value = "工作部门",order = 2)
     @ApiModelProperty(value = "部门名字", dataType = "String")
     private String deptName;
 
@@ -66,6 +81,7 @@
     /**
      * 计量专业
      */
+    @ExcelProperty(value = "计量专业",order = 3)
     @ApiModelProperty(value = "计量专业", dataType = "String")
     private String major;
 
@@ -110,6 +126,7 @@
     /**
      * 证书号
      */
+    @ExcelProperty(value = "证号",order = 4)
     @ApiModelProperty(value = "证书号", dataType = "String")
     private String certNo;
 
@@ -122,12 +139,14 @@
     /**
      * 有效日期
      */
+    @ExcelProperty(value = "证书有效期",order = 6)
     @ApiModelProperty(value = "有效日期", dataType = "String")
     private String effectiveDate;
 
     /**
      * 发放日期
      */
+    @ExcelProperty(value = "发证日期",order = 5)
     @ApiModelProperty(value = "发放日期", dataType = "String")
     private String grantDate;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffListRequest.java
index 7c4afb3..0a1194a 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffListRequest.java
@@ -4,6 +4,8 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * @Description:
  * @Author: wangpeng
@@ -18,4 +20,7 @@
     private String deptName;
     @ApiModelProperty(value = "部门id", dataType = "Long")
     private Long deptId;
+
+    @ApiModelProperty(value = "导出ids", dataType = "List")
+    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/TrainListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/TrainListRequest.java
index f68597b..6321f8b 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/TrainListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/TrainListRequest.java
@@ -14,6 +14,8 @@
 public class TrainListRequest {
     @ApiModelProperty(value = "训练登记表编号", dataType = "String")
     private String trainNo;
+    @ApiModelProperty(value = "值班领导", dataType = "String")
+    private String dutyLeader;
     @ApiModelProperty(value = "创建开始时间", dataType = "String")
     private String createTimeStart;
     @ApiModelProperty(value = "创建结束时间", dataType = "String")
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/SignAddRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/SignAddRequest.java
index 117be34..d71055c 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/SignAddRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/SignAddRequest.java
@@ -43,13 +43,6 @@
     private Long signUserId;
 
     /**
-     * 签章或签名-字典code
-     */
-    @NotBlank(message = "类型不能为空")
-    @ApiModelProperty(value = "签名/签章-字典code", dataType = "String", required = true)
-    private String signType;
-
-    /**
      * minio存储文件名
      */
     @ApiModelProperty(value = "上传文件返回名称", dataType = "String")
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateAddRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateAddRequest.java
index aff1265..6316648 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateAddRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateAddRequest.java
@@ -17,30 +17,28 @@
 @Data
 public class TemplateAddRequest extends BaseSystemRequest {
     /**
-     * 原始记录模板/证书报告模板名称
+     * 模板名称
      */
     @ApiModelProperty(value = "名称", dataType = "String", required = true)
     @NotBlank(message = "名称不能为空")
     private String templateName;
 
     /**
-     * 原始记录模板/证书报告模板描述
+     * 模板描述
      */
     @ApiModelProperty(value = "描述", dataType = "String")
     private String templateDesc;
 
     /**
-     * 原始记录模板/证书报告模板创建人
+     * 创建人
      */
     @ApiModelProperty(value = "创建人", dataType = "String", required = true)
     @NotBlank(message = "创建人不能为空")
     private String templateCreator;
 
-    /**
-     * 原始记录模板/证书报告模板-字典code
-     */
-    @NotBlank(message = "类型不能为空")
-    @ApiModelProperty(value = "原始记录模板/证书报告模板-字典code", dataType = "String", required = true)
+
+    @NotBlank(message = "模板类型不能为空")
+    @ApiModelProperty(value = "模板类型(字典code)", dataType = "String", required = true)
     private String templateType;
 
     /**
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateListRequest.java
index eec5a1e..6d17bbe 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateListRequest.java
@@ -1,11 +1,12 @@
 package com.casic.missiles.dto.system;
 
+import com.casic.missiles.annotation.DictCodeField;
+import com.casic.missiles.constants.MeterDictCode;
 import com.casic.missiles.dto.BaseSystemRequest;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import javax.validation.constraints.NotBlank;
 import java.util.List;
 
 /**
@@ -19,8 +20,8 @@
     /**
      * 类型
      */
-//    @ApiModelProperty(value = "类型-字典code", dataType = "String", required = true)
-    @NotBlank(message = "类型不能为空")
+    @DictCodeField(message = "模板类型不合法", cacheName = MeterDictCode.TEMPLATE_TYPE)
+    @ApiModelProperty(value = "模板类型(字典code)", dataType = "String")
     private String templateType;
 
     /**
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificateChangeApply.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificateChangeApply.java
index 9216308..36923fd 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificateChangeApply.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificateChangeApply.java
@@ -1,11 +1,19 @@
 package com.casic.missiles.model.business;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 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 com.casic.missiles.dto.BaseRequest;
+import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -20,6 +28,12 @@
  * @author wangpeng
  * @since 2023-08-15
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
+@ApiModel
 @Data
 @TableName("biz_business_certificate_change_apply")
 public class BizBusinessCertificateChangeApply extends BaseRequest implements Serializable {
@@ -33,6 +47,7 @@
     /**
      * 申请单编号
      */
+    @ExcelProperty(value = "申请单编号", order = 1)
     @ApiModelProperty(value = "申请单编号", dataType = "String")
     @TableField("change_apply_no")
     private String changeApplyNo;
@@ -40,6 +55,7 @@
     /**
      * 申请单名字
      */
+    @ExcelProperty(value = "申请单名称", order = 2)
     @ApiModelProperty(value = "申请单名字", dataType = "String")
     @TableField("change_apply_name")
     private String changeApplyName;
@@ -54,6 +70,7 @@
     /**
      * 更换证书编号
      */
+    @ExcelProperty(value = "更换证书编号", order = 3)
     @ApiModelProperty(value = "更换证书编号", dataType = "String")
     @TableField("change_report_no")
     private String changeReportNo;
@@ -61,7 +78,8 @@
     /**
      * 更换证书名字
      */
-    @ApiModelProperty(value = "更换证书名字", dataType = "String")
+    @ExcelProperty(value = "更换证书/报告名称", order = 4)
+    @ApiModelProperty(value = "更换证书/报告名称", dataType = "String")
     @TableField("change_report_name")
     private String changeReportName;
 
@@ -73,6 +91,7 @@
     @TableField("change_type")
     private String changeType;
 
+    @ExcelProperty(value = "变更类型", order = 5)
     @ApiModelProperty(value = "变更类型(字典value)", dataType = "String")
     @TableField(exist = false)
     private String changeTypeName;
@@ -142,13 +161,15 @@
     /**
      * 创建用户名字
      */
-    @ApiModelProperty(value = "创建用户名字", dataType = "String")
+    @ExcelProperty(value = "创建人", order = 6)
+    @ApiModelProperty(value = "创建人名字", dataType = "String")
     @TableField("create_user_name")
     private String createUserName;
 
     /**
      * 创建时间
      */
+    @ExcelProperty(value = "创建时间", order = 7)
     @ApiModelProperty(value = "创建时间", dataType = "String")
     @TableField("create_time")
     private String createTime;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificateReport.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificateReport.java
index f01db9e..db06018 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificateReport.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificateReport.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.model.business;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -22,6 +29,11 @@
  * @author wangpeng
  * @since 2023-08-14
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @ApiModel
 @Data
 @TableName("biz_business_certificate_report")
@@ -36,6 +48,7 @@
     /**
      * 证书报告编号
      */
+    @ExcelProperty(value = "证书报告编号", order = 1)
     @ApiModelProperty(value = "证书报告编号", dataType = "String")
     @TableField("certificate_report_no")
     private String certificateReportNo;
@@ -43,6 +56,7 @@
     /**
      * 证书报告名称
      */
+    @ExcelProperty(value = "证书报告名称", order = 2)
     @ApiModelProperty(value = "证书报告名称", dataType = "String")
     @TableField("certificate_report_name")
     private String certificateReportName;
@@ -62,6 +76,7 @@
     @TableField("measure_category")
     private String measureCategory;
 
+    @ExcelProperty(value = "检校类别", order = 6)
     @ApiModelProperty(value = "检校类别(字典value)", dataType = "String")
     @TableField(exist = false)
     private String measureCategoryName;
@@ -69,6 +84,7 @@
     /**
      * 检校时间
      */
+    @ExcelProperty(value = "检校时间", order = 8)
     @ApiModelProperty(value = "检校时间", dataType = "String")
     @TableField("calibration_time")
     private String calibrationTime;
@@ -267,18 +283,22 @@
     @TableField(exist = false)
     private Integer decisionItem;
 
-    @ApiModelProperty(value = "设备样品编号（列表返回参数）", dataType = "String")
+    @ExcelProperty(value = "被检设备统一编号", order = 3)
+    @ApiModelProperty(value = "被检设备统一编号（列表返回参数）", dataType = "String")
     @TableField(exist = false)
     private String sampleNo;
 
-    @ApiModelProperty(value = "设备样品名称（列表返回参数）", dataType = "String")
+    @ExcelProperty(value = "被检设备名称", order = 4)
+    @ApiModelProperty(value = "被检设备名称（列表返回参数）", dataType = "String")
     @TableField(exist = false)
     private String sampleName;
 
-    @ApiModelProperty(value = "设备样品规格型号（列表返回参数）", dataType = "String")
+    @ExcelProperty(value = "规格型号", order = 5)
+    @ApiModelProperty(value = "规格型号（列表返回参数）", dataType = "String")
     @TableField(exist = false)
     private String sampleModel;
 
+    @ExcelProperty(value = "检定员", order = 7)
     @ApiModelProperty(value = "检定员名字（列表返回参数）", dataType = "String")
     @TableField(exist = false)
     private String staffName;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessIdentifyInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessIdentifyInfo.java
index 46bfba5..f1a9bec 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessIdentifyInfo.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessIdentifyInfo.java
@@ -1,10 +1,15 @@
 package com.casic.missiles.model.business;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 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;
 
@@ -20,6 +25,11 @@
  * @author wangpeng
  * @since 2023-08-15
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @Data
 @TableName("biz_business_identify_info")
 public class BizBusinessIdentifyInfo implements Serializable {
@@ -33,6 +43,7 @@
     /**
      * 记录编号
      */
+    @ExcelProperty(value = "记录编号", order = 1)
     @ApiModelProperty(value = "记录编号", dataType = "String")
     @TableField("record_no")
     private String recordNo;
@@ -41,20 +52,15 @@
      * 标志类型(字典code)
      */
     @NotEmpty(message = "标志类型不能为空")
-    @ApiModelProperty(value = "标志类型(字典code)", dataType = "String")
-    @DictCodeField(message = "标志类型不合法", cacheName = MeterDictCode.IDENTIFY_PRINT_TYPE)
+    @ApiModelProperty(value = "标志类型(直接存计量标识/使用状态/校准状态的字典value)", dataType = "String")
     @TableField("identify_type")
     private String identifyType;
 
-    @ApiModelProperty(value = "标志类型(字典value)", dataType = "String")
-    @TableField(exist = false)
-    private String identifyTypeName;
-
     /**
      * 设备id(可以是受检设备/设备台账)
      */
     @NotNull(message = "设备id不能为空")
-    @ApiModelProperty(value = "设备id(可以是受检设备/设备台账)", dataType = "String")
+    @ApiModelProperty(value = "设备id(可以是受检设备/设备台账)", dataType = "Long")
     @TableField("device_id")
     private Long deviceId;
 
@@ -66,29 +72,32 @@
     @TableField("device_type")
     private String deviceType;
 
+    @ExcelProperty(value = "统一编号", order = 3)
     @NotEmpty(message = "设备编号不能为空")
-    @ApiModelProperty(value = "设备编号", dataType = "String")
+    @ApiModelProperty(value = "统一编号", dataType = "String")
     @TableField("device_no")
     private String deviceNo;
 
     /**
      * 设备名字
      */
-    @NotEmpty(message = "设备名字不能为空")
-    @ApiModelProperty(value = "设备名字", dataType = "String")
+    @ExcelProperty(value = "设备名称", order = 4)
+    @NotEmpty(message = "设备名称不能为空")
+    @ApiModelProperty(value = "设备名称", dataType = "String")
     @TableField("device_name")
     private String deviceName;
 
     /**
      * 检定员id
      */
-    @ApiModelProperty(value = "检定员id", dataType = "String")
+    @ApiModelProperty(value = "检定员id", dataType = "Long")
     @TableField("measure_person_id")
     private Long measurePersonId;
 
     /**
      * 检定员名字
      */
+    @ExcelProperty(value = "检定员", order = 5)
     @ApiModelProperty(value = "检定员名字", dataType = "String")
     @TableField("measure_person")
     private String measurePerson;
@@ -103,7 +112,8 @@
     /**
      * 更新时间
      */
-    @ApiModelProperty(value = "更新时间", dataType = "String")
+    @ExcelProperty(value = "打印时间", order = 6)
+    @ApiModelProperty(value = "打印时间", dataType = "String")
     @TableField("update_time")
     private String updateTime;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceAssess.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceAssess.java
index 659d9ca..6720b90 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceAssess.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceAssess.java
@@ -1,11 +1,26 @@
 package com.casic.missiles.model.business;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 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 com.casic.missiles.dto.BaseRequest;
+import com.casic.missiles.dto.business.outsource.OrderSampleDTO;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import javax.validation.constraints.NotEmpty;
 import java.io.Serializable;
+import java.util.List;
 
 /**
  * <p>
@@ -15,146 +30,231 @@
  * @author wangpeng
  * @since 2023-08-16
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
+@ApiModel
 @Data
 @TableName("biz_business_outsource_assess")
-public class BizBusinessOutsourceAssess implements Serializable {
+public class BizBusinessOutsourceAssess extends BaseRequest implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
+    @ApiModelProperty(value = "id，更新/删除使用参数", dataType = "Long")
     @TableId("id")
     private Long id;
 
     /**
      * 评审表编号
      */
+    @ExcelProperty(value = "评审表编号", order = 1)
+    @ApiModelProperty(value = "评审表编号(后台生成)", dataType = "String")
     @TableField("project_no")
     private String projectNo;
 
     /**
      * 评审表名称
      */
+    @ExcelProperty(value = "评审表名称", order = 2)
+    @ApiModelProperty(value = "评审表名称", dataType = "String")
     @TableField("project_name")
     private String projectName;
 
+    @NotEmpty(message = "实验室代码不能为空")
+    @DictCodeField(message = "实验室代码描述不合法", cacheName = MeterDictCode.LAB_CODE)
+    @ApiModelProperty(value = "实验室代码(字典code)", dataType = "String")
+    @TableField("lab_code")
+    private String labCode;
+
+    @ApiModelProperty(value = "实验室代码(字典value)", dataType = "String")
+    @TableField(exist = false)
+    private String labCodeName;
+
+    /**
+     * 组别代码
+     */
+    @NotEmpty(message = "组别代码不能为空")
+    @DictCodeField(message = "组别代码描述不合法", cacheName = MeterDictCode.GROUP_CODE)
+    @ApiModelProperty(value = "组别代码(字典code)", dataType = "String")
+    @TableField("group_code")
+    private String groupCode;
+
+    @ApiModelProperty(value = "组别代码(字典value)", dataType = "String")
+    @TableField(exist = false)
+    private String groupCodeName;
+
     /**
      * 申请人id
      */
+    @ApiModelProperty(value = "申请人id", dataType = "String")
     @TableField("applicant_id")
     private Long applicantId;
 
     /**
      * 申请人名字
      */
+    @ExcelProperty(value = "申请人", order = 5)
+    @ApiModelProperty(value = "申请人", dataType = "String")
     @TableField("applicant_name")
     private String applicantName;
 
     /**
      * 申请时间
      */
+    @ExcelProperty(value = "申请时间", order = 6)
+    @ApiModelProperty(value = "申请时间", dataType = "String")
     @TableField("applicant_time")
     private String applicantTime;
 
     /**
      * 附件(minio存储文件名)
      */
+    @ApiModelProperty(value = "附件(minio存储文件名)", dataType = "String")
     @TableField("minio_file_name")
     private String minioFileName;
 
     /**
      * 备注
      */
+    @ApiModelProperty(value = "备注", dataType = "String")
     @TableField("remark")
     private String remark;
 
     /**
      * 创建人id
      */
+    @ApiModelProperty(value = "创建人id", dataType = "String")
     @TableField("create_user_id")
     private Long createUserId;
 
     /**
      * 创建人名字
      */
+    @ApiModelProperty(value = "创建人名字", dataType = "String")
     @TableField("create_user_name")
     private String createUserName;
 
     /**
      * 分包方id
      */
+    @ApiModelProperty(value = "评审表编号", dataType = "String")
     @TableField("outsourcer_id")
     private Long outsourcerId;
 
     /**
      * 预计开始时间
      */
+    @ApiModelProperty(value = "预计开始时间", dataType = "String")
     @TableField("pre_start_time")
     private String preStartTime;
 
     /**
      * 预计结束时间
      */
+    @ApiModelProperty(value = "预计结束时间", dataType = "String")
     @TableField("pre_end_time")
     private String preEndTime;
 
     /**
      * 分包原因-字典
      */
+    @ApiModelProperty(value = "分包原因(字典code)", dataType = "String")
+    @DictCodeField(message = "分包原因描述不合法", cacheName = MeterDictCode.OUTSOURCE_REASON)
     @TableField("outsource_reason")
     private String outsourceReason;
 
+    @ApiModelProperty(value = "分包原因(字典value)", dataType = "String")
+    @TableField(exist = false)
+    private String outsourceReasonName;
+
     /**
      * 预计费用
      */
+    @ApiModelProperty(value = "预计费用", dataType = "String")
     @TableField("pre_cost")
     private String preCost;
 
     /**
      * 审批状态
      */
+    @ApiModelProperty(value = "审批状态", dataType = "String")
+    @DictCodeField(message = "审批状态描述不合法", cacheName = MeterDictCode.APPROVAL_STATUS)
     @TableField("approval_status")
     private String approvalStatus;
 
     /**
      * 流程实例id
      */
+    @ApiModelProperty(value = "流程实例id", dataType = "String")
     @TableField("process_id")
     private String processId;
 
     /**
      * 实验室认可情况
      */
+    @ApiModelProperty(value = "实验室认可情况", dataType = "String")
     @TableField("approve_situation")
     private String approveSituation;
 
     /**
      * 溯源性
      */
+    @ApiModelProperty(value = "溯源性", dataType = "String")
     @TableField("traceability")
     private String traceability;
 
     /**
      * 测试方法
      */
+    @ApiModelProperty(value = "测试方法", dataType = "String")
     @TableField("test_method")
     private String testMethod;
 
     /**
      * 技术能力
      */
+    @ApiModelProperty(value = "技术能力", dataType = "String")
     @TableField("technique_ability")
     private String techniqueAbility;
 
     /**
      * 创建时间
      */
+    @ApiModelProperty(hidden = true)
     @TableField("create_time")
     private String createTime;
 
     /**
      * 更新时间
      */
+    @ApiModelProperty(hidden = true)
     @TableField("update_time")
     private String updateTime;
 
+    @ApiModelProperty(value = "审批状态类型-字典value", dataType = "String")
+    @TableField(exist = false)
+    private String approvalStatusName;
 
+    @ApiModelProperty(value = "任务id（同意、驳回等操作使用）", dataType = "String")
+    @TableField(exist = false)
+    private String taskId;
+
+    @ApiModelProperty(value = "可选决策项（1同意驳回拒绝 2同意驳回 3同意拒绝，用于待审批列表同意/驳回/拒绝按钮展示）", dataType = "Integer")
+    @TableField(exist = false)
+    private Integer decisionItem;
+
+    @NotEmpty(message = "受检设备信息不能为空")
+    @ApiModelProperty(value = "受检设备id列表（新建使用参数）", dataType = "List")
+    @TableField(exist = false)
+    private List<OrderSampleDTO> orderSampleList;
+
+    @ExcelProperty(value = "分包机构名称", order = 3)
+    @ApiModelProperty(value = "分包机构名称（列表返回参数）", dataType = "String")
+    private String outsourcerName;
+
+    @ExcelProperty(value = "机构负责人", order = 4)
+    @ApiModelProperty(value = "机构负责人（列表返回参数）", dataType = "String")
+    private String director;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceProtocol.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceProtocol.java
new file mode 100644
index 0000000..38df697
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceProtocol.java
@@ -0,0 +1,225 @@
+package com.casic.missiles.model.business;
+
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
+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 com.casic.missiles.dto.BaseRequest;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotEmpty;
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 计量检定业务-分包管理-测试、校准或检定工作分包协议书
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-08-24
+ */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
+@Data
+@TableName("biz_business_outsource_protocol")
+public class BizBusinessOutsourceProtocol extends BaseRequest implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "id，更新/删除使用参数", dataType = "Long")
+    @TableId("id")
+    private Long id;
+
+    /**
+     * 协议书编号
+     */
+    @ExcelProperty(value = "协议书编号", order = 1)
+    @ApiModelProperty(value = "协议书编号(后台生成)", dataType = "String")
+    @TableField("protocol_no")
+    private String protocolNo;
+
+    /**
+     * 协议书名称
+     */
+    @ExcelProperty(value = "协议书名称", order = 2)
+    @ApiModelProperty(value = "协议书名称", dataType = "String")
+    @TableField("project_name")
+    private String projectName;
+
+    @NotEmpty(message = "实验室代码不能为空")
+    @DictCodeField(message = "实验室代码描述不合法", cacheName = MeterDictCode.LAB_CODE)
+    @ApiModelProperty(value = "实验室代码(字典code)", dataType = "String")
+    @TableField("lab_code")
+    private String labCode;
+
+    @ApiModelProperty(value = "实验室代码(字典value)", dataType = "String")
+    @TableField(exist = false)
+    private String labCodeName;
+
+    @NotEmpty(message = "组别代码不能为空")
+    @DictCodeField(message = "组别代码描述不合法", cacheName = MeterDictCode.GROUP_CODE)
+    @ApiModelProperty(value = "组别代码(字典code)", dataType = "String")
+    @TableField("group_code")
+    private String groupCode;
+
+    @ApiModelProperty(value = "组别代码(字典value)", dataType = "String")
+    @TableField(exist = false)
+    private String groupCodeName;
+
+    /**
+     * 分包方id
+     */
+    @ApiModelProperty(value = "分包方id", dataType = "Long")
+    @TableField("outsourcer_id")
+    private Long outsourcerId;
+
+    /**
+     * 其他
+     */
+    @ApiModelProperty(value = "其他", dataType = "String")
+    @TableField("remark")
+    private String remark;
+
+    /**
+     * 分包方编号
+     */
+    @ApiModelProperty(value = "分包方编号(新建不用传)", dataType = "String")
+    @TableField("outsource_no")
+    private String outsourceNo;
+
+    /**
+     * 分包方名称
+     */
+    @ExcelProperty(value = "分包方名称", order = 3)
+    @ApiModelProperty(value = "分包方名称(新建不用传)", dataType = "String")
+    @TableField("outsource_name")
+    private String outsourceName;
+
+    /**
+     * 联系人
+     */
+    @ExcelProperty(value = "联系人", order = 4)
+    @ApiModelProperty(value = "联系人", dataType = "String")
+    @TableField("contacts")
+    private String contacts;
+
+    /**
+     * 电话
+     */
+    @ApiModelProperty(value = "电话", dataType = "String")
+    @TableField("mobile")
+    private String mobile;
+
+    /**
+     * 地址
+     */
+    @ApiModelProperty(value = "地址", dataType = "String")
+    @TableField("address")
+    private String address;
+
+    /**
+     * 要求完成日期
+     */
+    @ApiModelProperty(value = "要求完成日期", dataType = "String")
+    @TableField("require_date")
+    private String requireDate;
+
+    /**
+     * 分包费用(元)
+     */
+    @ApiModelProperty(value = "分包费用(元)", dataType = "String")
+    @TableField("outsource_cost")
+    private Double outsourceCost;
+
+    /**
+     * 分包方负责人
+     */
+    @ApiModelProperty(value = "分包方负责人", dataType = "String")
+    @TableField("director")
+    private String director;
+
+    /**
+     * 分包项目
+     */
+    @ApiModelProperty(value = "分包项目", dataType = "String")
+    @TableField("item")
+    private String item;
+
+    /**
+     * 分包要求
+     */
+    @ApiModelProperty(value = "分包要求", dataType = "String")
+    @TableField("requires")
+    private String requires;
+
+    /**
+     * 创建人id
+     */
+    @ApiModelProperty(hidden = true)
+    @TableField("create_user_id")
+    private Long createUserId;
+
+    /**
+     * 创建人名字
+     */
+    @ExcelProperty(value = "申请人", order = 5)
+    @ApiModelProperty(value = "申请人", dataType = "String")
+    @TableField("create_user_name")
+    private String createUserName;
+
+    /**
+     * 审批状态
+     */
+    @ApiModelProperty(value = "审批状态", dataType = "String")
+    @DictCodeField(message = "审批状态描述不合法", cacheName = MeterDictCode.APPROVAL_STATUS)
+    @TableField("approval_status")
+    private String approvalStatus;
+
+    /**
+     * 流程实例id
+     */
+    @ApiModelProperty(value = "流程实例id", dataType = "String")
+    @TableField("process_id")
+    private String processId;
+
+    /**
+     * 创建时间
+     */
+    @ExcelProperty(value = "申请时间", order = 6)
+    @ApiModelProperty(value = "申请时间", dataType = "String")
+    @TableField("create_time")
+    private String createTime;
+
+    /**
+     * 更新时间
+     */
+    @ApiModelProperty(hidden = true)
+    @TableField("update_time")
+    private String updateTime;
+
+    @ApiModelProperty(value = "审批状态类型-字典value", dataType = "String")
+    @TableField(exist = false)
+    private String approvalStatusName;
+
+    @ApiModelProperty(value = "任务id（同意、驳回等操作使用）", dataType = "String")
+    @TableField(exist = false)
+    private String taskId;
+
+    @ApiModelProperty(value = "可选决策项（1同意驳回拒绝 2同意驳回 3同意拒绝，用于待审批列表同意/驳回/拒绝按钮展示）", dataType = "Integer")
+    @TableField(exist = false)
+    private Integer decisionItem;
+
+
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourcerInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourcerInfo.java
index ec4e997..f9aa69e 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourcerInfo.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourcerInfo.java
@@ -17,6 +17,7 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import javax.validation.constraints.NotEmpty;
 import java.io.Serializable;
 
 /**
@@ -59,6 +60,29 @@
     @TableField("outsourcer_name")
     private String outsourcerName;
 
+    @NotEmpty(message = "实验室代码不能为空")
+    @DictCodeField(message = "实验室代码描述不合法", cacheName = MeterDictCode.LAB_CODE)
+    @ApiModelProperty(value = "实验室代码(字典code)", dataType = "String")
+    @TableField("lab_code")
+    private String labCode;
+
+    @ApiModelProperty(value = "实验室代码(字典value)", dataType = "String")
+    @TableField(exist = false)
+    private String labCodeName;
+
+    /**
+     * 组别代码
+     */
+    @NotEmpty(message = "组别代码不能为空")
+    @DictCodeField(message = "组别代码描述不合法", cacheName = MeterDictCode.GROUP_CODE)
+    @ApiModelProperty(value = "组别代码(字典code)", dataType = "String")
+    @TableField("group_code")
+    private String groupCode;
+
+    @ApiModelProperty(value = "组别代码(字典value)", dataType = "String")
+    @TableField(exist = false)
+    private String groupCodeName;
+
     /**
      * 单位简称
      */
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardInfo.java
index c48eed7..dffdfdd 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardInfo.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardInfo.java
@@ -5,6 +5,7 @@
 import com.baomidou.mybatisplus.annotation.TableName;
 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;
 
@@ -18,6 +19,7 @@
  * @author wangpeng
  * @since 2023-08-04
  */
+@ApiModel
 @Data
 @TableName("biz_equipment_standard_info")
 public class BizEquipmentStandardInfo implements Serializable {
@@ -119,7 +121,7 @@
      * 管理状态(字典code)
      */
     @ApiModelProperty(value = "管理状态(字典code)", dataType = "String")
-    @DictCodeField(message = "管理状态不合法", cacheName = MeterDictCode.MANAGER_STATE)
+    @DictCodeField(message = "管理状态不合法", cacheName = MeterDictCode.STANDARD_MANAGER_STATE)
     @TableField("manage_status")
     private String manageStatus;
 
@@ -151,7 +153,7 @@
     /**
      * 温度(℃)
      */
-    @ApiModelProperty(value = "使用状态(字典code)", dataType = "String")
+    @ApiModelProperty(value = "温度(℃)", dataType = "String")
     @TableField("temperature")
     private Double temperature;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardInfoApproval.java b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardInfoApproval.java
index dbd86ab..9f58d83 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardInfoApproval.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardInfoApproval.java
@@ -150,7 +150,7 @@
      * 管理状态(字典code)
      */
     @ApiModelProperty(value = "管理状态(字典code)", dataType = "String")
-    @DictCodeField(message = "管理状态不合法", cacheName = MeterDictCode.MANAGER_STATE)
+    @DictCodeField(message = "管理状态不合法", cacheName = MeterDictCode.STANDARD_MANAGER_STATE)
     @TableField("manage_status")
     private String manageStatus;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardTechnologyRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardTechnologyRelation.java
index 0e612bd..751f26b 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardTechnologyRelation.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardTechnologyRelation.java
@@ -3,6 +3,7 @@
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -16,6 +17,7 @@
  * @author wangpeng
  * @since 2023-08-04
  */
+@ApiModel
 @Data
 @TableName("biz_equipment_standard_technology_relation")
 public class BizEquipmentStandardTechnologyRelation implements Serializable {
@@ -33,6 +35,10 @@
     @TableField("technology_file_id")
     private Long technologyFileId;
 
+    @ApiModelProperty(value = "依据的技术文件编号", dataType = "String")
+    @TableField("technology_file_no")
+    private String technologyFileNo;
+
     /**
      * 依据的技术文件名称(技术文件中现行测试校准检定方法表文件名字段)
      */
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerInfo.java
index d6e8bed..65cd6bc 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerInfo.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerInfo.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.model.resource;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -21,6 +28,11 @@
  * @author wangpeng
  * @since 2023-08-08
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @ApiModel
 @Data
 @TableName("biz_resource_customer_info")
@@ -35,6 +47,7 @@
     /**
      * 委托方编号
      */
+    @ExcelProperty(value = "委托方编号", order = 1)
     @ApiModelProperty(value = "委托方编号", dataType = "String")
     @TableField("customer_no")
     private String customerNo;
@@ -42,6 +55,7 @@
     /**
      * 委托方名称
      */
+    @ExcelProperty(value = "委托方名称", order = 2)
     @ApiModelProperty(value = "委托方名称(新建时为下拉选择一个受检单位组织的名字，传deptId字段，后端获取名称)", dataType = "String")
     @TableField("customer_name")
     private String customerName;
@@ -63,6 +77,7 @@
     /**
      * 联系人
      */
+    @ExcelProperty(value = "联系人", order = 3)
     @ApiModelProperty(value = "联系人", dataType = "String")
     @TableField("contacts")
     private String contacts;
@@ -70,6 +85,7 @@
     /**
      * 座机电话
      */
+    @ExcelProperty(value = "座机电话", order = 4)
     @ApiModelProperty(value = "座机电话", dataType = "String")
     @TableField("mobile")
     private String mobile;
@@ -77,6 +93,7 @@
     /**
      * 手机号码
      */
+    @ExcelProperty(value = "手机号码", order = 5)
     @ApiModelProperty(value = "手机号码", dataType = "String")
     @TableField("phone")
     private String phone;
@@ -91,6 +108,7 @@
     /**
      * 地址
      */
+    @ExcelProperty(value = "地址", order = 6)
     @ApiModelProperty(value = "地址", dataType = "String")
     @TableField("address")
     private String address;
@@ -141,6 +159,7 @@
     /**
      * 创建时间
      */
+    @ExcelProperty(value = "创建时间", order = 7)
     @ApiModelProperty(value = "创建时间", dataType = "String")
     @TableField("create_time")
     private String createTime;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerSuggestForm.java b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerSuggestForm.java
index 7201bbd..701bf8b 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerSuggestForm.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerSuggestForm.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.model.resource;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -22,6 +29,11 @@
  * @author wangpeng
  * @since 2023-08-08
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @ApiModel
 @Data
 @TableName("biz_resource_customer_suggest_form")
@@ -44,7 +56,8 @@
     /**
      * 委托方名称
      */
-    @ApiModelProperty(value = "委托方名称", dataType = "String")
+    @ExcelProperty(value = "意见反馈单位", order = 2)
+    @ApiModelProperty(value = "意见反馈单位", dataType = "String")
     @TableField("customer_name")
     private String customerName;
 
@@ -59,7 +72,8 @@
     /**
      * 委托方意见反馈部门名称
      */
-    @ApiModelProperty(value = "委托方意见反馈部门名称", dataType = "String")
+    @ExcelProperty(value = "委托方意见反馈部门", order = 3)
+    @ApiModelProperty(value = "委托方意见反馈部门", dataType = "String")
     @TableField("customer_dept_name")
     private String customerDeptName;
 
@@ -73,6 +87,7 @@
     /**
      * 表单编号
      */
+    @ExcelProperty(value = "表单编号", order = 1)
     @ApiModelProperty(value = "表单编号", dataType = "String")
     @TableField("form_no")
     private String formNo;
@@ -111,6 +126,7 @@
     /**
      * 创建人名字
      */
+    @ExcelProperty(value = "创建人", order = 4)
     @ApiModelProperty(value = "创建人名字", dataType = "String")
     @TableField("create_user_name")
     private String createUserName;
@@ -147,6 +163,7 @@
     /**
      * 创建时间
      */
+    @ExcelProperty(value = "创建时间", order = 5)
     @ApiModelProperty(value = "创建时间", dataType = "String")
     @TableField("create_time")
     private String createTime;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSealInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSealInfo.java
index cbf05d7..9bf389d 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSealInfo.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSealInfo.java
@@ -106,6 +106,10 @@
     @TableField("minio_file_name")
     private String minioFileName;
 
+    @ApiModelProperty(value = "minio存储文件url", dataType = "String")
+    @TableField(exist = false)
+    private String minioFileUrl;
+
     @ApiModelProperty(value = "创建时间", dataType = "String")
     @TableField("create_time")
     private String createTime;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSealUseNote.java b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSealUseNote.java
index 3f2d9e8..3ce16a8 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSealUseNote.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSealUseNote.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.model.resource;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -20,6 +27,11 @@
  * @author wangpeng
  * @since 2023-07-28
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @ApiModel
 @Data
 @TableName("biz_resource_seal_use_note")
@@ -34,6 +46,7 @@
     /**
      * 登记表编号
      */
+    @ExcelProperty(value = "申请单编号", order = 1)
     @ApiModelProperty(value = "登记表编号(自动生成)", dataType = "String")
     @TableField("note_form_no")
     private String noteFormNo;
@@ -55,6 +68,7 @@
     /**
      * 申请部门
      */
+    @ExcelProperty(value = "申请部门", order = 5)
     @ApiModelProperty(value = "申请部门", dataType = "String")
     @TableField("apply_dept_name")
     private String applyDeptName;
@@ -69,6 +83,7 @@
     /**
      * 申请人
      */
+    @ExcelProperty(value = "申请人", order = 6)
     @ApiModelProperty(value = "申请人", dataType = "String")
     @TableField("apply_user_name")
     private String applyUserName;
@@ -76,6 +91,7 @@
     /**
      * 申请时间
      */
+    @ExcelProperty(value = "申请时间", order = 7)
     @ApiModelProperty(value = "申请时间(新增自动获取当前时间)", dataType = "String")
     @TableField("apply_time")
     private String applyTime;
@@ -130,6 +146,26 @@
     @TableField("update_time")
     private String updateTime;
 
+    @ExcelProperty(value = "印章名称", order = 2)
+    @ApiModelProperty(value = "印章名称(列表返回参数)", dataType = "String")
+    @TableField(exist = false)
+    private String sealName;
+
+    @DictCodeField(message = "印章类型描述不合法", cacheName = MeterDictCode.SEAL_TYPE)
+    @ApiModelProperty(hidden = true)
+    @TableField(exist = false)
+    private String sealType;
+
+    @ExcelProperty(value = "印章类型", order = 3)
+    @ApiModelProperty(value = "印章类型(列表返回参数)", dataType = "String")
+    @TableField(exist = false)
+    private String sealTypeName;
+
+    @ExcelProperty(value = "批准人", order = 4)
+    @ApiModelProperty(value = "批准人(列表返回参数)", dataType = "String")
+    @TableField(exist = false)
+    private String approverName;
+
     @ApiModelProperty(value = "审批状态类型-字典value", dataType = "String")
     @TableField(exist = false)
     private String approvalStatusName;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceStaffInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceStaffInfo.java
index 5ef995b..41563a1 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceStaffInfo.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceStaffInfo.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.model.resource;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -20,6 +27,11 @@
  * @author wangpeng
  * @since 2023-07-25
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @ApiModel
 @Data
 @TableName("biz_resource_staff_info")
@@ -38,6 +50,7 @@
     /**
      * 人员编号
      */
+    @ExcelProperty(value = "人员编号",order = 0)
     @NotEmpty(message = "人员编号不能为空")
     @ApiModelProperty(value = "人员编号", dataType = "String")
     @TableField("staff_no")
@@ -46,6 +59,7 @@
     /**
      * 姓名
      */
+    @ExcelProperty(value = "姓名",order = 1)
     @ApiModelProperty(value = "姓名", dataType = "String")
     @TableField("staff_name")
     private String staffName;
@@ -152,13 +166,15 @@
     /**
      * 部门名字
      */
-    @ApiModelProperty(value = "部门名字", dataType = "String")
+    @ExcelProperty(value = "工作部门",order = 4)
+    @ApiModelProperty(value = "工作部门", dataType = "String")
     @TableField("dept_name")
     private String deptName;
 
     /**
      * 岗位
      */
+    @ExcelProperty(value = "岗位",order = 2)
     @ApiModelProperty(value = "岗位", dataType = "String")
     @TableField("station")
     private String station;
@@ -166,6 +182,7 @@
     /**
      * 计量专业
      */
+    @ExcelProperty(value = "计量专业",order = 5)
     @ApiModelProperty(value = "计量专业", dataType = "String")
     @TableField("major")
     private String major;
@@ -173,6 +190,7 @@
     /**
      * 证号
      */
+    @ExcelProperty(value = "证号",order = 3)
     @ApiModelProperty(value = "证号", dataType = "String")
     @TableField("certificate_number")
     private String certificateNumber;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSupplierInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSupplierInfo.java
index eb5ef01..a1e2697 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSupplierInfo.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSupplierInfo.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.model.resource;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -20,6 +27,11 @@
  * @author wangpeng
  * @since 2023-07-27
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @ApiModel
 @Data
 @TableName("biz_resource_supplier_info")
@@ -34,6 +46,7 @@
     /**
      * 供方编号
      */
+    @ExcelProperty(value = "供方编号", order = 1)
     @ApiModelProperty(value = "供方编号(自动生成)", dataType = "String")
     @TableField("supplier_no")
     private String supplierNo;
@@ -41,6 +54,7 @@
     /**
      * 供方名称
      */
+    @ExcelProperty(value = "供方名称", order = 2)
     @ApiModelProperty(value = "供方名称", dataType = "String")
     @TableField("supplier_name")
     private String supplierName;
@@ -60,6 +74,7 @@
     @TableField("supplier_type")
     private String supplierType;
 
+    @ExcelProperty(value = "供方类型", order = 3)
     @ApiModelProperty(value = "供方类型(字典value)", dataType = "String")
     @TableField(exist = false)
     private String supplierTypeName;
@@ -109,7 +124,8 @@
     /**
      * 电话
      */
-    @ApiModelProperty(value = "电话", dataType = "String")
+    @ExcelProperty(value = "联系电话", order = 4)
+    @ApiModelProperty(value = "联系电话", dataType = "String")
     @TableField("phone")
     private String phone;
 
@@ -158,6 +174,7 @@
     /**
      * 公司地址-省
      */
+    @ExcelProperty(value = "地址-省", order = 6)
     @ApiModelProperty(value = "公司地址-省", dataType = "String")
     @TableField("company_province_name")
     private String companyProvinceName;
@@ -172,6 +189,7 @@
     /**
      * 公司地址-市
      */
+    @ExcelProperty(value = "地址-市", order = 7)
     @ApiModelProperty(value = "公司地址-市", dataType = "String")
     @TableField("company_city_name")
     private String companyCityName;
@@ -186,6 +204,7 @@
     /**
      * 公司地址-区
      */
+    @ExcelProperty(value = "地址-区", order = 8)
     @ApiModelProperty(value = "公司地址-区", dataType = "String")
     @TableField("company_area_name")
     private String companyAreaName;
@@ -193,6 +212,7 @@
     /**
      * 公司地址-详细地址
      */
+    @ExcelProperty(value = "地址-详细地址", order = 9)
     @ApiModelProperty(value = "公司地址-详细地址", dataType = "String")
     @TableField("company_address")
     private String companyAddress;
@@ -200,6 +220,7 @@
     /**
      * 服务和供应的内容
      */
+    @ExcelProperty(value = "服务和供应的内容", order = 5)
     @ApiModelProperty(value = "服务和供应的内容", dataType = "String")
     @TableField("supplier_content")
     private String supplierContent;
@@ -250,6 +271,7 @@
     /**
      * 创建时间
      */
+    @ExcelProperty(value = "创建时间", order = 9)
     @ApiModelProperty(value = "创建时间", dataType = "String")
     @TableField("create_time")
     private String createTime;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/EnvLocationInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/EnvLocationInfo.java
new file mode 100644
index 0000000..d8e2d7b
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/EnvLocationInfo.java
@@ -0,0 +1,83 @@
+package com.casic.missiles.model.resource;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotEmpty;
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 实验室环境监控系统-设备表
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-06-07
+ */
+@ApiModel
+@Data
+@TableName("env_location_info")
+public class EnvLocationInfo implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "主键id", dataType = "Long")
+    @TableId("id")
+    private Long id;
+
+    /**
+     * 地点编号
+     */
+    @NotEmpty(message = "地点编号不能为空")
+    @ApiModelProperty(value = "地点编号", dataType = "String")
+    @TableField("location_no")
+    private String locationNo;
+
+    /**
+     * 地点名称
+     */
+    @ApiModelProperty(value = "地点名称", dataType = "String")
+    @TableField("location_name")
+    private String locationName;
+
+    /**
+     * 地点位置
+     */
+    @ApiModelProperty(value = "地点位置", dataType = "String")
+    @TableField("location_position")
+    private String locationPosition;
+
+    /**
+     * 创建人id
+     */
+    @ApiModelProperty(value = "创建人id", dataType = "Long")
+    @TableField("create_user_id")
+    private Long createUserId;
+
+    /**
+     * 创建人
+     */
+    @ApiModelProperty(value = "创建人", dataType = "String")
+    @TableField("create_user")
+    private String createUser;
+
+    /**
+     * 创建时间
+     */
+    @ApiModelProperty(value = "创建时间", dataType = "String")
+    @TableField("create_time")
+    private String createTime;
+
+    /**
+     * 更新时间
+     */
+    @ApiModelProperty(value = "更新时间", dataType = "String")
+    @TableField("update_time")
+    private String updateTime;
+
+
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemFileConfig.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemFileConfig.java
index 19e6845..86e569c 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemFileConfig.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemFileConfig.java
@@ -30,7 +30,7 @@
     @ApiModelProperty(value = "系统类别(1业务系统2受检系统3环境系统)", dataType = "Integer")
     @NotNull(message = "系统类别不能为空")
     @TableField("system_type")
-    private Integer systemType;
+    private Integer systemType = 1;
 
     @ApiModelProperty("下载编号")
     @TableField("download_no")
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemNotice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemNotice.java
index e94297d..06ec37d 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemNotice.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemNotice.java
@@ -34,7 +34,7 @@
     @ApiModelProperty(value = "系统类别(1业务系统2受检系统3环境系统)", dataType = "Integer")
     @NotNull(message = "系统类别不能为空")
     @TableField("system_type")
-    private Integer systemType;
+    private Integer systemType = 1;
 
     /**
      * 通知公告编号
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSign.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSign.java
index 6c0d7c9..954f4f8 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSign.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSign.java
@@ -51,7 +51,7 @@
     @ApiModelProperty(value = "系统类别(1业务系统2受检系统3环境系统)", dataType = "Integer")
     @NotNull(message = "系统类别不能为空")
     @TableField("system_type")
-    private Integer systemType;
+    private Integer systemType = 1;
 
     /**
      * 签名编号
@@ -130,4 +130,8 @@
     @TableField(exist = false)
     private List<Long> userIdList;
 
+    @ApiModelProperty(hidden = true)
+    @TableField(exist = false)
+    private String deptName;
+
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemTemplate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemTemplate.java
index 503a457..1d27ebe 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemTemplate.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemTemplate.java
@@ -47,7 +47,7 @@
     @ApiModelProperty(value = "系统类别(1业务系统2受检系统3环境系统)", dataType = "Integer")
     @NotNull(message = "系统类别不能为空")
     @TableField("system_type")
-    private Integer systemType;
+    private Integer systemType = 1;
 
     /**
      * 模板编号
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java
index 8c21cb0..f61e4a8 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java
@@ -32,4 +32,8 @@
     ReturnDTO approvalDelete(ApprovalDeleteRequest request);
 
     ReturnDTO failUpdate(T request);
+
+    List<O> listExport(R request);
+
+    List<O> listExportByIds(List<Long> ids);
 }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java
index 724166f..9bce15b 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java
@@ -157,6 +157,29 @@
         throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
     }
 
+    @Override
+    public List<O> listExport(R request) {
+        request.setCreateUserId(null);
+        request.setApprovalStatus(ApprovalStatusEnum.PASSED);
+        Page<O> page = PageFactory.defaultPage();
+        page.setCurrent(1);
+        page.setSearchCount(false);
+        page.setSize(Integer.MAX_VALUE);
+        Page<O> resultPage = this.baseMapper.selectBatchForApprovalList(page, request, null);
+        return resultPage.getRecords();
+    }
+
+    @Override
+    public List<O> listExportByIds(List<Long> ids) {
+        Page<O> page = PageFactory.defaultPage();
+        page.setCurrent(1);
+        page.setSearchCount(false);
+        page.setSize(Integer.MAX_VALUE);
+        List<String> businessKeys = ids.stream().map(String::valueOf).collect(Collectors.toList());
+        Page<O> resultPage = this.baseMapper.selectBatchForApprovalList(page, null, businessKeys);
+        return resultPage.getRecords();
+    }
+
     protected ReturnDTO updateApprovalStatus(Long id, String processId, String approvalStatus) {
         UpdateWrapper<T> updateWrapper = new UpdateWrapper<>();
         updateWrapper.eq("id", id);
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificatePrintServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificatePrintServiceImpl.java
index f6e4706..3228497 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificatePrintServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificatePrintServiceImpl.java
@@ -162,6 +162,30 @@
         return ReturnUtil.success(printLogMapper.selectList(wrapper));
     }
 
+    @Override
+    public List<CertificatePrintListResponse> listByIds(List<Long> ids) {
+        Page<CertificatePrintListResponse> page = PageFactory.defaultPage();
+        page.setCurrent(1);
+        page.setSearchCount(false);
+        page.setSize(Integer.MAX_VALUE);
+        List<String> businessKeys = ids.stream().map(String::valueOf).collect(Collectors.toList());
+        Page<CertificatePrintListResponse> resultPage = this.baseMapper.selectBatchForApprovalList(page, null, businessKeys);
+        return resultPage.getRecords();
+    }
+
+    @Override
+    public List<CertificatePrintListResponse> list(CertificatePrintApprovalListRequest request) {
+        request.setCreateUserId(null);
+        request.setApprovalStatus(null);
+        request.setPrintStatus(null);
+        Page<CertificatePrintListResponse> page = PageFactory.defaultPage();
+        page.setCurrent(1);
+        page.setSearchCount(false);
+        page.setSize(Integer.MAX_VALUE);
+        Page<CertificatePrintListResponse> resultPage = certificatePrintMapper.selectBatchForApprovalList(page, request, null);
+        return resultPage.getRecords();
+    }
+
     private void savePrintLog(Long id) {
         BizBusinessCertificatePrintLog printLog = new BizBusinessCertificatePrintLog();
         BizBusinessCertificatePrint certificatePrint = certificatePrintMapper.selectById(id);
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificateReportServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificateReportServiceImpl.java
index 457555f..24146be 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificateReportServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificateReportServiceImpl.java
@@ -158,8 +158,8 @@
         QueryWrapper<BizBusinessCertificateMeasureResultData> mWrapper = new QueryWrapper<>();
         mWrapper.eq("report_id", reportId);
         boolean mRemove = certificateMeasureResultDataService.remove(mWrapper);
-        Assert.isFalse(eRemove || mRemove, () -> {
+        if(!eRemove || !mRemove){
             throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
-        });
+        }
     }
 }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessIdentifyInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessIdentifyInfoServiceImpl.java
index 4c8e190..f7e63ca 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessIdentifyInfoServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessIdentifyInfoServiceImpl.java
@@ -1,8 +1,10 @@
 package com.casic.missiles.service.Impl.business;
 
+import cn.hutool.core.date.DateUtil;
 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.core.page.PageFactory;
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.business.identify.IdentifyListRequest;
@@ -14,11 +16,14 @@
 import com.casic.missiles.service.business.IBizBusinessIdentifyInfoService;
 import com.casic.missiles.utils.DictCodeUtils;
 import com.casic.missiles.utils.NumberGeneratorUtil;
+import com.casic.missiles.utils.QRCodeUtil;
 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.List;
+
 /**
  * <p>
  * 计量检定业务-任务计量管理-标识打印 服务实现类
@@ -35,9 +40,9 @@
     @Override
     public Page<BizBusinessIdentifyInfo> identifyListPage(Page<BizBusinessIdentifyInfo> page, IdentifyListRequest request) throws Exception {
         QueryWrapper<BizBusinessIdentifyInfo> wrapper = new QueryWrapper<>();
-        wrapper.eq("identify_type", request.getIdentifyType());
-        wrapper.like("device_no", request.getDeviceNo());
-        wrapper.like("device_name", request.getDeviceName());
+        wrapper.eq(StringUtils.isNotEmpty(request.getIdentifyType()), "identify_type", request.getIdentifyType());
+        wrapper.like(StringUtils.isNotEmpty(request.getDeviceNo()),"device_no", request.getDeviceNo());
+        wrapper.like(StringUtils.isNotEmpty(request.getDeviceName()), "device_name", request.getDeviceName());
         wrapper.apply(StringUtils.isNotBlank(request.getCreateTimeStart()),
                 "{0} <= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getCreateTimeStart().split(" ")[0]);
         wrapper.apply(StringUtils.isNotBlank(request.getCreateTimeEnd()),
@@ -64,8 +69,11 @@
     }
 
     @Override
-    public ReturnDTO updateIdentify(BizBusinessIdentifyInfo identifyInfo) {
-        if(identifyInfoMapper.updateById(identifyInfo) > 0){
+    public ReturnDTO updateIdentify(Long id) {
+        BizBusinessIdentifyInfo info = new BizBusinessIdentifyInfo();
+        info.setId(id);
+        info.setUpdateTime(DateUtil.now());
+        if(identifyInfoMapper.updateById(info) > 0){
             return ReturnUtil.success();
         }
         throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
@@ -79,4 +87,20 @@
         throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
     }
 
+    @Override
+    public List<BizBusinessIdentifyInfo> list(IdentifyListRequest request) throws Exception {
+        Page<BizBusinessIdentifyInfo> page = PageFactory.defaultPage();
+        page.setCurrent(1);
+        page.setSearchCount(false);
+        page.setSize(Integer.MAX_VALUE);
+        Page<BizBusinessIdentifyInfo> resultPage = this.identifyListPage(page, request);
+        return resultPage.getRecords();
+    }
+
+    @Override
+    public ReturnDTO<String> equipmentQrCode(Long id) {
+        String base64QRCode = QRCodeUtil.getBase64QRCode(String.valueOf(id));
+        return ReturnUtil.success(base64QRCode);
+    }
+
 }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOrderInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOrderInfoServiceImpl.java
index 82952ad..d8d2c6a 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOrderInfoServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOrderInfoServiceImpl.java
@@ -35,6 +35,7 @@
 import javax.servlet.http.HttpServletResponse;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 import java.util.stream.Collectors;
 
 /**
@@ -209,13 +210,16 @@
     private QueryWrapper<OrderListResponse> listParamWrapperBuilder(OrderListRequest request) {
         QueryWrapper<OrderListResponse> wrapper = new QueryWrapper<>();
         wrapper.like(StringUtils.isNotBlank(request.getOrderNo()), "order_no", request.getOrderNo());
+        wrapper.like(Objects.nonNull(request.getCustomerId()), "customer_id", request.getCustomerId());
         wrapper.like(StringUtils.isNotBlank(request.getCustomerName()), "customer_name", request.getCustomerName());
         wrapper.like(StringUtils.isNotBlank(request.getDeliverer()), "deliverer", request.getDeliverer());
         wrapper.like(StringUtils.isNotBlank(request.getCreateUserName()), "create_user_name", request.getCreateUserName());
-        wrapper.apply(StringUtils.isNotBlank(request.getCreateStartTime()),
-                "{0} <= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getCreateStartTime().split(" ")[0]);
-        wrapper.apply(StringUtils.isNotBlank(request.getCreateEndTime()),
-                "{0} >= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getCreateEndTime().split(" ")[0]);
+        if(StringUtils.isNotBlank(request.getCreateStartTime())){
+            wrapper.apply("{0} <= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getCreateStartTime().split(" ")[0]);
+        }
+        if(StringUtils.isNotBlank(request.getCreateEndTime())){
+            wrapper.apply("{0} >= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getCreateEndTime().split(" ")[0]);
+        }
         wrapper.orderByDesc("create_time");
         return wrapper;
     }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceAssessServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceAssessServiceImpl.java
index c6af980..ce40138 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceAssessServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceAssessServiceImpl.java
@@ -1,10 +1,33 @@
 package com.casic.missiles.service.Impl.business;
 
-import com.casic.missiles.model.business.BizBusinessOutsourceAssess;
+import cn.hutool.core.lang.Assert;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.casic.missiles.core.model.auth.AuthUser;
+import com.casic.missiles.core.shiro.ShiroKit;
+import com.casic.missiles.dto.BaseApprovalSubmitRequest;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.ReturnUtil;
+import com.casic.missiles.dto.business.outsource.OutsourceAssessApprovalListRequest;
+import com.casic.missiles.dto.business.outsource.OutsourceAssessSaveResponse;
+import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.NoGenerateFileCodeEnum;
+import com.casic.missiles.enums.NoGenerateRecordTypeCodeEnum;
+import com.casic.missiles.enums.system.ApprovalStatusEnum;
+import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.mapper.business.BizBusinessOutsourceAssessMapper;
+import com.casic.missiles.model.business.BizBusinessOutsourceAssess;
+import com.casic.missiles.model.business.BizBusinessOutsourceAssessSampleRelation;
+import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl;
+import com.casic.missiles.service.business.IBizBusinessOutsourceAssessSampleRelationService;
 import com.casic.missiles.service.business.IBizBusinessOutsourceAssessService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.casic.missiles.utils.NoGeneratorUtil;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Objects;
 
 /**
  * <p>
@@ -15,6 +38,103 @@
  * @since 2023-08-16
  */
 @Service
-public class BizBusinessOutsourceAssessServiceImpl extends ServiceImpl<BizBusinessOutsourceAssessMapper, BizBusinessOutsourceAssess> implements IBizBusinessOutsourceAssessService {
+public class BizBusinessOutsourceAssessServiceImpl extends GeneralApprovalServiceImpl<BizBusinessOutsourceAssessMapper, BizBusinessOutsourceAssess, BizBusinessOutsourceAssess, OutsourceAssessApprovalListRequest, BaseApprovalSubmitRequest> implements IBizBusinessOutsourceAssessService {
+    @Autowired
+    private IBizBusinessOutsourceAssessSampleRelationService outsourceAssessSampleRelationService;
 
+    @Override
+    public ReturnDTO<OutsourceAssessSaveResponse> saveOutsourceAssess(BizBusinessOutsourceAssess request) {
+        //生成编号
+        String labCode = request.getLabCode();
+        String groupCode = request.getGroupCode();
+        Long maxNo = this.baseMapper.selectMaxProjectNo();
+        String projectNo = NoGeneratorUtil.getCode(NoGenerateFileCodeEnum.D, labCode, NoGenerateRecordTypeCodeEnum.OUTSOURCE_ACCESS, groupCode, maxNo);
+        request.setCreateUserId(request.getUserId());
+        request.setCreateUserName(request.getUserName());
+        request.setApprovalStatus(ApprovalStatusEnum.DRAFT); //草稿箱状态
+        request.setProjectNo(projectNo);
+        int row = this.baseMapper.insert(request);
+        Assert.isFalse(row <= 0, () -> {
+            throw new BusinessException(BusinessExceptionEnum.OUTSOURCE_ACCESS_SAVE_FAILED);
+        });
+        //关联表
+        saveRelationData(request);
+        OutsourceAssessSaveResponse saveResponse = new OutsourceAssessSaveResponse();
+        saveResponse.setId(request.getId());
+        saveResponse.setProjectNo(projectNo);
+        return ReturnUtil.success(saveResponse);
+    }
+
+    @Override
+    @Transactional
+    public ReturnDTO draftUpdate(BizBusinessOutsourceAssess request) {
+        if (this.baseMapper.updateById(request) > 0) {
+            //关联表删除、增加
+            removeRelationData(request.getId());
+            saveRelationData(request);
+            return ReturnUtil.success();
+        }
+        throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
+    }
+
+    @Override
+    public ReturnDTO draftDelete(Long id) {
+        if (this.baseMapper.deleteById(id) > 0) {
+            //关联表删除
+            removeRelationData(id);
+            return ReturnUtil.success();
+        }
+        throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
+    }
+
+    @Override
+    public ReturnDTO draftBatchDelete(List<Long> ids) {
+        if (this.baseMapper.deleteBatchIds(ids) >= 0) {
+            ids.forEach(id -> removeRelationData(id));
+            return ReturnUtil.success();
+        }
+        throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
+    }
+
+    @Override
+    @Transactional
+    public ReturnDTO failUpdate(BizBusinessOutsourceAssess request) {
+        AuthUser user = ShiroKit.getUser();
+        Assert.isFalse(Objects.isNull(user), () -> {
+            throw new BusinessException(BusinessExceptionEnum.LOGIN_USER_ACQUIRE_FAILED);
+        });
+        request.setApprovalStatus(ApprovalStatusEnum.IN_APPROVED);
+        if (this.baseMapper.updateById(request) > 0) {
+            //关联表删除、增加
+            removeRelationData(request.getId());
+            saveRelationData(request);
+            baseApprovalService.failUpdate(request.getProcessId());
+            return ReturnUtil.success();
+        }
+        throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
+    }
+
+    private void saveRelationData(BizBusinessOutsourceAssess request) {
+        List<BizBusinessOutsourceAssessSampleRelation> sampleRelations = new ArrayList<>();
+        request.getOrderSampleList().forEach(dto -> {
+            BizBusinessOutsourceAssessSampleRelation relation = new BizBusinessOutsourceAssessSampleRelation();
+            relation.setOrderId(dto.getOrderId());
+            relation.setSampleId(dto.getSampleId());
+            relation.setAccessId(request.getId());
+            sampleRelations.add(relation);
+        });
+        if(outsourceAssessSampleRelationService.saveBatch(sampleRelations)){
+            return;
+        }
+        throw new BusinessException(BusinessExceptionEnum.OUTSOURCE_ACCESS_SAVE_FAILED);
+    }
+
+    private void removeRelationData(Long assessId) {
+        QueryWrapper<BizBusinessOutsourceAssessSampleRelation> wrapper = new QueryWrapper<>();
+        wrapper.eq("access_id", assessId);
+        if(outsourceAssessSampleRelationService.remove(wrapper)){
+            return;
+        }
+        throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
+    }
 }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceProtocolServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceProtocolServiceImpl.java
new file mode 100644
index 0000000..821e728
--- /dev/null
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceProtocolServiceImpl.java
@@ -0,0 +1,60 @@
+package com.casic.missiles.service.Impl.business;
+
+import cn.hutool.core.lang.Assert;
+import com.casic.missiles.dto.BaseApprovalSubmitRequest;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.ReturnUtil;
+import com.casic.missiles.dto.business.outsource.OutsourceProtocolApprovalListRequest;
+import com.casic.missiles.dto.business.outsource.OutsourceProtocolSaveResponse;
+import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.NoGenerateFileCodeEnum;
+import com.casic.missiles.enums.NoGenerateRecordTypeCodeEnum;
+import com.casic.missiles.enums.system.ApprovalStatusEnum;
+import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.mapper.business.BizBusinessOutsourceProtocolMapper;
+import com.casic.missiles.mapper.business.BizBusinessOutsourcerInfoMapper;
+import com.casic.missiles.model.business.BizBusinessOutsourceProtocol;
+import com.casic.missiles.model.business.BizBusinessOutsourcerInfo;
+import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl;
+import com.casic.missiles.service.business.IBizBusinessOutsourceProtocolService;
+import com.casic.missiles.utils.NoGeneratorUtil;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 计量检定业务-分包管理-测试、校准或检定工作分包协议书 服务实现类
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-08-24
+ */
+@Service
+public class BizBusinessOutsourceProtocolServiceImpl extends GeneralApprovalServiceImpl<BizBusinessOutsourceProtocolMapper, BizBusinessOutsourceProtocol, BizBusinessOutsourceProtocol, OutsourceProtocolApprovalListRequest, BaseApprovalSubmitRequest> implements IBizBusinessOutsourceProtocolService {
+    @Autowired
+    private BizBusinessOutsourcerInfoMapper outsourcerInfoMapper;
+
+    @Override
+    public ReturnDTO<OutsourceProtocolSaveResponse> saveOutsourceProtocol(BizBusinessOutsourceProtocol request) {
+        //生成编号
+        String labCode = request.getLabCode();
+        String groupCode = request.getGroupCode();
+        Long maxNo = this.baseMapper.selectMaxProtocolNo();
+        String protocolNo = NoGeneratorUtil.getCode(NoGenerateFileCodeEnum.D, labCode, NoGenerateRecordTypeCodeEnum.OUTSOURCE_PROTOCOL, groupCode, maxNo);
+        request.setCreateUserId(request.getUserId());
+        request.setCreateUserName(request.getUserName());
+        request.setApprovalStatus(ApprovalStatusEnum.DRAFT); //草稿箱状态
+        request.setProtocolNo(protocolNo);
+        BizBusinessOutsourcerInfo outsourcerInfo = outsourcerInfoMapper.selectById(request.getOutsourcerId());
+        request.setOutsourceNo(outsourcerInfo.getOutsourcerNo());
+        request.setOutsourceName(outsourcerInfo.getOutsourcerName());
+        int row = this.baseMapper.insert(request);
+        Assert.isFalse(row <= 0, () -> {
+            throw new BusinessException(BusinessExceptionEnum.OUTSOURCE_PROTOCOL_SAVE_FAILED);
+        });
+        OutsourceProtocolSaveResponse saveResponse = new OutsourceProtocolSaveResponse();
+        saveResponse.setId(request.getId());
+        saveResponse.setProtocolNo(protocolNo);
+        return ReturnUtil.success(saveResponse);
+    }
+}
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourcerInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourcerInfoServiceImpl.java
index 75f639d..8aadad7 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourcerInfoServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourcerInfoServiceImpl.java
@@ -3,12 +3,12 @@
 import cn.hutool.core.lang.Assert;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.dto.*;
 import com.casic.missiles.dto.business.outsource.OutsourcerInfoApprovalListRequest;
 import com.casic.missiles.dto.business.outsource.OutsourcerSaveResponse;
 import com.casic.missiles.enums.BusinessExceptionEnum;
-import com.casic.missiles.enums.PrefixCodeEnum;
+import com.casic.missiles.enums.NoGenerateFileCodeEnum;
+import com.casic.missiles.enums.NoGenerateRecordTypeCodeEnum;
 import com.casic.missiles.enums.system.ApprovalStatusEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.mapper.business.BizBusinessOutsourcerInfoMapper;
@@ -20,7 +20,7 @@
 import com.casic.missiles.service.business.IBizBusinessOutsourcerInfoService;
 import com.casic.missiles.service.business.IBizBusinessOutsourcerUserInfoService;
 import com.casic.missiles.utils.DictCodeUtils;
-import com.casic.missiles.utils.NumberGeneratorUtil;
+import com.casic.missiles.utils.NoGeneratorUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -42,22 +42,12 @@
     private IBizBusinessOutsourcerUserInfoService outsourcerUserInfoService;
 
     @Override
-    public List<BizBusinessOutsourcerInfo> list(OutsourcerInfoApprovalListRequest request) {
-        request.setCreateUserId(null);
-        request.setApprovalStatus(ApprovalStatusEnum.PASSED);
-        Page<BizBusinessOutsourcerInfo> page = PageFactory.defaultPage();
-        page.setCurrent(1);
-        page.setSearchCount(false);
-        page.setSize(Integer.MAX_VALUE);
-        Page<BizBusinessOutsourcerInfo> resultPage = this.baseMapper.selectBatchForApprovalList(page, request, null);
-        return resultPage.getRecords();
-    }
-
-    @Override
     public ReturnDTO<OutsourcerSaveResponse> saveOutsourcer(BizBusinessOutsourcerInfo request) {
         //生成编号
+        String labCode = request.getLabCode();
+        String groupCode = request.getGroupCode();
         Long maxNo = this.baseMapper.selectMaxNo();
-        String outsourcerNo = NumberGeneratorUtil.getContactNo(PrefixCodeEnum.OUTSOURCER_PREFIX, maxNo);
+        String outsourcerNo = NoGeneratorUtil.getCode(NoGenerateFileCodeEnum.D, labCode, NoGenerateRecordTypeCodeEnum.OUTSOURCE_INFO, groupCode, maxNo);
         request.setOutsourcerNo(outsourcerNo);
         request.setCreateUserId(request.getUserId());
         request.setCreateUserName(request.getUserName());
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessSiteExecutiveInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessSiteExecutiveInfoServiceImpl.java
index ebab3e6..6c6a129 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessSiteExecutiveInfoServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessSiteExecutiveInfoServiceImpl.java
@@ -189,9 +189,9 @@
         QueryWrapper<BizBusinessSiteExecutiveStaffRelation> mWrapper = new QueryWrapper<>();
         mWrapper.eq("site_executive_id", siteExecutiveId);
         boolean mRemove = siteExecutiveStaffRelationService.remove(mWrapper);
-        Assert.isFalse(eRemove || mRemove, () -> {
+        if(!eRemove || !mRemove){
             throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
-        });
+        }
     }
 
     private void doPopulateSiteExecutive(SiteExecutiveDetailResponse detailResponse) {
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessLabExecutiveInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessLabExecutiveInfoServiceImpl.java
index 50c5616..0242fcf 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessLabExecutiveInfoServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessLabExecutiveInfoServiceImpl.java
@@ -297,6 +297,29 @@
     }
 
     @Override
+    public List<SampleLabExecutiveListResponse> deptLabExecutiveList(SampleLabExecutiveListRequest request) throws Exception {
+        Page<SampleLabExecutiveListResponse> page = PageFactory.defaultPage();
+        page.setCurrent(1);
+        page.setSearchCount(false);
+        page.setSize(Integer.MAX_VALUE);
+        Page<SampleLabExecutiveListResponse> resultPage = this.deptLabExecutiveListPage(page, request);
+        return resultPage.getRecords();
+    }
+
+    @Override
+    public List<SampleLabExecutiveListResponse> deptLabExecutiveListByIds(String measureStatus, List<Long> ids) throws Exception {
+        Page<SampleLabExecutiveListResponse> page = PageFactory.defaultPage();
+        page.setCurrent(1);
+        page.setSearchCount(false);
+        page.setSize(Integer.MAX_VALUE);
+        SampleLabExecutiveListRequest request = new SampleLabExecutiveListRequest();
+        request.setIds(ids);
+        request.setMeasureStatus(measureStatus);
+        Page<SampleLabExecutiveListResponse> resultPage = this.deptLabExecutiveListPage(page, request);
+        return resultPage.getRecords();
+    }
+
+    @Override
     public Page<SampleLabExecutiveListResponse> myLabExecutiveListPage(Page<SampleLabExecutiveListResponse> page, SampleLabExecutiveListRequest labExecutiveListRequest) throws Exception{
         AuthUser user = ShiroKit.getUser();
         Assert.isFalse(Objects.isNull(user), () -> {
@@ -350,6 +373,29 @@
     }
 
     @Override
+    public List<SampleLabExecutiveListResponse> myLabExecutiveList(SampleLabExecutiveListRequest request) throws Exception {
+        Page<SampleLabExecutiveListResponse> page = PageFactory.defaultPage();
+        page.setCurrent(1);
+        page.setSearchCount(false);
+        page.setSize(Integer.MAX_VALUE);
+        Page<SampleLabExecutiveListResponse> resultPage = this.myLabExecutiveListPage(page, request);
+        return resultPage.getRecords();
+    }
+
+    @Override
+    public List<SampleLabExecutiveListResponse> myLabExecutiveListByIds(String measureStatus, List<Long> ids) throws Exception {
+        Page<SampleLabExecutiveListResponse> page = PageFactory.defaultPage();
+        page.setCurrent(1);
+        page.setSearchCount(false);
+        page.setSize(Integer.MAX_VALUE);
+        SampleLabExecutiveListRequest request = new SampleLabExecutiveListRequest();
+        request.setIds(ids);
+        request.setMeasureStatus(measureStatus);
+        Page<SampleLabExecutiveListResponse> resultPage = this.myLabExecutiveListPage(page, request);
+        return resultPage.getRecords();
+    }
+
+    @Override
     public List<SampleAmountResponse> myExecutiveAmount() {
         //登录用户id获取计量人员id，实验室检测信息中存储的是计量人员id
         AuthUser user = ShiroKit.getUser();
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentInfoServiceImpl.java
index 864b05e..db8cad4 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentInfoServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentInfoServiceImpl.java
@@ -35,7 +35,6 @@
 import com.casic.missiles.utils.ConvertUtils;
 import com.casic.missiles.utils.DictCodeUtils;
 import com.casic.missiles.utils.NumberGeneratorUtil;
-import org.flowable.engine.RuntimeService;
 import org.flowable.engine.runtime.ProcessInstance;
 import org.jetbrains.annotations.NotNull;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -43,7 +42,6 @@
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
 
-import javax.annotation.Resource;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
@@ -81,8 +79,6 @@
     private IBizEquipmentAttachmentService attachmentService;
     @Autowired
     private IBizEquipmentCheckpointService checkpointService;
-    @Resource
-    private RuntimeService runtimeService;
     @Autowired
     private ApprovalOperateService approvalOperateService;
 
@@ -235,18 +231,18 @@
     private void updateRelationInfo(EquipmentAddRequest request, BizEquipmentInfoApproval equipmentInfoApproval) {
         QueryWrapper<BizEquipmentTechnicalTarget> targetWrapper = new QueryWrapper<>();
         targetWrapper.eq("equipment_no", equipmentInfoApproval.getEquipmentNo());
-        boolean removeTargetFlag = technicalTargetService.remove(targetWrapper);
-        boolean saveTargetFlag = technicalTargetService.saveBatch(request.getTechnicalTargetList());
+        technicalTargetService.remove(targetWrapper);
+        technicalTargetService.saveBatch(request.getTechnicalTargetList());
 
         QueryWrapper<BizEquipmentAttachment> attachmentWrapper = new QueryWrapper<>();
         attachmentWrapper.eq("equipment_no", equipmentInfoApproval.getEquipmentNo());
-        boolean removeAttachmentFlag = attachmentService.remove(attachmentWrapper);
-        boolean saveAttachmentFlag = attachmentService.saveBatch(request.getAttachmentList());
+        attachmentService.remove(attachmentWrapper);
+        attachmentService.saveBatch(request.getAttachmentList());
 
         QueryWrapper<BizEquipmentCheckpoint> checkpointWrapper = new QueryWrapper<>();
         checkpointWrapper.eq("equipment_no", equipmentInfoApproval.getEquipmentNo());
-        boolean removeCheckpointFlag = checkpointService.remove(checkpointWrapper);
-        boolean saveCheckpointFlag = checkpointService.saveBatch(request.getCheckpointList());
+        checkpointService.remove(checkpointWrapper);
+        checkpointService.saveBatch(request.getCheckpointList());
     }
 
     @Override
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardInfoServiceImpl.java
index faff1ae..c50a5b3 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardInfoServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardInfoServiceImpl.java
@@ -22,7 +22,9 @@
 import com.casic.missiles.mapper.equipment.BizEquipmentStandardInfoMapper;
 import com.casic.missiles.mapper.equipment.BizEquipmentStandardTechnologyRelationMapper;
 import com.casic.missiles.mapper.resource.BizResourceStaffInfoMapper;
-import com.casic.missiles.model.equipment.*;
+import com.casic.missiles.model.equipment.BizEquipmentStandardInfo;
+import com.casic.missiles.model.equipment.BizEquipmentStandardInfoApproval;
+import com.casic.missiles.model.equipment.BizEquipmentStandardTechnologyRelation;
 import com.casic.missiles.model.resource.BizResourceStaffInfo;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.dao.DeptMapper;
@@ -33,14 +35,12 @@
 import com.casic.missiles.service.flowable.ApprovalOperateService;
 import com.casic.missiles.utils.ConvertUtils;
 import com.casic.missiles.utils.DictCodeUtils;
-import org.flowable.engine.RuntimeService;
 import org.flowable.engine.runtime.ProcessInstance;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
 
-import javax.annotation.Resource;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
@@ -62,8 +62,6 @@
     private BizResourceStaffInfoMapper staffInfoMapper;
     @Autowired
     private IBaseApprovalService baseApprovalService;
-    @Resource
-    private RuntimeService runtimeService;
     @Autowired
     private ApprovalOperateService approvalOperateService;
     @Autowired
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSealInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSealInfoServiceImpl.java
index 7c91fa2..00040d6 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSealInfoServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSealInfoServiceImpl.java
@@ -15,6 +15,7 @@
 import com.casic.missiles.modular.system.model.User;
 import com.casic.missiles.service.resource.IBizResourceSealInfoService;
 import com.casic.missiles.utils.DictCodeUtils;
+import com.casic.missiles.utils.MinioUtil;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -33,6 +34,8 @@
     private BizResourceSealInfoMapper sealInfoMapper;
     @Autowired
     private UserMapper userMapper;
+    @Autowired
+    private MinioUtil minioUtil;
 
     @Override
     public Page<BizResourceSealInfo> listPage(Page<BizResourceSealInfo> page, SealInfoListRequest request) throws Exception {
@@ -44,6 +47,7 @@
         Page<BizResourceSealInfo> sealInfoPage = sealInfoMapper.selectPage(page, wrapper);
         for (BizResourceSealInfo record : sealInfoPage.getRecords()) {
             DictCodeUtils.convertDictCodeToName(record);
+            record.setMinioFileUrl(minioUtil.getFileUrl(record.getMinioFileName()));
         }
         return sealInfoPage;
     }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceStaffInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceStaffInfoServiceImpl.java
index f058cf5..09203ac 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceStaffInfoServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceStaffInfoServiceImpl.java
@@ -3,6 +3,7 @@
 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.core.page.PageFactory;
 import com.casic.missiles.dto.IdDTO;
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
@@ -86,6 +87,13 @@
     }
 
     @Override
+    public List<BizResourceStaffInfo> list(StaffListRequest request) throws Exception {
+        Page<BizResourceStaffInfo> page = PageFactory.defaultPage();
+        Page<BizResourceStaffInfo> staffInfoPage = this.listPage(page, request);
+        return staffInfoPage.getRecords();
+    }
+
+    @Override
     @Transactional
     public ReturnDTO<IdDTO> staffBaseAdd(BizResourceStaffInfo staffInfo) {
         //登录账号查重
@@ -495,6 +503,28 @@
         return certResponsePage;
     }
 
+    @Override
+    public List<StaffCertResponse> certListByIds(List<Long> ids) throws Exception {
+        Page<StaffCertResponse> page = PageFactory.defaultPage();
+        page.setCurrent(1);
+        page.setSearchCount(false);
+        page.setSize(Integer.MAX_VALUE);
+        StaffCertRequest request = new StaffCertRequest();
+        request.setIds(ids);
+        Page<StaffCertResponse> resultPage = this.certListPage(page, request);
+        return resultPage.getRecords();
+    }
+
+    @Override
+    public List<StaffCertResponse> certList(StaffCertRequest request) throws Exception {
+        Page<StaffCertResponse> page = PageFactory.defaultPage();
+        page.setCurrent(1);
+        page.setSearchCount(false);
+        page.setSize(Integer.MAX_VALUE);
+        Page<StaffCertResponse> resultPage = this.certListPage(page, request);
+        return resultPage.getRecords();
+    }
+
     @Async
     public void deleteRelationInfo(Long staffId){
         QueryWrapper<BizResourceStaffEducation> educationWrapper = new QueryWrapper<>();
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceStaffVerifierServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceStaffVerifierServiceImpl.java
index 8ac7eee..b508d45 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceStaffVerifierServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceStaffVerifierServiceImpl.java
@@ -52,8 +52,8 @@
     private WebSocket webSocket;
 
     @Override
-    public ReturnDTO expirationReminder(IdDTO idDto) {
-        BizResourceStaffVerifier staffVerifier = verifierMapper.selectById(idDto.getId());
+    public ReturnDTO expirationReminder(IdDTO idDTO) {
+        BizResourceStaffVerifier staffVerifier = verifierMapper.selectById(idDTO.getId());
         BizResourceStaffInfo staffInfo = staffInfoMapper.selectById(staffVerifier.getStaffId());
         QueryWrapper<User> wrapper = new QueryWrapper<>();
         wrapper.eq("account", staffInfo.getAccount());
@@ -65,7 +65,7 @@
         Assert.isFalse(Objects.isNull(user), () -> {
             throw new BusinessException(BusinessExceptionEnum.LOGIN_USER_ACQUIRE_FAILED);
         });
-        WorkbenchRemindMessage remindMessage = new WorkbenchRemindMessage(userInfo.getId(), userInfo.getDeptId(), idDto.getId(), staffVerifier.getCertNo(), MessageTypeEnum.STAFF_CERT.getCode(), MessageSourceModuleEnum.RESOURCE.getCode(), MessageTypeEnum.STAFF_CERT.getValue(), MessageTypeEnum.STAFF_CERT.getValue(), staffVerifier.getCertName(),0, user.getId(), user.getName());
+        WorkbenchRemindMessage remindMessage = new WorkbenchRemindMessage(userInfo.getId(), userInfo.getDeptId(), idDTO.getId(), staffVerifier.getCertNo(), MessageTypeEnum.STAFF_CERT.getCode(), MessageSourceModuleEnum.RESOURCE.getCode(), MessageTypeEnum.STAFF_CERT.getValue(), MessageTypeEnum.STAFF_CERT.getValue(), staffVerifier.getCertName(),0, user.getId(), user.getName());
         if(messageMapper.insert(remindMessage) > 0){
             // 新增到消息列表后向用户推送消息
             webSocket.sendOneMessage(String.valueOf(userInfo.getId()), JSONObject.toJSONString(remindMessage));

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java
index bb0c50f..13a699b 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java
@@ -12,6 +12,7 @@
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.IGeneralApprovalService;
+import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
@@ -19,6 +20,7 @@
 import org.springframework.web.bind.annotation.RequestBody;
 
 import javax.validation.Valid;
+import java.util.List;
 import java.util.Objects;
 
 /**
@@ -117,4 +119,17 @@
         }
         return baseApprovalService.failUpdate(request);
     }
+
+    public List<O> exportList(@RequestBody @Valid R request) throws Exception {
+        List<O> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = baseApprovalService.listExportByIds(request.getIds());
+        } else {
+            list = baseApprovalService.listExport(request);
+        }
+        for (O record : list) {
+            DictCodeUtils.convertDictCodeToName(record);
+        }
+        return list;
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java
index 8a90961..d775831 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java
@@ -5,6 +5,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.business.certificate.CertificateChangeApplyApprovalListRequest;
 import com.casic.missiles.dto.business.certificate.CertificateChangeApplySaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessCertificateChangeApply;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
@@ -20,6 +21,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -48,4 +50,12 @@
         }
         return changeApplyService.saveChangeApply(request);
     }
+
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody CertificateChangeApplyApprovalListRequest request) throws Exception {
+        List<BizBusinessCertificateChangeApply> list = super.exportList(request);
+        super.exportExcel(BizBusinessCertificateChangeApply.class, list, ExportEnum.CERTIFICATE_CHANGE_APPLY.getSheetName());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java
index 5fc4b07..af8230e 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java
@@ -9,6 +9,7 @@
 import com.casic.missiles.dto.business.certificate.CertificatePrintApprovalListRequest;
 import com.casic.missiles.dto.business.certificate.CertificatePrintListResponse;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.enums.business.CertificatePrintStatusEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessCertificatePrintLog;
@@ -18,10 +19,16 @@
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.io.IOException;
+import java.util.List;
 import java.util.Objects;
 
 /**
@@ -98,4 +105,16 @@
         });
         return certificatePrintService.certificatePrintLog(idDTO.getId());
     }
+
+    @ApiOperation("证书打印审批导出")
+    @PostMapping("/listExport")
+    public void exportList(@RequestBody CertificatePrintApprovalListRequest request) throws IOException {
+        List<CertificatePrintListResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = certificatePrintService.listByIds(request.getIds());
+        } else {
+            list = certificatePrintService.list(request);
+        }
+        super.exportExcel(CertificatePrintListResponse.class, list, ExportEnum.CERTIFICATE_PRINT.getSheetName());
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java
index 63b06dc..6b2efd5 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java
@@ -6,6 +6,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.business.certificate.CertificateReportApprovalListRequest;
 import com.casic.missiles.dto.business.certificate.CertificateReportSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessCertificateReport;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
@@ -21,6 +22,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -50,7 +52,7 @@
         return certificateReportService.saveCertificateReport(request);
     }
 
-    @ApiOperation("证书审批详情（基本信息）")
+    @ApiOperation("详情（基本信息）")
     @PostMapping("/detail")
     public ReturnDTO<BizBusinessCertificateReport> detail(@RequestBody @Valid BaseDetailRequest request, BindingResult bindingResult) throws Exception {
         if(bindingResult.hasErrors()){
@@ -59,4 +61,11 @@
         return certificateReportService.detail(request);
     }
 
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody CertificateReportApprovalListRequest request) throws Exception {
+        List<BizBusinessCertificateReport> list = super.exportList(request);
+        super.exportExcel(BizBusinessCertificateReport.class, list, ExportEnum.CERTIFICATE_REPORT.getSheetName());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java
index 46b26bd..57c0809 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java
@@ -10,20 +10,21 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.business.identify.IdentifyListRequest;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessIdentifyInfo;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.business.IBizBusinessIdentifyInfoService;
+import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import javax.validation.Valid;
+import java.util.List;
 import java.util.Objects;
 
 /**
@@ -57,16 +58,13 @@
         return identifyInfoService.addIdentify(identifyInfo);
     }
 
-    @ApiOperation("标识打印更新")
+    @ApiOperation("标识打印更新（更新打印时间）")
     @PostMapping("/update")
-    public ReturnDTO updateIdentify(@RequestBody @Valid BizBusinessIdentifyInfo identifyInfo, BindingResult bindingResult) {
-        Assert.isFalse(Objects.isNull(identifyInfo.getId()), () -> {
+    public ReturnDTO updateIdentify(@RequestBody @Valid IdDTO idDTO) {
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        Assert.isFalse(bindingResult.hasErrors(), () -> {
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        });
-        return identifyInfoService.updateIdentify(identifyInfo);
+        return identifyInfoService.updateIdentify(idDTO.getId());
     }
 
     @ApiOperation("标识打印删除")
@@ -77,4 +75,37 @@
         });
         return identifyInfoService.deleteIdentify(idDTO.getId());
     }
+
+    @ApiOperation("标识打印导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody @Valid IdentifyListRequest request, BindingResult bindingResult) throws Exception {
+        if (bindingResult.hasErrors()) {
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        List<BizBusinessIdentifyInfo> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = identifyInfoService.listByIds(request.getIds());
+        } else {
+            list = identifyInfoService.list(request);
+        }
+        for (BizBusinessIdentifyInfo record : list) {
+            DictCodeUtils.convertDictCodeToName(record);
+        }
+        super.exportExcel(BizBusinessIdentifyInfo.class, list, ExportEnum.IDENTIFY_EXPORT.getSheetName());
+    }
+
+
+    // TODO: 2023/8/23 查询设备信息，4个底部按钮查设备（按钮的作用就是前端用来调不同接口、用来区分中间即将展示的标识），前端弹窗选设备，在确定保存时前端根据底部按钮判断传入设备类型deviceType字典code
+    // TODO: 2023/8/23 接口：查受检设备（第1个按钮），查设备台账（后3个按钮同一接口），查询之后前端根据标志类型的不同加到中间页面时进行判断（按产品给的对应表）
+    // TODO: 2023/8/23 提供二维码接口，前端在加到中间页面时调用一下
+
+    @ApiOperation("设备二维码")
+    @PostMapping("/equipment/qrCode")
+    public ReturnDTO<String> equipmentQrCode(@RequestBody @Valid IdDTO idDTO) {
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return identifyInfoService.equipmentQrCode(idDTO.getId());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java
index 707be6e..7e0453d 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java
@@ -117,7 +117,7 @@
     }
 
     @ApiOperation("任务单导出")
-    @PostMapping("/export")
+    @PostMapping("/listExport")
     public void orderExport(@RequestBody @Valid OrderListRequest request, HttpServletResponse response) {
         businessOrderService.orderExport(request, response);
     }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java
index 529a6ce..51432be 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java
@@ -1,9 +1,28 @@
 package com.casic.missiles.controller.business;
 
+import com.casic.missiles.controller.GeneralApprovalController;
+import com.casic.missiles.dto.BaseApprovalSubmitRequest;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.business.outsource.OutsourceAssessApprovalListRequest;
+import com.casic.missiles.dto.business.outsource.OutsourceAssessSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
+import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.model.business.BizBusinessOutsourceAssess;
+import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
+import com.casic.missiles.service.IGeneralApprovalService;
+import com.casic.missiles.service.business.IBizBusinessOutsourceAssessService;
 import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.BindingResult;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.validation.Valid;
+import java.util.List;
+
 /**
  * <p>
  * 计量检定业务-分包管理-测试、校准或检定工作分包评审表 前端控制器
@@ -15,6 +34,27 @@
 @Api(tags = "分包管理-测试、校准或检定工作分包评审表")
 @RestController
 @RequestMapping("/business/outsource/assess")
-public class BizBusinessOutsourceAssessController {
+public class BizBusinessOutsourceAssessController extends GeneralApprovalController<BizBusinessOutsourceAssess, BizBusinessOutsourceAssess, OutsourceAssessApprovalListRequest, BaseApprovalSubmitRequest> {
+    @Autowired
+    private IBizBusinessOutsourceAssessService outsourceAssessService;
 
+    public BizBusinessOutsourceAssessController(IGeneralApprovalService<BizBusinessOutsourceAssess, BizBusinessOutsourceAssess, OutsourceAssessApprovalListRequest, BaseApprovalSubmitRequest> baseApprovalService) {
+        super(baseApprovalService);
+    }
+
+    @ApiOperation("草稿箱-保存")
+    @PostMapping("/save")
+    public ReturnDTO<OutsourceAssessSaveResponse> saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceAssess request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        return outsourceAssessService.saveOutsourceAssess(request);
+    }
+
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception {
+        List<BizBusinessOutsourceAssess> list = super.exportList(request);
+        super.exportExcel(BizBusinessOutsourceAssess.class, list, ExportEnum.OUTSOURCE_ASSESS.getSheetName());
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java
new file mode 100644
index 0000000..9adef18
--- /dev/null
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java
@@ -0,0 +1,60 @@
+package com.casic.missiles.controller.business;
+
+import com.casic.missiles.controller.GeneralApprovalController;
+import com.casic.missiles.dto.BaseApprovalSubmitRequest;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.business.outsource.OutsourceProtocolApprovalListRequest;
+import com.casic.missiles.dto.business.outsource.OutsourceProtocolSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
+import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.model.business.BizBusinessOutsourceProtocol;
+import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
+import com.casic.missiles.service.IGeneralApprovalService;
+import com.casic.missiles.service.business.IBizBusinessOutsourceProtocolService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.BindingResult;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.validation.Valid;
+import java.util.List;
+
+/**
+ * <p>
+ * 计量检定业务-分包管理-测试、校准或检定工作分包协议书 前端控制器
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-08-24
+ */
+@Api(tags = "分包管理-测试、校准或检定工作分包协议书")
+@RestController
+@RequestMapping("/business/outsource/protocol")
+public class BizBusinessOutsourceProtocolController extends GeneralApprovalController<BizBusinessOutsourceProtocol, BizBusinessOutsourceProtocol, OutsourceProtocolApprovalListRequest, BaseApprovalSubmitRequest> {
+    @Autowired
+    private IBizBusinessOutsourceProtocolService outsourceProtocolService;
+
+    public BizBusinessOutsourceProtocolController(IGeneralApprovalService<BizBusinessOutsourceProtocol, BizBusinessOutsourceProtocol, OutsourceProtocolApprovalListRequest, BaseApprovalSubmitRequest> baseApprovalService) {
+        super(baseApprovalService);
+    }
+
+    @ApiOperation("草稿箱-保存")
+    @PostMapping("/save")
+    public ReturnDTO<OutsourceProtocolSaveResponse> saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceProtocol request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        return outsourceProtocolService.saveOutsourceProtocol(request);
+    }
+
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody OutsourceProtocolApprovalListRequest request) throws Exception {
+        List<BizBusinessOutsourceProtocol> list = super.exportList(request);
+        super.exportExcel(BizBusinessOutsourceProtocol.class, list, ExportEnum.OUTSOURCE_PROTOCOL.getSheetName());
+    }
+}
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java
index 097f645..f0f0943 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java
@@ -17,7 +17,6 @@
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.IGeneralApprovalService;
 import com.casic.missiles.service.business.IBizBusinessOutsourcerInfoService;
-import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -71,19 +70,8 @@
 
     @ApiOperation("分包方导出")
     @PostMapping("/listExport")
-    public void export(@RequestBody @Valid OutsourcerInfoApprovalListRequest request, BindingResult bindingResult) throws Exception {
-        if (bindingResult.hasErrors()) {
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        }
-        List<BizBusinessOutsourcerInfo> list;
-        if (!CollectionUtils.isEmpty(request.getIds())) {
-            list = outsourcerInfoService.listByIds(request.getIds());
-        } else {
-            list = outsourcerInfoService.list(request);
-        }
-        for (BizBusinessOutsourcerInfo record : list) {
-            DictCodeUtils.convertDictCodeToName(record);
-        }
+    public void export(@RequestBody OutsourcerInfoApprovalListRequest request) throws Exception {
+        List<BizBusinessOutsourcerInfo> list = super.exportList(request);
         super.exportExcel(BizBusinessOutsourcerInfo.class, list, ExportEnum.OUTSOURCER_EXPORT.getSheetName());
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java
index c2cbf9f..0410918 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java
@@ -17,11 +17,9 @@
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.IGeneralApprovalService;
 import com.casic.missiles.service.business.IBizBusinessSiteExecutiveInfoService;
-import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -60,7 +58,7 @@
         return siteExecutiveInfoService.saveSiteExecutiveInfo(siteExecutiveInfo);
     }
 
-    @ApiOperation("现场检测详情")
+    @ApiOperation("详情")
     @PostMapping("/detail")
     public ReturnDTO<SiteExecutiveDetailResponse> siteExecutiveDetail(@RequestBody @Valid IdDTO idDTO) throws Exception {
         Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
@@ -69,21 +67,10 @@
         return ReturnUtil.success(siteExecutiveInfoService.detail(idDTO.getId()));
     }
 
-    @ApiOperation("现场检测导出")
+    @ApiOperation("导出")
     @PostMapping("/listExport")
-    public void export(@RequestBody @Valid SiteExecutiveApprovalListRequest request, BindingResult bindingResult) throws Exception {
-        if (bindingResult.hasErrors()) {
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        }
-        List<SiteExecutiveApprovalListResponse> list;
-        if (!CollectionUtils.isEmpty(request.getIds())) {
-            list = siteExecutiveInfoService.listInfoByIds(request.getIds());
-        } else {
-            list = siteExecutiveInfoService.listInfo(request);
-        }
-        for (SiteExecutiveApprovalListResponse record : list) {
-            DictCodeUtils.convertDictCodeToName(record);
-        }
+    public void export(@RequestBody SiteExecutiveApprovalListRequest request) throws Exception {
+        List<SiteExecutiveApprovalListResponse> list = super.exportList(request);
         super.exportExcel(SiteExecutiveApprovalListResponse.class, list, ExportEnum.SITE_EXECUTIVE_EXPORT.getSheetName());
     }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
index 7e793cd..a92e209 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
@@ -55,7 +55,7 @@
 
     @ApiOperation("设备收发列表导出")
     @PostMapping("/export")
-    public void exportList(@RequestBody @Valid SampleDispatchListRequest request) throws IOException {
+    public void exportList(@RequestBody SampleDispatchListRequest request) throws IOException {
         List<SampleDispatchListResponse> list;
         if (!CollectionUtils.isEmpty(request.getIds())) {
             list = dispatchService.listByIds(request.getIds());
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java
index cdc77fc..d120fd4 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java
@@ -7,6 +7,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.business.labExecutive.*;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.business.IBusinessLabExecutiveInfoService;
@@ -14,6 +15,7 @@
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.*;
 
@@ -32,7 +34,7 @@
     @Autowired
     private IBusinessLabExecutiveInfoService labExecutiveInfoService;
 
-    @ApiOperation("实验室检测-部门检测-查询各状态列表（待检测、检测中、检测完）")
+    @ApiOperation("实验室任务-查询各状态列表（待检测、检测中、检测完）")
     @PostMapping("/deptExecutive/List")
     public ReturnDTO<PageInfoBT<SampleLabExecutiveListResponse>> queryDeptExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
@@ -43,10 +45,19 @@
         return ReturnUtil.success(super.packForBT(labExecutiveInfoService.deptLabExecutiveListPage(page, labExecutiveListRequest)));
     }
 
-    /**
-     * 实验室检测-我的检测-查询各状态列表（待检测、检测中、检测完）
-     */
-    @ApiOperation("实验室检测-我的检测-查询各状态列表（待检测、检测中、检测完）")
+    @ApiOperation("实验室任务导出")
+    @PostMapping("/deptExecutive/export")
+    public void deptExportList(@RequestBody @Valid SampleLabExecutiveListRequest request) throws Exception {
+        List<SampleLabExecutiveListResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = labExecutiveInfoService.deptLabExecutiveListByIds(request.getMeasureStatus(), request.getIds());
+        } else {
+            list = labExecutiveInfoService.deptLabExecutiveList(request);
+        }
+        super.exportExcel(SampleLabExecutiveListResponse.class, list, ExportEnum.DEPT_EXECUTIVE_TASK.getSheetName());
+    }
+
+    @ApiOperation("我的任务-查询各状态列表（待检测、检测中、检测完）")
     @PostMapping("/myExecutive/list")
     public ReturnDTO<PageInfoBT<SampleLabExecutiveListResponse>> queryMyExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
@@ -57,19 +68,25 @@
         return ReturnUtil.success(super.packForBT(labExecutiveInfoService.myLabExecutiveListPage(page, labExecutiveListRequest)));
     }
 
-    /**
-     * 实验室检测-我的检测-查询各状态样品数量（待检测、检测中、检测完）
-     */
-    @ApiOperation("实验室检测-我的检测-查询各状态样品数量（待检测、检测中、检测完）")
+    @ApiOperation("我的任务导出")
+    @PostMapping("/myExecutive/export")
+    public void exportList(@RequestBody @Valid SampleLabExecutiveListRequest request) throws Exception {
+        List<SampleLabExecutiveListResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = labExecutiveInfoService.myLabExecutiveListByIds(request.getMeasureStatus(), request.getIds());
+        } else {
+            list = labExecutiveInfoService.myLabExecutiveList(request);
+        }
+        super.exportExcel(SampleLabExecutiveListResponse.class, list, ExportEnum.MY_EXECUTIVE_TASK.getSheetName());
+    }
+
+    @ApiOperation("我的任务-查询各状态样品数量（待检测、检测中、检测完）")
     @GetMapping("/myExecutive/amount")
     public ReturnDTO<List<SampleAmountResponse>> queryMyExecutiveAmount() {
         return ReturnUtil.success(labExecutiveInfoService.myExecutiveAmount());
     }
 
-    /**
-     * 实验室检测-部门检测-分配（分配给具体人员）
-     */
-    @ApiOperation("实验室检测-部门检测-分配按钮（分配给具体人员）")
+    @ApiOperation("实验室任务-分配按钮（分配给具体人员）")
     @PostMapping("/deptExecutive/allocate")
     public ReturnDTO allocateStaff(@RequestBody @Valid SampleAllocateRequest sampleAllocateRequest, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -78,10 +95,7 @@
         return labExecutiveInfoService.allocateStaff(sampleAllocateRequest);
     }
 
-    /**
-     * 实验室检测-我的检测-检定人扫描收入（待检测->检测中）
-     */
-    @ApiOperation("实验室检测-我的检测-检定人扫描收入（待检测->检测中）")
+    @ApiOperation("我的任务-检定人扫描收入（待检测->检测中）")
     @PostMapping("/myExecutive/receive")
     public ReturnDTO sampleReceive(@RequestBody @Valid List<SampleOperateRequest> requestList, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -90,10 +104,7 @@
         return labExecutiveInfoService.sampleReceive(requestList);
     }
 
-    /**
-     * 实验室检测-负责人/检定人扫描检完（检测中->检测完）
-     */
-    @ApiOperation("实验室检测-负责人/检定人扫描检完（检测中->检测完）")
+    @ApiOperation("实验室任务-负责人/检定人扫描检完（检测中->检测完）")
     @PostMapping("/myExecutive/complete")
     public ReturnDTO sampleExecutiveComplete(@RequestBody @Valid List<SampleOperateRequest> requestList, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -102,10 +113,7 @@
         return labExecutiveInfoService.sampleExecutiveComplete(requestList);
     }
 
-    /**
-     * 实验室检测-部门检测/我的检测 编辑（只能修改应出具证书）
-     */
-    @ApiOperation("实验室检测-部门检测/我的检测 编辑（只能修改应出具证书）")
+    @ApiOperation("实验室任务/我的任务 编辑（只能修改应出具证书）")
     @PostMapping("/executive/update")
     public ReturnDTO updateExecutive(@RequestBody @Valid UpdateExecutiveRequest request, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -114,10 +122,7 @@
         return labExecutiveInfoService.updateExecutive(request);
     }
 
-    /**
-     * 实验室检测-部门检测/我的检测 详情
-     */
-    @ApiOperation("实验室检测-部门检测/我的检测 详情")
+    @ApiOperation("实验室任务/我的任务 详情")
     @PostMapping("/executive/detail")
     public ReturnDTO<ExecutiveDetailResponse> executiveDetail(@RequestBody @Valid ExecutiveDetailRequest request, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
@@ -131,7 +136,7 @@
      * 退回后会将下一个要执行的实验室检测状态更新为待分配，将后面的实验室顺序变更为连续（都进行减1）
      * 最后一个检测的实验室退回，等分发员再增加实验室或设备收发中的已收入直接手动点击完成
      */
-    @ApiOperation("实验室检测-部门检测/我的检测 退回（待检测/检测中->退回）")
+    @ApiOperation("实验室任务/我的任务 退回（待检测/检测中->退回）")
     @PostMapping("/executive/sendBack")
     public ReturnDTO executiveSendBack(@RequestBody @Valid ExecutiveSendBackRequest request, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -140,9 +145,6 @@
         return labExecutiveInfoService.sampleExecutiveSendBack(request);
     }
 
-    /**
-     * 分发员编辑实验室检测列表
-     */
     @ApiOperation("分发员编辑实验室检测列表")
     @PostMapping("/handOut/updateList")
     public ReturnDTO updateExecutiveList(@RequestBody @Valid UpdateExecutiveListRequest request, BindingResult bindingResult) {
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java
index 48a67ed..0c04f31 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java
@@ -10,6 +10,7 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.resource.customer.CustomerApprovalListRequest;
 import com.casic.missiles.dto.resource.customer.CustomerSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceCustomerInfo;
@@ -26,6 +27,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -55,6 +57,13 @@
         return customerInfoService.saveCustomerInfo(request);
     }
 
+    @ApiOperation("委托方名录导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody CustomerApprovalListRequest request) throws Exception {
+        List<BizResourceCustomerInfo> list = super.exportList(request);
+        super.exportExcel(BizResourceCustomerInfo.class, list, ExportEnum.CUSTOMER_INFO.getSheetName());
+    }
+
     @ApiOperation("委托方人员列表（分页）")
     @PostMapping("/person/listPage")
     public ReturnDTO<PageInfoBT<BizResourceCustomerStaff>> personListPage(@RequestBody IdDTO idDto) {
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
index 972ed4b..6418ea5 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
@@ -5,6 +5,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.resource.customer.SuggestFormApprovalListRequest;
 import com.casic.missiles.dto.resource.customer.SuggestFormSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceCustomerSuggestForm;
@@ -20,6 +21,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -50,4 +52,11 @@
         return suggestFormService.saveSuggestForm(request);
     }
 
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody SuggestFormApprovalListRequest request) throws Exception {
+        List<BizResourceCustomerSuggestForm> list = super.exportList(request);
+        super.exportExcel(BizResourceCustomerSuggestForm.class, list, ExportEnum.CUSTOMER_SUGGEST_FORM.getSheetName());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java
index 1934d1a..9e07eab 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java
@@ -15,12 +15,16 @@
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.resource.IEnvEnvironmentRecordConfigService;
 import com.casic.missiles.service.resource.IEnvEnvironmentRecordDataService;
+import com.casic.missiles.service.resource.IEnvLocationInfoService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
 import java.util.List;
@@ -39,6 +43,8 @@
     private IEnvEnvironmentRecordDataService environmentRecordDataService;
     @Autowired
     private IEnvEnvironmentRecordConfigService environmentRecordConfigService;
+    @Autowired
+    private IEnvLocationInfoService locationInfoService;
 
     @ApiOperation("环境记录单数据列表/详情")
     @PostMapping("/data/listPage")
@@ -95,4 +101,11 @@
         });
         return environmentRecordConfigService.deleteEnvironmentRecordConfig(idDTO.getId());
     }
+
+    @ApiOperation("地点列表")
+    @PostMapping("/location/listPage")
+    public ReturnDTO<PageInfoBT<LocationListResponse>> locationListPage(@RequestBody @Valid LocationListRequest request) {
+        Page<LocationListResponse> page = PageFactory.defaultPage();
+        return ReturnUtil.success(super.packForBT(locationInfoService.listPage(page, request)));
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java
index 82efe3f..e9561fa 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java
@@ -10,6 +10,7 @@
 import com.casic.missiles.dto.resource.seal.SealLogListRequest;
 import com.casic.missiles.dto.resource.seal.SealNoteApprovalListRequest;
 import com.casic.missiles.dto.resource.seal.SealNoteSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceSealUseLog;
@@ -27,6 +28,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -58,6 +60,13 @@
         return sealUseNoteService.saveSeal(request);
     }
 
+    @ApiOperation("印章使用登记导出（列表和导出中去掉经办人和监印人）")
+    @PostMapping("/listExport")
+    public void export(@RequestBody SealNoteApprovalListRequest request) throws Exception {
+        List<BizResourceSealUseNote> list = super.exportList(request);
+        super.exportExcel(BizResourceSealUseNote.class, list, ExportEnum.SEAL_NOTE.getSheetName());
+    }
+
     // TODO: 2023/7/28 印章使用日志：系统中使用印章时插入数据库
 
     @ApiOperation("印章使用日志列表（分页）")
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java
index 9b674fc..06b6521 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java
@@ -9,16 +9,20 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.resource.staff.StaffCertRequest;
 import com.casic.missiles.dto.resource.staff.StaffCertResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.service.resource.IBizResourceStaffInfoService;
 import com.casic.missiles.service.resource.IBizResourceStaffVerifierService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.List;
+
 /**
  * @Description:
  * @Author: wangpeng
@@ -41,9 +45,21 @@
         return ReturnUtil.success(super.packForBT(responsePage));
     }
 
+    @ApiOperation("证书逾期提醒导出")
+    @PostMapping("/listExport")
+    public void exportList(@RequestBody StaffCertRequest request) throws Exception {
+        List<StaffCertResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = staffInfoService.certListByIds(request.getIds());
+        } else {
+            list = staffInfoService.certList(request);
+        }
+        super.exportExcel(StaffCertResponse.class, list, ExportEnum.STAFF_CERTIFICATE_EXPIRE.getSheetName());
+    }
+
     @ApiOperation("证书逾期提醒")
     @PostMapping("/expirationReminder")
-    public ReturnDTO expirationReminder(@RequestBody IdDTO idDto) {
-        return verifierService.expirationReminder(idDto);
+    public ReturnDTO expirationReminder(@RequestBody IdDTO idDTO) {
+        return verifierService.expirationReminder(idDTO);
     }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java
index 3b251ad..a6e7850 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java
@@ -12,6 +12,7 @@
 import com.casic.missiles.dto.resource.staff.StaffListRequest;
 import com.casic.missiles.dto.resource.staff.TrainListRequest;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.*;
@@ -22,7 +23,10 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
 import java.util.List;
@@ -52,8 +56,19 @@
             throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
         }
         Page<BizResourceStaffInfo> page = PageFactory.defaultPage();
-        Page<BizResourceStaffInfo> responsePage = staffInfoService.listPage(page, request);
-        return ReturnUtil.success(super.packForBT(responsePage));
+        return ReturnUtil.success(super.packForBT(staffInfoService.listPage(page, request)));
+    }
+
+    @ApiOperation("人员登记导出")
+    @PostMapping("/listExport")
+    public void exportList(@RequestBody StaffListRequest request) throws Exception {
+        List<BizResourceStaffInfo> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = staffInfoService.listByIds(request.getIds());
+        } else {
+            list = staffInfoService.list(request);
+        }
+        super.exportExcel(BizResourceStaffInfo.class, list, ExportEnum.STAFF_INFO.getSheetName());
     }
 
     @ApiOperation("人员登记详情基础信息")
@@ -85,9 +100,9 @@
 
     @ApiOperation("科研教育列表（分页）")
     @PostMapping("/education/listPage")
-    public ReturnDTO<PageInfoBT<BizResourceStaffEducation>> educationListPage(@RequestBody IdDTO idDto) {
+    public ReturnDTO<PageInfoBT<BizResourceStaffEducation>> educationListPage(@RequestBody IdDTO idDTO) {
         Page<BizResourceStaffEducation> page = PageFactory.defaultPage();
-        Page<BizResourceStaffEducation> responsePage = staffInfoService.educationListPage(page, idDto);
+        Page<BizResourceStaffEducation> responsePage = staffInfoService.educationListPage(page, idDTO);
         return ReturnUtil.success(super.packForBT(responsePage));
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java
index af6aa86..d85d84a 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java
@@ -9,6 +9,7 @@
 import com.casic.missiles.dto.resource.outsideService.SupplierApprovalListRequest;
 import com.casic.missiles.dto.resource.outsideService.SupplierSaveResponse;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceSupplierAbility;
@@ -67,6 +68,13 @@
         return ReturnUtil.success(supplierInfoService.detail(idDTO.getId()));
     }
 
+    @ApiOperation("合格供方导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody SupplierApprovalListRequest request) throws Exception {
+        List<BizResourceSupplierInfo> list = super.exportList(request);
+        super.exportExcel(BizResourceSupplierInfo.class, list, ExportEnum.SUPPLIER_INFO.getSheetName());
+    }
+
     @ApiOperation("供方人员列表（分页）")
     @PostMapping("/person/listPage")
     public ReturnDTO<PageInfoBT<BizResourceSupplierPerson>> personListPage(@RequestBody IdDTO idDTO) {
diff --git a/casic-metering-api/src/main/resources/config/application.yml b/casic-metering-api/src/main/resources/config/application.yml
index 350db5f..ecff521 100644
--- a/casic-metering-api/src/main/resources/config/application.yml
+++ b/casic-metering-api/src/main/resources/config/application.yml
@@ -126,7 +126,7 @@
     #作者
     author: wangpeng
     #待生成对象表名
-    table-name: biz_equipment_technical_target_approval,biz_equipment_attachment_approval,biz_equipment_checkpoint_approval
+    table-name: biz_business_outsource_protocol
 
 reminder:
   #节点--common模块config包 ReminderNodeConfig配置
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
index 4a19e4e..d47d552 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
@@ -53,6 +53,7 @@
     SUGGEST_FORM_SAVE_FAILED(2509, "委托方意见登记表保存至草稿箱失败"),
     EXAMINE_FORM_SAVE_FAILED(2510, "要求、委托书及合同评审表保存至草稿箱失败"),
     CUSTOMER_EXIST_SAVE_FAILED(2511, "该委托方已存在，请重新选择"),
+    DUPLICATE_LOCATION_NO(2512, "地点编号已存在"),
 
     /**
      * 计量检定业务模块
@@ -68,6 +69,8 @@
     COMPLETE_SAMPLE_NOT_EXIST(2609, "检测中不存在扫描收入的样品"),
     CANNOT_CHANGE_MEASURE_INFO(2610, "无法更改非当前登录用户的检测信息"),
     NON_EXIST_ORDER_OR_SAMPLE(2611, "不存在该委托单或该委托单下的样品"),
+    OUTSOURCE_ACCESS_SAVE_FAILED(2612, "测试、校准或检定工作分包评审表保存至草稿箱失败"),
+    OUTSOURCE_PROTOCOL_SAVE_FAILED(2613, "测试、校准或检定工作分包协议书保存至草稿箱失败"),
 
     /**
      * 历史遗留备用
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
index 5089ad1..81a406b 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
@@ -10,54 +10,38 @@
     /**
      * 资源管理
      */
-    ENVIRONMENT_DATA_EXPORT("environmentData", "environmentData", "环境记录单数据"),
+    ENVIRONMENT_DATA_EXPORT("environmentData", "环境记录单数据", "环境记录单数据"),
+    STAFF_INFO("staffInfo", "人员登记", "人员登记"),
+    STAFF_CERTIFICATE_EXPIRE("certificateExpire", "证书逾期提醒", "证书逾期提醒"),
+    SUPPLIER_INFO("supplierInfo", "合格供方名录", "合格供方名录"),
+    CUSTOMER_INFO("customerInfo", "委托方名录", "委托方名录"),
+    CUSTOMER_SUGGEST_FORM("customerSuggestForm", "委托方意见登记表", "委托方意见登记表"),
+    SEAL_NOTE("sealNote", "印章使用登记", "印章使用登记"),
 
-    FILE_EXPORT("meterFileData", "meterFileData", "计量文件信息"),
-    TRAIN_PLAN_EXPORT("trainPlanData", "trainPlanData", "培训计划"),
-    TRAIN_LOG_EXPORT("trainLogData", "trainLogData", "培训记录"),
-    METER_ORGANIZE_EXPORT("meterOrganizeData", "meterOrganizeData", "计量组织"),
-    TRACE_SUPPLIER_EXPORT("traceSupplierData", "traceSupplierData", "溯源供方"),
-    SIGN_EXPORT("signData", "signData", "签名/签章"),
-    TEMPLATE_EXPORT("templateData", "templateData", "原始记录模板/证书报告模板"),
-    FIXED_ASSETS("meterFixedAssets", "meterFixedAssets", "固定资产"),
-    METER_EQUIPMENT("meterEquipment", "meterEquipment", "测量设备"),
-    CALIBRATION_TEST_EQUIPMENT("calibrationTestEquipment", "calibrationTestEquipment", "校准检定设备"),
-    MEASURE_ACCOUNT("measureAccount", "measureAccount", "测量工装"),
-    STANDARD_SUPPORT_EQUIPMENT("standardSupportEquipment", "standardSupportEquipment", "标准配套设备"),
-    STANDARD_EQUIPMENT("standardEquipment", "standardEquipment", "标准装置"),
-    FLOW_DEF_EXPORT("flowDefData", "flowDefData", "流程定义"),
-    STAFF_CERTIFICATE("certificate", "certificate", "计量人员证书"),
-    CHECK_INFO("checkInfo", "checkInfo", "设备管理点检测"),
-    EQUIPMENT_APPLY("equipmentApply", "equipmentApply", "设备借用"),
-    STANDARD_EQUIPMENT_REMIND("equipmentApplyRemind", "equipmentApplyRemind", "标准装置到期提醒"),
-    METER_PRICE("meterPrice", "meterPrice", "价格库"),
-    METER_STAFF("meterStaff", "meterStaff", "计量人员"),
-    STANDARD_EQUIPMENT_APPLY("standardEquipmentApply", "standardEquipmentApply", "标准装置申请"),
-    STATE_MANAGE_APPLY("stateManage", "stateManage", "状态管理"),
-    METER_ACCEPTANCE_CHECK("acceptanceCheck", "acceptanceCheck", "设备检修保养验收单"),
-    CUSTOMER_EXPORT("customerData", "customerData", "客户信息"),
-    ORDER_EXPORT("orderData", "orderData", "委托书信息"),
-    SAMPLE_EXPORT("sampleData", "sampleData", "样本信息"),
-    EXCHANGE_DATA("exchangeData", "exchangeData", "设备交接单"),
-    DISPATCH_DATA("dispatchData", "dispatchData", "设备收发"),
-    ENVIRONMENT_DATA("environmentData", "environmentData", "环境记录单"),
-    ORIGIN_DATA("originData", "originData", "原始记录"),
-    CERTIFICATE_REPORT("certificateReport", "certificateReport", "证书报告"),
-    ADVICE_EXPORT("adviceData", "adviceData", "客户反馈"),
-    HANDOUT_EXPORT("handoutData", "handoutData", "任务分发列表"),
-    OUTSOURCER_EXPORT("outsourcerData", "outsourcerData", "分包方"),
-    SITE_EXECUTIVE_EXPORT("siteExecutiveData", "siteExecutiveData", "现场测试、校准或检定"),
-    CERTIFICATE_PRINT_EXPORT("certificatePrintData", "certificatePrintData", "证书打印"),
-    DOWNLOAD_TEMPLATE("downloadTemplate", "downloadTemplate", "页面配置"),
-    OUTSOURCER_CERTIFICATE_EXPORT("outsourceCertificateData", "outsourceCertificateData", "分包证书"),
-    SETTLEMENT_INFO_EXPORT("settlementInfoData", "settlementInfoData", "业务结算"),
-    EQUIPMENT_REMIND("equipmentRemind", "equipmentRemind", "设备到期提醒"),
-    AGREEMENT_INFO_EXPORT("agreementInfoData", "agreementInfoData", "合同"),
-    WORK_STATISTICS_EXPORT("workStatisticsData", "workStatisticsData", "实时工作统计"),
-    DEPT_OUTPUT_EXPORT("deptOutputData", "deptOutputData", "部门产值分析"),
-    WORKLOAD_EXPORT("workloadData", "workloadData", "业务工作量分析"),
-    DEPT_COMPREHENSIVE_EXPORT("deptComprehensiveData", "deptComprehensiveData", "部门综合分析"),
-    ENVIRONMENTAL_RECORD("environmentalRecordData", "environmentalRecordData", "现场环境记录");
+    /**
+     * 计量检定业务
+     */
+    OUTSOURCER_EXPORT("outsourcerData", "分包方名录", "分包方名录"),
+    IDENTIFY_EXPORT("identifyData", "计量标识", "计量标识"),
+    ORDER_EXPORT("orderData", "任务单", "任务单"),
+    DISPATCH_DATA("dispatchData", "设备收发", "设备收发"),
+    HANDOUT_EXPORT("handoutData", "任务分发", "任务分发"),
+    SITE_EXECUTIVE_EXPORT("siteExecutiveData", "现场测试、校准或检定", "现场测试、校准或检定"),
+    CERTIFICATE_REPORT("certificateReport", "证书审批", "证书审批"),
+    CERTIFICATE_CHANGE_APPLY("certificateChangeApply", "证书报告补充或更换申请单", "证书报告补充或更换申请单"),
+    CERTIFICATE_PRINT("certificatePrintData", "证书打印审批", "证书打印审批"),
+    DEPT_EXECUTIVE_TASK("deptExecutiveTaskData", "实验室任务", "实验室任务"),
+    MY_EXECUTIVE_TASK("myExecutiveTaskData", "我的任务", "我的任务"),
+    OUTSOURCE_ASSESS("outsourceAssess", "测试、校准或检定工作分包评审表", "测试、校准或检定工作分包评审表"),
+    OUTSOURCE_PROTOCOL("outsourceProtocol", "测试、校准或检定工作分包协议书", "测试、校准或检定工作分包协议书"),
+
+    /**
+     * 系统管理
+     */
+    SIGN_EXPORT("signData", "签名", "签名"),
+    TEMPLATE_EXPORT("templateData", "文件模板", "文件模板"),
+    FLOW_DEF_EXPORT("flowDefData", "流程定义", "流程定义"),
+    DOWNLOAD_TEMPLATE("downloadTemplate", "流程定义", "页面配置");
 
     ExportEnum(String fileName, String sheetName, String description) {
         this.fileName = fileName;
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateRecordTypeCodeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateRecordTypeCodeEnum.java
index 31d913c..a963522 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateRecordTypeCodeEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateRecordTypeCodeEnum.java
@@ -46,4 +46,14 @@
     String SITE_EXECUTIVE_APPROVAL = "01";
     //《现场测试、校准或检定工作记录表》
     String SITE_EXECUTIVE_LOG = "02";
+
+    //测试、校准或检定工作分包协议书
+    String OUTSOURCE_PROTOCOL = "01";
+    //测试、校准或检定工作分包评审表
+    String OUTSOURCE_ACCESS = "02";
+    //测试、校准或检定工作分包通知书
+    String OUTSOURCE_NOTICE = "03";
+    //测试、校准或检定工作分包方名录
+    String OUTSOURCE_INFO = "04";
+
 }
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
index 24b8635..f78bd53 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
@@ -15,6 +15,10 @@
     String CERTIFICATE_CHANGE_APPLY_BEAN_NAME = "certificateChangeApplyBean";
     //现场测试、校准或检定
     String SITE_EXECUTIVE_BEAN_NAME = "siteExecutiveBean";
+    //测试、校准或检定工作分包评审表
+    String OUTSOURCE_ASSESS_BEAN_NAME = "outsourceAssessBean";
+    //测试、校准或检定工作分包协议书
+    String OUTSOURCE_PROTOCOL_BEAN_NAME = "outsourceProtocolBean";
 
     /*********************************设备与装置************************************/
     //设备台账
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 b21c661..6b86fd1 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
@@ -18,6 +18,8 @@
     OUTSOURCER_APPROVAL(OUTSOURCER_BEAN_NAME, ""),
     CERTIFICATE_CHANGE_APPROVAL(CERTIFICATE_CHANGE_APPLY_BEAN_NAME, ""),
     SITE_EXECUTIVE_APPROVAL(SITE_EXECUTIVE_BEAN_NAME, ""),
+    OUTSOURCE_ASSESS_APPROVAL(OUTSOURCE_ASSESS_BEAN_NAME, ""),
+    OUTSOURCE_PROTOCOL_APPROVAL(OUTSOURCE_PROTOCOL_BEAN_NAME, ""),
 
     ACTION_STATUS_MAP(new HashMap<String, AwareActionStatusEnum>() {
         {
@@ -47,6 +49,10 @@
             put(ApplyFromIdEnum.CERTIFICATE_CHANGE_APPROVAL.getCode(), CERTIFICATE_CHANGE_APPROVAL);
             //现场测试、校准或检定审批
             put(ApplyFromIdEnum.SITE_EXECUTIVE_APPROVAL.getCode(), SITE_EXECUTIVE_APPROVAL);
+            //测试、校准或检定工作分包评审表
+            put(ApplyFromIdEnum.OUTSOURCE_ASSESS_APPROVAL.getCode(), OUTSOURCE_ASSESS_APPROVAL);
+            //测试、校准或检定工作分包协议书
+            put(ApplyFromIdEnum.OUTSOURCE_PROTOCOL_APPROVAL.getCode(), OUTSOURCE_PROTOCOL_APPROVAL);
         }
     });
     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 934405e..c7410bd 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
@@ -9,6 +9,8 @@
     CERTIFICATE_CHANGE_APPROVAL("jljdywzsbchghsqd", MessageSourceModuleEnum.BUSINESS.getCode(), "证书/报告补充或更换申请单"),
     OUTSOURCER_APPROVAL("jljdywcsjzhgfbfml", MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定合格分包方名录"),
     SITE_EXECUTIVE_APPROVAL("jljdywxccsjzsp", MessageSourceModuleEnum.BUSINESS.getCode(), "现场测试、校准或检定审批"),
+    OUTSOURCE_ASSESS_APPROVAL("jljdywcsjzfbpsb", MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包评审表"),
+    OUTSOURCE_PROTOCOL_APPROVAL("jljdywcsjzfbxys", MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包协议书"),
 
 
     /*******************************************设备与装置*********************************************/
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/GeneralApprovalMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/GeneralApprovalMapper.java
index 4fb7344..0c9d6ae 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/GeneralApprovalMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/GeneralApprovalMapper.java
@@ -17,8 +17,4 @@
 
     Page<O> selectBatchForApprovalList(Page<O> page, @Param("request") R request, @Param("businessKeys") List<String> businessKeys);
 
-//    Page<O> selectListPage(Page<O> page, @Param("request") R request);
-
-//    Long selectMaxNo();
-
 }
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceAssessMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceAssessMapper.java
index 7867bb8..ba59009 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceAssessMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceAssessMapper.java
@@ -1,7 +1,12 @@
 package com.casic.missiles.mapper.business;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.business.outsource.OutsourceAssessApprovalListRequest;
+import com.casic.missiles.mapper.GeneralApprovalMapper;
 import com.casic.missiles.model.business.BizBusinessOutsourceAssess;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * <p>
@@ -11,6 +16,10 @@
  * @author wangpeng
  * @since 2023-08-16
  */
-public interface BizBusinessOutsourceAssessMapper extends BaseMapper<BizBusinessOutsourceAssess> {
+public interface BizBusinessOutsourceAssessMapper extends GeneralApprovalMapper<BizBusinessOutsourceAssess, BizBusinessOutsourceAssess, OutsourceAssessApprovalListRequest> {
+
+    Page<BizBusinessOutsourceAssess> selectBatchForApprovalList(Page<BizBusinessOutsourceAssess> page, @Param("request") OutsourceAssessApprovalListRequest request, @Param("businessKeys") List<String> businessKeys);
+
+    Long selectMaxProjectNo();
 
 }
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceProtocolMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceProtocolMapper.java
new file mode 100644
index 0000000..e6aba35
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceProtocolMapper.java
@@ -0,0 +1,24 @@
+package com.casic.missiles.mapper.business;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.business.outsource.OutsourceProtocolApprovalListRequest;
+import com.casic.missiles.mapper.GeneralApprovalMapper;
+import com.casic.missiles.model.business.BizBusinessOutsourceProtocol;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 计量检定业务-分包管理-测试、校准或检定工作分包协议书 Mapper 接口
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-08-24
+ */
+public interface BizBusinessOutsourceProtocolMapper extends GeneralApprovalMapper<BizBusinessOutsourceProtocol, BizBusinessOutsourceProtocol, OutsourceProtocolApprovalListRequest> {
+
+    Page<BizBusinessOutsourceProtocol> selectBatchForApprovalList(Page<BizBusinessOutsourceProtocol> page, @Param("request") OutsourceProtocolApprovalListRequest request, @Param("businessKeys") List<String> businessKeys);
+
+    Long selectMaxProtocolNo();
+}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/EnvLocationInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/EnvLocationInfoMapper.java
new file mode 100644
index 0000000..49eff87
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/EnvLocationInfoMapper.java
@@ -0,0 +1,21 @@
+package com.casic.missiles.mapper.resource;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.resource.environment.LocationListRequest;
+import com.casic.missiles.dto.resource.environment.LocationListResponse;
+import com.casic.missiles.model.resource.EnvLocationInfo;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * <p>
+ * 实验室环境监控系统-设备表 Mapper 接口
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-06-07
+ */
+public interface EnvLocationInfoMapper extends BaseMapper<EnvLocationInfo> {
+
+    Page<LocationListResponse> selectLocationListPage(Page<LocationListResponse> page, @Param("request") LocationListRequest request);
+}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java
index de124db..85ed0f7 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java
@@ -1,7 +1,9 @@
 package com.casic.missiles.mapper.system;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.dto.system.SignDetailResponse;
+import com.casic.missiles.dto.system.SignListRequest;
 import com.casic.missiles.model.system.SystemSign;
 import org.apache.ibatis.annotations.Param;
 
@@ -22,4 +24,8 @@
     SignDetailResponse selectSignDetailById(Long id);
 
     List<SystemSign> selectUsableSignList(@Param("userId") Long userId);
+
+    Page<SystemSign> selectSignListPage(Page<SystemSign> page, @Param("request") SignListRequest request);
+
+    List<SystemSign> selectSignList(@Param("request") SignListRequest request);
 }
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateChangeApplyMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateChangeApplyMapper.xml
index d798447..c496092 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateChangeApplyMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateChangeApplyMapper.xml
@@ -30,31 +30,31 @@
         SELECT *
         FROM biz_business_certificate_change_apply
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.changeApplyNo != null and request.changeApplyNo !=''">
+        <if test="request != null and request.changeApplyNo != null and request.changeApplyNo !=''">
             and change_apply_no like concat('%',#{request.changeApplyNo},'%')
         </if>
-        <if test="request.changeReportNo != null and request.changeReportNo !=''">
+        <if test="request != null and request.changeReportNo != null and request.changeReportNo !=''">
             and change_report_no like concat('%',#{request.changeReportNo},'%')
         </if>
-        <if test="request.changeReportName != null and request.changeReportName !=''">
+        <if test="request != null and request.changeReportName != null and request.changeReportName !=''">
             and change_report_name like concat('%',#{request.changeReportName},'%')
         </if>
-        <if test="request.changeType != null and request.changeType !=''">
+        <if test="request != null and request.changeType != null and request.changeType !=''">
             and change_type = #{request.changeType}
         </if>
-        <if test="request.createUserName != null and request.createUserName !=''">
+        <if test="request != null and request.createUserName != null and request.createUserName !=''">
             and create_user_name like concat('%',#{request.createUserName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificatePrintMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificatePrintMapper.xml
index b66cd99..49c0ac8 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificatePrintMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificatePrintMapper.xml
@@ -31,34 +31,34 @@
         LEFT JOIN biz_business_order_sample_relation bosr ON (bosr.order_id = bcr.order_id AND bosr.sample_id = bcr.sample_id)
         LEFT JOIN biz_business_order_info boi ON boi.id = bosr.order_id
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and bcp.approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.printStatus != null and request.printStatus !=''">
+        <if test="request != null and request.printStatus != null and request.printStatus !=''">
             and print_status = #{request.printStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and bcp.create_user_id = #{request.createUserId}
         </if>
-        <if test="request.certificateReportNo != null and request.certificateReportNo !=''">
+        <if test="request != null and request.certificateReportNo != null and request.certificateReportNo !=''">
             and bcr.certificate_report_no like concat('%',#{request.certificateReportNo},'%')
         </if>
-        <if test="request.certificateReportName != null and request.certificateReportName !=''">
+        <if test="request != null and request.certificateReportName != null and request.certificateReportName !=''">
             and bcr.certificate_report_name like concat('%',#{request.certificateReportName},'%')
         </if>
-        <if test="request.customerName != null and request.customerName !=''">
+        <if test="request != null and request.customerName != null and request.customerName !=''">
             and boi.customer_name like concat('%',#{request.customerName},'%')
         </if>
-        <if test="request.sampleNo != null and request.sampleNo !=''">
+        <if test="request != null and request.sampleNo != null and request.sampleNo !=''">
             and bosr.sample_no like concat('%',#{request.sampleNo},'%')
         </if>
-        <if test="request.sampleName != null and request.sampleName !=''">
+        <if test="request != null and request.sampleName != null and request.sampleName !=''">
             and bosr.sample_name like concat('%',#{request.sampleName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and bcp.create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and bcp.create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml
index b366034..767695d 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml
@@ -46,33 +46,37 @@
         SELECT bcr.*, bosr.sample_no, bosr.sample_name, bosr.sample_model, rsi.staff_name
         FROM biz_business_certificate_report bcr
         LEFT JOIN biz_business_order_sample_relation bosr ON (bosr.order_id = bcr.order_id AND bosr.sample_id = bcr.sample_id)
+        LEFT JOIN biz_business_order_info boi ON boi.id = bcr.order_id
         LEFT JOIN biz_resource_staff_info rsi ON rsi.id = bcr.measure_person_id
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and bcr.approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and bcr.create_user_id = #{request.createUserId}
         </if>
-        <if test="request.certificateReportNo != null and request.certificateReportNo !=''">
+        <if test="request != null and request.customerId != null and request.customerId !=''">
+            and boi.customer_id = #{request.customerId}
+        </if>
+        <if test="request != null and request.certificateReportNo != null and request.certificateReportNo !=''">
             and bcr.certificate_report_no like concat('%',#{request.certificateReportNo},'%')
         </if>
-        <if test="request.certificateReportName != null and request.certificateReportName !=''">
+        <if test="request != null and request.certificateReportName != null and request.certificateReportName !=''">
             and bcr.certificate_report_name like concat('%',#{request.certificateReportName},'%')
         </if>
-        <if test="request.sampleNo != null and request.sampleNo !=''">
+        <if test="request != null and request.sampleNo != null and request.sampleNo !=''">
             and bosr.sample_no like concat('%',#{request.sampleNo},'%')
         </if>
-        <if test="request.measureCategory != null and request.measureCategory !=''">
+        <if test="request != null and request.measureCategory != null and request.measureCategory !=''">
             and bcr.measure_category = #{request.measureCategory}
         </if>
-        <if test="request.measurePerson != null and request.measurePerson !=''">
+        <if test="request != null and request.measurePerson != null and request.measurePerson !=''">
             and rsi.staff_name like concat('%',#{request.measurePerson},'%')
         </if>
-        <if test="request.calibrationTimeStart != null and request.calibrationTimeStart !=''">
+        <if test="request != null and request.calibrationTimeStart != null and request.calibrationTimeStart !=''">
             and bcr.calibration_time &gt;= #{request.calibrationTimeStart}
         </if>
-        <if test="request.calibrationTimeEnd != null and request.calibrationTimeEnd !=''">
+        <if test="request != null and request.calibrationTimeEnd != null and request.calibrationTimeEnd !=''">
             and bcr.calibration_time &lt;= #{request.calibrationTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceAssessMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceAssessMapper.xml
index d0fcf8b..c22c101 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceAssessMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceAssessMapper.xml
@@ -7,6 +7,8 @@
         <id column="id" property="id" />
         <result column="project_no" property="projectNo" />
         <result column="project_name" property="projectName" />
+        <result column="lab_code" property="labCode" />
+        <result column="group_code" property="groupCode" />
         <result column="applicant_id" property="applicantId" />
         <result column="applicant_name" property="applicantName" />
         <result column="applicant_time" property="applicantTime" />
@@ -31,7 +33,45 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, project_no, project_name, applicant_id, applicant_name, applicant_time, minio_file_name, remark, create_user_id, create_user_name, outsourcer_id, pre_start_time, pre_end_time, outsource_reason, pre_cost, approval_status, process_id, approve_situation, traceability, test_method, technique_ability, create_time, update_time
+        id, project_no, project_name, lab_code, group_code, applicant_id, applicant_name, applicant_time, minio_file_name, remark, create_user_id, create_user_name, outsourcer_id, pre_start_time, pre_end_time, outsource_reason, pre_cost, approval_status, process_id, approve_situation, traceability, test_method, technique_ability, create_time, update_time
     </sql>
 
+    <select id="selectMaxProjectNo" resultType="java.lang.Long">
+        SELECT IFNULL(max(RIGHT(project_no, 3)), 0) from biz_business_outsource_assess
+    </select>
+
+    <select id="selectBatchForApprovalList" resultMap="BaseResultMap">
+        SELECT bboa.*, bboi.outsourcer_name, bboi.director
+        FROM biz_business_outsource_assess bboa
+        LEFT JOIN biz_business_outsourcer_info bboi ON bboa.outsourcer_id = bboi.id
+        WHERE 1=1
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
+            and bboa.approval_status = #{request.approvalStatus}
+        </if>
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
+            and bboa.create_user_id = #{request.createUserId}
+        </if>
+        <if test="request != null and request.projectNo != null and request.projectNo !=''">
+            and bboa.project_no like concat('%',#{request.projectNo},'%')
+        </if>
+        <if test="request != null and request.outsourcerName != null and request.outsourcerName !=''">
+            and bboi.outsourcer_name like concat('%',#{request.outsourcerName},'%')
+        </if>
+        <if test="request != null and request.applicantName != null and request.applicantName !=''">
+            and bboa.applicant_name like concat('%',#{request.applicantName},'%')
+        </if>
+        <if test="request != null and request.applicantTimeStart != null and request.applicantTimeStart !=''">
+            and bboa.applicant_time &gt;= #{request.applicantTimeStart}
+        </if>
+        <if test="request != null and request.applicantTimeEnd != null and request.applicantTimeEnd !=''">
+            and bboa.applicant_time &lt;= #{request.applicantTimeEnd}
+        </if>
+        <if test="businessKeys != null">
+            and bboa.id in
+            <foreach collection="businessKeys" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
+        ORDER BY bboa.create_time DESC
+    </select>
 </mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceProtocolMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceProtocolMapper.xml
new file mode 100644
index 0000000..b7b2149
--- /dev/null
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceProtocolMapper.xml
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.mapper.business.BizBusinessOutsourceProtocolMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.business.BizBusinessOutsourceProtocol">
+        <id column="id" property="id" />
+        <result column="protocol_no" property="protocolNo" />
+        <result column="project_name" property="projectName" />
+        <result column="lab_code" property="labCode" />
+        <result column="group_code" property="groupCode" />
+        <result column="outsourcer_id" property="outsourcerId" />
+        <result column="remark" property="remark" />
+        <result column="outsource_no" property="outsourceNo" />
+        <result column="outsource_name" property="outsourceName" />
+        <result column="contacts" property="contacts" />
+        <result column="mobile" property="mobile" />
+        <result column="address" property="address" />
+        <result column="require_date" property="requireDate" />
+        <result column="outsource_cost" property="outsourceCost" />
+        <result column="director" property="director" />
+        <result column="item" property="item" />
+        <result column="requires" property="requires" />
+        <result column="create_user_id" property="createUserId" />
+        <result column="create_user_name" property="createUserName" />
+        <result column="approval_status" property="approvalStatus" />
+        <result column="process_id" property="processId" />
+        <result column="create_time" property="createTime" />
+        <result column="update_time" property="updateTime" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, protocol_no, project_name, lab_code, group_code, outsourcer_id, remark, outsource_no, outsource_name, contacts, mobile, address, require_date, outsource_cost, director, item, requires, create_user_id, create_user_name, approval_status, process_id, create_time, update_time
+    </sql>
+
+    <select id="selectMaxProtocolNo" resultType="java.lang.Long">
+        SELECT IFNULL(max(RIGHT(protocol_no, 3)), 0) from biz_business_outsource_protocol
+    </select>
+
+    <select id="selectBatchForApprovalList" resultMap="BaseResultMap">
+        SELECT *
+        FROM biz_business_outsource_protocol
+        WHERE 1=1
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
+            and approval_status = #{request.approvalStatus}
+        </if>
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
+            and create_user_id = #{request.createUserId}
+        </if>
+        <if test="request != null and request.protocolNo != null and request.protocolNo !=''">
+            and protocol_no like concat('%',#{request.protocolNo},'%')
+        </if>
+        <if test="request != null and request.outsourcerName != null and request.outsourcerName !=''">
+            and outsourcer_name like concat('%',#{request.outsourcerName},'%')
+        </if>
+        <if test="request != null and request.applicantName != null and request.applicantName !=''">
+            and create_user_name like concat('%',#{request.applicantName},'%')
+        </if>
+        <if test="request != null and request.applicantTimeStart != null and request.applicantTimeStart !=''">
+            and create_time &gt;= #{request.applicantTimeStart}
+        </if>
+        <if test="request != null and request.applicantTimeEnd != null and request.applicantTimeEnd !=''">
+            and create_time &lt;= #{request.applicantTimeEnd}
+        </if>
+        <if test="businessKeys != null">
+            and id in
+            <foreach collection="businessKeys" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
+        ORDER BY create_time DESC
+    </select>
+</mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourcerInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourcerInfoMapper.xml
index 510a80b..3049b54 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourcerInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourcerInfoMapper.xml
@@ -7,6 +7,8 @@
         <id column="id" property="id" />
         <result column="outsourcer_no" property="outsourcerNo" />
         <result column="outsourcer_name" property="outsourcerName" />
+        <result column="lab_code" property="labCode" />
+        <result column="group_code" property="groupCode" />
         <result column="outsourcer_brief_name" property="outsourcerBriefName" />
         <result column="outsourcer_size" property="outsourcerSize" />
         <result column="business_size" property="businessSize" />
@@ -55,32 +57,32 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, outsourcer_no, outsourcer_name, outsourcer_brief_name, outsourcer_size, business_size, grade, evaluation, tax_number, bank_account, bank_name, bank_account_number, postal_code, director, phone, fax, mobile, email, website, address_country, address_province, address_city, address_area, full_address, address_country_name, address_province_name, address_city_name, address_area_name, invoice_country, invoice_province, invoice_city, invoice_area, invoice_full_address, invoice_country_name, invoice_province_name, invoice_city_name, invoice_area_name, business_scope, business_content, minio_file_name, approval_status, process_id, remark, create_user_id, create_user_name, create_time, update_time
+        id, outsourcer_no, outsourcer_name, lab_code, group_code, outsourcer_brief_name, outsourcer_size, business_size, grade, evaluation, tax_number, bank_account, bank_name, bank_account_number, postal_code, director, phone, fax, mobile, email, website, address_country, address_province, address_city, address_area, full_address, address_country_name, address_province_name, address_city_name, address_area_name, invoice_country, invoice_province, invoice_city, invoice_area, invoice_full_address, invoice_country_name, invoice_province_name, invoice_city_name, invoice_area_name, business_scope, business_content, minio_file_name, approval_status, process_id, remark, create_user_id, create_user_name, create_time, update_time
     </sql>
 
     <select id="selectBatchForApprovalList" resultMap="BaseResultMap">
         SELECT *
         FROM biz_business_outsourcer_info
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.outsourcerNo != null and request.outsourcerNo !=''">
+        <if test="request != null and request.outsourcerNo != null and request.outsourcerNo !=''">
             and outsourcer_no like concat('%',#{request.outsourcerNo},'%')
         </if>
-        <if test="request.outsourcerName != null and request.outsourcerName !=''">
+        <if test="request != null and request.outsourcerName != null and request.outsourcerName !=''">
             and outsourcer_name like concat('%',#{request.outsourcerName},'%')
         </if>
-        <if test="request.director != null and request.director !=''">
+        <if test="request != null and request.director != null and request.director !=''">
             and director like concat('%',#{request.director},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
@@ -93,6 +95,6 @@
     </select>
 
     <select id="selectMaxNo" resultType="java.lang.Long">
-        SELECT IFNULL(max(RIGHT(outsourcer_no, 12)), 0) from biz_business_outsourcer_info
+        SELECT IFNULL(max(RIGHT(outsourcer_no, 3)), 0) from biz_business_outsourcer_info
     </select>
 </mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessSiteExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessSiteExecutiveInfoMapper.xml
index 135c5d0..3c5ae79 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessSiteExecutiveInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessSiteExecutiveInfoMapper.xml
@@ -38,25 +38,25 @@
         FROM biz_business_site_executive_info bsei
         LEFT JOIN biz_resource_customer_info rci ON bsei.customer_id = rci.id
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and bsei.approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and bsei.create_user_id = #{request.createUserId}
         </if>
-        <if test="request.siteExecutiveNo != null and request.siteExecutiveNo !=''">
+        <if test="request != null and request.siteExecutiveNo != null and request.siteExecutiveNo !=''">
             and bsei.site_executive_no like concat('%',#{request.siteExecutiveNo},'%')
         </if>
-        <if test="request.customerName != null and request.customerName !=''">
+        <if test="request != null and request.customerName != null and request.customerName !=''">
             and rci.outsourcer_name like concat('%',#{request.customerName},'%')
         </if>
-        <if test="request.applyName != null and request.applyName !=''">
+        <if test="request != null and request.applyName != null and request.applyName !=''">
             and bsei.apply_name like concat('%',#{request.applyName},'%')
         </if>
-        <if test="request.applyTimeStart != null and request.applyTimeStart !=''">
+        <if test="request != null and request.applyTimeStart != null and request.applyTimeStart !=''">
             and bsei.apply_time &gt;= #{request.applyTimeStart}
         </if>
-        <if test="request.applyTimeEnd != null and request.applyTimeEnd !=''">
+        <if test="request != null and request.applyTimeEnd != null and request.applyTimeEnd !=''">
             and bsei.apply_time &lt;= #{request.applyTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml
index 84d9e2a..6bd38a9 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml
@@ -105,6 +105,12 @@
         <if test="request.isUrgent != null and request.isUrgent !=''">
             AND bo.is_urgent = #{request.isUrgent}
         </if>
+        <if test="request.ids != null">
+            and blei.id in
+            <foreach collection="request.ids" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
         ORDER BY blei.update_time DESC
     </select>
 
@@ -137,6 +143,12 @@
         <if test="request.isUrgent != null and request.isUrgent !=''">
             AND bo.is_urgent = #{request.isUrgent}
         </if>
+        <if test="request.ids != null">
+            and blei.id in
+            <foreach collection="request.ids" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
         ORDER BY blei.update_time DESC
     </select>
 
diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardInfoMapper.xml
index 1a5551b..2ed8d17 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardInfoMapper.xml
@@ -45,12 +45,6 @@
         FROM biz_equipment_standard_info besi
         LEFT JOIN biz_equipment_standard_technology_relation bestr ON besi.standard_no = bestr.standard_no
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
-            and besi.approval_status = #{request.approvalStatus}
-        </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
-            and besi.create_user_id = #{request.createUserId}
-        </if>
         <if test="request.standardName != null and request.standardName !=''">
             and besi.standard_name like concat('%',#{request.standardName},'%')
         </if>
diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardTechnologyRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardTechnologyRelationMapper.xml
index fc7e16c..cd03c8c 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardTechnologyRelationMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardTechnologyRelationMapper.xml
@@ -6,6 +6,7 @@
     <resultMap id="BaseResultMap" type="com.casic.missiles.model.equipment.BizEquipmentStandardTechnologyRelation">
         <id column="id" property="id" />
         <result column="technology_file_id" property="technologyFileId" />
+        <result column="technology_file_no" property="technologyFileNo" />
         <result column="technology_file_name" property="technologyFileName" />
         <result column="standard_id" property="standardId" />
         <result column="standard_no" property="standardNo" />
@@ -14,7 +15,7 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, technology_file_id, technology_file_name, standard_id, remark
+        id, technology_file_id, technology_file_no, technology_file_name, standard_id, remark
     </sql>
 
 </mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceAuthorizeOrderMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceAuthorizeOrderMapper.xml
index ac5176c..554fe65 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceAuthorizeOrderMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceAuthorizeOrderMapper.xml
@@ -32,22 +32,22 @@
         SELECT *
         FROM biz_resource_authorize_order
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.orderNo != null and request.orderNo !=''">
+        <if test="request != null and request.orderNo != null and request.orderNo !=''">
             and order_no like concat('%',#{request.orderNo},'%')
         </if>
-        <if test="request.createUserName != null and request.createUserName !=''">
+        <if test="request != null and request.createUserName != null and request.createUserName !=''">
             and create_user_name like concat('%',#{request.createUserName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerExamineFormMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerExamineFormMapper.xml
index ab242f6..af7f98f 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerExamineFormMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerExamineFormMapper.xml
@@ -41,28 +41,28 @@
         SELECT *
         FROM biz_resource_customer_examine_form
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.formNo != null and request.formNo !=''">
+        <if test="request != null and request.formNo != null and request.formNo !=''">
             and form_no like concat('%',#{request.formNo},'%')
         </if>
-        <if test="request.labCode != null and request.labCode !=''">
+        <if test="request != null and request.labCode != null and request.labCode !=''">
             and lab_code like concat('%',#{request.labCode},'%')
         </if>
-        <if test="request.groupCode != null and request.groupCode !=''">
+        <if test="request != null and request.groupCode != null and request.groupCode !=''">
             and group_code like concat('%',#{request.groupCode},'%')
         </if>
-        <if test="request.createUserName != null and request.createUserName !=''">
+        <if test="request != null and request.createUserName != null and request.createUserName !=''">
             and create_user_name like concat('%',#{request.createUserName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerInfoMapper.xml
index fa8ffbc..06a2798 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerInfoMapper.xml
@@ -33,25 +33,25 @@
         SELECT *
         FROM biz_resource_customer_info
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.customerNo != null and request.customerNo !=''">
+        <if test="request != null and request.customerNo != null and request.customerNo !=''">
             and customer_no like concat('%',#{request.customerNo},'%')
         </if>
-        <if test="request.customerName != null and request.customerName !=''">
+        <if test="request != null and request.customerName != null and request.customerName !=''">
             and customer_name like concat('%',#{request.customerName},'%')
         </if>
-        <if test="request.contacts != null and request.contacts !=''">
+        <if test="request != null and request.contacts != null and request.contacts !=''">
             and contacts like concat('%',#{request.contacts},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerSuggestFormMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerSuggestFormMapper.xml
index 28f5bb2..1806662 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerSuggestFormMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerSuggestFormMapper.xml
@@ -33,28 +33,28 @@
         SELECT *
         FROM biz_resource_customer_suggest_form
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.formNo != null and request.formNo !=''">
+        <if test="request != null and request.formNo != null and request.formNo !=''">
             and form_no like concat('%',#{request.formNo},'%')
         </if>
-        <if test="request.customerName != null and request.customerName !=''">
+        <if test="request != null and request.customerName != null and request.customerName !=''">
             and customer_name like concat('%',#{request.customerName},'%')
         </if>
-        <if test="request.customerDeptName != null and request.customerDeptName !=''">
+        <if test="request != null and request.customerDeptName != null and request.customerDeptName !=''">
             and customer_dept_name like concat('%',#{request.customerDeptName},'%')
         </if>
-        <if test="request.createUserName != null and request.createUserName !=''">
+        <if test="request != null and request.createUserName != null and request.createUserName !=''">
             and create_user_name like concat('%',#{request.createUserName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSealUseNoteMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSealUseNoteMapper.xml
index ab37bc1..b02bb33 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSealUseNoteMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSealUseNoteMapper.xml
@@ -29,32 +29,32 @@
     </sql>
 
     <select id="selectBatchForApprovalList" resultMap="BaseResultMap">
-        SELECT *
+        SELECT brsun.*, brsi.seal_name, brsi.seal_type, brsi.approver_name
         FROM biz_resource_seal_use_note brsun
         JOIN biz_resource_seal_info brsi ON brsun.seal_id = brsi.id
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and brsun.approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and brsun.create_user_id = #{request.createUserId}
         </if>
-        <if test="request.sealName != null and request.sealName !=''">
+        <if test="request != null and request.sealName != null and request.sealName !=''">
             and brsi.seal_name like concat('%',#{request.sealName},'%')
         </if>
-        <if test="request.sealType != null and request.sealType !=''">
+        <if test="request != null and request.sealType != null and request.sealType !=''">
             and brsi.seal_type = #{request.sealType}
         </if>
-        <if test="request.applyDeptName != null and request.applyDeptName !=''">
+        <if test="request != null and request.applyDeptName != null and request.applyDeptName !=''">
             and brsun.apply_dept_name like concat('%',#{request.applyDeptName},'%')
         </if>
-        <if test="request.applyUserName != null and request.applyUserName !=''">
+        <if test="request != null and request.applyUserName != null and request.applyUserName !=''">
             and brsun.apply_user_name like concat('%',#{request.applyUserName},'%')
         </if>
-        <if test="request.applyTimeStart != null and request.applyTimeStart !=''">
+        <if test="request != null and request.applyTimeStart != null and request.applyTimeStart !=''">
             and brsun.apply_time &gt;= #{request.applyTimeStart}
         </if>
-        <if test="request.applyTimeEnd != null and request.applyTimeEnd !=''">
+        <if test="request != null and request.applyTimeEnd != null and request.applyTimeEnd !=''">
             and brsun.apply_time &lt;= #{request.applyTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml
index 119bf7d..4f8392a 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml
@@ -31,6 +31,12 @@
         <if test="request.deptName != null and request.deptName !=''">
             and brsi.dept_name like concat('%',#{request.deptName},'%')
         </if>
+        <if test="request.ids != null">
+            and brsv.id in
+            <foreach collection="request.ids" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
         ORDER BY brsv.grant_date DESC
     </select>
 
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSupplierInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSupplierInfoMapper.xml
index fe8d399..e8ce7ef 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSupplierInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSupplierInfoMapper.xml
@@ -48,28 +48,28 @@
         SELECT *
         FROM biz_resource_supplier_info
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.supplierNo != null and request.supplierNo !=''">
+        <if test="request != null and request.supplierNo != null and request.supplierNo !=''">
             and supplier_no like concat('%',#{request.supplierNo},'%')
         </if>
-        <if test="request.supplierName != null and request.supplierName !=''">
+        <if test="request != null and request.supplierName != null and request.supplierName !=''">
             and supplier_name like concat('%',#{request.supplierName},'%')
         </if>
-        <if test="request.director != null and request.director !=''">
+        <if test="request != null and request.director != null and request.director !=''">
             and director like concat('%',#{request.director},'%')
         </if>
-        <if test="request.supplierType != null and request.supplierType !=''">
+        <if test="request != null and request.supplierType != null and request.supplierType !=''">
             and supplier_type = #{request.supplierType}
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/EnvLocationInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/EnvLocationInfoMapper.xml
new file mode 100644
index 0000000..68bcf10
--- /dev/null
+++ b/casic-metering-dao/src/main/resources/mapper/resource/EnvLocationInfoMapper.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.mapper.resource.EnvLocationInfoMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.resource.EnvLocationInfo">
+        <id column="id" property="id" />
+        <result column="location_no" property="locationNo" />
+        <result column="location_name" property="locationName" />
+        <result column="location_position" property="locationPosition" />
+        <result column="create_user_id" property="createUserId" />
+        <result column="create_user" property="createUser" />
+        <result column="create_time" property="createTime" />
+        <result column="update_time" property="updateTime" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, location_no, location_name, location_position, create_user_id, create_user, create_time, update_time
+    </sql>
+
+    <select id="selectLocationListPage" resultType="com.casic.missiles.dto.resource.environment.LocationListResponse">
+        SELECT *
+        FROM env_location_info
+        WHERE 1=1
+        <if test="request.locationNo != null and request.locationNo !=''">
+            AND location_no LIKE concat('%',#{request.locationNo},'%')
+        </if>
+        <if test="request.locationName != null and request.locationName !=''">
+            AND location_name LIKE concat('%',#{request.locationName},'%')
+        </if>
+        ORDER BY create_time DESC
+    </select>
+
+</mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml
index b28c18f..8854047 100644
--- a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml
@@ -11,7 +11,6 @@
         <result column="sign_desc" property="signDesc" />
         <result column="sign_director" property="signDirector" />
         <result column="sign_user_id" property="signUserId" />
-        <result column="sign_type" property="signType" />
         <result column="minio_file_name" property="minioFileName" />
         <result column="create_time" property="createTime" />
         <result column="update_time" property="updateTime" />
@@ -28,7 +27,6 @@
         <result column="sign_name" property="signName" />
         <result column="sign_desc" property="signDesc" />
         <result column="sign_director" property="signDirector" />
-        <result column="sign_type" property="signType" />
         <result column="sign_user_id" property="signUserId" />
         <result column="minio_file_name" property="minioFileName" />
         <result column="create_time" property="createTime" />
@@ -62,4 +60,58 @@
         JOIN system_sign_user_relation ssur ON ss.id = ssur.sign_id
         WHERE ssur.user_id = #{userId}
     </select>
+
+    <select id="selectSignListPage" resultMap="BaseResultMap">
+        SELECT ss.*, sd.SIMPLE_NAME AS deptName
+        FROM system_sign ss
+        LEFT JOIN sys_user su ON su.id = ss.sign_user_id
+        LEFT JOIN sys_dept sd ON sd.id = su.dept_id
+        WHERE 1=1
+        <if test="request.signNo != null and request.signNo !=''">
+            AND ss.sign_no LIKE concat('%',#{request.signNo},'%')
+        </if>
+        <if test="request.signName != null and request.signName !=''">
+            AND ss.sign_name LIKE concat('%',#{request.signName},'%')
+        </if>
+        <if test="request.signDirector != null and request.signDirector !=''">
+            AND ss.sign_director LIKE concat('%',#{request.signDirector},'%')
+        </if>
+        <if test="request.signUserId != null and request.signUserId !=''">
+            AND ss.sign_user_id = #{request.signUserId}
+        </if>
+        <if test="request.createStartTime != null and request.createStartTime !=''">
+            AND DATE_FORMAT(ss.create_time,'%Y-%m-%d') &gt;= DATE_FORMAT(#{request.createStartTime},'%Y-%m-%d')
+        </if>
+        <if test="request.createEndTime != null and request.createEndTime !=''">
+            AND DATE_FORMAT(ss.create_time,'%Y-%m-%d')  &lt;= DATE_FORMAT(#{request.createEndTime},'%Y-%m-%d')
+        </if>
+        ORDER BY ss.create_time DESC
+    </select>
+
+    <select id="selectSignList" resultMap="BaseResultMap">
+        SELECT ss.*, sd.SIMPLE_NAME AS deptName
+        FROM system_sign ss
+        LEFT JOIN sys_user su ON su.id = ss.sign_user_id
+        LEFT JOIN sys_dept sd ON sd.id = su.dept_id
+        WHERE 1=1
+        <if test="request.signNo != null and request.signNo !=''">
+            AND ss.sign_no LIKE concat('%',#{request.signNo},'%')
+        </if>
+        <if test="request.signName != null and request.signName !=''">
+            AND ss.sign_name LIKE concat('%',#{request.signName},'%')
+        </if>
+        <if test="request.signDirector != null and request.signDirector !=''">
+            AND ss.sign_director LIKE concat('%',#{request.signDirector},'%')
+        </if>
+        <if test="request.signUserId != null and request.signUserId !=''">
+            AND ss.sign_user_id = #{request.signUserId}
+        </if>
+        <if test="request.createStartTime != null and request.createStartTime !=''">
+            AND DATE_FORMAT(ss.create_time,'%Y-%m-%d') &gt;= DATE_FORMAT(#{request.createStartTime},'%Y-%m-%d')
+        </if>
+        <if test="request.createEndTime != null and request.createEndTime !=''">
+            AND DATE_FORMAT(ss.create_time,'%Y-%m-%d')  &lt;= DATE_FORMAT(#{request.createEndTime},'%Y-%m-%d')
+        </if>
+        ORDER BY ss.create_time DESC
+    </select>
 </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 515050a..60f530b 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
@@ -47,8 +47,8 @@
     String STORAGE_LOCATION = "bizStorageLocation";
     //计量专业
     String MEASURE_MAJOR = "bizMeasureMajor";
-    //管理状态
-    String MANAGER_STATE = "bizManagerState";
+    //标准装置管理状态
+    String STANDARD_MANAGER_STATE = "bizStandardManagerState";
 
     /**
      * 资源管理 字典code
@@ -95,8 +95,6 @@
     String MEASURE_STATUS = "measureStatus";
     //检定方式
     String MEASURE_TYPE = "measureType";
-    //标识打印标志类型
-    String IDENTIFY_PRINT_TYPE = "bizBusinessIdentify";
     //变更类型
     String REPORT_CHANGE_TYPE = "bizCertChangeType";
     //规模类型
@@ -111,19 +109,24 @@
     String MEASURE_CATEGORY = "measureCategory";
     //检定结果
     String MEASURE_RESULT = "measureResult";
+    //分包原因
+    String OUTSOURCE_REASON = "outsourceReason";
+
+    /**
+     * 系统管理
+     */
+    String TEMPLATE_TYPE = "templateType";
+
 
     /**
      * 标准装置 字典code
      */
     //类别
     String STANDARD_CATEGORY = "standardCategory";
-    //管理状态
-    String STANDARD_MANAGER_STATE = "standardManagerState";
     //标准等级
     String STANDARD_LEVEL = "standardLevel";
     //传递范围
     String STANDARD_TRANSMIT_RANGE = "transmitRange";
-
     //资本来源
     String CAPITAL_SOURCE = "capitalSource";
     //标准装置-申请类型
@@ -148,8 +151,6 @@
     String CERTIFICATE_CLASS = "certificationClass";
     //证书管理-检校专业
     String CALIBRATION_MAJOR = "calibrationMajor";
-    //分包原因
-    String OUTSOURCE_REASON = "outsourceReason";
 
     /**
      * 工作台
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/BaseApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/BaseApprovalListRequest.java
index 73c12c1..80d7424 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/BaseApprovalListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/BaseApprovalListRequest.java
@@ -6,6 +6,7 @@
 
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotEmpty;
+import java.util.List;
 
 /**
  * @Description:
@@ -19,14 +20,14 @@
      * 表单id
      */
     @NotBlank(message = "表单id不能为空")
-    @ApiModelProperty(value = "表单id（流程定义对应的表单id，等价于业务id）", dataType = "String")
+    @ApiModelProperty(value = "表单id（流程定义对应的表单id，等价于业务id），导出接口不用传", dataType = "String")
     private String formId;
 
     /**
      * 审批状态类型，对应ApprovalStatusEnum
      */
     @NotEmpty(message = "审批状态类型不能为空")
-    @ApiModelProperty(value = "审批状态类型code", dataType = "String")
+    @ApiModelProperty(value = "审批状态类型code，导出接口不用传", dataType = "String")
     private String approvalStatus;
 
     @ApiModelProperty(hidden = true)
@@ -34,4 +35,7 @@
 
     @ApiModelProperty(hidden = true)
     private Long createUserId;
+
+    @ApiModelProperty(value = "导出ids", dataType = "List")
+    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificatePrintApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificatePrintApprovalListRequest.java
index b93d1c9..3cc2f4e 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificatePrintApprovalListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificatePrintApprovalListRequest.java
@@ -5,8 +5,6 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import java.util.List;
-
 /**
  * @Description:
  * @Author: wangpeng
@@ -38,7 +36,4 @@
 
     @ApiModelProperty(value = "创建结束时间", dataType = "String")
     private String createTimeEnd;
-
-    @ApiModelProperty(value = "导出ids", dataType = "List")
-    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportApprovalListRequest.java
index 4f7a038..c115847 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportApprovalListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportApprovalListRequest.java
@@ -5,8 +5,6 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import java.util.List;
-
 /**
  * @Description:
  * @Author: wangpeng
@@ -15,6 +13,8 @@
 @ApiModel
 @Data
 public class CertificateReportApprovalListRequest extends BaseApprovalListRequest {
+    @ApiModelProperty(value = "委托方id", dataType = "String")
+    private Long customerId;
 
     @ApiModelProperty(value = "证书报告编号", dataType = "String")
     private String certificateReportNo;
@@ -37,6 +37,4 @@
     @ApiModelProperty(value = "检校结束时间", dataType = "String")
     private String calibrationTimeEnd;
 
-    @ApiModelProperty(value = "导出ids", dataType = "List")
-    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/identify/IdentifyListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/identify/IdentifyListRequest.java
index 1b87ae6..f019203 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/identify/IdentifyListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/identify/IdentifyListRequest.java
@@ -4,6 +4,8 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * @Description:
  * @Author: wangpeng
@@ -26,4 +28,7 @@
 
     @ApiModelProperty(value = "打印结束时间", dataType = "String")
     private String createTimeEnd;
+
+    @ApiModelProperty(value = "导出ids", dataType = "List")
+    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListRequest.java
index 1264883..62415fb 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListRequest.java
@@ -7,6 +7,7 @@
 import lombok.Data;
 
 import javax.validation.constraints.NotBlank;
+import java.util.List;
 
 @Data
 @ApiModel
@@ -37,4 +38,6 @@
     @ApiModelProperty(value = "是否加急（1是0否null全部）", dataType = "Integer")
     private String isUrgent;
 
+    @ApiModelProperty(value = "导出ids", dataType = "List")
+    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListRequest.java
index 5201d7b..499760a 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListRequest.java
@@ -17,6 +17,9 @@
     @ApiModelProperty(value = "任务单编号", dataType = "String")
     private String orderNo;
 
+    @ApiModelProperty(value = "委托方id", dataType = "Long")
+    private Long customerId;
+
     @ApiModelProperty(value = "委托方名称", dataType = "String")
     private String customerName;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OrderSampleDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OrderSampleDTO.java
new file mode 100644
index 0000000..796edc0
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OrderSampleDTO.java
@@ -0,0 +1,19 @@
+package com.casic.missiles.dto.business.outsource;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/8/24 11:38
+ */
+@ApiModel
+@Data
+public class OrderSampleDTO {
+    @ApiModelProperty(value = "任务单id", dataType = "Long")
+    private Long orderId;
+    @ApiModelProperty(value = "受检设备id", dataType = "Long")
+    private Long sampleId;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceAssessApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceAssessApprovalListRequest.java
new file mode 100644
index 0000000..9a930c3
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceAssessApprovalListRequest.java
@@ -0,0 +1,30 @@
+package com.casic.missiles.dto.business.outsource;
+
+import com.casic.missiles.dto.BaseApprovalListRequest;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/8/24 11:01
+ */
+@ApiModel
+@Data
+public class OutsourceAssessApprovalListRequest extends BaseApprovalListRequest {
+    @ApiModelProperty(value = "评审表编号", dataType = "String")
+    private String projectNo;
+
+    @ApiModelProperty(value = "分包机构名称", dataType = "String")
+    private String outsourcerName;
+
+    @ApiModelProperty(value = "申请人", dataType = "String")
+    private String applicantName;
+
+    @ApiModelProperty(value = "申请时间开始", dataType = "String")
+    private String applicantTimeStart;
+
+    @ApiModelProperty(value = "申请时间结束", dataType = "String")
+    private String applicantTimeEnd;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceAssessSaveResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceAssessSaveResponse.java
new file mode 100644
index 0000000..8bf9aad
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceAssessSaveResponse.java
@@ -0,0 +1,20 @@
+package com.casic.missiles.dto.business.outsource;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/8/14 16:17
+ */
+@ApiModel
+@Data
+public class OutsourceAssessSaveResponse {
+    @ApiModelProperty(value = "主键id", dataType = "Long")
+    private Long id;
+
+    @ApiModelProperty(value = "编号", dataType = "String")
+    private String projectNo;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProtocolApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProtocolApprovalListRequest.java
new file mode 100644
index 0000000..0f32331
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProtocolApprovalListRequest.java
@@ -0,0 +1,30 @@
+package com.casic.missiles.dto.business.outsource;
+
+import com.casic.missiles.dto.BaseApprovalListRequest;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/8/24 15:01
+ */
+@ApiModel
+@Data
+public class OutsourceProtocolApprovalListRequest extends BaseApprovalListRequest {
+    @ApiModelProperty(value = "协议书编号", dataType = "String")
+    private String protocolNo;
+
+    @ApiModelProperty(value = "分包方名称", dataType = "String")
+    private String outsourcerName;
+
+    @ApiModelProperty(value = "申请人", dataType = "String")
+    private String applicantName;
+
+    @ApiModelProperty(value = "申请时间开始", dataType = "String")
+    private String applicantTimeStart;
+
+    @ApiModelProperty(value = "申请时间结束", dataType = "String")
+    private String applicantTimeEnd;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProtocolSaveResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProtocolSaveResponse.java
new file mode 100644
index 0000000..e324967
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProtocolSaveResponse.java
@@ -0,0 +1,20 @@
+package com.casic.missiles.dto.business.outsource;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/8/14 16:17
+ */
+@ApiModel
+@Data
+public class OutsourceProtocolSaveResponse {
+    @ApiModelProperty(value = "主键id", dataType = "Long")
+    private Long id;
+
+    @ApiModelProperty(value = "编号", dataType = "String")
+    private String protocolNo;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveApprovalListRequest.java
index f29f4e4..7047c28 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveApprovalListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveApprovalListRequest.java
@@ -5,8 +5,6 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import java.util.List;
-
 /**
  * @Description: 现场检测审批列表请求实体
  * @Author: wangpeng
@@ -30,7 +28,4 @@
     @ApiModelProperty(value = "申请时间结束", dataType = "String")
     private String applyTimeEnd;
 
-    @ApiModelProperty(value = "导出ids", dataType = "List")
-    private List<Long> ids;
-
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveDetailResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveDetailResponse.java
index 1f28752..394c934 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveDetailResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveDetailResponse.java
@@ -12,6 +12,18 @@
     @ApiModelProperty(value = "id，更新/删除使用参数", dataType = "Long")
     private Long id;
 
+    @ApiModelProperty(value = "实验室代码(字典code)", dataType = "String")
+    private String labCode;
+
+    @ApiModelProperty(value = "实验室代码(字典value)", dataType = "String")
+    private String labCodeName;
+
+    @ApiModelProperty(value = "组别代码(字典code)", dataType = "String")
+    private String groupCode;
+
+    @ApiModelProperty(value = "组别代码(字典value)", dataType = "String")
+    private String groupCodeName;
+
     @ApiModelProperty(value = "审批编号", dataType = "String")
     private String siteExecutiveNo;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/environment/LocationListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/environment/LocationListRequest.java
new file mode 100644
index 0000000..13d03c3
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/environment/LocationListRequest.java
@@ -0,0 +1,20 @@
+package com.casic.missiles.dto.resource.environment;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/6/8 13:56
+ */
+@ApiModel
+@Data
+public class LocationListRequest {
+    @ApiModelProperty(value = "地点编号", dataType = "String")
+    private String locationNo;
+
+    @ApiModelProperty(value = "地点名称", dataType = "String")
+    private String locationName;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/environment/LocationListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/environment/LocationListResponse.java
new file mode 100644
index 0000000..4c531af
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/environment/LocationListResponse.java
@@ -0,0 +1,78 @@
+package com.casic.missiles.dto.resource.environment;
+
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
+import com.baomidou.mybatisplus.annotation.TableField;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description: 地点列表响应实体
+ * @Author: wangpeng
+ * @Date: 2023/6/8 13:53
+ */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
+@ApiModel
+@Data
+public class LocationListResponse {
+    @ApiModelProperty(value = "主键id", dataType = "Long")
+    private Long id;
+
+    /**
+     * 地点编号
+     */
+    @ExcelProperty("地点编号")
+    @ApiModelProperty(value = "地点编号", dataType = "String")
+    private String locationNo;
+
+    /**
+     * 地点名称
+     */
+    @ExcelProperty("地点名称")
+    @ApiModelProperty(value = "地点名称", dataType = "String")
+    private String locationName;
+
+    /**
+     * 地点位置
+     */
+    @ExcelProperty("地点位置")
+    @ApiModelProperty(value = "地点位置", dataType = "String")
+    private String locationPosition;
+
+    /**
+     * 创建人id
+     */
+    @ApiModelProperty(value = "创建人id", dataType = "Long")
+    private Long createUserId;
+
+    /**
+     * 创建人
+     */
+    @ExcelProperty("创建人")
+    @ApiModelProperty(value = "创建人", dataType = "String")
+    @TableField("create_user")
+    private String createUser;
+
+    /**
+     * 创建时间
+     */
+    @ExcelProperty("创建时间")
+    @ApiModelProperty(value = "创建时间", dataType = "String")
+    private String createTime;
+
+    /**
+     * 更新时间
+     */
+    @ApiModelProperty(value = "更新时间", dataType = "String")
+    private String updateTime;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertRequest.java
index 9a7f6c6..c827915 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertRequest.java
@@ -4,6 +4,8 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * @Description:
  * @Author: wangpeng
@@ -16,4 +18,7 @@
     private String name;
     @ApiModelProperty(value = "部门名", dataType = "String")
     private String deptName;
+
+    @ApiModelProperty(value = "导出ids", dataType = "List")
+    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertResponse.java
index f78b159..8f2f79e 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertResponse.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.dto.resource.staff;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.casic.missiles.annotation.DictCodeField;
 import com.casic.missiles.constants.MeterDictCode;
 import io.swagger.annotations.ApiModel;
@@ -13,12 +20,18 @@
  * @Author: wangpeng
  * @Date: 2023/7/27 15:13
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @ApiModel
 @Data
 public class StaffCertResponse {
     /**
      * 人员编号
      */
+    @ExcelProperty(value = "人员编号",order = 0)
     @NotEmpty(message = "人员编号不能为空")
     @ApiModelProperty(value = "人员编号", dataType = "String")
     private String staffNo;
@@ -26,6 +39,7 @@
     /**
      * 姓名
      */
+    @ExcelProperty(value = "姓名",order = 1)
     @ApiModelProperty(value = "姓名", dataType = "String")
     private String staffName;
 
@@ -54,6 +68,7 @@
     /**
      * 部门名字
      */
+    @ExcelProperty(value = "工作部门",order = 2)
     @ApiModelProperty(value = "部门名字", dataType = "String")
     private String deptName;
 
@@ -66,6 +81,7 @@
     /**
      * 计量专业
      */
+    @ExcelProperty(value = "计量专业",order = 3)
     @ApiModelProperty(value = "计量专业", dataType = "String")
     private String major;
 
@@ -110,6 +126,7 @@
     /**
      * 证书号
      */
+    @ExcelProperty(value = "证号",order = 4)
     @ApiModelProperty(value = "证书号", dataType = "String")
     private String certNo;
 
@@ -122,12 +139,14 @@
     /**
      * 有效日期
      */
+    @ExcelProperty(value = "证书有效期",order = 6)
     @ApiModelProperty(value = "有效日期", dataType = "String")
     private String effectiveDate;
 
     /**
      * 发放日期
      */
+    @ExcelProperty(value = "发证日期",order = 5)
     @ApiModelProperty(value = "发放日期", dataType = "String")
     private String grantDate;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffListRequest.java
index 7c4afb3..0a1194a 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffListRequest.java
@@ -4,6 +4,8 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * @Description:
  * @Author: wangpeng
@@ -18,4 +20,7 @@
     private String deptName;
     @ApiModelProperty(value = "部门id", dataType = "Long")
     private Long deptId;
+
+    @ApiModelProperty(value = "导出ids", dataType = "List")
+    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/TrainListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/TrainListRequest.java
index f68597b..6321f8b 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/TrainListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/TrainListRequest.java
@@ -14,6 +14,8 @@
 public class TrainListRequest {
     @ApiModelProperty(value = "训练登记表编号", dataType = "String")
     private String trainNo;
+    @ApiModelProperty(value = "值班领导", dataType = "String")
+    private String dutyLeader;
     @ApiModelProperty(value = "创建开始时间", dataType = "String")
     private String createTimeStart;
     @ApiModelProperty(value = "创建结束时间", dataType = "String")
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/SignAddRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/SignAddRequest.java
index 117be34..d71055c 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/SignAddRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/SignAddRequest.java
@@ -43,13 +43,6 @@
     private Long signUserId;
 
     /**
-     * 签章或签名-字典code
-     */
-    @NotBlank(message = "类型不能为空")
-    @ApiModelProperty(value = "签名/签章-字典code", dataType = "String", required = true)
-    private String signType;
-
-    /**
      * minio存储文件名
      */
     @ApiModelProperty(value = "上传文件返回名称", dataType = "String")
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateAddRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateAddRequest.java
index aff1265..6316648 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateAddRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateAddRequest.java
@@ -17,30 +17,28 @@
 @Data
 public class TemplateAddRequest extends BaseSystemRequest {
     /**
-     * 原始记录模板/证书报告模板名称
+     * 模板名称
      */
     @ApiModelProperty(value = "名称", dataType = "String", required = true)
     @NotBlank(message = "名称不能为空")
     private String templateName;
 
     /**
-     * 原始记录模板/证书报告模板描述
+     * 模板描述
      */
     @ApiModelProperty(value = "描述", dataType = "String")
     private String templateDesc;
 
     /**
-     * 原始记录模板/证书报告模板创建人
+     * 创建人
      */
     @ApiModelProperty(value = "创建人", dataType = "String", required = true)
     @NotBlank(message = "创建人不能为空")
     private String templateCreator;
 
-    /**
-     * 原始记录模板/证书报告模板-字典code
-     */
-    @NotBlank(message = "类型不能为空")
-    @ApiModelProperty(value = "原始记录模板/证书报告模板-字典code", dataType = "String", required = true)
+
+    @NotBlank(message = "模板类型不能为空")
+    @ApiModelProperty(value = "模板类型(字典code)", dataType = "String", required = true)
     private String templateType;
 
     /**
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateListRequest.java
index eec5a1e..6d17bbe 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateListRequest.java
@@ -1,11 +1,12 @@
 package com.casic.missiles.dto.system;
 
+import com.casic.missiles.annotation.DictCodeField;
+import com.casic.missiles.constants.MeterDictCode;
 import com.casic.missiles.dto.BaseSystemRequest;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import javax.validation.constraints.NotBlank;
 import java.util.List;
 
 /**
@@ -19,8 +20,8 @@
     /**
      * 类型
      */
-//    @ApiModelProperty(value = "类型-字典code", dataType = "String", required = true)
-    @NotBlank(message = "类型不能为空")
+    @DictCodeField(message = "模板类型不合法", cacheName = MeterDictCode.TEMPLATE_TYPE)
+    @ApiModelProperty(value = "模板类型(字典code)", dataType = "String")
     private String templateType;
 
     /**
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificateChangeApply.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificateChangeApply.java
index 9216308..36923fd 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificateChangeApply.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificateChangeApply.java
@@ -1,11 +1,19 @@
 package com.casic.missiles.model.business;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 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 com.casic.missiles.dto.BaseRequest;
+import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -20,6 +28,12 @@
  * @author wangpeng
  * @since 2023-08-15
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
+@ApiModel
 @Data
 @TableName("biz_business_certificate_change_apply")
 public class BizBusinessCertificateChangeApply extends BaseRequest implements Serializable {
@@ -33,6 +47,7 @@
     /**
      * 申请单编号
      */
+    @ExcelProperty(value = "申请单编号", order = 1)
     @ApiModelProperty(value = "申请单编号", dataType = "String")
     @TableField("change_apply_no")
     private String changeApplyNo;
@@ -40,6 +55,7 @@
     /**
      * 申请单名字
      */
+    @ExcelProperty(value = "申请单名称", order = 2)
     @ApiModelProperty(value = "申请单名字", dataType = "String")
     @TableField("change_apply_name")
     private String changeApplyName;
@@ -54,6 +70,7 @@
     /**
      * 更换证书编号
      */
+    @ExcelProperty(value = "更换证书编号", order = 3)
     @ApiModelProperty(value = "更换证书编号", dataType = "String")
     @TableField("change_report_no")
     private String changeReportNo;
@@ -61,7 +78,8 @@
     /**
      * 更换证书名字
      */
-    @ApiModelProperty(value = "更换证书名字", dataType = "String")
+    @ExcelProperty(value = "更换证书/报告名称", order = 4)
+    @ApiModelProperty(value = "更换证书/报告名称", dataType = "String")
     @TableField("change_report_name")
     private String changeReportName;
 
@@ -73,6 +91,7 @@
     @TableField("change_type")
     private String changeType;
 
+    @ExcelProperty(value = "变更类型", order = 5)
     @ApiModelProperty(value = "变更类型(字典value)", dataType = "String")
     @TableField(exist = false)
     private String changeTypeName;
@@ -142,13 +161,15 @@
     /**
      * 创建用户名字
      */
-    @ApiModelProperty(value = "创建用户名字", dataType = "String")
+    @ExcelProperty(value = "创建人", order = 6)
+    @ApiModelProperty(value = "创建人名字", dataType = "String")
     @TableField("create_user_name")
     private String createUserName;
 
     /**
      * 创建时间
      */
+    @ExcelProperty(value = "创建时间", order = 7)
     @ApiModelProperty(value = "创建时间", dataType = "String")
     @TableField("create_time")
     private String createTime;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificateReport.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificateReport.java
index f01db9e..db06018 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificateReport.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificateReport.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.model.business;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -22,6 +29,11 @@
  * @author wangpeng
  * @since 2023-08-14
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @ApiModel
 @Data
 @TableName("biz_business_certificate_report")
@@ -36,6 +48,7 @@
     /**
      * 证书报告编号
      */
+    @ExcelProperty(value = "证书报告编号", order = 1)
     @ApiModelProperty(value = "证书报告编号", dataType = "String")
     @TableField("certificate_report_no")
     private String certificateReportNo;
@@ -43,6 +56,7 @@
     /**
      * 证书报告名称
      */
+    @ExcelProperty(value = "证书报告名称", order = 2)
     @ApiModelProperty(value = "证书报告名称", dataType = "String")
     @TableField("certificate_report_name")
     private String certificateReportName;
@@ -62,6 +76,7 @@
     @TableField("measure_category")
     private String measureCategory;
 
+    @ExcelProperty(value = "检校类别", order = 6)
     @ApiModelProperty(value = "检校类别(字典value)", dataType = "String")
     @TableField(exist = false)
     private String measureCategoryName;
@@ -69,6 +84,7 @@
     /**
      * 检校时间
      */
+    @ExcelProperty(value = "检校时间", order = 8)
     @ApiModelProperty(value = "检校时间", dataType = "String")
     @TableField("calibration_time")
     private String calibrationTime;
@@ -267,18 +283,22 @@
     @TableField(exist = false)
     private Integer decisionItem;
 
-    @ApiModelProperty(value = "设备样品编号（列表返回参数）", dataType = "String")
+    @ExcelProperty(value = "被检设备统一编号", order = 3)
+    @ApiModelProperty(value = "被检设备统一编号（列表返回参数）", dataType = "String")
     @TableField(exist = false)
     private String sampleNo;
 
-    @ApiModelProperty(value = "设备样品名称（列表返回参数）", dataType = "String")
+    @ExcelProperty(value = "被检设备名称", order = 4)
+    @ApiModelProperty(value = "被检设备名称（列表返回参数）", dataType = "String")
     @TableField(exist = false)
     private String sampleName;
 
-    @ApiModelProperty(value = "设备样品规格型号（列表返回参数）", dataType = "String")
+    @ExcelProperty(value = "规格型号", order = 5)
+    @ApiModelProperty(value = "规格型号（列表返回参数）", dataType = "String")
     @TableField(exist = false)
     private String sampleModel;
 
+    @ExcelProperty(value = "检定员", order = 7)
     @ApiModelProperty(value = "检定员名字（列表返回参数）", dataType = "String")
     @TableField(exist = false)
     private String staffName;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessIdentifyInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessIdentifyInfo.java
index 46bfba5..f1a9bec 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessIdentifyInfo.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessIdentifyInfo.java
@@ -1,10 +1,15 @@
 package com.casic.missiles.model.business;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 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;
 
@@ -20,6 +25,11 @@
  * @author wangpeng
  * @since 2023-08-15
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @Data
 @TableName("biz_business_identify_info")
 public class BizBusinessIdentifyInfo implements Serializable {
@@ -33,6 +43,7 @@
     /**
      * 记录编号
      */
+    @ExcelProperty(value = "记录编号", order = 1)
     @ApiModelProperty(value = "记录编号", dataType = "String")
     @TableField("record_no")
     private String recordNo;
@@ -41,20 +52,15 @@
      * 标志类型(字典code)
      */
     @NotEmpty(message = "标志类型不能为空")
-    @ApiModelProperty(value = "标志类型(字典code)", dataType = "String")
-    @DictCodeField(message = "标志类型不合法", cacheName = MeterDictCode.IDENTIFY_PRINT_TYPE)
+    @ApiModelProperty(value = "标志类型(直接存计量标识/使用状态/校准状态的字典value)", dataType = "String")
     @TableField("identify_type")
     private String identifyType;
 
-    @ApiModelProperty(value = "标志类型(字典value)", dataType = "String")
-    @TableField(exist = false)
-    private String identifyTypeName;
-
     /**
      * 设备id(可以是受检设备/设备台账)
      */
     @NotNull(message = "设备id不能为空")
-    @ApiModelProperty(value = "设备id(可以是受检设备/设备台账)", dataType = "String")
+    @ApiModelProperty(value = "设备id(可以是受检设备/设备台账)", dataType = "Long")
     @TableField("device_id")
     private Long deviceId;
 
@@ -66,29 +72,32 @@
     @TableField("device_type")
     private String deviceType;
 
+    @ExcelProperty(value = "统一编号", order = 3)
     @NotEmpty(message = "设备编号不能为空")
-    @ApiModelProperty(value = "设备编号", dataType = "String")
+    @ApiModelProperty(value = "统一编号", dataType = "String")
     @TableField("device_no")
     private String deviceNo;
 
     /**
      * 设备名字
      */
-    @NotEmpty(message = "设备名字不能为空")
-    @ApiModelProperty(value = "设备名字", dataType = "String")
+    @ExcelProperty(value = "设备名称", order = 4)
+    @NotEmpty(message = "设备名称不能为空")
+    @ApiModelProperty(value = "设备名称", dataType = "String")
     @TableField("device_name")
     private String deviceName;
 
     /**
      * 检定员id
      */
-    @ApiModelProperty(value = "检定员id", dataType = "String")
+    @ApiModelProperty(value = "检定员id", dataType = "Long")
     @TableField("measure_person_id")
     private Long measurePersonId;
 
     /**
      * 检定员名字
      */
+    @ExcelProperty(value = "检定员", order = 5)
     @ApiModelProperty(value = "检定员名字", dataType = "String")
     @TableField("measure_person")
     private String measurePerson;
@@ -103,7 +112,8 @@
     /**
      * 更新时间
      */
-    @ApiModelProperty(value = "更新时间", dataType = "String")
+    @ExcelProperty(value = "打印时间", order = 6)
+    @ApiModelProperty(value = "打印时间", dataType = "String")
     @TableField("update_time")
     private String updateTime;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceAssess.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceAssess.java
index 659d9ca..6720b90 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceAssess.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceAssess.java
@@ -1,11 +1,26 @@
 package com.casic.missiles.model.business;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 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 com.casic.missiles.dto.BaseRequest;
+import com.casic.missiles.dto.business.outsource.OrderSampleDTO;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import javax.validation.constraints.NotEmpty;
 import java.io.Serializable;
+import java.util.List;
 
 /**
  * <p>
@@ -15,146 +30,231 @@
  * @author wangpeng
  * @since 2023-08-16
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
+@ApiModel
 @Data
 @TableName("biz_business_outsource_assess")
-public class BizBusinessOutsourceAssess implements Serializable {
+public class BizBusinessOutsourceAssess extends BaseRequest implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
+    @ApiModelProperty(value = "id，更新/删除使用参数", dataType = "Long")
     @TableId("id")
     private Long id;
 
     /**
      * 评审表编号
      */
+    @ExcelProperty(value = "评审表编号", order = 1)
+    @ApiModelProperty(value = "评审表编号(后台生成)", dataType = "String")
     @TableField("project_no")
     private String projectNo;
 
     /**
      * 评审表名称
      */
+    @ExcelProperty(value = "评审表名称", order = 2)
+    @ApiModelProperty(value = "评审表名称", dataType = "String")
     @TableField("project_name")
     private String projectName;
 
+    @NotEmpty(message = "实验室代码不能为空")
+    @DictCodeField(message = "实验室代码描述不合法", cacheName = MeterDictCode.LAB_CODE)
+    @ApiModelProperty(value = "实验室代码(字典code)", dataType = "String")
+    @TableField("lab_code")
+    private String labCode;
+
+    @ApiModelProperty(value = "实验室代码(字典value)", dataType = "String")
+    @TableField(exist = false)
+    private String labCodeName;
+
+    /**
+     * 组别代码
+     */
+    @NotEmpty(message = "组别代码不能为空")
+    @DictCodeField(message = "组别代码描述不合法", cacheName = MeterDictCode.GROUP_CODE)
+    @ApiModelProperty(value = "组别代码(字典code)", dataType = "String")
+    @TableField("group_code")
+    private String groupCode;
+
+    @ApiModelProperty(value = "组别代码(字典value)", dataType = "String")
+    @TableField(exist = false)
+    private String groupCodeName;
+
     /**
      * 申请人id
      */
+    @ApiModelProperty(value = "申请人id", dataType = "String")
     @TableField("applicant_id")
     private Long applicantId;
 
     /**
      * 申请人名字
      */
+    @ExcelProperty(value = "申请人", order = 5)
+    @ApiModelProperty(value = "申请人", dataType = "String")
     @TableField("applicant_name")
     private String applicantName;
 
     /**
      * 申请时间
      */
+    @ExcelProperty(value = "申请时间", order = 6)
+    @ApiModelProperty(value = "申请时间", dataType = "String")
     @TableField("applicant_time")
     private String applicantTime;
 
     /**
      * 附件(minio存储文件名)
      */
+    @ApiModelProperty(value = "附件(minio存储文件名)", dataType = "String")
     @TableField("minio_file_name")
     private String minioFileName;
 
     /**
      * 备注
      */
+    @ApiModelProperty(value = "备注", dataType = "String")
     @TableField("remark")
     private String remark;
 
     /**
      * 创建人id
      */
+    @ApiModelProperty(value = "创建人id", dataType = "String")
     @TableField("create_user_id")
     private Long createUserId;
 
     /**
      * 创建人名字
      */
+    @ApiModelProperty(value = "创建人名字", dataType = "String")
     @TableField("create_user_name")
     private String createUserName;
 
     /**
      * 分包方id
      */
+    @ApiModelProperty(value = "评审表编号", dataType = "String")
     @TableField("outsourcer_id")
     private Long outsourcerId;
 
     /**
      * 预计开始时间
      */
+    @ApiModelProperty(value = "预计开始时间", dataType = "String")
     @TableField("pre_start_time")
     private String preStartTime;
 
     /**
      * 预计结束时间
      */
+    @ApiModelProperty(value = "预计结束时间", dataType = "String")
     @TableField("pre_end_time")
     private String preEndTime;
 
     /**
      * 分包原因-字典
      */
+    @ApiModelProperty(value = "分包原因(字典code)", dataType = "String")
+    @DictCodeField(message = "分包原因描述不合法", cacheName = MeterDictCode.OUTSOURCE_REASON)
     @TableField("outsource_reason")
     private String outsourceReason;
 
+    @ApiModelProperty(value = "分包原因(字典value)", dataType = "String")
+    @TableField(exist = false)
+    private String outsourceReasonName;
+
     /**
      * 预计费用
      */
+    @ApiModelProperty(value = "预计费用", dataType = "String")
     @TableField("pre_cost")
     private String preCost;
 
     /**
      * 审批状态
      */
+    @ApiModelProperty(value = "审批状态", dataType = "String")
+    @DictCodeField(message = "审批状态描述不合法", cacheName = MeterDictCode.APPROVAL_STATUS)
     @TableField("approval_status")
     private String approvalStatus;
 
     /**
      * 流程实例id
      */
+    @ApiModelProperty(value = "流程实例id", dataType = "String")
     @TableField("process_id")
     private String processId;
 
     /**
      * 实验室认可情况
      */
+    @ApiModelProperty(value = "实验室认可情况", dataType = "String")
     @TableField("approve_situation")
     private String approveSituation;
 
     /**
      * 溯源性
      */
+    @ApiModelProperty(value = "溯源性", dataType = "String")
     @TableField("traceability")
     private String traceability;
 
     /**
      * 测试方法
      */
+    @ApiModelProperty(value = "测试方法", dataType = "String")
     @TableField("test_method")
     private String testMethod;
 
     /**
      * 技术能力
      */
+    @ApiModelProperty(value = "技术能力", dataType = "String")
     @TableField("technique_ability")
     private String techniqueAbility;
 
     /**
      * 创建时间
      */
+    @ApiModelProperty(hidden = true)
     @TableField("create_time")
     private String createTime;
 
     /**
      * 更新时间
      */
+    @ApiModelProperty(hidden = true)
     @TableField("update_time")
     private String updateTime;
 
+    @ApiModelProperty(value = "审批状态类型-字典value", dataType = "String")
+    @TableField(exist = false)
+    private String approvalStatusName;
 
+    @ApiModelProperty(value = "任务id（同意、驳回等操作使用）", dataType = "String")
+    @TableField(exist = false)
+    private String taskId;
+
+    @ApiModelProperty(value = "可选决策项（1同意驳回拒绝 2同意驳回 3同意拒绝，用于待审批列表同意/驳回/拒绝按钮展示）", dataType = "Integer")
+    @TableField(exist = false)
+    private Integer decisionItem;
+
+    @NotEmpty(message = "受检设备信息不能为空")
+    @ApiModelProperty(value = "受检设备id列表（新建使用参数）", dataType = "List")
+    @TableField(exist = false)
+    private List<OrderSampleDTO> orderSampleList;
+
+    @ExcelProperty(value = "分包机构名称", order = 3)
+    @ApiModelProperty(value = "分包机构名称（列表返回参数）", dataType = "String")
+    private String outsourcerName;
+
+    @ExcelProperty(value = "机构负责人", order = 4)
+    @ApiModelProperty(value = "机构负责人（列表返回参数）", dataType = "String")
+    private String director;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceProtocol.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceProtocol.java
new file mode 100644
index 0000000..38df697
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceProtocol.java
@@ -0,0 +1,225 @@
+package com.casic.missiles.model.business;
+
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
+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 com.casic.missiles.dto.BaseRequest;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotEmpty;
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 计量检定业务-分包管理-测试、校准或检定工作分包协议书
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-08-24
+ */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
+@Data
+@TableName("biz_business_outsource_protocol")
+public class BizBusinessOutsourceProtocol extends BaseRequest implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "id，更新/删除使用参数", dataType = "Long")
+    @TableId("id")
+    private Long id;
+
+    /**
+     * 协议书编号
+     */
+    @ExcelProperty(value = "协议书编号", order = 1)
+    @ApiModelProperty(value = "协议书编号(后台生成)", dataType = "String")
+    @TableField("protocol_no")
+    private String protocolNo;
+
+    /**
+     * 协议书名称
+     */
+    @ExcelProperty(value = "协议书名称", order = 2)
+    @ApiModelProperty(value = "协议书名称", dataType = "String")
+    @TableField("project_name")
+    private String projectName;
+
+    @NotEmpty(message = "实验室代码不能为空")
+    @DictCodeField(message = "实验室代码描述不合法", cacheName = MeterDictCode.LAB_CODE)
+    @ApiModelProperty(value = "实验室代码(字典code)", dataType = "String")
+    @TableField("lab_code")
+    private String labCode;
+
+    @ApiModelProperty(value = "实验室代码(字典value)", dataType = "String")
+    @TableField(exist = false)
+    private String labCodeName;
+
+    @NotEmpty(message = "组别代码不能为空")
+    @DictCodeField(message = "组别代码描述不合法", cacheName = MeterDictCode.GROUP_CODE)
+    @ApiModelProperty(value = "组别代码(字典code)", dataType = "String")
+    @TableField("group_code")
+    private String groupCode;
+
+    @ApiModelProperty(value = "组别代码(字典value)", dataType = "String")
+    @TableField(exist = false)
+    private String groupCodeName;
+
+    /**
+     * 分包方id
+     */
+    @ApiModelProperty(value = "分包方id", dataType = "Long")
+    @TableField("outsourcer_id")
+    private Long outsourcerId;
+
+    /**
+     * 其他
+     */
+    @ApiModelProperty(value = "其他", dataType = "String")
+    @TableField("remark")
+    private String remark;
+
+    /**
+     * 分包方编号
+     */
+    @ApiModelProperty(value = "分包方编号(新建不用传)", dataType = "String")
+    @TableField("outsource_no")
+    private String outsourceNo;
+
+    /**
+     * 分包方名称
+     */
+    @ExcelProperty(value = "分包方名称", order = 3)
+    @ApiModelProperty(value = "分包方名称(新建不用传)", dataType = "String")
+    @TableField("outsource_name")
+    private String outsourceName;
+
+    /**
+     * 联系人
+     */
+    @ExcelProperty(value = "联系人", order = 4)
+    @ApiModelProperty(value = "联系人", dataType = "String")
+    @TableField("contacts")
+    private String contacts;
+
+    /**
+     * 电话
+     */
+    @ApiModelProperty(value = "电话", dataType = "String")
+    @TableField("mobile")
+    private String mobile;
+
+    /**
+     * 地址
+     */
+    @ApiModelProperty(value = "地址", dataType = "String")
+    @TableField("address")
+    private String address;
+
+    /**
+     * 要求完成日期
+     */
+    @ApiModelProperty(value = "要求完成日期", dataType = "String")
+    @TableField("require_date")
+    private String requireDate;
+
+    /**
+     * 分包费用(元)
+     */
+    @ApiModelProperty(value = "分包费用(元)", dataType = "String")
+    @TableField("outsource_cost")
+    private Double outsourceCost;
+
+    /**
+     * 分包方负责人
+     */
+    @ApiModelProperty(value = "分包方负责人", dataType = "String")
+    @TableField("director")
+    private String director;
+
+    /**
+     * 分包项目
+     */
+    @ApiModelProperty(value = "分包项目", dataType = "String")
+    @TableField("item")
+    private String item;
+
+    /**
+     * 分包要求
+     */
+    @ApiModelProperty(value = "分包要求", dataType = "String")
+    @TableField("requires")
+    private String requires;
+
+    /**
+     * 创建人id
+     */
+    @ApiModelProperty(hidden = true)
+    @TableField("create_user_id")
+    private Long createUserId;
+
+    /**
+     * 创建人名字
+     */
+    @ExcelProperty(value = "申请人", order = 5)
+    @ApiModelProperty(value = "申请人", dataType = "String")
+    @TableField("create_user_name")
+    private String createUserName;
+
+    /**
+     * 审批状态
+     */
+    @ApiModelProperty(value = "审批状态", dataType = "String")
+    @DictCodeField(message = "审批状态描述不合法", cacheName = MeterDictCode.APPROVAL_STATUS)
+    @TableField("approval_status")
+    private String approvalStatus;
+
+    /**
+     * 流程实例id
+     */
+    @ApiModelProperty(value = "流程实例id", dataType = "String")
+    @TableField("process_id")
+    private String processId;
+
+    /**
+     * 创建时间
+     */
+    @ExcelProperty(value = "申请时间", order = 6)
+    @ApiModelProperty(value = "申请时间", dataType = "String")
+    @TableField("create_time")
+    private String createTime;
+
+    /**
+     * 更新时间
+     */
+    @ApiModelProperty(hidden = true)
+    @TableField("update_time")
+    private String updateTime;
+
+    @ApiModelProperty(value = "审批状态类型-字典value", dataType = "String")
+    @TableField(exist = false)
+    private String approvalStatusName;
+
+    @ApiModelProperty(value = "任务id（同意、驳回等操作使用）", dataType = "String")
+    @TableField(exist = false)
+    private String taskId;
+
+    @ApiModelProperty(value = "可选决策项（1同意驳回拒绝 2同意驳回 3同意拒绝，用于待审批列表同意/驳回/拒绝按钮展示）", dataType = "Integer")
+    @TableField(exist = false)
+    private Integer decisionItem;
+
+
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourcerInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourcerInfo.java
index ec4e997..f9aa69e 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourcerInfo.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourcerInfo.java
@@ -17,6 +17,7 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import javax.validation.constraints.NotEmpty;
 import java.io.Serializable;
 
 /**
@@ -59,6 +60,29 @@
     @TableField("outsourcer_name")
     private String outsourcerName;
 
+    @NotEmpty(message = "实验室代码不能为空")
+    @DictCodeField(message = "实验室代码描述不合法", cacheName = MeterDictCode.LAB_CODE)
+    @ApiModelProperty(value = "实验室代码(字典code)", dataType = "String")
+    @TableField("lab_code")
+    private String labCode;
+
+    @ApiModelProperty(value = "实验室代码(字典value)", dataType = "String")
+    @TableField(exist = false)
+    private String labCodeName;
+
+    /**
+     * 组别代码
+     */
+    @NotEmpty(message = "组别代码不能为空")
+    @DictCodeField(message = "组别代码描述不合法", cacheName = MeterDictCode.GROUP_CODE)
+    @ApiModelProperty(value = "组别代码(字典code)", dataType = "String")
+    @TableField("group_code")
+    private String groupCode;
+
+    @ApiModelProperty(value = "组别代码(字典value)", dataType = "String")
+    @TableField(exist = false)
+    private String groupCodeName;
+
     /**
      * 单位简称
      */
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardInfo.java
index c48eed7..dffdfdd 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardInfo.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardInfo.java
@@ -5,6 +5,7 @@
 import com.baomidou.mybatisplus.annotation.TableName;
 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;
 
@@ -18,6 +19,7 @@
  * @author wangpeng
  * @since 2023-08-04
  */
+@ApiModel
 @Data
 @TableName("biz_equipment_standard_info")
 public class BizEquipmentStandardInfo implements Serializable {
@@ -119,7 +121,7 @@
      * 管理状态(字典code)
      */
     @ApiModelProperty(value = "管理状态(字典code)", dataType = "String")
-    @DictCodeField(message = "管理状态不合法", cacheName = MeterDictCode.MANAGER_STATE)
+    @DictCodeField(message = "管理状态不合法", cacheName = MeterDictCode.STANDARD_MANAGER_STATE)
     @TableField("manage_status")
     private String manageStatus;
 
@@ -151,7 +153,7 @@
     /**
      * 温度(℃)
      */
-    @ApiModelProperty(value = "使用状态(字典code)", dataType = "String")
+    @ApiModelProperty(value = "温度(℃)", dataType = "String")
     @TableField("temperature")
     private Double temperature;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardInfoApproval.java b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardInfoApproval.java
index dbd86ab..9f58d83 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardInfoApproval.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardInfoApproval.java
@@ -150,7 +150,7 @@
      * 管理状态(字典code)
      */
     @ApiModelProperty(value = "管理状态(字典code)", dataType = "String")
-    @DictCodeField(message = "管理状态不合法", cacheName = MeterDictCode.MANAGER_STATE)
+    @DictCodeField(message = "管理状态不合法", cacheName = MeterDictCode.STANDARD_MANAGER_STATE)
     @TableField("manage_status")
     private String manageStatus;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardTechnologyRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardTechnologyRelation.java
index 0e612bd..751f26b 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardTechnologyRelation.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardTechnologyRelation.java
@@ -3,6 +3,7 @@
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -16,6 +17,7 @@
  * @author wangpeng
  * @since 2023-08-04
  */
+@ApiModel
 @Data
 @TableName("biz_equipment_standard_technology_relation")
 public class BizEquipmentStandardTechnologyRelation implements Serializable {
@@ -33,6 +35,10 @@
     @TableField("technology_file_id")
     private Long technologyFileId;
 
+    @ApiModelProperty(value = "依据的技术文件编号", dataType = "String")
+    @TableField("technology_file_no")
+    private String technologyFileNo;
+
     /**
      * 依据的技术文件名称(技术文件中现行测试校准检定方法表文件名字段)
      */
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerInfo.java
index d6e8bed..65cd6bc 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerInfo.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerInfo.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.model.resource;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -21,6 +28,11 @@
  * @author wangpeng
  * @since 2023-08-08
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @ApiModel
 @Data
 @TableName("biz_resource_customer_info")
@@ -35,6 +47,7 @@
     /**
      * 委托方编号
      */
+    @ExcelProperty(value = "委托方编号", order = 1)
     @ApiModelProperty(value = "委托方编号", dataType = "String")
     @TableField("customer_no")
     private String customerNo;
@@ -42,6 +55,7 @@
     /**
      * 委托方名称
      */
+    @ExcelProperty(value = "委托方名称", order = 2)
     @ApiModelProperty(value = "委托方名称(新建时为下拉选择一个受检单位组织的名字，传deptId字段，后端获取名称)", dataType = "String")
     @TableField("customer_name")
     private String customerName;
@@ -63,6 +77,7 @@
     /**
      * 联系人
      */
+    @ExcelProperty(value = "联系人", order = 3)
     @ApiModelProperty(value = "联系人", dataType = "String")
     @TableField("contacts")
     private String contacts;
@@ -70,6 +85,7 @@
     /**
      * 座机电话
      */
+    @ExcelProperty(value = "座机电话", order = 4)
     @ApiModelProperty(value = "座机电话", dataType = "String")
     @TableField("mobile")
     private String mobile;
@@ -77,6 +93,7 @@
     /**
      * 手机号码
      */
+    @ExcelProperty(value = "手机号码", order = 5)
     @ApiModelProperty(value = "手机号码", dataType = "String")
     @TableField("phone")
     private String phone;
@@ -91,6 +108,7 @@
     /**
      * 地址
      */
+    @ExcelProperty(value = "地址", order = 6)
     @ApiModelProperty(value = "地址", dataType = "String")
     @TableField("address")
     private String address;
@@ -141,6 +159,7 @@
     /**
      * 创建时间
      */
+    @ExcelProperty(value = "创建时间", order = 7)
     @ApiModelProperty(value = "创建时间", dataType = "String")
     @TableField("create_time")
     private String createTime;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerSuggestForm.java b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerSuggestForm.java
index 7201bbd..701bf8b 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerSuggestForm.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerSuggestForm.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.model.resource;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -22,6 +29,11 @@
  * @author wangpeng
  * @since 2023-08-08
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @ApiModel
 @Data
 @TableName("biz_resource_customer_suggest_form")
@@ -44,7 +56,8 @@
     /**
      * 委托方名称
      */
-    @ApiModelProperty(value = "委托方名称", dataType = "String")
+    @ExcelProperty(value = "意见反馈单位", order = 2)
+    @ApiModelProperty(value = "意见反馈单位", dataType = "String")
     @TableField("customer_name")
     private String customerName;
 
@@ -59,7 +72,8 @@
     /**
      * 委托方意见反馈部门名称
      */
-    @ApiModelProperty(value = "委托方意见反馈部门名称", dataType = "String")
+    @ExcelProperty(value = "委托方意见反馈部门", order = 3)
+    @ApiModelProperty(value = "委托方意见反馈部门", dataType = "String")
     @TableField("customer_dept_name")
     private String customerDeptName;
 
@@ -73,6 +87,7 @@
     /**
      * 表单编号
      */
+    @ExcelProperty(value = "表单编号", order = 1)
     @ApiModelProperty(value = "表单编号", dataType = "String")
     @TableField("form_no")
     private String formNo;
@@ -111,6 +126,7 @@
     /**
      * 创建人名字
      */
+    @ExcelProperty(value = "创建人", order = 4)
     @ApiModelProperty(value = "创建人名字", dataType = "String")
     @TableField("create_user_name")
     private String createUserName;
@@ -147,6 +163,7 @@
     /**
      * 创建时间
      */
+    @ExcelProperty(value = "创建时间", order = 5)
     @ApiModelProperty(value = "创建时间", dataType = "String")
     @TableField("create_time")
     private String createTime;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSealInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSealInfo.java
index cbf05d7..9bf389d 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSealInfo.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSealInfo.java
@@ -106,6 +106,10 @@
     @TableField("minio_file_name")
     private String minioFileName;
 
+    @ApiModelProperty(value = "minio存储文件url", dataType = "String")
+    @TableField(exist = false)
+    private String minioFileUrl;
+
     @ApiModelProperty(value = "创建时间", dataType = "String")
     @TableField("create_time")
     private String createTime;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSealUseNote.java b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSealUseNote.java
index 3f2d9e8..3ce16a8 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSealUseNote.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSealUseNote.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.model.resource;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -20,6 +27,11 @@
  * @author wangpeng
  * @since 2023-07-28
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @ApiModel
 @Data
 @TableName("biz_resource_seal_use_note")
@@ -34,6 +46,7 @@
     /**
      * 登记表编号
      */
+    @ExcelProperty(value = "申请单编号", order = 1)
     @ApiModelProperty(value = "登记表编号(自动生成)", dataType = "String")
     @TableField("note_form_no")
     private String noteFormNo;
@@ -55,6 +68,7 @@
     /**
      * 申请部门
      */
+    @ExcelProperty(value = "申请部门", order = 5)
     @ApiModelProperty(value = "申请部门", dataType = "String")
     @TableField("apply_dept_name")
     private String applyDeptName;
@@ -69,6 +83,7 @@
     /**
      * 申请人
      */
+    @ExcelProperty(value = "申请人", order = 6)
     @ApiModelProperty(value = "申请人", dataType = "String")
     @TableField("apply_user_name")
     private String applyUserName;
@@ -76,6 +91,7 @@
     /**
      * 申请时间
      */
+    @ExcelProperty(value = "申请时间", order = 7)
     @ApiModelProperty(value = "申请时间(新增自动获取当前时间)", dataType = "String")
     @TableField("apply_time")
     private String applyTime;
@@ -130,6 +146,26 @@
     @TableField("update_time")
     private String updateTime;
 
+    @ExcelProperty(value = "印章名称", order = 2)
+    @ApiModelProperty(value = "印章名称(列表返回参数)", dataType = "String")
+    @TableField(exist = false)
+    private String sealName;
+
+    @DictCodeField(message = "印章类型描述不合法", cacheName = MeterDictCode.SEAL_TYPE)
+    @ApiModelProperty(hidden = true)
+    @TableField(exist = false)
+    private String sealType;
+
+    @ExcelProperty(value = "印章类型", order = 3)
+    @ApiModelProperty(value = "印章类型(列表返回参数)", dataType = "String")
+    @TableField(exist = false)
+    private String sealTypeName;
+
+    @ExcelProperty(value = "批准人", order = 4)
+    @ApiModelProperty(value = "批准人(列表返回参数)", dataType = "String")
+    @TableField(exist = false)
+    private String approverName;
+
     @ApiModelProperty(value = "审批状态类型-字典value", dataType = "String")
     @TableField(exist = false)
     private String approvalStatusName;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceStaffInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceStaffInfo.java
index 5ef995b..41563a1 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceStaffInfo.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceStaffInfo.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.model.resource;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -20,6 +27,11 @@
  * @author wangpeng
  * @since 2023-07-25
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @ApiModel
 @Data
 @TableName("biz_resource_staff_info")
@@ -38,6 +50,7 @@
     /**
      * 人员编号
      */
+    @ExcelProperty(value = "人员编号",order = 0)
     @NotEmpty(message = "人员编号不能为空")
     @ApiModelProperty(value = "人员编号", dataType = "String")
     @TableField("staff_no")
@@ -46,6 +59,7 @@
     /**
      * 姓名
      */
+    @ExcelProperty(value = "姓名",order = 1)
     @ApiModelProperty(value = "姓名", dataType = "String")
     @TableField("staff_name")
     private String staffName;
@@ -152,13 +166,15 @@
     /**
      * 部门名字
      */
-    @ApiModelProperty(value = "部门名字", dataType = "String")
+    @ExcelProperty(value = "工作部门",order = 4)
+    @ApiModelProperty(value = "工作部门", dataType = "String")
     @TableField("dept_name")
     private String deptName;
 
     /**
      * 岗位
      */
+    @ExcelProperty(value = "岗位",order = 2)
     @ApiModelProperty(value = "岗位", dataType = "String")
     @TableField("station")
     private String station;
@@ -166,6 +182,7 @@
     /**
      * 计量专业
      */
+    @ExcelProperty(value = "计量专业",order = 5)
     @ApiModelProperty(value = "计量专业", dataType = "String")
     @TableField("major")
     private String major;
@@ -173,6 +190,7 @@
     /**
      * 证号
      */
+    @ExcelProperty(value = "证号",order = 3)
     @ApiModelProperty(value = "证号", dataType = "String")
     @TableField("certificate_number")
     private String certificateNumber;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSupplierInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSupplierInfo.java
index eb5ef01..a1e2697 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSupplierInfo.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSupplierInfo.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.model.resource;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -20,6 +27,11 @@
  * @author wangpeng
  * @since 2023-07-27
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @ApiModel
 @Data
 @TableName("biz_resource_supplier_info")
@@ -34,6 +46,7 @@
     /**
      * 供方编号
      */
+    @ExcelProperty(value = "供方编号", order = 1)
     @ApiModelProperty(value = "供方编号(自动生成)", dataType = "String")
     @TableField("supplier_no")
     private String supplierNo;
@@ -41,6 +54,7 @@
     /**
      * 供方名称
      */
+    @ExcelProperty(value = "供方名称", order = 2)
     @ApiModelProperty(value = "供方名称", dataType = "String")
     @TableField("supplier_name")
     private String supplierName;
@@ -60,6 +74,7 @@
     @TableField("supplier_type")
     private String supplierType;
 
+    @ExcelProperty(value = "供方类型", order = 3)
     @ApiModelProperty(value = "供方类型(字典value)", dataType = "String")
     @TableField(exist = false)
     private String supplierTypeName;
@@ -109,7 +124,8 @@
     /**
      * 电话
      */
-    @ApiModelProperty(value = "电话", dataType = "String")
+    @ExcelProperty(value = "联系电话", order = 4)
+    @ApiModelProperty(value = "联系电话", dataType = "String")
     @TableField("phone")
     private String phone;
 
@@ -158,6 +174,7 @@
     /**
      * 公司地址-省
      */
+    @ExcelProperty(value = "地址-省", order = 6)
     @ApiModelProperty(value = "公司地址-省", dataType = "String")
     @TableField("company_province_name")
     private String companyProvinceName;
@@ -172,6 +189,7 @@
     /**
      * 公司地址-市
      */
+    @ExcelProperty(value = "地址-市", order = 7)
     @ApiModelProperty(value = "公司地址-市", dataType = "String")
     @TableField("company_city_name")
     private String companyCityName;
@@ -186,6 +204,7 @@
     /**
      * 公司地址-区
      */
+    @ExcelProperty(value = "地址-区", order = 8)
     @ApiModelProperty(value = "公司地址-区", dataType = "String")
     @TableField("company_area_name")
     private String companyAreaName;
@@ -193,6 +212,7 @@
     /**
      * 公司地址-详细地址
      */
+    @ExcelProperty(value = "地址-详细地址", order = 9)
     @ApiModelProperty(value = "公司地址-详细地址", dataType = "String")
     @TableField("company_address")
     private String companyAddress;
@@ -200,6 +220,7 @@
     /**
      * 服务和供应的内容
      */
+    @ExcelProperty(value = "服务和供应的内容", order = 5)
     @ApiModelProperty(value = "服务和供应的内容", dataType = "String")
     @TableField("supplier_content")
     private String supplierContent;
@@ -250,6 +271,7 @@
     /**
      * 创建时间
      */
+    @ExcelProperty(value = "创建时间", order = 9)
     @ApiModelProperty(value = "创建时间", dataType = "String")
     @TableField("create_time")
     private String createTime;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/EnvLocationInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/EnvLocationInfo.java
new file mode 100644
index 0000000..d8e2d7b
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/EnvLocationInfo.java
@@ -0,0 +1,83 @@
+package com.casic.missiles.model.resource;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotEmpty;
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 实验室环境监控系统-设备表
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-06-07
+ */
+@ApiModel
+@Data
+@TableName("env_location_info")
+public class EnvLocationInfo implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "主键id", dataType = "Long")
+    @TableId("id")
+    private Long id;
+
+    /**
+     * 地点编号
+     */
+    @NotEmpty(message = "地点编号不能为空")
+    @ApiModelProperty(value = "地点编号", dataType = "String")
+    @TableField("location_no")
+    private String locationNo;
+
+    /**
+     * 地点名称
+     */
+    @ApiModelProperty(value = "地点名称", dataType = "String")
+    @TableField("location_name")
+    private String locationName;
+
+    /**
+     * 地点位置
+     */
+    @ApiModelProperty(value = "地点位置", dataType = "String")
+    @TableField("location_position")
+    private String locationPosition;
+
+    /**
+     * 创建人id
+     */
+    @ApiModelProperty(value = "创建人id", dataType = "Long")
+    @TableField("create_user_id")
+    private Long createUserId;
+
+    /**
+     * 创建人
+     */
+    @ApiModelProperty(value = "创建人", dataType = "String")
+    @TableField("create_user")
+    private String createUser;
+
+    /**
+     * 创建时间
+     */
+    @ApiModelProperty(value = "创建时间", dataType = "String")
+    @TableField("create_time")
+    private String createTime;
+
+    /**
+     * 更新时间
+     */
+    @ApiModelProperty(value = "更新时间", dataType = "String")
+    @TableField("update_time")
+    private String updateTime;
+
+
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemFileConfig.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemFileConfig.java
index 19e6845..86e569c 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemFileConfig.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemFileConfig.java
@@ -30,7 +30,7 @@
     @ApiModelProperty(value = "系统类别(1业务系统2受检系统3环境系统)", dataType = "Integer")
     @NotNull(message = "系统类别不能为空")
     @TableField("system_type")
-    private Integer systemType;
+    private Integer systemType = 1;
 
     @ApiModelProperty("下载编号")
     @TableField("download_no")
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemNotice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemNotice.java
index e94297d..06ec37d 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemNotice.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemNotice.java
@@ -34,7 +34,7 @@
     @ApiModelProperty(value = "系统类别(1业务系统2受检系统3环境系统)", dataType = "Integer")
     @NotNull(message = "系统类别不能为空")
     @TableField("system_type")
-    private Integer systemType;
+    private Integer systemType = 1;
 
     /**
      * 通知公告编号
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSign.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSign.java
index 6c0d7c9..954f4f8 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSign.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSign.java
@@ -51,7 +51,7 @@
     @ApiModelProperty(value = "系统类别(1业务系统2受检系统3环境系统)", dataType = "Integer")
     @NotNull(message = "系统类别不能为空")
     @TableField("system_type")
-    private Integer systemType;
+    private Integer systemType = 1;
 
     /**
      * 签名编号
@@ -130,4 +130,8 @@
     @TableField(exist = false)
     private List<Long> userIdList;
 
+    @ApiModelProperty(hidden = true)
+    @TableField(exist = false)
+    private String deptName;
+
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemTemplate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemTemplate.java
index 503a457..1d27ebe 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemTemplate.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemTemplate.java
@@ -47,7 +47,7 @@
     @ApiModelProperty(value = "系统类别(1业务系统2受检系统3环境系统)", dataType = "Integer")
     @NotNull(message = "系统类别不能为空")
     @TableField("system_type")
-    private Integer systemType;
+    private Integer systemType = 1;
 
     /**
      * 模板编号
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java
index 8c21cb0..f61e4a8 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java
@@ -32,4 +32,8 @@
     ReturnDTO approvalDelete(ApprovalDeleteRequest request);
 
     ReturnDTO failUpdate(T request);
+
+    List<O> listExport(R request);
+
+    List<O> listExportByIds(List<Long> ids);
 }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java
index 724166f..9bce15b 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java
@@ -157,6 +157,29 @@
         throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
     }
 
+    @Override
+    public List<O> listExport(R request) {
+        request.setCreateUserId(null);
+        request.setApprovalStatus(ApprovalStatusEnum.PASSED);
+        Page<O> page = PageFactory.defaultPage();
+        page.setCurrent(1);
+        page.setSearchCount(false);
+        page.setSize(Integer.MAX_VALUE);
+        Page<O> resultPage = this.baseMapper.selectBatchForApprovalList(page, request, null);
+        return resultPage.getRecords();
+    }
+
+    @Override
+    public List<O> listExportByIds(List<Long> ids) {
+        Page<O> page = PageFactory.defaultPage();
+        page.setCurrent(1);
+        page.setSearchCount(false);
+        page.setSize(Integer.MAX_VALUE);
+        List<String> businessKeys = ids.stream().map(String::valueOf).collect(Collectors.toList());
+        Page<O> resultPage = this.baseMapper.selectBatchForApprovalList(page, null, businessKeys);
+        return resultPage.getRecords();
+    }
+
     protected ReturnDTO updateApprovalStatus(Long id, String processId, String approvalStatus) {
         UpdateWrapper<T> updateWrapper = new UpdateWrapper<>();
         updateWrapper.eq("id", id);
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificatePrintServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificatePrintServiceImpl.java
index f6e4706..3228497 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificatePrintServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificatePrintServiceImpl.java
@@ -162,6 +162,30 @@
         return ReturnUtil.success(printLogMapper.selectList(wrapper));
     }
 
+    @Override
+    public List<CertificatePrintListResponse> listByIds(List<Long> ids) {
+        Page<CertificatePrintListResponse> page = PageFactory.defaultPage();
+        page.setCurrent(1);
+        page.setSearchCount(false);
+        page.setSize(Integer.MAX_VALUE);
+        List<String> businessKeys = ids.stream().map(String::valueOf).collect(Collectors.toList());
+        Page<CertificatePrintListResponse> resultPage = this.baseMapper.selectBatchForApprovalList(page, null, businessKeys);
+        return resultPage.getRecords();
+    }
+
+    @Override
+    public List<CertificatePrintListResponse> list(CertificatePrintApprovalListRequest request) {
+        request.setCreateUserId(null);
+        request.setApprovalStatus(null);
+        request.setPrintStatus(null);
+        Page<CertificatePrintListResponse> page = PageFactory.defaultPage();
+        page.setCurrent(1);
+        page.setSearchCount(false);
+        page.setSize(Integer.MAX_VALUE);
+        Page<CertificatePrintListResponse> resultPage = certificatePrintMapper.selectBatchForApprovalList(page, request, null);
+        return resultPage.getRecords();
+    }
+
     private void savePrintLog(Long id) {
         BizBusinessCertificatePrintLog printLog = new BizBusinessCertificatePrintLog();
         BizBusinessCertificatePrint certificatePrint = certificatePrintMapper.selectById(id);
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificateReportServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificateReportServiceImpl.java
index 457555f..24146be 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificateReportServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificateReportServiceImpl.java
@@ -158,8 +158,8 @@
         QueryWrapper<BizBusinessCertificateMeasureResultData> mWrapper = new QueryWrapper<>();
         mWrapper.eq("report_id", reportId);
         boolean mRemove = certificateMeasureResultDataService.remove(mWrapper);
-        Assert.isFalse(eRemove || mRemove, () -> {
+        if(!eRemove || !mRemove){
             throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
-        });
+        }
     }
 }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessIdentifyInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessIdentifyInfoServiceImpl.java
index 4c8e190..f7e63ca 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessIdentifyInfoServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessIdentifyInfoServiceImpl.java
@@ -1,8 +1,10 @@
 package com.casic.missiles.service.Impl.business;
 
+import cn.hutool.core.date.DateUtil;
 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.core.page.PageFactory;
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.business.identify.IdentifyListRequest;
@@ -14,11 +16,14 @@
 import com.casic.missiles.service.business.IBizBusinessIdentifyInfoService;
 import com.casic.missiles.utils.DictCodeUtils;
 import com.casic.missiles.utils.NumberGeneratorUtil;
+import com.casic.missiles.utils.QRCodeUtil;
 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.List;
+
 /**
  * <p>
  * 计量检定业务-任务计量管理-标识打印 服务实现类
@@ -35,9 +40,9 @@
     @Override
     public Page<BizBusinessIdentifyInfo> identifyListPage(Page<BizBusinessIdentifyInfo> page, IdentifyListRequest request) throws Exception {
         QueryWrapper<BizBusinessIdentifyInfo> wrapper = new QueryWrapper<>();
-        wrapper.eq("identify_type", request.getIdentifyType());
-        wrapper.like("device_no", request.getDeviceNo());
-        wrapper.like("device_name", request.getDeviceName());
+        wrapper.eq(StringUtils.isNotEmpty(request.getIdentifyType()), "identify_type", request.getIdentifyType());
+        wrapper.like(StringUtils.isNotEmpty(request.getDeviceNo()),"device_no", request.getDeviceNo());
+        wrapper.like(StringUtils.isNotEmpty(request.getDeviceName()), "device_name", request.getDeviceName());
         wrapper.apply(StringUtils.isNotBlank(request.getCreateTimeStart()),
                 "{0} <= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getCreateTimeStart().split(" ")[0]);
         wrapper.apply(StringUtils.isNotBlank(request.getCreateTimeEnd()),
@@ -64,8 +69,11 @@
     }
 
     @Override
-    public ReturnDTO updateIdentify(BizBusinessIdentifyInfo identifyInfo) {
-        if(identifyInfoMapper.updateById(identifyInfo) > 0){
+    public ReturnDTO updateIdentify(Long id) {
+        BizBusinessIdentifyInfo info = new BizBusinessIdentifyInfo();
+        info.setId(id);
+        info.setUpdateTime(DateUtil.now());
+        if(identifyInfoMapper.updateById(info) > 0){
             return ReturnUtil.success();
         }
         throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
@@ -79,4 +87,20 @@
         throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
     }
 
+    @Override
+    public List<BizBusinessIdentifyInfo> list(IdentifyListRequest request) throws Exception {
+        Page<BizBusinessIdentifyInfo> page = PageFactory.defaultPage();
+        page.setCurrent(1);
+        page.setSearchCount(false);
+        page.setSize(Integer.MAX_VALUE);
+        Page<BizBusinessIdentifyInfo> resultPage = this.identifyListPage(page, request);
+        return resultPage.getRecords();
+    }
+
+    @Override
+    public ReturnDTO<String> equipmentQrCode(Long id) {
+        String base64QRCode = QRCodeUtil.getBase64QRCode(String.valueOf(id));
+        return ReturnUtil.success(base64QRCode);
+    }
+
 }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOrderInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOrderInfoServiceImpl.java
index 82952ad..d8d2c6a 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOrderInfoServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOrderInfoServiceImpl.java
@@ -35,6 +35,7 @@
 import javax.servlet.http.HttpServletResponse;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 import java.util.stream.Collectors;
 
 /**
@@ -209,13 +210,16 @@
     private QueryWrapper<OrderListResponse> listParamWrapperBuilder(OrderListRequest request) {
         QueryWrapper<OrderListResponse> wrapper = new QueryWrapper<>();
         wrapper.like(StringUtils.isNotBlank(request.getOrderNo()), "order_no", request.getOrderNo());
+        wrapper.like(Objects.nonNull(request.getCustomerId()), "customer_id", request.getCustomerId());
         wrapper.like(StringUtils.isNotBlank(request.getCustomerName()), "customer_name", request.getCustomerName());
         wrapper.like(StringUtils.isNotBlank(request.getDeliverer()), "deliverer", request.getDeliverer());
         wrapper.like(StringUtils.isNotBlank(request.getCreateUserName()), "create_user_name", request.getCreateUserName());
-        wrapper.apply(StringUtils.isNotBlank(request.getCreateStartTime()),
-                "{0} <= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getCreateStartTime().split(" ")[0]);
-        wrapper.apply(StringUtils.isNotBlank(request.getCreateEndTime()),
-                "{0} >= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getCreateEndTime().split(" ")[0]);
+        if(StringUtils.isNotBlank(request.getCreateStartTime())){
+            wrapper.apply("{0} <= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getCreateStartTime().split(" ")[0]);
+        }
+        if(StringUtils.isNotBlank(request.getCreateEndTime())){
+            wrapper.apply("{0} >= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getCreateEndTime().split(" ")[0]);
+        }
         wrapper.orderByDesc("create_time");
         return wrapper;
     }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceAssessServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceAssessServiceImpl.java
index c6af980..ce40138 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceAssessServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceAssessServiceImpl.java
@@ -1,10 +1,33 @@
 package com.casic.missiles.service.Impl.business;
 
-import com.casic.missiles.model.business.BizBusinessOutsourceAssess;
+import cn.hutool.core.lang.Assert;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.casic.missiles.core.model.auth.AuthUser;
+import com.casic.missiles.core.shiro.ShiroKit;
+import com.casic.missiles.dto.BaseApprovalSubmitRequest;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.ReturnUtil;
+import com.casic.missiles.dto.business.outsource.OutsourceAssessApprovalListRequest;
+import com.casic.missiles.dto.business.outsource.OutsourceAssessSaveResponse;
+import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.NoGenerateFileCodeEnum;
+import com.casic.missiles.enums.NoGenerateRecordTypeCodeEnum;
+import com.casic.missiles.enums.system.ApprovalStatusEnum;
+import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.mapper.business.BizBusinessOutsourceAssessMapper;
+import com.casic.missiles.model.business.BizBusinessOutsourceAssess;
+import com.casic.missiles.model.business.BizBusinessOutsourceAssessSampleRelation;
+import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl;
+import com.casic.missiles.service.business.IBizBusinessOutsourceAssessSampleRelationService;
 import com.casic.missiles.service.business.IBizBusinessOutsourceAssessService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.casic.missiles.utils.NoGeneratorUtil;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Objects;
 
 /**
  * <p>
@@ -15,6 +38,103 @@
  * @since 2023-08-16
  */
 @Service
-public class BizBusinessOutsourceAssessServiceImpl extends ServiceImpl<BizBusinessOutsourceAssessMapper, BizBusinessOutsourceAssess> implements IBizBusinessOutsourceAssessService {
+public class BizBusinessOutsourceAssessServiceImpl extends GeneralApprovalServiceImpl<BizBusinessOutsourceAssessMapper, BizBusinessOutsourceAssess, BizBusinessOutsourceAssess, OutsourceAssessApprovalListRequest, BaseApprovalSubmitRequest> implements IBizBusinessOutsourceAssessService {
+    @Autowired
+    private IBizBusinessOutsourceAssessSampleRelationService outsourceAssessSampleRelationService;
 
+    @Override
+    public ReturnDTO<OutsourceAssessSaveResponse> saveOutsourceAssess(BizBusinessOutsourceAssess request) {
+        //生成编号
+        String labCode = request.getLabCode();
+        String groupCode = request.getGroupCode();
+        Long maxNo = this.baseMapper.selectMaxProjectNo();
+        String projectNo = NoGeneratorUtil.getCode(NoGenerateFileCodeEnum.D, labCode, NoGenerateRecordTypeCodeEnum.OUTSOURCE_ACCESS, groupCode, maxNo);
+        request.setCreateUserId(request.getUserId());
+        request.setCreateUserName(request.getUserName());
+        request.setApprovalStatus(ApprovalStatusEnum.DRAFT); //草稿箱状态
+        request.setProjectNo(projectNo);
+        int row = this.baseMapper.insert(request);
+        Assert.isFalse(row <= 0, () -> {
+            throw new BusinessException(BusinessExceptionEnum.OUTSOURCE_ACCESS_SAVE_FAILED);
+        });
+        //关联表
+        saveRelationData(request);
+        OutsourceAssessSaveResponse saveResponse = new OutsourceAssessSaveResponse();
+        saveResponse.setId(request.getId());
+        saveResponse.setProjectNo(projectNo);
+        return ReturnUtil.success(saveResponse);
+    }
+
+    @Override
+    @Transactional
+    public ReturnDTO draftUpdate(BizBusinessOutsourceAssess request) {
+        if (this.baseMapper.updateById(request) > 0) {
+            //关联表删除、增加
+            removeRelationData(request.getId());
+            saveRelationData(request);
+            return ReturnUtil.success();
+        }
+        throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
+    }
+
+    @Override
+    public ReturnDTO draftDelete(Long id) {
+        if (this.baseMapper.deleteById(id) > 0) {
+            //关联表删除
+            removeRelationData(id);
+            return ReturnUtil.success();
+        }
+        throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
+    }
+
+    @Override
+    public ReturnDTO draftBatchDelete(List<Long> ids) {
+        if (this.baseMapper.deleteBatchIds(ids) >= 0) {
+            ids.forEach(id -> removeRelationData(id));
+            return ReturnUtil.success();
+        }
+        throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
+    }
+
+    @Override
+    @Transactional
+    public ReturnDTO failUpdate(BizBusinessOutsourceAssess request) {
+        AuthUser user = ShiroKit.getUser();
+        Assert.isFalse(Objects.isNull(user), () -> {
+            throw new BusinessException(BusinessExceptionEnum.LOGIN_USER_ACQUIRE_FAILED);
+        });
+        request.setApprovalStatus(ApprovalStatusEnum.IN_APPROVED);
+        if (this.baseMapper.updateById(request) > 0) {
+            //关联表删除、增加
+            removeRelationData(request.getId());
+            saveRelationData(request);
+            baseApprovalService.failUpdate(request.getProcessId());
+            return ReturnUtil.success();
+        }
+        throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
+    }
+
+    private void saveRelationData(BizBusinessOutsourceAssess request) {
+        List<BizBusinessOutsourceAssessSampleRelation> sampleRelations = new ArrayList<>();
+        request.getOrderSampleList().forEach(dto -> {
+            BizBusinessOutsourceAssessSampleRelation relation = new BizBusinessOutsourceAssessSampleRelation();
+            relation.setOrderId(dto.getOrderId());
+            relation.setSampleId(dto.getSampleId());
+            relation.setAccessId(request.getId());
+            sampleRelations.add(relation);
+        });
+        if(outsourceAssessSampleRelationService.saveBatch(sampleRelations)){
+            return;
+        }
+        throw new BusinessException(BusinessExceptionEnum.OUTSOURCE_ACCESS_SAVE_FAILED);
+    }
+
+    private void removeRelationData(Long assessId) {
+        QueryWrapper<BizBusinessOutsourceAssessSampleRelation> wrapper = new QueryWrapper<>();
+        wrapper.eq("access_id", assessId);
+        if(outsourceAssessSampleRelationService.remove(wrapper)){
+            return;
+        }
+        throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
+    }
 }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceProtocolServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceProtocolServiceImpl.java
new file mode 100644
index 0000000..821e728
--- /dev/null
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceProtocolServiceImpl.java
@@ -0,0 +1,60 @@
+package com.casic.missiles.service.Impl.business;
+
+import cn.hutool.core.lang.Assert;
+import com.casic.missiles.dto.BaseApprovalSubmitRequest;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.ReturnUtil;
+import com.casic.missiles.dto.business.outsource.OutsourceProtocolApprovalListRequest;
+import com.casic.missiles.dto.business.outsource.OutsourceProtocolSaveResponse;
+import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.NoGenerateFileCodeEnum;
+import com.casic.missiles.enums.NoGenerateRecordTypeCodeEnum;
+import com.casic.missiles.enums.system.ApprovalStatusEnum;
+import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.mapper.business.BizBusinessOutsourceProtocolMapper;
+import com.casic.missiles.mapper.business.BizBusinessOutsourcerInfoMapper;
+import com.casic.missiles.model.business.BizBusinessOutsourceProtocol;
+import com.casic.missiles.model.business.BizBusinessOutsourcerInfo;
+import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl;
+import com.casic.missiles.service.business.IBizBusinessOutsourceProtocolService;
+import com.casic.missiles.utils.NoGeneratorUtil;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 计量检定业务-分包管理-测试、校准或检定工作分包协议书 服务实现类
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-08-24
+ */
+@Service
+public class BizBusinessOutsourceProtocolServiceImpl extends GeneralApprovalServiceImpl<BizBusinessOutsourceProtocolMapper, BizBusinessOutsourceProtocol, BizBusinessOutsourceProtocol, OutsourceProtocolApprovalListRequest, BaseApprovalSubmitRequest> implements IBizBusinessOutsourceProtocolService {
+    @Autowired
+    private BizBusinessOutsourcerInfoMapper outsourcerInfoMapper;
+
+    @Override
+    public ReturnDTO<OutsourceProtocolSaveResponse> saveOutsourceProtocol(BizBusinessOutsourceProtocol request) {
+        //生成编号
+        String labCode = request.getLabCode();
+        String groupCode = request.getGroupCode();
+        Long maxNo = this.baseMapper.selectMaxProtocolNo();
+        String protocolNo = NoGeneratorUtil.getCode(NoGenerateFileCodeEnum.D, labCode, NoGenerateRecordTypeCodeEnum.OUTSOURCE_PROTOCOL, groupCode, maxNo);
+        request.setCreateUserId(request.getUserId());
+        request.setCreateUserName(request.getUserName());
+        request.setApprovalStatus(ApprovalStatusEnum.DRAFT); //草稿箱状态
+        request.setProtocolNo(protocolNo);
+        BizBusinessOutsourcerInfo outsourcerInfo = outsourcerInfoMapper.selectById(request.getOutsourcerId());
+        request.setOutsourceNo(outsourcerInfo.getOutsourcerNo());
+        request.setOutsourceName(outsourcerInfo.getOutsourcerName());
+        int row = this.baseMapper.insert(request);
+        Assert.isFalse(row <= 0, () -> {
+            throw new BusinessException(BusinessExceptionEnum.OUTSOURCE_PROTOCOL_SAVE_FAILED);
+        });
+        OutsourceProtocolSaveResponse saveResponse = new OutsourceProtocolSaveResponse();
+        saveResponse.setId(request.getId());
+        saveResponse.setProtocolNo(protocolNo);
+        return ReturnUtil.success(saveResponse);
+    }
+}
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourcerInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourcerInfoServiceImpl.java
index 75f639d..8aadad7 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourcerInfoServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourcerInfoServiceImpl.java
@@ -3,12 +3,12 @@
 import cn.hutool.core.lang.Assert;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.dto.*;
 import com.casic.missiles.dto.business.outsource.OutsourcerInfoApprovalListRequest;
 import com.casic.missiles.dto.business.outsource.OutsourcerSaveResponse;
 import com.casic.missiles.enums.BusinessExceptionEnum;
-import com.casic.missiles.enums.PrefixCodeEnum;
+import com.casic.missiles.enums.NoGenerateFileCodeEnum;
+import com.casic.missiles.enums.NoGenerateRecordTypeCodeEnum;
 import com.casic.missiles.enums.system.ApprovalStatusEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.mapper.business.BizBusinessOutsourcerInfoMapper;
@@ -20,7 +20,7 @@
 import com.casic.missiles.service.business.IBizBusinessOutsourcerInfoService;
 import com.casic.missiles.service.business.IBizBusinessOutsourcerUserInfoService;
 import com.casic.missiles.utils.DictCodeUtils;
-import com.casic.missiles.utils.NumberGeneratorUtil;
+import com.casic.missiles.utils.NoGeneratorUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -42,22 +42,12 @@
     private IBizBusinessOutsourcerUserInfoService outsourcerUserInfoService;
 
     @Override
-    public List<BizBusinessOutsourcerInfo> list(OutsourcerInfoApprovalListRequest request) {
-        request.setCreateUserId(null);
-        request.setApprovalStatus(ApprovalStatusEnum.PASSED);
-        Page<BizBusinessOutsourcerInfo> page = PageFactory.defaultPage();
-        page.setCurrent(1);
-        page.setSearchCount(false);
-        page.setSize(Integer.MAX_VALUE);
-        Page<BizBusinessOutsourcerInfo> resultPage = this.baseMapper.selectBatchForApprovalList(page, request, null);
-        return resultPage.getRecords();
-    }
-
-    @Override
     public ReturnDTO<OutsourcerSaveResponse> saveOutsourcer(BizBusinessOutsourcerInfo request) {
         //生成编号
+        String labCode = request.getLabCode();
+        String groupCode = request.getGroupCode();
         Long maxNo = this.baseMapper.selectMaxNo();
-        String outsourcerNo = NumberGeneratorUtil.getContactNo(PrefixCodeEnum.OUTSOURCER_PREFIX, maxNo);
+        String outsourcerNo = NoGeneratorUtil.getCode(NoGenerateFileCodeEnum.D, labCode, NoGenerateRecordTypeCodeEnum.OUTSOURCE_INFO, groupCode, maxNo);
         request.setOutsourcerNo(outsourcerNo);
         request.setCreateUserId(request.getUserId());
         request.setCreateUserName(request.getUserName());
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessSiteExecutiveInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessSiteExecutiveInfoServiceImpl.java
index ebab3e6..6c6a129 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessSiteExecutiveInfoServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessSiteExecutiveInfoServiceImpl.java
@@ -189,9 +189,9 @@
         QueryWrapper<BizBusinessSiteExecutiveStaffRelation> mWrapper = new QueryWrapper<>();
         mWrapper.eq("site_executive_id", siteExecutiveId);
         boolean mRemove = siteExecutiveStaffRelationService.remove(mWrapper);
-        Assert.isFalse(eRemove || mRemove, () -> {
+        if(!eRemove || !mRemove){
             throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
-        });
+        }
     }
 
     private void doPopulateSiteExecutive(SiteExecutiveDetailResponse detailResponse) {
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessLabExecutiveInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessLabExecutiveInfoServiceImpl.java
index 50c5616..0242fcf 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessLabExecutiveInfoServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessLabExecutiveInfoServiceImpl.java
@@ -297,6 +297,29 @@
     }
 
     @Override
+    public List<SampleLabExecutiveListResponse> deptLabExecutiveList(SampleLabExecutiveListRequest request) throws Exception {
+        Page<SampleLabExecutiveListResponse> page = PageFactory.defaultPage();
+        page.setCurrent(1);
+        page.setSearchCount(false);
+        page.setSize(Integer.MAX_VALUE);
+        Page<SampleLabExecutiveListResponse> resultPage = this.deptLabExecutiveListPage(page, request);
+        return resultPage.getRecords();
+    }
+
+    @Override
+    public List<SampleLabExecutiveListResponse> deptLabExecutiveListByIds(String measureStatus, List<Long> ids) throws Exception {
+        Page<SampleLabExecutiveListResponse> page = PageFactory.defaultPage();
+        page.setCurrent(1);
+        page.setSearchCount(false);
+        page.setSize(Integer.MAX_VALUE);
+        SampleLabExecutiveListRequest request = new SampleLabExecutiveListRequest();
+        request.setIds(ids);
+        request.setMeasureStatus(measureStatus);
+        Page<SampleLabExecutiveListResponse> resultPage = this.deptLabExecutiveListPage(page, request);
+        return resultPage.getRecords();
+    }
+
+    @Override
     public Page<SampleLabExecutiveListResponse> myLabExecutiveListPage(Page<SampleLabExecutiveListResponse> page, SampleLabExecutiveListRequest labExecutiveListRequest) throws Exception{
         AuthUser user = ShiroKit.getUser();
         Assert.isFalse(Objects.isNull(user), () -> {
@@ -350,6 +373,29 @@
     }
 
     @Override
+    public List<SampleLabExecutiveListResponse> myLabExecutiveList(SampleLabExecutiveListRequest request) throws Exception {
+        Page<SampleLabExecutiveListResponse> page = PageFactory.defaultPage();
+        page.setCurrent(1);
+        page.setSearchCount(false);
+        page.setSize(Integer.MAX_VALUE);
+        Page<SampleLabExecutiveListResponse> resultPage = this.myLabExecutiveListPage(page, request);
+        return resultPage.getRecords();
+    }
+
+    @Override
+    public List<SampleLabExecutiveListResponse> myLabExecutiveListByIds(String measureStatus, List<Long> ids) throws Exception {
+        Page<SampleLabExecutiveListResponse> page = PageFactory.defaultPage();
+        page.setCurrent(1);
+        page.setSearchCount(false);
+        page.setSize(Integer.MAX_VALUE);
+        SampleLabExecutiveListRequest request = new SampleLabExecutiveListRequest();
+        request.setIds(ids);
+        request.setMeasureStatus(measureStatus);
+        Page<SampleLabExecutiveListResponse> resultPage = this.myLabExecutiveListPage(page, request);
+        return resultPage.getRecords();
+    }
+
+    @Override
     public List<SampleAmountResponse> myExecutiveAmount() {
         //登录用户id获取计量人员id，实验室检测信息中存储的是计量人员id
         AuthUser user = ShiroKit.getUser();
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentInfoServiceImpl.java
index 864b05e..db8cad4 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentInfoServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentInfoServiceImpl.java
@@ -35,7 +35,6 @@
 import com.casic.missiles.utils.ConvertUtils;
 import com.casic.missiles.utils.DictCodeUtils;
 import com.casic.missiles.utils.NumberGeneratorUtil;
-import org.flowable.engine.RuntimeService;
 import org.flowable.engine.runtime.ProcessInstance;
 import org.jetbrains.annotations.NotNull;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -43,7 +42,6 @@
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
 
-import javax.annotation.Resource;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
@@ -81,8 +79,6 @@
     private IBizEquipmentAttachmentService attachmentService;
     @Autowired
     private IBizEquipmentCheckpointService checkpointService;
-    @Resource
-    private RuntimeService runtimeService;
     @Autowired
     private ApprovalOperateService approvalOperateService;
 
@@ -235,18 +231,18 @@
     private void updateRelationInfo(EquipmentAddRequest request, BizEquipmentInfoApproval equipmentInfoApproval) {
         QueryWrapper<BizEquipmentTechnicalTarget> targetWrapper = new QueryWrapper<>();
         targetWrapper.eq("equipment_no", equipmentInfoApproval.getEquipmentNo());
-        boolean removeTargetFlag = technicalTargetService.remove(targetWrapper);
-        boolean saveTargetFlag = technicalTargetService.saveBatch(request.getTechnicalTargetList());
+        technicalTargetService.remove(targetWrapper);
+        technicalTargetService.saveBatch(request.getTechnicalTargetList());
 
         QueryWrapper<BizEquipmentAttachment> attachmentWrapper = new QueryWrapper<>();
         attachmentWrapper.eq("equipment_no", equipmentInfoApproval.getEquipmentNo());
-        boolean removeAttachmentFlag = attachmentService.remove(attachmentWrapper);
-        boolean saveAttachmentFlag = attachmentService.saveBatch(request.getAttachmentList());
+        attachmentService.remove(attachmentWrapper);
+        attachmentService.saveBatch(request.getAttachmentList());
 
         QueryWrapper<BizEquipmentCheckpoint> checkpointWrapper = new QueryWrapper<>();
         checkpointWrapper.eq("equipment_no", equipmentInfoApproval.getEquipmentNo());
-        boolean removeCheckpointFlag = checkpointService.remove(checkpointWrapper);
-        boolean saveCheckpointFlag = checkpointService.saveBatch(request.getCheckpointList());
+        checkpointService.remove(checkpointWrapper);
+        checkpointService.saveBatch(request.getCheckpointList());
     }
 
     @Override
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardInfoServiceImpl.java
index faff1ae..c50a5b3 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardInfoServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardInfoServiceImpl.java
@@ -22,7 +22,9 @@
 import com.casic.missiles.mapper.equipment.BizEquipmentStandardInfoMapper;
 import com.casic.missiles.mapper.equipment.BizEquipmentStandardTechnologyRelationMapper;
 import com.casic.missiles.mapper.resource.BizResourceStaffInfoMapper;
-import com.casic.missiles.model.equipment.*;
+import com.casic.missiles.model.equipment.BizEquipmentStandardInfo;
+import com.casic.missiles.model.equipment.BizEquipmentStandardInfoApproval;
+import com.casic.missiles.model.equipment.BizEquipmentStandardTechnologyRelation;
 import com.casic.missiles.model.resource.BizResourceStaffInfo;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.dao.DeptMapper;
@@ -33,14 +35,12 @@
 import com.casic.missiles.service.flowable.ApprovalOperateService;
 import com.casic.missiles.utils.ConvertUtils;
 import com.casic.missiles.utils.DictCodeUtils;
-import org.flowable.engine.RuntimeService;
 import org.flowable.engine.runtime.ProcessInstance;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
 
-import javax.annotation.Resource;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
@@ -62,8 +62,6 @@
     private BizResourceStaffInfoMapper staffInfoMapper;
     @Autowired
     private IBaseApprovalService baseApprovalService;
-    @Resource
-    private RuntimeService runtimeService;
     @Autowired
     private ApprovalOperateService approvalOperateService;
     @Autowired
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSealInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSealInfoServiceImpl.java
index 7c91fa2..00040d6 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSealInfoServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSealInfoServiceImpl.java
@@ -15,6 +15,7 @@
 import com.casic.missiles.modular.system.model.User;
 import com.casic.missiles.service.resource.IBizResourceSealInfoService;
 import com.casic.missiles.utils.DictCodeUtils;
+import com.casic.missiles.utils.MinioUtil;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -33,6 +34,8 @@
     private BizResourceSealInfoMapper sealInfoMapper;
     @Autowired
     private UserMapper userMapper;
+    @Autowired
+    private MinioUtil minioUtil;
 
     @Override
     public Page<BizResourceSealInfo> listPage(Page<BizResourceSealInfo> page, SealInfoListRequest request) throws Exception {
@@ -44,6 +47,7 @@
         Page<BizResourceSealInfo> sealInfoPage = sealInfoMapper.selectPage(page, wrapper);
         for (BizResourceSealInfo record : sealInfoPage.getRecords()) {
             DictCodeUtils.convertDictCodeToName(record);
+            record.setMinioFileUrl(minioUtil.getFileUrl(record.getMinioFileName()));
         }
         return sealInfoPage;
     }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceStaffInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceStaffInfoServiceImpl.java
index f058cf5..09203ac 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceStaffInfoServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceStaffInfoServiceImpl.java
@@ -3,6 +3,7 @@
 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.core.page.PageFactory;
 import com.casic.missiles.dto.IdDTO;
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
@@ -86,6 +87,13 @@
     }
 
     @Override
+    public List<BizResourceStaffInfo> list(StaffListRequest request) throws Exception {
+        Page<BizResourceStaffInfo> page = PageFactory.defaultPage();
+        Page<BizResourceStaffInfo> staffInfoPage = this.listPage(page, request);
+        return staffInfoPage.getRecords();
+    }
+
+    @Override
     @Transactional
     public ReturnDTO<IdDTO> staffBaseAdd(BizResourceStaffInfo staffInfo) {
         //登录账号查重
@@ -495,6 +503,28 @@
         return certResponsePage;
     }
 
+    @Override
+    public List<StaffCertResponse> certListByIds(List<Long> ids) throws Exception {
+        Page<StaffCertResponse> page = PageFactory.defaultPage();
+        page.setCurrent(1);
+        page.setSearchCount(false);
+        page.setSize(Integer.MAX_VALUE);
+        StaffCertRequest request = new StaffCertRequest();
+        request.setIds(ids);
+        Page<StaffCertResponse> resultPage = this.certListPage(page, request);
+        return resultPage.getRecords();
+    }
+
+    @Override
+    public List<StaffCertResponse> certList(StaffCertRequest request) throws Exception {
+        Page<StaffCertResponse> page = PageFactory.defaultPage();
+        page.setCurrent(1);
+        page.setSearchCount(false);
+        page.setSize(Integer.MAX_VALUE);
+        Page<StaffCertResponse> resultPage = this.certListPage(page, request);
+        return resultPage.getRecords();
+    }
+
     @Async
     public void deleteRelationInfo(Long staffId){
         QueryWrapper<BizResourceStaffEducation> educationWrapper = new QueryWrapper<>();
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceStaffVerifierServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceStaffVerifierServiceImpl.java
index 8ac7eee..b508d45 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceStaffVerifierServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceStaffVerifierServiceImpl.java
@@ -52,8 +52,8 @@
     private WebSocket webSocket;
 
     @Override
-    public ReturnDTO expirationReminder(IdDTO idDto) {
-        BizResourceStaffVerifier staffVerifier = verifierMapper.selectById(idDto.getId());
+    public ReturnDTO expirationReminder(IdDTO idDTO) {
+        BizResourceStaffVerifier staffVerifier = verifierMapper.selectById(idDTO.getId());
         BizResourceStaffInfo staffInfo = staffInfoMapper.selectById(staffVerifier.getStaffId());
         QueryWrapper<User> wrapper = new QueryWrapper<>();
         wrapper.eq("account", staffInfo.getAccount());
@@ -65,7 +65,7 @@
         Assert.isFalse(Objects.isNull(user), () -> {
             throw new BusinessException(BusinessExceptionEnum.LOGIN_USER_ACQUIRE_FAILED);
         });
-        WorkbenchRemindMessage remindMessage = new WorkbenchRemindMessage(userInfo.getId(), userInfo.getDeptId(), idDto.getId(), staffVerifier.getCertNo(), MessageTypeEnum.STAFF_CERT.getCode(), MessageSourceModuleEnum.RESOURCE.getCode(), MessageTypeEnum.STAFF_CERT.getValue(), MessageTypeEnum.STAFF_CERT.getValue(), staffVerifier.getCertName(),0, user.getId(), user.getName());
+        WorkbenchRemindMessage remindMessage = new WorkbenchRemindMessage(userInfo.getId(), userInfo.getDeptId(), idDTO.getId(), staffVerifier.getCertNo(), MessageTypeEnum.STAFF_CERT.getCode(), MessageSourceModuleEnum.RESOURCE.getCode(), MessageTypeEnum.STAFF_CERT.getValue(), MessageTypeEnum.STAFF_CERT.getValue(), staffVerifier.getCertName(),0, user.getId(), user.getName());
         if(messageMapper.insert(remindMessage) > 0){
             // 新增到消息列表后向用户推送消息
             webSocket.sendOneMessage(String.valueOf(userInfo.getId()), JSONObject.toJSONString(remindMessage));
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceTrainInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceTrainInfoServiceImpl.java
index c1d6308..3a533f2 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceTrainInfoServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceTrainInfoServiceImpl.java
@@ -44,11 +44,14 @@
     @Override
     public Page<BizResourceTrainInfo> listPage(Page<BizResourceTrainInfo> page, TrainListRequest request) throws Exception {
         QueryWrapper<BizResourceTrainInfo> wrapper = new QueryWrapper<>();
-        wrapper.like("train_no", request.getTrainNo());
-        wrapper.apply(StringUtils.isNotBlank(request.getCreateTimeStart()),//apply方法传入参数名不能为空
-                "{0} <= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getCreateTimeStart().split(" ")[0]);
-        wrapper.apply(StringUtils.isNotBlank(request.getCreateTimeEnd()),
-                "{0} >= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getCreateTimeEnd().split(" ")[0]);
+        wrapper.like(StringUtils.isNotEmpty(request.getTrainNo()), "train_no", request.getTrainNo());
+        wrapper.like(StringUtils.isNotEmpty(request.getDutyLeader()),"duty_leader", request.getDutyLeader());
+        if(StringUtils.isNotBlank(request.getCreateTimeStart())){
+            wrapper.apply("{0} <= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getCreateTimeStart().split(" ")[0]);
+        }
+        if(StringUtils.isNotBlank(request.getCreateTimeEnd())){
+            wrapper.apply("{0} >= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getCreateTimeEnd().split(" ")[0]);
+        }
         wrapper.orderByDesc("create_time");
         Page<BizResourceTrainInfo> trainInfoPage = trainInfoMapper.selectPage(page, wrapper);
         for (BizResourceTrainInfo record : trainInfoPage.getRecords()) {

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java
index bb0c50f..13a699b 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java
@@ -12,6 +12,7 @@
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.IGeneralApprovalService;
+import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
@@ -19,6 +20,7 @@
 import org.springframework.web.bind.annotation.RequestBody;
 
 import javax.validation.Valid;
+import java.util.List;
 import java.util.Objects;
 
 /**
@@ -117,4 +119,17 @@
         }
         return baseApprovalService.failUpdate(request);
     }
+
+    public List<O> exportList(@RequestBody @Valid R request) throws Exception {
+        List<O> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = baseApprovalService.listExportByIds(request.getIds());
+        } else {
+            list = baseApprovalService.listExport(request);
+        }
+        for (O record : list) {
+            DictCodeUtils.convertDictCodeToName(record);
+        }
+        return list;
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java
index 8a90961..d775831 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java
@@ -5,6 +5,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.business.certificate.CertificateChangeApplyApprovalListRequest;
 import com.casic.missiles.dto.business.certificate.CertificateChangeApplySaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessCertificateChangeApply;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
@@ -20,6 +21,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -48,4 +50,12 @@
         }
         return changeApplyService.saveChangeApply(request);
     }
+
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody CertificateChangeApplyApprovalListRequest request) throws Exception {
+        List<BizBusinessCertificateChangeApply> list = super.exportList(request);
+        super.exportExcel(BizBusinessCertificateChangeApply.class, list, ExportEnum.CERTIFICATE_CHANGE_APPLY.getSheetName());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java
index 5fc4b07..af8230e 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java
@@ -9,6 +9,7 @@
 import com.casic.missiles.dto.business.certificate.CertificatePrintApprovalListRequest;
 import com.casic.missiles.dto.business.certificate.CertificatePrintListResponse;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.enums.business.CertificatePrintStatusEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessCertificatePrintLog;
@@ -18,10 +19,16 @@
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.io.IOException;
+import java.util.List;
 import java.util.Objects;
 
 /**
@@ -98,4 +105,16 @@
         });
         return certificatePrintService.certificatePrintLog(idDTO.getId());
     }
+
+    @ApiOperation("证书打印审批导出")
+    @PostMapping("/listExport")
+    public void exportList(@RequestBody CertificatePrintApprovalListRequest request) throws IOException {
+        List<CertificatePrintListResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = certificatePrintService.listByIds(request.getIds());
+        } else {
+            list = certificatePrintService.list(request);
+        }
+        super.exportExcel(CertificatePrintListResponse.class, list, ExportEnum.CERTIFICATE_PRINT.getSheetName());
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java
index 63b06dc..6b2efd5 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java
@@ -6,6 +6,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.business.certificate.CertificateReportApprovalListRequest;
 import com.casic.missiles.dto.business.certificate.CertificateReportSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessCertificateReport;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
@@ -21,6 +22,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -50,7 +52,7 @@
         return certificateReportService.saveCertificateReport(request);
     }
 
-    @ApiOperation("证书审批详情（基本信息）")
+    @ApiOperation("详情（基本信息）")
     @PostMapping("/detail")
     public ReturnDTO<BizBusinessCertificateReport> detail(@RequestBody @Valid BaseDetailRequest request, BindingResult bindingResult) throws Exception {
         if(bindingResult.hasErrors()){
@@ -59,4 +61,11 @@
         return certificateReportService.detail(request);
     }
 
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody CertificateReportApprovalListRequest request) throws Exception {
+        List<BizBusinessCertificateReport> list = super.exportList(request);
+        super.exportExcel(BizBusinessCertificateReport.class, list, ExportEnum.CERTIFICATE_REPORT.getSheetName());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java
index 46b26bd..57c0809 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java
@@ -10,20 +10,21 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.business.identify.IdentifyListRequest;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessIdentifyInfo;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.business.IBizBusinessIdentifyInfoService;
+import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import javax.validation.Valid;
+import java.util.List;
 import java.util.Objects;
 
 /**
@@ -57,16 +58,13 @@
         return identifyInfoService.addIdentify(identifyInfo);
     }
 
-    @ApiOperation("标识打印更新")
+    @ApiOperation("标识打印更新（更新打印时间）")
     @PostMapping("/update")
-    public ReturnDTO updateIdentify(@RequestBody @Valid BizBusinessIdentifyInfo identifyInfo, BindingResult bindingResult) {
-        Assert.isFalse(Objects.isNull(identifyInfo.getId()), () -> {
+    public ReturnDTO updateIdentify(@RequestBody @Valid IdDTO idDTO) {
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        Assert.isFalse(bindingResult.hasErrors(), () -> {
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        });
-        return identifyInfoService.updateIdentify(identifyInfo);
+        return identifyInfoService.updateIdentify(idDTO.getId());
     }
 
     @ApiOperation("标识打印删除")
@@ -77,4 +75,37 @@
         });
         return identifyInfoService.deleteIdentify(idDTO.getId());
     }
+
+    @ApiOperation("标识打印导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody @Valid IdentifyListRequest request, BindingResult bindingResult) throws Exception {
+        if (bindingResult.hasErrors()) {
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        List<BizBusinessIdentifyInfo> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = identifyInfoService.listByIds(request.getIds());
+        } else {
+            list = identifyInfoService.list(request);
+        }
+        for (BizBusinessIdentifyInfo record : list) {
+            DictCodeUtils.convertDictCodeToName(record);
+        }
+        super.exportExcel(BizBusinessIdentifyInfo.class, list, ExportEnum.IDENTIFY_EXPORT.getSheetName());
+    }
+
+
+    // TODO: 2023/8/23 查询设备信息，4个底部按钮查设备（按钮的作用就是前端用来调不同接口、用来区分中间即将展示的标识），前端弹窗选设备，在确定保存时前端根据底部按钮判断传入设备类型deviceType字典code
+    // TODO: 2023/8/23 接口：查受检设备（第1个按钮），查设备台账（后3个按钮同一接口），查询之后前端根据标志类型的不同加到中间页面时进行判断（按产品给的对应表）
+    // TODO: 2023/8/23 提供二维码接口，前端在加到中间页面时调用一下
+
+    @ApiOperation("设备二维码")
+    @PostMapping("/equipment/qrCode")
+    public ReturnDTO<String> equipmentQrCode(@RequestBody @Valid IdDTO idDTO) {
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return identifyInfoService.equipmentQrCode(idDTO.getId());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java
index 707be6e..7e0453d 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java
@@ -117,7 +117,7 @@
     }
 
     @ApiOperation("任务单导出")
-    @PostMapping("/export")
+    @PostMapping("/listExport")
     public void orderExport(@RequestBody @Valid OrderListRequest request, HttpServletResponse response) {
         businessOrderService.orderExport(request, response);
     }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java
index 529a6ce..51432be 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java
@@ -1,9 +1,28 @@
 package com.casic.missiles.controller.business;
 
+import com.casic.missiles.controller.GeneralApprovalController;
+import com.casic.missiles.dto.BaseApprovalSubmitRequest;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.business.outsource.OutsourceAssessApprovalListRequest;
+import com.casic.missiles.dto.business.outsource.OutsourceAssessSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
+import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.model.business.BizBusinessOutsourceAssess;
+import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
+import com.casic.missiles.service.IGeneralApprovalService;
+import com.casic.missiles.service.business.IBizBusinessOutsourceAssessService;
 import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.BindingResult;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.validation.Valid;
+import java.util.List;
+
 /**
  * <p>
  * 计量检定业务-分包管理-测试、校准或检定工作分包评审表 前端控制器
@@ -15,6 +34,27 @@
 @Api(tags = "分包管理-测试、校准或检定工作分包评审表")
 @RestController
 @RequestMapping("/business/outsource/assess")
-public class BizBusinessOutsourceAssessController {
+public class BizBusinessOutsourceAssessController extends GeneralApprovalController<BizBusinessOutsourceAssess, BizBusinessOutsourceAssess, OutsourceAssessApprovalListRequest, BaseApprovalSubmitRequest> {
+    @Autowired
+    private IBizBusinessOutsourceAssessService outsourceAssessService;
 
+    public BizBusinessOutsourceAssessController(IGeneralApprovalService<BizBusinessOutsourceAssess, BizBusinessOutsourceAssess, OutsourceAssessApprovalListRequest, BaseApprovalSubmitRequest> baseApprovalService) {
+        super(baseApprovalService);
+    }
+
+    @ApiOperation("草稿箱-保存")
+    @PostMapping("/save")
+    public ReturnDTO<OutsourceAssessSaveResponse> saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceAssess request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        return outsourceAssessService.saveOutsourceAssess(request);
+    }
+
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception {
+        List<BizBusinessOutsourceAssess> list = super.exportList(request);
+        super.exportExcel(BizBusinessOutsourceAssess.class, list, ExportEnum.OUTSOURCE_ASSESS.getSheetName());
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java
new file mode 100644
index 0000000..9adef18
--- /dev/null
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java
@@ -0,0 +1,60 @@
+package com.casic.missiles.controller.business;
+
+import com.casic.missiles.controller.GeneralApprovalController;
+import com.casic.missiles.dto.BaseApprovalSubmitRequest;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.business.outsource.OutsourceProtocolApprovalListRequest;
+import com.casic.missiles.dto.business.outsource.OutsourceProtocolSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
+import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.model.business.BizBusinessOutsourceProtocol;
+import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
+import com.casic.missiles.service.IGeneralApprovalService;
+import com.casic.missiles.service.business.IBizBusinessOutsourceProtocolService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.BindingResult;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.validation.Valid;
+import java.util.List;
+
+/**
+ * <p>
+ * 计量检定业务-分包管理-测试、校准或检定工作分包协议书 前端控制器
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-08-24
+ */
+@Api(tags = "分包管理-测试、校准或检定工作分包协议书")
+@RestController
+@RequestMapping("/business/outsource/protocol")
+public class BizBusinessOutsourceProtocolController extends GeneralApprovalController<BizBusinessOutsourceProtocol, BizBusinessOutsourceProtocol, OutsourceProtocolApprovalListRequest, BaseApprovalSubmitRequest> {
+    @Autowired
+    private IBizBusinessOutsourceProtocolService outsourceProtocolService;
+
+    public BizBusinessOutsourceProtocolController(IGeneralApprovalService<BizBusinessOutsourceProtocol, BizBusinessOutsourceProtocol, OutsourceProtocolApprovalListRequest, BaseApprovalSubmitRequest> baseApprovalService) {
+        super(baseApprovalService);
+    }
+
+    @ApiOperation("草稿箱-保存")
+    @PostMapping("/save")
+    public ReturnDTO<OutsourceProtocolSaveResponse> saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceProtocol request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        return outsourceProtocolService.saveOutsourceProtocol(request);
+    }
+
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody OutsourceProtocolApprovalListRequest request) throws Exception {
+        List<BizBusinessOutsourceProtocol> list = super.exportList(request);
+        super.exportExcel(BizBusinessOutsourceProtocol.class, list, ExportEnum.OUTSOURCE_PROTOCOL.getSheetName());
+    }
+}
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java
index 097f645..f0f0943 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java
@@ -17,7 +17,6 @@
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.IGeneralApprovalService;
 import com.casic.missiles.service.business.IBizBusinessOutsourcerInfoService;
-import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -71,19 +70,8 @@
 
     @ApiOperation("分包方导出")
     @PostMapping("/listExport")
-    public void export(@RequestBody @Valid OutsourcerInfoApprovalListRequest request, BindingResult bindingResult) throws Exception {
-        if (bindingResult.hasErrors()) {
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        }
-        List<BizBusinessOutsourcerInfo> list;
-        if (!CollectionUtils.isEmpty(request.getIds())) {
-            list = outsourcerInfoService.listByIds(request.getIds());
-        } else {
-            list = outsourcerInfoService.list(request);
-        }
-        for (BizBusinessOutsourcerInfo record : list) {
-            DictCodeUtils.convertDictCodeToName(record);
-        }
+    public void export(@RequestBody OutsourcerInfoApprovalListRequest request) throws Exception {
+        List<BizBusinessOutsourcerInfo> list = super.exportList(request);
         super.exportExcel(BizBusinessOutsourcerInfo.class, list, ExportEnum.OUTSOURCER_EXPORT.getSheetName());
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java
index c2cbf9f..0410918 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java
@@ -17,11 +17,9 @@
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.IGeneralApprovalService;
 import com.casic.missiles.service.business.IBizBusinessSiteExecutiveInfoService;
-import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -60,7 +58,7 @@
         return siteExecutiveInfoService.saveSiteExecutiveInfo(siteExecutiveInfo);
     }
 
-    @ApiOperation("现场检测详情")
+    @ApiOperation("详情")
     @PostMapping("/detail")
     public ReturnDTO<SiteExecutiveDetailResponse> siteExecutiveDetail(@RequestBody @Valid IdDTO idDTO) throws Exception {
         Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
@@ -69,21 +67,10 @@
         return ReturnUtil.success(siteExecutiveInfoService.detail(idDTO.getId()));
     }
 
-    @ApiOperation("现场检测导出")
+    @ApiOperation("导出")
     @PostMapping("/listExport")
-    public void export(@RequestBody @Valid SiteExecutiveApprovalListRequest request, BindingResult bindingResult) throws Exception {
-        if (bindingResult.hasErrors()) {
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        }
-        List<SiteExecutiveApprovalListResponse> list;
-        if (!CollectionUtils.isEmpty(request.getIds())) {
-            list = siteExecutiveInfoService.listInfoByIds(request.getIds());
-        } else {
-            list = siteExecutiveInfoService.listInfo(request);
-        }
-        for (SiteExecutiveApprovalListResponse record : list) {
-            DictCodeUtils.convertDictCodeToName(record);
-        }
+    public void export(@RequestBody SiteExecutiveApprovalListRequest request) throws Exception {
+        List<SiteExecutiveApprovalListResponse> list = super.exportList(request);
         super.exportExcel(SiteExecutiveApprovalListResponse.class, list, ExportEnum.SITE_EXECUTIVE_EXPORT.getSheetName());
     }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
index 7e793cd..a92e209 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
@@ -55,7 +55,7 @@
 
     @ApiOperation("设备收发列表导出")
     @PostMapping("/export")
-    public void exportList(@RequestBody @Valid SampleDispatchListRequest request) throws IOException {
+    public void exportList(@RequestBody SampleDispatchListRequest request) throws IOException {
         List<SampleDispatchListResponse> list;
         if (!CollectionUtils.isEmpty(request.getIds())) {
             list = dispatchService.listByIds(request.getIds());
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java
index cdc77fc..d120fd4 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java
@@ -7,6 +7,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.business.labExecutive.*;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.business.IBusinessLabExecutiveInfoService;
@@ -14,6 +15,7 @@
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.*;
 
@@ -32,7 +34,7 @@
     @Autowired
     private IBusinessLabExecutiveInfoService labExecutiveInfoService;
 
-    @ApiOperation("实验室检测-部门检测-查询各状态列表（待检测、检测中、检测完）")
+    @ApiOperation("实验室任务-查询各状态列表（待检测、检测中、检测完）")
     @PostMapping("/deptExecutive/List")
     public ReturnDTO<PageInfoBT<SampleLabExecutiveListResponse>> queryDeptExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
@@ -43,10 +45,19 @@
         return ReturnUtil.success(super.packForBT(labExecutiveInfoService.deptLabExecutiveListPage(page, labExecutiveListRequest)));
     }
 
-    /**
-     * 实验室检测-我的检测-查询各状态列表（待检测、检测中、检测完）
-     */
-    @ApiOperation("实验室检测-我的检测-查询各状态列表（待检测、检测中、检测完）")
+    @ApiOperation("实验室任务导出")
+    @PostMapping("/deptExecutive/export")
+    public void deptExportList(@RequestBody @Valid SampleLabExecutiveListRequest request) throws Exception {
+        List<SampleLabExecutiveListResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = labExecutiveInfoService.deptLabExecutiveListByIds(request.getMeasureStatus(), request.getIds());
+        } else {
+            list = labExecutiveInfoService.deptLabExecutiveList(request);
+        }
+        super.exportExcel(SampleLabExecutiveListResponse.class, list, ExportEnum.DEPT_EXECUTIVE_TASK.getSheetName());
+    }
+
+    @ApiOperation("我的任务-查询各状态列表（待检测、检测中、检测完）")
     @PostMapping("/myExecutive/list")
     public ReturnDTO<PageInfoBT<SampleLabExecutiveListResponse>> queryMyExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
@@ -57,19 +68,25 @@
         return ReturnUtil.success(super.packForBT(labExecutiveInfoService.myLabExecutiveListPage(page, labExecutiveListRequest)));
     }
 
-    /**
-     * 实验室检测-我的检测-查询各状态样品数量（待检测、检测中、检测完）
-     */
-    @ApiOperation("实验室检测-我的检测-查询各状态样品数量（待检测、检测中、检测完）")
+    @ApiOperation("我的任务导出")
+    @PostMapping("/myExecutive/export")
+    public void exportList(@RequestBody @Valid SampleLabExecutiveListRequest request) throws Exception {
+        List<SampleLabExecutiveListResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = labExecutiveInfoService.myLabExecutiveListByIds(request.getMeasureStatus(), request.getIds());
+        } else {
+            list = labExecutiveInfoService.myLabExecutiveList(request);
+        }
+        super.exportExcel(SampleLabExecutiveListResponse.class, list, ExportEnum.MY_EXECUTIVE_TASK.getSheetName());
+    }
+
+    @ApiOperation("我的任务-查询各状态样品数量（待检测、检测中、检测完）")
     @GetMapping("/myExecutive/amount")
     public ReturnDTO<List<SampleAmountResponse>> queryMyExecutiveAmount() {
         return ReturnUtil.success(labExecutiveInfoService.myExecutiveAmount());
     }
 
-    /**
-     * 实验室检测-部门检测-分配（分配给具体人员）
-     */
-    @ApiOperation("实验室检测-部门检测-分配按钮（分配给具体人员）")
+    @ApiOperation("实验室任务-分配按钮（分配给具体人员）")
     @PostMapping("/deptExecutive/allocate")
     public ReturnDTO allocateStaff(@RequestBody @Valid SampleAllocateRequest sampleAllocateRequest, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -78,10 +95,7 @@
         return labExecutiveInfoService.allocateStaff(sampleAllocateRequest);
     }
 
-    /**
-     * 实验室检测-我的检测-检定人扫描收入（待检测->检测中）
-     */
-    @ApiOperation("实验室检测-我的检测-检定人扫描收入（待检测->检测中）")
+    @ApiOperation("我的任务-检定人扫描收入（待检测->检测中）")
     @PostMapping("/myExecutive/receive")
     public ReturnDTO sampleReceive(@RequestBody @Valid List<SampleOperateRequest> requestList, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -90,10 +104,7 @@
         return labExecutiveInfoService.sampleReceive(requestList);
     }
 
-    /**
-     * 实验室检测-负责人/检定人扫描检完（检测中->检测完）
-     */
-    @ApiOperation("实验室检测-负责人/检定人扫描检完（检测中->检测完）")
+    @ApiOperation("实验室任务-负责人/检定人扫描检完（检测中->检测完）")
     @PostMapping("/myExecutive/complete")
     public ReturnDTO sampleExecutiveComplete(@RequestBody @Valid List<SampleOperateRequest> requestList, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -102,10 +113,7 @@
         return labExecutiveInfoService.sampleExecutiveComplete(requestList);
     }
 
-    /**
-     * 实验室检测-部门检测/我的检测 编辑（只能修改应出具证书）
-     */
-    @ApiOperation("实验室检测-部门检测/我的检测 编辑（只能修改应出具证书）")
+    @ApiOperation("实验室任务/我的任务 编辑（只能修改应出具证书）")
     @PostMapping("/executive/update")
     public ReturnDTO updateExecutive(@RequestBody @Valid UpdateExecutiveRequest request, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -114,10 +122,7 @@
         return labExecutiveInfoService.updateExecutive(request);
     }
 
-    /**
-     * 实验室检测-部门检测/我的检测 详情
-     */
-    @ApiOperation("实验室检测-部门检测/我的检测 详情")
+    @ApiOperation("实验室任务/我的任务 详情")
     @PostMapping("/executive/detail")
     public ReturnDTO<ExecutiveDetailResponse> executiveDetail(@RequestBody @Valid ExecutiveDetailRequest request, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
@@ -131,7 +136,7 @@
      * 退回后会将下一个要执行的实验室检测状态更新为待分配，将后面的实验室顺序变更为连续（都进行减1）
      * 最后一个检测的实验室退回，等分发员再增加实验室或设备收发中的已收入直接手动点击完成
      */
-    @ApiOperation("实验室检测-部门检测/我的检测 退回（待检测/检测中->退回）")
+    @ApiOperation("实验室任务/我的任务 退回（待检测/检测中->退回）")
     @PostMapping("/executive/sendBack")
     public ReturnDTO executiveSendBack(@RequestBody @Valid ExecutiveSendBackRequest request, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -140,9 +145,6 @@
         return labExecutiveInfoService.sampleExecutiveSendBack(request);
     }
 
-    /**
-     * 分发员编辑实验室检测列表
-     */
     @ApiOperation("分发员编辑实验室检测列表")
     @PostMapping("/handOut/updateList")
     public ReturnDTO updateExecutiveList(@RequestBody @Valid UpdateExecutiveListRequest request, BindingResult bindingResult) {
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java
index 48a67ed..0c04f31 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java
@@ -10,6 +10,7 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.resource.customer.CustomerApprovalListRequest;
 import com.casic.missiles.dto.resource.customer.CustomerSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceCustomerInfo;
@@ -26,6 +27,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -55,6 +57,13 @@
         return customerInfoService.saveCustomerInfo(request);
     }
 
+    @ApiOperation("委托方名录导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody CustomerApprovalListRequest request) throws Exception {
+        List<BizResourceCustomerInfo> list = super.exportList(request);
+        super.exportExcel(BizResourceCustomerInfo.class, list, ExportEnum.CUSTOMER_INFO.getSheetName());
+    }
+
     @ApiOperation("委托方人员列表（分页）")
     @PostMapping("/person/listPage")
     public ReturnDTO<PageInfoBT<BizResourceCustomerStaff>> personListPage(@RequestBody IdDTO idDto) {
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
index 972ed4b..6418ea5 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
@@ -5,6 +5,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.resource.customer.SuggestFormApprovalListRequest;
 import com.casic.missiles.dto.resource.customer.SuggestFormSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceCustomerSuggestForm;
@@ -20,6 +21,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -50,4 +52,11 @@
         return suggestFormService.saveSuggestForm(request);
     }
 
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody SuggestFormApprovalListRequest request) throws Exception {
+        List<BizResourceCustomerSuggestForm> list = super.exportList(request);
+        super.exportExcel(BizResourceCustomerSuggestForm.class, list, ExportEnum.CUSTOMER_SUGGEST_FORM.getSheetName());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java
index 1934d1a..9e07eab 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java
@@ -15,12 +15,16 @@
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.resource.IEnvEnvironmentRecordConfigService;
 import com.casic.missiles.service.resource.IEnvEnvironmentRecordDataService;
+import com.casic.missiles.service.resource.IEnvLocationInfoService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
 import java.util.List;
@@ -39,6 +43,8 @@
     private IEnvEnvironmentRecordDataService environmentRecordDataService;
     @Autowired
     private IEnvEnvironmentRecordConfigService environmentRecordConfigService;
+    @Autowired
+    private IEnvLocationInfoService locationInfoService;
 
     @ApiOperation("环境记录单数据列表/详情")
     @PostMapping("/data/listPage")
@@ -95,4 +101,11 @@
         });
         return environmentRecordConfigService.deleteEnvironmentRecordConfig(idDTO.getId());
     }
+
+    @ApiOperation("地点列表")
+    @PostMapping("/location/listPage")
+    public ReturnDTO<PageInfoBT<LocationListResponse>> locationListPage(@RequestBody @Valid LocationListRequest request) {
+        Page<LocationListResponse> page = PageFactory.defaultPage();
+        return ReturnUtil.success(super.packForBT(locationInfoService.listPage(page, request)));
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java
index 82efe3f..e9561fa 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java
@@ -10,6 +10,7 @@
 import com.casic.missiles.dto.resource.seal.SealLogListRequest;
 import com.casic.missiles.dto.resource.seal.SealNoteApprovalListRequest;
 import com.casic.missiles.dto.resource.seal.SealNoteSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceSealUseLog;
@@ -27,6 +28,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -58,6 +60,13 @@
         return sealUseNoteService.saveSeal(request);
     }
 
+    @ApiOperation("印章使用登记导出（列表和导出中去掉经办人和监印人）")
+    @PostMapping("/listExport")
+    public void export(@RequestBody SealNoteApprovalListRequest request) throws Exception {
+        List<BizResourceSealUseNote> list = super.exportList(request);
+        super.exportExcel(BizResourceSealUseNote.class, list, ExportEnum.SEAL_NOTE.getSheetName());
+    }
+
     // TODO: 2023/7/28 印章使用日志：系统中使用印章时插入数据库
 
     @ApiOperation("印章使用日志列表（分页）")
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java
index 9b674fc..06b6521 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java
@@ -9,16 +9,20 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.resource.staff.StaffCertRequest;
 import com.casic.missiles.dto.resource.staff.StaffCertResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.service.resource.IBizResourceStaffInfoService;
 import com.casic.missiles.service.resource.IBizResourceStaffVerifierService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.List;
+
 /**
  * @Description:
  * @Author: wangpeng
@@ -41,9 +45,21 @@
         return ReturnUtil.success(super.packForBT(responsePage));
     }
 
+    @ApiOperation("证书逾期提醒导出")
+    @PostMapping("/listExport")
+    public void exportList(@RequestBody StaffCertRequest request) throws Exception {
+        List<StaffCertResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = staffInfoService.certListByIds(request.getIds());
+        } else {
+            list = staffInfoService.certList(request);
+        }
+        super.exportExcel(StaffCertResponse.class, list, ExportEnum.STAFF_CERTIFICATE_EXPIRE.getSheetName());
+    }
+
     @ApiOperation("证书逾期提醒")
     @PostMapping("/expirationReminder")
-    public ReturnDTO expirationReminder(@RequestBody IdDTO idDto) {
-        return verifierService.expirationReminder(idDto);
+    public ReturnDTO expirationReminder(@RequestBody IdDTO idDTO) {
+        return verifierService.expirationReminder(idDTO);
     }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java
index 3b251ad..a6e7850 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java
@@ -12,6 +12,7 @@
 import com.casic.missiles.dto.resource.staff.StaffListRequest;
 import com.casic.missiles.dto.resource.staff.TrainListRequest;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.*;
@@ -22,7 +23,10 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
 import java.util.List;
@@ -52,8 +56,19 @@
             throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
         }
         Page<BizResourceStaffInfo> page = PageFactory.defaultPage();
-        Page<BizResourceStaffInfo> responsePage = staffInfoService.listPage(page, request);
-        return ReturnUtil.success(super.packForBT(responsePage));
+        return ReturnUtil.success(super.packForBT(staffInfoService.listPage(page, request)));
+    }
+
+    @ApiOperation("人员登记导出")
+    @PostMapping("/listExport")
+    public void exportList(@RequestBody StaffListRequest request) throws Exception {
+        List<BizResourceStaffInfo> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = staffInfoService.listByIds(request.getIds());
+        } else {
+            list = staffInfoService.list(request);
+        }
+        super.exportExcel(BizResourceStaffInfo.class, list, ExportEnum.STAFF_INFO.getSheetName());
     }
 
     @ApiOperation("人员登记详情基础信息")
@@ -85,9 +100,9 @@
 
     @ApiOperation("科研教育列表（分页）")
     @PostMapping("/education/listPage")
-    public ReturnDTO<PageInfoBT<BizResourceStaffEducation>> educationListPage(@RequestBody IdDTO idDto) {
+    public ReturnDTO<PageInfoBT<BizResourceStaffEducation>> educationListPage(@RequestBody IdDTO idDTO) {
         Page<BizResourceStaffEducation> page = PageFactory.defaultPage();
-        Page<BizResourceStaffEducation> responsePage = staffInfoService.educationListPage(page, idDto);
+        Page<BizResourceStaffEducation> responsePage = staffInfoService.educationListPage(page, idDTO);
         return ReturnUtil.success(super.packForBT(responsePage));
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java
index af6aa86..d85d84a 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java
@@ -9,6 +9,7 @@
 import com.casic.missiles.dto.resource.outsideService.SupplierApprovalListRequest;
 import com.casic.missiles.dto.resource.outsideService.SupplierSaveResponse;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceSupplierAbility;
@@ -67,6 +68,13 @@
         return ReturnUtil.success(supplierInfoService.detail(idDTO.getId()));
     }
 
+    @ApiOperation("合格供方导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody SupplierApprovalListRequest request) throws Exception {
+        List<BizResourceSupplierInfo> list = super.exportList(request);
+        super.exportExcel(BizResourceSupplierInfo.class, list, ExportEnum.SUPPLIER_INFO.getSheetName());
+    }
+
     @ApiOperation("供方人员列表（分页）")
     @PostMapping("/person/listPage")
     public ReturnDTO<PageInfoBT<BizResourceSupplierPerson>> personListPage(@RequestBody IdDTO idDTO) {
diff --git a/casic-metering-api/src/main/resources/config/application.yml b/casic-metering-api/src/main/resources/config/application.yml
index 350db5f..ecff521 100644
--- a/casic-metering-api/src/main/resources/config/application.yml
+++ b/casic-metering-api/src/main/resources/config/application.yml
@@ -126,7 +126,7 @@
     #作者
     author: wangpeng
     #待生成对象表名
-    table-name: biz_equipment_technical_target_approval,biz_equipment_attachment_approval,biz_equipment_checkpoint_approval
+    table-name: biz_business_outsource_protocol
 
 reminder:
   #节点--common模块config包 ReminderNodeConfig配置
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
index 4a19e4e..d47d552 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
@@ -53,6 +53,7 @@
     SUGGEST_FORM_SAVE_FAILED(2509, "委托方意见登记表保存至草稿箱失败"),
     EXAMINE_FORM_SAVE_FAILED(2510, "要求、委托书及合同评审表保存至草稿箱失败"),
     CUSTOMER_EXIST_SAVE_FAILED(2511, "该委托方已存在，请重新选择"),
+    DUPLICATE_LOCATION_NO(2512, "地点编号已存在"),
 
     /**
      * 计量检定业务模块
@@ -68,6 +69,8 @@
     COMPLETE_SAMPLE_NOT_EXIST(2609, "检测中不存在扫描收入的样品"),
     CANNOT_CHANGE_MEASURE_INFO(2610, "无法更改非当前登录用户的检测信息"),
     NON_EXIST_ORDER_OR_SAMPLE(2611, "不存在该委托单或该委托单下的样品"),
+    OUTSOURCE_ACCESS_SAVE_FAILED(2612, "测试、校准或检定工作分包评审表保存至草稿箱失败"),
+    OUTSOURCE_PROTOCOL_SAVE_FAILED(2613, "测试、校准或检定工作分包协议书保存至草稿箱失败"),
 
     /**
      * 历史遗留备用
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
index 5089ad1..81a406b 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
@@ -10,54 +10,38 @@
     /**
      * 资源管理
      */
-    ENVIRONMENT_DATA_EXPORT("environmentData", "environmentData", "环境记录单数据"),
+    ENVIRONMENT_DATA_EXPORT("environmentData", "环境记录单数据", "环境记录单数据"),
+    STAFF_INFO("staffInfo", "人员登记", "人员登记"),
+    STAFF_CERTIFICATE_EXPIRE("certificateExpire", "证书逾期提醒", "证书逾期提醒"),
+    SUPPLIER_INFO("supplierInfo", "合格供方名录", "合格供方名录"),
+    CUSTOMER_INFO("customerInfo", "委托方名录", "委托方名录"),
+    CUSTOMER_SUGGEST_FORM("customerSuggestForm", "委托方意见登记表", "委托方意见登记表"),
+    SEAL_NOTE("sealNote", "印章使用登记", "印章使用登记"),
 
-    FILE_EXPORT("meterFileData", "meterFileData", "计量文件信息"),
-    TRAIN_PLAN_EXPORT("trainPlanData", "trainPlanData", "培训计划"),
-    TRAIN_LOG_EXPORT("trainLogData", "trainLogData", "培训记录"),
-    METER_ORGANIZE_EXPORT("meterOrganizeData", "meterOrganizeData", "计量组织"),
-    TRACE_SUPPLIER_EXPORT("traceSupplierData", "traceSupplierData", "溯源供方"),
-    SIGN_EXPORT("signData", "signData", "签名/签章"),
-    TEMPLATE_EXPORT("templateData", "templateData", "原始记录模板/证书报告模板"),
-    FIXED_ASSETS("meterFixedAssets", "meterFixedAssets", "固定资产"),
-    METER_EQUIPMENT("meterEquipment", "meterEquipment", "测量设备"),
-    CALIBRATION_TEST_EQUIPMENT("calibrationTestEquipment", "calibrationTestEquipment", "校准检定设备"),
-    MEASURE_ACCOUNT("measureAccount", "measureAccount", "测量工装"),
-    STANDARD_SUPPORT_EQUIPMENT("standardSupportEquipment", "standardSupportEquipment", "标准配套设备"),
-    STANDARD_EQUIPMENT("standardEquipment", "standardEquipment", "标准装置"),
-    FLOW_DEF_EXPORT("flowDefData", "flowDefData", "流程定义"),
-    STAFF_CERTIFICATE("certificate", "certificate", "计量人员证书"),
-    CHECK_INFO("checkInfo", "checkInfo", "设备管理点检测"),
-    EQUIPMENT_APPLY("equipmentApply", "equipmentApply", "设备借用"),
-    STANDARD_EQUIPMENT_REMIND("equipmentApplyRemind", "equipmentApplyRemind", "标准装置到期提醒"),
-    METER_PRICE("meterPrice", "meterPrice", "价格库"),
-    METER_STAFF("meterStaff", "meterStaff", "计量人员"),
-    STANDARD_EQUIPMENT_APPLY("standardEquipmentApply", "standardEquipmentApply", "标准装置申请"),
-    STATE_MANAGE_APPLY("stateManage", "stateManage", "状态管理"),
-    METER_ACCEPTANCE_CHECK("acceptanceCheck", "acceptanceCheck", "设备检修保养验收单"),
-    CUSTOMER_EXPORT("customerData", "customerData", "客户信息"),
-    ORDER_EXPORT("orderData", "orderData", "委托书信息"),
-    SAMPLE_EXPORT("sampleData", "sampleData", "样本信息"),
-    EXCHANGE_DATA("exchangeData", "exchangeData", "设备交接单"),
-    DISPATCH_DATA("dispatchData", "dispatchData", "设备收发"),
-    ENVIRONMENT_DATA("environmentData", "environmentData", "环境记录单"),
-    ORIGIN_DATA("originData", "originData", "原始记录"),
-    CERTIFICATE_REPORT("certificateReport", "certificateReport", "证书报告"),
-    ADVICE_EXPORT("adviceData", "adviceData", "客户反馈"),
-    HANDOUT_EXPORT("handoutData", "handoutData", "任务分发列表"),
-    OUTSOURCER_EXPORT("outsourcerData", "outsourcerData", "分包方"),
-    SITE_EXECUTIVE_EXPORT("siteExecutiveData", "siteExecutiveData", "现场测试、校准或检定"),
-    CERTIFICATE_PRINT_EXPORT("certificatePrintData", "certificatePrintData", "证书打印"),
-    DOWNLOAD_TEMPLATE("downloadTemplate", "downloadTemplate", "页面配置"),
-    OUTSOURCER_CERTIFICATE_EXPORT("outsourceCertificateData", "outsourceCertificateData", "分包证书"),
-    SETTLEMENT_INFO_EXPORT("settlementInfoData", "settlementInfoData", "业务结算"),
-    EQUIPMENT_REMIND("equipmentRemind", "equipmentRemind", "设备到期提醒"),
-    AGREEMENT_INFO_EXPORT("agreementInfoData", "agreementInfoData", "合同"),
-    WORK_STATISTICS_EXPORT("workStatisticsData", "workStatisticsData", "实时工作统计"),
-    DEPT_OUTPUT_EXPORT("deptOutputData", "deptOutputData", "部门产值分析"),
-    WORKLOAD_EXPORT("workloadData", "workloadData", "业务工作量分析"),
-    DEPT_COMPREHENSIVE_EXPORT("deptComprehensiveData", "deptComprehensiveData", "部门综合分析"),
-    ENVIRONMENTAL_RECORD("environmentalRecordData", "environmentalRecordData", "现场环境记录");
+    /**
+     * 计量检定业务
+     */
+    OUTSOURCER_EXPORT("outsourcerData", "分包方名录", "分包方名录"),
+    IDENTIFY_EXPORT("identifyData", "计量标识", "计量标识"),
+    ORDER_EXPORT("orderData", "任务单", "任务单"),
+    DISPATCH_DATA("dispatchData", "设备收发", "设备收发"),
+    HANDOUT_EXPORT("handoutData", "任务分发", "任务分发"),
+    SITE_EXECUTIVE_EXPORT("siteExecutiveData", "现场测试、校准或检定", "现场测试、校准或检定"),
+    CERTIFICATE_REPORT("certificateReport", "证书审批", "证书审批"),
+    CERTIFICATE_CHANGE_APPLY("certificateChangeApply", "证书报告补充或更换申请单", "证书报告补充或更换申请单"),
+    CERTIFICATE_PRINT("certificatePrintData", "证书打印审批", "证书打印审批"),
+    DEPT_EXECUTIVE_TASK("deptExecutiveTaskData", "实验室任务", "实验室任务"),
+    MY_EXECUTIVE_TASK("myExecutiveTaskData", "我的任务", "我的任务"),
+    OUTSOURCE_ASSESS("outsourceAssess", "测试、校准或检定工作分包评审表", "测试、校准或检定工作分包评审表"),
+    OUTSOURCE_PROTOCOL("outsourceProtocol", "测试、校准或检定工作分包协议书", "测试、校准或检定工作分包协议书"),
+
+    /**
+     * 系统管理
+     */
+    SIGN_EXPORT("signData", "签名", "签名"),
+    TEMPLATE_EXPORT("templateData", "文件模板", "文件模板"),
+    FLOW_DEF_EXPORT("flowDefData", "流程定义", "流程定义"),
+    DOWNLOAD_TEMPLATE("downloadTemplate", "流程定义", "页面配置");
 
     ExportEnum(String fileName, String sheetName, String description) {
         this.fileName = fileName;
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateRecordTypeCodeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateRecordTypeCodeEnum.java
index 31d913c..a963522 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateRecordTypeCodeEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateRecordTypeCodeEnum.java
@@ -46,4 +46,14 @@
     String SITE_EXECUTIVE_APPROVAL = "01";
     //《现场测试、校准或检定工作记录表》
     String SITE_EXECUTIVE_LOG = "02";
+
+    //测试、校准或检定工作分包协议书
+    String OUTSOURCE_PROTOCOL = "01";
+    //测试、校准或检定工作分包评审表
+    String OUTSOURCE_ACCESS = "02";
+    //测试、校准或检定工作分包通知书
+    String OUTSOURCE_NOTICE = "03";
+    //测试、校准或检定工作分包方名录
+    String OUTSOURCE_INFO = "04";
+
 }
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
index 24b8635..f78bd53 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
@@ -15,6 +15,10 @@
     String CERTIFICATE_CHANGE_APPLY_BEAN_NAME = "certificateChangeApplyBean";
     //现场测试、校准或检定
     String SITE_EXECUTIVE_BEAN_NAME = "siteExecutiveBean";
+    //测试、校准或检定工作分包评审表
+    String OUTSOURCE_ASSESS_BEAN_NAME = "outsourceAssessBean";
+    //测试、校准或检定工作分包协议书
+    String OUTSOURCE_PROTOCOL_BEAN_NAME = "outsourceProtocolBean";
 
     /*********************************设备与装置************************************/
     //设备台账
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 b21c661..6b86fd1 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
@@ -18,6 +18,8 @@
     OUTSOURCER_APPROVAL(OUTSOURCER_BEAN_NAME, ""),
     CERTIFICATE_CHANGE_APPROVAL(CERTIFICATE_CHANGE_APPLY_BEAN_NAME, ""),
     SITE_EXECUTIVE_APPROVAL(SITE_EXECUTIVE_BEAN_NAME, ""),
+    OUTSOURCE_ASSESS_APPROVAL(OUTSOURCE_ASSESS_BEAN_NAME, ""),
+    OUTSOURCE_PROTOCOL_APPROVAL(OUTSOURCE_PROTOCOL_BEAN_NAME, ""),
 
     ACTION_STATUS_MAP(new HashMap<String, AwareActionStatusEnum>() {
         {
@@ -47,6 +49,10 @@
             put(ApplyFromIdEnum.CERTIFICATE_CHANGE_APPROVAL.getCode(), CERTIFICATE_CHANGE_APPROVAL);
             //现场测试、校准或检定审批
             put(ApplyFromIdEnum.SITE_EXECUTIVE_APPROVAL.getCode(), SITE_EXECUTIVE_APPROVAL);
+            //测试、校准或检定工作分包评审表
+            put(ApplyFromIdEnum.OUTSOURCE_ASSESS_APPROVAL.getCode(), OUTSOURCE_ASSESS_APPROVAL);
+            //测试、校准或检定工作分包协议书
+            put(ApplyFromIdEnum.OUTSOURCE_PROTOCOL_APPROVAL.getCode(), OUTSOURCE_PROTOCOL_APPROVAL);
         }
     });
     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 934405e..c7410bd 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
@@ -9,6 +9,8 @@
     CERTIFICATE_CHANGE_APPROVAL("jljdywzsbchghsqd", MessageSourceModuleEnum.BUSINESS.getCode(), "证书/报告补充或更换申请单"),
     OUTSOURCER_APPROVAL("jljdywcsjzhgfbfml", MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定合格分包方名录"),
     SITE_EXECUTIVE_APPROVAL("jljdywxccsjzsp", MessageSourceModuleEnum.BUSINESS.getCode(), "现场测试、校准或检定审批"),
+    OUTSOURCE_ASSESS_APPROVAL("jljdywcsjzfbpsb", MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包评审表"),
+    OUTSOURCE_PROTOCOL_APPROVAL("jljdywcsjzfbxys", MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包协议书"),
 
 
     /*******************************************设备与装置*********************************************/
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/GeneralApprovalMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/GeneralApprovalMapper.java
index 4fb7344..0c9d6ae 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/GeneralApprovalMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/GeneralApprovalMapper.java
@@ -17,8 +17,4 @@
 
     Page<O> selectBatchForApprovalList(Page<O> page, @Param("request") R request, @Param("businessKeys") List<String> businessKeys);
 
-//    Page<O> selectListPage(Page<O> page, @Param("request") R request);
-
-//    Long selectMaxNo();
-
 }
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceAssessMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceAssessMapper.java
index 7867bb8..ba59009 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceAssessMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceAssessMapper.java
@@ -1,7 +1,12 @@
 package com.casic.missiles.mapper.business;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.business.outsource.OutsourceAssessApprovalListRequest;
+import com.casic.missiles.mapper.GeneralApprovalMapper;
 import com.casic.missiles.model.business.BizBusinessOutsourceAssess;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * <p>
@@ -11,6 +16,10 @@
  * @author wangpeng
  * @since 2023-08-16
  */
-public interface BizBusinessOutsourceAssessMapper extends BaseMapper<BizBusinessOutsourceAssess> {
+public interface BizBusinessOutsourceAssessMapper extends GeneralApprovalMapper<BizBusinessOutsourceAssess, BizBusinessOutsourceAssess, OutsourceAssessApprovalListRequest> {
+
+    Page<BizBusinessOutsourceAssess> selectBatchForApprovalList(Page<BizBusinessOutsourceAssess> page, @Param("request") OutsourceAssessApprovalListRequest request, @Param("businessKeys") List<String> businessKeys);
+
+    Long selectMaxProjectNo();
 
 }
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceProtocolMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceProtocolMapper.java
new file mode 100644
index 0000000..e6aba35
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceProtocolMapper.java
@@ -0,0 +1,24 @@
+package com.casic.missiles.mapper.business;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.business.outsource.OutsourceProtocolApprovalListRequest;
+import com.casic.missiles.mapper.GeneralApprovalMapper;
+import com.casic.missiles.model.business.BizBusinessOutsourceProtocol;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 计量检定业务-分包管理-测试、校准或检定工作分包协议书 Mapper 接口
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-08-24
+ */
+public interface BizBusinessOutsourceProtocolMapper extends GeneralApprovalMapper<BizBusinessOutsourceProtocol, BizBusinessOutsourceProtocol, OutsourceProtocolApprovalListRequest> {
+
+    Page<BizBusinessOutsourceProtocol> selectBatchForApprovalList(Page<BizBusinessOutsourceProtocol> page, @Param("request") OutsourceProtocolApprovalListRequest request, @Param("businessKeys") List<String> businessKeys);
+
+    Long selectMaxProtocolNo();
+}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/EnvLocationInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/EnvLocationInfoMapper.java
new file mode 100644
index 0000000..49eff87
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/EnvLocationInfoMapper.java
@@ -0,0 +1,21 @@
+package com.casic.missiles.mapper.resource;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.resource.environment.LocationListRequest;
+import com.casic.missiles.dto.resource.environment.LocationListResponse;
+import com.casic.missiles.model.resource.EnvLocationInfo;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * <p>
+ * 实验室环境监控系统-设备表 Mapper 接口
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-06-07
+ */
+public interface EnvLocationInfoMapper extends BaseMapper<EnvLocationInfo> {
+
+    Page<LocationListResponse> selectLocationListPage(Page<LocationListResponse> page, @Param("request") LocationListRequest request);
+}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java
index de124db..85ed0f7 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java
@@ -1,7 +1,9 @@
 package com.casic.missiles.mapper.system;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.dto.system.SignDetailResponse;
+import com.casic.missiles.dto.system.SignListRequest;
 import com.casic.missiles.model.system.SystemSign;
 import org.apache.ibatis.annotations.Param;
 
@@ -22,4 +24,8 @@
     SignDetailResponse selectSignDetailById(Long id);
 
     List<SystemSign> selectUsableSignList(@Param("userId") Long userId);
+
+    Page<SystemSign> selectSignListPage(Page<SystemSign> page, @Param("request") SignListRequest request);
+
+    List<SystemSign> selectSignList(@Param("request") SignListRequest request);
 }
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateChangeApplyMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateChangeApplyMapper.xml
index d798447..c496092 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateChangeApplyMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateChangeApplyMapper.xml
@@ -30,31 +30,31 @@
         SELECT *
         FROM biz_business_certificate_change_apply
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.changeApplyNo != null and request.changeApplyNo !=''">
+        <if test="request != null and request.changeApplyNo != null and request.changeApplyNo !=''">
             and change_apply_no like concat('%',#{request.changeApplyNo},'%')
         </if>
-        <if test="request.changeReportNo != null and request.changeReportNo !=''">
+        <if test="request != null and request.changeReportNo != null and request.changeReportNo !=''">
             and change_report_no like concat('%',#{request.changeReportNo},'%')
         </if>
-        <if test="request.changeReportName != null and request.changeReportName !=''">
+        <if test="request != null and request.changeReportName != null and request.changeReportName !=''">
             and change_report_name like concat('%',#{request.changeReportName},'%')
         </if>
-        <if test="request.changeType != null and request.changeType !=''">
+        <if test="request != null and request.changeType != null and request.changeType !=''">
             and change_type = #{request.changeType}
         </if>
-        <if test="request.createUserName != null and request.createUserName !=''">
+        <if test="request != null and request.createUserName != null and request.createUserName !=''">
             and create_user_name like concat('%',#{request.createUserName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificatePrintMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificatePrintMapper.xml
index b66cd99..49c0ac8 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificatePrintMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificatePrintMapper.xml
@@ -31,34 +31,34 @@
         LEFT JOIN biz_business_order_sample_relation bosr ON (bosr.order_id = bcr.order_id AND bosr.sample_id = bcr.sample_id)
         LEFT JOIN biz_business_order_info boi ON boi.id = bosr.order_id
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and bcp.approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.printStatus != null and request.printStatus !=''">
+        <if test="request != null and request.printStatus != null and request.printStatus !=''">
             and print_status = #{request.printStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and bcp.create_user_id = #{request.createUserId}
         </if>
-        <if test="request.certificateReportNo != null and request.certificateReportNo !=''">
+        <if test="request != null and request.certificateReportNo != null and request.certificateReportNo !=''">
             and bcr.certificate_report_no like concat('%',#{request.certificateReportNo},'%')
         </if>
-        <if test="request.certificateReportName != null and request.certificateReportName !=''">
+        <if test="request != null and request.certificateReportName != null and request.certificateReportName !=''">
             and bcr.certificate_report_name like concat('%',#{request.certificateReportName},'%')
         </if>
-        <if test="request.customerName != null and request.customerName !=''">
+        <if test="request != null and request.customerName != null and request.customerName !=''">
             and boi.customer_name like concat('%',#{request.customerName},'%')
         </if>
-        <if test="request.sampleNo != null and request.sampleNo !=''">
+        <if test="request != null and request.sampleNo != null and request.sampleNo !=''">
             and bosr.sample_no like concat('%',#{request.sampleNo},'%')
         </if>
-        <if test="request.sampleName != null and request.sampleName !=''">
+        <if test="request != null and request.sampleName != null and request.sampleName !=''">
             and bosr.sample_name like concat('%',#{request.sampleName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and bcp.create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and bcp.create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml
index b366034..767695d 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml
@@ -46,33 +46,37 @@
         SELECT bcr.*, bosr.sample_no, bosr.sample_name, bosr.sample_model, rsi.staff_name
         FROM biz_business_certificate_report bcr
         LEFT JOIN biz_business_order_sample_relation bosr ON (bosr.order_id = bcr.order_id AND bosr.sample_id = bcr.sample_id)
+        LEFT JOIN biz_business_order_info boi ON boi.id = bcr.order_id
         LEFT JOIN biz_resource_staff_info rsi ON rsi.id = bcr.measure_person_id
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and bcr.approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and bcr.create_user_id = #{request.createUserId}
         </if>
-        <if test="request.certificateReportNo != null and request.certificateReportNo !=''">
+        <if test="request != null and request.customerId != null and request.customerId !=''">
+            and boi.customer_id = #{request.customerId}
+        </if>
+        <if test="request != null and request.certificateReportNo != null and request.certificateReportNo !=''">
             and bcr.certificate_report_no like concat('%',#{request.certificateReportNo},'%')
         </if>
-        <if test="request.certificateReportName != null and request.certificateReportName !=''">
+        <if test="request != null and request.certificateReportName != null and request.certificateReportName !=''">
             and bcr.certificate_report_name like concat('%',#{request.certificateReportName},'%')
         </if>
-        <if test="request.sampleNo != null and request.sampleNo !=''">
+        <if test="request != null and request.sampleNo != null and request.sampleNo !=''">
             and bosr.sample_no like concat('%',#{request.sampleNo},'%')
         </if>
-        <if test="request.measureCategory != null and request.measureCategory !=''">
+        <if test="request != null and request.measureCategory != null and request.measureCategory !=''">
             and bcr.measure_category = #{request.measureCategory}
         </if>
-        <if test="request.measurePerson != null and request.measurePerson !=''">
+        <if test="request != null and request.measurePerson != null and request.measurePerson !=''">
             and rsi.staff_name like concat('%',#{request.measurePerson},'%')
         </if>
-        <if test="request.calibrationTimeStart != null and request.calibrationTimeStart !=''">
+        <if test="request != null and request.calibrationTimeStart != null and request.calibrationTimeStart !=''">
             and bcr.calibration_time &gt;= #{request.calibrationTimeStart}
         </if>
-        <if test="request.calibrationTimeEnd != null and request.calibrationTimeEnd !=''">
+        <if test="request != null and request.calibrationTimeEnd != null and request.calibrationTimeEnd !=''">
             and bcr.calibration_time &lt;= #{request.calibrationTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceAssessMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceAssessMapper.xml
index d0fcf8b..c22c101 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceAssessMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceAssessMapper.xml
@@ -7,6 +7,8 @@
         <id column="id" property="id" />
         <result column="project_no" property="projectNo" />
         <result column="project_name" property="projectName" />
+        <result column="lab_code" property="labCode" />
+        <result column="group_code" property="groupCode" />
         <result column="applicant_id" property="applicantId" />
         <result column="applicant_name" property="applicantName" />
         <result column="applicant_time" property="applicantTime" />
@@ -31,7 +33,45 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, project_no, project_name, applicant_id, applicant_name, applicant_time, minio_file_name, remark, create_user_id, create_user_name, outsourcer_id, pre_start_time, pre_end_time, outsource_reason, pre_cost, approval_status, process_id, approve_situation, traceability, test_method, technique_ability, create_time, update_time
+        id, project_no, project_name, lab_code, group_code, applicant_id, applicant_name, applicant_time, minio_file_name, remark, create_user_id, create_user_name, outsourcer_id, pre_start_time, pre_end_time, outsource_reason, pre_cost, approval_status, process_id, approve_situation, traceability, test_method, technique_ability, create_time, update_time
     </sql>
 
+    <select id="selectMaxProjectNo" resultType="java.lang.Long">
+        SELECT IFNULL(max(RIGHT(project_no, 3)), 0) from biz_business_outsource_assess
+    </select>
+
+    <select id="selectBatchForApprovalList" resultMap="BaseResultMap">
+        SELECT bboa.*, bboi.outsourcer_name, bboi.director
+        FROM biz_business_outsource_assess bboa
+        LEFT JOIN biz_business_outsourcer_info bboi ON bboa.outsourcer_id = bboi.id
+        WHERE 1=1
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
+            and bboa.approval_status = #{request.approvalStatus}
+        </if>
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
+            and bboa.create_user_id = #{request.createUserId}
+        </if>
+        <if test="request != null and request.projectNo != null and request.projectNo !=''">
+            and bboa.project_no like concat('%',#{request.projectNo},'%')
+        </if>
+        <if test="request != null and request.outsourcerName != null and request.outsourcerName !=''">
+            and bboi.outsourcer_name like concat('%',#{request.outsourcerName},'%')
+        </if>
+        <if test="request != null and request.applicantName != null and request.applicantName !=''">
+            and bboa.applicant_name like concat('%',#{request.applicantName},'%')
+        </if>
+        <if test="request != null and request.applicantTimeStart != null and request.applicantTimeStart !=''">
+            and bboa.applicant_time &gt;= #{request.applicantTimeStart}
+        </if>
+        <if test="request != null and request.applicantTimeEnd != null and request.applicantTimeEnd !=''">
+            and bboa.applicant_time &lt;= #{request.applicantTimeEnd}
+        </if>
+        <if test="businessKeys != null">
+            and bboa.id in
+            <foreach collection="businessKeys" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
+        ORDER BY bboa.create_time DESC
+    </select>
 </mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceProtocolMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceProtocolMapper.xml
new file mode 100644
index 0000000..b7b2149
--- /dev/null
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceProtocolMapper.xml
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.mapper.business.BizBusinessOutsourceProtocolMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.business.BizBusinessOutsourceProtocol">
+        <id column="id" property="id" />
+        <result column="protocol_no" property="protocolNo" />
+        <result column="project_name" property="projectName" />
+        <result column="lab_code" property="labCode" />
+        <result column="group_code" property="groupCode" />
+        <result column="outsourcer_id" property="outsourcerId" />
+        <result column="remark" property="remark" />
+        <result column="outsource_no" property="outsourceNo" />
+        <result column="outsource_name" property="outsourceName" />
+        <result column="contacts" property="contacts" />
+        <result column="mobile" property="mobile" />
+        <result column="address" property="address" />
+        <result column="require_date" property="requireDate" />
+        <result column="outsource_cost" property="outsourceCost" />
+        <result column="director" property="director" />
+        <result column="item" property="item" />
+        <result column="requires" property="requires" />
+        <result column="create_user_id" property="createUserId" />
+        <result column="create_user_name" property="createUserName" />
+        <result column="approval_status" property="approvalStatus" />
+        <result column="process_id" property="processId" />
+        <result column="create_time" property="createTime" />
+        <result column="update_time" property="updateTime" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, protocol_no, project_name, lab_code, group_code, outsourcer_id, remark, outsource_no, outsource_name, contacts, mobile, address, require_date, outsource_cost, director, item, requires, create_user_id, create_user_name, approval_status, process_id, create_time, update_time
+    </sql>
+
+    <select id="selectMaxProtocolNo" resultType="java.lang.Long">
+        SELECT IFNULL(max(RIGHT(protocol_no, 3)), 0) from biz_business_outsource_protocol
+    </select>
+
+    <select id="selectBatchForApprovalList" resultMap="BaseResultMap">
+        SELECT *
+        FROM biz_business_outsource_protocol
+        WHERE 1=1
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
+            and approval_status = #{request.approvalStatus}
+        </if>
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
+            and create_user_id = #{request.createUserId}
+        </if>
+        <if test="request != null and request.protocolNo != null and request.protocolNo !=''">
+            and protocol_no like concat('%',#{request.protocolNo},'%')
+        </if>
+        <if test="request != null and request.outsourcerName != null and request.outsourcerName !=''">
+            and outsourcer_name like concat('%',#{request.outsourcerName},'%')
+        </if>
+        <if test="request != null and request.applicantName != null and request.applicantName !=''">
+            and create_user_name like concat('%',#{request.applicantName},'%')
+        </if>
+        <if test="request != null and request.applicantTimeStart != null and request.applicantTimeStart !=''">
+            and create_time &gt;= #{request.applicantTimeStart}
+        </if>
+        <if test="request != null and request.applicantTimeEnd != null and request.applicantTimeEnd !=''">
+            and create_time &lt;= #{request.applicantTimeEnd}
+        </if>
+        <if test="businessKeys != null">
+            and id in
+            <foreach collection="businessKeys" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
+        ORDER BY create_time DESC
+    </select>
+</mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourcerInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourcerInfoMapper.xml
index 510a80b..3049b54 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourcerInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourcerInfoMapper.xml
@@ -7,6 +7,8 @@
         <id column="id" property="id" />
         <result column="outsourcer_no" property="outsourcerNo" />
         <result column="outsourcer_name" property="outsourcerName" />
+        <result column="lab_code" property="labCode" />
+        <result column="group_code" property="groupCode" />
         <result column="outsourcer_brief_name" property="outsourcerBriefName" />
         <result column="outsourcer_size" property="outsourcerSize" />
         <result column="business_size" property="businessSize" />
@@ -55,32 +57,32 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, outsourcer_no, outsourcer_name, outsourcer_brief_name, outsourcer_size, business_size, grade, evaluation, tax_number, bank_account, bank_name, bank_account_number, postal_code, director, phone, fax, mobile, email, website, address_country, address_province, address_city, address_area, full_address, address_country_name, address_province_name, address_city_name, address_area_name, invoice_country, invoice_province, invoice_city, invoice_area, invoice_full_address, invoice_country_name, invoice_province_name, invoice_city_name, invoice_area_name, business_scope, business_content, minio_file_name, approval_status, process_id, remark, create_user_id, create_user_name, create_time, update_time
+        id, outsourcer_no, outsourcer_name, lab_code, group_code, outsourcer_brief_name, outsourcer_size, business_size, grade, evaluation, tax_number, bank_account, bank_name, bank_account_number, postal_code, director, phone, fax, mobile, email, website, address_country, address_province, address_city, address_area, full_address, address_country_name, address_province_name, address_city_name, address_area_name, invoice_country, invoice_province, invoice_city, invoice_area, invoice_full_address, invoice_country_name, invoice_province_name, invoice_city_name, invoice_area_name, business_scope, business_content, minio_file_name, approval_status, process_id, remark, create_user_id, create_user_name, create_time, update_time
     </sql>
 
     <select id="selectBatchForApprovalList" resultMap="BaseResultMap">
         SELECT *
         FROM biz_business_outsourcer_info
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.outsourcerNo != null and request.outsourcerNo !=''">
+        <if test="request != null and request.outsourcerNo != null and request.outsourcerNo !=''">
             and outsourcer_no like concat('%',#{request.outsourcerNo},'%')
         </if>
-        <if test="request.outsourcerName != null and request.outsourcerName !=''">
+        <if test="request != null and request.outsourcerName != null and request.outsourcerName !=''">
             and outsourcer_name like concat('%',#{request.outsourcerName},'%')
         </if>
-        <if test="request.director != null and request.director !=''">
+        <if test="request != null and request.director != null and request.director !=''">
             and director like concat('%',#{request.director},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
@@ -93,6 +95,6 @@
     </select>
 
     <select id="selectMaxNo" resultType="java.lang.Long">
-        SELECT IFNULL(max(RIGHT(outsourcer_no, 12)), 0) from biz_business_outsourcer_info
+        SELECT IFNULL(max(RIGHT(outsourcer_no, 3)), 0) from biz_business_outsourcer_info
     </select>
 </mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessSiteExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessSiteExecutiveInfoMapper.xml
index 135c5d0..3c5ae79 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessSiteExecutiveInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessSiteExecutiveInfoMapper.xml
@@ -38,25 +38,25 @@
         FROM biz_business_site_executive_info bsei
         LEFT JOIN biz_resource_customer_info rci ON bsei.customer_id = rci.id
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and bsei.approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and bsei.create_user_id = #{request.createUserId}
         </if>
-        <if test="request.siteExecutiveNo != null and request.siteExecutiveNo !=''">
+        <if test="request != null and request.siteExecutiveNo != null and request.siteExecutiveNo !=''">
             and bsei.site_executive_no like concat('%',#{request.siteExecutiveNo},'%')
         </if>
-        <if test="request.customerName != null and request.customerName !=''">
+        <if test="request != null and request.customerName != null and request.customerName !=''">
             and rci.outsourcer_name like concat('%',#{request.customerName},'%')
         </if>
-        <if test="request.applyName != null and request.applyName !=''">
+        <if test="request != null and request.applyName != null and request.applyName !=''">
             and bsei.apply_name like concat('%',#{request.applyName},'%')
         </if>
-        <if test="request.applyTimeStart != null and request.applyTimeStart !=''">
+        <if test="request != null and request.applyTimeStart != null and request.applyTimeStart !=''">
             and bsei.apply_time &gt;= #{request.applyTimeStart}
         </if>
-        <if test="request.applyTimeEnd != null and request.applyTimeEnd !=''">
+        <if test="request != null and request.applyTimeEnd != null and request.applyTimeEnd !=''">
             and bsei.apply_time &lt;= #{request.applyTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml
index 84d9e2a..6bd38a9 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml
@@ -105,6 +105,12 @@
         <if test="request.isUrgent != null and request.isUrgent !=''">
             AND bo.is_urgent = #{request.isUrgent}
         </if>
+        <if test="request.ids != null">
+            and blei.id in
+            <foreach collection="request.ids" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
         ORDER BY blei.update_time DESC
     </select>
 
@@ -137,6 +143,12 @@
         <if test="request.isUrgent != null and request.isUrgent !=''">
             AND bo.is_urgent = #{request.isUrgent}
         </if>
+        <if test="request.ids != null">
+            and blei.id in
+            <foreach collection="request.ids" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
         ORDER BY blei.update_time DESC
     </select>
 
diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardInfoMapper.xml
index 1a5551b..2ed8d17 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardInfoMapper.xml
@@ -45,12 +45,6 @@
         FROM biz_equipment_standard_info besi
         LEFT JOIN biz_equipment_standard_technology_relation bestr ON besi.standard_no = bestr.standard_no
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
-            and besi.approval_status = #{request.approvalStatus}
-        </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
-            and besi.create_user_id = #{request.createUserId}
-        </if>
         <if test="request.standardName != null and request.standardName !=''">
             and besi.standard_name like concat('%',#{request.standardName},'%')
         </if>
diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardTechnologyRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardTechnologyRelationMapper.xml
index fc7e16c..cd03c8c 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardTechnologyRelationMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardTechnologyRelationMapper.xml
@@ -6,6 +6,7 @@
     <resultMap id="BaseResultMap" type="com.casic.missiles.model.equipment.BizEquipmentStandardTechnologyRelation">
         <id column="id" property="id" />
         <result column="technology_file_id" property="technologyFileId" />
+        <result column="technology_file_no" property="technologyFileNo" />
         <result column="technology_file_name" property="technologyFileName" />
         <result column="standard_id" property="standardId" />
         <result column="standard_no" property="standardNo" />
@@ -14,7 +15,7 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, technology_file_id, technology_file_name, standard_id, remark
+        id, technology_file_id, technology_file_no, technology_file_name, standard_id, remark
     </sql>
 
 </mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceAuthorizeOrderMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceAuthorizeOrderMapper.xml
index ac5176c..554fe65 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceAuthorizeOrderMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceAuthorizeOrderMapper.xml
@@ -32,22 +32,22 @@
         SELECT *
         FROM biz_resource_authorize_order
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.orderNo != null and request.orderNo !=''">
+        <if test="request != null and request.orderNo != null and request.orderNo !=''">
             and order_no like concat('%',#{request.orderNo},'%')
         </if>
-        <if test="request.createUserName != null and request.createUserName !=''">
+        <if test="request != null and request.createUserName != null and request.createUserName !=''">
             and create_user_name like concat('%',#{request.createUserName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerExamineFormMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerExamineFormMapper.xml
index ab242f6..af7f98f 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerExamineFormMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerExamineFormMapper.xml
@@ -41,28 +41,28 @@
         SELECT *
         FROM biz_resource_customer_examine_form
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.formNo != null and request.formNo !=''">
+        <if test="request != null and request.formNo != null and request.formNo !=''">
             and form_no like concat('%',#{request.formNo},'%')
         </if>
-        <if test="request.labCode != null and request.labCode !=''">
+        <if test="request != null and request.labCode != null and request.labCode !=''">
             and lab_code like concat('%',#{request.labCode},'%')
         </if>
-        <if test="request.groupCode != null and request.groupCode !=''">
+        <if test="request != null and request.groupCode != null and request.groupCode !=''">
             and group_code like concat('%',#{request.groupCode},'%')
         </if>
-        <if test="request.createUserName != null and request.createUserName !=''">
+        <if test="request != null and request.createUserName != null and request.createUserName !=''">
             and create_user_name like concat('%',#{request.createUserName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerInfoMapper.xml
index fa8ffbc..06a2798 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerInfoMapper.xml
@@ -33,25 +33,25 @@
         SELECT *
         FROM biz_resource_customer_info
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.customerNo != null and request.customerNo !=''">
+        <if test="request != null and request.customerNo != null and request.customerNo !=''">
             and customer_no like concat('%',#{request.customerNo},'%')
         </if>
-        <if test="request.customerName != null and request.customerName !=''">
+        <if test="request != null and request.customerName != null and request.customerName !=''">
             and customer_name like concat('%',#{request.customerName},'%')
         </if>
-        <if test="request.contacts != null and request.contacts !=''">
+        <if test="request != null and request.contacts != null and request.contacts !=''">
             and contacts like concat('%',#{request.contacts},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerSuggestFormMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerSuggestFormMapper.xml
index 28f5bb2..1806662 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerSuggestFormMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerSuggestFormMapper.xml
@@ -33,28 +33,28 @@
         SELECT *
         FROM biz_resource_customer_suggest_form
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.formNo != null and request.formNo !=''">
+        <if test="request != null and request.formNo != null and request.formNo !=''">
             and form_no like concat('%',#{request.formNo},'%')
         </if>
-        <if test="request.customerName != null and request.customerName !=''">
+        <if test="request != null and request.customerName != null and request.customerName !=''">
             and customer_name like concat('%',#{request.customerName},'%')
         </if>
-        <if test="request.customerDeptName != null and request.customerDeptName !=''">
+        <if test="request != null and request.customerDeptName != null and request.customerDeptName !=''">
             and customer_dept_name like concat('%',#{request.customerDeptName},'%')
         </if>
-        <if test="request.createUserName != null and request.createUserName !=''">
+        <if test="request != null and request.createUserName != null and request.createUserName !=''">
             and create_user_name like concat('%',#{request.createUserName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSealUseNoteMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSealUseNoteMapper.xml
index ab37bc1..b02bb33 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSealUseNoteMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSealUseNoteMapper.xml
@@ -29,32 +29,32 @@
     </sql>
 
     <select id="selectBatchForApprovalList" resultMap="BaseResultMap">
-        SELECT *
+        SELECT brsun.*, brsi.seal_name, brsi.seal_type, brsi.approver_name
         FROM biz_resource_seal_use_note brsun
         JOIN biz_resource_seal_info brsi ON brsun.seal_id = brsi.id
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and brsun.approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and brsun.create_user_id = #{request.createUserId}
         </if>
-        <if test="request.sealName != null and request.sealName !=''">
+        <if test="request != null and request.sealName != null and request.sealName !=''">
             and brsi.seal_name like concat('%',#{request.sealName},'%')
         </if>
-        <if test="request.sealType != null and request.sealType !=''">
+        <if test="request != null and request.sealType != null and request.sealType !=''">
             and brsi.seal_type = #{request.sealType}
         </if>
-        <if test="request.applyDeptName != null and request.applyDeptName !=''">
+        <if test="request != null and request.applyDeptName != null and request.applyDeptName !=''">
             and brsun.apply_dept_name like concat('%',#{request.applyDeptName},'%')
         </if>
-        <if test="request.applyUserName != null and request.applyUserName !=''">
+        <if test="request != null and request.applyUserName != null and request.applyUserName !=''">
             and brsun.apply_user_name like concat('%',#{request.applyUserName},'%')
         </if>
-        <if test="request.applyTimeStart != null and request.applyTimeStart !=''">
+        <if test="request != null and request.applyTimeStart != null and request.applyTimeStart !=''">
             and brsun.apply_time &gt;= #{request.applyTimeStart}
         </if>
-        <if test="request.applyTimeEnd != null and request.applyTimeEnd !=''">
+        <if test="request != null and request.applyTimeEnd != null and request.applyTimeEnd !=''">
             and brsun.apply_time &lt;= #{request.applyTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml
index 119bf7d..4f8392a 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml
@@ -31,6 +31,12 @@
         <if test="request.deptName != null and request.deptName !=''">
             and brsi.dept_name like concat('%',#{request.deptName},'%')
         </if>
+        <if test="request.ids != null">
+            and brsv.id in
+            <foreach collection="request.ids" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
         ORDER BY brsv.grant_date DESC
     </select>
 
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSupplierInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSupplierInfoMapper.xml
index fe8d399..e8ce7ef 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSupplierInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSupplierInfoMapper.xml
@@ -48,28 +48,28 @@
         SELECT *
         FROM biz_resource_supplier_info
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.supplierNo != null and request.supplierNo !=''">
+        <if test="request != null and request.supplierNo != null and request.supplierNo !=''">
             and supplier_no like concat('%',#{request.supplierNo},'%')
         </if>
-        <if test="request.supplierName != null and request.supplierName !=''">
+        <if test="request != null and request.supplierName != null and request.supplierName !=''">
             and supplier_name like concat('%',#{request.supplierName},'%')
         </if>
-        <if test="request.director != null and request.director !=''">
+        <if test="request != null and request.director != null and request.director !=''">
             and director like concat('%',#{request.director},'%')
         </if>
-        <if test="request.supplierType != null and request.supplierType !=''">
+        <if test="request != null and request.supplierType != null and request.supplierType !=''">
             and supplier_type = #{request.supplierType}
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/EnvLocationInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/EnvLocationInfoMapper.xml
new file mode 100644
index 0000000..68bcf10
--- /dev/null
+++ b/casic-metering-dao/src/main/resources/mapper/resource/EnvLocationInfoMapper.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.mapper.resource.EnvLocationInfoMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.resource.EnvLocationInfo">
+        <id column="id" property="id" />
+        <result column="location_no" property="locationNo" />
+        <result column="location_name" property="locationName" />
+        <result column="location_position" property="locationPosition" />
+        <result column="create_user_id" property="createUserId" />
+        <result column="create_user" property="createUser" />
+        <result column="create_time" property="createTime" />
+        <result column="update_time" property="updateTime" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, location_no, location_name, location_position, create_user_id, create_user, create_time, update_time
+    </sql>
+
+    <select id="selectLocationListPage" resultType="com.casic.missiles.dto.resource.environment.LocationListResponse">
+        SELECT *
+        FROM env_location_info
+        WHERE 1=1
+        <if test="request.locationNo != null and request.locationNo !=''">
+            AND location_no LIKE concat('%',#{request.locationNo},'%')
+        </if>
+        <if test="request.locationName != null and request.locationName !=''">
+            AND location_name LIKE concat('%',#{request.locationName},'%')
+        </if>
+        ORDER BY create_time DESC
+    </select>
+
+</mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml
index b28c18f..8854047 100644
--- a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml
@@ -11,7 +11,6 @@
         <result column="sign_desc" property="signDesc" />
         <result column="sign_director" property="signDirector" />
         <result column="sign_user_id" property="signUserId" />
-        <result column="sign_type" property="signType" />
         <result column="minio_file_name" property="minioFileName" />
         <result column="create_time" property="createTime" />
         <result column="update_time" property="updateTime" />
@@ -28,7 +27,6 @@
         <result column="sign_name" property="signName" />
         <result column="sign_desc" property="signDesc" />
         <result column="sign_director" property="signDirector" />
-        <result column="sign_type" property="signType" />
         <result column="sign_user_id" property="signUserId" />
         <result column="minio_file_name" property="minioFileName" />
         <result column="create_time" property="createTime" />
@@ -62,4 +60,58 @@
         JOIN system_sign_user_relation ssur ON ss.id = ssur.sign_id
         WHERE ssur.user_id = #{userId}
     </select>
+
+    <select id="selectSignListPage" resultMap="BaseResultMap">
+        SELECT ss.*, sd.SIMPLE_NAME AS deptName
+        FROM system_sign ss
+        LEFT JOIN sys_user su ON su.id = ss.sign_user_id
+        LEFT JOIN sys_dept sd ON sd.id = su.dept_id
+        WHERE 1=1
+        <if test="request.signNo != null and request.signNo !=''">
+            AND ss.sign_no LIKE concat('%',#{request.signNo},'%')
+        </if>
+        <if test="request.signName != null and request.signName !=''">
+            AND ss.sign_name LIKE concat('%',#{request.signName},'%')
+        </if>
+        <if test="request.signDirector != null and request.signDirector !=''">
+            AND ss.sign_director LIKE concat('%',#{request.signDirector},'%')
+        </if>
+        <if test="request.signUserId != null and request.signUserId !=''">
+            AND ss.sign_user_id = #{request.signUserId}
+        </if>
+        <if test="request.createStartTime != null and request.createStartTime !=''">
+            AND DATE_FORMAT(ss.create_time,'%Y-%m-%d') &gt;= DATE_FORMAT(#{request.createStartTime},'%Y-%m-%d')
+        </if>
+        <if test="request.createEndTime != null and request.createEndTime !=''">
+            AND DATE_FORMAT(ss.create_time,'%Y-%m-%d')  &lt;= DATE_FORMAT(#{request.createEndTime},'%Y-%m-%d')
+        </if>
+        ORDER BY ss.create_time DESC
+    </select>
+
+    <select id="selectSignList" resultMap="BaseResultMap">
+        SELECT ss.*, sd.SIMPLE_NAME AS deptName
+        FROM system_sign ss
+        LEFT JOIN sys_user su ON su.id = ss.sign_user_id
+        LEFT JOIN sys_dept sd ON sd.id = su.dept_id
+        WHERE 1=1
+        <if test="request.signNo != null and request.signNo !=''">
+            AND ss.sign_no LIKE concat('%',#{request.signNo},'%')
+        </if>
+        <if test="request.signName != null and request.signName !=''">
+            AND ss.sign_name LIKE concat('%',#{request.signName},'%')
+        </if>
+        <if test="request.signDirector != null and request.signDirector !=''">
+            AND ss.sign_director LIKE concat('%',#{request.signDirector},'%')
+        </if>
+        <if test="request.signUserId != null and request.signUserId !=''">
+            AND ss.sign_user_id = #{request.signUserId}
+        </if>
+        <if test="request.createStartTime != null and request.createStartTime !=''">
+            AND DATE_FORMAT(ss.create_time,'%Y-%m-%d') &gt;= DATE_FORMAT(#{request.createStartTime},'%Y-%m-%d')
+        </if>
+        <if test="request.createEndTime != null and request.createEndTime !=''">
+            AND DATE_FORMAT(ss.create_time,'%Y-%m-%d')  &lt;= DATE_FORMAT(#{request.createEndTime},'%Y-%m-%d')
+        </if>
+        ORDER BY ss.create_time DESC
+    </select>
 </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 515050a..60f530b 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
@@ -47,8 +47,8 @@
     String STORAGE_LOCATION = "bizStorageLocation";
     //计量专业
     String MEASURE_MAJOR = "bizMeasureMajor";
-    //管理状态
-    String MANAGER_STATE = "bizManagerState";
+    //标准装置管理状态
+    String STANDARD_MANAGER_STATE = "bizStandardManagerState";
 
     /**
      * 资源管理 字典code
@@ -95,8 +95,6 @@
     String MEASURE_STATUS = "measureStatus";
     //检定方式
     String MEASURE_TYPE = "measureType";
-    //标识打印标志类型
-    String IDENTIFY_PRINT_TYPE = "bizBusinessIdentify";
     //变更类型
     String REPORT_CHANGE_TYPE = "bizCertChangeType";
     //规模类型
@@ -111,19 +109,24 @@
     String MEASURE_CATEGORY = "measureCategory";
     //检定结果
     String MEASURE_RESULT = "measureResult";
+    //分包原因
+    String OUTSOURCE_REASON = "outsourceReason";
+
+    /**
+     * 系统管理
+     */
+    String TEMPLATE_TYPE = "templateType";
+
 
     /**
      * 标准装置 字典code
      */
     //类别
     String STANDARD_CATEGORY = "standardCategory";
-    //管理状态
-    String STANDARD_MANAGER_STATE = "standardManagerState";
     //标准等级
     String STANDARD_LEVEL = "standardLevel";
     //传递范围
     String STANDARD_TRANSMIT_RANGE = "transmitRange";
-
     //资本来源
     String CAPITAL_SOURCE = "capitalSource";
     //标准装置-申请类型
@@ -148,8 +151,6 @@
     String CERTIFICATE_CLASS = "certificationClass";
     //证书管理-检校专业
     String CALIBRATION_MAJOR = "calibrationMajor";
-    //分包原因
-    String OUTSOURCE_REASON = "outsourceReason";
 
     /**
      * 工作台
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/BaseApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/BaseApprovalListRequest.java
index 73c12c1..80d7424 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/BaseApprovalListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/BaseApprovalListRequest.java
@@ -6,6 +6,7 @@
 
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotEmpty;
+import java.util.List;
 
 /**
  * @Description:
@@ -19,14 +20,14 @@
      * 表单id
      */
     @NotBlank(message = "表单id不能为空")
-    @ApiModelProperty(value = "表单id（流程定义对应的表单id，等价于业务id）", dataType = "String")
+    @ApiModelProperty(value = "表单id（流程定义对应的表单id，等价于业务id），导出接口不用传", dataType = "String")
     private String formId;
 
     /**
      * 审批状态类型，对应ApprovalStatusEnum
      */
     @NotEmpty(message = "审批状态类型不能为空")
-    @ApiModelProperty(value = "审批状态类型code", dataType = "String")
+    @ApiModelProperty(value = "审批状态类型code，导出接口不用传", dataType = "String")
     private String approvalStatus;
 
     @ApiModelProperty(hidden = true)
@@ -34,4 +35,7 @@
 
     @ApiModelProperty(hidden = true)
     private Long createUserId;
+
+    @ApiModelProperty(value = "导出ids", dataType = "List")
+    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificatePrintApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificatePrintApprovalListRequest.java
index b93d1c9..3cc2f4e 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificatePrintApprovalListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificatePrintApprovalListRequest.java
@@ -5,8 +5,6 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import java.util.List;
-
 /**
  * @Description:
  * @Author: wangpeng
@@ -38,7 +36,4 @@
 
     @ApiModelProperty(value = "创建结束时间", dataType = "String")
     private String createTimeEnd;
-
-    @ApiModelProperty(value = "导出ids", dataType = "List")
-    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportApprovalListRequest.java
index 4f7a038..c115847 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportApprovalListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportApprovalListRequest.java
@@ -5,8 +5,6 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import java.util.List;
-
 /**
  * @Description:
  * @Author: wangpeng
@@ -15,6 +13,8 @@
 @ApiModel
 @Data
 public class CertificateReportApprovalListRequest extends BaseApprovalListRequest {
+    @ApiModelProperty(value = "委托方id", dataType = "String")
+    private Long customerId;
 
     @ApiModelProperty(value = "证书报告编号", dataType = "String")
     private String certificateReportNo;
@@ -37,6 +37,4 @@
     @ApiModelProperty(value = "检校结束时间", dataType = "String")
     private String calibrationTimeEnd;
 
-    @ApiModelProperty(value = "导出ids", dataType = "List")
-    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/identify/IdentifyListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/identify/IdentifyListRequest.java
index 1b87ae6..f019203 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/identify/IdentifyListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/identify/IdentifyListRequest.java
@@ -4,6 +4,8 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * @Description:
  * @Author: wangpeng
@@ -26,4 +28,7 @@
 
     @ApiModelProperty(value = "打印结束时间", dataType = "String")
     private String createTimeEnd;
+
+    @ApiModelProperty(value = "导出ids", dataType = "List")
+    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListRequest.java
index 1264883..62415fb 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListRequest.java
@@ -7,6 +7,7 @@
 import lombok.Data;
 
 import javax.validation.constraints.NotBlank;
+import java.util.List;
 
 @Data
 @ApiModel
@@ -37,4 +38,6 @@
     @ApiModelProperty(value = "是否加急（1是0否null全部）", dataType = "Integer")
     private String isUrgent;
 
+    @ApiModelProperty(value = "导出ids", dataType = "List")
+    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListRequest.java
index 5201d7b..499760a 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListRequest.java
@@ -17,6 +17,9 @@
     @ApiModelProperty(value = "任务单编号", dataType = "String")
     private String orderNo;
 
+    @ApiModelProperty(value = "委托方id", dataType = "Long")
+    private Long customerId;
+
     @ApiModelProperty(value = "委托方名称", dataType = "String")
     private String customerName;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OrderSampleDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OrderSampleDTO.java
new file mode 100644
index 0000000..796edc0
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OrderSampleDTO.java
@@ -0,0 +1,19 @@
+package com.casic.missiles.dto.business.outsource;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/8/24 11:38
+ */
+@ApiModel
+@Data
+public class OrderSampleDTO {
+    @ApiModelProperty(value = "任务单id", dataType = "Long")
+    private Long orderId;
+    @ApiModelProperty(value = "受检设备id", dataType = "Long")
+    private Long sampleId;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceAssessApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceAssessApprovalListRequest.java
new file mode 100644
index 0000000..9a930c3
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceAssessApprovalListRequest.java
@@ -0,0 +1,30 @@
+package com.casic.missiles.dto.business.outsource;
+
+import com.casic.missiles.dto.BaseApprovalListRequest;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/8/24 11:01
+ */
+@ApiModel
+@Data
+public class OutsourceAssessApprovalListRequest extends BaseApprovalListRequest {
+    @ApiModelProperty(value = "评审表编号", dataType = "String")
+    private String projectNo;
+
+    @ApiModelProperty(value = "分包机构名称", dataType = "String")
+    private String outsourcerName;
+
+    @ApiModelProperty(value = "申请人", dataType = "String")
+    private String applicantName;
+
+    @ApiModelProperty(value = "申请时间开始", dataType = "String")
+    private String applicantTimeStart;
+
+    @ApiModelProperty(value = "申请时间结束", dataType = "String")
+    private String applicantTimeEnd;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceAssessSaveResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceAssessSaveResponse.java
new file mode 100644
index 0000000..8bf9aad
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceAssessSaveResponse.java
@@ -0,0 +1,20 @@
+package com.casic.missiles.dto.business.outsource;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/8/14 16:17
+ */
+@ApiModel
+@Data
+public class OutsourceAssessSaveResponse {
+    @ApiModelProperty(value = "主键id", dataType = "Long")
+    private Long id;
+
+    @ApiModelProperty(value = "编号", dataType = "String")
+    private String projectNo;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProtocolApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProtocolApprovalListRequest.java
new file mode 100644
index 0000000..0f32331
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProtocolApprovalListRequest.java
@@ -0,0 +1,30 @@
+package com.casic.missiles.dto.business.outsource;
+
+import com.casic.missiles.dto.BaseApprovalListRequest;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/8/24 15:01
+ */
+@ApiModel
+@Data
+public class OutsourceProtocolApprovalListRequest extends BaseApprovalListRequest {
+    @ApiModelProperty(value = "协议书编号", dataType = "String")
+    private String protocolNo;
+
+    @ApiModelProperty(value = "分包方名称", dataType = "String")
+    private String outsourcerName;
+
+    @ApiModelProperty(value = "申请人", dataType = "String")
+    private String applicantName;
+
+    @ApiModelProperty(value = "申请时间开始", dataType = "String")
+    private String applicantTimeStart;
+
+    @ApiModelProperty(value = "申请时间结束", dataType = "String")
+    private String applicantTimeEnd;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProtocolSaveResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProtocolSaveResponse.java
new file mode 100644
index 0000000..e324967
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProtocolSaveResponse.java
@@ -0,0 +1,20 @@
+package com.casic.missiles.dto.business.outsource;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/8/14 16:17
+ */
+@ApiModel
+@Data
+public class OutsourceProtocolSaveResponse {
+    @ApiModelProperty(value = "主键id", dataType = "Long")
+    private Long id;
+
+    @ApiModelProperty(value = "编号", dataType = "String")
+    private String protocolNo;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveApprovalListRequest.java
index f29f4e4..7047c28 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveApprovalListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveApprovalListRequest.java
@@ -5,8 +5,6 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import java.util.List;
-
 /**
  * @Description: 现场检测审批列表请求实体
  * @Author: wangpeng
@@ -30,7 +28,4 @@
     @ApiModelProperty(value = "申请时间结束", dataType = "String")
     private String applyTimeEnd;
 
-    @ApiModelProperty(value = "导出ids", dataType = "List")
-    private List<Long> ids;
-
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveDetailResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveDetailResponse.java
index 1f28752..394c934 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveDetailResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveDetailResponse.java
@@ -12,6 +12,18 @@
     @ApiModelProperty(value = "id，更新/删除使用参数", dataType = "Long")
     private Long id;
 
+    @ApiModelProperty(value = "实验室代码(字典code)", dataType = "String")
+    private String labCode;
+
+    @ApiModelProperty(value = "实验室代码(字典value)", dataType = "String")
+    private String labCodeName;
+
+    @ApiModelProperty(value = "组别代码(字典code)", dataType = "String")
+    private String groupCode;
+
+    @ApiModelProperty(value = "组别代码(字典value)", dataType = "String")
+    private String groupCodeName;
+
     @ApiModelProperty(value = "审批编号", dataType = "String")
     private String siteExecutiveNo;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/environment/LocationListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/environment/LocationListRequest.java
new file mode 100644
index 0000000..13d03c3
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/environment/LocationListRequest.java
@@ -0,0 +1,20 @@
+package com.casic.missiles.dto.resource.environment;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/6/8 13:56
+ */
+@ApiModel
+@Data
+public class LocationListRequest {
+    @ApiModelProperty(value = "地点编号", dataType = "String")
+    private String locationNo;
+
+    @ApiModelProperty(value = "地点名称", dataType = "String")
+    private String locationName;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/environment/LocationListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/environment/LocationListResponse.java
new file mode 100644
index 0000000..4c531af
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/environment/LocationListResponse.java
@@ -0,0 +1,78 @@
+package com.casic.missiles.dto.resource.environment;
+
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
+import com.baomidou.mybatisplus.annotation.TableField;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description: 地点列表响应实体
+ * @Author: wangpeng
+ * @Date: 2023/6/8 13:53
+ */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
+@ApiModel
+@Data
+public class LocationListResponse {
+    @ApiModelProperty(value = "主键id", dataType = "Long")
+    private Long id;
+
+    /**
+     * 地点编号
+     */
+    @ExcelProperty("地点编号")
+    @ApiModelProperty(value = "地点编号", dataType = "String")
+    private String locationNo;
+
+    /**
+     * 地点名称
+     */
+    @ExcelProperty("地点名称")
+    @ApiModelProperty(value = "地点名称", dataType = "String")
+    private String locationName;
+
+    /**
+     * 地点位置
+     */
+    @ExcelProperty("地点位置")
+    @ApiModelProperty(value = "地点位置", dataType = "String")
+    private String locationPosition;
+
+    /**
+     * 创建人id
+     */
+    @ApiModelProperty(value = "创建人id", dataType = "Long")
+    private Long createUserId;
+
+    /**
+     * 创建人
+     */
+    @ExcelProperty("创建人")
+    @ApiModelProperty(value = "创建人", dataType = "String")
+    @TableField("create_user")
+    private String createUser;
+
+    /**
+     * 创建时间
+     */
+    @ExcelProperty("创建时间")
+    @ApiModelProperty(value = "创建时间", dataType = "String")
+    private String createTime;
+
+    /**
+     * 更新时间
+     */
+    @ApiModelProperty(value = "更新时间", dataType = "String")
+    private String updateTime;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertRequest.java
index 9a7f6c6..c827915 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertRequest.java
@@ -4,6 +4,8 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * @Description:
  * @Author: wangpeng
@@ -16,4 +18,7 @@
     private String name;
     @ApiModelProperty(value = "部门名", dataType = "String")
     private String deptName;
+
+    @ApiModelProperty(value = "导出ids", dataType = "List")
+    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertResponse.java
index f78b159..8f2f79e 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertResponse.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.dto.resource.staff;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.casic.missiles.annotation.DictCodeField;
 import com.casic.missiles.constants.MeterDictCode;
 import io.swagger.annotations.ApiModel;
@@ -13,12 +20,18 @@
  * @Author: wangpeng
  * @Date: 2023/7/27 15:13
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @ApiModel
 @Data
 public class StaffCertResponse {
     /**
      * 人员编号
      */
+    @ExcelProperty(value = "人员编号",order = 0)
     @NotEmpty(message = "人员编号不能为空")
     @ApiModelProperty(value = "人员编号", dataType = "String")
     private String staffNo;
@@ -26,6 +39,7 @@
     /**
      * 姓名
      */
+    @ExcelProperty(value = "姓名",order = 1)
     @ApiModelProperty(value = "姓名", dataType = "String")
     private String staffName;
 
@@ -54,6 +68,7 @@
     /**
      * 部门名字
      */
+    @ExcelProperty(value = "工作部门",order = 2)
     @ApiModelProperty(value = "部门名字", dataType = "String")
     private String deptName;
 
@@ -66,6 +81,7 @@
     /**
      * 计量专业
      */
+    @ExcelProperty(value = "计量专业",order = 3)
     @ApiModelProperty(value = "计量专业", dataType = "String")
     private String major;
 
@@ -110,6 +126,7 @@
     /**
      * 证书号
      */
+    @ExcelProperty(value = "证号",order = 4)
     @ApiModelProperty(value = "证书号", dataType = "String")
     private String certNo;
 
@@ -122,12 +139,14 @@
     /**
      * 有效日期
      */
+    @ExcelProperty(value = "证书有效期",order = 6)
     @ApiModelProperty(value = "有效日期", dataType = "String")
     private String effectiveDate;
 
     /**
      * 发放日期
      */
+    @ExcelProperty(value = "发证日期",order = 5)
     @ApiModelProperty(value = "发放日期", dataType = "String")
     private String grantDate;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffListRequest.java
index 7c4afb3..0a1194a 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffListRequest.java
@@ -4,6 +4,8 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * @Description:
  * @Author: wangpeng
@@ -18,4 +20,7 @@
     private String deptName;
     @ApiModelProperty(value = "部门id", dataType = "Long")
     private Long deptId;
+
+    @ApiModelProperty(value = "导出ids", dataType = "List")
+    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/TrainListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/TrainListRequest.java
index f68597b..6321f8b 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/TrainListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/TrainListRequest.java
@@ -14,6 +14,8 @@
 public class TrainListRequest {
     @ApiModelProperty(value = "训练登记表编号", dataType = "String")
     private String trainNo;
+    @ApiModelProperty(value = "值班领导", dataType = "String")
+    private String dutyLeader;
     @ApiModelProperty(value = "创建开始时间", dataType = "String")
     private String createTimeStart;
     @ApiModelProperty(value = "创建结束时间", dataType = "String")
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/SignAddRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/SignAddRequest.java
index 117be34..d71055c 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/SignAddRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/SignAddRequest.java
@@ -43,13 +43,6 @@
     private Long signUserId;
 
     /**
-     * 签章或签名-字典code
-     */
-    @NotBlank(message = "类型不能为空")
-    @ApiModelProperty(value = "签名/签章-字典code", dataType = "String", required = true)
-    private String signType;
-
-    /**
      * minio存储文件名
      */
     @ApiModelProperty(value = "上传文件返回名称", dataType = "String")
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateAddRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateAddRequest.java
index aff1265..6316648 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateAddRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateAddRequest.java
@@ -17,30 +17,28 @@
 @Data
 public class TemplateAddRequest extends BaseSystemRequest {
     /**
-     * 原始记录模板/证书报告模板名称
+     * 模板名称
      */
     @ApiModelProperty(value = "名称", dataType = "String", required = true)
     @NotBlank(message = "名称不能为空")
     private String templateName;
 
     /**
-     * 原始记录模板/证书报告模板描述
+     * 模板描述
      */
     @ApiModelProperty(value = "描述", dataType = "String")
     private String templateDesc;
 
     /**
-     * 原始记录模板/证书报告模板创建人
+     * 创建人
      */
     @ApiModelProperty(value = "创建人", dataType = "String", required = true)
     @NotBlank(message = "创建人不能为空")
     private String templateCreator;
 
-    /**
-     * 原始记录模板/证书报告模板-字典code
-     */
-    @NotBlank(message = "类型不能为空")
-    @ApiModelProperty(value = "原始记录模板/证书报告模板-字典code", dataType = "String", required = true)
+
+    @NotBlank(message = "模板类型不能为空")
+    @ApiModelProperty(value = "模板类型(字典code)", dataType = "String", required = true)
     private String templateType;
 
     /**
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateListRequest.java
index eec5a1e..6d17bbe 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateListRequest.java
@@ -1,11 +1,12 @@
 package com.casic.missiles.dto.system;
 
+import com.casic.missiles.annotation.DictCodeField;
+import com.casic.missiles.constants.MeterDictCode;
 import com.casic.missiles.dto.BaseSystemRequest;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import javax.validation.constraints.NotBlank;
 import java.util.List;
 
 /**
@@ -19,8 +20,8 @@
     /**
      * 类型
      */
-//    @ApiModelProperty(value = "类型-字典code", dataType = "String", required = true)
-    @NotBlank(message = "类型不能为空")
+    @DictCodeField(message = "模板类型不合法", cacheName = MeterDictCode.TEMPLATE_TYPE)
+    @ApiModelProperty(value = "模板类型(字典code)", dataType = "String")
     private String templateType;
 
     /**
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificateChangeApply.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificateChangeApply.java
index 9216308..36923fd 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificateChangeApply.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificateChangeApply.java
@@ -1,11 +1,19 @@
 package com.casic.missiles.model.business;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 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 com.casic.missiles.dto.BaseRequest;
+import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -20,6 +28,12 @@
  * @author wangpeng
  * @since 2023-08-15
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
+@ApiModel
 @Data
 @TableName("biz_business_certificate_change_apply")
 public class BizBusinessCertificateChangeApply extends BaseRequest implements Serializable {
@@ -33,6 +47,7 @@
     /**
      * 申请单编号
      */
+    @ExcelProperty(value = "申请单编号", order = 1)
     @ApiModelProperty(value = "申请单编号", dataType = "String")
     @TableField("change_apply_no")
     private String changeApplyNo;
@@ -40,6 +55,7 @@
     /**
      * 申请单名字
      */
+    @ExcelProperty(value = "申请单名称", order = 2)
     @ApiModelProperty(value = "申请单名字", dataType = "String")
     @TableField("change_apply_name")
     private String changeApplyName;
@@ -54,6 +70,7 @@
     /**
      * 更换证书编号
      */
+    @ExcelProperty(value = "更换证书编号", order = 3)
     @ApiModelProperty(value = "更换证书编号", dataType = "String")
     @TableField("change_report_no")
     private String changeReportNo;
@@ -61,7 +78,8 @@
     /**
      * 更换证书名字
      */
-    @ApiModelProperty(value = "更换证书名字", dataType = "String")
+    @ExcelProperty(value = "更换证书/报告名称", order = 4)
+    @ApiModelProperty(value = "更换证书/报告名称", dataType = "String")
     @TableField("change_report_name")
     private String changeReportName;
 
@@ -73,6 +91,7 @@
     @TableField("change_type")
     private String changeType;
 
+    @ExcelProperty(value = "变更类型", order = 5)
     @ApiModelProperty(value = "变更类型(字典value)", dataType = "String")
     @TableField(exist = false)
     private String changeTypeName;
@@ -142,13 +161,15 @@
     /**
      * 创建用户名字
      */
-    @ApiModelProperty(value = "创建用户名字", dataType = "String")
+    @ExcelProperty(value = "创建人", order = 6)
+    @ApiModelProperty(value = "创建人名字", dataType = "String")
     @TableField("create_user_name")
     private String createUserName;
 
     /**
      * 创建时间
      */
+    @ExcelProperty(value = "创建时间", order = 7)
     @ApiModelProperty(value = "创建时间", dataType = "String")
     @TableField("create_time")
     private String createTime;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificateReport.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificateReport.java
index f01db9e..db06018 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificateReport.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificateReport.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.model.business;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -22,6 +29,11 @@
  * @author wangpeng
  * @since 2023-08-14
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @ApiModel
 @Data
 @TableName("biz_business_certificate_report")
@@ -36,6 +48,7 @@
     /**
      * 证书报告编号
      */
+    @ExcelProperty(value = "证书报告编号", order = 1)
     @ApiModelProperty(value = "证书报告编号", dataType = "String")
     @TableField("certificate_report_no")
     private String certificateReportNo;
@@ -43,6 +56,7 @@
     /**
      * 证书报告名称
      */
+    @ExcelProperty(value = "证书报告名称", order = 2)
     @ApiModelProperty(value = "证书报告名称", dataType = "String")
     @TableField("certificate_report_name")
     private String certificateReportName;
@@ -62,6 +76,7 @@
     @TableField("measure_category")
     private String measureCategory;
 
+    @ExcelProperty(value = "检校类别", order = 6)
     @ApiModelProperty(value = "检校类别(字典value)", dataType = "String")
     @TableField(exist = false)
     private String measureCategoryName;
@@ -69,6 +84,7 @@
     /**
      * 检校时间
      */
+    @ExcelProperty(value = "检校时间", order = 8)
     @ApiModelProperty(value = "检校时间", dataType = "String")
     @TableField("calibration_time")
     private String calibrationTime;
@@ -267,18 +283,22 @@
     @TableField(exist = false)
     private Integer decisionItem;
 
-    @ApiModelProperty(value = "设备样品编号（列表返回参数）", dataType = "String")
+    @ExcelProperty(value = "被检设备统一编号", order = 3)
+    @ApiModelProperty(value = "被检设备统一编号（列表返回参数）", dataType = "String")
     @TableField(exist = false)
     private String sampleNo;
 
-    @ApiModelProperty(value = "设备样品名称（列表返回参数）", dataType = "String")
+    @ExcelProperty(value = "被检设备名称", order = 4)
+    @ApiModelProperty(value = "被检设备名称（列表返回参数）", dataType = "String")
     @TableField(exist = false)
     private String sampleName;
 
-    @ApiModelProperty(value = "设备样品规格型号（列表返回参数）", dataType = "String")
+    @ExcelProperty(value = "规格型号", order = 5)
+    @ApiModelProperty(value = "规格型号（列表返回参数）", dataType = "String")
     @TableField(exist = false)
     private String sampleModel;
 
+    @ExcelProperty(value = "检定员", order = 7)
     @ApiModelProperty(value = "检定员名字（列表返回参数）", dataType = "String")
     @TableField(exist = false)
     private String staffName;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessIdentifyInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessIdentifyInfo.java
index 46bfba5..f1a9bec 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessIdentifyInfo.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessIdentifyInfo.java
@@ -1,10 +1,15 @@
 package com.casic.missiles.model.business;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 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;
 
@@ -20,6 +25,11 @@
  * @author wangpeng
  * @since 2023-08-15
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @Data
 @TableName("biz_business_identify_info")
 public class BizBusinessIdentifyInfo implements Serializable {
@@ -33,6 +43,7 @@
     /**
      * 记录编号
      */
+    @ExcelProperty(value = "记录编号", order = 1)
     @ApiModelProperty(value = "记录编号", dataType = "String")
     @TableField("record_no")
     private String recordNo;
@@ -41,20 +52,15 @@
      * 标志类型(字典code)
      */
     @NotEmpty(message = "标志类型不能为空")
-    @ApiModelProperty(value = "标志类型(字典code)", dataType = "String")
-    @DictCodeField(message = "标志类型不合法", cacheName = MeterDictCode.IDENTIFY_PRINT_TYPE)
+    @ApiModelProperty(value = "标志类型(直接存计量标识/使用状态/校准状态的字典value)", dataType = "String")
     @TableField("identify_type")
     private String identifyType;
 
-    @ApiModelProperty(value = "标志类型(字典value)", dataType = "String")
-    @TableField(exist = false)
-    private String identifyTypeName;
-
     /**
      * 设备id(可以是受检设备/设备台账)
      */
     @NotNull(message = "设备id不能为空")
-    @ApiModelProperty(value = "设备id(可以是受检设备/设备台账)", dataType = "String")
+    @ApiModelProperty(value = "设备id(可以是受检设备/设备台账)", dataType = "Long")
     @TableField("device_id")
     private Long deviceId;
 
@@ -66,29 +72,32 @@
     @TableField("device_type")
     private String deviceType;
 
+    @ExcelProperty(value = "统一编号", order = 3)
     @NotEmpty(message = "设备编号不能为空")
-    @ApiModelProperty(value = "设备编号", dataType = "String")
+    @ApiModelProperty(value = "统一编号", dataType = "String")
     @TableField("device_no")
     private String deviceNo;
 
     /**
      * 设备名字
      */
-    @NotEmpty(message = "设备名字不能为空")
-    @ApiModelProperty(value = "设备名字", dataType = "String")
+    @ExcelProperty(value = "设备名称", order = 4)
+    @NotEmpty(message = "设备名称不能为空")
+    @ApiModelProperty(value = "设备名称", dataType = "String")
     @TableField("device_name")
     private String deviceName;
 
     /**
      * 检定员id
      */
-    @ApiModelProperty(value = "检定员id", dataType = "String")
+    @ApiModelProperty(value = "检定员id", dataType = "Long")
     @TableField("measure_person_id")
     private Long measurePersonId;
 
     /**
      * 检定员名字
      */
+    @ExcelProperty(value = "检定员", order = 5)
     @ApiModelProperty(value = "检定员名字", dataType = "String")
     @TableField("measure_person")
     private String measurePerson;
@@ -103,7 +112,8 @@
     /**
      * 更新时间
      */
-    @ApiModelProperty(value = "更新时间", dataType = "String")
+    @ExcelProperty(value = "打印时间", order = 6)
+    @ApiModelProperty(value = "打印时间", dataType = "String")
     @TableField("update_time")
     private String updateTime;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceAssess.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceAssess.java
index 659d9ca..6720b90 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceAssess.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceAssess.java
@@ -1,11 +1,26 @@
 package com.casic.missiles.model.business;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 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 com.casic.missiles.dto.BaseRequest;
+import com.casic.missiles.dto.business.outsource.OrderSampleDTO;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import javax.validation.constraints.NotEmpty;
 import java.io.Serializable;
+import java.util.List;
 
 /**
  * <p>
@@ -15,146 +30,231 @@
  * @author wangpeng
  * @since 2023-08-16
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
+@ApiModel
 @Data
 @TableName("biz_business_outsource_assess")
-public class BizBusinessOutsourceAssess implements Serializable {
+public class BizBusinessOutsourceAssess extends BaseRequest implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
+    @ApiModelProperty(value = "id，更新/删除使用参数", dataType = "Long")
     @TableId("id")
     private Long id;
 
     /**
      * 评审表编号
      */
+    @ExcelProperty(value = "评审表编号", order = 1)
+    @ApiModelProperty(value = "评审表编号(后台生成)", dataType = "String")
     @TableField("project_no")
     private String projectNo;
 
     /**
      * 评审表名称
      */
+    @ExcelProperty(value = "评审表名称", order = 2)
+    @ApiModelProperty(value = "评审表名称", dataType = "String")
     @TableField("project_name")
     private String projectName;
 
+    @NotEmpty(message = "实验室代码不能为空")
+    @DictCodeField(message = "实验室代码描述不合法", cacheName = MeterDictCode.LAB_CODE)
+    @ApiModelProperty(value = "实验室代码(字典code)", dataType = "String")
+    @TableField("lab_code")
+    private String labCode;
+
+    @ApiModelProperty(value = "实验室代码(字典value)", dataType = "String")
+    @TableField(exist = false)
+    private String labCodeName;
+
+    /**
+     * 组别代码
+     */
+    @NotEmpty(message = "组别代码不能为空")
+    @DictCodeField(message = "组别代码描述不合法", cacheName = MeterDictCode.GROUP_CODE)
+    @ApiModelProperty(value = "组别代码(字典code)", dataType = "String")
+    @TableField("group_code")
+    private String groupCode;
+
+    @ApiModelProperty(value = "组别代码(字典value)", dataType = "String")
+    @TableField(exist = false)
+    private String groupCodeName;
+
     /**
      * 申请人id
      */
+    @ApiModelProperty(value = "申请人id", dataType = "String")
     @TableField("applicant_id")
     private Long applicantId;
 
     /**
      * 申请人名字
      */
+    @ExcelProperty(value = "申请人", order = 5)
+    @ApiModelProperty(value = "申请人", dataType = "String")
     @TableField("applicant_name")
     private String applicantName;
 
     /**
      * 申请时间
      */
+    @ExcelProperty(value = "申请时间", order = 6)
+    @ApiModelProperty(value = "申请时间", dataType = "String")
     @TableField("applicant_time")
     private String applicantTime;
 
     /**
      * 附件(minio存储文件名)
      */
+    @ApiModelProperty(value = "附件(minio存储文件名)", dataType = "String")
     @TableField("minio_file_name")
     private String minioFileName;
 
     /**
      * 备注
      */
+    @ApiModelProperty(value = "备注", dataType = "String")
     @TableField("remark")
     private String remark;
 
     /**
      * 创建人id
      */
+    @ApiModelProperty(value = "创建人id", dataType = "String")
     @TableField("create_user_id")
     private Long createUserId;
 
     /**
      * 创建人名字
      */
+    @ApiModelProperty(value = "创建人名字", dataType = "String")
     @TableField("create_user_name")
     private String createUserName;
 
     /**
      * 分包方id
      */
+    @ApiModelProperty(value = "评审表编号", dataType = "String")
     @TableField("outsourcer_id")
     private Long outsourcerId;
 
     /**
      * 预计开始时间
      */
+    @ApiModelProperty(value = "预计开始时间", dataType = "String")
     @TableField("pre_start_time")
     private String preStartTime;
 
     /**
      * 预计结束时间
      */
+    @ApiModelProperty(value = "预计结束时间", dataType = "String")
     @TableField("pre_end_time")
     private String preEndTime;
 
     /**
      * 分包原因-字典
      */
+    @ApiModelProperty(value = "分包原因(字典code)", dataType = "String")
+    @DictCodeField(message = "分包原因描述不合法", cacheName = MeterDictCode.OUTSOURCE_REASON)
     @TableField("outsource_reason")
     private String outsourceReason;
 
+    @ApiModelProperty(value = "分包原因(字典value)", dataType = "String")
+    @TableField(exist = false)
+    private String outsourceReasonName;
+
     /**
      * 预计费用
      */
+    @ApiModelProperty(value = "预计费用", dataType = "String")
     @TableField("pre_cost")
     private String preCost;
 
     /**
      * 审批状态
      */
+    @ApiModelProperty(value = "审批状态", dataType = "String")
+    @DictCodeField(message = "审批状态描述不合法", cacheName = MeterDictCode.APPROVAL_STATUS)
     @TableField("approval_status")
     private String approvalStatus;
 
     /**
      * 流程实例id
      */
+    @ApiModelProperty(value = "流程实例id", dataType = "String")
     @TableField("process_id")
     private String processId;
 
     /**
      * 实验室认可情况
      */
+    @ApiModelProperty(value = "实验室认可情况", dataType = "String")
     @TableField("approve_situation")
     private String approveSituation;
 
     /**
      * 溯源性
      */
+    @ApiModelProperty(value = "溯源性", dataType = "String")
     @TableField("traceability")
     private String traceability;
 
     /**
      * 测试方法
      */
+    @ApiModelProperty(value = "测试方法", dataType = "String")
     @TableField("test_method")
     private String testMethod;
 
     /**
      * 技术能力
      */
+    @ApiModelProperty(value = "技术能力", dataType = "String")
     @TableField("technique_ability")
     private String techniqueAbility;
 
     /**
      * 创建时间
      */
+    @ApiModelProperty(hidden = true)
     @TableField("create_time")
     private String createTime;
 
     /**
      * 更新时间
      */
+    @ApiModelProperty(hidden = true)
     @TableField("update_time")
     private String updateTime;
 
+    @ApiModelProperty(value = "审批状态类型-字典value", dataType = "String")
+    @TableField(exist = false)
+    private String approvalStatusName;
 
+    @ApiModelProperty(value = "任务id（同意、驳回等操作使用）", dataType = "String")
+    @TableField(exist = false)
+    private String taskId;
+
+    @ApiModelProperty(value = "可选决策项（1同意驳回拒绝 2同意驳回 3同意拒绝，用于待审批列表同意/驳回/拒绝按钮展示）", dataType = "Integer")
+    @TableField(exist = false)
+    private Integer decisionItem;
+
+    @NotEmpty(message = "受检设备信息不能为空")
+    @ApiModelProperty(value = "受检设备id列表（新建使用参数）", dataType = "List")
+    @TableField(exist = false)
+    private List<OrderSampleDTO> orderSampleList;
+
+    @ExcelProperty(value = "分包机构名称", order = 3)
+    @ApiModelProperty(value = "分包机构名称（列表返回参数）", dataType = "String")
+    private String outsourcerName;
+
+    @ExcelProperty(value = "机构负责人", order = 4)
+    @ApiModelProperty(value = "机构负责人（列表返回参数）", dataType = "String")
+    private String director;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceProtocol.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceProtocol.java
new file mode 100644
index 0000000..38df697
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceProtocol.java
@@ -0,0 +1,225 @@
+package com.casic.missiles.model.business;
+
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
+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 com.casic.missiles.dto.BaseRequest;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotEmpty;
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 计量检定业务-分包管理-测试、校准或检定工作分包协议书
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-08-24
+ */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
+@Data
+@TableName("biz_business_outsource_protocol")
+public class BizBusinessOutsourceProtocol extends BaseRequest implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "id，更新/删除使用参数", dataType = "Long")
+    @TableId("id")
+    private Long id;
+
+    /**
+     * 协议书编号
+     */
+    @ExcelProperty(value = "协议书编号", order = 1)
+    @ApiModelProperty(value = "协议书编号(后台生成)", dataType = "String")
+    @TableField("protocol_no")
+    private String protocolNo;
+
+    /**
+     * 协议书名称
+     */
+    @ExcelProperty(value = "协议书名称", order = 2)
+    @ApiModelProperty(value = "协议书名称", dataType = "String")
+    @TableField("project_name")
+    private String projectName;
+
+    @NotEmpty(message = "实验室代码不能为空")
+    @DictCodeField(message = "实验室代码描述不合法", cacheName = MeterDictCode.LAB_CODE)
+    @ApiModelProperty(value = "实验室代码(字典code)", dataType = "String")
+    @TableField("lab_code")
+    private String labCode;
+
+    @ApiModelProperty(value = "实验室代码(字典value)", dataType = "String")
+    @TableField(exist = false)
+    private String labCodeName;
+
+    @NotEmpty(message = "组别代码不能为空")
+    @DictCodeField(message = "组别代码描述不合法", cacheName = MeterDictCode.GROUP_CODE)
+    @ApiModelProperty(value = "组别代码(字典code)", dataType = "String")
+    @TableField("group_code")
+    private String groupCode;
+
+    @ApiModelProperty(value = "组别代码(字典value)", dataType = "String")
+    @TableField(exist = false)
+    private String groupCodeName;
+
+    /**
+     * 分包方id
+     */
+    @ApiModelProperty(value = "分包方id", dataType = "Long")
+    @TableField("outsourcer_id")
+    private Long outsourcerId;
+
+    /**
+     * 其他
+     */
+    @ApiModelProperty(value = "其他", dataType = "String")
+    @TableField("remark")
+    private String remark;
+
+    /**
+     * 分包方编号
+     */
+    @ApiModelProperty(value = "分包方编号(新建不用传)", dataType = "String")
+    @TableField("outsource_no")
+    private String outsourceNo;
+
+    /**
+     * 分包方名称
+     */
+    @ExcelProperty(value = "分包方名称", order = 3)
+    @ApiModelProperty(value = "分包方名称(新建不用传)", dataType = "String")
+    @TableField("outsource_name")
+    private String outsourceName;
+
+    /**
+     * 联系人
+     */
+    @ExcelProperty(value = "联系人", order = 4)
+    @ApiModelProperty(value = "联系人", dataType = "String")
+    @TableField("contacts")
+    private String contacts;
+
+    /**
+     * 电话
+     */
+    @ApiModelProperty(value = "电话", dataType = "String")
+    @TableField("mobile")
+    private String mobile;
+
+    /**
+     * 地址
+     */
+    @ApiModelProperty(value = "地址", dataType = "String")
+    @TableField("address")
+    private String address;
+
+    /**
+     * 要求完成日期
+     */
+    @ApiModelProperty(value = "要求完成日期", dataType = "String")
+    @TableField("require_date")
+    private String requireDate;
+
+    /**
+     * 分包费用(元)
+     */
+    @ApiModelProperty(value = "分包费用(元)", dataType = "String")
+    @TableField("outsource_cost")
+    private Double outsourceCost;
+
+    /**
+     * 分包方负责人
+     */
+    @ApiModelProperty(value = "分包方负责人", dataType = "String")
+    @TableField("director")
+    private String director;
+
+    /**
+     * 分包项目
+     */
+    @ApiModelProperty(value = "分包项目", dataType = "String")
+    @TableField("item")
+    private String item;
+
+    /**
+     * 分包要求
+     */
+    @ApiModelProperty(value = "分包要求", dataType = "String")
+    @TableField("requires")
+    private String requires;
+
+    /**
+     * 创建人id
+     */
+    @ApiModelProperty(hidden = true)
+    @TableField("create_user_id")
+    private Long createUserId;
+
+    /**
+     * 创建人名字
+     */
+    @ExcelProperty(value = "申请人", order = 5)
+    @ApiModelProperty(value = "申请人", dataType = "String")
+    @TableField("create_user_name")
+    private String createUserName;
+
+    /**
+     * 审批状态
+     */
+    @ApiModelProperty(value = "审批状态", dataType = "String")
+    @DictCodeField(message = "审批状态描述不合法", cacheName = MeterDictCode.APPROVAL_STATUS)
+    @TableField("approval_status")
+    private String approvalStatus;
+
+    /**
+     * 流程实例id
+     */
+    @ApiModelProperty(value = "流程实例id", dataType = "String")
+    @TableField("process_id")
+    private String processId;
+
+    /**
+     * 创建时间
+     */
+    @ExcelProperty(value = "申请时间", order = 6)
+    @ApiModelProperty(value = "申请时间", dataType = "String")
+    @TableField("create_time")
+    private String createTime;
+
+    /**
+     * 更新时间
+     */
+    @ApiModelProperty(hidden = true)
+    @TableField("update_time")
+    private String updateTime;
+
+    @ApiModelProperty(value = "审批状态类型-字典value", dataType = "String")
+    @TableField(exist = false)
+    private String approvalStatusName;
+
+    @ApiModelProperty(value = "任务id（同意、驳回等操作使用）", dataType = "String")
+    @TableField(exist = false)
+    private String taskId;
+
+    @ApiModelProperty(value = "可选决策项（1同意驳回拒绝 2同意驳回 3同意拒绝，用于待审批列表同意/驳回/拒绝按钮展示）", dataType = "Integer")
+    @TableField(exist = false)
+    private Integer decisionItem;
+
+
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourcerInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourcerInfo.java
index ec4e997..f9aa69e 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourcerInfo.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourcerInfo.java
@@ -17,6 +17,7 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import javax.validation.constraints.NotEmpty;
 import java.io.Serializable;
 
 /**
@@ -59,6 +60,29 @@
     @TableField("outsourcer_name")
     private String outsourcerName;
 
+    @NotEmpty(message = "实验室代码不能为空")
+    @DictCodeField(message = "实验室代码描述不合法", cacheName = MeterDictCode.LAB_CODE)
+    @ApiModelProperty(value = "实验室代码(字典code)", dataType = "String")
+    @TableField("lab_code")
+    private String labCode;
+
+    @ApiModelProperty(value = "实验室代码(字典value)", dataType = "String")
+    @TableField(exist = false)
+    private String labCodeName;
+
+    /**
+     * 组别代码
+     */
+    @NotEmpty(message = "组别代码不能为空")
+    @DictCodeField(message = "组别代码描述不合法", cacheName = MeterDictCode.GROUP_CODE)
+    @ApiModelProperty(value = "组别代码(字典code)", dataType = "String")
+    @TableField("group_code")
+    private String groupCode;
+
+    @ApiModelProperty(value = "组别代码(字典value)", dataType = "String")
+    @TableField(exist = false)
+    private String groupCodeName;
+
     /**
      * 单位简称
      */
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardInfo.java
index c48eed7..dffdfdd 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardInfo.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardInfo.java
@@ -5,6 +5,7 @@
 import com.baomidou.mybatisplus.annotation.TableName;
 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;
 
@@ -18,6 +19,7 @@
  * @author wangpeng
  * @since 2023-08-04
  */
+@ApiModel
 @Data
 @TableName("biz_equipment_standard_info")
 public class BizEquipmentStandardInfo implements Serializable {
@@ -119,7 +121,7 @@
      * 管理状态(字典code)
      */
     @ApiModelProperty(value = "管理状态(字典code)", dataType = "String")
-    @DictCodeField(message = "管理状态不合法", cacheName = MeterDictCode.MANAGER_STATE)
+    @DictCodeField(message = "管理状态不合法", cacheName = MeterDictCode.STANDARD_MANAGER_STATE)
     @TableField("manage_status")
     private String manageStatus;
 
@@ -151,7 +153,7 @@
     /**
      * 温度(℃)
      */
-    @ApiModelProperty(value = "使用状态(字典code)", dataType = "String")
+    @ApiModelProperty(value = "温度(℃)", dataType = "String")
     @TableField("temperature")
     private Double temperature;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardInfoApproval.java b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardInfoApproval.java
index dbd86ab..9f58d83 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardInfoApproval.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardInfoApproval.java
@@ -150,7 +150,7 @@
      * 管理状态(字典code)
      */
     @ApiModelProperty(value = "管理状态(字典code)", dataType = "String")
-    @DictCodeField(message = "管理状态不合法", cacheName = MeterDictCode.MANAGER_STATE)
+    @DictCodeField(message = "管理状态不合法", cacheName = MeterDictCode.STANDARD_MANAGER_STATE)
     @TableField("manage_status")
     private String manageStatus;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardTechnologyRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardTechnologyRelation.java
index 0e612bd..751f26b 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardTechnologyRelation.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardTechnologyRelation.java
@@ -3,6 +3,7 @@
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -16,6 +17,7 @@
  * @author wangpeng
  * @since 2023-08-04
  */
+@ApiModel
 @Data
 @TableName("biz_equipment_standard_technology_relation")
 public class BizEquipmentStandardTechnologyRelation implements Serializable {
@@ -33,6 +35,10 @@
     @TableField("technology_file_id")
     private Long technologyFileId;
 
+    @ApiModelProperty(value = "依据的技术文件编号", dataType = "String")
+    @TableField("technology_file_no")
+    private String technologyFileNo;
+
     /**
      * 依据的技术文件名称(技术文件中现行测试校准检定方法表文件名字段)
      */
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerInfo.java
index d6e8bed..65cd6bc 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerInfo.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerInfo.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.model.resource;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -21,6 +28,11 @@
  * @author wangpeng
  * @since 2023-08-08
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @ApiModel
 @Data
 @TableName("biz_resource_customer_info")
@@ -35,6 +47,7 @@
     /**
      * 委托方编号
      */
+    @ExcelProperty(value = "委托方编号", order = 1)
     @ApiModelProperty(value = "委托方编号", dataType = "String")
     @TableField("customer_no")
     private String customerNo;
@@ -42,6 +55,7 @@
     /**
      * 委托方名称
      */
+    @ExcelProperty(value = "委托方名称", order = 2)
     @ApiModelProperty(value = "委托方名称(新建时为下拉选择一个受检单位组织的名字，传deptId字段，后端获取名称)", dataType = "String")
     @TableField("customer_name")
     private String customerName;
@@ -63,6 +77,7 @@
     /**
      * 联系人
      */
+    @ExcelProperty(value = "联系人", order = 3)
     @ApiModelProperty(value = "联系人", dataType = "String")
     @TableField("contacts")
     private String contacts;
@@ -70,6 +85,7 @@
     /**
      * 座机电话
      */
+    @ExcelProperty(value = "座机电话", order = 4)
     @ApiModelProperty(value = "座机电话", dataType = "String")
     @TableField("mobile")
     private String mobile;
@@ -77,6 +93,7 @@
     /**
      * 手机号码
      */
+    @ExcelProperty(value = "手机号码", order = 5)
     @ApiModelProperty(value = "手机号码", dataType = "String")
     @TableField("phone")
     private String phone;
@@ -91,6 +108,7 @@
     /**
      * 地址
      */
+    @ExcelProperty(value = "地址", order = 6)
     @ApiModelProperty(value = "地址", dataType = "String")
     @TableField("address")
     private String address;
@@ -141,6 +159,7 @@
     /**
      * 创建时间
      */
+    @ExcelProperty(value = "创建时间", order = 7)
     @ApiModelProperty(value = "创建时间", dataType = "String")
     @TableField("create_time")
     private String createTime;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerSuggestForm.java b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerSuggestForm.java
index 7201bbd..701bf8b 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerSuggestForm.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerSuggestForm.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.model.resource;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -22,6 +29,11 @@
  * @author wangpeng
  * @since 2023-08-08
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @ApiModel
 @Data
 @TableName("biz_resource_customer_suggest_form")
@@ -44,7 +56,8 @@
     /**
      * 委托方名称
      */
-    @ApiModelProperty(value = "委托方名称", dataType = "String")
+    @ExcelProperty(value = "意见反馈单位", order = 2)
+    @ApiModelProperty(value = "意见反馈单位", dataType = "String")
     @TableField("customer_name")
     private String customerName;
 
@@ -59,7 +72,8 @@
     /**
      * 委托方意见反馈部门名称
      */
-    @ApiModelProperty(value = "委托方意见反馈部门名称", dataType = "String")
+    @ExcelProperty(value = "委托方意见反馈部门", order = 3)
+    @ApiModelProperty(value = "委托方意见反馈部门", dataType = "String")
     @TableField("customer_dept_name")
     private String customerDeptName;
 
@@ -73,6 +87,7 @@
     /**
      * 表单编号
      */
+    @ExcelProperty(value = "表单编号", order = 1)
     @ApiModelProperty(value = "表单编号", dataType = "String")
     @TableField("form_no")
     private String formNo;
@@ -111,6 +126,7 @@
     /**
      * 创建人名字
      */
+    @ExcelProperty(value = "创建人", order = 4)
     @ApiModelProperty(value = "创建人名字", dataType = "String")
     @TableField("create_user_name")
     private String createUserName;
@@ -147,6 +163,7 @@
     /**
      * 创建时间
      */
+    @ExcelProperty(value = "创建时间", order = 5)
     @ApiModelProperty(value = "创建时间", dataType = "String")
     @TableField("create_time")
     private String createTime;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSealInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSealInfo.java
index cbf05d7..9bf389d 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSealInfo.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSealInfo.java
@@ -106,6 +106,10 @@
     @TableField("minio_file_name")
     private String minioFileName;
 
+    @ApiModelProperty(value = "minio存储文件url", dataType = "String")
+    @TableField(exist = false)
+    private String minioFileUrl;
+
     @ApiModelProperty(value = "创建时间", dataType = "String")
     @TableField("create_time")
     private String createTime;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSealUseNote.java b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSealUseNote.java
index 3f2d9e8..3ce16a8 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSealUseNote.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSealUseNote.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.model.resource;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -20,6 +27,11 @@
  * @author wangpeng
  * @since 2023-07-28
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @ApiModel
 @Data
 @TableName("biz_resource_seal_use_note")
@@ -34,6 +46,7 @@
     /**
      * 登记表编号
      */
+    @ExcelProperty(value = "申请单编号", order = 1)
     @ApiModelProperty(value = "登记表编号(自动生成)", dataType = "String")
     @TableField("note_form_no")
     private String noteFormNo;
@@ -55,6 +68,7 @@
     /**
      * 申请部门
      */
+    @ExcelProperty(value = "申请部门", order = 5)
     @ApiModelProperty(value = "申请部门", dataType = "String")
     @TableField("apply_dept_name")
     private String applyDeptName;
@@ -69,6 +83,7 @@
     /**
      * 申请人
      */
+    @ExcelProperty(value = "申请人", order = 6)
     @ApiModelProperty(value = "申请人", dataType = "String")
     @TableField("apply_user_name")
     private String applyUserName;
@@ -76,6 +91,7 @@
     /**
      * 申请时间
      */
+    @ExcelProperty(value = "申请时间", order = 7)
     @ApiModelProperty(value = "申请时间(新增自动获取当前时间)", dataType = "String")
     @TableField("apply_time")
     private String applyTime;
@@ -130,6 +146,26 @@
     @TableField("update_time")
     private String updateTime;
 
+    @ExcelProperty(value = "印章名称", order = 2)
+    @ApiModelProperty(value = "印章名称(列表返回参数)", dataType = "String")
+    @TableField(exist = false)
+    private String sealName;
+
+    @DictCodeField(message = "印章类型描述不合法", cacheName = MeterDictCode.SEAL_TYPE)
+    @ApiModelProperty(hidden = true)
+    @TableField(exist = false)
+    private String sealType;
+
+    @ExcelProperty(value = "印章类型", order = 3)
+    @ApiModelProperty(value = "印章类型(列表返回参数)", dataType = "String")
+    @TableField(exist = false)
+    private String sealTypeName;
+
+    @ExcelProperty(value = "批准人", order = 4)
+    @ApiModelProperty(value = "批准人(列表返回参数)", dataType = "String")
+    @TableField(exist = false)
+    private String approverName;
+
     @ApiModelProperty(value = "审批状态类型-字典value", dataType = "String")
     @TableField(exist = false)
     private String approvalStatusName;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceStaffInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceStaffInfo.java
index 5ef995b..41563a1 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceStaffInfo.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceStaffInfo.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.model.resource;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -20,6 +27,11 @@
  * @author wangpeng
  * @since 2023-07-25
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @ApiModel
 @Data
 @TableName("biz_resource_staff_info")
@@ -38,6 +50,7 @@
     /**
      * 人员编号
      */
+    @ExcelProperty(value = "人员编号",order = 0)
     @NotEmpty(message = "人员编号不能为空")
     @ApiModelProperty(value = "人员编号", dataType = "String")
     @TableField("staff_no")
@@ -46,6 +59,7 @@
     /**
      * 姓名
      */
+    @ExcelProperty(value = "姓名",order = 1)
     @ApiModelProperty(value = "姓名", dataType = "String")
     @TableField("staff_name")
     private String staffName;
@@ -152,13 +166,15 @@
     /**
      * 部门名字
      */
-    @ApiModelProperty(value = "部门名字", dataType = "String")
+    @ExcelProperty(value = "工作部门",order = 4)
+    @ApiModelProperty(value = "工作部门", dataType = "String")
     @TableField("dept_name")
     private String deptName;
 
     /**
      * 岗位
      */
+    @ExcelProperty(value = "岗位",order = 2)
     @ApiModelProperty(value = "岗位", dataType = "String")
     @TableField("station")
     private String station;
@@ -166,6 +182,7 @@
     /**
      * 计量专业
      */
+    @ExcelProperty(value = "计量专业",order = 5)
     @ApiModelProperty(value = "计量专业", dataType = "String")
     @TableField("major")
     private String major;
@@ -173,6 +190,7 @@
     /**
      * 证号
      */
+    @ExcelProperty(value = "证号",order = 3)
     @ApiModelProperty(value = "证号", dataType = "String")
     @TableField("certificate_number")
     private String certificateNumber;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSupplierInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSupplierInfo.java
index eb5ef01..a1e2697 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSupplierInfo.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSupplierInfo.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.model.resource;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -20,6 +27,11 @@
  * @author wangpeng
  * @since 2023-07-27
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @ApiModel
 @Data
 @TableName("biz_resource_supplier_info")
@@ -34,6 +46,7 @@
     /**
      * 供方编号
      */
+    @ExcelProperty(value = "供方编号", order = 1)
     @ApiModelProperty(value = "供方编号(自动生成)", dataType = "String")
     @TableField("supplier_no")
     private String supplierNo;
@@ -41,6 +54,7 @@
     /**
      * 供方名称
      */
+    @ExcelProperty(value = "供方名称", order = 2)
     @ApiModelProperty(value = "供方名称", dataType = "String")
     @TableField("supplier_name")
     private String supplierName;
@@ -60,6 +74,7 @@
     @TableField("supplier_type")
     private String supplierType;
 
+    @ExcelProperty(value = "供方类型", order = 3)
     @ApiModelProperty(value = "供方类型(字典value)", dataType = "String")
     @TableField(exist = false)
     private String supplierTypeName;
@@ -109,7 +124,8 @@
     /**
      * 电话
      */
-    @ApiModelProperty(value = "电话", dataType = "String")
+    @ExcelProperty(value = "联系电话", order = 4)
+    @ApiModelProperty(value = "联系电话", dataType = "String")
     @TableField("phone")
     private String phone;
 
@@ -158,6 +174,7 @@
     /**
      * 公司地址-省
      */
+    @ExcelProperty(value = "地址-省", order = 6)
     @ApiModelProperty(value = "公司地址-省", dataType = "String")
     @TableField("company_province_name")
     private String companyProvinceName;
@@ -172,6 +189,7 @@
     /**
      * 公司地址-市
      */
+    @ExcelProperty(value = "地址-市", order = 7)
     @ApiModelProperty(value = "公司地址-市", dataType = "String")
     @TableField("company_city_name")
     private String companyCityName;
@@ -186,6 +204,7 @@
     /**
      * 公司地址-区
      */
+    @ExcelProperty(value = "地址-区", order = 8)
     @ApiModelProperty(value = "公司地址-区", dataType = "String")
     @TableField("company_area_name")
     private String companyAreaName;
@@ -193,6 +212,7 @@
     /**
      * 公司地址-详细地址
      */
+    @ExcelProperty(value = "地址-详细地址", order = 9)
     @ApiModelProperty(value = "公司地址-详细地址", dataType = "String")
     @TableField("company_address")
     private String companyAddress;
@@ -200,6 +220,7 @@
     /**
      * 服务和供应的内容
      */
+    @ExcelProperty(value = "服务和供应的内容", order = 5)
     @ApiModelProperty(value = "服务和供应的内容", dataType = "String")
     @TableField("supplier_content")
     private String supplierContent;
@@ -250,6 +271,7 @@
     /**
      * 创建时间
      */
+    @ExcelProperty(value = "创建时间", order = 9)
     @ApiModelProperty(value = "创建时间", dataType = "String")
     @TableField("create_time")
     private String createTime;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/EnvLocationInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/EnvLocationInfo.java
new file mode 100644
index 0000000..d8e2d7b
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/EnvLocationInfo.java
@@ -0,0 +1,83 @@
+package com.casic.missiles.model.resource;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotEmpty;
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 实验室环境监控系统-设备表
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-06-07
+ */
+@ApiModel
+@Data
+@TableName("env_location_info")
+public class EnvLocationInfo implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "主键id", dataType = "Long")
+    @TableId("id")
+    private Long id;
+
+    /**
+     * 地点编号
+     */
+    @NotEmpty(message = "地点编号不能为空")
+    @ApiModelProperty(value = "地点编号", dataType = "String")
+    @TableField("location_no")
+    private String locationNo;
+
+    /**
+     * 地点名称
+     */
+    @ApiModelProperty(value = "地点名称", dataType = "String")
+    @TableField("location_name")
+    private String locationName;
+
+    /**
+     * 地点位置
+     */
+    @ApiModelProperty(value = "地点位置", dataType = "String")
+    @TableField("location_position")
+    private String locationPosition;
+
+    /**
+     * 创建人id
+     */
+    @ApiModelProperty(value = "创建人id", dataType = "Long")
+    @TableField("create_user_id")
+    private Long createUserId;
+
+    /**
+     * 创建人
+     */
+    @ApiModelProperty(value = "创建人", dataType = "String")
+    @TableField("create_user")
+    private String createUser;
+
+    /**
+     * 创建时间
+     */
+    @ApiModelProperty(value = "创建时间", dataType = "String")
+    @TableField("create_time")
+    private String createTime;
+
+    /**
+     * 更新时间
+     */
+    @ApiModelProperty(value = "更新时间", dataType = "String")
+    @TableField("update_time")
+    private String updateTime;
+
+
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemFileConfig.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemFileConfig.java
index 19e6845..86e569c 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemFileConfig.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemFileConfig.java
@@ -30,7 +30,7 @@
     @ApiModelProperty(value = "系统类别(1业务系统2受检系统3环境系统)", dataType = "Integer")
     @NotNull(message = "系统类别不能为空")
     @TableField("system_type")
-    private Integer systemType;
+    private Integer systemType = 1;
 
     @ApiModelProperty("下载编号")
     @TableField("download_no")
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemNotice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemNotice.java
index e94297d..06ec37d 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemNotice.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemNotice.java
@@ -34,7 +34,7 @@
     @ApiModelProperty(value = "系统类别(1业务系统2受检系统3环境系统)", dataType = "Integer")
     @NotNull(message = "系统类别不能为空")
     @TableField("system_type")
-    private Integer systemType;
+    private Integer systemType = 1;
 
     /**
      * 通知公告编号
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSign.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSign.java
index 6c0d7c9..954f4f8 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSign.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSign.java
@@ -51,7 +51,7 @@
     @ApiModelProperty(value = "系统类别(1业务系统2受检系统3环境系统)", dataType = "Integer")
     @NotNull(message = "系统类别不能为空")
     @TableField("system_type")
-    private Integer systemType;
+    private Integer systemType = 1;
 
     /**
      * 签名编号
@@ -130,4 +130,8 @@
     @TableField(exist = false)
     private List<Long> userIdList;
 
+    @ApiModelProperty(hidden = true)
+    @TableField(exist = false)
+    private String deptName;
+
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemTemplate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemTemplate.java
index 503a457..1d27ebe 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemTemplate.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemTemplate.java
@@ -47,7 +47,7 @@
     @ApiModelProperty(value = "系统类别(1业务系统2受检系统3环境系统)", dataType = "Integer")
     @NotNull(message = "系统类别不能为空")
     @TableField("system_type")
-    private Integer systemType;
+    private Integer systemType = 1;
 
     /**
      * 模板编号
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java
index 8c21cb0..f61e4a8 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java
@@ -32,4 +32,8 @@
     ReturnDTO approvalDelete(ApprovalDeleteRequest request);
 
     ReturnDTO failUpdate(T request);
+
+    List<O> listExport(R request);
+
+    List<O> listExportByIds(List<Long> ids);
 }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java
index 724166f..9bce15b 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java
@@ -157,6 +157,29 @@
         throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
     }
 
+    @Override
+    public List<O> listExport(R request) {
+        request.setCreateUserId(null);
+        request.setApprovalStatus(ApprovalStatusEnum.PASSED);
+        Page<O> page = PageFactory.defaultPage();
+        page.setCurrent(1);
+        page.setSearchCount(false);
+        page.setSize(Integer.MAX_VALUE);
+        Page<O> resultPage = this.baseMapper.selectBatchForApprovalList(page, request, null);
+        return resultPage.getRecords();
+    }
+
+    @Override
+    public List<O> listExportByIds(List<Long> ids) {
+        Page<O> page = PageFactory.defaultPage();
+        page.setCurrent(1);
+        page.setSearchCount(false);
+        page.setSize(Integer.MAX_VALUE);
+        List<String> businessKeys = ids.stream().map(String::valueOf).collect(Collectors.toList());
+        Page<O> resultPage = this.baseMapper.selectBatchForApprovalList(page, null, businessKeys);
+        return resultPage.getRecords();
+    }
+
     protected ReturnDTO updateApprovalStatus(Long id, String processId, String approvalStatus) {
         UpdateWrapper<T> updateWrapper = new UpdateWrapper<>();
         updateWrapper.eq("id", id);
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificatePrintServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificatePrintServiceImpl.java
index f6e4706..3228497 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificatePrintServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificatePrintServiceImpl.java
@@ -162,6 +162,30 @@
         return ReturnUtil.success(printLogMapper.selectList(wrapper));
     }
 
+    @Override
+    public List<CertificatePrintListResponse> listByIds(List<Long> ids) {
+        Page<CertificatePrintListResponse> page = PageFactory.defaultPage();
+        page.setCurrent(1);
+        page.setSearchCount(false);
+        page.setSize(Integer.MAX_VALUE);
+        List<String> businessKeys = ids.stream().map(String::valueOf).collect(Collectors.toList());
+        Page<CertificatePrintListResponse> resultPage = this.baseMapper.selectBatchForApprovalList(page, null, businessKeys);
+        return resultPage.getRecords();
+    }
+
+    @Override
+    public List<CertificatePrintListResponse> list(CertificatePrintApprovalListRequest request) {
+        request.setCreateUserId(null);
+        request.setApprovalStatus(null);
+        request.setPrintStatus(null);
+        Page<CertificatePrintListResponse> page = PageFactory.defaultPage();
+        page.setCurrent(1);
+        page.setSearchCount(false);
+        page.setSize(Integer.MAX_VALUE);
+        Page<CertificatePrintListResponse> resultPage = certificatePrintMapper.selectBatchForApprovalList(page, request, null);
+        return resultPage.getRecords();
+    }
+
     private void savePrintLog(Long id) {
         BizBusinessCertificatePrintLog printLog = new BizBusinessCertificatePrintLog();
         BizBusinessCertificatePrint certificatePrint = certificatePrintMapper.selectById(id);
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificateReportServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificateReportServiceImpl.java
index 457555f..24146be 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificateReportServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificateReportServiceImpl.java
@@ -158,8 +158,8 @@
         QueryWrapper<BizBusinessCertificateMeasureResultData> mWrapper = new QueryWrapper<>();
         mWrapper.eq("report_id", reportId);
         boolean mRemove = certificateMeasureResultDataService.remove(mWrapper);
-        Assert.isFalse(eRemove || mRemove, () -> {
+        if(!eRemove || !mRemove){
             throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
-        });
+        }
     }
 }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessIdentifyInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessIdentifyInfoServiceImpl.java
index 4c8e190..f7e63ca 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessIdentifyInfoServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessIdentifyInfoServiceImpl.java
@@ -1,8 +1,10 @@
 package com.casic.missiles.service.Impl.business;
 
+import cn.hutool.core.date.DateUtil;
 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.core.page.PageFactory;
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.business.identify.IdentifyListRequest;
@@ -14,11 +16,14 @@
 import com.casic.missiles.service.business.IBizBusinessIdentifyInfoService;
 import com.casic.missiles.utils.DictCodeUtils;
 import com.casic.missiles.utils.NumberGeneratorUtil;
+import com.casic.missiles.utils.QRCodeUtil;
 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.List;
+
 /**
  * <p>
  * 计量检定业务-任务计量管理-标识打印 服务实现类
@@ -35,9 +40,9 @@
     @Override
     public Page<BizBusinessIdentifyInfo> identifyListPage(Page<BizBusinessIdentifyInfo> page, IdentifyListRequest request) throws Exception {
         QueryWrapper<BizBusinessIdentifyInfo> wrapper = new QueryWrapper<>();
-        wrapper.eq("identify_type", request.getIdentifyType());
-        wrapper.like("device_no", request.getDeviceNo());
-        wrapper.like("device_name", request.getDeviceName());
+        wrapper.eq(StringUtils.isNotEmpty(request.getIdentifyType()), "identify_type", request.getIdentifyType());
+        wrapper.like(StringUtils.isNotEmpty(request.getDeviceNo()),"device_no", request.getDeviceNo());
+        wrapper.like(StringUtils.isNotEmpty(request.getDeviceName()), "device_name", request.getDeviceName());
         wrapper.apply(StringUtils.isNotBlank(request.getCreateTimeStart()),
                 "{0} <= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getCreateTimeStart().split(" ")[0]);
         wrapper.apply(StringUtils.isNotBlank(request.getCreateTimeEnd()),
@@ -64,8 +69,11 @@
     }
 
     @Override
-    public ReturnDTO updateIdentify(BizBusinessIdentifyInfo identifyInfo) {
-        if(identifyInfoMapper.updateById(identifyInfo) > 0){
+    public ReturnDTO updateIdentify(Long id) {
+        BizBusinessIdentifyInfo info = new BizBusinessIdentifyInfo();
+        info.setId(id);
+        info.setUpdateTime(DateUtil.now());
+        if(identifyInfoMapper.updateById(info) > 0){
             return ReturnUtil.success();
         }
         throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
@@ -79,4 +87,20 @@
         throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
     }
 
+    @Override
+    public List<BizBusinessIdentifyInfo> list(IdentifyListRequest request) throws Exception {
+        Page<BizBusinessIdentifyInfo> page = PageFactory.defaultPage();
+        page.setCurrent(1);
+        page.setSearchCount(false);
+        page.setSize(Integer.MAX_VALUE);
+        Page<BizBusinessIdentifyInfo> resultPage = this.identifyListPage(page, request);
+        return resultPage.getRecords();
+    }
+
+    @Override
+    public ReturnDTO<String> equipmentQrCode(Long id) {
+        String base64QRCode = QRCodeUtil.getBase64QRCode(String.valueOf(id));
+        return ReturnUtil.success(base64QRCode);
+    }
+
 }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOrderInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOrderInfoServiceImpl.java
index 82952ad..d8d2c6a 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOrderInfoServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOrderInfoServiceImpl.java
@@ -35,6 +35,7 @@
 import javax.servlet.http.HttpServletResponse;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 import java.util.stream.Collectors;
 
 /**
@@ -209,13 +210,16 @@
     private QueryWrapper<OrderListResponse> listParamWrapperBuilder(OrderListRequest request) {
         QueryWrapper<OrderListResponse> wrapper = new QueryWrapper<>();
         wrapper.like(StringUtils.isNotBlank(request.getOrderNo()), "order_no", request.getOrderNo());
+        wrapper.like(Objects.nonNull(request.getCustomerId()), "customer_id", request.getCustomerId());
         wrapper.like(StringUtils.isNotBlank(request.getCustomerName()), "customer_name", request.getCustomerName());
         wrapper.like(StringUtils.isNotBlank(request.getDeliverer()), "deliverer", request.getDeliverer());
         wrapper.like(StringUtils.isNotBlank(request.getCreateUserName()), "create_user_name", request.getCreateUserName());
-        wrapper.apply(StringUtils.isNotBlank(request.getCreateStartTime()),
-                "{0} <= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getCreateStartTime().split(" ")[0]);
-        wrapper.apply(StringUtils.isNotBlank(request.getCreateEndTime()),
-                "{0} >= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getCreateEndTime().split(" ")[0]);
+        if(StringUtils.isNotBlank(request.getCreateStartTime())){
+            wrapper.apply("{0} <= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getCreateStartTime().split(" ")[0]);
+        }
+        if(StringUtils.isNotBlank(request.getCreateEndTime())){
+            wrapper.apply("{0} >= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getCreateEndTime().split(" ")[0]);
+        }
         wrapper.orderByDesc("create_time");
         return wrapper;
     }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceAssessServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceAssessServiceImpl.java
index c6af980..ce40138 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceAssessServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceAssessServiceImpl.java
@@ -1,10 +1,33 @@
 package com.casic.missiles.service.Impl.business;
 
-import com.casic.missiles.model.business.BizBusinessOutsourceAssess;
+import cn.hutool.core.lang.Assert;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.casic.missiles.core.model.auth.AuthUser;
+import com.casic.missiles.core.shiro.ShiroKit;
+import com.casic.missiles.dto.BaseApprovalSubmitRequest;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.ReturnUtil;
+import com.casic.missiles.dto.business.outsource.OutsourceAssessApprovalListRequest;
+import com.casic.missiles.dto.business.outsource.OutsourceAssessSaveResponse;
+import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.NoGenerateFileCodeEnum;
+import com.casic.missiles.enums.NoGenerateRecordTypeCodeEnum;
+import com.casic.missiles.enums.system.ApprovalStatusEnum;
+import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.mapper.business.BizBusinessOutsourceAssessMapper;
+import com.casic.missiles.model.business.BizBusinessOutsourceAssess;
+import com.casic.missiles.model.business.BizBusinessOutsourceAssessSampleRelation;
+import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl;
+import com.casic.missiles.service.business.IBizBusinessOutsourceAssessSampleRelationService;
 import com.casic.missiles.service.business.IBizBusinessOutsourceAssessService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.casic.missiles.utils.NoGeneratorUtil;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Objects;
 
 /**
  * <p>
@@ -15,6 +38,103 @@
  * @since 2023-08-16
  */
 @Service
-public class BizBusinessOutsourceAssessServiceImpl extends ServiceImpl<BizBusinessOutsourceAssessMapper, BizBusinessOutsourceAssess> implements IBizBusinessOutsourceAssessService {
+public class BizBusinessOutsourceAssessServiceImpl extends GeneralApprovalServiceImpl<BizBusinessOutsourceAssessMapper, BizBusinessOutsourceAssess, BizBusinessOutsourceAssess, OutsourceAssessApprovalListRequest, BaseApprovalSubmitRequest> implements IBizBusinessOutsourceAssessService {
+    @Autowired
+    private IBizBusinessOutsourceAssessSampleRelationService outsourceAssessSampleRelationService;
 
+    @Override
+    public ReturnDTO<OutsourceAssessSaveResponse> saveOutsourceAssess(BizBusinessOutsourceAssess request) {
+        //生成编号
+        String labCode = request.getLabCode();
+        String groupCode = request.getGroupCode();
+        Long maxNo = this.baseMapper.selectMaxProjectNo();
+        String projectNo = NoGeneratorUtil.getCode(NoGenerateFileCodeEnum.D, labCode, NoGenerateRecordTypeCodeEnum.OUTSOURCE_ACCESS, groupCode, maxNo);
+        request.setCreateUserId(request.getUserId());
+        request.setCreateUserName(request.getUserName());
+        request.setApprovalStatus(ApprovalStatusEnum.DRAFT); //草稿箱状态
+        request.setProjectNo(projectNo);
+        int row = this.baseMapper.insert(request);
+        Assert.isFalse(row <= 0, () -> {
+            throw new BusinessException(BusinessExceptionEnum.OUTSOURCE_ACCESS_SAVE_FAILED);
+        });
+        //关联表
+        saveRelationData(request);
+        OutsourceAssessSaveResponse saveResponse = new OutsourceAssessSaveResponse();
+        saveResponse.setId(request.getId());
+        saveResponse.setProjectNo(projectNo);
+        return ReturnUtil.success(saveResponse);
+    }
+
+    @Override
+    @Transactional
+    public ReturnDTO draftUpdate(BizBusinessOutsourceAssess request) {
+        if (this.baseMapper.updateById(request) > 0) {
+            //关联表删除、增加
+            removeRelationData(request.getId());
+            saveRelationData(request);
+            return ReturnUtil.success();
+        }
+        throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
+    }
+
+    @Override
+    public ReturnDTO draftDelete(Long id) {
+        if (this.baseMapper.deleteById(id) > 0) {
+            //关联表删除
+            removeRelationData(id);
+            return ReturnUtil.success();
+        }
+        throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
+    }
+
+    @Override
+    public ReturnDTO draftBatchDelete(List<Long> ids) {
+        if (this.baseMapper.deleteBatchIds(ids) >= 0) {
+            ids.forEach(id -> removeRelationData(id));
+            return ReturnUtil.success();
+        }
+        throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
+    }
+
+    @Override
+    @Transactional
+    public ReturnDTO failUpdate(BizBusinessOutsourceAssess request) {
+        AuthUser user = ShiroKit.getUser();
+        Assert.isFalse(Objects.isNull(user), () -> {
+            throw new BusinessException(BusinessExceptionEnum.LOGIN_USER_ACQUIRE_FAILED);
+        });
+        request.setApprovalStatus(ApprovalStatusEnum.IN_APPROVED);
+        if (this.baseMapper.updateById(request) > 0) {
+            //关联表删除、增加
+            removeRelationData(request.getId());
+            saveRelationData(request);
+            baseApprovalService.failUpdate(request.getProcessId());
+            return ReturnUtil.success();
+        }
+        throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
+    }
+
+    private void saveRelationData(BizBusinessOutsourceAssess request) {
+        List<BizBusinessOutsourceAssessSampleRelation> sampleRelations = new ArrayList<>();
+        request.getOrderSampleList().forEach(dto -> {
+            BizBusinessOutsourceAssessSampleRelation relation = new BizBusinessOutsourceAssessSampleRelation();
+            relation.setOrderId(dto.getOrderId());
+            relation.setSampleId(dto.getSampleId());
+            relation.setAccessId(request.getId());
+            sampleRelations.add(relation);
+        });
+        if(outsourceAssessSampleRelationService.saveBatch(sampleRelations)){
+            return;
+        }
+        throw new BusinessException(BusinessExceptionEnum.OUTSOURCE_ACCESS_SAVE_FAILED);
+    }
+
+    private void removeRelationData(Long assessId) {
+        QueryWrapper<BizBusinessOutsourceAssessSampleRelation> wrapper = new QueryWrapper<>();
+        wrapper.eq("access_id", assessId);
+        if(outsourceAssessSampleRelationService.remove(wrapper)){
+            return;
+        }
+        throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
+    }
 }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceProtocolServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceProtocolServiceImpl.java
new file mode 100644
index 0000000..821e728
--- /dev/null
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceProtocolServiceImpl.java
@@ -0,0 +1,60 @@
+package com.casic.missiles.service.Impl.business;
+
+import cn.hutool.core.lang.Assert;
+import com.casic.missiles.dto.BaseApprovalSubmitRequest;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.ReturnUtil;
+import com.casic.missiles.dto.business.outsource.OutsourceProtocolApprovalListRequest;
+import com.casic.missiles.dto.business.outsource.OutsourceProtocolSaveResponse;
+import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.NoGenerateFileCodeEnum;
+import com.casic.missiles.enums.NoGenerateRecordTypeCodeEnum;
+import com.casic.missiles.enums.system.ApprovalStatusEnum;
+import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.mapper.business.BizBusinessOutsourceProtocolMapper;
+import com.casic.missiles.mapper.business.BizBusinessOutsourcerInfoMapper;
+import com.casic.missiles.model.business.BizBusinessOutsourceProtocol;
+import com.casic.missiles.model.business.BizBusinessOutsourcerInfo;
+import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl;
+import com.casic.missiles.service.business.IBizBusinessOutsourceProtocolService;
+import com.casic.missiles.utils.NoGeneratorUtil;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 计量检定业务-分包管理-测试、校准或检定工作分包协议书 服务实现类
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-08-24
+ */
+@Service
+public class BizBusinessOutsourceProtocolServiceImpl extends GeneralApprovalServiceImpl<BizBusinessOutsourceProtocolMapper, BizBusinessOutsourceProtocol, BizBusinessOutsourceProtocol, OutsourceProtocolApprovalListRequest, BaseApprovalSubmitRequest> implements IBizBusinessOutsourceProtocolService {
+    @Autowired
+    private BizBusinessOutsourcerInfoMapper outsourcerInfoMapper;
+
+    @Override
+    public ReturnDTO<OutsourceProtocolSaveResponse> saveOutsourceProtocol(BizBusinessOutsourceProtocol request) {
+        //生成编号
+        String labCode = request.getLabCode();
+        String groupCode = request.getGroupCode();
+        Long maxNo = this.baseMapper.selectMaxProtocolNo();
+        String protocolNo = NoGeneratorUtil.getCode(NoGenerateFileCodeEnum.D, labCode, NoGenerateRecordTypeCodeEnum.OUTSOURCE_PROTOCOL, groupCode, maxNo);
+        request.setCreateUserId(request.getUserId());
+        request.setCreateUserName(request.getUserName());
+        request.setApprovalStatus(ApprovalStatusEnum.DRAFT); //草稿箱状态
+        request.setProtocolNo(protocolNo);
+        BizBusinessOutsourcerInfo outsourcerInfo = outsourcerInfoMapper.selectById(request.getOutsourcerId());
+        request.setOutsourceNo(outsourcerInfo.getOutsourcerNo());
+        request.setOutsourceName(outsourcerInfo.getOutsourcerName());
+        int row = this.baseMapper.insert(request);
+        Assert.isFalse(row <= 0, () -> {
+            throw new BusinessException(BusinessExceptionEnum.OUTSOURCE_PROTOCOL_SAVE_FAILED);
+        });
+        OutsourceProtocolSaveResponse saveResponse = new OutsourceProtocolSaveResponse();
+        saveResponse.setId(request.getId());
+        saveResponse.setProtocolNo(protocolNo);
+        return ReturnUtil.success(saveResponse);
+    }
+}
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourcerInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourcerInfoServiceImpl.java
index 75f639d..8aadad7 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourcerInfoServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourcerInfoServiceImpl.java
@@ -3,12 +3,12 @@
 import cn.hutool.core.lang.Assert;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.dto.*;
 import com.casic.missiles.dto.business.outsource.OutsourcerInfoApprovalListRequest;
 import com.casic.missiles.dto.business.outsource.OutsourcerSaveResponse;
 import com.casic.missiles.enums.BusinessExceptionEnum;
-import com.casic.missiles.enums.PrefixCodeEnum;
+import com.casic.missiles.enums.NoGenerateFileCodeEnum;
+import com.casic.missiles.enums.NoGenerateRecordTypeCodeEnum;
 import com.casic.missiles.enums.system.ApprovalStatusEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.mapper.business.BizBusinessOutsourcerInfoMapper;
@@ -20,7 +20,7 @@
 import com.casic.missiles.service.business.IBizBusinessOutsourcerInfoService;
 import com.casic.missiles.service.business.IBizBusinessOutsourcerUserInfoService;
 import com.casic.missiles.utils.DictCodeUtils;
-import com.casic.missiles.utils.NumberGeneratorUtil;
+import com.casic.missiles.utils.NoGeneratorUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -42,22 +42,12 @@
     private IBizBusinessOutsourcerUserInfoService outsourcerUserInfoService;
 
     @Override
-    public List<BizBusinessOutsourcerInfo> list(OutsourcerInfoApprovalListRequest request) {
-        request.setCreateUserId(null);
-        request.setApprovalStatus(ApprovalStatusEnum.PASSED);
-        Page<BizBusinessOutsourcerInfo> page = PageFactory.defaultPage();
-        page.setCurrent(1);
-        page.setSearchCount(false);
-        page.setSize(Integer.MAX_VALUE);
-        Page<BizBusinessOutsourcerInfo> resultPage = this.baseMapper.selectBatchForApprovalList(page, request, null);
-        return resultPage.getRecords();
-    }
-
-    @Override
     public ReturnDTO<OutsourcerSaveResponse> saveOutsourcer(BizBusinessOutsourcerInfo request) {
         //生成编号
+        String labCode = request.getLabCode();
+        String groupCode = request.getGroupCode();
         Long maxNo = this.baseMapper.selectMaxNo();
-        String outsourcerNo = NumberGeneratorUtil.getContactNo(PrefixCodeEnum.OUTSOURCER_PREFIX, maxNo);
+        String outsourcerNo = NoGeneratorUtil.getCode(NoGenerateFileCodeEnum.D, labCode, NoGenerateRecordTypeCodeEnum.OUTSOURCE_INFO, groupCode, maxNo);
         request.setOutsourcerNo(outsourcerNo);
         request.setCreateUserId(request.getUserId());
         request.setCreateUserName(request.getUserName());
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessSiteExecutiveInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessSiteExecutiveInfoServiceImpl.java
index ebab3e6..6c6a129 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessSiteExecutiveInfoServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessSiteExecutiveInfoServiceImpl.java
@@ -189,9 +189,9 @@
         QueryWrapper<BizBusinessSiteExecutiveStaffRelation> mWrapper = new QueryWrapper<>();
         mWrapper.eq("site_executive_id", siteExecutiveId);
         boolean mRemove = siteExecutiveStaffRelationService.remove(mWrapper);
-        Assert.isFalse(eRemove || mRemove, () -> {
+        if(!eRemove || !mRemove){
             throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
-        });
+        }
     }
 
     private void doPopulateSiteExecutive(SiteExecutiveDetailResponse detailResponse) {
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessLabExecutiveInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessLabExecutiveInfoServiceImpl.java
index 50c5616..0242fcf 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessLabExecutiveInfoServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessLabExecutiveInfoServiceImpl.java
@@ -297,6 +297,29 @@
     }
 
     @Override
+    public List<SampleLabExecutiveListResponse> deptLabExecutiveList(SampleLabExecutiveListRequest request) throws Exception {
+        Page<SampleLabExecutiveListResponse> page = PageFactory.defaultPage();
+        page.setCurrent(1);
+        page.setSearchCount(false);
+        page.setSize(Integer.MAX_VALUE);
+        Page<SampleLabExecutiveListResponse> resultPage = this.deptLabExecutiveListPage(page, request);
+        return resultPage.getRecords();
+    }
+
+    @Override
+    public List<SampleLabExecutiveListResponse> deptLabExecutiveListByIds(String measureStatus, List<Long> ids) throws Exception {
+        Page<SampleLabExecutiveListResponse> page = PageFactory.defaultPage();
+        page.setCurrent(1);
+        page.setSearchCount(false);
+        page.setSize(Integer.MAX_VALUE);
+        SampleLabExecutiveListRequest request = new SampleLabExecutiveListRequest();
+        request.setIds(ids);
+        request.setMeasureStatus(measureStatus);
+        Page<SampleLabExecutiveListResponse> resultPage = this.deptLabExecutiveListPage(page, request);
+        return resultPage.getRecords();
+    }
+
+    @Override
     public Page<SampleLabExecutiveListResponse> myLabExecutiveListPage(Page<SampleLabExecutiveListResponse> page, SampleLabExecutiveListRequest labExecutiveListRequest) throws Exception{
         AuthUser user = ShiroKit.getUser();
         Assert.isFalse(Objects.isNull(user), () -> {
@@ -350,6 +373,29 @@
     }
 
     @Override
+    public List<SampleLabExecutiveListResponse> myLabExecutiveList(SampleLabExecutiveListRequest request) throws Exception {
+        Page<SampleLabExecutiveListResponse> page = PageFactory.defaultPage();
+        page.setCurrent(1);
+        page.setSearchCount(false);
+        page.setSize(Integer.MAX_VALUE);
+        Page<SampleLabExecutiveListResponse> resultPage = this.myLabExecutiveListPage(page, request);
+        return resultPage.getRecords();
+    }
+
+    @Override
+    public List<SampleLabExecutiveListResponse> myLabExecutiveListByIds(String measureStatus, List<Long> ids) throws Exception {
+        Page<SampleLabExecutiveListResponse> page = PageFactory.defaultPage();
+        page.setCurrent(1);
+        page.setSearchCount(false);
+        page.setSize(Integer.MAX_VALUE);
+        SampleLabExecutiveListRequest request = new SampleLabExecutiveListRequest();
+        request.setIds(ids);
+        request.setMeasureStatus(measureStatus);
+        Page<SampleLabExecutiveListResponse> resultPage = this.myLabExecutiveListPage(page, request);
+        return resultPage.getRecords();
+    }
+
+    @Override
     public List<SampleAmountResponse> myExecutiveAmount() {
         //登录用户id获取计量人员id，实验室检测信息中存储的是计量人员id
         AuthUser user = ShiroKit.getUser();
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentInfoServiceImpl.java
index 864b05e..db8cad4 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentInfoServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentInfoServiceImpl.java
@@ -35,7 +35,6 @@
 import com.casic.missiles.utils.ConvertUtils;
 import com.casic.missiles.utils.DictCodeUtils;
 import com.casic.missiles.utils.NumberGeneratorUtil;
-import org.flowable.engine.RuntimeService;
 import org.flowable.engine.runtime.ProcessInstance;
 import org.jetbrains.annotations.NotNull;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -43,7 +42,6 @@
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
 
-import javax.annotation.Resource;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
@@ -81,8 +79,6 @@
     private IBizEquipmentAttachmentService attachmentService;
     @Autowired
     private IBizEquipmentCheckpointService checkpointService;
-    @Resource
-    private RuntimeService runtimeService;
     @Autowired
     private ApprovalOperateService approvalOperateService;
 
@@ -235,18 +231,18 @@
     private void updateRelationInfo(EquipmentAddRequest request, BizEquipmentInfoApproval equipmentInfoApproval) {
         QueryWrapper<BizEquipmentTechnicalTarget> targetWrapper = new QueryWrapper<>();
         targetWrapper.eq("equipment_no", equipmentInfoApproval.getEquipmentNo());
-        boolean removeTargetFlag = technicalTargetService.remove(targetWrapper);
-        boolean saveTargetFlag = technicalTargetService.saveBatch(request.getTechnicalTargetList());
+        technicalTargetService.remove(targetWrapper);
+        technicalTargetService.saveBatch(request.getTechnicalTargetList());
 
         QueryWrapper<BizEquipmentAttachment> attachmentWrapper = new QueryWrapper<>();
         attachmentWrapper.eq("equipment_no", equipmentInfoApproval.getEquipmentNo());
-        boolean removeAttachmentFlag = attachmentService.remove(attachmentWrapper);
-        boolean saveAttachmentFlag = attachmentService.saveBatch(request.getAttachmentList());
+        attachmentService.remove(attachmentWrapper);
+        attachmentService.saveBatch(request.getAttachmentList());
 
         QueryWrapper<BizEquipmentCheckpoint> checkpointWrapper = new QueryWrapper<>();
         checkpointWrapper.eq("equipment_no", equipmentInfoApproval.getEquipmentNo());
-        boolean removeCheckpointFlag = checkpointService.remove(checkpointWrapper);
-        boolean saveCheckpointFlag = checkpointService.saveBatch(request.getCheckpointList());
+        checkpointService.remove(checkpointWrapper);
+        checkpointService.saveBatch(request.getCheckpointList());
     }
 
     @Override
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardInfoServiceImpl.java
index faff1ae..c50a5b3 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardInfoServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardInfoServiceImpl.java
@@ -22,7 +22,9 @@
 import com.casic.missiles.mapper.equipment.BizEquipmentStandardInfoMapper;
 import com.casic.missiles.mapper.equipment.BizEquipmentStandardTechnologyRelationMapper;
 import com.casic.missiles.mapper.resource.BizResourceStaffInfoMapper;
-import com.casic.missiles.model.equipment.*;
+import com.casic.missiles.model.equipment.BizEquipmentStandardInfo;
+import com.casic.missiles.model.equipment.BizEquipmentStandardInfoApproval;
+import com.casic.missiles.model.equipment.BizEquipmentStandardTechnologyRelation;
 import com.casic.missiles.model.resource.BizResourceStaffInfo;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.dao.DeptMapper;
@@ -33,14 +35,12 @@
 import com.casic.missiles.service.flowable.ApprovalOperateService;
 import com.casic.missiles.utils.ConvertUtils;
 import com.casic.missiles.utils.DictCodeUtils;
-import org.flowable.engine.RuntimeService;
 import org.flowable.engine.runtime.ProcessInstance;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
 
-import javax.annotation.Resource;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
@@ -62,8 +62,6 @@
     private BizResourceStaffInfoMapper staffInfoMapper;
     @Autowired
     private IBaseApprovalService baseApprovalService;
-    @Resource
-    private RuntimeService runtimeService;
     @Autowired
     private ApprovalOperateService approvalOperateService;
     @Autowired
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSealInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSealInfoServiceImpl.java
index 7c91fa2..00040d6 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSealInfoServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSealInfoServiceImpl.java
@@ -15,6 +15,7 @@
 import com.casic.missiles.modular.system.model.User;
 import com.casic.missiles.service.resource.IBizResourceSealInfoService;
 import com.casic.missiles.utils.DictCodeUtils;
+import com.casic.missiles.utils.MinioUtil;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -33,6 +34,8 @@
     private BizResourceSealInfoMapper sealInfoMapper;
     @Autowired
     private UserMapper userMapper;
+    @Autowired
+    private MinioUtil minioUtil;
 
     @Override
     public Page<BizResourceSealInfo> listPage(Page<BizResourceSealInfo> page, SealInfoListRequest request) throws Exception {
@@ -44,6 +47,7 @@
         Page<BizResourceSealInfo> sealInfoPage = sealInfoMapper.selectPage(page, wrapper);
         for (BizResourceSealInfo record : sealInfoPage.getRecords()) {
             DictCodeUtils.convertDictCodeToName(record);
+            record.setMinioFileUrl(minioUtil.getFileUrl(record.getMinioFileName()));
         }
         return sealInfoPage;
     }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceStaffInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceStaffInfoServiceImpl.java
index f058cf5..09203ac 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceStaffInfoServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceStaffInfoServiceImpl.java
@@ -3,6 +3,7 @@
 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.core.page.PageFactory;
 import com.casic.missiles.dto.IdDTO;
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
@@ -86,6 +87,13 @@
     }
 
     @Override
+    public List<BizResourceStaffInfo> list(StaffListRequest request) throws Exception {
+        Page<BizResourceStaffInfo> page = PageFactory.defaultPage();
+        Page<BizResourceStaffInfo> staffInfoPage = this.listPage(page, request);
+        return staffInfoPage.getRecords();
+    }
+
+    @Override
     @Transactional
     public ReturnDTO<IdDTO> staffBaseAdd(BizResourceStaffInfo staffInfo) {
         //登录账号查重
@@ -495,6 +503,28 @@
         return certResponsePage;
     }
 
+    @Override
+    public List<StaffCertResponse> certListByIds(List<Long> ids) throws Exception {
+        Page<StaffCertResponse> page = PageFactory.defaultPage();
+        page.setCurrent(1);
+        page.setSearchCount(false);
+        page.setSize(Integer.MAX_VALUE);
+        StaffCertRequest request = new StaffCertRequest();
+        request.setIds(ids);
+        Page<StaffCertResponse> resultPage = this.certListPage(page, request);
+        return resultPage.getRecords();
+    }
+
+    @Override
+    public List<StaffCertResponse> certList(StaffCertRequest request) throws Exception {
+        Page<StaffCertResponse> page = PageFactory.defaultPage();
+        page.setCurrent(1);
+        page.setSearchCount(false);
+        page.setSize(Integer.MAX_VALUE);
+        Page<StaffCertResponse> resultPage = this.certListPage(page, request);
+        return resultPage.getRecords();
+    }
+
     @Async
     public void deleteRelationInfo(Long staffId){
         QueryWrapper<BizResourceStaffEducation> educationWrapper = new QueryWrapper<>();
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceStaffVerifierServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceStaffVerifierServiceImpl.java
index 8ac7eee..b508d45 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceStaffVerifierServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceStaffVerifierServiceImpl.java
@@ -52,8 +52,8 @@
     private WebSocket webSocket;
 
     @Override
-    public ReturnDTO expirationReminder(IdDTO idDto) {
-        BizResourceStaffVerifier staffVerifier = verifierMapper.selectById(idDto.getId());
+    public ReturnDTO expirationReminder(IdDTO idDTO) {
+        BizResourceStaffVerifier staffVerifier = verifierMapper.selectById(idDTO.getId());
         BizResourceStaffInfo staffInfo = staffInfoMapper.selectById(staffVerifier.getStaffId());
         QueryWrapper<User> wrapper = new QueryWrapper<>();
         wrapper.eq("account", staffInfo.getAccount());
@@ -65,7 +65,7 @@
         Assert.isFalse(Objects.isNull(user), () -> {
             throw new BusinessException(BusinessExceptionEnum.LOGIN_USER_ACQUIRE_FAILED);
         });
-        WorkbenchRemindMessage remindMessage = new WorkbenchRemindMessage(userInfo.getId(), userInfo.getDeptId(), idDto.getId(), staffVerifier.getCertNo(), MessageTypeEnum.STAFF_CERT.getCode(), MessageSourceModuleEnum.RESOURCE.getCode(), MessageTypeEnum.STAFF_CERT.getValue(), MessageTypeEnum.STAFF_CERT.getValue(), staffVerifier.getCertName(),0, user.getId(), user.getName());
+        WorkbenchRemindMessage remindMessage = new WorkbenchRemindMessage(userInfo.getId(), userInfo.getDeptId(), idDTO.getId(), staffVerifier.getCertNo(), MessageTypeEnum.STAFF_CERT.getCode(), MessageSourceModuleEnum.RESOURCE.getCode(), MessageTypeEnum.STAFF_CERT.getValue(), MessageTypeEnum.STAFF_CERT.getValue(), staffVerifier.getCertName(),0, user.getId(), user.getName());
         if(messageMapper.insert(remindMessage) > 0){
             // 新增到消息列表后向用户推送消息
             webSocket.sendOneMessage(String.valueOf(userInfo.getId()), JSONObject.toJSONString(remindMessage));
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceTrainInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceTrainInfoServiceImpl.java
index c1d6308..3a533f2 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceTrainInfoServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceTrainInfoServiceImpl.java
@@ -44,11 +44,14 @@
     @Override
     public Page<BizResourceTrainInfo> listPage(Page<BizResourceTrainInfo> page, TrainListRequest request) throws Exception {
         QueryWrapper<BizResourceTrainInfo> wrapper = new QueryWrapper<>();
-        wrapper.like("train_no", request.getTrainNo());
-        wrapper.apply(StringUtils.isNotBlank(request.getCreateTimeStart()),//apply方法传入参数名不能为空
-                "{0} <= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getCreateTimeStart().split(" ")[0]);
-        wrapper.apply(StringUtils.isNotBlank(request.getCreateTimeEnd()),
-                "{0} >= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getCreateTimeEnd().split(" ")[0]);
+        wrapper.like(StringUtils.isNotEmpty(request.getTrainNo()), "train_no", request.getTrainNo());
+        wrapper.like(StringUtils.isNotEmpty(request.getDutyLeader()),"duty_leader", request.getDutyLeader());
+        if(StringUtils.isNotBlank(request.getCreateTimeStart())){
+            wrapper.apply("{0} <= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getCreateTimeStart().split(" ")[0]);
+        }
+        if(StringUtils.isNotBlank(request.getCreateTimeEnd())){
+            wrapper.apply("{0} >= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getCreateTimeEnd().split(" ")[0]);
+        }
         wrapper.orderByDesc("create_time");
         Page<BizResourceTrainInfo> trainInfoPage = trainInfoMapper.selectPage(page, wrapper);
         for (BizResourceTrainInfo record : trainInfoPage.getRecords()) {
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/EnvLocationInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/EnvLocationInfoServiceImpl.java
new file mode 100644
index 0000000..cdc5742
--- /dev/null
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/EnvLocationInfoServiceImpl.java
@@ -0,0 +1,31 @@
+package com.casic.missiles.service.Impl.resource;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.casic.missiles.dto.resource.environment.LocationListRequest;
+import com.casic.missiles.dto.resource.environment.LocationListResponse;
+import com.casic.missiles.mapper.resource.EnvLocationInfoMapper;
+import com.casic.missiles.model.resource.EnvLocationInfo;
+import com.casic.missiles.service.resource.IEnvLocationInfoService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 实验室环境监控系统-设备表 服务实现类
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-06-07
+ */
+@Service
+public class EnvLocationInfoServiceImpl extends ServiceImpl<EnvLocationInfoMapper, EnvLocationInfo> implements IEnvLocationInfoService {
+    @Autowired
+    private EnvLocationInfoMapper locationInfoMapper;
+
+    @Override
+    public Page<LocationListResponse> listPage(Page<LocationListResponse> page, LocationListRequest request) {
+        Page<LocationListResponse> resultPage = locationInfoMapper.selectLocationListPage(page, request);
+        return resultPage;
+    }
+}

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java
index bb0c50f..13a699b 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java
@@ -12,6 +12,7 @@
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.IGeneralApprovalService;
+import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
@@ -19,6 +20,7 @@
 import org.springframework.web.bind.annotation.RequestBody;
 
 import javax.validation.Valid;
+import java.util.List;
 import java.util.Objects;
 
 /**
@@ -117,4 +119,17 @@
         }
         return baseApprovalService.failUpdate(request);
     }
+
+    public List<O> exportList(@RequestBody @Valid R request) throws Exception {
+        List<O> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = baseApprovalService.listExportByIds(request.getIds());
+        } else {
+            list = baseApprovalService.listExport(request);
+        }
+        for (O record : list) {
+            DictCodeUtils.convertDictCodeToName(record);
+        }
+        return list;
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java
index 8a90961..d775831 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java
@@ -5,6 +5,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.business.certificate.CertificateChangeApplyApprovalListRequest;
 import com.casic.missiles.dto.business.certificate.CertificateChangeApplySaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessCertificateChangeApply;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
@@ -20,6 +21,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -48,4 +50,12 @@
         }
         return changeApplyService.saveChangeApply(request);
     }
+
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody CertificateChangeApplyApprovalListRequest request) throws Exception {
+        List<BizBusinessCertificateChangeApply> list = super.exportList(request);
+        super.exportExcel(BizBusinessCertificateChangeApply.class, list, ExportEnum.CERTIFICATE_CHANGE_APPLY.getSheetName());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java
index 5fc4b07..af8230e 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java
@@ -9,6 +9,7 @@
 import com.casic.missiles.dto.business.certificate.CertificatePrintApprovalListRequest;
 import com.casic.missiles.dto.business.certificate.CertificatePrintListResponse;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.enums.business.CertificatePrintStatusEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessCertificatePrintLog;
@@ -18,10 +19,16 @@
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.io.IOException;
+import java.util.List;
 import java.util.Objects;
 
 /**
@@ -98,4 +105,16 @@
         });
         return certificatePrintService.certificatePrintLog(idDTO.getId());
     }
+
+    @ApiOperation("证书打印审批导出")
+    @PostMapping("/listExport")
+    public void exportList(@RequestBody CertificatePrintApprovalListRequest request) throws IOException {
+        List<CertificatePrintListResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = certificatePrintService.listByIds(request.getIds());
+        } else {
+            list = certificatePrintService.list(request);
+        }
+        super.exportExcel(CertificatePrintListResponse.class, list, ExportEnum.CERTIFICATE_PRINT.getSheetName());
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java
index 63b06dc..6b2efd5 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java
@@ -6,6 +6,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.business.certificate.CertificateReportApprovalListRequest;
 import com.casic.missiles.dto.business.certificate.CertificateReportSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessCertificateReport;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
@@ -21,6 +22,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -50,7 +52,7 @@
         return certificateReportService.saveCertificateReport(request);
     }
 
-    @ApiOperation("证书审批详情（基本信息）")
+    @ApiOperation("详情（基本信息）")
     @PostMapping("/detail")
     public ReturnDTO<BizBusinessCertificateReport> detail(@RequestBody @Valid BaseDetailRequest request, BindingResult bindingResult) throws Exception {
         if(bindingResult.hasErrors()){
@@ -59,4 +61,11 @@
         return certificateReportService.detail(request);
     }
 
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody CertificateReportApprovalListRequest request) throws Exception {
+        List<BizBusinessCertificateReport> list = super.exportList(request);
+        super.exportExcel(BizBusinessCertificateReport.class, list, ExportEnum.CERTIFICATE_REPORT.getSheetName());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java
index 46b26bd..57c0809 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java
@@ -10,20 +10,21 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.business.identify.IdentifyListRequest;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessIdentifyInfo;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.business.IBizBusinessIdentifyInfoService;
+import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import javax.validation.Valid;
+import java.util.List;
 import java.util.Objects;
 
 /**
@@ -57,16 +58,13 @@
         return identifyInfoService.addIdentify(identifyInfo);
     }
 
-    @ApiOperation("标识打印更新")
+    @ApiOperation("标识打印更新（更新打印时间）")
     @PostMapping("/update")
-    public ReturnDTO updateIdentify(@RequestBody @Valid BizBusinessIdentifyInfo identifyInfo, BindingResult bindingResult) {
-        Assert.isFalse(Objects.isNull(identifyInfo.getId()), () -> {
+    public ReturnDTO updateIdentify(@RequestBody @Valid IdDTO idDTO) {
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        Assert.isFalse(bindingResult.hasErrors(), () -> {
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        });
-        return identifyInfoService.updateIdentify(identifyInfo);
+        return identifyInfoService.updateIdentify(idDTO.getId());
     }
 
     @ApiOperation("标识打印删除")
@@ -77,4 +75,37 @@
         });
         return identifyInfoService.deleteIdentify(idDTO.getId());
     }
+
+    @ApiOperation("标识打印导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody @Valid IdentifyListRequest request, BindingResult bindingResult) throws Exception {
+        if (bindingResult.hasErrors()) {
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        List<BizBusinessIdentifyInfo> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = identifyInfoService.listByIds(request.getIds());
+        } else {
+            list = identifyInfoService.list(request);
+        }
+        for (BizBusinessIdentifyInfo record : list) {
+            DictCodeUtils.convertDictCodeToName(record);
+        }
+        super.exportExcel(BizBusinessIdentifyInfo.class, list, ExportEnum.IDENTIFY_EXPORT.getSheetName());
+    }
+
+
+    // TODO: 2023/8/23 查询设备信息，4个底部按钮查设备（按钮的作用就是前端用来调不同接口、用来区分中间即将展示的标识），前端弹窗选设备，在确定保存时前端根据底部按钮判断传入设备类型deviceType字典code
+    // TODO: 2023/8/23 接口：查受检设备（第1个按钮），查设备台账（后3个按钮同一接口），查询之后前端根据标志类型的不同加到中间页面时进行判断（按产品给的对应表）
+    // TODO: 2023/8/23 提供二维码接口，前端在加到中间页面时调用一下
+
+    @ApiOperation("设备二维码")
+    @PostMapping("/equipment/qrCode")
+    public ReturnDTO<String> equipmentQrCode(@RequestBody @Valid IdDTO idDTO) {
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return identifyInfoService.equipmentQrCode(idDTO.getId());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java
index 707be6e..7e0453d 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java
@@ -117,7 +117,7 @@
     }
 
     @ApiOperation("任务单导出")
-    @PostMapping("/export")
+    @PostMapping("/listExport")
     public void orderExport(@RequestBody @Valid OrderListRequest request, HttpServletResponse response) {
         businessOrderService.orderExport(request, response);
     }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java
index 529a6ce..51432be 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java
@@ -1,9 +1,28 @@
 package com.casic.missiles.controller.business;
 
+import com.casic.missiles.controller.GeneralApprovalController;
+import com.casic.missiles.dto.BaseApprovalSubmitRequest;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.business.outsource.OutsourceAssessApprovalListRequest;
+import com.casic.missiles.dto.business.outsource.OutsourceAssessSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
+import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.model.business.BizBusinessOutsourceAssess;
+import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
+import com.casic.missiles.service.IGeneralApprovalService;
+import com.casic.missiles.service.business.IBizBusinessOutsourceAssessService;
 import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.BindingResult;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.validation.Valid;
+import java.util.List;
+
 /**
  * <p>
  * 计量检定业务-分包管理-测试、校准或检定工作分包评审表 前端控制器
@@ -15,6 +34,27 @@
 @Api(tags = "分包管理-测试、校准或检定工作分包评审表")
 @RestController
 @RequestMapping("/business/outsource/assess")
-public class BizBusinessOutsourceAssessController {
+public class BizBusinessOutsourceAssessController extends GeneralApprovalController<BizBusinessOutsourceAssess, BizBusinessOutsourceAssess, OutsourceAssessApprovalListRequest, BaseApprovalSubmitRequest> {
+    @Autowired
+    private IBizBusinessOutsourceAssessService outsourceAssessService;
 
+    public BizBusinessOutsourceAssessController(IGeneralApprovalService<BizBusinessOutsourceAssess, BizBusinessOutsourceAssess, OutsourceAssessApprovalListRequest, BaseApprovalSubmitRequest> baseApprovalService) {
+        super(baseApprovalService);
+    }
+
+    @ApiOperation("草稿箱-保存")
+    @PostMapping("/save")
+    public ReturnDTO<OutsourceAssessSaveResponse> saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceAssess request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        return outsourceAssessService.saveOutsourceAssess(request);
+    }
+
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception {
+        List<BizBusinessOutsourceAssess> list = super.exportList(request);
+        super.exportExcel(BizBusinessOutsourceAssess.class, list, ExportEnum.OUTSOURCE_ASSESS.getSheetName());
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java
new file mode 100644
index 0000000..9adef18
--- /dev/null
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java
@@ -0,0 +1,60 @@
+package com.casic.missiles.controller.business;
+
+import com.casic.missiles.controller.GeneralApprovalController;
+import com.casic.missiles.dto.BaseApprovalSubmitRequest;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.business.outsource.OutsourceProtocolApprovalListRequest;
+import com.casic.missiles.dto.business.outsource.OutsourceProtocolSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
+import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.model.business.BizBusinessOutsourceProtocol;
+import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
+import com.casic.missiles.service.IGeneralApprovalService;
+import com.casic.missiles.service.business.IBizBusinessOutsourceProtocolService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.BindingResult;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.validation.Valid;
+import java.util.List;
+
+/**
+ * <p>
+ * 计量检定业务-分包管理-测试、校准或检定工作分包协议书 前端控制器
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-08-24
+ */
+@Api(tags = "分包管理-测试、校准或检定工作分包协议书")
+@RestController
+@RequestMapping("/business/outsource/protocol")
+public class BizBusinessOutsourceProtocolController extends GeneralApprovalController<BizBusinessOutsourceProtocol, BizBusinessOutsourceProtocol, OutsourceProtocolApprovalListRequest, BaseApprovalSubmitRequest> {
+    @Autowired
+    private IBizBusinessOutsourceProtocolService outsourceProtocolService;
+
+    public BizBusinessOutsourceProtocolController(IGeneralApprovalService<BizBusinessOutsourceProtocol, BizBusinessOutsourceProtocol, OutsourceProtocolApprovalListRequest, BaseApprovalSubmitRequest> baseApprovalService) {
+        super(baseApprovalService);
+    }
+
+    @ApiOperation("草稿箱-保存")
+    @PostMapping("/save")
+    public ReturnDTO<OutsourceProtocolSaveResponse> saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceProtocol request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        return outsourceProtocolService.saveOutsourceProtocol(request);
+    }
+
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody OutsourceProtocolApprovalListRequest request) throws Exception {
+        List<BizBusinessOutsourceProtocol> list = super.exportList(request);
+        super.exportExcel(BizBusinessOutsourceProtocol.class, list, ExportEnum.OUTSOURCE_PROTOCOL.getSheetName());
+    }
+}
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java
index 097f645..f0f0943 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java
@@ -17,7 +17,6 @@
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.IGeneralApprovalService;
 import com.casic.missiles.service.business.IBizBusinessOutsourcerInfoService;
-import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -71,19 +70,8 @@
 
     @ApiOperation("分包方导出")
     @PostMapping("/listExport")
-    public void export(@RequestBody @Valid OutsourcerInfoApprovalListRequest request, BindingResult bindingResult) throws Exception {
-        if (bindingResult.hasErrors()) {
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        }
-        List<BizBusinessOutsourcerInfo> list;
-        if (!CollectionUtils.isEmpty(request.getIds())) {
-            list = outsourcerInfoService.listByIds(request.getIds());
-        } else {
-            list = outsourcerInfoService.list(request);
-        }
-        for (BizBusinessOutsourcerInfo record : list) {
-            DictCodeUtils.convertDictCodeToName(record);
-        }
+    public void export(@RequestBody OutsourcerInfoApprovalListRequest request) throws Exception {
+        List<BizBusinessOutsourcerInfo> list = super.exportList(request);
         super.exportExcel(BizBusinessOutsourcerInfo.class, list, ExportEnum.OUTSOURCER_EXPORT.getSheetName());
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java
index c2cbf9f..0410918 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java
@@ -17,11 +17,9 @@
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.IGeneralApprovalService;
 import com.casic.missiles.service.business.IBizBusinessSiteExecutiveInfoService;
-import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -60,7 +58,7 @@
         return siteExecutiveInfoService.saveSiteExecutiveInfo(siteExecutiveInfo);
     }
 
-    @ApiOperation("现场检测详情")
+    @ApiOperation("详情")
     @PostMapping("/detail")
     public ReturnDTO<SiteExecutiveDetailResponse> siteExecutiveDetail(@RequestBody @Valid IdDTO idDTO) throws Exception {
         Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
@@ -69,21 +67,10 @@
         return ReturnUtil.success(siteExecutiveInfoService.detail(idDTO.getId()));
     }
 
-    @ApiOperation("现场检测导出")
+    @ApiOperation("导出")
     @PostMapping("/listExport")
-    public void export(@RequestBody @Valid SiteExecutiveApprovalListRequest request, BindingResult bindingResult) throws Exception {
-        if (bindingResult.hasErrors()) {
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        }
-        List<SiteExecutiveApprovalListResponse> list;
-        if (!CollectionUtils.isEmpty(request.getIds())) {
-            list = siteExecutiveInfoService.listInfoByIds(request.getIds());
-        } else {
-            list = siteExecutiveInfoService.listInfo(request);
-        }
-        for (SiteExecutiveApprovalListResponse record : list) {
-            DictCodeUtils.convertDictCodeToName(record);
-        }
+    public void export(@RequestBody SiteExecutiveApprovalListRequest request) throws Exception {
+        List<SiteExecutiveApprovalListResponse> list = super.exportList(request);
         super.exportExcel(SiteExecutiveApprovalListResponse.class, list, ExportEnum.SITE_EXECUTIVE_EXPORT.getSheetName());
     }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
index 7e793cd..a92e209 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
@@ -55,7 +55,7 @@
 
     @ApiOperation("设备收发列表导出")
     @PostMapping("/export")
-    public void exportList(@RequestBody @Valid SampleDispatchListRequest request) throws IOException {
+    public void exportList(@RequestBody SampleDispatchListRequest request) throws IOException {
         List<SampleDispatchListResponse> list;
         if (!CollectionUtils.isEmpty(request.getIds())) {
             list = dispatchService.listByIds(request.getIds());
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java
index cdc77fc..d120fd4 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java
@@ -7,6 +7,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.business.labExecutive.*;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.business.IBusinessLabExecutiveInfoService;
@@ -14,6 +15,7 @@
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.*;
 
@@ -32,7 +34,7 @@
     @Autowired
     private IBusinessLabExecutiveInfoService labExecutiveInfoService;
 
-    @ApiOperation("实验室检测-部门检测-查询各状态列表（待检测、检测中、检测完）")
+    @ApiOperation("实验室任务-查询各状态列表（待检测、检测中、检测完）")
     @PostMapping("/deptExecutive/List")
     public ReturnDTO<PageInfoBT<SampleLabExecutiveListResponse>> queryDeptExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
@@ -43,10 +45,19 @@
         return ReturnUtil.success(super.packForBT(labExecutiveInfoService.deptLabExecutiveListPage(page, labExecutiveListRequest)));
     }
 
-    /**
-     * 实验室检测-我的检测-查询各状态列表（待检测、检测中、检测完）
-     */
-    @ApiOperation("实验室检测-我的检测-查询各状态列表（待检测、检测中、检测完）")
+    @ApiOperation("实验室任务导出")
+    @PostMapping("/deptExecutive/export")
+    public void deptExportList(@RequestBody @Valid SampleLabExecutiveListRequest request) throws Exception {
+        List<SampleLabExecutiveListResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = labExecutiveInfoService.deptLabExecutiveListByIds(request.getMeasureStatus(), request.getIds());
+        } else {
+            list = labExecutiveInfoService.deptLabExecutiveList(request);
+        }
+        super.exportExcel(SampleLabExecutiveListResponse.class, list, ExportEnum.DEPT_EXECUTIVE_TASK.getSheetName());
+    }
+
+    @ApiOperation("我的任务-查询各状态列表（待检测、检测中、检测完）")
     @PostMapping("/myExecutive/list")
     public ReturnDTO<PageInfoBT<SampleLabExecutiveListResponse>> queryMyExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
@@ -57,19 +68,25 @@
         return ReturnUtil.success(super.packForBT(labExecutiveInfoService.myLabExecutiveListPage(page, labExecutiveListRequest)));
     }
 
-    /**
-     * 实验室检测-我的检测-查询各状态样品数量（待检测、检测中、检测完）
-     */
-    @ApiOperation("实验室检测-我的检测-查询各状态样品数量（待检测、检测中、检测完）")
+    @ApiOperation("我的任务导出")
+    @PostMapping("/myExecutive/export")
+    public void exportList(@RequestBody @Valid SampleLabExecutiveListRequest request) throws Exception {
+        List<SampleLabExecutiveListResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = labExecutiveInfoService.myLabExecutiveListByIds(request.getMeasureStatus(), request.getIds());
+        } else {
+            list = labExecutiveInfoService.myLabExecutiveList(request);
+        }
+        super.exportExcel(SampleLabExecutiveListResponse.class, list, ExportEnum.MY_EXECUTIVE_TASK.getSheetName());
+    }
+
+    @ApiOperation("我的任务-查询各状态样品数量（待检测、检测中、检测完）")
     @GetMapping("/myExecutive/amount")
     public ReturnDTO<List<SampleAmountResponse>> queryMyExecutiveAmount() {
         return ReturnUtil.success(labExecutiveInfoService.myExecutiveAmount());
     }
 
-    /**
-     * 实验室检测-部门检测-分配（分配给具体人员）
-     */
-    @ApiOperation("实验室检测-部门检测-分配按钮（分配给具体人员）")
+    @ApiOperation("实验室任务-分配按钮（分配给具体人员）")
     @PostMapping("/deptExecutive/allocate")
     public ReturnDTO allocateStaff(@RequestBody @Valid SampleAllocateRequest sampleAllocateRequest, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -78,10 +95,7 @@
         return labExecutiveInfoService.allocateStaff(sampleAllocateRequest);
     }
 
-    /**
-     * 实验室检测-我的检测-检定人扫描收入（待检测->检测中）
-     */
-    @ApiOperation("实验室检测-我的检测-检定人扫描收入（待检测->检测中）")
+    @ApiOperation("我的任务-检定人扫描收入（待检测->检测中）")
     @PostMapping("/myExecutive/receive")
     public ReturnDTO sampleReceive(@RequestBody @Valid List<SampleOperateRequest> requestList, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -90,10 +104,7 @@
         return labExecutiveInfoService.sampleReceive(requestList);
     }
 
-    /**
-     * 实验室检测-负责人/检定人扫描检完（检测中->检测完）
-     */
-    @ApiOperation("实验室检测-负责人/检定人扫描检完（检测中->检测完）")
+    @ApiOperation("实验室任务-负责人/检定人扫描检完（检测中->检测完）")
     @PostMapping("/myExecutive/complete")
     public ReturnDTO sampleExecutiveComplete(@RequestBody @Valid List<SampleOperateRequest> requestList, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -102,10 +113,7 @@
         return labExecutiveInfoService.sampleExecutiveComplete(requestList);
     }
 
-    /**
-     * 实验室检测-部门检测/我的检测 编辑（只能修改应出具证书）
-     */
-    @ApiOperation("实验室检测-部门检测/我的检测 编辑（只能修改应出具证书）")
+    @ApiOperation("实验室任务/我的任务 编辑（只能修改应出具证书）")
     @PostMapping("/executive/update")
     public ReturnDTO updateExecutive(@RequestBody @Valid UpdateExecutiveRequest request, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -114,10 +122,7 @@
         return labExecutiveInfoService.updateExecutive(request);
     }
 
-    /**
-     * 实验室检测-部门检测/我的检测 详情
-     */
-    @ApiOperation("实验室检测-部门检测/我的检测 详情")
+    @ApiOperation("实验室任务/我的任务 详情")
     @PostMapping("/executive/detail")
     public ReturnDTO<ExecutiveDetailResponse> executiveDetail(@RequestBody @Valid ExecutiveDetailRequest request, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
@@ -131,7 +136,7 @@
      * 退回后会将下一个要执行的实验室检测状态更新为待分配，将后面的实验室顺序变更为连续（都进行减1）
      * 最后一个检测的实验室退回，等分发员再增加实验室或设备收发中的已收入直接手动点击完成
      */
-    @ApiOperation("实验室检测-部门检测/我的检测 退回（待检测/检测中->退回）")
+    @ApiOperation("实验室任务/我的任务 退回（待检测/检测中->退回）")
     @PostMapping("/executive/sendBack")
     public ReturnDTO executiveSendBack(@RequestBody @Valid ExecutiveSendBackRequest request, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -140,9 +145,6 @@
         return labExecutiveInfoService.sampleExecutiveSendBack(request);
     }
 
-    /**
-     * 分发员编辑实验室检测列表
-     */
     @ApiOperation("分发员编辑实验室检测列表")
     @PostMapping("/handOut/updateList")
     public ReturnDTO updateExecutiveList(@RequestBody @Valid UpdateExecutiveListRequest request, BindingResult bindingResult) {
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java
index 48a67ed..0c04f31 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java
@@ -10,6 +10,7 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.resource.customer.CustomerApprovalListRequest;
 import com.casic.missiles.dto.resource.customer.CustomerSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceCustomerInfo;
@@ -26,6 +27,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -55,6 +57,13 @@
         return customerInfoService.saveCustomerInfo(request);
     }
 
+    @ApiOperation("委托方名录导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody CustomerApprovalListRequest request) throws Exception {
+        List<BizResourceCustomerInfo> list = super.exportList(request);
+        super.exportExcel(BizResourceCustomerInfo.class, list, ExportEnum.CUSTOMER_INFO.getSheetName());
+    }
+
     @ApiOperation("委托方人员列表（分页）")
     @PostMapping("/person/listPage")
     public ReturnDTO<PageInfoBT<BizResourceCustomerStaff>> personListPage(@RequestBody IdDTO idDto) {
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
index 972ed4b..6418ea5 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
@@ -5,6 +5,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.resource.customer.SuggestFormApprovalListRequest;
 import com.casic.missiles.dto.resource.customer.SuggestFormSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceCustomerSuggestForm;
@@ -20,6 +21,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -50,4 +52,11 @@
         return suggestFormService.saveSuggestForm(request);
     }
 
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody SuggestFormApprovalListRequest request) throws Exception {
+        List<BizResourceCustomerSuggestForm> list = super.exportList(request);
+        super.exportExcel(BizResourceCustomerSuggestForm.class, list, ExportEnum.CUSTOMER_SUGGEST_FORM.getSheetName());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java
index 1934d1a..9e07eab 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java
@@ -15,12 +15,16 @@
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.resource.IEnvEnvironmentRecordConfigService;
 import com.casic.missiles.service.resource.IEnvEnvironmentRecordDataService;
+import com.casic.missiles.service.resource.IEnvLocationInfoService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
 import java.util.List;
@@ -39,6 +43,8 @@
     private IEnvEnvironmentRecordDataService environmentRecordDataService;
     @Autowired
     private IEnvEnvironmentRecordConfigService environmentRecordConfigService;
+    @Autowired
+    private IEnvLocationInfoService locationInfoService;
 
     @ApiOperation("环境记录单数据列表/详情")
     @PostMapping("/data/listPage")
@@ -95,4 +101,11 @@
         });
         return environmentRecordConfigService.deleteEnvironmentRecordConfig(idDTO.getId());
     }
+
+    @ApiOperation("地点列表")
+    @PostMapping("/location/listPage")
+    public ReturnDTO<PageInfoBT<LocationListResponse>> locationListPage(@RequestBody @Valid LocationListRequest request) {
+        Page<LocationListResponse> page = PageFactory.defaultPage();
+        return ReturnUtil.success(super.packForBT(locationInfoService.listPage(page, request)));
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java
index 82efe3f..e9561fa 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java
@@ -10,6 +10,7 @@
 import com.casic.missiles.dto.resource.seal.SealLogListRequest;
 import com.casic.missiles.dto.resource.seal.SealNoteApprovalListRequest;
 import com.casic.missiles.dto.resource.seal.SealNoteSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceSealUseLog;
@@ -27,6 +28,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -58,6 +60,13 @@
         return sealUseNoteService.saveSeal(request);
     }
 
+    @ApiOperation("印章使用登记导出（列表和导出中去掉经办人和监印人）")
+    @PostMapping("/listExport")
+    public void export(@RequestBody SealNoteApprovalListRequest request) throws Exception {
+        List<BizResourceSealUseNote> list = super.exportList(request);
+        super.exportExcel(BizResourceSealUseNote.class, list, ExportEnum.SEAL_NOTE.getSheetName());
+    }
+
     // TODO: 2023/7/28 印章使用日志：系统中使用印章时插入数据库
 
     @ApiOperation("印章使用日志列表（分页）")
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java
index 9b674fc..06b6521 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java
@@ -9,16 +9,20 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.resource.staff.StaffCertRequest;
 import com.casic.missiles.dto.resource.staff.StaffCertResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.service.resource.IBizResourceStaffInfoService;
 import com.casic.missiles.service.resource.IBizResourceStaffVerifierService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.List;
+
 /**
  * @Description:
  * @Author: wangpeng
@@ -41,9 +45,21 @@
         return ReturnUtil.success(super.packForBT(responsePage));
     }
 
+    @ApiOperation("证书逾期提醒导出")
+    @PostMapping("/listExport")
+    public void exportList(@RequestBody StaffCertRequest request) throws Exception {
+        List<StaffCertResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = staffInfoService.certListByIds(request.getIds());
+        } else {
+            list = staffInfoService.certList(request);
+        }
+        super.exportExcel(StaffCertResponse.class, list, ExportEnum.STAFF_CERTIFICATE_EXPIRE.getSheetName());
+    }
+
     @ApiOperation("证书逾期提醒")
     @PostMapping("/expirationReminder")
-    public ReturnDTO expirationReminder(@RequestBody IdDTO idDto) {
-        return verifierService.expirationReminder(idDto);
+    public ReturnDTO expirationReminder(@RequestBody IdDTO idDTO) {
+        return verifierService.expirationReminder(idDTO);
     }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java
index 3b251ad..a6e7850 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java
@@ -12,6 +12,7 @@
 import com.casic.missiles.dto.resource.staff.StaffListRequest;
 import com.casic.missiles.dto.resource.staff.TrainListRequest;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.*;
@@ -22,7 +23,10 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
 import java.util.List;
@@ -52,8 +56,19 @@
             throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
         }
         Page<BizResourceStaffInfo> page = PageFactory.defaultPage();
-        Page<BizResourceStaffInfo> responsePage = staffInfoService.listPage(page, request);
-        return ReturnUtil.success(super.packForBT(responsePage));
+        return ReturnUtil.success(super.packForBT(staffInfoService.listPage(page, request)));
+    }
+
+    @ApiOperation("人员登记导出")
+    @PostMapping("/listExport")
+    public void exportList(@RequestBody StaffListRequest request) throws Exception {
+        List<BizResourceStaffInfo> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = staffInfoService.listByIds(request.getIds());
+        } else {
+            list = staffInfoService.list(request);
+        }
+        super.exportExcel(BizResourceStaffInfo.class, list, ExportEnum.STAFF_INFO.getSheetName());
     }
 
     @ApiOperation("人员登记详情基础信息")
@@ -85,9 +100,9 @@
 
     @ApiOperation("科研教育列表（分页）")
     @PostMapping("/education/listPage")
-    public ReturnDTO<PageInfoBT<BizResourceStaffEducation>> educationListPage(@RequestBody IdDTO idDto) {
+    public ReturnDTO<PageInfoBT<BizResourceStaffEducation>> educationListPage(@RequestBody IdDTO idDTO) {
         Page<BizResourceStaffEducation> page = PageFactory.defaultPage();
-        Page<BizResourceStaffEducation> responsePage = staffInfoService.educationListPage(page, idDto);
+        Page<BizResourceStaffEducation> responsePage = staffInfoService.educationListPage(page, idDTO);
         return ReturnUtil.success(super.packForBT(responsePage));
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java
index af6aa86..d85d84a 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java
@@ -9,6 +9,7 @@
 import com.casic.missiles.dto.resource.outsideService.SupplierApprovalListRequest;
 import com.casic.missiles.dto.resource.outsideService.SupplierSaveResponse;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceSupplierAbility;
@@ -67,6 +68,13 @@
         return ReturnUtil.success(supplierInfoService.detail(idDTO.getId()));
     }
 
+    @ApiOperation("合格供方导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody SupplierApprovalListRequest request) throws Exception {
+        List<BizResourceSupplierInfo> list = super.exportList(request);
+        super.exportExcel(BizResourceSupplierInfo.class, list, ExportEnum.SUPPLIER_INFO.getSheetName());
+    }
+
     @ApiOperation("供方人员列表（分页）")
     @PostMapping("/person/listPage")
     public ReturnDTO<PageInfoBT<BizResourceSupplierPerson>> personListPage(@RequestBody IdDTO idDTO) {
diff --git a/casic-metering-api/src/main/resources/config/application.yml b/casic-metering-api/src/main/resources/config/application.yml
index 350db5f..ecff521 100644
--- a/casic-metering-api/src/main/resources/config/application.yml
+++ b/casic-metering-api/src/main/resources/config/application.yml
@@ -126,7 +126,7 @@
     #作者
     author: wangpeng
     #待生成对象表名
-    table-name: biz_equipment_technical_target_approval,biz_equipment_attachment_approval,biz_equipment_checkpoint_approval
+    table-name: biz_business_outsource_protocol
 
 reminder:
   #节点--common模块config包 ReminderNodeConfig配置
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
index 4a19e4e..d47d552 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
@@ -53,6 +53,7 @@
     SUGGEST_FORM_SAVE_FAILED(2509, "委托方意见登记表保存至草稿箱失败"),
     EXAMINE_FORM_SAVE_FAILED(2510, "要求、委托书及合同评审表保存至草稿箱失败"),
     CUSTOMER_EXIST_SAVE_FAILED(2511, "该委托方已存在，请重新选择"),
+    DUPLICATE_LOCATION_NO(2512, "地点编号已存在"),
 
     /**
      * 计量检定业务模块
@@ -68,6 +69,8 @@
     COMPLETE_SAMPLE_NOT_EXIST(2609, "检测中不存在扫描收入的样品"),
     CANNOT_CHANGE_MEASURE_INFO(2610, "无法更改非当前登录用户的检测信息"),
     NON_EXIST_ORDER_OR_SAMPLE(2611, "不存在该委托单或该委托单下的样品"),
+    OUTSOURCE_ACCESS_SAVE_FAILED(2612, "测试、校准或检定工作分包评审表保存至草稿箱失败"),
+    OUTSOURCE_PROTOCOL_SAVE_FAILED(2613, "测试、校准或检定工作分包协议书保存至草稿箱失败"),
 
     /**
      * 历史遗留备用
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
index 5089ad1..81a406b 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
@@ -10,54 +10,38 @@
     /**
      * 资源管理
      */
-    ENVIRONMENT_DATA_EXPORT("environmentData", "environmentData", "环境记录单数据"),
+    ENVIRONMENT_DATA_EXPORT("environmentData", "环境记录单数据", "环境记录单数据"),
+    STAFF_INFO("staffInfo", "人员登记", "人员登记"),
+    STAFF_CERTIFICATE_EXPIRE("certificateExpire", "证书逾期提醒", "证书逾期提醒"),
+    SUPPLIER_INFO("supplierInfo", "合格供方名录", "合格供方名录"),
+    CUSTOMER_INFO("customerInfo", "委托方名录", "委托方名录"),
+    CUSTOMER_SUGGEST_FORM("customerSuggestForm", "委托方意见登记表", "委托方意见登记表"),
+    SEAL_NOTE("sealNote", "印章使用登记", "印章使用登记"),
 
-    FILE_EXPORT("meterFileData", "meterFileData", "计量文件信息"),
-    TRAIN_PLAN_EXPORT("trainPlanData", "trainPlanData", "培训计划"),
-    TRAIN_LOG_EXPORT("trainLogData", "trainLogData", "培训记录"),
-    METER_ORGANIZE_EXPORT("meterOrganizeData", "meterOrganizeData", "计量组织"),
-    TRACE_SUPPLIER_EXPORT("traceSupplierData", "traceSupplierData", "溯源供方"),
-    SIGN_EXPORT("signData", "signData", "签名/签章"),
-    TEMPLATE_EXPORT("templateData", "templateData", "原始记录模板/证书报告模板"),
-    FIXED_ASSETS("meterFixedAssets", "meterFixedAssets", "固定资产"),
-    METER_EQUIPMENT("meterEquipment", "meterEquipment", "测量设备"),
-    CALIBRATION_TEST_EQUIPMENT("calibrationTestEquipment", "calibrationTestEquipment", "校准检定设备"),
-    MEASURE_ACCOUNT("measureAccount", "measureAccount", "测量工装"),
-    STANDARD_SUPPORT_EQUIPMENT("standardSupportEquipment", "standardSupportEquipment", "标准配套设备"),
-    STANDARD_EQUIPMENT("standardEquipment", "standardEquipment", "标准装置"),
-    FLOW_DEF_EXPORT("flowDefData", "flowDefData", "流程定义"),
-    STAFF_CERTIFICATE("certificate", "certificate", "计量人员证书"),
-    CHECK_INFO("checkInfo", "checkInfo", "设备管理点检测"),
-    EQUIPMENT_APPLY("equipmentApply", "equipmentApply", "设备借用"),
-    STANDARD_EQUIPMENT_REMIND("equipmentApplyRemind", "equipmentApplyRemind", "标准装置到期提醒"),
-    METER_PRICE("meterPrice", "meterPrice", "价格库"),
-    METER_STAFF("meterStaff", "meterStaff", "计量人员"),
-    STANDARD_EQUIPMENT_APPLY("standardEquipmentApply", "standardEquipmentApply", "标准装置申请"),
-    STATE_MANAGE_APPLY("stateManage", "stateManage", "状态管理"),
-    METER_ACCEPTANCE_CHECK("acceptanceCheck", "acceptanceCheck", "设备检修保养验收单"),
-    CUSTOMER_EXPORT("customerData", "customerData", "客户信息"),
-    ORDER_EXPORT("orderData", "orderData", "委托书信息"),
-    SAMPLE_EXPORT("sampleData", "sampleData", "样本信息"),
-    EXCHANGE_DATA("exchangeData", "exchangeData", "设备交接单"),
-    DISPATCH_DATA("dispatchData", "dispatchData", "设备收发"),
-    ENVIRONMENT_DATA("environmentData", "environmentData", "环境记录单"),
-    ORIGIN_DATA("originData", "originData", "原始记录"),
-    CERTIFICATE_REPORT("certificateReport", "certificateReport", "证书报告"),
-    ADVICE_EXPORT("adviceData", "adviceData", "客户反馈"),
-    HANDOUT_EXPORT("handoutData", "handoutData", "任务分发列表"),
-    OUTSOURCER_EXPORT("outsourcerData", "outsourcerData", "分包方"),
-    SITE_EXECUTIVE_EXPORT("siteExecutiveData", "siteExecutiveData", "现场测试、校准或检定"),
-    CERTIFICATE_PRINT_EXPORT("certificatePrintData", "certificatePrintData", "证书打印"),
-    DOWNLOAD_TEMPLATE("downloadTemplate", "downloadTemplate", "页面配置"),
-    OUTSOURCER_CERTIFICATE_EXPORT("outsourceCertificateData", "outsourceCertificateData", "分包证书"),
-    SETTLEMENT_INFO_EXPORT("settlementInfoData", "settlementInfoData", "业务结算"),
-    EQUIPMENT_REMIND("equipmentRemind", "equipmentRemind", "设备到期提醒"),
-    AGREEMENT_INFO_EXPORT("agreementInfoData", "agreementInfoData", "合同"),
-    WORK_STATISTICS_EXPORT("workStatisticsData", "workStatisticsData", "实时工作统计"),
-    DEPT_OUTPUT_EXPORT("deptOutputData", "deptOutputData", "部门产值分析"),
-    WORKLOAD_EXPORT("workloadData", "workloadData", "业务工作量分析"),
-    DEPT_COMPREHENSIVE_EXPORT("deptComprehensiveData", "deptComprehensiveData", "部门综合分析"),
-    ENVIRONMENTAL_RECORD("environmentalRecordData", "environmentalRecordData", "现场环境记录");
+    /**
+     * 计量检定业务
+     */
+    OUTSOURCER_EXPORT("outsourcerData", "分包方名录", "分包方名录"),
+    IDENTIFY_EXPORT("identifyData", "计量标识", "计量标识"),
+    ORDER_EXPORT("orderData", "任务单", "任务单"),
+    DISPATCH_DATA("dispatchData", "设备收发", "设备收发"),
+    HANDOUT_EXPORT("handoutData", "任务分发", "任务分发"),
+    SITE_EXECUTIVE_EXPORT("siteExecutiveData", "现场测试、校准或检定", "现场测试、校准或检定"),
+    CERTIFICATE_REPORT("certificateReport", "证书审批", "证书审批"),
+    CERTIFICATE_CHANGE_APPLY("certificateChangeApply", "证书报告补充或更换申请单", "证书报告补充或更换申请单"),
+    CERTIFICATE_PRINT("certificatePrintData", "证书打印审批", "证书打印审批"),
+    DEPT_EXECUTIVE_TASK("deptExecutiveTaskData", "实验室任务", "实验室任务"),
+    MY_EXECUTIVE_TASK("myExecutiveTaskData", "我的任务", "我的任务"),
+    OUTSOURCE_ASSESS("outsourceAssess", "测试、校准或检定工作分包评审表", "测试、校准或检定工作分包评审表"),
+    OUTSOURCE_PROTOCOL("outsourceProtocol", "测试、校准或检定工作分包协议书", "测试、校准或检定工作分包协议书"),
+
+    /**
+     * 系统管理
+     */
+    SIGN_EXPORT("signData", "签名", "签名"),
+    TEMPLATE_EXPORT("templateData", "文件模板", "文件模板"),
+    FLOW_DEF_EXPORT("flowDefData", "流程定义", "流程定义"),
+    DOWNLOAD_TEMPLATE("downloadTemplate", "流程定义", "页面配置");
 
     ExportEnum(String fileName, String sheetName, String description) {
         this.fileName = fileName;
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateRecordTypeCodeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateRecordTypeCodeEnum.java
index 31d913c..a963522 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateRecordTypeCodeEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateRecordTypeCodeEnum.java
@@ -46,4 +46,14 @@
     String SITE_EXECUTIVE_APPROVAL = "01";
     //《现场测试、校准或检定工作记录表》
     String SITE_EXECUTIVE_LOG = "02";
+
+    //测试、校准或检定工作分包协议书
+    String OUTSOURCE_PROTOCOL = "01";
+    //测试、校准或检定工作分包评审表
+    String OUTSOURCE_ACCESS = "02";
+    //测试、校准或检定工作分包通知书
+    String OUTSOURCE_NOTICE = "03";
+    //测试、校准或检定工作分包方名录
+    String OUTSOURCE_INFO = "04";
+
 }
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
index 24b8635..f78bd53 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
@@ -15,6 +15,10 @@
     String CERTIFICATE_CHANGE_APPLY_BEAN_NAME = "certificateChangeApplyBean";
     //现场测试、校准或检定
     String SITE_EXECUTIVE_BEAN_NAME = "siteExecutiveBean";
+    //测试、校准或检定工作分包评审表
+    String OUTSOURCE_ASSESS_BEAN_NAME = "outsourceAssessBean";
+    //测试、校准或检定工作分包协议书
+    String OUTSOURCE_PROTOCOL_BEAN_NAME = "outsourceProtocolBean";
 
     /*********************************设备与装置************************************/
     //设备台账
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 b21c661..6b86fd1 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
@@ -18,6 +18,8 @@
     OUTSOURCER_APPROVAL(OUTSOURCER_BEAN_NAME, ""),
     CERTIFICATE_CHANGE_APPROVAL(CERTIFICATE_CHANGE_APPLY_BEAN_NAME, ""),
     SITE_EXECUTIVE_APPROVAL(SITE_EXECUTIVE_BEAN_NAME, ""),
+    OUTSOURCE_ASSESS_APPROVAL(OUTSOURCE_ASSESS_BEAN_NAME, ""),
+    OUTSOURCE_PROTOCOL_APPROVAL(OUTSOURCE_PROTOCOL_BEAN_NAME, ""),
 
     ACTION_STATUS_MAP(new HashMap<String, AwareActionStatusEnum>() {
         {
@@ -47,6 +49,10 @@
             put(ApplyFromIdEnum.CERTIFICATE_CHANGE_APPROVAL.getCode(), CERTIFICATE_CHANGE_APPROVAL);
             //现场测试、校准或检定审批
             put(ApplyFromIdEnum.SITE_EXECUTIVE_APPROVAL.getCode(), SITE_EXECUTIVE_APPROVAL);
+            //测试、校准或检定工作分包评审表
+            put(ApplyFromIdEnum.OUTSOURCE_ASSESS_APPROVAL.getCode(), OUTSOURCE_ASSESS_APPROVAL);
+            //测试、校准或检定工作分包协议书
+            put(ApplyFromIdEnum.OUTSOURCE_PROTOCOL_APPROVAL.getCode(), OUTSOURCE_PROTOCOL_APPROVAL);
         }
     });
     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 934405e..c7410bd 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
@@ -9,6 +9,8 @@
     CERTIFICATE_CHANGE_APPROVAL("jljdywzsbchghsqd", MessageSourceModuleEnum.BUSINESS.getCode(), "证书/报告补充或更换申请单"),
     OUTSOURCER_APPROVAL("jljdywcsjzhgfbfml", MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定合格分包方名录"),
     SITE_EXECUTIVE_APPROVAL("jljdywxccsjzsp", MessageSourceModuleEnum.BUSINESS.getCode(), "现场测试、校准或检定审批"),
+    OUTSOURCE_ASSESS_APPROVAL("jljdywcsjzfbpsb", MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包评审表"),
+    OUTSOURCE_PROTOCOL_APPROVAL("jljdywcsjzfbxys", MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包协议书"),
 
 
     /*******************************************设备与装置*********************************************/
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/GeneralApprovalMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/GeneralApprovalMapper.java
index 4fb7344..0c9d6ae 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/GeneralApprovalMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/GeneralApprovalMapper.java
@@ -17,8 +17,4 @@
 
     Page<O> selectBatchForApprovalList(Page<O> page, @Param("request") R request, @Param("businessKeys") List<String> businessKeys);
 
-//    Page<O> selectListPage(Page<O> page, @Param("request") R request);
-
-//    Long selectMaxNo();
-
 }
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceAssessMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceAssessMapper.java
index 7867bb8..ba59009 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceAssessMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceAssessMapper.java
@@ -1,7 +1,12 @@
 package com.casic.missiles.mapper.business;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.business.outsource.OutsourceAssessApprovalListRequest;
+import com.casic.missiles.mapper.GeneralApprovalMapper;
 import com.casic.missiles.model.business.BizBusinessOutsourceAssess;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * <p>
@@ -11,6 +16,10 @@
  * @author wangpeng
  * @since 2023-08-16
  */
-public interface BizBusinessOutsourceAssessMapper extends BaseMapper<BizBusinessOutsourceAssess> {
+public interface BizBusinessOutsourceAssessMapper extends GeneralApprovalMapper<BizBusinessOutsourceAssess, BizBusinessOutsourceAssess, OutsourceAssessApprovalListRequest> {
+
+    Page<BizBusinessOutsourceAssess> selectBatchForApprovalList(Page<BizBusinessOutsourceAssess> page, @Param("request") OutsourceAssessApprovalListRequest request, @Param("businessKeys") List<String> businessKeys);
+
+    Long selectMaxProjectNo();
 
 }
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceProtocolMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceProtocolMapper.java
new file mode 100644
index 0000000..e6aba35
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceProtocolMapper.java
@@ -0,0 +1,24 @@
+package com.casic.missiles.mapper.business;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.business.outsource.OutsourceProtocolApprovalListRequest;
+import com.casic.missiles.mapper.GeneralApprovalMapper;
+import com.casic.missiles.model.business.BizBusinessOutsourceProtocol;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 计量检定业务-分包管理-测试、校准或检定工作分包协议书 Mapper 接口
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-08-24
+ */
+public interface BizBusinessOutsourceProtocolMapper extends GeneralApprovalMapper<BizBusinessOutsourceProtocol, BizBusinessOutsourceProtocol, OutsourceProtocolApprovalListRequest> {
+
+    Page<BizBusinessOutsourceProtocol> selectBatchForApprovalList(Page<BizBusinessOutsourceProtocol> page, @Param("request") OutsourceProtocolApprovalListRequest request, @Param("businessKeys") List<String> businessKeys);
+
+    Long selectMaxProtocolNo();
+}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/EnvLocationInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/EnvLocationInfoMapper.java
new file mode 100644
index 0000000..49eff87
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/EnvLocationInfoMapper.java
@@ -0,0 +1,21 @@
+package com.casic.missiles.mapper.resource;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.resource.environment.LocationListRequest;
+import com.casic.missiles.dto.resource.environment.LocationListResponse;
+import com.casic.missiles.model.resource.EnvLocationInfo;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * <p>
+ * 实验室环境监控系统-设备表 Mapper 接口
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-06-07
+ */
+public interface EnvLocationInfoMapper extends BaseMapper<EnvLocationInfo> {
+
+    Page<LocationListResponse> selectLocationListPage(Page<LocationListResponse> page, @Param("request") LocationListRequest request);
+}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java
index de124db..85ed0f7 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java
@@ -1,7 +1,9 @@
 package com.casic.missiles.mapper.system;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.dto.system.SignDetailResponse;
+import com.casic.missiles.dto.system.SignListRequest;
 import com.casic.missiles.model.system.SystemSign;
 import org.apache.ibatis.annotations.Param;
 
@@ -22,4 +24,8 @@
     SignDetailResponse selectSignDetailById(Long id);
 
     List<SystemSign> selectUsableSignList(@Param("userId") Long userId);
+
+    Page<SystemSign> selectSignListPage(Page<SystemSign> page, @Param("request") SignListRequest request);
+
+    List<SystemSign> selectSignList(@Param("request") SignListRequest request);
 }
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateChangeApplyMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateChangeApplyMapper.xml
index d798447..c496092 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateChangeApplyMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateChangeApplyMapper.xml
@@ -30,31 +30,31 @@
         SELECT *
         FROM biz_business_certificate_change_apply
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.changeApplyNo != null and request.changeApplyNo !=''">
+        <if test="request != null and request.changeApplyNo != null and request.changeApplyNo !=''">
             and change_apply_no like concat('%',#{request.changeApplyNo},'%')
         </if>
-        <if test="request.changeReportNo != null and request.changeReportNo !=''">
+        <if test="request != null and request.changeReportNo != null and request.changeReportNo !=''">
             and change_report_no like concat('%',#{request.changeReportNo},'%')
         </if>
-        <if test="request.changeReportName != null and request.changeReportName !=''">
+        <if test="request != null and request.changeReportName != null and request.changeReportName !=''">
             and change_report_name like concat('%',#{request.changeReportName},'%')
         </if>
-        <if test="request.changeType != null and request.changeType !=''">
+        <if test="request != null and request.changeType != null and request.changeType !=''">
             and change_type = #{request.changeType}
         </if>
-        <if test="request.createUserName != null and request.createUserName !=''">
+        <if test="request != null and request.createUserName != null and request.createUserName !=''">
             and create_user_name like concat('%',#{request.createUserName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificatePrintMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificatePrintMapper.xml
index b66cd99..49c0ac8 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificatePrintMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificatePrintMapper.xml
@@ -31,34 +31,34 @@
         LEFT JOIN biz_business_order_sample_relation bosr ON (bosr.order_id = bcr.order_id AND bosr.sample_id = bcr.sample_id)
         LEFT JOIN biz_business_order_info boi ON boi.id = bosr.order_id
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and bcp.approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.printStatus != null and request.printStatus !=''">
+        <if test="request != null and request.printStatus != null and request.printStatus !=''">
             and print_status = #{request.printStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and bcp.create_user_id = #{request.createUserId}
         </if>
-        <if test="request.certificateReportNo != null and request.certificateReportNo !=''">
+        <if test="request != null and request.certificateReportNo != null and request.certificateReportNo !=''">
             and bcr.certificate_report_no like concat('%',#{request.certificateReportNo},'%')
         </if>
-        <if test="request.certificateReportName != null and request.certificateReportName !=''">
+        <if test="request != null and request.certificateReportName != null and request.certificateReportName !=''">
             and bcr.certificate_report_name like concat('%',#{request.certificateReportName},'%')
         </if>
-        <if test="request.customerName != null and request.customerName !=''">
+        <if test="request != null and request.customerName != null and request.customerName !=''">
             and boi.customer_name like concat('%',#{request.customerName},'%')
         </if>
-        <if test="request.sampleNo != null and request.sampleNo !=''">
+        <if test="request != null and request.sampleNo != null and request.sampleNo !=''">
             and bosr.sample_no like concat('%',#{request.sampleNo},'%')
         </if>
-        <if test="request.sampleName != null and request.sampleName !=''">
+        <if test="request != null and request.sampleName != null and request.sampleName !=''">
             and bosr.sample_name like concat('%',#{request.sampleName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and bcp.create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and bcp.create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml
index b366034..767695d 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml
@@ -46,33 +46,37 @@
         SELECT bcr.*, bosr.sample_no, bosr.sample_name, bosr.sample_model, rsi.staff_name
         FROM biz_business_certificate_report bcr
         LEFT JOIN biz_business_order_sample_relation bosr ON (bosr.order_id = bcr.order_id AND bosr.sample_id = bcr.sample_id)
+        LEFT JOIN biz_business_order_info boi ON boi.id = bcr.order_id
         LEFT JOIN biz_resource_staff_info rsi ON rsi.id = bcr.measure_person_id
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and bcr.approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and bcr.create_user_id = #{request.createUserId}
         </if>
-        <if test="request.certificateReportNo != null and request.certificateReportNo !=''">
+        <if test="request != null and request.customerId != null and request.customerId !=''">
+            and boi.customer_id = #{request.customerId}
+        </if>
+        <if test="request != null and request.certificateReportNo != null and request.certificateReportNo !=''">
             and bcr.certificate_report_no like concat('%',#{request.certificateReportNo},'%')
         </if>
-        <if test="request.certificateReportName != null and request.certificateReportName !=''">
+        <if test="request != null and request.certificateReportName != null and request.certificateReportName !=''">
             and bcr.certificate_report_name like concat('%',#{request.certificateReportName},'%')
         </if>
-        <if test="request.sampleNo != null and request.sampleNo !=''">
+        <if test="request != null and request.sampleNo != null and request.sampleNo !=''">
             and bosr.sample_no like concat('%',#{request.sampleNo},'%')
         </if>
-        <if test="request.measureCategory != null and request.measureCategory !=''">
+        <if test="request != null and request.measureCategory != null and request.measureCategory !=''">
             and bcr.measure_category = #{request.measureCategory}
         </if>
-        <if test="request.measurePerson != null and request.measurePerson !=''">
+        <if test="request != null and request.measurePerson != null and request.measurePerson !=''">
             and rsi.staff_name like concat('%',#{request.measurePerson},'%')
         </if>
-        <if test="request.calibrationTimeStart != null and request.calibrationTimeStart !=''">
+        <if test="request != null and request.calibrationTimeStart != null and request.calibrationTimeStart !=''">
             and bcr.calibration_time &gt;= #{request.calibrationTimeStart}
         </if>
-        <if test="request.calibrationTimeEnd != null and request.calibrationTimeEnd !=''">
+        <if test="request != null and request.calibrationTimeEnd != null and request.calibrationTimeEnd !=''">
             and bcr.calibration_time &lt;= #{request.calibrationTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceAssessMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceAssessMapper.xml
index d0fcf8b..c22c101 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceAssessMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceAssessMapper.xml
@@ -7,6 +7,8 @@
         <id column="id" property="id" />
         <result column="project_no" property="projectNo" />
         <result column="project_name" property="projectName" />
+        <result column="lab_code" property="labCode" />
+        <result column="group_code" property="groupCode" />
         <result column="applicant_id" property="applicantId" />
         <result column="applicant_name" property="applicantName" />
         <result column="applicant_time" property="applicantTime" />
@@ -31,7 +33,45 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, project_no, project_name, applicant_id, applicant_name, applicant_time, minio_file_name, remark, create_user_id, create_user_name, outsourcer_id, pre_start_time, pre_end_time, outsource_reason, pre_cost, approval_status, process_id, approve_situation, traceability, test_method, technique_ability, create_time, update_time
+        id, project_no, project_name, lab_code, group_code, applicant_id, applicant_name, applicant_time, minio_file_name, remark, create_user_id, create_user_name, outsourcer_id, pre_start_time, pre_end_time, outsource_reason, pre_cost, approval_status, process_id, approve_situation, traceability, test_method, technique_ability, create_time, update_time
     </sql>
 
+    <select id="selectMaxProjectNo" resultType="java.lang.Long">
+        SELECT IFNULL(max(RIGHT(project_no, 3)), 0) from biz_business_outsource_assess
+    </select>
+
+    <select id="selectBatchForApprovalList" resultMap="BaseResultMap">
+        SELECT bboa.*, bboi.outsourcer_name, bboi.director
+        FROM biz_business_outsource_assess bboa
+        LEFT JOIN biz_business_outsourcer_info bboi ON bboa.outsourcer_id = bboi.id
+        WHERE 1=1
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
+            and bboa.approval_status = #{request.approvalStatus}
+        </if>
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
+            and bboa.create_user_id = #{request.createUserId}
+        </if>
+        <if test="request != null and request.projectNo != null and request.projectNo !=''">
+            and bboa.project_no like concat('%',#{request.projectNo},'%')
+        </if>
+        <if test="request != null and request.outsourcerName != null and request.outsourcerName !=''">
+            and bboi.outsourcer_name like concat('%',#{request.outsourcerName},'%')
+        </if>
+        <if test="request != null and request.applicantName != null and request.applicantName !=''">
+            and bboa.applicant_name like concat('%',#{request.applicantName},'%')
+        </if>
+        <if test="request != null and request.applicantTimeStart != null and request.applicantTimeStart !=''">
+            and bboa.applicant_time &gt;= #{request.applicantTimeStart}
+        </if>
+        <if test="request != null and request.applicantTimeEnd != null and request.applicantTimeEnd !=''">
+            and bboa.applicant_time &lt;= #{request.applicantTimeEnd}
+        </if>
+        <if test="businessKeys != null">
+            and bboa.id in
+            <foreach collection="businessKeys" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
+        ORDER BY bboa.create_time DESC
+    </select>
 </mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceProtocolMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceProtocolMapper.xml
new file mode 100644
index 0000000..b7b2149
--- /dev/null
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceProtocolMapper.xml
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.mapper.business.BizBusinessOutsourceProtocolMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.business.BizBusinessOutsourceProtocol">
+        <id column="id" property="id" />
+        <result column="protocol_no" property="protocolNo" />
+        <result column="project_name" property="projectName" />
+        <result column="lab_code" property="labCode" />
+        <result column="group_code" property="groupCode" />
+        <result column="outsourcer_id" property="outsourcerId" />
+        <result column="remark" property="remark" />
+        <result column="outsource_no" property="outsourceNo" />
+        <result column="outsource_name" property="outsourceName" />
+        <result column="contacts" property="contacts" />
+        <result column="mobile" property="mobile" />
+        <result column="address" property="address" />
+        <result column="require_date" property="requireDate" />
+        <result column="outsource_cost" property="outsourceCost" />
+        <result column="director" property="director" />
+        <result column="item" property="item" />
+        <result column="requires" property="requires" />
+        <result column="create_user_id" property="createUserId" />
+        <result column="create_user_name" property="createUserName" />
+        <result column="approval_status" property="approvalStatus" />
+        <result column="process_id" property="processId" />
+        <result column="create_time" property="createTime" />
+        <result column="update_time" property="updateTime" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, protocol_no, project_name, lab_code, group_code, outsourcer_id, remark, outsource_no, outsource_name, contacts, mobile, address, require_date, outsource_cost, director, item, requires, create_user_id, create_user_name, approval_status, process_id, create_time, update_time
+    </sql>
+
+    <select id="selectMaxProtocolNo" resultType="java.lang.Long">
+        SELECT IFNULL(max(RIGHT(protocol_no, 3)), 0) from biz_business_outsource_protocol
+    </select>
+
+    <select id="selectBatchForApprovalList" resultMap="BaseResultMap">
+        SELECT *
+        FROM biz_business_outsource_protocol
+        WHERE 1=1
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
+            and approval_status = #{request.approvalStatus}
+        </if>
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
+            and create_user_id = #{request.createUserId}
+        </if>
+        <if test="request != null and request.protocolNo != null and request.protocolNo !=''">
+            and protocol_no like concat('%',#{request.protocolNo},'%')
+        </if>
+        <if test="request != null and request.outsourcerName != null and request.outsourcerName !=''">
+            and outsourcer_name like concat('%',#{request.outsourcerName},'%')
+        </if>
+        <if test="request != null and request.applicantName != null and request.applicantName !=''">
+            and create_user_name like concat('%',#{request.applicantName},'%')
+        </if>
+        <if test="request != null and request.applicantTimeStart != null and request.applicantTimeStart !=''">
+            and create_time &gt;= #{request.applicantTimeStart}
+        </if>
+        <if test="request != null and request.applicantTimeEnd != null and request.applicantTimeEnd !=''">
+            and create_time &lt;= #{request.applicantTimeEnd}
+        </if>
+        <if test="businessKeys != null">
+            and id in
+            <foreach collection="businessKeys" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
+        ORDER BY create_time DESC
+    </select>
+</mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourcerInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourcerInfoMapper.xml
index 510a80b..3049b54 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourcerInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourcerInfoMapper.xml
@@ -7,6 +7,8 @@
         <id column="id" property="id" />
         <result column="outsourcer_no" property="outsourcerNo" />
         <result column="outsourcer_name" property="outsourcerName" />
+        <result column="lab_code" property="labCode" />
+        <result column="group_code" property="groupCode" />
         <result column="outsourcer_brief_name" property="outsourcerBriefName" />
         <result column="outsourcer_size" property="outsourcerSize" />
         <result column="business_size" property="businessSize" />
@@ -55,32 +57,32 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, outsourcer_no, outsourcer_name, outsourcer_brief_name, outsourcer_size, business_size, grade, evaluation, tax_number, bank_account, bank_name, bank_account_number, postal_code, director, phone, fax, mobile, email, website, address_country, address_province, address_city, address_area, full_address, address_country_name, address_province_name, address_city_name, address_area_name, invoice_country, invoice_province, invoice_city, invoice_area, invoice_full_address, invoice_country_name, invoice_province_name, invoice_city_name, invoice_area_name, business_scope, business_content, minio_file_name, approval_status, process_id, remark, create_user_id, create_user_name, create_time, update_time
+        id, outsourcer_no, outsourcer_name, lab_code, group_code, outsourcer_brief_name, outsourcer_size, business_size, grade, evaluation, tax_number, bank_account, bank_name, bank_account_number, postal_code, director, phone, fax, mobile, email, website, address_country, address_province, address_city, address_area, full_address, address_country_name, address_province_name, address_city_name, address_area_name, invoice_country, invoice_province, invoice_city, invoice_area, invoice_full_address, invoice_country_name, invoice_province_name, invoice_city_name, invoice_area_name, business_scope, business_content, minio_file_name, approval_status, process_id, remark, create_user_id, create_user_name, create_time, update_time
     </sql>
 
     <select id="selectBatchForApprovalList" resultMap="BaseResultMap">
         SELECT *
         FROM biz_business_outsourcer_info
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.outsourcerNo != null and request.outsourcerNo !=''">
+        <if test="request != null and request.outsourcerNo != null and request.outsourcerNo !=''">
             and outsourcer_no like concat('%',#{request.outsourcerNo},'%')
         </if>
-        <if test="request.outsourcerName != null and request.outsourcerName !=''">
+        <if test="request != null and request.outsourcerName != null and request.outsourcerName !=''">
             and outsourcer_name like concat('%',#{request.outsourcerName},'%')
         </if>
-        <if test="request.director != null and request.director !=''">
+        <if test="request != null and request.director != null and request.director !=''">
             and director like concat('%',#{request.director},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
@@ -93,6 +95,6 @@
     </select>
 
     <select id="selectMaxNo" resultType="java.lang.Long">
-        SELECT IFNULL(max(RIGHT(outsourcer_no, 12)), 0) from biz_business_outsourcer_info
+        SELECT IFNULL(max(RIGHT(outsourcer_no, 3)), 0) from biz_business_outsourcer_info
     </select>
 </mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessSiteExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessSiteExecutiveInfoMapper.xml
index 135c5d0..3c5ae79 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessSiteExecutiveInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessSiteExecutiveInfoMapper.xml
@@ -38,25 +38,25 @@
         FROM biz_business_site_executive_info bsei
         LEFT JOIN biz_resource_customer_info rci ON bsei.customer_id = rci.id
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and bsei.approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and bsei.create_user_id = #{request.createUserId}
         </if>
-        <if test="request.siteExecutiveNo != null and request.siteExecutiveNo !=''">
+        <if test="request != null and request.siteExecutiveNo != null and request.siteExecutiveNo !=''">
             and bsei.site_executive_no like concat('%',#{request.siteExecutiveNo},'%')
         </if>
-        <if test="request.customerName != null and request.customerName !=''">
+        <if test="request != null and request.customerName != null and request.customerName !=''">
             and rci.outsourcer_name like concat('%',#{request.customerName},'%')
         </if>
-        <if test="request.applyName != null and request.applyName !=''">
+        <if test="request != null and request.applyName != null and request.applyName !=''">
             and bsei.apply_name like concat('%',#{request.applyName},'%')
         </if>
-        <if test="request.applyTimeStart != null and request.applyTimeStart !=''">
+        <if test="request != null and request.applyTimeStart != null and request.applyTimeStart !=''">
             and bsei.apply_time &gt;= #{request.applyTimeStart}
         </if>
-        <if test="request.applyTimeEnd != null and request.applyTimeEnd !=''">
+        <if test="request != null and request.applyTimeEnd != null and request.applyTimeEnd !=''">
             and bsei.apply_time &lt;= #{request.applyTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml
index 84d9e2a..6bd38a9 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml
@@ -105,6 +105,12 @@
         <if test="request.isUrgent != null and request.isUrgent !=''">
             AND bo.is_urgent = #{request.isUrgent}
         </if>
+        <if test="request.ids != null">
+            and blei.id in
+            <foreach collection="request.ids" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
         ORDER BY blei.update_time DESC
     </select>
 
@@ -137,6 +143,12 @@
         <if test="request.isUrgent != null and request.isUrgent !=''">
             AND bo.is_urgent = #{request.isUrgent}
         </if>
+        <if test="request.ids != null">
+            and blei.id in
+            <foreach collection="request.ids" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
         ORDER BY blei.update_time DESC
     </select>
 
diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardInfoMapper.xml
index 1a5551b..2ed8d17 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardInfoMapper.xml
@@ -45,12 +45,6 @@
         FROM biz_equipment_standard_info besi
         LEFT JOIN biz_equipment_standard_technology_relation bestr ON besi.standard_no = bestr.standard_no
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
-            and besi.approval_status = #{request.approvalStatus}
-        </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
-            and besi.create_user_id = #{request.createUserId}
-        </if>
         <if test="request.standardName != null and request.standardName !=''">
             and besi.standard_name like concat('%',#{request.standardName},'%')
         </if>
diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardTechnologyRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardTechnologyRelationMapper.xml
index fc7e16c..cd03c8c 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardTechnologyRelationMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardTechnologyRelationMapper.xml
@@ -6,6 +6,7 @@
     <resultMap id="BaseResultMap" type="com.casic.missiles.model.equipment.BizEquipmentStandardTechnologyRelation">
         <id column="id" property="id" />
         <result column="technology_file_id" property="technologyFileId" />
+        <result column="technology_file_no" property="technologyFileNo" />
         <result column="technology_file_name" property="technologyFileName" />
         <result column="standard_id" property="standardId" />
         <result column="standard_no" property="standardNo" />
@@ -14,7 +15,7 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, technology_file_id, technology_file_name, standard_id, remark
+        id, technology_file_id, technology_file_no, technology_file_name, standard_id, remark
     </sql>
 
 </mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceAuthorizeOrderMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceAuthorizeOrderMapper.xml
index ac5176c..554fe65 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceAuthorizeOrderMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceAuthorizeOrderMapper.xml
@@ -32,22 +32,22 @@
         SELECT *
         FROM biz_resource_authorize_order
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.orderNo != null and request.orderNo !=''">
+        <if test="request != null and request.orderNo != null and request.orderNo !=''">
             and order_no like concat('%',#{request.orderNo},'%')
         </if>
-        <if test="request.createUserName != null and request.createUserName !=''">
+        <if test="request != null and request.createUserName != null and request.createUserName !=''">
             and create_user_name like concat('%',#{request.createUserName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerExamineFormMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerExamineFormMapper.xml
index ab242f6..af7f98f 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerExamineFormMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerExamineFormMapper.xml
@@ -41,28 +41,28 @@
         SELECT *
         FROM biz_resource_customer_examine_form
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.formNo != null and request.formNo !=''">
+        <if test="request != null and request.formNo != null and request.formNo !=''">
             and form_no like concat('%',#{request.formNo},'%')
         </if>
-        <if test="request.labCode != null and request.labCode !=''">
+        <if test="request != null and request.labCode != null and request.labCode !=''">
             and lab_code like concat('%',#{request.labCode},'%')
         </if>
-        <if test="request.groupCode != null and request.groupCode !=''">
+        <if test="request != null and request.groupCode != null and request.groupCode !=''">
             and group_code like concat('%',#{request.groupCode},'%')
         </if>
-        <if test="request.createUserName != null and request.createUserName !=''">
+        <if test="request != null and request.createUserName != null and request.createUserName !=''">
             and create_user_name like concat('%',#{request.createUserName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerInfoMapper.xml
index fa8ffbc..06a2798 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerInfoMapper.xml
@@ -33,25 +33,25 @@
         SELECT *
         FROM biz_resource_customer_info
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.customerNo != null and request.customerNo !=''">
+        <if test="request != null and request.customerNo != null and request.customerNo !=''">
             and customer_no like concat('%',#{request.customerNo},'%')
         </if>
-        <if test="request.customerName != null and request.customerName !=''">
+        <if test="request != null and request.customerName != null and request.customerName !=''">
             and customer_name like concat('%',#{request.customerName},'%')
         </if>
-        <if test="request.contacts != null and request.contacts !=''">
+        <if test="request != null and request.contacts != null and request.contacts !=''">
             and contacts like concat('%',#{request.contacts},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerSuggestFormMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerSuggestFormMapper.xml
index 28f5bb2..1806662 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerSuggestFormMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerSuggestFormMapper.xml
@@ -33,28 +33,28 @@
         SELECT *
         FROM biz_resource_customer_suggest_form
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.formNo != null and request.formNo !=''">
+        <if test="request != null and request.formNo != null and request.formNo !=''">
             and form_no like concat('%',#{request.formNo},'%')
         </if>
-        <if test="request.customerName != null and request.customerName !=''">
+        <if test="request != null and request.customerName != null and request.customerName !=''">
             and customer_name like concat('%',#{request.customerName},'%')
         </if>
-        <if test="request.customerDeptName != null and request.customerDeptName !=''">
+        <if test="request != null and request.customerDeptName != null and request.customerDeptName !=''">
             and customer_dept_name like concat('%',#{request.customerDeptName},'%')
         </if>
-        <if test="request.createUserName != null and request.createUserName !=''">
+        <if test="request != null and request.createUserName != null and request.createUserName !=''">
             and create_user_name like concat('%',#{request.createUserName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSealUseNoteMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSealUseNoteMapper.xml
index ab37bc1..b02bb33 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSealUseNoteMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSealUseNoteMapper.xml
@@ -29,32 +29,32 @@
     </sql>
 
     <select id="selectBatchForApprovalList" resultMap="BaseResultMap">
-        SELECT *
+        SELECT brsun.*, brsi.seal_name, brsi.seal_type, brsi.approver_name
         FROM biz_resource_seal_use_note brsun
         JOIN biz_resource_seal_info brsi ON brsun.seal_id = brsi.id
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and brsun.approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and brsun.create_user_id = #{request.createUserId}
         </if>
-        <if test="request.sealName != null and request.sealName !=''">
+        <if test="request != null and request.sealName != null and request.sealName !=''">
             and brsi.seal_name like concat('%',#{request.sealName},'%')
         </if>
-        <if test="request.sealType != null and request.sealType !=''">
+        <if test="request != null and request.sealType != null and request.sealType !=''">
             and brsi.seal_type = #{request.sealType}
         </if>
-        <if test="request.applyDeptName != null and request.applyDeptName !=''">
+        <if test="request != null and request.applyDeptName != null and request.applyDeptName !=''">
             and brsun.apply_dept_name like concat('%',#{request.applyDeptName},'%')
         </if>
-        <if test="request.applyUserName != null and request.applyUserName !=''">
+        <if test="request != null and request.applyUserName != null and request.applyUserName !=''">
             and brsun.apply_user_name like concat('%',#{request.applyUserName},'%')
         </if>
-        <if test="request.applyTimeStart != null and request.applyTimeStart !=''">
+        <if test="request != null and request.applyTimeStart != null and request.applyTimeStart !=''">
             and brsun.apply_time &gt;= #{request.applyTimeStart}
         </if>
-        <if test="request.applyTimeEnd != null and request.applyTimeEnd !=''">
+        <if test="request != null and request.applyTimeEnd != null and request.applyTimeEnd !=''">
             and brsun.apply_time &lt;= #{request.applyTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml
index 119bf7d..4f8392a 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml
@@ -31,6 +31,12 @@
         <if test="request.deptName != null and request.deptName !=''">
             and brsi.dept_name like concat('%',#{request.deptName},'%')
         </if>
+        <if test="request.ids != null">
+            and brsv.id in
+            <foreach collection="request.ids" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
         ORDER BY brsv.grant_date DESC
     </select>
 
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSupplierInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSupplierInfoMapper.xml
index fe8d399..e8ce7ef 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSupplierInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSupplierInfoMapper.xml
@@ -48,28 +48,28 @@
         SELECT *
         FROM biz_resource_supplier_info
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.supplierNo != null and request.supplierNo !=''">
+        <if test="request != null and request.supplierNo != null and request.supplierNo !=''">
             and supplier_no like concat('%',#{request.supplierNo},'%')
         </if>
-        <if test="request.supplierName != null and request.supplierName !=''">
+        <if test="request != null and request.supplierName != null and request.supplierName !=''">
             and supplier_name like concat('%',#{request.supplierName},'%')
         </if>
-        <if test="request.director != null and request.director !=''">
+        <if test="request != null and request.director != null and request.director !=''">
             and director like concat('%',#{request.director},'%')
         </if>
-        <if test="request.supplierType != null and request.supplierType !=''">
+        <if test="request != null and request.supplierType != null and request.supplierType !=''">
             and supplier_type = #{request.supplierType}
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/EnvLocationInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/EnvLocationInfoMapper.xml
new file mode 100644
index 0000000..68bcf10
--- /dev/null
+++ b/casic-metering-dao/src/main/resources/mapper/resource/EnvLocationInfoMapper.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.mapper.resource.EnvLocationInfoMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.resource.EnvLocationInfo">
+        <id column="id" property="id" />
+        <result column="location_no" property="locationNo" />
+        <result column="location_name" property="locationName" />
+        <result column="location_position" property="locationPosition" />
+        <result column="create_user_id" property="createUserId" />
+        <result column="create_user" property="createUser" />
+        <result column="create_time" property="createTime" />
+        <result column="update_time" property="updateTime" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, location_no, location_name, location_position, create_user_id, create_user, create_time, update_time
+    </sql>
+
+    <select id="selectLocationListPage" resultType="com.casic.missiles.dto.resource.environment.LocationListResponse">
+        SELECT *
+        FROM env_location_info
+        WHERE 1=1
+        <if test="request.locationNo != null and request.locationNo !=''">
+            AND location_no LIKE concat('%',#{request.locationNo},'%')
+        </if>
+        <if test="request.locationName != null and request.locationName !=''">
+            AND location_name LIKE concat('%',#{request.locationName},'%')
+        </if>
+        ORDER BY create_time DESC
+    </select>
+
+</mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml
index b28c18f..8854047 100644
--- a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml
@@ -11,7 +11,6 @@
         <result column="sign_desc" property="signDesc" />
         <result column="sign_director" property="signDirector" />
         <result column="sign_user_id" property="signUserId" />
-        <result column="sign_type" property="signType" />
         <result column="minio_file_name" property="minioFileName" />
         <result column="create_time" property="createTime" />
         <result column="update_time" property="updateTime" />
@@ -28,7 +27,6 @@
         <result column="sign_name" property="signName" />
         <result column="sign_desc" property="signDesc" />
         <result column="sign_director" property="signDirector" />
-        <result column="sign_type" property="signType" />
         <result column="sign_user_id" property="signUserId" />
         <result column="minio_file_name" property="minioFileName" />
         <result column="create_time" property="createTime" />
@@ -62,4 +60,58 @@
         JOIN system_sign_user_relation ssur ON ss.id = ssur.sign_id
         WHERE ssur.user_id = #{userId}
     </select>
+
+    <select id="selectSignListPage" resultMap="BaseResultMap">
+        SELECT ss.*, sd.SIMPLE_NAME AS deptName
+        FROM system_sign ss
+        LEFT JOIN sys_user su ON su.id = ss.sign_user_id
+        LEFT JOIN sys_dept sd ON sd.id = su.dept_id
+        WHERE 1=1
+        <if test="request.signNo != null and request.signNo !=''">
+            AND ss.sign_no LIKE concat('%',#{request.signNo},'%')
+        </if>
+        <if test="request.signName != null and request.signName !=''">
+            AND ss.sign_name LIKE concat('%',#{request.signName},'%')
+        </if>
+        <if test="request.signDirector != null and request.signDirector !=''">
+            AND ss.sign_director LIKE concat('%',#{request.signDirector},'%')
+        </if>
+        <if test="request.signUserId != null and request.signUserId !=''">
+            AND ss.sign_user_id = #{request.signUserId}
+        </if>
+        <if test="request.createStartTime != null and request.createStartTime !=''">
+            AND DATE_FORMAT(ss.create_time,'%Y-%m-%d') &gt;= DATE_FORMAT(#{request.createStartTime},'%Y-%m-%d')
+        </if>
+        <if test="request.createEndTime != null and request.createEndTime !=''">
+            AND DATE_FORMAT(ss.create_time,'%Y-%m-%d')  &lt;= DATE_FORMAT(#{request.createEndTime},'%Y-%m-%d')
+        </if>
+        ORDER BY ss.create_time DESC
+    </select>
+
+    <select id="selectSignList" resultMap="BaseResultMap">
+        SELECT ss.*, sd.SIMPLE_NAME AS deptName
+        FROM system_sign ss
+        LEFT JOIN sys_user su ON su.id = ss.sign_user_id
+        LEFT JOIN sys_dept sd ON sd.id = su.dept_id
+        WHERE 1=1
+        <if test="request.signNo != null and request.signNo !=''">
+            AND ss.sign_no LIKE concat('%',#{request.signNo},'%')
+        </if>
+        <if test="request.signName != null and request.signName !=''">
+            AND ss.sign_name LIKE concat('%',#{request.signName},'%')
+        </if>
+        <if test="request.signDirector != null and request.signDirector !=''">
+            AND ss.sign_director LIKE concat('%',#{request.signDirector},'%')
+        </if>
+        <if test="request.signUserId != null and request.signUserId !=''">
+            AND ss.sign_user_id = #{request.signUserId}
+        </if>
+        <if test="request.createStartTime != null and request.createStartTime !=''">
+            AND DATE_FORMAT(ss.create_time,'%Y-%m-%d') &gt;= DATE_FORMAT(#{request.createStartTime},'%Y-%m-%d')
+        </if>
+        <if test="request.createEndTime != null and request.createEndTime !=''">
+            AND DATE_FORMAT(ss.create_time,'%Y-%m-%d')  &lt;= DATE_FORMAT(#{request.createEndTime},'%Y-%m-%d')
+        </if>
+        ORDER BY ss.create_time DESC
+    </select>
 </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 515050a..60f530b 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
@@ -47,8 +47,8 @@
     String STORAGE_LOCATION = "bizStorageLocation";
     //计量专业
     String MEASURE_MAJOR = "bizMeasureMajor";
-    //管理状态
-    String MANAGER_STATE = "bizManagerState";
+    //标准装置管理状态
+    String STANDARD_MANAGER_STATE = "bizStandardManagerState";
 
     /**
      * 资源管理 字典code
@@ -95,8 +95,6 @@
     String MEASURE_STATUS = "measureStatus";
     //检定方式
     String MEASURE_TYPE = "measureType";
-    //标识打印标志类型
-    String IDENTIFY_PRINT_TYPE = "bizBusinessIdentify";
     //变更类型
     String REPORT_CHANGE_TYPE = "bizCertChangeType";
     //规模类型
@@ -111,19 +109,24 @@
     String MEASURE_CATEGORY = "measureCategory";
     //检定结果
     String MEASURE_RESULT = "measureResult";
+    //分包原因
+    String OUTSOURCE_REASON = "outsourceReason";
+
+    /**
+     * 系统管理
+     */
+    String TEMPLATE_TYPE = "templateType";
+
 
     /**
      * 标准装置 字典code
      */
     //类别
     String STANDARD_CATEGORY = "standardCategory";
-    //管理状态
-    String STANDARD_MANAGER_STATE = "standardManagerState";
     //标准等级
     String STANDARD_LEVEL = "standardLevel";
     //传递范围
     String STANDARD_TRANSMIT_RANGE = "transmitRange";
-
     //资本来源
     String CAPITAL_SOURCE = "capitalSource";
     //标准装置-申请类型
@@ -148,8 +151,6 @@
     String CERTIFICATE_CLASS = "certificationClass";
     //证书管理-检校专业
     String CALIBRATION_MAJOR = "calibrationMajor";
-    //分包原因
-    String OUTSOURCE_REASON = "outsourceReason";
 
     /**
      * 工作台
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/BaseApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/BaseApprovalListRequest.java
index 73c12c1..80d7424 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/BaseApprovalListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/BaseApprovalListRequest.java
@@ -6,6 +6,7 @@
 
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotEmpty;
+import java.util.List;
 
 /**
  * @Description:
@@ -19,14 +20,14 @@
      * 表单id
      */
     @NotBlank(message = "表单id不能为空")
-    @ApiModelProperty(value = "表单id（流程定义对应的表单id，等价于业务id）", dataType = "String")
+    @ApiModelProperty(value = "表单id（流程定义对应的表单id，等价于业务id），导出接口不用传", dataType = "String")
     private String formId;
 
     /**
      * 审批状态类型，对应ApprovalStatusEnum
      */
     @NotEmpty(message = "审批状态类型不能为空")
-    @ApiModelProperty(value = "审批状态类型code", dataType = "String")
+    @ApiModelProperty(value = "审批状态类型code，导出接口不用传", dataType = "String")
     private String approvalStatus;
 
     @ApiModelProperty(hidden = true)
@@ -34,4 +35,7 @@
 
     @ApiModelProperty(hidden = true)
     private Long createUserId;
+
+    @ApiModelProperty(value = "导出ids", dataType = "List")
+    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificatePrintApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificatePrintApprovalListRequest.java
index b93d1c9..3cc2f4e 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificatePrintApprovalListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificatePrintApprovalListRequest.java
@@ -5,8 +5,6 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import java.util.List;
-
 /**
  * @Description:
  * @Author: wangpeng
@@ -38,7 +36,4 @@
 
     @ApiModelProperty(value = "创建结束时间", dataType = "String")
     private String createTimeEnd;
-
-    @ApiModelProperty(value = "导出ids", dataType = "List")
-    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportApprovalListRequest.java
index 4f7a038..c115847 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportApprovalListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportApprovalListRequest.java
@@ -5,8 +5,6 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import java.util.List;
-
 /**
  * @Description:
  * @Author: wangpeng
@@ -15,6 +13,8 @@
 @ApiModel
 @Data
 public class CertificateReportApprovalListRequest extends BaseApprovalListRequest {
+    @ApiModelProperty(value = "委托方id", dataType = "String")
+    private Long customerId;
 
     @ApiModelProperty(value = "证书报告编号", dataType = "String")
     private String certificateReportNo;
@@ -37,6 +37,4 @@
     @ApiModelProperty(value = "检校结束时间", dataType = "String")
     private String calibrationTimeEnd;
 
-    @ApiModelProperty(value = "导出ids", dataType = "List")
-    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/identify/IdentifyListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/identify/IdentifyListRequest.java
index 1b87ae6..f019203 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/identify/IdentifyListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/identify/IdentifyListRequest.java
@@ -4,6 +4,8 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * @Description:
  * @Author: wangpeng
@@ -26,4 +28,7 @@
 
     @ApiModelProperty(value = "打印结束时间", dataType = "String")
     private String createTimeEnd;
+
+    @ApiModelProperty(value = "导出ids", dataType = "List")
+    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListRequest.java
index 1264883..62415fb 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListRequest.java
@@ -7,6 +7,7 @@
 import lombok.Data;
 
 import javax.validation.constraints.NotBlank;
+import java.util.List;
 
 @Data
 @ApiModel
@@ -37,4 +38,6 @@
     @ApiModelProperty(value = "是否加急（1是0否null全部）", dataType = "Integer")
     private String isUrgent;
 
+    @ApiModelProperty(value = "导出ids", dataType = "List")
+    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListRequest.java
index 5201d7b..499760a 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListRequest.java
@@ -17,6 +17,9 @@
     @ApiModelProperty(value = "任务单编号", dataType = "String")
     private String orderNo;
 
+    @ApiModelProperty(value = "委托方id", dataType = "Long")
+    private Long customerId;
+
     @ApiModelProperty(value = "委托方名称", dataType = "String")
     private String customerName;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OrderSampleDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OrderSampleDTO.java
new file mode 100644
index 0000000..796edc0
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OrderSampleDTO.java
@@ -0,0 +1,19 @@
+package com.casic.missiles.dto.business.outsource;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/8/24 11:38
+ */
+@ApiModel
+@Data
+public class OrderSampleDTO {
+    @ApiModelProperty(value = "任务单id", dataType = "Long")
+    private Long orderId;
+    @ApiModelProperty(value = "受检设备id", dataType = "Long")
+    private Long sampleId;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceAssessApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceAssessApprovalListRequest.java
new file mode 100644
index 0000000..9a930c3
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceAssessApprovalListRequest.java
@@ -0,0 +1,30 @@
+package com.casic.missiles.dto.business.outsource;
+
+import com.casic.missiles.dto.BaseApprovalListRequest;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/8/24 11:01
+ */
+@ApiModel
+@Data
+public class OutsourceAssessApprovalListRequest extends BaseApprovalListRequest {
+    @ApiModelProperty(value = "评审表编号", dataType = "String")
+    private String projectNo;
+
+    @ApiModelProperty(value = "分包机构名称", dataType = "String")
+    private String outsourcerName;
+
+    @ApiModelProperty(value = "申请人", dataType = "String")
+    private String applicantName;
+
+    @ApiModelProperty(value = "申请时间开始", dataType = "String")
+    private String applicantTimeStart;
+
+    @ApiModelProperty(value = "申请时间结束", dataType = "String")
+    private String applicantTimeEnd;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceAssessSaveResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceAssessSaveResponse.java
new file mode 100644
index 0000000..8bf9aad
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceAssessSaveResponse.java
@@ -0,0 +1,20 @@
+package com.casic.missiles.dto.business.outsource;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/8/14 16:17
+ */
+@ApiModel
+@Data
+public class OutsourceAssessSaveResponse {
+    @ApiModelProperty(value = "主键id", dataType = "Long")
+    private Long id;
+
+    @ApiModelProperty(value = "编号", dataType = "String")
+    private String projectNo;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProtocolApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProtocolApprovalListRequest.java
new file mode 100644
index 0000000..0f32331
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProtocolApprovalListRequest.java
@@ -0,0 +1,30 @@
+package com.casic.missiles.dto.business.outsource;
+
+import com.casic.missiles.dto.BaseApprovalListRequest;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/8/24 15:01
+ */
+@ApiModel
+@Data
+public class OutsourceProtocolApprovalListRequest extends BaseApprovalListRequest {
+    @ApiModelProperty(value = "协议书编号", dataType = "String")
+    private String protocolNo;
+
+    @ApiModelProperty(value = "分包方名称", dataType = "String")
+    private String outsourcerName;
+
+    @ApiModelProperty(value = "申请人", dataType = "String")
+    private String applicantName;
+
+    @ApiModelProperty(value = "申请时间开始", dataType = "String")
+    private String applicantTimeStart;
+
+    @ApiModelProperty(value = "申请时间结束", dataType = "String")
+    private String applicantTimeEnd;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProtocolSaveResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProtocolSaveResponse.java
new file mode 100644
index 0000000..e324967
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProtocolSaveResponse.java
@@ -0,0 +1,20 @@
+package com.casic.missiles.dto.business.outsource;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/8/14 16:17
+ */
+@ApiModel
+@Data
+public class OutsourceProtocolSaveResponse {
+    @ApiModelProperty(value = "主键id", dataType = "Long")
+    private Long id;
+
+    @ApiModelProperty(value = "编号", dataType = "String")
+    private String protocolNo;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveApprovalListRequest.java
index f29f4e4..7047c28 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveApprovalListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveApprovalListRequest.java
@@ -5,8 +5,6 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import java.util.List;
-
 /**
  * @Description: 现场检测审批列表请求实体
  * @Author: wangpeng
@@ -30,7 +28,4 @@
     @ApiModelProperty(value = "申请时间结束", dataType = "String")
     private String applyTimeEnd;
 
-    @ApiModelProperty(value = "导出ids", dataType = "List")
-    private List<Long> ids;
-
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveDetailResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveDetailResponse.java
index 1f28752..394c934 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveDetailResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveDetailResponse.java
@@ -12,6 +12,18 @@
     @ApiModelProperty(value = "id，更新/删除使用参数", dataType = "Long")
     private Long id;
 
+    @ApiModelProperty(value = "实验室代码(字典code)", dataType = "String")
+    private String labCode;
+
+    @ApiModelProperty(value = "实验室代码(字典value)", dataType = "String")
+    private String labCodeName;
+
+    @ApiModelProperty(value = "组别代码(字典code)", dataType = "String")
+    private String groupCode;
+
+    @ApiModelProperty(value = "组别代码(字典value)", dataType = "String")
+    private String groupCodeName;
+
     @ApiModelProperty(value = "审批编号", dataType = "String")
     private String siteExecutiveNo;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/environment/LocationListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/environment/LocationListRequest.java
new file mode 100644
index 0000000..13d03c3
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/environment/LocationListRequest.java
@@ -0,0 +1,20 @@
+package com.casic.missiles.dto.resource.environment;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/6/8 13:56
+ */
+@ApiModel
+@Data
+public class LocationListRequest {
+    @ApiModelProperty(value = "地点编号", dataType = "String")
+    private String locationNo;
+
+    @ApiModelProperty(value = "地点名称", dataType = "String")
+    private String locationName;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/environment/LocationListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/environment/LocationListResponse.java
new file mode 100644
index 0000000..4c531af
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/environment/LocationListResponse.java
@@ -0,0 +1,78 @@
+package com.casic.missiles.dto.resource.environment;
+
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
+import com.baomidou.mybatisplus.annotation.TableField;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description: 地点列表响应实体
+ * @Author: wangpeng
+ * @Date: 2023/6/8 13:53
+ */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
+@ApiModel
+@Data
+public class LocationListResponse {
+    @ApiModelProperty(value = "主键id", dataType = "Long")
+    private Long id;
+
+    /**
+     * 地点编号
+     */
+    @ExcelProperty("地点编号")
+    @ApiModelProperty(value = "地点编号", dataType = "String")
+    private String locationNo;
+
+    /**
+     * 地点名称
+     */
+    @ExcelProperty("地点名称")
+    @ApiModelProperty(value = "地点名称", dataType = "String")
+    private String locationName;
+
+    /**
+     * 地点位置
+     */
+    @ExcelProperty("地点位置")
+    @ApiModelProperty(value = "地点位置", dataType = "String")
+    private String locationPosition;
+
+    /**
+     * 创建人id
+     */
+    @ApiModelProperty(value = "创建人id", dataType = "Long")
+    private Long createUserId;
+
+    /**
+     * 创建人
+     */
+    @ExcelProperty("创建人")
+    @ApiModelProperty(value = "创建人", dataType = "String")
+    @TableField("create_user")
+    private String createUser;
+
+    /**
+     * 创建时间
+     */
+    @ExcelProperty("创建时间")
+    @ApiModelProperty(value = "创建时间", dataType = "String")
+    private String createTime;
+
+    /**
+     * 更新时间
+     */
+    @ApiModelProperty(value = "更新时间", dataType = "String")
+    private String updateTime;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertRequest.java
index 9a7f6c6..c827915 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertRequest.java
@@ -4,6 +4,8 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * @Description:
  * @Author: wangpeng
@@ -16,4 +18,7 @@
     private String name;
     @ApiModelProperty(value = "部门名", dataType = "String")
     private String deptName;
+
+    @ApiModelProperty(value = "导出ids", dataType = "List")
+    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertResponse.java
index f78b159..8f2f79e 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertResponse.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.dto.resource.staff;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.casic.missiles.annotation.DictCodeField;
 import com.casic.missiles.constants.MeterDictCode;
 import io.swagger.annotations.ApiModel;
@@ -13,12 +20,18 @@
  * @Author: wangpeng
  * @Date: 2023/7/27 15:13
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @ApiModel
 @Data
 public class StaffCertResponse {
     /**
      * 人员编号
      */
+    @ExcelProperty(value = "人员编号",order = 0)
     @NotEmpty(message = "人员编号不能为空")
     @ApiModelProperty(value = "人员编号", dataType = "String")
     private String staffNo;
@@ -26,6 +39,7 @@
     /**
      * 姓名
      */
+    @ExcelProperty(value = "姓名",order = 1)
     @ApiModelProperty(value = "姓名", dataType = "String")
     private String staffName;
 
@@ -54,6 +68,7 @@
     /**
      * 部门名字
      */
+    @ExcelProperty(value = "工作部门",order = 2)
     @ApiModelProperty(value = "部门名字", dataType = "String")
     private String deptName;
 
@@ -66,6 +81,7 @@
     /**
      * 计量专业
      */
+    @ExcelProperty(value = "计量专业",order = 3)
     @ApiModelProperty(value = "计量专业", dataType = "String")
     private String major;
 
@@ -110,6 +126,7 @@
     /**
      * 证书号
      */
+    @ExcelProperty(value = "证号",order = 4)
     @ApiModelProperty(value = "证书号", dataType = "String")
     private String certNo;
 
@@ -122,12 +139,14 @@
     /**
      * 有效日期
      */
+    @ExcelProperty(value = "证书有效期",order = 6)
     @ApiModelProperty(value = "有效日期", dataType = "String")
     private String effectiveDate;
 
     /**
      * 发放日期
      */
+    @ExcelProperty(value = "发证日期",order = 5)
     @ApiModelProperty(value = "发放日期", dataType = "String")
     private String grantDate;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffListRequest.java
index 7c4afb3..0a1194a 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffListRequest.java
@@ -4,6 +4,8 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * @Description:
  * @Author: wangpeng
@@ -18,4 +20,7 @@
     private String deptName;
     @ApiModelProperty(value = "部门id", dataType = "Long")
     private Long deptId;
+
+    @ApiModelProperty(value = "导出ids", dataType = "List")
+    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/TrainListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/TrainListRequest.java
index f68597b..6321f8b 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/TrainListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/TrainListRequest.java
@@ -14,6 +14,8 @@
 public class TrainListRequest {
     @ApiModelProperty(value = "训练登记表编号", dataType = "String")
     private String trainNo;
+    @ApiModelProperty(value = "值班领导", dataType = "String")
+    private String dutyLeader;
     @ApiModelProperty(value = "创建开始时间", dataType = "String")
     private String createTimeStart;
     @ApiModelProperty(value = "创建结束时间", dataType = "String")
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/SignAddRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/SignAddRequest.java
index 117be34..d71055c 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/SignAddRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/SignAddRequest.java
@@ -43,13 +43,6 @@
     private Long signUserId;
 
     /**
-     * 签章或签名-字典code
-     */
-    @NotBlank(message = "类型不能为空")
-    @ApiModelProperty(value = "签名/签章-字典code", dataType = "String", required = true)
-    private String signType;
-
-    /**
      * minio存储文件名
      */
     @ApiModelProperty(value = "上传文件返回名称", dataType = "String")
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateAddRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateAddRequest.java
index aff1265..6316648 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateAddRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateAddRequest.java
@@ -17,30 +17,28 @@
 @Data
 public class TemplateAddRequest extends BaseSystemRequest {
     /**
-     * 原始记录模板/证书报告模板名称
+     * 模板名称
      */
     @ApiModelProperty(value = "名称", dataType = "String", required = true)
     @NotBlank(message = "名称不能为空")
     private String templateName;
 
     /**
-     * 原始记录模板/证书报告模板描述
+     * 模板描述
      */
     @ApiModelProperty(value = "描述", dataType = "String")
     private String templateDesc;
 
     /**
-     * 原始记录模板/证书报告模板创建人
+     * 创建人
      */
     @ApiModelProperty(value = "创建人", dataType = "String", required = true)
     @NotBlank(message = "创建人不能为空")
     private String templateCreator;
 
-    /**
-     * 原始记录模板/证书报告模板-字典code
-     */
-    @NotBlank(message = "类型不能为空")
-    @ApiModelProperty(value = "原始记录模板/证书报告模板-字典code", dataType = "String", required = true)
+
+    @NotBlank(message = "模板类型不能为空")
+    @ApiModelProperty(value = "模板类型(字典code)", dataType = "String", required = true)
     private String templateType;
 
     /**
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateListRequest.java
index eec5a1e..6d17bbe 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateListRequest.java
@@ -1,11 +1,12 @@
 package com.casic.missiles.dto.system;
 
+import com.casic.missiles.annotation.DictCodeField;
+import com.casic.missiles.constants.MeterDictCode;
 import com.casic.missiles.dto.BaseSystemRequest;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import javax.validation.constraints.NotBlank;
 import java.util.List;
 
 /**
@@ -19,8 +20,8 @@
     /**
      * 类型
      */
-//    @ApiModelProperty(value = "类型-字典code", dataType = "String", required = true)
-    @NotBlank(message = "类型不能为空")
+    @DictCodeField(message = "模板类型不合法", cacheName = MeterDictCode.TEMPLATE_TYPE)
+    @ApiModelProperty(value = "模板类型(字典code)", dataType = "String")
     private String templateType;
 
     /**
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificateChangeApply.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificateChangeApply.java
index 9216308..36923fd 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificateChangeApply.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificateChangeApply.java
@@ -1,11 +1,19 @@
 package com.casic.missiles.model.business;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 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 com.casic.missiles.dto.BaseRequest;
+import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -20,6 +28,12 @@
  * @author wangpeng
  * @since 2023-08-15
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
+@ApiModel
 @Data
 @TableName("biz_business_certificate_change_apply")
 public class BizBusinessCertificateChangeApply extends BaseRequest implements Serializable {
@@ -33,6 +47,7 @@
     /**
      * 申请单编号
      */
+    @ExcelProperty(value = "申请单编号", order = 1)
     @ApiModelProperty(value = "申请单编号", dataType = "String")
     @TableField("change_apply_no")
     private String changeApplyNo;
@@ -40,6 +55,7 @@
     /**
      * 申请单名字
      */
+    @ExcelProperty(value = "申请单名称", order = 2)
     @ApiModelProperty(value = "申请单名字", dataType = "String")
     @TableField("change_apply_name")
     private String changeApplyName;
@@ -54,6 +70,7 @@
     /**
      * 更换证书编号
      */
+    @ExcelProperty(value = "更换证书编号", order = 3)
     @ApiModelProperty(value = "更换证书编号", dataType = "String")
     @TableField("change_report_no")
     private String changeReportNo;
@@ -61,7 +78,8 @@
     /**
      * 更换证书名字
      */
-    @ApiModelProperty(value = "更换证书名字", dataType = "String")
+    @ExcelProperty(value = "更换证书/报告名称", order = 4)
+    @ApiModelProperty(value = "更换证书/报告名称", dataType = "String")
     @TableField("change_report_name")
     private String changeReportName;
 
@@ -73,6 +91,7 @@
     @TableField("change_type")
     private String changeType;
 
+    @ExcelProperty(value = "变更类型", order = 5)
     @ApiModelProperty(value = "变更类型(字典value)", dataType = "String")
     @TableField(exist = false)
     private String changeTypeName;
@@ -142,13 +161,15 @@
     /**
      * 创建用户名字
      */
-    @ApiModelProperty(value = "创建用户名字", dataType = "String")
+    @ExcelProperty(value = "创建人", order = 6)
+    @ApiModelProperty(value = "创建人名字", dataType = "String")
     @TableField("create_user_name")
     private String createUserName;
 
     /**
      * 创建时间
      */
+    @ExcelProperty(value = "创建时间", order = 7)
     @ApiModelProperty(value = "创建时间", dataType = "String")
     @TableField("create_time")
     private String createTime;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificateReport.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificateReport.java
index f01db9e..db06018 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificateReport.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificateReport.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.model.business;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -22,6 +29,11 @@
  * @author wangpeng
  * @since 2023-08-14
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @ApiModel
 @Data
 @TableName("biz_business_certificate_report")
@@ -36,6 +48,7 @@
     /**
      * 证书报告编号
      */
+    @ExcelProperty(value = "证书报告编号", order = 1)
     @ApiModelProperty(value = "证书报告编号", dataType = "String")
     @TableField("certificate_report_no")
     private String certificateReportNo;
@@ -43,6 +56,7 @@
     /**
      * 证书报告名称
      */
+    @ExcelProperty(value = "证书报告名称", order = 2)
     @ApiModelProperty(value = "证书报告名称", dataType = "String")
     @TableField("certificate_report_name")
     private String certificateReportName;
@@ -62,6 +76,7 @@
     @TableField("measure_category")
     private String measureCategory;
 
+    @ExcelProperty(value = "检校类别", order = 6)
     @ApiModelProperty(value = "检校类别(字典value)", dataType = "String")
     @TableField(exist = false)
     private String measureCategoryName;
@@ -69,6 +84,7 @@
     /**
      * 检校时间
      */
+    @ExcelProperty(value = "检校时间", order = 8)
     @ApiModelProperty(value = "检校时间", dataType = "String")
     @TableField("calibration_time")
     private String calibrationTime;
@@ -267,18 +283,22 @@
     @TableField(exist = false)
     private Integer decisionItem;
 
-    @ApiModelProperty(value = "设备样品编号（列表返回参数）", dataType = "String")
+    @ExcelProperty(value = "被检设备统一编号", order = 3)
+    @ApiModelProperty(value = "被检设备统一编号（列表返回参数）", dataType = "String")
     @TableField(exist = false)
     private String sampleNo;
 
-    @ApiModelProperty(value = "设备样品名称（列表返回参数）", dataType = "String")
+    @ExcelProperty(value = "被检设备名称", order = 4)
+    @ApiModelProperty(value = "被检设备名称（列表返回参数）", dataType = "String")
     @TableField(exist = false)
     private String sampleName;
 
-    @ApiModelProperty(value = "设备样品规格型号（列表返回参数）", dataType = "String")
+    @ExcelProperty(value = "规格型号", order = 5)
+    @ApiModelProperty(value = "规格型号（列表返回参数）", dataType = "String")
     @TableField(exist = false)
     private String sampleModel;
 
+    @ExcelProperty(value = "检定员", order = 7)
     @ApiModelProperty(value = "检定员名字（列表返回参数）", dataType = "String")
     @TableField(exist = false)
     private String staffName;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessIdentifyInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessIdentifyInfo.java
index 46bfba5..f1a9bec 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessIdentifyInfo.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessIdentifyInfo.java
@@ -1,10 +1,15 @@
 package com.casic.missiles.model.business;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 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;
 
@@ -20,6 +25,11 @@
  * @author wangpeng
  * @since 2023-08-15
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @Data
 @TableName("biz_business_identify_info")
 public class BizBusinessIdentifyInfo implements Serializable {
@@ -33,6 +43,7 @@
     /**
      * 记录编号
      */
+    @ExcelProperty(value = "记录编号", order = 1)
     @ApiModelProperty(value = "记录编号", dataType = "String")
     @TableField("record_no")
     private String recordNo;
@@ -41,20 +52,15 @@
      * 标志类型(字典code)
      */
     @NotEmpty(message = "标志类型不能为空")
-    @ApiModelProperty(value = "标志类型(字典code)", dataType = "String")
-    @DictCodeField(message = "标志类型不合法", cacheName = MeterDictCode.IDENTIFY_PRINT_TYPE)
+    @ApiModelProperty(value = "标志类型(直接存计量标识/使用状态/校准状态的字典value)", dataType = "String")
     @TableField("identify_type")
     private String identifyType;
 
-    @ApiModelProperty(value = "标志类型(字典value)", dataType = "String")
-    @TableField(exist = false)
-    private String identifyTypeName;
-
     /**
      * 设备id(可以是受检设备/设备台账)
      */
     @NotNull(message = "设备id不能为空")
-    @ApiModelProperty(value = "设备id(可以是受检设备/设备台账)", dataType = "String")
+    @ApiModelProperty(value = "设备id(可以是受检设备/设备台账)", dataType = "Long")
     @TableField("device_id")
     private Long deviceId;
 
@@ -66,29 +72,32 @@
     @TableField("device_type")
     private String deviceType;
 
+    @ExcelProperty(value = "统一编号", order = 3)
     @NotEmpty(message = "设备编号不能为空")
-    @ApiModelProperty(value = "设备编号", dataType = "String")
+    @ApiModelProperty(value = "统一编号", dataType = "String")
     @TableField("device_no")
     private String deviceNo;
 
     /**
      * 设备名字
      */
-    @NotEmpty(message = "设备名字不能为空")
-    @ApiModelProperty(value = "设备名字", dataType = "String")
+    @ExcelProperty(value = "设备名称", order = 4)
+    @NotEmpty(message = "设备名称不能为空")
+    @ApiModelProperty(value = "设备名称", dataType = "String")
     @TableField("device_name")
     private String deviceName;
 
     /**
      * 检定员id
      */
-    @ApiModelProperty(value = "检定员id", dataType = "String")
+    @ApiModelProperty(value = "检定员id", dataType = "Long")
     @TableField("measure_person_id")
     private Long measurePersonId;
 
     /**
      * 检定员名字
      */
+    @ExcelProperty(value = "检定员", order = 5)
     @ApiModelProperty(value = "检定员名字", dataType = "String")
     @TableField("measure_person")
     private String measurePerson;
@@ -103,7 +112,8 @@
     /**
      * 更新时间
      */
-    @ApiModelProperty(value = "更新时间", dataType = "String")
+    @ExcelProperty(value = "打印时间", order = 6)
+    @ApiModelProperty(value = "打印时间", dataType = "String")
     @TableField("update_time")
     private String updateTime;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceAssess.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceAssess.java
index 659d9ca..6720b90 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceAssess.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceAssess.java
@@ -1,11 +1,26 @@
 package com.casic.missiles.model.business;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 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 com.casic.missiles.dto.BaseRequest;
+import com.casic.missiles.dto.business.outsource.OrderSampleDTO;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import javax.validation.constraints.NotEmpty;
 import java.io.Serializable;
+import java.util.List;
 
 /**
  * <p>
@@ -15,146 +30,231 @@
  * @author wangpeng
  * @since 2023-08-16
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
+@ApiModel
 @Data
 @TableName("biz_business_outsource_assess")
-public class BizBusinessOutsourceAssess implements Serializable {
+public class BizBusinessOutsourceAssess extends BaseRequest implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
+    @ApiModelProperty(value = "id，更新/删除使用参数", dataType = "Long")
     @TableId("id")
     private Long id;
 
     /**
      * 评审表编号
      */
+    @ExcelProperty(value = "评审表编号", order = 1)
+    @ApiModelProperty(value = "评审表编号(后台生成)", dataType = "String")
     @TableField("project_no")
     private String projectNo;
 
     /**
      * 评审表名称
      */
+    @ExcelProperty(value = "评审表名称", order = 2)
+    @ApiModelProperty(value = "评审表名称", dataType = "String")
     @TableField("project_name")
     private String projectName;
 
+    @NotEmpty(message = "实验室代码不能为空")
+    @DictCodeField(message = "实验室代码描述不合法", cacheName = MeterDictCode.LAB_CODE)
+    @ApiModelProperty(value = "实验室代码(字典code)", dataType = "String")
+    @TableField("lab_code")
+    private String labCode;
+
+    @ApiModelProperty(value = "实验室代码(字典value)", dataType = "String")
+    @TableField(exist = false)
+    private String labCodeName;
+
+    /**
+     * 组别代码
+     */
+    @NotEmpty(message = "组别代码不能为空")
+    @DictCodeField(message = "组别代码描述不合法", cacheName = MeterDictCode.GROUP_CODE)
+    @ApiModelProperty(value = "组别代码(字典code)", dataType = "String")
+    @TableField("group_code")
+    private String groupCode;
+
+    @ApiModelProperty(value = "组别代码(字典value)", dataType = "String")
+    @TableField(exist = false)
+    private String groupCodeName;
+
     /**
      * 申请人id
      */
+    @ApiModelProperty(value = "申请人id", dataType = "String")
     @TableField("applicant_id")
     private Long applicantId;
 
     /**
      * 申请人名字
      */
+    @ExcelProperty(value = "申请人", order = 5)
+    @ApiModelProperty(value = "申请人", dataType = "String")
     @TableField("applicant_name")
     private String applicantName;
 
     /**
      * 申请时间
      */
+    @ExcelProperty(value = "申请时间", order = 6)
+    @ApiModelProperty(value = "申请时间", dataType = "String")
     @TableField("applicant_time")
     private String applicantTime;
 
     /**
      * 附件(minio存储文件名)
      */
+    @ApiModelProperty(value = "附件(minio存储文件名)", dataType = "String")
     @TableField("minio_file_name")
     private String minioFileName;
 
     /**
      * 备注
      */
+    @ApiModelProperty(value = "备注", dataType = "String")
     @TableField("remark")
     private String remark;
 
     /**
      * 创建人id
      */
+    @ApiModelProperty(value = "创建人id", dataType = "String")
     @TableField("create_user_id")
     private Long createUserId;
 
     /**
      * 创建人名字
      */
+    @ApiModelProperty(value = "创建人名字", dataType = "String")
     @TableField("create_user_name")
     private String createUserName;
 
     /**
      * 分包方id
      */
+    @ApiModelProperty(value = "评审表编号", dataType = "String")
     @TableField("outsourcer_id")
     private Long outsourcerId;
 
     /**
      * 预计开始时间
      */
+    @ApiModelProperty(value = "预计开始时间", dataType = "String")
     @TableField("pre_start_time")
     private String preStartTime;
 
     /**
      * 预计结束时间
      */
+    @ApiModelProperty(value = "预计结束时间", dataType = "String")
     @TableField("pre_end_time")
     private String preEndTime;
 
     /**
      * 分包原因-字典
      */
+    @ApiModelProperty(value = "分包原因(字典code)", dataType = "String")
+    @DictCodeField(message = "分包原因描述不合法", cacheName = MeterDictCode.OUTSOURCE_REASON)
     @TableField("outsource_reason")
     private String outsourceReason;
 
+    @ApiModelProperty(value = "分包原因(字典value)", dataType = "String")
+    @TableField(exist = false)
+    private String outsourceReasonName;
+
     /**
      * 预计费用
      */
+    @ApiModelProperty(value = "预计费用", dataType = "String")
     @TableField("pre_cost")
     private String preCost;
 
     /**
      * 审批状态
      */
+    @ApiModelProperty(value = "审批状态", dataType = "String")
+    @DictCodeField(message = "审批状态描述不合法", cacheName = MeterDictCode.APPROVAL_STATUS)
     @TableField("approval_status")
     private String approvalStatus;
 
     /**
      * 流程实例id
      */
+    @ApiModelProperty(value = "流程实例id", dataType = "String")
     @TableField("process_id")
     private String processId;
 
     /**
      * 实验室认可情况
      */
+    @ApiModelProperty(value = "实验室认可情况", dataType = "String")
     @TableField("approve_situation")
     private String approveSituation;
 
     /**
      * 溯源性
      */
+    @ApiModelProperty(value = "溯源性", dataType = "String")
     @TableField("traceability")
     private String traceability;
 
     /**
      * 测试方法
      */
+    @ApiModelProperty(value = "测试方法", dataType = "String")
     @TableField("test_method")
     private String testMethod;
 
     /**
      * 技术能力
      */
+    @ApiModelProperty(value = "技术能力", dataType = "String")
     @TableField("technique_ability")
     private String techniqueAbility;
 
     /**
      * 创建时间
      */
+    @ApiModelProperty(hidden = true)
     @TableField("create_time")
     private String createTime;
 
     /**
      * 更新时间
      */
+    @ApiModelProperty(hidden = true)
     @TableField("update_time")
     private String updateTime;
 
+    @ApiModelProperty(value = "审批状态类型-字典value", dataType = "String")
+    @TableField(exist = false)
+    private String approvalStatusName;
 
+    @ApiModelProperty(value = "任务id（同意、驳回等操作使用）", dataType = "String")
+    @TableField(exist = false)
+    private String taskId;
+
+    @ApiModelProperty(value = "可选决策项（1同意驳回拒绝 2同意驳回 3同意拒绝，用于待审批列表同意/驳回/拒绝按钮展示）", dataType = "Integer")
+    @TableField(exist = false)
+    private Integer decisionItem;
+
+    @NotEmpty(message = "受检设备信息不能为空")
+    @ApiModelProperty(value = "受检设备id列表（新建使用参数）", dataType = "List")
+    @TableField(exist = false)
+    private List<OrderSampleDTO> orderSampleList;
+
+    @ExcelProperty(value = "分包机构名称", order = 3)
+    @ApiModelProperty(value = "分包机构名称（列表返回参数）", dataType = "String")
+    private String outsourcerName;
+
+    @ExcelProperty(value = "机构负责人", order = 4)
+    @ApiModelProperty(value = "机构负责人（列表返回参数）", dataType = "String")
+    private String director;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceProtocol.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceProtocol.java
new file mode 100644
index 0000000..38df697
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceProtocol.java
@@ -0,0 +1,225 @@
+package com.casic.missiles.model.business;
+
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
+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 com.casic.missiles.dto.BaseRequest;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotEmpty;
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 计量检定业务-分包管理-测试、校准或检定工作分包协议书
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-08-24
+ */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
+@Data
+@TableName("biz_business_outsource_protocol")
+public class BizBusinessOutsourceProtocol extends BaseRequest implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "id，更新/删除使用参数", dataType = "Long")
+    @TableId("id")
+    private Long id;
+
+    /**
+     * 协议书编号
+     */
+    @ExcelProperty(value = "协议书编号", order = 1)
+    @ApiModelProperty(value = "协议书编号(后台生成)", dataType = "String")
+    @TableField("protocol_no")
+    private String protocolNo;
+
+    /**
+     * 协议书名称
+     */
+    @ExcelProperty(value = "协议书名称", order = 2)
+    @ApiModelProperty(value = "协议书名称", dataType = "String")
+    @TableField("project_name")
+    private String projectName;
+
+    @NotEmpty(message = "实验室代码不能为空")
+    @DictCodeField(message = "实验室代码描述不合法", cacheName = MeterDictCode.LAB_CODE)
+    @ApiModelProperty(value = "实验室代码(字典code)", dataType = "String")
+    @TableField("lab_code")
+    private String labCode;
+
+    @ApiModelProperty(value = "实验室代码(字典value)", dataType = "String")
+    @TableField(exist = false)
+    private String labCodeName;
+
+    @NotEmpty(message = "组别代码不能为空")
+    @DictCodeField(message = "组别代码描述不合法", cacheName = MeterDictCode.GROUP_CODE)
+    @ApiModelProperty(value = "组别代码(字典code)", dataType = "String")
+    @TableField("group_code")
+    private String groupCode;
+
+    @ApiModelProperty(value = "组别代码(字典value)", dataType = "String")
+    @TableField(exist = false)
+    private String groupCodeName;
+
+    /**
+     * 分包方id
+     */
+    @ApiModelProperty(value = "分包方id", dataType = "Long")
+    @TableField("outsourcer_id")
+    private Long outsourcerId;
+
+    /**
+     * 其他
+     */
+    @ApiModelProperty(value = "其他", dataType = "String")
+    @TableField("remark")
+    private String remark;
+
+    /**
+     * 分包方编号
+     */
+    @ApiModelProperty(value = "分包方编号(新建不用传)", dataType = "String")
+    @TableField("outsource_no")
+    private String outsourceNo;
+
+    /**
+     * 分包方名称
+     */
+    @ExcelProperty(value = "分包方名称", order = 3)
+    @ApiModelProperty(value = "分包方名称(新建不用传)", dataType = "String")
+    @TableField("outsource_name")
+    private String outsourceName;
+
+    /**
+     * 联系人
+     */
+    @ExcelProperty(value = "联系人", order = 4)
+    @ApiModelProperty(value = "联系人", dataType = "String")
+    @TableField("contacts")
+    private String contacts;
+
+    /**
+     * 电话
+     */
+    @ApiModelProperty(value = "电话", dataType = "String")
+    @TableField("mobile")
+    private String mobile;
+
+    /**
+     * 地址
+     */
+    @ApiModelProperty(value = "地址", dataType = "String")
+    @TableField("address")
+    private String address;
+
+    /**
+     * 要求完成日期
+     */
+    @ApiModelProperty(value = "要求完成日期", dataType = "String")
+    @TableField("require_date")
+    private String requireDate;
+
+    /**
+     * 分包费用(元)
+     */
+    @ApiModelProperty(value = "分包费用(元)", dataType = "String")
+    @TableField("outsource_cost")
+    private Double outsourceCost;
+
+    /**
+     * 分包方负责人
+     */
+    @ApiModelProperty(value = "分包方负责人", dataType = "String")
+    @TableField("director")
+    private String director;
+
+    /**
+     * 分包项目
+     */
+    @ApiModelProperty(value = "分包项目", dataType = "String")
+    @TableField("item")
+    private String item;
+
+    /**
+     * 分包要求
+     */
+    @ApiModelProperty(value = "分包要求", dataType = "String")
+    @TableField("requires")
+    private String requires;
+
+    /**
+     * 创建人id
+     */
+    @ApiModelProperty(hidden = true)
+    @TableField("create_user_id")
+    private Long createUserId;
+
+    /**
+     * 创建人名字
+     */
+    @ExcelProperty(value = "申请人", order = 5)
+    @ApiModelProperty(value = "申请人", dataType = "String")
+    @TableField("create_user_name")
+    private String createUserName;
+
+    /**
+     * 审批状态
+     */
+    @ApiModelProperty(value = "审批状态", dataType = "String")
+    @DictCodeField(message = "审批状态描述不合法", cacheName = MeterDictCode.APPROVAL_STATUS)
+    @TableField("approval_status")
+    private String approvalStatus;
+
+    /**
+     * 流程实例id
+     */
+    @ApiModelProperty(value = "流程实例id", dataType = "String")
+    @TableField("process_id")
+    private String processId;
+
+    /**
+     * 创建时间
+     */
+    @ExcelProperty(value = "申请时间", order = 6)
+    @ApiModelProperty(value = "申请时间", dataType = "String")
+    @TableField("create_time")
+    private String createTime;
+
+    /**
+     * 更新时间
+     */
+    @ApiModelProperty(hidden = true)
+    @TableField("update_time")
+    private String updateTime;
+
+    @ApiModelProperty(value = "审批状态类型-字典value", dataType = "String")
+    @TableField(exist = false)
+    private String approvalStatusName;
+
+    @ApiModelProperty(value = "任务id（同意、驳回等操作使用）", dataType = "String")
+    @TableField(exist = false)
+    private String taskId;
+
+    @ApiModelProperty(value = "可选决策项（1同意驳回拒绝 2同意驳回 3同意拒绝，用于待审批列表同意/驳回/拒绝按钮展示）", dataType = "Integer")
+    @TableField(exist = false)
+    private Integer decisionItem;
+
+
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourcerInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourcerInfo.java
index ec4e997..f9aa69e 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourcerInfo.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourcerInfo.java
@@ -17,6 +17,7 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import javax.validation.constraints.NotEmpty;
 import java.io.Serializable;
 
 /**
@@ -59,6 +60,29 @@
     @TableField("outsourcer_name")
     private String outsourcerName;
 
+    @NotEmpty(message = "实验室代码不能为空")
+    @DictCodeField(message = "实验室代码描述不合法", cacheName = MeterDictCode.LAB_CODE)
+    @ApiModelProperty(value = "实验室代码(字典code)", dataType = "String")
+    @TableField("lab_code")
+    private String labCode;
+
+    @ApiModelProperty(value = "实验室代码(字典value)", dataType = "String")
+    @TableField(exist = false)
+    private String labCodeName;
+
+    /**
+     * 组别代码
+     */
+    @NotEmpty(message = "组别代码不能为空")
+    @DictCodeField(message = "组别代码描述不合法", cacheName = MeterDictCode.GROUP_CODE)
+    @ApiModelProperty(value = "组别代码(字典code)", dataType = "String")
+    @TableField("group_code")
+    private String groupCode;
+
+    @ApiModelProperty(value = "组别代码(字典value)", dataType = "String")
+    @TableField(exist = false)
+    private String groupCodeName;
+
     /**
      * 单位简称
      */
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardInfo.java
index c48eed7..dffdfdd 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardInfo.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardInfo.java
@@ -5,6 +5,7 @@
 import com.baomidou.mybatisplus.annotation.TableName;
 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;
 
@@ -18,6 +19,7 @@
  * @author wangpeng
  * @since 2023-08-04
  */
+@ApiModel
 @Data
 @TableName("biz_equipment_standard_info")
 public class BizEquipmentStandardInfo implements Serializable {
@@ -119,7 +121,7 @@
      * 管理状态(字典code)
      */
     @ApiModelProperty(value = "管理状态(字典code)", dataType = "String")
-    @DictCodeField(message = "管理状态不合法", cacheName = MeterDictCode.MANAGER_STATE)
+    @DictCodeField(message = "管理状态不合法", cacheName = MeterDictCode.STANDARD_MANAGER_STATE)
     @TableField("manage_status")
     private String manageStatus;
 
@@ -151,7 +153,7 @@
     /**
      * 温度(℃)
      */
-    @ApiModelProperty(value = "使用状态(字典code)", dataType = "String")
+    @ApiModelProperty(value = "温度(℃)", dataType = "String")
     @TableField("temperature")
     private Double temperature;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardInfoApproval.java b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardInfoApproval.java
index dbd86ab..9f58d83 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardInfoApproval.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardInfoApproval.java
@@ -150,7 +150,7 @@
      * 管理状态(字典code)
      */
     @ApiModelProperty(value = "管理状态(字典code)", dataType = "String")
-    @DictCodeField(message = "管理状态不合法", cacheName = MeterDictCode.MANAGER_STATE)
+    @DictCodeField(message = "管理状态不合法", cacheName = MeterDictCode.STANDARD_MANAGER_STATE)
     @TableField("manage_status")
     private String manageStatus;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardTechnologyRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardTechnologyRelation.java
index 0e612bd..751f26b 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardTechnologyRelation.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardTechnologyRelation.java
@@ -3,6 +3,7 @@
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -16,6 +17,7 @@
  * @author wangpeng
  * @since 2023-08-04
  */
+@ApiModel
 @Data
 @TableName("biz_equipment_standard_technology_relation")
 public class BizEquipmentStandardTechnologyRelation implements Serializable {
@@ -33,6 +35,10 @@
     @TableField("technology_file_id")
     private Long technologyFileId;
 
+    @ApiModelProperty(value = "依据的技术文件编号", dataType = "String")
+    @TableField("technology_file_no")
+    private String technologyFileNo;
+
     /**
      * 依据的技术文件名称(技术文件中现行测试校准检定方法表文件名字段)
      */
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerInfo.java
index d6e8bed..65cd6bc 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerInfo.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerInfo.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.model.resource;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -21,6 +28,11 @@
  * @author wangpeng
  * @since 2023-08-08
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @ApiModel
 @Data
 @TableName("biz_resource_customer_info")
@@ -35,6 +47,7 @@
     /**
      * 委托方编号
      */
+    @ExcelProperty(value = "委托方编号", order = 1)
     @ApiModelProperty(value = "委托方编号", dataType = "String")
     @TableField("customer_no")
     private String customerNo;
@@ -42,6 +55,7 @@
     /**
      * 委托方名称
      */
+    @ExcelProperty(value = "委托方名称", order = 2)
     @ApiModelProperty(value = "委托方名称(新建时为下拉选择一个受检单位组织的名字，传deptId字段，后端获取名称)", dataType = "String")
     @TableField("customer_name")
     private String customerName;
@@ -63,6 +77,7 @@
     /**
      * 联系人
      */
+    @ExcelProperty(value = "联系人", order = 3)
     @ApiModelProperty(value = "联系人", dataType = "String")
     @TableField("contacts")
     private String contacts;
@@ -70,6 +85,7 @@
     /**
      * 座机电话
      */
+    @ExcelProperty(value = "座机电话", order = 4)
     @ApiModelProperty(value = "座机电话", dataType = "String")
     @TableField("mobile")
     private String mobile;
@@ -77,6 +93,7 @@
     /**
      * 手机号码
      */
+    @ExcelProperty(value = "手机号码", order = 5)
     @ApiModelProperty(value = "手机号码", dataType = "String")
     @TableField("phone")
     private String phone;
@@ -91,6 +108,7 @@
     /**
      * 地址
      */
+    @ExcelProperty(value = "地址", order = 6)
     @ApiModelProperty(value = "地址", dataType = "String")
     @TableField("address")
     private String address;
@@ -141,6 +159,7 @@
     /**
      * 创建时间
      */
+    @ExcelProperty(value = "创建时间", order = 7)
     @ApiModelProperty(value = "创建时间", dataType = "String")
     @TableField("create_time")
     private String createTime;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerSuggestForm.java b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerSuggestForm.java
index 7201bbd..701bf8b 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerSuggestForm.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerSuggestForm.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.model.resource;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -22,6 +29,11 @@
  * @author wangpeng
  * @since 2023-08-08
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @ApiModel
 @Data
 @TableName("biz_resource_customer_suggest_form")
@@ -44,7 +56,8 @@
     /**
      * 委托方名称
      */
-    @ApiModelProperty(value = "委托方名称", dataType = "String")
+    @ExcelProperty(value = "意见反馈单位", order = 2)
+    @ApiModelProperty(value = "意见反馈单位", dataType = "String")
     @TableField("customer_name")
     private String customerName;
 
@@ -59,7 +72,8 @@
     /**
      * 委托方意见反馈部门名称
      */
-    @ApiModelProperty(value = "委托方意见反馈部门名称", dataType = "String")
+    @ExcelProperty(value = "委托方意见反馈部门", order = 3)
+    @ApiModelProperty(value = "委托方意见反馈部门", dataType = "String")
     @TableField("customer_dept_name")
     private String customerDeptName;
 
@@ -73,6 +87,7 @@
     /**
      * 表单编号
      */
+    @ExcelProperty(value = "表单编号", order = 1)
     @ApiModelProperty(value = "表单编号", dataType = "String")
     @TableField("form_no")
     private String formNo;
@@ -111,6 +126,7 @@
     /**
      * 创建人名字
      */
+    @ExcelProperty(value = "创建人", order = 4)
     @ApiModelProperty(value = "创建人名字", dataType = "String")
     @TableField("create_user_name")
     private String createUserName;
@@ -147,6 +163,7 @@
     /**
      * 创建时间
      */
+    @ExcelProperty(value = "创建时间", order = 5)
     @ApiModelProperty(value = "创建时间", dataType = "String")
     @TableField("create_time")
     private String createTime;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSealInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSealInfo.java
index cbf05d7..9bf389d 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSealInfo.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSealInfo.java
@@ -106,6 +106,10 @@
     @TableField("minio_file_name")
     private String minioFileName;
 
+    @ApiModelProperty(value = "minio存储文件url", dataType = "String")
+    @TableField(exist = false)
+    private String minioFileUrl;
+
     @ApiModelProperty(value = "创建时间", dataType = "String")
     @TableField("create_time")
     private String createTime;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSealUseNote.java b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSealUseNote.java
index 3f2d9e8..3ce16a8 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSealUseNote.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSealUseNote.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.model.resource;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -20,6 +27,11 @@
  * @author wangpeng
  * @since 2023-07-28
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @ApiModel
 @Data
 @TableName("biz_resource_seal_use_note")
@@ -34,6 +46,7 @@
     /**
      * 登记表编号
      */
+    @ExcelProperty(value = "申请单编号", order = 1)
     @ApiModelProperty(value = "登记表编号(自动生成)", dataType = "String")
     @TableField("note_form_no")
     private String noteFormNo;
@@ -55,6 +68,7 @@
     /**
      * 申请部门
      */
+    @ExcelProperty(value = "申请部门", order = 5)
     @ApiModelProperty(value = "申请部门", dataType = "String")
     @TableField("apply_dept_name")
     private String applyDeptName;
@@ -69,6 +83,7 @@
     /**
      * 申请人
      */
+    @ExcelProperty(value = "申请人", order = 6)
     @ApiModelProperty(value = "申请人", dataType = "String")
     @TableField("apply_user_name")
     private String applyUserName;
@@ -76,6 +91,7 @@
     /**
      * 申请时间
      */
+    @ExcelProperty(value = "申请时间", order = 7)
     @ApiModelProperty(value = "申请时间(新增自动获取当前时间)", dataType = "String")
     @TableField("apply_time")
     private String applyTime;
@@ -130,6 +146,26 @@
     @TableField("update_time")
     private String updateTime;
 
+    @ExcelProperty(value = "印章名称", order = 2)
+    @ApiModelProperty(value = "印章名称(列表返回参数)", dataType = "String")
+    @TableField(exist = false)
+    private String sealName;
+
+    @DictCodeField(message = "印章类型描述不合法", cacheName = MeterDictCode.SEAL_TYPE)
+    @ApiModelProperty(hidden = true)
+    @TableField(exist = false)
+    private String sealType;
+
+    @ExcelProperty(value = "印章类型", order = 3)
+    @ApiModelProperty(value = "印章类型(列表返回参数)", dataType = "String")
+    @TableField(exist = false)
+    private String sealTypeName;
+
+    @ExcelProperty(value = "批准人", order = 4)
+    @ApiModelProperty(value = "批准人(列表返回参数)", dataType = "String")
+    @TableField(exist = false)
+    private String approverName;
+
     @ApiModelProperty(value = "审批状态类型-字典value", dataType = "String")
     @TableField(exist = false)
     private String approvalStatusName;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceStaffInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceStaffInfo.java
index 5ef995b..41563a1 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceStaffInfo.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceStaffInfo.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.model.resource;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -20,6 +27,11 @@
  * @author wangpeng
  * @since 2023-07-25
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @ApiModel
 @Data
 @TableName("biz_resource_staff_info")
@@ -38,6 +50,7 @@
     /**
      * 人员编号
      */
+    @ExcelProperty(value = "人员编号",order = 0)
     @NotEmpty(message = "人员编号不能为空")
     @ApiModelProperty(value = "人员编号", dataType = "String")
     @TableField("staff_no")
@@ -46,6 +59,7 @@
     /**
      * 姓名
      */
+    @ExcelProperty(value = "姓名",order = 1)
     @ApiModelProperty(value = "姓名", dataType = "String")
     @TableField("staff_name")
     private String staffName;
@@ -152,13 +166,15 @@
     /**
      * 部门名字
      */
-    @ApiModelProperty(value = "部门名字", dataType = "String")
+    @ExcelProperty(value = "工作部门",order = 4)
+    @ApiModelProperty(value = "工作部门", dataType = "String")
     @TableField("dept_name")
     private String deptName;
 
     /**
      * 岗位
      */
+    @ExcelProperty(value = "岗位",order = 2)
     @ApiModelProperty(value = "岗位", dataType = "String")
     @TableField("station")
     private String station;
@@ -166,6 +182,7 @@
     /**
      * 计量专业
      */
+    @ExcelProperty(value = "计量专业",order = 5)
     @ApiModelProperty(value = "计量专业", dataType = "String")
     @TableField("major")
     private String major;
@@ -173,6 +190,7 @@
     /**
      * 证号
      */
+    @ExcelProperty(value = "证号",order = 3)
     @ApiModelProperty(value = "证号", dataType = "String")
     @TableField("certificate_number")
     private String certificateNumber;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSupplierInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSupplierInfo.java
index eb5ef01..a1e2697 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSupplierInfo.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSupplierInfo.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.model.resource;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -20,6 +27,11 @@
  * @author wangpeng
  * @since 2023-07-27
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @ApiModel
 @Data
 @TableName("biz_resource_supplier_info")
@@ -34,6 +46,7 @@
     /**
      * 供方编号
      */
+    @ExcelProperty(value = "供方编号", order = 1)
     @ApiModelProperty(value = "供方编号(自动生成)", dataType = "String")
     @TableField("supplier_no")
     private String supplierNo;
@@ -41,6 +54,7 @@
     /**
      * 供方名称
      */
+    @ExcelProperty(value = "供方名称", order = 2)
     @ApiModelProperty(value = "供方名称", dataType = "String")
     @TableField("supplier_name")
     private String supplierName;
@@ -60,6 +74,7 @@
     @TableField("supplier_type")
     private String supplierType;
 
+    @ExcelProperty(value = "供方类型", order = 3)
     @ApiModelProperty(value = "供方类型(字典value)", dataType = "String")
     @TableField(exist = false)
     private String supplierTypeName;
@@ -109,7 +124,8 @@
     /**
      * 电话
      */
-    @ApiModelProperty(value = "电话", dataType = "String")
+    @ExcelProperty(value = "联系电话", order = 4)
+    @ApiModelProperty(value = "联系电话", dataType = "String")
     @TableField("phone")
     private String phone;
 
@@ -158,6 +174,7 @@
     /**
      * 公司地址-省
      */
+    @ExcelProperty(value = "地址-省", order = 6)
     @ApiModelProperty(value = "公司地址-省", dataType = "String")
     @TableField("company_province_name")
     private String companyProvinceName;
@@ -172,6 +189,7 @@
     /**
      * 公司地址-市
      */
+    @ExcelProperty(value = "地址-市", order = 7)
     @ApiModelProperty(value = "公司地址-市", dataType = "String")
     @TableField("company_city_name")
     private String companyCityName;
@@ -186,6 +204,7 @@
     /**
      * 公司地址-区
      */
+    @ExcelProperty(value = "地址-区", order = 8)
     @ApiModelProperty(value = "公司地址-区", dataType = "String")
     @TableField("company_area_name")
     private String companyAreaName;
@@ -193,6 +212,7 @@
     /**
      * 公司地址-详细地址
      */
+    @ExcelProperty(value = "地址-详细地址", order = 9)
     @ApiModelProperty(value = "公司地址-详细地址", dataType = "String")
     @TableField("company_address")
     private String companyAddress;
@@ -200,6 +220,7 @@
     /**
      * 服务和供应的内容
      */
+    @ExcelProperty(value = "服务和供应的内容", order = 5)
     @ApiModelProperty(value = "服务和供应的内容", dataType = "String")
     @TableField("supplier_content")
     private String supplierContent;
@@ -250,6 +271,7 @@
     /**
      * 创建时间
      */
+    @ExcelProperty(value = "创建时间", order = 9)
     @ApiModelProperty(value = "创建时间", dataType = "String")
     @TableField("create_time")
     private String createTime;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/EnvLocationInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/EnvLocationInfo.java
new file mode 100644
index 0000000..d8e2d7b
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/EnvLocationInfo.java
@@ -0,0 +1,83 @@
+package com.casic.missiles.model.resource;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotEmpty;
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 实验室环境监控系统-设备表
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-06-07
+ */
+@ApiModel
+@Data
+@TableName("env_location_info")
+public class EnvLocationInfo implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "主键id", dataType = "Long")
+    @TableId("id")
+    private Long id;
+
+    /**
+     * 地点编号
+     */
+    @NotEmpty(message = "地点编号不能为空")
+    @ApiModelProperty(value = "地点编号", dataType = "String")
+    @TableField("location_no")
+    private String locationNo;
+
+    /**
+     * 地点名称
+     */
+    @ApiModelProperty(value = "地点名称", dataType = "String")
+    @TableField("location_name")
+    private String locationName;
+
+    /**
+     * 地点位置
+     */
+    @ApiModelProperty(value = "地点位置", dataType = "String")
+    @TableField("location_position")
+    private String locationPosition;
+
+    /**
+     * 创建人id
+     */
+    @ApiModelProperty(value = "创建人id", dataType = "Long")
+    @TableField("create_user_id")
+    private Long createUserId;
+
+    /**
+     * 创建人
+     */
+    @ApiModelProperty(value = "创建人", dataType = "String")
+    @TableField("create_user")
+    private String createUser;
+
+    /**
+     * 创建时间
+     */
+    @ApiModelProperty(value = "创建时间", dataType = "String")
+    @TableField("create_time")
+    private String createTime;
+
+    /**
+     * 更新时间
+     */
+    @ApiModelProperty(value = "更新时间", dataType = "String")
+    @TableField("update_time")
+    private String updateTime;
+
+
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemFileConfig.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemFileConfig.java
index 19e6845..86e569c 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemFileConfig.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemFileConfig.java
@@ -30,7 +30,7 @@
     @ApiModelProperty(value = "系统类别(1业务系统2受检系统3环境系统)", dataType = "Integer")
     @NotNull(message = "系统类别不能为空")
     @TableField("system_type")
-    private Integer systemType;
+    private Integer systemType = 1;
 
     @ApiModelProperty("下载编号")
     @TableField("download_no")
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemNotice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemNotice.java
index e94297d..06ec37d 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemNotice.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemNotice.java
@@ -34,7 +34,7 @@
     @ApiModelProperty(value = "系统类别(1业务系统2受检系统3环境系统)", dataType = "Integer")
     @NotNull(message = "系统类别不能为空")
     @TableField("system_type")
-    private Integer systemType;
+    private Integer systemType = 1;
 
     /**
      * 通知公告编号
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSign.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSign.java
index 6c0d7c9..954f4f8 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSign.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSign.java
@@ -51,7 +51,7 @@
     @ApiModelProperty(value = "系统类别(1业务系统2受检系统3环境系统)", dataType = "Integer")
     @NotNull(message = "系统类别不能为空")
     @TableField("system_type")
-    private Integer systemType;
+    private Integer systemType = 1;
 
     /**
      * 签名编号
@@ -130,4 +130,8 @@
     @TableField(exist = false)
     private List<Long> userIdList;
 
+    @ApiModelProperty(hidden = true)
+    @TableField(exist = false)
+    private String deptName;
+
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemTemplate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemTemplate.java
index 503a457..1d27ebe 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemTemplate.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemTemplate.java
@@ -47,7 +47,7 @@
     @ApiModelProperty(value = "系统类别(1业务系统2受检系统3环境系统)", dataType = "Integer")
     @NotNull(message = "系统类别不能为空")
     @TableField("system_type")
-    private Integer systemType;
+    private Integer systemType = 1;
 
     /**
      * 模板编号
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java
index 8c21cb0..f61e4a8 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java
@@ -32,4 +32,8 @@
     ReturnDTO approvalDelete(ApprovalDeleteRequest request);
 
     ReturnDTO failUpdate(T request);
+
+    List<O> listExport(R request);
+
+    List<O> listExportByIds(List<Long> ids);
 }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java
index 724166f..9bce15b 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java
@@ -157,6 +157,29 @@
         throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
     }
 
+    @Override
+    public List<O> listExport(R request) {
+        request.setCreateUserId(null);
+        request.setApprovalStatus(ApprovalStatusEnum.PASSED);
+        Page<O> page = PageFactory.defaultPage();
+        page.setCurrent(1);
+        page.setSearchCount(false);
+        page.setSize(Integer.MAX_VALUE);
+        Page<O> resultPage = this.baseMapper.selectBatchForApprovalList(page, request, null);
+        return resultPage.getRecords();
+    }
+
+    @Override
+    public List<O> listExportByIds(List<Long> ids) {
+        Page<O> page = PageFactory.defaultPage();
+        page.setCurrent(1);
+        page.setSearchCount(false);
+        page.setSize(Integer.MAX_VALUE);
+        List<String> businessKeys = ids.stream().map(String::valueOf).collect(Collectors.toList());
+        Page<O> resultPage = this.baseMapper.selectBatchForApprovalList(page, null, businessKeys);
+        return resultPage.getRecords();
+    }
+
     protected ReturnDTO updateApprovalStatus(Long id, String processId, String approvalStatus) {
         UpdateWrapper<T> updateWrapper = new UpdateWrapper<>();
         updateWrapper.eq("id", id);
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificatePrintServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificatePrintServiceImpl.java
index f6e4706..3228497 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificatePrintServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificatePrintServiceImpl.java
@@ -162,6 +162,30 @@
         return ReturnUtil.success(printLogMapper.selectList(wrapper));
     }
 
+    @Override
+    public List<CertificatePrintListResponse> listByIds(List<Long> ids) {
+        Page<CertificatePrintListResponse> page = PageFactory.defaultPage();
+        page.setCurrent(1);
+        page.setSearchCount(false);
+        page.setSize(Integer.MAX_VALUE);
+        List<String> businessKeys = ids.stream().map(String::valueOf).collect(Collectors.toList());
+        Page<CertificatePrintListResponse> resultPage = this.baseMapper.selectBatchForApprovalList(page, null, businessKeys);
+        return resultPage.getRecords();
+    }
+
+    @Override
+    public List<CertificatePrintListResponse> list(CertificatePrintApprovalListRequest request) {
+        request.setCreateUserId(null);
+        request.setApprovalStatus(null);
+        request.setPrintStatus(null);
+        Page<CertificatePrintListResponse> page = PageFactory.defaultPage();
+        page.setCurrent(1);
+        page.setSearchCount(false);
+        page.setSize(Integer.MAX_VALUE);
+        Page<CertificatePrintListResponse> resultPage = certificatePrintMapper.selectBatchForApprovalList(page, request, null);
+        return resultPage.getRecords();
+    }
+
     private void savePrintLog(Long id) {
         BizBusinessCertificatePrintLog printLog = new BizBusinessCertificatePrintLog();
         BizBusinessCertificatePrint certificatePrint = certificatePrintMapper.selectById(id);
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificateReportServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificateReportServiceImpl.java
index 457555f..24146be 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificateReportServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificateReportServiceImpl.java
@@ -158,8 +158,8 @@
         QueryWrapper<BizBusinessCertificateMeasureResultData> mWrapper = new QueryWrapper<>();
         mWrapper.eq("report_id", reportId);
         boolean mRemove = certificateMeasureResultDataService.remove(mWrapper);
-        Assert.isFalse(eRemove || mRemove, () -> {
+        if(!eRemove || !mRemove){
             throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
-        });
+        }
     }
 }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessIdentifyInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessIdentifyInfoServiceImpl.java
index 4c8e190..f7e63ca 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessIdentifyInfoServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessIdentifyInfoServiceImpl.java
@@ -1,8 +1,10 @@
 package com.casic.missiles.service.Impl.business;
 
+import cn.hutool.core.date.DateUtil;
 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.core.page.PageFactory;
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.business.identify.IdentifyListRequest;
@@ -14,11 +16,14 @@
 import com.casic.missiles.service.business.IBizBusinessIdentifyInfoService;
 import com.casic.missiles.utils.DictCodeUtils;
 import com.casic.missiles.utils.NumberGeneratorUtil;
+import com.casic.missiles.utils.QRCodeUtil;
 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.List;
+
 /**
  * <p>
  * 计量检定业务-任务计量管理-标识打印 服务实现类
@@ -35,9 +40,9 @@
     @Override
     public Page<BizBusinessIdentifyInfo> identifyListPage(Page<BizBusinessIdentifyInfo> page, IdentifyListRequest request) throws Exception {
         QueryWrapper<BizBusinessIdentifyInfo> wrapper = new QueryWrapper<>();
-        wrapper.eq("identify_type", request.getIdentifyType());
-        wrapper.like("device_no", request.getDeviceNo());
-        wrapper.like("device_name", request.getDeviceName());
+        wrapper.eq(StringUtils.isNotEmpty(request.getIdentifyType()), "identify_type", request.getIdentifyType());
+        wrapper.like(StringUtils.isNotEmpty(request.getDeviceNo()),"device_no", request.getDeviceNo());
+        wrapper.like(StringUtils.isNotEmpty(request.getDeviceName()), "device_name", request.getDeviceName());
         wrapper.apply(StringUtils.isNotBlank(request.getCreateTimeStart()),
                 "{0} <= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getCreateTimeStart().split(" ")[0]);
         wrapper.apply(StringUtils.isNotBlank(request.getCreateTimeEnd()),
@@ -64,8 +69,11 @@
     }
 
     @Override
-    public ReturnDTO updateIdentify(BizBusinessIdentifyInfo identifyInfo) {
-        if(identifyInfoMapper.updateById(identifyInfo) > 0){
+    public ReturnDTO updateIdentify(Long id) {
+        BizBusinessIdentifyInfo info = new BizBusinessIdentifyInfo();
+        info.setId(id);
+        info.setUpdateTime(DateUtil.now());
+        if(identifyInfoMapper.updateById(info) > 0){
             return ReturnUtil.success();
         }
         throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
@@ -79,4 +87,20 @@
         throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
     }
 
+    @Override
+    public List<BizBusinessIdentifyInfo> list(IdentifyListRequest request) throws Exception {
+        Page<BizBusinessIdentifyInfo> page = PageFactory.defaultPage();
+        page.setCurrent(1);
+        page.setSearchCount(false);
+        page.setSize(Integer.MAX_VALUE);
+        Page<BizBusinessIdentifyInfo> resultPage = this.identifyListPage(page, request);
+        return resultPage.getRecords();
+    }
+
+    @Override
+    public ReturnDTO<String> equipmentQrCode(Long id) {
+        String base64QRCode = QRCodeUtil.getBase64QRCode(String.valueOf(id));
+        return ReturnUtil.success(base64QRCode);
+    }
+
 }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOrderInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOrderInfoServiceImpl.java
index 82952ad..d8d2c6a 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOrderInfoServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOrderInfoServiceImpl.java
@@ -35,6 +35,7 @@
 import javax.servlet.http.HttpServletResponse;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 import java.util.stream.Collectors;
 
 /**
@@ -209,13 +210,16 @@
     private QueryWrapper<OrderListResponse> listParamWrapperBuilder(OrderListRequest request) {
         QueryWrapper<OrderListResponse> wrapper = new QueryWrapper<>();
         wrapper.like(StringUtils.isNotBlank(request.getOrderNo()), "order_no", request.getOrderNo());
+        wrapper.like(Objects.nonNull(request.getCustomerId()), "customer_id", request.getCustomerId());
         wrapper.like(StringUtils.isNotBlank(request.getCustomerName()), "customer_name", request.getCustomerName());
         wrapper.like(StringUtils.isNotBlank(request.getDeliverer()), "deliverer", request.getDeliverer());
         wrapper.like(StringUtils.isNotBlank(request.getCreateUserName()), "create_user_name", request.getCreateUserName());
-        wrapper.apply(StringUtils.isNotBlank(request.getCreateStartTime()),
-                "{0} <= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getCreateStartTime().split(" ")[0]);
-        wrapper.apply(StringUtils.isNotBlank(request.getCreateEndTime()),
-                "{0} >= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getCreateEndTime().split(" ")[0]);
+        if(StringUtils.isNotBlank(request.getCreateStartTime())){
+            wrapper.apply("{0} <= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getCreateStartTime().split(" ")[0]);
+        }
+        if(StringUtils.isNotBlank(request.getCreateEndTime())){
+            wrapper.apply("{0} >= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getCreateEndTime().split(" ")[0]);
+        }
         wrapper.orderByDesc("create_time");
         return wrapper;
     }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceAssessServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceAssessServiceImpl.java
index c6af980..ce40138 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceAssessServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceAssessServiceImpl.java
@@ -1,10 +1,33 @@
 package com.casic.missiles.service.Impl.business;
 
-import com.casic.missiles.model.business.BizBusinessOutsourceAssess;
+import cn.hutool.core.lang.Assert;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.casic.missiles.core.model.auth.AuthUser;
+import com.casic.missiles.core.shiro.ShiroKit;
+import com.casic.missiles.dto.BaseApprovalSubmitRequest;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.ReturnUtil;
+import com.casic.missiles.dto.business.outsource.OutsourceAssessApprovalListRequest;
+import com.casic.missiles.dto.business.outsource.OutsourceAssessSaveResponse;
+import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.NoGenerateFileCodeEnum;
+import com.casic.missiles.enums.NoGenerateRecordTypeCodeEnum;
+import com.casic.missiles.enums.system.ApprovalStatusEnum;
+import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.mapper.business.BizBusinessOutsourceAssessMapper;
+import com.casic.missiles.model.business.BizBusinessOutsourceAssess;
+import com.casic.missiles.model.business.BizBusinessOutsourceAssessSampleRelation;
+import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl;
+import com.casic.missiles.service.business.IBizBusinessOutsourceAssessSampleRelationService;
 import com.casic.missiles.service.business.IBizBusinessOutsourceAssessService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.casic.missiles.utils.NoGeneratorUtil;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Objects;
 
 /**
  * <p>
@@ -15,6 +38,103 @@
  * @since 2023-08-16
  */
 @Service
-public class BizBusinessOutsourceAssessServiceImpl extends ServiceImpl<BizBusinessOutsourceAssessMapper, BizBusinessOutsourceAssess> implements IBizBusinessOutsourceAssessService {
+public class BizBusinessOutsourceAssessServiceImpl extends GeneralApprovalServiceImpl<BizBusinessOutsourceAssessMapper, BizBusinessOutsourceAssess, BizBusinessOutsourceAssess, OutsourceAssessApprovalListRequest, BaseApprovalSubmitRequest> implements IBizBusinessOutsourceAssessService {
+    @Autowired
+    private IBizBusinessOutsourceAssessSampleRelationService outsourceAssessSampleRelationService;
 
+    @Override
+    public ReturnDTO<OutsourceAssessSaveResponse> saveOutsourceAssess(BizBusinessOutsourceAssess request) {
+        //生成编号
+        String labCode = request.getLabCode();
+        String groupCode = request.getGroupCode();
+        Long maxNo = this.baseMapper.selectMaxProjectNo();
+        String projectNo = NoGeneratorUtil.getCode(NoGenerateFileCodeEnum.D, labCode, NoGenerateRecordTypeCodeEnum.OUTSOURCE_ACCESS, groupCode, maxNo);
+        request.setCreateUserId(request.getUserId());
+        request.setCreateUserName(request.getUserName());
+        request.setApprovalStatus(ApprovalStatusEnum.DRAFT); //草稿箱状态
+        request.setProjectNo(projectNo);
+        int row = this.baseMapper.insert(request);
+        Assert.isFalse(row <= 0, () -> {
+            throw new BusinessException(BusinessExceptionEnum.OUTSOURCE_ACCESS_SAVE_FAILED);
+        });
+        //关联表
+        saveRelationData(request);
+        OutsourceAssessSaveResponse saveResponse = new OutsourceAssessSaveResponse();
+        saveResponse.setId(request.getId());
+        saveResponse.setProjectNo(projectNo);
+        return ReturnUtil.success(saveResponse);
+    }
+
+    @Override
+    @Transactional
+    public ReturnDTO draftUpdate(BizBusinessOutsourceAssess request) {
+        if (this.baseMapper.updateById(request) > 0) {
+            //关联表删除、增加
+            removeRelationData(request.getId());
+            saveRelationData(request);
+            return ReturnUtil.success();
+        }
+        throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
+    }
+
+    @Override
+    public ReturnDTO draftDelete(Long id) {
+        if (this.baseMapper.deleteById(id) > 0) {
+            //关联表删除
+            removeRelationData(id);
+            return ReturnUtil.success();
+        }
+        throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
+    }
+
+    @Override
+    public ReturnDTO draftBatchDelete(List<Long> ids) {
+        if (this.baseMapper.deleteBatchIds(ids) >= 0) {
+            ids.forEach(id -> removeRelationData(id));
+            return ReturnUtil.success();
+        }
+        throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
+    }
+
+    @Override
+    @Transactional
+    public ReturnDTO failUpdate(BizBusinessOutsourceAssess request) {
+        AuthUser user = ShiroKit.getUser();
+        Assert.isFalse(Objects.isNull(user), () -> {
+            throw new BusinessException(BusinessExceptionEnum.LOGIN_USER_ACQUIRE_FAILED);
+        });
+        request.setApprovalStatus(ApprovalStatusEnum.IN_APPROVED);
+        if (this.baseMapper.updateById(request) > 0) {
+            //关联表删除、增加
+            removeRelationData(request.getId());
+            saveRelationData(request);
+            baseApprovalService.failUpdate(request.getProcessId());
+            return ReturnUtil.success();
+        }
+        throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
+    }
+
+    private void saveRelationData(BizBusinessOutsourceAssess request) {
+        List<BizBusinessOutsourceAssessSampleRelation> sampleRelations = new ArrayList<>();
+        request.getOrderSampleList().forEach(dto -> {
+            BizBusinessOutsourceAssessSampleRelation relation = new BizBusinessOutsourceAssessSampleRelation();
+            relation.setOrderId(dto.getOrderId());
+            relation.setSampleId(dto.getSampleId());
+            relation.setAccessId(request.getId());
+            sampleRelations.add(relation);
+        });
+        if(outsourceAssessSampleRelationService.saveBatch(sampleRelations)){
+            return;
+        }
+        throw new BusinessException(BusinessExceptionEnum.OUTSOURCE_ACCESS_SAVE_FAILED);
+    }
+
+    private void removeRelationData(Long assessId) {
+        QueryWrapper<BizBusinessOutsourceAssessSampleRelation> wrapper = new QueryWrapper<>();
+        wrapper.eq("access_id", assessId);
+        if(outsourceAssessSampleRelationService.remove(wrapper)){
+            return;
+        }
+        throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
+    }
 }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceProtocolServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceProtocolServiceImpl.java
new file mode 100644
index 0000000..821e728
--- /dev/null
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceProtocolServiceImpl.java
@@ -0,0 +1,60 @@
+package com.casic.missiles.service.Impl.business;
+
+import cn.hutool.core.lang.Assert;
+import com.casic.missiles.dto.BaseApprovalSubmitRequest;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.ReturnUtil;
+import com.casic.missiles.dto.business.outsource.OutsourceProtocolApprovalListRequest;
+import com.casic.missiles.dto.business.outsource.OutsourceProtocolSaveResponse;
+import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.NoGenerateFileCodeEnum;
+import com.casic.missiles.enums.NoGenerateRecordTypeCodeEnum;
+import com.casic.missiles.enums.system.ApprovalStatusEnum;
+import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.mapper.business.BizBusinessOutsourceProtocolMapper;
+import com.casic.missiles.mapper.business.BizBusinessOutsourcerInfoMapper;
+import com.casic.missiles.model.business.BizBusinessOutsourceProtocol;
+import com.casic.missiles.model.business.BizBusinessOutsourcerInfo;
+import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl;
+import com.casic.missiles.service.business.IBizBusinessOutsourceProtocolService;
+import com.casic.missiles.utils.NoGeneratorUtil;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 计量检定业务-分包管理-测试、校准或检定工作分包协议书 服务实现类
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-08-24
+ */
+@Service
+public class BizBusinessOutsourceProtocolServiceImpl extends GeneralApprovalServiceImpl<BizBusinessOutsourceProtocolMapper, BizBusinessOutsourceProtocol, BizBusinessOutsourceProtocol, OutsourceProtocolApprovalListRequest, BaseApprovalSubmitRequest> implements IBizBusinessOutsourceProtocolService {
+    @Autowired
+    private BizBusinessOutsourcerInfoMapper outsourcerInfoMapper;
+
+    @Override
+    public ReturnDTO<OutsourceProtocolSaveResponse> saveOutsourceProtocol(BizBusinessOutsourceProtocol request) {
+        //生成编号
+        String labCode = request.getLabCode();
+        String groupCode = request.getGroupCode();
+        Long maxNo = this.baseMapper.selectMaxProtocolNo();
+        String protocolNo = NoGeneratorUtil.getCode(NoGenerateFileCodeEnum.D, labCode, NoGenerateRecordTypeCodeEnum.OUTSOURCE_PROTOCOL, groupCode, maxNo);
+        request.setCreateUserId(request.getUserId());
+        request.setCreateUserName(request.getUserName());
+        request.setApprovalStatus(ApprovalStatusEnum.DRAFT); //草稿箱状态
+        request.setProtocolNo(protocolNo);
+        BizBusinessOutsourcerInfo outsourcerInfo = outsourcerInfoMapper.selectById(request.getOutsourcerId());
+        request.setOutsourceNo(outsourcerInfo.getOutsourcerNo());
+        request.setOutsourceName(outsourcerInfo.getOutsourcerName());
+        int row = this.baseMapper.insert(request);
+        Assert.isFalse(row <= 0, () -> {
+            throw new BusinessException(BusinessExceptionEnum.OUTSOURCE_PROTOCOL_SAVE_FAILED);
+        });
+        OutsourceProtocolSaveResponse saveResponse = new OutsourceProtocolSaveResponse();
+        saveResponse.setId(request.getId());
+        saveResponse.setProtocolNo(protocolNo);
+        return ReturnUtil.success(saveResponse);
+    }
+}
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourcerInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourcerInfoServiceImpl.java
index 75f639d..8aadad7 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourcerInfoServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourcerInfoServiceImpl.java
@@ -3,12 +3,12 @@
 import cn.hutool.core.lang.Assert;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.dto.*;
 import com.casic.missiles.dto.business.outsource.OutsourcerInfoApprovalListRequest;
 import com.casic.missiles.dto.business.outsource.OutsourcerSaveResponse;
 import com.casic.missiles.enums.BusinessExceptionEnum;
-import com.casic.missiles.enums.PrefixCodeEnum;
+import com.casic.missiles.enums.NoGenerateFileCodeEnum;
+import com.casic.missiles.enums.NoGenerateRecordTypeCodeEnum;
 import com.casic.missiles.enums.system.ApprovalStatusEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.mapper.business.BizBusinessOutsourcerInfoMapper;
@@ -20,7 +20,7 @@
 import com.casic.missiles.service.business.IBizBusinessOutsourcerInfoService;
 import com.casic.missiles.service.business.IBizBusinessOutsourcerUserInfoService;
 import com.casic.missiles.utils.DictCodeUtils;
-import com.casic.missiles.utils.NumberGeneratorUtil;
+import com.casic.missiles.utils.NoGeneratorUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -42,22 +42,12 @@
     private IBizBusinessOutsourcerUserInfoService outsourcerUserInfoService;
 
     @Override
-    public List<BizBusinessOutsourcerInfo> list(OutsourcerInfoApprovalListRequest request) {
-        request.setCreateUserId(null);
-        request.setApprovalStatus(ApprovalStatusEnum.PASSED);
-        Page<BizBusinessOutsourcerInfo> page = PageFactory.defaultPage();
-        page.setCurrent(1);
-        page.setSearchCount(false);
-        page.setSize(Integer.MAX_VALUE);
-        Page<BizBusinessOutsourcerInfo> resultPage = this.baseMapper.selectBatchForApprovalList(page, request, null);
-        return resultPage.getRecords();
-    }
-
-    @Override
     public ReturnDTO<OutsourcerSaveResponse> saveOutsourcer(BizBusinessOutsourcerInfo request) {
         //生成编号
+        String labCode = request.getLabCode();
+        String groupCode = request.getGroupCode();
         Long maxNo = this.baseMapper.selectMaxNo();
-        String outsourcerNo = NumberGeneratorUtil.getContactNo(PrefixCodeEnum.OUTSOURCER_PREFIX, maxNo);
+        String outsourcerNo = NoGeneratorUtil.getCode(NoGenerateFileCodeEnum.D, labCode, NoGenerateRecordTypeCodeEnum.OUTSOURCE_INFO, groupCode, maxNo);
         request.setOutsourcerNo(outsourcerNo);
         request.setCreateUserId(request.getUserId());
         request.setCreateUserName(request.getUserName());
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessSiteExecutiveInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessSiteExecutiveInfoServiceImpl.java
index ebab3e6..6c6a129 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessSiteExecutiveInfoServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessSiteExecutiveInfoServiceImpl.java
@@ -189,9 +189,9 @@
         QueryWrapper<BizBusinessSiteExecutiveStaffRelation> mWrapper = new QueryWrapper<>();
         mWrapper.eq("site_executive_id", siteExecutiveId);
         boolean mRemove = siteExecutiveStaffRelationService.remove(mWrapper);
-        Assert.isFalse(eRemove || mRemove, () -> {
+        if(!eRemove || !mRemove){
             throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
-        });
+        }
     }
 
     private void doPopulateSiteExecutive(SiteExecutiveDetailResponse detailResponse) {
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessLabExecutiveInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessLabExecutiveInfoServiceImpl.java
index 50c5616..0242fcf 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessLabExecutiveInfoServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessLabExecutiveInfoServiceImpl.java
@@ -297,6 +297,29 @@
     }
 
     @Override
+    public List<SampleLabExecutiveListResponse> deptLabExecutiveList(SampleLabExecutiveListRequest request) throws Exception {
+        Page<SampleLabExecutiveListResponse> page = PageFactory.defaultPage();
+        page.setCurrent(1);
+        page.setSearchCount(false);
+        page.setSize(Integer.MAX_VALUE);
+        Page<SampleLabExecutiveListResponse> resultPage = this.deptLabExecutiveListPage(page, request);
+        return resultPage.getRecords();
+    }
+
+    @Override
+    public List<SampleLabExecutiveListResponse> deptLabExecutiveListByIds(String measureStatus, List<Long> ids) throws Exception {
+        Page<SampleLabExecutiveListResponse> page = PageFactory.defaultPage();
+        page.setCurrent(1);
+        page.setSearchCount(false);
+        page.setSize(Integer.MAX_VALUE);
+        SampleLabExecutiveListRequest request = new SampleLabExecutiveListRequest();
+        request.setIds(ids);
+        request.setMeasureStatus(measureStatus);
+        Page<SampleLabExecutiveListResponse> resultPage = this.deptLabExecutiveListPage(page, request);
+        return resultPage.getRecords();
+    }
+
+    @Override
     public Page<SampleLabExecutiveListResponse> myLabExecutiveListPage(Page<SampleLabExecutiveListResponse> page, SampleLabExecutiveListRequest labExecutiveListRequest) throws Exception{
         AuthUser user = ShiroKit.getUser();
         Assert.isFalse(Objects.isNull(user), () -> {
@@ -350,6 +373,29 @@
     }
 
     @Override
+    public List<SampleLabExecutiveListResponse> myLabExecutiveList(SampleLabExecutiveListRequest request) throws Exception {
+        Page<SampleLabExecutiveListResponse> page = PageFactory.defaultPage();
+        page.setCurrent(1);
+        page.setSearchCount(false);
+        page.setSize(Integer.MAX_VALUE);
+        Page<SampleLabExecutiveListResponse> resultPage = this.myLabExecutiveListPage(page, request);
+        return resultPage.getRecords();
+    }
+
+    @Override
+    public List<SampleLabExecutiveListResponse> myLabExecutiveListByIds(String measureStatus, List<Long> ids) throws Exception {
+        Page<SampleLabExecutiveListResponse> page = PageFactory.defaultPage();
+        page.setCurrent(1);
+        page.setSearchCount(false);
+        page.setSize(Integer.MAX_VALUE);
+        SampleLabExecutiveListRequest request = new SampleLabExecutiveListRequest();
+        request.setIds(ids);
+        request.setMeasureStatus(measureStatus);
+        Page<SampleLabExecutiveListResponse> resultPage = this.myLabExecutiveListPage(page, request);
+        return resultPage.getRecords();
+    }
+
+    @Override
     public List<SampleAmountResponse> myExecutiveAmount() {
         //登录用户id获取计量人员id，实验室检测信息中存储的是计量人员id
         AuthUser user = ShiroKit.getUser();
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentInfoServiceImpl.java
index 864b05e..db8cad4 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentInfoServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentInfoServiceImpl.java
@@ -35,7 +35,6 @@
 import com.casic.missiles.utils.ConvertUtils;
 import com.casic.missiles.utils.DictCodeUtils;
 import com.casic.missiles.utils.NumberGeneratorUtil;
-import org.flowable.engine.RuntimeService;
 import org.flowable.engine.runtime.ProcessInstance;
 import org.jetbrains.annotations.NotNull;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -43,7 +42,6 @@
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
 
-import javax.annotation.Resource;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
@@ -81,8 +79,6 @@
     private IBizEquipmentAttachmentService attachmentService;
     @Autowired
     private IBizEquipmentCheckpointService checkpointService;
-    @Resource
-    private RuntimeService runtimeService;
     @Autowired
     private ApprovalOperateService approvalOperateService;
 
@@ -235,18 +231,18 @@
     private void updateRelationInfo(EquipmentAddRequest request, BizEquipmentInfoApproval equipmentInfoApproval) {
         QueryWrapper<BizEquipmentTechnicalTarget> targetWrapper = new QueryWrapper<>();
         targetWrapper.eq("equipment_no", equipmentInfoApproval.getEquipmentNo());
-        boolean removeTargetFlag = technicalTargetService.remove(targetWrapper);
-        boolean saveTargetFlag = technicalTargetService.saveBatch(request.getTechnicalTargetList());
+        technicalTargetService.remove(targetWrapper);
+        technicalTargetService.saveBatch(request.getTechnicalTargetList());
 
         QueryWrapper<BizEquipmentAttachment> attachmentWrapper = new QueryWrapper<>();
         attachmentWrapper.eq("equipment_no", equipmentInfoApproval.getEquipmentNo());
-        boolean removeAttachmentFlag = attachmentService.remove(attachmentWrapper);
-        boolean saveAttachmentFlag = attachmentService.saveBatch(request.getAttachmentList());
+        attachmentService.remove(attachmentWrapper);
+        attachmentService.saveBatch(request.getAttachmentList());
 
         QueryWrapper<BizEquipmentCheckpoint> checkpointWrapper = new QueryWrapper<>();
         checkpointWrapper.eq("equipment_no", equipmentInfoApproval.getEquipmentNo());
-        boolean removeCheckpointFlag = checkpointService.remove(checkpointWrapper);
-        boolean saveCheckpointFlag = checkpointService.saveBatch(request.getCheckpointList());
+        checkpointService.remove(checkpointWrapper);
+        checkpointService.saveBatch(request.getCheckpointList());
     }
 
     @Override
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardInfoServiceImpl.java
index faff1ae..c50a5b3 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardInfoServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardInfoServiceImpl.java
@@ -22,7 +22,9 @@
 import com.casic.missiles.mapper.equipment.BizEquipmentStandardInfoMapper;
 import com.casic.missiles.mapper.equipment.BizEquipmentStandardTechnologyRelationMapper;
 import com.casic.missiles.mapper.resource.BizResourceStaffInfoMapper;
-import com.casic.missiles.model.equipment.*;
+import com.casic.missiles.model.equipment.BizEquipmentStandardInfo;
+import com.casic.missiles.model.equipment.BizEquipmentStandardInfoApproval;
+import com.casic.missiles.model.equipment.BizEquipmentStandardTechnologyRelation;
 import com.casic.missiles.model.resource.BizResourceStaffInfo;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.dao.DeptMapper;
@@ -33,14 +35,12 @@
 import com.casic.missiles.service.flowable.ApprovalOperateService;
 import com.casic.missiles.utils.ConvertUtils;
 import com.casic.missiles.utils.DictCodeUtils;
-import org.flowable.engine.RuntimeService;
 import org.flowable.engine.runtime.ProcessInstance;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
 
-import javax.annotation.Resource;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
@@ -62,8 +62,6 @@
     private BizResourceStaffInfoMapper staffInfoMapper;
     @Autowired
     private IBaseApprovalService baseApprovalService;
-    @Resource
-    private RuntimeService runtimeService;
     @Autowired
     private ApprovalOperateService approvalOperateService;
     @Autowired
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSealInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSealInfoServiceImpl.java
index 7c91fa2..00040d6 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSealInfoServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSealInfoServiceImpl.java
@@ -15,6 +15,7 @@
 import com.casic.missiles.modular.system.model.User;
 import com.casic.missiles.service.resource.IBizResourceSealInfoService;
 import com.casic.missiles.utils.DictCodeUtils;
+import com.casic.missiles.utils.MinioUtil;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -33,6 +34,8 @@
     private BizResourceSealInfoMapper sealInfoMapper;
     @Autowired
     private UserMapper userMapper;
+    @Autowired
+    private MinioUtil minioUtil;
 
     @Override
     public Page<BizResourceSealInfo> listPage(Page<BizResourceSealInfo> page, SealInfoListRequest request) throws Exception {
@@ -44,6 +47,7 @@
         Page<BizResourceSealInfo> sealInfoPage = sealInfoMapper.selectPage(page, wrapper);
         for (BizResourceSealInfo record : sealInfoPage.getRecords()) {
             DictCodeUtils.convertDictCodeToName(record);
+            record.setMinioFileUrl(minioUtil.getFileUrl(record.getMinioFileName()));
         }
         return sealInfoPage;
     }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceStaffInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceStaffInfoServiceImpl.java
index f058cf5..09203ac 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceStaffInfoServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceStaffInfoServiceImpl.java
@@ -3,6 +3,7 @@
 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.core.page.PageFactory;
 import com.casic.missiles.dto.IdDTO;
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
@@ -86,6 +87,13 @@
     }
 
     @Override
+    public List<BizResourceStaffInfo> list(StaffListRequest request) throws Exception {
+        Page<BizResourceStaffInfo> page = PageFactory.defaultPage();
+        Page<BizResourceStaffInfo> staffInfoPage = this.listPage(page, request);
+        return staffInfoPage.getRecords();
+    }
+
+    @Override
     @Transactional
     public ReturnDTO<IdDTO> staffBaseAdd(BizResourceStaffInfo staffInfo) {
         //登录账号查重
@@ -495,6 +503,28 @@
         return certResponsePage;
     }
 
+    @Override
+    public List<StaffCertResponse> certListByIds(List<Long> ids) throws Exception {
+        Page<StaffCertResponse> page = PageFactory.defaultPage();
+        page.setCurrent(1);
+        page.setSearchCount(false);
+        page.setSize(Integer.MAX_VALUE);
+        StaffCertRequest request = new StaffCertRequest();
+        request.setIds(ids);
+        Page<StaffCertResponse> resultPage = this.certListPage(page, request);
+        return resultPage.getRecords();
+    }
+
+    @Override
+    public List<StaffCertResponse> certList(StaffCertRequest request) throws Exception {
+        Page<StaffCertResponse> page = PageFactory.defaultPage();
+        page.setCurrent(1);
+        page.setSearchCount(false);
+        page.setSize(Integer.MAX_VALUE);
+        Page<StaffCertResponse> resultPage = this.certListPage(page, request);
+        return resultPage.getRecords();
+    }
+
     @Async
     public void deleteRelationInfo(Long staffId){
         QueryWrapper<BizResourceStaffEducation> educationWrapper = new QueryWrapper<>();
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceStaffVerifierServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceStaffVerifierServiceImpl.java
index 8ac7eee..b508d45 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceStaffVerifierServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceStaffVerifierServiceImpl.java
@@ -52,8 +52,8 @@
     private WebSocket webSocket;
 
     @Override
-    public ReturnDTO expirationReminder(IdDTO idDto) {
-        BizResourceStaffVerifier staffVerifier = verifierMapper.selectById(idDto.getId());
+    public ReturnDTO expirationReminder(IdDTO idDTO) {
+        BizResourceStaffVerifier staffVerifier = verifierMapper.selectById(idDTO.getId());
         BizResourceStaffInfo staffInfo = staffInfoMapper.selectById(staffVerifier.getStaffId());
         QueryWrapper<User> wrapper = new QueryWrapper<>();
         wrapper.eq("account", staffInfo.getAccount());
@@ -65,7 +65,7 @@
         Assert.isFalse(Objects.isNull(user), () -> {
             throw new BusinessException(BusinessExceptionEnum.LOGIN_USER_ACQUIRE_FAILED);
         });
-        WorkbenchRemindMessage remindMessage = new WorkbenchRemindMessage(userInfo.getId(), userInfo.getDeptId(), idDto.getId(), staffVerifier.getCertNo(), MessageTypeEnum.STAFF_CERT.getCode(), MessageSourceModuleEnum.RESOURCE.getCode(), MessageTypeEnum.STAFF_CERT.getValue(), MessageTypeEnum.STAFF_CERT.getValue(), staffVerifier.getCertName(),0, user.getId(), user.getName());
+        WorkbenchRemindMessage remindMessage = new WorkbenchRemindMessage(userInfo.getId(), userInfo.getDeptId(), idDTO.getId(), staffVerifier.getCertNo(), MessageTypeEnum.STAFF_CERT.getCode(), MessageSourceModuleEnum.RESOURCE.getCode(), MessageTypeEnum.STAFF_CERT.getValue(), MessageTypeEnum.STAFF_CERT.getValue(), staffVerifier.getCertName(),0, user.getId(), user.getName());
         if(messageMapper.insert(remindMessage) > 0){
             // 新增到消息列表后向用户推送消息
             webSocket.sendOneMessage(String.valueOf(userInfo.getId()), JSONObject.toJSONString(remindMessage));
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceTrainInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceTrainInfoServiceImpl.java
index c1d6308..3a533f2 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceTrainInfoServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceTrainInfoServiceImpl.java
@@ -44,11 +44,14 @@
     @Override
     public Page<BizResourceTrainInfo> listPage(Page<BizResourceTrainInfo> page, TrainListRequest request) throws Exception {
         QueryWrapper<BizResourceTrainInfo> wrapper = new QueryWrapper<>();
-        wrapper.like("train_no", request.getTrainNo());
-        wrapper.apply(StringUtils.isNotBlank(request.getCreateTimeStart()),//apply方法传入参数名不能为空
-                "{0} <= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getCreateTimeStart().split(" ")[0]);
-        wrapper.apply(StringUtils.isNotBlank(request.getCreateTimeEnd()),
-                "{0} >= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getCreateTimeEnd().split(" ")[0]);
+        wrapper.like(StringUtils.isNotEmpty(request.getTrainNo()), "train_no", request.getTrainNo());
+        wrapper.like(StringUtils.isNotEmpty(request.getDutyLeader()),"duty_leader", request.getDutyLeader());
+        if(StringUtils.isNotBlank(request.getCreateTimeStart())){
+            wrapper.apply("{0} <= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getCreateTimeStart().split(" ")[0]);
+        }
+        if(StringUtils.isNotBlank(request.getCreateTimeEnd())){
+            wrapper.apply("{0} >= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getCreateTimeEnd().split(" ")[0]);
+        }
         wrapper.orderByDesc("create_time");
         Page<BizResourceTrainInfo> trainInfoPage = trainInfoMapper.selectPage(page, wrapper);
         for (BizResourceTrainInfo record : trainInfoPage.getRecords()) {
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/EnvLocationInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/EnvLocationInfoServiceImpl.java
new file mode 100644
index 0000000..cdc5742
--- /dev/null
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/EnvLocationInfoServiceImpl.java
@@ -0,0 +1,31 @@
+package com.casic.missiles.service.Impl.resource;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.casic.missiles.dto.resource.environment.LocationListRequest;
+import com.casic.missiles.dto.resource.environment.LocationListResponse;
+import com.casic.missiles.mapper.resource.EnvLocationInfoMapper;
+import com.casic.missiles.model.resource.EnvLocationInfo;
+import com.casic.missiles.service.resource.IEnvLocationInfoService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 实验室环境监控系统-设备表 服务实现类
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-06-07
+ */
+@Service
+public class EnvLocationInfoServiceImpl extends ServiceImpl<EnvLocationInfoMapper, EnvLocationInfo> implements IEnvLocationInfoService {
+    @Autowired
+    private EnvLocationInfoMapper locationInfoMapper;
+
+    @Override
+    public Page<LocationListResponse> listPage(Page<LocationListResponse> page, LocationListRequest request) {
+        Page<LocationListResponse> resultPage = locationInfoMapper.selectLocationListPage(page, request);
+        return resultPage;
+    }
+}
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/DownloadCenterServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/DownloadCenterServiceImpl.java
index c956d24..d9f3282 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/DownloadCenterServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/DownloadCenterServiceImpl.java
@@ -131,10 +131,12 @@
         wrapper.like(StringUtils.isNotBlank(request.getModuleName()), "module_name", request.getModuleName());
         wrapper.like(StringUtils.isNotBlank(request.getFileName()), "file_name", request.getFileName());
         wrapper.like(StringUtils.isNotBlank(request.getFileType()), "file_type", request.getFileType());
-        wrapper.apply(StringUtils.isNotBlank(request.getStartTime()),
-                "{0} <= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getStartTime().split(" ")[0]);
-        wrapper.apply(StringUtils.isNotBlank(request.getEndTime()),
-                "{0} >= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getEndTime().split(" ")[0]);
+        if(StringUtils.isNotBlank(request.getStartTime())){
+            wrapper.apply("{0} <= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getStartTime().split(" ")[0]);
+        }
+        if(StringUtils.isNotBlank(request.getEndTime())){
+            wrapper.apply("{0} >= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getEndTime().split(" ")[0]);
+        }
         wrapper.orderByDesc("create_time");
         return wrapper;
     }

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java
index bb0c50f..13a699b 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java
@@ -12,6 +12,7 @@
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.IGeneralApprovalService;
+import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
@@ -19,6 +20,7 @@
 import org.springframework.web.bind.annotation.RequestBody;
 
 import javax.validation.Valid;
+import java.util.List;
 import java.util.Objects;
 
 /**
@@ -117,4 +119,17 @@
         }
         return baseApprovalService.failUpdate(request);
     }
+
+    public List<O> exportList(@RequestBody @Valid R request) throws Exception {
+        List<O> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = baseApprovalService.listExportByIds(request.getIds());
+        } else {
+            list = baseApprovalService.listExport(request);
+        }
+        for (O record : list) {
+            DictCodeUtils.convertDictCodeToName(record);
+        }
+        return list;
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java
index 8a90961..d775831 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java
@@ -5,6 +5,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.business.certificate.CertificateChangeApplyApprovalListRequest;
 import com.casic.missiles.dto.business.certificate.CertificateChangeApplySaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessCertificateChangeApply;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
@@ -20,6 +21,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -48,4 +50,12 @@
         }
         return changeApplyService.saveChangeApply(request);
     }
+
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody CertificateChangeApplyApprovalListRequest request) throws Exception {
+        List<BizBusinessCertificateChangeApply> list = super.exportList(request);
+        super.exportExcel(BizBusinessCertificateChangeApply.class, list, ExportEnum.CERTIFICATE_CHANGE_APPLY.getSheetName());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java
index 5fc4b07..af8230e 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java
@@ -9,6 +9,7 @@
 import com.casic.missiles.dto.business.certificate.CertificatePrintApprovalListRequest;
 import com.casic.missiles.dto.business.certificate.CertificatePrintListResponse;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.enums.business.CertificatePrintStatusEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessCertificatePrintLog;
@@ -18,10 +19,16 @@
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.io.IOException;
+import java.util.List;
 import java.util.Objects;
 
 /**
@@ -98,4 +105,16 @@
         });
         return certificatePrintService.certificatePrintLog(idDTO.getId());
     }
+
+    @ApiOperation("证书打印审批导出")
+    @PostMapping("/listExport")
+    public void exportList(@RequestBody CertificatePrintApprovalListRequest request) throws IOException {
+        List<CertificatePrintListResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = certificatePrintService.listByIds(request.getIds());
+        } else {
+            list = certificatePrintService.list(request);
+        }
+        super.exportExcel(CertificatePrintListResponse.class, list, ExportEnum.CERTIFICATE_PRINT.getSheetName());
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java
index 63b06dc..6b2efd5 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java
@@ -6,6 +6,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.business.certificate.CertificateReportApprovalListRequest;
 import com.casic.missiles.dto.business.certificate.CertificateReportSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessCertificateReport;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
@@ -21,6 +22,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -50,7 +52,7 @@
         return certificateReportService.saveCertificateReport(request);
     }
 
-    @ApiOperation("证书审批详情（基本信息）")
+    @ApiOperation("详情（基本信息）")
     @PostMapping("/detail")
     public ReturnDTO<BizBusinessCertificateReport> detail(@RequestBody @Valid BaseDetailRequest request, BindingResult bindingResult) throws Exception {
         if(bindingResult.hasErrors()){
@@ -59,4 +61,11 @@
         return certificateReportService.detail(request);
     }
 
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody CertificateReportApprovalListRequest request) throws Exception {
+        List<BizBusinessCertificateReport> list = super.exportList(request);
+        super.exportExcel(BizBusinessCertificateReport.class, list, ExportEnum.CERTIFICATE_REPORT.getSheetName());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java
index 46b26bd..57c0809 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java
@@ -10,20 +10,21 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.business.identify.IdentifyListRequest;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessIdentifyInfo;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.business.IBizBusinessIdentifyInfoService;
+import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import javax.validation.Valid;
+import java.util.List;
 import java.util.Objects;
 
 /**
@@ -57,16 +58,13 @@
         return identifyInfoService.addIdentify(identifyInfo);
     }
 
-    @ApiOperation("标识打印更新")
+    @ApiOperation("标识打印更新（更新打印时间）")
     @PostMapping("/update")
-    public ReturnDTO updateIdentify(@RequestBody @Valid BizBusinessIdentifyInfo identifyInfo, BindingResult bindingResult) {
-        Assert.isFalse(Objects.isNull(identifyInfo.getId()), () -> {
+    public ReturnDTO updateIdentify(@RequestBody @Valid IdDTO idDTO) {
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        Assert.isFalse(bindingResult.hasErrors(), () -> {
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        });
-        return identifyInfoService.updateIdentify(identifyInfo);
+        return identifyInfoService.updateIdentify(idDTO.getId());
     }
 
     @ApiOperation("标识打印删除")
@@ -77,4 +75,37 @@
         });
         return identifyInfoService.deleteIdentify(idDTO.getId());
     }
+
+    @ApiOperation("标识打印导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody @Valid IdentifyListRequest request, BindingResult bindingResult) throws Exception {
+        if (bindingResult.hasErrors()) {
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        List<BizBusinessIdentifyInfo> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = identifyInfoService.listByIds(request.getIds());
+        } else {
+            list = identifyInfoService.list(request);
+        }
+        for (BizBusinessIdentifyInfo record : list) {
+            DictCodeUtils.convertDictCodeToName(record);
+        }
+        super.exportExcel(BizBusinessIdentifyInfo.class, list, ExportEnum.IDENTIFY_EXPORT.getSheetName());
+    }
+
+
+    // TODO: 2023/8/23 查询设备信息，4个底部按钮查设备（按钮的作用就是前端用来调不同接口、用来区分中间即将展示的标识），前端弹窗选设备，在确定保存时前端根据底部按钮判断传入设备类型deviceType字典code
+    // TODO: 2023/8/23 接口：查受检设备（第1个按钮），查设备台账（后3个按钮同一接口），查询之后前端根据标志类型的不同加到中间页面时进行判断（按产品给的对应表）
+    // TODO: 2023/8/23 提供二维码接口，前端在加到中间页面时调用一下
+
+    @ApiOperation("设备二维码")
+    @PostMapping("/equipment/qrCode")
+    public ReturnDTO<String> equipmentQrCode(@RequestBody @Valid IdDTO idDTO) {
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return identifyInfoService.equipmentQrCode(idDTO.getId());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java
index 707be6e..7e0453d 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java
@@ -117,7 +117,7 @@
     }
 
     @ApiOperation("任务单导出")
-    @PostMapping("/export")
+    @PostMapping("/listExport")
     public void orderExport(@RequestBody @Valid OrderListRequest request, HttpServletResponse response) {
         businessOrderService.orderExport(request, response);
     }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java
index 529a6ce..51432be 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java
@@ -1,9 +1,28 @@
 package com.casic.missiles.controller.business;
 
+import com.casic.missiles.controller.GeneralApprovalController;
+import com.casic.missiles.dto.BaseApprovalSubmitRequest;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.business.outsource.OutsourceAssessApprovalListRequest;
+import com.casic.missiles.dto.business.outsource.OutsourceAssessSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
+import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.model.business.BizBusinessOutsourceAssess;
+import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
+import com.casic.missiles.service.IGeneralApprovalService;
+import com.casic.missiles.service.business.IBizBusinessOutsourceAssessService;
 import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.BindingResult;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.validation.Valid;
+import java.util.List;
+
 /**
  * <p>
  * 计量检定业务-分包管理-测试、校准或检定工作分包评审表 前端控制器
@@ -15,6 +34,27 @@
 @Api(tags = "分包管理-测试、校准或检定工作分包评审表")
 @RestController
 @RequestMapping("/business/outsource/assess")
-public class BizBusinessOutsourceAssessController {
+public class BizBusinessOutsourceAssessController extends GeneralApprovalController<BizBusinessOutsourceAssess, BizBusinessOutsourceAssess, OutsourceAssessApprovalListRequest, BaseApprovalSubmitRequest> {
+    @Autowired
+    private IBizBusinessOutsourceAssessService outsourceAssessService;
 
+    public BizBusinessOutsourceAssessController(IGeneralApprovalService<BizBusinessOutsourceAssess, BizBusinessOutsourceAssess, OutsourceAssessApprovalListRequest, BaseApprovalSubmitRequest> baseApprovalService) {
+        super(baseApprovalService);
+    }
+
+    @ApiOperation("草稿箱-保存")
+    @PostMapping("/save")
+    public ReturnDTO<OutsourceAssessSaveResponse> saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceAssess request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        return outsourceAssessService.saveOutsourceAssess(request);
+    }
+
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception {
+        List<BizBusinessOutsourceAssess> list = super.exportList(request);
+        super.exportExcel(BizBusinessOutsourceAssess.class, list, ExportEnum.OUTSOURCE_ASSESS.getSheetName());
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java
new file mode 100644
index 0000000..9adef18
--- /dev/null
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java
@@ -0,0 +1,60 @@
+package com.casic.missiles.controller.business;
+
+import com.casic.missiles.controller.GeneralApprovalController;
+import com.casic.missiles.dto.BaseApprovalSubmitRequest;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.business.outsource.OutsourceProtocolApprovalListRequest;
+import com.casic.missiles.dto.business.outsource.OutsourceProtocolSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
+import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.model.business.BizBusinessOutsourceProtocol;
+import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
+import com.casic.missiles.service.IGeneralApprovalService;
+import com.casic.missiles.service.business.IBizBusinessOutsourceProtocolService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.BindingResult;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.validation.Valid;
+import java.util.List;
+
+/**
+ * <p>
+ * 计量检定业务-分包管理-测试、校准或检定工作分包协议书 前端控制器
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-08-24
+ */
+@Api(tags = "分包管理-测试、校准或检定工作分包协议书")
+@RestController
+@RequestMapping("/business/outsource/protocol")
+public class BizBusinessOutsourceProtocolController extends GeneralApprovalController<BizBusinessOutsourceProtocol, BizBusinessOutsourceProtocol, OutsourceProtocolApprovalListRequest, BaseApprovalSubmitRequest> {
+    @Autowired
+    private IBizBusinessOutsourceProtocolService outsourceProtocolService;
+
+    public BizBusinessOutsourceProtocolController(IGeneralApprovalService<BizBusinessOutsourceProtocol, BizBusinessOutsourceProtocol, OutsourceProtocolApprovalListRequest, BaseApprovalSubmitRequest> baseApprovalService) {
+        super(baseApprovalService);
+    }
+
+    @ApiOperation("草稿箱-保存")
+    @PostMapping("/save")
+    public ReturnDTO<OutsourceProtocolSaveResponse> saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceProtocol request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        return outsourceProtocolService.saveOutsourceProtocol(request);
+    }
+
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody OutsourceProtocolApprovalListRequest request) throws Exception {
+        List<BizBusinessOutsourceProtocol> list = super.exportList(request);
+        super.exportExcel(BizBusinessOutsourceProtocol.class, list, ExportEnum.OUTSOURCE_PROTOCOL.getSheetName());
+    }
+}
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java
index 097f645..f0f0943 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java
@@ -17,7 +17,6 @@
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.IGeneralApprovalService;
 import com.casic.missiles.service.business.IBizBusinessOutsourcerInfoService;
-import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -71,19 +70,8 @@
 
     @ApiOperation("分包方导出")
     @PostMapping("/listExport")
-    public void export(@RequestBody @Valid OutsourcerInfoApprovalListRequest request, BindingResult bindingResult) throws Exception {
-        if (bindingResult.hasErrors()) {
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        }
-        List<BizBusinessOutsourcerInfo> list;
-        if (!CollectionUtils.isEmpty(request.getIds())) {
-            list = outsourcerInfoService.listByIds(request.getIds());
-        } else {
-            list = outsourcerInfoService.list(request);
-        }
-        for (BizBusinessOutsourcerInfo record : list) {
-            DictCodeUtils.convertDictCodeToName(record);
-        }
+    public void export(@RequestBody OutsourcerInfoApprovalListRequest request) throws Exception {
+        List<BizBusinessOutsourcerInfo> list = super.exportList(request);
         super.exportExcel(BizBusinessOutsourcerInfo.class, list, ExportEnum.OUTSOURCER_EXPORT.getSheetName());
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java
index c2cbf9f..0410918 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java
@@ -17,11 +17,9 @@
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.IGeneralApprovalService;
 import com.casic.missiles.service.business.IBizBusinessSiteExecutiveInfoService;
-import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -60,7 +58,7 @@
         return siteExecutiveInfoService.saveSiteExecutiveInfo(siteExecutiveInfo);
     }
 
-    @ApiOperation("现场检测详情")
+    @ApiOperation("详情")
     @PostMapping("/detail")
     public ReturnDTO<SiteExecutiveDetailResponse> siteExecutiveDetail(@RequestBody @Valid IdDTO idDTO) throws Exception {
         Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
@@ -69,21 +67,10 @@
         return ReturnUtil.success(siteExecutiveInfoService.detail(idDTO.getId()));
     }
 
-    @ApiOperation("现场检测导出")
+    @ApiOperation("导出")
     @PostMapping("/listExport")
-    public void export(@RequestBody @Valid SiteExecutiveApprovalListRequest request, BindingResult bindingResult) throws Exception {
-        if (bindingResult.hasErrors()) {
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        }
-        List<SiteExecutiveApprovalListResponse> list;
-        if (!CollectionUtils.isEmpty(request.getIds())) {
-            list = siteExecutiveInfoService.listInfoByIds(request.getIds());
-        } else {
-            list = siteExecutiveInfoService.listInfo(request);
-        }
-        for (SiteExecutiveApprovalListResponse record : list) {
-            DictCodeUtils.convertDictCodeToName(record);
-        }
+    public void export(@RequestBody SiteExecutiveApprovalListRequest request) throws Exception {
+        List<SiteExecutiveApprovalListResponse> list = super.exportList(request);
         super.exportExcel(SiteExecutiveApprovalListResponse.class, list, ExportEnum.SITE_EXECUTIVE_EXPORT.getSheetName());
     }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
index 7e793cd..a92e209 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
@@ -55,7 +55,7 @@
 
     @ApiOperation("设备收发列表导出")
     @PostMapping("/export")
-    public void exportList(@RequestBody @Valid SampleDispatchListRequest request) throws IOException {
+    public void exportList(@RequestBody SampleDispatchListRequest request) throws IOException {
         List<SampleDispatchListResponse> list;
         if (!CollectionUtils.isEmpty(request.getIds())) {
             list = dispatchService.listByIds(request.getIds());
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java
index cdc77fc..d120fd4 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java
@@ -7,6 +7,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.business.labExecutive.*;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.business.IBusinessLabExecutiveInfoService;
@@ -14,6 +15,7 @@
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.*;
 
@@ -32,7 +34,7 @@
     @Autowired
     private IBusinessLabExecutiveInfoService labExecutiveInfoService;
 
-    @ApiOperation("实验室检测-部门检测-查询各状态列表（待检测、检测中、检测完）")
+    @ApiOperation("实验室任务-查询各状态列表（待检测、检测中、检测完）")
     @PostMapping("/deptExecutive/List")
     public ReturnDTO<PageInfoBT<SampleLabExecutiveListResponse>> queryDeptExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
@@ -43,10 +45,19 @@
         return ReturnUtil.success(super.packForBT(labExecutiveInfoService.deptLabExecutiveListPage(page, labExecutiveListRequest)));
     }
 
-    /**
-     * 实验室检测-我的检测-查询各状态列表（待检测、检测中、检测完）
-     */
-    @ApiOperation("实验室检测-我的检测-查询各状态列表（待检测、检测中、检测完）")
+    @ApiOperation("实验室任务导出")
+    @PostMapping("/deptExecutive/export")
+    public void deptExportList(@RequestBody @Valid SampleLabExecutiveListRequest request) throws Exception {
+        List<SampleLabExecutiveListResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = labExecutiveInfoService.deptLabExecutiveListByIds(request.getMeasureStatus(), request.getIds());
+        } else {
+            list = labExecutiveInfoService.deptLabExecutiveList(request);
+        }
+        super.exportExcel(SampleLabExecutiveListResponse.class, list, ExportEnum.DEPT_EXECUTIVE_TASK.getSheetName());
+    }
+
+    @ApiOperation("我的任务-查询各状态列表（待检测、检测中、检测完）")
     @PostMapping("/myExecutive/list")
     public ReturnDTO<PageInfoBT<SampleLabExecutiveListResponse>> queryMyExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
@@ -57,19 +68,25 @@
         return ReturnUtil.success(super.packForBT(labExecutiveInfoService.myLabExecutiveListPage(page, labExecutiveListRequest)));
     }
 
-    /**
-     * 实验室检测-我的检测-查询各状态样品数量（待检测、检测中、检测完）
-     */
-    @ApiOperation("实验室检测-我的检测-查询各状态样品数量（待检测、检测中、检测完）")
+    @ApiOperation("我的任务导出")
+    @PostMapping("/myExecutive/export")
+    public void exportList(@RequestBody @Valid SampleLabExecutiveListRequest request) throws Exception {
+        List<SampleLabExecutiveListResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = labExecutiveInfoService.myLabExecutiveListByIds(request.getMeasureStatus(), request.getIds());
+        } else {
+            list = labExecutiveInfoService.myLabExecutiveList(request);
+        }
+        super.exportExcel(SampleLabExecutiveListResponse.class, list, ExportEnum.MY_EXECUTIVE_TASK.getSheetName());
+    }
+
+    @ApiOperation("我的任务-查询各状态样品数量（待检测、检测中、检测完）")
     @GetMapping("/myExecutive/amount")
     public ReturnDTO<List<SampleAmountResponse>> queryMyExecutiveAmount() {
         return ReturnUtil.success(labExecutiveInfoService.myExecutiveAmount());
     }
 
-    /**
-     * 实验室检测-部门检测-分配（分配给具体人员）
-     */
-    @ApiOperation("实验室检测-部门检测-分配按钮（分配给具体人员）")
+    @ApiOperation("实验室任务-分配按钮（分配给具体人员）")
     @PostMapping("/deptExecutive/allocate")
     public ReturnDTO allocateStaff(@RequestBody @Valid SampleAllocateRequest sampleAllocateRequest, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -78,10 +95,7 @@
         return labExecutiveInfoService.allocateStaff(sampleAllocateRequest);
     }
 
-    /**
-     * 实验室检测-我的检测-检定人扫描收入（待检测->检测中）
-     */
-    @ApiOperation("实验室检测-我的检测-检定人扫描收入（待检测->检测中）")
+    @ApiOperation("我的任务-检定人扫描收入（待检测->检测中）")
     @PostMapping("/myExecutive/receive")
     public ReturnDTO sampleReceive(@RequestBody @Valid List<SampleOperateRequest> requestList, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -90,10 +104,7 @@
         return labExecutiveInfoService.sampleReceive(requestList);
     }
 
-    /**
-     * 实验室检测-负责人/检定人扫描检完（检测中->检测完）
-     */
-    @ApiOperation("实验室检测-负责人/检定人扫描检完（检测中->检测完）")
+    @ApiOperation("实验室任务-负责人/检定人扫描检完（检测中->检测完）")
     @PostMapping("/myExecutive/complete")
     public ReturnDTO sampleExecutiveComplete(@RequestBody @Valid List<SampleOperateRequest> requestList, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -102,10 +113,7 @@
         return labExecutiveInfoService.sampleExecutiveComplete(requestList);
     }
 
-    /**
-     * 实验室检测-部门检测/我的检测 编辑（只能修改应出具证书）
-     */
-    @ApiOperation("实验室检测-部门检测/我的检测 编辑（只能修改应出具证书）")
+    @ApiOperation("实验室任务/我的任务 编辑（只能修改应出具证书）")
     @PostMapping("/executive/update")
     public ReturnDTO updateExecutive(@RequestBody @Valid UpdateExecutiveRequest request, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -114,10 +122,7 @@
         return labExecutiveInfoService.updateExecutive(request);
     }
 
-    /**
-     * 实验室检测-部门检测/我的检测 详情
-     */
-    @ApiOperation("实验室检测-部门检测/我的检测 详情")
+    @ApiOperation("实验室任务/我的任务 详情")
     @PostMapping("/executive/detail")
     public ReturnDTO<ExecutiveDetailResponse> executiveDetail(@RequestBody @Valid ExecutiveDetailRequest request, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
@@ -131,7 +136,7 @@
      * 退回后会将下一个要执行的实验室检测状态更新为待分配，将后面的实验室顺序变更为连续（都进行减1）
      * 最后一个检测的实验室退回，等分发员再增加实验室或设备收发中的已收入直接手动点击完成
      */
-    @ApiOperation("实验室检测-部门检测/我的检测 退回（待检测/检测中->退回）")
+    @ApiOperation("实验室任务/我的任务 退回（待检测/检测中->退回）")
     @PostMapping("/executive/sendBack")
     public ReturnDTO executiveSendBack(@RequestBody @Valid ExecutiveSendBackRequest request, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -140,9 +145,6 @@
         return labExecutiveInfoService.sampleExecutiveSendBack(request);
     }
 
-    /**
-     * 分发员编辑实验室检测列表
-     */
     @ApiOperation("分发员编辑实验室检测列表")
     @PostMapping("/handOut/updateList")
     public ReturnDTO updateExecutiveList(@RequestBody @Valid UpdateExecutiveListRequest request, BindingResult bindingResult) {
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java
index 48a67ed..0c04f31 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java
@@ -10,6 +10,7 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.resource.customer.CustomerApprovalListRequest;
 import com.casic.missiles.dto.resource.customer.CustomerSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceCustomerInfo;
@@ -26,6 +27,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -55,6 +57,13 @@
         return customerInfoService.saveCustomerInfo(request);
     }
 
+    @ApiOperation("委托方名录导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody CustomerApprovalListRequest request) throws Exception {
+        List<BizResourceCustomerInfo> list = super.exportList(request);
+        super.exportExcel(BizResourceCustomerInfo.class, list, ExportEnum.CUSTOMER_INFO.getSheetName());
+    }
+
     @ApiOperation("委托方人员列表（分页）")
     @PostMapping("/person/listPage")
     public ReturnDTO<PageInfoBT<BizResourceCustomerStaff>> personListPage(@RequestBody IdDTO idDto) {
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
index 972ed4b..6418ea5 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
@@ -5,6 +5,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.resource.customer.SuggestFormApprovalListRequest;
 import com.casic.missiles.dto.resource.customer.SuggestFormSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceCustomerSuggestForm;
@@ -20,6 +21,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -50,4 +52,11 @@
         return suggestFormService.saveSuggestForm(request);
     }
 
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody SuggestFormApprovalListRequest request) throws Exception {
+        List<BizResourceCustomerSuggestForm> list = super.exportList(request);
+        super.exportExcel(BizResourceCustomerSuggestForm.class, list, ExportEnum.CUSTOMER_SUGGEST_FORM.getSheetName());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java
index 1934d1a..9e07eab 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java
@@ -15,12 +15,16 @@
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.resource.IEnvEnvironmentRecordConfigService;
 import com.casic.missiles.service.resource.IEnvEnvironmentRecordDataService;
+import com.casic.missiles.service.resource.IEnvLocationInfoService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
 import java.util.List;
@@ -39,6 +43,8 @@
     private IEnvEnvironmentRecordDataService environmentRecordDataService;
     @Autowired
     private IEnvEnvironmentRecordConfigService environmentRecordConfigService;
+    @Autowired
+    private IEnvLocationInfoService locationInfoService;
 
     @ApiOperation("环境记录单数据列表/详情")
     @PostMapping("/data/listPage")
@@ -95,4 +101,11 @@
         });
         return environmentRecordConfigService.deleteEnvironmentRecordConfig(idDTO.getId());
     }
+
+    @ApiOperation("地点列表")
+    @PostMapping("/location/listPage")
+    public ReturnDTO<PageInfoBT<LocationListResponse>> locationListPage(@RequestBody @Valid LocationListRequest request) {
+        Page<LocationListResponse> page = PageFactory.defaultPage();
+        return ReturnUtil.success(super.packForBT(locationInfoService.listPage(page, request)));
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java
index 82efe3f..e9561fa 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java
@@ -10,6 +10,7 @@
 import com.casic.missiles.dto.resource.seal.SealLogListRequest;
 import com.casic.missiles.dto.resource.seal.SealNoteApprovalListRequest;
 import com.casic.missiles.dto.resource.seal.SealNoteSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceSealUseLog;
@@ -27,6 +28,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -58,6 +60,13 @@
         return sealUseNoteService.saveSeal(request);
     }
 
+    @ApiOperation("印章使用登记导出（列表和导出中去掉经办人和监印人）")
+    @PostMapping("/listExport")
+    public void export(@RequestBody SealNoteApprovalListRequest request) throws Exception {
+        List<BizResourceSealUseNote> list = super.exportList(request);
+        super.exportExcel(BizResourceSealUseNote.class, list, ExportEnum.SEAL_NOTE.getSheetName());
+    }
+
     // TODO: 2023/7/28 印章使用日志：系统中使用印章时插入数据库
 
     @ApiOperation("印章使用日志列表（分页）")
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java
index 9b674fc..06b6521 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java
@@ -9,16 +9,20 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.resource.staff.StaffCertRequest;
 import com.casic.missiles.dto.resource.staff.StaffCertResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.service.resource.IBizResourceStaffInfoService;
 import com.casic.missiles.service.resource.IBizResourceStaffVerifierService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.List;
+
 /**
  * @Description:
  * @Author: wangpeng
@@ -41,9 +45,21 @@
         return ReturnUtil.success(super.packForBT(responsePage));
     }
 
+    @ApiOperation("证书逾期提醒导出")
+    @PostMapping("/listExport")
+    public void exportList(@RequestBody StaffCertRequest request) throws Exception {
+        List<StaffCertResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = staffInfoService.certListByIds(request.getIds());
+        } else {
+            list = staffInfoService.certList(request);
+        }
+        super.exportExcel(StaffCertResponse.class, list, ExportEnum.STAFF_CERTIFICATE_EXPIRE.getSheetName());
+    }
+
     @ApiOperation("证书逾期提醒")
     @PostMapping("/expirationReminder")
-    public ReturnDTO expirationReminder(@RequestBody IdDTO idDto) {
-        return verifierService.expirationReminder(idDto);
+    public ReturnDTO expirationReminder(@RequestBody IdDTO idDTO) {
+        return verifierService.expirationReminder(idDTO);
     }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java
index 3b251ad..a6e7850 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java
@@ -12,6 +12,7 @@
 import com.casic.missiles.dto.resource.staff.StaffListRequest;
 import com.casic.missiles.dto.resource.staff.TrainListRequest;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.*;
@@ -22,7 +23,10 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
 import java.util.List;
@@ -52,8 +56,19 @@
             throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
         }
         Page<BizResourceStaffInfo> page = PageFactory.defaultPage();
-        Page<BizResourceStaffInfo> responsePage = staffInfoService.listPage(page, request);
-        return ReturnUtil.success(super.packForBT(responsePage));
+        return ReturnUtil.success(super.packForBT(staffInfoService.listPage(page, request)));
+    }
+
+    @ApiOperation("人员登记导出")
+    @PostMapping("/listExport")
+    public void exportList(@RequestBody StaffListRequest request) throws Exception {
+        List<BizResourceStaffInfo> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = staffInfoService.listByIds(request.getIds());
+        } else {
+            list = staffInfoService.list(request);
+        }
+        super.exportExcel(BizResourceStaffInfo.class, list, ExportEnum.STAFF_INFO.getSheetName());
     }
 
     @ApiOperation("人员登记详情基础信息")
@@ -85,9 +100,9 @@
 
     @ApiOperation("科研教育列表（分页）")
     @PostMapping("/education/listPage")
-    public ReturnDTO<PageInfoBT<BizResourceStaffEducation>> educationListPage(@RequestBody IdDTO idDto) {
+    public ReturnDTO<PageInfoBT<BizResourceStaffEducation>> educationListPage(@RequestBody IdDTO idDTO) {
         Page<BizResourceStaffEducation> page = PageFactory.defaultPage();
-        Page<BizResourceStaffEducation> responsePage = staffInfoService.educationListPage(page, idDto);
+        Page<BizResourceStaffEducation> responsePage = staffInfoService.educationListPage(page, idDTO);
         return ReturnUtil.success(super.packForBT(responsePage));
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java
index af6aa86..d85d84a 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java
@@ -9,6 +9,7 @@
 import com.casic.missiles.dto.resource.outsideService.SupplierApprovalListRequest;
 import com.casic.missiles.dto.resource.outsideService.SupplierSaveResponse;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceSupplierAbility;
@@ -67,6 +68,13 @@
         return ReturnUtil.success(supplierInfoService.detail(idDTO.getId()));
     }
 
+    @ApiOperation("合格供方导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody SupplierApprovalListRequest request) throws Exception {
+        List<BizResourceSupplierInfo> list = super.exportList(request);
+        super.exportExcel(BizResourceSupplierInfo.class, list, ExportEnum.SUPPLIER_INFO.getSheetName());
+    }
+
     @ApiOperation("供方人员列表（分页）")
     @PostMapping("/person/listPage")
     public ReturnDTO<PageInfoBT<BizResourceSupplierPerson>> personListPage(@RequestBody IdDTO idDTO) {
diff --git a/casic-metering-api/src/main/resources/config/application.yml b/casic-metering-api/src/main/resources/config/application.yml
index 350db5f..ecff521 100644
--- a/casic-metering-api/src/main/resources/config/application.yml
+++ b/casic-metering-api/src/main/resources/config/application.yml
@@ -126,7 +126,7 @@
     #作者
     author: wangpeng
     #待生成对象表名
-    table-name: biz_equipment_technical_target_approval,biz_equipment_attachment_approval,biz_equipment_checkpoint_approval
+    table-name: biz_business_outsource_protocol
 
 reminder:
   #节点--common模块config包 ReminderNodeConfig配置
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
index 4a19e4e..d47d552 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
@@ -53,6 +53,7 @@
     SUGGEST_FORM_SAVE_FAILED(2509, "委托方意见登记表保存至草稿箱失败"),
     EXAMINE_FORM_SAVE_FAILED(2510, "要求、委托书及合同评审表保存至草稿箱失败"),
     CUSTOMER_EXIST_SAVE_FAILED(2511, "该委托方已存在，请重新选择"),
+    DUPLICATE_LOCATION_NO(2512, "地点编号已存在"),
 
     /**
      * 计量检定业务模块
@@ -68,6 +69,8 @@
     COMPLETE_SAMPLE_NOT_EXIST(2609, "检测中不存在扫描收入的样品"),
     CANNOT_CHANGE_MEASURE_INFO(2610, "无法更改非当前登录用户的检测信息"),
     NON_EXIST_ORDER_OR_SAMPLE(2611, "不存在该委托单或该委托单下的样品"),
+    OUTSOURCE_ACCESS_SAVE_FAILED(2612, "测试、校准或检定工作分包评审表保存至草稿箱失败"),
+    OUTSOURCE_PROTOCOL_SAVE_FAILED(2613, "测试、校准或检定工作分包协议书保存至草稿箱失败"),
 
     /**
      * 历史遗留备用
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
index 5089ad1..81a406b 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
@@ -10,54 +10,38 @@
     /**
      * 资源管理
      */
-    ENVIRONMENT_DATA_EXPORT("environmentData", "environmentData", "环境记录单数据"),
+    ENVIRONMENT_DATA_EXPORT("environmentData", "环境记录单数据", "环境记录单数据"),
+    STAFF_INFO("staffInfo", "人员登记", "人员登记"),
+    STAFF_CERTIFICATE_EXPIRE("certificateExpire", "证书逾期提醒", "证书逾期提醒"),
+    SUPPLIER_INFO("supplierInfo", "合格供方名录", "合格供方名录"),
+    CUSTOMER_INFO("customerInfo", "委托方名录", "委托方名录"),
+    CUSTOMER_SUGGEST_FORM("customerSuggestForm", "委托方意见登记表", "委托方意见登记表"),
+    SEAL_NOTE("sealNote", "印章使用登记", "印章使用登记"),
 
-    FILE_EXPORT("meterFileData", "meterFileData", "计量文件信息"),
-    TRAIN_PLAN_EXPORT("trainPlanData", "trainPlanData", "培训计划"),
-    TRAIN_LOG_EXPORT("trainLogData", "trainLogData", "培训记录"),
-    METER_ORGANIZE_EXPORT("meterOrganizeData", "meterOrganizeData", "计量组织"),
-    TRACE_SUPPLIER_EXPORT("traceSupplierData", "traceSupplierData", "溯源供方"),
-    SIGN_EXPORT("signData", "signData", "签名/签章"),
-    TEMPLATE_EXPORT("templateData", "templateData", "原始记录模板/证书报告模板"),
-    FIXED_ASSETS("meterFixedAssets", "meterFixedAssets", "固定资产"),
-    METER_EQUIPMENT("meterEquipment", "meterEquipment", "测量设备"),
-    CALIBRATION_TEST_EQUIPMENT("calibrationTestEquipment", "calibrationTestEquipment", "校准检定设备"),
-    MEASURE_ACCOUNT("measureAccount", "measureAccount", "测量工装"),
-    STANDARD_SUPPORT_EQUIPMENT("standardSupportEquipment", "standardSupportEquipment", "标准配套设备"),
-    STANDARD_EQUIPMENT("standardEquipment", "standardEquipment", "标准装置"),
-    FLOW_DEF_EXPORT("flowDefData", "flowDefData", "流程定义"),
-    STAFF_CERTIFICATE("certificate", "certificate", "计量人员证书"),
-    CHECK_INFO("checkInfo", "checkInfo", "设备管理点检测"),
-    EQUIPMENT_APPLY("equipmentApply", "equipmentApply", "设备借用"),
-    STANDARD_EQUIPMENT_REMIND("equipmentApplyRemind", "equipmentApplyRemind", "标准装置到期提醒"),
-    METER_PRICE("meterPrice", "meterPrice", "价格库"),
-    METER_STAFF("meterStaff", "meterStaff", "计量人员"),
-    STANDARD_EQUIPMENT_APPLY("standardEquipmentApply", "standardEquipmentApply", "标准装置申请"),
-    STATE_MANAGE_APPLY("stateManage", "stateManage", "状态管理"),
-    METER_ACCEPTANCE_CHECK("acceptanceCheck", "acceptanceCheck", "设备检修保养验收单"),
-    CUSTOMER_EXPORT("customerData", "customerData", "客户信息"),
-    ORDER_EXPORT("orderData", "orderData", "委托书信息"),
-    SAMPLE_EXPORT("sampleData", "sampleData", "样本信息"),
-    EXCHANGE_DATA("exchangeData", "exchangeData", "设备交接单"),
-    DISPATCH_DATA("dispatchData", "dispatchData", "设备收发"),
-    ENVIRONMENT_DATA("environmentData", "environmentData", "环境记录单"),
-    ORIGIN_DATA("originData", "originData", "原始记录"),
-    CERTIFICATE_REPORT("certificateReport", "certificateReport", "证书报告"),
-    ADVICE_EXPORT("adviceData", "adviceData", "客户反馈"),
-    HANDOUT_EXPORT("handoutData", "handoutData", "任务分发列表"),
-    OUTSOURCER_EXPORT("outsourcerData", "outsourcerData", "分包方"),
-    SITE_EXECUTIVE_EXPORT("siteExecutiveData", "siteExecutiveData", "现场测试、校准或检定"),
-    CERTIFICATE_PRINT_EXPORT("certificatePrintData", "certificatePrintData", "证书打印"),
-    DOWNLOAD_TEMPLATE("downloadTemplate", "downloadTemplate", "页面配置"),
-    OUTSOURCER_CERTIFICATE_EXPORT("outsourceCertificateData", "outsourceCertificateData", "分包证书"),
-    SETTLEMENT_INFO_EXPORT("settlementInfoData", "settlementInfoData", "业务结算"),
-    EQUIPMENT_REMIND("equipmentRemind", "equipmentRemind", "设备到期提醒"),
-    AGREEMENT_INFO_EXPORT("agreementInfoData", "agreementInfoData", "合同"),
-    WORK_STATISTICS_EXPORT("workStatisticsData", "workStatisticsData", "实时工作统计"),
-    DEPT_OUTPUT_EXPORT("deptOutputData", "deptOutputData", "部门产值分析"),
-    WORKLOAD_EXPORT("workloadData", "workloadData", "业务工作量分析"),
-    DEPT_COMPREHENSIVE_EXPORT("deptComprehensiveData", "deptComprehensiveData", "部门综合分析"),
-    ENVIRONMENTAL_RECORD("environmentalRecordData", "environmentalRecordData", "现场环境记录");
+    /**
+     * 计量检定业务
+     */
+    OUTSOURCER_EXPORT("outsourcerData", "分包方名录", "分包方名录"),
+    IDENTIFY_EXPORT("identifyData", "计量标识", "计量标识"),
+    ORDER_EXPORT("orderData", "任务单", "任务单"),
+    DISPATCH_DATA("dispatchData", "设备收发", "设备收发"),
+    HANDOUT_EXPORT("handoutData", "任务分发", "任务分发"),
+    SITE_EXECUTIVE_EXPORT("siteExecutiveData", "现场测试、校准或检定", "现场测试、校准或检定"),
+    CERTIFICATE_REPORT("certificateReport", "证书审批", "证书审批"),
+    CERTIFICATE_CHANGE_APPLY("certificateChangeApply", "证书报告补充或更换申请单", "证书报告补充或更换申请单"),
+    CERTIFICATE_PRINT("certificatePrintData", "证书打印审批", "证书打印审批"),
+    DEPT_EXECUTIVE_TASK("deptExecutiveTaskData", "实验室任务", "实验室任务"),
+    MY_EXECUTIVE_TASK("myExecutiveTaskData", "我的任务", "我的任务"),
+    OUTSOURCE_ASSESS("outsourceAssess", "测试、校准或检定工作分包评审表", "测试、校准或检定工作分包评审表"),
+    OUTSOURCE_PROTOCOL("outsourceProtocol", "测试、校准或检定工作分包协议书", "测试、校准或检定工作分包协议书"),
+
+    /**
+     * 系统管理
+     */
+    SIGN_EXPORT("signData", "签名", "签名"),
+    TEMPLATE_EXPORT("templateData", "文件模板", "文件模板"),
+    FLOW_DEF_EXPORT("flowDefData", "流程定义", "流程定义"),
+    DOWNLOAD_TEMPLATE("downloadTemplate", "流程定义", "页面配置");
 
     ExportEnum(String fileName, String sheetName, String description) {
         this.fileName = fileName;
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateRecordTypeCodeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateRecordTypeCodeEnum.java
index 31d913c..a963522 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateRecordTypeCodeEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateRecordTypeCodeEnum.java
@@ -46,4 +46,14 @@
     String SITE_EXECUTIVE_APPROVAL = "01";
     //《现场测试、校准或检定工作记录表》
     String SITE_EXECUTIVE_LOG = "02";
+
+    //测试、校准或检定工作分包协议书
+    String OUTSOURCE_PROTOCOL = "01";
+    //测试、校准或检定工作分包评审表
+    String OUTSOURCE_ACCESS = "02";
+    //测试、校准或检定工作分包通知书
+    String OUTSOURCE_NOTICE = "03";
+    //测试、校准或检定工作分包方名录
+    String OUTSOURCE_INFO = "04";
+
 }
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
index 24b8635..f78bd53 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
@@ -15,6 +15,10 @@
     String CERTIFICATE_CHANGE_APPLY_BEAN_NAME = "certificateChangeApplyBean";
     //现场测试、校准或检定
     String SITE_EXECUTIVE_BEAN_NAME = "siteExecutiveBean";
+    //测试、校准或检定工作分包评审表
+    String OUTSOURCE_ASSESS_BEAN_NAME = "outsourceAssessBean";
+    //测试、校准或检定工作分包协议书
+    String OUTSOURCE_PROTOCOL_BEAN_NAME = "outsourceProtocolBean";
 
     /*********************************设备与装置************************************/
     //设备台账
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 b21c661..6b86fd1 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
@@ -18,6 +18,8 @@
     OUTSOURCER_APPROVAL(OUTSOURCER_BEAN_NAME, ""),
     CERTIFICATE_CHANGE_APPROVAL(CERTIFICATE_CHANGE_APPLY_BEAN_NAME, ""),
     SITE_EXECUTIVE_APPROVAL(SITE_EXECUTIVE_BEAN_NAME, ""),
+    OUTSOURCE_ASSESS_APPROVAL(OUTSOURCE_ASSESS_BEAN_NAME, ""),
+    OUTSOURCE_PROTOCOL_APPROVAL(OUTSOURCE_PROTOCOL_BEAN_NAME, ""),
 
     ACTION_STATUS_MAP(new HashMap<String, AwareActionStatusEnum>() {
         {
@@ -47,6 +49,10 @@
             put(ApplyFromIdEnum.CERTIFICATE_CHANGE_APPROVAL.getCode(), CERTIFICATE_CHANGE_APPROVAL);
             //现场测试、校准或检定审批
             put(ApplyFromIdEnum.SITE_EXECUTIVE_APPROVAL.getCode(), SITE_EXECUTIVE_APPROVAL);
+            //测试、校准或检定工作分包评审表
+            put(ApplyFromIdEnum.OUTSOURCE_ASSESS_APPROVAL.getCode(), OUTSOURCE_ASSESS_APPROVAL);
+            //测试、校准或检定工作分包协议书
+            put(ApplyFromIdEnum.OUTSOURCE_PROTOCOL_APPROVAL.getCode(), OUTSOURCE_PROTOCOL_APPROVAL);
         }
     });
     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 934405e..c7410bd 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
@@ -9,6 +9,8 @@
     CERTIFICATE_CHANGE_APPROVAL("jljdywzsbchghsqd", MessageSourceModuleEnum.BUSINESS.getCode(), "证书/报告补充或更换申请单"),
     OUTSOURCER_APPROVAL("jljdywcsjzhgfbfml", MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定合格分包方名录"),
     SITE_EXECUTIVE_APPROVAL("jljdywxccsjzsp", MessageSourceModuleEnum.BUSINESS.getCode(), "现场测试、校准或检定审批"),
+    OUTSOURCE_ASSESS_APPROVAL("jljdywcsjzfbpsb", MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包评审表"),
+    OUTSOURCE_PROTOCOL_APPROVAL("jljdywcsjzfbxys", MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包协议书"),
 
 
     /*******************************************设备与装置*********************************************/
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/GeneralApprovalMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/GeneralApprovalMapper.java
index 4fb7344..0c9d6ae 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/GeneralApprovalMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/GeneralApprovalMapper.java
@@ -17,8 +17,4 @@
 
     Page<O> selectBatchForApprovalList(Page<O> page, @Param("request") R request, @Param("businessKeys") List<String> businessKeys);
 
-//    Page<O> selectListPage(Page<O> page, @Param("request") R request);
-
-//    Long selectMaxNo();
-
 }
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceAssessMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceAssessMapper.java
index 7867bb8..ba59009 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceAssessMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceAssessMapper.java
@@ -1,7 +1,12 @@
 package com.casic.missiles.mapper.business;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.business.outsource.OutsourceAssessApprovalListRequest;
+import com.casic.missiles.mapper.GeneralApprovalMapper;
 import com.casic.missiles.model.business.BizBusinessOutsourceAssess;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * <p>
@@ -11,6 +16,10 @@
  * @author wangpeng
  * @since 2023-08-16
  */
-public interface BizBusinessOutsourceAssessMapper extends BaseMapper<BizBusinessOutsourceAssess> {
+public interface BizBusinessOutsourceAssessMapper extends GeneralApprovalMapper<BizBusinessOutsourceAssess, BizBusinessOutsourceAssess, OutsourceAssessApprovalListRequest> {
+
+    Page<BizBusinessOutsourceAssess> selectBatchForApprovalList(Page<BizBusinessOutsourceAssess> page, @Param("request") OutsourceAssessApprovalListRequest request, @Param("businessKeys") List<String> businessKeys);
+
+    Long selectMaxProjectNo();
 
 }
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceProtocolMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceProtocolMapper.java
new file mode 100644
index 0000000..e6aba35
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceProtocolMapper.java
@@ -0,0 +1,24 @@
+package com.casic.missiles.mapper.business;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.business.outsource.OutsourceProtocolApprovalListRequest;
+import com.casic.missiles.mapper.GeneralApprovalMapper;
+import com.casic.missiles.model.business.BizBusinessOutsourceProtocol;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 计量检定业务-分包管理-测试、校准或检定工作分包协议书 Mapper 接口
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-08-24
+ */
+public interface BizBusinessOutsourceProtocolMapper extends GeneralApprovalMapper<BizBusinessOutsourceProtocol, BizBusinessOutsourceProtocol, OutsourceProtocolApprovalListRequest> {
+
+    Page<BizBusinessOutsourceProtocol> selectBatchForApprovalList(Page<BizBusinessOutsourceProtocol> page, @Param("request") OutsourceProtocolApprovalListRequest request, @Param("businessKeys") List<String> businessKeys);
+
+    Long selectMaxProtocolNo();
+}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/EnvLocationInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/EnvLocationInfoMapper.java
new file mode 100644
index 0000000..49eff87
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/EnvLocationInfoMapper.java
@@ -0,0 +1,21 @@
+package com.casic.missiles.mapper.resource;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.resource.environment.LocationListRequest;
+import com.casic.missiles.dto.resource.environment.LocationListResponse;
+import com.casic.missiles.model.resource.EnvLocationInfo;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * <p>
+ * 实验室环境监控系统-设备表 Mapper 接口
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-06-07
+ */
+public interface EnvLocationInfoMapper extends BaseMapper<EnvLocationInfo> {
+
+    Page<LocationListResponse> selectLocationListPage(Page<LocationListResponse> page, @Param("request") LocationListRequest request);
+}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java
index de124db..85ed0f7 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java
@@ -1,7 +1,9 @@
 package com.casic.missiles.mapper.system;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.dto.system.SignDetailResponse;
+import com.casic.missiles.dto.system.SignListRequest;
 import com.casic.missiles.model.system.SystemSign;
 import org.apache.ibatis.annotations.Param;
 
@@ -22,4 +24,8 @@
     SignDetailResponse selectSignDetailById(Long id);
 
     List<SystemSign> selectUsableSignList(@Param("userId") Long userId);
+
+    Page<SystemSign> selectSignListPage(Page<SystemSign> page, @Param("request") SignListRequest request);
+
+    List<SystemSign> selectSignList(@Param("request") SignListRequest request);
 }
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateChangeApplyMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateChangeApplyMapper.xml
index d798447..c496092 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateChangeApplyMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateChangeApplyMapper.xml
@@ -30,31 +30,31 @@
         SELECT *
         FROM biz_business_certificate_change_apply
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.changeApplyNo != null and request.changeApplyNo !=''">
+        <if test="request != null and request.changeApplyNo != null and request.changeApplyNo !=''">
             and change_apply_no like concat('%',#{request.changeApplyNo},'%')
         </if>
-        <if test="request.changeReportNo != null and request.changeReportNo !=''">
+        <if test="request != null and request.changeReportNo != null and request.changeReportNo !=''">
             and change_report_no like concat('%',#{request.changeReportNo},'%')
         </if>
-        <if test="request.changeReportName != null and request.changeReportName !=''">
+        <if test="request != null and request.changeReportName != null and request.changeReportName !=''">
             and change_report_name like concat('%',#{request.changeReportName},'%')
         </if>
-        <if test="request.changeType != null and request.changeType !=''">
+        <if test="request != null and request.changeType != null and request.changeType !=''">
             and change_type = #{request.changeType}
         </if>
-        <if test="request.createUserName != null and request.createUserName !=''">
+        <if test="request != null and request.createUserName != null and request.createUserName !=''">
             and create_user_name like concat('%',#{request.createUserName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificatePrintMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificatePrintMapper.xml
index b66cd99..49c0ac8 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificatePrintMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificatePrintMapper.xml
@@ -31,34 +31,34 @@
         LEFT JOIN biz_business_order_sample_relation bosr ON (bosr.order_id = bcr.order_id AND bosr.sample_id = bcr.sample_id)
         LEFT JOIN biz_business_order_info boi ON boi.id = bosr.order_id
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and bcp.approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.printStatus != null and request.printStatus !=''">
+        <if test="request != null and request.printStatus != null and request.printStatus !=''">
             and print_status = #{request.printStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and bcp.create_user_id = #{request.createUserId}
         </if>
-        <if test="request.certificateReportNo != null and request.certificateReportNo !=''">
+        <if test="request != null and request.certificateReportNo != null and request.certificateReportNo !=''">
             and bcr.certificate_report_no like concat('%',#{request.certificateReportNo},'%')
         </if>
-        <if test="request.certificateReportName != null and request.certificateReportName !=''">
+        <if test="request != null and request.certificateReportName != null and request.certificateReportName !=''">
             and bcr.certificate_report_name like concat('%',#{request.certificateReportName},'%')
         </if>
-        <if test="request.customerName != null and request.customerName !=''">
+        <if test="request != null and request.customerName != null and request.customerName !=''">
             and boi.customer_name like concat('%',#{request.customerName},'%')
         </if>
-        <if test="request.sampleNo != null and request.sampleNo !=''">
+        <if test="request != null and request.sampleNo != null and request.sampleNo !=''">
             and bosr.sample_no like concat('%',#{request.sampleNo},'%')
         </if>
-        <if test="request.sampleName != null and request.sampleName !=''">
+        <if test="request != null and request.sampleName != null and request.sampleName !=''">
             and bosr.sample_name like concat('%',#{request.sampleName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and bcp.create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and bcp.create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml
index b366034..767695d 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml
@@ -46,33 +46,37 @@
         SELECT bcr.*, bosr.sample_no, bosr.sample_name, bosr.sample_model, rsi.staff_name
         FROM biz_business_certificate_report bcr
         LEFT JOIN biz_business_order_sample_relation bosr ON (bosr.order_id = bcr.order_id AND bosr.sample_id = bcr.sample_id)
+        LEFT JOIN biz_business_order_info boi ON boi.id = bcr.order_id
         LEFT JOIN biz_resource_staff_info rsi ON rsi.id = bcr.measure_person_id
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and bcr.approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and bcr.create_user_id = #{request.createUserId}
         </if>
-        <if test="request.certificateReportNo != null and request.certificateReportNo !=''">
+        <if test="request != null and request.customerId != null and request.customerId !=''">
+            and boi.customer_id = #{request.customerId}
+        </if>
+        <if test="request != null and request.certificateReportNo != null and request.certificateReportNo !=''">
             and bcr.certificate_report_no like concat('%',#{request.certificateReportNo},'%')
         </if>
-        <if test="request.certificateReportName != null and request.certificateReportName !=''">
+        <if test="request != null and request.certificateReportName != null and request.certificateReportName !=''">
             and bcr.certificate_report_name like concat('%',#{request.certificateReportName},'%')
         </if>
-        <if test="request.sampleNo != null and request.sampleNo !=''">
+        <if test="request != null and request.sampleNo != null and request.sampleNo !=''">
             and bosr.sample_no like concat('%',#{request.sampleNo},'%')
         </if>
-        <if test="request.measureCategory != null and request.measureCategory !=''">
+        <if test="request != null and request.measureCategory != null and request.measureCategory !=''">
             and bcr.measure_category = #{request.measureCategory}
         </if>
-        <if test="request.measurePerson != null and request.measurePerson !=''">
+        <if test="request != null and request.measurePerson != null and request.measurePerson !=''">
             and rsi.staff_name like concat('%',#{request.measurePerson},'%')
         </if>
-        <if test="request.calibrationTimeStart != null and request.calibrationTimeStart !=''">
+        <if test="request != null and request.calibrationTimeStart != null and request.calibrationTimeStart !=''">
             and bcr.calibration_time &gt;= #{request.calibrationTimeStart}
         </if>
-        <if test="request.calibrationTimeEnd != null and request.calibrationTimeEnd !=''">
+        <if test="request != null and request.calibrationTimeEnd != null and request.calibrationTimeEnd !=''">
             and bcr.calibration_time &lt;= #{request.calibrationTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceAssessMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceAssessMapper.xml
index d0fcf8b..c22c101 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceAssessMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceAssessMapper.xml
@@ -7,6 +7,8 @@
         <id column="id" property="id" />
         <result column="project_no" property="projectNo" />
         <result column="project_name" property="projectName" />
+        <result column="lab_code" property="labCode" />
+        <result column="group_code" property="groupCode" />
         <result column="applicant_id" property="applicantId" />
         <result column="applicant_name" property="applicantName" />
         <result column="applicant_time" property="applicantTime" />
@@ -31,7 +33,45 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, project_no, project_name, applicant_id, applicant_name, applicant_time, minio_file_name, remark, create_user_id, create_user_name, outsourcer_id, pre_start_time, pre_end_time, outsource_reason, pre_cost, approval_status, process_id, approve_situation, traceability, test_method, technique_ability, create_time, update_time
+        id, project_no, project_name, lab_code, group_code, applicant_id, applicant_name, applicant_time, minio_file_name, remark, create_user_id, create_user_name, outsourcer_id, pre_start_time, pre_end_time, outsource_reason, pre_cost, approval_status, process_id, approve_situation, traceability, test_method, technique_ability, create_time, update_time
     </sql>
 
+    <select id="selectMaxProjectNo" resultType="java.lang.Long">
+        SELECT IFNULL(max(RIGHT(project_no, 3)), 0) from biz_business_outsource_assess
+    </select>
+
+    <select id="selectBatchForApprovalList" resultMap="BaseResultMap">
+        SELECT bboa.*, bboi.outsourcer_name, bboi.director
+        FROM biz_business_outsource_assess bboa
+        LEFT JOIN biz_business_outsourcer_info bboi ON bboa.outsourcer_id = bboi.id
+        WHERE 1=1
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
+            and bboa.approval_status = #{request.approvalStatus}
+        </if>
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
+            and bboa.create_user_id = #{request.createUserId}
+        </if>
+        <if test="request != null and request.projectNo != null and request.projectNo !=''">
+            and bboa.project_no like concat('%',#{request.projectNo},'%')
+        </if>
+        <if test="request != null and request.outsourcerName != null and request.outsourcerName !=''">
+            and bboi.outsourcer_name like concat('%',#{request.outsourcerName},'%')
+        </if>
+        <if test="request != null and request.applicantName != null and request.applicantName !=''">
+            and bboa.applicant_name like concat('%',#{request.applicantName},'%')
+        </if>
+        <if test="request != null and request.applicantTimeStart != null and request.applicantTimeStart !=''">
+            and bboa.applicant_time &gt;= #{request.applicantTimeStart}
+        </if>
+        <if test="request != null and request.applicantTimeEnd != null and request.applicantTimeEnd !=''">
+            and bboa.applicant_time &lt;= #{request.applicantTimeEnd}
+        </if>
+        <if test="businessKeys != null">
+            and bboa.id in
+            <foreach collection="businessKeys" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
+        ORDER BY bboa.create_time DESC
+    </select>
 </mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceProtocolMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceProtocolMapper.xml
new file mode 100644
index 0000000..b7b2149
--- /dev/null
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceProtocolMapper.xml
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.mapper.business.BizBusinessOutsourceProtocolMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.business.BizBusinessOutsourceProtocol">
+        <id column="id" property="id" />
+        <result column="protocol_no" property="protocolNo" />
+        <result column="project_name" property="projectName" />
+        <result column="lab_code" property="labCode" />
+        <result column="group_code" property="groupCode" />
+        <result column="outsourcer_id" property="outsourcerId" />
+        <result column="remark" property="remark" />
+        <result column="outsource_no" property="outsourceNo" />
+        <result column="outsource_name" property="outsourceName" />
+        <result column="contacts" property="contacts" />
+        <result column="mobile" property="mobile" />
+        <result column="address" property="address" />
+        <result column="require_date" property="requireDate" />
+        <result column="outsource_cost" property="outsourceCost" />
+        <result column="director" property="director" />
+        <result column="item" property="item" />
+        <result column="requires" property="requires" />
+        <result column="create_user_id" property="createUserId" />
+        <result column="create_user_name" property="createUserName" />
+        <result column="approval_status" property="approvalStatus" />
+        <result column="process_id" property="processId" />
+        <result column="create_time" property="createTime" />
+        <result column="update_time" property="updateTime" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, protocol_no, project_name, lab_code, group_code, outsourcer_id, remark, outsource_no, outsource_name, contacts, mobile, address, require_date, outsource_cost, director, item, requires, create_user_id, create_user_name, approval_status, process_id, create_time, update_time
+    </sql>
+
+    <select id="selectMaxProtocolNo" resultType="java.lang.Long">
+        SELECT IFNULL(max(RIGHT(protocol_no, 3)), 0) from biz_business_outsource_protocol
+    </select>
+
+    <select id="selectBatchForApprovalList" resultMap="BaseResultMap">
+        SELECT *
+        FROM biz_business_outsource_protocol
+        WHERE 1=1
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
+            and approval_status = #{request.approvalStatus}
+        </if>
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
+            and create_user_id = #{request.createUserId}
+        </if>
+        <if test="request != null and request.protocolNo != null and request.protocolNo !=''">
+            and protocol_no like concat('%',#{request.protocolNo},'%')
+        </if>
+        <if test="request != null and request.outsourcerName != null and request.outsourcerName !=''">
+            and outsourcer_name like concat('%',#{request.outsourcerName},'%')
+        </if>
+        <if test="request != null and request.applicantName != null and request.applicantName !=''">
+            and create_user_name like concat('%',#{request.applicantName},'%')
+        </if>
+        <if test="request != null and request.applicantTimeStart != null and request.applicantTimeStart !=''">
+            and create_time &gt;= #{request.applicantTimeStart}
+        </if>
+        <if test="request != null and request.applicantTimeEnd != null and request.applicantTimeEnd !=''">
+            and create_time &lt;= #{request.applicantTimeEnd}
+        </if>
+        <if test="businessKeys != null">
+            and id in
+            <foreach collection="businessKeys" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
+        ORDER BY create_time DESC
+    </select>
+</mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourcerInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourcerInfoMapper.xml
index 510a80b..3049b54 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourcerInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourcerInfoMapper.xml
@@ -7,6 +7,8 @@
         <id column="id" property="id" />
         <result column="outsourcer_no" property="outsourcerNo" />
         <result column="outsourcer_name" property="outsourcerName" />
+        <result column="lab_code" property="labCode" />
+        <result column="group_code" property="groupCode" />
         <result column="outsourcer_brief_name" property="outsourcerBriefName" />
         <result column="outsourcer_size" property="outsourcerSize" />
         <result column="business_size" property="businessSize" />
@@ -55,32 +57,32 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, outsourcer_no, outsourcer_name, outsourcer_brief_name, outsourcer_size, business_size, grade, evaluation, tax_number, bank_account, bank_name, bank_account_number, postal_code, director, phone, fax, mobile, email, website, address_country, address_province, address_city, address_area, full_address, address_country_name, address_province_name, address_city_name, address_area_name, invoice_country, invoice_province, invoice_city, invoice_area, invoice_full_address, invoice_country_name, invoice_province_name, invoice_city_name, invoice_area_name, business_scope, business_content, minio_file_name, approval_status, process_id, remark, create_user_id, create_user_name, create_time, update_time
+        id, outsourcer_no, outsourcer_name, lab_code, group_code, outsourcer_brief_name, outsourcer_size, business_size, grade, evaluation, tax_number, bank_account, bank_name, bank_account_number, postal_code, director, phone, fax, mobile, email, website, address_country, address_province, address_city, address_area, full_address, address_country_name, address_province_name, address_city_name, address_area_name, invoice_country, invoice_province, invoice_city, invoice_area, invoice_full_address, invoice_country_name, invoice_province_name, invoice_city_name, invoice_area_name, business_scope, business_content, minio_file_name, approval_status, process_id, remark, create_user_id, create_user_name, create_time, update_time
     </sql>
 
     <select id="selectBatchForApprovalList" resultMap="BaseResultMap">
         SELECT *
         FROM biz_business_outsourcer_info
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.outsourcerNo != null and request.outsourcerNo !=''">
+        <if test="request != null and request.outsourcerNo != null and request.outsourcerNo !=''">
             and outsourcer_no like concat('%',#{request.outsourcerNo},'%')
         </if>
-        <if test="request.outsourcerName != null and request.outsourcerName !=''">
+        <if test="request != null and request.outsourcerName != null and request.outsourcerName !=''">
             and outsourcer_name like concat('%',#{request.outsourcerName},'%')
         </if>
-        <if test="request.director != null and request.director !=''">
+        <if test="request != null and request.director != null and request.director !=''">
             and director like concat('%',#{request.director},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
@@ -93,6 +95,6 @@
     </select>
 
     <select id="selectMaxNo" resultType="java.lang.Long">
-        SELECT IFNULL(max(RIGHT(outsourcer_no, 12)), 0) from biz_business_outsourcer_info
+        SELECT IFNULL(max(RIGHT(outsourcer_no, 3)), 0) from biz_business_outsourcer_info
     </select>
 </mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessSiteExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessSiteExecutiveInfoMapper.xml
index 135c5d0..3c5ae79 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessSiteExecutiveInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessSiteExecutiveInfoMapper.xml
@@ -38,25 +38,25 @@
         FROM biz_business_site_executive_info bsei
         LEFT JOIN biz_resource_customer_info rci ON bsei.customer_id = rci.id
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and bsei.approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and bsei.create_user_id = #{request.createUserId}
         </if>
-        <if test="request.siteExecutiveNo != null and request.siteExecutiveNo !=''">
+        <if test="request != null and request.siteExecutiveNo != null and request.siteExecutiveNo !=''">
             and bsei.site_executive_no like concat('%',#{request.siteExecutiveNo},'%')
         </if>
-        <if test="request.customerName != null and request.customerName !=''">
+        <if test="request != null and request.customerName != null and request.customerName !=''">
             and rci.outsourcer_name like concat('%',#{request.customerName},'%')
         </if>
-        <if test="request.applyName != null and request.applyName !=''">
+        <if test="request != null and request.applyName != null and request.applyName !=''">
             and bsei.apply_name like concat('%',#{request.applyName},'%')
         </if>
-        <if test="request.applyTimeStart != null and request.applyTimeStart !=''">
+        <if test="request != null and request.applyTimeStart != null and request.applyTimeStart !=''">
             and bsei.apply_time &gt;= #{request.applyTimeStart}
         </if>
-        <if test="request.applyTimeEnd != null and request.applyTimeEnd !=''">
+        <if test="request != null and request.applyTimeEnd != null and request.applyTimeEnd !=''">
             and bsei.apply_time &lt;= #{request.applyTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml
index 84d9e2a..6bd38a9 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml
@@ -105,6 +105,12 @@
         <if test="request.isUrgent != null and request.isUrgent !=''">
             AND bo.is_urgent = #{request.isUrgent}
         </if>
+        <if test="request.ids != null">
+            and blei.id in
+            <foreach collection="request.ids" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
         ORDER BY blei.update_time DESC
     </select>
 
@@ -137,6 +143,12 @@
         <if test="request.isUrgent != null and request.isUrgent !=''">
             AND bo.is_urgent = #{request.isUrgent}
         </if>
+        <if test="request.ids != null">
+            and blei.id in
+            <foreach collection="request.ids" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
         ORDER BY blei.update_time DESC
     </select>
 
diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardInfoMapper.xml
index 1a5551b..2ed8d17 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardInfoMapper.xml
@@ -45,12 +45,6 @@
         FROM biz_equipment_standard_info besi
         LEFT JOIN biz_equipment_standard_technology_relation bestr ON besi.standard_no = bestr.standard_no
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
-            and besi.approval_status = #{request.approvalStatus}
-        </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
-            and besi.create_user_id = #{request.createUserId}
-        </if>
         <if test="request.standardName != null and request.standardName !=''">
             and besi.standard_name like concat('%',#{request.standardName},'%')
         </if>
diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardTechnologyRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardTechnologyRelationMapper.xml
index fc7e16c..cd03c8c 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardTechnologyRelationMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardTechnologyRelationMapper.xml
@@ -6,6 +6,7 @@
     <resultMap id="BaseResultMap" type="com.casic.missiles.model.equipment.BizEquipmentStandardTechnologyRelation">
         <id column="id" property="id" />
         <result column="technology_file_id" property="technologyFileId" />
+        <result column="technology_file_no" property="technologyFileNo" />
         <result column="technology_file_name" property="technologyFileName" />
         <result column="standard_id" property="standardId" />
         <result column="standard_no" property="standardNo" />
@@ -14,7 +15,7 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, technology_file_id, technology_file_name, standard_id, remark
+        id, technology_file_id, technology_file_no, technology_file_name, standard_id, remark
     </sql>
 
 </mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceAuthorizeOrderMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceAuthorizeOrderMapper.xml
index ac5176c..554fe65 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceAuthorizeOrderMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceAuthorizeOrderMapper.xml
@@ -32,22 +32,22 @@
         SELECT *
         FROM biz_resource_authorize_order
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.orderNo != null and request.orderNo !=''">
+        <if test="request != null and request.orderNo != null and request.orderNo !=''">
             and order_no like concat('%',#{request.orderNo},'%')
         </if>
-        <if test="request.createUserName != null and request.createUserName !=''">
+        <if test="request != null and request.createUserName != null and request.createUserName !=''">
             and create_user_name like concat('%',#{request.createUserName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerExamineFormMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerExamineFormMapper.xml
index ab242f6..af7f98f 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerExamineFormMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerExamineFormMapper.xml
@@ -41,28 +41,28 @@
         SELECT *
         FROM biz_resource_customer_examine_form
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.formNo != null and request.formNo !=''">
+        <if test="request != null and request.formNo != null and request.formNo !=''">
             and form_no like concat('%',#{request.formNo},'%')
         </if>
-        <if test="request.labCode != null and request.labCode !=''">
+        <if test="request != null and request.labCode != null and request.labCode !=''">
             and lab_code like concat('%',#{request.labCode},'%')
         </if>
-        <if test="request.groupCode != null and request.groupCode !=''">
+        <if test="request != null and request.groupCode != null and request.groupCode !=''">
             and group_code like concat('%',#{request.groupCode},'%')
         </if>
-        <if test="request.createUserName != null and request.createUserName !=''">
+        <if test="request != null and request.createUserName != null and request.createUserName !=''">
             and create_user_name like concat('%',#{request.createUserName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerInfoMapper.xml
index fa8ffbc..06a2798 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerInfoMapper.xml
@@ -33,25 +33,25 @@
         SELECT *
         FROM biz_resource_customer_info
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.customerNo != null and request.customerNo !=''">
+        <if test="request != null and request.customerNo != null and request.customerNo !=''">
             and customer_no like concat('%',#{request.customerNo},'%')
         </if>
-        <if test="request.customerName != null and request.customerName !=''">
+        <if test="request != null and request.customerName != null and request.customerName !=''">
             and customer_name like concat('%',#{request.customerName},'%')
         </if>
-        <if test="request.contacts != null and request.contacts !=''">
+        <if test="request != null and request.contacts != null and request.contacts !=''">
             and contacts like concat('%',#{request.contacts},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerSuggestFormMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerSuggestFormMapper.xml
index 28f5bb2..1806662 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerSuggestFormMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerSuggestFormMapper.xml
@@ -33,28 +33,28 @@
         SELECT *
         FROM biz_resource_customer_suggest_form
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.formNo != null and request.formNo !=''">
+        <if test="request != null and request.formNo != null and request.formNo !=''">
             and form_no like concat('%',#{request.formNo},'%')
         </if>
-        <if test="request.customerName != null and request.customerName !=''">
+        <if test="request != null and request.customerName != null and request.customerName !=''">
             and customer_name like concat('%',#{request.customerName},'%')
         </if>
-        <if test="request.customerDeptName != null and request.customerDeptName !=''">
+        <if test="request != null and request.customerDeptName != null and request.customerDeptName !=''">
             and customer_dept_name like concat('%',#{request.customerDeptName},'%')
         </if>
-        <if test="request.createUserName != null and request.createUserName !=''">
+        <if test="request != null and request.createUserName != null and request.createUserName !=''">
             and create_user_name like concat('%',#{request.createUserName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSealUseNoteMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSealUseNoteMapper.xml
index ab37bc1..b02bb33 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSealUseNoteMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSealUseNoteMapper.xml
@@ -29,32 +29,32 @@
     </sql>
 
     <select id="selectBatchForApprovalList" resultMap="BaseResultMap">
-        SELECT *
+        SELECT brsun.*, brsi.seal_name, brsi.seal_type, brsi.approver_name
         FROM biz_resource_seal_use_note brsun
         JOIN biz_resource_seal_info brsi ON brsun.seal_id = brsi.id
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and brsun.approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and brsun.create_user_id = #{request.createUserId}
         </if>
-        <if test="request.sealName != null and request.sealName !=''">
+        <if test="request != null and request.sealName != null and request.sealName !=''">
             and brsi.seal_name like concat('%',#{request.sealName},'%')
         </if>
-        <if test="request.sealType != null and request.sealType !=''">
+        <if test="request != null and request.sealType != null and request.sealType !=''">
             and brsi.seal_type = #{request.sealType}
         </if>
-        <if test="request.applyDeptName != null and request.applyDeptName !=''">
+        <if test="request != null and request.applyDeptName != null and request.applyDeptName !=''">
             and brsun.apply_dept_name like concat('%',#{request.applyDeptName},'%')
         </if>
-        <if test="request.applyUserName != null and request.applyUserName !=''">
+        <if test="request != null and request.applyUserName != null and request.applyUserName !=''">
             and brsun.apply_user_name like concat('%',#{request.applyUserName},'%')
         </if>
-        <if test="request.applyTimeStart != null and request.applyTimeStart !=''">
+        <if test="request != null and request.applyTimeStart != null and request.applyTimeStart !=''">
             and brsun.apply_time &gt;= #{request.applyTimeStart}
         </if>
-        <if test="request.applyTimeEnd != null and request.applyTimeEnd !=''">
+        <if test="request != null and request.applyTimeEnd != null and request.applyTimeEnd !=''">
             and brsun.apply_time &lt;= #{request.applyTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml
index 119bf7d..4f8392a 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml
@@ -31,6 +31,12 @@
         <if test="request.deptName != null and request.deptName !=''">
             and brsi.dept_name like concat('%',#{request.deptName},'%')
         </if>
+        <if test="request.ids != null">
+            and brsv.id in
+            <foreach collection="request.ids" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
         ORDER BY brsv.grant_date DESC
     </select>
 
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSupplierInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSupplierInfoMapper.xml
index fe8d399..e8ce7ef 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSupplierInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSupplierInfoMapper.xml
@@ -48,28 +48,28 @@
         SELECT *
         FROM biz_resource_supplier_info
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.supplierNo != null and request.supplierNo !=''">
+        <if test="request != null and request.supplierNo != null and request.supplierNo !=''">
             and supplier_no like concat('%',#{request.supplierNo},'%')
         </if>
-        <if test="request.supplierName != null and request.supplierName !=''">
+        <if test="request != null and request.supplierName != null and request.supplierName !=''">
             and supplier_name like concat('%',#{request.supplierName},'%')
         </if>
-        <if test="request.director != null and request.director !=''">
+        <if test="request != null and request.director != null and request.director !=''">
             and director like concat('%',#{request.director},'%')
         </if>
-        <if test="request.supplierType != null and request.supplierType !=''">
+        <if test="request != null and request.supplierType != null and request.supplierType !=''">
             and supplier_type = #{request.supplierType}
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/EnvLocationInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/EnvLocationInfoMapper.xml
new file mode 100644
index 0000000..68bcf10
--- /dev/null
+++ b/casic-metering-dao/src/main/resources/mapper/resource/EnvLocationInfoMapper.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.mapper.resource.EnvLocationInfoMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.resource.EnvLocationInfo">
+        <id column="id" property="id" />
+        <result column="location_no" property="locationNo" />
+        <result column="location_name" property="locationName" />
+        <result column="location_position" property="locationPosition" />
+        <result column="create_user_id" property="createUserId" />
+        <result column="create_user" property="createUser" />
+        <result column="create_time" property="createTime" />
+        <result column="update_time" property="updateTime" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, location_no, location_name, location_position, create_user_id, create_user, create_time, update_time
+    </sql>
+
+    <select id="selectLocationListPage" resultType="com.casic.missiles.dto.resource.environment.LocationListResponse">
+        SELECT *
+        FROM env_location_info
+        WHERE 1=1
+        <if test="request.locationNo != null and request.locationNo !=''">
+            AND location_no LIKE concat('%',#{request.locationNo},'%')
+        </if>
+        <if test="request.locationName != null and request.locationName !=''">
+            AND location_name LIKE concat('%',#{request.locationName},'%')
+        </if>
+        ORDER BY create_time DESC
+    </select>
+
+</mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml
index b28c18f..8854047 100644
--- a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml
@@ -11,7 +11,6 @@
         <result column="sign_desc" property="signDesc" />
         <result column="sign_director" property="signDirector" />
         <result column="sign_user_id" property="signUserId" />
-        <result column="sign_type" property="signType" />
         <result column="minio_file_name" property="minioFileName" />
         <result column="create_time" property="createTime" />
         <result column="update_time" property="updateTime" />
@@ -28,7 +27,6 @@
         <result column="sign_name" property="signName" />
         <result column="sign_desc" property="signDesc" />
         <result column="sign_director" property="signDirector" />
-        <result column="sign_type" property="signType" />
         <result column="sign_user_id" property="signUserId" />
         <result column="minio_file_name" property="minioFileName" />
         <result column="create_time" property="createTime" />
@@ -62,4 +60,58 @@
         JOIN system_sign_user_relation ssur ON ss.id = ssur.sign_id
         WHERE ssur.user_id = #{userId}
     </select>
+
+    <select id="selectSignListPage" resultMap="BaseResultMap">
+        SELECT ss.*, sd.SIMPLE_NAME AS deptName
+        FROM system_sign ss
+        LEFT JOIN sys_user su ON su.id = ss.sign_user_id
+        LEFT JOIN sys_dept sd ON sd.id = su.dept_id
+        WHERE 1=1
+        <if test="request.signNo != null and request.signNo !=''">
+            AND ss.sign_no LIKE concat('%',#{request.signNo},'%')
+        </if>
+        <if test="request.signName != null and request.signName !=''">
+            AND ss.sign_name LIKE concat('%',#{request.signName},'%')
+        </if>
+        <if test="request.signDirector != null and request.signDirector !=''">
+            AND ss.sign_director LIKE concat('%',#{request.signDirector},'%')
+        </if>
+        <if test="request.signUserId != null and request.signUserId !=''">
+            AND ss.sign_user_id = #{request.signUserId}
+        </if>
+        <if test="request.createStartTime != null and request.createStartTime !=''">
+            AND DATE_FORMAT(ss.create_time,'%Y-%m-%d') &gt;= DATE_FORMAT(#{request.createStartTime},'%Y-%m-%d')
+        </if>
+        <if test="request.createEndTime != null and request.createEndTime !=''">
+            AND DATE_FORMAT(ss.create_time,'%Y-%m-%d')  &lt;= DATE_FORMAT(#{request.createEndTime},'%Y-%m-%d')
+        </if>
+        ORDER BY ss.create_time DESC
+    </select>
+
+    <select id="selectSignList" resultMap="BaseResultMap">
+        SELECT ss.*, sd.SIMPLE_NAME AS deptName
+        FROM system_sign ss
+        LEFT JOIN sys_user su ON su.id = ss.sign_user_id
+        LEFT JOIN sys_dept sd ON sd.id = su.dept_id
+        WHERE 1=1
+        <if test="request.signNo != null and request.signNo !=''">
+            AND ss.sign_no LIKE concat('%',#{request.signNo},'%')
+        </if>
+        <if test="request.signName != null and request.signName !=''">
+            AND ss.sign_name LIKE concat('%',#{request.signName},'%')
+        </if>
+        <if test="request.signDirector != null and request.signDirector !=''">
+            AND ss.sign_director LIKE concat('%',#{request.signDirector},'%')
+        </if>
+        <if test="request.signUserId != null and request.signUserId !=''">
+            AND ss.sign_user_id = #{request.signUserId}
+        </if>
+        <if test="request.createStartTime != null and request.createStartTime !=''">
+            AND DATE_FORMAT(ss.create_time,'%Y-%m-%d') &gt;= DATE_FORMAT(#{request.createStartTime},'%Y-%m-%d')
+        </if>
+        <if test="request.createEndTime != null and request.createEndTime !=''">
+            AND DATE_FORMAT(ss.create_time,'%Y-%m-%d')  &lt;= DATE_FORMAT(#{request.createEndTime},'%Y-%m-%d')
+        </if>
+        ORDER BY ss.create_time DESC
+    </select>
 </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 515050a..60f530b 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
@@ -47,8 +47,8 @@
     String STORAGE_LOCATION = "bizStorageLocation";
     //计量专业
     String MEASURE_MAJOR = "bizMeasureMajor";
-    //管理状态
-    String MANAGER_STATE = "bizManagerState";
+    //标准装置管理状态
+    String STANDARD_MANAGER_STATE = "bizStandardManagerState";
 
     /**
      * 资源管理 字典code
@@ -95,8 +95,6 @@
     String MEASURE_STATUS = "measureStatus";
     //检定方式
     String MEASURE_TYPE = "measureType";
-    //标识打印标志类型
-    String IDENTIFY_PRINT_TYPE = "bizBusinessIdentify";
     //变更类型
     String REPORT_CHANGE_TYPE = "bizCertChangeType";
     //规模类型
@@ -111,19 +109,24 @@
     String MEASURE_CATEGORY = "measureCategory";
     //检定结果
     String MEASURE_RESULT = "measureResult";
+    //分包原因
+    String OUTSOURCE_REASON = "outsourceReason";
+
+    /**
+     * 系统管理
+     */
+    String TEMPLATE_TYPE = "templateType";
+
 
     /**
      * 标准装置 字典code
      */
     //类别
     String STANDARD_CATEGORY = "standardCategory";
-    //管理状态
-    String STANDARD_MANAGER_STATE = "standardManagerState";
     //标准等级
     String STANDARD_LEVEL = "standardLevel";
     //传递范围
     String STANDARD_TRANSMIT_RANGE = "transmitRange";
-
     //资本来源
     String CAPITAL_SOURCE = "capitalSource";
     //标准装置-申请类型
@@ -148,8 +151,6 @@
     String CERTIFICATE_CLASS = "certificationClass";
     //证书管理-检校专业
     String CALIBRATION_MAJOR = "calibrationMajor";
-    //分包原因
-    String OUTSOURCE_REASON = "outsourceReason";
 
     /**
      * 工作台
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/BaseApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/BaseApprovalListRequest.java
index 73c12c1..80d7424 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/BaseApprovalListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/BaseApprovalListRequest.java
@@ -6,6 +6,7 @@
 
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotEmpty;
+import java.util.List;
 
 /**
  * @Description:
@@ -19,14 +20,14 @@
      * 表单id
      */
     @NotBlank(message = "表单id不能为空")
-    @ApiModelProperty(value = "表单id（流程定义对应的表单id，等价于业务id）", dataType = "String")
+    @ApiModelProperty(value = "表单id（流程定义对应的表单id，等价于业务id），导出接口不用传", dataType = "String")
     private String formId;
 
     /**
      * 审批状态类型，对应ApprovalStatusEnum
      */
     @NotEmpty(message = "审批状态类型不能为空")
-    @ApiModelProperty(value = "审批状态类型code", dataType = "String")
+    @ApiModelProperty(value = "审批状态类型code，导出接口不用传", dataType = "String")
     private String approvalStatus;
 
     @ApiModelProperty(hidden = true)
@@ -34,4 +35,7 @@
 
     @ApiModelProperty(hidden = true)
     private Long createUserId;
+
+    @ApiModelProperty(value = "导出ids", dataType = "List")
+    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificatePrintApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificatePrintApprovalListRequest.java
index b93d1c9..3cc2f4e 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificatePrintApprovalListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificatePrintApprovalListRequest.java
@@ -5,8 +5,6 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import java.util.List;
-
 /**
  * @Description:
  * @Author: wangpeng
@@ -38,7 +36,4 @@
 
     @ApiModelProperty(value = "创建结束时间", dataType = "String")
     private String createTimeEnd;
-
-    @ApiModelProperty(value = "导出ids", dataType = "List")
-    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportApprovalListRequest.java
index 4f7a038..c115847 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportApprovalListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportApprovalListRequest.java
@@ -5,8 +5,6 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import java.util.List;
-
 /**
  * @Description:
  * @Author: wangpeng
@@ -15,6 +13,8 @@
 @ApiModel
 @Data
 public class CertificateReportApprovalListRequest extends BaseApprovalListRequest {
+    @ApiModelProperty(value = "委托方id", dataType = "String")
+    private Long customerId;
 
     @ApiModelProperty(value = "证书报告编号", dataType = "String")
     private String certificateReportNo;
@@ -37,6 +37,4 @@
     @ApiModelProperty(value = "检校结束时间", dataType = "String")
     private String calibrationTimeEnd;
 
-    @ApiModelProperty(value = "导出ids", dataType = "List")
-    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/identify/IdentifyListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/identify/IdentifyListRequest.java
index 1b87ae6..f019203 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/identify/IdentifyListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/identify/IdentifyListRequest.java
@@ -4,6 +4,8 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * @Description:
  * @Author: wangpeng
@@ -26,4 +28,7 @@
 
     @ApiModelProperty(value = "打印结束时间", dataType = "String")
     private String createTimeEnd;
+
+    @ApiModelProperty(value = "导出ids", dataType = "List")
+    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListRequest.java
index 1264883..62415fb 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListRequest.java
@@ -7,6 +7,7 @@
 import lombok.Data;
 
 import javax.validation.constraints.NotBlank;
+import java.util.List;
 
 @Data
 @ApiModel
@@ -37,4 +38,6 @@
     @ApiModelProperty(value = "是否加急（1是0否null全部）", dataType = "Integer")
     private String isUrgent;
 
+    @ApiModelProperty(value = "导出ids", dataType = "List")
+    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListRequest.java
index 5201d7b..499760a 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListRequest.java
@@ -17,6 +17,9 @@
     @ApiModelProperty(value = "任务单编号", dataType = "String")
     private String orderNo;
 
+    @ApiModelProperty(value = "委托方id", dataType = "Long")
+    private Long customerId;
+
     @ApiModelProperty(value = "委托方名称", dataType = "String")
     private String customerName;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OrderSampleDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OrderSampleDTO.java
new file mode 100644
index 0000000..796edc0
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OrderSampleDTO.java
@@ -0,0 +1,19 @@
+package com.casic.missiles.dto.business.outsource;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/8/24 11:38
+ */
+@ApiModel
+@Data
+public class OrderSampleDTO {
+    @ApiModelProperty(value = "任务单id", dataType = "Long")
+    private Long orderId;
+    @ApiModelProperty(value = "受检设备id", dataType = "Long")
+    private Long sampleId;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceAssessApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceAssessApprovalListRequest.java
new file mode 100644
index 0000000..9a930c3
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceAssessApprovalListRequest.java
@@ -0,0 +1,30 @@
+package com.casic.missiles.dto.business.outsource;
+
+import com.casic.missiles.dto.BaseApprovalListRequest;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/8/24 11:01
+ */
+@ApiModel
+@Data
+public class OutsourceAssessApprovalListRequest extends BaseApprovalListRequest {
+    @ApiModelProperty(value = "评审表编号", dataType = "String")
+    private String projectNo;
+
+    @ApiModelProperty(value = "分包机构名称", dataType = "String")
+    private String outsourcerName;
+
+    @ApiModelProperty(value = "申请人", dataType = "String")
+    private String applicantName;
+
+    @ApiModelProperty(value = "申请时间开始", dataType = "String")
+    private String applicantTimeStart;
+
+    @ApiModelProperty(value = "申请时间结束", dataType = "String")
+    private String applicantTimeEnd;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceAssessSaveResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceAssessSaveResponse.java
new file mode 100644
index 0000000..8bf9aad
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceAssessSaveResponse.java
@@ -0,0 +1,20 @@
+package com.casic.missiles.dto.business.outsource;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/8/14 16:17
+ */
+@ApiModel
+@Data
+public class OutsourceAssessSaveResponse {
+    @ApiModelProperty(value = "主键id", dataType = "Long")
+    private Long id;
+
+    @ApiModelProperty(value = "编号", dataType = "String")
+    private String projectNo;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProtocolApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProtocolApprovalListRequest.java
new file mode 100644
index 0000000..0f32331
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProtocolApprovalListRequest.java
@@ -0,0 +1,30 @@
+package com.casic.missiles.dto.business.outsource;
+
+import com.casic.missiles.dto.BaseApprovalListRequest;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/8/24 15:01
+ */
+@ApiModel
+@Data
+public class OutsourceProtocolApprovalListRequest extends BaseApprovalListRequest {
+    @ApiModelProperty(value = "协议书编号", dataType = "String")
+    private String protocolNo;
+
+    @ApiModelProperty(value = "分包方名称", dataType = "String")
+    private String outsourcerName;
+
+    @ApiModelProperty(value = "申请人", dataType = "String")
+    private String applicantName;
+
+    @ApiModelProperty(value = "申请时间开始", dataType = "String")
+    private String applicantTimeStart;
+
+    @ApiModelProperty(value = "申请时间结束", dataType = "String")
+    private String applicantTimeEnd;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProtocolSaveResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProtocolSaveResponse.java
new file mode 100644
index 0000000..e324967
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProtocolSaveResponse.java
@@ -0,0 +1,20 @@
+package com.casic.missiles.dto.business.outsource;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/8/14 16:17
+ */
+@ApiModel
+@Data
+public class OutsourceProtocolSaveResponse {
+    @ApiModelProperty(value = "主键id", dataType = "Long")
+    private Long id;
+
+    @ApiModelProperty(value = "编号", dataType = "String")
+    private String protocolNo;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveApprovalListRequest.java
index f29f4e4..7047c28 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveApprovalListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveApprovalListRequest.java
@@ -5,8 +5,6 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import java.util.List;
-
 /**
  * @Description: 现场检测审批列表请求实体
  * @Author: wangpeng
@@ -30,7 +28,4 @@
     @ApiModelProperty(value = "申请时间结束", dataType = "String")
     private String applyTimeEnd;
 
-    @ApiModelProperty(value = "导出ids", dataType = "List")
-    private List<Long> ids;
-
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveDetailResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveDetailResponse.java
index 1f28752..394c934 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveDetailResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveDetailResponse.java
@@ -12,6 +12,18 @@
     @ApiModelProperty(value = "id，更新/删除使用参数", dataType = "Long")
     private Long id;
 
+    @ApiModelProperty(value = "实验室代码(字典code)", dataType = "String")
+    private String labCode;
+
+    @ApiModelProperty(value = "实验室代码(字典value)", dataType = "String")
+    private String labCodeName;
+
+    @ApiModelProperty(value = "组别代码(字典code)", dataType = "String")
+    private String groupCode;
+
+    @ApiModelProperty(value = "组别代码(字典value)", dataType = "String")
+    private String groupCodeName;
+
     @ApiModelProperty(value = "审批编号", dataType = "String")
     private String siteExecutiveNo;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/environment/LocationListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/environment/LocationListRequest.java
new file mode 100644
index 0000000..13d03c3
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/environment/LocationListRequest.java
@@ -0,0 +1,20 @@
+package com.casic.missiles.dto.resource.environment;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/6/8 13:56
+ */
+@ApiModel
+@Data
+public class LocationListRequest {
+    @ApiModelProperty(value = "地点编号", dataType = "String")
+    private String locationNo;
+
+    @ApiModelProperty(value = "地点名称", dataType = "String")
+    private String locationName;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/environment/LocationListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/environment/LocationListResponse.java
new file mode 100644
index 0000000..4c531af
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/environment/LocationListResponse.java
@@ -0,0 +1,78 @@
+package com.casic.missiles.dto.resource.environment;
+
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
+import com.baomidou.mybatisplus.annotation.TableField;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description: 地点列表响应实体
+ * @Author: wangpeng
+ * @Date: 2023/6/8 13:53
+ */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
+@ApiModel
+@Data
+public class LocationListResponse {
+    @ApiModelProperty(value = "主键id", dataType = "Long")
+    private Long id;
+
+    /**
+     * 地点编号
+     */
+    @ExcelProperty("地点编号")
+    @ApiModelProperty(value = "地点编号", dataType = "String")
+    private String locationNo;
+
+    /**
+     * 地点名称
+     */
+    @ExcelProperty("地点名称")
+    @ApiModelProperty(value = "地点名称", dataType = "String")
+    private String locationName;
+
+    /**
+     * 地点位置
+     */
+    @ExcelProperty("地点位置")
+    @ApiModelProperty(value = "地点位置", dataType = "String")
+    private String locationPosition;
+
+    /**
+     * 创建人id
+     */
+    @ApiModelProperty(value = "创建人id", dataType = "Long")
+    private Long createUserId;
+
+    /**
+     * 创建人
+     */
+    @ExcelProperty("创建人")
+    @ApiModelProperty(value = "创建人", dataType = "String")
+    @TableField("create_user")
+    private String createUser;
+
+    /**
+     * 创建时间
+     */
+    @ExcelProperty("创建时间")
+    @ApiModelProperty(value = "创建时间", dataType = "String")
+    private String createTime;
+
+    /**
+     * 更新时间
+     */
+    @ApiModelProperty(value = "更新时间", dataType = "String")
+    private String updateTime;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertRequest.java
index 9a7f6c6..c827915 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertRequest.java
@@ -4,6 +4,8 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * @Description:
  * @Author: wangpeng
@@ -16,4 +18,7 @@
     private String name;
     @ApiModelProperty(value = "部门名", dataType = "String")
     private String deptName;
+
+    @ApiModelProperty(value = "导出ids", dataType = "List")
+    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertResponse.java
index f78b159..8f2f79e 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertResponse.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.dto.resource.staff;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.casic.missiles.annotation.DictCodeField;
 import com.casic.missiles.constants.MeterDictCode;
 import io.swagger.annotations.ApiModel;
@@ -13,12 +20,18 @@
  * @Author: wangpeng
  * @Date: 2023/7/27 15:13
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @ApiModel
 @Data
 public class StaffCertResponse {
     /**
      * 人员编号
      */
+    @ExcelProperty(value = "人员编号",order = 0)
     @NotEmpty(message = "人员编号不能为空")
     @ApiModelProperty(value = "人员编号", dataType = "String")
     private String staffNo;
@@ -26,6 +39,7 @@
     /**
      * 姓名
      */
+    @ExcelProperty(value = "姓名",order = 1)
     @ApiModelProperty(value = "姓名", dataType = "String")
     private String staffName;
 
@@ -54,6 +68,7 @@
     /**
      * 部门名字
      */
+    @ExcelProperty(value = "工作部门",order = 2)
     @ApiModelProperty(value = "部门名字", dataType = "String")
     private String deptName;
 
@@ -66,6 +81,7 @@
     /**
      * 计量专业
      */
+    @ExcelProperty(value = "计量专业",order = 3)
     @ApiModelProperty(value = "计量专业", dataType = "String")
     private String major;
 
@@ -110,6 +126,7 @@
     /**
      * 证书号
      */
+    @ExcelProperty(value = "证号",order = 4)
     @ApiModelProperty(value = "证书号", dataType = "String")
     private String certNo;
 
@@ -122,12 +139,14 @@
     /**
      * 有效日期
      */
+    @ExcelProperty(value = "证书有效期",order = 6)
     @ApiModelProperty(value = "有效日期", dataType = "String")
     private String effectiveDate;
 
     /**
      * 发放日期
      */
+    @ExcelProperty(value = "发证日期",order = 5)
     @ApiModelProperty(value = "发放日期", dataType = "String")
     private String grantDate;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffListRequest.java
index 7c4afb3..0a1194a 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffListRequest.java
@@ -4,6 +4,8 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * @Description:
  * @Author: wangpeng
@@ -18,4 +20,7 @@
     private String deptName;
     @ApiModelProperty(value = "部门id", dataType = "Long")
     private Long deptId;
+
+    @ApiModelProperty(value = "导出ids", dataType = "List")
+    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/TrainListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/TrainListRequest.java
index f68597b..6321f8b 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/TrainListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/TrainListRequest.java
@@ -14,6 +14,8 @@
 public class TrainListRequest {
     @ApiModelProperty(value = "训练登记表编号", dataType = "String")
     private String trainNo;
+    @ApiModelProperty(value = "值班领导", dataType = "String")
+    private String dutyLeader;
     @ApiModelProperty(value = "创建开始时间", dataType = "String")
     private String createTimeStart;
     @ApiModelProperty(value = "创建结束时间", dataType = "String")
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/SignAddRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/SignAddRequest.java
index 117be34..d71055c 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/SignAddRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/SignAddRequest.java
@@ -43,13 +43,6 @@
     private Long signUserId;
 
     /**
-     * 签章或签名-字典code
-     */
-    @NotBlank(message = "类型不能为空")
-    @ApiModelProperty(value = "签名/签章-字典code", dataType = "String", required = true)
-    private String signType;
-
-    /**
      * minio存储文件名
      */
     @ApiModelProperty(value = "上传文件返回名称", dataType = "String")
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateAddRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateAddRequest.java
index aff1265..6316648 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateAddRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateAddRequest.java
@@ -17,30 +17,28 @@
 @Data
 public class TemplateAddRequest extends BaseSystemRequest {
     /**
-     * 原始记录模板/证书报告模板名称
+     * 模板名称
      */
     @ApiModelProperty(value = "名称", dataType = "String", required = true)
     @NotBlank(message = "名称不能为空")
     private String templateName;
 
     /**
-     * 原始记录模板/证书报告模板描述
+     * 模板描述
      */
     @ApiModelProperty(value = "描述", dataType = "String")
     private String templateDesc;
 
     /**
-     * 原始记录模板/证书报告模板创建人
+     * 创建人
      */
     @ApiModelProperty(value = "创建人", dataType = "String", required = true)
     @NotBlank(message = "创建人不能为空")
     private String templateCreator;
 
-    /**
-     * 原始记录模板/证书报告模板-字典code
-     */
-    @NotBlank(message = "类型不能为空")
-    @ApiModelProperty(value = "原始记录模板/证书报告模板-字典code", dataType = "String", required = true)
+
+    @NotBlank(message = "模板类型不能为空")
+    @ApiModelProperty(value = "模板类型(字典code)", dataType = "String", required = true)
     private String templateType;
 
     /**
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateListRequest.java
index eec5a1e..6d17bbe 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateListRequest.java
@@ -1,11 +1,12 @@
 package com.casic.missiles.dto.system;
 
+import com.casic.missiles.annotation.DictCodeField;
+import com.casic.missiles.constants.MeterDictCode;
 import com.casic.missiles.dto.BaseSystemRequest;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import javax.validation.constraints.NotBlank;
 import java.util.List;
 
 /**
@@ -19,8 +20,8 @@
     /**
      * 类型
      */
-//    @ApiModelProperty(value = "类型-字典code", dataType = "String", required = true)
-    @NotBlank(message = "类型不能为空")
+    @DictCodeField(message = "模板类型不合法", cacheName = MeterDictCode.TEMPLATE_TYPE)
+    @ApiModelProperty(value = "模板类型(字典code)", dataType = "String")
     private String templateType;
 
     /**
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificateChangeApply.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificateChangeApply.java
index 9216308..36923fd 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificateChangeApply.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificateChangeApply.java
@@ -1,11 +1,19 @@
 package com.casic.missiles.model.business;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 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 com.casic.missiles.dto.BaseRequest;
+import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -20,6 +28,12 @@
  * @author wangpeng
  * @since 2023-08-15
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
+@ApiModel
 @Data
 @TableName("biz_business_certificate_change_apply")
 public class BizBusinessCertificateChangeApply extends BaseRequest implements Serializable {
@@ -33,6 +47,7 @@
     /**
      * 申请单编号
      */
+    @ExcelProperty(value = "申请单编号", order = 1)
     @ApiModelProperty(value = "申请单编号", dataType = "String")
     @TableField("change_apply_no")
     private String changeApplyNo;
@@ -40,6 +55,7 @@
     /**
      * 申请单名字
      */
+    @ExcelProperty(value = "申请单名称", order = 2)
     @ApiModelProperty(value = "申请单名字", dataType = "String")
     @TableField("change_apply_name")
     private String changeApplyName;
@@ -54,6 +70,7 @@
     /**
      * 更换证书编号
      */
+    @ExcelProperty(value = "更换证书编号", order = 3)
     @ApiModelProperty(value = "更换证书编号", dataType = "String")
     @TableField("change_report_no")
     private String changeReportNo;
@@ -61,7 +78,8 @@
     /**
      * 更换证书名字
      */
-    @ApiModelProperty(value = "更换证书名字", dataType = "String")
+    @ExcelProperty(value = "更换证书/报告名称", order = 4)
+    @ApiModelProperty(value = "更换证书/报告名称", dataType = "String")
     @TableField("change_report_name")
     private String changeReportName;
 
@@ -73,6 +91,7 @@
     @TableField("change_type")
     private String changeType;
 
+    @ExcelProperty(value = "变更类型", order = 5)
     @ApiModelProperty(value = "变更类型(字典value)", dataType = "String")
     @TableField(exist = false)
     private String changeTypeName;
@@ -142,13 +161,15 @@
     /**
      * 创建用户名字
      */
-    @ApiModelProperty(value = "创建用户名字", dataType = "String")
+    @ExcelProperty(value = "创建人", order = 6)
+    @ApiModelProperty(value = "创建人名字", dataType = "String")
     @TableField("create_user_name")
     private String createUserName;
 
     /**
      * 创建时间
      */
+    @ExcelProperty(value = "创建时间", order = 7)
     @ApiModelProperty(value = "创建时间", dataType = "String")
     @TableField("create_time")
     private String createTime;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificateReport.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificateReport.java
index f01db9e..db06018 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificateReport.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificateReport.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.model.business;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -22,6 +29,11 @@
  * @author wangpeng
  * @since 2023-08-14
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @ApiModel
 @Data
 @TableName("biz_business_certificate_report")
@@ -36,6 +48,7 @@
     /**
      * 证书报告编号
      */
+    @ExcelProperty(value = "证书报告编号", order = 1)
     @ApiModelProperty(value = "证书报告编号", dataType = "String")
     @TableField("certificate_report_no")
     private String certificateReportNo;
@@ -43,6 +56,7 @@
     /**
      * 证书报告名称
      */
+    @ExcelProperty(value = "证书报告名称", order = 2)
     @ApiModelProperty(value = "证书报告名称", dataType = "String")
     @TableField("certificate_report_name")
     private String certificateReportName;
@@ -62,6 +76,7 @@
     @TableField("measure_category")
     private String measureCategory;
 
+    @ExcelProperty(value = "检校类别", order = 6)
     @ApiModelProperty(value = "检校类别(字典value)", dataType = "String")
     @TableField(exist = false)
     private String measureCategoryName;
@@ -69,6 +84,7 @@
     /**
      * 检校时间
      */
+    @ExcelProperty(value = "检校时间", order = 8)
     @ApiModelProperty(value = "检校时间", dataType = "String")
     @TableField("calibration_time")
     private String calibrationTime;
@@ -267,18 +283,22 @@
     @TableField(exist = false)
     private Integer decisionItem;
 
-    @ApiModelProperty(value = "设备样品编号（列表返回参数）", dataType = "String")
+    @ExcelProperty(value = "被检设备统一编号", order = 3)
+    @ApiModelProperty(value = "被检设备统一编号（列表返回参数）", dataType = "String")
     @TableField(exist = false)
     private String sampleNo;
 
-    @ApiModelProperty(value = "设备样品名称（列表返回参数）", dataType = "String")
+    @ExcelProperty(value = "被检设备名称", order = 4)
+    @ApiModelProperty(value = "被检设备名称（列表返回参数）", dataType = "String")
     @TableField(exist = false)
     private String sampleName;
 
-    @ApiModelProperty(value = "设备样品规格型号（列表返回参数）", dataType = "String")
+    @ExcelProperty(value = "规格型号", order = 5)
+    @ApiModelProperty(value = "规格型号（列表返回参数）", dataType = "String")
     @TableField(exist = false)
     private String sampleModel;
 
+    @ExcelProperty(value = "检定员", order = 7)
     @ApiModelProperty(value = "检定员名字（列表返回参数）", dataType = "String")
     @TableField(exist = false)
     private String staffName;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessIdentifyInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessIdentifyInfo.java
index 46bfba5..f1a9bec 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessIdentifyInfo.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessIdentifyInfo.java
@@ -1,10 +1,15 @@
 package com.casic.missiles.model.business;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 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;
 
@@ -20,6 +25,11 @@
  * @author wangpeng
  * @since 2023-08-15
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @Data
 @TableName("biz_business_identify_info")
 public class BizBusinessIdentifyInfo implements Serializable {
@@ -33,6 +43,7 @@
     /**
      * 记录编号
      */
+    @ExcelProperty(value = "记录编号", order = 1)
     @ApiModelProperty(value = "记录编号", dataType = "String")
     @TableField("record_no")
     private String recordNo;
@@ -41,20 +52,15 @@
      * 标志类型(字典code)
      */
     @NotEmpty(message = "标志类型不能为空")
-    @ApiModelProperty(value = "标志类型(字典code)", dataType = "String")
-    @DictCodeField(message = "标志类型不合法", cacheName = MeterDictCode.IDENTIFY_PRINT_TYPE)
+    @ApiModelProperty(value = "标志类型(直接存计量标识/使用状态/校准状态的字典value)", dataType = "String")
     @TableField("identify_type")
     private String identifyType;
 
-    @ApiModelProperty(value = "标志类型(字典value)", dataType = "String")
-    @TableField(exist = false)
-    private String identifyTypeName;
-
     /**
      * 设备id(可以是受检设备/设备台账)
      */
     @NotNull(message = "设备id不能为空")
-    @ApiModelProperty(value = "设备id(可以是受检设备/设备台账)", dataType = "String")
+    @ApiModelProperty(value = "设备id(可以是受检设备/设备台账)", dataType = "Long")
     @TableField("device_id")
     private Long deviceId;
 
@@ -66,29 +72,32 @@
     @TableField("device_type")
     private String deviceType;
 
+    @ExcelProperty(value = "统一编号", order = 3)
     @NotEmpty(message = "设备编号不能为空")
-    @ApiModelProperty(value = "设备编号", dataType = "String")
+    @ApiModelProperty(value = "统一编号", dataType = "String")
     @TableField("device_no")
     private String deviceNo;
 
     /**
      * 设备名字
      */
-    @NotEmpty(message = "设备名字不能为空")
-    @ApiModelProperty(value = "设备名字", dataType = "String")
+    @ExcelProperty(value = "设备名称", order = 4)
+    @NotEmpty(message = "设备名称不能为空")
+    @ApiModelProperty(value = "设备名称", dataType = "String")
     @TableField("device_name")
     private String deviceName;
 
     /**
      * 检定员id
      */
-    @ApiModelProperty(value = "检定员id", dataType = "String")
+    @ApiModelProperty(value = "检定员id", dataType = "Long")
     @TableField("measure_person_id")
     private Long measurePersonId;
 
     /**
      * 检定员名字
      */
+    @ExcelProperty(value = "检定员", order = 5)
     @ApiModelProperty(value = "检定员名字", dataType = "String")
     @TableField("measure_person")
     private String measurePerson;
@@ -103,7 +112,8 @@
     /**
      * 更新时间
      */
-    @ApiModelProperty(value = "更新时间", dataType = "String")
+    @ExcelProperty(value = "打印时间", order = 6)
+    @ApiModelProperty(value = "打印时间", dataType = "String")
     @TableField("update_time")
     private String updateTime;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceAssess.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceAssess.java
index 659d9ca..6720b90 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceAssess.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceAssess.java
@@ -1,11 +1,26 @@
 package com.casic.missiles.model.business;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 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 com.casic.missiles.dto.BaseRequest;
+import com.casic.missiles.dto.business.outsource.OrderSampleDTO;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import javax.validation.constraints.NotEmpty;
 import java.io.Serializable;
+import java.util.List;
 
 /**
  * <p>
@@ -15,146 +30,231 @@
  * @author wangpeng
  * @since 2023-08-16
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
+@ApiModel
 @Data
 @TableName("biz_business_outsource_assess")
-public class BizBusinessOutsourceAssess implements Serializable {
+public class BizBusinessOutsourceAssess extends BaseRequest implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
+    @ApiModelProperty(value = "id，更新/删除使用参数", dataType = "Long")
     @TableId("id")
     private Long id;
 
     /**
      * 评审表编号
      */
+    @ExcelProperty(value = "评审表编号", order = 1)
+    @ApiModelProperty(value = "评审表编号(后台生成)", dataType = "String")
     @TableField("project_no")
     private String projectNo;
 
     /**
      * 评审表名称
      */
+    @ExcelProperty(value = "评审表名称", order = 2)
+    @ApiModelProperty(value = "评审表名称", dataType = "String")
     @TableField("project_name")
     private String projectName;
 
+    @NotEmpty(message = "实验室代码不能为空")
+    @DictCodeField(message = "实验室代码描述不合法", cacheName = MeterDictCode.LAB_CODE)
+    @ApiModelProperty(value = "实验室代码(字典code)", dataType = "String")
+    @TableField("lab_code")
+    private String labCode;
+
+    @ApiModelProperty(value = "实验室代码(字典value)", dataType = "String")
+    @TableField(exist = false)
+    private String labCodeName;
+
+    /**
+     * 组别代码
+     */
+    @NotEmpty(message = "组别代码不能为空")
+    @DictCodeField(message = "组别代码描述不合法", cacheName = MeterDictCode.GROUP_CODE)
+    @ApiModelProperty(value = "组别代码(字典code)", dataType = "String")
+    @TableField("group_code")
+    private String groupCode;
+
+    @ApiModelProperty(value = "组别代码(字典value)", dataType = "String")
+    @TableField(exist = false)
+    private String groupCodeName;
+
     /**
      * 申请人id
      */
+    @ApiModelProperty(value = "申请人id", dataType = "String")
     @TableField("applicant_id")
     private Long applicantId;
 
     /**
      * 申请人名字
      */
+    @ExcelProperty(value = "申请人", order = 5)
+    @ApiModelProperty(value = "申请人", dataType = "String")
     @TableField("applicant_name")
     private String applicantName;
 
     /**
      * 申请时间
      */
+    @ExcelProperty(value = "申请时间", order = 6)
+    @ApiModelProperty(value = "申请时间", dataType = "String")
     @TableField("applicant_time")
     private String applicantTime;
 
     /**
      * 附件(minio存储文件名)
      */
+    @ApiModelProperty(value = "附件(minio存储文件名)", dataType = "String")
     @TableField("minio_file_name")
     private String minioFileName;
 
     /**
      * 备注
      */
+    @ApiModelProperty(value = "备注", dataType = "String")
     @TableField("remark")
     private String remark;
 
     /**
      * 创建人id
      */
+    @ApiModelProperty(value = "创建人id", dataType = "String")
     @TableField("create_user_id")
     private Long createUserId;
 
     /**
      * 创建人名字
      */
+    @ApiModelProperty(value = "创建人名字", dataType = "String")
     @TableField("create_user_name")
     private String createUserName;
 
     /**
      * 分包方id
      */
+    @ApiModelProperty(value = "评审表编号", dataType = "String")
     @TableField("outsourcer_id")
     private Long outsourcerId;
 
     /**
      * 预计开始时间
      */
+    @ApiModelProperty(value = "预计开始时间", dataType = "String")
     @TableField("pre_start_time")
     private String preStartTime;
 
     /**
      * 预计结束时间
      */
+    @ApiModelProperty(value = "预计结束时间", dataType = "String")
     @TableField("pre_end_time")
     private String preEndTime;
 
     /**
      * 分包原因-字典
      */
+    @ApiModelProperty(value = "分包原因(字典code)", dataType = "String")
+    @DictCodeField(message = "分包原因描述不合法", cacheName = MeterDictCode.OUTSOURCE_REASON)
     @TableField("outsource_reason")
     private String outsourceReason;
 
+    @ApiModelProperty(value = "分包原因(字典value)", dataType = "String")
+    @TableField(exist = false)
+    private String outsourceReasonName;
+
     /**
      * 预计费用
      */
+    @ApiModelProperty(value = "预计费用", dataType = "String")
     @TableField("pre_cost")
     private String preCost;
 
     /**
      * 审批状态
      */
+    @ApiModelProperty(value = "审批状态", dataType = "String")
+    @DictCodeField(message = "审批状态描述不合法", cacheName = MeterDictCode.APPROVAL_STATUS)
     @TableField("approval_status")
     private String approvalStatus;
 
     /**
      * 流程实例id
      */
+    @ApiModelProperty(value = "流程实例id", dataType = "String")
     @TableField("process_id")
     private String processId;
 
     /**
      * 实验室认可情况
      */
+    @ApiModelProperty(value = "实验室认可情况", dataType = "String")
     @TableField("approve_situation")
     private String approveSituation;
 
     /**
      * 溯源性
      */
+    @ApiModelProperty(value = "溯源性", dataType = "String")
     @TableField("traceability")
     private String traceability;
 
     /**
      * 测试方法
      */
+    @ApiModelProperty(value = "测试方法", dataType = "String")
     @TableField("test_method")
     private String testMethod;
 
     /**
      * 技术能力
      */
+    @ApiModelProperty(value = "技术能力", dataType = "String")
     @TableField("technique_ability")
     private String techniqueAbility;
 
     /**
      * 创建时间
      */
+    @ApiModelProperty(hidden = true)
     @TableField("create_time")
     private String createTime;
 
     /**
      * 更新时间
      */
+    @ApiModelProperty(hidden = true)
     @TableField("update_time")
     private String updateTime;
 
+    @ApiModelProperty(value = "审批状态类型-字典value", dataType = "String")
+    @TableField(exist = false)
+    private String approvalStatusName;
 
+    @ApiModelProperty(value = "任务id（同意、驳回等操作使用）", dataType = "String")
+    @TableField(exist = false)
+    private String taskId;
+
+    @ApiModelProperty(value = "可选决策项（1同意驳回拒绝 2同意驳回 3同意拒绝，用于待审批列表同意/驳回/拒绝按钮展示）", dataType = "Integer")
+    @TableField(exist = false)
+    private Integer decisionItem;
+
+    @NotEmpty(message = "受检设备信息不能为空")
+    @ApiModelProperty(value = "受检设备id列表（新建使用参数）", dataType = "List")
+    @TableField(exist = false)
+    private List<OrderSampleDTO> orderSampleList;
+
+    @ExcelProperty(value = "分包机构名称", order = 3)
+    @ApiModelProperty(value = "分包机构名称（列表返回参数）", dataType = "String")
+    private String outsourcerName;
+
+    @ExcelProperty(value = "机构负责人", order = 4)
+    @ApiModelProperty(value = "机构负责人（列表返回参数）", dataType = "String")
+    private String director;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceProtocol.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceProtocol.java
new file mode 100644
index 0000000..38df697
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceProtocol.java
@@ -0,0 +1,225 @@
+package com.casic.missiles.model.business;
+
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
+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 com.casic.missiles.dto.BaseRequest;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotEmpty;
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 计量检定业务-分包管理-测试、校准或检定工作分包协议书
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-08-24
+ */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
+@Data
+@TableName("biz_business_outsource_protocol")
+public class BizBusinessOutsourceProtocol extends BaseRequest implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "id，更新/删除使用参数", dataType = "Long")
+    @TableId("id")
+    private Long id;
+
+    /**
+     * 协议书编号
+     */
+    @ExcelProperty(value = "协议书编号", order = 1)
+    @ApiModelProperty(value = "协议书编号(后台生成)", dataType = "String")
+    @TableField("protocol_no")
+    private String protocolNo;
+
+    /**
+     * 协议书名称
+     */
+    @ExcelProperty(value = "协议书名称", order = 2)
+    @ApiModelProperty(value = "协议书名称", dataType = "String")
+    @TableField("project_name")
+    private String projectName;
+
+    @NotEmpty(message = "实验室代码不能为空")
+    @DictCodeField(message = "实验室代码描述不合法", cacheName = MeterDictCode.LAB_CODE)
+    @ApiModelProperty(value = "实验室代码(字典code)", dataType = "String")
+    @TableField("lab_code")
+    private String labCode;
+
+    @ApiModelProperty(value = "实验室代码(字典value)", dataType = "String")
+    @TableField(exist = false)
+    private String labCodeName;
+
+    @NotEmpty(message = "组别代码不能为空")
+    @DictCodeField(message = "组别代码描述不合法", cacheName = MeterDictCode.GROUP_CODE)
+    @ApiModelProperty(value = "组别代码(字典code)", dataType = "String")
+    @TableField("group_code")
+    private String groupCode;
+
+    @ApiModelProperty(value = "组别代码(字典value)", dataType = "String")
+    @TableField(exist = false)
+    private String groupCodeName;
+
+    /**
+     * 分包方id
+     */
+    @ApiModelProperty(value = "分包方id", dataType = "Long")
+    @TableField("outsourcer_id")
+    private Long outsourcerId;
+
+    /**
+     * 其他
+     */
+    @ApiModelProperty(value = "其他", dataType = "String")
+    @TableField("remark")
+    private String remark;
+
+    /**
+     * 分包方编号
+     */
+    @ApiModelProperty(value = "分包方编号(新建不用传)", dataType = "String")
+    @TableField("outsource_no")
+    private String outsourceNo;
+
+    /**
+     * 分包方名称
+     */
+    @ExcelProperty(value = "分包方名称", order = 3)
+    @ApiModelProperty(value = "分包方名称(新建不用传)", dataType = "String")
+    @TableField("outsource_name")
+    private String outsourceName;
+
+    /**
+     * 联系人
+     */
+    @ExcelProperty(value = "联系人", order = 4)
+    @ApiModelProperty(value = "联系人", dataType = "String")
+    @TableField("contacts")
+    private String contacts;
+
+    /**
+     * 电话
+     */
+    @ApiModelProperty(value = "电话", dataType = "String")
+    @TableField("mobile")
+    private String mobile;
+
+    /**
+     * 地址
+     */
+    @ApiModelProperty(value = "地址", dataType = "String")
+    @TableField("address")
+    private String address;
+
+    /**
+     * 要求完成日期
+     */
+    @ApiModelProperty(value = "要求完成日期", dataType = "String")
+    @TableField("require_date")
+    private String requireDate;
+
+    /**
+     * 分包费用(元)
+     */
+    @ApiModelProperty(value = "分包费用(元)", dataType = "String")
+    @TableField("outsource_cost")
+    private Double outsourceCost;
+
+    /**
+     * 分包方负责人
+     */
+    @ApiModelProperty(value = "分包方负责人", dataType = "String")
+    @TableField("director")
+    private String director;
+
+    /**
+     * 分包项目
+     */
+    @ApiModelProperty(value = "分包项目", dataType = "String")
+    @TableField("item")
+    private String item;
+
+    /**
+     * 分包要求
+     */
+    @ApiModelProperty(value = "分包要求", dataType = "String")
+    @TableField("requires")
+    private String requires;
+
+    /**
+     * 创建人id
+     */
+    @ApiModelProperty(hidden = true)
+    @TableField("create_user_id")
+    private Long createUserId;
+
+    /**
+     * 创建人名字
+     */
+    @ExcelProperty(value = "申请人", order = 5)
+    @ApiModelProperty(value = "申请人", dataType = "String")
+    @TableField("create_user_name")
+    private String createUserName;
+
+    /**
+     * 审批状态
+     */
+    @ApiModelProperty(value = "审批状态", dataType = "String")
+    @DictCodeField(message = "审批状态描述不合法", cacheName = MeterDictCode.APPROVAL_STATUS)
+    @TableField("approval_status")
+    private String approvalStatus;
+
+    /**
+     * 流程实例id
+     */
+    @ApiModelProperty(value = "流程实例id", dataType = "String")
+    @TableField("process_id")
+    private String processId;
+
+    /**
+     * 创建时间
+     */
+    @ExcelProperty(value = "申请时间", order = 6)
+    @ApiModelProperty(value = "申请时间", dataType = "String")
+    @TableField("create_time")
+    private String createTime;
+
+    /**
+     * 更新时间
+     */
+    @ApiModelProperty(hidden = true)
+    @TableField("update_time")
+    private String updateTime;
+
+    @ApiModelProperty(value = "审批状态类型-字典value", dataType = "String")
+    @TableField(exist = false)
+    private String approvalStatusName;
+
+    @ApiModelProperty(value = "任务id（同意、驳回等操作使用）", dataType = "String")
+    @TableField(exist = false)
+    private String taskId;
+
+    @ApiModelProperty(value = "可选决策项（1同意驳回拒绝 2同意驳回 3同意拒绝，用于待审批列表同意/驳回/拒绝按钮展示）", dataType = "Integer")
+    @TableField(exist = false)
+    private Integer decisionItem;
+
+
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourcerInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourcerInfo.java
index ec4e997..f9aa69e 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourcerInfo.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourcerInfo.java
@@ -17,6 +17,7 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import javax.validation.constraints.NotEmpty;
 import java.io.Serializable;
 
 /**
@@ -59,6 +60,29 @@
     @TableField("outsourcer_name")
     private String outsourcerName;
 
+    @NotEmpty(message = "实验室代码不能为空")
+    @DictCodeField(message = "实验室代码描述不合法", cacheName = MeterDictCode.LAB_CODE)
+    @ApiModelProperty(value = "实验室代码(字典code)", dataType = "String")
+    @TableField("lab_code")
+    private String labCode;
+
+    @ApiModelProperty(value = "实验室代码(字典value)", dataType = "String")
+    @TableField(exist = false)
+    private String labCodeName;
+
+    /**
+     * 组别代码
+     */
+    @NotEmpty(message = "组别代码不能为空")
+    @DictCodeField(message = "组别代码描述不合法", cacheName = MeterDictCode.GROUP_CODE)
+    @ApiModelProperty(value = "组别代码(字典code)", dataType = "String")
+    @TableField("group_code")
+    private String groupCode;
+
+    @ApiModelProperty(value = "组别代码(字典value)", dataType = "String")
+    @TableField(exist = false)
+    private String groupCodeName;
+
     /**
      * 单位简称
      */
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardInfo.java
index c48eed7..dffdfdd 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardInfo.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardInfo.java
@@ -5,6 +5,7 @@
 import com.baomidou.mybatisplus.annotation.TableName;
 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;
 
@@ -18,6 +19,7 @@
  * @author wangpeng
  * @since 2023-08-04
  */
+@ApiModel
 @Data
 @TableName("biz_equipment_standard_info")
 public class BizEquipmentStandardInfo implements Serializable {
@@ -119,7 +121,7 @@
      * 管理状态(字典code)
      */
     @ApiModelProperty(value = "管理状态(字典code)", dataType = "String")
-    @DictCodeField(message = "管理状态不合法", cacheName = MeterDictCode.MANAGER_STATE)
+    @DictCodeField(message = "管理状态不合法", cacheName = MeterDictCode.STANDARD_MANAGER_STATE)
     @TableField("manage_status")
     private String manageStatus;
 
@@ -151,7 +153,7 @@
     /**
      * 温度(℃)
      */
-    @ApiModelProperty(value = "使用状态(字典code)", dataType = "String")
+    @ApiModelProperty(value = "温度(℃)", dataType = "String")
     @TableField("temperature")
     private Double temperature;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardInfoApproval.java b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardInfoApproval.java
index dbd86ab..9f58d83 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardInfoApproval.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardInfoApproval.java
@@ -150,7 +150,7 @@
      * 管理状态(字典code)
      */
     @ApiModelProperty(value = "管理状态(字典code)", dataType = "String")
-    @DictCodeField(message = "管理状态不合法", cacheName = MeterDictCode.MANAGER_STATE)
+    @DictCodeField(message = "管理状态不合法", cacheName = MeterDictCode.STANDARD_MANAGER_STATE)
     @TableField("manage_status")
     private String manageStatus;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardTechnologyRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardTechnologyRelation.java
index 0e612bd..751f26b 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardTechnologyRelation.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardTechnologyRelation.java
@@ -3,6 +3,7 @@
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -16,6 +17,7 @@
  * @author wangpeng
  * @since 2023-08-04
  */
+@ApiModel
 @Data
 @TableName("biz_equipment_standard_technology_relation")
 public class BizEquipmentStandardTechnologyRelation implements Serializable {
@@ -33,6 +35,10 @@
     @TableField("technology_file_id")
     private Long technologyFileId;
 
+    @ApiModelProperty(value = "依据的技术文件编号", dataType = "String")
+    @TableField("technology_file_no")
+    private String technologyFileNo;
+
     /**
      * 依据的技术文件名称(技术文件中现行测试校准检定方法表文件名字段)
      */
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerInfo.java
index d6e8bed..65cd6bc 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerInfo.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerInfo.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.model.resource;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -21,6 +28,11 @@
  * @author wangpeng
  * @since 2023-08-08
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @ApiModel
 @Data
 @TableName("biz_resource_customer_info")
@@ -35,6 +47,7 @@
     /**
      * 委托方编号
      */
+    @ExcelProperty(value = "委托方编号", order = 1)
     @ApiModelProperty(value = "委托方编号", dataType = "String")
     @TableField("customer_no")
     private String customerNo;
@@ -42,6 +55,7 @@
     /**
      * 委托方名称
      */
+    @ExcelProperty(value = "委托方名称", order = 2)
     @ApiModelProperty(value = "委托方名称(新建时为下拉选择一个受检单位组织的名字，传deptId字段，后端获取名称)", dataType = "String")
     @TableField("customer_name")
     private String customerName;
@@ -63,6 +77,7 @@
     /**
      * 联系人
      */
+    @ExcelProperty(value = "联系人", order = 3)
     @ApiModelProperty(value = "联系人", dataType = "String")
     @TableField("contacts")
     private String contacts;
@@ -70,6 +85,7 @@
     /**
      * 座机电话
      */
+    @ExcelProperty(value = "座机电话", order = 4)
     @ApiModelProperty(value = "座机电话", dataType = "String")
     @TableField("mobile")
     private String mobile;
@@ -77,6 +93,7 @@
     /**
      * 手机号码
      */
+    @ExcelProperty(value = "手机号码", order = 5)
     @ApiModelProperty(value = "手机号码", dataType = "String")
     @TableField("phone")
     private String phone;
@@ -91,6 +108,7 @@
     /**
      * 地址
      */
+    @ExcelProperty(value = "地址", order = 6)
     @ApiModelProperty(value = "地址", dataType = "String")
     @TableField("address")
     private String address;
@@ -141,6 +159,7 @@
     /**
      * 创建时间
      */
+    @ExcelProperty(value = "创建时间", order = 7)
     @ApiModelProperty(value = "创建时间", dataType = "String")
     @TableField("create_time")
     private String createTime;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerSuggestForm.java b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerSuggestForm.java
index 7201bbd..701bf8b 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerSuggestForm.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerSuggestForm.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.model.resource;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -22,6 +29,11 @@
  * @author wangpeng
  * @since 2023-08-08
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @ApiModel
 @Data
 @TableName("biz_resource_customer_suggest_form")
@@ -44,7 +56,8 @@
     /**
      * 委托方名称
      */
-    @ApiModelProperty(value = "委托方名称", dataType = "String")
+    @ExcelProperty(value = "意见反馈单位", order = 2)
+    @ApiModelProperty(value = "意见反馈单位", dataType = "String")
     @TableField("customer_name")
     private String customerName;
 
@@ -59,7 +72,8 @@
     /**
      * 委托方意见反馈部门名称
      */
-    @ApiModelProperty(value = "委托方意见反馈部门名称", dataType = "String")
+    @ExcelProperty(value = "委托方意见反馈部门", order = 3)
+    @ApiModelProperty(value = "委托方意见反馈部门", dataType = "String")
     @TableField("customer_dept_name")
     private String customerDeptName;
 
@@ -73,6 +87,7 @@
     /**
      * 表单编号
      */
+    @ExcelProperty(value = "表单编号", order = 1)
     @ApiModelProperty(value = "表单编号", dataType = "String")
     @TableField("form_no")
     private String formNo;
@@ -111,6 +126,7 @@
     /**
      * 创建人名字
      */
+    @ExcelProperty(value = "创建人", order = 4)
     @ApiModelProperty(value = "创建人名字", dataType = "String")
     @TableField("create_user_name")
     private String createUserName;
@@ -147,6 +163,7 @@
     /**
      * 创建时间
      */
+    @ExcelProperty(value = "创建时间", order = 5)
     @ApiModelProperty(value = "创建时间", dataType = "String")
     @TableField("create_time")
     private String createTime;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSealInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSealInfo.java
index cbf05d7..9bf389d 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSealInfo.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSealInfo.java
@@ -106,6 +106,10 @@
     @TableField("minio_file_name")
     private String minioFileName;
 
+    @ApiModelProperty(value = "minio存储文件url", dataType = "String")
+    @TableField(exist = false)
+    private String minioFileUrl;
+
     @ApiModelProperty(value = "创建时间", dataType = "String")
     @TableField("create_time")
     private String createTime;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSealUseNote.java b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSealUseNote.java
index 3f2d9e8..3ce16a8 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSealUseNote.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSealUseNote.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.model.resource;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -20,6 +27,11 @@
  * @author wangpeng
  * @since 2023-07-28
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @ApiModel
 @Data
 @TableName("biz_resource_seal_use_note")
@@ -34,6 +46,7 @@
     /**
      * 登记表编号
      */
+    @ExcelProperty(value = "申请单编号", order = 1)
     @ApiModelProperty(value = "登记表编号(自动生成)", dataType = "String")
     @TableField("note_form_no")
     private String noteFormNo;
@@ -55,6 +68,7 @@
     /**
      * 申请部门
      */
+    @ExcelProperty(value = "申请部门", order = 5)
     @ApiModelProperty(value = "申请部门", dataType = "String")
     @TableField("apply_dept_name")
     private String applyDeptName;
@@ -69,6 +83,7 @@
     /**
      * 申请人
      */
+    @ExcelProperty(value = "申请人", order = 6)
     @ApiModelProperty(value = "申请人", dataType = "String")
     @TableField("apply_user_name")
     private String applyUserName;
@@ -76,6 +91,7 @@
     /**
      * 申请时间
      */
+    @ExcelProperty(value = "申请时间", order = 7)
     @ApiModelProperty(value = "申请时间(新增自动获取当前时间)", dataType = "String")
     @TableField("apply_time")
     private String applyTime;
@@ -130,6 +146,26 @@
     @TableField("update_time")
     private String updateTime;
 
+    @ExcelProperty(value = "印章名称", order = 2)
+    @ApiModelProperty(value = "印章名称(列表返回参数)", dataType = "String")
+    @TableField(exist = false)
+    private String sealName;
+
+    @DictCodeField(message = "印章类型描述不合法", cacheName = MeterDictCode.SEAL_TYPE)
+    @ApiModelProperty(hidden = true)
+    @TableField(exist = false)
+    private String sealType;
+
+    @ExcelProperty(value = "印章类型", order = 3)
+    @ApiModelProperty(value = "印章类型(列表返回参数)", dataType = "String")
+    @TableField(exist = false)
+    private String sealTypeName;
+
+    @ExcelProperty(value = "批准人", order = 4)
+    @ApiModelProperty(value = "批准人(列表返回参数)", dataType = "String")
+    @TableField(exist = false)
+    private String approverName;
+
     @ApiModelProperty(value = "审批状态类型-字典value", dataType = "String")
     @TableField(exist = false)
     private String approvalStatusName;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceStaffInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceStaffInfo.java
index 5ef995b..41563a1 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceStaffInfo.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceStaffInfo.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.model.resource;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -20,6 +27,11 @@
  * @author wangpeng
  * @since 2023-07-25
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @ApiModel
 @Data
 @TableName("biz_resource_staff_info")
@@ -38,6 +50,7 @@
     /**
      * 人员编号
      */
+    @ExcelProperty(value = "人员编号",order = 0)
     @NotEmpty(message = "人员编号不能为空")
     @ApiModelProperty(value = "人员编号", dataType = "String")
     @TableField("staff_no")
@@ -46,6 +59,7 @@
     /**
      * 姓名
      */
+    @ExcelProperty(value = "姓名",order = 1)
     @ApiModelProperty(value = "姓名", dataType = "String")
     @TableField("staff_name")
     private String staffName;
@@ -152,13 +166,15 @@
     /**
      * 部门名字
      */
-    @ApiModelProperty(value = "部门名字", dataType = "String")
+    @ExcelProperty(value = "工作部门",order = 4)
+    @ApiModelProperty(value = "工作部门", dataType = "String")
     @TableField("dept_name")
     private String deptName;
 
     /**
      * 岗位
      */
+    @ExcelProperty(value = "岗位",order = 2)
     @ApiModelProperty(value = "岗位", dataType = "String")
     @TableField("station")
     private String station;
@@ -166,6 +182,7 @@
     /**
      * 计量专业
      */
+    @ExcelProperty(value = "计量专业",order = 5)
     @ApiModelProperty(value = "计量专业", dataType = "String")
     @TableField("major")
     private String major;
@@ -173,6 +190,7 @@
     /**
      * 证号
      */
+    @ExcelProperty(value = "证号",order = 3)
     @ApiModelProperty(value = "证号", dataType = "String")
     @TableField("certificate_number")
     private String certificateNumber;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSupplierInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSupplierInfo.java
index eb5ef01..a1e2697 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSupplierInfo.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSupplierInfo.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.model.resource;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -20,6 +27,11 @@
  * @author wangpeng
  * @since 2023-07-27
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @ApiModel
 @Data
 @TableName("biz_resource_supplier_info")
@@ -34,6 +46,7 @@
     /**
      * 供方编号
      */
+    @ExcelProperty(value = "供方编号", order = 1)
     @ApiModelProperty(value = "供方编号(自动生成)", dataType = "String")
     @TableField("supplier_no")
     private String supplierNo;
@@ -41,6 +54,7 @@
     /**
      * 供方名称
      */
+    @ExcelProperty(value = "供方名称", order = 2)
     @ApiModelProperty(value = "供方名称", dataType = "String")
     @TableField("supplier_name")
     private String supplierName;
@@ -60,6 +74,7 @@
     @TableField("supplier_type")
     private String supplierType;
 
+    @ExcelProperty(value = "供方类型", order = 3)
     @ApiModelProperty(value = "供方类型(字典value)", dataType = "String")
     @TableField(exist = false)
     private String supplierTypeName;
@@ -109,7 +124,8 @@
     /**
      * 电话
      */
-    @ApiModelProperty(value = "电话", dataType = "String")
+    @ExcelProperty(value = "联系电话", order = 4)
+    @ApiModelProperty(value = "联系电话", dataType = "String")
     @TableField("phone")
     private String phone;
 
@@ -158,6 +174,7 @@
     /**
      * 公司地址-省
      */
+    @ExcelProperty(value = "地址-省", order = 6)
     @ApiModelProperty(value = "公司地址-省", dataType = "String")
     @TableField("company_province_name")
     private String companyProvinceName;
@@ -172,6 +189,7 @@
     /**
      * 公司地址-市
      */
+    @ExcelProperty(value = "地址-市", order = 7)
     @ApiModelProperty(value = "公司地址-市", dataType = "String")
     @TableField("company_city_name")
     private String companyCityName;
@@ -186,6 +204,7 @@
     /**
      * 公司地址-区
      */
+    @ExcelProperty(value = "地址-区", order = 8)
     @ApiModelProperty(value = "公司地址-区", dataType = "String")
     @TableField("company_area_name")
     private String companyAreaName;
@@ -193,6 +212,7 @@
     /**
      * 公司地址-详细地址
      */
+    @ExcelProperty(value = "地址-详细地址", order = 9)
     @ApiModelProperty(value = "公司地址-详细地址", dataType = "String")
     @TableField("company_address")
     private String companyAddress;
@@ -200,6 +220,7 @@
     /**
      * 服务和供应的内容
      */
+    @ExcelProperty(value = "服务和供应的内容", order = 5)
     @ApiModelProperty(value = "服务和供应的内容", dataType = "String")
     @TableField("supplier_content")
     private String supplierContent;
@@ -250,6 +271,7 @@
     /**
      * 创建时间
      */
+    @ExcelProperty(value = "创建时间", order = 9)
     @ApiModelProperty(value = "创建时间", dataType = "String")
     @TableField("create_time")
     private String createTime;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/EnvLocationInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/EnvLocationInfo.java
new file mode 100644
index 0000000..d8e2d7b
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/EnvLocationInfo.java
@@ -0,0 +1,83 @@
+package com.casic.missiles.model.resource;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotEmpty;
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 实验室环境监控系统-设备表
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-06-07
+ */
+@ApiModel
+@Data
+@TableName("env_location_info")
+public class EnvLocationInfo implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "主键id", dataType = "Long")
+    @TableId("id")
+    private Long id;
+
+    /**
+     * 地点编号
+     */
+    @NotEmpty(message = "地点编号不能为空")
+    @ApiModelProperty(value = "地点编号", dataType = "String")
+    @TableField("location_no")
+    private String locationNo;
+
+    /**
+     * 地点名称
+     */
+    @ApiModelProperty(value = "地点名称", dataType = "String")
+    @TableField("location_name")
+    private String locationName;
+
+    /**
+     * 地点位置
+     */
+    @ApiModelProperty(value = "地点位置", dataType = "String")
+    @TableField("location_position")
+    private String locationPosition;
+
+    /**
+     * 创建人id
+     */
+    @ApiModelProperty(value = "创建人id", dataType = "Long")
+    @TableField("create_user_id")
+    private Long createUserId;
+
+    /**
+     * 创建人
+     */
+    @ApiModelProperty(value = "创建人", dataType = "String")
+    @TableField("create_user")
+    private String createUser;
+
+    /**
+     * 创建时间
+     */
+    @ApiModelProperty(value = "创建时间", dataType = "String")
+    @TableField("create_time")
+    private String createTime;
+
+    /**
+     * 更新时间
+     */
+    @ApiModelProperty(value = "更新时间", dataType = "String")
+    @TableField("update_time")
+    private String updateTime;
+
+
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemFileConfig.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemFileConfig.java
index 19e6845..86e569c 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemFileConfig.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemFileConfig.java
@@ -30,7 +30,7 @@
     @ApiModelProperty(value = "系统类别(1业务系统2受检系统3环境系统)", dataType = "Integer")
     @NotNull(message = "系统类别不能为空")
     @TableField("system_type")
-    private Integer systemType;
+    private Integer systemType = 1;
 
     @ApiModelProperty("下载编号")
     @TableField("download_no")
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemNotice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemNotice.java
index e94297d..06ec37d 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemNotice.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemNotice.java
@@ -34,7 +34,7 @@
     @ApiModelProperty(value = "系统类别(1业务系统2受检系统3环境系统)", dataType = "Integer")
     @NotNull(message = "系统类别不能为空")
     @TableField("system_type")
-    private Integer systemType;
+    private Integer systemType = 1;
 
     /**
      * 通知公告编号
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSign.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSign.java
index 6c0d7c9..954f4f8 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSign.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSign.java
@@ -51,7 +51,7 @@
     @ApiModelProperty(value = "系统类别(1业务系统2受检系统3环境系统)", dataType = "Integer")
     @NotNull(message = "系统类别不能为空")
     @TableField("system_type")
-    private Integer systemType;
+    private Integer systemType = 1;
 
     /**
      * 签名编号
@@ -130,4 +130,8 @@
     @TableField(exist = false)
     private List<Long> userIdList;
 
+    @ApiModelProperty(hidden = true)
+    @TableField(exist = false)
+    private String deptName;
+
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemTemplate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemTemplate.java
index 503a457..1d27ebe 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemTemplate.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemTemplate.java
@@ -47,7 +47,7 @@
     @ApiModelProperty(value = "系统类别(1业务系统2受检系统3环境系统)", dataType = "Integer")
     @NotNull(message = "系统类别不能为空")
     @TableField("system_type")
-    private Integer systemType;
+    private Integer systemType = 1;
 
     /**
      * 模板编号
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java
index 8c21cb0..f61e4a8 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java
@@ -32,4 +32,8 @@
     ReturnDTO approvalDelete(ApprovalDeleteRequest request);
 
     ReturnDTO failUpdate(T request);
+
+    List<O> listExport(R request);
+
+    List<O> listExportByIds(List<Long> ids);
 }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java
index 724166f..9bce15b 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java
@@ -157,6 +157,29 @@
         throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
     }
 
+    @Override
+    public List<O> listExport(R request) {
+        request.setCreateUserId(null);
+        request.setApprovalStatus(ApprovalStatusEnum.PASSED);
+        Page<O> page = PageFactory.defaultPage();
+        page.setCurrent(1);
+        page.setSearchCount(false);
+        page.setSize(Integer.MAX_VALUE);
+        Page<O> resultPage = this.baseMapper.selectBatchForApprovalList(page, request, null);
+        return resultPage.getRecords();
+    }
+
+    @Override
+    public List<O> listExportByIds(List<Long> ids) {
+        Page<O> page = PageFactory.defaultPage();
+        page.setCurrent(1);
+        page.setSearchCount(false);
+        page.setSize(Integer.MAX_VALUE);
+        List<String> businessKeys = ids.stream().map(String::valueOf).collect(Collectors.toList());
+        Page<O> resultPage = this.baseMapper.selectBatchForApprovalList(page, null, businessKeys);
+        return resultPage.getRecords();
+    }
+
     protected ReturnDTO updateApprovalStatus(Long id, String processId, String approvalStatus) {
         UpdateWrapper<T> updateWrapper = new UpdateWrapper<>();
         updateWrapper.eq("id", id);
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificatePrintServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificatePrintServiceImpl.java
index f6e4706..3228497 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificatePrintServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificatePrintServiceImpl.java
@@ -162,6 +162,30 @@
         return ReturnUtil.success(printLogMapper.selectList(wrapper));
     }
 
+    @Override
+    public List<CertificatePrintListResponse> listByIds(List<Long> ids) {
+        Page<CertificatePrintListResponse> page = PageFactory.defaultPage();
+        page.setCurrent(1);
+        page.setSearchCount(false);
+        page.setSize(Integer.MAX_VALUE);
+        List<String> businessKeys = ids.stream().map(String::valueOf).collect(Collectors.toList());
+        Page<CertificatePrintListResponse> resultPage = this.baseMapper.selectBatchForApprovalList(page, null, businessKeys);
+        return resultPage.getRecords();
+    }
+
+    @Override
+    public List<CertificatePrintListResponse> list(CertificatePrintApprovalListRequest request) {
+        request.setCreateUserId(null);
+        request.setApprovalStatus(null);
+        request.setPrintStatus(null);
+        Page<CertificatePrintListResponse> page = PageFactory.defaultPage();
+        page.setCurrent(1);
+        page.setSearchCount(false);
+        page.setSize(Integer.MAX_VALUE);
+        Page<CertificatePrintListResponse> resultPage = certificatePrintMapper.selectBatchForApprovalList(page, request, null);
+        return resultPage.getRecords();
+    }
+
     private void savePrintLog(Long id) {
         BizBusinessCertificatePrintLog printLog = new BizBusinessCertificatePrintLog();
         BizBusinessCertificatePrint certificatePrint = certificatePrintMapper.selectById(id);
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificateReportServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificateReportServiceImpl.java
index 457555f..24146be 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificateReportServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificateReportServiceImpl.java
@@ -158,8 +158,8 @@
         QueryWrapper<BizBusinessCertificateMeasureResultData> mWrapper = new QueryWrapper<>();
         mWrapper.eq("report_id", reportId);
         boolean mRemove = certificateMeasureResultDataService.remove(mWrapper);
-        Assert.isFalse(eRemove || mRemove, () -> {
+        if(!eRemove || !mRemove){
             throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
-        });
+        }
     }
 }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessIdentifyInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessIdentifyInfoServiceImpl.java
index 4c8e190..f7e63ca 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessIdentifyInfoServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessIdentifyInfoServiceImpl.java
@@ -1,8 +1,10 @@
 package com.casic.missiles.service.Impl.business;
 
+import cn.hutool.core.date.DateUtil;
 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.core.page.PageFactory;
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.business.identify.IdentifyListRequest;
@@ -14,11 +16,14 @@
 import com.casic.missiles.service.business.IBizBusinessIdentifyInfoService;
 import com.casic.missiles.utils.DictCodeUtils;
 import com.casic.missiles.utils.NumberGeneratorUtil;
+import com.casic.missiles.utils.QRCodeUtil;
 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.List;
+
 /**
  * <p>
  * 计量检定业务-任务计量管理-标识打印 服务实现类
@@ -35,9 +40,9 @@
     @Override
     public Page<BizBusinessIdentifyInfo> identifyListPage(Page<BizBusinessIdentifyInfo> page, IdentifyListRequest request) throws Exception {
         QueryWrapper<BizBusinessIdentifyInfo> wrapper = new QueryWrapper<>();
-        wrapper.eq("identify_type", request.getIdentifyType());
-        wrapper.like("device_no", request.getDeviceNo());
-        wrapper.like("device_name", request.getDeviceName());
+        wrapper.eq(StringUtils.isNotEmpty(request.getIdentifyType()), "identify_type", request.getIdentifyType());
+        wrapper.like(StringUtils.isNotEmpty(request.getDeviceNo()),"device_no", request.getDeviceNo());
+        wrapper.like(StringUtils.isNotEmpty(request.getDeviceName()), "device_name", request.getDeviceName());
         wrapper.apply(StringUtils.isNotBlank(request.getCreateTimeStart()),
                 "{0} <= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getCreateTimeStart().split(" ")[0]);
         wrapper.apply(StringUtils.isNotBlank(request.getCreateTimeEnd()),
@@ -64,8 +69,11 @@
     }
 
     @Override
-    public ReturnDTO updateIdentify(BizBusinessIdentifyInfo identifyInfo) {
-        if(identifyInfoMapper.updateById(identifyInfo) > 0){
+    public ReturnDTO updateIdentify(Long id) {
+        BizBusinessIdentifyInfo info = new BizBusinessIdentifyInfo();
+        info.setId(id);
+        info.setUpdateTime(DateUtil.now());
+        if(identifyInfoMapper.updateById(info) > 0){
             return ReturnUtil.success();
         }
         throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
@@ -79,4 +87,20 @@
         throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
     }
 
+    @Override
+    public List<BizBusinessIdentifyInfo> list(IdentifyListRequest request) throws Exception {
+        Page<BizBusinessIdentifyInfo> page = PageFactory.defaultPage();
+        page.setCurrent(1);
+        page.setSearchCount(false);
+        page.setSize(Integer.MAX_VALUE);
+        Page<BizBusinessIdentifyInfo> resultPage = this.identifyListPage(page, request);
+        return resultPage.getRecords();
+    }
+
+    @Override
+    public ReturnDTO<String> equipmentQrCode(Long id) {
+        String base64QRCode = QRCodeUtil.getBase64QRCode(String.valueOf(id));
+        return ReturnUtil.success(base64QRCode);
+    }
+
 }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOrderInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOrderInfoServiceImpl.java
index 82952ad..d8d2c6a 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOrderInfoServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOrderInfoServiceImpl.java
@@ -35,6 +35,7 @@
 import javax.servlet.http.HttpServletResponse;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 import java.util.stream.Collectors;
 
 /**
@@ -209,13 +210,16 @@
     private QueryWrapper<OrderListResponse> listParamWrapperBuilder(OrderListRequest request) {
         QueryWrapper<OrderListResponse> wrapper = new QueryWrapper<>();
         wrapper.like(StringUtils.isNotBlank(request.getOrderNo()), "order_no", request.getOrderNo());
+        wrapper.like(Objects.nonNull(request.getCustomerId()), "customer_id", request.getCustomerId());
         wrapper.like(StringUtils.isNotBlank(request.getCustomerName()), "customer_name", request.getCustomerName());
         wrapper.like(StringUtils.isNotBlank(request.getDeliverer()), "deliverer", request.getDeliverer());
         wrapper.like(StringUtils.isNotBlank(request.getCreateUserName()), "create_user_name", request.getCreateUserName());
-        wrapper.apply(StringUtils.isNotBlank(request.getCreateStartTime()),
-                "{0} <= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getCreateStartTime().split(" ")[0]);
-        wrapper.apply(StringUtils.isNotBlank(request.getCreateEndTime()),
-                "{0} >= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getCreateEndTime().split(" ")[0]);
+        if(StringUtils.isNotBlank(request.getCreateStartTime())){
+            wrapper.apply("{0} <= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getCreateStartTime().split(" ")[0]);
+        }
+        if(StringUtils.isNotBlank(request.getCreateEndTime())){
+            wrapper.apply("{0} >= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getCreateEndTime().split(" ")[0]);
+        }
         wrapper.orderByDesc("create_time");
         return wrapper;
     }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceAssessServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceAssessServiceImpl.java
index c6af980..ce40138 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceAssessServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceAssessServiceImpl.java
@@ -1,10 +1,33 @@
 package com.casic.missiles.service.Impl.business;
 
-import com.casic.missiles.model.business.BizBusinessOutsourceAssess;
+import cn.hutool.core.lang.Assert;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.casic.missiles.core.model.auth.AuthUser;
+import com.casic.missiles.core.shiro.ShiroKit;
+import com.casic.missiles.dto.BaseApprovalSubmitRequest;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.ReturnUtil;
+import com.casic.missiles.dto.business.outsource.OutsourceAssessApprovalListRequest;
+import com.casic.missiles.dto.business.outsource.OutsourceAssessSaveResponse;
+import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.NoGenerateFileCodeEnum;
+import com.casic.missiles.enums.NoGenerateRecordTypeCodeEnum;
+import com.casic.missiles.enums.system.ApprovalStatusEnum;
+import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.mapper.business.BizBusinessOutsourceAssessMapper;
+import com.casic.missiles.model.business.BizBusinessOutsourceAssess;
+import com.casic.missiles.model.business.BizBusinessOutsourceAssessSampleRelation;
+import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl;
+import com.casic.missiles.service.business.IBizBusinessOutsourceAssessSampleRelationService;
 import com.casic.missiles.service.business.IBizBusinessOutsourceAssessService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.casic.missiles.utils.NoGeneratorUtil;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Objects;
 
 /**
  * <p>
@@ -15,6 +38,103 @@
  * @since 2023-08-16
  */
 @Service
-public class BizBusinessOutsourceAssessServiceImpl extends ServiceImpl<BizBusinessOutsourceAssessMapper, BizBusinessOutsourceAssess> implements IBizBusinessOutsourceAssessService {
+public class BizBusinessOutsourceAssessServiceImpl extends GeneralApprovalServiceImpl<BizBusinessOutsourceAssessMapper, BizBusinessOutsourceAssess, BizBusinessOutsourceAssess, OutsourceAssessApprovalListRequest, BaseApprovalSubmitRequest> implements IBizBusinessOutsourceAssessService {
+    @Autowired
+    private IBizBusinessOutsourceAssessSampleRelationService outsourceAssessSampleRelationService;
 
+    @Override
+    public ReturnDTO<OutsourceAssessSaveResponse> saveOutsourceAssess(BizBusinessOutsourceAssess request) {
+        //生成编号
+        String labCode = request.getLabCode();
+        String groupCode = request.getGroupCode();
+        Long maxNo = this.baseMapper.selectMaxProjectNo();
+        String projectNo = NoGeneratorUtil.getCode(NoGenerateFileCodeEnum.D, labCode, NoGenerateRecordTypeCodeEnum.OUTSOURCE_ACCESS, groupCode, maxNo);
+        request.setCreateUserId(request.getUserId());
+        request.setCreateUserName(request.getUserName());
+        request.setApprovalStatus(ApprovalStatusEnum.DRAFT); //草稿箱状态
+        request.setProjectNo(projectNo);
+        int row = this.baseMapper.insert(request);
+        Assert.isFalse(row <= 0, () -> {
+            throw new BusinessException(BusinessExceptionEnum.OUTSOURCE_ACCESS_SAVE_FAILED);
+        });
+        //关联表
+        saveRelationData(request);
+        OutsourceAssessSaveResponse saveResponse = new OutsourceAssessSaveResponse();
+        saveResponse.setId(request.getId());
+        saveResponse.setProjectNo(projectNo);
+        return ReturnUtil.success(saveResponse);
+    }
+
+    @Override
+    @Transactional
+    public ReturnDTO draftUpdate(BizBusinessOutsourceAssess request) {
+        if (this.baseMapper.updateById(request) > 0) {
+            //关联表删除、增加
+            removeRelationData(request.getId());
+            saveRelationData(request);
+            return ReturnUtil.success();
+        }
+        throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
+    }
+
+    @Override
+    public ReturnDTO draftDelete(Long id) {
+        if (this.baseMapper.deleteById(id) > 0) {
+            //关联表删除
+            removeRelationData(id);
+            return ReturnUtil.success();
+        }
+        throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
+    }
+
+    @Override
+    public ReturnDTO draftBatchDelete(List<Long> ids) {
+        if (this.baseMapper.deleteBatchIds(ids) >= 0) {
+            ids.forEach(id -> removeRelationData(id));
+            return ReturnUtil.success();
+        }
+        throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
+    }
+
+    @Override
+    @Transactional
+    public ReturnDTO failUpdate(BizBusinessOutsourceAssess request) {
+        AuthUser user = ShiroKit.getUser();
+        Assert.isFalse(Objects.isNull(user), () -> {
+            throw new BusinessException(BusinessExceptionEnum.LOGIN_USER_ACQUIRE_FAILED);
+        });
+        request.setApprovalStatus(ApprovalStatusEnum.IN_APPROVED);
+        if (this.baseMapper.updateById(request) > 0) {
+            //关联表删除、增加
+            removeRelationData(request.getId());
+            saveRelationData(request);
+            baseApprovalService.failUpdate(request.getProcessId());
+            return ReturnUtil.success();
+        }
+        throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
+    }
+
+    private void saveRelationData(BizBusinessOutsourceAssess request) {
+        List<BizBusinessOutsourceAssessSampleRelation> sampleRelations = new ArrayList<>();
+        request.getOrderSampleList().forEach(dto -> {
+            BizBusinessOutsourceAssessSampleRelation relation = new BizBusinessOutsourceAssessSampleRelation();
+            relation.setOrderId(dto.getOrderId());
+            relation.setSampleId(dto.getSampleId());
+            relation.setAccessId(request.getId());
+            sampleRelations.add(relation);
+        });
+        if(outsourceAssessSampleRelationService.saveBatch(sampleRelations)){
+            return;
+        }
+        throw new BusinessException(BusinessExceptionEnum.OUTSOURCE_ACCESS_SAVE_FAILED);
+    }
+
+    private void removeRelationData(Long assessId) {
+        QueryWrapper<BizBusinessOutsourceAssessSampleRelation> wrapper = new QueryWrapper<>();
+        wrapper.eq("access_id", assessId);
+        if(outsourceAssessSampleRelationService.remove(wrapper)){
+            return;
+        }
+        throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
+    }
 }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceProtocolServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceProtocolServiceImpl.java
new file mode 100644
index 0000000..821e728
--- /dev/null
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceProtocolServiceImpl.java
@@ -0,0 +1,60 @@
+package com.casic.missiles.service.Impl.business;
+
+import cn.hutool.core.lang.Assert;
+import com.casic.missiles.dto.BaseApprovalSubmitRequest;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.ReturnUtil;
+import com.casic.missiles.dto.business.outsource.OutsourceProtocolApprovalListRequest;
+import com.casic.missiles.dto.business.outsource.OutsourceProtocolSaveResponse;
+import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.NoGenerateFileCodeEnum;
+import com.casic.missiles.enums.NoGenerateRecordTypeCodeEnum;
+import com.casic.missiles.enums.system.ApprovalStatusEnum;
+import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.mapper.business.BizBusinessOutsourceProtocolMapper;
+import com.casic.missiles.mapper.business.BizBusinessOutsourcerInfoMapper;
+import com.casic.missiles.model.business.BizBusinessOutsourceProtocol;
+import com.casic.missiles.model.business.BizBusinessOutsourcerInfo;
+import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl;
+import com.casic.missiles.service.business.IBizBusinessOutsourceProtocolService;
+import com.casic.missiles.utils.NoGeneratorUtil;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 计量检定业务-分包管理-测试、校准或检定工作分包协议书 服务实现类
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-08-24
+ */
+@Service
+public class BizBusinessOutsourceProtocolServiceImpl extends GeneralApprovalServiceImpl<BizBusinessOutsourceProtocolMapper, BizBusinessOutsourceProtocol, BizBusinessOutsourceProtocol, OutsourceProtocolApprovalListRequest, BaseApprovalSubmitRequest> implements IBizBusinessOutsourceProtocolService {
+    @Autowired
+    private BizBusinessOutsourcerInfoMapper outsourcerInfoMapper;
+
+    @Override
+    public ReturnDTO<OutsourceProtocolSaveResponse> saveOutsourceProtocol(BizBusinessOutsourceProtocol request) {
+        //生成编号
+        String labCode = request.getLabCode();
+        String groupCode = request.getGroupCode();
+        Long maxNo = this.baseMapper.selectMaxProtocolNo();
+        String protocolNo = NoGeneratorUtil.getCode(NoGenerateFileCodeEnum.D, labCode, NoGenerateRecordTypeCodeEnum.OUTSOURCE_PROTOCOL, groupCode, maxNo);
+        request.setCreateUserId(request.getUserId());
+        request.setCreateUserName(request.getUserName());
+        request.setApprovalStatus(ApprovalStatusEnum.DRAFT); //草稿箱状态
+        request.setProtocolNo(protocolNo);
+        BizBusinessOutsourcerInfo outsourcerInfo = outsourcerInfoMapper.selectById(request.getOutsourcerId());
+        request.setOutsourceNo(outsourcerInfo.getOutsourcerNo());
+        request.setOutsourceName(outsourcerInfo.getOutsourcerName());
+        int row = this.baseMapper.insert(request);
+        Assert.isFalse(row <= 0, () -> {
+            throw new BusinessException(BusinessExceptionEnum.OUTSOURCE_PROTOCOL_SAVE_FAILED);
+        });
+        OutsourceProtocolSaveResponse saveResponse = new OutsourceProtocolSaveResponse();
+        saveResponse.setId(request.getId());
+        saveResponse.setProtocolNo(protocolNo);
+        return ReturnUtil.success(saveResponse);
+    }
+}
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourcerInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourcerInfoServiceImpl.java
index 75f639d..8aadad7 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourcerInfoServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourcerInfoServiceImpl.java
@@ -3,12 +3,12 @@
 import cn.hutool.core.lang.Assert;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.dto.*;
 import com.casic.missiles.dto.business.outsource.OutsourcerInfoApprovalListRequest;
 import com.casic.missiles.dto.business.outsource.OutsourcerSaveResponse;
 import com.casic.missiles.enums.BusinessExceptionEnum;
-import com.casic.missiles.enums.PrefixCodeEnum;
+import com.casic.missiles.enums.NoGenerateFileCodeEnum;
+import com.casic.missiles.enums.NoGenerateRecordTypeCodeEnum;
 import com.casic.missiles.enums.system.ApprovalStatusEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.mapper.business.BizBusinessOutsourcerInfoMapper;
@@ -20,7 +20,7 @@
 import com.casic.missiles.service.business.IBizBusinessOutsourcerInfoService;
 import com.casic.missiles.service.business.IBizBusinessOutsourcerUserInfoService;
 import com.casic.missiles.utils.DictCodeUtils;
-import com.casic.missiles.utils.NumberGeneratorUtil;
+import com.casic.missiles.utils.NoGeneratorUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -42,22 +42,12 @@
     private IBizBusinessOutsourcerUserInfoService outsourcerUserInfoService;
 
     @Override
-    public List<BizBusinessOutsourcerInfo> list(OutsourcerInfoApprovalListRequest request) {
-        request.setCreateUserId(null);
-        request.setApprovalStatus(ApprovalStatusEnum.PASSED);
-        Page<BizBusinessOutsourcerInfo> page = PageFactory.defaultPage();
-        page.setCurrent(1);
-        page.setSearchCount(false);
-        page.setSize(Integer.MAX_VALUE);
-        Page<BizBusinessOutsourcerInfo> resultPage = this.baseMapper.selectBatchForApprovalList(page, request, null);
-        return resultPage.getRecords();
-    }
-
-    @Override
     public ReturnDTO<OutsourcerSaveResponse> saveOutsourcer(BizBusinessOutsourcerInfo request) {
         //生成编号
+        String labCode = request.getLabCode();
+        String groupCode = request.getGroupCode();
         Long maxNo = this.baseMapper.selectMaxNo();
-        String outsourcerNo = NumberGeneratorUtil.getContactNo(PrefixCodeEnum.OUTSOURCER_PREFIX, maxNo);
+        String outsourcerNo = NoGeneratorUtil.getCode(NoGenerateFileCodeEnum.D, labCode, NoGenerateRecordTypeCodeEnum.OUTSOURCE_INFO, groupCode, maxNo);
         request.setOutsourcerNo(outsourcerNo);
         request.setCreateUserId(request.getUserId());
         request.setCreateUserName(request.getUserName());
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessSiteExecutiveInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessSiteExecutiveInfoServiceImpl.java
index ebab3e6..6c6a129 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessSiteExecutiveInfoServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessSiteExecutiveInfoServiceImpl.java
@@ -189,9 +189,9 @@
         QueryWrapper<BizBusinessSiteExecutiveStaffRelation> mWrapper = new QueryWrapper<>();
         mWrapper.eq("site_executive_id", siteExecutiveId);
         boolean mRemove = siteExecutiveStaffRelationService.remove(mWrapper);
-        Assert.isFalse(eRemove || mRemove, () -> {
+        if(!eRemove || !mRemove){
             throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
-        });
+        }
     }
 
     private void doPopulateSiteExecutive(SiteExecutiveDetailResponse detailResponse) {
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessLabExecutiveInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessLabExecutiveInfoServiceImpl.java
index 50c5616..0242fcf 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessLabExecutiveInfoServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessLabExecutiveInfoServiceImpl.java
@@ -297,6 +297,29 @@
     }
 
     @Override
+    public List<SampleLabExecutiveListResponse> deptLabExecutiveList(SampleLabExecutiveListRequest request) throws Exception {
+        Page<SampleLabExecutiveListResponse> page = PageFactory.defaultPage();
+        page.setCurrent(1);
+        page.setSearchCount(false);
+        page.setSize(Integer.MAX_VALUE);
+        Page<SampleLabExecutiveListResponse> resultPage = this.deptLabExecutiveListPage(page, request);
+        return resultPage.getRecords();
+    }
+
+    @Override
+    public List<SampleLabExecutiveListResponse> deptLabExecutiveListByIds(String measureStatus, List<Long> ids) throws Exception {
+        Page<SampleLabExecutiveListResponse> page = PageFactory.defaultPage();
+        page.setCurrent(1);
+        page.setSearchCount(false);
+        page.setSize(Integer.MAX_VALUE);
+        SampleLabExecutiveListRequest request = new SampleLabExecutiveListRequest();
+        request.setIds(ids);
+        request.setMeasureStatus(measureStatus);
+        Page<SampleLabExecutiveListResponse> resultPage = this.deptLabExecutiveListPage(page, request);
+        return resultPage.getRecords();
+    }
+
+    @Override
     public Page<SampleLabExecutiveListResponse> myLabExecutiveListPage(Page<SampleLabExecutiveListResponse> page, SampleLabExecutiveListRequest labExecutiveListRequest) throws Exception{
         AuthUser user = ShiroKit.getUser();
         Assert.isFalse(Objects.isNull(user), () -> {
@@ -350,6 +373,29 @@
     }
 
     @Override
+    public List<SampleLabExecutiveListResponse> myLabExecutiveList(SampleLabExecutiveListRequest request) throws Exception {
+        Page<SampleLabExecutiveListResponse> page = PageFactory.defaultPage();
+        page.setCurrent(1);
+        page.setSearchCount(false);
+        page.setSize(Integer.MAX_VALUE);
+        Page<SampleLabExecutiveListResponse> resultPage = this.myLabExecutiveListPage(page, request);
+        return resultPage.getRecords();
+    }
+
+    @Override
+    public List<SampleLabExecutiveListResponse> myLabExecutiveListByIds(String measureStatus, List<Long> ids) throws Exception {
+        Page<SampleLabExecutiveListResponse> page = PageFactory.defaultPage();
+        page.setCurrent(1);
+        page.setSearchCount(false);
+        page.setSize(Integer.MAX_VALUE);
+        SampleLabExecutiveListRequest request = new SampleLabExecutiveListRequest();
+        request.setIds(ids);
+        request.setMeasureStatus(measureStatus);
+        Page<SampleLabExecutiveListResponse> resultPage = this.myLabExecutiveListPage(page, request);
+        return resultPage.getRecords();
+    }
+
+    @Override
     public List<SampleAmountResponse> myExecutiveAmount() {
         //登录用户id获取计量人员id，实验室检测信息中存储的是计量人员id
         AuthUser user = ShiroKit.getUser();
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentInfoServiceImpl.java
index 864b05e..db8cad4 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentInfoServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentInfoServiceImpl.java
@@ -35,7 +35,6 @@
 import com.casic.missiles.utils.ConvertUtils;
 import com.casic.missiles.utils.DictCodeUtils;
 import com.casic.missiles.utils.NumberGeneratorUtil;
-import org.flowable.engine.RuntimeService;
 import org.flowable.engine.runtime.ProcessInstance;
 import org.jetbrains.annotations.NotNull;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -43,7 +42,6 @@
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
 
-import javax.annotation.Resource;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
@@ -81,8 +79,6 @@
     private IBizEquipmentAttachmentService attachmentService;
     @Autowired
     private IBizEquipmentCheckpointService checkpointService;
-    @Resource
-    private RuntimeService runtimeService;
     @Autowired
     private ApprovalOperateService approvalOperateService;
 
@@ -235,18 +231,18 @@
     private void updateRelationInfo(EquipmentAddRequest request, BizEquipmentInfoApproval equipmentInfoApproval) {
         QueryWrapper<BizEquipmentTechnicalTarget> targetWrapper = new QueryWrapper<>();
         targetWrapper.eq("equipment_no", equipmentInfoApproval.getEquipmentNo());
-        boolean removeTargetFlag = technicalTargetService.remove(targetWrapper);
-        boolean saveTargetFlag = technicalTargetService.saveBatch(request.getTechnicalTargetList());
+        technicalTargetService.remove(targetWrapper);
+        technicalTargetService.saveBatch(request.getTechnicalTargetList());
 
         QueryWrapper<BizEquipmentAttachment> attachmentWrapper = new QueryWrapper<>();
         attachmentWrapper.eq("equipment_no", equipmentInfoApproval.getEquipmentNo());
-        boolean removeAttachmentFlag = attachmentService.remove(attachmentWrapper);
-        boolean saveAttachmentFlag = attachmentService.saveBatch(request.getAttachmentList());
+        attachmentService.remove(attachmentWrapper);
+        attachmentService.saveBatch(request.getAttachmentList());
 
         QueryWrapper<BizEquipmentCheckpoint> checkpointWrapper = new QueryWrapper<>();
         checkpointWrapper.eq("equipment_no", equipmentInfoApproval.getEquipmentNo());
-        boolean removeCheckpointFlag = checkpointService.remove(checkpointWrapper);
-        boolean saveCheckpointFlag = checkpointService.saveBatch(request.getCheckpointList());
+        checkpointService.remove(checkpointWrapper);
+        checkpointService.saveBatch(request.getCheckpointList());
     }
 
     @Override
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardInfoServiceImpl.java
index faff1ae..c50a5b3 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardInfoServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardInfoServiceImpl.java
@@ -22,7 +22,9 @@
 import com.casic.missiles.mapper.equipment.BizEquipmentStandardInfoMapper;
 import com.casic.missiles.mapper.equipment.BizEquipmentStandardTechnologyRelationMapper;
 import com.casic.missiles.mapper.resource.BizResourceStaffInfoMapper;
-import com.casic.missiles.model.equipment.*;
+import com.casic.missiles.model.equipment.BizEquipmentStandardInfo;
+import com.casic.missiles.model.equipment.BizEquipmentStandardInfoApproval;
+import com.casic.missiles.model.equipment.BizEquipmentStandardTechnologyRelation;
 import com.casic.missiles.model.resource.BizResourceStaffInfo;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.dao.DeptMapper;
@@ -33,14 +35,12 @@
 import com.casic.missiles.service.flowable.ApprovalOperateService;
 import com.casic.missiles.utils.ConvertUtils;
 import com.casic.missiles.utils.DictCodeUtils;
-import org.flowable.engine.RuntimeService;
 import org.flowable.engine.runtime.ProcessInstance;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
 
-import javax.annotation.Resource;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
@@ -62,8 +62,6 @@
     private BizResourceStaffInfoMapper staffInfoMapper;
     @Autowired
     private IBaseApprovalService baseApprovalService;
-    @Resource
-    private RuntimeService runtimeService;
     @Autowired
     private ApprovalOperateService approvalOperateService;
     @Autowired
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSealInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSealInfoServiceImpl.java
index 7c91fa2..00040d6 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSealInfoServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSealInfoServiceImpl.java
@@ -15,6 +15,7 @@
 import com.casic.missiles.modular.system.model.User;
 import com.casic.missiles.service.resource.IBizResourceSealInfoService;
 import com.casic.missiles.utils.DictCodeUtils;
+import com.casic.missiles.utils.MinioUtil;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -33,6 +34,8 @@
     private BizResourceSealInfoMapper sealInfoMapper;
     @Autowired
     private UserMapper userMapper;
+    @Autowired
+    private MinioUtil minioUtil;
 
     @Override
     public Page<BizResourceSealInfo> listPage(Page<BizResourceSealInfo> page, SealInfoListRequest request) throws Exception {
@@ -44,6 +47,7 @@
         Page<BizResourceSealInfo> sealInfoPage = sealInfoMapper.selectPage(page, wrapper);
         for (BizResourceSealInfo record : sealInfoPage.getRecords()) {
             DictCodeUtils.convertDictCodeToName(record);
+            record.setMinioFileUrl(minioUtil.getFileUrl(record.getMinioFileName()));
         }
         return sealInfoPage;
     }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceStaffInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceStaffInfoServiceImpl.java
index f058cf5..09203ac 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceStaffInfoServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceStaffInfoServiceImpl.java
@@ -3,6 +3,7 @@
 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.core.page.PageFactory;
 import com.casic.missiles.dto.IdDTO;
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
@@ -86,6 +87,13 @@
     }
 
     @Override
+    public List<BizResourceStaffInfo> list(StaffListRequest request) throws Exception {
+        Page<BizResourceStaffInfo> page = PageFactory.defaultPage();
+        Page<BizResourceStaffInfo> staffInfoPage = this.listPage(page, request);
+        return staffInfoPage.getRecords();
+    }
+
+    @Override
     @Transactional
     public ReturnDTO<IdDTO> staffBaseAdd(BizResourceStaffInfo staffInfo) {
         //登录账号查重
@@ -495,6 +503,28 @@
         return certResponsePage;
     }
 
+    @Override
+    public List<StaffCertResponse> certListByIds(List<Long> ids) throws Exception {
+        Page<StaffCertResponse> page = PageFactory.defaultPage();
+        page.setCurrent(1);
+        page.setSearchCount(false);
+        page.setSize(Integer.MAX_VALUE);
+        StaffCertRequest request = new StaffCertRequest();
+        request.setIds(ids);
+        Page<StaffCertResponse> resultPage = this.certListPage(page, request);
+        return resultPage.getRecords();
+    }
+
+    @Override
+    public List<StaffCertResponse> certList(StaffCertRequest request) throws Exception {
+        Page<StaffCertResponse> page = PageFactory.defaultPage();
+        page.setCurrent(1);
+        page.setSearchCount(false);
+        page.setSize(Integer.MAX_VALUE);
+        Page<StaffCertResponse> resultPage = this.certListPage(page, request);
+        return resultPage.getRecords();
+    }
+
     @Async
     public void deleteRelationInfo(Long staffId){
         QueryWrapper<BizResourceStaffEducation> educationWrapper = new QueryWrapper<>();
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceStaffVerifierServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceStaffVerifierServiceImpl.java
index 8ac7eee..b508d45 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceStaffVerifierServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceStaffVerifierServiceImpl.java
@@ -52,8 +52,8 @@
     private WebSocket webSocket;
 
     @Override
-    public ReturnDTO expirationReminder(IdDTO idDto) {
-        BizResourceStaffVerifier staffVerifier = verifierMapper.selectById(idDto.getId());
+    public ReturnDTO expirationReminder(IdDTO idDTO) {
+        BizResourceStaffVerifier staffVerifier = verifierMapper.selectById(idDTO.getId());
         BizResourceStaffInfo staffInfo = staffInfoMapper.selectById(staffVerifier.getStaffId());
         QueryWrapper<User> wrapper = new QueryWrapper<>();
         wrapper.eq("account", staffInfo.getAccount());
@@ -65,7 +65,7 @@
         Assert.isFalse(Objects.isNull(user), () -> {
             throw new BusinessException(BusinessExceptionEnum.LOGIN_USER_ACQUIRE_FAILED);
         });
-        WorkbenchRemindMessage remindMessage = new WorkbenchRemindMessage(userInfo.getId(), userInfo.getDeptId(), idDto.getId(), staffVerifier.getCertNo(), MessageTypeEnum.STAFF_CERT.getCode(), MessageSourceModuleEnum.RESOURCE.getCode(), MessageTypeEnum.STAFF_CERT.getValue(), MessageTypeEnum.STAFF_CERT.getValue(), staffVerifier.getCertName(),0, user.getId(), user.getName());
+        WorkbenchRemindMessage remindMessage = new WorkbenchRemindMessage(userInfo.getId(), userInfo.getDeptId(), idDTO.getId(), staffVerifier.getCertNo(), MessageTypeEnum.STAFF_CERT.getCode(), MessageSourceModuleEnum.RESOURCE.getCode(), MessageTypeEnum.STAFF_CERT.getValue(), MessageTypeEnum.STAFF_CERT.getValue(), staffVerifier.getCertName(),0, user.getId(), user.getName());
         if(messageMapper.insert(remindMessage) > 0){
             // 新增到消息列表后向用户推送消息
             webSocket.sendOneMessage(String.valueOf(userInfo.getId()), JSONObject.toJSONString(remindMessage));
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceTrainInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceTrainInfoServiceImpl.java
index c1d6308..3a533f2 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceTrainInfoServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceTrainInfoServiceImpl.java
@@ -44,11 +44,14 @@
     @Override
     public Page<BizResourceTrainInfo> listPage(Page<BizResourceTrainInfo> page, TrainListRequest request) throws Exception {
         QueryWrapper<BizResourceTrainInfo> wrapper = new QueryWrapper<>();
-        wrapper.like("train_no", request.getTrainNo());
-        wrapper.apply(StringUtils.isNotBlank(request.getCreateTimeStart()),//apply方法传入参数名不能为空
-                "{0} <= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getCreateTimeStart().split(" ")[0]);
-        wrapper.apply(StringUtils.isNotBlank(request.getCreateTimeEnd()),
-                "{0} >= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getCreateTimeEnd().split(" ")[0]);
+        wrapper.like(StringUtils.isNotEmpty(request.getTrainNo()), "train_no", request.getTrainNo());
+        wrapper.like(StringUtils.isNotEmpty(request.getDutyLeader()),"duty_leader", request.getDutyLeader());
+        if(StringUtils.isNotBlank(request.getCreateTimeStart())){
+            wrapper.apply("{0} <= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getCreateTimeStart().split(" ")[0]);
+        }
+        if(StringUtils.isNotBlank(request.getCreateTimeEnd())){
+            wrapper.apply("{0} >= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getCreateTimeEnd().split(" ")[0]);
+        }
         wrapper.orderByDesc("create_time");
         Page<BizResourceTrainInfo> trainInfoPage = trainInfoMapper.selectPage(page, wrapper);
         for (BizResourceTrainInfo record : trainInfoPage.getRecords()) {
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/EnvLocationInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/EnvLocationInfoServiceImpl.java
new file mode 100644
index 0000000..cdc5742
--- /dev/null
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/EnvLocationInfoServiceImpl.java
@@ -0,0 +1,31 @@
+package com.casic.missiles.service.Impl.resource;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.casic.missiles.dto.resource.environment.LocationListRequest;
+import com.casic.missiles.dto.resource.environment.LocationListResponse;
+import com.casic.missiles.mapper.resource.EnvLocationInfoMapper;
+import com.casic.missiles.model.resource.EnvLocationInfo;
+import com.casic.missiles.service.resource.IEnvLocationInfoService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 实验室环境监控系统-设备表 服务实现类
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-06-07
+ */
+@Service
+public class EnvLocationInfoServiceImpl extends ServiceImpl<EnvLocationInfoMapper, EnvLocationInfo> implements IEnvLocationInfoService {
+    @Autowired
+    private EnvLocationInfoMapper locationInfoMapper;
+
+    @Override
+    public Page<LocationListResponse> listPage(Page<LocationListResponse> page, LocationListRequest request) {
+        Page<LocationListResponse> resultPage = locationInfoMapper.selectLocationListPage(page, request);
+        return resultPage;
+    }
+}
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/DownloadCenterServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/DownloadCenterServiceImpl.java
index c956d24..d9f3282 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/DownloadCenterServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/DownloadCenterServiceImpl.java
@@ -131,10 +131,12 @@
         wrapper.like(StringUtils.isNotBlank(request.getModuleName()), "module_name", request.getModuleName());
         wrapper.like(StringUtils.isNotBlank(request.getFileName()), "file_name", request.getFileName());
         wrapper.like(StringUtils.isNotBlank(request.getFileType()), "file_type", request.getFileType());
-        wrapper.apply(StringUtils.isNotBlank(request.getStartTime()),
-                "{0} <= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getStartTime().split(" ")[0]);
-        wrapper.apply(StringUtils.isNotBlank(request.getEndTime()),
-                "{0} >= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getEndTime().split(" ")[0]);
+        if(StringUtils.isNotBlank(request.getStartTime())){
+            wrapper.apply("{0} <= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getStartTime().split(" ")[0]);
+        }
+        if(StringUtils.isNotBlank(request.getEndTime())){
+            wrapper.apply("{0} >= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getEndTime().split(" ")[0]);
+        }
         wrapper.orderByDesc("create_time");
         return wrapper;
     }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemSignServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemSignServiceImpl.java
index 41976bb..7e90a09 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemSignServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemSignServiceImpl.java
@@ -52,15 +52,14 @@
 
     @Override
     public Page<SystemSign> listPage(Page<SystemSign> page, SignListRequest request) {
-        QueryWrapper<SystemSign> wrapper = getWrapper(request);
-        Page<SystemSign> signPage = signMapper.selectPage(page, wrapper);
+        Page<SystemSign> signPage = signMapper.selectSignListPage(page, request);
         return signPage;
     }
 
     @Override
     public List<SystemSign> list(SignListRequest request) {
-        QueryWrapper<SystemSign> wrapper = getWrapper(request);
-        return signMapper.selectList(wrapper);
+        List<SystemSign> signList = signMapper.selectSignList(request);
+        return signList;
     }
 
     @Override

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java
index bb0c50f..13a699b 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java
@@ -12,6 +12,7 @@
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.IGeneralApprovalService;
+import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
@@ -19,6 +20,7 @@
 import org.springframework.web.bind.annotation.RequestBody;
 
 import javax.validation.Valid;
+import java.util.List;
 import java.util.Objects;
 
 /**
@@ -117,4 +119,17 @@
         }
         return baseApprovalService.failUpdate(request);
     }
+
+    public List<O> exportList(@RequestBody @Valid R request) throws Exception {
+        List<O> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = baseApprovalService.listExportByIds(request.getIds());
+        } else {
+            list = baseApprovalService.listExport(request);
+        }
+        for (O record : list) {
+            DictCodeUtils.convertDictCodeToName(record);
+        }
+        return list;
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java
index 8a90961..d775831 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java
@@ -5,6 +5,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.business.certificate.CertificateChangeApplyApprovalListRequest;
 import com.casic.missiles.dto.business.certificate.CertificateChangeApplySaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessCertificateChangeApply;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
@@ -20,6 +21,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -48,4 +50,12 @@
         }
         return changeApplyService.saveChangeApply(request);
     }
+
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody CertificateChangeApplyApprovalListRequest request) throws Exception {
+        List<BizBusinessCertificateChangeApply> list = super.exportList(request);
+        super.exportExcel(BizBusinessCertificateChangeApply.class, list, ExportEnum.CERTIFICATE_CHANGE_APPLY.getSheetName());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java
index 5fc4b07..af8230e 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java
@@ -9,6 +9,7 @@
 import com.casic.missiles.dto.business.certificate.CertificatePrintApprovalListRequest;
 import com.casic.missiles.dto.business.certificate.CertificatePrintListResponse;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.enums.business.CertificatePrintStatusEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessCertificatePrintLog;
@@ -18,10 +19,16 @@
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.io.IOException;
+import java.util.List;
 import java.util.Objects;
 
 /**
@@ -98,4 +105,16 @@
         });
         return certificatePrintService.certificatePrintLog(idDTO.getId());
     }
+
+    @ApiOperation("证书打印审批导出")
+    @PostMapping("/listExport")
+    public void exportList(@RequestBody CertificatePrintApprovalListRequest request) throws IOException {
+        List<CertificatePrintListResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = certificatePrintService.listByIds(request.getIds());
+        } else {
+            list = certificatePrintService.list(request);
+        }
+        super.exportExcel(CertificatePrintListResponse.class, list, ExportEnum.CERTIFICATE_PRINT.getSheetName());
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java
index 63b06dc..6b2efd5 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java
@@ -6,6 +6,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.business.certificate.CertificateReportApprovalListRequest;
 import com.casic.missiles.dto.business.certificate.CertificateReportSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessCertificateReport;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
@@ -21,6 +22,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -50,7 +52,7 @@
         return certificateReportService.saveCertificateReport(request);
     }
 
-    @ApiOperation("证书审批详情（基本信息）")
+    @ApiOperation("详情（基本信息）")
     @PostMapping("/detail")
     public ReturnDTO<BizBusinessCertificateReport> detail(@RequestBody @Valid BaseDetailRequest request, BindingResult bindingResult) throws Exception {
         if(bindingResult.hasErrors()){
@@ -59,4 +61,11 @@
         return certificateReportService.detail(request);
     }
 
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody CertificateReportApprovalListRequest request) throws Exception {
+        List<BizBusinessCertificateReport> list = super.exportList(request);
+        super.exportExcel(BizBusinessCertificateReport.class, list, ExportEnum.CERTIFICATE_REPORT.getSheetName());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java
index 46b26bd..57c0809 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java
@@ -10,20 +10,21 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.business.identify.IdentifyListRequest;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessIdentifyInfo;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.business.IBizBusinessIdentifyInfoService;
+import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import javax.validation.Valid;
+import java.util.List;
 import java.util.Objects;
 
 /**
@@ -57,16 +58,13 @@
         return identifyInfoService.addIdentify(identifyInfo);
     }
 
-    @ApiOperation("标识打印更新")
+    @ApiOperation("标识打印更新（更新打印时间）")
     @PostMapping("/update")
-    public ReturnDTO updateIdentify(@RequestBody @Valid BizBusinessIdentifyInfo identifyInfo, BindingResult bindingResult) {
-        Assert.isFalse(Objects.isNull(identifyInfo.getId()), () -> {
+    public ReturnDTO updateIdentify(@RequestBody @Valid IdDTO idDTO) {
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        Assert.isFalse(bindingResult.hasErrors(), () -> {
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        });
-        return identifyInfoService.updateIdentify(identifyInfo);
+        return identifyInfoService.updateIdentify(idDTO.getId());
     }
 
     @ApiOperation("标识打印删除")
@@ -77,4 +75,37 @@
         });
         return identifyInfoService.deleteIdentify(idDTO.getId());
     }
+
+    @ApiOperation("标识打印导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody @Valid IdentifyListRequest request, BindingResult bindingResult) throws Exception {
+        if (bindingResult.hasErrors()) {
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        List<BizBusinessIdentifyInfo> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = identifyInfoService.listByIds(request.getIds());
+        } else {
+            list = identifyInfoService.list(request);
+        }
+        for (BizBusinessIdentifyInfo record : list) {
+            DictCodeUtils.convertDictCodeToName(record);
+        }
+        super.exportExcel(BizBusinessIdentifyInfo.class, list, ExportEnum.IDENTIFY_EXPORT.getSheetName());
+    }
+
+
+    // TODO: 2023/8/23 查询设备信息，4个底部按钮查设备（按钮的作用就是前端用来调不同接口、用来区分中间即将展示的标识），前端弹窗选设备，在确定保存时前端根据底部按钮判断传入设备类型deviceType字典code
+    // TODO: 2023/8/23 接口：查受检设备（第1个按钮），查设备台账（后3个按钮同一接口），查询之后前端根据标志类型的不同加到中间页面时进行判断（按产品给的对应表）
+    // TODO: 2023/8/23 提供二维码接口，前端在加到中间页面时调用一下
+
+    @ApiOperation("设备二维码")
+    @PostMapping("/equipment/qrCode")
+    public ReturnDTO<String> equipmentQrCode(@RequestBody @Valid IdDTO idDTO) {
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return identifyInfoService.equipmentQrCode(idDTO.getId());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java
index 707be6e..7e0453d 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java
@@ -117,7 +117,7 @@
     }
 
     @ApiOperation("任务单导出")
-    @PostMapping("/export")
+    @PostMapping("/listExport")
     public void orderExport(@RequestBody @Valid OrderListRequest request, HttpServletResponse response) {
         businessOrderService.orderExport(request, response);
     }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java
index 529a6ce..51432be 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java
@@ -1,9 +1,28 @@
 package com.casic.missiles.controller.business;
 
+import com.casic.missiles.controller.GeneralApprovalController;
+import com.casic.missiles.dto.BaseApprovalSubmitRequest;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.business.outsource.OutsourceAssessApprovalListRequest;
+import com.casic.missiles.dto.business.outsource.OutsourceAssessSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
+import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.model.business.BizBusinessOutsourceAssess;
+import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
+import com.casic.missiles.service.IGeneralApprovalService;
+import com.casic.missiles.service.business.IBizBusinessOutsourceAssessService;
 import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.BindingResult;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.validation.Valid;
+import java.util.List;
+
 /**
  * <p>
  * 计量检定业务-分包管理-测试、校准或检定工作分包评审表 前端控制器
@@ -15,6 +34,27 @@
 @Api(tags = "分包管理-测试、校准或检定工作分包评审表")
 @RestController
 @RequestMapping("/business/outsource/assess")
-public class BizBusinessOutsourceAssessController {
+public class BizBusinessOutsourceAssessController extends GeneralApprovalController<BizBusinessOutsourceAssess, BizBusinessOutsourceAssess, OutsourceAssessApprovalListRequest, BaseApprovalSubmitRequest> {
+    @Autowired
+    private IBizBusinessOutsourceAssessService outsourceAssessService;
 
+    public BizBusinessOutsourceAssessController(IGeneralApprovalService<BizBusinessOutsourceAssess, BizBusinessOutsourceAssess, OutsourceAssessApprovalListRequest, BaseApprovalSubmitRequest> baseApprovalService) {
+        super(baseApprovalService);
+    }
+
+    @ApiOperation("草稿箱-保存")
+    @PostMapping("/save")
+    public ReturnDTO<OutsourceAssessSaveResponse> saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceAssess request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        return outsourceAssessService.saveOutsourceAssess(request);
+    }
+
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception {
+        List<BizBusinessOutsourceAssess> list = super.exportList(request);
+        super.exportExcel(BizBusinessOutsourceAssess.class, list, ExportEnum.OUTSOURCE_ASSESS.getSheetName());
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java
new file mode 100644
index 0000000..9adef18
--- /dev/null
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java
@@ -0,0 +1,60 @@
+package com.casic.missiles.controller.business;
+
+import com.casic.missiles.controller.GeneralApprovalController;
+import com.casic.missiles.dto.BaseApprovalSubmitRequest;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.business.outsource.OutsourceProtocolApprovalListRequest;
+import com.casic.missiles.dto.business.outsource.OutsourceProtocolSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
+import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.model.business.BizBusinessOutsourceProtocol;
+import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
+import com.casic.missiles.service.IGeneralApprovalService;
+import com.casic.missiles.service.business.IBizBusinessOutsourceProtocolService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.BindingResult;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.validation.Valid;
+import java.util.List;
+
+/**
+ * <p>
+ * 计量检定业务-分包管理-测试、校准或检定工作分包协议书 前端控制器
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-08-24
+ */
+@Api(tags = "分包管理-测试、校准或检定工作分包协议书")
+@RestController
+@RequestMapping("/business/outsource/protocol")
+public class BizBusinessOutsourceProtocolController extends GeneralApprovalController<BizBusinessOutsourceProtocol, BizBusinessOutsourceProtocol, OutsourceProtocolApprovalListRequest, BaseApprovalSubmitRequest> {
+    @Autowired
+    private IBizBusinessOutsourceProtocolService outsourceProtocolService;
+
+    public BizBusinessOutsourceProtocolController(IGeneralApprovalService<BizBusinessOutsourceProtocol, BizBusinessOutsourceProtocol, OutsourceProtocolApprovalListRequest, BaseApprovalSubmitRequest> baseApprovalService) {
+        super(baseApprovalService);
+    }
+
+    @ApiOperation("草稿箱-保存")
+    @PostMapping("/save")
+    public ReturnDTO<OutsourceProtocolSaveResponse> saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceProtocol request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        return outsourceProtocolService.saveOutsourceProtocol(request);
+    }
+
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody OutsourceProtocolApprovalListRequest request) throws Exception {
+        List<BizBusinessOutsourceProtocol> list = super.exportList(request);
+        super.exportExcel(BizBusinessOutsourceProtocol.class, list, ExportEnum.OUTSOURCE_PROTOCOL.getSheetName());
+    }
+}
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java
index 097f645..f0f0943 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java
@@ -17,7 +17,6 @@
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.IGeneralApprovalService;
 import com.casic.missiles.service.business.IBizBusinessOutsourcerInfoService;
-import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -71,19 +70,8 @@
 
     @ApiOperation("分包方导出")
     @PostMapping("/listExport")
-    public void export(@RequestBody @Valid OutsourcerInfoApprovalListRequest request, BindingResult bindingResult) throws Exception {
-        if (bindingResult.hasErrors()) {
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        }
-        List<BizBusinessOutsourcerInfo> list;
-        if (!CollectionUtils.isEmpty(request.getIds())) {
-            list = outsourcerInfoService.listByIds(request.getIds());
-        } else {
-            list = outsourcerInfoService.list(request);
-        }
-        for (BizBusinessOutsourcerInfo record : list) {
-            DictCodeUtils.convertDictCodeToName(record);
-        }
+    public void export(@RequestBody OutsourcerInfoApprovalListRequest request) throws Exception {
+        List<BizBusinessOutsourcerInfo> list = super.exportList(request);
         super.exportExcel(BizBusinessOutsourcerInfo.class, list, ExportEnum.OUTSOURCER_EXPORT.getSheetName());
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java
index c2cbf9f..0410918 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java
@@ -17,11 +17,9 @@
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.IGeneralApprovalService;
 import com.casic.missiles.service.business.IBizBusinessSiteExecutiveInfoService;
-import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -60,7 +58,7 @@
         return siteExecutiveInfoService.saveSiteExecutiveInfo(siteExecutiveInfo);
     }
 
-    @ApiOperation("现场检测详情")
+    @ApiOperation("详情")
     @PostMapping("/detail")
     public ReturnDTO<SiteExecutiveDetailResponse> siteExecutiveDetail(@RequestBody @Valid IdDTO idDTO) throws Exception {
         Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
@@ -69,21 +67,10 @@
         return ReturnUtil.success(siteExecutiveInfoService.detail(idDTO.getId()));
     }
 
-    @ApiOperation("现场检测导出")
+    @ApiOperation("导出")
     @PostMapping("/listExport")
-    public void export(@RequestBody @Valid SiteExecutiveApprovalListRequest request, BindingResult bindingResult) throws Exception {
-        if (bindingResult.hasErrors()) {
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        }
-        List<SiteExecutiveApprovalListResponse> list;
-        if (!CollectionUtils.isEmpty(request.getIds())) {
-            list = siteExecutiveInfoService.listInfoByIds(request.getIds());
-        } else {
-            list = siteExecutiveInfoService.listInfo(request);
-        }
-        for (SiteExecutiveApprovalListResponse record : list) {
-            DictCodeUtils.convertDictCodeToName(record);
-        }
+    public void export(@RequestBody SiteExecutiveApprovalListRequest request) throws Exception {
+        List<SiteExecutiveApprovalListResponse> list = super.exportList(request);
         super.exportExcel(SiteExecutiveApprovalListResponse.class, list, ExportEnum.SITE_EXECUTIVE_EXPORT.getSheetName());
     }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
index 7e793cd..a92e209 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
@@ -55,7 +55,7 @@
 
     @ApiOperation("设备收发列表导出")
     @PostMapping("/export")
-    public void exportList(@RequestBody @Valid SampleDispatchListRequest request) throws IOException {
+    public void exportList(@RequestBody SampleDispatchListRequest request) throws IOException {
         List<SampleDispatchListResponse> list;
         if (!CollectionUtils.isEmpty(request.getIds())) {
             list = dispatchService.listByIds(request.getIds());
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java
index cdc77fc..d120fd4 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java
@@ -7,6 +7,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.business.labExecutive.*;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.business.IBusinessLabExecutiveInfoService;
@@ -14,6 +15,7 @@
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.*;
 
@@ -32,7 +34,7 @@
     @Autowired
     private IBusinessLabExecutiveInfoService labExecutiveInfoService;
 
-    @ApiOperation("实验室检测-部门检测-查询各状态列表（待检测、检测中、检测完）")
+    @ApiOperation("实验室任务-查询各状态列表（待检测、检测中、检测完）")
     @PostMapping("/deptExecutive/List")
     public ReturnDTO<PageInfoBT<SampleLabExecutiveListResponse>> queryDeptExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
@@ -43,10 +45,19 @@
         return ReturnUtil.success(super.packForBT(labExecutiveInfoService.deptLabExecutiveListPage(page, labExecutiveListRequest)));
     }
 
-    /**
-     * 实验室检测-我的检测-查询各状态列表（待检测、检测中、检测完）
-     */
-    @ApiOperation("实验室检测-我的检测-查询各状态列表（待检测、检测中、检测完）")
+    @ApiOperation("实验室任务导出")
+    @PostMapping("/deptExecutive/export")
+    public void deptExportList(@RequestBody @Valid SampleLabExecutiveListRequest request) throws Exception {
+        List<SampleLabExecutiveListResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = labExecutiveInfoService.deptLabExecutiveListByIds(request.getMeasureStatus(), request.getIds());
+        } else {
+            list = labExecutiveInfoService.deptLabExecutiveList(request);
+        }
+        super.exportExcel(SampleLabExecutiveListResponse.class, list, ExportEnum.DEPT_EXECUTIVE_TASK.getSheetName());
+    }
+
+    @ApiOperation("我的任务-查询各状态列表（待检测、检测中、检测完）")
     @PostMapping("/myExecutive/list")
     public ReturnDTO<PageInfoBT<SampleLabExecutiveListResponse>> queryMyExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
@@ -57,19 +68,25 @@
         return ReturnUtil.success(super.packForBT(labExecutiveInfoService.myLabExecutiveListPage(page, labExecutiveListRequest)));
     }
 
-    /**
-     * 实验室检测-我的检测-查询各状态样品数量（待检测、检测中、检测完）
-     */
-    @ApiOperation("实验室检测-我的检测-查询各状态样品数量（待检测、检测中、检测完）")
+    @ApiOperation("我的任务导出")
+    @PostMapping("/myExecutive/export")
+    public void exportList(@RequestBody @Valid SampleLabExecutiveListRequest request) throws Exception {
+        List<SampleLabExecutiveListResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = labExecutiveInfoService.myLabExecutiveListByIds(request.getMeasureStatus(), request.getIds());
+        } else {
+            list = labExecutiveInfoService.myLabExecutiveList(request);
+        }
+        super.exportExcel(SampleLabExecutiveListResponse.class, list, ExportEnum.MY_EXECUTIVE_TASK.getSheetName());
+    }
+
+    @ApiOperation("我的任务-查询各状态样品数量（待检测、检测中、检测完）")
     @GetMapping("/myExecutive/amount")
     public ReturnDTO<List<SampleAmountResponse>> queryMyExecutiveAmount() {
         return ReturnUtil.success(labExecutiveInfoService.myExecutiveAmount());
     }
 
-    /**
-     * 实验室检测-部门检测-分配（分配给具体人员）
-     */
-    @ApiOperation("实验室检测-部门检测-分配按钮（分配给具体人员）")
+    @ApiOperation("实验室任务-分配按钮（分配给具体人员）")
     @PostMapping("/deptExecutive/allocate")
     public ReturnDTO allocateStaff(@RequestBody @Valid SampleAllocateRequest sampleAllocateRequest, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -78,10 +95,7 @@
         return labExecutiveInfoService.allocateStaff(sampleAllocateRequest);
     }
 
-    /**
-     * 实验室检测-我的检测-检定人扫描收入（待检测->检测中）
-     */
-    @ApiOperation("实验室检测-我的检测-检定人扫描收入（待检测->检测中）")
+    @ApiOperation("我的任务-检定人扫描收入（待检测->检测中）")
     @PostMapping("/myExecutive/receive")
     public ReturnDTO sampleReceive(@RequestBody @Valid List<SampleOperateRequest> requestList, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -90,10 +104,7 @@
         return labExecutiveInfoService.sampleReceive(requestList);
     }
 
-    /**
-     * 实验室检测-负责人/检定人扫描检完（检测中->检测完）
-     */
-    @ApiOperation("实验室检测-负责人/检定人扫描检完（检测中->检测完）")
+    @ApiOperation("实验室任务-负责人/检定人扫描检完（检测中->检测完）")
     @PostMapping("/myExecutive/complete")
     public ReturnDTO sampleExecutiveComplete(@RequestBody @Valid List<SampleOperateRequest> requestList, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -102,10 +113,7 @@
         return labExecutiveInfoService.sampleExecutiveComplete(requestList);
     }
 
-    /**
-     * 实验室检测-部门检测/我的检测 编辑（只能修改应出具证书）
-     */
-    @ApiOperation("实验室检测-部门检测/我的检测 编辑（只能修改应出具证书）")
+    @ApiOperation("实验室任务/我的任务 编辑（只能修改应出具证书）")
     @PostMapping("/executive/update")
     public ReturnDTO updateExecutive(@RequestBody @Valid UpdateExecutiveRequest request, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -114,10 +122,7 @@
         return labExecutiveInfoService.updateExecutive(request);
     }
 
-    /**
-     * 实验室检测-部门检测/我的检测 详情
-     */
-    @ApiOperation("实验室检测-部门检测/我的检测 详情")
+    @ApiOperation("实验室任务/我的任务 详情")
     @PostMapping("/executive/detail")
     public ReturnDTO<ExecutiveDetailResponse> executiveDetail(@RequestBody @Valid ExecutiveDetailRequest request, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
@@ -131,7 +136,7 @@
      * 退回后会将下一个要执行的实验室检测状态更新为待分配，将后面的实验室顺序变更为连续（都进行减1）
      * 最后一个检测的实验室退回，等分发员再增加实验室或设备收发中的已收入直接手动点击完成
      */
-    @ApiOperation("实验室检测-部门检测/我的检测 退回（待检测/检测中->退回）")
+    @ApiOperation("实验室任务/我的任务 退回（待检测/检测中->退回）")
     @PostMapping("/executive/sendBack")
     public ReturnDTO executiveSendBack(@RequestBody @Valid ExecutiveSendBackRequest request, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -140,9 +145,6 @@
         return labExecutiveInfoService.sampleExecutiveSendBack(request);
     }
 
-    /**
-     * 分发员编辑实验室检测列表
-     */
     @ApiOperation("分发员编辑实验室检测列表")
     @PostMapping("/handOut/updateList")
     public ReturnDTO updateExecutiveList(@RequestBody @Valid UpdateExecutiveListRequest request, BindingResult bindingResult) {
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java
index 48a67ed..0c04f31 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java
@@ -10,6 +10,7 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.resource.customer.CustomerApprovalListRequest;
 import com.casic.missiles.dto.resource.customer.CustomerSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceCustomerInfo;
@@ -26,6 +27,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -55,6 +57,13 @@
         return customerInfoService.saveCustomerInfo(request);
     }
 
+    @ApiOperation("委托方名录导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody CustomerApprovalListRequest request) throws Exception {
+        List<BizResourceCustomerInfo> list = super.exportList(request);
+        super.exportExcel(BizResourceCustomerInfo.class, list, ExportEnum.CUSTOMER_INFO.getSheetName());
+    }
+
     @ApiOperation("委托方人员列表（分页）")
     @PostMapping("/person/listPage")
     public ReturnDTO<PageInfoBT<BizResourceCustomerStaff>> personListPage(@RequestBody IdDTO idDto) {
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
index 972ed4b..6418ea5 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
@@ -5,6 +5,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.resource.customer.SuggestFormApprovalListRequest;
 import com.casic.missiles.dto.resource.customer.SuggestFormSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceCustomerSuggestForm;
@@ -20,6 +21,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -50,4 +52,11 @@
         return suggestFormService.saveSuggestForm(request);
     }
 
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody SuggestFormApprovalListRequest request) throws Exception {
+        List<BizResourceCustomerSuggestForm> list = super.exportList(request);
+        super.exportExcel(BizResourceCustomerSuggestForm.class, list, ExportEnum.CUSTOMER_SUGGEST_FORM.getSheetName());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java
index 1934d1a..9e07eab 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java
@@ -15,12 +15,16 @@
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.resource.IEnvEnvironmentRecordConfigService;
 import com.casic.missiles.service.resource.IEnvEnvironmentRecordDataService;
+import com.casic.missiles.service.resource.IEnvLocationInfoService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
 import java.util.List;
@@ -39,6 +43,8 @@
     private IEnvEnvironmentRecordDataService environmentRecordDataService;
     @Autowired
     private IEnvEnvironmentRecordConfigService environmentRecordConfigService;
+    @Autowired
+    private IEnvLocationInfoService locationInfoService;
 
     @ApiOperation("环境记录单数据列表/详情")
     @PostMapping("/data/listPage")
@@ -95,4 +101,11 @@
         });
         return environmentRecordConfigService.deleteEnvironmentRecordConfig(idDTO.getId());
     }
+
+    @ApiOperation("地点列表")
+    @PostMapping("/location/listPage")
+    public ReturnDTO<PageInfoBT<LocationListResponse>> locationListPage(@RequestBody @Valid LocationListRequest request) {
+        Page<LocationListResponse> page = PageFactory.defaultPage();
+        return ReturnUtil.success(super.packForBT(locationInfoService.listPage(page, request)));
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java
index 82efe3f..e9561fa 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java
@@ -10,6 +10,7 @@
 import com.casic.missiles.dto.resource.seal.SealLogListRequest;
 import com.casic.missiles.dto.resource.seal.SealNoteApprovalListRequest;
 import com.casic.missiles.dto.resource.seal.SealNoteSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceSealUseLog;
@@ -27,6 +28,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -58,6 +60,13 @@
         return sealUseNoteService.saveSeal(request);
     }
 
+    @ApiOperation("印章使用登记导出（列表和导出中去掉经办人和监印人）")
+    @PostMapping("/listExport")
+    public void export(@RequestBody SealNoteApprovalListRequest request) throws Exception {
+        List<BizResourceSealUseNote> list = super.exportList(request);
+        super.exportExcel(BizResourceSealUseNote.class, list, ExportEnum.SEAL_NOTE.getSheetName());
+    }
+
     // TODO: 2023/7/28 印章使用日志：系统中使用印章时插入数据库
 
     @ApiOperation("印章使用日志列表（分页）")
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java
index 9b674fc..06b6521 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java
@@ -9,16 +9,20 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.resource.staff.StaffCertRequest;
 import com.casic.missiles.dto.resource.staff.StaffCertResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.service.resource.IBizResourceStaffInfoService;
 import com.casic.missiles.service.resource.IBizResourceStaffVerifierService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.List;
+
 /**
  * @Description:
  * @Author: wangpeng
@@ -41,9 +45,21 @@
         return ReturnUtil.success(super.packForBT(responsePage));
     }
 
+    @ApiOperation("证书逾期提醒导出")
+    @PostMapping("/listExport")
+    public void exportList(@RequestBody StaffCertRequest request) throws Exception {
+        List<StaffCertResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = staffInfoService.certListByIds(request.getIds());
+        } else {
+            list = staffInfoService.certList(request);
+        }
+        super.exportExcel(StaffCertResponse.class, list, ExportEnum.STAFF_CERTIFICATE_EXPIRE.getSheetName());
+    }
+
     @ApiOperation("证书逾期提醒")
     @PostMapping("/expirationReminder")
-    public ReturnDTO expirationReminder(@RequestBody IdDTO idDto) {
-        return verifierService.expirationReminder(idDto);
+    public ReturnDTO expirationReminder(@RequestBody IdDTO idDTO) {
+        return verifierService.expirationReminder(idDTO);
     }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java
index 3b251ad..a6e7850 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java
@@ -12,6 +12,7 @@
 import com.casic.missiles.dto.resource.staff.StaffListRequest;
 import com.casic.missiles.dto.resource.staff.TrainListRequest;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.*;
@@ -22,7 +23,10 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
 import java.util.List;
@@ -52,8 +56,19 @@
             throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
         }
         Page<BizResourceStaffInfo> page = PageFactory.defaultPage();
-        Page<BizResourceStaffInfo> responsePage = staffInfoService.listPage(page, request);
-        return ReturnUtil.success(super.packForBT(responsePage));
+        return ReturnUtil.success(super.packForBT(staffInfoService.listPage(page, request)));
+    }
+
+    @ApiOperation("人员登记导出")
+    @PostMapping("/listExport")
+    public void exportList(@RequestBody StaffListRequest request) throws Exception {
+        List<BizResourceStaffInfo> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = staffInfoService.listByIds(request.getIds());
+        } else {
+            list = staffInfoService.list(request);
+        }
+        super.exportExcel(BizResourceStaffInfo.class, list, ExportEnum.STAFF_INFO.getSheetName());
     }
 
     @ApiOperation("人员登记详情基础信息")
@@ -85,9 +100,9 @@
 
     @ApiOperation("科研教育列表（分页）")
     @PostMapping("/education/listPage")
-    public ReturnDTO<PageInfoBT<BizResourceStaffEducation>> educationListPage(@RequestBody IdDTO idDto) {
+    public ReturnDTO<PageInfoBT<BizResourceStaffEducation>> educationListPage(@RequestBody IdDTO idDTO) {
         Page<BizResourceStaffEducation> page = PageFactory.defaultPage();
-        Page<BizResourceStaffEducation> responsePage = staffInfoService.educationListPage(page, idDto);
+        Page<BizResourceStaffEducation> responsePage = staffInfoService.educationListPage(page, idDTO);
         return ReturnUtil.success(super.packForBT(responsePage));
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java
index af6aa86..d85d84a 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java
@@ -9,6 +9,7 @@
 import com.casic.missiles.dto.resource.outsideService.SupplierApprovalListRequest;
 import com.casic.missiles.dto.resource.outsideService.SupplierSaveResponse;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceSupplierAbility;
@@ -67,6 +68,13 @@
         return ReturnUtil.success(supplierInfoService.detail(idDTO.getId()));
     }
 
+    @ApiOperation("合格供方导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody SupplierApprovalListRequest request) throws Exception {
+        List<BizResourceSupplierInfo> list = super.exportList(request);
+        super.exportExcel(BizResourceSupplierInfo.class, list, ExportEnum.SUPPLIER_INFO.getSheetName());
+    }
+
     @ApiOperation("供方人员列表（分页）")
     @PostMapping("/person/listPage")
     public ReturnDTO<PageInfoBT<BizResourceSupplierPerson>> personListPage(@RequestBody IdDTO idDTO) {
diff --git a/casic-metering-api/src/main/resources/config/application.yml b/casic-metering-api/src/main/resources/config/application.yml
index 350db5f..ecff521 100644
--- a/casic-metering-api/src/main/resources/config/application.yml
+++ b/casic-metering-api/src/main/resources/config/application.yml
@@ -126,7 +126,7 @@
     #作者
     author: wangpeng
     #待生成对象表名
-    table-name: biz_equipment_technical_target_approval,biz_equipment_attachment_approval,biz_equipment_checkpoint_approval
+    table-name: biz_business_outsource_protocol
 
 reminder:
   #节点--common模块config包 ReminderNodeConfig配置
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
index 4a19e4e..d47d552 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
@@ -53,6 +53,7 @@
     SUGGEST_FORM_SAVE_FAILED(2509, "委托方意见登记表保存至草稿箱失败"),
     EXAMINE_FORM_SAVE_FAILED(2510, "要求、委托书及合同评审表保存至草稿箱失败"),
     CUSTOMER_EXIST_SAVE_FAILED(2511, "该委托方已存在，请重新选择"),
+    DUPLICATE_LOCATION_NO(2512, "地点编号已存在"),
 
     /**
      * 计量检定业务模块
@@ -68,6 +69,8 @@
     COMPLETE_SAMPLE_NOT_EXIST(2609, "检测中不存在扫描收入的样品"),
     CANNOT_CHANGE_MEASURE_INFO(2610, "无法更改非当前登录用户的检测信息"),
     NON_EXIST_ORDER_OR_SAMPLE(2611, "不存在该委托单或该委托单下的样品"),
+    OUTSOURCE_ACCESS_SAVE_FAILED(2612, "测试、校准或检定工作分包评审表保存至草稿箱失败"),
+    OUTSOURCE_PROTOCOL_SAVE_FAILED(2613, "测试、校准或检定工作分包协议书保存至草稿箱失败"),
 
     /**
      * 历史遗留备用
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
index 5089ad1..81a406b 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
@@ -10,54 +10,38 @@
     /**
      * 资源管理
      */
-    ENVIRONMENT_DATA_EXPORT("environmentData", "environmentData", "环境记录单数据"),
+    ENVIRONMENT_DATA_EXPORT("environmentData", "环境记录单数据", "环境记录单数据"),
+    STAFF_INFO("staffInfo", "人员登记", "人员登记"),
+    STAFF_CERTIFICATE_EXPIRE("certificateExpire", "证书逾期提醒", "证书逾期提醒"),
+    SUPPLIER_INFO("supplierInfo", "合格供方名录", "合格供方名录"),
+    CUSTOMER_INFO("customerInfo", "委托方名录", "委托方名录"),
+    CUSTOMER_SUGGEST_FORM("customerSuggestForm", "委托方意见登记表", "委托方意见登记表"),
+    SEAL_NOTE("sealNote", "印章使用登记", "印章使用登记"),
 
-    FILE_EXPORT("meterFileData", "meterFileData", "计量文件信息"),
-    TRAIN_PLAN_EXPORT("trainPlanData", "trainPlanData", "培训计划"),
-    TRAIN_LOG_EXPORT("trainLogData", "trainLogData", "培训记录"),
-    METER_ORGANIZE_EXPORT("meterOrganizeData", "meterOrganizeData", "计量组织"),
-    TRACE_SUPPLIER_EXPORT("traceSupplierData", "traceSupplierData", "溯源供方"),
-    SIGN_EXPORT("signData", "signData", "签名/签章"),
-    TEMPLATE_EXPORT("templateData", "templateData", "原始记录模板/证书报告模板"),
-    FIXED_ASSETS("meterFixedAssets", "meterFixedAssets", "固定资产"),
-    METER_EQUIPMENT("meterEquipment", "meterEquipment", "测量设备"),
-    CALIBRATION_TEST_EQUIPMENT("calibrationTestEquipment", "calibrationTestEquipment", "校准检定设备"),
-    MEASURE_ACCOUNT("measureAccount", "measureAccount", "测量工装"),
-    STANDARD_SUPPORT_EQUIPMENT("standardSupportEquipment", "standardSupportEquipment", "标准配套设备"),
-    STANDARD_EQUIPMENT("standardEquipment", "standardEquipment", "标准装置"),
-    FLOW_DEF_EXPORT("flowDefData", "flowDefData", "流程定义"),
-    STAFF_CERTIFICATE("certificate", "certificate", "计量人员证书"),
-    CHECK_INFO("checkInfo", "checkInfo", "设备管理点检测"),
-    EQUIPMENT_APPLY("equipmentApply", "equipmentApply", "设备借用"),
-    STANDARD_EQUIPMENT_REMIND("equipmentApplyRemind", "equipmentApplyRemind", "标准装置到期提醒"),
-    METER_PRICE("meterPrice", "meterPrice", "价格库"),
-    METER_STAFF("meterStaff", "meterStaff", "计量人员"),
-    STANDARD_EQUIPMENT_APPLY("standardEquipmentApply", "standardEquipmentApply", "标准装置申请"),
-    STATE_MANAGE_APPLY("stateManage", "stateManage", "状态管理"),
-    METER_ACCEPTANCE_CHECK("acceptanceCheck", "acceptanceCheck", "设备检修保养验收单"),
-    CUSTOMER_EXPORT("customerData", "customerData", "客户信息"),
-    ORDER_EXPORT("orderData", "orderData", "委托书信息"),
-    SAMPLE_EXPORT("sampleData", "sampleData", "样本信息"),
-    EXCHANGE_DATA("exchangeData", "exchangeData", "设备交接单"),
-    DISPATCH_DATA("dispatchData", "dispatchData", "设备收发"),
-    ENVIRONMENT_DATA("environmentData", "environmentData", "环境记录单"),
-    ORIGIN_DATA("originData", "originData", "原始记录"),
-    CERTIFICATE_REPORT("certificateReport", "certificateReport", "证书报告"),
-    ADVICE_EXPORT("adviceData", "adviceData", "客户反馈"),
-    HANDOUT_EXPORT("handoutData", "handoutData", "任务分发列表"),
-    OUTSOURCER_EXPORT("outsourcerData", "outsourcerData", "分包方"),
-    SITE_EXECUTIVE_EXPORT("siteExecutiveData", "siteExecutiveData", "现场测试、校准或检定"),
-    CERTIFICATE_PRINT_EXPORT("certificatePrintData", "certificatePrintData", "证书打印"),
-    DOWNLOAD_TEMPLATE("downloadTemplate", "downloadTemplate", "页面配置"),
-    OUTSOURCER_CERTIFICATE_EXPORT("outsourceCertificateData", "outsourceCertificateData", "分包证书"),
-    SETTLEMENT_INFO_EXPORT("settlementInfoData", "settlementInfoData", "业务结算"),
-    EQUIPMENT_REMIND("equipmentRemind", "equipmentRemind", "设备到期提醒"),
-    AGREEMENT_INFO_EXPORT("agreementInfoData", "agreementInfoData", "合同"),
-    WORK_STATISTICS_EXPORT("workStatisticsData", "workStatisticsData", "实时工作统计"),
-    DEPT_OUTPUT_EXPORT("deptOutputData", "deptOutputData", "部门产值分析"),
-    WORKLOAD_EXPORT("workloadData", "workloadData", "业务工作量分析"),
-    DEPT_COMPREHENSIVE_EXPORT("deptComprehensiveData", "deptComprehensiveData", "部门综合分析"),
-    ENVIRONMENTAL_RECORD("environmentalRecordData", "environmentalRecordData", "现场环境记录");
+    /**
+     * 计量检定业务
+     */
+    OUTSOURCER_EXPORT("outsourcerData", "分包方名录", "分包方名录"),
+    IDENTIFY_EXPORT("identifyData", "计量标识", "计量标识"),
+    ORDER_EXPORT("orderData", "任务单", "任务单"),
+    DISPATCH_DATA("dispatchData", "设备收发", "设备收发"),
+    HANDOUT_EXPORT("handoutData", "任务分发", "任务分发"),
+    SITE_EXECUTIVE_EXPORT("siteExecutiveData", "现场测试、校准或检定", "现场测试、校准或检定"),
+    CERTIFICATE_REPORT("certificateReport", "证书审批", "证书审批"),
+    CERTIFICATE_CHANGE_APPLY("certificateChangeApply", "证书报告补充或更换申请单", "证书报告补充或更换申请单"),
+    CERTIFICATE_PRINT("certificatePrintData", "证书打印审批", "证书打印审批"),
+    DEPT_EXECUTIVE_TASK("deptExecutiveTaskData", "实验室任务", "实验室任务"),
+    MY_EXECUTIVE_TASK("myExecutiveTaskData", "我的任务", "我的任务"),
+    OUTSOURCE_ASSESS("outsourceAssess", "测试、校准或检定工作分包评审表", "测试、校准或检定工作分包评审表"),
+    OUTSOURCE_PROTOCOL("outsourceProtocol", "测试、校准或检定工作分包协议书", "测试、校准或检定工作分包协议书"),
+
+    /**
+     * 系统管理
+     */
+    SIGN_EXPORT("signData", "签名", "签名"),
+    TEMPLATE_EXPORT("templateData", "文件模板", "文件模板"),
+    FLOW_DEF_EXPORT("flowDefData", "流程定义", "流程定义"),
+    DOWNLOAD_TEMPLATE("downloadTemplate", "流程定义", "页面配置");
 
     ExportEnum(String fileName, String sheetName, String description) {
         this.fileName = fileName;
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateRecordTypeCodeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateRecordTypeCodeEnum.java
index 31d913c..a963522 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateRecordTypeCodeEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateRecordTypeCodeEnum.java
@@ -46,4 +46,14 @@
     String SITE_EXECUTIVE_APPROVAL = "01";
     //《现场测试、校准或检定工作记录表》
     String SITE_EXECUTIVE_LOG = "02";
+
+    //测试、校准或检定工作分包协议书
+    String OUTSOURCE_PROTOCOL = "01";
+    //测试、校准或检定工作分包评审表
+    String OUTSOURCE_ACCESS = "02";
+    //测试、校准或检定工作分包通知书
+    String OUTSOURCE_NOTICE = "03";
+    //测试、校准或检定工作分包方名录
+    String OUTSOURCE_INFO = "04";
+
 }
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
index 24b8635..f78bd53 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
@@ -15,6 +15,10 @@
     String CERTIFICATE_CHANGE_APPLY_BEAN_NAME = "certificateChangeApplyBean";
     //现场测试、校准或检定
     String SITE_EXECUTIVE_BEAN_NAME = "siteExecutiveBean";
+    //测试、校准或检定工作分包评审表
+    String OUTSOURCE_ASSESS_BEAN_NAME = "outsourceAssessBean";
+    //测试、校准或检定工作分包协议书
+    String OUTSOURCE_PROTOCOL_BEAN_NAME = "outsourceProtocolBean";
 
     /*********************************设备与装置************************************/
     //设备台账
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 b21c661..6b86fd1 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
@@ -18,6 +18,8 @@
     OUTSOURCER_APPROVAL(OUTSOURCER_BEAN_NAME, ""),
     CERTIFICATE_CHANGE_APPROVAL(CERTIFICATE_CHANGE_APPLY_BEAN_NAME, ""),
     SITE_EXECUTIVE_APPROVAL(SITE_EXECUTIVE_BEAN_NAME, ""),
+    OUTSOURCE_ASSESS_APPROVAL(OUTSOURCE_ASSESS_BEAN_NAME, ""),
+    OUTSOURCE_PROTOCOL_APPROVAL(OUTSOURCE_PROTOCOL_BEAN_NAME, ""),
 
     ACTION_STATUS_MAP(new HashMap<String, AwareActionStatusEnum>() {
         {
@@ -47,6 +49,10 @@
             put(ApplyFromIdEnum.CERTIFICATE_CHANGE_APPROVAL.getCode(), CERTIFICATE_CHANGE_APPROVAL);
             //现场测试、校准或检定审批
             put(ApplyFromIdEnum.SITE_EXECUTIVE_APPROVAL.getCode(), SITE_EXECUTIVE_APPROVAL);
+            //测试、校准或检定工作分包评审表
+            put(ApplyFromIdEnum.OUTSOURCE_ASSESS_APPROVAL.getCode(), OUTSOURCE_ASSESS_APPROVAL);
+            //测试、校准或检定工作分包协议书
+            put(ApplyFromIdEnum.OUTSOURCE_PROTOCOL_APPROVAL.getCode(), OUTSOURCE_PROTOCOL_APPROVAL);
         }
     });
     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 934405e..c7410bd 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
@@ -9,6 +9,8 @@
     CERTIFICATE_CHANGE_APPROVAL("jljdywzsbchghsqd", MessageSourceModuleEnum.BUSINESS.getCode(), "证书/报告补充或更换申请单"),
     OUTSOURCER_APPROVAL("jljdywcsjzhgfbfml", MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定合格分包方名录"),
     SITE_EXECUTIVE_APPROVAL("jljdywxccsjzsp", MessageSourceModuleEnum.BUSINESS.getCode(), "现场测试、校准或检定审批"),
+    OUTSOURCE_ASSESS_APPROVAL("jljdywcsjzfbpsb", MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包评审表"),
+    OUTSOURCE_PROTOCOL_APPROVAL("jljdywcsjzfbxys", MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包协议书"),
 
 
     /*******************************************设备与装置*********************************************/
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/GeneralApprovalMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/GeneralApprovalMapper.java
index 4fb7344..0c9d6ae 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/GeneralApprovalMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/GeneralApprovalMapper.java
@@ -17,8 +17,4 @@
 
     Page<O> selectBatchForApprovalList(Page<O> page, @Param("request") R request, @Param("businessKeys") List<String> businessKeys);
 
-//    Page<O> selectListPage(Page<O> page, @Param("request") R request);
-
-//    Long selectMaxNo();
-
 }
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceAssessMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceAssessMapper.java
index 7867bb8..ba59009 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceAssessMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceAssessMapper.java
@@ -1,7 +1,12 @@
 package com.casic.missiles.mapper.business;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.business.outsource.OutsourceAssessApprovalListRequest;
+import com.casic.missiles.mapper.GeneralApprovalMapper;
 import com.casic.missiles.model.business.BizBusinessOutsourceAssess;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * <p>
@@ -11,6 +16,10 @@
  * @author wangpeng
  * @since 2023-08-16
  */
-public interface BizBusinessOutsourceAssessMapper extends BaseMapper<BizBusinessOutsourceAssess> {
+public interface BizBusinessOutsourceAssessMapper extends GeneralApprovalMapper<BizBusinessOutsourceAssess, BizBusinessOutsourceAssess, OutsourceAssessApprovalListRequest> {
+
+    Page<BizBusinessOutsourceAssess> selectBatchForApprovalList(Page<BizBusinessOutsourceAssess> page, @Param("request") OutsourceAssessApprovalListRequest request, @Param("businessKeys") List<String> businessKeys);
+
+    Long selectMaxProjectNo();
 
 }
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceProtocolMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceProtocolMapper.java
new file mode 100644
index 0000000..e6aba35
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceProtocolMapper.java
@@ -0,0 +1,24 @@
+package com.casic.missiles.mapper.business;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.business.outsource.OutsourceProtocolApprovalListRequest;
+import com.casic.missiles.mapper.GeneralApprovalMapper;
+import com.casic.missiles.model.business.BizBusinessOutsourceProtocol;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 计量检定业务-分包管理-测试、校准或检定工作分包协议书 Mapper 接口
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-08-24
+ */
+public interface BizBusinessOutsourceProtocolMapper extends GeneralApprovalMapper<BizBusinessOutsourceProtocol, BizBusinessOutsourceProtocol, OutsourceProtocolApprovalListRequest> {
+
+    Page<BizBusinessOutsourceProtocol> selectBatchForApprovalList(Page<BizBusinessOutsourceProtocol> page, @Param("request") OutsourceProtocolApprovalListRequest request, @Param("businessKeys") List<String> businessKeys);
+
+    Long selectMaxProtocolNo();
+}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/EnvLocationInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/EnvLocationInfoMapper.java
new file mode 100644
index 0000000..49eff87
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/EnvLocationInfoMapper.java
@@ -0,0 +1,21 @@
+package com.casic.missiles.mapper.resource;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.resource.environment.LocationListRequest;
+import com.casic.missiles.dto.resource.environment.LocationListResponse;
+import com.casic.missiles.model.resource.EnvLocationInfo;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * <p>
+ * 实验室环境监控系统-设备表 Mapper 接口
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-06-07
+ */
+public interface EnvLocationInfoMapper extends BaseMapper<EnvLocationInfo> {
+
+    Page<LocationListResponse> selectLocationListPage(Page<LocationListResponse> page, @Param("request") LocationListRequest request);
+}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java
index de124db..85ed0f7 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java
@@ -1,7 +1,9 @@
 package com.casic.missiles.mapper.system;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.dto.system.SignDetailResponse;
+import com.casic.missiles.dto.system.SignListRequest;
 import com.casic.missiles.model.system.SystemSign;
 import org.apache.ibatis.annotations.Param;
 
@@ -22,4 +24,8 @@
     SignDetailResponse selectSignDetailById(Long id);
 
     List<SystemSign> selectUsableSignList(@Param("userId") Long userId);
+
+    Page<SystemSign> selectSignListPage(Page<SystemSign> page, @Param("request") SignListRequest request);
+
+    List<SystemSign> selectSignList(@Param("request") SignListRequest request);
 }
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateChangeApplyMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateChangeApplyMapper.xml
index d798447..c496092 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateChangeApplyMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateChangeApplyMapper.xml
@@ -30,31 +30,31 @@
         SELECT *
         FROM biz_business_certificate_change_apply
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.changeApplyNo != null and request.changeApplyNo !=''">
+        <if test="request != null and request.changeApplyNo != null and request.changeApplyNo !=''">
             and change_apply_no like concat('%',#{request.changeApplyNo},'%')
         </if>
-        <if test="request.changeReportNo != null and request.changeReportNo !=''">
+        <if test="request != null and request.changeReportNo != null and request.changeReportNo !=''">
             and change_report_no like concat('%',#{request.changeReportNo},'%')
         </if>
-        <if test="request.changeReportName != null and request.changeReportName !=''">
+        <if test="request != null and request.changeReportName != null and request.changeReportName !=''">
             and change_report_name like concat('%',#{request.changeReportName},'%')
         </if>
-        <if test="request.changeType != null and request.changeType !=''">
+        <if test="request != null and request.changeType != null and request.changeType !=''">
             and change_type = #{request.changeType}
         </if>
-        <if test="request.createUserName != null and request.createUserName !=''">
+        <if test="request != null and request.createUserName != null and request.createUserName !=''">
             and create_user_name like concat('%',#{request.createUserName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificatePrintMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificatePrintMapper.xml
index b66cd99..49c0ac8 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificatePrintMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificatePrintMapper.xml
@@ -31,34 +31,34 @@
         LEFT JOIN biz_business_order_sample_relation bosr ON (bosr.order_id = bcr.order_id AND bosr.sample_id = bcr.sample_id)
         LEFT JOIN biz_business_order_info boi ON boi.id = bosr.order_id
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and bcp.approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.printStatus != null and request.printStatus !=''">
+        <if test="request != null and request.printStatus != null and request.printStatus !=''">
             and print_status = #{request.printStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and bcp.create_user_id = #{request.createUserId}
         </if>
-        <if test="request.certificateReportNo != null and request.certificateReportNo !=''">
+        <if test="request != null and request.certificateReportNo != null and request.certificateReportNo !=''">
             and bcr.certificate_report_no like concat('%',#{request.certificateReportNo},'%')
         </if>
-        <if test="request.certificateReportName != null and request.certificateReportName !=''">
+        <if test="request != null and request.certificateReportName != null and request.certificateReportName !=''">
             and bcr.certificate_report_name like concat('%',#{request.certificateReportName},'%')
         </if>
-        <if test="request.customerName != null and request.customerName !=''">
+        <if test="request != null and request.customerName != null and request.customerName !=''">
             and boi.customer_name like concat('%',#{request.customerName},'%')
         </if>
-        <if test="request.sampleNo != null and request.sampleNo !=''">
+        <if test="request != null and request.sampleNo != null and request.sampleNo !=''">
             and bosr.sample_no like concat('%',#{request.sampleNo},'%')
         </if>
-        <if test="request.sampleName != null and request.sampleName !=''">
+        <if test="request != null and request.sampleName != null and request.sampleName !=''">
             and bosr.sample_name like concat('%',#{request.sampleName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and bcp.create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and bcp.create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml
index b366034..767695d 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml
@@ -46,33 +46,37 @@
         SELECT bcr.*, bosr.sample_no, bosr.sample_name, bosr.sample_model, rsi.staff_name
         FROM biz_business_certificate_report bcr
         LEFT JOIN biz_business_order_sample_relation bosr ON (bosr.order_id = bcr.order_id AND bosr.sample_id = bcr.sample_id)
+        LEFT JOIN biz_business_order_info boi ON boi.id = bcr.order_id
         LEFT JOIN biz_resource_staff_info rsi ON rsi.id = bcr.measure_person_id
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and bcr.approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and bcr.create_user_id = #{request.createUserId}
         </if>
-        <if test="request.certificateReportNo != null and request.certificateReportNo !=''">
+        <if test="request != null and request.customerId != null and request.customerId !=''">
+            and boi.customer_id = #{request.customerId}
+        </if>
+        <if test="request != null and request.certificateReportNo != null and request.certificateReportNo !=''">
             and bcr.certificate_report_no like concat('%',#{request.certificateReportNo},'%')
         </if>
-        <if test="request.certificateReportName != null and request.certificateReportName !=''">
+        <if test="request != null and request.certificateReportName != null and request.certificateReportName !=''">
             and bcr.certificate_report_name like concat('%',#{request.certificateReportName},'%')
         </if>
-        <if test="request.sampleNo != null and request.sampleNo !=''">
+        <if test="request != null and request.sampleNo != null and request.sampleNo !=''">
             and bosr.sample_no like concat('%',#{request.sampleNo},'%')
         </if>
-        <if test="request.measureCategory != null and request.measureCategory !=''">
+        <if test="request != null and request.measureCategory != null and request.measureCategory !=''">
             and bcr.measure_category = #{request.measureCategory}
         </if>
-        <if test="request.measurePerson != null and request.measurePerson !=''">
+        <if test="request != null and request.measurePerson != null and request.measurePerson !=''">
             and rsi.staff_name like concat('%',#{request.measurePerson},'%')
         </if>
-        <if test="request.calibrationTimeStart != null and request.calibrationTimeStart !=''">
+        <if test="request != null and request.calibrationTimeStart != null and request.calibrationTimeStart !=''">
             and bcr.calibration_time &gt;= #{request.calibrationTimeStart}
         </if>
-        <if test="request.calibrationTimeEnd != null and request.calibrationTimeEnd !=''">
+        <if test="request != null and request.calibrationTimeEnd != null and request.calibrationTimeEnd !=''">
             and bcr.calibration_time &lt;= #{request.calibrationTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceAssessMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceAssessMapper.xml
index d0fcf8b..c22c101 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceAssessMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceAssessMapper.xml
@@ -7,6 +7,8 @@
         <id column="id" property="id" />
         <result column="project_no" property="projectNo" />
         <result column="project_name" property="projectName" />
+        <result column="lab_code" property="labCode" />
+        <result column="group_code" property="groupCode" />
         <result column="applicant_id" property="applicantId" />
         <result column="applicant_name" property="applicantName" />
         <result column="applicant_time" property="applicantTime" />
@@ -31,7 +33,45 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, project_no, project_name, applicant_id, applicant_name, applicant_time, minio_file_name, remark, create_user_id, create_user_name, outsourcer_id, pre_start_time, pre_end_time, outsource_reason, pre_cost, approval_status, process_id, approve_situation, traceability, test_method, technique_ability, create_time, update_time
+        id, project_no, project_name, lab_code, group_code, applicant_id, applicant_name, applicant_time, minio_file_name, remark, create_user_id, create_user_name, outsourcer_id, pre_start_time, pre_end_time, outsource_reason, pre_cost, approval_status, process_id, approve_situation, traceability, test_method, technique_ability, create_time, update_time
     </sql>
 
+    <select id="selectMaxProjectNo" resultType="java.lang.Long">
+        SELECT IFNULL(max(RIGHT(project_no, 3)), 0) from biz_business_outsource_assess
+    </select>
+
+    <select id="selectBatchForApprovalList" resultMap="BaseResultMap">
+        SELECT bboa.*, bboi.outsourcer_name, bboi.director
+        FROM biz_business_outsource_assess bboa
+        LEFT JOIN biz_business_outsourcer_info bboi ON bboa.outsourcer_id = bboi.id
+        WHERE 1=1
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
+            and bboa.approval_status = #{request.approvalStatus}
+        </if>
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
+            and bboa.create_user_id = #{request.createUserId}
+        </if>
+        <if test="request != null and request.projectNo != null and request.projectNo !=''">
+            and bboa.project_no like concat('%',#{request.projectNo},'%')
+        </if>
+        <if test="request != null and request.outsourcerName != null and request.outsourcerName !=''">
+            and bboi.outsourcer_name like concat('%',#{request.outsourcerName},'%')
+        </if>
+        <if test="request != null and request.applicantName != null and request.applicantName !=''">
+            and bboa.applicant_name like concat('%',#{request.applicantName},'%')
+        </if>
+        <if test="request != null and request.applicantTimeStart != null and request.applicantTimeStart !=''">
+            and bboa.applicant_time &gt;= #{request.applicantTimeStart}
+        </if>
+        <if test="request != null and request.applicantTimeEnd != null and request.applicantTimeEnd !=''">
+            and bboa.applicant_time &lt;= #{request.applicantTimeEnd}
+        </if>
+        <if test="businessKeys != null">
+            and bboa.id in
+            <foreach collection="businessKeys" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
+        ORDER BY bboa.create_time DESC
+    </select>
 </mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceProtocolMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceProtocolMapper.xml
new file mode 100644
index 0000000..b7b2149
--- /dev/null
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceProtocolMapper.xml
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.mapper.business.BizBusinessOutsourceProtocolMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.business.BizBusinessOutsourceProtocol">
+        <id column="id" property="id" />
+        <result column="protocol_no" property="protocolNo" />
+        <result column="project_name" property="projectName" />
+        <result column="lab_code" property="labCode" />
+        <result column="group_code" property="groupCode" />
+        <result column="outsourcer_id" property="outsourcerId" />
+        <result column="remark" property="remark" />
+        <result column="outsource_no" property="outsourceNo" />
+        <result column="outsource_name" property="outsourceName" />
+        <result column="contacts" property="contacts" />
+        <result column="mobile" property="mobile" />
+        <result column="address" property="address" />
+        <result column="require_date" property="requireDate" />
+        <result column="outsource_cost" property="outsourceCost" />
+        <result column="director" property="director" />
+        <result column="item" property="item" />
+        <result column="requires" property="requires" />
+        <result column="create_user_id" property="createUserId" />
+        <result column="create_user_name" property="createUserName" />
+        <result column="approval_status" property="approvalStatus" />
+        <result column="process_id" property="processId" />
+        <result column="create_time" property="createTime" />
+        <result column="update_time" property="updateTime" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, protocol_no, project_name, lab_code, group_code, outsourcer_id, remark, outsource_no, outsource_name, contacts, mobile, address, require_date, outsource_cost, director, item, requires, create_user_id, create_user_name, approval_status, process_id, create_time, update_time
+    </sql>
+
+    <select id="selectMaxProtocolNo" resultType="java.lang.Long">
+        SELECT IFNULL(max(RIGHT(protocol_no, 3)), 0) from biz_business_outsource_protocol
+    </select>
+
+    <select id="selectBatchForApprovalList" resultMap="BaseResultMap">
+        SELECT *
+        FROM biz_business_outsource_protocol
+        WHERE 1=1
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
+            and approval_status = #{request.approvalStatus}
+        </if>
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
+            and create_user_id = #{request.createUserId}
+        </if>
+        <if test="request != null and request.protocolNo != null and request.protocolNo !=''">
+            and protocol_no like concat('%',#{request.protocolNo},'%')
+        </if>
+        <if test="request != null and request.outsourcerName != null and request.outsourcerName !=''">
+            and outsourcer_name like concat('%',#{request.outsourcerName},'%')
+        </if>
+        <if test="request != null and request.applicantName != null and request.applicantName !=''">
+            and create_user_name like concat('%',#{request.applicantName},'%')
+        </if>
+        <if test="request != null and request.applicantTimeStart != null and request.applicantTimeStart !=''">
+            and create_time &gt;= #{request.applicantTimeStart}
+        </if>
+        <if test="request != null and request.applicantTimeEnd != null and request.applicantTimeEnd !=''">
+            and create_time &lt;= #{request.applicantTimeEnd}
+        </if>
+        <if test="businessKeys != null">
+            and id in
+            <foreach collection="businessKeys" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
+        ORDER BY create_time DESC
+    </select>
+</mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourcerInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourcerInfoMapper.xml
index 510a80b..3049b54 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourcerInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourcerInfoMapper.xml
@@ -7,6 +7,8 @@
         <id column="id" property="id" />
         <result column="outsourcer_no" property="outsourcerNo" />
         <result column="outsourcer_name" property="outsourcerName" />
+        <result column="lab_code" property="labCode" />
+        <result column="group_code" property="groupCode" />
         <result column="outsourcer_brief_name" property="outsourcerBriefName" />
         <result column="outsourcer_size" property="outsourcerSize" />
         <result column="business_size" property="businessSize" />
@@ -55,32 +57,32 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, outsourcer_no, outsourcer_name, outsourcer_brief_name, outsourcer_size, business_size, grade, evaluation, tax_number, bank_account, bank_name, bank_account_number, postal_code, director, phone, fax, mobile, email, website, address_country, address_province, address_city, address_area, full_address, address_country_name, address_province_name, address_city_name, address_area_name, invoice_country, invoice_province, invoice_city, invoice_area, invoice_full_address, invoice_country_name, invoice_province_name, invoice_city_name, invoice_area_name, business_scope, business_content, minio_file_name, approval_status, process_id, remark, create_user_id, create_user_name, create_time, update_time
+        id, outsourcer_no, outsourcer_name, lab_code, group_code, outsourcer_brief_name, outsourcer_size, business_size, grade, evaluation, tax_number, bank_account, bank_name, bank_account_number, postal_code, director, phone, fax, mobile, email, website, address_country, address_province, address_city, address_area, full_address, address_country_name, address_province_name, address_city_name, address_area_name, invoice_country, invoice_province, invoice_city, invoice_area, invoice_full_address, invoice_country_name, invoice_province_name, invoice_city_name, invoice_area_name, business_scope, business_content, minio_file_name, approval_status, process_id, remark, create_user_id, create_user_name, create_time, update_time
     </sql>
 
     <select id="selectBatchForApprovalList" resultMap="BaseResultMap">
         SELECT *
         FROM biz_business_outsourcer_info
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.outsourcerNo != null and request.outsourcerNo !=''">
+        <if test="request != null and request.outsourcerNo != null and request.outsourcerNo !=''">
             and outsourcer_no like concat('%',#{request.outsourcerNo},'%')
         </if>
-        <if test="request.outsourcerName != null and request.outsourcerName !=''">
+        <if test="request != null and request.outsourcerName != null and request.outsourcerName !=''">
             and outsourcer_name like concat('%',#{request.outsourcerName},'%')
         </if>
-        <if test="request.director != null and request.director !=''">
+        <if test="request != null and request.director != null and request.director !=''">
             and director like concat('%',#{request.director},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
@@ -93,6 +95,6 @@
     </select>
 
     <select id="selectMaxNo" resultType="java.lang.Long">
-        SELECT IFNULL(max(RIGHT(outsourcer_no, 12)), 0) from biz_business_outsourcer_info
+        SELECT IFNULL(max(RIGHT(outsourcer_no, 3)), 0) from biz_business_outsourcer_info
     </select>
 </mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessSiteExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessSiteExecutiveInfoMapper.xml
index 135c5d0..3c5ae79 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessSiteExecutiveInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessSiteExecutiveInfoMapper.xml
@@ -38,25 +38,25 @@
         FROM biz_business_site_executive_info bsei
         LEFT JOIN biz_resource_customer_info rci ON bsei.customer_id = rci.id
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and bsei.approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and bsei.create_user_id = #{request.createUserId}
         </if>
-        <if test="request.siteExecutiveNo != null and request.siteExecutiveNo !=''">
+        <if test="request != null and request.siteExecutiveNo != null and request.siteExecutiveNo !=''">
             and bsei.site_executive_no like concat('%',#{request.siteExecutiveNo},'%')
         </if>
-        <if test="request.customerName != null and request.customerName !=''">
+        <if test="request != null and request.customerName != null and request.customerName !=''">
             and rci.outsourcer_name like concat('%',#{request.customerName},'%')
         </if>
-        <if test="request.applyName != null and request.applyName !=''">
+        <if test="request != null and request.applyName != null and request.applyName !=''">
             and bsei.apply_name like concat('%',#{request.applyName},'%')
         </if>
-        <if test="request.applyTimeStart != null and request.applyTimeStart !=''">
+        <if test="request != null and request.applyTimeStart != null and request.applyTimeStart !=''">
             and bsei.apply_time &gt;= #{request.applyTimeStart}
         </if>
-        <if test="request.applyTimeEnd != null and request.applyTimeEnd !=''">
+        <if test="request != null and request.applyTimeEnd != null and request.applyTimeEnd !=''">
             and bsei.apply_time &lt;= #{request.applyTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml
index 84d9e2a..6bd38a9 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml
@@ -105,6 +105,12 @@
         <if test="request.isUrgent != null and request.isUrgent !=''">
             AND bo.is_urgent = #{request.isUrgent}
         </if>
+        <if test="request.ids != null">
+            and blei.id in
+            <foreach collection="request.ids" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
         ORDER BY blei.update_time DESC
     </select>
 
@@ -137,6 +143,12 @@
         <if test="request.isUrgent != null and request.isUrgent !=''">
             AND bo.is_urgent = #{request.isUrgent}
         </if>
+        <if test="request.ids != null">
+            and blei.id in
+            <foreach collection="request.ids" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
         ORDER BY blei.update_time DESC
     </select>
 
diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardInfoMapper.xml
index 1a5551b..2ed8d17 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardInfoMapper.xml
@@ -45,12 +45,6 @@
         FROM biz_equipment_standard_info besi
         LEFT JOIN biz_equipment_standard_technology_relation bestr ON besi.standard_no = bestr.standard_no
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
-            and besi.approval_status = #{request.approvalStatus}
-        </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
-            and besi.create_user_id = #{request.createUserId}
-        </if>
         <if test="request.standardName != null and request.standardName !=''">
             and besi.standard_name like concat('%',#{request.standardName},'%')
         </if>
diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardTechnologyRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardTechnologyRelationMapper.xml
index fc7e16c..cd03c8c 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardTechnologyRelationMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardTechnologyRelationMapper.xml
@@ -6,6 +6,7 @@
     <resultMap id="BaseResultMap" type="com.casic.missiles.model.equipment.BizEquipmentStandardTechnologyRelation">
         <id column="id" property="id" />
         <result column="technology_file_id" property="technologyFileId" />
+        <result column="technology_file_no" property="technologyFileNo" />
         <result column="technology_file_name" property="technologyFileName" />
         <result column="standard_id" property="standardId" />
         <result column="standard_no" property="standardNo" />
@@ -14,7 +15,7 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, technology_file_id, technology_file_name, standard_id, remark
+        id, technology_file_id, technology_file_no, technology_file_name, standard_id, remark
     </sql>
 
 </mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceAuthorizeOrderMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceAuthorizeOrderMapper.xml
index ac5176c..554fe65 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceAuthorizeOrderMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceAuthorizeOrderMapper.xml
@@ -32,22 +32,22 @@
         SELECT *
         FROM biz_resource_authorize_order
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.orderNo != null and request.orderNo !=''">
+        <if test="request != null and request.orderNo != null and request.orderNo !=''">
             and order_no like concat('%',#{request.orderNo},'%')
         </if>
-        <if test="request.createUserName != null and request.createUserName !=''">
+        <if test="request != null and request.createUserName != null and request.createUserName !=''">
             and create_user_name like concat('%',#{request.createUserName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerExamineFormMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerExamineFormMapper.xml
index ab242f6..af7f98f 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerExamineFormMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerExamineFormMapper.xml
@@ -41,28 +41,28 @@
         SELECT *
         FROM biz_resource_customer_examine_form
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.formNo != null and request.formNo !=''">
+        <if test="request != null and request.formNo != null and request.formNo !=''">
             and form_no like concat('%',#{request.formNo},'%')
         </if>
-        <if test="request.labCode != null and request.labCode !=''">
+        <if test="request != null and request.labCode != null and request.labCode !=''">
             and lab_code like concat('%',#{request.labCode},'%')
         </if>
-        <if test="request.groupCode != null and request.groupCode !=''">
+        <if test="request != null and request.groupCode != null and request.groupCode !=''">
             and group_code like concat('%',#{request.groupCode},'%')
         </if>
-        <if test="request.createUserName != null and request.createUserName !=''">
+        <if test="request != null and request.createUserName != null and request.createUserName !=''">
             and create_user_name like concat('%',#{request.createUserName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerInfoMapper.xml
index fa8ffbc..06a2798 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerInfoMapper.xml
@@ -33,25 +33,25 @@
         SELECT *
         FROM biz_resource_customer_info
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.customerNo != null and request.customerNo !=''">
+        <if test="request != null and request.customerNo != null and request.customerNo !=''">
             and customer_no like concat('%',#{request.customerNo},'%')
         </if>
-        <if test="request.customerName != null and request.customerName !=''">
+        <if test="request != null and request.customerName != null and request.customerName !=''">
             and customer_name like concat('%',#{request.customerName},'%')
         </if>
-        <if test="request.contacts != null and request.contacts !=''">
+        <if test="request != null and request.contacts != null and request.contacts !=''">
             and contacts like concat('%',#{request.contacts},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerSuggestFormMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerSuggestFormMapper.xml
index 28f5bb2..1806662 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerSuggestFormMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerSuggestFormMapper.xml
@@ -33,28 +33,28 @@
         SELECT *
         FROM biz_resource_customer_suggest_form
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.formNo != null and request.formNo !=''">
+        <if test="request != null and request.formNo != null and request.formNo !=''">
             and form_no like concat('%',#{request.formNo},'%')
         </if>
-        <if test="request.customerName != null and request.customerName !=''">
+        <if test="request != null and request.customerName != null and request.customerName !=''">
             and customer_name like concat('%',#{request.customerName},'%')
         </if>
-        <if test="request.customerDeptName != null and request.customerDeptName !=''">
+        <if test="request != null and request.customerDeptName != null and request.customerDeptName !=''">
             and customer_dept_name like concat('%',#{request.customerDeptName},'%')
         </if>
-        <if test="request.createUserName != null and request.createUserName !=''">
+        <if test="request != null and request.createUserName != null and request.createUserName !=''">
             and create_user_name like concat('%',#{request.createUserName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSealUseNoteMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSealUseNoteMapper.xml
index ab37bc1..b02bb33 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSealUseNoteMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSealUseNoteMapper.xml
@@ -29,32 +29,32 @@
     </sql>
 
     <select id="selectBatchForApprovalList" resultMap="BaseResultMap">
-        SELECT *
+        SELECT brsun.*, brsi.seal_name, brsi.seal_type, brsi.approver_name
         FROM biz_resource_seal_use_note brsun
         JOIN biz_resource_seal_info brsi ON brsun.seal_id = brsi.id
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and brsun.approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and brsun.create_user_id = #{request.createUserId}
         </if>
-        <if test="request.sealName != null and request.sealName !=''">
+        <if test="request != null and request.sealName != null and request.sealName !=''">
             and brsi.seal_name like concat('%',#{request.sealName},'%')
         </if>
-        <if test="request.sealType != null and request.sealType !=''">
+        <if test="request != null and request.sealType != null and request.sealType !=''">
             and brsi.seal_type = #{request.sealType}
         </if>
-        <if test="request.applyDeptName != null and request.applyDeptName !=''">
+        <if test="request != null and request.applyDeptName != null and request.applyDeptName !=''">
             and brsun.apply_dept_name like concat('%',#{request.applyDeptName},'%')
         </if>
-        <if test="request.applyUserName != null and request.applyUserName !=''">
+        <if test="request != null and request.applyUserName != null and request.applyUserName !=''">
             and brsun.apply_user_name like concat('%',#{request.applyUserName},'%')
         </if>
-        <if test="request.applyTimeStart != null and request.applyTimeStart !=''">
+        <if test="request != null and request.applyTimeStart != null and request.applyTimeStart !=''">
             and brsun.apply_time &gt;= #{request.applyTimeStart}
         </if>
-        <if test="request.applyTimeEnd != null and request.applyTimeEnd !=''">
+        <if test="request != null and request.applyTimeEnd != null and request.applyTimeEnd !=''">
             and brsun.apply_time &lt;= #{request.applyTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml
index 119bf7d..4f8392a 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml
@@ -31,6 +31,12 @@
         <if test="request.deptName != null and request.deptName !=''">
             and brsi.dept_name like concat('%',#{request.deptName},'%')
         </if>
+        <if test="request.ids != null">
+            and brsv.id in
+            <foreach collection="request.ids" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
         ORDER BY brsv.grant_date DESC
     </select>
 
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSupplierInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSupplierInfoMapper.xml
index fe8d399..e8ce7ef 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSupplierInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSupplierInfoMapper.xml
@@ -48,28 +48,28 @@
         SELECT *
         FROM biz_resource_supplier_info
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.supplierNo != null and request.supplierNo !=''">
+        <if test="request != null and request.supplierNo != null and request.supplierNo !=''">
             and supplier_no like concat('%',#{request.supplierNo},'%')
         </if>
-        <if test="request.supplierName != null and request.supplierName !=''">
+        <if test="request != null and request.supplierName != null and request.supplierName !=''">
             and supplier_name like concat('%',#{request.supplierName},'%')
         </if>
-        <if test="request.director != null and request.director !=''">
+        <if test="request != null and request.director != null and request.director !=''">
             and director like concat('%',#{request.director},'%')
         </if>
-        <if test="request.supplierType != null and request.supplierType !=''">
+        <if test="request != null and request.supplierType != null and request.supplierType !=''">
             and supplier_type = #{request.supplierType}
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/EnvLocationInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/EnvLocationInfoMapper.xml
new file mode 100644
index 0000000..68bcf10
--- /dev/null
+++ b/casic-metering-dao/src/main/resources/mapper/resource/EnvLocationInfoMapper.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.mapper.resource.EnvLocationInfoMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.resource.EnvLocationInfo">
+        <id column="id" property="id" />
+        <result column="location_no" property="locationNo" />
+        <result column="location_name" property="locationName" />
+        <result column="location_position" property="locationPosition" />
+        <result column="create_user_id" property="createUserId" />
+        <result column="create_user" property="createUser" />
+        <result column="create_time" property="createTime" />
+        <result column="update_time" property="updateTime" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, location_no, location_name, location_position, create_user_id, create_user, create_time, update_time
+    </sql>
+
+    <select id="selectLocationListPage" resultType="com.casic.missiles.dto.resource.environment.LocationListResponse">
+        SELECT *
+        FROM env_location_info
+        WHERE 1=1
+        <if test="request.locationNo != null and request.locationNo !=''">
+            AND location_no LIKE concat('%',#{request.locationNo},'%')
+        </if>
+        <if test="request.locationName != null and request.locationName !=''">
+            AND location_name LIKE concat('%',#{request.locationName},'%')
+        </if>
+        ORDER BY create_time DESC
+    </select>
+
+</mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml
index b28c18f..8854047 100644
--- a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml
@@ -11,7 +11,6 @@
         <result column="sign_desc" property="signDesc" />
         <result column="sign_director" property="signDirector" />
         <result column="sign_user_id" property="signUserId" />
-        <result column="sign_type" property="signType" />
         <result column="minio_file_name" property="minioFileName" />
         <result column="create_time" property="createTime" />
         <result column="update_time" property="updateTime" />
@@ -28,7 +27,6 @@
         <result column="sign_name" property="signName" />
         <result column="sign_desc" property="signDesc" />
         <result column="sign_director" property="signDirector" />
-        <result column="sign_type" property="signType" />
         <result column="sign_user_id" property="signUserId" />
         <result column="minio_file_name" property="minioFileName" />
         <result column="create_time" property="createTime" />
@@ -62,4 +60,58 @@
         JOIN system_sign_user_relation ssur ON ss.id = ssur.sign_id
         WHERE ssur.user_id = #{userId}
     </select>
+
+    <select id="selectSignListPage" resultMap="BaseResultMap">
+        SELECT ss.*, sd.SIMPLE_NAME AS deptName
+        FROM system_sign ss
+        LEFT JOIN sys_user su ON su.id = ss.sign_user_id
+        LEFT JOIN sys_dept sd ON sd.id = su.dept_id
+        WHERE 1=1
+        <if test="request.signNo != null and request.signNo !=''">
+            AND ss.sign_no LIKE concat('%',#{request.signNo},'%')
+        </if>
+        <if test="request.signName != null and request.signName !=''">
+            AND ss.sign_name LIKE concat('%',#{request.signName},'%')
+        </if>
+        <if test="request.signDirector != null and request.signDirector !=''">
+            AND ss.sign_director LIKE concat('%',#{request.signDirector},'%')
+        </if>
+        <if test="request.signUserId != null and request.signUserId !=''">
+            AND ss.sign_user_id = #{request.signUserId}
+        </if>
+        <if test="request.createStartTime != null and request.createStartTime !=''">
+            AND DATE_FORMAT(ss.create_time,'%Y-%m-%d') &gt;= DATE_FORMAT(#{request.createStartTime},'%Y-%m-%d')
+        </if>
+        <if test="request.createEndTime != null and request.createEndTime !=''">
+            AND DATE_FORMAT(ss.create_time,'%Y-%m-%d')  &lt;= DATE_FORMAT(#{request.createEndTime},'%Y-%m-%d')
+        </if>
+        ORDER BY ss.create_time DESC
+    </select>
+
+    <select id="selectSignList" resultMap="BaseResultMap">
+        SELECT ss.*, sd.SIMPLE_NAME AS deptName
+        FROM system_sign ss
+        LEFT JOIN sys_user su ON su.id = ss.sign_user_id
+        LEFT JOIN sys_dept sd ON sd.id = su.dept_id
+        WHERE 1=1
+        <if test="request.signNo != null and request.signNo !=''">
+            AND ss.sign_no LIKE concat('%',#{request.signNo},'%')
+        </if>
+        <if test="request.signName != null and request.signName !=''">
+            AND ss.sign_name LIKE concat('%',#{request.signName},'%')
+        </if>
+        <if test="request.signDirector != null and request.signDirector !=''">
+            AND ss.sign_director LIKE concat('%',#{request.signDirector},'%')
+        </if>
+        <if test="request.signUserId != null and request.signUserId !=''">
+            AND ss.sign_user_id = #{request.signUserId}
+        </if>
+        <if test="request.createStartTime != null and request.createStartTime !=''">
+            AND DATE_FORMAT(ss.create_time,'%Y-%m-%d') &gt;= DATE_FORMAT(#{request.createStartTime},'%Y-%m-%d')
+        </if>
+        <if test="request.createEndTime != null and request.createEndTime !=''">
+            AND DATE_FORMAT(ss.create_time,'%Y-%m-%d')  &lt;= DATE_FORMAT(#{request.createEndTime},'%Y-%m-%d')
+        </if>
+        ORDER BY ss.create_time DESC
+    </select>
 </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 515050a..60f530b 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
@@ -47,8 +47,8 @@
     String STORAGE_LOCATION = "bizStorageLocation";
     //计量专业
     String MEASURE_MAJOR = "bizMeasureMajor";
-    //管理状态
-    String MANAGER_STATE = "bizManagerState";
+    //标准装置管理状态
+    String STANDARD_MANAGER_STATE = "bizStandardManagerState";
 
     /**
      * 资源管理 字典code
@@ -95,8 +95,6 @@
     String MEASURE_STATUS = "measureStatus";
     //检定方式
     String MEASURE_TYPE = "measureType";
-    //标识打印标志类型
-    String IDENTIFY_PRINT_TYPE = "bizBusinessIdentify";
     //变更类型
     String REPORT_CHANGE_TYPE = "bizCertChangeType";
     //规模类型
@@ -111,19 +109,24 @@
     String MEASURE_CATEGORY = "measureCategory";
     //检定结果
     String MEASURE_RESULT = "measureResult";
+    //分包原因
+    String OUTSOURCE_REASON = "outsourceReason";
+
+    /**
+     * 系统管理
+     */
+    String TEMPLATE_TYPE = "templateType";
+
 
     /**
      * 标准装置 字典code
      */
     //类别
     String STANDARD_CATEGORY = "standardCategory";
-    //管理状态
-    String STANDARD_MANAGER_STATE = "standardManagerState";
     //标准等级
     String STANDARD_LEVEL = "standardLevel";
     //传递范围
     String STANDARD_TRANSMIT_RANGE = "transmitRange";
-
     //资本来源
     String CAPITAL_SOURCE = "capitalSource";
     //标准装置-申请类型
@@ -148,8 +151,6 @@
     String CERTIFICATE_CLASS = "certificationClass";
     //证书管理-检校专业
     String CALIBRATION_MAJOR = "calibrationMajor";
-    //分包原因
-    String OUTSOURCE_REASON = "outsourceReason";
 
     /**
      * 工作台
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/BaseApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/BaseApprovalListRequest.java
index 73c12c1..80d7424 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/BaseApprovalListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/BaseApprovalListRequest.java
@@ -6,6 +6,7 @@
 
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotEmpty;
+import java.util.List;
 
 /**
  * @Description:
@@ -19,14 +20,14 @@
      * 表单id
      */
     @NotBlank(message = "表单id不能为空")
-    @ApiModelProperty(value = "表单id（流程定义对应的表单id，等价于业务id）", dataType = "String")
+    @ApiModelProperty(value = "表单id（流程定义对应的表单id，等价于业务id），导出接口不用传", dataType = "String")
     private String formId;
 
     /**
      * 审批状态类型，对应ApprovalStatusEnum
      */
     @NotEmpty(message = "审批状态类型不能为空")
-    @ApiModelProperty(value = "审批状态类型code", dataType = "String")
+    @ApiModelProperty(value = "审批状态类型code，导出接口不用传", dataType = "String")
     private String approvalStatus;
 
     @ApiModelProperty(hidden = true)
@@ -34,4 +35,7 @@
 
     @ApiModelProperty(hidden = true)
     private Long createUserId;
+
+    @ApiModelProperty(value = "导出ids", dataType = "List")
+    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificatePrintApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificatePrintApprovalListRequest.java
index b93d1c9..3cc2f4e 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificatePrintApprovalListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificatePrintApprovalListRequest.java
@@ -5,8 +5,6 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import java.util.List;
-
 /**
  * @Description:
  * @Author: wangpeng
@@ -38,7 +36,4 @@
 
     @ApiModelProperty(value = "创建结束时间", dataType = "String")
     private String createTimeEnd;
-
-    @ApiModelProperty(value = "导出ids", dataType = "List")
-    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportApprovalListRequest.java
index 4f7a038..c115847 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportApprovalListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportApprovalListRequest.java
@@ -5,8 +5,6 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import java.util.List;
-
 /**
  * @Description:
  * @Author: wangpeng
@@ -15,6 +13,8 @@
 @ApiModel
 @Data
 public class CertificateReportApprovalListRequest extends BaseApprovalListRequest {
+    @ApiModelProperty(value = "委托方id", dataType = "String")
+    private Long customerId;
 
     @ApiModelProperty(value = "证书报告编号", dataType = "String")
     private String certificateReportNo;
@@ -37,6 +37,4 @@
     @ApiModelProperty(value = "检校结束时间", dataType = "String")
     private String calibrationTimeEnd;
 
-    @ApiModelProperty(value = "导出ids", dataType = "List")
-    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/identify/IdentifyListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/identify/IdentifyListRequest.java
index 1b87ae6..f019203 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/identify/IdentifyListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/identify/IdentifyListRequest.java
@@ -4,6 +4,8 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * @Description:
  * @Author: wangpeng
@@ -26,4 +28,7 @@
 
     @ApiModelProperty(value = "打印结束时间", dataType = "String")
     private String createTimeEnd;
+
+    @ApiModelProperty(value = "导出ids", dataType = "List")
+    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListRequest.java
index 1264883..62415fb 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListRequest.java
@@ -7,6 +7,7 @@
 import lombok.Data;
 
 import javax.validation.constraints.NotBlank;
+import java.util.List;
 
 @Data
 @ApiModel
@@ -37,4 +38,6 @@
     @ApiModelProperty(value = "是否加急（1是0否null全部）", dataType = "Integer")
     private String isUrgent;
 
+    @ApiModelProperty(value = "导出ids", dataType = "List")
+    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListRequest.java
index 5201d7b..499760a 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListRequest.java
@@ -17,6 +17,9 @@
     @ApiModelProperty(value = "任务单编号", dataType = "String")
     private String orderNo;
 
+    @ApiModelProperty(value = "委托方id", dataType = "Long")
+    private Long customerId;
+
     @ApiModelProperty(value = "委托方名称", dataType = "String")
     private String customerName;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OrderSampleDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OrderSampleDTO.java
new file mode 100644
index 0000000..796edc0
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OrderSampleDTO.java
@@ -0,0 +1,19 @@
+package com.casic.missiles.dto.business.outsource;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/8/24 11:38
+ */
+@ApiModel
+@Data
+public class OrderSampleDTO {
+    @ApiModelProperty(value = "任务单id", dataType = "Long")
+    private Long orderId;
+    @ApiModelProperty(value = "受检设备id", dataType = "Long")
+    private Long sampleId;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceAssessApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceAssessApprovalListRequest.java
new file mode 100644
index 0000000..9a930c3
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceAssessApprovalListRequest.java
@@ -0,0 +1,30 @@
+package com.casic.missiles.dto.business.outsource;
+
+import com.casic.missiles.dto.BaseApprovalListRequest;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/8/24 11:01
+ */
+@ApiModel
+@Data
+public class OutsourceAssessApprovalListRequest extends BaseApprovalListRequest {
+    @ApiModelProperty(value = "评审表编号", dataType = "String")
+    private String projectNo;
+
+    @ApiModelProperty(value = "分包机构名称", dataType = "String")
+    private String outsourcerName;
+
+    @ApiModelProperty(value = "申请人", dataType = "String")
+    private String applicantName;
+
+    @ApiModelProperty(value = "申请时间开始", dataType = "String")
+    private String applicantTimeStart;
+
+    @ApiModelProperty(value = "申请时间结束", dataType = "String")
+    private String applicantTimeEnd;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceAssessSaveResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceAssessSaveResponse.java
new file mode 100644
index 0000000..8bf9aad
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceAssessSaveResponse.java
@@ -0,0 +1,20 @@
+package com.casic.missiles.dto.business.outsource;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/8/14 16:17
+ */
+@ApiModel
+@Data
+public class OutsourceAssessSaveResponse {
+    @ApiModelProperty(value = "主键id", dataType = "Long")
+    private Long id;
+
+    @ApiModelProperty(value = "编号", dataType = "String")
+    private String projectNo;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProtocolApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProtocolApprovalListRequest.java
new file mode 100644
index 0000000..0f32331
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProtocolApprovalListRequest.java
@@ -0,0 +1,30 @@
+package com.casic.missiles.dto.business.outsource;
+
+import com.casic.missiles.dto.BaseApprovalListRequest;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/8/24 15:01
+ */
+@ApiModel
+@Data
+public class OutsourceProtocolApprovalListRequest extends BaseApprovalListRequest {
+    @ApiModelProperty(value = "协议书编号", dataType = "String")
+    private String protocolNo;
+
+    @ApiModelProperty(value = "分包方名称", dataType = "String")
+    private String outsourcerName;
+
+    @ApiModelProperty(value = "申请人", dataType = "String")
+    private String applicantName;
+
+    @ApiModelProperty(value = "申请时间开始", dataType = "String")
+    private String applicantTimeStart;
+
+    @ApiModelProperty(value = "申请时间结束", dataType = "String")
+    private String applicantTimeEnd;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProtocolSaveResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProtocolSaveResponse.java
new file mode 100644
index 0000000..e324967
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProtocolSaveResponse.java
@@ -0,0 +1,20 @@
+package com.casic.missiles.dto.business.outsource;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/8/14 16:17
+ */
+@ApiModel
+@Data
+public class OutsourceProtocolSaveResponse {
+    @ApiModelProperty(value = "主键id", dataType = "Long")
+    private Long id;
+
+    @ApiModelProperty(value = "编号", dataType = "String")
+    private String protocolNo;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveApprovalListRequest.java
index f29f4e4..7047c28 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveApprovalListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveApprovalListRequest.java
@@ -5,8 +5,6 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import java.util.List;
-
 /**
  * @Description: 现场检测审批列表请求实体
  * @Author: wangpeng
@@ -30,7 +28,4 @@
     @ApiModelProperty(value = "申请时间结束", dataType = "String")
     private String applyTimeEnd;
 
-    @ApiModelProperty(value = "导出ids", dataType = "List")
-    private List<Long> ids;
-
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveDetailResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveDetailResponse.java
index 1f28752..394c934 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveDetailResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveDetailResponse.java
@@ -12,6 +12,18 @@
     @ApiModelProperty(value = "id，更新/删除使用参数", dataType = "Long")
     private Long id;
 
+    @ApiModelProperty(value = "实验室代码(字典code)", dataType = "String")
+    private String labCode;
+
+    @ApiModelProperty(value = "实验室代码(字典value)", dataType = "String")
+    private String labCodeName;
+
+    @ApiModelProperty(value = "组别代码(字典code)", dataType = "String")
+    private String groupCode;
+
+    @ApiModelProperty(value = "组别代码(字典value)", dataType = "String")
+    private String groupCodeName;
+
     @ApiModelProperty(value = "审批编号", dataType = "String")
     private String siteExecutiveNo;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/environment/LocationListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/environment/LocationListRequest.java
new file mode 100644
index 0000000..13d03c3
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/environment/LocationListRequest.java
@@ -0,0 +1,20 @@
+package com.casic.missiles.dto.resource.environment;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/6/8 13:56
+ */
+@ApiModel
+@Data
+public class LocationListRequest {
+    @ApiModelProperty(value = "地点编号", dataType = "String")
+    private String locationNo;
+
+    @ApiModelProperty(value = "地点名称", dataType = "String")
+    private String locationName;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/environment/LocationListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/environment/LocationListResponse.java
new file mode 100644
index 0000000..4c531af
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/environment/LocationListResponse.java
@@ -0,0 +1,78 @@
+package com.casic.missiles.dto.resource.environment;
+
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
+import com.baomidou.mybatisplus.annotation.TableField;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description: 地点列表响应实体
+ * @Author: wangpeng
+ * @Date: 2023/6/8 13:53
+ */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
+@ApiModel
+@Data
+public class LocationListResponse {
+    @ApiModelProperty(value = "主键id", dataType = "Long")
+    private Long id;
+
+    /**
+     * 地点编号
+     */
+    @ExcelProperty("地点编号")
+    @ApiModelProperty(value = "地点编号", dataType = "String")
+    private String locationNo;
+
+    /**
+     * 地点名称
+     */
+    @ExcelProperty("地点名称")
+    @ApiModelProperty(value = "地点名称", dataType = "String")
+    private String locationName;
+
+    /**
+     * 地点位置
+     */
+    @ExcelProperty("地点位置")
+    @ApiModelProperty(value = "地点位置", dataType = "String")
+    private String locationPosition;
+
+    /**
+     * 创建人id
+     */
+    @ApiModelProperty(value = "创建人id", dataType = "Long")
+    private Long createUserId;
+
+    /**
+     * 创建人
+     */
+    @ExcelProperty("创建人")
+    @ApiModelProperty(value = "创建人", dataType = "String")
+    @TableField("create_user")
+    private String createUser;
+
+    /**
+     * 创建时间
+     */
+    @ExcelProperty("创建时间")
+    @ApiModelProperty(value = "创建时间", dataType = "String")
+    private String createTime;
+
+    /**
+     * 更新时间
+     */
+    @ApiModelProperty(value = "更新时间", dataType = "String")
+    private String updateTime;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertRequest.java
index 9a7f6c6..c827915 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertRequest.java
@@ -4,6 +4,8 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * @Description:
  * @Author: wangpeng
@@ -16,4 +18,7 @@
     private String name;
     @ApiModelProperty(value = "部门名", dataType = "String")
     private String deptName;
+
+    @ApiModelProperty(value = "导出ids", dataType = "List")
+    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertResponse.java
index f78b159..8f2f79e 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertResponse.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.dto.resource.staff;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.casic.missiles.annotation.DictCodeField;
 import com.casic.missiles.constants.MeterDictCode;
 import io.swagger.annotations.ApiModel;
@@ -13,12 +20,18 @@
  * @Author: wangpeng
  * @Date: 2023/7/27 15:13
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @ApiModel
 @Data
 public class StaffCertResponse {
     /**
      * 人员编号
      */
+    @ExcelProperty(value = "人员编号",order = 0)
     @NotEmpty(message = "人员编号不能为空")
     @ApiModelProperty(value = "人员编号", dataType = "String")
     private String staffNo;
@@ -26,6 +39,7 @@
     /**
      * 姓名
      */
+    @ExcelProperty(value = "姓名",order = 1)
     @ApiModelProperty(value = "姓名", dataType = "String")
     private String staffName;
 
@@ -54,6 +68,7 @@
     /**
      * 部门名字
      */
+    @ExcelProperty(value = "工作部门",order = 2)
     @ApiModelProperty(value = "部门名字", dataType = "String")
     private String deptName;
 
@@ -66,6 +81,7 @@
     /**
      * 计量专业
      */
+    @ExcelProperty(value = "计量专业",order = 3)
     @ApiModelProperty(value = "计量专业", dataType = "String")
     private String major;
 
@@ -110,6 +126,7 @@
     /**
      * 证书号
      */
+    @ExcelProperty(value = "证号",order = 4)
     @ApiModelProperty(value = "证书号", dataType = "String")
     private String certNo;
 
@@ -122,12 +139,14 @@
     /**
      * 有效日期
      */
+    @ExcelProperty(value = "证书有效期",order = 6)
     @ApiModelProperty(value = "有效日期", dataType = "String")
     private String effectiveDate;
 
     /**
      * 发放日期
      */
+    @ExcelProperty(value = "发证日期",order = 5)
     @ApiModelProperty(value = "发放日期", dataType = "String")
     private String grantDate;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffListRequest.java
index 7c4afb3..0a1194a 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffListRequest.java
@@ -4,6 +4,8 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * @Description:
  * @Author: wangpeng
@@ -18,4 +20,7 @@
     private String deptName;
     @ApiModelProperty(value = "部门id", dataType = "Long")
     private Long deptId;
+
+    @ApiModelProperty(value = "导出ids", dataType = "List")
+    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/TrainListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/TrainListRequest.java
index f68597b..6321f8b 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/TrainListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/TrainListRequest.java
@@ -14,6 +14,8 @@
 public class TrainListRequest {
     @ApiModelProperty(value = "训练登记表编号", dataType = "String")
     private String trainNo;
+    @ApiModelProperty(value = "值班领导", dataType = "String")
+    private String dutyLeader;
     @ApiModelProperty(value = "创建开始时间", dataType = "String")
     private String createTimeStart;
     @ApiModelProperty(value = "创建结束时间", dataType = "String")
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/SignAddRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/SignAddRequest.java
index 117be34..d71055c 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/SignAddRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/SignAddRequest.java
@@ -43,13 +43,6 @@
     private Long signUserId;
 
     /**
-     * 签章或签名-字典code
-     */
-    @NotBlank(message = "类型不能为空")
-    @ApiModelProperty(value = "签名/签章-字典code", dataType = "String", required = true)
-    private String signType;
-
-    /**
      * minio存储文件名
      */
     @ApiModelProperty(value = "上传文件返回名称", dataType = "String")
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateAddRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateAddRequest.java
index aff1265..6316648 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateAddRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateAddRequest.java
@@ -17,30 +17,28 @@
 @Data
 public class TemplateAddRequest extends BaseSystemRequest {
     /**
-     * 原始记录模板/证书报告模板名称
+     * 模板名称
      */
     @ApiModelProperty(value = "名称", dataType = "String", required = true)
     @NotBlank(message = "名称不能为空")
     private String templateName;
 
     /**
-     * 原始记录模板/证书报告模板描述
+     * 模板描述
      */
     @ApiModelProperty(value = "描述", dataType = "String")
     private String templateDesc;
 
     /**
-     * 原始记录模板/证书报告模板创建人
+     * 创建人
      */
     @ApiModelProperty(value = "创建人", dataType = "String", required = true)
     @NotBlank(message = "创建人不能为空")
     private String templateCreator;
 
-    /**
-     * 原始记录模板/证书报告模板-字典code
-     */
-    @NotBlank(message = "类型不能为空")
-    @ApiModelProperty(value = "原始记录模板/证书报告模板-字典code", dataType = "String", required = true)
+
+    @NotBlank(message = "模板类型不能为空")
+    @ApiModelProperty(value = "模板类型(字典code)", dataType = "String", required = true)
     private String templateType;
 
     /**
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateListRequest.java
index eec5a1e..6d17bbe 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateListRequest.java
@@ -1,11 +1,12 @@
 package com.casic.missiles.dto.system;
 
+import com.casic.missiles.annotation.DictCodeField;
+import com.casic.missiles.constants.MeterDictCode;
 import com.casic.missiles.dto.BaseSystemRequest;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import javax.validation.constraints.NotBlank;
 import java.util.List;
 
 /**
@@ -19,8 +20,8 @@
     /**
      * 类型
      */
-//    @ApiModelProperty(value = "类型-字典code", dataType = "String", required = true)
-    @NotBlank(message = "类型不能为空")
+    @DictCodeField(message = "模板类型不合法", cacheName = MeterDictCode.TEMPLATE_TYPE)
+    @ApiModelProperty(value = "模板类型(字典code)", dataType = "String")
     private String templateType;
 
     /**
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificateChangeApply.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificateChangeApply.java
index 9216308..36923fd 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificateChangeApply.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificateChangeApply.java
@@ -1,11 +1,19 @@
 package com.casic.missiles.model.business;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 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 com.casic.missiles.dto.BaseRequest;
+import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -20,6 +28,12 @@
  * @author wangpeng
  * @since 2023-08-15
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
+@ApiModel
 @Data
 @TableName("biz_business_certificate_change_apply")
 public class BizBusinessCertificateChangeApply extends BaseRequest implements Serializable {
@@ -33,6 +47,7 @@
     /**
      * 申请单编号
      */
+    @ExcelProperty(value = "申请单编号", order = 1)
     @ApiModelProperty(value = "申请单编号", dataType = "String")
     @TableField("change_apply_no")
     private String changeApplyNo;
@@ -40,6 +55,7 @@
     /**
      * 申请单名字
      */
+    @ExcelProperty(value = "申请单名称", order = 2)
     @ApiModelProperty(value = "申请单名字", dataType = "String")
     @TableField("change_apply_name")
     private String changeApplyName;
@@ -54,6 +70,7 @@
     /**
      * 更换证书编号
      */
+    @ExcelProperty(value = "更换证书编号", order = 3)
     @ApiModelProperty(value = "更换证书编号", dataType = "String")
     @TableField("change_report_no")
     private String changeReportNo;
@@ -61,7 +78,8 @@
     /**
      * 更换证书名字
      */
-    @ApiModelProperty(value = "更换证书名字", dataType = "String")
+    @ExcelProperty(value = "更换证书/报告名称", order = 4)
+    @ApiModelProperty(value = "更换证书/报告名称", dataType = "String")
     @TableField("change_report_name")
     private String changeReportName;
 
@@ -73,6 +91,7 @@
     @TableField("change_type")
     private String changeType;
 
+    @ExcelProperty(value = "变更类型", order = 5)
     @ApiModelProperty(value = "变更类型(字典value)", dataType = "String")
     @TableField(exist = false)
     private String changeTypeName;
@@ -142,13 +161,15 @@
     /**
      * 创建用户名字
      */
-    @ApiModelProperty(value = "创建用户名字", dataType = "String")
+    @ExcelProperty(value = "创建人", order = 6)
+    @ApiModelProperty(value = "创建人名字", dataType = "String")
     @TableField("create_user_name")
     private String createUserName;
 
     /**
      * 创建时间
      */
+    @ExcelProperty(value = "创建时间", order = 7)
     @ApiModelProperty(value = "创建时间", dataType = "String")
     @TableField("create_time")
     private String createTime;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificateReport.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificateReport.java
index f01db9e..db06018 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificateReport.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificateReport.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.model.business;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -22,6 +29,11 @@
  * @author wangpeng
  * @since 2023-08-14
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @ApiModel
 @Data
 @TableName("biz_business_certificate_report")
@@ -36,6 +48,7 @@
     /**
      * 证书报告编号
      */
+    @ExcelProperty(value = "证书报告编号", order = 1)
     @ApiModelProperty(value = "证书报告编号", dataType = "String")
     @TableField("certificate_report_no")
     private String certificateReportNo;
@@ -43,6 +56,7 @@
     /**
      * 证书报告名称
      */
+    @ExcelProperty(value = "证书报告名称", order = 2)
     @ApiModelProperty(value = "证书报告名称", dataType = "String")
     @TableField("certificate_report_name")
     private String certificateReportName;
@@ -62,6 +76,7 @@
     @TableField("measure_category")
     private String measureCategory;
 
+    @ExcelProperty(value = "检校类别", order = 6)
     @ApiModelProperty(value = "检校类别(字典value)", dataType = "String")
     @TableField(exist = false)
     private String measureCategoryName;
@@ -69,6 +84,7 @@
     /**
      * 检校时间
      */
+    @ExcelProperty(value = "检校时间", order = 8)
     @ApiModelProperty(value = "检校时间", dataType = "String")
     @TableField("calibration_time")
     private String calibrationTime;
@@ -267,18 +283,22 @@
     @TableField(exist = false)
     private Integer decisionItem;
 
-    @ApiModelProperty(value = "设备样品编号（列表返回参数）", dataType = "String")
+    @ExcelProperty(value = "被检设备统一编号", order = 3)
+    @ApiModelProperty(value = "被检设备统一编号（列表返回参数）", dataType = "String")
     @TableField(exist = false)
     private String sampleNo;
 
-    @ApiModelProperty(value = "设备样品名称（列表返回参数）", dataType = "String")
+    @ExcelProperty(value = "被检设备名称", order = 4)
+    @ApiModelProperty(value = "被检设备名称（列表返回参数）", dataType = "String")
     @TableField(exist = false)
     private String sampleName;
 
-    @ApiModelProperty(value = "设备样品规格型号（列表返回参数）", dataType = "String")
+    @ExcelProperty(value = "规格型号", order = 5)
+    @ApiModelProperty(value = "规格型号（列表返回参数）", dataType = "String")
     @TableField(exist = false)
     private String sampleModel;
 
+    @ExcelProperty(value = "检定员", order = 7)
     @ApiModelProperty(value = "检定员名字（列表返回参数）", dataType = "String")
     @TableField(exist = false)
     private String staffName;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessIdentifyInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessIdentifyInfo.java
index 46bfba5..f1a9bec 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessIdentifyInfo.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessIdentifyInfo.java
@@ -1,10 +1,15 @@
 package com.casic.missiles.model.business;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 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;
 
@@ -20,6 +25,11 @@
  * @author wangpeng
  * @since 2023-08-15
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @Data
 @TableName("biz_business_identify_info")
 public class BizBusinessIdentifyInfo implements Serializable {
@@ -33,6 +43,7 @@
     /**
      * 记录编号
      */
+    @ExcelProperty(value = "记录编号", order = 1)
     @ApiModelProperty(value = "记录编号", dataType = "String")
     @TableField("record_no")
     private String recordNo;
@@ -41,20 +52,15 @@
      * 标志类型(字典code)
      */
     @NotEmpty(message = "标志类型不能为空")
-    @ApiModelProperty(value = "标志类型(字典code)", dataType = "String")
-    @DictCodeField(message = "标志类型不合法", cacheName = MeterDictCode.IDENTIFY_PRINT_TYPE)
+    @ApiModelProperty(value = "标志类型(直接存计量标识/使用状态/校准状态的字典value)", dataType = "String")
     @TableField("identify_type")
     private String identifyType;
 
-    @ApiModelProperty(value = "标志类型(字典value)", dataType = "String")
-    @TableField(exist = false)
-    private String identifyTypeName;
-
     /**
      * 设备id(可以是受检设备/设备台账)
      */
     @NotNull(message = "设备id不能为空")
-    @ApiModelProperty(value = "设备id(可以是受检设备/设备台账)", dataType = "String")
+    @ApiModelProperty(value = "设备id(可以是受检设备/设备台账)", dataType = "Long")
     @TableField("device_id")
     private Long deviceId;
 
@@ -66,29 +72,32 @@
     @TableField("device_type")
     private String deviceType;
 
+    @ExcelProperty(value = "统一编号", order = 3)
     @NotEmpty(message = "设备编号不能为空")
-    @ApiModelProperty(value = "设备编号", dataType = "String")
+    @ApiModelProperty(value = "统一编号", dataType = "String")
     @TableField("device_no")
     private String deviceNo;
 
     /**
      * 设备名字
      */
-    @NotEmpty(message = "设备名字不能为空")
-    @ApiModelProperty(value = "设备名字", dataType = "String")
+    @ExcelProperty(value = "设备名称", order = 4)
+    @NotEmpty(message = "设备名称不能为空")
+    @ApiModelProperty(value = "设备名称", dataType = "String")
     @TableField("device_name")
     private String deviceName;
 
     /**
      * 检定员id
      */
-    @ApiModelProperty(value = "检定员id", dataType = "String")
+    @ApiModelProperty(value = "检定员id", dataType = "Long")
     @TableField("measure_person_id")
     private Long measurePersonId;
 
     /**
      * 检定员名字
      */
+    @ExcelProperty(value = "检定员", order = 5)
     @ApiModelProperty(value = "检定员名字", dataType = "String")
     @TableField("measure_person")
     private String measurePerson;
@@ -103,7 +112,8 @@
     /**
      * 更新时间
      */
-    @ApiModelProperty(value = "更新时间", dataType = "String")
+    @ExcelProperty(value = "打印时间", order = 6)
+    @ApiModelProperty(value = "打印时间", dataType = "String")
     @TableField("update_time")
     private String updateTime;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceAssess.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceAssess.java
index 659d9ca..6720b90 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceAssess.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceAssess.java
@@ -1,11 +1,26 @@
 package com.casic.missiles.model.business;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 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 com.casic.missiles.dto.BaseRequest;
+import com.casic.missiles.dto.business.outsource.OrderSampleDTO;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import javax.validation.constraints.NotEmpty;
 import java.io.Serializable;
+import java.util.List;
 
 /**
  * <p>
@@ -15,146 +30,231 @@
  * @author wangpeng
  * @since 2023-08-16
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
+@ApiModel
 @Data
 @TableName("biz_business_outsource_assess")
-public class BizBusinessOutsourceAssess implements Serializable {
+public class BizBusinessOutsourceAssess extends BaseRequest implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
+    @ApiModelProperty(value = "id，更新/删除使用参数", dataType = "Long")
     @TableId("id")
     private Long id;
 
     /**
      * 评审表编号
      */
+    @ExcelProperty(value = "评审表编号", order = 1)
+    @ApiModelProperty(value = "评审表编号(后台生成)", dataType = "String")
     @TableField("project_no")
     private String projectNo;
 
     /**
      * 评审表名称
      */
+    @ExcelProperty(value = "评审表名称", order = 2)
+    @ApiModelProperty(value = "评审表名称", dataType = "String")
     @TableField("project_name")
     private String projectName;
 
+    @NotEmpty(message = "实验室代码不能为空")
+    @DictCodeField(message = "实验室代码描述不合法", cacheName = MeterDictCode.LAB_CODE)
+    @ApiModelProperty(value = "实验室代码(字典code)", dataType = "String")
+    @TableField("lab_code")
+    private String labCode;
+
+    @ApiModelProperty(value = "实验室代码(字典value)", dataType = "String")
+    @TableField(exist = false)
+    private String labCodeName;
+
+    /**
+     * 组别代码
+     */
+    @NotEmpty(message = "组别代码不能为空")
+    @DictCodeField(message = "组别代码描述不合法", cacheName = MeterDictCode.GROUP_CODE)
+    @ApiModelProperty(value = "组别代码(字典code)", dataType = "String")
+    @TableField("group_code")
+    private String groupCode;
+
+    @ApiModelProperty(value = "组别代码(字典value)", dataType = "String")
+    @TableField(exist = false)
+    private String groupCodeName;
+
     /**
      * 申请人id
      */
+    @ApiModelProperty(value = "申请人id", dataType = "String")
     @TableField("applicant_id")
     private Long applicantId;
 
     /**
      * 申请人名字
      */
+    @ExcelProperty(value = "申请人", order = 5)
+    @ApiModelProperty(value = "申请人", dataType = "String")
     @TableField("applicant_name")
     private String applicantName;
 
     /**
      * 申请时间
      */
+    @ExcelProperty(value = "申请时间", order = 6)
+    @ApiModelProperty(value = "申请时间", dataType = "String")
     @TableField("applicant_time")
     private String applicantTime;
 
     /**
      * 附件(minio存储文件名)
      */
+    @ApiModelProperty(value = "附件(minio存储文件名)", dataType = "String")
     @TableField("minio_file_name")
     private String minioFileName;
 
     /**
      * 备注
      */
+    @ApiModelProperty(value = "备注", dataType = "String")
     @TableField("remark")
     private String remark;
 
     /**
      * 创建人id
      */
+    @ApiModelProperty(value = "创建人id", dataType = "String")
     @TableField("create_user_id")
     private Long createUserId;
 
     /**
      * 创建人名字
      */
+    @ApiModelProperty(value = "创建人名字", dataType = "String")
     @TableField("create_user_name")
     private String createUserName;
 
     /**
      * 分包方id
      */
+    @ApiModelProperty(value = "评审表编号", dataType = "String")
     @TableField("outsourcer_id")
     private Long outsourcerId;
 
     /**
      * 预计开始时间
      */
+    @ApiModelProperty(value = "预计开始时间", dataType = "String")
     @TableField("pre_start_time")
     private String preStartTime;
 
     /**
      * 预计结束时间
      */
+    @ApiModelProperty(value = "预计结束时间", dataType = "String")
     @TableField("pre_end_time")
     private String preEndTime;
 
     /**
      * 分包原因-字典
      */
+    @ApiModelProperty(value = "分包原因(字典code)", dataType = "String")
+    @DictCodeField(message = "分包原因描述不合法", cacheName = MeterDictCode.OUTSOURCE_REASON)
     @TableField("outsource_reason")
     private String outsourceReason;
 
+    @ApiModelProperty(value = "分包原因(字典value)", dataType = "String")
+    @TableField(exist = false)
+    private String outsourceReasonName;
+
     /**
      * 预计费用
      */
+    @ApiModelProperty(value = "预计费用", dataType = "String")
     @TableField("pre_cost")
     private String preCost;
 
     /**
      * 审批状态
      */
+    @ApiModelProperty(value = "审批状态", dataType = "String")
+    @DictCodeField(message = "审批状态描述不合法", cacheName = MeterDictCode.APPROVAL_STATUS)
     @TableField("approval_status")
     private String approvalStatus;
 
     /**
      * 流程实例id
      */
+    @ApiModelProperty(value = "流程实例id", dataType = "String")
     @TableField("process_id")
     private String processId;
 
     /**
      * 实验室认可情况
      */
+    @ApiModelProperty(value = "实验室认可情况", dataType = "String")
     @TableField("approve_situation")
     private String approveSituation;
 
     /**
      * 溯源性
      */
+    @ApiModelProperty(value = "溯源性", dataType = "String")
     @TableField("traceability")
     private String traceability;
 
     /**
      * 测试方法
      */
+    @ApiModelProperty(value = "测试方法", dataType = "String")
     @TableField("test_method")
     private String testMethod;
 
     /**
      * 技术能力
      */
+    @ApiModelProperty(value = "技术能力", dataType = "String")
     @TableField("technique_ability")
     private String techniqueAbility;
 
     /**
      * 创建时间
      */
+    @ApiModelProperty(hidden = true)
     @TableField("create_time")
     private String createTime;
 
     /**
      * 更新时间
      */
+    @ApiModelProperty(hidden = true)
     @TableField("update_time")
     private String updateTime;
 
+    @ApiModelProperty(value = "审批状态类型-字典value", dataType = "String")
+    @TableField(exist = false)
+    private String approvalStatusName;
 
+    @ApiModelProperty(value = "任务id（同意、驳回等操作使用）", dataType = "String")
+    @TableField(exist = false)
+    private String taskId;
+
+    @ApiModelProperty(value = "可选决策项（1同意驳回拒绝 2同意驳回 3同意拒绝，用于待审批列表同意/驳回/拒绝按钮展示）", dataType = "Integer")
+    @TableField(exist = false)
+    private Integer decisionItem;
+
+    @NotEmpty(message = "受检设备信息不能为空")
+    @ApiModelProperty(value = "受检设备id列表（新建使用参数）", dataType = "List")
+    @TableField(exist = false)
+    private List<OrderSampleDTO> orderSampleList;
+
+    @ExcelProperty(value = "分包机构名称", order = 3)
+    @ApiModelProperty(value = "分包机构名称（列表返回参数）", dataType = "String")
+    private String outsourcerName;
+
+    @ExcelProperty(value = "机构负责人", order = 4)
+    @ApiModelProperty(value = "机构负责人（列表返回参数）", dataType = "String")
+    private String director;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceProtocol.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceProtocol.java
new file mode 100644
index 0000000..38df697
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceProtocol.java
@@ -0,0 +1,225 @@
+package com.casic.missiles.model.business;
+
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
+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 com.casic.missiles.dto.BaseRequest;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotEmpty;
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 计量检定业务-分包管理-测试、校准或检定工作分包协议书
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-08-24
+ */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
+@Data
+@TableName("biz_business_outsource_protocol")
+public class BizBusinessOutsourceProtocol extends BaseRequest implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "id，更新/删除使用参数", dataType = "Long")
+    @TableId("id")
+    private Long id;
+
+    /**
+     * 协议书编号
+     */
+    @ExcelProperty(value = "协议书编号", order = 1)
+    @ApiModelProperty(value = "协议书编号(后台生成)", dataType = "String")
+    @TableField("protocol_no")
+    private String protocolNo;
+
+    /**
+     * 协议书名称
+     */
+    @ExcelProperty(value = "协议书名称", order = 2)
+    @ApiModelProperty(value = "协议书名称", dataType = "String")
+    @TableField("project_name")
+    private String projectName;
+
+    @NotEmpty(message = "实验室代码不能为空")
+    @DictCodeField(message = "实验室代码描述不合法", cacheName = MeterDictCode.LAB_CODE)
+    @ApiModelProperty(value = "实验室代码(字典code)", dataType = "String")
+    @TableField("lab_code")
+    private String labCode;
+
+    @ApiModelProperty(value = "实验室代码(字典value)", dataType = "String")
+    @TableField(exist = false)
+    private String labCodeName;
+
+    @NotEmpty(message = "组别代码不能为空")
+    @DictCodeField(message = "组别代码描述不合法", cacheName = MeterDictCode.GROUP_CODE)
+    @ApiModelProperty(value = "组别代码(字典code)", dataType = "String")
+    @TableField("group_code")
+    private String groupCode;
+
+    @ApiModelProperty(value = "组别代码(字典value)", dataType = "String")
+    @TableField(exist = false)
+    private String groupCodeName;
+
+    /**
+     * 分包方id
+     */
+    @ApiModelProperty(value = "分包方id", dataType = "Long")
+    @TableField("outsourcer_id")
+    private Long outsourcerId;
+
+    /**
+     * 其他
+     */
+    @ApiModelProperty(value = "其他", dataType = "String")
+    @TableField("remark")
+    private String remark;
+
+    /**
+     * 分包方编号
+     */
+    @ApiModelProperty(value = "分包方编号(新建不用传)", dataType = "String")
+    @TableField("outsource_no")
+    private String outsourceNo;
+
+    /**
+     * 分包方名称
+     */
+    @ExcelProperty(value = "分包方名称", order = 3)
+    @ApiModelProperty(value = "分包方名称(新建不用传)", dataType = "String")
+    @TableField("outsource_name")
+    private String outsourceName;
+
+    /**
+     * 联系人
+     */
+    @ExcelProperty(value = "联系人", order = 4)
+    @ApiModelProperty(value = "联系人", dataType = "String")
+    @TableField("contacts")
+    private String contacts;
+
+    /**
+     * 电话
+     */
+    @ApiModelProperty(value = "电话", dataType = "String")
+    @TableField("mobile")
+    private String mobile;
+
+    /**
+     * 地址
+     */
+    @ApiModelProperty(value = "地址", dataType = "String")
+    @TableField("address")
+    private String address;
+
+    /**
+     * 要求完成日期
+     */
+    @ApiModelProperty(value = "要求完成日期", dataType = "String")
+    @TableField("require_date")
+    private String requireDate;
+
+    /**
+     * 分包费用(元)
+     */
+    @ApiModelProperty(value = "分包费用(元)", dataType = "String")
+    @TableField("outsource_cost")
+    private Double outsourceCost;
+
+    /**
+     * 分包方负责人
+     */
+    @ApiModelProperty(value = "分包方负责人", dataType = "String")
+    @TableField("director")
+    private String director;
+
+    /**
+     * 分包项目
+     */
+    @ApiModelProperty(value = "分包项目", dataType = "String")
+    @TableField("item")
+    private String item;
+
+    /**
+     * 分包要求
+     */
+    @ApiModelProperty(value = "分包要求", dataType = "String")
+    @TableField("requires")
+    private String requires;
+
+    /**
+     * 创建人id
+     */
+    @ApiModelProperty(hidden = true)
+    @TableField("create_user_id")
+    private Long createUserId;
+
+    /**
+     * 创建人名字
+     */
+    @ExcelProperty(value = "申请人", order = 5)
+    @ApiModelProperty(value = "申请人", dataType = "String")
+    @TableField("create_user_name")
+    private String createUserName;
+
+    /**
+     * 审批状态
+     */
+    @ApiModelProperty(value = "审批状态", dataType = "String")
+    @DictCodeField(message = "审批状态描述不合法", cacheName = MeterDictCode.APPROVAL_STATUS)
+    @TableField("approval_status")
+    private String approvalStatus;
+
+    /**
+     * 流程实例id
+     */
+    @ApiModelProperty(value = "流程实例id", dataType = "String")
+    @TableField("process_id")
+    private String processId;
+
+    /**
+     * 创建时间
+     */
+    @ExcelProperty(value = "申请时间", order = 6)
+    @ApiModelProperty(value = "申请时间", dataType = "String")
+    @TableField("create_time")
+    private String createTime;
+
+    /**
+     * 更新时间
+     */
+    @ApiModelProperty(hidden = true)
+    @TableField("update_time")
+    private String updateTime;
+
+    @ApiModelProperty(value = "审批状态类型-字典value", dataType = "String")
+    @TableField(exist = false)
+    private String approvalStatusName;
+
+    @ApiModelProperty(value = "任务id（同意、驳回等操作使用）", dataType = "String")
+    @TableField(exist = false)
+    private String taskId;
+
+    @ApiModelProperty(value = "可选决策项（1同意驳回拒绝 2同意驳回 3同意拒绝，用于待审批列表同意/驳回/拒绝按钮展示）", dataType = "Integer")
+    @TableField(exist = false)
+    private Integer decisionItem;
+
+
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourcerInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourcerInfo.java
index ec4e997..f9aa69e 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourcerInfo.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourcerInfo.java
@@ -17,6 +17,7 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import javax.validation.constraints.NotEmpty;
 import java.io.Serializable;
 
 /**
@@ -59,6 +60,29 @@
     @TableField("outsourcer_name")
     private String outsourcerName;
 
+    @NotEmpty(message = "实验室代码不能为空")
+    @DictCodeField(message = "实验室代码描述不合法", cacheName = MeterDictCode.LAB_CODE)
+    @ApiModelProperty(value = "实验室代码(字典code)", dataType = "String")
+    @TableField("lab_code")
+    private String labCode;
+
+    @ApiModelProperty(value = "实验室代码(字典value)", dataType = "String")
+    @TableField(exist = false)
+    private String labCodeName;
+
+    /**
+     * 组别代码
+     */
+    @NotEmpty(message = "组别代码不能为空")
+    @DictCodeField(message = "组别代码描述不合法", cacheName = MeterDictCode.GROUP_CODE)
+    @ApiModelProperty(value = "组别代码(字典code)", dataType = "String")
+    @TableField("group_code")
+    private String groupCode;
+
+    @ApiModelProperty(value = "组别代码(字典value)", dataType = "String")
+    @TableField(exist = false)
+    private String groupCodeName;
+
     /**
      * 单位简称
      */
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardInfo.java
index c48eed7..dffdfdd 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardInfo.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardInfo.java
@@ -5,6 +5,7 @@
 import com.baomidou.mybatisplus.annotation.TableName;
 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;
 
@@ -18,6 +19,7 @@
  * @author wangpeng
  * @since 2023-08-04
  */
+@ApiModel
 @Data
 @TableName("biz_equipment_standard_info")
 public class BizEquipmentStandardInfo implements Serializable {
@@ -119,7 +121,7 @@
      * 管理状态(字典code)
      */
     @ApiModelProperty(value = "管理状态(字典code)", dataType = "String")
-    @DictCodeField(message = "管理状态不合法", cacheName = MeterDictCode.MANAGER_STATE)
+    @DictCodeField(message = "管理状态不合法", cacheName = MeterDictCode.STANDARD_MANAGER_STATE)
     @TableField("manage_status")
     private String manageStatus;
 
@@ -151,7 +153,7 @@
     /**
      * 温度(℃)
      */
-    @ApiModelProperty(value = "使用状态(字典code)", dataType = "String")
+    @ApiModelProperty(value = "温度(℃)", dataType = "String")
     @TableField("temperature")
     private Double temperature;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardInfoApproval.java b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardInfoApproval.java
index dbd86ab..9f58d83 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardInfoApproval.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardInfoApproval.java
@@ -150,7 +150,7 @@
      * 管理状态(字典code)
      */
     @ApiModelProperty(value = "管理状态(字典code)", dataType = "String")
-    @DictCodeField(message = "管理状态不合法", cacheName = MeterDictCode.MANAGER_STATE)
+    @DictCodeField(message = "管理状态不合法", cacheName = MeterDictCode.STANDARD_MANAGER_STATE)
     @TableField("manage_status")
     private String manageStatus;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardTechnologyRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardTechnologyRelation.java
index 0e612bd..751f26b 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardTechnologyRelation.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardTechnologyRelation.java
@@ -3,6 +3,7 @@
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -16,6 +17,7 @@
  * @author wangpeng
  * @since 2023-08-04
  */
+@ApiModel
 @Data
 @TableName("biz_equipment_standard_technology_relation")
 public class BizEquipmentStandardTechnologyRelation implements Serializable {
@@ -33,6 +35,10 @@
     @TableField("technology_file_id")
     private Long technologyFileId;
 
+    @ApiModelProperty(value = "依据的技术文件编号", dataType = "String")
+    @TableField("technology_file_no")
+    private String technologyFileNo;
+
     /**
      * 依据的技术文件名称(技术文件中现行测试校准检定方法表文件名字段)
      */
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerInfo.java
index d6e8bed..65cd6bc 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerInfo.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerInfo.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.model.resource;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -21,6 +28,11 @@
  * @author wangpeng
  * @since 2023-08-08
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @ApiModel
 @Data
 @TableName("biz_resource_customer_info")
@@ -35,6 +47,7 @@
     /**
      * 委托方编号
      */
+    @ExcelProperty(value = "委托方编号", order = 1)
     @ApiModelProperty(value = "委托方编号", dataType = "String")
     @TableField("customer_no")
     private String customerNo;
@@ -42,6 +55,7 @@
     /**
      * 委托方名称
      */
+    @ExcelProperty(value = "委托方名称", order = 2)
     @ApiModelProperty(value = "委托方名称(新建时为下拉选择一个受检单位组织的名字，传deptId字段，后端获取名称)", dataType = "String")
     @TableField("customer_name")
     private String customerName;
@@ -63,6 +77,7 @@
     /**
      * 联系人
      */
+    @ExcelProperty(value = "联系人", order = 3)
     @ApiModelProperty(value = "联系人", dataType = "String")
     @TableField("contacts")
     private String contacts;
@@ -70,6 +85,7 @@
     /**
      * 座机电话
      */
+    @ExcelProperty(value = "座机电话", order = 4)
     @ApiModelProperty(value = "座机电话", dataType = "String")
     @TableField("mobile")
     private String mobile;
@@ -77,6 +93,7 @@
     /**
      * 手机号码
      */
+    @ExcelProperty(value = "手机号码", order = 5)
     @ApiModelProperty(value = "手机号码", dataType = "String")
     @TableField("phone")
     private String phone;
@@ -91,6 +108,7 @@
     /**
      * 地址
      */
+    @ExcelProperty(value = "地址", order = 6)
     @ApiModelProperty(value = "地址", dataType = "String")
     @TableField("address")
     private String address;
@@ -141,6 +159,7 @@
     /**
      * 创建时间
      */
+    @ExcelProperty(value = "创建时间", order = 7)
     @ApiModelProperty(value = "创建时间", dataType = "String")
     @TableField("create_time")
     private String createTime;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerSuggestForm.java b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerSuggestForm.java
index 7201bbd..701bf8b 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerSuggestForm.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerSuggestForm.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.model.resource;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -22,6 +29,11 @@
  * @author wangpeng
  * @since 2023-08-08
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @ApiModel
 @Data
 @TableName("biz_resource_customer_suggest_form")
@@ -44,7 +56,8 @@
     /**
      * 委托方名称
      */
-    @ApiModelProperty(value = "委托方名称", dataType = "String")
+    @ExcelProperty(value = "意见反馈单位", order = 2)
+    @ApiModelProperty(value = "意见反馈单位", dataType = "String")
     @TableField("customer_name")
     private String customerName;
 
@@ -59,7 +72,8 @@
     /**
      * 委托方意见反馈部门名称
      */
-    @ApiModelProperty(value = "委托方意见反馈部门名称", dataType = "String")
+    @ExcelProperty(value = "委托方意见反馈部门", order = 3)
+    @ApiModelProperty(value = "委托方意见反馈部门", dataType = "String")
     @TableField("customer_dept_name")
     private String customerDeptName;
 
@@ -73,6 +87,7 @@
     /**
      * 表单编号
      */
+    @ExcelProperty(value = "表单编号", order = 1)
     @ApiModelProperty(value = "表单编号", dataType = "String")
     @TableField("form_no")
     private String formNo;
@@ -111,6 +126,7 @@
     /**
      * 创建人名字
      */
+    @ExcelProperty(value = "创建人", order = 4)
     @ApiModelProperty(value = "创建人名字", dataType = "String")
     @TableField("create_user_name")
     private String createUserName;
@@ -147,6 +163,7 @@
     /**
      * 创建时间
      */
+    @ExcelProperty(value = "创建时间", order = 5)
     @ApiModelProperty(value = "创建时间", dataType = "String")
     @TableField("create_time")
     private String createTime;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSealInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSealInfo.java
index cbf05d7..9bf389d 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSealInfo.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSealInfo.java
@@ -106,6 +106,10 @@
     @TableField("minio_file_name")
     private String minioFileName;
 
+    @ApiModelProperty(value = "minio存储文件url", dataType = "String")
+    @TableField(exist = false)
+    private String minioFileUrl;
+
     @ApiModelProperty(value = "创建时间", dataType = "String")
     @TableField("create_time")
     private String createTime;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSealUseNote.java b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSealUseNote.java
index 3f2d9e8..3ce16a8 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSealUseNote.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSealUseNote.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.model.resource;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -20,6 +27,11 @@
  * @author wangpeng
  * @since 2023-07-28
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @ApiModel
 @Data
 @TableName("biz_resource_seal_use_note")
@@ -34,6 +46,7 @@
     /**
      * 登记表编号
      */
+    @ExcelProperty(value = "申请单编号", order = 1)
     @ApiModelProperty(value = "登记表编号(自动生成)", dataType = "String")
     @TableField("note_form_no")
     private String noteFormNo;
@@ -55,6 +68,7 @@
     /**
      * 申请部门
      */
+    @ExcelProperty(value = "申请部门", order = 5)
     @ApiModelProperty(value = "申请部门", dataType = "String")
     @TableField("apply_dept_name")
     private String applyDeptName;
@@ -69,6 +83,7 @@
     /**
      * 申请人
      */
+    @ExcelProperty(value = "申请人", order = 6)
     @ApiModelProperty(value = "申请人", dataType = "String")
     @TableField("apply_user_name")
     private String applyUserName;
@@ -76,6 +91,7 @@
     /**
      * 申请时间
      */
+    @ExcelProperty(value = "申请时间", order = 7)
     @ApiModelProperty(value = "申请时间(新增自动获取当前时间)", dataType = "String")
     @TableField("apply_time")
     private String applyTime;
@@ -130,6 +146,26 @@
     @TableField("update_time")
     private String updateTime;
 
+    @ExcelProperty(value = "印章名称", order = 2)
+    @ApiModelProperty(value = "印章名称(列表返回参数)", dataType = "String")
+    @TableField(exist = false)
+    private String sealName;
+
+    @DictCodeField(message = "印章类型描述不合法", cacheName = MeterDictCode.SEAL_TYPE)
+    @ApiModelProperty(hidden = true)
+    @TableField(exist = false)
+    private String sealType;
+
+    @ExcelProperty(value = "印章类型", order = 3)
+    @ApiModelProperty(value = "印章类型(列表返回参数)", dataType = "String")
+    @TableField(exist = false)
+    private String sealTypeName;
+
+    @ExcelProperty(value = "批准人", order = 4)
+    @ApiModelProperty(value = "批准人(列表返回参数)", dataType = "String")
+    @TableField(exist = false)
+    private String approverName;
+
     @ApiModelProperty(value = "审批状态类型-字典value", dataType = "String")
     @TableField(exist = false)
     private String approvalStatusName;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceStaffInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceStaffInfo.java
index 5ef995b..41563a1 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceStaffInfo.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceStaffInfo.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.model.resource;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -20,6 +27,11 @@
  * @author wangpeng
  * @since 2023-07-25
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @ApiModel
 @Data
 @TableName("biz_resource_staff_info")
@@ -38,6 +50,7 @@
     /**
      * 人员编号
      */
+    @ExcelProperty(value = "人员编号",order = 0)
     @NotEmpty(message = "人员编号不能为空")
     @ApiModelProperty(value = "人员编号", dataType = "String")
     @TableField("staff_no")
@@ -46,6 +59,7 @@
     /**
      * 姓名
      */
+    @ExcelProperty(value = "姓名",order = 1)
     @ApiModelProperty(value = "姓名", dataType = "String")
     @TableField("staff_name")
     private String staffName;
@@ -152,13 +166,15 @@
     /**
      * 部门名字
      */
-    @ApiModelProperty(value = "部门名字", dataType = "String")
+    @ExcelProperty(value = "工作部门",order = 4)
+    @ApiModelProperty(value = "工作部门", dataType = "String")
     @TableField("dept_name")
     private String deptName;
 
     /**
      * 岗位
      */
+    @ExcelProperty(value = "岗位",order = 2)
     @ApiModelProperty(value = "岗位", dataType = "String")
     @TableField("station")
     private String station;
@@ -166,6 +182,7 @@
     /**
      * 计量专业
      */
+    @ExcelProperty(value = "计量专业",order = 5)
     @ApiModelProperty(value = "计量专业", dataType = "String")
     @TableField("major")
     private String major;
@@ -173,6 +190,7 @@
     /**
      * 证号
      */
+    @ExcelProperty(value = "证号",order = 3)
     @ApiModelProperty(value = "证号", dataType = "String")
     @TableField("certificate_number")
     private String certificateNumber;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSupplierInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSupplierInfo.java
index eb5ef01..a1e2697 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSupplierInfo.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSupplierInfo.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.model.resource;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -20,6 +27,11 @@
  * @author wangpeng
  * @since 2023-07-27
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @ApiModel
 @Data
 @TableName("biz_resource_supplier_info")
@@ -34,6 +46,7 @@
     /**
      * 供方编号
      */
+    @ExcelProperty(value = "供方编号", order = 1)
     @ApiModelProperty(value = "供方编号(自动生成)", dataType = "String")
     @TableField("supplier_no")
     private String supplierNo;
@@ -41,6 +54,7 @@
     /**
      * 供方名称
      */
+    @ExcelProperty(value = "供方名称", order = 2)
     @ApiModelProperty(value = "供方名称", dataType = "String")
     @TableField("supplier_name")
     private String supplierName;
@@ -60,6 +74,7 @@
     @TableField("supplier_type")
     private String supplierType;
 
+    @ExcelProperty(value = "供方类型", order = 3)
     @ApiModelProperty(value = "供方类型(字典value)", dataType = "String")
     @TableField(exist = false)
     private String supplierTypeName;
@@ -109,7 +124,8 @@
     /**
      * 电话
      */
-    @ApiModelProperty(value = "电话", dataType = "String")
+    @ExcelProperty(value = "联系电话", order = 4)
+    @ApiModelProperty(value = "联系电话", dataType = "String")
     @TableField("phone")
     private String phone;
 
@@ -158,6 +174,7 @@
     /**
      * 公司地址-省
      */
+    @ExcelProperty(value = "地址-省", order = 6)
     @ApiModelProperty(value = "公司地址-省", dataType = "String")
     @TableField("company_province_name")
     private String companyProvinceName;
@@ -172,6 +189,7 @@
     /**
      * 公司地址-市
      */
+    @ExcelProperty(value = "地址-市", order = 7)
     @ApiModelProperty(value = "公司地址-市", dataType = "String")
     @TableField("company_city_name")
     private String companyCityName;
@@ -186,6 +204,7 @@
     /**
      * 公司地址-区
      */
+    @ExcelProperty(value = "地址-区", order = 8)
     @ApiModelProperty(value = "公司地址-区", dataType = "String")
     @TableField("company_area_name")
     private String companyAreaName;
@@ -193,6 +212,7 @@
     /**
      * 公司地址-详细地址
      */
+    @ExcelProperty(value = "地址-详细地址", order = 9)
     @ApiModelProperty(value = "公司地址-详细地址", dataType = "String")
     @TableField("company_address")
     private String companyAddress;
@@ -200,6 +220,7 @@
     /**
      * 服务和供应的内容
      */
+    @ExcelProperty(value = "服务和供应的内容", order = 5)
     @ApiModelProperty(value = "服务和供应的内容", dataType = "String")
     @TableField("supplier_content")
     private String supplierContent;
@@ -250,6 +271,7 @@
     /**
      * 创建时间
      */
+    @ExcelProperty(value = "创建时间", order = 9)
     @ApiModelProperty(value = "创建时间", dataType = "String")
     @TableField("create_time")
     private String createTime;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/EnvLocationInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/EnvLocationInfo.java
new file mode 100644
index 0000000..d8e2d7b
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/EnvLocationInfo.java
@@ -0,0 +1,83 @@
+package com.casic.missiles.model.resource;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotEmpty;
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 实验室环境监控系统-设备表
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-06-07
+ */
+@ApiModel
+@Data
+@TableName("env_location_info")
+public class EnvLocationInfo implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "主键id", dataType = "Long")
+    @TableId("id")
+    private Long id;
+
+    /**
+     * 地点编号
+     */
+    @NotEmpty(message = "地点编号不能为空")
+    @ApiModelProperty(value = "地点编号", dataType = "String")
+    @TableField("location_no")
+    private String locationNo;
+
+    /**
+     * 地点名称
+     */
+    @ApiModelProperty(value = "地点名称", dataType = "String")
+    @TableField("location_name")
+    private String locationName;
+
+    /**
+     * 地点位置
+     */
+    @ApiModelProperty(value = "地点位置", dataType = "String")
+    @TableField("location_position")
+    private String locationPosition;
+
+    /**
+     * 创建人id
+     */
+    @ApiModelProperty(value = "创建人id", dataType = "Long")
+    @TableField("create_user_id")
+    private Long createUserId;
+
+    /**
+     * 创建人
+     */
+    @ApiModelProperty(value = "创建人", dataType = "String")
+    @TableField("create_user")
+    private String createUser;
+
+    /**
+     * 创建时间
+     */
+    @ApiModelProperty(value = "创建时间", dataType = "String")
+    @TableField("create_time")
+    private String createTime;
+
+    /**
+     * 更新时间
+     */
+    @ApiModelProperty(value = "更新时间", dataType = "String")
+    @TableField("update_time")
+    private String updateTime;
+
+
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemFileConfig.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemFileConfig.java
index 19e6845..86e569c 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemFileConfig.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemFileConfig.java
@@ -30,7 +30,7 @@
     @ApiModelProperty(value = "系统类别(1业务系统2受检系统3环境系统)", dataType = "Integer")
     @NotNull(message = "系统类别不能为空")
     @TableField("system_type")
-    private Integer systemType;
+    private Integer systemType = 1;
 
     @ApiModelProperty("下载编号")
     @TableField("download_no")
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemNotice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemNotice.java
index e94297d..06ec37d 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemNotice.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemNotice.java
@@ -34,7 +34,7 @@
     @ApiModelProperty(value = "系统类别(1业务系统2受检系统3环境系统)", dataType = "Integer")
     @NotNull(message = "系统类别不能为空")
     @TableField("system_type")
-    private Integer systemType;
+    private Integer systemType = 1;
 
     /**
      * 通知公告编号
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSign.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSign.java
index 6c0d7c9..954f4f8 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSign.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSign.java
@@ -51,7 +51,7 @@
     @ApiModelProperty(value = "系统类别(1业务系统2受检系统3环境系统)", dataType = "Integer")
     @NotNull(message = "系统类别不能为空")
     @TableField("system_type")
-    private Integer systemType;
+    private Integer systemType = 1;
 
     /**
      * 签名编号
@@ -130,4 +130,8 @@
     @TableField(exist = false)
     private List<Long> userIdList;
 
+    @ApiModelProperty(hidden = true)
+    @TableField(exist = false)
+    private String deptName;
+
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemTemplate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemTemplate.java
index 503a457..1d27ebe 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemTemplate.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemTemplate.java
@@ -47,7 +47,7 @@
     @ApiModelProperty(value = "系统类别(1业务系统2受检系统3环境系统)", dataType = "Integer")
     @NotNull(message = "系统类别不能为空")
     @TableField("system_type")
-    private Integer systemType;
+    private Integer systemType = 1;
 
     /**
      * 模板编号
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java
index 8c21cb0..f61e4a8 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java
@@ -32,4 +32,8 @@
     ReturnDTO approvalDelete(ApprovalDeleteRequest request);
 
     ReturnDTO failUpdate(T request);
+
+    List<O> listExport(R request);
+
+    List<O> listExportByIds(List<Long> ids);
 }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java
index 724166f..9bce15b 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java
@@ -157,6 +157,29 @@
         throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
     }
 
+    @Override
+    public List<O> listExport(R request) {
+        request.setCreateUserId(null);
+        request.setApprovalStatus(ApprovalStatusEnum.PASSED);
+        Page<O> page = PageFactory.defaultPage();
+        page.setCurrent(1);
+        page.setSearchCount(false);
+        page.setSize(Integer.MAX_VALUE);
+        Page<O> resultPage = this.baseMapper.selectBatchForApprovalList(page, request, null);
+        return resultPage.getRecords();
+    }
+
+    @Override
+    public List<O> listExportByIds(List<Long> ids) {
+        Page<O> page = PageFactory.defaultPage();
+        page.setCurrent(1);
+        page.setSearchCount(false);
+        page.setSize(Integer.MAX_VALUE);
+        List<String> businessKeys = ids.stream().map(String::valueOf).collect(Collectors.toList());
+        Page<O> resultPage = this.baseMapper.selectBatchForApprovalList(page, null, businessKeys);
+        return resultPage.getRecords();
+    }
+
     protected ReturnDTO updateApprovalStatus(Long id, String processId, String approvalStatus) {
         UpdateWrapper<T> updateWrapper = new UpdateWrapper<>();
         updateWrapper.eq("id", id);
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificatePrintServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificatePrintServiceImpl.java
index f6e4706..3228497 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificatePrintServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificatePrintServiceImpl.java
@@ -162,6 +162,30 @@
         return ReturnUtil.success(printLogMapper.selectList(wrapper));
     }
 
+    @Override
+    public List<CertificatePrintListResponse> listByIds(List<Long> ids) {
+        Page<CertificatePrintListResponse> page = PageFactory.defaultPage();
+        page.setCurrent(1);
+        page.setSearchCount(false);
+        page.setSize(Integer.MAX_VALUE);
+        List<String> businessKeys = ids.stream().map(String::valueOf).collect(Collectors.toList());
+        Page<CertificatePrintListResponse> resultPage = this.baseMapper.selectBatchForApprovalList(page, null, businessKeys);
+        return resultPage.getRecords();
+    }
+
+    @Override
+    public List<CertificatePrintListResponse> list(CertificatePrintApprovalListRequest request) {
+        request.setCreateUserId(null);
+        request.setApprovalStatus(null);
+        request.setPrintStatus(null);
+        Page<CertificatePrintListResponse> page = PageFactory.defaultPage();
+        page.setCurrent(1);
+        page.setSearchCount(false);
+        page.setSize(Integer.MAX_VALUE);
+        Page<CertificatePrintListResponse> resultPage = certificatePrintMapper.selectBatchForApprovalList(page, request, null);
+        return resultPage.getRecords();
+    }
+
     private void savePrintLog(Long id) {
         BizBusinessCertificatePrintLog printLog = new BizBusinessCertificatePrintLog();
         BizBusinessCertificatePrint certificatePrint = certificatePrintMapper.selectById(id);
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificateReportServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificateReportServiceImpl.java
index 457555f..24146be 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificateReportServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificateReportServiceImpl.java
@@ -158,8 +158,8 @@
         QueryWrapper<BizBusinessCertificateMeasureResultData> mWrapper = new QueryWrapper<>();
         mWrapper.eq("report_id", reportId);
         boolean mRemove = certificateMeasureResultDataService.remove(mWrapper);
-        Assert.isFalse(eRemove || mRemove, () -> {
+        if(!eRemove || !mRemove){
             throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
-        });
+        }
     }
 }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessIdentifyInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessIdentifyInfoServiceImpl.java
index 4c8e190..f7e63ca 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessIdentifyInfoServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessIdentifyInfoServiceImpl.java
@@ -1,8 +1,10 @@
 package com.casic.missiles.service.Impl.business;
 
+import cn.hutool.core.date.DateUtil;
 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.core.page.PageFactory;
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.business.identify.IdentifyListRequest;
@@ -14,11 +16,14 @@
 import com.casic.missiles.service.business.IBizBusinessIdentifyInfoService;
 import com.casic.missiles.utils.DictCodeUtils;
 import com.casic.missiles.utils.NumberGeneratorUtil;
+import com.casic.missiles.utils.QRCodeUtil;
 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.List;
+
 /**
  * <p>
  * 计量检定业务-任务计量管理-标识打印 服务实现类
@@ -35,9 +40,9 @@
     @Override
     public Page<BizBusinessIdentifyInfo> identifyListPage(Page<BizBusinessIdentifyInfo> page, IdentifyListRequest request) throws Exception {
         QueryWrapper<BizBusinessIdentifyInfo> wrapper = new QueryWrapper<>();
-        wrapper.eq("identify_type", request.getIdentifyType());
-        wrapper.like("device_no", request.getDeviceNo());
-        wrapper.like("device_name", request.getDeviceName());
+        wrapper.eq(StringUtils.isNotEmpty(request.getIdentifyType()), "identify_type", request.getIdentifyType());
+        wrapper.like(StringUtils.isNotEmpty(request.getDeviceNo()),"device_no", request.getDeviceNo());
+        wrapper.like(StringUtils.isNotEmpty(request.getDeviceName()), "device_name", request.getDeviceName());
         wrapper.apply(StringUtils.isNotBlank(request.getCreateTimeStart()),
                 "{0} <= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getCreateTimeStart().split(" ")[0]);
         wrapper.apply(StringUtils.isNotBlank(request.getCreateTimeEnd()),
@@ -64,8 +69,11 @@
     }
 
     @Override
-    public ReturnDTO updateIdentify(BizBusinessIdentifyInfo identifyInfo) {
-        if(identifyInfoMapper.updateById(identifyInfo) > 0){
+    public ReturnDTO updateIdentify(Long id) {
+        BizBusinessIdentifyInfo info = new BizBusinessIdentifyInfo();
+        info.setId(id);
+        info.setUpdateTime(DateUtil.now());
+        if(identifyInfoMapper.updateById(info) > 0){
             return ReturnUtil.success();
         }
         throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
@@ -79,4 +87,20 @@
         throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
     }
 
+    @Override
+    public List<BizBusinessIdentifyInfo> list(IdentifyListRequest request) throws Exception {
+        Page<BizBusinessIdentifyInfo> page = PageFactory.defaultPage();
+        page.setCurrent(1);
+        page.setSearchCount(false);
+        page.setSize(Integer.MAX_VALUE);
+        Page<BizBusinessIdentifyInfo> resultPage = this.identifyListPage(page, request);
+        return resultPage.getRecords();
+    }
+
+    @Override
+    public ReturnDTO<String> equipmentQrCode(Long id) {
+        String base64QRCode = QRCodeUtil.getBase64QRCode(String.valueOf(id));
+        return ReturnUtil.success(base64QRCode);
+    }
+
 }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOrderInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOrderInfoServiceImpl.java
index 82952ad..d8d2c6a 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOrderInfoServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOrderInfoServiceImpl.java
@@ -35,6 +35,7 @@
 import javax.servlet.http.HttpServletResponse;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 import java.util.stream.Collectors;
 
 /**
@@ -209,13 +210,16 @@
     private QueryWrapper<OrderListResponse> listParamWrapperBuilder(OrderListRequest request) {
         QueryWrapper<OrderListResponse> wrapper = new QueryWrapper<>();
         wrapper.like(StringUtils.isNotBlank(request.getOrderNo()), "order_no", request.getOrderNo());
+        wrapper.like(Objects.nonNull(request.getCustomerId()), "customer_id", request.getCustomerId());
         wrapper.like(StringUtils.isNotBlank(request.getCustomerName()), "customer_name", request.getCustomerName());
         wrapper.like(StringUtils.isNotBlank(request.getDeliverer()), "deliverer", request.getDeliverer());
         wrapper.like(StringUtils.isNotBlank(request.getCreateUserName()), "create_user_name", request.getCreateUserName());
-        wrapper.apply(StringUtils.isNotBlank(request.getCreateStartTime()),
-                "{0} <= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getCreateStartTime().split(" ")[0]);
-        wrapper.apply(StringUtils.isNotBlank(request.getCreateEndTime()),
-                "{0} >= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getCreateEndTime().split(" ")[0]);
+        if(StringUtils.isNotBlank(request.getCreateStartTime())){
+            wrapper.apply("{0} <= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getCreateStartTime().split(" ")[0]);
+        }
+        if(StringUtils.isNotBlank(request.getCreateEndTime())){
+            wrapper.apply("{0} >= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getCreateEndTime().split(" ")[0]);
+        }
         wrapper.orderByDesc("create_time");
         return wrapper;
     }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceAssessServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceAssessServiceImpl.java
index c6af980..ce40138 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceAssessServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceAssessServiceImpl.java
@@ -1,10 +1,33 @@
 package com.casic.missiles.service.Impl.business;
 
-import com.casic.missiles.model.business.BizBusinessOutsourceAssess;
+import cn.hutool.core.lang.Assert;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.casic.missiles.core.model.auth.AuthUser;
+import com.casic.missiles.core.shiro.ShiroKit;
+import com.casic.missiles.dto.BaseApprovalSubmitRequest;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.ReturnUtil;
+import com.casic.missiles.dto.business.outsource.OutsourceAssessApprovalListRequest;
+import com.casic.missiles.dto.business.outsource.OutsourceAssessSaveResponse;
+import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.NoGenerateFileCodeEnum;
+import com.casic.missiles.enums.NoGenerateRecordTypeCodeEnum;
+import com.casic.missiles.enums.system.ApprovalStatusEnum;
+import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.mapper.business.BizBusinessOutsourceAssessMapper;
+import com.casic.missiles.model.business.BizBusinessOutsourceAssess;
+import com.casic.missiles.model.business.BizBusinessOutsourceAssessSampleRelation;
+import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl;
+import com.casic.missiles.service.business.IBizBusinessOutsourceAssessSampleRelationService;
 import com.casic.missiles.service.business.IBizBusinessOutsourceAssessService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.casic.missiles.utils.NoGeneratorUtil;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Objects;
 
 /**
  * <p>
@@ -15,6 +38,103 @@
  * @since 2023-08-16
  */
 @Service
-public class BizBusinessOutsourceAssessServiceImpl extends ServiceImpl<BizBusinessOutsourceAssessMapper, BizBusinessOutsourceAssess> implements IBizBusinessOutsourceAssessService {
+public class BizBusinessOutsourceAssessServiceImpl extends GeneralApprovalServiceImpl<BizBusinessOutsourceAssessMapper, BizBusinessOutsourceAssess, BizBusinessOutsourceAssess, OutsourceAssessApprovalListRequest, BaseApprovalSubmitRequest> implements IBizBusinessOutsourceAssessService {
+    @Autowired
+    private IBizBusinessOutsourceAssessSampleRelationService outsourceAssessSampleRelationService;
 
+    @Override
+    public ReturnDTO<OutsourceAssessSaveResponse> saveOutsourceAssess(BizBusinessOutsourceAssess request) {
+        //生成编号
+        String labCode = request.getLabCode();
+        String groupCode = request.getGroupCode();
+        Long maxNo = this.baseMapper.selectMaxProjectNo();
+        String projectNo = NoGeneratorUtil.getCode(NoGenerateFileCodeEnum.D, labCode, NoGenerateRecordTypeCodeEnum.OUTSOURCE_ACCESS, groupCode, maxNo);
+        request.setCreateUserId(request.getUserId());
+        request.setCreateUserName(request.getUserName());
+        request.setApprovalStatus(ApprovalStatusEnum.DRAFT); //草稿箱状态
+        request.setProjectNo(projectNo);
+        int row = this.baseMapper.insert(request);
+        Assert.isFalse(row <= 0, () -> {
+            throw new BusinessException(BusinessExceptionEnum.OUTSOURCE_ACCESS_SAVE_FAILED);
+        });
+        //关联表
+        saveRelationData(request);
+        OutsourceAssessSaveResponse saveResponse = new OutsourceAssessSaveResponse();
+        saveResponse.setId(request.getId());
+        saveResponse.setProjectNo(projectNo);
+        return ReturnUtil.success(saveResponse);
+    }
+
+    @Override
+    @Transactional
+    public ReturnDTO draftUpdate(BizBusinessOutsourceAssess request) {
+        if (this.baseMapper.updateById(request) > 0) {
+            //关联表删除、增加
+            removeRelationData(request.getId());
+            saveRelationData(request);
+            return ReturnUtil.success();
+        }
+        throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
+    }
+
+    @Override
+    public ReturnDTO draftDelete(Long id) {
+        if (this.baseMapper.deleteById(id) > 0) {
+            //关联表删除
+            removeRelationData(id);
+            return ReturnUtil.success();
+        }
+        throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
+    }
+
+    @Override
+    public ReturnDTO draftBatchDelete(List<Long> ids) {
+        if (this.baseMapper.deleteBatchIds(ids) >= 0) {
+            ids.forEach(id -> removeRelationData(id));
+            return ReturnUtil.success();
+        }
+        throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
+    }
+
+    @Override
+    @Transactional
+    public ReturnDTO failUpdate(BizBusinessOutsourceAssess request) {
+        AuthUser user = ShiroKit.getUser();
+        Assert.isFalse(Objects.isNull(user), () -> {
+            throw new BusinessException(BusinessExceptionEnum.LOGIN_USER_ACQUIRE_FAILED);
+        });
+        request.setApprovalStatus(ApprovalStatusEnum.IN_APPROVED);
+        if (this.baseMapper.updateById(request) > 0) {
+            //关联表删除、增加
+            removeRelationData(request.getId());
+            saveRelationData(request);
+            baseApprovalService.failUpdate(request.getProcessId());
+            return ReturnUtil.success();
+        }
+        throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
+    }
+
+    private void saveRelationData(BizBusinessOutsourceAssess request) {
+        List<BizBusinessOutsourceAssessSampleRelation> sampleRelations = new ArrayList<>();
+        request.getOrderSampleList().forEach(dto -> {
+            BizBusinessOutsourceAssessSampleRelation relation = new BizBusinessOutsourceAssessSampleRelation();
+            relation.setOrderId(dto.getOrderId());
+            relation.setSampleId(dto.getSampleId());
+            relation.setAccessId(request.getId());
+            sampleRelations.add(relation);
+        });
+        if(outsourceAssessSampleRelationService.saveBatch(sampleRelations)){
+            return;
+        }
+        throw new BusinessException(BusinessExceptionEnum.OUTSOURCE_ACCESS_SAVE_FAILED);
+    }
+
+    private void removeRelationData(Long assessId) {
+        QueryWrapper<BizBusinessOutsourceAssessSampleRelation> wrapper = new QueryWrapper<>();
+        wrapper.eq("access_id", assessId);
+        if(outsourceAssessSampleRelationService.remove(wrapper)){
+            return;
+        }
+        throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
+    }
 }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceProtocolServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceProtocolServiceImpl.java
new file mode 100644
index 0000000..821e728
--- /dev/null
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceProtocolServiceImpl.java
@@ -0,0 +1,60 @@
+package com.casic.missiles.service.Impl.business;
+
+import cn.hutool.core.lang.Assert;
+import com.casic.missiles.dto.BaseApprovalSubmitRequest;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.ReturnUtil;
+import com.casic.missiles.dto.business.outsource.OutsourceProtocolApprovalListRequest;
+import com.casic.missiles.dto.business.outsource.OutsourceProtocolSaveResponse;
+import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.NoGenerateFileCodeEnum;
+import com.casic.missiles.enums.NoGenerateRecordTypeCodeEnum;
+import com.casic.missiles.enums.system.ApprovalStatusEnum;
+import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.mapper.business.BizBusinessOutsourceProtocolMapper;
+import com.casic.missiles.mapper.business.BizBusinessOutsourcerInfoMapper;
+import com.casic.missiles.model.business.BizBusinessOutsourceProtocol;
+import com.casic.missiles.model.business.BizBusinessOutsourcerInfo;
+import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl;
+import com.casic.missiles.service.business.IBizBusinessOutsourceProtocolService;
+import com.casic.missiles.utils.NoGeneratorUtil;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 计量检定业务-分包管理-测试、校准或检定工作分包协议书 服务实现类
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-08-24
+ */
+@Service
+public class BizBusinessOutsourceProtocolServiceImpl extends GeneralApprovalServiceImpl<BizBusinessOutsourceProtocolMapper, BizBusinessOutsourceProtocol, BizBusinessOutsourceProtocol, OutsourceProtocolApprovalListRequest, BaseApprovalSubmitRequest> implements IBizBusinessOutsourceProtocolService {
+    @Autowired
+    private BizBusinessOutsourcerInfoMapper outsourcerInfoMapper;
+
+    @Override
+    public ReturnDTO<OutsourceProtocolSaveResponse> saveOutsourceProtocol(BizBusinessOutsourceProtocol request) {
+        //生成编号
+        String labCode = request.getLabCode();
+        String groupCode = request.getGroupCode();
+        Long maxNo = this.baseMapper.selectMaxProtocolNo();
+        String protocolNo = NoGeneratorUtil.getCode(NoGenerateFileCodeEnum.D, labCode, NoGenerateRecordTypeCodeEnum.OUTSOURCE_PROTOCOL, groupCode, maxNo);
+        request.setCreateUserId(request.getUserId());
+        request.setCreateUserName(request.getUserName());
+        request.setApprovalStatus(ApprovalStatusEnum.DRAFT); //草稿箱状态
+        request.setProtocolNo(protocolNo);
+        BizBusinessOutsourcerInfo outsourcerInfo = outsourcerInfoMapper.selectById(request.getOutsourcerId());
+        request.setOutsourceNo(outsourcerInfo.getOutsourcerNo());
+        request.setOutsourceName(outsourcerInfo.getOutsourcerName());
+        int row = this.baseMapper.insert(request);
+        Assert.isFalse(row <= 0, () -> {
+            throw new BusinessException(BusinessExceptionEnum.OUTSOURCE_PROTOCOL_SAVE_FAILED);
+        });
+        OutsourceProtocolSaveResponse saveResponse = new OutsourceProtocolSaveResponse();
+        saveResponse.setId(request.getId());
+        saveResponse.setProtocolNo(protocolNo);
+        return ReturnUtil.success(saveResponse);
+    }
+}
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourcerInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourcerInfoServiceImpl.java
index 75f639d..8aadad7 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourcerInfoServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourcerInfoServiceImpl.java
@@ -3,12 +3,12 @@
 import cn.hutool.core.lang.Assert;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.dto.*;
 import com.casic.missiles.dto.business.outsource.OutsourcerInfoApprovalListRequest;
 import com.casic.missiles.dto.business.outsource.OutsourcerSaveResponse;
 import com.casic.missiles.enums.BusinessExceptionEnum;
-import com.casic.missiles.enums.PrefixCodeEnum;
+import com.casic.missiles.enums.NoGenerateFileCodeEnum;
+import com.casic.missiles.enums.NoGenerateRecordTypeCodeEnum;
 import com.casic.missiles.enums.system.ApprovalStatusEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.mapper.business.BizBusinessOutsourcerInfoMapper;
@@ -20,7 +20,7 @@
 import com.casic.missiles.service.business.IBizBusinessOutsourcerInfoService;
 import com.casic.missiles.service.business.IBizBusinessOutsourcerUserInfoService;
 import com.casic.missiles.utils.DictCodeUtils;
-import com.casic.missiles.utils.NumberGeneratorUtil;
+import com.casic.missiles.utils.NoGeneratorUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -42,22 +42,12 @@
     private IBizBusinessOutsourcerUserInfoService outsourcerUserInfoService;
 
     @Override
-    public List<BizBusinessOutsourcerInfo> list(OutsourcerInfoApprovalListRequest request) {
-        request.setCreateUserId(null);
-        request.setApprovalStatus(ApprovalStatusEnum.PASSED);
-        Page<BizBusinessOutsourcerInfo> page = PageFactory.defaultPage();
-        page.setCurrent(1);
-        page.setSearchCount(false);
-        page.setSize(Integer.MAX_VALUE);
-        Page<BizBusinessOutsourcerInfo> resultPage = this.baseMapper.selectBatchForApprovalList(page, request, null);
-        return resultPage.getRecords();
-    }
-
-    @Override
     public ReturnDTO<OutsourcerSaveResponse> saveOutsourcer(BizBusinessOutsourcerInfo request) {
         //生成编号
+        String labCode = request.getLabCode();
+        String groupCode = request.getGroupCode();
         Long maxNo = this.baseMapper.selectMaxNo();
-        String outsourcerNo = NumberGeneratorUtil.getContactNo(PrefixCodeEnum.OUTSOURCER_PREFIX, maxNo);
+        String outsourcerNo = NoGeneratorUtil.getCode(NoGenerateFileCodeEnum.D, labCode, NoGenerateRecordTypeCodeEnum.OUTSOURCE_INFO, groupCode, maxNo);
         request.setOutsourcerNo(outsourcerNo);
         request.setCreateUserId(request.getUserId());
         request.setCreateUserName(request.getUserName());
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessSiteExecutiveInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessSiteExecutiveInfoServiceImpl.java
index ebab3e6..6c6a129 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessSiteExecutiveInfoServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessSiteExecutiveInfoServiceImpl.java
@@ -189,9 +189,9 @@
         QueryWrapper<BizBusinessSiteExecutiveStaffRelation> mWrapper = new QueryWrapper<>();
         mWrapper.eq("site_executive_id", siteExecutiveId);
         boolean mRemove = siteExecutiveStaffRelationService.remove(mWrapper);
-        Assert.isFalse(eRemove || mRemove, () -> {
+        if(!eRemove || !mRemove){
             throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
-        });
+        }
     }
 
     private void doPopulateSiteExecutive(SiteExecutiveDetailResponse detailResponse) {
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessLabExecutiveInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessLabExecutiveInfoServiceImpl.java
index 50c5616..0242fcf 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessLabExecutiveInfoServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessLabExecutiveInfoServiceImpl.java
@@ -297,6 +297,29 @@
     }
 
     @Override
+    public List<SampleLabExecutiveListResponse> deptLabExecutiveList(SampleLabExecutiveListRequest request) throws Exception {
+        Page<SampleLabExecutiveListResponse> page = PageFactory.defaultPage();
+        page.setCurrent(1);
+        page.setSearchCount(false);
+        page.setSize(Integer.MAX_VALUE);
+        Page<SampleLabExecutiveListResponse> resultPage = this.deptLabExecutiveListPage(page, request);
+        return resultPage.getRecords();
+    }
+
+    @Override
+    public List<SampleLabExecutiveListResponse> deptLabExecutiveListByIds(String measureStatus, List<Long> ids) throws Exception {
+        Page<SampleLabExecutiveListResponse> page = PageFactory.defaultPage();
+        page.setCurrent(1);
+        page.setSearchCount(false);
+        page.setSize(Integer.MAX_VALUE);
+        SampleLabExecutiveListRequest request = new SampleLabExecutiveListRequest();
+        request.setIds(ids);
+        request.setMeasureStatus(measureStatus);
+        Page<SampleLabExecutiveListResponse> resultPage = this.deptLabExecutiveListPage(page, request);
+        return resultPage.getRecords();
+    }
+
+    @Override
     public Page<SampleLabExecutiveListResponse> myLabExecutiveListPage(Page<SampleLabExecutiveListResponse> page, SampleLabExecutiveListRequest labExecutiveListRequest) throws Exception{
         AuthUser user = ShiroKit.getUser();
         Assert.isFalse(Objects.isNull(user), () -> {
@@ -350,6 +373,29 @@
     }
 
     @Override
+    public List<SampleLabExecutiveListResponse> myLabExecutiveList(SampleLabExecutiveListRequest request) throws Exception {
+        Page<SampleLabExecutiveListResponse> page = PageFactory.defaultPage();
+        page.setCurrent(1);
+        page.setSearchCount(false);
+        page.setSize(Integer.MAX_VALUE);
+        Page<SampleLabExecutiveListResponse> resultPage = this.myLabExecutiveListPage(page, request);
+        return resultPage.getRecords();
+    }
+
+    @Override
+    public List<SampleLabExecutiveListResponse> myLabExecutiveListByIds(String measureStatus, List<Long> ids) throws Exception {
+        Page<SampleLabExecutiveListResponse> page = PageFactory.defaultPage();
+        page.setCurrent(1);
+        page.setSearchCount(false);
+        page.setSize(Integer.MAX_VALUE);
+        SampleLabExecutiveListRequest request = new SampleLabExecutiveListRequest();
+        request.setIds(ids);
+        request.setMeasureStatus(measureStatus);
+        Page<SampleLabExecutiveListResponse> resultPage = this.myLabExecutiveListPage(page, request);
+        return resultPage.getRecords();
+    }
+
+    @Override
     public List<SampleAmountResponse> myExecutiveAmount() {
         //登录用户id获取计量人员id，实验室检测信息中存储的是计量人员id
         AuthUser user = ShiroKit.getUser();
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentInfoServiceImpl.java
index 864b05e..db8cad4 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentInfoServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentInfoServiceImpl.java
@@ -35,7 +35,6 @@
 import com.casic.missiles.utils.ConvertUtils;
 import com.casic.missiles.utils.DictCodeUtils;
 import com.casic.missiles.utils.NumberGeneratorUtil;
-import org.flowable.engine.RuntimeService;
 import org.flowable.engine.runtime.ProcessInstance;
 import org.jetbrains.annotations.NotNull;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -43,7 +42,6 @@
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
 
-import javax.annotation.Resource;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
@@ -81,8 +79,6 @@
     private IBizEquipmentAttachmentService attachmentService;
     @Autowired
     private IBizEquipmentCheckpointService checkpointService;
-    @Resource
-    private RuntimeService runtimeService;
     @Autowired
     private ApprovalOperateService approvalOperateService;
 
@@ -235,18 +231,18 @@
     private void updateRelationInfo(EquipmentAddRequest request, BizEquipmentInfoApproval equipmentInfoApproval) {
         QueryWrapper<BizEquipmentTechnicalTarget> targetWrapper = new QueryWrapper<>();
         targetWrapper.eq("equipment_no", equipmentInfoApproval.getEquipmentNo());
-        boolean removeTargetFlag = technicalTargetService.remove(targetWrapper);
-        boolean saveTargetFlag = technicalTargetService.saveBatch(request.getTechnicalTargetList());
+        technicalTargetService.remove(targetWrapper);
+        technicalTargetService.saveBatch(request.getTechnicalTargetList());
 
         QueryWrapper<BizEquipmentAttachment> attachmentWrapper = new QueryWrapper<>();
         attachmentWrapper.eq("equipment_no", equipmentInfoApproval.getEquipmentNo());
-        boolean removeAttachmentFlag = attachmentService.remove(attachmentWrapper);
-        boolean saveAttachmentFlag = attachmentService.saveBatch(request.getAttachmentList());
+        attachmentService.remove(attachmentWrapper);
+        attachmentService.saveBatch(request.getAttachmentList());
 
         QueryWrapper<BizEquipmentCheckpoint> checkpointWrapper = new QueryWrapper<>();
         checkpointWrapper.eq("equipment_no", equipmentInfoApproval.getEquipmentNo());
-        boolean removeCheckpointFlag = checkpointService.remove(checkpointWrapper);
-        boolean saveCheckpointFlag = checkpointService.saveBatch(request.getCheckpointList());
+        checkpointService.remove(checkpointWrapper);
+        checkpointService.saveBatch(request.getCheckpointList());
     }
 
     @Override
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardInfoServiceImpl.java
index faff1ae..c50a5b3 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardInfoServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardInfoServiceImpl.java
@@ -22,7 +22,9 @@
 import com.casic.missiles.mapper.equipment.BizEquipmentStandardInfoMapper;
 import com.casic.missiles.mapper.equipment.BizEquipmentStandardTechnologyRelationMapper;
 import com.casic.missiles.mapper.resource.BizResourceStaffInfoMapper;
-import com.casic.missiles.model.equipment.*;
+import com.casic.missiles.model.equipment.BizEquipmentStandardInfo;
+import com.casic.missiles.model.equipment.BizEquipmentStandardInfoApproval;
+import com.casic.missiles.model.equipment.BizEquipmentStandardTechnologyRelation;
 import com.casic.missiles.model.resource.BizResourceStaffInfo;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.dao.DeptMapper;
@@ -33,14 +35,12 @@
 import com.casic.missiles.service.flowable.ApprovalOperateService;
 import com.casic.missiles.utils.ConvertUtils;
 import com.casic.missiles.utils.DictCodeUtils;
-import org.flowable.engine.RuntimeService;
 import org.flowable.engine.runtime.ProcessInstance;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
 
-import javax.annotation.Resource;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
@@ -62,8 +62,6 @@
     private BizResourceStaffInfoMapper staffInfoMapper;
     @Autowired
     private IBaseApprovalService baseApprovalService;
-    @Resource
-    private RuntimeService runtimeService;
     @Autowired
     private ApprovalOperateService approvalOperateService;
     @Autowired
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSealInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSealInfoServiceImpl.java
index 7c91fa2..00040d6 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSealInfoServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSealInfoServiceImpl.java
@@ -15,6 +15,7 @@
 import com.casic.missiles.modular.system.model.User;
 import com.casic.missiles.service.resource.IBizResourceSealInfoService;
 import com.casic.missiles.utils.DictCodeUtils;
+import com.casic.missiles.utils.MinioUtil;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -33,6 +34,8 @@
     private BizResourceSealInfoMapper sealInfoMapper;
     @Autowired
     private UserMapper userMapper;
+    @Autowired
+    private MinioUtil minioUtil;
 
     @Override
     public Page<BizResourceSealInfo> listPage(Page<BizResourceSealInfo> page, SealInfoListRequest request) throws Exception {
@@ -44,6 +47,7 @@
         Page<BizResourceSealInfo> sealInfoPage = sealInfoMapper.selectPage(page, wrapper);
         for (BizResourceSealInfo record : sealInfoPage.getRecords()) {
             DictCodeUtils.convertDictCodeToName(record);
+            record.setMinioFileUrl(minioUtil.getFileUrl(record.getMinioFileName()));
         }
         return sealInfoPage;
     }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceStaffInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceStaffInfoServiceImpl.java
index f058cf5..09203ac 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceStaffInfoServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceStaffInfoServiceImpl.java
@@ -3,6 +3,7 @@
 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.core.page.PageFactory;
 import com.casic.missiles.dto.IdDTO;
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
@@ -86,6 +87,13 @@
     }
 
     @Override
+    public List<BizResourceStaffInfo> list(StaffListRequest request) throws Exception {
+        Page<BizResourceStaffInfo> page = PageFactory.defaultPage();
+        Page<BizResourceStaffInfo> staffInfoPage = this.listPage(page, request);
+        return staffInfoPage.getRecords();
+    }
+
+    @Override
     @Transactional
     public ReturnDTO<IdDTO> staffBaseAdd(BizResourceStaffInfo staffInfo) {
         //登录账号查重
@@ -495,6 +503,28 @@
         return certResponsePage;
     }
 
+    @Override
+    public List<StaffCertResponse> certListByIds(List<Long> ids) throws Exception {
+        Page<StaffCertResponse> page = PageFactory.defaultPage();
+        page.setCurrent(1);
+        page.setSearchCount(false);
+        page.setSize(Integer.MAX_VALUE);
+        StaffCertRequest request = new StaffCertRequest();
+        request.setIds(ids);
+        Page<StaffCertResponse> resultPage = this.certListPage(page, request);
+        return resultPage.getRecords();
+    }
+
+    @Override
+    public List<StaffCertResponse> certList(StaffCertRequest request) throws Exception {
+        Page<StaffCertResponse> page = PageFactory.defaultPage();
+        page.setCurrent(1);
+        page.setSearchCount(false);
+        page.setSize(Integer.MAX_VALUE);
+        Page<StaffCertResponse> resultPage = this.certListPage(page, request);
+        return resultPage.getRecords();
+    }
+
     @Async
     public void deleteRelationInfo(Long staffId){
         QueryWrapper<BizResourceStaffEducation> educationWrapper = new QueryWrapper<>();
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceStaffVerifierServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceStaffVerifierServiceImpl.java
index 8ac7eee..b508d45 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceStaffVerifierServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceStaffVerifierServiceImpl.java
@@ -52,8 +52,8 @@
     private WebSocket webSocket;
 
     @Override
-    public ReturnDTO expirationReminder(IdDTO idDto) {
-        BizResourceStaffVerifier staffVerifier = verifierMapper.selectById(idDto.getId());
+    public ReturnDTO expirationReminder(IdDTO idDTO) {
+        BizResourceStaffVerifier staffVerifier = verifierMapper.selectById(idDTO.getId());
         BizResourceStaffInfo staffInfo = staffInfoMapper.selectById(staffVerifier.getStaffId());
         QueryWrapper<User> wrapper = new QueryWrapper<>();
         wrapper.eq("account", staffInfo.getAccount());
@@ -65,7 +65,7 @@
         Assert.isFalse(Objects.isNull(user), () -> {
             throw new BusinessException(BusinessExceptionEnum.LOGIN_USER_ACQUIRE_FAILED);
         });
-        WorkbenchRemindMessage remindMessage = new WorkbenchRemindMessage(userInfo.getId(), userInfo.getDeptId(), idDto.getId(), staffVerifier.getCertNo(), MessageTypeEnum.STAFF_CERT.getCode(), MessageSourceModuleEnum.RESOURCE.getCode(), MessageTypeEnum.STAFF_CERT.getValue(), MessageTypeEnum.STAFF_CERT.getValue(), staffVerifier.getCertName(),0, user.getId(), user.getName());
+        WorkbenchRemindMessage remindMessage = new WorkbenchRemindMessage(userInfo.getId(), userInfo.getDeptId(), idDTO.getId(), staffVerifier.getCertNo(), MessageTypeEnum.STAFF_CERT.getCode(), MessageSourceModuleEnum.RESOURCE.getCode(), MessageTypeEnum.STAFF_CERT.getValue(), MessageTypeEnum.STAFF_CERT.getValue(), staffVerifier.getCertName(),0, user.getId(), user.getName());
         if(messageMapper.insert(remindMessage) > 0){
             // 新增到消息列表后向用户推送消息
             webSocket.sendOneMessage(String.valueOf(userInfo.getId()), JSONObject.toJSONString(remindMessage));
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceTrainInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceTrainInfoServiceImpl.java
index c1d6308..3a533f2 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceTrainInfoServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceTrainInfoServiceImpl.java
@@ -44,11 +44,14 @@
     @Override
     public Page<BizResourceTrainInfo> listPage(Page<BizResourceTrainInfo> page, TrainListRequest request) throws Exception {
         QueryWrapper<BizResourceTrainInfo> wrapper = new QueryWrapper<>();
-        wrapper.like("train_no", request.getTrainNo());
-        wrapper.apply(StringUtils.isNotBlank(request.getCreateTimeStart()),//apply方法传入参数名不能为空
-                "{0} <= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getCreateTimeStart().split(" ")[0]);
-        wrapper.apply(StringUtils.isNotBlank(request.getCreateTimeEnd()),
-                "{0} >= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getCreateTimeEnd().split(" ")[0]);
+        wrapper.like(StringUtils.isNotEmpty(request.getTrainNo()), "train_no", request.getTrainNo());
+        wrapper.like(StringUtils.isNotEmpty(request.getDutyLeader()),"duty_leader", request.getDutyLeader());
+        if(StringUtils.isNotBlank(request.getCreateTimeStart())){
+            wrapper.apply("{0} <= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getCreateTimeStart().split(" ")[0]);
+        }
+        if(StringUtils.isNotBlank(request.getCreateTimeEnd())){
+            wrapper.apply("{0} >= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getCreateTimeEnd().split(" ")[0]);
+        }
         wrapper.orderByDesc("create_time");
         Page<BizResourceTrainInfo> trainInfoPage = trainInfoMapper.selectPage(page, wrapper);
         for (BizResourceTrainInfo record : trainInfoPage.getRecords()) {
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/EnvLocationInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/EnvLocationInfoServiceImpl.java
new file mode 100644
index 0000000..cdc5742
--- /dev/null
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/EnvLocationInfoServiceImpl.java
@@ -0,0 +1,31 @@
+package com.casic.missiles.service.Impl.resource;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.casic.missiles.dto.resource.environment.LocationListRequest;
+import com.casic.missiles.dto.resource.environment.LocationListResponse;
+import com.casic.missiles.mapper.resource.EnvLocationInfoMapper;
+import com.casic.missiles.model.resource.EnvLocationInfo;
+import com.casic.missiles.service.resource.IEnvLocationInfoService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 实验室环境监控系统-设备表 服务实现类
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-06-07
+ */
+@Service
+public class EnvLocationInfoServiceImpl extends ServiceImpl<EnvLocationInfoMapper, EnvLocationInfo> implements IEnvLocationInfoService {
+    @Autowired
+    private EnvLocationInfoMapper locationInfoMapper;
+
+    @Override
+    public Page<LocationListResponse> listPage(Page<LocationListResponse> page, LocationListRequest request) {
+        Page<LocationListResponse> resultPage = locationInfoMapper.selectLocationListPage(page, request);
+        return resultPage;
+    }
+}
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/DownloadCenterServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/DownloadCenterServiceImpl.java
index c956d24..d9f3282 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/DownloadCenterServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/DownloadCenterServiceImpl.java
@@ -131,10 +131,12 @@
         wrapper.like(StringUtils.isNotBlank(request.getModuleName()), "module_name", request.getModuleName());
         wrapper.like(StringUtils.isNotBlank(request.getFileName()), "file_name", request.getFileName());
         wrapper.like(StringUtils.isNotBlank(request.getFileType()), "file_type", request.getFileType());
-        wrapper.apply(StringUtils.isNotBlank(request.getStartTime()),
-                "{0} <= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getStartTime().split(" ")[0]);
-        wrapper.apply(StringUtils.isNotBlank(request.getEndTime()),
-                "{0} >= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getEndTime().split(" ")[0]);
+        if(StringUtils.isNotBlank(request.getStartTime())){
+            wrapper.apply("{0} <= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getStartTime().split(" ")[0]);
+        }
+        if(StringUtils.isNotBlank(request.getEndTime())){
+            wrapper.apply("{0} >= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getEndTime().split(" ")[0]);
+        }
         wrapper.orderByDesc("create_time");
         return wrapper;
     }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemSignServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemSignServiceImpl.java
index 41976bb..7e90a09 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemSignServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemSignServiceImpl.java
@@ -52,15 +52,14 @@
 
     @Override
     public Page<SystemSign> listPage(Page<SystemSign> page, SignListRequest request) {
-        QueryWrapper<SystemSign> wrapper = getWrapper(request);
-        Page<SystemSign> signPage = signMapper.selectPage(page, wrapper);
+        Page<SystemSign> signPage = signMapper.selectSignListPage(page, request);
         return signPage;
     }
 
     @Override
     public List<SystemSign> list(SignListRequest request) {
-        QueryWrapper<SystemSign> wrapper = getWrapper(request);
-        return signMapper.selectList(wrapper);
+        List<SystemSign> signList = signMapper.selectSignList(request);
+        return signList;
     }
 
     @Override
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessCertificatePrintService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessCertificatePrintService.java
index 03247ab..7d6db77 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessCertificatePrintService.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessCertificatePrintService.java
@@ -9,6 +9,8 @@
 import com.casic.missiles.model.business.BizBusinessCertificatePrintLog;
 import com.casic.missiles.model.business.BizBusinessCertificateReport;
 
+import java.util.List;
+
 /**
  * <p>
  * 计量检定业务-任务计量管理-证书管理 服务类
@@ -30,4 +32,9 @@
     ReturnDTO certificatePrintStatus(Long id, String printStatus);
 
     ReturnDTO<BizBusinessCertificatePrintLog> certificatePrintLog(Long id);
+
+    List<CertificatePrintListResponse> listByIds(List<Long> ids);
+
+    List<CertificatePrintListResponse> list(CertificatePrintApprovalListRequest request);
+
 }

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java
index bb0c50f..13a699b 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java
@@ -12,6 +12,7 @@
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.IGeneralApprovalService;
+import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
@@ -19,6 +20,7 @@
 import org.springframework.web.bind.annotation.RequestBody;
 
 import javax.validation.Valid;
+import java.util.List;
 import java.util.Objects;
 
 /**
@@ -117,4 +119,17 @@
         }
         return baseApprovalService.failUpdate(request);
     }
+
+    public List<O> exportList(@RequestBody @Valid R request) throws Exception {
+        List<O> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = baseApprovalService.listExportByIds(request.getIds());
+        } else {
+            list = baseApprovalService.listExport(request);
+        }
+        for (O record : list) {
+            DictCodeUtils.convertDictCodeToName(record);
+        }
+        return list;
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java
index 8a90961..d775831 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java
@@ -5,6 +5,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.business.certificate.CertificateChangeApplyApprovalListRequest;
 import com.casic.missiles.dto.business.certificate.CertificateChangeApplySaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessCertificateChangeApply;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
@@ -20,6 +21,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -48,4 +50,12 @@
         }
         return changeApplyService.saveChangeApply(request);
     }
+
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody CertificateChangeApplyApprovalListRequest request) throws Exception {
+        List<BizBusinessCertificateChangeApply> list = super.exportList(request);
+        super.exportExcel(BizBusinessCertificateChangeApply.class, list, ExportEnum.CERTIFICATE_CHANGE_APPLY.getSheetName());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java
index 5fc4b07..af8230e 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java
@@ -9,6 +9,7 @@
 import com.casic.missiles.dto.business.certificate.CertificatePrintApprovalListRequest;
 import com.casic.missiles.dto.business.certificate.CertificatePrintListResponse;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.enums.business.CertificatePrintStatusEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessCertificatePrintLog;
@@ -18,10 +19,16 @@
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.io.IOException;
+import java.util.List;
 import java.util.Objects;
 
 /**
@@ -98,4 +105,16 @@
         });
         return certificatePrintService.certificatePrintLog(idDTO.getId());
     }
+
+    @ApiOperation("证书打印审批导出")
+    @PostMapping("/listExport")
+    public void exportList(@RequestBody CertificatePrintApprovalListRequest request) throws IOException {
+        List<CertificatePrintListResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = certificatePrintService.listByIds(request.getIds());
+        } else {
+            list = certificatePrintService.list(request);
+        }
+        super.exportExcel(CertificatePrintListResponse.class, list, ExportEnum.CERTIFICATE_PRINT.getSheetName());
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java
index 63b06dc..6b2efd5 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java
@@ -6,6 +6,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.business.certificate.CertificateReportApprovalListRequest;
 import com.casic.missiles.dto.business.certificate.CertificateReportSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessCertificateReport;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
@@ -21,6 +22,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -50,7 +52,7 @@
         return certificateReportService.saveCertificateReport(request);
     }
 
-    @ApiOperation("证书审批详情（基本信息）")
+    @ApiOperation("详情（基本信息）")
     @PostMapping("/detail")
     public ReturnDTO<BizBusinessCertificateReport> detail(@RequestBody @Valid BaseDetailRequest request, BindingResult bindingResult) throws Exception {
         if(bindingResult.hasErrors()){
@@ -59,4 +61,11 @@
         return certificateReportService.detail(request);
     }
 
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody CertificateReportApprovalListRequest request) throws Exception {
+        List<BizBusinessCertificateReport> list = super.exportList(request);
+        super.exportExcel(BizBusinessCertificateReport.class, list, ExportEnum.CERTIFICATE_REPORT.getSheetName());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java
index 46b26bd..57c0809 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java
@@ -10,20 +10,21 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.business.identify.IdentifyListRequest;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessIdentifyInfo;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.business.IBizBusinessIdentifyInfoService;
+import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import javax.validation.Valid;
+import java.util.List;
 import java.util.Objects;
 
 /**
@@ -57,16 +58,13 @@
         return identifyInfoService.addIdentify(identifyInfo);
     }
 
-    @ApiOperation("标识打印更新")
+    @ApiOperation("标识打印更新（更新打印时间）")
     @PostMapping("/update")
-    public ReturnDTO updateIdentify(@RequestBody @Valid BizBusinessIdentifyInfo identifyInfo, BindingResult bindingResult) {
-        Assert.isFalse(Objects.isNull(identifyInfo.getId()), () -> {
+    public ReturnDTO updateIdentify(@RequestBody @Valid IdDTO idDTO) {
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        Assert.isFalse(bindingResult.hasErrors(), () -> {
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        });
-        return identifyInfoService.updateIdentify(identifyInfo);
+        return identifyInfoService.updateIdentify(idDTO.getId());
     }
 
     @ApiOperation("标识打印删除")
@@ -77,4 +75,37 @@
         });
         return identifyInfoService.deleteIdentify(idDTO.getId());
     }
+
+    @ApiOperation("标识打印导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody @Valid IdentifyListRequest request, BindingResult bindingResult) throws Exception {
+        if (bindingResult.hasErrors()) {
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        List<BizBusinessIdentifyInfo> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = identifyInfoService.listByIds(request.getIds());
+        } else {
+            list = identifyInfoService.list(request);
+        }
+        for (BizBusinessIdentifyInfo record : list) {
+            DictCodeUtils.convertDictCodeToName(record);
+        }
+        super.exportExcel(BizBusinessIdentifyInfo.class, list, ExportEnum.IDENTIFY_EXPORT.getSheetName());
+    }
+
+
+    // TODO: 2023/8/23 查询设备信息，4个底部按钮查设备（按钮的作用就是前端用来调不同接口、用来区分中间即将展示的标识），前端弹窗选设备，在确定保存时前端根据底部按钮判断传入设备类型deviceType字典code
+    // TODO: 2023/8/23 接口：查受检设备（第1个按钮），查设备台账（后3个按钮同一接口），查询之后前端根据标志类型的不同加到中间页面时进行判断（按产品给的对应表）
+    // TODO: 2023/8/23 提供二维码接口，前端在加到中间页面时调用一下
+
+    @ApiOperation("设备二维码")
+    @PostMapping("/equipment/qrCode")
+    public ReturnDTO<String> equipmentQrCode(@RequestBody @Valid IdDTO idDTO) {
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return identifyInfoService.equipmentQrCode(idDTO.getId());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java
index 707be6e..7e0453d 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java
@@ -117,7 +117,7 @@
     }
 
     @ApiOperation("任务单导出")
-    @PostMapping("/export")
+    @PostMapping("/listExport")
     public void orderExport(@RequestBody @Valid OrderListRequest request, HttpServletResponse response) {
         businessOrderService.orderExport(request, response);
     }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java
index 529a6ce..51432be 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java
@@ -1,9 +1,28 @@
 package com.casic.missiles.controller.business;
 
+import com.casic.missiles.controller.GeneralApprovalController;
+import com.casic.missiles.dto.BaseApprovalSubmitRequest;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.business.outsource.OutsourceAssessApprovalListRequest;
+import com.casic.missiles.dto.business.outsource.OutsourceAssessSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
+import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.model.business.BizBusinessOutsourceAssess;
+import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
+import com.casic.missiles.service.IGeneralApprovalService;
+import com.casic.missiles.service.business.IBizBusinessOutsourceAssessService;
 import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.BindingResult;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.validation.Valid;
+import java.util.List;
+
 /**
  * <p>
  * 计量检定业务-分包管理-测试、校准或检定工作分包评审表 前端控制器
@@ -15,6 +34,27 @@
 @Api(tags = "分包管理-测试、校准或检定工作分包评审表")
 @RestController
 @RequestMapping("/business/outsource/assess")
-public class BizBusinessOutsourceAssessController {
+public class BizBusinessOutsourceAssessController extends GeneralApprovalController<BizBusinessOutsourceAssess, BizBusinessOutsourceAssess, OutsourceAssessApprovalListRequest, BaseApprovalSubmitRequest> {
+    @Autowired
+    private IBizBusinessOutsourceAssessService outsourceAssessService;
 
+    public BizBusinessOutsourceAssessController(IGeneralApprovalService<BizBusinessOutsourceAssess, BizBusinessOutsourceAssess, OutsourceAssessApprovalListRequest, BaseApprovalSubmitRequest> baseApprovalService) {
+        super(baseApprovalService);
+    }
+
+    @ApiOperation("草稿箱-保存")
+    @PostMapping("/save")
+    public ReturnDTO<OutsourceAssessSaveResponse> saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceAssess request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        return outsourceAssessService.saveOutsourceAssess(request);
+    }
+
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception {
+        List<BizBusinessOutsourceAssess> list = super.exportList(request);
+        super.exportExcel(BizBusinessOutsourceAssess.class, list, ExportEnum.OUTSOURCE_ASSESS.getSheetName());
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java
new file mode 100644
index 0000000..9adef18
--- /dev/null
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java
@@ -0,0 +1,60 @@
+package com.casic.missiles.controller.business;
+
+import com.casic.missiles.controller.GeneralApprovalController;
+import com.casic.missiles.dto.BaseApprovalSubmitRequest;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.business.outsource.OutsourceProtocolApprovalListRequest;
+import com.casic.missiles.dto.business.outsource.OutsourceProtocolSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
+import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.model.business.BizBusinessOutsourceProtocol;
+import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
+import com.casic.missiles.service.IGeneralApprovalService;
+import com.casic.missiles.service.business.IBizBusinessOutsourceProtocolService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.BindingResult;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.validation.Valid;
+import java.util.List;
+
+/**
+ * <p>
+ * 计量检定业务-分包管理-测试、校准或检定工作分包协议书 前端控制器
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-08-24
+ */
+@Api(tags = "分包管理-测试、校准或检定工作分包协议书")
+@RestController
+@RequestMapping("/business/outsource/protocol")
+public class BizBusinessOutsourceProtocolController extends GeneralApprovalController<BizBusinessOutsourceProtocol, BizBusinessOutsourceProtocol, OutsourceProtocolApprovalListRequest, BaseApprovalSubmitRequest> {
+    @Autowired
+    private IBizBusinessOutsourceProtocolService outsourceProtocolService;
+
+    public BizBusinessOutsourceProtocolController(IGeneralApprovalService<BizBusinessOutsourceProtocol, BizBusinessOutsourceProtocol, OutsourceProtocolApprovalListRequest, BaseApprovalSubmitRequest> baseApprovalService) {
+        super(baseApprovalService);
+    }
+
+    @ApiOperation("草稿箱-保存")
+    @PostMapping("/save")
+    public ReturnDTO<OutsourceProtocolSaveResponse> saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceProtocol request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        return outsourceProtocolService.saveOutsourceProtocol(request);
+    }
+
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody OutsourceProtocolApprovalListRequest request) throws Exception {
+        List<BizBusinessOutsourceProtocol> list = super.exportList(request);
+        super.exportExcel(BizBusinessOutsourceProtocol.class, list, ExportEnum.OUTSOURCE_PROTOCOL.getSheetName());
+    }
+}
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java
index 097f645..f0f0943 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java
@@ -17,7 +17,6 @@
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.IGeneralApprovalService;
 import com.casic.missiles.service.business.IBizBusinessOutsourcerInfoService;
-import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -71,19 +70,8 @@
 
     @ApiOperation("分包方导出")
     @PostMapping("/listExport")
-    public void export(@RequestBody @Valid OutsourcerInfoApprovalListRequest request, BindingResult bindingResult) throws Exception {
-        if (bindingResult.hasErrors()) {
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        }
-        List<BizBusinessOutsourcerInfo> list;
-        if (!CollectionUtils.isEmpty(request.getIds())) {
-            list = outsourcerInfoService.listByIds(request.getIds());
-        } else {
-            list = outsourcerInfoService.list(request);
-        }
-        for (BizBusinessOutsourcerInfo record : list) {
-            DictCodeUtils.convertDictCodeToName(record);
-        }
+    public void export(@RequestBody OutsourcerInfoApprovalListRequest request) throws Exception {
+        List<BizBusinessOutsourcerInfo> list = super.exportList(request);
         super.exportExcel(BizBusinessOutsourcerInfo.class, list, ExportEnum.OUTSOURCER_EXPORT.getSheetName());
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java
index c2cbf9f..0410918 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java
@@ -17,11 +17,9 @@
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.IGeneralApprovalService;
 import com.casic.missiles.service.business.IBizBusinessSiteExecutiveInfoService;
-import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -60,7 +58,7 @@
         return siteExecutiveInfoService.saveSiteExecutiveInfo(siteExecutiveInfo);
     }
 
-    @ApiOperation("现场检测详情")
+    @ApiOperation("详情")
     @PostMapping("/detail")
     public ReturnDTO<SiteExecutiveDetailResponse> siteExecutiveDetail(@RequestBody @Valid IdDTO idDTO) throws Exception {
         Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
@@ -69,21 +67,10 @@
         return ReturnUtil.success(siteExecutiveInfoService.detail(idDTO.getId()));
     }
 
-    @ApiOperation("现场检测导出")
+    @ApiOperation("导出")
     @PostMapping("/listExport")
-    public void export(@RequestBody @Valid SiteExecutiveApprovalListRequest request, BindingResult bindingResult) throws Exception {
-        if (bindingResult.hasErrors()) {
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        }
-        List<SiteExecutiveApprovalListResponse> list;
-        if (!CollectionUtils.isEmpty(request.getIds())) {
-            list = siteExecutiveInfoService.listInfoByIds(request.getIds());
-        } else {
-            list = siteExecutiveInfoService.listInfo(request);
-        }
-        for (SiteExecutiveApprovalListResponse record : list) {
-            DictCodeUtils.convertDictCodeToName(record);
-        }
+    public void export(@RequestBody SiteExecutiveApprovalListRequest request) throws Exception {
+        List<SiteExecutiveApprovalListResponse> list = super.exportList(request);
         super.exportExcel(SiteExecutiveApprovalListResponse.class, list, ExportEnum.SITE_EXECUTIVE_EXPORT.getSheetName());
     }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
index 7e793cd..a92e209 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
@@ -55,7 +55,7 @@
 
     @ApiOperation("设备收发列表导出")
     @PostMapping("/export")
-    public void exportList(@RequestBody @Valid SampleDispatchListRequest request) throws IOException {
+    public void exportList(@RequestBody SampleDispatchListRequest request) throws IOException {
         List<SampleDispatchListResponse> list;
         if (!CollectionUtils.isEmpty(request.getIds())) {
             list = dispatchService.listByIds(request.getIds());
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java
index cdc77fc..d120fd4 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java
@@ -7,6 +7,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.business.labExecutive.*;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.business.IBusinessLabExecutiveInfoService;
@@ -14,6 +15,7 @@
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.*;
 
@@ -32,7 +34,7 @@
     @Autowired
     private IBusinessLabExecutiveInfoService labExecutiveInfoService;
 
-    @ApiOperation("实验室检测-部门检测-查询各状态列表（待检测、检测中、检测完）")
+    @ApiOperation("实验室任务-查询各状态列表（待检测、检测中、检测完）")
     @PostMapping("/deptExecutive/List")
     public ReturnDTO<PageInfoBT<SampleLabExecutiveListResponse>> queryDeptExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
@@ -43,10 +45,19 @@
         return ReturnUtil.success(super.packForBT(labExecutiveInfoService.deptLabExecutiveListPage(page, labExecutiveListRequest)));
     }
 
-    /**
-     * 实验室检测-我的检测-查询各状态列表（待检测、检测中、检测完）
-     */
-    @ApiOperation("实验室检测-我的检测-查询各状态列表（待检测、检测中、检测完）")
+    @ApiOperation("实验室任务导出")
+    @PostMapping("/deptExecutive/export")
+    public void deptExportList(@RequestBody @Valid SampleLabExecutiveListRequest request) throws Exception {
+        List<SampleLabExecutiveListResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = labExecutiveInfoService.deptLabExecutiveListByIds(request.getMeasureStatus(), request.getIds());
+        } else {
+            list = labExecutiveInfoService.deptLabExecutiveList(request);
+        }
+        super.exportExcel(SampleLabExecutiveListResponse.class, list, ExportEnum.DEPT_EXECUTIVE_TASK.getSheetName());
+    }
+
+    @ApiOperation("我的任务-查询各状态列表（待检测、检测中、检测完）")
     @PostMapping("/myExecutive/list")
     public ReturnDTO<PageInfoBT<SampleLabExecutiveListResponse>> queryMyExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
@@ -57,19 +68,25 @@
         return ReturnUtil.success(super.packForBT(labExecutiveInfoService.myLabExecutiveListPage(page, labExecutiveListRequest)));
     }
 
-    /**
-     * 实验室检测-我的检测-查询各状态样品数量（待检测、检测中、检测完）
-     */
-    @ApiOperation("实验室检测-我的检测-查询各状态样品数量（待检测、检测中、检测完）")
+    @ApiOperation("我的任务导出")
+    @PostMapping("/myExecutive/export")
+    public void exportList(@RequestBody @Valid SampleLabExecutiveListRequest request) throws Exception {
+        List<SampleLabExecutiveListResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = labExecutiveInfoService.myLabExecutiveListByIds(request.getMeasureStatus(), request.getIds());
+        } else {
+            list = labExecutiveInfoService.myLabExecutiveList(request);
+        }
+        super.exportExcel(SampleLabExecutiveListResponse.class, list, ExportEnum.MY_EXECUTIVE_TASK.getSheetName());
+    }
+
+    @ApiOperation("我的任务-查询各状态样品数量（待检测、检测中、检测完）")
     @GetMapping("/myExecutive/amount")
     public ReturnDTO<List<SampleAmountResponse>> queryMyExecutiveAmount() {
         return ReturnUtil.success(labExecutiveInfoService.myExecutiveAmount());
     }
 
-    /**
-     * 实验室检测-部门检测-分配（分配给具体人员）
-     */
-    @ApiOperation("实验室检测-部门检测-分配按钮（分配给具体人员）")
+    @ApiOperation("实验室任务-分配按钮（分配给具体人员）")
     @PostMapping("/deptExecutive/allocate")
     public ReturnDTO allocateStaff(@RequestBody @Valid SampleAllocateRequest sampleAllocateRequest, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -78,10 +95,7 @@
         return labExecutiveInfoService.allocateStaff(sampleAllocateRequest);
     }
 
-    /**
-     * 实验室检测-我的检测-检定人扫描收入（待检测->检测中）
-     */
-    @ApiOperation("实验室检测-我的检测-检定人扫描收入（待检测->检测中）")
+    @ApiOperation("我的任务-检定人扫描收入（待检测->检测中）")
     @PostMapping("/myExecutive/receive")
     public ReturnDTO sampleReceive(@RequestBody @Valid List<SampleOperateRequest> requestList, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -90,10 +104,7 @@
         return labExecutiveInfoService.sampleReceive(requestList);
     }
 
-    /**
-     * 实验室检测-负责人/检定人扫描检完（检测中->检测完）
-     */
-    @ApiOperation("实验室检测-负责人/检定人扫描检完（检测中->检测完）")
+    @ApiOperation("实验室任务-负责人/检定人扫描检完（检测中->检测完）")
     @PostMapping("/myExecutive/complete")
     public ReturnDTO sampleExecutiveComplete(@RequestBody @Valid List<SampleOperateRequest> requestList, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -102,10 +113,7 @@
         return labExecutiveInfoService.sampleExecutiveComplete(requestList);
     }
 
-    /**
-     * 实验室检测-部门检测/我的检测 编辑（只能修改应出具证书）
-     */
-    @ApiOperation("实验室检测-部门检测/我的检测 编辑（只能修改应出具证书）")
+    @ApiOperation("实验室任务/我的任务 编辑（只能修改应出具证书）")
     @PostMapping("/executive/update")
     public ReturnDTO updateExecutive(@RequestBody @Valid UpdateExecutiveRequest request, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -114,10 +122,7 @@
         return labExecutiveInfoService.updateExecutive(request);
     }
 
-    /**
-     * 实验室检测-部门检测/我的检测 详情
-     */
-    @ApiOperation("实验室检测-部门检测/我的检测 详情")
+    @ApiOperation("实验室任务/我的任务 详情")
     @PostMapping("/executive/detail")
     public ReturnDTO<ExecutiveDetailResponse> executiveDetail(@RequestBody @Valid ExecutiveDetailRequest request, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
@@ -131,7 +136,7 @@
      * 退回后会将下一个要执行的实验室检测状态更新为待分配，将后面的实验室顺序变更为连续（都进行减1）
      * 最后一个检测的实验室退回，等分发员再增加实验室或设备收发中的已收入直接手动点击完成
      */
-    @ApiOperation("实验室检测-部门检测/我的检测 退回（待检测/检测中->退回）")
+    @ApiOperation("实验室任务/我的任务 退回（待检测/检测中->退回）")
     @PostMapping("/executive/sendBack")
     public ReturnDTO executiveSendBack(@RequestBody @Valid ExecutiveSendBackRequest request, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -140,9 +145,6 @@
         return labExecutiveInfoService.sampleExecutiveSendBack(request);
     }
 
-    /**
-     * 分发员编辑实验室检测列表
-     */
     @ApiOperation("分发员编辑实验室检测列表")
     @PostMapping("/handOut/updateList")
     public ReturnDTO updateExecutiveList(@RequestBody @Valid UpdateExecutiveListRequest request, BindingResult bindingResult) {
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java
index 48a67ed..0c04f31 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java
@@ -10,6 +10,7 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.resource.customer.CustomerApprovalListRequest;
 import com.casic.missiles.dto.resource.customer.CustomerSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceCustomerInfo;
@@ -26,6 +27,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -55,6 +57,13 @@
         return customerInfoService.saveCustomerInfo(request);
     }
 
+    @ApiOperation("委托方名录导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody CustomerApprovalListRequest request) throws Exception {
+        List<BizResourceCustomerInfo> list = super.exportList(request);
+        super.exportExcel(BizResourceCustomerInfo.class, list, ExportEnum.CUSTOMER_INFO.getSheetName());
+    }
+
     @ApiOperation("委托方人员列表（分页）")
     @PostMapping("/person/listPage")
     public ReturnDTO<PageInfoBT<BizResourceCustomerStaff>> personListPage(@RequestBody IdDTO idDto) {
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
index 972ed4b..6418ea5 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
@@ -5,6 +5,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.resource.customer.SuggestFormApprovalListRequest;
 import com.casic.missiles.dto.resource.customer.SuggestFormSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceCustomerSuggestForm;
@@ -20,6 +21,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -50,4 +52,11 @@
         return suggestFormService.saveSuggestForm(request);
     }
 
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody SuggestFormApprovalListRequest request) throws Exception {
+        List<BizResourceCustomerSuggestForm> list = super.exportList(request);
+        super.exportExcel(BizResourceCustomerSuggestForm.class, list, ExportEnum.CUSTOMER_SUGGEST_FORM.getSheetName());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java
index 1934d1a..9e07eab 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java
@@ -15,12 +15,16 @@
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.resource.IEnvEnvironmentRecordConfigService;
 import com.casic.missiles.service.resource.IEnvEnvironmentRecordDataService;
+import com.casic.missiles.service.resource.IEnvLocationInfoService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
 import java.util.List;
@@ -39,6 +43,8 @@
     private IEnvEnvironmentRecordDataService environmentRecordDataService;
     @Autowired
     private IEnvEnvironmentRecordConfigService environmentRecordConfigService;
+    @Autowired
+    private IEnvLocationInfoService locationInfoService;
 
     @ApiOperation("环境记录单数据列表/详情")
     @PostMapping("/data/listPage")
@@ -95,4 +101,11 @@
         });
         return environmentRecordConfigService.deleteEnvironmentRecordConfig(idDTO.getId());
     }
+
+    @ApiOperation("地点列表")
+    @PostMapping("/location/listPage")
+    public ReturnDTO<PageInfoBT<LocationListResponse>> locationListPage(@RequestBody @Valid LocationListRequest request) {
+        Page<LocationListResponse> page = PageFactory.defaultPage();
+        return ReturnUtil.success(super.packForBT(locationInfoService.listPage(page, request)));
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java
index 82efe3f..e9561fa 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java
@@ -10,6 +10,7 @@
 import com.casic.missiles.dto.resource.seal.SealLogListRequest;
 import com.casic.missiles.dto.resource.seal.SealNoteApprovalListRequest;
 import com.casic.missiles.dto.resource.seal.SealNoteSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceSealUseLog;
@@ -27,6 +28,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -58,6 +60,13 @@
         return sealUseNoteService.saveSeal(request);
     }
 
+    @ApiOperation("印章使用登记导出（列表和导出中去掉经办人和监印人）")
+    @PostMapping("/listExport")
+    public void export(@RequestBody SealNoteApprovalListRequest request) throws Exception {
+        List<BizResourceSealUseNote> list = super.exportList(request);
+        super.exportExcel(BizResourceSealUseNote.class, list, ExportEnum.SEAL_NOTE.getSheetName());
+    }
+
     // TODO: 2023/7/28 印章使用日志：系统中使用印章时插入数据库
 
     @ApiOperation("印章使用日志列表（分页）")
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java
index 9b674fc..06b6521 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java
@@ -9,16 +9,20 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.resource.staff.StaffCertRequest;
 import com.casic.missiles.dto.resource.staff.StaffCertResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.service.resource.IBizResourceStaffInfoService;
 import com.casic.missiles.service.resource.IBizResourceStaffVerifierService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.List;
+
 /**
  * @Description:
  * @Author: wangpeng
@@ -41,9 +45,21 @@
         return ReturnUtil.success(super.packForBT(responsePage));
     }
 
+    @ApiOperation("证书逾期提醒导出")
+    @PostMapping("/listExport")
+    public void exportList(@RequestBody StaffCertRequest request) throws Exception {
+        List<StaffCertResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = staffInfoService.certListByIds(request.getIds());
+        } else {
+            list = staffInfoService.certList(request);
+        }
+        super.exportExcel(StaffCertResponse.class, list, ExportEnum.STAFF_CERTIFICATE_EXPIRE.getSheetName());
+    }
+
     @ApiOperation("证书逾期提醒")
     @PostMapping("/expirationReminder")
-    public ReturnDTO expirationReminder(@RequestBody IdDTO idDto) {
-        return verifierService.expirationReminder(idDto);
+    public ReturnDTO expirationReminder(@RequestBody IdDTO idDTO) {
+        return verifierService.expirationReminder(idDTO);
     }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java
index 3b251ad..a6e7850 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java
@@ -12,6 +12,7 @@
 import com.casic.missiles.dto.resource.staff.StaffListRequest;
 import com.casic.missiles.dto.resource.staff.TrainListRequest;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.*;
@@ -22,7 +23,10 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
 import java.util.List;
@@ -52,8 +56,19 @@
             throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
         }
         Page<BizResourceStaffInfo> page = PageFactory.defaultPage();
-        Page<BizResourceStaffInfo> responsePage = staffInfoService.listPage(page, request);
-        return ReturnUtil.success(super.packForBT(responsePage));
+        return ReturnUtil.success(super.packForBT(staffInfoService.listPage(page, request)));
+    }
+
+    @ApiOperation("人员登记导出")
+    @PostMapping("/listExport")
+    public void exportList(@RequestBody StaffListRequest request) throws Exception {
+        List<BizResourceStaffInfo> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = staffInfoService.listByIds(request.getIds());
+        } else {
+            list = staffInfoService.list(request);
+        }
+        super.exportExcel(BizResourceStaffInfo.class, list, ExportEnum.STAFF_INFO.getSheetName());
     }
 
     @ApiOperation("人员登记详情基础信息")
@@ -85,9 +100,9 @@
 
     @ApiOperation("科研教育列表（分页）")
     @PostMapping("/education/listPage")
-    public ReturnDTO<PageInfoBT<BizResourceStaffEducation>> educationListPage(@RequestBody IdDTO idDto) {
+    public ReturnDTO<PageInfoBT<BizResourceStaffEducation>> educationListPage(@RequestBody IdDTO idDTO) {
         Page<BizResourceStaffEducation> page = PageFactory.defaultPage();
-        Page<BizResourceStaffEducation> responsePage = staffInfoService.educationListPage(page, idDto);
+        Page<BizResourceStaffEducation> responsePage = staffInfoService.educationListPage(page, idDTO);
         return ReturnUtil.success(super.packForBT(responsePage));
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java
index af6aa86..d85d84a 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java
@@ -9,6 +9,7 @@
 import com.casic.missiles.dto.resource.outsideService.SupplierApprovalListRequest;
 import com.casic.missiles.dto.resource.outsideService.SupplierSaveResponse;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceSupplierAbility;
@@ -67,6 +68,13 @@
         return ReturnUtil.success(supplierInfoService.detail(idDTO.getId()));
     }
 
+    @ApiOperation("合格供方导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody SupplierApprovalListRequest request) throws Exception {
+        List<BizResourceSupplierInfo> list = super.exportList(request);
+        super.exportExcel(BizResourceSupplierInfo.class, list, ExportEnum.SUPPLIER_INFO.getSheetName());
+    }
+
     @ApiOperation("供方人员列表（分页）")
     @PostMapping("/person/listPage")
     public ReturnDTO<PageInfoBT<BizResourceSupplierPerson>> personListPage(@RequestBody IdDTO idDTO) {
diff --git a/casic-metering-api/src/main/resources/config/application.yml b/casic-metering-api/src/main/resources/config/application.yml
index 350db5f..ecff521 100644
--- a/casic-metering-api/src/main/resources/config/application.yml
+++ b/casic-metering-api/src/main/resources/config/application.yml
@@ -126,7 +126,7 @@
     #作者
     author: wangpeng
     #待生成对象表名
-    table-name: biz_equipment_technical_target_approval,biz_equipment_attachment_approval,biz_equipment_checkpoint_approval
+    table-name: biz_business_outsource_protocol
 
 reminder:
   #节点--common模块config包 ReminderNodeConfig配置
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
index 4a19e4e..d47d552 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
@@ -53,6 +53,7 @@
     SUGGEST_FORM_SAVE_FAILED(2509, "委托方意见登记表保存至草稿箱失败"),
     EXAMINE_FORM_SAVE_FAILED(2510, "要求、委托书及合同评审表保存至草稿箱失败"),
     CUSTOMER_EXIST_SAVE_FAILED(2511, "该委托方已存在，请重新选择"),
+    DUPLICATE_LOCATION_NO(2512, "地点编号已存在"),
 
     /**
      * 计量检定业务模块
@@ -68,6 +69,8 @@
     COMPLETE_SAMPLE_NOT_EXIST(2609, "检测中不存在扫描收入的样品"),
     CANNOT_CHANGE_MEASURE_INFO(2610, "无法更改非当前登录用户的检测信息"),
     NON_EXIST_ORDER_OR_SAMPLE(2611, "不存在该委托单或该委托单下的样品"),
+    OUTSOURCE_ACCESS_SAVE_FAILED(2612, "测试、校准或检定工作分包评审表保存至草稿箱失败"),
+    OUTSOURCE_PROTOCOL_SAVE_FAILED(2613, "测试、校准或检定工作分包协议书保存至草稿箱失败"),
 
     /**
      * 历史遗留备用
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
index 5089ad1..81a406b 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
@@ -10,54 +10,38 @@
     /**
      * 资源管理
      */
-    ENVIRONMENT_DATA_EXPORT("environmentData", "environmentData", "环境记录单数据"),
+    ENVIRONMENT_DATA_EXPORT("environmentData", "环境记录单数据", "环境记录单数据"),
+    STAFF_INFO("staffInfo", "人员登记", "人员登记"),
+    STAFF_CERTIFICATE_EXPIRE("certificateExpire", "证书逾期提醒", "证书逾期提醒"),
+    SUPPLIER_INFO("supplierInfo", "合格供方名录", "合格供方名录"),
+    CUSTOMER_INFO("customerInfo", "委托方名录", "委托方名录"),
+    CUSTOMER_SUGGEST_FORM("customerSuggestForm", "委托方意见登记表", "委托方意见登记表"),
+    SEAL_NOTE("sealNote", "印章使用登记", "印章使用登记"),
 
-    FILE_EXPORT("meterFileData", "meterFileData", "计量文件信息"),
-    TRAIN_PLAN_EXPORT("trainPlanData", "trainPlanData", "培训计划"),
-    TRAIN_LOG_EXPORT("trainLogData", "trainLogData", "培训记录"),
-    METER_ORGANIZE_EXPORT("meterOrganizeData", "meterOrganizeData", "计量组织"),
-    TRACE_SUPPLIER_EXPORT("traceSupplierData", "traceSupplierData", "溯源供方"),
-    SIGN_EXPORT("signData", "signData", "签名/签章"),
-    TEMPLATE_EXPORT("templateData", "templateData", "原始记录模板/证书报告模板"),
-    FIXED_ASSETS("meterFixedAssets", "meterFixedAssets", "固定资产"),
-    METER_EQUIPMENT("meterEquipment", "meterEquipment", "测量设备"),
-    CALIBRATION_TEST_EQUIPMENT("calibrationTestEquipment", "calibrationTestEquipment", "校准检定设备"),
-    MEASURE_ACCOUNT("measureAccount", "measureAccount", "测量工装"),
-    STANDARD_SUPPORT_EQUIPMENT("standardSupportEquipment", "standardSupportEquipment", "标准配套设备"),
-    STANDARD_EQUIPMENT("standardEquipment", "standardEquipment", "标准装置"),
-    FLOW_DEF_EXPORT("flowDefData", "flowDefData", "流程定义"),
-    STAFF_CERTIFICATE("certificate", "certificate", "计量人员证书"),
-    CHECK_INFO("checkInfo", "checkInfo", "设备管理点检测"),
-    EQUIPMENT_APPLY("equipmentApply", "equipmentApply", "设备借用"),
-    STANDARD_EQUIPMENT_REMIND("equipmentApplyRemind", "equipmentApplyRemind", "标准装置到期提醒"),
-    METER_PRICE("meterPrice", "meterPrice", "价格库"),
-    METER_STAFF("meterStaff", "meterStaff", "计量人员"),
-    STANDARD_EQUIPMENT_APPLY("standardEquipmentApply", "standardEquipmentApply", "标准装置申请"),
-    STATE_MANAGE_APPLY("stateManage", "stateManage", "状态管理"),
-    METER_ACCEPTANCE_CHECK("acceptanceCheck", "acceptanceCheck", "设备检修保养验收单"),
-    CUSTOMER_EXPORT("customerData", "customerData", "客户信息"),
-    ORDER_EXPORT("orderData", "orderData", "委托书信息"),
-    SAMPLE_EXPORT("sampleData", "sampleData", "样本信息"),
-    EXCHANGE_DATA("exchangeData", "exchangeData", "设备交接单"),
-    DISPATCH_DATA("dispatchData", "dispatchData", "设备收发"),
-    ENVIRONMENT_DATA("environmentData", "environmentData", "环境记录单"),
-    ORIGIN_DATA("originData", "originData", "原始记录"),
-    CERTIFICATE_REPORT("certificateReport", "certificateReport", "证书报告"),
-    ADVICE_EXPORT("adviceData", "adviceData", "客户反馈"),
-    HANDOUT_EXPORT("handoutData", "handoutData", "任务分发列表"),
-    OUTSOURCER_EXPORT("outsourcerData", "outsourcerData", "分包方"),
-    SITE_EXECUTIVE_EXPORT("siteExecutiveData", "siteExecutiveData", "现场测试、校准或检定"),
-    CERTIFICATE_PRINT_EXPORT("certificatePrintData", "certificatePrintData", "证书打印"),
-    DOWNLOAD_TEMPLATE("downloadTemplate", "downloadTemplate", "页面配置"),
-    OUTSOURCER_CERTIFICATE_EXPORT("outsourceCertificateData", "outsourceCertificateData", "分包证书"),
-    SETTLEMENT_INFO_EXPORT("settlementInfoData", "settlementInfoData", "业务结算"),
-    EQUIPMENT_REMIND("equipmentRemind", "equipmentRemind", "设备到期提醒"),
-    AGREEMENT_INFO_EXPORT("agreementInfoData", "agreementInfoData", "合同"),
-    WORK_STATISTICS_EXPORT("workStatisticsData", "workStatisticsData", "实时工作统计"),
-    DEPT_OUTPUT_EXPORT("deptOutputData", "deptOutputData", "部门产值分析"),
-    WORKLOAD_EXPORT("workloadData", "workloadData", "业务工作量分析"),
-    DEPT_COMPREHENSIVE_EXPORT("deptComprehensiveData", "deptComprehensiveData", "部门综合分析"),
-    ENVIRONMENTAL_RECORD("environmentalRecordData", "environmentalRecordData", "现场环境记录");
+    /**
+     * 计量检定业务
+     */
+    OUTSOURCER_EXPORT("outsourcerData", "分包方名录", "分包方名录"),
+    IDENTIFY_EXPORT("identifyData", "计量标识", "计量标识"),
+    ORDER_EXPORT("orderData", "任务单", "任务单"),
+    DISPATCH_DATA("dispatchData", "设备收发", "设备收发"),
+    HANDOUT_EXPORT("handoutData", "任务分发", "任务分发"),
+    SITE_EXECUTIVE_EXPORT("siteExecutiveData", "现场测试、校准或检定", "现场测试、校准或检定"),
+    CERTIFICATE_REPORT("certificateReport", "证书审批", "证书审批"),
+    CERTIFICATE_CHANGE_APPLY("certificateChangeApply", "证书报告补充或更换申请单", "证书报告补充或更换申请单"),
+    CERTIFICATE_PRINT("certificatePrintData", "证书打印审批", "证书打印审批"),
+    DEPT_EXECUTIVE_TASK("deptExecutiveTaskData", "实验室任务", "实验室任务"),
+    MY_EXECUTIVE_TASK("myExecutiveTaskData", "我的任务", "我的任务"),
+    OUTSOURCE_ASSESS("outsourceAssess", "测试、校准或检定工作分包评审表", "测试、校准或检定工作分包评审表"),
+    OUTSOURCE_PROTOCOL("outsourceProtocol", "测试、校准或检定工作分包协议书", "测试、校准或检定工作分包协议书"),
+
+    /**
+     * 系统管理
+     */
+    SIGN_EXPORT("signData", "签名", "签名"),
+    TEMPLATE_EXPORT("templateData", "文件模板", "文件模板"),
+    FLOW_DEF_EXPORT("flowDefData", "流程定义", "流程定义"),
+    DOWNLOAD_TEMPLATE("downloadTemplate", "流程定义", "页面配置");
 
     ExportEnum(String fileName, String sheetName, String description) {
         this.fileName = fileName;
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateRecordTypeCodeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateRecordTypeCodeEnum.java
index 31d913c..a963522 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateRecordTypeCodeEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateRecordTypeCodeEnum.java
@@ -46,4 +46,14 @@
     String SITE_EXECUTIVE_APPROVAL = "01";
     //《现场测试、校准或检定工作记录表》
     String SITE_EXECUTIVE_LOG = "02";
+
+    //测试、校准或检定工作分包协议书
+    String OUTSOURCE_PROTOCOL = "01";
+    //测试、校准或检定工作分包评审表
+    String OUTSOURCE_ACCESS = "02";
+    //测试、校准或检定工作分包通知书
+    String OUTSOURCE_NOTICE = "03";
+    //测试、校准或检定工作分包方名录
+    String OUTSOURCE_INFO = "04";
+
 }
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
index 24b8635..f78bd53 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
@@ -15,6 +15,10 @@
     String CERTIFICATE_CHANGE_APPLY_BEAN_NAME = "certificateChangeApplyBean";
     //现场测试、校准或检定
     String SITE_EXECUTIVE_BEAN_NAME = "siteExecutiveBean";
+    //测试、校准或检定工作分包评审表
+    String OUTSOURCE_ASSESS_BEAN_NAME = "outsourceAssessBean";
+    //测试、校准或检定工作分包协议书
+    String OUTSOURCE_PROTOCOL_BEAN_NAME = "outsourceProtocolBean";
 
     /*********************************设备与装置************************************/
     //设备台账
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 b21c661..6b86fd1 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
@@ -18,6 +18,8 @@
     OUTSOURCER_APPROVAL(OUTSOURCER_BEAN_NAME, ""),
     CERTIFICATE_CHANGE_APPROVAL(CERTIFICATE_CHANGE_APPLY_BEAN_NAME, ""),
     SITE_EXECUTIVE_APPROVAL(SITE_EXECUTIVE_BEAN_NAME, ""),
+    OUTSOURCE_ASSESS_APPROVAL(OUTSOURCE_ASSESS_BEAN_NAME, ""),
+    OUTSOURCE_PROTOCOL_APPROVAL(OUTSOURCE_PROTOCOL_BEAN_NAME, ""),
 
     ACTION_STATUS_MAP(new HashMap<String, AwareActionStatusEnum>() {
         {
@@ -47,6 +49,10 @@
             put(ApplyFromIdEnum.CERTIFICATE_CHANGE_APPROVAL.getCode(), CERTIFICATE_CHANGE_APPROVAL);
             //现场测试、校准或检定审批
             put(ApplyFromIdEnum.SITE_EXECUTIVE_APPROVAL.getCode(), SITE_EXECUTIVE_APPROVAL);
+            //测试、校准或检定工作分包评审表
+            put(ApplyFromIdEnum.OUTSOURCE_ASSESS_APPROVAL.getCode(), OUTSOURCE_ASSESS_APPROVAL);
+            //测试、校准或检定工作分包协议书
+            put(ApplyFromIdEnum.OUTSOURCE_PROTOCOL_APPROVAL.getCode(), OUTSOURCE_PROTOCOL_APPROVAL);
         }
     });
     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 934405e..c7410bd 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
@@ -9,6 +9,8 @@
     CERTIFICATE_CHANGE_APPROVAL("jljdywzsbchghsqd", MessageSourceModuleEnum.BUSINESS.getCode(), "证书/报告补充或更换申请单"),
     OUTSOURCER_APPROVAL("jljdywcsjzhgfbfml", MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定合格分包方名录"),
     SITE_EXECUTIVE_APPROVAL("jljdywxccsjzsp", MessageSourceModuleEnum.BUSINESS.getCode(), "现场测试、校准或检定审批"),
+    OUTSOURCE_ASSESS_APPROVAL("jljdywcsjzfbpsb", MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包评审表"),
+    OUTSOURCE_PROTOCOL_APPROVAL("jljdywcsjzfbxys", MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包协议书"),
 
 
     /*******************************************设备与装置*********************************************/
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/GeneralApprovalMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/GeneralApprovalMapper.java
index 4fb7344..0c9d6ae 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/GeneralApprovalMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/GeneralApprovalMapper.java
@@ -17,8 +17,4 @@
 
     Page<O> selectBatchForApprovalList(Page<O> page, @Param("request") R request, @Param("businessKeys") List<String> businessKeys);
 
-//    Page<O> selectListPage(Page<O> page, @Param("request") R request);
-
-//    Long selectMaxNo();
-
 }
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceAssessMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceAssessMapper.java
index 7867bb8..ba59009 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceAssessMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceAssessMapper.java
@@ -1,7 +1,12 @@
 package com.casic.missiles.mapper.business;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.business.outsource.OutsourceAssessApprovalListRequest;
+import com.casic.missiles.mapper.GeneralApprovalMapper;
 import com.casic.missiles.model.business.BizBusinessOutsourceAssess;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * <p>
@@ -11,6 +16,10 @@
  * @author wangpeng
  * @since 2023-08-16
  */
-public interface BizBusinessOutsourceAssessMapper extends BaseMapper<BizBusinessOutsourceAssess> {
+public interface BizBusinessOutsourceAssessMapper extends GeneralApprovalMapper<BizBusinessOutsourceAssess, BizBusinessOutsourceAssess, OutsourceAssessApprovalListRequest> {
+
+    Page<BizBusinessOutsourceAssess> selectBatchForApprovalList(Page<BizBusinessOutsourceAssess> page, @Param("request") OutsourceAssessApprovalListRequest request, @Param("businessKeys") List<String> businessKeys);
+
+    Long selectMaxProjectNo();
 
 }
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceProtocolMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceProtocolMapper.java
new file mode 100644
index 0000000..e6aba35
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceProtocolMapper.java
@@ -0,0 +1,24 @@
+package com.casic.missiles.mapper.business;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.business.outsource.OutsourceProtocolApprovalListRequest;
+import com.casic.missiles.mapper.GeneralApprovalMapper;
+import com.casic.missiles.model.business.BizBusinessOutsourceProtocol;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 计量检定业务-分包管理-测试、校准或检定工作分包协议书 Mapper 接口
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-08-24
+ */
+public interface BizBusinessOutsourceProtocolMapper extends GeneralApprovalMapper<BizBusinessOutsourceProtocol, BizBusinessOutsourceProtocol, OutsourceProtocolApprovalListRequest> {
+
+    Page<BizBusinessOutsourceProtocol> selectBatchForApprovalList(Page<BizBusinessOutsourceProtocol> page, @Param("request") OutsourceProtocolApprovalListRequest request, @Param("businessKeys") List<String> businessKeys);
+
+    Long selectMaxProtocolNo();
+}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/EnvLocationInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/EnvLocationInfoMapper.java
new file mode 100644
index 0000000..49eff87
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/EnvLocationInfoMapper.java
@@ -0,0 +1,21 @@
+package com.casic.missiles.mapper.resource;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.resource.environment.LocationListRequest;
+import com.casic.missiles.dto.resource.environment.LocationListResponse;
+import com.casic.missiles.model.resource.EnvLocationInfo;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * <p>
+ * 实验室环境监控系统-设备表 Mapper 接口
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-06-07
+ */
+public interface EnvLocationInfoMapper extends BaseMapper<EnvLocationInfo> {
+
+    Page<LocationListResponse> selectLocationListPage(Page<LocationListResponse> page, @Param("request") LocationListRequest request);
+}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java
index de124db..85ed0f7 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java
@@ -1,7 +1,9 @@
 package com.casic.missiles.mapper.system;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.dto.system.SignDetailResponse;
+import com.casic.missiles.dto.system.SignListRequest;
 import com.casic.missiles.model.system.SystemSign;
 import org.apache.ibatis.annotations.Param;
 
@@ -22,4 +24,8 @@
     SignDetailResponse selectSignDetailById(Long id);
 
     List<SystemSign> selectUsableSignList(@Param("userId") Long userId);
+
+    Page<SystemSign> selectSignListPage(Page<SystemSign> page, @Param("request") SignListRequest request);
+
+    List<SystemSign> selectSignList(@Param("request") SignListRequest request);
 }
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateChangeApplyMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateChangeApplyMapper.xml
index d798447..c496092 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateChangeApplyMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateChangeApplyMapper.xml
@@ -30,31 +30,31 @@
         SELECT *
         FROM biz_business_certificate_change_apply
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.changeApplyNo != null and request.changeApplyNo !=''">
+        <if test="request != null and request.changeApplyNo != null and request.changeApplyNo !=''">
             and change_apply_no like concat('%',#{request.changeApplyNo},'%')
         </if>
-        <if test="request.changeReportNo != null and request.changeReportNo !=''">
+        <if test="request != null and request.changeReportNo != null and request.changeReportNo !=''">
             and change_report_no like concat('%',#{request.changeReportNo},'%')
         </if>
-        <if test="request.changeReportName != null and request.changeReportName !=''">
+        <if test="request != null and request.changeReportName != null and request.changeReportName !=''">
             and change_report_name like concat('%',#{request.changeReportName},'%')
         </if>
-        <if test="request.changeType != null and request.changeType !=''">
+        <if test="request != null and request.changeType != null and request.changeType !=''">
             and change_type = #{request.changeType}
         </if>
-        <if test="request.createUserName != null and request.createUserName !=''">
+        <if test="request != null and request.createUserName != null and request.createUserName !=''">
             and create_user_name like concat('%',#{request.createUserName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificatePrintMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificatePrintMapper.xml
index b66cd99..49c0ac8 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificatePrintMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificatePrintMapper.xml
@@ -31,34 +31,34 @@
         LEFT JOIN biz_business_order_sample_relation bosr ON (bosr.order_id = bcr.order_id AND bosr.sample_id = bcr.sample_id)
         LEFT JOIN biz_business_order_info boi ON boi.id = bosr.order_id
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and bcp.approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.printStatus != null and request.printStatus !=''">
+        <if test="request != null and request.printStatus != null and request.printStatus !=''">
             and print_status = #{request.printStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and bcp.create_user_id = #{request.createUserId}
         </if>
-        <if test="request.certificateReportNo != null and request.certificateReportNo !=''">
+        <if test="request != null and request.certificateReportNo != null and request.certificateReportNo !=''">
             and bcr.certificate_report_no like concat('%',#{request.certificateReportNo},'%')
         </if>
-        <if test="request.certificateReportName != null and request.certificateReportName !=''">
+        <if test="request != null and request.certificateReportName != null and request.certificateReportName !=''">
             and bcr.certificate_report_name like concat('%',#{request.certificateReportName},'%')
         </if>
-        <if test="request.customerName != null and request.customerName !=''">
+        <if test="request != null and request.customerName != null and request.customerName !=''">
             and boi.customer_name like concat('%',#{request.customerName},'%')
         </if>
-        <if test="request.sampleNo != null and request.sampleNo !=''">
+        <if test="request != null and request.sampleNo != null and request.sampleNo !=''">
             and bosr.sample_no like concat('%',#{request.sampleNo},'%')
         </if>
-        <if test="request.sampleName != null and request.sampleName !=''">
+        <if test="request != null and request.sampleName != null and request.sampleName !=''">
             and bosr.sample_name like concat('%',#{request.sampleName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and bcp.create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and bcp.create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml
index b366034..767695d 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml
@@ -46,33 +46,37 @@
         SELECT bcr.*, bosr.sample_no, bosr.sample_name, bosr.sample_model, rsi.staff_name
         FROM biz_business_certificate_report bcr
         LEFT JOIN biz_business_order_sample_relation bosr ON (bosr.order_id = bcr.order_id AND bosr.sample_id = bcr.sample_id)
+        LEFT JOIN biz_business_order_info boi ON boi.id = bcr.order_id
         LEFT JOIN biz_resource_staff_info rsi ON rsi.id = bcr.measure_person_id
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and bcr.approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and bcr.create_user_id = #{request.createUserId}
         </if>
-        <if test="request.certificateReportNo != null and request.certificateReportNo !=''">
+        <if test="request != null and request.customerId != null and request.customerId !=''">
+            and boi.customer_id = #{request.customerId}
+        </if>
+        <if test="request != null and request.certificateReportNo != null and request.certificateReportNo !=''">
             and bcr.certificate_report_no like concat('%',#{request.certificateReportNo},'%')
         </if>
-        <if test="request.certificateReportName != null and request.certificateReportName !=''">
+        <if test="request != null and request.certificateReportName != null and request.certificateReportName !=''">
             and bcr.certificate_report_name like concat('%',#{request.certificateReportName},'%')
         </if>
-        <if test="request.sampleNo != null and request.sampleNo !=''">
+        <if test="request != null and request.sampleNo != null and request.sampleNo !=''">
             and bosr.sample_no like concat('%',#{request.sampleNo},'%')
         </if>
-        <if test="request.measureCategory != null and request.measureCategory !=''">
+        <if test="request != null and request.measureCategory != null and request.measureCategory !=''">
             and bcr.measure_category = #{request.measureCategory}
         </if>
-        <if test="request.measurePerson != null and request.measurePerson !=''">
+        <if test="request != null and request.measurePerson != null and request.measurePerson !=''">
             and rsi.staff_name like concat('%',#{request.measurePerson},'%')
         </if>
-        <if test="request.calibrationTimeStart != null and request.calibrationTimeStart !=''">
+        <if test="request != null and request.calibrationTimeStart != null and request.calibrationTimeStart !=''">
             and bcr.calibration_time &gt;= #{request.calibrationTimeStart}
         </if>
-        <if test="request.calibrationTimeEnd != null and request.calibrationTimeEnd !=''">
+        <if test="request != null and request.calibrationTimeEnd != null and request.calibrationTimeEnd !=''">
             and bcr.calibration_time &lt;= #{request.calibrationTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceAssessMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceAssessMapper.xml
index d0fcf8b..c22c101 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceAssessMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceAssessMapper.xml
@@ -7,6 +7,8 @@
         <id column="id" property="id" />
         <result column="project_no" property="projectNo" />
         <result column="project_name" property="projectName" />
+        <result column="lab_code" property="labCode" />
+        <result column="group_code" property="groupCode" />
         <result column="applicant_id" property="applicantId" />
         <result column="applicant_name" property="applicantName" />
         <result column="applicant_time" property="applicantTime" />
@@ -31,7 +33,45 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, project_no, project_name, applicant_id, applicant_name, applicant_time, minio_file_name, remark, create_user_id, create_user_name, outsourcer_id, pre_start_time, pre_end_time, outsource_reason, pre_cost, approval_status, process_id, approve_situation, traceability, test_method, technique_ability, create_time, update_time
+        id, project_no, project_name, lab_code, group_code, applicant_id, applicant_name, applicant_time, minio_file_name, remark, create_user_id, create_user_name, outsourcer_id, pre_start_time, pre_end_time, outsource_reason, pre_cost, approval_status, process_id, approve_situation, traceability, test_method, technique_ability, create_time, update_time
     </sql>
 
+    <select id="selectMaxProjectNo" resultType="java.lang.Long">
+        SELECT IFNULL(max(RIGHT(project_no, 3)), 0) from biz_business_outsource_assess
+    </select>
+
+    <select id="selectBatchForApprovalList" resultMap="BaseResultMap">
+        SELECT bboa.*, bboi.outsourcer_name, bboi.director
+        FROM biz_business_outsource_assess bboa
+        LEFT JOIN biz_business_outsourcer_info bboi ON bboa.outsourcer_id = bboi.id
+        WHERE 1=1
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
+            and bboa.approval_status = #{request.approvalStatus}
+        </if>
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
+            and bboa.create_user_id = #{request.createUserId}
+        </if>
+        <if test="request != null and request.projectNo != null and request.projectNo !=''">
+            and bboa.project_no like concat('%',#{request.projectNo},'%')
+        </if>
+        <if test="request != null and request.outsourcerName != null and request.outsourcerName !=''">
+            and bboi.outsourcer_name like concat('%',#{request.outsourcerName},'%')
+        </if>
+        <if test="request != null and request.applicantName != null and request.applicantName !=''">
+            and bboa.applicant_name like concat('%',#{request.applicantName},'%')
+        </if>
+        <if test="request != null and request.applicantTimeStart != null and request.applicantTimeStart !=''">
+            and bboa.applicant_time &gt;= #{request.applicantTimeStart}
+        </if>
+        <if test="request != null and request.applicantTimeEnd != null and request.applicantTimeEnd !=''">
+            and bboa.applicant_time &lt;= #{request.applicantTimeEnd}
+        </if>
+        <if test="businessKeys != null">
+            and bboa.id in
+            <foreach collection="businessKeys" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
+        ORDER BY bboa.create_time DESC
+    </select>
 </mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceProtocolMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceProtocolMapper.xml
new file mode 100644
index 0000000..b7b2149
--- /dev/null
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceProtocolMapper.xml
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.mapper.business.BizBusinessOutsourceProtocolMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.business.BizBusinessOutsourceProtocol">
+        <id column="id" property="id" />
+        <result column="protocol_no" property="protocolNo" />
+        <result column="project_name" property="projectName" />
+        <result column="lab_code" property="labCode" />
+        <result column="group_code" property="groupCode" />
+        <result column="outsourcer_id" property="outsourcerId" />
+        <result column="remark" property="remark" />
+        <result column="outsource_no" property="outsourceNo" />
+        <result column="outsource_name" property="outsourceName" />
+        <result column="contacts" property="contacts" />
+        <result column="mobile" property="mobile" />
+        <result column="address" property="address" />
+        <result column="require_date" property="requireDate" />
+        <result column="outsource_cost" property="outsourceCost" />
+        <result column="director" property="director" />
+        <result column="item" property="item" />
+        <result column="requires" property="requires" />
+        <result column="create_user_id" property="createUserId" />
+        <result column="create_user_name" property="createUserName" />
+        <result column="approval_status" property="approvalStatus" />
+        <result column="process_id" property="processId" />
+        <result column="create_time" property="createTime" />
+        <result column="update_time" property="updateTime" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, protocol_no, project_name, lab_code, group_code, outsourcer_id, remark, outsource_no, outsource_name, contacts, mobile, address, require_date, outsource_cost, director, item, requires, create_user_id, create_user_name, approval_status, process_id, create_time, update_time
+    </sql>
+
+    <select id="selectMaxProtocolNo" resultType="java.lang.Long">
+        SELECT IFNULL(max(RIGHT(protocol_no, 3)), 0) from biz_business_outsource_protocol
+    </select>
+
+    <select id="selectBatchForApprovalList" resultMap="BaseResultMap">
+        SELECT *
+        FROM biz_business_outsource_protocol
+        WHERE 1=1
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
+            and approval_status = #{request.approvalStatus}
+        </if>
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
+            and create_user_id = #{request.createUserId}
+        </if>
+        <if test="request != null and request.protocolNo != null and request.protocolNo !=''">
+            and protocol_no like concat('%',#{request.protocolNo},'%')
+        </if>
+        <if test="request != null and request.outsourcerName != null and request.outsourcerName !=''">
+            and outsourcer_name like concat('%',#{request.outsourcerName},'%')
+        </if>
+        <if test="request != null and request.applicantName != null and request.applicantName !=''">
+            and create_user_name like concat('%',#{request.applicantName},'%')
+        </if>
+        <if test="request != null and request.applicantTimeStart != null and request.applicantTimeStart !=''">
+            and create_time &gt;= #{request.applicantTimeStart}
+        </if>
+        <if test="request != null and request.applicantTimeEnd != null and request.applicantTimeEnd !=''">
+            and create_time &lt;= #{request.applicantTimeEnd}
+        </if>
+        <if test="businessKeys != null">
+            and id in
+            <foreach collection="businessKeys" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
+        ORDER BY create_time DESC
+    </select>
+</mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourcerInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourcerInfoMapper.xml
index 510a80b..3049b54 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourcerInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourcerInfoMapper.xml
@@ -7,6 +7,8 @@
         <id column="id" property="id" />
         <result column="outsourcer_no" property="outsourcerNo" />
         <result column="outsourcer_name" property="outsourcerName" />
+        <result column="lab_code" property="labCode" />
+        <result column="group_code" property="groupCode" />
         <result column="outsourcer_brief_name" property="outsourcerBriefName" />
         <result column="outsourcer_size" property="outsourcerSize" />
         <result column="business_size" property="businessSize" />
@@ -55,32 +57,32 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, outsourcer_no, outsourcer_name, outsourcer_brief_name, outsourcer_size, business_size, grade, evaluation, tax_number, bank_account, bank_name, bank_account_number, postal_code, director, phone, fax, mobile, email, website, address_country, address_province, address_city, address_area, full_address, address_country_name, address_province_name, address_city_name, address_area_name, invoice_country, invoice_province, invoice_city, invoice_area, invoice_full_address, invoice_country_name, invoice_province_name, invoice_city_name, invoice_area_name, business_scope, business_content, minio_file_name, approval_status, process_id, remark, create_user_id, create_user_name, create_time, update_time
+        id, outsourcer_no, outsourcer_name, lab_code, group_code, outsourcer_brief_name, outsourcer_size, business_size, grade, evaluation, tax_number, bank_account, bank_name, bank_account_number, postal_code, director, phone, fax, mobile, email, website, address_country, address_province, address_city, address_area, full_address, address_country_name, address_province_name, address_city_name, address_area_name, invoice_country, invoice_province, invoice_city, invoice_area, invoice_full_address, invoice_country_name, invoice_province_name, invoice_city_name, invoice_area_name, business_scope, business_content, minio_file_name, approval_status, process_id, remark, create_user_id, create_user_name, create_time, update_time
     </sql>
 
     <select id="selectBatchForApprovalList" resultMap="BaseResultMap">
         SELECT *
         FROM biz_business_outsourcer_info
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.outsourcerNo != null and request.outsourcerNo !=''">
+        <if test="request != null and request.outsourcerNo != null and request.outsourcerNo !=''">
             and outsourcer_no like concat('%',#{request.outsourcerNo},'%')
         </if>
-        <if test="request.outsourcerName != null and request.outsourcerName !=''">
+        <if test="request != null and request.outsourcerName != null and request.outsourcerName !=''">
             and outsourcer_name like concat('%',#{request.outsourcerName},'%')
         </if>
-        <if test="request.director != null and request.director !=''">
+        <if test="request != null and request.director != null and request.director !=''">
             and director like concat('%',#{request.director},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
@@ -93,6 +95,6 @@
     </select>
 
     <select id="selectMaxNo" resultType="java.lang.Long">
-        SELECT IFNULL(max(RIGHT(outsourcer_no, 12)), 0) from biz_business_outsourcer_info
+        SELECT IFNULL(max(RIGHT(outsourcer_no, 3)), 0) from biz_business_outsourcer_info
     </select>
 </mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessSiteExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessSiteExecutiveInfoMapper.xml
index 135c5d0..3c5ae79 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessSiteExecutiveInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessSiteExecutiveInfoMapper.xml
@@ -38,25 +38,25 @@
         FROM biz_business_site_executive_info bsei
         LEFT JOIN biz_resource_customer_info rci ON bsei.customer_id = rci.id
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and bsei.approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and bsei.create_user_id = #{request.createUserId}
         </if>
-        <if test="request.siteExecutiveNo != null and request.siteExecutiveNo !=''">
+        <if test="request != null and request.siteExecutiveNo != null and request.siteExecutiveNo !=''">
             and bsei.site_executive_no like concat('%',#{request.siteExecutiveNo},'%')
         </if>
-        <if test="request.customerName != null and request.customerName !=''">
+        <if test="request != null and request.customerName != null and request.customerName !=''">
             and rci.outsourcer_name like concat('%',#{request.customerName},'%')
         </if>
-        <if test="request.applyName != null and request.applyName !=''">
+        <if test="request != null and request.applyName != null and request.applyName !=''">
             and bsei.apply_name like concat('%',#{request.applyName},'%')
         </if>
-        <if test="request.applyTimeStart != null and request.applyTimeStart !=''">
+        <if test="request != null and request.applyTimeStart != null and request.applyTimeStart !=''">
             and bsei.apply_time &gt;= #{request.applyTimeStart}
         </if>
-        <if test="request.applyTimeEnd != null and request.applyTimeEnd !=''">
+        <if test="request != null and request.applyTimeEnd != null and request.applyTimeEnd !=''">
             and bsei.apply_time &lt;= #{request.applyTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml
index 84d9e2a..6bd38a9 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml
@@ -105,6 +105,12 @@
         <if test="request.isUrgent != null and request.isUrgent !=''">
             AND bo.is_urgent = #{request.isUrgent}
         </if>
+        <if test="request.ids != null">
+            and blei.id in
+            <foreach collection="request.ids" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
         ORDER BY blei.update_time DESC
     </select>
 
@@ -137,6 +143,12 @@
         <if test="request.isUrgent != null and request.isUrgent !=''">
             AND bo.is_urgent = #{request.isUrgent}
         </if>
+        <if test="request.ids != null">
+            and blei.id in
+            <foreach collection="request.ids" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
         ORDER BY blei.update_time DESC
     </select>
 
diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardInfoMapper.xml
index 1a5551b..2ed8d17 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardInfoMapper.xml
@@ -45,12 +45,6 @@
         FROM biz_equipment_standard_info besi
         LEFT JOIN biz_equipment_standard_technology_relation bestr ON besi.standard_no = bestr.standard_no
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
-            and besi.approval_status = #{request.approvalStatus}
-        </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
-            and besi.create_user_id = #{request.createUserId}
-        </if>
         <if test="request.standardName != null and request.standardName !=''">
             and besi.standard_name like concat('%',#{request.standardName},'%')
         </if>
diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardTechnologyRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardTechnologyRelationMapper.xml
index fc7e16c..cd03c8c 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardTechnologyRelationMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardTechnologyRelationMapper.xml
@@ -6,6 +6,7 @@
     <resultMap id="BaseResultMap" type="com.casic.missiles.model.equipment.BizEquipmentStandardTechnologyRelation">
         <id column="id" property="id" />
         <result column="technology_file_id" property="technologyFileId" />
+        <result column="technology_file_no" property="technologyFileNo" />
         <result column="technology_file_name" property="technologyFileName" />
         <result column="standard_id" property="standardId" />
         <result column="standard_no" property="standardNo" />
@@ -14,7 +15,7 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, technology_file_id, technology_file_name, standard_id, remark
+        id, technology_file_id, technology_file_no, technology_file_name, standard_id, remark
     </sql>
 
 </mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceAuthorizeOrderMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceAuthorizeOrderMapper.xml
index ac5176c..554fe65 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceAuthorizeOrderMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceAuthorizeOrderMapper.xml
@@ -32,22 +32,22 @@
         SELECT *
         FROM biz_resource_authorize_order
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.orderNo != null and request.orderNo !=''">
+        <if test="request != null and request.orderNo != null and request.orderNo !=''">
             and order_no like concat('%',#{request.orderNo},'%')
         </if>
-        <if test="request.createUserName != null and request.createUserName !=''">
+        <if test="request != null and request.createUserName != null and request.createUserName !=''">
             and create_user_name like concat('%',#{request.createUserName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerExamineFormMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerExamineFormMapper.xml
index ab242f6..af7f98f 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerExamineFormMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerExamineFormMapper.xml
@@ -41,28 +41,28 @@
         SELECT *
         FROM biz_resource_customer_examine_form
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.formNo != null and request.formNo !=''">
+        <if test="request != null and request.formNo != null and request.formNo !=''">
             and form_no like concat('%',#{request.formNo},'%')
         </if>
-        <if test="request.labCode != null and request.labCode !=''">
+        <if test="request != null and request.labCode != null and request.labCode !=''">
             and lab_code like concat('%',#{request.labCode},'%')
         </if>
-        <if test="request.groupCode != null and request.groupCode !=''">
+        <if test="request != null and request.groupCode != null and request.groupCode !=''">
             and group_code like concat('%',#{request.groupCode},'%')
         </if>
-        <if test="request.createUserName != null and request.createUserName !=''">
+        <if test="request != null and request.createUserName != null and request.createUserName !=''">
             and create_user_name like concat('%',#{request.createUserName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerInfoMapper.xml
index fa8ffbc..06a2798 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerInfoMapper.xml
@@ -33,25 +33,25 @@
         SELECT *
         FROM biz_resource_customer_info
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.customerNo != null and request.customerNo !=''">
+        <if test="request != null and request.customerNo != null and request.customerNo !=''">
             and customer_no like concat('%',#{request.customerNo},'%')
         </if>
-        <if test="request.customerName != null and request.customerName !=''">
+        <if test="request != null and request.customerName != null and request.customerName !=''">
             and customer_name like concat('%',#{request.customerName},'%')
         </if>
-        <if test="request.contacts != null and request.contacts !=''">
+        <if test="request != null and request.contacts != null and request.contacts !=''">
             and contacts like concat('%',#{request.contacts},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerSuggestFormMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerSuggestFormMapper.xml
index 28f5bb2..1806662 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerSuggestFormMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerSuggestFormMapper.xml
@@ -33,28 +33,28 @@
         SELECT *
         FROM biz_resource_customer_suggest_form
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.formNo != null and request.formNo !=''">
+        <if test="request != null and request.formNo != null and request.formNo !=''">
             and form_no like concat('%',#{request.formNo},'%')
         </if>
-        <if test="request.customerName != null and request.customerName !=''">
+        <if test="request != null and request.customerName != null and request.customerName !=''">
             and customer_name like concat('%',#{request.customerName},'%')
         </if>
-        <if test="request.customerDeptName != null and request.customerDeptName !=''">
+        <if test="request != null and request.customerDeptName != null and request.customerDeptName !=''">
             and customer_dept_name like concat('%',#{request.customerDeptName},'%')
         </if>
-        <if test="request.createUserName != null and request.createUserName !=''">
+        <if test="request != null and request.createUserName != null and request.createUserName !=''">
             and create_user_name like concat('%',#{request.createUserName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSealUseNoteMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSealUseNoteMapper.xml
index ab37bc1..b02bb33 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSealUseNoteMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSealUseNoteMapper.xml
@@ -29,32 +29,32 @@
     </sql>
 
     <select id="selectBatchForApprovalList" resultMap="BaseResultMap">
-        SELECT *
+        SELECT brsun.*, brsi.seal_name, brsi.seal_type, brsi.approver_name
         FROM biz_resource_seal_use_note brsun
         JOIN biz_resource_seal_info brsi ON brsun.seal_id = brsi.id
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and brsun.approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and brsun.create_user_id = #{request.createUserId}
         </if>
-        <if test="request.sealName != null and request.sealName !=''">
+        <if test="request != null and request.sealName != null and request.sealName !=''">
             and brsi.seal_name like concat('%',#{request.sealName},'%')
         </if>
-        <if test="request.sealType != null and request.sealType !=''">
+        <if test="request != null and request.sealType != null and request.sealType !=''">
             and brsi.seal_type = #{request.sealType}
         </if>
-        <if test="request.applyDeptName != null and request.applyDeptName !=''">
+        <if test="request != null and request.applyDeptName != null and request.applyDeptName !=''">
             and brsun.apply_dept_name like concat('%',#{request.applyDeptName},'%')
         </if>
-        <if test="request.applyUserName != null and request.applyUserName !=''">
+        <if test="request != null and request.applyUserName != null and request.applyUserName !=''">
             and brsun.apply_user_name like concat('%',#{request.applyUserName},'%')
         </if>
-        <if test="request.applyTimeStart != null and request.applyTimeStart !=''">
+        <if test="request != null and request.applyTimeStart != null and request.applyTimeStart !=''">
             and brsun.apply_time &gt;= #{request.applyTimeStart}
         </if>
-        <if test="request.applyTimeEnd != null and request.applyTimeEnd !=''">
+        <if test="request != null and request.applyTimeEnd != null and request.applyTimeEnd !=''">
             and brsun.apply_time &lt;= #{request.applyTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml
index 119bf7d..4f8392a 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml
@@ -31,6 +31,12 @@
         <if test="request.deptName != null and request.deptName !=''">
             and brsi.dept_name like concat('%',#{request.deptName},'%')
         </if>
+        <if test="request.ids != null">
+            and brsv.id in
+            <foreach collection="request.ids" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
         ORDER BY brsv.grant_date DESC
     </select>
 
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSupplierInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSupplierInfoMapper.xml
index fe8d399..e8ce7ef 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSupplierInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSupplierInfoMapper.xml
@@ -48,28 +48,28 @@
         SELECT *
         FROM biz_resource_supplier_info
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.supplierNo != null and request.supplierNo !=''">
+        <if test="request != null and request.supplierNo != null and request.supplierNo !=''">
             and supplier_no like concat('%',#{request.supplierNo},'%')
         </if>
-        <if test="request.supplierName != null and request.supplierName !=''">
+        <if test="request != null and request.supplierName != null and request.supplierName !=''">
             and supplier_name like concat('%',#{request.supplierName},'%')
         </if>
-        <if test="request.director != null and request.director !=''">
+        <if test="request != null and request.director != null and request.director !=''">
             and director like concat('%',#{request.director},'%')
         </if>
-        <if test="request.supplierType != null and request.supplierType !=''">
+        <if test="request != null and request.supplierType != null and request.supplierType !=''">
             and supplier_type = #{request.supplierType}
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/EnvLocationInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/EnvLocationInfoMapper.xml
new file mode 100644
index 0000000..68bcf10
--- /dev/null
+++ b/casic-metering-dao/src/main/resources/mapper/resource/EnvLocationInfoMapper.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.mapper.resource.EnvLocationInfoMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.resource.EnvLocationInfo">
+        <id column="id" property="id" />
+        <result column="location_no" property="locationNo" />
+        <result column="location_name" property="locationName" />
+        <result column="location_position" property="locationPosition" />
+        <result column="create_user_id" property="createUserId" />
+        <result column="create_user" property="createUser" />
+        <result column="create_time" property="createTime" />
+        <result column="update_time" property="updateTime" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, location_no, location_name, location_position, create_user_id, create_user, create_time, update_time
+    </sql>
+
+    <select id="selectLocationListPage" resultType="com.casic.missiles.dto.resource.environment.LocationListResponse">
+        SELECT *
+        FROM env_location_info
+        WHERE 1=1
+        <if test="request.locationNo != null and request.locationNo !=''">
+            AND location_no LIKE concat('%',#{request.locationNo},'%')
+        </if>
+        <if test="request.locationName != null and request.locationName !=''">
+            AND location_name LIKE concat('%',#{request.locationName},'%')
+        </if>
+        ORDER BY create_time DESC
+    </select>
+
+</mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml
index b28c18f..8854047 100644
--- a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml
@@ -11,7 +11,6 @@
         <result column="sign_desc" property="signDesc" />
         <result column="sign_director" property="signDirector" />
         <result column="sign_user_id" property="signUserId" />
-        <result column="sign_type" property="signType" />
         <result column="minio_file_name" property="minioFileName" />
         <result column="create_time" property="createTime" />
         <result column="update_time" property="updateTime" />
@@ -28,7 +27,6 @@
         <result column="sign_name" property="signName" />
         <result column="sign_desc" property="signDesc" />
         <result column="sign_director" property="signDirector" />
-        <result column="sign_type" property="signType" />
         <result column="sign_user_id" property="signUserId" />
         <result column="minio_file_name" property="minioFileName" />
         <result column="create_time" property="createTime" />
@@ -62,4 +60,58 @@
         JOIN system_sign_user_relation ssur ON ss.id = ssur.sign_id
         WHERE ssur.user_id = #{userId}
     </select>
+
+    <select id="selectSignListPage" resultMap="BaseResultMap">
+        SELECT ss.*, sd.SIMPLE_NAME AS deptName
+        FROM system_sign ss
+        LEFT JOIN sys_user su ON su.id = ss.sign_user_id
+        LEFT JOIN sys_dept sd ON sd.id = su.dept_id
+        WHERE 1=1
+        <if test="request.signNo != null and request.signNo !=''">
+            AND ss.sign_no LIKE concat('%',#{request.signNo},'%')
+        </if>
+        <if test="request.signName != null and request.signName !=''">
+            AND ss.sign_name LIKE concat('%',#{request.signName},'%')
+        </if>
+        <if test="request.signDirector != null and request.signDirector !=''">
+            AND ss.sign_director LIKE concat('%',#{request.signDirector},'%')
+        </if>
+        <if test="request.signUserId != null and request.signUserId !=''">
+            AND ss.sign_user_id = #{request.signUserId}
+        </if>
+        <if test="request.createStartTime != null and request.createStartTime !=''">
+            AND DATE_FORMAT(ss.create_time,'%Y-%m-%d') &gt;= DATE_FORMAT(#{request.createStartTime},'%Y-%m-%d')
+        </if>
+        <if test="request.createEndTime != null and request.createEndTime !=''">
+            AND DATE_FORMAT(ss.create_time,'%Y-%m-%d')  &lt;= DATE_FORMAT(#{request.createEndTime},'%Y-%m-%d')
+        </if>
+        ORDER BY ss.create_time DESC
+    </select>
+
+    <select id="selectSignList" resultMap="BaseResultMap">
+        SELECT ss.*, sd.SIMPLE_NAME AS deptName
+        FROM system_sign ss
+        LEFT JOIN sys_user su ON su.id = ss.sign_user_id
+        LEFT JOIN sys_dept sd ON sd.id = su.dept_id
+        WHERE 1=1
+        <if test="request.signNo != null and request.signNo !=''">
+            AND ss.sign_no LIKE concat('%',#{request.signNo},'%')
+        </if>
+        <if test="request.signName != null and request.signName !=''">
+            AND ss.sign_name LIKE concat('%',#{request.signName},'%')
+        </if>
+        <if test="request.signDirector != null and request.signDirector !=''">
+            AND ss.sign_director LIKE concat('%',#{request.signDirector},'%')
+        </if>
+        <if test="request.signUserId != null and request.signUserId !=''">
+            AND ss.sign_user_id = #{request.signUserId}
+        </if>
+        <if test="request.createStartTime != null and request.createStartTime !=''">
+            AND DATE_FORMAT(ss.create_time,'%Y-%m-%d') &gt;= DATE_FORMAT(#{request.createStartTime},'%Y-%m-%d')
+        </if>
+        <if test="request.createEndTime != null and request.createEndTime !=''">
+            AND DATE_FORMAT(ss.create_time,'%Y-%m-%d')  &lt;= DATE_FORMAT(#{request.createEndTime},'%Y-%m-%d')
+        </if>
+        ORDER BY ss.create_time DESC
+    </select>
 </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 515050a..60f530b 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
@@ -47,8 +47,8 @@
     String STORAGE_LOCATION = "bizStorageLocation";
     //计量专业
     String MEASURE_MAJOR = "bizMeasureMajor";
-    //管理状态
-    String MANAGER_STATE = "bizManagerState";
+    //标准装置管理状态
+    String STANDARD_MANAGER_STATE = "bizStandardManagerState";
 
     /**
      * 资源管理 字典code
@@ -95,8 +95,6 @@
     String MEASURE_STATUS = "measureStatus";
     //检定方式
     String MEASURE_TYPE = "measureType";
-    //标识打印标志类型
-    String IDENTIFY_PRINT_TYPE = "bizBusinessIdentify";
     //变更类型
     String REPORT_CHANGE_TYPE = "bizCertChangeType";
     //规模类型
@@ -111,19 +109,24 @@
     String MEASURE_CATEGORY = "measureCategory";
     //检定结果
     String MEASURE_RESULT = "measureResult";
+    //分包原因
+    String OUTSOURCE_REASON = "outsourceReason";
+
+    /**
+     * 系统管理
+     */
+    String TEMPLATE_TYPE = "templateType";
+
 
     /**
      * 标准装置 字典code
      */
     //类别
     String STANDARD_CATEGORY = "standardCategory";
-    //管理状态
-    String STANDARD_MANAGER_STATE = "standardManagerState";
     //标准等级
     String STANDARD_LEVEL = "standardLevel";
     //传递范围
     String STANDARD_TRANSMIT_RANGE = "transmitRange";
-
     //资本来源
     String CAPITAL_SOURCE = "capitalSource";
     //标准装置-申请类型
@@ -148,8 +151,6 @@
     String CERTIFICATE_CLASS = "certificationClass";
     //证书管理-检校专业
     String CALIBRATION_MAJOR = "calibrationMajor";
-    //分包原因
-    String OUTSOURCE_REASON = "outsourceReason";
 
     /**
      * 工作台
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/BaseApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/BaseApprovalListRequest.java
index 73c12c1..80d7424 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/BaseApprovalListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/BaseApprovalListRequest.java
@@ -6,6 +6,7 @@
 
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotEmpty;
+import java.util.List;
 
 /**
  * @Description:
@@ -19,14 +20,14 @@
      * 表单id
      */
     @NotBlank(message = "表单id不能为空")
-    @ApiModelProperty(value = "表单id（流程定义对应的表单id，等价于业务id）", dataType = "String")
+    @ApiModelProperty(value = "表单id（流程定义对应的表单id，等价于业务id），导出接口不用传", dataType = "String")
     private String formId;
 
     /**
      * 审批状态类型，对应ApprovalStatusEnum
      */
     @NotEmpty(message = "审批状态类型不能为空")
-    @ApiModelProperty(value = "审批状态类型code", dataType = "String")
+    @ApiModelProperty(value = "审批状态类型code，导出接口不用传", dataType = "String")
     private String approvalStatus;
 
     @ApiModelProperty(hidden = true)
@@ -34,4 +35,7 @@
 
     @ApiModelProperty(hidden = true)
     private Long createUserId;
+
+    @ApiModelProperty(value = "导出ids", dataType = "List")
+    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificatePrintApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificatePrintApprovalListRequest.java
index b93d1c9..3cc2f4e 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificatePrintApprovalListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificatePrintApprovalListRequest.java
@@ -5,8 +5,6 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import java.util.List;
-
 /**
  * @Description:
  * @Author: wangpeng
@@ -38,7 +36,4 @@
 
     @ApiModelProperty(value = "创建结束时间", dataType = "String")
     private String createTimeEnd;
-
-    @ApiModelProperty(value = "导出ids", dataType = "List")
-    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportApprovalListRequest.java
index 4f7a038..c115847 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportApprovalListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportApprovalListRequest.java
@@ -5,8 +5,6 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import java.util.List;
-
 /**
  * @Description:
  * @Author: wangpeng
@@ -15,6 +13,8 @@
 @ApiModel
 @Data
 public class CertificateReportApprovalListRequest extends BaseApprovalListRequest {
+    @ApiModelProperty(value = "委托方id", dataType = "String")
+    private Long customerId;
 
     @ApiModelProperty(value = "证书报告编号", dataType = "String")
     private String certificateReportNo;
@@ -37,6 +37,4 @@
     @ApiModelProperty(value = "检校结束时间", dataType = "String")
     private String calibrationTimeEnd;
 
-    @ApiModelProperty(value = "导出ids", dataType = "List")
-    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/identify/IdentifyListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/identify/IdentifyListRequest.java
index 1b87ae6..f019203 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/identify/IdentifyListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/identify/IdentifyListRequest.java
@@ -4,6 +4,8 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * @Description:
  * @Author: wangpeng
@@ -26,4 +28,7 @@
 
     @ApiModelProperty(value = "打印结束时间", dataType = "String")
     private String createTimeEnd;
+
+    @ApiModelProperty(value = "导出ids", dataType = "List")
+    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListRequest.java
index 1264883..62415fb 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListRequest.java
@@ -7,6 +7,7 @@
 import lombok.Data;
 
 import javax.validation.constraints.NotBlank;
+import java.util.List;
 
 @Data
 @ApiModel
@@ -37,4 +38,6 @@
     @ApiModelProperty(value = "是否加急（1是0否null全部）", dataType = "Integer")
     private String isUrgent;
 
+    @ApiModelProperty(value = "导出ids", dataType = "List")
+    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListRequest.java
index 5201d7b..499760a 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListRequest.java
@@ -17,6 +17,9 @@
     @ApiModelProperty(value = "任务单编号", dataType = "String")
     private String orderNo;
 
+    @ApiModelProperty(value = "委托方id", dataType = "Long")
+    private Long customerId;
+
     @ApiModelProperty(value = "委托方名称", dataType = "String")
     private String customerName;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OrderSampleDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OrderSampleDTO.java
new file mode 100644
index 0000000..796edc0
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OrderSampleDTO.java
@@ -0,0 +1,19 @@
+package com.casic.missiles.dto.business.outsource;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/8/24 11:38
+ */
+@ApiModel
+@Data
+public class OrderSampleDTO {
+    @ApiModelProperty(value = "任务单id", dataType = "Long")
+    private Long orderId;
+    @ApiModelProperty(value = "受检设备id", dataType = "Long")
+    private Long sampleId;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceAssessApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceAssessApprovalListRequest.java
new file mode 100644
index 0000000..9a930c3
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceAssessApprovalListRequest.java
@@ -0,0 +1,30 @@
+package com.casic.missiles.dto.business.outsource;
+
+import com.casic.missiles.dto.BaseApprovalListRequest;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/8/24 11:01
+ */
+@ApiModel
+@Data
+public class OutsourceAssessApprovalListRequest extends BaseApprovalListRequest {
+    @ApiModelProperty(value = "评审表编号", dataType = "String")
+    private String projectNo;
+
+    @ApiModelProperty(value = "分包机构名称", dataType = "String")
+    private String outsourcerName;
+
+    @ApiModelProperty(value = "申请人", dataType = "String")
+    private String applicantName;
+
+    @ApiModelProperty(value = "申请时间开始", dataType = "String")
+    private String applicantTimeStart;
+
+    @ApiModelProperty(value = "申请时间结束", dataType = "String")
+    private String applicantTimeEnd;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceAssessSaveResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceAssessSaveResponse.java
new file mode 100644
index 0000000..8bf9aad
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceAssessSaveResponse.java
@@ -0,0 +1,20 @@
+package com.casic.missiles.dto.business.outsource;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/8/14 16:17
+ */
+@ApiModel
+@Data
+public class OutsourceAssessSaveResponse {
+    @ApiModelProperty(value = "主键id", dataType = "Long")
+    private Long id;
+
+    @ApiModelProperty(value = "编号", dataType = "String")
+    private String projectNo;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProtocolApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProtocolApprovalListRequest.java
new file mode 100644
index 0000000..0f32331
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProtocolApprovalListRequest.java
@@ -0,0 +1,30 @@
+package com.casic.missiles.dto.business.outsource;
+
+import com.casic.missiles.dto.BaseApprovalListRequest;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/8/24 15:01
+ */
+@ApiModel
+@Data
+public class OutsourceProtocolApprovalListRequest extends BaseApprovalListRequest {
+    @ApiModelProperty(value = "协议书编号", dataType = "String")
+    private String protocolNo;
+
+    @ApiModelProperty(value = "分包方名称", dataType = "String")
+    private String outsourcerName;
+
+    @ApiModelProperty(value = "申请人", dataType = "String")
+    private String applicantName;
+
+    @ApiModelProperty(value = "申请时间开始", dataType = "String")
+    private String applicantTimeStart;
+
+    @ApiModelProperty(value = "申请时间结束", dataType = "String")
+    private String applicantTimeEnd;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProtocolSaveResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProtocolSaveResponse.java
new file mode 100644
index 0000000..e324967
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProtocolSaveResponse.java
@@ -0,0 +1,20 @@
+package com.casic.missiles.dto.business.outsource;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/8/14 16:17
+ */
+@ApiModel
+@Data
+public class OutsourceProtocolSaveResponse {
+    @ApiModelProperty(value = "主键id", dataType = "Long")
+    private Long id;
+
+    @ApiModelProperty(value = "编号", dataType = "String")
+    private String protocolNo;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveApprovalListRequest.java
index f29f4e4..7047c28 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveApprovalListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveApprovalListRequest.java
@@ -5,8 +5,6 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import java.util.List;
-
 /**
  * @Description: 现场检测审批列表请求实体
  * @Author: wangpeng
@@ -30,7 +28,4 @@
     @ApiModelProperty(value = "申请时间结束", dataType = "String")
     private String applyTimeEnd;
 
-    @ApiModelProperty(value = "导出ids", dataType = "List")
-    private List<Long> ids;
-
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveDetailResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveDetailResponse.java
index 1f28752..394c934 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveDetailResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveDetailResponse.java
@@ -12,6 +12,18 @@
     @ApiModelProperty(value = "id，更新/删除使用参数", dataType = "Long")
     private Long id;
 
+    @ApiModelProperty(value = "实验室代码(字典code)", dataType = "String")
+    private String labCode;
+
+    @ApiModelProperty(value = "实验室代码(字典value)", dataType = "String")
+    private String labCodeName;
+
+    @ApiModelProperty(value = "组别代码(字典code)", dataType = "String")
+    private String groupCode;
+
+    @ApiModelProperty(value = "组别代码(字典value)", dataType = "String")
+    private String groupCodeName;
+
     @ApiModelProperty(value = "审批编号", dataType = "String")
     private String siteExecutiveNo;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/environment/LocationListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/environment/LocationListRequest.java
new file mode 100644
index 0000000..13d03c3
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/environment/LocationListRequest.java
@@ -0,0 +1,20 @@
+package com.casic.missiles.dto.resource.environment;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/6/8 13:56
+ */
+@ApiModel
+@Data
+public class LocationListRequest {
+    @ApiModelProperty(value = "地点编号", dataType = "String")
+    private String locationNo;
+
+    @ApiModelProperty(value = "地点名称", dataType = "String")
+    private String locationName;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/environment/LocationListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/environment/LocationListResponse.java
new file mode 100644
index 0000000..4c531af
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/environment/LocationListResponse.java
@@ -0,0 +1,78 @@
+package com.casic.missiles.dto.resource.environment;
+
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
+import com.baomidou.mybatisplus.annotation.TableField;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description: 地点列表响应实体
+ * @Author: wangpeng
+ * @Date: 2023/6/8 13:53
+ */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
+@ApiModel
+@Data
+public class LocationListResponse {
+    @ApiModelProperty(value = "主键id", dataType = "Long")
+    private Long id;
+
+    /**
+     * 地点编号
+     */
+    @ExcelProperty("地点编号")
+    @ApiModelProperty(value = "地点编号", dataType = "String")
+    private String locationNo;
+
+    /**
+     * 地点名称
+     */
+    @ExcelProperty("地点名称")
+    @ApiModelProperty(value = "地点名称", dataType = "String")
+    private String locationName;
+
+    /**
+     * 地点位置
+     */
+    @ExcelProperty("地点位置")
+    @ApiModelProperty(value = "地点位置", dataType = "String")
+    private String locationPosition;
+
+    /**
+     * 创建人id
+     */
+    @ApiModelProperty(value = "创建人id", dataType = "Long")
+    private Long createUserId;
+
+    /**
+     * 创建人
+     */
+    @ExcelProperty("创建人")
+    @ApiModelProperty(value = "创建人", dataType = "String")
+    @TableField("create_user")
+    private String createUser;
+
+    /**
+     * 创建时间
+     */
+    @ExcelProperty("创建时间")
+    @ApiModelProperty(value = "创建时间", dataType = "String")
+    private String createTime;
+
+    /**
+     * 更新时间
+     */
+    @ApiModelProperty(value = "更新时间", dataType = "String")
+    private String updateTime;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertRequest.java
index 9a7f6c6..c827915 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertRequest.java
@@ -4,6 +4,8 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * @Description:
  * @Author: wangpeng
@@ -16,4 +18,7 @@
     private String name;
     @ApiModelProperty(value = "部门名", dataType = "String")
     private String deptName;
+
+    @ApiModelProperty(value = "导出ids", dataType = "List")
+    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertResponse.java
index f78b159..8f2f79e 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertResponse.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.dto.resource.staff;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.casic.missiles.annotation.DictCodeField;
 import com.casic.missiles.constants.MeterDictCode;
 import io.swagger.annotations.ApiModel;
@@ -13,12 +20,18 @@
  * @Author: wangpeng
  * @Date: 2023/7/27 15:13
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @ApiModel
 @Data
 public class StaffCertResponse {
     /**
      * 人员编号
      */
+    @ExcelProperty(value = "人员编号",order = 0)
     @NotEmpty(message = "人员编号不能为空")
     @ApiModelProperty(value = "人员编号", dataType = "String")
     private String staffNo;
@@ -26,6 +39,7 @@
     /**
      * 姓名
      */
+    @ExcelProperty(value = "姓名",order = 1)
     @ApiModelProperty(value = "姓名", dataType = "String")
     private String staffName;
 
@@ -54,6 +68,7 @@
     /**
      * 部门名字
      */
+    @ExcelProperty(value = "工作部门",order = 2)
     @ApiModelProperty(value = "部门名字", dataType = "String")
     private String deptName;
 
@@ -66,6 +81,7 @@
     /**
      * 计量专业
      */
+    @ExcelProperty(value = "计量专业",order = 3)
     @ApiModelProperty(value = "计量专业", dataType = "String")
     private String major;
 
@@ -110,6 +126,7 @@
     /**
      * 证书号
      */
+    @ExcelProperty(value = "证号",order = 4)
     @ApiModelProperty(value = "证书号", dataType = "String")
     private String certNo;
 
@@ -122,12 +139,14 @@
     /**
      * 有效日期
      */
+    @ExcelProperty(value = "证书有效期",order = 6)
     @ApiModelProperty(value = "有效日期", dataType = "String")
     private String effectiveDate;
 
     /**
      * 发放日期
      */
+    @ExcelProperty(value = "发证日期",order = 5)
     @ApiModelProperty(value = "发放日期", dataType = "String")
     private String grantDate;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffListRequest.java
index 7c4afb3..0a1194a 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffListRequest.java
@@ -4,6 +4,8 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * @Description:
  * @Author: wangpeng
@@ -18,4 +20,7 @@
     private String deptName;
     @ApiModelProperty(value = "部门id", dataType = "Long")
     private Long deptId;
+
+    @ApiModelProperty(value = "导出ids", dataType = "List")
+    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/TrainListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/TrainListRequest.java
index f68597b..6321f8b 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/TrainListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/TrainListRequest.java
@@ -14,6 +14,8 @@
 public class TrainListRequest {
     @ApiModelProperty(value = "训练登记表编号", dataType = "String")
     private String trainNo;
+    @ApiModelProperty(value = "值班领导", dataType = "String")
+    private String dutyLeader;
     @ApiModelProperty(value = "创建开始时间", dataType = "String")
     private String createTimeStart;
     @ApiModelProperty(value = "创建结束时间", dataType = "String")
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/SignAddRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/SignAddRequest.java
index 117be34..d71055c 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/SignAddRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/SignAddRequest.java
@@ -43,13 +43,6 @@
     private Long signUserId;
 
     /**
-     * 签章或签名-字典code
-     */
-    @NotBlank(message = "类型不能为空")
-    @ApiModelProperty(value = "签名/签章-字典code", dataType = "String", required = true)
-    private String signType;
-
-    /**
      * minio存储文件名
      */
     @ApiModelProperty(value = "上传文件返回名称", dataType = "String")
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateAddRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateAddRequest.java
index aff1265..6316648 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateAddRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateAddRequest.java
@@ -17,30 +17,28 @@
 @Data
 public class TemplateAddRequest extends BaseSystemRequest {
     /**
-     * 原始记录模板/证书报告模板名称
+     * 模板名称
      */
     @ApiModelProperty(value = "名称", dataType = "String", required = true)
     @NotBlank(message = "名称不能为空")
     private String templateName;
 
     /**
-     * 原始记录模板/证书报告模板描述
+     * 模板描述
      */
     @ApiModelProperty(value = "描述", dataType = "String")
     private String templateDesc;
 
     /**
-     * 原始记录模板/证书报告模板创建人
+     * 创建人
      */
     @ApiModelProperty(value = "创建人", dataType = "String", required = true)
     @NotBlank(message = "创建人不能为空")
     private String templateCreator;
 
-    /**
-     * 原始记录模板/证书报告模板-字典code
-     */
-    @NotBlank(message = "类型不能为空")
-    @ApiModelProperty(value = "原始记录模板/证书报告模板-字典code", dataType = "String", required = true)
+
+    @NotBlank(message = "模板类型不能为空")
+    @ApiModelProperty(value = "模板类型(字典code)", dataType = "String", required = true)
     private String templateType;
 
     /**
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateListRequest.java
index eec5a1e..6d17bbe 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateListRequest.java
@@ -1,11 +1,12 @@
 package com.casic.missiles.dto.system;
 
+import com.casic.missiles.annotation.DictCodeField;
+import com.casic.missiles.constants.MeterDictCode;
 import com.casic.missiles.dto.BaseSystemRequest;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import javax.validation.constraints.NotBlank;
 import java.util.List;
 
 /**
@@ -19,8 +20,8 @@
     /**
      * 类型
      */
-//    @ApiModelProperty(value = "类型-字典code", dataType = "String", required = true)
-    @NotBlank(message = "类型不能为空")
+    @DictCodeField(message = "模板类型不合法", cacheName = MeterDictCode.TEMPLATE_TYPE)
+    @ApiModelProperty(value = "模板类型(字典code)", dataType = "String")
     private String templateType;
 
     /**
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificateChangeApply.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificateChangeApply.java
index 9216308..36923fd 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificateChangeApply.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificateChangeApply.java
@@ -1,11 +1,19 @@
 package com.casic.missiles.model.business;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 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 com.casic.missiles.dto.BaseRequest;
+import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -20,6 +28,12 @@
  * @author wangpeng
  * @since 2023-08-15
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
+@ApiModel
 @Data
 @TableName("biz_business_certificate_change_apply")
 public class BizBusinessCertificateChangeApply extends BaseRequest implements Serializable {
@@ -33,6 +47,7 @@
     /**
      * 申请单编号
      */
+    @ExcelProperty(value = "申请单编号", order = 1)
     @ApiModelProperty(value = "申请单编号", dataType = "String")
     @TableField("change_apply_no")
     private String changeApplyNo;
@@ -40,6 +55,7 @@
     /**
      * 申请单名字
      */
+    @ExcelProperty(value = "申请单名称", order = 2)
     @ApiModelProperty(value = "申请单名字", dataType = "String")
     @TableField("change_apply_name")
     private String changeApplyName;
@@ -54,6 +70,7 @@
     /**
      * 更换证书编号
      */
+    @ExcelProperty(value = "更换证书编号", order = 3)
     @ApiModelProperty(value = "更换证书编号", dataType = "String")
     @TableField("change_report_no")
     private String changeReportNo;
@@ -61,7 +78,8 @@
     /**
      * 更换证书名字
      */
-    @ApiModelProperty(value = "更换证书名字", dataType = "String")
+    @ExcelProperty(value = "更换证书/报告名称", order = 4)
+    @ApiModelProperty(value = "更换证书/报告名称", dataType = "String")
     @TableField("change_report_name")
     private String changeReportName;
 
@@ -73,6 +91,7 @@
     @TableField("change_type")
     private String changeType;
 
+    @ExcelProperty(value = "变更类型", order = 5)
     @ApiModelProperty(value = "变更类型(字典value)", dataType = "String")
     @TableField(exist = false)
     private String changeTypeName;
@@ -142,13 +161,15 @@
     /**
      * 创建用户名字
      */
-    @ApiModelProperty(value = "创建用户名字", dataType = "String")
+    @ExcelProperty(value = "创建人", order = 6)
+    @ApiModelProperty(value = "创建人名字", dataType = "String")
     @TableField("create_user_name")
     private String createUserName;
 
     /**
      * 创建时间
      */
+    @ExcelProperty(value = "创建时间", order = 7)
     @ApiModelProperty(value = "创建时间", dataType = "String")
     @TableField("create_time")
     private String createTime;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificateReport.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificateReport.java
index f01db9e..db06018 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificateReport.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificateReport.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.model.business;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -22,6 +29,11 @@
  * @author wangpeng
  * @since 2023-08-14
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @ApiModel
 @Data
 @TableName("biz_business_certificate_report")
@@ -36,6 +48,7 @@
     /**
      * 证书报告编号
      */
+    @ExcelProperty(value = "证书报告编号", order = 1)
     @ApiModelProperty(value = "证书报告编号", dataType = "String")
     @TableField("certificate_report_no")
     private String certificateReportNo;
@@ -43,6 +56,7 @@
     /**
      * 证书报告名称
      */
+    @ExcelProperty(value = "证书报告名称", order = 2)
     @ApiModelProperty(value = "证书报告名称", dataType = "String")
     @TableField("certificate_report_name")
     private String certificateReportName;
@@ -62,6 +76,7 @@
     @TableField("measure_category")
     private String measureCategory;
 
+    @ExcelProperty(value = "检校类别", order = 6)
     @ApiModelProperty(value = "检校类别(字典value)", dataType = "String")
     @TableField(exist = false)
     private String measureCategoryName;
@@ -69,6 +84,7 @@
     /**
      * 检校时间
      */
+    @ExcelProperty(value = "检校时间", order = 8)
     @ApiModelProperty(value = "检校时间", dataType = "String")
     @TableField("calibration_time")
     private String calibrationTime;
@@ -267,18 +283,22 @@
     @TableField(exist = false)
     private Integer decisionItem;
 
-    @ApiModelProperty(value = "设备样品编号（列表返回参数）", dataType = "String")
+    @ExcelProperty(value = "被检设备统一编号", order = 3)
+    @ApiModelProperty(value = "被检设备统一编号（列表返回参数）", dataType = "String")
     @TableField(exist = false)
     private String sampleNo;
 
-    @ApiModelProperty(value = "设备样品名称（列表返回参数）", dataType = "String")
+    @ExcelProperty(value = "被检设备名称", order = 4)
+    @ApiModelProperty(value = "被检设备名称（列表返回参数）", dataType = "String")
     @TableField(exist = false)
     private String sampleName;
 
-    @ApiModelProperty(value = "设备样品规格型号（列表返回参数）", dataType = "String")
+    @ExcelProperty(value = "规格型号", order = 5)
+    @ApiModelProperty(value = "规格型号（列表返回参数）", dataType = "String")
     @TableField(exist = false)
     private String sampleModel;
 
+    @ExcelProperty(value = "检定员", order = 7)
     @ApiModelProperty(value = "检定员名字（列表返回参数）", dataType = "String")
     @TableField(exist = false)
     private String staffName;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessIdentifyInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessIdentifyInfo.java
index 46bfba5..f1a9bec 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessIdentifyInfo.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessIdentifyInfo.java
@@ -1,10 +1,15 @@
 package com.casic.missiles.model.business;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 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;
 
@@ -20,6 +25,11 @@
  * @author wangpeng
  * @since 2023-08-15
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @Data
 @TableName("biz_business_identify_info")
 public class BizBusinessIdentifyInfo implements Serializable {
@@ -33,6 +43,7 @@
     /**
      * 记录编号
      */
+    @ExcelProperty(value = "记录编号", order = 1)
     @ApiModelProperty(value = "记录编号", dataType = "String")
     @TableField("record_no")
     private String recordNo;
@@ -41,20 +52,15 @@
      * 标志类型(字典code)
      */
     @NotEmpty(message = "标志类型不能为空")
-    @ApiModelProperty(value = "标志类型(字典code)", dataType = "String")
-    @DictCodeField(message = "标志类型不合法", cacheName = MeterDictCode.IDENTIFY_PRINT_TYPE)
+    @ApiModelProperty(value = "标志类型(直接存计量标识/使用状态/校准状态的字典value)", dataType = "String")
     @TableField("identify_type")
     private String identifyType;
 
-    @ApiModelProperty(value = "标志类型(字典value)", dataType = "String")
-    @TableField(exist = false)
-    private String identifyTypeName;
-
     /**
      * 设备id(可以是受检设备/设备台账)
      */
     @NotNull(message = "设备id不能为空")
-    @ApiModelProperty(value = "设备id(可以是受检设备/设备台账)", dataType = "String")
+    @ApiModelProperty(value = "设备id(可以是受检设备/设备台账)", dataType = "Long")
     @TableField("device_id")
     private Long deviceId;
 
@@ -66,29 +72,32 @@
     @TableField("device_type")
     private String deviceType;
 
+    @ExcelProperty(value = "统一编号", order = 3)
     @NotEmpty(message = "设备编号不能为空")
-    @ApiModelProperty(value = "设备编号", dataType = "String")
+    @ApiModelProperty(value = "统一编号", dataType = "String")
     @TableField("device_no")
     private String deviceNo;
 
     /**
      * 设备名字
      */
-    @NotEmpty(message = "设备名字不能为空")
-    @ApiModelProperty(value = "设备名字", dataType = "String")
+    @ExcelProperty(value = "设备名称", order = 4)
+    @NotEmpty(message = "设备名称不能为空")
+    @ApiModelProperty(value = "设备名称", dataType = "String")
     @TableField("device_name")
     private String deviceName;
 
     /**
      * 检定员id
      */
-    @ApiModelProperty(value = "检定员id", dataType = "String")
+    @ApiModelProperty(value = "检定员id", dataType = "Long")
     @TableField("measure_person_id")
     private Long measurePersonId;
 
     /**
      * 检定员名字
      */
+    @ExcelProperty(value = "检定员", order = 5)
     @ApiModelProperty(value = "检定员名字", dataType = "String")
     @TableField("measure_person")
     private String measurePerson;
@@ -103,7 +112,8 @@
     /**
      * 更新时间
      */
-    @ApiModelProperty(value = "更新时间", dataType = "String")
+    @ExcelProperty(value = "打印时间", order = 6)
+    @ApiModelProperty(value = "打印时间", dataType = "String")
     @TableField("update_time")
     private String updateTime;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceAssess.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceAssess.java
index 659d9ca..6720b90 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceAssess.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceAssess.java
@@ -1,11 +1,26 @@
 package com.casic.missiles.model.business;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 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 com.casic.missiles.dto.BaseRequest;
+import com.casic.missiles.dto.business.outsource.OrderSampleDTO;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import javax.validation.constraints.NotEmpty;
 import java.io.Serializable;
+import java.util.List;
 
 /**
  * <p>
@@ -15,146 +30,231 @@
  * @author wangpeng
  * @since 2023-08-16
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
+@ApiModel
 @Data
 @TableName("biz_business_outsource_assess")
-public class BizBusinessOutsourceAssess implements Serializable {
+public class BizBusinessOutsourceAssess extends BaseRequest implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
+    @ApiModelProperty(value = "id，更新/删除使用参数", dataType = "Long")
     @TableId("id")
     private Long id;
 
     /**
      * 评审表编号
      */
+    @ExcelProperty(value = "评审表编号", order = 1)
+    @ApiModelProperty(value = "评审表编号(后台生成)", dataType = "String")
     @TableField("project_no")
     private String projectNo;
 
     /**
      * 评审表名称
      */
+    @ExcelProperty(value = "评审表名称", order = 2)
+    @ApiModelProperty(value = "评审表名称", dataType = "String")
     @TableField("project_name")
     private String projectName;
 
+    @NotEmpty(message = "实验室代码不能为空")
+    @DictCodeField(message = "实验室代码描述不合法", cacheName = MeterDictCode.LAB_CODE)
+    @ApiModelProperty(value = "实验室代码(字典code)", dataType = "String")
+    @TableField("lab_code")
+    private String labCode;
+
+    @ApiModelProperty(value = "实验室代码(字典value)", dataType = "String")
+    @TableField(exist = false)
+    private String labCodeName;
+
+    /**
+     * 组别代码
+     */
+    @NotEmpty(message = "组别代码不能为空")
+    @DictCodeField(message = "组别代码描述不合法", cacheName = MeterDictCode.GROUP_CODE)
+    @ApiModelProperty(value = "组别代码(字典code)", dataType = "String")
+    @TableField("group_code")
+    private String groupCode;
+
+    @ApiModelProperty(value = "组别代码(字典value)", dataType = "String")
+    @TableField(exist = false)
+    private String groupCodeName;
+
     /**
      * 申请人id
      */
+    @ApiModelProperty(value = "申请人id", dataType = "String")
     @TableField("applicant_id")
     private Long applicantId;
 
     /**
      * 申请人名字
      */
+    @ExcelProperty(value = "申请人", order = 5)
+    @ApiModelProperty(value = "申请人", dataType = "String")
     @TableField("applicant_name")
     private String applicantName;
 
     /**
      * 申请时间
      */
+    @ExcelProperty(value = "申请时间", order = 6)
+    @ApiModelProperty(value = "申请时间", dataType = "String")
     @TableField("applicant_time")
     private String applicantTime;
 
     /**
      * 附件(minio存储文件名)
      */
+    @ApiModelProperty(value = "附件(minio存储文件名)", dataType = "String")
     @TableField("minio_file_name")
     private String minioFileName;
 
     /**
      * 备注
      */
+    @ApiModelProperty(value = "备注", dataType = "String")
     @TableField("remark")
     private String remark;
 
     /**
      * 创建人id
      */
+    @ApiModelProperty(value = "创建人id", dataType = "String")
     @TableField("create_user_id")
     private Long createUserId;
 
     /**
      * 创建人名字
      */
+    @ApiModelProperty(value = "创建人名字", dataType = "String")
     @TableField("create_user_name")
     private String createUserName;
 
     /**
      * 分包方id
      */
+    @ApiModelProperty(value = "评审表编号", dataType = "String")
     @TableField("outsourcer_id")
     private Long outsourcerId;
 
     /**
      * 预计开始时间
      */
+    @ApiModelProperty(value = "预计开始时间", dataType = "String")
     @TableField("pre_start_time")
     private String preStartTime;
 
     /**
      * 预计结束时间
      */
+    @ApiModelProperty(value = "预计结束时间", dataType = "String")
     @TableField("pre_end_time")
     private String preEndTime;
 
     /**
      * 分包原因-字典
      */
+    @ApiModelProperty(value = "分包原因(字典code)", dataType = "String")
+    @DictCodeField(message = "分包原因描述不合法", cacheName = MeterDictCode.OUTSOURCE_REASON)
     @TableField("outsource_reason")
     private String outsourceReason;
 
+    @ApiModelProperty(value = "分包原因(字典value)", dataType = "String")
+    @TableField(exist = false)
+    private String outsourceReasonName;
+
     /**
      * 预计费用
      */
+    @ApiModelProperty(value = "预计费用", dataType = "String")
     @TableField("pre_cost")
     private String preCost;
 
     /**
      * 审批状态
      */
+    @ApiModelProperty(value = "审批状态", dataType = "String")
+    @DictCodeField(message = "审批状态描述不合法", cacheName = MeterDictCode.APPROVAL_STATUS)
     @TableField("approval_status")
     private String approvalStatus;
 
     /**
      * 流程实例id
      */
+    @ApiModelProperty(value = "流程实例id", dataType = "String")
     @TableField("process_id")
     private String processId;
 
     /**
      * 实验室认可情况
      */
+    @ApiModelProperty(value = "实验室认可情况", dataType = "String")
     @TableField("approve_situation")
     private String approveSituation;
 
     /**
      * 溯源性
      */
+    @ApiModelProperty(value = "溯源性", dataType = "String")
     @TableField("traceability")
     private String traceability;
 
     /**
      * 测试方法
      */
+    @ApiModelProperty(value = "测试方法", dataType = "String")
     @TableField("test_method")
     private String testMethod;
 
     /**
      * 技术能力
      */
+    @ApiModelProperty(value = "技术能力", dataType = "String")
     @TableField("technique_ability")
     private String techniqueAbility;
 
     /**
      * 创建时间
      */
+    @ApiModelProperty(hidden = true)
     @TableField("create_time")
     private String createTime;
 
     /**
      * 更新时间
      */
+    @ApiModelProperty(hidden = true)
     @TableField("update_time")
     private String updateTime;
 
+    @ApiModelProperty(value = "审批状态类型-字典value", dataType = "String")
+    @TableField(exist = false)
+    private String approvalStatusName;
 
+    @ApiModelProperty(value = "任务id（同意、驳回等操作使用）", dataType = "String")
+    @TableField(exist = false)
+    private String taskId;
+
+    @ApiModelProperty(value = "可选决策项（1同意驳回拒绝 2同意驳回 3同意拒绝，用于待审批列表同意/驳回/拒绝按钮展示）", dataType = "Integer")
+    @TableField(exist = false)
+    private Integer decisionItem;
+
+    @NotEmpty(message = "受检设备信息不能为空")
+    @ApiModelProperty(value = "受检设备id列表（新建使用参数）", dataType = "List")
+    @TableField(exist = false)
+    private List<OrderSampleDTO> orderSampleList;
+
+    @ExcelProperty(value = "分包机构名称", order = 3)
+    @ApiModelProperty(value = "分包机构名称（列表返回参数）", dataType = "String")
+    private String outsourcerName;
+
+    @ExcelProperty(value = "机构负责人", order = 4)
+    @ApiModelProperty(value = "机构负责人（列表返回参数）", dataType = "String")
+    private String director;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceProtocol.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceProtocol.java
new file mode 100644
index 0000000..38df697
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceProtocol.java
@@ -0,0 +1,225 @@
+package com.casic.missiles.model.business;
+
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
+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 com.casic.missiles.dto.BaseRequest;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotEmpty;
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 计量检定业务-分包管理-测试、校准或检定工作分包协议书
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-08-24
+ */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
+@Data
+@TableName("biz_business_outsource_protocol")
+public class BizBusinessOutsourceProtocol extends BaseRequest implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "id，更新/删除使用参数", dataType = "Long")
+    @TableId("id")
+    private Long id;
+
+    /**
+     * 协议书编号
+     */
+    @ExcelProperty(value = "协议书编号", order = 1)
+    @ApiModelProperty(value = "协议书编号(后台生成)", dataType = "String")
+    @TableField("protocol_no")
+    private String protocolNo;
+
+    /**
+     * 协议书名称
+     */
+    @ExcelProperty(value = "协议书名称", order = 2)
+    @ApiModelProperty(value = "协议书名称", dataType = "String")
+    @TableField("project_name")
+    private String projectName;
+
+    @NotEmpty(message = "实验室代码不能为空")
+    @DictCodeField(message = "实验室代码描述不合法", cacheName = MeterDictCode.LAB_CODE)
+    @ApiModelProperty(value = "实验室代码(字典code)", dataType = "String")
+    @TableField("lab_code")
+    private String labCode;
+
+    @ApiModelProperty(value = "实验室代码(字典value)", dataType = "String")
+    @TableField(exist = false)
+    private String labCodeName;
+
+    @NotEmpty(message = "组别代码不能为空")
+    @DictCodeField(message = "组别代码描述不合法", cacheName = MeterDictCode.GROUP_CODE)
+    @ApiModelProperty(value = "组别代码(字典code)", dataType = "String")
+    @TableField("group_code")
+    private String groupCode;
+
+    @ApiModelProperty(value = "组别代码(字典value)", dataType = "String")
+    @TableField(exist = false)
+    private String groupCodeName;
+
+    /**
+     * 分包方id
+     */
+    @ApiModelProperty(value = "分包方id", dataType = "Long")
+    @TableField("outsourcer_id")
+    private Long outsourcerId;
+
+    /**
+     * 其他
+     */
+    @ApiModelProperty(value = "其他", dataType = "String")
+    @TableField("remark")
+    private String remark;
+
+    /**
+     * 分包方编号
+     */
+    @ApiModelProperty(value = "分包方编号(新建不用传)", dataType = "String")
+    @TableField("outsource_no")
+    private String outsourceNo;
+
+    /**
+     * 分包方名称
+     */
+    @ExcelProperty(value = "分包方名称", order = 3)
+    @ApiModelProperty(value = "分包方名称(新建不用传)", dataType = "String")
+    @TableField("outsource_name")
+    private String outsourceName;
+
+    /**
+     * 联系人
+     */
+    @ExcelProperty(value = "联系人", order = 4)
+    @ApiModelProperty(value = "联系人", dataType = "String")
+    @TableField("contacts")
+    private String contacts;
+
+    /**
+     * 电话
+     */
+    @ApiModelProperty(value = "电话", dataType = "String")
+    @TableField("mobile")
+    private String mobile;
+
+    /**
+     * 地址
+     */
+    @ApiModelProperty(value = "地址", dataType = "String")
+    @TableField("address")
+    private String address;
+
+    /**
+     * 要求完成日期
+     */
+    @ApiModelProperty(value = "要求完成日期", dataType = "String")
+    @TableField("require_date")
+    private String requireDate;
+
+    /**
+     * 分包费用(元)
+     */
+    @ApiModelProperty(value = "分包费用(元)", dataType = "String")
+    @TableField("outsource_cost")
+    private Double outsourceCost;
+
+    /**
+     * 分包方负责人
+     */
+    @ApiModelProperty(value = "分包方负责人", dataType = "String")
+    @TableField("director")
+    private String director;
+
+    /**
+     * 分包项目
+     */
+    @ApiModelProperty(value = "分包项目", dataType = "String")
+    @TableField("item")
+    private String item;
+
+    /**
+     * 分包要求
+     */
+    @ApiModelProperty(value = "分包要求", dataType = "String")
+    @TableField("requires")
+    private String requires;
+
+    /**
+     * 创建人id
+     */
+    @ApiModelProperty(hidden = true)
+    @TableField("create_user_id")
+    private Long createUserId;
+
+    /**
+     * 创建人名字
+     */
+    @ExcelProperty(value = "申请人", order = 5)
+    @ApiModelProperty(value = "申请人", dataType = "String")
+    @TableField("create_user_name")
+    private String createUserName;
+
+    /**
+     * 审批状态
+     */
+    @ApiModelProperty(value = "审批状态", dataType = "String")
+    @DictCodeField(message = "审批状态描述不合法", cacheName = MeterDictCode.APPROVAL_STATUS)
+    @TableField("approval_status")
+    private String approvalStatus;
+
+    /**
+     * 流程实例id
+     */
+    @ApiModelProperty(value = "流程实例id", dataType = "String")
+    @TableField("process_id")
+    private String processId;
+
+    /**
+     * 创建时间
+     */
+    @ExcelProperty(value = "申请时间", order = 6)
+    @ApiModelProperty(value = "申请时间", dataType = "String")
+    @TableField("create_time")
+    private String createTime;
+
+    /**
+     * 更新时间
+     */
+    @ApiModelProperty(hidden = true)
+    @TableField("update_time")
+    private String updateTime;
+
+    @ApiModelProperty(value = "审批状态类型-字典value", dataType = "String")
+    @TableField(exist = false)
+    private String approvalStatusName;
+
+    @ApiModelProperty(value = "任务id（同意、驳回等操作使用）", dataType = "String")
+    @TableField(exist = false)
+    private String taskId;
+
+    @ApiModelProperty(value = "可选决策项（1同意驳回拒绝 2同意驳回 3同意拒绝，用于待审批列表同意/驳回/拒绝按钮展示）", dataType = "Integer")
+    @TableField(exist = false)
+    private Integer decisionItem;
+
+
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourcerInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourcerInfo.java
index ec4e997..f9aa69e 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourcerInfo.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourcerInfo.java
@@ -17,6 +17,7 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import javax.validation.constraints.NotEmpty;
 import java.io.Serializable;
 
 /**
@@ -59,6 +60,29 @@
     @TableField("outsourcer_name")
     private String outsourcerName;
 
+    @NotEmpty(message = "实验室代码不能为空")
+    @DictCodeField(message = "实验室代码描述不合法", cacheName = MeterDictCode.LAB_CODE)
+    @ApiModelProperty(value = "实验室代码(字典code)", dataType = "String")
+    @TableField("lab_code")
+    private String labCode;
+
+    @ApiModelProperty(value = "实验室代码(字典value)", dataType = "String")
+    @TableField(exist = false)
+    private String labCodeName;
+
+    /**
+     * 组别代码
+     */
+    @NotEmpty(message = "组别代码不能为空")
+    @DictCodeField(message = "组别代码描述不合法", cacheName = MeterDictCode.GROUP_CODE)
+    @ApiModelProperty(value = "组别代码(字典code)", dataType = "String")
+    @TableField("group_code")
+    private String groupCode;
+
+    @ApiModelProperty(value = "组别代码(字典value)", dataType = "String")
+    @TableField(exist = false)
+    private String groupCodeName;
+
     /**
      * 单位简称
      */
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardInfo.java
index c48eed7..dffdfdd 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardInfo.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardInfo.java
@@ -5,6 +5,7 @@
 import com.baomidou.mybatisplus.annotation.TableName;
 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;
 
@@ -18,6 +19,7 @@
  * @author wangpeng
  * @since 2023-08-04
  */
+@ApiModel
 @Data
 @TableName("biz_equipment_standard_info")
 public class BizEquipmentStandardInfo implements Serializable {
@@ -119,7 +121,7 @@
      * 管理状态(字典code)
      */
     @ApiModelProperty(value = "管理状态(字典code)", dataType = "String")
-    @DictCodeField(message = "管理状态不合法", cacheName = MeterDictCode.MANAGER_STATE)
+    @DictCodeField(message = "管理状态不合法", cacheName = MeterDictCode.STANDARD_MANAGER_STATE)
     @TableField("manage_status")
     private String manageStatus;
 
@@ -151,7 +153,7 @@
     /**
      * 温度(℃)
      */
-    @ApiModelProperty(value = "使用状态(字典code)", dataType = "String")
+    @ApiModelProperty(value = "温度(℃)", dataType = "String")
     @TableField("temperature")
     private Double temperature;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardInfoApproval.java b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardInfoApproval.java
index dbd86ab..9f58d83 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardInfoApproval.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardInfoApproval.java
@@ -150,7 +150,7 @@
      * 管理状态(字典code)
      */
     @ApiModelProperty(value = "管理状态(字典code)", dataType = "String")
-    @DictCodeField(message = "管理状态不合法", cacheName = MeterDictCode.MANAGER_STATE)
+    @DictCodeField(message = "管理状态不合法", cacheName = MeterDictCode.STANDARD_MANAGER_STATE)
     @TableField("manage_status")
     private String manageStatus;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardTechnologyRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardTechnologyRelation.java
index 0e612bd..751f26b 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardTechnologyRelation.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardTechnologyRelation.java
@@ -3,6 +3,7 @@
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -16,6 +17,7 @@
  * @author wangpeng
  * @since 2023-08-04
  */
+@ApiModel
 @Data
 @TableName("biz_equipment_standard_technology_relation")
 public class BizEquipmentStandardTechnologyRelation implements Serializable {
@@ -33,6 +35,10 @@
     @TableField("technology_file_id")
     private Long technologyFileId;
 
+    @ApiModelProperty(value = "依据的技术文件编号", dataType = "String")
+    @TableField("technology_file_no")
+    private String technologyFileNo;
+
     /**
      * 依据的技术文件名称(技术文件中现行测试校准检定方法表文件名字段)
      */
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerInfo.java
index d6e8bed..65cd6bc 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerInfo.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerInfo.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.model.resource;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -21,6 +28,11 @@
  * @author wangpeng
  * @since 2023-08-08
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @ApiModel
 @Data
 @TableName("biz_resource_customer_info")
@@ -35,6 +47,7 @@
     /**
      * 委托方编号
      */
+    @ExcelProperty(value = "委托方编号", order = 1)
     @ApiModelProperty(value = "委托方编号", dataType = "String")
     @TableField("customer_no")
     private String customerNo;
@@ -42,6 +55,7 @@
     /**
      * 委托方名称
      */
+    @ExcelProperty(value = "委托方名称", order = 2)
     @ApiModelProperty(value = "委托方名称(新建时为下拉选择一个受检单位组织的名字，传deptId字段，后端获取名称)", dataType = "String")
     @TableField("customer_name")
     private String customerName;
@@ -63,6 +77,7 @@
     /**
      * 联系人
      */
+    @ExcelProperty(value = "联系人", order = 3)
     @ApiModelProperty(value = "联系人", dataType = "String")
     @TableField("contacts")
     private String contacts;
@@ -70,6 +85,7 @@
     /**
      * 座机电话
      */
+    @ExcelProperty(value = "座机电话", order = 4)
     @ApiModelProperty(value = "座机电话", dataType = "String")
     @TableField("mobile")
     private String mobile;
@@ -77,6 +93,7 @@
     /**
      * 手机号码
      */
+    @ExcelProperty(value = "手机号码", order = 5)
     @ApiModelProperty(value = "手机号码", dataType = "String")
     @TableField("phone")
     private String phone;
@@ -91,6 +108,7 @@
     /**
      * 地址
      */
+    @ExcelProperty(value = "地址", order = 6)
     @ApiModelProperty(value = "地址", dataType = "String")
     @TableField("address")
     private String address;
@@ -141,6 +159,7 @@
     /**
      * 创建时间
      */
+    @ExcelProperty(value = "创建时间", order = 7)
     @ApiModelProperty(value = "创建时间", dataType = "String")
     @TableField("create_time")
     private String createTime;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerSuggestForm.java b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerSuggestForm.java
index 7201bbd..701bf8b 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerSuggestForm.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerSuggestForm.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.model.resource;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -22,6 +29,11 @@
  * @author wangpeng
  * @since 2023-08-08
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @ApiModel
 @Data
 @TableName("biz_resource_customer_suggest_form")
@@ -44,7 +56,8 @@
     /**
      * 委托方名称
      */
-    @ApiModelProperty(value = "委托方名称", dataType = "String")
+    @ExcelProperty(value = "意见反馈单位", order = 2)
+    @ApiModelProperty(value = "意见反馈单位", dataType = "String")
     @TableField("customer_name")
     private String customerName;
 
@@ -59,7 +72,8 @@
     /**
      * 委托方意见反馈部门名称
      */
-    @ApiModelProperty(value = "委托方意见反馈部门名称", dataType = "String")
+    @ExcelProperty(value = "委托方意见反馈部门", order = 3)
+    @ApiModelProperty(value = "委托方意见反馈部门", dataType = "String")
     @TableField("customer_dept_name")
     private String customerDeptName;
 
@@ -73,6 +87,7 @@
     /**
      * 表单编号
      */
+    @ExcelProperty(value = "表单编号", order = 1)
     @ApiModelProperty(value = "表单编号", dataType = "String")
     @TableField("form_no")
     private String formNo;
@@ -111,6 +126,7 @@
     /**
      * 创建人名字
      */
+    @ExcelProperty(value = "创建人", order = 4)
     @ApiModelProperty(value = "创建人名字", dataType = "String")
     @TableField("create_user_name")
     private String createUserName;
@@ -147,6 +163,7 @@
     /**
      * 创建时间
      */
+    @ExcelProperty(value = "创建时间", order = 5)
     @ApiModelProperty(value = "创建时间", dataType = "String")
     @TableField("create_time")
     private String createTime;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSealInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSealInfo.java
index cbf05d7..9bf389d 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSealInfo.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSealInfo.java
@@ -106,6 +106,10 @@
     @TableField("minio_file_name")
     private String minioFileName;
 
+    @ApiModelProperty(value = "minio存储文件url", dataType = "String")
+    @TableField(exist = false)
+    private String minioFileUrl;
+
     @ApiModelProperty(value = "创建时间", dataType = "String")
     @TableField("create_time")
     private String createTime;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSealUseNote.java b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSealUseNote.java
index 3f2d9e8..3ce16a8 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSealUseNote.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSealUseNote.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.model.resource;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -20,6 +27,11 @@
  * @author wangpeng
  * @since 2023-07-28
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @ApiModel
 @Data
 @TableName("biz_resource_seal_use_note")
@@ -34,6 +46,7 @@
     /**
      * 登记表编号
      */
+    @ExcelProperty(value = "申请单编号", order = 1)
     @ApiModelProperty(value = "登记表编号(自动生成)", dataType = "String")
     @TableField("note_form_no")
     private String noteFormNo;
@@ -55,6 +68,7 @@
     /**
      * 申请部门
      */
+    @ExcelProperty(value = "申请部门", order = 5)
     @ApiModelProperty(value = "申请部门", dataType = "String")
     @TableField("apply_dept_name")
     private String applyDeptName;
@@ -69,6 +83,7 @@
     /**
      * 申请人
      */
+    @ExcelProperty(value = "申请人", order = 6)
     @ApiModelProperty(value = "申请人", dataType = "String")
     @TableField("apply_user_name")
     private String applyUserName;
@@ -76,6 +91,7 @@
     /**
      * 申请时间
      */
+    @ExcelProperty(value = "申请时间", order = 7)
     @ApiModelProperty(value = "申请时间(新增自动获取当前时间)", dataType = "String")
     @TableField("apply_time")
     private String applyTime;
@@ -130,6 +146,26 @@
     @TableField("update_time")
     private String updateTime;
 
+    @ExcelProperty(value = "印章名称", order = 2)
+    @ApiModelProperty(value = "印章名称(列表返回参数)", dataType = "String")
+    @TableField(exist = false)
+    private String sealName;
+
+    @DictCodeField(message = "印章类型描述不合法", cacheName = MeterDictCode.SEAL_TYPE)
+    @ApiModelProperty(hidden = true)
+    @TableField(exist = false)
+    private String sealType;
+
+    @ExcelProperty(value = "印章类型", order = 3)
+    @ApiModelProperty(value = "印章类型(列表返回参数)", dataType = "String")
+    @TableField(exist = false)
+    private String sealTypeName;
+
+    @ExcelProperty(value = "批准人", order = 4)
+    @ApiModelProperty(value = "批准人(列表返回参数)", dataType = "String")
+    @TableField(exist = false)
+    private String approverName;
+
     @ApiModelProperty(value = "审批状态类型-字典value", dataType = "String")
     @TableField(exist = false)
     private String approvalStatusName;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceStaffInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceStaffInfo.java
index 5ef995b..41563a1 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceStaffInfo.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceStaffInfo.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.model.resource;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -20,6 +27,11 @@
  * @author wangpeng
  * @since 2023-07-25
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @ApiModel
 @Data
 @TableName("biz_resource_staff_info")
@@ -38,6 +50,7 @@
     /**
      * 人员编号
      */
+    @ExcelProperty(value = "人员编号",order = 0)
     @NotEmpty(message = "人员编号不能为空")
     @ApiModelProperty(value = "人员编号", dataType = "String")
     @TableField("staff_no")
@@ -46,6 +59,7 @@
     /**
      * 姓名
      */
+    @ExcelProperty(value = "姓名",order = 1)
     @ApiModelProperty(value = "姓名", dataType = "String")
     @TableField("staff_name")
     private String staffName;
@@ -152,13 +166,15 @@
     /**
      * 部门名字
      */
-    @ApiModelProperty(value = "部门名字", dataType = "String")
+    @ExcelProperty(value = "工作部门",order = 4)
+    @ApiModelProperty(value = "工作部门", dataType = "String")
     @TableField("dept_name")
     private String deptName;
 
     /**
      * 岗位
      */
+    @ExcelProperty(value = "岗位",order = 2)
     @ApiModelProperty(value = "岗位", dataType = "String")
     @TableField("station")
     private String station;
@@ -166,6 +182,7 @@
     /**
      * 计量专业
      */
+    @ExcelProperty(value = "计量专业",order = 5)
     @ApiModelProperty(value = "计量专业", dataType = "String")
     @TableField("major")
     private String major;
@@ -173,6 +190,7 @@
     /**
      * 证号
      */
+    @ExcelProperty(value = "证号",order = 3)
     @ApiModelProperty(value = "证号", dataType = "String")
     @TableField("certificate_number")
     private String certificateNumber;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSupplierInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSupplierInfo.java
index eb5ef01..a1e2697 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSupplierInfo.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSupplierInfo.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.model.resource;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -20,6 +27,11 @@
  * @author wangpeng
  * @since 2023-07-27
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @ApiModel
 @Data
 @TableName("biz_resource_supplier_info")
@@ -34,6 +46,7 @@
     /**
      * 供方编号
      */
+    @ExcelProperty(value = "供方编号", order = 1)
     @ApiModelProperty(value = "供方编号(自动生成)", dataType = "String")
     @TableField("supplier_no")
     private String supplierNo;
@@ -41,6 +54,7 @@
     /**
      * 供方名称
      */
+    @ExcelProperty(value = "供方名称", order = 2)
     @ApiModelProperty(value = "供方名称", dataType = "String")
     @TableField("supplier_name")
     private String supplierName;
@@ -60,6 +74,7 @@
     @TableField("supplier_type")
     private String supplierType;
 
+    @ExcelProperty(value = "供方类型", order = 3)
     @ApiModelProperty(value = "供方类型(字典value)", dataType = "String")
     @TableField(exist = false)
     private String supplierTypeName;
@@ -109,7 +124,8 @@
     /**
      * 电话
      */
-    @ApiModelProperty(value = "电话", dataType = "String")
+    @ExcelProperty(value = "联系电话", order = 4)
+    @ApiModelProperty(value = "联系电话", dataType = "String")
     @TableField("phone")
     private String phone;
 
@@ -158,6 +174,7 @@
     /**
      * 公司地址-省
      */
+    @ExcelProperty(value = "地址-省", order = 6)
     @ApiModelProperty(value = "公司地址-省", dataType = "String")
     @TableField("company_province_name")
     private String companyProvinceName;
@@ -172,6 +189,7 @@
     /**
      * 公司地址-市
      */
+    @ExcelProperty(value = "地址-市", order = 7)
     @ApiModelProperty(value = "公司地址-市", dataType = "String")
     @TableField("company_city_name")
     private String companyCityName;
@@ -186,6 +204,7 @@
     /**
      * 公司地址-区
      */
+    @ExcelProperty(value = "地址-区", order = 8)
     @ApiModelProperty(value = "公司地址-区", dataType = "String")
     @TableField("company_area_name")
     private String companyAreaName;
@@ -193,6 +212,7 @@
     /**
      * 公司地址-详细地址
      */
+    @ExcelProperty(value = "地址-详细地址", order = 9)
     @ApiModelProperty(value = "公司地址-详细地址", dataType = "String")
     @TableField("company_address")
     private String companyAddress;
@@ -200,6 +220,7 @@
     /**
      * 服务和供应的内容
      */
+    @ExcelProperty(value = "服务和供应的内容", order = 5)
     @ApiModelProperty(value = "服务和供应的内容", dataType = "String")
     @TableField("supplier_content")
     private String supplierContent;
@@ -250,6 +271,7 @@
     /**
      * 创建时间
      */
+    @ExcelProperty(value = "创建时间", order = 9)
     @ApiModelProperty(value = "创建时间", dataType = "String")
     @TableField("create_time")
     private String createTime;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/EnvLocationInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/EnvLocationInfo.java
new file mode 100644
index 0000000..d8e2d7b
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/EnvLocationInfo.java
@@ -0,0 +1,83 @@
+package com.casic.missiles.model.resource;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotEmpty;
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 实验室环境监控系统-设备表
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-06-07
+ */
+@ApiModel
+@Data
+@TableName("env_location_info")
+public class EnvLocationInfo implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "主键id", dataType = "Long")
+    @TableId("id")
+    private Long id;
+
+    /**
+     * 地点编号
+     */
+    @NotEmpty(message = "地点编号不能为空")
+    @ApiModelProperty(value = "地点编号", dataType = "String")
+    @TableField("location_no")
+    private String locationNo;
+
+    /**
+     * 地点名称
+     */
+    @ApiModelProperty(value = "地点名称", dataType = "String")
+    @TableField("location_name")
+    private String locationName;
+
+    /**
+     * 地点位置
+     */
+    @ApiModelProperty(value = "地点位置", dataType = "String")
+    @TableField("location_position")
+    private String locationPosition;
+
+    /**
+     * 创建人id
+     */
+    @ApiModelProperty(value = "创建人id", dataType = "Long")
+    @TableField("create_user_id")
+    private Long createUserId;
+
+    /**
+     * 创建人
+     */
+    @ApiModelProperty(value = "创建人", dataType = "String")
+    @TableField("create_user")
+    private String createUser;
+
+    /**
+     * 创建时间
+     */
+    @ApiModelProperty(value = "创建时间", dataType = "String")
+    @TableField("create_time")
+    private String createTime;
+
+    /**
+     * 更新时间
+     */
+    @ApiModelProperty(value = "更新时间", dataType = "String")
+    @TableField("update_time")
+    private String updateTime;
+
+
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemFileConfig.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemFileConfig.java
index 19e6845..86e569c 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemFileConfig.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemFileConfig.java
@@ -30,7 +30,7 @@
     @ApiModelProperty(value = "系统类别(1业务系统2受检系统3环境系统)", dataType = "Integer")
     @NotNull(message = "系统类别不能为空")
     @TableField("system_type")
-    private Integer systemType;
+    private Integer systemType = 1;
 
     @ApiModelProperty("下载编号")
     @TableField("download_no")
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemNotice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemNotice.java
index e94297d..06ec37d 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemNotice.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemNotice.java
@@ -34,7 +34,7 @@
     @ApiModelProperty(value = "系统类别(1业务系统2受检系统3环境系统)", dataType = "Integer")
     @NotNull(message = "系统类别不能为空")
     @TableField("system_type")
-    private Integer systemType;
+    private Integer systemType = 1;
 
     /**
      * 通知公告编号
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSign.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSign.java
index 6c0d7c9..954f4f8 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSign.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSign.java
@@ -51,7 +51,7 @@
     @ApiModelProperty(value = "系统类别(1业务系统2受检系统3环境系统)", dataType = "Integer")
     @NotNull(message = "系统类别不能为空")
     @TableField("system_type")
-    private Integer systemType;
+    private Integer systemType = 1;
 
     /**
      * 签名编号
@@ -130,4 +130,8 @@
     @TableField(exist = false)
     private List<Long> userIdList;
 
+    @ApiModelProperty(hidden = true)
+    @TableField(exist = false)
+    private String deptName;
+
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemTemplate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemTemplate.java
index 503a457..1d27ebe 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemTemplate.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemTemplate.java
@@ -47,7 +47,7 @@
     @ApiModelProperty(value = "系统类别(1业务系统2受检系统3环境系统)", dataType = "Integer")
     @NotNull(message = "系统类别不能为空")
     @TableField("system_type")
-    private Integer systemType;
+    private Integer systemType = 1;
 
     /**
      * 模板编号
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java
index 8c21cb0..f61e4a8 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java
@@ -32,4 +32,8 @@
     ReturnDTO approvalDelete(ApprovalDeleteRequest request);
 
     ReturnDTO failUpdate(T request);
+
+    List<O> listExport(R request);
+
+    List<O> listExportByIds(List<Long> ids);
 }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java
index 724166f..9bce15b 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java
@@ -157,6 +157,29 @@
         throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
     }
 
+    @Override
+    public List<O> listExport(R request) {
+        request.setCreateUserId(null);
+        request.setApprovalStatus(ApprovalStatusEnum.PASSED);
+        Page<O> page = PageFactory.defaultPage();
+        page.setCurrent(1);
+        page.setSearchCount(false);
+        page.setSize(Integer.MAX_VALUE);
+        Page<O> resultPage = this.baseMapper.selectBatchForApprovalList(page, request, null);
+        return resultPage.getRecords();
+    }
+
+    @Override
+    public List<O> listExportByIds(List<Long> ids) {
+        Page<O> page = PageFactory.defaultPage();
+        page.setCurrent(1);
+        page.setSearchCount(false);
+        page.setSize(Integer.MAX_VALUE);
+        List<String> businessKeys = ids.stream().map(String::valueOf).collect(Collectors.toList());
+        Page<O> resultPage = this.baseMapper.selectBatchForApprovalList(page, null, businessKeys);
+        return resultPage.getRecords();
+    }
+
     protected ReturnDTO updateApprovalStatus(Long id, String processId, String approvalStatus) {
         UpdateWrapper<T> updateWrapper = new UpdateWrapper<>();
         updateWrapper.eq("id", id);
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificatePrintServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificatePrintServiceImpl.java
index f6e4706..3228497 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificatePrintServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificatePrintServiceImpl.java
@@ -162,6 +162,30 @@
         return ReturnUtil.success(printLogMapper.selectList(wrapper));
     }
 
+    @Override
+    public List<CertificatePrintListResponse> listByIds(List<Long> ids) {
+        Page<CertificatePrintListResponse> page = PageFactory.defaultPage();
+        page.setCurrent(1);
+        page.setSearchCount(false);
+        page.setSize(Integer.MAX_VALUE);
+        List<String> businessKeys = ids.stream().map(String::valueOf).collect(Collectors.toList());
+        Page<CertificatePrintListResponse> resultPage = this.baseMapper.selectBatchForApprovalList(page, null, businessKeys);
+        return resultPage.getRecords();
+    }
+
+    @Override
+    public List<CertificatePrintListResponse> list(CertificatePrintApprovalListRequest request) {
+        request.setCreateUserId(null);
+        request.setApprovalStatus(null);
+        request.setPrintStatus(null);
+        Page<CertificatePrintListResponse> page = PageFactory.defaultPage();
+        page.setCurrent(1);
+        page.setSearchCount(false);
+        page.setSize(Integer.MAX_VALUE);
+        Page<CertificatePrintListResponse> resultPage = certificatePrintMapper.selectBatchForApprovalList(page, request, null);
+        return resultPage.getRecords();
+    }
+
     private void savePrintLog(Long id) {
         BizBusinessCertificatePrintLog printLog = new BizBusinessCertificatePrintLog();
         BizBusinessCertificatePrint certificatePrint = certificatePrintMapper.selectById(id);
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificateReportServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificateReportServiceImpl.java
index 457555f..24146be 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificateReportServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificateReportServiceImpl.java
@@ -158,8 +158,8 @@
         QueryWrapper<BizBusinessCertificateMeasureResultData> mWrapper = new QueryWrapper<>();
         mWrapper.eq("report_id", reportId);
         boolean mRemove = certificateMeasureResultDataService.remove(mWrapper);
-        Assert.isFalse(eRemove || mRemove, () -> {
+        if(!eRemove || !mRemove){
             throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
-        });
+        }
     }
 }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessIdentifyInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessIdentifyInfoServiceImpl.java
index 4c8e190..f7e63ca 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessIdentifyInfoServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessIdentifyInfoServiceImpl.java
@@ -1,8 +1,10 @@
 package com.casic.missiles.service.Impl.business;
 
+import cn.hutool.core.date.DateUtil;
 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.core.page.PageFactory;
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.business.identify.IdentifyListRequest;
@@ -14,11 +16,14 @@
 import com.casic.missiles.service.business.IBizBusinessIdentifyInfoService;
 import com.casic.missiles.utils.DictCodeUtils;
 import com.casic.missiles.utils.NumberGeneratorUtil;
+import com.casic.missiles.utils.QRCodeUtil;
 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.List;
+
 /**
  * <p>
  * 计量检定业务-任务计量管理-标识打印 服务实现类
@@ -35,9 +40,9 @@
     @Override
     public Page<BizBusinessIdentifyInfo> identifyListPage(Page<BizBusinessIdentifyInfo> page, IdentifyListRequest request) throws Exception {
         QueryWrapper<BizBusinessIdentifyInfo> wrapper = new QueryWrapper<>();
-        wrapper.eq("identify_type", request.getIdentifyType());
-        wrapper.like("device_no", request.getDeviceNo());
-        wrapper.like("device_name", request.getDeviceName());
+        wrapper.eq(StringUtils.isNotEmpty(request.getIdentifyType()), "identify_type", request.getIdentifyType());
+        wrapper.like(StringUtils.isNotEmpty(request.getDeviceNo()),"device_no", request.getDeviceNo());
+        wrapper.like(StringUtils.isNotEmpty(request.getDeviceName()), "device_name", request.getDeviceName());
         wrapper.apply(StringUtils.isNotBlank(request.getCreateTimeStart()),
                 "{0} <= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getCreateTimeStart().split(" ")[0]);
         wrapper.apply(StringUtils.isNotBlank(request.getCreateTimeEnd()),
@@ -64,8 +69,11 @@
     }
 
     @Override
-    public ReturnDTO updateIdentify(BizBusinessIdentifyInfo identifyInfo) {
-        if(identifyInfoMapper.updateById(identifyInfo) > 0){
+    public ReturnDTO updateIdentify(Long id) {
+        BizBusinessIdentifyInfo info = new BizBusinessIdentifyInfo();
+        info.setId(id);
+        info.setUpdateTime(DateUtil.now());
+        if(identifyInfoMapper.updateById(info) > 0){
             return ReturnUtil.success();
         }
         throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
@@ -79,4 +87,20 @@
         throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
     }
 
+    @Override
+    public List<BizBusinessIdentifyInfo> list(IdentifyListRequest request) throws Exception {
+        Page<BizBusinessIdentifyInfo> page = PageFactory.defaultPage();
+        page.setCurrent(1);
+        page.setSearchCount(false);
+        page.setSize(Integer.MAX_VALUE);
+        Page<BizBusinessIdentifyInfo> resultPage = this.identifyListPage(page, request);
+        return resultPage.getRecords();
+    }
+
+    @Override
+    public ReturnDTO<String> equipmentQrCode(Long id) {
+        String base64QRCode = QRCodeUtil.getBase64QRCode(String.valueOf(id));
+        return ReturnUtil.success(base64QRCode);
+    }
+
 }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOrderInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOrderInfoServiceImpl.java
index 82952ad..d8d2c6a 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOrderInfoServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOrderInfoServiceImpl.java
@@ -35,6 +35,7 @@
 import javax.servlet.http.HttpServletResponse;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 import java.util.stream.Collectors;
 
 /**
@@ -209,13 +210,16 @@
     private QueryWrapper<OrderListResponse> listParamWrapperBuilder(OrderListRequest request) {
         QueryWrapper<OrderListResponse> wrapper = new QueryWrapper<>();
         wrapper.like(StringUtils.isNotBlank(request.getOrderNo()), "order_no", request.getOrderNo());
+        wrapper.like(Objects.nonNull(request.getCustomerId()), "customer_id", request.getCustomerId());
         wrapper.like(StringUtils.isNotBlank(request.getCustomerName()), "customer_name", request.getCustomerName());
         wrapper.like(StringUtils.isNotBlank(request.getDeliverer()), "deliverer", request.getDeliverer());
         wrapper.like(StringUtils.isNotBlank(request.getCreateUserName()), "create_user_name", request.getCreateUserName());
-        wrapper.apply(StringUtils.isNotBlank(request.getCreateStartTime()),
-                "{0} <= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getCreateStartTime().split(" ")[0]);
-        wrapper.apply(StringUtils.isNotBlank(request.getCreateEndTime()),
-                "{0} >= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getCreateEndTime().split(" ")[0]);
+        if(StringUtils.isNotBlank(request.getCreateStartTime())){
+            wrapper.apply("{0} <= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getCreateStartTime().split(" ")[0]);
+        }
+        if(StringUtils.isNotBlank(request.getCreateEndTime())){
+            wrapper.apply("{0} >= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getCreateEndTime().split(" ")[0]);
+        }
         wrapper.orderByDesc("create_time");
         return wrapper;
     }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceAssessServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceAssessServiceImpl.java
index c6af980..ce40138 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceAssessServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceAssessServiceImpl.java
@@ -1,10 +1,33 @@
 package com.casic.missiles.service.Impl.business;
 
-import com.casic.missiles.model.business.BizBusinessOutsourceAssess;
+import cn.hutool.core.lang.Assert;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.casic.missiles.core.model.auth.AuthUser;
+import com.casic.missiles.core.shiro.ShiroKit;
+import com.casic.missiles.dto.BaseApprovalSubmitRequest;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.ReturnUtil;
+import com.casic.missiles.dto.business.outsource.OutsourceAssessApprovalListRequest;
+import com.casic.missiles.dto.business.outsource.OutsourceAssessSaveResponse;
+import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.NoGenerateFileCodeEnum;
+import com.casic.missiles.enums.NoGenerateRecordTypeCodeEnum;
+import com.casic.missiles.enums.system.ApprovalStatusEnum;
+import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.mapper.business.BizBusinessOutsourceAssessMapper;
+import com.casic.missiles.model.business.BizBusinessOutsourceAssess;
+import com.casic.missiles.model.business.BizBusinessOutsourceAssessSampleRelation;
+import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl;
+import com.casic.missiles.service.business.IBizBusinessOutsourceAssessSampleRelationService;
 import com.casic.missiles.service.business.IBizBusinessOutsourceAssessService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.casic.missiles.utils.NoGeneratorUtil;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Objects;
 
 /**
  * <p>
@@ -15,6 +38,103 @@
  * @since 2023-08-16
  */
 @Service
-public class BizBusinessOutsourceAssessServiceImpl extends ServiceImpl<BizBusinessOutsourceAssessMapper, BizBusinessOutsourceAssess> implements IBizBusinessOutsourceAssessService {
+public class BizBusinessOutsourceAssessServiceImpl extends GeneralApprovalServiceImpl<BizBusinessOutsourceAssessMapper, BizBusinessOutsourceAssess, BizBusinessOutsourceAssess, OutsourceAssessApprovalListRequest, BaseApprovalSubmitRequest> implements IBizBusinessOutsourceAssessService {
+    @Autowired
+    private IBizBusinessOutsourceAssessSampleRelationService outsourceAssessSampleRelationService;
 
+    @Override
+    public ReturnDTO<OutsourceAssessSaveResponse> saveOutsourceAssess(BizBusinessOutsourceAssess request) {
+        //生成编号
+        String labCode = request.getLabCode();
+        String groupCode = request.getGroupCode();
+        Long maxNo = this.baseMapper.selectMaxProjectNo();
+        String projectNo = NoGeneratorUtil.getCode(NoGenerateFileCodeEnum.D, labCode, NoGenerateRecordTypeCodeEnum.OUTSOURCE_ACCESS, groupCode, maxNo);
+        request.setCreateUserId(request.getUserId());
+        request.setCreateUserName(request.getUserName());
+        request.setApprovalStatus(ApprovalStatusEnum.DRAFT); //草稿箱状态
+        request.setProjectNo(projectNo);
+        int row = this.baseMapper.insert(request);
+        Assert.isFalse(row <= 0, () -> {
+            throw new BusinessException(BusinessExceptionEnum.OUTSOURCE_ACCESS_SAVE_FAILED);
+        });
+        //关联表
+        saveRelationData(request);
+        OutsourceAssessSaveResponse saveResponse = new OutsourceAssessSaveResponse();
+        saveResponse.setId(request.getId());
+        saveResponse.setProjectNo(projectNo);
+        return ReturnUtil.success(saveResponse);
+    }
+
+    @Override
+    @Transactional
+    public ReturnDTO draftUpdate(BizBusinessOutsourceAssess request) {
+        if (this.baseMapper.updateById(request) > 0) {
+            //关联表删除、增加
+            removeRelationData(request.getId());
+            saveRelationData(request);
+            return ReturnUtil.success();
+        }
+        throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
+    }
+
+    @Override
+    public ReturnDTO draftDelete(Long id) {
+        if (this.baseMapper.deleteById(id) > 0) {
+            //关联表删除
+            removeRelationData(id);
+            return ReturnUtil.success();
+        }
+        throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
+    }
+
+    @Override
+    public ReturnDTO draftBatchDelete(List<Long> ids) {
+        if (this.baseMapper.deleteBatchIds(ids) >= 0) {
+            ids.forEach(id -> removeRelationData(id));
+            return ReturnUtil.success();
+        }
+        throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
+    }
+
+    @Override
+    @Transactional
+    public ReturnDTO failUpdate(BizBusinessOutsourceAssess request) {
+        AuthUser user = ShiroKit.getUser();
+        Assert.isFalse(Objects.isNull(user), () -> {
+            throw new BusinessException(BusinessExceptionEnum.LOGIN_USER_ACQUIRE_FAILED);
+        });
+        request.setApprovalStatus(ApprovalStatusEnum.IN_APPROVED);
+        if (this.baseMapper.updateById(request) > 0) {
+            //关联表删除、增加
+            removeRelationData(request.getId());
+            saveRelationData(request);
+            baseApprovalService.failUpdate(request.getProcessId());
+            return ReturnUtil.success();
+        }
+        throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
+    }
+
+    private void saveRelationData(BizBusinessOutsourceAssess request) {
+        List<BizBusinessOutsourceAssessSampleRelation> sampleRelations = new ArrayList<>();
+        request.getOrderSampleList().forEach(dto -> {
+            BizBusinessOutsourceAssessSampleRelation relation = new BizBusinessOutsourceAssessSampleRelation();
+            relation.setOrderId(dto.getOrderId());
+            relation.setSampleId(dto.getSampleId());
+            relation.setAccessId(request.getId());
+            sampleRelations.add(relation);
+        });
+        if(outsourceAssessSampleRelationService.saveBatch(sampleRelations)){
+            return;
+        }
+        throw new BusinessException(BusinessExceptionEnum.OUTSOURCE_ACCESS_SAVE_FAILED);
+    }
+
+    private void removeRelationData(Long assessId) {
+        QueryWrapper<BizBusinessOutsourceAssessSampleRelation> wrapper = new QueryWrapper<>();
+        wrapper.eq("access_id", assessId);
+        if(outsourceAssessSampleRelationService.remove(wrapper)){
+            return;
+        }
+        throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
+    }
 }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceProtocolServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceProtocolServiceImpl.java
new file mode 100644
index 0000000..821e728
--- /dev/null
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceProtocolServiceImpl.java
@@ -0,0 +1,60 @@
+package com.casic.missiles.service.Impl.business;
+
+import cn.hutool.core.lang.Assert;
+import com.casic.missiles.dto.BaseApprovalSubmitRequest;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.ReturnUtil;
+import com.casic.missiles.dto.business.outsource.OutsourceProtocolApprovalListRequest;
+import com.casic.missiles.dto.business.outsource.OutsourceProtocolSaveResponse;
+import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.NoGenerateFileCodeEnum;
+import com.casic.missiles.enums.NoGenerateRecordTypeCodeEnum;
+import com.casic.missiles.enums.system.ApprovalStatusEnum;
+import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.mapper.business.BizBusinessOutsourceProtocolMapper;
+import com.casic.missiles.mapper.business.BizBusinessOutsourcerInfoMapper;
+import com.casic.missiles.model.business.BizBusinessOutsourceProtocol;
+import com.casic.missiles.model.business.BizBusinessOutsourcerInfo;
+import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl;
+import com.casic.missiles.service.business.IBizBusinessOutsourceProtocolService;
+import com.casic.missiles.utils.NoGeneratorUtil;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 计量检定业务-分包管理-测试、校准或检定工作分包协议书 服务实现类
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-08-24
+ */
+@Service
+public class BizBusinessOutsourceProtocolServiceImpl extends GeneralApprovalServiceImpl<BizBusinessOutsourceProtocolMapper, BizBusinessOutsourceProtocol, BizBusinessOutsourceProtocol, OutsourceProtocolApprovalListRequest, BaseApprovalSubmitRequest> implements IBizBusinessOutsourceProtocolService {
+    @Autowired
+    private BizBusinessOutsourcerInfoMapper outsourcerInfoMapper;
+
+    @Override
+    public ReturnDTO<OutsourceProtocolSaveResponse> saveOutsourceProtocol(BizBusinessOutsourceProtocol request) {
+        //生成编号
+        String labCode = request.getLabCode();
+        String groupCode = request.getGroupCode();
+        Long maxNo = this.baseMapper.selectMaxProtocolNo();
+        String protocolNo = NoGeneratorUtil.getCode(NoGenerateFileCodeEnum.D, labCode, NoGenerateRecordTypeCodeEnum.OUTSOURCE_PROTOCOL, groupCode, maxNo);
+        request.setCreateUserId(request.getUserId());
+        request.setCreateUserName(request.getUserName());
+        request.setApprovalStatus(ApprovalStatusEnum.DRAFT); //草稿箱状态
+        request.setProtocolNo(protocolNo);
+        BizBusinessOutsourcerInfo outsourcerInfo = outsourcerInfoMapper.selectById(request.getOutsourcerId());
+        request.setOutsourceNo(outsourcerInfo.getOutsourcerNo());
+        request.setOutsourceName(outsourcerInfo.getOutsourcerName());
+        int row = this.baseMapper.insert(request);
+        Assert.isFalse(row <= 0, () -> {
+            throw new BusinessException(BusinessExceptionEnum.OUTSOURCE_PROTOCOL_SAVE_FAILED);
+        });
+        OutsourceProtocolSaveResponse saveResponse = new OutsourceProtocolSaveResponse();
+        saveResponse.setId(request.getId());
+        saveResponse.setProtocolNo(protocolNo);
+        return ReturnUtil.success(saveResponse);
+    }
+}
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourcerInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourcerInfoServiceImpl.java
index 75f639d..8aadad7 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourcerInfoServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourcerInfoServiceImpl.java
@@ -3,12 +3,12 @@
 import cn.hutool.core.lang.Assert;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.dto.*;
 import com.casic.missiles.dto.business.outsource.OutsourcerInfoApprovalListRequest;
 import com.casic.missiles.dto.business.outsource.OutsourcerSaveResponse;
 import com.casic.missiles.enums.BusinessExceptionEnum;
-import com.casic.missiles.enums.PrefixCodeEnum;
+import com.casic.missiles.enums.NoGenerateFileCodeEnum;
+import com.casic.missiles.enums.NoGenerateRecordTypeCodeEnum;
 import com.casic.missiles.enums.system.ApprovalStatusEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.mapper.business.BizBusinessOutsourcerInfoMapper;
@@ -20,7 +20,7 @@
 import com.casic.missiles.service.business.IBizBusinessOutsourcerInfoService;
 import com.casic.missiles.service.business.IBizBusinessOutsourcerUserInfoService;
 import com.casic.missiles.utils.DictCodeUtils;
-import com.casic.missiles.utils.NumberGeneratorUtil;
+import com.casic.missiles.utils.NoGeneratorUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -42,22 +42,12 @@
     private IBizBusinessOutsourcerUserInfoService outsourcerUserInfoService;
 
     @Override
-    public List<BizBusinessOutsourcerInfo> list(OutsourcerInfoApprovalListRequest request) {
-        request.setCreateUserId(null);
-        request.setApprovalStatus(ApprovalStatusEnum.PASSED);
-        Page<BizBusinessOutsourcerInfo> page = PageFactory.defaultPage();
-        page.setCurrent(1);
-        page.setSearchCount(false);
-        page.setSize(Integer.MAX_VALUE);
-        Page<BizBusinessOutsourcerInfo> resultPage = this.baseMapper.selectBatchForApprovalList(page, request, null);
-        return resultPage.getRecords();
-    }
-
-    @Override
     public ReturnDTO<OutsourcerSaveResponse> saveOutsourcer(BizBusinessOutsourcerInfo request) {
         //生成编号
+        String labCode = request.getLabCode();
+        String groupCode = request.getGroupCode();
         Long maxNo = this.baseMapper.selectMaxNo();
-        String outsourcerNo = NumberGeneratorUtil.getContactNo(PrefixCodeEnum.OUTSOURCER_PREFIX, maxNo);
+        String outsourcerNo = NoGeneratorUtil.getCode(NoGenerateFileCodeEnum.D, labCode, NoGenerateRecordTypeCodeEnum.OUTSOURCE_INFO, groupCode, maxNo);
         request.setOutsourcerNo(outsourcerNo);
         request.setCreateUserId(request.getUserId());
         request.setCreateUserName(request.getUserName());
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessSiteExecutiveInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessSiteExecutiveInfoServiceImpl.java
index ebab3e6..6c6a129 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessSiteExecutiveInfoServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessSiteExecutiveInfoServiceImpl.java
@@ -189,9 +189,9 @@
         QueryWrapper<BizBusinessSiteExecutiveStaffRelation> mWrapper = new QueryWrapper<>();
         mWrapper.eq("site_executive_id", siteExecutiveId);
         boolean mRemove = siteExecutiveStaffRelationService.remove(mWrapper);
-        Assert.isFalse(eRemove || mRemove, () -> {
+        if(!eRemove || !mRemove){
             throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
-        });
+        }
     }
 
     private void doPopulateSiteExecutive(SiteExecutiveDetailResponse detailResponse) {
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessLabExecutiveInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessLabExecutiveInfoServiceImpl.java
index 50c5616..0242fcf 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessLabExecutiveInfoServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessLabExecutiveInfoServiceImpl.java
@@ -297,6 +297,29 @@
     }
 
     @Override
+    public List<SampleLabExecutiveListResponse> deptLabExecutiveList(SampleLabExecutiveListRequest request) throws Exception {
+        Page<SampleLabExecutiveListResponse> page = PageFactory.defaultPage();
+        page.setCurrent(1);
+        page.setSearchCount(false);
+        page.setSize(Integer.MAX_VALUE);
+        Page<SampleLabExecutiveListResponse> resultPage = this.deptLabExecutiveListPage(page, request);
+        return resultPage.getRecords();
+    }
+
+    @Override
+    public List<SampleLabExecutiveListResponse> deptLabExecutiveListByIds(String measureStatus, List<Long> ids) throws Exception {
+        Page<SampleLabExecutiveListResponse> page = PageFactory.defaultPage();
+        page.setCurrent(1);
+        page.setSearchCount(false);
+        page.setSize(Integer.MAX_VALUE);
+        SampleLabExecutiveListRequest request = new SampleLabExecutiveListRequest();
+        request.setIds(ids);
+        request.setMeasureStatus(measureStatus);
+        Page<SampleLabExecutiveListResponse> resultPage = this.deptLabExecutiveListPage(page, request);
+        return resultPage.getRecords();
+    }
+
+    @Override
     public Page<SampleLabExecutiveListResponse> myLabExecutiveListPage(Page<SampleLabExecutiveListResponse> page, SampleLabExecutiveListRequest labExecutiveListRequest) throws Exception{
         AuthUser user = ShiroKit.getUser();
         Assert.isFalse(Objects.isNull(user), () -> {
@@ -350,6 +373,29 @@
     }
 
     @Override
+    public List<SampleLabExecutiveListResponse> myLabExecutiveList(SampleLabExecutiveListRequest request) throws Exception {
+        Page<SampleLabExecutiveListResponse> page = PageFactory.defaultPage();
+        page.setCurrent(1);
+        page.setSearchCount(false);
+        page.setSize(Integer.MAX_VALUE);
+        Page<SampleLabExecutiveListResponse> resultPage = this.myLabExecutiveListPage(page, request);
+        return resultPage.getRecords();
+    }
+
+    @Override
+    public List<SampleLabExecutiveListResponse> myLabExecutiveListByIds(String measureStatus, List<Long> ids) throws Exception {
+        Page<SampleLabExecutiveListResponse> page = PageFactory.defaultPage();
+        page.setCurrent(1);
+        page.setSearchCount(false);
+        page.setSize(Integer.MAX_VALUE);
+        SampleLabExecutiveListRequest request = new SampleLabExecutiveListRequest();
+        request.setIds(ids);
+        request.setMeasureStatus(measureStatus);
+        Page<SampleLabExecutiveListResponse> resultPage = this.myLabExecutiveListPage(page, request);
+        return resultPage.getRecords();
+    }
+
+    @Override
     public List<SampleAmountResponse> myExecutiveAmount() {
         //登录用户id获取计量人员id，实验室检测信息中存储的是计量人员id
         AuthUser user = ShiroKit.getUser();
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentInfoServiceImpl.java
index 864b05e..db8cad4 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentInfoServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentInfoServiceImpl.java
@@ -35,7 +35,6 @@
 import com.casic.missiles.utils.ConvertUtils;
 import com.casic.missiles.utils.DictCodeUtils;
 import com.casic.missiles.utils.NumberGeneratorUtil;
-import org.flowable.engine.RuntimeService;
 import org.flowable.engine.runtime.ProcessInstance;
 import org.jetbrains.annotations.NotNull;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -43,7 +42,6 @@
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
 
-import javax.annotation.Resource;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
@@ -81,8 +79,6 @@
     private IBizEquipmentAttachmentService attachmentService;
     @Autowired
     private IBizEquipmentCheckpointService checkpointService;
-    @Resource
-    private RuntimeService runtimeService;
     @Autowired
     private ApprovalOperateService approvalOperateService;
 
@@ -235,18 +231,18 @@
     private void updateRelationInfo(EquipmentAddRequest request, BizEquipmentInfoApproval equipmentInfoApproval) {
         QueryWrapper<BizEquipmentTechnicalTarget> targetWrapper = new QueryWrapper<>();
         targetWrapper.eq("equipment_no", equipmentInfoApproval.getEquipmentNo());
-        boolean removeTargetFlag = technicalTargetService.remove(targetWrapper);
-        boolean saveTargetFlag = technicalTargetService.saveBatch(request.getTechnicalTargetList());
+        technicalTargetService.remove(targetWrapper);
+        technicalTargetService.saveBatch(request.getTechnicalTargetList());
 
         QueryWrapper<BizEquipmentAttachment> attachmentWrapper = new QueryWrapper<>();
         attachmentWrapper.eq("equipment_no", equipmentInfoApproval.getEquipmentNo());
-        boolean removeAttachmentFlag = attachmentService.remove(attachmentWrapper);
-        boolean saveAttachmentFlag = attachmentService.saveBatch(request.getAttachmentList());
+        attachmentService.remove(attachmentWrapper);
+        attachmentService.saveBatch(request.getAttachmentList());
 
         QueryWrapper<BizEquipmentCheckpoint> checkpointWrapper = new QueryWrapper<>();
         checkpointWrapper.eq("equipment_no", equipmentInfoApproval.getEquipmentNo());
-        boolean removeCheckpointFlag = checkpointService.remove(checkpointWrapper);
-        boolean saveCheckpointFlag = checkpointService.saveBatch(request.getCheckpointList());
+        checkpointService.remove(checkpointWrapper);
+        checkpointService.saveBatch(request.getCheckpointList());
     }
 
     @Override
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardInfoServiceImpl.java
index faff1ae..c50a5b3 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardInfoServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardInfoServiceImpl.java
@@ -22,7 +22,9 @@
 import com.casic.missiles.mapper.equipment.BizEquipmentStandardInfoMapper;
 import com.casic.missiles.mapper.equipment.BizEquipmentStandardTechnologyRelationMapper;
 import com.casic.missiles.mapper.resource.BizResourceStaffInfoMapper;
-import com.casic.missiles.model.equipment.*;
+import com.casic.missiles.model.equipment.BizEquipmentStandardInfo;
+import com.casic.missiles.model.equipment.BizEquipmentStandardInfoApproval;
+import com.casic.missiles.model.equipment.BizEquipmentStandardTechnologyRelation;
 import com.casic.missiles.model.resource.BizResourceStaffInfo;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.dao.DeptMapper;
@@ -33,14 +35,12 @@
 import com.casic.missiles.service.flowable.ApprovalOperateService;
 import com.casic.missiles.utils.ConvertUtils;
 import com.casic.missiles.utils.DictCodeUtils;
-import org.flowable.engine.RuntimeService;
 import org.flowable.engine.runtime.ProcessInstance;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
 
-import javax.annotation.Resource;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
@@ -62,8 +62,6 @@
     private BizResourceStaffInfoMapper staffInfoMapper;
     @Autowired
     private IBaseApprovalService baseApprovalService;
-    @Resource
-    private RuntimeService runtimeService;
     @Autowired
     private ApprovalOperateService approvalOperateService;
     @Autowired
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSealInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSealInfoServiceImpl.java
index 7c91fa2..00040d6 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSealInfoServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSealInfoServiceImpl.java
@@ -15,6 +15,7 @@
 import com.casic.missiles.modular.system.model.User;
 import com.casic.missiles.service.resource.IBizResourceSealInfoService;
 import com.casic.missiles.utils.DictCodeUtils;
+import com.casic.missiles.utils.MinioUtil;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -33,6 +34,8 @@
     private BizResourceSealInfoMapper sealInfoMapper;
     @Autowired
     private UserMapper userMapper;
+    @Autowired
+    private MinioUtil minioUtil;
 
     @Override
     public Page<BizResourceSealInfo> listPage(Page<BizResourceSealInfo> page, SealInfoListRequest request) throws Exception {
@@ -44,6 +47,7 @@
         Page<BizResourceSealInfo> sealInfoPage = sealInfoMapper.selectPage(page, wrapper);
         for (BizResourceSealInfo record : sealInfoPage.getRecords()) {
             DictCodeUtils.convertDictCodeToName(record);
+            record.setMinioFileUrl(minioUtil.getFileUrl(record.getMinioFileName()));
         }
         return sealInfoPage;
     }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceStaffInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceStaffInfoServiceImpl.java
index f058cf5..09203ac 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceStaffInfoServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceStaffInfoServiceImpl.java
@@ -3,6 +3,7 @@
 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.core.page.PageFactory;
 import com.casic.missiles.dto.IdDTO;
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
@@ -86,6 +87,13 @@
     }
 
     @Override
+    public List<BizResourceStaffInfo> list(StaffListRequest request) throws Exception {
+        Page<BizResourceStaffInfo> page = PageFactory.defaultPage();
+        Page<BizResourceStaffInfo> staffInfoPage = this.listPage(page, request);
+        return staffInfoPage.getRecords();
+    }
+
+    @Override
     @Transactional
     public ReturnDTO<IdDTO> staffBaseAdd(BizResourceStaffInfo staffInfo) {
         //登录账号查重
@@ -495,6 +503,28 @@
         return certResponsePage;
     }
 
+    @Override
+    public List<StaffCertResponse> certListByIds(List<Long> ids) throws Exception {
+        Page<StaffCertResponse> page = PageFactory.defaultPage();
+        page.setCurrent(1);
+        page.setSearchCount(false);
+        page.setSize(Integer.MAX_VALUE);
+        StaffCertRequest request = new StaffCertRequest();
+        request.setIds(ids);
+        Page<StaffCertResponse> resultPage = this.certListPage(page, request);
+        return resultPage.getRecords();
+    }
+
+    @Override
+    public List<StaffCertResponse> certList(StaffCertRequest request) throws Exception {
+        Page<StaffCertResponse> page = PageFactory.defaultPage();
+        page.setCurrent(1);
+        page.setSearchCount(false);
+        page.setSize(Integer.MAX_VALUE);
+        Page<StaffCertResponse> resultPage = this.certListPage(page, request);
+        return resultPage.getRecords();
+    }
+
     @Async
     public void deleteRelationInfo(Long staffId){
         QueryWrapper<BizResourceStaffEducation> educationWrapper = new QueryWrapper<>();
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceStaffVerifierServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceStaffVerifierServiceImpl.java
index 8ac7eee..b508d45 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceStaffVerifierServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceStaffVerifierServiceImpl.java
@@ -52,8 +52,8 @@
     private WebSocket webSocket;
 
     @Override
-    public ReturnDTO expirationReminder(IdDTO idDto) {
-        BizResourceStaffVerifier staffVerifier = verifierMapper.selectById(idDto.getId());
+    public ReturnDTO expirationReminder(IdDTO idDTO) {
+        BizResourceStaffVerifier staffVerifier = verifierMapper.selectById(idDTO.getId());
         BizResourceStaffInfo staffInfo = staffInfoMapper.selectById(staffVerifier.getStaffId());
         QueryWrapper<User> wrapper = new QueryWrapper<>();
         wrapper.eq("account", staffInfo.getAccount());
@@ -65,7 +65,7 @@
         Assert.isFalse(Objects.isNull(user), () -> {
             throw new BusinessException(BusinessExceptionEnum.LOGIN_USER_ACQUIRE_FAILED);
         });
-        WorkbenchRemindMessage remindMessage = new WorkbenchRemindMessage(userInfo.getId(), userInfo.getDeptId(), idDto.getId(), staffVerifier.getCertNo(), MessageTypeEnum.STAFF_CERT.getCode(), MessageSourceModuleEnum.RESOURCE.getCode(), MessageTypeEnum.STAFF_CERT.getValue(), MessageTypeEnum.STAFF_CERT.getValue(), staffVerifier.getCertName(),0, user.getId(), user.getName());
+        WorkbenchRemindMessage remindMessage = new WorkbenchRemindMessage(userInfo.getId(), userInfo.getDeptId(), idDTO.getId(), staffVerifier.getCertNo(), MessageTypeEnum.STAFF_CERT.getCode(), MessageSourceModuleEnum.RESOURCE.getCode(), MessageTypeEnum.STAFF_CERT.getValue(), MessageTypeEnum.STAFF_CERT.getValue(), staffVerifier.getCertName(),0, user.getId(), user.getName());
         if(messageMapper.insert(remindMessage) > 0){
             // 新增到消息列表后向用户推送消息
             webSocket.sendOneMessage(String.valueOf(userInfo.getId()), JSONObject.toJSONString(remindMessage));
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceTrainInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceTrainInfoServiceImpl.java
index c1d6308..3a533f2 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceTrainInfoServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceTrainInfoServiceImpl.java
@@ -44,11 +44,14 @@
     @Override
     public Page<BizResourceTrainInfo> listPage(Page<BizResourceTrainInfo> page, TrainListRequest request) throws Exception {
         QueryWrapper<BizResourceTrainInfo> wrapper = new QueryWrapper<>();
-        wrapper.like("train_no", request.getTrainNo());
-        wrapper.apply(StringUtils.isNotBlank(request.getCreateTimeStart()),//apply方法传入参数名不能为空
-                "{0} <= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getCreateTimeStart().split(" ")[0]);
-        wrapper.apply(StringUtils.isNotBlank(request.getCreateTimeEnd()),
-                "{0} >= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getCreateTimeEnd().split(" ")[0]);
+        wrapper.like(StringUtils.isNotEmpty(request.getTrainNo()), "train_no", request.getTrainNo());
+        wrapper.like(StringUtils.isNotEmpty(request.getDutyLeader()),"duty_leader", request.getDutyLeader());
+        if(StringUtils.isNotBlank(request.getCreateTimeStart())){
+            wrapper.apply("{0} <= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getCreateTimeStart().split(" ")[0]);
+        }
+        if(StringUtils.isNotBlank(request.getCreateTimeEnd())){
+            wrapper.apply("{0} >= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getCreateTimeEnd().split(" ")[0]);
+        }
         wrapper.orderByDesc("create_time");
         Page<BizResourceTrainInfo> trainInfoPage = trainInfoMapper.selectPage(page, wrapper);
         for (BizResourceTrainInfo record : trainInfoPage.getRecords()) {
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/EnvLocationInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/EnvLocationInfoServiceImpl.java
new file mode 100644
index 0000000..cdc5742
--- /dev/null
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/EnvLocationInfoServiceImpl.java
@@ -0,0 +1,31 @@
+package com.casic.missiles.service.Impl.resource;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.casic.missiles.dto.resource.environment.LocationListRequest;
+import com.casic.missiles.dto.resource.environment.LocationListResponse;
+import com.casic.missiles.mapper.resource.EnvLocationInfoMapper;
+import com.casic.missiles.model.resource.EnvLocationInfo;
+import com.casic.missiles.service.resource.IEnvLocationInfoService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 实验室环境监控系统-设备表 服务实现类
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-06-07
+ */
+@Service
+public class EnvLocationInfoServiceImpl extends ServiceImpl<EnvLocationInfoMapper, EnvLocationInfo> implements IEnvLocationInfoService {
+    @Autowired
+    private EnvLocationInfoMapper locationInfoMapper;
+
+    @Override
+    public Page<LocationListResponse> listPage(Page<LocationListResponse> page, LocationListRequest request) {
+        Page<LocationListResponse> resultPage = locationInfoMapper.selectLocationListPage(page, request);
+        return resultPage;
+    }
+}
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/DownloadCenterServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/DownloadCenterServiceImpl.java
index c956d24..d9f3282 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/DownloadCenterServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/DownloadCenterServiceImpl.java
@@ -131,10 +131,12 @@
         wrapper.like(StringUtils.isNotBlank(request.getModuleName()), "module_name", request.getModuleName());
         wrapper.like(StringUtils.isNotBlank(request.getFileName()), "file_name", request.getFileName());
         wrapper.like(StringUtils.isNotBlank(request.getFileType()), "file_type", request.getFileType());
-        wrapper.apply(StringUtils.isNotBlank(request.getStartTime()),
-                "{0} <= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getStartTime().split(" ")[0]);
-        wrapper.apply(StringUtils.isNotBlank(request.getEndTime()),
-                "{0} >= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getEndTime().split(" ")[0]);
+        if(StringUtils.isNotBlank(request.getStartTime())){
+            wrapper.apply("{0} <= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getStartTime().split(" ")[0]);
+        }
+        if(StringUtils.isNotBlank(request.getEndTime())){
+            wrapper.apply("{0} >= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getEndTime().split(" ")[0]);
+        }
         wrapper.orderByDesc("create_time");
         return wrapper;
     }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemSignServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemSignServiceImpl.java
index 41976bb..7e90a09 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemSignServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemSignServiceImpl.java
@@ -52,15 +52,14 @@
 
     @Override
     public Page<SystemSign> listPage(Page<SystemSign> page, SignListRequest request) {
-        QueryWrapper<SystemSign> wrapper = getWrapper(request);
-        Page<SystemSign> signPage = signMapper.selectPage(page, wrapper);
+        Page<SystemSign> signPage = signMapper.selectSignListPage(page, request);
         return signPage;
     }
 
     @Override
     public List<SystemSign> list(SignListRequest request) {
-        QueryWrapper<SystemSign> wrapper = getWrapper(request);
-        return signMapper.selectList(wrapper);
+        List<SystemSign> signList = signMapper.selectSignList(request);
+        return signList;
     }
 
     @Override
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessCertificatePrintService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessCertificatePrintService.java
index 03247ab..7d6db77 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessCertificatePrintService.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessCertificatePrintService.java
@@ -9,6 +9,8 @@
 import com.casic.missiles.model.business.BizBusinessCertificatePrintLog;
 import com.casic.missiles.model.business.BizBusinessCertificateReport;
 
+import java.util.List;
+
 /**
  * <p>
  * 计量检定业务-任务计量管理-证书管理 服务类
@@ -30,4 +32,9 @@
     ReturnDTO certificatePrintStatus(Long id, String printStatus);
 
     ReturnDTO<BizBusinessCertificatePrintLog> certificatePrintLog(Long id);
+
+    List<CertificatePrintListResponse> listByIds(List<Long> ids);
+
+    List<CertificatePrintListResponse> list(CertificatePrintApprovalListRequest request);
+
 }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessCertificateReportService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessCertificateReportService.java
index 305ac7f..b33ef22 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessCertificateReportService.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessCertificateReportService.java
@@ -21,6 +21,4 @@
     ReturnDTO<CertificateReportSaveResponse> saveCertificateReport(BizBusinessCertificateReport request);
 
     ReturnDTO<BizBusinessCertificateReport> detail(BaseDetailRequest request);
-
-
 }

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java
index bb0c50f..13a699b 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java
@@ -12,6 +12,7 @@
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.IGeneralApprovalService;
+import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
@@ -19,6 +20,7 @@
 import org.springframework.web.bind.annotation.RequestBody;
 
 import javax.validation.Valid;
+import java.util.List;
 import java.util.Objects;
 
 /**
@@ -117,4 +119,17 @@
         }
         return baseApprovalService.failUpdate(request);
     }
+
+    public List<O> exportList(@RequestBody @Valid R request) throws Exception {
+        List<O> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = baseApprovalService.listExportByIds(request.getIds());
+        } else {
+            list = baseApprovalService.listExport(request);
+        }
+        for (O record : list) {
+            DictCodeUtils.convertDictCodeToName(record);
+        }
+        return list;
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java
index 8a90961..d775831 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java
@@ -5,6 +5,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.business.certificate.CertificateChangeApplyApprovalListRequest;
 import com.casic.missiles.dto.business.certificate.CertificateChangeApplySaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessCertificateChangeApply;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
@@ -20,6 +21,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -48,4 +50,12 @@
         }
         return changeApplyService.saveChangeApply(request);
     }
+
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody CertificateChangeApplyApprovalListRequest request) throws Exception {
+        List<BizBusinessCertificateChangeApply> list = super.exportList(request);
+        super.exportExcel(BizBusinessCertificateChangeApply.class, list, ExportEnum.CERTIFICATE_CHANGE_APPLY.getSheetName());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java
index 5fc4b07..af8230e 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java
@@ -9,6 +9,7 @@
 import com.casic.missiles.dto.business.certificate.CertificatePrintApprovalListRequest;
 import com.casic.missiles.dto.business.certificate.CertificatePrintListResponse;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.enums.business.CertificatePrintStatusEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessCertificatePrintLog;
@@ -18,10 +19,16 @@
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.io.IOException;
+import java.util.List;
 import java.util.Objects;
 
 /**
@@ -98,4 +105,16 @@
         });
         return certificatePrintService.certificatePrintLog(idDTO.getId());
     }
+
+    @ApiOperation("证书打印审批导出")
+    @PostMapping("/listExport")
+    public void exportList(@RequestBody CertificatePrintApprovalListRequest request) throws IOException {
+        List<CertificatePrintListResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = certificatePrintService.listByIds(request.getIds());
+        } else {
+            list = certificatePrintService.list(request);
+        }
+        super.exportExcel(CertificatePrintListResponse.class, list, ExportEnum.CERTIFICATE_PRINT.getSheetName());
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java
index 63b06dc..6b2efd5 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java
@@ -6,6 +6,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.business.certificate.CertificateReportApprovalListRequest;
 import com.casic.missiles.dto.business.certificate.CertificateReportSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessCertificateReport;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
@@ -21,6 +22,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -50,7 +52,7 @@
         return certificateReportService.saveCertificateReport(request);
     }
 
-    @ApiOperation("证书审批详情（基本信息）")
+    @ApiOperation("详情（基本信息）")
     @PostMapping("/detail")
     public ReturnDTO<BizBusinessCertificateReport> detail(@RequestBody @Valid BaseDetailRequest request, BindingResult bindingResult) throws Exception {
         if(bindingResult.hasErrors()){
@@ -59,4 +61,11 @@
         return certificateReportService.detail(request);
     }
 
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody CertificateReportApprovalListRequest request) throws Exception {
+        List<BizBusinessCertificateReport> list = super.exportList(request);
+        super.exportExcel(BizBusinessCertificateReport.class, list, ExportEnum.CERTIFICATE_REPORT.getSheetName());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java
index 46b26bd..57c0809 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java
@@ -10,20 +10,21 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.business.identify.IdentifyListRequest;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessIdentifyInfo;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.business.IBizBusinessIdentifyInfoService;
+import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import javax.validation.Valid;
+import java.util.List;
 import java.util.Objects;
 
 /**
@@ -57,16 +58,13 @@
         return identifyInfoService.addIdentify(identifyInfo);
     }
 
-    @ApiOperation("标识打印更新")
+    @ApiOperation("标识打印更新（更新打印时间）")
     @PostMapping("/update")
-    public ReturnDTO updateIdentify(@RequestBody @Valid BizBusinessIdentifyInfo identifyInfo, BindingResult bindingResult) {
-        Assert.isFalse(Objects.isNull(identifyInfo.getId()), () -> {
+    public ReturnDTO updateIdentify(@RequestBody @Valid IdDTO idDTO) {
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        Assert.isFalse(bindingResult.hasErrors(), () -> {
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        });
-        return identifyInfoService.updateIdentify(identifyInfo);
+        return identifyInfoService.updateIdentify(idDTO.getId());
     }
 
     @ApiOperation("标识打印删除")
@@ -77,4 +75,37 @@
         });
         return identifyInfoService.deleteIdentify(idDTO.getId());
     }
+
+    @ApiOperation("标识打印导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody @Valid IdentifyListRequest request, BindingResult bindingResult) throws Exception {
+        if (bindingResult.hasErrors()) {
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        List<BizBusinessIdentifyInfo> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = identifyInfoService.listByIds(request.getIds());
+        } else {
+            list = identifyInfoService.list(request);
+        }
+        for (BizBusinessIdentifyInfo record : list) {
+            DictCodeUtils.convertDictCodeToName(record);
+        }
+        super.exportExcel(BizBusinessIdentifyInfo.class, list, ExportEnum.IDENTIFY_EXPORT.getSheetName());
+    }
+
+
+    // TODO: 2023/8/23 查询设备信息，4个底部按钮查设备（按钮的作用就是前端用来调不同接口、用来区分中间即将展示的标识），前端弹窗选设备，在确定保存时前端根据底部按钮判断传入设备类型deviceType字典code
+    // TODO: 2023/8/23 接口：查受检设备（第1个按钮），查设备台账（后3个按钮同一接口），查询之后前端根据标志类型的不同加到中间页面时进行判断（按产品给的对应表）
+    // TODO: 2023/8/23 提供二维码接口，前端在加到中间页面时调用一下
+
+    @ApiOperation("设备二维码")
+    @PostMapping("/equipment/qrCode")
+    public ReturnDTO<String> equipmentQrCode(@RequestBody @Valid IdDTO idDTO) {
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return identifyInfoService.equipmentQrCode(idDTO.getId());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java
index 707be6e..7e0453d 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java
@@ -117,7 +117,7 @@
     }
 
     @ApiOperation("任务单导出")
-    @PostMapping("/export")
+    @PostMapping("/listExport")
     public void orderExport(@RequestBody @Valid OrderListRequest request, HttpServletResponse response) {
         businessOrderService.orderExport(request, response);
     }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java
index 529a6ce..51432be 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java
@@ -1,9 +1,28 @@
 package com.casic.missiles.controller.business;
 
+import com.casic.missiles.controller.GeneralApprovalController;
+import com.casic.missiles.dto.BaseApprovalSubmitRequest;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.business.outsource.OutsourceAssessApprovalListRequest;
+import com.casic.missiles.dto.business.outsource.OutsourceAssessSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
+import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.model.business.BizBusinessOutsourceAssess;
+import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
+import com.casic.missiles.service.IGeneralApprovalService;
+import com.casic.missiles.service.business.IBizBusinessOutsourceAssessService;
 import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.BindingResult;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.validation.Valid;
+import java.util.List;
+
 /**
  * <p>
  * 计量检定业务-分包管理-测试、校准或检定工作分包评审表 前端控制器
@@ -15,6 +34,27 @@
 @Api(tags = "分包管理-测试、校准或检定工作分包评审表")
 @RestController
 @RequestMapping("/business/outsource/assess")
-public class BizBusinessOutsourceAssessController {
+public class BizBusinessOutsourceAssessController extends GeneralApprovalController<BizBusinessOutsourceAssess, BizBusinessOutsourceAssess, OutsourceAssessApprovalListRequest, BaseApprovalSubmitRequest> {
+    @Autowired
+    private IBizBusinessOutsourceAssessService outsourceAssessService;
 
+    public BizBusinessOutsourceAssessController(IGeneralApprovalService<BizBusinessOutsourceAssess, BizBusinessOutsourceAssess, OutsourceAssessApprovalListRequest, BaseApprovalSubmitRequest> baseApprovalService) {
+        super(baseApprovalService);
+    }
+
+    @ApiOperation("草稿箱-保存")
+    @PostMapping("/save")
+    public ReturnDTO<OutsourceAssessSaveResponse> saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceAssess request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        return outsourceAssessService.saveOutsourceAssess(request);
+    }
+
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception {
+        List<BizBusinessOutsourceAssess> list = super.exportList(request);
+        super.exportExcel(BizBusinessOutsourceAssess.class, list, ExportEnum.OUTSOURCE_ASSESS.getSheetName());
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java
new file mode 100644
index 0000000..9adef18
--- /dev/null
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java
@@ -0,0 +1,60 @@
+package com.casic.missiles.controller.business;
+
+import com.casic.missiles.controller.GeneralApprovalController;
+import com.casic.missiles.dto.BaseApprovalSubmitRequest;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.business.outsource.OutsourceProtocolApprovalListRequest;
+import com.casic.missiles.dto.business.outsource.OutsourceProtocolSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
+import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.model.business.BizBusinessOutsourceProtocol;
+import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
+import com.casic.missiles.service.IGeneralApprovalService;
+import com.casic.missiles.service.business.IBizBusinessOutsourceProtocolService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.BindingResult;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.validation.Valid;
+import java.util.List;
+
+/**
+ * <p>
+ * 计量检定业务-分包管理-测试、校准或检定工作分包协议书 前端控制器
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-08-24
+ */
+@Api(tags = "分包管理-测试、校准或检定工作分包协议书")
+@RestController
+@RequestMapping("/business/outsource/protocol")
+public class BizBusinessOutsourceProtocolController extends GeneralApprovalController<BizBusinessOutsourceProtocol, BizBusinessOutsourceProtocol, OutsourceProtocolApprovalListRequest, BaseApprovalSubmitRequest> {
+    @Autowired
+    private IBizBusinessOutsourceProtocolService outsourceProtocolService;
+
+    public BizBusinessOutsourceProtocolController(IGeneralApprovalService<BizBusinessOutsourceProtocol, BizBusinessOutsourceProtocol, OutsourceProtocolApprovalListRequest, BaseApprovalSubmitRequest> baseApprovalService) {
+        super(baseApprovalService);
+    }
+
+    @ApiOperation("草稿箱-保存")
+    @PostMapping("/save")
+    public ReturnDTO<OutsourceProtocolSaveResponse> saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceProtocol request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        return outsourceProtocolService.saveOutsourceProtocol(request);
+    }
+
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody OutsourceProtocolApprovalListRequest request) throws Exception {
+        List<BizBusinessOutsourceProtocol> list = super.exportList(request);
+        super.exportExcel(BizBusinessOutsourceProtocol.class, list, ExportEnum.OUTSOURCE_PROTOCOL.getSheetName());
+    }
+}
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java
index 097f645..f0f0943 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java
@@ -17,7 +17,6 @@
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.IGeneralApprovalService;
 import com.casic.missiles.service.business.IBizBusinessOutsourcerInfoService;
-import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -71,19 +70,8 @@
 
     @ApiOperation("分包方导出")
     @PostMapping("/listExport")
-    public void export(@RequestBody @Valid OutsourcerInfoApprovalListRequest request, BindingResult bindingResult) throws Exception {
-        if (bindingResult.hasErrors()) {
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        }
-        List<BizBusinessOutsourcerInfo> list;
-        if (!CollectionUtils.isEmpty(request.getIds())) {
-            list = outsourcerInfoService.listByIds(request.getIds());
-        } else {
-            list = outsourcerInfoService.list(request);
-        }
-        for (BizBusinessOutsourcerInfo record : list) {
-            DictCodeUtils.convertDictCodeToName(record);
-        }
+    public void export(@RequestBody OutsourcerInfoApprovalListRequest request) throws Exception {
+        List<BizBusinessOutsourcerInfo> list = super.exportList(request);
         super.exportExcel(BizBusinessOutsourcerInfo.class, list, ExportEnum.OUTSOURCER_EXPORT.getSheetName());
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java
index c2cbf9f..0410918 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java
@@ -17,11 +17,9 @@
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.IGeneralApprovalService;
 import com.casic.missiles.service.business.IBizBusinessSiteExecutiveInfoService;
-import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -60,7 +58,7 @@
         return siteExecutiveInfoService.saveSiteExecutiveInfo(siteExecutiveInfo);
     }
 
-    @ApiOperation("现场检测详情")
+    @ApiOperation("详情")
     @PostMapping("/detail")
     public ReturnDTO<SiteExecutiveDetailResponse> siteExecutiveDetail(@RequestBody @Valid IdDTO idDTO) throws Exception {
         Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
@@ -69,21 +67,10 @@
         return ReturnUtil.success(siteExecutiveInfoService.detail(idDTO.getId()));
     }
 
-    @ApiOperation("现场检测导出")
+    @ApiOperation("导出")
     @PostMapping("/listExport")
-    public void export(@RequestBody @Valid SiteExecutiveApprovalListRequest request, BindingResult bindingResult) throws Exception {
-        if (bindingResult.hasErrors()) {
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        }
-        List<SiteExecutiveApprovalListResponse> list;
-        if (!CollectionUtils.isEmpty(request.getIds())) {
-            list = siteExecutiveInfoService.listInfoByIds(request.getIds());
-        } else {
-            list = siteExecutiveInfoService.listInfo(request);
-        }
-        for (SiteExecutiveApprovalListResponse record : list) {
-            DictCodeUtils.convertDictCodeToName(record);
-        }
+    public void export(@RequestBody SiteExecutiveApprovalListRequest request) throws Exception {
+        List<SiteExecutiveApprovalListResponse> list = super.exportList(request);
         super.exportExcel(SiteExecutiveApprovalListResponse.class, list, ExportEnum.SITE_EXECUTIVE_EXPORT.getSheetName());
     }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
index 7e793cd..a92e209 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
@@ -55,7 +55,7 @@
 
     @ApiOperation("设备收发列表导出")
     @PostMapping("/export")
-    public void exportList(@RequestBody @Valid SampleDispatchListRequest request) throws IOException {
+    public void exportList(@RequestBody SampleDispatchListRequest request) throws IOException {
         List<SampleDispatchListResponse> list;
         if (!CollectionUtils.isEmpty(request.getIds())) {
             list = dispatchService.listByIds(request.getIds());
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java
index cdc77fc..d120fd4 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java
@@ -7,6 +7,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.business.labExecutive.*;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.business.IBusinessLabExecutiveInfoService;
@@ -14,6 +15,7 @@
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.*;
 
@@ -32,7 +34,7 @@
     @Autowired
     private IBusinessLabExecutiveInfoService labExecutiveInfoService;
 
-    @ApiOperation("实验室检测-部门检测-查询各状态列表（待检测、检测中、检测完）")
+    @ApiOperation("实验室任务-查询各状态列表（待检测、检测中、检测完）")
     @PostMapping("/deptExecutive/List")
     public ReturnDTO<PageInfoBT<SampleLabExecutiveListResponse>> queryDeptExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
@@ -43,10 +45,19 @@
         return ReturnUtil.success(super.packForBT(labExecutiveInfoService.deptLabExecutiveListPage(page, labExecutiveListRequest)));
     }
 
-    /**
-     * 实验室检测-我的检测-查询各状态列表（待检测、检测中、检测完）
-     */
-    @ApiOperation("实验室检测-我的检测-查询各状态列表（待检测、检测中、检测完）")
+    @ApiOperation("实验室任务导出")
+    @PostMapping("/deptExecutive/export")
+    public void deptExportList(@RequestBody @Valid SampleLabExecutiveListRequest request) throws Exception {
+        List<SampleLabExecutiveListResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = labExecutiveInfoService.deptLabExecutiveListByIds(request.getMeasureStatus(), request.getIds());
+        } else {
+            list = labExecutiveInfoService.deptLabExecutiveList(request);
+        }
+        super.exportExcel(SampleLabExecutiveListResponse.class, list, ExportEnum.DEPT_EXECUTIVE_TASK.getSheetName());
+    }
+
+    @ApiOperation("我的任务-查询各状态列表（待检测、检测中、检测完）")
     @PostMapping("/myExecutive/list")
     public ReturnDTO<PageInfoBT<SampleLabExecutiveListResponse>> queryMyExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
@@ -57,19 +68,25 @@
         return ReturnUtil.success(super.packForBT(labExecutiveInfoService.myLabExecutiveListPage(page, labExecutiveListRequest)));
     }
 
-    /**
-     * 实验室检测-我的检测-查询各状态样品数量（待检测、检测中、检测完）
-     */
-    @ApiOperation("实验室检测-我的检测-查询各状态样品数量（待检测、检测中、检测完）")
+    @ApiOperation("我的任务导出")
+    @PostMapping("/myExecutive/export")
+    public void exportList(@RequestBody @Valid SampleLabExecutiveListRequest request) throws Exception {
+        List<SampleLabExecutiveListResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = labExecutiveInfoService.myLabExecutiveListByIds(request.getMeasureStatus(), request.getIds());
+        } else {
+            list = labExecutiveInfoService.myLabExecutiveList(request);
+        }
+        super.exportExcel(SampleLabExecutiveListResponse.class, list, ExportEnum.MY_EXECUTIVE_TASK.getSheetName());
+    }
+
+    @ApiOperation("我的任务-查询各状态样品数量（待检测、检测中、检测完）")
     @GetMapping("/myExecutive/amount")
     public ReturnDTO<List<SampleAmountResponse>> queryMyExecutiveAmount() {
         return ReturnUtil.success(labExecutiveInfoService.myExecutiveAmount());
     }
 
-    /**
-     * 实验室检测-部门检测-分配（分配给具体人员）
-     */
-    @ApiOperation("实验室检测-部门检测-分配按钮（分配给具体人员）")
+    @ApiOperation("实验室任务-分配按钮（分配给具体人员）")
     @PostMapping("/deptExecutive/allocate")
     public ReturnDTO allocateStaff(@RequestBody @Valid SampleAllocateRequest sampleAllocateRequest, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -78,10 +95,7 @@
         return labExecutiveInfoService.allocateStaff(sampleAllocateRequest);
     }
 
-    /**
-     * 实验室检测-我的检测-检定人扫描收入（待检测->检测中）
-     */
-    @ApiOperation("实验室检测-我的检测-检定人扫描收入（待检测->检测中）")
+    @ApiOperation("我的任务-检定人扫描收入（待检测->检测中）")
     @PostMapping("/myExecutive/receive")
     public ReturnDTO sampleReceive(@RequestBody @Valid List<SampleOperateRequest> requestList, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -90,10 +104,7 @@
         return labExecutiveInfoService.sampleReceive(requestList);
     }
 
-    /**
-     * 实验室检测-负责人/检定人扫描检完（检测中->检测完）
-     */
-    @ApiOperation("实验室检测-负责人/检定人扫描检完（检测中->检测完）")
+    @ApiOperation("实验室任务-负责人/检定人扫描检完（检测中->检测完）")
     @PostMapping("/myExecutive/complete")
     public ReturnDTO sampleExecutiveComplete(@RequestBody @Valid List<SampleOperateRequest> requestList, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -102,10 +113,7 @@
         return labExecutiveInfoService.sampleExecutiveComplete(requestList);
     }
 
-    /**
-     * 实验室检测-部门检测/我的检测 编辑（只能修改应出具证书）
-     */
-    @ApiOperation("实验室检测-部门检测/我的检测 编辑（只能修改应出具证书）")
+    @ApiOperation("实验室任务/我的任务 编辑（只能修改应出具证书）")
     @PostMapping("/executive/update")
     public ReturnDTO updateExecutive(@RequestBody @Valid UpdateExecutiveRequest request, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -114,10 +122,7 @@
         return labExecutiveInfoService.updateExecutive(request);
     }
 
-    /**
-     * 实验室检测-部门检测/我的检测 详情
-     */
-    @ApiOperation("实验室检测-部门检测/我的检测 详情")
+    @ApiOperation("实验室任务/我的任务 详情")
     @PostMapping("/executive/detail")
     public ReturnDTO<ExecutiveDetailResponse> executiveDetail(@RequestBody @Valid ExecutiveDetailRequest request, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
@@ -131,7 +136,7 @@
      * 退回后会将下一个要执行的实验室检测状态更新为待分配，将后面的实验室顺序变更为连续（都进行减1）
      * 最后一个检测的实验室退回，等分发员再增加实验室或设备收发中的已收入直接手动点击完成
      */
-    @ApiOperation("实验室检测-部门检测/我的检测 退回（待检测/检测中->退回）")
+    @ApiOperation("实验室任务/我的任务 退回（待检测/检测中->退回）")
     @PostMapping("/executive/sendBack")
     public ReturnDTO executiveSendBack(@RequestBody @Valid ExecutiveSendBackRequest request, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -140,9 +145,6 @@
         return labExecutiveInfoService.sampleExecutiveSendBack(request);
     }
 
-    /**
-     * 分发员编辑实验室检测列表
-     */
     @ApiOperation("分发员编辑实验室检测列表")
     @PostMapping("/handOut/updateList")
     public ReturnDTO updateExecutiveList(@RequestBody @Valid UpdateExecutiveListRequest request, BindingResult bindingResult) {
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java
index 48a67ed..0c04f31 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java
@@ -10,6 +10,7 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.resource.customer.CustomerApprovalListRequest;
 import com.casic.missiles.dto.resource.customer.CustomerSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceCustomerInfo;
@@ -26,6 +27,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -55,6 +57,13 @@
         return customerInfoService.saveCustomerInfo(request);
     }
 
+    @ApiOperation("委托方名录导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody CustomerApprovalListRequest request) throws Exception {
+        List<BizResourceCustomerInfo> list = super.exportList(request);
+        super.exportExcel(BizResourceCustomerInfo.class, list, ExportEnum.CUSTOMER_INFO.getSheetName());
+    }
+
     @ApiOperation("委托方人员列表（分页）")
     @PostMapping("/person/listPage")
     public ReturnDTO<PageInfoBT<BizResourceCustomerStaff>> personListPage(@RequestBody IdDTO idDto) {
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
index 972ed4b..6418ea5 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
@@ -5,6 +5,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.resource.customer.SuggestFormApprovalListRequest;
 import com.casic.missiles.dto.resource.customer.SuggestFormSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceCustomerSuggestForm;
@@ -20,6 +21,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -50,4 +52,11 @@
         return suggestFormService.saveSuggestForm(request);
     }
 
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody SuggestFormApprovalListRequest request) throws Exception {
+        List<BizResourceCustomerSuggestForm> list = super.exportList(request);
+        super.exportExcel(BizResourceCustomerSuggestForm.class, list, ExportEnum.CUSTOMER_SUGGEST_FORM.getSheetName());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java
index 1934d1a..9e07eab 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java
@@ -15,12 +15,16 @@
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.resource.IEnvEnvironmentRecordConfigService;
 import com.casic.missiles.service.resource.IEnvEnvironmentRecordDataService;
+import com.casic.missiles.service.resource.IEnvLocationInfoService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
 import java.util.List;
@@ -39,6 +43,8 @@
     private IEnvEnvironmentRecordDataService environmentRecordDataService;
     @Autowired
     private IEnvEnvironmentRecordConfigService environmentRecordConfigService;
+    @Autowired
+    private IEnvLocationInfoService locationInfoService;
 
     @ApiOperation("环境记录单数据列表/详情")
     @PostMapping("/data/listPage")
@@ -95,4 +101,11 @@
         });
         return environmentRecordConfigService.deleteEnvironmentRecordConfig(idDTO.getId());
     }
+
+    @ApiOperation("地点列表")
+    @PostMapping("/location/listPage")
+    public ReturnDTO<PageInfoBT<LocationListResponse>> locationListPage(@RequestBody @Valid LocationListRequest request) {
+        Page<LocationListResponse> page = PageFactory.defaultPage();
+        return ReturnUtil.success(super.packForBT(locationInfoService.listPage(page, request)));
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java
index 82efe3f..e9561fa 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java
@@ -10,6 +10,7 @@
 import com.casic.missiles.dto.resource.seal.SealLogListRequest;
 import com.casic.missiles.dto.resource.seal.SealNoteApprovalListRequest;
 import com.casic.missiles.dto.resource.seal.SealNoteSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceSealUseLog;
@@ -27,6 +28,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -58,6 +60,13 @@
         return sealUseNoteService.saveSeal(request);
     }
 
+    @ApiOperation("印章使用登记导出（列表和导出中去掉经办人和监印人）")
+    @PostMapping("/listExport")
+    public void export(@RequestBody SealNoteApprovalListRequest request) throws Exception {
+        List<BizResourceSealUseNote> list = super.exportList(request);
+        super.exportExcel(BizResourceSealUseNote.class, list, ExportEnum.SEAL_NOTE.getSheetName());
+    }
+
     // TODO: 2023/7/28 印章使用日志：系统中使用印章时插入数据库
 
     @ApiOperation("印章使用日志列表（分页）")
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java
index 9b674fc..06b6521 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java
@@ -9,16 +9,20 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.resource.staff.StaffCertRequest;
 import com.casic.missiles.dto.resource.staff.StaffCertResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.service.resource.IBizResourceStaffInfoService;
 import com.casic.missiles.service.resource.IBizResourceStaffVerifierService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.List;
+
 /**
  * @Description:
  * @Author: wangpeng
@@ -41,9 +45,21 @@
         return ReturnUtil.success(super.packForBT(responsePage));
     }
 
+    @ApiOperation("证书逾期提醒导出")
+    @PostMapping("/listExport")
+    public void exportList(@RequestBody StaffCertRequest request) throws Exception {
+        List<StaffCertResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = staffInfoService.certListByIds(request.getIds());
+        } else {
+            list = staffInfoService.certList(request);
+        }
+        super.exportExcel(StaffCertResponse.class, list, ExportEnum.STAFF_CERTIFICATE_EXPIRE.getSheetName());
+    }
+
     @ApiOperation("证书逾期提醒")
     @PostMapping("/expirationReminder")
-    public ReturnDTO expirationReminder(@RequestBody IdDTO idDto) {
-        return verifierService.expirationReminder(idDto);
+    public ReturnDTO expirationReminder(@RequestBody IdDTO idDTO) {
+        return verifierService.expirationReminder(idDTO);
     }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java
index 3b251ad..a6e7850 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java
@@ -12,6 +12,7 @@
 import com.casic.missiles.dto.resource.staff.StaffListRequest;
 import com.casic.missiles.dto.resource.staff.TrainListRequest;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.*;
@@ -22,7 +23,10 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
 import java.util.List;
@@ -52,8 +56,19 @@
             throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
         }
         Page<BizResourceStaffInfo> page = PageFactory.defaultPage();
-        Page<BizResourceStaffInfo> responsePage = staffInfoService.listPage(page, request);
-        return ReturnUtil.success(super.packForBT(responsePage));
+        return ReturnUtil.success(super.packForBT(staffInfoService.listPage(page, request)));
+    }
+
+    @ApiOperation("人员登记导出")
+    @PostMapping("/listExport")
+    public void exportList(@RequestBody StaffListRequest request) throws Exception {
+        List<BizResourceStaffInfo> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = staffInfoService.listByIds(request.getIds());
+        } else {
+            list = staffInfoService.list(request);
+        }
+        super.exportExcel(BizResourceStaffInfo.class, list, ExportEnum.STAFF_INFO.getSheetName());
     }
 
     @ApiOperation("人员登记详情基础信息")
@@ -85,9 +100,9 @@
 
     @ApiOperation("科研教育列表（分页）")
     @PostMapping("/education/listPage")
-    public ReturnDTO<PageInfoBT<BizResourceStaffEducation>> educationListPage(@RequestBody IdDTO idDto) {
+    public ReturnDTO<PageInfoBT<BizResourceStaffEducation>> educationListPage(@RequestBody IdDTO idDTO) {
         Page<BizResourceStaffEducation> page = PageFactory.defaultPage();
-        Page<BizResourceStaffEducation> responsePage = staffInfoService.educationListPage(page, idDto);
+        Page<BizResourceStaffEducation> responsePage = staffInfoService.educationListPage(page, idDTO);
         return ReturnUtil.success(super.packForBT(responsePage));
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java
index af6aa86..d85d84a 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java
@@ -9,6 +9,7 @@
 import com.casic.missiles.dto.resource.outsideService.SupplierApprovalListRequest;
 import com.casic.missiles.dto.resource.outsideService.SupplierSaveResponse;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceSupplierAbility;
@@ -67,6 +68,13 @@
         return ReturnUtil.success(supplierInfoService.detail(idDTO.getId()));
     }
 
+    @ApiOperation("合格供方导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody SupplierApprovalListRequest request) throws Exception {
+        List<BizResourceSupplierInfo> list = super.exportList(request);
+        super.exportExcel(BizResourceSupplierInfo.class, list, ExportEnum.SUPPLIER_INFO.getSheetName());
+    }
+
     @ApiOperation("供方人员列表（分页）")
     @PostMapping("/person/listPage")
     public ReturnDTO<PageInfoBT<BizResourceSupplierPerson>> personListPage(@RequestBody IdDTO idDTO) {
diff --git a/casic-metering-api/src/main/resources/config/application.yml b/casic-metering-api/src/main/resources/config/application.yml
index 350db5f..ecff521 100644
--- a/casic-metering-api/src/main/resources/config/application.yml
+++ b/casic-metering-api/src/main/resources/config/application.yml
@@ -126,7 +126,7 @@
     #作者
     author: wangpeng
     #待生成对象表名
-    table-name: biz_equipment_technical_target_approval,biz_equipment_attachment_approval,biz_equipment_checkpoint_approval
+    table-name: biz_business_outsource_protocol
 
 reminder:
   #节点--common模块config包 ReminderNodeConfig配置
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
index 4a19e4e..d47d552 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
@@ -53,6 +53,7 @@
     SUGGEST_FORM_SAVE_FAILED(2509, "委托方意见登记表保存至草稿箱失败"),
     EXAMINE_FORM_SAVE_FAILED(2510, "要求、委托书及合同评审表保存至草稿箱失败"),
     CUSTOMER_EXIST_SAVE_FAILED(2511, "该委托方已存在，请重新选择"),
+    DUPLICATE_LOCATION_NO(2512, "地点编号已存在"),
 
     /**
      * 计量检定业务模块
@@ -68,6 +69,8 @@
     COMPLETE_SAMPLE_NOT_EXIST(2609, "检测中不存在扫描收入的样品"),
     CANNOT_CHANGE_MEASURE_INFO(2610, "无法更改非当前登录用户的检测信息"),
     NON_EXIST_ORDER_OR_SAMPLE(2611, "不存在该委托单或该委托单下的样品"),
+    OUTSOURCE_ACCESS_SAVE_FAILED(2612, "测试、校准或检定工作分包评审表保存至草稿箱失败"),
+    OUTSOURCE_PROTOCOL_SAVE_FAILED(2613, "测试、校准或检定工作分包协议书保存至草稿箱失败"),
 
     /**
      * 历史遗留备用
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
index 5089ad1..81a406b 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
@@ -10,54 +10,38 @@
     /**
      * 资源管理
      */
-    ENVIRONMENT_DATA_EXPORT("environmentData", "environmentData", "环境记录单数据"),
+    ENVIRONMENT_DATA_EXPORT("environmentData", "环境记录单数据", "环境记录单数据"),
+    STAFF_INFO("staffInfo", "人员登记", "人员登记"),
+    STAFF_CERTIFICATE_EXPIRE("certificateExpire", "证书逾期提醒", "证书逾期提醒"),
+    SUPPLIER_INFO("supplierInfo", "合格供方名录", "合格供方名录"),
+    CUSTOMER_INFO("customerInfo", "委托方名录", "委托方名录"),
+    CUSTOMER_SUGGEST_FORM("customerSuggestForm", "委托方意见登记表", "委托方意见登记表"),
+    SEAL_NOTE("sealNote", "印章使用登记", "印章使用登记"),
 
-    FILE_EXPORT("meterFileData", "meterFileData", "计量文件信息"),
-    TRAIN_PLAN_EXPORT("trainPlanData", "trainPlanData", "培训计划"),
-    TRAIN_LOG_EXPORT("trainLogData", "trainLogData", "培训记录"),
-    METER_ORGANIZE_EXPORT("meterOrganizeData", "meterOrganizeData", "计量组织"),
-    TRACE_SUPPLIER_EXPORT("traceSupplierData", "traceSupplierData", "溯源供方"),
-    SIGN_EXPORT("signData", "signData", "签名/签章"),
-    TEMPLATE_EXPORT("templateData", "templateData", "原始记录模板/证书报告模板"),
-    FIXED_ASSETS("meterFixedAssets", "meterFixedAssets", "固定资产"),
-    METER_EQUIPMENT("meterEquipment", "meterEquipment", "测量设备"),
-    CALIBRATION_TEST_EQUIPMENT("calibrationTestEquipment", "calibrationTestEquipment", "校准检定设备"),
-    MEASURE_ACCOUNT("measureAccount", "measureAccount", "测量工装"),
-    STANDARD_SUPPORT_EQUIPMENT("standardSupportEquipment", "standardSupportEquipment", "标准配套设备"),
-    STANDARD_EQUIPMENT("standardEquipment", "standardEquipment", "标准装置"),
-    FLOW_DEF_EXPORT("flowDefData", "flowDefData", "流程定义"),
-    STAFF_CERTIFICATE("certificate", "certificate", "计量人员证书"),
-    CHECK_INFO("checkInfo", "checkInfo", "设备管理点检测"),
-    EQUIPMENT_APPLY("equipmentApply", "equipmentApply", "设备借用"),
-    STANDARD_EQUIPMENT_REMIND("equipmentApplyRemind", "equipmentApplyRemind", "标准装置到期提醒"),
-    METER_PRICE("meterPrice", "meterPrice", "价格库"),
-    METER_STAFF("meterStaff", "meterStaff", "计量人员"),
-    STANDARD_EQUIPMENT_APPLY("standardEquipmentApply", "standardEquipmentApply", "标准装置申请"),
-    STATE_MANAGE_APPLY("stateManage", "stateManage", "状态管理"),
-    METER_ACCEPTANCE_CHECK("acceptanceCheck", "acceptanceCheck", "设备检修保养验收单"),
-    CUSTOMER_EXPORT("customerData", "customerData", "客户信息"),
-    ORDER_EXPORT("orderData", "orderData", "委托书信息"),
-    SAMPLE_EXPORT("sampleData", "sampleData", "样本信息"),
-    EXCHANGE_DATA("exchangeData", "exchangeData", "设备交接单"),
-    DISPATCH_DATA("dispatchData", "dispatchData", "设备收发"),
-    ENVIRONMENT_DATA("environmentData", "environmentData", "环境记录单"),
-    ORIGIN_DATA("originData", "originData", "原始记录"),
-    CERTIFICATE_REPORT("certificateReport", "certificateReport", "证书报告"),
-    ADVICE_EXPORT("adviceData", "adviceData", "客户反馈"),
-    HANDOUT_EXPORT("handoutData", "handoutData", "任务分发列表"),
-    OUTSOURCER_EXPORT("outsourcerData", "outsourcerData", "分包方"),
-    SITE_EXECUTIVE_EXPORT("siteExecutiveData", "siteExecutiveData", "现场测试、校准或检定"),
-    CERTIFICATE_PRINT_EXPORT("certificatePrintData", "certificatePrintData", "证书打印"),
-    DOWNLOAD_TEMPLATE("downloadTemplate", "downloadTemplate", "页面配置"),
-    OUTSOURCER_CERTIFICATE_EXPORT("outsourceCertificateData", "outsourceCertificateData", "分包证书"),
-    SETTLEMENT_INFO_EXPORT("settlementInfoData", "settlementInfoData", "业务结算"),
-    EQUIPMENT_REMIND("equipmentRemind", "equipmentRemind", "设备到期提醒"),
-    AGREEMENT_INFO_EXPORT("agreementInfoData", "agreementInfoData", "合同"),
-    WORK_STATISTICS_EXPORT("workStatisticsData", "workStatisticsData", "实时工作统计"),
-    DEPT_OUTPUT_EXPORT("deptOutputData", "deptOutputData", "部门产值分析"),
-    WORKLOAD_EXPORT("workloadData", "workloadData", "业务工作量分析"),
-    DEPT_COMPREHENSIVE_EXPORT("deptComprehensiveData", "deptComprehensiveData", "部门综合分析"),
-    ENVIRONMENTAL_RECORD("environmentalRecordData", "environmentalRecordData", "现场环境记录");
+    /**
+     * 计量检定业务
+     */
+    OUTSOURCER_EXPORT("outsourcerData", "分包方名录", "分包方名录"),
+    IDENTIFY_EXPORT("identifyData", "计量标识", "计量标识"),
+    ORDER_EXPORT("orderData", "任务单", "任务单"),
+    DISPATCH_DATA("dispatchData", "设备收发", "设备收发"),
+    HANDOUT_EXPORT("handoutData", "任务分发", "任务分发"),
+    SITE_EXECUTIVE_EXPORT("siteExecutiveData", "现场测试、校准或检定", "现场测试、校准或检定"),
+    CERTIFICATE_REPORT("certificateReport", "证书审批", "证书审批"),
+    CERTIFICATE_CHANGE_APPLY("certificateChangeApply", "证书报告补充或更换申请单", "证书报告补充或更换申请单"),
+    CERTIFICATE_PRINT("certificatePrintData", "证书打印审批", "证书打印审批"),
+    DEPT_EXECUTIVE_TASK("deptExecutiveTaskData", "实验室任务", "实验室任务"),
+    MY_EXECUTIVE_TASK("myExecutiveTaskData", "我的任务", "我的任务"),
+    OUTSOURCE_ASSESS("outsourceAssess", "测试、校准或检定工作分包评审表", "测试、校准或检定工作分包评审表"),
+    OUTSOURCE_PROTOCOL("outsourceProtocol", "测试、校准或检定工作分包协议书", "测试、校准或检定工作分包协议书"),
+
+    /**
+     * 系统管理
+     */
+    SIGN_EXPORT("signData", "签名", "签名"),
+    TEMPLATE_EXPORT("templateData", "文件模板", "文件模板"),
+    FLOW_DEF_EXPORT("flowDefData", "流程定义", "流程定义"),
+    DOWNLOAD_TEMPLATE("downloadTemplate", "流程定义", "页面配置");
 
     ExportEnum(String fileName, String sheetName, String description) {
         this.fileName = fileName;
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateRecordTypeCodeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateRecordTypeCodeEnum.java
index 31d913c..a963522 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateRecordTypeCodeEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateRecordTypeCodeEnum.java
@@ -46,4 +46,14 @@
     String SITE_EXECUTIVE_APPROVAL = "01";
     //《现场测试、校准或检定工作记录表》
     String SITE_EXECUTIVE_LOG = "02";
+
+    //测试、校准或检定工作分包协议书
+    String OUTSOURCE_PROTOCOL = "01";
+    //测试、校准或检定工作分包评审表
+    String OUTSOURCE_ACCESS = "02";
+    //测试、校准或检定工作分包通知书
+    String OUTSOURCE_NOTICE = "03";
+    //测试、校准或检定工作分包方名录
+    String OUTSOURCE_INFO = "04";
+
 }
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
index 24b8635..f78bd53 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
@@ -15,6 +15,10 @@
     String CERTIFICATE_CHANGE_APPLY_BEAN_NAME = "certificateChangeApplyBean";
     //现场测试、校准或检定
     String SITE_EXECUTIVE_BEAN_NAME = "siteExecutiveBean";
+    //测试、校准或检定工作分包评审表
+    String OUTSOURCE_ASSESS_BEAN_NAME = "outsourceAssessBean";
+    //测试、校准或检定工作分包协议书
+    String OUTSOURCE_PROTOCOL_BEAN_NAME = "outsourceProtocolBean";
 
     /*********************************设备与装置************************************/
     //设备台账
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 b21c661..6b86fd1 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
@@ -18,6 +18,8 @@
     OUTSOURCER_APPROVAL(OUTSOURCER_BEAN_NAME, ""),
     CERTIFICATE_CHANGE_APPROVAL(CERTIFICATE_CHANGE_APPLY_BEAN_NAME, ""),
     SITE_EXECUTIVE_APPROVAL(SITE_EXECUTIVE_BEAN_NAME, ""),
+    OUTSOURCE_ASSESS_APPROVAL(OUTSOURCE_ASSESS_BEAN_NAME, ""),
+    OUTSOURCE_PROTOCOL_APPROVAL(OUTSOURCE_PROTOCOL_BEAN_NAME, ""),
 
     ACTION_STATUS_MAP(new HashMap<String, AwareActionStatusEnum>() {
         {
@@ -47,6 +49,10 @@
             put(ApplyFromIdEnum.CERTIFICATE_CHANGE_APPROVAL.getCode(), CERTIFICATE_CHANGE_APPROVAL);
             //现场测试、校准或检定审批
             put(ApplyFromIdEnum.SITE_EXECUTIVE_APPROVAL.getCode(), SITE_EXECUTIVE_APPROVAL);
+            //测试、校准或检定工作分包评审表
+            put(ApplyFromIdEnum.OUTSOURCE_ASSESS_APPROVAL.getCode(), OUTSOURCE_ASSESS_APPROVAL);
+            //测试、校准或检定工作分包协议书
+            put(ApplyFromIdEnum.OUTSOURCE_PROTOCOL_APPROVAL.getCode(), OUTSOURCE_PROTOCOL_APPROVAL);
         }
     });
     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 934405e..c7410bd 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
@@ -9,6 +9,8 @@
     CERTIFICATE_CHANGE_APPROVAL("jljdywzsbchghsqd", MessageSourceModuleEnum.BUSINESS.getCode(), "证书/报告补充或更换申请单"),
     OUTSOURCER_APPROVAL("jljdywcsjzhgfbfml", MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定合格分包方名录"),
     SITE_EXECUTIVE_APPROVAL("jljdywxccsjzsp", MessageSourceModuleEnum.BUSINESS.getCode(), "现场测试、校准或检定审批"),
+    OUTSOURCE_ASSESS_APPROVAL("jljdywcsjzfbpsb", MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包评审表"),
+    OUTSOURCE_PROTOCOL_APPROVAL("jljdywcsjzfbxys", MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包协议书"),
 
 
     /*******************************************设备与装置*********************************************/
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/GeneralApprovalMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/GeneralApprovalMapper.java
index 4fb7344..0c9d6ae 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/GeneralApprovalMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/GeneralApprovalMapper.java
@@ -17,8 +17,4 @@
 
     Page<O> selectBatchForApprovalList(Page<O> page, @Param("request") R request, @Param("businessKeys") List<String> businessKeys);
 
-//    Page<O> selectListPage(Page<O> page, @Param("request") R request);
-
-//    Long selectMaxNo();
-
 }
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceAssessMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceAssessMapper.java
index 7867bb8..ba59009 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceAssessMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceAssessMapper.java
@@ -1,7 +1,12 @@
 package com.casic.missiles.mapper.business;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.business.outsource.OutsourceAssessApprovalListRequest;
+import com.casic.missiles.mapper.GeneralApprovalMapper;
 import com.casic.missiles.model.business.BizBusinessOutsourceAssess;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * <p>
@@ -11,6 +16,10 @@
  * @author wangpeng
  * @since 2023-08-16
  */
-public interface BizBusinessOutsourceAssessMapper extends BaseMapper<BizBusinessOutsourceAssess> {
+public interface BizBusinessOutsourceAssessMapper extends GeneralApprovalMapper<BizBusinessOutsourceAssess, BizBusinessOutsourceAssess, OutsourceAssessApprovalListRequest> {
+
+    Page<BizBusinessOutsourceAssess> selectBatchForApprovalList(Page<BizBusinessOutsourceAssess> page, @Param("request") OutsourceAssessApprovalListRequest request, @Param("businessKeys") List<String> businessKeys);
+
+    Long selectMaxProjectNo();
 
 }
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceProtocolMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceProtocolMapper.java
new file mode 100644
index 0000000..e6aba35
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceProtocolMapper.java
@@ -0,0 +1,24 @@
+package com.casic.missiles.mapper.business;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.business.outsource.OutsourceProtocolApprovalListRequest;
+import com.casic.missiles.mapper.GeneralApprovalMapper;
+import com.casic.missiles.model.business.BizBusinessOutsourceProtocol;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 计量检定业务-分包管理-测试、校准或检定工作分包协议书 Mapper 接口
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-08-24
+ */
+public interface BizBusinessOutsourceProtocolMapper extends GeneralApprovalMapper<BizBusinessOutsourceProtocol, BizBusinessOutsourceProtocol, OutsourceProtocolApprovalListRequest> {
+
+    Page<BizBusinessOutsourceProtocol> selectBatchForApprovalList(Page<BizBusinessOutsourceProtocol> page, @Param("request") OutsourceProtocolApprovalListRequest request, @Param("businessKeys") List<String> businessKeys);
+
+    Long selectMaxProtocolNo();
+}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/EnvLocationInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/EnvLocationInfoMapper.java
new file mode 100644
index 0000000..49eff87
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/EnvLocationInfoMapper.java
@@ -0,0 +1,21 @@
+package com.casic.missiles.mapper.resource;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.resource.environment.LocationListRequest;
+import com.casic.missiles.dto.resource.environment.LocationListResponse;
+import com.casic.missiles.model.resource.EnvLocationInfo;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * <p>
+ * 实验室环境监控系统-设备表 Mapper 接口
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-06-07
+ */
+public interface EnvLocationInfoMapper extends BaseMapper<EnvLocationInfo> {
+
+    Page<LocationListResponse> selectLocationListPage(Page<LocationListResponse> page, @Param("request") LocationListRequest request);
+}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java
index de124db..85ed0f7 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java
@@ -1,7 +1,9 @@
 package com.casic.missiles.mapper.system;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.dto.system.SignDetailResponse;
+import com.casic.missiles.dto.system.SignListRequest;
 import com.casic.missiles.model.system.SystemSign;
 import org.apache.ibatis.annotations.Param;
 
@@ -22,4 +24,8 @@
     SignDetailResponse selectSignDetailById(Long id);
 
     List<SystemSign> selectUsableSignList(@Param("userId") Long userId);
+
+    Page<SystemSign> selectSignListPage(Page<SystemSign> page, @Param("request") SignListRequest request);
+
+    List<SystemSign> selectSignList(@Param("request") SignListRequest request);
 }
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateChangeApplyMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateChangeApplyMapper.xml
index d798447..c496092 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateChangeApplyMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateChangeApplyMapper.xml
@@ -30,31 +30,31 @@
         SELECT *
         FROM biz_business_certificate_change_apply
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.changeApplyNo != null and request.changeApplyNo !=''">
+        <if test="request != null and request.changeApplyNo != null and request.changeApplyNo !=''">
             and change_apply_no like concat('%',#{request.changeApplyNo},'%')
         </if>
-        <if test="request.changeReportNo != null and request.changeReportNo !=''">
+        <if test="request != null and request.changeReportNo != null and request.changeReportNo !=''">
             and change_report_no like concat('%',#{request.changeReportNo},'%')
         </if>
-        <if test="request.changeReportName != null and request.changeReportName !=''">
+        <if test="request != null and request.changeReportName != null and request.changeReportName !=''">
             and change_report_name like concat('%',#{request.changeReportName},'%')
         </if>
-        <if test="request.changeType != null and request.changeType !=''">
+        <if test="request != null and request.changeType != null and request.changeType !=''">
             and change_type = #{request.changeType}
         </if>
-        <if test="request.createUserName != null and request.createUserName !=''">
+        <if test="request != null and request.createUserName != null and request.createUserName !=''">
             and create_user_name like concat('%',#{request.createUserName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificatePrintMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificatePrintMapper.xml
index b66cd99..49c0ac8 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificatePrintMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificatePrintMapper.xml
@@ -31,34 +31,34 @@
         LEFT JOIN biz_business_order_sample_relation bosr ON (bosr.order_id = bcr.order_id AND bosr.sample_id = bcr.sample_id)
         LEFT JOIN biz_business_order_info boi ON boi.id = bosr.order_id
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and bcp.approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.printStatus != null and request.printStatus !=''">
+        <if test="request != null and request.printStatus != null and request.printStatus !=''">
             and print_status = #{request.printStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and bcp.create_user_id = #{request.createUserId}
         </if>
-        <if test="request.certificateReportNo != null and request.certificateReportNo !=''">
+        <if test="request != null and request.certificateReportNo != null and request.certificateReportNo !=''">
             and bcr.certificate_report_no like concat('%',#{request.certificateReportNo},'%')
         </if>
-        <if test="request.certificateReportName != null and request.certificateReportName !=''">
+        <if test="request != null and request.certificateReportName != null and request.certificateReportName !=''">
             and bcr.certificate_report_name like concat('%',#{request.certificateReportName},'%')
         </if>
-        <if test="request.customerName != null and request.customerName !=''">
+        <if test="request != null and request.customerName != null and request.customerName !=''">
             and boi.customer_name like concat('%',#{request.customerName},'%')
         </if>
-        <if test="request.sampleNo != null and request.sampleNo !=''">
+        <if test="request != null and request.sampleNo != null and request.sampleNo !=''">
             and bosr.sample_no like concat('%',#{request.sampleNo},'%')
         </if>
-        <if test="request.sampleName != null and request.sampleName !=''">
+        <if test="request != null and request.sampleName != null and request.sampleName !=''">
             and bosr.sample_name like concat('%',#{request.sampleName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and bcp.create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and bcp.create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml
index b366034..767695d 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml
@@ -46,33 +46,37 @@
         SELECT bcr.*, bosr.sample_no, bosr.sample_name, bosr.sample_model, rsi.staff_name
         FROM biz_business_certificate_report bcr
         LEFT JOIN biz_business_order_sample_relation bosr ON (bosr.order_id = bcr.order_id AND bosr.sample_id = bcr.sample_id)
+        LEFT JOIN biz_business_order_info boi ON boi.id = bcr.order_id
         LEFT JOIN biz_resource_staff_info rsi ON rsi.id = bcr.measure_person_id
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and bcr.approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and bcr.create_user_id = #{request.createUserId}
         </if>
-        <if test="request.certificateReportNo != null and request.certificateReportNo !=''">
+        <if test="request != null and request.customerId != null and request.customerId !=''">
+            and boi.customer_id = #{request.customerId}
+        </if>
+        <if test="request != null and request.certificateReportNo != null and request.certificateReportNo !=''">
             and bcr.certificate_report_no like concat('%',#{request.certificateReportNo},'%')
         </if>
-        <if test="request.certificateReportName != null and request.certificateReportName !=''">
+        <if test="request != null and request.certificateReportName != null and request.certificateReportName !=''">
             and bcr.certificate_report_name like concat('%',#{request.certificateReportName},'%')
         </if>
-        <if test="request.sampleNo != null and request.sampleNo !=''">
+        <if test="request != null and request.sampleNo != null and request.sampleNo !=''">
             and bosr.sample_no like concat('%',#{request.sampleNo},'%')
         </if>
-        <if test="request.measureCategory != null and request.measureCategory !=''">
+        <if test="request != null and request.measureCategory != null and request.measureCategory !=''">
             and bcr.measure_category = #{request.measureCategory}
         </if>
-        <if test="request.measurePerson != null and request.measurePerson !=''">
+        <if test="request != null and request.measurePerson != null and request.measurePerson !=''">
             and rsi.staff_name like concat('%',#{request.measurePerson},'%')
         </if>
-        <if test="request.calibrationTimeStart != null and request.calibrationTimeStart !=''">
+        <if test="request != null and request.calibrationTimeStart != null and request.calibrationTimeStart !=''">
             and bcr.calibration_time &gt;= #{request.calibrationTimeStart}
         </if>
-        <if test="request.calibrationTimeEnd != null and request.calibrationTimeEnd !=''">
+        <if test="request != null and request.calibrationTimeEnd != null and request.calibrationTimeEnd !=''">
             and bcr.calibration_time &lt;= #{request.calibrationTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceAssessMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceAssessMapper.xml
index d0fcf8b..c22c101 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceAssessMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceAssessMapper.xml
@@ -7,6 +7,8 @@
         <id column="id" property="id" />
         <result column="project_no" property="projectNo" />
         <result column="project_name" property="projectName" />
+        <result column="lab_code" property="labCode" />
+        <result column="group_code" property="groupCode" />
         <result column="applicant_id" property="applicantId" />
         <result column="applicant_name" property="applicantName" />
         <result column="applicant_time" property="applicantTime" />
@@ -31,7 +33,45 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, project_no, project_name, applicant_id, applicant_name, applicant_time, minio_file_name, remark, create_user_id, create_user_name, outsourcer_id, pre_start_time, pre_end_time, outsource_reason, pre_cost, approval_status, process_id, approve_situation, traceability, test_method, technique_ability, create_time, update_time
+        id, project_no, project_name, lab_code, group_code, applicant_id, applicant_name, applicant_time, minio_file_name, remark, create_user_id, create_user_name, outsourcer_id, pre_start_time, pre_end_time, outsource_reason, pre_cost, approval_status, process_id, approve_situation, traceability, test_method, technique_ability, create_time, update_time
     </sql>
 
+    <select id="selectMaxProjectNo" resultType="java.lang.Long">
+        SELECT IFNULL(max(RIGHT(project_no, 3)), 0) from biz_business_outsource_assess
+    </select>
+
+    <select id="selectBatchForApprovalList" resultMap="BaseResultMap">
+        SELECT bboa.*, bboi.outsourcer_name, bboi.director
+        FROM biz_business_outsource_assess bboa
+        LEFT JOIN biz_business_outsourcer_info bboi ON bboa.outsourcer_id = bboi.id
+        WHERE 1=1
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
+            and bboa.approval_status = #{request.approvalStatus}
+        </if>
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
+            and bboa.create_user_id = #{request.createUserId}
+        </if>
+        <if test="request != null and request.projectNo != null and request.projectNo !=''">
+            and bboa.project_no like concat('%',#{request.projectNo},'%')
+        </if>
+        <if test="request != null and request.outsourcerName != null and request.outsourcerName !=''">
+            and bboi.outsourcer_name like concat('%',#{request.outsourcerName},'%')
+        </if>
+        <if test="request != null and request.applicantName != null and request.applicantName !=''">
+            and bboa.applicant_name like concat('%',#{request.applicantName},'%')
+        </if>
+        <if test="request != null and request.applicantTimeStart != null and request.applicantTimeStart !=''">
+            and bboa.applicant_time &gt;= #{request.applicantTimeStart}
+        </if>
+        <if test="request != null and request.applicantTimeEnd != null and request.applicantTimeEnd !=''">
+            and bboa.applicant_time &lt;= #{request.applicantTimeEnd}
+        </if>
+        <if test="businessKeys != null">
+            and bboa.id in
+            <foreach collection="businessKeys" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
+        ORDER BY bboa.create_time DESC
+    </select>
 </mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceProtocolMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceProtocolMapper.xml
new file mode 100644
index 0000000..b7b2149
--- /dev/null
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceProtocolMapper.xml
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.mapper.business.BizBusinessOutsourceProtocolMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.business.BizBusinessOutsourceProtocol">
+        <id column="id" property="id" />
+        <result column="protocol_no" property="protocolNo" />
+        <result column="project_name" property="projectName" />
+        <result column="lab_code" property="labCode" />
+        <result column="group_code" property="groupCode" />
+        <result column="outsourcer_id" property="outsourcerId" />
+        <result column="remark" property="remark" />
+        <result column="outsource_no" property="outsourceNo" />
+        <result column="outsource_name" property="outsourceName" />
+        <result column="contacts" property="contacts" />
+        <result column="mobile" property="mobile" />
+        <result column="address" property="address" />
+        <result column="require_date" property="requireDate" />
+        <result column="outsource_cost" property="outsourceCost" />
+        <result column="director" property="director" />
+        <result column="item" property="item" />
+        <result column="requires" property="requires" />
+        <result column="create_user_id" property="createUserId" />
+        <result column="create_user_name" property="createUserName" />
+        <result column="approval_status" property="approvalStatus" />
+        <result column="process_id" property="processId" />
+        <result column="create_time" property="createTime" />
+        <result column="update_time" property="updateTime" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, protocol_no, project_name, lab_code, group_code, outsourcer_id, remark, outsource_no, outsource_name, contacts, mobile, address, require_date, outsource_cost, director, item, requires, create_user_id, create_user_name, approval_status, process_id, create_time, update_time
+    </sql>
+
+    <select id="selectMaxProtocolNo" resultType="java.lang.Long">
+        SELECT IFNULL(max(RIGHT(protocol_no, 3)), 0) from biz_business_outsource_protocol
+    </select>
+
+    <select id="selectBatchForApprovalList" resultMap="BaseResultMap">
+        SELECT *
+        FROM biz_business_outsource_protocol
+        WHERE 1=1
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
+            and approval_status = #{request.approvalStatus}
+        </if>
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
+            and create_user_id = #{request.createUserId}
+        </if>
+        <if test="request != null and request.protocolNo != null and request.protocolNo !=''">
+            and protocol_no like concat('%',#{request.protocolNo},'%')
+        </if>
+        <if test="request != null and request.outsourcerName != null and request.outsourcerName !=''">
+            and outsourcer_name like concat('%',#{request.outsourcerName},'%')
+        </if>
+        <if test="request != null and request.applicantName != null and request.applicantName !=''">
+            and create_user_name like concat('%',#{request.applicantName},'%')
+        </if>
+        <if test="request != null and request.applicantTimeStart != null and request.applicantTimeStart !=''">
+            and create_time &gt;= #{request.applicantTimeStart}
+        </if>
+        <if test="request != null and request.applicantTimeEnd != null and request.applicantTimeEnd !=''">
+            and create_time &lt;= #{request.applicantTimeEnd}
+        </if>
+        <if test="businessKeys != null">
+            and id in
+            <foreach collection="businessKeys" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
+        ORDER BY create_time DESC
+    </select>
+</mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourcerInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourcerInfoMapper.xml
index 510a80b..3049b54 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourcerInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourcerInfoMapper.xml
@@ -7,6 +7,8 @@
         <id column="id" property="id" />
         <result column="outsourcer_no" property="outsourcerNo" />
         <result column="outsourcer_name" property="outsourcerName" />
+        <result column="lab_code" property="labCode" />
+        <result column="group_code" property="groupCode" />
         <result column="outsourcer_brief_name" property="outsourcerBriefName" />
         <result column="outsourcer_size" property="outsourcerSize" />
         <result column="business_size" property="businessSize" />
@@ -55,32 +57,32 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, outsourcer_no, outsourcer_name, outsourcer_brief_name, outsourcer_size, business_size, grade, evaluation, tax_number, bank_account, bank_name, bank_account_number, postal_code, director, phone, fax, mobile, email, website, address_country, address_province, address_city, address_area, full_address, address_country_name, address_province_name, address_city_name, address_area_name, invoice_country, invoice_province, invoice_city, invoice_area, invoice_full_address, invoice_country_name, invoice_province_name, invoice_city_name, invoice_area_name, business_scope, business_content, minio_file_name, approval_status, process_id, remark, create_user_id, create_user_name, create_time, update_time
+        id, outsourcer_no, outsourcer_name, lab_code, group_code, outsourcer_brief_name, outsourcer_size, business_size, grade, evaluation, tax_number, bank_account, bank_name, bank_account_number, postal_code, director, phone, fax, mobile, email, website, address_country, address_province, address_city, address_area, full_address, address_country_name, address_province_name, address_city_name, address_area_name, invoice_country, invoice_province, invoice_city, invoice_area, invoice_full_address, invoice_country_name, invoice_province_name, invoice_city_name, invoice_area_name, business_scope, business_content, minio_file_name, approval_status, process_id, remark, create_user_id, create_user_name, create_time, update_time
     </sql>
 
     <select id="selectBatchForApprovalList" resultMap="BaseResultMap">
         SELECT *
         FROM biz_business_outsourcer_info
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.outsourcerNo != null and request.outsourcerNo !=''">
+        <if test="request != null and request.outsourcerNo != null and request.outsourcerNo !=''">
             and outsourcer_no like concat('%',#{request.outsourcerNo},'%')
         </if>
-        <if test="request.outsourcerName != null and request.outsourcerName !=''">
+        <if test="request != null and request.outsourcerName != null and request.outsourcerName !=''">
             and outsourcer_name like concat('%',#{request.outsourcerName},'%')
         </if>
-        <if test="request.director != null and request.director !=''">
+        <if test="request != null and request.director != null and request.director !=''">
             and director like concat('%',#{request.director},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
@@ -93,6 +95,6 @@
     </select>
 
     <select id="selectMaxNo" resultType="java.lang.Long">
-        SELECT IFNULL(max(RIGHT(outsourcer_no, 12)), 0) from biz_business_outsourcer_info
+        SELECT IFNULL(max(RIGHT(outsourcer_no, 3)), 0) from biz_business_outsourcer_info
     </select>
 </mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessSiteExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessSiteExecutiveInfoMapper.xml
index 135c5d0..3c5ae79 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessSiteExecutiveInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessSiteExecutiveInfoMapper.xml
@@ -38,25 +38,25 @@
         FROM biz_business_site_executive_info bsei
         LEFT JOIN biz_resource_customer_info rci ON bsei.customer_id = rci.id
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and bsei.approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and bsei.create_user_id = #{request.createUserId}
         </if>
-        <if test="request.siteExecutiveNo != null and request.siteExecutiveNo !=''">
+        <if test="request != null and request.siteExecutiveNo != null and request.siteExecutiveNo !=''">
             and bsei.site_executive_no like concat('%',#{request.siteExecutiveNo},'%')
         </if>
-        <if test="request.customerName != null and request.customerName !=''">
+        <if test="request != null and request.customerName != null and request.customerName !=''">
             and rci.outsourcer_name like concat('%',#{request.customerName},'%')
         </if>
-        <if test="request.applyName != null and request.applyName !=''">
+        <if test="request != null and request.applyName != null and request.applyName !=''">
             and bsei.apply_name like concat('%',#{request.applyName},'%')
         </if>
-        <if test="request.applyTimeStart != null and request.applyTimeStart !=''">
+        <if test="request != null and request.applyTimeStart != null and request.applyTimeStart !=''">
             and bsei.apply_time &gt;= #{request.applyTimeStart}
         </if>
-        <if test="request.applyTimeEnd != null and request.applyTimeEnd !=''">
+        <if test="request != null and request.applyTimeEnd != null and request.applyTimeEnd !=''">
             and bsei.apply_time &lt;= #{request.applyTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml
index 84d9e2a..6bd38a9 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml
@@ -105,6 +105,12 @@
         <if test="request.isUrgent != null and request.isUrgent !=''">
             AND bo.is_urgent = #{request.isUrgent}
         </if>
+        <if test="request.ids != null">
+            and blei.id in
+            <foreach collection="request.ids" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
         ORDER BY blei.update_time DESC
     </select>
 
@@ -137,6 +143,12 @@
         <if test="request.isUrgent != null and request.isUrgent !=''">
             AND bo.is_urgent = #{request.isUrgent}
         </if>
+        <if test="request.ids != null">
+            and blei.id in
+            <foreach collection="request.ids" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
         ORDER BY blei.update_time DESC
     </select>
 
diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardInfoMapper.xml
index 1a5551b..2ed8d17 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardInfoMapper.xml
@@ -45,12 +45,6 @@
         FROM biz_equipment_standard_info besi
         LEFT JOIN biz_equipment_standard_technology_relation bestr ON besi.standard_no = bestr.standard_no
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
-            and besi.approval_status = #{request.approvalStatus}
-        </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
-            and besi.create_user_id = #{request.createUserId}
-        </if>
         <if test="request.standardName != null and request.standardName !=''">
             and besi.standard_name like concat('%',#{request.standardName},'%')
         </if>
diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardTechnologyRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardTechnologyRelationMapper.xml
index fc7e16c..cd03c8c 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardTechnologyRelationMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardTechnologyRelationMapper.xml
@@ -6,6 +6,7 @@
     <resultMap id="BaseResultMap" type="com.casic.missiles.model.equipment.BizEquipmentStandardTechnologyRelation">
         <id column="id" property="id" />
         <result column="technology_file_id" property="technologyFileId" />
+        <result column="technology_file_no" property="technologyFileNo" />
         <result column="technology_file_name" property="technologyFileName" />
         <result column="standard_id" property="standardId" />
         <result column="standard_no" property="standardNo" />
@@ -14,7 +15,7 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, technology_file_id, technology_file_name, standard_id, remark
+        id, technology_file_id, technology_file_no, technology_file_name, standard_id, remark
     </sql>
 
 </mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceAuthorizeOrderMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceAuthorizeOrderMapper.xml
index ac5176c..554fe65 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceAuthorizeOrderMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceAuthorizeOrderMapper.xml
@@ -32,22 +32,22 @@
         SELECT *
         FROM biz_resource_authorize_order
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.orderNo != null and request.orderNo !=''">
+        <if test="request != null and request.orderNo != null and request.orderNo !=''">
             and order_no like concat('%',#{request.orderNo},'%')
         </if>
-        <if test="request.createUserName != null and request.createUserName !=''">
+        <if test="request != null and request.createUserName != null and request.createUserName !=''">
             and create_user_name like concat('%',#{request.createUserName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerExamineFormMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerExamineFormMapper.xml
index ab242f6..af7f98f 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerExamineFormMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerExamineFormMapper.xml
@@ -41,28 +41,28 @@
         SELECT *
         FROM biz_resource_customer_examine_form
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.formNo != null and request.formNo !=''">
+        <if test="request != null and request.formNo != null and request.formNo !=''">
             and form_no like concat('%',#{request.formNo},'%')
         </if>
-        <if test="request.labCode != null and request.labCode !=''">
+        <if test="request != null and request.labCode != null and request.labCode !=''">
             and lab_code like concat('%',#{request.labCode},'%')
         </if>
-        <if test="request.groupCode != null and request.groupCode !=''">
+        <if test="request != null and request.groupCode != null and request.groupCode !=''">
             and group_code like concat('%',#{request.groupCode},'%')
         </if>
-        <if test="request.createUserName != null and request.createUserName !=''">
+        <if test="request != null and request.createUserName != null and request.createUserName !=''">
             and create_user_name like concat('%',#{request.createUserName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerInfoMapper.xml
index fa8ffbc..06a2798 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerInfoMapper.xml
@@ -33,25 +33,25 @@
         SELECT *
         FROM biz_resource_customer_info
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.customerNo != null and request.customerNo !=''">
+        <if test="request != null and request.customerNo != null and request.customerNo !=''">
             and customer_no like concat('%',#{request.customerNo},'%')
         </if>
-        <if test="request.customerName != null and request.customerName !=''">
+        <if test="request != null and request.customerName != null and request.customerName !=''">
             and customer_name like concat('%',#{request.customerName},'%')
         </if>
-        <if test="request.contacts != null and request.contacts !=''">
+        <if test="request != null and request.contacts != null and request.contacts !=''">
             and contacts like concat('%',#{request.contacts},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerSuggestFormMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerSuggestFormMapper.xml
index 28f5bb2..1806662 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerSuggestFormMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerSuggestFormMapper.xml
@@ -33,28 +33,28 @@
         SELECT *
         FROM biz_resource_customer_suggest_form
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.formNo != null and request.formNo !=''">
+        <if test="request != null and request.formNo != null and request.formNo !=''">
             and form_no like concat('%',#{request.formNo},'%')
         </if>
-        <if test="request.customerName != null and request.customerName !=''">
+        <if test="request != null and request.customerName != null and request.customerName !=''">
             and customer_name like concat('%',#{request.customerName},'%')
         </if>
-        <if test="request.customerDeptName != null and request.customerDeptName !=''">
+        <if test="request != null and request.customerDeptName != null and request.customerDeptName !=''">
             and customer_dept_name like concat('%',#{request.customerDeptName},'%')
         </if>
-        <if test="request.createUserName != null and request.createUserName !=''">
+        <if test="request != null and request.createUserName != null and request.createUserName !=''">
             and create_user_name like concat('%',#{request.createUserName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSealUseNoteMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSealUseNoteMapper.xml
index ab37bc1..b02bb33 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSealUseNoteMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSealUseNoteMapper.xml
@@ -29,32 +29,32 @@
     </sql>
 
     <select id="selectBatchForApprovalList" resultMap="BaseResultMap">
-        SELECT *
+        SELECT brsun.*, brsi.seal_name, brsi.seal_type, brsi.approver_name
         FROM biz_resource_seal_use_note brsun
         JOIN biz_resource_seal_info brsi ON brsun.seal_id = brsi.id
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and brsun.approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and brsun.create_user_id = #{request.createUserId}
         </if>
-        <if test="request.sealName != null and request.sealName !=''">
+        <if test="request != null and request.sealName != null and request.sealName !=''">
             and brsi.seal_name like concat('%',#{request.sealName},'%')
         </if>
-        <if test="request.sealType != null and request.sealType !=''">
+        <if test="request != null and request.sealType != null and request.sealType !=''">
             and brsi.seal_type = #{request.sealType}
         </if>
-        <if test="request.applyDeptName != null and request.applyDeptName !=''">
+        <if test="request != null and request.applyDeptName != null and request.applyDeptName !=''">
             and brsun.apply_dept_name like concat('%',#{request.applyDeptName},'%')
         </if>
-        <if test="request.applyUserName != null and request.applyUserName !=''">
+        <if test="request != null and request.applyUserName != null and request.applyUserName !=''">
             and brsun.apply_user_name like concat('%',#{request.applyUserName},'%')
         </if>
-        <if test="request.applyTimeStart != null and request.applyTimeStart !=''">
+        <if test="request != null and request.applyTimeStart != null and request.applyTimeStart !=''">
             and brsun.apply_time &gt;= #{request.applyTimeStart}
         </if>
-        <if test="request.applyTimeEnd != null and request.applyTimeEnd !=''">
+        <if test="request != null and request.applyTimeEnd != null and request.applyTimeEnd !=''">
             and brsun.apply_time &lt;= #{request.applyTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml
index 119bf7d..4f8392a 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml
@@ -31,6 +31,12 @@
         <if test="request.deptName != null and request.deptName !=''">
             and brsi.dept_name like concat('%',#{request.deptName},'%')
         </if>
+        <if test="request.ids != null">
+            and brsv.id in
+            <foreach collection="request.ids" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
         ORDER BY brsv.grant_date DESC
     </select>
 
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSupplierInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSupplierInfoMapper.xml
index fe8d399..e8ce7ef 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSupplierInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSupplierInfoMapper.xml
@@ -48,28 +48,28 @@
         SELECT *
         FROM biz_resource_supplier_info
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.supplierNo != null and request.supplierNo !=''">
+        <if test="request != null and request.supplierNo != null and request.supplierNo !=''">
             and supplier_no like concat('%',#{request.supplierNo},'%')
         </if>
-        <if test="request.supplierName != null and request.supplierName !=''">
+        <if test="request != null and request.supplierName != null and request.supplierName !=''">
             and supplier_name like concat('%',#{request.supplierName},'%')
         </if>
-        <if test="request.director != null and request.director !=''">
+        <if test="request != null and request.director != null and request.director !=''">
             and director like concat('%',#{request.director},'%')
         </if>
-        <if test="request.supplierType != null and request.supplierType !=''">
+        <if test="request != null and request.supplierType != null and request.supplierType !=''">
             and supplier_type = #{request.supplierType}
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/EnvLocationInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/EnvLocationInfoMapper.xml
new file mode 100644
index 0000000..68bcf10
--- /dev/null
+++ b/casic-metering-dao/src/main/resources/mapper/resource/EnvLocationInfoMapper.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.mapper.resource.EnvLocationInfoMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.resource.EnvLocationInfo">
+        <id column="id" property="id" />
+        <result column="location_no" property="locationNo" />
+        <result column="location_name" property="locationName" />
+        <result column="location_position" property="locationPosition" />
+        <result column="create_user_id" property="createUserId" />
+        <result column="create_user" property="createUser" />
+        <result column="create_time" property="createTime" />
+        <result column="update_time" property="updateTime" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, location_no, location_name, location_position, create_user_id, create_user, create_time, update_time
+    </sql>
+
+    <select id="selectLocationListPage" resultType="com.casic.missiles.dto.resource.environment.LocationListResponse">
+        SELECT *
+        FROM env_location_info
+        WHERE 1=1
+        <if test="request.locationNo != null and request.locationNo !=''">
+            AND location_no LIKE concat('%',#{request.locationNo},'%')
+        </if>
+        <if test="request.locationName != null and request.locationName !=''">
+            AND location_name LIKE concat('%',#{request.locationName},'%')
+        </if>
+        ORDER BY create_time DESC
+    </select>
+
+</mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml
index b28c18f..8854047 100644
--- a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml
@@ -11,7 +11,6 @@
         <result column="sign_desc" property="signDesc" />
         <result column="sign_director" property="signDirector" />
         <result column="sign_user_id" property="signUserId" />
-        <result column="sign_type" property="signType" />
         <result column="minio_file_name" property="minioFileName" />
         <result column="create_time" property="createTime" />
         <result column="update_time" property="updateTime" />
@@ -28,7 +27,6 @@
         <result column="sign_name" property="signName" />
         <result column="sign_desc" property="signDesc" />
         <result column="sign_director" property="signDirector" />
-        <result column="sign_type" property="signType" />
         <result column="sign_user_id" property="signUserId" />
         <result column="minio_file_name" property="minioFileName" />
         <result column="create_time" property="createTime" />
@@ -62,4 +60,58 @@
         JOIN system_sign_user_relation ssur ON ss.id = ssur.sign_id
         WHERE ssur.user_id = #{userId}
     </select>
+
+    <select id="selectSignListPage" resultMap="BaseResultMap">
+        SELECT ss.*, sd.SIMPLE_NAME AS deptName
+        FROM system_sign ss
+        LEFT JOIN sys_user su ON su.id = ss.sign_user_id
+        LEFT JOIN sys_dept sd ON sd.id = su.dept_id
+        WHERE 1=1
+        <if test="request.signNo != null and request.signNo !=''">
+            AND ss.sign_no LIKE concat('%',#{request.signNo},'%')
+        </if>
+        <if test="request.signName != null and request.signName !=''">
+            AND ss.sign_name LIKE concat('%',#{request.signName},'%')
+        </if>
+        <if test="request.signDirector != null and request.signDirector !=''">
+            AND ss.sign_director LIKE concat('%',#{request.signDirector},'%')
+        </if>
+        <if test="request.signUserId != null and request.signUserId !=''">
+            AND ss.sign_user_id = #{request.signUserId}
+        </if>
+        <if test="request.createStartTime != null and request.createStartTime !=''">
+            AND DATE_FORMAT(ss.create_time,'%Y-%m-%d') &gt;= DATE_FORMAT(#{request.createStartTime},'%Y-%m-%d')
+        </if>
+        <if test="request.createEndTime != null and request.createEndTime !=''">
+            AND DATE_FORMAT(ss.create_time,'%Y-%m-%d')  &lt;= DATE_FORMAT(#{request.createEndTime},'%Y-%m-%d')
+        </if>
+        ORDER BY ss.create_time DESC
+    </select>
+
+    <select id="selectSignList" resultMap="BaseResultMap">
+        SELECT ss.*, sd.SIMPLE_NAME AS deptName
+        FROM system_sign ss
+        LEFT JOIN sys_user su ON su.id = ss.sign_user_id
+        LEFT JOIN sys_dept sd ON sd.id = su.dept_id
+        WHERE 1=1
+        <if test="request.signNo != null and request.signNo !=''">
+            AND ss.sign_no LIKE concat('%',#{request.signNo},'%')
+        </if>
+        <if test="request.signName != null and request.signName !=''">
+            AND ss.sign_name LIKE concat('%',#{request.signName},'%')
+        </if>
+        <if test="request.signDirector != null and request.signDirector !=''">
+            AND ss.sign_director LIKE concat('%',#{request.signDirector},'%')
+        </if>
+        <if test="request.signUserId != null and request.signUserId !=''">
+            AND ss.sign_user_id = #{request.signUserId}
+        </if>
+        <if test="request.createStartTime != null and request.createStartTime !=''">
+            AND DATE_FORMAT(ss.create_time,'%Y-%m-%d') &gt;= DATE_FORMAT(#{request.createStartTime},'%Y-%m-%d')
+        </if>
+        <if test="request.createEndTime != null and request.createEndTime !=''">
+            AND DATE_FORMAT(ss.create_time,'%Y-%m-%d')  &lt;= DATE_FORMAT(#{request.createEndTime},'%Y-%m-%d')
+        </if>
+        ORDER BY ss.create_time DESC
+    </select>
 </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 515050a..60f530b 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
@@ -47,8 +47,8 @@
     String STORAGE_LOCATION = "bizStorageLocation";
     //计量专业
     String MEASURE_MAJOR = "bizMeasureMajor";
-    //管理状态
-    String MANAGER_STATE = "bizManagerState";
+    //标准装置管理状态
+    String STANDARD_MANAGER_STATE = "bizStandardManagerState";
 
     /**
      * 资源管理 字典code
@@ -95,8 +95,6 @@
     String MEASURE_STATUS = "measureStatus";
     //检定方式
     String MEASURE_TYPE = "measureType";
-    //标识打印标志类型
-    String IDENTIFY_PRINT_TYPE = "bizBusinessIdentify";
     //变更类型
     String REPORT_CHANGE_TYPE = "bizCertChangeType";
     //规模类型
@@ -111,19 +109,24 @@
     String MEASURE_CATEGORY = "measureCategory";
     //检定结果
     String MEASURE_RESULT = "measureResult";
+    //分包原因
+    String OUTSOURCE_REASON = "outsourceReason";
+
+    /**
+     * 系统管理
+     */
+    String TEMPLATE_TYPE = "templateType";
+
 
     /**
      * 标准装置 字典code
      */
     //类别
     String STANDARD_CATEGORY = "standardCategory";
-    //管理状态
-    String STANDARD_MANAGER_STATE = "standardManagerState";
     //标准等级
     String STANDARD_LEVEL = "standardLevel";
     //传递范围
     String STANDARD_TRANSMIT_RANGE = "transmitRange";
-
     //资本来源
     String CAPITAL_SOURCE = "capitalSource";
     //标准装置-申请类型
@@ -148,8 +151,6 @@
     String CERTIFICATE_CLASS = "certificationClass";
     //证书管理-检校专业
     String CALIBRATION_MAJOR = "calibrationMajor";
-    //分包原因
-    String OUTSOURCE_REASON = "outsourceReason";
 
     /**
      * 工作台
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/BaseApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/BaseApprovalListRequest.java
index 73c12c1..80d7424 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/BaseApprovalListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/BaseApprovalListRequest.java
@@ -6,6 +6,7 @@
 
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotEmpty;
+import java.util.List;
 
 /**
  * @Description:
@@ -19,14 +20,14 @@
      * 表单id
      */
     @NotBlank(message = "表单id不能为空")
-    @ApiModelProperty(value = "表单id（流程定义对应的表单id，等价于业务id）", dataType = "String")
+    @ApiModelProperty(value = "表单id（流程定义对应的表单id，等价于业务id），导出接口不用传", dataType = "String")
     private String formId;
 
     /**
      * 审批状态类型，对应ApprovalStatusEnum
      */
     @NotEmpty(message = "审批状态类型不能为空")
-    @ApiModelProperty(value = "审批状态类型code", dataType = "String")
+    @ApiModelProperty(value = "审批状态类型code，导出接口不用传", dataType = "String")
     private String approvalStatus;
 
     @ApiModelProperty(hidden = true)
@@ -34,4 +35,7 @@
 
     @ApiModelProperty(hidden = true)
     private Long createUserId;
+
+    @ApiModelProperty(value = "导出ids", dataType = "List")
+    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificatePrintApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificatePrintApprovalListRequest.java
index b93d1c9..3cc2f4e 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificatePrintApprovalListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificatePrintApprovalListRequest.java
@@ -5,8 +5,6 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import java.util.List;
-
 /**
  * @Description:
  * @Author: wangpeng
@@ -38,7 +36,4 @@
 
     @ApiModelProperty(value = "创建结束时间", dataType = "String")
     private String createTimeEnd;
-
-    @ApiModelProperty(value = "导出ids", dataType = "List")
-    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportApprovalListRequest.java
index 4f7a038..c115847 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportApprovalListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportApprovalListRequest.java
@@ -5,8 +5,6 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import java.util.List;
-
 /**
  * @Description:
  * @Author: wangpeng
@@ -15,6 +13,8 @@
 @ApiModel
 @Data
 public class CertificateReportApprovalListRequest extends BaseApprovalListRequest {
+    @ApiModelProperty(value = "委托方id", dataType = "String")
+    private Long customerId;
 
     @ApiModelProperty(value = "证书报告编号", dataType = "String")
     private String certificateReportNo;
@@ -37,6 +37,4 @@
     @ApiModelProperty(value = "检校结束时间", dataType = "String")
     private String calibrationTimeEnd;
 
-    @ApiModelProperty(value = "导出ids", dataType = "List")
-    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/identify/IdentifyListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/identify/IdentifyListRequest.java
index 1b87ae6..f019203 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/identify/IdentifyListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/identify/IdentifyListRequest.java
@@ -4,6 +4,8 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * @Description:
  * @Author: wangpeng
@@ -26,4 +28,7 @@
 
     @ApiModelProperty(value = "打印结束时间", dataType = "String")
     private String createTimeEnd;
+
+    @ApiModelProperty(value = "导出ids", dataType = "List")
+    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListRequest.java
index 1264883..62415fb 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListRequest.java
@@ -7,6 +7,7 @@
 import lombok.Data;
 
 import javax.validation.constraints.NotBlank;
+import java.util.List;
 
 @Data
 @ApiModel
@@ -37,4 +38,6 @@
     @ApiModelProperty(value = "是否加急（1是0否null全部）", dataType = "Integer")
     private String isUrgent;
 
+    @ApiModelProperty(value = "导出ids", dataType = "List")
+    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListRequest.java
index 5201d7b..499760a 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListRequest.java
@@ -17,6 +17,9 @@
     @ApiModelProperty(value = "任务单编号", dataType = "String")
     private String orderNo;
 
+    @ApiModelProperty(value = "委托方id", dataType = "Long")
+    private Long customerId;
+
     @ApiModelProperty(value = "委托方名称", dataType = "String")
     private String customerName;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OrderSampleDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OrderSampleDTO.java
new file mode 100644
index 0000000..796edc0
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OrderSampleDTO.java
@@ -0,0 +1,19 @@
+package com.casic.missiles.dto.business.outsource;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/8/24 11:38
+ */
+@ApiModel
+@Data
+public class OrderSampleDTO {
+    @ApiModelProperty(value = "任务单id", dataType = "Long")
+    private Long orderId;
+    @ApiModelProperty(value = "受检设备id", dataType = "Long")
+    private Long sampleId;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceAssessApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceAssessApprovalListRequest.java
new file mode 100644
index 0000000..9a930c3
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceAssessApprovalListRequest.java
@@ -0,0 +1,30 @@
+package com.casic.missiles.dto.business.outsource;
+
+import com.casic.missiles.dto.BaseApprovalListRequest;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/8/24 11:01
+ */
+@ApiModel
+@Data
+public class OutsourceAssessApprovalListRequest extends BaseApprovalListRequest {
+    @ApiModelProperty(value = "评审表编号", dataType = "String")
+    private String projectNo;
+
+    @ApiModelProperty(value = "分包机构名称", dataType = "String")
+    private String outsourcerName;
+
+    @ApiModelProperty(value = "申请人", dataType = "String")
+    private String applicantName;
+
+    @ApiModelProperty(value = "申请时间开始", dataType = "String")
+    private String applicantTimeStart;
+
+    @ApiModelProperty(value = "申请时间结束", dataType = "String")
+    private String applicantTimeEnd;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceAssessSaveResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceAssessSaveResponse.java
new file mode 100644
index 0000000..8bf9aad
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceAssessSaveResponse.java
@@ -0,0 +1,20 @@
+package com.casic.missiles.dto.business.outsource;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/8/14 16:17
+ */
+@ApiModel
+@Data
+public class OutsourceAssessSaveResponse {
+    @ApiModelProperty(value = "主键id", dataType = "Long")
+    private Long id;
+
+    @ApiModelProperty(value = "编号", dataType = "String")
+    private String projectNo;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProtocolApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProtocolApprovalListRequest.java
new file mode 100644
index 0000000..0f32331
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProtocolApprovalListRequest.java
@@ -0,0 +1,30 @@
+package com.casic.missiles.dto.business.outsource;
+
+import com.casic.missiles.dto.BaseApprovalListRequest;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/8/24 15:01
+ */
+@ApiModel
+@Data
+public class OutsourceProtocolApprovalListRequest extends BaseApprovalListRequest {
+    @ApiModelProperty(value = "协议书编号", dataType = "String")
+    private String protocolNo;
+
+    @ApiModelProperty(value = "分包方名称", dataType = "String")
+    private String outsourcerName;
+
+    @ApiModelProperty(value = "申请人", dataType = "String")
+    private String applicantName;
+
+    @ApiModelProperty(value = "申请时间开始", dataType = "String")
+    private String applicantTimeStart;
+
+    @ApiModelProperty(value = "申请时间结束", dataType = "String")
+    private String applicantTimeEnd;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProtocolSaveResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProtocolSaveResponse.java
new file mode 100644
index 0000000..e324967
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProtocolSaveResponse.java
@@ -0,0 +1,20 @@
+package com.casic.missiles.dto.business.outsource;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/8/14 16:17
+ */
+@ApiModel
+@Data
+public class OutsourceProtocolSaveResponse {
+    @ApiModelProperty(value = "主键id", dataType = "Long")
+    private Long id;
+
+    @ApiModelProperty(value = "编号", dataType = "String")
+    private String protocolNo;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveApprovalListRequest.java
index f29f4e4..7047c28 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveApprovalListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveApprovalListRequest.java
@@ -5,8 +5,6 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import java.util.List;
-
 /**
  * @Description: 现场检测审批列表请求实体
  * @Author: wangpeng
@@ -30,7 +28,4 @@
     @ApiModelProperty(value = "申请时间结束", dataType = "String")
     private String applyTimeEnd;
 
-    @ApiModelProperty(value = "导出ids", dataType = "List")
-    private List<Long> ids;
-
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveDetailResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveDetailResponse.java
index 1f28752..394c934 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveDetailResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveDetailResponse.java
@@ -12,6 +12,18 @@
     @ApiModelProperty(value = "id，更新/删除使用参数", dataType = "Long")
     private Long id;
 
+    @ApiModelProperty(value = "实验室代码(字典code)", dataType = "String")
+    private String labCode;
+
+    @ApiModelProperty(value = "实验室代码(字典value)", dataType = "String")
+    private String labCodeName;
+
+    @ApiModelProperty(value = "组别代码(字典code)", dataType = "String")
+    private String groupCode;
+
+    @ApiModelProperty(value = "组别代码(字典value)", dataType = "String")
+    private String groupCodeName;
+
     @ApiModelProperty(value = "审批编号", dataType = "String")
     private String siteExecutiveNo;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/environment/LocationListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/environment/LocationListRequest.java
new file mode 100644
index 0000000..13d03c3
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/environment/LocationListRequest.java
@@ -0,0 +1,20 @@
+package com.casic.missiles.dto.resource.environment;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/6/8 13:56
+ */
+@ApiModel
+@Data
+public class LocationListRequest {
+    @ApiModelProperty(value = "地点编号", dataType = "String")
+    private String locationNo;
+
+    @ApiModelProperty(value = "地点名称", dataType = "String")
+    private String locationName;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/environment/LocationListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/environment/LocationListResponse.java
new file mode 100644
index 0000000..4c531af
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/environment/LocationListResponse.java
@@ -0,0 +1,78 @@
+package com.casic.missiles.dto.resource.environment;
+
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
+import com.baomidou.mybatisplus.annotation.TableField;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description: 地点列表响应实体
+ * @Author: wangpeng
+ * @Date: 2023/6/8 13:53
+ */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
+@ApiModel
+@Data
+public class LocationListResponse {
+    @ApiModelProperty(value = "主键id", dataType = "Long")
+    private Long id;
+
+    /**
+     * 地点编号
+     */
+    @ExcelProperty("地点编号")
+    @ApiModelProperty(value = "地点编号", dataType = "String")
+    private String locationNo;
+
+    /**
+     * 地点名称
+     */
+    @ExcelProperty("地点名称")
+    @ApiModelProperty(value = "地点名称", dataType = "String")
+    private String locationName;
+
+    /**
+     * 地点位置
+     */
+    @ExcelProperty("地点位置")
+    @ApiModelProperty(value = "地点位置", dataType = "String")
+    private String locationPosition;
+
+    /**
+     * 创建人id
+     */
+    @ApiModelProperty(value = "创建人id", dataType = "Long")
+    private Long createUserId;
+
+    /**
+     * 创建人
+     */
+    @ExcelProperty("创建人")
+    @ApiModelProperty(value = "创建人", dataType = "String")
+    @TableField("create_user")
+    private String createUser;
+
+    /**
+     * 创建时间
+     */
+    @ExcelProperty("创建时间")
+    @ApiModelProperty(value = "创建时间", dataType = "String")
+    private String createTime;
+
+    /**
+     * 更新时间
+     */
+    @ApiModelProperty(value = "更新时间", dataType = "String")
+    private String updateTime;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertRequest.java
index 9a7f6c6..c827915 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertRequest.java
@@ -4,6 +4,8 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * @Description:
  * @Author: wangpeng
@@ -16,4 +18,7 @@
     private String name;
     @ApiModelProperty(value = "部门名", dataType = "String")
     private String deptName;
+
+    @ApiModelProperty(value = "导出ids", dataType = "List")
+    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertResponse.java
index f78b159..8f2f79e 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertResponse.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.dto.resource.staff;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.casic.missiles.annotation.DictCodeField;
 import com.casic.missiles.constants.MeterDictCode;
 import io.swagger.annotations.ApiModel;
@@ -13,12 +20,18 @@
  * @Author: wangpeng
  * @Date: 2023/7/27 15:13
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @ApiModel
 @Data
 public class StaffCertResponse {
     /**
      * 人员编号
      */
+    @ExcelProperty(value = "人员编号",order = 0)
     @NotEmpty(message = "人员编号不能为空")
     @ApiModelProperty(value = "人员编号", dataType = "String")
     private String staffNo;
@@ -26,6 +39,7 @@
     /**
      * 姓名
      */
+    @ExcelProperty(value = "姓名",order = 1)
     @ApiModelProperty(value = "姓名", dataType = "String")
     private String staffName;
 
@@ -54,6 +68,7 @@
     /**
      * 部门名字
      */
+    @ExcelProperty(value = "工作部门",order = 2)
     @ApiModelProperty(value = "部门名字", dataType = "String")
     private String deptName;
 
@@ -66,6 +81,7 @@
     /**
      * 计量专业
      */
+    @ExcelProperty(value = "计量专业",order = 3)
     @ApiModelProperty(value = "计量专业", dataType = "String")
     private String major;
 
@@ -110,6 +126,7 @@
     /**
      * 证书号
      */
+    @ExcelProperty(value = "证号",order = 4)
     @ApiModelProperty(value = "证书号", dataType = "String")
     private String certNo;
 
@@ -122,12 +139,14 @@
     /**
      * 有效日期
      */
+    @ExcelProperty(value = "证书有效期",order = 6)
     @ApiModelProperty(value = "有效日期", dataType = "String")
     private String effectiveDate;
 
     /**
      * 发放日期
      */
+    @ExcelProperty(value = "发证日期",order = 5)
     @ApiModelProperty(value = "发放日期", dataType = "String")
     private String grantDate;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffListRequest.java
index 7c4afb3..0a1194a 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffListRequest.java
@@ -4,6 +4,8 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * @Description:
  * @Author: wangpeng
@@ -18,4 +20,7 @@
     private String deptName;
     @ApiModelProperty(value = "部门id", dataType = "Long")
     private Long deptId;
+
+    @ApiModelProperty(value = "导出ids", dataType = "List")
+    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/TrainListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/TrainListRequest.java
index f68597b..6321f8b 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/TrainListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/TrainListRequest.java
@@ -14,6 +14,8 @@
 public class TrainListRequest {
     @ApiModelProperty(value = "训练登记表编号", dataType = "String")
     private String trainNo;
+    @ApiModelProperty(value = "值班领导", dataType = "String")
+    private String dutyLeader;
     @ApiModelProperty(value = "创建开始时间", dataType = "String")
     private String createTimeStart;
     @ApiModelProperty(value = "创建结束时间", dataType = "String")
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/SignAddRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/SignAddRequest.java
index 117be34..d71055c 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/SignAddRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/SignAddRequest.java
@@ -43,13 +43,6 @@
     private Long signUserId;
 
     /**
-     * 签章或签名-字典code
-     */
-    @NotBlank(message = "类型不能为空")
-    @ApiModelProperty(value = "签名/签章-字典code", dataType = "String", required = true)
-    private String signType;
-
-    /**
      * minio存储文件名
      */
     @ApiModelProperty(value = "上传文件返回名称", dataType = "String")
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateAddRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateAddRequest.java
index aff1265..6316648 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateAddRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateAddRequest.java
@@ -17,30 +17,28 @@
 @Data
 public class TemplateAddRequest extends BaseSystemRequest {
     /**
-     * 原始记录模板/证书报告模板名称
+     * 模板名称
      */
     @ApiModelProperty(value = "名称", dataType = "String", required = true)
     @NotBlank(message = "名称不能为空")
     private String templateName;
 
     /**
-     * 原始记录模板/证书报告模板描述
+     * 模板描述
      */
     @ApiModelProperty(value = "描述", dataType = "String")
     private String templateDesc;
 
     /**
-     * 原始记录模板/证书报告模板创建人
+     * 创建人
      */
     @ApiModelProperty(value = "创建人", dataType = "String", required = true)
     @NotBlank(message = "创建人不能为空")
     private String templateCreator;
 
-    /**
-     * 原始记录模板/证书报告模板-字典code
-     */
-    @NotBlank(message = "类型不能为空")
-    @ApiModelProperty(value = "原始记录模板/证书报告模板-字典code", dataType = "String", required = true)
+
+    @NotBlank(message = "模板类型不能为空")
+    @ApiModelProperty(value = "模板类型(字典code)", dataType = "String", required = true)
     private String templateType;
 
     /**
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateListRequest.java
index eec5a1e..6d17bbe 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateListRequest.java
@@ -1,11 +1,12 @@
 package com.casic.missiles.dto.system;
 
+import com.casic.missiles.annotation.DictCodeField;
+import com.casic.missiles.constants.MeterDictCode;
 import com.casic.missiles.dto.BaseSystemRequest;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import javax.validation.constraints.NotBlank;
 import java.util.List;
 
 /**
@@ -19,8 +20,8 @@
     /**
      * 类型
      */
-//    @ApiModelProperty(value = "类型-字典code", dataType = "String", required = true)
-    @NotBlank(message = "类型不能为空")
+    @DictCodeField(message = "模板类型不合法", cacheName = MeterDictCode.TEMPLATE_TYPE)
+    @ApiModelProperty(value = "模板类型(字典code)", dataType = "String")
     private String templateType;
 
     /**
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificateChangeApply.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificateChangeApply.java
index 9216308..36923fd 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificateChangeApply.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificateChangeApply.java
@@ -1,11 +1,19 @@
 package com.casic.missiles.model.business;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 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 com.casic.missiles.dto.BaseRequest;
+import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -20,6 +28,12 @@
  * @author wangpeng
  * @since 2023-08-15
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
+@ApiModel
 @Data
 @TableName("biz_business_certificate_change_apply")
 public class BizBusinessCertificateChangeApply extends BaseRequest implements Serializable {
@@ -33,6 +47,7 @@
     /**
      * 申请单编号
      */
+    @ExcelProperty(value = "申请单编号", order = 1)
     @ApiModelProperty(value = "申请单编号", dataType = "String")
     @TableField("change_apply_no")
     private String changeApplyNo;
@@ -40,6 +55,7 @@
     /**
      * 申请单名字
      */
+    @ExcelProperty(value = "申请单名称", order = 2)
     @ApiModelProperty(value = "申请单名字", dataType = "String")
     @TableField("change_apply_name")
     private String changeApplyName;
@@ -54,6 +70,7 @@
     /**
      * 更换证书编号
      */
+    @ExcelProperty(value = "更换证书编号", order = 3)
     @ApiModelProperty(value = "更换证书编号", dataType = "String")
     @TableField("change_report_no")
     private String changeReportNo;
@@ -61,7 +78,8 @@
     /**
      * 更换证书名字
      */
-    @ApiModelProperty(value = "更换证书名字", dataType = "String")
+    @ExcelProperty(value = "更换证书/报告名称", order = 4)
+    @ApiModelProperty(value = "更换证书/报告名称", dataType = "String")
     @TableField("change_report_name")
     private String changeReportName;
 
@@ -73,6 +91,7 @@
     @TableField("change_type")
     private String changeType;
 
+    @ExcelProperty(value = "变更类型", order = 5)
     @ApiModelProperty(value = "变更类型(字典value)", dataType = "String")
     @TableField(exist = false)
     private String changeTypeName;
@@ -142,13 +161,15 @@
     /**
      * 创建用户名字
      */
-    @ApiModelProperty(value = "创建用户名字", dataType = "String")
+    @ExcelProperty(value = "创建人", order = 6)
+    @ApiModelProperty(value = "创建人名字", dataType = "String")
     @TableField("create_user_name")
     private String createUserName;
 
     /**
      * 创建时间
      */
+    @ExcelProperty(value = "创建时间", order = 7)
     @ApiModelProperty(value = "创建时间", dataType = "String")
     @TableField("create_time")
     private String createTime;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificateReport.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificateReport.java
index f01db9e..db06018 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificateReport.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificateReport.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.model.business;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -22,6 +29,11 @@
  * @author wangpeng
  * @since 2023-08-14
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @ApiModel
 @Data
 @TableName("biz_business_certificate_report")
@@ -36,6 +48,7 @@
     /**
      * 证书报告编号
      */
+    @ExcelProperty(value = "证书报告编号", order = 1)
     @ApiModelProperty(value = "证书报告编号", dataType = "String")
     @TableField("certificate_report_no")
     private String certificateReportNo;
@@ -43,6 +56,7 @@
     /**
      * 证书报告名称
      */
+    @ExcelProperty(value = "证书报告名称", order = 2)
     @ApiModelProperty(value = "证书报告名称", dataType = "String")
     @TableField("certificate_report_name")
     private String certificateReportName;
@@ -62,6 +76,7 @@
     @TableField("measure_category")
     private String measureCategory;
 
+    @ExcelProperty(value = "检校类别", order = 6)
     @ApiModelProperty(value = "检校类别(字典value)", dataType = "String")
     @TableField(exist = false)
     private String measureCategoryName;
@@ -69,6 +84,7 @@
     /**
      * 检校时间
      */
+    @ExcelProperty(value = "检校时间", order = 8)
     @ApiModelProperty(value = "检校时间", dataType = "String")
     @TableField("calibration_time")
     private String calibrationTime;
@@ -267,18 +283,22 @@
     @TableField(exist = false)
     private Integer decisionItem;
 
-    @ApiModelProperty(value = "设备样品编号（列表返回参数）", dataType = "String")
+    @ExcelProperty(value = "被检设备统一编号", order = 3)
+    @ApiModelProperty(value = "被检设备统一编号（列表返回参数）", dataType = "String")
     @TableField(exist = false)
     private String sampleNo;
 
-    @ApiModelProperty(value = "设备样品名称（列表返回参数）", dataType = "String")
+    @ExcelProperty(value = "被检设备名称", order = 4)
+    @ApiModelProperty(value = "被检设备名称（列表返回参数）", dataType = "String")
     @TableField(exist = false)
     private String sampleName;
 
-    @ApiModelProperty(value = "设备样品规格型号（列表返回参数）", dataType = "String")
+    @ExcelProperty(value = "规格型号", order = 5)
+    @ApiModelProperty(value = "规格型号（列表返回参数）", dataType = "String")
     @TableField(exist = false)
     private String sampleModel;
 
+    @ExcelProperty(value = "检定员", order = 7)
     @ApiModelProperty(value = "检定员名字（列表返回参数）", dataType = "String")
     @TableField(exist = false)
     private String staffName;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessIdentifyInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessIdentifyInfo.java
index 46bfba5..f1a9bec 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessIdentifyInfo.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessIdentifyInfo.java
@@ -1,10 +1,15 @@
 package com.casic.missiles.model.business;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 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;
 
@@ -20,6 +25,11 @@
  * @author wangpeng
  * @since 2023-08-15
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @Data
 @TableName("biz_business_identify_info")
 public class BizBusinessIdentifyInfo implements Serializable {
@@ -33,6 +43,7 @@
     /**
      * 记录编号
      */
+    @ExcelProperty(value = "记录编号", order = 1)
     @ApiModelProperty(value = "记录编号", dataType = "String")
     @TableField("record_no")
     private String recordNo;
@@ -41,20 +52,15 @@
      * 标志类型(字典code)
      */
     @NotEmpty(message = "标志类型不能为空")
-    @ApiModelProperty(value = "标志类型(字典code)", dataType = "String")
-    @DictCodeField(message = "标志类型不合法", cacheName = MeterDictCode.IDENTIFY_PRINT_TYPE)
+    @ApiModelProperty(value = "标志类型(直接存计量标识/使用状态/校准状态的字典value)", dataType = "String")
     @TableField("identify_type")
     private String identifyType;
 
-    @ApiModelProperty(value = "标志类型(字典value)", dataType = "String")
-    @TableField(exist = false)
-    private String identifyTypeName;
-
     /**
      * 设备id(可以是受检设备/设备台账)
      */
     @NotNull(message = "设备id不能为空")
-    @ApiModelProperty(value = "设备id(可以是受检设备/设备台账)", dataType = "String")
+    @ApiModelProperty(value = "设备id(可以是受检设备/设备台账)", dataType = "Long")
     @TableField("device_id")
     private Long deviceId;
 
@@ -66,29 +72,32 @@
     @TableField("device_type")
     private String deviceType;
 
+    @ExcelProperty(value = "统一编号", order = 3)
     @NotEmpty(message = "设备编号不能为空")
-    @ApiModelProperty(value = "设备编号", dataType = "String")
+    @ApiModelProperty(value = "统一编号", dataType = "String")
     @TableField("device_no")
     private String deviceNo;
 
     /**
      * 设备名字
      */
-    @NotEmpty(message = "设备名字不能为空")
-    @ApiModelProperty(value = "设备名字", dataType = "String")
+    @ExcelProperty(value = "设备名称", order = 4)
+    @NotEmpty(message = "设备名称不能为空")
+    @ApiModelProperty(value = "设备名称", dataType = "String")
     @TableField("device_name")
     private String deviceName;
 
     /**
      * 检定员id
      */
-    @ApiModelProperty(value = "检定员id", dataType = "String")
+    @ApiModelProperty(value = "检定员id", dataType = "Long")
     @TableField("measure_person_id")
     private Long measurePersonId;
 
     /**
      * 检定员名字
      */
+    @ExcelProperty(value = "检定员", order = 5)
     @ApiModelProperty(value = "检定员名字", dataType = "String")
     @TableField("measure_person")
     private String measurePerson;
@@ -103,7 +112,8 @@
     /**
      * 更新时间
      */
-    @ApiModelProperty(value = "更新时间", dataType = "String")
+    @ExcelProperty(value = "打印时间", order = 6)
+    @ApiModelProperty(value = "打印时间", dataType = "String")
     @TableField("update_time")
     private String updateTime;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceAssess.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceAssess.java
index 659d9ca..6720b90 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceAssess.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceAssess.java
@@ -1,11 +1,26 @@
 package com.casic.missiles.model.business;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 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 com.casic.missiles.dto.BaseRequest;
+import com.casic.missiles.dto.business.outsource.OrderSampleDTO;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import javax.validation.constraints.NotEmpty;
 import java.io.Serializable;
+import java.util.List;
 
 /**
  * <p>
@@ -15,146 +30,231 @@
  * @author wangpeng
  * @since 2023-08-16
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
+@ApiModel
 @Data
 @TableName("biz_business_outsource_assess")
-public class BizBusinessOutsourceAssess implements Serializable {
+public class BizBusinessOutsourceAssess extends BaseRequest implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
+    @ApiModelProperty(value = "id，更新/删除使用参数", dataType = "Long")
     @TableId("id")
     private Long id;
 
     /**
      * 评审表编号
      */
+    @ExcelProperty(value = "评审表编号", order = 1)
+    @ApiModelProperty(value = "评审表编号(后台生成)", dataType = "String")
     @TableField("project_no")
     private String projectNo;
 
     /**
      * 评审表名称
      */
+    @ExcelProperty(value = "评审表名称", order = 2)
+    @ApiModelProperty(value = "评审表名称", dataType = "String")
     @TableField("project_name")
     private String projectName;
 
+    @NotEmpty(message = "实验室代码不能为空")
+    @DictCodeField(message = "实验室代码描述不合法", cacheName = MeterDictCode.LAB_CODE)
+    @ApiModelProperty(value = "实验室代码(字典code)", dataType = "String")
+    @TableField("lab_code")
+    private String labCode;
+
+    @ApiModelProperty(value = "实验室代码(字典value)", dataType = "String")
+    @TableField(exist = false)
+    private String labCodeName;
+
+    /**
+     * 组别代码
+     */
+    @NotEmpty(message = "组别代码不能为空")
+    @DictCodeField(message = "组别代码描述不合法", cacheName = MeterDictCode.GROUP_CODE)
+    @ApiModelProperty(value = "组别代码(字典code)", dataType = "String")
+    @TableField("group_code")
+    private String groupCode;
+
+    @ApiModelProperty(value = "组别代码(字典value)", dataType = "String")
+    @TableField(exist = false)
+    private String groupCodeName;
+
     /**
      * 申请人id
      */
+    @ApiModelProperty(value = "申请人id", dataType = "String")
     @TableField("applicant_id")
     private Long applicantId;
 
     /**
      * 申请人名字
      */
+    @ExcelProperty(value = "申请人", order = 5)
+    @ApiModelProperty(value = "申请人", dataType = "String")
     @TableField("applicant_name")
     private String applicantName;
 
     /**
      * 申请时间
      */
+    @ExcelProperty(value = "申请时间", order = 6)
+    @ApiModelProperty(value = "申请时间", dataType = "String")
     @TableField("applicant_time")
     private String applicantTime;
 
     /**
      * 附件(minio存储文件名)
      */
+    @ApiModelProperty(value = "附件(minio存储文件名)", dataType = "String")
     @TableField("minio_file_name")
     private String minioFileName;
 
     /**
      * 备注
      */
+    @ApiModelProperty(value = "备注", dataType = "String")
     @TableField("remark")
     private String remark;
 
     /**
      * 创建人id
      */
+    @ApiModelProperty(value = "创建人id", dataType = "String")
     @TableField("create_user_id")
     private Long createUserId;
 
     /**
      * 创建人名字
      */
+    @ApiModelProperty(value = "创建人名字", dataType = "String")
     @TableField("create_user_name")
     private String createUserName;
 
     /**
      * 分包方id
      */
+    @ApiModelProperty(value = "评审表编号", dataType = "String")
     @TableField("outsourcer_id")
     private Long outsourcerId;
 
     /**
      * 预计开始时间
      */
+    @ApiModelProperty(value = "预计开始时间", dataType = "String")
     @TableField("pre_start_time")
     private String preStartTime;
 
     /**
      * 预计结束时间
      */
+    @ApiModelProperty(value = "预计结束时间", dataType = "String")
     @TableField("pre_end_time")
     private String preEndTime;
 
     /**
      * 分包原因-字典
      */
+    @ApiModelProperty(value = "分包原因(字典code)", dataType = "String")
+    @DictCodeField(message = "分包原因描述不合法", cacheName = MeterDictCode.OUTSOURCE_REASON)
     @TableField("outsource_reason")
     private String outsourceReason;
 
+    @ApiModelProperty(value = "分包原因(字典value)", dataType = "String")
+    @TableField(exist = false)
+    private String outsourceReasonName;
+
     /**
      * 预计费用
      */
+    @ApiModelProperty(value = "预计费用", dataType = "String")
     @TableField("pre_cost")
     private String preCost;
 
     /**
      * 审批状态
      */
+    @ApiModelProperty(value = "审批状态", dataType = "String")
+    @DictCodeField(message = "审批状态描述不合法", cacheName = MeterDictCode.APPROVAL_STATUS)
     @TableField("approval_status")
     private String approvalStatus;
 
     /**
      * 流程实例id
      */
+    @ApiModelProperty(value = "流程实例id", dataType = "String")
     @TableField("process_id")
     private String processId;
 
     /**
      * 实验室认可情况
      */
+    @ApiModelProperty(value = "实验室认可情况", dataType = "String")
     @TableField("approve_situation")
     private String approveSituation;
 
     /**
      * 溯源性
      */
+    @ApiModelProperty(value = "溯源性", dataType = "String")
     @TableField("traceability")
     private String traceability;
 
     /**
      * 测试方法
      */
+    @ApiModelProperty(value = "测试方法", dataType = "String")
     @TableField("test_method")
     private String testMethod;
 
     /**
      * 技术能力
      */
+    @ApiModelProperty(value = "技术能力", dataType = "String")
     @TableField("technique_ability")
     private String techniqueAbility;
 
     /**
      * 创建时间
      */
+    @ApiModelProperty(hidden = true)
     @TableField("create_time")
     private String createTime;
 
     /**
      * 更新时间
      */
+    @ApiModelProperty(hidden = true)
     @TableField("update_time")
     private String updateTime;
 
+    @ApiModelProperty(value = "审批状态类型-字典value", dataType = "String")
+    @TableField(exist = false)
+    private String approvalStatusName;
 
+    @ApiModelProperty(value = "任务id（同意、驳回等操作使用）", dataType = "String")
+    @TableField(exist = false)
+    private String taskId;
+
+    @ApiModelProperty(value = "可选决策项（1同意驳回拒绝 2同意驳回 3同意拒绝，用于待审批列表同意/驳回/拒绝按钮展示）", dataType = "Integer")
+    @TableField(exist = false)
+    private Integer decisionItem;
+
+    @NotEmpty(message = "受检设备信息不能为空")
+    @ApiModelProperty(value = "受检设备id列表（新建使用参数）", dataType = "List")
+    @TableField(exist = false)
+    private List<OrderSampleDTO> orderSampleList;
+
+    @ExcelProperty(value = "分包机构名称", order = 3)
+    @ApiModelProperty(value = "分包机构名称（列表返回参数）", dataType = "String")
+    private String outsourcerName;
+
+    @ExcelProperty(value = "机构负责人", order = 4)
+    @ApiModelProperty(value = "机构负责人（列表返回参数）", dataType = "String")
+    private String director;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceProtocol.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceProtocol.java
new file mode 100644
index 0000000..38df697
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceProtocol.java
@@ -0,0 +1,225 @@
+package com.casic.missiles.model.business;
+
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
+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 com.casic.missiles.dto.BaseRequest;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotEmpty;
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 计量检定业务-分包管理-测试、校准或检定工作分包协议书
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-08-24
+ */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
+@Data
+@TableName("biz_business_outsource_protocol")
+public class BizBusinessOutsourceProtocol extends BaseRequest implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "id，更新/删除使用参数", dataType = "Long")
+    @TableId("id")
+    private Long id;
+
+    /**
+     * 协议书编号
+     */
+    @ExcelProperty(value = "协议书编号", order = 1)
+    @ApiModelProperty(value = "协议书编号(后台生成)", dataType = "String")
+    @TableField("protocol_no")
+    private String protocolNo;
+
+    /**
+     * 协议书名称
+     */
+    @ExcelProperty(value = "协议书名称", order = 2)
+    @ApiModelProperty(value = "协议书名称", dataType = "String")
+    @TableField("project_name")
+    private String projectName;
+
+    @NotEmpty(message = "实验室代码不能为空")
+    @DictCodeField(message = "实验室代码描述不合法", cacheName = MeterDictCode.LAB_CODE)
+    @ApiModelProperty(value = "实验室代码(字典code)", dataType = "String")
+    @TableField("lab_code")
+    private String labCode;
+
+    @ApiModelProperty(value = "实验室代码(字典value)", dataType = "String")
+    @TableField(exist = false)
+    private String labCodeName;
+
+    @NotEmpty(message = "组别代码不能为空")
+    @DictCodeField(message = "组别代码描述不合法", cacheName = MeterDictCode.GROUP_CODE)
+    @ApiModelProperty(value = "组别代码(字典code)", dataType = "String")
+    @TableField("group_code")
+    private String groupCode;
+
+    @ApiModelProperty(value = "组别代码(字典value)", dataType = "String")
+    @TableField(exist = false)
+    private String groupCodeName;
+
+    /**
+     * 分包方id
+     */
+    @ApiModelProperty(value = "分包方id", dataType = "Long")
+    @TableField("outsourcer_id")
+    private Long outsourcerId;
+
+    /**
+     * 其他
+     */
+    @ApiModelProperty(value = "其他", dataType = "String")
+    @TableField("remark")
+    private String remark;
+
+    /**
+     * 分包方编号
+     */
+    @ApiModelProperty(value = "分包方编号(新建不用传)", dataType = "String")
+    @TableField("outsource_no")
+    private String outsourceNo;
+
+    /**
+     * 分包方名称
+     */
+    @ExcelProperty(value = "分包方名称", order = 3)
+    @ApiModelProperty(value = "分包方名称(新建不用传)", dataType = "String")
+    @TableField("outsource_name")
+    private String outsourceName;
+
+    /**
+     * 联系人
+     */
+    @ExcelProperty(value = "联系人", order = 4)
+    @ApiModelProperty(value = "联系人", dataType = "String")
+    @TableField("contacts")
+    private String contacts;
+
+    /**
+     * 电话
+     */
+    @ApiModelProperty(value = "电话", dataType = "String")
+    @TableField("mobile")
+    private String mobile;
+
+    /**
+     * 地址
+     */
+    @ApiModelProperty(value = "地址", dataType = "String")
+    @TableField("address")
+    private String address;
+
+    /**
+     * 要求完成日期
+     */
+    @ApiModelProperty(value = "要求完成日期", dataType = "String")
+    @TableField("require_date")
+    private String requireDate;
+
+    /**
+     * 分包费用(元)
+     */
+    @ApiModelProperty(value = "分包费用(元)", dataType = "String")
+    @TableField("outsource_cost")
+    private Double outsourceCost;
+
+    /**
+     * 分包方负责人
+     */
+    @ApiModelProperty(value = "分包方负责人", dataType = "String")
+    @TableField("director")
+    private String director;
+
+    /**
+     * 分包项目
+     */
+    @ApiModelProperty(value = "分包项目", dataType = "String")
+    @TableField("item")
+    private String item;
+
+    /**
+     * 分包要求
+     */
+    @ApiModelProperty(value = "分包要求", dataType = "String")
+    @TableField("requires")
+    private String requires;
+
+    /**
+     * 创建人id
+     */
+    @ApiModelProperty(hidden = true)
+    @TableField("create_user_id")
+    private Long createUserId;
+
+    /**
+     * 创建人名字
+     */
+    @ExcelProperty(value = "申请人", order = 5)
+    @ApiModelProperty(value = "申请人", dataType = "String")
+    @TableField("create_user_name")
+    private String createUserName;
+
+    /**
+     * 审批状态
+     */
+    @ApiModelProperty(value = "审批状态", dataType = "String")
+    @DictCodeField(message = "审批状态描述不合法", cacheName = MeterDictCode.APPROVAL_STATUS)
+    @TableField("approval_status")
+    private String approvalStatus;
+
+    /**
+     * 流程实例id
+     */
+    @ApiModelProperty(value = "流程实例id", dataType = "String")
+    @TableField("process_id")
+    private String processId;
+
+    /**
+     * 创建时间
+     */
+    @ExcelProperty(value = "申请时间", order = 6)
+    @ApiModelProperty(value = "申请时间", dataType = "String")
+    @TableField("create_time")
+    private String createTime;
+
+    /**
+     * 更新时间
+     */
+    @ApiModelProperty(hidden = true)
+    @TableField("update_time")
+    private String updateTime;
+
+    @ApiModelProperty(value = "审批状态类型-字典value", dataType = "String")
+    @TableField(exist = false)
+    private String approvalStatusName;
+
+    @ApiModelProperty(value = "任务id（同意、驳回等操作使用）", dataType = "String")
+    @TableField(exist = false)
+    private String taskId;
+
+    @ApiModelProperty(value = "可选决策项（1同意驳回拒绝 2同意驳回 3同意拒绝，用于待审批列表同意/驳回/拒绝按钮展示）", dataType = "Integer")
+    @TableField(exist = false)
+    private Integer decisionItem;
+
+
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourcerInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourcerInfo.java
index ec4e997..f9aa69e 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourcerInfo.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourcerInfo.java
@@ -17,6 +17,7 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import javax.validation.constraints.NotEmpty;
 import java.io.Serializable;
 
 /**
@@ -59,6 +60,29 @@
     @TableField("outsourcer_name")
     private String outsourcerName;
 
+    @NotEmpty(message = "实验室代码不能为空")
+    @DictCodeField(message = "实验室代码描述不合法", cacheName = MeterDictCode.LAB_CODE)
+    @ApiModelProperty(value = "实验室代码(字典code)", dataType = "String")
+    @TableField("lab_code")
+    private String labCode;
+
+    @ApiModelProperty(value = "实验室代码(字典value)", dataType = "String")
+    @TableField(exist = false)
+    private String labCodeName;
+
+    /**
+     * 组别代码
+     */
+    @NotEmpty(message = "组别代码不能为空")
+    @DictCodeField(message = "组别代码描述不合法", cacheName = MeterDictCode.GROUP_CODE)
+    @ApiModelProperty(value = "组别代码(字典code)", dataType = "String")
+    @TableField("group_code")
+    private String groupCode;
+
+    @ApiModelProperty(value = "组别代码(字典value)", dataType = "String")
+    @TableField(exist = false)
+    private String groupCodeName;
+
     /**
      * 单位简称
      */
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardInfo.java
index c48eed7..dffdfdd 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardInfo.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardInfo.java
@@ -5,6 +5,7 @@
 import com.baomidou.mybatisplus.annotation.TableName;
 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;
 
@@ -18,6 +19,7 @@
  * @author wangpeng
  * @since 2023-08-04
  */
+@ApiModel
 @Data
 @TableName("biz_equipment_standard_info")
 public class BizEquipmentStandardInfo implements Serializable {
@@ -119,7 +121,7 @@
      * 管理状态(字典code)
      */
     @ApiModelProperty(value = "管理状态(字典code)", dataType = "String")
-    @DictCodeField(message = "管理状态不合法", cacheName = MeterDictCode.MANAGER_STATE)
+    @DictCodeField(message = "管理状态不合法", cacheName = MeterDictCode.STANDARD_MANAGER_STATE)
     @TableField("manage_status")
     private String manageStatus;
 
@@ -151,7 +153,7 @@
     /**
      * 温度(℃)
      */
-    @ApiModelProperty(value = "使用状态(字典code)", dataType = "String")
+    @ApiModelProperty(value = "温度(℃)", dataType = "String")
     @TableField("temperature")
     private Double temperature;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardInfoApproval.java b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardInfoApproval.java
index dbd86ab..9f58d83 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardInfoApproval.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardInfoApproval.java
@@ -150,7 +150,7 @@
      * 管理状态(字典code)
      */
     @ApiModelProperty(value = "管理状态(字典code)", dataType = "String")
-    @DictCodeField(message = "管理状态不合法", cacheName = MeterDictCode.MANAGER_STATE)
+    @DictCodeField(message = "管理状态不合法", cacheName = MeterDictCode.STANDARD_MANAGER_STATE)
     @TableField("manage_status")
     private String manageStatus;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardTechnologyRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardTechnologyRelation.java
index 0e612bd..751f26b 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardTechnologyRelation.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardTechnologyRelation.java
@@ -3,6 +3,7 @@
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -16,6 +17,7 @@
  * @author wangpeng
  * @since 2023-08-04
  */
+@ApiModel
 @Data
 @TableName("biz_equipment_standard_technology_relation")
 public class BizEquipmentStandardTechnologyRelation implements Serializable {
@@ -33,6 +35,10 @@
     @TableField("technology_file_id")
     private Long technologyFileId;
 
+    @ApiModelProperty(value = "依据的技术文件编号", dataType = "String")
+    @TableField("technology_file_no")
+    private String technologyFileNo;
+
     /**
      * 依据的技术文件名称(技术文件中现行测试校准检定方法表文件名字段)
      */
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerInfo.java
index d6e8bed..65cd6bc 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerInfo.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerInfo.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.model.resource;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -21,6 +28,11 @@
  * @author wangpeng
  * @since 2023-08-08
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @ApiModel
 @Data
 @TableName("biz_resource_customer_info")
@@ -35,6 +47,7 @@
     /**
      * 委托方编号
      */
+    @ExcelProperty(value = "委托方编号", order = 1)
     @ApiModelProperty(value = "委托方编号", dataType = "String")
     @TableField("customer_no")
     private String customerNo;
@@ -42,6 +55,7 @@
     /**
      * 委托方名称
      */
+    @ExcelProperty(value = "委托方名称", order = 2)
     @ApiModelProperty(value = "委托方名称(新建时为下拉选择一个受检单位组织的名字，传deptId字段，后端获取名称)", dataType = "String")
     @TableField("customer_name")
     private String customerName;
@@ -63,6 +77,7 @@
     /**
      * 联系人
      */
+    @ExcelProperty(value = "联系人", order = 3)
     @ApiModelProperty(value = "联系人", dataType = "String")
     @TableField("contacts")
     private String contacts;
@@ -70,6 +85,7 @@
     /**
      * 座机电话
      */
+    @ExcelProperty(value = "座机电话", order = 4)
     @ApiModelProperty(value = "座机电话", dataType = "String")
     @TableField("mobile")
     private String mobile;
@@ -77,6 +93,7 @@
     /**
      * 手机号码
      */
+    @ExcelProperty(value = "手机号码", order = 5)
     @ApiModelProperty(value = "手机号码", dataType = "String")
     @TableField("phone")
     private String phone;
@@ -91,6 +108,7 @@
     /**
      * 地址
      */
+    @ExcelProperty(value = "地址", order = 6)
     @ApiModelProperty(value = "地址", dataType = "String")
     @TableField("address")
     private String address;
@@ -141,6 +159,7 @@
     /**
      * 创建时间
      */
+    @ExcelProperty(value = "创建时间", order = 7)
     @ApiModelProperty(value = "创建时间", dataType = "String")
     @TableField("create_time")
     private String createTime;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerSuggestForm.java b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerSuggestForm.java
index 7201bbd..701bf8b 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerSuggestForm.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerSuggestForm.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.model.resource;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -22,6 +29,11 @@
  * @author wangpeng
  * @since 2023-08-08
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @ApiModel
 @Data
 @TableName("biz_resource_customer_suggest_form")
@@ -44,7 +56,8 @@
     /**
      * 委托方名称
      */
-    @ApiModelProperty(value = "委托方名称", dataType = "String")
+    @ExcelProperty(value = "意见反馈单位", order = 2)
+    @ApiModelProperty(value = "意见反馈单位", dataType = "String")
     @TableField("customer_name")
     private String customerName;
 
@@ -59,7 +72,8 @@
     /**
      * 委托方意见反馈部门名称
      */
-    @ApiModelProperty(value = "委托方意见反馈部门名称", dataType = "String")
+    @ExcelProperty(value = "委托方意见反馈部门", order = 3)
+    @ApiModelProperty(value = "委托方意见反馈部门", dataType = "String")
     @TableField("customer_dept_name")
     private String customerDeptName;
 
@@ -73,6 +87,7 @@
     /**
      * 表单编号
      */
+    @ExcelProperty(value = "表单编号", order = 1)
     @ApiModelProperty(value = "表单编号", dataType = "String")
     @TableField("form_no")
     private String formNo;
@@ -111,6 +126,7 @@
     /**
      * 创建人名字
      */
+    @ExcelProperty(value = "创建人", order = 4)
     @ApiModelProperty(value = "创建人名字", dataType = "String")
     @TableField("create_user_name")
     private String createUserName;
@@ -147,6 +163,7 @@
     /**
      * 创建时间
      */
+    @ExcelProperty(value = "创建时间", order = 5)
     @ApiModelProperty(value = "创建时间", dataType = "String")
     @TableField("create_time")
     private String createTime;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSealInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSealInfo.java
index cbf05d7..9bf389d 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSealInfo.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSealInfo.java
@@ -106,6 +106,10 @@
     @TableField("minio_file_name")
     private String minioFileName;
 
+    @ApiModelProperty(value = "minio存储文件url", dataType = "String")
+    @TableField(exist = false)
+    private String minioFileUrl;
+
     @ApiModelProperty(value = "创建时间", dataType = "String")
     @TableField("create_time")
     private String createTime;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSealUseNote.java b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSealUseNote.java
index 3f2d9e8..3ce16a8 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSealUseNote.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSealUseNote.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.model.resource;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -20,6 +27,11 @@
  * @author wangpeng
  * @since 2023-07-28
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @ApiModel
 @Data
 @TableName("biz_resource_seal_use_note")
@@ -34,6 +46,7 @@
     /**
      * 登记表编号
      */
+    @ExcelProperty(value = "申请单编号", order = 1)
     @ApiModelProperty(value = "登记表编号(自动生成)", dataType = "String")
     @TableField("note_form_no")
     private String noteFormNo;
@@ -55,6 +68,7 @@
     /**
      * 申请部门
      */
+    @ExcelProperty(value = "申请部门", order = 5)
     @ApiModelProperty(value = "申请部门", dataType = "String")
     @TableField("apply_dept_name")
     private String applyDeptName;
@@ -69,6 +83,7 @@
     /**
      * 申请人
      */
+    @ExcelProperty(value = "申请人", order = 6)
     @ApiModelProperty(value = "申请人", dataType = "String")
     @TableField("apply_user_name")
     private String applyUserName;
@@ -76,6 +91,7 @@
     /**
      * 申请时间
      */
+    @ExcelProperty(value = "申请时间", order = 7)
     @ApiModelProperty(value = "申请时间(新增自动获取当前时间)", dataType = "String")
     @TableField("apply_time")
     private String applyTime;
@@ -130,6 +146,26 @@
     @TableField("update_time")
     private String updateTime;
 
+    @ExcelProperty(value = "印章名称", order = 2)
+    @ApiModelProperty(value = "印章名称(列表返回参数)", dataType = "String")
+    @TableField(exist = false)
+    private String sealName;
+
+    @DictCodeField(message = "印章类型描述不合法", cacheName = MeterDictCode.SEAL_TYPE)
+    @ApiModelProperty(hidden = true)
+    @TableField(exist = false)
+    private String sealType;
+
+    @ExcelProperty(value = "印章类型", order = 3)
+    @ApiModelProperty(value = "印章类型(列表返回参数)", dataType = "String")
+    @TableField(exist = false)
+    private String sealTypeName;
+
+    @ExcelProperty(value = "批准人", order = 4)
+    @ApiModelProperty(value = "批准人(列表返回参数)", dataType = "String")
+    @TableField(exist = false)
+    private String approverName;
+
     @ApiModelProperty(value = "审批状态类型-字典value", dataType = "String")
     @TableField(exist = false)
     private String approvalStatusName;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceStaffInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceStaffInfo.java
index 5ef995b..41563a1 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceStaffInfo.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceStaffInfo.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.model.resource;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -20,6 +27,11 @@
  * @author wangpeng
  * @since 2023-07-25
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @ApiModel
 @Data
 @TableName("biz_resource_staff_info")
@@ -38,6 +50,7 @@
     /**
      * 人员编号
      */
+    @ExcelProperty(value = "人员编号",order = 0)
     @NotEmpty(message = "人员编号不能为空")
     @ApiModelProperty(value = "人员编号", dataType = "String")
     @TableField("staff_no")
@@ -46,6 +59,7 @@
     /**
      * 姓名
      */
+    @ExcelProperty(value = "姓名",order = 1)
     @ApiModelProperty(value = "姓名", dataType = "String")
     @TableField("staff_name")
     private String staffName;
@@ -152,13 +166,15 @@
     /**
      * 部门名字
      */
-    @ApiModelProperty(value = "部门名字", dataType = "String")
+    @ExcelProperty(value = "工作部门",order = 4)
+    @ApiModelProperty(value = "工作部门", dataType = "String")
     @TableField("dept_name")
     private String deptName;
 
     /**
      * 岗位
      */
+    @ExcelProperty(value = "岗位",order = 2)
     @ApiModelProperty(value = "岗位", dataType = "String")
     @TableField("station")
     private String station;
@@ -166,6 +182,7 @@
     /**
      * 计量专业
      */
+    @ExcelProperty(value = "计量专业",order = 5)
     @ApiModelProperty(value = "计量专业", dataType = "String")
     @TableField("major")
     private String major;
@@ -173,6 +190,7 @@
     /**
      * 证号
      */
+    @ExcelProperty(value = "证号",order = 3)
     @ApiModelProperty(value = "证号", dataType = "String")
     @TableField("certificate_number")
     private String certificateNumber;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSupplierInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSupplierInfo.java
index eb5ef01..a1e2697 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSupplierInfo.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSupplierInfo.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.model.resource;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -20,6 +27,11 @@
  * @author wangpeng
  * @since 2023-07-27
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @ApiModel
 @Data
 @TableName("biz_resource_supplier_info")
@@ -34,6 +46,7 @@
     /**
      * 供方编号
      */
+    @ExcelProperty(value = "供方编号", order = 1)
     @ApiModelProperty(value = "供方编号(自动生成)", dataType = "String")
     @TableField("supplier_no")
     private String supplierNo;
@@ -41,6 +54,7 @@
     /**
      * 供方名称
      */
+    @ExcelProperty(value = "供方名称", order = 2)
     @ApiModelProperty(value = "供方名称", dataType = "String")
     @TableField("supplier_name")
     private String supplierName;
@@ -60,6 +74,7 @@
     @TableField("supplier_type")
     private String supplierType;
 
+    @ExcelProperty(value = "供方类型", order = 3)
     @ApiModelProperty(value = "供方类型(字典value)", dataType = "String")
     @TableField(exist = false)
     private String supplierTypeName;
@@ -109,7 +124,8 @@
     /**
      * 电话
      */
-    @ApiModelProperty(value = "电话", dataType = "String")
+    @ExcelProperty(value = "联系电话", order = 4)
+    @ApiModelProperty(value = "联系电话", dataType = "String")
     @TableField("phone")
     private String phone;
 
@@ -158,6 +174,7 @@
     /**
      * 公司地址-省
      */
+    @ExcelProperty(value = "地址-省", order = 6)
     @ApiModelProperty(value = "公司地址-省", dataType = "String")
     @TableField("company_province_name")
     private String companyProvinceName;
@@ -172,6 +189,7 @@
     /**
      * 公司地址-市
      */
+    @ExcelProperty(value = "地址-市", order = 7)
     @ApiModelProperty(value = "公司地址-市", dataType = "String")
     @TableField("company_city_name")
     private String companyCityName;
@@ -186,6 +204,7 @@
     /**
      * 公司地址-区
      */
+    @ExcelProperty(value = "地址-区", order = 8)
     @ApiModelProperty(value = "公司地址-区", dataType = "String")
     @TableField("company_area_name")
     private String companyAreaName;
@@ -193,6 +212,7 @@
     /**
      * 公司地址-详细地址
      */
+    @ExcelProperty(value = "地址-详细地址", order = 9)
     @ApiModelProperty(value = "公司地址-详细地址", dataType = "String")
     @TableField("company_address")
     private String companyAddress;
@@ -200,6 +220,7 @@
     /**
      * 服务和供应的内容
      */
+    @ExcelProperty(value = "服务和供应的内容", order = 5)
     @ApiModelProperty(value = "服务和供应的内容", dataType = "String")
     @TableField("supplier_content")
     private String supplierContent;
@@ -250,6 +271,7 @@
     /**
      * 创建时间
      */
+    @ExcelProperty(value = "创建时间", order = 9)
     @ApiModelProperty(value = "创建时间", dataType = "String")
     @TableField("create_time")
     private String createTime;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/EnvLocationInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/EnvLocationInfo.java
new file mode 100644
index 0000000..d8e2d7b
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/EnvLocationInfo.java
@@ -0,0 +1,83 @@
+package com.casic.missiles.model.resource;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotEmpty;
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 实验室环境监控系统-设备表
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-06-07
+ */
+@ApiModel
+@Data
+@TableName("env_location_info")
+public class EnvLocationInfo implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "主键id", dataType = "Long")
+    @TableId("id")
+    private Long id;
+
+    /**
+     * 地点编号
+     */
+    @NotEmpty(message = "地点编号不能为空")
+    @ApiModelProperty(value = "地点编号", dataType = "String")
+    @TableField("location_no")
+    private String locationNo;
+
+    /**
+     * 地点名称
+     */
+    @ApiModelProperty(value = "地点名称", dataType = "String")
+    @TableField("location_name")
+    private String locationName;
+
+    /**
+     * 地点位置
+     */
+    @ApiModelProperty(value = "地点位置", dataType = "String")
+    @TableField("location_position")
+    private String locationPosition;
+
+    /**
+     * 创建人id
+     */
+    @ApiModelProperty(value = "创建人id", dataType = "Long")
+    @TableField("create_user_id")
+    private Long createUserId;
+
+    /**
+     * 创建人
+     */
+    @ApiModelProperty(value = "创建人", dataType = "String")
+    @TableField("create_user")
+    private String createUser;
+
+    /**
+     * 创建时间
+     */
+    @ApiModelProperty(value = "创建时间", dataType = "String")
+    @TableField("create_time")
+    private String createTime;
+
+    /**
+     * 更新时间
+     */
+    @ApiModelProperty(value = "更新时间", dataType = "String")
+    @TableField("update_time")
+    private String updateTime;
+
+
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemFileConfig.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemFileConfig.java
index 19e6845..86e569c 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemFileConfig.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemFileConfig.java
@@ -30,7 +30,7 @@
     @ApiModelProperty(value = "系统类别(1业务系统2受检系统3环境系统)", dataType = "Integer")
     @NotNull(message = "系统类别不能为空")
     @TableField("system_type")
-    private Integer systemType;
+    private Integer systemType = 1;
 
     @ApiModelProperty("下载编号")
     @TableField("download_no")
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemNotice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemNotice.java
index e94297d..06ec37d 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemNotice.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemNotice.java
@@ -34,7 +34,7 @@
     @ApiModelProperty(value = "系统类别(1业务系统2受检系统3环境系统)", dataType = "Integer")
     @NotNull(message = "系统类别不能为空")
     @TableField("system_type")
-    private Integer systemType;
+    private Integer systemType = 1;
 
     /**
      * 通知公告编号
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSign.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSign.java
index 6c0d7c9..954f4f8 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSign.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSign.java
@@ -51,7 +51,7 @@
     @ApiModelProperty(value = "系统类别(1业务系统2受检系统3环境系统)", dataType = "Integer")
     @NotNull(message = "系统类别不能为空")
     @TableField("system_type")
-    private Integer systemType;
+    private Integer systemType = 1;
 
     /**
      * 签名编号
@@ -130,4 +130,8 @@
     @TableField(exist = false)
     private List<Long> userIdList;
 
+    @ApiModelProperty(hidden = true)
+    @TableField(exist = false)
+    private String deptName;
+
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemTemplate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemTemplate.java
index 503a457..1d27ebe 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemTemplate.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemTemplate.java
@@ -47,7 +47,7 @@
     @ApiModelProperty(value = "系统类别(1业务系统2受检系统3环境系统)", dataType = "Integer")
     @NotNull(message = "系统类别不能为空")
     @TableField("system_type")
-    private Integer systemType;
+    private Integer systemType = 1;
 
     /**
      * 模板编号
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java
index 8c21cb0..f61e4a8 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java
@@ -32,4 +32,8 @@
     ReturnDTO approvalDelete(ApprovalDeleteRequest request);
 
     ReturnDTO failUpdate(T request);
+
+    List<O> listExport(R request);
+
+    List<O> listExportByIds(List<Long> ids);
 }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java
index 724166f..9bce15b 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java
@@ -157,6 +157,29 @@
         throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
     }
 
+    @Override
+    public List<O> listExport(R request) {
+        request.setCreateUserId(null);
+        request.setApprovalStatus(ApprovalStatusEnum.PASSED);
+        Page<O> page = PageFactory.defaultPage();
+        page.setCurrent(1);
+        page.setSearchCount(false);
+        page.setSize(Integer.MAX_VALUE);
+        Page<O> resultPage = this.baseMapper.selectBatchForApprovalList(page, request, null);
+        return resultPage.getRecords();
+    }
+
+    @Override
+    public List<O> listExportByIds(List<Long> ids) {
+        Page<O> page = PageFactory.defaultPage();
+        page.setCurrent(1);
+        page.setSearchCount(false);
+        page.setSize(Integer.MAX_VALUE);
+        List<String> businessKeys = ids.stream().map(String::valueOf).collect(Collectors.toList());
+        Page<O> resultPage = this.baseMapper.selectBatchForApprovalList(page, null, businessKeys);
+        return resultPage.getRecords();
+    }
+
     protected ReturnDTO updateApprovalStatus(Long id, String processId, String approvalStatus) {
         UpdateWrapper<T> updateWrapper = new UpdateWrapper<>();
         updateWrapper.eq("id", id);
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificatePrintServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificatePrintServiceImpl.java
index f6e4706..3228497 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificatePrintServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificatePrintServiceImpl.java
@@ -162,6 +162,30 @@
         return ReturnUtil.success(printLogMapper.selectList(wrapper));
     }
 
+    @Override
+    public List<CertificatePrintListResponse> listByIds(List<Long> ids) {
+        Page<CertificatePrintListResponse> page = PageFactory.defaultPage();
+        page.setCurrent(1);
+        page.setSearchCount(false);
+        page.setSize(Integer.MAX_VALUE);
+        List<String> businessKeys = ids.stream().map(String::valueOf).collect(Collectors.toList());
+        Page<CertificatePrintListResponse> resultPage = this.baseMapper.selectBatchForApprovalList(page, null, businessKeys);
+        return resultPage.getRecords();
+    }
+
+    @Override
+    public List<CertificatePrintListResponse> list(CertificatePrintApprovalListRequest request) {
+        request.setCreateUserId(null);
+        request.setApprovalStatus(null);
+        request.setPrintStatus(null);
+        Page<CertificatePrintListResponse> page = PageFactory.defaultPage();
+        page.setCurrent(1);
+        page.setSearchCount(false);
+        page.setSize(Integer.MAX_VALUE);
+        Page<CertificatePrintListResponse> resultPage = certificatePrintMapper.selectBatchForApprovalList(page, request, null);
+        return resultPage.getRecords();
+    }
+
     private void savePrintLog(Long id) {
         BizBusinessCertificatePrintLog printLog = new BizBusinessCertificatePrintLog();
         BizBusinessCertificatePrint certificatePrint = certificatePrintMapper.selectById(id);
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificateReportServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificateReportServiceImpl.java
index 457555f..24146be 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificateReportServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificateReportServiceImpl.java
@@ -158,8 +158,8 @@
         QueryWrapper<BizBusinessCertificateMeasureResultData> mWrapper = new QueryWrapper<>();
         mWrapper.eq("report_id", reportId);
         boolean mRemove = certificateMeasureResultDataService.remove(mWrapper);
-        Assert.isFalse(eRemove || mRemove, () -> {
+        if(!eRemove || !mRemove){
             throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
-        });
+        }
     }
 }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessIdentifyInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessIdentifyInfoServiceImpl.java
index 4c8e190..f7e63ca 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessIdentifyInfoServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessIdentifyInfoServiceImpl.java
@@ -1,8 +1,10 @@
 package com.casic.missiles.service.Impl.business;
 
+import cn.hutool.core.date.DateUtil;
 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.core.page.PageFactory;
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.business.identify.IdentifyListRequest;
@@ -14,11 +16,14 @@
 import com.casic.missiles.service.business.IBizBusinessIdentifyInfoService;
 import com.casic.missiles.utils.DictCodeUtils;
 import com.casic.missiles.utils.NumberGeneratorUtil;
+import com.casic.missiles.utils.QRCodeUtil;
 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.List;
+
 /**
  * <p>
  * 计量检定业务-任务计量管理-标识打印 服务实现类
@@ -35,9 +40,9 @@
     @Override
     public Page<BizBusinessIdentifyInfo> identifyListPage(Page<BizBusinessIdentifyInfo> page, IdentifyListRequest request) throws Exception {
         QueryWrapper<BizBusinessIdentifyInfo> wrapper = new QueryWrapper<>();
-        wrapper.eq("identify_type", request.getIdentifyType());
-        wrapper.like("device_no", request.getDeviceNo());
-        wrapper.like("device_name", request.getDeviceName());
+        wrapper.eq(StringUtils.isNotEmpty(request.getIdentifyType()), "identify_type", request.getIdentifyType());
+        wrapper.like(StringUtils.isNotEmpty(request.getDeviceNo()),"device_no", request.getDeviceNo());
+        wrapper.like(StringUtils.isNotEmpty(request.getDeviceName()), "device_name", request.getDeviceName());
         wrapper.apply(StringUtils.isNotBlank(request.getCreateTimeStart()),
                 "{0} <= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getCreateTimeStart().split(" ")[0]);
         wrapper.apply(StringUtils.isNotBlank(request.getCreateTimeEnd()),
@@ -64,8 +69,11 @@
     }
 
     @Override
-    public ReturnDTO updateIdentify(BizBusinessIdentifyInfo identifyInfo) {
-        if(identifyInfoMapper.updateById(identifyInfo) > 0){
+    public ReturnDTO updateIdentify(Long id) {
+        BizBusinessIdentifyInfo info = new BizBusinessIdentifyInfo();
+        info.setId(id);
+        info.setUpdateTime(DateUtil.now());
+        if(identifyInfoMapper.updateById(info) > 0){
             return ReturnUtil.success();
         }
         throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
@@ -79,4 +87,20 @@
         throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
     }
 
+    @Override
+    public List<BizBusinessIdentifyInfo> list(IdentifyListRequest request) throws Exception {
+        Page<BizBusinessIdentifyInfo> page = PageFactory.defaultPage();
+        page.setCurrent(1);
+        page.setSearchCount(false);
+        page.setSize(Integer.MAX_VALUE);
+        Page<BizBusinessIdentifyInfo> resultPage = this.identifyListPage(page, request);
+        return resultPage.getRecords();
+    }
+
+    @Override
+    public ReturnDTO<String> equipmentQrCode(Long id) {
+        String base64QRCode = QRCodeUtil.getBase64QRCode(String.valueOf(id));
+        return ReturnUtil.success(base64QRCode);
+    }
+
 }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOrderInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOrderInfoServiceImpl.java
index 82952ad..d8d2c6a 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOrderInfoServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOrderInfoServiceImpl.java
@@ -35,6 +35,7 @@
 import javax.servlet.http.HttpServletResponse;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 import java.util.stream.Collectors;
 
 /**
@@ -209,13 +210,16 @@
     private QueryWrapper<OrderListResponse> listParamWrapperBuilder(OrderListRequest request) {
         QueryWrapper<OrderListResponse> wrapper = new QueryWrapper<>();
         wrapper.like(StringUtils.isNotBlank(request.getOrderNo()), "order_no", request.getOrderNo());
+        wrapper.like(Objects.nonNull(request.getCustomerId()), "customer_id", request.getCustomerId());
         wrapper.like(StringUtils.isNotBlank(request.getCustomerName()), "customer_name", request.getCustomerName());
         wrapper.like(StringUtils.isNotBlank(request.getDeliverer()), "deliverer", request.getDeliverer());
         wrapper.like(StringUtils.isNotBlank(request.getCreateUserName()), "create_user_name", request.getCreateUserName());
-        wrapper.apply(StringUtils.isNotBlank(request.getCreateStartTime()),
-                "{0} <= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getCreateStartTime().split(" ")[0]);
-        wrapper.apply(StringUtils.isNotBlank(request.getCreateEndTime()),
-                "{0} >= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getCreateEndTime().split(" ")[0]);
+        if(StringUtils.isNotBlank(request.getCreateStartTime())){
+            wrapper.apply("{0} <= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getCreateStartTime().split(" ")[0]);
+        }
+        if(StringUtils.isNotBlank(request.getCreateEndTime())){
+            wrapper.apply("{0} >= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getCreateEndTime().split(" ")[0]);
+        }
         wrapper.orderByDesc("create_time");
         return wrapper;
     }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceAssessServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceAssessServiceImpl.java
index c6af980..ce40138 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceAssessServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceAssessServiceImpl.java
@@ -1,10 +1,33 @@
 package com.casic.missiles.service.Impl.business;
 
-import com.casic.missiles.model.business.BizBusinessOutsourceAssess;
+import cn.hutool.core.lang.Assert;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.casic.missiles.core.model.auth.AuthUser;
+import com.casic.missiles.core.shiro.ShiroKit;
+import com.casic.missiles.dto.BaseApprovalSubmitRequest;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.ReturnUtil;
+import com.casic.missiles.dto.business.outsource.OutsourceAssessApprovalListRequest;
+import com.casic.missiles.dto.business.outsource.OutsourceAssessSaveResponse;
+import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.NoGenerateFileCodeEnum;
+import com.casic.missiles.enums.NoGenerateRecordTypeCodeEnum;
+import com.casic.missiles.enums.system.ApprovalStatusEnum;
+import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.mapper.business.BizBusinessOutsourceAssessMapper;
+import com.casic.missiles.model.business.BizBusinessOutsourceAssess;
+import com.casic.missiles.model.business.BizBusinessOutsourceAssessSampleRelation;
+import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl;
+import com.casic.missiles.service.business.IBizBusinessOutsourceAssessSampleRelationService;
 import com.casic.missiles.service.business.IBizBusinessOutsourceAssessService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.casic.missiles.utils.NoGeneratorUtil;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Objects;
 
 /**
  * <p>
@@ -15,6 +38,103 @@
  * @since 2023-08-16
  */
 @Service
-public class BizBusinessOutsourceAssessServiceImpl extends ServiceImpl<BizBusinessOutsourceAssessMapper, BizBusinessOutsourceAssess> implements IBizBusinessOutsourceAssessService {
+public class BizBusinessOutsourceAssessServiceImpl extends GeneralApprovalServiceImpl<BizBusinessOutsourceAssessMapper, BizBusinessOutsourceAssess, BizBusinessOutsourceAssess, OutsourceAssessApprovalListRequest, BaseApprovalSubmitRequest> implements IBizBusinessOutsourceAssessService {
+    @Autowired
+    private IBizBusinessOutsourceAssessSampleRelationService outsourceAssessSampleRelationService;
 
+    @Override
+    public ReturnDTO<OutsourceAssessSaveResponse> saveOutsourceAssess(BizBusinessOutsourceAssess request) {
+        //生成编号
+        String labCode = request.getLabCode();
+        String groupCode = request.getGroupCode();
+        Long maxNo = this.baseMapper.selectMaxProjectNo();
+        String projectNo = NoGeneratorUtil.getCode(NoGenerateFileCodeEnum.D, labCode, NoGenerateRecordTypeCodeEnum.OUTSOURCE_ACCESS, groupCode, maxNo);
+        request.setCreateUserId(request.getUserId());
+        request.setCreateUserName(request.getUserName());
+        request.setApprovalStatus(ApprovalStatusEnum.DRAFT); //草稿箱状态
+        request.setProjectNo(projectNo);
+        int row = this.baseMapper.insert(request);
+        Assert.isFalse(row <= 0, () -> {
+            throw new BusinessException(BusinessExceptionEnum.OUTSOURCE_ACCESS_SAVE_FAILED);
+        });
+        //关联表
+        saveRelationData(request);
+        OutsourceAssessSaveResponse saveResponse = new OutsourceAssessSaveResponse();
+        saveResponse.setId(request.getId());
+        saveResponse.setProjectNo(projectNo);
+        return ReturnUtil.success(saveResponse);
+    }
+
+    @Override
+    @Transactional
+    public ReturnDTO draftUpdate(BizBusinessOutsourceAssess request) {
+        if (this.baseMapper.updateById(request) > 0) {
+            //关联表删除、增加
+            removeRelationData(request.getId());
+            saveRelationData(request);
+            return ReturnUtil.success();
+        }
+        throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
+    }
+
+    @Override
+    public ReturnDTO draftDelete(Long id) {
+        if (this.baseMapper.deleteById(id) > 0) {
+            //关联表删除
+            removeRelationData(id);
+            return ReturnUtil.success();
+        }
+        throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
+    }
+
+    @Override
+    public ReturnDTO draftBatchDelete(List<Long> ids) {
+        if (this.baseMapper.deleteBatchIds(ids) >= 0) {
+            ids.forEach(id -> removeRelationData(id));
+            return ReturnUtil.success();
+        }
+        throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
+    }
+
+    @Override
+    @Transactional
+    public ReturnDTO failUpdate(BizBusinessOutsourceAssess request) {
+        AuthUser user = ShiroKit.getUser();
+        Assert.isFalse(Objects.isNull(user), () -> {
+            throw new BusinessException(BusinessExceptionEnum.LOGIN_USER_ACQUIRE_FAILED);
+        });
+        request.setApprovalStatus(ApprovalStatusEnum.IN_APPROVED);
+        if (this.baseMapper.updateById(request) > 0) {
+            //关联表删除、增加
+            removeRelationData(request.getId());
+            saveRelationData(request);
+            baseApprovalService.failUpdate(request.getProcessId());
+            return ReturnUtil.success();
+        }
+        throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
+    }
+
+    private void saveRelationData(BizBusinessOutsourceAssess request) {
+        List<BizBusinessOutsourceAssessSampleRelation> sampleRelations = new ArrayList<>();
+        request.getOrderSampleList().forEach(dto -> {
+            BizBusinessOutsourceAssessSampleRelation relation = new BizBusinessOutsourceAssessSampleRelation();
+            relation.setOrderId(dto.getOrderId());
+            relation.setSampleId(dto.getSampleId());
+            relation.setAccessId(request.getId());
+            sampleRelations.add(relation);
+        });
+        if(outsourceAssessSampleRelationService.saveBatch(sampleRelations)){
+            return;
+        }
+        throw new BusinessException(BusinessExceptionEnum.OUTSOURCE_ACCESS_SAVE_FAILED);
+    }
+
+    private void removeRelationData(Long assessId) {
+        QueryWrapper<BizBusinessOutsourceAssessSampleRelation> wrapper = new QueryWrapper<>();
+        wrapper.eq("access_id", assessId);
+        if(outsourceAssessSampleRelationService.remove(wrapper)){
+            return;
+        }
+        throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
+    }
 }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceProtocolServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceProtocolServiceImpl.java
new file mode 100644
index 0000000..821e728
--- /dev/null
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceProtocolServiceImpl.java
@@ -0,0 +1,60 @@
+package com.casic.missiles.service.Impl.business;
+
+import cn.hutool.core.lang.Assert;
+import com.casic.missiles.dto.BaseApprovalSubmitRequest;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.ReturnUtil;
+import com.casic.missiles.dto.business.outsource.OutsourceProtocolApprovalListRequest;
+import com.casic.missiles.dto.business.outsource.OutsourceProtocolSaveResponse;
+import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.NoGenerateFileCodeEnum;
+import com.casic.missiles.enums.NoGenerateRecordTypeCodeEnum;
+import com.casic.missiles.enums.system.ApprovalStatusEnum;
+import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.mapper.business.BizBusinessOutsourceProtocolMapper;
+import com.casic.missiles.mapper.business.BizBusinessOutsourcerInfoMapper;
+import com.casic.missiles.model.business.BizBusinessOutsourceProtocol;
+import com.casic.missiles.model.business.BizBusinessOutsourcerInfo;
+import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl;
+import com.casic.missiles.service.business.IBizBusinessOutsourceProtocolService;
+import com.casic.missiles.utils.NoGeneratorUtil;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 计量检定业务-分包管理-测试、校准或检定工作分包协议书 服务实现类
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-08-24
+ */
+@Service
+public class BizBusinessOutsourceProtocolServiceImpl extends GeneralApprovalServiceImpl<BizBusinessOutsourceProtocolMapper, BizBusinessOutsourceProtocol, BizBusinessOutsourceProtocol, OutsourceProtocolApprovalListRequest, BaseApprovalSubmitRequest> implements IBizBusinessOutsourceProtocolService {
+    @Autowired
+    private BizBusinessOutsourcerInfoMapper outsourcerInfoMapper;
+
+    @Override
+    public ReturnDTO<OutsourceProtocolSaveResponse> saveOutsourceProtocol(BizBusinessOutsourceProtocol request) {
+        //生成编号
+        String labCode = request.getLabCode();
+        String groupCode = request.getGroupCode();
+        Long maxNo = this.baseMapper.selectMaxProtocolNo();
+        String protocolNo = NoGeneratorUtil.getCode(NoGenerateFileCodeEnum.D, labCode, NoGenerateRecordTypeCodeEnum.OUTSOURCE_PROTOCOL, groupCode, maxNo);
+        request.setCreateUserId(request.getUserId());
+        request.setCreateUserName(request.getUserName());
+        request.setApprovalStatus(ApprovalStatusEnum.DRAFT); //草稿箱状态
+        request.setProtocolNo(protocolNo);
+        BizBusinessOutsourcerInfo outsourcerInfo = outsourcerInfoMapper.selectById(request.getOutsourcerId());
+        request.setOutsourceNo(outsourcerInfo.getOutsourcerNo());
+        request.setOutsourceName(outsourcerInfo.getOutsourcerName());
+        int row = this.baseMapper.insert(request);
+        Assert.isFalse(row <= 0, () -> {
+            throw new BusinessException(BusinessExceptionEnum.OUTSOURCE_PROTOCOL_SAVE_FAILED);
+        });
+        OutsourceProtocolSaveResponse saveResponse = new OutsourceProtocolSaveResponse();
+        saveResponse.setId(request.getId());
+        saveResponse.setProtocolNo(protocolNo);
+        return ReturnUtil.success(saveResponse);
+    }
+}
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourcerInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourcerInfoServiceImpl.java
index 75f639d..8aadad7 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourcerInfoServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourcerInfoServiceImpl.java
@@ -3,12 +3,12 @@
 import cn.hutool.core.lang.Assert;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.dto.*;
 import com.casic.missiles.dto.business.outsource.OutsourcerInfoApprovalListRequest;
 import com.casic.missiles.dto.business.outsource.OutsourcerSaveResponse;
 import com.casic.missiles.enums.BusinessExceptionEnum;
-import com.casic.missiles.enums.PrefixCodeEnum;
+import com.casic.missiles.enums.NoGenerateFileCodeEnum;
+import com.casic.missiles.enums.NoGenerateRecordTypeCodeEnum;
 import com.casic.missiles.enums.system.ApprovalStatusEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.mapper.business.BizBusinessOutsourcerInfoMapper;
@@ -20,7 +20,7 @@
 import com.casic.missiles.service.business.IBizBusinessOutsourcerInfoService;
 import com.casic.missiles.service.business.IBizBusinessOutsourcerUserInfoService;
 import com.casic.missiles.utils.DictCodeUtils;
-import com.casic.missiles.utils.NumberGeneratorUtil;
+import com.casic.missiles.utils.NoGeneratorUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -42,22 +42,12 @@
     private IBizBusinessOutsourcerUserInfoService outsourcerUserInfoService;
 
     @Override
-    public List<BizBusinessOutsourcerInfo> list(OutsourcerInfoApprovalListRequest request) {
-        request.setCreateUserId(null);
-        request.setApprovalStatus(ApprovalStatusEnum.PASSED);
-        Page<BizBusinessOutsourcerInfo> page = PageFactory.defaultPage();
-        page.setCurrent(1);
-        page.setSearchCount(false);
-        page.setSize(Integer.MAX_VALUE);
-        Page<BizBusinessOutsourcerInfo> resultPage = this.baseMapper.selectBatchForApprovalList(page, request, null);
-        return resultPage.getRecords();
-    }
-
-    @Override
     public ReturnDTO<OutsourcerSaveResponse> saveOutsourcer(BizBusinessOutsourcerInfo request) {
         //生成编号
+        String labCode = request.getLabCode();
+        String groupCode = request.getGroupCode();
         Long maxNo = this.baseMapper.selectMaxNo();
-        String outsourcerNo = NumberGeneratorUtil.getContactNo(PrefixCodeEnum.OUTSOURCER_PREFIX, maxNo);
+        String outsourcerNo = NoGeneratorUtil.getCode(NoGenerateFileCodeEnum.D, labCode, NoGenerateRecordTypeCodeEnum.OUTSOURCE_INFO, groupCode, maxNo);
         request.setOutsourcerNo(outsourcerNo);
         request.setCreateUserId(request.getUserId());
         request.setCreateUserName(request.getUserName());
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessSiteExecutiveInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessSiteExecutiveInfoServiceImpl.java
index ebab3e6..6c6a129 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessSiteExecutiveInfoServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessSiteExecutiveInfoServiceImpl.java
@@ -189,9 +189,9 @@
         QueryWrapper<BizBusinessSiteExecutiveStaffRelation> mWrapper = new QueryWrapper<>();
         mWrapper.eq("site_executive_id", siteExecutiveId);
         boolean mRemove = siteExecutiveStaffRelationService.remove(mWrapper);
-        Assert.isFalse(eRemove || mRemove, () -> {
+        if(!eRemove || !mRemove){
             throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
-        });
+        }
     }
 
     private void doPopulateSiteExecutive(SiteExecutiveDetailResponse detailResponse) {
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessLabExecutiveInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessLabExecutiveInfoServiceImpl.java
index 50c5616..0242fcf 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessLabExecutiveInfoServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessLabExecutiveInfoServiceImpl.java
@@ -297,6 +297,29 @@
     }
 
     @Override
+    public List<SampleLabExecutiveListResponse> deptLabExecutiveList(SampleLabExecutiveListRequest request) throws Exception {
+        Page<SampleLabExecutiveListResponse> page = PageFactory.defaultPage();
+        page.setCurrent(1);
+        page.setSearchCount(false);
+        page.setSize(Integer.MAX_VALUE);
+        Page<SampleLabExecutiveListResponse> resultPage = this.deptLabExecutiveListPage(page, request);
+        return resultPage.getRecords();
+    }
+
+    @Override
+    public List<SampleLabExecutiveListResponse> deptLabExecutiveListByIds(String measureStatus, List<Long> ids) throws Exception {
+        Page<SampleLabExecutiveListResponse> page = PageFactory.defaultPage();
+        page.setCurrent(1);
+        page.setSearchCount(false);
+        page.setSize(Integer.MAX_VALUE);
+        SampleLabExecutiveListRequest request = new SampleLabExecutiveListRequest();
+        request.setIds(ids);
+        request.setMeasureStatus(measureStatus);
+        Page<SampleLabExecutiveListResponse> resultPage = this.deptLabExecutiveListPage(page, request);
+        return resultPage.getRecords();
+    }
+
+    @Override
     public Page<SampleLabExecutiveListResponse> myLabExecutiveListPage(Page<SampleLabExecutiveListResponse> page, SampleLabExecutiveListRequest labExecutiveListRequest) throws Exception{
         AuthUser user = ShiroKit.getUser();
         Assert.isFalse(Objects.isNull(user), () -> {
@@ -350,6 +373,29 @@
     }
 
     @Override
+    public List<SampleLabExecutiveListResponse> myLabExecutiveList(SampleLabExecutiveListRequest request) throws Exception {
+        Page<SampleLabExecutiveListResponse> page = PageFactory.defaultPage();
+        page.setCurrent(1);
+        page.setSearchCount(false);
+        page.setSize(Integer.MAX_VALUE);
+        Page<SampleLabExecutiveListResponse> resultPage = this.myLabExecutiveListPage(page, request);
+        return resultPage.getRecords();
+    }
+
+    @Override
+    public List<SampleLabExecutiveListResponse> myLabExecutiveListByIds(String measureStatus, List<Long> ids) throws Exception {
+        Page<SampleLabExecutiveListResponse> page = PageFactory.defaultPage();
+        page.setCurrent(1);
+        page.setSearchCount(false);
+        page.setSize(Integer.MAX_VALUE);
+        SampleLabExecutiveListRequest request = new SampleLabExecutiveListRequest();
+        request.setIds(ids);
+        request.setMeasureStatus(measureStatus);
+        Page<SampleLabExecutiveListResponse> resultPage = this.myLabExecutiveListPage(page, request);
+        return resultPage.getRecords();
+    }
+
+    @Override
     public List<SampleAmountResponse> myExecutiveAmount() {
         //登录用户id获取计量人员id，实验室检测信息中存储的是计量人员id
         AuthUser user = ShiroKit.getUser();
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentInfoServiceImpl.java
index 864b05e..db8cad4 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentInfoServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentInfoServiceImpl.java
@@ -35,7 +35,6 @@
 import com.casic.missiles.utils.ConvertUtils;
 import com.casic.missiles.utils.DictCodeUtils;
 import com.casic.missiles.utils.NumberGeneratorUtil;
-import org.flowable.engine.RuntimeService;
 import org.flowable.engine.runtime.ProcessInstance;
 import org.jetbrains.annotations.NotNull;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -43,7 +42,6 @@
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
 
-import javax.annotation.Resource;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
@@ -81,8 +79,6 @@
     private IBizEquipmentAttachmentService attachmentService;
     @Autowired
     private IBizEquipmentCheckpointService checkpointService;
-    @Resource
-    private RuntimeService runtimeService;
     @Autowired
     private ApprovalOperateService approvalOperateService;
 
@@ -235,18 +231,18 @@
     private void updateRelationInfo(EquipmentAddRequest request, BizEquipmentInfoApproval equipmentInfoApproval) {
         QueryWrapper<BizEquipmentTechnicalTarget> targetWrapper = new QueryWrapper<>();
         targetWrapper.eq("equipment_no", equipmentInfoApproval.getEquipmentNo());
-        boolean removeTargetFlag = technicalTargetService.remove(targetWrapper);
-        boolean saveTargetFlag = technicalTargetService.saveBatch(request.getTechnicalTargetList());
+        technicalTargetService.remove(targetWrapper);
+        technicalTargetService.saveBatch(request.getTechnicalTargetList());
 
         QueryWrapper<BizEquipmentAttachment> attachmentWrapper = new QueryWrapper<>();
         attachmentWrapper.eq("equipment_no", equipmentInfoApproval.getEquipmentNo());
-        boolean removeAttachmentFlag = attachmentService.remove(attachmentWrapper);
-        boolean saveAttachmentFlag = attachmentService.saveBatch(request.getAttachmentList());
+        attachmentService.remove(attachmentWrapper);
+        attachmentService.saveBatch(request.getAttachmentList());
 
         QueryWrapper<BizEquipmentCheckpoint> checkpointWrapper = new QueryWrapper<>();
         checkpointWrapper.eq("equipment_no", equipmentInfoApproval.getEquipmentNo());
-        boolean removeCheckpointFlag = checkpointService.remove(checkpointWrapper);
-        boolean saveCheckpointFlag = checkpointService.saveBatch(request.getCheckpointList());
+        checkpointService.remove(checkpointWrapper);
+        checkpointService.saveBatch(request.getCheckpointList());
     }
 
     @Override
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardInfoServiceImpl.java
index faff1ae..c50a5b3 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardInfoServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardInfoServiceImpl.java
@@ -22,7 +22,9 @@
 import com.casic.missiles.mapper.equipment.BizEquipmentStandardInfoMapper;
 import com.casic.missiles.mapper.equipment.BizEquipmentStandardTechnologyRelationMapper;
 import com.casic.missiles.mapper.resource.BizResourceStaffInfoMapper;
-import com.casic.missiles.model.equipment.*;
+import com.casic.missiles.model.equipment.BizEquipmentStandardInfo;
+import com.casic.missiles.model.equipment.BizEquipmentStandardInfoApproval;
+import com.casic.missiles.model.equipment.BizEquipmentStandardTechnologyRelation;
 import com.casic.missiles.model.resource.BizResourceStaffInfo;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.dao.DeptMapper;
@@ -33,14 +35,12 @@
 import com.casic.missiles.service.flowable.ApprovalOperateService;
 import com.casic.missiles.utils.ConvertUtils;
 import com.casic.missiles.utils.DictCodeUtils;
-import org.flowable.engine.RuntimeService;
 import org.flowable.engine.runtime.ProcessInstance;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
 
-import javax.annotation.Resource;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
@@ -62,8 +62,6 @@
     private BizResourceStaffInfoMapper staffInfoMapper;
     @Autowired
     private IBaseApprovalService baseApprovalService;
-    @Resource
-    private RuntimeService runtimeService;
     @Autowired
     private ApprovalOperateService approvalOperateService;
     @Autowired
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSealInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSealInfoServiceImpl.java
index 7c91fa2..00040d6 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSealInfoServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSealInfoServiceImpl.java
@@ -15,6 +15,7 @@
 import com.casic.missiles.modular.system.model.User;
 import com.casic.missiles.service.resource.IBizResourceSealInfoService;
 import com.casic.missiles.utils.DictCodeUtils;
+import com.casic.missiles.utils.MinioUtil;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -33,6 +34,8 @@
     private BizResourceSealInfoMapper sealInfoMapper;
     @Autowired
     private UserMapper userMapper;
+    @Autowired
+    private MinioUtil minioUtil;
 
     @Override
     public Page<BizResourceSealInfo> listPage(Page<BizResourceSealInfo> page, SealInfoListRequest request) throws Exception {
@@ -44,6 +47,7 @@
         Page<BizResourceSealInfo> sealInfoPage = sealInfoMapper.selectPage(page, wrapper);
         for (BizResourceSealInfo record : sealInfoPage.getRecords()) {
             DictCodeUtils.convertDictCodeToName(record);
+            record.setMinioFileUrl(minioUtil.getFileUrl(record.getMinioFileName()));
         }
         return sealInfoPage;
     }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceStaffInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceStaffInfoServiceImpl.java
index f058cf5..09203ac 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceStaffInfoServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceStaffInfoServiceImpl.java
@@ -3,6 +3,7 @@
 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.core.page.PageFactory;
 import com.casic.missiles.dto.IdDTO;
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
@@ -86,6 +87,13 @@
     }
 
     @Override
+    public List<BizResourceStaffInfo> list(StaffListRequest request) throws Exception {
+        Page<BizResourceStaffInfo> page = PageFactory.defaultPage();
+        Page<BizResourceStaffInfo> staffInfoPage = this.listPage(page, request);
+        return staffInfoPage.getRecords();
+    }
+
+    @Override
     @Transactional
     public ReturnDTO<IdDTO> staffBaseAdd(BizResourceStaffInfo staffInfo) {
         //登录账号查重
@@ -495,6 +503,28 @@
         return certResponsePage;
     }
 
+    @Override
+    public List<StaffCertResponse> certListByIds(List<Long> ids) throws Exception {
+        Page<StaffCertResponse> page = PageFactory.defaultPage();
+        page.setCurrent(1);
+        page.setSearchCount(false);
+        page.setSize(Integer.MAX_VALUE);
+        StaffCertRequest request = new StaffCertRequest();
+        request.setIds(ids);
+        Page<StaffCertResponse> resultPage = this.certListPage(page, request);
+        return resultPage.getRecords();
+    }
+
+    @Override
+    public List<StaffCertResponse> certList(StaffCertRequest request) throws Exception {
+        Page<StaffCertResponse> page = PageFactory.defaultPage();
+        page.setCurrent(1);
+        page.setSearchCount(false);
+        page.setSize(Integer.MAX_VALUE);
+        Page<StaffCertResponse> resultPage = this.certListPage(page, request);
+        return resultPage.getRecords();
+    }
+
     @Async
     public void deleteRelationInfo(Long staffId){
         QueryWrapper<BizResourceStaffEducation> educationWrapper = new QueryWrapper<>();
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceStaffVerifierServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceStaffVerifierServiceImpl.java
index 8ac7eee..b508d45 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceStaffVerifierServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceStaffVerifierServiceImpl.java
@@ -52,8 +52,8 @@
     private WebSocket webSocket;
 
     @Override
-    public ReturnDTO expirationReminder(IdDTO idDto) {
-        BizResourceStaffVerifier staffVerifier = verifierMapper.selectById(idDto.getId());
+    public ReturnDTO expirationReminder(IdDTO idDTO) {
+        BizResourceStaffVerifier staffVerifier = verifierMapper.selectById(idDTO.getId());
         BizResourceStaffInfo staffInfo = staffInfoMapper.selectById(staffVerifier.getStaffId());
         QueryWrapper<User> wrapper = new QueryWrapper<>();
         wrapper.eq("account", staffInfo.getAccount());
@@ -65,7 +65,7 @@
         Assert.isFalse(Objects.isNull(user), () -> {
             throw new BusinessException(BusinessExceptionEnum.LOGIN_USER_ACQUIRE_FAILED);
         });
-        WorkbenchRemindMessage remindMessage = new WorkbenchRemindMessage(userInfo.getId(), userInfo.getDeptId(), idDto.getId(), staffVerifier.getCertNo(), MessageTypeEnum.STAFF_CERT.getCode(), MessageSourceModuleEnum.RESOURCE.getCode(), MessageTypeEnum.STAFF_CERT.getValue(), MessageTypeEnum.STAFF_CERT.getValue(), staffVerifier.getCertName(),0, user.getId(), user.getName());
+        WorkbenchRemindMessage remindMessage = new WorkbenchRemindMessage(userInfo.getId(), userInfo.getDeptId(), idDTO.getId(), staffVerifier.getCertNo(), MessageTypeEnum.STAFF_CERT.getCode(), MessageSourceModuleEnum.RESOURCE.getCode(), MessageTypeEnum.STAFF_CERT.getValue(), MessageTypeEnum.STAFF_CERT.getValue(), staffVerifier.getCertName(),0, user.getId(), user.getName());
         if(messageMapper.insert(remindMessage) > 0){
             // 新增到消息列表后向用户推送消息
             webSocket.sendOneMessage(String.valueOf(userInfo.getId()), JSONObject.toJSONString(remindMessage));
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceTrainInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceTrainInfoServiceImpl.java
index c1d6308..3a533f2 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceTrainInfoServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceTrainInfoServiceImpl.java
@@ -44,11 +44,14 @@
     @Override
     public Page<BizResourceTrainInfo> listPage(Page<BizResourceTrainInfo> page, TrainListRequest request) throws Exception {
         QueryWrapper<BizResourceTrainInfo> wrapper = new QueryWrapper<>();
-        wrapper.like("train_no", request.getTrainNo());
-        wrapper.apply(StringUtils.isNotBlank(request.getCreateTimeStart()),//apply方法传入参数名不能为空
-                "{0} <= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getCreateTimeStart().split(" ")[0]);
-        wrapper.apply(StringUtils.isNotBlank(request.getCreateTimeEnd()),
-                "{0} >= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getCreateTimeEnd().split(" ")[0]);
+        wrapper.like(StringUtils.isNotEmpty(request.getTrainNo()), "train_no", request.getTrainNo());
+        wrapper.like(StringUtils.isNotEmpty(request.getDutyLeader()),"duty_leader", request.getDutyLeader());
+        if(StringUtils.isNotBlank(request.getCreateTimeStart())){
+            wrapper.apply("{0} <= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getCreateTimeStart().split(" ")[0]);
+        }
+        if(StringUtils.isNotBlank(request.getCreateTimeEnd())){
+            wrapper.apply("{0} >= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getCreateTimeEnd().split(" ")[0]);
+        }
         wrapper.orderByDesc("create_time");
         Page<BizResourceTrainInfo> trainInfoPage = trainInfoMapper.selectPage(page, wrapper);
         for (BizResourceTrainInfo record : trainInfoPage.getRecords()) {
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/EnvLocationInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/EnvLocationInfoServiceImpl.java
new file mode 100644
index 0000000..cdc5742
--- /dev/null
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/EnvLocationInfoServiceImpl.java
@@ -0,0 +1,31 @@
+package com.casic.missiles.service.Impl.resource;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.casic.missiles.dto.resource.environment.LocationListRequest;
+import com.casic.missiles.dto.resource.environment.LocationListResponse;
+import com.casic.missiles.mapper.resource.EnvLocationInfoMapper;
+import com.casic.missiles.model.resource.EnvLocationInfo;
+import com.casic.missiles.service.resource.IEnvLocationInfoService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 实验室环境监控系统-设备表 服务实现类
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-06-07
+ */
+@Service
+public class EnvLocationInfoServiceImpl extends ServiceImpl<EnvLocationInfoMapper, EnvLocationInfo> implements IEnvLocationInfoService {
+    @Autowired
+    private EnvLocationInfoMapper locationInfoMapper;
+
+    @Override
+    public Page<LocationListResponse> listPage(Page<LocationListResponse> page, LocationListRequest request) {
+        Page<LocationListResponse> resultPage = locationInfoMapper.selectLocationListPage(page, request);
+        return resultPage;
+    }
+}
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/DownloadCenterServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/DownloadCenterServiceImpl.java
index c956d24..d9f3282 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/DownloadCenterServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/DownloadCenterServiceImpl.java
@@ -131,10 +131,12 @@
         wrapper.like(StringUtils.isNotBlank(request.getModuleName()), "module_name", request.getModuleName());
         wrapper.like(StringUtils.isNotBlank(request.getFileName()), "file_name", request.getFileName());
         wrapper.like(StringUtils.isNotBlank(request.getFileType()), "file_type", request.getFileType());
-        wrapper.apply(StringUtils.isNotBlank(request.getStartTime()),
-                "{0} <= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getStartTime().split(" ")[0]);
-        wrapper.apply(StringUtils.isNotBlank(request.getEndTime()),
-                "{0} >= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getEndTime().split(" ")[0]);
+        if(StringUtils.isNotBlank(request.getStartTime())){
+            wrapper.apply("{0} <= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getStartTime().split(" ")[0]);
+        }
+        if(StringUtils.isNotBlank(request.getEndTime())){
+            wrapper.apply("{0} >= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getEndTime().split(" ")[0]);
+        }
         wrapper.orderByDesc("create_time");
         return wrapper;
     }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemSignServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemSignServiceImpl.java
index 41976bb..7e90a09 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemSignServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemSignServiceImpl.java
@@ -52,15 +52,14 @@
 
     @Override
     public Page<SystemSign> listPage(Page<SystemSign> page, SignListRequest request) {
-        QueryWrapper<SystemSign> wrapper = getWrapper(request);
-        Page<SystemSign> signPage = signMapper.selectPage(page, wrapper);
+        Page<SystemSign> signPage = signMapper.selectSignListPage(page, request);
         return signPage;
     }
 
     @Override
     public List<SystemSign> list(SignListRequest request) {
-        QueryWrapper<SystemSign> wrapper = getWrapper(request);
-        return signMapper.selectList(wrapper);
+        List<SystemSign> signList = signMapper.selectSignList(request);
+        return signList;
     }
 
     @Override
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessCertificatePrintService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessCertificatePrintService.java
index 03247ab..7d6db77 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessCertificatePrintService.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessCertificatePrintService.java
@@ -9,6 +9,8 @@
 import com.casic.missiles.model.business.BizBusinessCertificatePrintLog;
 import com.casic.missiles.model.business.BizBusinessCertificateReport;
 
+import java.util.List;
+
 /**
  * <p>
  * 计量检定业务-任务计量管理-证书管理 服务类
@@ -30,4 +32,9 @@
     ReturnDTO certificatePrintStatus(Long id, String printStatus);
 
     ReturnDTO<BizBusinessCertificatePrintLog> certificatePrintLog(Long id);
+
+    List<CertificatePrintListResponse> listByIds(List<Long> ids);
+
+    List<CertificatePrintListResponse> list(CertificatePrintApprovalListRequest request);
+
 }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessCertificateReportService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessCertificateReportService.java
index 305ac7f..b33ef22 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessCertificateReportService.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessCertificateReportService.java
@@ -21,6 +21,4 @@
     ReturnDTO<CertificateReportSaveResponse> saveCertificateReport(BizBusinessCertificateReport request);
 
     ReturnDTO<BizBusinessCertificateReport> detail(BaseDetailRequest request);
-
-
 }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessIdentifyInfoService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessIdentifyInfoService.java
index 53c49d0..6d2089f 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessIdentifyInfoService.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessIdentifyInfoService.java
@@ -6,6 +6,8 @@
 import com.casic.missiles.model.business.BizBusinessIdentifyInfo;
 import com.baomidou.mybatisplus.extension.service.IService;
 
+import java.util.List;
+
 /**
  * <p>
  * 计量检定业务-任务计量管理-标识打印 服务类
@@ -20,7 +22,11 @@
 
     ReturnDTO addIdentify(BizBusinessIdentifyInfo identifyInfo);
 
-    ReturnDTO updateIdentify(BizBusinessIdentifyInfo identifyInfo);
+    ReturnDTO updateIdentify(Long id);
 
     ReturnDTO deleteIdentify(Long id);
+
+    List<BizBusinessIdentifyInfo> list(IdentifyListRequest request) throws Exception;
+
+    ReturnDTO<String> equipmentQrCode(Long id);
 }

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java
index bb0c50f..13a699b 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java
@@ -12,6 +12,7 @@
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.IGeneralApprovalService;
+import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
@@ -19,6 +20,7 @@
 import org.springframework.web.bind.annotation.RequestBody;
 
 import javax.validation.Valid;
+import java.util.List;
 import java.util.Objects;
 
 /**
@@ -117,4 +119,17 @@
         }
         return baseApprovalService.failUpdate(request);
     }
+
+    public List<O> exportList(@RequestBody @Valid R request) throws Exception {
+        List<O> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = baseApprovalService.listExportByIds(request.getIds());
+        } else {
+            list = baseApprovalService.listExport(request);
+        }
+        for (O record : list) {
+            DictCodeUtils.convertDictCodeToName(record);
+        }
+        return list;
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java
index 8a90961..d775831 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java
@@ -5,6 +5,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.business.certificate.CertificateChangeApplyApprovalListRequest;
 import com.casic.missiles.dto.business.certificate.CertificateChangeApplySaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessCertificateChangeApply;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
@@ -20,6 +21,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -48,4 +50,12 @@
         }
         return changeApplyService.saveChangeApply(request);
     }
+
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody CertificateChangeApplyApprovalListRequest request) throws Exception {
+        List<BizBusinessCertificateChangeApply> list = super.exportList(request);
+        super.exportExcel(BizBusinessCertificateChangeApply.class, list, ExportEnum.CERTIFICATE_CHANGE_APPLY.getSheetName());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java
index 5fc4b07..af8230e 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java
@@ -9,6 +9,7 @@
 import com.casic.missiles.dto.business.certificate.CertificatePrintApprovalListRequest;
 import com.casic.missiles.dto.business.certificate.CertificatePrintListResponse;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.enums.business.CertificatePrintStatusEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessCertificatePrintLog;
@@ -18,10 +19,16 @@
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.io.IOException;
+import java.util.List;
 import java.util.Objects;
 
 /**
@@ -98,4 +105,16 @@
         });
         return certificatePrintService.certificatePrintLog(idDTO.getId());
     }
+
+    @ApiOperation("证书打印审批导出")
+    @PostMapping("/listExport")
+    public void exportList(@RequestBody CertificatePrintApprovalListRequest request) throws IOException {
+        List<CertificatePrintListResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = certificatePrintService.listByIds(request.getIds());
+        } else {
+            list = certificatePrintService.list(request);
+        }
+        super.exportExcel(CertificatePrintListResponse.class, list, ExportEnum.CERTIFICATE_PRINT.getSheetName());
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java
index 63b06dc..6b2efd5 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java
@@ -6,6 +6,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.business.certificate.CertificateReportApprovalListRequest;
 import com.casic.missiles.dto.business.certificate.CertificateReportSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessCertificateReport;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
@@ -21,6 +22,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -50,7 +52,7 @@
         return certificateReportService.saveCertificateReport(request);
     }
 
-    @ApiOperation("证书审批详情（基本信息）")
+    @ApiOperation("详情（基本信息）")
     @PostMapping("/detail")
     public ReturnDTO<BizBusinessCertificateReport> detail(@RequestBody @Valid BaseDetailRequest request, BindingResult bindingResult) throws Exception {
         if(bindingResult.hasErrors()){
@@ -59,4 +61,11 @@
         return certificateReportService.detail(request);
     }
 
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody CertificateReportApprovalListRequest request) throws Exception {
+        List<BizBusinessCertificateReport> list = super.exportList(request);
+        super.exportExcel(BizBusinessCertificateReport.class, list, ExportEnum.CERTIFICATE_REPORT.getSheetName());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java
index 46b26bd..57c0809 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java
@@ -10,20 +10,21 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.business.identify.IdentifyListRequest;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessIdentifyInfo;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.business.IBizBusinessIdentifyInfoService;
+import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import javax.validation.Valid;
+import java.util.List;
 import java.util.Objects;
 
 /**
@@ -57,16 +58,13 @@
         return identifyInfoService.addIdentify(identifyInfo);
     }
 
-    @ApiOperation("标识打印更新")
+    @ApiOperation("标识打印更新（更新打印时间）")
     @PostMapping("/update")
-    public ReturnDTO updateIdentify(@RequestBody @Valid BizBusinessIdentifyInfo identifyInfo, BindingResult bindingResult) {
-        Assert.isFalse(Objects.isNull(identifyInfo.getId()), () -> {
+    public ReturnDTO updateIdentify(@RequestBody @Valid IdDTO idDTO) {
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        Assert.isFalse(bindingResult.hasErrors(), () -> {
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        });
-        return identifyInfoService.updateIdentify(identifyInfo);
+        return identifyInfoService.updateIdentify(idDTO.getId());
     }
 
     @ApiOperation("标识打印删除")
@@ -77,4 +75,37 @@
         });
         return identifyInfoService.deleteIdentify(idDTO.getId());
     }
+
+    @ApiOperation("标识打印导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody @Valid IdentifyListRequest request, BindingResult bindingResult) throws Exception {
+        if (bindingResult.hasErrors()) {
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        List<BizBusinessIdentifyInfo> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = identifyInfoService.listByIds(request.getIds());
+        } else {
+            list = identifyInfoService.list(request);
+        }
+        for (BizBusinessIdentifyInfo record : list) {
+            DictCodeUtils.convertDictCodeToName(record);
+        }
+        super.exportExcel(BizBusinessIdentifyInfo.class, list, ExportEnum.IDENTIFY_EXPORT.getSheetName());
+    }
+
+
+    // TODO: 2023/8/23 查询设备信息，4个底部按钮查设备（按钮的作用就是前端用来调不同接口、用来区分中间即将展示的标识），前端弹窗选设备，在确定保存时前端根据底部按钮判断传入设备类型deviceType字典code
+    // TODO: 2023/8/23 接口：查受检设备（第1个按钮），查设备台账（后3个按钮同一接口），查询之后前端根据标志类型的不同加到中间页面时进行判断（按产品给的对应表）
+    // TODO: 2023/8/23 提供二维码接口，前端在加到中间页面时调用一下
+
+    @ApiOperation("设备二维码")
+    @PostMapping("/equipment/qrCode")
+    public ReturnDTO<String> equipmentQrCode(@RequestBody @Valid IdDTO idDTO) {
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return identifyInfoService.equipmentQrCode(idDTO.getId());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java
index 707be6e..7e0453d 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java
@@ -117,7 +117,7 @@
     }
 
     @ApiOperation("任务单导出")
-    @PostMapping("/export")
+    @PostMapping("/listExport")
     public void orderExport(@RequestBody @Valid OrderListRequest request, HttpServletResponse response) {
         businessOrderService.orderExport(request, response);
     }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java
index 529a6ce..51432be 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java
@@ -1,9 +1,28 @@
 package com.casic.missiles.controller.business;
 
+import com.casic.missiles.controller.GeneralApprovalController;
+import com.casic.missiles.dto.BaseApprovalSubmitRequest;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.business.outsource.OutsourceAssessApprovalListRequest;
+import com.casic.missiles.dto.business.outsource.OutsourceAssessSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
+import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.model.business.BizBusinessOutsourceAssess;
+import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
+import com.casic.missiles.service.IGeneralApprovalService;
+import com.casic.missiles.service.business.IBizBusinessOutsourceAssessService;
 import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.BindingResult;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.validation.Valid;
+import java.util.List;
+
 /**
  * <p>
  * 计量检定业务-分包管理-测试、校准或检定工作分包评审表 前端控制器
@@ -15,6 +34,27 @@
 @Api(tags = "分包管理-测试、校准或检定工作分包评审表")
 @RestController
 @RequestMapping("/business/outsource/assess")
-public class BizBusinessOutsourceAssessController {
+public class BizBusinessOutsourceAssessController extends GeneralApprovalController<BizBusinessOutsourceAssess, BizBusinessOutsourceAssess, OutsourceAssessApprovalListRequest, BaseApprovalSubmitRequest> {
+    @Autowired
+    private IBizBusinessOutsourceAssessService outsourceAssessService;
 
+    public BizBusinessOutsourceAssessController(IGeneralApprovalService<BizBusinessOutsourceAssess, BizBusinessOutsourceAssess, OutsourceAssessApprovalListRequest, BaseApprovalSubmitRequest> baseApprovalService) {
+        super(baseApprovalService);
+    }
+
+    @ApiOperation("草稿箱-保存")
+    @PostMapping("/save")
+    public ReturnDTO<OutsourceAssessSaveResponse> saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceAssess request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        return outsourceAssessService.saveOutsourceAssess(request);
+    }
+
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception {
+        List<BizBusinessOutsourceAssess> list = super.exportList(request);
+        super.exportExcel(BizBusinessOutsourceAssess.class, list, ExportEnum.OUTSOURCE_ASSESS.getSheetName());
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java
new file mode 100644
index 0000000..9adef18
--- /dev/null
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java
@@ -0,0 +1,60 @@
+package com.casic.missiles.controller.business;
+
+import com.casic.missiles.controller.GeneralApprovalController;
+import com.casic.missiles.dto.BaseApprovalSubmitRequest;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.business.outsource.OutsourceProtocolApprovalListRequest;
+import com.casic.missiles.dto.business.outsource.OutsourceProtocolSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
+import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.model.business.BizBusinessOutsourceProtocol;
+import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
+import com.casic.missiles.service.IGeneralApprovalService;
+import com.casic.missiles.service.business.IBizBusinessOutsourceProtocolService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.BindingResult;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.validation.Valid;
+import java.util.List;
+
+/**
+ * <p>
+ * 计量检定业务-分包管理-测试、校准或检定工作分包协议书 前端控制器
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-08-24
+ */
+@Api(tags = "分包管理-测试、校准或检定工作分包协议书")
+@RestController
+@RequestMapping("/business/outsource/protocol")
+public class BizBusinessOutsourceProtocolController extends GeneralApprovalController<BizBusinessOutsourceProtocol, BizBusinessOutsourceProtocol, OutsourceProtocolApprovalListRequest, BaseApprovalSubmitRequest> {
+    @Autowired
+    private IBizBusinessOutsourceProtocolService outsourceProtocolService;
+
+    public BizBusinessOutsourceProtocolController(IGeneralApprovalService<BizBusinessOutsourceProtocol, BizBusinessOutsourceProtocol, OutsourceProtocolApprovalListRequest, BaseApprovalSubmitRequest> baseApprovalService) {
+        super(baseApprovalService);
+    }
+
+    @ApiOperation("草稿箱-保存")
+    @PostMapping("/save")
+    public ReturnDTO<OutsourceProtocolSaveResponse> saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceProtocol request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        return outsourceProtocolService.saveOutsourceProtocol(request);
+    }
+
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody OutsourceProtocolApprovalListRequest request) throws Exception {
+        List<BizBusinessOutsourceProtocol> list = super.exportList(request);
+        super.exportExcel(BizBusinessOutsourceProtocol.class, list, ExportEnum.OUTSOURCE_PROTOCOL.getSheetName());
+    }
+}
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java
index 097f645..f0f0943 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java
@@ -17,7 +17,6 @@
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.IGeneralApprovalService;
 import com.casic.missiles.service.business.IBizBusinessOutsourcerInfoService;
-import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -71,19 +70,8 @@
 
     @ApiOperation("分包方导出")
     @PostMapping("/listExport")
-    public void export(@RequestBody @Valid OutsourcerInfoApprovalListRequest request, BindingResult bindingResult) throws Exception {
-        if (bindingResult.hasErrors()) {
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        }
-        List<BizBusinessOutsourcerInfo> list;
-        if (!CollectionUtils.isEmpty(request.getIds())) {
-            list = outsourcerInfoService.listByIds(request.getIds());
-        } else {
-            list = outsourcerInfoService.list(request);
-        }
-        for (BizBusinessOutsourcerInfo record : list) {
-            DictCodeUtils.convertDictCodeToName(record);
-        }
+    public void export(@RequestBody OutsourcerInfoApprovalListRequest request) throws Exception {
+        List<BizBusinessOutsourcerInfo> list = super.exportList(request);
         super.exportExcel(BizBusinessOutsourcerInfo.class, list, ExportEnum.OUTSOURCER_EXPORT.getSheetName());
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java
index c2cbf9f..0410918 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java
@@ -17,11 +17,9 @@
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.IGeneralApprovalService;
 import com.casic.missiles.service.business.IBizBusinessSiteExecutiveInfoService;
-import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -60,7 +58,7 @@
         return siteExecutiveInfoService.saveSiteExecutiveInfo(siteExecutiveInfo);
     }
 
-    @ApiOperation("现场检测详情")
+    @ApiOperation("详情")
     @PostMapping("/detail")
     public ReturnDTO<SiteExecutiveDetailResponse> siteExecutiveDetail(@RequestBody @Valid IdDTO idDTO) throws Exception {
         Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
@@ -69,21 +67,10 @@
         return ReturnUtil.success(siteExecutiveInfoService.detail(idDTO.getId()));
     }
 
-    @ApiOperation("现场检测导出")
+    @ApiOperation("导出")
     @PostMapping("/listExport")
-    public void export(@RequestBody @Valid SiteExecutiveApprovalListRequest request, BindingResult bindingResult) throws Exception {
-        if (bindingResult.hasErrors()) {
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        }
-        List<SiteExecutiveApprovalListResponse> list;
-        if (!CollectionUtils.isEmpty(request.getIds())) {
-            list = siteExecutiveInfoService.listInfoByIds(request.getIds());
-        } else {
-            list = siteExecutiveInfoService.listInfo(request);
-        }
-        for (SiteExecutiveApprovalListResponse record : list) {
-            DictCodeUtils.convertDictCodeToName(record);
-        }
+    public void export(@RequestBody SiteExecutiveApprovalListRequest request) throws Exception {
+        List<SiteExecutiveApprovalListResponse> list = super.exportList(request);
         super.exportExcel(SiteExecutiveApprovalListResponse.class, list, ExportEnum.SITE_EXECUTIVE_EXPORT.getSheetName());
     }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
index 7e793cd..a92e209 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
@@ -55,7 +55,7 @@
 
     @ApiOperation("设备收发列表导出")
     @PostMapping("/export")
-    public void exportList(@RequestBody @Valid SampleDispatchListRequest request) throws IOException {
+    public void exportList(@RequestBody SampleDispatchListRequest request) throws IOException {
         List<SampleDispatchListResponse> list;
         if (!CollectionUtils.isEmpty(request.getIds())) {
             list = dispatchService.listByIds(request.getIds());
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java
index cdc77fc..d120fd4 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java
@@ -7,6 +7,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.business.labExecutive.*;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.business.IBusinessLabExecutiveInfoService;
@@ -14,6 +15,7 @@
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.*;
 
@@ -32,7 +34,7 @@
     @Autowired
     private IBusinessLabExecutiveInfoService labExecutiveInfoService;
 
-    @ApiOperation("实验室检测-部门检测-查询各状态列表（待检测、检测中、检测完）")
+    @ApiOperation("实验室任务-查询各状态列表（待检测、检测中、检测完）")
     @PostMapping("/deptExecutive/List")
     public ReturnDTO<PageInfoBT<SampleLabExecutiveListResponse>> queryDeptExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
@@ -43,10 +45,19 @@
         return ReturnUtil.success(super.packForBT(labExecutiveInfoService.deptLabExecutiveListPage(page, labExecutiveListRequest)));
     }
 
-    /**
-     * 实验室检测-我的检测-查询各状态列表（待检测、检测中、检测完）
-     */
-    @ApiOperation("实验室检测-我的检测-查询各状态列表（待检测、检测中、检测完）")
+    @ApiOperation("实验室任务导出")
+    @PostMapping("/deptExecutive/export")
+    public void deptExportList(@RequestBody @Valid SampleLabExecutiveListRequest request) throws Exception {
+        List<SampleLabExecutiveListResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = labExecutiveInfoService.deptLabExecutiveListByIds(request.getMeasureStatus(), request.getIds());
+        } else {
+            list = labExecutiveInfoService.deptLabExecutiveList(request);
+        }
+        super.exportExcel(SampleLabExecutiveListResponse.class, list, ExportEnum.DEPT_EXECUTIVE_TASK.getSheetName());
+    }
+
+    @ApiOperation("我的任务-查询各状态列表（待检测、检测中、检测完）")
     @PostMapping("/myExecutive/list")
     public ReturnDTO<PageInfoBT<SampleLabExecutiveListResponse>> queryMyExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
@@ -57,19 +68,25 @@
         return ReturnUtil.success(super.packForBT(labExecutiveInfoService.myLabExecutiveListPage(page, labExecutiveListRequest)));
     }
 
-    /**
-     * 实验室检测-我的检测-查询各状态样品数量（待检测、检测中、检测完）
-     */
-    @ApiOperation("实验室检测-我的检测-查询各状态样品数量（待检测、检测中、检测完）")
+    @ApiOperation("我的任务导出")
+    @PostMapping("/myExecutive/export")
+    public void exportList(@RequestBody @Valid SampleLabExecutiveListRequest request) throws Exception {
+        List<SampleLabExecutiveListResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = labExecutiveInfoService.myLabExecutiveListByIds(request.getMeasureStatus(), request.getIds());
+        } else {
+            list = labExecutiveInfoService.myLabExecutiveList(request);
+        }
+        super.exportExcel(SampleLabExecutiveListResponse.class, list, ExportEnum.MY_EXECUTIVE_TASK.getSheetName());
+    }
+
+    @ApiOperation("我的任务-查询各状态样品数量（待检测、检测中、检测完）")
     @GetMapping("/myExecutive/amount")
     public ReturnDTO<List<SampleAmountResponse>> queryMyExecutiveAmount() {
         return ReturnUtil.success(labExecutiveInfoService.myExecutiveAmount());
     }
 
-    /**
-     * 实验室检测-部门检测-分配（分配给具体人员）
-     */
-    @ApiOperation("实验室检测-部门检测-分配按钮（分配给具体人员）")
+    @ApiOperation("实验室任务-分配按钮（分配给具体人员）")
     @PostMapping("/deptExecutive/allocate")
     public ReturnDTO allocateStaff(@RequestBody @Valid SampleAllocateRequest sampleAllocateRequest, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -78,10 +95,7 @@
         return labExecutiveInfoService.allocateStaff(sampleAllocateRequest);
     }
 
-    /**
-     * 实验室检测-我的检测-检定人扫描收入（待检测->检测中）
-     */
-    @ApiOperation("实验室检测-我的检测-检定人扫描收入（待检测->检测中）")
+    @ApiOperation("我的任务-检定人扫描收入（待检测->检测中）")
     @PostMapping("/myExecutive/receive")
     public ReturnDTO sampleReceive(@RequestBody @Valid List<SampleOperateRequest> requestList, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -90,10 +104,7 @@
         return labExecutiveInfoService.sampleReceive(requestList);
     }
 
-    /**
-     * 实验室检测-负责人/检定人扫描检完（检测中->检测完）
-     */
-    @ApiOperation("实验室检测-负责人/检定人扫描检完（检测中->检测完）")
+    @ApiOperation("实验室任务-负责人/检定人扫描检完（检测中->检测完）")
     @PostMapping("/myExecutive/complete")
     public ReturnDTO sampleExecutiveComplete(@RequestBody @Valid List<SampleOperateRequest> requestList, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -102,10 +113,7 @@
         return labExecutiveInfoService.sampleExecutiveComplete(requestList);
     }
 
-    /**
-     * 实验室检测-部门检测/我的检测 编辑（只能修改应出具证书）
-     */
-    @ApiOperation("实验室检测-部门检测/我的检测 编辑（只能修改应出具证书）")
+    @ApiOperation("实验室任务/我的任务 编辑（只能修改应出具证书）")
     @PostMapping("/executive/update")
     public ReturnDTO updateExecutive(@RequestBody @Valid UpdateExecutiveRequest request, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -114,10 +122,7 @@
         return labExecutiveInfoService.updateExecutive(request);
     }
 
-    /**
-     * 实验室检测-部门检测/我的检测 详情
-     */
-    @ApiOperation("实验室检测-部门检测/我的检测 详情")
+    @ApiOperation("实验室任务/我的任务 详情")
     @PostMapping("/executive/detail")
     public ReturnDTO<ExecutiveDetailResponse> executiveDetail(@RequestBody @Valid ExecutiveDetailRequest request, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
@@ -131,7 +136,7 @@
      * 退回后会将下一个要执行的实验室检测状态更新为待分配，将后面的实验室顺序变更为连续（都进行减1）
      * 最后一个检测的实验室退回，等分发员再增加实验室或设备收发中的已收入直接手动点击完成
      */
-    @ApiOperation("实验室检测-部门检测/我的检测 退回（待检测/检测中->退回）")
+    @ApiOperation("实验室任务/我的任务 退回（待检测/检测中->退回）")
     @PostMapping("/executive/sendBack")
     public ReturnDTO executiveSendBack(@RequestBody @Valid ExecutiveSendBackRequest request, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -140,9 +145,6 @@
         return labExecutiveInfoService.sampleExecutiveSendBack(request);
     }
 
-    /**
-     * 分发员编辑实验室检测列表
-     */
     @ApiOperation("分发员编辑实验室检测列表")
     @PostMapping("/handOut/updateList")
     public ReturnDTO updateExecutiveList(@RequestBody @Valid UpdateExecutiveListRequest request, BindingResult bindingResult) {
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java
index 48a67ed..0c04f31 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java
@@ -10,6 +10,7 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.resource.customer.CustomerApprovalListRequest;
 import com.casic.missiles.dto.resource.customer.CustomerSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceCustomerInfo;
@@ -26,6 +27,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -55,6 +57,13 @@
         return customerInfoService.saveCustomerInfo(request);
     }
 
+    @ApiOperation("委托方名录导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody CustomerApprovalListRequest request) throws Exception {
+        List<BizResourceCustomerInfo> list = super.exportList(request);
+        super.exportExcel(BizResourceCustomerInfo.class, list, ExportEnum.CUSTOMER_INFO.getSheetName());
+    }
+
     @ApiOperation("委托方人员列表（分页）")
     @PostMapping("/person/listPage")
     public ReturnDTO<PageInfoBT<BizResourceCustomerStaff>> personListPage(@RequestBody IdDTO idDto) {
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
index 972ed4b..6418ea5 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
@@ -5,6 +5,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.resource.customer.SuggestFormApprovalListRequest;
 import com.casic.missiles.dto.resource.customer.SuggestFormSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceCustomerSuggestForm;
@@ -20,6 +21,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -50,4 +52,11 @@
         return suggestFormService.saveSuggestForm(request);
     }
 
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody SuggestFormApprovalListRequest request) throws Exception {
+        List<BizResourceCustomerSuggestForm> list = super.exportList(request);
+        super.exportExcel(BizResourceCustomerSuggestForm.class, list, ExportEnum.CUSTOMER_SUGGEST_FORM.getSheetName());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java
index 1934d1a..9e07eab 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java
@@ -15,12 +15,16 @@
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.resource.IEnvEnvironmentRecordConfigService;
 import com.casic.missiles.service.resource.IEnvEnvironmentRecordDataService;
+import com.casic.missiles.service.resource.IEnvLocationInfoService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
 import java.util.List;
@@ -39,6 +43,8 @@
     private IEnvEnvironmentRecordDataService environmentRecordDataService;
     @Autowired
     private IEnvEnvironmentRecordConfigService environmentRecordConfigService;
+    @Autowired
+    private IEnvLocationInfoService locationInfoService;
 
     @ApiOperation("环境记录单数据列表/详情")
     @PostMapping("/data/listPage")
@@ -95,4 +101,11 @@
         });
         return environmentRecordConfigService.deleteEnvironmentRecordConfig(idDTO.getId());
     }
+
+    @ApiOperation("地点列表")
+    @PostMapping("/location/listPage")
+    public ReturnDTO<PageInfoBT<LocationListResponse>> locationListPage(@RequestBody @Valid LocationListRequest request) {
+        Page<LocationListResponse> page = PageFactory.defaultPage();
+        return ReturnUtil.success(super.packForBT(locationInfoService.listPage(page, request)));
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java
index 82efe3f..e9561fa 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java
@@ -10,6 +10,7 @@
 import com.casic.missiles.dto.resource.seal.SealLogListRequest;
 import com.casic.missiles.dto.resource.seal.SealNoteApprovalListRequest;
 import com.casic.missiles.dto.resource.seal.SealNoteSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceSealUseLog;
@@ -27,6 +28,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -58,6 +60,13 @@
         return sealUseNoteService.saveSeal(request);
     }
 
+    @ApiOperation("印章使用登记导出（列表和导出中去掉经办人和监印人）")
+    @PostMapping("/listExport")
+    public void export(@RequestBody SealNoteApprovalListRequest request) throws Exception {
+        List<BizResourceSealUseNote> list = super.exportList(request);
+        super.exportExcel(BizResourceSealUseNote.class, list, ExportEnum.SEAL_NOTE.getSheetName());
+    }
+
     // TODO: 2023/7/28 印章使用日志：系统中使用印章时插入数据库
 
     @ApiOperation("印章使用日志列表（分页）")
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java
index 9b674fc..06b6521 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java
@@ -9,16 +9,20 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.resource.staff.StaffCertRequest;
 import com.casic.missiles.dto.resource.staff.StaffCertResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.service.resource.IBizResourceStaffInfoService;
 import com.casic.missiles.service.resource.IBizResourceStaffVerifierService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.List;
+
 /**
  * @Description:
  * @Author: wangpeng
@@ -41,9 +45,21 @@
         return ReturnUtil.success(super.packForBT(responsePage));
     }
 
+    @ApiOperation("证书逾期提醒导出")
+    @PostMapping("/listExport")
+    public void exportList(@RequestBody StaffCertRequest request) throws Exception {
+        List<StaffCertResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = staffInfoService.certListByIds(request.getIds());
+        } else {
+            list = staffInfoService.certList(request);
+        }
+        super.exportExcel(StaffCertResponse.class, list, ExportEnum.STAFF_CERTIFICATE_EXPIRE.getSheetName());
+    }
+
     @ApiOperation("证书逾期提醒")
     @PostMapping("/expirationReminder")
-    public ReturnDTO expirationReminder(@RequestBody IdDTO idDto) {
-        return verifierService.expirationReminder(idDto);
+    public ReturnDTO expirationReminder(@RequestBody IdDTO idDTO) {
+        return verifierService.expirationReminder(idDTO);
     }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java
index 3b251ad..a6e7850 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java
@@ -12,6 +12,7 @@
 import com.casic.missiles.dto.resource.staff.StaffListRequest;
 import com.casic.missiles.dto.resource.staff.TrainListRequest;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.*;
@@ -22,7 +23,10 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
 import java.util.List;
@@ -52,8 +56,19 @@
             throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
         }
         Page<BizResourceStaffInfo> page = PageFactory.defaultPage();
-        Page<BizResourceStaffInfo> responsePage = staffInfoService.listPage(page, request);
-        return ReturnUtil.success(super.packForBT(responsePage));
+        return ReturnUtil.success(super.packForBT(staffInfoService.listPage(page, request)));
+    }
+
+    @ApiOperation("人员登记导出")
+    @PostMapping("/listExport")
+    public void exportList(@RequestBody StaffListRequest request) throws Exception {
+        List<BizResourceStaffInfo> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = staffInfoService.listByIds(request.getIds());
+        } else {
+            list = staffInfoService.list(request);
+        }
+        super.exportExcel(BizResourceStaffInfo.class, list, ExportEnum.STAFF_INFO.getSheetName());
     }
 
     @ApiOperation("人员登记详情基础信息")
@@ -85,9 +100,9 @@
 
     @ApiOperation("科研教育列表（分页）")
     @PostMapping("/education/listPage")
-    public ReturnDTO<PageInfoBT<BizResourceStaffEducation>> educationListPage(@RequestBody IdDTO idDto) {
+    public ReturnDTO<PageInfoBT<BizResourceStaffEducation>> educationListPage(@RequestBody IdDTO idDTO) {
         Page<BizResourceStaffEducation> page = PageFactory.defaultPage();
-        Page<BizResourceStaffEducation> responsePage = staffInfoService.educationListPage(page, idDto);
+        Page<BizResourceStaffEducation> responsePage = staffInfoService.educationListPage(page, idDTO);
         return ReturnUtil.success(super.packForBT(responsePage));
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java
index af6aa86..d85d84a 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java
@@ -9,6 +9,7 @@
 import com.casic.missiles.dto.resource.outsideService.SupplierApprovalListRequest;
 import com.casic.missiles.dto.resource.outsideService.SupplierSaveResponse;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceSupplierAbility;
@@ -67,6 +68,13 @@
         return ReturnUtil.success(supplierInfoService.detail(idDTO.getId()));
     }
 
+    @ApiOperation("合格供方导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody SupplierApprovalListRequest request) throws Exception {
+        List<BizResourceSupplierInfo> list = super.exportList(request);
+        super.exportExcel(BizResourceSupplierInfo.class, list, ExportEnum.SUPPLIER_INFO.getSheetName());
+    }
+
     @ApiOperation("供方人员列表（分页）")
     @PostMapping("/person/listPage")
     public ReturnDTO<PageInfoBT<BizResourceSupplierPerson>> personListPage(@RequestBody IdDTO idDTO) {
diff --git a/casic-metering-api/src/main/resources/config/application.yml b/casic-metering-api/src/main/resources/config/application.yml
index 350db5f..ecff521 100644
--- a/casic-metering-api/src/main/resources/config/application.yml
+++ b/casic-metering-api/src/main/resources/config/application.yml
@@ -126,7 +126,7 @@
     #作者
     author: wangpeng
     #待生成对象表名
-    table-name: biz_equipment_technical_target_approval,biz_equipment_attachment_approval,biz_equipment_checkpoint_approval
+    table-name: biz_business_outsource_protocol
 
 reminder:
   #节点--common模块config包 ReminderNodeConfig配置
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
index 4a19e4e..d47d552 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
@@ -53,6 +53,7 @@
     SUGGEST_FORM_SAVE_FAILED(2509, "委托方意见登记表保存至草稿箱失败"),
     EXAMINE_FORM_SAVE_FAILED(2510, "要求、委托书及合同评审表保存至草稿箱失败"),
     CUSTOMER_EXIST_SAVE_FAILED(2511, "该委托方已存在，请重新选择"),
+    DUPLICATE_LOCATION_NO(2512, "地点编号已存在"),
 
     /**
      * 计量检定业务模块
@@ -68,6 +69,8 @@
     COMPLETE_SAMPLE_NOT_EXIST(2609, "检测中不存在扫描收入的样品"),
     CANNOT_CHANGE_MEASURE_INFO(2610, "无法更改非当前登录用户的检测信息"),
     NON_EXIST_ORDER_OR_SAMPLE(2611, "不存在该委托单或该委托单下的样品"),
+    OUTSOURCE_ACCESS_SAVE_FAILED(2612, "测试、校准或检定工作分包评审表保存至草稿箱失败"),
+    OUTSOURCE_PROTOCOL_SAVE_FAILED(2613, "测试、校准或检定工作分包协议书保存至草稿箱失败"),
 
     /**
      * 历史遗留备用
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
index 5089ad1..81a406b 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
@@ -10,54 +10,38 @@
     /**
      * 资源管理
      */
-    ENVIRONMENT_DATA_EXPORT("environmentData", "environmentData", "环境记录单数据"),
+    ENVIRONMENT_DATA_EXPORT("environmentData", "环境记录单数据", "环境记录单数据"),
+    STAFF_INFO("staffInfo", "人员登记", "人员登记"),
+    STAFF_CERTIFICATE_EXPIRE("certificateExpire", "证书逾期提醒", "证书逾期提醒"),
+    SUPPLIER_INFO("supplierInfo", "合格供方名录", "合格供方名录"),
+    CUSTOMER_INFO("customerInfo", "委托方名录", "委托方名录"),
+    CUSTOMER_SUGGEST_FORM("customerSuggestForm", "委托方意见登记表", "委托方意见登记表"),
+    SEAL_NOTE("sealNote", "印章使用登记", "印章使用登记"),
 
-    FILE_EXPORT("meterFileData", "meterFileData", "计量文件信息"),
-    TRAIN_PLAN_EXPORT("trainPlanData", "trainPlanData", "培训计划"),
-    TRAIN_LOG_EXPORT("trainLogData", "trainLogData", "培训记录"),
-    METER_ORGANIZE_EXPORT("meterOrganizeData", "meterOrganizeData", "计量组织"),
-    TRACE_SUPPLIER_EXPORT("traceSupplierData", "traceSupplierData", "溯源供方"),
-    SIGN_EXPORT("signData", "signData", "签名/签章"),
-    TEMPLATE_EXPORT("templateData", "templateData", "原始记录模板/证书报告模板"),
-    FIXED_ASSETS("meterFixedAssets", "meterFixedAssets", "固定资产"),
-    METER_EQUIPMENT("meterEquipment", "meterEquipment", "测量设备"),
-    CALIBRATION_TEST_EQUIPMENT("calibrationTestEquipment", "calibrationTestEquipment", "校准检定设备"),
-    MEASURE_ACCOUNT("measureAccount", "measureAccount", "测量工装"),
-    STANDARD_SUPPORT_EQUIPMENT("standardSupportEquipment", "standardSupportEquipment", "标准配套设备"),
-    STANDARD_EQUIPMENT("standardEquipment", "standardEquipment", "标准装置"),
-    FLOW_DEF_EXPORT("flowDefData", "flowDefData", "流程定义"),
-    STAFF_CERTIFICATE("certificate", "certificate", "计量人员证书"),
-    CHECK_INFO("checkInfo", "checkInfo", "设备管理点检测"),
-    EQUIPMENT_APPLY("equipmentApply", "equipmentApply", "设备借用"),
-    STANDARD_EQUIPMENT_REMIND("equipmentApplyRemind", "equipmentApplyRemind", "标准装置到期提醒"),
-    METER_PRICE("meterPrice", "meterPrice", "价格库"),
-    METER_STAFF("meterStaff", "meterStaff", "计量人员"),
-    STANDARD_EQUIPMENT_APPLY("standardEquipmentApply", "standardEquipmentApply", "标准装置申请"),
-    STATE_MANAGE_APPLY("stateManage", "stateManage", "状态管理"),
-    METER_ACCEPTANCE_CHECK("acceptanceCheck", "acceptanceCheck", "设备检修保养验收单"),
-    CUSTOMER_EXPORT("customerData", "customerData", "客户信息"),
-    ORDER_EXPORT("orderData", "orderData", "委托书信息"),
-    SAMPLE_EXPORT("sampleData", "sampleData", "样本信息"),
-    EXCHANGE_DATA("exchangeData", "exchangeData", "设备交接单"),
-    DISPATCH_DATA("dispatchData", "dispatchData", "设备收发"),
-    ENVIRONMENT_DATA("environmentData", "environmentData", "环境记录单"),
-    ORIGIN_DATA("originData", "originData", "原始记录"),
-    CERTIFICATE_REPORT("certificateReport", "certificateReport", "证书报告"),
-    ADVICE_EXPORT("adviceData", "adviceData", "客户反馈"),
-    HANDOUT_EXPORT("handoutData", "handoutData", "任务分发列表"),
-    OUTSOURCER_EXPORT("outsourcerData", "outsourcerData", "分包方"),
-    SITE_EXECUTIVE_EXPORT("siteExecutiveData", "siteExecutiveData", "现场测试、校准或检定"),
-    CERTIFICATE_PRINT_EXPORT("certificatePrintData", "certificatePrintData", "证书打印"),
-    DOWNLOAD_TEMPLATE("downloadTemplate", "downloadTemplate", "页面配置"),
-    OUTSOURCER_CERTIFICATE_EXPORT("outsourceCertificateData", "outsourceCertificateData", "分包证书"),
-    SETTLEMENT_INFO_EXPORT("settlementInfoData", "settlementInfoData", "业务结算"),
-    EQUIPMENT_REMIND("equipmentRemind", "equipmentRemind", "设备到期提醒"),
-    AGREEMENT_INFO_EXPORT("agreementInfoData", "agreementInfoData", "合同"),
-    WORK_STATISTICS_EXPORT("workStatisticsData", "workStatisticsData", "实时工作统计"),
-    DEPT_OUTPUT_EXPORT("deptOutputData", "deptOutputData", "部门产值分析"),
-    WORKLOAD_EXPORT("workloadData", "workloadData", "业务工作量分析"),
-    DEPT_COMPREHENSIVE_EXPORT("deptComprehensiveData", "deptComprehensiveData", "部门综合分析"),
-    ENVIRONMENTAL_RECORD("environmentalRecordData", "environmentalRecordData", "现场环境记录");
+    /**
+     * 计量检定业务
+     */
+    OUTSOURCER_EXPORT("outsourcerData", "分包方名录", "分包方名录"),
+    IDENTIFY_EXPORT("identifyData", "计量标识", "计量标识"),
+    ORDER_EXPORT("orderData", "任务单", "任务单"),
+    DISPATCH_DATA("dispatchData", "设备收发", "设备收发"),
+    HANDOUT_EXPORT("handoutData", "任务分发", "任务分发"),
+    SITE_EXECUTIVE_EXPORT("siteExecutiveData", "现场测试、校准或检定", "现场测试、校准或检定"),
+    CERTIFICATE_REPORT("certificateReport", "证书审批", "证书审批"),
+    CERTIFICATE_CHANGE_APPLY("certificateChangeApply", "证书报告补充或更换申请单", "证书报告补充或更换申请单"),
+    CERTIFICATE_PRINT("certificatePrintData", "证书打印审批", "证书打印审批"),
+    DEPT_EXECUTIVE_TASK("deptExecutiveTaskData", "实验室任务", "实验室任务"),
+    MY_EXECUTIVE_TASK("myExecutiveTaskData", "我的任务", "我的任务"),
+    OUTSOURCE_ASSESS("outsourceAssess", "测试、校准或检定工作分包评审表", "测试、校准或检定工作分包评审表"),
+    OUTSOURCE_PROTOCOL("outsourceProtocol", "测试、校准或检定工作分包协议书", "测试、校准或检定工作分包协议书"),
+
+    /**
+     * 系统管理
+     */
+    SIGN_EXPORT("signData", "签名", "签名"),
+    TEMPLATE_EXPORT("templateData", "文件模板", "文件模板"),
+    FLOW_DEF_EXPORT("flowDefData", "流程定义", "流程定义"),
+    DOWNLOAD_TEMPLATE("downloadTemplate", "流程定义", "页面配置");
 
     ExportEnum(String fileName, String sheetName, String description) {
         this.fileName = fileName;
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateRecordTypeCodeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateRecordTypeCodeEnum.java
index 31d913c..a963522 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateRecordTypeCodeEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateRecordTypeCodeEnum.java
@@ -46,4 +46,14 @@
     String SITE_EXECUTIVE_APPROVAL = "01";
     //《现场测试、校准或检定工作记录表》
     String SITE_EXECUTIVE_LOG = "02";
+
+    //测试、校准或检定工作分包协议书
+    String OUTSOURCE_PROTOCOL = "01";
+    //测试、校准或检定工作分包评审表
+    String OUTSOURCE_ACCESS = "02";
+    //测试、校准或检定工作分包通知书
+    String OUTSOURCE_NOTICE = "03";
+    //测试、校准或检定工作分包方名录
+    String OUTSOURCE_INFO = "04";
+
 }
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
index 24b8635..f78bd53 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
@@ -15,6 +15,10 @@
     String CERTIFICATE_CHANGE_APPLY_BEAN_NAME = "certificateChangeApplyBean";
     //现场测试、校准或检定
     String SITE_EXECUTIVE_BEAN_NAME = "siteExecutiveBean";
+    //测试、校准或检定工作分包评审表
+    String OUTSOURCE_ASSESS_BEAN_NAME = "outsourceAssessBean";
+    //测试、校准或检定工作分包协议书
+    String OUTSOURCE_PROTOCOL_BEAN_NAME = "outsourceProtocolBean";
 
     /*********************************设备与装置************************************/
     //设备台账
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 b21c661..6b86fd1 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
@@ -18,6 +18,8 @@
     OUTSOURCER_APPROVAL(OUTSOURCER_BEAN_NAME, ""),
     CERTIFICATE_CHANGE_APPROVAL(CERTIFICATE_CHANGE_APPLY_BEAN_NAME, ""),
     SITE_EXECUTIVE_APPROVAL(SITE_EXECUTIVE_BEAN_NAME, ""),
+    OUTSOURCE_ASSESS_APPROVAL(OUTSOURCE_ASSESS_BEAN_NAME, ""),
+    OUTSOURCE_PROTOCOL_APPROVAL(OUTSOURCE_PROTOCOL_BEAN_NAME, ""),
 
     ACTION_STATUS_MAP(new HashMap<String, AwareActionStatusEnum>() {
         {
@@ -47,6 +49,10 @@
             put(ApplyFromIdEnum.CERTIFICATE_CHANGE_APPROVAL.getCode(), CERTIFICATE_CHANGE_APPROVAL);
             //现场测试、校准或检定审批
             put(ApplyFromIdEnum.SITE_EXECUTIVE_APPROVAL.getCode(), SITE_EXECUTIVE_APPROVAL);
+            //测试、校准或检定工作分包评审表
+            put(ApplyFromIdEnum.OUTSOURCE_ASSESS_APPROVAL.getCode(), OUTSOURCE_ASSESS_APPROVAL);
+            //测试、校准或检定工作分包协议书
+            put(ApplyFromIdEnum.OUTSOURCE_PROTOCOL_APPROVAL.getCode(), OUTSOURCE_PROTOCOL_APPROVAL);
         }
     });
     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 934405e..c7410bd 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
@@ -9,6 +9,8 @@
     CERTIFICATE_CHANGE_APPROVAL("jljdywzsbchghsqd", MessageSourceModuleEnum.BUSINESS.getCode(), "证书/报告补充或更换申请单"),
     OUTSOURCER_APPROVAL("jljdywcsjzhgfbfml", MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定合格分包方名录"),
     SITE_EXECUTIVE_APPROVAL("jljdywxccsjzsp", MessageSourceModuleEnum.BUSINESS.getCode(), "现场测试、校准或检定审批"),
+    OUTSOURCE_ASSESS_APPROVAL("jljdywcsjzfbpsb", MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包评审表"),
+    OUTSOURCE_PROTOCOL_APPROVAL("jljdywcsjzfbxys", MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包协议书"),
 
 
     /*******************************************设备与装置*********************************************/
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/GeneralApprovalMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/GeneralApprovalMapper.java
index 4fb7344..0c9d6ae 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/GeneralApprovalMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/GeneralApprovalMapper.java
@@ -17,8 +17,4 @@
 
     Page<O> selectBatchForApprovalList(Page<O> page, @Param("request") R request, @Param("businessKeys") List<String> businessKeys);
 
-//    Page<O> selectListPage(Page<O> page, @Param("request") R request);
-
-//    Long selectMaxNo();
-
 }
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceAssessMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceAssessMapper.java
index 7867bb8..ba59009 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceAssessMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceAssessMapper.java
@@ -1,7 +1,12 @@
 package com.casic.missiles.mapper.business;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.business.outsource.OutsourceAssessApprovalListRequest;
+import com.casic.missiles.mapper.GeneralApprovalMapper;
 import com.casic.missiles.model.business.BizBusinessOutsourceAssess;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * <p>
@@ -11,6 +16,10 @@
  * @author wangpeng
  * @since 2023-08-16
  */
-public interface BizBusinessOutsourceAssessMapper extends BaseMapper<BizBusinessOutsourceAssess> {
+public interface BizBusinessOutsourceAssessMapper extends GeneralApprovalMapper<BizBusinessOutsourceAssess, BizBusinessOutsourceAssess, OutsourceAssessApprovalListRequest> {
+
+    Page<BizBusinessOutsourceAssess> selectBatchForApprovalList(Page<BizBusinessOutsourceAssess> page, @Param("request") OutsourceAssessApprovalListRequest request, @Param("businessKeys") List<String> businessKeys);
+
+    Long selectMaxProjectNo();
 
 }
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceProtocolMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceProtocolMapper.java
new file mode 100644
index 0000000..e6aba35
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceProtocolMapper.java
@@ -0,0 +1,24 @@
+package com.casic.missiles.mapper.business;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.business.outsource.OutsourceProtocolApprovalListRequest;
+import com.casic.missiles.mapper.GeneralApprovalMapper;
+import com.casic.missiles.model.business.BizBusinessOutsourceProtocol;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 计量检定业务-分包管理-测试、校准或检定工作分包协议书 Mapper 接口
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-08-24
+ */
+public interface BizBusinessOutsourceProtocolMapper extends GeneralApprovalMapper<BizBusinessOutsourceProtocol, BizBusinessOutsourceProtocol, OutsourceProtocolApprovalListRequest> {
+
+    Page<BizBusinessOutsourceProtocol> selectBatchForApprovalList(Page<BizBusinessOutsourceProtocol> page, @Param("request") OutsourceProtocolApprovalListRequest request, @Param("businessKeys") List<String> businessKeys);
+
+    Long selectMaxProtocolNo();
+}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/EnvLocationInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/EnvLocationInfoMapper.java
new file mode 100644
index 0000000..49eff87
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/EnvLocationInfoMapper.java
@@ -0,0 +1,21 @@
+package com.casic.missiles.mapper.resource;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.resource.environment.LocationListRequest;
+import com.casic.missiles.dto.resource.environment.LocationListResponse;
+import com.casic.missiles.model.resource.EnvLocationInfo;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * <p>
+ * 实验室环境监控系统-设备表 Mapper 接口
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-06-07
+ */
+public interface EnvLocationInfoMapper extends BaseMapper<EnvLocationInfo> {
+
+    Page<LocationListResponse> selectLocationListPage(Page<LocationListResponse> page, @Param("request") LocationListRequest request);
+}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java
index de124db..85ed0f7 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java
@@ -1,7 +1,9 @@
 package com.casic.missiles.mapper.system;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.dto.system.SignDetailResponse;
+import com.casic.missiles.dto.system.SignListRequest;
 import com.casic.missiles.model.system.SystemSign;
 import org.apache.ibatis.annotations.Param;
 
@@ -22,4 +24,8 @@
     SignDetailResponse selectSignDetailById(Long id);
 
     List<SystemSign> selectUsableSignList(@Param("userId") Long userId);
+
+    Page<SystemSign> selectSignListPage(Page<SystemSign> page, @Param("request") SignListRequest request);
+
+    List<SystemSign> selectSignList(@Param("request") SignListRequest request);
 }
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateChangeApplyMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateChangeApplyMapper.xml
index d798447..c496092 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateChangeApplyMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateChangeApplyMapper.xml
@@ -30,31 +30,31 @@
         SELECT *
         FROM biz_business_certificate_change_apply
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.changeApplyNo != null and request.changeApplyNo !=''">
+        <if test="request != null and request.changeApplyNo != null and request.changeApplyNo !=''">
             and change_apply_no like concat('%',#{request.changeApplyNo},'%')
         </if>
-        <if test="request.changeReportNo != null and request.changeReportNo !=''">
+        <if test="request != null and request.changeReportNo != null and request.changeReportNo !=''">
             and change_report_no like concat('%',#{request.changeReportNo},'%')
         </if>
-        <if test="request.changeReportName != null and request.changeReportName !=''">
+        <if test="request != null and request.changeReportName != null and request.changeReportName !=''">
             and change_report_name like concat('%',#{request.changeReportName},'%')
         </if>
-        <if test="request.changeType != null and request.changeType !=''">
+        <if test="request != null and request.changeType != null and request.changeType !=''">
             and change_type = #{request.changeType}
         </if>
-        <if test="request.createUserName != null and request.createUserName !=''">
+        <if test="request != null and request.createUserName != null and request.createUserName !=''">
             and create_user_name like concat('%',#{request.createUserName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificatePrintMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificatePrintMapper.xml
index b66cd99..49c0ac8 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificatePrintMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificatePrintMapper.xml
@@ -31,34 +31,34 @@
         LEFT JOIN biz_business_order_sample_relation bosr ON (bosr.order_id = bcr.order_id AND bosr.sample_id = bcr.sample_id)
         LEFT JOIN biz_business_order_info boi ON boi.id = bosr.order_id
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and bcp.approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.printStatus != null and request.printStatus !=''">
+        <if test="request != null and request.printStatus != null and request.printStatus !=''">
             and print_status = #{request.printStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and bcp.create_user_id = #{request.createUserId}
         </if>
-        <if test="request.certificateReportNo != null and request.certificateReportNo !=''">
+        <if test="request != null and request.certificateReportNo != null and request.certificateReportNo !=''">
             and bcr.certificate_report_no like concat('%',#{request.certificateReportNo},'%')
         </if>
-        <if test="request.certificateReportName != null and request.certificateReportName !=''">
+        <if test="request != null and request.certificateReportName != null and request.certificateReportName !=''">
             and bcr.certificate_report_name like concat('%',#{request.certificateReportName},'%')
         </if>
-        <if test="request.customerName != null and request.customerName !=''">
+        <if test="request != null and request.customerName != null and request.customerName !=''">
             and boi.customer_name like concat('%',#{request.customerName},'%')
         </if>
-        <if test="request.sampleNo != null and request.sampleNo !=''">
+        <if test="request != null and request.sampleNo != null and request.sampleNo !=''">
             and bosr.sample_no like concat('%',#{request.sampleNo},'%')
         </if>
-        <if test="request.sampleName != null and request.sampleName !=''">
+        <if test="request != null and request.sampleName != null and request.sampleName !=''">
             and bosr.sample_name like concat('%',#{request.sampleName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and bcp.create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and bcp.create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml
index b366034..767695d 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml
@@ -46,33 +46,37 @@
         SELECT bcr.*, bosr.sample_no, bosr.sample_name, bosr.sample_model, rsi.staff_name
         FROM biz_business_certificate_report bcr
         LEFT JOIN biz_business_order_sample_relation bosr ON (bosr.order_id = bcr.order_id AND bosr.sample_id = bcr.sample_id)
+        LEFT JOIN biz_business_order_info boi ON boi.id = bcr.order_id
         LEFT JOIN biz_resource_staff_info rsi ON rsi.id = bcr.measure_person_id
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and bcr.approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and bcr.create_user_id = #{request.createUserId}
         </if>
-        <if test="request.certificateReportNo != null and request.certificateReportNo !=''">
+        <if test="request != null and request.customerId != null and request.customerId !=''">
+            and boi.customer_id = #{request.customerId}
+        </if>
+        <if test="request != null and request.certificateReportNo != null and request.certificateReportNo !=''">
             and bcr.certificate_report_no like concat('%',#{request.certificateReportNo},'%')
         </if>
-        <if test="request.certificateReportName != null and request.certificateReportName !=''">
+        <if test="request != null and request.certificateReportName != null and request.certificateReportName !=''">
             and bcr.certificate_report_name like concat('%',#{request.certificateReportName},'%')
         </if>
-        <if test="request.sampleNo != null and request.sampleNo !=''">
+        <if test="request != null and request.sampleNo != null and request.sampleNo !=''">
             and bosr.sample_no like concat('%',#{request.sampleNo},'%')
         </if>
-        <if test="request.measureCategory != null and request.measureCategory !=''">
+        <if test="request != null and request.measureCategory != null and request.measureCategory !=''">
             and bcr.measure_category = #{request.measureCategory}
         </if>
-        <if test="request.measurePerson != null and request.measurePerson !=''">
+        <if test="request != null and request.measurePerson != null and request.measurePerson !=''">
             and rsi.staff_name like concat('%',#{request.measurePerson},'%')
         </if>
-        <if test="request.calibrationTimeStart != null and request.calibrationTimeStart !=''">
+        <if test="request != null and request.calibrationTimeStart != null and request.calibrationTimeStart !=''">
             and bcr.calibration_time &gt;= #{request.calibrationTimeStart}
         </if>
-        <if test="request.calibrationTimeEnd != null and request.calibrationTimeEnd !=''">
+        <if test="request != null and request.calibrationTimeEnd != null and request.calibrationTimeEnd !=''">
             and bcr.calibration_time &lt;= #{request.calibrationTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceAssessMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceAssessMapper.xml
index d0fcf8b..c22c101 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceAssessMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceAssessMapper.xml
@@ -7,6 +7,8 @@
         <id column="id" property="id" />
         <result column="project_no" property="projectNo" />
         <result column="project_name" property="projectName" />
+        <result column="lab_code" property="labCode" />
+        <result column="group_code" property="groupCode" />
         <result column="applicant_id" property="applicantId" />
         <result column="applicant_name" property="applicantName" />
         <result column="applicant_time" property="applicantTime" />
@@ -31,7 +33,45 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, project_no, project_name, applicant_id, applicant_name, applicant_time, minio_file_name, remark, create_user_id, create_user_name, outsourcer_id, pre_start_time, pre_end_time, outsource_reason, pre_cost, approval_status, process_id, approve_situation, traceability, test_method, technique_ability, create_time, update_time
+        id, project_no, project_name, lab_code, group_code, applicant_id, applicant_name, applicant_time, minio_file_name, remark, create_user_id, create_user_name, outsourcer_id, pre_start_time, pre_end_time, outsource_reason, pre_cost, approval_status, process_id, approve_situation, traceability, test_method, technique_ability, create_time, update_time
     </sql>
 
+    <select id="selectMaxProjectNo" resultType="java.lang.Long">
+        SELECT IFNULL(max(RIGHT(project_no, 3)), 0) from biz_business_outsource_assess
+    </select>
+
+    <select id="selectBatchForApprovalList" resultMap="BaseResultMap">
+        SELECT bboa.*, bboi.outsourcer_name, bboi.director
+        FROM biz_business_outsource_assess bboa
+        LEFT JOIN biz_business_outsourcer_info bboi ON bboa.outsourcer_id = bboi.id
+        WHERE 1=1
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
+            and bboa.approval_status = #{request.approvalStatus}
+        </if>
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
+            and bboa.create_user_id = #{request.createUserId}
+        </if>
+        <if test="request != null and request.projectNo != null and request.projectNo !=''">
+            and bboa.project_no like concat('%',#{request.projectNo},'%')
+        </if>
+        <if test="request != null and request.outsourcerName != null and request.outsourcerName !=''">
+            and bboi.outsourcer_name like concat('%',#{request.outsourcerName},'%')
+        </if>
+        <if test="request != null and request.applicantName != null and request.applicantName !=''">
+            and bboa.applicant_name like concat('%',#{request.applicantName},'%')
+        </if>
+        <if test="request != null and request.applicantTimeStart != null and request.applicantTimeStart !=''">
+            and bboa.applicant_time &gt;= #{request.applicantTimeStart}
+        </if>
+        <if test="request != null and request.applicantTimeEnd != null and request.applicantTimeEnd !=''">
+            and bboa.applicant_time &lt;= #{request.applicantTimeEnd}
+        </if>
+        <if test="businessKeys != null">
+            and bboa.id in
+            <foreach collection="businessKeys" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
+        ORDER BY bboa.create_time DESC
+    </select>
 </mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceProtocolMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceProtocolMapper.xml
new file mode 100644
index 0000000..b7b2149
--- /dev/null
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceProtocolMapper.xml
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.mapper.business.BizBusinessOutsourceProtocolMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.business.BizBusinessOutsourceProtocol">
+        <id column="id" property="id" />
+        <result column="protocol_no" property="protocolNo" />
+        <result column="project_name" property="projectName" />
+        <result column="lab_code" property="labCode" />
+        <result column="group_code" property="groupCode" />
+        <result column="outsourcer_id" property="outsourcerId" />
+        <result column="remark" property="remark" />
+        <result column="outsource_no" property="outsourceNo" />
+        <result column="outsource_name" property="outsourceName" />
+        <result column="contacts" property="contacts" />
+        <result column="mobile" property="mobile" />
+        <result column="address" property="address" />
+        <result column="require_date" property="requireDate" />
+        <result column="outsource_cost" property="outsourceCost" />
+        <result column="director" property="director" />
+        <result column="item" property="item" />
+        <result column="requires" property="requires" />
+        <result column="create_user_id" property="createUserId" />
+        <result column="create_user_name" property="createUserName" />
+        <result column="approval_status" property="approvalStatus" />
+        <result column="process_id" property="processId" />
+        <result column="create_time" property="createTime" />
+        <result column="update_time" property="updateTime" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, protocol_no, project_name, lab_code, group_code, outsourcer_id, remark, outsource_no, outsource_name, contacts, mobile, address, require_date, outsource_cost, director, item, requires, create_user_id, create_user_name, approval_status, process_id, create_time, update_time
+    </sql>
+
+    <select id="selectMaxProtocolNo" resultType="java.lang.Long">
+        SELECT IFNULL(max(RIGHT(protocol_no, 3)), 0) from biz_business_outsource_protocol
+    </select>
+
+    <select id="selectBatchForApprovalList" resultMap="BaseResultMap">
+        SELECT *
+        FROM biz_business_outsource_protocol
+        WHERE 1=1
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
+            and approval_status = #{request.approvalStatus}
+        </if>
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
+            and create_user_id = #{request.createUserId}
+        </if>
+        <if test="request != null and request.protocolNo != null and request.protocolNo !=''">
+            and protocol_no like concat('%',#{request.protocolNo},'%')
+        </if>
+        <if test="request != null and request.outsourcerName != null and request.outsourcerName !=''">
+            and outsourcer_name like concat('%',#{request.outsourcerName},'%')
+        </if>
+        <if test="request != null and request.applicantName != null and request.applicantName !=''">
+            and create_user_name like concat('%',#{request.applicantName},'%')
+        </if>
+        <if test="request != null and request.applicantTimeStart != null and request.applicantTimeStart !=''">
+            and create_time &gt;= #{request.applicantTimeStart}
+        </if>
+        <if test="request != null and request.applicantTimeEnd != null and request.applicantTimeEnd !=''">
+            and create_time &lt;= #{request.applicantTimeEnd}
+        </if>
+        <if test="businessKeys != null">
+            and id in
+            <foreach collection="businessKeys" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
+        ORDER BY create_time DESC
+    </select>
+</mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourcerInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourcerInfoMapper.xml
index 510a80b..3049b54 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourcerInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourcerInfoMapper.xml
@@ -7,6 +7,8 @@
         <id column="id" property="id" />
         <result column="outsourcer_no" property="outsourcerNo" />
         <result column="outsourcer_name" property="outsourcerName" />
+        <result column="lab_code" property="labCode" />
+        <result column="group_code" property="groupCode" />
         <result column="outsourcer_brief_name" property="outsourcerBriefName" />
         <result column="outsourcer_size" property="outsourcerSize" />
         <result column="business_size" property="businessSize" />
@@ -55,32 +57,32 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, outsourcer_no, outsourcer_name, outsourcer_brief_name, outsourcer_size, business_size, grade, evaluation, tax_number, bank_account, bank_name, bank_account_number, postal_code, director, phone, fax, mobile, email, website, address_country, address_province, address_city, address_area, full_address, address_country_name, address_province_name, address_city_name, address_area_name, invoice_country, invoice_province, invoice_city, invoice_area, invoice_full_address, invoice_country_name, invoice_province_name, invoice_city_name, invoice_area_name, business_scope, business_content, minio_file_name, approval_status, process_id, remark, create_user_id, create_user_name, create_time, update_time
+        id, outsourcer_no, outsourcer_name, lab_code, group_code, outsourcer_brief_name, outsourcer_size, business_size, grade, evaluation, tax_number, bank_account, bank_name, bank_account_number, postal_code, director, phone, fax, mobile, email, website, address_country, address_province, address_city, address_area, full_address, address_country_name, address_province_name, address_city_name, address_area_name, invoice_country, invoice_province, invoice_city, invoice_area, invoice_full_address, invoice_country_name, invoice_province_name, invoice_city_name, invoice_area_name, business_scope, business_content, minio_file_name, approval_status, process_id, remark, create_user_id, create_user_name, create_time, update_time
     </sql>
 
     <select id="selectBatchForApprovalList" resultMap="BaseResultMap">
         SELECT *
         FROM biz_business_outsourcer_info
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.outsourcerNo != null and request.outsourcerNo !=''">
+        <if test="request != null and request.outsourcerNo != null and request.outsourcerNo !=''">
             and outsourcer_no like concat('%',#{request.outsourcerNo},'%')
         </if>
-        <if test="request.outsourcerName != null and request.outsourcerName !=''">
+        <if test="request != null and request.outsourcerName != null and request.outsourcerName !=''">
             and outsourcer_name like concat('%',#{request.outsourcerName},'%')
         </if>
-        <if test="request.director != null and request.director !=''">
+        <if test="request != null and request.director != null and request.director !=''">
             and director like concat('%',#{request.director},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
@@ -93,6 +95,6 @@
     </select>
 
     <select id="selectMaxNo" resultType="java.lang.Long">
-        SELECT IFNULL(max(RIGHT(outsourcer_no, 12)), 0) from biz_business_outsourcer_info
+        SELECT IFNULL(max(RIGHT(outsourcer_no, 3)), 0) from biz_business_outsourcer_info
     </select>
 </mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessSiteExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessSiteExecutiveInfoMapper.xml
index 135c5d0..3c5ae79 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessSiteExecutiveInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessSiteExecutiveInfoMapper.xml
@@ -38,25 +38,25 @@
         FROM biz_business_site_executive_info bsei
         LEFT JOIN biz_resource_customer_info rci ON bsei.customer_id = rci.id
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and bsei.approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and bsei.create_user_id = #{request.createUserId}
         </if>
-        <if test="request.siteExecutiveNo != null and request.siteExecutiveNo !=''">
+        <if test="request != null and request.siteExecutiveNo != null and request.siteExecutiveNo !=''">
             and bsei.site_executive_no like concat('%',#{request.siteExecutiveNo},'%')
         </if>
-        <if test="request.customerName != null and request.customerName !=''">
+        <if test="request != null and request.customerName != null and request.customerName !=''">
             and rci.outsourcer_name like concat('%',#{request.customerName},'%')
         </if>
-        <if test="request.applyName != null and request.applyName !=''">
+        <if test="request != null and request.applyName != null and request.applyName !=''">
             and bsei.apply_name like concat('%',#{request.applyName},'%')
         </if>
-        <if test="request.applyTimeStart != null and request.applyTimeStart !=''">
+        <if test="request != null and request.applyTimeStart != null and request.applyTimeStart !=''">
             and bsei.apply_time &gt;= #{request.applyTimeStart}
         </if>
-        <if test="request.applyTimeEnd != null and request.applyTimeEnd !=''">
+        <if test="request != null and request.applyTimeEnd != null and request.applyTimeEnd !=''">
             and bsei.apply_time &lt;= #{request.applyTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml
index 84d9e2a..6bd38a9 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml
@@ -105,6 +105,12 @@
         <if test="request.isUrgent != null and request.isUrgent !=''">
             AND bo.is_urgent = #{request.isUrgent}
         </if>
+        <if test="request.ids != null">
+            and blei.id in
+            <foreach collection="request.ids" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
         ORDER BY blei.update_time DESC
     </select>
 
@@ -137,6 +143,12 @@
         <if test="request.isUrgent != null and request.isUrgent !=''">
             AND bo.is_urgent = #{request.isUrgent}
         </if>
+        <if test="request.ids != null">
+            and blei.id in
+            <foreach collection="request.ids" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
         ORDER BY blei.update_time DESC
     </select>
 
diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardInfoMapper.xml
index 1a5551b..2ed8d17 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardInfoMapper.xml
@@ -45,12 +45,6 @@
         FROM biz_equipment_standard_info besi
         LEFT JOIN biz_equipment_standard_technology_relation bestr ON besi.standard_no = bestr.standard_no
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
-            and besi.approval_status = #{request.approvalStatus}
-        </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
-            and besi.create_user_id = #{request.createUserId}
-        </if>
         <if test="request.standardName != null and request.standardName !=''">
             and besi.standard_name like concat('%',#{request.standardName},'%')
         </if>
diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardTechnologyRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardTechnologyRelationMapper.xml
index fc7e16c..cd03c8c 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardTechnologyRelationMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardTechnologyRelationMapper.xml
@@ -6,6 +6,7 @@
     <resultMap id="BaseResultMap" type="com.casic.missiles.model.equipment.BizEquipmentStandardTechnologyRelation">
         <id column="id" property="id" />
         <result column="technology_file_id" property="technologyFileId" />
+        <result column="technology_file_no" property="technologyFileNo" />
         <result column="technology_file_name" property="technologyFileName" />
         <result column="standard_id" property="standardId" />
         <result column="standard_no" property="standardNo" />
@@ -14,7 +15,7 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, technology_file_id, technology_file_name, standard_id, remark
+        id, technology_file_id, technology_file_no, technology_file_name, standard_id, remark
     </sql>
 
 </mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceAuthorizeOrderMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceAuthorizeOrderMapper.xml
index ac5176c..554fe65 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceAuthorizeOrderMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceAuthorizeOrderMapper.xml
@@ -32,22 +32,22 @@
         SELECT *
         FROM biz_resource_authorize_order
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.orderNo != null and request.orderNo !=''">
+        <if test="request != null and request.orderNo != null and request.orderNo !=''">
             and order_no like concat('%',#{request.orderNo},'%')
         </if>
-        <if test="request.createUserName != null and request.createUserName !=''">
+        <if test="request != null and request.createUserName != null and request.createUserName !=''">
             and create_user_name like concat('%',#{request.createUserName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerExamineFormMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerExamineFormMapper.xml
index ab242f6..af7f98f 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerExamineFormMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerExamineFormMapper.xml
@@ -41,28 +41,28 @@
         SELECT *
         FROM biz_resource_customer_examine_form
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.formNo != null and request.formNo !=''">
+        <if test="request != null and request.formNo != null and request.formNo !=''">
             and form_no like concat('%',#{request.formNo},'%')
         </if>
-        <if test="request.labCode != null and request.labCode !=''">
+        <if test="request != null and request.labCode != null and request.labCode !=''">
             and lab_code like concat('%',#{request.labCode},'%')
         </if>
-        <if test="request.groupCode != null and request.groupCode !=''">
+        <if test="request != null and request.groupCode != null and request.groupCode !=''">
             and group_code like concat('%',#{request.groupCode},'%')
         </if>
-        <if test="request.createUserName != null and request.createUserName !=''">
+        <if test="request != null and request.createUserName != null and request.createUserName !=''">
             and create_user_name like concat('%',#{request.createUserName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerInfoMapper.xml
index fa8ffbc..06a2798 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerInfoMapper.xml
@@ -33,25 +33,25 @@
         SELECT *
         FROM biz_resource_customer_info
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.customerNo != null and request.customerNo !=''">
+        <if test="request != null and request.customerNo != null and request.customerNo !=''">
             and customer_no like concat('%',#{request.customerNo},'%')
         </if>
-        <if test="request.customerName != null and request.customerName !=''">
+        <if test="request != null and request.customerName != null and request.customerName !=''">
             and customer_name like concat('%',#{request.customerName},'%')
         </if>
-        <if test="request.contacts != null and request.contacts !=''">
+        <if test="request != null and request.contacts != null and request.contacts !=''">
             and contacts like concat('%',#{request.contacts},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerSuggestFormMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerSuggestFormMapper.xml
index 28f5bb2..1806662 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerSuggestFormMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerSuggestFormMapper.xml
@@ -33,28 +33,28 @@
         SELECT *
         FROM biz_resource_customer_suggest_form
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.formNo != null and request.formNo !=''">
+        <if test="request != null and request.formNo != null and request.formNo !=''">
             and form_no like concat('%',#{request.formNo},'%')
         </if>
-        <if test="request.customerName != null and request.customerName !=''">
+        <if test="request != null and request.customerName != null and request.customerName !=''">
             and customer_name like concat('%',#{request.customerName},'%')
         </if>
-        <if test="request.customerDeptName != null and request.customerDeptName !=''">
+        <if test="request != null and request.customerDeptName != null and request.customerDeptName !=''">
             and customer_dept_name like concat('%',#{request.customerDeptName},'%')
         </if>
-        <if test="request.createUserName != null and request.createUserName !=''">
+        <if test="request != null and request.createUserName != null and request.createUserName !=''">
             and create_user_name like concat('%',#{request.createUserName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSealUseNoteMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSealUseNoteMapper.xml
index ab37bc1..b02bb33 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSealUseNoteMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSealUseNoteMapper.xml
@@ -29,32 +29,32 @@
     </sql>
 
     <select id="selectBatchForApprovalList" resultMap="BaseResultMap">
-        SELECT *
+        SELECT brsun.*, brsi.seal_name, brsi.seal_type, brsi.approver_name
         FROM biz_resource_seal_use_note brsun
         JOIN biz_resource_seal_info brsi ON brsun.seal_id = brsi.id
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and brsun.approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and brsun.create_user_id = #{request.createUserId}
         </if>
-        <if test="request.sealName != null and request.sealName !=''">
+        <if test="request != null and request.sealName != null and request.sealName !=''">
             and brsi.seal_name like concat('%',#{request.sealName},'%')
         </if>
-        <if test="request.sealType != null and request.sealType !=''">
+        <if test="request != null and request.sealType != null and request.sealType !=''">
             and brsi.seal_type = #{request.sealType}
         </if>
-        <if test="request.applyDeptName != null and request.applyDeptName !=''">
+        <if test="request != null and request.applyDeptName != null and request.applyDeptName !=''">
             and brsun.apply_dept_name like concat('%',#{request.applyDeptName},'%')
         </if>
-        <if test="request.applyUserName != null and request.applyUserName !=''">
+        <if test="request != null and request.applyUserName != null and request.applyUserName !=''">
             and brsun.apply_user_name like concat('%',#{request.applyUserName},'%')
         </if>
-        <if test="request.applyTimeStart != null and request.applyTimeStart !=''">
+        <if test="request != null and request.applyTimeStart != null and request.applyTimeStart !=''">
             and brsun.apply_time &gt;= #{request.applyTimeStart}
         </if>
-        <if test="request.applyTimeEnd != null and request.applyTimeEnd !=''">
+        <if test="request != null and request.applyTimeEnd != null and request.applyTimeEnd !=''">
             and brsun.apply_time &lt;= #{request.applyTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml
index 119bf7d..4f8392a 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml
@@ -31,6 +31,12 @@
         <if test="request.deptName != null and request.deptName !=''">
             and brsi.dept_name like concat('%',#{request.deptName},'%')
         </if>
+        <if test="request.ids != null">
+            and brsv.id in
+            <foreach collection="request.ids" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
         ORDER BY brsv.grant_date DESC
     </select>
 
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSupplierInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSupplierInfoMapper.xml
index fe8d399..e8ce7ef 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSupplierInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSupplierInfoMapper.xml
@@ -48,28 +48,28 @@
         SELECT *
         FROM biz_resource_supplier_info
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.supplierNo != null and request.supplierNo !=''">
+        <if test="request != null and request.supplierNo != null and request.supplierNo !=''">
             and supplier_no like concat('%',#{request.supplierNo},'%')
         </if>
-        <if test="request.supplierName != null and request.supplierName !=''">
+        <if test="request != null and request.supplierName != null and request.supplierName !=''">
             and supplier_name like concat('%',#{request.supplierName},'%')
         </if>
-        <if test="request.director != null and request.director !=''">
+        <if test="request != null and request.director != null and request.director !=''">
             and director like concat('%',#{request.director},'%')
         </if>
-        <if test="request.supplierType != null and request.supplierType !=''">
+        <if test="request != null and request.supplierType != null and request.supplierType !=''">
             and supplier_type = #{request.supplierType}
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/EnvLocationInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/EnvLocationInfoMapper.xml
new file mode 100644
index 0000000..68bcf10
--- /dev/null
+++ b/casic-metering-dao/src/main/resources/mapper/resource/EnvLocationInfoMapper.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.mapper.resource.EnvLocationInfoMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.resource.EnvLocationInfo">
+        <id column="id" property="id" />
+        <result column="location_no" property="locationNo" />
+        <result column="location_name" property="locationName" />
+        <result column="location_position" property="locationPosition" />
+        <result column="create_user_id" property="createUserId" />
+        <result column="create_user" property="createUser" />
+        <result column="create_time" property="createTime" />
+        <result column="update_time" property="updateTime" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, location_no, location_name, location_position, create_user_id, create_user, create_time, update_time
+    </sql>
+
+    <select id="selectLocationListPage" resultType="com.casic.missiles.dto.resource.environment.LocationListResponse">
+        SELECT *
+        FROM env_location_info
+        WHERE 1=1
+        <if test="request.locationNo != null and request.locationNo !=''">
+            AND location_no LIKE concat('%',#{request.locationNo},'%')
+        </if>
+        <if test="request.locationName != null and request.locationName !=''">
+            AND location_name LIKE concat('%',#{request.locationName},'%')
+        </if>
+        ORDER BY create_time DESC
+    </select>
+
+</mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml
index b28c18f..8854047 100644
--- a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml
@@ -11,7 +11,6 @@
         <result column="sign_desc" property="signDesc" />
         <result column="sign_director" property="signDirector" />
         <result column="sign_user_id" property="signUserId" />
-        <result column="sign_type" property="signType" />
         <result column="minio_file_name" property="minioFileName" />
         <result column="create_time" property="createTime" />
         <result column="update_time" property="updateTime" />
@@ -28,7 +27,6 @@
         <result column="sign_name" property="signName" />
         <result column="sign_desc" property="signDesc" />
         <result column="sign_director" property="signDirector" />
-        <result column="sign_type" property="signType" />
         <result column="sign_user_id" property="signUserId" />
         <result column="minio_file_name" property="minioFileName" />
         <result column="create_time" property="createTime" />
@@ -62,4 +60,58 @@
         JOIN system_sign_user_relation ssur ON ss.id = ssur.sign_id
         WHERE ssur.user_id = #{userId}
     </select>
+
+    <select id="selectSignListPage" resultMap="BaseResultMap">
+        SELECT ss.*, sd.SIMPLE_NAME AS deptName
+        FROM system_sign ss
+        LEFT JOIN sys_user su ON su.id = ss.sign_user_id
+        LEFT JOIN sys_dept sd ON sd.id = su.dept_id
+        WHERE 1=1
+        <if test="request.signNo != null and request.signNo !=''">
+            AND ss.sign_no LIKE concat('%',#{request.signNo},'%')
+        </if>
+        <if test="request.signName != null and request.signName !=''">
+            AND ss.sign_name LIKE concat('%',#{request.signName},'%')
+        </if>
+        <if test="request.signDirector != null and request.signDirector !=''">
+            AND ss.sign_director LIKE concat('%',#{request.signDirector},'%')
+        </if>
+        <if test="request.signUserId != null and request.signUserId !=''">
+            AND ss.sign_user_id = #{request.signUserId}
+        </if>
+        <if test="request.createStartTime != null and request.createStartTime !=''">
+            AND DATE_FORMAT(ss.create_time,'%Y-%m-%d') &gt;= DATE_FORMAT(#{request.createStartTime},'%Y-%m-%d')
+        </if>
+        <if test="request.createEndTime != null and request.createEndTime !=''">
+            AND DATE_FORMAT(ss.create_time,'%Y-%m-%d')  &lt;= DATE_FORMAT(#{request.createEndTime},'%Y-%m-%d')
+        </if>
+        ORDER BY ss.create_time DESC
+    </select>
+
+    <select id="selectSignList" resultMap="BaseResultMap">
+        SELECT ss.*, sd.SIMPLE_NAME AS deptName
+        FROM system_sign ss
+        LEFT JOIN sys_user su ON su.id = ss.sign_user_id
+        LEFT JOIN sys_dept sd ON sd.id = su.dept_id
+        WHERE 1=1
+        <if test="request.signNo != null and request.signNo !=''">
+            AND ss.sign_no LIKE concat('%',#{request.signNo},'%')
+        </if>
+        <if test="request.signName != null and request.signName !=''">
+            AND ss.sign_name LIKE concat('%',#{request.signName},'%')
+        </if>
+        <if test="request.signDirector != null and request.signDirector !=''">
+            AND ss.sign_director LIKE concat('%',#{request.signDirector},'%')
+        </if>
+        <if test="request.signUserId != null and request.signUserId !=''">
+            AND ss.sign_user_id = #{request.signUserId}
+        </if>
+        <if test="request.createStartTime != null and request.createStartTime !=''">
+            AND DATE_FORMAT(ss.create_time,'%Y-%m-%d') &gt;= DATE_FORMAT(#{request.createStartTime},'%Y-%m-%d')
+        </if>
+        <if test="request.createEndTime != null and request.createEndTime !=''">
+            AND DATE_FORMAT(ss.create_time,'%Y-%m-%d')  &lt;= DATE_FORMAT(#{request.createEndTime},'%Y-%m-%d')
+        </if>
+        ORDER BY ss.create_time DESC
+    </select>
 </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 515050a..60f530b 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
@@ -47,8 +47,8 @@
     String STORAGE_LOCATION = "bizStorageLocation";
     //计量专业
     String MEASURE_MAJOR = "bizMeasureMajor";
-    //管理状态
-    String MANAGER_STATE = "bizManagerState";
+    //标准装置管理状态
+    String STANDARD_MANAGER_STATE = "bizStandardManagerState";
 
     /**
      * 资源管理 字典code
@@ -95,8 +95,6 @@
     String MEASURE_STATUS = "measureStatus";
     //检定方式
     String MEASURE_TYPE = "measureType";
-    //标识打印标志类型
-    String IDENTIFY_PRINT_TYPE = "bizBusinessIdentify";
     //变更类型
     String REPORT_CHANGE_TYPE = "bizCertChangeType";
     //规模类型
@@ -111,19 +109,24 @@
     String MEASURE_CATEGORY = "measureCategory";
     //检定结果
     String MEASURE_RESULT = "measureResult";
+    //分包原因
+    String OUTSOURCE_REASON = "outsourceReason";
+
+    /**
+     * 系统管理
+     */
+    String TEMPLATE_TYPE = "templateType";
+
 
     /**
      * 标准装置 字典code
      */
     //类别
     String STANDARD_CATEGORY = "standardCategory";
-    //管理状态
-    String STANDARD_MANAGER_STATE = "standardManagerState";
     //标准等级
     String STANDARD_LEVEL = "standardLevel";
     //传递范围
     String STANDARD_TRANSMIT_RANGE = "transmitRange";
-
     //资本来源
     String CAPITAL_SOURCE = "capitalSource";
     //标准装置-申请类型
@@ -148,8 +151,6 @@
     String CERTIFICATE_CLASS = "certificationClass";
     //证书管理-检校专业
     String CALIBRATION_MAJOR = "calibrationMajor";
-    //分包原因
-    String OUTSOURCE_REASON = "outsourceReason";
 
     /**
      * 工作台
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/BaseApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/BaseApprovalListRequest.java
index 73c12c1..80d7424 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/BaseApprovalListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/BaseApprovalListRequest.java
@@ -6,6 +6,7 @@
 
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotEmpty;
+import java.util.List;
 
 /**
  * @Description:
@@ -19,14 +20,14 @@
      * 表单id
      */
     @NotBlank(message = "表单id不能为空")
-    @ApiModelProperty(value = "表单id（流程定义对应的表单id，等价于业务id）", dataType = "String")
+    @ApiModelProperty(value = "表单id（流程定义对应的表单id，等价于业务id），导出接口不用传", dataType = "String")
     private String formId;
 
     /**
      * 审批状态类型，对应ApprovalStatusEnum
      */
     @NotEmpty(message = "审批状态类型不能为空")
-    @ApiModelProperty(value = "审批状态类型code", dataType = "String")
+    @ApiModelProperty(value = "审批状态类型code，导出接口不用传", dataType = "String")
     private String approvalStatus;
 
     @ApiModelProperty(hidden = true)
@@ -34,4 +35,7 @@
 
     @ApiModelProperty(hidden = true)
     private Long createUserId;
+
+    @ApiModelProperty(value = "导出ids", dataType = "List")
+    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificatePrintApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificatePrintApprovalListRequest.java
index b93d1c9..3cc2f4e 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificatePrintApprovalListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificatePrintApprovalListRequest.java
@@ -5,8 +5,6 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import java.util.List;
-
 /**
  * @Description:
  * @Author: wangpeng
@@ -38,7 +36,4 @@
 
     @ApiModelProperty(value = "创建结束时间", dataType = "String")
     private String createTimeEnd;
-
-    @ApiModelProperty(value = "导出ids", dataType = "List")
-    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportApprovalListRequest.java
index 4f7a038..c115847 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportApprovalListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportApprovalListRequest.java
@@ -5,8 +5,6 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import java.util.List;
-
 /**
  * @Description:
  * @Author: wangpeng
@@ -15,6 +13,8 @@
 @ApiModel
 @Data
 public class CertificateReportApprovalListRequest extends BaseApprovalListRequest {
+    @ApiModelProperty(value = "委托方id", dataType = "String")
+    private Long customerId;
 
     @ApiModelProperty(value = "证书报告编号", dataType = "String")
     private String certificateReportNo;
@@ -37,6 +37,4 @@
     @ApiModelProperty(value = "检校结束时间", dataType = "String")
     private String calibrationTimeEnd;
 
-    @ApiModelProperty(value = "导出ids", dataType = "List")
-    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/identify/IdentifyListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/identify/IdentifyListRequest.java
index 1b87ae6..f019203 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/identify/IdentifyListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/identify/IdentifyListRequest.java
@@ -4,6 +4,8 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * @Description:
  * @Author: wangpeng
@@ -26,4 +28,7 @@
 
     @ApiModelProperty(value = "打印结束时间", dataType = "String")
     private String createTimeEnd;
+
+    @ApiModelProperty(value = "导出ids", dataType = "List")
+    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListRequest.java
index 1264883..62415fb 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListRequest.java
@@ -7,6 +7,7 @@
 import lombok.Data;
 
 import javax.validation.constraints.NotBlank;
+import java.util.List;
 
 @Data
 @ApiModel
@@ -37,4 +38,6 @@
     @ApiModelProperty(value = "是否加急（1是0否null全部）", dataType = "Integer")
     private String isUrgent;
 
+    @ApiModelProperty(value = "导出ids", dataType = "List")
+    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListRequest.java
index 5201d7b..499760a 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListRequest.java
@@ -17,6 +17,9 @@
     @ApiModelProperty(value = "任务单编号", dataType = "String")
     private String orderNo;
 
+    @ApiModelProperty(value = "委托方id", dataType = "Long")
+    private Long customerId;
+
     @ApiModelProperty(value = "委托方名称", dataType = "String")
     private String customerName;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OrderSampleDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OrderSampleDTO.java
new file mode 100644
index 0000000..796edc0
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OrderSampleDTO.java
@@ -0,0 +1,19 @@
+package com.casic.missiles.dto.business.outsource;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/8/24 11:38
+ */
+@ApiModel
+@Data
+public class OrderSampleDTO {
+    @ApiModelProperty(value = "任务单id", dataType = "Long")
+    private Long orderId;
+    @ApiModelProperty(value = "受检设备id", dataType = "Long")
+    private Long sampleId;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceAssessApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceAssessApprovalListRequest.java
new file mode 100644
index 0000000..9a930c3
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceAssessApprovalListRequest.java
@@ -0,0 +1,30 @@
+package com.casic.missiles.dto.business.outsource;
+
+import com.casic.missiles.dto.BaseApprovalListRequest;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/8/24 11:01
+ */
+@ApiModel
+@Data
+public class OutsourceAssessApprovalListRequest extends BaseApprovalListRequest {
+    @ApiModelProperty(value = "评审表编号", dataType = "String")
+    private String projectNo;
+
+    @ApiModelProperty(value = "分包机构名称", dataType = "String")
+    private String outsourcerName;
+
+    @ApiModelProperty(value = "申请人", dataType = "String")
+    private String applicantName;
+
+    @ApiModelProperty(value = "申请时间开始", dataType = "String")
+    private String applicantTimeStart;
+
+    @ApiModelProperty(value = "申请时间结束", dataType = "String")
+    private String applicantTimeEnd;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceAssessSaveResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceAssessSaveResponse.java
new file mode 100644
index 0000000..8bf9aad
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceAssessSaveResponse.java
@@ -0,0 +1,20 @@
+package com.casic.missiles.dto.business.outsource;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/8/14 16:17
+ */
+@ApiModel
+@Data
+public class OutsourceAssessSaveResponse {
+    @ApiModelProperty(value = "主键id", dataType = "Long")
+    private Long id;
+
+    @ApiModelProperty(value = "编号", dataType = "String")
+    private String projectNo;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProtocolApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProtocolApprovalListRequest.java
new file mode 100644
index 0000000..0f32331
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProtocolApprovalListRequest.java
@@ -0,0 +1,30 @@
+package com.casic.missiles.dto.business.outsource;
+
+import com.casic.missiles.dto.BaseApprovalListRequest;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/8/24 15:01
+ */
+@ApiModel
+@Data
+public class OutsourceProtocolApprovalListRequest extends BaseApprovalListRequest {
+    @ApiModelProperty(value = "协议书编号", dataType = "String")
+    private String protocolNo;
+
+    @ApiModelProperty(value = "分包方名称", dataType = "String")
+    private String outsourcerName;
+
+    @ApiModelProperty(value = "申请人", dataType = "String")
+    private String applicantName;
+
+    @ApiModelProperty(value = "申请时间开始", dataType = "String")
+    private String applicantTimeStart;
+
+    @ApiModelProperty(value = "申请时间结束", dataType = "String")
+    private String applicantTimeEnd;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProtocolSaveResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProtocolSaveResponse.java
new file mode 100644
index 0000000..e324967
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProtocolSaveResponse.java
@@ -0,0 +1,20 @@
+package com.casic.missiles.dto.business.outsource;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/8/14 16:17
+ */
+@ApiModel
+@Data
+public class OutsourceProtocolSaveResponse {
+    @ApiModelProperty(value = "主键id", dataType = "Long")
+    private Long id;
+
+    @ApiModelProperty(value = "编号", dataType = "String")
+    private String protocolNo;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveApprovalListRequest.java
index f29f4e4..7047c28 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveApprovalListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveApprovalListRequest.java
@@ -5,8 +5,6 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import java.util.List;
-
 /**
  * @Description: 现场检测审批列表请求实体
  * @Author: wangpeng
@@ -30,7 +28,4 @@
     @ApiModelProperty(value = "申请时间结束", dataType = "String")
     private String applyTimeEnd;
 
-    @ApiModelProperty(value = "导出ids", dataType = "List")
-    private List<Long> ids;
-
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveDetailResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveDetailResponse.java
index 1f28752..394c934 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveDetailResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveDetailResponse.java
@@ -12,6 +12,18 @@
     @ApiModelProperty(value = "id，更新/删除使用参数", dataType = "Long")
     private Long id;
 
+    @ApiModelProperty(value = "实验室代码(字典code)", dataType = "String")
+    private String labCode;
+
+    @ApiModelProperty(value = "实验室代码(字典value)", dataType = "String")
+    private String labCodeName;
+
+    @ApiModelProperty(value = "组别代码(字典code)", dataType = "String")
+    private String groupCode;
+
+    @ApiModelProperty(value = "组别代码(字典value)", dataType = "String")
+    private String groupCodeName;
+
     @ApiModelProperty(value = "审批编号", dataType = "String")
     private String siteExecutiveNo;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/environment/LocationListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/environment/LocationListRequest.java
new file mode 100644
index 0000000..13d03c3
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/environment/LocationListRequest.java
@@ -0,0 +1,20 @@
+package com.casic.missiles.dto.resource.environment;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/6/8 13:56
+ */
+@ApiModel
+@Data
+public class LocationListRequest {
+    @ApiModelProperty(value = "地点编号", dataType = "String")
+    private String locationNo;
+
+    @ApiModelProperty(value = "地点名称", dataType = "String")
+    private String locationName;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/environment/LocationListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/environment/LocationListResponse.java
new file mode 100644
index 0000000..4c531af
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/environment/LocationListResponse.java
@@ -0,0 +1,78 @@
+package com.casic.missiles.dto.resource.environment;
+
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
+import com.baomidou.mybatisplus.annotation.TableField;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description: 地点列表响应实体
+ * @Author: wangpeng
+ * @Date: 2023/6/8 13:53
+ */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
+@ApiModel
+@Data
+public class LocationListResponse {
+    @ApiModelProperty(value = "主键id", dataType = "Long")
+    private Long id;
+
+    /**
+     * 地点编号
+     */
+    @ExcelProperty("地点编号")
+    @ApiModelProperty(value = "地点编号", dataType = "String")
+    private String locationNo;
+
+    /**
+     * 地点名称
+     */
+    @ExcelProperty("地点名称")
+    @ApiModelProperty(value = "地点名称", dataType = "String")
+    private String locationName;
+
+    /**
+     * 地点位置
+     */
+    @ExcelProperty("地点位置")
+    @ApiModelProperty(value = "地点位置", dataType = "String")
+    private String locationPosition;
+
+    /**
+     * 创建人id
+     */
+    @ApiModelProperty(value = "创建人id", dataType = "Long")
+    private Long createUserId;
+
+    /**
+     * 创建人
+     */
+    @ExcelProperty("创建人")
+    @ApiModelProperty(value = "创建人", dataType = "String")
+    @TableField("create_user")
+    private String createUser;
+
+    /**
+     * 创建时间
+     */
+    @ExcelProperty("创建时间")
+    @ApiModelProperty(value = "创建时间", dataType = "String")
+    private String createTime;
+
+    /**
+     * 更新时间
+     */
+    @ApiModelProperty(value = "更新时间", dataType = "String")
+    private String updateTime;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertRequest.java
index 9a7f6c6..c827915 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertRequest.java
@@ -4,6 +4,8 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * @Description:
  * @Author: wangpeng
@@ -16,4 +18,7 @@
     private String name;
     @ApiModelProperty(value = "部门名", dataType = "String")
     private String deptName;
+
+    @ApiModelProperty(value = "导出ids", dataType = "List")
+    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertResponse.java
index f78b159..8f2f79e 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertResponse.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.dto.resource.staff;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.casic.missiles.annotation.DictCodeField;
 import com.casic.missiles.constants.MeterDictCode;
 import io.swagger.annotations.ApiModel;
@@ -13,12 +20,18 @@
  * @Author: wangpeng
  * @Date: 2023/7/27 15:13
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @ApiModel
 @Data
 public class StaffCertResponse {
     /**
      * 人员编号
      */
+    @ExcelProperty(value = "人员编号",order = 0)
     @NotEmpty(message = "人员编号不能为空")
     @ApiModelProperty(value = "人员编号", dataType = "String")
     private String staffNo;
@@ -26,6 +39,7 @@
     /**
      * 姓名
      */
+    @ExcelProperty(value = "姓名",order = 1)
     @ApiModelProperty(value = "姓名", dataType = "String")
     private String staffName;
 
@@ -54,6 +68,7 @@
     /**
      * 部门名字
      */
+    @ExcelProperty(value = "工作部门",order = 2)
     @ApiModelProperty(value = "部门名字", dataType = "String")
     private String deptName;
 
@@ -66,6 +81,7 @@
     /**
      * 计量专业
      */
+    @ExcelProperty(value = "计量专业",order = 3)
     @ApiModelProperty(value = "计量专业", dataType = "String")
     private String major;
 
@@ -110,6 +126,7 @@
     /**
      * 证书号
      */
+    @ExcelProperty(value = "证号",order = 4)
     @ApiModelProperty(value = "证书号", dataType = "String")
     private String certNo;
 
@@ -122,12 +139,14 @@
     /**
      * 有效日期
      */
+    @ExcelProperty(value = "证书有效期",order = 6)
     @ApiModelProperty(value = "有效日期", dataType = "String")
     private String effectiveDate;
 
     /**
      * 发放日期
      */
+    @ExcelProperty(value = "发证日期",order = 5)
     @ApiModelProperty(value = "发放日期", dataType = "String")
     private String grantDate;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffListRequest.java
index 7c4afb3..0a1194a 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffListRequest.java
@@ -4,6 +4,8 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * @Description:
  * @Author: wangpeng
@@ -18,4 +20,7 @@
     private String deptName;
     @ApiModelProperty(value = "部门id", dataType = "Long")
     private Long deptId;
+
+    @ApiModelProperty(value = "导出ids", dataType = "List")
+    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/TrainListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/TrainListRequest.java
index f68597b..6321f8b 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/TrainListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/TrainListRequest.java
@@ -14,6 +14,8 @@
 public class TrainListRequest {
     @ApiModelProperty(value = "训练登记表编号", dataType = "String")
     private String trainNo;
+    @ApiModelProperty(value = "值班领导", dataType = "String")
+    private String dutyLeader;
     @ApiModelProperty(value = "创建开始时间", dataType = "String")
     private String createTimeStart;
     @ApiModelProperty(value = "创建结束时间", dataType = "String")
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/SignAddRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/SignAddRequest.java
index 117be34..d71055c 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/SignAddRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/SignAddRequest.java
@@ -43,13 +43,6 @@
     private Long signUserId;
 
     /**
-     * 签章或签名-字典code
-     */
-    @NotBlank(message = "类型不能为空")
-    @ApiModelProperty(value = "签名/签章-字典code", dataType = "String", required = true)
-    private String signType;
-
-    /**
      * minio存储文件名
      */
     @ApiModelProperty(value = "上传文件返回名称", dataType = "String")
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateAddRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateAddRequest.java
index aff1265..6316648 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateAddRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateAddRequest.java
@@ -17,30 +17,28 @@
 @Data
 public class TemplateAddRequest extends BaseSystemRequest {
     /**
-     * 原始记录模板/证书报告模板名称
+     * 模板名称
      */
     @ApiModelProperty(value = "名称", dataType = "String", required = true)
     @NotBlank(message = "名称不能为空")
     private String templateName;
 
     /**
-     * 原始记录模板/证书报告模板描述
+     * 模板描述
      */
     @ApiModelProperty(value = "描述", dataType = "String")
     private String templateDesc;
 
     /**
-     * 原始记录模板/证书报告模板创建人
+     * 创建人
      */
     @ApiModelProperty(value = "创建人", dataType = "String", required = true)
     @NotBlank(message = "创建人不能为空")
     private String templateCreator;
 
-    /**
-     * 原始记录模板/证书报告模板-字典code
-     */
-    @NotBlank(message = "类型不能为空")
-    @ApiModelProperty(value = "原始记录模板/证书报告模板-字典code", dataType = "String", required = true)
+
+    @NotBlank(message = "模板类型不能为空")
+    @ApiModelProperty(value = "模板类型(字典code)", dataType = "String", required = true)
     private String templateType;
 
     /**
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateListRequest.java
index eec5a1e..6d17bbe 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateListRequest.java
@@ -1,11 +1,12 @@
 package com.casic.missiles.dto.system;
 
+import com.casic.missiles.annotation.DictCodeField;
+import com.casic.missiles.constants.MeterDictCode;
 import com.casic.missiles.dto.BaseSystemRequest;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import javax.validation.constraints.NotBlank;
 import java.util.List;
 
 /**
@@ -19,8 +20,8 @@
     /**
      * 类型
      */
-//    @ApiModelProperty(value = "类型-字典code", dataType = "String", required = true)
-    @NotBlank(message = "类型不能为空")
+    @DictCodeField(message = "模板类型不合法", cacheName = MeterDictCode.TEMPLATE_TYPE)
+    @ApiModelProperty(value = "模板类型(字典code)", dataType = "String")
     private String templateType;
 
     /**
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificateChangeApply.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificateChangeApply.java
index 9216308..36923fd 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificateChangeApply.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificateChangeApply.java
@@ -1,11 +1,19 @@
 package com.casic.missiles.model.business;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 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 com.casic.missiles.dto.BaseRequest;
+import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -20,6 +28,12 @@
  * @author wangpeng
  * @since 2023-08-15
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
+@ApiModel
 @Data
 @TableName("biz_business_certificate_change_apply")
 public class BizBusinessCertificateChangeApply extends BaseRequest implements Serializable {
@@ -33,6 +47,7 @@
     /**
      * 申请单编号
      */
+    @ExcelProperty(value = "申请单编号", order = 1)
     @ApiModelProperty(value = "申请单编号", dataType = "String")
     @TableField("change_apply_no")
     private String changeApplyNo;
@@ -40,6 +55,7 @@
     /**
      * 申请单名字
      */
+    @ExcelProperty(value = "申请单名称", order = 2)
     @ApiModelProperty(value = "申请单名字", dataType = "String")
     @TableField("change_apply_name")
     private String changeApplyName;
@@ -54,6 +70,7 @@
     /**
      * 更换证书编号
      */
+    @ExcelProperty(value = "更换证书编号", order = 3)
     @ApiModelProperty(value = "更换证书编号", dataType = "String")
     @TableField("change_report_no")
     private String changeReportNo;
@@ -61,7 +78,8 @@
     /**
      * 更换证书名字
      */
-    @ApiModelProperty(value = "更换证书名字", dataType = "String")
+    @ExcelProperty(value = "更换证书/报告名称", order = 4)
+    @ApiModelProperty(value = "更换证书/报告名称", dataType = "String")
     @TableField("change_report_name")
     private String changeReportName;
 
@@ -73,6 +91,7 @@
     @TableField("change_type")
     private String changeType;
 
+    @ExcelProperty(value = "变更类型", order = 5)
     @ApiModelProperty(value = "变更类型(字典value)", dataType = "String")
     @TableField(exist = false)
     private String changeTypeName;
@@ -142,13 +161,15 @@
     /**
      * 创建用户名字
      */
-    @ApiModelProperty(value = "创建用户名字", dataType = "String")
+    @ExcelProperty(value = "创建人", order = 6)
+    @ApiModelProperty(value = "创建人名字", dataType = "String")
     @TableField("create_user_name")
     private String createUserName;
 
     /**
      * 创建时间
      */
+    @ExcelProperty(value = "创建时间", order = 7)
     @ApiModelProperty(value = "创建时间", dataType = "String")
     @TableField("create_time")
     private String createTime;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificateReport.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificateReport.java
index f01db9e..db06018 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificateReport.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificateReport.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.model.business;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -22,6 +29,11 @@
  * @author wangpeng
  * @since 2023-08-14
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @ApiModel
 @Data
 @TableName("biz_business_certificate_report")
@@ -36,6 +48,7 @@
     /**
      * 证书报告编号
      */
+    @ExcelProperty(value = "证书报告编号", order = 1)
     @ApiModelProperty(value = "证书报告编号", dataType = "String")
     @TableField("certificate_report_no")
     private String certificateReportNo;
@@ -43,6 +56,7 @@
     /**
      * 证书报告名称
      */
+    @ExcelProperty(value = "证书报告名称", order = 2)
     @ApiModelProperty(value = "证书报告名称", dataType = "String")
     @TableField("certificate_report_name")
     private String certificateReportName;
@@ -62,6 +76,7 @@
     @TableField("measure_category")
     private String measureCategory;
 
+    @ExcelProperty(value = "检校类别", order = 6)
     @ApiModelProperty(value = "检校类别(字典value)", dataType = "String")
     @TableField(exist = false)
     private String measureCategoryName;
@@ -69,6 +84,7 @@
     /**
      * 检校时间
      */
+    @ExcelProperty(value = "检校时间", order = 8)
     @ApiModelProperty(value = "检校时间", dataType = "String")
     @TableField("calibration_time")
     private String calibrationTime;
@@ -267,18 +283,22 @@
     @TableField(exist = false)
     private Integer decisionItem;
 
-    @ApiModelProperty(value = "设备样品编号（列表返回参数）", dataType = "String")
+    @ExcelProperty(value = "被检设备统一编号", order = 3)
+    @ApiModelProperty(value = "被检设备统一编号（列表返回参数）", dataType = "String")
     @TableField(exist = false)
     private String sampleNo;
 
-    @ApiModelProperty(value = "设备样品名称（列表返回参数）", dataType = "String")
+    @ExcelProperty(value = "被检设备名称", order = 4)
+    @ApiModelProperty(value = "被检设备名称（列表返回参数）", dataType = "String")
     @TableField(exist = false)
     private String sampleName;
 
-    @ApiModelProperty(value = "设备样品规格型号（列表返回参数）", dataType = "String")
+    @ExcelProperty(value = "规格型号", order = 5)
+    @ApiModelProperty(value = "规格型号（列表返回参数）", dataType = "String")
     @TableField(exist = false)
     private String sampleModel;
 
+    @ExcelProperty(value = "检定员", order = 7)
     @ApiModelProperty(value = "检定员名字（列表返回参数）", dataType = "String")
     @TableField(exist = false)
     private String staffName;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessIdentifyInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessIdentifyInfo.java
index 46bfba5..f1a9bec 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessIdentifyInfo.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessIdentifyInfo.java
@@ -1,10 +1,15 @@
 package com.casic.missiles.model.business;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 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;
 
@@ -20,6 +25,11 @@
  * @author wangpeng
  * @since 2023-08-15
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @Data
 @TableName("biz_business_identify_info")
 public class BizBusinessIdentifyInfo implements Serializable {
@@ -33,6 +43,7 @@
     /**
      * 记录编号
      */
+    @ExcelProperty(value = "记录编号", order = 1)
     @ApiModelProperty(value = "记录编号", dataType = "String")
     @TableField("record_no")
     private String recordNo;
@@ -41,20 +52,15 @@
      * 标志类型(字典code)
      */
     @NotEmpty(message = "标志类型不能为空")
-    @ApiModelProperty(value = "标志类型(字典code)", dataType = "String")
-    @DictCodeField(message = "标志类型不合法", cacheName = MeterDictCode.IDENTIFY_PRINT_TYPE)
+    @ApiModelProperty(value = "标志类型(直接存计量标识/使用状态/校准状态的字典value)", dataType = "String")
     @TableField("identify_type")
     private String identifyType;
 
-    @ApiModelProperty(value = "标志类型(字典value)", dataType = "String")
-    @TableField(exist = false)
-    private String identifyTypeName;
-
     /**
      * 设备id(可以是受检设备/设备台账)
      */
     @NotNull(message = "设备id不能为空")
-    @ApiModelProperty(value = "设备id(可以是受检设备/设备台账)", dataType = "String")
+    @ApiModelProperty(value = "设备id(可以是受检设备/设备台账)", dataType = "Long")
     @TableField("device_id")
     private Long deviceId;
 
@@ -66,29 +72,32 @@
     @TableField("device_type")
     private String deviceType;
 
+    @ExcelProperty(value = "统一编号", order = 3)
     @NotEmpty(message = "设备编号不能为空")
-    @ApiModelProperty(value = "设备编号", dataType = "String")
+    @ApiModelProperty(value = "统一编号", dataType = "String")
     @TableField("device_no")
     private String deviceNo;
 
     /**
      * 设备名字
      */
-    @NotEmpty(message = "设备名字不能为空")
-    @ApiModelProperty(value = "设备名字", dataType = "String")
+    @ExcelProperty(value = "设备名称", order = 4)
+    @NotEmpty(message = "设备名称不能为空")
+    @ApiModelProperty(value = "设备名称", dataType = "String")
     @TableField("device_name")
     private String deviceName;
 
     /**
      * 检定员id
      */
-    @ApiModelProperty(value = "检定员id", dataType = "String")
+    @ApiModelProperty(value = "检定员id", dataType = "Long")
     @TableField("measure_person_id")
     private Long measurePersonId;
 
     /**
      * 检定员名字
      */
+    @ExcelProperty(value = "检定员", order = 5)
     @ApiModelProperty(value = "检定员名字", dataType = "String")
     @TableField("measure_person")
     private String measurePerson;
@@ -103,7 +112,8 @@
     /**
      * 更新时间
      */
-    @ApiModelProperty(value = "更新时间", dataType = "String")
+    @ExcelProperty(value = "打印时间", order = 6)
+    @ApiModelProperty(value = "打印时间", dataType = "String")
     @TableField("update_time")
     private String updateTime;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceAssess.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceAssess.java
index 659d9ca..6720b90 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceAssess.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceAssess.java
@@ -1,11 +1,26 @@
 package com.casic.missiles.model.business;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 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 com.casic.missiles.dto.BaseRequest;
+import com.casic.missiles.dto.business.outsource.OrderSampleDTO;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import javax.validation.constraints.NotEmpty;
 import java.io.Serializable;
+import java.util.List;
 
 /**
  * <p>
@@ -15,146 +30,231 @@
  * @author wangpeng
  * @since 2023-08-16
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
+@ApiModel
 @Data
 @TableName("biz_business_outsource_assess")
-public class BizBusinessOutsourceAssess implements Serializable {
+public class BizBusinessOutsourceAssess extends BaseRequest implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
+    @ApiModelProperty(value = "id，更新/删除使用参数", dataType = "Long")
     @TableId("id")
     private Long id;
 
     /**
      * 评审表编号
      */
+    @ExcelProperty(value = "评审表编号", order = 1)
+    @ApiModelProperty(value = "评审表编号(后台生成)", dataType = "String")
     @TableField("project_no")
     private String projectNo;
 
     /**
      * 评审表名称
      */
+    @ExcelProperty(value = "评审表名称", order = 2)
+    @ApiModelProperty(value = "评审表名称", dataType = "String")
     @TableField("project_name")
     private String projectName;
 
+    @NotEmpty(message = "实验室代码不能为空")
+    @DictCodeField(message = "实验室代码描述不合法", cacheName = MeterDictCode.LAB_CODE)
+    @ApiModelProperty(value = "实验室代码(字典code)", dataType = "String")
+    @TableField("lab_code")
+    private String labCode;
+
+    @ApiModelProperty(value = "实验室代码(字典value)", dataType = "String")
+    @TableField(exist = false)
+    private String labCodeName;
+
+    /**
+     * 组别代码
+     */
+    @NotEmpty(message = "组别代码不能为空")
+    @DictCodeField(message = "组别代码描述不合法", cacheName = MeterDictCode.GROUP_CODE)
+    @ApiModelProperty(value = "组别代码(字典code)", dataType = "String")
+    @TableField("group_code")
+    private String groupCode;
+
+    @ApiModelProperty(value = "组别代码(字典value)", dataType = "String")
+    @TableField(exist = false)
+    private String groupCodeName;
+
     /**
      * 申请人id
      */
+    @ApiModelProperty(value = "申请人id", dataType = "String")
     @TableField("applicant_id")
     private Long applicantId;
 
     /**
      * 申请人名字
      */
+    @ExcelProperty(value = "申请人", order = 5)
+    @ApiModelProperty(value = "申请人", dataType = "String")
     @TableField("applicant_name")
     private String applicantName;
 
     /**
      * 申请时间
      */
+    @ExcelProperty(value = "申请时间", order = 6)
+    @ApiModelProperty(value = "申请时间", dataType = "String")
     @TableField("applicant_time")
     private String applicantTime;
 
     /**
      * 附件(minio存储文件名)
      */
+    @ApiModelProperty(value = "附件(minio存储文件名)", dataType = "String")
     @TableField("minio_file_name")
     private String minioFileName;
 
     /**
      * 备注
      */
+    @ApiModelProperty(value = "备注", dataType = "String")
     @TableField("remark")
     private String remark;
 
     /**
      * 创建人id
      */
+    @ApiModelProperty(value = "创建人id", dataType = "String")
     @TableField("create_user_id")
     private Long createUserId;
 
     /**
      * 创建人名字
      */
+    @ApiModelProperty(value = "创建人名字", dataType = "String")
     @TableField("create_user_name")
     private String createUserName;
 
     /**
      * 分包方id
      */
+    @ApiModelProperty(value = "评审表编号", dataType = "String")
     @TableField("outsourcer_id")
     private Long outsourcerId;
 
     /**
      * 预计开始时间
      */
+    @ApiModelProperty(value = "预计开始时间", dataType = "String")
     @TableField("pre_start_time")
     private String preStartTime;
 
     /**
      * 预计结束时间
      */
+    @ApiModelProperty(value = "预计结束时间", dataType = "String")
     @TableField("pre_end_time")
     private String preEndTime;
 
     /**
      * 分包原因-字典
      */
+    @ApiModelProperty(value = "分包原因(字典code)", dataType = "String")
+    @DictCodeField(message = "分包原因描述不合法", cacheName = MeterDictCode.OUTSOURCE_REASON)
     @TableField("outsource_reason")
     private String outsourceReason;
 
+    @ApiModelProperty(value = "分包原因(字典value)", dataType = "String")
+    @TableField(exist = false)
+    private String outsourceReasonName;
+
     /**
      * 预计费用
      */
+    @ApiModelProperty(value = "预计费用", dataType = "String")
     @TableField("pre_cost")
     private String preCost;
 
     /**
      * 审批状态
      */
+    @ApiModelProperty(value = "审批状态", dataType = "String")
+    @DictCodeField(message = "审批状态描述不合法", cacheName = MeterDictCode.APPROVAL_STATUS)
     @TableField("approval_status")
     private String approvalStatus;
 
     /**
      * 流程实例id
      */
+    @ApiModelProperty(value = "流程实例id", dataType = "String")
     @TableField("process_id")
     private String processId;
 
     /**
      * 实验室认可情况
      */
+    @ApiModelProperty(value = "实验室认可情况", dataType = "String")
     @TableField("approve_situation")
     private String approveSituation;
 
     /**
      * 溯源性
      */
+    @ApiModelProperty(value = "溯源性", dataType = "String")
     @TableField("traceability")
     private String traceability;
 
     /**
      * 测试方法
      */
+    @ApiModelProperty(value = "测试方法", dataType = "String")
     @TableField("test_method")
     private String testMethod;
 
     /**
      * 技术能力
      */
+    @ApiModelProperty(value = "技术能力", dataType = "String")
     @TableField("technique_ability")
     private String techniqueAbility;
 
     /**
      * 创建时间
      */
+    @ApiModelProperty(hidden = true)
     @TableField("create_time")
     private String createTime;
 
     /**
      * 更新时间
      */
+    @ApiModelProperty(hidden = true)
     @TableField("update_time")
     private String updateTime;
 
+    @ApiModelProperty(value = "审批状态类型-字典value", dataType = "String")
+    @TableField(exist = false)
+    private String approvalStatusName;
 
+    @ApiModelProperty(value = "任务id（同意、驳回等操作使用）", dataType = "String")
+    @TableField(exist = false)
+    private String taskId;
+
+    @ApiModelProperty(value = "可选决策项（1同意驳回拒绝 2同意驳回 3同意拒绝，用于待审批列表同意/驳回/拒绝按钮展示）", dataType = "Integer")
+    @TableField(exist = false)
+    private Integer decisionItem;
+
+    @NotEmpty(message = "受检设备信息不能为空")
+    @ApiModelProperty(value = "受检设备id列表（新建使用参数）", dataType = "List")
+    @TableField(exist = false)
+    private List<OrderSampleDTO> orderSampleList;
+
+    @ExcelProperty(value = "分包机构名称", order = 3)
+    @ApiModelProperty(value = "分包机构名称（列表返回参数）", dataType = "String")
+    private String outsourcerName;
+
+    @ExcelProperty(value = "机构负责人", order = 4)
+    @ApiModelProperty(value = "机构负责人（列表返回参数）", dataType = "String")
+    private String director;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceProtocol.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceProtocol.java
new file mode 100644
index 0000000..38df697
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceProtocol.java
@@ -0,0 +1,225 @@
+package com.casic.missiles.model.business;
+
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
+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 com.casic.missiles.dto.BaseRequest;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotEmpty;
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 计量检定业务-分包管理-测试、校准或检定工作分包协议书
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-08-24
+ */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
+@Data
+@TableName("biz_business_outsource_protocol")
+public class BizBusinessOutsourceProtocol extends BaseRequest implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "id，更新/删除使用参数", dataType = "Long")
+    @TableId("id")
+    private Long id;
+
+    /**
+     * 协议书编号
+     */
+    @ExcelProperty(value = "协议书编号", order = 1)
+    @ApiModelProperty(value = "协议书编号(后台生成)", dataType = "String")
+    @TableField("protocol_no")
+    private String protocolNo;
+
+    /**
+     * 协议书名称
+     */
+    @ExcelProperty(value = "协议书名称", order = 2)
+    @ApiModelProperty(value = "协议书名称", dataType = "String")
+    @TableField("project_name")
+    private String projectName;
+
+    @NotEmpty(message = "实验室代码不能为空")
+    @DictCodeField(message = "实验室代码描述不合法", cacheName = MeterDictCode.LAB_CODE)
+    @ApiModelProperty(value = "实验室代码(字典code)", dataType = "String")
+    @TableField("lab_code")
+    private String labCode;
+
+    @ApiModelProperty(value = "实验室代码(字典value)", dataType = "String")
+    @TableField(exist = false)
+    private String labCodeName;
+
+    @NotEmpty(message = "组别代码不能为空")
+    @DictCodeField(message = "组别代码描述不合法", cacheName = MeterDictCode.GROUP_CODE)
+    @ApiModelProperty(value = "组别代码(字典code)", dataType = "String")
+    @TableField("group_code")
+    private String groupCode;
+
+    @ApiModelProperty(value = "组别代码(字典value)", dataType = "String")
+    @TableField(exist = false)
+    private String groupCodeName;
+
+    /**
+     * 分包方id
+     */
+    @ApiModelProperty(value = "分包方id", dataType = "Long")
+    @TableField("outsourcer_id")
+    private Long outsourcerId;
+
+    /**
+     * 其他
+     */
+    @ApiModelProperty(value = "其他", dataType = "String")
+    @TableField("remark")
+    private String remark;
+
+    /**
+     * 分包方编号
+     */
+    @ApiModelProperty(value = "分包方编号(新建不用传)", dataType = "String")
+    @TableField("outsource_no")
+    private String outsourceNo;
+
+    /**
+     * 分包方名称
+     */
+    @ExcelProperty(value = "分包方名称", order = 3)
+    @ApiModelProperty(value = "分包方名称(新建不用传)", dataType = "String")
+    @TableField("outsource_name")
+    private String outsourceName;
+
+    /**
+     * 联系人
+     */
+    @ExcelProperty(value = "联系人", order = 4)
+    @ApiModelProperty(value = "联系人", dataType = "String")
+    @TableField("contacts")
+    private String contacts;
+
+    /**
+     * 电话
+     */
+    @ApiModelProperty(value = "电话", dataType = "String")
+    @TableField("mobile")
+    private String mobile;
+
+    /**
+     * 地址
+     */
+    @ApiModelProperty(value = "地址", dataType = "String")
+    @TableField("address")
+    private String address;
+
+    /**
+     * 要求完成日期
+     */
+    @ApiModelProperty(value = "要求完成日期", dataType = "String")
+    @TableField("require_date")
+    private String requireDate;
+
+    /**
+     * 分包费用(元)
+     */
+    @ApiModelProperty(value = "分包费用(元)", dataType = "String")
+    @TableField("outsource_cost")
+    private Double outsourceCost;
+
+    /**
+     * 分包方负责人
+     */
+    @ApiModelProperty(value = "分包方负责人", dataType = "String")
+    @TableField("director")
+    private String director;
+
+    /**
+     * 分包项目
+     */
+    @ApiModelProperty(value = "分包项目", dataType = "String")
+    @TableField("item")
+    private String item;
+
+    /**
+     * 分包要求
+     */
+    @ApiModelProperty(value = "分包要求", dataType = "String")
+    @TableField("requires")
+    private String requires;
+
+    /**
+     * 创建人id
+     */
+    @ApiModelProperty(hidden = true)
+    @TableField("create_user_id")
+    private Long createUserId;
+
+    /**
+     * 创建人名字
+     */
+    @ExcelProperty(value = "申请人", order = 5)
+    @ApiModelProperty(value = "申请人", dataType = "String")
+    @TableField("create_user_name")
+    private String createUserName;
+
+    /**
+     * 审批状态
+     */
+    @ApiModelProperty(value = "审批状态", dataType = "String")
+    @DictCodeField(message = "审批状态描述不合法", cacheName = MeterDictCode.APPROVAL_STATUS)
+    @TableField("approval_status")
+    private String approvalStatus;
+
+    /**
+     * 流程实例id
+     */
+    @ApiModelProperty(value = "流程实例id", dataType = "String")
+    @TableField("process_id")
+    private String processId;
+
+    /**
+     * 创建时间
+     */
+    @ExcelProperty(value = "申请时间", order = 6)
+    @ApiModelProperty(value = "申请时间", dataType = "String")
+    @TableField("create_time")
+    private String createTime;
+
+    /**
+     * 更新时间
+     */
+    @ApiModelProperty(hidden = true)
+    @TableField("update_time")
+    private String updateTime;
+
+    @ApiModelProperty(value = "审批状态类型-字典value", dataType = "String")
+    @TableField(exist = false)
+    private String approvalStatusName;
+
+    @ApiModelProperty(value = "任务id（同意、驳回等操作使用）", dataType = "String")
+    @TableField(exist = false)
+    private String taskId;
+
+    @ApiModelProperty(value = "可选决策项（1同意驳回拒绝 2同意驳回 3同意拒绝，用于待审批列表同意/驳回/拒绝按钮展示）", dataType = "Integer")
+    @TableField(exist = false)
+    private Integer decisionItem;
+
+
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourcerInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourcerInfo.java
index ec4e997..f9aa69e 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourcerInfo.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourcerInfo.java
@@ -17,6 +17,7 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import javax.validation.constraints.NotEmpty;
 import java.io.Serializable;
 
 /**
@@ -59,6 +60,29 @@
     @TableField("outsourcer_name")
     private String outsourcerName;
 
+    @NotEmpty(message = "实验室代码不能为空")
+    @DictCodeField(message = "实验室代码描述不合法", cacheName = MeterDictCode.LAB_CODE)
+    @ApiModelProperty(value = "实验室代码(字典code)", dataType = "String")
+    @TableField("lab_code")
+    private String labCode;
+
+    @ApiModelProperty(value = "实验室代码(字典value)", dataType = "String")
+    @TableField(exist = false)
+    private String labCodeName;
+
+    /**
+     * 组别代码
+     */
+    @NotEmpty(message = "组别代码不能为空")
+    @DictCodeField(message = "组别代码描述不合法", cacheName = MeterDictCode.GROUP_CODE)
+    @ApiModelProperty(value = "组别代码(字典code)", dataType = "String")
+    @TableField("group_code")
+    private String groupCode;
+
+    @ApiModelProperty(value = "组别代码(字典value)", dataType = "String")
+    @TableField(exist = false)
+    private String groupCodeName;
+
     /**
      * 单位简称
      */
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardInfo.java
index c48eed7..dffdfdd 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardInfo.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardInfo.java
@@ -5,6 +5,7 @@
 import com.baomidou.mybatisplus.annotation.TableName;
 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;
 
@@ -18,6 +19,7 @@
  * @author wangpeng
  * @since 2023-08-04
  */
+@ApiModel
 @Data
 @TableName("biz_equipment_standard_info")
 public class BizEquipmentStandardInfo implements Serializable {
@@ -119,7 +121,7 @@
      * 管理状态(字典code)
      */
     @ApiModelProperty(value = "管理状态(字典code)", dataType = "String")
-    @DictCodeField(message = "管理状态不合法", cacheName = MeterDictCode.MANAGER_STATE)
+    @DictCodeField(message = "管理状态不合法", cacheName = MeterDictCode.STANDARD_MANAGER_STATE)
     @TableField("manage_status")
     private String manageStatus;
 
@@ -151,7 +153,7 @@
     /**
      * 温度(℃)
      */
-    @ApiModelProperty(value = "使用状态(字典code)", dataType = "String")
+    @ApiModelProperty(value = "温度(℃)", dataType = "String")
     @TableField("temperature")
     private Double temperature;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardInfoApproval.java b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardInfoApproval.java
index dbd86ab..9f58d83 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardInfoApproval.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardInfoApproval.java
@@ -150,7 +150,7 @@
      * 管理状态(字典code)
      */
     @ApiModelProperty(value = "管理状态(字典code)", dataType = "String")
-    @DictCodeField(message = "管理状态不合法", cacheName = MeterDictCode.MANAGER_STATE)
+    @DictCodeField(message = "管理状态不合法", cacheName = MeterDictCode.STANDARD_MANAGER_STATE)
     @TableField("manage_status")
     private String manageStatus;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardTechnologyRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardTechnologyRelation.java
index 0e612bd..751f26b 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardTechnologyRelation.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardTechnologyRelation.java
@@ -3,6 +3,7 @@
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -16,6 +17,7 @@
  * @author wangpeng
  * @since 2023-08-04
  */
+@ApiModel
 @Data
 @TableName("biz_equipment_standard_technology_relation")
 public class BizEquipmentStandardTechnologyRelation implements Serializable {
@@ -33,6 +35,10 @@
     @TableField("technology_file_id")
     private Long technologyFileId;
 
+    @ApiModelProperty(value = "依据的技术文件编号", dataType = "String")
+    @TableField("technology_file_no")
+    private String technologyFileNo;
+
     /**
      * 依据的技术文件名称(技术文件中现行测试校准检定方法表文件名字段)
      */
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerInfo.java
index d6e8bed..65cd6bc 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerInfo.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerInfo.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.model.resource;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -21,6 +28,11 @@
  * @author wangpeng
  * @since 2023-08-08
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @ApiModel
 @Data
 @TableName("biz_resource_customer_info")
@@ -35,6 +47,7 @@
     /**
      * 委托方编号
      */
+    @ExcelProperty(value = "委托方编号", order = 1)
     @ApiModelProperty(value = "委托方编号", dataType = "String")
     @TableField("customer_no")
     private String customerNo;
@@ -42,6 +55,7 @@
     /**
      * 委托方名称
      */
+    @ExcelProperty(value = "委托方名称", order = 2)
     @ApiModelProperty(value = "委托方名称(新建时为下拉选择一个受检单位组织的名字，传deptId字段，后端获取名称)", dataType = "String")
     @TableField("customer_name")
     private String customerName;
@@ -63,6 +77,7 @@
     /**
      * 联系人
      */
+    @ExcelProperty(value = "联系人", order = 3)
     @ApiModelProperty(value = "联系人", dataType = "String")
     @TableField("contacts")
     private String contacts;
@@ -70,6 +85,7 @@
     /**
      * 座机电话
      */
+    @ExcelProperty(value = "座机电话", order = 4)
     @ApiModelProperty(value = "座机电话", dataType = "String")
     @TableField("mobile")
     private String mobile;
@@ -77,6 +93,7 @@
     /**
      * 手机号码
      */
+    @ExcelProperty(value = "手机号码", order = 5)
     @ApiModelProperty(value = "手机号码", dataType = "String")
     @TableField("phone")
     private String phone;
@@ -91,6 +108,7 @@
     /**
      * 地址
      */
+    @ExcelProperty(value = "地址", order = 6)
     @ApiModelProperty(value = "地址", dataType = "String")
     @TableField("address")
     private String address;
@@ -141,6 +159,7 @@
     /**
      * 创建时间
      */
+    @ExcelProperty(value = "创建时间", order = 7)
     @ApiModelProperty(value = "创建时间", dataType = "String")
     @TableField("create_time")
     private String createTime;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerSuggestForm.java b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerSuggestForm.java
index 7201bbd..701bf8b 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerSuggestForm.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerSuggestForm.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.model.resource;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -22,6 +29,11 @@
  * @author wangpeng
  * @since 2023-08-08
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @ApiModel
 @Data
 @TableName("biz_resource_customer_suggest_form")
@@ -44,7 +56,8 @@
     /**
      * 委托方名称
      */
-    @ApiModelProperty(value = "委托方名称", dataType = "String")
+    @ExcelProperty(value = "意见反馈单位", order = 2)
+    @ApiModelProperty(value = "意见反馈单位", dataType = "String")
     @TableField("customer_name")
     private String customerName;
 
@@ -59,7 +72,8 @@
     /**
      * 委托方意见反馈部门名称
      */
-    @ApiModelProperty(value = "委托方意见反馈部门名称", dataType = "String")
+    @ExcelProperty(value = "委托方意见反馈部门", order = 3)
+    @ApiModelProperty(value = "委托方意见反馈部门", dataType = "String")
     @TableField("customer_dept_name")
     private String customerDeptName;
 
@@ -73,6 +87,7 @@
     /**
      * 表单编号
      */
+    @ExcelProperty(value = "表单编号", order = 1)
     @ApiModelProperty(value = "表单编号", dataType = "String")
     @TableField("form_no")
     private String formNo;
@@ -111,6 +126,7 @@
     /**
      * 创建人名字
      */
+    @ExcelProperty(value = "创建人", order = 4)
     @ApiModelProperty(value = "创建人名字", dataType = "String")
     @TableField("create_user_name")
     private String createUserName;
@@ -147,6 +163,7 @@
     /**
      * 创建时间
      */
+    @ExcelProperty(value = "创建时间", order = 5)
     @ApiModelProperty(value = "创建时间", dataType = "String")
     @TableField("create_time")
     private String createTime;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSealInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSealInfo.java
index cbf05d7..9bf389d 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSealInfo.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSealInfo.java
@@ -106,6 +106,10 @@
     @TableField("minio_file_name")
     private String minioFileName;
 
+    @ApiModelProperty(value = "minio存储文件url", dataType = "String")
+    @TableField(exist = false)
+    private String minioFileUrl;
+
     @ApiModelProperty(value = "创建时间", dataType = "String")
     @TableField("create_time")
     private String createTime;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSealUseNote.java b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSealUseNote.java
index 3f2d9e8..3ce16a8 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSealUseNote.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSealUseNote.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.model.resource;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -20,6 +27,11 @@
  * @author wangpeng
  * @since 2023-07-28
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @ApiModel
 @Data
 @TableName("biz_resource_seal_use_note")
@@ -34,6 +46,7 @@
     /**
      * 登记表编号
      */
+    @ExcelProperty(value = "申请单编号", order = 1)
     @ApiModelProperty(value = "登记表编号(自动生成)", dataType = "String")
     @TableField("note_form_no")
     private String noteFormNo;
@@ -55,6 +68,7 @@
     /**
      * 申请部门
      */
+    @ExcelProperty(value = "申请部门", order = 5)
     @ApiModelProperty(value = "申请部门", dataType = "String")
     @TableField("apply_dept_name")
     private String applyDeptName;
@@ -69,6 +83,7 @@
     /**
      * 申请人
      */
+    @ExcelProperty(value = "申请人", order = 6)
     @ApiModelProperty(value = "申请人", dataType = "String")
     @TableField("apply_user_name")
     private String applyUserName;
@@ -76,6 +91,7 @@
     /**
      * 申请时间
      */
+    @ExcelProperty(value = "申请时间", order = 7)
     @ApiModelProperty(value = "申请时间(新增自动获取当前时间)", dataType = "String")
     @TableField("apply_time")
     private String applyTime;
@@ -130,6 +146,26 @@
     @TableField("update_time")
     private String updateTime;
 
+    @ExcelProperty(value = "印章名称", order = 2)
+    @ApiModelProperty(value = "印章名称(列表返回参数)", dataType = "String")
+    @TableField(exist = false)
+    private String sealName;
+
+    @DictCodeField(message = "印章类型描述不合法", cacheName = MeterDictCode.SEAL_TYPE)
+    @ApiModelProperty(hidden = true)
+    @TableField(exist = false)
+    private String sealType;
+
+    @ExcelProperty(value = "印章类型", order = 3)
+    @ApiModelProperty(value = "印章类型(列表返回参数)", dataType = "String")
+    @TableField(exist = false)
+    private String sealTypeName;
+
+    @ExcelProperty(value = "批准人", order = 4)
+    @ApiModelProperty(value = "批准人(列表返回参数)", dataType = "String")
+    @TableField(exist = false)
+    private String approverName;
+
     @ApiModelProperty(value = "审批状态类型-字典value", dataType = "String")
     @TableField(exist = false)
     private String approvalStatusName;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceStaffInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceStaffInfo.java
index 5ef995b..41563a1 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceStaffInfo.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceStaffInfo.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.model.resource;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -20,6 +27,11 @@
  * @author wangpeng
  * @since 2023-07-25
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @ApiModel
 @Data
 @TableName("biz_resource_staff_info")
@@ -38,6 +50,7 @@
     /**
      * 人员编号
      */
+    @ExcelProperty(value = "人员编号",order = 0)
     @NotEmpty(message = "人员编号不能为空")
     @ApiModelProperty(value = "人员编号", dataType = "String")
     @TableField("staff_no")
@@ -46,6 +59,7 @@
     /**
      * 姓名
      */
+    @ExcelProperty(value = "姓名",order = 1)
     @ApiModelProperty(value = "姓名", dataType = "String")
     @TableField("staff_name")
     private String staffName;
@@ -152,13 +166,15 @@
     /**
      * 部门名字
      */
-    @ApiModelProperty(value = "部门名字", dataType = "String")
+    @ExcelProperty(value = "工作部门",order = 4)
+    @ApiModelProperty(value = "工作部门", dataType = "String")
     @TableField("dept_name")
     private String deptName;
 
     /**
      * 岗位
      */
+    @ExcelProperty(value = "岗位",order = 2)
     @ApiModelProperty(value = "岗位", dataType = "String")
     @TableField("station")
     private String station;
@@ -166,6 +182,7 @@
     /**
      * 计量专业
      */
+    @ExcelProperty(value = "计量专业",order = 5)
     @ApiModelProperty(value = "计量专业", dataType = "String")
     @TableField("major")
     private String major;
@@ -173,6 +190,7 @@
     /**
      * 证号
      */
+    @ExcelProperty(value = "证号",order = 3)
     @ApiModelProperty(value = "证号", dataType = "String")
     @TableField("certificate_number")
     private String certificateNumber;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSupplierInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSupplierInfo.java
index eb5ef01..a1e2697 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSupplierInfo.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSupplierInfo.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.model.resource;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -20,6 +27,11 @@
  * @author wangpeng
  * @since 2023-07-27
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @ApiModel
 @Data
 @TableName("biz_resource_supplier_info")
@@ -34,6 +46,7 @@
     /**
      * 供方编号
      */
+    @ExcelProperty(value = "供方编号", order = 1)
     @ApiModelProperty(value = "供方编号(自动生成)", dataType = "String")
     @TableField("supplier_no")
     private String supplierNo;
@@ -41,6 +54,7 @@
     /**
      * 供方名称
      */
+    @ExcelProperty(value = "供方名称", order = 2)
     @ApiModelProperty(value = "供方名称", dataType = "String")
     @TableField("supplier_name")
     private String supplierName;
@@ -60,6 +74,7 @@
     @TableField("supplier_type")
     private String supplierType;
 
+    @ExcelProperty(value = "供方类型", order = 3)
     @ApiModelProperty(value = "供方类型(字典value)", dataType = "String")
     @TableField(exist = false)
     private String supplierTypeName;
@@ -109,7 +124,8 @@
     /**
      * 电话
      */
-    @ApiModelProperty(value = "电话", dataType = "String")
+    @ExcelProperty(value = "联系电话", order = 4)
+    @ApiModelProperty(value = "联系电话", dataType = "String")
     @TableField("phone")
     private String phone;
 
@@ -158,6 +174,7 @@
     /**
      * 公司地址-省
      */
+    @ExcelProperty(value = "地址-省", order = 6)
     @ApiModelProperty(value = "公司地址-省", dataType = "String")
     @TableField("company_province_name")
     private String companyProvinceName;
@@ -172,6 +189,7 @@
     /**
      * 公司地址-市
      */
+    @ExcelProperty(value = "地址-市", order = 7)
     @ApiModelProperty(value = "公司地址-市", dataType = "String")
     @TableField("company_city_name")
     private String companyCityName;
@@ -186,6 +204,7 @@
     /**
      * 公司地址-区
      */
+    @ExcelProperty(value = "地址-区", order = 8)
     @ApiModelProperty(value = "公司地址-区", dataType = "String")
     @TableField("company_area_name")
     private String companyAreaName;
@@ -193,6 +212,7 @@
     /**
      * 公司地址-详细地址
      */
+    @ExcelProperty(value = "地址-详细地址", order = 9)
     @ApiModelProperty(value = "公司地址-详细地址", dataType = "String")
     @TableField("company_address")
     private String companyAddress;
@@ -200,6 +220,7 @@
     /**
      * 服务和供应的内容
      */
+    @ExcelProperty(value = "服务和供应的内容", order = 5)
     @ApiModelProperty(value = "服务和供应的内容", dataType = "String")
     @TableField("supplier_content")
     private String supplierContent;
@@ -250,6 +271,7 @@
     /**
      * 创建时间
      */
+    @ExcelProperty(value = "创建时间", order = 9)
     @ApiModelProperty(value = "创建时间", dataType = "String")
     @TableField("create_time")
     private String createTime;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/EnvLocationInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/EnvLocationInfo.java
new file mode 100644
index 0000000..d8e2d7b
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/EnvLocationInfo.java
@@ -0,0 +1,83 @@
+package com.casic.missiles.model.resource;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotEmpty;
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 实验室环境监控系统-设备表
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-06-07
+ */
+@ApiModel
+@Data
+@TableName("env_location_info")
+public class EnvLocationInfo implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "主键id", dataType = "Long")
+    @TableId("id")
+    private Long id;
+
+    /**
+     * 地点编号
+     */
+    @NotEmpty(message = "地点编号不能为空")
+    @ApiModelProperty(value = "地点编号", dataType = "String")
+    @TableField("location_no")
+    private String locationNo;
+
+    /**
+     * 地点名称
+     */
+    @ApiModelProperty(value = "地点名称", dataType = "String")
+    @TableField("location_name")
+    private String locationName;
+
+    /**
+     * 地点位置
+     */
+    @ApiModelProperty(value = "地点位置", dataType = "String")
+    @TableField("location_position")
+    private String locationPosition;
+
+    /**
+     * 创建人id
+     */
+    @ApiModelProperty(value = "创建人id", dataType = "Long")
+    @TableField("create_user_id")
+    private Long createUserId;
+
+    /**
+     * 创建人
+     */
+    @ApiModelProperty(value = "创建人", dataType = "String")
+    @TableField("create_user")
+    private String createUser;
+
+    /**
+     * 创建时间
+     */
+    @ApiModelProperty(value = "创建时间", dataType = "String")
+    @TableField("create_time")
+    private String createTime;
+
+    /**
+     * 更新时间
+     */
+    @ApiModelProperty(value = "更新时间", dataType = "String")
+    @TableField("update_time")
+    private String updateTime;
+
+
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemFileConfig.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemFileConfig.java
index 19e6845..86e569c 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemFileConfig.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemFileConfig.java
@@ -30,7 +30,7 @@
     @ApiModelProperty(value = "系统类别(1业务系统2受检系统3环境系统)", dataType = "Integer")
     @NotNull(message = "系统类别不能为空")
     @TableField("system_type")
-    private Integer systemType;
+    private Integer systemType = 1;
 
     @ApiModelProperty("下载编号")
     @TableField("download_no")
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemNotice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemNotice.java
index e94297d..06ec37d 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemNotice.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemNotice.java
@@ -34,7 +34,7 @@
     @ApiModelProperty(value = "系统类别(1业务系统2受检系统3环境系统)", dataType = "Integer")
     @NotNull(message = "系统类别不能为空")
     @TableField("system_type")
-    private Integer systemType;
+    private Integer systemType = 1;
 
     /**
      * 通知公告编号
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSign.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSign.java
index 6c0d7c9..954f4f8 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSign.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSign.java
@@ -51,7 +51,7 @@
     @ApiModelProperty(value = "系统类别(1业务系统2受检系统3环境系统)", dataType = "Integer")
     @NotNull(message = "系统类别不能为空")
     @TableField("system_type")
-    private Integer systemType;
+    private Integer systemType = 1;
 
     /**
      * 签名编号
@@ -130,4 +130,8 @@
     @TableField(exist = false)
     private List<Long> userIdList;
 
+    @ApiModelProperty(hidden = true)
+    @TableField(exist = false)
+    private String deptName;
+
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemTemplate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemTemplate.java
index 503a457..1d27ebe 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemTemplate.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemTemplate.java
@@ -47,7 +47,7 @@
     @ApiModelProperty(value = "系统类别(1业务系统2受检系统3环境系统)", dataType = "Integer")
     @NotNull(message = "系统类别不能为空")
     @TableField("system_type")
-    private Integer systemType;
+    private Integer systemType = 1;
 
     /**
      * 模板编号
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java
index 8c21cb0..f61e4a8 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java
@@ -32,4 +32,8 @@
     ReturnDTO approvalDelete(ApprovalDeleteRequest request);
 
     ReturnDTO failUpdate(T request);
+
+    List<O> listExport(R request);
+
+    List<O> listExportByIds(List<Long> ids);
 }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java
index 724166f..9bce15b 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java
@@ -157,6 +157,29 @@
         throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
     }
 
+    @Override
+    public List<O> listExport(R request) {
+        request.setCreateUserId(null);
+        request.setApprovalStatus(ApprovalStatusEnum.PASSED);
+        Page<O> page = PageFactory.defaultPage();
+        page.setCurrent(1);
+        page.setSearchCount(false);
+        page.setSize(Integer.MAX_VALUE);
+        Page<O> resultPage = this.baseMapper.selectBatchForApprovalList(page, request, null);
+        return resultPage.getRecords();
+    }
+
+    @Override
+    public List<O> listExportByIds(List<Long> ids) {
+        Page<O> page = PageFactory.defaultPage();
+        page.setCurrent(1);
+        page.setSearchCount(false);
+        page.setSize(Integer.MAX_VALUE);
+        List<String> businessKeys = ids.stream().map(String::valueOf).collect(Collectors.toList());
+        Page<O> resultPage = this.baseMapper.selectBatchForApprovalList(page, null, businessKeys);
+        return resultPage.getRecords();
+    }
+
     protected ReturnDTO updateApprovalStatus(Long id, String processId, String approvalStatus) {
         UpdateWrapper<T> updateWrapper = new UpdateWrapper<>();
         updateWrapper.eq("id", id);
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificatePrintServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificatePrintServiceImpl.java
index f6e4706..3228497 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificatePrintServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificatePrintServiceImpl.java
@@ -162,6 +162,30 @@
         return ReturnUtil.success(printLogMapper.selectList(wrapper));
     }
 
+    @Override
+    public List<CertificatePrintListResponse> listByIds(List<Long> ids) {
+        Page<CertificatePrintListResponse> page = PageFactory.defaultPage();
+        page.setCurrent(1);
+        page.setSearchCount(false);
+        page.setSize(Integer.MAX_VALUE);
+        List<String> businessKeys = ids.stream().map(String::valueOf).collect(Collectors.toList());
+        Page<CertificatePrintListResponse> resultPage = this.baseMapper.selectBatchForApprovalList(page, null, businessKeys);
+        return resultPage.getRecords();
+    }
+
+    @Override
+    public List<CertificatePrintListResponse> list(CertificatePrintApprovalListRequest request) {
+        request.setCreateUserId(null);
+        request.setApprovalStatus(null);
+        request.setPrintStatus(null);
+        Page<CertificatePrintListResponse> page = PageFactory.defaultPage();
+        page.setCurrent(1);
+        page.setSearchCount(false);
+        page.setSize(Integer.MAX_VALUE);
+        Page<CertificatePrintListResponse> resultPage = certificatePrintMapper.selectBatchForApprovalList(page, request, null);
+        return resultPage.getRecords();
+    }
+
     private void savePrintLog(Long id) {
         BizBusinessCertificatePrintLog printLog = new BizBusinessCertificatePrintLog();
         BizBusinessCertificatePrint certificatePrint = certificatePrintMapper.selectById(id);
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificateReportServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificateReportServiceImpl.java
index 457555f..24146be 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificateReportServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificateReportServiceImpl.java
@@ -158,8 +158,8 @@
         QueryWrapper<BizBusinessCertificateMeasureResultData> mWrapper = new QueryWrapper<>();
         mWrapper.eq("report_id", reportId);
         boolean mRemove = certificateMeasureResultDataService.remove(mWrapper);
-        Assert.isFalse(eRemove || mRemove, () -> {
+        if(!eRemove || !mRemove){
             throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
-        });
+        }
     }
 }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessIdentifyInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessIdentifyInfoServiceImpl.java
index 4c8e190..f7e63ca 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessIdentifyInfoServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessIdentifyInfoServiceImpl.java
@@ -1,8 +1,10 @@
 package com.casic.missiles.service.Impl.business;
 
+import cn.hutool.core.date.DateUtil;
 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.core.page.PageFactory;
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.business.identify.IdentifyListRequest;
@@ -14,11 +16,14 @@
 import com.casic.missiles.service.business.IBizBusinessIdentifyInfoService;
 import com.casic.missiles.utils.DictCodeUtils;
 import com.casic.missiles.utils.NumberGeneratorUtil;
+import com.casic.missiles.utils.QRCodeUtil;
 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.List;
+
 /**
  * <p>
  * 计量检定业务-任务计量管理-标识打印 服务实现类
@@ -35,9 +40,9 @@
     @Override
     public Page<BizBusinessIdentifyInfo> identifyListPage(Page<BizBusinessIdentifyInfo> page, IdentifyListRequest request) throws Exception {
         QueryWrapper<BizBusinessIdentifyInfo> wrapper = new QueryWrapper<>();
-        wrapper.eq("identify_type", request.getIdentifyType());
-        wrapper.like("device_no", request.getDeviceNo());
-        wrapper.like("device_name", request.getDeviceName());
+        wrapper.eq(StringUtils.isNotEmpty(request.getIdentifyType()), "identify_type", request.getIdentifyType());
+        wrapper.like(StringUtils.isNotEmpty(request.getDeviceNo()),"device_no", request.getDeviceNo());
+        wrapper.like(StringUtils.isNotEmpty(request.getDeviceName()), "device_name", request.getDeviceName());
         wrapper.apply(StringUtils.isNotBlank(request.getCreateTimeStart()),
                 "{0} <= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getCreateTimeStart().split(" ")[0]);
         wrapper.apply(StringUtils.isNotBlank(request.getCreateTimeEnd()),
@@ -64,8 +69,11 @@
     }
 
     @Override
-    public ReturnDTO updateIdentify(BizBusinessIdentifyInfo identifyInfo) {
-        if(identifyInfoMapper.updateById(identifyInfo) > 0){
+    public ReturnDTO updateIdentify(Long id) {
+        BizBusinessIdentifyInfo info = new BizBusinessIdentifyInfo();
+        info.setId(id);
+        info.setUpdateTime(DateUtil.now());
+        if(identifyInfoMapper.updateById(info) > 0){
             return ReturnUtil.success();
         }
         throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
@@ -79,4 +87,20 @@
         throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
     }
 
+    @Override
+    public List<BizBusinessIdentifyInfo> list(IdentifyListRequest request) throws Exception {
+        Page<BizBusinessIdentifyInfo> page = PageFactory.defaultPage();
+        page.setCurrent(1);
+        page.setSearchCount(false);
+        page.setSize(Integer.MAX_VALUE);
+        Page<BizBusinessIdentifyInfo> resultPage = this.identifyListPage(page, request);
+        return resultPage.getRecords();
+    }
+
+    @Override
+    public ReturnDTO<String> equipmentQrCode(Long id) {
+        String base64QRCode = QRCodeUtil.getBase64QRCode(String.valueOf(id));
+        return ReturnUtil.success(base64QRCode);
+    }
+
 }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOrderInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOrderInfoServiceImpl.java
index 82952ad..d8d2c6a 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOrderInfoServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOrderInfoServiceImpl.java
@@ -35,6 +35,7 @@
 import javax.servlet.http.HttpServletResponse;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 import java.util.stream.Collectors;
 
 /**
@@ -209,13 +210,16 @@
     private QueryWrapper<OrderListResponse> listParamWrapperBuilder(OrderListRequest request) {
         QueryWrapper<OrderListResponse> wrapper = new QueryWrapper<>();
         wrapper.like(StringUtils.isNotBlank(request.getOrderNo()), "order_no", request.getOrderNo());
+        wrapper.like(Objects.nonNull(request.getCustomerId()), "customer_id", request.getCustomerId());
         wrapper.like(StringUtils.isNotBlank(request.getCustomerName()), "customer_name", request.getCustomerName());
         wrapper.like(StringUtils.isNotBlank(request.getDeliverer()), "deliverer", request.getDeliverer());
         wrapper.like(StringUtils.isNotBlank(request.getCreateUserName()), "create_user_name", request.getCreateUserName());
-        wrapper.apply(StringUtils.isNotBlank(request.getCreateStartTime()),
-                "{0} <= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getCreateStartTime().split(" ")[0]);
-        wrapper.apply(StringUtils.isNotBlank(request.getCreateEndTime()),
-                "{0} >= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getCreateEndTime().split(" ")[0]);
+        if(StringUtils.isNotBlank(request.getCreateStartTime())){
+            wrapper.apply("{0} <= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getCreateStartTime().split(" ")[0]);
+        }
+        if(StringUtils.isNotBlank(request.getCreateEndTime())){
+            wrapper.apply("{0} >= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getCreateEndTime().split(" ")[0]);
+        }
         wrapper.orderByDesc("create_time");
         return wrapper;
     }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceAssessServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceAssessServiceImpl.java
index c6af980..ce40138 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceAssessServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceAssessServiceImpl.java
@@ -1,10 +1,33 @@
 package com.casic.missiles.service.Impl.business;
 
-import com.casic.missiles.model.business.BizBusinessOutsourceAssess;
+import cn.hutool.core.lang.Assert;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.casic.missiles.core.model.auth.AuthUser;
+import com.casic.missiles.core.shiro.ShiroKit;
+import com.casic.missiles.dto.BaseApprovalSubmitRequest;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.ReturnUtil;
+import com.casic.missiles.dto.business.outsource.OutsourceAssessApprovalListRequest;
+import com.casic.missiles.dto.business.outsource.OutsourceAssessSaveResponse;
+import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.NoGenerateFileCodeEnum;
+import com.casic.missiles.enums.NoGenerateRecordTypeCodeEnum;
+import com.casic.missiles.enums.system.ApprovalStatusEnum;
+import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.mapper.business.BizBusinessOutsourceAssessMapper;
+import com.casic.missiles.model.business.BizBusinessOutsourceAssess;
+import com.casic.missiles.model.business.BizBusinessOutsourceAssessSampleRelation;
+import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl;
+import com.casic.missiles.service.business.IBizBusinessOutsourceAssessSampleRelationService;
 import com.casic.missiles.service.business.IBizBusinessOutsourceAssessService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.casic.missiles.utils.NoGeneratorUtil;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Objects;
 
 /**
  * <p>
@@ -15,6 +38,103 @@
  * @since 2023-08-16
  */
 @Service
-public class BizBusinessOutsourceAssessServiceImpl extends ServiceImpl<BizBusinessOutsourceAssessMapper, BizBusinessOutsourceAssess> implements IBizBusinessOutsourceAssessService {
+public class BizBusinessOutsourceAssessServiceImpl extends GeneralApprovalServiceImpl<BizBusinessOutsourceAssessMapper, BizBusinessOutsourceAssess, BizBusinessOutsourceAssess, OutsourceAssessApprovalListRequest, BaseApprovalSubmitRequest> implements IBizBusinessOutsourceAssessService {
+    @Autowired
+    private IBizBusinessOutsourceAssessSampleRelationService outsourceAssessSampleRelationService;
 
+    @Override
+    public ReturnDTO<OutsourceAssessSaveResponse> saveOutsourceAssess(BizBusinessOutsourceAssess request) {
+        //生成编号
+        String labCode = request.getLabCode();
+        String groupCode = request.getGroupCode();
+        Long maxNo = this.baseMapper.selectMaxProjectNo();
+        String projectNo = NoGeneratorUtil.getCode(NoGenerateFileCodeEnum.D, labCode, NoGenerateRecordTypeCodeEnum.OUTSOURCE_ACCESS, groupCode, maxNo);
+        request.setCreateUserId(request.getUserId());
+        request.setCreateUserName(request.getUserName());
+        request.setApprovalStatus(ApprovalStatusEnum.DRAFT); //草稿箱状态
+        request.setProjectNo(projectNo);
+        int row = this.baseMapper.insert(request);
+        Assert.isFalse(row <= 0, () -> {
+            throw new BusinessException(BusinessExceptionEnum.OUTSOURCE_ACCESS_SAVE_FAILED);
+        });
+        //关联表
+        saveRelationData(request);
+        OutsourceAssessSaveResponse saveResponse = new OutsourceAssessSaveResponse();
+        saveResponse.setId(request.getId());
+        saveResponse.setProjectNo(projectNo);
+        return ReturnUtil.success(saveResponse);
+    }
+
+    @Override
+    @Transactional
+    public ReturnDTO draftUpdate(BizBusinessOutsourceAssess request) {
+        if (this.baseMapper.updateById(request) > 0) {
+            //关联表删除、增加
+            removeRelationData(request.getId());
+            saveRelationData(request);
+            return ReturnUtil.success();
+        }
+        throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
+    }
+
+    @Override
+    public ReturnDTO draftDelete(Long id) {
+        if (this.baseMapper.deleteById(id) > 0) {
+            //关联表删除
+            removeRelationData(id);
+            return ReturnUtil.success();
+        }
+        throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
+    }
+
+    @Override
+    public ReturnDTO draftBatchDelete(List<Long> ids) {
+        if (this.baseMapper.deleteBatchIds(ids) >= 0) {
+            ids.forEach(id -> removeRelationData(id));
+            return ReturnUtil.success();
+        }
+        throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
+    }
+
+    @Override
+    @Transactional
+    public ReturnDTO failUpdate(BizBusinessOutsourceAssess request) {
+        AuthUser user = ShiroKit.getUser();
+        Assert.isFalse(Objects.isNull(user), () -> {
+            throw new BusinessException(BusinessExceptionEnum.LOGIN_USER_ACQUIRE_FAILED);
+        });
+        request.setApprovalStatus(ApprovalStatusEnum.IN_APPROVED);
+        if (this.baseMapper.updateById(request) > 0) {
+            //关联表删除、增加
+            removeRelationData(request.getId());
+            saveRelationData(request);
+            baseApprovalService.failUpdate(request.getProcessId());
+            return ReturnUtil.success();
+        }
+        throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
+    }
+
+    private void saveRelationData(BizBusinessOutsourceAssess request) {
+        List<BizBusinessOutsourceAssessSampleRelation> sampleRelations = new ArrayList<>();
+        request.getOrderSampleList().forEach(dto -> {
+            BizBusinessOutsourceAssessSampleRelation relation = new BizBusinessOutsourceAssessSampleRelation();
+            relation.setOrderId(dto.getOrderId());
+            relation.setSampleId(dto.getSampleId());
+            relation.setAccessId(request.getId());
+            sampleRelations.add(relation);
+        });
+        if(outsourceAssessSampleRelationService.saveBatch(sampleRelations)){
+            return;
+        }
+        throw new BusinessException(BusinessExceptionEnum.OUTSOURCE_ACCESS_SAVE_FAILED);
+    }
+
+    private void removeRelationData(Long assessId) {
+        QueryWrapper<BizBusinessOutsourceAssessSampleRelation> wrapper = new QueryWrapper<>();
+        wrapper.eq("access_id", assessId);
+        if(outsourceAssessSampleRelationService.remove(wrapper)){
+            return;
+        }
+        throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
+    }
 }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceProtocolServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceProtocolServiceImpl.java
new file mode 100644
index 0000000..821e728
--- /dev/null
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceProtocolServiceImpl.java
@@ -0,0 +1,60 @@
+package com.casic.missiles.service.Impl.business;
+
+import cn.hutool.core.lang.Assert;
+import com.casic.missiles.dto.BaseApprovalSubmitRequest;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.ReturnUtil;
+import com.casic.missiles.dto.business.outsource.OutsourceProtocolApprovalListRequest;
+import com.casic.missiles.dto.business.outsource.OutsourceProtocolSaveResponse;
+import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.NoGenerateFileCodeEnum;
+import com.casic.missiles.enums.NoGenerateRecordTypeCodeEnum;
+import com.casic.missiles.enums.system.ApprovalStatusEnum;
+import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.mapper.business.BizBusinessOutsourceProtocolMapper;
+import com.casic.missiles.mapper.business.BizBusinessOutsourcerInfoMapper;
+import com.casic.missiles.model.business.BizBusinessOutsourceProtocol;
+import com.casic.missiles.model.business.BizBusinessOutsourcerInfo;
+import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl;
+import com.casic.missiles.service.business.IBizBusinessOutsourceProtocolService;
+import com.casic.missiles.utils.NoGeneratorUtil;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 计量检定业务-分包管理-测试、校准或检定工作分包协议书 服务实现类
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-08-24
+ */
+@Service
+public class BizBusinessOutsourceProtocolServiceImpl extends GeneralApprovalServiceImpl<BizBusinessOutsourceProtocolMapper, BizBusinessOutsourceProtocol, BizBusinessOutsourceProtocol, OutsourceProtocolApprovalListRequest, BaseApprovalSubmitRequest> implements IBizBusinessOutsourceProtocolService {
+    @Autowired
+    private BizBusinessOutsourcerInfoMapper outsourcerInfoMapper;
+
+    @Override
+    public ReturnDTO<OutsourceProtocolSaveResponse> saveOutsourceProtocol(BizBusinessOutsourceProtocol request) {
+        //生成编号
+        String labCode = request.getLabCode();
+        String groupCode = request.getGroupCode();
+        Long maxNo = this.baseMapper.selectMaxProtocolNo();
+        String protocolNo = NoGeneratorUtil.getCode(NoGenerateFileCodeEnum.D, labCode, NoGenerateRecordTypeCodeEnum.OUTSOURCE_PROTOCOL, groupCode, maxNo);
+        request.setCreateUserId(request.getUserId());
+        request.setCreateUserName(request.getUserName());
+        request.setApprovalStatus(ApprovalStatusEnum.DRAFT); //草稿箱状态
+        request.setProtocolNo(protocolNo);
+        BizBusinessOutsourcerInfo outsourcerInfo = outsourcerInfoMapper.selectById(request.getOutsourcerId());
+        request.setOutsourceNo(outsourcerInfo.getOutsourcerNo());
+        request.setOutsourceName(outsourcerInfo.getOutsourcerName());
+        int row = this.baseMapper.insert(request);
+        Assert.isFalse(row <= 0, () -> {
+            throw new BusinessException(BusinessExceptionEnum.OUTSOURCE_PROTOCOL_SAVE_FAILED);
+        });
+        OutsourceProtocolSaveResponse saveResponse = new OutsourceProtocolSaveResponse();
+        saveResponse.setId(request.getId());
+        saveResponse.setProtocolNo(protocolNo);
+        return ReturnUtil.success(saveResponse);
+    }
+}
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourcerInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourcerInfoServiceImpl.java
index 75f639d..8aadad7 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourcerInfoServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourcerInfoServiceImpl.java
@@ -3,12 +3,12 @@
 import cn.hutool.core.lang.Assert;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.dto.*;
 import com.casic.missiles.dto.business.outsource.OutsourcerInfoApprovalListRequest;
 import com.casic.missiles.dto.business.outsource.OutsourcerSaveResponse;
 import com.casic.missiles.enums.BusinessExceptionEnum;
-import com.casic.missiles.enums.PrefixCodeEnum;
+import com.casic.missiles.enums.NoGenerateFileCodeEnum;
+import com.casic.missiles.enums.NoGenerateRecordTypeCodeEnum;
 import com.casic.missiles.enums.system.ApprovalStatusEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.mapper.business.BizBusinessOutsourcerInfoMapper;
@@ -20,7 +20,7 @@
 import com.casic.missiles.service.business.IBizBusinessOutsourcerInfoService;
 import com.casic.missiles.service.business.IBizBusinessOutsourcerUserInfoService;
 import com.casic.missiles.utils.DictCodeUtils;
-import com.casic.missiles.utils.NumberGeneratorUtil;
+import com.casic.missiles.utils.NoGeneratorUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -42,22 +42,12 @@
     private IBizBusinessOutsourcerUserInfoService outsourcerUserInfoService;
 
     @Override
-    public List<BizBusinessOutsourcerInfo> list(OutsourcerInfoApprovalListRequest request) {
-        request.setCreateUserId(null);
-        request.setApprovalStatus(ApprovalStatusEnum.PASSED);
-        Page<BizBusinessOutsourcerInfo> page = PageFactory.defaultPage();
-        page.setCurrent(1);
-        page.setSearchCount(false);
-        page.setSize(Integer.MAX_VALUE);
-        Page<BizBusinessOutsourcerInfo> resultPage = this.baseMapper.selectBatchForApprovalList(page, request, null);
-        return resultPage.getRecords();
-    }
-
-    @Override
     public ReturnDTO<OutsourcerSaveResponse> saveOutsourcer(BizBusinessOutsourcerInfo request) {
         //生成编号
+        String labCode = request.getLabCode();
+        String groupCode = request.getGroupCode();
         Long maxNo = this.baseMapper.selectMaxNo();
-        String outsourcerNo = NumberGeneratorUtil.getContactNo(PrefixCodeEnum.OUTSOURCER_PREFIX, maxNo);
+        String outsourcerNo = NoGeneratorUtil.getCode(NoGenerateFileCodeEnum.D, labCode, NoGenerateRecordTypeCodeEnum.OUTSOURCE_INFO, groupCode, maxNo);
         request.setOutsourcerNo(outsourcerNo);
         request.setCreateUserId(request.getUserId());
         request.setCreateUserName(request.getUserName());
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessSiteExecutiveInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessSiteExecutiveInfoServiceImpl.java
index ebab3e6..6c6a129 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessSiteExecutiveInfoServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessSiteExecutiveInfoServiceImpl.java
@@ -189,9 +189,9 @@
         QueryWrapper<BizBusinessSiteExecutiveStaffRelation> mWrapper = new QueryWrapper<>();
         mWrapper.eq("site_executive_id", siteExecutiveId);
         boolean mRemove = siteExecutiveStaffRelationService.remove(mWrapper);
-        Assert.isFalse(eRemove || mRemove, () -> {
+        if(!eRemove || !mRemove){
             throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
-        });
+        }
     }
 
     private void doPopulateSiteExecutive(SiteExecutiveDetailResponse detailResponse) {
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessLabExecutiveInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessLabExecutiveInfoServiceImpl.java
index 50c5616..0242fcf 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessLabExecutiveInfoServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessLabExecutiveInfoServiceImpl.java
@@ -297,6 +297,29 @@
     }
 
     @Override
+    public List<SampleLabExecutiveListResponse> deptLabExecutiveList(SampleLabExecutiveListRequest request) throws Exception {
+        Page<SampleLabExecutiveListResponse> page = PageFactory.defaultPage();
+        page.setCurrent(1);
+        page.setSearchCount(false);
+        page.setSize(Integer.MAX_VALUE);
+        Page<SampleLabExecutiveListResponse> resultPage = this.deptLabExecutiveListPage(page, request);
+        return resultPage.getRecords();
+    }
+
+    @Override
+    public List<SampleLabExecutiveListResponse> deptLabExecutiveListByIds(String measureStatus, List<Long> ids) throws Exception {
+        Page<SampleLabExecutiveListResponse> page = PageFactory.defaultPage();
+        page.setCurrent(1);
+        page.setSearchCount(false);
+        page.setSize(Integer.MAX_VALUE);
+        SampleLabExecutiveListRequest request = new SampleLabExecutiveListRequest();
+        request.setIds(ids);
+        request.setMeasureStatus(measureStatus);
+        Page<SampleLabExecutiveListResponse> resultPage = this.deptLabExecutiveListPage(page, request);
+        return resultPage.getRecords();
+    }
+
+    @Override
     public Page<SampleLabExecutiveListResponse> myLabExecutiveListPage(Page<SampleLabExecutiveListResponse> page, SampleLabExecutiveListRequest labExecutiveListRequest) throws Exception{
         AuthUser user = ShiroKit.getUser();
         Assert.isFalse(Objects.isNull(user), () -> {
@@ -350,6 +373,29 @@
     }
 
     @Override
+    public List<SampleLabExecutiveListResponse> myLabExecutiveList(SampleLabExecutiveListRequest request) throws Exception {
+        Page<SampleLabExecutiveListResponse> page = PageFactory.defaultPage();
+        page.setCurrent(1);
+        page.setSearchCount(false);
+        page.setSize(Integer.MAX_VALUE);
+        Page<SampleLabExecutiveListResponse> resultPage = this.myLabExecutiveListPage(page, request);
+        return resultPage.getRecords();
+    }
+
+    @Override
+    public List<SampleLabExecutiveListResponse> myLabExecutiveListByIds(String measureStatus, List<Long> ids) throws Exception {
+        Page<SampleLabExecutiveListResponse> page = PageFactory.defaultPage();
+        page.setCurrent(1);
+        page.setSearchCount(false);
+        page.setSize(Integer.MAX_VALUE);
+        SampleLabExecutiveListRequest request = new SampleLabExecutiveListRequest();
+        request.setIds(ids);
+        request.setMeasureStatus(measureStatus);
+        Page<SampleLabExecutiveListResponse> resultPage = this.myLabExecutiveListPage(page, request);
+        return resultPage.getRecords();
+    }
+
+    @Override
     public List<SampleAmountResponse> myExecutiveAmount() {
         //登录用户id获取计量人员id，实验室检测信息中存储的是计量人员id
         AuthUser user = ShiroKit.getUser();
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentInfoServiceImpl.java
index 864b05e..db8cad4 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentInfoServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentInfoServiceImpl.java
@@ -35,7 +35,6 @@
 import com.casic.missiles.utils.ConvertUtils;
 import com.casic.missiles.utils.DictCodeUtils;
 import com.casic.missiles.utils.NumberGeneratorUtil;
-import org.flowable.engine.RuntimeService;
 import org.flowable.engine.runtime.ProcessInstance;
 import org.jetbrains.annotations.NotNull;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -43,7 +42,6 @@
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
 
-import javax.annotation.Resource;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
@@ -81,8 +79,6 @@
     private IBizEquipmentAttachmentService attachmentService;
     @Autowired
     private IBizEquipmentCheckpointService checkpointService;
-    @Resource
-    private RuntimeService runtimeService;
     @Autowired
     private ApprovalOperateService approvalOperateService;
 
@@ -235,18 +231,18 @@
     private void updateRelationInfo(EquipmentAddRequest request, BizEquipmentInfoApproval equipmentInfoApproval) {
         QueryWrapper<BizEquipmentTechnicalTarget> targetWrapper = new QueryWrapper<>();
         targetWrapper.eq("equipment_no", equipmentInfoApproval.getEquipmentNo());
-        boolean removeTargetFlag = technicalTargetService.remove(targetWrapper);
-        boolean saveTargetFlag = technicalTargetService.saveBatch(request.getTechnicalTargetList());
+        technicalTargetService.remove(targetWrapper);
+        technicalTargetService.saveBatch(request.getTechnicalTargetList());
 
         QueryWrapper<BizEquipmentAttachment> attachmentWrapper = new QueryWrapper<>();
         attachmentWrapper.eq("equipment_no", equipmentInfoApproval.getEquipmentNo());
-        boolean removeAttachmentFlag = attachmentService.remove(attachmentWrapper);
-        boolean saveAttachmentFlag = attachmentService.saveBatch(request.getAttachmentList());
+        attachmentService.remove(attachmentWrapper);
+        attachmentService.saveBatch(request.getAttachmentList());
 
         QueryWrapper<BizEquipmentCheckpoint> checkpointWrapper = new QueryWrapper<>();
         checkpointWrapper.eq("equipment_no", equipmentInfoApproval.getEquipmentNo());
-        boolean removeCheckpointFlag = checkpointService.remove(checkpointWrapper);
-        boolean saveCheckpointFlag = checkpointService.saveBatch(request.getCheckpointList());
+        checkpointService.remove(checkpointWrapper);
+        checkpointService.saveBatch(request.getCheckpointList());
     }
 
     @Override
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardInfoServiceImpl.java
index faff1ae..c50a5b3 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardInfoServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardInfoServiceImpl.java
@@ -22,7 +22,9 @@
 import com.casic.missiles.mapper.equipment.BizEquipmentStandardInfoMapper;
 import com.casic.missiles.mapper.equipment.BizEquipmentStandardTechnologyRelationMapper;
 import com.casic.missiles.mapper.resource.BizResourceStaffInfoMapper;
-import com.casic.missiles.model.equipment.*;
+import com.casic.missiles.model.equipment.BizEquipmentStandardInfo;
+import com.casic.missiles.model.equipment.BizEquipmentStandardInfoApproval;
+import com.casic.missiles.model.equipment.BizEquipmentStandardTechnologyRelation;
 import com.casic.missiles.model.resource.BizResourceStaffInfo;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.dao.DeptMapper;
@@ -33,14 +35,12 @@
 import com.casic.missiles.service.flowable.ApprovalOperateService;
 import com.casic.missiles.utils.ConvertUtils;
 import com.casic.missiles.utils.DictCodeUtils;
-import org.flowable.engine.RuntimeService;
 import org.flowable.engine.runtime.ProcessInstance;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
 
-import javax.annotation.Resource;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
@@ -62,8 +62,6 @@
     private BizResourceStaffInfoMapper staffInfoMapper;
     @Autowired
     private IBaseApprovalService baseApprovalService;
-    @Resource
-    private RuntimeService runtimeService;
     @Autowired
     private ApprovalOperateService approvalOperateService;
     @Autowired
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSealInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSealInfoServiceImpl.java
index 7c91fa2..00040d6 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSealInfoServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSealInfoServiceImpl.java
@@ -15,6 +15,7 @@
 import com.casic.missiles.modular.system.model.User;
 import com.casic.missiles.service.resource.IBizResourceSealInfoService;
 import com.casic.missiles.utils.DictCodeUtils;
+import com.casic.missiles.utils.MinioUtil;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -33,6 +34,8 @@
     private BizResourceSealInfoMapper sealInfoMapper;
     @Autowired
     private UserMapper userMapper;
+    @Autowired
+    private MinioUtil minioUtil;
 
     @Override
     public Page<BizResourceSealInfo> listPage(Page<BizResourceSealInfo> page, SealInfoListRequest request) throws Exception {
@@ -44,6 +47,7 @@
         Page<BizResourceSealInfo> sealInfoPage = sealInfoMapper.selectPage(page, wrapper);
         for (BizResourceSealInfo record : sealInfoPage.getRecords()) {
             DictCodeUtils.convertDictCodeToName(record);
+            record.setMinioFileUrl(minioUtil.getFileUrl(record.getMinioFileName()));
         }
         return sealInfoPage;
     }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceStaffInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceStaffInfoServiceImpl.java
index f058cf5..09203ac 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceStaffInfoServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceStaffInfoServiceImpl.java
@@ -3,6 +3,7 @@
 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.core.page.PageFactory;
 import com.casic.missiles.dto.IdDTO;
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
@@ -86,6 +87,13 @@
     }
 
     @Override
+    public List<BizResourceStaffInfo> list(StaffListRequest request) throws Exception {
+        Page<BizResourceStaffInfo> page = PageFactory.defaultPage();
+        Page<BizResourceStaffInfo> staffInfoPage = this.listPage(page, request);
+        return staffInfoPage.getRecords();
+    }
+
+    @Override
     @Transactional
     public ReturnDTO<IdDTO> staffBaseAdd(BizResourceStaffInfo staffInfo) {
         //登录账号查重
@@ -495,6 +503,28 @@
         return certResponsePage;
     }
 
+    @Override
+    public List<StaffCertResponse> certListByIds(List<Long> ids) throws Exception {
+        Page<StaffCertResponse> page = PageFactory.defaultPage();
+        page.setCurrent(1);
+        page.setSearchCount(false);
+        page.setSize(Integer.MAX_VALUE);
+        StaffCertRequest request = new StaffCertRequest();
+        request.setIds(ids);
+        Page<StaffCertResponse> resultPage = this.certListPage(page, request);
+        return resultPage.getRecords();
+    }
+
+    @Override
+    public List<StaffCertResponse> certList(StaffCertRequest request) throws Exception {
+        Page<StaffCertResponse> page = PageFactory.defaultPage();
+        page.setCurrent(1);
+        page.setSearchCount(false);
+        page.setSize(Integer.MAX_VALUE);
+        Page<StaffCertResponse> resultPage = this.certListPage(page, request);
+        return resultPage.getRecords();
+    }
+
     @Async
     public void deleteRelationInfo(Long staffId){
         QueryWrapper<BizResourceStaffEducation> educationWrapper = new QueryWrapper<>();
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceStaffVerifierServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceStaffVerifierServiceImpl.java
index 8ac7eee..b508d45 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceStaffVerifierServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceStaffVerifierServiceImpl.java
@@ -52,8 +52,8 @@
     private WebSocket webSocket;
 
     @Override
-    public ReturnDTO expirationReminder(IdDTO idDto) {
-        BizResourceStaffVerifier staffVerifier = verifierMapper.selectById(idDto.getId());
+    public ReturnDTO expirationReminder(IdDTO idDTO) {
+        BizResourceStaffVerifier staffVerifier = verifierMapper.selectById(idDTO.getId());
         BizResourceStaffInfo staffInfo = staffInfoMapper.selectById(staffVerifier.getStaffId());
         QueryWrapper<User> wrapper = new QueryWrapper<>();
         wrapper.eq("account", staffInfo.getAccount());
@@ -65,7 +65,7 @@
         Assert.isFalse(Objects.isNull(user), () -> {
             throw new BusinessException(BusinessExceptionEnum.LOGIN_USER_ACQUIRE_FAILED);
         });
-        WorkbenchRemindMessage remindMessage = new WorkbenchRemindMessage(userInfo.getId(), userInfo.getDeptId(), idDto.getId(), staffVerifier.getCertNo(), MessageTypeEnum.STAFF_CERT.getCode(), MessageSourceModuleEnum.RESOURCE.getCode(), MessageTypeEnum.STAFF_CERT.getValue(), MessageTypeEnum.STAFF_CERT.getValue(), staffVerifier.getCertName(),0, user.getId(), user.getName());
+        WorkbenchRemindMessage remindMessage = new WorkbenchRemindMessage(userInfo.getId(), userInfo.getDeptId(), idDTO.getId(), staffVerifier.getCertNo(), MessageTypeEnum.STAFF_CERT.getCode(), MessageSourceModuleEnum.RESOURCE.getCode(), MessageTypeEnum.STAFF_CERT.getValue(), MessageTypeEnum.STAFF_CERT.getValue(), staffVerifier.getCertName(),0, user.getId(), user.getName());
         if(messageMapper.insert(remindMessage) > 0){
             // 新增到消息列表后向用户推送消息
             webSocket.sendOneMessage(String.valueOf(userInfo.getId()), JSONObject.toJSONString(remindMessage));
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceTrainInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceTrainInfoServiceImpl.java
index c1d6308..3a533f2 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceTrainInfoServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceTrainInfoServiceImpl.java
@@ -44,11 +44,14 @@
     @Override
     public Page<BizResourceTrainInfo> listPage(Page<BizResourceTrainInfo> page, TrainListRequest request) throws Exception {
         QueryWrapper<BizResourceTrainInfo> wrapper = new QueryWrapper<>();
-        wrapper.like("train_no", request.getTrainNo());
-        wrapper.apply(StringUtils.isNotBlank(request.getCreateTimeStart()),//apply方法传入参数名不能为空
-                "{0} <= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getCreateTimeStart().split(" ")[0]);
-        wrapper.apply(StringUtils.isNotBlank(request.getCreateTimeEnd()),
-                "{0} >= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getCreateTimeEnd().split(" ")[0]);
+        wrapper.like(StringUtils.isNotEmpty(request.getTrainNo()), "train_no", request.getTrainNo());
+        wrapper.like(StringUtils.isNotEmpty(request.getDutyLeader()),"duty_leader", request.getDutyLeader());
+        if(StringUtils.isNotBlank(request.getCreateTimeStart())){
+            wrapper.apply("{0} <= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getCreateTimeStart().split(" ")[0]);
+        }
+        if(StringUtils.isNotBlank(request.getCreateTimeEnd())){
+            wrapper.apply("{0} >= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getCreateTimeEnd().split(" ")[0]);
+        }
         wrapper.orderByDesc("create_time");
         Page<BizResourceTrainInfo> trainInfoPage = trainInfoMapper.selectPage(page, wrapper);
         for (BizResourceTrainInfo record : trainInfoPage.getRecords()) {
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/EnvLocationInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/EnvLocationInfoServiceImpl.java
new file mode 100644
index 0000000..cdc5742
--- /dev/null
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/EnvLocationInfoServiceImpl.java
@@ -0,0 +1,31 @@
+package com.casic.missiles.service.Impl.resource;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.casic.missiles.dto.resource.environment.LocationListRequest;
+import com.casic.missiles.dto.resource.environment.LocationListResponse;
+import com.casic.missiles.mapper.resource.EnvLocationInfoMapper;
+import com.casic.missiles.model.resource.EnvLocationInfo;
+import com.casic.missiles.service.resource.IEnvLocationInfoService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 实验室环境监控系统-设备表 服务实现类
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-06-07
+ */
+@Service
+public class EnvLocationInfoServiceImpl extends ServiceImpl<EnvLocationInfoMapper, EnvLocationInfo> implements IEnvLocationInfoService {
+    @Autowired
+    private EnvLocationInfoMapper locationInfoMapper;
+
+    @Override
+    public Page<LocationListResponse> listPage(Page<LocationListResponse> page, LocationListRequest request) {
+        Page<LocationListResponse> resultPage = locationInfoMapper.selectLocationListPage(page, request);
+        return resultPage;
+    }
+}
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/DownloadCenterServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/DownloadCenterServiceImpl.java
index c956d24..d9f3282 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/DownloadCenterServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/DownloadCenterServiceImpl.java
@@ -131,10 +131,12 @@
         wrapper.like(StringUtils.isNotBlank(request.getModuleName()), "module_name", request.getModuleName());
         wrapper.like(StringUtils.isNotBlank(request.getFileName()), "file_name", request.getFileName());
         wrapper.like(StringUtils.isNotBlank(request.getFileType()), "file_type", request.getFileType());
-        wrapper.apply(StringUtils.isNotBlank(request.getStartTime()),
-                "{0} <= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getStartTime().split(" ")[0]);
-        wrapper.apply(StringUtils.isNotBlank(request.getEndTime()),
-                "{0} >= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getEndTime().split(" ")[0]);
+        if(StringUtils.isNotBlank(request.getStartTime())){
+            wrapper.apply("{0} <= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getStartTime().split(" ")[0]);
+        }
+        if(StringUtils.isNotBlank(request.getEndTime())){
+            wrapper.apply("{0} >= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getEndTime().split(" ")[0]);
+        }
         wrapper.orderByDesc("create_time");
         return wrapper;
     }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemSignServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemSignServiceImpl.java
index 41976bb..7e90a09 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemSignServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemSignServiceImpl.java
@@ -52,15 +52,14 @@
 
     @Override
     public Page<SystemSign> listPage(Page<SystemSign> page, SignListRequest request) {
-        QueryWrapper<SystemSign> wrapper = getWrapper(request);
-        Page<SystemSign> signPage = signMapper.selectPage(page, wrapper);
+        Page<SystemSign> signPage = signMapper.selectSignListPage(page, request);
         return signPage;
     }
 
     @Override
     public List<SystemSign> list(SignListRequest request) {
-        QueryWrapper<SystemSign> wrapper = getWrapper(request);
-        return signMapper.selectList(wrapper);
+        List<SystemSign> signList = signMapper.selectSignList(request);
+        return signList;
     }
 
     @Override
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessCertificatePrintService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessCertificatePrintService.java
index 03247ab..7d6db77 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessCertificatePrintService.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessCertificatePrintService.java
@@ -9,6 +9,8 @@
 import com.casic.missiles.model.business.BizBusinessCertificatePrintLog;
 import com.casic.missiles.model.business.BizBusinessCertificateReport;
 
+import java.util.List;
+
 /**
  * <p>
  * 计量检定业务-任务计量管理-证书管理 服务类
@@ -30,4 +32,9 @@
     ReturnDTO certificatePrintStatus(Long id, String printStatus);
 
     ReturnDTO<BizBusinessCertificatePrintLog> certificatePrintLog(Long id);
+
+    List<CertificatePrintListResponse> listByIds(List<Long> ids);
+
+    List<CertificatePrintListResponse> list(CertificatePrintApprovalListRequest request);
+
 }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessCertificateReportService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessCertificateReportService.java
index 305ac7f..b33ef22 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessCertificateReportService.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessCertificateReportService.java
@@ -21,6 +21,4 @@
     ReturnDTO<CertificateReportSaveResponse> saveCertificateReport(BizBusinessCertificateReport request);
 
     ReturnDTO<BizBusinessCertificateReport> detail(BaseDetailRequest request);
-
-
 }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessIdentifyInfoService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessIdentifyInfoService.java
index 53c49d0..6d2089f 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessIdentifyInfoService.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessIdentifyInfoService.java
@@ -6,6 +6,8 @@
 import com.casic.missiles.model.business.BizBusinessIdentifyInfo;
 import com.baomidou.mybatisplus.extension.service.IService;
 
+import java.util.List;
+
 /**
  * <p>
  * 计量检定业务-任务计量管理-标识打印 服务类
@@ -20,7 +22,11 @@
 
     ReturnDTO addIdentify(BizBusinessIdentifyInfo identifyInfo);
 
-    ReturnDTO updateIdentify(BizBusinessIdentifyInfo identifyInfo);
+    ReturnDTO updateIdentify(Long id);
 
     ReturnDTO deleteIdentify(Long id);
+
+    List<BizBusinessIdentifyInfo> list(IdentifyListRequest request) throws Exception;
+
+    ReturnDTO<String> equipmentQrCode(Long id);
 }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessOutsourceAssessService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessOutsourceAssessService.java
index 5e15bc8..bcdc791 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessOutsourceAssessService.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessOutsourceAssessService.java
@@ -1,7 +1,11 @@
 package com.casic.missiles.service.business;
 
+import com.casic.missiles.dto.BaseApprovalSubmitRequest;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.business.outsource.OutsourceAssessApprovalListRequest;
+import com.casic.missiles.dto.business.outsource.OutsourceAssessSaveResponse;
 import com.casic.missiles.model.business.BizBusinessOutsourceAssess;
-import com.baomidou.mybatisplus.extension.service.IService;
+import com.casic.missiles.service.IGeneralApprovalService;
 
 /**
  * <p>
@@ -11,6 +15,7 @@
  * @author wangpeng
  * @since 2023-08-16
  */
-public interface IBizBusinessOutsourceAssessService extends IService<BizBusinessOutsourceAssess> {
+public interface IBizBusinessOutsourceAssessService extends IGeneralApprovalService<BizBusinessOutsourceAssess, BizBusinessOutsourceAssess, OutsourceAssessApprovalListRequest, BaseApprovalSubmitRequest> {
 
+    ReturnDTO<OutsourceAssessSaveResponse> saveOutsourceAssess(BizBusinessOutsourceAssess request);
 }

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java
index bb0c50f..13a699b 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java
@@ -12,6 +12,7 @@
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.IGeneralApprovalService;
+import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
@@ -19,6 +20,7 @@
 import org.springframework.web.bind.annotation.RequestBody;
 
 import javax.validation.Valid;
+import java.util.List;
 import java.util.Objects;
 
 /**
@@ -117,4 +119,17 @@
         }
         return baseApprovalService.failUpdate(request);
     }
+
+    public List<O> exportList(@RequestBody @Valid R request) throws Exception {
+        List<O> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = baseApprovalService.listExportByIds(request.getIds());
+        } else {
+            list = baseApprovalService.listExport(request);
+        }
+        for (O record : list) {
+            DictCodeUtils.convertDictCodeToName(record);
+        }
+        return list;
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java
index 8a90961..d775831 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java
@@ -5,6 +5,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.business.certificate.CertificateChangeApplyApprovalListRequest;
 import com.casic.missiles.dto.business.certificate.CertificateChangeApplySaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessCertificateChangeApply;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
@@ -20,6 +21,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -48,4 +50,12 @@
         }
         return changeApplyService.saveChangeApply(request);
     }
+
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody CertificateChangeApplyApprovalListRequest request) throws Exception {
+        List<BizBusinessCertificateChangeApply> list = super.exportList(request);
+        super.exportExcel(BizBusinessCertificateChangeApply.class, list, ExportEnum.CERTIFICATE_CHANGE_APPLY.getSheetName());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java
index 5fc4b07..af8230e 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java
@@ -9,6 +9,7 @@
 import com.casic.missiles.dto.business.certificate.CertificatePrintApprovalListRequest;
 import com.casic.missiles.dto.business.certificate.CertificatePrintListResponse;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.enums.business.CertificatePrintStatusEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessCertificatePrintLog;
@@ -18,10 +19,16 @@
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.io.IOException;
+import java.util.List;
 import java.util.Objects;
 
 /**
@@ -98,4 +105,16 @@
         });
         return certificatePrintService.certificatePrintLog(idDTO.getId());
     }
+
+    @ApiOperation("证书打印审批导出")
+    @PostMapping("/listExport")
+    public void exportList(@RequestBody CertificatePrintApprovalListRequest request) throws IOException {
+        List<CertificatePrintListResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = certificatePrintService.listByIds(request.getIds());
+        } else {
+            list = certificatePrintService.list(request);
+        }
+        super.exportExcel(CertificatePrintListResponse.class, list, ExportEnum.CERTIFICATE_PRINT.getSheetName());
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java
index 63b06dc..6b2efd5 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java
@@ -6,6 +6,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.business.certificate.CertificateReportApprovalListRequest;
 import com.casic.missiles.dto.business.certificate.CertificateReportSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessCertificateReport;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
@@ -21,6 +22,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -50,7 +52,7 @@
         return certificateReportService.saveCertificateReport(request);
     }
 
-    @ApiOperation("证书审批详情（基本信息）")
+    @ApiOperation("详情（基本信息）")
     @PostMapping("/detail")
     public ReturnDTO<BizBusinessCertificateReport> detail(@RequestBody @Valid BaseDetailRequest request, BindingResult bindingResult) throws Exception {
         if(bindingResult.hasErrors()){
@@ -59,4 +61,11 @@
         return certificateReportService.detail(request);
     }
 
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody CertificateReportApprovalListRequest request) throws Exception {
+        List<BizBusinessCertificateReport> list = super.exportList(request);
+        super.exportExcel(BizBusinessCertificateReport.class, list, ExportEnum.CERTIFICATE_REPORT.getSheetName());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java
index 46b26bd..57c0809 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java
@@ -10,20 +10,21 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.business.identify.IdentifyListRequest;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessIdentifyInfo;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.business.IBizBusinessIdentifyInfoService;
+import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import javax.validation.Valid;
+import java.util.List;
 import java.util.Objects;
 
 /**
@@ -57,16 +58,13 @@
         return identifyInfoService.addIdentify(identifyInfo);
     }
 
-    @ApiOperation("标识打印更新")
+    @ApiOperation("标识打印更新（更新打印时间）")
     @PostMapping("/update")
-    public ReturnDTO updateIdentify(@RequestBody @Valid BizBusinessIdentifyInfo identifyInfo, BindingResult bindingResult) {
-        Assert.isFalse(Objects.isNull(identifyInfo.getId()), () -> {
+    public ReturnDTO updateIdentify(@RequestBody @Valid IdDTO idDTO) {
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        Assert.isFalse(bindingResult.hasErrors(), () -> {
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        });
-        return identifyInfoService.updateIdentify(identifyInfo);
+        return identifyInfoService.updateIdentify(idDTO.getId());
     }
 
     @ApiOperation("标识打印删除")
@@ -77,4 +75,37 @@
         });
         return identifyInfoService.deleteIdentify(idDTO.getId());
     }
+
+    @ApiOperation("标识打印导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody @Valid IdentifyListRequest request, BindingResult bindingResult) throws Exception {
+        if (bindingResult.hasErrors()) {
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        List<BizBusinessIdentifyInfo> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = identifyInfoService.listByIds(request.getIds());
+        } else {
+            list = identifyInfoService.list(request);
+        }
+        for (BizBusinessIdentifyInfo record : list) {
+            DictCodeUtils.convertDictCodeToName(record);
+        }
+        super.exportExcel(BizBusinessIdentifyInfo.class, list, ExportEnum.IDENTIFY_EXPORT.getSheetName());
+    }
+
+
+    // TODO: 2023/8/23 查询设备信息，4个底部按钮查设备（按钮的作用就是前端用来调不同接口、用来区分中间即将展示的标识），前端弹窗选设备，在确定保存时前端根据底部按钮判断传入设备类型deviceType字典code
+    // TODO: 2023/8/23 接口：查受检设备（第1个按钮），查设备台账（后3个按钮同一接口），查询之后前端根据标志类型的不同加到中间页面时进行判断（按产品给的对应表）
+    // TODO: 2023/8/23 提供二维码接口，前端在加到中间页面时调用一下
+
+    @ApiOperation("设备二维码")
+    @PostMapping("/equipment/qrCode")
+    public ReturnDTO<String> equipmentQrCode(@RequestBody @Valid IdDTO idDTO) {
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return identifyInfoService.equipmentQrCode(idDTO.getId());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java
index 707be6e..7e0453d 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java
@@ -117,7 +117,7 @@
     }
 
     @ApiOperation("任务单导出")
-    @PostMapping("/export")
+    @PostMapping("/listExport")
     public void orderExport(@RequestBody @Valid OrderListRequest request, HttpServletResponse response) {
         businessOrderService.orderExport(request, response);
     }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java
index 529a6ce..51432be 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java
@@ -1,9 +1,28 @@
 package com.casic.missiles.controller.business;
 
+import com.casic.missiles.controller.GeneralApprovalController;
+import com.casic.missiles.dto.BaseApprovalSubmitRequest;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.business.outsource.OutsourceAssessApprovalListRequest;
+import com.casic.missiles.dto.business.outsource.OutsourceAssessSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
+import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.model.business.BizBusinessOutsourceAssess;
+import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
+import com.casic.missiles.service.IGeneralApprovalService;
+import com.casic.missiles.service.business.IBizBusinessOutsourceAssessService;
 import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.BindingResult;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.validation.Valid;
+import java.util.List;
+
 /**
  * <p>
  * 计量检定业务-分包管理-测试、校准或检定工作分包评审表 前端控制器
@@ -15,6 +34,27 @@
 @Api(tags = "分包管理-测试、校准或检定工作分包评审表")
 @RestController
 @RequestMapping("/business/outsource/assess")
-public class BizBusinessOutsourceAssessController {
+public class BizBusinessOutsourceAssessController extends GeneralApprovalController<BizBusinessOutsourceAssess, BizBusinessOutsourceAssess, OutsourceAssessApprovalListRequest, BaseApprovalSubmitRequest> {
+    @Autowired
+    private IBizBusinessOutsourceAssessService outsourceAssessService;
 
+    public BizBusinessOutsourceAssessController(IGeneralApprovalService<BizBusinessOutsourceAssess, BizBusinessOutsourceAssess, OutsourceAssessApprovalListRequest, BaseApprovalSubmitRequest> baseApprovalService) {
+        super(baseApprovalService);
+    }
+
+    @ApiOperation("草稿箱-保存")
+    @PostMapping("/save")
+    public ReturnDTO<OutsourceAssessSaveResponse> saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceAssess request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        return outsourceAssessService.saveOutsourceAssess(request);
+    }
+
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception {
+        List<BizBusinessOutsourceAssess> list = super.exportList(request);
+        super.exportExcel(BizBusinessOutsourceAssess.class, list, ExportEnum.OUTSOURCE_ASSESS.getSheetName());
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java
new file mode 100644
index 0000000..9adef18
--- /dev/null
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java
@@ -0,0 +1,60 @@
+package com.casic.missiles.controller.business;
+
+import com.casic.missiles.controller.GeneralApprovalController;
+import com.casic.missiles.dto.BaseApprovalSubmitRequest;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.business.outsource.OutsourceProtocolApprovalListRequest;
+import com.casic.missiles.dto.business.outsource.OutsourceProtocolSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
+import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.model.business.BizBusinessOutsourceProtocol;
+import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
+import com.casic.missiles.service.IGeneralApprovalService;
+import com.casic.missiles.service.business.IBizBusinessOutsourceProtocolService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.BindingResult;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.validation.Valid;
+import java.util.List;
+
+/**
+ * <p>
+ * 计量检定业务-分包管理-测试、校准或检定工作分包协议书 前端控制器
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-08-24
+ */
+@Api(tags = "分包管理-测试、校准或检定工作分包协议书")
+@RestController
+@RequestMapping("/business/outsource/protocol")
+public class BizBusinessOutsourceProtocolController extends GeneralApprovalController<BizBusinessOutsourceProtocol, BizBusinessOutsourceProtocol, OutsourceProtocolApprovalListRequest, BaseApprovalSubmitRequest> {
+    @Autowired
+    private IBizBusinessOutsourceProtocolService outsourceProtocolService;
+
+    public BizBusinessOutsourceProtocolController(IGeneralApprovalService<BizBusinessOutsourceProtocol, BizBusinessOutsourceProtocol, OutsourceProtocolApprovalListRequest, BaseApprovalSubmitRequest> baseApprovalService) {
+        super(baseApprovalService);
+    }
+
+    @ApiOperation("草稿箱-保存")
+    @PostMapping("/save")
+    public ReturnDTO<OutsourceProtocolSaveResponse> saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceProtocol request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        return outsourceProtocolService.saveOutsourceProtocol(request);
+    }
+
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody OutsourceProtocolApprovalListRequest request) throws Exception {
+        List<BizBusinessOutsourceProtocol> list = super.exportList(request);
+        super.exportExcel(BizBusinessOutsourceProtocol.class, list, ExportEnum.OUTSOURCE_PROTOCOL.getSheetName());
+    }
+}
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java
index 097f645..f0f0943 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java
@@ -17,7 +17,6 @@
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.IGeneralApprovalService;
 import com.casic.missiles.service.business.IBizBusinessOutsourcerInfoService;
-import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -71,19 +70,8 @@
 
     @ApiOperation("分包方导出")
     @PostMapping("/listExport")
-    public void export(@RequestBody @Valid OutsourcerInfoApprovalListRequest request, BindingResult bindingResult) throws Exception {
-        if (bindingResult.hasErrors()) {
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        }
-        List<BizBusinessOutsourcerInfo> list;
-        if (!CollectionUtils.isEmpty(request.getIds())) {
-            list = outsourcerInfoService.listByIds(request.getIds());
-        } else {
-            list = outsourcerInfoService.list(request);
-        }
-        for (BizBusinessOutsourcerInfo record : list) {
-            DictCodeUtils.convertDictCodeToName(record);
-        }
+    public void export(@RequestBody OutsourcerInfoApprovalListRequest request) throws Exception {
+        List<BizBusinessOutsourcerInfo> list = super.exportList(request);
         super.exportExcel(BizBusinessOutsourcerInfo.class, list, ExportEnum.OUTSOURCER_EXPORT.getSheetName());
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java
index c2cbf9f..0410918 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java
@@ -17,11 +17,9 @@
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.IGeneralApprovalService;
 import com.casic.missiles.service.business.IBizBusinessSiteExecutiveInfoService;
-import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -60,7 +58,7 @@
         return siteExecutiveInfoService.saveSiteExecutiveInfo(siteExecutiveInfo);
     }
 
-    @ApiOperation("现场检测详情")
+    @ApiOperation("详情")
     @PostMapping("/detail")
     public ReturnDTO<SiteExecutiveDetailResponse> siteExecutiveDetail(@RequestBody @Valid IdDTO idDTO) throws Exception {
         Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
@@ -69,21 +67,10 @@
         return ReturnUtil.success(siteExecutiveInfoService.detail(idDTO.getId()));
     }
 
-    @ApiOperation("现场检测导出")
+    @ApiOperation("导出")
     @PostMapping("/listExport")
-    public void export(@RequestBody @Valid SiteExecutiveApprovalListRequest request, BindingResult bindingResult) throws Exception {
-        if (bindingResult.hasErrors()) {
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        }
-        List<SiteExecutiveApprovalListResponse> list;
-        if (!CollectionUtils.isEmpty(request.getIds())) {
-            list = siteExecutiveInfoService.listInfoByIds(request.getIds());
-        } else {
-            list = siteExecutiveInfoService.listInfo(request);
-        }
-        for (SiteExecutiveApprovalListResponse record : list) {
-            DictCodeUtils.convertDictCodeToName(record);
-        }
+    public void export(@RequestBody SiteExecutiveApprovalListRequest request) throws Exception {
+        List<SiteExecutiveApprovalListResponse> list = super.exportList(request);
         super.exportExcel(SiteExecutiveApprovalListResponse.class, list, ExportEnum.SITE_EXECUTIVE_EXPORT.getSheetName());
     }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
index 7e793cd..a92e209 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
@@ -55,7 +55,7 @@
 
     @ApiOperation("设备收发列表导出")
     @PostMapping("/export")
-    public void exportList(@RequestBody @Valid SampleDispatchListRequest request) throws IOException {
+    public void exportList(@RequestBody SampleDispatchListRequest request) throws IOException {
         List<SampleDispatchListResponse> list;
         if (!CollectionUtils.isEmpty(request.getIds())) {
             list = dispatchService.listByIds(request.getIds());
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java
index cdc77fc..d120fd4 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java
@@ -7,6 +7,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.business.labExecutive.*;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.business.IBusinessLabExecutiveInfoService;
@@ -14,6 +15,7 @@
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.*;
 
@@ -32,7 +34,7 @@
     @Autowired
     private IBusinessLabExecutiveInfoService labExecutiveInfoService;
 
-    @ApiOperation("实验室检测-部门检测-查询各状态列表（待检测、检测中、检测完）")
+    @ApiOperation("实验室任务-查询各状态列表（待检测、检测中、检测完）")
     @PostMapping("/deptExecutive/List")
     public ReturnDTO<PageInfoBT<SampleLabExecutiveListResponse>> queryDeptExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
@@ -43,10 +45,19 @@
         return ReturnUtil.success(super.packForBT(labExecutiveInfoService.deptLabExecutiveListPage(page, labExecutiveListRequest)));
     }
 
-    /**
-     * 实验室检测-我的检测-查询各状态列表（待检测、检测中、检测完）
-     */
-    @ApiOperation("实验室检测-我的检测-查询各状态列表（待检测、检测中、检测完）")
+    @ApiOperation("实验室任务导出")
+    @PostMapping("/deptExecutive/export")
+    public void deptExportList(@RequestBody @Valid SampleLabExecutiveListRequest request) throws Exception {
+        List<SampleLabExecutiveListResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = labExecutiveInfoService.deptLabExecutiveListByIds(request.getMeasureStatus(), request.getIds());
+        } else {
+            list = labExecutiveInfoService.deptLabExecutiveList(request);
+        }
+        super.exportExcel(SampleLabExecutiveListResponse.class, list, ExportEnum.DEPT_EXECUTIVE_TASK.getSheetName());
+    }
+
+    @ApiOperation("我的任务-查询各状态列表（待检测、检测中、检测完）")
     @PostMapping("/myExecutive/list")
     public ReturnDTO<PageInfoBT<SampleLabExecutiveListResponse>> queryMyExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
@@ -57,19 +68,25 @@
         return ReturnUtil.success(super.packForBT(labExecutiveInfoService.myLabExecutiveListPage(page, labExecutiveListRequest)));
     }
 
-    /**
-     * 实验室检测-我的检测-查询各状态样品数量（待检测、检测中、检测完）
-     */
-    @ApiOperation("实验室检测-我的检测-查询各状态样品数量（待检测、检测中、检测完）")
+    @ApiOperation("我的任务导出")
+    @PostMapping("/myExecutive/export")
+    public void exportList(@RequestBody @Valid SampleLabExecutiveListRequest request) throws Exception {
+        List<SampleLabExecutiveListResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = labExecutiveInfoService.myLabExecutiveListByIds(request.getMeasureStatus(), request.getIds());
+        } else {
+            list = labExecutiveInfoService.myLabExecutiveList(request);
+        }
+        super.exportExcel(SampleLabExecutiveListResponse.class, list, ExportEnum.MY_EXECUTIVE_TASK.getSheetName());
+    }
+
+    @ApiOperation("我的任务-查询各状态样品数量（待检测、检测中、检测完）")
     @GetMapping("/myExecutive/amount")
     public ReturnDTO<List<SampleAmountResponse>> queryMyExecutiveAmount() {
         return ReturnUtil.success(labExecutiveInfoService.myExecutiveAmount());
     }
 
-    /**
-     * 实验室检测-部门检测-分配（分配给具体人员）
-     */
-    @ApiOperation("实验室检测-部门检测-分配按钮（分配给具体人员）")
+    @ApiOperation("实验室任务-分配按钮（分配给具体人员）")
     @PostMapping("/deptExecutive/allocate")
     public ReturnDTO allocateStaff(@RequestBody @Valid SampleAllocateRequest sampleAllocateRequest, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -78,10 +95,7 @@
         return labExecutiveInfoService.allocateStaff(sampleAllocateRequest);
     }
 
-    /**
-     * 实验室检测-我的检测-检定人扫描收入（待检测->检测中）
-     */
-    @ApiOperation("实验室检测-我的检测-检定人扫描收入（待检测->检测中）")
+    @ApiOperation("我的任务-检定人扫描收入（待检测->检测中）")
     @PostMapping("/myExecutive/receive")
     public ReturnDTO sampleReceive(@RequestBody @Valid List<SampleOperateRequest> requestList, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -90,10 +104,7 @@
         return labExecutiveInfoService.sampleReceive(requestList);
     }
 
-    /**
-     * 实验室检测-负责人/检定人扫描检完（检测中->检测完）
-     */
-    @ApiOperation("实验室检测-负责人/检定人扫描检完（检测中->检测完）")
+    @ApiOperation("实验室任务-负责人/检定人扫描检完（检测中->检测完）")
     @PostMapping("/myExecutive/complete")
     public ReturnDTO sampleExecutiveComplete(@RequestBody @Valid List<SampleOperateRequest> requestList, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -102,10 +113,7 @@
         return labExecutiveInfoService.sampleExecutiveComplete(requestList);
     }
 
-    /**
-     * 实验室检测-部门检测/我的检测 编辑（只能修改应出具证书）
-     */
-    @ApiOperation("实验室检测-部门检测/我的检测 编辑（只能修改应出具证书）")
+    @ApiOperation("实验室任务/我的任务 编辑（只能修改应出具证书）")
     @PostMapping("/executive/update")
     public ReturnDTO updateExecutive(@RequestBody @Valid UpdateExecutiveRequest request, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -114,10 +122,7 @@
         return labExecutiveInfoService.updateExecutive(request);
     }
 
-    /**
-     * 实验室检测-部门检测/我的检测 详情
-     */
-    @ApiOperation("实验室检测-部门检测/我的检测 详情")
+    @ApiOperation("实验室任务/我的任务 详情")
     @PostMapping("/executive/detail")
     public ReturnDTO<ExecutiveDetailResponse> executiveDetail(@RequestBody @Valid ExecutiveDetailRequest request, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
@@ -131,7 +136,7 @@
      * 退回后会将下一个要执行的实验室检测状态更新为待分配，将后面的实验室顺序变更为连续（都进行减1）
      * 最后一个检测的实验室退回，等分发员再增加实验室或设备收发中的已收入直接手动点击完成
      */
-    @ApiOperation("实验室检测-部门检测/我的检测 退回（待检测/检测中->退回）")
+    @ApiOperation("实验室任务/我的任务 退回（待检测/检测中->退回）")
     @PostMapping("/executive/sendBack")
     public ReturnDTO executiveSendBack(@RequestBody @Valid ExecutiveSendBackRequest request, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -140,9 +145,6 @@
         return labExecutiveInfoService.sampleExecutiveSendBack(request);
     }
 
-    /**
-     * 分发员编辑实验室检测列表
-     */
     @ApiOperation("分发员编辑实验室检测列表")
     @PostMapping("/handOut/updateList")
     public ReturnDTO updateExecutiveList(@RequestBody @Valid UpdateExecutiveListRequest request, BindingResult bindingResult) {
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java
index 48a67ed..0c04f31 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java
@@ -10,6 +10,7 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.resource.customer.CustomerApprovalListRequest;
 import com.casic.missiles.dto.resource.customer.CustomerSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceCustomerInfo;
@@ -26,6 +27,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -55,6 +57,13 @@
         return customerInfoService.saveCustomerInfo(request);
     }
 
+    @ApiOperation("委托方名录导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody CustomerApprovalListRequest request) throws Exception {
+        List<BizResourceCustomerInfo> list = super.exportList(request);
+        super.exportExcel(BizResourceCustomerInfo.class, list, ExportEnum.CUSTOMER_INFO.getSheetName());
+    }
+
     @ApiOperation("委托方人员列表（分页）")
     @PostMapping("/person/listPage")
     public ReturnDTO<PageInfoBT<BizResourceCustomerStaff>> personListPage(@RequestBody IdDTO idDto) {
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
index 972ed4b..6418ea5 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
@@ -5,6 +5,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.resource.customer.SuggestFormApprovalListRequest;
 import com.casic.missiles.dto.resource.customer.SuggestFormSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceCustomerSuggestForm;
@@ -20,6 +21,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -50,4 +52,11 @@
         return suggestFormService.saveSuggestForm(request);
     }
 
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody SuggestFormApprovalListRequest request) throws Exception {
+        List<BizResourceCustomerSuggestForm> list = super.exportList(request);
+        super.exportExcel(BizResourceCustomerSuggestForm.class, list, ExportEnum.CUSTOMER_SUGGEST_FORM.getSheetName());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java
index 1934d1a..9e07eab 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java
@@ -15,12 +15,16 @@
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.resource.IEnvEnvironmentRecordConfigService;
 import com.casic.missiles.service.resource.IEnvEnvironmentRecordDataService;
+import com.casic.missiles.service.resource.IEnvLocationInfoService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
 import java.util.List;
@@ -39,6 +43,8 @@
     private IEnvEnvironmentRecordDataService environmentRecordDataService;
     @Autowired
     private IEnvEnvironmentRecordConfigService environmentRecordConfigService;
+    @Autowired
+    private IEnvLocationInfoService locationInfoService;
 
     @ApiOperation("环境记录单数据列表/详情")
     @PostMapping("/data/listPage")
@@ -95,4 +101,11 @@
         });
         return environmentRecordConfigService.deleteEnvironmentRecordConfig(idDTO.getId());
     }
+
+    @ApiOperation("地点列表")
+    @PostMapping("/location/listPage")
+    public ReturnDTO<PageInfoBT<LocationListResponse>> locationListPage(@RequestBody @Valid LocationListRequest request) {
+        Page<LocationListResponse> page = PageFactory.defaultPage();
+        return ReturnUtil.success(super.packForBT(locationInfoService.listPage(page, request)));
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java
index 82efe3f..e9561fa 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java
@@ -10,6 +10,7 @@
 import com.casic.missiles.dto.resource.seal.SealLogListRequest;
 import com.casic.missiles.dto.resource.seal.SealNoteApprovalListRequest;
 import com.casic.missiles.dto.resource.seal.SealNoteSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceSealUseLog;
@@ -27,6 +28,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -58,6 +60,13 @@
         return sealUseNoteService.saveSeal(request);
     }
 
+    @ApiOperation("印章使用登记导出（列表和导出中去掉经办人和监印人）")
+    @PostMapping("/listExport")
+    public void export(@RequestBody SealNoteApprovalListRequest request) throws Exception {
+        List<BizResourceSealUseNote> list = super.exportList(request);
+        super.exportExcel(BizResourceSealUseNote.class, list, ExportEnum.SEAL_NOTE.getSheetName());
+    }
+
     // TODO: 2023/7/28 印章使用日志：系统中使用印章时插入数据库
 
     @ApiOperation("印章使用日志列表（分页）")
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java
index 9b674fc..06b6521 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java
@@ -9,16 +9,20 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.resource.staff.StaffCertRequest;
 import com.casic.missiles.dto.resource.staff.StaffCertResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.service.resource.IBizResourceStaffInfoService;
 import com.casic.missiles.service.resource.IBizResourceStaffVerifierService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.List;
+
 /**
  * @Description:
  * @Author: wangpeng
@@ -41,9 +45,21 @@
         return ReturnUtil.success(super.packForBT(responsePage));
     }
 
+    @ApiOperation("证书逾期提醒导出")
+    @PostMapping("/listExport")
+    public void exportList(@RequestBody StaffCertRequest request) throws Exception {
+        List<StaffCertResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = staffInfoService.certListByIds(request.getIds());
+        } else {
+            list = staffInfoService.certList(request);
+        }
+        super.exportExcel(StaffCertResponse.class, list, ExportEnum.STAFF_CERTIFICATE_EXPIRE.getSheetName());
+    }
+
     @ApiOperation("证书逾期提醒")
     @PostMapping("/expirationReminder")
-    public ReturnDTO expirationReminder(@RequestBody IdDTO idDto) {
-        return verifierService.expirationReminder(idDto);
+    public ReturnDTO expirationReminder(@RequestBody IdDTO idDTO) {
+        return verifierService.expirationReminder(idDTO);
     }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java
index 3b251ad..a6e7850 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java
@@ -12,6 +12,7 @@
 import com.casic.missiles.dto.resource.staff.StaffListRequest;
 import com.casic.missiles.dto.resource.staff.TrainListRequest;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.*;
@@ -22,7 +23,10 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
 import java.util.List;
@@ -52,8 +56,19 @@
             throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
         }
         Page<BizResourceStaffInfo> page = PageFactory.defaultPage();
-        Page<BizResourceStaffInfo> responsePage = staffInfoService.listPage(page, request);
-        return ReturnUtil.success(super.packForBT(responsePage));
+        return ReturnUtil.success(super.packForBT(staffInfoService.listPage(page, request)));
+    }
+
+    @ApiOperation("人员登记导出")
+    @PostMapping("/listExport")
+    public void exportList(@RequestBody StaffListRequest request) throws Exception {
+        List<BizResourceStaffInfo> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = staffInfoService.listByIds(request.getIds());
+        } else {
+            list = staffInfoService.list(request);
+        }
+        super.exportExcel(BizResourceStaffInfo.class, list, ExportEnum.STAFF_INFO.getSheetName());
     }
 
     @ApiOperation("人员登记详情基础信息")
@@ -85,9 +100,9 @@
 
     @ApiOperation("科研教育列表（分页）")
     @PostMapping("/education/listPage")
-    public ReturnDTO<PageInfoBT<BizResourceStaffEducation>> educationListPage(@RequestBody IdDTO idDto) {
+    public ReturnDTO<PageInfoBT<BizResourceStaffEducation>> educationListPage(@RequestBody IdDTO idDTO) {
         Page<BizResourceStaffEducation> page = PageFactory.defaultPage();
-        Page<BizResourceStaffEducation> responsePage = staffInfoService.educationListPage(page, idDto);
+        Page<BizResourceStaffEducation> responsePage = staffInfoService.educationListPage(page, idDTO);
         return ReturnUtil.success(super.packForBT(responsePage));
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java
index af6aa86..d85d84a 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java
@@ -9,6 +9,7 @@
 import com.casic.missiles.dto.resource.outsideService.SupplierApprovalListRequest;
 import com.casic.missiles.dto.resource.outsideService.SupplierSaveResponse;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceSupplierAbility;
@@ -67,6 +68,13 @@
         return ReturnUtil.success(supplierInfoService.detail(idDTO.getId()));
     }
 
+    @ApiOperation("合格供方导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody SupplierApprovalListRequest request) throws Exception {
+        List<BizResourceSupplierInfo> list = super.exportList(request);
+        super.exportExcel(BizResourceSupplierInfo.class, list, ExportEnum.SUPPLIER_INFO.getSheetName());
+    }
+
     @ApiOperation("供方人员列表（分页）")
     @PostMapping("/person/listPage")
     public ReturnDTO<PageInfoBT<BizResourceSupplierPerson>> personListPage(@RequestBody IdDTO idDTO) {
diff --git a/casic-metering-api/src/main/resources/config/application.yml b/casic-metering-api/src/main/resources/config/application.yml
index 350db5f..ecff521 100644
--- a/casic-metering-api/src/main/resources/config/application.yml
+++ b/casic-metering-api/src/main/resources/config/application.yml
@@ -126,7 +126,7 @@
     #作者
     author: wangpeng
     #待生成对象表名
-    table-name: biz_equipment_technical_target_approval,biz_equipment_attachment_approval,biz_equipment_checkpoint_approval
+    table-name: biz_business_outsource_protocol
 
 reminder:
   #节点--common模块config包 ReminderNodeConfig配置
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
index 4a19e4e..d47d552 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
@@ -53,6 +53,7 @@
     SUGGEST_FORM_SAVE_FAILED(2509, "委托方意见登记表保存至草稿箱失败"),
     EXAMINE_FORM_SAVE_FAILED(2510, "要求、委托书及合同评审表保存至草稿箱失败"),
     CUSTOMER_EXIST_SAVE_FAILED(2511, "该委托方已存在，请重新选择"),
+    DUPLICATE_LOCATION_NO(2512, "地点编号已存在"),
 
     /**
      * 计量检定业务模块
@@ -68,6 +69,8 @@
     COMPLETE_SAMPLE_NOT_EXIST(2609, "检测中不存在扫描收入的样品"),
     CANNOT_CHANGE_MEASURE_INFO(2610, "无法更改非当前登录用户的检测信息"),
     NON_EXIST_ORDER_OR_SAMPLE(2611, "不存在该委托单或该委托单下的样品"),
+    OUTSOURCE_ACCESS_SAVE_FAILED(2612, "测试、校准或检定工作分包评审表保存至草稿箱失败"),
+    OUTSOURCE_PROTOCOL_SAVE_FAILED(2613, "测试、校准或检定工作分包协议书保存至草稿箱失败"),
 
     /**
      * 历史遗留备用
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
index 5089ad1..81a406b 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
@@ -10,54 +10,38 @@
     /**
      * 资源管理
      */
-    ENVIRONMENT_DATA_EXPORT("environmentData", "environmentData", "环境记录单数据"),
+    ENVIRONMENT_DATA_EXPORT("environmentData", "环境记录单数据", "环境记录单数据"),
+    STAFF_INFO("staffInfo", "人员登记", "人员登记"),
+    STAFF_CERTIFICATE_EXPIRE("certificateExpire", "证书逾期提醒", "证书逾期提醒"),
+    SUPPLIER_INFO("supplierInfo", "合格供方名录", "合格供方名录"),
+    CUSTOMER_INFO("customerInfo", "委托方名录", "委托方名录"),
+    CUSTOMER_SUGGEST_FORM("customerSuggestForm", "委托方意见登记表", "委托方意见登记表"),
+    SEAL_NOTE("sealNote", "印章使用登记", "印章使用登记"),
 
-    FILE_EXPORT("meterFileData", "meterFileData", "计量文件信息"),
-    TRAIN_PLAN_EXPORT("trainPlanData", "trainPlanData", "培训计划"),
-    TRAIN_LOG_EXPORT("trainLogData", "trainLogData", "培训记录"),
-    METER_ORGANIZE_EXPORT("meterOrganizeData", "meterOrganizeData", "计量组织"),
-    TRACE_SUPPLIER_EXPORT("traceSupplierData", "traceSupplierData", "溯源供方"),
-    SIGN_EXPORT("signData", "signData", "签名/签章"),
-    TEMPLATE_EXPORT("templateData", "templateData", "原始记录模板/证书报告模板"),
-    FIXED_ASSETS("meterFixedAssets", "meterFixedAssets", "固定资产"),
-    METER_EQUIPMENT("meterEquipment", "meterEquipment", "测量设备"),
-    CALIBRATION_TEST_EQUIPMENT("calibrationTestEquipment", "calibrationTestEquipment", "校准检定设备"),
-    MEASURE_ACCOUNT("measureAccount", "measureAccount", "测量工装"),
-    STANDARD_SUPPORT_EQUIPMENT("standardSupportEquipment", "standardSupportEquipment", "标准配套设备"),
-    STANDARD_EQUIPMENT("standardEquipment", "standardEquipment", "标准装置"),
-    FLOW_DEF_EXPORT("flowDefData", "flowDefData", "流程定义"),
-    STAFF_CERTIFICATE("certificate", "certificate", "计量人员证书"),
-    CHECK_INFO("checkInfo", "checkInfo", "设备管理点检测"),
-    EQUIPMENT_APPLY("equipmentApply", "equipmentApply", "设备借用"),
-    STANDARD_EQUIPMENT_REMIND("equipmentApplyRemind", "equipmentApplyRemind", "标准装置到期提醒"),
-    METER_PRICE("meterPrice", "meterPrice", "价格库"),
-    METER_STAFF("meterStaff", "meterStaff", "计量人员"),
-    STANDARD_EQUIPMENT_APPLY("standardEquipmentApply", "standardEquipmentApply", "标准装置申请"),
-    STATE_MANAGE_APPLY("stateManage", "stateManage", "状态管理"),
-    METER_ACCEPTANCE_CHECK("acceptanceCheck", "acceptanceCheck", "设备检修保养验收单"),
-    CUSTOMER_EXPORT("customerData", "customerData", "客户信息"),
-    ORDER_EXPORT("orderData", "orderData", "委托书信息"),
-    SAMPLE_EXPORT("sampleData", "sampleData", "样本信息"),
-    EXCHANGE_DATA("exchangeData", "exchangeData", "设备交接单"),
-    DISPATCH_DATA("dispatchData", "dispatchData", "设备收发"),
-    ENVIRONMENT_DATA("environmentData", "environmentData", "环境记录单"),
-    ORIGIN_DATA("originData", "originData", "原始记录"),
-    CERTIFICATE_REPORT("certificateReport", "certificateReport", "证书报告"),
-    ADVICE_EXPORT("adviceData", "adviceData", "客户反馈"),
-    HANDOUT_EXPORT("handoutData", "handoutData", "任务分发列表"),
-    OUTSOURCER_EXPORT("outsourcerData", "outsourcerData", "分包方"),
-    SITE_EXECUTIVE_EXPORT("siteExecutiveData", "siteExecutiveData", "现场测试、校准或检定"),
-    CERTIFICATE_PRINT_EXPORT("certificatePrintData", "certificatePrintData", "证书打印"),
-    DOWNLOAD_TEMPLATE("downloadTemplate", "downloadTemplate", "页面配置"),
-    OUTSOURCER_CERTIFICATE_EXPORT("outsourceCertificateData", "outsourceCertificateData", "分包证书"),
-    SETTLEMENT_INFO_EXPORT("settlementInfoData", "settlementInfoData", "业务结算"),
-    EQUIPMENT_REMIND("equipmentRemind", "equipmentRemind", "设备到期提醒"),
-    AGREEMENT_INFO_EXPORT("agreementInfoData", "agreementInfoData", "合同"),
-    WORK_STATISTICS_EXPORT("workStatisticsData", "workStatisticsData", "实时工作统计"),
-    DEPT_OUTPUT_EXPORT("deptOutputData", "deptOutputData", "部门产值分析"),
-    WORKLOAD_EXPORT("workloadData", "workloadData", "业务工作量分析"),
-    DEPT_COMPREHENSIVE_EXPORT("deptComprehensiveData", "deptComprehensiveData", "部门综合分析"),
-    ENVIRONMENTAL_RECORD("environmentalRecordData", "environmentalRecordData", "现场环境记录");
+    /**
+     * 计量检定业务
+     */
+    OUTSOURCER_EXPORT("outsourcerData", "分包方名录", "分包方名录"),
+    IDENTIFY_EXPORT("identifyData", "计量标识", "计量标识"),
+    ORDER_EXPORT("orderData", "任务单", "任务单"),
+    DISPATCH_DATA("dispatchData", "设备收发", "设备收发"),
+    HANDOUT_EXPORT("handoutData", "任务分发", "任务分发"),
+    SITE_EXECUTIVE_EXPORT("siteExecutiveData", "现场测试、校准或检定", "现场测试、校准或检定"),
+    CERTIFICATE_REPORT("certificateReport", "证书审批", "证书审批"),
+    CERTIFICATE_CHANGE_APPLY("certificateChangeApply", "证书报告补充或更换申请单", "证书报告补充或更换申请单"),
+    CERTIFICATE_PRINT("certificatePrintData", "证书打印审批", "证书打印审批"),
+    DEPT_EXECUTIVE_TASK("deptExecutiveTaskData", "实验室任务", "实验室任务"),
+    MY_EXECUTIVE_TASK("myExecutiveTaskData", "我的任务", "我的任务"),
+    OUTSOURCE_ASSESS("outsourceAssess", "测试、校准或检定工作分包评审表", "测试、校准或检定工作分包评审表"),
+    OUTSOURCE_PROTOCOL("outsourceProtocol", "测试、校准或检定工作分包协议书", "测试、校准或检定工作分包协议书"),
+
+    /**
+     * 系统管理
+     */
+    SIGN_EXPORT("signData", "签名", "签名"),
+    TEMPLATE_EXPORT("templateData", "文件模板", "文件模板"),
+    FLOW_DEF_EXPORT("flowDefData", "流程定义", "流程定义"),
+    DOWNLOAD_TEMPLATE("downloadTemplate", "流程定义", "页面配置");
 
     ExportEnum(String fileName, String sheetName, String description) {
         this.fileName = fileName;
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateRecordTypeCodeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateRecordTypeCodeEnum.java
index 31d913c..a963522 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateRecordTypeCodeEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateRecordTypeCodeEnum.java
@@ -46,4 +46,14 @@
     String SITE_EXECUTIVE_APPROVAL = "01";
     //《现场测试、校准或检定工作记录表》
     String SITE_EXECUTIVE_LOG = "02";
+
+    //测试、校准或检定工作分包协议书
+    String OUTSOURCE_PROTOCOL = "01";
+    //测试、校准或检定工作分包评审表
+    String OUTSOURCE_ACCESS = "02";
+    //测试、校准或检定工作分包通知书
+    String OUTSOURCE_NOTICE = "03";
+    //测试、校准或检定工作分包方名录
+    String OUTSOURCE_INFO = "04";
+
 }
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
index 24b8635..f78bd53 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
@@ -15,6 +15,10 @@
     String CERTIFICATE_CHANGE_APPLY_BEAN_NAME = "certificateChangeApplyBean";
     //现场测试、校准或检定
     String SITE_EXECUTIVE_BEAN_NAME = "siteExecutiveBean";
+    //测试、校准或检定工作分包评审表
+    String OUTSOURCE_ASSESS_BEAN_NAME = "outsourceAssessBean";
+    //测试、校准或检定工作分包协议书
+    String OUTSOURCE_PROTOCOL_BEAN_NAME = "outsourceProtocolBean";
 
     /*********************************设备与装置************************************/
     //设备台账
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 b21c661..6b86fd1 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
@@ -18,6 +18,8 @@
     OUTSOURCER_APPROVAL(OUTSOURCER_BEAN_NAME, ""),
     CERTIFICATE_CHANGE_APPROVAL(CERTIFICATE_CHANGE_APPLY_BEAN_NAME, ""),
     SITE_EXECUTIVE_APPROVAL(SITE_EXECUTIVE_BEAN_NAME, ""),
+    OUTSOURCE_ASSESS_APPROVAL(OUTSOURCE_ASSESS_BEAN_NAME, ""),
+    OUTSOURCE_PROTOCOL_APPROVAL(OUTSOURCE_PROTOCOL_BEAN_NAME, ""),
 
     ACTION_STATUS_MAP(new HashMap<String, AwareActionStatusEnum>() {
         {
@@ -47,6 +49,10 @@
             put(ApplyFromIdEnum.CERTIFICATE_CHANGE_APPROVAL.getCode(), CERTIFICATE_CHANGE_APPROVAL);
             //现场测试、校准或检定审批
             put(ApplyFromIdEnum.SITE_EXECUTIVE_APPROVAL.getCode(), SITE_EXECUTIVE_APPROVAL);
+            //测试、校准或检定工作分包评审表
+            put(ApplyFromIdEnum.OUTSOURCE_ASSESS_APPROVAL.getCode(), OUTSOURCE_ASSESS_APPROVAL);
+            //测试、校准或检定工作分包协议书
+            put(ApplyFromIdEnum.OUTSOURCE_PROTOCOL_APPROVAL.getCode(), OUTSOURCE_PROTOCOL_APPROVAL);
         }
     });
     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 934405e..c7410bd 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
@@ -9,6 +9,8 @@
     CERTIFICATE_CHANGE_APPROVAL("jljdywzsbchghsqd", MessageSourceModuleEnum.BUSINESS.getCode(), "证书/报告补充或更换申请单"),
     OUTSOURCER_APPROVAL("jljdywcsjzhgfbfml", MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定合格分包方名录"),
     SITE_EXECUTIVE_APPROVAL("jljdywxccsjzsp", MessageSourceModuleEnum.BUSINESS.getCode(), "现场测试、校准或检定审批"),
+    OUTSOURCE_ASSESS_APPROVAL("jljdywcsjzfbpsb", MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包评审表"),
+    OUTSOURCE_PROTOCOL_APPROVAL("jljdywcsjzfbxys", MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包协议书"),
 
 
     /*******************************************设备与装置*********************************************/
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/GeneralApprovalMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/GeneralApprovalMapper.java
index 4fb7344..0c9d6ae 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/GeneralApprovalMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/GeneralApprovalMapper.java
@@ -17,8 +17,4 @@
 
     Page<O> selectBatchForApprovalList(Page<O> page, @Param("request") R request, @Param("businessKeys") List<String> businessKeys);
 
-//    Page<O> selectListPage(Page<O> page, @Param("request") R request);
-
-//    Long selectMaxNo();
-
 }
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceAssessMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceAssessMapper.java
index 7867bb8..ba59009 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceAssessMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceAssessMapper.java
@@ -1,7 +1,12 @@
 package com.casic.missiles.mapper.business;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.business.outsource.OutsourceAssessApprovalListRequest;
+import com.casic.missiles.mapper.GeneralApprovalMapper;
 import com.casic.missiles.model.business.BizBusinessOutsourceAssess;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * <p>
@@ -11,6 +16,10 @@
  * @author wangpeng
  * @since 2023-08-16
  */
-public interface BizBusinessOutsourceAssessMapper extends BaseMapper<BizBusinessOutsourceAssess> {
+public interface BizBusinessOutsourceAssessMapper extends GeneralApprovalMapper<BizBusinessOutsourceAssess, BizBusinessOutsourceAssess, OutsourceAssessApprovalListRequest> {
+
+    Page<BizBusinessOutsourceAssess> selectBatchForApprovalList(Page<BizBusinessOutsourceAssess> page, @Param("request") OutsourceAssessApprovalListRequest request, @Param("businessKeys") List<String> businessKeys);
+
+    Long selectMaxProjectNo();
 
 }
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceProtocolMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceProtocolMapper.java
new file mode 100644
index 0000000..e6aba35
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceProtocolMapper.java
@@ -0,0 +1,24 @@
+package com.casic.missiles.mapper.business;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.business.outsource.OutsourceProtocolApprovalListRequest;
+import com.casic.missiles.mapper.GeneralApprovalMapper;
+import com.casic.missiles.model.business.BizBusinessOutsourceProtocol;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 计量检定业务-分包管理-测试、校准或检定工作分包协议书 Mapper 接口
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-08-24
+ */
+public interface BizBusinessOutsourceProtocolMapper extends GeneralApprovalMapper<BizBusinessOutsourceProtocol, BizBusinessOutsourceProtocol, OutsourceProtocolApprovalListRequest> {
+
+    Page<BizBusinessOutsourceProtocol> selectBatchForApprovalList(Page<BizBusinessOutsourceProtocol> page, @Param("request") OutsourceProtocolApprovalListRequest request, @Param("businessKeys") List<String> businessKeys);
+
+    Long selectMaxProtocolNo();
+}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/EnvLocationInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/EnvLocationInfoMapper.java
new file mode 100644
index 0000000..49eff87
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/EnvLocationInfoMapper.java
@@ -0,0 +1,21 @@
+package com.casic.missiles.mapper.resource;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.resource.environment.LocationListRequest;
+import com.casic.missiles.dto.resource.environment.LocationListResponse;
+import com.casic.missiles.model.resource.EnvLocationInfo;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * <p>
+ * 实验室环境监控系统-设备表 Mapper 接口
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-06-07
+ */
+public interface EnvLocationInfoMapper extends BaseMapper<EnvLocationInfo> {
+
+    Page<LocationListResponse> selectLocationListPage(Page<LocationListResponse> page, @Param("request") LocationListRequest request);
+}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java
index de124db..85ed0f7 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java
@@ -1,7 +1,9 @@
 package com.casic.missiles.mapper.system;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.dto.system.SignDetailResponse;
+import com.casic.missiles.dto.system.SignListRequest;
 import com.casic.missiles.model.system.SystemSign;
 import org.apache.ibatis.annotations.Param;
 
@@ -22,4 +24,8 @@
     SignDetailResponse selectSignDetailById(Long id);
 
     List<SystemSign> selectUsableSignList(@Param("userId") Long userId);
+
+    Page<SystemSign> selectSignListPage(Page<SystemSign> page, @Param("request") SignListRequest request);
+
+    List<SystemSign> selectSignList(@Param("request") SignListRequest request);
 }
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateChangeApplyMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateChangeApplyMapper.xml
index d798447..c496092 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateChangeApplyMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateChangeApplyMapper.xml
@@ -30,31 +30,31 @@
         SELECT *
         FROM biz_business_certificate_change_apply
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.changeApplyNo != null and request.changeApplyNo !=''">
+        <if test="request != null and request.changeApplyNo != null and request.changeApplyNo !=''">
             and change_apply_no like concat('%',#{request.changeApplyNo},'%')
         </if>
-        <if test="request.changeReportNo != null and request.changeReportNo !=''">
+        <if test="request != null and request.changeReportNo != null and request.changeReportNo !=''">
             and change_report_no like concat('%',#{request.changeReportNo},'%')
         </if>
-        <if test="request.changeReportName != null and request.changeReportName !=''">
+        <if test="request != null and request.changeReportName != null and request.changeReportName !=''">
             and change_report_name like concat('%',#{request.changeReportName},'%')
         </if>
-        <if test="request.changeType != null and request.changeType !=''">
+        <if test="request != null and request.changeType != null and request.changeType !=''">
             and change_type = #{request.changeType}
         </if>
-        <if test="request.createUserName != null and request.createUserName !=''">
+        <if test="request != null and request.createUserName != null and request.createUserName !=''">
             and create_user_name like concat('%',#{request.createUserName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificatePrintMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificatePrintMapper.xml
index b66cd99..49c0ac8 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificatePrintMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificatePrintMapper.xml
@@ -31,34 +31,34 @@
         LEFT JOIN biz_business_order_sample_relation bosr ON (bosr.order_id = bcr.order_id AND bosr.sample_id = bcr.sample_id)
         LEFT JOIN biz_business_order_info boi ON boi.id = bosr.order_id
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and bcp.approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.printStatus != null and request.printStatus !=''">
+        <if test="request != null and request.printStatus != null and request.printStatus !=''">
             and print_status = #{request.printStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and bcp.create_user_id = #{request.createUserId}
         </if>
-        <if test="request.certificateReportNo != null and request.certificateReportNo !=''">
+        <if test="request != null and request.certificateReportNo != null and request.certificateReportNo !=''">
             and bcr.certificate_report_no like concat('%',#{request.certificateReportNo},'%')
         </if>
-        <if test="request.certificateReportName != null and request.certificateReportName !=''">
+        <if test="request != null and request.certificateReportName != null and request.certificateReportName !=''">
             and bcr.certificate_report_name like concat('%',#{request.certificateReportName},'%')
         </if>
-        <if test="request.customerName != null and request.customerName !=''">
+        <if test="request != null and request.customerName != null and request.customerName !=''">
             and boi.customer_name like concat('%',#{request.customerName},'%')
         </if>
-        <if test="request.sampleNo != null and request.sampleNo !=''">
+        <if test="request != null and request.sampleNo != null and request.sampleNo !=''">
             and bosr.sample_no like concat('%',#{request.sampleNo},'%')
         </if>
-        <if test="request.sampleName != null and request.sampleName !=''">
+        <if test="request != null and request.sampleName != null and request.sampleName !=''">
             and bosr.sample_name like concat('%',#{request.sampleName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and bcp.create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and bcp.create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml
index b366034..767695d 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml
@@ -46,33 +46,37 @@
         SELECT bcr.*, bosr.sample_no, bosr.sample_name, bosr.sample_model, rsi.staff_name
         FROM biz_business_certificate_report bcr
         LEFT JOIN biz_business_order_sample_relation bosr ON (bosr.order_id = bcr.order_id AND bosr.sample_id = bcr.sample_id)
+        LEFT JOIN biz_business_order_info boi ON boi.id = bcr.order_id
         LEFT JOIN biz_resource_staff_info rsi ON rsi.id = bcr.measure_person_id
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and bcr.approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and bcr.create_user_id = #{request.createUserId}
         </if>
-        <if test="request.certificateReportNo != null and request.certificateReportNo !=''">
+        <if test="request != null and request.customerId != null and request.customerId !=''">
+            and boi.customer_id = #{request.customerId}
+        </if>
+        <if test="request != null and request.certificateReportNo != null and request.certificateReportNo !=''">
             and bcr.certificate_report_no like concat('%',#{request.certificateReportNo},'%')
         </if>
-        <if test="request.certificateReportName != null and request.certificateReportName !=''">
+        <if test="request != null and request.certificateReportName != null and request.certificateReportName !=''">
             and bcr.certificate_report_name like concat('%',#{request.certificateReportName},'%')
         </if>
-        <if test="request.sampleNo != null and request.sampleNo !=''">
+        <if test="request != null and request.sampleNo != null and request.sampleNo !=''">
             and bosr.sample_no like concat('%',#{request.sampleNo},'%')
         </if>
-        <if test="request.measureCategory != null and request.measureCategory !=''">
+        <if test="request != null and request.measureCategory != null and request.measureCategory !=''">
             and bcr.measure_category = #{request.measureCategory}
         </if>
-        <if test="request.measurePerson != null and request.measurePerson !=''">
+        <if test="request != null and request.measurePerson != null and request.measurePerson !=''">
             and rsi.staff_name like concat('%',#{request.measurePerson},'%')
         </if>
-        <if test="request.calibrationTimeStart != null and request.calibrationTimeStart !=''">
+        <if test="request != null and request.calibrationTimeStart != null and request.calibrationTimeStart !=''">
             and bcr.calibration_time &gt;= #{request.calibrationTimeStart}
         </if>
-        <if test="request.calibrationTimeEnd != null and request.calibrationTimeEnd !=''">
+        <if test="request != null and request.calibrationTimeEnd != null and request.calibrationTimeEnd !=''">
             and bcr.calibration_time &lt;= #{request.calibrationTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceAssessMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceAssessMapper.xml
index d0fcf8b..c22c101 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceAssessMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceAssessMapper.xml
@@ -7,6 +7,8 @@
         <id column="id" property="id" />
         <result column="project_no" property="projectNo" />
         <result column="project_name" property="projectName" />
+        <result column="lab_code" property="labCode" />
+        <result column="group_code" property="groupCode" />
         <result column="applicant_id" property="applicantId" />
         <result column="applicant_name" property="applicantName" />
         <result column="applicant_time" property="applicantTime" />
@@ -31,7 +33,45 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, project_no, project_name, applicant_id, applicant_name, applicant_time, minio_file_name, remark, create_user_id, create_user_name, outsourcer_id, pre_start_time, pre_end_time, outsource_reason, pre_cost, approval_status, process_id, approve_situation, traceability, test_method, technique_ability, create_time, update_time
+        id, project_no, project_name, lab_code, group_code, applicant_id, applicant_name, applicant_time, minio_file_name, remark, create_user_id, create_user_name, outsourcer_id, pre_start_time, pre_end_time, outsource_reason, pre_cost, approval_status, process_id, approve_situation, traceability, test_method, technique_ability, create_time, update_time
     </sql>
 
+    <select id="selectMaxProjectNo" resultType="java.lang.Long">
+        SELECT IFNULL(max(RIGHT(project_no, 3)), 0) from biz_business_outsource_assess
+    </select>
+
+    <select id="selectBatchForApprovalList" resultMap="BaseResultMap">
+        SELECT bboa.*, bboi.outsourcer_name, bboi.director
+        FROM biz_business_outsource_assess bboa
+        LEFT JOIN biz_business_outsourcer_info bboi ON bboa.outsourcer_id = bboi.id
+        WHERE 1=1
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
+            and bboa.approval_status = #{request.approvalStatus}
+        </if>
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
+            and bboa.create_user_id = #{request.createUserId}
+        </if>
+        <if test="request != null and request.projectNo != null and request.projectNo !=''">
+            and bboa.project_no like concat('%',#{request.projectNo},'%')
+        </if>
+        <if test="request != null and request.outsourcerName != null and request.outsourcerName !=''">
+            and bboi.outsourcer_name like concat('%',#{request.outsourcerName},'%')
+        </if>
+        <if test="request != null and request.applicantName != null and request.applicantName !=''">
+            and bboa.applicant_name like concat('%',#{request.applicantName},'%')
+        </if>
+        <if test="request != null and request.applicantTimeStart != null and request.applicantTimeStart !=''">
+            and bboa.applicant_time &gt;= #{request.applicantTimeStart}
+        </if>
+        <if test="request != null and request.applicantTimeEnd != null and request.applicantTimeEnd !=''">
+            and bboa.applicant_time &lt;= #{request.applicantTimeEnd}
+        </if>
+        <if test="businessKeys != null">
+            and bboa.id in
+            <foreach collection="businessKeys" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
+        ORDER BY bboa.create_time DESC
+    </select>
 </mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceProtocolMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceProtocolMapper.xml
new file mode 100644
index 0000000..b7b2149
--- /dev/null
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceProtocolMapper.xml
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.mapper.business.BizBusinessOutsourceProtocolMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.business.BizBusinessOutsourceProtocol">
+        <id column="id" property="id" />
+        <result column="protocol_no" property="protocolNo" />
+        <result column="project_name" property="projectName" />
+        <result column="lab_code" property="labCode" />
+        <result column="group_code" property="groupCode" />
+        <result column="outsourcer_id" property="outsourcerId" />
+        <result column="remark" property="remark" />
+        <result column="outsource_no" property="outsourceNo" />
+        <result column="outsource_name" property="outsourceName" />
+        <result column="contacts" property="contacts" />
+        <result column="mobile" property="mobile" />
+        <result column="address" property="address" />
+        <result column="require_date" property="requireDate" />
+        <result column="outsource_cost" property="outsourceCost" />
+        <result column="director" property="director" />
+        <result column="item" property="item" />
+        <result column="requires" property="requires" />
+        <result column="create_user_id" property="createUserId" />
+        <result column="create_user_name" property="createUserName" />
+        <result column="approval_status" property="approvalStatus" />
+        <result column="process_id" property="processId" />
+        <result column="create_time" property="createTime" />
+        <result column="update_time" property="updateTime" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, protocol_no, project_name, lab_code, group_code, outsourcer_id, remark, outsource_no, outsource_name, contacts, mobile, address, require_date, outsource_cost, director, item, requires, create_user_id, create_user_name, approval_status, process_id, create_time, update_time
+    </sql>
+
+    <select id="selectMaxProtocolNo" resultType="java.lang.Long">
+        SELECT IFNULL(max(RIGHT(protocol_no, 3)), 0) from biz_business_outsource_protocol
+    </select>
+
+    <select id="selectBatchForApprovalList" resultMap="BaseResultMap">
+        SELECT *
+        FROM biz_business_outsource_protocol
+        WHERE 1=1
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
+            and approval_status = #{request.approvalStatus}
+        </if>
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
+            and create_user_id = #{request.createUserId}
+        </if>
+        <if test="request != null and request.protocolNo != null and request.protocolNo !=''">
+            and protocol_no like concat('%',#{request.protocolNo},'%')
+        </if>
+        <if test="request != null and request.outsourcerName != null and request.outsourcerName !=''">
+            and outsourcer_name like concat('%',#{request.outsourcerName},'%')
+        </if>
+        <if test="request != null and request.applicantName != null and request.applicantName !=''">
+            and create_user_name like concat('%',#{request.applicantName},'%')
+        </if>
+        <if test="request != null and request.applicantTimeStart != null and request.applicantTimeStart !=''">
+            and create_time &gt;= #{request.applicantTimeStart}
+        </if>
+        <if test="request != null and request.applicantTimeEnd != null and request.applicantTimeEnd !=''">
+            and create_time &lt;= #{request.applicantTimeEnd}
+        </if>
+        <if test="businessKeys != null">
+            and id in
+            <foreach collection="businessKeys" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
+        ORDER BY create_time DESC
+    </select>
+</mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourcerInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourcerInfoMapper.xml
index 510a80b..3049b54 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourcerInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourcerInfoMapper.xml
@@ -7,6 +7,8 @@
         <id column="id" property="id" />
         <result column="outsourcer_no" property="outsourcerNo" />
         <result column="outsourcer_name" property="outsourcerName" />
+        <result column="lab_code" property="labCode" />
+        <result column="group_code" property="groupCode" />
         <result column="outsourcer_brief_name" property="outsourcerBriefName" />
         <result column="outsourcer_size" property="outsourcerSize" />
         <result column="business_size" property="businessSize" />
@@ -55,32 +57,32 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, outsourcer_no, outsourcer_name, outsourcer_brief_name, outsourcer_size, business_size, grade, evaluation, tax_number, bank_account, bank_name, bank_account_number, postal_code, director, phone, fax, mobile, email, website, address_country, address_province, address_city, address_area, full_address, address_country_name, address_province_name, address_city_name, address_area_name, invoice_country, invoice_province, invoice_city, invoice_area, invoice_full_address, invoice_country_name, invoice_province_name, invoice_city_name, invoice_area_name, business_scope, business_content, minio_file_name, approval_status, process_id, remark, create_user_id, create_user_name, create_time, update_time
+        id, outsourcer_no, outsourcer_name, lab_code, group_code, outsourcer_brief_name, outsourcer_size, business_size, grade, evaluation, tax_number, bank_account, bank_name, bank_account_number, postal_code, director, phone, fax, mobile, email, website, address_country, address_province, address_city, address_area, full_address, address_country_name, address_province_name, address_city_name, address_area_name, invoice_country, invoice_province, invoice_city, invoice_area, invoice_full_address, invoice_country_name, invoice_province_name, invoice_city_name, invoice_area_name, business_scope, business_content, minio_file_name, approval_status, process_id, remark, create_user_id, create_user_name, create_time, update_time
     </sql>
 
     <select id="selectBatchForApprovalList" resultMap="BaseResultMap">
         SELECT *
         FROM biz_business_outsourcer_info
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.outsourcerNo != null and request.outsourcerNo !=''">
+        <if test="request != null and request.outsourcerNo != null and request.outsourcerNo !=''">
             and outsourcer_no like concat('%',#{request.outsourcerNo},'%')
         </if>
-        <if test="request.outsourcerName != null and request.outsourcerName !=''">
+        <if test="request != null and request.outsourcerName != null and request.outsourcerName !=''">
             and outsourcer_name like concat('%',#{request.outsourcerName},'%')
         </if>
-        <if test="request.director != null and request.director !=''">
+        <if test="request != null and request.director != null and request.director !=''">
             and director like concat('%',#{request.director},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
@@ -93,6 +95,6 @@
     </select>
 
     <select id="selectMaxNo" resultType="java.lang.Long">
-        SELECT IFNULL(max(RIGHT(outsourcer_no, 12)), 0) from biz_business_outsourcer_info
+        SELECT IFNULL(max(RIGHT(outsourcer_no, 3)), 0) from biz_business_outsourcer_info
     </select>
 </mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessSiteExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessSiteExecutiveInfoMapper.xml
index 135c5d0..3c5ae79 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessSiteExecutiveInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessSiteExecutiveInfoMapper.xml
@@ -38,25 +38,25 @@
         FROM biz_business_site_executive_info bsei
         LEFT JOIN biz_resource_customer_info rci ON bsei.customer_id = rci.id
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and bsei.approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and bsei.create_user_id = #{request.createUserId}
         </if>
-        <if test="request.siteExecutiveNo != null and request.siteExecutiveNo !=''">
+        <if test="request != null and request.siteExecutiveNo != null and request.siteExecutiveNo !=''">
             and bsei.site_executive_no like concat('%',#{request.siteExecutiveNo},'%')
         </if>
-        <if test="request.customerName != null and request.customerName !=''">
+        <if test="request != null and request.customerName != null and request.customerName !=''">
             and rci.outsourcer_name like concat('%',#{request.customerName},'%')
         </if>
-        <if test="request.applyName != null and request.applyName !=''">
+        <if test="request != null and request.applyName != null and request.applyName !=''">
             and bsei.apply_name like concat('%',#{request.applyName},'%')
         </if>
-        <if test="request.applyTimeStart != null and request.applyTimeStart !=''">
+        <if test="request != null and request.applyTimeStart != null and request.applyTimeStart !=''">
             and bsei.apply_time &gt;= #{request.applyTimeStart}
         </if>
-        <if test="request.applyTimeEnd != null and request.applyTimeEnd !=''">
+        <if test="request != null and request.applyTimeEnd != null and request.applyTimeEnd !=''">
             and bsei.apply_time &lt;= #{request.applyTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml
index 84d9e2a..6bd38a9 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml
@@ -105,6 +105,12 @@
         <if test="request.isUrgent != null and request.isUrgent !=''">
             AND bo.is_urgent = #{request.isUrgent}
         </if>
+        <if test="request.ids != null">
+            and blei.id in
+            <foreach collection="request.ids" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
         ORDER BY blei.update_time DESC
     </select>
 
@@ -137,6 +143,12 @@
         <if test="request.isUrgent != null and request.isUrgent !=''">
             AND bo.is_urgent = #{request.isUrgent}
         </if>
+        <if test="request.ids != null">
+            and blei.id in
+            <foreach collection="request.ids" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
         ORDER BY blei.update_time DESC
     </select>
 
diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardInfoMapper.xml
index 1a5551b..2ed8d17 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardInfoMapper.xml
@@ -45,12 +45,6 @@
         FROM biz_equipment_standard_info besi
         LEFT JOIN biz_equipment_standard_technology_relation bestr ON besi.standard_no = bestr.standard_no
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
-            and besi.approval_status = #{request.approvalStatus}
-        </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
-            and besi.create_user_id = #{request.createUserId}
-        </if>
         <if test="request.standardName != null and request.standardName !=''">
             and besi.standard_name like concat('%',#{request.standardName},'%')
         </if>
diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardTechnologyRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardTechnologyRelationMapper.xml
index fc7e16c..cd03c8c 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardTechnologyRelationMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardTechnologyRelationMapper.xml
@@ -6,6 +6,7 @@
     <resultMap id="BaseResultMap" type="com.casic.missiles.model.equipment.BizEquipmentStandardTechnologyRelation">
         <id column="id" property="id" />
         <result column="technology_file_id" property="technologyFileId" />
+        <result column="technology_file_no" property="technologyFileNo" />
         <result column="technology_file_name" property="technologyFileName" />
         <result column="standard_id" property="standardId" />
         <result column="standard_no" property="standardNo" />
@@ -14,7 +15,7 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, technology_file_id, technology_file_name, standard_id, remark
+        id, technology_file_id, technology_file_no, technology_file_name, standard_id, remark
     </sql>
 
 </mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceAuthorizeOrderMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceAuthorizeOrderMapper.xml
index ac5176c..554fe65 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceAuthorizeOrderMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceAuthorizeOrderMapper.xml
@@ -32,22 +32,22 @@
         SELECT *
         FROM biz_resource_authorize_order
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.orderNo != null and request.orderNo !=''">
+        <if test="request != null and request.orderNo != null and request.orderNo !=''">
             and order_no like concat('%',#{request.orderNo},'%')
         </if>
-        <if test="request.createUserName != null and request.createUserName !=''">
+        <if test="request != null and request.createUserName != null and request.createUserName !=''">
             and create_user_name like concat('%',#{request.createUserName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerExamineFormMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerExamineFormMapper.xml
index ab242f6..af7f98f 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerExamineFormMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerExamineFormMapper.xml
@@ -41,28 +41,28 @@
         SELECT *
         FROM biz_resource_customer_examine_form
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.formNo != null and request.formNo !=''">
+        <if test="request != null and request.formNo != null and request.formNo !=''">
             and form_no like concat('%',#{request.formNo},'%')
         </if>
-        <if test="request.labCode != null and request.labCode !=''">
+        <if test="request != null and request.labCode != null and request.labCode !=''">
             and lab_code like concat('%',#{request.labCode},'%')
         </if>
-        <if test="request.groupCode != null and request.groupCode !=''">
+        <if test="request != null and request.groupCode != null and request.groupCode !=''">
             and group_code like concat('%',#{request.groupCode},'%')
         </if>
-        <if test="request.createUserName != null and request.createUserName !=''">
+        <if test="request != null and request.createUserName != null and request.createUserName !=''">
             and create_user_name like concat('%',#{request.createUserName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerInfoMapper.xml
index fa8ffbc..06a2798 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerInfoMapper.xml
@@ -33,25 +33,25 @@
         SELECT *
         FROM biz_resource_customer_info
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.customerNo != null and request.customerNo !=''">
+        <if test="request != null and request.customerNo != null and request.customerNo !=''">
             and customer_no like concat('%',#{request.customerNo},'%')
         </if>
-        <if test="request.customerName != null and request.customerName !=''">
+        <if test="request != null and request.customerName != null and request.customerName !=''">
             and customer_name like concat('%',#{request.customerName},'%')
         </if>
-        <if test="request.contacts != null and request.contacts !=''">
+        <if test="request != null and request.contacts != null and request.contacts !=''">
             and contacts like concat('%',#{request.contacts},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerSuggestFormMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerSuggestFormMapper.xml
index 28f5bb2..1806662 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerSuggestFormMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerSuggestFormMapper.xml
@@ -33,28 +33,28 @@
         SELECT *
         FROM biz_resource_customer_suggest_form
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.formNo != null and request.formNo !=''">
+        <if test="request != null and request.formNo != null and request.formNo !=''">
             and form_no like concat('%',#{request.formNo},'%')
         </if>
-        <if test="request.customerName != null and request.customerName !=''">
+        <if test="request != null and request.customerName != null and request.customerName !=''">
             and customer_name like concat('%',#{request.customerName},'%')
         </if>
-        <if test="request.customerDeptName != null and request.customerDeptName !=''">
+        <if test="request != null and request.customerDeptName != null and request.customerDeptName !=''">
             and customer_dept_name like concat('%',#{request.customerDeptName},'%')
         </if>
-        <if test="request.createUserName != null and request.createUserName !=''">
+        <if test="request != null and request.createUserName != null and request.createUserName !=''">
             and create_user_name like concat('%',#{request.createUserName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSealUseNoteMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSealUseNoteMapper.xml
index ab37bc1..b02bb33 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSealUseNoteMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSealUseNoteMapper.xml
@@ -29,32 +29,32 @@
     </sql>
 
     <select id="selectBatchForApprovalList" resultMap="BaseResultMap">
-        SELECT *
+        SELECT brsun.*, brsi.seal_name, brsi.seal_type, brsi.approver_name
         FROM biz_resource_seal_use_note brsun
         JOIN biz_resource_seal_info brsi ON brsun.seal_id = brsi.id
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and brsun.approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and brsun.create_user_id = #{request.createUserId}
         </if>
-        <if test="request.sealName != null and request.sealName !=''">
+        <if test="request != null and request.sealName != null and request.sealName !=''">
             and brsi.seal_name like concat('%',#{request.sealName},'%')
         </if>
-        <if test="request.sealType != null and request.sealType !=''">
+        <if test="request != null and request.sealType != null and request.sealType !=''">
             and brsi.seal_type = #{request.sealType}
         </if>
-        <if test="request.applyDeptName != null and request.applyDeptName !=''">
+        <if test="request != null and request.applyDeptName != null and request.applyDeptName !=''">
             and brsun.apply_dept_name like concat('%',#{request.applyDeptName},'%')
         </if>
-        <if test="request.applyUserName != null and request.applyUserName !=''">
+        <if test="request != null and request.applyUserName != null and request.applyUserName !=''">
             and brsun.apply_user_name like concat('%',#{request.applyUserName},'%')
         </if>
-        <if test="request.applyTimeStart != null and request.applyTimeStart !=''">
+        <if test="request != null and request.applyTimeStart != null and request.applyTimeStart !=''">
             and brsun.apply_time &gt;= #{request.applyTimeStart}
         </if>
-        <if test="request.applyTimeEnd != null and request.applyTimeEnd !=''">
+        <if test="request != null and request.applyTimeEnd != null and request.applyTimeEnd !=''">
             and brsun.apply_time &lt;= #{request.applyTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml
index 119bf7d..4f8392a 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml
@@ -31,6 +31,12 @@
         <if test="request.deptName != null and request.deptName !=''">
             and brsi.dept_name like concat('%',#{request.deptName},'%')
         </if>
+        <if test="request.ids != null">
+            and brsv.id in
+            <foreach collection="request.ids" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
         ORDER BY brsv.grant_date DESC
     </select>
 
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSupplierInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSupplierInfoMapper.xml
index fe8d399..e8ce7ef 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSupplierInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSupplierInfoMapper.xml
@@ -48,28 +48,28 @@
         SELECT *
         FROM biz_resource_supplier_info
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.supplierNo != null and request.supplierNo !=''">
+        <if test="request != null and request.supplierNo != null and request.supplierNo !=''">
             and supplier_no like concat('%',#{request.supplierNo},'%')
         </if>
-        <if test="request.supplierName != null and request.supplierName !=''">
+        <if test="request != null and request.supplierName != null and request.supplierName !=''">
             and supplier_name like concat('%',#{request.supplierName},'%')
         </if>
-        <if test="request.director != null and request.director !=''">
+        <if test="request != null and request.director != null and request.director !=''">
             and director like concat('%',#{request.director},'%')
         </if>
-        <if test="request.supplierType != null and request.supplierType !=''">
+        <if test="request != null and request.supplierType != null and request.supplierType !=''">
             and supplier_type = #{request.supplierType}
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/EnvLocationInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/EnvLocationInfoMapper.xml
new file mode 100644
index 0000000..68bcf10
--- /dev/null
+++ b/casic-metering-dao/src/main/resources/mapper/resource/EnvLocationInfoMapper.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.mapper.resource.EnvLocationInfoMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.resource.EnvLocationInfo">
+        <id column="id" property="id" />
+        <result column="location_no" property="locationNo" />
+        <result column="location_name" property="locationName" />
+        <result column="location_position" property="locationPosition" />
+        <result column="create_user_id" property="createUserId" />
+        <result column="create_user" property="createUser" />
+        <result column="create_time" property="createTime" />
+        <result column="update_time" property="updateTime" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, location_no, location_name, location_position, create_user_id, create_user, create_time, update_time
+    </sql>
+
+    <select id="selectLocationListPage" resultType="com.casic.missiles.dto.resource.environment.LocationListResponse">
+        SELECT *
+        FROM env_location_info
+        WHERE 1=1
+        <if test="request.locationNo != null and request.locationNo !=''">
+            AND location_no LIKE concat('%',#{request.locationNo},'%')
+        </if>
+        <if test="request.locationName != null and request.locationName !=''">
+            AND location_name LIKE concat('%',#{request.locationName},'%')
+        </if>
+        ORDER BY create_time DESC
+    </select>
+
+</mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml
index b28c18f..8854047 100644
--- a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml
@@ -11,7 +11,6 @@
         <result column="sign_desc" property="signDesc" />
         <result column="sign_director" property="signDirector" />
         <result column="sign_user_id" property="signUserId" />
-        <result column="sign_type" property="signType" />
         <result column="minio_file_name" property="minioFileName" />
         <result column="create_time" property="createTime" />
         <result column="update_time" property="updateTime" />
@@ -28,7 +27,6 @@
         <result column="sign_name" property="signName" />
         <result column="sign_desc" property="signDesc" />
         <result column="sign_director" property="signDirector" />
-        <result column="sign_type" property="signType" />
         <result column="sign_user_id" property="signUserId" />
         <result column="minio_file_name" property="minioFileName" />
         <result column="create_time" property="createTime" />
@@ -62,4 +60,58 @@
         JOIN system_sign_user_relation ssur ON ss.id = ssur.sign_id
         WHERE ssur.user_id = #{userId}
     </select>
+
+    <select id="selectSignListPage" resultMap="BaseResultMap">
+        SELECT ss.*, sd.SIMPLE_NAME AS deptName
+        FROM system_sign ss
+        LEFT JOIN sys_user su ON su.id = ss.sign_user_id
+        LEFT JOIN sys_dept sd ON sd.id = su.dept_id
+        WHERE 1=1
+        <if test="request.signNo != null and request.signNo !=''">
+            AND ss.sign_no LIKE concat('%',#{request.signNo},'%')
+        </if>
+        <if test="request.signName != null and request.signName !=''">
+            AND ss.sign_name LIKE concat('%',#{request.signName},'%')
+        </if>
+        <if test="request.signDirector != null and request.signDirector !=''">
+            AND ss.sign_director LIKE concat('%',#{request.signDirector},'%')
+        </if>
+        <if test="request.signUserId != null and request.signUserId !=''">
+            AND ss.sign_user_id = #{request.signUserId}
+        </if>
+        <if test="request.createStartTime != null and request.createStartTime !=''">
+            AND DATE_FORMAT(ss.create_time,'%Y-%m-%d') &gt;= DATE_FORMAT(#{request.createStartTime},'%Y-%m-%d')
+        </if>
+        <if test="request.createEndTime != null and request.createEndTime !=''">
+            AND DATE_FORMAT(ss.create_time,'%Y-%m-%d')  &lt;= DATE_FORMAT(#{request.createEndTime},'%Y-%m-%d')
+        </if>
+        ORDER BY ss.create_time DESC
+    </select>
+
+    <select id="selectSignList" resultMap="BaseResultMap">
+        SELECT ss.*, sd.SIMPLE_NAME AS deptName
+        FROM system_sign ss
+        LEFT JOIN sys_user su ON su.id = ss.sign_user_id
+        LEFT JOIN sys_dept sd ON sd.id = su.dept_id
+        WHERE 1=1
+        <if test="request.signNo != null and request.signNo !=''">
+            AND ss.sign_no LIKE concat('%',#{request.signNo},'%')
+        </if>
+        <if test="request.signName != null and request.signName !=''">
+            AND ss.sign_name LIKE concat('%',#{request.signName},'%')
+        </if>
+        <if test="request.signDirector != null and request.signDirector !=''">
+            AND ss.sign_director LIKE concat('%',#{request.signDirector},'%')
+        </if>
+        <if test="request.signUserId != null and request.signUserId !=''">
+            AND ss.sign_user_id = #{request.signUserId}
+        </if>
+        <if test="request.createStartTime != null and request.createStartTime !=''">
+            AND DATE_FORMAT(ss.create_time,'%Y-%m-%d') &gt;= DATE_FORMAT(#{request.createStartTime},'%Y-%m-%d')
+        </if>
+        <if test="request.createEndTime != null and request.createEndTime !=''">
+            AND DATE_FORMAT(ss.create_time,'%Y-%m-%d')  &lt;= DATE_FORMAT(#{request.createEndTime},'%Y-%m-%d')
+        </if>
+        ORDER BY ss.create_time DESC
+    </select>
 </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 515050a..60f530b 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
@@ -47,8 +47,8 @@
     String STORAGE_LOCATION = "bizStorageLocation";
     //计量专业
     String MEASURE_MAJOR = "bizMeasureMajor";
-    //管理状态
-    String MANAGER_STATE = "bizManagerState";
+    //标准装置管理状态
+    String STANDARD_MANAGER_STATE = "bizStandardManagerState";
 
     /**
      * 资源管理 字典code
@@ -95,8 +95,6 @@
     String MEASURE_STATUS = "measureStatus";
     //检定方式
     String MEASURE_TYPE = "measureType";
-    //标识打印标志类型
-    String IDENTIFY_PRINT_TYPE = "bizBusinessIdentify";
     //变更类型
     String REPORT_CHANGE_TYPE = "bizCertChangeType";
     //规模类型
@@ -111,19 +109,24 @@
     String MEASURE_CATEGORY = "measureCategory";
     //检定结果
     String MEASURE_RESULT = "measureResult";
+    //分包原因
+    String OUTSOURCE_REASON = "outsourceReason";
+
+    /**
+     * 系统管理
+     */
+    String TEMPLATE_TYPE = "templateType";
+
 
     /**
      * 标准装置 字典code
      */
     //类别
     String STANDARD_CATEGORY = "standardCategory";
-    //管理状态
-    String STANDARD_MANAGER_STATE = "standardManagerState";
     //标准等级
     String STANDARD_LEVEL = "standardLevel";
     //传递范围
     String STANDARD_TRANSMIT_RANGE = "transmitRange";
-
     //资本来源
     String CAPITAL_SOURCE = "capitalSource";
     //标准装置-申请类型
@@ -148,8 +151,6 @@
     String CERTIFICATE_CLASS = "certificationClass";
     //证书管理-检校专业
     String CALIBRATION_MAJOR = "calibrationMajor";
-    //分包原因
-    String OUTSOURCE_REASON = "outsourceReason";
 
     /**
      * 工作台
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/BaseApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/BaseApprovalListRequest.java
index 73c12c1..80d7424 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/BaseApprovalListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/BaseApprovalListRequest.java
@@ -6,6 +6,7 @@
 
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotEmpty;
+import java.util.List;
 
 /**
  * @Description:
@@ -19,14 +20,14 @@
      * 表单id
      */
     @NotBlank(message = "表单id不能为空")
-    @ApiModelProperty(value = "表单id（流程定义对应的表单id，等价于业务id）", dataType = "String")
+    @ApiModelProperty(value = "表单id（流程定义对应的表单id，等价于业务id），导出接口不用传", dataType = "String")
     private String formId;
 
     /**
      * 审批状态类型，对应ApprovalStatusEnum
      */
     @NotEmpty(message = "审批状态类型不能为空")
-    @ApiModelProperty(value = "审批状态类型code", dataType = "String")
+    @ApiModelProperty(value = "审批状态类型code，导出接口不用传", dataType = "String")
     private String approvalStatus;
 
     @ApiModelProperty(hidden = true)
@@ -34,4 +35,7 @@
 
     @ApiModelProperty(hidden = true)
     private Long createUserId;
+
+    @ApiModelProperty(value = "导出ids", dataType = "List")
+    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificatePrintApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificatePrintApprovalListRequest.java
index b93d1c9..3cc2f4e 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificatePrintApprovalListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificatePrintApprovalListRequest.java
@@ -5,8 +5,6 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import java.util.List;
-
 /**
  * @Description:
  * @Author: wangpeng
@@ -38,7 +36,4 @@
 
     @ApiModelProperty(value = "创建结束时间", dataType = "String")
     private String createTimeEnd;
-
-    @ApiModelProperty(value = "导出ids", dataType = "List")
-    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportApprovalListRequest.java
index 4f7a038..c115847 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportApprovalListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportApprovalListRequest.java
@@ -5,8 +5,6 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import java.util.List;
-
 /**
  * @Description:
  * @Author: wangpeng
@@ -15,6 +13,8 @@
 @ApiModel
 @Data
 public class CertificateReportApprovalListRequest extends BaseApprovalListRequest {
+    @ApiModelProperty(value = "委托方id", dataType = "String")
+    private Long customerId;
 
     @ApiModelProperty(value = "证书报告编号", dataType = "String")
     private String certificateReportNo;
@@ -37,6 +37,4 @@
     @ApiModelProperty(value = "检校结束时间", dataType = "String")
     private String calibrationTimeEnd;
 
-    @ApiModelProperty(value = "导出ids", dataType = "List")
-    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/identify/IdentifyListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/identify/IdentifyListRequest.java
index 1b87ae6..f019203 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/identify/IdentifyListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/identify/IdentifyListRequest.java
@@ -4,6 +4,8 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * @Description:
  * @Author: wangpeng
@@ -26,4 +28,7 @@
 
     @ApiModelProperty(value = "打印结束时间", dataType = "String")
     private String createTimeEnd;
+
+    @ApiModelProperty(value = "导出ids", dataType = "List")
+    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListRequest.java
index 1264883..62415fb 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListRequest.java
@@ -7,6 +7,7 @@
 import lombok.Data;
 
 import javax.validation.constraints.NotBlank;
+import java.util.List;
 
 @Data
 @ApiModel
@@ -37,4 +38,6 @@
     @ApiModelProperty(value = "是否加急（1是0否null全部）", dataType = "Integer")
     private String isUrgent;
 
+    @ApiModelProperty(value = "导出ids", dataType = "List")
+    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListRequest.java
index 5201d7b..499760a 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListRequest.java
@@ -17,6 +17,9 @@
     @ApiModelProperty(value = "任务单编号", dataType = "String")
     private String orderNo;
 
+    @ApiModelProperty(value = "委托方id", dataType = "Long")
+    private Long customerId;
+
     @ApiModelProperty(value = "委托方名称", dataType = "String")
     private String customerName;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OrderSampleDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OrderSampleDTO.java
new file mode 100644
index 0000000..796edc0
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OrderSampleDTO.java
@@ -0,0 +1,19 @@
+package com.casic.missiles.dto.business.outsource;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/8/24 11:38
+ */
+@ApiModel
+@Data
+public class OrderSampleDTO {
+    @ApiModelProperty(value = "任务单id", dataType = "Long")
+    private Long orderId;
+    @ApiModelProperty(value = "受检设备id", dataType = "Long")
+    private Long sampleId;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceAssessApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceAssessApprovalListRequest.java
new file mode 100644
index 0000000..9a930c3
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceAssessApprovalListRequest.java
@@ -0,0 +1,30 @@
+package com.casic.missiles.dto.business.outsource;
+
+import com.casic.missiles.dto.BaseApprovalListRequest;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/8/24 11:01
+ */
+@ApiModel
+@Data
+public class OutsourceAssessApprovalListRequest extends BaseApprovalListRequest {
+    @ApiModelProperty(value = "评审表编号", dataType = "String")
+    private String projectNo;
+
+    @ApiModelProperty(value = "分包机构名称", dataType = "String")
+    private String outsourcerName;
+
+    @ApiModelProperty(value = "申请人", dataType = "String")
+    private String applicantName;
+
+    @ApiModelProperty(value = "申请时间开始", dataType = "String")
+    private String applicantTimeStart;
+
+    @ApiModelProperty(value = "申请时间结束", dataType = "String")
+    private String applicantTimeEnd;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceAssessSaveResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceAssessSaveResponse.java
new file mode 100644
index 0000000..8bf9aad
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceAssessSaveResponse.java
@@ -0,0 +1,20 @@
+package com.casic.missiles.dto.business.outsource;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/8/14 16:17
+ */
+@ApiModel
+@Data
+public class OutsourceAssessSaveResponse {
+    @ApiModelProperty(value = "主键id", dataType = "Long")
+    private Long id;
+
+    @ApiModelProperty(value = "编号", dataType = "String")
+    private String projectNo;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProtocolApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProtocolApprovalListRequest.java
new file mode 100644
index 0000000..0f32331
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProtocolApprovalListRequest.java
@@ -0,0 +1,30 @@
+package com.casic.missiles.dto.business.outsource;
+
+import com.casic.missiles.dto.BaseApprovalListRequest;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/8/24 15:01
+ */
+@ApiModel
+@Data
+public class OutsourceProtocolApprovalListRequest extends BaseApprovalListRequest {
+    @ApiModelProperty(value = "协议书编号", dataType = "String")
+    private String protocolNo;
+
+    @ApiModelProperty(value = "分包方名称", dataType = "String")
+    private String outsourcerName;
+
+    @ApiModelProperty(value = "申请人", dataType = "String")
+    private String applicantName;
+
+    @ApiModelProperty(value = "申请时间开始", dataType = "String")
+    private String applicantTimeStart;
+
+    @ApiModelProperty(value = "申请时间结束", dataType = "String")
+    private String applicantTimeEnd;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProtocolSaveResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProtocolSaveResponse.java
new file mode 100644
index 0000000..e324967
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProtocolSaveResponse.java
@@ -0,0 +1,20 @@
+package com.casic.missiles.dto.business.outsource;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/8/14 16:17
+ */
+@ApiModel
+@Data
+public class OutsourceProtocolSaveResponse {
+    @ApiModelProperty(value = "主键id", dataType = "Long")
+    private Long id;
+
+    @ApiModelProperty(value = "编号", dataType = "String")
+    private String protocolNo;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveApprovalListRequest.java
index f29f4e4..7047c28 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveApprovalListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveApprovalListRequest.java
@@ -5,8 +5,6 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import java.util.List;
-
 /**
  * @Description: 现场检测审批列表请求实体
  * @Author: wangpeng
@@ -30,7 +28,4 @@
     @ApiModelProperty(value = "申请时间结束", dataType = "String")
     private String applyTimeEnd;
 
-    @ApiModelProperty(value = "导出ids", dataType = "List")
-    private List<Long> ids;
-
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveDetailResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveDetailResponse.java
index 1f28752..394c934 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveDetailResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveDetailResponse.java
@@ -12,6 +12,18 @@
     @ApiModelProperty(value = "id，更新/删除使用参数", dataType = "Long")
     private Long id;
 
+    @ApiModelProperty(value = "实验室代码(字典code)", dataType = "String")
+    private String labCode;
+
+    @ApiModelProperty(value = "实验室代码(字典value)", dataType = "String")
+    private String labCodeName;
+
+    @ApiModelProperty(value = "组别代码(字典code)", dataType = "String")
+    private String groupCode;
+
+    @ApiModelProperty(value = "组别代码(字典value)", dataType = "String")
+    private String groupCodeName;
+
     @ApiModelProperty(value = "审批编号", dataType = "String")
     private String siteExecutiveNo;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/environment/LocationListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/environment/LocationListRequest.java
new file mode 100644
index 0000000..13d03c3
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/environment/LocationListRequest.java
@@ -0,0 +1,20 @@
+package com.casic.missiles.dto.resource.environment;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/6/8 13:56
+ */
+@ApiModel
+@Data
+public class LocationListRequest {
+    @ApiModelProperty(value = "地点编号", dataType = "String")
+    private String locationNo;
+
+    @ApiModelProperty(value = "地点名称", dataType = "String")
+    private String locationName;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/environment/LocationListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/environment/LocationListResponse.java
new file mode 100644
index 0000000..4c531af
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/environment/LocationListResponse.java
@@ -0,0 +1,78 @@
+package com.casic.missiles.dto.resource.environment;
+
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
+import com.baomidou.mybatisplus.annotation.TableField;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description: 地点列表响应实体
+ * @Author: wangpeng
+ * @Date: 2023/6/8 13:53
+ */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
+@ApiModel
+@Data
+public class LocationListResponse {
+    @ApiModelProperty(value = "主键id", dataType = "Long")
+    private Long id;
+
+    /**
+     * 地点编号
+     */
+    @ExcelProperty("地点编号")
+    @ApiModelProperty(value = "地点编号", dataType = "String")
+    private String locationNo;
+
+    /**
+     * 地点名称
+     */
+    @ExcelProperty("地点名称")
+    @ApiModelProperty(value = "地点名称", dataType = "String")
+    private String locationName;
+
+    /**
+     * 地点位置
+     */
+    @ExcelProperty("地点位置")
+    @ApiModelProperty(value = "地点位置", dataType = "String")
+    private String locationPosition;
+
+    /**
+     * 创建人id
+     */
+    @ApiModelProperty(value = "创建人id", dataType = "Long")
+    private Long createUserId;
+
+    /**
+     * 创建人
+     */
+    @ExcelProperty("创建人")
+    @ApiModelProperty(value = "创建人", dataType = "String")
+    @TableField("create_user")
+    private String createUser;
+
+    /**
+     * 创建时间
+     */
+    @ExcelProperty("创建时间")
+    @ApiModelProperty(value = "创建时间", dataType = "String")
+    private String createTime;
+
+    /**
+     * 更新时间
+     */
+    @ApiModelProperty(value = "更新时间", dataType = "String")
+    private String updateTime;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertRequest.java
index 9a7f6c6..c827915 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertRequest.java
@@ -4,6 +4,8 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * @Description:
  * @Author: wangpeng
@@ -16,4 +18,7 @@
     private String name;
     @ApiModelProperty(value = "部门名", dataType = "String")
     private String deptName;
+
+    @ApiModelProperty(value = "导出ids", dataType = "List")
+    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertResponse.java
index f78b159..8f2f79e 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertResponse.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.dto.resource.staff;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.casic.missiles.annotation.DictCodeField;
 import com.casic.missiles.constants.MeterDictCode;
 import io.swagger.annotations.ApiModel;
@@ -13,12 +20,18 @@
  * @Author: wangpeng
  * @Date: 2023/7/27 15:13
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @ApiModel
 @Data
 public class StaffCertResponse {
     /**
      * 人员编号
      */
+    @ExcelProperty(value = "人员编号",order = 0)
     @NotEmpty(message = "人员编号不能为空")
     @ApiModelProperty(value = "人员编号", dataType = "String")
     private String staffNo;
@@ -26,6 +39,7 @@
     /**
      * 姓名
      */
+    @ExcelProperty(value = "姓名",order = 1)
     @ApiModelProperty(value = "姓名", dataType = "String")
     private String staffName;
 
@@ -54,6 +68,7 @@
     /**
      * 部门名字
      */
+    @ExcelProperty(value = "工作部门",order = 2)
     @ApiModelProperty(value = "部门名字", dataType = "String")
     private String deptName;
 
@@ -66,6 +81,7 @@
     /**
      * 计量专业
      */
+    @ExcelProperty(value = "计量专业",order = 3)
     @ApiModelProperty(value = "计量专业", dataType = "String")
     private String major;
 
@@ -110,6 +126,7 @@
     /**
      * 证书号
      */
+    @ExcelProperty(value = "证号",order = 4)
     @ApiModelProperty(value = "证书号", dataType = "String")
     private String certNo;
 
@@ -122,12 +139,14 @@
     /**
      * 有效日期
      */
+    @ExcelProperty(value = "证书有效期",order = 6)
     @ApiModelProperty(value = "有效日期", dataType = "String")
     private String effectiveDate;
 
     /**
      * 发放日期
      */
+    @ExcelProperty(value = "发证日期",order = 5)
     @ApiModelProperty(value = "发放日期", dataType = "String")
     private String grantDate;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffListRequest.java
index 7c4afb3..0a1194a 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffListRequest.java
@@ -4,6 +4,8 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * @Description:
  * @Author: wangpeng
@@ -18,4 +20,7 @@
     private String deptName;
     @ApiModelProperty(value = "部门id", dataType = "Long")
     private Long deptId;
+
+    @ApiModelProperty(value = "导出ids", dataType = "List")
+    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/TrainListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/TrainListRequest.java
index f68597b..6321f8b 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/TrainListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/TrainListRequest.java
@@ -14,6 +14,8 @@
 public class TrainListRequest {
     @ApiModelProperty(value = "训练登记表编号", dataType = "String")
     private String trainNo;
+    @ApiModelProperty(value = "值班领导", dataType = "String")
+    private String dutyLeader;
     @ApiModelProperty(value = "创建开始时间", dataType = "String")
     private String createTimeStart;
     @ApiModelProperty(value = "创建结束时间", dataType = "String")
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/SignAddRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/SignAddRequest.java
index 117be34..d71055c 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/SignAddRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/SignAddRequest.java
@@ -43,13 +43,6 @@
     private Long signUserId;
 
     /**
-     * 签章或签名-字典code
-     */
-    @NotBlank(message = "类型不能为空")
-    @ApiModelProperty(value = "签名/签章-字典code", dataType = "String", required = true)
-    private String signType;
-
-    /**
      * minio存储文件名
      */
     @ApiModelProperty(value = "上传文件返回名称", dataType = "String")
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateAddRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateAddRequest.java
index aff1265..6316648 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateAddRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateAddRequest.java
@@ -17,30 +17,28 @@
 @Data
 public class TemplateAddRequest extends BaseSystemRequest {
     /**
-     * 原始记录模板/证书报告模板名称
+     * 模板名称
      */
     @ApiModelProperty(value = "名称", dataType = "String", required = true)
     @NotBlank(message = "名称不能为空")
     private String templateName;
 
     /**
-     * 原始记录模板/证书报告模板描述
+     * 模板描述
      */
     @ApiModelProperty(value = "描述", dataType = "String")
     private String templateDesc;
 
     /**
-     * 原始记录模板/证书报告模板创建人
+     * 创建人
      */
     @ApiModelProperty(value = "创建人", dataType = "String", required = true)
     @NotBlank(message = "创建人不能为空")
     private String templateCreator;
 
-    /**
-     * 原始记录模板/证书报告模板-字典code
-     */
-    @NotBlank(message = "类型不能为空")
-    @ApiModelProperty(value = "原始记录模板/证书报告模板-字典code", dataType = "String", required = true)
+
+    @NotBlank(message = "模板类型不能为空")
+    @ApiModelProperty(value = "模板类型(字典code)", dataType = "String", required = true)
     private String templateType;
 
     /**
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateListRequest.java
index eec5a1e..6d17bbe 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateListRequest.java
@@ -1,11 +1,12 @@
 package com.casic.missiles.dto.system;
 
+import com.casic.missiles.annotation.DictCodeField;
+import com.casic.missiles.constants.MeterDictCode;
 import com.casic.missiles.dto.BaseSystemRequest;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import javax.validation.constraints.NotBlank;
 import java.util.List;
 
 /**
@@ -19,8 +20,8 @@
     /**
      * 类型
      */
-//    @ApiModelProperty(value = "类型-字典code", dataType = "String", required = true)
-    @NotBlank(message = "类型不能为空")
+    @DictCodeField(message = "模板类型不合法", cacheName = MeterDictCode.TEMPLATE_TYPE)
+    @ApiModelProperty(value = "模板类型(字典code)", dataType = "String")
     private String templateType;
 
     /**
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificateChangeApply.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificateChangeApply.java
index 9216308..36923fd 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificateChangeApply.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificateChangeApply.java
@@ -1,11 +1,19 @@
 package com.casic.missiles.model.business;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 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 com.casic.missiles.dto.BaseRequest;
+import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -20,6 +28,12 @@
  * @author wangpeng
  * @since 2023-08-15
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
+@ApiModel
 @Data
 @TableName("biz_business_certificate_change_apply")
 public class BizBusinessCertificateChangeApply extends BaseRequest implements Serializable {
@@ -33,6 +47,7 @@
     /**
      * 申请单编号
      */
+    @ExcelProperty(value = "申请单编号", order = 1)
     @ApiModelProperty(value = "申请单编号", dataType = "String")
     @TableField("change_apply_no")
     private String changeApplyNo;
@@ -40,6 +55,7 @@
     /**
      * 申请单名字
      */
+    @ExcelProperty(value = "申请单名称", order = 2)
     @ApiModelProperty(value = "申请单名字", dataType = "String")
     @TableField("change_apply_name")
     private String changeApplyName;
@@ -54,6 +70,7 @@
     /**
      * 更换证书编号
      */
+    @ExcelProperty(value = "更换证书编号", order = 3)
     @ApiModelProperty(value = "更换证书编号", dataType = "String")
     @TableField("change_report_no")
     private String changeReportNo;
@@ -61,7 +78,8 @@
     /**
      * 更换证书名字
      */
-    @ApiModelProperty(value = "更换证书名字", dataType = "String")
+    @ExcelProperty(value = "更换证书/报告名称", order = 4)
+    @ApiModelProperty(value = "更换证书/报告名称", dataType = "String")
     @TableField("change_report_name")
     private String changeReportName;
 
@@ -73,6 +91,7 @@
     @TableField("change_type")
     private String changeType;
 
+    @ExcelProperty(value = "变更类型", order = 5)
     @ApiModelProperty(value = "变更类型(字典value)", dataType = "String")
     @TableField(exist = false)
     private String changeTypeName;
@@ -142,13 +161,15 @@
     /**
      * 创建用户名字
      */
-    @ApiModelProperty(value = "创建用户名字", dataType = "String")
+    @ExcelProperty(value = "创建人", order = 6)
+    @ApiModelProperty(value = "创建人名字", dataType = "String")
     @TableField("create_user_name")
     private String createUserName;
 
     /**
      * 创建时间
      */
+    @ExcelProperty(value = "创建时间", order = 7)
     @ApiModelProperty(value = "创建时间", dataType = "String")
     @TableField("create_time")
     private String createTime;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificateReport.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificateReport.java
index f01db9e..db06018 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificateReport.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificateReport.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.model.business;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -22,6 +29,11 @@
  * @author wangpeng
  * @since 2023-08-14
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @ApiModel
 @Data
 @TableName("biz_business_certificate_report")
@@ -36,6 +48,7 @@
     /**
      * 证书报告编号
      */
+    @ExcelProperty(value = "证书报告编号", order = 1)
     @ApiModelProperty(value = "证书报告编号", dataType = "String")
     @TableField("certificate_report_no")
     private String certificateReportNo;
@@ -43,6 +56,7 @@
     /**
      * 证书报告名称
      */
+    @ExcelProperty(value = "证书报告名称", order = 2)
     @ApiModelProperty(value = "证书报告名称", dataType = "String")
     @TableField("certificate_report_name")
     private String certificateReportName;
@@ -62,6 +76,7 @@
     @TableField("measure_category")
     private String measureCategory;
 
+    @ExcelProperty(value = "检校类别", order = 6)
     @ApiModelProperty(value = "检校类别(字典value)", dataType = "String")
     @TableField(exist = false)
     private String measureCategoryName;
@@ -69,6 +84,7 @@
     /**
      * 检校时间
      */
+    @ExcelProperty(value = "检校时间", order = 8)
     @ApiModelProperty(value = "检校时间", dataType = "String")
     @TableField("calibration_time")
     private String calibrationTime;
@@ -267,18 +283,22 @@
     @TableField(exist = false)
     private Integer decisionItem;
 
-    @ApiModelProperty(value = "设备样品编号（列表返回参数）", dataType = "String")
+    @ExcelProperty(value = "被检设备统一编号", order = 3)
+    @ApiModelProperty(value = "被检设备统一编号（列表返回参数）", dataType = "String")
     @TableField(exist = false)
     private String sampleNo;
 
-    @ApiModelProperty(value = "设备样品名称（列表返回参数）", dataType = "String")
+    @ExcelProperty(value = "被检设备名称", order = 4)
+    @ApiModelProperty(value = "被检设备名称（列表返回参数）", dataType = "String")
     @TableField(exist = false)
     private String sampleName;
 
-    @ApiModelProperty(value = "设备样品规格型号（列表返回参数）", dataType = "String")
+    @ExcelProperty(value = "规格型号", order = 5)
+    @ApiModelProperty(value = "规格型号（列表返回参数）", dataType = "String")
     @TableField(exist = false)
     private String sampleModel;
 
+    @ExcelProperty(value = "检定员", order = 7)
     @ApiModelProperty(value = "检定员名字（列表返回参数）", dataType = "String")
     @TableField(exist = false)
     private String staffName;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessIdentifyInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessIdentifyInfo.java
index 46bfba5..f1a9bec 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessIdentifyInfo.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessIdentifyInfo.java
@@ -1,10 +1,15 @@
 package com.casic.missiles.model.business;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 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;
 
@@ -20,6 +25,11 @@
  * @author wangpeng
  * @since 2023-08-15
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @Data
 @TableName("biz_business_identify_info")
 public class BizBusinessIdentifyInfo implements Serializable {
@@ -33,6 +43,7 @@
     /**
      * 记录编号
      */
+    @ExcelProperty(value = "记录编号", order = 1)
     @ApiModelProperty(value = "记录编号", dataType = "String")
     @TableField("record_no")
     private String recordNo;
@@ -41,20 +52,15 @@
      * 标志类型(字典code)
      */
     @NotEmpty(message = "标志类型不能为空")
-    @ApiModelProperty(value = "标志类型(字典code)", dataType = "String")
-    @DictCodeField(message = "标志类型不合法", cacheName = MeterDictCode.IDENTIFY_PRINT_TYPE)
+    @ApiModelProperty(value = "标志类型(直接存计量标识/使用状态/校准状态的字典value)", dataType = "String")
     @TableField("identify_type")
     private String identifyType;
 
-    @ApiModelProperty(value = "标志类型(字典value)", dataType = "String")
-    @TableField(exist = false)
-    private String identifyTypeName;
-
     /**
      * 设备id(可以是受检设备/设备台账)
      */
     @NotNull(message = "设备id不能为空")
-    @ApiModelProperty(value = "设备id(可以是受检设备/设备台账)", dataType = "String")
+    @ApiModelProperty(value = "设备id(可以是受检设备/设备台账)", dataType = "Long")
     @TableField("device_id")
     private Long deviceId;
 
@@ -66,29 +72,32 @@
     @TableField("device_type")
     private String deviceType;
 
+    @ExcelProperty(value = "统一编号", order = 3)
     @NotEmpty(message = "设备编号不能为空")
-    @ApiModelProperty(value = "设备编号", dataType = "String")
+    @ApiModelProperty(value = "统一编号", dataType = "String")
     @TableField("device_no")
     private String deviceNo;
 
     /**
      * 设备名字
      */
-    @NotEmpty(message = "设备名字不能为空")
-    @ApiModelProperty(value = "设备名字", dataType = "String")
+    @ExcelProperty(value = "设备名称", order = 4)
+    @NotEmpty(message = "设备名称不能为空")
+    @ApiModelProperty(value = "设备名称", dataType = "String")
     @TableField("device_name")
     private String deviceName;
 
     /**
      * 检定员id
      */
-    @ApiModelProperty(value = "检定员id", dataType = "String")
+    @ApiModelProperty(value = "检定员id", dataType = "Long")
     @TableField("measure_person_id")
     private Long measurePersonId;
 
     /**
      * 检定员名字
      */
+    @ExcelProperty(value = "检定员", order = 5)
     @ApiModelProperty(value = "检定员名字", dataType = "String")
     @TableField("measure_person")
     private String measurePerson;
@@ -103,7 +112,8 @@
     /**
      * 更新时间
      */
-    @ApiModelProperty(value = "更新时间", dataType = "String")
+    @ExcelProperty(value = "打印时间", order = 6)
+    @ApiModelProperty(value = "打印时间", dataType = "String")
     @TableField("update_time")
     private String updateTime;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceAssess.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceAssess.java
index 659d9ca..6720b90 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceAssess.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceAssess.java
@@ -1,11 +1,26 @@
 package com.casic.missiles.model.business;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 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 com.casic.missiles.dto.BaseRequest;
+import com.casic.missiles.dto.business.outsource.OrderSampleDTO;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import javax.validation.constraints.NotEmpty;
 import java.io.Serializable;
+import java.util.List;
 
 /**
  * <p>
@@ -15,146 +30,231 @@
  * @author wangpeng
  * @since 2023-08-16
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
+@ApiModel
 @Data
 @TableName("biz_business_outsource_assess")
-public class BizBusinessOutsourceAssess implements Serializable {
+public class BizBusinessOutsourceAssess extends BaseRequest implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
+    @ApiModelProperty(value = "id，更新/删除使用参数", dataType = "Long")
     @TableId("id")
     private Long id;
 
     /**
      * 评审表编号
      */
+    @ExcelProperty(value = "评审表编号", order = 1)
+    @ApiModelProperty(value = "评审表编号(后台生成)", dataType = "String")
     @TableField("project_no")
     private String projectNo;
 
     /**
      * 评审表名称
      */
+    @ExcelProperty(value = "评审表名称", order = 2)
+    @ApiModelProperty(value = "评审表名称", dataType = "String")
     @TableField("project_name")
     private String projectName;
 
+    @NotEmpty(message = "实验室代码不能为空")
+    @DictCodeField(message = "实验室代码描述不合法", cacheName = MeterDictCode.LAB_CODE)
+    @ApiModelProperty(value = "实验室代码(字典code)", dataType = "String")
+    @TableField("lab_code")
+    private String labCode;
+
+    @ApiModelProperty(value = "实验室代码(字典value)", dataType = "String")
+    @TableField(exist = false)
+    private String labCodeName;
+
+    /**
+     * 组别代码
+     */
+    @NotEmpty(message = "组别代码不能为空")
+    @DictCodeField(message = "组别代码描述不合法", cacheName = MeterDictCode.GROUP_CODE)
+    @ApiModelProperty(value = "组别代码(字典code)", dataType = "String")
+    @TableField("group_code")
+    private String groupCode;
+
+    @ApiModelProperty(value = "组别代码(字典value)", dataType = "String")
+    @TableField(exist = false)
+    private String groupCodeName;
+
     /**
      * 申请人id
      */
+    @ApiModelProperty(value = "申请人id", dataType = "String")
     @TableField("applicant_id")
     private Long applicantId;
 
     /**
      * 申请人名字
      */
+    @ExcelProperty(value = "申请人", order = 5)
+    @ApiModelProperty(value = "申请人", dataType = "String")
     @TableField("applicant_name")
     private String applicantName;
 
     /**
      * 申请时间
      */
+    @ExcelProperty(value = "申请时间", order = 6)
+    @ApiModelProperty(value = "申请时间", dataType = "String")
     @TableField("applicant_time")
     private String applicantTime;
 
     /**
      * 附件(minio存储文件名)
      */
+    @ApiModelProperty(value = "附件(minio存储文件名)", dataType = "String")
     @TableField("minio_file_name")
     private String minioFileName;
 
     /**
      * 备注
      */
+    @ApiModelProperty(value = "备注", dataType = "String")
     @TableField("remark")
     private String remark;
 
     /**
      * 创建人id
      */
+    @ApiModelProperty(value = "创建人id", dataType = "String")
     @TableField("create_user_id")
     private Long createUserId;
 
     /**
      * 创建人名字
      */
+    @ApiModelProperty(value = "创建人名字", dataType = "String")
     @TableField("create_user_name")
     private String createUserName;
 
     /**
      * 分包方id
      */
+    @ApiModelProperty(value = "评审表编号", dataType = "String")
     @TableField("outsourcer_id")
     private Long outsourcerId;
 
     /**
      * 预计开始时间
      */
+    @ApiModelProperty(value = "预计开始时间", dataType = "String")
     @TableField("pre_start_time")
     private String preStartTime;
 
     /**
      * 预计结束时间
      */
+    @ApiModelProperty(value = "预计结束时间", dataType = "String")
     @TableField("pre_end_time")
     private String preEndTime;
 
     /**
      * 分包原因-字典
      */
+    @ApiModelProperty(value = "分包原因(字典code)", dataType = "String")
+    @DictCodeField(message = "分包原因描述不合法", cacheName = MeterDictCode.OUTSOURCE_REASON)
     @TableField("outsource_reason")
     private String outsourceReason;
 
+    @ApiModelProperty(value = "分包原因(字典value)", dataType = "String")
+    @TableField(exist = false)
+    private String outsourceReasonName;
+
     /**
      * 预计费用
      */
+    @ApiModelProperty(value = "预计费用", dataType = "String")
     @TableField("pre_cost")
     private String preCost;
 
     /**
      * 审批状态
      */
+    @ApiModelProperty(value = "审批状态", dataType = "String")
+    @DictCodeField(message = "审批状态描述不合法", cacheName = MeterDictCode.APPROVAL_STATUS)
     @TableField("approval_status")
     private String approvalStatus;
 
     /**
      * 流程实例id
      */
+    @ApiModelProperty(value = "流程实例id", dataType = "String")
     @TableField("process_id")
     private String processId;
 
     /**
      * 实验室认可情况
      */
+    @ApiModelProperty(value = "实验室认可情况", dataType = "String")
     @TableField("approve_situation")
     private String approveSituation;
 
     /**
      * 溯源性
      */
+    @ApiModelProperty(value = "溯源性", dataType = "String")
     @TableField("traceability")
     private String traceability;
 
     /**
      * 测试方法
      */
+    @ApiModelProperty(value = "测试方法", dataType = "String")
     @TableField("test_method")
     private String testMethod;
 
     /**
      * 技术能力
      */
+    @ApiModelProperty(value = "技术能力", dataType = "String")
     @TableField("technique_ability")
     private String techniqueAbility;
 
     /**
      * 创建时间
      */
+    @ApiModelProperty(hidden = true)
     @TableField("create_time")
     private String createTime;
 
     /**
      * 更新时间
      */
+    @ApiModelProperty(hidden = true)
     @TableField("update_time")
     private String updateTime;
 
+    @ApiModelProperty(value = "审批状态类型-字典value", dataType = "String")
+    @TableField(exist = false)
+    private String approvalStatusName;
 
+    @ApiModelProperty(value = "任务id（同意、驳回等操作使用）", dataType = "String")
+    @TableField(exist = false)
+    private String taskId;
+
+    @ApiModelProperty(value = "可选决策项（1同意驳回拒绝 2同意驳回 3同意拒绝，用于待审批列表同意/驳回/拒绝按钮展示）", dataType = "Integer")
+    @TableField(exist = false)
+    private Integer decisionItem;
+
+    @NotEmpty(message = "受检设备信息不能为空")
+    @ApiModelProperty(value = "受检设备id列表（新建使用参数）", dataType = "List")
+    @TableField(exist = false)
+    private List<OrderSampleDTO> orderSampleList;
+
+    @ExcelProperty(value = "分包机构名称", order = 3)
+    @ApiModelProperty(value = "分包机构名称（列表返回参数）", dataType = "String")
+    private String outsourcerName;
+
+    @ExcelProperty(value = "机构负责人", order = 4)
+    @ApiModelProperty(value = "机构负责人（列表返回参数）", dataType = "String")
+    private String director;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceProtocol.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceProtocol.java
new file mode 100644
index 0000000..38df697
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceProtocol.java
@@ -0,0 +1,225 @@
+package com.casic.missiles.model.business;
+
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
+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 com.casic.missiles.dto.BaseRequest;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotEmpty;
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 计量检定业务-分包管理-测试、校准或检定工作分包协议书
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-08-24
+ */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
+@Data
+@TableName("biz_business_outsource_protocol")
+public class BizBusinessOutsourceProtocol extends BaseRequest implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "id，更新/删除使用参数", dataType = "Long")
+    @TableId("id")
+    private Long id;
+
+    /**
+     * 协议书编号
+     */
+    @ExcelProperty(value = "协议书编号", order = 1)
+    @ApiModelProperty(value = "协议书编号(后台生成)", dataType = "String")
+    @TableField("protocol_no")
+    private String protocolNo;
+
+    /**
+     * 协议书名称
+     */
+    @ExcelProperty(value = "协议书名称", order = 2)
+    @ApiModelProperty(value = "协议书名称", dataType = "String")
+    @TableField("project_name")
+    private String projectName;
+
+    @NotEmpty(message = "实验室代码不能为空")
+    @DictCodeField(message = "实验室代码描述不合法", cacheName = MeterDictCode.LAB_CODE)
+    @ApiModelProperty(value = "实验室代码(字典code)", dataType = "String")
+    @TableField("lab_code")
+    private String labCode;
+
+    @ApiModelProperty(value = "实验室代码(字典value)", dataType = "String")
+    @TableField(exist = false)
+    private String labCodeName;
+
+    @NotEmpty(message = "组别代码不能为空")
+    @DictCodeField(message = "组别代码描述不合法", cacheName = MeterDictCode.GROUP_CODE)
+    @ApiModelProperty(value = "组别代码(字典code)", dataType = "String")
+    @TableField("group_code")
+    private String groupCode;
+
+    @ApiModelProperty(value = "组别代码(字典value)", dataType = "String")
+    @TableField(exist = false)
+    private String groupCodeName;
+
+    /**
+     * 分包方id
+     */
+    @ApiModelProperty(value = "分包方id", dataType = "Long")
+    @TableField("outsourcer_id")
+    private Long outsourcerId;
+
+    /**
+     * 其他
+     */
+    @ApiModelProperty(value = "其他", dataType = "String")
+    @TableField("remark")
+    private String remark;
+
+    /**
+     * 分包方编号
+     */
+    @ApiModelProperty(value = "分包方编号(新建不用传)", dataType = "String")
+    @TableField("outsource_no")
+    private String outsourceNo;
+
+    /**
+     * 分包方名称
+     */
+    @ExcelProperty(value = "分包方名称", order = 3)
+    @ApiModelProperty(value = "分包方名称(新建不用传)", dataType = "String")
+    @TableField("outsource_name")
+    private String outsourceName;
+
+    /**
+     * 联系人
+     */
+    @ExcelProperty(value = "联系人", order = 4)
+    @ApiModelProperty(value = "联系人", dataType = "String")
+    @TableField("contacts")
+    private String contacts;
+
+    /**
+     * 电话
+     */
+    @ApiModelProperty(value = "电话", dataType = "String")
+    @TableField("mobile")
+    private String mobile;
+
+    /**
+     * 地址
+     */
+    @ApiModelProperty(value = "地址", dataType = "String")
+    @TableField("address")
+    private String address;
+
+    /**
+     * 要求完成日期
+     */
+    @ApiModelProperty(value = "要求完成日期", dataType = "String")
+    @TableField("require_date")
+    private String requireDate;
+
+    /**
+     * 分包费用(元)
+     */
+    @ApiModelProperty(value = "分包费用(元)", dataType = "String")
+    @TableField("outsource_cost")
+    private Double outsourceCost;
+
+    /**
+     * 分包方负责人
+     */
+    @ApiModelProperty(value = "分包方负责人", dataType = "String")
+    @TableField("director")
+    private String director;
+
+    /**
+     * 分包项目
+     */
+    @ApiModelProperty(value = "分包项目", dataType = "String")
+    @TableField("item")
+    private String item;
+
+    /**
+     * 分包要求
+     */
+    @ApiModelProperty(value = "分包要求", dataType = "String")
+    @TableField("requires")
+    private String requires;
+
+    /**
+     * 创建人id
+     */
+    @ApiModelProperty(hidden = true)
+    @TableField("create_user_id")
+    private Long createUserId;
+
+    /**
+     * 创建人名字
+     */
+    @ExcelProperty(value = "申请人", order = 5)
+    @ApiModelProperty(value = "申请人", dataType = "String")
+    @TableField("create_user_name")
+    private String createUserName;
+
+    /**
+     * 审批状态
+     */
+    @ApiModelProperty(value = "审批状态", dataType = "String")
+    @DictCodeField(message = "审批状态描述不合法", cacheName = MeterDictCode.APPROVAL_STATUS)
+    @TableField("approval_status")
+    private String approvalStatus;
+
+    /**
+     * 流程实例id
+     */
+    @ApiModelProperty(value = "流程实例id", dataType = "String")
+    @TableField("process_id")
+    private String processId;
+
+    /**
+     * 创建时间
+     */
+    @ExcelProperty(value = "申请时间", order = 6)
+    @ApiModelProperty(value = "申请时间", dataType = "String")
+    @TableField("create_time")
+    private String createTime;
+
+    /**
+     * 更新时间
+     */
+    @ApiModelProperty(hidden = true)
+    @TableField("update_time")
+    private String updateTime;
+
+    @ApiModelProperty(value = "审批状态类型-字典value", dataType = "String")
+    @TableField(exist = false)
+    private String approvalStatusName;
+
+    @ApiModelProperty(value = "任务id（同意、驳回等操作使用）", dataType = "String")
+    @TableField(exist = false)
+    private String taskId;
+
+    @ApiModelProperty(value = "可选决策项（1同意驳回拒绝 2同意驳回 3同意拒绝，用于待审批列表同意/驳回/拒绝按钮展示）", dataType = "Integer")
+    @TableField(exist = false)
+    private Integer decisionItem;
+
+
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourcerInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourcerInfo.java
index ec4e997..f9aa69e 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourcerInfo.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourcerInfo.java
@@ -17,6 +17,7 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import javax.validation.constraints.NotEmpty;
 import java.io.Serializable;
 
 /**
@@ -59,6 +60,29 @@
     @TableField("outsourcer_name")
     private String outsourcerName;
 
+    @NotEmpty(message = "实验室代码不能为空")
+    @DictCodeField(message = "实验室代码描述不合法", cacheName = MeterDictCode.LAB_CODE)
+    @ApiModelProperty(value = "实验室代码(字典code)", dataType = "String")
+    @TableField("lab_code")
+    private String labCode;
+
+    @ApiModelProperty(value = "实验室代码(字典value)", dataType = "String")
+    @TableField(exist = false)
+    private String labCodeName;
+
+    /**
+     * 组别代码
+     */
+    @NotEmpty(message = "组别代码不能为空")
+    @DictCodeField(message = "组别代码描述不合法", cacheName = MeterDictCode.GROUP_CODE)
+    @ApiModelProperty(value = "组别代码(字典code)", dataType = "String")
+    @TableField("group_code")
+    private String groupCode;
+
+    @ApiModelProperty(value = "组别代码(字典value)", dataType = "String")
+    @TableField(exist = false)
+    private String groupCodeName;
+
     /**
      * 单位简称
      */
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardInfo.java
index c48eed7..dffdfdd 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardInfo.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardInfo.java
@@ -5,6 +5,7 @@
 import com.baomidou.mybatisplus.annotation.TableName;
 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;
 
@@ -18,6 +19,7 @@
  * @author wangpeng
  * @since 2023-08-04
  */
+@ApiModel
 @Data
 @TableName("biz_equipment_standard_info")
 public class BizEquipmentStandardInfo implements Serializable {
@@ -119,7 +121,7 @@
      * 管理状态(字典code)
      */
     @ApiModelProperty(value = "管理状态(字典code)", dataType = "String")
-    @DictCodeField(message = "管理状态不合法", cacheName = MeterDictCode.MANAGER_STATE)
+    @DictCodeField(message = "管理状态不合法", cacheName = MeterDictCode.STANDARD_MANAGER_STATE)
     @TableField("manage_status")
     private String manageStatus;
 
@@ -151,7 +153,7 @@
     /**
      * 温度(℃)
      */
-    @ApiModelProperty(value = "使用状态(字典code)", dataType = "String")
+    @ApiModelProperty(value = "温度(℃)", dataType = "String")
     @TableField("temperature")
     private Double temperature;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardInfoApproval.java b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardInfoApproval.java
index dbd86ab..9f58d83 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardInfoApproval.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardInfoApproval.java
@@ -150,7 +150,7 @@
      * 管理状态(字典code)
      */
     @ApiModelProperty(value = "管理状态(字典code)", dataType = "String")
-    @DictCodeField(message = "管理状态不合法", cacheName = MeterDictCode.MANAGER_STATE)
+    @DictCodeField(message = "管理状态不合法", cacheName = MeterDictCode.STANDARD_MANAGER_STATE)
     @TableField("manage_status")
     private String manageStatus;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardTechnologyRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardTechnologyRelation.java
index 0e612bd..751f26b 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardTechnologyRelation.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardTechnologyRelation.java
@@ -3,6 +3,7 @@
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -16,6 +17,7 @@
  * @author wangpeng
  * @since 2023-08-04
  */
+@ApiModel
 @Data
 @TableName("biz_equipment_standard_technology_relation")
 public class BizEquipmentStandardTechnologyRelation implements Serializable {
@@ -33,6 +35,10 @@
     @TableField("technology_file_id")
     private Long technologyFileId;
 
+    @ApiModelProperty(value = "依据的技术文件编号", dataType = "String")
+    @TableField("technology_file_no")
+    private String technologyFileNo;
+
     /**
      * 依据的技术文件名称(技术文件中现行测试校准检定方法表文件名字段)
      */
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerInfo.java
index d6e8bed..65cd6bc 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerInfo.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerInfo.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.model.resource;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -21,6 +28,11 @@
  * @author wangpeng
  * @since 2023-08-08
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @ApiModel
 @Data
 @TableName("biz_resource_customer_info")
@@ -35,6 +47,7 @@
     /**
      * 委托方编号
      */
+    @ExcelProperty(value = "委托方编号", order = 1)
     @ApiModelProperty(value = "委托方编号", dataType = "String")
     @TableField("customer_no")
     private String customerNo;
@@ -42,6 +55,7 @@
     /**
      * 委托方名称
      */
+    @ExcelProperty(value = "委托方名称", order = 2)
     @ApiModelProperty(value = "委托方名称(新建时为下拉选择一个受检单位组织的名字，传deptId字段，后端获取名称)", dataType = "String")
     @TableField("customer_name")
     private String customerName;
@@ -63,6 +77,7 @@
     /**
      * 联系人
      */
+    @ExcelProperty(value = "联系人", order = 3)
     @ApiModelProperty(value = "联系人", dataType = "String")
     @TableField("contacts")
     private String contacts;
@@ -70,6 +85,7 @@
     /**
      * 座机电话
      */
+    @ExcelProperty(value = "座机电话", order = 4)
     @ApiModelProperty(value = "座机电话", dataType = "String")
     @TableField("mobile")
     private String mobile;
@@ -77,6 +93,7 @@
     /**
      * 手机号码
      */
+    @ExcelProperty(value = "手机号码", order = 5)
     @ApiModelProperty(value = "手机号码", dataType = "String")
     @TableField("phone")
     private String phone;
@@ -91,6 +108,7 @@
     /**
      * 地址
      */
+    @ExcelProperty(value = "地址", order = 6)
     @ApiModelProperty(value = "地址", dataType = "String")
     @TableField("address")
     private String address;
@@ -141,6 +159,7 @@
     /**
      * 创建时间
      */
+    @ExcelProperty(value = "创建时间", order = 7)
     @ApiModelProperty(value = "创建时间", dataType = "String")
     @TableField("create_time")
     private String createTime;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerSuggestForm.java b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerSuggestForm.java
index 7201bbd..701bf8b 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerSuggestForm.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerSuggestForm.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.model.resource;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -22,6 +29,11 @@
  * @author wangpeng
  * @since 2023-08-08
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @ApiModel
 @Data
 @TableName("biz_resource_customer_suggest_form")
@@ -44,7 +56,8 @@
     /**
      * 委托方名称
      */
-    @ApiModelProperty(value = "委托方名称", dataType = "String")
+    @ExcelProperty(value = "意见反馈单位", order = 2)
+    @ApiModelProperty(value = "意见反馈单位", dataType = "String")
     @TableField("customer_name")
     private String customerName;
 
@@ -59,7 +72,8 @@
     /**
      * 委托方意见反馈部门名称
      */
-    @ApiModelProperty(value = "委托方意见反馈部门名称", dataType = "String")
+    @ExcelProperty(value = "委托方意见反馈部门", order = 3)
+    @ApiModelProperty(value = "委托方意见反馈部门", dataType = "String")
     @TableField("customer_dept_name")
     private String customerDeptName;
 
@@ -73,6 +87,7 @@
     /**
      * 表单编号
      */
+    @ExcelProperty(value = "表单编号", order = 1)
     @ApiModelProperty(value = "表单编号", dataType = "String")
     @TableField("form_no")
     private String formNo;
@@ -111,6 +126,7 @@
     /**
      * 创建人名字
      */
+    @ExcelProperty(value = "创建人", order = 4)
     @ApiModelProperty(value = "创建人名字", dataType = "String")
     @TableField("create_user_name")
     private String createUserName;
@@ -147,6 +163,7 @@
     /**
      * 创建时间
      */
+    @ExcelProperty(value = "创建时间", order = 5)
     @ApiModelProperty(value = "创建时间", dataType = "String")
     @TableField("create_time")
     private String createTime;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSealInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSealInfo.java
index cbf05d7..9bf389d 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSealInfo.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSealInfo.java
@@ -106,6 +106,10 @@
     @TableField("minio_file_name")
     private String minioFileName;
 
+    @ApiModelProperty(value = "minio存储文件url", dataType = "String")
+    @TableField(exist = false)
+    private String minioFileUrl;
+
     @ApiModelProperty(value = "创建时间", dataType = "String")
     @TableField("create_time")
     private String createTime;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSealUseNote.java b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSealUseNote.java
index 3f2d9e8..3ce16a8 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSealUseNote.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSealUseNote.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.model.resource;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -20,6 +27,11 @@
  * @author wangpeng
  * @since 2023-07-28
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @ApiModel
 @Data
 @TableName("biz_resource_seal_use_note")
@@ -34,6 +46,7 @@
     /**
      * 登记表编号
      */
+    @ExcelProperty(value = "申请单编号", order = 1)
     @ApiModelProperty(value = "登记表编号(自动生成)", dataType = "String")
     @TableField("note_form_no")
     private String noteFormNo;
@@ -55,6 +68,7 @@
     /**
      * 申请部门
      */
+    @ExcelProperty(value = "申请部门", order = 5)
     @ApiModelProperty(value = "申请部门", dataType = "String")
     @TableField("apply_dept_name")
     private String applyDeptName;
@@ -69,6 +83,7 @@
     /**
      * 申请人
      */
+    @ExcelProperty(value = "申请人", order = 6)
     @ApiModelProperty(value = "申请人", dataType = "String")
     @TableField("apply_user_name")
     private String applyUserName;
@@ -76,6 +91,7 @@
     /**
      * 申请时间
      */
+    @ExcelProperty(value = "申请时间", order = 7)
     @ApiModelProperty(value = "申请时间(新增自动获取当前时间)", dataType = "String")
     @TableField("apply_time")
     private String applyTime;
@@ -130,6 +146,26 @@
     @TableField("update_time")
     private String updateTime;
 
+    @ExcelProperty(value = "印章名称", order = 2)
+    @ApiModelProperty(value = "印章名称(列表返回参数)", dataType = "String")
+    @TableField(exist = false)
+    private String sealName;
+
+    @DictCodeField(message = "印章类型描述不合法", cacheName = MeterDictCode.SEAL_TYPE)
+    @ApiModelProperty(hidden = true)
+    @TableField(exist = false)
+    private String sealType;
+
+    @ExcelProperty(value = "印章类型", order = 3)
+    @ApiModelProperty(value = "印章类型(列表返回参数)", dataType = "String")
+    @TableField(exist = false)
+    private String sealTypeName;
+
+    @ExcelProperty(value = "批准人", order = 4)
+    @ApiModelProperty(value = "批准人(列表返回参数)", dataType = "String")
+    @TableField(exist = false)
+    private String approverName;
+
     @ApiModelProperty(value = "审批状态类型-字典value", dataType = "String")
     @TableField(exist = false)
     private String approvalStatusName;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceStaffInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceStaffInfo.java
index 5ef995b..41563a1 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceStaffInfo.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceStaffInfo.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.model.resource;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -20,6 +27,11 @@
  * @author wangpeng
  * @since 2023-07-25
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @ApiModel
 @Data
 @TableName("biz_resource_staff_info")
@@ -38,6 +50,7 @@
     /**
      * 人员编号
      */
+    @ExcelProperty(value = "人员编号",order = 0)
     @NotEmpty(message = "人员编号不能为空")
     @ApiModelProperty(value = "人员编号", dataType = "String")
     @TableField("staff_no")
@@ -46,6 +59,7 @@
     /**
      * 姓名
      */
+    @ExcelProperty(value = "姓名",order = 1)
     @ApiModelProperty(value = "姓名", dataType = "String")
     @TableField("staff_name")
     private String staffName;
@@ -152,13 +166,15 @@
     /**
      * 部门名字
      */
-    @ApiModelProperty(value = "部门名字", dataType = "String")
+    @ExcelProperty(value = "工作部门",order = 4)
+    @ApiModelProperty(value = "工作部门", dataType = "String")
     @TableField("dept_name")
     private String deptName;
 
     /**
      * 岗位
      */
+    @ExcelProperty(value = "岗位",order = 2)
     @ApiModelProperty(value = "岗位", dataType = "String")
     @TableField("station")
     private String station;
@@ -166,6 +182,7 @@
     /**
      * 计量专业
      */
+    @ExcelProperty(value = "计量专业",order = 5)
     @ApiModelProperty(value = "计量专业", dataType = "String")
     @TableField("major")
     private String major;
@@ -173,6 +190,7 @@
     /**
      * 证号
      */
+    @ExcelProperty(value = "证号",order = 3)
     @ApiModelProperty(value = "证号", dataType = "String")
     @TableField("certificate_number")
     private String certificateNumber;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSupplierInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSupplierInfo.java
index eb5ef01..a1e2697 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSupplierInfo.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSupplierInfo.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.model.resource;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -20,6 +27,11 @@
  * @author wangpeng
  * @since 2023-07-27
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @ApiModel
 @Data
 @TableName("biz_resource_supplier_info")
@@ -34,6 +46,7 @@
     /**
      * 供方编号
      */
+    @ExcelProperty(value = "供方编号", order = 1)
     @ApiModelProperty(value = "供方编号(自动生成)", dataType = "String")
     @TableField("supplier_no")
     private String supplierNo;
@@ -41,6 +54,7 @@
     /**
      * 供方名称
      */
+    @ExcelProperty(value = "供方名称", order = 2)
     @ApiModelProperty(value = "供方名称", dataType = "String")
     @TableField("supplier_name")
     private String supplierName;
@@ -60,6 +74,7 @@
     @TableField("supplier_type")
     private String supplierType;
 
+    @ExcelProperty(value = "供方类型", order = 3)
     @ApiModelProperty(value = "供方类型(字典value)", dataType = "String")
     @TableField(exist = false)
     private String supplierTypeName;
@@ -109,7 +124,8 @@
     /**
      * 电话
      */
-    @ApiModelProperty(value = "电话", dataType = "String")
+    @ExcelProperty(value = "联系电话", order = 4)
+    @ApiModelProperty(value = "联系电话", dataType = "String")
     @TableField("phone")
     private String phone;
 
@@ -158,6 +174,7 @@
     /**
      * 公司地址-省
      */
+    @ExcelProperty(value = "地址-省", order = 6)
     @ApiModelProperty(value = "公司地址-省", dataType = "String")
     @TableField("company_province_name")
     private String companyProvinceName;
@@ -172,6 +189,7 @@
     /**
      * 公司地址-市
      */
+    @ExcelProperty(value = "地址-市", order = 7)
     @ApiModelProperty(value = "公司地址-市", dataType = "String")
     @TableField("company_city_name")
     private String companyCityName;
@@ -186,6 +204,7 @@
     /**
      * 公司地址-区
      */
+    @ExcelProperty(value = "地址-区", order = 8)
     @ApiModelProperty(value = "公司地址-区", dataType = "String")
     @TableField("company_area_name")
     private String companyAreaName;
@@ -193,6 +212,7 @@
     /**
      * 公司地址-详细地址
      */
+    @ExcelProperty(value = "地址-详细地址", order = 9)
     @ApiModelProperty(value = "公司地址-详细地址", dataType = "String")
     @TableField("company_address")
     private String companyAddress;
@@ -200,6 +220,7 @@
     /**
      * 服务和供应的内容
      */
+    @ExcelProperty(value = "服务和供应的内容", order = 5)
     @ApiModelProperty(value = "服务和供应的内容", dataType = "String")
     @TableField("supplier_content")
     private String supplierContent;
@@ -250,6 +271,7 @@
     /**
      * 创建时间
      */
+    @ExcelProperty(value = "创建时间", order = 9)
     @ApiModelProperty(value = "创建时间", dataType = "String")
     @TableField("create_time")
     private String createTime;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/EnvLocationInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/EnvLocationInfo.java
new file mode 100644
index 0000000..d8e2d7b
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/EnvLocationInfo.java
@@ -0,0 +1,83 @@
+package com.casic.missiles.model.resource;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotEmpty;
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 实验室环境监控系统-设备表
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-06-07
+ */
+@ApiModel
+@Data
+@TableName("env_location_info")
+public class EnvLocationInfo implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "主键id", dataType = "Long")
+    @TableId("id")
+    private Long id;
+
+    /**
+     * 地点编号
+     */
+    @NotEmpty(message = "地点编号不能为空")
+    @ApiModelProperty(value = "地点编号", dataType = "String")
+    @TableField("location_no")
+    private String locationNo;
+
+    /**
+     * 地点名称
+     */
+    @ApiModelProperty(value = "地点名称", dataType = "String")
+    @TableField("location_name")
+    private String locationName;
+
+    /**
+     * 地点位置
+     */
+    @ApiModelProperty(value = "地点位置", dataType = "String")
+    @TableField("location_position")
+    private String locationPosition;
+
+    /**
+     * 创建人id
+     */
+    @ApiModelProperty(value = "创建人id", dataType = "Long")
+    @TableField("create_user_id")
+    private Long createUserId;
+
+    /**
+     * 创建人
+     */
+    @ApiModelProperty(value = "创建人", dataType = "String")
+    @TableField("create_user")
+    private String createUser;
+
+    /**
+     * 创建时间
+     */
+    @ApiModelProperty(value = "创建时间", dataType = "String")
+    @TableField("create_time")
+    private String createTime;
+
+    /**
+     * 更新时间
+     */
+    @ApiModelProperty(value = "更新时间", dataType = "String")
+    @TableField("update_time")
+    private String updateTime;
+
+
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemFileConfig.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemFileConfig.java
index 19e6845..86e569c 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemFileConfig.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemFileConfig.java
@@ -30,7 +30,7 @@
     @ApiModelProperty(value = "系统类别(1业务系统2受检系统3环境系统)", dataType = "Integer")
     @NotNull(message = "系统类别不能为空")
     @TableField("system_type")
-    private Integer systemType;
+    private Integer systemType = 1;
 
     @ApiModelProperty("下载编号")
     @TableField("download_no")
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemNotice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemNotice.java
index e94297d..06ec37d 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemNotice.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemNotice.java
@@ -34,7 +34,7 @@
     @ApiModelProperty(value = "系统类别(1业务系统2受检系统3环境系统)", dataType = "Integer")
     @NotNull(message = "系统类别不能为空")
     @TableField("system_type")
-    private Integer systemType;
+    private Integer systemType = 1;
 
     /**
      * 通知公告编号
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSign.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSign.java
index 6c0d7c9..954f4f8 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSign.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSign.java
@@ -51,7 +51,7 @@
     @ApiModelProperty(value = "系统类别(1业务系统2受检系统3环境系统)", dataType = "Integer")
     @NotNull(message = "系统类别不能为空")
     @TableField("system_type")
-    private Integer systemType;
+    private Integer systemType = 1;
 
     /**
      * 签名编号
@@ -130,4 +130,8 @@
     @TableField(exist = false)
     private List<Long> userIdList;
 
+    @ApiModelProperty(hidden = true)
+    @TableField(exist = false)
+    private String deptName;
+
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemTemplate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemTemplate.java
index 503a457..1d27ebe 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemTemplate.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemTemplate.java
@@ -47,7 +47,7 @@
     @ApiModelProperty(value = "系统类别(1业务系统2受检系统3环境系统)", dataType = "Integer")
     @NotNull(message = "系统类别不能为空")
     @TableField("system_type")
-    private Integer systemType;
+    private Integer systemType = 1;
 
     /**
      * 模板编号
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java
index 8c21cb0..f61e4a8 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java
@@ -32,4 +32,8 @@
     ReturnDTO approvalDelete(ApprovalDeleteRequest request);
 
     ReturnDTO failUpdate(T request);
+
+    List<O> listExport(R request);
+
+    List<O> listExportByIds(List<Long> ids);
 }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java
index 724166f..9bce15b 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java
@@ -157,6 +157,29 @@
         throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
     }
 
+    @Override
+    public List<O> listExport(R request) {
+        request.setCreateUserId(null);
+        request.setApprovalStatus(ApprovalStatusEnum.PASSED);
+        Page<O> page = PageFactory.defaultPage();
+        page.setCurrent(1);
+        page.setSearchCount(false);
+        page.setSize(Integer.MAX_VALUE);
+        Page<O> resultPage = this.baseMapper.selectBatchForApprovalList(page, request, null);
+        return resultPage.getRecords();
+    }
+
+    @Override
+    public List<O> listExportByIds(List<Long> ids) {
+        Page<O> page = PageFactory.defaultPage();
+        page.setCurrent(1);
+        page.setSearchCount(false);
+        page.setSize(Integer.MAX_VALUE);
+        List<String> businessKeys = ids.stream().map(String::valueOf).collect(Collectors.toList());
+        Page<O> resultPage = this.baseMapper.selectBatchForApprovalList(page, null, businessKeys);
+        return resultPage.getRecords();
+    }
+
     protected ReturnDTO updateApprovalStatus(Long id, String processId, String approvalStatus) {
         UpdateWrapper<T> updateWrapper = new UpdateWrapper<>();
         updateWrapper.eq("id", id);
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificatePrintServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificatePrintServiceImpl.java
index f6e4706..3228497 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificatePrintServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificatePrintServiceImpl.java
@@ -162,6 +162,30 @@
         return ReturnUtil.success(printLogMapper.selectList(wrapper));
     }
 
+    @Override
+    public List<CertificatePrintListResponse> listByIds(List<Long> ids) {
+        Page<CertificatePrintListResponse> page = PageFactory.defaultPage();
+        page.setCurrent(1);
+        page.setSearchCount(false);
+        page.setSize(Integer.MAX_VALUE);
+        List<String> businessKeys = ids.stream().map(String::valueOf).collect(Collectors.toList());
+        Page<CertificatePrintListResponse> resultPage = this.baseMapper.selectBatchForApprovalList(page, null, businessKeys);
+        return resultPage.getRecords();
+    }
+
+    @Override
+    public List<CertificatePrintListResponse> list(CertificatePrintApprovalListRequest request) {
+        request.setCreateUserId(null);
+        request.setApprovalStatus(null);
+        request.setPrintStatus(null);
+        Page<CertificatePrintListResponse> page = PageFactory.defaultPage();
+        page.setCurrent(1);
+        page.setSearchCount(false);
+        page.setSize(Integer.MAX_VALUE);
+        Page<CertificatePrintListResponse> resultPage = certificatePrintMapper.selectBatchForApprovalList(page, request, null);
+        return resultPage.getRecords();
+    }
+
     private void savePrintLog(Long id) {
         BizBusinessCertificatePrintLog printLog = new BizBusinessCertificatePrintLog();
         BizBusinessCertificatePrint certificatePrint = certificatePrintMapper.selectById(id);
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificateReportServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificateReportServiceImpl.java
index 457555f..24146be 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificateReportServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificateReportServiceImpl.java
@@ -158,8 +158,8 @@
         QueryWrapper<BizBusinessCertificateMeasureResultData> mWrapper = new QueryWrapper<>();
         mWrapper.eq("report_id", reportId);
         boolean mRemove = certificateMeasureResultDataService.remove(mWrapper);
-        Assert.isFalse(eRemove || mRemove, () -> {
+        if(!eRemove || !mRemove){
             throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
-        });
+        }
     }
 }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessIdentifyInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessIdentifyInfoServiceImpl.java
index 4c8e190..f7e63ca 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessIdentifyInfoServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessIdentifyInfoServiceImpl.java
@@ -1,8 +1,10 @@
 package com.casic.missiles.service.Impl.business;
 
+import cn.hutool.core.date.DateUtil;
 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.core.page.PageFactory;
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.business.identify.IdentifyListRequest;
@@ -14,11 +16,14 @@
 import com.casic.missiles.service.business.IBizBusinessIdentifyInfoService;
 import com.casic.missiles.utils.DictCodeUtils;
 import com.casic.missiles.utils.NumberGeneratorUtil;
+import com.casic.missiles.utils.QRCodeUtil;
 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.List;
+
 /**
  * <p>
  * 计量检定业务-任务计量管理-标识打印 服务实现类
@@ -35,9 +40,9 @@
     @Override
     public Page<BizBusinessIdentifyInfo> identifyListPage(Page<BizBusinessIdentifyInfo> page, IdentifyListRequest request) throws Exception {
         QueryWrapper<BizBusinessIdentifyInfo> wrapper = new QueryWrapper<>();
-        wrapper.eq("identify_type", request.getIdentifyType());
-        wrapper.like("device_no", request.getDeviceNo());
-        wrapper.like("device_name", request.getDeviceName());
+        wrapper.eq(StringUtils.isNotEmpty(request.getIdentifyType()), "identify_type", request.getIdentifyType());
+        wrapper.like(StringUtils.isNotEmpty(request.getDeviceNo()),"device_no", request.getDeviceNo());
+        wrapper.like(StringUtils.isNotEmpty(request.getDeviceName()), "device_name", request.getDeviceName());
         wrapper.apply(StringUtils.isNotBlank(request.getCreateTimeStart()),
                 "{0} <= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getCreateTimeStart().split(" ")[0]);
         wrapper.apply(StringUtils.isNotBlank(request.getCreateTimeEnd()),
@@ -64,8 +69,11 @@
     }
 
     @Override
-    public ReturnDTO updateIdentify(BizBusinessIdentifyInfo identifyInfo) {
-        if(identifyInfoMapper.updateById(identifyInfo) > 0){
+    public ReturnDTO updateIdentify(Long id) {
+        BizBusinessIdentifyInfo info = new BizBusinessIdentifyInfo();
+        info.setId(id);
+        info.setUpdateTime(DateUtil.now());
+        if(identifyInfoMapper.updateById(info) > 0){
             return ReturnUtil.success();
         }
         throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
@@ -79,4 +87,20 @@
         throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
     }
 
+    @Override
+    public List<BizBusinessIdentifyInfo> list(IdentifyListRequest request) throws Exception {
+        Page<BizBusinessIdentifyInfo> page = PageFactory.defaultPage();
+        page.setCurrent(1);
+        page.setSearchCount(false);
+        page.setSize(Integer.MAX_VALUE);
+        Page<BizBusinessIdentifyInfo> resultPage = this.identifyListPage(page, request);
+        return resultPage.getRecords();
+    }
+
+    @Override
+    public ReturnDTO<String> equipmentQrCode(Long id) {
+        String base64QRCode = QRCodeUtil.getBase64QRCode(String.valueOf(id));
+        return ReturnUtil.success(base64QRCode);
+    }
+
 }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOrderInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOrderInfoServiceImpl.java
index 82952ad..d8d2c6a 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOrderInfoServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOrderInfoServiceImpl.java
@@ -35,6 +35,7 @@
 import javax.servlet.http.HttpServletResponse;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 import java.util.stream.Collectors;
 
 /**
@@ -209,13 +210,16 @@
     private QueryWrapper<OrderListResponse> listParamWrapperBuilder(OrderListRequest request) {
         QueryWrapper<OrderListResponse> wrapper = new QueryWrapper<>();
         wrapper.like(StringUtils.isNotBlank(request.getOrderNo()), "order_no", request.getOrderNo());
+        wrapper.like(Objects.nonNull(request.getCustomerId()), "customer_id", request.getCustomerId());
         wrapper.like(StringUtils.isNotBlank(request.getCustomerName()), "customer_name", request.getCustomerName());
         wrapper.like(StringUtils.isNotBlank(request.getDeliverer()), "deliverer", request.getDeliverer());
         wrapper.like(StringUtils.isNotBlank(request.getCreateUserName()), "create_user_name", request.getCreateUserName());
-        wrapper.apply(StringUtils.isNotBlank(request.getCreateStartTime()),
-                "{0} <= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getCreateStartTime().split(" ")[0]);
-        wrapper.apply(StringUtils.isNotBlank(request.getCreateEndTime()),
-                "{0} >= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getCreateEndTime().split(" ")[0]);
+        if(StringUtils.isNotBlank(request.getCreateStartTime())){
+            wrapper.apply("{0} <= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getCreateStartTime().split(" ")[0]);
+        }
+        if(StringUtils.isNotBlank(request.getCreateEndTime())){
+            wrapper.apply("{0} >= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getCreateEndTime().split(" ")[0]);
+        }
         wrapper.orderByDesc("create_time");
         return wrapper;
     }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceAssessServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceAssessServiceImpl.java
index c6af980..ce40138 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceAssessServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceAssessServiceImpl.java
@@ -1,10 +1,33 @@
 package com.casic.missiles.service.Impl.business;
 
-import com.casic.missiles.model.business.BizBusinessOutsourceAssess;
+import cn.hutool.core.lang.Assert;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.casic.missiles.core.model.auth.AuthUser;
+import com.casic.missiles.core.shiro.ShiroKit;
+import com.casic.missiles.dto.BaseApprovalSubmitRequest;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.ReturnUtil;
+import com.casic.missiles.dto.business.outsource.OutsourceAssessApprovalListRequest;
+import com.casic.missiles.dto.business.outsource.OutsourceAssessSaveResponse;
+import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.NoGenerateFileCodeEnum;
+import com.casic.missiles.enums.NoGenerateRecordTypeCodeEnum;
+import com.casic.missiles.enums.system.ApprovalStatusEnum;
+import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.mapper.business.BizBusinessOutsourceAssessMapper;
+import com.casic.missiles.model.business.BizBusinessOutsourceAssess;
+import com.casic.missiles.model.business.BizBusinessOutsourceAssessSampleRelation;
+import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl;
+import com.casic.missiles.service.business.IBizBusinessOutsourceAssessSampleRelationService;
 import com.casic.missiles.service.business.IBizBusinessOutsourceAssessService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.casic.missiles.utils.NoGeneratorUtil;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Objects;
 
 /**
  * <p>
@@ -15,6 +38,103 @@
  * @since 2023-08-16
  */
 @Service
-public class BizBusinessOutsourceAssessServiceImpl extends ServiceImpl<BizBusinessOutsourceAssessMapper, BizBusinessOutsourceAssess> implements IBizBusinessOutsourceAssessService {
+public class BizBusinessOutsourceAssessServiceImpl extends GeneralApprovalServiceImpl<BizBusinessOutsourceAssessMapper, BizBusinessOutsourceAssess, BizBusinessOutsourceAssess, OutsourceAssessApprovalListRequest, BaseApprovalSubmitRequest> implements IBizBusinessOutsourceAssessService {
+    @Autowired
+    private IBizBusinessOutsourceAssessSampleRelationService outsourceAssessSampleRelationService;
 
+    @Override
+    public ReturnDTO<OutsourceAssessSaveResponse> saveOutsourceAssess(BizBusinessOutsourceAssess request) {
+        //生成编号
+        String labCode = request.getLabCode();
+        String groupCode = request.getGroupCode();
+        Long maxNo = this.baseMapper.selectMaxProjectNo();
+        String projectNo = NoGeneratorUtil.getCode(NoGenerateFileCodeEnum.D, labCode, NoGenerateRecordTypeCodeEnum.OUTSOURCE_ACCESS, groupCode, maxNo);
+        request.setCreateUserId(request.getUserId());
+        request.setCreateUserName(request.getUserName());
+        request.setApprovalStatus(ApprovalStatusEnum.DRAFT); //草稿箱状态
+        request.setProjectNo(projectNo);
+        int row = this.baseMapper.insert(request);
+        Assert.isFalse(row <= 0, () -> {
+            throw new BusinessException(BusinessExceptionEnum.OUTSOURCE_ACCESS_SAVE_FAILED);
+        });
+        //关联表
+        saveRelationData(request);
+        OutsourceAssessSaveResponse saveResponse = new OutsourceAssessSaveResponse();
+        saveResponse.setId(request.getId());
+        saveResponse.setProjectNo(projectNo);
+        return ReturnUtil.success(saveResponse);
+    }
+
+    @Override
+    @Transactional
+    public ReturnDTO draftUpdate(BizBusinessOutsourceAssess request) {
+        if (this.baseMapper.updateById(request) > 0) {
+            //关联表删除、增加
+            removeRelationData(request.getId());
+            saveRelationData(request);
+            return ReturnUtil.success();
+        }
+        throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
+    }
+
+    @Override
+    public ReturnDTO draftDelete(Long id) {
+        if (this.baseMapper.deleteById(id) > 0) {
+            //关联表删除
+            removeRelationData(id);
+            return ReturnUtil.success();
+        }
+        throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
+    }
+
+    @Override
+    public ReturnDTO draftBatchDelete(List<Long> ids) {
+        if (this.baseMapper.deleteBatchIds(ids) >= 0) {
+            ids.forEach(id -> removeRelationData(id));
+            return ReturnUtil.success();
+        }
+        throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
+    }
+
+    @Override
+    @Transactional
+    public ReturnDTO failUpdate(BizBusinessOutsourceAssess request) {
+        AuthUser user = ShiroKit.getUser();
+        Assert.isFalse(Objects.isNull(user), () -> {
+            throw new BusinessException(BusinessExceptionEnum.LOGIN_USER_ACQUIRE_FAILED);
+        });
+        request.setApprovalStatus(ApprovalStatusEnum.IN_APPROVED);
+        if (this.baseMapper.updateById(request) > 0) {
+            //关联表删除、增加
+            removeRelationData(request.getId());
+            saveRelationData(request);
+            baseApprovalService.failUpdate(request.getProcessId());
+            return ReturnUtil.success();
+        }
+        throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
+    }
+
+    private void saveRelationData(BizBusinessOutsourceAssess request) {
+        List<BizBusinessOutsourceAssessSampleRelation> sampleRelations = new ArrayList<>();
+        request.getOrderSampleList().forEach(dto -> {
+            BizBusinessOutsourceAssessSampleRelation relation = new BizBusinessOutsourceAssessSampleRelation();
+            relation.setOrderId(dto.getOrderId());
+            relation.setSampleId(dto.getSampleId());
+            relation.setAccessId(request.getId());
+            sampleRelations.add(relation);
+        });
+        if(outsourceAssessSampleRelationService.saveBatch(sampleRelations)){
+            return;
+        }
+        throw new BusinessException(BusinessExceptionEnum.OUTSOURCE_ACCESS_SAVE_FAILED);
+    }
+
+    private void removeRelationData(Long assessId) {
+        QueryWrapper<BizBusinessOutsourceAssessSampleRelation> wrapper = new QueryWrapper<>();
+        wrapper.eq("access_id", assessId);
+        if(outsourceAssessSampleRelationService.remove(wrapper)){
+            return;
+        }
+        throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
+    }
 }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceProtocolServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceProtocolServiceImpl.java
new file mode 100644
index 0000000..821e728
--- /dev/null
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceProtocolServiceImpl.java
@@ -0,0 +1,60 @@
+package com.casic.missiles.service.Impl.business;
+
+import cn.hutool.core.lang.Assert;
+import com.casic.missiles.dto.BaseApprovalSubmitRequest;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.ReturnUtil;
+import com.casic.missiles.dto.business.outsource.OutsourceProtocolApprovalListRequest;
+import com.casic.missiles.dto.business.outsource.OutsourceProtocolSaveResponse;
+import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.NoGenerateFileCodeEnum;
+import com.casic.missiles.enums.NoGenerateRecordTypeCodeEnum;
+import com.casic.missiles.enums.system.ApprovalStatusEnum;
+import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.mapper.business.BizBusinessOutsourceProtocolMapper;
+import com.casic.missiles.mapper.business.BizBusinessOutsourcerInfoMapper;
+import com.casic.missiles.model.business.BizBusinessOutsourceProtocol;
+import com.casic.missiles.model.business.BizBusinessOutsourcerInfo;
+import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl;
+import com.casic.missiles.service.business.IBizBusinessOutsourceProtocolService;
+import com.casic.missiles.utils.NoGeneratorUtil;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 计量检定业务-分包管理-测试、校准或检定工作分包协议书 服务实现类
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-08-24
+ */
+@Service
+public class BizBusinessOutsourceProtocolServiceImpl extends GeneralApprovalServiceImpl<BizBusinessOutsourceProtocolMapper, BizBusinessOutsourceProtocol, BizBusinessOutsourceProtocol, OutsourceProtocolApprovalListRequest, BaseApprovalSubmitRequest> implements IBizBusinessOutsourceProtocolService {
+    @Autowired
+    private BizBusinessOutsourcerInfoMapper outsourcerInfoMapper;
+
+    @Override
+    public ReturnDTO<OutsourceProtocolSaveResponse> saveOutsourceProtocol(BizBusinessOutsourceProtocol request) {
+        //生成编号
+        String labCode = request.getLabCode();
+        String groupCode = request.getGroupCode();
+        Long maxNo = this.baseMapper.selectMaxProtocolNo();
+        String protocolNo = NoGeneratorUtil.getCode(NoGenerateFileCodeEnum.D, labCode, NoGenerateRecordTypeCodeEnum.OUTSOURCE_PROTOCOL, groupCode, maxNo);
+        request.setCreateUserId(request.getUserId());
+        request.setCreateUserName(request.getUserName());
+        request.setApprovalStatus(ApprovalStatusEnum.DRAFT); //草稿箱状态
+        request.setProtocolNo(protocolNo);
+        BizBusinessOutsourcerInfo outsourcerInfo = outsourcerInfoMapper.selectById(request.getOutsourcerId());
+        request.setOutsourceNo(outsourcerInfo.getOutsourcerNo());
+        request.setOutsourceName(outsourcerInfo.getOutsourcerName());
+        int row = this.baseMapper.insert(request);
+        Assert.isFalse(row <= 0, () -> {
+            throw new BusinessException(BusinessExceptionEnum.OUTSOURCE_PROTOCOL_SAVE_FAILED);
+        });
+        OutsourceProtocolSaveResponse saveResponse = new OutsourceProtocolSaveResponse();
+        saveResponse.setId(request.getId());
+        saveResponse.setProtocolNo(protocolNo);
+        return ReturnUtil.success(saveResponse);
+    }
+}
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourcerInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourcerInfoServiceImpl.java
index 75f639d..8aadad7 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourcerInfoServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourcerInfoServiceImpl.java
@@ -3,12 +3,12 @@
 import cn.hutool.core.lang.Assert;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.dto.*;
 import com.casic.missiles.dto.business.outsource.OutsourcerInfoApprovalListRequest;
 import com.casic.missiles.dto.business.outsource.OutsourcerSaveResponse;
 import com.casic.missiles.enums.BusinessExceptionEnum;
-import com.casic.missiles.enums.PrefixCodeEnum;
+import com.casic.missiles.enums.NoGenerateFileCodeEnum;
+import com.casic.missiles.enums.NoGenerateRecordTypeCodeEnum;
 import com.casic.missiles.enums.system.ApprovalStatusEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.mapper.business.BizBusinessOutsourcerInfoMapper;
@@ -20,7 +20,7 @@
 import com.casic.missiles.service.business.IBizBusinessOutsourcerInfoService;
 import com.casic.missiles.service.business.IBizBusinessOutsourcerUserInfoService;
 import com.casic.missiles.utils.DictCodeUtils;
-import com.casic.missiles.utils.NumberGeneratorUtil;
+import com.casic.missiles.utils.NoGeneratorUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -42,22 +42,12 @@
     private IBizBusinessOutsourcerUserInfoService outsourcerUserInfoService;
 
     @Override
-    public List<BizBusinessOutsourcerInfo> list(OutsourcerInfoApprovalListRequest request) {
-        request.setCreateUserId(null);
-        request.setApprovalStatus(ApprovalStatusEnum.PASSED);
-        Page<BizBusinessOutsourcerInfo> page = PageFactory.defaultPage();
-        page.setCurrent(1);
-        page.setSearchCount(false);
-        page.setSize(Integer.MAX_VALUE);
-        Page<BizBusinessOutsourcerInfo> resultPage = this.baseMapper.selectBatchForApprovalList(page, request, null);
-        return resultPage.getRecords();
-    }
-
-    @Override
     public ReturnDTO<OutsourcerSaveResponse> saveOutsourcer(BizBusinessOutsourcerInfo request) {
         //生成编号
+        String labCode = request.getLabCode();
+        String groupCode = request.getGroupCode();
         Long maxNo = this.baseMapper.selectMaxNo();
-        String outsourcerNo = NumberGeneratorUtil.getContactNo(PrefixCodeEnum.OUTSOURCER_PREFIX, maxNo);
+        String outsourcerNo = NoGeneratorUtil.getCode(NoGenerateFileCodeEnum.D, labCode, NoGenerateRecordTypeCodeEnum.OUTSOURCE_INFO, groupCode, maxNo);
         request.setOutsourcerNo(outsourcerNo);
         request.setCreateUserId(request.getUserId());
         request.setCreateUserName(request.getUserName());
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessSiteExecutiveInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessSiteExecutiveInfoServiceImpl.java
index ebab3e6..6c6a129 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessSiteExecutiveInfoServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessSiteExecutiveInfoServiceImpl.java
@@ -189,9 +189,9 @@
         QueryWrapper<BizBusinessSiteExecutiveStaffRelation> mWrapper = new QueryWrapper<>();
         mWrapper.eq("site_executive_id", siteExecutiveId);
         boolean mRemove = siteExecutiveStaffRelationService.remove(mWrapper);
-        Assert.isFalse(eRemove || mRemove, () -> {
+        if(!eRemove || !mRemove){
             throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
-        });
+        }
     }
 
     private void doPopulateSiteExecutive(SiteExecutiveDetailResponse detailResponse) {
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessLabExecutiveInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessLabExecutiveInfoServiceImpl.java
index 50c5616..0242fcf 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessLabExecutiveInfoServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessLabExecutiveInfoServiceImpl.java
@@ -297,6 +297,29 @@
     }
 
     @Override
+    public List<SampleLabExecutiveListResponse> deptLabExecutiveList(SampleLabExecutiveListRequest request) throws Exception {
+        Page<SampleLabExecutiveListResponse> page = PageFactory.defaultPage();
+        page.setCurrent(1);
+        page.setSearchCount(false);
+        page.setSize(Integer.MAX_VALUE);
+        Page<SampleLabExecutiveListResponse> resultPage = this.deptLabExecutiveListPage(page, request);
+        return resultPage.getRecords();
+    }
+
+    @Override
+    public List<SampleLabExecutiveListResponse> deptLabExecutiveListByIds(String measureStatus, List<Long> ids) throws Exception {
+        Page<SampleLabExecutiveListResponse> page = PageFactory.defaultPage();
+        page.setCurrent(1);
+        page.setSearchCount(false);
+        page.setSize(Integer.MAX_VALUE);
+        SampleLabExecutiveListRequest request = new SampleLabExecutiveListRequest();
+        request.setIds(ids);
+        request.setMeasureStatus(measureStatus);
+        Page<SampleLabExecutiveListResponse> resultPage = this.deptLabExecutiveListPage(page, request);
+        return resultPage.getRecords();
+    }
+
+    @Override
     public Page<SampleLabExecutiveListResponse> myLabExecutiveListPage(Page<SampleLabExecutiveListResponse> page, SampleLabExecutiveListRequest labExecutiveListRequest) throws Exception{
         AuthUser user = ShiroKit.getUser();
         Assert.isFalse(Objects.isNull(user), () -> {
@@ -350,6 +373,29 @@
     }
 
     @Override
+    public List<SampleLabExecutiveListResponse> myLabExecutiveList(SampleLabExecutiveListRequest request) throws Exception {
+        Page<SampleLabExecutiveListResponse> page = PageFactory.defaultPage();
+        page.setCurrent(1);
+        page.setSearchCount(false);
+        page.setSize(Integer.MAX_VALUE);
+        Page<SampleLabExecutiveListResponse> resultPage = this.myLabExecutiveListPage(page, request);
+        return resultPage.getRecords();
+    }
+
+    @Override
+    public List<SampleLabExecutiveListResponse> myLabExecutiveListByIds(String measureStatus, List<Long> ids) throws Exception {
+        Page<SampleLabExecutiveListResponse> page = PageFactory.defaultPage();
+        page.setCurrent(1);
+        page.setSearchCount(false);
+        page.setSize(Integer.MAX_VALUE);
+        SampleLabExecutiveListRequest request = new SampleLabExecutiveListRequest();
+        request.setIds(ids);
+        request.setMeasureStatus(measureStatus);
+        Page<SampleLabExecutiveListResponse> resultPage = this.myLabExecutiveListPage(page, request);
+        return resultPage.getRecords();
+    }
+
+    @Override
     public List<SampleAmountResponse> myExecutiveAmount() {
         //登录用户id获取计量人员id，实验室检测信息中存储的是计量人员id
         AuthUser user = ShiroKit.getUser();
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentInfoServiceImpl.java
index 864b05e..db8cad4 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentInfoServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentInfoServiceImpl.java
@@ -35,7 +35,6 @@
 import com.casic.missiles.utils.ConvertUtils;
 import com.casic.missiles.utils.DictCodeUtils;
 import com.casic.missiles.utils.NumberGeneratorUtil;
-import org.flowable.engine.RuntimeService;
 import org.flowable.engine.runtime.ProcessInstance;
 import org.jetbrains.annotations.NotNull;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -43,7 +42,6 @@
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
 
-import javax.annotation.Resource;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
@@ -81,8 +79,6 @@
     private IBizEquipmentAttachmentService attachmentService;
     @Autowired
     private IBizEquipmentCheckpointService checkpointService;
-    @Resource
-    private RuntimeService runtimeService;
     @Autowired
     private ApprovalOperateService approvalOperateService;
 
@@ -235,18 +231,18 @@
     private void updateRelationInfo(EquipmentAddRequest request, BizEquipmentInfoApproval equipmentInfoApproval) {
         QueryWrapper<BizEquipmentTechnicalTarget> targetWrapper = new QueryWrapper<>();
         targetWrapper.eq("equipment_no", equipmentInfoApproval.getEquipmentNo());
-        boolean removeTargetFlag = technicalTargetService.remove(targetWrapper);
-        boolean saveTargetFlag = technicalTargetService.saveBatch(request.getTechnicalTargetList());
+        technicalTargetService.remove(targetWrapper);
+        technicalTargetService.saveBatch(request.getTechnicalTargetList());
 
         QueryWrapper<BizEquipmentAttachment> attachmentWrapper = new QueryWrapper<>();
         attachmentWrapper.eq("equipment_no", equipmentInfoApproval.getEquipmentNo());
-        boolean removeAttachmentFlag = attachmentService.remove(attachmentWrapper);
-        boolean saveAttachmentFlag = attachmentService.saveBatch(request.getAttachmentList());
+        attachmentService.remove(attachmentWrapper);
+        attachmentService.saveBatch(request.getAttachmentList());
 
         QueryWrapper<BizEquipmentCheckpoint> checkpointWrapper = new QueryWrapper<>();
         checkpointWrapper.eq("equipment_no", equipmentInfoApproval.getEquipmentNo());
-        boolean removeCheckpointFlag = checkpointService.remove(checkpointWrapper);
-        boolean saveCheckpointFlag = checkpointService.saveBatch(request.getCheckpointList());
+        checkpointService.remove(checkpointWrapper);
+        checkpointService.saveBatch(request.getCheckpointList());
     }
 
     @Override
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardInfoServiceImpl.java
index faff1ae..c50a5b3 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardInfoServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardInfoServiceImpl.java
@@ -22,7 +22,9 @@
 import com.casic.missiles.mapper.equipment.BizEquipmentStandardInfoMapper;
 import com.casic.missiles.mapper.equipment.BizEquipmentStandardTechnologyRelationMapper;
 import com.casic.missiles.mapper.resource.BizResourceStaffInfoMapper;
-import com.casic.missiles.model.equipment.*;
+import com.casic.missiles.model.equipment.BizEquipmentStandardInfo;
+import com.casic.missiles.model.equipment.BizEquipmentStandardInfoApproval;
+import com.casic.missiles.model.equipment.BizEquipmentStandardTechnologyRelation;
 import com.casic.missiles.model.resource.BizResourceStaffInfo;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.dao.DeptMapper;
@@ -33,14 +35,12 @@
 import com.casic.missiles.service.flowable.ApprovalOperateService;
 import com.casic.missiles.utils.ConvertUtils;
 import com.casic.missiles.utils.DictCodeUtils;
-import org.flowable.engine.RuntimeService;
 import org.flowable.engine.runtime.ProcessInstance;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
 
-import javax.annotation.Resource;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
@@ -62,8 +62,6 @@
     private BizResourceStaffInfoMapper staffInfoMapper;
     @Autowired
     private IBaseApprovalService baseApprovalService;
-    @Resource
-    private RuntimeService runtimeService;
     @Autowired
     private ApprovalOperateService approvalOperateService;
     @Autowired
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSealInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSealInfoServiceImpl.java
index 7c91fa2..00040d6 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSealInfoServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSealInfoServiceImpl.java
@@ -15,6 +15,7 @@
 import com.casic.missiles.modular.system.model.User;
 import com.casic.missiles.service.resource.IBizResourceSealInfoService;
 import com.casic.missiles.utils.DictCodeUtils;
+import com.casic.missiles.utils.MinioUtil;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -33,6 +34,8 @@
     private BizResourceSealInfoMapper sealInfoMapper;
     @Autowired
     private UserMapper userMapper;
+    @Autowired
+    private MinioUtil minioUtil;
 
     @Override
     public Page<BizResourceSealInfo> listPage(Page<BizResourceSealInfo> page, SealInfoListRequest request) throws Exception {
@@ -44,6 +47,7 @@
         Page<BizResourceSealInfo> sealInfoPage = sealInfoMapper.selectPage(page, wrapper);
         for (BizResourceSealInfo record : sealInfoPage.getRecords()) {
             DictCodeUtils.convertDictCodeToName(record);
+            record.setMinioFileUrl(minioUtil.getFileUrl(record.getMinioFileName()));
         }
         return sealInfoPage;
     }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceStaffInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceStaffInfoServiceImpl.java
index f058cf5..09203ac 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceStaffInfoServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceStaffInfoServiceImpl.java
@@ -3,6 +3,7 @@
 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.core.page.PageFactory;
 import com.casic.missiles.dto.IdDTO;
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
@@ -86,6 +87,13 @@
     }
 
     @Override
+    public List<BizResourceStaffInfo> list(StaffListRequest request) throws Exception {
+        Page<BizResourceStaffInfo> page = PageFactory.defaultPage();
+        Page<BizResourceStaffInfo> staffInfoPage = this.listPage(page, request);
+        return staffInfoPage.getRecords();
+    }
+
+    @Override
     @Transactional
     public ReturnDTO<IdDTO> staffBaseAdd(BizResourceStaffInfo staffInfo) {
         //登录账号查重
@@ -495,6 +503,28 @@
         return certResponsePage;
     }
 
+    @Override
+    public List<StaffCertResponse> certListByIds(List<Long> ids) throws Exception {
+        Page<StaffCertResponse> page = PageFactory.defaultPage();
+        page.setCurrent(1);
+        page.setSearchCount(false);
+        page.setSize(Integer.MAX_VALUE);
+        StaffCertRequest request = new StaffCertRequest();
+        request.setIds(ids);
+        Page<StaffCertResponse> resultPage = this.certListPage(page, request);
+        return resultPage.getRecords();
+    }
+
+    @Override
+    public List<StaffCertResponse> certList(StaffCertRequest request) throws Exception {
+        Page<StaffCertResponse> page = PageFactory.defaultPage();
+        page.setCurrent(1);
+        page.setSearchCount(false);
+        page.setSize(Integer.MAX_VALUE);
+        Page<StaffCertResponse> resultPage = this.certListPage(page, request);
+        return resultPage.getRecords();
+    }
+
     @Async
     public void deleteRelationInfo(Long staffId){
         QueryWrapper<BizResourceStaffEducation> educationWrapper = new QueryWrapper<>();
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceStaffVerifierServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceStaffVerifierServiceImpl.java
index 8ac7eee..b508d45 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceStaffVerifierServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceStaffVerifierServiceImpl.java
@@ -52,8 +52,8 @@
     private WebSocket webSocket;
 
     @Override
-    public ReturnDTO expirationReminder(IdDTO idDto) {
-        BizResourceStaffVerifier staffVerifier = verifierMapper.selectById(idDto.getId());
+    public ReturnDTO expirationReminder(IdDTO idDTO) {
+        BizResourceStaffVerifier staffVerifier = verifierMapper.selectById(idDTO.getId());
         BizResourceStaffInfo staffInfo = staffInfoMapper.selectById(staffVerifier.getStaffId());
         QueryWrapper<User> wrapper = new QueryWrapper<>();
         wrapper.eq("account", staffInfo.getAccount());
@@ -65,7 +65,7 @@
         Assert.isFalse(Objects.isNull(user), () -> {
             throw new BusinessException(BusinessExceptionEnum.LOGIN_USER_ACQUIRE_FAILED);
         });
-        WorkbenchRemindMessage remindMessage = new WorkbenchRemindMessage(userInfo.getId(), userInfo.getDeptId(), idDto.getId(), staffVerifier.getCertNo(), MessageTypeEnum.STAFF_CERT.getCode(), MessageSourceModuleEnum.RESOURCE.getCode(), MessageTypeEnum.STAFF_CERT.getValue(), MessageTypeEnum.STAFF_CERT.getValue(), staffVerifier.getCertName(),0, user.getId(), user.getName());
+        WorkbenchRemindMessage remindMessage = new WorkbenchRemindMessage(userInfo.getId(), userInfo.getDeptId(), idDTO.getId(), staffVerifier.getCertNo(), MessageTypeEnum.STAFF_CERT.getCode(), MessageSourceModuleEnum.RESOURCE.getCode(), MessageTypeEnum.STAFF_CERT.getValue(), MessageTypeEnum.STAFF_CERT.getValue(), staffVerifier.getCertName(),0, user.getId(), user.getName());
         if(messageMapper.insert(remindMessage) > 0){
             // 新增到消息列表后向用户推送消息
             webSocket.sendOneMessage(String.valueOf(userInfo.getId()), JSONObject.toJSONString(remindMessage));
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceTrainInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceTrainInfoServiceImpl.java
index c1d6308..3a533f2 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceTrainInfoServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceTrainInfoServiceImpl.java
@@ -44,11 +44,14 @@
     @Override
     public Page<BizResourceTrainInfo> listPage(Page<BizResourceTrainInfo> page, TrainListRequest request) throws Exception {
         QueryWrapper<BizResourceTrainInfo> wrapper = new QueryWrapper<>();
-        wrapper.like("train_no", request.getTrainNo());
-        wrapper.apply(StringUtils.isNotBlank(request.getCreateTimeStart()),//apply方法传入参数名不能为空
-                "{0} <= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getCreateTimeStart().split(" ")[0]);
-        wrapper.apply(StringUtils.isNotBlank(request.getCreateTimeEnd()),
-                "{0} >= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getCreateTimeEnd().split(" ")[0]);
+        wrapper.like(StringUtils.isNotEmpty(request.getTrainNo()), "train_no", request.getTrainNo());
+        wrapper.like(StringUtils.isNotEmpty(request.getDutyLeader()),"duty_leader", request.getDutyLeader());
+        if(StringUtils.isNotBlank(request.getCreateTimeStart())){
+            wrapper.apply("{0} <= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getCreateTimeStart().split(" ")[0]);
+        }
+        if(StringUtils.isNotBlank(request.getCreateTimeEnd())){
+            wrapper.apply("{0} >= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getCreateTimeEnd().split(" ")[0]);
+        }
         wrapper.orderByDesc("create_time");
         Page<BizResourceTrainInfo> trainInfoPage = trainInfoMapper.selectPage(page, wrapper);
         for (BizResourceTrainInfo record : trainInfoPage.getRecords()) {
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/EnvLocationInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/EnvLocationInfoServiceImpl.java
new file mode 100644
index 0000000..cdc5742
--- /dev/null
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/EnvLocationInfoServiceImpl.java
@@ -0,0 +1,31 @@
+package com.casic.missiles.service.Impl.resource;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.casic.missiles.dto.resource.environment.LocationListRequest;
+import com.casic.missiles.dto.resource.environment.LocationListResponse;
+import com.casic.missiles.mapper.resource.EnvLocationInfoMapper;
+import com.casic.missiles.model.resource.EnvLocationInfo;
+import com.casic.missiles.service.resource.IEnvLocationInfoService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 实验室环境监控系统-设备表 服务实现类
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-06-07
+ */
+@Service
+public class EnvLocationInfoServiceImpl extends ServiceImpl<EnvLocationInfoMapper, EnvLocationInfo> implements IEnvLocationInfoService {
+    @Autowired
+    private EnvLocationInfoMapper locationInfoMapper;
+
+    @Override
+    public Page<LocationListResponse> listPage(Page<LocationListResponse> page, LocationListRequest request) {
+        Page<LocationListResponse> resultPage = locationInfoMapper.selectLocationListPage(page, request);
+        return resultPage;
+    }
+}
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/DownloadCenterServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/DownloadCenterServiceImpl.java
index c956d24..d9f3282 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/DownloadCenterServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/DownloadCenterServiceImpl.java
@@ -131,10 +131,12 @@
         wrapper.like(StringUtils.isNotBlank(request.getModuleName()), "module_name", request.getModuleName());
         wrapper.like(StringUtils.isNotBlank(request.getFileName()), "file_name", request.getFileName());
         wrapper.like(StringUtils.isNotBlank(request.getFileType()), "file_type", request.getFileType());
-        wrapper.apply(StringUtils.isNotBlank(request.getStartTime()),
-                "{0} <= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getStartTime().split(" ")[0]);
-        wrapper.apply(StringUtils.isNotBlank(request.getEndTime()),
-                "{0} >= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getEndTime().split(" ")[0]);
+        if(StringUtils.isNotBlank(request.getStartTime())){
+            wrapper.apply("{0} <= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getStartTime().split(" ")[0]);
+        }
+        if(StringUtils.isNotBlank(request.getEndTime())){
+            wrapper.apply("{0} >= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getEndTime().split(" ")[0]);
+        }
         wrapper.orderByDesc("create_time");
         return wrapper;
     }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemSignServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemSignServiceImpl.java
index 41976bb..7e90a09 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemSignServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemSignServiceImpl.java
@@ -52,15 +52,14 @@
 
     @Override
     public Page<SystemSign> listPage(Page<SystemSign> page, SignListRequest request) {
-        QueryWrapper<SystemSign> wrapper = getWrapper(request);
-        Page<SystemSign> signPage = signMapper.selectPage(page, wrapper);
+        Page<SystemSign> signPage = signMapper.selectSignListPage(page, request);
         return signPage;
     }
 
     @Override
     public List<SystemSign> list(SignListRequest request) {
-        QueryWrapper<SystemSign> wrapper = getWrapper(request);
-        return signMapper.selectList(wrapper);
+        List<SystemSign> signList = signMapper.selectSignList(request);
+        return signList;
     }
 
     @Override
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessCertificatePrintService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessCertificatePrintService.java
index 03247ab..7d6db77 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessCertificatePrintService.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessCertificatePrintService.java
@@ -9,6 +9,8 @@
 import com.casic.missiles.model.business.BizBusinessCertificatePrintLog;
 import com.casic.missiles.model.business.BizBusinessCertificateReport;
 
+import java.util.List;
+
 /**
  * <p>
  * 计量检定业务-任务计量管理-证书管理 服务类
@@ -30,4 +32,9 @@
     ReturnDTO certificatePrintStatus(Long id, String printStatus);
 
     ReturnDTO<BizBusinessCertificatePrintLog> certificatePrintLog(Long id);
+
+    List<CertificatePrintListResponse> listByIds(List<Long> ids);
+
+    List<CertificatePrintListResponse> list(CertificatePrintApprovalListRequest request);
+
 }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessCertificateReportService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessCertificateReportService.java
index 305ac7f..b33ef22 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessCertificateReportService.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessCertificateReportService.java
@@ -21,6 +21,4 @@
     ReturnDTO<CertificateReportSaveResponse> saveCertificateReport(BizBusinessCertificateReport request);
 
     ReturnDTO<BizBusinessCertificateReport> detail(BaseDetailRequest request);
-
-
 }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessIdentifyInfoService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessIdentifyInfoService.java
index 53c49d0..6d2089f 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessIdentifyInfoService.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessIdentifyInfoService.java
@@ -6,6 +6,8 @@
 import com.casic.missiles.model.business.BizBusinessIdentifyInfo;
 import com.baomidou.mybatisplus.extension.service.IService;
 
+import java.util.List;
+
 /**
  * <p>
  * 计量检定业务-任务计量管理-标识打印 服务类
@@ -20,7 +22,11 @@
 
     ReturnDTO addIdentify(BizBusinessIdentifyInfo identifyInfo);
 
-    ReturnDTO updateIdentify(BizBusinessIdentifyInfo identifyInfo);
+    ReturnDTO updateIdentify(Long id);
 
     ReturnDTO deleteIdentify(Long id);
+
+    List<BizBusinessIdentifyInfo> list(IdentifyListRequest request) throws Exception;
+
+    ReturnDTO<String> equipmentQrCode(Long id);
 }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessOutsourceAssessService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessOutsourceAssessService.java
index 5e15bc8..bcdc791 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessOutsourceAssessService.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessOutsourceAssessService.java
@@ -1,7 +1,11 @@
 package com.casic.missiles.service.business;
 
+import com.casic.missiles.dto.BaseApprovalSubmitRequest;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.business.outsource.OutsourceAssessApprovalListRequest;
+import com.casic.missiles.dto.business.outsource.OutsourceAssessSaveResponse;
 import com.casic.missiles.model.business.BizBusinessOutsourceAssess;
-import com.baomidou.mybatisplus.extension.service.IService;
+import com.casic.missiles.service.IGeneralApprovalService;
 
 /**
  * <p>
@@ -11,6 +15,7 @@
  * @author wangpeng
  * @since 2023-08-16
  */
-public interface IBizBusinessOutsourceAssessService extends IService<BizBusinessOutsourceAssess> {
+public interface IBizBusinessOutsourceAssessService extends IGeneralApprovalService<BizBusinessOutsourceAssess, BizBusinessOutsourceAssess, OutsourceAssessApprovalListRequest, BaseApprovalSubmitRequest> {
 
+    ReturnDTO<OutsourceAssessSaveResponse> saveOutsourceAssess(BizBusinessOutsourceAssess request);
 }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessOutsourceProtocolService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessOutsourceProtocolService.java
new file mode 100644
index 0000000..7f3092b
--- /dev/null
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessOutsourceProtocolService.java
@@ -0,0 +1,21 @@
+package com.casic.missiles.service.business;
+
+import com.casic.missiles.dto.BaseApprovalSubmitRequest;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.business.outsource.OutsourceProtocolApprovalListRequest;
+import com.casic.missiles.dto.business.outsource.OutsourceProtocolSaveResponse;
+import com.casic.missiles.model.business.BizBusinessOutsourceProtocol;
+import com.casic.missiles.service.IGeneralApprovalService;
+
+/**
+ * <p>
+ * 计量检定业务-分包管理-测试、校准或检定工作分包协议书 服务类
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-08-24
+ */
+public interface IBizBusinessOutsourceProtocolService extends IGeneralApprovalService<BizBusinessOutsourceProtocol, BizBusinessOutsourceProtocol, OutsourceProtocolApprovalListRequest, BaseApprovalSubmitRequest> {
+
+    ReturnDTO<OutsourceProtocolSaveResponse> saveOutsourceProtocol(BizBusinessOutsourceProtocol request);
+}

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java
index bb0c50f..13a699b 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java
@@ -12,6 +12,7 @@
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.IGeneralApprovalService;
+import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
@@ -19,6 +20,7 @@
 import org.springframework.web.bind.annotation.RequestBody;
 
 import javax.validation.Valid;
+import java.util.List;
 import java.util.Objects;
 
 /**
@@ -117,4 +119,17 @@
         }
         return baseApprovalService.failUpdate(request);
     }
+
+    public List<O> exportList(@RequestBody @Valid R request) throws Exception {
+        List<O> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = baseApprovalService.listExportByIds(request.getIds());
+        } else {
+            list = baseApprovalService.listExport(request);
+        }
+        for (O record : list) {
+            DictCodeUtils.convertDictCodeToName(record);
+        }
+        return list;
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java
index 8a90961..d775831 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java
@@ -5,6 +5,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.business.certificate.CertificateChangeApplyApprovalListRequest;
 import com.casic.missiles.dto.business.certificate.CertificateChangeApplySaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessCertificateChangeApply;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
@@ -20,6 +21,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -48,4 +50,12 @@
         }
         return changeApplyService.saveChangeApply(request);
     }
+
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody CertificateChangeApplyApprovalListRequest request) throws Exception {
+        List<BizBusinessCertificateChangeApply> list = super.exportList(request);
+        super.exportExcel(BizBusinessCertificateChangeApply.class, list, ExportEnum.CERTIFICATE_CHANGE_APPLY.getSheetName());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java
index 5fc4b07..af8230e 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java
@@ -9,6 +9,7 @@
 import com.casic.missiles.dto.business.certificate.CertificatePrintApprovalListRequest;
 import com.casic.missiles.dto.business.certificate.CertificatePrintListResponse;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.enums.business.CertificatePrintStatusEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessCertificatePrintLog;
@@ -18,10 +19,16 @@
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.io.IOException;
+import java.util.List;
 import java.util.Objects;
 
 /**
@@ -98,4 +105,16 @@
         });
         return certificatePrintService.certificatePrintLog(idDTO.getId());
     }
+
+    @ApiOperation("证书打印审批导出")
+    @PostMapping("/listExport")
+    public void exportList(@RequestBody CertificatePrintApprovalListRequest request) throws IOException {
+        List<CertificatePrintListResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = certificatePrintService.listByIds(request.getIds());
+        } else {
+            list = certificatePrintService.list(request);
+        }
+        super.exportExcel(CertificatePrintListResponse.class, list, ExportEnum.CERTIFICATE_PRINT.getSheetName());
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java
index 63b06dc..6b2efd5 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java
@@ -6,6 +6,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.business.certificate.CertificateReportApprovalListRequest;
 import com.casic.missiles.dto.business.certificate.CertificateReportSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessCertificateReport;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
@@ -21,6 +22,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -50,7 +52,7 @@
         return certificateReportService.saveCertificateReport(request);
     }
 
-    @ApiOperation("证书审批详情（基本信息）")
+    @ApiOperation("详情（基本信息）")
     @PostMapping("/detail")
     public ReturnDTO<BizBusinessCertificateReport> detail(@RequestBody @Valid BaseDetailRequest request, BindingResult bindingResult) throws Exception {
         if(bindingResult.hasErrors()){
@@ -59,4 +61,11 @@
         return certificateReportService.detail(request);
     }
 
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody CertificateReportApprovalListRequest request) throws Exception {
+        List<BizBusinessCertificateReport> list = super.exportList(request);
+        super.exportExcel(BizBusinessCertificateReport.class, list, ExportEnum.CERTIFICATE_REPORT.getSheetName());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java
index 46b26bd..57c0809 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java
@@ -10,20 +10,21 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.business.identify.IdentifyListRequest;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessIdentifyInfo;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.business.IBizBusinessIdentifyInfoService;
+import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import javax.validation.Valid;
+import java.util.List;
 import java.util.Objects;
 
 /**
@@ -57,16 +58,13 @@
         return identifyInfoService.addIdentify(identifyInfo);
     }
 
-    @ApiOperation("标识打印更新")
+    @ApiOperation("标识打印更新（更新打印时间）")
     @PostMapping("/update")
-    public ReturnDTO updateIdentify(@RequestBody @Valid BizBusinessIdentifyInfo identifyInfo, BindingResult bindingResult) {
-        Assert.isFalse(Objects.isNull(identifyInfo.getId()), () -> {
+    public ReturnDTO updateIdentify(@RequestBody @Valid IdDTO idDTO) {
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        Assert.isFalse(bindingResult.hasErrors(), () -> {
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        });
-        return identifyInfoService.updateIdentify(identifyInfo);
+        return identifyInfoService.updateIdentify(idDTO.getId());
     }
 
     @ApiOperation("标识打印删除")
@@ -77,4 +75,37 @@
         });
         return identifyInfoService.deleteIdentify(idDTO.getId());
     }
+
+    @ApiOperation("标识打印导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody @Valid IdentifyListRequest request, BindingResult bindingResult) throws Exception {
+        if (bindingResult.hasErrors()) {
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        List<BizBusinessIdentifyInfo> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = identifyInfoService.listByIds(request.getIds());
+        } else {
+            list = identifyInfoService.list(request);
+        }
+        for (BizBusinessIdentifyInfo record : list) {
+            DictCodeUtils.convertDictCodeToName(record);
+        }
+        super.exportExcel(BizBusinessIdentifyInfo.class, list, ExportEnum.IDENTIFY_EXPORT.getSheetName());
+    }
+
+
+    // TODO: 2023/8/23 查询设备信息，4个底部按钮查设备（按钮的作用就是前端用来调不同接口、用来区分中间即将展示的标识），前端弹窗选设备，在确定保存时前端根据底部按钮判断传入设备类型deviceType字典code
+    // TODO: 2023/8/23 接口：查受检设备（第1个按钮），查设备台账（后3个按钮同一接口），查询之后前端根据标志类型的不同加到中间页面时进行判断（按产品给的对应表）
+    // TODO: 2023/8/23 提供二维码接口，前端在加到中间页面时调用一下
+
+    @ApiOperation("设备二维码")
+    @PostMapping("/equipment/qrCode")
+    public ReturnDTO<String> equipmentQrCode(@RequestBody @Valid IdDTO idDTO) {
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return identifyInfoService.equipmentQrCode(idDTO.getId());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java
index 707be6e..7e0453d 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java
@@ -117,7 +117,7 @@
     }
 
     @ApiOperation("任务单导出")
-    @PostMapping("/export")
+    @PostMapping("/listExport")
     public void orderExport(@RequestBody @Valid OrderListRequest request, HttpServletResponse response) {
         businessOrderService.orderExport(request, response);
     }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java
index 529a6ce..51432be 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java
@@ -1,9 +1,28 @@
 package com.casic.missiles.controller.business;
 
+import com.casic.missiles.controller.GeneralApprovalController;
+import com.casic.missiles.dto.BaseApprovalSubmitRequest;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.business.outsource.OutsourceAssessApprovalListRequest;
+import com.casic.missiles.dto.business.outsource.OutsourceAssessSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
+import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.model.business.BizBusinessOutsourceAssess;
+import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
+import com.casic.missiles.service.IGeneralApprovalService;
+import com.casic.missiles.service.business.IBizBusinessOutsourceAssessService;
 import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.BindingResult;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.validation.Valid;
+import java.util.List;
+
 /**
  * <p>
  * 计量检定业务-分包管理-测试、校准或检定工作分包评审表 前端控制器
@@ -15,6 +34,27 @@
 @Api(tags = "分包管理-测试、校准或检定工作分包评审表")
 @RestController
 @RequestMapping("/business/outsource/assess")
-public class BizBusinessOutsourceAssessController {
+public class BizBusinessOutsourceAssessController extends GeneralApprovalController<BizBusinessOutsourceAssess, BizBusinessOutsourceAssess, OutsourceAssessApprovalListRequest, BaseApprovalSubmitRequest> {
+    @Autowired
+    private IBizBusinessOutsourceAssessService outsourceAssessService;
 
+    public BizBusinessOutsourceAssessController(IGeneralApprovalService<BizBusinessOutsourceAssess, BizBusinessOutsourceAssess, OutsourceAssessApprovalListRequest, BaseApprovalSubmitRequest> baseApprovalService) {
+        super(baseApprovalService);
+    }
+
+    @ApiOperation("草稿箱-保存")
+    @PostMapping("/save")
+    public ReturnDTO<OutsourceAssessSaveResponse> saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceAssess request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        return outsourceAssessService.saveOutsourceAssess(request);
+    }
+
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception {
+        List<BizBusinessOutsourceAssess> list = super.exportList(request);
+        super.exportExcel(BizBusinessOutsourceAssess.class, list, ExportEnum.OUTSOURCE_ASSESS.getSheetName());
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java
new file mode 100644
index 0000000..9adef18
--- /dev/null
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java
@@ -0,0 +1,60 @@
+package com.casic.missiles.controller.business;
+
+import com.casic.missiles.controller.GeneralApprovalController;
+import com.casic.missiles.dto.BaseApprovalSubmitRequest;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.business.outsource.OutsourceProtocolApprovalListRequest;
+import com.casic.missiles.dto.business.outsource.OutsourceProtocolSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
+import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.model.business.BizBusinessOutsourceProtocol;
+import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
+import com.casic.missiles.service.IGeneralApprovalService;
+import com.casic.missiles.service.business.IBizBusinessOutsourceProtocolService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.BindingResult;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.validation.Valid;
+import java.util.List;
+
+/**
+ * <p>
+ * 计量检定业务-分包管理-测试、校准或检定工作分包协议书 前端控制器
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-08-24
+ */
+@Api(tags = "分包管理-测试、校准或检定工作分包协议书")
+@RestController
+@RequestMapping("/business/outsource/protocol")
+public class BizBusinessOutsourceProtocolController extends GeneralApprovalController<BizBusinessOutsourceProtocol, BizBusinessOutsourceProtocol, OutsourceProtocolApprovalListRequest, BaseApprovalSubmitRequest> {
+    @Autowired
+    private IBizBusinessOutsourceProtocolService outsourceProtocolService;
+
+    public BizBusinessOutsourceProtocolController(IGeneralApprovalService<BizBusinessOutsourceProtocol, BizBusinessOutsourceProtocol, OutsourceProtocolApprovalListRequest, BaseApprovalSubmitRequest> baseApprovalService) {
+        super(baseApprovalService);
+    }
+
+    @ApiOperation("草稿箱-保存")
+    @PostMapping("/save")
+    public ReturnDTO<OutsourceProtocolSaveResponse> saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceProtocol request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        return outsourceProtocolService.saveOutsourceProtocol(request);
+    }
+
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody OutsourceProtocolApprovalListRequest request) throws Exception {
+        List<BizBusinessOutsourceProtocol> list = super.exportList(request);
+        super.exportExcel(BizBusinessOutsourceProtocol.class, list, ExportEnum.OUTSOURCE_PROTOCOL.getSheetName());
+    }
+}
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java
index 097f645..f0f0943 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java
@@ -17,7 +17,6 @@
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.IGeneralApprovalService;
 import com.casic.missiles.service.business.IBizBusinessOutsourcerInfoService;
-import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -71,19 +70,8 @@
 
     @ApiOperation("分包方导出")
     @PostMapping("/listExport")
-    public void export(@RequestBody @Valid OutsourcerInfoApprovalListRequest request, BindingResult bindingResult) throws Exception {
-        if (bindingResult.hasErrors()) {
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        }
-        List<BizBusinessOutsourcerInfo> list;
-        if (!CollectionUtils.isEmpty(request.getIds())) {
-            list = outsourcerInfoService.listByIds(request.getIds());
-        } else {
-            list = outsourcerInfoService.list(request);
-        }
-        for (BizBusinessOutsourcerInfo record : list) {
-            DictCodeUtils.convertDictCodeToName(record);
-        }
+    public void export(@RequestBody OutsourcerInfoApprovalListRequest request) throws Exception {
+        List<BizBusinessOutsourcerInfo> list = super.exportList(request);
         super.exportExcel(BizBusinessOutsourcerInfo.class, list, ExportEnum.OUTSOURCER_EXPORT.getSheetName());
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java
index c2cbf9f..0410918 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java
@@ -17,11 +17,9 @@
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.IGeneralApprovalService;
 import com.casic.missiles.service.business.IBizBusinessSiteExecutiveInfoService;
-import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -60,7 +58,7 @@
         return siteExecutiveInfoService.saveSiteExecutiveInfo(siteExecutiveInfo);
     }
 
-    @ApiOperation("现场检测详情")
+    @ApiOperation("详情")
     @PostMapping("/detail")
     public ReturnDTO<SiteExecutiveDetailResponse> siteExecutiveDetail(@RequestBody @Valid IdDTO idDTO) throws Exception {
         Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
@@ -69,21 +67,10 @@
         return ReturnUtil.success(siteExecutiveInfoService.detail(idDTO.getId()));
     }
 
-    @ApiOperation("现场检测导出")
+    @ApiOperation("导出")
     @PostMapping("/listExport")
-    public void export(@RequestBody @Valid SiteExecutiveApprovalListRequest request, BindingResult bindingResult) throws Exception {
-        if (bindingResult.hasErrors()) {
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        }
-        List<SiteExecutiveApprovalListResponse> list;
-        if (!CollectionUtils.isEmpty(request.getIds())) {
-            list = siteExecutiveInfoService.listInfoByIds(request.getIds());
-        } else {
-            list = siteExecutiveInfoService.listInfo(request);
-        }
-        for (SiteExecutiveApprovalListResponse record : list) {
-            DictCodeUtils.convertDictCodeToName(record);
-        }
+    public void export(@RequestBody SiteExecutiveApprovalListRequest request) throws Exception {
+        List<SiteExecutiveApprovalListResponse> list = super.exportList(request);
         super.exportExcel(SiteExecutiveApprovalListResponse.class, list, ExportEnum.SITE_EXECUTIVE_EXPORT.getSheetName());
     }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
index 7e793cd..a92e209 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
@@ -55,7 +55,7 @@
 
     @ApiOperation("设备收发列表导出")
     @PostMapping("/export")
-    public void exportList(@RequestBody @Valid SampleDispatchListRequest request) throws IOException {
+    public void exportList(@RequestBody SampleDispatchListRequest request) throws IOException {
         List<SampleDispatchListResponse> list;
         if (!CollectionUtils.isEmpty(request.getIds())) {
             list = dispatchService.listByIds(request.getIds());
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java
index cdc77fc..d120fd4 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java
@@ -7,6 +7,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.business.labExecutive.*;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.business.IBusinessLabExecutiveInfoService;
@@ -14,6 +15,7 @@
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.*;
 
@@ -32,7 +34,7 @@
     @Autowired
     private IBusinessLabExecutiveInfoService labExecutiveInfoService;
 
-    @ApiOperation("实验室检测-部门检测-查询各状态列表（待检测、检测中、检测完）")
+    @ApiOperation("实验室任务-查询各状态列表（待检测、检测中、检测完）")
     @PostMapping("/deptExecutive/List")
     public ReturnDTO<PageInfoBT<SampleLabExecutiveListResponse>> queryDeptExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
@@ -43,10 +45,19 @@
         return ReturnUtil.success(super.packForBT(labExecutiveInfoService.deptLabExecutiveListPage(page, labExecutiveListRequest)));
     }
 
-    /**
-     * 实验室检测-我的检测-查询各状态列表（待检测、检测中、检测完）
-     */
-    @ApiOperation("实验室检测-我的检测-查询各状态列表（待检测、检测中、检测完）")
+    @ApiOperation("实验室任务导出")
+    @PostMapping("/deptExecutive/export")
+    public void deptExportList(@RequestBody @Valid SampleLabExecutiveListRequest request) throws Exception {
+        List<SampleLabExecutiveListResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = labExecutiveInfoService.deptLabExecutiveListByIds(request.getMeasureStatus(), request.getIds());
+        } else {
+            list = labExecutiveInfoService.deptLabExecutiveList(request);
+        }
+        super.exportExcel(SampleLabExecutiveListResponse.class, list, ExportEnum.DEPT_EXECUTIVE_TASK.getSheetName());
+    }
+
+    @ApiOperation("我的任务-查询各状态列表（待检测、检测中、检测完）")
     @PostMapping("/myExecutive/list")
     public ReturnDTO<PageInfoBT<SampleLabExecutiveListResponse>> queryMyExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
@@ -57,19 +68,25 @@
         return ReturnUtil.success(super.packForBT(labExecutiveInfoService.myLabExecutiveListPage(page, labExecutiveListRequest)));
     }
 
-    /**
-     * 实验室检测-我的检测-查询各状态样品数量（待检测、检测中、检测完）
-     */
-    @ApiOperation("实验室检测-我的检测-查询各状态样品数量（待检测、检测中、检测完）")
+    @ApiOperation("我的任务导出")
+    @PostMapping("/myExecutive/export")
+    public void exportList(@RequestBody @Valid SampleLabExecutiveListRequest request) throws Exception {
+        List<SampleLabExecutiveListResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = labExecutiveInfoService.myLabExecutiveListByIds(request.getMeasureStatus(), request.getIds());
+        } else {
+            list = labExecutiveInfoService.myLabExecutiveList(request);
+        }
+        super.exportExcel(SampleLabExecutiveListResponse.class, list, ExportEnum.MY_EXECUTIVE_TASK.getSheetName());
+    }
+
+    @ApiOperation("我的任务-查询各状态样品数量（待检测、检测中、检测完）")
     @GetMapping("/myExecutive/amount")
     public ReturnDTO<List<SampleAmountResponse>> queryMyExecutiveAmount() {
         return ReturnUtil.success(labExecutiveInfoService.myExecutiveAmount());
     }
 
-    /**
-     * 实验室检测-部门检测-分配（分配给具体人员）
-     */
-    @ApiOperation("实验室检测-部门检测-分配按钮（分配给具体人员）")
+    @ApiOperation("实验室任务-分配按钮（分配给具体人员）")
     @PostMapping("/deptExecutive/allocate")
     public ReturnDTO allocateStaff(@RequestBody @Valid SampleAllocateRequest sampleAllocateRequest, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -78,10 +95,7 @@
         return labExecutiveInfoService.allocateStaff(sampleAllocateRequest);
     }
 
-    /**
-     * 实验室检测-我的检测-检定人扫描收入（待检测->检测中）
-     */
-    @ApiOperation("实验室检测-我的检测-检定人扫描收入（待检测->检测中）")
+    @ApiOperation("我的任务-检定人扫描收入（待检测->检测中）")
     @PostMapping("/myExecutive/receive")
     public ReturnDTO sampleReceive(@RequestBody @Valid List<SampleOperateRequest> requestList, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -90,10 +104,7 @@
         return labExecutiveInfoService.sampleReceive(requestList);
     }
 
-    /**
-     * 实验室检测-负责人/检定人扫描检完（检测中->检测完）
-     */
-    @ApiOperation("实验室检测-负责人/检定人扫描检完（检测中->检测完）")
+    @ApiOperation("实验室任务-负责人/检定人扫描检完（检测中->检测完）")
     @PostMapping("/myExecutive/complete")
     public ReturnDTO sampleExecutiveComplete(@RequestBody @Valid List<SampleOperateRequest> requestList, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -102,10 +113,7 @@
         return labExecutiveInfoService.sampleExecutiveComplete(requestList);
     }
 
-    /**
-     * 实验室检测-部门检测/我的检测 编辑（只能修改应出具证书）
-     */
-    @ApiOperation("实验室检测-部门检测/我的检测 编辑（只能修改应出具证书）")
+    @ApiOperation("实验室任务/我的任务 编辑（只能修改应出具证书）")
     @PostMapping("/executive/update")
     public ReturnDTO updateExecutive(@RequestBody @Valid UpdateExecutiveRequest request, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -114,10 +122,7 @@
         return labExecutiveInfoService.updateExecutive(request);
     }
 
-    /**
-     * 实验室检测-部门检测/我的检测 详情
-     */
-    @ApiOperation("实验室检测-部门检测/我的检测 详情")
+    @ApiOperation("实验室任务/我的任务 详情")
     @PostMapping("/executive/detail")
     public ReturnDTO<ExecutiveDetailResponse> executiveDetail(@RequestBody @Valid ExecutiveDetailRequest request, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
@@ -131,7 +136,7 @@
      * 退回后会将下一个要执行的实验室检测状态更新为待分配，将后面的实验室顺序变更为连续（都进行减1）
      * 最后一个检测的实验室退回，等分发员再增加实验室或设备收发中的已收入直接手动点击完成
      */
-    @ApiOperation("实验室检测-部门检测/我的检测 退回（待检测/检测中->退回）")
+    @ApiOperation("实验室任务/我的任务 退回（待检测/检测中->退回）")
     @PostMapping("/executive/sendBack")
     public ReturnDTO executiveSendBack(@RequestBody @Valid ExecutiveSendBackRequest request, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -140,9 +145,6 @@
         return labExecutiveInfoService.sampleExecutiveSendBack(request);
     }
 
-    /**
-     * 分发员编辑实验室检测列表
-     */
     @ApiOperation("分发员编辑实验室检测列表")
     @PostMapping("/handOut/updateList")
     public ReturnDTO updateExecutiveList(@RequestBody @Valid UpdateExecutiveListRequest request, BindingResult bindingResult) {
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java
index 48a67ed..0c04f31 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java
@@ -10,6 +10,7 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.resource.customer.CustomerApprovalListRequest;
 import com.casic.missiles.dto.resource.customer.CustomerSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceCustomerInfo;
@@ -26,6 +27,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -55,6 +57,13 @@
         return customerInfoService.saveCustomerInfo(request);
     }
 
+    @ApiOperation("委托方名录导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody CustomerApprovalListRequest request) throws Exception {
+        List<BizResourceCustomerInfo> list = super.exportList(request);
+        super.exportExcel(BizResourceCustomerInfo.class, list, ExportEnum.CUSTOMER_INFO.getSheetName());
+    }
+
     @ApiOperation("委托方人员列表（分页）")
     @PostMapping("/person/listPage")
     public ReturnDTO<PageInfoBT<BizResourceCustomerStaff>> personListPage(@RequestBody IdDTO idDto) {
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
index 972ed4b..6418ea5 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
@@ -5,6 +5,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.resource.customer.SuggestFormApprovalListRequest;
 import com.casic.missiles.dto.resource.customer.SuggestFormSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceCustomerSuggestForm;
@@ -20,6 +21,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -50,4 +52,11 @@
         return suggestFormService.saveSuggestForm(request);
     }
 
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody SuggestFormApprovalListRequest request) throws Exception {
+        List<BizResourceCustomerSuggestForm> list = super.exportList(request);
+        super.exportExcel(BizResourceCustomerSuggestForm.class, list, ExportEnum.CUSTOMER_SUGGEST_FORM.getSheetName());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java
index 1934d1a..9e07eab 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java
@@ -15,12 +15,16 @@
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.resource.IEnvEnvironmentRecordConfigService;
 import com.casic.missiles.service.resource.IEnvEnvironmentRecordDataService;
+import com.casic.missiles.service.resource.IEnvLocationInfoService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
 import java.util.List;
@@ -39,6 +43,8 @@
     private IEnvEnvironmentRecordDataService environmentRecordDataService;
     @Autowired
     private IEnvEnvironmentRecordConfigService environmentRecordConfigService;
+    @Autowired
+    private IEnvLocationInfoService locationInfoService;
 
     @ApiOperation("环境记录单数据列表/详情")
     @PostMapping("/data/listPage")
@@ -95,4 +101,11 @@
         });
         return environmentRecordConfigService.deleteEnvironmentRecordConfig(idDTO.getId());
     }
+
+    @ApiOperation("地点列表")
+    @PostMapping("/location/listPage")
+    public ReturnDTO<PageInfoBT<LocationListResponse>> locationListPage(@RequestBody @Valid LocationListRequest request) {
+        Page<LocationListResponse> page = PageFactory.defaultPage();
+        return ReturnUtil.success(super.packForBT(locationInfoService.listPage(page, request)));
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java
index 82efe3f..e9561fa 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java
@@ -10,6 +10,7 @@
 import com.casic.missiles.dto.resource.seal.SealLogListRequest;
 import com.casic.missiles.dto.resource.seal.SealNoteApprovalListRequest;
 import com.casic.missiles.dto.resource.seal.SealNoteSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceSealUseLog;
@@ -27,6 +28,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -58,6 +60,13 @@
         return sealUseNoteService.saveSeal(request);
     }
 
+    @ApiOperation("印章使用登记导出（列表和导出中去掉经办人和监印人）")
+    @PostMapping("/listExport")
+    public void export(@RequestBody SealNoteApprovalListRequest request) throws Exception {
+        List<BizResourceSealUseNote> list = super.exportList(request);
+        super.exportExcel(BizResourceSealUseNote.class, list, ExportEnum.SEAL_NOTE.getSheetName());
+    }
+
     // TODO: 2023/7/28 印章使用日志：系统中使用印章时插入数据库
 
     @ApiOperation("印章使用日志列表（分页）")
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java
index 9b674fc..06b6521 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java
@@ -9,16 +9,20 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.resource.staff.StaffCertRequest;
 import com.casic.missiles.dto.resource.staff.StaffCertResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.service.resource.IBizResourceStaffInfoService;
 import com.casic.missiles.service.resource.IBizResourceStaffVerifierService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.List;
+
 /**
  * @Description:
  * @Author: wangpeng
@@ -41,9 +45,21 @@
         return ReturnUtil.success(super.packForBT(responsePage));
     }
 
+    @ApiOperation("证书逾期提醒导出")
+    @PostMapping("/listExport")
+    public void exportList(@RequestBody StaffCertRequest request) throws Exception {
+        List<StaffCertResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = staffInfoService.certListByIds(request.getIds());
+        } else {
+            list = staffInfoService.certList(request);
+        }
+        super.exportExcel(StaffCertResponse.class, list, ExportEnum.STAFF_CERTIFICATE_EXPIRE.getSheetName());
+    }
+
     @ApiOperation("证书逾期提醒")
     @PostMapping("/expirationReminder")
-    public ReturnDTO expirationReminder(@RequestBody IdDTO idDto) {
-        return verifierService.expirationReminder(idDto);
+    public ReturnDTO expirationReminder(@RequestBody IdDTO idDTO) {
+        return verifierService.expirationReminder(idDTO);
     }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java
index 3b251ad..a6e7850 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java
@@ -12,6 +12,7 @@
 import com.casic.missiles.dto.resource.staff.StaffListRequest;
 import com.casic.missiles.dto.resource.staff.TrainListRequest;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.*;
@@ -22,7 +23,10 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
 import java.util.List;
@@ -52,8 +56,19 @@
             throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
         }
         Page<BizResourceStaffInfo> page = PageFactory.defaultPage();
-        Page<BizResourceStaffInfo> responsePage = staffInfoService.listPage(page, request);
-        return ReturnUtil.success(super.packForBT(responsePage));
+        return ReturnUtil.success(super.packForBT(staffInfoService.listPage(page, request)));
+    }
+
+    @ApiOperation("人员登记导出")
+    @PostMapping("/listExport")
+    public void exportList(@RequestBody StaffListRequest request) throws Exception {
+        List<BizResourceStaffInfo> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = staffInfoService.listByIds(request.getIds());
+        } else {
+            list = staffInfoService.list(request);
+        }
+        super.exportExcel(BizResourceStaffInfo.class, list, ExportEnum.STAFF_INFO.getSheetName());
     }
 
     @ApiOperation("人员登记详情基础信息")
@@ -85,9 +100,9 @@
 
     @ApiOperation("科研教育列表（分页）")
     @PostMapping("/education/listPage")
-    public ReturnDTO<PageInfoBT<BizResourceStaffEducation>> educationListPage(@RequestBody IdDTO idDto) {
+    public ReturnDTO<PageInfoBT<BizResourceStaffEducation>> educationListPage(@RequestBody IdDTO idDTO) {
         Page<BizResourceStaffEducation> page = PageFactory.defaultPage();
-        Page<BizResourceStaffEducation> responsePage = staffInfoService.educationListPage(page, idDto);
+        Page<BizResourceStaffEducation> responsePage = staffInfoService.educationListPage(page, idDTO);
         return ReturnUtil.success(super.packForBT(responsePage));
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java
index af6aa86..d85d84a 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java
@@ -9,6 +9,7 @@
 import com.casic.missiles.dto.resource.outsideService.SupplierApprovalListRequest;
 import com.casic.missiles.dto.resource.outsideService.SupplierSaveResponse;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceSupplierAbility;
@@ -67,6 +68,13 @@
         return ReturnUtil.success(supplierInfoService.detail(idDTO.getId()));
     }
 
+    @ApiOperation("合格供方导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody SupplierApprovalListRequest request) throws Exception {
+        List<BizResourceSupplierInfo> list = super.exportList(request);
+        super.exportExcel(BizResourceSupplierInfo.class, list, ExportEnum.SUPPLIER_INFO.getSheetName());
+    }
+
     @ApiOperation("供方人员列表（分页）")
     @PostMapping("/person/listPage")
     public ReturnDTO<PageInfoBT<BizResourceSupplierPerson>> personListPage(@RequestBody IdDTO idDTO) {
diff --git a/casic-metering-api/src/main/resources/config/application.yml b/casic-metering-api/src/main/resources/config/application.yml
index 350db5f..ecff521 100644
--- a/casic-metering-api/src/main/resources/config/application.yml
+++ b/casic-metering-api/src/main/resources/config/application.yml
@@ -126,7 +126,7 @@
     #作者
     author: wangpeng
     #待生成对象表名
-    table-name: biz_equipment_technical_target_approval,biz_equipment_attachment_approval,biz_equipment_checkpoint_approval
+    table-name: biz_business_outsource_protocol
 
 reminder:
   #节点--common模块config包 ReminderNodeConfig配置
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
index 4a19e4e..d47d552 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
@@ -53,6 +53,7 @@
     SUGGEST_FORM_SAVE_FAILED(2509, "委托方意见登记表保存至草稿箱失败"),
     EXAMINE_FORM_SAVE_FAILED(2510, "要求、委托书及合同评审表保存至草稿箱失败"),
     CUSTOMER_EXIST_SAVE_FAILED(2511, "该委托方已存在，请重新选择"),
+    DUPLICATE_LOCATION_NO(2512, "地点编号已存在"),
 
     /**
      * 计量检定业务模块
@@ -68,6 +69,8 @@
     COMPLETE_SAMPLE_NOT_EXIST(2609, "检测中不存在扫描收入的样品"),
     CANNOT_CHANGE_MEASURE_INFO(2610, "无法更改非当前登录用户的检测信息"),
     NON_EXIST_ORDER_OR_SAMPLE(2611, "不存在该委托单或该委托单下的样品"),
+    OUTSOURCE_ACCESS_SAVE_FAILED(2612, "测试、校准或检定工作分包评审表保存至草稿箱失败"),
+    OUTSOURCE_PROTOCOL_SAVE_FAILED(2613, "测试、校准或检定工作分包协议书保存至草稿箱失败"),
 
     /**
      * 历史遗留备用
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
index 5089ad1..81a406b 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
@@ -10,54 +10,38 @@
     /**
      * 资源管理
      */
-    ENVIRONMENT_DATA_EXPORT("environmentData", "environmentData", "环境记录单数据"),
+    ENVIRONMENT_DATA_EXPORT("environmentData", "环境记录单数据", "环境记录单数据"),
+    STAFF_INFO("staffInfo", "人员登记", "人员登记"),
+    STAFF_CERTIFICATE_EXPIRE("certificateExpire", "证书逾期提醒", "证书逾期提醒"),
+    SUPPLIER_INFO("supplierInfo", "合格供方名录", "合格供方名录"),
+    CUSTOMER_INFO("customerInfo", "委托方名录", "委托方名录"),
+    CUSTOMER_SUGGEST_FORM("customerSuggestForm", "委托方意见登记表", "委托方意见登记表"),
+    SEAL_NOTE("sealNote", "印章使用登记", "印章使用登记"),
 
-    FILE_EXPORT("meterFileData", "meterFileData", "计量文件信息"),
-    TRAIN_PLAN_EXPORT("trainPlanData", "trainPlanData", "培训计划"),
-    TRAIN_LOG_EXPORT("trainLogData", "trainLogData", "培训记录"),
-    METER_ORGANIZE_EXPORT("meterOrganizeData", "meterOrganizeData", "计量组织"),
-    TRACE_SUPPLIER_EXPORT("traceSupplierData", "traceSupplierData", "溯源供方"),
-    SIGN_EXPORT("signData", "signData", "签名/签章"),
-    TEMPLATE_EXPORT("templateData", "templateData", "原始记录模板/证书报告模板"),
-    FIXED_ASSETS("meterFixedAssets", "meterFixedAssets", "固定资产"),
-    METER_EQUIPMENT("meterEquipment", "meterEquipment", "测量设备"),
-    CALIBRATION_TEST_EQUIPMENT("calibrationTestEquipment", "calibrationTestEquipment", "校准检定设备"),
-    MEASURE_ACCOUNT("measureAccount", "measureAccount", "测量工装"),
-    STANDARD_SUPPORT_EQUIPMENT("standardSupportEquipment", "standardSupportEquipment", "标准配套设备"),
-    STANDARD_EQUIPMENT("standardEquipment", "standardEquipment", "标准装置"),
-    FLOW_DEF_EXPORT("flowDefData", "flowDefData", "流程定义"),
-    STAFF_CERTIFICATE("certificate", "certificate", "计量人员证书"),
-    CHECK_INFO("checkInfo", "checkInfo", "设备管理点检测"),
-    EQUIPMENT_APPLY("equipmentApply", "equipmentApply", "设备借用"),
-    STANDARD_EQUIPMENT_REMIND("equipmentApplyRemind", "equipmentApplyRemind", "标准装置到期提醒"),
-    METER_PRICE("meterPrice", "meterPrice", "价格库"),
-    METER_STAFF("meterStaff", "meterStaff", "计量人员"),
-    STANDARD_EQUIPMENT_APPLY("standardEquipmentApply", "standardEquipmentApply", "标准装置申请"),
-    STATE_MANAGE_APPLY("stateManage", "stateManage", "状态管理"),
-    METER_ACCEPTANCE_CHECK("acceptanceCheck", "acceptanceCheck", "设备检修保养验收单"),
-    CUSTOMER_EXPORT("customerData", "customerData", "客户信息"),
-    ORDER_EXPORT("orderData", "orderData", "委托书信息"),
-    SAMPLE_EXPORT("sampleData", "sampleData", "样本信息"),
-    EXCHANGE_DATA("exchangeData", "exchangeData", "设备交接单"),
-    DISPATCH_DATA("dispatchData", "dispatchData", "设备收发"),
-    ENVIRONMENT_DATA("environmentData", "environmentData", "环境记录单"),
-    ORIGIN_DATA("originData", "originData", "原始记录"),
-    CERTIFICATE_REPORT("certificateReport", "certificateReport", "证书报告"),
-    ADVICE_EXPORT("adviceData", "adviceData", "客户反馈"),
-    HANDOUT_EXPORT("handoutData", "handoutData", "任务分发列表"),
-    OUTSOURCER_EXPORT("outsourcerData", "outsourcerData", "分包方"),
-    SITE_EXECUTIVE_EXPORT("siteExecutiveData", "siteExecutiveData", "现场测试、校准或检定"),
-    CERTIFICATE_PRINT_EXPORT("certificatePrintData", "certificatePrintData", "证书打印"),
-    DOWNLOAD_TEMPLATE("downloadTemplate", "downloadTemplate", "页面配置"),
-    OUTSOURCER_CERTIFICATE_EXPORT("outsourceCertificateData", "outsourceCertificateData", "分包证书"),
-    SETTLEMENT_INFO_EXPORT("settlementInfoData", "settlementInfoData", "业务结算"),
-    EQUIPMENT_REMIND("equipmentRemind", "equipmentRemind", "设备到期提醒"),
-    AGREEMENT_INFO_EXPORT("agreementInfoData", "agreementInfoData", "合同"),
-    WORK_STATISTICS_EXPORT("workStatisticsData", "workStatisticsData", "实时工作统计"),
-    DEPT_OUTPUT_EXPORT("deptOutputData", "deptOutputData", "部门产值分析"),
-    WORKLOAD_EXPORT("workloadData", "workloadData", "业务工作量分析"),
-    DEPT_COMPREHENSIVE_EXPORT("deptComprehensiveData", "deptComprehensiveData", "部门综合分析"),
-    ENVIRONMENTAL_RECORD("environmentalRecordData", "environmentalRecordData", "现场环境记录");
+    /**
+     * 计量检定业务
+     */
+    OUTSOURCER_EXPORT("outsourcerData", "分包方名录", "分包方名录"),
+    IDENTIFY_EXPORT("identifyData", "计量标识", "计量标识"),
+    ORDER_EXPORT("orderData", "任务单", "任务单"),
+    DISPATCH_DATA("dispatchData", "设备收发", "设备收发"),
+    HANDOUT_EXPORT("handoutData", "任务分发", "任务分发"),
+    SITE_EXECUTIVE_EXPORT("siteExecutiveData", "现场测试、校准或检定", "现场测试、校准或检定"),
+    CERTIFICATE_REPORT("certificateReport", "证书审批", "证书审批"),
+    CERTIFICATE_CHANGE_APPLY("certificateChangeApply", "证书报告补充或更换申请单", "证书报告补充或更换申请单"),
+    CERTIFICATE_PRINT("certificatePrintData", "证书打印审批", "证书打印审批"),
+    DEPT_EXECUTIVE_TASK("deptExecutiveTaskData", "实验室任务", "实验室任务"),
+    MY_EXECUTIVE_TASK("myExecutiveTaskData", "我的任务", "我的任务"),
+    OUTSOURCE_ASSESS("outsourceAssess", "测试、校准或检定工作分包评审表", "测试、校准或检定工作分包评审表"),
+    OUTSOURCE_PROTOCOL("outsourceProtocol", "测试、校准或检定工作分包协议书", "测试、校准或检定工作分包协议书"),
+
+    /**
+     * 系统管理
+     */
+    SIGN_EXPORT("signData", "签名", "签名"),
+    TEMPLATE_EXPORT("templateData", "文件模板", "文件模板"),
+    FLOW_DEF_EXPORT("flowDefData", "流程定义", "流程定义"),
+    DOWNLOAD_TEMPLATE("downloadTemplate", "流程定义", "页面配置");
 
     ExportEnum(String fileName, String sheetName, String description) {
         this.fileName = fileName;
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateRecordTypeCodeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateRecordTypeCodeEnum.java
index 31d913c..a963522 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateRecordTypeCodeEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateRecordTypeCodeEnum.java
@@ -46,4 +46,14 @@
     String SITE_EXECUTIVE_APPROVAL = "01";
     //《现场测试、校准或检定工作记录表》
     String SITE_EXECUTIVE_LOG = "02";
+
+    //测试、校准或检定工作分包协议书
+    String OUTSOURCE_PROTOCOL = "01";
+    //测试、校准或检定工作分包评审表
+    String OUTSOURCE_ACCESS = "02";
+    //测试、校准或检定工作分包通知书
+    String OUTSOURCE_NOTICE = "03";
+    //测试、校准或检定工作分包方名录
+    String OUTSOURCE_INFO = "04";
+
 }
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
index 24b8635..f78bd53 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
@@ -15,6 +15,10 @@
     String CERTIFICATE_CHANGE_APPLY_BEAN_NAME = "certificateChangeApplyBean";
     //现场测试、校准或检定
     String SITE_EXECUTIVE_BEAN_NAME = "siteExecutiveBean";
+    //测试、校准或检定工作分包评审表
+    String OUTSOURCE_ASSESS_BEAN_NAME = "outsourceAssessBean";
+    //测试、校准或检定工作分包协议书
+    String OUTSOURCE_PROTOCOL_BEAN_NAME = "outsourceProtocolBean";
 
     /*********************************设备与装置************************************/
     //设备台账
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 b21c661..6b86fd1 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
@@ -18,6 +18,8 @@
     OUTSOURCER_APPROVAL(OUTSOURCER_BEAN_NAME, ""),
     CERTIFICATE_CHANGE_APPROVAL(CERTIFICATE_CHANGE_APPLY_BEAN_NAME, ""),
     SITE_EXECUTIVE_APPROVAL(SITE_EXECUTIVE_BEAN_NAME, ""),
+    OUTSOURCE_ASSESS_APPROVAL(OUTSOURCE_ASSESS_BEAN_NAME, ""),
+    OUTSOURCE_PROTOCOL_APPROVAL(OUTSOURCE_PROTOCOL_BEAN_NAME, ""),
 
     ACTION_STATUS_MAP(new HashMap<String, AwareActionStatusEnum>() {
         {
@@ -47,6 +49,10 @@
             put(ApplyFromIdEnum.CERTIFICATE_CHANGE_APPROVAL.getCode(), CERTIFICATE_CHANGE_APPROVAL);
             //现场测试、校准或检定审批
             put(ApplyFromIdEnum.SITE_EXECUTIVE_APPROVAL.getCode(), SITE_EXECUTIVE_APPROVAL);
+            //测试、校准或检定工作分包评审表
+            put(ApplyFromIdEnum.OUTSOURCE_ASSESS_APPROVAL.getCode(), OUTSOURCE_ASSESS_APPROVAL);
+            //测试、校准或检定工作分包协议书
+            put(ApplyFromIdEnum.OUTSOURCE_PROTOCOL_APPROVAL.getCode(), OUTSOURCE_PROTOCOL_APPROVAL);
         }
     });
     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 934405e..c7410bd 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
@@ -9,6 +9,8 @@
     CERTIFICATE_CHANGE_APPROVAL("jljdywzsbchghsqd", MessageSourceModuleEnum.BUSINESS.getCode(), "证书/报告补充或更换申请单"),
     OUTSOURCER_APPROVAL("jljdywcsjzhgfbfml", MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定合格分包方名录"),
     SITE_EXECUTIVE_APPROVAL("jljdywxccsjzsp", MessageSourceModuleEnum.BUSINESS.getCode(), "现场测试、校准或检定审批"),
+    OUTSOURCE_ASSESS_APPROVAL("jljdywcsjzfbpsb", MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包评审表"),
+    OUTSOURCE_PROTOCOL_APPROVAL("jljdywcsjzfbxys", MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包协议书"),
 
 
     /*******************************************设备与装置*********************************************/
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/GeneralApprovalMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/GeneralApprovalMapper.java
index 4fb7344..0c9d6ae 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/GeneralApprovalMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/GeneralApprovalMapper.java
@@ -17,8 +17,4 @@
 
     Page<O> selectBatchForApprovalList(Page<O> page, @Param("request") R request, @Param("businessKeys") List<String> businessKeys);
 
-//    Page<O> selectListPage(Page<O> page, @Param("request") R request);
-
-//    Long selectMaxNo();
-
 }
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceAssessMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceAssessMapper.java
index 7867bb8..ba59009 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceAssessMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceAssessMapper.java
@@ -1,7 +1,12 @@
 package com.casic.missiles.mapper.business;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.business.outsource.OutsourceAssessApprovalListRequest;
+import com.casic.missiles.mapper.GeneralApprovalMapper;
 import com.casic.missiles.model.business.BizBusinessOutsourceAssess;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * <p>
@@ -11,6 +16,10 @@
  * @author wangpeng
  * @since 2023-08-16
  */
-public interface BizBusinessOutsourceAssessMapper extends BaseMapper<BizBusinessOutsourceAssess> {
+public interface BizBusinessOutsourceAssessMapper extends GeneralApprovalMapper<BizBusinessOutsourceAssess, BizBusinessOutsourceAssess, OutsourceAssessApprovalListRequest> {
+
+    Page<BizBusinessOutsourceAssess> selectBatchForApprovalList(Page<BizBusinessOutsourceAssess> page, @Param("request") OutsourceAssessApprovalListRequest request, @Param("businessKeys") List<String> businessKeys);
+
+    Long selectMaxProjectNo();
 
 }
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceProtocolMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceProtocolMapper.java
new file mode 100644
index 0000000..e6aba35
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceProtocolMapper.java
@@ -0,0 +1,24 @@
+package com.casic.missiles.mapper.business;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.business.outsource.OutsourceProtocolApprovalListRequest;
+import com.casic.missiles.mapper.GeneralApprovalMapper;
+import com.casic.missiles.model.business.BizBusinessOutsourceProtocol;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 计量检定业务-分包管理-测试、校准或检定工作分包协议书 Mapper 接口
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-08-24
+ */
+public interface BizBusinessOutsourceProtocolMapper extends GeneralApprovalMapper<BizBusinessOutsourceProtocol, BizBusinessOutsourceProtocol, OutsourceProtocolApprovalListRequest> {
+
+    Page<BizBusinessOutsourceProtocol> selectBatchForApprovalList(Page<BizBusinessOutsourceProtocol> page, @Param("request") OutsourceProtocolApprovalListRequest request, @Param("businessKeys") List<String> businessKeys);
+
+    Long selectMaxProtocolNo();
+}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/EnvLocationInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/EnvLocationInfoMapper.java
new file mode 100644
index 0000000..49eff87
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/EnvLocationInfoMapper.java
@@ -0,0 +1,21 @@
+package com.casic.missiles.mapper.resource;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.resource.environment.LocationListRequest;
+import com.casic.missiles.dto.resource.environment.LocationListResponse;
+import com.casic.missiles.model.resource.EnvLocationInfo;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * <p>
+ * 实验室环境监控系统-设备表 Mapper 接口
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-06-07
+ */
+public interface EnvLocationInfoMapper extends BaseMapper<EnvLocationInfo> {
+
+    Page<LocationListResponse> selectLocationListPage(Page<LocationListResponse> page, @Param("request") LocationListRequest request);
+}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java
index de124db..85ed0f7 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java
@@ -1,7 +1,9 @@
 package com.casic.missiles.mapper.system;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.dto.system.SignDetailResponse;
+import com.casic.missiles.dto.system.SignListRequest;
 import com.casic.missiles.model.system.SystemSign;
 import org.apache.ibatis.annotations.Param;
 
@@ -22,4 +24,8 @@
     SignDetailResponse selectSignDetailById(Long id);
 
     List<SystemSign> selectUsableSignList(@Param("userId") Long userId);
+
+    Page<SystemSign> selectSignListPage(Page<SystemSign> page, @Param("request") SignListRequest request);
+
+    List<SystemSign> selectSignList(@Param("request") SignListRequest request);
 }
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateChangeApplyMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateChangeApplyMapper.xml
index d798447..c496092 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateChangeApplyMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateChangeApplyMapper.xml
@@ -30,31 +30,31 @@
         SELECT *
         FROM biz_business_certificate_change_apply
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.changeApplyNo != null and request.changeApplyNo !=''">
+        <if test="request != null and request.changeApplyNo != null and request.changeApplyNo !=''">
             and change_apply_no like concat('%',#{request.changeApplyNo},'%')
         </if>
-        <if test="request.changeReportNo != null and request.changeReportNo !=''">
+        <if test="request != null and request.changeReportNo != null and request.changeReportNo !=''">
             and change_report_no like concat('%',#{request.changeReportNo},'%')
         </if>
-        <if test="request.changeReportName != null and request.changeReportName !=''">
+        <if test="request != null and request.changeReportName != null and request.changeReportName !=''">
             and change_report_name like concat('%',#{request.changeReportName},'%')
         </if>
-        <if test="request.changeType != null and request.changeType !=''">
+        <if test="request != null and request.changeType != null and request.changeType !=''">
             and change_type = #{request.changeType}
         </if>
-        <if test="request.createUserName != null and request.createUserName !=''">
+        <if test="request != null and request.createUserName != null and request.createUserName !=''">
             and create_user_name like concat('%',#{request.createUserName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificatePrintMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificatePrintMapper.xml
index b66cd99..49c0ac8 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificatePrintMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificatePrintMapper.xml
@@ -31,34 +31,34 @@
         LEFT JOIN biz_business_order_sample_relation bosr ON (bosr.order_id = bcr.order_id AND bosr.sample_id = bcr.sample_id)
         LEFT JOIN biz_business_order_info boi ON boi.id = bosr.order_id
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and bcp.approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.printStatus != null and request.printStatus !=''">
+        <if test="request != null and request.printStatus != null and request.printStatus !=''">
             and print_status = #{request.printStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and bcp.create_user_id = #{request.createUserId}
         </if>
-        <if test="request.certificateReportNo != null and request.certificateReportNo !=''">
+        <if test="request != null and request.certificateReportNo != null and request.certificateReportNo !=''">
             and bcr.certificate_report_no like concat('%',#{request.certificateReportNo},'%')
         </if>
-        <if test="request.certificateReportName != null and request.certificateReportName !=''">
+        <if test="request != null and request.certificateReportName != null and request.certificateReportName !=''">
             and bcr.certificate_report_name like concat('%',#{request.certificateReportName},'%')
         </if>
-        <if test="request.customerName != null and request.customerName !=''">
+        <if test="request != null and request.customerName != null and request.customerName !=''">
             and boi.customer_name like concat('%',#{request.customerName},'%')
         </if>
-        <if test="request.sampleNo != null and request.sampleNo !=''">
+        <if test="request != null and request.sampleNo != null and request.sampleNo !=''">
             and bosr.sample_no like concat('%',#{request.sampleNo},'%')
         </if>
-        <if test="request.sampleName != null and request.sampleName !=''">
+        <if test="request != null and request.sampleName != null and request.sampleName !=''">
             and bosr.sample_name like concat('%',#{request.sampleName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and bcp.create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and bcp.create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml
index b366034..767695d 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml
@@ -46,33 +46,37 @@
         SELECT bcr.*, bosr.sample_no, bosr.sample_name, bosr.sample_model, rsi.staff_name
         FROM biz_business_certificate_report bcr
         LEFT JOIN biz_business_order_sample_relation bosr ON (bosr.order_id = bcr.order_id AND bosr.sample_id = bcr.sample_id)
+        LEFT JOIN biz_business_order_info boi ON boi.id = bcr.order_id
         LEFT JOIN biz_resource_staff_info rsi ON rsi.id = bcr.measure_person_id
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and bcr.approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and bcr.create_user_id = #{request.createUserId}
         </if>
-        <if test="request.certificateReportNo != null and request.certificateReportNo !=''">
+        <if test="request != null and request.customerId != null and request.customerId !=''">
+            and boi.customer_id = #{request.customerId}
+        </if>
+        <if test="request != null and request.certificateReportNo != null and request.certificateReportNo !=''">
             and bcr.certificate_report_no like concat('%',#{request.certificateReportNo},'%')
         </if>
-        <if test="request.certificateReportName != null and request.certificateReportName !=''">
+        <if test="request != null and request.certificateReportName != null and request.certificateReportName !=''">
             and bcr.certificate_report_name like concat('%',#{request.certificateReportName},'%')
         </if>
-        <if test="request.sampleNo != null and request.sampleNo !=''">
+        <if test="request != null and request.sampleNo != null and request.sampleNo !=''">
             and bosr.sample_no like concat('%',#{request.sampleNo},'%')
         </if>
-        <if test="request.measureCategory != null and request.measureCategory !=''">
+        <if test="request != null and request.measureCategory != null and request.measureCategory !=''">
             and bcr.measure_category = #{request.measureCategory}
         </if>
-        <if test="request.measurePerson != null and request.measurePerson !=''">
+        <if test="request != null and request.measurePerson != null and request.measurePerson !=''">
             and rsi.staff_name like concat('%',#{request.measurePerson},'%')
         </if>
-        <if test="request.calibrationTimeStart != null and request.calibrationTimeStart !=''">
+        <if test="request != null and request.calibrationTimeStart != null and request.calibrationTimeStart !=''">
             and bcr.calibration_time &gt;= #{request.calibrationTimeStart}
         </if>
-        <if test="request.calibrationTimeEnd != null and request.calibrationTimeEnd !=''">
+        <if test="request != null and request.calibrationTimeEnd != null and request.calibrationTimeEnd !=''">
             and bcr.calibration_time &lt;= #{request.calibrationTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceAssessMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceAssessMapper.xml
index d0fcf8b..c22c101 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceAssessMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceAssessMapper.xml
@@ -7,6 +7,8 @@
         <id column="id" property="id" />
         <result column="project_no" property="projectNo" />
         <result column="project_name" property="projectName" />
+        <result column="lab_code" property="labCode" />
+        <result column="group_code" property="groupCode" />
         <result column="applicant_id" property="applicantId" />
         <result column="applicant_name" property="applicantName" />
         <result column="applicant_time" property="applicantTime" />
@@ -31,7 +33,45 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, project_no, project_name, applicant_id, applicant_name, applicant_time, minio_file_name, remark, create_user_id, create_user_name, outsourcer_id, pre_start_time, pre_end_time, outsource_reason, pre_cost, approval_status, process_id, approve_situation, traceability, test_method, technique_ability, create_time, update_time
+        id, project_no, project_name, lab_code, group_code, applicant_id, applicant_name, applicant_time, minio_file_name, remark, create_user_id, create_user_name, outsourcer_id, pre_start_time, pre_end_time, outsource_reason, pre_cost, approval_status, process_id, approve_situation, traceability, test_method, technique_ability, create_time, update_time
     </sql>
 
+    <select id="selectMaxProjectNo" resultType="java.lang.Long">
+        SELECT IFNULL(max(RIGHT(project_no, 3)), 0) from biz_business_outsource_assess
+    </select>
+
+    <select id="selectBatchForApprovalList" resultMap="BaseResultMap">
+        SELECT bboa.*, bboi.outsourcer_name, bboi.director
+        FROM biz_business_outsource_assess bboa
+        LEFT JOIN biz_business_outsourcer_info bboi ON bboa.outsourcer_id = bboi.id
+        WHERE 1=1
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
+            and bboa.approval_status = #{request.approvalStatus}
+        </if>
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
+            and bboa.create_user_id = #{request.createUserId}
+        </if>
+        <if test="request != null and request.projectNo != null and request.projectNo !=''">
+            and bboa.project_no like concat('%',#{request.projectNo},'%')
+        </if>
+        <if test="request != null and request.outsourcerName != null and request.outsourcerName !=''">
+            and bboi.outsourcer_name like concat('%',#{request.outsourcerName},'%')
+        </if>
+        <if test="request != null and request.applicantName != null and request.applicantName !=''">
+            and bboa.applicant_name like concat('%',#{request.applicantName},'%')
+        </if>
+        <if test="request != null and request.applicantTimeStart != null and request.applicantTimeStart !=''">
+            and bboa.applicant_time &gt;= #{request.applicantTimeStart}
+        </if>
+        <if test="request != null and request.applicantTimeEnd != null and request.applicantTimeEnd !=''">
+            and bboa.applicant_time &lt;= #{request.applicantTimeEnd}
+        </if>
+        <if test="businessKeys != null">
+            and bboa.id in
+            <foreach collection="businessKeys" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
+        ORDER BY bboa.create_time DESC
+    </select>
 </mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceProtocolMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceProtocolMapper.xml
new file mode 100644
index 0000000..b7b2149
--- /dev/null
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceProtocolMapper.xml
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.mapper.business.BizBusinessOutsourceProtocolMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.business.BizBusinessOutsourceProtocol">
+        <id column="id" property="id" />
+        <result column="protocol_no" property="protocolNo" />
+        <result column="project_name" property="projectName" />
+        <result column="lab_code" property="labCode" />
+        <result column="group_code" property="groupCode" />
+        <result column="outsourcer_id" property="outsourcerId" />
+        <result column="remark" property="remark" />
+        <result column="outsource_no" property="outsourceNo" />
+        <result column="outsource_name" property="outsourceName" />
+        <result column="contacts" property="contacts" />
+        <result column="mobile" property="mobile" />
+        <result column="address" property="address" />
+        <result column="require_date" property="requireDate" />
+        <result column="outsource_cost" property="outsourceCost" />
+        <result column="director" property="director" />
+        <result column="item" property="item" />
+        <result column="requires" property="requires" />
+        <result column="create_user_id" property="createUserId" />
+        <result column="create_user_name" property="createUserName" />
+        <result column="approval_status" property="approvalStatus" />
+        <result column="process_id" property="processId" />
+        <result column="create_time" property="createTime" />
+        <result column="update_time" property="updateTime" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, protocol_no, project_name, lab_code, group_code, outsourcer_id, remark, outsource_no, outsource_name, contacts, mobile, address, require_date, outsource_cost, director, item, requires, create_user_id, create_user_name, approval_status, process_id, create_time, update_time
+    </sql>
+
+    <select id="selectMaxProtocolNo" resultType="java.lang.Long">
+        SELECT IFNULL(max(RIGHT(protocol_no, 3)), 0) from biz_business_outsource_protocol
+    </select>
+
+    <select id="selectBatchForApprovalList" resultMap="BaseResultMap">
+        SELECT *
+        FROM biz_business_outsource_protocol
+        WHERE 1=1
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
+            and approval_status = #{request.approvalStatus}
+        </if>
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
+            and create_user_id = #{request.createUserId}
+        </if>
+        <if test="request != null and request.protocolNo != null and request.protocolNo !=''">
+            and protocol_no like concat('%',#{request.protocolNo},'%')
+        </if>
+        <if test="request != null and request.outsourcerName != null and request.outsourcerName !=''">
+            and outsourcer_name like concat('%',#{request.outsourcerName},'%')
+        </if>
+        <if test="request != null and request.applicantName != null and request.applicantName !=''">
+            and create_user_name like concat('%',#{request.applicantName},'%')
+        </if>
+        <if test="request != null and request.applicantTimeStart != null and request.applicantTimeStart !=''">
+            and create_time &gt;= #{request.applicantTimeStart}
+        </if>
+        <if test="request != null and request.applicantTimeEnd != null and request.applicantTimeEnd !=''">
+            and create_time &lt;= #{request.applicantTimeEnd}
+        </if>
+        <if test="businessKeys != null">
+            and id in
+            <foreach collection="businessKeys" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
+        ORDER BY create_time DESC
+    </select>
+</mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourcerInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourcerInfoMapper.xml
index 510a80b..3049b54 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourcerInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourcerInfoMapper.xml
@@ -7,6 +7,8 @@
         <id column="id" property="id" />
         <result column="outsourcer_no" property="outsourcerNo" />
         <result column="outsourcer_name" property="outsourcerName" />
+        <result column="lab_code" property="labCode" />
+        <result column="group_code" property="groupCode" />
         <result column="outsourcer_brief_name" property="outsourcerBriefName" />
         <result column="outsourcer_size" property="outsourcerSize" />
         <result column="business_size" property="businessSize" />
@@ -55,32 +57,32 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, outsourcer_no, outsourcer_name, outsourcer_brief_name, outsourcer_size, business_size, grade, evaluation, tax_number, bank_account, bank_name, bank_account_number, postal_code, director, phone, fax, mobile, email, website, address_country, address_province, address_city, address_area, full_address, address_country_name, address_province_name, address_city_name, address_area_name, invoice_country, invoice_province, invoice_city, invoice_area, invoice_full_address, invoice_country_name, invoice_province_name, invoice_city_name, invoice_area_name, business_scope, business_content, minio_file_name, approval_status, process_id, remark, create_user_id, create_user_name, create_time, update_time
+        id, outsourcer_no, outsourcer_name, lab_code, group_code, outsourcer_brief_name, outsourcer_size, business_size, grade, evaluation, tax_number, bank_account, bank_name, bank_account_number, postal_code, director, phone, fax, mobile, email, website, address_country, address_province, address_city, address_area, full_address, address_country_name, address_province_name, address_city_name, address_area_name, invoice_country, invoice_province, invoice_city, invoice_area, invoice_full_address, invoice_country_name, invoice_province_name, invoice_city_name, invoice_area_name, business_scope, business_content, minio_file_name, approval_status, process_id, remark, create_user_id, create_user_name, create_time, update_time
     </sql>
 
     <select id="selectBatchForApprovalList" resultMap="BaseResultMap">
         SELECT *
         FROM biz_business_outsourcer_info
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.outsourcerNo != null and request.outsourcerNo !=''">
+        <if test="request != null and request.outsourcerNo != null and request.outsourcerNo !=''">
             and outsourcer_no like concat('%',#{request.outsourcerNo},'%')
         </if>
-        <if test="request.outsourcerName != null and request.outsourcerName !=''">
+        <if test="request != null and request.outsourcerName != null and request.outsourcerName !=''">
             and outsourcer_name like concat('%',#{request.outsourcerName},'%')
         </if>
-        <if test="request.director != null and request.director !=''">
+        <if test="request != null and request.director != null and request.director !=''">
             and director like concat('%',#{request.director},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
@@ -93,6 +95,6 @@
     </select>
 
     <select id="selectMaxNo" resultType="java.lang.Long">
-        SELECT IFNULL(max(RIGHT(outsourcer_no, 12)), 0) from biz_business_outsourcer_info
+        SELECT IFNULL(max(RIGHT(outsourcer_no, 3)), 0) from biz_business_outsourcer_info
     </select>
 </mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessSiteExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessSiteExecutiveInfoMapper.xml
index 135c5d0..3c5ae79 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessSiteExecutiveInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessSiteExecutiveInfoMapper.xml
@@ -38,25 +38,25 @@
         FROM biz_business_site_executive_info bsei
         LEFT JOIN biz_resource_customer_info rci ON bsei.customer_id = rci.id
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and bsei.approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and bsei.create_user_id = #{request.createUserId}
         </if>
-        <if test="request.siteExecutiveNo != null and request.siteExecutiveNo !=''">
+        <if test="request != null and request.siteExecutiveNo != null and request.siteExecutiveNo !=''">
             and bsei.site_executive_no like concat('%',#{request.siteExecutiveNo},'%')
         </if>
-        <if test="request.customerName != null and request.customerName !=''">
+        <if test="request != null and request.customerName != null and request.customerName !=''">
             and rci.outsourcer_name like concat('%',#{request.customerName},'%')
         </if>
-        <if test="request.applyName != null and request.applyName !=''">
+        <if test="request != null and request.applyName != null and request.applyName !=''">
             and bsei.apply_name like concat('%',#{request.applyName},'%')
         </if>
-        <if test="request.applyTimeStart != null and request.applyTimeStart !=''">
+        <if test="request != null and request.applyTimeStart != null and request.applyTimeStart !=''">
             and bsei.apply_time &gt;= #{request.applyTimeStart}
         </if>
-        <if test="request.applyTimeEnd != null and request.applyTimeEnd !=''">
+        <if test="request != null and request.applyTimeEnd != null and request.applyTimeEnd !=''">
             and bsei.apply_time &lt;= #{request.applyTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml
index 84d9e2a..6bd38a9 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml
@@ -105,6 +105,12 @@
         <if test="request.isUrgent != null and request.isUrgent !=''">
             AND bo.is_urgent = #{request.isUrgent}
         </if>
+        <if test="request.ids != null">
+            and blei.id in
+            <foreach collection="request.ids" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
         ORDER BY blei.update_time DESC
     </select>
 
@@ -137,6 +143,12 @@
         <if test="request.isUrgent != null and request.isUrgent !=''">
             AND bo.is_urgent = #{request.isUrgent}
         </if>
+        <if test="request.ids != null">
+            and blei.id in
+            <foreach collection="request.ids" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
         ORDER BY blei.update_time DESC
     </select>
 
diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardInfoMapper.xml
index 1a5551b..2ed8d17 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardInfoMapper.xml
@@ -45,12 +45,6 @@
         FROM biz_equipment_standard_info besi
         LEFT JOIN biz_equipment_standard_technology_relation bestr ON besi.standard_no = bestr.standard_no
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
-            and besi.approval_status = #{request.approvalStatus}
-        </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
-            and besi.create_user_id = #{request.createUserId}
-        </if>
         <if test="request.standardName != null and request.standardName !=''">
             and besi.standard_name like concat('%',#{request.standardName},'%')
         </if>
diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardTechnologyRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardTechnologyRelationMapper.xml
index fc7e16c..cd03c8c 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardTechnologyRelationMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardTechnologyRelationMapper.xml
@@ -6,6 +6,7 @@
     <resultMap id="BaseResultMap" type="com.casic.missiles.model.equipment.BizEquipmentStandardTechnologyRelation">
         <id column="id" property="id" />
         <result column="technology_file_id" property="technologyFileId" />
+        <result column="technology_file_no" property="technologyFileNo" />
         <result column="technology_file_name" property="technologyFileName" />
         <result column="standard_id" property="standardId" />
         <result column="standard_no" property="standardNo" />
@@ -14,7 +15,7 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, technology_file_id, technology_file_name, standard_id, remark
+        id, technology_file_id, technology_file_no, technology_file_name, standard_id, remark
     </sql>
 
 </mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceAuthorizeOrderMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceAuthorizeOrderMapper.xml
index ac5176c..554fe65 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceAuthorizeOrderMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceAuthorizeOrderMapper.xml
@@ -32,22 +32,22 @@
         SELECT *
         FROM biz_resource_authorize_order
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.orderNo != null and request.orderNo !=''">
+        <if test="request != null and request.orderNo != null and request.orderNo !=''">
             and order_no like concat('%',#{request.orderNo},'%')
         </if>
-        <if test="request.createUserName != null and request.createUserName !=''">
+        <if test="request != null and request.createUserName != null and request.createUserName !=''">
             and create_user_name like concat('%',#{request.createUserName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerExamineFormMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerExamineFormMapper.xml
index ab242f6..af7f98f 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerExamineFormMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerExamineFormMapper.xml
@@ -41,28 +41,28 @@
         SELECT *
         FROM biz_resource_customer_examine_form
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.formNo != null and request.formNo !=''">
+        <if test="request != null and request.formNo != null and request.formNo !=''">
             and form_no like concat('%',#{request.formNo},'%')
         </if>
-        <if test="request.labCode != null and request.labCode !=''">
+        <if test="request != null and request.labCode != null and request.labCode !=''">
             and lab_code like concat('%',#{request.labCode},'%')
         </if>
-        <if test="request.groupCode != null and request.groupCode !=''">
+        <if test="request != null and request.groupCode != null and request.groupCode !=''">
             and group_code like concat('%',#{request.groupCode},'%')
         </if>
-        <if test="request.createUserName != null and request.createUserName !=''">
+        <if test="request != null and request.createUserName != null and request.createUserName !=''">
             and create_user_name like concat('%',#{request.createUserName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerInfoMapper.xml
index fa8ffbc..06a2798 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerInfoMapper.xml
@@ -33,25 +33,25 @@
         SELECT *
         FROM biz_resource_customer_info
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.customerNo != null and request.customerNo !=''">
+        <if test="request != null and request.customerNo != null and request.customerNo !=''">
             and customer_no like concat('%',#{request.customerNo},'%')
         </if>
-        <if test="request.customerName != null and request.customerName !=''">
+        <if test="request != null and request.customerName != null and request.customerName !=''">
             and customer_name like concat('%',#{request.customerName},'%')
         </if>
-        <if test="request.contacts != null and request.contacts !=''">
+        <if test="request != null and request.contacts != null and request.contacts !=''">
             and contacts like concat('%',#{request.contacts},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerSuggestFormMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerSuggestFormMapper.xml
index 28f5bb2..1806662 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerSuggestFormMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerSuggestFormMapper.xml
@@ -33,28 +33,28 @@
         SELECT *
         FROM biz_resource_customer_suggest_form
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.formNo != null and request.formNo !=''">
+        <if test="request != null and request.formNo != null and request.formNo !=''">
             and form_no like concat('%',#{request.formNo},'%')
         </if>
-        <if test="request.customerName != null and request.customerName !=''">
+        <if test="request != null and request.customerName != null and request.customerName !=''">
             and customer_name like concat('%',#{request.customerName},'%')
         </if>
-        <if test="request.customerDeptName != null and request.customerDeptName !=''">
+        <if test="request != null and request.customerDeptName != null and request.customerDeptName !=''">
             and customer_dept_name like concat('%',#{request.customerDeptName},'%')
         </if>
-        <if test="request.createUserName != null and request.createUserName !=''">
+        <if test="request != null and request.createUserName != null and request.createUserName !=''">
             and create_user_name like concat('%',#{request.createUserName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSealUseNoteMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSealUseNoteMapper.xml
index ab37bc1..b02bb33 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSealUseNoteMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSealUseNoteMapper.xml
@@ -29,32 +29,32 @@
     </sql>
 
     <select id="selectBatchForApprovalList" resultMap="BaseResultMap">
-        SELECT *
+        SELECT brsun.*, brsi.seal_name, brsi.seal_type, brsi.approver_name
         FROM biz_resource_seal_use_note brsun
         JOIN biz_resource_seal_info brsi ON brsun.seal_id = brsi.id
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and brsun.approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and brsun.create_user_id = #{request.createUserId}
         </if>
-        <if test="request.sealName != null and request.sealName !=''">
+        <if test="request != null and request.sealName != null and request.sealName !=''">
             and brsi.seal_name like concat('%',#{request.sealName},'%')
         </if>
-        <if test="request.sealType != null and request.sealType !=''">
+        <if test="request != null and request.sealType != null and request.sealType !=''">
             and brsi.seal_type = #{request.sealType}
         </if>
-        <if test="request.applyDeptName != null and request.applyDeptName !=''">
+        <if test="request != null and request.applyDeptName != null and request.applyDeptName !=''">
             and brsun.apply_dept_name like concat('%',#{request.applyDeptName},'%')
         </if>
-        <if test="request.applyUserName != null and request.applyUserName !=''">
+        <if test="request != null and request.applyUserName != null and request.applyUserName !=''">
             and brsun.apply_user_name like concat('%',#{request.applyUserName},'%')
         </if>
-        <if test="request.applyTimeStart != null and request.applyTimeStart !=''">
+        <if test="request != null and request.applyTimeStart != null and request.applyTimeStart !=''">
             and brsun.apply_time &gt;= #{request.applyTimeStart}
         </if>
-        <if test="request.applyTimeEnd != null and request.applyTimeEnd !=''">
+        <if test="request != null and request.applyTimeEnd != null and request.applyTimeEnd !=''">
             and brsun.apply_time &lt;= #{request.applyTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml
index 119bf7d..4f8392a 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml
@@ -31,6 +31,12 @@
         <if test="request.deptName != null and request.deptName !=''">
             and brsi.dept_name like concat('%',#{request.deptName},'%')
         </if>
+        <if test="request.ids != null">
+            and brsv.id in
+            <foreach collection="request.ids" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
         ORDER BY brsv.grant_date DESC
     </select>
 
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSupplierInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSupplierInfoMapper.xml
index fe8d399..e8ce7ef 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSupplierInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSupplierInfoMapper.xml
@@ -48,28 +48,28 @@
         SELECT *
         FROM biz_resource_supplier_info
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.supplierNo != null and request.supplierNo !=''">
+        <if test="request != null and request.supplierNo != null and request.supplierNo !=''">
             and supplier_no like concat('%',#{request.supplierNo},'%')
         </if>
-        <if test="request.supplierName != null and request.supplierName !=''">
+        <if test="request != null and request.supplierName != null and request.supplierName !=''">
             and supplier_name like concat('%',#{request.supplierName},'%')
         </if>
-        <if test="request.director != null and request.director !=''">
+        <if test="request != null and request.director != null and request.director !=''">
             and director like concat('%',#{request.director},'%')
         </if>
-        <if test="request.supplierType != null and request.supplierType !=''">
+        <if test="request != null and request.supplierType != null and request.supplierType !=''">
             and supplier_type = #{request.supplierType}
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/EnvLocationInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/EnvLocationInfoMapper.xml
new file mode 100644
index 0000000..68bcf10
--- /dev/null
+++ b/casic-metering-dao/src/main/resources/mapper/resource/EnvLocationInfoMapper.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.mapper.resource.EnvLocationInfoMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.resource.EnvLocationInfo">
+        <id column="id" property="id" />
+        <result column="location_no" property="locationNo" />
+        <result column="location_name" property="locationName" />
+        <result column="location_position" property="locationPosition" />
+        <result column="create_user_id" property="createUserId" />
+        <result column="create_user" property="createUser" />
+        <result column="create_time" property="createTime" />
+        <result column="update_time" property="updateTime" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, location_no, location_name, location_position, create_user_id, create_user, create_time, update_time
+    </sql>
+
+    <select id="selectLocationListPage" resultType="com.casic.missiles.dto.resource.environment.LocationListResponse">
+        SELECT *
+        FROM env_location_info
+        WHERE 1=1
+        <if test="request.locationNo != null and request.locationNo !=''">
+            AND location_no LIKE concat('%',#{request.locationNo},'%')
+        </if>
+        <if test="request.locationName != null and request.locationName !=''">
+            AND location_name LIKE concat('%',#{request.locationName},'%')
+        </if>
+        ORDER BY create_time DESC
+    </select>
+
+</mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml
index b28c18f..8854047 100644
--- a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml
@@ -11,7 +11,6 @@
         <result column="sign_desc" property="signDesc" />
         <result column="sign_director" property="signDirector" />
         <result column="sign_user_id" property="signUserId" />
-        <result column="sign_type" property="signType" />
         <result column="minio_file_name" property="minioFileName" />
         <result column="create_time" property="createTime" />
         <result column="update_time" property="updateTime" />
@@ -28,7 +27,6 @@
         <result column="sign_name" property="signName" />
         <result column="sign_desc" property="signDesc" />
         <result column="sign_director" property="signDirector" />
-        <result column="sign_type" property="signType" />
         <result column="sign_user_id" property="signUserId" />
         <result column="minio_file_name" property="minioFileName" />
         <result column="create_time" property="createTime" />
@@ -62,4 +60,58 @@
         JOIN system_sign_user_relation ssur ON ss.id = ssur.sign_id
         WHERE ssur.user_id = #{userId}
     </select>
+
+    <select id="selectSignListPage" resultMap="BaseResultMap">
+        SELECT ss.*, sd.SIMPLE_NAME AS deptName
+        FROM system_sign ss
+        LEFT JOIN sys_user su ON su.id = ss.sign_user_id
+        LEFT JOIN sys_dept sd ON sd.id = su.dept_id
+        WHERE 1=1
+        <if test="request.signNo != null and request.signNo !=''">
+            AND ss.sign_no LIKE concat('%',#{request.signNo},'%')
+        </if>
+        <if test="request.signName != null and request.signName !=''">
+            AND ss.sign_name LIKE concat('%',#{request.signName},'%')
+        </if>
+        <if test="request.signDirector != null and request.signDirector !=''">
+            AND ss.sign_director LIKE concat('%',#{request.signDirector},'%')
+        </if>
+        <if test="request.signUserId != null and request.signUserId !=''">
+            AND ss.sign_user_id = #{request.signUserId}
+        </if>
+        <if test="request.createStartTime != null and request.createStartTime !=''">
+            AND DATE_FORMAT(ss.create_time,'%Y-%m-%d') &gt;= DATE_FORMAT(#{request.createStartTime},'%Y-%m-%d')
+        </if>
+        <if test="request.createEndTime != null and request.createEndTime !=''">
+            AND DATE_FORMAT(ss.create_time,'%Y-%m-%d')  &lt;= DATE_FORMAT(#{request.createEndTime},'%Y-%m-%d')
+        </if>
+        ORDER BY ss.create_time DESC
+    </select>
+
+    <select id="selectSignList" resultMap="BaseResultMap">
+        SELECT ss.*, sd.SIMPLE_NAME AS deptName
+        FROM system_sign ss
+        LEFT JOIN sys_user su ON su.id = ss.sign_user_id
+        LEFT JOIN sys_dept sd ON sd.id = su.dept_id
+        WHERE 1=1
+        <if test="request.signNo != null and request.signNo !=''">
+            AND ss.sign_no LIKE concat('%',#{request.signNo},'%')
+        </if>
+        <if test="request.signName != null and request.signName !=''">
+            AND ss.sign_name LIKE concat('%',#{request.signName},'%')
+        </if>
+        <if test="request.signDirector != null and request.signDirector !=''">
+            AND ss.sign_director LIKE concat('%',#{request.signDirector},'%')
+        </if>
+        <if test="request.signUserId != null and request.signUserId !=''">
+            AND ss.sign_user_id = #{request.signUserId}
+        </if>
+        <if test="request.createStartTime != null and request.createStartTime !=''">
+            AND DATE_FORMAT(ss.create_time,'%Y-%m-%d') &gt;= DATE_FORMAT(#{request.createStartTime},'%Y-%m-%d')
+        </if>
+        <if test="request.createEndTime != null and request.createEndTime !=''">
+            AND DATE_FORMAT(ss.create_time,'%Y-%m-%d')  &lt;= DATE_FORMAT(#{request.createEndTime},'%Y-%m-%d')
+        </if>
+        ORDER BY ss.create_time DESC
+    </select>
 </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 515050a..60f530b 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
@@ -47,8 +47,8 @@
     String STORAGE_LOCATION = "bizStorageLocation";
     //计量专业
     String MEASURE_MAJOR = "bizMeasureMajor";
-    //管理状态
-    String MANAGER_STATE = "bizManagerState";
+    //标准装置管理状态
+    String STANDARD_MANAGER_STATE = "bizStandardManagerState";
 
     /**
      * 资源管理 字典code
@@ -95,8 +95,6 @@
     String MEASURE_STATUS = "measureStatus";
     //检定方式
     String MEASURE_TYPE = "measureType";
-    //标识打印标志类型
-    String IDENTIFY_PRINT_TYPE = "bizBusinessIdentify";
     //变更类型
     String REPORT_CHANGE_TYPE = "bizCertChangeType";
     //规模类型
@@ -111,19 +109,24 @@
     String MEASURE_CATEGORY = "measureCategory";
     //检定结果
     String MEASURE_RESULT = "measureResult";
+    //分包原因
+    String OUTSOURCE_REASON = "outsourceReason";
+
+    /**
+     * 系统管理
+     */
+    String TEMPLATE_TYPE = "templateType";
+
 
     /**
      * 标准装置 字典code
      */
     //类别
     String STANDARD_CATEGORY = "standardCategory";
-    //管理状态
-    String STANDARD_MANAGER_STATE = "standardManagerState";
     //标准等级
     String STANDARD_LEVEL = "standardLevel";
     //传递范围
     String STANDARD_TRANSMIT_RANGE = "transmitRange";
-
     //资本来源
     String CAPITAL_SOURCE = "capitalSource";
     //标准装置-申请类型
@@ -148,8 +151,6 @@
     String CERTIFICATE_CLASS = "certificationClass";
     //证书管理-检校专业
     String CALIBRATION_MAJOR = "calibrationMajor";
-    //分包原因
-    String OUTSOURCE_REASON = "outsourceReason";
 
     /**
      * 工作台
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/BaseApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/BaseApprovalListRequest.java
index 73c12c1..80d7424 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/BaseApprovalListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/BaseApprovalListRequest.java
@@ -6,6 +6,7 @@
 
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotEmpty;
+import java.util.List;
 
 /**
  * @Description:
@@ -19,14 +20,14 @@
      * 表单id
      */
     @NotBlank(message = "表单id不能为空")
-    @ApiModelProperty(value = "表单id（流程定义对应的表单id，等价于业务id）", dataType = "String")
+    @ApiModelProperty(value = "表单id（流程定义对应的表单id，等价于业务id），导出接口不用传", dataType = "String")
     private String formId;
 
     /**
      * 审批状态类型，对应ApprovalStatusEnum
      */
     @NotEmpty(message = "审批状态类型不能为空")
-    @ApiModelProperty(value = "审批状态类型code", dataType = "String")
+    @ApiModelProperty(value = "审批状态类型code，导出接口不用传", dataType = "String")
     private String approvalStatus;
 
     @ApiModelProperty(hidden = true)
@@ -34,4 +35,7 @@
 
     @ApiModelProperty(hidden = true)
     private Long createUserId;
+
+    @ApiModelProperty(value = "导出ids", dataType = "List")
+    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificatePrintApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificatePrintApprovalListRequest.java
index b93d1c9..3cc2f4e 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificatePrintApprovalListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificatePrintApprovalListRequest.java
@@ -5,8 +5,6 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import java.util.List;
-
 /**
  * @Description:
  * @Author: wangpeng
@@ -38,7 +36,4 @@
 
     @ApiModelProperty(value = "创建结束时间", dataType = "String")
     private String createTimeEnd;
-
-    @ApiModelProperty(value = "导出ids", dataType = "List")
-    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportApprovalListRequest.java
index 4f7a038..c115847 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportApprovalListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportApprovalListRequest.java
@@ -5,8 +5,6 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import java.util.List;
-
 /**
  * @Description:
  * @Author: wangpeng
@@ -15,6 +13,8 @@
 @ApiModel
 @Data
 public class CertificateReportApprovalListRequest extends BaseApprovalListRequest {
+    @ApiModelProperty(value = "委托方id", dataType = "String")
+    private Long customerId;
 
     @ApiModelProperty(value = "证书报告编号", dataType = "String")
     private String certificateReportNo;
@@ -37,6 +37,4 @@
     @ApiModelProperty(value = "检校结束时间", dataType = "String")
     private String calibrationTimeEnd;
 
-    @ApiModelProperty(value = "导出ids", dataType = "List")
-    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/identify/IdentifyListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/identify/IdentifyListRequest.java
index 1b87ae6..f019203 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/identify/IdentifyListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/identify/IdentifyListRequest.java
@@ -4,6 +4,8 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * @Description:
  * @Author: wangpeng
@@ -26,4 +28,7 @@
 
     @ApiModelProperty(value = "打印结束时间", dataType = "String")
     private String createTimeEnd;
+
+    @ApiModelProperty(value = "导出ids", dataType = "List")
+    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListRequest.java
index 1264883..62415fb 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListRequest.java
@@ -7,6 +7,7 @@
 import lombok.Data;
 
 import javax.validation.constraints.NotBlank;
+import java.util.List;
 
 @Data
 @ApiModel
@@ -37,4 +38,6 @@
     @ApiModelProperty(value = "是否加急（1是0否null全部）", dataType = "Integer")
     private String isUrgent;
 
+    @ApiModelProperty(value = "导出ids", dataType = "List")
+    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListRequest.java
index 5201d7b..499760a 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListRequest.java
@@ -17,6 +17,9 @@
     @ApiModelProperty(value = "任务单编号", dataType = "String")
     private String orderNo;
 
+    @ApiModelProperty(value = "委托方id", dataType = "Long")
+    private Long customerId;
+
     @ApiModelProperty(value = "委托方名称", dataType = "String")
     private String customerName;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OrderSampleDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OrderSampleDTO.java
new file mode 100644
index 0000000..796edc0
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OrderSampleDTO.java
@@ -0,0 +1,19 @@
+package com.casic.missiles.dto.business.outsource;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/8/24 11:38
+ */
+@ApiModel
+@Data
+public class OrderSampleDTO {
+    @ApiModelProperty(value = "任务单id", dataType = "Long")
+    private Long orderId;
+    @ApiModelProperty(value = "受检设备id", dataType = "Long")
+    private Long sampleId;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceAssessApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceAssessApprovalListRequest.java
new file mode 100644
index 0000000..9a930c3
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceAssessApprovalListRequest.java
@@ -0,0 +1,30 @@
+package com.casic.missiles.dto.business.outsource;
+
+import com.casic.missiles.dto.BaseApprovalListRequest;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/8/24 11:01
+ */
+@ApiModel
+@Data
+public class OutsourceAssessApprovalListRequest extends BaseApprovalListRequest {
+    @ApiModelProperty(value = "评审表编号", dataType = "String")
+    private String projectNo;
+
+    @ApiModelProperty(value = "分包机构名称", dataType = "String")
+    private String outsourcerName;
+
+    @ApiModelProperty(value = "申请人", dataType = "String")
+    private String applicantName;
+
+    @ApiModelProperty(value = "申请时间开始", dataType = "String")
+    private String applicantTimeStart;
+
+    @ApiModelProperty(value = "申请时间结束", dataType = "String")
+    private String applicantTimeEnd;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceAssessSaveResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceAssessSaveResponse.java
new file mode 100644
index 0000000..8bf9aad
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceAssessSaveResponse.java
@@ -0,0 +1,20 @@
+package com.casic.missiles.dto.business.outsource;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/8/14 16:17
+ */
+@ApiModel
+@Data
+public class OutsourceAssessSaveResponse {
+    @ApiModelProperty(value = "主键id", dataType = "Long")
+    private Long id;
+
+    @ApiModelProperty(value = "编号", dataType = "String")
+    private String projectNo;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProtocolApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProtocolApprovalListRequest.java
new file mode 100644
index 0000000..0f32331
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProtocolApprovalListRequest.java
@@ -0,0 +1,30 @@
+package com.casic.missiles.dto.business.outsource;
+
+import com.casic.missiles.dto.BaseApprovalListRequest;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/8/24 15:01
+ */
+@ApiModel
+@Data
+public class OutsourceProtocolApprovalListRequest extends BaseApprovalListRequest {
+    @ApiModelProperty(value = "协议书编号", dataType = "String")
+    private String protocolNo;
+
+    @ApiModelProperty(value = "分包方名称", dataType = "String")
+    private String outsourcerName;
+
+    @ApiModelProperty(value = "申请人", dataType = "String")
+    private String applicantName;
+
+    @ApiModelProperty(value = "申请时间开始", dataType = "String")
+    private String applicantTimeStart;
+
+    @ApiModelProperty(value = "申请时间结束", dataType = "String")
+    private String applicantTimeEnd;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProtocolSaveResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProtocolSaveResponse.java
new file mode 100644
index 0000000..e324967
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProtocolSaveResponse.java
@@ -0,0 +1,20 @@
+package com.casic.missiles.dto.business.outsource;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/8/14 16:17
+ */
+@ApiModel
+@Data
+public class OutsourceProtocolSaveResponse {
+    @ApiModelProperty(value = "主键id", dataType = "Long")
+    private Long id;
+
+    @ApiModelProperty(value = "编号", dataType = "String")
+    private String protocolNo;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveApprovalListRequest.java
index f29f4e4..7047c28 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveApprovalListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveApprovalListRequest.java
@@ -5,8 +5,6 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import java.util.List;
-
 /**
  * @Description: 现场检测审批列表请求实体
  * @Author: wangpeng
@@ -30,7 +28,4 @@
     @ApiModelProperty(value = "申请时间结束", dataType = "String")
     private String applyTimeEnd;
 
-    @ApiModelProperty(value = "导出ids", dataType = "List")
-    private List<Long> ids;
-
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveDetailResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveDetailResponse.java
index 1f28752..394c934 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveDetailResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveDetailResponse.java
@@ -12,6 +12,18 @@
     @ApiModelProperty(value = "id，更新/删除使用参数", dataType = "Long")
     private Long id;
 
+    @ApiModelProperty(value = "实验室代码(字典code)", dataType = "String")
+    private String labCode;
+
+    @ApiModelProperty(value = "实验室代码(字典value)", dataType = "String")
+    private String labCodeName;
+
+    @ApiModelProperty(value = "组别代码(字典code)", dataType = "String")
+    private String groupCode;
+
+    @ApiModelProperty(value = "组别代码(字典value)", dataType = "String")
+    private String groupCodeName;
+
     @ApiModelProperty(value = "审批编号", dataType = "String")
     private String siteExecutiveNo;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/environment/LocationListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/environment/LocationListRequest.java
new file mode 100644
index 0000000..13d03c3
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/environment/LocationListRequest.java
@@ -0,0 +1,20 @@
+package com.casic.missiles.dto.resource.environment;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/6/8 13:56
+ */
+@ApiModel
+@Data
+public class LocationListRequest {
+    @ApiModelProperty(value = "地点编号", dataType = "String")
+    private String locationNo;
+
+    @ApiModelProperty(value = "地点名称", dataType = "String")
+    private String locationName;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/environment/LocationListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/environment/LocationListResponse.java
new file mode 100644
index 0000000..4c531af
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/environment/LocationListResponse.java
@@ -0,0 +1,78 @@
+package com.casic.missiles.dto.resource.environment;
+
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
+import com.baomidou.mybatisplus.annotation.TableField;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description: 地点列表响应实体
+ * @Author: wangpeng
+ * @Date: 2023/6/8 13:53
+ */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
+@ApiModel
+@Data
+public class LocationListResponse {
+    @ApiModelProperty(value = "主键id", dataType = "Long")
+    private Long id;
+
+    /**
+     * 地点编号
+     */
+    @ExcelProperty("地点编号")
+    @ApiModelProperty(value = "地点编号", dataType = "String")
+    private String locationNo;
+
+    /**
+     * 地点名称
+     */
+    @ExcelProperty("地点名称")
+    @ApiModelProperty(value = "地点名称", dataType = "String")
+    private String locationName;
+
+    /**
+     * 地点位置
+     */
+    @ExcelProperty("地点位置")
+    @ApiModelProperty(value = "地点位置", dataType = "String")
+    private String locationPosition;
+
+    /**
+     * 创建人id
+     */
+    @ApiModelProperty(value = "创建人id", dataType = "Long")
+    private Long createUserId;
+
+    /**
+     * 创建人
+     */
+    @ExcelProperty("创建人")
+    @ApiModelProperty(value = "创建人", dataType = "String")
+    @TableField("create_user")
+    private String createUser;
+
+    /**
+     * 创建时间
+     */
+    @ExcelProperty("创建时间")
+    @ApiModelProperty(value = "创建时间", dataType = "String")
+    private String createTime;
+
+    /**
+     * 更新时间
+     */
+    @ApiModelProperty(value = "更新时间", dataType = "String")
+    private String updateTime;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertRequest.java
index 9a7f6c6..c827915 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertRequest.java
@@ -4,6 +4,8 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * @Description:
  * @Author: wangpeng
@@ -16,4 +18,7 @@
     private String name;
     @ApiModelProperty(value = "部门名", dataType = "String")
     private String deptName;
+
+    @ApiModelProperty(value = "导出ids", dataType = "List")
+    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertResponse.java
index f78b159..8f2f79e 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertResponse.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.dto.resource.staff;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.casic.missiles.annotation.DictCodeField;
 import com.casic.missiles.constants.MeterDictCode;
 import io.swagger.annotations.ApiModel;
@@ -13,12 +20,18 @@
  * @Author: wangpeng
  * @Date: 2023/7/27 15:13
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @ApiModel
 @Data
 public class StaffCertResponse {
     /**
      * 人员编号
      */
+    @ExcelProperty(value = "人员编号",order = 0)
     @NotEmpty(message = "人员编号不能为空")
     @ApiModelProperty(value = "人员编号", dataType = "String")
     private String staffNo;
@@ -26,6 +39,7 @@
     /**
      * 姓名
      */
+    @ExcelProperty(value = "姓名",order = 1)
     @ApiModelProperty(value = "姓名", dataType = "String")
     private String staffName;
 
@@ -54,6 +68,7 @@
     /**
      * 部门名字
      */
+    @ExcelProperty(value = "工作部门",order = 2)
     @ApiModelProperty(value = "部门名字", dataType = "String")
     private String deptName;
 
@@ -66,6 +81,7 @@
     /**
      * 计量专业
      */
+    @ExcelProperty(value = "计量专业",order = 3)
     @ApiModelProperty(value = "计量专业", dataType = "String")
     private String major;
 
@@ -110,6 +126,7 @@
     /**
      * 证书号
      */
+    @ExcelProperty(value = "证号",order = 4)
     @ApiModelProperty(value = "证书号", dataType = "String")
     private String certNo;
 
@@ -122,12 +139,14 @@
     /**
      * 有效日期
      */
+    @ExcelProperty(value = "证书有效期",order = 6)
     @ApiModelProperty(value = "有效日期", dataType = "String")
     private String effectiveDate;
 
     /**
      * 发放日期
      */
+    @ExcelProperty(value = "发证日期",order = 5)
     @ApiModelProperty(value = "发放日期", dataType = "String")
     private String grantDate;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffListRequest.java
index 7c4afb3..0a1194a 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffListRequest.java
@@ -4,6 +4,8 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * @Description:
  * @Author: wangpeng
@@ -18,4 +20,7 @@
     private String deptName;
     @ApiModelProperty(value = "部门id", dataType = "Long")
     private Long deptId;
+
+    @ApiModelProperty(value = "导出ids", dataType = "List")
+    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/TrainListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/TrainListRequest.java
index f68597b..6321f8b 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/TrainListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/TrainListRequest.java
@@ -14,6 +14,8 @@
 public class TrainListRequest {
     @ApiModelProperty(value = "训练登记表编号", dataType = "String")
     private String trainNo;
+    @ApiModelProperty(value = "值班领导", dataType = "String")
+    private String dutyLeader;
     @ApiModelProperty(value = "创建开始时间", dataType = "String")
     private String createTimeStart;
     @ApiModelProperty(value = "创建结束时间", dataType = "String")
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/SignAddRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/SignAddRequest.java
index 117be34..d71055c 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/SignAddRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/SignAddRequest.java
@@ -43,13 +43,6 @@
     private Long signUserId;
 
     /**
-     * 签章或签名-字典code
-     */
-    @NotBlank(message = "类型不能为空")
-    @ApiModelProperty(value = "签名/签章-字典code", dataType = "String", required = true)
-    private String signType;
-
-    /**
      * minio存储文件名
      */
     @ApiModelProperty(value = "上传文件返回名称", dataType = "String")
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateAddRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateAddRequest.java
index aff1265..6316648 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateAddRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateAddRequest.java
@@ -17,30 +17,28 @@
 @Data
 public class TemplateAddRequest extends BaseSystemRequest {
     /**
-     * 原始记录模板/证书报告模板名称
+     * 模板名称
      */
     @ApiModelProperty(value = "名称", dataType = "String", required = true)
     @NotBlank(message = "名称不能为空")
     private String templateName;
 
     /**
-     * 原始记录模板/证书报告模板描述
+     * 模板描述
      */
     @ApiModelProperty(value = "描述", dataType = "String")
     private String templateDesc;
 
     /**
-     * 原始记录模板/证书报告模板创建人
+     * 创建人
      */
     @ApiModelProperty(value = "创建人", dataType = "String", required = true)
     @NotBlank(message = "创建人不能为空")
     private String templateCreator;
 
-    /**
-     * 原始记录模板/证书报告模板-字典code
-     */
-    @NotBlank(message = "类型不能为空")
-    @ApiModelProperty(value = "原始记录模板/证书报告模板-字典code", dataType = "String", required = true)
+
+    @NotBlank(message = "模板类型不能为空")
+    @ApiModelProperty(value = "模板类型(字典code)", dataType = "String", required = true)
     private String templateType;
 
     /**
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateListRequest.java
index eec5a1e..6d17bbe 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateListRequest.java
@@ -1,11 +1,12 @@
 package com.casic.missiles.dto.system;
 
+import com.casic.missiles.annotation.DictCodeField;
+import com.casic.missiles.constants.MeterDictCode;
 import com.casic.missiles.dto.BaseSystemRequest;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import javax.validation.constraints.NotBlank;
 import java.util.List;
 
 /**
@@ -19,8 +20,8 @@
     /**
      * 类型
      */
-//    @ApiModelProperty(value = "类型-字典code", dataType = "String", required = true)
-    @NotBlank(message = "类型不能为空")
+    @DictCodeField(message = "模板类型不合法", cacheName = MeterDictCode.TEMPLATE_TYPE)
+    @ApiModelProperty(value = "模板类型(字典code)", dataType = "String")
     private String templateType;
 
     /**
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificateChangeApply.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificateChangeApply.java
index 9216308..36923fd 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificateChangeApply.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificateChangeApply.java
@@ -1,11 +1,19 @@
 package com.casic.missiles.model.business;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 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 com.casic.missiles.dto.BaseRequest;
+import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -20,6 +28,12 @@
  * @author wangpeng
  * @since 2023-08-15
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
+@ApiModel
 @Data
 @TableName("biz_business_certificate_change_apply")
 public class BizBusinessCertificateChangeApply extends BaseRequest implements Serializable {
@@ -33,6 +47,7 @@
     /**
      * 申请单编号
      */
+    @ExcelProperty(value = "申请单编号", order = 1)
     @ApiModelProperty(value = "申请单编号", dataType = "String")
     @TableField("change_apply_no")
     private String changeApplyNo;
@@ -40,6 +55,7 @@
     /**
      * 申请单名字
      */
+    @ExcelProperty(value = "申请单名称", order = 2)
     @ApiModelProperty(value = "申请单名字", dataType = "String")
     @TableField("change_apply_name")
     private String changeApplyName;
@@ -54,6 +70,7 @@
     /**
      * 更换证书编号
      */
+    @ExcelProperty(value = "更换证书编号", order = 3)
     @ApiModelProperty(value = "更换证书编号", dataType = "String")
     @TableField("change_report_no")
     private String changeReportNo;
@@ -61,7 +78,8 @@
     /**
      * 更换证书名字
      */
-    @ApiModelProperty(value = "更换证书名字", dataType = "String")
+    @ExcelProperty(value = "更换证书/报告名称", order = 4)
+    @ApiModelProperty(value = "更换证书/报告名称", dataType = "String")
     @TableField("change_report_name")
     private String changeReportName;
 
@@ -73,6 +91,7 @@
     @TableField("change_type")
     private String changeType;
 
+    @ExcelProperty(value = "变更类型", order = 5)
     @ApiModelProperty(value = "变更类型(字典value)", dataType = "String")
     @TableField(exist = false)
     private String changeTypeName;
@@ -142,13 +161,15 @@
     /**
      * 创建用户名字
      */
-    @ApiModelProperty(value = "创建用户名字", dataType = "String")
+    @ExcelProperty(value = "创建人", order = 6)
+    @ApiModelProperty(value = "创建人名字", dataType = "String")
     @TableField("create_user_name")
     private String createUserName;
 
     /**
      * 创建时间
      */
+    @ExcelProperty(value = "创建时间", order = 7)
     @ApiModelProperty(value = "创建时间", dataType = "String")
     @TableField("create_time")
     private String createTime;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificateReport.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificateReport.java
index f01db9e..db06018 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificateReport.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificateReport.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.model.business;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -22,6 +29,11 @@
  * @author wangpeng
  * @since 2023-08-14
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @ApiModel
 @Data
 @TableName("biz_business_certificate_report")
@@ -36,6 +48,7 @@
     /**
      * 证书报告编号
      */
+    @ExcelProperty(value = "证书报告编号", order = 1)
     @ApiModelProperty(value = "证书报告编号", dataType = "String")
     @TableField("certificate_report_no")
     private String certificateReportNo;
@@ -43,6 +56,7 @@
     /**
      * 证书报告名称
      */
+    @ExcelProperty(value = "证书报告名称", order = 2)
     @ApiModelProperty(value = "证书报告名称", dataType = "String")
     @TableField("certificate_report_name")
     private String certificateReportName;
@@ -62,6 +76,7 @@
     @TableField("measure_category")
     private String measureCategory;
 
+    @ExcelProperty(value = "检校类别", order = 6)
     @ApiModelProperty(value = "检校类别(字典value)", dataType = "String")
     @TableField(exist = false)
     private String measureCategoryName;
@@ -69,6 +84,7 @@
     /**
      * 检校时间
      */
+    @ExcelProperty(value = "检校时间", order = 8)
     @ApiModelProperty(value = "检校时间", dataType = "String")
     @TableField("calibration_time")
     private String calibrationTime;
@@ -267,18 +283,22 @@
     @TableField(exist = false)
     private Integer decisionItem;
 
-    @ApiModelProperty(value = "设备样品编号（列表返回参数）", dataType = "String")
+    @ExcelProperty(value = "被检设备统一编号", order = 3)
+    @ApiModelProperty(value = "被检设备统一编号（列表返回参数）", dataType = "String")
     @TableField(exist = false)
     private String sampleNo;
 
-    @ApiModelProperty(value = "设备样品名称（列表返回参数）", dataType = "String")
+    @ExcelProperty(value = "被检设备名称", order = 4)
+    @ApiModelProperty(value = "被检设备名称（列表返回参数）", dataType = "String")
     @TableField(exist = false)
     private String sampleName;
 
-    @ApiModelProperty(value = "设备样品规格型号（列表返回参数）", dataType = "String")
+    @ExcelProperty(value = "规格型号", order = 5)
+    @ApiModelProperty(value = "规格型号（列表返回参数）", dataType = "String")
     @TableField(exist = false)
     private String sampleModel;
 
+    @ExcelProperty(value = "检定员", order = 7)
     @ApiModelProperty(value = "检定员名字（列表返回参数）", dataType = "String")
     @TableField(exist = false)
     private String staffName;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessIdentifyInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessIdentifyInfo.java
index 46bfba5..f1a9bec 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessIdentifyInfo.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessIdentifyInfo.java
@@ -1,10 +1,15 @@
 package com.casic.missiles.model.business;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 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;
 
@@ -20,6 +25,11 @@
  * @author wangpeng
  * @since 2023-08-15
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @Data
 @TableName("biz_business_identify_info")
 public class BizBusinessIdentifyInfo implements Serializable {
@@ -33,6 +43,7 @@
     /**
      * 记录编号
      */
+    @ExcelProperty(value = "记录编号", order = 1)
     @ApiModelProperty(value = "记录编号", dataType = "String")
     @TableField("record_no")
     private String recordNo;
@@ -41,20 +52,15 @@
      * 标志类型(字典code)
      */
     @NotEmpty(message = "标志类型不能为空")
-    @ApiModelProperty(value = "标志类型(字典code)", dataType = "String")
-    @DictCodeField(message = "标志类型不合法", cacheName = MeterDictCode.IDENTIFY_PRINT_TYPE)
+    @ApiModelProperty(value = "标志类型(直接存计量标识/使用状态/校准状态的字典value)", dataType = "String")
     @TableField("identify_type")
     private String identifyType;
 
-    @ApiModelProperty(value = "标志类型(字典value)", dataType = "String")
-    @TableField(exist = false)
-    private String identifyTypeName;
-
     /**
      * 设备id(可以是受检设备/设备台账)
      */
     @NotNull(message = "设备id不能为空")
-    @ApiModelProperty(value = "设备id(可以是受检设备/设备台账)", dataType = "String")
+    @ApiModelProperty(value = "设备id(可以是受检设备/设备台账)", dataType = "Long")
     @TableField("device_id")
     private Long deviceId;
 
@@ -66,29 +72,32 @@
     @TableField("device_type")
     private String deviceType;
 
+    @ExcelProperty(value = "统一编号", order = 3)
     @NotEmpty(message = "设备编号不能为空")
-    @ApiModelProperty(value = "设备编号", dataType = "String")
+    @ApiModelProperty(value = "统一编号", dataType = "String")
     @TableField("device_no")
     private String deviceNo;
 
     /**
      * 设备名字
      */
-    @NotEmpty(message = "设备名字不能为空")
-    @ApiModelProperty(value = "设备名字", dataType = "String")
+    @ExcelProperty(value = "设备名称", order = 4)
+    @NotEmpty(message = "设备名称不能为空")
+    @ApiModelProperty(value = "设备名称", dataType = "String")
     @TableField("device_name")
     private String deviceName;
 
     /**
      * 检定员id
      */
-    @ApiModelProperty(value = "检定员id", dataType = "String")
+    @ApiModelProperty(value = "检定员id", dataType = "Long")
     @TableField("measure_person_id")
     private Long measurePersonId;
 
     /**
      * 检定员名字
      */
+    @ExcelProperty(value = "检定员", order = 5)
     @ApiModelProperty(value = "检定员名字", dataType = "String")
     @TableField("measure_person")
     private String measurePerson;
@@ -103,7 +112,8 @@
     /**
      * 更新时间
      */
-    @ApiModelProperty(value = "更新时间", dataType = "String")
+    @ExcelProperty(value = "打印时间", order = 6)
+    @ApiModelProperty(value = "打印时间", dataType = "String")
     @TableField("update_time")
     private String updateTime;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceAssess.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceAssess.java
index 659d9ca..6720b90 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceAssess.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceAssess.java
@@ -1,11 +1,26 @@
 package com.casic.missiles.model.business;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 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 com.casic.missiles.dto.BaseRequest;
+import com.casic.missiles.dto.business.outsource.OrderSampleDTO;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import javax.validation.constraints.NotEmpty;
 import java.io.Serializable;
+import java.util.List;
 
 /**
  * <p>
@@ -15,146 +30,231 @@
  * @author wangpeng
  * @since 2023-08-16
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
+@ApiModel
 @Data
 @TableName("biz_business_outsource_assess")
-public class BizBusinessOutsourceAssess implements Serializable {
+public class BizBusinessOutsourceAssess extends BaseRequest implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
+    @ApiModelProperty(value = "id，更新/删除使用参数", dataType = "Long")
     @TableId("id")
     private Long id;
 
     /**
      * 评审表编号
      */
+    @ExcelProperty(value = "评审表编号", order = 1)
+    @ApiModelProperty(value = "评审表编号(后台生成)", dataType = "String")
     @TableField("project_no")
     private String projectNo;
 
     /**
      * 评审表名称
      */
+    @ExcelProperty(value = "评审表名称", order = 2)
+    @ApiModelProperty(value = "评审表名称", dataType = "String")
     @TableField("project_name")
     private String projectName;
 
+    @NotEmpty(message = "实验室代码不能为空")
+    @DictCodeField(message = "实验室代码描述不合法", cacheName = MeterDictCode.LAB_CODE)
+    @ApiModelProperty(value = "实验室代码(字典code)", dataType = "String")
+    @TableField("lab_code")
+    private String labCode;
+
+    @ApiModelProperty(value = "实验室代码(字典value)", dataType = "String")
+    @TableField(exist = false)
+    private String labCodeName;
+
+    /**
+     * 组别代码
+     */
+    @NotEmpty(message = "组别代码不能为空")
+    @DictCodeField(message = "组别代码描述不合法", cacheName = MeterDictCode.GROUP_CODE)
+    @ApiModelProperty(value = "组别代码(字典code)", dataType = "String")
+    @TableField("group_code")
+    private String groupCode;
+
+    @ApiModelProperty(value = "组别代码(字典value)", dataType = "String")
+    @TableField(exist = false)
+    private String groupCodeName;
+
     /**
      * 申请人id
      */
+    @ApiModelProperty(value = "申请人id", dataType = "String")
     @TableField("applicant_id")
     private Long applicantId;
 
     /**
      * 申请人名字
      */
+    @ExcelProperty(value = "申请人", order = 5)
+    @ApiModelProperty(value = "申请人", dataType = "String")
     @TableField("applicant_name")
     private String applicantName;
 
     /**
      * 申请时间
      */
+    @ExcelProperty(value = "申请时间", order = 6)
+    @ApiModelProperty(value = "申请时间", dataType = "String")
     @TableField("applicant_time")
     private String applicantTime;
 
     /**
      * 附件(minio存储文件名)
      */
+    @ApiModelProperty(value = "附件(minio存储文件名)", dataType = "String")
     @TableField("minio_file_name")
     private String minioFileName;
 
     /**
      * 备注
      */
+    @ApiModelProperty(value = "备注", dataType = "String")
     @TableField("remark")
     private String remark;
 
     /**
      * 创建人id
      */
+    @ApiModelProperty(value = "创建人id", dataType = "String")
     @TableField("create_user_id")
     private Long createUserId;
 
     /**
      * 创建人名字
      */
+    @ApiModelProperty(value = "创建人名字", dataType = "String")
     @TableField("create_user_name")
     private String createUserName;
 
     /**
      * 分包方id
      */
+    @ApiModelProperty(value = "评审表编号", dataType = "String")
     @TableField("outsourcer_id")
     private Long outsourcerId;
 
     /**
      * 预计开始时间
      */
+    @ApiModelProperty(value = "预计开始时间", dataType = "String")
     @TableField("pre_start_time")
     private String preStartTime;
 
     /**
      * 预计结束时间
      */
+    @ApiModelProperty(value = "预计结束时间", dataType = "String")
     @TableField("pre_end_time")
     private String preEndTime;
 
     /**
      * 分包原因-字典
      */
+    @ApiModelProperty(value = "分包原因(字典code)", dataType = "String")
+    @DictCodeField(message = "分包原因描述不合法", cacheName = MeterDictCode.OUTSOURCE_REASON)
     @TableField("outsource_reason")
     private String outsourceReason;
 
+    @ApiModelProperty(value = "分包原因(字典value)", dataType = "String")
+    @TableField(exist = false)
+    private String outsourceReasonName;
+
     /**
      * 预计费用
      */
+    @ApiModelProperty(value = "预计费用", dataType = "String")
     @TableField("pre_cost")
     private String preCost;
 
     /**
      * 审批状态
      */
+    @ApiModelProperty(value = "审批状态", dataType = "String")
+    @DictCodeField(message = "审批状态描述不合法", cacheName = MeterDictCode.APPROVAL_STATUS)
     @TableField("approval_status")
     private String approvalStatus;
 
     /**
      * 流程实例id
      */
+    @ApiModelProperty(value = "流程实例id", dataType = "String")
     @TableField("process_id")
     private String processId;
 
     /**
      * 实验室认可情况
      */
+    @ApiModelProperty(value = "实验室认可情况", dataType = "String")
     @TableField("approve_situation")
     private String approveSituation;
 
     /**
      * 溯源性
      */
+    @ApiModelProperty(value = "溯源性", dataType = "String")
     @TableField("traceability")
     private String traceability;
 
     /**
      * 测试方法
      */
+    @ApiModelProperty(value = "测试方法", dataType = "String")
     @TableField("test_method")
     private String testMethod;
 
     /**
      * 技术能力
      */
+    @ApiModelProperty(value = "技术能力", dataType = "String")
     @TableField("technique_ability")
     private String techniqueAbility;
 
     /**
      * 创建时间
      */
+    @ApiModelProperty(hidden = true)
     @TableField("create_time")
     private String createTime;
 
     /**
      * 更新时间
      */
+    @ApiModelProperty(hidden = true)
     @TableField("update_time")
     private String updateTime;
 
+    @ApiModelProperty(value = "审批状态类型-字典value", dataType = "String")
+    @TableField(exist = false)
+    private String approvalStatusName;
 
+    @ApiModelProperty(value = "任务id（同意、驳回等操作使用）", dataType = "String")
+    @TableField(exist = false)
+    private String taskId;
+
+    @ApiModelProperty(value = "可选决策项（1同意驳回拒绝 2同意驳回 3同意拒绝，用于待审批列表同意/驳回/拒绝按钮展示）", dataType = "Integer")
+    @TableField(exist = false)
+    private Integer decisionItem;
+
+    @NotEmpty(message = "受检设备信息不能为空")
+    @ApiModelProperty(value = "受检设备id列表（新建使用参数）", dataType = "List")
+    @TableField(exist = false)
+    private List<OrderSampleDTO> orderSampleList;
+
+    @ExcelProperty(value = "分包机构名称", order = 3)
+    @ApiModelProperty(value = "分包机构名称（列表返回参数）", dataType = "String")
+    private String outsourcerName;
+
+    @ExcelProperty(value = "机构负责人", order = 4)
+    @ApiModelProperty(value = "机构负责人（列表返回参数）", dataType = "String")
+    private String director;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceProtocol.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceProtocol.java
new file mode 100644
index 0000000..38df697
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceProtocol.java
@@ -0,0 +1,225 @@
+package com.casic.missiles.model.business;
+
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
+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 com.casic.missiles.dto.BaseRequest;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotEmpty;
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 计量检定业务-分包管理-测试、校准或检定工作分包协议书
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-08-24
+ */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
+@Data
+@TableName("biz_business_outsource_protocol")
+public class BizBusinessOutsourceProtocol extends BaseRequest implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "id，更新/删除使用参数", dataType = "Long")
+    @TableId("id")
+    private Long id;
+
+    /**
+     * 协议书编号
+     */
+    @ExcelProperty(value = "协议书编号", order = 1)
+    @ApiModelProperty(value = "协议书编号(后台生成)", dataType = "String")
+    @TableField("protocol_no")
+    private String protocolNo;
+
+    /**
+     * 协议书名称
+     */
+    @ExcelProperty(value = "协议书名称", order = 2)
+    @ApiModelProperty(value = "协议书名称", dataType = "String")
+    @TableField("project_name")
+    private String projectName;
+
+    @NotEmpty(message = "实验室代码不能为空")
+    @DictCodeField(message = "实验室代码描述不合法", cacheName = MeterDictCode.LAB_CODE)
+    @ApiModelProperty(value = "实验室代码(字典code)", dataType = "String")
+    @TableField("lab_code")
+    private String labCode;
+
+    @ApiModelProperty(value = "实验室代码(字典value)", dataType = "String")
+    @TableField(exist = false)
+    private String labCodeName;
+
+    @NotEmpty(message = "组别代码不能为空")
+    @DictCodeField(message = "组别代码描述不合法", cacheName = MeterDictCode.GROUP_CODE)
+    @ApiModelProperty(value = "组别代码(字典code)", dataType = "String")
+    @TableField("group_code")
+    private String groupCode;
+
+    @ApiModelProperty(value = "组别代码(字典value)", dataType = "String")
+    @TableField(exist = false)
+    private String groupCodeName;
+
+    /**
+     * 分包方id
+     */
+    @ApiModelProperty(value = "分包方id", dataType = "Long")
+    @TableField("outsourcer_id")
+    private Long outsourcerId;
+
+    /**
+     * 其他
+     */
+    @ApiModelProperty(value = "其他", dataType = "String")
+    @TableField("remark")
+    private String remark;
+
+    /**
+     * 分包方编号
+     */
+    @ApiModelProperty(value = "分包方编号(新建不用传)", dataType = "String")
+    @TableField("outsource_no")
+    private String outsourceNo;
+
+    /**
+     * 分包方名称
+     */
+    @ExcelProperty(value = "分包方名称", order = 3)
+    @ApiModelProperty(value = "分包方名称(新建不用传)", dataType = "String")
+    @TableField("outsource_name")
+    private String outsourceName;
+
+    /**
+     * 联系人
+     */
+    @ExcelProperty(value = "联系人", order = 4)
+    @ApiModelProperty(value = "联系人", dataType = "String")
+    @TableField("contacts")
+    private String contacts;
+
+    /**
+     * 电话
+     */
+    @ApiModelProperty(value = "电话", dataType = "String")
+    @TableField("mobile")
+    private String mobile;
+
+    /**
+     * 地址
+     */
+    @ApiModelProperty(value = "地址", dataType = "String")
+    @TableField("address")
+    private String address;
+
+    /**
+     * 要求完成日期
+     */
+    @ApiModelProperty(value = "要求完成日期", dataType = "String")
+    @TableField("require_date")
+    private String requireDate;
+
+    /**
+     * 分包费用(元)
+     */
+    @ApiModelProperty(value = "分包费用(元)", dataType = "String")
+    @TableField("outsource_cost")
+    private Double outsourceCost;
+
+    /**
+     * 分包方负责人
+     */
+    @ApiModelProperty(value = "分包方负责人", dataType = "String")
+    @TableField("director")
+    private String director;
+
+    /**
+     * 分包项目
+     */
+    @ApiModelProperty(value = "分包项目", dataType = "String")
+    @TableField("item")
+    private String item;
+
+    /**
+     * 分包要求
+     */
+    @ApiModelProperty(value = "分包要求", dataType = "String")
+    @TableField("requires")
+    private String requires;
+
+    /**
+     * 创建人id
+     */
+    @ApiModelProperty(hidden = true)
+    @TableField("create_user_id")
+    private Long createUserId;
+
+    /**
+     * 创建人名字
+     */
+    @ExcelProperty(value = "申请人", order = 5)
+    @ApiModelProperty(value = "申请人", dataType = "String")
+    @TableField("create_user_name")
+    private String createUserName;
+
+    /**
+     * 审批状态
+     */
+    @ApiModelProperty(value = "审批状态", dataType = "String")
+    @DictCodeField(message = "审批状态描述不合法", cacheName = MeterDictCode.APPROVAL_STATUS)
+    @TableField("approval_status")
+    private String approvalStatus;
+
+    /**
+     * 流程实例id
+     */
+    @ApiModelProperty(value = "流程实例id", dataType = "String")
+    @TableField("process_id")
+    private String processId;
+
+    /**
+     * 创建时间
+     */
+    @ExcelProperty(value = "申请时间", order = 6)
+    @ApiModelProperty(value = "申请时间", dataType = "String")
+    @TableField("create_time")
+    private String createTime;
+
+    /**
+     * 更新时间
+     */
+    @ApiModelProperty(hidden = true)
+    @TableField("update_time")
+    private String updateTime;
+
+    @ApiModelProperty(value = "审批状态类型-字典value", dataType = "String")
+    @TableField(exist = false)
+    private String approvalStatusName;
+
+    @ApiModelProperty(value = "任务id（同意、驳回等操作使用）", dataType = "String")
+    @TableField(exist = false)
+    private String taskId;
+
+    @ApiModelProperty(value = "可选决策项（1同意驳回拒绝 2同意驳回 3同意拒绝，用于待审批列表同意/驳回/拒绝按钮展示）", dataType = "Integer")
+    @TableField(exist = false)
+    private Integer decisionItem;
+
+
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourcerInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourcerInfo.java
index ec4e997..f9aa69e 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourcerInfo.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourcerInfo.java
@@ -17,6 +17,7 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import javax.validation.constraints.NotEmpty;
 import java.io.Serializable;
 
 /**
@@ -59,6 +60,29 @@
     @TableField("outsourcer_name")
     private String outsourcerName;
 
+    @NotEmpty(message = "实验室代码不能为空")
+    @DictCodeField(message = "实验室代码描述不合法", cacheName = MeterDictCode.LAB_CODE)
+    @ApiModelProperty(value = "实验室代码(字典code)", dataType = "String")
+    @TableField("lab_code")
+    private String labCode;
+
+    @ApiModelProperty(value = "实验室代码(字典value)", dataType = "String")
+    @TableField(exist = false)
+    private String labCodeName;
+
+    /**
+     * 组别代码
+     */
+    @NotEmpty(message = "组别代码不能为空")
+    @DictCodeField(message = "组别代码描述不合法", cacheName = MeterDictCode.GROUP_CODE)
+    @ApiModelProperty(value = "组别代码(字典code)", dataType = "String")
+    @TableField("group_code")
+    private String groupCode;
+
+    @ApiModelProperty(value = "组别代码(字典value)", dataType = "String")
+    @TableField(exist = false)
+    private String groupCodeName;
+
     /**
      * 单位简称
      */
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardInfo.java
index c48eed7..dffdfdd 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardInfo.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardInfo.java
@@ -5,6 +5,7 @@
 import com.baomidou.mybatisplus.annotation.TableName;
 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;
 
@@ -18,6 +19,7 @@
  * @author wangpeng
  * @since 2023-08-04
  */
+@ApiModel
 @Data
 @TableName("biz_equipment_standard_info")
 public class BizEquipmentStandardInfo implements Serializable {
@@ -119,7 +121,7 @@
      * 管理状态(字典code)
      */
     @ApiModelProperty(value = "管理状态(字典code)", dataType = "String")
-    @DictCodeField(message = "管理状态不合法", cacheName = MeterDictCode.MANAGER_STATE)
+    @DictCodeField(message = "管理状态不合法", cacheName = MeterDictCode.STANDARD_MANAGER_STATE)
     @TableField("manage_status")
     private String manageStatus;
 
@@ -151,7 +153,7 @@
     /**
      * 温度(℃)
      */
-    @ApiModelProperty(value = "使用状态(字典code)", dataType = "String")
+    @ApiModelProperty(value = "温度(℃)", dataType = "String")
     @TableField("temperature")
     private Double temperature;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardInfoApproval.java b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardInfoApproval.java
index dbd86ab..9f58d83 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardInfoApproval.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardInfoApproval.java
@@ -150,7 +150,7 @@
      * 管理状态(字典code)
      */
     @ApiModelProperty(value = "管理状态(字典code)", dataType = "String")
-    @DictCodeField(message = "管理状态不合法", cacheName = MeterDictCode.MANAGER_STATE)
+    @DictCodeField(message = "管理状态不合法", cacheName = MeterDictCode.STANDARD_MANAGER_STATE)
     @TableField("manage_status")
     private String manageStatus;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardTechnologyRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardTechnologyRelation.java
index 0e612bd..751f26b 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardTechnologyRelation.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardTechnologyRelation.java
@@ -3,6 +3,7 @@
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -16,6 +17,7 @@
  * @author wangpeng
  * @since 2023-08-04
  */
+@ApiModel
 @Data
 @TableName("biz_equipment_standard_technology_relation")
 public class BizEquipmentStandardTechnologyRelation implements Serializable {
@@ -33,6 +35,10 @@
     @TableField("technology_file_id")
     private Long technologyFileId;
 
+    @ApiModelProperty(value = "依据的技术文件编号", dataType = "String")
+    @TableField("technology_file_no")
+    private String technologyFileNo;
+
     /**
      * 依据的技术文件名称(技术文件中现行测试校准检定方法表文件名字段)
      */
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerInfo.java
index d6e8bed..65cd6bc 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerInfo.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerInfo.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.model.resource;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -21,6 +28,11 @@
  * @author wangpeng
  * @since 2023-08-08
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @ApiModel
 @Data
 @TableName("biz_resource_customer_info")
@@ -35,6 +47,7 @@
     /**
      * 委托方编号
      */
+    @ExcelProperty(value = "委托方编号", order = 1)
     @ApiModelProperty(value = "委托方编号", dataType = "String")
     @TableField("customer_no")
     private String customerNo;
@@ -42,6 +55,7 @@
     /**
      * 委托方名称
      */
+    @ExcelProperty(value = "委托方名称", order = 2)
     @ApiModelProperty(value = "委托方名称(新建时为下拉选择一个受检单位组织的名字，传deptId字段，后端获取名称)", dataType = "String")
     @TableField("customer_name")
     private String customerName;
@@ -63,6 +77,7 @@
     /**
      * 联系人
      */
+    @ExcelProperty(value = "联系人", order = 3)
     @ApiModelProperty(value = "联系人", dataType = "String")
     @TableField("contacts")
     private String contacts;
@@ -70,6 +85,7 @@
     /**
      * 座机电话
      */
+    @ExcelProperty(value = "座机电话", order = 4)
     @ApiModelProperty(value = "座机电话", dataType = "String")
     @TableField("mobile")
     private String mobile;
@@ -77,6 +93,7 @@
     /**
      * 手机号码
      */
+    @ExcelProperty(value = "手机号码", order = 5)
     @ApiModelProperty(value = "手机号码", dataType = "String")
     @TableField("phone")
     private String phone;
@@ -91,6 +108,7 @@
     /**
      * 地址
      */
+    @ExcelProperty(value = "地址", order = 6)
     @ApiModelProperty(value = "地址", dataType = "String")
     @TableField("address")
     private String address;
@@ -141,6 +159,7 @@
     /**
      * 创建时间
      */
+    @ExcelProperty(value = "创建时间", order = 7)
     @ApiModelProperty(value = "创建时间", dataType = "String")
     @TableField("create_time")
     private String createTime;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerSuggestForm.java b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerSuggestForm.java
index 7201bbd..701bf8b 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerSuggestForm.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerSuggestForm.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.model.resource;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -22,6 +29,11 @@
  * @author wangpeng
  * @since 2023-08-08
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @ApiModel
 @Data
 @TableName("biz_resource_customer_suggest_form")
@@ -44,7 +56,8 @@
     /**
      * 委托方名称
      */
-    @ApiModelProperty(value = "委托方名称", dataType = "String")
+    @ExcelProperty(value = "意见反馈单位", order = 2)
+    @ApiModelProperty(value = "意见反馈单位", dataType = "String")
     @TableField("customer_name")
     private String customerName;
 
@@ -59,7 +72,8 @@
     /**
      * 委托方意见反馈部门名称
      */
-    @ApiModelProperty(value = "委托方意见反馈部门名称", dataType = "String")
+    @ExcelProperty(value = "委托方意见反馈部门", order = 3)
+    @ApiModelProperty(value = "委托方意见反馈部门", dataType = "String")
     @TableField("customer_dept_name")
     private String customerDeptName;
 
@@ -73,6 +87,7 @@
     /**
      * 表单编号
      */
+    @ExcelProperty(value = "表单编号", order = 1)
     @ApiModelProperty(value = "表单编号", dataType = "String")
     @TableField("form_no")
     private String formNo;
@@ -111,6 +126,7 @@
     /**
      * 创建人名字
      */
+    @ExcelProperty(value = "创建人", order = 4)
     @ApiModelProperty(value = "创建人名字", dataType = "String")
     @TableField("create_user_name")
     private String createUserName;
@@ -147,6 +163,7 @@
     /**
      * 创建时间
      */
+    @ExcelProperty(value = "创建时间", order = 5)
     @ApiModelProperty(value = "创建时间", dataType = "String")
     @TableField("create_time")
     private String createTime;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSealInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSealInfo.java
index cbf05d7..9bf389d 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSealInfo.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSealInfo.java
@@ -106,6 +106,10 @@
     @TableField("minio_file_name")
     private String minioFileName;
 
+    @ApiModelProperty(value = "minio存储文件url", dataType = "String")
+    @TableField(exist = false)
+    private String minioFileUrl;
+
     @ApiModelProperty(value = "创建时间", dataType = "String")
     @TableField("create_time")
     private String createTime;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSealUseNote.java b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSealUseNote.java
index 3f2d9e8..3ce16a8 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSealUseNote.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSealUseNote.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.model.resource;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -20,6 +27,11 @@
  * @author wangpeng
  * @since 2023-07-28
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @ApiModel
 @Data
 @TableName("biz_resource_seal_use_note")
@@ -34,6 +46,7 @@
     /**
      * 登记表编号
      */
+    @ExcelProperty(value = "申请单编号", order = 1)
     @ApiModelProperty(value = "登记表编号(自动生成)", dataType = "String")
     @TableField("note_form_no")
     private String noteFormNo;
@@ -55,6 +68,7 @@
     /**
      * 申请部门
      */
+    @ExcelProperty(value = "申请部门", order = 5)
     @ApiModelProperty(value = "申请部门", dataType = "String")
     @TableField("apply_dept_name")
     private String applyDeptName;
@@ -69,6 +83,7 @@
     /**
      * 申请人
      */
+    @ExcelProperty(value = "申请人", order = 6)
     @ApiModelProperty(value = "申请人", dataType = "String")
     @TableField("apply_user_name")
     private String applyUserName;
@@ -76,6 +91,7 @@
     /**
      * 申请时间
      */
+    @ExcelProperty(value = "申请时间", order = 7)
     @ApiModelProperty(value = "申请时间(新增自动获取当前时间)", dataType = "String")
     @TableField("apply_time")
     private String applyTime;
@@ -130,6 +146,26 @@
     @TableField("update_time")
     private String updateTime;
 
+    @ExcelProperty(value = "印章名称", order = 2)
+    @ApiModelProperty(value = "印章名称(列表返回参数)", dataType = "String")
+    @TableField(exist = false)
+    private String sealName;
+
+    @DictCodeField(message = "印章类型描述不合法", cacheName = MeterDictCode.SEAL_TYPE)
+    @ApiModelProperty(hidden = true)
+    @TableField(exist = false)
+    private String sealType;
+
+    @ExcelProperty(value = "印章类型", order = 3)
+    @ApiModelProperty(value = "印章类型(列表返回参数)", dataType = "String")
+    @TableField(exist = false)
+    private String sealTypeName;
+
+    @ExcelProperty(value = "批准人", order = 4)
+    @ApiModelProperty(value = "批准人(列表返回参数)", dataType = "String")
+    @TableField(exist = false)
+    private String approverName;
+
     @ApiModelProperty(value = "审批状态类型-字典value", dataType = "String")
     @TableField(exist = false)
     private String approvalStatusName;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceStaffInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceStaffInfo.java
index 5ef995b..41563a1 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceStaffInfo.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceStaffInfo.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.model.resource;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -20,6 +27,11 @@
  * @author wangpeng
  * @since 2023-07-25
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @ApiModel
 @Data
 @TableName("biz_resource_staff_info")
@@ -38,6 +50,7 @@
     /**
      * 人员编号
      */
+    @ExcelProperty(value = "人员编号",order = 0)
     @NotEmpty(message = "人员编号不能为空")
     @ApiModelProperty(value = "人员编号", dataType = "String")
     @TableField("staff_no")
@@ -46,6 +59,7 @@
     /**
      * 姓名
      */
+    @ExcelProperty(value = "姓名",order = 1)
     @ApiModelProperty(value = "姓名", dataType = "String")
     @TableField("staff_name")
     private String staffName;
@@ -152,13 +166,15 @@
     /**
      * 部门名字
      */
-    @ApiModelProperty(value = "部门名字", dataType = "String")
+    @ExcelProperty(value = "工作部门",order = 4)
+    @ApiModelProperty(value = "工作部门", dataType = "String")
     @TableField("dept_name")
     private String deptName;
 
     /**
      * 岗位
      */
+    @ExcelProperty(value = "岗位",order = 2)
     @ApiModelProperty(value = "岗位", dataType = "String")
     @TableField("station")
     private String station;
@@ -166,6 +182,7 @@
     /**
      * 计量专业
      */
+    @ExcelProperty(value = "计量专业",order = 5)
     @ApiModelProperty(value = "计量专业", dataType = "String")
     @TableField("major")
     private String major;
@@ -173,6 +190,7 @@
     /**
      * 证号
      */
+    @ExcelProperty(value = "证号",order = 3)
     @ApiModelProperty(value = "证号", dataType = "String")
     @TableField("certificate_number")
     private String certificateNumber;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSupplierInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSupplierInfo.java
index eb5ef01..a1e2697 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSupplierInfo.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSupplierInfo.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.model.resource;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -20,6 +27,11 @@
  * @author wangpeng
  * @since 2023-07-27
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @ApiModel
 @Data
 @TableName("biz_resource_supplier_info")
@@ -34,6 +46,7 @@
     /**
      * 供方编号
      */
+    @ExcelProperty(value = "供方编号", order = 1)
     @ApiModelProperty(value = "供方编号(自动生成)", dataType = "String")
     @TableField("supplier_no")
     private String supplierNo;
@@ -41,6 +54,7 @@
     /**
      * 供方名称
      */
+    @ExcelProperty(value = "供方名称", order = 2)
     @ApiModelProperty(value = "供方名称", dataType = "String")
     @TableField("supplier_name")
     private String supplierName;
@@ -60,6 +74,7 @@
     @TableField("supplier_type")
     private String supplierType;
 
+    @ExcelProperty(value = "供方类型", order = 3)
     @ApiModelProperty(value = "供方类型(字典value)", dataType = "String")
     @TableField(exist = false)
     private String supplierTypeName;
@@ -109,7 +124,8 @@
     /**
      * 电话
      */
-    @ApiModelProperty(value = "电话", dataType = "String")
+    @ExcelProperty(value = "联系电话", order = 4)
+    @ApiModelProperty(value = "联系电话", dataType = "String")
     @TableField("phone")
     private String phone;
 
@@ -158,6 +174,7 @@
     /**
      * 公司地址-省
      */
+    @ExcelProperty(value = "地址-省", order = 6)
     @ApiModelProperty(value = "公司地址-省", dataType = "String")
     @TableField("company_province_name")
     private String companyProvinceName;
@@ -172,6 +189,7 @@
     /**
      * 公司地址-市
      */
+    @ExcelProperty(value = "地址-市", order = 7)
     @ApiModelProperty(value = "公司地址-市", dataType = "String")
     @TableField("company_city_name")
     private String companyCityName;
@@ -186,6 +204,7 @@
     /**
      * 公司地址-区
      */
+    @ExcelProperty(value = "地址-区", order = 8)
     @ApiModelProperty(value = "公司地址-区", dataType = "String")
     @TableField("company_area_name")
     private String companyAreaName;
@@ -193,6 +212,7 @@
     /**
      * 公司地址-详细地址
      */
+    @ExcelProperty(value = "地址-详细地址", order = 9)
     @ApiModelProperty(value = "公司地址-详细地址", dataType = "String")
     @TableField("company_address")
     private String companyAddress;
@@ -200,6 +220,7 @@
     /**
      * 服务和供应的内容
      */
+    @ExcelProperty(value = "服务和供应的内容", order = 5)
     @ApiModelProperty(value = "服务和供应的内容", dataType = "String")
     @TableField("supplier_content")
     private String supplierContent;
@@ -250,6 +271,7 @@
     /**
      * 创建时间
      */
+    @ExcelProperty(value = "创建时间", order = 9)
     @ApiModelProperty(value = "创建时间", dataType = "String")
     @TableField("create_time")
     private String createTime;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/EnvLocationInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/EnvLocationInfo.java
new file mode 100644
index 0000000..d8e2d7b
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/EnvLocationInfo.java
@@ -0,0 +1,83 @@
+package com.casic.missiles.model.resource;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotEmpty;
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 实验室环境监控系统-设备表
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-06-07
+ */
+@ApiModel
+@Data
+@TableName("env_location_info")
+public class EnvLocationInfo implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "主键id", dataType = "Long")
+    @TableId("id")
+    private Long id;
+
+    /**
+     * 地点编号
+     */
+    @NotEmpty(message = "地点编号不能为空")
+    @ApiModelProperty(value = "地点编号", dataType = "String")
+    @TableField("location_no")
+    private String locationNo;
+
+    /**
+     * 地点名称
+     */
+    @ApiModelProperty(value = "地点名称", dataType = "String")
+    @TableField("location_name")
+    private String locationName;
+
+    /**
+     * 地点位置
+     */
+    @ApiModelProperty(value = "地点位置", dataType = "String")
+    @TableField("location_position")
+    private String locationPosition;
+
+    /**
+     * 创建人id
+     */
+    @ApiModelProperty(value = "创建人id", dataType = "Long")
+    @TableField("create_user_id")
+    private Long createUserId;
+
+    /**
+     * 创建人
+     */
+    @ApiModelProperty(value = "创建人", dataType = "String")
+    @TableField("create_user")
+    private String createUser;
+
+    /**
+     * 创建时间
+     */
+    @ApiModelProperty(value = "创建时间", dataType = "String")
+    @TableField("create_time")
+    private String createTime;
+
+    /**
+     * 更新时间
+     */
+    @ApiModelProperty(value = "更新时间", dataType = "String")
+    @TableField("update_time")
+    private String updateTime;
+
+
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemFileConfig.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemFileConfig.java
index 19e6845..86e569c 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemFileConfig.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemFileConfig.java
@@ -30,7 +30,7 @@
     @ApiModelProperty(value = "系统类别(1业务系统2受检系统3环境系统)", dataType = "Integer")
     @NotNull(message = "系统类别不能为空")
     @TableField("system_type")
-    private Integer systemType;
+    private Integer systemType = 1;
 
     @ApiModelProperty("下载编号")
     @TableField("download_no")
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemNotice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemNotice.java
index e94297d..06ec37d 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemNotice.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemNotice.java
@@ -34,7 +34,7 @@
     @ApiModelProperty(value = "系统类别(1业务系统2受检系统3环境系统)", dataType = "Integer")
     @NotNull(message = "系统类别不能为空")
     @TableField("system_type")
-    private Integer systemType;
+    private Integer systemType = 1;
 
     /**
      * 通知公告编号
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSign.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSign.java
index 6c0d7c9..954f4f8 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSign.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSign.java
@@ -51,7 +51,7 @@
     @ApiModelProperty(value = "系统类别(1业务系统2受检系统3环境系统)", dataType = "Integer")
     @NotNull(message = "系统类别不能为空")
     @TableField("system_type")
-    private Integer systemType;
+    private Integer systemType = 1;
 
     /**
      * 签名编号
@@ -130,4 +130,8 @@
     @TableField(exist = false)
     private List<Long> userIdList;
 
+    @ApiModelProperty(hidden = true)
+    @TableField(exist = false)
+    private String deptName;
+
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemTemplate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemTemplate.java
index 503a457..1d27ebe 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemTemplate.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemTemplate.java
@@ -47,7 +47,7 @@
     @ApiModelProperty(value = "系统类别(1业务系统2受检系统3环境系统)", dataType = "Integer")
     @NotNull(message = "系统类别不能为空")
     @TableField("system_type")
-    private Integer systemType;
+    private Integer systemType = 1;
 
     /**
      * 模板编号
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java
index 8c21cb0..f61e4a8 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java
@@ -32,4 +32,8 @@
     ReturnDTO approvalDelete(ApprovalDeleteRequest request);
 
     ReturnDTO failUpdate(T request);
+
+    List<O> listExport(R request);
+
+    List<O> listExportByIds(List<Long> ids);
 }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java
index 724166f..9bce15b 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java
@@ -157,6 +157,29 @@
         throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
     }
 
+    @Override
+    public List<O> listExport(R request) {
+        request.setCreateUserId(null);
+        request.setApprovalStatus(ApprovalStatusEnum.PASSED);
+        Page<O> page = PageFactory.defaultPage();
+        page.setCurrent(1);
+        page.setSearchCount(false);
+        page.setSize(Integer.MAX_VALUE);
+        Page<O> resultPage = this.baseMapper.selectBatchForApprovalList(page, request, null);
+        return resultPage.getRecords();
+    }
+
+    @Override
+    public List<O> listExportByIds(List<Long> ids) {
+        Page<O> page = PageFactory.defaultPage();
+        page.setCurrent(1);
+        page.setSearchCount(false);
+        page.setSize(Integer.MAX_VALUE);
+        List<String> businessKeys = ids.stream().map(String::valueOf).collect(Collectors.toList());
+        Page<O> resultPage = this.baseMapper.selectBatchForApprovalList(page, null, businessKeys);
+        return resultPage.getRecords();
+    }
+
     protected ReturnDTO updateApprovalStatus(Long id, String processId, String approvalStatus) {
         UpdateWrapper<T> updateWrapper = new UpdateWrapper<>();
         updateWrapper.eq("id", id);
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificatePrintServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificatePrintServiceImpl.java
index f6e4706..3228497 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificatePrintServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificatePrintServiceImpl.java
@@ -162,6 +162,30 @@
         return ReturnUtil.success(printLogMapper.selectList(wrapper));
     }
 
+    @Override
+    public List<CertificatePrintListResponse> listByIds(List<Long> ids) {
+        Page<CertificatePrintListResponse> page = PageFactory.defaultPage();
+        page.setCurrent(1);
+        page.setSearchCount(false);
+        page.setSize(Integer.MAX_VALUE);
+        List<String> businessKeys = ids.stream().map(String::valueOf).collect(Collectors.toList());
+        Page<CertificatePrintListResponse> resultPage = this.baseMapper.selectBatchForApprovalList(page, null, businessKeys);
+        return resultPage.getRecords();
+    }
+
+    @Override
+    public List<CertificatePrintListResponse> list(CertificatePrintApprovalListRequest request) {
+        request.setCreateUserId(null);
+        request.setApprovalStatus(null);
+        request.setPrintStatus(null);
+        Page<CertificatePrintListResponse> page = PageFactory.defaultPage();
+        page.setCurrent(1);
+        page.setSearchCount(false);
+        page.setSize(Integer.MAX_VALUE);
+        Page<CertificatePrintListResponse> resultPage = certificatePrintMapper.selectBatchForApprovalList(page, request, null);
+        return resultPage.getRecords();
+    }
+
     private void savePrintLog(Long id) {
         BizBusinessCertificatePrintLog printLog = new BizBusinessCertificatePrintLog();
         BizBusinessCertificatePrint certificatePrint = certificatePrintMapper.selectById(id);
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificateReportServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificateReportServiceImpl.java
index 457555f..24146be 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificateReportServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificateReportServiceImpl.java
@@ -158,8 +158,8 @@
         QueryWrapper<BizBusinessCertificateMeasureResultData> mWrapper = new QueryWrapper<>();
         mWrapper.eq("report_id", reportId);
         boolean mRemove = certificateMeasureResultDataService.remove(mWrapper);
-        Assert.isFalse(eRemove || mRemove, () -> {
+        if(!eRemove || !mRemove){
             throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
-        });
+        }
     }
 }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessIdentifyInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessIdentifyInfoServiceImpl.java
index 4c8e190..f7e63ca 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessIdentifyInfoServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessIdentifyInfoServiceImpl.java
@@ -1,8 +1,10 @@
 package com.casic.missiles.service.Impl.business;
 
+import cn.hutool.core.date.DateUtil;
 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.core.page.PageFactory;
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.business.identify.IdentifyListRequest;
@@ -14,11 +16,14 @@
 import com.casic.missiles.service.business.IBizBusinessIdentifyInfoService;
 import com.casic.missiles.utils.DictCodeUtils;
 import com.casic.missiles.utils.NumberGeneratorUtil;
+import com.casic.missiles.utils.QRCodeUtil;
 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.List;
+
 /**
  * <p>
  * 计量检定业务-任务计量管理-标识打印 服务实现类
@@ -35,9 +40,9 @@
     @Override
     public Page<BizBusinessIdentifyInfo> identifyListPage(Page<BizBusinessIdentifyInfo> page, IdentifyListRequest request) throws Exception {
         QueryWrapper<BizBusinessIdentifyInfo> wrapper = new QueryWrapper<>();
-        wrapper.eq("identify_type", request.getIdentifyType());
-        wrapper.like("device_no", request.getDeviceNo());
-        wrapper.like("device_name", request.getDeviceName());
+        wrapper.eq(StringUtils.isNotEmpty(request.getIdentifyType()), "identify_type", request.getIdentifyType());
+        wrapper.like(StringUtils.isNotEmpty(request.getDeviceNo()),"device_no", request.getDeviceNo());
+        wrapper.like(StringUtils.isNotEmpty(request.getDeviceName()), "device_name", request.getDeviceName());
         wrapper.apply(StringUtils.isNotBlank(request.getCreateTimeStart()),
                 "{0} <= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getCreateTimeStart().split(" ")[0]);
         wrapper.apply(StringUtils.isNotBlank(request.getCreateTimeEnd()),
@@ -64,8 +69,11 @@
     }
 
     @Override
-    public ReturnDTO updateIdentify(BizBusinessIdentifyInfo identifyInfo) {
-        if(identifyInfoMapper.updateById(identifyInfo) > 0){
+    public ReturnDTO updateIdentify(Long id) {
+        BizBusinessIdentifyInfo info = new BizBusinessIdentifyInfo();
+        info.setId(id);
+        info.setUpdateTime(DateUtil.now());
+        if(identifyInfoMapper.updateById(info) > 0){
             return ReturnUtil.success();
         }
         throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
@@ -79,4 +87,20 @@
         throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
     }
 
+    @Override
+    public List<BizBusinessIdentifyInfo> list(IdentifyListRequest request) throws Exception {
+        Page<BizBusinessIdentifyInfo> page = PageFactory.defaultPage();
+        page.setCurrent(1);
+        page.setSearchCount(false);
+        page.setSize(Integer.MAX_VALUE);
+        Page<BizBusinessIdentifyInfo> resultPage = this.identifyListPage(page, request);
+        return resultPage.getRecords();
+    }
+
+    @Override
+    public ReturnDTO<String> equipmentQrCode(Long id) {
+        String base64QRCode = QRCodeUtil.getBase64QRCode(String.valueOf(id));
+        return ReturnUtil.success(base64QRCode);
+    }
+
 }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOrderInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOrderInfoServiceImpl.java
index 82952ad..d8d2c6a 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOrderInfoServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOrderInfoServiceImpl.java
@@ -35,6 +35,7 @@
 import javax.servlet.http.HttpServletResponse;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 import java.util.stream.Collectors;
 
 /**
@@ -209,13 +210,16 @@
     private QueryWrapper<OrderListResponse> listParamWrapperBuilder(OrderListRequest request) {
         QueryWrapper<OrderListResponse> wrapper = new QueryWrapper<>();
         wrapper.like(StringUtils.isNotBlank(request.getOrderNo()), "order_no", request.getOrderNo());
+        wrapper.like(Objects.nonNull(request.getCustomerId()), "customer_id", request.getCustomerId());
         wrapper.like(StringUtils.isNotBlank(request.getCustomerName()), "customer_name", request.getCustomerName());
         wrapper.like(StringUtils.isNotBlank(request.getDeliverer()), "deliverer", request.getDeliverer());
         wrapper.like(StringUtils.isNotBlank(request.getCreateUserName()), "create_user_name", request.getCreateUserName());
-        wrapper.apply(StringUtils.isNotBlank(request.getCreateStartTime()),
-                "{0} <= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getCreateStartTime().split(" ")[0]);
-        wrapper.apply(StringUtils.isNotBlank(request.getCreateEndTime()),
-                "{0} >= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getCreateEndTime().split(" ")[0]);
+        if(StringUtils.isNotBlank(request.getCreateStartTime())){
+            wrapper.apply("{0} <= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getCreateStartTime().split(" ")[0]);
+        }
+        if(StringUtils.isNotBlank(request.getCreateEndTime())){
+            wrapper.apply("{0} >= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getCreateEndTime().split(" ")[0]);
+        }
         wrapper.orderByDesc("create_time");
         return wrapper;
     }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceAssessServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceAssessServiceImpl.java
index c6af980..ce40138 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceAssessServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceAssessServiceImpl.java
@@ -1,10 +1,33 @@
 package com.casic.missiles.service.Impl.business;
 
-import com.casic.missiles.model.business.BizBusinessOutsourceAssess;
+import cn.hutool.core.lang.Assert;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.casic.missiles.core.model.auth.AuthUser;
+import com.casic.missiles.core.shiro.ShiroKit;
+import com.casic.missiles.dto.BaseApprovalSubmitRequest;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.ReturnUtil;
+import com.casic.missiles.dto.business.outsource.OutsourceAssessApprovalListRequest;
+import com.casic.missiles.dto.business.outsource.OutsourceAssessSaveResponse;
+import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.NoGenerateFileCodeEnum;
+import com.casic.missiles.enums.NoGenerateRecordTypeCodeEnum;
+import com.casic.missiles.enums.system.ApprovalStatusEnum;
+import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.mapper.business.BizBusinessOutsourceAssessMapper;
+import com.casic.missiles.model.business.BizBusinessOutsourceAssess;
+import com.casic.missiles.model.business.BizBusinessOutsourceAssessSampleRelation;
+import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl;
+import com.casic.missiles.service.business.IBizBusinessOutsourceAssessSampleRelationService;
 import com.casic.missiles.service.business.IBizBusinessOutsourceAssessService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.casic.missiles.utils.NoGeneratorUtil;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Objects;
 
 /**
  * <p>
@@ -15,6 +38,103 @@
  * @since 2023-08-16
  */
 @Service
-public class BizBusinessOutsourceAssessServiceImpl extends ServiceImpl<BizBusinessOutsourceAssessMapper, BizBusinessOutsourceAssess> implements IBizBusinessOutsourceAssessService {
+public class BizBusinessOutsourceAssessServiceImpl extends GeneralApprovalServiceImpl<BizBusinessOutsourceAssessMapper, BizBusinessOutsourceAssess, BizBusinessOutsourceAssess, OutsourceAssessApprovalListRequest, BaseApprovalSubmitRequest> implements IBizBusinessOutsourceAssessService {
+    @Autowired
+    private IBizBusinessOutsourceAssessSampleRelationService outsourceAssessSampleRelationService;
 
+    @Override
+    public ReturnDTO<OutsourceAssessSaveResponse> saveOutsourceAssess(BizBusinessOutsourceAssess request) {
+        //生成编号
+        String labCode = request.getLabCode();
+        String groupCode = request.getGroupCode();
+        Long maxNo = this.baseMapper.selectMaxProjectNo();
+        String projectNo = NoGeneratorUtil.getCode(NoGenerateFileCodeEnum.D, labCode, NoGenerateRecordTypeCodeEnum.OUTSOURCE_ACCESS, groupCode, maxNo);
+        request.setCreateUserId(request.getUserId());
+        request.setCreateUserName(request.getUserName());
+        request.setApprovalStatus(ApprovalStatusEnum.DRAFT); //草稿箱状态
+        request.setProjectNo(projectNo);
+        int row = this.baseMapper.insert(request);
+        Assert.isFalse(row <= 0, () -> {
+            throw new BusinessException(BusinessExceptionEnum.OUTSOURCE_ACCESS_SAVE_FAILED);
+        });
+        //关联表
+        saveRelationData(request);
+        OutsourceAssessSaveResponse saveResponse = new OutsourceAssessSaveResponse();
+        saveResponse.setId(request.getId());
+        saveResponse.setProjectNo(projectNo);
+        return ReturnUtil.success(saveResponse);
+    }
+
+    @Override
+    @Transactional
+    public ReturnDTO draftUpdate(BizBusinessOutsourceAssess request) {
+        if (this.baseMapper.updateById(request) > 0) {
+            //关联表删除、增加
+            removeRelationData(request.getId());
+            saveRelationData(request);
+            return ReturnUtil.success();
+        }
+        throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
+    }
+
+    @Override
+    public ReturnDTO draftDelete(Long id) {
+        if (this.baseMapper.deleteById(id) > 0) {
+            //关联表删除
+            removeRelationData(id);
+            return ReturnUtil.success();
+        }
+        throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
+    }
+
+    @Override
+    public ReturnDTO draftBatchDelete(List<Long> ids) {
+        if (this.baseMapper.deleteBatchIds(ids) >= 0) {
+            ids.forEach(id -> removeRelationData(id));
+            return ReturnUtil.success();
+        }
+        throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
+    }
+
+    @Override
+    @Transactional
+    public ReturnDTO failUpdate(BizBusinessOutsourceAssess request) {
+        AuthUser user = ShiroKit.getUser();
+        Assert.isFalse(Objects.isNull(user), () -> {
+            throw new BusinessException(BusinessExceptionEnum.LOGIN_USER_ACQUIRE_FAILED);
+        });
+        request.setApprovalStatus(ApprovalStatusEnum.IN_APPROVED);
+        if (this.baseMapper.updateById(request) > 0) {
+            //关联表删除、增加
+            removeRelationData(request.getId());
+            saveRelationData(request);
+            baseApprovalService.failUpdate(request.getProcessId());
+            return ReturnUtil.success();
+        }
+        throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
+    }
+
+    private void saveRelationData(BizBusinessOutsourceAssess request) {
+        List<BizBusinessOutsourceAssessSampleRelation> sampleRelations = new ArrayList<>();
+        request.getOrderSampleList().forEach(dto -> {
+            BizBusinessOutsourceAssessSampleRelation relation = new BizBusinessOutsourceAssessSampleRelation();
+            relation.setOrderId(dto.getOrderId());
+            relation.setSampleId(dto.getSampleId());
+            relation.setAccessId(request.getId());
+            sampleRelations.add(relation);
+        });
+        if(outsourceAssessSampleRelationService.saveBatch(sampleRelations)){
+            return;
+        }
+        throw new BusinessException(BusinessExceptionEnum.OUTSOURCE_ACCESS_SAVE_FAILED);
+    }
+
+    private void removeRelationData(Long assessId) {
+        QueryWrapper<BizBusinessOutsourceAssessSampleRelation> wrapper = new QueryWrapper<>();
+        wrapper.eq("access_id", assessId);
+        if(outsourceAssessSampleRelationService.remove(wrapper)){
+            return;
+        }
+        throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
+    }
 }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceProtocolServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceProtocolServiceImpl.java
new file mode 100644
index 0000000..821e728
--- /dev/null
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceProtocolServiceImpl.java
@@ -0,0 +1,60 @@
+package com.casic.missiles.service.Impl.business;
+
+import cn.hutool.core.lang.Assert;
+import com.casic.missiles.dto.BaseApprovalSubmitRequest;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.ReturnUtil;
+import com.casic.missiles.dto.business.outsource.OutsourceProtocolApprovalListRequest;
+import com.casic.missiles.dto.business.outsource.OutsourceProtocolSaveResponse;
+import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.NoGenerateFileCodeEnum;
+import com.casic.missiles.enums.NoGenerateRecordTypeCodeEnum;
+import com.casic.missiles.enums.system.ApprovalStatusEnum;
+import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.mapper.business.BizBusinessOutsourceProtocolMapper;
+import com.casic.missiles.mapper.business.BizBusinessOutsourcerInfoMapper;
+import com.casic.missiles.model.business.BizBusinessOutsourceProtocol;
+import com.casic.missiles.model.business.BizBusinessOutsourcerInfo;
+import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl;
+import com.casic.missiles.service.business.IBizBusinessOutsourceProtocolService;
+import com.casic.missiles.utils.NoGeneratorUtil;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 计量检定业务-分包管理-测试、校准或检定工作分包协议书 服务实现类
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-08-24
+ */
+@Service
+public class BizBusinessOutsourceProtocolServiceImpl extends GeneralApprovalServiceImpl<BizBusinessOutsourceProtocolMapper, BizBusinessOutsourceProtocol, BizBusinessOutsourceProtocol, OutsourceProtocolApprovalListRequest, BaseApprovalSubmitRequest> implements IBizBusinessOutsourceProtocolService {
+    @Autowired
+    private BizBusinessOutsourcerInfoMapper outsourcerInfoMapper;
+
+    @Override
+    public ReturnDTO<OutsourceProtocolSaveResponse> saveOutsourceProtocol(BizBusinessOutsourceProtocol request) {
+        //生成编号
+        String labCode = request.getLabCode();
+        String groupCode = request.getGroupCode();
+        Long maxNo = this.baseMapper.selectMaxProtocolNo();
+        String protocolNo = NoGeneratorUtil.getCode(NoGenerateFileCodeEnum.D, labCode, NoGenerateRecordTypeCodeEnum.OUTSOURCE_PROTOCOL, groupCode, maxNo);
+        request.setCreateUserId(request.getUserId());
+        request.setCreateUserName(request.getUserName());
+        request.setApprovalStatus(ApprovalStatusEnum.DRAFT); //草稿箱状态
+        request.setProtocolNo(protocolNo);
+        BizBusinessOutsourcerInfo outsourcerInfo = outsourcerInfoMapper.selectById(request.getOutsourcerId());
+        request.setOutsourceNo(outsourcerInfo.getOutsourcerNo());
+        request.setOutsourceName(outsourcerInfo.getOutsourcerName());
+        int row = this.baseMapper.insert(request);
+        Assert.isFalse(row <= 0, () -> {
+            throw new BusinessException(BusinessExceptionEnum.OUTSOURCE_PROTOCOL_SAVE_FAILED);
+        });
+        OutsourceProtocolSaveResponse saveResponse = new OutsourceProtocolSaveResponse();
+        saveResponse.setId(request.getId());
+        saveResponse.setProtocolNo(protocolNo);
+        return ReturnUtil.success(saveResponse);
+    }
+}
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourcerInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourcerInfoServiceImpl.java
index 75f639d..8aadad7 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourcerInfoServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourcerInfoServiceImpl.java
@@ -3,12 +3,12 @@
 import cn.hutool.core.lang.Assert;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.dto.*;
 import com.casic.missiles.dto.business.outsource.OutsourcerInfoApprovalListRequest;
 import com.casic.missiles.dto.business.outsource.OutsourcerSaveResponse;
 import com.casic.missiles.enums.BusinessExceptionEnum;
-import com.casic.missiles.enums.PrefixCodeEnum;
+import com.casic.missiles.enums.NoGenerateFileCodeEnum;
+import com.casic.missiles.enums.NoGenerateRecordTypeCodeEnum;
 import com.casic.missiles.enums.system.ApprovalStatusEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.mapper.business.BizBusinessOutsourcerInfoMapper;
@@ -20,7 +20,7 @@
 import com.casic.missiles.service.business.IBizBusinessOutsourcerInfoService;
 import com.casic.missiles.service.business.IBizBusinessOutsourcerUserInfoService;
 import com.casic.missiles.utils.DictCodeUtils;
-import com.casic.missiles.utils.NumberGeneratorUtil;
+import com.casic.missiles.utils.NoGeneratorUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -42,22 +42,12 @@
     private IBizBusinessOutsourcerUserInfoService outsourcerUserInfoService;
 
     @Override
-    public List<BizBusinessOutsourcerInfo> list(OutsourcerInfoApprovalListRequest request) {
-        request.setCreateUserId(null);
-        request.setApprovalStatus(ApprovalStatusEnum.PASSED);
-        Page<BizBusinessOutsourcerInfo> page = PageFactory.defaultPage();
-        page.setCurrent(1);
-        page.setSearchCount(false);
-        page.setSize(Integer.MAX_VALUE);
-        Page<BizBusinessOutsourcerInfo> resultPage = this.baseMapper.selectBatchForApprovalList(page, request, null);
-        return resultPage.getRecords();
-    }
-
-    @Override
     public ReturnDTO<OutsourcerSaveResponse> saveOutsourcer(BizBusinessOutsourcerInfo request) {
         //生成编号
+        String labCode = request.getLabCode();
+        String groupCode = request.getGroupCode();
         Long maxNo = this.baseMapper.selectMaxNo();
-        String outsourcerNo = NumberGeneratorUtil.getContactNo(PrefixCodeEnum.OUTSOURCER_PREFIX, maxNo);
+        String outsourcerNo = NoGeneratorUtil.getCode(NoGenerateFileCodeEnum.D, labCode, NoGenerateRecordTypeCodeEnum.OUTSOURCE_INFO, groupCode, maxNo);
         request.setOutsourcerNo(outsourcerNo);
         request.setCreateUserId(request.getUserId());
         request.setCreateUserName(request.getUserName());
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessSiteExecutiveInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessSiteExecutiveInfoServiceImpl.java
index ebab3e6..6c6a129 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessSiteExecutiveInfoServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessSiteExecutiveInfoServiceImpl.java
@@ -189,9 +189,9 @@
         QueryWrapper<BizBusinessSiteExecutiveStaffRelation> mWrapper = new QueryWrapper<>();
         mWrapper.eq("site_executive_id", siteExecutiveId);
         boolean mRemove = siteExecutiveStaffRelationService.remove(mWrapper);
-        Assert.isFalse(eRemove || mRemove, () -> {
+        if(!eRemove || !mRemove){
             throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
-        });
+        }
     }
 
     private void doPopulateSiteExecutive(SiteExecutiveDetailResponse detailResponse) {
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessLabExecutiveInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessLabExecutiveInfoServiceImpl.java
index 50c5616..0242fcf 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessLabExecutiveInfoServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessLabExecutiveInfoServiceImpl.java
@@ -297,6 +297,29 @@
     }
 
     @Override
+    public List<SampleLabExecutiveListResponse> deptLabExecutiveList(SampleLabExecutiveListRequest request) throws Exception {
+        Page<SampleLabExecutiveListResponse> page = PageFactory.defaultPage();
+        page.setCurrent(1);
+        page.setSearchCount(false);
+        page.setSize(Integer.MAX_VALUE);
+        Page<SampleLabExecutiveListResponse> resultPage = this.deptLabExecutiveListPage(page, request);
+        return resultPage.getRecords();
+    }
+
+    @Override
+    public List<SampleLabExecutiveListResponse> deptLabExecutiveListByIds(String measureStatus, List<Long> ids) throws Exception {
+        Page<SampleLabExecutiveListResponse> page = PageFactory.defaultPage();
+        page.setCurrent(1);
+        page.setSearchCount(false);
+        page.setSize(Integer.MAX_VALUE);
+        SampleLabExecutiveListRequest request = new SampleLabExecutiveListRequest();
+        request.setIds(ids);
+        request.setMeasureStatus(measureStatus);
+        Page<SampleLabExecutiveListResponse> resultPage = this.deptLabExecutiveListPage(page, request);
+        return resultPage.getRecords();
+    }
+
+    @Override
     public Page<SampleLabExecutiveListResponse> myLabExecutiveListPage(Page<SampleLabExecutiveListResponse> page, SampleLabExecutiveListRequest labExecutiveListRequest) throws Exception{
         AuthUser user = ShiroKit.getUser();
         Assert.isFalse(Objects.isNull(user), () -> {
@@ -350,6 +373,29 @@
     }
 
     @Override
+    public List<SampleLabExecutiveListResponse> myLabExecutiveList(SampleLabExecutiveListRequest request) throws Exception {
+        Page<SampleLabExecutiveListResponse> page = PageFactory.defaultPage();
+        page.setCurrent(1);
+        page.setSearchCount(false);
+        page.setSize(Integer.MAX_VALUE);
+        Page<SampleLabExecutiveListResponse> resultPage = this.myLabExecutiveListPage(page, request);
+        return resultPage.getRecords();
+    }
+
+    @Override
+    public List<SampleLabExecutiveListResponse> myLabExecutiveListByIds(String measureStatus, List<Long> ids) throws Exception {
+        Page<SampleLabExecutiveListResponse> page = PageFactory.defaultPage();
+        page.setCurrent(1);
+        page.setSearchCount(false);
+        page.setSize(Integer.MAX_VALUE);
+        SampleLabExecutiveListRequest request = new SampleLabExecutiveListRequest();
+        request.setIds(ids);
+        request.setMeasureStatus(measureStatus);
+        Page<SampleLabExecutiveListResponse> resultPage = this.myLabExecutiveListPage(page, request);
+        return resultPage.getRecords();
+    }
+
+    @Override
     public List<SampleAmountResponse> myExecutiveAmount() {
         //登录用户id获取计量人员id，实验室检测信息中存储的是计量人员id
         AuthUser user = ShiroKit.getUser();
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentInfoServiceImpl.java
index 864b05e..db8cad4 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentInfoServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentInfoServiceImpl.java
@@ -35,7 +35,6 @@
 import com.casic.missiles.utils.ConvertUtils;
 import com.casic.missiles.utils.DictCodeUtils;
 import com.casic.missiles.utils.NumberGeneratorUtil;
-import org.flowable.engine.RuntimeService;
 import org.flowable.engine.runtime.ProcessInstance;
 import org.jetbrains.annotations.NotNull;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -43,7 +42,6 @@
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
 
-import javax.annotation.Resource;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
@@ -81,8 +79,6 @@
     private IBizEquipmentAttachmentService attachmentService;
     @Autowired
     private IBizEquipmentCheckpointService checkpointService;
-    @Resource
-    private RuntimeService runtimeService;
     @Autowired
     private ApprovalOperateService approvalOperateService;
 
@@ -235,18 +231,18 @@
     private void updateRelationInfo(EquipmentAddRequest request, BizEquipmentInfoApproval equipmentInfoApproval) {
         QueryWrapper<BizEquipmentTechnicalTarget> targetWrapper = new QueryWrapper<>();
         targetWrapper.eq("equipment_no", equipmentInfoApproval.getEquipmentNo());
-        boolean removeTargetFlag = technicalTargetService.remove(targetWrapper);
-        boolean saveTargetFlag = technicalTargetService.saveBatch(request.getTechnicalTargetList());
+        technicalTargetService.remove(targetWrapper);
+        technicalTargetService.saveBatch(request.getTechnicalTargetList());
 
         QueryWrapper<BizEquipmentAttachment> attachmentWrapper = new QueryWrapper<>();
         attachmentWrapper.eq("equipment_no", equipmentInfoApproval.getEquipmentNo());
-        boolean removeAttachmentFlag = attachmentService.remove(attachmentWrapper);
-        boolean saveAttachmentFlag = attachmentService.saveBatch(request.getAttachmentList());
+        attachmentService.remove(attachmentWrapper);
+        attachmentService.saveBatch(request.getAttachmentList());
 
         QueryWrapper<BizEquipmentCheckpoint> checkpointWrapper = new QueryWrapper<>();
         checkpointWrapper.eq("equipment_no", equipmentInfoApproval.getEquipmentNo());
-        boolean removeCheckpointFlag = checkpointService.remove(checkpointWrapper);
-        boolean saveCheckpointFlag = checkpointService.saveBatch(request.getCheckpointList());
+        checkpointService.remove(checkpointWrapper);
+        checkpointService.saveBatch(request.getCheckpointList());
     }
 
     @Override
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardInfoServiceImpl.java
index faff1ae..c50a5b3 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardInfoServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardInfoServiceImpl.java
@@ -22,7 +22,9 @@
 import com.casic.missiles.mapper.equipment.BizEquipmentStandardInfoMapper;
 import com.casic.missiles.mapper.equipment.BizEquipmentStandardTechnologyRelationMapper;
 import com.casic.missiles.mapper.resource.BizResourceStaffInfoMapper;
-import com.casic.missiles.model.equipment.*;
+import com.casic.missiles.model.equipment.BizEquipmentStandardInfo;
+import com.casic.missiles.model.equipment.BizEquipmentStandardInfoApproval;
+import com.casic.missiles.model.equipment.BizEquipmentStandardTechnologyRelation;
 import com.casic.missiles.model.resource.BizResourceStaffInfo;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.dao.DeptMapper;
@@ -33,14 +35,12 @@
 import com.casic.missiles.service.flowable.ApprovalOperateService;
 import com.casic.missiles.utils.ConvertUtils;
 import com.casic.missiles.utils.DictCodeUtils;
-import org.flowable.engine.RuntimeService;
 import org.flowable.engine.runtime.ProcessInstance;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
 
-import javax.annotation.Resource;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
@@ -62,8 +62,6 @@
     private BizResourceStaffInfoMapper staffInfoMapper;
     @Autowired
     private IBaseApprovalService baseApprovalService;
-    @Resource
-    private RuntimeService runtimeService;
     @Autowired
     private ApprovalOperateService approvalOperateService;
     @Autowired
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSealInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSealInfoServiceImpl.java
index 7c91fa2..00040d6 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSealInfoServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSealInfoServiceImpl.java
@@ -15,6 +15,7 @@
 import com.casic.missiles.modular.system.model.User;
 import com.casic.missiles.service.resource.IBizResourceSealInfoService;
 import com.casic.missiles.utils.DictCodeUtils;
+import com.casic.missiles.utils.MinioUtil;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -33,6 +34,8 @@
     private BizResourceSealInfoMapper sealInfoMapper;
     @Autowired
     private UserMapper userMapper;
+    @Autowired
+    private MinioUtil minioUtil;
 
     @Override
     public Page<BizResourceSealInfo> listPage(Page<BizResourceSealInfo> page, SealInfoListRequest request) throws Exception {
@@ -44,6 +47,7 @@
         Page<BizResourceSealInfo> sealInfoPage = sealInfoMapper.selectPage(page, wrapper);
         for (BizResourceSealInfo record : sealInfoPage.getRecords()) {
             DictCodeUtils.convertDictCodeToName(record);
+            record.setMinioFileUrl(minioUtil.getFileUrl(record.getMinioFileName()));
         }
         return sealInfoPage;
     }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceStaffInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceStaffInfoServiceImpl.java
index f058cf5..09203ac 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceStaffInfoServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceStaffInfoServiceImpl.java
@@ -3,6 +3,7 @@
 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.core.page.PageFactory;
 import com.casic.missiles.dto.IdDTO;
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
@@ -86,6 +87,13 @@
     }
 
     @Override
+    public List<BizResourceStaffInfo> list(StaffListRequest request) throws Exception {
+        Page<BizResourceStaffInfo> page = PageFactory.defaultPage();
+        Page<BizResourceStaffInfo> staffInfoPage = this.listPage(page, request);
+        return staffInfoPage.getRecords();
+    }
+
+    @Override
     @Transactional
     public ReturnDTO<IdDTO> staffBaseAdd(BizResourceStaffInfo staffInfo) {
         //登录账号查重
@@ -495,6 +503,28 @@
         return certResponsePage;
     }
 
+    @Override
+    public List<StaffCertResponse> certListByIds(List<Long> ids) throws Exception {
+        Page<StaffCertResponse> page = PageFactory.defaultPage();
+        page.setCurrent(1);
+        page.setSearchCount(false);
+        page.setSize(Integer.MAX_VALUE);
+        StaffCertRequest request = new StaffCertRequest();
+        request.setIds(ids);
+        Page<StaffCertResponse> resultPage = this.certListPage(page, request);
+        return resultPage.getRecords();
+    }
+
+    @Override
+    public List<StaffCertResponse> certList(StaffCertRequest request) throws Exception {
+        Page<StaffCertResponse> page = PageFactory.defaultPage();
+        page.setCurrent(1);
+        page.setSearchCount(false);
+        page.setSize(Integer.MAX_VALUE);
+        Page<StaffCertResponse> resultPage = this.certListPage(page, request);
+        return resultPage.getRecords();
+    }
+
     @Async
     public void deleteRelationInfo(Long staffId){
         QueryWrapper<BizResourceStaffEducation> educationWrapper = new QueryWrapper<>();
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceStaffVerifierServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceStaffVerifierServiceImpl.java
index 8ac7eee..b508d45 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceStaffVerifierServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceStaffVerifierServiceImpl.java
@@ -52,8 +52,8 @@
     private WebSocket webSocket;
 
     @Override
-    public ReturnDTO expirationReminder(IdDTO idDto) {
-        BizResourceStaffVerifier staffVerifier = verifierMapper.selectById(idDto.getId());
+    public ReturnDTO expirationReminder(IdDTO idDTO) {
+        BizResourceStaffVerifier staffVerifier = verifierMapper.selectById(idDTO.getId());
         BizResourceStaffInfo staffInfo = staffInfoMapper.selectById(staffVerifier.getStaffId());
         QueryWrapper<User> wrapper = new QueryWrapper<>();
         wrapper.eq("account", staffInfo.getAccount());
@@ -65,7 +65,7 @@
         Assert.isFalse(Objects.isNull(user), () -> {
             throw new BusinessException(BusinessExceptionEnum.LOGIN_USER_ACQUIRE_FAILED);
         });
-        WorkbenchRemindMessage remindMessage = new WorkbenchRemindMessage(userInfo.getId(), userInfo.getDeptId(), idDto.getId(), staffVerifier.getCertNo(), MessageTypeEnum.STAFF_CERT.getCode(), MessageSourceModuleEnum.RESOURCE.getCode(), MessageTypeEnum.STAFF_CERT.getValue(), MessageTypeEnum.STAFF_CERT.getValue(), staffVerifier.getCertName(),0, user.getId(), user.getName());
+        WorkbenchRemindMessage remindMessage = new WorkbenchRemindMessage(userInfo.getId(), userInfo.getDeptId(), idDTO.getId(), staffVerifier.getCertNo(), MessageTypeEnum.STAFF_CERT.getCode(), MessageSourceModuleEnum.RESOURCE.getCode(), MessageTypeEnum.STAFF_CERT.getValue(), MessageTypeEnum.STAFF_CERT.getValue(), staffVerifier.getCertName(),0, user.getId(), user.getName());
         if(messageMapper.insert(remindMessage) > 0){
             // 新增到消息列表后向用户推送消息
             webSocket.sendOneMessage(String.valueOf(userInfo.getId()), JSONObject.toJSONString(remindMessage));
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceTrainInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceTrainInfoServiceImpl.java
index c1d6308..3a533f2 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceTrainInfoServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceTrainInfoServiceImpl.java
@@ -44,11 +44,14 @@
     @Override
     public Page<BizResourceTrainInfo> listPage(Page<BizResourceTrainInfo> page, TrainListRequest request) throws Exception {
         QueryWrapper<BizResourceTrainInfo> wrapper = new QueryWrapper<>();
-        wrapper.like("train_no", request.getTrainNo());
-        wrapper.apply(StringUtils.isNotBlank(request.getCreateTimeStart()),//apply方法传入参数名不能为空
-                "{0} <= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getCreateTimeStart().split(" ")[0]);
-        wrapper.apply(StringUtils.isNotBlank(request.getCreateTimeEnd()),
-                "{0} >= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getCreateTimeEnd().split(" ")[0]);
+        wrapper.like(StringUtils.isNotEmpty(request.getTrainNo()), "train_no", request.getTrainNo());
+        wrapper.like(StringUtils.isNotEmpty(request.getDutyLeader()),"duty_leader", request.getDutyLeader());
+        if(StringUtils.isNotBlank(request.getCreateTimeStart())){
+            wrapper.apply("{0} <= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getCreateTimeStart().split(" ")[0]);
+        }
+        if(StringUtils.isNotBlank(request.getCreateTimeEnd())){
+            wrapper.apply("{0} >= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getCreateTimeEnd().split(" ")[0]);
+        }
         wrapper.orderByDesc("create_time");
         Page<BizResourceTrainInfo> trainInfoPage = trainInfoMapper.selectPage(page, wrapper);
         for (BizResourceTrainInfo record : trainInfoPage.getRecords()) {
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/EnvLocationInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/EnvLocationInfoServiceImpl.java
new file mode 100644
index 0000000..cdc5742
--- /dev/null
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/EnvLocationInfoServiceImpl.java
@@ -0,0 +1,31 @@
+package com.casic.missiles.service.Impl.resource;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.casic.missiles.dto.resource.environment.LocationListRequest;
+import com.casic.missiles.dto.resource.environment.LocationListResponse;
+import com.casic.missiles.mapper.resource.EnvLocationInfoMapper;
+import com.casic.missiles.model.resource.EnvLocationInfo;
+import com.casic.missiles.service.resource.IEnvLocationInfoService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 实验室环境监控系统-设备表 服务实现类
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-06-07
+ */
+@Service
+public class EnvLocationInfoServiceImpl extends ServiceImpl<EnvLocationInfoMapper, EnvLocationInfo> implements IEnvLocationInfoService {
+    @Autowired
+    private EnvLocationInfoMapper locationInfoMapper;
+
+    @Override
+    public Page<LocationListResponse> listPage(Page<LocationListResponse> page, LocationListRequest request) {
+        Page<LocationListResponse> resultPage = locationInfoMapper.selectLocationListPage(page, request);
+        return resultPage;
+    }
+}
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/DownloadCenterServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/DownloadCenterServiceImpl.java
index c956d24..d9f3282 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/DownloadCenterServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/DownloadCenterServiceImpl.java
@@ -131,10 +131,12 @@
         wrapper.like(StringUtils.isNotBlank(request.getModuleName()), "module_name", request.getModuleName());
         wrapper.like(StringUtils.isNotBlank(request.getFileName()), "file_name", request.getFileName());
         wrapper.like(StringUtils.isNotBlank(request.getFileType()), "file_type", request.getFileType());
-        wrapper.apply(StringUtils.isNotBlank(request.getStartTime()),
-                "{0} <= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getStartTime().split(" ")[0]);
-        wrapper.apply(StringUtils.isNotBlank(request.getEndTime()),
-                "{0} >= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getEndTime().split(" ")[0]);
+        if(StringUtils.isNotBlank(request.getStartTime())){
+            wrapper.apply("{0} <= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getStartTime().split(" ")[0]);
+        }
+        if(StringUtils.isNotBlank(request.getEndTime())){
+            wrapper.apply("{0} >= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getEndTime().split(" ")[0]);
+        }
         wrapper.orderByDesc("create_time");
         return wrapper;
     }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemSignServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemSignServiceImpl.java
index 41976bb..7e90a09 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemSignServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemSignServiceImpl.java
@@ -52,15 +52,14 @@
 
     @Override
     public Page<SystemSign> listPage(Page<SystemSign> page, SignListRequest request) {
-        QueryWrapper<SystemSign> wrapper = getWrapper(request);
-        Page<SystemSign> signPage = signMapper.selectPage(page, wrapper);
+        Page<SystemSign> signPage = signMapper.selectSignListPage(page, request);
         return signPage;
     }
 
     @Override
     public List<SystemSign> list(SignListRequest request) {
-        QueryWrapper<SystemSign> wrapper = getWrapper(request);
-        return signMapper.selectList(wrapper);
+        List<SystemSign> signList = signMapper.selectSignList(request);
+        return signList;
     }
 
     @Override
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessCertificatePrintService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessCertificatePrintService.java
index 03247ab..7d6db77 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessCertificatePrintService.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessCertificatePrintService.java
@@ -9,6 +9,8 @@
 import com.casic.missiles.model.business.BizBusinessCertificatePrintLog;
 import com.casic.missiles.model.business.BizBusinessCertificateReport;
 
+import java.util.List;
+
 /**
  * <p>
  * 计量检定业务-任务计量管理-证书管理 服务类
@@ -30,4 +32,9 @@
     ReturnDTO certificatePrintStatus(Long id, String printStatus);
 
     ReturnDTO<BizBusinessCertificatePrintLog> certificatePrintLog(Long id);
+
+    List<CertificatePrintListResponse> listByIds(List<Long> ids);
+
+    List<CertificatePrintListResponse> list(CertificatePrintApprovalListRequest request);
+
 }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessCertificateReportService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessCertificateReportService.java
index 305ac7f..b33ef22 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessCertificateReportService.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessCertificateReportService.java
@@ -21,6 +21,4 @@
     ReturnDTO<CertificateReportSaveResponse> saveCertificateReport(BizBusinessCertificateReport request);
 
     ReturnDTO<BizBusinessCertificateReport> detail(BaseDetailRequest request);
-
-
 }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessIdentifyInfoService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessIdentifyInfoService.java
index 53c49d0..6d2089f 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessIdentifyInfoService.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessIdentifyInfoService.java
@@ -6,6 +6,8 @@
 import com.casic.missiles.model.business.BizBusinessIdentifyInfo;
 import com.baomidou.mybatisplus.extension.service.IService;
 
+import java.util.List;
+
 /**
  * <p>
  * 计量检定业务-任务计量管理-标识打印 服务类
@@ -20,7 +22,11 @@
 
     ReturnDTO addIdentify(BizBusinessIdentifyInfo identifyInfo);
 
-    ReturnDTO updateIdentify(BizBusinessIdentifyInfo identifyInfo);
+    ReturnDTO updateIdentify(Long id);
 
     ReturnDTO deleteIdentify(Long id);
+
+    List<BizBusinessIdentifyInfo> list(IdentifyListRequest request) throws Exception;
+
+    ReturnDTO<String> equipmentQrCode(Long id);
 }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessOutsourceAssessService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessOutsourceAssessService.java
index 5e15bc8..bcdc791 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessOutsourceAssessService.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessOutsourceAssessService.java
@@ -1,7 +1,11 @@
 package com.casic.missiles.service.business;
 
+import com.casic.missiles.dto.BaseApprovalSubmitRequest;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.business.outsource.OutsourceAssessApprovalListRequest;
+import com.casic.missiles.dto.business.outsource.OutsourceAssessSaveResponse;
 import com.casic.missiles.model.business.BizBusinessOutsourceAssess;
-import com.baomidou.mybatisplus.extension.service.IService;
+import com.casic.missiles.service.IGeneralApprovalService;
 
 /**
  * <p>
@@ -11,6 +15,7 @@
  * @author wangpeng
  * @since 2023-08-16
  */
-public interface IBizBusinessOutsourceAssessService extends IService<BizBusinessOutsourceAssess> {
+public interface IBizBusinessOutsourceAssessService extends IGeneralApprovalService<BizBusinessOutsourceAssess, BizBusinessOutsourceAssess, OutsourceAssessApprovalListRequest, BaseApprovalSubmitRequest> {
 
+    ReturnDTO<OutsourceAssessSaveResponse> saveOutsourceAssess(BizBusinessOutsourceAssess request);
 }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessOutsourceProtocolService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessOutsourceProtocolService.java
new file mode 100644
index 0000000..7f3092b
--- /dev/null
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessOutsourceProtocolService.java
@@ -0,0 +1,21 @@
+package com.casic.missiles.service.business;
+
+import com.casic.missiles.dto.BaseApprovalSubmitRequest;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.business.outsource.OutsourceProtocolApprovalListRequest;
+import com.casic.missiles.dto.business.outsource.OutsourceProtocolSaveResponse;
+import com.casic.missiles.model.business.BizBusinessOutsourceProtocol;
+import com.casic.missiles.service.IGeneralApprovalService;
+
+/**
+ * <p>
+ * 计量检定业务-分包管理-测试、校准或检定工作分包协议书 服务类
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-08-24
+ */
+public interface IBizBusinessOutsourceProtocolService extends IGeneralApprovalService<BizBusinessOutsourceProtocol, BizBusinessOutsourceProtocol, OutsourceProtocolApprovalListRequest, BaseApprovalSubmitRequest> {
+
+    ReturnDTO<OutsourceProtocolSaveResponse> saveOutsourceProtocol(BizBusinessOutsourceProtocol request);
+}
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessOutsourcerInfoService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessOutsourcerInfoService.java
index 9ba656b..b199de4 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessOutsourcerInfoService.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessOutsourcerInfoService.java
@@ -24,8 +24,6 @@
  */
 public interface IBizBusinessOutsourcerInfoService extends IGeneralApprovalService<BizBusinessOutsourcerInfo, BizBusinessOutsourcerInfo, OutsourcerInfoApprovalListRequest, BaseApprovalSubmitRequest> {
 
-    List<BizBusinessOutsourcerInfo> list(OutsourcerInfoApprovalListRequest request);
-
     ReturnDTO<OutsourcerSaveResponse> saveOutsourcer(BizBusinessOutsourcerInfo request);
 
     BizBusinessOutsourcerInfo detail(Long id) throws Exception;

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java
index bb0c50f..13a699b 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java
@@ -12,6 +12,7 @@
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.IGeneralApprovalService;
+import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
@@ -19,6 +20,7 @@
 import org.springframework.web.bind.annotation.RequestBody;
 
 import javax.validation.Valid;
+import java.util.List;
 import java.util.Objects;
 
 /**
@@ -117,4 +119,17 @@
         }
         return baseApprovalService.failUpdate(request);
     }
+
+    public List<O> exportList(@RequestBody @Valid R request) throws Exception {
+        List<O> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = baseApprovalService.listExportByIds(request.getIds());
+        } else {
+            list = baseApprovalService.listExport(request);
+        }
+        for (O record : list) {
+            DictCodeUtils.convertDictCodeToName(record);
+        }
+        return list;
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java
index 8a90961..d775831 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java
@@ -5,6 +5,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.business.certificate.CertificateChangeApplyApprovalListRequest;
 import com.casic.missiles.dto.business.certificate.CertificateChangeApplySaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessCertificateChangeApply;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
@@ -20,6 +21,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -48,4 +50,12 @@
         }
         return changeApplyService.saveChangeApply(request);
     }
+
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody CertificateChangeApplyApprovalListRequest request) throws Exception {
+        List<BizBusinessCertificateChangeApply> list = super.exportList(request);
+        super.exportExcel(BizBusinessCertificateChangeApply.class, list, ExportEnum.CERTIFICATE_CHANGE_APPLY.getSheetName());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java
index 5fc4b07..af8230e 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java
@@ -9,6 +9,7 @@
 import com.casic.missiles.dto.business.certificate.CertificatePrintApprovalListRequest;
 import com.casic.missiles.dto.business.certificate.CertificatePrintListResponse;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.enums.business.CertificatePrintStatusEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessCertificatePrintLog;
@@ -18,10 +19,16 @@
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.io.IOException;
+import java.util.List;
 import java.util.Objects;
 
 /**
@@ -98,4 +105,16 @@
         });
         return certificatePrintService.certificatePrintLog(idDTO.getId());
     }
+
+    @ApiOperation("证书打印审批导出")
+    @PostMapping("/listExport")
+    public void exportList(@RequestBody CertificatePrintApprovalListRequest request) throws IOException {
+        List<CertificatePrintListResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = certificatePrintService.listByIds(request.getIds());
+        } else {
+            list = certificatePrintService.list(request);
+        }
+        super.exportExcel(CertificatePrintListResponse.class, list, ExportEnum.CERTIFICATE_PRINT.getSheetName());
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java
index 63b06dc..6b2efd5 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java
@@ -6,6 +6,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.business.certificate.CertificateReportApprovalListRequest;
 import com.casic.missiles.dto.business.certificate.CertificateReportSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessCertificateReport;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
@@ -21,6 +22,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -50,7 +52,7 @@
         return certificateReportService.saveCertificateReport(request);
     }
 
-    @ApiOperation("证书审批详情（基本信息）")
+    @ApiOperation("详情（基本信息）")
     @PostMapping("/detail")
     public ReturnDTO<BizBusinessCertificateReport> detail(@RequestBody @Valid BaseDetailRequest request, BindingResult bindingResult) throws Exception {
         if(bindingResult.hasErrors()){
@@ -59,4 +61,11 @@
         return certificateReportService.detail(request);
     }
 
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody CertificateReportApprovalListRequest request) throws Exception {
+        List<BizBusinessCertificateReport> list = super.exportList(request);
+        super.exportExcel(BizBusinessCertificateReport.class, list, ExportEnum.CERTIFICATE_REPORT.getSheetName());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java
index 46b26bd..57c0809 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java
@@ -10,20 +10,21 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.business.identify.IdentifyListRequest;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessIdentifyInfo;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.business.IBizBusinessIdentifyInfoService;
+import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import javax.validation.Valid;
+import java.util.List;
 import java.util.Objects;
 
 /**
@@ -57,16 +58,13 @@
         return identifyInfoService.addIdentify(identifyInfo);
     }
 
-    @ApiOperation("标识打印更新")
+    @ApiOperation("标识打印更新（更新打印时间）")
     @PostMapping("/update")
-    public ReturnDTO updateIdentify(@RequestBody @Valid BizBusinessIdentifyInfo identifyInfo, BindingResult bindingResult) {
-        Assert.isFalse(Objects.isNull(identifyInfo.getId()), () -> {
+    public ReturnDTO updateIdentify(@RequestBody @Valid IdDTO idDTO) {
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        Assert.isFalse(bindingResult.hasErrors(), () -> {
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        });
-        return identifyInfoService.updateIdentify(identifyInfo);
+        return identifyInfoService.updateIdentify(idDTO.getId());
     }
 
     @ApiOperation("标识打印删除")
@@ -77,4 +75,37 @@
         });
         return identifyInfoService.deleteIdentify(idDTO.getId());
     }
+
+    @ApiOperation("标识打印导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody @Valid IdentifyListRequest request, BindingResult bindingResult) throws Exception {
+        if (bindingResult.hasErrors()) {
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        List<BizBusinessIdentifyInfo> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = identifyInfoService.listByIds(request.getIds());
+        } else {
+            list = identifyInfoService.list(request);
+        }
+        for (BizBusinessIdentifyInfo record : list) {
+            DictCodeUtils.convertDictCodeToName(record);
+        }
+        super.exportExcel(BizBusinessIdentifyInfo.class, list, ExportEnum.IDENTIFY_EXPORT.getSheetName());
+    }
+
+
+    // TODO: 2023/8/23 查询设备信息，4个底部按钮查设备（按钮的作用就是前端用来调不同接口、用来区分中间即将展示的标识），前端弹窗选设备，在确定保存时前端根据底部按钮判断传入设备类型deviceType字典code
+    // TODO: 2023/8/23 接口：查受检设备（第1个按钮），查设备台账（后3个按钮同一接口），查询之后前端根据标志类型的不同加到中间页面时进行判断（按产品给的对应表）
+    // TODO: 2023/8/23 提供二维码接口，前端在加到中间页面时调用一下
+
+    @ApiOperation("设备二维码")
+    @PostMapping("/equipment/qrCode")
+    public ReturnDTO<String> equipmentQrCode(@RequestBody @Valid IdDTO idDTO) {
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return identifyInfoService.equipmentQrCode(idDTO.getId());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java
index 707be6e..7e0453d 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java
@@ -117,7 +117,7 @@
     }
 
     @ApiOperation("任务单导出")
-    @PostMapping("/export")
+    @PostMapping("/listExport")
     public void orderExport(@RequestBody @Valid OrderListRequest request, HttpServletResponse response) {
         businessOrderService.orderExport(request, response);
     }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java
index 529a6ce..51432be 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java
@@ -1,9 +1,28 @@
 package com.casic.missiles.controller.business;
 
+import com.casic.missiles.controller.GeneralApprovalController;
+import com.casic.missiles.dto.BaseApprovalSubmitRequest;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.business.outsource.OutsourceAssessApprovalListRequest;
+import com.casic.missiles.dto.business.outsource.OutsourceAssessSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
+import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.model.business.BizBusinessOutsourceAssess;
+import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
+import com.casic.missiles.service.IGeneralApprovalService;
+import com.casic.missiles.service.business.IBizBusinessOutsourceAssessService;
 import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.BindingResult;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.validation.Valid;
+import java.util.List;
+
 /**
  * <p>
  * 计量检定业务-分包管理-测试、校准或检定工作分包评审表 前端控制器
@@ -15,6 +34,27 @@
 @Api(tags = "分包管理-测试、校准或检定工作分包评审表")
 @RestController
 @RequestMapping("/business/outsource/assess")
-public class BizBusinessOutsourceAssessController {
+public class BizBusinessOutsourceAssessController extends GeneralApprovalController<BizBusinessOutsourceAssess, BizBusinessOutsourceAssess, OutsourceAssessApprovalListRequest, BaseApprovalSubmitRequest> {
+    @Autowired
+    private IBizBusinessOutsourceAssessService outsourceAssessService;
 
+    public BizBusinessOutsourceAssessController(IGeneralApprovalService<BizBusinessOutsourceAssess, BizBusinessOutsourceAssess, OutsourceAssessApprovalListRequest, BaseApprovalSubmitRequest> baseApprovalService) {
+        super(baseApprovalService);
+    }
+
+    @ApiOperation("草稿箱-保存")
+    @PostMapping("/save")
+    public ReturnDTO<OutsourceAssessSaveResponse> saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceAssess request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        return outsourceAssessService.saveOutsourceAssess(request);
+    }
+
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception {
+        List<BizBusinessOutsourceAssess> list = super.exportList(request);
+        super.exportExcel(BizBusinessOutsourceAssess.class, list, ExportEnum.OUTSOURCE_ASSESS.getSheetName());
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java
new file mode 100644
index 0000000..9adef18
--- /dev/null
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java
@@ -0,0 +1,60 @@
+package com.casic.missiles.controller.business;
+
+import com.casic.missiles.controller.GeneralApprovalController;
+import com.casic.missiles.dto.BaseApprovalSubmitRequest;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.business.outsource.OutsourceProtocolApprovalListRequest;
+import com.casic.missiles.dto.business.outsource.OutsourceProtocolSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
+import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.model.business.BizBusinessOutsourceProtocol;
+import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
+import com.casic.missiles.service.IGeneralApprovalService;
+import com.casic.missiles.service.business.IBizBusinessOutsourceProtocolService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.BindingResult;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.validation.Valid;
+import java.util.List;
+
+/**
+ * <p>
+ * 计量检定业务-分包管理-测试、校准或检定工作分包协议书 前端控制器
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-08-24
+ */
+@Api(tags = "分包管理-测试、校准或检定工作分包协议书")
+@RestController
+@RequestMapping("/business/outsource/protocol")
+public class BizBusinessOutsourceProtocolController extends GeneralApprovalController<BizBusinessOutsourceProtocol, BizBusinessOutsourceProtocol, OutsourceProtocolApprovalListRequest, BaseApprovalSubmitRequest> {
+    @Autowired
+    private IBizBusinessOutsourceProtocolService outsourceProtocolService;
+
+    public BizBusinessOutsourceProtocolController(IGeneralApprovalService<BizBusinessOutsourceProtocol, BizBusinessOutsourceProtocol, OutsourceProtocolApprovalListRequest, BaseApprovalSubmitRequest> baseApprovalService) {
+        super(baseApprovalService);
+    }
+
+    @ApiOperation("草稿箱-保存")
+    @PostMapping("/save")
+    public ReturnDTO<OutsourceProtocolSaveResponse> saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceProtocol request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        return outsourceProtocolService.saveOutsourceProtocol(request);
+    }
+
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody OutsourceProtocolApprovalListRequest request) throws Exception {
+        List<BizBusinessOutsourceProtocol> list = super.exportList(request);
+        super.exportExcel(BizBusinessOutsourceProtocol.class, list, ExportEnum.OUTSOURCE_PROTOCOL.getSheetName());
+    }
+}
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java
index 097f645..f0f0943 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java
@@ -17,7 +17,6 @@
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.IGeneralApprovalService;
 import com.casic.missiles.service.business.IBizBusinessOutsourcerInfoService;
-import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -71,19 +70,8 @@
 
     @ApiOperation("分包方导出")
     @PostMapping("/listExport")
-    public void export(@RequestBody @Valid OutsourcerInfoApprovalListRequest request, BindingResult bindingResult) throws Exception {
-        if (bindingResult.hasErrors()) {
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        }
-        List<BizBusinessOutsourcerInfo> list;
-        if (!CollectionUtils.isEmpty(request.getIds())) {
-            list = outsourcerInfoService.listByIds(request.getIds());
-        } else {
-            list = outsourcerInfoService.list(request);
-        }
-        for (BizBusinessOutsourcerInfo record : list) {
-            DictCodeUtils.convertDictCodeToName(record);
-        }
+    public void export(@RequestBody OutsourcerInfoApprovalListRequest request) throws Exception {
+        List<BizBusinessOutsourcerInfo> list = super.exportList(request);
         super.exportExcel(BizBusinessOutsourcerInfo.class, list, ExportEnum.OUTSOURCER_EXPORT.getSheetName());
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java
index c2cbf9f..0410918 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java
@@ -17,11 +17,9 @@
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.IGeneralApprovalService;
 import com.casic.missiles.service.business.IBizBusinessSiteExecutiveInfoService;
-import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -60,7 +58,7 @@
         return siteExecutiveInfoService.saveSiteExecutiveInfo(siteExecutiveInfo);
     }
 
-    @ApiOperation("现场检测详情")
+    @ApiOperation("详情")
     @PostMapping("/detail")
     public ReturnDTO<SiteExecutiveDetailResponse> siteExecutiveDetail(@RequestBody @Valid IdDTO idDTO) throws Exception {
         Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
@@ -69,21 +67,10 @@
         return ReturnUtil.success(siteExecutiveInfoService.detail(idDTO.getId()));
     }
 
-    @ApiOperation("现场检测导出")
+    @ApiOperation("导出")
     @PostMapping("/listExport")
-    public void export(@RequestBody @Valid SiteExecutiveApprovalListRequest request, BindingResult bindingResult) throws Exception {
-        if (bindingResult.hasErrors()) {
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        }
-        List<SiteExecutiveApprovalListResponse> list;
-        if (!CollectionUtils.isEmpty(request.getIds())) {
-            list = siteExecutiveInfoService.listInfoByIds(request.getIds());
-        } else {
-            list = siteExecutiveInfoService.listInfo(request);
-        }
-        for (SiteExecutiveApprovalListResponse record : list) {
-            DictCodeUtils.convertDictCodeToName(record);
-        }
+    public void export(@RequestBody SiteExecutiveApprovalListRequest request) throws Exception {
+        List<SiteExecutiveApprovalListResponse> list = super.exportList(request);
         super.exportExcel(SiteExecutiveApprovalListResponse.class, list, ExportEnum.SITE_EXECUTIVE_EXPORT.getSheetName());
     }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
index 7e793cd..a92e209 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
@@ -55,7 +55,7 @@
 
     @ApiOperation("设备收发列表导出")
     @PostMapping("/export")
-    public void exportList(@RequestBody @Valid SampleDispatchListRequest request) throws IOException {
+    public void exportList(@RequestBody SampleDispatchListRequest request) throws IOException {
         List<SampleDispatchListResponse> list;
         if (!CollectionUtils.isEmpty(request.getIds())) {
             list = dispatchService.listByIds(request.getIds());
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java
index cdc77fc..d120fd4 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java
@@ -7,6 +7,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.business.labExecutive.*;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.business.IBusinessLabExecutiveInfoService;
@@ -14,6 +15,7 @@
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.*;
 
@@ -32,7 +34,7 @@
     @Autowired
     private IBusinessLabExecutiveInfoService labExecutiveInfoService;
 
-    @ApiOperation("实验室检测-部门检测-查询各状态列表（待检测、检测中、检测完）")
+    @ApiOperation("实验室任务-查询各状态列表（待检测、检测中、检测完）")
     @PostMapping("/deptExecutive/List")
     public ReturnDTO<PageInfoBT<SampleLabExecutiveListResponse>> queryDeptExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
@@ -43,10 +45,19 @@
         return ReturnUtil.success(super.packForBT(labExecutiveInfoService.deptLabExecutiveListPage(page, labExecutiveListRequest)));
     }
 
-    /**
-     * 实验室检测-我的检测-查询各状态列表（待检测、检测中、检测完）
-     */
-    @ApiOperation("实验室检测-我的检测-查询各状态列表（待检测、检测中、检测完）")
+    @ApiOperation("实验室任务导出")
+    @PostMapping("/deptExecutive/export")
+    public void deptExportList(@RequestBody @Valid SampleLabExecutiveListRequest request) throws Exception {
+        List<SampleLabExecutiveListResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = labExecutiveInfoService.deptLabExecutiveListByIds(request.getMeasureStatus(), request.getIds());
+        } else {
+            list = labExecutiveInfoService.deptLabExecutiveList(request);
+        }
+        super.exportExcel(SampleLabExecutiveListResponse.class, list, ExportEnum.DEPT_EXECUTIVE_TASK.getSheetName());
+    }
+
+    @ApiOperation("我的任务-查询各状态列表（待检测、检测中、检测完）")
     @PostMapping("/myExecutive/list")
     public ReturnDTO<PageInfoBT<SampleLabExecutiveListResponse>> queryMyExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
@@ -57,19 +68,25 @@
         return ReturnUtil.success(super.packForBT(labExecutiveInfoService.myLabExecutiveListPage(page, labExecutiveListRequest)));
     }
 
-    /**
-     * 实验室检测-我的检测-查询各状态样品数量（待检测、检测中、检测完）
-     */
-    @ApiOperation("实验室检测-我的检测-查询各状态样品数量（待检测、检测中、检测完）")
+    @ApiOperation("我的任务导出")
+    @PostMapping("/myExecutive/export")
+    public void exportList(@RequestBody @Valid SampleLabExecutiveListRequest request) throws Exception {
+        List<SampleLabExecutiveListResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = labExecutiveInfoService.myLabExecutiveListByIds(request.getMeasureStatus(), request.getIds());
+        } else {
+            list = labExecutiveInfoService.myLabExecutiveList(request);
+        }
+        super.exportExcel(SampleLabExecutiveListResponse.class, list, ExportEnum.MY_EXECUTIVE_TASK.getSheetName());
+    }
+
+    @ApiOperation("我的任务-查询各状态样品数量（待检测、检测中、检测完）")
     @GetMapping("/myExecutive/amount")
     public ReturnDTO<List<SampleAmountResponse>> queryMyExecutiveAmount() {
         return ReturnUtil.success(labExecutiveInfoService.myExecutiveAmount());
     }
 
-    /**
-     * 实验室检测-部门检测-分配（分配给具体人员）
-     */
-    @ApiOperation("实验室检测-部门检测-分配按钮（分配给具体人员）")
+    @ApiOperation("实验室任务-分配按钮（分配给具体人员）")
     @PostMapping("/deptExecutive/allocate")
     public ReturnDTO allocateStaff(@RequestBody @Valid SampleAllocateRequest sampleAllocateRequest, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -78,10 +95,7 @@
         return labExecutiveInfoService.allocateStaff(sampleAllocateRequest);
     }
 
-    /**
-     * 实验室检测-我的检测-检定人扫描收入（待检测->检测中）
-     */
-    @ApiOperation("实验室检测-我的检测-检定人扫描收入（待检测->检测中）")
+    @ApiOperation("我的任务-检定人扫描收入（待检测->检测中）")
     @PostMapping("/myExecutive/receive")
     public ReturnDTO sampleReceive(@RequestBody @Valid List<SampleOperateRequest> requestList, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -90,10 +104,7 @@
         return labExecutiveInfoService.sampleReceive(requestList);
     }
 
-    /**
-     * 实验室检测-负责人/检定人扫描检完（检测中->检测完）
-     */
-    @ApiOperation("实验室检测-负责人/检定人扫描检完（检测中->检测完）")
+    @ApiOperation("实验室任务-负责人/检定人扫描检完（检测中->检测完）")
     @PostMapping("/myExecutive/complete")
     public ReturnDTO sampleExecutiveComplete(@RequestBody @Valid List<SampleOperateRequest> requestList, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -102,10 +113,7 @@
         return labExecutiveInfoService.sampleExecutiveComplete(requestList);
     }
 
-    /**
-     * 实验室检测-部门检测/我的检测 编辑（只能修改应出具证书）
-     */
-    @ApiOperation("实验室检测-部门检测/我的检测 编辑（只能修改应出具证书）")
+    @ApiOperation("实验室任务/我的任务 编辑（只能修改应出具证书）")
     @PostMapping("/executive/update")
     public ReturnDTO updateExecutive(@RequestBody @Valid UpdateExecutiveRequest request, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -114,10 +122,7 @@
         return labExecutiveInfoService.updateExecutive(request);
     }
 
-    /**
-     * 实验室检测-部门检测/我的检测 详情
-     */
-    @ApiOperation("实验室检测-部门检测/我的检测 详情")
+    @ApiOperation("实验室任务/我的任务 详情")
     @PostMapping("/executive/detail")
     public ReturnDTO<ExecutiveDetailResponse> executiveDetail(@RequestBody @Valid ExecutiveDetailRequest request, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
@@ -131,7 +136,7 @@
      * 退回后会将下一个要执行的实验室检测状态更新为待分配，将后面的实验室顺序变更为连续（都进行减1）
      * 最后一个检测的实验室退回，等分发员再增加实验室或设备收发中的已收入直接手动点击完成
      */
-    @ApiOperation("实验室检测-部门检测/我的检测 退回（待检测/检测中->退回）")
+    @ApiOperation("实验室任务/我的任务 退回（待检测/检测中->退回）")
     @PostMapping("/executive/sendBack")
     public ReturnDTO executiveSendBack(@RequestBody @Valid ExecutiveSendBackRequest request, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -140,9 +145,6 @@
         return labExecutiveInfoService.sampleExecutiveSendBack(request);
     }
 
-    /**
-     * 分发员编辑实验室检测列表
-     */
     @ApiOperation("分发员编辑实验室检测列表")
     @PostMapping("/handOut/updateList")
     public ReturnDTO updateExecutiveList(@RequestBody @Valid UpdateExecutiveListRequest request, BindingResult bindingResult) {
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java
index 48a67ed..0c04f31 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java
@@ -10,6 +10,7 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.resource.customer.CustomerApprovalListRequest;
 import com.casic.missiles.dto.resource.customer.CustomerSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceCustomerInfo;
@@ -26,6 +27,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -55,6 +57,13 @@
         return customerInfoService.saveCustomerInfo(request);
     }
 
+    @ApiOperation("委托方名录导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody CustomerApprovalListRequest request) throws Exception {
+        List<BizResourceCustomerInfo> list = super.exportList(request);
+        super.exportExcel(BizResourceCustomerInfo.class, list, ExportEnum.CUSTOMER_INFO.getSheetName());
+    }
+
     @ApiOperation("委托方人员列表（分页）")
     @PostMapping("/person/listPage")
     public ReturnDTO<PageInfoBT<BizResourceCustomerStaff>> personListPage(@RequestBody IdDTO idDto) {
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
index 972ed4b..6418ea5 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
@@ -5,6 +5,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.resource.customer.SuggestFormApprovalListRequest;
 import com.casic.missiles.dto.resource.customer.SuggestFormSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceCustomerSuggestForm;
@@ -20,6 +21,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -50,4 +52,11 @@
         return suggestFormService.saveSuggestForm(request);
     }
 
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody SuggestFormApprovalListRequest request) throws Exception {
+        List<BizResourceCustomerSuggestForm> list = super.exportList(request);
+        super.exportExcel(BizResourceCustomerSuggestForm.class, list, ExportEnum.CUSTOMER_SUGGEST_FORM.getSheetName());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java
index 1934d1a..9e07eab 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java
@@ -15,12 +15,16 @@
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.resource.IEnvEnvironmentRecordConfigService;
 import com.casic.missiles.service.resource.IEnvEnvironmentRecordDataService;
+import com.casic.missiles.service.resource.IEnvLocationInfoService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
 import java.util.List;
@@ -39,6 +43,8 @@
     private IEnvEnvironmentRecordDataService environmentRecordDataService;
     @Autowired
     private IEnvEnvironmentRecordConfigService environmentRecordConfigService;
+    @Autowired
+    private IEnvLocationInfoService locationInfoService;
 
     @ApiOperation("环境记录单数据列表/详情")
     @PostMapping("/data/listPage")
@@ -95,4 +101,11 @@
         });
         return environmentRecordConfigService.deleteEnvironmentRecordConfig(idDTO.getId());
     }
+
+    @ApiOperation("地点列表")
+    @PostMapping("/location/listPage")
+    public ReturnDTO<PageInfoBT<LocationListResponse>> locationListPage(@RequestBody @Valid LocationListRequest request) {
+        Page<LocationListResponse> page = PageFactory.defaultPage();
+        return ReturnUtil.success(super.packForBT(locationInfoService.listPage(page, request)));
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java
index 82efe3f..e9561fa 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java
@@ -10,6 +10,7 @@
 import com.casic.missiles.dto.resource.seal.SealLogListRequest;
 import com.casic.missiles.dto.resource.seal.SealNoteApprovalListRequest;
 import com.casic.missiles.dto.resource.seal.SealNoteSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceSealUseLog;
@@ -27,6 +28,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -58,6 +60,13 @@
         return sealUseNoteService.saveSeal(request);
     }
 
+    @ApiOperation("印章使用登记导出（列表和导出中去掉经办人和监印人）")
+    @PostMapping("/listExport")
+    public void export(@RequestBody SealNoteApprovalListRequest request) throws Exception {
+        List<BizResourceSealUseNote> list = super.exportList(request);
+        super.exportExcel(BizResourceSealUseNote.class, list, ExportEnum.SEAL_NOTE.getSheetName());
+    }
+
     // TODO: 2023/7/28 印章使用日志：系统中使用印章时插入数据库
 
     @ApiOperation("印章使用日志列表（分页）")
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java
index 9b674fc..06b6521 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java
@@ -9,16 +9,20 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.resource.staff.StaffCertRequest;
 import com.casic.missiles.dto.resource.staff.StaffCertResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.service.resource.IBizResourceStaffInfoService;
 import com.casic.missiles.service.resource.IBizResourceStaffVerifierService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.List;
+
 /**
  * @Description:
  * @Author: wangpeng
@@ -41,9 +45,21 @@
         return ReturnUtil.success(super.packForBT(responsePage));
     }
 
+    @ApiOperation("证书逾期提醒导出")
+    @PostMapping("/listExport")
+    public void exportList(@RequestBody StaffCertRequest request) throws Exception {
+        List<StaffCertResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = staffInfoService.certListByIds(request.getIds());
+        } else {
+            list = staffInfoService.certList(request);
+        }
+        super.exportExcel(StaffCertResponse.class, list, ExportEnum.STAFF_CERTIFICATE_EXPIRE.getSheetName());
+    }
+
     @ApiOperation("证书逾期提醒")
     @PostMapping("/expirationReminder")
-    public ReturnDTO expirationReminder(@RequestBody IdDTO idDto) {
-        return verifierService.expirationReminder(idDto);
+    public ReturnDTO expirationReminder(@RequestBody IdDTO idDTO) {
+        return verifierService.expirationReminder(idDTO);
     }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java
index 3b251ad..a6e7850 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java
@@ -12,6 +12,7 @@
 import com.casic.missiles.dto.resource.staff.StaffListRequest;
 import com.casic.missiles.dto.resource.staff.TrainListRequest;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.*;
@@ -22,7 +23,10 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
 import java.util.List;
@@ -52,8 +56,19 @@
             throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
         }
         Page<BizResourceStaffInfo> page = PageFactory.defaultPage();
-        Page<BizResourceStaffInfo> responsePage = staffInfoService.listPage(page, request);
-        return ReturnUtil.success(super.packForBT(responsePage));
+        return ReturnUtil.success(super.packForBT(staffInfoService.listPage(page, request)));
+    }
+
+    @ApiOperation("人员登记导出")
+    @PostMapping("/listExport")
+    public void exportList(@RequestBody StaffListRequest request) throws Exception {
+        List<BizResourceStaffInfo> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = staffInfoService.listByIds(request.getIds());
+        } else {
+            list = staffInfoService.list(request);
+        }
+        super.exportExcel(BizResourceStaffInfo.class, list, ExportEnum.STAFF_INFO.getSheetName());
     }
 
     @ApiOperation("人员登记详情基础信息")
@@ -85,9 +100,9 @@
 
     @ApiOperation("科研教育列表（分页）")
     @PostMapping("/education/listPage")
-    public ReturnDTO<PageInfoBT<BizResourceStaffEducation>> educationListPage(@RequestBody IdDTO idDto) {
+    public ReturnDTO<PageInfoBT<BizResourceStaffEducation>> educationListPage(@RequestBody IdDTO idDTO) {
         Page<BizResourceStaffEducation> page = PageFactory.defaultPage();
-        Page<BizResourceStaffEducation> responsePage = staffInfoService.educationListPage(page, idDto);
+        Page<BizResourceStaffEducation> responsePage = staffInfoService.educationListPage(page, idDTO);
         return ReturnUtil.success(super.packForBT(responsePage));
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java
index af6aa86..d85d84a 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java
@@ -9,6 +9,7 @@
 import com.casic.missiles.dto.resource.outsideService.SupplierApprovalListRequest;
 import com.casic.missiles.dto.resource.outsideService.SupplierSaveResponse;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceSupplierAbility;
@@ -67,6 +68,13 @@
         return ReturnUtil.success(supplierInfoService.detail(idDTO.getId()));
     }
 
+    @ApiOperation("合格供方导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody SupplierApprovalListRequest request) throws Exception {
+        List<BizResourceSupplierInfo> list = super.exportList(request);
+        super.exportExcel(BizResourceSupplierInfo.class, list, ExportEnum.SUPPLIER_INFO.getSheetName());
+    }
+
     @ApiOperation("供方人员列表（分页）")
     @PostMapping("/person/listPage")
     public ReturnDTO<PageInfoBT<BizResourceSupplierPerson>> personListPage(@RequestBody IdDTO idDTO) {
diff --git a/casic-metering-api/src/main/resources/config/application.yml b/casic-metering-api/src/main/resources/config/application.yml
index 350db5f..ecff521 100644
--- a/casic-metering-api/src/main/resources/config/application.yml
+++ b/casic-metering-api/src/main/resources/config/application.yml
@@ -126,7 +126,7 @@
     #作者
     author: wangpeng
     #待生成对象表名
-    table-name: biz_equipment_technical_target_approval,biz_equipment_attachment_approval,biz_equipment_checkpoint_approval
+    table-name: biz_business_outsource_protocol
 
 reminder:
   #节点--common模块config包 ReminderNodeConfig配置
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
index 4a19e4e..d47d552 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
@@ -53,6 +53,7 @@
     SUGGEST_FORM_SAVE_FAILED(2509, "委托方意见登记表保存至草稿箱失败"),
     EXAMINE_FORM_SAVE_FAILED(2510, "要求、委托书及合同评审表保存至草稿箱失败"),
     CUSTOMER_EXIST_SAVE_FAILED(2511, "该委托方已存在，请重新选择"),
+    DUPLICATE_LOCATION_NO(2512, "地点编号已存在"),
 
     /**
      * 计量检定业务模块
@@ -68,6 +69,8 @@
     COMPLETE_SAMPLE_NOT_EXIST(2609, "检测中不存在扫描收入的样品"),
     CANNOT_CHANGE_MEASURE_INFO(2610, "无法更改非当前登录用户的检测信息"),
     NON_EXIST_ORDER_OR_SAMPLE(2611, "不存在该委托单或该委托单下的样品"),
+    OUTSOURCE_ACCESS_SAVE_FAILED(2612, "测试、校准或检定工作分包评审表保存至草稿箱失败"),
+    OUTSOURCE_PROTOCOL_SAVE_FAILED(2613, "测试、校准或检定工作分包协议书保存至草稿箱失败"),
 
     /**
      * 历史遗留备用
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
index 5089ad1..81a406b 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
@@ -10,54 +10,38 @@
     /**
      * 资源管理
      */
-    ENVIRONMENT_DATA_EXPORT("environmentData", "environmentData", "环境记录单数据"),
+    ENVIRONMENT_DATA_EXPORT("environmentData", "环境记录单数据", "环境记录单数据"),
+    STAFF_INFO("staffInfo", "人员登记", "人员登记"),
+    STAFF_CERTIFICATE_EXPIRE("certificateExpire", "证书逾期提醒", "证书逾期提醒"),
+    SUPPLIER_INFO("supplierInfo", "合格供方名录", "合格供方名录"),
+    CUSTOMER_INFO("customerInfo", "委托方名录", "委托方名录"),
+    CUSTOMER_SUGGEST_FORM("customerSuggestForm", "委托方意见登记表", "委托方意见登记表"),
+    SEAL_NOTE("sealNote", "印章使用登记", "印章使用登记"),
 
-    FILE_EXPORT("meterFileData", "meterFileData", "计量文件信息"),
-    TRAIN_PLAN_EXPORT("trainPlanData", "trainPlanData", "培训计划"),
-    TRAIN_LOG_EXPORT("trainLogData", "trainLogData", "培训记录"),
-    METER_ORGANIZE_EXPORT("meterOrganizeData", "meterOrganizeData", "计量组织"),
-    TRACE_SUPPLIER_EXPORT("traceSupplierData", "traceSupplierData", "溯源供方"),
-    SIGN_EXPORT("signData", "signData", "签名/签章"),
-    TEMPLATE_EXPORT("templateData", "templateData", "原始记录模板/证书报告模板"),
-    FIXED_ASSETS("meterFixedAssets", "meterFixedAssets", "固定资产"),
-    METER_EQUIPMENT("meterEquipment", "meterEquipment", "测量设备"),
-    CALIBRATION_TEST_EQUIPMENT("calibrationTestEquipment", "calibrationTestEquipment", "校准检定设备"),
-    MEASURE_ACCOUNT("measureAccount", "measureAccount", "测量工装"),
-    STANDARD_SUPPORT_EQUIPMENT("standardSupportEquipment", "standardSupportEquipment", "标准配套设备"),
-    STANDARD_EQUIPMENT("standardEquipment", "standardEquipment", "标准装置"),
-    FLOW_DEF_EXPORT("flowDefData", "flowDefData", "流程定义"),
-    STAFF_CERTIFICATE("certificate", "certificate", "计量人员证书"),
-    CHECK_INFO("checkInfo", "checkInfo", "设备管理点检测"),
-    EQUIPMENT_APPLY("equipmentApply", "equipmentApply", "设备借用"),
-    STANDARD_EQUIPMENT_REMIND("equipmentApplyRemind", "equipmentApplyRemind", "标准装置到期提醒"),
-    METER_PRICE("meterPrice", "meterPrice", "价格库"),
-    METER_STAFF("meterStaff", "meterStaff", "计量人员"),
-    STANDARD_EQUIPMENT_APPLY("standardEquipmentApply", "standardEquipmentApply", "标准装置申请"),
-    STATE_MANAGE_APPLY("stateManage", "stateManage", "状态管理"),
-    METER_ACCEPTANCE_CHECK("acceptanceCheck", "acceptanceCheck", "设备检修保养验收单"),
-    CUSTOMER_EXPORT("customerData", "customerData", "客户信息"),
-    ORDER_EXPORT("orderData", "orderData", "委托书信息"),
-    SAMPLE_EXPORT("sampleData", "sampleData", "样本信息"),
-    EXCHANGE_DATA("exchangeData", "exchangeData", "设备交接单"),
-    DISPATCH_DATA("dispatchData", "dispatchData", "设备收发"),
-    ENVIRONMENT_DATA("environmentData", "environmentData", "环境记录单"),
-    ORIGIN_DATA("originData", "originData", "原始记录"),
-    CERTIFICATE_REPORT("certificateReport", "certificateReport", "证书报告"),
-    ADVICE_EXPORT("adviceData", "adviceData", "客户反馈"),
-    HANDOUT_EXPORT("handoutData", "handoutData", "任务分发列表"),
-    OUTSOURCER_EXPORT("outsourcerData", "outsourcerData", "分包方"),
-    SITE_EXECUTIVE_EXPORT("siteExecutiveData", "siteExecutiveData", "现场测试、校准或检定"),
-    CERTIFICATE_PRINT_EXPORT("certificatePrintData", "certificatePrintData", "证书打印"),
-    DOWNLOAD_TEMPLATE("downloadTemplate", "downloadTemplate", "页面配置"),
-    OUTSOURCER_CERTIFICATE_EXPORT("outsourceCertificateData", "outsourceCertificateData", "分包证书"),
-    SETTLEMENT_INFO_EXPORT("settlementInfoData", "settlementInfoData", "业务结算"),
-    EQUIPMENT_REMIND("equipmentRemind", "equipmentRemind", "设备到期提醒"),
-    AGREEMENT_INFO_EXPORT("agreementInfoData", "agreementInfoData", "合同"),
-    WORK_STATISTICS_EXPORT("workStatisticsData", "workStatisticsData", "实时工作统计"),
-    DEPT_OUTPUT_EXPORT("deptOutputData", "deptOutputData", "部门产值分析"),
-    WORKLOAD_EXPORT("workloadData", "workloadData", "业务工作量分析"),
-    DEPT_COMPREHENSIVE_EXPORT("deptComprehensiveData", "deptComprehensiveData", "部门综合分析"),
-    ENVIRONMENTAL_RECORD("environmentalRecordData", "environmentalRecordData", "现场环境记录");
+    /**
+     * 计量检定业务
+     */
+    OUTSOURCER_EXPORT("outsourcerData", "分包方名录", "分包方名录"),
+    IDENTIFY_EXPORT("identifyData", "计量标识", "计量标识"),
+    ORDER_EXPORT("orderData", "任务单", "任务单"),
+    DISPATCH_DATA("dispatchData", "设备收发", "设备收发"),
+    HANDOUT_EXPORT("handoutData", "任务分发", "任务分发"),
+    SITE_EXECUTIVE_EXPORT("siteExecutiveData", "现场测试、校准或检定", "现场测试、校准或检定"),
+    CERTIFICATE_REPORT("certificateReport", "证书审批", "证书审批"),
+    CERTIFICATE_CHANGE_APPLY("certificateChangeApply", "证书报告补充或更换申请单", "证书报告补充或更换申请单"),
+    CERTIFICATE_PRINT("certificatePrintData", "证书打印审批", "证书打印审批"),
+    DEPT_EXECUTIVE_TASK("deptExecutiveTaskData", "实验室任务", "实验室任务"),
+    MY_EXECUTIVE_TASK("myExecutiveTaskData", "我的任务", "我的任务"),
+    OUTSOURCE_ASSESS("outsourceAssess", "测试、校准或检定工作分包评审表", "测试、校准或检定工作分包评审表"),
+    OUTSOURCE_PROTOCOL("outsourceProtocol", "测试、校准或检定工作分包协议书", "测试、校准或检定工作分包协议书"),
+
+    /**
+     * 系统管理
+     */
+    SIGN_EXPORT("signData", "签名", "签名"),
+    TEMPLATE_EXPORT("templateData", "文件模板", "文件模板"),
+    FLOW_DEF_EXPORT("flowDefData", "流程定义", "流程定义"),
+    DOWNLOAD_TEMPLATE("downloadTemplate", "流程定义", "页面配置");
 
     ExportEnum(String fileName, String sheetName, String description) {
         this.fileName = fileName;
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateRecordTypeCodeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateRecordTypeCodeEnum.java
index 31d913c..a963522 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateRecordTypeCodeEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateRecordTypeCodeEnum.java
@@ -46,4 +46,14 @@
     String SITE_EXECUTIVE_APPROVAL = "01";
     //《现场测试、校准或检定工作记录表》
     String SITE_EXECUTIVE_LOG = "02";
+
+    //测试、校准或检定工作分包协议书
+    String OUTSOURCE_PROTOCOL = "01";
+    //测试、校准或检定工作分包评审表
+    String OUTSOURCE_ACCESS = "02";
+    //测试、校准或检定工作分包通知书
+    String OUTSOURCE_NOTICE = "03";
+    //测试、校准或检定工作分包方名录
+    String OUTSOURCE_INFO = "04";
+
 }
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
index 24b8635..f78bd53 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
@@ -15,6 +15,10 @@
     String CERTIFICATE_CHANGE_APPLY_BEAN_NAME = "certificateChangeApplyBean";
     //现场测试、校准或检定
     String SITE_EXECUTIVE_BEAN_NAME = "siteExecutiveBean";
+    //测试、校准或检定工作分包评审表
+    String OUTSOURCE_ASSESS_BEAN_NAME = "outsourceAssessBean";
+    //测试、校准或检定工作分包协议书
+    String OUTSOURCE_PROTOCOL_BEAN_NAME = "outsourceProtocolBean";
 
     /*********************************设备与装置************************************/
     //设备台账
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 b21c661..6b86fd1 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
@@ -18,6 +18,8 @@
     OUTSOURCER_APPROVAL(OUTSOURCER_BEAN_NAME, ""),
     CERTIFICATE_CHANGE_APPROVAL(CERTIFICATE_CHANGE_APPLY_BEAN_NAME, ""),
     SITE_EXECUTIVE_APPROVAL(SITE_EXECUTIVE_BEAN_NAME, ""),
+    OUTSOURCE_ASSESS_APPROVAL(OUTSOURCE_ASSESS_BEAN_NAME, ""),
+    OUTSOURCE_PROTOCOL_APPROVAL(OUTSOURCE_PROTOCOL_BEAN_NAME, ""),
 
     ACTION_STATUS_MAP(new HashMap<String, AwareActionStatusEnum>() {
         {
@@ -47,6 +49,10 @@
             put(ApplyFromIdEnum.CERTIFICATE_CHANGE_APPROVAL.getCode(), CERTIFICATE_CHANGE_APPROVAL);
             //现场测试、校准或检定审批
             put(ApplyFromIdEnum.SITE_EXECUTIVE_APPROVAL.getCode(), SITE_EXECUTIVE_APPROVAL);
+            //测试、校准或检定工作分包评审表
+            put(ApplyFromIdEnum.OUTSOURCE_ASSESS_APPROVAL.getCode(), OUTSOURCE_ASSESS_APPROVAL);
+            //测试、校准或检定工作分包协议书
+            put(ApplyFromIdEnum.OUTSOURCE_PROTOCOL_APPROVAL.getCode(), OUTSOURCE_PROTOCOL_APPROVAL);
         }
     });
     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 934405e..c7410bd 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
@@ -9,6 +9,8 @@
     CERTIFICATE_CHANGE_APPROVAL("jljdywzsbchghsqd", MessageSourceModuleEnum.BUSINESS.getCode(), "证书/报告补充或更换申请单"),
     OUTSOURCER_APPROVAL("jljdywcsjzhgfbfml", MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定合格分包方名录"),
     SITE_EXECUTIVE_APPROVAL("jljdywxccsjzsp", MessageSourceModuleEnum.BUSINESS.getCode(), "现场测试、校准或检定审批"),
+    OUTSOURCE_ASSESS_APPROVAL("jljdywcsjzfbpsb", MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包评审表"),
+    OUTSOURCE_PROTOCOL_APPROVAL("jljdywcsjzfbxys", MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包协议书"),
 
 
     /*******************************************设备与装置*********************************************/
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/GeneralApprovalMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/GeneralApprovalMapper.java
index 4fb7344..0c9d6ae 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/GeneralApprovalMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/GeneralApprovalMapper.java
@@ -17,8 +17,4 @@
 
     Page<O> selectBatchForApprovalList(Page<O> page, @Param("request") R request, @Param("businessKeys") List<String> businessKeys);
 
-//    Page<O> selectListPage(Page<O> page, @Param("request") R request);
-
-//    Long selectMaxNo();
-
 }
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceAssessMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceAssessMapper.java
index 7867bb8..ba59009 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceAssessMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceAssessMapper.java
@@ -1,7 +1,12 @@
 package com.casic.missiles.mapper.business;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.business.outsource.OutsourceAssessApprovalListRequest;
+import com.casic.missiles.mapper.GeneralApprovalMapper;
 import com.casic.missiles.model.business.BizBusinessOutsourceAssess;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * <p>
@@ -11,6 +16,10 @@
  * @author wangpeng
  * @since 2023-08-16
  */
-public interface BizBusinessOutsourceAssessMapper extends BaseMapper<BizBusinessOutsourceAssess> {
+public interface BizBusinessOutsourceAssessMapper extends GeneralApprovalMapper<BizBusinessOutsourceAssess, BizBusinessOutsourceAssess, OutsourceAssessApprovalListRequest> {
+
+    Page<BizBusinessOutsourceAssess> selectBatchForApprovalList(Page<BizBusinessOutsourceAssess> page, @Param("request") OutsourceAssessApprovalListRequest request, @Param("businessKeys") List<String> businessKeys);
+
+    Long selectMaxProjectNo();
 
 }
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceProtocolMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceProtocolMapper.java
new file mode 100644
index 0000000..e6aba35
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceProtocolMapper.java
@@ -0,0 +1,24 @@
+package com.casic.missiles.mapper.business;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.business.outsource.OutsourceProtocolApprovalListRequest;
+import com.casic.missiles.mapper.GeneralApprovalMapper;
+import com.casic.missiles.model.business.BizBusinessOutsourceProtocol;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 计量检定业务-分包管理-测试、校准或检定工作分包协议书 Mapper 接口
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-08-24
+ */
+public interface BizBusinessOutsourceProtocolMapper extends GeneralApprovalMapper<BizBusinessOutsourceProtocol, BizBusinessOutsourceProtocol, OutsourceProtocolApprovalListRequest> {
+
+    Page<BizBusinessOutsourceProtocol> selectBatchForApprovalList(Page<BizBusinessOutsourceProtocol> page, @Param("request") OutsourceProtocolApprovalListRequest request, @Param("businessKeys") List<String> businessKeys);
+
+    Long selectMaxProtocolNo();
+}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/EnvLocationInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/EnvLocationInfoMapper.java
new file mode 100644
index 0000000..49eff87
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/EnvLocationInfoMapper.java
@@ -0,0 +1,21 @@
+package com.casic.missiles.mapper.resource;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.resource.environment.LocationListRequest;
+import com.casic.missiles.dto.resource.environment.LocationListResponse;
+import com.casic.missiles.model.resource.EnvLocationInfo;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * <p>
+ * 实验室环境监控系统-设备表 Mapper 接口
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-06-07
+ */
+public interface EnvLocationInfoMapper extends BaseMapper<EnvLocationInfo> {
+
+    Page<LocationListResponse> selectLocationListPage(Page<LocationListResponse> page, @Param("request") LocationListRequest request);
+}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java
index de124db..85ed0f7 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java
@@ -1,7 +1,9 @@
 package com.casic.missiles.mapper.system;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.dto.system.SignDetailResponse;
+import com.casic.missiles.dto.system.SignListRequest;
 import com.casic.missiles.model.system.SystemSign;
 import org.apache.ibatis.annotations.Param;
 
@@ -22,4 +24,8 @@
     SignDetailResponse selectSignDetailById(Long id);
 
     List<SystemSign> selectUsableSignList(@Param("userId") Long userId);
+
+    Page<SystemSign> selectSignListPage(Page<SystemSign> page, @Param("request") SignListRequest request);
+
+    List<SystemSign> selectSignList(@Param("request") SignListRequest request);
 }
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateChangeApplyMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateChangeApplyMapper.xml
index d798447..c496092 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateChangeApplyMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateChangeApplyMapper.xml
@@ -30,31 +30,31 @@
         SELECT *
         FROM biz_business_certificate_change_apply
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.changeApplyNo != null and request.changeApplyNo !=''">
+        <if test="request != null and request.changeApplyNo != null and request.changeApplyNo !=''">
             and change_apply_no like concat('%',#{request.changeApplyNo},'%')
         </if>
-        <if test="request.changeReportNo != null and request.changeReportNo !=''">
+        <if test="request != null and request.changeReportNo != null and request.changeReportNo !=''">
             and change_report_no like concat('%',#{request.changeReportNo},'%')
         </if>
-        <if test="request.changeReportName != null and request.changeReportName !=''">
+        <if test="request != null and request.changeReportName != null and request.changeReportName !=''">
             and change_report_name like concat('%',#{request.changeReportName},'%')
         </if>
-        <if test="request.changeType != null and request.changeType !=''">
+        <if test="request != null and request.changeType != null and request.changeType !=''">
             and change_type = #{request.changeType}
         </if>
-        <if test="request.createUserName != null and request.createUserName !=''">
+        <if test="request != null and request.createUserName != null and request.createUserName !=''">
             and create_user_name like concat('%',#{request.createUserName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificatePrintMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificatePrintMapper.xml
index b66cd99..49c0ac8 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificatePrintMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificatePrintMapper.xml
@@ -31,34 +31,34 @@
         LEFT JOIN biz_business_order_sample_relation bosr ON (bosr.order_id = bcr.order_id AND bosr.sample_id = bcr.sample_id)
         LEFT JOIN biz_business_order_info boi ON boi.id = bosr.order_id
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and bcp.approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.printStatus != null and request.printStatus !=''">
+        <if test="request != null and request.printStatus != null and request.printStatus !=''">
             and print_status = #{request.printStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and bcp.create_user_id = #{request.createUserId}
         </if>
-        <if test="request.certificateReportNo != null and request.certificateReportNo !=''">
+        <if test="request != null and request.certificateReportNo != null and request.certificateReportNo !=''">
             and bcr.certificate_report_no like concat('%',#{request.certificateReportNo},'%')
         </if>
-        <if test="request.certificateReportName != null and request.certificateReportName !=''">
+        <if test="request != null and request.certificateReportName != null and request.certificateReportName !=''">
             and bcr.certificate_report_name like concat('%',#{request.certificateReportName},'%')
         </if>
-        <if test="request.customerName != null and request.customerName !=''">
+        <if test="request != null and request.customerName != null and request.customerName !=''">
             and boi.customer_name like concat('%',#{request.customerName},'%')
         </if>
-        <if test="request.sampleNo != null and request.sampleNo !=''">
+        <if test="request != null and request.sampleNo != null and request.sampleNo !=''">
             and bosr.sample_no like concat('%',#{request.sampleNo},'%')
         </if>
-        <if test="request.sampleName != null and request.sampleName !=''">
+        <if test="request != null and request.sampleName != null and request.sampleName !=''">
             and bosr.sample_name like concat('%',#{request.sampleName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and bcp.create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and bcp.create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml
index b366034..767695d 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml
@@ -46,33 +46,37 @@
         SELECT bcr.*, bosr.sample_no, bosr.sample_name, bosr.sample_model, rsi.staff_name
         FROM biz_business_certificate_report bcr
         LEFT JOIN biz_business_order_sample_relation bosr ON (bosr.order_id = bcr.order_id AND bosr.sample_id = bcr.sample_id)
+        LEFT JOIN biz_business_order_info boi ON boi.id = bcr.order_id
         LEFT JOIN biz_resource_staff_info rsi ON rsi.id = bcr.measure_person_id
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and bcr.approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and bcr.create_user_id = #{request.createUserId}
         </if>
-        <if test="request.certificateReportNo != null and request.certificateReportNo !=''">
+        <if test="request != null and request.customerId != null and request.customerId !=''">
+            and boi.customer_id = #{request.customerId}
+        </if>
+        <if test="request != null and request.certificateReportNo != null and request.certificateReportNo !=''">
             and bcr.certificate_report_no like concat('%',#{request.certificateReportNo},'%')
         </if>
-        <if test="request.certificateReportName != null and request.certificateReportName !=''">
+        <if test="request != null and request.certificateReportName != null and request.certificateReportName !=''">
             and bcr.certificate_report_name like concat('%',#{request.certificateReportName},'%')
         </if>
-        <if test="request.sampleNo != null and request.sampleNo !=''">
+        <if test="request != null and request.sampleNo != null and request.sampleNo !=''">
             and bosr.sample_no like concat('%',#{request.sampleNo},'%')
         </if>
-        <if test="request.measureCategory != null and request.measureCategory !=''">
+        <if test="request != null and request.measureCategory != null and request.measureCategory !=''">
             and bcr.measure_category = #{request.measureCategory}
         </if>
-        <if test="request.measurePerson != null and request.measurePerson !=''">
+        <if test="request != null and request.measurePerson != null and request.measurePerson !=''">
             and rsi.staff_name like concat('%',#{request.measurePerson},'%')
         </if>
-        <if test="request.calibrationTimeStart != null and request.calibrationTimeStart !=''">
+        <if test="request != null and request.calibrationTimeStart != null and request.calibrationTimeStart !=''">
             and bcr.calibration_time &gt;= #{request.calibrationTimeStart}
         </if>
-        <if test="request.calibrationTimeEnd != null and request.calibrationTimeEnd !=''">
+        <if test="request != null and request.calibrationTimeEnd != null and request.calibrationTimeEnd !=''">
             and bcr.calibration_time &lt;= #{request.calibrationTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceAssessMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceAssessMapper.xml
index d0fcf8b..c22c101 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceAssessMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceAssessMapper.xml
@@ -7,6 +7,8 @@
         <id column="id" property="id" />
         <result column="project_no" property="projectNo" />
         <result column="project_name" property="projectName" />
+        <result column="lab_code" property="labCode" />
+        <result column="group_code" property="groupCode" />
         <result column="applicant_id" property="applicantId" />
         <result column="applicant_name" property="applicantName" />
         <result column="applicant_time" property="applicantTime" />
@@ -31,7 +33,45 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, project_no, project_name, applicant_id, applicant_name, applicant_time, minio_file_name, remark, create_user_id, create_user_name, outsourcer_id, pre_start_time, pre_end_time, outsource_reason, pre_cost, approval_status, process_id, approve_situation, traceability, test_method, technique_ability, create_time, update_time
+        id, project_no, project_name, lab_code, group_code, applicant_id, applicant_name, applicant_time, minio_file_name, remark, create_user_id, create_user_name, outsourcer_id, pre_start_time, pre_end_time, outsource_reason, pre_cost, approval_status, process_id, approve_situation, traceability, test_method, technique_ability, create_time, update_time
     </sql>
 
+    <select id="selectMaxProjectNo" resultType="java.lang.Long">
+        SELECT IFNULL(max(RIGHT(project_no, 3)), 0) from biz_business_outsource_assess
+    </select>
+
+    <select id="selectBatchForApprovalList" resultMap="BaseResultMap">
+        SELECT bboa.*, bboi.outsourcer_name, bboi.director
+        FROM biz_business_outsource_assess bboa
+        LEFT JOIN biz_business_outsourcer_info bboi ON bboa.outsourcer_id = bboi.id
+        WHERE 1=1
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
+            and bboa.approval_status = #{request.approvalStatus}
+        </if>
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
+            and bboa.create_user_id = #{request.createUserId}
+        </if>
+        <if test="request != null and request.projectNo != null and request.projectNo !=''">
+            and bboa.project_no like concat('%',#{request.projectNo},'%')
+        </if>
+        <if test="request != null and request.outsourcerName != null and request.outsourcerName !=''">
+            and bboi.outsourcer_name like concat('%',#{request.outsourcerName},'%')
+        </if>
+        <if test="request != null and request.applicantName != null and request.applicantName !=''">
+            and bboa.applicant_name like concat('%',#{request.applicantName},'%')
+        </if>
+        <if test="request != null and request.applicantTimeStart != null and request.applicantTimeStart !=''">
+            and bboa.applicant_time &gt;= #{request.applicantTimeStart}
+        </if>
+        <if test="request != null and request.applicantTimeEnd != null and request.applicantTimeEnd !=''">
+            and bboa.applicant_time &lt;= #{request.applicantTimeEnd}
+        </if>
+        <if test="businessKeys != null">
+            and bboa.id in
+            <foreach collection="businessKeys" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
+        ORDER BY bboa.create_time DESC
+    </select>
 </mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceProtocolMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceProtocolMapper.xml
new file mode 100644
index 0000000..b7b2149
--- /dev/null
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceProtocolMapper.xml
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.mapper.business.BizBusinessOutsourceProtocolMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.business.BizBusinessOutsourceProtocol">
+        <id column="id" property="id" />
+        <result column="protocol_no" property="protocolNo" />
+        <result column="project_name" property="projectName" />
+        <result column="lab_code" property="labCode" />
+        <result column="group_code" property="groupCode" />
+        <result column="outsourcer_id" property="outsourcerId" />
+        <result column="remark" property="remark" />
+        <result column="outsource_no" property="outsourceNo" />
+        <result column="outsource_name" property="outsourceName" />
+        <result column="contacts" property="contacts" />
+        <result column="mobile" property="mobile" />
+        <result column="address" property="address" />
+        <result column="require_date" property="requireDate" />
+        <result column="outsource_cost" property="outsourceCost" />
+        <result column="director" property="director" />
+        <result column="item" property="item" />
+        <result column="requires" property="requires" />
+        <result column="create_user_id" property="createUserId" />
+        <result column="create_user_name" property="createUserName" />
+        <result column="approval_status" property="approvalStatus" />
+        <result column="process_id" property="processId" />
+        <result column="create_time" property="createTime" />
+        <result column="update_time" property="updateTime" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, protocol_no, project_name, lab_code, group_code, outsourcer_id, remark, outsource_no, outsource_name, contacts, mobile, address, require_date, outsource_cost, director, item, requires, create_user_id, create_user_name, approval_status, process_id, create_time, update_time
+    </sql>
+
+    <select id="selectMaxProtocolNo" resultType="java.lang.Long">
+        SELECT IFNULL(max(RIGHT(protocol_no, 3)), 0) from biz_business_outsource_protocol
+    </select>
+
+    <select id="selectBatchForApprovalList" resultMap="BaseResultMap">
+        SELECT *
+        FROM biz_business_outsource_protocol
+        WHERE 1=1
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
+            and approval_status = #{request.approvalStatus}
+        </if>
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
+            and create_user_id = #{request.createUserId}
+        </if>
+        <if test="request != null and request.protocolNo != null and request.protocolNo !=''">
+            and protocol_no like concat('%',#{request.protocolNo},'%')
+        </if>
+        <if test="request != null and request.outsourcerName != null and request.outsourcerName !=''">
+            and outsourcer_name like concat('%',#{request.outsourcerName},'%')
+        </if>
+        <if test="request != null and request.applicantName != null and request.applicantName !=''">
+            and create_user_name like concat('%',#{request.applicantName},'%')
+        </if>
+        <if test="request != null and request.applicantTimeStart != null and request.applicantTimeStart !=''">
+            and create_time &gt;= #{request.applicantTimeStart}
+        </if>
+        <if test="request != null and request.applicantTimeEnd != null and request.applicantTimeEnd !=''">
+            and create_time &lt;= #{request.applicantTimeEnd}
+        </if>
+        <if test="businessKeys != null">
+            and id in
+            <foreach collection="businessKeys" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
+        ORDER BY create_time DESC
+    </select>
+</mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourcerInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourcerInfoMapper.xml
index 510a80b..3049b54 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourcerInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourcerInfoMapper.xml
@@ -7,6 +7,8 @@
         <id column="id" property="id" />
         <result column="outsourcer_no" property="outsourcerNo" />
         <result column="outsourcer_name" property="outsourcerName" />
+        <result column="lab_code" property="labCode" />
+        <result column="group_code" property="groupCode" />
         <result column="outsourcer_brief_name" property="outsourcerBriefName" />
         <result column="outsourcer_size" property="outsourcerSize" />
         <result column="business_size" property="businessSize" />
@@ -55,32 +57,32 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, outsourcer_no, outsourcer_name, outsourcer_brief_name, outsourcer_size, business_size, grade, evaluation, tax_number, bank_account, bank_name, bank_account_number, postal_code, director, phone, fax, mobile, email, website, address_country, address_province, address_city, address_area, full_address, address_country_name, address_province_name, address_city_name, address_area_name, invoice_country, invoice_province, invoice_city, invoice_area, invoice_full_address, invoice_country_name, invoice_province_name, invoice_city_name, invoice_area_name, business_scope, business_content, minio_file_name, approval_status, process_id, remark, create_user_id, create_user_name, create_time, update_time
+        id, outsourcer_no, outsourcer_name, lab_code, group_code, outsourcer_brief_name, outsourcer_size, business_size, grade, evaluation, tax_number, bank_account, bank_name, bank_account_number, postal_code, director, phone, fax, mobile, email, website, address_country, address_province, address_city, address_area, full_address, address_country_name, address_province_name, address_city_name, address_area_name, invoice_country, invoice_province, invoice_city, invoice_area, invoice_full_address, invoice_country_name, invoice_province_name, invoice_city_name, invoice_area_name, business_scope, business_content, minio_file_name, approval_status, process_id, remark, create_user_id, create_user_name, create_time, update_time
     </sql>
 
     <select id="selectBatchForApprovalList" resultMap="BaseResultMap">
         SELECT *
         FROM biz_business_outsourcer_info
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.outsourcerNo != null and request.outsourcerNo !=''">
+        <if test="request != null and request.outsourcerNo != null and request.outsourcerNo !=''">
             and outsourcer_no like concat('%',#{request.outsourcerNo},'%')
         </if>
-        <if test="request.outsourcerName != null and request.outsourcerName !=''">
+        <if test="request != null and request.outsourcerName != null and request.outsourcerName !=''">
             and outsourcer_name like concat('%',#{request.outsourcerName},'%')
         </if>
-        <if test="request.director != null and request.director !=''">
+        <if test="request != null and request.director != null and request.director !=''">
             and director like concat('%',#{request.director},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
@@ -93,6 +95,6 @@
     </select>
 
     <select id="selectMaxNo" resultType="java.lang.Long">
-        SELECT IFNULL(max(RIGHT(outsourcer_no, 12)), 0) from biz_business_outsourcer_info
+        SELECT IFNULL(max(RIGHT(outsourcer_no, 3)), 0) from biz_business_outsourcer_info
     </select>
 </mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessSiteExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessSiteExecutiveInfoMapper.xml
index 135c5d0..3c5ae79 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessSiteExecutiveInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessSiteExecutiveInfoMapper.xml
@@ -38,25 +38,25 @@
         FROM biz_business_site_executive_info bsei
         LEFT JOIN biz_resource_customer_info rci ON bsei.customer_id = rci.id
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and bsei.approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and bsei.create_user_id = #{request.createUserId}
         </if>
-        <if test="request.siteExecutiveNo != null and request.siteExecutiveNo !=''">
+        <if test="request != null and request.siteExecutiveNo != null and request.siteExecutiveNo !=''">
             and bsei.site_executive_no like concat('%',#{request.siteExecutiveNo},'%')
         </if>
-        <if test="request.customerName != null and request.customerName !=''">
+        <if test="request != null and request.customerName != null and request.customerName !=''">
             and rci.outsourcer_name like concat('%',#{request.customerName},'%')
         </if>
-        <if test="request.applyName != null and request.applyName !=''">
+        <if test="request != null and request.applyName != null and request.applyName !=''">
             and bsei.apply_name like concat('%',#{request.applyName},'%')
         </if>
-        <if test="request.applyTimeStart != null and request.applyTimeStart !=''">
+        <if test="request != null and request.applyTimeStart != null and request.applyTimeStart !=''">
             and bsei.apply_time &gt;= #{request.applyTimeStart}
         </if>
-        <if test="request.applyTimeEnd != null and request.applyTimeEnd !=''">
+        <if test="request != null and request.applyTimeEnd != null and request.applyTimeEnd !=''">
             and bsei.apply_time &lt;= #{request.applyTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml
index 84d9e2a..6bd38a9 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml
@@ -105,6 +105,12 @@
         <if test="request.isUrgent != null and request.isUrgent !=''">
             AND bo.is_urgent = #{request.isUrgent}
         </if>
+        <if test="request.ids != null">
+            and blei.id in
+            <foreach collection="request.ids" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
         ORDER BY blei.update_time DESC
     </select>
 
@@ -137,6 +143,12 @@
         <if test="request.isUrgent != null and request.isUrgent !=''">
             AND bo.is_urgent = #{request.isUrgent}
         </if>
+        <if test="request.ids != null">
+            and blei.id in
+            <foreach collection="request.ids" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
         ORDER BY blei.update_time DESC
     </select>
 
diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardInfoMapper.xml
index 1a5551b..2ed8d17 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardInfoMapper.xml
@@ -45,12 +45,6 @@
         FROM biz_equipment_standard_info besi
         LEFT JOIN biz_equipment_standard_technology_relation bestr ON besi.standard_no = bestr.standard_no
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
-            and besi.approval_status = #{request.approvalStatus}
-        </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
-            and besi.create_user_id = #{request.createUserId}
-        </if>
         <if test="request.standardName != null and request.standardName !=''">
             and besi.standard_name like concat('%',#{request.standardName},'%')
         </if>
diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardTechnologyRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardTechnologyRelationMapper.xml
index fc7e16c..cd03c8c 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardTechnologyRelationMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardTechnologyRelationMapper.xml
@@ -6,6 +6,7 @@
     <resultMap id="BaseResultMap" type="com.casic.missiles.model.equipment.BizEquipmentStandardTechnologyRelation">
         <id column="id" property="id" />
         <result column="technology_file_id" property="technologyFileId" />
+        <result column="technology_file_no" property="technologyFileNo" />
         <result column="technology_file_name" property="technologyFileName" />
         <result column="standard_id" property="standardId" />
         <result column="standard_no" property="standardNo" />
@@ -14,7 +15,7 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, technology_file_id, technology_file_name, standard_id, remark
+        id, technology_file_id, technology_file_no, technology_file_name, standard_id, remark
     </sql>
 
 </mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceAuthorizeOrderMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceAuthorizeOrderMapper.xml
index ac5176c..554fe65 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceAuthorizeOrderMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceAuthorizeOrderMapper.xml
@@ -32,22 +32,22 @@
         SELECT *
         FROM biz_resource_authorize_order
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.orderNo != null and request.orderNo !=''">
+        <if test="request != null and request.orderNo != null and request.orderNo !=''">
             and order_no like concat('%',#{request.orderNo},'%')
         </if>
-        <if test="request.createUserName != null and request.createUserName !=''">
+        <if test="request != null and request.createUserName != null and request.createUserName !=''">
             and create_user_name like concat('%',#{request.createUserName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerExamineFormMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerExamineFormMapper.xml
index ab242f6..af7f98f 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerExamineFormMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerExamineFormMapper.xml
@@ -41,28 +41,28 @@
         SELECT *
         FROM biz_resource_customer_examine_form
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.formNo != null and request.formNo !=''">
+        <if test="request != null and request.formNo != null and request.formNo !=''">
             and form_no like concat('%',#{request.formNo},'%')
         </if>
-        <if test="request.labCode != null and request.labCode !=''">
+        <if test="request != null and request.labCode != null and request.labCode !=''">
             and lab_code like concat('%',#{request.labCode},'%')
         </if>
-        <if test="request.groupCode != null and request.groupCode !=''">
+        <if test="request != null and request.groupCode != null and request.groupCode !=''">
             and group_code like concat('%',#{request.groupCode},'%')
         </if>
-        <if test="request.createUserName != null and request.createUserName !=''">
+        <if test="request != null and request.createUserName != null and request.createUserName !=''">
             and create_user_name like concat('%',#{request.createUserName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerInfoMapper.xml
index fa8ffbc..06a2798 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerInfoMapper.xml
@@ -33,25 +33,25 @@
         SELECT *
         FROM biz_resource_customer_info
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.customerNo != null and request.customerNo !=''">
+        <if test="request != null and request.customerNo != null and request.customerNo !=''">
             and customer_no like concat('%',#{request.customerNo},'%')
         </if>
-        <if test="request.customerName != null and request.customerName !=''">
+        <if test="request != null and request.customerName != null and request.customerName !=''">
             and customer_name like concat('%',#{request.customerName},'%')
         </if>
-        <if test="request.contacts != null and request.contacts !=''">
+        <if test="request != null and request.contacts != null and request.contacts !=''">
             and contacts like concat('%',#{request.contacts},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerSuggestFormMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerSuggestFormMapper.xml
index 28f5bb2..1806662 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerSuggestFormMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerSuggestFormMapper.xml
@@ -33,28 +33,28 @@
         SELECT *
         FROM biz_resource_customer_suggest_form
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.formNo != null and request.formNo !=''">
+        <if test="request != null and request.formNo != null and request.formNo !=''">
             and form_no like concat('%',#{request.formNo},'%')
         </if>
-        <if test="request.customerName != null and request.customerName !=''">
+        <if test="request != null and request.customerName != null and request.customerName !=''">
             and customer_name like concat('%',#{request.customerName},'%')
         </if>
-        <if test="request.customerDeptName != null and request.customerDeptName !=''">
+        <if test="request != null and request.customerDeptName != null and request.customerDeptName !=''">
             and customer_dept_name like concat('%',#{request.customerDeptName},'%')
         </if>
-        <if test="request.createUserName != null and request.createUserName !=''">
+        <if test="request != null and request.createUserName != null and request.createUserName !=''">
             and create_user_name like concat('%',#{request.createUserName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSealUseNoteMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSealUseNoteMapper.xml
index ab37bc1..b02bb33 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSealUseNoteMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSealUseNoteMapper.xml
@@ -29,32 +29,32 @@
     </sql>
 
     <select id="selectBatchForApprovalList" resultMap="BaseResultMap">
-        SELECT *
+        SELECT brsun.*, brsi.seal_name, brsi.seal_type, brsi.approver_name
         FROM biz_resource_seal_use_note brsun
         JOIN biz_resource_seal_info brsi ON brsun.seal_id = brsi.id
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and brsun.approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and brsun.create_user_id = #{request.createUserId}
         </if>
-        <if test="request.sealName != null and request.sealName !=''">
+        <if test="request != null and request.sealName != null and request.sealName !=''">
             and brsi.seal_name like concat('%',#{request.sealName},'%')
         </if>
-        <if test="request.sealType != null and request.sealType !=''">
+        <if test="request != null and request.sealType != null and request.sealType !=''">
             and brsi.seal_type = #{request.sealType}
         </if>
-        <if test="request.applyDeptName != null and request.applyDeptName !=''">
+        <if test="request != null and request.applyDeptName != null and request.applyDeptName !=''">
             and brsun.apply_dept_name like concat('%',#{request.applyDeptName},'%')
         </if>
-        <if test="request.applyUserName != null and request.applyUserName !=''">
+        <if test="request != null and request.applyUserName != null and request.applyUserName !=''">
             and brsun.apply_user_name like concat('%',#{request.applyUserName},'%')
         </if>
-        <if test="request.applyTimeStart != null and request.applyTimeStart !=''">
+        <if test="request != null and request.applyTimeStart != null and request.applyTimeStart !=''">
             and brsun.apply_time &gt;= #{request.applyTimeStart}
         </if>
-        <if test="request.applyTimeEnd != null and request.applyTimeEnd !=''">
+        <if test="request != null and request.applyTimeEnd != null and request.applyTimeEnd !=''">
             and brsun.apply_time &lt;= #{request.applyTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml
index 119bf7d..4f8392a 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml
@@ -31,6 +31,12 @@
         <if test="request.deptName != null and request.deptName !=''">
             and brsi.dept_name like concat('%',#{request.deptName},'%')
         </if>
+        <if test="request.ids != null">
+            and brsv.id in
+            <foreach collection="request.ids" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
         ORDER BY brsv.grant_date DESC
     </select>
 
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSupplierInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSupplierInfoMapper.xml
index fe8d399..e8ce7ef 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSupplierInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSupplierInfoMapper.xml
@@ -48,28 +48,28 @@
         SELECT *
         FROM biz_resource_supplier_info
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.supplierNo != null and request.supplierNo !=''">
+        <if test="request != null and request.supplierNo != null and request.supplierNo !=''">
             and supplier_no like concat('%',#{request.supplierNo},'%')
         </if>
-        <if test="request.supplierName != null and request.supplierName !=''">
+        <if test="request != null and request.supplierName != null and request.supplierName !=''">
             and supplier_name like concat('%',#{request.supplierName},'%')
         </if>
-        <if test="request.director != null and request.director !=''">
+        <if test="request != null and request.director != null and request.director !=''">
             and director like concat('%',#{request.director},'%')
         </if>
-        <if test="request.supplierType != null and request.supplierType !=''">
+        <if test="request != null and request.supplierType != null and request.supplierType !=''">
             and supplier_type = #{request.supplierType}
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/EnvLocationInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/EnvLocationInfoMapper.xml
new file mode 100644
index 0000000..68bcf10
--- /dev/null
+++ b/casic-metering-dao/src/main/resources/mapper/resource/EnvLocationInfoMapper.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.mapper.resource.EnvLocationInfoMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.resource.EnvLocationInfo">
+        <id column="id" property="id" />
+        <result column="location_no" property="locationNo" />
+        <result column="location_name" property="locationName" />
+        <result column="location_position" property="locationPosition" />
+        <result column="create_user_id" property="createUserId" />
+        <result column="create_user" property="createUser" />
+        <result column="create_time" property="createTime" />
+        <result column="update_time" property="updateTime" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, location_no, location_name, location_position, create_user_id, create_user, create_time, update_time
+    </sql>
+
+    <select id="selectLocationListPage" resultType="com.casic.missiles.dto.resource.environment.LocationListResponse">
+        SELECT *
+        FROM env_location_info
+        WHERE 1=1
+        <if test="request.locationNo != null and request.locationNo !=''">
+            AND location_no LIKE concat('%',#{request.locationNo},'%')
+        </if>
+        <if test="request.locationName != null and request.locationName !=''">
+            AND location_name LIKE concat('%',#{request.locationName},'%')
+        </if>
+        ORDER BY create_time DESC
+    </select>
+
+</mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml
index b28c18f..8854047 100644
--- a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml
@@ -11,7 +11,6 @@
         <result column="sign_desc" property="signDesc" />
         <result column="sign_director" property="signDirector" />
         <result column="sign_user_id" property="signUserId" />
-        <result column="sign_type" property="signType" />
         <result column="minio_file_name" property="minioFileName" />
         <result column="create_time" property="createTime" />
         <result column="update_time" property="updateTime" />
@@ -28,7 +27,6 @@
         <result column="sign_name" property="signName" />
         <result column="sign_desc" property="signDesc" />
         <result column="sign_director" property="signDirector" />
-        <result column="sign_type" property="signType" />
         <result column="sign_user_id" property="signUserId" />
         <result column="minio_file_name" property="minioFileName" />
         <result column="create_time" property="createTime" />
@@ -62,4 +60,58 @@
         JOIN system_sign_user_relation ssur ON ss.id = ssur.sign_id
         WHERE ssur.user_id = #{userId}
     </select>
+
+    <select id="selectSignListPage" resultMap="BaseResultMap">
+        SELECT ss.*, sd.SIMPLE_NAME AS deptName
+        FROM system_sign ss
+        LEFT JOIN sys_user su ON su.id = ss.sign_user_id
+        LEFT JOIN sys_dept sd ON sd.id = su.dept_id
+        WHERE 1=1
+        <if test="request.signNo != null and request.signNo !=''">
+            AND ss.sign_no LIKE concat('%',#{request.signNo},'%')
+        </if>
+        <if test="request.signName != null and request.signName !=''">
+            AND ss.sign_name LIKE concat('%',#{request.signName},'%')
+        </if>
+        <if test="request.signDirector != null and request.signDirector !=''">
+            AND ss.sign_director LIKE concat('%',#{request.signDirector},'%')
+        </if>
+        <if test="request.signUserId != null and request.signUserId !=''">
+            AND ss.sign_user_id = #{request.signUserId}
+        </if>
+        <if test="request.createStartTime != null and request.createStartTime !=''">
+            AND DATE_FORMAT(ss.create_time,'%Y-%m-%d') &gt;= DATE_FORMAT(#{request.createStartTime},'%Y-%m-%d')
+        </if>
+        <if test="request.createEndTime != null and request.createEndTime !=''">
+            AND DATE_FORMAT(ss.create_time,'%Y-%m-%d')  &lt;= DATE_FORMAT(#{request.createEndTime},'%Y-%m-%d')
+        </if>
+        ORDER BY ss.create_time DESC
+    </select>
+
+    <select id="selectSignList" resultMap="BaseResultMap">
+        SELECT ss.*, sd.SIMPLE_NAME AS deptName
+        FROM system_sign ss
+        LEFT JOIN sys_user su ON su.id = ss.sign_user_id
+        LEFT JOIN sys_dept sd ON sd.id = su.dept_id
+        WHERE 1=1
+        <if test="request.signNo != null and request.signNo !=''">
+            AND ss.sign_no LIKE concat('%',#{request.signNo},'%')
+        </if>
+        <if test="request.signName != null and request.signName !=''">
+            AND ss.sign_name LIKE concat('%',#{request.signName},'%')
+        </if>
+        <if test="request.signDirector != null and request.signDirector !=''">
+            AND ss.sign_director LIKE concat('%',#{request.signDirector},'%')
+        </if>
+        <if test="request.signUserId != null and request.signUserId !=''">
+            AND ss.sign_user_id = #{request.signUserId}
+        </if>
+        <if test="request.createStartTime != null and request.createStartTime !=''">
+            AND DATE_FORMAT(ss.create_time,'%Y-%m-%d') &gt;= DATE_FORMAT(#{request.createStartTime},'%Y-%m-%d')
+        </if>
+        <if test="request.createEndTime != null and request.createEndTime !=''">
+            AND DATE_FORMAT(ss.create_time,'%Y-%m-%d')  &lt;= DATE_FORMAT(#{request.createEndTime},'%Y-%m-%d')
+        </if>
+        ORDER BY ss.create_time DESC
+    </select>
 </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 515050a..60f530b 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
@@ -47,8 +47,8 @@
     String STORAGE_LOCATION = "bizStorageLocation";
     //计量专业
     String MEASURE_MAJOR = "bizMeasureMajor";
-    //管理状态
-    String MANAGER_STATE = "bizManagerState";
+    //标准装置管理状态
+    String STANDARD_MANAGER_STATE = "bizStandardManagerState";
 
     /**
      * 资源管理 字典code
@@ -95,8 +95,6 @@
     String MEASURE_STATUS = "measureStatus";
     //检定方式
     String MEASURE_TYPE = "measureType";
-    //标识打印标志类型
-    String IDENTIFY_PRINT_TYPE = "bizBusinessIdentify";
     //变更类型
     String REPORT_CHANGE_TYPE = "bizCertChangeType";
     //规模类型
@@ -111,19 +109,24 @@
     String MEASURE_CATEGORY = "measureCategory";
     //检定结果
     String MEASURE_RESULT = "measureResult";
+    //分包原因
+    String OUTSOURCE_REASON = "outsourceReason";
+
+    /**
+     * 系统管理
+     */
+    String TEMPLATE_TYPE = "templateType";
+
 
     /**
      * 标准装置 字典code
      */
     //类别
     String STANDARD_CATEGORY = "standardCategory";
-    //管理状态
-    String STANDARD_MANAGER_STATE = "standardManagerState";
     //标准等级
     String STANDARD_LEVEL = "standardLevel";
     //传递范围
     String STANDARD_TRANSMIT_RANGE = "transmitRange";
-
     //资本来源
     String CAPITAL_SOURCE = "capitalSource";
     //标准装置-申请类型
@@ -148,8 +151,6 @@
     String CERTIFICATE_CLASS = "certificationClass";
     //证书管理-检校专业
     String CALIBRATION_MAJOR = "calibrationMajor";
-    //分包原因
-    String OUTSOURCE_REASON = "outsourceReason";
 
     /**
      * 工作台
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/BaseApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/BaseApprovalListRequest.java
index 73c12c1..80d7424 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/BaseApprovalListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/BaseApprovalListRequest.java
@@ -6,6 +6,7 @@
 
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotEmpty;
+import java.util.List;
 
 /**
  * @Description:
@@ -19,14 +20,14 @@
      * 表单id
      */
     @NotBlank(message = "表单id不能为空")
-    @ApiModelProperty(value = "表单id（流程定义对应的表单id，等价于业务id）", dataType = "String")
+    @ApiModelProperty(value = "表单id（流程定义对应的表单id，等价于业务id），导出接口不用传", dataType = "String")
     private String formId;
 
     /**
      * 审批状态类型，对应ApprovalStatusEnum
      */
     @NotEmpty(message = "审批状态类型不能为空")
-    @ApiModelProperty(value = "审批状态类型code", dataType = "String")
+    @ApiModelProperty(value = "审批状态类型code，导出接口不用传", dataType = "String")
     private String approvalStatus;
 
     @ApiModelProperty(hidden = true)
@@ -34,4 +35,7 @@
 
     @ApiModelProperty(hidden = true)
     private Long createUserId;
+
+    @ApiModelProperty(value = "导出ids", dataType = "List")
+    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificatePrintApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificatePrintApprovalListRequest.java
index b93d1c9..3cc2f4e 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificatePrintApprovalListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificatePrintApprovalListRequest.java
@@ -5,8 +5,6 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import java.util.List;
-
 /**
  * @Description:
  * @Author: wangpeng
@@ -38,7 +36,4 @@
 
     @ApiModelProperty(value = "创建结束时间", dataType = "String")
     private String createTimeEnd;
-
-    @ApiModelProperty(value = "导出ids", dataType = "List")
-    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportApprovalListRequest.java
index 4f7a038..c115847 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportApprovalListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportApprovalListRequest.java
@@ -5,8 +5,6 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import java.util.List;
-
 /**
  * @Description:
  * @Author: wangpeng
@@ -15,6 +13,8 @@
 @ApiModel
 @Data
 public class CertificateReportApprovalListRequest extends BaseApprovalListRequest {
+    @ApiModelProperty(value = "委托方id", dataType = "String")
+    private Long customerId;
 
     @ApiModelProperty(value = "证书报告编号", dataType = "String")
     private String certificateReportNo;
@@ -37,6 +37,4 @@
     @ApiModelProperty(value = "检校结束时间", dataType = "String")
     private String calibrationTimeEnd;
 
-    @ApiModelProperty(value = "导出ids", dataType = "List")
-    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/identify/IdentifyListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/identify/IdentifyListRequest.java
index 1b87ae6..f019203 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/identify/IdentifyListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/identify/IdentifyListRequest.java
@@ -4,6 +4,8 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * @Description:
  * @Author: wangpeng
@@ -26,4 +28,7 @@
 
     @ApiModelProperty(value = "打印结束时间", dataType = "String")
     private String createTimeEnd;
+
+    @ApiModelProperty(value = "导出ids", dataType = "List")
+    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListRequest.java
index 1264883..62415fb 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListRequest.java
@@ -7,6 +7,7 @@
 import lombok.Data;
 
 import javax.validation.constraints.NotBlank;
+import java.util.List;
 
 @Data
 @ApiModel
@@ -37,4 +38,6 @@
     @ApiModelProperty(value = "是否加急（1是0否null全部）", dataType = "Integer")
     private String isUrgent;
 
+    @ApiModelProperty(value = "导出ids", dataType = "List")
+    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListRequest.java
index 5201d7b..499760a 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListRequest.java
@@ -17,6 +17,9 @@
     @ApiModelProperty(value = "任务单编号", dataType = "String")
     private String orderNo;
 
+    @ApiModelProperty(value = "委托方id", dataType = "Long")
+    private Long customerId;
+
     @ApiModelProperty(value = "委托方名称", dataType = "String")
     private String customerName;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OrderSampleDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OrderSampleDTO.java
new file mode 100644
index 0000000..796edc0
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OrderSampleDTO.java
@@ -0,0 +1,19 @@
+package com.casic.missiles.dto.business.outsource;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/8/24 11:38
+ */
+@ApiModel
+@Data
+public class OrderSampleDTO {
+    @ApiModelProperty(value = "任务单id", dataType = "Long")
+    private Long orderId;
+    @ApiModelProperty(value = "受检设备id", dataType = "Long")
+    private Long sampleId;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceAssessApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceAssessApprovalListRequest.java
new file mode 100644
index 0000000..9a930c3
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceAssessApprovalListRequest.java
@@ -0,0 +1,30 @@
+package com.casic.missiles.dto.business.outsource;
+
+import com.casic.missiles.dto.BaseApprovalListRequest;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/8/24 11:01
+ */
+@ApiModel
+@Data
+public class OutsourceAssessApprovalListRequest extends BaseApprovalListRequest {
+    @ApiModelProperty(value = "评审表编号", dataType = "String")
+    private String projectNo;
+
+    @ApiModelProperty(value = "分包机构名称", dataType = "String")
+    private String outsourcerName;
+
+    @ApiModelProperty(value = "申请人", dataType = "String")
+    private String applicantName;
+
+    @ApiModelProperty(value = "申请时间开始", dataType = "String")
+    private String applicantTimeStart;
+
+    @ApiModelProperty(value = "申请时间结束", dataType = "String")
+    private String applicantTimeEnd;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceAssessSaveResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceAssessSaveResponse.java
new file mode 100644
index 0000000..8bf9aad
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceAssessSaveResponse.java
@@ -0,0 +1,20 @@
+package com.casic.missiles.dto.business.outsource;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/8/14 16:17
+ */
+@ApiModel
+@Data
+public class OutsourceAssessSaveResponse {
+    @ApiModelProperty(value = "主键id", dataType = "Long")
+    private Long id;
+
+    @ApiModelProperty(value = "编号", dataType = "String")
+    private String projectNo;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProtocolApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProtocolApprovalListRequest.java
new file mode 100644
index 0000000..0f32331
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProtocolApprovalListRequest.java
@@ -0,0 +1,30 @@
+package com.casic.missiles.dto.business.outsource;
+
+import com.casic.missiles.dto.BaseApprovalListRequest;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/8/24 15:01
+ */
+@ApiModel
+@Data
+public class OutsourceProtocolApprovalListRequest extends BaseApprovalListRequest {
+    @ApiModelProperty(value = "协议书编号", dataType = "String")
+    private String protocolNo;
+
+    @ApiModelProperty(value = "分包方名称", dataType = "String")
+    private String outsourcerName;
+
+    @ApiModelProperty(value = "申请人", dataType = "String")
+    private String applicantName;
+
+    @ApiModelProperty(value = "申请时间开始", dataType = "String")
+    private String applicantTimeStart;
+
+    @ApiModelProperty(value = "申请时间结束", dataType = "String")
+    private String applicantTimeEnd;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProtocolSaveResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProtocolSaveResponse.java
new file mode 100644
index 0000000..e324967
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProtocolSaveResponse.java
@@ -0,0 +1,20 @@
+package com.casic.missiles.dto.business.outsource;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/8/14 16:17
+ */
+@ApiModel
+@Data
+public class OutsourceProtocolSaveResponse {
+    @ApiModelProperty(value = "主键id", dataType = "Long")
+    private Long id;
+
+    @ApiModelProperty(value = "编号", dataType = "String")
+    private String protocolNo;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveApprovalListRequest.java
index f29f4e4..7047c28 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveApprovalListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveApprovalListRequest.java
@@ -5,8 +5,6 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import java.util.List;
-
 /**
  * @Description: 现场检测审批列表请求实体
  * @Author: wangpeng
@@ -30,7 +28,4 @@
     @ApiModelProperty(value = "申请时间结束", dataType = "String")
     private String applyTimeEnd;
 
-    @ApiModelProperty(value = "导出ids", dataType = "List")
-    private List<Long> ids;
-
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveDetailResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveDetailResponse.java
index 1f28752..394c934 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveDetailResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveDetailResponse.java
@@ -12,6 +12,18 @@
     @ApiModelProperty(value = "id，更新/删除使用参数", dataType = "Long")
     private Long id;
 
+    @ApiModelProperty(value = "实验室代码(字典code)", dataType = "String")
+    private String labCode;
+
+    @ApiModelProperty(value = "实验室代码(字典value)", dataType = "String")
+    private String labCodeName;
+
+    @ApiModelProperty(value = "组别代码(字典code)", dataType = "String")
+    private String groupCode;
+
+    @ApiModelProperty(value = "组别代码(字典value)", dataType = "String")
+    private String groupCodeName;
+
     @ApiModelProperty(value = "审批编号", dataType = "String")
     private String siteExecutiveNo;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/environment/LocationListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/environment/LocationListRequest.java
new file mode 100644
index 0000000..13d03c3
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/environment/LocationListRequest.java
@@ -0,0 +1,20 @@
+package com.casic.missiles.dto.resource.environment;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/6/8 13:56
+ */
+@ApiModel
+@Data
+public class LocationListRequest {
+    @ApiModelProperty(value = "地点编号", dataType = "String")
+    private String locationNo;
+
+    @ApiModelProperty(value = "地点名称", dataType = "String")
+    private String locationName;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/environment/LocationListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/environment/LocationListResponse.java
new file mode 100644
index 0000000..4c531af
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/environment/LocationListResponse.java
@@ -0,0 +1,78 @@
+package com.casic.missiles.dto.resource.environment;
+
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
+import com.baomidou.mybatisplus.annotation.TableField;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description: 地点列表响应实体
+ * @Author: wangpeng
+ * @Date: 2023/6/8 13:53
+ */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
+@ApiModel
+@Data
+public class LocationListResponse {
+    @ApiModelProperty(value = "主键id", dataType = "Long")
+    private Long id;
+
+    /**
+     * 地点编号
+     */
+    @ExcelProperty("地点编号")
+    @ApiModelProperty(value = "地点编号", dataType = "String")
+    private String locationNo;
+
+    /**
+     * 地点名称
+     */
+    @ExcelProperty("地点名称")
+    @ApiModelProperty(value = "地点名称", dataType = "String")
+    private String locationName;
+
+    /**
+     * 地点位置
+     */
+    @ExcelProperty("地点位置")
+    @ApiModelProperty(value = "地点位置", dataType = "String")
+    private String locationPosition;
+
+    /**
+     * 创建人id
+     */
+    @ApiModelProperty(value = "创建人id", dataType = "Long")
+    private Long createUserId;
+
+    /**
+     * 创建人
+     */
+    @ExcelProperty("创建人")
+    @ApiModelProperty(value = "创建人", dataType = "String")
+    @TableField("create_user")
+    private String createUser;
+
+    /**
+     * 创建时间
+     */
+    @ExcelProperty("创建时间")
+    @ApiModelProperty(value = "创建时间", dataType = "String")
+    private String createTime;
+
+    /**
+     * 更新时间
+     */
+    @ApiModelProperty(value = "更新时间", dataType = "String")
+    private String updateTime;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertRequest.java
index 9a7f6c6..c827915 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertRequest.java
@@ -4,6 +4,8 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * @Description:
  * @Author: wangpeng
@@ -16,4 +18,7 @@
     private String name;
     @ApiModelProperty(value = "部门名", dataType = "String")
     private String deptName;
+
+    @ApiModelProperty(value = "导出ids", dataType = "List")
+    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertResponse.java
index f78b159..8f2f79e 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertResponse.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.dto.resource.staff;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.casic.missiles.annotation.DictCodeField;
 import com.casic.missiles.constants.MeterDictCode;
 import io.swagger.annotations.ApiModel;
@@ -13,12 +20,18 @@
  * @Author: wangpeng
  * @Date: 2023/7/27 15:13
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @ApiModel
 @Data
 public class StaffCertResponse {
     /**
      * 人员编号
      */
+    @ExcelProperty(value = "人员编号",order = 0)
     @NotEmpty(message = "人员编号不能为空")
     @ApiModelProperty(value = "人员编号", dataType = "String")
     private String staffNo;
@@ -26,6 +39,7 @@
     /**
      * 姓名
      */
+    @ExcelProperty(value = "姓名",order = 1)
     @ApiModelProperty(value = "姓名", dataType = "String")
     private String staffName;
 
@@ -54,6 +68,7 @@
     /**
      * 部门名字
      */
+    @ExcelProperty(value = "工作部门",order = 2)
     @ApiModelProperty(value = "部门名字", dataType = "String")
     private String deptName;
 
@@ -66,6 +81,7 @@
     /**
      * 计量专业
      */
+    @ExcelProperty(value = "计量专业",order = 3)
     @ApiModelProperty(value = "计量专业", dataType = "String")
     private String major;
 
@@ -110,6 +126,7 @@
     /**
      * 证书号
      */
+    @ExcelProperty(value = "证号",order = 4)
     @ApiModelProperty(value = "证书号", dataType = "String")
     private String certNo;
 
@@ -122,12 +139,14 @@
     /**
      * 有效日期
      */
+    @ExcelProperty(value = "证书有效期",order = 6)
     @ApiModelProperty(value = "有效日期", dataType = "String")
     private String effectiveDate;
 
     /**
      * 发放日期
      */
+    @ExcelProperty(value = "发证日期",order = 5)
     @ApiModelProperty(value = "发放日期", dataType = "String")
     private String grantDate;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffListRequest.java
index 7c4afb3..0a1194a 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffListRequest.java
@@ -4,6 +4,8 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * @Description:
  * @Author: wangpeng
@@ -18,4 +20,7 @@
     private String deptName;
     @ApiModelProperty(value = "部门id", dataType = "Long")
     private Long deptId;
+
+    @ApiModelProperty(value = "导出ids", dataType = "List")
+    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/TrainListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/TrainListRequest.java
index f68597b..6321f8b 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/TrainListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/TrainListRequest.java
@@ -14,6 +14,8 @@
 public class TrainListRequest {
     @ApiModelProperty(value = "训练登记表编号", dataType = "String")
     private String trainNo;
+    @ApiModelProperty(value = "值班领导", dataType = "String")
+    private String dutyLeader;
     @ApiModelProperty(value = "创建开始时间", dataType = "String")
     private String createTimeStart;
     @ApiModelProperty(value = "创建结束时间", dataType = "String")
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/SignAddRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/SignAddRequest.java
index 117be34..d71055c 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/SignAddRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/SignAddRequest.java
@@ -43,13 +43,6 @@
     private Long signUserId;
 
     /**
-     * 签章或签名-字典code
-     */
-    @NotBlank(message = "类型不能为空")
-    @ApiModelProperty(value = "签名/签章-字典code", dataType = "String", required = true)
-    private String signType;
-
-    /**
      * minio存储文件名
      */
     @ApiModelProperty(value = "上传文件返回名称", dataType = "String")
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateAddRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateAddRequest.java
index aff1265..6316648 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateAddRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateAddRequest.java
@@ -17,30 +17,28 @@
 @Data
 public class TemplateAddRequest extends BaseSystemRequest {
     /**
-     * 原始记录模板/证书报告模板名称
+     * 模板名称
      */
     @ApiModelProperty(value = "名称", dataType = "String", required = true)
     @NotBlank(message = "名称不能为空")
     private String templateName;
 
     /**
-     * 原始记录模板/证书报告模板描述
+     * 模板描述
      */
     @ApiModelProperty(value = "描述", dataType = "String")
     private String templateDesc;
 
     /**
-     * 原始记录模板/证书报告模板创建人
+     * 创建人
      */
     @ApiModelProperty(value = "创建人", dataType = "String", required = true)
     @NotBlank(message = "创建人不能为空")
     private String templateCreator;
 
-    /**
-     * 原始记录模板/证书报告模板-字典code
-     */
-    @NotBlank(message = "类型不能为空")
-    @ApiModelProperty(value = "原始记录模板/证书报告模板-字典code", dataType = "String", required = true)
+
+    @NotBlank(message = "模板类型不能为空")
+    @ApiModelProperty(value = "模板类型(字典code)", dataType = "String", required = true)
     private String templateType;
 
     /**
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateListRequest.java
index eec5a1e..6d17bbe 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateListRequest.java
@@ -1,11 +1,12 @@
 package com.casic.missiles.dto.system;
 
+import com.casic.missiles.annotation.DictCodeField;
+import com.casic.missiles.constants.MeterDictCode;
 import com.casic.missiles.dto.BaseSystemRequest;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import javax.validation.constraints.NotBlank;
 import java.util.List;
 
 /**
@@ -19,8 +20,8 @@
     /**
      * 类型
      */
-//    @ApiModelProperty(value = "类型-字典code", dataType = "String", required = true)
-    @NotBlank(message = "类型不能为空")
+    @DictCodeField(message = "模板类型不合法", cacheName = MeterDictCode.TEMPLATE_TYPE)
+    @ApiModelProperty(value = "模板类型(字典code)", dataType = "String")
     private String templateType;
 
     /**
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificateChangeApply.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificateChangeApply.java
index 9216308..36923fd 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificateChangeApply.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificateChangeApply.java
@@ -1,11 +1,19 @@
 package com.casic.missiles.model.business;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 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 com.casic.missiles.dto.BaseRequest;
+import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -20,6 +28,12 @@
  * @author wangpeng
  * @since 2023-08-15
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
+@ApiModel
 @Data
 @TableName("biz_business_certificate_change_apply")
 public class BizBusinessCertificateChangeApply extends BaseRequest implements Serializable {
@@ -33,6 +47,7 @@
     /**
      * 申请单编号
      */
+    @ExcelProperty(value = "申请单编号", order = 1)
     @ApiModelProperty(value = "申请单编号", dataType = "String")
     @TableField("change_apply_no")
     private String changeApplyNo;
@@ -40,6 +55,7 @@
     /**
      * 申请单名字
      */
+    @ExcelProperty(value = "申请单名称", order = 2)
     @ApiModelProperty(value = "申请单名字", dataType = "String")
     @TableField("change_apply_name")
     private String changeApplyName;
@@ -54,6 +70,7 @@
     /**
      * 更换证书编号
      */
+    @ExcelProperty(value = "更换证书编号", order = 3)
     @ApiModelProperty(value = "更换证书编号", dataType = "String")
     @TableField("change_report_no")
     private String changeReportNo;
@@ -61,7 +78,8 @@
     /**
      * 更换证书名字
      */
-    @ApiModelProperty(value = "更换证书名字", dataType = "String")
+    @ExcelProperty(value = "更换证书/报告名称", order = 4)
+    @ApiModelProperty(value = "更换证书/报告名称", dataType = "String")
     @TableField("change_report_name")
     private String changeReportName;
 
@@ -73,6 +91,7 @@
     @TableField("change_type")
     private String changeType;
 
+    @ExcelProperty(value = "变更类型", order = 5)
     @ApiModelProperty(value = "变更类型(字典value)", dataType = "String")
     @TableField(exist = false)
     private String changeTypeName;
@@ -142,13 +161,15 @@
     /**
      * 创建用户名字
      */
-    @ApiModelProperty(value = "创建用户名字", dataType = "String")
+    @ExcelProperty(value = "创建人", order = 6)
+    @ApiModelProperty(value = "创建人名字", dataType = "String")
     @TableField("create_user_name")
     private String createUserName;
 
     /**
      * 创建时间
      */
+    @ExcelProperty(value = "创建时间", order = 7)
     @ApiModelProperty(value = "创建时间", dataType = "String")
     @TableField("create_time")
     private String createTime;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificateReport.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificateReport.java
index f01db9e..db06018 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificateReport.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificateReport.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.model.business;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -22,6 +29,11 @@
  * @author wangpeng
  * @since 2023-08-14
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @ApiModel
 @Data
 @TableName("biz_business_certificate_report")
@@ -36,6 +48,7 @@
     /**
      * 证书报告编号
      */
+    @ExcelProperty(value = "证书报告编号", order = 1)
     @ApiModelProperty(value = "证书报告编号", dataType = "String")
     @TableField("certificate_report_no")
     private String certificateReportNo;
@@ -43,6 +56,7 @@
     /**
      * 证书报告名称
      */
+    @ExcelProperty(value = "证书报告名称", order = 2)
     @ApiModelProperty(value = "证书报告名称", dataType = "String")
     @TableField("certificate_report_name")
     private String certificateReportName;
@@ -62,6 +76,7 @@
     @TableField("measure_category")
     private String measureCategory;
 
+    @ExcelProperty(value = "检校类别", order = 6)
     @ApiModelProperty(value = "检校类别(字典value)", dataType = "String")
     @TableField(exist = false)
     private String measureCategoryName;
@@ -69,6 +84,7 @@
     /**
      * 检校时间
      */
+    @ExcelProperty(value = "检校时间", order = 8)
     @ApiModelProperty(value = "检校时间", dataType = "String")
     @TableField("calibration_time")
     private String calibrationTime;
@@ -267,18 +283,22 @@
     @TableField(exist = false)
     private Integer decisionItem;
 
-    @ApiModelProperty(value = "设备样品编号（列表返回参数）", dataType = "String")
+    @ExcelProperty(value = "被检设备统一编号", order = 3)
+    @ApiModelProperty(value = "被检设备统一编号（列表返回参数）", dataType = "String")
     @TableField(exist = false)
     private String sampleNo;
 
-    @ApiModelProperty(value = "设备样品名称（列表返回参数）", dataType = "String")
+    @ExcelProperty(value = "被检设备名称", order = 4)
+    @ApiModelProperty(value = "被检设备名称（列表返回参数）", dataType = "String")
     @TableField(exist = false)
     private String sampleName;
 
-    @ApiModelProperty(value = "设备样品规格型号（列表返回参数）", dataType = "String")
+    @ExcelProperty(value = "规格型号", order = 5)
+    @ApiModelProperty(value = "规格型号（列表返回参数）", dataType = "String")
     @TableField(exist = false)
     private String sampleModel;
 
+    @ExcelProperty(value = "检定员", order = 7)
     @ApiModelProperty(value = "检定员名字（列表返回参数）", dataType = "String")
     @TableField(exist = false)
     private String staffName;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessIdentifyInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessIdentifyInfo.java
index 46bfba5..f1a9bec 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessIdentifyInfo.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessIdentifyInfo.java
@@ -1,10 +1,15 @@
 package com.casic.missiles.model.business;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 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;
 
@@ -20,6 +25,11 @@
  * @author wangpeng
  * @since 2023-08-15
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @Data
 @TableName("biz_business_identify_info")
 public class BizBusinessIdentifyInfo implements Serializable {
@@ -33,6 +43,7 @@
     /**
      * 记录编号
      */
+    @ExcelProperty(value = "记录编号", order = 1)
     @ApiModelProperty(value = "记录编号", dataType = "String")
     @TableField("record_no")
     private String recordNo;
@@ -41,20 +52,15 @@
      * 标志类型(字典code)
      */
     @NotEmpty(message = "标志类型不能为空")
-    @ApiModelProperty(value = "标志类型(字典code)", dataType = "String")
-    @DictCodeField(message = "标志类型不合法", cacheName = MeterDictCode.IDENTIFY_PRINT_TYPE)
+    @ApiModelProperty(value = "标志类型(直接存计量标识/使用状态/校准状态的字典value)", dataType = "String")
     @TableField("identify_type")
     private String identifyType;
 
-    @ApiModelProperty(value = "标志类型(字典value)", dataType = "String")
-    @TableField(exist = false)
-    private String identifyTypeName;
-
     /**
      * 设备id(可以是受检设备/设备台账)
      */
     @NotNull(message = "设备id不能为空")
-    @ApiModelProperty(value = "设备id(可以是受检设备/设备台账)", dataType = "String")
+    @ApiModelProperty(value = "设备id(可以是受检设备/设备台账)", dataType = "Long")
     @TableField("device_id")
     private Long deviceId;
 
@@ -66,29 +72,32 @@
     @TableField("device_type")
     private String deviceType;
 
+    @ExcelProperty(value = "统一编号", order = 3)
     @NotEmpty(message = "设备编号不能为空")
-    @ApiModelProperty(value = "设备编号", dataType = "String")
+    @ApiModelProperty(value = "统一编号", dataType = "String")
     @TableField("device_no")
     private String deviceNo;
 
     /**
      * 设备名字
      */
-    @NotEmpty(message = "设备名字不能为空")
-    @ApiModelProperty(value = "设备名字", dataType = "String")
+    @ExcelProperty(value = "设备名称", order = 4)
+    @NotEmpty(message = "设备名称不能为空")
+    @ApiModelProperty(value = "设备名称", dataType = "String")
     @TableField("device_name")
     private String deviceName;
 
     /**
      * 检定员id
      */
-    @ApiModelProperty(value = "检定员id", dataType = "String")
+    @ApiModelProperty(value = "检定员id", dataType = "Long")
     @TableField("measure_person_id")
     private Long measurePersonId;
 
     /**
      * 检定员名字
      */
+    @ExcelProperty(value = "检定员", order = 5)
     @ApiModelProperty(value = "检定员名字", dataType = "String")
     @TableField("measure_person")
     private String measurePerson;
@@ -103,7 +112,8 @@
     /**
      * 更新时间
      */
-    @ApiModelProperty(value = "更新时间", dataType = "String")
+    @ExcelProperty(value = "打印时间", order = 6)
+    @ApiModelProperty(value = "打印时间", dataType = "String")
     @TableField("update_time")
     private String updateTime;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceAssess.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceAssess.java
index 659d9ca..6720b90 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceAssess.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceAssess.java
@@ -1,11 +1,26 @@
 package com.casic.missiles.model.business;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 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 com.casic.missiles.dto.BaseRequest;
+import com.casic.missiles.dto.business.outsource.OrderSampleDTO;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import javax.validation.constraints.NotEmpty;
 import java.io.Serializable;
+import java.util.List;
 
 /**
  * <p>
@@ -15,146 +30,231 @@
  * @author wangpeng
  * @since 2023-08-16
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
+@ApiModel
 @Data
 @TableName("biz_business_outsource_assess")
-public class BizBusinessOutsourceAssess implements Serializable {
+public class BizBusinessOutsourceAssess extends BaseRequest implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
+    @ApiModelProperty(value = "id，更新/删除使用参数", dataType = "Long")
     @TableId("id")
     private Long id;
 
     /**
      * 评审表编号
      */
+    @ExcelProperty(value = "评审表编号", order = 1)
+    @ApiModelProperty(value = "评审表编号(后台生成)", dataType = "String")
     @TableField("project_no")
     private String projectNo;
 
     /**
      * 评审表名称
      */
+    @ExcelProperty(value = "评审表名称", order = 2)
+    @ApiModelProperty(value = "评审表名称", dataType = "String")
     @TableField("project_name")
     private String projectName;
 
+    @NotEmpty(message = "实验室代码不能为空")
+    @DictCodeField(message = "实验室代码描述不合法", cacheName = MeterDictCode.LAB_CODE)
+    @ApiModelProperty(value = "实验室代码(字典code)", dataType = "String")
+    @TableField("lab_code")
+    private String labCode;
+
+    @ApiModelProperty(value = "实验室代码(字典value)", dataType = "String")
+    @TableField(exist = false)
+    private String labCodeName;
+
+    /**
+     * 组别代码
+     */
+    @NotEmpty(message = "组别代码不能为空")
+    @DictCodeField(message = "组别代码描述不合法", cacheName = MeterDictCode.GROUP_CODE)
+    @ApiModelProperty(value = "组别代码(字典code)", dataType = "String")
+    @TableField("group_code")
+    private String groupCode;
+
+    @ApiModelProperty(value = "组别代码(字典value)", dataType = "String")
+    @TableField(exist = false)
+    private String groupCodeName;
+
     /**
      * 申请人id
      */
+    @ApiModelProperty(value = "申请人id", dataType = "String")
     @TableField("applicant_id")
     private Long applicantId;
 
     /**
      * 申请人名字
      */
+    @ExcelProperty(value = "申请人", order = 5)
+    @ApiModelProperty(value = "申请人", dataType = "String")
     @TableField("applicant_name")
     private String applicantName;
 
     /**
      * 申请时间
      */
+    @ExcelProperty(value = "申请时间", order = 6)
+    @ApiModelProperty(value = "申请时间", dataType = "String")
     @TableField("applicant_time")
     private String applicantTime;
 
     /**
      * 附件(minio存储文件名)
      */
+    @ApiModelProperty(value = "附件(minio存储文件名)", dataType = "String")
     @TableField("minio_file_name")
     private String minioFileName;
 
     /**
      * 备注
      */
+    @ApiModelProperty(value = "备注", dataType = "String")
     @TableField("remark")
     private String remark;
 
     /**
      * 创建人id
      */
+    @ApiModelProperty(value = "创建人id", dataType = "String")
     @TableField("create_user_id")
     private Long createUserId;
 
     /**
      * 创建人名字
      */
+    @ApiModelProperty(value = "创建人名字", dataType = "String")
     @TableField("create_user_name")
     private String createUserName;
 
     /**
      * 分包方id
      */
+    @ApiModelProperty(value = "评审表编号", dataType = "String")
     @TableField("outsourcer_id")
     private Long outsourcerId;
 
     /**
      * 预计开始时间
      */
+    @ApiModelProperty(value = "预计开始时间", dataType = "String")
     @TableField("pre_start_time")
     private String preStartTime;
 
     /**
      * 预计结束时间
      */
+    @ApiModelProperty(value = "预计结束时间", dataType = "String")
     @TableField("pre_end_time")
     private String preEndTime;
 
     /**
      * 分包原因-字典
      */
+    @ApiModelProperty(value = "分包原因(字典code)", dataType = "String")
+    @DictCodeField(message = "分包原因描述不合法", cacheName = MeterDictCode.OUTSOURCE_REASON)
     @TableField("outsource_reason")
     private String outsourceReason;
 
+    @ApiModelProperty(value = "分包原因(字典value)", dataType = "String")
+    @TableField(exist = false)
+    private String outsourceReasonName;
+
     /**
      * 预计费用
      */
+    @ApiModelProperty(value = "预计费用", dataType = "String")
     @TableField("pre_cost")
     private String preCost;
 
     /**
      * 审批状态
      */
+    @ApiModelProperty(value = "审批状态", dataType = "String")
+    @DictCodeField(message = "审批状态描述不合法", cacheName = MeterDictCode.APPROVAL_STATUS)
     @TableField("approval_status")
     private String approvalStatus;
 
     /**
      * 流程实例id
      */
+    @ApiModelProperty(value = "流程实例id", dataType = "String")
     @TableField("process_id")
     private String processId;
 
     /**
      * 实验室认可情况
      */
+    @ApiModelProperty(value = "实验室认可情况", dataType = "String")
     @TableField("approve_situation")
     private String approveSituation;
 
     /**
      * 溯源性
      */
+    @ApiModelProperty(value = "溯源性", dataType = "String")
     @TableField("traceability")
     private String traceability;
 
     /**
      * 测试方法
      */
+    @ApiModelProperty(value = "测试方法", dataType = "String")
     @TableField("test_method")
     private String testMethod;
 
     /**
      * 技术能力
      */
+    @ApiModelProperty(value = "技术能力", dataType = "String")
     @TableField("technique_ability")
     private String techniqueAbility;
 
     /**
      * 创建时间
      */
+    @ApiModelProperty(hidden = true)
     @TableField("create_time")
     private String createTime;
 
     /**
      * 更新时间
      */
+    @ApiModelProperty(hidden = true)
     @TableField("update_time")
     private String updateTime;
 
+    @ApiModelProperty(value = "审批状态类型-字典value", dataType = "String")
+    @TableField(exist = false)
+    private String approvalStatusName;
 
+    @ApiModelProperty(value = "任务id（同意、驳回等操作使用）", dataType = "String")
+    @TableField(exist = false)
+    private String taskId;
+
+    @ApiModelProperty(value = "可选决策项（1同意驳回拒绝 2同意驳回 3同意拒绝，用于待审批列表同意/驳回/拒绝按钮展示）", dataType = "Integer")
+    @TableField(exist = false)
+    private Integer decisionItem;
+
+    @NotEmpty(message = "受检设备信息不能为空")
+    @ApiModelProperty(value = "受检设备id列表（新建使用参数）", dataType = "List")
+    @TableField(exist = false)
+    private List<OrderSampleDTO> orderSampleList;
+
+    @ExcelProperty(value = "分包机构名称", order = 3)
+    @ApiModelProperty(value = "分包机构名称（列表返回参数）", dataType = "String")
+    private String outsourcerName;
+
+    @ExcelProperty(value = "机构负责人", order = 4)
+    @ApiModelProperty(value = "机构负责人（列表返回参数）", dataType = "String")
+    private String director;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceProtocol.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceProtocol.java
new file mode 100644
index 0000000..38df697
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceProtocol.java
@@ -0,0 +1,225 @@
+package com.casic.missiles.model.business;
+
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
+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 com.casic.missiles.dto.BaseRequest;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotEmpty;
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 计量检定业务-分包管理-测试、校准或检定工作分包协议书
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-08-24
+ */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
+@Data
+@TableName("biz_business_outsource_protocol")
+public class BizBusinessOutsourceProtocol extends BaseRequest implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "id，更新/删除使用参数", dataType = "Long")
+    @TableId("id")
+    private Long id;
+
+    /**
+     * 协议书编号
+     */
+    @ExcelProperty(value = "协议书编号", order = 1)
+    @ApiModelProperty(value = "协议书编号(后台生成)", dataType = "String")
+    @TableField("protocol_no")
+    private String protocolNo;
+
+    /**
+     * 协议书名称
+     */
+    @ExcelProperty(value = "协议书名称", order = 2)
+    @ApiModelProperty(value = "协议书名称", dataType = "String")
+    @TableField("project_name")
+    private String projectName;
+
+    @NotEmpty(message = "实验室代码不能为空")
+    @DictCodeField(message = "实验室代码描述不合法", cacheName = MeterDictCode.LAB_CODE)
+    @ApiModelProperty(value = "实验室代码(字典code)", dataType = "String")
+    @TableField("lab_code")
+    private String labCode;
+
+    @ApiModelProperty(value = "实验室代码(字典value)", dataType = "String")
+    @TableField(exist = false)
+    private String labCodeName;
+
+    @NotEmpty(message = "组别代码不能为空")
+    @DictCodeField(message = "组别代码描述不合法", cacheName = MeterDictCode.GROUP_CODE)
+    @ApiModelProperty(value = "组别代码(字典code)", dataType = "String")
+    @TableField("group_code")
+    private String groupCode;
+
+    @ApiModelProperty(value = "组别代码(字典value)", dataType = "String")
+    @TableField(exist = false)
+    private String groupCodeName;
+
+    /**
+     * 分包方id
+     */
+    @ApiModelProperty(value = "分包方id", dataType = "Long")
+    @TableField("outsourcer_id")
+    private Long outsourcerId;
+
+    /**
+     * 其他
+     */
+    @ApiModelProperty(value = "其他", dataType = "String")
+    @TableField("remark")
+    private String remark;
+
+    /**
+     * 分包方编号
+     */
+    @ApiModelProperty(value = "分包方编号(新建不用传)", dataType = "String")
+    @TableField("outsource_no")
+    private String outsourceNo;
+
+    /**
+     * 分包方名称
+     */
+    @ExcelProperty(value = "分包方名称", order = 3)
+    @ApiModelProperty(value = "分包方名称(新建不用传)", dataType = "String")
+    @TableField("outsource_name")
+    private String outsourceName;
+
+    /**
+     * 联系人
+     */
+    @ExcelProperty(value = "联系人", order = 4)
+    @ApiModelProperty(value = "联系人", dataType = "String")
+    @TableField("contacts")
+    private String contacts;
+
+    /**
+     * 电话
+     */
+    @ApiModelProperty(value = "电话", dataType = "String")
+    @TableField("mobile")
+    private String mobile;
+
+    /**
+     * 地址
+     */
+    @ApiModelProperty(value = "地址", dataType = "String")
+    @TableField("address")
+    private String address;
+
+    /**
+     * 要求完成日期
+     */
+    @ApiModelProperty(value = "要求完成日期", dataType = "String")
+    @TableField("require_date")
+    private String requireDate;
+
+    /**
+     * 分包费用(元)
+     */
+    @ApiModelProperty(value = "分包费用(元)", dataType = "String")
+    @TableField("outsource_cost")
+    private Double outsourceCost;
+
+    /**
+     * 分包方负责人
+     */
+    @ApiModelProperty(value = "分包方负责人", dataType = "String")
+    @TableField("director")
+    private String director;
+
+    /**
+     * 分包项目
+     */
+    @ApiModelProperty(value = "分包项目", dataType = "String")
+    @TableField("item")
+    private String item;
+
+    /**
+     * 分包要求
+     */
+    @ApiModelProperty(value = "分包要求", dataType = "String")
+    @TableField("requires")
+    private String requires;
+
+    /**
+     * 创建人id
+     */
+    @ApiModelProperty(hidden = true)
+    @TableField("create_user_id")
+    private Long createUserId;
+
+    /**
+     * 创建人名字
+     */
+    @ExcelProperty(value = "申请人", order = 5)
+    @ApiModelProperty(value = "申请人", dataType = "String")
+    @TableField("create_user_name")
+    private String createUserName;
+
+    /**
+     * 审批状态
+     */
+    @ApiModelProperty(value = "审批状态", dataType = "String")
+    @DictCodeField(message = "审批状态描述不合法", cacheName = MeterDictCode.APPROVAL_STATUS)
+    @TableField("approval_status")
+    private String approvalStatus;
+
+    /**
+     * 流程实例id
+     */
+    @ApiModelProperty(value = "流程实例id", dataType = "String")
+    @TableField("process_id")
+    private String processId;
+
+    /**
+     * 创建时间
+     */
+    @ExcelProperty(value = "申请时间", order = 6)
+    @ApiModelProperty(value = "申请时间", dataType = "String")
+    @TableField("create_time")
+    private String createTime;
+
+    /**
+     * 更新时间
+     */
+    @ApiModelProperty(hidden = true)
+    @TableField("update_time")
+    private String updateTime;
+
+    @ApiModelProperty(value = "审批状态类型-字典value", dataType = "String")
+    @TableField(exist = false)
+    private String approvalStatusName;
+
+    @ApiModelProperty(value = "任务id（同意、驳回等操作使用）", dataType = "String")
+    @TableField(exist = false)
+    private String taskId;
+
+    @ApiModelProperty(value = "可选决策项（1同意驳回拒绝 2同意驳回 3同意拒绝，用于待审批列表同意/驳回/拒绝按钮展示）", dataType = "Integer")
+    @TableField(exist = false)
+    private Integer decisionItem;
+
+
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourcerInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourcerInfo.java
index ec4e997..f9aa69e 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourcerInfo.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourcerInfo.java
@@ -17,6 +17,7 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import javax.validation.constraints.NotEmpty;
 import java.io.Serializable;
 
 /**
@@ -59,6 +60,29 @@
     @TableField("outsourcer_name")
     private String outsourcerName;
 
+    @NotEmpty(message = "实验室代码不能为空")
+    @DictCodeField(message = "实验室代码描述不合法", cacheName = MeterDictCode.LAB_CODE)
+    @ApiModelProperty(value = "实验室代码(字典code)", dataType = "String")
+    @TableField("lab_code")
+    private String labCode;
+
+    @ApiModelProperty(value = "实验室代码(字典value)", dataType = "String")
+    @TableField(exist = false)
+    private String labCodeName;
+
+    /**
+     * 组别代码
+     */
+    @NotEmpty(message = "组别代码不能为空")
+    @DictCodeField(message = "组别代码描述不合法", cacheName = MeterDictCode.GROUP_CODE)
+    @ApiModelProperty(value = "组别代码(字典code)", dataType = "String")
+    @TableField("group_code")
+    private String groupCode;
+
+    @ApiModelProperty(value = "组别代码(字典value)", dataType = "String")
+    @TableField(exist = false)
+    private String groupCodeName;
+
     /**
      * 单位简称
      */
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardInfo.java
index c48eed7..dffdfdd 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardInfo.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardInfo.java
@@ -5,6 +5,7 @@
 import com.baomidou.mybatisplus.annotation.TableName;
 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;
 
@@ -18,6 +19,7 @@
  * @author wangpeng
  * @since 2023-08-04
  */
+@ApiModel
 @Data
 @TableName("biz_equipment_standard_info")
 public class BizEquipmentStandardInfo implements Serializable {
@@ -119,7 +121,7 @@
      * 管理状态(字典code)
      */
     @ApiModelProperty(value = "管理状态(字典code)", dataType = "String")
-    @DictCodeField(message = "管理状态不合法", cacheName = MeterDictCode.MANAGER_STATE)
+    @DictCodeField(message = "管理状态不合法", cacheName = MeterDictCode.STANDARD_MANAGER_STATE)
     @TableField("manage_status")
     private String manageStatus;
 
@@ -151,7 +153,7 @@
     /**
      * 温度(℃)
      */
-    @ApiModelProperty(value = "使用状态(字典code)", dataType = "String")
+    @ApiModelProperty(value = "温度(℃)", dataType = "String")
     @TableField("temperature")
     private Double temperature;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardInfoApproval.java b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardInfoApproval.java
index dbd86ab..9f58d83 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardInfoApproval.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardInfoApproval.java
@@ -150,7 +150,7 @@
      * 管理状态(字典code)
      */
     @ApiModelProperty(value = "管理状态(字典code)", dataType = "String")
-    @DictCodeField(message = "管理状态不合法", cacheName = MeterDictCode.MANAGER_STATE)
+    @DictCodeField(message = "管理状态不合法", cacheName = MeterDictCode.STANDARD_MANAGER_STATE)
     @TableField("manage_status")
     private String manageStatus;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardTechnologyRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardTechnologyRelation.java
index 0e612bd..751f26b 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardTechnologyRelation.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardTechnologyRelation.java
@@ -3,6 +3,7 @@
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -16,6 +17,7 @@
  * @author wangpeng
  * @since 2023-08-04
  */
+@ApiModel
 @Data
 @TableName("biz_equipment_standard_technology_relation")
 public class BizEquipmentStandardTechnologyRelation implements Serializable {
@@ -33,6 +35,10 @@
     @TableField("technology_file_id")
     private Long technologyFileId;
 
+    @ApiModelProperty(value = "依据的技术文件编号", dataType = "String")
+    @TableField("technology_file_no")
+    private String technologyFileNo;
+
     /**
      * 依据的技术文件名称(技术文件中现行测试校准检定方法表文件名字段)
      */
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerInfo.java
index d6e8bed..65cd6bc 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerInfo.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerInfo.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.model.resource;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -21,6 +28,11 @@
  * @author wangpeng
  * @since 2023-08-08
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @ApiModel
 @Data
 @TableName("biz_resource_customer_info")
@@ -35,6 +47,7 @@
     /**
      * 委托方编号
      */
+    @ExcelProperty(value = "委托方编号", order = 1)
     @ApiModelProperty(value = "委托方编号", dataType = "String")
     @TableField("customer_no")
     private String customerNo;
@@ -42,6 +55,7 @@
     /**
      * 委托方名称
      */
+    @ExcelProperty(value = "委托方名称", order = 2)
     @ApiModelProperty(value = "委托方名称(新建时为下拉选择一个受检单位组织的名字，传deptId字段，后端获取名称)", dataType = "String")
     @TableField("customer_name")
     private String customerName;
@@ -63,6 +77,7 @@
     /**
      * 联系人
      */
+    @ExcelProperty(value = "联系人", order = 3)
     @ApiModelProperty(value = "联系人", dataType = "String")
     @TableField("contacts")
     private String contacts;
@@ -70,6 +85,7 @@
     /**
      * 座机电话
      */
+    @ExcelProperty(value = "座机电话", order = 4)
     @ApiModelProperty(value = "座机电话", dataType = "String")
     @TableField("mobile")
     private String mobile;
@@ -77,6 +93,7 @@
     /**
      * 手机号码
      */
+    @ExcelProperty(value = "手机号码", order = 5)
     @ApiModelProperty(value = "手机号码", dataType = "String")
     @TableField("phone")
     private String phone;
@@ -91,6 +108,7 @@
     /**
      * 地址
      */
+    @ExcelProperty(value = "地址", order = 6)
     @ApiModelProperty(value = "地址", dataType = "String")
     @TableField("address")
     private String address;
@@ -141,6 +159,7 @@
     /**
      * 创建时间
      */
+    @ExcelProperty(value = "创建时间", order = 7)
     @ApiModelProperty(value = "创建时间", dataType = "String")
     @TableField("create_time")
     private String createTime;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerSuggestForm.java b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerSuggestForm.java
index 7201bbd..701bf8b 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerSuggestForm.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerSuggestForm.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.model.resource;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -22,6 +29,11 @@
  * @author wangpeng
  * @since 2023-08-08
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @ApiModel
 @Data
 @TableName("biz_resource_customer_suggest_form")
@@ -44,7 +56,8 @@
     /**
      * 委托方名称
      */
-    @ApiModelProperty(value = "委托方名称", dataType = "String")
+    @ExcelProperty(value = "意见反馈单位", order = 2)
+    @ApiModelProperty(value = "意见反馈单位", dataType = "String")
     @TableField("customer_name")
     private String customerName;
 
@@ -59,7 +72,8 @@
     /**
      * 委托方意见反馈部门名称
      */
-    @ApiModelProperty(value = "委托方意见反馈部门名称", dataType = "String")
+    @ExcelProperty(value = "委托方意见反馈部门", order = 3)
+    @ApiModelProperty(value = "委托方意见反馈部门", dataType = "String")
     @TableField("customer_dept_name")
     private String customerDeptName;
 
@@ -73,6 +87,7 @@
     /**
      * 表单编号
      */
+    @ExcelProperty(value = "表单编号", order = 1)
     @ApiModelProperty(value = "表单编号", dataType = "String")
     @TableField("form_no")
     private String formNo;
@@ -111,6 +126,7 @@
     /**
      * 创建人名字
      */
+    @ExcelProperty(value = "创建人", order = 4)
     @ApiModelProperty(value = "创建人名字", dataType = "String")
     @TableField("create_user_name")
     private String createUserName;
@@ -147,6 +163,7 @@
     /**
      * 创建时间
      */
+    @ExcelProperty(value = "创建时间", order = 5)
     @ApiModelProperty(value = "创建时间", dataType = "String")
     @TableField("create_time")
     private String createTime;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSealInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSealInfo.java
index cbf05d7..9bf389d 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSealInfo.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSealInfo.java
@@ -106,6 +106,10 @@
     @TableField("minio_file_name")
     private String minioFileName;
 
+    @ApiModelProperty(value = "minio存储文件url", dataType = "String")
+    @TableField(exist = false)
+    private String minioFileUrl;
+
     @ApiModelProperty(value = "创建时间", dataType = "String")
     @TableField("create_time")
     private String createTime;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSealUseNote.java b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSealUseNote.java
index 3f2d9e8..3ce16a8 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSealUseNote.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSealUseNote.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.model.resource;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -20,6 +27,11 @@
  * @author wangpeng
  * @since 2023-07-28
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @ApiModel
 @Data
 @TableName("biz_resource_seal_use_note")
@@ -34,6 +46,7 @@
     /**
      * 登记表编号
      */
+    @ExcelProperty(value = "申请单编号", order = 1)
     @ApiModelProperty(value = "登记表编号(自动生成)", dataType = "String")
     @TableField("note_form_no")
     private String noteFormNo;
@@ -55,6 +68,7 @@
     /**
      * 申请部门
      */
+    @ExcelProperty(value = "申请部门", order = 5)
     @ApiModelProperty(value = "申请部门", dataType = "String")
     @TableField("apply_dept_name")
     private String applyDeptName;
@@ -69,6 +83,7 @@
     /**
      * 申请人
      */
+    @ExcelProperty(value = "申请人", order = 6)
     @ApiModelProperty(value = "申请人", dataType = "String")
     @TableField("apply_user_name")
     private String applyUserName;
@@ -76,6 +91,7 @@
     /**
      * 申请时间
      */
+    @ExcelProperty(value = "申请时间", order = 7)
     @ApiModelProperty(value = "申请时间(新增自动获取当前时间)", dataType = "String")
     @TableField("apply_time")
     private String applyTime;
@@ -130,6 +146,26 @@
     @TableField("update_time")
     private String updateTime;
 
+    @ExcelProperty(value = "印章名称", order = 2)
+    @ApiModelProperty(value = "印章名称(列表返回参数)", dataType = "String")
+    @TableField(exist = false)
+    private String sealName;
+
+    @DictCodeField(message = "印章类型描述不合法", cacheName = MeterDictCode.SEAL_TYPE)
+    @ApiModelProperty(hidden = true)
+    @TableField(exist = false)
+    private String sealType;
+
+    @ExcelProperty(value = "印章类型", order = 3)
+    @ApiModelProperty(value = "印章类型(列表返回参数)", dataType = "String")
+    @TableField(exist = false)
+    private String sealTypeName;
+
+    @ExcelProperty(value = "批准人", order = 4)
+    @ApiModelProperty(value = "批准人(列表返回参数)", dataType = "String")
+    @TableField(exist = false)
+    private String approverName;
+
     @ApiModelProperty(value = "审批状态类型-字典value", dataType = "String")
     @TableField(exist = false)
     private String approvalStatusName;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceStaffInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceStaffInfo.java
index 5ef995b..41563a1 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceStaffInfo.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceStaffInfo.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.model.resource;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -20,6 +27,11 @@
  * @author wangpeng
  * @since 2023-07-25
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @ApiModel
 @Data
 @TableName("biz_resource_staff_info")
@@ -38,6 +50,7 @@
     /**
      * 人员编号
      */
+    @ExcelProperty(value = "人员编号",order = 0)
     @NotEmpty(message = "人员编号不能为空")
     @ApiModelProperty(value = "人员编号", dataType = "String")
     @TableField("staff_no")
@@ -46,6 +59,7 @@
     /**
      * 姓名
      */
+    @ExcelProperty(value = "姓名",order = 1)
     @ApiModelProperty(value = "姓名", dataType = "String")
     @TableField("staff_name")
     private String staffName;
@@ -152,13 +166,15 @@
     /**
      * 部门名字
      */
-    @ApiModelProperty(value = "部门名字", dataType = "String")
+    @ExcelProperty(value = "工作部门",order = 4)
+    @ApiModelProperty(value = "工作部门", dataType = "String")
     @TableField("dept_name")
     private String deptName;
 
     /**
      * 岗位
      */
+    @ExcelProperty(value = "岗位",order = 2)
     @ApiModelProperty(value = "岗位", dataType = "String")
     @TableField("station")
     private String station;
@@ -166,6 +182,7 @@
     /**
      * 计量专业
      */
+    @ExcelProperty(value = "计量专业",order = 5)
     @ApiModelProperty(value = "计量专业", dataType = "String")
     @TableField("major")
     private String major;
@@ -173,6 +190,7 @@
     /**
      * 证号
      */
+    @ExcelProperty(value = "证号",order = 3)
     @ApiModelProperty(value = "证号", dataType = "String")
     @TableField("certificate_number")
     private String certificateNumber;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSupplierInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSupplierInfo.java
index eb5ef01..a1e2697 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSupplierInfo.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSupplierInfo.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.model.resource;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -20,6 +27,11 @@
  * @author wangpeng
  * @since 2023-07-27
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @ApiModel
 @Data
 @TableName("biz_resource_supplier_info")
@@ -34,6 +46,7 @@
     /**
      * 供方编号
      */
+    @ExcelProperty(value = "供方编号", order = 1)
     @ApiModelProperty(value = "供方编号(自动生成)", dataType = "String")
     @TableField("supplier_no")
     private String supplierNo;
@@ -41,6 +54,7 @@
     /**
      * 供方名称
      */
+    @ExcelProperty(value = "供方名称", order = 2)
     @ApiModelProperty(value = "供方名称", dataType = "String")
     @TableField("supplier_name")
     private String supplierName;
@@ -60,6 +74,7 @@
     @TableField("supplier_type")
     private String supplierType;
 
+    @ExcelProperty(value = "供方类型", order = 3)
     @ApiModelProperty(value = "供方类型(字典value)", dataType = "String")
     @TableField(exist = false)
     private String supplierTypeName;
@@ -109,7 +124,8 @@
     /**
      * 电话
      */
-    @ApiModelProperty(value = "电话", dataType = "String")
+    @ExcelProperty(value = "联系电话", order = 4)
+    @ApiModelProperty(value = "联系电话", dataType = "String")
     @TableField("phone")
     private String phone;
 
@@ -158,6 +174,7 @@
     /**
      * 公司地址-省
      */
+    @ExcelProperty(value = "地址-省", order = 6)
     @ApiModelProperty(value = "公司地址-省", dataType = "String")
     @TableField("company_province_name")
     private String companyProvinceName;
@@ -172,6 +189,7 @@
     /**
      * 公司地址-市
      */
+    @ExcelProperty(value = "地址-市", order = 7)
     @ApiModelProperty(value = "公司地址-市", dataType = "String")
     @TableField("company_city_name")
     private String companyCityName;
@@ -186,6 +204,7 @@
     /**
      * 公司地址-区
      */
+    @ExcelProperty(value = "地址-区", order = 8)
     @ApiModelProperty(value = "公司地址-区", dataType = "String")
     @TableField("company_area_name")
     private String companyAreaName;
@@ -193,6 +212,7 @@
     /**
      * 公司地址-详细地址
      */
+    @ExcelProperty(value = "地址-详细地址", order = 9)
     @ApiModelProperty(value = "公司地址-详细地址", dataType = "String")
     @TableField("company_address")
     private String companyAddress;
@@ -200,6 +220,7 @@
     /**
      * 服务和供应的内容
      */
+    @ExcelProperty(value = "服务和供应的内容", order = 5)
     @ApiModelProperty(value = "服务和供应的内容", dataType = "String")
     @TableField("supplier_content")
     private String supplierContent;
@@ -250,6 +271,7 @@
     /**
      * 创建时间
      */
+    @ExcelProperty(value = "创建时间", order = 9)
     @ApiModelProperty(value = "创建时间", dataType = "String")
     @TableField("create_time")
     private String createTime;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/EnvLocationInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/EnvLocationInfo.java
new file mode 100644
index 0000000..d8e2d7b
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/EnvLocationInfo.java
@@ -0,0 +1,83 @@
+package com.casic.missiles.model.resource;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotEmpty;
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 实验室环境监控系统-设备表
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-06-07
+ */
+@ApiModel
+@Data
+@TableName("env_location_info")
+public class EnvLocationInfo implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "主键id", dataType = "Long")
+    @TableId("id")
+    private Long id;
+
+    /**
+     * 地点编号
+     */
+    @NotEmpty(message = "地点编号不能为空")
+    @ApiModelProperty(value = "地点编号", dataType = "String")
+    @TableField("location_no")
+    private String locationNo;
+
+    /**
+     * 地点名称
+     */
+    @ApiModelProperty(value = "地点名称", dataType = "String")
+    @TableField("location_name")
+    private String locationName;
+
+    /**
+     * 地点位置
+     */
+    @ApiModelProperty(value = "地点位置", dataType = "String")
+    @TableField("location_position")
+    private String locationPosition;
+
+    /**
+     * 创建人id
+     */
+    @ApiModelProperty(value = "创建人id", dataType = "Long")
+    @TableField("create_user_id")
+    private Long createUserId;
+
+    /**
+     * 创建人
+     */
+    @ApiModelProperty(value = "创建人", dataType = "String")
+    @TableField("create_user")
+    private String createUser;
+
+    /**
+     * 创建时间
+     */
+    @ApiModelProperty(value = "创建时间", dataType = "String")
+    @TableField("create_time")
+    private String createTime;
+
+    /**
+     * 更新时间
+     */
+    @ApiModelProperty(value = "更新时间", dataType = "String")
+    @TableField("update_time")
+    private String updateTime;
+
+
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemFileConfig.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemFileConfig.java
index 19e6845..86e569c 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemFileConfig.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemFileConfig.java
@@ -30,7 +30,7 @@
     @ApiModelProperty(value = "系统类别(1业务系统2受检系统3环境系统)", dataType = "Integer")
     @NotNull(message = "系统类别不能为空")
     @TableField("system_type")
-    private Integer systemType;
+    private Integer systemType = 1;
 
     @ApiModelProperty("下载编号")
     @TableField("download_no")
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemNotice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemNotice.java
index e94297d..06ec37d 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemNotice.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemNotice.java
@@ -34,7 +34,7 @@
     @ApiModelProperty(value = "系统类别(1业务系统2受检系统3环境系统)", dataType = "Integer")
     @NotNull(message = "系统类别不能为空")
     @TableField("system_type")
-    private Integer systemType;
+    private Integer systemType = 1;
 
     /**
      * 通知公告编号
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSign.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSign.java
index 6c0d7c9..954f4f8 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSign.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSign.java
@@ -51,7 +51,7 @@
     @ApiModelProperty(value = "系统类别(1业务系统2受检系统3环境系统)", dataType = "Integer")
     @NotNull(message = "系统类别不能为空")
     @TableField("system_type")
-    private Integer systemType;
+    private Integer systemType = 1;
 
     /**
      * 签名编号
@@ -130,4 +130,8 @@
     @TableField(exist = false)
     private List<Long> userIdList;
 
+    @ApiModelProperty(hidden = true)
+    @TableField(exist = false)
+    private String deptName;
+
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemTemplate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemTemplate.java
index 503a457..1d27ebe 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemTemplate.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemTemplate.java
@@ -47,7 +47,7 @@
     @ApiModelProperty(value = "系统类别(1业务系统2受检系统3环境系统)", dataType = "Integer")
     @NotNull(message = "系统类别不能为空")
     @TableField("system_type")
-    private Integer systemType;
+    private Integer systemType = 1;
 
     /**
      * 模板编号
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java
index 8c21cb0..f61e4a8 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java
@@ -32,4 +32,8 @@
     ReturnDTO approvalDelete(ApprovalDeleteRequest request);
 
     ReturnDTO failUpdate(T request);
+
+    List<O> listExport(R request);
+
+    List<O> listExportByIds(List<Long> ids);
 }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java
index 724166f..9bce15b 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java
@@ -157,6 +157,29 @@
         throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
     }
 
+    @Override
+    public List<O> listExport(R request) {
+        request.setCreateUserId(null);
+        request.setApprovalStatus(ApprovalStatusEnum.PASSED);
+        Page<O> page = PageFactory.defaultPage();
+        page.setCurrent(1);
+        page.setSearchCount(false);
+        page.setSize(Integer.MAX_VALUE);
+        Page<O> resultPage = this.baseMapper.selectBatchForApprovalList(page, request, null);
+        return resultPage.getRecords();
+    }
+
+    @Override
+    public List<O> listExportByIds(List<Long> ids) {
+        Page<O> page = PageFactory.defaultPage();
+        page.setCurrent(1);
+        page.setSearchCount(false);
+        page.setSize(Integer.MAX_VALUE);
+        List<String> businessKeys = ids.stream().map(String::valueOf).collect(Collectors.toList());
+        Page<O> resultPage = this.baseMapper.selectBatchForApprovalList(page, null, businessKeys);
+        return resultPage.getRecords();
+    }
+
     protected ReturnDTO updateApprovalStatus(Long id, String processId, String approvalStatus) {
         UpdateWrapper<T> updateWrapper = new UpdateWrapper<>();
         updateWrapper.eq("id", id);
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificatePrintServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificatePrintServiceImpl.java
index f6e4706..3228497 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificatePrintServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificatePrintServiceImpl.java
@@ -162,6 +162,30 @@
         return ReturnUtil.success(printLogMapper.selectList(wrapper));
     }
 
+    @Override
+    public List<CertificatePrintListResponse> listByIds(List<Long> ids) {
+        Page<CertificatePrintListResponse> page = PageFactory.defaultPage();
+        page.setCurrent(1);
+        page.setSearchCount(false);
+        page.setSize(Integer.MAX_VALUE);
+        List<String> businessKeys = ids.stream().map(String::valueOf).collect(Collectors.toList());
+        Page<CertificatePrintListResponse> resultPage = this.baseMapper.selectBatchForApprovalList(page, null, businessKeys);
+        return resultPage.getRecords();
+    }
+
+    @Override
+    public List<CertificatePrintListResponse> list(CertificatePrintApprovalListRequest request) {
+        request.setCreateUserId(null);
+        request.setApprovalStatus(null);
+        request.setPrintStatus(null);
+        Page<CertificatePrintListResponse> page = PageFactory.defaultPage();
+        page.setCurrent(1);
+        page.setSearchCount(false);
+        page.setSize(Integer.MAX_VALUE);
+        Page<CertificatePrintListResponse> resultPage = certificatePrintMapper.selectBatchForApprovalList(page, request, null);
+        return resultPage.getRecords();
+    }
+
     private void savePrintLog(Long id) {
         BizBusinessCertificatePrintLog printLog = new BizBusinessCertificatePrintLog();
         BizBusinessCertificatePrint certificatePrint = certificatePrintMapper.selectById(id);
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificateReportServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificateReportServiceImpl.java
index 457555f..24146be 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificateReportServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificateReportServiceImpl.java
@@ -158,8 +158,8 @@
         QueryWrapper<BizBusinessCertificateMeasureResultData> mWrapper = new QueryWrapper<>();
         mWrapper.eq("report_id", reportId);
         boolean mRemove = certificateMeasureResultDataService.remove(mWrapper);
-        Assert.isFalse(eRemove || mRemove, () -> {
+        if(!eRemove || !mRemove){
             throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
-        });
+        }
     }
 }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessIdentifyInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessIdentifyInfoServiceImpl.java
index 4c8e190..f7e63ca 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessIdentifyInfoServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessIdentifyInfoServiceImpl.java
@@ -1,8 +1,10 @@
 package com.casic.missiles.service.Impl.business;
 
+import cn.hutool.core.date.DateUtil;
 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.core.page.PageFactory;
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.business.identify.IdentifyListRequest;
@@ -14,11 +16,14 @@
 import com.casic.missiles.service.business.IBizBusinessIdentifyInfoService;
 import com.casic.missiles.utils.DictCodeUtils;
 import com.casic.missiles.utils.NumberGeneratorUtil;
+import com.casic.missiles.utils.QRCodeUtil;
 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.List;
+
 /**
  * <p>
  * 计量检定业务-任务计量管理-标识打印 服务实现类
@@ -35,9 +40,9 @@
     @Override
     public Page<BizBusinessIdentifyInfo> identifyListPage(Page<BizBusinessIdentifyInfo> page, IdentifyListRequest request) throws Exception {
         QueryWrapper<BizBusinessIdentifyInfo> wrapper = new QueryWrapper<>();
-        wrapper.eq("identify_type", request.getIdentifyType());
-        wrapper.like("device_no", request.getDeviceNo());
-        wrapper.like("device_name", request.getDeviceName());
+        wrapper.eq(StringUtils.isNotEmpty(request.getIdentifyType()), "identify_type", request.getIdentifyType());
+        wrapper.like(StringUtils.isNotEmpty(request.getDeviceNo()),"device_no", request.getDeviceNo());
+        wrapper.like(StringUtils.isNotEmpty(request.getDeviceName()), "device_name", request.getDeviceName());
         wrapper.apply(StringUtils.isNotBlank(request.getCreateTimeStart()),
                 "{0} <= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getCreateTimeStart().split(" ")[0]);
         wrapper.apply(StringUtils.isNotBlank(request.getCreateTimeEnd()),
@@ -64,8 +69,11 @@
     }
 
     @Override
-    public ReturnDTO updateIdentify(BizBusinessIdentifyInfo identifyInfo) {
-        if(identifyInfoMapper.updateById(identifyInfo) > 0){
+    public ReturnDTO updateIdentify(Long id) {
+        BizBusinessIdentifyInfo info = new BizBusinessIdentifyInfo();
+        info.setId(id);
+        info.setUpdateTime(DateUtil.now());
+        if(identifyInfoMapper.updateById(info) > 0){
             return ReturnUtil.success();
         }
         throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
@@ -79,4 +87,20 @@
         throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
     }
 
+    @Override
+    public List<BizBusinessIdentifyInfo> list(IdentifyListRequest request) throws Exception {
+        Page<BizBusinessIdentifyInfo> page = PageFactory.defaultPage();
+        page.setCurrent(1);
+        page.setSearchCount(false);
+        page.setSize(Integer.MAX_VALUE);
+        Page<BizBusinessIdentifyInfo> resultPage = this.identifyListPage(page, request);
+        return resultPage.getRecords();
+    }
+
+    @Override
+    public ReturnDTO<String> equipmentQrCode(Long id) {
+        String base64QRCode = QRCodeUtil.getBase64QRCode(String.valueOf(id));
+        return ReturnUtil.success(base64QRCode);
+    }
+
 }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOrderInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOrderInfoServiceImpl.java
index 82952ad..d8d2c6a 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOrderInfoServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOrderInfoServiceImpl.java
@@ -35,6 +35,7 @@
 import javax.servlet.http.HttpServletResponse;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 import java.util.stream.Collectors;
 
 /**
@@ -209,13 +210,16 @@
     private QueryWrapper<OrderListResponse> listParamWrapperBuilder(OrderListRequest request) {
         QueryWrapper<OrderListResponse> wrapper = new QueryWrapper<>();
         wrapper.like(StringUtils.isNotBlank(request.getOrderNo()), "order_no", request.getOrderNo());
+        wrapper.like(Objects.nonNull(request.getCustomerId()), "customer_id", request.getCustomerId());
         wrapper.like(StringUtils.isNotBlank(request.getCustomerName()), "customer_name", request.getCustomerName());
         wrapper.like(StringUtils.isNotBlank(request.getDeliverer()), "deliverer", request.getDeliverer());
         wrapper.like(StringUtils.isNotBlank(request.getCreateUserName()), "create_user_name", request.getCreateUserName());
-        wrapper.apply(StringUtils.isNotBlank(request.getCreateStartTime()),
-                "{0} <= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getCreateStartTime().split(" ")[0]);
-        wrapper.apply(StringUtils.isNotBlank(request.getCreateEndTime()),
-                "{0} >= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getCreateEndTime().split(" ")[0]);
+        if(StringUtils.isNotBlank(request.getCreateStartTime())){
+            wrapper.apply("{0} <= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getCreateStartTime().split(" ")[0]);
+        }
+        if(StringUtils.isNotBlank(request.getCreateEndTime())){
+            wrapper.apply("{0} >= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getCreateEndTime().split(" ")[0]);
+        }
         wrapper.orderByDesc("create_time");
         return wrapper;
     }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceAssessServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceAssessServiceImpl.java
index c6af980..ce40138 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceAssessServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceAssessServiceImpl.java
@@ -1,10 +1,33 @@
 package com.casic.missiles.service.Impl.business;
 
-import com.casic.missiles.model.business.BizBusinessOutsourceAssess;
+import cn.hutool.core.lang.Assert;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.casic.missiles.core.model.auth.AuthUser;
+import com.casic.missiles.core.shiro.ShiroKit;
+import com.casic.missiles.dto.BaseApprovalSubmitRequest;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.ReturnUtil;
+import com.casic.missiles.dto.business.outsource.OutsourceAssessApprovalListRequest;
+import com.casic.missiles.dto.business.outsource.OutsourceAssessSaveResponse;
+import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.NoGenerateFileCodeEnum;
+import com.casic.missiles.enums.NoGenerateRecordTypeCodeEnum;
+import com.casic.missiles.enums.system.ApprovalStatusEnum;
+import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.mapper.business.BizBusinessOutsourceAssessMapper;
+import com.casic.missiles.model.business.BizBusinessOutsourceAssess;
+import com.casic.missiles.model.business.BizBusinessOutsourceAssessSampleRelation;
+import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl;
+import com.casic.missiles.service.business.IBizBusinessOutsourceAssessSampleRelationService;
 import com.casic.missiles.service.business.IBizBusinessOutsourceAssessService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.casic.missiles.utils.NoGeneratorUtil;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Objects;
 
 /**
  * <p>
@@ -15,6 +38,103 @@
  * @since 2023-08-16
  */
 @Service
-public class BizBusinessOutsourceAssessServiceImpl extends ServiceImpl<BizBusinessOutsourceAssessMapper, BizBusinessOutsourceAssess> implements IBizBusinessOutsourceAssessService {
+public class BizBusinessOutsourceAssessServiceImpl extends GeneralApprovalServiceImpl<BizBusinessOutsourceAssessMapper, BizBusinessOutsourceAssess, BizBusinessOutsourceAssess, OutsourceAssessApprovalListRequest, BaseApprovalSubmitRequest> implements IBizBusinessOutsourceAssessService {
+    @Autowired
+    private IBizBusinessOutsourceAssessSampleRelationService outsourceAssessSampleRelationService;
 
+    @Override
+    public ReturnDTO<OutsourceAssessSaveResponse> saveOutsourceAssess(BizBusinessOutsourceAssess request) {
+        //生成编号
+        String labCode = request.getLabCode();
+        String groupCode = request.getGroupCode();
+        Long maxNo = this.baseMapper.selectMaxProjectNo();
+        String projectNo = NoGeneratorUtil.getCode(NoGenerateFileCodeEnum.D, labCode, NoGenerateRecordTypeCodeEnum.OUTSOURCE_ACCESS, groupCode, maxNo);
+        request.setCreateUserId(request.getUserId());
+        request.setCreateUserName(request.getUserName());
+        request.setApprovalStatus(ApprovalStatusEnum.DRAFT); //草稿箱状态
+        request.setProjectNo(projectNo);
+        int row = this.baseMapper.insert(request);
+        Assert.isFalse(row <= 0, () -> {
+            throw new BusinessException(BusinessExceptionEnum.OUTSOURCE_ACCESS_SAVE_FAILED);
+        });
+        //关联表
+        saveRelationData(request);
+        OutsourceAssessSaveResponse saveResponse = new OutsourceAssessSaveResponse();
+        saveResponse.setId(request.getId());
+        saveResponse.setProjectNo(projectNo);
+        return ReturnUtil.success(saveResponse);
+    }
+
+    @Override
+    @Transactional
+    public ReturnDTO draftUpdate(BizBusinessOutsourceAssess request) {
+        if (this.baseMapper.updateById(request) > 0) {
+            //关联表删除、增加
+            removeRelationData(request.getId());
+            saveRelationData(request);
+            return ReturnUtil.success();
+        }
+        throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
+    }
+
+    @Override
+    public ReturnDTO draftDelete(Long id) {
+        if (this.baseMapper.deleteById(id) > 0) {
+            //关联表删除
+            removeRelationData(id);
+            return ReturnUtil.success();
+        }
+        throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
+    }
+
+    @Override
+    public ReturnDTO draftBatchDelete(List<Long> ids) {
+        if (this.baseMapper.deleteBatchIds(ids) >= 0) {
+            ids.forEach(id -> removeRelationData(id));
+            return ReturnUtil.success();
+        }
+        throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
+    }
+
+    @Override
+    @Transactional
+    public ReturnDTO failUpdate(BizBusinessOutsourceAssess request) {
+        AuthUser user = ShiroKit.getUser();
+        Assert.isFalse(Objects.isNull(user), () -> {
+            throw new BusinessException(BusinessExceptionEnum.LOGIN_USER_ACQUIRE_FAILED);
+        });
+        request.setApprovalStatus(ApprovalStatusEnum.IN_APPROVED);
+        if (this.baseMapper.updateById(request) > 0) {
+            //关联表删除、增加
+            removeRelationData(request.getId());
+            saveRelationData(request);
+            baseApprovalService.failUpdate(request.getProcessId());
+            return ReturnUtil.success();
+        }
+        throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
+    }
+
+    private void saveRelationData(BizBusinessOutsourceAssess request) {
+        List<BizBusinessOutsourceAssessSampleRelation> sampleRelations = new ArrayList<>();
+        request.getOrderSampleList().forEach(dto -> {
+            BizBusinessOutsourceAssessSampleRelation relation = new BizBusinessOutsourceAssessSampleRelation();
+            relation.setOrderId(dto.getOrderId());
+            relation.setSampleId(dto.getSampleId());
+            relation.setAccessId(request.getId());
+            sampleRelations.add(relation);
+        });
+        if(outsourceAssessSampleRelationService.saveBatch(sampleRelations)){
+            return;
+        }
+        throw new BusinessException(BusinessExceptionEnum.OUTSOURCE_ACCESS_SAVE_FAILED);
+    }
+
+    private void removeRelationData(Long assessId) {
+        QueryWrapper<BizBusinessOutsourceAssessSampleRelation> wrapper = new QueryWrapper<>();
+        wrapper.eq("access_id", assessId);
+        if(outsourceAssessSampleRelationService.remove(wrapper)){
+            return;
+        }
+        throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
+    }
 }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceProtocolServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceProtocolServiceImpl.java
new file mode 100644
index 0000000..821e728
--- /dev/null
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceProtocolServiceImpl.java
@@ -0,0 +1,60 @@
+package com.casic.missiles.service.Impl.business;
+
+import cn.hutool.core.lang.Assert;
+import com.casic.missiles.dto.BaseApprovalSubmitRequest;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.ReturnUtil;
+import com.casic.missiles.dto.business.outsource.OutsourceProtocolApprovalListRequest;
+import com.casic.missiles.dto.business.outsource.OutsourceProtocolSaveResponse;
+import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.NoGenerateFileCodeEnum;
+import com.casic.missiles.enums.NoGenerateRecordTypeCodeEnum;
+import com.casic.missiles.enums.system.ApprovalStatusEnum;
+import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.mapper.business.BizBusinessOutsourceProtocolMapper;
+import com.casic.missiles.mapper.business.BizBusinessOutsourcerInfoMapper;
+import com.casic.missiles.model.business.BizBusinessOutsourceProtocol;
+import com.casic.missiles.model.business.BizBusinessOutsourcerInfo;
+import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl;
+import com.casic.missiles.service.business.IBizBusinessOutsourceProtocolService;
+import com.casic.missiles.utils.NoGeneratorUtil;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 计量检定业务-分包管理-测试、校准或检定工作分包协议书 服务实现类
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-08-24
+ */
+@Service
+public class BizBusinessOutsourceProtocolServiceImpl extends GeneralApprovalServiceImpl<BizBusinessOutsourceProtocolMapper, BizBusinessOutsourceProtocol, BizBusinessOutsourceProtocol, OutsourceProtocolApprovalListRequest, BaseApprovalSubmitRequest> implements IBizBusinessOutsourceProtocolService {
+    @Autowired
+    private BizBusinessOutsourcerInfoMapper outsourcerInfoMapper;
+
+    @Override
+    public ReturnDTO<OutsourceProtocolSaveResponse> saveOutsourceProtocol(BizBusinessOutsourceProtocol request) {
+        //生成编号
+        String labCode = request.getLabCode();
+        String groupCode = request.getGroupCode();
+        Long maxNo = this.baseMapper.selectMaxProtocolNo();
+        String protocolNo = NoGeneratorUtil.getCode(NoGenerateFileCodeEnum.D, labCode, NoGenerateRecordTypeCodeEnum.OUTSOURCE_PROTOCOL, groupCode, maxNo);
+        request.setCreateUserId(request.getUserId());
+        request.setCreateUserName(request.getUserName());
+        request.setApprovalStatus(ApprovalStatusEnum.DRAFT); //草稿箱状态
+        request.setProtocolNo(protocolNo);
+        BizBusinessOutsourcerInfo outsourcerInfo = outsourcerInfoMapper.selectById(request.getOutsourcerId());
+        request.setOutsourceNo(outsourcerInfo.getOutsourcerNo());
+        request.setOutsourceName(outsourcerInfo.getOutsourcerName());
+        int row = this.baseMapper.insert(request);
+        Assert.isFalse(row <= 0, () -> {
+            throw new BusinessException(BusinessExceptionEnum.OUTSOURCE_PROTOCOL_SAVE_FAILED);
+        });
+        OutsourceProtocolSaveResponse saveResponse = new OutsourceProtocolSaveResponse();
+        saveResponse.setId(request.getId());
+        saveResponse.setProtocolNo(protocolNo);
+        return ReturnUtil.success(saveResponse);
+    }
+}
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourcerInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourcerInfoServiceImpl.java
index 75f639d..8aadad7 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourcerInfoServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourcerInfoServiceImpl.java
@@ -3,12 +3,12 @@
 import cn.hutool.core.lang.Assert;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.dto.*;
 import com.casic.missiles.dto.business.outsource.OutsourcerInfoApprovalListRequest;
 import com.casic.missiles.dto.business.outsource.OutsourcerSaveResponse;
 import com.casic.missiles.enums.BusinessExceptionEnum;
-import com.casic.missiles.enums.PrefixCodeEnum;
+import com.casic.missiles.enums.NoGenerateFileCodeEnum;
+import com.casic.missiles.enums.NoGenerateRecordTypeCodeEnum;
 import com.casic.missiles.enums.system.ApprovalStatusEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.mapper.business.BizBusinessOutsourcerInfoMapper;
@@ -20,7 +20,7 @@
 import com.casic.missiles.service.business.IBizBusinessOutsourcerInfoService;
 import com.casic.missiles.service.business.IBizBusinessOutsourcerUserInfoService;
 import com.casic.missiles.utils.DictCodeUtils;
-import com.casic.missiles.utils.NumberGeneratorUtil;
+import com.casic.missiles.utils.NoGeneratorUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -42,22 +42,12 @@
     private IBizBusinessOutsourcerUserInfoService outsourcerUserInfoService;
 
     @Override
-    public List<BizBusinessOutsourcerInfo> list(OutsourcerInfoApprovalListRequest request) {
-        request.setCreateUserId(null);
-        request.setApprovalStatus(ApprovalStatusEnum.PASSED);
-        Page<BizBusinessOutsourcerInfo> page = PageFactory.defaultPage();
-        page.setCurrent(1);
-        page.setSearchCount(false);
-        page.setSize(Integer.MAX_VALUE);
-        Page<BizBusinessOutsourcerInfo> resultPage = this.baseMapper.selectBatchForApprovalList(page, request, null);
-        return resultPage.getRecords();
-    }
-
-    @Override
     public ReturnDTO<OutsourcerSaveResponse> saveOutsourcer(BizBusinessOutsourcerInfo request) {
         //生成编号
+        String labCode = request.getLabCode();
+        String groupCode = request.getGroupCode();
         Long maxNo = this.baseMapper.selectMaxNo();
-        String outsourcerNo = NumberGeneratorUtil.getContactNo(PrefixCodeEnum.OUTSOURCER_PREFIX, maxNo);
+        String outsourcerNo = NoGeneratorUtil.getCode(NoGenerateFileCodeEnum.D, labCode, NoGenerateRecordTypeCodeEnum.OUTSOURCE_INFO, groupCode, maxNo);
         request.setOutsourcerNo(outsourcerNo);
         request.setCreateUserId(request.getUserId());
         request.setCreateUserName(request.getUserName());
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessSiteExecutiveInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessSiteExecutiveInfoServiceImpl.java
index ebab3e6..6c6a129 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessSiteExecutiveInfoServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessSiteExecutiveInfoServiceImpl.java
@@ -189,9 +189,9 @@
         QueryWrapper<BizBusinessSiteExecutiveStaffRelation> mWrapper = new QueryWrapper<>();
         mWrapper.eq("site_executive_id", siteExecutiveId);
         boolean mRemove = siteExecutiveStaffRelationService.remove(mWrapper);
-        Assert.isFalse(eRemove || mRemove, () -> {
+        if(!eRemove || !mRemove){
             throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
-        });
+        }
     }
 
     private void doPopulateSiteExecutive(SiteExecutiveDetailResponse detailResponse) {
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessLabExecutiveInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessLabExecutiveInfoServiceImpl.java
index 50c5616..0242fcf 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessLabExecutiveInfoServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessLabExecutiveInfoServiceImpl.java
@@ -297,6 +297,29 @@
     }
 
     @Override
+    public List<SampleLabExecutiveListResponse> deptLabExecutiveList(SampleLabExecutiveListRequest request) throws Exception {
+        Page<SampleLabExecutiveListResponse> page = PageFactory.defaultPage();
+        page.setCurrent(1);
+        page.setSearchCount(false);
+        page.setSize(Integer.MAX_VALUE);
+        Page<SampleLabExecutiveListResponse> resultPage = this.deptLabExecutiveListPage(page, request);
+        return resultPage.getRecords();
+    }
+
+    @Override
+    public List<SampleLabExecutiveListResponse> deptLabExecutiveListByIds(String measureStatus, List<Long> ids) throws Exception {
+        Page<SampleLabExecutiveListResponse> page = PageFactory.defaultPage();
+        page.setCurrent(1);
+        page.setSearchCount(false);
+        page.setSize(Integer.MAX_VALUE);
+        SampleLabExecutiveListRequest request = new SampleLabExecutiveListRequest();
+        request.setIds(ids);
+        request.setMeasureStatus(measureStatus);
+        Page<SampleLabExecutiveListResponse> resultPage = this.deptLabExecutiveListPage(page, request);
+        return resultPage.getRecords();
+    }
+
+    @Override
     public Page<SampleLabExecutiveListResponse> myLabExecutiveListPage(Page<SampleLabExecutiveListResponse> page, SampleLabExecutiveListRequest labExecutiveListRequest) throws Exception{
         AuthUser user = ShiroKit.getUser();
         Assert.isFalse(Objects.isNull(user), () -> {
@@ -350,6 +373,29 @@
     }
 
     @Override
+    public List<SampleLabExecutiveListResponse> myLabExecutiveList(SampleLabExecutiveListRequest request) throws Exception {
+        Page<SampleLabExecutiveListResponse> page = PageFactory.defaultPage();
+        page.setCurrent(1);
+        page.setSearchCount(false);
+        page.setSize(Integer.MAX_VALUE);
+        Page<SampleLabExecutiveListResponse> resultPage = this.myLabExecutiveListPage(page, request);
+        return resultPage.getRecords();
+    }
+
+    @Override
+    public List<SampleLabExecutiveListResponse> myLabExecutiveListByIds(String measureStatus, List<Long> ids) throws Exception {
+        Page<SampleLabExecutiveListResponse> page = PageFactory.defaultPage();
+        page.setCurrent(1);
+        page.setSearchCount(false);
+        page.setSize(Integer.MAX_VALUE);
+        SampleLabExecutiveListRequest request = new SampleLabExecutiveListRequest();
+        request.setIds(ids);
+        request.setMeasureStatus(measureStatus);
+        Page<SampleLabExecutiveListResponse> resultPage = this.myLabExecutiveListPage(page, request);
+        return resultPage.getRecords();
+    }
+
+    @Override
     public List<SampleAmountResponse> myExecutiveAmount() {
         //登录用户id获取计量人员id，实验室检测信息中存储的是计量人员id
         AuthUser user = ShiroKit.getUser();
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentInfoServiceImpl.java
index 864b05e..db8cad4 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentInfoServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentInfoServiceImpl.java
@@ -35,7 +35,6 @@
 import com.casic.missiles.utils.ConvertUtils;
 import com.casic.missiles.utils.DictCodeUtils;
 import com.casic.missiles.utils.NumberGeneratorUtil;
-import org.flowable.engine.RuntimeService;
 import org.flowable.engine.runtime.ProcessInstance;
 import org.jetbrains.annotations.NotNull;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -43,7 +42,6 @@
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
 
-import javax.annotation.Resource;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
@@ -81,8 +79,6 @@
     private IBizEquipmentAttachmentService attachmentService;
     @Autowired
     private IBizEquipmentCheckpointService checkpointService;
-    @Resource
-    private RuntimeService runtimeService;
     @Autowired
     private ApprovalOperateService approvalOperateService;
 
@@ -235,18 +231,18 @@
     private void updateRelationInfo(EquipmentAddRequest request, BizEquipmentInfoApproval equipmentInfoApproval) {
         QueryWrapper<BizEquipmentTechnicalTarget> targetWrapper = new QueryWrapper<>();
         targetWrapper.eq("equipment_no", equipmentInfoApproval.getEquipmentNo());
-        boolean removeTargetFlag = technicalTargetService.remove(targetWrapper);
-        boolean saveTargetFlag = technicalTargetService.saveBatch(request.getTechnicalTargetList());
+        technicalTargetService.remove(targetWrapper);
+        technicalTargetService.saveBatch(request.getTechnicalTargetList());
 
         QueryWrapper<BizEquipmentAttachment> attachmentWrapper = new QueryWrapper<>();
         attachmentWrapper.eq("equipment_no", equipmentInfoApproval.getEquipmentNo());
-        boolean removeAttachmentFlag = attachmentService.remove(attachmentWrapper);
-        boolean saveAttachmentFlag = attachmentService.saveBatch(request.getAttachmentList());
+        attachmentService.remove(attachmentWrapper);
+        attachmentService.saveBatch(request.getAttachmentList());
 
         QueryWrapper<BizEquipmentCheckpoint> checkpointWrapper = new QueryWrapper<>();
         checkpointWrapper.eq("equipment_no", equipmentInfoApproval.getEquipmentNo());
-        boolean removeCheckpointFlag = checkpointService.remove(checkpointWrapper);
-        boolean saveCheckpointFlag = checkpointService.saveBatch(request.getCheckpointList());
+        checkpointService.remove(checkpointWrapper);
+        checkpointService.saveBatch(request.getCheckpointList());
     }
 
     @Override
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardInfoServiceImpl.java
index faff1ae..c50a5b3 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardInfoServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardInfoServiceImpl.java
@@ -22,7 +22,9 @@
 import com.casic.missiles.mapper.equipment.BizEquipmentStandardInfoMapper;
 import com.casic.missiles.mapper.equipment.BizEquipmentStandardTechnologyRelationMapper;
 import com.casic.missiles.mapper.resource.BizResourceStaffInfoMapper;
-import com.casic.missiles.model.equipment.*;
+import com.casic.missiles.model.equipment.BizEquipmentStandardInfo;
+import com.casic.missiles.model.equipment.BizEquipmentStandardInfoApproval;
+import com.casic.missiles.model.equipment.BizEquipmentStandardTechnologyRelation;
 import com.casic.missiles.model.resource.BizResourceStaffInfo;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.dao.DeptMapper;
@@ -33,14 +35,12 @@
 import com.casic.missiles.service.flowable.ApprovalOperateService;
 import com.casic.missiles.utils.ConvertUtils;
 import com.casic.missiles.utils.DictCodeUtils;
-import org.flowable.engine.RuntimeService;
 import org.flowable.engine.runtime.ProcessInstance;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
 
-import javax.annotation.Resource;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
@@ -62,8 +62,6 @@
     private BizResourceStaffInfoMapper staffInfoMapper;
     @Autowired
     private IBaseApprovalService baseApprovalService;
-    @Resource
-    private RuntimeService runtimeService;
     @Autowired
     private ApprovalOperateService approvalOperateService;
     @Autowired
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSealInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSealInfoServiceImpl.java
index 7c91fa2..00040d6 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSealInfoServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSealInfoServiceImpl.java
@@ -15,6 +15,7 @@
 import com.casic.missiles.modular.system.model.User;
 import com.casic.missiles.service.resource.IBizResourceSealInfoService;
 import com.casic.missiles.utils.DictCodeUtils;
+import com.casic.missiles.utils.MinioUtil;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -33,6 +34,8 @@
     private BizResourceSealInfoMapper sealInfoMapper;
     @Autowired
     private UserMapper userMapper;
+    @Autowired
+    private MinioUtil minioUtil;
 
     @Override
     public Page<BizResourceSealInfo> listPage(Page<BizResourceSealInfo> page, SealInfoListRequest request) throws Exception {
@@ -44,6 +47,7 @@
         Page<BizResourceSealInfo> sealInfoPage = sealInfoMapper.selectPage(page, wrapper);
         for (BizResourceSealInfo record : sealInfoPage.getRecords()) {
             DictCodeUtils.convertDictCodeToName(record);
+            record.setMinioFileUrl(minioUtil.getFileUrl(record.getMinioFileName()));
         }
         return sealInfoPage;
     }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceStaffInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceStaffInfoServiceImpl.java
index f058cf5..09203ac 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceStaffInfoServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceStaffInfoServiceImpl.java
@@ -3,6 +3,7 @@
 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.core.page.PageFactory;
 import com.casic.missiles.dto.IdDTO;
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
@@ -86,6 +87,13 @@
     }
 
     @Override
+    public List<BizResourceStaffInfo> list(StaffListRequest request) throws Exception {
+        Page<BizResourceStaffInfo> page = PageFactory.defaultPage();
+        Page<BizResourceStaffInfo> staffInfoPage = this.listPage(page, request);
+        return staffInfoPage.getRecords();
+    }
+
+    @Override
     @Transactional
     public ReturnDTO<IdDTO> staffBaseAdd(BizResourceStaffInfo staffInfo) {
         //登录账号查重
@@ -495,6 +503,28 @@
         return certResponsePage;
     }
 
+    @Override
+    public List<StaffCertResponse> certListByIds(List<Long> ids) throws Exception {
+        Page<StaffCertResponse> page = PageFactory.defaultPage();
+        page.setCurrent(1);
+        page.setSearchCount(false);
+        page.setSize(Integer.MAX_VALUE);
+        StaffCertRequest request = new StaffCertRequest();
+        request.setIds(ids);
+        Page<StaffCertResponse> resultPage = this.certListPage(page, request);
+        return resultPage.getRecords();
+    }
+
+    @Override
+    public List<StaffCertResponse> certList(StaffCertRequest request) throws Exception {
+        Page<StaffCertResponse> page = PageFactory.defaultPage();
+        page.setCurrent(1);
+        page.setSearchCount(false);
+        page.setSize(Integer.MAX_VALUE);
+        Page<StaffCertResponse> resultPage = this.certListPage(page, request);
+        return resultPage.getRecords();
+    }
+
     @Async
     public void deleteRelationInfo(Long staffId){
         QueryWrapper<BizResourceStaffEducation> educationWrapper = new QueryWrapper<>();
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceStaffVerifierServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceStaffVerifierServiceImpl.java
index 8ac7eee..b508d45 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceStaffVerifierServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceStaffVerifierServiceImpl.java
@@ -52,8 +52,8 @@
     private WebSocket webSocket;
 
     @Override
-    public ReturnDTO expirationReminder(IdDTO idDto) {
-        BizResourceStaffVerifier staffVerifier = verifierMapper.selectById(idDto.getId());
+    public ReturnDTO expirationReminder(IdDTO idDTO) {
+        BizResourceStaffVerifier staffVerifier = verifierMapper.selectById(idDTO.getId());
         BizResourceStaffInfo staffInfo = staffInfoMapper.selectById(staffVerifier.getStaffId());
         QueryWrapper<User> wrapper = new QueryWrapper<>();
         wrapper.eq("account", staffInfo.getAccount());
@@ -65,7 +65,7 @@
         Assert.isFalse(Objects.isNull(user), () -> {
             throw new BusinessException(BusinessExceptionEnum.LOGIN_USER_ACQUIRE_FAILED);
         });
-        WorkbenchRemindMessage remindMessage = new WorkbenchRemindMessage(userInfo.getId(), userInfo.getDeptId(), idDto.getId(), staffVerifier.getCertNo(), MessageTypeEnum.STAFF_CERT.getCode(), MessageSourceModuleEnum.RESOURCE.getCode(), MessageTypeEnum.STAFF_CERT.getValue(), MessageTypeEnum.STAFF_CERT.getValue(), staffVerifier.getCertName(),0, user.getId(), user.getName());
+        WorkbenchRemindMessage remindMessage = new WorkbenchRemindMessage(userInfo.getId(), userInfo.getDeptId(), idDTO.getId(), staffVerifier.getCertNo(), MessageTypeEnum.STAFF_CERT.getCode(), MessageSourceModuleEnum.RESOURCE.getCode(), MessageTypeEnum.STAFF_CERT.getValue(), MessageTypeEnum.STAFF_CERT.getValue(), staffVerifier.getCertName(),0, user.getId(), user.getName());
         if(messageMapper.insert(remindMessage) > 0){
             // 新增到消息列表后向用户推送消息
             webSocket.sendOneMessage(String.valueOf(userInfo.getId()), JSONObject.toJSONString(remindMessage));
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceTrainInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceTrainInfoServiceImpl.java
index c1d6308..3a533f2 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceTrainInfoServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceTrainInfoServiceImpl.java
@@ -44,11 +44,14 @@
     @Override
     public Page<BizResourceTrainInfo> listPage(Page<BizResourceTrainInfo> page, TrainListRequest request) throws Exception {
         QueryWrapper<BizResourceTrainInfo> wrapper = new QueryWrapper<>();
-        wrapper.like("train_no", request.getTrainNo());
-        wrapper.apply(StringUtils.isNotBlank(request.getCreateTimeStart()),//apply方法传入参数名不能为空
-                "{0} <= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getCreateTimeStart().split(" ")[0]);
-        wrapper.apply(StringUtils.isNotBlank(request.getCreateTimeEnd()),
-                "{0} >= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getCreateTimeEnd().split(" ")[0]);
+        wrapper.like(StringUtils.isNotEmpty(request.getTrainNo()), "train_no", request.getTrainNo());
+        wrapper.like(StringUtils.isNotEmpty(request.getDutyLeader()),"duty_leader", request.getDutyLeader());
+        if(StringUtils.isNotBlank(request.getCreateTimeStart())){
+            wrapper.apply("{0} <= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getCreateTimeStart().split(" ")[0]);
+        }
+        if(StringUtils.isNotBlank(request.getCreateTimeEnd())){
+            wrapper.apply("{0} >= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getCreateTimeEnd().split(" ")[0]);
+        }
         wrapper.orderByDesc("create_time");
         Page<BizResourceTrainInfo> trainInfoPage = trainInfoMapper.selectPage(page, wrapper);
         for (BizResourceTrainInfo record : trainInfoPage.getRecords()) {
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/EnvLocationInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/EnvLocationInfoServiceImpl.java
new file mode 100644
index 0000000..cdc5742
--- /dev/null
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/EnvLocationInfoServiceImpl.java
@@ -0,0 +1,31 @@
+package com.casic.missiles.service.Impl.resource;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.casic.missiles.dto.resource.environment.LocationListRequest;
+import com.casic.missiles.dto.resource.environment.LocationListResponse;
+import com.casic.missiles.mapper.resource.EnvLocationInfoMapper;
+import com.casic.missiles.model.resource.EnvLocationInfo;
+import com.casic.missiles.service.resource.IEnvLocationInfoService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 实验室环境监控系统-设备表 服务实现类
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-06-07
+ */
+@Service
+public class EnvLocationInfoServiceImpl extends ServiceImpl<EnvLocationInfoMapper, EnvLocationInfo> implements IEnvLocationInfoService {
+    @Autowired
+    private EnvLocationInfoMapper locationInfoMapper;
+
+    @Override
+    public Page<LocationListResponse> listPage(Page<LocationListResponse> page, LocationListRequest request) {
+        Page<LocationListResponse> resultPage = locationInfoMapper.selectLocationListPage(page, request);
+        return resultPage;
+    }
+}
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/DownloadCenterServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/DownloadCenterServiceImpl.java
index c956d24..d9f3282 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/DownloadCenterServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/DownloadCenterServiceImpl.java
@@ -131,10 +131,12 @@
         wrapper.like(StringUtils.isNotBlank(request.getModuleName()), "module_name", request.getModuleName());
         wrapper.like(StringUtils.isNotBlank(request.getFileName()), "file_name", request.getFileName());
         wrapper.like(StringUtils.isNotBlank(request.getFileType()), "file_type", request.getFileType());
-        wrapper.apply(StringUtils.isNotBlank(request.getStartTime()),
-                "{0} <= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getStartTime().split(" ")[0]);
-        wrapper.apply(StringUtils.isNotBlank(request.getEndTime()),
-                "{0} >= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getEndTime().split(" ")[0]);
+        if(StringUtils.isNotBlank(request.getStartTime())){
+            wrapper.apply("{0} <= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getStartTime().split(" ")[0]);
+        }
+        if(StringUtils.isNotBlank(request.getEndTime())){
+            wrapper.apply("{0} >= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getEndTime().split(" ")[0]);
+        }
         wrapper.orderByDesc("create_time");
         return wrapper;
     }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemSignServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemSignServiceImpl.java
index 41976bb..7e90a09 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemSignServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemSignServiceImpl.java
@@ -52,15 +52,14 @@
 
     @Override
     public Page<SystemSign> listPage(Page<SystemSign> page, SignListRequest request) {
-        QueryWrapper<SystemSign> wrapper = getWrapper(request);
-        Page<SystemSign> signPage = signMapper.selectPage(page, wrapper);
+        Page<SystemSign> signPage = signMapper.selectSignListPage(page, request);
         return signPage;
     }
 
     @Override
     public List<SystemSign> list(SignListRequest request) {
-        QueryWrapper<SystemSign> wrapper = getWrapper(request);
-        return signMapper.selectList(wrapper);
+        List<SystemSign> signList = signMapper.selectSignList(request);
+        return signList;
     }
 
     @Override
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessCertificatePrintService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessCertificatePrintService.java
index 03247ab..7d6db77 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessCertificatePrintService.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessCertificatePrintService.java
@@ -9,6 +9,8 @@
 import com.casic.missiles.model.business.BizBusinessCertificatePrintLog;
 import com.casic.missiles.model.business.BizBusinessCertificateReport;
 
+import java.util.List;
+
 /**
  * <p>
  * 计量检定业务-任务计量管理-证书管理 服务类
@@ -30,4 +32,9 @@
     ReturnDTO certificatePrintStatus(Long id, String printStatus);
 
     ReturnDTO<BizBusinessCertificatePrintLog> certificatePrintLog(Long id);
+
+    List<CertificatePrintListResponse> listByIds(List<Long> ids);
+
+    List<CertificatePrintListResponse> list(CertificatePrintApprovalListRequest request);
+
 }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessCertificateReportService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessCertificateReportService.java
index 305ac7f..b33ef22 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessCertificateReportService.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessCertificateReportService.java
@@ -21,6 +21,4 @@
     ReturnDTO<CertificateReportSaveResponse> saveCertificateReport(BizBusinessCertificateReport request);
 
     ReturnDTO<BizBusinessCertificateReport> detail(BaseDetailRequest request);
-
-
 }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessIdentifyInfoService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessIdentifyInfoService.java
index 53c49d0..6d2089f 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessIdentifyInfoService.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessIdentifyInfoService.java
@@ -6,6 +6,8 @@
 import com.casic.missiles.model.business.BizBusinessIdentifyInfo;
 import com.baomidou.mybatisplus.extension.service.IService;
 
+import java.util.List;
+
 /**
  * <p>
  * 计量检定业务-任务计量管理-标识打印 服务类
@@ -20,7 +22,11 @@
 
     ReturnDTO addIdentify(BizBusinessIdentifyInfo identifyInfo);
 
-    ReturnDTO updateIdentify(BizBusinessIdentifyInfo identifyInfo);
+    ReturnDTO updateIdentify(Long id);
 
     ReturnDTO deleteIdentify(Long id);
+
+    List<BizBusinessIdentifyInfo> list(IdentifyListRequest request) throws Exception;
+
+    ReturnDTO<String> equipmentQrCode(Long id);
 }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessOutsourceAssessService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessOutsourceAssessService.java
index 5e15bc8..bcdc791 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessOutsourceAssessService.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessOutsourceAssessService.java
@@ -1,7 +1,11 @@
 package com.casic.missiles.service.business;
 
+import com.casic.missiles.dto.BaseApprovalSubmitRequest;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.business.outsource.OutsourceAssessApprovalListRequest;
+import com.casic.missiles.dto.business.outsource.OutsourceAssessSaveResponse;
 import com.casic.missiles.model.business.BizBusinessOutsourceAssess;
-import com.baomidou.mybatisplus.extension.service.IService;
+import com.casic.missiles.service.IGeneralApprovalService;
 
 /**
  * <p>
@@ -11,6 +15,7 @@
  * @author wangpeng
  * @since 2023-08-16
  */
-public interface IBizBusinessOutsourceAssessService extends IService<BizBusinessOutsourceAssess> {
+public interface IBizBusinessOutsourceAssessService extends IGeneralApprovalService<BizBusinessOutsourceAssess, BizBusinessOutsourceAssess, OutsourceAssessApprovalListRequest, BaseApprovalSubmitRequest> {
 
+    ReturnDTO<OutsourceAssessSaveResponse> saveOutsourceAssess(BizBusinessOutsourceAssess request);
 }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessOutsourceProtocolService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessOutsourceProtocolService.java
new file mode 100644
index 0000000..7f3092b
--- /dev/null
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessOutsourceProtocolService.java
@@ -0,0 +1,21 @@
+package com.casic.missiles.service.business;
+
+import com.casic.missiles.dto.BaseApprovalSubmitRequest;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.business.outsource.OutsourceProtocolApprovalListRequest;
+import com.casic.missiles.dto.business.outsource.OutsourceProtocolSaveResponse;
+import com.casic.missiles.model.business.BizBusinessOutsourceProtocol;
+import com.casic.missiles.service.IGeneralApprovalService;
+
+/**
+ * <p>
+ * 计量检定业务-分包管理-测试、校准或检定工作分包协议书 服务类
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-08-24
+ */
+public interface IBizBusinessOutsourceProtocolService extends IGeneralApprovalService<BizBusinessOutsourceProtocol, BizBusinessOutsourceProtocol, OutsourceProtocolApprovalListRequest, BaseApprovalSubmitRequest> {
+
+    ReturnDTO<OutsourceProtocolSaveResponse> saveOutsourceProtocol(BizBusinessOutsourceProtocol request);
+}
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessOutsourcerInfoService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessOutsourcerInfoService.java
index 9ba656b..b199de4 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessOutsourcerInfoService.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessOutsourcerInfoService.java
@@ -24,8 +24,6 @@
  */
 public interface IBizBusinessOutsourcerInfoService extends IGeneralApprovalService<BizBusinessOutsourcerInfo, BizBusinessOutsourcerInfo, OutsourcerInfoApprovalListRequest, BaseApprovalSubmitRequest> {
 
-    List<BizBusinessOutsourcerInfo> list(OutsourcerInfoApprovalListRequest request);
-
     ReturnDTO<OutsourcerSaveResponse> saveOutsourcer(BizBusinessOutsourcerInfo request);
 
     BizBusinessOutsourcerInfo detail(Long id) throws Exception;
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessLabExecutiveInfoService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessLabExecutiveInfoService.java
index 278c674..f6ed490 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessLabExecutiveInfoService.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessLabExecutiveInfoService.java
@@ -30,8 +30,16 @@
 
     Page<SampleLabExecutiveListResponse> deptLabExecutiveListPage(Page<SampleLabExecutiveListResponse> page, SampleLabExecutiveListRequest labExecutiveListRequest) throws Exception;
 
+    List<SampleLabExecutiveListResponse> deptLabExecutiveList(SampleLabExecutiveListRequest request) throws Exception;
+
+    List<SampleLabExecutiveListResponse> deptLabExecutiveListByIds(String measureStatus, List<Long> ids) throws Exception;
+
     Page<SampleLabExecutiveListResponse> myLabExecutiveListPage(Page<SampleLabExecutiveListResponse> page, SampleLabExecutiveListRequest labExecutiveListRequest) throws Exception;
 
+    List<SampleLabExecutiveListResponse> myLabExecutiveList(SampleLabExecutiveListRequest request) throws Exception;
+
+    List<SampleLabExecutiveListResponse> myLabExecutiveListByIds(String measureStatus, List<Long> ids) throws Exception;
+
     List<SampleAmountResponse> myExecutiveAmount();
 
     ReturnDTO sampleReceive(List<SampleOperateRequest> requestList);

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java
index bb0c50f..13a699b 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java
@@ -12,6 +12,7 @@
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.IGeneralApprovalService;
+import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
@@ -19,6 +20,7 @@
 import org.springframework.web.bind.annotation.RequestBody;
 
 import javax.validation.Valid;
+import java.util.List;
 import java.util.Objects;
 
 /**
@@ -117,4 +119,17 @@
         }
         return baseApprovalService.failUpdate(request);
     }
+
+    public List<O> exportList(@RequestBody @Valid R request) throws Exception {
+        List<O> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = baseApprovalService.listExportByIds(request.getIds());
+        } else {
+            list = baseApprovalService.listExport(request);
+        }
+        for (O record : list) {
+            DictCodeUtils.convertDictCodeToName(record);
+        }
+        return list;
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java
index 8a90961..d775831 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java
@@ -5,6 +5,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.business.certificate.CertificateChangeApplyApprovalListRequest;
 import com.casic.missiles.dto.business.certificate.CertificateChangeApplySaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessCertificateChangeApply;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
@@ -20,6 +21,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -48,4 +50,12 @@
         }
         return changeApplyService.saveChangeApply(request);
     }
+
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody CertificateChangeApplyApprovalListRequest request) throws Exception {
+        List<BizBusinessCertificateChangeApply> list = super.exportList(request);
+        super.exportExcel(BizBusinessCertificateChangeApply.class, list, ExportEnum.CERTIFICATE_CHANGE_APPLY.getSheetName());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java
index 5fc4b07..af8230e 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java
@@ -9,6 +9,7 @@
 import com.casic.missiles.dto.business.certificate.CertificatePrintApprovalListRequest;
 import com.casic.missiles.dto.business.certificate.CertificatePrintListResponse;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.enums.business.CertificatePrintStatusEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessCertificatePrintLog;
@@ -18,10 +19,16 @@
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.io.IOException;
+import java.util.List;
 import java.util.Objects;
 
 /**
@@ -98,4 +105,16 @@
         });
         return certificatePrintService.certificatePrintLog(idDTO.getId());
     }
+
+    @ApiOperation("证书打印审批导出")
+    @PostMapping("/listExport")
+    public void exportList(@RequestBody CertificatePrintApprovalListRequest request) throws IOException {
+        List<CertificatePrintListResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = certificatePrintService.listByIds(request.getIds());
+        } else {
+            list = certificatePrintService.list(request);
+        }
+        super.exportExcel(CertificatePrintListResponse.class, list, ExportEnum.CERTIFICATE_PRINT.getSheetName());
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java
index 63b06dc..6b2efd5 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java
@@ -6,6 +6,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.business.certificate.CertificateReportApprovalListRequest;
 import com.casic.missiles.dto.business.certificate.CertificateReportSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessCertificateReport;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
@@ -21,6 +22,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -50,7 +52,7 @@
         return certificateReportService.saveCertificateReport(request);
     }
 
-    @ApiOperation("证书审批详情（基本信息）")
+    @ApiOperation("详情（基本信息）")
     @PostMapping("/detail")
     public ReturnDTO<BizBusinessCertificateReport> detail(@RequestBody @Valid BaseDetailRequest request, BindingResult bindingResult) throws Exception {
         if(bindingResult.hasErrors()){
@@ -59,4 +61,11 @@
         return certificateReportService.detail(request);
     }
 
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody CertificateReportApprovalListRequest request) throws Exception {
+        List<BizBusinessCertificateReport> list = super.exportList(request);
+        super.exportExcel(BizBusinessCertificateReport.class, list, ExportEnum.CERTIFICATE_REPORT.getSheetName());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java
index 46b26bd..57c0809 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java
@@ -10,20 +10,21 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.business.identify.IdentifyListRequest;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessIdentifyInfo;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.business.IBizBusinessIdentifyInfoService;
+import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import javax.validation.Valid;
+import java.util.List;
 import java.util.Objects;
 
 /**
@@ -57,16 +58,13 @@
         return identifyInfoService.addIdentify(identifyInfo);
     }
 
-    @ApiOperation("标识打印更新")
+    @ApiOperation("标识打印更新（更新打印时间）")
     @PostMapping("/update")
-    public ReturnDTO updateIdentify(@RequestBody @Valid BizBusinessIdentifyInfo identifyInfo, BindingResult bindingResult) {
-        Assert.isFalse(Objects.isNull(identifyInfo.getId()), () -> {
+    public ReturnDTO updateIdentify(@RequestBody @Valid IdDTO idDTO) {
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        Assert.isFalse(bindingResult.hasErrors(), () -> {
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        });
-        return identifyInfoService.updateIdentify(identifyInfo);
+        return identifyInfoService.updateIdentify(idDTO.getId());
     }
 
     @ApiOperation("标识打印删除")
@@ -77,4 +75,37 @@
         });
         return identifyInfoService.deleteIdentify(idDTO.getId());
     }
+
+    @ApiOperation("标识打印导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody @Valid IdentifyListRequest request, BindingResult bindingResult) throws Exception {
+        if (bindingResult.hasErrors()) {
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        List<BizBusinessIdentifyInfo> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = identifyInfoService.listByIds(request.getIds());
+        } else {
+            list = identifyInfoService.list(request);
+        }
+        for (BizBusinessIdentifyInfo record : list) {
+            DictCodeUtils.convertDictCodeToName(record);
+        }
+        super.exportExcel(BizBusinessIdentifyInfo.class, list, ExportEnum.IDENTIFY_EXPORT.getSheetName());
+    }
+
+
+    // TODO: 2023/8/23 查询设备信息，4个底部按钮查设备（按钮的作用就是前端用来调不同接口、用来区分中间即将展示的标识），前端弹窗选设备，在确定保存时前端根据底部按钮判断传入设备类型deviceType字典code
+    // TODO: 2023/8/23 接口：查受检设备（第1个按钮），查设备台账（后3个按钮同一接口），查询之后前端根据标志类型的不同加到中间页面时进行判断（按产品给的对应表）
+    // TODO: 2023/8/23 提供二维码接口，前端在加到中间页面时调用一下
+
+    @ApiOperation("设备二维码")
+    @PostMapping("/equipment/qrCode")
+    public ReturnDTO<String> equipmentQrCode(@RequestBody @Valid IdDTO idDTO) {
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return identifyInfoService.equipmentQrCode(idDTO.getId());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java
index 707be6e..7e0453d 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java
@@ -117,7 +117,7 @@
     }
 
     @ApiOperation("任务单导出")
-    @PostMapping("/export")
+    @PostMapping("/listExport")
     public void orderExport(@RequestBody @Valid OrderListRequest request, HttpServletResponse response) {
         businessOrderService.orderExport(request, response);
     }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java
index 529a6ce..51432be 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java
@@ -1,9 +1,28 @@
 package com.casic.missiles.controller.business;
 
+import com.casic.missiles.controller.GeneralApprovalController;
+import com.casic.missiles.dto.BaseApprovalSubmitRequest;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.business.outsource.OutsourceAssessApprovalListRequest;
+import com.casic.missiles.dto.business.outsource.OutsourceAssessSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
+import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.model.business.BizBusinessOutsourceAssess;
+import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
+import com.casic.missiles.service.IGeneralApprovalService;
+import com.casic.missiles.service.business.IBizBusinessOutsourceAssessService;
 import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.BindingResult;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.validation.Valid;
+import java.util.List;
+
 /**
  * <p>
  * 计量检定业务-分包管理-测试、校准或检定工作分包评审表 前端控制器
@@ -15,6 +34,27 @@
 @Api(tags = "分包管理-测试、校准或检定工作分包评审表")
 @RestController
 @RequestMapping("/business/outsource/assess")
-public class BizBusinessOutsourceAssessController {
+public class BizBusinessOutsourceAssessController extends GeneralApprovalController<BizBusinessOutsourceAssess, BizBusinessOutsourceAssess, OutsourceAssessApprovalListRequest, BaseApprovalSubmitRequest> {
+    @Autowired
+    private IBizBusinessOutsourceAssessService outsourceAssessService;
 
+    public BizBusinessOutsourceAssessController(IGeneralApprovalService<BizBusinessOutsourceAssess, BizBusinessOutsourceAssess, OutsourceAssessApprovalListRequest, BaseApprovalSubmitRequest> baseApprovalService) {
+        super(baseApprovalService);
+    }
+
+    @ApiOperation("草稿箱-保存")
+    @PostMapping("/save")
+    public ReturnDTO<OutsourceAssessSaveResponse> saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceAssess request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        return outsourceAssessService.saveOutsourceAssess(request);
+    }
+
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception {
+        List<BizBusinessOutsourceAssess> list = super.exportList(request);
+        super.exportExcel(BizBusinessOutsourceAssess.class, list, ExportEnum.OUTSOURCE_ASSESS.getSheetName());
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java
new file mode 100644
index 0000000..9adef18
--- /dev/null
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java
@@ -0,0 +1,60 @@
+package com.casic.missiles.controller.business;
+
+import com.casic.missiles.controller.GeneralApprovalController;
+import com.casic.missiles.dto.BaseApprovalSubmitRequest;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.business.outsource.OutsourceProtocolApprovalListRequest;
+import com.casic.missiles.dto.business.outsource.OutsourceProtocolSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
+import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.model.business.BizBusinessOutsourceProtocol;
+import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
+import com.casic.missiles.service.IGeneralApprovalService;
+import com.casic.missiles.service.business.IBizBusinessOutsourceProtocolService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.BindingResult;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.validation.Valid;
+import java.util.List;
+
+/**
+ * <p>
+ * 计量检定业务-分包管理-测试、校准或检定工作分包协议书 前端控制器
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-08-24
+ */
+@Api(tags = "分包管理-测试、校准或检定工作分包协议书")
+@RestController
+@RequestMapping("/business/outsource/protocol")
+public class BizBusinessOutsourceProtocolController extends GeneralApprovalController<BizBusinessOutsourceProtocol, BizBusinessOutsourceProtocol, OutsourceProtocolApprovalListRequest, BaseApprovalSubmitRequest> {
+    @Autowired
+    private IBizBusinessOutsourceProtocolService outsourceProtocolService;
+
+    public BizBusinessOutsourceProtocolController(IGeneralApprovalService<BizBusinessOutsourceProtocol, BizBusinessOutsourceProtocol, OutsourceProtocolApprovalListRequest, BaseApprovalSubmitRequest> baseApprovalService) {
+        super(baseApprovalService);
+    }
+
+    @ApiOperation("草稿箱-保存")
+    @PostMapping("/save")
+    public ReturnDTO<OutsourceProtocolSaveResponse> saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceProtocol request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        return outsourceProtocolService.saveOutsourceProtocol(request);
+    }
+
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody OutsourceProtocolApprovalListRequest request) throws Exception {
+        List<BizBusinessOutsourceProtocol> list = super.exportList(request);
+        super.exportExcel(BizBusinessOutsourceProtocol.class, list, ExportEnum.OUTSOURCE_PROTOCOL.getSheetName());
+    }
+}
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java
index 097f645..f0f0943 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java
@@ -17,7 +17,6 @@
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.IGeneralApprovalService;
 import com.casic.missiles.service.business.IBizBusinessOutsourcerInfoService;
-import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -71,19 +70,8 @@
 
     @ApiOperation("分包方导出")
     @PostMapping("/listExport")
-    public void export(@RequestBody @Valid OutsourcerInfoApprovalListRequest request, BindingResult bindingResult) throws Exception {
-        if (bindingResult.hasErrors()) {
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        }
-        List<BizBusinessOutsourcerInfo> list;
-        if (!CollectionUtils.isEmpty(request.getIds())) {
-            list = outsourcerInfoService.listByIds(request.getIds());
-        } else {
-            list = outsourcerInfoService.list(request);
-        }
-        for (BizBusinessOutsourcerInfo record : list) {
-            DictCodeUtils.convertDictCodeToName(record);
-        }
+    public void export(@RequestBody OutsourcerInfoApprovalListRequest request) throws Exception {
+        List<BizBusinessOutsourcerInfo> list = super.exportList(request);
         super.exportExcel(BizBusinessOutsourcerInfo.class, list, ExportEnum.OUTSOURCER_EXPORT.getSheetName());
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java
index c2cbf9f..0410918 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java
@@ -17,11 +17,9 @@
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.IGeneralApprovalService;
 import com.casic.missiles.service.business.IBizBusinessSiteExecutiveInfoService;
-import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -60,7 +58,7 @@
         return siteExecutiveInfoService.saveSiteExecutiveInfo(siteExecutiveInfo);
     }
 
-    @ApiOperation("现场检测详情")
+    @ApiOperation("详情")
     @PostMapping("/detail")
     public ReturnDTO<SiteExecutiveDetailResponse> siteExecutiveDetail(@RequestBody @Valid IdDTO idDTO) throws Exception {
         Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
@@ -69,21 +67,10 @@
         return ReturnUtil.success(siteExecutiveInfoService.detail(idDTO.getId()));
     }
 
-    @ApiOperation("现场检测导出")
+    @ApiOperation("导出")
     @PostMapping("/listExport")
-    public void export(@RequestBody @Valid SiteExecutiveApprovalListRequest request, BindingResult bindingResult) throws Exception {
-        if (bindingResult.hasErrors()) {
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        }
-        List<SiteExecutiveApprovalListResponse> list;
-        if (!CollectionUtils.isEmpty(request.getIds())) {
-            list = siteExecutiveInfoService.listInfoByIds(request.getIds());
-        } else {
-            list = siteExecutiveInfoService.listInfo(request);
-        }
-        for (SiteExecutiveApprovalListResponse record : list) {
-            DictCodeUtils.convertDictCodeToName(record);
-        }
+    public void export(@RequestBody SiteExecutiveApprovalListRequest request) throws Exception {
+        List<SiteExecutiveApprovalListResponse> list = super.exportList(request);
         super.exportExcel(SiteExecutiveApprovalListResponse.class, list, ExportEnum.SITE_EXECUTIVE_EXPORT.getSheetName());
     }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
index 7e793cd..a92e209 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
@@ -55,7 +55,7 @@
 
     @ApiOperation("设备收发列表导出")
     @PostMapping("/export")
-    public void exportList(@RequestBody @Valid SampleDispatchListRequest request) throws IOException {
+    public void exportList(@RequestBody SampleDispatchListRequest request) throws IOException {
         List<SampleDispatchListResponse> list;
         if (!CollectionUtils.isEmpty(request.getIds())) {
             list = dispatchService.listByIds(request.getIds());
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java
index cdc77fc..d120fd4 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java
@@ -7,6 +7,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.business.labExecutive.*;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.business.IBusinessLabExecutiveInfoService;
@@ -14,6 +15,7 @@
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.*;
 
@@ -32,7 +34,7 @@
     @Autowired
     private IBusinessLabExecutiveInfoService labExecutiveInfoService;
 
-    @ApiOperation("实验室检测-部门检测-查询各状态列表（待检测、检测中、检测完）")
+    @ApiOperation("实验室任务-查询各状态列表（待检测、检测中、检测完）")
     @PostMapping("/deptExecutive/List")
     public ReturnDTO<PageInfoBT<SampleLabExecutiveListResponse>> queryDeptExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
@@ -43,10 +45,19 @@
         return ReturnUtil.success(super.packForBT(labExecutiveInfoService.deptLabExecutiveListPage(page, labExecutiveListRequest)));
     }
 
-    /**
-     * 实验室检测-我的检测-查询各状态列表（待检测、检测中、检测完）
-     */
-    @ApiOperation("实验室检测-我的检测-查询各状态列表（待检测、检测中、检测完）")
+    @ApiOperation("实验室任务导出")
+    @PostMapping("/deptExecutive/export")
+    public void deptExportList(@RequestBody @Valid SampleLabExecutiveListRequest request) throws Exception {
+        List<SampleLabExecutiveListResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = labExecutiveInfoService.deptLabExecutiveListByIds(request.getMeasureStatus(), request.getIds());
+        } else {
+            list = labExecutiveInfoService.deptLabExecutiveList(request);
+        }
+        super.exportExcel(SampleLabExecutiveListResponse.class, list, ExportEnum.DEPT_EXECUTIVE_TASK.getSheetName());
+    }
+
+    @ApiOperation("我的任务-查询各状态列表（待检测、检测中、检测完）")
     @PostMapping("/myExecutive/list")
     public ReturnDTO<PageInfoBT<SampleLabExecutiveListResponse>> queryMyExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
@@ -57,19 +68,25 @@
         return ReturnUtil.success(super.packForBT(labExecutiveInfoService.myLabExecutiveListPage(page, labExecutiveListRequest)));
     }
 
-    /**
-     * 实验室检测-我的检测-查询各状态样品数量（待检测、检测中、检测完）
-     */
-    @ApiOperation("实验室检测-我的检测-查询各状态样品数量（待检测、检测中、检测完）")
+    @ApiOperation("我的任务导出")
+    @PostMapping("/myExecutive/export")
+    public void exportList(@RequestBody @Valid SampleLabExecutiveListRequest request) throws Exception {
+        List<SampleLabExecutiveListResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = labExecutiveInfoService.myLabExecutiveListByIds(request.getMeasureStatus(), request.getIds());
+        } else {
+            list = labExecutiveInfoService.myLabExecutiveList(request);
+        }
+        super.exportExcel(SampleLabExecutiveListResponse.class, list, ExportEnum.MY_EXECUTIVE_TASK.getSheetName());
+    }
+
+    @ApiOperation("我的任务-查询各状态样品数量（待检测、检测中、检测完）")
     @GetMapping("/myExecutive/amount")
     public ReturnDTO<List<SampleAmountResponse>> queryMyExecutiveAmount() {
         return ReturnUtil.success(labExecutiveInfoService.myExecutiveAmount());
     }
 
-    /**
-     * 实验室检测-部门检测-分配（分配给具体人员）
-     */
-    @ApiOperation("实验室检测-部门检测-分配按钮（分配给具体人员）")
+    @ApiOperation("实验室任务-分配按钮（分配给具体人员）")
     @PostMapping("/deptExecutive/allocate")
     public ReturnDTO allocateStaff(@RequestBody @Valid SampleAllocateRequest sampleAllocateRequest, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -78,10 +95,7 @@
         return labExecutiveInfoService.allocateStaff(sampleAllocateRequest);
     }
 
-    /**
-     * 实验室检测-我的检测-检定人扫描收入（待检测->检测中）
-     */
-    @ApiOperation("实验室检测-我的检测-检定人扫描收入（待检测->检测中）")
+    @ApiOperation("我的任务-检定人扫描收入（待检测->检测中）")
     @PostMapping("/myExecutive/receive")
     public ReturnDTO sampleReceive(@RequestBody @Valid List<SampleOperateRequest> requestList, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -90,10 +104,7 @@
         return labExecutiveInfoService.sampleReceive(requestList);
     }
 
-    /**
-     * 实验室检测-负责人/检定人扫描检完（检测中->检测完）
-     */
-    @ApiOperation("实验室检测-负责人/检定人扫描检完（检测中->检测完）")
+    @ApiOperation("实验室任务-负责人/检定人扫描检完（检测中->检测完）")
     @PostMapping("/myExecutive/complete")
     public ReturnDTO sampleExecutiveComplete(@RequestBody @Valid List<SampleOperateRequest> requestList, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -102,10 +113,7 @@
         return labExecutiveInfoService.sampleExecutiveComplete(requestList);
     }
 
-    /**
-     * 实验室检测-部门检测/我的检测 编辑（只能修改应出具证书）
-     */
-    @ApiOperation("实验室检测-部门检测/我的检测 编辑（只能修改应出具证书）")
+    @ApiOperation("实验室任务/我的任务 编辑（只能修改应出具证书）")
     @PostMapping("/executive/update")
     public ReturnDTO updateExecutive(@RequestBody @Valid UpdateExecutiveRequest request, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -114,10 +122,7 @@
         return labExecutiveInfoService.updateExecutive(request);
     }
 
-    /**
-     * 实验室检测-部门检测/我的检测 详情
-     */
-    @ApiOperation("实验室检测-部门检测/我的检测 详情")
+    @ApiOperation("实验室任务/我的任务 详情")
     @PostMapping("/executive/detail")
     public ReturnDTO<ExecutiveDetailResponse> executiveDetail(@RequestBody @Valid ExecutiveDetailRequest request, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
@@ -131,7 +136,7 @@
      * 退回后会将下一个要执行的实验室检测状态更新为待分配，将后面的实验室顺序变更为连续（都进行减1）
      * 最后一个检测的实验室退回，等分发员再增加实验室或设备收发中的已收入直接手动点击完成
      */
-    @ApiOperation("实验室检测-部门检测/我的检测 退回（待检测/检测中->退回）")
+    @ApiOperation("实验室任务/我的任务 退回（待检测/检测中->退回）")
     @PostMapping("/executive/sendBack")
     public ReturnDTO executiveSendBack(@RequestBody @Valid ExecutiveSendBackRequest request, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -140,9 +145,6 @@
         return labExecutiveInfoService.sampleExecutiveSendBack(request);
     }
 
-    /**
-     * 分发员编辑实验室检测列表
-     */
     @ApiOperation("分发员编辑实验室检测列表")
     @PostMapping("/handOut/updateList")
     public ReturnDTO updateExecutiveList(@RequestBody @Valid UpdateExecutiveListRequest request, BindingResult bindingResult) {
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java
index 48a67ed..0c04f31 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java
@@ -10,6 +10,7 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.resource.customer.CustomerApprovalListRequest;
 import com.casic.missiles.dto.resource.customer.CustomerSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceCustomerInfo;
@@ -26,6 +27,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -55,6 +57,13 @@
         return customerInfoService.saveCustomerInfo(request);
     }
 
+    @ApiOperation("委托方名录导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody CustomerApprovalListRequest request) throws Exception {
+        List<BizResourceCustomerInfo> list = super.exportList(request);
+        super.exportExcel(BizResourceCustomerInfo.class, list, ExportEnum.CUSTOMER_INFO.getSheetName());
+    }
+
     @ApiOperation("委托方人员列表（分页）")
     @PostMapping("/person/listPage")
     public ReturnDTO<PageInfoBT<BizResourceCustomerStaff>> personListPage(@RequestBody IdDTO idDto) {
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
index 972ed4b..6418ea5 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
@@ -5,6 +5,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.resource.customer.SuggestFormApprovalListRequest;
 import com.casic.missiles.dto.resource.customer.SuggestFormSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceCustomerSuggestForm;
@@ -20,6 +21,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -50,4 +52,11 @@
         return suggestFormService.saveSuggestForm(request);
     }
 
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody SuggestFormApprovalListRequest request) throws Exception {
+        List<BizResourceCustomerSuggestForm> list = super.exportList(request);
+        super.exportExcel(BizResourceCustomerSuggestForm.class, list, ExportEnum.CUSTOMER_SUGGEST_FORM.getSheetName());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java
index 1934d1a..9e07eab 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java
@@ -15,12 +15,16 @@
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.resource.IEnvEnvironmentRecordConfigService;
 import com.casic.missiles.service.resource.IEnvEnvironmentRecordDataService;
+import com.casic.missiles.service.resource.IEnvLocationInfoService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
 import java.util.List;
@@ -39,6 +43,8 @@
     private IEnvEnvironmentRecordDataService environmentRecordDataService;
     @Autowired
     private IEnvEnvironmentRecordConfigService environmentRecordConfigService;
+    @Autowired
+    private IEnvLocationInfoService locationInfoService;
 
     @ApiOperation("环境记录单数据列表/详情")
     @PostMapping("/data/listPage")
@@ -95,4 +101,11 @@
         });
         return environmentRecordConfigService.deleteEnvironmentRecordConfig(idDTO.getId());
     }
+
+    @ApiOperation("地点列表")
+    @PostMapping("/location/listPage")
+    public ReturnDTO<PageInfoBT<LocationListResponse>> locationListPage(@RequestBody @Valid LocationListRequest request) {
+        Page<LocationListResponse> page = PageFactory.defaultPage();
+        return ReturnUtil.success(super.packForBT(locationInfoService.listPage(page, request)));
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java
index 82efe3f..e9561fa 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java
@@ -10,6 +10,7 @@
 import com.casic.missiles.dto.resource.seal.SealLogListRequest;
 import com.casic.missiles.dto.resource.seal.SealNoteApprovalListRequest;
 import com.casic.missiles.dto.resource.seal.SealNoteSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceSealUseLog;
@@ -27,6 +28,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -58,6 +60,13 @@
         return sealUseNoteService.saveSeal(request);
     }
 
+    @ApiOperation("印章使用登记导出（列表和导出中去掉经办人和监印人）")
+    @PostMapping("/listExport")
+    public void export(@RequestBody SealNoteApprovalListRequest request) throws Exception {
+        List<BizResourceSealUseNote> list = super.exportList(request);
+        super.exportExcel(BizResourceSealUseNote.class, list, ExportEnum.SEAL_NOTE.getSheetName());
+    }
+
     // TODO: 2023/7/28 印章使用日志：系统中使用印章时插入数据库
 
     @ApiOperation("印章使用日志列表（分页）")
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java
index 9b674fc..06b6521 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java
@@ -9,16 +9,20 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.resource.staff.StaffCertRequest;
 import com.casic.missiles.dto.resource.staff.StaffCertResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.service.resource.IBizResourceStaffInfoService;
 import com.casic.missiles.service.resource.IBizResourceStaffVerifierService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.List;
+
 /**
  * @Description:
  * @Author: wangpeng
@@ -41,9 +45,21 @@
         return ReturnUtil.success(super.packForBT(responsePage));
     }
 
+    @ApiOperation("证书逾期提醒导出")
+    @PostMapping("/listExport")
+    public void exportList(@RequestBody StaffCertRequest request) throws Exception {
+        List<StaffCertResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = staffInfoService.certListByIds(request.getIds());
+        } else {
+            list = staffInfoService.certList(request);
+        }
+        super.exportExcel(StaffCertResponse.class, list, ExportEnum.STAFF_CERTIFICATE_EXPIRE.getSheetName());
+    }
+
     @ApiOperation("证书逾期提醒")
     @PostMapping("/expirationReminder")
-    public ReturnDTO expirationReminder(@RequestBody IdDTO idDto) {
-        return verifierService.expirationReminder(idDto);
+    public ReturnDTO expirationReminder(@RequestBody IdDTO idDTO) {
+        return verifierService.expirationReminder(idDTO);
     }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java
index 3b251ad..a6e7850 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java
@@ -12,6 +12,7 @@
 import com.casic.missiles.dto.resource.staff.StaffListRequest;
 import com.casic.missiles.dto.resource.staff.TrainListRequest;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.*;
@@ -22,7 +23,10 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
 import java.util.List;
@@ -52,8 +56,19 @@
             throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
         }
         Page<BizResourceStaffInfo> page = PageFactory.defaultPage();
-        Page<BizResourceStaffInfo> responsePage = staffInfoService.listPage(page, request);
-        return ReturnUtil.success(super.packForBT(responsePage));
+        return ReturnUtil.success(super.packForBT(staffInfoService.listPage(page, request)));
+    }
+
+    @ApiOperation("人员登记导出")
+    @PostMapping("/listExport")
+    public void exportList(@RequestBody StaffListRequest request) throws Exception {
+        List<BizResourceStaffInfo> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = staffInfoService.listByIds(request.getIds());
+        } else {
+            list = staffInfoService.list(request);
+        }
+        super.exportExcel(BizResourceStaffInfo.class, list, ExportEnum.STAFF_INFO.getSheetName());
     }
 
     @ApiOperation("人员登记详情基础信息")
@@ -85,9 +100,9 @@
 
     @ApiOperation("科研教育列表（分页）")
     @PostMapping("/education/listPage")
-    public ReturnDTO<PageInfoBT<BizResourceStaffEducation>> educationListPage(@RequestBody IdDTO idDto) {
+    public ReturnDTO<PageInfoBT<BizResourceStaffEducation>> educationListPage(@RequestBody IdDTO idDTO) {
         Page<BizResourceStaffEducation> page = PageFactory.defaultPage();
-        Page<BizResourceStaffEducation> responsePage = staffInfoService.educationListPage(page, idDto);
+        Page<BizResourceStaffEducation> responsePage = staffInfoService.educationListPage(page, idDTO);
         return ReturnUtil.success(super.packForBT(responsePage));
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java
index af6aa86..d85d84a 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java
@@ -9,6 +9,7 @@
 import com.casic.missiles.dto.resource.outsideService.SupplierApprovalListRequest;
 import com.casic.missiles.dto.resource.outsideService.SupplierSaveResponse;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceSupplierAbility;
@@ -67,6 +68,13 @@
         return ReturnUtil.success(supplierInfoService.detail(idDTO.getId()));
     }
 
+    @ApiOperation("合格供方导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody SupplierApprovalListRequest request) throws Exception {
+        List<BizResourceSupplierInfo> list = super.exportList(request);
+        super.exportExcel(BizResourceSupplierInfo.class, list, ExportEnum.SUPPLIER_INFO.getSheetName());
+    }
+
     @ApiOperation("供方人员列表（分页）")
     @PostMapping("/person/listPage")
     public ReturnDTO<PageInfoBT<BizResourceSupplierPerson>> personListPage(@RequestBody IdDTO idDTO) {
diff --git a/casic-metering-api/src/main/resources/config/application.yml b/casic-metering-api/src/main/resources/config/application.yml
index 350db5f..ecff521 100644
--- a/casic-metering-api/src/main/resources/config/application.yml
+++ b/casic-metering-api/src/main/resources/config/application.yml
@@ -126,7 +126,7 @@
     #作者
     author: wangpeng
     #待生成对象表名
-    table-name: biz_equipment_technical_target_approval,biz_equipment_attachment_approval,biz_equipment_checkpoint_approval
+    table-name: biz_business_outsource_protocol
 
 reminder:
   #节点--common模块config包 ReminderNodeConfig配置
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
index 4a19e4e..d47d552 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
@@ -53,6 +53,7 @@
     SUGGEST_FORM_SAVE_FAILED(2509, "委托方意见登记表保存至草稿箱失败"),
     EXAMINE_FORM_SAVE_FAILED(2510, "要求、委托书及合同评审表保存至草稿箱失败"),
     CUSTOMER_EXIST_SAVE_FAILED(2511, "该委托方已存在，请重新选择"),
+    DUPLICATE_LOCATION_NO(2512, "地点编号已存在"),
 
     /**
      * 计量检定业务模块
@@ -68,6 +69,8 @@
     COMPLETE_SAMPLE_NOT_EXIST(2609, "检测中不存在扫描收入的样品"),
     CANNOT_CHANGE_MEASURE_INFO(2610, "无法更改非当前登录用户的检测信息"),
     NON_EXIST_ORDER_OR_SAMPLE(2611, "不存在该委托单或该委托单下的样品"),
+    OUTSOURCE_ACCESS_SAVE_FAILED(2612, "测试、校准或检定工作分包评审表保存至草稿箱失败"),
+    OUTSOURCE_PROTOCOL_SAVE_FAILED(2613, "测试、校准或检定工作分包协议书保存至草稿箱失败"),
 
     /**
      * 历史遗留备用
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
index 5089ad1..81a406b 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
@@ -10,54 +10,38 @@
     /**
      * 资源管理
      */
-    ENVIRONMENT_DATA_EXPORT("environmentData", "environmentData", "环境记录单数据"),
+    ENVIRONMENT_DATA_EXPORT("environmentData", "环境记录单数据", "环境记录单数据"),
+    STAFF_INFO("staffInfo", "人员登记", "人员登记"),
+    STAFF_CERTIFICATE_EXPIRE("certificateExpire", "证书逾期提醒", "证书逾期提醒"),
+    SUPPLIER_INFO("supplierInfo", "合格供方名录", "合格供方名录"),
+    CUSTOMER_INFO("customerInfo", "委托方名录", "委托方名录"),
+    CUSTOMER_SUGGEST_FORM("customerSuggestForm", "委托方意见登记表", "委托方意见登记表"),
+    SEAL_NOTE("sealNote", "印章使用登记", "印章使用登记"),
 
-    FILE_EXPORT("meterFileData", "meterFileData", "计量文件信息"),
-    TRAIN_PLAN_EXPORT("trainPlanData", "trainPlanData", "培训计划"),
-    TRAIN_LOG_EXPORT("trainLogData", "trainLogData", "培训记录"),
-    METER_ORGANIZE_EXPORT("meterOrganizeData", "meterOrganizeData", "计量组织"),
-    TRACE_SUPPLIER_EXPORT("traceSupplierData", "traceSupplierData", "溯源供方"),
-    SIGN_EXPORT("signData", "signData", "签名/签章"),
-    TEMPLATE_EXPORT("templateData", "templateData", "原始记录模板/证书报告模板"),
-    FIXED_ASSETS("meterFixedAssets", "meterFixedAssets", "固定资产"),
-    METER_EQUIPMENT("meterEquipment", "meterEquipment", "测量设备"),
-    CALIBRATION_TEST_EQUIPMENT("calibrationTestEquipment", "calibrationTestEquipment", "校准检定设备"),
-    MEASURE_ACCOUNT("measureAccount", "measureAccount", "测量工装"),
-    STANDARD_SUPPORT_EQUIPMENT("standardSupportEquipment", "standardSupportEquipment", "标准配套设备"),
-    STANDARD_EQUIPMENT("standardEquipment", "standardEquipment", "标准装置"),
-    FLOW_DEF_EXPORT("flowDefData", "flowDefData", "流程定义"),
-    STAFF_CERTIFICATE("certificate", "certificate", "计量人员证书"),
-    CHECK_INFO("checkInfo", "checkInfo", "设备管理点检测"),
-    EQUIPMENT_APPLY("equipmentApply", "equipmentApply", "设备借用"),
-    STANDARD_EQUIPMENT_REMIND("equipmentApplyRemind", "equipmentApplyRemind", "标准装置到期提醒"),
-    METER_PRICE("meterPrice", "meterPrice", "价格库"),
-    METER_STAFF("meterStaff", "meterStaff", "计量人员"),
-    STANDARD_EQUIPMENT_APPLY("standardEquipmentApply", "standardEquipmentApply", "标准装置申请"),
-    STATE_MANAGE_APPLY("stateManage", "stateManage", "状态管理"),
-    METER_ACCEPTANCE_CHECK("acceptanceCheck", "acceptanceCheck", "设备检修保养验收单"),
-    CUSTOMER_EXPORT("customerData", "customerData", "客户信息"),
-    ORDER_EXPORT("orderData", "orderData", "委托书信息"),
-    SAMPLE_EXPORT("sampleData", "sampleData", "样本信息"),
-    EXCHANGE_DATA("exchangeData", "exchangeData", "设备交接单"),
-    DISPATCH_DATA("dispatchData", "dispatchData", "设备收发"),
-    ENVIRONMENT_DATA("environmentData", "environmentData", "环境记录单"),
-    ORIGIN_DATA("originData", "originData", "原始记录"),
-    CERTIFICATE_REPORT("certificateReport", "certificateReport", "证书报告"),
-    ADVICE_EXPORT("adviceData", "adviceData", "客户反馈"),
-    HANDOUT_EXPORT("handoutData", "handoutData", "任务分发列表"),
-    OUTSOURCER_EXPORT("outsourcerData", "outsourcerData", "分包方"),
-    SITE_EXECUTIVE_EXPORT("siteExecutiveData", "siteExecutiveData", "现场测试、校准或检定"),
-    CERTIFICATE_PRINT_EXPORT("certificatePrintData", "certificatePrintData", "证书打印"),
-    DOWNLOAD_TEMPLATE("downloadTemplate", "downloadTemplate", "页面配置"),
-    OUTSOURCER_CERTIFICATE_EXPORT("outsourceCertificateData", "outsourceCertificateData", "分包证书"),
-    SETTLEMENT_INFO_EXPORT("settlementInfoData", "settlementInfoData", "业务结算"),
-    EQUIPMENT_REMIND("equipmentRemind", "equipmentRemind", "设备到期提醒"),
-    AGREEMENT_INFO_EXPORT("agreementInfoData", "agreementInfoData", "合同"),
-    WORK_STATISTICS_EXPORT("workStatisticsData", "workStatisticsData", "实时工作统计"),
-    DEPT_OUTPUT_EXPORT("deptOutputData", "deptOutputData", "部门产值分析"),
-    WORKLOAD_EXPORT("workloadData", "workloadData", "业务工作量分析"),
-    DEPT_COMPREHENSIVE_EXPORT("deptComprehensiveData", "deptComprehensiveData", "部门综合分析"),
-    ENVIRONMENTAL_RECORD("environmentalRecordData", "environmentalRecordData", "现场环境记录");
+    /**
+     * 计量检定业务
+     */
+    OUTSOURCER_EXPORT("outsourcerData", "分包方名录", "分包方名录"),
+    IDENTIFY_EXPORT("identifyData", "计量标识", "计量标识"),
+    ORDER_EXPORT("orderData", "任务单", "任务单"),
+    DISPATCH_DATA("dispatchData", "设备收发", "设备收发"),
+    HANDOUT_EXPORT("handoutData", "任务分发", "任务分发"),
+    SITE_EXECUTIVE_EXPORT("siteExecutiveData", "现场测试、校准或检定", "现场测试、校准或检定"),
+    CERTIFICATE_REPORT("certificateReport", "证书审批", "证书审批"),
+    CERTIFICATE_CHANGE_APPLY("certificateChangeApply", "证书报告补充或更换申请单", "证书报告补充或更换申请单"),
+    CERTIFICATE_PRINT("certificatePrintData", "证书打印审批", "证书打印审批"),
+    DEPT_EXECUTIVE_TASK("deptExecutiveTaskData", "实验室任务", "实验室任务"),
+    MY_EXECUTIVE_TASK("myExecutiveTaskData", "我的任务", "我的任务"),
+    OUTSOURCE_ASSESS("outsourceAssess", "测试、校准或检定工作分包评审表", "测试、校准或检定工作分包评审表"),
+    OUTSOURCE_PROTOCOL("outsourceProtocol", "测试、校准或检定工作分包协议书", "测试、校准或检定工作分包协议书"),
+
+    /**
+     * 系统管理
+     */
+    SIGN_EXPORT("signData", "签名", "签名"),
+    TEMPLATE_EXPORT("templateData", "文件模板", "文件模板"),
+    FLOW_DEF_EXPORT("flowDefData", "流程定义", "流程定义"),
+    DOWNLOAD_TEMPLATE("downloadTemplate", "流程定义", "页面配置");
 
     ExportEnum(String fileName, String sheetName, String description) {
         this.fileName = fileName;
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateRecordTypeCodeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateRecordTypeCodeEnum.java
index 31d913c..a963522 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateRecordTypeCodeEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateRecordTypeCodeEnum.java
@@ -46,4 +46,14 @@
     String SITE_EXECUTIVE_APPROVAL = "01";
     //《现场测试、校准或检定工作记录表》
     String SITE_EXECUTIVE_LOG = "02";
+
+    //测试、校准或检定工作分包协议书
+    String OUTSOURCE_PROTOCOL = "01";
+    //测试、校准或检定工作分包评审表
+    String OUTSOURCE_ACCESS = "02";
+    //测试、校准或检定工作分包通知书
+    String OUTSOURCE_NOTICE = "03";
+    //测试、校准或检定工作分包方名录
+    String OUTSOURCE_INFO = "04";
+
 }
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
index 24b8635..f78bd53 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
@@ -15,6 +15,10 @@
     String CERTIFICATE_CHANGE_APPLY_BEAN_NAME = "certificateChangeApplyBean";
     //现场测试、校准或检定
     String SITE_EXECUTIVE_BEAN_NAME = "siteExecutiveBean";
+    //测试、校准或检定工作分包评审表
+    String OUTSOURCE_ASSESS_BEAN_NAME = "outsourceAssessBean";
+    //测试、校准或检定工作分包协议书
+    String OUTSOURCE_PROTOCOL_BEAN_NAME = "outsourceProtocolBean";
 
     /*********************************设备与装置************************************/
     //设备台账
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 b21c661..6b86fd1 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
@@ -18,6 +18,8 @@
     OUTSOURCER_APPROVAL(OUTSOURCER_BEAN_NAME, ""),
     CERTIFICATE_CHANGE_APPROVAL(CERTIFICATE_CHANGE_APPLY_BEAN_NAME, ""),
     SITE_EXECUTIVE_APPROVAL(SITE_EXECUTIVE_BEAN_NAME, ""),
+    OUTSOURCE_ASSESS_APPROVAL(OUTSOURCE_ASSESS_BEAN_NAME, ""),
+    OUTSOURCE_PROTOCOL_APPROVAL(OUTSOURCE_PROTOCOL_BEAN_NAME, ""),
 
     ACTION_STATUS_MAP(new HashMap<String, AwareActionStatusEnum>() {
         {
@@ -47,6 +49,10 @@
             put(ApplyFromIdEnum.CERTIFICATE_CHANGE_APPROVAL.getCode(), CERTIFICATE_CHANGE_APPROVAL);
             //现场测试、校准或检定审批
             put(ApplyFromIdEnum.SITE_EXECUTIVE_APPROVAL.getCode(), SITE_EXECUTIVE_APPROVAL);
+            //测试、校准或检定工作分包评审表
+            put(ApplyFromIdEnum.OUTSOURCE_ASSESS_APPROVAL.getCode(), OUTSOURCE_ASSESS_APPROVAL);
+            //测试、校准或检定工作分包协议书
+            put(ApplyFromIdEnum.OUTSOURCE_PROTOCOL_APPROVAL.getCode(), OUTSOURCE_PROTOCOL_APPROVAL);
         }
     });
     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 934405e..c7410bd 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
@@ -9,6 +9,8 @@
     CERTIFICATE_CHANGE_APPROVAL("jljdywzsbchghsqd", MessageSourceModuleEnum.BUSINESS.getCode(), "证书/报告补充或更换申请单"),
     OUTSOURCER_APPROVAL("jljdywcsjzhgfbfml", MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定合格分包方名录"),
     SITE_EXECUTIVE_APPROVAL("jljdywxccsjzsp", MessageSourceModuleEnum.BUSINESS.getCode(), "现场测试、校准或检定审批"),
+    OUTSOURCE_ASSESS_APPROVAL("jljdywcsjzfbpsb", MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包评审表"),
+    OUTSOURCE_PROTOCOL_APPROVAL("jljdywcsjzfbxys", MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包协议书"),
 
 
     /*******************************************设备与装置*********************************************/
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/GeneralApprovalMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/GeneralApprovalMapper.java
index 4fb7344..0c9d6ae 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/GeneralApprovalMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/GeneralApprovalMapper.java
@@ -17,8 +17,4 @@
 
     Page<O> selectBatchForApprovalList(Page<O> page, @Param("request") R request, @Param("businessKeys") List<String> businessKeys);
 
-//    Page<O> selectListPage(Page<O> page, @Param("request") R request);
-
-//    Long selectMaxNo();
-
 }
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceAssessMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceAssessMapper.java
index 7867bb8..ba59009 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceAssessMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceAssessMapper.java
@@ -1,7 +1,12 @@
 package com.casic.missiles.mapper.business;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.business.outsource.OutsourceAssessApprovalListRequest;
+import com.casic.missiles.mapper.GeneralApprovalMapper;
 import com.casic.missiles.model.business.BizBusinessOutsourceAssess;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * <p>
@@ -11,6 +16,10 @@
  * @author wangpeng
  * @since 2023-08-16
  */
-public interface BizBusinessOutsourceAssessMapper extends BaseMapper<BizBusinessOutsourceAssess> {
+public interface BizBusinessOutsourceAssessMapper extends GeneralApprovalMapper<BizBusinessOutsourceAssess, BizBusinessOutsourceAssess, OutsourceAssessApprovalListRequest> {
+
+    Page<BizBusinessOutsourceAssess> selectBatchForApprovalList(Page<BizBusinessOutsourceAssess> page, @Param("request") OutsourceAssessApprovalListRequest request, @Param("businessKeys") List<String> businessKeys);
+
+    Long selectMaxProjectNo();
 
 }
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceProtocolMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceProtocolMapper.java
new file mode 100644
index 0000000..e6aba35
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceProtocolMapper.java
@@ -0,0 +1,24 @@
+package com.casic.missiles.mapper.business;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.business.outsource.OutsourceProtocolApprovalListRequest;
+import com.casic.missiles.mapper.GeneralApprovalMapper;
+import com.casic.missiles.model.business.BizBusinessOutsourceProtocol;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 计量检定业务-分包管理-测试、校准或检定工作分包协议书 Mapper 接口
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-08-24
+ */
+public interface BizBusinessOutsourceProtocolMapper extends GeneralApprovalMapper<BizBusinessOutsourceProtocol, BizBusinessOutsourceProtocol, OutsourceProtocolApprovalListRequest> {
+
+    Page<BizBusinessOutsourceProtocol> selectBatchForApprovalList(Page<BizBusinessOutsourceProtocol> page, @Param("request") OutsourceProtocolApprovalListRequest request, @Param("businessKeys") List<String> businessKeys);
+
+    Long selectMaxProtocolNo();
+}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/EnvLocationInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/EnvLocationInfoMapper.java
new file mode 100644
index 0000000..49eff87
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/EnvLocationInfoMapper.java
@@ -0,0 +1,21 @@
+package com.casic.missiles.mapper.resource;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.resource.environment.LocationListRequest;
+import com.casic.missiles.dto.resource.environment.LocationListResponse;
+import com.casic.missiles.model.resource.EnvLocationInfo;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * <p>
+ * 实验室环境监控系统-设备表 Mapper 接口
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-06-07
+ */
+public interface EnvLocationInfoMapper extends BaseMapper<EnvLocationInfo> {
+
+    Page<LocationListResponse> selectLocationListPage(Page<LocationListResponse> page, @Param("request") LocationListRequest request);
+}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java
index de124db..85ed0f7 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java
@@ -1,7 +1,9 @@
 package com.casic.missiles.mapper.system;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.dto.system.SignDetailResponse;
+import com.casic.missiles.dto.system.SignListRequest;
 import com.casic.missiles.model.system.SystemSign;
 import org.apache.ibatis.annotations.Param;
 
@@ -22,4 +24,8 @@
     SignDetailResponse selectSignDetailById(Long id);
 
     List<SystemSign> selectUsableSignList(@Param("userId") Long userId);
+
+    Page<SystemSign> selectSignListPage(Page<SystemSign> page, @Param("request") SignListRequest request);
+
+    List<SystemSign> selectSignList(@Param("request") SignListRequest request);
 }
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateChangeApplyMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateChangeApplyMapper.xml
index d798447..c496092 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateChangeApplyMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateChangeApplyMapper.xml
@@ -30,31 +30,31 @@
         SELECT *
         FROM biz_business_certificate_change_apply
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.changeApplyNo != null and request.changeApplyNo !=''">
+        <if test="request != null and request.changeApplyNo != null and request.changeApplyNo !=''">
             and change_apply_no like concat('%',#{request.changeApplyNo},'%')
         </if>
-        <if test="request.changeReportNo != null and request.changeReportNo !=''">
+        <if test="request != null and request.changeReportNo != null and request.changeReportNo !=''">
             and change_report_no like concat('%',#{request.changeReportNo},'%')
         </if>
-        <if test="request.changeReportName != null and request.changeReportName !=''">
+        <if test="request != null and request.changeReportName != null and request.changeReportName !=''">
             and change_report_name like concat('%',#{request.changeReportName},'%')
         </if>
-        <if test="request.changeType != null and request.changeType !=''">
+        <if test="request != null and request.changeType != null and request.changeType !=''">
             and change_type = #{request.changeType}
         </if>
-        <if test="request.createUserName != null and request.createUserName !=''">
+        <if test="request != null and request.createUserName != null and request.createUserName !=''">
             and create_user_name like concat('%',#{request.createUserName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificatePrintMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificatePrintMapper.xml
index b66cd99..49c0ac8 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificatePrintMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificatePrintMapper.xml
@@ -31,34 +31,34 @@
         LEFT JOIN biz_business_order_sample_relation bosr ON (bosr.order_id = bcr.order_id AND bosr.sample_id = bcr.sample_id)
         LEFT JOIN biz_business_order_info boi ON boi.id = bosr.order_id
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and bcp.approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.printStatus != null and request.printStatus !=''">
+        <if test="request != null and request.printStatus != null and request.printStatus !=''">
             and print_status = #{request.printStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and bcp.create_user_id = #{request.createUserId}
         </if>
-        <if test="request.certificateReportNo != null and request.certificateReportNo !=''">
+        <if test="request != null and request.certificateReportNo != null and request.certificateReportNo !=''">
             and bcr.certificate_report_no like concat('%',#{request.certificateReportNo},'%')
         </if>
-        <if test="request.certificateReportName != null and request.certificateReportName !=''">
+        <if test="request != null and request.certificateReportName != null and request.certificateReportName !=''">
             and bcr.certificate_report_name like concat('%',#{request.certificateReportName},'%')
         </if>
-        <if test="request.customerName != null and request.customerName !=''">
+        <if test="request != null and request.customerName != null and request.customerName !=''">
             and boi.customer_name like concat('%',#{request.customerName},'%')
         </if>
-        <if test="request.sampleNo != null and request.sampleNo !=''">
+        <if test="request != null and request.sampleNo != null and request.sampleNo !=''">
             and bosr.sample_no like concat('%',#{request.sampleNo},'%')
         </if>
-        <if test="request.sampleName != null and request.sampleName !=''">
+        <if test="request != null and request.sampleName != null and request.sampleName !=''">
             and bosr.sample_name like concat('%',#{request.sampleName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and bcp.create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and bcp.create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml
index b366034..767695d 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml
@@ -46,33 +46,37 @@
         SELECT bcr.*, bosr.sample_no, bosr.sample_name, bosr.sample_model, rsi.staff_name
         FROM biz_business_certificate_report bcr
         LEFT JOIN biz_business_order_sample_relation bosr ON (bosr.order_id = bcr.order_id AND bosr.sample_id = bcr.sample_id)
+        LEFT JOIN biz_business_order_info boi ON boi.id = bcr.order_id
         LEFT JOIN biz_resource_staff_info rsi ON rsi.id = bcr.measure_person_id
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and bcr.approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and bcr.create_user_id = #{request.createUserId}
         </if>
-        <if test="request.certificateReportNo != null and request.certificateReportNo !=''">
+        <if test="request != null and request.customerId != null and request.customerId !=''">
+            and boi.customer_id = #{request.customerId}
+        </if>
+        <if test="request != null and request.certificateReportNo != null and request.certificateReportNo !=''">
             and bcr.certificate_report_no like concat('%',#{request.certificateReportNo},'%')
         </if>
-        <if test="request.certificateReportName != null and request.certificateReportName !=''">
+        <if test="request != null and request.certificateReportName != null and request.certificateReportName !=''">
             and bcr.certificate_report_name like concat('%',#{request.certificateReportName},'%')
         </if>
-        <if test="request.sampleNo != null and request.sampleNo !=''">
+        <if test="request != null and request.sampleNo != null and request.sampleNo !=''">
             and bosr.sample_no like concat('%',#{request.sampleNo},'%')
         </if>
-        <if test="request.measureCategory != null and request.measureCategory !=''">
+        <if test="request != null and request.measureCategory != null and request.measureCategory !=''">
             and bcr.measure_category = #{request.measureCategory}
         </if>
-        <if test="request.measurePerson != null and request.measurePerson !=''">
+        <if test="request != null and request.measurePerson != null and request.measurePerson !=''">
             and rsi.staff_name like concat('%',#{request.measurePerson},'%')
         </if>
-        <if test="request.calibrationTimeStart != null and request.calibrationTimeStart !=''">
+        <if test="request != null and request.calibrationTimeStart != null and request.calibrationTimeStart !=''">
             and bcr.calibration_time &gt;= #{request.calibrationTimeStart}
         </if>
-        <if test="request.calibrationTimeEnd != null and request.calibrationTimeEnd !=''">
+        <if test="request != null and request.calibrationTimeEnd != null and request.calibrationTimeEnd !=''">
             and bcr.calibration_time &lt;= #{request.calibrationTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceAssessMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceAssessMapper.xml
index d0fcf8b..c22c101 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceAssessMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceAssessMapper.xml
@@ -7,6 +7,8 @@
         <id column="id" property="id" />
         <result column="project_no" property="projectNo" />
         <result column="project_name" property="projectName" />
+        <result column="lab_code" property="labCode" />
+        <result column="group_code" property="groupCode" />
         <result column="applicant_id" property="applicantId" />
         <result column="applicant_name" property="applicantName" />
         <result column="applicant_time" property="applicantTime" />
@@ -31,7 +33,45 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, project_no, project_name, applicant_id, applicant_name, applicant_time, minio_file_name, remark, create_user_id, create_user_name, outsourcer_id, pre_start_time, pre_end_time, outsource_reason, pre_cost, approval_status, process_id, approve_situation, traceability, test_method, technique_ability, create_time, update_time
+        id, project_no, project_name, lab_code, group_code, applicant_id, applicant_name, applicant_time, minio_file_name, remark, create_user_id, create_user_name, outsourcer_id, pre_start_time, pre_end_time, outsource_reason, pre_cost, approval_status, process_id, approve_situation, traceability, test_method, technique_ability, create_time, update_time
     </sql>
 
+    <select id="selectMaxProjectNo" resultType="java.lang.Long">
+        SELECT IFNULL(max(RIGHT(project_no, 3)), 0) from biz_business_outsource_assess
+    </select>
+
+    <select id="selectBatchForApprovalList" resultMap="BaseResultMap">
+        SELECT bboa.*, bboi.outsourcer_name, bboi.director
+        FROM biz_business_outsource_assess bboa
+        LEFT JOIN biz_business_outsourcer_info bboi ON bboa.outsourcer_id = bboi.id
+        WHERE 1=1
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
+            and bboa.approval_status = #{request.approvalStatus}
+        </if>
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
+            and bboa.create_user_id = #{request.createUserId}
+        </if>
+        <if test="request != null and request.projectNo != null and request.projectNo !=''">
+            and bboa.project_no like concat('%',#{request.projectNo},'%')
+        </if>
+        <if test="request != null and request.outsourcerName != null and request.outsourcerName !=''">
+            and bboi.outsourcer_name like concat('%',#{request.outsourcerName},'%')
+        </if>
+        <if test="request != null and request.applicantName != null and request.applicantName !=''">
+            and bboa.applicant_name like concat('%',#{request.applicantName},'%')
+        </if>
+        <if test="request != null and request.applicantTimeStart != null and request.applicantTimeStart !=''">
+            and bboa.applicant_time &gt;= #{request.applicantTimeStart}
+        </if>
+        <if test="request != null and request.applicantTimeEnd != null and request.applicantTimeEnd !=''">
+            and bboa.applicant_time &lt;= #{request.applicantTimeEnd}
+        </if>
+        <if test="businessKeys != null">
+            and bboa.id in
+            <foreach collection="businessKeys" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
+        ORDER BY bboa.create_time DESC
+    </select>
 </mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceProtocolMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceProtocolMapper.xml
new file mode 100644
index 0000000..b7b2149
--- /dev/null
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceProtocolMapper.xml
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.mapper.business.BizBusinessOutsourceProtocolMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.business.BizBusinessOutsourceProtocol">
+        <id column="id" property="id" />
+        <result column="protocol_no" property="protocolNo" />
+        <result column="project_name" property="projectName" />
+        <result column="lab_code" property="labCode" />
+        <result column="group_code" property="groupCode" />
+        <result column="outsourcer_id" property="outsourcerId" />
+        <result column="remark" property="remark" />
+        <result column="outsource_no" property="outsourceNo" />
+        <result column="outsource_name" property="outsourceName" />
+        <result column="contacts" property="contacts" />
+        <result column="mobile" property="mobile" />
+        <result column="address" property="address" />
+        <result column="require_date" property="requireDate" />
+        <result column="outsource_cost" property="outsourceCost" />
+        <result column="director" property="director" />
+        <result column="item" property="item" />
+        <result column="requires" property="requires" />
+        <result column="create_user_id" property="createUserId" />
+        <result column="create_user_name" property="createUserName" />
+        <result column="approval_status" property="approvalStatus" />
+        <result column="process_id" property="processId" />
+        <result column="create_time" property="createTime" />
+        <result column="update_time" property="updateTime" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, protocol_no, project_name, lab_code, group_code, outsourcer_id, remark, outsource_no, outsource_name, contacts, mobile, address, require_date, outsource_cost, director, item, requires, create_user_id, create_user_name, approval_status, process_id, create_time, update_time
+    </sql>
+
+    <select id="selectMaxProtocolNo" resultType="java.lang.Long">
+        SELECT IFNULL(max(RIGHT(protocol_no, 3)), 0) from biz_business_outsource_protocol
+    </select>
+
+    <select id="selectBatchForApprovalList" resultMap="BaseResultMap">
+        SELECT *
+        FROM biz_business_outsource_protocol
+        WHERE 1=1
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
+            and approval_status = #{request.approvalStatus}
+        </if>
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
+            and create_user_id = #{request.createUserId}
+        </if>
+        <if test="request != null and request.protocolNo != null and request.protocolNo !=''">
+            and protocol_no like concat('%',#{request.protocolNo},'%')
+        </if>
+        <if test="request != null and request.outsourcerName != null and request.outsourcerName !=''">
+            and outsourcer_name like concat('%',#{request.outsourcerName},'%')
+        </if>
+        <if test="request != null and request.applicantName != null and request.applicantName !=''">
+            and create_user_name like concat('%',#{request.applicantName},'%')
+        </if>
+        <if test="request != null and request.applicantTimeStart != null and request.applicantTimeStart !=''">
+            and create_time &gt;= #{request.applicantTimeStart}
+        </if>
+        <if test="request != null and request.applicantTimeEnd != null and request.applicantTimeEnd !=''">
+            and create_time &lt;= #{request.applicantTimeEnd}
+        </if>
+        <if test="businessKeys != null">
+            and id in
+            <foreach collection="businessKeys" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
+        ORDER BY create_time DESC
+    </select>
+</mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourcerInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourcerInfoMapper.xml
index 510a80b..3049b54 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourcerInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourcerInfoMapper.xml
@@ -7,6 +7,8 @@
         <id column="id" property="id" />
         <result column="outsourcer_no" property="outsourcerNo" />
         <result column="outsourcer_name" property="outsourcerName" />
+        <result column="lab_code" property="labCode" />
+        <result column="group_code" property="groupCode" />
         <result column="outsourcer_brief_name" property="outsourcerBriefName" />
         <result column="outsourcer_size" property="outsourcerSize" />
         <result column="business_size" property="businessSize" />
@@ -55,32 +57,32 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, outsourcer_no, outsourcer_name, outsourcer_brief_name, outsourcer_size, business_size, grade, evaluation, tax_number, bank_account, bank_name, bank_account_number, postal_code, director, phone, fax, mobile, email, website, address_country, address_province, address_city, address_area, full_address, address_country_name, address_province_name, address_city_name, address_area_name, invoice_country, invoice_province, invoice_city, invoice_area, invoice_full_address, invoice_country_name, invoice_province_name, invoice_city_name, invoice_area_name, business_scope, business_content, minio_file_name, approval_status, process_id, remark, create_user_id, create_user_name, create_time, update_time
+        id, outsourcer_no, outsourcer_name, lab_code, group_code, outsourcer_brief_name, outsourcer_size, business_size, grade, evaluation, tax_number, bank_account, bank_name, bank_account_number, postal_code, director, phone, fax, mobile, email, website, address_country, address_province, address_city, address_area, full_address, address_country_name, address_province_name, address_city_name, address_area_name, invoice_country, invoice_province, invoice_city, invoice_area, invoice_full_address, invoice_country_name, invoice_province_name, invoice_city_name, invoice_area_name, business_scope, business_content, minio_file_name, approval_status, process_id, remark, create_user_id, create_user_name, create_time, update_time
     </sql>
 
     <select id="selectBatchForApprovalList" resultMap="BaseResultMap">
         SELECT *
         FROM biz_business_outsourcer_info
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.outsourcerNo != null and request.outsourcerNo !=''">
+        <if test="request != null and request.outsourcerNo != null and request.outsourcerNo !=''">
             and outsourcer_no like concat('%',#{request.outsourcerNo},'%')
         </if>
-        <if test="request.outsourcerName != null and request.outsourcerName !=''">
+        <if test="request != null and request.outsourcerName != null and request.outsourcerName !=''">
             and outsourcer_name like concat('%',#{request.outsourcerName},'%')
         </if>
-        <if test="request.director != null and request.director !=''">
+        <if test="request != null and request.director != null and request.director !=''">
             and director like concat('%',#{request.director},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
@@ -93,6 +95,6 @@
     </select>
 
     <select id="selectMaxNo" resultType="java.lang.Long">
-        SELECT IFNULL(max(RIGHT(outsourcer_no, 12)), 0) from biz_business_outsourcer_info
+        SELECT IFNULL(max(RIGHT(outsourcer_no, 3)), 0) from biz_business_outsourcer_info
     </select>
 </mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessSiteExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessSiteExecutiveInfoMapper.xml
index 135c5d0..3c5ae79 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessSiteExecutiveInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessSiteExecutiveInfoMapper.xml
@@ -38,25 +38,25 @@
         FROM biz_business_site_executive_info bsei
         LEFT JOIN biz_resource_customer_info rci ON bsei.customer_id = rci.id
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and bsei.approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and bsei.create_user_id = #{request.createUserId}
         </if>
-        <if test="request.siteExecutiveNo != null and request.siteExecutiveNo !=''">
+        <if test="request != null and request.siteExecutiveNo != null and request.siteExecutiveNo !=''">
             and bsei.site_executive_no like concat('%',#{request.siteExecutiveNo},'%')
         </if>
-        <if test="request.customerName != null and request.customerName !=''">
+        <if test="request != null and request.customerName != null and request.customerName !=''">
             and rci.outsourcer_name like concat('%',#{request.customerName},'%')
         </if>
-        <if test="request.applyName != null and request.applyName !=''">
+        <if test="request != null and request.applyName != null and request.applyName !=''">
             and bsei.apply_name like concat('%',#{request.applyName},'%')
         </if>
-        <if test="request.applyTimeStart != null and request.applyTimeStart !=''">
+        <if test="request != null and request.applyTimeStart != null and request.applyTimeStart !=''">
             and bsei.apply_time &gt;= #{request.applyTimeStart}
         </if>
-        <if test="request.applyTimeEnd != null and request.applyTimeEnd !=''">
+        <if test="request != null and request.applyTimeEnd != null and request.applyTimeEnd !=''">
             and bsei.apply_time &lt;= #{request.applyTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml
index 84d9e2a..6bd38a9 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml
@@ -105,6 +105,12 @@
         <if test="request.isUrgent != null and request.isUrgent !=''">
             AND bo.is_urgent = #{request.isUrgent}
         </if>
+        <if test="request.ids != null">
+            and blei.id in
+            <foreach collection="request.ids" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
         ORDER BY blei.update_time DESC
     </select>
 
@@ -137,6 +143,12 @@
         <if test="request.isUrgent != null and request.isUrgent !=''">
             AND bo.is_urgent = #{request.isUrgent}
         </if>
+        <if test="request.ids != null">
+            and blei.id in
+            <foreach collection="request.ids" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
         ORDER BY blei.update_time DESC
     </select>
 
diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardInfoMapper.xml
index 1a5551b..2ed8d17 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardInfoMapper.xml
@@ -45,12 +45,6 @@
         FROM biz_equipment_standard_info besi
         LEFT JOIN biz_equipment_standard_technology_relation bestr ON besi.standard_no = bestr.standard_no
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
-            and besi.approval_status = #{request.approvalStatus}
-        </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
-            and besi.create_user_id = #{request.createUserId}
-        </if>
         <if test="request.standardName != null and request.standardName !=''">
             and besi.standard_name like concat('%',#{request.standardName},'%')
         </if>
diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardTechnologyRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardTechnologyRelationMapper.xml
index fc7e16c..cd03c8c 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardTechnologyRelationMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardTechnologyRelationMapper.xml
@@ -6,6 +6,7 @@
     <resultMap id="BaseResultMap" type="com.casic.missiles.model.equipment.BizEquipmentStandardTechnologyRelation">
         <id column="id" property="id" />
         <result column="technology_file_id" property="technologyFileId" />
+        <result column="technology_file_no" property="technologyFileNo" />
         <result column="technology_file_name" property="technologyFileName" />
         <result column="standard_id" property="standardId" />
         <result column="standard_no" property="standardNo" />
@@ -14,7 +15,7 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, technology_file_id, technology_file_name, standard_id, remark
+        id, technology_file_id, technology_file_no, technology_file_name, standard_id, remark
     </sql>
 
 </mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceAuthorizeOrderMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceAuthorizeOrderMapper.xml
index ac5176c..554fe65 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceAuthorizeOrderMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceAuthorizeOrderMapper.xml
@@ -32,22 +32,22 @@
         SELECT *
         FROM biz_resource_authorize_order
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.orderNo != null and request.orderNo !=''">
+        <if test="request != null and request.orderNo != null and request.orderNo !=''">
             and order_no like concat('%',#{request.orderNo},'%')
         </if>
-        <if test="request.createUserName != null and request.createUserName !=''">
+        <if test="request != null and request.createUserName != null and request.createUserName !=''">
             and create_user_name like concat('%',#{request.createUserName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerExamineFormMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerExamineFormMapper.xml
index ab242f6..af7f98f 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerExamineFormMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerExamineFormMapper.xml
@@ -41,28 +41,28 @@
         SELECT *
         FROM biz_resource_customer_examine_form
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.formNo != null and request.formNo !=''">
+        <if test="request != null and request.formNo != null and request.formNo !=''">
             and form_no like concat('%',#{request.formNo},'%')
         </if>
-        <if test="request.labCode != null and request.labCode !=''">
+        <if test="request != null and request.labCode != null and request.labCode !=''">
             and lab_code like concat('%',#{request.labCode},'%')
         </if>
-        <if test="request.groupCode != null and request.groupCode !=''">
+        <if test="request != null and request.groupCode != null and request.groupCode !=''">
             and group_code like concat('%',#{request.groupCode},'%')
         </if>
-        <if test="request.createUserName != null and request.createUserName !=''">
+        <if test="request != null and request.createUserName != null and request.createUserName !=''">
             and create_user_name like concat('%',#{request.createUserName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerInfoMapper.xml
index fa8ffbc..06a2798 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerInfoMapper.xml
@@ -33,25 +33,25 @@
         SELECT *
         FROM biz_resource_customer_info
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.customerNo != null and request.customerNo !=''">
+        <if test="request != null and request.customerNo != null and request.customerNo !=''">
             and customer_no like concat('%',#{request.customerNo},'%')
         </if>
-        <if test="request.customerName != null and request.customerName !=''">
+        <if test="request != null and request.customerName != null and request.customerName !=''">
             and customer_name like concat('%',#{request.customerName},'%')
         </if>
-        <if test="request.contacts != null and request.contacts !=''">
+        <if test="request != null and request.contacts != null and request.contacts !=''">
             and contacts like concat('%',#{request.contacts},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerSuggestFormMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerSuggestFormMapper.xml
index 28f5bb2..1806662 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerSuggestFormMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerSuggestFormMapper.xml
@@ -33,28 +33,28 @@
         SELECT *
         FROM biz_resource_customer_suggest_form
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.formNo != null and request.formNo !=''">
+        <if test="request != null and request.formNo != null and request.formNo !=''">
             and form_no like concat('%',#{request.formNo},'%')
         </if>
-        <if test="request.customerName != null and request.customerName !=''">
+        <if test="request != null and request.customerName != null and request.customerName !=''">
             and customer_name like concat('%',#{request.customerName},'%')
         </if>
-        <if test="request.customerDeptName != null and request.customerDeptName !=''">
+        <if test="request != null and request.customerDeptName != null and request.customerDeptName !=''">
             and customer_dept_name like concat('%',#{request.customerDeptName},'%')
         </if>
-        <if test="request.createUserName != null and request.createUserName !=''">
+        <if test="request != null and request.createUserName != null and request.createUserName !=''">
             and create_user_name like concat('%',#{request.createUserName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSealUseNoteMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSealUseNoteMapper.xml
index ab37bc1..b02bb33 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSealUseNoteMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSealUseNoteMapper.xml
@@ -29,32 +29,32 @@
     </sql>
 
     <select id="selectBatchForApprovalList" resultMap="BaseResultMap">
-        SELECT *
+        SELECT brsun.*, brsi.seal_name, brsi.seal_type, brsi.approver_name
         FROM biz_resource_seal_use_note brsun
         JOIN biz_resource_seal_info brsi ON brsun.seal_id = brsi.id
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and brsun.approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and brsun.create_user_id = #{request.createUserId}
         </if>
-        <if test="request.sealName != null and request.sealName !=''">
+        <if test="request != null and request.sealName != null and request.sealName !=''">
             and brsi.seal_name like concat('%',#{request.sealName},'%')
         </if>
-        <if test="request.sealType != null and request.sealType !=''">
+        <if test="request != null and request.sealType != null and request.sealType !=''">
             and brsi.seal_type = #{request.sealType}
         </if>
-        <if test="request.applyDeptName != null and request.applyDeptName !=''">
+        <if test="request != null and request.applyDeptName != null and request.applyDeptName !=''">
             and brsun.apply_dept_name like concat('%',#{request.applyDeptName},'%')
         </if>
-        <if test="request.applyUserName != null and request.applyUserName !=''">
+        <if test="request != null and request.applyUserName != null and request.applyUserName !=''">
             and brsun.apply_user_name like concat('%',#{request.applyUserName},'%')
         </if>
-        <if test="request.applyTimeStart != null and request.applyTimeStart !=''">
+        <if test="request != null and request.applyTimeStart != null and request.applyTimeStart !=''">
             and brsun.apply_time &gt;= #{request.applyTimeStart}
         </if>
-        <if test="request.applyTimeEnd != null and request.applyTimeEnd !=''">
+        <if test="request != null and request.applyTimeEnd != null and request.applyTimeEnd !=''">
             and brsun.apply_time &lt;= #{request.applyTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml
index 119bf7d..4f8392a 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml
@@ -31,6 +31,12 @@
         <if test="request.deptName != null and request.deptName !=''">
             and brsi.dept_name like concat('%',#{request.deptName},'%')
         </if>
+        <if test="request.ids != null">
+            and brsv.id in
+            <foreach collection="request.ids" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
         ORDER BY brsv.grant_date DESC
     </select>
 
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSupplierInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSupplierInfoMapper.xml
index fe8d399..e8ce7ef 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSupplierInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSupplierInfoMapper.xml
@@ -48,28 +48,28 @@
         SELECT *
         FROM biz_resource_supplier_info
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.supplierNo != null and request.supplierNo !=''">
+        <if test="request != null and request.supplierNo != null and request.supplierNo !=''">
             and supplier_no like concat('%',#{request.supplierNo},'%')
         </if>
-        <if test="request.supplierName != null and request.supplierName !=''">
+        <if test="request != null and request.supplierName != null and request.supplierName !=''">
             and supplier_name like concat('%',#{request.supplierName},'%')
         </if>
-        <if test="request.director != null and request.director !=''">
+        <if test="request != null and request.director != null and request.director !=''">
             and director like concat('%',#{request.director},'%')
         </if>
-        <if test="request.supplierType != null and request.supplierType !=''">
+        <if test="request != null and request.supplierType != null and request.supplierType !=''">
             and supplier_type = #{request.supplierType}
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/EnvLocationInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/EnvLocationInfoMapper.xml
new file mode 100644
index 0000000..68bcf10
--- /dev/null
+++ b/casic-metering-dao/src/main/resources/mapper/resource/EnvLocationInfoMapper.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.mapper.resource.EnvLocationInfoMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.resource.EnvLocationInfo">
+        <id column="id" property="id" />
+        <result column="location_no" property="locationNo" />
+        <result column="location_name" property="locationName" />
+        <result column="location_position" property="locationPosition" />
+        <result column="create_user_id" property="createUserId" />
+        <result column="create_user" property="createUser" />
+        <result column="create_time" property="createTime" />
+        <result column="update_time" property="updateTime" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, location_no, location_name, location_position, create_user_id, create_user, create_time, update_time
+    </sql>
+
+    <select id="selectLocationListPage" resultType="com.casic.missiles.dto.resource.environment.LocationListResponse">
+        SELECT *
+        FROM env_location_info
+        WHERE 1=1
+        <if test="request.locationNo != null and request.locationNo !=''">
+            AND location_no LIKE concat('%',#{request.locationNo},'%')
+        </if>
+        <if test="request.locationName != null and request.locationName !=''">
+            AND location_name LIKE concat('%',#{request.locationName},'%')
+        </if>
+        ORDER BY create_time DESC
+    </select>
+
+</mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml
index b28c18f..8854047 100644
--- a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml
@@ -11,7 +11,6 @@
         <result column="sign_desc" property="signDesc" />
         <result column="sign_director" property="signDirector" />
         <result column="sign_user_id" property="signUserId" />
-        <result column="sign_type" property="signType" />
         <result column="minio_file_name" property="minioFileName" />
         <result column="create_time" property="createTime" />
         <result column="update_time" property="updateTime" />
@@ -28,7 +27,6 @@
         <result column="sign_name" property="signName" />
         <result column="sign_desc" property="signDesc" />
         <result column="sign_director" property="signDirector" />
-        <result column="sign_type" property="signType" />
         <result column="sign_user_id" property="signUserId" />
         <result column="minio_file_name" property="minioFileName" />
         <result column="create_time" property="createTime" />
@@ -62,4 +60,58 @@
         JOIN system_sign_user_relation ssur ON ss.id = ssur.sign_id
         WHERE ssur.user_id = #{userId}
     </select>
+
+    <select id="selectSignListPage" resultMap="BaseResultMap">
+        SELECT ss.*, sd.SIMPLE_NAME AS deptName
+        FROM system_sign ss
+        LEFT JOIN sys_user su ON su.id = ss.sign_user_id
+        LEFT JOIN sys_dept sd ON sd.id = su.dept_id
+        WHERE 1=1
+        <if test="request.signNo != null and request.signNo !=''">
+            AND ss.sign_no LIKE concat('%',#{request.signNo},'%')
+        </if>
+        <if test="request.signName != null and request.signName !=''">
+            AND ss.sign_name LIKE concat('%',#{request.signName},'%')
+        </if>
+        <if test="request.signDirector != null and request.signDirector !=''">
+            AND ss.sign_director LIKE concat('%',#{request.signDirector},'%')
+        </if>
+        <if test="request.signUserId != null and request.signUserId !=''">
+            AND ss.sign_user_id = #{request.signUserId}
+        </if>
+        <if test="request.createStartTime != null and request.createStartTime !=''">
+            AND DATE_FORMAT(ss.create_time,'%Y-%m-%d') &gt;= DATE_FORMAT(#{request.createStartTime},'%Y-%m-%d')
+        </if>
+        <if test="request.createEndTime != null and request.createEndTime !=''">
+            AND DATE_FORMAT(ss.create_time,'%Y-%m-%d')  &lt;= DATE_FORMAT(#{request.createEndTime},'%Y-%m-%d')
+        </if>
+        ORDER BY ss.create_time DESC
+    </select>
+
+    <select id="selectSignList" resultMap="BaseResultMap">
+        SELECT ss.*, sd.SIMPLE_NAME AS deptName
+        FROM system_sign ss
+        LEFT JOIN sys_user su ON su.id = ss.sign_user_id
+        LEFT JOIN sys_dept sd ON sd.id = su.dept_id
+        WHERE 1=1
+        <if test="request.signNo != null and request.signNo !=''">
+            AND ss.sign_no LIKE concat('%',#{request.signNo},'%')
+        </if>
+        <if test="request.signName != null and request.signName !=''">
+            AND ss.sign_name LIKE concat('%',#{request.signName},'%')
+        </if>
+        <if test="request.signDirector != null and request.signDirector !=''">
+            AND ss.sign_director LIKE concat('%',#{request.signDirector},'%')
+        </if>
+        <if test="request.signUserId != null and request.signUserId !=''">
+            AND ss.sign_user_id = #{request.signUserId}
+        </if>
+        <if test="request.createStartTime != null and request.createStartTime !=''">
+            AND DATE_FORMAT(ss.create_time,'%Y-%m-%d') &gt;= DATE_FORMAT(#{request.createStartTime},'%Y-%m-%d')
+        </if>
+        <if test="request.createEndTime != null and request.createEndTime !=''">
+            AND DATE_FORMAT(ss.create_time,'%Y-%m-%d')  &lt;= DATE_FORMAT(#{request.createEndTime},'%Y-%m-%d')
+        </if>
+        ORDER BY ss.create_time DESC
+    </select>
 </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 515050a..60f530b 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
@@ -47,8 +47,8 @@
     String STORAGE_LOCATION = "bizStorageLocation";
     //计量专业
     String MEASURE_MAJOR = "bizMeasureMajor";
-    //管理状态
-    String MANAGER_STATE = "bizManagerState";
+    //标准装置管理状态
+    String STANDARD_MANAGER_STATE = "bizStandardManagerState";
 
     /**
      * 资源管理 字典code
@@ -95,8 +95,6 @@
     String MEASURE_STATUS = "measureStatus";
     //检定方式
     String MEASURE_TYPE = "measureType";
-    //标识打印标志类型
-    String IDENTIFY_PRINT_TYPE = "bizBusinessIdentify";
     //变更类型
     String REPORT_CHANGE_TYPE = "bizCertChangeType";
     //规模类型
@@ -111,19 +109,24 @@
     String MEASURE_CATEGORY = "measureCategory";
     //检定结果
     String MEASURE_RESULT = "measureResult";
+    //分包原因
+    String OUTSOURCE_REASON = "outsourceReason";
+
+    /**
+     * 系统管理
+     */
+    String TEMPLATE_TYPE = "templateType";
+
 
     /**
      * 标准装置 字典code
      */
     //类别
     String STANDARD_CATEGORY = "standardCategory";
-    //管理状态
-    String STANDARD_MANAGER_STATE = "standardManagerState";
     //标准等级
     String STANDARD_LEVEL = "standardLevel";
     //传递范围
     String STANDARD_TRANSMIT_RANGE = "transmitRange";
-
     //资本来源
     String CAPITAL_SOURCE = "capitalSource";
     //标准装置-申请类型
@@ -148,8 +151,6 @@
     String CERTIFICATE_CLASS = "certificationClass";
     //证书管理-检校专业
     String CALIBRATION_MAJOR = "calibrationMajor";
-    //分包原因
-    String OUTSOURCE_REASON = "outsourceReason";
 
     /**
      * 工作台
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/BaseApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/BaseApprovalListRequest.java
index 73c12c1..80d7424 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/BaseApprovalListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/BaseApprovalListRequest.java
@@ -6,6 +6,7 @@
 
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotEmpty;
+import java.util.List;
 
 /**
  * @Description:
@@ -19,14 +20,14 @@
      * 表单id
      */
     @NotBlank(message = "表单id不能为空")
-    @ApiModelProperty(value = "表单id（流程定义对应的表单id，等价于业务id）", dataType = "String")
+    @ApiModelProperty(value = "表单id（流程定义对应的表单id，等价于业务id），导出接口不用传", dataType = "String")
     private String formId;
 
     /**
      * 审批状态类型，对应ApprovalStatusEnum
      */
     @NotEmpty(message = "审批状态类型不能为空")
-    @ApiModelProperty(value = "审批状态类型code", dataType = "String")
+    @ApiModelProperty(value = "审批状态类型code，导出接口不用传", dataType = "String")
     private String approvalStatus;
 
     @ApiModelProperty(hidden = true)
@@ -34,4 +35,7 @@
 
     @ApiModelProperty(hidden = true)
     private Long createUserId;
+
+    @ApiModelProperty(value = "导出ids", dataType = "List")
+    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificatePrintApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificatePrintApprovalListRequest.java
index b93d1c9..3cc2f4e 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificatePrintApprovalListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificatePrintApprovalListRequest.java
@@ -5,8 +5,6 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import java.util.List;
-
 /**
  * @Description:
  * @Author: wangpeng
@@ -38,7 +36,4 @@
 
     @ApiModelProperty(value = "创建结束时间", dataType = "String")
     private String createTimeEnd;
-
-    @ApiModelProperty(value = "导出ids", dataType = "List")
-    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportApprovalListRequest.java
index 4f7a038..c115847 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportApprovalListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportApprovalListRequest.java
@@ -5,8 +5,6 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import java.util.List;
-
 /**
  * @Description:
  * @Author: wangpeng
@@ -15,6 +13,8 @@
 @ApiModel
 @Data
 public class CertificateReportApprovalListRequest extends BaseApprovalListRequest {
+    @ApiModelProperty(value = "委托方id", dataType = "String")
+    private Long customerId;
 
     @ApiModelProperty(value = "证书报告编号", dataType = "String")
     private String certificateReportNo;
@@ -37,6 +37,4 @@
     @ApiModelProperty(value = "检校结束时间", dataType = "String")
     private String calibrationTimeEnd;
 
-    @ApiModelProperty(value = "导出ids", dataType = "List")
-    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/identify/IdentifyListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/identify/IdentifyListRequest.java
index 1b87ae6..f019203 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/identify/IdentifyListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/identify/IdentifyListRequest.java
@@ -4,6 +4,8 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * @Description:
  * @Author: wangpeng
@@ -26,4 +28,7 @@
 
     @ApiModelProperty(value = "打印结束时间", dataType = "String")
     private String createTimeEnd;
+
+    @ApiModelProperty(value = "导出ids", dataType = "List")
+    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListRequest.java
index 1264883..62415fb 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListRequest.java
@@ -7,6 +7,7 @@
 import lombok.Data;
 
 import javax.validation.constraints.NotBlank;
+import java.util.List;
 
 @Data
 @ApiModel
@@ -37,4 +38,6 @@
     @ApiModelProperty(value = "是否加急（1是0否null全部）", dataType = "Integer")
     private String isUrgent;
 
+    @ApiModelProperty(value = "导出ids", dataType = "List")
+    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListRequest.java
index 5201d7b..499760a 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListRequest.java
@@ -17,6 +17,9 @@
     @ApiModelProperty(value = "任务单编号", dataType = "String")
     private String orderNo;
 
+    @ApiModelProperty(value = "委托方id", dataType = "Long")
+    private Long customerId;
+
     @ApiModelProperty(value = "委托方名称", dataType = "String")
     private String customerName;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OrderSampleDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OrderSampleDTO.java
new file mode 100644
index 0000000..796edc0
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OrderSampleDTO.java
@@ -0,0 +1,19 @@
+package com.casic.missiles.dto.business.outsource;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/8/24 11:38
+ */
+@ApiModel
+@Data
+public class OrderSampleDTO {
+    @ApiModelProperty(value = "任务单id", dataType = "Long")
+    private Long orderId;
+    @ApiModelProperty(value = "受检设备id", dataType = "Long")
+    private Long sampleId;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceAssessApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceAssessApprovalListRequest.java
new file mode 100644
index 0000000..9a930c3
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceAssessApprovalListRequest.java
@@ -0,0 +1,30 @@
+package com.casic.missiles.dto.business.outsource;
+
+import com.casic.missiles.dto.BaseApprovalListRequest;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/8/24 11:01
+ */
+@ApiModel
+@Data
+public class OutsourceAssessApprovalListRequest extends BaseApprovalListRequest {
+    @ApiModelProperty(value = "评审表编号", dataType = "String")
+    private String projectNo;
+
+    @ApiModelProperty(value = "分包机构名称", dataType = "String")
+    private String outsourcerName;
+
+    @ApiModelProperty(value = "申请人", dataType = "String")
+    private String applicantName;
+
+    @ApiModelProperty(value = "申请时间开始", dataType = "String")
+    private String applicantTimeStart;
+
+    @ApiModelProperty(value = "申请时间结束", dataType = "String")
+    private String applicantTimeEnd;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceAssessSaveResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceAssessSaveResponse.java
new file mode 100644
index 0000000..8bf9aad
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceAssessSaveResponse.java
@@ -0,0 +1,20 @@
+package com.casic.missiles.dto.business.outsource;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/8/14 16:17
+ */
+@ApiModel
+@Data
+public class OutsourceAssessSaveResponse {
+    @ApiModelProperty(value = "主键id", dataType = "Long")
+    private Long id;
+
+    @ApiModelProperty(value = "编号", dataType = "String")
+    private String projectNo;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProtocolApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProtocolApprovalListRequest.java
new file mode 100644
index 0000000..0f32331
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProtocolApprovalListRequest.java
@@ -0,0 +1,30 @@
+package com.casic.missiles.dto.business.outsource;
+
+import com.casic.missiles.dto.BaseApprovalListRequest;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/8/24 15:01
+ */
+@ApiModel
+@Data
+public class OutsourceProtocolApprovalListRequest extends BaseApprovalListRequest {
+    @ApiModelProperty(value = "协议书编号", dataType = "String")
+    private String protocolNo;
+
+    @ApiModelProperty(value = "分包方名称", dataType = "String")
+    private String outsourcerName;
+
+    @ApiModelProperty(value = "申请人", dataType = "String")
+    private String applicantName;
+
+    @ApiModelProperty(value = "申请时间开始", dataType = "String")
+    private String applicantTimeStart;
+
+    @ApiModelProperty(value = "申请时间结束", dataType = "String")
+    private String applicantTimeEnd;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProtocolSaveResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProtocolSaveResponse.java
new file mode 100644
index 0000000..e324967
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProtocolSaveResponse.java
@@ -0,0 +1,20 @@
+package com.casic.missiles.dto.business.outsource;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/8/14 16:17
+ */
+@ApiModel
+@Data
+public class OutsourceProtocolSaveResponse {
+    @ApiModelProperty(value = "主键id", dataType = "Long")
+    private Long id;
+
+    @ApiModelProperty(value = "编号", dataType = "String")
+    private String protocolNo;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveApprovalListRequest.java
index f29f4e4..7047c28 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveApprovalListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveApprovalListRequest.java
@@ -5,8 +5,6 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import java.util.List;
-
 /**
  * @Description: 现场检测审批列表请求实体
  * @Author: wangpeng
@@ -30,7 +28,4 @@
     @ApiModelProperty(value = "申请时间结束", dataType = "String")
     private String applyTimeEnd;
 
-    @ApiModelProperty(value = "导出ids", dataType = "List")
-    private List<Long> ids;
-
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveDetailResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveDetailResponse.java
index 1f28752..394c934 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveDetailResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveDetailResponse.java
@@ -12,6 +12,18 @@
     @ApiModelProperty(value = "id，更新/删除使用参数", dataType = "Long")
     private Long id;
 
+    @ApiModelProperty(value = "实验室代码(字典code)", dataType = "String")
+    private String labCode;
+
+    @ApiModelProperty(value = "实验室代码(字典value)", dataType = "String")
+    private String labCodeName;
+
+    @ApiModelProperty(value = "组别代码(字典code)", dataType = "String")
+    private String groupCode;
+
+    @ApiModelProperty(value = "组别代码(字典value)", dataType = "String")
+    private String groupCodeName;
+
     @ApiModelProperty(value = "审批编号", dataType = "String")
     private String siteExecutiveNo;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/environment/LocationListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/environment/LocationListRequest.java
new file mode 100644
index 0000000..13d03c3
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/environment/LocationListRequest.java
@@ -0,0 +1,20 @@
+package com.casic.missiles.dto.resource.environment;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/6/8 13:56
+ */
+@ApiModel
+@Data
+public class LocationListRequest {
+    @ApiModelProperty(value = "地点编号", dataType = "String")
+    private String locationNo;
+
+    @ApiModelProperty(value = "地点名称", dataType = "String")
+    private String locationName;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/environment/LocationListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/environment/LocationListResponse.java
new file mode 100644
index 0000000..4c531af
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/environment/LocationListResponse.java
@@ -0,0 +1,78 @@
+package com.casic.missiles.dto.resource.environment;
+
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
+import com.baomidou.mybatisplus.annotation.TableField;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description: 地点列表响应实体
+ * @Author: wangpeng
+ * @Date: 2023/6/8 13:53
+ */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
+@ApiModel
+@Data
+public class LocationListResponse {
+    @ApiModelProperty(value = "主键id", dataType = "Long")
+    private Long id;
+
+    /**
+     * 地点编号
+     */
+    @ExcelProperty("地点编号")
+    @ApiModelProperty(value = "地点编号", dataType = "String")
+    private String locationNo;
+
+    /**
+     * 地点名称
+     */
+    @ExcelProperty("地点名称")
+    @ApiModelProperty(value = "地点名称", dataType = "String")
+    private String locationName;
+
+    /**
+     * 地点位置
+     */
+    @ExcelProperty("地点位置")
+    @ApiModelProperty(value = "地点位置", dataType = "String")
+    private String locationPosition;
+
+    /**
+     * 创建人id
+     */
+    @ApiModelProperty(value = "创建人id", dataType = "Long")
+    private Long createUserId;
+
+    /**
+     * 创建人
+     */
+    @ExcelProperty("创建人")
+    @ApiModelProperty(value = "创建人", dataType = "String")
+    @TableField("create_user")
+    private String createUser;
+
+    /**
+     * 创建时间
+     */
+    @ExcelProperty("创建时间")
+    @ApiModelProperty(value = "创建时间", dataType = "String")
+    private String createTime;
+
+    /**
+     * 更新时间
+     */
+    @ApiModelProperty(value = "更新时间", dataType = "String")
+    private String updateTime;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertRequest.java
index 9a7f6c6..c827915 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertRequest.java
@@ -4,6 +4,8 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * @Description:
  * @Author: wangpeng
@@ -16,4 +18,7 @@
     private String name;
     @ApiModelProperty(value = "部门名", dataType = "String")
     private String deptName;
+
+    @ApiModelProperty(value = "导出ids", dataType = "List")
+    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertResponse.java
index f78b159..8f2f79e 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertResponse.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.dto.resource.staff;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.casic.missiles.annotation.DictCodeField;
 import com.casic.missiles.constants.MeterDictCode;
 import io.swagger.annotations.ApiModel;
@@ -13,12 +20,18 @@
  * @Author: wangpeng
  * @Date: 2023/7/27 15:13
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @ApiModel
 @Data
 public class StaffCertResponse {
     /**
      * 人员编号
      */
+    @ExcelProperty(value = "人员编号",order = 0)
     @NotEmpty(message = "人员编号不能为空")
     @ApiModelProperty(value = "人员编号", dataType = "String")
     private String staffNo;
@@ -26,6 +39,7 @@
     /**
      * 姓名
      */
+    @ExcelProperty(value = "姓名",order = 1)
     @ApiModelProperty(value = "姓名", dataType = "String")
     private String staffName;
 
@@ -54,6 +68,7 @@
     /**
      * 部门名字
      */
+    @ExcelProperty(value = "工作部门",order = 2)
     @ApiModelProperty(value = "部门名字", dataType = "String")
     private String deptName;
 
@@ -66,6 +81,7 @@
     /**
      * 计量专业
      */
+    @ExcelProperty(value = "计量专业",order = 3)
     @ApiModelProperty(value = "计量专业", dataType = "String")
     private String major;
 
@@ -110,6 +126,7 @@
     /**
      * 证书号
      */
+    @ExcelProperty(value = "证号",order = 4)
     @ApiModelProperty(value = "证书号", dataType = "String")
     private String certNo;
 
@@ -122,12 +139,14 @@
     /**
      * 有效日期
      */
+    @ExcelProperty(value = "证书有效期",order = 6)
     @ApiModelProperty(value = "有效日期", dataType = "String")
     private String effectiveDate;
 
     /**
      * 发放日期
      */
+    @ExcelProperty(value = "发证日期",order = 5)
     @ApiModelProperty(value = "发放日期", dataType = "String")
     private String grantDate;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffListRequest.java
index 7c4afb3..0a1194a 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffListRequest.java
@@ -4,6 +4,8 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * @Description:
  * @Author: wangpeng
@@ -18,4 +20,7 @@
     private String deptName;
     @ApiModelProperty(value = "部门id", dataType = "Long")
     private Long deptId;
+
+    @ApiModelProperty(value = "导出ids", dataType = "List")
+    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/TrainListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/TrainListRequest.java
index f68597b..6321f8b 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/TrainListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/TrainListRequest.java
@@ -14,6 +14,8 @@
 public class TrainListRequest {
     @ApiModelProperty(value = "训练登记表编号", dataType = "String")
     private String trainNo;
+    @ApiModelProperty(value = "值班领导", dataType = "String")
+    private String dutyLeader;
     @ApiModelProperty(value = "创建开始时间", dataType = "String")
     private String createTimeStart;
     @ApiModelProperty(value = "创建结束时间", dataType = "String")
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/SignAddRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/SignAddRequest.java
index 117be34..d71055c 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/SignAddRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/SignAddRequest.java
@@ -43,13 +43,6 @@
     private Long signUserId;
 
     /**
-     * 签章或签名-字典code
-     */
-    @NotBlank(message = "类型不能为空")
-    @ApiModelProperty(value = "签名/签章-字典code", dataType = "String", required = true)
-    private String signType;
-
-    /**
      * minio存储文件名
      */
     @ApiModelProperty(value = "上传文件返回名称", dataType = "String")
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateAddRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateAddRequest.java
index aff1265..6316648 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateAddRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateAddRequest.java
@@ -17,30 +17,28 @@
 @Data
 public class TemplateAddRequest extends BaseSystemRequest {
     /**
-     * 原始记录模板/证书报告模板名称
+     * 模板名称
      */
     @ApiModelProperty(value = "名称", dataType = "String", required = true)
     @NotBlank(message = "名称不能为空")
     private String templateName;
 
     /**
-     * 原始记录模板/证书报告模板描述
+     * 模板描述
      */
     @ApiModelProperty(value = "描述", dataType = "String")
     private String templateDesc;
 
     /**
-     * 原始记录模板/证书报告模板创建人
+     * 创建人
      */
     @ApiModelProperty(value = "创建人", dataType = "String", required = true)
     @NotBlank(message = "创建人不能为空")
     private String templateCreator;
 
-    /**
-     * 原始记录模板/证书报告模板-字典code
-     */
-    @NotBlank(message = "类型不能为空")
-    @ApiModelProperty(value = "原始记录模板/证书报告模板-字典code", dataType = "String", required = true)
+
+    @NotBlank(message = "模板类型不能为空")
+    @ApiModelProperty(value = "模板类型(字典code)", dataType = "String", required = true)
     private String templateType;
 
     /**
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateListRequest.java
index eec5a1e..6d17bbe 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateListRequest.java
@@ -1,11 +1,12 @@
 package com.casic.missiles.dto.system;
 
+import com.casic.missiles.annotation.DictCodeField;
+import com.casic.missiles.constants.MeterDictCode;
 import com.casic.missiles.dto.BaseSystemRequest;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import javax.validation.constraints.NotBlank;
 import java.util.List;
 
 /**
@@ -19,8 +20,8 @@
     /**
      * 类型
      */
-//    @ApiModelProperty(value = "类型-字典code", dataType = "String", required = true)
-    @NotBlank(message = "类型不能为空")
+    @DictCodeField(message = "模板类型不合法", cacheName = MeterDictCode.TEMPLATE_TYPE)
+    @ApiModelProperty(value = "模板类型(字典code)", dataType = "String")
     private String templateType;
 
     /**
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificateChangeApply.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificateChangeApply.java
index 9216308..36923fd 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificateChangeApply.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificateChangeApply.java
@@ -1,11 +1,19 @@
 package com.casic.missiles.model.business;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 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 com.casic.missiles.dto.BaseRequest;
+import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -20,6 +28,12 @@
  * @author wangpeng
  * @since 2023-08-15
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
+@ApiModel
 @Data
 @TableName("biz_business_certificate_change_apply")
 public class BizBusinessCertificateChangeApply extends BaseRequest implements Serializable {
@@ -33,6 +47,7 @@
     /**
      * 申请单编号
      */
+    @ExcelProperty(value = "申请单编号", order = 1)
     @ApiModelProperty(value = "申请单编号", dataType = "String")
     @TableField("change_apply_no")
     private String changeApplyNo;
@@ -40,6 +55,7 @@
     /**
      * 申请单名字
      */
+    @ExcelProperty(value = "申请单名称", order = 2)
     @ApiModelProperty(value = "申请单名字", dataType = "String")
     @TableField("change_apply_name")
     private String changeApplyName;
@@ -54,6 +70,7 @@
     /**
      * 更换证书编号
      */
+    @ExcelProperty(value = "更换证书编号", order = 3)
     @ApiModelProperty(value = "更换证书编号", dataType = "String")
     @TableField("change_report_no")
     private String changeReportNo;
@@ -61,7 +78,8 @@
     /**
      * 更换证书名字
      */
-    @ApiModelProperty(value = "更换证书名字", dataType = "String")
+    @ExcelProperty(value = "更换证书/报告名称", order = 4)
+    @ApiModelProperty(value = "更换证书/报告名称", dataType = "String")
     @TableField("change_report_name")
     private String changeReportName;
 
@@ -73,6 +91,7 @@
     @TableField("change_type")
     private String changeType;
 
+    @ExcelProperty(value = "变更类型", order = 5)
     @ApiModelProperty(value = "变更类型(字典value)", dataType = "String")
     @TableField(exist = false)
     private String changeTypeName;
@@ -142,13 +161,15 @@
     /**
      * 创建用户名字
      */
-    @ApiModelProperty(value = "创建用户名字", dataType = "String")
+    @ExcelProperty(value = "创建人", order = 6)
+    @ApiModelProperty(value = "创建人名字", dataType = "String")
     @TableField("create_user_name")
     private String createUserName;
 
     /**
      * 创建时间
      */
+    @ExcelProperty(value = "创建时间", order = 7)
     @ApiModelProperty(value = "创建时间", dataType = "String")
     @TableField("create_time")
     private String createTime;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificateReport.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificateReport.java
index f01db9e..db06018 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificateReport.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificateReport.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.model.business;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -22,6 +29,11 @@
  * @author wangpeng
  * @since 2023-08-14
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @ApiModel
 @Data
 @TableName("biz_business_certificate_report")
@@ -36,6 +48,7 @@
     /**
      * 证书报告编号
      */
+    @ExcelProperty(value = "证书报告编号", order = 1)
     @ApiModelProperty(value = "证书报告编号", dataType = "String")
     @TableField("certificate_report_no")
     private String certificateReportNo;
@@ -43,6 +56,7 @@
     /**
      * 证书报告名称
      */
+    @ExcelProperty(value = "证书报告名称", order = 2)
     @ApiModelProperty(value = "证书报告名称", dataType = "String")
     @TableField("certificate_report_name")
     private String certificateReportName;
@@ -62,6 +76,7 @@
     @TableField("measure_category")
     private String measureCategory;
 
+    @ExcelProperty(value = "检校类别", order = 6)
     @ApiModelProperty(value = "检校类别(字典value)", dataType = "String")
     @TableField(exist = false)
     private String measureCategoryName;
@@ -69,6 +84,7 @@
     /**
      * 检校时间
      */
+    @ExcelProperty(value = "检校时间", order = 8)
     @ApiModelProperty(value = "检校时间", dataType = "String")
     @TableField("calibration_time")
     private String calibrationTime;
@@ -267,18 +283,22 @@
     @TableField(exist = false)
     private Integer decisionItem;
 
-    @ApiModelProperty(value = "设备样品编号（列表返回参数）", dataType = "String")
+    @ExcelProperty(value = "被检设备统一编号", order = 3)
+    @ApiModelProperty(value = "被检设备统一编号（列表返回参数）", dataType = "String")
     @TableField(exist = false)
     private String sampleNo;
 
-    @ApiModelProperty(value = "设备样品名称（列表返回参数）", dataType = "String")
+    @ExcelProperty(value = "被检设备名称", order = 4)
+    @ApiModelProperty(value = "被检设备名称（列表返回参数）", dataType = "String")
     @TableField(exist = false)
     private String sampleName;
 
-    @ApiModelProperty(value = "设备样品规格型号（列表返回参数）", dataType = "String")
+    @ExcelProperty(value = "规格型号", order = 5)
+    @ApiModelProperty(value = "规格型号（列表返回参数）", dataType = "String")
     @TableField(exist = false)
     private String sampleModel;
 
+    @ExcelProperty(value = "检定员", order = 7)
     @ApiModelProperty(value = "检定员名字（列表返回参数）", dataType = "String")
     @TableField(exist = false)
     private String staffName;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessIdentifyInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessIdentifyInfo.java
index 46bfba5..f1a9bec 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessIdentifyInfo.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessIdentifyInfo.java
@@ -1,10 +1,15 @@
 package com.casic.missiles.model.business;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 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;
 
@@ -20,6 +25,11 @@
  * @author wangpeng
  * @since 2023-08-15
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @Data
 @TableName("biz_business_identify_info")
 public class BizBusinessIdentifyInfo implements Serializable {
@@ -33,6 +43,7 @@
     /**
      * 记录编号
      */
+    @ExcelProperty(value = "记录编号", order = 1)
     @ApiModelProperty(value = "记录编号", dataType = "String")
     @TableField("record_no")
     private String recordNo;
@@ -41,20 +52,15 @@
      * 标志类型(字典code)
      */
     @NotEmpty(message = "标志类型不能为空")
-    @ApiModelProperty(value = "标志类型(字典code)", dataType = "String")
-    @DictCodeField(message = "标志类型不合法", cacheName = MeterDictCode.IDENTIFY_PRINT_TYPE)
+    @ApiModelProperty(value = "标志类型(直接存计量标识/使用状态/校准状态的字典value)", dataType = "String")
     @TableField("identify_type")
     private String identifyType;
 
-    @ApiModelProperty(value = "标志类型(字典value)", dataType = "String")
-    @TableField(exist = false)
-    private String identifyTypeName;
-
     /**
      * 设备id(可以是受检设备/设备台账)
      */
     @NotNull(message = "设备id不能为空")
-    @ApiModelProperty(value = "设备id(可以是受检设备/设备台账)", dataType = "String")
+    @ApiModelProperty(value = "设备id(可以是受检设备/设备台账)", dataType = "Long")
     @TableField("device_id")
     private Long deviceId;
 
@@ -66,29 +72,32 @@
     @TableField("device_type")
     private String deviceType;
 
+    @ExcelProperty(value = "统一编号", order = 3)
     @NotEmpty(message = "设备编号不能为空")
-    @ApiModelProperty(value = "设备编号", dataType = "String")
+    @ApiModelProperty(value = "统一编号", dataType = "String")
     @TableField("device_no")
     private String deviceNo;
 
     /**
      * 设备名字
      */
-    @NotEmpty(message = "设备名字不能为空")
-    @ApiModelProperty(value = "设备名字", dataType = "String")
+    @ExcelProperty(value = "设备名称", order = 4)
+    @NotEmpty(message = "设备名称不能为空")
+    @ApiModelProperty(value = "设备名称", dataType = "String")
     @TableField("device_name")
     private String deviceName;
 
     /**
      * 检定员id
      */
-    @ApiModelProperty(value = "检定员id", dataType = "String")
+    @ApiModelProperty(value = "检定员id", dataType = "Long")
     @TableField("measure_person_id")
     private Long measurePersonId;
 
     /**
      * 检定员名字
      */
+    @ExcelProperty(value = "检定员", order = 5)
     @ApiModelProperty(value = "检定员名字", dataType = "String")
     @TableField("measure_person")
     private String measurePerson;
@@ -103,7 +112,8 @@
     /**
      * 更新时间
      */
-    @ApiModelProperty(value = "更新时间", dataType = "String")
+    @ExcelProperty(value = "打印时间", order = 6)
+    @ApiModelProperty(value = "打印时间", dataType = "String")
     @TableField("update_time")
     private String updateTime;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceAssess.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceAssess.java
index 659d9ca..6720b90 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceAssess.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceAssess.java
@@ -1,11 +1,26 @@
 package com.casic.missiles.model.business;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 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 com.casic.missiles.dto.BaseRequest;
+import com.casic.missiles.dto.business.outsource.OrderSampleDTO;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import javax.validation.constraints.NotEmpty;
 import java.io.Serializable;
+import java.util.List;
 
 /**
  * <p>
@@ -15,146 +30,231 @@
  * @author wangpeng
  * @since 2023-08-16
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
+@ApiModel
 @Data
 @TableName("biz_business_outsource_assess")
-public class BizBusinessOutsourceAssess implements Serializable {
+public class BizBusinessOutsourceAssess extends BaseRequest implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
+    @ApiModelProperty(value = "id，更新/删除使用参数", dataType = "Long")
     @TableId("id")
     private Long id;
 
     /**
      * 评审表编号
      */
+    @ExcelProperty(value = "评审表编号", order = 1)
+    @ApiModelProperty(value = "评审表编号(后台生成)", dataType = "String")
     @TableField("project_no")
     private String projectNo;
 
     /**
      * 评审表名称
      */
+    @ExcelProperty(value = "评审表名称", order = 2)
+    @ApiModelProperty(value = "评审表名称", dataType = "String")
     @TableField("project_name")
     private String projectName;
 
+    @NotEmpty(message = "实验室代码不能为空")
+    @DictCodeField(message = "实验室代码描述不合法", cacheName = MeterDictCode.LAB_CODE)
+    @ApiModelProperty(value = "实验室代码(字典code)", dataType = "String")
+    @TableField("lab_code")
+    private String labCode;
+
+    @ApiModelProperty(value = "实验室代码(字典value)", dataType = "String")
+    @TableField(exist = false)
+    private String labCodeName;
+
+    /**
+     * 组别代码
+     */
+    @NotEmpty(message = "组别代码不能为空")
+    @DictCodeField(message = "组别代码描述不合法", cacheName = MeterDictCode.GROUP_CODE)
+    @ApiModelProperty(value = "组别代码(字典code)", dataType = "String")
+    @TableField("group_code")
+    private String groupCode;
+
+    @ApiModelProperty(value = "组别代码(字典value)", dataType = "String")
+    @TableField(exist = false)
+    private String groupCodeName;
+
     /**
      * 申请人id
      */
+    @ApiModelProperty(value = "申请人id", dataType = "String")
     @TableField("applicant_id")
     private Long applicantId;
 
     /**
      * 申请人名字
      */
+    @ExcelProperty(value = "申请人", order = 5)
+    @ApiModelProperty(value = "申请人", dataType = "String")
     @TableField("applicant_name")
     private String applicantName;
 
     /**
      * 申请时间
      */
+    @ExcelProperty(value = "申请时间", order = 6)
+    @ApiModelProperty(value = "申请时间", dataType = "String")
     @TableField("applicant_time")
     private String applicantTime;
 
     /**
      * 附件(minio存储文件名)
      */
+    @ApiModelProperty(value = "附件(minio存储文件名)", dataType = "String")
     @TableField("minio_file_name")
     private String minioFileName;
 
     /**
      * 备注
      */
+    @ApiModelProperty(value = "备注", dataType = "String")
     @TableField("remark")
     private String remark;
 
     /**
      * 创建人id
      */
+    @ApiModelProperty(value = "创建人id", dataType = "String")
     @TableField("create_user_id")
     private Long createUserId;
 
     /**
      * 创建人名字
      */
+    @ApiModelProperty(value = "创建人名字", dataType = "String")
     @TableField("create_user_name")
     private String createUserName;
 
     /**
      * 分包方id
      */
+    @ApiModelProperty(value = "评审表编号", dataType = "String")
     @TableField("outsourcer_id")
     private Long outsourcerId;
 
     /**
      * 预计开始时间
      */
+    @ApiModelProperty(value = "预计开始时间", dataType = "String")
     @TableField("pre_start_time")
     private String preStartTime;
 
     /**
      * 预计结束时间
      */
+    @ApiModelProperty(value = "预计结束时间", dataType = "String")
     @TableField("pre_end_time")
     private String preEndTime;
 
     /**
      * 分包原因-字典
      */
+    @ApiModelProperty(value = "分包原因(字典code)", dataType = "String")
+    @DictCodeField(message = "分包原因描述不合法", cacheName = MeterDictCode.OUTSOURCE_REASON)
     @TableField("outsource_reason")
     private String outsourceReason;
 
+    @ApiModelProperty(value = "分包原因(字典value)", dataType = "String")
+    @TableField(exist = false)
+    private String outsourceReasonName;
+
     /**
      * 预计费用
      */
+    @ApiModelProperty(value = "预计费用", dataType = "String")
     @TableField("pre_cost")
     private String preCost;
 
     /**
      * 审批状态
      */
+    @ApiModelProperty(value = "审批状态", dataType = "String")
+    @DictCodeField(message = "审批状态描述不合法", cacheName = MeterDictCode.APPROVAL_STATUS)
     @TableField("approval_status")
     private String approvalStatus;
 
     /**
      * 流程实例id
      */
+    @ApiModelProperty(value = "流程实例id", dataType = "String")
     @TableField("process_id")
     private String processId;
 
     /**
      * 实验室认可情况
      */
+    @ApiModelProperty(value = "实验室认可情况", dataType = "String")
     @TableField("approve_situation")
     private String approveSituation;
 
     /**
      * 溯源性
      */
+    @ApiModelProperty(value = "溯源性", dataType = "String")
     @TableField("traceability")
     private String traceability;
 
     /**
      * 测试方法
      */
+    @ApiModelProperty(value = "测试方法", dataType = "String")
     @TableField("test_method")
     private String testMethod;
 
     /**
      * 技术能力
      */
+    @ApiModelProperty(value = "技术能力", dataType = "String")
     @TableField("technique_ability")
     private String techniqueAbility;
 
     /**
      * 创建时间
      */
+    @ApiModelProperty(hidden = true)
     @TableField("create_time")
     private String createTime;
 
     /**
      * 更新时间
      */
+    @ApiModelProperty(hidden = true)
     @TableField("update_time")
     private String updateTime;
 
+    @ApiModelProperty(value = "审批状态类型-字典value", dataType = "String")
+    @TableField(exist = false)
+    private String approvalStatusName;
 
+    @ApiModelProperty(value = "任务id（同意、驳回等操作使用）", dataType = "String")
+    @TableField(exist = false)
+    private String taskId;
+
+    @ApiModelProperty(value = "可选决策项（1同意驳回拒绝 2同意驳回 3同意拒绝，用于待审批列表同意/驳回/拒绝按钮展示）", dataType = "Integer")
+    @TableField(exist = false)
+    private Integer decisionItem;
+
+    @NotEmpty(message = "受检设备信息不能为空")
+    @ApiModelProperty(value = "受检设备id列表（新建使用参数）", dataType = "List")
+    @TableField(exist = false)
+    private List<OrderSampleDTO> orderSampleList;
+
+    @ExcelProperty(value = "分包机构名称", order = 3)
+    @ApiModelProperty(value = "分包机构名称（列表返回参数）", dataType = "String")
+    private String outsourcerName;
+
+    @ExcelProperty(value = "机构负责人", order = 4)
+    @ApiModelProperty(value = "机构负责人（列表返回参数）", dataType = "String")
+    private String director;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceProtocol.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceProtocol.java
new file mode 100644
index 0000000..38df697
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceProtocol.java
@@ -0,0 +1,225 @@
+package com.casic.missiles.model.business;
+
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
+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 com.casic.missiles.dto.BaseRequest;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotEmpty;
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 计量检定业务-分包管理-测试、校准或检定工作分包协议书
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-08-24
+ */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
+@Data
+@TableName("biz_business_outsource_protocol")
+public class BizBusinessOutsourceProtocol extends BaseRequest implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "id，更新/删除使用参数", dataType = "Long")
+    @TableId("id")
+    private Long id;
+
+    /**
+     * 协议书编号
+     */
+    @ExcelProperty(value = "协议书编号", order = 1)
+    @ApiModelProperty(value = "协议书编号(后台生成)", dataType = "String")
+    @TableField("protocol_no")
+    private String protocolNo;
+
+    /**
+     * 协议书名称
+     */
+    @ExcelProperty(value = "协议书名称", order = 2)
+    @ApiModelProperty(value = "协议书名称", dataType = "String")
+    @TableField("project_name")
+    private String projectName;
+
+    @NotEmpty(message = "实验室代码不能为空")
+    @DictCodeField(message = "实验室代码描述不合法", cacheName = MeterDictCode.LAB_CODE)
+    @ApiModelProperty(value = "实验室代码(字典code)", dataType = "String")
+    @TableField("lab_code")
+    private String labCode;
+
+    @ApiModelProperty(value = "实验室代码(字典value)", dataType = "String")
+    @TableField(exist = false)
+    private String labCodeName;
+
+    @NotEmpty(message = "组别代码不能为空")
+    @DictCodeField(message = "组别代码描述不合法", cacheName = MeterDictCode.GROUP_CODE)
+    @ApiModelProperty(value = "组别代码(字典code)", dataType = "String")
+    @TableField("group_code")
+    private String groupCode;
+
+    @ApiModelProperty(value = "组别代码(字典value)", dataType = "String")
+    @TableField(exist = false)
+    private String groupCodeName;
+
+    /**
+     * 分包方id
+     */
+    @ApiModelProperty(value = "分包方id", dataType = "Long")
+    @TableField("outsourcer_id")
+    private Long outsourcerId;
+
+    /**
+     * 其他
+     */
+    @ApiModelProperty(value = "其他", dataType = "String")
+    @TableField("remark")
+    private String remark;
+
+    /**
+     * 分包方编号
+     */
+    @ApiModelProperty(value = "分包方编号(新建不用传)", dataType = "String")
+    @TableField("outsource_no")
+    private String outsourceNo;
+
+    /**
+     * 分包方名称
+     */
+    @ExcelProperty(value = "分包方名称", order = 3)
+    @ApiModelProperty(value = "分包方名称(新建不用传)", dataType = "String")
+    @TableField("outsource_name")
+    private String outsourceName;
+
+    /**
+     * 联系人
+     */
+    @ExcelProperty(value = "联系人", order = 4)
+    @ApiModelProperty(value = "联系人", dataType = "String")
+    @TableField("contacts")
+    private String contacts;
+
+    /**
+     * 电话
+     */
+    @ApiModelProperty(value = "电话", dataType = "String")
+    @TableField("mobile")
+    private String mobile;
+
+    /**
+     * 地址
+     */
+    @ApiModelProperty(value = "地址", dataType = "String")
+    @TableField("address")
+    private String address;
+
+    /**
+     * 要求完成日期
+     */
+    @ApiModelProperty(value = "要求完成日期", dataType = "String")
+    @TableField("require_date")
+    private String requireDate;
+
+    /**
+     * 分包费用(元)
+     */
+    @ApiModelProperty(value = "分包费用(元)", dataType = "String")
+    @TableField("outsource_cost")
+    private Double outsourceCost;
+
+    /**
+     * 分包方负责人
+     */
+    @ApiModelProperty(value = "分包方负责人", dataType = "String")
+    @TableField("director")
+    private String director;
+
+    /**
+     * 分包项目
+     */
+    @ApiModelProperty(value = "分包项目", dataType = "String")
+    @TableField("item")
+    private String item;
+
+    /**
+     * 分包要求
+     */
+    @ApiModelProperty(value = "分包要求", dataType = "String")
+    @TableField("requires")
+    private String requires;
+
+    /**
+     * 创建人id
+     */
+    @ApiModelProperty(hidden = true)
+    @TableField("create_user_id")
+    private Long createUserId;
+
+    /**
+     * 创建人名字
+     */
+    @ExcelProperty(value = "申请人", order = 5)
+    @ApiModelProperty(value = "申请人", dataType = "String")
+    @TableField("create_user_name")
+    private String createUserName;
+
+    /**
+     * 审批状态
+     */
+    @ApiModelProperty(value = "审批状态", dataType = "String")
+    @DictCodeField(message = "审批状态描述不合法", cacheName = MeterDictCode.APPROVAL_STATUS)
+    @TableField("approval_status")
+    private String approvalStatus;
+
+    /**
+     * 流程实例id
+     */
+    @ApiModelProperty(value = "流程实例id", dataType = "String")
+    @TableField("process_id")
+    private String processId;
+
+    /**
+     * 创建时间
+     */
+    @ExcelProperty(value = "申请时间", order = 6)
+    @ApiModelProperty(value = "申请时间", dataType = "String")
+    @TableField("create_time")
+    private String createTime;
+
+    /**
+     * 更新时间
+     */
+    @ApiModelProperty(hidden = true)
+    @TableField("update_time")
+    private String updateTime;
+
+    @ApiModelProperty(value = "审批状态类型-字典value", dataType = "String")
+    @TableField(exist = false)
+    private String approvalStatusName;
+
+    @ApiModelProperty(value = "任务id（同意、驳回等操作使用）", dataType = "String")
+    @TableField(exist = false)
+    private String taskId;
+
+    @ApiModelProperty(value = "可选决策项（1同意驳回拒绝 2同意驳回 3同意拒绝，用于待审批列表同意/驳回/拒绝按钮展示）", dataType = "Integer")
+    @TableField(exist = false)
+    private Integer decisionItem;
+
+
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourcerInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourcerInfo.java
index ec4e997..f9aa69e 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourcerInfo.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourcerInfo.java
@@ -17,6 +17,7 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import javax.validation.constraints.NotEmpty;
 import java.io.Serializable;
 
 /**
@@ -59,6 +60,29 @@
     @TableField("outsourcer_name")
     private String outsourcerName;
 
+    @NotEmpty(message = "实验室代码不能为空")
+    @DictCodeField(message = "实验室代码描述不合法", cacheName = MeterDictCode.LAB_CODE)
+    @ApiModelProperty(value = "实验室代码(字典code)", dataType = "String")
+    @TableField("lab_code")
+    private String labCode;
+
+    @ApiModelProperty(value = "实验室代码(字典value)", dataType = "String")
+    @TableField(exist = false)
+    private String labCodeName;
+
+    /**
+     * 组别代码
+     */
+    @NotEmpty(message = "组别代码不能为空")
+    @DictCodeField(message = "组别代码描述不合法", cacheName = MeterDictCode.GROUP_CODE)
+    @ApiModelProperty(value = "组别代码(字典code)", dataType = "String")
+    @TableField("group_code")
+    private String groupCode;
+
+    @ApiModelProperty(value = "组别代码(字典value)", dataType = "String")
+    @TableField(exist = false)
+    private String groupCodeName;
+
     /**
      * 单位简称
      */
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardInfo.java
index c48eed7..dffdfdd 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardInfo.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardInfo.java
@@ -5,6 +5,7 @@
 import com.baomidou.mybatisplus.annotation.TableName;
 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;
 
@@ -18,6 +19,7 @@
  * @author wangpeng
  * @since 2023-08-04
  */
+@ApiModel
 @Data
 @TableName("biz_equipment_standard_info")
 public class BizEquipmentStandardInfo implements Serializable {
@@ -119,7 +121,7 @@
      * 管理状态(字典code)
      */
     @ApiModelProperty(value = "管理状态(字典code)", dataType = "String")
-    @DictCodeField(message = "管理状态不合法", cacheName = MeterDictCode.MANAGER_STATE)
+    @DictCodeField(message = "管理状态不合法", cacheName = MeterDictCode.STANDARD_MANAGER_STATE)
     @TableField("manage_status")
     private String manageStatus;
 
@@ -151,7 +153,7 @@
     /**
      * 温度(℃)
      */
-    @ApiModelProperty(value = "使用状态(字典code)", dataType = "String")
+    @ApiModelProperty(value = "温度(℃)", dataType = "String")
     @TableField("temperature")
     private Double temperature;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardInfoApproval.java b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardInfoApproval.java
index dbd86ab..9f58d83 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardInfoApproval.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardInfoApproval.java
@@ -150,7 +150,7 @@
      * 管理状态(字典code)
      */
     @ApiModelProperty(value = "管理状态(字典code)", dataType = "String")
-    @DictCodeField(message = "管理状态不合法", cacheName = MeterDictCode.MANAGER_STATE)
+    @DictCodeField(message = "管理状态不合法", cacheName = MeterDictCode.STANDARD_MANAGER_STATE)
     @TableField("manage_status")
     private String manageStatus;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardTechnologyRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardTechnologyRelation.java
index 0e612bd..751f26b 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardTechnologyRelation.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardTechnologyRelation.java
@@ -3,6 +3,7 @@
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -16,6 +17,7 @@
  * @author wangpeng
  * @since 2023-08-04
  */
+@ApiModel
 @Data
 @TableName("biz_equipment_standard_technology_relation")
 public class BizEquipmentStandardTechnologyRelation implements Serializable {
@@ -33,6 +35,10 @@
     @TableField("technology_file_id")
     private Long technologyFileId;
 
+    @ApiModelProperty(value = "依据的技术文件编号", dataType = "String")
+    @TableField("technology_file_no")
+    private String technologyFileNo;
+
     /**
      * 依据的技术文件名称(技术文件中现行测试校准检定方法表文件名字段)
      */
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerInfo.java
index d6e8bed..65cd6bc 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerInfo.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerInfo.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.model.resource;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -21,6 +28,11 @@
  * @author wangpeng
  * @since 2023-08-08
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @ApiModel
 @Data
 @TableName("biz_resource_customer_info")
@@ -35,6 +47,7 @@
     /**
      * 委托方编号
      */
+    @ExcelProperty(value = "委托方编号", order = 1)
     @ApiModelProperty(value = "委托方编号", dataType = "String")
     @TableField("customer_no")
     private String customerNo;
@@ -42,6 +55,7 @@
     /**
      * 委托方名称
      */
+    @ExcelProperty(value = "委托方名称", order = 2)
     @ApiModelProperty(value = "委托方名称(新建时为下拉选择一个受检单位组织的名字，传deptId字段，后端获取名称)", dataType = "String")
     @TableField("customer_name")
     private String customerName;
@@ -63,6 +77,7 @@
     /**
      * 联系人
      */
+    @ExcelProperty(value = "联系人", order = 3)
     @ApiModelProperty(value = "联系人", dataType = "String")
     @TableField("contacts")
     private String contacts;
@@ -70,6 +85,7 @@
     /**
      * 座机电话
      */
+    @ExcelProperty(value = "座机电话", order = 4)
     @ApiModelProperty(value = "座机电话", dataType = "String")
     @TableField("mobile")
     private String mobile;
@@ -77,6 +93,7 @@
     /**
      * 手机号码
      */
+    @ExcelProperty(value = "手机号码", order = 5)
     @ApiModelProperty(value = "手机号码", dataType = "String")
     @TableField("phone")
     private String phone;
@@ -91,6 +108,7 @@
     /**
      * 地址
      */
+    @ExcelProperty(value = "地址", order = 6)
     @ApiModelProperty(value = "地址", dataType = "String")
     @TableField("address")
     private String address;
@@ -141,6 +159,7 @@
     /**
      * 创建时间
      */
+    @ExcelProperty(value = "创建时间", order = 7)
     @ApiModelProperty(value = "创建时间", dataType = "String")
     @TableField("create_time")
     private String createTime;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerSuggestForm.java b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerSuggestForm.java
index 7201bbd..701bf8b 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerSuggestForm.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerSuggestForm.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.model.resource;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -22,6 +29,11 @@
  * @author wangpeng
  * @since 2023-08-08
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @ApiModel
 @Data
 @TableName("biz_resource_customer_suggest_form")
@@ -44,7 +56,8 @@
     /**
      * 委托方名称
      */
-    @ApiModelProperty(value = "委托方名称", dataType = "String")
+    @ExcelProperty(value = "意见反馈单位", order = 2)
+    @ApiModelProperty(value = "意见反馈单位", dataType = "String")
     @TableField("customer_name")
     private String customerName;
 
@@ -59,7 +72,8 @@
     /**
      * 委托方意见反馈部门名称
      */
-    @ApiModelProperty(value = "委托方意见反馈部门名称", dataType = "String")
+    @ExcelProperty(value = "委托方意见反馈部门", order = 3)
+    @ApiModelProperty(value = "委托方意见反馈部门", dataType = "String")
     @TableField("customer_dept_name")
     private String customerDeptName;
 
@@ -73,6 +87,7 @@
     /**
      * 表单编号
      */
+    @ExcelProperty(value = "表单编号", order = 1)
     @ApiModelProperty(value = "表单编号", dataType = "String")
     @TableField("form_no")
     private String formNo;
@@ -111,6 +126,7 @@
     /**
      * 创建人名字
      */
+    @ExcelProperty(value = "创建人", order = 4)
     @ApiModelProperty(value = "创建人名字", dataType = "String")
     @TableField("create_user_name")
     private String createUserName;
@@ -147,6 +163,7 @@
     /**
      * 创建时间
      */
+    @ExcelProperty(value = "创建时间", order = 5)
     @ApiModelProperty(value = "创建时间", dataType = "String")
     @TableField("create_time")
     private String createTime;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSealInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSealInfo.java
index cbf05d7..9bf389d 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSealInfo.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSealInfo.java
@@ -106,6 +106,10 @@
     @TableField("minio_file_name")
     private String minioFileName;
 
+    @ApiModelProperty(value = "minio存储文件url", dataType = "String")
+    @TableField(exist = false)
+    private String minioFileUrl;
+
     @ApiModelProperty(value = "创建时间", dataType = "String")
     @TableField("create_time")
     private String createTime;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSealUseNote.java b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSealUseNote.java
index 3f2d9e8..3ce16a8 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSealUseNote.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSealUseNote.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.model.resource;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -20,6 +27,11 @@
  * @author wangpeng
  * @since 2023-07-28
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @ApiModel
 @Data
 @TableName("biz_resource_seal_use_note")
@@ -34,6 +46,7 @@
     /**
      * 登记表编号
      */
+    @ExcelProperty(value = "申请单编号", order = 1)
     @ApiModelProperty(value = "登记表编号(自动生成)", dataType = "String")
     @TableField("note_form_no")
     private String noteFormNo;
@@ -55,6 +68,7 @@
     /**
      * 申请部门
      */
+    @ExcelProperty(value = "申请部门", order = 5)
     @ApiModelProperty(value = "申请部门", dataType = "String")
     @TableField("apply_dept_name")
     private String applyDeptName;
@@ -69,6 +83,7 @@
     /**
      * 申请人
      */
+    @ExcelProperty(value = "申请人", order = 6)
     @ApiModelProperty(value = "申请人", dataType = "String")
     @TableField("apply_user_name")
     private String applyUserName;
@@ -76,6 +91,7 @@
     /**
      * 申请时间
      */
+    @ExcelProperty(value = "申请时间", order = 7)
     @ApiModelProperty(value = "申请时间(新增自动获取当前时间)", dataType = "String")
     @TableField("apply_time")
     private String applyTime;
@@ -130,6 +146,26 @@
     @TableField("update_time")
     private String updateTime;
 
+    @ExcelProperty(value = "印章名称", order = 2)
+    @ApiModelProperty(value = "印章名称(列表返回参数)", dataType = "String")
+    @TableField(exist = false)
+    private String sealName;
+
+    @DictCodeField(message = "印章类型描述不合法", cacheName = MeterDictCode.SEAL_TYPE)
+    @ApiModelProperty(hidden = true)
+    @TableField(exist = false)
+    private String sealType;
+
+    @ExcelProperty(value = "印章类型", order = 3)
+    @ApiModelProperty(value = "印章类型(列表返回参数)", dataType = "String")
+    @TableField(exist = false)
+    private String sealTypeName;
+
+    @ExcelProperty(value = "批准人", order = 4)
+    @ApiModelProperty(value = "批准人(列表返回参数)", dataType = "String")
+    @TableField(exist = false)
+    private String approverName;
+
     @ApiModelProperty(value = "审批状态类型-字典value", dataType = "String")
     @TableField(exist = false)
     private String approvalStatusName;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceStaffInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceStaffInfo.java
index 5ef995b..41563a1 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceStaffInfo.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceStaffInfo.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.model.resource;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -20,6 +27,11 @@
  * @author wangpeng
  * @since 2023-07-25
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @ApiModel
 @Data
 @TableName("biz_resource_staff_info")
@@ -38,6 +50,7 @@
     /**
      * 人员编号
      */
+    @ExcelProperty(value = "人员编号",order = 0)
     @NotEmpty(message = "人员编号不能为空")
     @ApiModelProperty(value = "人员编号", dataType = "String")
     @TableField("staff_no")
@@ -46,6 +59,7 @@
     /**
      * 姓名
      */
+    @ExcelProperty(value = "姓名",order = 1)
     @ApiModelProperty(value = "姓名", dataType = "String")
     @TableField("staff_name")
     private String staffName;
@@ -152,13 +166,15 @@
     /**
      * 部门名字
      */
-    @ApiModelProperty(value = "部门名字", dataType = "String")
+    @ExcelProperty(value = "工作部门",order = 4)
+    @ApiModelProperty(value = "工作部门", dataType = "String")
     @TableField("dept_name")
     private String deptName;
 
     /**
      * 岗位
      */
+    @ExcelProperty(value = "岗位",order = 2)
     @ApiModelProperty(value = "岗位", dataType = "String")
     @TableField("station")
     private String station;
@@ -166,6 +182,7 @@
     /**
      * 计量专业
      */
+    @ExcelProperty(value = "计量专业",order = 5)
     @ApiModelProperty(value = "计量专业", dataType = "String")
     @TableField("major")
     private String major;
@@ -173,6 +190,7 @@
     /**
      * 证号
      */
+    @ExcelProperty(value = "证号",order = 3)
     @ApiModelProperty(value = "证号", dataType = "String")
     @TableField("certificate_number")
     private String certificateNumber;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSupplierInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSupplierInfo.java
index eb5ef01..a1e2697 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSupplierInfo.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSupplierInfo.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.model.resource;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -20,6 +27,11 @@
  * @author wangpeng
  * @since 2023-07-27
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @ApiModel
 @Data
 @TableName("biz_resource_supplier_info")
@@ -34,6 +46,7 @@
     /**
      * 供方编号
      */
+    @ExcelProperty(value = "供方编号", order = 1)
     @ApiModelProperty(value = "供方编号(自动生成)", dataType = "String")
     @TableField("supplier_no")
     private String supplierNo;
@@ -41,6 +54,7 @@
     /**
      * 供方名称
      */
+    @ExcelProperty(value = "供方名称", order = 2)
     @ApiModelProperty(value = "供方名称", dataType = "String")
     @TableField("supplier_name")
     private String supplierName;
@@ -60,6 +74,7 @@
     @TableField("supplier_type")
     private String supplierType;
 
+    @ExcelProperty(value = "供方类型", order = 3)
     @ApiModelProperty(value = "供方类型(字典value)", dataType = "String")
     @TableField(exist = false)
     private String supplierTypeName;
@@ -109,7 +124,8 @@
     /**
      * 电话
      */
-    @ApiModelProperty(value = "电话", dataType = "String")
+    @ExcelProperty(value = "联系电话", order = 4)
+    @ApiModelProperty(value = "联系电话", dataType = "String")
     @TableField("phone")
     private String phone;
 
@@ -158,6 +174,7 @@
     /**
      * 公司地址-省
      */
+    @ExcelProperty(value = "地址-省", order = 6)
     @ApiModelProperty(value = "公司地址-省", dataType = "String")
     @TableField("company_province_name")
     private String companyProvinceName;
@@ -172,6 +189,7 @@
     /**
      * 公司地址-市
      */
+    @ExcelProperty(value = "地址-市", order = 7)
     @ApiModelProperty(value = "公司地址-市", dataType = "String")
     @TableField("company_city_name")
     private String companyCityName;
@@ -186,6 +204,7 @@
     /**
      * 公司地址-区
      */
+    @ExcelProperty(value = "地址-区", order = 8)
     @ApiModelProperty(value = "公司地址-区", dataType = "String")
     @TableField("company_area_name")
     private String companyAreaName;
@@ -193,6 +212,7 @@
     /**
      * 公司地址-详细地址
      */
+    @ExcelProperty(value = "地址-详细地址", order = 9)
     @ApiModelProperty(value = "公司地址-详细地址", dataType = "String")
     @TableField("company_address")
     private String companyAddress;
@@ -200,6 +220,7 @@
     /**
      * 服务和供应的内容
      */
+    @ExcelProperty(value = "服务和供应的内容", order = 5)
     @ApiModelProperty(value = "服务和供应的内容", dataType = "String")
     @TableField("supplier_content")
     private String supplierContent;
@@ -250,6 +271,7 @@
     /**
      * 创建时间
      */
+    @ExcelProperty(value = "创建时间", order = 9)
     @ApiModelProperty(value = "创建时间", dataType = "String")
     @TableField("create_time")
     private String createTime;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/EnvLocationInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/EnvLocationInfo.java
new file mode 100644
index 0000000..d8e2d7b
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/EnvLocationInfo.java
@@ -0,0 +1,83 @@
+package com.casic.missiles.model.resource;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotEmpty;
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 实验室环境监控系统-设备表
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-06-07
+ */
+@ApiModel
+@Data
+@TableName("env_location_info")
+public class EnvLocationInfo implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "主键id", dataType = "Long")
+    @TableId("id")
+    private Long id;
+
+    /**
+     * 地点编号
+     */
+    @NotEmpty(message = "地点编号不能为空")
+    @ApiModelProperty(value = "地点编号", dataType = "String")
+    @TableField("location_no")
+    private String locationNo;
+
+    /**
+     * 地点名称
+     */
+    @ApiModelProperty(value = "地点名称", dataType = "String")
+    @TableField("location_name")
+    private String locationName;
+
+    /**
+     * 地点位置
+     */
+    @ApiModelProperty(value = "地点位置", dataType = "String")
+    @TableField("location_position")
+    private String locationPosition;
+
+    /**
+     * 创建人id
+     */
+    @ApiModelProperty(value = "创建人id", dataType = "Long")
+    @TableField("create_user_id")
+    private Long createUserId;
+
+    /**
+     * 创建人
+     */
+    @ApiModelProperty(value = "创建人", dataType = "String")
+    @TableField("create_user")
+    private String createUser;
+
+    /**
+     * 创建时间
+     */
+    @ApiModelProperty(value = "创建时间", dataType = "String")
+    @TableField("create_time")
+    private String createTime;
+
+    /**
+     * 更新时间
+     */
+    @ApiModelProperty(value = "更新时间", dataType = "String")
+    @TableField("update_time")
+    private String updateTime;
+
+
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemFileConfig.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemFileConfig.java
index 19e6845..86e569c 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemFileConfig.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemFileConfig.java
@@ -30,7 +30,7 @@
     @ApiModelProperty(value = "系统类别(1业务系统2受检系统3环境系统)", dataType = "Integer")
     @NotNull(message = "系统类别不能为空")
     @TableField("system_type")
-    private Integer systemType;
+    private Integer systemType = 1;
 
     @ApiModelProperty("下载编号")
     @TableField("download_no")
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemNotice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemNotice.java
index e94297d..06ec37d 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemNotice.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemNotice.java
@@ -34,7 +34,7 @@
     @ApiModelProperty(value = "系统类别(1业务系统2受检系统3环境系统)", dataType = "Integer")
     @NotNull(message = "系统类别不能为空")
     @TableField("system_type")
-    private Integer systemType;
+    private Integer systemType = 1;
 
     /**
      * 通知公告编号
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSign.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSign.java
index 6c0d7c9..954f4f8 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSign.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSign.java
@@ -51,7 +51,7 @@
     @ApiModelProperty(value = "系统类别(1业务系统2受检系统3环境系统)", dataType = "Integer")
     @NotNull(message = "系统类别不能为空")
     @TableField("system_type")
-    private Integer systemType;
+    private Integer systemType = 1;
 
     /**
      * 签名编号
@@ -130,4 +130,8 @@
     @TableField(exist = false)
     private List<Long> userIdList;
 
+    @ApiModelProperty(hidden = true)
+    @TableField(exist = false)
+    private String deptName;
+
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemTemplate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemTemplate.java
index 503a457..1d27ebe 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemTemplate.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemTemplate.java
@@ -47,7 +47,7 @@
     @ApiModelProperty(value = "系统类别(1业务系统2受检系统3环境系统)", dataType = "Integer")
     @NotNull(message = "系统类别不能为空")
     @TableField("system_type")
-    private Integer systemType;
+    private Integer systemType = 1;
 
     /**
      * 模板编号
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java
index 8c21cb0..f61e4a8 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java
@@ -32,4 +32,8 @@
     ReturnDTO approvalDelete(ApprovalDeleteRequest request);
 
     ReturnDTO failUpdate(T request);
+
+    List<O> listExport(R request);
+
+    List<O> listExportByIds(List<Long> ids);
 }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java
index 724166f..9bce15b 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java
@@ -157,6 +157,29 @@
         throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
     }
 
+    @Override
+    public List<O> listExport(R request) {
+        request.setCreateUserId(null);
+        request.setApprovalStatus(ApprovalStatusEnum.PASSED);
+        Page<O> page = PageFactory.defaultPage();
+        page.setCurrent(1);
+        page.setSearchCount(false);
+        page.setSize(Integer.MAX_VALUE);
+        Page<O> resultPage = this.baseMapper.selectBatchForApprovalList(page, request, null);
+        return resultPage.getRecords();
+    }
+
+    @Override
+    public List<O> listExportByIds(List<Long> ids) {
+        Page<O> page = PageFactory.defaultPage();
+        page.setCurrent(1);
+        page.setSearchCount(false);
+        page.setSize(Integer.MAX_VALUE);
+        List<String> businessKeys = ids.stream().map(String::valueOf).collect(Collectors.toList());
+        Page<O> resultPage = this.baseMapper.selectBatchForApprovalList(page, null, businessKeys);
+        return resultPage.getRecords();
+    }
+
     protected ReturnDTO updateApprovalStatus(Long id, String processId, String approvalStatus) {
         UpdateWrapper<T> updateWrapper = new UpdateWrapper<>();
         updateWrapper.eq("id", id);
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificatePrintServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificatePrintServiceImpl.java
index f6e4706..3228497 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificatePrintServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificatePrintServiceImpl.java
@@ -162,6 +162,30 @@
         return ReturnUtil.success(printLogMapper.selectList(wrapper));
     }
 
+    @Override
+    public List<CertificatePrintListResponse> listByIds(List<Long> ids) {
+        Page<CertificatePrintListResponse> page = PageFactory.defaultPage();
+        page.setCurrent(1);
+        page.setSearchCount(false);
+        page.setSize(Integer.MAX_VALUE);
+        List<String> businessKeys = ids.stream().map(String::valueOf).collect(Collectors.toList());
+        Page<CertificatePrintListResponse> resultPage = this.baseMapper.selectBatchForApprovalList(page, null, businessKeys);
+        return resultPage.getRecords();
+    }
+
+    @Override
+    public List<CertificatePrintListResponse> list(CertificatePrintApprovalListRequest request) {
+        request.setCreateUserId(null);
+        request.setApprovalStatus(null);
+        request.setPrintStatus(null);
+        Page<CertificatePrintListResponse> page = PageFactory.defaultPage();
+        page.setCurrent(1);
+        page.setSearchCount(false);
+        page.setSize(Integer.MAX_VALUE);
+        Page<CertificatePrintListResponse> resultPage = certificatePrintMapper.selectBatchForApprovalList(page, request, null);
+        return resultPage.getRecords();
+    }
+
     private void savePrintLog(Long id) {
         BizBusinessCertificatePrintLog printLog = new BizBusinessCertificatePrintLog();
         BizBusinessCertificatePrint certificatePrint = certificatePrintMapper.selectById(id);
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificateReportServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificateReportServiceImpl.java
index 457555f..24146be 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificateReportServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificateReportServiceImpl.java
@@ -158,8 +158,8 @@
         QueryWrapper<BizBusinessCertificateMeasureResultData> mWrapper = new QueryWrapper<>();
         mWrapper.eq("report_id", reportId);
         boolean mRemove = certificateMeasureResultDataService.remove(mWrapper);
-        Assert.isFalse(eRemove || mRemove, () -> {
+        if(!eRemove || !mRemove){
             throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
-        });
+        }
     }
 }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessIdentifyInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessIdentifyInfoServiceImpl.java
index 4c8e190..f7e63ca 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessIdentifyInfoServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessIdentifyInfoServiceImpl.java
@@ -1,8 +1,10 @@
 package com.casic.missiles.service.Impl.business;
 
+import cn.hutool.core.date.DateUtil;
 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.core.page.PageFactory;
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.business.identify.IdentifyListRequest;
@@ -14,11 +16,14 @@
 import com.casic.missiles.service.business.IBizBusinessIdentifyInfoService;
 import com.casic.missiles.utils.DictCodeUtils;
 import com.casic.missiles.utils.NumberGeneratorUtil;
+import com.casic.missiles.utils.QRCodeUtil;
 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.List;
+
 /**
  * <p>
  * 计量检定业务-任务计量管理-标识打印 服务实现类
@@ -35,9 +40,9 @@
     @Override
     public Page<BizBusinessIdentifyInfo> identifyListPage(Page<BizBusinessIdentifyInfo> page, IdentifyListRequest request) throws Exception {
         QueryWrapper<BizBusinessIdentifyInfo> wrapper = new QueryWrapper<>();
-        wrapper.eq("identify_type", request.getIdentifyType());
-        wrapper.like("device_no", request.getDeviceNo());
-        wrapper.like("device_name", request.getDeviceName());
+        wrapper.eq(StringUtils.isNotEmpty(request.getIdentifyType()), "identify_type", request.getIdentifyType());
+        wrapper.like(StringUtils.isNotEmpty(request.getDeviceNo()),"device_no", request.getDeviceNo());
+        wrapper.like(StringUtils.isNotEmpty(request.getDeviceName()), "device_name", request.getDeviceName());
         wrapper.apply(StringUtils.isNotBlank(request.getCreateTimeStart()),
                 "{0} <= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getCreateTimeStart().split(" ")[0]);
         wrapper.apply(StringUtils.isNotBlank(request.getCreateTimeEnd()),
@@ -64,8 +69,11 @@
     }
 
     @Override
-    public ReturnDTO updateIdentify(BizBusinessIdentifyInfo identifyInfo) {
-        if(identifyInfoMapper.updateById(identifyInfo) > 0){
+    public ReturnDTO updateIdentify(Long id) {
+        BizBusinessIdentifyInfo info = new BizBusinessIdentifyInfo();
+        info.setId(id);
+        info.setUpdateTime(DateUtil.now());
+        if(identifyInfoMapper.updateById(info) > 0){
             return ReturnUtil.success();
         }
         throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
@@ -79,4 +87,20 @@
         throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
     }
 
+    @Override
+    public List<BizBusinessIdentifyInfo> list(IdentifyListRequest request) throws Exception {
+        Page<BizBusinessIdentifyInfo> page = PageFactory.defaultPage();
+        page.setCurrent(1);
+        page.setSearchCount(false);
+        page.setSize(Integer.MAX_VALUE);
+        Page<BizBusinessIdentifyInfo> resultPage = this.identifyListPage(page, request);
+        return resultPage.getRecords();
+    }
+
+    @Override
+    public ReturnDTO<String> equipmentQrCode(Long id) {
+        String base64QRCode = QRCodeUtil.getBase64QRCode(String.valueOf(id));
+        return ReturnUtil.success(base64QRCode);
+    }
+
 }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOrderInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOrderInfoServiceImpl.java
index 82952ad..d8d2c6a 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOrderInfoServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOrderInfoServiceImpl.java
@@ -35,6 +35,7 @@
 import javax.servlet.http.HttpServletResponse;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 import java.util.stream.Collectors;
 
 /**
@@ -209,13 +210,16 @@
     private QueryWrapper<OrderListResponse> listParamWrapperBuilder(OrderListRequest request) {
         QueryWrapper<OrderListResponse> wrapper = new QueryWrapper<>();
         wrapper.like(StringUtils.isNotBlank(request.getOrderNo()), "order_no", request.getOrderNo());
+        wrapper.like(Objects.nonNull(request.getCustomerId()), "customer_id", request.getCustomerId());
         wrapper.like(StringUtils.isNotBlank(request.getCustomerName()), "customer_name", request.getCustomerName());
         wrapper.like(StringUtils.isNotBlank(request.getDeliverer()), "deliverer", request.getDeliverer());
         wrapper.like(StringUtils.isNotBlank(request.getCreateUserName()), "create_user_name", request.getCreateUserName());
-        wrapper.apply(StringUtils.isNotBlank(request.getCreateStartTime()),
-                "{0} <= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getCreateStartTime().split(" ")[0]);
-        wrapper.apply(StringUtils.isNotBlank(request.getCreateEndTime()),
-                "{0} >= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getCreateEndTime().split(" ")[0]);
+        if(StringUtils.isNotBlank(request.getCreateStartTime())){
+            wrapper.apply("{0} <= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getCreateStartTime().split(" ")[0]);
+        }
+        if(StringUtils.isNotBlank(request.getCreateEndTime())){
+            wrapper.apply("{0} >= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getCreateEndTime().split(" ")[0]);
+        }
         wrapper.orderByDesc("create_time");
         return wrapper;
     }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceAssessServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceAssessServiceImpl.java
index c6af980..ce40138 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceAssessServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceAssessServiceImpl.java
@@ -1,10 +1,33 @@
 package com.casic.missiles.service.Impl.business;
 
-import com.casic.missiles.model.business.BizBusinessOutsourceAssess;
+import cn.hutool.core.lang.Assert;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.casic.missiles.core.model.auth.AuthUser;
+import com.casic.missiles.core.shiro.ShiroKit;
+import com.casic.missiles.dto.BaseApprovalSubmitRequest;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.ReturnUtil;
+import com.casic.missiles.dto.business.outsource.OutsourceAssessApprovalListRequest;
+import com.casic.missiles.dto.business.outsource.OutsourceAssessSaveResponse;
+import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.NoGenerateFileCodeEnum;
+import com.casic.missiles.enums.NoGenerateRecordTypeCodeEnum;
+import com.casic.missiles.enums.system.ApprovalStatusEnum;
+import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.mapper.business.BizBusinessOutsourceAssessMapper;
+import com.casic.missiles.model.business.BizBusinessOutsourceAssess;
+import com.casic.missiles.model.business.BizBusinessOutsourceAssessSampleRelation;
+import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl;
+import com.casic.missiles.service.business.IBizBusinessOutsourceAssessSampleRelationService;
 import com.casic.missiles.service.business.IBizBusinessOutsourceAssessService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.casic.missiles.utils.NoGeneratorUtil;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Objects;
 
 /**
  * <p>
@@ -15,6 +38,103 @@
  * @since 2023-08-16
  */
 @Service
-public class BizBusinessOutsourceAssessServiceImpl extends ServiceImpl<BizBusinessOutsourceAssessMapper, BizBusinessOutsourceAssess> implements IBizBusinessOutsourceAssessService {
+public class BizBusinessOutsourceAssessServiceImpl extends GeneralApprovalServiceImpl<BizBusinessOutsourceAssessMapper, BizBusinessOutsourceAssess, BizBusinessOutsourceAssess, OutsourceAssessApprovalListRequest, BaseApprovalSubmitRequest> implements IBizBusinessOutsourceAssessService {
+    @Autowired
+    private IBizBusinessOutsourceAssessSampleRelationService outsourceAssessSampleRelationService;
 
+    @Override
+    public ReturnDTO<OutsourceAssessSaveResponse> saveOutsourceAssess(BizBusinessOutsourceAssess request) {
+        //生成编号
+        String labCode = request.getLabCode();
+        String groupCode = request.getGroupCode();
+        Long maxNo = this.baseMapper.selectMaxProjectNo();
+        String projectNo = NoGeneratorUtil.getCode(NoGenerateFileCodeEnum.D, labCode, NoGenerateRecordTypeCodeEnum.OUTSOURCE_ACCESS, groupCode, maxNo);
+        request.setCreateUserId(request.getUserId());
+        request.setCreateUserName(request.getUserName());
+        request.setApprovalStatus(ApprovalStatusEnum.DRAFT); //草稿箱状态
+        request.setProjectNo(projectNo);
+        int row = this.baseMapper.insert(request);
+        Assert.isFalse(row <= 0, () -> {
+            throw new BusinessException(BusinessExceptionEnum.OUTSOURCE_ACCESS_SAVE_FAILED);
+        });
+        //关联表
+        saveRelationData(request);
+        OutsourceAssessSaveResponse saveResponse = new OutsourceAssessSaveResponse();
+        saveResponse.setId(request.getId());
+        saveResponse.setProjectNo(projectNo);
+        return ReturnUtil.success(saveResponse);
+    }
+
+    @Override
+    @Transactional
+    public ReturnDTO draftUpdate(BizBusinessOutsourceAssess request) {
+        if (this.baseMapper.updateById(request) > 0) {
+            //关联表删除、增加
+            removeRelationData(request.getId());
+            saveRelationData(request);
+            return ReturnUtil.success();
+        }
+        throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
+    }
+
+    @Override
+    public ReturnDTO draftDelete(Long id) {
+        if (this.baseMapper.deleteById(id) > 0) {
+            //关联表删除
+            removeRelationData(id);
+            return ReturnUtil.success();
+        }
+        throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
+    }
+
+    @Override
+    public ReturnDTO draftBatchDelete(List<Long> ids) {
+        if (this.baseMapper.deleteBatchIds(ids) >= 0) {
+            ids.forEach(id -> removeRelationData(id));
+            return ReturnUtil.success();
+        }
+        throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
+    }
+
+    @Override
+    @Transactional
+    public ReturnDTO failUpdate(BizBusinessOutsourceAssess request) {
+        AuthUser user = ShiroKit.getUser();
+        Assert.isFalse(Objects.isNull(user), () -> {
+            throw new BusinessException(BusinessExceptionEnum.LOGIN_USER_ACQUIRE_FAILED);
+        });
+        request.setApprovalStatus(ApprovalStatusEnum.IN_APPROVED);
+        if (this.baseMapper.updateById(request) > 0) {
+            //关联表删除、增加
+            removeRelationData(request.getId());
+            saveRelationData(request);
+            baseApprovalService.failUpdate(request.getProcessId());
+            return ReturnUtil.success();
+        }
+        throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
+    }
+
+    private void saveRelationData(BizBusinessOutsourceAssess request) {
+        List<BizBusinessOutsourceAssessSampleRelation> sampleRelations = new ArrayList<>();
+        request.getOrderSampleList().forEach(dto -> {
+            BizBusinessOutsourceAssessSampleRelation relation = new BizBusinessOutsourceAssessSampleRelation();
+            relation.setOrderId(dto.getOrderId());
+            relation.setSampleId(dto.getSampleId());
+            relation.setAccessId(request.getId());
+            sampleRelations.add(relation);
+        });
+        if(outsourceAssessSampleRelationService.saveBatch(sampleRelations)){
+            return;
+        }
+        throw new BusinessException(BusinessExceptionEnum.OUTSOURCE_ACCESS_SAVE_FAILED);
+    }
+
+    private void removeRelationData(Long assessId) {
+        QueryWrapper<BizBusinessOutsourceAssessSampleRelation> wrapper = new QueryWrapper<>();
+        wrapper.eq("access_id", assessId);
+        if(outsourceAssessSampleRelationService.remove(wrapper)){
+            return;
+        }
+        throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
+    }
 }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceProtocolServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceProtocolServiceImpl.java
new file mode 100644
index 0000000..821e728
--- /dev/null
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceProtocolServiceImpl.java
@@ -0,0 +1,60 @@
+package com.casic.missiles.service.Impl.business;
+
+import cn.hutool.core.lang.Assert;
+import com.casic.missiles.dto.BaseApprovalSubmitRequest;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.ReturnUtil;
+import com.casic.missiles.dto.business.outsource.OutsourceProtocolApprovalListRequest;
+import com.casic.missiles.dto.business.outsource.OutsourceProtocolSaveResponse;
+import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.NoGenerateFileCodeEnum;
+import com.casic.missiles.enums.NoGenerateRecordTypeCodeEnum;
+import com.casic.missiles.enums.system.ApprovalStatusEnum;
+import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.mapper.business.BizBusinessOutsourceProtocolMapper;
+import com.casic.missiles.mapper.business.BizBusinessOutsourcerInfoMapper;
+import com.casic.missiles.model.business.BizBusinessOutsourceProtocol;
+import com.casic.missiles.model.business.BizBusinessOutsourcerInfo;
+import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl;
+import com.casic.missiles.service.business.IBizBusinessOutsourceProtocolService;
+import com.casic.missiles.utils.NoGeneratorUtil;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 计量检定业务-分包管理-测试、校准或检定工作分包协议书 服务实现类
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-08-24
+ */
+@Service
+public class BizBusinessOutsourceProtocolServiceImpl extends GeneralApprovalServiceImpl<BizBusinessOutsourceProtocolMapper, BizBusinessOutsourceProtocol, BizBusinessOutsourceProtocol, OutsourceProtocolApprovalListRequest, BaseApprovalSubmitRequest> implements IBizBusinessOutsourceProtocolService {
+    @Autowired
+    private BizBusinessOutsourcerInfoMapper outsourcerInfoMapper;
+
+    @Override
+    public ReturnDTO<OutsourceProtocolSaveResponse> saveOutsourceProtocol(BizBusinessOutsourceProtocol request) {
+        //生成编号
+        String labCode = request.getLabCode();
+        String groupCode = request.getGroupCode();
+        Long maxNo = this.baseMapper.selectMaxProtocolNo();
+        String protocolNo = NoGeneratorUtil.getCode(NoGenerateFileCodeEnum.D, labCode, NoGenerateRecordTypeCodeEnum.OUTSOURCE_PROTOCOL, groupCode, maxNo);
+        request.setCreateUserId(request.getUserId());
+        request.setCreateUserName(request.getUserName());
+        request.setApprovalStatus(ApprovalStatusEnum.DRAFT); //草稿箱状态
+        request.setProtocolNo(protocolNo);
+        BizBusinessOutsourcerInfo outsourcerInfo = outsourcerInfoMapper.selectById(request.getOutsourcerId());
+        request.setOutsourceNo(outsourcerInfo.getOutsourcerNo());
+        request.setOutsourceName(outsourcerInfo.getOutsourcerName());
+        int row = this.baseMapper.insert(request);
+        Assert.isFalse(row <= 0, () -> {
+            throw new BusinessException(BusinessExceptionEnum.OUTSOURCE_PROTOCOL_SAVE_FAILED);
+        });
+        OutsourceProtocolSaveResponse saveResponse = new OutsourceProtocolSaveResponse();
+        saveResponse.setId(request.getId());
+        saveResponse.setProtocolNo(protocolNo);
+        return ReturnUtil.success(saveResponse);
+    }
+}
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourcerInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourcerInfoServiceImpl.java
index 75f639d..8aadad7 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourcerInfoServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourcerInfoServiceImpl.java
@@ -3,12 +3,12 @@
 import cn.hutool.core.lang.Assert;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.dto.*;
 import com.casic.missiles.dto.business.outsource.OutsourcerInfoApprovalListRequest;
 import com.casic.missiles.dto.business.outsource.OutsourcerSaveResponse;
 import com.casic.missiles.enums.BusinessExceptionEnum;
-import com.casic.missiles.enums.PrefixCodeEnum;
+import com.casic.missiles.enums.NoGenerateFileCodeEnum;
+import com.casic.missiles.enums.NoGenerateRecordTypeCodeEnum;
 import com.casic.missiles.enums.system.ApprovalStatusEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.mapper.business.BizBusinessOutsourcerInfoMapper;
@@ -20,7 +20,7 @@
 import com.casic.missiles.service.business.IBizBusinessOutsourcerInfoService;
 import com.casic.missiles.service.business.IBizBusinessOutsourcerUserInfoService;
 import com.casic.missiles.utils.DictCodeUtils;
-import com.casic.missiles.utils.NumberGeneratorUtil;
+import com.casic.missiles.utils.NoGeneratorUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -42,22 +42,12 @@
     private IBizBusinessOutsourcerUserInfoService outsourcerUserInfoService;
 
     @Override
-    public List<BizBusinessOutsourcerInfo> list(OutsourcerInfoApprovalListRequest request) {
-        request.setCreateUserId(null);
-        request.setApprovalStatus(ApprovalStatusEnum.PASSED);
-        Page<BizBusinessOutsourcerInfo> page = PageFactory.defaultPage();
-        page.setCurrent(1);
-        page.setSearchCount(false);
-        page.setSize(Integer.MAX_VALUE);
-        Page<BizBusinessOutsourcerInfo> resultPage = this.baseMapper.selectBatchForApprovalList(page, request, null);
-        return resultPage.getRecords();
-    }
-
-    @Override
     public ReturnDTO<OutsourcerSaveResponse> saveOutsourcer(BizBusinessOutsourcerInfo request) {
         //生成编号
+        String labCode = request.getLabCode();
+        String groupCode = request.getGroupCode();
         Long maxNo = this.baseMapper.selectMaxNo();
-        String outsourcerNo = NumberGeneratorUtil.getContactNo(PrefixCodeEnum.OUTSOURCER_PREFIX, maxNo);
+        String outsourcerNo = NoGeneratorUtil.getCode(NoGenerateFileCodeEnum.D, labCode, NoGenerateRecordTypeCodeEnum.OUTSOURCE_INFO, groupCode, maxNo);
         request.setOutsourcerNo(outsourcerNo);
         request.setCreateUserId(request.getUserId());
         request.setCreateUserName(request.getUserName());
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessSiteExecutiveInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessSiteExecutiveInfoServiceImpl.java
index ebab3e6..6c6a129 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessSiteExecutiveInfoServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessSiteExecutiveInfoServiceImpl.java
@@ -189,9 +189,9 @@
         QueryWrapper<BizBusinessSiteExecutiveStaffRelation> mWrapper = new QueryWrapper<>();
         mWrapper.eq("site_executive_id", siteExecutiveId);
         boolean mRemove = siteExecutiveStaffRelationService.remove(mWrapper);
-        Assert.isFalse(eRemove || mRemove, () -> {
+        if(!eRemove || !mRemove){
             throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
-        });
+        }
     }
 
     private void doPopulateSiteExecutive(SiteExecutiveDetailResponse detailResponse) {
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessLabExecutiveInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessLabExecutiveInfoServiceImpl.java
index 50c5616..0242fcf 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessLabExecutiveInfoServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessLabExecutiveInfoServiceImpl.java
@@ -297,6 +297,29 @@
     }
 
     @Override
+    public List<SampleLabExecutiveListResponse> deptLabExecutiveList(SampleLabExecutiveListRequest request) throws Exception {
+        Page<SampleLabExecutiveListResponse> page = PageFactory.defaultPage();
+        page.setCurrent(1);
+        page.setSearchCount(false);
+        page.setSize(Integer.MAX_VALUE);
+        Page<SampleLabExecutiveListResponse> resultPage = this.deptLabExecutiveListPage(page, request);
+        return resultPage.getRecords();
+    }
+
+    @Override
+    public List<SampleLabExecutiveListResponse> deptLabExecutiveListByIds(String measureStatus, List<Long> ids) throws Exception {
+        Page<SampleLabExecutiveListResponse> page = PageFactory.defaultPage();
+        page.setCurrent(1);
+        page.setSearchCount(false);
+        page.setSize(Integer.MAX_VALUE);
+        SampleLabExecutiveListRequest request = new SampleLabExecutiveListRequest();
+        request.setIds(ids);
+        request.setMeasureStatus(measureStatus);
+        Page<SampleLabExecutiveListResponse> resultPage = this.deptLabExecutiveListPage(page, request);
+        return resultPage.getRecords();
+    }
+
+    @Override
     public Page<SampleLabExecutiveListResponse> myLabExecutiveListPage(Page<SampleLabExecutiveListResponse> page, SampleLabExecutiveListRequest labExecutiveListRequest) throws Exception{
         AuthUser user = ShiroKit.getUser();
         Assert.isFalse(Objects.isNull(user), () -> {
@@ -350,6 +373,29 @@
     }
 
     @Override
+    public List<SampleLabExecutiveListResponse> myLabExecutiveList(SampleLabExecutiveListRequest request) throws Exception {
+        Page<SampleLabExecutiveListResponse> page = PageFactory.defaultPage();
+        page.setCurrent(1);
+        page.setSearchCount(false);
+        page.setSize(Integer.MAX_VALUE);
+        Page<SampleLabExecutiveListResponse> resultPage = this.myLabExecutiveListPage(page, request);
+        return resultPage.getRecords();
+    }
+
+    @Override
+    public List<SampleLabExecutiveListResponse> myLabExecutiveListByIds(String measureStatus, List<Long> ids) throws Exception {
+        Page<SampleLabExecutiveListResponse> page = PageFactory.defaultPage();
+        page.setCurrent(1);
+        page.setSearchCount(false);
+        page.setSize(Integer.MAX_VALUE);
+        SampleLabExecutiveListRequest request = new SampleLabExecutiveListRequest();
+        request.setIds(ids);
+        request.setMeasureStatus(measureStatus);
+        Page<SampleLabExecutiveListResponse> resultPage = this.myLabExecutiveListPage(page, request);
+        return resultPage.getRecords();
+    }
+
+    @Override
     public List<SampleAmountResponse> myExecutiveAmount() {
         //登录用户id获取计量人员id，实验室检测信息中存储的是计量人员id
         AuthUser user = ShiroKit.getUser();
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentInfoServiceImpl.java
index 864b05e..db8cad4 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentInfoServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentInfoServiceImpl.java
@@ -35,7 +35,6 @@
 import com.casic.missiles.utils.ConvertUtils;
 import com.casic.missiles.utils.DictCodeUtils;
 import com.casic.missiles.utils.NumberGeneratorUtil;
-import org.flowable.engine.RuntimeService;
 import org.flowable.engine.runtime.ProcessInstance;
 import org.jetbrains.annotations.NotNull;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -43,7 +42,6 @@
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
 
-import javax.annotation.Resource;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
@@ -81,8 +79,6 @@
     private IBizEquipmentAttachmentService attachmentService;
     @Autowired
     private IBizEquipmentCheckpointService checkpointService;
-    @Resource
-    private RuntimeService runtimeService;
     @Autowired
     private ApprovalOperateService approvalOperateService;
 
@@ -235,18 +231,18 @@
     private void updateRelationInfo(EquipmentAddRequest request, BizEquipmentInfoApproval equipmentInfoApproval) {
         QueryWrapper<BizEquipmentTechnicalTarget> targetWrapper = new QueryWrapper<>();
         targetWrapper.eq("equipment_no", equipmentInfoApproval.getEquipmentNo());
-        boolean removeTargetFlag = technicalTargetService.remove(targetWrapper);
-        boolean saveTargetFlag = technicalTargetService.saveBatch(request.getTechnicalTargetList());
+        technicalTargetService.remove(targetWrapper);
+        technicalTargetService.saveBatch(request.getTechnicalTargetList());
 
         QueryWrapper<BizEquipmentAttachment> attachmentWrapper = new QueryWrapper<>();
         attachmentWrapper.eq("equipment_no", equipmentInfoApproval.getEquipmentNo());
-        boolean removeAttachmentFlag = attachmentService.remove(attachmentWrapper);
-        boolean saveAttachmentFlag = attachmentService.saveBatch(request.getAttachmentList());
+        attachmentService.remove(attachmentWrapper);
+        attachmentService.saveBatch(request.getAttachmentList());
 
         QueryWrapper<BizEquipmentCheckpoint> checkpointWrapper = new QueryWrapper<>();
         checkpointWrapper.eq("equipment_no", equipmentInfoApproval.getEquipmentNo());
-        boolean removeCheckpointFlag = checkpointService.remove(checkpointWrapper);
-        boolean saveCheckpointFlag = checkpointService.saveBatch(request.getCheckpointList());
+        checkpointService.remove(checkpointWrapper);
+        checkpointService.saveBatch(request.getCheckpointList());
     }
 
     @Override
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardInfoServiceImpl.java
index faff1ae..c50a5b3 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardInfoServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardInfoServiceImpl.java
@@ -22,7 +22,9 @@
 import com.casic.missiles.mapper.equipment.BizEquipmentStandardInfoMapper;
 import com.casic.missiles.mapper.equipment.BizEquipmentStandardTechnologyRelationMapper;
 import com.casic.missiles.mapper.resource.BizResourceStaffInfoMapper;
-import com.casic.missiles.model.equipment.*;
+import com.casic.missiles.model.equipment.BizEquipmentStandardInfo;
+import com.casic.missiles.model.equipment.BizEquipmentStandardInfoApproval;
+import com.casic.missiles.model.equipment.BizEquipmentStandardTechnologyRelation;
 import com.casic.missiles.model.resource.BizResourceStaffInfo;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.dao.DeptMapper;
@@ -33,14 +35,12 @@
 import com.casic.missiles.service.flowable.ApprovalOperateService;
 import com.casic.missiles.utils.ConvertUtils;
 import com.casic.missiles.utils.DictCodeUtils;
-import org.flowable.engine.RuntimeService;
 import org.flowable.engine.runtime.ProcessInstance;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
 
-import javax.annotation.Resource;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
@@ -62,8 +62,6 @@
     private BizResourceStaffInfoMapper staffInfoMapper;
     @Autowired
     private IBaseApprovalService baseApprovalService;
-    @Resource
-    private RuntimeService runtimeService;
     @Autowired
     private ApprovalOperateService approvalOperateService;
     @Autowired
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSealInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSealInfoServiceImpl.java
index 7c91fa2..00040d6 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSealInfoServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSealInfoServiceImpl.java
@@ -15,6 +15,7 @@
 import com.casic.missiles.modular.system.model.User;
 import com.casic.missiles.service.resource.IBizResourceSealInfoService;
 import com.casic.missiles.utils.DictCodeUtils;
+import com.casic.missiles.utils.MinioUtil;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -33,6 +34,8 @@
     private BizResourceSealInfoMapper sealInfoMapper;
     @Autowired
     private UserMapper userMapper;
+    @Autowired
+    private MinioUtil minioUtil;
 
     @Override
     public Page<BizResourceSealInfo> listPage(Page<BizResourceSealInfo> page, SealInfoListRequest request) throws Exception {
@@ -44,6 +47,7 @@
         Page<BizResourceSealInfo> sealInfoPage = sealInfoMapper.selectPage(page, wrapper);
         for (BizResourceSealInfo record : sealInfoPage.getRecords()) {
             DictCodeUtils.convertDictCodeToName(record);
+            record.setMinioFileUrl(minioUtil.getFileUrl(record.getMinioFileName()));
         }
         return sealInfoPage;
     }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceStaffInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceStaffInfoServiceImpl.java
index f058cf5..09203ac 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceStaffInfoServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceStaffInfoServiceImpl.java
@@ -3,6 +3,7 @@
 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.core.page.PageFactory;
 import com.casic.missiles.dto.IdDTO;
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
@@ -86,6 +87,13 @@
     }
 
     @Override
+    public List<BizResourceStaffInfo> list(StaffListRequest request) throws Exception {
+        Page<BizResourceStaffInfo> page = PageFactory.defaultPage();
+        Page<BizResourceStaffInfo> staffInfoPage = this.listPage(page, request);
+        return staffInfoPage.getRecords();
+    }
+
+    @Override
     @Transactional
     public ReturnDTO<IdDTO> staffBaseAdd(BizResourceStaffInfo staffInfo) {
         //登录账号查重
@@ -495,6 +503,28 @@
         return certResponsePage;
     }
 
+    @Override
+    public List<StaffCertResponse> certListByIds(List<Long> ids) throws Exception {
+        Page<StaffCertResponse> page = PageFactory.defaultPage();
+        page.setCurrent(1);
+        page.setSearchCount(false);
+        page.setSize(Integer.MAX_VALUE);
+        StaffCertRequest request = new StaffCertRequest();
+        request.setIds(ids);
+        Page<StaffCertResponse> resultPage = this.certListPage(page, request);
+        return resultPage.getRecords();
+    }
+
+    @Override
+    public List<StaffCertResponse> certList(StaffCertRequest request) throws Exception {
+        Page<StaffCertResponse> page = PageFactory.defaultPage();
+        page.setCurrent(1);
+        page.setSearchCount(false);
+        page.setSize(Integer.MAX_VALUE);
+        Page<StaffCertResponse> resultPage = this.certListPage(page, request);
+        return resultPage.getRecords();
+    }
+
     @Async
     public void deleteRelationInfo(Long staffId){
         QueryWrapper<BizResourceStaffEducation> educationWrapper = new QueryWrapper<>();
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceStaffVerifierServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceStaffVerifierServiceImpl.java
index 8ac7eee..b508d45 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceStaffVerifierServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceStaffVerifierServiceImpl.java
@@ -52,8 +52,8 @@
     private WebSocket webSocket;
 
     @Override
-    public ReturnDTO expirationReminder(IdDTO idDto) {
-        BizResourceStaffVerifier staffVerifier = verifierMapper.selectById(idDto.getId());
+    public ReturnDTO expirationReminder(IdDTO idDTO) {
+        BizResourceStaffVerifier staffVerifier = verifierMapper.selectById(idDTO.getId());
         BizResourceStaffInfo staffInfo = staffInfoMapper.selectById(staffVerifier.getStaffId());
         QueryWrapper<User> wrapper = new QueryWrapper<>();
         wrapper.eq("account", staffInfo.getAccount());
@@ -65,7 +65,7 @@
         Assert.isFalse(Objects.isNull(user), () -> {
             throw new BusinessException(BusinessExceptionEnum.LOGIN_USER_ACQUIRE_FAILED);
         });
-        WorkbenchRemindMessage remindMessage = new WorkbenchRemindMessage(userInfo.getId(), userInfo.getDeptId(), idDto.getId(), staffVerifier.getCertNo(), MessageTypeEnum.STAFF_CERT.getCode(), MessageSourceModuleEnum.RESOURCE.getCode(), MessageTypeEnum.STAFF_CERT.getValue(), MessageTypeEnum.STAFF_CERT.getValue(), staffVerifier.getCertName(),0, user.getId(), user.getName());
+        WorkbenchRemindMessage remindMessage = new WorkbenchRemindMessage(userInfo.getId(), userInfo.getDeptId(), idDTO.getId(), staffVerifier.getCertNo(), MessageTypeEnum.STAFF_CERT.getCode(), MessageSourceModuleEnum.RESOURCE.getCode(), MessageTypeEnum.STAFF_CERT.getValue(), MessageTypeEnum.STAFF_CERT.getValue(), staffVerifier.getCertName(),0, user.getId(), user.getName());
         if(messageMapper.insert(remindMessage) > 0){
             // 新增到消息列表后向用户推送消息
             webSocket.sendOneMessage(String.valueOf(userInfo.getId()), JSONObject.toJSONString(remindMessage));
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceTrainInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceTrainInfoServiceImpl.java
index c1d6308..3a533f2 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceTrainInfoServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceTrainInfoServiceImpl.java
@@ -44,11 +44,14 @@
     @Override
     public Page<BizResourceTrainInfo> listPage(Page<BizResourceTrainInfo> page, TrainListRequest request) throws Exception {
         QueryWrapper<BizResourceTrainInfo> wrapper = new QueryWrapper<>();
-        wrapper.like("train_no", request.getTrainNo());
-        wrapper.apply(StringUtils.isNotBlank(request.getCreateTimeStart()),//apply方法传入参数名不能为空
-                "{0} <= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getCreateTimeStart().split(" ")[0]);
-        wrapper.apply(StringUtils.isNotBlank(request.getCreateTimeEnd()),
-                "{0} >= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getCreateTimeEnd().split(" ")[0]);
+        wrapper.like(StringUtils.isNotEmpty(request.getTrainNo()), "train_no", request.getTrainNo());
+        wrapper.like(StringUtils.isNotEmpty(request.getDutyLeader()),"duty_leader", request.getDutyLeader());
+        if(StringUtils.isNotBlank(request.getCreateTimeStart())){
+            wrapper.apply("{0} <= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getCreateTimeStart().split(" ")[0]);
+        }
+        if(StringUtils.isNotBlank(request.getCreateTimeEnd())){
+            wrapper.apply("{0} >= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getCreateTimeEnd().split(" ")[0]);
+        }
         wrapper.orderByDesc("create_time");
         Page<BizResourceTrainInfo> trainInfoPage = trainInfoMapper.selectPage(page, wrapper);
         for (BizResourceTrainInfo record : trainInfoPage.getRecords()) {
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/EnvLocationInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/EnvLocationInfoServiceImpl.java
new file mode 100644
index 0000000..cdc5742
--- /dev/null
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/EnvLocationInfoServiceImpl.java
@@ -0,0 +1,31 @@
+package com.casic.missiles.service.Impl.resource;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.casic.missiles.dto.resource.environment.LocationListRequest;
+import com.casic.missiles.dto.resource.environment.LocationListResponse;
+import com.casic.missiles.mapper.resource.EnvLocationInfoMapper;
+import com.casic.missiles.model.resource.EnvLocationInfo;
+import com.casic.missiles.service.resource.IEnvLocationInfoService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 实验室环境监控系统-设备表 服务实现类
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-06-07
+ */
+@Service
+public class EnvLocationInfoServiceImpl extends ServiceImpl<EnvLocationInfoMapper, EnvLocationInfo> implements IEnvLocationInfoService {
+    @Autowired
+    private EnvLocationInfoMapper locationInfoMapper;
+
+    @Override
+    public Page<LocationListResponse> listPage(Page<LocationListResponse> page, LocationListRequest request) {
+        Page<LocationListResponse> resultPage = locationInfoMapper.selectLocationListPage(page, request);
+        return resultPage;
+    }
+}
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/DownloadCenterServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/DownloadCenterServiceImpl.java
index c956d24..d9f3282 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/DownloadCenterServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/DownloadCenterServiceImpl.java
@@ -131,10 +131,12 @@
         wrapper.like(StringUtils.isNotBlank(request.getModuleName()), "module_name", request.getModuleName());
         wrapper.like(StringUtils.isNotBlank(request.getFileName()), "file_name", request.getFileName());
         wrapper.like(StringUtils.isNotBlank(request.getFileType()), "file_type", request.getFileType());
-        wrapper.apply(StringUtils.isNotBlank(request.getStartTime()),
-                "{0} <= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getStartTime().split(" ")[0]);
-        wrapper.apply(StringUtils.isNotBlank(request.getEndTime()),
-                "{0} >= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getEndTime().split(" ")[0]);
+        if(StringUtils.isNotBlank(request.getStartTime())){
+            wrapper.apply("{0} <= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getStartTime().split(" ")[0]);
+        }
+        if(StringUtils.isNotBlank(request.getEndTime())){
+            wrapper.apply("{0} >= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getEndTime().split(" ")[0]);
+        }
         wrapper.orderByDesc("create_time");
         return wrapper;
     }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemSignServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemSignServiceImpl.java
index 41976bb..7e90a09 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemSignServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemSignServiceImpl.java
@@ -52,15 +52,14 @@
 
     @Override
     public Page<SystemSign> listPage(Page<SystemSign> page, SignListRequest request) {
-        QueryWrapper<SystemSign> wrapper = getWrapper(request);
-        Page<SystemSign> signPage = signMapper.selectPage(page, wrapper);
+        Page<SystemSign> signPage = signMapper.selectSignListPage(page, request);
         return signPage;
     }
 
     @Override
     public List<SystemSign> list(SignListRequest request) {
-        QueryWrapper<SystemSign> wrapper = getWrapper(request);
-        return signMapper.selectList(wrapper);
+        List<SystemSign> signList = signMapper.selectSignList(request);
+        return signList;
     }
 
     @Override
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessCertificatePrintService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessCertificatePrintService.java
index 03247ab..7d6db77 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessCertificatePrintService.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessCertificatePrintService.java
@@ -9,6 +9,8 @@
 import com.casic.missiles.model.business.BizBusinessCertificatePrintLog;
 import com.casic.missiles.model.business.BizBusinessCertificateReport;
 
+import java.util.List;
+
 /**
  * <p>
  * 计量检定业务-任务计量管理-证书管理 服务类
@@ -30,4 +32,9 @@
     ReturnDTO certificatePrintStatus(Long id, String printStatus);
 
     ReturnDTO<BizBusinessCertificatePrintLog> certificatePrintLog(Long id);
+
+    List<CertificatePrintListResponse> listByIds(List<Long> ids);
+
+    List<CertificatePrintListResponse> list(CertificatePrintApprovalListRequest request);
+
 }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessCertificateReportService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessCertificateReportService.java
index 305ac7f..b33ef22 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessCertificateReportService.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessCertificateReportService.java
@@ -21,6 +21,4 @@
     ReturnDTO<CertificateReportSaveResponse> saveCertificateReport(BizBusinessCertificateReport request);
 
     ReturnDTO<BizBusinessCertificateReport> detail(BaseDetailRequest request);
-
-
 }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessIdentifyInfoService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessIdentifyInfoService.java
index 53c49d0..6d2089f 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessIdentifyInfoService.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessIdentifyInfoService.java
@@ -6,6 +6,8 @@
 import com.casic.missiles.model.business.BizBusinessIdentifyInfo;
 import com.baomidou.mybatisplus.extension.service.IService;
 
+import java.util.List;
+
 /**
  * <p>
  * 计量检定业务-任务计量管理-标识打印 服务类
@@ -20,7 +22,11 @@
 
     ReturnDTO addIdentify(BizBusinessIdentifyInfo identifyInfo);
 
-    ReturnDTO updateIdentify(BizBusinessIdentifyInfo identifyInfo);
+    ReturnDTO updateIdentify(Long id);
 
     ReturnDTO deleteIdentify(Long id);
+
+    List<BizBusinessIdentifyInfo> list(IdentifyListRequest request) throws Exception;
+
+    ReturnDTO<String> equipmentQrCode(Long id);
 }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessOutsourceAssessService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessOutsourceAssessService.java
index 5e15bc8..bcdc791 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessOutsourceAssessService.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessOutsourceAssessService.java
@@ -1,7 +1,11 @@
 package com.casic.missiles.service.business;
 
+import com.casic.missiles.dto.BaseApprovalSubmitRequest;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.business.outsource.OutsourceAssessApprovalListRequest;
+import com.casic.missiles.dto.business.outsource.OutsourceAssessSaveResponse;
 import com.casic.missiles.model.business.BizBusinessOutsourceAssess;
-import com.baomidou.mybatisplus.extension.service.IService;
+import com.casic.missiles.service.IGeneralApprovalService;
 
 /**
  * <p>
@@ -11,6 +15,7 @@
  * @author wangpeng
  * @since 2023-08-16
  */
-public interface IBizBusinessOutsourceAssessService extends IService<BizBusinessOutsourceAssess> {
+public interface IBizBusinessOutsourceAssessService extends IGeneralApprovalService<BizBusinessOutsourceAssess, BizBusinessOutsourceAssess, OutsourceAssessApprovalListRequest, BaseApprovalSubmitRequest> {
 
+    ReturnDTO<OutsourceAssessSaveResponse> saveOutsourceAssess(BizBusinessOutsourceAssess request);
 }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessOutsourceProtocolService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessOutsourceProtocolService.java
new file mode 100644
index 0000000..7f3092b
--- /dev/null
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessOutsourceProtocolService.java
@@ -0,0 +1,21 @@
+package com.casic.missiles.service.business;
+
+import com.casic.missiles.dto.BaseApprovalSubmitRequest;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.business.outsource.OutsourceProtocolApprovalListRequest;
+import com.casic.missiles.dto.business.outsource.OutsourceProtocolSaveResponse;
+import com.casic.missiles.model.business.BizBusinessOutsourceProtocol;
+import com.casic.missiles.service.IGeneralApprovalService;
+
+/**
+ * <p>
+ * 计量检定业务-分包管理-测试、校准或检定工作分包协议书 服务类
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-08-24
+ */
+public interface IBizBusinessOutsourceProtocolService extends IGeneralApprovalService<BizBusinessOutsourceProtocol, BizBusinessOutsourceProtocol, OutsourceProtocolApprovalListRequest, BaseApprovalSubmitRequest> {
+
+    ReturnDTO<OutsourceProtocolSaveResponse> saveOutsourceProtocol(BizBusinessOutsourceProtocol request);
+}
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessOutsourcerInfoService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessOutsourcerInfoService.java
index 9ba656b..b199de4 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessOutsourcerInfoService.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessOutsourcerInfoService.java
@@ -24,8 +24,6 @@
  */
 public interface IBizBusinessOutsourcerInfoService extends IGeneralApprovalService<BizBusinessOutsourcerInfo, BizBusinessOutsourcerInfo, OutsourcerInfoApprovalListRequest, BaseApprovalSubmitRequest> {
 
-    List<BizBusinessOutsourcerInfo> list(OutsourcerInfoApprovalListRequest request);
-
     ReturnDTO<OutsourcerSaveResponse> saveOutsourcer(BizBusinessOutsourcerInfo request);
 
     BizBusinessOutsourcerInfo detail(Long id) throws Exception;
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessLabExecutiveInfoService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessLabExecutiveInfoService.java
index 278c674..f6ed490 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessLabExecutiveInfoService.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessLabExecutiveInfoService.java
@@ -30,8 +30,16 @@
 
     Page<SampleLabExecutiveListResponse> deptLabExecutiveListPage(Page<SampleLabExecutiveListResponse> page, SampleLabExecutiveListRequest labExecutiveListRequest) throws Exception;
 
+    List<SampleLabExecutiveListResponse> deptLabExecutiveList(SampleLabExecutiveListRequest request) throws Exception;
+
+    List<SampleLabExecutiveListResponse> deptLabExecutiveListByIds(String measureStatus, List<Long> ids) throws Exception;
+
     Page<SampleLabExecutiveListResponse> myLabExecutiveListPage(Page<SampleLabExecutiveListResponse> page, SampleLabExecutiveListRequest labExecutiveListRequest) throws Exception;
 
+    List<SampleLabExecutiveListResponse> myLabExecutiveList(SampleLabExecutiveListRequest request) throws Exception;
+
+    List<SampleLabExecutiveListResponse> myLabExecutiveListByIds(String measureStatus, List<Long> ids) throws Exception;
+
     List<SampleAmountResponse> myExecutiveAmount();
 
     ReturnDTO sampleReceive(List<SampleOperateRequest> requestList);
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/OutsourceAssessEventPostProcessor.java b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/OutsourceAssessEventPostProcessor.java
new file mode 100644
index 0000000..cda3086
--- /dev/null
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/OutsourceAssessEventPostProcessor.java
@@ -0,0 +1,46 @@
+package com.casic.missiles.service.listeners.processor;
+
+import cn.hutool.core.lang.Assert;
+import com.casic.missiles.dto.flowable.NotifyEventStatusDTO;
+import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.notifyevent.ActionStatusBeanEnum;
+import com.casic.missiles.enums.system.ApprovalStatusEnum;
+import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.mapper.business.BizBusinessOutsourceAssessMapper;
+import com.casic.missiles.model.business.BizBusinessOutsourceAssess;
+import com.casic.missiles.service.listeners.NotifyEventPostProcessor;
+import com.casic.missiles.utils.SpringContextUtil;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.Objects;
+
+/**
+ * @Description: 测试、校准或检定工作分包评审表审批通过后处理
+ * @Author: wangpeng
+ * @Date: 2023/8/21 13:20
+ */
+@Slf4j
+@Service(ActionStatusBeanEnum.OUTSOURCE_ASSESS_BEAN_NAME)
+public class OutsourceAssessEventPostProcessor implements NotifyEventPostProcessor {
+    @Override
+    @Transactional
+    public void doHandleNotifyEvent(NotifyEventStatusDTO notifyEventStatusDTO) {
+        Long id = Long.valueOf(notifyEventStatusDTO.getId());
+        Assert.isFalse(Objects.isNull(id), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        BizBusinessOutsourceAssessMapper outsourceAssessMapper = SpringContextUtil.getBean(BizBusinessOutsourceAssessMapper.class);
+
+        BizBusinessOutsourceAssess outsourceAssess = new BizBusinessOutsourceAssess();
+        outsourceAssess.setId(id);
+        outsourceAssess.setApprovalStatus(ApprovalStatusEnum.PASSED);
+        int updateFlag = outsourceAssessMapper.updateById(outsourceAssess);
+        if (updateFlag <= 0) {
+            log.error("测试、校准或检定工作分包评审表审批通过后处理失败");
+            throw new BusinessException(BusinessExceptionEnum.APPROVAL_PROCESSOR_HANDLE_FAILED);
+        }
+    }
+
+}

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java
index bb0c50f..13a699b 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java
@@ -12,6 +12,7 @@
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.IGeneralApprovalService;
+import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
@@ -19,6 +20,7 @@
 import org.springframework.web.bind.annotation.RequestBody;
 
 import javax.validation.Valid;
+import java.util.List;
 import java.util.Objects;
 
 /**
@@ -117,4 +119,17 @@
         }
         return baseApprovalService.failUpdate(request);
     }
+
+    public List<O> exportList(@RequestBody @Valid R request) throws Exception {
+        List<O> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = baseApprovalService.listExportByIds(request.getIds());
+        } else {
+            list = baseApprovalService.listExport(request);
+        }
+        for (O record : list) {
+            DictCodeUtils.convertDictCodeToName(record);
+        }
+        return list;
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java
index 8a90961..d775831 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java
@@ -5,6 +5,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.business.certificate.CertificateChangeApplyApprovalListRequest;
 import com.casic.missiles.dto.business.certificate.CertificateChangeApplySaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessCertificateChangeApply;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
@@ -20,6 +21,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -48,4 +50,12 @@
         }
         return changeApplyService.saveChangeApply(request);
     }
+
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody CertificateChangeApplyApprovalListRequest request) throws Exception {
+        List<BizBusinessCertificateChangeApply> list = super.exportList(request);
+        super.exportExcel(BizBusinessCertificateChangeApply.class, list, ExportEnum.CERTIFICATE_CHANGE_APPLY.getSheetName());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java
index 5fc4b07..af8230e 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java
@@ -9,6 +9,7 @@
 import com.casic.missiles.dto.business.certificate.CertificatePrintApprovalListRequest;
 import com.casic.missiles.dto.business.certificate.CertificatePrintListResponse;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.enums.business.CertificatePrintStatusEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessCertificatePrintLog;
@@ -18,10 +19,16 @@
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.io.IOException;
+import java.util.List;
 import java.util.Objects;
 
 /**
@@ -98,4 +105,16 @@
         });
         return certificatePrintService.certificatePrintLog(idDTO.getId());
     }
+
+    @ApiOperation("证书打印审批导出")
+    @PostMapping("/listExport")
+    public void exportList(@RequestBody CertificatePrintApprovalListRequest request) throws IOException {
+        List<CertificatePrintListResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = certificatePrintService.listByIds(request.getIds());
+        } else {
+            list = certificatePrintService.list(request);
+        }
+        super.exportExcel(CertificatePrintListResponse.class, list, ExportEnum.CERTIFICATE_PRINT.getSheetName());
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java
index 63b06dc..6b2efd5 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java
@@ -6,6 +6,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.business.certificate.CertificateReportApprovalListRequest;
 import com.casic.missiles.dto.business.certificate.CertificateReportSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessCertificateReport;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
@@ -21,6 +22,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -50,7 +52,7 @@
         return certificateReportService.saveCertificateReport(request);
     }
 
-    @ApiOperation("证书审批详情（基本信息）")
+    @ApiOperation("详情（基本信息）")
     @PostMapping("/detail")
     public ReturnDTO<BizBusinessCertificateReport> detail(@RequestBody @Valid BaseDetailRequest request, BindingResult bindingResult) throws Exception {
         if(bindingResult.hasErrors()){
@@ -59,4 +61,11 @@
         return certificateReportService.detail(request);
     }
 
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody CertificateReportApprovalListRequest request) throws Exception {
+        List<BizBusinessCertificateReport> list = super.exportList(request);
+        super.exportExcel(BizBusinessCertificateReport.class, list, ExportEnum.CERTIFICATE_REPORT.getSheetName());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java
index 46b26bd..57c0809 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java
@@ -10,20 +10,21 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.business.identify.IdentifyListRequest;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessIdentifyInfo;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.business.IBizBusinessIdentifyInfoService;
+import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import javax.validation.Valid;
+import java.util.List;
 import java.util.Objects;
 
 /**
@@ -57,16 +58,13 @@
         return identifyInfoService.addIdentify(identifyInfo);
     }
 
-    @ApiOperation("标识打印更新")
+    @ApiOperation("标识打印更新（更新打印时间）")
     @PostMapping("/update")
-    public ReturnDTO updateIdentify(@RequestBody @Valid BizBusinessIdentifyInfo identifyInfo, BindingResult bindingResult) {
-        Assert.isFalse(Objects.isNull(identifyInfo.getId()), () -> {
+    public ReturnDTO updateIdentify(@RequestBody @Valid IdDTO idDTO) {
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        Assert.isFalse(bindingResult.hasErrors(), () -> {
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        });
-        return identifyInfoService.updateIdentify(identifyInfo);
+        return identifyInfoService.updateIdentify(idDTO.getId());
     }
 
     @ApiOperation("标识打印删除")
@@ -77,4 +75,37 @@
         });
         return identifyInfoService.deleteIdentify(idDTO.getId());
     }
+
+    @ApiOperation("标识打印导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody @Valid IdentifyListRequest request, BindingResult bindingResult) throws Exception {
+        if (bindingResult.hasErrors()) {
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        List<BizBusinessIdentifyInfo> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = identifyInfoService.listByIds(request.getIds());
+        } else {
+            list = identifyInfoService.list(request);
+        }
+        for (BizBusinessIdentifyInfo record : list) {
+            DictCodeUtils.convertDictCodeToName(record);
+        }
+        super.exportExcel(BizBusinessIdentifyInfo.class, list, ExportEnum.IDENTIFY_EXPORT.getSheetName());
+    }
+
+
+    // TODO: 2023/8/23 查询设备信息，4个底部按钮查设备（按钮的作用就是前端用来调不同接口、用来区分中间即将展示的标识），前端弹窗选设备，在确定保存时前端根据底部按钮判断传入设备类型deviceType字典code
+    // TODO: 2023/8/23 接口：查受检设备（第1个按钮），查设备台账（后3个按钮同一接口），查询之后前端根据标志类型的不同加到中间页面时进行判断（按产品给的对应表）
+    // TODO: 2023/8/23 提供二维码接口，前端在加到中间页面时调用一下
+
+    @ApiOperation("设备二维码")
+    @PostMapping("/equipment/qrCode")
+    public ReturnDTO<String> equipmentQrCode(@RequestBody @Valid IdDTO idDTO) {
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return identifyInfoService.equipmentQrCode(idDTO.getId());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java
index 707be6e..7e0453d 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java
@@ -117,7 +117,7 @@
     }
 
     @ApiOperation("任务单导出")
-    @PostMapping("/export")
+    @PostMapping("/listExport")
     public void orderExport(@RequestBody @Valid OrderListRequest request, HttpServletResponse response) {
         businessOrderService.orderExport(request, response);
     }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java
index 529a6ce..51432be 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java
@@ -1,9 +1,28 @@
 package com.casic.missiles.controller.business;
 
+import com.casic.missiles.controller.GeneralApprovalController;
+import com.casic.missiles.dto.BaseApprovalSubmitRequest;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.business.outsource.OutsourceAssessApprovalListRequest;
+import com.casic.missiles.dto.business.outsource.OutsourceAssessSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
+import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.model.business.BizBusinessOutsourceAssess;
+import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
+import com.casic.missiles.service.IGeneralApprovalService;
+import com.casic.missiles.service.business.IBizBusinessOutsourceAssessService;
 import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.BindingResult;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.validation.Valid;
+import java.util.List;
+
 /**
  * <p>
  * 计量检定业务-分包管理-测试、校准或检定工作分包评审表 前端控制器
@@ -15,6 +34,27 @@
 @Api(tags = "分包管理-测试、校准或检定工作分包评审表")
 @RestController
 @RequestMapping("/business/outsource/assess")
-public class BizBusinessOutsourceAssessController {
+public class BizBusinessOutsourceAssessController extends GeneralApprovalController<BizBusinessOutsourceAssess, BizBusinessOutsourceAssess, OutsourceAssessApprovalListRequest, BaseApprovalSubmitRequest> {
+    @Autowired
+    private IBizBusinessOutsourceAssessService outsourceAssessService;
 
+    public BizBusinessOutsourceAssessController(IGeneralApprovalService<BizBusinessOutsourceAssess, BizBusinessOutsourceAssess, OutsourceAssessApprovalListRequest, BaseApprovalSubmitRequest> baseApprovalService) {
+        super(baseApprovalService);
+    }
+
+    @ApiOperation("草稿箱-保存")
+    @PostMapping("/save")
+    public ReturnDTO<OutsourceAssessSaveResponse> saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceAssess request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        return outsourceAssessService.saveOutsourceAssess(request);
+    }
+
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception {
+        List<BizBusinessOutsourceAssess> list = super.exportList(request);
+        super.exportExcel(BizBusinessOutsourceAssess.class, list, ExportEnum.OUTSOURCE_ASSESS.getSheetName());
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java
new file mode 100644
index 0000000..9adef18
--- /dev/null
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java
@@ -0,0 +1,60 @@
+package com.casic.missiles.controller.business;
+
+import com.casic.missiles.controller.GeneralApprovalController;
+import com.casic.missiles.dto.BaseApprovalSubmitRequest;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.business.outsource.OutsourceProtocolApprovalListRequest;
+import com.casic.missiles.dto.business.outsource.OutsourceProtocolSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
+import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.model.business.BizBusinessOutsourceProtocol;
+import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
+import com.casic.missiles.service.IGeneralApprovalService;
+import com.casic.missiles.service.business.IBizBusinessOutsourceProtocolService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.BindingResult;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.validation.Valid;
+import java.util.List;
+
+/**
+ * <p>
+ * 计量检定业务-分包管理-测试、校准或检定工作分包协议书 前端控制器
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-08-24
+ */
+@Api(tags = "分包管理-测试、校准或检定工作分包协议书")
+@RestController
+@RequestMapping("/business/outsource/protocol")
+public class BizBusinessOutsourceProtocolController extends GeneralApprovalController<BizBusinessOutsourceProtocol, BizBusinessOutsourceProtocol, OutsourceProtocolApprovalListRequest, BaseApprovalSubmitRequest> {
+    @Autowired
+    private IBizBusinessOutsourceProtocolService outsourceProtocolService;
+
+    public BizBusinessOutsourceProtocolController(IGeneralApprovalService<BizBusinessOutsourceProtocol, BizBusinessOutsourceProtocol, OutsourceProtocolApprovalListRequest, BaseApprovalSubmitRequest> baseApprovalService) {
+        super(baseApprovalService);
+    }
+
+    @ApiOperation("草稿箱-保存")
+    @PostMapping("/save")
+    public ReturnDTO<OutsourceProtocolSaveResponse> saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceProtocol request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        return outsourceProtocolService.saveOutsourceProtocol(request);
+    }
+
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody OutsourceProtocolApprovalListRequest request) throws Exception {
+        List<BizBusinessOutsourceProtocol> list = super.exportList(request);
+        super.exportExcel(BizBusinessOutsourceProtocol.class, list, ExportEnum.OUTSOURCE_PROTOCOL.getSheetName());
+    }
+}
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java
index 097f645..f0f0943 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java
@@ -17,7 +17,6 @@
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.IGeneralApprovalService;
 import com.casic.missiles.service.business.IBizBusinessOutsourcerInfoService;
-import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -71,19 +70,8 @@
 
     @ApiOperation("分包方导出")
     @PostMapping("/listExport")
-    public void export(@RequestBody @Valid OutsourcerInfoApprovalListRequest request, BindingResult bindingResult) throws Exception {
-        if (bindingResult.hasErrors()) {
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        }
-        List<BizBusinessOutsourcerInfo> list;
-        if (!CollectionUtils.isEmpty(request.getIds())) {
-            list = outsourcerInfoService.listByIds(request.getIds());
-        } else {
-            list = outsourcerInfoService.list(request);
-        }
-        for (BizBusinessOutsourcerInfo record : list) {
-            DictCodeUtils.convertDictCodeToName(record);
-        }
+    public void export(@RequestBody OutsourcerInfoApprovalListRequest request) throws Exception {
+        List<BizBusinessOutsourcerInfo> list = super.exportList(request);
         super.exportExcel(BizBusinessOutsourcerInfo.class, list, ExportEnum.OUTSOURCER_EXPORT.getSheetName());
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java
index c2cbf9f..0410918 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java
@@ -17,11 +17,9 @@
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.IGeneralApprovalService;
 import com.casic.missiles.service.business.IBizBusinessSiteExecutiveInfoService;
-import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -60,7 +58,7 @@
         return siteExecutiveInfoService.saveSiteExecutiveInfo(siteExecutiveInfo);
     }
 
-    @ApiOperation("现场检测详情")
+    @ApiOperation("详情")
     @PostMapping("/detail")
     public ReturnDTO<SiteExecutiveDetailResponse> siteExecutiveDetail(@RequestBody @Valid IdDTO idDTO) throws Exception {
         Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
@@ -69,21 +67,10 @@
         return ReturnUtil.success(siteExecutiveInfoService.detail(idDTO.getId()));
     }
 
-    @ApiOperation("现场检测导出")
+    @ApiOperation("导出")
     @PostMapping("/listExport")
-    public void export(@RequestBody @Valid SiteExecutiveApprovalListRequest request, BindingResult bindingResult) throws Exception {
-        if (bindingResult.hasErrors()) {
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        }
-        List<SiteExecutiveApprovalListResponse> list;
-        if (!CollectionUtils.isEmpty(request.getIds())) {
-            list = siteExecutiveInfoService.listInfoByIds(request.getIds());
-        } else {
-            list = siteExecutiveInfoService.listInfo(request);
-        }
-        for (SiteExecutiveApprovalListResponse record : list) {
-            DictCodeUtils.convertDictCodeToName(record);
-        }
+    public void export(@RequestBody SiteExecutiveApprovalListRequest request) throws Exception {
+        List<SiteExecutiveApprovalListResponse> list = super.exportList(request);
         super.exportExcel(SiteExecutiveApprovalListResponse.class, list, ExportEnum.SITE_EXECUTIVE_EXPORT.getSheetName());
     }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
index 7e793cd..a92e209 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
@@ -55,7 +55,7 @@
 
     @ApiOperation("设备收发列表导出")
     @PostMapping("/export")
-    public void exportList(@RequestBody @Valid SampleDispatchListRequest request) throws IOException {
+    public void exportList(@RequestBody SampleDispatchListRequest request) throws IOException {
         List<SampleDispatchListResponse> list;
         if (!CollectionUtils.isEmpty(request.getIds())) {
             list = dispatchService.listByIds(request.getIds());
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java
index cdc77fc..d120fd4 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java
@@ -7,6 +7,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.business.labExecutive.*;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.business.IBusinessLabExecutiveInfoService;
@@ -14,6 +15,7 @@
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.*;
 
@@ -32,7 +34,7 @@
     @Autowired
     private IBusinessLabExecutiveInfoService labExecutiveInfoService;
 
-    @ApiOperation("实验室检测-部门检测-查询各状态列表（待检测、检测中、检测完）")
+    @ApiOperation("实验室任务-查询各状态列表（待检测、检测中、检测完）")
     @PostMapping("/deptExecutive/List")
     public ReturnDTO<PageInfoBT<SampleLabExecutiveListResponse>> queryDeptExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
@@ -43,10 +45,19 @@
         return ReturnUtil.success(super.packForBT(labExecutiveInfoService.deptLabExecutiveListPage(page, labExecutiveListRequest)));
     }
 
-    /**
-     * 实验室检测-我的检测-查询各状态列表（待检测、检测中、检测完）
-     */
-    @ApiOperation("实验室检测-我的检测-查询各状态列表（待检测、检测中、检测完）")
+    @ApiOperation("实验室任务导出")
+    @PostMapping("/deptExecutive/export")
+    public void deptExportList(@RequestBody @Valid SampleLabExecutiveListRequest request) throws Exception {
+        List<SampleLabExecutiveListResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = labExecutiveInfoService.deptLabExecutiveListByIds(request.getMeasureStatus(), request.getIds());
+        } else {
+            list = labExecutiveInfoService.deptLabExecutiveList(request);
+        }
+        super.exportExcel(SampleLabExecutiveListResponse.class, list, ExportEnum.DEPT_EXECUTIVE_TASK.getSheetName());
+    }
+
+    @ApiOperation("我的任务-查询各状态列表（待检测、检测中、检测完）")
     @PostMapping("/myExecutive/list")
     public ReturnDTO<PageInfoBT<SampleLabExecutiveListResponse>> queryMyExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
@@ -57,19 +68,25 @@
         return ReturnUtil.success(super.packForBT(labExecutiveInfoService.myLabExecutiveListPage(page, labExecutiveListRequest)));
     }
 
-    /**
-     * 实验室检测-我的检测-查询各状态样品数量（待检测、检测中、检测完）
-     */
-    @ApiOperation("实验室检测-我的检测-查询各状态样品数量（待检测、检测中、检测完）")
+    @ApiOperation("我的任务导出")
+    @PostMapping("/myExecutive/export")
+    public void exportList(@RequestBody @Valid SampleLabExecutiveListRequest request) throws Exception {
+        List<SampleLabExecutiveListResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = labExecutiveInfoService.myLabExecutiveListByIds(request.getMeasureStatus(), request.getIds());
+        } else {
+            list = labExecutiveInfoService.myLabExecutiveList(request);
+        }
+        super.exportExcel(SampleLabExecutiveListResponse.class, list, ExportEnum.MY_EXECUTIVE_TASK.getSheetName());
+    }
+
+    @ApiOperation("我的任务-查询各状态样品数量（待检测、检测中、检测完）")
     @GetMapping("/myExecutive/amount")
     public ReturnDTO<List<SampleAmountResponse>> queryMyExecutiveAmount() {
         return ReturnUtil.success(labExecutiveInfoService.myExecutiveAmount());
     }
 
-    /**
-     * 实验室检测-部门检测-分配（分配给具体人员）
-     */
-    @ApiOperation("实验室检测-部门检测-分配按钮（分配给具体人员）")
+    @ApiOperation("实验室任务-分配按钮（分配给具体人员）")
     @PostMapping("/deptExecutive/allocate")
     public ReturnDTO allocateStaff(@RequestBody @Valid SampleAllocateRequest sampleAllocateRequest, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -78,10 +95,7 @@
         return labExecutiveInfoService.allocateStaff(sampleAllocateRequest);
     }
 
-    /**
-     * 实验室检测-我的检测-检定人扫描收入（待检测->检测中）
-     */
-    @ApiOperation("实验室检测-我的检测-检定人扫描收入（待检测->检测中）")
+    @ApiOperation("我的任务-检定人扫描收入（待检测->检测中）")
     @PostMapping("/myExecutive/receive")
     public ReturnDTO sampleReceive(@RequestBody @Valid List<SampleOperateRequest> requestList, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -90,10 +104,7 @@
         return labExecutiveInfoService.sampleReceive(requestList);
     }
 
-    /**
-     * 实验室检测-负责人/检定人扫描检完（检测中->检测完）
-     */
-    @ApiOperation("实验室检测-负责人/检定人扫描检完（检测中->检测完）")
+    @ApiOperation("实验室任务-负责人/检定人扫描检完（检测中->检测完）")
     @PostMapping("/myExecutive/complete")
     public ReturnDTO sampleExecutiveComplete(@RequestBody @Valid List<SampleOperateRequest> requestList, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -102,10 +113,7 @@
         return labExecutiveInfoService.sampleExecutiveComplete(requestList);
     }
 
-    /**
-     * 实验室检测-部门检测/我的检测 编辑（只能修改应出具证书）
-     */
-    @ApiOperation("实验室检测-部门检测/我的检测 编辑（只能修改应出具证书）")
+    @ApiOperation("实验室任务/我的任务 编辑（只能修改应出具证书）")
     @PostMapping("/executive/update")
     public ReturnDTO updateExecutive(@RequestBody @Valid UpdateExecutiveRequest request, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -114,10 +122,7 @@
         return labExecutiveInfoService.updateExecutive(request);
     }
 
-    /**
-     * 实验室检测-部门检测/我的检测 详情
-     */
-    @ApiOperation("实验室检测-部门检测/我的检测 详情")
+    @ApiOperation("实验室任务/我的任务 详情")
     @PostMapping("/executive/detail")
     public ReturnDTO<ExecutiveDetailResponse> executiveDetail(@RequestBody @Valid ExecutiveDetailRequest request, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
@@ -131,7 +136,7 @@
      * 退回后会将下一个要执行的实验室检测状态更新为待分配，将后面的实验室顺序变更为连续（都进行减1）
      * 最后一个检测的实验室退回，等分发员再增加实验室或设备收发中的已收入直接手动点击完成
      */
-    @ApiOperation("实验室检测-部门检测/我的检测 退回（待检测/检测中->退回）")
+    @ApiOperation("实验室任务/我的任务 退回（待检测/检测中->退回）")
     @PostMapping("/executive/sendBack")
     public ReturnDTO executiveSendBack(@RequestBody @Valid ExecutiveSendBackRequest request, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -140,9 +145,6 @@
         return labExecutiveInfoService.sampleExecutiveSendBack(request);
     }
 
-    /**
-     * 分发员编辑实验室检测列表
-     */
     @ApiOperation("分发员编辑实验室检测列表")
     @PostMapping("/handOut/updateList")
     public ReturnDTO updateExecutiveList(@RequestBody @Valid UpdateExecutiveListRequest request, BindingResult bindingResult) {
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java
index 48a67ed..0c04f31 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java
@@ -10,6 +10,7 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.resource.customer.CustomerApprovalListRequest;
 import com.casic.missiles.dto.resource.customer.CustomerSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceCustomerInfo;
@@ -26,6 +27,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -55,6 +57,13 @@
         return customerInfoService.saveCustomerInfo(request);
     }
 
+    @ApiOperation("委托方名录导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody CustomerApprovalListRequest request) throws Exception {
+        List<BizResourceCustomerInfo> list = super.exportList(request);
+        super.exportExcel(BizResourceCustomerInfo.class, list, ExportEnum.CUSTOMER_INFO.getSheetName());
+    }
+
     @ApiOperation("委托方人员列表（分页）")
     @PostMapping("/person/listPage")
     public ReturnDTO<PageInfoBT<BizResourceCustomerStaff>> personListPage(@RequestBody IdDTO idDto) {
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
index 972ed4b..6418ea5 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
@@ -5,6 +5,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.resource.customer.SuggestFormApprovalListRequest;
 import com.casic.missiles.dto.resource.customer.SuggestFormSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceCustomerSuggestForm;
@@ -20,6 +21,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -50,4 +52,11 @@
         return suggestFormService.saveSuggestForm(request);
     }
 
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody SuggestFormApprovalListRequest request) throws Exception {
+        List<BizResourceCustomerSuggestForm> list = super.exportList(request);
+        super.exportExcel(BizResourceCustomerSuggestForm.class, list, ExportEnum.CUSTOMER_SUGGEST_FORM.getSheetName());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java
index 1934d1a..9e07eab 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java
@@ -15,12 +15,16 @@
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.resource.IEnvEnvironmentRecordConfigService;
 import com.casic.missiles.service.resource.IEnvEnvironmentRecordDataService;
+import com.casic.missiles.service.resource.IEnvLocationInfoService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
 import java.util.List;
@@ -39,6 +43,8 @@
     private IEnvEnvironmentRecordDataService environmentRecordDataService;
     @Autowired
     private IEnvEnvironmentRecordConfigService environmentRecordConfigService;
+    @Autowired
+    private IEnvLocationInfoService locationInfoService;
 
     @ApiOperation("环境记录单数据列表/详情")
     @PostMapping("/data/listPage")
@@ -95,4 +101,11 @@
         });
         return environmentRecordConfigService.deleteEnvironmentRecordConfig(idDTO.getId());
     }
+
+    @ApiOperation("地点列表")
+    @PostMapping("/location/listPage")
+    public ReturnDTO<PageInfoBT<LocationListResponse>> locationListPage(@RequestBody @Valid LocationListRequest request) {
+        Page<LocationListResponse> page = PageFactory.defaultPage();
+        return ReturnUtil.success(super.packForBT(locationInfoService.listPage(page, request)));
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java
index 82efe3f..e9561fa 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java
@@ -10,6 +10,7 @@
 import com.casic.missiles.dto.resource.seal.SealLogListRequest;
 import com.casic.missiles.dto.resource.seal.SealNoteApprovalListRequest;
 import com.casic.missiles.dto.resource.seal.SealNoteSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceSealUseLog;
@@ -27,6 +28,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -58,6 +60,13 @@
         return sealUseNoteService.saveSeal(request);
     }
 
+    @ApiOperation("印章使用登记导出（列表和导出中去掉经办人和监印人）")
+    @PostMapping("/listExport")
+    public void export(@RequestBody SealNoteApprovalListRequest request) throws Exception {
+        List<BizResourceSealUseNote> list = super.exportList(request);
+        super.exportExcel(BizResourceSealUseNote.class, list, ExportEnum.SEAL_NOTE.getSheetName());
+    }
+
     // TODO: 2023/7/28 印章使用日志：系统中使用印章时插入数据库
 
     @ApiOperation("印章使用日志列表（分页）")
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java
index 9b674fc..06b6521 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java
@@ -9,16 +9,20 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.resource.staff.StaffCertRequest;
 import com.casic.missiles.dto.resource.staff.StaffCertResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.service.resource.IBizResourceStaffInfoService;
 import com.casic.missiles.service.resource.IBizResourceStaffVerifierService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.List;
+
 /**
  * @Description:
  * @Author: wangpeng
@@ -41,9 +45,21 @@
         return ReturnUtil.success(super.packForBT(responsePage));
     }
 
+    @ApiOperation("证书逾期提醒导出")
+    @PostMapping("/listExport")
+    public void exportList(@RequestBody StaffCertRequest request) throws Exception {
+        List<StaffCertResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = staffInfoService.certListByIds(request.getIds());
+        } else {
+            list = staffInfoService.certList(request);
+        }
+        super.exportExcel(StaffCertResponse.class, list, ExportEnum.STAFF_CERTIFICATE_EXPIRE.getSheetName());
+    }
+
     @ApiOperation("证书逾期提醒")
     @PostMapping("/expirationReminder")
-    public ReturnDTO expirationReminder(@RequestBody IdDTO idDto) {
-        return verifierService.expirationReminder(idDto);
+    public ReturnDTO expirationReminder(@RequestBody IdDTO idDTO) {
+        return verifierService.expirationReminder(idDTO);
     }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java
index 3b251ad..a6e7850 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java
@@ -12,6 +12,7 @@
 import com.casic.missiles.dto.resource.staff.StaffListRequest;
 import com.casic.missiles.dto.resource.staff.TrainListRequest;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.*;
@@ -22,7 +23,10 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
 import java.util.List;
@@ -52,8 +56,19 @@
             throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
         }
         Page<BizResourceStaffInfo> page = PageFactory.defaultPage();
-        Page<BizResourceStaffInfo> responsePage = staffInfoService.listPage(page, request);
-        return ReturnUtil.success(super.packForBT(responsePage));
+        return ReturnUtil.success(super.packForBT(staffInfoService.listPage(page, request)));
+    }
+
+    @ApiOperation("人员登记导出")
+    @PostMapping("/listExport")
+    public void exportList(@RequestBody StaffListRequest request) throws Exception {
+        List<BizResourceStaffInfo> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = staffInfoService.listByIds(request.getIds());
+        } else {
+            list = staffInfoService.list(request);
+        }
+        super.exportExcel(BizResourceStaffInfo.class, list, ExportEnum.STAFF_INFO.getSheetName());
     }
 
     @ApiOperation("人员登记详情基础信息")
@@ -85,9 +100,9 @@
 
     @ApiOperation("科研教育列表（分页）")
     @PostMapping("/education/listPage")
-    public ReturnDTO<PageInfoBT<BizResourceStaffEducation>> educationListPage(@RequestBody IdDTO idDto) {
+    public ReturnDTO<PageInfoBT<BizResourceStaffEducation>> educationListPage(@RequestBody IdDTO idDTO) {
         Page<BizResourceStaffEducation> page = PageFactory.defaultPage();
-        Page<BizResourceStaffEducation> responsePage = staffInfoService.educationListPage(page, idDto);
+        Page<BizResourceStaffEducation> responsePage = staffInfoService.educationListPage(page, idDTO);
         return ReturnUtil.success(super.packForBT(responsePage));
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java
index af6aa86..d85d84a 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java
@@ -9,6 +9,7 @@
 import com.casic.missiles.dto.resource.outsideService.SupplierApprovalListRequest;
 import com.casic.missiles.dto.resource.outsideService.SupplierSaveResponse;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceSupplierAbility;
@@ -67,6 +68,13 @@
         return ReturnUtil.success(supplierInfoService.detail(idDTO.getId()));
     }
 
+    @ApiOperation("合格供方导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody SupplierApprovalListRequest request) throws Exception {
+        List<BizResourceSupplierInfo> list = super.exportList(request);
+        super.exportExcel(BizResourceSupplierInfo.class, list, ExportEnum.SUPPLIER_INFO.getSheetName());
+    }
+
     @ApiOperation("供方人员列表（分页）")
     @PostMapping("/person/listPage")
     public ReturnDTO<PageInfoBT<BizResourceSupplierPerson>> personListPage(@RequestBody IdDTO idDTO) {
diff --git a/casic-metering-api/src/main/resources/config/application.yml b/casic-metering-api/src/main/resources/config/application.yml
index 350db5f..ecff521 100644
--- a/casic-metering-api/src/main/resources/config/application.yml
+++ b/casic-metering-api/src/main/resources/config/application.yml
@@ -126,7 +126,7 @@
     #作者
     author: wangpeng
     #待生成对象表名
-    table-name: biz_equipment_technical_target_approval,biz_equipment_attachment_approval,biz_equipment_checkpoint_approval
+    table-name: biz_business_outsource_protocol
 
 reminder:
   #节点--common模块config包 ReminderNodeConfig配置
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
index 4a19e4e..d47d552 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
@@ -53,6 +53,7 @@
     SUGGEST_FORM_SAVE_FAILED(2509, "委托方意见登记表保存至草稿箱失败"),
     EXAMINE_FORM_SAVE_FAILED(2510, "要求、委托书及合同评审表保存至草稿箱失败"),
     CUSTOMER_EXIST_SAVE_FAILED(2511, "该委托方已存在，请重新选择"),
+    DUPLICATE_LOCATION_NO(2512, "地点编号已存在"),
 
     /**
      * 计量检定业务模块
@@ -68,6 +69,8 @@
     COMPLETE_SAMPLE_NOT_EXIST(2609, "检测中不存在扫描收入的样品"),
     CANNOT_CHANGE_MEASURE_INFO(2610, "无法更改非当前登录用户的检测信息"),
     NON_EXIST_ORDER_OR_SAMPLE(2611, "不存在该委托单或该委托单下的样品"),
+    OUTSOURCE_ACCESS_SAVE_FAILED(2612, "测试、校准或检定工作分包评审表保存至草稿箱失败"),
+    OUTSOURCE_PROTOCOL_SAVE_FAILED(2613, "测试、校准或检定工作分包协议书保存至草稿箱失败"),
 
     /**
      * 历史遗留备用
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
index 5089ad1..81a406b 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
@@ -10,54 +10,38 @@
     /**
      * 资源管理
      */
-    ENVIRONMENT_DATA_EXPORT("environmentData", "environmentData", "环境记录单数据"),
+    ENVIRONMENT_DATA_EXPORT("environmentData", "环境记录单数据", "环境记录单数据"),
+    STAFF_INFO("staffInfo", "人员登记", "人员登记"),
+    STAFF_CERTIFICATE_EXPIRE("certificateExpire", "证书逾期提醒", "证书逾期提醒"),
+    SUPPLIER_INFO("supplierInfo", "合格供方名录", "合格供方名录"),
+    CUSTOMER_INFO("customerInfo", "委托方名录", "委托方名录"),
+    CUSTOMER_SUGGEST_FORM("customerSuggestForm", "委托方意见登记表", "委托方意见登记表"),
+    SEAL_NOTE("sealNote", "印章使用登记", "印章使用登记"),
 
-    FILE_EXPORT("meterFileData", "meterFileData", "计量文件信息"),
-    TRAIN_PLAN_EXPORT("trainPlanData", "trainPlanData", "培训计划"),
-    TRAIN_LOG_EXPORT("trainLogData", "trainLogData", "培训记录"),
-    METER_ORGANIZE_EXPORT("meterOrganizeData", "meterOrganizeData", "计量组织"),
-    TRACE_SUPPLIER_EXPORT("traceSupplierData", "traceSupplierData", "溯源供方"),
-    SIGN_EXPORT("signData", "signData", "签名/签章"),
-    TEMPLATE_EXPORT("templateData", "templateData", "原始记录模板/证书报告模板"),
-    FIXED_ASSETS("meterFixedAssets", "meterFixedAssets", "固定资产"),
-    METER_EQUIPMENT("meterEquipment", "meterEquipment", "测量设备"),
-    CALIBRATION_TEST_EQUIPMENT("calibrationTestEquipment", "calibrationTestEquipment", "校准检定设备"),
-    MEASURE_ACCOUNT("measureAccount", "measureAccount", "测量工装"),
-    STANDARD_SUPPORT_EQUIPMENT("standardSupportEquipment", "standardSupportEquipment", "标准配套设备"),
-    STANDARD_EQUIPMENT("standardEquipment", "standardEquipment", "标准装置"),
-    FLOW_DEF_EXPORT("flowDefData", "flowDefData", "流程定义"),
-    STAFF_CERTIFICATE("certificate", "certificate", "计量人员证书"),
-    CHECK_INFO("checkInfo", "checkInfo", "设备管理点检测"),
-    EQUIPMENT_APPLY("equipmentApply", "equipmentApply", "设备借用"),
-    STANDARD_EQUIPMENT_REMIND("equipmentApplyRemind", "equipmentApplyRemind", "标准装置到期提醒"),
-    METER_PRICE("meterPrice", "meterPrice", "价格库"),
-    METER_STAFF("meterStaff", "meterStaff", "计量人员"),
-    STANDARD_EQUIPMENT_APPLY("standardEquipmentApply", "standardEquipmentApply", "标准装置申请"),
-    STATE_MANAGE_APPLY("stateManage", "stateManage", "状态管理"),
-    METER_ACCEPTANCE_CHECK("acceptanceCheck", "acceptanceCheck", "设备检修保养验收单"),
-    CUSTOMER_EXPORT("customerData", "customerData", "客户信息"),
-    ORDER_EXPORT("orderData", "orderData", "委托书信息"),
-    SAMPLE_EXPORT("sampleData", "sampleData", "样本信息"),
-    EXCHANGE_DATA("exchangeData", "exchangeData", "设备交接单"),
-    DISPATCH_DATA("dispatchData", "dispatchData", "设备收发"),
-    ENVIRONMENT_DATA("environmentData", "environmentData", "环境记录单"),
-    ORIGIN_DATA("originData", "originData", "原始记录"),
-    CERTIFICATE_REPORT("certificateReport", "certificateReport", "证书报告"),
-    ADVICE_EXPORT("adviceData", "adviceData", "客户反馈"),
-    HANDOUT_EXPORT("handoutData", "handoutData", "任务分发列表"),
-    OUTSOURCER_EXPORT("outsourcerData", "outsourcerData", "分包方"),
-    SITE_EXECUTIVE_EXPORT("siteExecutiveData", "siteExecutiveData", "现场测试、校准或检定"),
-    CERTIFICATE_PRINT_EXPORT("certificatePrintData", "certificatePrintData", "证书打印"),
-    DOWNLOAD_TEMPLATE("downloadTemplate", "downloadTemplate", "页面配置"),
-    OUTSOURCER_CERTIFICATE_EXPORT("outsourceCertificateData", "outsourceCertificateData", "分包证书"),
-    SETTLEMENT_INFO_EXPORT("settlementInfoData", "settlementInfoData", "业务结算"),
-    EQUIPMENT_REMIND("equipmentRemind", "equipmentRemind", "设备到期提醒"),
-    AGREEMENT_INFO_EXPORT("agreementInfoData", "agreementInfoData", "合同"),
-    WORK_STATISTICS_EXPORT("workStatisticsData", "workStatisticsData", "实时工作统计"),
-    DEPT_OUTPUT_EXPORT("deptOutputData", "deptOutputData", "部门产值分析"),
-    WORKLOAD_EXPORT("workloadData", "workloadData", "业务工作量分析"),
-    DEPT_COMPREHENSIVE_EXPORT("deptComprehensiveData", "deptComprehensiveData", "部门综合分析"),
-    ENVIRONMENTAL_RECORD("environmentalRecordData", "environmentalRecordData", "现场环境记录");
+    /**
+     * 计量检定业务
+     */
+    OUTSOURCER_EXPORT("outsourcerData", "分包方名录", "分包方名录"),
+    IDENTIFY_EXPORT("identifyData", "计量标识", "计量标识"),
+    ORDER_EXPORT("orderData", "任务单", "任务单"),
+    DISPATCH_DATA("dispatchData", "设备收发", "设备收发"),
+    HANDOUT_EXPORT("handoutData", "任务分发", "任务分发"),
+    SITE_EXECUTIVE_EXPORT("siteExecutiveData", "现场测试、校准或检定", "现场测试、校准或检定"),
+    CERTIFICATE_REPORT("certificateReport", "证书审批", "证书审批"),
+    CERTIFICATE_CHANGE_APPLY("certificateChangeApply", "证书报告补充或更换申请单", "证书报告补充或更换申请单"),
+    CERTIFICATE_PRINT("certificatePrintData", "证书打印审批", "证书打印审批"),
+    DEPT_EXECUTIVE_TASK("deptExecutiveTaskData", "实验室任务", "实验室任务"),
+    MY_EXECUTIVE_TASK("myExecutiveTaskData", "我的任务", "我的任务"),
+    OUTSOURCE_ASSESS("outsourceAssess", "测试、校准或检定工作分包评审表", "测试、校准或检定工作分包评审表"),
+    OUTSOURCE_PROTOCOL("outsourceProtocol", "测试、校准或检定工作分包协议书", "测试、校准或检定工作分包协议书"),
+
+    /**
+     * 系统管理
+     */
+    SIGN_EXPORT("signData", "签名", "签名"),
+    TEMPLATE_EXPORT("templateData", "文件模板", "文件模板"),
+    FLOW_DEF_EXPORT("flowDefData", "流程定义", "流程定义"),
+    DOWNLOAD_TEMPLATE("downloadTemplate", "流程定义", "页面配置");
 
     ExportEnum(String fileName, String sheetName, String description) {
         this.fileName = fileName;
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateRecordTypeCodeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateRecordTypeCodeEnum.java
index 31d913c..a963522 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateRecordTypeCodeEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateRecordTypeCodeEnum.java
@@ -46,4 +46,14 @@
     String SITE_EXECUTIVE_APPROVAL = "01";
     //《现场测试、校准或检定工作记录表》
     String SITE_EXECUTIVE_LOG = "02";
+
+    //测试、校准或检定工作分包协议书
+    String OUTSOURCE_PROTOCOL = "01";
+    //测试、校准或检定工作分包评审表
+    String OUTSOURCE_ACCESS = "02";
+    //测试、校准或检定工作分包通知书
+    String OUTSOURCE_NOTICE = "03";
+    //测试、校准或检定工作分包方名录
+    String OUTSOURCE_INFO = "04";
+
 }
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
index 24b8635..f78bd53 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
@@ -15,6 +15,10 @@
     String CERTIFICATE_CHANGE_APPLY_BEAN_NAME = "certificateChangeApplyBean";
     //现场测试、校准或检定
     String SITE_EXECUTIVE_BEAN_NAME = "siteExecutiveBean";
+    //测试、校准或检定工作分包评审表
+    String OUTSOURCE_ASSESS_BEAN_NAME = "outsourceAssessBean";
+    //测试、校准或检定工作分包协议书
+    String OUTSOURCE_PROTOCOL_BEAN_NAME = "outsourceProtocolBean";
 
     /*********************************设备与装置************************************/
     //设备台账
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 b21c661..6b86fd1 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
@@ -18,6 +18,8 @@
     OUTSOURCER_APPROVAL(OUTSOURCER_BEAN_NAME, ""),
     CERTIFICATE_CHANGE_APPROVAL(CERTIFICATE_CHANGE_APPLY_BEAN_NAME, ""),
     SITE_EXECUTIVE_APPROVAL(SITE_EXECUTIVE_BEAN_NAME, ""),
+    OUTSOURCE_ASSESS_APPROVAL(OUTSOURCE_ASSESS_BEAN_NAME, ""),
+    OUTSOURCE_PROTOCOL_APPROVAL(OUTSOURCE_PROTOCOL_BEAN_NAME, ""),
 
     ACTION_STATUS_MAP(new HashMap<String, AwareActionStatusEnum>() {
         {
@@ -47,6 +49,10 @@
             put(ApplyFromIdEnum.CERTIFICATE_CHANGE_APPROVAL.getCode(), CERTIFICATE_CHANGE_APPROVAL);
             //现场测试、校准或检定审批
             put(ApplyFromIdEnum.SITE_EXECUTIVE_APPROVAL.getCode(), SITE_EXECUTIVE_APPROVAL);
+            //测试、校准或检定工作分包评审表
+            put(ApplyFromIdEnum.OUTSOURCE_ASSESS_APPROVAL.getCode(), OUTSOURCE_ASSESS_APPROVAL);
+            //测试、校准或检定工作分包协议书
+            put(ApplyFromIdEnum.OUTSOURCE_PROTOCOL_APPROVAL.getCode(), OUTSOURCE_PROTOCOL_APPROVAL);
         }
     });
     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 934405e..c7410bd 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
@@ -9,6 +9,8 @@
     CERTIFICATE_CHANGE_APPROVAL("jljdywzsbchghsqd", MessageSourceModuleEnum.BUSINESS.getCode(), "证书/报告补充或更换申请单"),
     OUTSOURCER_APPROVAL("jljdywcsjzhgfbfml", MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定合格分包方名录"),
     SITE_EXECUTIVE_APPROVAL("jljdywxccsjzsp", MessageSourceModuleEnum.BUSINESS.getCode(), "现场测试、校准或检定审批"),
+    OUTSOURCE_ASSESS_APPROVAL("jljdywcsjzfbpsb", MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包评审表"),
+    OUTSOURCE_PROTOCOL_APPROVAL("jljdywcsjzfbxys", MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包协议书"),
 
 
     /*******************************************设备与装置*********************************************/
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/GeneralApprovalMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/GeneralApprovalMapper.java
index 4fb7344..0c9d6ae 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/GeneralApprovalMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/GeneralApprovalMapper.java
@@ -17,8 +17,4 @@
 
     Page<O> selectBatchForApprovalList(Page<O> page, @Param("request") R request, @Param("businessKeys") List<String> businessKeys);
 
-//    Page<O> selectListPage(Page<O> page, @Param("request") R request);
-
-//    Long selectMaxNo();
-
 }
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceAssessMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceAssessMapper.java
index 7867bb8..ba59009 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceAssessMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceAssessMapper.java
@@ -1,7 +1,12 @@
 package com.casic.missiles.mapper.business;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.business.outsource.OutsourceAssessApprovalListRequest;
+import com.casic.missiles.mapper.GeneralApprovalMapper;
 import com.casic.missiles.model.business.BizBusinessOutsourceAssess;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * <p>
@@ -11,6 +16,10 @@
  * @author wangpeng
  * @since 2023-08-16
  */
-public interface BizBusinessOutsourceAssessMapper extends BaseMapper<BizBusinessOutsourceAssess> {
+public interface BizBusinessOutsourceAssessMapper extends GeneralApprovalMapper<BizBusinessOutsourceAssess, BizBusinessOutsourceAssess, OutsourceAssessApprovalListRequest> {
+
+    Page<BizBusinessOutsourceAssess> selectBatchForApprovalList(Page<BizBusinessOutsourceAssess> page, @Param("request") OutsourceAssessApprovalListRequest request, @Param("businessKeys") List<String> businessKeys);
+
+    Long selectMaxProjectNo();
 
 }
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceProtocolMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceProtocolMapper.java
new file mode 100644
index 0000000..e6aba35
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceProtocolMapper.java
@@ -0,0 +1,24 @@
+package com.casic.missiles.mapper.business;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.business.outsource.OutsourceProtocolApprovalListRequest;
+import com.casic.missiles.mapper.GeneralApprovalMapper;
+import com.casic.missiles.model.business.BizBusinessOutsourceProtocol;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 计量检定业务-分包管理-测试、校准或检定工作分包协议书 Mapper 接口
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-08-24
+ */
+public interface BizBusinessOutsourceProtocolMapper extends GeneralApprovalMapper<BizBusinessOutsourceProtocol, BizBusinessOutsourceProtocol, OutsourceProtocolApprovalListRequest> {
+
+    Page<BizBusinessOutsourceProtocol> selectBatchForApprovalList(Page<BizBusinessOutsourceProtocol> page, @Param("request") OutsourceProtocolApprovalListRequest request, @Param("businessKeys") List<String> businessKeys);
+
+    Long selectMaxProtocolNo();
+}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/EnvLocationInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/EnvLocationInfoMapper.java
new file mode 100644
index 0000000..49eff87
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/EnvLocationInfoMapper.java
@@ -0,0 +1,21 @@
+package com.casic.missiles.mapper.resource;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.resource.environment.LocationListRequest;
+import com.casic.missiles.dto.resource.environment.LocationListResponse;
+import com.casic.missiles.model.resource.EnvLocationInfo;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * <p>
+ * 实验室环境监控系统-设备表 Mapper 接口
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-06-07
+ */
+public interface EnvLocationInfoMapper extends BaseMapper<EnvLocationInfo> {
+
+    Page<LocationListResponse> selectLocationListPage(Page<LocationListResponse> page, @Param("request") LocationListRequest request);
+}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java
index de124db..85ed0f7 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java
@@ -1,7 +1,9 @@
 package com.casic.missiles.mapper.system;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.dto.system.SignDetailResponse;
+import com.casic.missiles.dto.system.SignListRequest;
 import com.casic.missiles.model.system.SystemSign;
 import org.apache.ibatis.annotations.Param;
 
@@ -22,4 +24,8 @@
     SignDetailResponse selectSignDetailById(Long id);
 
     List<SystemSign> selectUsableSignList(@Param("userId") Long userId);
+
+    Page<SystemSign> selectSignListPage(Page<SystemSign> page, @Param("request") SignListRequest request);
+
+    List<SystemSign> selectSignList(@Param("request") SignListRequest request);
 }
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateChangeApplyMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateChangeApplyMapper.xml
index d798447..c496092 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateChangeApplyMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateChangeApplyMapper.xml
@@ -30,31 +30,31 @@
         SELECT *
         FROM biz_business_certificate_change_apply
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.changeApplyNo != null and request.changeApplyNo !=''">
+        <if test="request != null and request.changeApplyNo != null and request.changeApplyNo !=''">
             and change_apply_no like concat('%',#{request.changeApplyNo},'%')
         </if>
-        <if test="request.changeReportNo != null and request.changeReportNo !=''">
+        <if test="request != null and request.changeReportNo != null and request.changeReportNo !=''">
             and change_report_no like concat('%',#{request.changeReportNo},'%')
         </if>
-        <if test="request.changeReportName != null and request.changeReportName !=''">
+        <if test="request != null and request.changeReportName != null and request.changeReportName !=''">
             and change_report_name like concat('%',#{request.changeReportName},'%')
         </if>
-        <if test="request.changeType != null and request.changeType !=''">
+        <if test="request != null and request.changeType != null and request.changeType !=''">
             and change_type = #{request.changeType}
         </if>
-        <if test="request.createUserName != null and request.createUserName !=''">
+        <if test="request != null and request.createUserName != null and request.createUserName !=''">
             and create_user_name like concat('%',#{request.createUserName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificatePrintMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificatePrintMapper.xml
index b66cd99..49c0ac8 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificatePrintMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificatePrintMapper.xml
@@ -31,34 +31,34 @@
         LEFT JOIN biz_business_order_sample_relation bosr ON (bosr.order_id = bcr.order_id AND bosr.sample_id = bcr.sample_id)
         LEFT JOIN biz_business_order_info boi ON boi.id = bosr.order_id
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and bcp.approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.printStatus != null and request.printStatus !=''">
+        <if test="request != null and request.printStatus != null and request.printStatus !=''">
             and print_status = #{request.printStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and bcp.create_user_id = #{request.createUserId}
         </if>
-        <if test="request.certificateReportNo != null and request.certificateReportNo !=''">
+        <if test="request != null and request.certificateReportNo != null and request.certificateReportNo !=''">
             and bcr.certificate_report_no like concat('%',#{request.certificateReportNo},'%')
         </if>
-        <if test="request.certificateReportName != null and request.certificateReportName !=''">
+        <if test="request != null and request.certificateReportName != null and request.certificateReportName !=''">
             and bcr.certificate_report_name like concat('%',#{request.certificateReportName},'%')
         </if>
-        <if test="request.customerName != null and request.customerName !=''">
+        <if test="request != null and request.customerName != null and request.customerName !=''">
             and boi.customer_name like concat('%',#{request.customerName},'%')
         </if>
-        <if test="request.sampleNo != null and request.sampleNo !=''">
+        <if test="request != null and request.sampleNo != null and request.sampleNo !=''">
             and bosr.sample_no like concat('%',#{request.sampleNo},'%')
         </if>
-        <if test="request.sampleName != null and request.sampleName !=''">
+        <if test="request != null and request.sampleName != null and request.sampleName !=''">
             and bosr.sample_name like concat('%',#{request.sampleName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and bcp.create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and bcp.create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml
index b366034..767695d 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml
@@ -46,33 +46,37 @@
         SELECT bcr.*, bosr.sample_no, bosr.sample_name, bosr.sample_model, rsi.staff_name
         FROM biz_business_certificate_report bcr
         LEFT JOIN biz_business_order_sample_relation bosr ON (bosr.order_id = bcr.order_id AND bosr.sample_id = bcr.sample_id)
+        LEFT JOIN biz_business_order_info boi ON boi.id = bcr.order_id
         LEFT JOIN biz_resource_staff_info rsi ON rsi.id = bcr.measure_person_id
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and bcr.approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and bcr.create_user_id = #{request.createUserId}
         </if>
-        <if test="request.certificateReportNo != null and request.certificateReportNo !=''">
+        <if test="request != null and request.customerId != null and request.customerId !=''">
+            and boi.customer_id = #{request.customerId}
+        </if>
+        <if test="request != null and request.certificateReportNo != null and request.certificateReportNo !=''">
             and bcr.certificate_report_no like concat('%',#{request.certificateReportNo},'%')
         </if>
-        <if test="request.certificateReportName != null and request.certificateReportName !=''">
+        <if test="request != null and request.certificateReportName != null and request.certificateReportName !=''">
             and bcr.certificate_report_name like concat('%',#{request.certificateReportName},'%')
         </if>
-        <if test="request.sampleNo != null and request.sampleNo !=''">
+        <if test="request != null and request.sampleNo != null and request.sampleNo !=''">
             and bosr.sample_no like concat('%',#{request.sampleNo},'%')
         </if>
-        <if test="request.measureCategory != null and request.measureCategory !=''">
+        <if test="request != null and request.measureCategory != null and request.measureCategory !=''">
             and bcr.measure_category = #{request.measureCategory}
         </if>
-        <if test="request.measurePerson != null and request.measurePerson !=''">
+        <if test="request != null and request.measurePerson != null and request.measurePerson !=''">
             and rsi.staff_name like concat('%',#{request.measurePerson},'%')
         </if>
-        <if test="request.calibrationTimeStart != null and request.calibrationTimeStart !=''">
+        <if test="request != null and request.calibrationTimeStart != null and request.calibrationTimeStart !=''">
             and bcr.calibration_time &gt;= #{request.calibrationTimeStart}
         </if>
-        <if test="request.calibrationTimeEnd != null and request.calibrationTimeEnd !=''">
+        <if test="request != null and request.calibrationTimeEnd != null and request.calibrationTimeEnd !=''">
             and bcr.calibration_time &lt;= #{request.calibrationTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceAssessMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceAssessMapper.xml
index d0fcf8b..c22c101 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceAssessMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceAssessMapper.xml
@@ -7,6 +7,8 @@
         <id column="id" property="id" />
         <result column="project_no" property="projectNo" />
         <result column="project_name" property="projectName" />
+        <result column="lab_code" property="labCode" />
+        <result column="group_code" property="groupCode" />
         <result column="applicant_id" property="applicantId" />
         <result column="applicant_name" property="applicantName" />
         <result column="applicant_time" property="applicantTime" />
@@ -31,7 +33,45 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, project_no, project_name, applicant_id, applicant_name, applicant_time, minio_file_name, remark, create_user_id, create_user_name, outsourcer_id, pre_start_time, pre_end_time, outsource_reason, pre_cost, approval_status, process_id, approve_situation, traceability, test_method, technique_ability, create_time, update_time
+        id, project_no, project_name, lab_code, group_code, applicant_id, applicant_name, applicant_time, minio_file_name, remark, create_user_id, create_user_name, outsourcer_id, pre_start_time, pre_end_time, outsource_reason, pre_cost, approval_status, process_id, approve_situation, traceability, test_method, technique_ability, create_time, update_time
     </sql>
 
+    <select id="selectMaxProjectNo" resultType="java.lang.Long">
+        SELECT IFNULL(max(RIGHT(project_no, 3)), 0) from biz_business_outsource_assess
+    </select>
+
+    <select id="selectBatchForApprovalList" resultMap="BaseResultMap">
+        SELECT bboa.*, bboi.outsourcer_name, bboi.director
+        FROM biz_business_outsource_assess bboa
+        LEFT JOIN biz_business_outsourcer_info bboi ON bboa.outsourcer_id = bboi.id
+        WHERE 1=1
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
+            and bboa.approval_status = #{request.approvalStatus}
+        </if>
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
+            and bboa.create_user_id = #{request.createUserId}
+        </if>
+        <if test="request != null and request.projectNo != null and request.projectNo !=''">
+            and bboa.project_no like concat('%',#{request.projectNo},'%')
+        </if>
+        <if test="request != null and request.outsourcerName != null and request.outsourcerName !=''">
+            and bboi.outsourcer_name like concat('%',#{request.outsourcerName},'%')
+        </if>
+        <if test="request != null and request.applicantName != null and request.applicantName !=''">
+            and bboa.applicant_name like concat('%',#{request.applicantName},'%')
+        </if>
+        <if test="request != null and request.applicantTimeStart != null and request.applicantTimeStart !=''">
+            and bboa.applicant_time &gt;= #{request.applicantTimeStart}
+        </if>
+        <if test="request != null and request.applicantTimeEnd != null and request.applicantTimeEnd !=''">
+            and bboa.applicant_time &lt;= #{request.applicantTimeEnd}
+        </if>
+        <if test="businessKeys != null">
+            and bboa.id in
+            <foreach collection="businessKeys" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
+        ORDER BY bboa.create_time DESC
+    </select>
 </mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceProtocolMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceProtocolMapper.xml
new file mode 100644
index 0000000..b7b2149
--- /dev/null
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceProtocolMapper.xml
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.mapper.business.BizBusinessOutsourceProtocolMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.business.BizBusinessOutsourceProtocol">
+        <id column="id" property="id" />
+        <result column="protocol_no" property="protocolNo" />
+        <result column="project_name" property="projectName" />
+        <result column="lab_code" property="labCode" />
+        <result column="group_code" property="groupCode" />
+        <result column="outsourcer_id" property="outsourcerId" />
+        <result column="remark" property="remark" />
+        <result column="outsource_no" property="outsourceNo" />
+        <result column="outsource_name" property="outsourceName" />
+        <result column="contacts" property="contacts" />
+        <result column="mobile" property="mobile" />
+        <result column="address" property="address" />
+        <result column="require_date" property="requireDate" />
+        <result column="outsource_cost" property="outsourceCost" />
+        <result column="director" property="director" />
+        <result column="item" property="item" />
+        <result column="requires" property="requires" />
+        <result column="create_user_id" property="createUserId" />
+        <result column="create_user_name" property="createUserName" />
+        <result column="approval_status" property="approvalStatus" />
+        <result column="process_id" property="processId" />
+        <result column="create_time" property="createTime" />
+        <result column="update_time" property="updateTime" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, protocol_no, project_name, lab_code, group_code, outsourcer_id, remark, outsource_no, outsource_name, contacts, mobile, address, require_date, outsource_cost, director, item, requires, create_user_id, create_user_name, approval_status, process_id, create_time, update_time
+    </sql>
+
+    <select id="selectMaxProtocolNo" resultType="java.lang.Long">
+        SELECT IFNULL(max(RIGHT(protocol_no, 3)), 0) from biz_business_outsource_protocol
+    </select>
+
+    <select id="selectBatchForApprovalList" resultMap="BaseResultMap">
+        SELECT *
+        FROM biz_business_outsource_protocol
+        WHERE 1=1
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
+            and approval_status = #{request.approvalStatus}
+        </if>
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
+            and create_user_id = #{request.createUserId}
+        </if>
+        <if test="request != null and request.protocolNo != null and request.protocolNo !=''">
+            and protocol_no like concat('%',#{request.protocolNo},'%')
+        </if>
+        <if test="request != null and request.outsourcerName != null and request.outsourcerName !=''">
+            and outsourcer_name like concat('%',#{request.outsourcerName},'%')
+        </if>
+        <if test="request != null and request.applicantName != null and request.applicantName !=''">
+            and create_user_name like concat('%',#{request.applicantName},'%')
+        </if>
+        <if test="request != null and request.applicantTimeStart != null and request.applicantTimeStart !=''">
+            and create_time &gt;= #{request.applicantTimeStart}
+        </if>
+        <if test="request != null and request.applicantTimeEnd != null and request.applicantTimeEnd !=''">
+            and create_time &lt;= #{request.applicantTimeEnd}
+        </if>
+        <if test="businessKeys != null">
+            and id in
+            <foreach collection="businessKeys" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
+        ORDER BY create_time DESC
+    </select>
+</mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourcerInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourcerInfoMapper.xml
index 510a80b..3049b54 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourcerInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourcerInfoMapper.xml
@@ -7,6 +7,8 @@
         <id column="id" property="id" />
         <result column="outsourcer_no" property="outsourcerNo" />
         <result column="outsourcer_name" property="outsourcerName" />
+        <result column="lab_code" property="labCode" />
+        <result column="group_code" property="groupCode" />
         <result column="outsourcer_brief_name" property="outsourcerBriefName" />
         <result column="outsourcer_size" property="outsourcerSize" />
         <result column="business_size" property="businessSize" />
@@ -55,32 +57,32 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, outsourcer_no, outsourcer_name, outsourcer_brief_name, outsourcer_size, business_size, grade, evaluation, tax_number, bank_account, bank_name, bank_account_number, postal_code, director, phone, fax, mobile, email, website, address_country, address_province, address_city, address_area, full_address, address_country_name, address_province_name, address_city_name, address_area_name, invoice_country, invoice_province, invoice_city, invoice_area, invoice_full_address, invoice_country_name, invoice_province_name, invoice_city_name, invoice_area_name, business_scope, business_content, minio_file_name, approval_status, process_id, remark, create_user_id, create_user_name, create_time, update_time
+        id, outsourcer_no, outsourcer_name, lab_code, group_code, outsourcer_brief_name, outsourcer_size, business_size, grade, evaluation, tax_number, bank_account, bank_name, bank_account_number, postal_code, director, phone, fax, mobile, email, website, address_country, address_province, address_city, address_area, full_address, address_country_name, address_province_name, address_city_name, address_area_name, invoice_country, invoice_province, invoice_city, invoice_area, invoice_full_address, invoice_country_name, invoice_province_name, invoice_city_name, invoice_area_name, business_scope, business_content, minio_file_name, approval_status, process_id, remark, create_user_id, create_user_name, create_time, update_time
     </sql>
 
     <select id="selectBatchForApprovalList" resultMap="BaseResultMap">
         SELECT *
         FROM biz_business_outsourcer_info
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.outsourcerNo != null and request.outsourcerNo !=''">
+        <if test="request != null and request.outsourcerNo != null and request.outsourcerNo !=''">
             and outsourcer_no like concat('%',#{request.outsourcerNo},'%')
         </if>
-        <if test="request.outsourcerName != null and request.outsourcerName !=''">
+        <if test="request != null and request.outsourcerName != null and request.outsourcerName !=''">
             and outsourcer_name like concat('%',#{request.outsourcerName},'%')
         </if>
-        <if test="request.director != null and request.director !=''">
+        <if test="request != null and request.director != null and request.director !=''">
             and director like concat('%',#{request.director},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
@@ -93,6 +95,6 @@
     </select>
 
     <select id="selectMaxNo" resultType="java.lang.Long">
-        SELECT IFNULL(max(RIGHT(outsourcer_no, 12)), 0) from biz_business_outsourcer_info
+        SELECT IFNULL(max(RIGHT(outsourcer_no, 3)), 0) from biz_business_outsourcer_info
     </select>
 </mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessSiteExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessSiteExecutiveInfoMapper.xml
index 135c5d0..3c5ae79 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessSiteExecutiveInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessSiteExecutiveInfoMapper.xml
@@ -38,25 +38,25 @@
         FROM biz_business_site_executive_info bsei
         LEFT JOIN biz_resource_customer_info rci ON bsei.customer_id = rci.id
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and bsei.approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and bsei.create_user_id = #{request.createUserId}
         </if>
-        <if test="request.siteExecutiveNo != null and request.siteExecutiveNo !=''">
+        <if test="request != null and request.siteExecutiveNo != null and request.siteExecutiveNo !=''">
             and bsei.site_executive_no like concat('%',#{request.siteExecutiveNo},'%')
         </if>
-        <if test="request.customerName != null and request.customerName !=''">
+        <if test="request != null and request.customerName != null and request.customerName !=''">
             and rci.outsourcer_name like concat('%',#{request.customerName},'%')
         </if>
-        <if test="request.applyName != null and request.applyName !=''">
+        <if test="request != null and request.applyName != null and request.applyName !=''">
             and bsei.apply_name like concat('%',#{request.applyName},'%')
         </if>
-        <if test="request.applyTimeStart != null and request.applyTimeStart !=''">
+        <if test="request != null and request.applyTimeStart != null and request.applyTimeStart !=''">
             and bsei.apply_time &gt;= #{request.applyTimeStart}
         </if>
-        <if test="request.applyTimeEnd != null and request.applyTimeEnd !=''">
+        <if test="request != null and request.applyTimeEnd != null and request.applyTimeEnd !=''">
             and bsei.apply_time &lt;= #{request.applyTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml
index 84d9e2a..6bd38a9 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml
@@ -105,6 +105,12 @@
         <if test="request.isUrgent != null and request.isUrgent !=''">
             AND bo.is_urgent = #{request.isUrgent}
         </if>
+        <if test="request.ids != null">
+            and blei.id in
+            <foreach collection="request.ids" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
         ORDER BY blei.update_time DESC
     </select>
 
@@ -137,6 +143,12 @@
         <if test="request.isUrgent != null and request.isUrgent !=''">
             AND bo.is_urgent = #{request.isUrgent}
         </if>
+        <if test="request.ids != null">
+            and blei.id in
+            <foreach collection="request.ids" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
         ORDER BY blei.update_time DESC
     </select>
 
diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardInfoMapper.xml
index 1a5551b..2ed8d17 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardInfoMapper.xml
@@ -45,12 +45,6 @@
         FROM biz_equipment_standard_info besi
         LEFT JOIN biz_equipment_standard_technology_relation bestr ON besi.standard_no = bestr.standard_no
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
-            and besi.approval_status = #{request.approvalStatus}
-        </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
-            and besi.create_user_id = #{request.createUserId}
-        </if>
         <if test="request.standardName != null and request.standardName !=''">
             and besi.standard_name like concat('%',#{request.standardName},'%')
         </if>
diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardTechnologyRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardTechnologyRelationMapper.xml
index fc7e16c..cd03c8c 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardTechnologyRelationMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardTechnologyRelationMapper.xml
@@ -6,6 +6,7 @@
     <resultMap id="BaseResultMap" type="com.casic.missiles.model.equipment.BizEquipmentStandardTechnologyRelation">
         <id column="id" property="id" />
         <result column="technology_file_id" property="technologyFileId" />
+        <result column="technology_file_no" property="technologyFileNo" />
         <result column="technology_file_name" property="technologyFileName" />
         <result column="standard_id" property="standardId" />
         <result column="standard_no" property="standardNo" />
@@ -14,7 +15,7 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, technology_file_id, technology_file_name, standard_id, remark
+        id, technology_file_id, technology_file_no, technology_file_name, standard_id, remark
     </sql>
 
 </mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceAuthorizeOrderMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceAuthorizeOrderMapper.xml
index ac5176c..554fe65 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceAuthorizeOrderMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceAuthorizeOrderMapper.xml
@@ -32,22 +32,22 @@
         SELECT *
         FROM biz_resource_authorize_order
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.orderNo != null and request.orderNo !=''">
+        <if test="request != null and request.orderNo != null and request.orderNo !=''">
             and order_no like concat('%',#{request.orderNo},'%')
         </if>
-        <if test="request.createUserName != null and request.createUserName !=''">
+        <if test="request != null and request.createUserName != null and request.createUserName !=''">
             and create_user_name like concat('%',#{request.createUserName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerExamineFormMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerExamineFormMapper.xml
index ab242f6..af7f98f 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerExamineFormMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerExamineFormMapper.xml
@@ -41,28 +41,28 @@
         SELECT *
         FROM biz_resource_customer_examine_form
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.formNo != null and request.formNo !=''">
+        <if test="request != null and request.formNo != null and request.formNo !=''">
             and form_no like concat('%',#{request.formNo},'%')
         </if>
-        <if test="request.labCode != null and request.labCode !=''">
+        <if test="request != null and request.labCode != null and request.labCode !=''">
             and lab_code like concat('%',#{request.labCode},'%')
         </if>
-        <if test="request.groupCode != null and request.groupCode !=''">
+        <if test="request != null and request.groupCode != null and request.groupCode !=''">
             and group_code like concat('%',#{request.groupCode},'%')
         </if>
-        <if test="request.createUserName != null and request.createUserName !=''">
+        <if test="request != null and request.createUserName != null and request.createUserName !=''">
             and create_user_name like concat('%',#{request.createUserName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerInfoMapper.xml
index fa8ffbc..06a2798 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerInfoMapper.xml
@@ -33,25 +33,25 @@
         SELECT *
         FROM biz_resource_customer_info
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.customerNo != null and request.customerNo !=''">
+        <if test="request != null and request.customerNo != null and request.customerNo !=''">
             and customer_no like concat('%',#{request.customerNo},'%')
         </if>
-        <if test="request.customerName != null and request.customerName !=''">
+        <if test="request != null and request.customerName != null and request.customerName !=''">
             and customer_name like concat('%',#{request.customerName},'%')
         </if>
-        <if test="request.contacts != null and request.contacts !=''">
+        <if test="request != null and request.contacts != null and request.contacts !=''">
             and contacts like concat('%',#{request.contacts},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerSuggestFormMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerSuggestFormMapper.xml
index 28f5bb2..1806662 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerSuggestFormMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerSuggestFormMapper.xml
@@ -33,28 +33,28 @@
         SELECT *
         FROM biz_resource_customer_suggest_form
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.formNo != null and request.formNo !=''">
+        <if test="request != null and request.formNo != null and request.formNo !=''">
             and form_no like concat('%',#{request.formNo},'%')
         </if>
-        <if test="request.customerName != null and request.customerName !=''">
+        <if test="request != null and request.customerName != null and request.customerName !=''">
             and customer_name like concat('%',#{request.customerName},'%')
         </if>
-        <if test="request.customerDeptName != null and request.customerDeptName !=''">
+        <if test="request != null and request.customerDeptName != null and request.customerDeptName !=''">
             and customer_dept_name like concat('%',#{request.customerDeptName},'%')
         </if>
-        <if test="request.createUserName != null and request.createUserName !=''">
+        <if test="request != null and request.createUserName != null and request.createUserName !=''">
             and create_user_name like concat('%',#{request.createUserName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSealUseNoteMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSealUseNoteMapper.xml
index ab37bc1..b02bb33 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSealUseNoteMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSealUseNoteMapper.xml
@@ -29,32 +29,32 @@
     </sql>
 
     <select id="selectBatchForApprovalList" resultMap="BaseResultMap">
-        SELECT *
+        SELECT brsun.*, brsi.seal_name, brsi.seal_type, brsi.approver_name
         FROM biz_resource_seal_use_note brsun
         JOIN biz_resource_seal_info brsi ON brsun.seal_id = brsi.id
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and brsun.approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and brsun.create_user_id = #{request.createUserId}
         </if>
-        <if test="request.sealName != null and request.sealName !=''">
+        <if test="request != null and request.sealName != null and request.sealName !=''">
             and brsi.seal_name like concat('%',#{request.sealName},'%')
         </if>
-        <if test="request.sealType != null and request.sealType !=''">
+        <if test="request != null and request.sealType != null and request.sealType !=''">
             and brsi.seal_type = #{request.sealType}
         </if>
-        <if test="request.applyDeptName != null and request.applyDeptName !=''">
+        <if test="request != null and request.applyDeptName != null and request.applyDeptName !=''">
             and brsun.apply_dept_name like concat('%',#{request.applyDeptName},'%')
         </if>
-        <if test="request.applyUserName != null and request.applyUserName !=''">
+        <if test="request != null and request.applyUserName != null and request.applyUserName !=''">
             and brsun.apply_user_name like concat('%',#{request.applyUserName},'%')
         </if>
-        <if test="request.applyTimeStart != null and request.applyTimeStart !=''">
+        <if test="request != null and request.applyTimeStart != null and request.applyTimeStart !=''">
             and brsun.apply_time &gt;= #{request.applyTimeStart}
         </if>
-        <if test="request.applyTimeEnd != null and request.applyTimeEnd !=''">
+        <if test="request != null and request.applyTimeEnd != null and request.applyTimeEnd !=''">
             and brsun.apply_time &lt;= #{request.applyTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml
index 119bf7d..4f8392a 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml
@@ -31,6 +31,12 @@
         <if test="request.deptName != null and request.deptName !=''">
             and brsi.dept_name like concat('%',#{request.deptName},'%')
         </if>
+        <if test="request.ids != null">
+            and brsv.id in
+            <foreach collection="request.ids" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
         ORDER BY brsv.grant_date DESC
     </select>
 
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSupplierInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSupplierInfoMapper.xml
index fe8d399..e8ce7ef 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSupplierInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSupplierInfoMapper.xml
@@ -48,28 +48,28 @@
         SELECT *
         FROM biz_resource_supplier_info
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.supplierNo != null and request.supplierNo !=''">
+        <if test="request != null and request.supplierNo != null and request.supplierNo !=''">
             and supplier_no like concat('%',#{request.supplierNo},'%')
         </if>
-        <if test="request.supplierName != null and request.supplierName !=''">
+        <if test="request != null and request.supplierName != null and request.supplierName !=''">
             and supplier_name like concat('%',#{request.supplierName},'%')
         </if>
-        <if test="request.director != null and request.director !=''">
+        <if test="request != null and request.director != null and request.director !=''">
             and director like concat('%',#{request.director},'%')
         </if>
-        <if test="request.supplierType != null and request.supplierType !=''">
+        <if test="request != null and request.supplierType != null and request.supplierType !=''">
             and supplier_type = #{request.supplierType}
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/EnvLocationInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/EnvLocationInfoMapper.xml
new file mode 100644
index 0000000..68bcf10
--- /dev/null
+++ b/casic-metering-dao/src/main/resources/mapper/resource/EnvLocationInfoMapper.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.mapper.resource.EnvLocationInfoMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.resource.EnvLocationInfo">
+        <id column="id" property="id" />
+        <result column="location_no" property="locationNo" />
+        <result column="location_name" property="locationName" />
+        <result column="location_position" property="locationPosition" />
+        <result column="create_user_id" property="createUserId" />
+        <result column="create_user" property="createUser" />
+        <result column="create_time" property="createTime" />
+        <result column="update_time" property="updateTime" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, location_no, location_name, location_position, create_user_id, create_user, create_time, update_time
+    </sql>
+
+    <select id="selectLocationListPage" resultType="com.casic.missiles.dto.resource.environment.LocationListResponse">
+        SELECT *
+        FROM env_location_info
+        WHERE 1=1
+        <if test="request.locationNo != null and request.locationNo !=''">
+            AND location_no LIKE concat('%',#{request.locationNo},'%')
+        </if>
+        <if test="request.locationName != null and request.locationName !=''">
+            AND location_name LIKE concat('%',#{request.locationName},'%')
+        </if>
+        ORDER BY create_time DESC
+    </select>
+
+</mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml
index b28c18f..8854047 100644
--- a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml
@@ -11,7 +11,6 @@
         <result column="sign_desc" property="signDesc" />
         <result column="sign_director" property="signDirector" />
         <result column="sign_user_id" property="signUserId" />
-        <result column="sign_type" property="signType" />
         <result column="minio_file_name" property="minioFileName" />
         <result column="create_time" property="createTime" />
         <result column="update_time" property="updateTime" />
@@ -28,7 +27,6 @@
         <result column="sign_name" property="signName" />
         <result column="sign_desc" property="signDesc" />
         <result column="sign_director" property="signDirector" />
-        <result column="sign_type" property="signType" />
         <result column="sign_user_id" property="signUserId" />
         <result column="minio_file_name" property="minioFileName" />
         <result column="create_time" property="createTime" />
@@ -62,4 +60,58 @@
         JOIN system_sign_user_relation ssur ON ss.id = ssur.sign_id
         WHERE ssur.user_id = #{userId}
     </select>
+
+    <select id="selectSignListPage" resultMap="BaseResultMap">
+        SELECT ss.*, sd.SIMPLE_NAME AS deptName
+        FROM system_sign ss
+        LEFT JOIN sys_user su ON su.id = ss.sign_user_id
+        LEFT JOIN sys_dept sd ON sd.id = su.dept_id
+        WHERE 1=1
+        <if test="request.signNo != null and request.signNo !=''">
+            AND ss.sign_no LIKE concat('%',#{request.signNo},'%')
+        </if>
+        <if test="request.signName != null and request.signName !=''">
+            AND ss.sign_name LIKE concat('%',#{request.signName},'%')
+        </if>
+        <if test="request.signDirector != null and request.signDirector !=''">
+            AND ss.sign_director LIKE concat('%',#{request.signDirector},'%')
+        </if>
+        <if test="request.signUserId != null and request.signUserId !=''">
+            AND ss.sign_user_id = #{request.signUserId}
+        </if>
+        <if test="request.createStartTime != null and request.createStartTime !=''">
+            AND DATE_FORMAT(ss.create_time,'%Y-%m-%d') &gt;= DATE_FORMAT(#{request.createStartTime},'%Y-%m-%d')
+        </if>
+        <if test="request.createEndTime != null and request.createEndTime !=''">
+            AND DATE_FORMAT(ss.create_time,'%Y-%m-%d')  &lt;= DATE_FORMAT(#{request.createEndTime},'%Y-%m-%d')
+        </if>
+        ORDER BY ss.create_time DESC
+    </select>
+
+    <select id="selectSignList" resultMap="BaseResultMap">
+        SELECT ss.*, sd.SIMPLE_NAME AS deptName
+        FROM system_sign ss
+        LEFT JOIN sys_user su ON su.id = ss.sign_user_id
+        LEFT JOIN sys_dept sd ON sd.id = su.dept_id
+        WHERE 1=1
+        <if test="request.signNo != null and request.signNo !=''">
+            AND ss.sign_no LIKE concat('%',#{request.signNo},'%')
+        </if>
+        <if test="request.signName != null and request.signName !=''">
+            AND ss.sign_name LIKE concat('%',#{request.signName},'%')
+        </if>
+        <if test="request.signDirector != null and request.signDirector !=''">
+            AND ss.sign_director LIKE concat('%',#{request.signDirector},'%')
+        </if>
+        <if test="request.signUserId != null and request.signUserId !=''">
+            AND ss.sign_user_id = #{request.signUserId}
+        </if>
+        <if test="request.createStartTime != null and request.createStartTime !=''">
+            AND DATE_FORMAT(ss.create_time,'%Y-%m-%d') &gt;= DATE_FORMAT(#{request.createStartTime},'%Y-%m-%d')
+        </if>
+        <if test="request.createEndTime != null and request.createEndTime !=''">
+            AND DATE_FORMAT(ss.create_time,'%Y-%m-%d')  &lt;= DATE_FORMAT(#{request.createEndTime},'%Y-%m-%d')
+        </if>
+        ORDER BY ss.create_time DESC
+    </select>
 </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 515050a..60f530b 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
@@ -47,8 +47,8 @@
     String STORAGE_LOCATION = "bizStorageLocation";
     //计量专业
     String MEASURE_MAJOR = "bizMeasureMajor";
-    //管理状态
-    String MANAGER_STATE = "bizManagerState";
+    //标准装置管理状态
+    String STANDARD_MANAGER_STATE = "bizStandardManagerState";
 
     /**
      * 资源管理 字典code
@@ -95,8 +95,6 @@
     String MEASURE_STATUS = "measureStatus";
     //检定方式
     String MEASURE_TYPE = "measureType";
-    //标识打印标志类型
-    String IDENTIFY_PRINT_TYPE = "bizBusinessIdentify";
     //变更类型
     String REPORT_CHANGE_TYPE = "bizCertChangeType";
     //规模类型
@@ -111,19 +109,24 @@
     String MEASURE_CATEGORY = "measureCategory";
     //检定结果
     String MEASURE_RESULT = "measureResult";
+    //分包原因
+    String OUTSOURCE_REASON = "outsourceReason";
+
+    /**
+     * 系统管理
+     */
+    String TEMPLATE_TYPE = "templateType";
+
 
     /**
      * 标准装置 字典code
      */
     //类别
     String STANDARD_CATEGORY = "standardCategory";
-    //管理状态
-    String STANDARD_MANAGER_STATE = "standardManagerState";
     //标准等级
     String STANDARD_LEVEL = "standardLevel";
     //传递范围
     String STANDARD_TRANSMIT_RANGE = "transmitRange";
-
     //资本来源
     String CAPITAL_SOURCE = "capitalSource";
     //标准装置-申请类型
@@ -148,8 +151,6 @@
     String CERTIFICATE_CLASS = "certificationClass";
     //证书管理-检校专业
     String CALIBRATION_MAJOR = "calibrationMajor";
-    //分包原因
-    String OUTSOURCE_REASON = "outsourceReason";
 
     /**
      * 工作台
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/BaseApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/BaseApprovalListRequest.java
index 73c12c1..80d7424 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/BaseApprovalListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/BaseApprovalListRequest.java
@@ -6,6 +6,7 @@
 
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotEmpty;
+import java.util.List;
 
 /**
  * @Description:
@@ -19,14 +20,14 @@
      * 表单id
      */
     @NotBlank(message = "表单id不能为空")
-    @ApiModelProperty(value = "表单id（流程定义对应的表单id，等价于业务id）", dataType = "String")
+    @ApiModelProperty(value = "表单id（流程定义对应的表单id，等价于业务id），导出接口不用传", dataType = "String")
     private String formId;
 
     /**
      * 审批状态类型，对应ApprovalStatusEnum
      */
     @NotEmpty(message = "审批状态类型不能为空")
-    @ApiModelProperty(value = "审批状态类型code", dataType = "String")
+    @ApiModelProperty(value = "审批状态类型code，导出接口不用传", dataType = "String")
     private String approvalStatus;
 
     @ApiModelProperty(hidden = true)
@@ -34,4 +35,7 @@
 
     @ApiModelProperty(hidden = true)
     private Long createUserId;
+
+    @ApiModelProperty(value = "导出ids", dataType = "List")
+    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificatePrintApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificatePrintApprovalListRequest.java
index b93d1c9..3cc2f4e 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificatePrintApprovalListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificatePrintApprovalListRequest.java
@@ -5,8 +5,6 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import java.util.List;
-
 /**
  * @Description:
  * @Author: wangpeng
@@ -38,7 +36,4 @@
 
     @ApiModelProperty(value = "创建结束时间", dataType = "String")
     private String createTimeEnd;
-
-    @ApiModelProperty(value = "导出ids", dataType = "List")
-    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportApprovalListRequest.java
index 4f7a038..c115847 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportApprovalListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportApprovalListRequest.java
@@ -5,8 +5,6 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import java.util.List;
-
 /**
  * @Description:
  * @Author: wangpeng
@@ -15,6 +13,8 @@
 @ApiModel
 @Data
 public class CertificateReportApprovalListRequest extends BaseApprovalListRequest {
+    @ApiModelProperty(value = "委托方id", dataType = "String")
+    private Long customerId;
 
     @ApiModelProperty(value = "证书报告编号", dataType = "String")
     private String certificateReportNo;
@@ -37,6 +37,4 @@
     @ApiModelProperty(value = "检校结束时间", dataType = "String")
     private String calibrationTimeEnd;
 
-    @ApiModelProperty(value = "导出ids", dataType = "List")
-    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/identify/IdentifyListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/identify/IdentifyListRequest.java
index 1b87ae6..f019203 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/identify/IdentifyListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/identify/IdentifyListRequest.java
@@ -4,6 +4,8 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * @Description:
  * @Author: wangpeng
@@ -26,4 +28,7 @@
 
     @ApiModelProperty(value = "打印结束时间", dataType = "String")
     private String createTimeEnd;
+
+    @ApiModelProperty(value = "导出ids", dataType = "List")
+    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListRequest.java
index 1264883..62415fb 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListRequest.java
@@ -7,6 +7,7 @@
 import lombok.Data;
 
 import javax.validation.constraints.NotBlank;
+import java.util.List;
 
 @Data
 @ApiModel
@@ -37,4 +38,6 @@
     @ApiModelProperty(value = "是否加急（1是0否null全部）", dataType = "Integer")
     private String isUrgent;
 
+    @ApiModelProperty(value = "导出ids", dataType = "List")
+    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListRequest.java
index 5201d7b..499760a 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListRequest.java
@@ -17,6 +17,9 @@
     @ApiModelProperty(value = "任务单编号", dataType = "String")
     private String orderNo;
 
+    @ApiModelProperty(value = "委托方id", dataType = "Long")
+    private Long customerId;
+
     @ApiModelProperty(value = "委托方名称", dataType = "String")
     private String customerName;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OrderSampleDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OrderSampleDTO.java
new file mode 100644
index 0000000..796edc0
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OrderSampleDTO.java
@@ -0,0 +1,19 @@
+package com.casic.missiles.dto.business.outsource;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/8/24 11:38
+ */
+@ApiModel
+@Data
+public class OrderSampleDTO {
+    @ApiModelProperty(value = "任务单id", dataType = "Long")
+    private Long orderId;
+    @ApiModelProperty(value = "受检设备id", dataType = "Long")
+    private Long sampleId;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceAssessApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceAssessApprovalListRequest.java
new file mode 100644
index 0000000..9a930c3
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceAssessApprovalListRequest.java
@@ -0,0 +1,30 @@
+package com.casic.missiles.dto.business.outsource;
+
+import com.casic.missiles.dto.BaseApprovalListRequest;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/8/24 11:01
+ */
+@ApiModel
+@Data
+public class OutsourceAssessApprovalListRequest extends BaseApprovalListRequest {
+    @ApiModelProperty(value = "评审表编号", dataType = "String")
+    private String projectNo;
+
+    @ApiModelProperty(value = "分包机构名称", dataType = "String")
+    private String outsourcerName;
+
+    @ApiModelProperty(value = "申请人", dataType = "String")
+    private String applicantName;
+
+    @ApiModelProperty(value = "申请时间开始", dataType = "String")
+    private String applicantTimeStart;
+
+    @ApiModelProperty(value = "申请时间结束", dataType = "String")
+    private String applicantTimeEnd;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceAssessSaveResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceAssessSaveResponse.java
new file mode 100644
index 0000000..8bf9aad
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceAssessSaveResponse.java
@@ -0,0 +1,20 @@
+package com.casic.missiles.dto.business.outsource;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/8/14 16:17
+ */
+@ApiModel
+@Data
+public class OutsourceAssessSaveResponse {
+    @ApiModelProperty(value = "主键id", dataType = "Long")
+    private Long id;
+
+    @ApiModelProperty(value = "编号", dataType = "String")
+    private String projectNo;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProtocolApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProtocolApprovalListRequest.java
new file mode 100644
index 0000000..0f32331
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProtocolApprovalListRequest.java
@@ -0,0 +1,30 @@
+package com.casic.missiles.dto.business.outsource;
+
+import com.casic.missiles.dto.BaseApprovalListRequest;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/8/24 15:01
+ */
+@ApiModel
+@Data
+public class OutsourceProtocolApprovalListRequest extends BaseApprovalListRequest {
+    @ApiModelProperty(value = "协议书编号", dataType = "String")
+    private String protocolNo;
+
+    @ApiModelProperty(value = "分包方名称", dataType = "String")
+    private String outsourcerName;
+
+    @ApiModelProperty(value = "申请人", dataType = "String")
+    private String applicantName;
+
+    @ApiModelProperty(value = "申请时间开始", dataType = "String")
+    private String applicantTimeStart;
+
+    @ApiModelProperty(value = "申请时间结束", dataType = "String")
+    private String applicantTimeEnd;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProtocolSaveResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProtocolSaveResponse.java
new file mode 100644
index 0000000..e324967
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProtocolSaveResponse.java
@@ -0,0 +1,20 @@
+package com.casic.missiles.dto.business.outsource;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/8/14 16:17
+ */
+@ApiModel
+@Data
+public class OutsourceProtocolSaveResponse {
+    @ApiModelProperty(value = "主键id", dataType = "Long")
+    private Long id;
+
+    @ApiModelProperty(value = "编号", dataType = "String")
+    private String protocolNo;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveApprovalListRequest.java
index f29f4e4..7047c28 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveApprovalListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveApprovalListRequest.java
@@ -5,8 +5,6 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import java.util.List;
-
 /**
  * @Description: 现场检测审批列表请求实体
  * @Author: wangpeng
@@ -30,7 +28,4 @@
     @ApiModelProperty(value = "申请时间结束", dataType = "String")
     private String applyTimeEnd;
 
-    @ApiModelProperty(value = "导出ids", dataType = "List")
-    private List<Long> ids;
-
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveDetailResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveDetailResponse.java
index 1f28752..394c934 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveDetailResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveDetailResponse.java
@@ -12,6 +12,18 @@
     @ApiModelProperty(value = "id，更新/删除使用参数", dataType = "Long")
     private Long id;
 
+    @ApiModelProperty(value = "实验室代码(字典code)", dataType = "String")
+    private String labCode;
+
+    @ApiModelProperty(value = "实验室代码(字典value)", dataType = "String")
+    private String labCodeName;
+
+    @ApiModelProperty(value = "组别代码(字典code)", dataType = "String")
+    private String groupCode;
+
+    @ApiModelProperty(value = "组别代码(字典value)", dataType = "String")
+    private String groupCodeName;
+
     @ApiModelProperty(value = "审批编号", dataType = "String")
     private String siteExecutiveNo;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/environment/LocationListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/environment/LocationListRequest.java
new file mode 100644
index 0000000..13d03c3
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/environment/LocationListRequest.java
@@ -0,0 +1,20 @@
+package com.casic.missiles.dto.resource.environment;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/6/8 13:56
+ */
+@ApiModel
+@Data
+public class LocationListRequest {
+    @ApiModelProperty(value = "地点编号", dataType = "String")
+    private String locationNo;
+
+    @ApiModelProperty(value = "地点名称", dataType = "String")
+    private String locationName;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/environment/LocationListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/environment/LocationListResponse.java
new file mode 100644
index 0000000..4c531af
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/environment/LocationListResponse.java
@@ -0,0 +1,78 @@
+package com.casic.missiles.dto.resource.environment;
+
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
+import com.baomidou.mybatisplus.annotation.TableField;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description: 地点列表响应实体
+ * @Author: wangpeng
+ * @Date: 2023/6/8 13:53
+ */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
+@ApiModel
+@Data
+public class LocationListResponse {
+    @ApiModelProperty(value = "主键id", dataType = "Long")
+    private Long id;
+
+    /**
+     * 地点编号
+     */
+    @ExcelProperty("地点编号")
+    @ApiModelProperty(value = "地点编号", dataType = "String")
+    private String locationNo;
+
+    /**
+     * 地点名称
+     */
+    @ExcelProperty("地点名称")
+    @ApiModelProperty(value = "地点名称", dataType = "String")
+    private String locationName;
+
+    /**
+     * 地点位置
+     */
+    @ExcelProperty("地点位置")
+    @ApiModelProperty(value = "地点位置", dataType = "String")
+    private String locationPosition;
+
+    /**
+     * 创建人id
+     */
+    @ApiModelProperty(value = "创建人id", dataType = "Long")
+    private Long createUserId;
+
+    /**
+     * 创建人
+     */
+    @ExcelProperty("创建人")
+    @ApiModelProperty(value = "创建人", dataType = "String")
+    @TableField("create_user")
+    private String createUser;
+
+    /**
+     * 创建时间
+     */
+    @ExcelProperty("创建时间")
+    @ApiModelProperty(value = "创建时间", dataType = "String")
+    private String createTime;
+
+    /**
+     * 更新时间
+     */
+    @ApiModelProperty(value = "更新时间", dataType = "String")
+    private String updateTime;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertRequest.java
index 9a7f6c6..c827915 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertRequest.java
@@ -4,6 +4,8 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * @Description:
  * @Author: wangpeng
@@ -16,4 +18,7 @@
     private String name;
     @ApiModelProperty(value = "部门名", dataType = "String")
     private String deptName;
+
+    @ApiModelProperty(value = "导出ids", dataType = "List")
+    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertResponse.java
index f78b159..8f2f79e 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertResponse.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.dto.resource.staff;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.casic.missiles.annotation.DictCodeField;
 import com.casic.missiles.constants.MeterDictCode;
 import io.swagger.annotations.ApiModel;
@@ -13,12 +20,18 @@
  * @Author: wangpeng
  * @Date: 2023/7/27 15:13
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @ApiModel
 @Data
 public class StaffCertResponse {
     /**
      * 人员编号
      */
+    @ExcelProperty(value = "人员编号",order = 0)
     @NotEmpty(message = "人员编号不能为空")
     @ApiModelProperty(value = "人员编号", dataType = "String")
     private String staffNo;
@@ -26,6 +39,7 @@
     /**
      * 姓名
      */
+    @ExcelProperty(value = "姓名",order = 1)
     @ApiModelProperty(value = "姓名", dataType = "String")
     private String staffName;
 
@@ -54,6 +68,7 @@
     /**
      * 部门名字
      */
+    @ExcelProperty(value = "工作部门",order = 2)
     @ApiModelProperty(value = "部门名字", dataType = "String")
     private String deptName;
 
@@ -66,6 +81,7 @@
     /**
      * 计量专业
      */
+    @ExcelProperty(value = "计量专业",order = 3)
     @ApiModelProperty(value = "计量专业", dataType = "String")
     private String major;
 
@@ -110,6 +126,7 @@
     /**
      * 证书号
      */
+    @ExcelProperty(value = "证号",order = 4)
     @ApiModelProperty(value = "证书号", dataType = "String")
     private String certNo;
 
@@ -122,12 +139,14 @@
     /**
      * 有效日期
      */
+    @ExcelProperty(value = "证书有效期",order = 6)
     @ApiModelProperty(value = "有效日期", dataType = "String")
     private String effectiveDate;
 
     /**
      * 发放日期
      */
+    @ExcelProperty(value = "发证日期",order = 5)
     @ApiModelProperty(value = "发放日期", dataType = "String")
     private String grantDate;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffListRequest.java
index 7c4afb3..0a1194a 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffListRequest.java
@@ -4,6 +4,8 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * @Description:
  * @Author: wangpeng
@@ -18,4 +20,7 @@
     private String deptName;
     @ApiModelProperty(value = "部门id", dataType = "Long")
     private Long deptId;
+
+    @ApiModelProperty(value = "导出ids", dataType = "List")
+    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/TrainListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/TrainListRequest.java
index f68597b..6321f8b 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/TrainListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/TrainListRequest.java
@@ -14,6 +14,8 @@
 public class TrainListRequest {
     @ApiModelProperty(value = "训练登记表编号", dataType = "String")
     private String trainNo;
+    @ApiModelProperty(value = "值班领导", dataType = "String")
+    private String dutyLeader;
     @ApiModelProperty(value = "创建开始时间", dataType = "String")
     private String createTimeStart;
     @ApiModelProperty(value = "创建结束时间", dataType = "String")
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/SignAddRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/SignAddRequest.java
index 117be34..d71055c 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/SignAddRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/SignAddRequest.java
@@ -43,13 +43,6 @@
     private Long signUserId;
 
     /**
-     * 签章或签名-字典code
-     */
-    @NotBlank(message = "类型不能为空")
-    @ApiModelProperty(value = "签名/签章-字典code", dataType = "String", required = true)
-    private String signType;
-
-    /**
      * minio存储文件名
      */
     @ApiModelProperty(value = "上传文件返回名称", dataType = "String")
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateAddRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateAddRequest.java
index aff1265..6316648 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateAddRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateAddRequest.java
@@ -17,30 +17,28 @@
 @Data
 public class TemplateAddRequest extends BaseSystemRequest {
     /**
-     * 原始记录模板/证书报告模板名称
+     * 模板名称
      */
     @ApiModelProperty(value = "名称", dataType = "String", required = true)
     @NotBlank(message = "名称不能为空")
     private String templateName;
 
     /**
-     * 原始记录模板/证书报告模板描述
+     * 模板描述
      */
     @ApiModelProperty(value = "描述", dataType = "String")
     private String templateDesc;
 
     /**
-     * 原始记录模板/证书报告模板创建人
+     * 创建人
      */
     @ApiModelProperty(value = "创建人", dataType = "String", required = true)
     @NotBlank(message = "创建人不能为空")
     private String templateCreator;
 
-    /**
-     * 原始记录模板/证书报告模板-字典code
-     */
-    @NotBlank(message = "类型不能为空")
-    @ApiModelProperty(value = "原始记录模板/证书报告模板-字典code", dataType = "String", required = true)
+
+    @NotBlank(message = "模板类型不能为空")
+    @ApiModelProperty(value = "模板类型(字典code)", dataType = "String", required = true)
     private String templateType;
 
     /**
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateListRequest.java
index eec5a1e..6d17bbe 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateListRequest.java
@@ -1,11 +1,12 @@
 package com.casic.missiles.dto.system;
 
+import com.casic.missiles.annotation.DictCodeField;
+import com.casic.missiles.constants.MeterDictCode;
 import com.casic.missiles.dto.BaseSystemRequest;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import javax.validation.constraints.NotBlank;
 import java.util.List;
 
 /**
@@ -19,8 +20,8 @@
     /**
      * 类型
      */
-//    @ApiModelProperty(value = "类型-字典code", dataType = "String", required = true)
-    @NotBlank(message = "类型不能为空")
+    @DictCodeField(message = "模板类型不合法", cacheName = MeterDictCode.TEMPLATE_TYPE)
+    @ApiModelProperty(value = "模板类型(字典code)", dataType = "String")
     private String templateType;
 
     /**
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificateChangeApply.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificateChangeApply.java
index 9216308..36923fd 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificateChangeApply.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificateChangeApply.java
@@ -1,11 +1,19 @@
 package com.casic.missiles.model.business;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 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 com.casic.missiles.dto.BaseRequest;
+import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -20,6 +28,12 @@
  * @author wangpeng
  * @since 2023-08-15
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
+@ApiModel
 @Data
 @TableName("biz_business_certificate_change_apply")
 public class BizBusinessCertificateChangeApply extends BaseRequest implements Serializable {
@@ -33,6 +47,7 @@
     /**
      * 申请单编号
      */
+    @ExcelProperty(value = "申请单编号", order = 1)
     @ApiModelProperty(value = "申请单编号", dataType = "String")
     @TableField("change_apply_no")
     private String changeApplyNo;
@@ -40,6 +55,7 @@
     /**
      * 申请单名字
      */
+    @ExcelProperty(value = "申请单名称", order = 2)
     @ApiModelProperty(value = "申请单名字", dataType = "String")
     @TableField("change_apply_name")
     private String changeApplyName;
@@ -54,6 +70,7 @@
     /**
      * 更换证书编号
      */
+    @ExcelProperty(value = "更换证书编号", order = 3)
     @ApiModelProperty(value = "更换证书编号", dataType = "String")
     @TableField("change_report_no")
     private String changeReportNo;
@@ -61,7 +78,8 @@
     /**
      * 更换证书名字
      */
-    @ApiModelProperty(value = "更换证书名字", dataType = "String")
+    @ExcelProperty(value = "更换证书/报告名称", order = 4)
+    @ApiModelProperty(value = "更换证书/报告名称", dataType = "String")
     @TableField("change_report_name")
     private String changeReportName;
 
@@ -73,6 +91,7 @@
     @TableField("change_type")
     private String changeType;
 
+    @ExcelProperty(value = "变更类型", order = 5)
     @ApiModelProperty(value = "变更类型(字典value)", dataType = "String")
     @TableField(exist = false)
     private String changeTypeName;
@@ -142,13 +161,15 @@
     /**
      * 创建用户名字
      */
-    @ApiModelProperty(value = "创建用户名字", dataType = "String")
+    @ExcelProperty(value = "创建人", order = 6)
+    @ApiModelProperty(value = "创建人名字", dataType = "String")
     @TableField("create_user_name")
     private String createUserName;
 
     /**
      * 创建时间
      */
+    @ExcelProperty(value = "创建时间", order = 7)
     @ApiModelProperty(value = "创建时间", dataType = "String")
     @TableField("create_time")
     private String createTime;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificateReport.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificateReport.java
index f01db9e..db06018 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificateReport.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificateReport.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.model.business;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -22,6 +29,11 @@
  * @author wangpeng
  * @since 2023-08-14
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @ApiModel
 @Data
 @TableName("biz_business_certificate_report")
@@ -36,6 +48,7 @@
     /**
      * 证书报告编号
      */
+    @ExcelProperty(value = "证书报告编号", order = 1)
     @ApiModelProperty(value = "证书报告编号", dataType = "String")
     @TableField("certificate_report_no")
     private String certificateReportNo;
@@ -43,6 +56,7 @@
     /**
      * 证书报告名称
      */
+    @ExcelProperty(value = "证书报告名称", order = 2)
     @ApiModelProperty(value = "证书报告名称", dataType = "String")
     @TableField("certificate_report_name")
     private String certificateReportName;
@@ -62,6 +76,7 @@
     @TableField("measure_category")
     private String measureCategory;
 
+    @ExcelProperty(value = "检校类别", order = 6)
     @ApiModelProperty(value = "检校类别(字典value)", dataType = "String")
     @TableField(exist = false)
     private String measureCategoryName;
@@ -69,6 +84,7 @@
     /**
      * 检校时间
      */
+    @ExcelProperty(value = "检校时间", order = 8)
     @ApiModelProperty(value = "检校时间", dataType = "String")
     @TableField("calibration_time")
     private String calibrationTime;
@@ -267,18 +283,22 @@
     @TableField(exist = false)
     private Integer decisionItem;
 
-    @ApiModelProperty(value = "设备样品编号（列表返回参数）", dataType = "String")
+    @ExcelProperty(value = "被检设备统一编号", order = 3)
+    @ApiModelProperty(value = "被检设备统一编号（列表返回参数）", dataType = "String")
     @TableField(exist = false)
     private String sampleNo;
 
-    @ApiModelProperty(value = "设备样品名称（列表返回参数）", dataType = "String")
+    @ExcelProperty(value = "被检设备名称", order = 4)
+    @ApiModelProperty(value = "被检设备名称（列表返回参数）", dataType = "String")
     @TableField(exist = false)
     private String sampleName;
 
-    @ApiModelProperty(value = "设备样品规格型号（列表返回参数）", dataType = "String")
+    @ExcelProperty(value = "规格型号", order = 5)
+    @ApiModelProperty(value = "规格型号（列表返回参数）", dataType = "String")
     @TableField(exist = false)
     private String sampleModel;
 
+    @ExcelProperty(value = "检定员", order = 7)
     @ApiModelProperty(value = "检定员名字（列表返回参数）", dataType = "String")
     @TableField(exist = false)
     private String staffName;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessIdentifyInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessIdentifyInfo.java
index 46bfba5..f1a9bec 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessIdentifyInfo.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessIdentifyInfo.java
@@ -1,10 +1,15 @@
 package com.casic.missiles.model.business;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 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;
 
@@ -20,6 +25,11 @@
  * @author wangpeng
  * @since 2023-08-15
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @Data
 @TableName("biz_business_identify_info")
 public class BizBusinessIdentifyInfo implements Serializable {
@@ -33,6 +43,7 @@
     /**
      * 记录编号
      */
+    @ExcelProperty(value = "记录编号", order = 1)
     @ApiModelProperty(value = "记录编号", dataType = "String")
     @TableField("record_no")
     private String recordNo;
@@ -41,20 +52,15 @@
      * 标志类型(字典code)
      */
     @NotEmpty(message = "标志类型不能为空")
-    @ApiModelProperty(value = "标志类型(字典code)", dataType = "String")
-    @DictCodeField(message = "标志类型不合法", cacheName = MeterDictCode.IDENTIFY_PRINT_TYPE)
+    @ApiModelProperty(value = "标志类型(直接存计量标识/使用状态/校准状态的字典value)", dataType = "String")
     @TableField("identify_type")
     private String identifyType;
 
-    @ApiModelProperty(value = "标志类型(字典value)", dataType = "String")
-    @TableField(exist = false)
-    private String identifyTypeName;
-
     /**
      * 设备id(可以是受检设备/设备台账)
      */
     @NotNull(message = "设备id不能为空")
-    @ApiModelProperty(value = "设备id(可以是受检设备/设备台账)", dataType = "String")
+    @ApiModelProperty(value = "设备id(可以是受检设备/设备台账)", dataType = "Long")
     @TableField("device_id")
     private Long deviceId;
 
@@ -66,29 +72,32 @@
     @TableField("device_type")
     private String deviceType;
 
+    @ExcelProperty(value = "统一编号", order = 3)
     @NotEmpty(message = "设备编号不能为空")
-    @ApiModelProperty(value = "设备编号", dataType = "String")
+    @ApiModelProperty(value = "统一编号", dataType = "String")
     @TableField("device_no")
     private String deviceNo;
 
     /**
      * 设备名字
      */
-    @NotEmpty(message = "设备名字不能为空")
-    @ApiModelProperty(value = "设备名字", dataType = "String")
+    @ExcelProperty(value = "设备名称", order = 4)
+    @NotEmpty(message = "设备名称不能为空")
+    @ApiModelProperty(value = "设备名称", dataType = "String")
     @TableField("device_name")
     private String deviceName;
 
     /**
      * 检定员id
      */
-    @ApiModelProperty(value = "检定员id", dataType = "String")
+    @ApiModelProperty(value = "检定员id", dataType = "Long")
     @TableField("measure_person_id")
     private Long measurePersonId;
 
     /**
      * 检定员名字
      */
+    @ExcelProperty(value = "检定员", order = 5)
     @ApiModelProperty(value = "检定员名字", dataType = "String")
     @TableField("measure_person")
     private String measurePerson;
@@ -103,7 +112,8 @@
     /**
      * 更新时间
      */
-    @ApiModelProperty(value = "更新时间", dataType = "String")
+    @ExcelProperty(value = "打印时间", order = 6)
+    @ApiModelProperty(value = "打印时间", dataType = "String")
     @TableField("update_time")
     private String updateTime;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceAssess.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceAssess.java
index 659d9ca..6720b90 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceAssess.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceAssess.java
@@ -1,11 +1,26 @@
 package com.casic.missiles.model.business;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 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 com.casic.missiles.dto.BaseRequest;
+import com.casic.missiles.dto.business.outsource.OrderSampleDTO;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import javax.validation.constraints.NotEmpty;
 import java.io.Serializable;
+import java.util.List;
 
 /**
  * <p>
@@ -15,146 +30,231 @@
  * @author wangpeng
  * @since 2023-08-16
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
+@ApiModel
 @Data
 @TableName("biz_business_outsource_assess")
-public class BizBusinessOutsourceAssess implements Serializable {
+public class BizBusinessOutsourceAssess extends BaseRequest implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
+    @ApiModelProperty(value = "id，更新/删除使用参数", dataType = "Long")
     @TableId("id")
     private Long id;
 
     /**
      * 评审表编号
      */
+    @ExcelProperty(value = "评审表编号", order = 1)
+    @ApiModelProperty(value = "评审表编号(后台生成)", dataType = "String")
     @TableField("project_no")
     private String projectNo;
 
     /**
      * 评审表名称
      */
+    @ExcelProperty(value = "评审表名称", order = 2)
+    @ApiModelProperty(value = "评审表名称", dataType = "String")
     @TableField("project_name")
     private String projectName;
 
+    @NotEmpty(message = "实验室代码不能为空")
+    @DictCodeField(message = "实验室代码描述不合法", cacheName = MeterDictCode.LAB_CODE)
+    @ApiModelProperty(value = "实验室代码(字典code)", dataType = "String")
+    @TableField("lab_code")
+    private String labCode;
+
+    @ApiModelProperty(value = "实验室代码(字典value)", dataType = "String")
+    @TableField(exist = false)
+    private String labCodeName;
+
+    /**
+     * 组别代码
+     */
+    @NotEmpty(message = "组别代码不能为空")
+    @DictCodeField(message = "组别代码描述不合法", cacheName = MeterDictCode.GROUP_CODE)
+    @ApiModelProperty(value = "组别代码(字典code)", dataType = "String")
+    @TableField("group_code")
+    private String groupCode;
+
+    @ApiModelProperty(value = "组别代码(字典value)", dataType = "String")
+    @TableField(exist = false)
+    private String groupCodeName;
+
     /**
      * 申请人id
      */
+    @ApiModelProperty(value = "申请人id", dataType = "String")
     @TableField("applicant_id")
     private Long applicantId;
 
     /**
      * 申请人名字
      */
+    @ExcelProperty(value = "申请人", order = 5)
+    @ApiModelProperty(value = "申请人", dataType = "String")
     @TableField("applicant_name")
     private String applicantName;
 
     /**
      * 申请时间
      */
+    @ExcelProperty(value = "申请时间", order = 6)
+    @ApiModelProperty(value = "申请时间", dataType = "String")
     @TableField("applicant_time")
     private String applicantTime;
 
     /**
      * 附件(minio存储文件名)
      */
+    @ApiModelProperty(value = "附件(minio存储文件名)", dataType = "String")
     @TableField("minio_file_name")
     private String minioFileName;
 
     /**
      * 备注
      */
+    @ApiModelProperty(value = "备注", dataType = "String")
     @TableField("remark")
     private String remark;
 
     /**
      * 创建人id
      */
+    @ApiModelProperty(value = "创建人id", dataType = "String")
     @TableField("create_user_id")
     private Long createUserId;
 
     /**
      * 创建人名字
      */
+    @ApiModelProperty(value = "创建人名字", dataType = "String")
     @TableField("create_user_name")
     private String createUserName;
 
     /**
      * 分包方id
      */
+    @ApiModelProperty(value = "评审表编号", dataType = "String")
     @TableField("outsourcer_id")
     private Long outsourcerId;
 
     /**
      * 预计开始时间
      */
+    @ApiModelProperty(value = "预计开始时间", dataType = "String")
     @TableField("pre_start_time")
     private String preStartTime;
 
     /**
      * 预计结束时间
      */
+    @ApiModelProperty(value = "预计结束时间", dataType = "String")
     @TableField("pre_end_time")
     private String preEndTime;
 
     /**
      * 分包原因-字典
      */
+    @ApiModelProperty(value = "分包原因(字典code)", dataType = "String")
+    @DictCodeField(message = "分包原因描述不合法", cacheName = MeterDictCode.OUTSOURCE_REASON)
     @TableField("outsource_reason")
     private String outsourceReason;
 
+    @ApiModelProperty(value = "分包原因(字典value)", dataType = "String")
+    @TableField(exist = false)
+    private String outsourceReasonName;
+
     /**
      * 预计费用
      */
+    @ApiModelProperty(value = "预计费用", dataType = "String")
     @TableField("pre_cost")
     private String preCost;
 
     /**
      * 审批状态
      */
+    @ApiModelProperty(value = "审批状态", dataType = "String")
+    @DictCodeField(message = "审批状态描述不合法", cacheName = MeterDictCode.APPROVAL_STATUS)
     @TableField("approval_status")
     private String approvalStatus;
 
     /**
      * 流程实例id
      */
+    @ApiModelProperty(value = "流程实例id", dataType = "String")
     @TableField("process_id")
     private String processId;
 
     /**
      * 实验室认可情况
      */
+    @ApiModelProperty(value = "实验室认可情况", dataType = "String")
     @TableField("approve_situation")
     private String approveSituation;
 
     /**
      * 溯源性
      */
+    @ApiModelProperty(value = "溯源性", dataType = "String")
     @TableField("traceability")
     private String traceability;
 
     /**
      * 测试方法
      */
+    @ApiModelProperty(value = "测试方法", dataType = "String")
     @TableField("test_method")
     private String testMethod;
 
     /**
      * 技术能力
      */
+    @ApiModelProperty(value = "技术能力", dataType = "String")
     @TableField("technique_ability")
     private String techniqueAbility;
 
     /**
      * 创建时间
      */
+    @ApiModelProperty(hidden = true)
     @TableField("create_time")
     private String createTime;
 
     /**
      * 更新时间
      */
+    @ApiModelProperty(hidden = true)
     @TableField("update_time")
     private String updateTime;
 
+    @ApiModelProperty(value = "审批状态类型-字典value", dataType = "String")
+    @TableField(exist = false)
+    private String approvalStatusName;
 
+    @ApiModelProperty(value = "任务id（同意、驳回等操作使用）", dataType = "String")
+    @TableField(exist = false)
+    private String taskId;
+
+    @ApiModelProperty(value = "可选决策项（1同意驳回拒绝 2同意驳回 3同意拒绝，用于待审批列表同意/驳回/拒绝按钮展示）", dataType = "Integer")
+    @TableField(exist = false)
+    private Integer decisionItem;
+
+    @NotEmpty(message = "受检设备信息不能为空")
+    @ApiModelProperty(value = "受检设备id列表（新建使用参数）", dataType = "List")
+    @TableField(exist = false)
+    private List<OrderSampleDTO> orderSampleList;
+
+    @ExcelProperty(value = "分包机构名称", order = 3)
+    @ApiModelProperty(value = "分包机构名称（列表返回参数）", dataType = "String")
+    private String outsourcerName;
+
+    @ExcelProperty(value = "机构负责人", order = 4)
+    @ApiModelProperty(value = "机构负责人（列表返回参数）", dataType = "String")
+    private String director;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceProtocol.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceProtocol.java
new file mode 100644
index 0000000..38df697
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceProtocol.java
@@ -0,0 +1,225 @@
+package com.casic.missiles.model.business;
+
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
+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 com.casic.missiles.dto.BaseRequest;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotEmpty;
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 计量检定业务-分包管理-测试、校准或检定工作分包协议书
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-08-24
+ */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
+@Data
+@TableName("biz_business_outsource_protocol")
+public class BizBusinessOutsourceProtocol extends BaseRequest implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "id，更新/删除使用参数", dataType = "Long")
+    @TableId("id")
+    private Long id;
+
+    /**
+     * 协议书编号
+     */
+    @ExcelProperty(value = "协议书编号", order = 1)
+    @ApiModelProperty(value = "协议书编号(后台生成)", dataType = "String")
+    @TableField("protocol_no")
+    private String protocolNo;
+
+    /**
+     * 协议书名称
+     */
+    @ExcelProperty(value = "协议书名称", order = 2)
+    @ApiModelProperty(value = "协议书名称", dataType = "String")
+    @TableField("project_name")
+    private String projectName;
+
+    @NotEmpty(message = "实验室代码不能为空")
+    @DictCodeField(message = "实验室代码描述不合法", cacheName = MeterDictCode.LAB_CODE)
+    @ApiModelProperty(value = "实验室代码(字典code)", dataType = "String")
+    @TableField("lab_code")
+    private String labCode;
+
+    @ApiModelProperty(value = "实验室代码(字典value)", dataType = "String")
+    @TableField(exist = false)
+    private String labCodeName;
+
+    @NotEmpty(message = "组别代码不能为空")
+    @DictCodeField(message = "组别代码描述不合法", cacheName = MeterDictCode.GROUP_CODE)
+    @ApiModelProperty(value = "组别代码(字典code)", dataType = "String")
+    @TableField("group_code")
+    private String groupCode;
+
+    @ApiModelProperty(value = "组别代码(字典value)", dataType = "String")
+    @TableField(exist = false)
+    private String groupCodeName;
+
+    /**
+     * 分包方id
+     */
+    @ApiModelProperty(value = "分包方id", dataType = "Long")
+    @TableField("outsourcer_id")
+    private Long outsourcerId;
+
+    /**
+     * 其他
+     */
+    @ApiModelProperty(value = "其他", dataType = "String")
+    @TableField("remark")
+    private String remark;
+
+    /**
+     * 分包方编号
+     */
+    @ApiModelProperty(value = "分包方编号(新建不用传)", dataType = "String")
+    @TableField("outsource_no")
+    private String outsourceNo;
+
+    /**
+     * 分包方名称
+     */
+    @ExcelProperty(value = "分包方名称", order = 3)
+    @ApiModelProperty(value = "分包方名称(新建不用传)", dataType = "String")
+    @TableField("outsource_name")
+    private String outsourceName;
+
+    /**
+     * 联系人
+     */
+    @ExcelProperty(value = "联系人", order = 4)
+    @ApiModelProperty(value = "联系人", dataType = "String")
+    @TableField("contacts")
+    private String contacts;
+
+    /**
+     * 电话
+     */
+    @ApiModelProperty(value = "电话", dataType = "String")
+    @TableField("mobile")
+    private String mobile;
+
+    /**
+     * 地址
+     */
+    @ApiModelProperty(value = "地址", dataType = "String")
+    @TableField("address")
+    private String address;
+
+    /**
+     * 要求完成日期
+     */
+    @ApiModelProperty(value = "要求完成日期", dataType = "String")
+    @TableField("require_date")
+    private String requireDate;
+
+    /**
+     * 分包费用(元)
+     */
+    @ApiModelProperty(value = "分包费用(元)", dataType = "String")
+    @TableField("outsource_cost")
+    private Double outsourceCost;
+
+    /**
+     * 分包方负责人
+     */
+    @ApiModelProperty(value = "分包方负责人", dataType = "String")
+    @TableField("director")
+    private String director;
+
+    /**
+     * 分包项目
+     */
+    @ApiModelProperty(value = "分包项目", dataType = "String")
+    @TableField("item")
+    private String item;
+
+    /**
+     * 分包要求
+     */
+    @ApiModelProperty(value = "分包要求", dataType = "String")
+    @TableField("requires")
+    private String requires;
+
+    /**
+     * 创建人id
+     */
+    @ApiModelProperty(hidden = true)
+    @TableField("create_user_id")
+    private Long createUserId;
+
+    /**
+     * 创建人名字
+     */
+    @ExcelProperty(value = "申请人", order = 5)
+    @ApiModelProperty(value = "申请人", dataType = "String")
+    @TableField("create_user_name")
+    private String createUserName;
+
+    /**
+     * 审批状态
+     */
+    @ApiModelProperty(value = "审批状态", dataType = "String")
+    @DictCodeField(message = "审批状态描述不合法", cacheName = MeterDictCode.APPROVAL_STATUS)
+    @TableField("approval_status")
+    private String approvalStatus;
+
+    /**
+     * 流程实例id
+     */
+    @ApiModelProperty(value = "流程实例id", dataType = "String")
+    @TableField("process_id")
+    private String processId;
+
+    /**
+     * 创建时间
+     */
+    @ExcelProperty(value = "申请时间", order = 6)
+    @ApiModelProperty(value = "申请时间", dataType = "String")
+    @TableField("create_time")
+    private String createTime;
+
+    /**
+     * 更新时间
+     */
+    @ApiModelProperty(hidden = true)
+    @TableField("update_time")
+    private String updateTime;
+
+    @ApiModelProperty(value = "审批状态类型-字典value", dataType = "String")
+    @TableField(exist = false)
+    private String approvalStatusName;
+
+    @ApiModelProperty(value = "任务id（同意、驳回等操作使用）", dataType = "String")
+    @TableField(exist = false)
+    private String taskId;
+
+    @ApiModelProperty(value = "可选决策项（1同意驳回拒绝 2同意驳回 3同意拒绝，用于待审批列表同意/驳回/拒绝按钮展示）", dataType = "Integer")
+    @TableField(exist = false)
+    private Integer decisionItem;
+
+
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourcerInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourcerInfo.java
index ec4e997..f9aa69e 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourcerInfo.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourcerInfo.java
@@ -17,6 +17,7 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import javax.validation.constraints.NotEmpty;
 import java.io.Serializable;
 
 /**
@@ -59,6 +60,29 @@
     @TableField("outsourcer_name")
     private String outsourcerName;
 
+    @NotEmpty(message = "实验室代码不能为空")
+    @DictCodeField(message = "实验室代码描述不合法", cacheName = MeterDictCode.LAB_CODE)
+    @ApiModelProperty(value = "实验室代码(字典code)", dataType = "String")
+    @TableField("lab_code")
+    private String labCode;
+
+    @ApiModelProperty(value = "实验室代码(字典value)", dataType = "String")
+    @TableField(exist = false)
+    private String labCodeName;
+
+    /**
+     * 组别代码
+     */
+    @NotEmpty(message = "组别代码不能为空")
+    @DictCodeField(message = "组别代码描述不合法", cacheName = MeterDictCode.GROUP_CODE)
+    @ApiModelProperty(value = "组别代码(字典code)", dataType = "String")
+    @TableField("group_code")
+    private String groupCode;
+
+    @ApiModelProperty(value = "组别代码(字典value)", dataType = "String")
+    @TableField(exist = false)
+    private String groupCodeName;
+
     /**
      * 单位简称
      */
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardInfo.java
index c48eed7..dffdfdd 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardInfo.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardInfo.java
@@ -5,6 +5,7 @@
 import com.baomidou.mybatisplus.annotation.TableName;
 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;
 
@@ -18,6 +19,7 @@
  * @author wangpeng
  * @since 2023-08-04
  */
+@ApiModel
 @Data
 @TableName("biz_equipment_standard_info")
 public class BizEquipmentStandardInfo implements Serializable {
@@ -119,7 +121,7 @@
      * 管理状态(字典code)
      */
     @ApiModelProperty(value = "管理状态(字典code)", dataType = "String")
-    @DictCodeField(message = "管理状态不合法", cacheName = MeterDictCode.MANAGER_STATE)
+    @DictCodeField(message = "管理状态不合法", cacheName = MeterDictCode.STANDARD_MANAGER_STATE)
     @TableField("manage_status")
     private String manageStatus;
 
@@ -151,7 +153,7 @@
     /**
      * 温度(℃)
      */
-    @ApiModelProperty(value = "使用状态(字典code)", dataType = "String")
+    @ApiModelProperty(value = "温度(℃)", dataType = "String")
     @TableField("temperature")
     private Double temperature;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardInfoApproval.java b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardInfoApproval.java
index dbd86ab..9f58d83 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardInfoApproval.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardInfoApproval.java
@@ -150,7 +150,7 @@
      * 管理状态(字典code)
      */
     @ApiModelProperty(value = "管理状态(字典code)", dataType = "String")
-    @DictCodeField(message = "管理状态不合法", cacheName = MeterDictCode.MANAGER_STATE)
+    @DictCodeField(message = "管理状态不合法", cacheName = MeterDictCode.STANDARD_MANAGER_STATE)
     @TableField("manage_status")
     private String manageStatus;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardTechnologyRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardTechnologyRelation.java
index 0e612bd..751f26b 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardTechnologyRelation.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardTechnologyRelation.java
@@ -3,6 +3,7 @@
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -16,6 +17,7 @@
  * @author wangpeng
  * @since 2023-08-04
  */
+@ApiModel
 @Data
 @TableName("biz_equipment_standard_technology_relation")
 public class BizEquipmentStandardTechnologyRelation implements Serializable {
@@ -33,6 +35,10 @@
     @TableField("technology_file_id")
     private Long technologyFileId;
 
+    @ApiModelProperty(value = "依据的技术文件编号", dataType = "String")
+    @TableField("technology_file_no")
+    private String technologyFileNo;
+
     /**
      * 依据的技术文件名称(技术文件中现行测试校准检定方法表文件名字段)
      */
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerInfo.java
index d6e8bed..65cd6bc 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerInfo.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerInfo.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.model.resource;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -21,6 +28,11 @@
  * @author wangpeng
  * @since 2023-08-08
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @ApiModel
 @Data
 @TableName("biz_resource_customer_info")
@@ -35,6 +47,7 @@
     /**
      * 委托方编号
      */
+    @ExcelProperty(value = "委托方编号", order = 1)
     @ApiModelProperty(value = "委托方编号", dataType = "String")
     @TableField("customer_no")
     private String customerNo;
@@ -42,6 +55,7 @@
     /**
      * 委托方名称
      */
+    @ExcelProperty(value = "委托方名称", order = 2)
     @ApiModelProperty(value = "委托方名称(新建时为下拉选择一个受检单位组织的名字，传deptId字段，后端获取名称)", dataType = "String")
     @TableField("customer_name")
     private String customerName;
@@ -63,6 +77,7 @@
     /**
      * 联系人
      */
+    @ExcelProperty(value = "联系人", order = 3)
     @ApiModelProperty(value = "联系人", dataType = "String")
     @TableField("contacts")
     private String contacts;
@@ -70,6 +85,7 @@
     /**
      * 座机电话
      */
+    @ExcelProperty(value = "座机电话", order = 4)
     @ApiModelProperty(value = "座机电话", dataType = "String")
     @TableField("mobile")
     private String mobile;
@@ -77,6 +93,7 @@
     /**
      * 手机号码
      */
+    @ExcelProperty(value = "手机号码", order = 5)
     @ApiModelProperty(value = "手机号码", dataType = "String")
     @TableField("phone")
     private String phone;
@@ -91,6 +108,7 @@
     /**
      * 地址
      */
+    @ExcelProperty(value = "地址", order = 6)
     @ApiModelProperty(value = "地址", dataType = "String")
     @TableField("address")
     private String address;
@@ -141,6 +159,7 @@
     /**
      * 创建时间
      */
+    @ExcelProperty(value = "创建时间", order = 7)
     @ApiModelProperty(value = "创建时间", dataType = "String")
     @TableField("create_time")
     private String createTime;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerSuggestForm.java b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerSuggestForm.java
index 7201bbd..701bf8b 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerSuggestForm.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerSuggestForm.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.model.resource;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -22,6 +29,11 @@
  * @author wangpeng
  * @since 2023-08-08
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @ApiModel
 @Data
 @TableName("biz_resource_customer_suggest_form")
@@ -44,7 +56,8 @@
     /**
      * 委托方名称
      */
-    @ApiModelProperty(value = "委托方名称", dataType = "String")
+    @ExcelProperty(value = "意见反馈单位", order = 2)
+    @ApiModelProperty(value = "意见反馈单位", dataType = "String")
     @TableField("customer_name")
     private String customerName;
 
@@ -59,7 +72,8 @@
     /**
      * 委托方意见反馈部门名称
      */
-    @ApiModelProperty(value = "委托方意见反馈部门名称", dataType = "String")
+    @ExcelProperty(value = "委托方意见反馈部门", order = 3)
+    @ApiModelProperty(value = "委托方意见反馈部门", dataType = "String")
     @TableField("customer_dept_name")
     private String customerDeptName;
 
@@ -73,6 +87,7 @@
     /**
      * 表单编号
      */
+    @ExcelProperty(value = "表单编号", order = 1)
     @ApiModelProperty(value = "表单编号", dataType = "String")
     @TableField("form_no")
     private String formNo;
@@ -111,6 +126,7 @@
     /**
      * 创建人名字
      */
+    @ExcelProperty(value = "创建人", order = 4)
     @ApiModelProperty(value = "创建人名字", dataType = "String")
     @TableField("create_user_name")
     private String createUserName;
@@ -147,6 +163,7 @@
     /**
      * 创建时间
      */
+    @ExcelProperty(value = "创建时间", order = 5)
     @ApiModelProperty(value = "创建时间", dataType = "String")
     @TableField("create_time")
     private String createTime;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSealInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSealInfo.java
index cbf05d7..9bf389d 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSealInfo.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSealInfo.java
@@ -106,6 +106,10 @@
     @TableField("minio_file_name")
     private String minioFileName;
 
+    @ApiModelProperty(value = "minio存储文件url", dataType = "String")
+    @TableField(exist = false)
+    private String minioFileUrl;
+
     @ApiModelProperty(value = "创建时间", dataType = "String")
     @TableField("create_time")
     private String createTime;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSealUseNote.java b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSealUseNote.java
index 3f2d9e8..3ce16a8 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSealUseNote.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSealUseNote.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.model.resource;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -20,6 +27,11 @@
  * @author wangpeng
  * @since 2023-07-28
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @ApiModel
 @Data
 @TableName("biz_resource_seal_use_note")
@@ -34,6 +46,7 @@
     /**
      * 登记表编号
      */
+    @ExcelProperty(value = "申请单编号", order = 1)
     @ApiModelProperty(value = "登记表编号(自动生成)", dataType = "String")
     @TableField("note_form_no")
     private String noteFormNo;
@@ -55,6 +68,7 @@
     /**
      * 申请部门
      */
+    @ExcelProperty(value = "申请部门", order = 5)
     @ApiModelProperty(value = "申请部门", dataType = "String")
     @TableField("apply_dept_name")
     private String applyDeptName;
@@ -69,6 +83,7 @@
     /**
      * 申请人
      */
+    @ExcelProperty(value = "申请人", order = 6)
     @ApiModelProperty(value = "申请人", dataType = "String")
     @TableField("apply_user_name")
     private String applyUserName;
@@ -76,6 +91,7 @@
     /**
      * 申请时间
      */
+    @ExcelProperty(value = "申请时间", order = 7)
     @ApiModelProperty(value = "申请时间(新增自动获取当前时间)", dataType = "String")
     @TableField("apply_time")
     private String applyTime;
@@ -130,6 +146,26 @@
     @TableField("update_time")
     private String updateTime;
 
+    @ExcelProperty(value = "印章名称", order = 2)
+    @ApiModelProperty(value = "印章名称(列表返回参数)", dataType = "String")
+    @TableField(exist = false)
+    private String sealName;
+
+    @DictCodeField(message = "印章类型描述不合法", cacheName = MeterDictCode.SEAL_TYPE)
+    @ApiModelProperty(hidden = true)
+    @TableField(exist = false)
+    private String sealType;
+
+    @ExcelProperty(value = "印章类型", order = 3)
+    @ApiModelProperty(value = "印章类型(列表返回参数)", dataType = "String")
+    @TableField(exist = false)
+    private String sealTypeName;
+
+    @ExcelProperty(value = "批准人", order = 4)
+    @ApiModelProperty(value = "批准人(列表返回参数)", dataType = "String")
+    @TableField(exist = false)
+    private String approverName;
+
     @ApiModelProperty(value = "审批状态类型-字典value", dataType = "String")
     @TableField(exist = false)
     private String approvalStatusName;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceStaffInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceStaffInfo.java
index 5ef995b..41563a1 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceStaffInfo.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceStaffInfo.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.model.resource;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -20,6 +27,11 @@
  * @author wangpeng
  * @since 2023-07-25
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @ApiModel
 @Data
 @TableName("biz_resource_staff_info")
@@ -38,6 +50,7 @@
     /**
      * 人员编号
      */
+    @ExcelProperty(value = "人员编号",order = 0)
     @NotEmpty(message = "人员编号不能为空")
     @ApiModelProperty(value = "人员编号", dataType = "String")
     @TableField("staff_no")
@@ -46,6 +59,7 @@
     /**
      * 姓名
      */
+    @ExcelProperty(value = "姓名",order = 1)
     @ApiModelProperty(value = "姓名", dataType = "String")
     @TableField("staff_name")
     private String staffName;
@@ -152,13 +166,15 @@
     /**
      * 部门名字
      */
-    @ApiModelProperty(value = "部门名字", dataType = "String")
+    @ExcelProperty(value = "工作部门",order = 4)
+    @ApiModelProperty(value = "工作部门", dataType = "String")
     @TableField("dept_name")
     private String deptName;
 
     /**
      * 岗位
      */
+    @ExcelProperty(value = "岗位",order = 2)
     @ApiModelProperty(value = "岗位", dataType = "String")
     @TableField("station")
     private String station;
@@ -166,6 +182,7 @@
     /**
      * 计量专业
      */
+    @ExcelProperty(value = "计量专业",order = 5)
     @ApiModelProperty(value = "计量专业", dataType = "String")
     @TableField("major")
     private String major;
@@ -173,6 +190,7 @@
     /**
      * 证号
      */
+    @ExcelProperty(value = "证号",order = 3)
     @ApiModelProperty(value = "证号", dataType = "String")
     @TableField("certificate_number")
     private String certificateNumber;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSupplierInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSupplierInfo.java
index eb5ef01..a1e2697 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSupplierInfo.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSupplierInfo.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.model.resource;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -20,6 +27,11 @@
  * @author wangpeng
  * @since 2023-07-27
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @ApiModel
 @Data
 @TableName("biz_resource_supplier_info")
@@ -34,6 +46,7 @@
     /**
      * 供方编号
      */
+    @ExcelProperty(value = "供方编号", order = 1)
     @ApiModelProperty(value = "供方编号(自动生成)", dataType = "String")
     @TableField("supplier_no")
     private String supplierNo;
@@ -41,6 +54,7 @@
     /**
      * 供方名称
      */
+    @ExcelProperty(value = "供方名称", order = 2)
     @ApiModelProperty(value = "供方名称", dataType = "String")
     @TableField("supplier_name")
     private String supplierName;
@@ -60,6 +74,7 @@
     @TableField("supplier_type")
     private String supplierType;
 
+    @ExcelProperty(value = "供方类型", order = 3)
     @ApiModelProperty(value = "供方类型(字典value)", dataType = "String")
     @TableField(exist = false)
     private String supplierTypeName;
@@ -109,7 +124,8 @@
     /**
      * 电话
      */
-    @ApiModelProperty(value = "电话", dataType = "String")
+    @ExcelProperty(value = "联系电话", order = 4)
+    @ApiModelProperty(value = "联系电话", dataType = "String")
     @TableField("phone")
     private String phone;
 
@@ -158,6 +174,7 @@
     /**
      * 公司地址-省
      */
+    @ExcelProperty(value = "地址-省", order = 6)
     @ApiModelProperty(value = "公司地址-省", dataType = "String")
     @TableField("company_province_name")
     private String companyProvinceName;
@@ -172,6 +189,7 @@
     /**
      * 公司地址-市
      */
+    @ExcelProperty(value = "地址-市", order = 7)
     @ApiModelProperty(value = "公司地址-市", dataType = "String")
     @TableField("company_city_name")
     private String companyCityName;
@@ -186,6 +204,7 @@
     /**
      * 公司地址-区
      */
+    @ExcelProperty(value = "地址-区", order = 8)
     @ApiModelProperty(value = "公司地址-区", dataType = "String")
     @TableField("company_area_name")
     private String companyAreaName;
@@ -193,6 +212,7 @@
     /**
      * 公司地址-详细地址
      */
+    @ExcelProperty(value = "地址-详细地址", order = 9)
     @ApiModelProperty(value = "公司地址-详细地址", dataType = "String")
     @TableField("company_address")
     private String companyAddress;
@@ -200,6 +220,7 @@
     /**
      * 服务和供应的内容
      */
+    @ExcelProperty(value = "服务和供应的内容", order = 5)
     @ApiModelProperty(value = "服务和供应的内容", dataType = "String")
     @TableField("supplier_content")
     private String supplierContent;
@@ -250,6 +271,7 @@
     /**
      * 创建时间
      */
+    @ExcelProperty(value = "创建时间", order = 9)
     @ApiModelProperty(value = "创建时间", dataType = "String")
     @TableField("create_time")
     private String createTime;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/EnvLocationInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/EnvLocationInfo.java
new file mode 100644
index 0000000..d8e2d7b
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/EnvLocationInfo.java
@@ -0,0 +1,83 @@
+package com.casic.missiles.model.resource;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotEmpty;
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 实验室环境监控系统-设备表
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-06-07
+ */
+@ApiModel
+@Data
+@TableName("env_location_info")
+public class EnvLocationInfo implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "主键id", dataType = "Long")
+    @TableId("id")
+    private Long id;
+
+    /**
+     * 地点编号
+     */
+    @NotEmpty(message = "地点编号不能为空")
+    @ApiModelProperty(value = "地点编号", dataType = "String")
+    @TableField("location_no")
+    private String locationNo;
+
+    /**
+     * 地点名称
+     */
+    @ApiModelProperty(value = "地点名称", dataType = "String")
+    @TableField("location_name")
+    private String locationName;
+
+    /**
+     * 地点位置
+     */
+    @ApiModelProperty(value = "地点位置", dataType = "String")
+    @TableField("location_position")
+    private String locationPosition;
+
+    /**
+     * 创建人id
+     */
+    @ApiModelProperty(value = "创建人id", dataType = "Long")
+    @TableField("create_user_id")
+    private Long createUserId;
+
+    /**
+     * 创建人
+     */
+    @ApiModelProperty(value = "创建人", dataType = "String")
+    @TableField("create_user")
+    private String createUser;
+
+    /**
+     * 创建时间
+     */
+    @ApiModelProperty(value = "创建时间", dataType = "String")
+    @TableField("create_time")
+    private String createTime;
+
+    /**
+     * 更新时间
+     */
+    @ApiModelProperty(value = "更新时间", dataType = "String")
+    @TableField("update_time")
+    private String updateTime;
+
+
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemFileConfig.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemFileConfig.java
index 19e6845..86e569c 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemFileConfig.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemFileConfig.java
@@ -30,7 +30,7 @@
     @ApiModelProperty(value = "系统类别(1业务系统2受检系统3环境系统)", dataType = "Integer")
     @NotNull(message = "系统类别不能为空")
     @TableField("system_type")
-    private Integer systemType;
+    private Integer systemType = 1;
 
     @ApiModelProperty("下载编号")
     @TableField("download_no")
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemNotice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemNotice.java
index e94297d..06ec37d 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemNotice.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemNotice.java
@@ -34,7 +34,7 @@
     @ApiModelProperty(value = "系统类别(1业务系统2受检系统3环境系统)", dataType = "Integer")
     @NotNull(message = "系统类别不能为空")
     @TableField("system_type")
-    private Integer systemType;
+    private Integer systemType = 1;
 
     /**
      * 通知公告编号
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSign.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSign.java
index 6c0d7c9..954f4f8 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSign.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSign.java
@@ -51,7 +51,7 @@
     @ApiModelProperty(value = "系统类别(1业务系统2受检系统3环境系统)", dataType = "Integer")
     @NotNull(message = "系统类别不能为空")
     @TableField("system_type")
-    private Integer systemType;
+    private Integer systemType = 1;
 
     /**
      * 签名编号
@@ -130,4 +130,8 @@
     @TableField(exist = false)
     private List<Long> userIdList;
 
+    @ApiModelProperty(hidden = true)
+    @TableField(exist = false)
+    private String deptName;
+
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemTemplate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemTemplate.java
index 503a457..1d27ebe 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemTemplate.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemTemplate.java
@@ -47,7 +47,7 @@
     @ApiModelProperty(value = "系统类别(1业务系统2受检系统3环境系统)", dataType = "Integer")
     @NotNull(message = "系统类别不能为空")
     @TableField("system_type")
-    private Integer systemType;
+    private Integer systemType = 1;
 
     /**
      * 模板编号
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java
index 8c21cb0..f61e4a8 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java
@@ -32,4 +32,8 @@
     ReturnDTO approvalDelete(ApprovalDeleteRequest request);
 
     ReturnDTO failUpdate(T request);
+
+    List<O> listExport(R request);
+
+    List<O> listExportByIds(List<Long> ids);
 }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java
index 724166f..9bce15b 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java
@@ -157,6 +157,29 @@
         throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
     }
 
+    @Override
+    public List<O> listExport(R request) {
+        request.setCreateUserId(null);
+        request.setApprovalStatus(ApprovalStatusEnum.PASSED);
+        Page<O> page = PageFactory.defaultPage();
+        page.setCurrent(1);
+        page.setSearchCount(false);
+        page.setSize(Integer.MAX_VALUE);
+        Page<O> resultPage = this.baseMapper.selectBatchForApprovalList(page, request, null);
+        return resultPage.getRecords();
+    }
+
+    @Override
+    public List<O> listExportByIds(List<Long> ids) {
+        Page<O> page = PageFactory.defaultPage();
+        page.setCurrent(1);
+        page.setSearchCount(false);
+        page.setSize(Integer.MAX_VALUE);
+        List<String> businessKeys = ids.stream().map(String::valueOf).collect(Collectors.toList());
+        Page<O> resultPage = this.baseMapper.selectBatchForApprovalList(page, null, businessKeys);
+        return resultPage.getRecords();
+    }
+
     protected ReturnDTO updateApprovalStatus(Long id, String processId, String approvalStatus) {
         UpdateWrapper<T> updateWrapper = new UpdateWrapper<>();
         updateWrapper.eq("id", id);
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificatePrintServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificatePrintServiceImpl.java
index f6e4706..3228497 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificatePrintServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificatePrintServiceImpl.java
@@ -162,6 +162,30 @@
         return ReturnUtil.success(printLogMapper.selectList(wrapper));
     }
 
+    @Override
+    public List<CertificatePrintListResponse> listByIds(List<Long> ids) {
+        Page<CertificatePrintListResponse> page = PageFactory.defaultPage();
+        page.setCurrent(1);
+        page.setSearchCount(false);
+        page.setSize(Integer.MAX_VALUE);
+        List<String> businessKeys = ids.stream().map(String::valueOf).collect(Collectors.toList());
+        Page<CertificatePrintListResponse> resultPage = this.baseMapper.selectBatchForApprovalList(page, null, businessKeys);
+        return resultPage.getRecords();
+    }
+
+    @Override
+    public List<CertificatePrintListResponse> list(CertificatePrintApprovalListRequest request) {
+        request.setCreateUserId(null);
+        request.setApprovalStatus(null);
+        request.setPrintStatus(null);
+        Page<CertificatePrintListResponse> page = PageFactory.defaultPage();
+        page.setCurrent(1);
+        page.setSearchCount(false);
+        page.setSize(Integer.MAX_VALUE);
+        Page<CertificatePrintListResponse> resultPage = certificatePrintMapper.selectBatchForApprovalList(page, request, null);
+        return resultPage.getRecords();
+    }
+
     private void savePrintLog(Long id) {
         BizBusinessCertificatePrintLog printLog = new BizBusinessCertificatePrintLog();
         BizBusinessCertificatePrint certificatePrint = certificatePrintMapper.selectById(id);
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificateReportServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificateReportServiceImpl.java
index 457555f..24146be 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificateReportServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificateReportServiceImpl.java
@@ -158,8 +158,8 @@
         QueryWrapper<BizBusinessCertificateMeasureResultData> mWrapper = new QueryWrapper<>();
         mWrapper.eq("report_id", reportId);
         boolean mRemove = certificateMeasureResultDataService.remove(mWrapper);
-        Assert.isFalse(eRemove || mRemove, () -> {
+        if(!eRemove || !mRemove){
             throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
-        });
+        }
     }
 }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessIdentifyInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessIdentifyInfoServiceImpl.java
index 4c8e190..f7e63ca 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessIdentifyInfoServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessIdentifyInfoServiceImpl.java
@@ -1,8 +1,10 @@
 package com.casic.missiles.service.Impl.business;
 
+import cn.hutool.core.date.DateUtil;
 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.core.page.PageFactory;
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.business.identify.IdentifyListRequest;
@@ -14,11 +16,14 @@
 import com.casic.missiles.service.business.IBizBusinessIdentifyInfoService;
 import com.casic.missiles.utils.DictCodeUtils;
 import com.casic.missiles.utils.NumberGeneratorUtil;
+import com.casic.missiles.utils.QRCodeUtil;
 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.List;
+
 /**
  * <p>
  * 计量检定业务-任务计量管理-标识打印 服务实现类
@@ -35,9 +40,9 @@
     @Override
     public Page<BizBusinessIdentifyInfo> identifyListPage(Page<BizBusinessIdentifyInfo> page, IdentifyListRequest request) throws Exception {
         QueryWrapper<BizBusinessIdentifyInfo> wrapper = new QueryWrapper<>();
-        wrapper.eq("identify_type", request.getIdentifyType());
-        wrapper.like("device_no", request.getDeviceNo());
-        wrapper.like("device_name", request.getDeviceName());
+        wrapper.eq(StringUtils.isNotEmpty(request.getIdentifyType()), "identify_type", request.getIdentifyType());
+        wrapper.like(StringUtils.isNotEmpty(request.getDeviceNo()),"device_no", request.getDeviceNo());
+        wrapper.like(StringUtils.isNotEmpty(request.getDeviceName()), "device_name", request.getDeviceName());
         wrapper.apply(StringUtils.isNotBlank(request.getCreateTimeStart()),
                 "{0} <= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getCreateTimeStart().split(" ")[0]);
         wrapper.apply(StringUtils.isNotBlank(request.getCreateTimeEnd()),
@@ -64,8 +69,11 @@
     }
 
     @Override
-    public ReturnDTO updateIdentify(BizBusinessIdentifyInfo identifyInfo) {
-        if(identifyInfoMapper.updateById(identifyInfo) > 0){
+    public ReturnDTO updateIdentify(Long id) {
+        BizBusinessIdentifyInfo info = new BizBusinessIdentifyInfo();
+        info.setId(id);
+        info.setUpdateTime(DateUtil.now());
+        if(identifyInfoMapper.updateById(info) > 0){
             return ReturnUtil.success();
         }
         throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
@@ -79,4 +87,20 @@
         throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
     }
 
+    @Override
+    public List<BizBusinessIdentifyInfo> list(IdentifyListRequest request) throws Exception {
+        Page<BizBusinessIdentifyInfo> page = PageFactory.defaultPage();
+        page.setCurrent(1);
+        page.setSearchCount(false);
+        page.setSize(Integer.MAX_VALUE);
+        Page<BizBusinessIdentifyInfo> resultPage = this.identifyListPage(page, request);
+        return resultPage.getRecords();
+    }
+
+    @Override
+    public ReturnDTO<String> equipmentQrCode(Long id) {
+        String base64QRCode = QRCodeUtil.getBase64QRCode(String.valueOf(id));
+        return ReturnUtil.success(base64QRCode);
+    }
+
 }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOrderInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOrderInfoServiceImpl.java
index 82952ad..d8d2c6a 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOrderInfoServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOrderInfoServiceImpl.java
@@ -35,6 +35,7 @@
 import javax.servlet.http.HttpServletResponse;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 import java.util.stream.Collectors;
 
 /**
@@ -209,13 +210,16 @@
     private QueryWrapper<OrderListResponse> listParamWrapperBuilder(OrderListRequest request) {
         QueryWrapper<OrderListResponse> wrapper = new QueryWrapper<>();
         wrapper.like(StringUtils.isNotBlank(request.getOrderNo()), "order_no", request.getOrderNo());
+        wrapper.like(Objects.nonNull(request.getCustomerId()), "customer_id", request.getCustomerId());
         wrapper.like(StringUtils.isNotBlank(request.getCustomerName()), "customer_name", request.getCustomerName());
         wrapper.like(StringUtils.isNotBlank(request.getDeliverer()), "deliverer", request.getDeliverer());
         wrapper.like(StringUtils.isNotBlank(request.getCreateUserName()), "create_user_name", request.getCreateUserName());
-        wrapper.apply(StringUtils.isNotBlank(request.getCreateStartTime()),
-                "{0} <= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getCreateStartTime().split(" ")[0]);
-        wrapper.apply(StringUtils.isNotBlank(request.getCreateEndTime()),
-                "{0} >= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getCreateEndTime().split(" ")[0]);
+        if(StringUtils.isNotBlank(request.getCreateStartTime())){
+            wrapper.apply("{0} <= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getCreateStartTime().split(" ")[0]);
+        }
+        if(StringUtils.isNotBlank(request.getCreateEndTime())){
+            wrapper.apply("{0} >= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getCreateEndTime().split(" ")[0]);
+        }
         wrapper.orderByDesc("create_time");
         return wrapper;
     }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceAssessServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceAssessServiceImpl.java
index c6af980..ce40138 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceAssessServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceAssessServiceImpl.java
@@ -1,10 +1,33 @@
 package com.casic.missiles.service.Impl.business;
 
-import com.casic.missiles.model.business.BizBusinessOutsourceAssess;
+import cn.hutool.core.lang.Assert;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.casic.missiles.core.model.auth.AuthUser;
+import com.casic.missiles.core.shiro.ShiroKit;
+import com.casic.missiles.dto.BaseApprovalSubmitRequest;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.ReturnUtil;
+import com.casic.missiles.dto.business.outsource.OutsourceAssessApprovalListRequest;
+import com.casic.missiles.dto.business.outsource.OutsourceAssessSaveResponse;
+import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.NoGenerateFileCodeEnum;
+import com.casic.missiles.enums.NoGenerateRecordTypeCodeEnum;
+import com.casic.missiles.enums.system.ApprovalStatusEnum;
+import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.mapper.business.BizBusinessOutsourceAssessMapper;
+import com.casic.missiles.model.business.BizBusinessOutsourceAssess;
+import com.casic.missiles.model.business.BizBusinessOutsourceAssessSampleRelation;
+import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl;
+import com.casic.missiles.service.business.IBizBusinessOutsourceAssessSampleRelationService;
 import com.casic.missiles.service.business.IBizBusinessOutsourceAssessService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.casic.missiles.utils.NoGeneratorUtil;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Objects;
 
 /**
  * <p>
@@ -15,6 +38,103 @@
  * @since 2023-08-16
  */
 @Service
-public class BizBusinessOutsourceAssessServiceImpl extends ServiceImpl<BizBusinessOutsourceAssessMapper, BizBusinessOutsourceAssess> implements IBizBusinessOutsourceAssessService {
+public class BizBusinessOutsourceAssessServiceImpl extends GeneralApprovalServiceImpl<BizBusinessOutsourceAssessMapper, BizBusinessOutsourceAssess, BizBusinessOutsourceAssess, OutsourceAssessApprovalListRequest, BaseApprovalSubmitRequest> implements IBizBusinessOutsourceAssessService {
+    @Autowired
+    private IBizBusinessOutsourceAssessSampleRelationService outsourceAssessSampleRelationService;
 
+    @Override
+    public ReturnDTO<OutsourceAssessSaveResponse> saveOutsourceAssess(BizBusinessOutsourceAssess request) {
+        //生成编号
+        String labCode = request.getLabCode();
+        String groupCode = request.getGroupCode();
+        Long maxNo = this.baseMapper.selectMaxProjectNo();
+        String projectNo = NoGeneratorUtil.getCode(NoGenerateFileCodeEnum.D, labCode, NoGenerateRecordTypeCodeEnum.OUTSOURCE_ACCESS, groupCode, maxNo);
+        request.setCreateUserId(request.getUserId());
+        request.setCreateUserName(request.getUserName());
+        request.setApprovalStatus(ApprovalStatusEnum.DRAFT); //草稿箱状态
+        request.setProjectNo(projectNo);
+        int row = this.baseMapper.insert(request);
+        Assert.isFalse(row <= 0, () -> {
+            throw new BusinessException(BusinessExceptionEnum.OUTSOURCE_ACCESS_SAVE_FAILED);
+        });
+        //关联表
+        saveRelationData(request);
+        OutsourceAssessSaveResponse saveResponse = new OutsourceAssessSaveResponse();
+        saveResponse.setId(request.getId());
+        saveResponse.setProjectNo(projectNo);
+        return ReturnUtil.success(saveResponse);
+    }
+
+    @Override
+    @Transactional
+    public ReturnDTO draftUpdate(BizBusinessOutsourceAssess request) {
+        if (this.baseMapper.updateById(request) > 0) {
+            //关联表删除、增加
+            removeRelationData(request.getId());
+            saveRelationData(request);
+            return ReturnUtil.success();
+        }
+        throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
+    }
+
+    @Override
+    public ReturnDTO draftDelete(Long id) {
+        if (this.baseMapper.deleteById(id) > 0) {
+            //关联表删除
+            removeRelationData(id);
+            return ReturnUtil.success();
+        }
+        throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
+    }
+
+    @Override
+    public ReturnDTO draftBatchDelete(List<Long> ids) {
+        if (this.baseMapper.deleteBatchIds(ids) >= 0) {
+            ids.forEach(id -> removeRelationData(id));
+            return ReturnUtil.success();
+        }
+        throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
+    }
+
+    @Override
+    @Transactional
+    public ReturnDTO failUpdate(BizBusinessOutsourceAssess request) {
+        AuthUser user = ShiroKit.getUser();
+        Assert.isFalse(Objects.isNull(user), () -> {
+            throw new BusinessException(BusinessExceptionEnum.LOGIN_USER_ACQUIRE_FAILED);
+        });
+        request.setApprovalStatus(ApprovalStatusEnum.IN_APPROVED);
+        if (this.baseMapper.updateById(request) > 0) {
+            //关联表删除、增加
+            removeRelationData(request.getId());
+            saveRelationData(request);
+            baseApprovalService.failUpdate(request.getProcessId());
+            return ReturnUtil.success();
+        }
+        throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
+    }
+
+    private void saveRelationData(BizBusinessOutsourceAssess request) {
+        List<BizBusinessOutsourceAssessSampleRelation> sampleRelations = new ArrayList<>();
+        request.getOrderSampleList().forEach(dto -> {
+            BizBusinessOutsourceAssessSampleRelation relation = new BizBusinessOutsourceAssessSampleRelation();
+            relation.setOrderId(dto.getOrderId());
+            relation.setSampleId(dto.getSampleId());
+            relation.setAccessId(request.getId());
+            sampleRelations.add(relation);
+        });
+        if(outsourceAssessSampleRelationService.saveBatch(sampleRelations)){
+            return;
+        }
+        throw new BusinessException(BusinessExceptionEnum.OUTSOURCE_ACCESS_SAVE_FAILED);
+    }
+
+    private void removeRelationData(Long assessId) {
+        QueryWrapper<BizBusinessOutsourceAssessSampleRelation> wrapper = new QueryWrapper<>();
+        wrapper.eq("access_id", assessId);
+        if(outsourceAssessSampleRelationService.remove(wrapper)){
+            return;
+        }
+        throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
+    }
 }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceProtocolServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceProtocolServiceImpl.java
new file mode 100644
index 0000000..821e728
--- /dev/null
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceProtocolServiceImpl.java
@@ -0,0 +1,60 @@
+package com.casic.missiles.service.Impl.business;
+
+import cn.hutool.core.lang.Assert;
+import com.casic.missiles.dto.BaseApprovalSubmitRequest;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.ReturnUtil;
+import com.casic.missiles.dto.business.outsource.OutsourceProtocolApprovalListRequest;
+import com.casic.missiles.dto.business.outsource.OutsourceProtocolSaveResponse;
+import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.NoGenerateFileCodeEnum;
+import com.casic.missiles.enums.NoGenerateRecordTypeCodeEnum;
+import com.casic.missiles.enums.system.ApprovalStatusEnum;
+import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.mapper.business.BizBusinessOutsourceProtocolMapper;
+import com.casic.missiles.mapper.business.BizBusinessOutsourcerInfoMapper;
+import com.casic.missiles.model.business.BizBusinessOutsourceProtocol;
+import com.casic.missiles.model.business.BizBusinessOutsourcerInfo;
+import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl;
+import com.casic.missiles.service.business.IBizBusinessOutsourceProtocolService;
+import com.casic.missiles.utils.NoGeneratorUtil;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 计量检定业务-分包管理-测试、校准或检定工作分包协议书 服务实现类
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-08-24
+ */
+@Service
+public class BizBusinessOutsourceProtocolServiceImpl extends GeneralApprovalServiceImpl<BizBusinessOutsourceProtocolMapper, BizBusinessOutsourceProtocol, BizBusinessOutsourceProtocol, OutsourceProtocolApprovalListRequest, BaseApprovalSubmitRequest> implements IBizBusinessOutsourceProtocolService {
+    @Autowired
+    private BizBusinessOutsourcerInfoMapper outsourcerInfoMapper;
+
+    @Override
+    public ReturnDTO<OutsourceProtocolSaveResponse> saveOutsourceProtocol(BizBusinessOutsourceProtocol request) {
+        //生成编号
+        String labCode = request.getLabCode();
+        String groupCode = request.getGroupCode();
+        Long maxNo = this.baseMapper.selectMaxProtocolNo();
+        String protocolNo = NoGeneratorUtil.getCode(NoGenerateFileCodeEnum.D, labCode, NoGenerateRecordTypeCodeEnum.OUTSOURCE_PROTOCOL, groupCode, maxNo);
+        request.setCreateUserId(request.getUserId());
+        request.setCreateUserName(request.getUserName());
+        request.setApprovalStatus(ApprovalStatusEnum.DRAFT); //草稿箱状态
+        request.setProtocolNo(protocolNo);
+        BizBusinessOutsourcerInfo outsourcerInfo = outsourcerInfoMapper.selectById(request.getOutsourcerId());
+        request.setOutsourceNo(outsourcerInfo.getOutsourcerNo());
+        request.setOutsourceName(outsourcerInfo.getOutsourcerName());
+        int row = this.baseMapper.insert(request);
+        Assert.isFalse(row <= 0, () -> {
+            throw new BusinessException(BusinessExceptionEnum.OUTSOURCE_PROTOCOL_SAVE_FAILED);
+        });
+        OutsourceProtocolSaveResponse saveResponse = new OutsourceProtocolSaveResponse();
+        saveResponse.setId(request.getId());
+        saveResponse.setProtocolNo(protocolNo);
+        return ReturnUtil.success(saveResponse);
+    }
+}
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourcerInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourcerInfoServiceImpl.java
index 75f639d..8aadad7 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourcerInfoServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourcerInfoServiceImpl.java
@@ -3,12 +3,12 @@
 import cn.hutool.core.lang.Assert;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.dto.*;
 import com.casic.missiles.dto.business.outsource.OutsourcerInfoApprovalListRequest;
 import com.casic.missiles.dto.business.outsource.OutsourcerSaveResponse;
 import com.casic.missiles.enums.BusinessExceptionEnum;
-import com.casic.missiles.enums.PrefixCodeEnum;
+import com.casic.missiles.enums.NoGenerateFileCodeEnum;
+import com.casic.missiles.enums.NoGenerateRecordTypeCodeEnum;
 import com.casic.missiles.enums.system.ApprovalStatusEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.mapper.business.BizBusinessOutsourcerInfoMapper;
@@ -20,7 +20,7 @@
 import com.casic.missiles.service.business.IBizBusinessOutsourcerInfoService;
 import com.casic.missiles.service.business.IBizBusinessOutsourcerUserInfoService;
 import com.casic.missiles.utils.DictCodeUtils;
-import com.casic.missiles.utils.NumberGeneratorUtil;
+import com.casic.missiles.utils.NoGeneratorUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -42,22 +42,12 @@
     private IBizBusinessOutsourcerUserInfoService outsourcerUserInfoService;
 
     @Override
-    public List<BizBusinessOutsourcerInfo> list(OutsourcerInfoApprovalListRequest request) {
-        request.setCreateUserId(null);
-        request.setApprovalStatus(ApprovalStatusEnum.PASSED);
-        Page<BizBusinessOutsourcerInfo> page = PageFactory.defaultPage();
-        page.setCurrent(1);
-        page.setSearchCount(false);
-        page.setSize(Integer.MAX_VALUE);
-        Page<BizBusinessOutsourcerInfo> resultPage = this.baseMapper.selectBatchForApprovalList(page, request, null);
-        return resultPage.getRecords();
-    }
-
-    @Override
     public ReturnDTO<OutsourcerSaveResponse> saveOutsourcer(BizBusinessOutsourcerInfo request) {
         //生成编号
+        String labCode = request.getLabCode();
+        String groupCode = request.getGroupCode();
         Long maxNo = this.baseMapper.selectMaxNo();
-        String outsourcerNo = NumberGeneratorUtil.getContactNo(PrefixCodeEnum.OUTSOURCER_PREFIX, maxNo);
+        String outsourcerNo = NoGeneratorUtil.getCode(NoGenerateFileCodeEnum.D, labCode, NoGenerateRecordTypeCodeEnum.OUTSOURCE_INFO, groupCode, maxNo);
         request.setOutsourcerNo(outsourcerNo);
         request.setCreateUserId(request.getUserId());
         request.setCreateUserName(request.getUserName());
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessSiteExecutiveInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessSiteExecutiveInfoServiceImpl.java
index ebab3e6..6c6a129 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessSiteExecutiveInfoServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessSiteExecutiveInfoServiceImpl.java
@@ -189,9 +189,9 @@
         QueryWrapper<BizBusinessSiteExecutiveStaffRelation> mWrapper = new QueryWrapper<>();
         mWrapper.eq("site_executive_id", siteExecutiveId);
         boolean mRemove = siteExecutiveStaffRelationService.remove(mWrapper);
-        Assert.isFalse(eRemove || mRemove, () -> {
+        if(!eRemove || !mRemove){
             throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
-        });
+        }
     }
 
     private void doPopulateSiteExecutive(SiteExecutiveDetailResponse detailResponse) {
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessLabExecutiveInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessLabExecutiveInfoServiceImpl.java
index 50c5616..0242fcf 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessLabExecutiveInfoServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessLabExecutiveInfoServiceImpl.java
@@ -297,6 +297,29 @@
     }
 
     @Override
+    public List<SampleLabExecutiveListResponse> deptLabExecutiveList(SampleLabExecutiveListRequest request) throws Exception {
+        Page<SampleLabExecutiveListResponse> page = PageFactory.defaultPage();
+        page.setCurrent(1);
+        page.setSearchCount(false);
+        page.setSize(Integer.MAX_VALUE);
+        Page<SampleLabExecutiveListResponse> resultPage = this.deptLabExecutiveListPage(page, request);
+        return resultPage.getRecords();
+    }
+
+    @Override
+    public List<SampleLabExecutiveListResponse> deptLabExecutiveListByIds(String measureStatus, List<Long> ids) throws Exception {
+        Page<SampleLabExecutiveListResponse> page = PageFactory.defaultPage();
+        page.setCurrent(1);
+        page.setSearchCount(false);
+        page.setSize(Integer.MAX_VALUE);
+        SampleLabExecutiveListRequest request = new SampleLabExecutiveListRequest();
+        request.setIds(ids);
+        request.setMeasureStatus(measureStatus);
+        Page<SampleLabExecutiveListResponse> resultPage = this.deptLabExecutiveListPage(page, request);
+        return resultPage.getRecords();
+    }
+
+    @Override
     public Page<SampleLabExecutiveListResponse> myLabExecutiveListPage(Page<SampleLabExecutiveListResponse> page, SampleLabExecutiveListRequest labExecutiveListRequest) throws Exception{
         AuthUser user = ShiroKit.getUser();
         Assert.isFalse(Objects.isNull(user), () -> {
@@ -350,6 +373,29 @@
     }
 
     @Override
+    public List<SampleLabExecutiveListResponse> myLabExecutiveList(SampleLabExecutiveListRequest request) throws Exception {
+        Page<SampleLabExecutiveListResponse> page = PageFactory.defaultPage();
+        page.setCurrent(1);
+        page.setSearchCount(false);
+        page.setSize(Integer.MAX_VALUE);
+        Page<SampleLabExecutiveListResponse> resultPage = this.myLabExecutiveListPage(page, request);
+        return resultPage.getRecords();
+    }
+
+    @Override
+    public List<SampleLabExecutiveListResponse> myLabExecutiveListByIds(String measureStatus, List<Long> ids) throws Exception {
+        Page<SampleLabExecutiveListResponse> page = PageFactory.defaultPage();
+        page.setCurrent(1);
+        page.setSearchCount(false);
+        page.setSize(Integer.MAX_VALUE);
+        SampleLabExecutiveListRequest request = new SampleLabExecutiveListRequest();
+        request.setIds(ids);
+        request.setMeasureStatus(measureStatus);
+        Page<SampleLabExecutiveListResponse> resultPage = this.myLabExecutiveListPage(page, request);
+        return resultPage.getRecords();
+    }
+
+    @Override
     public List<SampleAmountResponse> myExecutiveAmount() {
         //登录用户id获取计量人员id，实验室检测信息中存储的是计量人员id
         AuthUser user = ShiroKit.getUser();
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentInfoServiceImpl.java
index 864b05e..db8cad4 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentInfoServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentInfoServiceImpl.java
@@ -35,7 +35,6 @@
 import com.casic.missiles.utils.ConvertUtils;
 import com.casic.missiles.utils.DictCodeUtils;
 import com.casic.missiles.utils.NumberGeneratorUtil;
-import org.flowable.engine.RuntimeService;
 import org.flowable.engine.runtime.ProcessInstance;
 import org.jetbrains.annotations.NotNull;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -43,7 +42,6 @@
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
 
-import javax.annotation.Resource;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
@@ -81,8 +79,6 @@
     private IBizEquipmentAttachmentService attachmentService;
     @Autowired
     private IBizEquipmentCheckpointService checkpointService;
-    @Resource
-    private RuntimeService runtimeService;
     @Autowired
     private ApprovalOperateService approvalOperateService;
 
@@ -235,18 +231,18 @@
     private void updateRelationInfo(EquipmentAddRequest request, BizEquipmentInfoApproval equipmentInfoApproval) {
         QueryWrapper<BizEquipmentTechnicalTarget> targetWrapper = new QueryWrapper<>();
         targetWrapper.eq("equipment_no", equipmentInfoApproval.getEquipmentNo());
-        boolean removeTargetFlag = technicalTargetService.remove(targetWrapper);
-        boolean saveTargetFlag = technicalTargetService.saveBatch(request.getTechnicalTargetList());
+        technicalTargetService.remove(targetWrapper);
+        technicalTargetService.saveBatch(request.getTechnicalTargetList());
 
         QueryWrapper<BizEquipmentAttachment> attachmentWrapper = new QueryWrapper<>();
         attachmentWrapper.eq("equipment_no", equipmentInfoApproval.getEquipmentNo());
-        boolean removeAttachmentFlag = attachmentService.remove(attachmentWrapper);
-        boolean saveAttachmentFlag = attachmentService.saveBatch(request.getAttachmentList());
+        attachmentService.remove(attachmentWrapper);
+        attachmentService.saveBatch(request.getAttachmentList());
 
         QueryWrapper<BizEquipmentCheckpoint> checkpointWrapper = new QueryWrapper<>();
         checkpointWrapper.eq("equipment_no", equipmentInfoApproval.getEquipmentNo());
-        boolean removeCheckpointFlag = checkpointService.remove(checkpointWrapper);
-        boolean saveCheckpointFlag = checkpointService.saveBatch(request.getCheckpointList());
+        checkpointService.remove(checkpointWrapper);
+        checkpointService.saveBatch(request.getCheckpointList());
     }
 
     @Override
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardInfoServiceImpl.java
index faff1ae..c50a5b3 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardInfoServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardInfoServiceImpl.java
@@ -22,7 +22,9 @@
 import com.casic.missiles.mapper.equipment.BizEquipmentStandardInfoMapper;
 import com.casic.missiles.mapper.equipment.BizEquipmentStandardTechnologyRelationMapper;
 import com.casic.missiles.mapper.resource.BizResourceStaffInfoMapper;
-import com.casic.missiles.model.equipment.*;
+import com.casic.missiles.model.equipment.BizEquipmentStandardInfo;
+import com.casic.missiles.model.equipment.BizEquipmentStandardInfoApproval;
+import com.casic.missiles.model.equipment.BizEquipmentStandardTechnologyRelation;
 import com.casic.missiles.model.resource.BizResourceStaffInfo;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.dao.DeptMapper;
@@ -33,14 +35,12 @@
 import com.casic.missiles.service.flowable.ApprovalOperateService;
 import com.casic.missiles.utils.ConvertUtils;
 import com.casic.missiles.utils.DictCodeUtils;
-import org.flowable.engine.RuntimeService;
 import org.flowable.engine.runtime.ProcessInstance;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
 
-import javax.annotation.Resource;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
@@ -62,8 +62,6 @@
     private BizResourceStaffInfoMapper staffInfoMapper;
     @Autowired
     private IBaseApprovalService baseApprovalService;
-    @Resource
-    private RuntimeService runtimeService;
     @Autowired
     private ApprovalOperateService approvalOperateService;
     @Autowired
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSealInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSealInfoServiceImpl.java
index 7c91fa2..00040d6 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSealInfoServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSealInfoServiceImpl.java
@@ -15,6 +15,7 @@
 import com.casic.missiles.modular.system.model.User;
 import com.casic.missiles.service.resource.IBizResourceSealInfoService;
 import com.casic.missiles.utils.DictCodeUtils;
+import com.casic.missiles.utils.MinioUtil;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -33,6 +34,8 @@
     private BizResourceSealInfoMapper sealInfoMapper;
     @Autowired
     private UserMapper userMapper;
+    @Autowired
+    private MinioUtil minioUtil;
 
     @Override
     public Page<BizResourceSealInfo> listPage(Page<BizResourceSealInfo> page, SealInfoListRequest request) throws Exception {
@@ -44,6 +47,7 @@
         Page<BizResourceSealInfo> sealInfoPage = sealInfoMapper.selectPage(page, wrapper);
         for (BizResourceSealInfo record : sealInfoPage.getRecords()) {
             DictCodeUtils.convertDictCodeToName(record);
+            record.setMinioFileUrl(minioUtil.getFileUrl(record.getMinioFileName()));
         }
         return sealInfoPage;
     }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceStaffInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceStaffInfoServiceImpl.java
index f058cf5..09203ac 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceStaffInfoServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceStaffInfoServiceImpl.java
@@ -3,6 +3,7 @@
 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.core.page.PageFactory;
 import com.casic.missiles.dto.IdDTO;
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
@@ -86,6 +87,13 @@
     }
 
     @Override
+    public List<BizResourceStaffInfo> list(StaffListRequest request) throws Exception {
+        Page<BizResourceStaffInfo> page = PageFactory.defaultPage();
+        Page<BizResourceStaffInfo> staffInfoPage = this.listPage(page, request);
+        return staffInfoPage.getRecords();
+    }
+
+    @Override
     @Transactional
     public ReturnDTO<IdDTO> staffBaseAdd(BizResourceStaffInfo staffInfo) {
         //登录账号查重
@@ -495,6 +503,28 @@
         return certResponsePage;
     }
 
+    @Override
+    public List<StaffCertResponse> certListByIds(List<Long> ids) throws Exception {
+        Page<StaffCertResponse> page = PageFactory.defaultPage();
+        page.setCurrent(1);
+        page.setSearchCount(false);
+        page.setSize(Integer.MAX_VALUE);
+        StaffCertRequest request = new StaffCertRequest();
+        request.setIds(ids);
+        Page<StaffCertResponse> resultPage = this.certListPage(page, request);
+        return resultPage.getRecords();
+    }
+
+    @Override
+    public List<StaffCertResponse> certList(StaffCertRequest request) throws Exception {
+        Page<StaffCertResponse> page = PageFactory.defaultPage();
+        page.setCurrent(1);
+        page.setSearchCount(false);
+        page.setSize(Integer.MAX_VALUE);
+        Page<StaffCertResponse> resultPage = this.certListPage(page, request);
+        return resultPage.getRecords();
+    }
+
     @Async
     public void deleteRelationInfo(Long staffId){
         QueryWrapper<BizResourceStaffEducation> educationWrapper = new QueryWrapper<>();
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceStaffVerifierServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceStaffVerifierServiceImpl.java
index 8ac7eee..b508d45 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceStaffVerifierServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceStaffVerifierServiceImpl.java
@@ -52,8 +52,8 @@
     private WebSocket webSocket;
 
     @Override
-    public ReturnDTO expirationReminder(IdDTO idDto) {
-        BizResourceStaffVerifier staffVerifier = verifierMapper.selectById(idDto.getId());
+    public ReturnDTO expirationReminder(IdDTO idDTO) {
+        BizResourceStaffVerifier staffVerifier = verifierMapper.selectById(idDTO.getId());
         BizResourceStaffInfo staffInfo = staffInfoMapper.selectById(staffVerifier.getStaffId());
         QueryWrapper<User> wrapper = new QueryWrapper<>();
         wrapper.eq("account", staffInfo.getAccount());
@@ -65,7 +65,7 @@
         Assert.isFalse(Objects.isNull(user), () -> {
             throw new BusinessException(BusinessExceptionEnum.LOGIN_USER_ACQUIRE_FAILED);
         });
-        WorkbenchRemindMessage remindMessage = new WorkbenchRemindMessage(userInfo.getId(), userInfo.getDeptId(), idDto.getId(), staffVerifier.getCertNo(), MessageTypeEnum.STAFF_CERT.getCode(), MessageSourceModuleEnum.RESOURCE.getCode(), MessageTypeEnum.STAFF_CERT.getValue(), MessageTypeEnum.STAFF_CERT.getValue(), staffVerifier.getCertName(),0, user.getId(), user.getName());
+        WorkbenchRemindMessage remindMessage = new WorkbenchRemindMessage(userInfo.getId(), userInfo.getDeptId(), idDTO.getId(), staffVerifier.getCertNo(), MessageTypeEnum.STAFF_CERT.getCode(), MessageSourceModuleEnum.RESOURCE.getCode(), MessageTypeEnum.STAFF_CERT.getValue(), MessageTypeEnum.STAFF_CERT.getValue(), staffVerifier.getCertName(),0, user.getId(), user.getName());
         if(messageMapper.insert(remindMessage) > 0){
             // 新增到消息列表后向用户推送消息
             webSocket.sendOneMessage(String.valueOf(userInfo.getId()), JSONObject.toJSONString(remindMessage));
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceTrainInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceTrainInfoServiceImpl.java
index c1d6308..3a533f2 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceTrainInfoServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceTrainInfoServiceImpl.java
@@ -44,11 +44,14 @@
     @Override
     public Page<BizResourceTrainInfo> listPage(Page<BizResourceTrainInfo> page, TrainListRequest request) throws Exception {
         QueryWrapper<BizResourceTrainInfo> wrapper = new QueryWrapper<>();
-        wrapper.like("train_no", request.getTrainNo());
-        wrapper.apply(StringUtils.isNotBlank(request.getCreateTimeStart()),//apply方法传入参数名不能为空
-                "{0} <= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getCreateTimeStart().split(" ")[0]);
-        wrapper.apply(StringUtils.isNotBlank(request.getCreateTimeEnd()),
-                "{0} >= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getCreateTimeEnd().split(" ")[0]);
+        wrapper.like(StringUtils.isNotEmpty(request.getTrainNo()), "train_no", request.getTrainNo());
+        wrapper.like(StringUtils.isNotEmpty(request.getDutyLeader()),"duty_leader", request.getDutyLeader());
+        if(StringUtils.isNotBlank(request.getCreateTimeStart())){
+            wrapper.apply("{0} <= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getCreateTimeStart().split(" ")[0]);
+        }
+        if(StringUtils.isNotBlank(request.getCreateTimeEnd())){
+            wrapper.apply("{0} >= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getCreateTimeEnd().split(" ")[0]);
+        }
         wrapper.orderByDesc("create_time");
         Page<BizResourceTrainInfo> trainInfoPage = trainInfoMapper.selectPage(page, wrapper);
         for (BizResourceTrainInfo record : trainInfoPage.getRecords()) {
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/EnvLocationInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/EnvLocationInfoServiceImpl.java
new file mode 100644
index 0000000..cdc5742
--- /dev/null
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/EnvLocationInfoServiceImpl.java
@@ -0,0 +1,31 @@
+package com.casic.missiles.service.Impl.resource;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.casic.missiles.dto.resource.environment.LocationListRequest;
+import com.casic.missiles.dto.resource.environment.LocationListResponse;
+import com.casic.missiles.mapper.resource.EnvLocationInfoMapper;
+import com.casic.missiles.model.resource.EnvLocationInfo;
+import com.casic.missiles.service.resource.IEnvLocationInfoService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 实验室环境监控系统-设备表 服务实现类
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-06-07
+ */
+@Service
+public class EnvLocationInfoServiceImpl extends ServiceImpl<EnvLocationInfoMapper, EnvLocationInfo> implements IEnvLocationInfoService {
+    @Autowired
+    private EnvLocationInfoMapper locationInfoMapper;
+
+    @Override
+    public Page<LocationListResponse> listPage(Page<LocationListResponse> page, LocationListRequest request) {
+        Page<LocationListResponse> resultPage = locationInfoMapper.selectLocationListPage(page, request);
+        return resultPage;
+    }
+}
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/DownloadCenterServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/DownloadCenterServiceImpl.java
index c956d24..d9f3282 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/DownloadCenterServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/DownloadCenterServiceImpl.java
@@ -131,10 +131,12 @@
         wrapper.like(StringUtils.isNotBlank(request.getModuleName()), "module_name", request.getModuleName());
         wrapper.like(StringUtils.isNotBlank(request.getFileName()), "file_name", request.getFileName());
         wrapper.like(StringUtils.isNotBlank(request.getFileType()), "file_type", request.getFileType());
-        wrapper.apply(StringUtils.isNotBlank(request.getStartTime()),
-                "{0} <= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getStartTime().split(" ")[0]);
-        wrapper.apply(StringUtils.isNotBlank(request.getEndTime()),
-                "{0} >= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getEndTime().split(" ")[0]);
+        if(StringUtils.isNotBlank(request.getStartTime())){
+            wrapper.apply("{0} <= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getStartTime().split(" ")[0]);
+        }
+        if(StringUtils.isNotBlank(request.getEndTime())){
+            wrapper.apply("{0} >= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getEndTime().split(" ")[0]);
+        }
         wrapper.orderByDesc("create_time");
         return wrapper;
     }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemSignServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemSignServiceImpl.java
index 41976bb..7e90a09 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemSignServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemSignServiceImpl.java
@@ -52,15 +52,14 @@
 
     @Override
     public Page<SystemSign> listPage(Page<SystemSign> page, SignListRequest request) {
-        QueryWrapper<SystemSign> wrapper = getWrapper(request);
-        Page<SystemSign> signPage = signMapper.selectPage(page, wrapper);
+        Page<SystemSign> signPage = signMapper.selectSignListPage(page, request);
         return signPage;
     }
 
     @Override
     public List<SystemSign> list(SignListRequest request) {
-        QueryWrapper<SystemSign> wrapper = getWrapper(request);
-        return signMapper.selectList(wrapper);
+        List<SystemSign> signList = signMapper.selectSignList(request);
+        return signList;
     }
 
     @Override
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessCertificatePrintService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessCertificatePrintService.java
index 03247ab..7d6db77 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessCertificatePrintService.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessCertificatePrintService.java
@@ -9,6 +9,8 @@
 import com.casic.missiles.model.business.BizBusinessCertificatePrintLog;
 import com.casic.missiles.model.business.BizBusinessCertificateReport;
 
+import java.util.List;
+
 /**
  * <p>
  * 计量检定业务-任务计量管理-证书管理 服务类
@@ -30,4 +32,9 @@
     ReturnDTO certificatePrintStatus(Long id, String printStatus);
 
     ReturnDTO<BizBusinessCertificatePrintLog> certificatePrintLog(Long id);
+
+    List<CertificatePrintListResponse> listByIds(List<Long> ids);
+
+    List<CertificatePrintListResponse> list(CertificatePrintApprovalListRequest request);
+
 }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessCertificateReportService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessCertificateReportService.java
index 305ac7f..b33ef22 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessCertificateReportService.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessCertificateReportService.java
@@ -21,6 +21,4 @@
     ReturnDTO<CertificateReportSaveResponse> saveCertificateReport(BizBusinessCertificateReport request);
 
     ReturnDTO<BizBusinessCertificateReport> detail(BaseDetailRequest request);
-
-
 }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessIdentifyInfoService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessIdentifyInfoService.java
index 53c49d0..6d2089f 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessIdentifyInfoService.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessIdentifyInfoService.java
@@ -6,6 +6,8 @@
 import com.casic.missiles.model.business.BizBusinessIdentifyInfo;
 import com.baomidou.mybatisplus.extension.service.IService;
 
+import java.util.List;
+
 /**
  * <p>
  * 计量检定业务-任务计量管理-标识打印 服务类
@@ -20,7 +22,11 @@
 
     ReturnDTO addIdentify(BizBusinessIdentifyInfo identifyInfo);
 
-    ReturnDTO updateIdentify(BizBusinessIdentifyInfo identifyInfo);
+    ReturnDTO updateIdentify(Long id);
 
     ReturnDTO deleteIdentify(Long id);
+
+    List<BizBusinessIdentifyInfo> list(IdentifyListRequest request) throws Exception;
+
+    ReturnDTO<String> equipmentQrCode(Long id);
 }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessOutsourceAssessService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessOutsourceAssessService.java
index 5e15bc8..bcdc791 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessOutsourceAssessService.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessOutsourceAssessService.java
@@ -1,7 +1,11 @@
 package com.casic.missiles.service.business;
 
+import com.casic.missiles.dto.BaseApprovalSubmitRequest;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.business.outsource.OutsourceAssessApprovalListRequest;
+import com.casic.missiles.dto.business.outsource.OutsourceAssessSaveResponse;
 import com.casic.missiles.model.business.BizBusinessOutsourceAssess;
-import com.baomidou.mybatisplus.extension.service.IService;
+import com.casic.missiles.service.IGeneralApprovalService;
 
 /**
  * <p>
@@ -11,6 +15,7 @@
  * @author wangpeng
  * @since 2023-08-16
  */
-public interface IBizBusinessOutsourceAssessService extends IService<BizBusinessOutsourceAssess> {
+public interface IBizBusinessOutsourceAssessService extends IGeneralApprovalService<BizBusinessOutsourceAssess, BizBusinessOutsourceAssess, OutsourceAssessApprovalListRequest, BaseApprovalSubmitRequest> {
 
+    ReturnDTO<OutsourceAssessSaveResponse> saveOutsourceAssess(BizBusinessOutsourceAssess request);
 }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessOutsourceProtocolService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessOutsourceProtocolService.java
new file mode 100644
index 0000000..7f3092b
--- /dev/null
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessOutsourceProtocolService.java
@@ -0,0 +1,21 @@
+package com.casic.missiles.service.business;
+
+import com.casic.missiles.dto.BaseApprovalSubmitRequest;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.business.outsource.OutsourceProtocolApprovalListRequest;
+import com.casic.missiles.dto.business.outsource.OutsourceProtocolSaveResponse;
+import com.casic.missiles.model.business.BizBusinessOutsourceProtocol;
+import com.casic.missiles.service.IGeneralApprovalService;
+
+/**
+ * <p>
+ * 计量检定业务-分包管理-测试、校准或检定工作分包协议书 服务类
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-08-24
+ */
+public interface IBizBusinessOutsourceProtocolService extends IGeneralApprovalService<BizBusinessOutsourceProtocol, BizBusinessOutsourceProtocol, OutsourceProtocolApprovalListRequest, BaseApprovalSubmitRequest> {
+
+    ReturnDTO<OutsourceProtocolSaveResponse> saveOutsourceProtocol(BizBusinessOutsourceProtocol request);
+}
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessOutsourcerInfoService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessOutsourcerInfoService.java
index 9ba656b..b199de4 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessOutsourcerInfoService.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessOutsourcerInfoService.java
@@ -24,8 +24,6 @@
  */
 public interface IBizBusinessOutsourcerInfoService extends IGeneralApprovalService<BizBusinessOutsourcerInfo, BizBusinessOutsourcerInfo, OutsourcerInfoApprovalListRequest, BaseApprovalSubmitRequest> {
 
-    List<BizBusinessOutsourcerInfo> list(OutsourcerInfoApprovalListRequest request);
-
     ReturnDTO<OutsourcerSaveResponse> saveOutsourcer(BizBusinessOutsourcerInfo request);
 
     BizBusinessOutsourcerInfo detail(Long id) throws Exception;
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessLabExecutiveInfoService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessLabExecutiveInfoService.java
index 278c674..f6ed490 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessLabExecutiveInfoService.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessLabExecutiveInfoService.java
@@ -30,8 +30,16 @@
 
     Page<SampleLabExecutiveListResponse> deptLabExecutiveListPage(Page<SampleLabExecutiveListResponse> page, SampleLabExecutiveListRequest labExecutiveListRequest) throws Exception;
 
+    List<SampleLabExecutiveListResponse> deptLabExecutiveList(SampleLabExecutiveListRequest request) throws Exception;
+
+    List<SampleLabExecutiveListResponse> deptLabExecutiveListByIds(String measureStatus, List<Long> ids) throws Exception;
+
     Page<SampleLabExecutiveListResponse> myLabExecutiveListPage(Page<SampleLabExecutiveListResponse> page, SampleLabExecutiveListRequest labExecutiveListRequest) throws Exception;
 
+    List<SampleLabExecutiveListResponse> myLabExecutiveList(SampleLabExecutiveListRequest request) throws Exception;
+
+    List<SampleLabExecutiveListResponse> myLabExecutiveListByIds(String measureStatus, List<Long> ids) throws Exception;
+
     List<SampleAmountResponse> myExecutiveAmount();
 
     ReturnDTO sampleReceive(List<SampleOperateRequest> requestList);
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/OutsourceAssessEventPostProcessor.java b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/OutsourceAssessEventPostProcessor.java
new file mode 100644
index 0000000..cda3086
--- /dev/null
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/OutsourceAssessEventPostProcessor.java
@@ -0,0 +1,46 @@
+package com.casic.missiles.service.listeners.processor;
+
+import cn.hutool.core.lang.Assert;
+import com.casic.missiles.dto.flowable.NotifyEventStatusDTO;
+import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.notifyevent.ActionStatusBeanEnum;
+import com.casic.missiles.enums.system.ApprovalStatusEnum;
+import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.mapper.business.BizBusinessOutsourceAssessMapper;
+import com.casic.missiles.model.business.BizBusinessOutsourceAssess;
+import com.casic.missiles.service.listeners.NotifyEventPostProcessor;
+import com.casic.missiles.utils.SpringContextUtil;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.Objects;
+
+/**
+ * @Description: 测试、校准或检定工作分包评审表审批通过后处理
+ * @Author: wangpeng
+ * @Date: 2023/8/21 13:20
+ */
+@Slf4j
+@Service(ActionStatusBeanEnum.OUTSOURCE_ASSESS_BEAN_NAME)
+public class OutsourceAssessEventPostProcessor implements NotifyEventPostProcessor {
+    @Override
+    @Transactional
+    public void doHandleNotifyEvent(NotifyEventStatusDTO notifyEventStatusDTO) {
+        Long id = Long.valueOf(notifyEventStatusDTO.getId());
+        Assert.isFalse(Objects.isNull(id), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        BizBusinessOutsourceAssessMapper outsourceAssessMapper = SpringContextUtil.getBean(BizBusinessOutsourceAssessMapper.class);
+
+        BizBusinessOutsourceAssess outsourceAssess = new BizBusinessOutsourceAssess();
+        outsourceAssess.setId(id);
+        outsourceAssess.setApprovalStatus(ApprovalStatusEnum.PASSED);
+        int updateFlag = outsourceAssessMapper.updateById(outsourceAssess);
+        if (updateFlag <= 0) {
+            log.error("测试、校准或检定工作分包评审表审批通过后处理失败");
+            throw new BusinessException(BusinessExceptionEnum.APPROVAL_PROCESSOR_HANDLE_FAILED);
+        }
+    }
+
+}
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/OutsourceProtocolEventPostProcessor.java b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/OutsourceProtocolEventPostProcessor.java
new file mode 100644
index 0000000..490c66e
--- /dev/null
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/OutsourceProtocolEventPostProcessor.java
@@ -0,0 +1,46 @@
+package com.casic.missiles.service.listeners.processor;
+
+import cn.hutool.core.lang.Assert;
+import com.casic.missiles.dto.flowable.NotifyEventStatusDTO;
+import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.notifyevent.ActionStatusBeanEnum;
+import com.casic.missiles.enums.system.ApprovalStatusEnum;
+import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.mapper.business.BizBusinessOutsourceProtocolMapper;
+import com.casic.missiles.model.business.BizBusinessOutsourceProtocol;
+import com.casic.missiles.service.listeners.NotifyEventPostProcessor;
+import com.casic.missiles.utils.SpringContextUtil;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.Objects;
+
+/**
+ * @Description: 测试、校准或检定工作分包协议书审批通过后处理
+ * @Author: wangpeng
+ * @Date: 2023/8/21 13:20
+ */
+@Slf4j
+@Service(ActionStatusBeanEnum.OUTSOURCE_PROTOCOL_BEAN_NAME)
+public class OutsourceProtocolEventPostProcessor implements NotifyEventPostProcessor {
+    @Override
+    @Transactional
+    public void doHandleNotifyEvent(NotifyEventStatusDTO notifyEventStatusDTO) {
+        Long id = Long.valueOf(notifyEventStatusDTO.getId());
+        Assert.isFalse(Objects.isNull(id), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        BizBusinessOutsourceProtocolMapper outsourceProtocolMapper = SpringContextUtil.getBean(BizBusinessOutsourceProtocolMapper.class);
+
+        BizBusinessOutsourceProtocol outsourceProtocol = new BizBusinessOutsourceProtocol();
+        outsourceProtocol.setId(id);
+        outsourceProtocol.setApprovalStatus(ApprovalStatusEnum.PASSED);
+        int updateFlag = outsourceProtocolMapper.updateById(outsourceProtocol);
+        if (updateFlag <= 0) {
+            log.error("测试、校准或检定工作分包协议书审批通过后处理失败");
+            throw new BusinessException(BusinessExceptionEnum.APPROVAL_PROCESSOR_HANDLE_FAILED);
+        }
+    }
+
+}

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java
index bb0c50f..13a699b 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java
@@ -12,6 +12,7 @@
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.IGeneralApprovalService;
+import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
@@ -19,6 +20,7 @@
 import org.springframework.web.bind.annotation.RequestBody;
 
 import javax.validation.Valid;
+import java.util.List;
 import java.util.Objects;
 
 /**
@@ -117,4 +119,17 @@
         }
         return baseApprovalService.failUpdate(request);
     }
+
+    public List<O> exportList(@RequestBody @Valid R request) throws Exception {
+        List<O> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = baseApprovalService.listExportByIds(request.getIds());
+        } else {
+            list = baseApprovalService.listExport(request);
+        }
+        for (O record : list) {
+            DictCodeUtils.convertDictCodeToName(record);
+        }
+        return list;
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java
index 8a90961..d775831 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java
@@ -5,6 +5,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.business.certificate.CertificateChangeApplyApprovalListRequest;
 import com.casic.missiles.dto.business.certificate.CertificateChangeApplySaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessCertificateChangeApply;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
@@ -20,6 +21,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -48,4 +50,12 @@
         }
         return changeApplyService.saveChangeApply(request);
     }
+
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody CertificateChangeApplyApprovalListRequest request) throws Exception {
+        List<BizBusinessCertificateChangeApply> list = super.exportList(request);
+        super.exportExcel(BizBusinessCertificateChangeApply.class, list, ExportEnum.CERTIFICATE_CHANGE_APPLY.getSheetName());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java
index 5fc4b07..af8230e 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java
@@ -9,6 +9,7 @@
 import com.casic.missiles.dto.business.certificate.CertificatePrintApprovalListRequest;
 import com.casic.missiles.dto.business.certificate.CertificatePrintListResponse;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.enums.business.CertificatePrintStatusEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessCertificatePrintLog;
@@ -18,10 +19,16 @@
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.io.IOException;
+import java.util.List;
 import java.util.Objects;
 
 /**
@@ -98,4 +105,16 @@
         });
         return certificatePrintService.certificatePrintLog(idDTO.getId());
     }
+
+    @ApiOperation("证书打印审批导出")
+    @PostMapping("/listExport")
+    public void exportList(@RequestBody CertificatePrintApprovalListRequest request) throws IOException {
+        List<CertificatePrintListResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = certificatePrintService.listByIds(request.getIds());
+        } else {
+            list = certificatePrintService.list(request);
+        }
+        super.exportExcel(CertificatePrintListResponse.class, list, ExportEnum.CERTIFICATE_PRINT.getSheetName());
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java
index 63b06dc..6b2efd5 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java
@@ -6,6 +6,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.business.certificate.CertificateReportApprovalListRequest;
 import com.casic.missiles.dto.business.certificate.CertificateReportSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessCertificateReport;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
@@ -21,6 +22,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -50,7 +52,7 @@
         return certificateReportService.saveCertificateReport(request);
     }
 
-    @ApiOperation("证书审批详情（基本信息）")
+    @ApiOperation("详情（基本信息）")
     @PostMapping("/detail")
     public ReturnDTO<BizBusinessCertificateReport> detail(@RequestBody @Valid BaseDetailRequest request, BindingResult bindingResult) throws Exception {
         if(bindingResult.hasErrors()){
@@ -59,4 +61,11 @@
         return certificateReportService.detail(request);
     }
 
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody CertificateReportApprovalListRequest request) throws Exception {
+        List<BizBusinessCertificateReport> list = super.exportList(request);
+        super.exportExcel(BizBusinessCertificateReport.class, list, ExportEnum.CERTIFICATE_REPORT.getSheetName());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java
index 46b26bd..57c0809 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java
@@ -10,20 +10,21 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.business.identify.IdentifyListRequest;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessIdentifyInfo;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.business.IBizBusinessIdentifyInfoService;
+import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import javax.validation.Valid;
+import java.util.List;
 import java.util.Objects;
 
 /**
@@ -57,16 +58,13 @@
         return identifyInfoService.addIdentify(identifyInfo);
     }
 
-    @ApiOperation("标识打印更新")
+    @ApiOperation("标识打印更新（更新打印时间）")
     @PostMapping("/update")
-    public ReturnDTO updateIdentify(@RequestBody @Valid BizBusinessIdentifyInfo identifyInfo, BindingResult bindingResult) {
-        Assert.isFalse(Objects.isNull(identifyInfo.getId()), () -> {
+    public ReturnDTO updateIdentify(@RequestBody @Valid IdDTO idDTO) {
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        Assert.isFalse(bindingResult.hasErrors(), () -> {
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        });
-        return identifyInfoService.updateIdentify(identifyInfo);
+        return identifyInfoService.updateIdentify(idDTO.getId());
     }
 
     @ApiOperation("标识打印删除")
@@ -77,4 +75,37 @@
         });
         return identifyInfoService.deleteIdentify(idDTO.getId());
     }
+
+    @ApiOperation("标识打印导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody @Valid IdentifyListRequest request, BindingResult bindingResult) throws Exception {
+        if (bindingResult.hasErrors()) {
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        List<BizBusinessIdentifyInfo> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = identifyInfoService.listByIds(request.getIds());
+        } else {
+            list = identifyInfoService.list(request);
+        }
+        for (BizBusinessIdentifyInfo record : list) {
+            DictCodeUtils.convertDictCodeToName(record);
+        }
+        super.exportExcel(BizBusinessIdentifyInfo.class, list, ExportEnum.IDENTIFY_EXPORT.getSheetName());
+    }
+
+
+    // TODO: 2023/8/23 查询设备信息，4个底部按钮查设备（按钮的作用就是前端用来调不同接口、用来区分中间即将展示的标识），前端弹窗选设备，在确定保存时前端根据底部按钮判断传入设备类型deviceType字典code
+    // TODO: 2023/8/23 接口：查受检设备（第1个按钮），查设备台账（后3个按钮同一接口），查询之后前端根据标志类型的不同加到中间页面时进行判断（按产品给的对应表）
+    // TODO: 2023/8/23 提供二维码接口，前端在加到中间页面时调用一下
+
+    @ApiOperation("设备二维码")
+    @PostMapping("/equipment/qrCode")
+    public ReturnDTO<String> equipmentQrCode(@RequestBody @Valid IdDTO idDTO) {
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return identifyInfoService.equipmentQrCode(idDTO.getId());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java
index 707be6e..7e0453d 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java
@@ -117,7 +117,7 @@
     }
 
     @ApiOperation("任务单导出")
-    @PostMapping("/export")
+    @PostMapping("/listExport")
     public void orderExport(@RequestBody @Valid OrderListRequest request, HttpServletResponse response) {
         businessOrderService.orderExport(request, response);
     }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java
index 529a6ce..51432be 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java
@@ -1,9 +1,28 @@
 package com.casic.missiles.controller.business;
 
+import com.casic.missiles.controller.GeneralApprovalController;
+import com.casic.missiles.dto.BaseApprovalSubmitRequest;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.business.outsource.OutsourceAssessApprovalListRequest;
+import com.casic.missiles.dto.business.outsource.OutsourceAssessSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
+import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.model.business.BizBusinessOutsourceAssess;
+import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
+import com.casic.missiles.service.IGeneralApprovalService;
+import com.casic.missiles.service.business.IBizBusinessOutsourceAssessService;
 import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.BindingResult;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.validation.Valid;
+import java.util.List;
+
 /**
  * <p>
  * 计量检定业务-分包管理-测试、校准或检定工作分包评审表 前端控制器
@@ -15,6 +34,27 @@
 @Api(tags = "分包管理-测试、校准或检定工作分包评审表")
 @RestController
 @RequestMapping("/business/outsource/assess")
-public class BizBusinessOutsourceAssessController {
+public class BizBusinessOutsourceAssessController extends GeneralApprovalController<BizBusinessOutsourceAssess, BizBusinessOutsourceAssess, OutsourceAssessApprovalListRequest, BaseApprovalSubmitRequest> {
+    @Autowired
+    private IBizBusinessOutsourceAssessService outsourceAssessService;
 
+    public BizBusinessOutsourceAssessController(IGeneralApprovalService<BizBusinessOutsourceAssess, BizBusinessOutsourceAssess, OutsourceAssessApprovalListRequest, BaseApprovalSubmitRequest> baseApprovalService) {
+        super(baseApprovalService);
+    }
+
+    @ApiOperation("草稿箱-保存")
+    @PostMapping("/save")
+    public ReturnDTO<OutsourceAssessSaveResponse> saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceAssess request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        return outsourceAssessService.saveOutsourceAssess(request);
+    }
+
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception {
+        List<BizBusinessOutsourceAssess> list = super.exportList(request);
+        super.exportExcel(BizBusinessOutsourceAssess.class, list, ExportEnum.OUTSOURCE_ASSESS.getSheetName());
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java
new file mode 100644
index 0000000..9adef18
--- /dev/null
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java
@@ -0,0 +1,60 @@
+package com.casic.missiles.controller.business;
+
+import com.casic.missiles.controller.GeneralApprovalController;
+import com.casic.missiles.dto.BaseApprovalSubmitRequest;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.business.outsource.OutsourceProtocolApprovalListRequest;
+import com.casic.missiles.dto.business.outsource.OutsourceProtocolSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
+import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.model.business.BizBusinessOutsourceProtocol;
+import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
+import com.casic.missiles.service.IGeneralApprovalService;
+import com.casic.missiles.service.business.IBizBusinessOutsourceProtocolService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.BindingResult;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.validation.Valid;
+import java.util.List;
+
+/**
+ * <p>
+ * 计量检定业务-分包管理-测试、校准或检定工作分包协议书 前端控制器
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-08-24
+ */
+@Api(tags = "分包管理-测试、校准或检定工作分包协议书")
+@RestController
+@RequestMapping("/business/outsource/protocol")
+public class BizBusinessOutsourceProtocolController extends GeneralApprovalController<BizBusinessOutsourceProtocol, BizBusinessOutsourceProtocol, OutsourceProtocolApprovalListRequest, BaseApprovalSubmitRequest> {
+    @Autowired
+    private IBizBusinessOutsourceProtocolService outsourceProtocolService;
+
+    public BizBusinessOutsourceProtocolController(IGeneralApprovalService<BizBusinessOutsourceProtocol, BizBusinessOutsourceProtocol, OutsourceProtocolApprovalListRequest, BaseApprovalSubmitRequest> baseApprovalService) {
+        super(baseApprovalService);
+    }
+
+    @ApiOperation("草稿箱-保存")
+    @PostMapping("/save")
+    public ReturnDTO<OutsourceProtocolSaveResponse> saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceProtocol request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        return outsourceProtocolService.saveOutsourceProtocol(request);
+    }
+
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody OutsourceProtocolApprovalListRequest request) throws Exception {
+        List<BizBusinessOutsourceProtocol> list = super.exportList(request);
+        super.exportExcel(BizBusinessOutsourceProtocol.class, list, ExportEnum.OUTSOURCE_PROTOCOL.getSheetName());
+    }
+}
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java
index 097f645..f0f0943 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java
@@ -17,7 +17,6 @@
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.IGeneralApprovalService;
 import com.casic.missiles.service.business.IBizBusinessOutsourcerInfoService;
-import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -71,19 +70,8 @@
 
     @ApiOperation("分包方导出")
     @PostMapping("/listExport")
-    public void export(@RequestBody @Valid OutsourcerInfoApprovalListRequest request, BindingResult bindingResult) throws Exception {
-        if (bindingResult.hasErrors()) {
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        }
-        List<BizBusinessOutsourcerInfo> list;
-        if (!CollectionUtils.isEmpty(request.getIds())) {
-            list = outsourcerInfoService.listByIds(request.getIds());
-        } else {
-            list = outsourcerInfoService.list(request);
-        }
-        for (BizBusinessOutsourcerInfo record : list) {
-            DictCodeUtils.convertDictCodeToName(record);
-        }
+    public void export(@RequestBody OutsourcerInfoApprovalListRequest request) throws Exception {
+        List<BizBusinessOutsourcerInfo> list = super.exportList(request);
         super.exportExcel(BizBusinessOutsourcerInfo.class, list, ExportEnum.OUTSOURCER_EXPORT.getSheetName());
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java
index c2cbf9f..0410918 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java
@@ -17,11 +17,9 @@
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.IGeneralApprovalService;
 import com.casic.missiles.service.business.IBizBusinessSiteExecutiveInfoService;
-import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -60,7 +58,7 @@
         return siteExecutiveInfoService.saveSiteExecutiveInfo(siteExecutiveInfo);
     }
 
-    @ApiOperation("现场检测详情")
+    @ApiOperation("详情")
     @PostMapping("/detail")
     public ReturnDTO<SiteExecutiveDetailResponse> siteExecutiveDetail(@RequestBody @Valid IdDTO idDTO) throws Exception {
         Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
@@ -69,21 +67,10 @@
         return ReturnUtil.success(siteExecutiveInfoService.detail(idDTO.getId()));
     }
 
-    @ApiOperation("现场检测导出")
+    @ApiOperation("导出")
     @PostMapping("/listExport")
-    public void export(@RequestBody @Valid SiteExecutiveApprovalListRequest request, BindingResult bindingResult) throws Exception {
-        if (bindingResult.hasErrors()) {
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        }
-        List<SiteExecutiveApprovalListResponse> list;
-        if (!CollectionUtils.isEmpty(request.getIds())) {
-            list = siteExecutiveInfoService.listInfoByIds(request.getIds());
-        } else {
-            list = siteExecutiveInfoService.listInfo(request);
-        }
-        for (SiteExecutiveApprovalListResponse record : list) {
-            DictCodeUtils.convertDictCodeToName(record);
-        }
+    public void export(@RequestBody SiteExecutiveApprovalListRequest request) throws Exception {
+        List<SiteExecutiveApprovalListResponse> list = super.exportList(request);
         super.exportExcel(SiteExecutiveApprovalListResponse.class, list, ExportEnum.SITE_EXECUTIVE_EXPORT.getSheetName());
     }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
index 7e793cd..a92e209 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
@@ -55,7 +55,7 @@
 
     @ApiOperation("设备收发列表导出")
     @PostMapping("/export")
-    public void exportList(@RequestBody @Valid SampleDispatchListRequest request) throws IOException {
+    public void exportList(@RequestBody SampleDispatchListRequest request) throws IOException {
         List<SampleDispatchListResponse> list;
         if (!CollectionUtils.isEmpty(request.getIds())) {
             list = dispatchService.listByIds(request.getIds());
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java
index cdc77fc..d120fd4 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java
@@ -7,6 +7,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.business.labExecutive.*;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.business.IBusinessLabExecutiveInfoService;
@@ -14,6 +15,7 @@
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.*;
 
@@ -32,7 +34,7 @@
     @Autowired
     private IBusinessLabExecutiveInfoService labExecutiveInfoService;
 
-    @ApiOperation("实验室检测-部门检测-查询各状态列表（待检测、检测中、检测完）")
+    @ApiOperation("实验室任务-查询各状态列表（待检测、检测中、检测完）")
     @PostMapping("/deptExecutive/List")
     public ReturnDTO<PageInfoBT<SampleLabExecutiveListResponse>> queryDeptExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
@@ -43,10 +45,19 @@
         return ReturnUtil.success(super.packForBT(labExecutiveInfoService.deptLabExecutiveListPage(page, labExecutiveListRequest)));
     }
 
-    /**
-     * 实验室检测-我的检测-查询各状态列表（待检测、检测中、检测完）
-     */
-    @ApiOperation("实验室检测-我的检测-查询各状态列表（待检测、检测中、检测完）")
+    @ApiOperation("实验室任务导出")
+    @PostMapping("/deptExecutive/export")
+    public void deptExportList(@RequestBody @Valid SampleLabExecutiveListRequest request) throws Exception {
+        List<SampleLabExecutiveListResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = labExecutiveInfoService.deptLabExecutiveListByIds(request.getMeasureStatus(), request.getIds());
+        } else {
+            list = labExecutiveInfoService.deptLabExecutiveList(request);
+        }
+        super.exportExcel(SampleLabExecutiveListResponse.class, list, ExportEnum.DEPT_EXECUTIVE_TASK.getSheetName());
+    }
+
+    @ApiOperation("我的任务-查询各状态列表（待检测、检测中、检测完）")
     @PostMapping("/myExecutive/list")
     public ReturnDTO<PageInfoBT<SampleLabExecutiveListResponse>> queryMyExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
@@ -57,19 +68,25 @@
         return ReturnUtil.success(super.packForBT(labExecutiveInfoService.myLabExecutiveListPage(page, labExecutiveListRequest)));
     }
 
-    /**
-     * 实验室检测-我的检测-查询各状态样品数量（待检测、检测中、检测完）
-     */
-    @ApiOperation("实验室检测-我的检测-查询各状态样品数量（待检测、检测中、检测完）")
+    @ApiOperation("我的任务导出")
+    @PostMapping("/myExecutive/export")
+    public void exportList(@RequestBody @Valid SampleLabExecutiveListRequest request) throws Exception {
+        List<SampleLabExecutiveListResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = labExecutiveInfoService.myLabExecutiveListByIds(request.getMeasureStatus(), request.getIds());
+        } else {
+            list = labExecutiveInfoService.myLabExecutiveList(request);
+        }
+        super.exportExcel(SampleLabExecutiveListResponse.class, list, ExportEnum.MY_EXECUTIVE_TASK.getSheetName());
+    }
+
+    @ApiOperation("我的任务-查询各状态样品数量（待检测、检测中、检测完）")
     @GetMapping("/myExecutive/amount")
     public ReturnDTO<List<SampleAmountResponse>> queryMyExecutiveAmount() {
         return ReturnUtil.success(labExecutiveInfoService.myExecutiveAmount());
     }
 
-    /**
-     * 实验室检测-部门检测-分配（分配给具体人员）
-     */
-    @ApiOperation("实验室检测-部门检测-分配按钮（分配给具体人员）")
+    @ApiOperation("实验室任务-分配按钮（分配给具体人员）")
     @PostMapping("/deptExecutive/allocate")
     public ReturnDTO allocateStaff(@RequestBody @Valid SampleAllocateRequest sampleAllocateRequest, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -78,10 +95,7 @@
         return labExecutiveInfoService.allocateStaff(sampleAllocateRequest);
     }
 
-    /**
-     * 实验室检测-我的检测-检定人扫描收入（待检测->检测中）
-     */
-    @ApiOperation("实验室检测-我的检测-检定人扫描收入（待检测->检测中）")
+    @ApiOperation("我的任务-检定人扫描收入（待检测->检测中）")
     @PostMapping("/myExecutive/receive")
     public ReturnDTO sampleReceive(@RequestBody @Valid List<SampleOperateRequest> requestList, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -90,10 +104,7 @@
         return labExecutiveInfoService.sampleReceive(requestList);
     }
 
-    /**
-     * 实验室检测-负责人/检定人扫描检完（检测中->检测完）
-     */
-    @ApiOperation("实验室检测-负责人/检定人扫描检完（检测中->检测完）")
+    @ApiOperation("实验室任务-负责人/检定人扫描检完（检测中->检测完）")
     @PostMapping("/myExecutive/complete")
     public ReturnDTO sampleExecutiveComplete(@RequestBody @Valid List<SampleOperateRequest> requestList, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -102,10 +113,7 @@
         return labExecutiveInfoService.sampleExecutiveComplete(requestList);
     }
 
-    /**
-     * 实验室检测-部门检测/我的检测 编辑（只能修改应出具证书）
-     */
-    @ApiOperation("实验室检测-部门检测/我的检测 编辑（只能修改应出具证书）")
+    @ApiOperation("实验室任务/我的任务 编辑（只能修改应出具证书）")
     @PostMapping("/executive/update")
     public ReturnDTO updateExecutive(@RequestBody @Valid UpdateExecutiveRequest request, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -114,10 +122,7 @@
         return labExecutiveInfoService.updateExecutive(request);
     }
 
-    /**
-     * 实验室检测-部门检测/我的检测 详情
-     */
-    @ApiOperation("实验室检测-部门检测/我的检测 详情")
+    @ApiOperation("实验室任务/我的任务 详情")
     @PostMapping("/executive/detail")
     public ReturnDTO<ExecutiveDetailResponse> executiveDetail(@RequestBody @Valid ExecutiveDetailRequest request, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
@@ -131,7 +136,7 @@
      * 退回后会将下一个要执行的实验室检测状态更新为待分配，将后面的实验室顺序变更为连续（都进行减1）
      * 最后一个检测的实验室退回，等分发员再增加实验室或设备收发中的已收入直接手动点击完成
      */
-    @ApiOperation("实验室检测-部门检测/我的检测 退回（待检测/检测中->退回）")
+    @ApiOperation("实验室任务/我的任务 退回（待检测/检测中->退回）")
     @PostMapping("/executive/sendBack")
     public ReturnDTO executiveSendBack(@RequestBody @Valid ExecutiveSendBackRequest request, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -140,9 +145,6 @@
         return labExecutiveInfoService.sampleExecutiveSendBack(request);
     }
 
-    /**
-     * 分发员编辑实验室检测列表
-     */
     @ApiOperation("分发员编辑实验室检测列表")
     @PostMapping("/handOut/updateList")
     public ReturnDTO updateExecutiveList(@RequestBody @Valid UpdateExecutiveListRequest request, BindingResult bindingResult) {
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java
index 48a67ed..0c04f31 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java
@@ -10,6 +10,7 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.resource.customer.CustomerApprovalListRequest;
 import com.casic.missiles.dto.resource.customer.CustomerSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceCustomerInfo;
@@ -26,6 +27,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -55,6 +57,13 @@
         return customerInfoService.saveCustomerInfo(request);
     }
 
+    @ApiOperation("委托方名录导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody CustomerApprovalListRequest request) throws Exception {
+        List<BizResourceCustomerInfo> list = super.exportList(request);
+        super.exportExcel(BizResourceCustomerInfo.class, list, ExportEnum.CUSTOMER_INFO.getSheetName());
+    }
+
     @ApiOperation("委托方人员列表（分页）")
     @PostMapping("/person/listPage")
     public ReturnDTO<PageInfoBT<BizResourceCustomerStaff>> personListPage(@RequestBody IdDTO idDto) {
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
index 972ed4b..6418ea5 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
@@ -5,6 +5,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.resource.customer.SuggestFormApprovalListRequest;
 import com.casic.missiles.dto.resource.customer.SuggestFormSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceCustomerSuggestForm;
@@ -20,6 +21,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -50,4 +52,11 @@
         return suggestFormService.saveSuggestForm(request);
     }
 
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody SuggestFormApprovalListRequest request) throws Exception {
+        List<BizResourceCustomerSuggestForm> list = super.exportList(request);
+        super.exportExcel(BizResourceCustomerSuggestForm.class, list, ExportEnum.CUSTOMER_SUGGEST_FORM.getSheetName());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java
index 1934d1a..9e07eab 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java
@@ -15,12 +15,16 @@
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.resource.IEnvEnvironmentRecordConfigService;
 import com.casic.missiles.service.resource.IEnvEnvironmentRecordDataService;
+import com.casic.missiles.service.resource.IEnvLocationInfoService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
 import java.util.List;
@@ -39,6 +43,8 @@
     private IEnvEnvironmentRecordDataService environmentRecordDataService;
     @Autowired
     private IEnvEnvironmentRecordConfigService environmentRecordConfigService;
+    @Autowired
+    private IEnvLocationInfoService locationInfoService;
 
     @ApiOperation("环境记录单数据列表/详情")
     @PostMapping("/data/listPage")
@@ -95,4 +101,11 @@
         });
         return environmentRecordConfigService.deleteEnvironmentRecordConfig(idDTO.getId());
     }
+
+    @ApiOperation("地点列表")
+    @PostMapping("/location/listPage")
+    public ReturnDTO<PageInfoBT<LocationListResponse>> locationListPage(@RequestBody @Valid LocationListRequest request) {
+        Page<LocationListResponse> page = PageFactory.defaultPage();
+        return ReturnUtil.success(super.packForBT(locationInfoService.listPage(page, request)));
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java
index 82efe3f..e9561fa 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java
@@ -10,6 +10,7 @@
 import com.casic.missiles.dto.resource.seal.SealLogListRequest;
 import com.casic.missiles.dto.resource.seal.SealNoteApprovalListRequest;
 import com.casic.missiles.dto.resource.seal.SealNoteSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceSealUseLog;
@@ -27,6 +28,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -58,6 +60,13 @@
         return sealUseNoteService.saveSeal(request);
     }
 
+    @ApiOperation("印章使用登记导出（列表和导出中去掉经办人和监印人）")
+    @PostMapping("/listExport")
+    public void export(@RequestBody SealNoteApprovalListRequest request) throws Exception {
+        List<BizResourceSealUseNote> list = super.exportList(request);
+        super.exportExcel(BizResourceSealUseNote.class, list, ExportEnum.SEAL_NOTE.getSheetName());
+    }
+
     // TODO: 2023/7/28 印章使用日志：系统中使用印章时插入数据库
 
     @ApiOperation("印章使用日志列表（分页）")
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java
index 9b674fc..06b6521 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java
@@ -9,16 +9,20 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.resource.staff.StaffCertRequest;
 import com.casic.missiles.dto.resource.staff.StaffCertResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.service.resource.IBizResourceStaffInfoService;
 import com.casic.missiles.service.resource.IBizResourceStaffVerifierService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.List;
+
 /**
  * @Description:
  * @Author: wangpeng
@@ -41,9 +45,21 @@
         return ReturnUtil.success(super.packForBT(responsePage));
     }
 
+    @ApiOperation("证书逾期提醒导出")
+    @PostMapping("/listExport")
+    public void exportList(@RequestBody StaffCertRequest request) throws Exception {
+        List<StaffCertResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = staffInfoService.certListByIds(request.getIds());
+        } else {
+            list = staffInfoService.certList(request);
+        }
+        super.exportExcel(StaffCertResponse.class, list, ExportEnum.STAFF_CERTIFICATE_EXPIRE.getSheetName());
+    }
+
     @ApiOperation("证书逾期提醒")
     @PostMapping("/expirationReminder")
-    public ReturnDTO expirationReminder(@RequestBody IdDTO idDto) {
-        return verifierService.expirationReminder(idDto);
+    public ReturnDTO expirationReminder(@RequestBody IdDTO idDTO) {
+        return verifierService.expirationReminder(idDTO);
     }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java
index 3b251ad..a6e7850 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java
@@ -12,6 +12,7 @@
 import com.casic.missiles.dto.resource.staff.StaffListRequest;
 import com.casic.missiles.dto.resource.staff.TrainListRequest;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.*;
@@ -22,7 +23,10 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
 import java.util.List;
@@ -52,8 +56,19 @@
             throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
         }
         Page<BizResourceStaffInfo> page = PageFactory.defaultPage();
-        Page<BizResourceStaffInfo> responsePage = staffInfoService.listPage(page, request);
-        return ReturnUtil.success(super.packForBT(responsePage));
+        return ReturnUtil.success(super.packForBT(staffInfoService.listPage(page, request)));
+    }
+
+    @ApiOperation("人员登记导出")
+    @PostMapping("/listExport")
+    public void exportList(@RequestBody StaffListRequest request) throws Exception {
+        List<BizResourceStaffInfo> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = staffInfoService.listByIds(request.getIds());
+        } else {
+            list = staffInfoService.list(request);
+        }
+        super.exportExcel(BizResourceStaffInfo.class, list, ExportEnum.STAFF_INFO.getSheetName());
     }
 
     @ApiOperation("人员登记详情基础信息")
@@ -85,9 +100,9 @@
 
     @ApiOperation("科研教育列表（分页）")
     @PostMapping("/education/listPage")
-    public ReturnDTO<PageInfoBT<BizResourceStaffEducation>> educationListPage(@RequestBody IdDTO idDto) {
+    public ReturnDTO<PageInfoBT<BizResourceStaffEducation>> educationListPage(@RequestBody IdDTO idDTO) {
         Page<BizResourceStaffEducation> page = PageFactory.defaultPage();
-        Page<BizResourceStaffEducation> responsePage = staffInfoService.educationListPage(page, idDto);
+        Page<BizResourceStaffEducation> responsePage = staffInfoService.educationListPage(page, idDTO);
         return ReturnUtil.success(super.packForBT(responsePage));
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java
index af6aa86..d85d84a 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java
@@ -9,6 +9,7 @@
 import com.casic.missiles.dto.resource.outsideService.SupplierApprovalListRequest;
 import com.casic.missiles.dto.resource.outsideService.SupplierSaveResponse;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceSupplierAbility;
@@ -67,6 +68,13 @@
         return ReturnUtil.success(supplierInfoService.detail(idDTO.getId()));
     }
 
+    @ApiOperation("合格供方导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody SupplierApprovalListRequest request) throws Exception {
+        List<BizResourceSupplierInfo> list = super.exportList(request);
+        super.exportExcel(BizResourceSupplierInfo.class, list, ExportEnum.SUPPLIER_INFO.getSheetName());
+    }
+
     @ApiOperation("供方人员列表（分页）")
     @PostMapping("/person/listPage")
     public ReturnDTO<PageInfoBT<BizResourceSupplierPerson>> personListPage(@RequestBody IdDTO idDTO) {
diff --git a/casic-metering-api/src/main/resources/config/application.yml b/casic-metering-api/src/main/resources/config/application.yml
index 350db5f..ecff521 100644
--- a/casic-metering-api/src/main/resources/config/application.yml
+++ b/casic-metering-api/src/main/resources/config/application.yml
@@ -126,7 +126,7 @@
     #作者
     author: wangpeng
     #待生成对象表名
-    table-name: biz_equipment_technical_target_approval,biz_equipment_attachment_approval,biz_equipment_checkpoint_approval
+    table-name: biz_business_outsource_protocol
 
 reminder:
   #节点--common模块config包 ReminderNodeConfig配置
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
index 4a19e4e..d47d552 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
@@ -53,6 +53,7 @@
     SUGGEST_FORM_SAVE_FAILED(2509, "委托方意见登记表保存至草稿箱失败"),
     EXAMINE_FORM_SAVE_FAILED(2510, "要求、委托书及合同评审表保存至草稿箱失败"),
     CUSTOMER_EXIST_SAVE_FAILED(2511, "该委托方已存在，请重新选择"),
+    DUPLICATE_LOCATION_NO(2512, "地点编号已存在"),
 
     /**
      * 计量检定业务模块
@@ -68,6 +69,8 @@
     COMPLETE_SAMPLE_NOT_EXIST(2609, "检测中不存在扫描收入的样品"),
     CANNOT_CHANGE_MEASURE_INFO(2610, "无法更改非当前登录用户的检测信息"),
     NON_EXIST_ORDER_OR_SAMPLE(2611, "不存在该委托单或该委托单下的样品"),
+    OUTSOURCE_ACCESS_SAVE_FAILED(2612, "测试、校准或检定工作分包评审表保存至草稿箱失败"),
+    OUTSOURCE_PROTOCOL_SAVE_FAILED(2613, "测试、校准或检定工作分包协议书保存至草稿箱失败"),
 
     /**
      * 历史遗留备用
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
index 5089ad1..81a406b 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
@@ -10,54 +10,38 @@
     /**
      * 资源管理
      */
-    ENVIRONMENT_DATA_EXPORT("environmentData", "environmentData", "环境记录单数据"),
+    ENVIRONMENT_DATA_EXPORT("environmentData", "环境记录单数据", "环境记录单数据"),
+    STAFF_INFO("staffInfo", "人员登记", "人员登记"),
+    STAFF_CERTIFICATE_EXPIRE("certificateExpire", "证书逾期提醒", "证书逾期提醒"),
+    SUPPLIER_INFO("supplierInfo", "合格供方名录", "合格供方名录"),
+    CUSTOMER_INFO("customerInfo", "委托方名录", "委托方名录"),
+    CUSTOMER_SUGGEST_FORM("customerSuggestForm", "委托方意见登记表", "委托方意见登记表"),
+    SEAL_NOTE("sealNote", "印章使用登记", "印章使用登记"),
 
-    FILE_EXPORT("meterFileData", "meterFileData", "计量文件信息"),
-    TRAIN_PLAN_EXPORT("trainPlanData", "trainPlanData", "培训计划"),
-    TRAIN_LOG_EXPORT("trainLogData", "trainLogData", "培训记录"),
-    METER_ORGANIZE_EXPORT("meterOrganizeData", "meterOrganizeData", "计量组织"),
-    TRACE_SUPPLIER_EXPORT("traceSupplierData", "traceSupplierData", "溯源供方"),
-    SIGN_EXPORT("signData", "signData", "签名/签章"),
-    TEMPLATE_EXPORT("templateData", "templateData", "原始记录模板/证书报告模板"),
-    FIXED_ASSETS("meterFixedAssets", "meterFixedAssets", "固定资产"),
-    METER_EQUIPMENT("meterEquipment", "meterEquipment", "测量设备"),
-    CALIBRATION_TEST_EQUIPMENT("calibrationTestEquipment", "calibrationTestEquipment", "校准检定设备"),
-    MEASURE_ACCOUNT("measureAccount", "measureAccount", "测量工装"),
-    STANDARD_SUPPORT_EQUIPMENT("standardSupportEquipment", "standardSupportEquipment", "标准配套设备"),
-    STANDARD_EQUIPMENT("standardEquipment", "standardEquipment", "标准装置"),
-    FLOW_DEF_EXPORT("flowDefData", "flowDefData", "流程定义"),
-    STAFF_CERTIFICATE("certificate", "certificate", "计量人员证书"),
-    CHECK_INFO("checkInfo", "checkInfo", "设备管理点检测"),
-    EQUIPMENT_APPLY("equipmentApply", "equipmentApply", "设备借用"),
-    STANDARD_EQUIPMENT_REMIND("equipmentApplyRemind", "equipmentApplyRemind", "标准装置到期提醒"),
-    METER_PRICE("meterPrice", "meterPrice", "价格库"),
-    METER_STAFF("meterStaff", "meterStaff", "计量人员"),
-    STANDARD_EQUIPMENT_APPLY("standardEquipmentApply", "standardEquipmentApply", "标准装置申请"),
-    STATE_MANAGE_APPLY("stateManage", "stateManage", "状态管理"),
-    METER_ACCEPTANCE_CHECK("acceptanceCheck", "acceptanceCheck", "设备检修保养验收单"),
-    CUSTOMER_EXPORT("customerData", "customerData", "客户信息"),
-    ORDER_EXPORT("orderData", "orderData", "委托书信息"),
-    SAMPLE_EXPORT("sampleData", "sampleData", "样本信息"),
-    EXCHANGE_DATA("exchangeData", "exchangeData", "设备交接单"),
-    DISPATCH_DATA("dispatchData", "dispatchData", "设备收发"),
-    ENVIRONMENT_DATA("environmentData", "environmentData", "环境记录单"),
-    ORIGIN_DATA("originData", "originData", "原始记录"),
-    CERTIFICATE_REPORT("certificateReport", "certificateReport", "证书报告"),
-    ADVICE_EXPORT("adviceData", "adviceData", "客户反馈"),
-    HANDOUT_EXPORT("handoutData", "handoutData", "任务分发列表"),
-    OUTSOURCER_EXPORT("outsourcerData", "outsourcerData", "分包方"),
-    SITE_EXECUTIVE_EXPORT("siteExecutiveData", "siteExecutiveData", "现场测试、校准或检定"),
-    CERTIFICATE_PRINT_EXPORT("certificatePrintData", "certificatePrintData", "证书打印"),
-    DOWNLOAD_TEMPLATE("downloadTemplate", "downloadTemplate", "页面配置"),
-    OUTSOURCER_CERTIFICATE_EXPORT("outsourceCertificateData", "outsourceCertificateData", "分包证书"),
-    SETTLEMENT_INFO_EXPORT("settlementInfoData", "settlementInfoData", "业务结算"),
-    EQUIPMENT_REMIND("equipmentRemind", "equipmentRemind", "设备到期提醒"),
-    AGREEMENT_INFO_EXPORT("agreementInfoData", "agreementInfoData", "合同"),
-    WORK_STATISTICS_EXPORT("workStatisticsData", "workStatisticsData", "实时工作统计"),
-    DEPT_OUTPUT_EXPORT("deptOutputData", "deptOutputData", "部门产值分析"),
-    WORKLOAD_EXPORT("workloadData", "workloadData", "业务工作量分析"),
-    DEPT_COMPREHENSIVE_EXPORT("deptComprehensiveData", "deptComprehensiveData", "部门综合分析"),
-    ENVIRONMENTAL_RECORD("environmentalRecordData", "environmentalRecordData", "现场环境记录");
+    /**
+     * 计量检定业务
+     */
+    OUTSOURCER_EXPORT("outsourcerData", "分包方名录", "分包方名录"),
+    IDENTIFY_EXPORT("identifyData", "计量标识", "计量标识"),
+    ORDER_EXPORT("orderData", "任务单", "任务单"),
+    DISPATCH_DATA("dispatchData", "设备收发", "设备收发"),
+    HANDOUT_EXPORT("handoutData", "任务分发", "任务分发"),
+    SITE_EXECUTIVE_EXPORT("siteExecutiveData", "现场测试、校准或检定", "现场测试、校准或检定"),
+    CERTIFICATE_REPORT("certificateReport", "证书审批", "证书审批"),
+    CERTIFICATE_CHANGE_APPLY("certificateChangeApply", "证书报告补充或更换申请单", "证书报告补充或更换申请单"),
+    CERTIFICATE_PRINT("certificatePrintData", "证书打印审批", "证书打印审批"),
+    DEPT_EXECUTIVE_TASK("deptExecutiveTaskData", "实验室任务", "实验室任务"),
+    MY_EXECUTIVE_TASK("myExecutiveTaskData", "我的任务", "我的任务"),
+    OUTSOURCE_ASSESS("outsourceAssess", "测试、校准或检定工作分包评审表", "测试、校准或检定工作分包评审表"),
+    OUTSOURCE_PROTOCOL("outsourceProtocol", "测试、校准或检定工作分包协议书", "测试、校准或检定工作分包协议书"),
+
+    /**
+     * 系统管理
+     */
+    SIGN_EXPORT("signData", "签名", "签名"),
+    TEMPLATE_EXPORT("templateData", "文件模板", "文件模板"),
+    FLOW_DEF_EXPORT("flowDefData", "流程定义", "流程定义"),
+    DOWNLOAD_TEMPLATE("downloadTemplate", "流程定义", "页面配置");
 
     ExportEnum(String fileName, String sheetName, String description) {
         this.fileName = fileName;
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateRecordTypeCodeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateRecordTypeCodeEnum.java
index 31d913c..a963522 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateRecordTypeCodeEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateRecordTypeCodeEnum.java
@@ -46,4 +46,14 @@
     String SITE_EXECUTIVE_APPROVAL = "01";
     //《现场测试、校准或检定工作记录表》
     String SITE_EXECUTIVE_LOG = "02";
+
+    //测试、校准或检定工作分包协议书
+    String OUTSOURCE_PROTOCOL = "01";
+    //测试、校准或检定工作分包评审表
+    String OUTSOURCE_ACCESS = "02";
+    //测试、校准或检定工作分包通知书
+    String OUTSOURCE_NOTICE = "03";
+    //测试、校准或检定工作分包方名录
+    String OUTSOURCE_INFO = "04";
+
 }
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
index 24b8635..f78bd53 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
@@ -15,6 +15,10 @@
     String CERTIFICATE_CHANGE_APPLY_BEAN_NAME = "certificateChangeApplyBean";
     //现场测试、校准或检定
     String SITE_EXECUTIVE_BEAN_NAME = "siteExecutiveBean";
+    //测试、校准或检定工作分包评审表
+    String OUTSOURCE_ASSESS_BEAN_NAME = "outsourceAssessBean";
+    //测试、校准或检定工作分包协议书
+    String OUTSOURCE_PROTOCOL_BEAN_NAME = "outsourceProtocolBean";
 
     /*********************************设备与装置************************************/
     //设备台账
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 b21c661..6b86fd1 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
@@ -18,6 +18,8 @@
     OUTSOURCER_APPROVAL(OUTSOURCER_BEAN_NAME, ""),
     CERTIFICATE_CHANGE_APPROVAL(CERTIFICATE_CHANGE_APPLY_BEAN_NAME, ""),
     SITE_EXECUTIVE_APPROVAL(SITE_EXECUTIVE_BEAN_NAME, ""),
+    OUTSOURCE_ASSESS_APPROVAL(OUTSOURCE_ASSESS_BEAN_NAME, ""),
+    OUTSOURCE_PROTOCOL_APPROVAL(OUTSOURCE_PROTOCOL_BEAN_NAME, ""),
 
     ACTION_STATUS_MAP(new HashMap<String, AwareActionStatusEnum>() {
         {
@@ -47,6 +49,10 @@
             put(ApplyFromIdEnum.CERTIFICATE_CHANGE_APPROVAL.getCode(), CERTIFICATE_CHANGE_APPROVAL);
             //现场测试、校准或检定审批
             put(ApplyFromIdEnum.SITE_EXECUTIVE_APPROVAL.getCode(), SITE_EXECUTIVE_APPROVAL);
+            //测试、校准或检定工作分包评审表
+            put(ApplyFromIdEnum.OUTSOURCE_ASSESS_APPROVAL.getCode(), OUTSOURCE_ASSESS_APPROVAL);
+            //测试、校准或检定工作分包协议书
+            put(ApplyFromIdEnum.OUTSOURCE_PROTOCOL_APPROVAL.getCode(), OUTSOURCE_PROTOCOL_APPROVAL);
         }
     });
     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 934405e..c7410bd 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
@@ -9,6 +9,8 @@
     CERTIFICATE_CHANGE_APPROVAL("jljdywzsbchghsqd", MessageSourceModuleEnum.BUSINESS.getCode(), "证书/报告补充或更换申请单"),
     OUTSOURCER_APPROVAL("jljdywcsjzhgfbfml", MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定合格分包方名录"),
     SITE_EXECUTIVE_APPROVAL("jljdywxccsjzsp", MessageSourceModuleEnum.BUSINESS.getCode(), "现场测试、校准或检定审批"),
+    OUTSOURCE_ASSESS_APPROVAL("jljdywcsjzfbpsb", MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包评审表"),
+    OUTSOURCE_PROTOCOL_APPROVAL("jljdywcsjzfbxys", MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包协议书"),
 
 
     /*******************************************设备与装置*********************************************/
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/GeneralApprovalMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/GeneralApprovalMapper.java
index 4fb7344..0c9d6ae 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/GeneralApprovalMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/GeneralApprovalMapper.java
@@ -17,8 +17,4 @@
 
     Page<O> selectBatchForApprovalList(Page<O> page, @Param("request") R request, @Param("businessKeys") List<String> businessKeys);
 
-//    Page<O> selectListPage(Page<O> page, @Param("request") R request);
-
-//    Long selectMaxNo();
-
 }
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceAssessMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceAssessMapper.java
index 7867bb8..ba59009 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceAssessMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceAssessMapper.java
@@ -1,7 +1,12 @@
 package com.casic.missiles.mapper.business;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.business.outsource.OutsourceAssessApprovalListRequest;
+import com.casic.missiles.mapper.GeneralApprovalMapper;
 import com.casic.missiles.model.business.BizBusinessOutsourceAssess;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * <p>
@@ -11,6 +16,10 @@
  * @author wangpeng
  * @since 2023-08-16
  */
-public interface BizBusinessOutsourceAssessMapper extends BaseMapper<BizBusinessOutsourceAssess> {
+public interface BizBusinessOutsourceAssessMapper extends GeneralApprovalMapper<BizBusinessOutsourceAssess, BizBusinessOutsourceAssess, OutsourceAssessApprovalListRequest> {
+
+    Page<BizBusinessOutsourceAssess> selectBatchForApprovalList(Page<BizBusinessOutsourceAssess> page, @Param("request") OutsourceAssessApprovalListRequest request, @Param("businessKeys") List<String> businessKeys);
+
+    Long selectMaxProjectNo();
 
 }
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceProtocolMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceProtocolMapper.java
new file mode 100644
index 0000000..e6aba35
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceProtocolMapper.java
@@ -0,0 +1,24 @@
+package com.casic.missiles.mapper.business;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.business.outsource.OutsourceProtocolApprovalListRequest;
+import com.casic.missiles.mapper.GeneralApprovalMapper;
+import com.casic.missiles.model.business.BizBusinessOutsourceProtocol;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 计量检定业务-分包管理-测试、校准或检定工作分包协议书 Mapper 接口
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-08-24
+ */
+public interface BizBusinessOutsourceProtocolMapper extends GeneralApprovalMapper<BizBusinessOutsourceProtocol, BizBusinessOutsourceProtocol, OutsourceProtocolApprovalListRequest> {
+
+    Page<BizBusinessOutsourceProtocol> selectBatchForApprovalList(Page<BizBusinessOutsourceProtocol> page, @Param("request") OutsourceProtocolApprovalListRequest request, @Param("businessKeys") List<String> businessKeys);
+
+    Long selectMaxProtocolNo();
+}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/EnvLocationInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/EnvLocationInfoMapper.java
new file mode 100644
index 0000000..49eff87
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/EnvLocationInfoMapper.java
@@ -0,0 +1,21 @@
+package com.casic.missiles.mapper.resource;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.resource.environment.LocationListRequest;
+import com.casic.missiles.dto.resource.environment.LocationListResponse;
+import com.casic.missiles.model.resource.EnvLocationInfo;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * <p>
+ * 实验室环境监控系统-设备表 Mapper 接口
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-06-07
+ */
+public interface EnvLocationInfoMapper extends BaseMapper<EnvLocationInfo> {
+
+    Page<LocationListResponse> selectLocationListPage(Page<LocationListResponse> page, @Param("request") LocationListRequest request);
+}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java
index de124db..85ed0f7 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java
@@ -1,7 +1,9 @@
 package com.casic.missiles.mapper.system;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.dto.system.SignDetailResponse;
+import com.casic.missiles.dto.system.SignListRequest;
 import com.casic.missiles.model.system.SystemSign;
 import org.apache.ibatis.annotations.Param;
 
@@ -22,4 +24,8 @@
     SignDetailResponse selectSignDetailById(Long id);
 
     List<SystemSign> selectUsableSignList(@Param("userId") Long userId);
+
+    Page<SystemSign> selectSignListPage(Page<SystemSign> page, @Param("request") SignListRequest request);
+
+    List<SystemSign> selectSignList(@Param("request") SignListRequest request);
 }
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateChangeApplyMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateChangeApplyMapper.xml
index d798447..c496092 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateChangeApplyMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateChangeApplyMapper.xml
@@ -30,31 +30,31 @@
         SELECT *
         FROM biz_business_certificate_change_apply
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.changeApplyNo != null and request.changeApplyNo !=''">
+        <if test="request != null and request.changeApplyNo != null and request.changeApplyNo !=''">
             and change_apply_no like concat('%',#{request.changeApplyNo},'%')
         </if>
-        <if test="request.changeReportNo != null and request.changeReportNo !=''">
+        <if test="request != null and request.changeReportNo != null and request.changeReportNo !=''">
             and change_report_no like concat('%',#{request.changeReportNo},'%')
         </if>
-        <if test="request.changeReportName != null and request.changeReportName !=''">
+        <if test="request != null and request.changeReportName != null and request.changeReportName !=''">
             and change_report_name like concat('%',#{request.changeReportName},'%')
         </if>
-        <if test="request.changeType != null and request.changeType !=''">
+        <if test="request != null and request.changeType != null and request.changeType !=''">
             and change_type = #{request.changeType}
         </if>
-        <if test="request.createUserName != null and request.createUserName !=''">
+        <if test="request != null and request.createUserName != null and request.createUserName !=''">
             and create_user_name like concat('%',#{request.createUserName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificatePrintMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificatePrintMapper.xml
index b66cd99..49c0ac8 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificatePrintMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificatePrintMapper.xml
@@ -31,34 +31,34 @@
         LEFT JOIN biz_business_order_sample_relation bosr ON (bosr.order_id = bcr.order_id AND bosr.sample_id = bcr.sample_id)
         LEFT JOIN biz_business_order_info boi ON boi.id = bosr.order_id
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and bcp.approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.printStatus != null and request.printStatus !=''">
+        <if test="request != null and request.printStatus != null and request.printStatus !=''">
             and print_status = #{request.printStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and bcp.create_user_id = #{request.createUserId}
         </if>
-        <if test="request.certificateReportNo != null and request.certificateReportNo !=''">
+        <if test="request != null and request.certificateReportNo != null and request.certificateReportNo !=''">
             and bcr.certificate_report_no like concat('%',#{request.certificateReportNo},'%')
         </if>
-        <if test="request.certificateReportName != null and request.certificateReportName !=''">
+        <if test="request != null and request.certificateReportName != null and request.certificateReportName !=''">
             and bcr.certificate_report_name like concat('%',#{request.certificateReportName},'%')
         </if>
-        <if test="request.customerName != null and request.customerName !=''">
+        <if test="request != null and request.customerName != null and request.customerName !=''">
             and boi.customer_name like concat('%',#{request.customerName},'%')
         </if>
-        <if test="request.sampleNo != null and request.sampleNo !=''">
+        <if test="request != null and request.sampleNo != null and request.sampleNo !=''">
             and bosr.sample_no like concat('%',#{request.sampleNo},'%')
         </if>
-        <if test="request.sampleName != null and request.sampleName !=''">
+        <if test="request != null and request.sampleName != null and request.sampleName !=''">
             and bosr.sample_name like concat('%',#{request.sampleName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and bcp.create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and bcp.create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml
index b366034..767695d 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml
@@ -46,33 +46,37 @@
         SELECT bcr.*, bosr.sample_no, bosr.sample_name, bosr.sample_model, rsi.staff_name
         FROM biz_business_certificate_report bcr
         LEFT JOIN biz_business_order_sample_relation bosr ON (bosr.order_id = bcr.order_id AND bosr.sample_id = bcr.sample_id)
+        LEFT JOIN biz_business_order_info boi ON boi.id = bcr.order_id
         LEFT JOIN biz_resource_staff_info rsi ON rsi.id = bcr.measure_person_id
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and bcr.approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and bcr.create_user_id = #{request.createUserId}
         </if>
-        <if test="request.certificateReportNo != null and request.certificateReportNo !=''">
+        <if test="request != null and request.customerId != null and request.customerId !=''">
+            and boi.customer_id = #{request.customerId}
+        </if>
+        <if test="request != null and request.certificateReportNo != null and request.certificateReportNo !=''">
             and bcr.certificate_report_no like concat('%',#{request.certificateReportNo},'%')
         </if>
-        <if test="request.certificateReportName != null and request.certificateReportName !=''">
+        <if test="request != null and request.certificateReportName != null and request.certificateReportName !=''">
             and bcr.certificate_report_name like concat('%',#{request.certificateReportName},'%')
         </if>
-        <if test="request.sampleNo != null and request.sampleNo !=''">
+        <if test="request != null and request.sampleNo != null and request.sampleNo !=''">
             and bosr.sample_no like concat('%',#{request.sampleNo},'%')
         </if>
-        <if test="request.measureCategory != null and request.measureCategory !=''">
+        <if test="request != null and request.measureCategory != null and request.measureCategory !=''">
             and bcr.measure_category = #{request.measureCategory}
         </if>
-        <if test="request.measurePerson != null and request.measurePerson !=''">
+        <if test="request != null and request.measurePerson != null and request.measurePerson !=''">
             and rsi.staff_name like concat('%',#{request.measurePerson},'%')
         </if>
-        <if test="request.calibrationTimeStart != null and request.calibrationTimeStart !=''">
+        <if test="request != null and request.calibrationTimeStart != null and request.calibrationTimeStart !=''">
             and bcr.calibration_time &gt;= #{request.calibrationTimeStart}
         </if>
-        <if test="request.calibrationTimeEnd != null and request.calibrationTimeEnd !=''">
+        <if test="request != null and request.calibrationTimeEnd != null and request.calibrationTimeEnd !=''">
             and bcr.calibration_time &lt;= #{request.calibrationTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceAssessMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceAssessMapper.xml
index d0fcf8b..c22c101 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceAssessMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceAssessMapper.xml
@@ -7,6 +7,8 @@
         <id column="id" property="id" />
         <result column="project_no" property="projectNo" />
         <result column="project_name" property="projectName" />
+        <result column="lab_code" property="labCode" />
+        <result column="group_code" property="groupCode" />
         <result column="applicant_id" property="applicantId" />
         <result column="applicant_name" property="applicantName" />
         <result column="applicant_time" property="applicantTime" />
@@ -31,7 +33,45 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, project_no, project_name, applicant_id, applicant_name, applicant_time, minio_file_name, remark, create_user_id, create_user_name, outsourcer_id, pre_start_time, pre_end_time, outsource_reason, pre_cost, approval_status, process_id, approve_situation, traceability, test_method, technique_ability, create_time, update_time
+        id, project_no, project_name, lab_code, group_code, applicant_id, applicant_name, applicant_time, minio_file_name, remark, create_user_id, create_user_name, outsourcer_id, pre_start_time, pre_end_time, outsource_reason, pre_cost, approval_status, process_id, approve_situation, traceability, test_method, technique_ability, create_time, update_time
     </sql>
 
+    <select id="selectMaxProjectNo" resultType="java.lang.Long">
+        SELECT IFNULL(max(RIGHT(project_no, 3)), 0) from biz_business_outsource_assess
+    </select>
+
+    <select id="selectBatchForApprovalList" resultMap="BaseResultMap">
+        SELECT bboa.*, bboi.outsourcer_name, bboi.director
+        FROM biz_business_outsource_assess bboa
+        LEFT JOIN biz_business_outsourcer_info bboi ON bboa.outsourcer_id = bboi.id
+        WHERE 1=1
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
+            and bboa.approval_status = #{request.approvalStatus}
+        </if>
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
+            and bboa.create_user_id = #{request.createUserId}
+        </if>
+        <if test="request != null and request.projectNo != null and request.projectNo !=''">
+            and bboa.project_no like concat('%',#{request.projectNo},'%')
+        </if>
+        <if test="request != null and request.outsourcerName != null and request.outsourcerName !=''">
+            and bboi.outsourcer_name like concat('%',#{request.outsourcerName},'%')
+        </if>
+        <if test="request != null and request.applicantName != null and request.applicantName !=''">
+            and bboa.applicant_name like concat('%',#{request.applicantName},'%')
+        </if>
+        <if test="request != null and request.applicantTimeStart != null and request.applicantTimeStart !=''">
+            and bboa.applicant_time &gt;= #{request.applicantTimeStart}
+        </if>
+        <if test="request != null and request.applicantTimeEnd != null and request.applicantTimeEnd !=''">
+            and bboa.applicant_time &lt;= #{request.applicantTimeEnd}
+        </if>
+        <if test="businessKeys != null">
+            and bboa.id in
+            <foreach collection="businessKeys" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
+        ORDER BY bboa.create_time DESC
+    </select>
 </mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceProtocolMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceProtocolMapper.xml
new file mode 100644
index 0000000..b7b2149
--- /dev/null
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceProtocolMapper.xml
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.mapper.business.BizBusinessOutsourceProtocolMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.business.BizBusinessOutsourceProtocol">
+        <id column="id" property="id" />
+        <result column="protocol_no" property="protocolNo" />
+        <result column="project_name" property="projectName" />
+        <result column="lab_code" property="labCode" />
+        <result column="group_code" property="groupCode" />
+        <result column="outsourcer_id" property="outsourcerId" />
+        <result column="remark" property="remark" />
+        <result column="outsource_no" property="outsourceNo" />
+        <result column="outsource_name" property="outsourceName" />
+        <result column="contacts" property="contacts" />
+        <result column="mobile" property="mobile" />
+        <result column="address" property="address" />
+        <result column="require_date" property="requireDate" />
+        <result column="outsource_cost" property="outsourceCost" />
+        <result column="director" property="director" />
+        <result column="item" property="item" />
+        <result column="requires" property="requires" />
+        <result column="create_user_id" property="createUserId" />
+        <result column="create_user_name" property="createUserName" />
+        <result column="approval_status" property="approvalStatus" />
+        <result column="process_id" property="processId" />
+        <result column="create_time" property="createTime" />
+        <result column="update_time" property="updateTime" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, protocol_no, project_name, lab_code, group_code, outsourcer_id, remark, outsource_no, outsource_name, contacts, mobile, address, require_date, outsource_cost, director, item, requires, create_user_id, create_user_name, approval_status, process_id, create_time, update_time
+    </sql>
+
+    <select id="selectMaxProtocolNo" resultType="java.lang.Long">
+        SELECT IFNULL(max(RIGHT(protocol_no, 3)), 0) from biz_business_outsource_protocol
+    </select>
+
+    <select id="selectBatchForApprovalList" resultMap="BaseResultMap">
+        SELECT *
+        FROM biz_business_outsource_protocol
+        WHERE 1=1
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
+            and approval_status = #{request.approvalStatus}
+        </if>
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
+            and create_user_id = #{request.createUserId}
+        </if>
+        <if test="request != null and request.protocolNo != null and request.protocolNo !=''">
+            and protocol_no like concat('%',#{request.protocolNo},'%')
+        </if>
+        <if test="request != null and request.outsourcerName != null and request.outsourcerName !=''">
+            and outsourcer_name like concat('%',#{request.outsourcerName},'%')
+        </if>
+        <if test="request != null and request.applicantName != null and request.applicantName !=''">
+            and create_user_name like concat('%',#{request.applicantName},'%')
+        </if>
+        <if test="request != null and request.applicantTimeStart != null and request.applicantTimeStart !=''">
+            and create_time &gt;= #{request.applicantTimeStart}
+        </if>
+        <if test="request != null and request.applicantTimeEnd != null and request.applicantTimeEnd !=''">
+            and create_time &lt;= #{request.applicantTimeEnd}
+        </if>
+        <if test="businessKeys != null">
+            and id in
+            <foreach collection="businessKeys" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
+        ORDER BY create_time DESC
+    </select>
+</mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourcerInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourcerInfoMapper.xml
index 510a80b..3049b54 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourcerInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourcerInfoMapper.xml
@@ -7,6 +7,8 @@
         <id column="id" property="id" />
         <result column="outsourcer_no" property="outsourcerNo" />
         <result column="outsourcer_name" property="outsourcerName" />
+        <result column="lab_code" property="labCode" />
+        <result column="group_code" property="groupCode" />
         <result column="outsourcer_brief_name" property="outsourcerBriefName" />
         <result column="outsourcer_size" property="outsourcerSize" />
         <result column="business_size" property="businessSize" />
@@ -55,32 +57,32 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, outsourcer_no, outsourcer_name, outsourcer_brief_name, outsourcer_size, business_size, grade, evaluation, tax_number, bank_account, bank_name, bank_account_number, postal_code, director, phone, fax, mobile, email, website, address_country, address_province, address_city, address_area, full_address, address_country_name, address_province_name, address_city_name, address_area_name, invoice_country, invoice_province, invoice_city, invoice_area, invoice_full_address, invoice_country_name, invoice_province_name, invoice_city_name, invoice_area_name, business_scope, business_content, minio_file_name, approval_status, process_id, remark, create_user_id, create_user_name, create_time, update_time
+        id, outsourcer_no, outsourcer_name, lab_code, group_code, outsourcer_brief_name, outsourcer_size, business_size, grade, evaluation, tax_number, bank_account, bank_name, bank_account_number, postal_code, director, phone, fax, mobile, email, website, address_country, address_province, address_city, address_area, full_address, address_country_name, address_province_name, address_city_name, address_area_name, invoice_country, invoice_province, invoice_city, invoice_area, invoice_full_address, invoice_country_name, invoice_province_name, invoice_city_name, invoice_area_name, business_scope, business_content, minio_file_name, approval_status, process_id, remark, create_user_id, create_user_name, create_time, update_time
     </sql>
 
     <select id="selectBatchForApprovalList" resultMap="BaseResultMap">
         SELECT *
         FROM biz_business_outsourcer_info
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.outsourcerNo != null and request.outsourcerNo !=''">
+        <if test="request != null and request.outsourcerNo != null and request.outsourcerNo !=''">
             and outsourcer_no like concat('%',#{request.outsourcerNo},'%')
         </if>
-        <if test="request.outsourcerName != null and request.outsourcerName !=''">
+        <if test="request != null and request.outsourcerName != null and request.outsourcerName !=''">
             and outsourcer_name like concat('%',#{request.outsourcerName},'%')
         </if>
-        <if test="request.director != null and request.director !=''">
+        <if test="request != null and request.director != null and request.director !=''">
             and director like concat('%',#{request.director},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
@@ -93,6 +95,6 @@
     </select>
 
     <select id="selectMaxNo" resultType="java.lang.Long">
-        SELECT IFNULL(max(RIGHT(outsourcer_no, 12)), 0) from biz_business_outsourcer_info
+        SELECT IFNULL(max(RIGHT(outsourcer_no, 3)), 0) from biz_business_outsourcer_info
     </select>
 </mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessSiteExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessSiteExecutiveInfoMapper.xml
index 135c5d0..3c5ae79 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessSiteExecutiveInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessSiteExecutiveInfoMapper.xml
@@ -38,25 +38,25 @@
         FROM biz_business_site_executive_info bsei
         LEFT JOIN biz_resource_customer_info rci ON bsei.customer_id = rci.id
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and bsei.approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and bsei.create_user_id = #{request.createUserId}
         </if>
-        <if test="request.siteExecutiveNo != null and request.siteExecutiveNo !=''">
+        <if test="request != null and request.siteExecutiveNo != null and request.siteExecutiveNo !=''">
             and bsei.site_executive_no like concat('%',#{request.siteExecutiveNo},'%')
         </if>
-        <if test="request.customerName != null and request.customerName !=''">
+        <if test="request != null and request.customerName != null and request.customerName !=''">
             and rci.outsourcer_name like concat('%',#{request.customerName},'%')
         </if>
-        <if test="request.applyName != null and request.applyName !=''">
+        <if test="request != null and request.applyName != null and request.applyName !=''">
             and bsei.apply_name like concat('%',#{request.applyName},'%')
         </if>
-        <if test="request.applyTimeStart != null and request.applyTimeStart !=''">
+        <if test="request != null and request.applyTimeStart != null and request.applyTimeStart !=''">
             and bsei.apply_time &gt;= #{request.applyTimeStart}
         </if>
-        <if test="request.applyTimeEnd != null and request.applyTimeEnd !=''">
+        <if test="request != null and request.applyTimeEnd != null and request.applyTimeEnd !=''">
             and bsei.apply_time &lt;= #{request.applyTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml
index 84d9e2a..6bd38a9 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml
@@ -105,6 +105,12 @@
         <if test="request.isUrgent != null and request.isUrgent !=''">
             AND bo.is_urgent = #{request.isUrgent}
         </if>
+        <if test="request.ids != null">
+            and blei.id in
+            <foreach collection="request.ids" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
         ORDER BY blei.update_time DESC
     </select>
 
@@ -137,6 +143,12 @@
         <if test="request.isUrgent != null and request.isUrgent !=''">
             AND bo.is_urgent = #{request.isUrgent}
         </if>
+        <if test="request.ids != null">
+            and blei.id in
+            <foreach collection="request.ids" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
         ORDER BY blei.update_time DESC
     </select>
 
diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardInfoMapper.xml
index 1a5551b..2ed8d17 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardInfoMapper.xml
@@ -45,12 +45,6 @@
         FROM biz_equipment_standard_info besi
         LEFT JOIN biz_equipment_standard_technology_relation bestr ON besi.standard_no = bestr.standard_no
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
-            and besi.approval_status = #{request.approvalStatus}
-        </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
-            and besi.create_user_id = #{request.createUserId}
-        </if>
         <if test="request.standardName != null and request.standardName !=''">
             and besi.standard_name like concat('%',#{request.standardName},'%')
         </if>
diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardTechnologyRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardTechnologyRelationMapper.xml
index fc7e16c..cd03c8c 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardTechnologyRelationMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardTechnologyRelationMapper.xml
@@ -6,6 +6,7 @@
     <resultMap id="BaseResultMap" type="com.casic.missiles.model.equipment.BizEquipmentStandardTechnologyRelation">
         <id column="id" property="id" />
         <result column="technology_file_id" property="technologyFileId" />
+        <result column="technology_file_no" property="technologyFileNo" />
         <result column="technology_file_name" property="technologyFileName" />
         <result column="standard_id" property="standardId" />
         <result column="standard_no" property="standardNo" />
@@ -14,7 +15,7 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, technology_file_id, technology_file_name, standard_id, remark
+        id, technology_file_id, technology_file_no, technology_file_name, standard_id, remark
     </sql>
 
 </mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceAuthorizeOrderMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceAuthorizeOrderMapper.xml
index ac5176c..554fe65 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceAuthorizeOrderMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceAuthorizeOrderMapper.xml
@@ -32,22 +32,22 @@
         SELECT *
         FROM biz_resource_authorize_order
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.orderNo != null and request.orderNo !=''">
+        <if test="request != null and request.orderNo != null and request.orderNo !=''">
             and order_no like concat('%',#{request.orderNo},'%')
         </if>
-        <if test="request.createUserName != null and request.createUserName !=''">
+        <if test="request != null and request.createUserName != null and request.createUserName !=''">
             and create_user_name like concat('%',#{request.createUserName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerExamineFormMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerExamineFormMapper.xml
index ab242f6..af7f98f 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerExamineFormMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerExamineFormMapper.xml
@@ -41,28 +41,28 @@
         SELECT *
         FROM biz_resource_customer_examine_form
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.formNo != null and request.formNo !=''">
+        <if test="request != null and request.formNo != null and request.formNo !=''">
             and form_no like concat('%',#{request.formNo},'%')
         </if>
-        <if test="request.labCode != null and request.labCode !=''">
+        <if test="request != null and request.labCode != null and request.labCode !=''">
             and lab_code like concat('%',#{request.labCode},'%')
         </if>
-        <if test="request.groupCode != null and request.groupCode !=''">
+        <if test="request != null and request.groupCode != null and request.groupCode !=''">
             and group_code like concat('%',#{request.groupCode},'%')
         </if>
-        <if test="request.createUserName != null and request.createUserName !=''">
+        <if test="request != null and request.createUserName != null and request.createUserName !=''">
             and create_user_name like concat('%',#{request.createUserName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerInfoMapper.xml
index fa8ffbc..06a2798 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerInfoMapper.xml
@@ -33,25 +33,25 @@
         SELECT *
         FROM biz_resource_customer_info
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.customerNo != null and request.customerNo !=''">
+        <if test="request != null and request.customerNo != null and request.customerNo !=''">
             and customer_no like concat('%',#{request.customerNo},'%')
         </if>
-        <if test="request.customerName != null and request.customerName !=''">
+        <if test="request != null and request.customerName != null and request.customerName !=''">
             and customer_name like concat('%',#{request.customerName},'%')
         </if>
-        <if test="request.contacts != null and request.contacts !=''">
+        <if test="request != null and request.contacts != null and request.contacts !=''">
             and contacts like concat('%',#{request.contacts},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerSuggestFormMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerSuggestFormMapper.xml
index 28f5bb2..1806662 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerSuggestFormMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerSuggestFormMapper.xml
@@ -33,28 +33,28 @@
         SELECT *
         FROM biz_resource_customer_suggest_form
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.formNo != null and request.formNo !=''">
+        <if test="request != null and request.formNo != null and request.formNo !=''">
             and form_no like concat('%',#{request.formNo},'%')
         </if>
-        <if test="request.customerName != null and request.customerName !=''">
+        <if test="request != null and request.customerName != null and request.customerName !=''">
             and customer_name like concat('%',#{request.customerName},'%')
         </if>
-        <if test="request.customerDeptName != null and request.customerDeptName !=''">
+        <if test="request != null and request.customerDeptName != null and request.customerDeptName !=''">
             and customer_dept_name like concat('%',#{request.customerDeptName},'%')
         </if>
-        <if test="request.createUserName != null and request.createUserName !=''">
+        <if test="request != null and request.createUserName != null and request.createUserName !=''">
             and create_user_name like concat('%',#{request.createUserName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSealUseNoteMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSealUseNoteMapper.xml
index ab37bc1..b02bb33 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSealUseNoteMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSealUseNoteMapper.xml
@@ -29,32 +29,32 @@
     </sql>
 
     <select id="selectBatchForApprovalList" resultMap="BaseResultMap">
-        SELECT *
+        SELECT brsun.*, brsi.seal_name, brsi.seal_type, brsi.approver_name
         FROM biz_resource_seal_use_note brsun
         JOIN biz_resource_seal_info brsi ON brsun.seal_id = brsi.id
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and brsun.approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and brsun.create_user_id = #{request.createUserId}
         </if>
-        <if test="request.sealName != null and request.sealName !=''">
+        <if test="request != null and request.sealName != null and request.sealName !=''">
             and brsi.seal_name like concat('%',#{request.sealName},'%')
         </if>
-        <if test="request.sealType != null and request.sealType !=''">
+        <if test="request != null and request.sealType != null and request.sealType !=''">
             and brsi.seal_type = #{request.sealType}
         </if>
-        <if test="request.applyDeptName != null and request.applyDeptName !=''">
+        <if test="request != null and request.applyDeptName != null and request.applyDeptName !=''">
             and brsun.apply_dept_name like concat('%',#{request.applyDeptName},'%')
         </if>
-        <if test="request.applyUserName != null and request.applyUserName !=''">
+        <if test="request != null and request.applyUserName != null and request.applyUserName !=''">
             and brsun.apply_user_name like concat('%',#{request.applyUserName},'%')
         </if>
-        <if test="request.applyTimeStart != null and request.applyTimeStart !=''">
+        <if test="request != null and request.applyTimeStart != null and request.applyTimeStart !=''">
             and brsun.apply_time &gt;= #{request.applyTimeStart}
         </if>
-        <if test="request.applyTimeEnd != null and request.applyTimeEnd !=''">
+        <if test="request != null and request.applyTimeEnd != null and request.applyTimeEnd !=''">
             and brsun.apply_time &lt;= #{request.applyTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml
index 119bf7d..4f8392a 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml
@@ -31,6 +31,12 @@
         <if test="request.deptName != null and request.deptName !=''">
             and brsi.dept_name like concat('%',#{request.deptName},'%')
         </if>
+        <if test="request.ids != null">
+            and brsv.id in
+            <foreach collection="request.ids" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
         ORDER BY brsv.grant_date DESC
     </select>
 
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSupplierInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSupplierInfoMapper.xml
index fe8d399..e8ce7ef 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSupplierInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSupplierInfoMapper.xml
@@ -48,28 +48,28 @@
         SELECT *
         FROM biz_resource_supplier_info
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.supplierNo != null and request.supplierNo !=''">
+        <if test="request != null and request.supplierNo != null and request.supplierNo !=''">
             and supplier_no like concat('%',#{request.supplierNo},'%')
         </if>
-        <if test="request.supplierName != null and request.supplierName !=''">
+        <if test="request != null and request.supplierName != null and request.supplierName !=''">
             and supplier_name like concat('%',#{request.supplierName},'%')
         </if>
-        <if test="request.director != null and request.director !=''">
+        <if test="request != null and request.director != null and request.director !=''">
             and director like concat('%',#{request.director},'%')
         </if>
-        <if test="request.supplierType != null and request.supplierType !=''">
+        <if test="request != null and request.supplierType != null and request.supplierType !=''">
             and supplier_type = #{request.supplierType}
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/EnvLocationInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/EnvLocationInfoMapper.xml
new file mode 100644
index 0000000..68bcf10
--- /dev/null
+++ b/casic-metering-dao/src/main/resources/mapper/resource/EnvLocationInfoMapper.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.mapper.resource.EnvLocationInfoMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.resource.EnvLocationInfo">
+        <id column="id" property="id" />
+        <result column="location_no" property="locationNo" />
+        <result column="location_name" property="locationName" />
+        <result column="location_position" property="locationPosition" />
+        <result column="create_user_id" property="createUserId" />
+        <result column="create_user" property="createUser" />
+        <result column="create_time" property="createTime" />
+        <result column="update_time" property="updateTime" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, location_no, location_name, location_position, create_user_id, create_user, create_time, update_time
+    </sql>
+
+    <select id="selectLocationListPage" resultType="com.casic.missiles.dto.resource.environment.LocationListResponse">
+        SELECT *
+        FROM env_location_info
+        WHERE 1=1
+        <if test="request.locationNo != null and request.locationNo !=''">
+            AND location_no LIKE concat('%',#{request.locationNo},'%')
+        </if>
+        <if test="request.locationName != null and request.locationName !=''">
+            AND location_name LIKE concat('%',#{request.locationName},'%')
+        </if>
+        ORDER BY create_time DESC
+    </select>
+
+</mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml
index b28c18f..8854047 100644
--- a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml
@@ -11,7 +11,6 @@
         <result column="sign_desc" property="signDesc" />
         <result column="sign_director" property="signDirector" />
         <result column="sign_user_id" property="signUserId" />
-        <result column="sign_type" property="signType" />
         <result column="minio_file_name" property="minioFileName" />
         <result column="create_time" property="createTime" />
         <result column="update_time" property="updateTime" />
@@ -28,7 +27,6 @@
         <result column="sign_name" property="signName" />
         <result column="sign_desc" property="signDesc" />
         <result column="sign_director" property="signDirector" />
-        <result column="sign_type" property="signType" />
         <result column="sign_user_id" property="signUserId" />
         <result column="minio_file_name" property="minioFileName" />
         <result column="create_time" property="createTime" />
@@ -62,4 +60,58 @@
         JOIN system_sign_user_relation ssur ON ss.id = ssur.sign_id
         WHERE ssur.user_id = #{userId}
     </select>
+
+    <select id="selectSignListPage" resultMap="BaseResultMap">
+        SELECT ss.*, sd.SIMPLE_NAME AS deptName
+        FROM system_sign ss
+        LEFT JOIN sys_user su ON su.id = ss.sign_user_id
+        LEFT JOIN sys_dept sd ON sd.id = su.dept_id
+        WHERE 1=1
+        <if test="request.signNo != null and request.signNo !=''">
+            AND ss.sign_no LIKE concat('%',#{request.signNo},'%')
+        </if>
+        <if test="request.signName != null and request.signName !=''">
+            AND ss.sign_name LIKE concat('%',#{request.signName},'%')
+        </if>
+        <if test="request.signDirector != null and request.signDirector !=''">
+            AND ss.sign_director LIKE concat('%',#{request.signDirector},'%')
+        </if>
+        <if test="request.signUserId != null and request.signUserId !=''">
+            AND ss.sign_user_id = #{request.signUserId}
+        </if>
+        <if test="request.createStartTime != null and request.createStartTime !=''">
+            AND DATE_FORMAT(ss.create_time,'%Y-%m-%d') &gt;= DATE_FORMAT(#{request.createStartTime},'%Y-%m-%d')
+        </if>
+        <if test="request.createEndTime != null and request.createEndTime !=''">
+            AND DATE_FORMAT(ss.create_time,'%Y-%m-%d')  &lt;= DATE_FORMAT(#{request.createEndTime},'%Y-%m-%d')
+        </if>
+        ORDER BY ss.create_time DESC
+    </select>
+
+    <select id="selectSignList" resultMap="BaseResultMap">
+        SELECT ss.*, sd.SIMPLE_NAME AS deptName
+        FROM system_sign ss
+        LEFT JOIN sys_user su ON su.id = ss.sign_user_id
+        LEFT JOIN sys_dept sd ON sd.id = su.dept_id
+        WHERE 1=1
+        <if test="request.signNo != null and request.signNo !=''">
+            AND ss.sign_no LIKE concat('%',#{request.signNo},'%')
+        </if>
+        <if test="request.signName != null and request.signName !=''">
+            AND ss.sign_name LIKE concat('%',#{request.signName},'%')
+        </if>
+        <if test="request.signDirector != null and request.signDirector !=''">
+            AND ss.sign_director LIKE concat('%',#{request.signDirector},'%')
+        </if>
+        <if test="request.signUserId != null and request.signUserId !=''">
+            AND ss.sign_user_id = #{request.signUserId}
+        </if>
+        <if test="request.createStartTime != null and request.createStartTime !=''">
+            AND DATE_FORMAT(ss.create_time,'%Y-%m-%d') &gt;= DATE_FORMAT(#{request.createStartTime},'%Y-%m-%d')
+        </if>
+        <if test="request.createEndTime != null and request.createEndTime !=''">
+            AND DATE_FORMAT(ss.create_time,'%Y-%m-%d')  &lt;= DATE_FORMAT(#{request.createEndTime},'%Y-%m-%d')
+        </if>
+        ORDER BY ss.create_time DESC
+    </select>
 </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 515050a..60f530b 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
@@ -47,8 +47,8 @@
     String STORAGE_LOCATION = "bizStorageLocation";
     //计量专业
     String MEASURE_MAJOR = "bizMeasureMajor";
-    //管理状态
-    String MANAGER_STATE = "bizManagerState";
+    //标准装置管理状态
+    String STANDARD_MANAGER_STATE = "bizStandardManagerState";
 
     /**
      * 资源管理 字典code
@@ -95,8 +95,6 @@
     String MEASURE_STATUS = "measureStatus";
     //检定方式
     String MEASURE_TYPE = "measureType";
-    //标识打印标志类型
-    String IDENTIFY_PRINT_TYPE = "bizBusinessIdentify";
     //变更类型
     String REPORT_CHANGE_TYPE = "bizCertChangeType";
     //规模类型
@@ -111,19 +109,24 @@
     String MEASURE_CATEGORY = "measureCategory";
     //检定结果
     String MEASURE_RESULT = "measureResult";
+    //分包原因
+    String OUTSOURCE_REASON = "outsourceReason";
+
+    /**
+     * 系统管理
+     */
+    String TEMPLATE_TYPE = "templateType";
+
 
     /**
      * 标准装置 字典code
      */
     //类别
     String STANDARD_CATEGORY = "standardCategory";
-    //管理状态
-    String STANDARD_MANAGER_STATE = "standardManagerState";
     //标准等级
     String STANDARD_LEVEL = "standardLevel";
     //传递范围
     String STANDARD_TRANSMIT_RANGE = "transmitRange";
-
     //资本来源
     String CAPITAL_SOURCE = "capitalSource";
     //标准装置-申请类型
@@ -148,8 +151,6 @@
     String CERTIFICATE_CLASS = "certificationClass";
     //证书管理-检校专业
     String CALIBRATION_MAJOR = "calibrationMajor";
-    //分包原因
-    String OUTSOURCE_REASON = "outsourceReason";
 
     /**
      * 工作台
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/BaseApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/BaseApprovalListRequest.java
index 73c12c1..80d7424 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/BaseApprovalListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/BaseApprovalListRequest.java
@@ -6,6 +6,7 @@
 
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotEmpty;
+import java.util.List;
 
 /**
  * @Description:
@@ -19,14 +20,14 @@
      * 表单id
      */
     @NotBlank(message = "表单id不能为空")
-    @ApiModelProperty(value = "表单id（流程定义对应的表单id，等价于业务id）", dataType = "String")
+    @ApiModelProperty(value = "表单id（流程定义对应的表单id，等价于业务id），导出接口不用传", dataType = "String")
     private String formId;
 
     /**
      * 审批状态类型，对应ApprovalStatusEnum
      */
     @NotEmpty(message = "审批状态类型不能为空")
-    @ApiModelProperty(value = "审批状态类型code", dataType = "String")
+    @ApiModelProperty(value = "审批状态类型code，导出接口不用传", dataType = "String")
     private String approvalStatus;
 
     @ApiModelProperty(hidden = true)
@@ -34,4 +35,7 @@
 
     @ApiModelProperty(hidden = true)
     private Long createUserId;
+
+    @ApiModelProperty(value = "导出ids", dataType = "List")
+    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificatePrintApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificatePrintApprovalListRequest.java
index b93d1c9..3cc2f4e 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificatePrintApprovalListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificatePrintApprovalListRequest.java
@@ -5,8 +5,6 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import java.util.List;
-
 /**
  * @Description:
  * @Author: wangpeng
@@ -38,7 +36,4 @@
 
     @ApiModelProperty(value = "创建结束时间", dataType = "String")
     private String createTimeEnd;
-
-    @ApiModelProperty(value = "导出ids", dataType = "List")
-    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportApprovalListRequest.java
index 4f7a038..c115847 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportApprovalListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportApprovalListRequest.java
@@ -5,8 +5,6 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import java.util.List;
-
 /**
  * @Description:
  * @Author: wangpeng
@@ -15,6 +13,8 @@
 @ApiModel
 @Data
 public class CertificateReportApprovalListRequest extends BaseApprovalListRequest {
+    @ApiModelProperty(value = "委托方id", dataType = "String")
+    private Long customerId;
 
     @ApiModelProperty(value = "证书报告编号", dataType = "String")
     private String certificateReportNo;
@@ -37,6 +37,4 @@
     @ApiModelProperty(value = "检校结束时间", dataType = "String")
     private String calibrationTimeEnd;
 
-    @ApiModelProperty(value = "导出ids", dataType = "List")
-    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/identify/IdentifyListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/identify/IdentifyListRequest.java
index 1b87ae6..f019203 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/identify/IdentifyListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/identify/IdentifyListRequest.java
@@ -4,6 +4,8 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * @Description:
  * @Author: wangpeng
@@ -26,4 +28,7 @@
 
     @ApiModelProperty(value = "打印结束时间", dataType = "String")
     private String createTimeEnd;
+
+    @ApiModelProperty(value = "导出ids", dataType = "List")
+    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListRequest.java
index 1264883..62415fb 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListRequest.java
@@ -7,6 +7,7 @@
 import lombok.Data;
 
 import javax.validation.constraints.NotBlank;
+import java.util.List;
 
 @Data
 @ApiModel
@@ -37,4 +38,6 @@
     @ApiModelProperty(value = "是否加急（1是0否null全部）", dataType = "Integer")
     private String isUrgent;
 
+    @ApiModelProperty(value = "导出ids", dataType = "List")
+    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListRequest.java
index 5201d7b..499760a 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListRequest.java
@@ -17,6 +17,9 @@
     @ApiModelProperty(value = "任务单编号", dataType = "String")
     private String orderNo;
 
+    @ApiModelProperty(value = "委托方id", dataType = "Long")
+    private Long customerId;
+
     @ApiModelProperty(value = "委托方名称", dataType = "String")
     private String customerName;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OrderSampleDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OrderSampleDTO.java
new file mode 100644
index 0000000..796edc0
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OrderSampleDTO.java
@@ -0,0 +1,19 @@
+package com.casic.missiles.dto.business.outsource;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/8/24 11:38
+ */
+@ApiModel
+@Data
+public class OrderSampleDTO {
+    @ApiModelProperty(value = "任务单id", dataType = "Long")
+    private Long orderId;
+    @ApiModelProperty(value = "受检设备id", dataType = "Long")
+    private Long sampleId;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceAssessApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceAssessApprovalListRequest.java
new file mode 100644
index 0000000..9a930c3
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceAssessApprovalListRequest.java
@@ -0,0 +1,30 @@
+package com.casic.missiles.dto.business.outsource;
+
+import com.casic.missiles.dto.BaseApprovalListRequest;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/8/24 11:01
+ */
+@ApiModel
+@Data
+public class OutsourceAssessApprovalListRequest extends BaseApprovalListRequest {
+    @ApiModelProperty(value = "评审表编号", dataType = "String")
+    private String projectNo;
+
+    @ApiModelProperty(value = "分包机构名称", dataType = "String")
+    private String outsourcerName;
+
+    @ApiModelProperty(value = "申请人", dataType = "String")
+    private String applicantName;
+
+    @ApiModelProperty(value = "申请时间开始", dataType = "String")
+    private String applicantTimeStart;
+
+    @ApiModelProperty(value = "申请时间结束", dataType = "String")
+    private String applicantTimeEnd;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceAssessSaveResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceAssessSaveResponse.java
new file mode 100644
index 0000000..8bf9aad
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceAssessSaveResponse.java
@@ -0,0 +1,20 @@
+package com.casic.missiles.dto.business.outsource;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/8/14 16:17
+ */
+@ApiModel
+@Data
+public class OutsourceAssessSaveResponse {
+    @ApiModelProperty(value = "主键id", dataType = "Long")
+    private Long id;
+
+    @ApiModelProperty(value = "编号", dataType = "String")
+    private String projectNo;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProtocolApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProtocolApprovalListRequest.java
new file mode 100644
index 0000000..0f32331
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProtocolApprovalListRequest.java
@@ -0,0 +1,30 @@
+package com.casic.missiles.dto.business.outsource;
+
+import com.casic.missiles.dto.BaseApprovalListRequest;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/8/24 15:01
+ */
+@ApiModel
+@Data
+public class OutsourceProtocolApprovalListRequest extends BaseApprovalListRequest {
+    @ApiModelProperty(value = "协议书编号", dataType = "String")
+    private String protocolNo;
+
+    @ApiModelProperty(value = "分包方名称", dataType = "String")
+    private String outsourcerName;
+
+    @ApiModelProperty(value = "申请人", dataType = "String")
+    private String applicantName;
+
+    @ApiModelProperty(value = "申请时间开始", dataType = "String")
+    private String applicantTimeStart;
+
+    @ApiModelProperty(value = "申请时间结束", dataType = "String")
+    private String applicantTimeEnd;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProtocolSaveResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProtocolSaveResponse.java
new file mode 100644
index 0000000..e324967
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProtocolSaveResponse.java
@@ -0,0 +1,20 @@
+package com.casic.missiles.dto.business.outsource;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/8/14 16:17
+ */
+@ApiModel
+@Data
+public class OutsourceProtocolSaveResponse {
+    @ApiModelProperty(value = "主键id", dataType = "Long")
+    private Long id;
+
+    @ApiModelProperty(value = "编号", dataType = "String")
+    private String protocolNo;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveApprovalListRequest.java
index f29f4e4..7047c28 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveApprovalListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveApprovalListRequest.java
@@ -5,8 +5,6 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import java.util.List;
-
 /**
  * @Description: 现场检测审批列表请求实体
  * @Author: wangpeng
@@ -30,7 +28,4 @@
     @ApiModelProperty(value = "申请时间结束", dataType = "String")
     private String applyTimeEnd;
 
-    @ApiModelProperty(value = "导出ids", dataType = "List")
-    private List<Long> ids;
-
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveDetailResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveDetailResponse.java
index 1f28752..394c934 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveDetailResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveDetailResponse.java
@@ -12,6 +12,18 @@
     @ApiModelProperty(value = "id，更新/删除使用参数", dataType = "Long")
     private Long id;
 
+    @ApiModelProperty(value = "实验室代码(字典code)", dataType = "String")
+    private String labCode;
+
+    @ApiModelProperty(value = "实验室代码(字典value)", dataType = "String")
+    private String labCodeName;
+
+    @ApiModelProperty(value = "组别代码(字典code)", dataType = "String")
+    private String groupCode;
+
+    @ApiModelProperty(value = "组别代码(字典value)", dataType = "String")
+    private String groupCodeName;
+
     @ApiModelProperty(value = "审批编号", dataType = "String")
     private String siteExecutiveNo;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/environment/LocationListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/environment/LocationListRequest.java
new file mode 100644
index 0000000..13d03c3
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/environment/LocationListRequest.java
@@ -0,0 +1,20 @@
+package com.casic.missiles.dto.resource.environment;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/6/8 13:56
+ */
+@ApiModel
+@Data
+public class LocationListRequest {
+    @ApiModelProperty(value = "地点编号", dataType = "String")
+    private String locationNo;
+
+    @ApiModelProperty(value = "地点名称", dataType = "String")
+    private String locationName;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/environment/LocationListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/environment/LocationListResponse.java
new file mode 100644
index 0000000..4c531af
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/environment/LocationListResponse.java
@@ -0,0 +1,78 @@
+package com.casic.missiles.dto.resource.environment;
+
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
+import com.baomidou.mybatisplus.annotation.TableField;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description: 地点列表响应实体
+ * @Author: wangpeng
+ * @Date: 2023/6/8 13:53
+ */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
+@ApiModel
+@Data
+public class LocationListResponse {
+    @ApiModelProperty(value = "主键id", dataType = "Long")
+    private Long id;
+
+    /**
+     * 地点编号
+     */
+    @ExcelProperty("地点编号")
+    @ApiModelProperty(value = "地点编号", dataType = "String")
+    private String locationNo;
+
+    /**
+     * 地点名称
+     */
+    @ExcelProperty("地点名称")
+    @ApiModelProperty(value = "地点名称", dataType = "String")
+    private String locationName;
+
+    /**
+     * 地点位置
+     */
+    @ExcelProperty("地点位置")
+    @ApiModelProperty(value = "地点位置", dataType = "String")
+    private String locationPosition;
+
+    /**
+     * 创建人id
+     */
+    @ApiModelProperty(value = "创建人id", dataType = "Long")
+    private Long createUserId;
+
+    /**
+     * 创建人
+     */
+    @ExcelProperty("创建人")
+    @ApiModelProperty(value = "创建人", dataType = "String")
+    @TableField("create_user")
+    private String createUser;
+
+    /**
+     * 创建时间
+     */
+    @ExcelProperty("创建时间")
+    @ApiModelProperty(value = "创建时间", dataType = "String")
+    private String createTime;
+
+    /**
+     * 更新时间
+     */
+    @ApiModelProperty(value = "更新时间", dataType = "String")
+    private String updateTime;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertRequest.java
index 9a7f6c6..c827915 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertRequest.java
@@ -4,6 +4,8 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * @Description:
  * @Author: wangpeng
@@ -16,4 +18,7 @@
     private String name;
     @ApiModelProperty(value = "部门名", dataType = "String")
     private String deptName;
+
+    @ApiModelProperty(value = "导出ids", dataType = "List")
+    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertResponse.java
index f78b159..8f2f79e 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertResponse.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.dto.resource.staff;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.casic.missiles.annotation.DictCodeField;
 import com.casic.missiles.constants.MeterDictCode;
 import io.swagger.annotations.ApiModel;
@@ -13,12 +20,18 @@
  * @Author: wangpeng
  * @Date: 2023/7/27 15:13
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @ApiModel
 @Data
 public class StaffCertResponse {
     /**
      * 人员编号
      */
+    @ExcelProperty(value = "人员编号",order = 0)
     @NotEmpty(message = "人员编号不能为空")
     @ApiModelProperty(value = "人员编号", dataType = "String")
     private String staffNo;
@@ -26,6 +39,7 @@
     /**
      * 姓名
      */
+    @ExcelProperty(value = "姓名",order = 1)
     @ApiModelProperty(value = "姓名", dataType = "String")
     private String staffName;
 
@@ -54,6 +68,7 @@
     /**
      * 部门名字
      */
+    @ExcelProperty(value = "工作部门",order = 2)
     @ApiModelProperty(value = "部门名字", dataType = "String")
     private String deptName;
 
@@ -66,6 +81,7 @@
     /**
      * 计量专业
      */
+    @ExcelProperty(value = "计量专业",order = 3)
     @ApiModelProperty(value = "计量专业", dataType = "String")
     private String major;
 
@@ -110,6 +126,7 @@
     /**
      * 证书号
      */
+    @ExcelProperty(value = "证号",order = 4)
     @ApiModelProperty(value = "证书号", dataType = "String")
     private String certNo;
 
@@ -122,12 +139,14 @@
     /**
      * 有效日期
      */
+    @ExcelProperty(value = "证书有效期",order = 6)
     @ApiModelProperty(value = "有效日期", dataType = "String")
     private String effectiveDate;
 
     /**
      * 发放日期
      */
+    @ExcelProperty(value = "发证日期",order = 5)
     @ApiModelProperty(value = "发放日期", dataType = "String")
     private String grantDate;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffListRequest.java
index 7c4afb3..0a1194a 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffListRequest.java
@@ -4,6 +4,8 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * @Description:
  * @Author: wangpeng
@@ -18,4 +20,7 @@
     private String deptName;
     @ApiModelProperty(value = "部门id", dataType = "Long")
     private Long deptId;
+
+    @ApiModelProperty(value = "导出ids", dataType = "List")
+    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/TrainListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/TrainListRequest.java
index f68597b..6321f8b 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/TrainListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/TrainListRequest.java
@@ -14,6 +14,8 @@
 public class TrainListRequest {
     @ApiModelProperty(value = "训练登记表编号", dataType = "String")
     private String trainNo;
+    @ApiModelProperty(value = "值班领导", dataType = "String")
+    private String dutyLeader;
     @ApiModelProperty(value = "创建开始时间", dataType = "String")
     private String createTimeStart;
     @ApiModelProperty(value = "创建结束时间", dataType = "String")
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/SignAddRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/SignAddRequest.java
index 117be34..d71055c 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/SignAddRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/SignAddRequest.java
@@ -43,13 +43,6 @@
     private Long signUserId;
 
     /**
-     * 签章或签名-字典code
-     */
-    @NotBlank(message = "类型不能为空")
-    @ApiModelProperty(value = "签名/签章-字典code", dataType = "String", required = true)
-    private String signType;
-
-    /**
      * minio存储文件名
      */
     @ApiModelProperty(value = "上传文件返回名称", dataType = "String")
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateAddRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateAddRequest.java
index aff1265..6316648 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateAddRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateAddRequest.java
@@ -17,30 +17,28 @@
 @Data
 public class TemplateAddRequest extends BaseSystemRequest {
     /**
-     * 原始记录模板/证书报告模板名称
+     * 模板名称
      */
     @ApiModelProperty(value = "名称", dataType = "String", required = true)
     @NotBlank(message = "名称不能为空")
     private String templateName;
 
     /**
-     * 原始记录模板/证书报告模板描述
+     * 模板描述
      */
     @ApiModelProperty(value = "描述", dataType = "String")
     private String templateDesc;
 
     /**
-     * 原始记录模板/证书报告模板创建人
+     * 创建人
      */
     @ApiModelProperty(value = "创建人", dataType = "String", required = true)
     @NotBlank(message = "创建人不能为空")
     private String templateCreator;
 
-    /**
-     * 原始记录模板/证书报告模板-字典code
-     */
-    @NotBlank(message = "类型不能为空")
-    @ApiModelProperty(value = "原始记录模板/证书报告模板-字典code", dataType = "String", required = true)
+
+    @NotBlank(message = "模板类型不能为空")
+    @ApiModelProperty(value = "模板类型(字典code)", dataType = "String", required = true)
     private String templateType;
 
     /**
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateListRequest.java
index eec5a1e..6d17bbe 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateListRequest.java
@@ -1,11 +1,12 @@
 package com.casic.missiles.dto.system;
 
+import com.casic.missiles.annotation.DictCodeField;
+import com.casic.missiles.constants.MeterDictCode;
 import com.casic.missiles.dto.BaseSystemRequest;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import javax.validation.constraints.NotBlank;
 import java.util.List;
 
 /**
@@ -19,8 +20,8 @@
     /**
      * 类型
      */
-//    @ApiModelProperty(value = "类型-字典code", dataType = "String", required = true)
-    @NotBlank(message = "类型不能为空")
+    @DictCodeField(message = "模板类型不合法", cacheName = MeterDictCode.TEMPLATE_TYPE)
+    @ApiModelProperty(value = "模板类型(字典code)", dataType = "String")
     private String templateType;
 
     /**
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificateChangeApply.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificateChangeApply.java
index 9216308..36923fd 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificateChangeApply.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificateChangeApply.java
@@ -1,11 +1,19 @@
 package com.casic.missiles.model.business;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 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 com.casic.missiles.dto.BaseRequest;
+import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -20,6 +28,12 @@
  * @author wangpeng
  * @since 2023-08-15
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
+@ApiModel
 @Data
 @TableName("biz_business_certificate_change_apply")
 public class BizBusinessCertificateChangeApply extends BaseRequest implements Serializable {
@@ -33,6 +47,7 @@
     /**
      * 申请单编号
      */
+    @ExcelProperty(value = "申请单编号", order = 1)
     @ApiModelProperty(value = "申请单编号", dataType = "String")
     @TableField("change_apply_no")
     private String changeApplyNo;
@@ -40,6 +55,7 @@
     /**
      * 申请单名字
      */
+    @ExcelProperty(value = "申请单名称", order = 2)
     @ApiModelProperty(value = "申请单名字", dataType = "String")
     @TableField("change_apply_name")
     private String changeApplyName;
@@ -54,6 +70,7 @@
     /**
      * 更换证书编号
      */
+    @ExcelProperty(value = "更换证书编号", order = 3)
     @ApiModelProperty(value = "更换证书编号", dataType = "String")
     @TableField("change_report_no")
     private String changeReportNo;
@@ -61,7 +78,8 @@
     /**
      * 更换证书名字
      */
-    @ApiModelProperty(value = "更换证书名字", dataType = "String")
+    @ExcelProperty(value = "更换证书/报告名称", order = 4)
+    @ApiModelProperty(value = "更换证书/报告名称", dataType = "String")
     @TableField("change_report_name")
     private String changeReportName;
 
@@ -73,6 +91,7 @@
     @TableField("change_type")
     private String changeType;
 
+    @ExcelProperty(value = "变更类型", order = 5)
     @ApiModelProperty(value = "变更类型(字典value)", dataType = "String")
     @TableField(exist = false)
     private String changeTypeName;
@@ -142,13 +161,15 @@
     /**
      * 创建用户名字
      */
-    @ApiModelProperty(value = "创建用户名字", dataType = "String")
+    @ExcelProperty(value = "创建人", order = 6)
+    @ApiModelProperty(value = "创建人名字", dataType = "String")
     @TableField("create_user_name")
     private String createUserName;
 
     /**
      * 创建时间
      */
+    @ExcelProperty(value = "创建时间", order = 7)
     @ApiModelProperty(value = "创建时间", dataType = "String")
     @TableField("create_time")
     private String createTime;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificateReport.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificateReport.java
index f01db9e..db06018 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificateReport.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificateReport.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.model.business;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -22,6 +29,11 @@
  * @author wangpeng
  * @since 2023-08-14
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @ApiModel
 @Data
 @TableName("biz_business_certificate_report")
@@ -36,6 +48,7 @@
     /**
      * 证书报告编号
      */
+    @ExcelProperty(value = "证书报告编号", order = 1)
     @ApiModelProperty(value = "证书报告编号", dataType = "String")
     @TableField("certificate_report_no")
     private String certificateReportNo;
@@ -43,6 +56,7 @@
     /**
      * 证书报告名称
      */
+    @ExcelProperty(value = "证书报告名称", order = 2)
     @ApiModelProperty(value = "证书报告名称", dataType = "String")
     @TableField("certificate_report_name")
     private String certificateReportName;
@@ -62,6 +76,7 @@
     @TableField("measure_category")
     private String measureCategory;
 
+    @ExcelProperty(value = "检校类别", order = 6)
     @ApiModelProperty(value = "检校类别(字典value)", dataType = "String")
     @TableField(exist = false)
     private String measureCategoryName;
@@ -69,6 +84,7 @@
     /**
      * 检校时间
      */
+    @ExcelProperty(value = "检校时间", order = 8)
     @ApiModelProperty(value = "检校时间", dataType = "String")
     @TableField("calibration_time")
     private String calibrationTime;
@@ -267,18 +283,22 @@
     @TableField(exist = false)
     private Integer decisionItem;
 
-    @ApiModelProperty(value = "设备样品编号（列表返回参数）", dataType = "String")
+    @ExcelProperty(value = "被检设备统一编号", order = 3)
+    @ApiModelProperty(value = "被检设备统一编号（列表返回参数）", dataType = "String")
     @TableField(exist = false)
     private String sampleNo;
 
-    @ApiModelProperty(value = "设备样品名称（列表返回参数）", dataType = "String")
+    @ExcelProperty(value = "被检设备名称", order = 4)
+    @ApiModelProperty(value = "被检设备名称（列表返回参数）", dataType = "String")
     @TableField(exist = false)
     private String sampleName;
 
-    @ApiModelProperty(value = "设备样品规格型号（列表返回参数）", dataType = "String")
+    @ExcelProperty(value = "规格型号", order = 5)
+    @ApiModelProperty(value = "规格型号（列表返回参数）", dataType = "String")
     @TableField(exist = false)
     private String sampleModel;
 
+    @ExcelProperty(value = "检定员", order = 7)
     @ApiModelProperty(value = "检定员名字（列表返回参数）", dataType = "String")
     @TableField(exist = false)
     private String staffName;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessIdentifyInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessIdentifyInfo.java
index 46bfba5..f1a9bec 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessIdentifyInfo.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessIdentifyInfo.java
@@ -1,10 +1,15 @@
 package com.casic.missiles.model.business;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 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;
 
@@ -20,6 +25,11 @@
  * @author wangpeng
  * @since 2023-08-15
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @Data
 @TableName("biz_business_identify_info")
 public class BizBusinessIdentifyInfo implements Serializable {
@@ -33,6 +43,7 @@
     /**
      * 记录编号
      */
+    @ExcelProperty(value = "记录编号", order = 1)
     @ApiModelProperty(value = "记录编号", dataType = "String")
     @TableField("record_no")
     private String recordNo;
@@ -41,20 +52,15 @@
      * 标志类型(字典code)
      */
     @NotEmpty(message = "标志类型不能为空")
-    @ApiModelProperty(value = "标志类型(字典code)", dataType = "String")
-    @DictCodeField(message = "标志类型不合法", cacheName = MeterDictCode.IDENTIFY_PRINT_TYPE)
+    @ApiModelProperty(value = "标志类型(直接存计量标识/使用状态/校准状态的字典value)", dataType = "String")
     @TableField("identify_type")
     private String identifyType;
 
-    @ApiModelProperty(value = "标志类型(字典value)", dataType = "String")
-    @TableField(exist = false)
-    private String identifyTypeName;
-
     /**
      * 设备id(可以是受检设备/设备台账)
      */
     @NotNull(message = "设备id不能为空")
-    @ApiModelProperty(value = "设备id(可以是受检设备/设备台账)", dataType = "String")
+    @ApiModelProperty(value = "设备id(可以是受检设备/设备台账)", dataType = "Long")
     @TableField("device_id")
     private Long deviceId;
 
@@ -66,29 +72,32 @@
     @TableField("device_type")
     private String deviceType;
 
+    @ExcelProperty(value = "统一编号", order = 3)
     @NotEmpty(message = "设备编号不能为空")
-    @ApiModelProperty(value = "设备编号", dataType = "String")
+    @ApiModelProperty(value = "统一编号", dataType = "String")
     @TableField("device_no")
     private String deviceNo;
 
     /**
      * 设备名字
      */
-    @NotEmpty(message = "设备名字不能为空")
-    @ApiModelProperty(value = "设备名字", dataType = "String")
+    @ExcelProperty(value = "设备名称", order = 4)
+    @NotEmpty(message = "设备名称不能为空")
+    @ApiModelProperty(value = "设备名称", dataType = "String")
     @TableField("device_name")
     private String deviceName;
 
     /**
      * 检定员id
      */
-    @ApiModelProperty(value = "检定员id", dataType = "String")
+    @ApiModelProperty(value = "检定员id", dataType = "Long")
     @TableField("measure_person_id")
     private Long measurePersonId;
 
     /**
      * 检定员名字
      */
+    @ExcelProperty(value = "检定员", order = 5)
     @ApiModelProperty(value = "检定员名字", dataType = "String")
     @TableField("measure_person")
     private String measurePerson;
@@ -103,7 +112,8 @@
     /**
      * 更新时间
      */
-    @ApiModelProperty(value = "更新时间", dataType = "String")
+    @ExcelProperty(value = "打印时间", order = 6)
+    @ApiModelProperty(value = "打印时间", dataType = "String")
     @TableField("update_time")
     private String updateTime;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceAssess.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceAssess.java
index 659d9ca..6720b90 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceAssess.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceAssess.java
@@ -1,11 +1,26 @@
 package com.casic.missiles.model.business;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 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 com.casic.missiles.dto.BaseRequest;
+import com.casic.missiles.dto.business.outsource.OrderSampleDTO;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import javax.validation.constraints.NotEmpty;
 import java.io.Serializable;
+import java.util.List;
 
 /**
  * <p>
@@ -15,146 +30,231 @@
  * @author wangpeng
  * @since 2023-08-16
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
+@ApiModel
 @Data
 @TableName("biz_business_outsource_assess")
-public class BizBusinessOutsourceAssess implements Serializable {
+public class BizBusinessOutsourceAssess extends BaseRequest implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
+    @ApiModelProperty(value = "id，更新/删除使用参数", dataType = "Long")
     @TableId("id")
     private Long id;
 
     /**
      * 评审表编号
      */
+    @ExcelProperty(value = "评审表编号", order = 1)
+    @ApiModelProperty(value = "评审表编号(后台生成)", dataType = "String")
     @TableField("project_no")
     private String projectNo;
 
     /**
      * 评审表名称
      */
+    @ExcelProperty(value = "评审表名称", order = 2)
+    @ApiModelProperty(value = "评审表名称", dataType = "String")
     @TableField("project_name")
     private String projectName;
 
+    @NotEmpty(message = "实验室代码不能为空")
+    @DictCodeField(message = "实验室代码描述不合法", cacheName = MeterDictCode.LAB_CODE)
+    @ApiModelProperty(value = "实验室代码(字典code)", dataType = "String")
+    @TableField("lab_code")
+    private String labCode;
+
+    @ApiModelProperty(value = "实验室代码(字典value)", dataType = "String")
+    @TableField(exist = false)
+    private String labCodeName;
+
+    /**
+     * 组别代码
+     */
+    @NotEmpty(message = "组别代码不能为空")
+    @DictCodeField(message = "组别代码描述不合法", cacheName = MeterDictCode.GROUP_CODE)
+    @ApiModelProperty(value = "组别代码(字典code)", dataType = "String")
+    @TableField("group_code")
+    private String groupCode;
+
+    @ApiModelProperty(value = "组别代码(字典value)", dataType = "String")
+    @TableField(exist = false)
+    private String groupCodeName;
+
     /**
      * 申请人id
      */
+    @ApiModelProperty(value = "申请人id", dataType = "String")
     @TableField("applicant_id")
     private Long applicantId;
 
     /**
      * 申请人名字
      */
+    @ExcelProperty(value = "申请人", order = 5)
+    @ApiModelProperty(value = "申请人", dataType = "String")
     @TableField("applicant_name")
     private String applicantName;
 
     /**
      * 申请时间
      */
+    @ExcelProperty(value = "申请时间", order = 6)
+    @ApiModelProperty(value = "申请时间", dataType = "String")
     @TableField("applicant_time")
     private String applicantTime;
 
     /**
      * 附件(minio存储文件名)
      */
+    @ApiModelProperty(value = "附件(minio存储文件名)", dataType = "String")
     @TableField("minio_file_name")
     private String minioFileName;
 
     /**
      * 备注
      */
+    @ApiModelProperty(value = "备注", dataType = "String")
     @TableField("remark")
     private String remark;
 
     /**
      * 创建人id
      */
+    @ApiModelProperty(value = "创建人id", dataType = "String")
     @TableField("create_user_id")
     private Long createUserId;
 
     /**
      * 创建人名字
      */
+    @ApiModelProperty(value = "创建人名字", dataType = "String")
     @TableField("create_user_name")
     private String createUserName;
 
     /**
      * 分包方id
      */
+    @ApiModelProperty(value = "评审表编号", dataType = "String")
     @TableField("outsourcer_id")
     private Long outsourcerId;
 
     /**
      * 预计开始时间
      */
+    @ApiModelProperty(value = "预计开始时间", dataType = "String")
     @TableField("pre_start_time")
     private String preStartTime;
 
     /**
      * 预计结束时间
      */
+    @ApiModelProperty(value = "预计结束时间", dataType = "String")
     @TableField("pre_end_time")
     private String preEndTime;
 
     /**
      * 分包原因-字典
      */
+    @ApiModelProperty(value = "分包原因(字典code)", dataType = "String")
+    @DictCodeField(message = "分包原因描述不合法", cacheName = MeterDictCode.OUTSOURCE_REASON)
     @TableField("outsource_reason")
     private String outsourceReason;
 
+    @ApiModelProperty(value = "分包原因(字典value)", dataType = "String")
+    @TableField(exist = false)
+    private String outsourceReasonName;
+
     /**
      * 预计费用
      */
+    @ApiModelProperty(value = "预计费用", dataType = "String")
     @TableField("pre_cost")
     private String preCost;
 
     /**
      * 审批状态
      */
+    @ApiModelProperty(value = "审批状态", dataType = "String")
+    @DictCodeField(message = "审批状态描述不合法", cacheName = MeterDictCode.APPROVAL_STATUS)
     @TableField("approval_status")
     private String approvalStatus;
 
     /**
      * 流程实例id
      */
+    @ApiModelProperty(value = "流程实例id", dataType = "String")
     @TableField("process_id")
     private String processId;
 
     /**
      * 实验室认可情况
      */
+    @ApiModelProperty(value = "实验室认可情况", dataType = "String")
     @TableField("approve_situation")
     private String approveSituation;
 
     /**
      * 溯源性
      */
+    @ApiModelProperty(value = "溯源性", dataType = "String")
     @TableField("traceability")
     private String traceability;
 
     /**
      * 测试方法
      */
+    @ApiModelProperty(value = "测试方法", dataType = "String")
     @TableField("test_method")
     private String testMethod;
 
     /**
      * 技术能力
      */
+    @ApiModelProperty(value = "技术能力", dataType = "String")
     @TableField("technique_ability")
     private String techniqueAbility;
 
     /**
      * 创建时间
      */
+    @ApiModelProperty(hidden = true)
     @TableField("create_time")
     private String createTime;
 
     /**
      * 更新时间
      */
+    @ApiModelProperty(hidden = true)
     @TableField("update_time")
     private String updateTime;
 
+    @ApiModelProperty(value = "审批状态类型-字典value", dataType = "String")
+    @TableField(exist = false)
+    private String approvalStatusName;
 
+    @ApiModelProperty(value = "任务id（同意、驳回等操作使用）", dataType = "String")
+    @TableField(exist = false)
+    private String taskId;
+
+    @ApiModelProperty(value = "可选决策项（1同意驳回拒绝 2同意驳回 3同意拒绝，用于待审批列表同意/驳回/拒绝按钮展示）", dataType = "Integer")
+    @TableField(exist = false)
+    private Integer decisionItem;
+
+    @NotEmpty(message = "受检设备信息不能为空")
+    @ApiModelProperty(value = "受检设备id列表（新建使用参数）", dataType = "List")
+    @TableField(exist = false)
+    private List<OrderSampleDTO> orderSampleList;
+
+    @ExcelProperty(value = "分包机构名称", order = 3)
+    @ApiModelProperty(value = "分包机构名称（列表返回参数）", dataType = "String")
+    private String outsourcerName;
+
+    @ExcelProperty(value = "机构负责人", order = 4)
+    @ApiModelProperty(value = "机构负责人（列表返回参数）", dataType = "String")
+    private String director;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceProtocol.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceProtocol.java
new file mode 100644
index 0000000..38df697
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceProtocol.java
@@ -0,0 +1,225 @@
+package com.casic.missiles.model.business;
+
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
+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 com.casic.missiles.dto.BaseRequest;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotEmpty;
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 计量检定业务-分包管理-测试、校准或检定工作分包协议书
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-08-24
+ */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
+@Data
+@TableName("biz_business_outsource_protocol")
+public class BizBusinessOutsourceProtocol extends BaseRequest implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "id，更新/删除使用参数", dataType = "Long")
+    @TableId("id")
+    private Long id;
+
+    /**
+     * 协议书编号
+     */
+    @ExcelProperty(value = "协议书编号", order = 1)
+    @ApiModelProperty(value = "协议书编号(后台生成)", dataType = "String")
+    @TableField("protocol_no")
+    private String protocolNo;
+
+    /**
+     * 协议书名称
+     */
+    @ExcelProperty(value = "协议书名称", order = 2)
+    @ApiModelProperty(value = "协议书名称", dataType = "String")
+    @TableField("project_name")
+    private String projectName;
+
+    @NotEmpty(message = "实验室代码不能为空")
+    @DictCodeField(message = "实验室代码描述不合法", cacheName = MeterDictCode.LAB_CODE)
+    @ApiModelProperty(value = "实验室代码(字典code)", dataType = "String")
+    @TableField("lab_code")
+    private String labCode;
+
+    @ApiModelProperty(value = "实验室代码(字典value)", dataType = "String")
+    @TableField(exist = false)
+    private String labCodeName;
+
+    @NotEmpty(message = "组别代码不能为空")
+    @DictCodeField(message = "组别代码描述不合法", cacheName = MeterDictCode.GROUP_CODE)
+    @ApiModelProperty(value = "组别代码(字典code)", dataType = "String")
+    @TableField("group_code")
+    private String groupCode;
+
+    @ApiModelProperty(value = "组别代码(字典value)", dataType = "String")
+    @TableField(exist = false)
+    private String groupCodeName;
+
+    /**
+     * 分包方id
+     */
+    @ApiModelProperty(value = "分包方id", dataType = "Long")
+    @TableField("outsourcer_id")
+    private Long outsourcerId;
+
+    /**
+     * 其他
+     */
+    @ApiModelProperty(value = "其他", dataType = "String")
+    @TableField("remark")
+    private String remark;
+
+    /**
+     * 分包方编号
+     */
+    @ApiModelProperty(value = "分包方编号(新建不用传)", dataType = "String")
+    @TableField("outsource_no")
+    private String outsourceNo;
+
+    /**
+     * 分包方名称
+     */
+    @ExcelProperty(value = "分包方名称", order = 3)
+    @ApiModelProperty(value = "分包方名称(新建不用传)", dataType = "String")
+    @TableField("outsource_name")
+    private String outsourceName;
+
+    /**
+     * 联系人
+     */
+    @ExcelProperty(value = "联系人", order = 4)
+    @ApiModelProperty(value = "联系人", dataType = "String")
+    @TableField("contacts")
+    private String contacts;
+
+    /**
+     * 电话
+     */
+    @ApiModelProperty(value = "电话", dataType = "String")
+    @TableField("mobile")
+    private String mobile;
+
+    /**
+     * 地址
+     */
+    @ApiModelProperty(value = "地址", dataType = "String")
+    @TableField("address")
+    private String address;
+
+    /**
+     * 要求完成日期
+     */
+    @ApiModelProperty(value = "要求完成日期", dataType = "String")
+    @TableField("require_date")
+    private String requireDate;
+
+    /**
+     * 分包费用(元)
+     */
+    @ApiModelProperty(value = "分包费用(元)", dataType = "String")
+    @TableField("outsource_cost")
+    private Double outsourceCost;
+
+    /**
+     * 分包方负责人
+     */
+    @ApiModelProperty(value = "分包方负责人", dataType = "String")
+    @TableField("director")
+    private String director;
+
+    /**
+     * 分包项目
+     */
+    @ApiModelProperty(value = "分包项目", dataType = "String")
+    @TableField("item")
+    private String item;
+
+    /**
+     * 分包要求
+     */
+    @ApiModelProperty(value = "分包要求", dataType = "String")
+    @TableField("requires")
+    private String requires;
+
+    /**
+     * 创建人id
+     */
+    @ApiModelProperty(hidden = true)
+    @TableField("create_user_id")
+    private Long createUserId;
+
+    /**
+     * 创建人名字
+     */
+    @ExcelProperty(value = "申请人", order = 5)
+    @ApiModelProperty(value = "申请人", dataType = "String")
+    @TableField("create_user_name")
+    private String createUserName;
+
+    /**
+     * 审批状态
+     */
+    @ApiModelProperty(value = "审批状态", dataType = "String")
+    @DictCodeField(message = "审批状态描述不合法", cacheName = MeterDictCode.APPROVAL_STATUS)
+    @TableField("approval_status")
+    private String approvalStatus;
+
+    /**
+     * 流程实例id
+     */
+    @ApiModelProperty(value = "流程实例id", dataType = "String")
+    @TableField("process_id")
+    private String processId;
+
+    /**
+     * 创建时间
+     */
+    @ExcelProperty(value = "申请时间", order = 6)
+    @ApiModelProperty(value = "申请时间", dataType = "String")
+    @TableField("create_time")
+    private String createTime;
+
+    /**
+     * 更新时间
+     */
+    @ApiModelProperty(hidden = true)
+    @TableField("update_time")
+    private String updateTime;
+
+    @ApiModelProperty(value = "审批状态类型-字典value", dataType = "String")
+    @TableField(exist = false)
+    private String approvalStatusName;
+
+    @ApiModelProperty(value = "任务id（同意、驳回等操作使用）", dataType = "String")
+    @TableField(exist = false)
+    private String taskId;
+
+    @ApiModelProperty(value = "可选决策项（1同意驳回拒绝 2同意驳回 3同意拒绝，用于待审批列表同意/驳回/拒绝按钮展示）", dataType = "Integer")
+    @TableField(exist = false)
+    private Integer decisionItem;
+
+
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourcerInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourcerInfo.java
index ec4e997..f9aa69e 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourcerInfo.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourcerInfo.java
@@ -17,6 +17,7 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import javax.validation.constraints.NotEmpty;
 import java.io.Serializable;
 
 /**
@@ -59,6 +60,29 @@
     @TableField("outsourcer_name")
     private String outsourcerName;
 
+    @NotEmpty(message = "实验室代码不能为空")
+    @DictCodeField(message = "实验室代码描述不合法", cacheName = MeterDictCode.LAB_CODE)
+    @ApiModelProperty(value = "实验室代码(字典code)", dataType = "String")
+    @TableField("lab_code")
+    private String labCode;
+
+    @ApiModelProperty(value = "实验室代码(字典value)", dataType = "String")
+    @TableField(exist = false)
+    private String labCodeName;
+
+    /**
+     * 组别代码
+     */
+    @NotEmpty(message = "组别代码不能为空")
+    @DictCodeField(message = "组别代码描述不合法", cacheName = MeterDictCode.GROUP_CODE)
+    @ApiModelProperty(value = "组别代码(字典code)", dataType = "String")
+    @TableField("group_code")
+    private String groupCode;
+
+    @ApiModelProperty(value = "组别代码(字典value)", dataType = "String")
+    @TableField(exist = false)
+    private String groupCodeName;
+
     /**
      * 单位简称
      */
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardInfo.java
index c48eed7..dffdfdd 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardInfo.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardInfo.java
@@ -5,6 +5,7 @@
 import com.baomidou.mybatisplus.annotation.TableName;
 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;
 
@@ -18,6 +19,7 @@
  * @author wangpeng
  * @since 2023-08-04
  */
+@ApiModel
 @Data
 @TableName("biz_equipment_standard_info")
 public class BizEquipmentStandardInfo implements Serializable {
@@ -119,7 +121,7 @@
      * 管理状态(字典code)
      */
     @ApiModelProperty(value = "管理状态(字典code)", dataType = "String")
-    @DictCodeField(message = "管理状态不合法", cacheName = MeterDictCode.MANAGER_STATE)
+    @DictCodeField(message = "管理状态不合法", cacheName = MeterDictCode.STANDARD_MANAGER_STATE)
     @TableField("manage_status")
     private String manageStatus;
 
@@ -151,7 +153,7 @@
     /**
      * 温度(℃)
      */
-    @ApiModelProperty(value = "使用状态(字典code)", dataType = "String")
+    @ApiModelProperty(value = "温度(℃)", dataType = "String")
     @TableField("temperature")
     private Double temperature;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardInfoApproval.java b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardInfoApproval.java
index dbd86ab..9f58d83 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardInfoApproval.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardInfoApproval.java
@@ -150,7 +150,7 @@
      * 管理状态(字典code)
      */
     @ApiModelProperty(value = "管理状态(字典code)", dataType = "String")
-    @DictCodeField(message = "管理状态不合法", cacheName = MeterDictCode.MANAGER_STATE)
+    @DictCodeField(message = "管理状态不合法", cacheName = MeterDictCode.STANDARD_MANAGER_STATE)
     @TableField("manage_status")
     private String manageStatus;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardTechnologyRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardTechnologyRelation.java
index 0e612bd..751f26b 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardTechnologyRelation.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardTechnologyRelation.java
@@ -3,6 +3,7 @@
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -16,6 +17,7 @@
  * @author wangpeng
  * @since 2023-08-04
  */
+@ApiModel
 @Data
 @TableName("biz_equipment_standard_technology_relation")
 public class BizEquipmentStandardTechnologyRelation implements Serializable {
@@ -33,6 +35,10 @@
     @TableField("technology_file_id")
     private Long technologyFileId;
 
+    @ApiModelProperty(value = "依据的技术文件编号", dataType = "String")
+    @TableField("technology_file_no")
+    private String technologyFileNo;
+
     /**
      * 依据的技术文件名称(技术文件中现行测试校准检定方法表文件名字段)
      */
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerInfo.java
index d6e8bed..65cd6bc 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerInfo.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerInfo.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.model.resource;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -21,6 +28,11 @@
  * @author wangpeng
  * @since 2023-08-08
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @ApiModel
 @Data
 @TableName("biz_resource_customer_info")
@@ -35,6 +47,7 @@
     /**
      * 委托方编号
      */
+    @ExcelProperty(value = "委托方编号", order = 1)
     @ApiModelProperty(value = "委托方编号", dataType = "String")
     @TableField("customer_no")
     private String customerNo;
@@ -42,6 +55,7 @@
     /**
      * 委托方名称
      */
+    @ExcelProperty(value = "委托方名称", order = 2)
     @ApiModelProperty(value = "委托方名称(新建时为下拉选择一个受检单位组织的名字，传deptId字段，后端获取名称)", dataType = "String")
     @TableField("customer_name")
     private String customerName;
@@ -63,6 +77,7 @@
     /**
      * 联系人
      */
+    @ExcelProperty(value = "联系人", order = 3)
     @ApiModelProperty(value = "联系人", dataType = "String")
     @TableField("contacts")
     private String contacts;
@@ -70,6 +85,7 @@
     /**
      * 座机电话
      */
+    @ExcelProperty(value = "座机电话", order = 4)
     @ApiModelProperty(value = "座机电话", dataType = "String")
     @TableField("mobile")
     private String mobile;
@@ -77,6 +93,7 @@
     /**
      * 手机号码
      */
+    @ExcelProperty(value = "手机号码", order = 5)
     @ApiModelProperty(value = "手机号码", dataType = "String")
     @TableField("phone")
     private String phone;
@@ -91,6 +108,7 @@
     /**
      * 地址
      */
+    @ExcelProperty(value = "地址", order = 6)
     @ApiModelProperty(value = "地址", dataType = "String")
     @TableField("address")
     private String address;
@@ -141,6 +159,7 @@
     /**
      * 创建时间
      */
+    @ExcelProperty(value = "创建时间", order = 7)
     @ApiModelProperty(value = "创建时间", dataType = "String")
     @TableField("create_time")
     private String createTime;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerSuggestForm.java b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerSuggestForm.java
index 7201bbd..701bf8b 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerSuggestForm.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerSuggestForm.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.model.resource;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -22,6 +29,11 @@
  * @author wangpeng
  * @since 2023-08-08
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @ApiModel
 @Data
 @TableName("biz_resource_customer_suggest_form")
@@ -44,7 +56,8 @@
     /**
      * 委托方名称
      */
-    @ApiModelProperty(value = "委托方名称", dataType = "String")
+    @ExcelProperty(value = "意见反馈单位", order = 2)
+    @ApiModelProperty(value = "意见反馈单位", dataType = "String")
     @TableField("customer_name")
     private String customerName;
 
@@ -59,7 +72,8 @@
     /**
      * 委托方意见反馈部门名称
      */
-    @ApiModelProperty(value = "委托方意见反馈部门名称", dataType = "String")
+    @ExcelProperty(value = "委托方意见反馈部门", order = 3)
+    @ApiModelProperty(value = "委托方意见反馈部门", dataType = "String")
     @TableField("customer_dept_name")
     private String customerDeptName;
 
@@ -73,6 +87,7 @@
     /**
      * 表单编号
      */
+    @ExcelProperty(value = "表单编号", order = 1)
     @ApiModelProperty(value = "表单编号", dataType = "String")
     @TableField("form_no")
     private String formNo;
@@ -111,6 +126,7 @@
     /**
      * 创建人名字
      */
+    @ExcelProperty(value = "创建人", order = 4)
     @ApiModelProperty(value = "创建人名字", dataType = "String")
     @TableField("create_user_name")
     private String createUserName;
@@ -147,6 +163,7 @@
     /**
      * 创建时间
      */
+    @ExcelProperty(value = "创建时间", order = 5)
     @ApiModelProperty(value = "创建时间", dataType = "String")
     @TableField("create_time")
     private String createTime;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSealInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSealInfo.java
index cbf05d7..9bf389d 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSealInfo.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSealInfo.java
@@ -106,6 +106,10 @@
     @TableField("minio_file_name")
     private String minioFileName;
 
+    @ApiModelProperty(value = "minio存储文件url", dataType = "String")
+    @TableField(exist = false)
+    private String minioFileUrl;
+
     @ApiModelProperty(value = "创建时间", dataType = "String")
     @TableField("create_time")
     private String createTime;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSealUseNote.java b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSealUseNote.java
index 3f2d9e8..3ce16a8 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSealUseNote.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSealUseNote.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.model.resource;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -20,6 +27,11 @@
  * @author wangpeng
  * @since 2023-07-28
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @ApiModel
 @Data
 @TableName("biz_resource_seal_use_note")
@@ -34,6 +46,7 @@
     /**
      * 登记表编号
      */
+    @ExcelProperty(value = "申请单编号", order = 1)
     @ApiModelProperty(value = "登记表编号(自动生成)", dataType = "String")
     @TableField("note_form_no")
     private String noteFormNo;
@@ -55,6 +68,7 @@
     /**
      * 申请部门
      */
+    @ExcelProperty(value = "申请部门", order = 5)
     @ApiModelProperty(value = "申请部门", dataType = "String")
     @TableField("apply_dept_name")
     private String applyDeptName;
@@ -69,6 +83,7 @@
     /**
      * 申请人
      */
+    @ExcelProperty(value = "申请人", order = 6)
     @ApiModelProperty(value = "申请人", dataType = "String")
     @TableField("apply_user_name")
     private String applyUserName;
@@ -76,6 +91,7 @@
     /**
      * 申请时间
      */
+    @ExcelProperty(value = "申请时间", order = 7)
     @ApiModelProperty(value = "申请时间(新增自动获取当前时间)", dataType = "String")
     @TableField("apply_time")
     private String applyTime;
@@ -130,6 +146,26 @@
     @TableField("update_time")
     private String updateTime;
 
+    @ExcelProperty(value = "印章名称", order = 2)
+    @ApiModelProperty(value = "印章名称(列表返回参数)", dataType = "String")
+    @TableField(exist = false)
+    private String sealName;
+
+    @DictCodeField(message = "印章类型描述不合法", cacheName = MeterDictCode.SEAL_TYPE)
+    @ApiModelProperty(hidden = true)
+    @TableField(exist = false)
+    private String sealType;
+
+    @ExcelProperty(value = "印章类型", order = 3)
+    @ApiModelProperty(value = "印章类型(列表返回参数)", dataType = "String")
+    @TableField(exist = false)
+    private String sealTypeName;
+
+    @ExcelProperty(value = "批准人", order = 4)
+    @ApiModelProperty(value = "批准人(列表返回参数)", dataType = "String")
+    @TableField(exist = false)
+    private String approverName;
+
     @ApiModelProperty(value = "审批状态类型-字典value", dataType = "String")
     @TableField(exist = false)
     private String approvalStatusName;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceStaffInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceStaffInfo.java
index 5ef995b..41563a1 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceStaffInfo.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceStaffInfo.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.model.resource;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -20,6 +27,11 @@
  * @author wangpeng
  * @since 2023-07-25
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @ApiModel
 @Data
 @TableName("biz_resource_staff_info")
@@ -38,6 +50,7 @@
     /**
      * 人员编号
      */
+    @ExcelProperty(value = "人员编号",order = 0)
     @NotEmpty(message = "人员编号不能为空")
     @ApiModelProperty(value = "人员编号", dataType = "String")
     @TableField("staff_no")
@@ -46,6 +59,7 @@
     /**
      * 姓名
      */
+    @ExcelProperty(value = "姓名",order = 1)
     @ApiModelProperty(value = "姓名", dataType = "String")
     @TableField("staff_name")
     private String staffName;
@@ -152,13 +166,15 @@
     /**
      * 部门名字
      */
-    @ApiModelProperty(value = "部门名字", dataType = "String")
+    @ExcelProperty(value = "工作部门",order = 4)
+    @ApiModelProperty(value = "工作部门", dataType = "String")
     @TableField("dept_name")
     private String deptName;
 
     /**
      * 岗位
      */
+    @ExcelProperty(value = "岗位",order = 2)
     @ApiModelProperty(value = "岗位", dataType = "String")
     @TableField("station")
     private String station;
@@ -166,6 +182,7 @@
     /**
      * 计量专业
      */
+    @ExcelProperty(value = "计量专业",order = 5)
     @ApiModelProperty(value = "计量专业", dataType = "String")
     @TableField("major")
     private String major;
@@ -173,6 +190,7 @@
     /**
      * 证号
      */
+    @ExcelProperty(value = "证号",order = 3)
     @ApiModelProperty(value = "证号", dataType = "String")
     @TableField("certificate_number")
     private String certificateNumber;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSupplierInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSupplierInfo.java
index eb5ef01..a1e2697 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSupplierInfo.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSupplierInfo.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.model.resource;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -20,6 +27,11 @@
  * @author wangpeng
  * @since 2023-07-27
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @ApiModel
 @Data
 @TableName("biz_resource_supplier_info")
@@ -34,6 +46,7 @@
     /**
      * 供方编号
      */
+    @ExcelProperty(value = "供方编号", order = 1)
     @ApiModelProperty(value = "供方编号(自动生成)", dataType = "String")
     @TableField("supplier_no")
     private String supplierNo;
@@ -41,6 +54,7 @@
     /**
      * 供方名称
      */
+    @ExcelProperty(value = "供方名称", order = 2)
     @ApiModelProperty(value = "供方名称", dataType = "String")
     @TableField("supplier_name")
     private String supplierName;
@@ -60,6 +74,7 @@
     @TableField("supplier_type")
     private String supplierType;
 
+    @ExcelProperty(value = "供方类型", order = 3)
     @ApiModelProperty(value = "供方类型(字典value)", dataType = "String")
     @TableField(exist = false)
     private String supplierTypeName;
@@ -109,7 +124,8 @@
     /**
      * 电话
      */
-    @ApiModelProperty(value = "电话", dataType = "String")
+    @ExcelProperty(value = "联系电话", order = 4)
+    @ApiModelProperty(value = "联系电话", dataType = "String")
     @TableField("phone")
     private String phone;
 
@@ -158,6 +174,7 @@
     /**
      * 公司地址-省
      */
+    @ExcelProperty(value = "地址-省", order = 6)
     @ApiModelProperty(value = "公司地址-省", dataType = "String")
     @TableField("company_province_name")
     private String companyProvinceName;
@@ -172,6 +189,7 @@
     /**
      * 公司地址-市
      */
+    @ExcelProperty(value = "地址-市", order = 7)
     @ApiModelProperty(value = "公司地址-市", dataType = "String")
     @TableField("company_city_name")
     private String companyCityName;
@@ -186,6 +204,7 @@
     /**
      * 公司地址-区
      */
+    @ExcelProperty(value = "地址-区", order = 8)
     @ApiModelProperty(value = "公司地址-区", dataType = "String")
     @TableField("company_area_name")
     private String companyAreaName;
@@ -193,6 +212,7 @@
     /**
      * 公司地址-详细地址
      */
+    @ExcelProperty(value = "地址-详细地址", order = 9)
     @ApiModelProperty(value = "公司地址-详细地址", dataType = "String")
     @TableField("company_address")
     private String companyAddress;
@@ -200,6 +220,7 @@
     /**
      * 服务和供应的内容
      */
+    @ExcelProperty(value = "服务和供应的内容", order = 5)
     @ApiModelProperty(value = "服务和供应的内容", dataType = "String")
     @TableField("supplier_content")
     private String supplierContent;
@@ -250,6 +271,7 @@
     /**
      * 创建时间
      */
+    @ExcelProperty(value = "创建时间", order = 9)
     @ApiModelProperty(value = "创建时间", dataType = "String")
     @TableField("create_time")
     private String createTime;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/EnvLocationInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/EnvLocationInfo.java
new file mode 100644
index 0000000..d8e2d7b
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/EnvLocationInfo.java
@@ -0,0 +1,83 @@
+package com.casic.missiles.model.resource;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotEmpty;
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 实验室环境监控系统-设备表
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-06-07
+ */
+@ApiModel
+@Data
+@TableName("env_location_info")
+public class EnvLocationInfo implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "主键id", dataType = "Long")
+    @TableId("id")
+    private Long id;
+
+    /**
+     * 地点编号
+     */
+    @NotEmpty(message = "地点编号不能为空")
+    @ApiModelProperty(value = "地点编号", dataType = "String")
+    @TableField("location_no")
+    private String locationNo;
+
+    /**
+     * 地点名称
+     */
+    @ApiModelProperty(value = "地点名称", dataType = "String")
+    @TableField("location_name")
+    private String locationName;
+
+    /**
+     * 地点位置
+     */
+    @ApiModelProperty(value = "地点位置", dataType = "String")
+    @TableField("location_position")
+    private String locationPosition;
+
+    /**
+     * 创建人id
+     */
+    @ApiModelProperty(value = "创建人id", dataType = "Long")
+    @TableField("create_user_id")
+    private Long createUserId;
+
+    /**
+     * 创建人
+     */
+    @ApiModelProperty(value = "创建人", dataType = "String")
+    @TableField("create_user")
+    private String createUser;
+
+    /**
+     * 创建时间
+     */
+    @ApiModelProperty(value = "创建时间", dataType = "String")
+    @TableField("create_time")
+    private String createTime;
+
+    /**
+     * 更新时间
+     */
+    @ApiModelProperty(value = "更新时间", dataType = "String")
+    @TableField("update_time")
+    private String updateTime;
+
+
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemFileConfig.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemFileConfig.java
index 19e6845..86e569c 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemFileConfig.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemFileConfig.java
@@ -30,7 +30,7 @@
     @ApiModelProperty(value = "系统类别(1业务系统2受检系统3环境系统)", dataType = "Integer")
     @NotNull(message = "系统类别不能为空")
     @TableField("system_type")
-    private Integer systemType;
+    private Integer systemType = 1;
 
     @ApiModelProperty("下载编号")
     @TableField("download_no")
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemNotice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemNotice.java
index e94297d..06ec37d 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemNotice.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemNotice.java
@@ -34,7 +34,7 @@
     @ApiModelProperty(value = "系统类别(1业务系统2受检系统3环境系统)", dataType = "Integer")
     @NotNull(message = "系统类别不能为空")
     @TableField("system_type")
-    private Integer systemType;
+    private Integer systemType = 1;
 
     /**
      * 通知公告编号
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSign.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSign.java
index 6c0d7c9..954f4f8 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSign.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSign.java
@@ -51,7 +51,7 @@
     @ApiModelProperty(value = "系统类别(1业务系统2受检系统3环境系统)", dataType = "Integer")
     @NotNull(message = "系统类别不能为空")
     @TableField("system_type")
-    private Integer systemType;
+    private Integer systemType = 1;
 
     /**
      * 签名编号
@@ -130,4 +130,8 @@
     @TableField(exist = false)
     private List<Long> userIdList;
 
+    @ApiModelProperty(hidden = true)
+    @TableField(exist = false)
+    private String deptName;
+
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemTemplate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemTemplate.java
index 503a457..1d27ebe 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemTemplate.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemTemplate.java
@@ -47,7 +47,7 @@
     @ApiModelProperty(value = "系统类别(1业务系统2受检系统3环境系统)", dataType = "Integer")
     @NotNull(message = "系统类别不能为空")
     @TableField("system_type")
-    private Integer systemType;
+    private Integer systemType = 1;
 
     /**
      * 模板编号
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java
index 8c21cb0..f61e4a8 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java
@@ -32,4 +32,8 @@
     ReturnDTO approvalDelete(ApprovalDeleteRequest request);
 
     ReturnDTO failUpdate(T request);
+
+    List<O> listExport(R request);
+
+    List<O> listExportByIds(List<Long> ids);
 }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java
index 724166f..9bce15b 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java
@@ -157,6 +157,29 @@
         throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
     }
 
+    @Override
+    public List<O> listExport(R request) {
+        request.setCreateUserId(null);
+        request.setApprovalStatus(ApprovalStatusEnum.PASSED);
+        Page<O> page = PageFactory.defaultPage();
+        page.setCurrent(1);
+        page.setSearchCount(false);
+        page.setSize(Integer.MAX_VALUE);
+        Page<O> resultPage = this.baseMapper.selectBatchForApprovalList(page, request, null);
+        return resultPage.getRecords();
+    }
+
+    @Override
+    public List<O> listExportByIds(List<Long> ids) {
+        Page<O> page = PageFactory.defaultPage();
+        page.setCurrent(1);
+        page.setSearchCount(false);
+        page.setSize(Integer.MAX_VALUE);
+        List<String> businessKeys = ids.stream().map(String::valueOf).collect(Collectors.toList());
+        Page<O> resultPage = this.baseMapper.selectBatchForApprovalList(page, null, businessKeys);
+        return resultPage.getRecords();
+    }
+
     protected ReturnDTO updateApprovalStatus(Long id, String processId, String approvalStatus) {
         UpdateWrapper<T> updateWrapper = new UpdateWrapper<>();
         updateWrapper.eq("id", id);
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificatePrintServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificatePrintServiceImpl.java
index f6e4706..3228497 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificatePrintServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificatePrintServiceImpl.java
@@ -162,6 +162,30 @@
         return ReturnUtil.success(printLogMapper.selectList(wrapper));
     }
 
+    @Override
+    public List<CertificatePrintListResponse> listByIds(List<Long> ids) {
+        Page<CertificatePrintListResponse> page = PageFactory.defaultPage();
+        page.setCurrent(1);
+        page.setSearchCount(false);
+        page.setSize(Integer.MAX_VALUE);
+        List<String> businessKeys = ids.stream().map(String::valueOf).collect(Collectors.toList());
+        Page<CertificatePrintListResponse> resultPage = this.baseMapper.selectBatchForApprovalList(page, null, businessKeys);
+        return resultPage.getRecords();
+    }
+
+    @Override
+    public List<CertificatePrintListResponse> list(CertificatePrintApprovalListRequest request) {
+        request.setCreateUserId(null);
+        request.setApprovalStatus(null);
+        request.setPrintStatus(null);
+        Page<CertificatePrintListResponse> page = PageFactory.defaultPage();
+        page.setCurrent(1);
+        page.setSearchCount(false);
+        page.setSize(Integer.MAX_VALUE);
+        Page<CertificatePrintListResponse> resultPage = certificatePrintMapper.selectBatchForApprovalList(page, request, null);
+        return resultPage.getRecords();
+    }
+
     private void savePrintLog(Long id) {
         BizBusinessCertificatePrintLog printLog = new BizBusinessCertificatePrintLog();
         BizBusinessCertificatePrint certificatePrint = certificatePrintMapper.selectById(id);
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificateReportServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificateReportServiceImpl.java
index 457555f..24146be 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificateReportServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificateReportServiceImpl.java
@@ -158,8 +158,8 @@
         QueryWrapper<BizBusinessCertificateMeasureResultData> mWrapper = new QueryWrapper<>();
         mWrapper.eq("report_id", reportId);
         boolean mRemove = certificateMeasureResultDataService.remove(mWrapper);
-        Assert.isFalse(eRemove || mRemove, () -> {
+        if(!eRemove || !mRemove){
             throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
-        });
+        }
     }
 }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessIdentifyInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessIdentifyInfoServiceImpl.java
index 4c8e190..f7e63ca 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessIdentifyInfoServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessIdentifyInfoServiceImpl.java
@@ -1,8 +1,10 @@
 package com.casic.missiles.service.Impl.business;
 
+import cn.hutool.core.date.DateUtil;
 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.core.page.PageFactory;
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.business.identify.IdentifyListRequest;
@@ -14,11 +16,14 @@
 import com.casic.missiles.service.business.IBizBusinessIdentifyInfoService;
 import com.casic.missiles.utils.DictCodeUtils;
 import com.casic.missiles.utils.NumberGeneratorUtil;
+import com.casic.missiles.utils.QRCodeUtil;
 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.List;
+
 /**
  * <p>
  * 计量检定业务-任务计量管理-标识打印 服务实现类
@@ -35,9 +40,9 @@
     @Override
     public Page<BizBusinessIdentifyInfo> identifyListPage(Page<BizBusinessIdentifyInfo> page, IdentifyListRequest request) throws Exception {
         QueryWrapper<BizBusinessIdentifyInfo> wrapper = new QueryWrapper<>();
-        wrapper.eq("identify_type", request.getIdentifyType());
-        wrapper.like("device_no", request.getDeviceNo());
-        wrapper.like("device_name", request.getDeviceName());
+        wrapper.eq(StringUtils.isNotEmpty(request.getIdentifyType()), "identify_type", request.getIdentifyType());
+        wrapper.like(StringUtils.isNotEmpty(request.getDeviceNo()),"device_no", request.getDeviceNo());
+        wrapper.like(StringUtils.isNotEmpty(request.getDeviceName()), "device_name", request.getDeviceName());
         wrapper.apply(StringUtils.isNotBlank(request.getCreateTimeStart()),
                 "{0} <= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getCreateTimeStart().split(" ")[0]);
         wrapper.apply(StringUtils.isNotBlank(request.getCreateTimeEnd()),
@@ -64,8 +69,11 @@
     }
 
     @Override
-    public ReturnDTO updateIdentify(BizBusinessIdentifyInfo identifyInfo) {
-        if(identifyInfoMapper.updateById(identifyInfo) > 0){
+    public ReturnDTO updateIdentify(Long id) {
+        BizBusinessIdentifyInfo info = new BizBusinessIdentifyInfo();
+        info.setId(id);
+        info.setUpdateTime(DateUtil.now());
+        if(identifyInfoMapper.updateById(info) > 0){
             return ReturnUtil.success();
         }
         throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
@@ -79,4 +87,20 @@
         throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
     }
 
+    @Override
+    public List<BizBusinessIdentifyInfo> list(IdentifyListRequest request) throws Exception {
+        Page<BizBusinessIdentifyInfo> page = PageFactory.defaultPage();
+        page.setCurrent(1);
+        page.setSearchCount(false);
+        page.setSize(Integer.MAX_VALUE);
+        Page<BizBusinessIdentifyInfo> resultPage = this.identifyListPage(page, request);
+        return resultPage.getRecords();
+    }
+
+    @Override
+    public ReturnDTO<String> equipmentQrCode(Long id) {
+        String base64QRCode = QRCodeUtil.getBase64QRCode(String.valueOf(id));
+        return ReturnUtil.success(base64QRCode);
+    }
+
 }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOrderInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOrderInfoServiceImpl.java
index 82952ad..d8d2c6a 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOrderInfoServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOrderInfoServiceImpl.java
@@ -35,6 +35,7 @@
 import javax.servlet.http.HttpServletResponse;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 import java.util.stream.Collectors;
 
 /**
@@ -209,13 +210,16 @@
     private QueryWrapper<OrderListResponse> listParamWrapperBuilder(OrderListRequest request) {
         QueryWrapper<OrderListResponse> wrapper = new QueryWrapper<>();
         wrapper.like(StringUtils.isNotBlank(request.getOrderNo()), "order_no", request.getOrderNo());
+        wrapper.like(Objects.nonNull(request.getCustomerId()), "customer_id", request.getCustomerId());
         wrapper.like(StringUtils.isNotBlank(request.getCustomerName()), "customer_name", request.getCustomerName());
         wrapper.like(StringUtils.isNotBlank(request.getDeliverer()), "deliverer", request.getDeliverer());
         wrapper.like(StringUtils.isNotBlank(request.getCreateUserName()), "create_user_name", request.getCreateUserName());
-        wrapper.apply(StringUtils.isNotBlank(request.getCreateStartTime()),
-                "{0} <= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getCreateStartTime().split(" ")[0]);
-        wrapper.apply(StringUtils.isNotBlank(request.getCreateEndTime()),
-                "{0} >= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getCreateEndTime().split(" ")[0]);
+        if(StringUtils.isNotBlank(request.getCreateStartTime())){
+            wrapper.apply("{0} <= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getCreateStartTime().split(" ")[0]);
+        }
+        if(StringUtils.isNotBlank(request.getCreateEndTime())){
+            wrapper.apply("{0} >= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getCreateEndTime().split(" ")[0]);
+        }
         wrapper.orderByDesc("create_time");
         return wrapper;
     }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceAssessServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceAssessServiceImpl.java
index c6af980..ce40138 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceAssessServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceAssessServiceImpl.java
@@ -1,10 +1,33 @@
 package com.casic.missiles.service.Impl.business;
 
-import com.casic.missiles.model.business.BizBusinessOutsourceAssess;
+import cn.hutool.core.lang.Assert;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.casic.missiles.core.model.auth.AuthUser;
+import com.casic.missiles.core.shiro.ShiroKit;
+import com.casic.missiles.dto.BaseApprovalSubmitRequest;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.ReturnUtil;
+import com.casic.missiles.dto.business.outsource.OutsourceAssessApprovalListRequest;
+import com.casic.missiles.dto.business.outsource.OutsourceAssessSaveResponse;
+import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.NoGenerateFileCodeEnum;
+import com.casic.missiles.enums.NoGenerateRecordTypeCodeEnum;
+import com.casic.missiles.enums.system.ApprovalStatusEnum;
+import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.mapper.business.BizBusinessOutsourceAssessMapper;
+import com.casic.missiles.model.business.BizBusinessOutsourceAssess;
+import com.casic.missiles.model.business.BizBusinessOutsourceAssessSampleRelation;
+import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl;
+import com.casic.missiles.service.business.IBizBusinessOutsourceAssessSampleRelationService;
 import com.casic.missiles.service.business.IBizBusinessOutsourceAssessService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.casic.missiles.utils.NoGeneratorUtil;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Objects;
 
 /**
  * <p>
@@ -15,6 +38,103 @@
  * @since 2023-08-16
  */
 @Service
-public class BizBusinessOutsourceAssessServiceImpl extends ServiceImpl<BizBusinessOutsourceAssessMapper, BizBusinessOutsourceAssess> implements IBizBusinessOutsourceAssessService {
+public class BizBusinessOutsourceAssessServiceImpl extends GeneralApprovalServiceImpl<BizBusinessOutsourceAssessMapper, BizBusinessOutsourceAssess, BizBusinessOutsourceAssess, OutsourceAssessApprovalListRequest, BaseApprovalSubmitRequest> implements IBizBusinessOutsourceAssessService {
+    @Autowired
+    private IBizBusinessOutsourceAssessSampleRelationService outsourceAssessSampleRelationService;
 
+    @Override
+    public ReturnDTO<OutsourceAssessSaveResponse> saveOutsourceAssess(BizBusinessOutsourceAssess request) {
+        //生成编号
+        String labCode = request.getLabCode();
+        String groupCode = request.getGroupCode();
+        Long maxNo = this.baseMapper.selectMaxProjectNo();
+        String projectNo = NoGeneratorUtil.getCode(NoGenerateFileCodeEnum.D, labCode, NoGenerateRecordTypeCodeEnum.OUTSOURCE_ACCESS, groupCode, maxNo);
+        request.setCreateUserId(request.getUserId());
+        request.setCreateUserName(request.getUserName());
+        request.setApprovalStatus(ApprovalStatusEnum.DRAFT); //草稿箱状态
+        request.setProjectNo(projectNo);
+        int row = this.baseMapper.insert(request);
+        Assert.isFalse(row <= 0, () -> {
+            throw new BusinessException(BusinessExceptionEnum.OUTSOURCE_ACCESS_SAVE_FAILED);
+        });
+        //关联表
+        saveRelationData(request);
+        OutsourceAssessSaveResponse saveResponse = new OutsourceAssessSaveResponse();
+        saveResponse.setId(request.getId());
+        saveResponse.setProjectNo(projectNo);
+        return ReturnUtil.success(saveResponse);
+    }
+
+    @Override
+    @Transactional
+    public ReturnDTO draftUpdate(BizBusinessOutsourceAssess request) {
+        if (this.baseMapper.updateById(request) > 0) {
+            //关联表删除、增加
+            removeRelationData(request.getId());
+            saveRelationData(request);
+            return ReturnUtil.success();
+        }
+        throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
+    }
+
+    @Override
+    public ReturnDTO draftDelete(Long id) {
+        if (this.baseMapper.deleteById(id) > 0) {
+            //关联表删除
+            removeRelationData(id);
+            return ReturnUtil.success();
+        }
+        throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
+    }
+
+    @Override
+    public ReturnDTO draftBatchDelete(List<Long> ids) {
+        if (this.baseMapper.deleteBatchIds(ids) >= 0) {
+            ids.forEach(id -> removeRelationData(id));
+            return ReturnUtil.success();
+        }
+        throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
+    }
+
+    @Override
+    @Transactional
+    public ReturnDTO failUpdate(BizBusinessOutsourceAssess request) {
+        AuthUser user = ShiroKit.getUser();
+        Assert.isFalse(Objects.isNull(user), () -> {
+            throw new BusinessException(BusinessExceptionEnum.LOGIN_USER_ACQUIRE_FAILED);
+        });
+        request.setApprovalStatus(ApprovalStatusEnum.IN_APPROVED);
+        if (this.baseMapper.updateById(request) > 0) {
+            //关联表删除、增加
+            removeRelationData(request.getId());
+            saveRelationData(request);
+            baseApprovalService.failUpdate(request.getProcessId());
+            return ReturnUtil.success();
+        }
+        throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
+    }
+
+    private void saveRelationData(BizBusinessOutsourceAssess request) {
+        List<BizBusinessOutsourceAssessSampleRelation> sampleRelations = new ArrayList<>();
+        request.getOrderSampleList().forEach(dto -> {
+            BizBusinessOutsourceAssessSampleRelation relation = new BizBusinessOutsourceAssessSampleRelation();
+            relation.setOrderId(dto.getOrderId());
+            relation.setSampleId(dto.getSampleId());
+            relation.setAccessId(request.getId());
+            sampleRelations.add(relation);
+        });
+        if(outsourceAssessSampleRelationService.saveBatch(sampleRelations)){
+            return;
+        }
+        throw new BusinessException(BusinessExceptionEnum.OUTSOURCE_ACCESS_SAVE_FAILED);
+    }
+
+    private void removeRelationData(Long assessId) {
+        QueryWrapper<BizBusinessOutsourceAssessSampleRelation> wrapper = new QueryWrapper<>();
+        wrapper.eq("access_id", assessId);
+        if(outsourceAssessSampleRelationService.remove(wrapper)){
+            return;
+        }
+        throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
+    }
 }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceProtocolServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceProtocolServiceImpl.java
new file mode 100644
index 0000000..821e728
--- /dev/null
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceProtocolServiceImpl.java
@@ -0,0 +1,60 @@
+package com.casic.missiles.service.Impl.business;
+
+import cn.hutool.core.lang.Assert;
+import com.casic.missiles.dto.BaseApprovalSubmitRequest;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.ReturnUtil;
+import com.casic.missiles.dto.business.outsource.OutsourceProtocolApprovalListRequest;
+import com.casic.missiles.dto.business.outsource.OutsourceProtocolSaveResponse;
+import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.NoGenerateFileCodeEnum;
+import com.casic.missiles.enums.NoGenerateRecordTypeCodeEnum;
+import com.casic.missiles.enums.system.ApprovalStatusEnum;
+import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.mapper.business.BizBusinessOutsourceProtocolMapper;
+import com.casic.missiles.mapper.business.BizBusinessOutsourcerInfoMapper;
+import com.casic.missiles.model.business.BizBusinessOutsourceProtocol;
+import com.casic.missiles.model.business.BizBusinessOutsourcerInfo;
+import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl;
+import com.casic.missiles.service.business.IBizBusinessOutsourceProtocolService;
+import com.casic.missiles.utils.NoGeneratorUtil;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 计量检定业务-分包管理-测试、校准或检定工作分包协议书 服务实现类
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-08-24
+ */
+@Service
+public class BizBusinessOutsourceProtocolServiceImpl extends GeneralApprovalServiceImpl<BizBusinessOutsourceProtocolMapper, BizBusinessOutsourceProtocol, BizBusinessOutsourceProtocol, OutsourceProtocolApprovalListRequest, BaseApprovalSubmitRequest> implements IBizBusinessOutsourceProtocolService {
+    @Autowired
+    private BizBusinessOutsourcerInfoMapper outsourcerInfoMapper;
+
+    @Override
+    public ReturnDTO<OutsourceProtocolSaveResponse> saveOutsourceProtocol(BizBusinessOutsourceProtocol request) {
+        //生成编号
+        String labCode = request.getLabCode();
+        String groupCode = request.getGroupCode();
+        Long maxNo = this.baseMapper.selectMaxProtocolNo();
+        String protocolNo = NoGeneratorUtil.getCode(NoGenerateFileCodeEnum.D, labCode, NoGenerateRecordTypeCodeEnum.OUTSOURCE_PROTOCOL, groupCode, maxNo);
+        request.setCreateUserId(request.getUserId());
+        request.setCreateUserName(request.getUserName());
+        request.setApprovalStatus(ApprovalStatusEnum.DRAFT); //草稿箱状态
+        request.setProtocolNo(protocolNo);
+        BizBusinessOutsourcerInfo outsourcerInfo = outsourcerInfoMapper.selectById(request.getOutsourcerId());
+        request.setOutsourceNo(outsourcerInfo.getOutsourcerNo());
+        request.setOutsourceName(outsourcerInfo.getOutsourcerName());
+        int row = this.baseMapper.insert(request);
+        Assert.isFalse(row <= 0, () -> {
+            throw new BusinessException(BusinessExceptionEnum.OUTSOURCE_PROTOCOL_SAVE_FAILED);
+        });
+        OutsourceProtocolSaveResponse saveResponse = new OutsourceProtocolSaveResponse();
+        saveResponse.setId(request.getId());
+        saveResponse.setProtocolNo(protocolNo);
+        return ReturnUtil.success(saveResponse);
+    }
+}
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourcerInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourcerInfoServiceImpl.java
index 75f639d..8aadad7 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourcerInfoServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourcerInfoServiceImpl.java
@@ -3,12 +3,12 @@
 import cn.hutool.core.lang.Assert;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.dto.*;
 import com.casic.missiles.dto.business.outsource.OutsourcerInfoApprovalListRequest;
 import com.casic.missiles.dto.business.outsource.OutsourcerSaveResponse;
 import com.casic.missiles.enums.BusinessExceptionEnum;
-import com.casic.missiles.enums.PrefixCodeEnum;
+import com.casic.missiles.enums.NoGenerateFileCodeEnum;
+import com.casic.missiles.enums.NoGenerateRecordTypeCodeEnum;
 import com.casic.missiles.enums.system.ApprovalStatusEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.mapper.business.BizBusinessOutsourcerInfoMapper;
@@ -20,7 +20,7 @@
 import com.casic.missiles.service.business.IBizBusinessOutsourcerInfoService;
 import com.casic.missiles.service.business.IBizBusinessOutsourcerUserInfoService;
 import com.casic.missiles.utils.DictCodeUtils;
-import com.casic.missiles.utils.NumberGeneratorUtil;
+import com.casic.missiles.utils.NoGeneratorUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -42,22 +42,12 @@
     private IBizBusinessOutsourcerUserInfoService outsourcerUserInfoService;
 
     @Override
-    public List<BizBusinessOutsourcerInfo> list(OutsourcerInfoApprovalListRequest request) {
-        request.setCreateUserId(null);
-        request.setApprovalStatus(ApprovalStatusEnum.PASSED);
-        Page<BizBusinessOutsourcerInfo> page = PageFactory.defaultPage();
-        page.setCurrent(1);
-        page.setSearchCount(false);
-        page.setSize(Integer.MAX_VALUE);
-        Page<BizBusinessOutsourcerInfo> resultPage = this.baseMapper.selectBatchForApprovalList(page, request, null);
-        return resultPage.getRecords();
-    }
-
-    @Override
     public ReturnDTO<OutsourcerSaveResponse> saveOutsourcer(BizBusinessOutsourcerInfo request) {
         //生成编号
+        String labCode = request.getLabCode();
+        String groupCode = request.getGroupCode();
         Long maxNo = this.baseMapper.selectMaxNo();
-        String outsourcerNo = NumberGeneratorUtil.getContactNo(PrefixCodeEnum.OUTSOURCER_PREFIX, maxNo);
+        String outsourcerNo = NoGeneratorUtil.getCode(NoGenerateFileCodeEnum.D, labCode, NoGenerateRecordTypeCodeEnum.OUTSOURCE_INFO, groupCode, maxNo);
         request.setOutsourcerNo(outsourcerNo);
         request.setCreateUserId(request.getUserId());
         request.setCreateUserName(request.getUserName());
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessSiteExecutiveInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessSiteExecutiveInfoServiceImpl.java
index ebab3e6..6c6a129 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessSiteExecutiveInfoServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessSiteExecutiveInfoServiceImpl.java
@@ -189,9 +189,9 @@
         QueryWrapper<BizBusinessSiteExecutiveStaffRelation> mWrapper = new QueryWrapper<>();
         mWrapper.eq("site_executive_id", siteExecutiveId);
         boolean mRemove = siteExecutiveStaffRelationService.remove(mWrapper);
-        Assert.isFalse(eRemove || mRemove, () -> {
+        if(!eRemove || !mRemove){
             throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
-        });
+        }
     }
 
     private void doPopulateSiteExecutive(SiteExecutiveDetailResponse detailResponse) {
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessLabExecutiveInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessLabExecutiveInfoServiceImpl.java
index 50c5616..0242fcf 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessLabExecutiveInfoServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessLabExecutiveInfoServiceImpl.java
@@ -297,6 +297,29 @@
     }
 
     @Override
+    public List<SampleLabExecutiveListResponse> deptLabExecutiveList(SampleLabExecutiveListRequest request) throws Exception {
+        Page<SampleLabExecutiveListResponse> page = PageFactory.defaultPage();
+        page.setCurrent(1);
+        page.setSearchCount(false);
+        page.setSize(Integer.MAX_VALUE);
+        Page<SampleLabExecutiveListResponse> resultPage = this.deptLabExecutiveListPage(page, request);
+        return resultPage.getRecords();
+    }
+
+    @Override
+    public List<SampleLabExecutiveListResponse> deptLabExecutiveListByIds(String measureStatus, List<Long> ids) throws Exception {
+        Page<SampleLabExecutiveListResponse> page = PageFactory.defaultPage();
+        page.setCurrent(1);
+        page.setSearchCount(false);
+        page.setSize(Integer.MAX_VALUE);
+        SampleLabExecutiveListRequest request = new SampleLabExecutiveListRequest();
+        request.setIds(ids);
+        request.setMeasureStatus(measureStatus);
+        Page<SampleLabExecutiveListResponse> resultPage = this.deptLabExecutiveListPage(page, request);
+        return resultPage.getRecords();
+    }
+
+    @Override
     public Page<SampleLabExecutiveListResponse> myLabExecutiveListPage(Page<SampleLabExecutiveListResponse> page, SampleLabExecutiveListRequest labExecutiveListRequest) throws Exception{
         AuthUser user = ShiroKit.getUser();
         Assert.isFalse(Objects.isNull(user), () -> {
@@ -350,6 +373,29 @@
     }
 
     @Override
+    public List<SampleLabExecutiveListResponse> myLabExecutiveList(SampleLabExecutiveListRequest request) throws Exception {
+        Page<SampleLabExecutiveListResponse> page = PageFactory.defaultPage();
+        page.setCurrent(1);
+        page.setSearchCount(false);
+        page.setSize(Integer.MAX_VALUE);
+        Page<SampleLabExecutiveListResponse> resultPage = this.myLabExecutiveListPage(page, request);
+        return resultPage.getRecords();
+    }
+
+    @Override
+    public List<SampleLabExecutiveListResponse> myLabExecutiveListByIds(String measureStatus, List<Long> ids) throws Exception {
+        Page<SampleLabExecutiveListResponse> page = PageFactory.defaultPage();
+        page.setCurrent(1);
+        page.setSearchCount(false);
+        page.setSize(Integer.MAX_VALUE);
+        SampleLabExecutiveListRequest request = new SampleLabExecutiveListRequest();
+        request.setIds(ids);
+        request.setMeasureStatus(measureStatus);
+        Page<SampleLabExecutiveListResponse> resultPage = this.myLabExecutiveListPage(page, request);
+        return resultPage.getRecords();
+    }
+
+    @Override
     public List<SampleAmountResponse> myExecutiveAmount() {
         //登录用户id获取计量人员id，实验室检测信息中存储的是计量人员id
         AuthUser user = ShiroKit.getUser();
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentInfoServiceImpl.java
index 864b05e..db8cad4 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentInfoServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentInfoServiceImpl.java
@@ -35,7 +35,6 @@
 import com.casic.missiles.utils.ConvertUtils;
 import com.casic.missiles.utils.DictCodeUtils;
 import com.casic.missiles.utils.NumberGeneratorUtil;
-import org.flowable.engine.RuntimeService;
 import org.flowable.engine.runtime.ProcessInstance;
 import org.jetbrains.annotations.NotNull;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -43,7 +42,6 @@
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
 
-import javax.annotation.Resource;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
@@ -81,8 +79,6 @@
     private IBizEquipmentAttachmentService attachmentService;
     @Autowired
     private IBizEquipmentCheckpointService checkpointService;
-    @Resource
-    private RuntimeService runtimeService;
     @Autowired
     private ApprovalOperateService approvalOperateService;
 
@@ -235,18 +231,18 @@
     private void updateRelationInfo(EquipmentAddRequest request, BizEquipmentInfoApproval equipmentInfoApproval) {
         QueryWrapper<BizEquipmentTechnicalTarget> targetWrapper = new QueryWrapper<>();
         targetWrapper.eq("equipment_no", equipmentInfoApproval.getEquipmentNo());
-        boolean removeTargetFlag = technicalTargetService.remove(targetWrapper);
-        boolean saveTargetFlag = technicalTargetService.saveBatch(request.getTechnicalTargetList());
+        technicalTargetService.remove(targetWrapper);
+        technicalTargetService.saveBatch(request.getTechnicalTargetList());
 
         QueryWrapper<BizEquipmentAttachment> attachmentWrapper = new QueryWrapper<>();
         attachmentWrapper.eq("equipment_no", equipmentInfoApproval.getEquipmentNo());
-        boolean removeAttachmentFlag = attachmentService.remove(attachmentWrapper);
-        boolean saveAttachmentFlag = attachmentService.saveBatch(request.getAttachmentList());
+        attachmentService.remove(attachmentWrapper);
+        attachmentService.saveBatch(request.getAttachmentList());
 
         QueryWrapper<BizEquipmentCheckpoint> checkpointWrapper = new QueryWrapper<>();
         checkpointWrapper.eq("equipment_no", equipmentInfoApproval.getEquipmentNo());
-        boolean removeCheckpointFlag = checkpointService.remove(checkpointWrapper);
-        boolean saveCheckpointFlag = checkpointService.saveBatch(request.getCheckpointList());
+        checkpointService.remove(checkpointWrapper);
+        checkpointService.saveBatch(request.getCheckpointList());
     }
 
     @Override
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardInfoServiceImpl.java
index faff1ae..c50a5b3 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardInfoServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardInfoServiceImpl.java
@@ -22,7 +22,9 @@
 import com.casic.missiles.mapper.equipment.BizEquipmentStandardInfoMapper;
 import com.casic.missiles.mapper.equipment.BizEquipmentStandardTechnologyRelationMapper;
 import com.casic.missiles.mapper.resource.BizResourceStaffInfoMapper;
-import com.casic.missiles.model.equipment.*;
+import com.casic.missiles.model.equipment.BizEquipmentStandardInfo;
+import com.casic.missiles.model.equipment.BizEquipmentStandardInfoApproval;
+import com.casic.missiles.model.equipment.BizEquipmentStandardTechnologyRelation;
 import com.casic.missiles.model.resource.BizResourceStaffInfo;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.dao.DeptMapper;
@@ -33,14 +35,12 @@
 import com.casic.missiles.service.flowable.ApprovalOperateService;
 import com.casic.missiles.utils.ConvertUtils;
 import com.casic.missiles.utils.DictCodeUtils;
-import org.flowable.engine.RuntimeService;
 import org.flowable.engine.runtime.ProcessInstance;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
 
-import javax.annotation.Resource;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
@@ -62,8 +62,6 @@
     private BizResourceStaffInfoMapper staffInfoMapper;
     @Autowired
     private IBaseApprovalService baseApprovalService;
-    @Resource
-    private RuntimeService runtimeService;
     @Autowired
     private ApprovalOperateService approvalOperateService;
     @Autowired
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSealInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSealInfoServiceImpl.java
index 7c91fa2..00040d6 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSealInfoServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSealInfoServiceImpl.java
@@ -15,6 +15,7 @@
 import com.casic.missiles.modular.system.model.User;
 import com.casic.missiles.service.resource.IBizResourceSealInfoService;
 import com.casic.missiles.utils.DictCodeUtils;
+import com.casic.missiles.utils.MinioUtil;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -33,6 +34,8 @@
     private BizResourceSealInfoMapper sealInfoMapper;
     @Autowired
     private UserMapper userMapper;
+    @Autowired
+    private MinioUtil minioUtil;
 
     @Override
     public Page<BizResourceSealInfo> listPage(Page<BizResourceSealInfo> page, SealInfoListRequest request) throws Exception {
@@ -44,6 +47,7 @@
         Page<BizResourceSealInfo> sealInfoPage = sealInfoMapper.selectPage(page, wrapper);
         for (BizResourceSealInfo record : sealInfoPage.getRecords()) {
             DictCodeUtils.convertDictCodeToName(record);
+            record.setMinioFileUrl(minioUtil.getFileUrl(record.getMinioFileName()));
         }
         return sealInfoPage;
     }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceStaffInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceStaffInfoServiceImpl.java
index f058cf5..09203ac 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceStaffInfoServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceStaffInfoServiceImpl.java
@@ -3,6 +3,7 @@
 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.core.page.PageFactory;
 import com.casic.missiles.dto.IdDTO;
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
@@ -86,6 +87,13 @@
     }
 
     @Override
+    public List<BizResourceStaffInfo> list(StaffListRequest request) throws Exception {
+        Page<BizResourceStaffInfo> page = PageFactory.defaultPage();
+        Page<BizResourceStaffInfo> staffInfoPage = this.listPage(page, request);
+        return staffInfoPage.getRecords();
+    }
+
+    @Override
     @Transactional
     public ReturnDTO<IdDTO> staffBaseAdd(BizResourceStaffInfo staffInfo) {
         //登录账号查重
@@ -495,6 +503,28 @@
         return certResponsePage;
     }
 
+    @Override
+    public List<StaffCertResponse> certListByIds(List<Long> ids) throws Exception {
+        Page<StaffCertResponse> page = PageFactory.defaultPage();
+        page.setCurrent(1);
+        page.setSearchCount(false);
+        page.setSize(Integer.MAX_VALUE);
+        StaffCertRequest request = new StaffCertRequest();
+        request.setIds(ids);
+        Page<StaffCertResponse> resultPage = this.certListPage(page, request);
+        return resultPage.getRecords();
+    }
+
+    @Override
+    public List<StaffCertResponse> certList(StaffCertRequest request) throws Exception {
+        Page<StaffCertResponse> page = PageFactory.defaultPage();
+        page.setCurrent(1);
+        page.setSearchCount(false);
+        page.setSize(Integer.MAX_VALUE);
+        Page<StaffCertResponse> resultPage = this.certListPage(page, request);
+        return resultPage.getRecords();
+    }
+
     @Async
     public void deleteRelationInfo(Long staffId){
         QueryWrapper<BizResourceStaffEducation> educationWrapper = new QueryWrapper<>();
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceStaffVerifierServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceStaffVerifierServiceImpl.java
index 8ac7eee..b508d45 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceStaffVerifierServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceStaffVerifierServiceImpl.java
@@ -52,8 +52,8 @@
     private WebSocket webSocket;
 
     @Override
-    public ReturnDTO expirationReminder(IdDTO idDto) {
-        BizResourceStaffVerifier staffVerifier = verifierMapper.selectById(idDto.getId());
+    public ReturnDTO expirationReminder(IdDTO idDTO) {
+        BizResourceStaffVerifier staffVerifier = verifierMapper.selectById(idDTO.getId());
         BizResourceStaffInfo staffInfo = staffInfoMapper.selectById(staffVerifier.getStaffId());
         QueryWrapper<User> wrapper = new QueryWrapper<>();
         wrapper.eq("account", staffInfo.getAccount());
@@ -65,7 +65,7 @@
         Assert.isFalse(Objects.isNull(user), () -> {
             throw new BusinessException(BusinessExceptionEnum.LOGIN_USER_ACQUIRE_FAILED);
         });
-        WorkbenchRemindMessage remindMessage = new WorkbenchRemindMessage(userInfo.getId(), userInfo.getDeptId(), idDto.getId(), staffVerifier.getCertNo(), MessageTypeEnum.STAFF_CERT.getCode(), MessageSourceModuleEnum.RESOURCE.getCode(), MessageTypeEnum.STAFF_CERT.getValue(), MessageTypeEnum.STAFF_CERT.getValue(), staffVerifier.getCertName(),0, user.getId(), user.getName());
+        WorkbenchRemindMessage remindMessage = new WorkbenchRemindMessage(userInfo.getId(), userInfo.getDeptId(), idDTO.getId(), staffVerifier.getCertNo(), MessageTypeEnum.STAFF_CERT.getCode(), MessageSourceModuleEnum.RESOURCE.getCode(), MessageTypeEnum.STAFF_CERT.getValue(), MessageTypeEnum.STAFF_CERT.getValue(), staffVerifier.getCertName(),0, user.getId(), user.getName());
         if(messageMapper.insert(remindMessage) > 0){
             // 新增到消息列表后向用户推送消息
             webSocket.sendOneMessage(String.valueOf(userInfo.getId()), JSONObject.toJSONString(remindMessage));
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceTrainInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceTrainInfoServiceImpl.java
index c1d6308..3a533f2 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceTrainInfoServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceTrainInfoServiceImpl.java
@@ -44,11 +44,14 @@
     @Override
     public Page<BizResourceTrainInfo> listPage(Page<BizResourceTrainInfo> page, TrainListRequest request) throws Exception {
         QueryWrapper<BizResourceTrainInfo> wrapper = new QueryWrapper<>();
-        wrapper.like("train_no", request.getTrainNo());
-        wrapper.apply(StringUtils.isNotBlank(request.getCreateTimeStart()),//apply方法传入参数名不能为空
-                "{0} <= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getCreateTimeStart().split(" ")[0]);
-        wrapper.apply(StringUtils.isNotBlank(request.getCreateTimeEnd()),
-                "{0} >= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getCreateTimeEnd().split(" ")[0]);
+        wrapper.like(StringUtils.isNotEmpty(request.getTrainNo()), "train_no", request.getTrainNo());
+        wrapper.like(StringUtils.isNotEmpty(request.getDutyLeader()),"duty_leader", request.getDutyLeader());
+        if(StringUtils.isNotBlank(request.getCreateTimeStart())){
+            wrapper.apply("{0} <= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getCreateTimeStart().split(" ")[0]);
+        }
+        if(StringUtils.isNotBlank(request.getCreateTimeEnd())){
+            wrapper.apply("{0} >= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getCreateTimeEnd().split(" ")[0]);
+        }
         wrapper.orderByDesc("create_time");
         Page<BizResourceTrainInfo> trainInfoPage = trainInfoMapper.selectPage(page, wrapper);
         for (BizResourceTrainInfo record : trainInfoPage.getRecords()) {
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/EnvLocationInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/EnvLocationInfoServiceImpl.java
new file mode 100644
index 0000000..cdc5742
--- /dev/null
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/EnvLocationInfoServiceImpl.java
@@ -0,0 +1,31 @@
+package com.casic.missiles.service.Impl.resource;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.casic.missiles.dto.resource.environment.LocationListRequest;
+import com.casic.missiles.dto.resource.environment.LocationListResponse;
+import com.casic.missiles.mapper.resource.EnvLocationInfoMapper;
+import com.casic.missiles.model.resource.EnvLocationInfo;
+import com.casic.missiles.service.resource.IEnvLocationInfoService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 实验室环境监控系统-设备表 服务实现类
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-06-07
+ */
+@Service
+public class EnvLocationInfoServiceImpl extends ServiceImpl<EnvLocationInfoMapper, EnvLocationInfo> implements IEnvLocationInfoService {
+    @Autowired
+    private EnvLocationInfoMapper locationInfoMapper;
+
+    @Override
+    public Page<LocationListResponse> listPage(Page<LocationListResponse> page, LocationListRequest request) {
+        Page<LocationListResponse> resultPage = locationInfoMapper.selectLocationListPage(page, request);
+        return resultPage;
+    }
+}
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/DownloadCenterServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/DownloadCenterServiceImpl.java
index c956d24..d9f3282 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/DownloadCenterServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/DownloadCenterServiceImpl.java
@@ -131,10 +131,12 @@
         wrapper.like(StringUtils.isNotBlank(request.getModuleName()), "module_name", request.getModuleName());
         wrapper.like(StringUtils.isNotBlank(request.getFileName()), "file_name", request.getFileName());
         wrapper.like(StringUtils.isNotBlank(request.getFileType()), "file_type", request.getFileType());
-        wrapper.apply(StringUtils.isNotBlank(request.getStartTime()),
-                "{0} <= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getStartTime().split(" ")[0]);
-        wrapper.apply(StringUtils.isNotBlank(request.getEndTime()),
-                "{0} >= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getEndTime().split(" ")[0]);
+        if(StringUtils.isNotBlank(request.getStartTime())){
+            wrapper.apply("{0} <= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getStartTime().split(" ")[0]);
+        }
+        if(StringUtils.isNotBlank(request.getEndTime())){
+            wrapper.apply("{0} >= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getEndTime().split(" ")[0]);
+        }
         wrapper.orderByDesc("create_time");
         return wrapper;
     }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemSignServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemSignServiceImpl.java
index 41976bb..7e90a09 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemSignServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemSignServiceImpl.java
@@ -52,15 +52,14 @@
 
     @Override
     public Page<SystemSign> listPage(Page<SystemSign> page, SignListRequest request) {
-        QueryWrapper<SystemSign> wrapper = getWrapper(request);
-        Page<SystemSign> signPage = signMapper.selectPage(page, wrapper);
+        Page<SystemSign> signPage = signMapper.selectSignListPage(page, request);
         return signPage;
     }
 
     @Override
     public List<SystemSign> list(SignListRequest request) {
-        QueryWrapper<SystemSign> wrapper = getWrapper(request);
-        return signMapper.selectList(wrapper);
+        List<SystemSign> signList = signMapper.selectSignList(request);
+        return signList;
     }
 
     @Override
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessCertificatePrintService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessCertificatePrintService.java
index 03247ab..7d6db77 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessCertificatePrintService.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessCertificatePrintService.java
@@ -9,6 +9,8 @@
 import com.casic.missiles.model.business.BizBusinessCertificatePrintLog;
 import com.casic.missiles.model.business.BizBusinessCertificateReport;
 
+import java.util.List;
+
 /**
  * <p>
  * 计量检定业务-任务计量管理-证书管理 服务类
@@ -30,4 +32,9 @@
     ReturnDTO certificatePrintStatus(Long id, String printStatus);
 
     ReturnDTO<BizBusinessCertificatePrintLog> certificatePrintLog(Long id);
+
+    List<CertificatePrintListResponse> listByIds(List<Long> ids);
+
+    List<CertificatePrintListResponse> list(CertificatePrintApprovalListRequest request);
+
 }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessCertificateReportService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessCertificateReportService.java
index 305ac7f..b33ef22 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessCertificateReportService.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessCertificateReportService.java
@@ -21,6 +21,4 @@
     ReturnDTO<CertificateReportSaveResponse> saveCertificateReport(BizBusinessCertificateReport request);
 
     ReturnDTO<BizBusinessCertificateReport> detail(BaseDetailRequest request);
-
-
 }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessIdentifyInfoService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessIdentifyInfoService.java
index 53c49d0..6d2089f 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessIdentifyInfoService.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessIdentifyInfoService.java
@@ -6,6 +6,8 @@
 import com.casic.missiles.model.business.BizBusinessIdentifyInfo;
 import com.baomidou.mybatisplus.extension.service.IService;
 
+import java.util.List;
+
 /**
  * <p>
  * 计量检定业务-任务计量管理-标识打印 服务类
@@ -20,7 +22,11 @@
 
     ReturnDTO addIdentify(BizBusinessIdentifyInfo identifyInfo);
 
-    ReturnDTO updateIdentify(BizBusinessIdentifyInfo identifyInfo);
+    ReturnDTO updateIdentify(Long id);
 
     ReturnDTO deleteIdentify(Long id);
+
+    List<BizBusinessIdentifyInfo> list(IdentifyListRequest request) throws Exception;
+
+    ReturnDTO<String> equipmentQrCode(Long id);
 }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessOutsourceAssessService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessOutsourceAssessService.java
index 5e15bc8..bcdc791 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessOutsourceAssessService.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessOutsourceAssessService.java
@@ -1,7 +1,11 @@
 package com.casic.missiles.service.business;
 
+import com.casic.missiles.dto.BaseApprovalSubmitRequest;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.business.outsource.OutsourceAssessApprovalListRequest;
+import com.casic.missiles.dto.business.outsource.OutsourceAssessSaveResponse;
 import com.casic.missiles.model.business.BizBusinessOutsourceAssess;
-import com.baomidou.mybatisplus.extension.service.IService;
+import com.casic.missiles.service.IGeneralApprovalService;
 
 /**
  * <p>
@@ -11,6 +15,7 @@
  * @author wangpeng
  * @since 2023-08-16
  */
-public interface IBizBusinessOutsourceAssessService extends IService<BizBusinessOutsourceAssess> {
+public interface IBizBusinessOutsourceAssessService extends IGeneralApprovalService<BizBusinessOutsourceAssess, BizBusinessOutsourceAssess, OutsourceAssessApprovalListRequest, BaseApprovalSubmitRequest> {
 
+    ReturnDTO<OutsourceAssessSaveResponse> saveOutsourceAssess(BizBusinessOutsourceAssess request);
 }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessOutsourceProtocolService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessOutsourceProtocolService.java
new file mode 100644
index 0000000..7f3092b
--- /dev/null
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessOutsourceProtocolService.java
@@ -0,0 +1,21 @@
+package com.casic.missiles.service.business;
+
+import com.casic.missiles.dto.BaseApprovalSubmitRequest;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.business.outsource.OutsourceProtocolApprovalListRequest;
+import com.casic.missiles.dto.business.outsource.OutsourceProtocolSaveResponse;
+import com.casic.missiles.model.business.BizBusinessOutsourceProtocol;
+import com.casic.missiles.service.IGeneralApprovalService;
+
+/**
+ * <p>
+ * 计量检定业务-分包管理-测试、校准或检定工作分包协议书 服务类
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-08-24
+ */
+public interface IBizBusinessOutsourceProtocolService extends IGeneralApprovalService<BizBusinessOutsourceProtocol, BizBusinessOutsourceProtocol, OutsourceProtocolApprovalListRequest, BaseApprovalSubmitRequest> {
+
+    ReturnDTO<OutsourceProtocolSaveResponse> saveOutsourceProtocol(BizBusinessOutsourceProtocol request);
+}
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessOutsourcerInfoService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessOutsourcerInfoService.java
index 9ba656b..b199de4 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessOutsourcerInfoService.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessOutsourcerInfoService.java
@@ -24,8 +24,6 @@
  */
 public interface IBizBusinessOutsourcerInfoService extends IGeneralApprovalService<BizBusinessOutsourcerInfo, BizBusinessOutsourcerInfo, OutsourcerInfoApprovalListRequest, BaseApprovalSubmitRequest> {
 
-    List<BizBusinessOutsourcerInfo> list(OutsourcerInfoApprovalListRequest request);
-
     ReturnDTO<OutsourcerSaveResponse> saveOutsourcer(BizBusinessOutsourcerInfo request);
 
     BizBusinessOutsourcerInfo detail(Long id) throws Exception;
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessLabExecutiveInfoService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessLabExecutiveInfoService.java
index 278c674..f6ed490 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessLabExecutiveInfoService.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessLabExecutiveInfoService.java
@@ -30,8 +30,16 @@
 
     Page<SampleLabExecutiveListResponse> deptLabExecutiveListPage(Page<SampleLabExecutiveListResponse> page, SampleLabExecutiveListRequest labExecutiveListRequest) throws Exception;
 
+    List<SampleLabExecutiveListResponse> deptLabExecutiveList(SampleLabExecutiveListRequest request) throws Exception;
+
+    List<SampleLabExecutiveListResponse> deptLabExecutiveListByIds(String measureStatus, List<Long> ids) throws Exception;
+
     Page<SampleLabExecutiveListResponse> myLabExecutiveListPage(Page<SampleLabExecutiveListResponse> page, SampleLabExecutiveListRequest labExecutiveListRequest) throws Exception;
 
+    List<SampleLabExecutiveListResponse> myLabExecutiveList(SampleLabExecutiveListRequest request) throws Exception;
+
+    List<SampleLabExecutiveListResponse> myLabExecutiveListByIds(String measureStatus, List<Long> ids) throws Exception;
+
     List<SampleAmountResponse> myExecutiveAmount();
 
     ReturnDTO sampleReceive(List<SampleOperateRequest> requestList);
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/OutsourceAssessEventPostProcessor.java b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/OutsourceAssessEventPostProcessor.java
new file mode 100644
index 0000000..cda3086
--- /dev/null
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/OutsourceAssessEventPostProcessor.java
@@ -0,0 +1,46 @@
+package com.casic.missiles.service.listeners.processor;
+
+import cn.hutool.core.lang.Assert;
+import com.casic.missiles.dto.flowable.NotifyEventStatusDTO;
+import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.notifyevent.ActionStatusBeanEnum;
+import com.casic.missiles.enums.system.ApprovalStatusEnum;
+import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.mapper.business.BizBusinessOutsourceAssessMapper;
+import com.casic.missiles.model.business.BizBusinessOutsourceAssess;
+import com.casic.missiles.service.listeners.NotifyEventPostProcessor;
+import com.casic.missiles.utils.SpringContextUtil;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.Objects;
+
+/**
+ * @Description: 测试、校准或检定工作分包评审表审批通过后处理
+ * @Author: wangpeng
+ * @Date: 2023/8/21 13:20
+ */
+@Slf4j
+@Service(ActionStatusBeanEnum.OUTSOURCE_ASSESS_BEAN_NAME)
+public class OutsourceAssessEventPostProcessor implements NotifyEventPostProcessor {
+    @Override
+    @Transactional
+    public void doHandleNotifyEvent(NotifyEventStatusDTO notifyEventStatusDTO) {
+        Long id = Long.valueOf(notifyEventStatusDTO.getId());
+        Assert.isFalse(Objects.isNull(id), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        BizBusinessOutsourceAssessMapper outsourceAssessMapper = SpringContextUtil.getBean(BizBusinessOutsourceAssessMapper.class);
+
+        BizBusinessOutsourceAssess outsourceAssess = new BizBusinessOutsourceAssess();
+        outsourceAssess.setId(id);
+        outsourceAssess.setApprovalStatus(ApprovalStatusEnum.PASSED);
+        int updateFlag = outsourceAssessMapper.updateById(outsourceAssess);
+        if (updateFlag <= 0) {
+            log.error("测试、校准或检定工作分包评审表审批通过后处理失败");
+            throw new BusinessException(BusinessExceptionEnum.APPROVAL_PROCESSOR_HANDLE_FAILED);
+        }
+    }
+
+}
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/OutsourceProtocolEventPostProcessor.java b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/OutsourceProtocolEventPostProcessor.java
new file mode 100644
index 0000000..490c66e
--- /dev/null
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/OutsourceProtocolEventPostProcessor.java
@@ -0,0 +1,46 @@
+package com.casic.missiles.service.listeners.processor;
+
+import cn.hutool.core.lang.Assert;
+import com.casic.missiles.dto.flowable.NotifyEventStatusDTO;
+import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.notifyevent.ActionStatusBeanEnum;
+import com.casic.missiles.enums.system.ApprovalStatusEnum;
+import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.mapper.business.BizBusinessOutsourceProtocolMapper;
+import com.casic.missiles.model.business.BizBusinessOutsourceProtocol;
+import com.casic.missiles.service.listeners.NotifyEventPostProcessor;
+import com.casic.missiles.utils.SpringContextUtil;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.Objects;
+
+/**
+ * @Description: 测试、校准或检定工作分包协议书审批通过后处理
+ * @Author: wangpeng
+ * @Date: 2023/8/21 13:20
+ */
+@Slf4j
+@Service(ActionStatusBeanEnum.OUTSOURCE_PROTOCOL_BEAN_NAME)
+public class OutsourceProtocolEventPostProcessor implements NotifyEventPostProcessor {
+    @Override
+    @Transactional
+    public void doHandleNotifyEvent(NotifyEventStatusDTO notifyEventStatusDTO) {
+        Long id = Long.valueOf(notifyEventStatusDTO.getId());
+        Assert.isFalse(Objects.isNull(id), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        BizBusinessOutsourceProtocolMapper outsourceProtocolMapper = SpringContextUtil.getBean(BizBusinessOutsourceProtocolMapper.class);
+
+        BizBusinessOutsourceProtocol outsourceProtocol = new BizBusinessOutsourceProtocol();
+        outsourceProtocol.setId(id);
+        outsourceProtocol.setApprovalStatus(ApprovalStatusEnum.PASSED);
+        int updateFlag = outsourceProtocolMapper.updateById(outsourceProtocol);
+        if (updateFlag <= 0) {
+            log.error("测试、校准或检定工作分包协议书审批通过后处理失败");
+            throw new BusinessException(BusinessExceptionEnum.APPROVAL_PROCESSOR_HANDLE_FAILED);
+        }
+    }
+
+}
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/SiteExecutiveEventPostProcessor.java b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/SiteExecutiveEventPostProcessor.java
index 6a690d7..4d25ca4 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/SiteExecutiveEventPostProcessor.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/SiteExecutiveEventPostProcessor.java
@@ -38,7 +38,7 @@
         siteExecutiveInfo.setApprovalStatus(ApprovalStatusEnum.PASSED);
         int updateFlag = siteExecutiveInfoMapper.updateById(siteExecutiveInfo);
         if (updateFlag <= 0) {
-            log.error("现场测试、校准或检定审批审批通过后处理失败");
+            log.error("现场测试、校准或检定审批通过后处理失败");
             throw new BusinessException(BusinessExceptionEnum.APPROVAL_PROCESSOR_HANDLE_FAILED);
         }
     }

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java
index bb0c50f..13a699b 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java
@@ -12,6 +12,7 @@
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.IGeneralApprovalService;
+import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
@@ -19,6 +20,7 @@
 import org.springframework.web.bind.annotation.RequestBody;
 
 import javax.validation.Valid;
+import java.util.List;
 import java.util.Objects;
 
 /**
@@ -117,4 +119,17 @@
         }
         return baseApprovalService.failUpdate(request);
     }
+
+    public List<O> exportList(@RequestBody @Valid R request) throws Exception {
+        List<O> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = baseApprovalService.listExportByIds(request.getIds());
+        } else {
+            list = baseApprovalService.listExport(request);
+        }
+        for (O record : list) {
+            DictCodeUtils.convertDictCodeToName(record);
+        }
+        return list;
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java
index 8a90961..d775831 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java
@@ -5,6 +5,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.business.certificate.CertificateChangeApplyApprovalListRequest;
 import com.casic.missiles.dto.business.certificate.CertificateChangeApplySaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessCertificateChangeApply;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
@@ -20,6 +21,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -48,4 +50,12 @@
         }
         return changeApplyService.saveChangeApply(request);
     }
+
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody CertificateChangeApplyApprovalListRequest request) throws Exception {
+        List<BizBusinessCertificateChangeApply> list = super.exportList(request);
+        super.exportExcel(BizBusinessCertificateChangeApply.class, list, ExportEnum.CERTIFICATE_CHANGE_APPLY.getSheetName());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java
index 5fc4b07..af8230e 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java
@@ -9,6 +9,7 @@
 import com.casic.missiles.dto.business.certificate.CertificatePrintApprovalListRequest;
 import com.casic.missiles.dto.business.certificate.CertificatePrintListResponse;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.enums.business.CertificatePrintStatusEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessCertificatePrintLog;
@@ -18,10 +19,16 @@
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.io.IOException;
+import java.util.List;
 import java.util.Objects;
 
 /**
@@ -98,4 +105,16 @@
         });
         return certificatePrintService.certificatePrintLog(idDTO.getId());
     }
+
+    @ApiOperation("证书打印审批导出")
+    @PostMapping("/listExport")
+    public void exportList(@RequestBody CertificatePrintApprovalListRequest request) throws IOException {
+        List<CertificatePrintListResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = certificatePrintService.listByIds(request.getIds());
+        } else {
+            list = certificatePrintService.list(request);
+        }
+        super.exportExcel(CertificatePrintListResponse.class, list, ExportEnum.CERTIFICATE_PRINT.getSheetName());
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java
index 63b06dc..6b2efd5 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java
@@ -6,6 +6,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.business.certificate.CertificateReportApprovalListRequest;
 import com.casic.missiles.dto.business.certificate.CertificateReportSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessCertificateReport;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
@@ -21,6 +22,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -50,7 +52,7 @@
         return certificateReportService.saveCertificateReport(request);
     }
 
-    @ApiOperation("证书审批详情（基本信息）")
+    @ApiOperation("详情（基本信息）")
     @PostMapping("/detail")
     public ReturnDTO<BizBusinessCertificateReport> detail(@RequestBody @Valid BaseDetailRequest request, BindingResult bindingResult) throws Exception {
         if(bindingResult.hasErrors()){
@@ -59,4 +61,11 @@
         return certificateReportService.detail(request);
     }
 
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody CertificateReportApprovalListRequest request) throws Exception {
+        List<BizBusinessCertificateReport> list = super.exportList(request);
+        super.exportExcel(BizBusinessCertificateReport.class, list, ExportEnum.CERTIFICATE_REPORT.getSheetName());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java
index 46b26bd..57c0809 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java
@@ -10,20 +10,21 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.business.identify.IdentifyListRequest;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessIdentifyInfo;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.business.IBizBusinessIdentifyInfoService;
+import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import javax.validation.Valid;
+import java.util.List;
 import java.util.Objects;
 
 /**
@@ -57,16 +58,13 @@
         return identifyInfoService.addIdentify(identifyInfo);
     }
 
-    @ApiOperation("标识打印更新")
+    @ApiOperation("标识打印更新（更新打印时间）")
     @PostMapping("/update")
-    public ReturnDTO updateIdentify(@RequestBody @Valid BizBusinessIdentifyInfo identifyInfo, BindingResult bindingResult) {
-        Assert.isFalse(Objects.isNull(identifyInfo.getId()), () -> {
+    public ReturnDTO updateIdentify(@RequestBody @Valid IdDTO idDTO) {
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        Assert.isFalse(bindingResult.hasErrors(), () -> {
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        });
-        return identifyInfoService.updateIdentify(identifyInfo);
+        return identifyInfoService.updateIdentify(idDTO.getId());
     }
 
     @ApiOperation("标识打印删除")
@@ -77,4 +75,37 @@
         });
         return identifyInfoService.deleteIdentify(idDTO.getId());
     }
+
+    @ApiOperation("标识打印导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody @Valid IdentifyListRequest request, BindingResult bindingResult) throws Exception {
+        if (bindingResult.hasErrors()) {
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        List<BizBusinessIdentifyInfo> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = identifyInfoService.listByIds(request.getIds());
+        } else {
+            list = identifyInfoService.list(request);
+        }
+        for (BizBusinessIdentifyInfo record : list) {
+            DictCodeUtils.convertDictCodeToName(record);
+        }
+        super.exportExcel(BizBusinessIdentifyInfo.class, list, ExportEnum.IDENTIFY_EXPORT.getSheetName());
+    }
+
+
+    // TODO: 2023/8/23 查询设备信息，4个底部按钮查设备（按钮的作用就是前端用来调不同接口、用来区分中间即将展示的标识），前端弹窗选设备，在确定保存时前端根据底部按钮判断传入设备类型deviceType字典code
+    // TODO: 2023/8/23 接口：查受检设备（第1个按钮），查设备台账（后3个按钮同一接口），查询之后前端根据标志类型的不同加到中间页面时进行判断（按产品给的对应表）
+    // TODO: 2023/8/23 提供二维码接口，前端在加到中间页面时调用一下
+
+    @ApiOperation("设备二维码")
+    @PostMapping("/equipment/qrCode")
+    public ReturnDTO<String> equipmentQrCode(@RequestBody @Valid IdDTO idDTO) {
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return identifyInfoService.equipmentQrCode(idDTO.getId());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java
index 707be6e..7e0453d 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java
@@ -117,7 +117,7 @@
     }
 
     @ApiOperation("任务单导出")
-    @PostMapping("/export")
+    @PostMapping("/listExport")
     public void orderExport(@RequestBody @Valid OrderListRequest request, HttpServletResponse response) {
         businessOrderService.orderExport(request, response);
     }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java
index 529a6ce..51432be 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java
@@ -1,9 +1,28 @@
 package com.casic.missiles.controller.business;
 
+import com.casic.missiles.controller.GeneralApprovalController;
+import com.casic.missiles.dto.BaseApprovalSubmitRequest;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.business.outsource.OutsourceAssessApprovalListRequest;
+import com.casic.missiles.dto.business.outsource.OutsourceAssessSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
+import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.model.business.BizBusinessOutsourceAssess;
+import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
+import com.casic.missiles.service.IGeneralApprovalService;
+import com.casic.missiles.service.business.IBizBusinessOutsourceAssessService;
 import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.BindingResult;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.validation.Valid;
+import java.util.List;
+
 /**
  * <p>
  * 计量检定业务-分包管理-测试、校准或检定工作分包评审表 前端控制器
@@ -15,6 +34,27 @@
 @Api(tags = "分包管理-测试、校准或检定工作分包评审表")
 @RestController
 @RequestMapping("/business/outsource/assess")
-public class BizBusinessOutsourceAssessController {
+public class BizBusinessOutsourceAssessController extends GeneralApprovalController<BizBusinessOutsourceAssess, BizBusinessOutsourceAssess, OutsourceAssessApprovalListRequest, BaseApprovalSubmitRequest> {
+    @Autowired
+    private IBizBusinessOutsourceAssessService outsourceAssessService;
 
+    public BizBusinessOutsourceAssessController(IGeneralApprovalService<BizBusinessOutsourceAssess, BizBusinessOutsourceAssess, OutsourceAssessApprovalListRequest, BaseApprovalSubmitRequest> baseApprovalService) {
+        super(baseApprovalService);
+    }
+
+    @ApiOperation("草稿箱-保存")
+    @PostMapping("/save")
+    public ReturnDTO<OutsourceAssessSaveResponse> saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceAssess request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        return outsourceAssessService.saveOutsourceAssess(request);
+    }
+
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception {
+        List<BizBusinessOutsourceAssess> list = super.exportList(request);
+        super.exportExcel(BizBusinessOutsourceAssess.class, list, ExportEnum.OUTSOURCE_ASSESS.getSheetName());
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java
new file mode 100644
index 0000000..9adef18
--- /dev/null
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java
@@ -0,0 +1,60 @@
+package com.casic.missiles.controller.business;
+
+import com.casic.missiles.controller.GeneralApprovalController;
+import com.casic.missiles.dto.BaseApprovalSubmitRequest;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.business.outsource.OutsourceProtocolApprovalListRequest;
+import com.casic.missiles.dto.business.outsource.OutsourceProtocolSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
+import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.model.business.BizBusinessOutsourceProtocol;
+import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
+import com.casic.missiles.service.IGeneralApprovalService;
+import com.casic.missiles.service.business.IBizBusinessOutsourceProtocolService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.BindingResult;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.validation.Valid;
+import java.util.List;
+
+/**
+ * <p>
+ * 计量检定业务-分包管理-测试、校准或检定工作分包协议书 前端控制器
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-08-24
+ */
+@Api(tags = "分包管理-测试、校准或检定工作分包协议书")
+@RestController
+@RequestMapping("/business/outsource/protocol")
+public class BizBusinessOutsourceProtocolController extends GeneralApprovalController<BizBusinessOutsourceProtocol, BizBusinessOutsourceProtocol, OutsourceProtocolApprovalListRequest, BaseApprovalSubmitRequest> {
+    @Autowired
+    private IBizBusinessOutsourceProtocolService outsourceProtocolService;
+
+    public BizBusinessOutsourceProtocolController(IGeneralApprovalService<BizBusinessOutsourceProtocol, BizBusinessOutsourceProtocol, OutsourceProtocolApprovalListRequest, BaseApprovalSubmitRequest> baseApprovalService) {
+        super(baseApprovalService);
+    }
+
+    @ApiOperation("草稿箱-保存")
+    @PostMapping("/save")
+    public ReturnDTO<OutsourceProtocolSaveResponse> saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceProtocol request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        return outsourceProtocolService.saveOutsourceProtocol(request);
+    }
+
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody OutsourceProtocolApprovalListRequest request) throws Exception {
+        List<BizBusinessOutsourceProtocol> list = super.exportList(request);
+        super.exportExcel(BizBusinessOutsourceProtocol.class, list, ExportEnum.OUTSOURCE_PROTOCOL.getSheetName());
+    }
+}
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java
index 097f645..f0f0943 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java
@@ -17,7 +17,6 @@
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.IGeneralApprovalService;
 import com.casic.missiles.service.business.IBizBusinessOutsourcerInfoService;
-import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -71,19 +70,8 @@
 
     @ApiOperation("分包方导出")
     @PostMapping("/listExport")
-    public void export(@RequestBody @Valid OutsourcerInfoApprovalListRequest request, BindingResult bindingResult) throws Exception {
-        if (bindingResult.hasErrors()) {
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        }
-        List<BizBusinessOutsourcerInfo> list;
-        if (!CollectionUtils.isEmpty(request.getIds())) {
-            list = outsourcerInfoService.listByIds(request.getIds());
-        } else {
-            list = outsourcerInfoService.list(request);
-        }
-        for (BizBusinessOutsourcerInfo record : list) {
-            DictCodeUtils.convertDictCodeToName(record);
-        }
+    public void export(@RequestBody OutsourcerInfoApprovalListRequest request) throws Exception {
+        List<BizBusinessOutsourcerInfo> list = super.exportList(request);
         super.exportExcel(BizBusinessOutsourcerInfo.class, list, ExportEnum.OUTSOURCER_EXPORT.getSheetName());
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java
index c2cbf9f..0410918 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java
@@ -17,11 +17,9 @@
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.IGeneralApprovalService;
 import com.casic.missiles.service.business.IBizBusinessSiteExecutiveInfoService;
-import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -60,7 +58,7 @@
         return siteExecutiveInfoService.saveSiteExecutiveInfo(siteExecutiveInfo);
     }
 
-    @ApiOperation("现场检测详情")
+    @ApiOperation("详情")
     @PostMapping("/detail")
     public ReturnDTO<SiteExecutiveDetailResponse> siteExecutiveDetail(@RequestBody @Valid IdDTO idDTO) throws Exception {
         Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
@@ -69,21 +67,10 @@
         return ReturnUtil.success(siteExecutiveInfoService.detail(idDTO.getId()));
     }
 
-    @ApiOperation("现场检测导出")
+    @ApiOperation("导出")
     @PostMapping("/listExport")
-    public void export(@RequestBody @Valid SiteExecutiveApprovalListRequest request, BindingResult bindingResult) throws Exception {
-        if (bindingResult.hasErrors()) {
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        }
-        List<SiteExecutiveApprovalListResponse> list;
-        if (!CollectionUtils.isEmpty(request.getIds())) {
-            list = siteExecutiveInfoService.listInfoByIds(request.getIds());
-        } else {
-            list = siteExecutiveInfoService.listInfo(request);
-        }
-        for (SiteExecutiveApprovalListResponse record : list) {
-            DictCodeUtils.convertDictCodeToName(record);
-        }
+    public void export(@RequestBody SiteExecutiveApprovalListRequest request) throws Exception {
+        List<SiteExecutiveApprovalListResponse> list = super.exportList(request);
         super.exportExcel(SiteExecutiveApprovalListResponse.class, list, ExportEnum.SITE_EXECUTIVE_EXPORT.getSheetName());
     }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
index 7e793cd..a92e209 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
@@ -55,7 +55,7 @@
 
     @ApiOperation("设备收发列表导出")
     @PostMapping("/export")
-    public void exportList(@RequestBody @Valid SampleDispatchListRequest request) throws IOException {
+    public void exportList(@RequestBody SampleDispatchListRequest request) throws IOException {
         List<SampleDispatchListResponse> list;
         if (!CollectionUtils.isEmpty(request.getIds())) {
             list = dispatchService.listByIds(request.getIds());
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java
index cdc77fc..d120fd4 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java
@@ -7,6 +7,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.business.labExecutive.*;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.business.IBusinessLabExecutiveInfoService;
@@ -14,6 +15,7 @@
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.*;
 
@@ -32,7 +34,7 @@
     @Autowired
     private IBusinessLabExecutiveInfoService labExecutiveInfoService;
 
-    @ApiOperation("实验室检测-部门检测-查询各状态列表（待检测、检测中、检测完）")
+    @ApiOperation("实验室任务-查询各状态列表（待检测、检测中、检测完）")
     @PostMapping("/deptExecutive/List")
     public ReturnDTO<PageInfoBT<SampleLabExecutiveListResponse>> queryDeptExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
@@ -43,10 +45,19 @@
         return ReturnUtil.success(super.packForBT(labExecutiveInfoService.deptLabExecutiveListPage(page, labExecutiveListRequest)));
     }
 
-    /**
-     * 实验室检测-我的检测-查询各状态列表（待检测、检测中、检测完）
-     */
-    @ApiOperation("实验室检测-我的检测-查询各状态列表（待检测、检测中、检测完）")
+    @ApiOperation("实验室任务导出")
+    @PostMapping("/deptExecutive/export")
+    public void deptExportList(@RequestBody @Valid SampleLabExecutiveListRequest request) throws Exception {
+        List<SampleLabExecutiveListResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = labExecutiveInfoService.deptLabExecutiveListByIds(request.getMeasureStatus(), request.getIds());
+        } else {
+            list = labExecutiveInfoService.deptLabExecutiveList(request);
+        }
+        super.exportExcel(SampleLabExecutiveListResponse.class, list, ExportEnum.DEPT_EXECUTIVE_TASK.getSheetName());
+    }
+
+    @ApiOperation("我的任务-查询各状态列表（待检测、检测中、检测完）")
     @PostMapping("/myExecutive/list")
     public ReturnDTO<PageInfoBT<SampleLabExecutiveListResponse>> queryMyExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
@@ -57,19 +68,25 @@
         return ReturnUtil.success(super.packForBT(labExecutiveInfoService.myLabExecutiveListPage(page, labExecutiveListRequest)));
     }
 
-    /**
-     * 实验室检测-我的检测-查询各状态样品数量（待检测、检测中、检测完）
-     */
-    @ApiOperation("实验室检测-我的检测-查询各状态样品数量（待检测、检测中、检测完）")
+    @ApiOperation("我的任务导出")
+    @PostMapping("/myExecutive/export")
+    public void exportList(@RequestBody @Valid SampleLabExecutiveListRequest request) throws Exception {
+        List<SampleLabExecutiveListResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = labExecutiveInfoService.myLabExecutiveListByIds(request.getMeasureStatus(), request.getIds());
+        } else {
+            list = labExecutiveInfoService.myLabExecutiveList(request);
+        }
+        super.exportExcel(SampleLabExecutiveListResponse.class, list, ExportEnum.MY_EXECUTIVE_TASK.getSheetName());
+    }
+
+    @ApiOperation("我的任务-查询各状态样品数量（待检测、检测中、检测完）")
     @GetMapping("/myExecutive/amount")
     public ReturnDTO<List<SampleAmountResponse>> queryMyExecutiveAmount() {
         return ReturnUtil.success(labExecutiveInfoService.myExecutiveAmount());
     }
 
-    /**
-     * 实验室检测-部门检测-分配（分配给具体人员）
-     */
-    @ApiOperation("实验室检测-部门检测-分配按钮（分配给具体人员）")
+    @ApiOperation("实验室任务-分配按钮（分配给具体人员）")
     @PostMapping("/deptExecutive/allocate")
     public ReturnDTO allocateStaff(@RequestBody @Valid SampleAllocateRequest sampleAllocateRequest, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -78,10 +95,7 @@
         return labExecutiveInfoService.allocateStaff(sampleAllocateRequest);
     }
 
-    /**
-     * 实验室检测-我的检测-检定人扫描收入（待检测->检测中）
-     */
-    @ApiOperation("实验室检测-我的检测-检定人扫描收入（待检测->检测中）")
+    @ApiOperation("我的任务-检定人扫描收入（待检测->检测中）")
     @PostMapping("/myExecutive/receive")
     public ReturnDTO sampleReceive(@RequestBody @Valid List<SampleOperateRequest> requestList, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -90,10 +104,7 @@
         return labExecutiveInfoService.sampleReceive(requestList);
     }
 
-    /**
-     * 实验室检测-负责人/检定人扫描检完（检测中->检测完）
-     */
-    @ApiOperation("实验室检测-负责人/检定人扫描检完（检测中->检测完）")
+    @ApiOperation("实验室任务-负责人/检定人扫描检完（检测中->检测完）")
     @PostMapping("/myExecutive/complete")
     public ReturnDTO sampleExecutiveComplete(@RequestBody @Valid List<SampleOperateRequest> requestList, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -102,10 +113,7 @@
         return labExecutiveInfoService.sampleExecutiveComplete(requestList);
     }
 
-    /**
-     * 实验室检测-部门检测/我的检测 编辑（只能修改应出具证书）
-     */
-    @ApiOperation("实验室检测-部门检测/我的检测 编辑（只能修改应出具证书）")
+    @ApiOperation("实验室任务/我的任务 编辑（只能修改应出具证书）")
     @PostMapping("/executive/update")
     public ReturnDTO updateExecutive(@RequestBody @Valid UpdateExecutiveRequest request, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -114,10 +122,7 @@
         return labExecutiveInfoService.updateExecutive(request);
     }
 
-    /**
-     * 实验室检测-部门检测/我的检测 详情
-     */
-    @ApiOperation("实验室检测-部门检测/我的检测 详情")
+    @ApiOperation("实验室任务/我的任务 详情")
     @PostMapping("/executive/detail")
     public ReturnDTO<ExecutiveDetailResponse> executiveDetail(@RequestBody @Valid ExecutiveDetailRequest request, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
@@ -131,7 +136,7 @@
      * 退回后会将下一个要执行的实验室检测状态更新为待分配，将后面的实验室顺序变更为连续（都进行减1）
      * 最后一个检测的实验室退回，等分发员再增加实验室或设备收发中的已收入直接手动点击完成
      */
-    @ApiOperation("实验室检测-部门检测/我的检测 退回（待检测/检测中->退回）")
+    @ApiOperation("实验室任务/我的任务 退回（待检测/检测中->退回）")
     @PostMapping("/executive/sendBack")
     public ReturnDTO executiveSendBack(@RequestBody @Valid ExecutiveSendBackRequest request, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -140,9 +145,6 @@
         return labExecutiveInfoService.sampleExecutiveSendBack(request);
     }
 
-    /**
-     * 分发员编辑实验室检测列表
-     */
     @ApiOperation("分发员编辑实验室检测列表")
     @PostMapping("/handOut/updateList")
     public ReturnDTO updateExecutiveList(@RequestBody @Valid UpdateExecutiveListRequest request, BindingResult bindingResult) {
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java
index 48a67ed..0c04f31 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java
@@ -10,6 +10,7 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.resource.customer.CustomerApprovalListRequest;
 import com.casic.missiles.dto.resource.customer.CustomerSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceCustomerInfo;
@@ -26,6 +27,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -55,6 +57,13 @@
         return customerInfoService.saveCustomerInfo(request);
     }
 
+    @ApiOperation("委托方名录导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody CustomerApprovalListRequest request) throws Exception {
+        List<BizResourceCustomerInfo> list = super.exportList(request);
+        super.exportExcel(BizResourceCustomerInfo.class, list, ExportEnum.CUSTOMER_INFO.getSheetName());
+    }
+
     @ApiOperation("委托方人员列表（分页）")
     @PostMapping("/person/listPage")
     public ReturnDTO<PageInfoBT<BizResourceCustomerStaff>> personListPage(@RequestBody IdDTO idDto) {
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
index 972ed4b..6418ea5 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
@@ -5,6 +5,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.resource.customer.SuggestFormApprovalListRequest;
 import com.casic.missiles.dto.resource.customer.SuggestFormSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceCustomerSuggestForm;
@@ -20,6 +21,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -50,4 +52,11 @@
         return suggestFormService.saveSuggestForm(request);
     }
 
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody SuggestFormApprovalListRequest request) throws Exception {
+        List<BizResourceCustomerSuggestForm> list = super.exportList(request);
+        super.exportExcel(BizResourceCustomerSuggestForm.class, list, ExportEnum.CUSTOMER_SUGGEST_FORM.getSheetName());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java
index 1934d1a..9e07eab 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java
@@ -15,12 +15,16 @@
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.resource.IEnvEnvironmentRecordConfigService;
 import com.casic.missiles.service.resource.IEnvEnvironmentRecordDataService;
+import com.casic.missiles.service.resource.IEnvLocationInfoService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
 import java.util.List;
@@ -39,6 +43,8 @@
     private IEnvEnvironmentRecordDataService environmentRecordDataService;
     @Autowired
     private IEnvEnvironmentRecordConfigService environmentRecordConfigService;
+    @Autowired
+    private IEnvLocationInfoService locationInfoService;
 
     @ApiOperation("环境记录单数据列表/详情")
     @PostMapping("/data/listPage")
@@ -95,4 +101,11 @@
         });
         return environmentRecordConfigService.deleteEnvironmentRecordConfig(idDTO.getId());
     }
+
+    @ApiOperation("地点列表")
+    @PostMapping("/location/listPage")
+    public ReturnDTO<PageInfoBT<LocationListResponse>> locationListPage(@RequestBody @Valid LocationListRequest request) {
+        Page<LocationListResponse> page = PageFactory.defaultPage();
+        return ReturnUtil.success(super.packForBT(locationInfoService.listPage(page, request)));
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java
index 82efe3f..e9561fa 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java
@@ -10,6 +10,7 @@
 import com.casic.missiles.dto.resource.seal.SealLogListRequest;
 import com.casic.missiles.dto.resource.seal.SealNoteApprovalListRequest;
 import com.casic.missiles.dto.resource.seal.SealNoteSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceSealUseLog;
@@ -27,6 +28,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -58,6 +60,13 @@
         return sealUseNoteService.saveSeal(request);
     }
 
+    @ApiOperation("印章使用登记导出（列表和导出中去掉经办人和监印人）")
+    @PostMapping("/listExport")
+    public void export(@RequestBody SealNoteApprovalListRequest request) throws Exception {
+        List<BizResourceSealUseNote> list = super.exportList(request);
+        super.exportExcel(BizResourceSealUseNote.class, list, ExportEnum.SEAL_NOTE.getSheetName());
+    }
+
     // TODO: 2023/7/28 印章使用日志：系统中使用印章时插入数据库
 
     @ApiOperation("印章使用日志列表（分页）")
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java
index 9b674fc..06b6521 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java
@@ -9,16 +9,20 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.resource.staff.StaffCertRequest;
 import com.casic.missiles.dto.resource.staff.StaffCertResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.service.resource.IBizResourceStaffInfoService;
 import com.casic.missiles.service.resource.IBizResourceStaffVerifierService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.List;
+
 /**
  * @Description:
  * @Author: wangpeng
@@ -41,9 +45,21 @@
         return ReturnUtil.success(super.packForBT(responsePage));
     }
 
+    @ApiOperation("证书逾期提醒导出")
+    @PostMapping("/listExport")
+    public void exportList(@RequestBody StaffCertRequest request) throws Exception {
+        List<StaffCertResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = staffInfoService.certListByIds(request.getIds());
+        } else {
+            list = staffInfoService.certList(request);
+        }
+        super.exportExcel(StaffCertResponse.class, list, ExportEnum.STAFF_CERTIFICATE_EXPIRE.getSheetName());
+    }
+
     @ApiOperation("证书逾期提醒")
     @PostMapping("/expirationReminder")
-    public ReturnDTO expirationReminder(@RequestBody IdDTO idDto) {
-        return verifierService.expirationReminder(idDto);
+    public ReturnDTO expirationReminder(@RequestBody IdDTO idDTO) {
+        return verifierService.expirationReminder(idDTO);
     }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java
index 3b251ad..a6e7850 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java
@@ -12,6 +12,7 @@
 import com.casic.missiles.dto.resource.staff.StaffListRequest;
 import com.casic.missiles.dto.resource.staff.TrainListRequest;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.*;
@@ -22,7 +23,10 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
 import java.util.List;
@@ -52,8 +56,19 @@
             throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
         }
         Page<BizResourceStaffInfo> page = PageFactory.defaultPage();
-        Page<BizResourceStaffInfo> responsePage = staffInfoService.listPage(page, request);
-        return ReturnUtil.success(super.packForBT(responsePage));
+        return ReturnUtil.success(super.packForBT(staffInfoService.listPage(page, request)));
+    }
+
+    @ApiOperation("人员登记导出")
+    @PostMapping("/listExport")
+    public void exportList(@RequestBody StaffListRequest request) throws Exception {
+        List<BizResourceStaffInfo> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = staffInfoService.listByIds(request.getIds());
+        } else {
+            list = staffInfoService.list(request);
+        }
+        super.exportExcel(BizResourceStaffInfo.class, list, ExportEnum.STAFF_INFO.getSheetName());
     }
 
     @ApiOperation("人员登记详情基础信息")
@@ -85,9 +100,9 @@
 
     @ApiOperation("科研教育列表（分页）")
     @PostMapping("/education/listPage")
-    public ReturnDTO<PageInfoBT<BizResourceStaffEducation>> educationListPage(@RequestBody IdDTO idDto) {
+    public ReturnDTO<PageInfoBT<BizResourceStaffEducation>> educationListPage(@RequestBody IdDTO idDTO) {
         Page<BizResourceStaffEducation> page = PageFactory.defaultPage();
-        Page<BizResourceStaffEducation> responsePage = staffInfoService.educationListPage(page, idDto);
+        Page<BizResourceStaffEducation> responsePage = staffInfoService.educationListPage(page, idDTO);
         return ReturnUtil.success(super.packForBT(responsePage));
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java
index af6aa86..d85d84a 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java
@@ -9,6 +9,7 @@
 import com.casic.missiles.dto.resource.outsideService.SupplierApprovalListRequest;
 import com.casic.missiles.dto.resource.outsideService.SupplierSaveResponse;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceSupplierAbility;
@@ -67,6 +68,13 @@
         return ReturnUtil.success(supplierInfoService.detail(idDTO.getId()));
     }
 
+    @ApiOperation("合格供方导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody SupplierApprovalListRequest request) throws Exception {
+        List<BizResourceSupplierInfo> list = super.exportList(request);
+        super.exportExcel(BizResourceSupplierInfo.class, list, ExportEnum.SUPPLIER_INFO.getSheetName());
+    }
+
     @ApiOperation("供方人员列表（分页）")
     @PostMapping("/person/listPage")
     public ReturnDTO<PageInfoBT<BizResourceSupplierPerson>> personListPage(@RequestBody IdDTO idDTO) {
diff --git a/casic-metering-api/src/main/resources/config/application.yml b/casic-metering-api/src/main/resources/config/application.yml
index 350db5f..ecff521 100644
--- a/casic-metering-api/src/main/resources/config/application.yml
+++ b/casic-metering-api/src/main/resources/config/application.yml
@@ -126,7 +126,7 @@
     #作者
     author: wangpeng
     #待生成对象表名
-    table-name: biz_equipment_technical_target_approval,biz_equipment_attachment_approval,biz_equipment_checkpoint_approval
+    table-name: biz_business_outsource_protocol
 
 reminder:
   #节点--common模块config包 ReminderNodeConfig配置
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
index 4a19e4e..d47d552 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
@@ -53,6 +53,7 @@
     SUGGEST_FORM_SAVE_FAILED(2509, "委托方意见登记表保存至草稿箱失败"),
     EXAMINE_FORM_SAVE_FAILED(2510, "要求、委托书及合同评审表保存至草稿箱失败"),
     CUSTOMER_EXIST_SAVE_FAILED(2511, "该委托方已存在，请重新选择"),
+    DUPLICATE_LOCATION_NO(2512, "地点编号已存在"),
 
     /**
      * 计量检定业务模块
@@ -68,6 +69,8 @@
     COMPLETE_SAMPLE_NOT_EXIST(2609, "检测中不存在扫描收入的样品"),
     CANNOT_CHANGE_MEASURE_INFO(2610, "无法更改非当前登录用户的检测信息"),
     NON_EXIST_ORDER_OR_SAMPLE(2611, "不存在该委托单或该委托单下的样品"),
+    OUTSOURCE_ACCESS_SAVE_FAILED(2612, "测试、校准或检定工作分包评审表保存至草稿箱失败"),
+    OUTSOURCE_PROTOCOL_SAVE_FAILED(2613, "测试、校准或检定工作分包协议书保存至草稿箱失败"),
 
     /**
      * 历史遗留备用
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
index 5089ad1..81a406b 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
@@ -10,54 +10,38 @@
     /**
      * 资源管理
      */
-    ENVIRONMENT_DATA_EXPORT("environmentData", "environmentData", "环境记录单数据"),
+    ENVIRONMENT_DATA_EXPORT("environmentData", "环境记录单数据", "环境记录单数据"),
+    STAFF_INFO("staffInfo", "人员登记", "人员登记"),
+    STAFF_CERTIFICATE_EXPIRE("certificateExpire", "证书逾期提醒", "证书逾期提醒"),
+    SUPPLIER_INFO("supplierInfo", "合格供方名录", "合格供方名录"),
+    CUSTOMER_INFO("customerInfo", "委托方名录", "委托方名录"),
+    CUSTOMER_SUGGEST_FORM("customerSuggestForm", "委托方意见登记表", "委托方意见登记表"),
+    SEAL_NOTE("sealNote", "印章使用登记", "印章使用登记"),
 
-    FILE_EXPORT("meterFileData", "meterFileData", "计量文件信息"),
-    TRAIN_PLAN_EXPORT("trainPlanData", "trainPlanData", "培训计划"),
-    TRAIN_LOG_EXPORT("trainLogData", "trainLogData", "培训记录"),
-    METER_ORGANIZE_EXPORT("meterOrganizeData", "meterOrganizeData", "计量组织"),
-    TRACE_SUPPLIER_EXPORT("traceSupplierData", "traceSupplierData", "溯源供方"),
-    SIGN_EXPORT("signData", "signData", "签名/签章"),
-    TEMPLATE_EXPORT("templateData", "templateData", "原始记录模板/证书报告模板"),
-    FIXED_ASSETS("meterFixedAssets", "meterFixedAssets", "固定资产"),
-    METER_EQUIPMENT("meterEquipment", "meterEquipment", "测量设备"),
-    CALIBRATION_TEST_EQUIPMENT("calibrationTestEquipment", "calibrationTestEquipment", "校准检定设备"),
-    MEASURE_ACCOUNT("measureAccount", "measureAccount", "测量工装"),
-    STANDARD_SUPPORT_EQUIPMENT("standardSupportEquipment", "standardSupportEquipment", "标准配套设备"),
-    STANDARD_EQUIPMENT("standardEquipment", "standardEquipment", "标准装置"),
-    FLOW_DEF_EXPORT("flowDefData", "flowDefData", "流程定义"),
-    STAFF_CERTIFICATE("certificate", "certificate", "计量人员证书"),
-    CHECK_INFO("checkInfo", "checkInfo", "设备管理点检测"),
-    EQUIPMENT_APPLY("equipmentApply", "equipmentApply", "设备借用"),
-    STANDARD_EQUIPMENT_REMIND("equipmentApplyRemind", "equipmentApplyRemind", "标准装置到期提醒"),
-    METER_PRICE("meterPrice", "meterPrice", "价格库"),
-    METER_STAFF("meterStaff", "meterStaff", "计量人员"),
-    STANDARD_EQUIPMENT_APPLY("standardEquipmentApply", "standardEquipmentApply", "标准装置申请"),
-    STATE_MANAGE_APPLY("stateManage", "stateManage", "状态管理"),
-    METER_ACCEPTANCE_CHECK("acceptanceCheck", "acceptanceCheck", "设备检修保养验收单"),
-    CUSTOMER_EXPORT("customerData", "customerData", "客户信息"),
-    ORDER_EXPORT("orderData", "orderData", "委托书信息"),
-    SAMPLE_EXPORT("sampleData", "sampleData", "样本信息"),
-    EXCHANGE_DATA("exchangeData", "exchangeData", "设备交接单"),
-    DISPATCH_DATA("dispatchData", "dispatchData", "设备收发"),
-    ENVIRONMENT_DATA("environmentData", "environmentData", "环境记录单"),
-    ORIGIN_DATA("originData", "originData", "原始记录"),
-    CERTIFICATE_REPORT("certificateReport", "certificateReport", "证书报告"),
-    ADVICE_EXPORT("adviceData", "adviceData", "客户反馈"),
-    HANDOUT_EXPORT("handoutData", "handoutData", "任务分发列表"),
-    OUTSOURCER_EXPORT("outsourcerData", "outsourcerData", "分包方"),
-    SITE_EXECUTIVE_EXPORT("siteExecutiveData", "siteExecutiveData", "现场测试、校准或检定"),
-    CERTIFICATE_PRINT_EXPORT("certificatePrintData", "certificatePrintData", "证书打印"),
-    DOWNLOAD_TEMPLATE("downloadTemplate", "downloadTemplate", "页面配置"),
-    OUTSOURCER_CERTIFICATE_EXPORT("outsourceCertificateData", "outsourceCertificateData", "分包证书"),
-    SETTLEMENT_INFO_EXPORT("settlementInfoData", "settlementInfoData", "业务结算"),
-    EQUIPMENT_REMIND("equipmentRemind", "equipmentRemind", "设备到期提醒"),
-    AGREEMENT_INFO_EXPORT("agreementInfoData", "agreementInfoData", "合同"),
-    WORK_STATISTICS_EXPORT("workStatisticsData", "workStatisticsData", "实时工作统计"),
-    DEPT_OUTPUT_EXPORT("deptOutputData", "deptOutputData", "部门产值分析"),
-    WORKLOAD_EXPORT("workloadData", "workloadData", "业务工作量分析"),
-    DEPT_COMPREHENSIVE_EXPORT("deptComprehensiveData", "deptComprehensiveData", "部门综合分析"),
-    ENVIRONMENTAL_RECORD("environmentalRecordData", "environmentalRecordData", "现场环境记录");
+    /**
+     * 计量检定业务
+     */
+    OUTSOURCER_EXPORT("outsourcerData", "分包方名录", "分包方名录"),
+    IDENTIFY_EXPORT("identifyData", "计量标识", "计量标识"),
+    ORDER_EXPORT("orderData", "任务单", "任务单"),
+    DISPATCH_DATA("dispatchData", "设备收发", "设备收发"),
+    HANDOUT_EXPORT("handoutData", "任务分发", "任务分发"),
+    SITE_EXECUTIVE_EXPORT("siteExecutiveData", "现场测试、校准或检定", "现场测试、校准或检定"),
+    CERTIFICATE_REPORT("certificateReport", "证书审批", "证书审批"),
+    CERTIFICATE_CHANGE_APPLY("certificateChangeApply", "证书报告补充或更换申请单", "证书报告补充或更换申请单"),
+    CERTIFICATE_PRINT("certificatePrintData", "证书打印审批", "证书打印审批"),
+    DEPT_EXECUTIVE_TASK("deptExecutiveTaskData", "实验室任务", "实验室任务"),
+    MY_EXECUTIVE_TASK("myExecutiveTaskData", "我的任务", "我的任务"),
+    OUTSOURCE_ASSESS("outsourceAssess", "测试、校准或检定工作分包评审表", "测试、校准或检定工作分包评审表"),
+    OUTSOURCE_PROTOCOL("outsourceProtocol", "测试、校准或检定工作分包协议书", "测试、校准或检定工作分包协议书"),
+
+    /**
+     * 系统管理
+     */
+    SIGN_EXPORT("signData", "签名", "签名"),
+    TEMPLATE_EXPORT("templateData", "文件模板", "文件模板"),
+    FLOW_DEF_EXPORT("flowDefData", "流程定义", "流程定义"),
+    DOWNLOAD_TEMPLATE("downloadTemplate", "流程定义", "页面配置");
 
     ExportEnum(String fileName, String sheetName, String description) {
         this.fileName = fileName;
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateRecordTypeCodeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateRecordTypeCodeEnum.java
index 31d913c..a963522 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateRecordTypeCodeEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateRecordTypeCodeEnum.java
@@ -46,4 +46,14 @@
     String SITE_EXECUTIVE_APPROVAL = "01";
     //《现场测试、校准或检定工作记录表》
     String SITE_EXECUTIVE_LOG = "02";
+
+    //测试、校准或检定工作分包协议书
+    String OUTSOURCE_PROTOCOL = "01";
+    //测试、校准或检定工作分包评审表
+    String OUTSOURCE_ACCESS = "02";
+    //测试、校准或检定工作分包通知书
+    String OUTSOURCE_NOTICE = "03";
+    //测试、校准或检定工作分包方名录
+    String OUTSOURCE_INFO = "04";
+
 }
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
index 24b8635..f78bd53 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
@@ -15,6 +15,10 @@
     String CERTIFICATE_CHANGE_APPLY_BEAN_NAME = "certificateChangeApplyBean";
     //现场测试、校准或检定
     String SITE_EXECUTIVE_BEAN_NAME = "siteExecutiveBean";
+    //测试、校准或检定工作分包评审表
+    String OUTSOURCE_ASSESS_BEAN_NAME = "outsourceAssessBean";
+    //测试、校准或检定工作分包协议书
+    String OUTSOURCE_PROTOCOL_BEAN_NAME = "outsourceProtocolBean";
 
     /*********************************设备与装置************************************/
     //设备台账
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 b21c661..6b86fd1 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
@@ -18,6 +18,8 @@
     OUTSOURCER_APPROVAL(OUTSOURCER_BEAN_NAME, ""),
     CERTIFICATE_CHANGE_APPROVAL(CERTIFICATE_CHANGE_APPLY_BEAN_NAME, ""),
     SITE_EXECUTIVE_APPROVAL(SITE_EXECUTIVE_BEAN_NAME, ""),
+    OUTSOURCE_ASSESS_APPROVAL(OUTSOURCE_ASSESS_BEAN_NAME, ""),
+    OUTSOURCE_PROTOCOL_APPROVAL(OUTSOURCE_PROTOCOL_BEAN_NAME, ""),
 
     ACTION_STATUS_MAP(new HashMap<String, AwareActionStatusEnum>() {
         {
@@ -47,6 +49,10 @@
             put(ApplyFromIdEnum.CERTIFICATE_CHANGE_APPROVAL.getCode(), CERTIFICATE_CHANGE_APPROVAL);
             //现场测试、校准或检定审批
             put(ApplyFromIdEnum.SITE_EXECUTIVE_APPROVAL.getCode(), SITE_EXECUTIVE_APPROVAL);
+            //测试、校准或检定工作分包评审表
+            put(ApplyFromIdEnum.OUTSOURCE_ASSESS_APPROVAL.getCode(), OUTSOURCE_ASSESS_APPROVAL);
+            //测试、校准或检定工作分包协议书
+            put(ApplyFromIdEnum.OUTSOURCE_PROTOCOL_APPROVAL.getCode(), OUTSOURCE_PROTOCOL_APPROVAL);
         }
     });
     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 934405e..c7410bd 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
@@ -9,6 +9,8 @@
     CERTIFICATE_CHANGE_APPROVAL("jljdywzsbchghsqd", MessageSourceModuleEnum.BUSINESS.getCode(), "证书/报告补充或更换申请单"),
     OUTSOURCER_APPROVAL("jljdywcsjzhgfbfml", MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定合格分包方名录"),
     SITE_EXECUTIVE_APPROVAL("jljdywxccsjzsp", MessageSourceModuleEnum.BUSINESS.getCode(), "现场测试、校准或检定审批"),
+    OUTSOURCE_ASSESS_APPROVAL("jljdywcsjzfbpsb", MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包评审表"),
+    OUTSOURCE_PROTOCOL_APPROVAL("jljdywcsjzfbxys", MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包协议书"),
 
 
     /*******************************************设备与装置*********************************************/
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/GeneralApprovalMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/GeneralApprovalMapper.java
index 4fb7344..0c9d6ae 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/GeneralApprovalMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/GeneralApprovalMapper.java
@@ -17,8 +17,4 @@
 
     Page<O> selectBatchForApprovalList(Page<O> page, @Param("request") R request, @Param("businessKeys") List<String> businessKeys);
 
-//    Page<O> selectListPage(Page<O> page, @Param("request") R request);
-
-//    Long selectMaxNo();
-
 }
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceAssessMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceAssessMapper.java
index 7867bb8..ba59009 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceAssessMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceAssessMapper.java
@@ -1,7 +1,12 @@
 package com.casic.missiles.mapper.business;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.business.outsource.OutsourceAssessApprovalListRequest;
+import com.casic.missiles.mapper.GeneralApprovalMapper;
 import com.casic.missiles.model.business.BizBusinessOutsourceAssess;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * <p>
@@ -11,6 +16,10 @@
  * @author wangpeng
  * @since 2023-08-16
  */
-public interface BizBusinessOutsourceAssessMapper extends BaseMapper<BizBusinessOutsourceAssess> {
+public interface BizBusinessOutsourceAssessMapper extends GeneralApprovalMapper<BizBusinessOutsourceAssess, BizBusinessOutsourceAssess, OutsourceAssessApprovalListRequest> {
+
+    Page<BizBusinessOutsourceAssess> selectBatchForApprovalList(Page<BizBusinessOutsourceAssess> page, @Param("request") OutsourceAssessApprovalListRequest request, @Param("businessKeys") List<String> businessKeys);
+
+    Long selectMaxProjectNo();
 
 }
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceProtocolMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceProtocolMapper.java
new file mode 100644
index 0000000..e6aba35
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceProtocolMapper.java
@@ -0,0 +1,24 @@
+package com.casic.missiles.mapper.business;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.business.outsource.OutsourceProtocolApprovalListRequest;
+import com.casic.missiles.mapper.GeneralApprovalMapper;
+import com.casic.missiles.model.business.BizBusinessOutsourceProtocol;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 计量检定业务-分包管理-测试、校准或检定工作分包协议书 Mapper 接口
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-08-24
+ */
+public interface BizBusinessOutsourceProtocolMapper extends GeneralApprovalMapper<BizBusinessOutsourceProtocol, BizBusinessOutsourceProtocol, OutsourceProtocolApprovalListRequest> {
+
+    Page<BizBusinessOutsourceProtocol> selectBatchForApprovalList(Page<BizBusinessOutsourceProtocol> page, @Param("request") OutsourceProtocolApprovalListRequest request, @Param("businessKeys") List<String> businessKeys);
+
+    Long selectMaxProtocolNo();
+}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/EnvLocationInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/EnvLocationInfoMapper.java
new file mode 100644
index 0000000..49eff87
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/EnvLocationInfoMapper.java
@@ -0,0 +1,21 @@
+package com.casic.missiles.mapper.resource;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.resource.environment.LocationListRequest;
+import com.casic.missiles.dto.resource.environment.LocationListResponse;
+import com.casic.missiles.model.resource.EnvLocationInfo;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * <p>
+ * 实验室环境监控系统-设备表 Mapper 接口
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-06-07
+ */
+public interface EnvLocationInfoMapper extends BaseMapper<EnvLocationInfo> {
+
+    Page<LocationListResponse> selectLocationListPage(Page<LocationListResponse> page, @Param("request") LocationListRequest request);
+}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java
index de124db..85ed0f7 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java
@@ -1,7 +1,9 @@
 package com.casic.missiles.mapper.system;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.dto.system.SignDetailResponse;
+import com.casic.missiles.dto.system.SignListRequest;
 import com.casic.missiles.model.system.SystemSign;
 import org.apache.ibatis.annotations.Param;
 
@@ -22,4 +24,8 @@
     SignDetailResponse selectSignDetailById(Long id);
 
     List<SystemSign> selectUsableSignList(@Param("userId") Long userId);
+
+    Page<SystemSign> selectSignListPage(Page<SystemSign> page, @Param("request") SignListRequest request);
+
+    List<SystemSign> selectSignList(@Param("request") SignListRequest request);
 }
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateChangeApplyMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateChangeApplyMapper.xml
index d798447..c496092 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateChangeApplyMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateChangeApplyMapper.xml
@@ -30,31 +30,31 @@
         SELECT *
         FROM biz_business_certificate_change_apply
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.changeApplyNo != null and request.changeApplyNo !=''">
+        <if test="request != null and request.changeApplyNo != null and request.changeApplyNo !=''">
             and change_apply_no like concat('%',#{request.changeApplyNo},'%')
         </if>
-        <if test="request.changeReportNo != null and request.changeReportNo !=''">
+        <if test="request != null and request.changeReportNo != null and request.changeReportNo !=''">
             and change_report_no like concat('%',#{request.changeReportNo},'%')
         </if>
-        <if test="request.changeReportName != null and request.changeReportName !=''">
+        <if test="request != null and request.changeReportName != null and request.changeReportName !=''">
             and change_report_name like concat('%',#{request.changeReportName},'%')
         </if>
-        <if test="request.changeType != null and request.changeType !=''">
+        <if test="request != null and request.changeType != null and request.changeType !=''">
             and change_type = #{request.changeType}
         </if>
-        <if test="request.createUserName != null and request.createUserName !=''">
+        <if test="request != null and request.createUserName != null and request.createUserName !=''">
             and create_user_name like concat('%',#{request.createUserName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificatePrintMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificatePrintMapper.xml
index b66cd99..49c0ac8 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificatePrintMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificatePrintMapper.xml
@@ -31,34 +31,34 @@
         LEFT JOIN biz_business_order_sample_relation bosr ON (bosr.order_id = bcr.order_id AND bosr.sample_id = bcr.sample_id)
         LEFT JOIN biz_business_order_info boi ON boi.id = bosr.order_id
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and bcp.approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.printStatus != null and request.printStatus !=''">
+        <if test="request != null and request.printStatus != null and request.printStatus !=''">
             and print_status = #{request.printStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and bcp.create_user_id = #{request.createUserId}
         </if>
-        <if test="request.certificateReportNo != null and request.certificateReportNo !=''">
+        <if test="request != null and request.certificateReportNo != null and request.certificateReportNo !=''">
             and bcr.certificate_report_no like concat('%',#{request.certificateReportNo},'%')
         </if>
-        <if test="request.certificateReportName != null and request.certificateReportName !=''">
+        <if test="request != null and request.certificateReportName != null and request.certificateReportName !=''">
             and bcr.certificate_report_name like concat('%',#{request.certificateReportName},'%')
         </if>
-        <if test="request.customerName != null and request.customerName !=''">
+        <if test="request != null and request.customerName != null and request.customerName !=''">
             and boi.customer_name like concat('%',#{request.customerName},'%')
         </if>
-        <if test="request.sampleNo != null and request.sampleNo !=''">
+        <if test="request != null and request.sampleNo != null and request.sampleNo !=''">
             and bosr.sample_no like concat('%',#{request.sampleNo},'%')
         </if>
-        <if test="request.sampleName != null and request.sampleName !=''">
+        <if test="request != null and request.sampleName != null and request.sampleName !=''">
             and bosr.sample_name like concat('%',#{request.sampleName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and bcp.create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and bcp.create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml
index b366034..767695d 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml
@@ -46,33 +46,37 @@
         SELECT bcr.*, bosr.sample_no, bosr.sample_name, bosr.sample_model, rsi.staff_name
         FROM biz_business_certificate_report bcr
         LEFT JOIN biz_business_order_sample_relation bosr ON (bosr.order_id = bcr.order_id AND bosr.sample_id = bcr.sample_id)
+        LEFT JOIN biz_business_order_info boi ON boi.id = bcr.order_id
         LEFT JOIN biz_resource_staff_info rsi ON rsi.id = bcr.measure_person_id
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and bcr.approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and bcr.create_user_id = #{request.createUserId}
         </if>
-        <if test="request.certificateReportNo != null and request.certificateReportNo !=''">
+        <if test="request != null and request.customerId != null and request.customerId !=''">
+            and boi.customer_id = #{request.customerId}
+        </if>
+        <if test="request != null and request.certificateReportNo != null and request.certificateReportNo !=''">
             and bcr.certificate_report_no like concat('%',#{request.certificateReportNo},'%')
         </if>
-        <if test="request.certificateReportName != null and request.certificateReportName !=''">
+        <if test="request != null and request.certificateReportName != null and request.certificateReportName !=''">
             and bcr.certificate_report_name like concat('%',#{request.certificateReportName},'%')
         </if>
-        <if test="request.sampleNo != null and request.sampleNo !=''">
+        <if test="request != null and request.sampleNo != null and request.sampleNo !=''">
             and bosr.sample_no like concat('%',#{request.sampleNo},'%')
         </if>
-        <if test="request.measureCategory != null and request.measureCategory !=''">
+        <if test="request != null and request.measureCategory != null and request.measureCategory !=''">
             and bcr.measure_category = #{request.measureCategory}
         </if>
-        <if test="request.measurePerson != null and request.measurePerson !=''">
+        <if test="request != null and request.measurePerson != null and request.measurePerson !=''">
             and rsi.staff_name like concat('%',#{request.measurePerson},'%')
         </if>
-        <if test="request.calibrationTimeStart != null and request.calibrationTimeStart !=''">
+        <if test="request != null and request.calibrationTimeStart != null and request.calibrationTimeStart !=''">
             and bcr.calibration_time &gt;= #{request.calibrationTimeStart}
         </if>
-        <if test="request.calibrationTimeEnd != null and request.calibrationTimeEnd !=''">
+        <if test="request != null and request.calibrationTimeEnd != null and request.calibrationTimeEnd !=''">
             and bcr.calibration_time &lt;= #{request.calibrationTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceAssessMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceAssessMapper.xml
index d0fcf8b..c22c101 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceAssessMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceAssessMapper.xml
@@ -7,6 +7,8 @@
         <id column="id" property="id" />
         <result column="project_no" property="projectNo" />
         <result column="project_name" property="projectName" />
+        <result column="lab_code" property="labCode" />
+        <result column="group_code" property="groupCode" />
         <result column="applicant_id" property="applicantId" />
         <result column="applicant_name" property="applicantName" />
         <result column="applicant_time" property="applicantTime" />
@@ -31,7 +33,45 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, project_no, project_name, applicant_id, applicant_name, applicant_time, minio_file_name, remark, create_user_id, create_user_name, outsourcer_id, pre_start_time, pre_end_time, outsource_reason, pre_cost, approval_status, process_id, approve_situation, traceability, test_method, technique_ability, create_time, update_time
+        id, project_no, project_name, lab_code, group_code, applicant_id, applicant_name, applicant_time, minio_file_name, remark, create_user_id, create_user_name, outsourcer_id, pre_start_time, pre_end_time, outsource_reason, pre_cost, approval_status, process_id, approve_situation, traceability, test_method, technique_ability, create_time, update_time
     </sql>
 
+    <select id="selectMaxProjectNo" resultType="java.lang.Long">
+        SELECT IFNULL(max(RIGHT(project_no, 3)), 0) from biz_business_outsource_assess
+    </select>
+
+    <select id="selectBatchForApprovalList" resultMap="BaseResultMap">
+        SELECT bboa.*, bboi.outsourcer_name, bboi.director
+        FROM biz_business_outsource_assess bboa
+        LEFT JOIN biz_business_outsourcer_info bboi ON bboa.outsourcer_id = bboi.id
+        WHERE 1=1
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
+            and bboa.approval_status = #{request.approvalStatus}
+        </if>
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
+            and bboa.create_user_id = #{request.createUserId}
+        </if>
+        <if test="request != null and request.projectNo != null and request.projectNo !=''">
+            and bboa.project_no like concat('%',#{request.projectNo},'%')
+        </if>
+        <if test="request != null and request.outsourcerName != null and request.outsourcerName !=''">
+            and bboi.outsourcer_name like concat('%',#{request.outsourcerName},'%')
+        </if>
+        <if test="request != null and request.applicantName != null and request.applicantName !=''">
+            and bboa.applicant_name like concat('%',#{request.applicantName},'%')
+        </if>
+        <if test="request != null and request.applicantTimeStart != null and request.applicantTimeStart !=''">
+            and bboa.applicant_time &gt;= #{request.applicantTimeStart}
+        </if>
+        <if test="request != null and request.applicantTimeEnd != null and request.applicantTimeEnd !=''">
+            and bboa.applicant_time &lt;= #{request.applicantTimeEnd}
+        </if>
+        <if test="businessKeys != null">
+            and bboa.id in
+            <foreach collection="businessKeys" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
+        ORDER BY bboa.create_time DESC
+    </select>
 </mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceProtocolMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceProtocolMapper.xml
new file mode 100644
index 0000000..b7b2149
--- /dev/null
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceProtocolMapper.xml
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.mapper.business.BizBusinessOutsourceProtocolMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.business.BizBusinessOutsourceProtocol">
+        <id column="id" property="id" />
+        <result column="protocol_no" property="protocolNo" />
+        <result column="project_name" property="projectName" />
+        <result column="lab_code" property="labCode" />
+        <result column="group_code" property="groupCode" />
+        <result column="outsourcer_id" property="outsourcerId" />
+        <result column="remark" property="remark" />
+        <result column="outsource_no" property="outsourceNo" />
+        <result column="outsource_name" property="outsourceName" />
+        <result column="contacts" property="contacts" />
+        <result column="mobile" property="mobile" />
+        <result column="address" property="address" />
+        <result column="require_date" property="requireDate" />
+        <result column="outsource_cost" property="outsourceCost" />
+        <result column="director" property="director" />
+        <result column="item" property="item" />
+        <result column="requires" property="requires" />
+        <result column="create_user_id" property="createUserId" />
+        <result column="create_user_name" property="createUserName" />
+        <result column="approval_status" property="approvalStatus" />
+        <result column="process_id" property="processId" />
+        <result column="create_time" property="createTime" />
+        <result column="update_time" property="updateTime" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, protocol_no, project_name, lab_code, group_code, outsourcer_id, remark, outsource_no, outsource_name, contacts, mobile, address, require_date, outsource_cost, director, item, requires, create_user_id, create_user_name, approval_status, process_id, create_time, update_time
+    </sql>
+
+    <select id="selectMaxProtocolNo" resultType="java.lang.Long">
+        SELECT IFNULL(max(RIGHT(protocol_no, 3)), 0) from biz_business_outsource_protocol
+    </select>
+
+    <select id="selectBatchForApprovalList" resultMap="BaseResultMap">
+        SELECT *
+        FROM biz_business_outsource_protocol
+        WHERE 1=1
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
+            and approval_status = #{request.approvalStatus}
+        </if>
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
+            and create_user_id = #{request.createUserId}
+        </if>
+        <if test="request != null and request.protocolNo != null and request.protocolNo !=''">
+            and protocol_no like concat('%',#{request.protocolNo},'%')
+        </if>
+        <if test="request != null and request.outsourcerName != null and request.outsourcerName !=''">
+            and outsourcer_name like concat('%',#{request.outsourcerName},'%')
+        </if>
+        <if test="request != null and request.applicantName != null and request.applicantName !=''">
+            and create_user_name like concat('%',#{request.applicantName},'%')
+        </if>
+        <if test="request != null and request.applicantTimeStart != null and request.applicantTimeStart !=''">
+            and create_time &gt;= #{request.applicantTimeStart}
+        </if>
+        <if test="request != null and request.applicantTimeEnd != null and request.applicantTimeEnd !=''">
+            and create_time &lt;= #{request.applicantTimeEnd}
+        </if>
+        <if test="businessKeys != null">
+            and id in
+            <foreach collection="businessKeys" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
+        ORDER BY create_time DESC
+    </select>
+</mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourcerInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourcerInfoMapper.xml
index 510a80b..3049b54 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourcerInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourcerInfoMapper.xml
@@ -7,6 +7,8 @@
         <id column="id" property="id" />
         <result column="outsourcer_no" property="outsourcerNo" />
         <result column="outsourcer_name" property="outsourcerName" />
+        <result column="lab_code" property="labCode" />
+        <result column="group_code" property="groupCode" />
         <result column="outsourcer_brief_name" property="outsourcerBriefName" />
         <result column="outsourcer_size" property="outsourcerSize" />
         <result column="business_size" property="businessSize" />
@@ -55,32 +57,32 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, outsourcer_no, outsourcer_name, outsourcer_brief_name, outsourcer_size, business_size, grade, evaluation, tax_number, bank_account, bank_name, bank_account_number, postal_code, director, phone, fax, mobile, email, website, address_country, address_province, address_city, address_area, full_address, address_country_name, address_province_name, address_city_name, address_area_name, invoice_country, invoice_province, invoice_city, invoice_area, invoice_full_address, invoice_country_name, invoice_province_name, invoice_city_name, invoice_area_name, business_scope, business_content, minio_file_name, approval_status, process_id, remark, create_user_id, create_user_name, create_time, update_time
+        id, outsourcer_no, outsourcer_name, lab_code, group_code, outsourcer_brief_name, outsourcer_size, business_size, grade, evaluation, tax_number, bank_account, bank_name, bank_account_number, postal_code, director, phone, fax, mobile, email, website, address_country, address_province, address_city, address_area, full_address, address_country_name, address_province_name, address_city_name, address_area_name, invoice_country, invoice_province, invoice_city, invoice_area, invoice_full_address, invoice_country_name, invoice_province_name, invoice_city_name, invoice_area_name, business_scope, business_content, minio_file_name, approval_status, process_id, remark, create_user_id, create_user_name, create_time, update_time
     </sql>
 
     <select id="selectBatchForApprovalList" resultMap="BaseResultMap">
         SELECT *
         FROM biz_business_outsourcer_info
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.outsourcerNo != null and request.outsourcerNo !=''">
+        <if test="request != null and request.outsourcerNo != null and request.outsourcerNo !=''">
             and outsourcer_no like concat('%',#{request.outsourcerNo},'%')
         </if>
-        <if test="request.outsourcerName != null and request.outsourcerName !=''">
+        <if test="request != null and request.outsourcerName != null and request.outsourcerName !=''">
             and outsourcer_name like concat('%',#{request.outsourcerName},'%')
         </if>
-        <if test="request.director != null and request.director !=''">
+        <if test="request != null and request.director != null and request.director !=''">
             and director like concat('%',#{request.director},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
@@ -93,6 +95,6 @@
     </select>
 
     <select id="selectMaxNo" resultType="java.lang.Long">
-        SELECT IFNULL(max(RIGHT(outsourcer_no, 12)), 0) from biz_business_outsourcer_info
+        SELECT IFNULL(max(RIGHT(outsourcer_no, 3)), 0) from biz_business_outsourcer_info
     </select>
 </mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessSiteExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessSiteExecutiveInfoMapper.xml
index 135c5d0..3c5ae79 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessSiteExecutiveInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessSiteExecutiveInfoMapper.xml
@@ -38,25 +38,25 @@
         FROM biz_business_site_executive_info bsei
         LEFT JOIN biz_resource_customer_info rci ON bsei.customer_id = rci.id
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and bsei.approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and bsei.create_user_id = #{request.createUserId}
         </if>
-        <if test="request.siteExecutiveNo != null and request.siteExecutiveNo !=''">
+        <if test="request != null and request.siteExecutiveNo != null and request.siteExecutiveNo !=''">
             and bsei.site_executive_no like concat('%',#{request.siteExecutiveNo},'%')
         </if>
-        <if test="request.customerName != null and request.customerName !=''">
+        <if test="request != null and request.customerName != null and request.customerName !=''">
             and rci.outsourcer_name like concat('%',#{request.customerName},'%')
         </if>
-        <if test="request.applyName != null and request.applyName !=''">
+        <if test="request != null and request.applyName != null and request.applyName !=''">
             and bsei.apply_name like concat('%',#{request.applyName},'%')
         </if>
-        <if test="request.applyTimeStart != null and request.applyTimeStart !=''">
+        <if test="request != null and request.applyTimeStart != null and request.applyTimeStart !=''">
             and bsei.apply_time &gt;= #{request.applyTimeStart}
         </if>
-        <if test="request.applyTimeEnd != null and request.applyTimeEnd !=''">
+        <if test="request != null and request.applyTimeEnd != null and request.applyTimeEnd !=''">
             and bsei.apply_time &lt;= #{request.applyTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml
index 84d9e2a..6bd38a9 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml
@@ -105,6 +105,12 @@
         <if test="request.isUrgent != null and request.isUrgent !=''">
             AND bo.is_urgent = #{request.isUrgent}
         </if>
+        <if test="request.ids != null">
+            and blei.id in
+            <foreach collection="request.ids" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
         ORDER BY blei.update_time DESC
     </select>
 
@@ -137,6 +143,12 @@
         <if test="request.isUrgent != null and request.isUrgent !=''">
             AND bo.is_urgent = #{request.isUrgent}
         </if>
+        <if test="request.ids != null">
+            and blei.id in
+            <foreach collection="request.ids" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
         ORDER BY blei.update_time DESC
     </select>
 
diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardInfoMapper.xml
index 1a5551b..2ed8d17 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardInfoMapper.xml
@@ -45,12 +45,6 @@
         FROM biz_equipment_standard_info besi
         LEFT JOIN biz_equipment_standard_technology_relation bestr ON besi.standard_no = bestr.standard_no
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
-            and besi.approval_status = #{request.approvalStatus}
-        </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
-            and besi.create_user_id = #{request.createUserId}
-        </if>
         <if test="request.standardName != null and request.standardName !=''">
             and besi.standard_name like concat('%',#{request.standardName},'%')
         </if>
diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardTechnologyRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardTechnologyRelationMapper.xml
index fc7e16c..cd03c8c 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardTechnologyRelationMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardTechnologyRelationMapper.xml
@@ -6,6 +6,7 @@
     <resultMap id="BaseResultMap" type="com.casic.missiles.model.equipment.BizEquipmentStandardTechnologyRelation">
         <id column="id" property="id" />
         <result column="technology_file_id" property="technologyFileId" />
+        <result column="technology_file_no" property="technologyFileNo" />
         <result column="technology_file_name" property="technologyFileName" />
         <result column="standard_id" property="standardId" />
         <result column="standard_no" property="standardNo" />
@@ -14,7 +15,7 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, technology_file_id, technology_file_name, standard_id, remark
+        id, technology_file_id, technology_file_no, technology_file_name, standard_id, remark
     </sql>
 
 </mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceAuthorizeOrderMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceAuthorizeOrderMapper.xml
index ac5176c..554fe65 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceAuthorizeOrderMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceAuthorizeOrderMapper.xml
@@ -32,22 +32,22 @@
         SELECT *
         FROM biz_resource_authorize_order
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.orderNo != null and request.orderNo !=''">
+        <if test="request != null and request.orderNo != null and request.orderNo !=''">
             and order_no like concat('%',#{request.orderNo},'%')
         </if>
-        <if test="request.createUserName != null and request.createUserName !=''">
+        <if test="request != null and request.createUserName != null and request.createUserName !=''">
             and create_user_name like concat('%',#{request.createUserName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerExamineFormMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerExamineFormMapper.xml
index ab242f6..af7f98f 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerExamineFormMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerExamineFormMapper.xml
@@ -41,28 +41,28 @@
         SELECT *
         FROM biz_resource_customer_examine_form
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.formNo != null and request.formNo !=''">
+        <if test="request != null and request.formNo != null and request.formNo !=''">
             and form_no like concat('%',#{request.formNo},'%')
         </if>
-        <if test="request.labCode != null and request.labCode !=''">
+        <if test="request != null and request.labCode != null and request.labCode !=''">
             and lab_code like concat('%',#{request.labCode},'%')
         </if>
-        <if test="request.groupCode != null and request.groupCode !=''">
+        <if test="request != null and request.groupCode != null and request.groupCode !=''">
             and group_code like concat('%',#{request.groupCode},'%')
         </if>
-        <if test="request.createUserName != null and request.createUserName !=''">
+        <if test="request != null and request.createUserName != null and request.createUserName !=''">
             and create_user_name like concat('%',#{request.createUserName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerInfoMapper.xml
index fa8ffbc..06a2798 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerInfoMapper.xml
@@ -33,25 +33,25 @@
         SELECT *
         FROM biz_resource_customer_info
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.customerNo != null and request.customerNo !=''">
+        <if test="request != null and request.customerNo != null and request.customerNo !=''">
             and customer_no like concat('%',#{request.customerNo},'%')
         </if>
-        <if test="request.customerName != null and request.customerName !=''">
+        <if test="request != null and request.customerName != null and request.customerName !=''">
             and customer_name like concat('%',#{request.customerName},'%')
         </if>
-        <if test="request.contacts != null and request.contacts !=''">
+        <if test="request != null and request.contacts != null and request.contacts !=''">
             and contacts like concat('%',#{request.contacts},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerSuggestFormMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerSuggestFormMapper.xml
index 28f5bb2..1806662 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerSuggestFormMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerSuggestFormMapper.xml
@@ -33,28 +33,28 @@
         SELECT *
         FROM biz_resource_customer_suggest_form
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.formNo != null and request.formNo !=''">
+        <if test="request != null and request.formNo != null and request.formNo !=''">
             and form_no like concat('%',#{request.formNo},'%')
         </if>
-        <if test="request.customerName != null and request.customerName !=''">
+        <if test="request != null and request.customerName != null and request.customerName !=''">
             and customer_name like concat('%',#{request.customerName},'%')
         </if>
-        <if test="request.customerDeptName != null and request.customerDeptName !=''">
+        <if test="request != null and request.customerDeptName != null and request.customerDeptName !=''">
             and customer_dept_name like concat('%',#{request.customerDeptName},'%')
         </if>
-        <if test="request.createUserName != null and request.createUserName !=''">
+        <if test="request != null and request.createUserName != null and request.createUserName !=''">
             and create_user_name like concat('%',#{request.createUserName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSealUseNoteMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSealUseNoteMapper.xml
index ab37bc1..b02bb33 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSealUseNoteMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSealUseNoteMapper.xml
@@ -29,32 +29,32 @@
     </sql>
 
     <select id="selectBatchForApprovalList" resultMap="BaseResultMap">
-        SELECT *
+        SELECT brsun.*, brsi.seal_name, brsi.seal_type, brsi.approver_name
         FROM biz_resource_seal_use_note brsun
         JOIN biz_resource_seal_info brsi ON brsun.seal_id = brsi.id
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and brsun.approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and brsun.create_user_id = #{request.createUserId}
         </if>
-        <if test="request.sealName != null and request.sealName !=''">
+        <if test="request != null and request.sealName != null and request.sealName !=''">
             and brsi.seal_name like concat('%',#{request.sealName},'%')
         </if>
-        <if test="request.sealType != null and request.sealType !=''">
+        <if test="request != null and request.sealType != null and request.sealType !=''">
             and brsi.seal_type = #{request.sealType}
         </if>
-        <if test="request.applyDeptName != null and request.applyDeptName !=''">
+        <if test="request != null and request.applyDeptName != null and request.applyDeptName !=''">
             and brsun.apply_dept_name like concat('%',#{request.applyDeptName},'%')
         </if>
-        <if test="request.applyUserName != null and request.applyUserName !=''">
+        <if test="request != null and request.applyUserName != null and request.applyUserName !=''">
             and brsun.apply_user_name like concat('%',#{request.applyUserName},'%')
         </if>
-        <if test="request.applyTimeStart != null and request.applyTimeStart !=''">
+        <if test="request != null and request.applyTimeStart != null and request.applyTimeStart !=''">
             and brsun.apply_time &gt;= #{request.applyTimeStart}
         </if>
-        <if test="request.applyTimeEnd != null and request.applyTimeEnd !=''">
+        <if test="request != null and request.applyTimeEnd != null and request.applyTimeEnd !=''">
             and brsun.apply_time &lt;= #{request.applyTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml
index 119bf7d..4f8392a 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml
@@ -31,6 +31,12 @@
         <if test="request.deptName != null and request.deptName !=''">
             and brsi.dept_name like concat('%',#{request.deptName},'%')
         </if>
+        <if test="request.ids != null">
+            and brsv.id in
+            <foreach collection="request.ids" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
         ORDER BY brsv.grant_date DESC
     </select>
 
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSupplierInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSupplierInfoMapper.xml
index fe8d399..e8ce7ef 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSupplierInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSupplierInfoMapper.xml
@@ -48,28 +48,28 @@
         SELECT *
         FROM biz_resource_supplier_info
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.supplierNo != null and request.supplierNo !=''">
+        <if test="request != null and request.supplierNo != null and request.supplierNo !=''">
             and supplier_no like concat('%',#{request.supplierNo},'%')
         </if>
-        <if test="request.supplierName != null and request.supplierName !=''">
+        <if test="request != null and request.supplierName != null and request.supplierName !=''">
             and supplier_name like concat('%',#{request.supplierName},'%')
         </if>
-        <if test="request.director != null and request.director !=''">
+        <if test="request != null and request.director != null and request.director !=''">
             and director like concat('%',#{request.director},'%')
         </if>
-        <if test="request.supplierType != null and request.supplierType !=''">
+        <if test="request != null and request.supplierType != null and request.supplierType !=''">
             and supplier_type = #{request.supplierType}
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/EnvLocationInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/EnvLocationInfoMapper.xml
new file mode 100644
index 0000000..68bcf10
--- /dev/null
+++ b/casic-metering-dao/src/main/resources/mapper/resource/EnvLocationInfoMapper.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.mapper.resource.EnvLocationInfoMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.resource.EnvLocationInfo">
+        <id column="id" property="id" />
+        <result column="location_no" property="locationNo" />
+        <result column="location_name" property="locationName" />
+        <result column="location_position" property="locationPosition" />
+        <result column="create_user_id" property="createUserId" />
+        <result column="create_user" property="createUser" />
+        <result column="create_time" property="createTime" />
+        <result column="update_time" property="updateTime" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, location_no, location_name, location_position, create_user_id, create_user, create_time, update_time
+    </sql>
+
+    <select id="selectLocationListPage" resultType="com.casic.missiles.dto.resource.environment.LocationListResponse">
+        SELECT *
+        FROM env_location_info
+        WHERE 1=1
+        <if test="request.locationNo != null and request.locationNo !=''">
+            AND location_no LIKE concat('%',#{request.locationNo},'%')
+        </if>
+        <if test="request.locationName != null and request.locationName !=''">
+            AND location_name LIKE concat('%',#{request.locationName},'%')
+        </if>
+        ORDER BY create_time DESC
+    </select>
+
+</mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml
index b28c18f..8854047 100644
--- a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml
@@ -11,7 +11,6 @@
         <result column="sign_desc" property="signDesc" />
         <result column="sign_director" property="signDirector" />
         <result column="sign_user_id" property="signUserId" />
-        <result column="sign_type" property="signType" />
         <result column="minio_file_name" property="minioFileName" />
         <result column="create_time" property="createTime" />
         <result column="update_time" property="updateTime" />
@@ -28,7 +27,6 @@
         <result column="sign_name" property="signName" />
         <result column="sign_desc" property="signDesc" />
         <result column="sign_director" property="signDirector" />
-        <result column="sign_type" property="signType" />
         <result column="sign_user_id" property="signUserId" />
         <result column="minio_file_name" property="minioFileName" />
         <result column="create_time" property="createTime" />
@@ -62,4 +60,58 @@
         JOIN system_sign_user_relation ssur ON ss.id = ssur.sign_id
         WHERE ssur.user_id = #{userId}
     </select>
+
+    <select id="selectSignListPage" resultMap="BaseResultMap">
+        SELECT ss.*, sd.SIMPLE_NAME AS deptName
+        FROM system_sign ss
+        LEFT JOIN sys_user su ON su.id = ss.sign_user_id
+        LEFT JOIN sys_dept sd ON sd.id = su.dept_id
+        WHERE 1=1
+        <if test="request.signNo != null and request.signNo !=''">
+            AND ss.sign_no LIKE concat('%',#{request.signNo},'%')
+        </if>
+        <if test="request.signName != null and request.signName !=''">
+            AND ss.sign_name LIKE concat('%',#{request.signName},'%')
+        </if>
+        <if test="request.signDirector != null and request.signDirector !=''">
+            AND ss.sign_director LIKE concat('%',#{request.signDirector},'%')
+        </if>
+        <if test="request.signUserId != null and request.signUserId !=''">
+            AND ss.sign_user_id = #{request.signUserId}
+        </if>
+        <if test="request.createStartTime != null and request.createStartTime !=''">
+            AND DATE_FORMAT(ss.create_time,'%Y-%m-%d') &gt;= DATE_FORMAT(#{request.createStartTime},'%Y-%m-%d')
+        </if>
+        <if test="request.createEndTime != null and request.createEndTime !=''">
+            AND DATE_FORMAT(ss.create_time,'%Y-%m-%d')  &lt;= DATE_FORMAT(#{request.createEndTime},'%Y-%m-%d')
+        </if>
+        ORDER BY ss.create_time DESC
+    </select>
+
+    <select id="selectSignList" resultMap="BaseResultMap">
+        SELECT ss.*, sd.SIMPLE_NAME AS deptName
+        FROM system_sign ss
+        LEFT JOIN sys_user su ON su.id = ss.sign_user_id
+        LEFT JOIN sys_dept sd ON sd.id = su.dept_id
+        WHERE 1=1
+        <if test="request.signNo != null and request.signNo !=''">
+            AND ss.sign_no LIKE concat('%',#{request.signNo},'%')
+        </if>
+        <if test="request.signName != null and request.signName !=''">
+            AND ss.sign_name LIKE concat('%',#{request.signName},'%')
+        </if>
+        <if test="request.signDirector != null and request.signDirector !=''">
+            AND ss.sign_director LIKE concat('%',#{request.signDirector},'%')
+        </if>
+        <if test="request.signUserId != null and request.signUserId !=''">
+            AND ss.sign_user_id = #{request.signUserId}
+        </if>
+        <if test="request.createStartTime != null and request.createStartTime !=''">
+            AND DATE_FORMAT(ss.create_time,'%Y-%m-%d') &gt;= DATE_FORMAT(#{request.createStartTime},'%Y-%m-%d')
+        </if>
+        <if test="request.createEndTime != null and request.createEndTime !=''">
+            AND DATE_FORMAT(ss.create_time,'%Y-%m-%d')  &lt;= DATE_FORMAT(#{request.createEndTime},'%Y-%m-%d')
+        </if>
+        ORDER BY ss.create_time DESC
+    </select>
 </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 515050a..60f530b 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
@@ -47,8 +47,8 @@
     String STORAGE_LOCATION = "bizStorageLocation";
     //计量专业
     String MEASURE_MAJOR = "bizMeasureMajor";
-    //管理状态
-    String MANAGER_STATE = "bizManagerState";
+    //标准装置管理状态
+    String STANDARD_MANAGER_STATE = "bizStandardManagerState";
 
     /**
      * 资源管理 字典code
@@ -95,8 +95,6 @@
     String MEASURE_STATUS = "measureStatus";
     //检定方式
     String MEASURE_TYPE = "measureType";
-    //标识打印标志类型
-    String IDENTIFY_PRINT_TYPE = "bizBusinessIdentify";
     //变更类型
     String REPORT_CHANGE_TYPE = "bizCertChangeType";
     //规模类型
@@ -111,19 +109,24 @@
     String MEASURE_CATEGORY = "measureCategory";
     //检定结果
     String MEASURE_RESULT = "measureResult";
+    //分包原因
+    String OUTSOURCE_REASON = "outsourceReason";
+
+    /**
+     * 系统管理
+     */
+    String TEMPLATE_TYPE = "templateType";
+
 
     /**
      * 标准装置 字典code
      */
     //类别
     String STANDARD_CATEGORY = "standardCategory";
-    //管理状态
-    String STANDARD_MANAGER_STATE = "standardManagerState";
     //标准等级
     String STANDARD_LEVEL = "standardLevel";
     //传递范围
     String STANDARD_TRANSMIT_RANGE = "transmitRange";
-
     //资本来源
     String CAPITAL_SOURCE = "capitalSource";
     //标准装置-申请类型
@@ -148,8 +151,6 @@
     String CERTIFICATE_CLASS = "certificationClass";
     //证书管理-检校专业
     String CALIBRATION_MAJOR = "calibrationMajor";
-    //分包原因
-    String OUTSOURCE_REASON = "outsourceReason";
 
     /**
      * 工作台
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/BaseApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/BaseApprovalListRequest.java
index 73c12c1..80d7424 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/BaseApprovalListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/BaseApprovalListRequest.java
@@ -6,6 +6,7 @@
 
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotEmpty;
+import java.util.List;
 
 /**
  * @Description:
@@ -19,14 +20,14 @@
      * 表单id
      */
     @NotBlank(message = "表单id不能为空")
-    @ApiModelProperty(value = "表单id（流程定义对应的表单id，等价于业务id）", dataType = "String")
+    @ApiModelProperty(value = "表单id（流程定义对应的表单id，等价于业务id），导出接口不用传", dataType = "String")
     private String formId;
 
     /**
      * 审批状态类型，对应ApprovalStatusEnum
      */
     @NotEmpty(message = "审批状态类型不能为空")
-    @ApiModelProperty(value = "审批状态类型code", dataType = "String")
+    @ApiModelProperty(value = "审批状态类型code，导出接口不用传", dataType = "String")
     private String approvalStatus;
 
     @ApiModelProperty(hidden = true)
@@ -34,4 +35,7 @@
 
     @ApiModelProperty(hidden = true)
     private Long createUserId;
+
+    @ApiModelProperty(value = "导出ids", dataType = "List")
+    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificatePrintApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificatePrintApprovalListRequest.java
index b93d1c9..3cc2f4e 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificatePrintApprovalListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificatePrintApprovalListRequest.java
@@ -5,8 +5,6 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import java.util.List;
-
 /**
  * @Description:
  * @Author: wangpeng
@@ -38,7 +36,4 @@
 
     @ApiModelProperty(value = "创建结束时间", dataType = "String")
     private String createTimeEnd;
-
-    @ApiModelProperty(value = "导出ids", dataType = "List")
-    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportApprovalListRequest.java
index 4f7a038..c115847 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportApprovalListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportApprovalListRequest.java
@@ -5,8 +5,6 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import java.util.List;
-
 /**
  * @Description:
  * @Author: wangpeng
@@ -15,6 +13,8 @@
 @ApiModel
 @Data
 public class CertificateReportApprovalListRequest extends BaseApprovalListRequest {
+    @ApiModelProperty(value = "委托方id", dataType = "String")
+    private Long customerId;
 
     @ApiModelProperty(value = "证书报告编号", dataType = "String")
     private String certificateReportNo;
@@ -37,6 +37,4 @@
     @ApiModelProperty(value = "检校结束时间", dataType = "String")
     private String calibrationTimeEnd;
 
-    @ApiModelProperty(value = "导出ids", dataType = "List")
-    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/identify/IdentifyListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/identify/IdentifyListRequest.java
index 1b87ae6..f019203 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/identify/IdentifyListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/identify/IdentifyListRequest.java
@@ -4,6 +4,8 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * @Description:
  * @Author: wangpeng
@@ -26,4 +28,7 @@
 
     @ApiModelProperty(value = "打印结束时间", dataType = "String")
     private String createTimeEnd;
+
+    @ApiModelProperty(value = "导出ids", dataType = "List")
+    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListRequest.java
index 1264883..62415fb 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListRequest.java
@@ -7,6 +7,7 @@
 import lombok.Data;
 
 import javax.validation.constraints.NotBlank;
+import java.util.List;
 
 @Data
 @ApiModel
@@ -37,4 +38,6 @@
     @ApiModelProperty(value = "是否加急（1是0否null全部）", dataType = "Integer")
     private String isUrgent;
 
+    @ApiModelProperty(value = "导出ids", dataType = "List")
+    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListRequest.java
index 5201d7b..499760a 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListRequest.java
@@ -17,6 +17,9 @@
     @ApiModelProperty(value = "任务单编号", dataType = "String")
     private String orderNo;
 
+    @ApiModelProperty(value = "委托方id", dataType = "Long")
+    private Long customerId;
+
     @ApiModelProperty(value = "委托方名称", dataType = "String")
     private String customerName;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OrderSampleDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OrderSampleDTO.java
new file mode 100644
index 0000000..796edc0
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OrderSampleDTO.java
@@ -0,0 +1,19 @@
+package com.casic.missiles.dto.business.outsource;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/8/24 11:38
+ */
+@ApiModel
+@Data
+public class OrderSampleDTO {
+    @ApiModelProperty(value = "任务单id", dataType = "Long")
+    private Long orderId;
+    @ApiModelProperty(value = "受检设备id", dataType = "Long")
+    private Long sampleId;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceAssessApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceAssessApprovalListRequest.java
new file mode 100644
index 0000000..9a930c3
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceAssessApprovalListRequest.java
@@ -0,0 +1,30 @@
+package com.casic.missiles.dto.business.outsource;
+
+import com.casic.missiles.dto.BaseApprovalListRequest;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/8/24 11:01
+ */
+@ApiModel
+@Data
+public class OutsourceAssessApprovalListRequest extends BaseApprovalListRequest {
+    @ApiModelProperty(value = "评审表编号", dataType = "String")
+    private String projectNo;
+
+    @ApiModelProperty(value = "分包机构名称", dataType = "String")
+    private String outsourcerName;
+
+    @ApiModelProperty(value = "申请人", dataType = "String")
+    private String applicantName;
+
+    @ApiModelProperty(value = "申请时间开始", dataType = "String")
+    private String applicantTimeStart;
+
+    @ApiModelProperty(value = "申请时间结束", dataType = "String")
+    private String applicantTimeEnd;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceAssessSaveResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceAssessSaveResponse.java
new file mode 100644
index 0000000..8bf9aad
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceAssessSaveResponse.java
@@ -0,0 +1,20 @@
+package com.casic.missiles.dto.business.outsource;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/8/14 16:17
+ */
+@ApiModel
+@Data
+public class OutsourceAssessSaveResponse {
+    @ApiModelProperty(value = "主键id", dataType = "Long")
+    private Long id;
+
+    @ApiModelProperty(value = "编号", dataType = "String")
+    private String projectNo;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProtocolApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProtocolApprovalListRequest.java
new file mode 100644
index 0000000..0f32331
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProtocolApprovalListRequest.java
@@ -0,0 +1,30 @@
+package com.casic.missiles.dto.business.outsource;
+
+import com.casic.missiles.dto.BaseApprovalListRequest;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/8/24 15:01
+ */
+@ApiModel
+@Data
+public class OutsourceProtocolApprovalListRequest extends BaseApprovalListRequest {
+    @ApiModelProperty(value = "协议书编号", dataType = "String")
+    private String protocolNo;
+
+    @ApiModelProperty(value = "分包方名称", dataType = "String")
+    private String outsourcerName;
+
+    @ApiModelProperty(value = "申请人", dataType = "String")
+    private String applicantName;
+
+    @ApiModelProperty(value = "申请时间开始", dataType = "String")
+    private String applicantTimeStart;
+
+    @ApiModelProperty(value = "申请时间结束", dataType = "String")
+    private String applicantTimeEnd;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProtocolSaveResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProtocolSaveResponse.java
new file mode 100644
index 0000000..e324967
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProtocolSaveResponse.java
@@ -0,0 +1,20 @@
+package com.casic.missiles.dto.business.outsource;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/8/14 16:17
+ */
+@ApiModel
+@Data
+public class OutsourceProtocolSaveResponse {
+    @ApiModelProperty(value = "主键id", dataType = "Long")
+    private Long id;
+
+    @ApiModelProperty(value = "编号", dataType = "String")
+    private String protocolNo;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveApprovalListRequest.java
index f29f4e4..7047c28 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveApprovalListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveApprovalListRequest.java
@@ -5,8 +5,6 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import java.util.List;
-
 /**
  * @Description: 现场检测审批列表请求实体
  * @Author: wangpeng
@@ -30,7 +28,4 @@
     @ApiModelProperty(value = "申请时间结束", dataType = "String")
     private String applyTimeEnd;
 
-    @ApiModelProperty(value = "导出ids", dataType = "List")
-    private List<Long> ids;
-
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveDetailResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveDetailResponse.java
index 1f28752..394c934 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveDetailResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveDetailResponse.java
@@ -12,6 +12,18 @@
     @ApiModelProperty(value = "id，更新/删除使用参数", dataType = "Long")
     private Long id;
 
+    @ApiModelProperty(value = "实验室代码(字典code)", dataType = "String")
+    private String labCode;
+
+    @ApiModelProperty(value = "实验室代码(字典value)", dataType = "String")
+    private String labCodeName;
+
+    @ApiModelProperty(value = "组别代码(字典code)", dataType = "String")
+    private String groupCode;
+
+    @ApiModelProperty(value = "组别代码(字典value)", dataType = "String")
+    private String groupCodeName;
+
     @ApiModelProperty(value = "审批编号", dataType = "String")
     private String siteExecutiveNo;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/environment/LocationListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/environment/LocationListRequest.java
new file mode 100644
index 0000000..13d03c3
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/environment/LocationListRequest.java
@@ -0,0 +1,20 @@
+package com.casic.missiles.dto.resource.environment;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/6/8 13:56
+ */
+@ApiModel
+@Data
+public class LocationListRequest {
+    @ApiModelProperty(value = "地点编号", dataType = "String")
+    private String locationNo;
+
+    @ApiModelProperty(value = "地点名称", dataType = "String")
+    private String locationName;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/environment/LocationListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/environment/LocationListResponse.java
new file mode 100644
index 0000000..4c531af
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/environment/LocationListResponse.java
@@ -0,0 +1,78 @@
+package com.casic.missiles.dto.resource.environment;
+
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
+import com.baomidou.mybatisplus.annotation.TableField;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description: 地点列表响应实体
+ * @Author: wangpeng
+ * @Date: 2023/6/8 13:53
+ */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
+@ApiModel
+@Data
+public class LocationListResponse {
+    @ApiModelProperty(value = "主键id", dataType = "Long")
+    private Long id;
+
+    /**
+     * 地点编号
+     */
+    @ExcelProperty("地点编号")
+    @ApiModelProperty(value = "地点编号", dataType = "String")
+    private String locationNo;
+
+    /**
+     * 地点名称
+     */
+    @ExcelProperty("地点名称")
+    @ApiModelProperty(value = "地点名称", dataType = "String")
+    private String locationName;
+
+    /**
+     * 地点位置
+     */
+    @ExcelProperty("地点位置")
+    @ApiModelProperty(value = "地点位置", dataType = "String")
+    private String locationPosition;
+
+    /**
+     * 创建人id
+     */
+    @ApiModelProperty(value = "创建人id", dataType = "Long")
+    private Long createUserId;
+
+    /**
+     * 创建人
+     */
+    @ExcelProperty("创建人")
+    @ApiModelProperty(value = "创建人", dataType = "String")
+    @TableField("create_user")
+    private String createUser;
+
+    /**
+     * 创建时间
+     */
+    @ExcelProperty("创建时间")
+    @ApiModelProperty(value = "创建时间", dataType = "String")
+    private String createTime;
+
+    /**
+     * 更新时间
+     */
+    @ApiModelProperty(value = "更新时间", dataType = "String")
+    private String updateTime;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertRequest.java
index 9a7f6c6..c827915 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertRequest.java
@@ -4,6 +4,8 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * @Description:
  * @Author: wangpeng
@@ -16,4 +18,7 @@
     private String name;
     @ApiModelProperty(value = "部门名", dataType = "String")
     private String deptName;
+
+    @ApiModelProperty(value = "导出ids", dataType = "List")
+    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertResponse.java
index f78b159..8f2f79e 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertResponse.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.dto.resource.staff;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.casic.missiles.annotation.DictCodeField;
 import com.casic.missiles.constants.MeterDictCode;
 import io.swagger.annotations.ApiModel;
@@ -13,12 +20,18 @@
  * @Author: wangpeng
  * @Date: 2023/7/27 15:13
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @ApiModel
 @Data
 public class StaffCertResponse {
     /**
      * 人员编号
      */
+    @ExcelProperty(value = "人员编号",order = 0)
     @NotEmpty(message = "人员编号不能为空")
     @ApiModelProperty(value = "人员编号", dataType = "String")
     private String staffNo;
@@ -26,6 +39,7 @@
     /**
      * 姓名
      */
+    @ExcelProperty(value = "姓名",order = 1)
     @ApiModelProperty(value = "姓名", dataType = "String")
     private String staffName;
 
@@ -54,6 +68,7 @@
     /**
      * 部门名字
      */
+    @ExcelProperty(value = "工作部门",order = 2)
     @ApiModelProperty(value = "部门名字", dataType = "String")
     private String deptName;
 
@@ -66,6 +81,7 @@
     /**
      * 计量专业
      */
+    @ExcelProperty(value = "计量专业",order = 3)
     @ApiModelProperty(value = "计量专业", dataType = "String")
     private String major;
 
@@ -110,6 +126,7 @@
     /**
      * 证书号
      */
+    @ExcelProperty(value = "证号",order = 4)
     @ApiModelProperty(value = "证书号", dataType = "String")
     private String certNo;
 
@@ -122,12 +139,14 @@
     /**
      * 有效日期
      */
+    @ExcelProperty(value = "证书有效期",order = 6)
     @ApiModelProperty(value = "有效日期", dataType = "String")
     private String effectiveDate;
 
     /**
      * 发放日期
      */
+    @ExcelProperty(value = "发证日期",order = 5)
     @ApiModelProperty(value = "发放日期", dataType = "String")
     private String grantDate;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffListRequest.java
index 7c4afb3..0a1194a 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffListRequest.java
@@ -4,6 +4,8 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * @Description:
  * @Author: wangpeng
@@ -18,4 +20,7 @@
     private String deptName;
     @ApiModelProperty(value = "部门id", dataType = "Long")
     private Long deptId;
+
+    @ApiModelProperty(value = "导出ids", dataType = "List")
+    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/TrainListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/TrainListRequest.java
index f68597b..6321f8b 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/TrainListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/TrainListRequest.java
@@ -14,6 +14,8 @@
 public class TrainListRequest {
     @ApiModelProperty(value = "训练登记表编号", dataType = "String")
     private String trainNo;
+    @ApiModelProperty(value = "值班领导", dataType = "String")
+    private String dutyLeader;
     @ApiModelProperty(value = "创建开始时间", dataType = "String")
     private String createTimeStart;
     @ApiModelProperty(value = "创建结束时间", dataType = "String")
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/SignAddRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/SignAddRequest.java
index 117be34..d71055c 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/SignAddRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/SignAddRequest.java
@@ -43,13 +43,6 @@
     private Long signUserId;
 
     /**
-     * 签章或签名-字典code
-     */
-    @NotBlank(message = "类型不能为空")
-    @ApiModelProperty(value = "签名/签章-字典code", dataType = "String", required = true)
-    private String signType;
-
-    /**
      * minio存储文件名
      */
     @ApiModelProperty(value = "上传文件返回名称", dataType = "String")
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateAddRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateAddRequest.java
index aff1265..6316648 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateAddRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateAddRequest.java
@@ -17,30 +17,28 @@
 @Data
 public class TemplateAddRequest extends BaseSystemRequest {
     /**
-     * 原始记录模板/证书报告模板名称
+     * 模板名称
      */
     @ApiModelProperty(value = "名称", dataType = "String", required = true)
     @NotBlank(message = "名称不能为空")
     private String templateName;
 
     /**
-     * 原始记录模板/证书报告模板描述
+     * 模板描述
      */
     @ApiModelProperty(value = "描述", dataType = "String")
     private String templateDesc;
 
     /**
-     * 原始记录模板/证书报告模板创建人
+     * 创建人
      */
     @ApiModelProperty(value = "创建人", dataType = "String", required = true)
     @NotBlank(message = "创建人不能为空")
     private String templateCreator;
 
-    /**
-     * 原始记录模板/证书报告模板-字典code
-     */
-    @NotBlank(message = "类型不能为空")
-    @ApiModelProperty(value = "原始记录模板/证书报告模板-字典code", dataType = "String", required = true)
+
+    @NotBlank(message = "模板类型不能为空")
+    @ApiModelProperty(value = "模板类型(字典code)", dataType = "String", required = true)
     private String templateType;
 
     /**
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateListRequest.java
index eec5a1e..6d17bbe 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateListRequest.java
@@ -1,11 +1,12 @@
 package com.casic.missiles.dto.system;
 
+import com.casic.missiles.annotation.DictCodeField;
+import com.casic.missiles.constants.MeterDictCode;
 import com.casic.missiles.dto.BaseSystemRequest;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import javax.validation.constraints.NotBlank;
 import java.util.List;
 
 /**
@@ -19,8 +20,8 @@
     /**
      * 类型
      */
-//    @ApiModelProperty(value = "类型-字典code", dataType = "String", required = true)
-    @NotBlank(message = "类型不能为空")
+    @DictCodeField(message = "模板类型不合法", cacheName = MeterDictCode.TEMPLATE_TYPE)
+    @ApiModelProperty(value = "模板类型(字典code)", dataType = "String")
     private String templateType;
 
     /**
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificateChangeApply.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificateChangeApply.java
index 9216308..36923fd 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificateChangeApply.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificateChangeApply.java
@@ -1,11 +1,19 @@
 package com.casic.missiles.model.business;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 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 com.casic.missiles.dto.BaseRequest;
+import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -20,6 +28,12 @@
  * @author wangpeng
  * @since 2023-08-15
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
+@ApiModel
 @Data
 @TableName("biz_business_certificate_change_apply")
 public class BizBusinessCertificateChangeApply extends BaseRequest implements Serializable {
@@ -33,6 +47,7 @@
     /**
      * 申请单编号
      */
+    @ExcelProperty(value = "申请单编号", order = 1)
     @ApiModelProperty(value = "申请单编号", dataType = "String")
     @TableField("change_apply_no")
     private String changeApplyNo;
@@ -40,6 +55,7 @@
     /**
      * 申请单名字
      */
+    @ExcelProperty(value = "申请单名称", order = 2)
     @ApiModelProperty(value = "申请单名字", dataType = "String")
     @TableField("change_apply_name")
     private String changeApplyName;
@@ -54,6 +70,7 @@
     /**
      * 更换证书编号
      */
+    @ExcelProperty(value = "更换证书编号", order = 3)
     @ApiModelProperty(value = "更换证书编号", dataType = "String")
     @TableField("change_report_no")
     private String changeReportNo;
@@ -61,7 +78,8 @@
     /**
      * 更换证书名字
      */
-    @ApiModelProperty(value = "更换证书名字", dataType = "String")
+    @ExcelProperty(value = "更换证书/报告名称", order = 4)
+    @ApiModelProperty(value = "更换证书/报告名称", dataType = "String")
     @TableField("change_report_name")
     private String changeReportName;
 
@@ -73,6 +91,7 @@
     @TableField("change_type")
     private String changeType;
 
+    @ExcelProperty(value = "变更类型", order = 5)
     @ApiModelProperty(value = "变更类型(字典value)", dataType = "String")
     @TableField(exist = false)
     private String changeTypeName;
@@ -142,13 +161,15 @@
     /**
      * 创建用户名字
      */
-    @ApiModelProperty(value = "创建用户名字", dataType = "String")
+    @ExcelProperty(value = "创建人", order = 6)
+    @ApiModelProperty(value = "创建人名字", dataType = "String")
     @TableField("create_user_name")
     private String createUserName;
 
     /**
      * 创建时间
      */
+    @ExcelProperty(value = "创建时间", order = 7)
     @ApiModelProperty(value = "创建时间", dataType = "String")
     @TableField("create_time")
     private String createTime;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificateReport.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificateReport.java
index f01db9e..db06018 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificateReport.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificateReport.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.model.business;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -22,6 +29,11 @@
  * @author wangpeng
  * @since 2023-08-14
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @ApiModel
 @Data
 @TableName("biz_business_certificate_report")
@@ -36,6 +48,7 @@
     /**
      * 证书报告编号
      */
+    @ExcelProperty(value = "证书报告编号", order = 1)
     @ApiModelProperty(value = "证书报告编号", dataType = "String")
     @TableField("certificate_report_no")
     private String certificateReportNo;
@@ -43,6 +56,7 @@
     /**
      * 证书报告名称
      */
+    @ExcelProperty(value = "证书报告名称", order = 2)
     @ApiModelProperty(value = "证书报告名称", dataType = "String")
     @TableField("certificate_report_name")
     private String certificateReportName;
@@ -62,6 +76,7 @@
     @TableField("measure_category")
     private String measureCategory;
 
+    @ExcelProperty(value = "检校类别", order = 6)
     @ApiModelProperty(value = "检校类别(字典value)", dataType = "String")
     @TableField(exist = false)
     private String measureCategoryName;
@@ -69,6 +84,7 @@
     /**
      * 检校时间
      */
+    @ExcelProperty(value = "检校时间", order = 8)
     @ApiModelProperty(value = "检校时间", dataType = "String")
     @TableField("calibration_time")
     private String calibrationTime;
@@ -267,18 +283,22 @@
     @TableField(exist = false)
     private Integer decisionItem;
 
-    @ApiModelProperty(value = "设备样品编号（列表返回参数）", dataType = "String")
+    @ExcelProperty(value = "被检设备统一编号", order = 3)
+    @ApiModelProperty(value = "被检设备统一编号（列表返回参数）", dataType = "String")
     @TableField(exist = false)
     private String sampleNo;
 
-    @ApiModelProperty(value = "设备样品名称（列表返回参数）", dataType = "String")
+    @ExcelProperty(value = "被检设备名称", order = 4)
+    @ApiModelProperty(value = "被检设备名称（列表返回参数）", dataType = "String")
     @TableField(exist = false)
     private String sampleName;
 
-    @ApiModelProperty(value = "设备样品规格型号（列表返回参数）", dataType = "String")
+    @ExcelProperty(value = "规格型号", order = 5)
+    @ApiModelProperty(value = "规格型号（列表返回参数）", dataType = "String")
     @TableField(exist = false)
     private String sampleModel;
 
+    @ExcelProperty(value = "检定员", order = 7)
     @ApiModelProperty(value = "检定员名字（列表返回参数）", dataType = "String")
     @TableField(exist = false)
     private String staffName;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessIdentifyInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessIdentifyInfo.java
index 46bfba5..f1a9bec 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessIdentifyInfo.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessIdentifyInfo.java
@@ -1,10 +1,15 @@
 package com.casic.missiles.model.business;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 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;
 
@@ -20,6 +25,11 @@
  * @author wangpeng
  * @since 2023-08-15
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @Data
 @TableName("biz_business_identify_info")
 public class BizBusinessIdentifyInfo implements Serializable {
@@ -33,6 +43,7 @@
     /**
      * 记录编号
      */
+    @ExcelProperty(value = "记录编号", order = 1)
     @ApiModelProperty(value = "记录编号", dataType = "String")
     @TableField("record_no")
     private String recordNo;
@@ -41,20 +52,15 @@
      * 标志类型(字典code)
      */
     @NotEmpty(message = "标志类型不能为空")
-    @ApiModelProperty(value = "标志类型(字典code)", dataType = "String")
-    @DictCodeField(message = "标志类型不合法", cacheName = MeterDictCode.IDENTIFY_PRINT_TYPE)
+    @ApiModelProperty(value = "标志类型(直接存计量标识/使用状态/校准状态的字典value)", dataType = "String")
     @TableField("identify_type")
     private String identifyType;
 
-    @ApiModelProperty(value = "标志类型(字典value)", dataType = "String")
-    @TableField(exist = false)
-    private String identifyTypeName;
-
     /**
      * 设备id(可以是受检设备/设备台账)
      */
     @NotNull(message = "设备id不能为空")
-    @ApiModelProperty(value = "设备id(可以是受检设备/设备台账)", dataType = "String")
+    @ApiModelProperty(value = "设备id(可以是受检设备/设备台账)", dataType = "Long")
     @TableField("device_id")
     private Long deviceId;
 
@@ -66,29 +72,32 @@
     @TableField("device_type")
     private String deviceType;
 
+    @ExcelProperty(value = "统一编号", order = 3)
     @NotEmpty(message = "设备编号不能为空")
-    @ApiModelProperty(value = "设备编号", dataType = "String")
+    @ApiModelProperty(value = "统一编号", dataType = "String")
     @TableField("device_no")
     private String deviceNo;
 
     /**
      * 设备名字
      */
-    @NotEmpty(message = "设备名字不能为空")
-    @ApiModelProperty(value = "设备名字", dataType = "String")
+    @ExcelProperty(value = "设备名称", order = 4)
+    @NotEmpty(message = "设备名称不能为空")
+    @ApiModelProperty(value = "设备名称", dataType = "String")
     @TableField("device_name")
     private String deviceName;
 
     /**
      * 检定员id
      */
-    @ApiModelProperty(value = "检定员id", dataType = "String")
+    @ApiModelProperty(value = "检定员id", dataType = "Long")
     @TableField("measure_person_id")
     private Long measurePersonId;
 
     /**
      * 检定员名字
      */
+    @ExcelProperty(value = "检定员", order = 5)
     @ApiModelProperty(value = "检定员名字", dataType = "String")
     @TableField("measure_person")
     private String measurePerson;
@@ -103,7 +112,8 @@
     /**
      * 更新时间
      */
-    @ApiModelProperty(value = "更新时间", dataType = "String")
+    @ExcelProperty(value = "打印时间", order = 6)
+    @ApiModelProperty(value = "打印时间", dataType = "String")
     @TableField("update_time")
     private String updateTime;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceAssess.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceAssess.java
index 659d9ca..6720b90 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceAssess.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceAssess.java
@@ -1,11 +1,26 @@
 package com.casic.missiles.model.business;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 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 com.casic.missiles.dto.BaseRequest;
+import com.casic.missiles.dto.business.outsource.OrderSampleDTO;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import javax.validation.constraints.NotEmpty;
 import java.io.Serializable;
+import java.util.List;
 
 /**
  * <p>
@@ -15,146 +30,231 @@
  * @author wangpeng
  * @since 2023-08-16
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
+@ApiModel
 @Data
 @TableName("biz_business_outsource_assess")
-public class BizBusinessOutsourceAssess implements Serializable {
+public class BizBusinessOutsourceAssess extends BaseRequest implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
+    @ApiModelProperty(value = "id，更新/删除使用参数", dataType = "Long")
     @TableId("id")
     private Long id;
 
     /**
      * 评审表编号
      */
+    @ExcelProperty(value = "评审表编号", order = 1)
+    @ApiModelProperty(value = "评审表编号(后台生成)", dataType = "String")
     @TableField("project_no")
     private String projectNo;
 
     /**
      * 评审表名称
      */
+    @ExcelProperty(value = "评审表名称", order = 2)
+    @ApiModelProperty(value = "评审表名称", dataType = "String")
     @TableField("project_name")
     private String projectName;
 
+    @NotEmpty(message = "实验室代码不能为空")
+    @DictCodeField(message = "实验室代码描述不合法", cacheName = MeterDictCode.LAB_CODE)
+    @ApiModelProperty(value = "实验室代码(字典code)", dataType = "String")
+    @TableField("lab_code")
+    private String labCode;
+
+    @ApiModelProperty(value = "实验室代码(字典value)", dataType = "String")
+    @TableField(exist = false)
+    private String labCodeName;
+
+    /**
+     * 组别代码
+     */
+    @NotEmpty(message = "组别代码不能为空")
+    @DictCodeField(message = "组别代码描述不合法", cacheName = MeterDictCode.GROUP_CODE)
+    @ApiModelProperty(value = "组别代码(字典code)", dataType = "String")
+    @TableField("group_code")
+    private String groupCode;
+
+    @ApiModelProperty(value = "组别代码(字典value)", dataType = "String")
+    @TableField(exist = false)
+    private String groupCodeName;
+
     /**
      * 申请人id
      */
+    @ApiModelProperty(value = "申请人id", dataType = "String")
     @TableField("applicant_id")
     private Long applicantId;
 
     /**
      * 申请人名字
      */
+    @ExcelProperty(value = "申请人", order = 5)
+    @ApiModelProperty(value = "申请人", dataType = "String")
     @TableField("applicant_name")
     private String applicantName;
 
     /**
      * 申请时间
      */
+    @ExcelProperty(value = "申请时间", order = 6)
+    @ApiModelProperty(value = "申请时间", dataType = "String")
     @TableField("applicant_time")
     private String applicantTime;
 
     /**
      * 附件(minio存储文件名)
      */
+    @ApiModelProperty(value = "附件(minio存储文件名)", dataType = "String")
     @TableField("minio_file_name")
     private String minioFileName;
 
     /**
      * 备注
      */
+    @ApiModelProperty(value = "备注", dataType = "String")
     @TableField("remark")
     private String remark;
 
     /**
      * 创建人id
      */
+    @ApiModelProperty(value = "创建人id", dataType = "String")
     @TableField("create_user_id")
     private Long createUserId;
 
     /**
      * 创建人名字
      */
+    @ApiModelProperty(value = "创建人名字", dataType = "String")
     @TableField("create_user_name")
     private String createUserName;
 
     /**
      * 分包方id
      */
+    @ApiModelProperty(value = "评审表编号", dataType = "String")
     @TableField("outsourcer_id")
     private Long outsourcerId;
 
     /**
      * 预计开始时间
      */
+    @ApiModelProperty(value = "预计开始时间", dataType = "String")
     @TableField("pre_start_time")
     private String preStartTime;
 
     /**
      * 预计结束时间
      */
+    @ApiModelProperty(value = "预计结束时间", dataType = "String")
     @TableField("pre_end_time")
     private String preEndTime;
 
     /**
      * 分包原因-字典
      */
+    @ApiModelProperty(value = "分包原因(字典code)", dataType = "String")
+    @DictCodeField(message = "分包原因描述不合法", cacheName = MeterDictCode.OUTSOURCE_REASON)
     @TableField("outsource_reason")
     private String outsourceReason;
 
+    @ApiModelProperty(value = "分包原因(字典value)", dataType = "String")
+    @TableField(exist = false)
+    private String outsourceReasonName;
+
     /**
      * 预计费用
      */
+    @ApiModelProperty(value = "预计费用", dataType = "String")
     @TableField("pre_cost")
     private String preCost;
 
     /**
      * 审批状态
      */
+    @ApiModelProperty(value = "审批状态", dataType = "String")
+    @DictCodeField(message = "审批状态描述不合法", cacheName = MeterDictCode.APPROVAL_STATUS)
     @TableField("approval_status")
     private String approvalStatus;
 
     /**
      * 流程实例id
      */
+    @ApiModelProperty(value = "流程实例id", dataType = "String")
     @TableField("process_id")
     private String processId;
 
     /**
      * 实验室认可情况
      */
+    @ApiModelProperty(value = "实验室认可情况", dataType = "String")
     @TableField("approve_situation")
     private String approveSituation;
 
     /**
      * 溯源性
      */
+    @ApiModelProperty(value = "溯源性", dataType = "String")
     @TableField("traceability")
     private String traceability;
 
     /**
      * 测试方法
      */
+    @ApiModelProperty(value = "测试方法", dataType = "String")
     @TableField("test_method")
     private String testMethod;
 
     /**
      * 技术能力
      */
+    @ApiModelProperty(value = "技术能力", dataType = "String")
     @TableField("technique_ability")
     private String techniqueAbility;
 
     /**
      * 创建时间
      */
+    @ApiModelProperty(hidden = true)
     @TableField("create_time")
     private String createTime;
 
     /**
      * 更新时间
      */
+    @ApiModelProperty(hidden = true)
     @TableField("update_time")
     private String updateTime;
 
+    @ApiModelProperty(value = "审批状态类型-字典value", dataType = "String")
+    @TableField(exist = false)
+    private String approvalStatusName;
 
+    @ApiModelProperty(value = "任务id（同意、驳回等操作使用）", dataType = "String")
+    @TableField(exist = false)
+    private String taskId;
+
+    @ApiModelProperty(value = "可选决策项（1同意驳回拒绝 2同意驳回 3同意拒绝，用于待审批列表同意/驳回/拒绝按钮展示）", dataType = "Integer")
+    @TableField(exist = false)
+    private Integer decisionItem;
+
+    @NotEmpty(message = "受检设备信息不能为空")
+    @ApiModelProperty(value = "受检设备id列表（新建使用参数）", dataType = "List")
+    @TableField(exist = false)
+    private List<OrderSampleDTO> orderSampleList;
+
+    @ExcelProperty(value = "分包机构名称", order = 3)
+    @ApiModelProperty(value = "分包机构名称（列表返回参数）", dataType = "String")
+    private String outsourcerName;
+
+    @ExcelProperty(value = "机构负责人", order = 4)
+    @ApiModelProperty(value = "机构负责人（列表返回参数）", dataType = "String")
+    private String director;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceProtocol.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceProtocol.java
new file mode 100644
index 0000000..38df697
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceProtocol.java
@@ -0,0 +1,225 @@
+package com.casic.missiles.model.business;
+
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
+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 com.casic.missiles.dto.BaseRequest;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotEmpty;
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 计量检定业务-分包管理-测试、校准或检定工作分包协议书
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-08-24
+ */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
+@Data
+@TableName("biz_business_outsource_protocol")
+public class BizBusinessOutsourceProtocol extends BaseRequest implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "id，更新/删除使用参数", dataType = "Long")
+    @TableId("id")
+    private Long id;
+
+    /**
+     * 协议书编号
+     */
+    @ExcelProperty(value = "协议书编号", order = 1)
+    @ApiModelProperty(value = "协议书编号(后台生成)", dataType = "String")
+    @TableField("protocol_no")
+    private String protocolNo;
+
+    /**
+     * 协议书名称
+     */
+    @ExcelProperty(value = "协议书名称", order = 2)
+    @ApiModelProperty(value = "协议书名称", dataType = "String")
+    @TableField("project_name")
+    private String projectName;
+
+    @NotEmpty(message = "实验室代码不能为空")
+    @DictCodeField(message = "实验室代码描述不合法", cacheName = MeterDictCode.LAB_CODE)
+    @ApiModelProperty(value = "实验室代码(字典code)", dataType = "String")
+    @TableField("lab_code")
+    private String labCode;
+
+    @ApiModelProperty(value = "实验室代码(字典value)", dataType = "String")
+    @TableField(exist = false)
+    private String labCodeName;
+
+    @NotEmpty(message = "组别代码不能为空")
+    @DictCodeField(message = "组别代码描述不合法", cacheName = MeterDictCode.GROUP_CODE)
+    @ApiModelProperty(value = "组别代码(字典code)", dataType = "String")
+    @TableField("group_code")
+    private String groupCode;
+
+    @ApiModelProperty(value = "组别代码(字典value)", dataType = "String")
+    @TableField(exist = false)
+    private String groupCodeName;
+
+    /**
+     * 分包方id
+     */
+    @ApiModelProperty(value = "分包方id", dataType = "Long")
+    @TableField("outsourcer_id")
+    private Long outsourcerId;
+
+    /**
+     * 其他
+     */
+    @ApiModelProperty(value = "其他", dataType = "String")
+    @TableField("remark")
+    private String remark;
+
+    /**
+     * 分包方编号
+     */
+    @ApiModelProperty(value = "分包方编号(新建不用传)", dataType = "String")
+    @TableField("outsource_no")
+    private String outsourceNo;
+
+    /**
+     * 分包方名称
+     */
+    @ExcelProperty(value = "分包方名称", order = 3)
+    @ApiModelProperty(value = "分包方名称(新建不用传)", dataType = "String")
+    @TableField("outsource_name")
+    private String outsourceName;
+
+    /**
+     * 联系人
+     */
+    @ExcelProperty(value = "联系人", order = 4)
+    @ApiModelProperty(value = "联系人", dataType = "String")
+    @TableField("contacts")
+    private String contacts;
+
+    /**
+     * 电话
+     */
+    @ApiModelProperty(value = "电话", dataType = "String")
+    @TableField("mobile")
+    private String mobile;
+
+    /**
+     * 地址
+     */
+    @ApiModelProperty(value = "地址", dataType = "String")
+    @TableField("address")
+    private String address;
+
+    /**
+     * 要求完成日期
+     */
+    @ApiModelProperty(value = "要求完成日期", dataType = "String")
+    @TableField("require_date")
+    private String requireDate;
+
+    /**
+     * 分包费用(元)
+     */
+    @ApiModelProperty(value = "分包费用(元)", dataType = "String")
+    @TableField("outsource_cost")
+    private Double outsourceCost;
+
+    /**
+     * 分包方负责人
+     */
+    @ApiModelProperty(value = "分包方负责人", dataType = "String")
+    @TableField("director")
+    private String director;
+
+    /**
+     * 分包项目
+     */
+    @ApiModelProperty(value = "分包项目", dataType = "String")
+    @TableField("item")
+    private String item;
+
+    /**
+     * 分包要求
+     */
+    @ApiModelProperty(value = "分包要求", dataType = "String")
+    @TableField("requires")
+    private String requires;
+
+    /**
+     * 创建人id
+     */
+    @ApiModelProperty(hidden = true)
+    @TableField("create_user_id")
+    private Long createUserId;
+
+    /**
+     * 创建人名字
+     */
+    @ExcelProperty(value = "申请人", order = 5)
+    @ApiModelProperty(value = "申请人", dataType = "String")
+    @TableField("create_user_name")
+    private String createUserName;
+
+    /**
+     * 审批状态
+     */
+    @ApiModelProperty(value = "审批状态", dataType = "String")
+    @DictCodeField(message = "审批状态描述不合法", cacheName = MeterDictCode.APPROVAL_STATUS)
+    @TableField("approval_status")
+    private String approvalStatus;
+
+    /**
+     * 流程实例id
+     */
+    @ApiModelProperty(value = "流程实例id", dataType = "String")
+    @TableField("process_id")
+    private String processId;
+
+    /**
+     * 创建时间
+     */
+    @ExcelProperty(value = "申请时间", order = 6)
+    @ApiModelProperty(value = "申请时间", dataType = "String")
+    @TableField("create_time")
+    private String createTime;
+
+    /**
+     * 更新时间
+     */
+    @ApiModelProperty(hidden = true)
+    @TableField("update_time")
+    private String updateTime;
+
+    @ApiModelProperty(value = "审批状态类型-字典value", dataType = "String")
+    @TableField(exist = false)
+    private String approvalStatusName;
+
+    @ApiModelProperty(value = "任务id（同意、驳回等操作使用）", dataType = "String")
+    @TableField(exist = false)
+    private String taskId;
+
+    @ApiModelProperty(value = "可选决策项（1同意驳回拒绝 2同意驳回 3同意拒绝，用于待审批列表同意/驳回/拒绝按钮展示）", dataType = "Integer")
+    @TableField(exist = false)
+    private Integer decisionItem;
+
+
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourcerInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourcerInfo.java
index ec4e997..f9aa69e 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourcerInfo.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourcerInfo.java
@@ -17,6 +17,7 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import javax.validation.constraints.NotEmpty;
 import java.io.Serializable;
 
 /**
@@ -59,6 +60,29 @@
     @TableField("outsourcer_name")
     private String outsourcerName;
 
+    @NotEmpty(message = "实验室代码不能为空")
+    @DictCodeField(message = "实验室代码描述不合法", cacheName = MeterDictCode.LAB_CODE)
+    @ApiModelProperty(value = "实验室代码(字典code)", dataType = "String")
+    @TableField("lab_code")
+    private String labCode;
+
+    @ApiModelProperty(value = "实验室代码(字典value)", dataType = "String")
+    @TableField(exist = false)
+    private String labCodeName;
+
+    /**
+     * 组别代码
+     */
+    @NotEmpty(message = "组别代码不能为空")
+    @DictCodeField(message = "组别代码描述不合法", cacheName = MeterDictCode.GROUP_CODE)
+    @ApiModelProperty(value = "组别代码(字典code)", dataType = "String")
+    @TableField("group_code")
+    private String groupCode;
+
+    @ApiModelProperty(value = "组别代码(字典value)", dataType = "String")
+    @TableField(exist = false)
+    private String groupCodeName;
+
     /**
      * 单位简称
      */
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardInfo.java
index c48eed7..dffdfdd 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardInfo.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardInfo.java
@@ -5,6 +5,7 @@
 import com.baomidou.mybatisplus.annotation.TableName;
 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;
 
@@ -18,6 +19,7 @@
  * @author wangpeng
  * @since 2023-08-04
  */
+@ApiModel
 @Data
 @TableName("biz_equipment_standard_info")
 public class BizEquipmentStandardInfo implements Serializable {
@@ -119,7 +121,7 @@
      * 管理状态(字典code)
      */
     @ApiModelProperty(value = "管理状态(字典code)", dataType = "String")
-    @DictCodeField(message = "管理状态不合法", cacheName = MeterDictCode.MANAGER_STATE)
+    @DictCodeField(message = "管理状态不合法", cacheName = MeterDictCode.STANDARD_MANAGER_STATE)
     @TableField("manage_status")
     private String manageStatus;
 
@@ -151,7 +153,7 @@
     /**
      * 温度(℃)
      */
-    @ApiModelProperty(value = "使用状态(字典code)", dataType = "String")
+    @ApiModelProperty(value = "温度(℃)", dataType = "String")
     @TableField("temperature")
     private Double temperature;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardInfoApproval.java b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardInfoApproval.java
index dbd86ab..9f58d83 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardInfoApproval.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardInfoApproval.java
@@ -150,7 +150,7 @@
      * 管理状态(字典code)
      */
     @ApiModelProperty(value = "管理状态(字典code)", dataType = "String")
-    @DictCodeField(message = "管理状态不合法", cacheName = MeterDictCode.MANAGER_STATE)
+    @DictCodeField(message = "管理状态不合法", cacheName = MeterDictCode.STANDARD_MANAGER_STATE)
     @TableField("manage_status")
     private String manageStatus;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardTechnologyRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardTechnologyRelation.java
index 0e612bd..751f26b 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardTechnologyRelation.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardTechnologyRelation.java
@@ -3,6 +3,7 @@
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -16,6 +17,7 @@
  * @author wangpeng
  * @since 2023-08-04
  */
+@ApiModel
 @Data
 @TableName("biz_equipment_standard_technology_relation")
 public class BizEquipmentStandardTechnologyRelation implements Serializable {
@@ -33,6 +35,10 @@
     @TableField("technology_file_id")
     private Long technologyFileId;
 
+    @ApiModelProperty(value = "依据的技术文件编号", dataType = "String")
+    @TableField("technology_file_no")
+    private String technologyFileNo;
+
     /**
      * 依据的技术文件名称(技术文件中现行测试校准检定方法表文件名字段)
      */
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerInfo.java
index d6e8bed..65cd6bc 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerInfo.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerInfo.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.model.resource;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -21,6 +28,11 @@
  * @author wangpeng
  * @since 2023-08-08
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @ApiModel
 @Data
 @TableName("biz_resource_customer_info")
@@ -35,6 +47,7 @@
     /**
      * 委托方编号
      */
+    @ExcelProperty(value = "委托方编号", order = 1)
     @ApiModelProperty(value = "委托方编号", dataType = "String")
     @TableField("customer_no")
     private String customerNo;
@@ -42,6 +55,7 @@
     /**
      * 委托方名称
      */
+    @ExcelProperty(value = "委托方名称", order = 2)
     @ApiModelProperty(value = "委托方名称(新建时为下拉选择一个受检单位组织的名字，传deptId字段，后端获取名称)", dataType = "String")
     @TableField("customer_name")
     private String customerName;
@@ -63,6 +77,7 @@
     /**
      * 联系人
      */
+    @ExcelProperty(value = "联系人", order = 3)
     @ApiModelProperty(value = "联系人", dataType = "String")
     @TableField("contacts")
     private String contacts;
@@ -70,6 +85,7 @@
     /**
      * 座机电话
      */
+    @ExcelProperty(value = "座机电话", order = 4)
     @ApiModelProperty(value = "座机电话", dataType = "String")
     @TableField("mobile")
     private String mobile;
@@ -77,6 +93,7 @@
     /**
      * 手机号码
      */
+    @ExcelProperty(value = "手机号码", order = 5)
     @ApiModelProperty(value = "手机号码", dataType = "String")
     @TableField("phone")
     private String phone;
@@ -91,6 +108,7 @@
     /**
      * 地址
      */
+    @ExcelProperty(value = "地址", order = 6)
     @ApiModelProperty(value = "地址", dataType = "String")
     @TableField("address")
     private String address;
@@ -141,6 +159,7 @@
     /**
      * 创建时间
      */
+    @ExcelProperty(value = "创建时间", order = 7)
     @ApiModelProperty(value = "创建时间", dataType = "String")
     @TableField("create_time")
     private String createTime;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerSuggestForm.java b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerSuggestForm.java
index 7201bbd..701bf8b 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerSuggestForm.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerSuggestForm.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.model.resource;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -22,6 +29,11 @@
  * @author wangpeng
  * @since 2023-08-08
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @ApiModel
 @Data
 @TableName("biz_resource_customer_suggest_form")
@@ -44,7 +56,8 @@
     /**
      * 委托方名称
      */
-    @ApiModelProperty(value = "委托方名称", dataType = "String")
+    @ExcelProperty(value = "意见反馈单位", order = 2)
+    @ApiModelProperty(value = "意见反馈单位", dataType = "String")
     @TableField("customer_name")
     private String customerName;
 
@@ -59,7 +72,8 @@
     /**
      * 委托方意见反馈部门名称
      */
-    @ApiModelProperty(value = "委托方意见反馈部门名称", dataType = "String")
+    @ExcelProperty(value = "委托方意见反馈部门", order = 3)
+    @ApiModelProperty(value = "委托方意见反馈部门", dataType = "String")
     @TableField("customer_dept_name")
     private String customerDeptName;
 
@@ -73,6 +87,7 @@
     /**
      * 表单编号
      */
+    @ExcelProperty(value = "表单编号", order = 1)
     @ApiModelProperty(value = "表单编号", dataType = "String")
     @TableField("form_no")
     private String formNo;
@@ -111,6 +126,7 @@
     /**
      * 创建人名字
      */
+    @ExcelProperty(value = "创建人", order = 4)
     @ApiModelProperty(value = "创建人名字", dataType = "String")
     @TableField("create_user_name")
     private String createUserName;
@@ -147,6 +163,7 @@
     /**
      * 创建时间
      */
+    @ExcelProperty(value = "创建时间", order = 5)
     @ApiModelProperty(value = "创建时间", dataType = "String")
     @TableField("create_time")
     private String createTime;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSealInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSealInfo.java
index cbf05d7..9bf389d 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSealInfo.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSealInfo.java
@@ -106,6 +106,10 @@
     @TableField("minio_file_name")
     private String minioFileName;
 
+    @ApiModelProperty(value = "minio存储文件url", dataType = "String")
+    @TableField(exist = false)
+    private String minioFileUrl;
+
     @ApiModelProperty(value = "创建时间", dataType = "String")
     @TableField("create_time")
     private String createTime;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSealUseNote.java b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSealUseNote.java
index 3f2d9e8..3ce16a8 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSealUseNote.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSealUseNote.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.model.resource;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -20,6 +27,11 @@
  * @author wangpeng
  * @since 2023-07-28
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @ApiModel
 @Data
 @TableName("biz_resource_seal_use_note")
@@ -34,6 +46,7 @@
     /**
      * 登记表编号
      */
+    @ExcelProperty(value = "申请单编号", order = 1)
     @ApiModelProperty(value = "登记表编号(自动生成)", dataType = "String")
     @TableField("note_form_no")
     private String noteFormNo;
@@ -55,6 +68,7 @@
     /**
      * 申请部门
      */
+    @ExcelProperty(value = "申请部门", order = 5)
     @ApiModelProperty(value = "申请部门", dataType = "String")
     @TableField("apply_dept_name")
     private String applyDeptName;
@@ -69,6 +83,7 @@
     /**
      * 申请人
      */
+    @ExcelProperty(value = "申请人", order = 6)
     @ApiModelProperty(value = "申请人", dataType = "String")
     @TableField("apply_user_name")
     private String applyUserName;
@@ -76,6 +91,7 @@
     /**
      * 申请时间
      */
+    @ExcelProperty(value = "申请时间", order = 7)
     @ApiModelProperty(value = "申请时间(新增自动获取当前时间)", dataType = "String")
     @TableField("apply_time")
     private String applyTime;
@@ -130,6 +146,26 @@
     @TableField("update_time")
     private String updateTime;
 
+    @ExcelProperty(value = "印章名称", order = 2)
+    @ApiModelProperty(value = "印章名称(列表返回参数)", dataType = "String")
+    @TableField(exist = false)
+    private String sealName;
+
+    @DictCodeField(message = "印章类型描述不合法", cacheName = MeterDictCode.SEAL_TYPE)
+    @ApiModelProperty(hidden = true)
+    @TableField(exist = false)
+    private String sealType;
+
+    @ExcelProperty(value = "印章类型", order = 3)
+    @ApiModelProperty(value = "印章类型(列表返回参数)", dataType = "String")
+    @TableField(exist = false)
+    private String sealTypeName;
+
+    @ExcelProperty(value = "批准人", order = 4)
+    @ApiModelProperty(value = "批准人(列表返回参数)", dataType = "String")
+    @TableField(exist = false)
+    private String approverName;
+
     @ApiModelProperty(value = "审批状态类型-字典value", dataType = "String")
     @TableField(exist = false)
     private String approvalStatusName;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceStaffInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceStaffInfo.java
index 5ef995b..41563a1 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceStaffInfo.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceStaffInfo.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.model.resource;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -20,6 +27,11 @@
  * @author wangpeng
  * @since 2023-07-25
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @ApiModel
 @Data
 @TableName("biz_resource_staff_info")
@@ -38,6 +50,7 @@
     /**
      * 人员编号
      */
+    @ExcelProperty(value = "人员编号",order = 0)
     @NotEmpty(message = "人员编号不能为空")
     @ApiModelProperty(value = "人员编号", dataType = "String")
     @TableField("staff_no")
@@ -46,6 +59,7 @@
     /**
      * 姓名
      */
+    @ExcelProperty(value = "姓名",order = 1)
     @ApiModelProperty(value = "姓名", dataType = "String")
     @TableField("staff_name")
     private String staffName;
@@ -152,13 +166,15 @@
     /**
      * 部门名字
      */
-    @ApiModelProperty(value = "部门名字", dataType = "String")
+    @ExcelProperty(value = "工作部门",order = 4)
+    @ApiModelProperty(value = "工作部门", dataType = "String")
     @TableField("dept_name")
     private String deptName;
 
     /**
      * 岗位
      */
+    @ExcelProperty(value = "岗位",order = 2)
     @ApiModelProperty(value = "岗位", dataType = "String")
     @TableField("station")
     private String station;
@@ -166,6 +182,7 @@
     /**
      * 计量专业
      */
+    @ExcelProperty(value = "计量专业",order = 5)
     @ApiModelProperty(value = "计量专业", dataType = "String")
     @TableField("major")
     private String major;
@@ -173,6 +190,7 @@
     /**
      * 证号
      */
+    @ExcelProperty(value = "证号",order = 3)
     @ApiModelProperty(value = "证号", dataType = "String")
     @TableField("certificate_number")
     private String certificateNumber;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSupplierInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSupplierInfo.java
index eb5ef01..a1e2697 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSupplierInfo.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSupplierInfo.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.model.resource;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -20,6 +27,11 @@
  * @author wangpeng
  * @since 2023-07-27
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @ApiModel
 @Data
 @TableName("biz_resource_supplier_info")
@@ -34,6 +46,7 @@
     /**
      * 供方编号
      */
+    @ExcelProperty(value = "供方编号", order = 1)
     @ApiModelProperty(value = "供方编号(自动生成)", dataType = "String")
     @TableField("supplier_no")
     private String supplierNo;
@@ -41,6 +54,7 @@
     /**
      * 供方名称
      */
+    @ExcelProperty(value = "供方名称", order = 2)
     @ApiModelProperty(value = "供方名称", dataType = "String")
     @TableField("supplier_name")
     private String supplierName;
@@ -60,6 +74,7 @@
     @TableField("supplier_type")
     private String supplierType;
 
+    @ExcelProperty(value = "供方类型", order = 3)
     @ApiModelProperty(value = "供方类型(字典value)", dataType = "String")
     @TableField(exist = false)
     private String supplierTypeName;
@@ -109,7 +124,8 @@
     /**
      * 电话
      */
-    @ApiModelProperty(value = "电话", dataType = "String")
+    @ExcelProperty(value = "联系电话", order = 4)
+    @ApiModelProperty(value = "联系电话", dataType = "String")
     @TableField("phone")
     private String phone;
 
@@ -158,6 +174,7 @@
     /**
      * 公司地址-省
      */
+    @ExcelProperty(value = "地址-省", order = 6)
     @ApiModelProperty(value = "公司地址-省", dataType = "String")
     @TableField("company_province_name")
     private String companyProvinceName;
@@ -172,6 +189,7 @@
     /**
      * 公司地址-市
      */
+    @ExcelProperty(value = "地址-市", order = 7)
     @ApiModelProperty(value = "公司地址-市", dataType = "String")
     @TableField("company_city_name")
     private String companyCityName;
@@ -186,6 +204,7 @@
     /**
      * 公司地址-区
      */
+    @ExcelProperty(value = "地址-区", order = 8)
     @ApiModelProperty(value = "公司地址-区", dataType = "String")
     @TableField("company_area_name")
     private String companyAreaName;
@@ -193,6 +212,7 @@
     /**
      * 公司地址-详细地址
      */
+    @ExcelProperty(value = "地址-详细地址", order = 9)
     @ApiModelProperty(value = "公司地址-详细地址", dataType = "String")
     @TableField("company_address")
     private String companyAddress;
@@ -200,6 +220,7 @@
     /**
      * 服务和供应的内容
      */
+    @ExcelProperty(value = "服务和供应的内容", order = 5)
     @ApiModelProperty(value = "服务和供应的内容", dataType = "String")
     @TableField("supplier_content")
     private String supplierContent;
@@ -250,6 +271,7 @@
     /**
      * 创建时间
      */
+    @ExcelProperty(value = "创建时间", order = 9)
     @ApiModelProperty(value = "创建时间", dataType = "String")
     @TableField("create_time")
     private String createTime;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/EnvLocationInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/EnvLocationInfo.java
new file mode 100644
index 0000000..d8e2d7b
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/EnvLocationInfo.java
@@ -0,0 +1,83 @@
+package com.casic.missiles.model.resource;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotEmpty;
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 实验室环境监控系统-设备表
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-06-07
+ */
+@ApiModel
+@Data
+@TableName("env_location_info")
+public class EnvLocationInfo implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "主键id", dataType = "Long")
+    @TableId("id")
+    private Long id;
+
+    /**
+     * 地点编号
+     */
+    @NotEmpty(message = "地点编号不能为空")
+    @ApiModelProperty(value = "地点编号", dataType = "String")
+    @TableField("location_no")
+    private String locationNo;
+
+    /**
+     * 地点名称
+     */
+    @ApiModelProperty(value = "地点名称", dataType = "String")
+    @TableField("location_name")
+    private String locationName;
+
+    /**
+     * 地点位置
+     */
+    @ApiModelProperty(value = "地点位置", dataType = "String")
+    @TableField("location_position")
+    private String locationPosition;
+
+    /**
+     * 创建人id
+     */
+    @ApiModelProperty(value = "创建人id", dataType = "Long")
+    @TableField("create_user_id")
+    private Long createUserId;
+
+    /**
+     * 创建人
+     */
+    @ApiModelProperty(value = "创建人", dataType = "String")
+    @TableField("create_user")
+    private String createUser;
+
+    /**
+     * 创建时间
+     */
+    @ApiModelProperty(value = "创建时间", dataType = "String")
+    @TableField("create_time")
+    private String createTime;
+
+    /**
+     * 更新时间
+     */
+    @ApiModelProperty(value = "更新时间", dataType = "String")
+    @TableField("update_time")
+    private String updateTime;
+
+
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemFileConfig.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemFileConfig.java
index 19e6845..86e569c 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemFileConfig.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemFileConfig.java
@@ -30,7 +30,7 @@
     @ApiModelProperty(value = "系统类别(1业务系统2受检系统3环境系统)", dataType = "Integer")
     @NotNull(message = "系统类别不能为空")
     @TableField("system_type")
-    private Integer systemType;
+    private Integer systemType = 1;
 
     @ApiModelProperty("下载编号")
     @TableField("download_no")
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemNotice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemNotice.java
index e94297d..06ec37d 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemNotice.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemNotice.java
@@ -34,7 +34,7 @@
     @ApiModelProperty(value = "系统类别(1业务系统2受检系统3环境系统)", dataType = "Integer")
     @NotNull(message = "系统类别不能为空")
     @TableField("system_type")
-    private Integer systemType;
+    private Integer systemType = 1;
 
     /**
      * 通知公告编号
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSign.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSign.java
index 6c0d7c9..954f4f8 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSign.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSign.java
@@ -51,7 +51,7 @@
     @ApiModelProperty(value = "系统类别(1业务系统2受检系统3环境系统)", dataType = "Integer")
     @NotNull(message = "系统类别不能为空")
     @TableField("system_type")
-    private Integer systemType;
+    private Integer systemType = 1;
 
     /**
      * 签名编号
@@ -130,4 +130,8 @@
     @TableField(exist = false)
     private List<Long> userIdList;
 
+    @ApiModelProperty(hidden = true)
+    @TableField(exist = false)
+    private String deptName;
+
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemTemplate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemTemplate.java
index 503a457..1d27ebe 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemTemplate.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemTemplate.java
@@ -47,7 +47,7 @@
     @ApiModelProperty(value = "系统类别(1业务系统2受检系统3环境系统)", dataType = "Integer")
     @NotNull(message = "系统类别不能为空")
     @TableField("system_type")
-    private Integer systemType;
+    private Integer systemType = 1;
 
     /**
      * 模板编号
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java
index 8c21cb0..f61e4a8 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java
@@ -32,4 +32,8 @@
     ReturnDTO approvalDelete(ApprovalDeleteRequest request);
 
     ReturnDTO failUpdate(T request);
+
+    List<O> listExport(R request);
+
+    List<O> listExportByIds(List<Long> ids);
 }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java
index 724166f..9bce15b 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java
@@ -157,6 +157,29 @@
         throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
     }
 
+    @Override
+    public List<O> listExport(R request) {
+        request.setCreateUserId(null);
+        request.setApprovalStatus(ApprovalStatusEnum.PASSED);
+        Page<O> page = PageFactory.defaultPage();
+        page.setCurrent(1);
+        page.setSearchCount(false);
+        page.setSize(Integer.MAX_VALUE);
+        Page<O> resultPage = this.baseMapper.selectBatchForApprovalList(page, request, null);
+        return resultPage.getRecords();
+    }
+
+    @Override
+    public List<O> listExportByIds(List<Long> ids) {
+        Page<O> page = PageFactory.defaultPage();
+        page.setCurrent(1);
+        page.setSearchCount(false);
+        page.setSize(Integer.MAX_VALUE);
+        List<String> businessKeys = ids.stream().map(String::valueOf).collect(Collectors.toList());
+        Page<O> resultPage = this.baseMapper.selectBatchForApprovalList(page, null, businessKeys);
+        return resultPage.getRecords();
+    }
+
     protected ReturnDTO updateApprovalStatus(Long id, String processId, String approvalStatus) {
         UpdateWrapper<T> updateWrapper = new UpdateWrapper<>();
         updateWrapper.eq("id", id);
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificatePrintServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificatePrintServiceImpl.java
index f6e4706..3228497 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificatePrintServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificatePrintServiceImpl.java
@@ -162,6 +162,30 @@
         return ReturnUtil.success(printLogMapper.selectList(wrapper));
     }
 
+    @Override
+    public List<CertificatePrintListResponse> listByIds(List<Long> ids) {
+        Page<CertificatePrintListResponse> page = PageFactory.defaultPage();
+        page.setCurrent(1);
+        page.setSearchCount(false);
+        page.setSize(Integer.MAX_VALUE);
+        List<String> businessKeys = ids.stream().map(String::valueOf).collect(Collectors.toList());
+        Page<CertificatePrintListResponse> resultPage = this.baseMapper.selectBatchForApprovalList(page, null, businessKeys);
+        return resultPage.getRecords();
+    }
+
+    @Override
+    public List<CertificatePrintListResponse> list(CertificatePrintApprovalListRequest request) {
+        request.setCreateUserId(null);
+        request.setApprovalStatus(null);
+        request.setPrintStatus(null);
+        Page<CertificatePrintListResponse> page = PageFactory.defaultPage();
+        page.setCurrent(1);
+        page.setSearchCount(false);
+        page.setSize(Integer.MAX_VALUE);
+        Page<CertificatePrintListResponse> resultPage = certificatePrintMapper.selectBatchForApprovalList(page, request, null);
+        return resultPage.getRecords();
+    }
+
     private void savePrintLog(Long id) {
         BizBusinessCertificatePrintLog printLog = new BizBusinessCertificatePrintLog();
         BizBusinessCertificatePrint certificatePrint = certificatePrintMapper.selectById(id);
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificateReportServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificateReportServiceImpl.java
index 457555f..24146be 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificateReportServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificateReportServiceImpl.java
@@ -158,8 +158,8 @@
         QueryWrapper<BizBusinessCertificateMeasureResultData> mWrapper = new QueryWrapper<>();
         mWrapper.eq("report_id", reportId);
         boolean mRemove = certificateMeasureResultDataService.remove(mWrapper);
-        Assert.isFalse(eRemove || mRemove, () -> {
+        if(!eRemove || !mRemove){
             throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
-        });
+        }
     }
 }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessIdentifyInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessIdentifyInfoServiceImpl.java
index 4c8e190..f7e63ca 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessIdentifyInfoServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessIdentifyInfoServiceImpl.java
@@ -1,8 +1,10 @@
 package com.casic.missiles.service.Impl.business;
 
+import cn.hutool.core.date.DateUtil;
 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.core.page.PageFactory;
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.business.identify.IdentifyListRequest;
@@ -14,11 +16,14 @@
 import com.casic.missiles.service.business.IBizBusinessIdentifyInfoService;
 import com.casic.missiles.utils.DictCodeUtils;
 import com.casic.missiles.utils.NumberGeneratorUtil;
+import com.casic.missiles.utils.QRCodeUtil;
 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.List;
+
 /**
  * <p>
  * 计量检定业务-任务计量管理-标识打印 服务实现类
@@ -35,9 +40,9 @@
     @Override
     public Page<BizBusinessIdentifyInfo> identifyListPage(Page<BizBusinessIdentifyInfo> page, IdentifyListRequest request) throws Exception {
         QueryWrapper<BizBusinessIdentifyInfo> wrapper = new QueryWrapper<>();
-        wrapper.eq("identify_type", request.getIdentifyType());
-        wrapper.like("device_no", request.getDeviceNo());
-        wrapper.like("device_name", request.getDeviceName());
+        wrapper.eq(StringUtils.isNotEmpty(request.getIdentifyType()), "identify_type", request.getIdentifyType());
+        wrapper.like(StringUtils.isNotEmpty(request.getDeviceNo()),"device_no", request.getDeviceNo());
+        wrapper.like(StringUtils.isNotEmpty(request.getDeviceName()), "device_name", request.getDeviceName());
         wrapper.apply(StringUtils.isNotBlank(request.getCreateTimeStart()),
                 "{0} <= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getCreateTimeStart().split(" ")[0]);
         wrapper.apply(StringUtils.isNotBlank(request.getCreateTimeEnd()),
@@ -64,8 +69,11 @@
     }
 
     @Override
-    public ReturnDTO updateIdentify(BizBusinessIdentifyInfo identifyInfo) {
-        if(identifyInfoMapper.updateById(identifyInfo) > 0){
+    public ReturnDTO updateIdentify(Long id) {
+        BizBusinessIdentifyInfo info = new BizBusinessIdentifyInfo();
+        info.setId(id);
+        info.setUpdateTime(DateUtil.now());
+        if(identifyInfoMapper.updateById(info) > 0){
             return ReturnUtil.success();
         }
         throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
@@ -79,4 +87,20 @@
         throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
     }
 
+    @Override
+    public List<BizBusinessIdentifyInfo> list(IdentifyListRequest request) throws Exception {
+        Page<BizBusinessIdentifyInfo> page = PageFactory.defaultPage();
+        page.setCurrent(1);
+        page.setSearchCount(false);
+        page.setSize(Integer.MAX_VALUE);
+        Page<BizBusinessIdentifyInfo> resultPage = this.identifyListPage(page, request);
+        return resultPage.getRecords();
+    }
+
+    @Override
+    public ReturnDTO<String> equipmentQrCode(Long id) {
+        String base64QRCode = QRCodeUtil.getBase64QRCode(String.valueOf(id));
+        return ReturnUtil.success(base64QRCode);
+    }
+
 }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOrderInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOrderInfoServiceImpl.java
index 82952ad..d8d2c6a 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOrderInfoServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOrderInfoServiceImpl.java
@@ -35,6 +35,7 @@
 import javax.servlet.http.HttpServletResponse;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 import java.util.stream.Collectors;
 
 /**
@@ -209,13 +210,16 @@
     private QueryWrapper<OrderListResponse> listParamWrapperBuilder(OrderListRequest request) {
         QueryWrapper<OrderListResponse> wrapper = new QueryWrapper<>();
         wrapper.like(StringUtils.isNotBlank(request.getOrderNo()), "order_no", request.getOrderNo());
+        wrapper.like(Objects.nonNull(request.getCustomerId()), "customer_id", request.getCustomerId());
         wrapper.like(StringUtils.isNotBlank(request.getCustomerName()), "customer_name", request.getCustomerName());
         wrapper.like(StringUtils.isNotBlank(request.getDeliverer()), "deliverer", request.getDeliverer());
         wrapper.like(StringUtils.isNotBlank(request.getCreateUserName()), "create_user_name", request.getCreateUserName());
-        wrapper.apply(StringUtils.isNotBlank(request.getCreateStartTime()),
-                "{0} <= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getCreateStartTime().split(" ")[0]);
-        wrapper.apply(StringUtils.isNotBlank(request.getCreateEndTime()),
-                "{0} >= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getCreateEndTime().split(" ")[0]);
+        if(StringUtils.isNotBlank(request.getCreateStartTime())){
+            wrapper.apply("{0} <= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getCreateStartTime().split(" ")[0]);
+        }
+        if(StringUtils.isNotBlank(request.getCreateEndTime())){
+            wrapper.apply("{0} >= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getCreateEndTime().split(" ")[0]);
+        }
         wrapper.orderByDesc("create_time");
         return wrapper;
     }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceAssessServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceAssessServiceImpl.java
index c6af980..ce40138 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceAssessServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceAssessServiceImpl.java
@@ -1,10 +1,33 @@
 package com.casic.missiles.service.Impl.business;
 
-import com.casic.missiles.model.business.BizBusinessOutsourceAssess;
+import cn.hutool.core.lang.Assert;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.casic.missiles.core.model.auth.AuthUser;
+import com.casic.missiles.core.shiro.ShiroKit;
+import com.casic.missiles.dto.BaseApprovalSubmitRequest;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.ReturnUtil;
+import com.casic.missiles.dto.business.outsource.OutsourceAssessApprovalListRequest;
+import com.casic.missiles.dto.business.outsource.OutsourceAssessSaveResponse;
+import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.NoGenerateFileCodeEnum;
+import com.casic.missiles.enums.NoGenerateRecordTypeCodeEnum;
+import com.casic.missiles.enums.system.ApprovalStatusEnum;
+import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.mapper.business.BizBusinessOutsourceAssessMapper;
+import com.casic.missiles.model.business.BizBusinessOutsourceAssess;
+import com.casic.missiles.model.business.BizBusinessOutsourceAssessSampleRelation;
+import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl;
+import com.casic.missiles.service.business.IBizBusinessOutsourceAssessSampleRelationService;
 import com.casic.missiles.service.business.IBizBusinessOutsourceAssessService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.casic.missiles.utils.NoGeneratorUtil;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Objects;
 
 /**
  * <p>
@@ -15,6 +38,103 @@
  * @since 2023-08-16
  */
 @Service
-public class BizBusinessOutsourceAssessServiceImpl extends ServiceImpl<BizBusinessOutsourceAssessMapper, BizBusinessOutsourceAssess> implements IBizBusinessOutsourceAssessService {
+public class BizBusinessOutsourceAssessServiceImpl extends GeneralApprovalServiceImpl<BizBusinessOutsourceAssessMapper, BizBusinessOutsourceAssess, BizBusinessOutsourceAssess, OutsourceAssessApprovalListRequest, BaseApprovalSubmitRequest> implements IBizBusinessOutsourceAssessService {
+    @Autowired
+    private IBizBusinessOutsourceAssessSampleRelationService outsourceAssessSampleRelationService;
 
+    @Override
+    public ReturnDTO<OutsourceAssessSaveResponse> saveOutsourceAssess(BizBusinessOutsourceAssess request) {
+        //生成编号
+        String labCode = request.getLabCode();
+        String groupCode = request.getGroupCode();
+        Long maxNo = this.baseMapper.selectMaxProjectNo();
+        String projectNo = NoGeneratorUtil.getCode(NoGenerateFileCodeEnum.D, labCode, NoGenerateRecordTypeCodeEnum.OUTSOURCE_ACCESS, groupCode, maxNo);
+        request.setCreateUserId(request.getUserId());
+        request.setCreateUserName(request.getUserName());
+        request.setApprovalStatus(ApprovalStatusEnum.DRAFT); //草稿箱状态
+        request.setProjectNo(projectNo);
+        int row = this.baseMapper.insert(request);
+        Assert.isFalse(row <= 0, () -> {
+            throw new BusinessException(BusinessExceptionEnum.OUTSOURCE_ACCESS_SAVE_FAILED);
+        });
+        //关联表
+        saveRelationData(request);
+        OutsourceAssessSaveResponse saveResponse = new OutsourceAssessSaveResponse();
+        saveResponse.setId(request.getId());
+        saveResponse.setProjectNo(projectNo);
+        return ReturnUtil.success(saveResponse);
+    }
+
+    @Override
+    @Transactional
+    public ReturnDTO draftUpdate(BizBusinessOutsourceAssess request) {
+        if (this.baseMapper.updateById(request) > 0) {
+            //关联表删除、增加
+            removeRelationData(request.getId());
+            saveRelationData(request);
+            return ReturnUtil.success();
+        }
+        throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
+    }
+
+    @Override
+    public ReturnDTO draftDelete(Long id) {
+        if (this.baseMapper.deleteById(id) > 0) {
+            //关联表删除
+            removeRelationData(id);
+            return ReturnUtil.success();
+        }
+        throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
+    }
+
+    @Override
+    public ReturnDTO draftBatchDelete(List<Long> ids) {
+        if (this.baseMapper.deleteBatchIds(ids) >= 0) {
+            ids.forEach(id -> removeRelationData(id));
+            return ReturnUtil.success();
+        }
+        throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
+    }
+
+    @Override
+    @Transactional
+    public ReturnDTO failUpdate(BizBusinessOutsourceAssess request) {
+        AuthUser user = ShiroKit.getUser();
+        Assert.isFalse(Objects.isNull(user), () -> {
+            throw new BusinessException(BusinessExceptionEnum.LOGIN_USER_ACQUIRE_FAILED);
+        });
+        request.setApprovalStatus(ApprovalStatusEnum.IN_APPROVED);
+        if (this.baseMapper.updateById(request) > 0) {
+            //关联表删除、增加
+            removeRelationData(request.getId());
+            saveRelationData(request);
+            baseApprovalService.failUpdate(request.getProcessId());
+            return ReturnUtil.success();
+        }
+        throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
+    }
+
+    private void saveRelationData(BizBusinessOutsourceAssess request) {
+        List<BizBusinessOutsourceAssessSampleRelation> sampleRelations = new ArrayList<>();
+        request.getOrderSampleList().forEach(dto -> {
+            BizBusinessOutsourceAssessSampleRelation relation = new BizBusinessOutsourceAssessSampleRelation();
+            relation.setOrderId(dto.getOrderId());
+            relation.setSampleId(dto.getSampleId());
+            relation.setAccessId(request.getId());
+            sampleRelations.add(relation);
+        });
+        if(outsourceAssessSampleRelationService.saveBatch(sampleRelations)){
+            return;
+        }
+        throw new BusinessException(BusinessExceptionEnum.OUTSOURCE_ACCESS_SAVE_FAILED);
+    }
+
+    private void removeRelationData(Long assessId) {
+        QueryWrapper<BizBusinessOutsourceAssessSampleRelation> wrapper = new QueryWrapper<>();
+        wrapper.eq("access_id", assessId);
+        if(outsourceAssessSampleRelationService.remove(wrapper)){
+            return;
+        }
+        throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
+    }
 }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceProtocolServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceProtocolServiceImpl.java
new file mode 100644
index 0000000..821e728
--- /dev/null
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceProtocolServiceImpl.java
@@ -0,0 +1,60 @@
+package com.casic.missiles.service.Impl.business;
+
+import cn.hutool.core.lang.Assert;
+import com.casic.missiles.dto.BaseApprovalSubmitRequest;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.ReturnUtil;
+import com.casic.missiles.dto.business.outsource.OutsourceProtocolApprovalListRequest;
+import com.casic.missiles.dto.business.outsource.OutsourceProtocolSaveResponse;
+import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.NoGenerateFileCodeEnum;
+import com.casic.missiles.enums.NoGenerateRecordTypeCodeEnum;
+import com.casic.missiles.enums.system.ApprovalStatusEnum;
+import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.mapper.business.BizBusinessOutsourceProtocolMapper;
+import com.casic.missiles.mapper.business.BizBusinessOutsourcerInfoMapper;
+import com.casic.missiles.model.business.BizBusinessOutsourceProtocol;
+import com.casic.missiles.model.business.BizBusinessOutsourcerInfo;
+import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl;
+import com.casic.missiles.service.business.IBizBusinessOutsourceProtocolService;
+import com.casic.missiles.utils.NoGeneratorUtil;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 计量检定业务-分包管理-测试、校准或检定工作分包协议书 服务实现类
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-08-24
+ */
+@Service
+public class BizBusinessOutsourceProtocolServiceImpl extends GeneralApprovalServiceImpl<BizBusinessOutsourceProtocolMapper, BizBusinessOutsourceProtocol, BizBusinessOutsourceProtocol, OutsourceProtocolApprovalListRequest, BaseApprovalSubmitRequest> implements IBizBusinessOutsourceProtocolService {
+    @Autowired
+    private BizBusinessOutsourcerInfoMapper outsourcerInfoMapper;
+
+    @Override
+    public ReturnDTO<OutsourceProtocolSaveResponse> saveOutsourceProtocol(BizBusinessOutsourceProtocol request) {
+        //生成编号
+        String labCode = request.getLabCode();
+        String groupCode = request.getGroupCode();
+        Long maxNo = this.baseMapper.selectMaxProtocolNo();
+        String protocolNo = NoGeneratorUtil.getCode(NoGenerateFileCodeEnum.D, labCode, NoGenerateRecordTypeCodeEnum.OUTSOURCE_PROTOCOL, groupCode, maxNo);
+        request.setCreateUserId(request.getUserId());
+        request.setCreateUserName(request.getUserName());
+        request.setApprovalStatus(ApprovalStatusEnum.DRAFT); //草稿箱状态
+        request.setProtocolNo(protocolNo);
+        BizBusinessOutsourcerInfo outsourcerInfo = outsourcerInfoMapper.selectById(request.getOutsourcerId());
+        request.setOutsourceNo(outsourcerInfo.getOutsourcerNo());
+        request.setOutsourceName(outsourcerInfo.getOutsourcerName());
+        int row = this.baseMapper.insert(request);
+        Assert.isFalse(row <= 0, () -> {
+            throw new BusinessException(BusinessExceptionEnum.OUTSOURCE_PROTOCOL_SAVE_FAILED);
+        });
+        OutsourceProtocolSaveResponse saveResponse = new OutsourceProtocolSaveResponse();
+        saveResponse.setId(request.getId());
+        saveResponse.setProtocolNo(protocolNo);
+        return ReturnUtil.success(saveResponse);
+    }
+}
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourcerInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourcerInfoServiceImpl.java
index 75f639d..8aadad7 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourcerInfoServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourcerInfoServiceImpl.java
@@ -3,12 +3,12 @@
 import cn.hutool.core.lang.Assert;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.dto.*;
 import com.casic.missiles.dto.business.outsource.OutsourcerInfoApprovalListRequest;
 import com.casic.missiles.dto.business.outsource.OutsourcerSaveResponse;
 import com.casic.missiles.enums.BusinessExceptionEnum;
-import com.casic.missiles.enums.PrefixCodeEnum;
+import com.casic.missiles.enums.NoGenerateFileCodeEnum;
+import com.casic.missiles.enums.NoGenerateRecordTypeCodeEnum;
 import com.casic.missiles.enums.system.ApprovalStatusEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.mapper.business.BizBusinessOutsourcerInfoMapper;
@@ -20,7 +20,7 @@
 import com.casic.missiles.service.business.IBizBusinessOutsourcerInfoService;
 import com.casic.missiles.service.business.IBizBusinessOutsourcerUserInfoService;
 import com.casic.missiles.utils.DictCodeUtils;
-import com.casic.missiles.utils.NumberGeneratorUtil;
+import com.casic.missiles.utils.NoGeneratorUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -42,22 +42,12 @@
     private IBizBusinessOutsourcerUserInfoService outsourcerUserInfoService;
 
     @Override
-    public List<BizBusinessOutsourcerInfo> list(OutsourcerInfoApprovalListRequest request) {
-        request.setCreateUserId(null);
-        request.setApprovalStatus(ApprovalStatusEnum.PASSED);
-        Page<BizBusinessOutsourcerInfo> page = PageFactory.defaultPage();
-        page.setCurrent(1);
-        page.setSearchCount(false);
-        page.setSize(Integer.MAX_VALUE);
-        Page<BizBusinessOutsourcerInfo> resultPage = this.baseMapper.selectBatchForApprovalList(page, request, null);
-        return resultPage.getRecords();
-    }
-
-    @Override
     public ReturnDTO<OutsourcerSaveResponse> saveOutsourcer(BizBusinessOutsourcerInfo request) {
         //生成编号
+        String labCode = request.getLabCode();
+        String groupCode = request.getGroupCode();
         Long maxNo = this.baseMapper.selectMaxNo();
-        String outsourcerNo = NumberGeneratorUtil.getContactNo(PrefixCodeEnum.OUTSOURCER_PREFIX, maxNo);
+        String outsourcerNo = NoGeneratorUtil.getCode(NoGenerateFileCodeEnum.D, labCode, NoGenerateRecordTypeCodeEnum.OUTSOURCE_INFO, groupCode, maxNo);
         request.setOutsourcerNo(outsourcerNo);
         request.setCreateUserId(request.getUserId());
         request.setCreateUserName(request.getUserName());
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessSiteExecutiveInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessSiteExecutiveInfoServiceImpl.java
index ebab3e6..6c6a129 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessSiteExecutiveInfoServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessSiteExecutiveInfoServiceImpl.java
@@ -189,9 +189,9 @@
         QueryWrapper<BizBusinessSiteExecutiveStaffRelation> mWrapper = new QueryWrapper<>();
         mWrapper.eq("site_executive_id", siteExecutiveId);
         boolean mRemove = siteExecutiveStaffRelationService.remove(mWrapper);
-        Assert.isFalse(eRemove || mRemove, () -> {
+        if(!eRemove || !mRemove){
             throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
-        });
+        }
     }
 
     private void doPopulateSiteExecutive(SiteExecutiveDetailResponse detailResponse) {
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessLabExecutiveInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessLabExecutiveInfoServiceImpl.java
index 50c5616..0242fcf 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessLabExecutiveInfoServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessLabExecutiveInfoServiceImpl.java
@@ -297,6 +297,29 @@
     }
 
     @Override
+    public List<SampleLabExecutiveListResponse> deptLabExecutiveList(SampleLabExecutiveListRequest request) throws Exception {
+        Page<SampleLabExecutiveListResponse> page = PageFactory.defaultPage();
+        page.setCurrent(1);
+        page.setSearchCount(false);
+        page.setSize(Integer.MAX_VALUE);
+        Page<SampleLabExecutiveListResponse> resultPage = this.deptLabExecutiveListPage(page, request);
+        return resultPage.getRecords();
+    }
+
+    @Override
+    public List<SampleLabExecutiveListResponse> deptLabExecutiveListByIds(String measureStatus, List<Long> ids) throws Exception {
+        Page<SampleLabExecutiveListResponse> page = PageFactory.defaultPage();
+        page.setCurrent(1);
+        page.setSearchCount(false);
+        page.setSize(Integer.MAX_VALUE);
+        SampleLabExecutiveListRequest request = new SampleLabExecutiveListRequest();
+        request.setIds(ids);
+        request.setMeasureStatus(measureStatus);
+        Page<SampleLabExecutiveListResponse> resultPage = this.deptLabExecutiveListPage(page, request);
+        return resultPage.getRecords();
+    }
+
+    @Override
     public Page<SampleLabExecutiveListResponse> myLabExecutiveListPage(Page<SampleLabExecutiveListResponse> page, SampleLabExecutiveListRequest labExecutiveListRequest) throws Exception{
         AuthUser user = ShiroKit.getUser();
         Assert.isFalse(Objects.isNull(user), () -> {
@@ -350,6 +373,29 @@
     }
 
     @Override
+    public List<SampleLabExecutiveListResponse> myLabExecutiveList(SampleLabExecutiveListRequest request) throws Exception {
+        Page<SampleLabExecutiveListResponse> page = PageFactory.defaultPage();
+        page.setCurrent(1);
+        page.setSearchCount(false);
+        page.setSize(Integer.MAX_VALUE);
+        Page<SampleLabExecutiveListResponse> resultPage = this.myLabExecutiveListPage(page, request);
+        return resultPage.getRecords();
+    }
+
+    @Override
+    public List<SampleLabExecutiveListResponse> myLabExecutiveListByIds(String measureStatus, List<Long> ids) throws Exception {
+        Page<SampleLabExecutiveListResponse> page = PageFactory.defaultPage();
+        page.setCurrent(1);
+        page.setSearchCount(false);
+        page.setSize(Integer.MAX_VALUE);
+        SampleLabExecutiveListRequest request = new SampleLabExecutiveListRequest();
+        request.setIds(ids);
+        request.setMeasureStatus(measureStatus);
+        Page<SampleLabExecutiveListResponse> resultPage = this.myLabExecutiveListPage(page, request);
+        return resultPage.getRecords();
+    }
+
+    @Override
     public List<SampleAmountResponse> myExecutiveAmount() {
         //登录用户id获取计量人员id，实验室检测信息中存储的是计量人员id
         AuthUser user = ShiroKit.getUser();
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentInfoServiceImpl.java
index 864b05e..db8cad4 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentInfoServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentInfoServiceImpl.java
@@ -35,7 +35,6 @@
 import com.casic.missiles.utils.ConvertUtils;
 import com.casic.missiles.utils.DictCodeUtils;
 import com.casic.missiles.utils.NumberGeneratorUtil;
-import org.flowable.engine.RuntimeService;
 import org.flowable.engine.runtime.ProcessInstance;
 import org.jetbrains.annotations.NotNull;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -43,7 +42,6 @@
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
 
-import javax.annotation.Resource;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
@@ -81,8 +79,6 @@
     private IBizEquipmentAttachmentService attachmentService;
     @Autowired
     private IBizEquipmentCheckpointService checkpointService;
-    @Resource
-    private RuntimeService runtimeService;
     @Autowired
     private ApprovalOperateService approvalOperateService;
 
@@ -235,18 +231,18 @@
     private void updateRelationInfo(EquipmentAddRequest request, BizEquipmentInfoApproval equipmentInfoApproval) {
         QueryWrapper<BizEquipmentTechnicalTarget> targetWrapper = new QueryWrapper<>();
         targetWrapper.eq("equipment_no", equipmentInfoApproval.getEquipmentNo());
-        boolean removeTargetFlag = technicalTargetService.remove(targetWrapper);
-        boolean saveTargetFlag = technicalTargetService.saveBatch(request.getTechnicalTargetList());
+        technicalTargetService.remove(targetWrapper);
+        technicalTargetService.saveBatch(request.getTechnicalTargetList());
 
         QueryWrapper<BizEquipmentAttachment> attachmentWrapper = new QueryWrapper<>();
         attachmentWrapper.eq("equipment_no", equipmentInfoApproval.getEquipmentNo());
-        boolean removeAttachmentFlag = attachmentService.remove(attachmentWrapper);
-        boolean saveAttachmentFlag = attachmentService.saveBatch(request.getAttachmentList());
+        attachmentService.remove(attachmentWrapper);
+        attachmentService.saveBatch(request.getAttachmentList());
 
         QueryWrapper<BizEquipmentCheckpoint> checkpointWrapper = new QueryWrapper<>();
         checkpointWrapper.eq("equipment_no", equipmentInfoApproval.getEquipmentNo());
-        boolean removeCheckpointFlag = checkpointService.remove(checkpointWrapper);
-        boolean saveCheckpointFlag = checkpointService.saveBatch(request.getCheckpointList());
+        checkpointService.remove(checkpointWrapper);
+        checkpointService.saveBatch(request.getCheckpointList());
     }
 
     @Override
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardInfoServiceImpl.java
index faff1ae..c50a5b3 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardInfoServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardInfoServiceImpl.java
@@ -22,7 +22,9 @@
 import com.casic.missiles.mapper.equipment.BizEquipmentStandardInfoMapper;
 import com.casic.missiles.mapper.equipment.BizEquipmentStandardTechnologyRelationMapper;
 import com.casic.missiles.mapper.resource.BizResourceStaffInfoMapper;
-import com.casic.missiles.model.equipment.*;
+import com.casic.missiles.model.equipment.BizEquipmentStandardInfo;
+import com.casic.missiles.model.equipment.BizEquipmentStandardInfoApproval;
+import com.casic.missiles.model.equipment.BizEquipmentStandardTechnologyRelation;
 import com.casic.missiles.model.resource.BizResourceStaffInfo;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.dao.DeptMapper;
@@ -33,14 +35,12 @@
 import com.casic.missiles.service.flowable.ApprovalOperateService;
 import com.casic.missiles.utils.ConvertUtils;
 import com.casic.missiles.utils.DictCodeUtils;
-import org.flowable.engine.RuntimeService;
 import org.flowable.engine.runtime.ProcessInstance;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
 
-import javax.annotation.Resource;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
@@ -62,8 +62,6 @@
     private BizResourceStaffInfoMapper staffInfoMapper;
     @Autowired
     private IBaseApprovalService baseApprovalService;
-    @Resource
-    private RuntimeService runtimeService;
     @Autowired
     private ApprovalOperateService approvalOperateService;
     @Autowired
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSealInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSealInfoServiceImpl.java
index 7c91fa2..00040d6 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSealInfoServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSealInfoServiceImpl.java
@@ -15,6 +15,7 @@
 import com.casic.missiles.modular.system.model.User;
 import com.casic.missiles.service.resource.IBizResourceSealInfoService;
 import com.casic.missiles.utils.DictCodeUtils;
+import com.casic.missiles.utils.MinioUtil;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -33,6 +34,8 @@
     private BizResourceSealInfoMapper sealInfoMapper;
     @Autowired
     private UserMapper userMapper;
+    @Autowired
+    private MinioUtil minioUtil;
 
     @Override
     public Page<BizResourceSealInfo> listPage(Page<BizResourceSealInfo> page, SealInfoListRequest request) throws Exception {
@@ -44,6 +47,7 @@
         Page<BizResourceSealInfo> sealInfoPage = sealInfoMapper.selectPage(page, wrapper);
         for (BizResourceSealInfo record : sealInfoPage.getRecords()) {
             DictCodeUtils.convertDictCodeToName(record);
+            record.setMinioFileUrl(minioUtil.getFileUrl(record.getMinioFileName()));
         }
         return sealInfoPage;
     }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceStaffInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceStaffInfoServiceImpl.java
index f058cf5..09203ac 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceStaffInfoServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceStaffInfoServiceImpl.java
@@ -3,6 +3,7 @@
 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.core.page.PageFactory;
 import com.casic.missiles.dto.IdDTO;
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
@@ -86,6 +87,13 @@
     }
 
     @Override
+    public List<BizResourceStaffInfo> list(StaffListRequest request) throws Exception {
+        Page<BizResourceStaffInfo> page = PageFactory.defaultPage();
+        Page<BizResourceStaffInfo> staffInfoPage = this.listPage(page, request);
+        return staffInfoPage.getRecords();
+    }
+
+    @Override
     @Transactional
     public ReturnDTO<IdDTO> staffBaseAdd(BizResourceStaffInfo staffInfo) {
         //登录账号查重
@@ -495,6 +503,28 @@
         return certResponsePage;
     }
 
+    @Override
+    public List<StaffCertResponse> certListByIds(List<Long> ids) throws Exception {
+        Page<StaffCertResponse> page = PageFactory.defaultPage();
+        page.setCurrent(1);
+        page.setSearchCount(false);
+        page.setSize(Integer.MAX_VALUE);
+        StaffCertRequest request = new StaffCertRequest();
+        request.setIds(ids);
+        Page<StaffCertResponse> resultPage = this.certListPage(page, request);
+        return resultPage.getRecords();
+    }
+
+    @Override
+    public List<StaffCertResponse> certList(StaffCertRequest request) throws Exception {
+        Page<StaffCertResponse> page = PageFactory.defaultPage();
+        page.setCurrent(1);
+        page.setSearchCount(false);
+        page.setSize(Integer.MAX_VALUE);
+        Page<StaffCertResponse> resultPage = this.certListPage(page, request);
+        return resultPage.getRecords();
+    }
+
     @Async
     public void deleteRelationInfo(Long staffId){
         QueryWrapper<BizResourceStaffEducation> educationWrapper = new QueryWrapper<>();
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceStaffVerifierServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceStaffVerifierServiceImpl.java
index 8ac7eee..b508d45 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceStaffVerifierServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceStaffVerifierServiceImpl.java
@@ -52,8 +52,8 @@
     private WebSocket webSocket;
 
     @Override
-    public ReturnDTO expirationReminder(IdDTO idDto) {
-        BizResourceStaffVerifier staffVerifier = verifierMapper.selectById(idDto.getId());
+    public ReturnDTO expirationReminder(IdDTO idDTO) {
+        BizResourceStaffVerifier staffVerifier = verifierMapper.selectById(idDTO.getId());
         BizResourceStaffInfo staffInfo = staffInfoMapper.selectById(staffVerifier.getStaffId());
         QueryWrapper<User> wrapper = new QueryWrapper<>();
         wrapper.eq("account", staffInfo.getAccount());
@@ -65,7 +65,7 @@
         Assert.isFalse(Objects.isNull(user), () -> {
             throw new BusinessException(BusinessExceptionEnum.LOGIN_USER_ACQUIRE_FAILED);
         });
-        WorkbenchRemindMessage remindMessage = new WorkbenchRemindMessage(userInfo.getId(), userInfo.getDeptId(), idDto.getId(), staffVerifier.getCertNo(), MessageTypeEnum.STAFF_CERT.getCode(), MessageSourceModuleEnum.RESOURCE.getCode(), MessageTypeEnum.STAFF_CERT.getValue(), MessageTypeEnum.STAFF_CERT.getValue(), staffVerifier.getCertName(),0, user.getId(), user.getName());
+        WorkbenchRemindMessage remindMessage = new WorkbenchRemindMessage(userInfo.getId(), userInfo.getDeptId(), idDTO.getId(), staffVerifier.getCertNo(), MessageTypeEnum.STAFF_CERT.getCode(), MessageSourceModuleEnum.RESOURCE.getCode(), MessageTypeEnum.STAFF_CERT.getValue(), MessageTypeEnum.STAFF_CERT.getValue(), staffVerifier.getCertName(),0, user.getId(), user.getName());
         if(messageMapper.insert(remindMessage) > 0){
             // 新增到消息列表后向用户推送消息
             webSocket.sendOneMessage(String.valueOf(userInfo.getId()), JSONObject.toJSONString(remindMessage));
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceTrainInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceTrainInfoServiceImpl.java
index c1d6308..3a533f2 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceTrainInfoServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceTrainInfoServiceImpl.java
@@ -44,11 +44,14 @@
     @Override
     public Page<BizResourceTrainInfo> listPage(Page<BizResourceTrainInfo> page, TrainListRequest request) throws Exception {
         QueryWrapper<BizResourceTrainInfo> wrapper = new QueryWrapper<>();
-        wrapper.like("train_no", request.getTrainNo());
-        wrapper.apply(StringUtils.isNotBlank(request.getCreateTimeStart()),//apply方法传入参数名不能为空
-                "{0} <= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getCreateTimeStart().split(" ")[0]);
-        wrapper.apply(StringUtils.isNotBlank(request.getCreateTimeEnd()),
-                "{0} >= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getCreateTimeEnd().split(" ")[0]);
+        wrapper.like(StringUtils.isNotEmpty(request.getTrainNo()), "train_no", request.getTrainNo());
+        wrapper.like(StringUtils.isNotEmpty(request.getDutyLeader()),"duty_leader", request.getDutyLeader());
+        if(StringUtils.isNotBlank(request.getCreateTimeStart())){
+            wrapper.apply("{0} <= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getCreateTimeStart().split(" ")[0]);
+        }
+        if(StringUtils.isNotBlank(request.getCreateTimeEnd())){
+            wrapper.apply("{0} >= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getCreateTimeEnd().split(" ")[0]);
+        }
         wrapper.orderByDesc("create_time");
         Page<BizResourceTrainInfo> trainInfoPage = trainInfoMapper.selectPage(page, wrapper);
         for (BizResourceTrainInfo record : trainInfoPage.getRecords()) {
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/EnvLocationInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/EnvLocationInfoServiceImpl.java
new file mode 100644
index 0000000..cdc5742
--- /dev/null
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/EnvLocationInfoServiceImpl.java
@@ -0,0 +1,31 @@
+package com.casic.missiles.service.Impl.resource;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.casic.missiles.dto.resource.environment.LocationListRequest;
+import com.casic.missiles.dto.resource.environment.LocationListResponse;
+import com.casic.missiles.mapper.resource.EnvLocationInfoMapper;
+import com.casic.missiles.model.resource.EnvLocationInfo;
+import com.casic.missiles.service.resource.IEnvLocationInfoService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 实验室环境监控系统-设备表 服务实现类
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-06-07
+ */
+@Service
+public class EnvLocationInfoServiceImpl extends ServiceImpl<EnvLocationInfoMapper, EnvLocationInfo> implements IEnvLocationInfoService {
+    @Autowired
+    private EnvLocationInfoMapper locationInfoMapper;
+
+    @Override
+    public Page<LocationListResponse> listPage(Page<LocationListResponse> page, LocationListRequest request) {
+        Page<LocationListResponse> resultPage = locationInfoMapper.selectLocationListPage(page, request);
+        return resultPage;
+    }
+}
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/DownloadCenterServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/DownloadCenterServiceImpl.java
index c956d24..d9f3282 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/DownloadCenterServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/DownloadCenterServiceImpl.java
@@ -131,10 +131,12 @@
         wrapper.like(StringUtils.isNotBlank(request.getModuleName()), "module_name", request.getModuleName());
         wrapper.like(StringUtils.isNotBlank(request.getFileName()), "file_name", request.getFileName());
         wrapper.like(StringUtils.isNotBlank(request.getFileType()), "file_type", request.getFileType());
-        wrapper.apply(StringUtils.isNotBlank(request.getStartTime()),
-                "{0} <= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getStartTime().split(" ")[0]);
-        wrapper.apply(StringUtils.isNotBlank(request.getEndTime()),
-                "{0} >= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getEndTime().split(" ")[0]);
+        if(StringUtils.isNotBlank(request.getStartTime())){
+            wrapper.apply("{0} <= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getStartTime().split(" ")[0]);
+        }
+        if(StringUtils.isNotBlank(request.getEndTime())){
+            wrapper.apply("{0} >= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getEndTime().split(" ")[0]);
+        }
         wrapper.orderByDesc("create_time");
         return wrapper;
     }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemSignServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemSignServiceImpl.java
index 41976bb..7e90a09 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemSignServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemSignServiceImpl.java
@@ -52,15 +52,14 @@
 
     @Override
     public Page<SystemSign> listPage(Page<SystemSign> page, SignListRequest request) {
-        QueryWrapper<SystemSign> wrapper = getWrapper(request);
-        Page<SystemSign> signPage = signMapper.selectPage(page, wrapper);
+        Page<SystemSign> signPage = signMapper.selectSignListPage(page, request);
         return signPage;
     }
 
     @Override
     public List<SystemSign> list(SignListRequest request) {
-        QueryWrapper<SystemSign> wrapper = getWrapper(request);
-        return signMapper.selectList(wrapper);
+        List<SystemSign> signList = signMapper.selectSignList(request);
+        return signList;
     }
 
     @Override
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessCertificatePrintService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessCertificatePrintService.java
index 03247ab..7d6db77 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessCertificatePrintService.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessCertificatePrintService.java
@@ -9,6 +9,8 @@
 import com.casic.missiles.model.business.BizBusinessCertificatePrintLog;
 import com.casic.missiles.model.business.BizBusinessCertificateReport;
 
+import java.util.List;
+
 /**
  * <p>
  * 计量检定业务-任务计量管理-证书管理 服务类
@@ -30,4 +32,9 @@
     ReturnDTO certificatePrintStatus(Long id, String printStatus);
 
     ReturnDTO<BizBusinessCertificatePrintLog> certificatePrintLog(Long id);
+
+    List<CertificatePrintListResponse> listByIds(List<Long> ids);
+
+    List<CertificatePrintListResponse> list(CertificatePrintApprovalListRequest request);
+
 }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessCertificateReportService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessCertificateReportService.java
index 305ac7f..b33ef22 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessCertificateReportService.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessCertificateReportService.java
@@ -21,6 +21,4 @@
     ReturnDTO<CertificateReportSaveResponse> saveCertificateReport(BizBusinessCertificateReport request);
 
     ReturnDTO<BizBusinessCertificateReport> detail(BaseDetailRequest request);
-
-
 }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessIdentifyInfoService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessIdentifyInfoService.java
index 53c49d0..6d2089f 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessIdentifyInfoService.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessIdentifyInfoService.java
@@ -6,6 +6,8 @@
 import com.casic.missiles.model.business.BizBusinessIdentifyInfo;
 import com.baomidou.mybatisplus.extension.service.IService;
 
+import java.util.List;
+
 /**
  * <p>
  * 计量检定业务-任务计量管理-标识打印 服务类
@@ -20,7 +22,11 @@
 
     ReturnDTO addIdentify(BizBusinessIdentifyInfo identifyInfo);
 
-    ReturnDTO updateIdentify(BizBusinessIdentifyInfo identifyInfo);
+    ReturnDTO updateIdentify(Long id);
 
     ReturnDTO deleteIdentify(Long id);
+
+    List<BizBusinessIdentifyInfo> list(IdentifyListRequest request) throws Exception;
+
+    ReturnDTO<String> equipmentQrCode(Long id);
 }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessOutsourceAssessService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessOutsourceAssessService.java
index 5e15bc8..bcdc791 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessOutsourceAssessService.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessOutsourceAssessService.java
@@ -1,7 +1,11 @@
 package com.casic.missiles.service.business;
 
+import com.casic.missiles.dto.BaseApprovalSubmitRequest;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.business.outsource.OutsourceAssessApprovalListRequest;
+import com.casic.missiles.dto.business.outsource.OutsourceAssessSaveResponse;
 import com.casic.missiles.model.business.BizBusinessOutsourceAssess;
-import com.baomidou.mybatisplus.extension.service.IService;
+import com.casic.missiles.service.IGeneralApprovalService;
 
 /**
  * <p>
@@ -11,6 +15,7 @@
  * @author wangpeng
  * @since 2023-08-16
  */
-public interface IBizBusinessOutsourceAssessService extends IService<BizBusinessOutsourceAssess> {
+public interface IBizBusinessOutsourceAssessService extends IGeneralApprovalService<BizBusinessOutsourceAssess, BizBusinessOutsourceAssess, OutsourceAssessApprovalListRequest, BaseApprovalSubmitRequest> {
 
+    ReturnDTO<OutsourceAssessSaveResponse> saveOutsourceAssess(BizBusinessOutsourceAssess request);
 }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessOutsourceProtocolService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessOutsourceProtocolService.java
new file mode 100644
index 0000000..7f3092b
--- /dev/null
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessOutsourceProtocolService.java
@@ -0,0 +1,21 @@
+package com.casic.missiles.service.business;
+
+import com.casic.missiles.dto.BaseApprovalSubmitRequest;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.business.outsource.OutsourceProtocolApprovalListRequest;
+import com.casic.missiles.dto.business.outsource.OutsourceProtocolSaveResponse;
+import com.casic.missiles.model.business.BizBusinessOutsourceProtocol;
+import com.casic.missiles.service.IGeneralApprovalService;
+
+/**
+ * <p>
+ * 计量检定业务-分包管理-测试、校准或检定工作分包协议书 服务类
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-08-24
+ */
+public interface IBizBusinessOutsourceProtocolService extends IGeneralApprovalService<BizBusinessOutsourceProtocol, BizBusinessOutsourceProtocol, OutsourceProtocolApprovalListRequest, BaseApprovalSubmitRequest> {
+
+    ReturnDTO<OutsourceProtocolSaveResponse> saveOutsourceProtocol(BizBusinessOutsourceProtocol request);
+}
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessOutsourcerInfoService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessOutsourcerInfoService.java
index 9ba656b..b199de4 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessOutsourcerInfoService.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessOutsourcerInfoService.java
@@ -24,8 +24,6 @@
  */
 public interface IBizBusinessOutsourcerInfoService extends IGeneralApprovalService<BizBusinessOutsourcerInfo, BizBusinessOutsourcerInfo, OutsourcerInfoApprovalListRequest, BaseApprovalSubmitRequest> {
 
-    List<BizBusinessOutsourcerInfo> list(OutsourcerInfoApprovalListRequest request);
-
     ReturnDTO<OutsourcerSaveResponse> saveOutsourcer(BizBusinessOutsourcerInfo request);
 
     BizBusinessOutsourcerInfo detail(Long id) throws Exception;
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessLabExecutiveInfoService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessLabExecutiveInfoService.java
index 278c674..f6ed490 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessLabExecutiveInfoService.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessLabExecutiveInfoService.java
@@ -30,8 +30,16 @@
 
     Page<SampleLabExecutiveListResponse> deptLabExecutiveListPage(Page<SampleLabExecutiveListResponse> page, SampleLabExecutiveListRequest labExecutiveListRequest) throws Exception;
 
+    List<SampleLabExecutiveListResponse> deptLabExecutiveList(SampleLabExecutiveListRequest request) throws Exception;
+
+    List<SampleLabExecutiveListResponse> deptLabExecutiveListByIds(String measureStatus, List<Long> ids) throws Exception;
+
     Page<SampleLabExecutiveListResponse> myLabExecutiveListPage(Page<SampleLabExecutiveListResponse> page, SampleLabExecutiveListRequest labExecutiveListRequest) throws Exception;
 
+    List<SampleLabExecutiveListResponse> myLabExecutiveList(SampleLabExecutiveListRequest request) throws Exception;
+
+    List<SampleLabExecutiveListResponse> myLabExecutiveListByIds(String measureStatus, List<Long> ids) throws Exception;
+
     List<SampleAmountResponse> myExecutiveAmount();
 
     ReturnDTO sampleReceive(List<SampleOperateRequest> requestList);
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/OutsourceAssessEventPostProcessor.java b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/OutsourceAssessEventPostProcessor.java
new file mode 100644
index 0000000..cda3086
--- /dev/null
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/OutsourceAssessEventPostProcessor.java
@@ -0,0 +1,46 @@
+package com.casic.missiles.service.listeners.processor;
+
+import cn.hutool.core.lang.Assert;
+import com.casic.missiles.dto.flowable.NotifyEventStatusDTO;
+import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.notifyevent.ActionStatusBeanEnum;
+import com.casic.missiles.enums.system.ApprovalStatusEnum;
+import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.mapper.business.BizBusinessOutsourceAssessMapper;
+import com.casic.missiles.model.business.BizBusinessOutsourceAssess;
+import com.casic.missiles.service.listeners.NotifyEventPostProcessor;
+import com.casic.missiles.utils.SpringContextUtil;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.Objects;
+
+/**
+ * @Description: 测试、校准或检定工作分包评审表审批通过后处理
+ * @Author: wangpeng
+ * @Date: 2023/8/21 13:20
+ */
+@Slf4j
+@Service(ActionStatusBeanEnum.OUTSOURCE_ASSESS_BEAN_NAME)
+public class OutsourceAssessEventPostProcessor implements NotifyEventPostProcessor {
+    @Override
+    @Transactional
+    public void doHandleNotifyEvent(NotifyEventStatusDTO notifyEventStatusDTO) {
+        Long id = Long.valueOf(notifyEventStatusDTO.getId());
+        Assert.isFalse(Objects.isNull(id), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        BizBusinessOutsourceAssessMapper outsourceAssessMapper = SpringContextUtil.getBean(BizBusinessOutsourceAssessMapper.class);
+
+        BizBusinessOutsourceAssess outsourceAssess = new BizBusinessOutsourceAssess();
+        outsourceAssess.setId(id);
+        outsourceAssess.setApprovalStatus(ApprovalStatusEnum.PASSED);
+        int updateFlag = outsourceAssessMapper.updateById(outsourceAssess);
+        if (updateFlag <= 0) {
+            log.error("测试、校准或检定工作分包评审表审批通过后处理失败");
+            throw new BusinessException(BusinessExceptionEnum.APPROVAL_PROCESSOR_HANDLE_FAILED);
+        }
+    }
+
+}
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/OutsourceProtocolEventPostProcessor.java b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/OutsourceProtocolEventPostProcessor.java
new file mode 100644
index 0000000..490c66e
--- /dev/null
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/OutsourceProtocolEventPostProcessor.java
@@ -0,0 +1,46 @@
+package com.casic.missiles.service.listeners.processor;
+
+import cn.hutool.core.lang.Assert;
+import com.casic.missiles.dto.flowable.NotifyEventStatusDTO;
+import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.notifyevent.ActionStatusBeanEnum;
+import com.casic.missiles.enums.system.ApprovalStatusEnum;
+import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.mapper.business.BizBusinessOutsourceProtocolMapper;
+import com.casic.missiles.model.business.BizBusinessOutsourceProtocol;
+import com.casic.missiles.service.listeners.NotifyEventPostProcessor;
+import com.casic.missiles.utils.SpringContextUtil;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.Objects;
+
+/**
+ * @Description: 测试、校准或检定工作分包协议书审批通过后处理
+ * @Author: wangpeng
+ * @Date: 2023/8/21 13:20
+ */
+@Slf4j
+@Service(ActionStatusBeanEnum.OUTSOURCE_PROTOCOL_BEAN_NAME)
+public class OutsourceProtocolEventPostProcessor implements NotifyEventPostProcessor {
+    @Override
+    @Transactional
+    public void doHandleNotifyEvent(NotifyEventStatusDTO notifyEventStatusDTO) {
+        Long id = Long.valueOf(notifyEventStatusDTO.getId());
+        Assert.isFalse(Objects.isNull(id), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        BizBusinessOutsourceProtocolMapper outsourceProtocolMapper = SpringContextUtil.getBean(BizBusinessOutsourceProtocolMapper.class);
+
+        BizBusinessOutsourceProtocol outsourceProtocol = new BizBusinessOutsourceProtocol();
+        outsourceProtocol.setId(id);
+        outsourceProtocol.setApprovalStatus(ApprovalStatusEnum.PASSED);
+        int updateFlag = outsourceProtocolMapper.updateById(outsourceProtocol);
+        if (updateFlag <= 0) {
+            log.error("测试、校准或检定工作分包协议书审批通过后处理失败");
+            throw new BusinessException(BusinessExceptionEnum.APPROVAL_PROCESSOR_HANDLE_FAILED);
+        }
+    }
+
+}
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/SiteExecutiveEventPostProcessor.java b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/SiteExecutiveEventPostProcessor.java
index 6a690d7..4d25ca4 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/SiteExecutiveEventPostProcessor.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/SiteExecutiveEventPostProcessor.java
@@ -38,7 +38,7 @@
         siteExecutiveInfo.setApprovalStatus(ApprovalStatusEnum.PASSED);
         int updateFlag = siteExecutiveInfoMapper.updateById(siteExecutiveInfo);
         if (updateFlag <= 0) {
-            log.error("现场测试、校准或检定审批审批通过后处理失败");
+            log.error("现场测试、校准或检定审批通过后处理失败");
             throw new BusinessException(BusinessExceptionEnum.APPROVAL_PROCESSOR_HANDLE_FAILED);
         }
     }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/resource/IBizResourceStaffInfoService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/resource/IBizResourceStaffInfoService.java
index 7adcf2b..31e7972 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/resource/IBizResourceStaffInfoService.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/resource/IBizResourceStaffInfoService.java
@@ -23,6 +23,8 @@
 
     Page<BizResourceStaffInfo> listPage(Page<BizResourceStaffInfo> page, StaffListRequest request) throws Exception;
 
+    List<BizResourceStaffInfo> list(StaffListRequest request) throws Exception;
+
     BizResourceStaffInfo detail(Long id);
 
     ReturnDTO<IdDTO> staffBaseAdd(BizResourceStaffInfo staffInfo);
@@ -116,4 +118,8 @@
     ReturnDTO verifierBatchDelete(List<Long> ids);
 
     Page<StaffCertResponse> certListPage(Page<StaffCertResponse> page, StaffCertRequest request) throws Exception;
+
+    List<StaffCertResponse> certListByIds(List<Long> ids) throws Exception;
+
+    List<StaffCertResponse> certList(StaffCertRequest request) throws Exception;
 }

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java
index bb0c50f..13a699b 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java
@@ -12,6 +12,7 @@
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.IGeneralApprovalService;
+import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
@@ -19,6 +20,7 @@
 import org.springframework.web.bind.annotation.RequestBody;
 
 import javax.validation.Valid;
+import java.util.List;
 import java.util.Objects;
 
 /**
@@ -117,4 +119,17 @@
         }
         return baseApprovalService.failUpdate(request);
     }
+
+    public List<O> exportList(@RequestBody @Valid R request) throws Exception {
+        List<O> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = baseApprovalService.listExportByIds(request.getIds());
+        } else {
+            list = baseApprovalService.listExport(request);
+        }
+        for (O record : list) {
+            DictCodeUtils.convertDictCodeToName(record);
+        }
+        return list;
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java
index 8a90961..d775831 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java
@@ -5,6 +5,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.business.certificate.CertificateChangeApplyApprovalListRequest;
 import com.casic.missiles.dto.business.certificate.CertificateChangeApplySaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessCertificateChangeApply;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
@@ -20,6 +21,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -48,4 +50,12 @@
         }
         return changeApplyService.saveChangeApply(request);
     }
+
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody CertificateChangeApplyApprovalListRequest request) throws Exception {
+        List<BizBusinessCertificateChangeApply> list = super.exportList(request);
+        super.exportExcel(BizBusinessCertificateChangeApply.class, list, ExportEnum.CERTIFICATE_CHANGE_APPLY.getSheetName());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java
index 5fc4b07..af8230e 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java
@@ -9,6 +9,7 @@
 import com.casic.missiles.dto.business.certificate.CertificatePrintApprovalListRequest;
 import com.casic.missiles.dto.business.certificate.CertificatePrintListResponse;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.enums.business.CertificatePrintStatusEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessCertificatePrintLog;
@@ -18,10 +19,16 @@
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.io.IOException;
+import java.util.List;
 import java.util.Objects;
 
 /**
@@ -98,4 +105,16 @@
         });
         return certificatePrintService.certificatePrintLog(idDTO.getId());
     }
+
+    @ApiOperation("证书打印审批导出")
+    @PostMapping("/listExport")
+    public void exportList(@RequestBody CertificatePrintApprovalListRequest request) throws IOException {
+        List<CertificatePrintListResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = certificatePrintService.listByIds(request.getIds());
+        } else {
+            list = certificatePrintService.list(request);
+        }
+        super.exportExcel(CertificatePrintListResponse.class, list, ExportEnum.CERTIFICATE_PRINT.getSheetName());
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java
index 63b06dc..6b2efd5 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java
@@ -6,6 +6,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.business.certificate.CertificateReportApprovalListRequest;
 import com.casic.missiles.dto.business.certificate.CertificateReportSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessCertificateReport;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
@@ -21,6 +22,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -50,7 +52,7 @@
         return certificateReportService.saveCertificateReport(request);
     }
 
-    @ApiOperation("证书审批详情（基本信息）")
+    @ApiOperation("详情（基本信息）")
     @PostMapping("/detail")
     public ReturnDTO<BizBusinessCertificateReport> detail(@RequestBody @Valid BaseDetailRequest request, BindingResult bindingResult) throws Exception {
         if(bindingResult.hasErrors()){
@@ -59,4 +61,11 @@
         return certificateReportService.detail(request);
     }
 
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody CertificateReportApprovalListRequest request) throws Exception {
+        List<BizBusinessCertificateReport> list = super.exportList(request);
+        super.exportExcel(BizBusinessCertificateReport.class, list, ExportEnum.CERTIFICATE_REPORT.getSheetName());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java
index 46b26bd..57c0809 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java
@@ -10,20 +10,21 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.business.identify.IdentifyListRequest;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessIdentifyInfo;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.business.IBizBusinessIdentifyInfoService;
+import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import javax.validation.Valid;
+import java.util.List;
 import java.util.Objects;
 
 /**
@@ -57,16 +58,13 @@
         return identifyInfoService.addIdentify(identifyInfo);
     }
 
-    @ApiOperation("标识打印更新")
+    @ApiOperation("标识打印更新（更新打印时间）")
     @PostMapping("/update")
-    public ReturnDTO updateIdentify(@RequestBody @Valid BizBusinessIdentifyInfo identifyInfo, BindingResult bindingResult) {
-        Assert.isFalse(Objects.isNull(identifyInfo.getId()), () -> {
+    public ReturnDTO updateIdentify(@RequestBody @Valid IdDTO idDTO) {
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        Assert.isFalse(bindingResult.hasErrors(), () -> {
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        });
-        return identifyInfoService.updateIdentify(identifyInfo);
+        return identifyInfoService.updateIdentify(idDTO.getId());
     }
 
     @ApiOperation("标识打印删除")
@@ -77,4 +75,37 @@
         });
         return identifyInfoService.deleteIdentify(idDTO.getId());
     }
+
+    @ApiOperation("标识打印导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody @Valid IdentifyListRequest request, BindingResult bindingResult) throws Exception {
+        if (bindingResult.hasErrors()) {
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        List<BizBusinessIdentifyInfo> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = identifyInfoService.listByIds(request.getIds());
+        } else {
+            list = identifyInfoService.list(request);
+        }
+        for (BizBusinessIdentifyInfo record : list) {
+            DictCodeUtils.convertDictCodeToName(record);
+        }
+        super.exportExcel(BizBusinessIdentifyInfo.class, list, ExportEnum.IDENTIFY_EXPORT.getSheetName());
+    }
+
+
+    // TODO: 2023/8/23 查询设备信息，4个底部按钮查设备（按钮的作用就是前端用来调不同接口、用来区分中间即将展示的标识），前端弹窗选设备，在确定保存时前端根据底部按钮判断传入设备类型deviceType字典code
+    // TODO: 2023/8/23 接口：查受检设备（第1个按钮），查设备台账（后3个按钮同一接口），查询之后前端根据标志类型的不同加到中间页面时进行判断（按产品给的对应表）
+    // TODO: 2023/8/23 提供二维码接口，前端在加到中间页面时调用一下
+
+    @ApiOperation("设备二维码")
+    @PostMapping("/equipment/qrCode")
+    public ReturnDTO<String> equipmentQrCode(@RequestBody @Valid IdDTO idDTO) {
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return identifyInfoService.equipmentQrCode(idDTO.getId());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java
index 707be6e..7e0453d 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java
@@ -117,7 +117,7 @@
     }
 
     @ApiOperation("任务单导出")
-    @PostMapping("/export")
+    @PostMapping("/listExport")
     public void orderExport(@RequestBody @Valid OrderListRequest request, HttpServletResponse response) {
         businessOrderService.orderExport(request, response);
     }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java
index 529a6ce..51432be 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java
@@ -1,9 +1,28 @@
 package com.casic.missiles.controller.business;
 
+import com.casic.missiles.controller.GeneralApprovalController;
+import com.casic.missiles.dto.BaseApprovalSubmitRequest;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.business.outsource.OutsourceAssessApprovalListRequest;
+import com.casic.missiles.dto.business.outsource.OutsourceAssessSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
+import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.model.business.BizBusinessOutsourceAssess;
+import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
+import com.casic.missiles.service.IGeneralApprovalService;
+import com.casic.missiles.service.business.IBizBusinessOutsourceAssessService;
 import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.BindingResult;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.validation.Valid;
+import java.util.List;
+
 /**
  * <p>
  * 计量检定业务-分包管理-测试、校准或检定工作分包评审表 前端控制器
@@ -15,6 +34,27 @@
 @Api(tags = "分包管理-测试、校准或检定工作分包评审表")
 @RestController
 @RequestMapping("/business/outsource/assess")
-public class BizBusinessOutsourceAssessController {
+public class BizBusinessOutsourceAssessController extends GeneralApprovalController<BizBusinessOutsourceAssess, BizBusinessOutsourceAssess, OutsourceAssessApprovalListRequest, BaseApprovalSubmitRequest> {
+    @Autowired
+    private IBizBusinessOutsourceAssessService outsourceAssessService;
 
+    public BizBusinessOutsourceAssessController(IGeneralApprovalService<BizBusinessOutsourceAssess, BizBusinessOutsourceAssess, OutsourceAssessApprovalListRequest, BaseApprovalSubmitRequest> baseApprovalService) {
+        super(baseApprovalService);
+    }
+
+    @ApiOperation("草稿箱-保存")
+    @PostMapping("/save")
+    public ReturnDTO<OutsourceAssessSaveResponse> saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceAssess request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        return outsourceAssessService.saveOutsourceAssess(request);
+    }
+
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception {
+        List<BizBusinessOutsourceAssess> list = super.exportList(request);
+        super.exportExcel(BizBusinessOutsourceAssess.class, list, ExportEnum.OUTSOURCE_ASSESS.getSheetName());
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java
new file mode 100644
index 0000000..9adef18
--- /dev/null
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java
@@ -0,0 +1,60 @@
+package com.casic.missiles.controller.business;
+
+import com.casic.missiles.controller.GeneralApprovalController;
+import com.casic.missiles.dto.BaseApprovalSubmitRequest;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.business.outsource.OutsourceProtocolApprovalListRequest;
+import com.casic.missiles.dto.business.outsource.OutsourceProtocolSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
+import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.model.business.BizBusinessOutsourceProtocol;
+import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
+import com.casic.missiles.service.IGeneralApprovalService;
+import com.casic.missiles.service.business.IBizBusinessOutsourceProtocolService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.BindingResult;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.validation.Valid;
+import java.util.List;
+
+/**
+ * <p>
+ * 计量检定业务-分包管理-测试、校准或检定工作分包协议书 前端控制器
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-08-24
+ */
+@Api(tags = "分包管理-测试、校准或检定工作分包协议书")
+@RestController
+@RequestMapping("/business/outsource/protocol")
+public class BizBusinessOutsourceProtocolController extends GeneralApprovalController<BizBusinessOutsourceProtocol, BizBusinessOutsourceProtocol, OutsourceProtocolApprovalListRequest, BaseApprovalSubmitRequest> {
+    @Autowired
+    private IBizBusinessOutsourceProtocolService outsourceProtocolService;
+
+    public BizBusinessOutsourceProtocolController(IGeneralApprovalService<BizBusinessOutsourceProtocol, BizBusinessOutsourceProtocol, OutsourceProtocolApprovalListRequest, BaseApprovalSubmitRequest> baseApprovalService) {
+        super(baseApprovalService);
+    }
+
+    @ApiOperation("草稿箱-保存")
+    @PostMapping("/save")
+    public ReturnDTO<OutsourceProtocolSaveResponse> saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceProtocol request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        return outsourceProtocolService.saveOutsourceProtocol(request);
+    }
+
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody OutsourceProtocolApprovalListRequest request) throws Exception {
+        List<BizBusinessOutsourceProtocol> list = super.exportList(request);
+        super.exportExcel(BizBusinessOutsourceProtocol.class, list, ExportEnum.OUTSOURCE_PROTOCOL.getSheetName());
+    }
+}
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java
index 097f645..f0f0943 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java
@@ -17,7 +17,6 @@
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.IGeneralApprovalService;
 import com.casic.missiles.service.business.IBizBusinessOutsourcerInfoService;
-import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -71,19 +70,8 @@
 
     @ApiOperation("分包方导出")
     @PostMapping("/listExport")
-    public void export(@RequestBody @Valid OutsourcerInfoApprovalListRequest request, BindingResult bindingResult) throws Exception {
-        if (bindingResult.hasErrors()) {
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        }
-        List<BizBusinessOutsourcerInfo> list;
-        if (!CollectionUtils.isEmpty(request.getIds())) {
-            list = outsourcerInfoService.listByIds(request.getIds());
-        } else {
-            list = outsourcerInfoService.list(request);
-        }
-        for (BizBusinessOutsourcerInfo record : list) {
-            DictCodeUtils.convertDictCodeToName(record);
-        }
+    public void export(@RequestBody OutsourcerInfoApprovalListRequest request) throws Exception {
+        List<BizBusinessOutsourcerInfo> list = super.exportList(request);
         super.exportExcel(BizBusinessOutsourcerInfo.class, list, ExportEnum.OUTSOURCER_EXPORT.getSheetName());
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java
index c2cbf9f..0410918 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java
@@ -17,11 +17,9 @@
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.IGeneralApprovalService;
 import com.casic.missiles.service.business.IBizBusinessSiteExecutiveInfoService;
-import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -60,7 +58,7 @@
         return siteExecutiveInfoService.saveSiteExecutiveInfo(siteExecutiveInfo);
     }
 
-    @ApiOperation("现场检测详情")
+    @ApiOperation("详情")
     @PostMapping("/detail")
     public ReturnDTO<SiteExecutiveDetailResponse> siteExecutiveDetail(@RequestBody @Valid IdDTO idDTO) throws Exception {
         Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
@@ -69,21 +67,10 @@
         return ReturnUtil.success(siteExecutiveInfoService.detail(idDTO.getId()));
     }
 
-    @ApiOperation("现场检测导出")
+    @ApiOperation("导出")
     @PostMapping("/listExport")
-    public void export(@RequestBody @Valid SiteExecutiveApprovalListRequest request, BindingResult bindingResult) throws Exception {
-        if (bindingResult.hasErrors()) {
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        }
-        List<SiteExecutiveApprovalListResponse> list;
-        if (!CollectionUtils.isEmpty(request.getIds())) {
-            list = siteExecutiveInfoService.listInfoByIds(request.getIds());
-        } else {
-            list = siteExecutiveInfoService.listInfo(request);
-        }
-        for (SiteExecutiveApprovalListResponse record : list) {
-            DictCodeUtils.convertDictCodeToName(record);
-        }
+    public void export(@RequestBody SiteExecutiveApprovalListRequest request) throws Exception {
+        List<SiteExecutiveApprovalListResponse> list = super.exportList(request);
         super.exportExcel(SiteExecutiveApprovalListResponse.class, list, ExportEnum.SITE_EXECUTIVE_EXPORT.getSheetName());
     }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
index 7e793cd..a92e209 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
@@ -55,7 +55,7 @@
 
     @ApiOperation("设备收发列表导出")
     @PostMapping("/export")
-    public void exportList(@RequestBody @Valid SampleDispatchListRequest request) throws IOException {
+    public void exportList(@RequestBody SampleDispatchListRequest request) throws IOException {
         List<SampleDispatchListResponse> list;
         if (!CollectionUtils.isEmpty(request.getIds())) {
             list = dispatchService.listByIds(request.getIds());
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java
index cdc77fc..d120fd4 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java
@@ -7,6 +7,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.business.labExecutive.*;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.business.IBusinessLabExecutiveInfoService;
@@ -14,6 +15,7 @@
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.*;
 
@@ -32,7 +34,7 @@
     @Autowired
     private IBusinessLabExecutiveInfoService labExecutiveInfoService;
 
-    @ApiOperation("实验室检测-部门检测-查询各状态列表（待检测、检测中、检测完）")
+    @ApiOperation("实验室任务-查询各状态列表（待检测、检测中、检测完）")
     @PostMapping("/deptExecutive/List")
     public ReturnDTO<PageInfoBT<SampleLabExecutiveListResponse>> queryDeptExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
@@ -43,10 +45,19 @@
         return ReturnUtil.success(super.packForBT(labExecutiveInfoService.deptLabExecutiveListPage(page, labExecutiveListRequest)));
     }
 
-    /**
-     * 实验室检测-我的检测-查询各状态列表（待检测、检测中、检测完）
-     */
-    @ApiOperation("实验室检测-我的检测-查询各状态列表（待检测、检测中、检测完）")
+    @ApiOperation("实验室任务导出")
+    @PostMapping("/deptExecutive/export")
+    public void deptExportList(@RequestBody @Valid SampleLabExecutiveListRequest request) throws Exception {
+        List<SampleLabExecutiveListResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = labExecutiveInfoService.deptLabExecutiveListByIds(request.getMeasureStatus(), request.getIds());
+        } else {
+            list = labExecutiveInfoService.deptLabExecutiveList(request);
+        }
+        super.exportExcel(SampleLabExecutiveListResponse.class, list, ExportEnum.DEPT_EXECUTIVE_TASK.getSheetName());
+    }
+
+    @ApiOperation("我的任务-查询各状态列表（待检测、检测中、检测完）")
     @PostMapping("/myExecutive/list")
     public ReturnDTO<PageInfoBT<SampleLabExecutiveListResponse>> queryMyExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
@@ -57,19 +68,25 @@
         return ReturnUtil.success(super.packForBT(labExecutiveInfoService.myLabExecutiveListPage(page, labExecutiveListRequest)));
     }
 
-    /**
-     * 实验室检测-我的检测-查询各状态样品数量（待检测、检测中、检测完）
-     */
-    @ApiOperation("实验室检测-我的检测-查询各状态样品数量（待检测、检测中、检测完）")
+    @ApiOperation("我的任务导出")
+    @PostMapping("/myExecutive/export")
+    public void exportList(@RequestBody @Valid SampleLabExecutiveListRequest request) throws Exception {
+        List<SampleLabExecutiveListResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = labExecutiveInfoService.myLabExecutiveListByIds(request.getMeasureStatus(), request.getIds());
+        } else {
+            list = labExecutiveInfoService.myLabExecutiveList(request);
+        }
+        super.exportExcel(SampleLabExecutiveListResponse.class, list, ExportEnum.MY_EXECUTIVE_TASK.getSheetName());
+    }
+
+    @ApiOperation("我的任务-查询各状态样品数量（待检测、检测中、检测完）")
     @GetMapping("/myExecutive/amount")
     public ReturnDTO<List<SampleAmountResponse>> queryMyExecutiveAmount() {
         return ReturnUtil.success(labExecutiveInfoService.myExecutiveAmount());
     }
 
-    /**
-     * 实验室检测-部门检测-分配（分配给具体人员）
-     */
-    @ApiOperation("实验室检测-部门检测-分配按钮（分配给具体人员）")
+    @ApiOperation("实验室任务-分配按钮（分配给具体人员）")
     @PostMapping("/deptExecutive/allocate")
     public ReturnDTO allocateStaff(@RequestBody @Valid SampleAllocateRequest sampleAllocateRequest, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -78,10 +95,7 @@
         return labExecutiveInfoService.allocateStaff(sampleAllocateRequest);
     }
 
-    /**
-     * 实验室检测-我的检测-检定人扫描收入（待检测->检测中）
-     */
-    @ApiOperation("实验室检测-我的检测-检定人扫描收入（待检测->检测中）")
+    @ApiOperation("我的任务-检定人扫描收入（待检测->检测中）")
     @PostMapping("/myExecutive/receive")
     public ReturnDTO sampleReceive(@RequestBody @Valid List<SampleOperateRequest> requestList, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -90,10 +104,7 @@
         return labExecutiveInfoService.sampleReceive(requestList);
     }
 
-    /**
-     * 实验室检测-负责人/检定人扫描检完（检测中->检测完）
-     */
-    @ApiOperation("实验室检测-负责人/检定人扫描检完（检测中->检测完）")
+    @ApiOperation("实验室任务-负责人/检定人扫描检完（检测中->检测完）")
     @PostMapping("/myExecutive/complete")
     public ReturnDTO sampleExecutiveComplete(@RequestBody @Valid List<SampleOperateRequest> requestList, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -102,10 +113,7 @@
         return labExecutiveInfoService.sampleExecutiveComplete(requestList);
     }
 
-    /**
-     * 实验室检测-部门检测/我的检测 编辑（只能修改应出具证书）
-     */
-    @ApiOperation("实验室检测-部门检测/我的检测 编辑（只能修改应出具证书）")
+    @ApiOperation("实验室任务/我的任务 编辑（只能修改应出具证书）")
     @PostMapping("/executive/update")
     public ReturnDTO updateExecutive(@RequestBody @Valid UpdateExecutiveRequest request, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -114,10 +122,7 @@
         return labExecutiveInfoService.updateExecutive(request);
     }
 
-    /**
-     * 实验室检测-部门检测/我的检测 详情
-     */
-    @ApiOperation("实验室检测-部门检测/我的检测 详情")
+    @ApiOperation("实验室任务/我的任务 详情")
     @PostMapping("/executive/detail")
     public ReturnDTO<ExecutiveDetailResponse> executiveDetail(@RequestBody @Valid ExecutiveDetailRequest request, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
@@ -131,7 +136,7 @@
      * 退回后会将下一个要执行的实验室检测状态更新为待分配，将后面的实验室顺序变更为连续（都进行减1）
      * 最后一个检测的实验室退回，等分发员再增加实验室或设备收发中的已收入直接手动点击完成
      */
-    @ApiOperation("实验室检测-部门检测/我的检测 退回（待检测/检测中->退回）")
+    @ApiOperation("实验室任务/我的任务 退回（待检测/检测中->退回）")
     @PostMapping("/executive/sendBack")
     public ReturnDTO executiveSendBack(@RequestBody @Valid ExecutiveSendBackRequest request, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -140,9 +145,6 @@
         return labExecutiveInfoService.sampleExecutiveSendBack(request);
     }
 
-    /**
-     * 分发员编辑实验室检测列表
-     */
     @ApiOperation("分发员编辑实验室检测列表")
     @PostMapping("/handOut/updateList")
     public ReturnDTO updateExecutiveList(@RequestBody @Valid UpdateExecutiveListRequest request, BindingResult bindingResult) {
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java
index 48a67ed..0c04f31 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java
@@ -10,6 +10,7 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.resource.customer.CustomerApprovalListRequest;
 import com.casic.missiles.dto.resource.customer.CustomerSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceCustomerInfo;
@@ -26,6 +27,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -55,6 +57,13 @@
         return customerInfoService.saveCustomerInfo(request);
     }
 
+    @ApiOperation("委托方名录导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody CustomerApprovalListRequest request) throws Exception {
+        List<BizResourceCustomerInfo> list = super.exportList(request);
+        super.exportExcel(BizResourceCustomerInfo.class, list, ExportEnum.CUSTOMER_INFO.getSheetName());
+    }
+
     @ApiOperation("委托方人员列表（分页）")
     @PostMapping("/person/listPage")
     public ReturnDTO<PageInfoBT<BizResourceCustomerStaff>> personListPage(@RequestBody IdDTO idDto) {
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
index 972ed4b..6418ea5 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
@@ -5,6 +5,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.resource.customer.SuggestFormApprovalListRequest;
 import com.casic.missiles.dto.resource.customer.SuggestFormSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceCustomerSuggestForm;
@@ -20,6 +21,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -50,4 +52,11 @@
         return suggestFormService.saveSuggestForm(request);
     }
 
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody SuggestFormApprovalListRequest request) throws Exception {
+        List<BizResourceCustomerSuggestForm> list = super.exportList(request);
+        super.exportExcel(BizResourceCustomerSuggestForm.class, list, ExportEnum.CUSTOMER_SUGGEST_FORM.getSheetName());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java
index 1934d1a..9e07eab 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java
@@ -15,12 +15,16 @@
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.resource.IEnvEnvironmentRecordConfigService;
 import com.casic.missiles.service.resource.IEnvEnvironmentRecordDataService;
+import com.casic.missiles.service.resource.IEnvLocationInfoService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
 import java.util.List;
@@ -39,6 +43,8 @@
     private IEnvEnvironmentRecordDataService environmentRecordDataService;
     @Autowired
     private IEnvEnvironmentRecordConfigService environmentRecordConfigService;
+    @Autowired
+    private IEnvLocationInfoService locationInfoService;
 
     @ApiOperation("环境记录单数据列表/详情")
     @PostMapping("/data/listPage")
@@ -95,4 +101,11 @@
         });
         return environmentRecordConfigService.deleteEnvironmentRecordConfig(idDTO.getId());
     }
+
+    @ApiOperation("地点列表")
+    @PostMapping("/location/listPage")
+    public ReturnDTO<PageInfoBT<LocationListResponse>> locationListPage(@RequestBody @Valid LocationListRequest request) {
+        Page<LocationListResponse> page = PageFactory.defaultPage();
+        return ReturnUtil.success(super.packForBT(locationInfoService.listPage(page, request)));
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java
index 82efe3f..e9561fa 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java
@@ -10,6 +10,7 @@
 import com.casic.missiles.dto.resource.seal.SealLogListRequest;
 import com.casic.missiles.dto.resource.seal.SealNoteApprovalListRequest;
 import com.casic.missiles.dto.resource.seal.SealNoteSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceSealUseLog;
@@ -27,6 +28,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -58,6 +60,13 @@
         return sealUseNoteService.saveSeal(request);
     }
 
+    @ApiOperation("印章使用登记导出（列表和导出中去掉经办人和监印人）")
+    @PostMapping("/listExport")
+    public void export(@RequestBody SealNoteApprovalListRequest request) throws Exception {
+        List<BizResourceSealUseNote> list = super.exportList(request);
+        super.exportExcel(BizResourceSealUseNote.class, list, ExportEnum.SEAL_NOTE.getSheetName());
+    }
+
     // TODO: 2023/7/28 印章使用日志：系统中使用印章时插入数据库
 
     @ApiOperation("印章使用日志列表（分页）")
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java
index 9b674fc..06b6521 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java
@@ -9,16 +9,20 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.resource.staff.StaffCertRequest;
 import com.casic.missiles.dto.resource.staff.StaffCertResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.service.resource.IBizResourceStaffInfoService;
 import com.casic.missiles.service.resource.IBizResourceStaffVerifierService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.List;
+
 /**
  * @Description:
  * @Author: wangpeng
@@ -41,9 +45,21 @@
         return ReturnUtil.success(super.packForBT(responsePage));
     }
 
+    @ApiOperation("证书逾期提醒导出")
+    @PostMapping("/listExport")
+    public void exportList(@RequestBody StaffCertRequest request) throws Exception {
+        List<StaffCertResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = staffInfoService.certListByIds(request.getIds());
+        } else {
+            list = staffInfoService.certList(request);
+        }
+        super.exportExcel(StaffCertResponse.class, list, ExportEnum.STAFF_CERTIFICATE_EXPIRE.getSheetName());
+    }
+
     @ApiOperation("证书逾期提醒")
     @PostMapping("/expirationReminder")
-    public ReturnDTO expirationReminder(@RequestBody IdDTO idDto) {
-        return verifierService.expirationReminder(idDto);
+    public ReturnDTO expirationReminder(@RequestBody IdDTO idDTO) {
+        return verifierService.expirationReminder(idDTO);
     }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java
index 3b251ad..a6e7850 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java
@@ -12,6 +12,7 @@
 import com.casic.missiles.dto.resource.staff.StaffListRequest;
 import com.casic.missiles.dto.resource.staff.TrainListRequest;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.*;
@@ -22,7 +23,10 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
 import java.util.List;
@@ -52,8 +56,19 @@
             throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
         }
         Page<BizResourceStaffInfo> page = PageFactory.defaultPage();
-        Page<BizResourceStaffInfo> responsePage = staffInfoService.listPage(page, request);
-        return ReturnUtil.success(super.packForBT(responsePage));
+        return ReturnUtil.success(super.packForBT(staffInfoService.listPage(page, request)));
+    }
+
+    @ApiOperation("人员登记导出")
+    @PostMapping("/listExport")
+    public void exportList(@RequestBody StaffListRequest request) throws Exception {
+        List<BizResourceStaffInfo> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = staffInfoService.listByIds(request.getIds());
+        } else {
+            list = staffInfoService.list(request);
+        }
+        super.exportExcel(BizResourceStaffInfo.class, list, ExportEnum.STAFF_INFO.getSheetName());
     }
 
     @ApiOperation("人员登记详情基础信息")
@@ -85,9 +100,9 @@
 
     @ApiOperation("科研教育列表（分页）")
     @PostMapping("/education/listPage")
-    public ReturnDTO<PageInfoBT<BizResourceStaffEducation>> educationListPage(@RequestBody IdDTO idDto) {
+    public ReturnDTO<PageInfoBT<BizResourceStaffEducation>> educationListPage(@RequestBody IdDTO idDTO) {
         Page<BizResourceStaffEducation> page = PageFactory.defaultPage();
-        Page<BizResourceStaffEducation> responsePage = staffInfoService.educationListPage(page, idDto);
+        Page<BizResourceStaffEducation> responsePage = staffInfoService.educationListPage(page, idDTO);
         return ReturnUtil.success(super.packForBT(responsePage));
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java
index af6aa86..d85d84a 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java
@@ -9,6 +9,7 @@
 import com.casic.missiles.dto.resource.outsideService.SupplierApprovalListRequest;
 import com.casic.missiles.dto.resource.outsideService.SupplierSaveResponse;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceSupplierAbility;
@@ -67,6 +68,13 @@
         return ReturnUtil.success(supplierInfoService.detail(idDTO.getId()));
     }
 
+    @ApiOperation("合格供方导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody SupplierApprovalListRequest request) throws Exception {
+        List<BizResourceSupplierInfo> list = super.exportList(request);
+        super.exportExcel(BizResourceSupplierInfo.class, list, ExportEnum.SUPPLIER_INFO.getSheetName());
+    }
+
     @ApiOperation("供方人员列表（分页）")
     @PostMapping("/person/listPage")
     public ReturnDTO<PageInfoBT<BizResourceSupplierPerson>> personListPage(@RequestBody IdDTO idDTO) {
diff --git a/casic-metering-api/src/main/resources/config/application.yml b/casic-metering-api/src/main/resources/config/application.yml
index 350db5f..ecff521 100644
--- a/casic-metering-api/src/main/resources/config/application.yml
+++ b/casic-metering-api/src/main/resources/config/application.yml
@@ -126,7 +126,7 @@
     #作者
     author: wangpeng
     #待生成对象表名
-    table-name: biz_equipment_technical_target_approval,biz_equipment_attachment_approval,biz_equipment_checkpoint_approval
+    table-name: biz_business_outsource_protocol
 
 reminder:
   #节点--common模块config包 ReminderNodeConfig配置
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
index 4a19e4e..d47d552 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
@@ -53,6 +53,7 @@
     SUGGEST_FORM_SAVE_FAILED(2509, "委托方意见登记表保存至草稿箱失败"),
     EXAMINE_FORM_SAVE_FAILED(2510, "要求、委托书及合同评审表保存至草稿箱失败"),
     CUSTOMER_EXIST_SAVE_FAILED(2511, "该委托方已存在，请重新选择"),
+    DUPLICATE_LOCATION_NO(2512, "地点编号已存在"),
 
     /**
      * 计量检定业务模块
@@ -68,6 +69,8 @@
     COMPLETE_SAMPLE_NOT_EXIST(2609, "检测中不存在扫描收入的样品"),
     CANNOT_CHANGE_MEASURE_INFO(2610, "无法更改非当前登录用户的检测信息"),
     NON_EXIST_ORDER_OR_SAMPLE(2611, "不存在该委托单或该委托单下的样品"),
+    OUTSOURCE_ACCESS_SAVE_FAILED(2612, "测试、校准或检定工作分包评审表保存至草稿箱失败"),
+    OUTSOURCE_PROTOCOL_SAVE_FAILED(2613, "测试、校准或检定工作分包协议书保存至草稿箱失败"),
 
     /**
      * 历史遗留备用
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
index 5089ad1..81a406b 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
@@ -10,54 +10,38 @@
     /**
      * 资源管理
      */
-    ENVIRONMENT_DATA_EXPORT("environmentData", "environmentData", "环境记录单数据"),
+    ENVIRONMENT_DATA_EXPORT("environmentData", "环境记录单数据", "环境记录单数据"),
+    STAFF_INFO("staffInfo", "人员登记", "人员登记"),
+    STAFF_CERTIFICATE_EXPIRE("certificateExpire", "证书逾期提醒", "证书逾期提醒"),
+    SUPPLIER_INFO("supplierInfo", "合格供方名录", "合格供方名录"),
+    CUSTOMER_INFO("customerInfo", "委托方名录", "委托方名录"),
+    CUSTOMER_SUGGEST_FORM("customerSuggestForm", "委托方意见登记表", "委托方意见登记表"),
+    SEAL_NOTE("sealNote", "印章使用登记", "印章使用登记"),
 
-    FILE_EXPORT("meterFileData", "meterFileData", "计量文件信息"),
-    TRAIN_PLAN_EXPORT("trainPlanData", "trainPlanData", "培训计划"),
-    TRAIN_LOG_EXPORT("trainLogData", "trainLogData", "培训记录"),
-    METER_ORGANIZE_EXPORT("meterOrganizeData", "meterOrganizeData", "计量组织"),
-    TRACE_SUPPLIER_EXPORT("traceSupplierData", "traceSupplierData", "溯源供方"),
-    SIGN_EXPORT("signData", "signData", "签名/签章"),
-    TEMPLATE_EXPORT("templateData", "templateData", "原始记录模板/证书报告模板"),
-    FIXED_ASSETS("meterFixedAssets", "meterFixedAssets", "固定资产"),
-    METER_EQUIPMENT("meterEquipment", "meterEquipment", "测量设备"),
-    CALIBRATION_TEST_EQUIPMENT("calibrationTestEquipment", "calibrationTestEquipment", "校准检定设备"),
-    MEASURE_ACCOUNT("measureAccount", "measureAccount", "测量工装"),
-    STANDARD_SUPPORT_EQUIPMENT("standardSupportEquipment", "standardSupportEquipment", "标准配套设备"),
-    STANDARD_EQUIPMENT("standardEquipment", "standardEquipment", "标准装置"),
-    FLOW_DEF_EXPORT("flowDefData", "flowDefData", "流程定义"),
-    STAFF_CERTIFICATE("certificate", "certificate", "计量人员证书"),
-    CHECK_INFO("checkInfo", "checkInfo", "设备管理点检测"),
-    EQUIPMENT_APPLY("equipmentApply", "equipmentApply", "设备借用"),
-    STANDARD_EQUIPMENT_REMIND("equipmentApplyRemind", "equipmentApplyRemind", "标准装置到期提醒"),
-    METER_PRICE("meterPrice", "meterPrice", "价格库"),
-    METER_STAFF("meterStaff", "meterStaff", "计量人员"),
-    STANDARD_EQUIPMENT_APPLY("standardEquipmentApply", "standardEquipmentApply", "标准装置申请"),
-    STATE_MANAGE_APPLY("stateManage", "stateManage", "状态管理"),
-    METER_ACCEPTANCE_CHECK("acceptanceCheck", "acceptanceCheck", "设备检修保养验收单"),
-    CUSTOMER_EXPORT("customerData", "customerData", "客户信息"),
-    ORDER_EXPORT("orderData", "orderData", "委托书信息"),
-    SAMPLE_EXPORT("sampleData", "sampleData", "样本信息"),
-    EXCHANGE_DATA("exchangeData", "exchangeData", "设备交接单"),
-    DISPATCH_DATA("dispatchData", "dispatchData", "设备收发"),
-    ENVIRONMENT_DATA("environmentData", "environmentData", "环境记录单"),
-    ORIGIN_DATA("originData", "originData", "原始记录"),
-    CERTIFICATE_REPORT("certificateReport", "certificateReport", "证书报告"),
-    ADVICE_EXPORT("adviceData", "adviceData", "客户反馈"),
-    HANDOUT_EXPORT("handoutData", "handoutData", "任务分发列表"),
-    OUTSOURCER_EXPORT("outsourcerData", "outsourcerData", "分包方"),
-    SITE_EXECUTIVE_EXPORT("siteExecutiveData", "siteExecutiveData", "现场测试、校准或检定"),
-    CERTIFICATE_PRINT_EXPORT("certificatePrintData", "certificatePrintData", "证书打印"),
-    DOWNLOAD_TEMPLATE("downloadTemplate", "downloadTemplate", "页面配置"),
-    OUTSOURCER_CERTIFICATE_EXPORT("outsourceCertificateData", "outsourceCertificateData", "分包证书"),
-    SETTLEMENT_INFO_EXPORT("settlementInfoData", "settlementInfoData", "业务结算"),
-    EQUIPMENT_REMIND("equipmentRemind", "equipmentRemind", "设备到期提醒"),
-    AGREEMENT_INFO_EXPORT("agreementInfoData", "agreementInfoData", "合同"),
-    WORK_STATISTICS_EXPORT("workStatisticsData", "workStatisticsData", "实时工作统计"),
-    DEPT_OUTPUT_EXPORT("deptOutputData", "deptOutputData", "部门产值分析"),
-    WORKLOAD_EXPORT("workloadData", "workloadData", "业务工作量分析"),
-    DEPT_COMPREHENSIVE_EXPORT("deptComprehensiveData", "deptComprehensiveData", "部门综合分析"),
-    ENVIRONMENTAL_RECORD("environmentalRecordData", "environmentalRecordData", "现场环境记录");
+    /**
+     * 计量检定业务
+     */
+    OUTSOURCER_EXPORT("outsourcerData", "分包方名录", "分包方名录"),
+    IDENTIFY_EXPORT("identifyData", "计量标识", "计量标识"),
+    ORDER_EXPORT("orderData", "任务单", "任务单"),
+    DISPATCH_DATA("dispatchData", "设备收发", "设备收发"),
+    HANDOUT_EXPORT("handoutData", "任务分发", "任务分发"),
+    SITE_EXECUTIVE_EXPORT("siteExecutiveData", "现场测试、校准或检定", "现场测试、校准或检定"),
+    CERTIFICATE_REPORT("certificateReport", "证书审批", "证书审批"),
+    CERTIFICATE_CHANGE_APPLY("certificateChangeApply", "证书报告补充或更换申请单", "证书报告补充或更换申请单"),
+    CERTIFICATE_PRINT("certificatePrintData", "证书打印审批", "证书打印审批"),
+    DEPT_EXECUTIVE_TASK("deptExecutiveTaskData", "实验室任务", "实验室任务"),
+    MY_EXECUTIVE_TASK("myExecutiveTaskData", "我的任务", "我的任务"),
+    OUTSOURCE_ASSESS("outsourceAssess", "测试、校准或检定工作分包评审表", "测试、校准或检定工作分包评审表"),
+    OUTSOURCE_PROTOCOL("outsourceProtocol", "测试、校准或检定工作分包协议书", "测试、校准或检定工作分包协议书"),
+
+    /**
+     * 系统管理
+     */
+    SIGN_EXPORT("signData", "签名", "签名"),
+    TEMPLATE_EXPORT("templateData", "文件模板", "文件模板"),
+    FLOW_DEF_EXPORT("flowDefData", "流程定义", "流程定义"),
+    DOWNLOAD_TEMPLATE("downloadTemplate", "流程定义", "页面配置");
 
     ExportEnum(String fileName, String sheetName, String description) {
         this.fileName = fileName;
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateRecordTypeCodeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateRecordTypeCodeEnum.java
index 31d913c..a963522 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateRecordTypeCodeEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateRecordTypeCodeEnum.java
@@ -46,4 +46,14 @@
     String SITE_EXECUTIVE_APPROVAL = "01";
     //《现场测试、校准或检定工作记录表》
     String SITE_EXECUTIVE_LOG = "02";
+
+    //测试、校准或检定工作分包协议书
+    String OUTSOURCE_PROTOCOL = "01";
+    //测试、校准或检定工作分包评审表
+    String OUTSOURCE_ACCESS = "02";
+    //测试、校准或检定工作分包通知书
+    String OUTSOURCE_NOTICE = "03";
+    //测试、校准或检定工作分包方名录
+    String OUTSOURCE_INFO = "04";
+
 }
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
index 24b8635..f78bd53 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
@@ -15,6 +15,10 @@
     String CERTIFICATE_CHANGE_APPLY_BEAN_NAME = "certificateChangeApplyBean";
     //现场测试、校准或检定
     String SITE_EXECUTIVE_BEAN_NAME = "siteExecutiveBean";
+    //测试、校准或检定工作分包评审表
+    String OUTSOURCE_ASSESS_BEAN_NAME = "outsourceAssessBean";
+    //测试、校准或检定工作分包协议书
+    String OUTSOURCE_PROTOCOL_BEAN_NAME = "outsourceProtocolBean";
 
     /*********************************设备与装置************************************/
     //设备台账
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 b21c661..6b86fd1 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
@@ -18,6 +18,8 @@
     OUTSOURCER_APPROVAL(OUTSOURCER_BEAN_NAME, ""),
     CERTIFICATE_CHANGE_APPROVAL(CERTIFICATE_CHANGE_APPLY_BEAN_NAME, ""),
     SITE_EXECUTIVE_APPROVAL(SITE_EXECUTIVE_BEAN_NAME, ""),
+    OUTSOURCE_ASSESS_APPROVAL(OUTSOURCE_ASSESS_BEAN_NAME, ""),
+    OUTSOURCE_PROTOCOL_APPROVAL(OUTSOURCE_PROTOCOL_BEAN_NAME, ""),
 
     ACTION_STATUS_MAP(new HashMap<String, AwareActionStatusEnum>() {
         {
@@ -47,6 +49,10 @@
             put(ApplyFromIdEnum.CERTIFICATE_CHANGE_APPROVAL.getCode(), CERTIFICATE_CHANGE_APPROVAL);
             //现场测试、校准或检定审批
             put(ApplyFromIdEnum.SITE_EXECUTIVE_APPROVAL.getCode(), SITE_EXECUTIVE_APPROVAL);
+            //测试、校准或检定工作分包评审表
+            put(ApplyFromIdEnum.OUTSOURCE_ASSESS_APPROVAL.getCode(), OUTSOURCE_ASSESS_APPROVAL);
+            //测试、校准或检定工作分包协议书
+            put(ApplyFromIdEnum.OUTSOURCE_PROTOCOL_APPROVAL.getCode(), OUTSOURCE_PROTOCOL_APPROVAL);
         }
     });
     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 934405e..c7410bd 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
@@ -9,6 +9,8 @@
     CERTIFICATE_CHANGE_APPROVAL("jljdywzsbchghsqd", MessageSourceModuleEnum.BUSINESS.getCode(), "证书/报告补充或更换申请单"),
     OUTSOURCER_APPROVAL("jljdywcsjzhgfbfml", MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定合格分包方名录"),
     SITE_EXECUTIVE_APPROVAL("jljdywxccsjzsp", MessageSourceModuleEnum.BUSINESS.getCode(), "现场测试、校准或检定审批"),
+    OUTSOURCE_ASSESS_APPROVAL("jljdywcsjzfbpsb", MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包评审表"),
+    OUTSOURCE_PROTOCOL_APPROVAL("jljdywcsjzfbxys", MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包协议书"),
 
 
     /*******************************************设备与装置*********************************************/
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/GeneralApprovalMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/GeneralApprovalMapper.java
index 4fb7344..0c9d6ae 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/GeneralApprovalMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/GeneralApprovalMapper.java
@@ -17,8 +17,4 @@
 
     Page<O> selectBatchForApprovalList(Page<O> page, @Param("request") R request, @Param("businessKeys") List<String> businessKeys);
 
-//    Page<O> selectListPage(Page<O> page, @Param("request") R request);
-
-//    Long selectMaxNo();
-
 }
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceAssessMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceAssessMapper.java
index 7867bb8..ba59009 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceAssessMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceAssessMapper.java
@@ -1,7 +1,12 @@
 package com.casic.missiles.mapper.business;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.business.outsource.OutsourceAssessApprovalListRequest;
+import com.casic.missiles.mapper.GeneralApprovalMapper;
 import com.casic.missiles.model.business.BizBusinessOutsourceAssess;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * <p>
@@ -11,6 +16,10 @@
  * @author wangpeng
  * @since 2023-08-16
  */
-public interface BizBusinessOutsourceAssessMapper extends BaseMapper<BizBusinessOutsourceAssess> {
+public interface BizBusinessOutsourceAssessMapper extends GeneralApprovalMapper<BizBusinessOutsourceAssess, BizBusinessOutsourceAssess, OutsourceAssessApprovalListRequest> {
+
+    Page<BizBusinessOutsourceAssess> selectBatchForApprovalList(Page<BizBusinessOutsourceAssess> page, @Param("request") OutsourceAssessApprovalListRequest request, @Param("businessKeys") List<String> businessKeys);
+
+    Long selectMaxProjectNo();
 
 }
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceProtocolMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceProtocolMapper.java
new file mode 100644
index 0000000..e6aba35
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceProtocolMapper.java
@@ -0,0 +1,24 @@
+package com.casic.missiles.mapper.business;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.business.outsource.OutsourceProtocolApprovalListRequest;
+import com.casic.missiles.mapper.GeneralApprovalMapper;
+import com.casic.missiles.model.business.BizBusinessOutsourceProtocol;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 计量检定业务-分包管理-测试、校准或检定工作分包协议书 Mapper 接口
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-08-24
+ */
+public interface BizBusinessOutsourceProtocolMapper extends GeneralApprovalMapper<BizBusinessOutsourceProtocol, BizBusinessOutsourceProtocol, OutsourceProtocolApprovalListRequest> {
+
+    Page<BizBusinessOutsourceProtocol> selectBatchForApprovalList(Page<BizBusinessOutsourceProtocol> page, @Param("request") OutsourceProtocolApprovalListRequest request, @Param("businessKeys") List<String> businessKeys);
+
+    Long selectMaxProtocolNo();
+}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/EnvLocationInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/EnvLocationInfoMapper.java
new file mode 100644
index 0000000..49eff87
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/EnvLocationInfoMapper.java
@@ -0,0 +1,21 @@
+package com.casic.missiles.mapper.resource;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.resource.environment.LocationListRequest;
+import com.casic.missiles.dto.resource.environment.LocationListResponse;
+import com.casic.missiles.model.resource.EnvLocationInfo;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * <p>
+ * 实验室环境监控系统-设备表 Mapper 接口
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-06-07
+ */
+public interface EnvLocationInfoMapper extends BaseMapper<EnvLocationInfo> {
+
+    Page<LocationListResponse> selectLocationListPage(Page<LocationListResponse> page, @Param("request") LocationListRequest request);
+}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java
index de124db..85ed0f7 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java
@@ -1,7 +1,9 @@
 package com.casic.missiles.mapper.system;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.dto.system.SignDetailResponse;
+import com.casic.missiles.dto.system.SignListRequest;
 import com.casic.missiles.model.system.SystemSign;
 import org.apache.ibatis.annotations.Param;
 
@@ -22,4 +24,8 @@
     SignDetailResponse selectSignDetailById(Long id);
 
     List<SystemSign> selectUsableSignList(@Param("userId") Long userId);
+
+    Page<SystemSign> selectSignListPage(Page<SystemSign> page, @Param("request") SignListRequest request);
+
+    List<SystemSign> selectSignList(@Param("request") SignListRequest request);
 }
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateChangeApplyMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateChangeApplyMapper.xml
index d798447..c496092 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateChangeApplyMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateChangeApplyMapper.xml
@@ -30,31 +30,31 @@
         SELECT *
         FROM biz_business_certificate_change_apply
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.changeApplyNo != null and request.changeApplyNo !=''">
+        <if test="request != null and request.changeApplyNo != null and request.changeApplyNo !=''">
             and change_apply_no like concat('%',#{request.changeApplyNo},'%')
         </if>
-        <if test="request.changeReportNo != null and request.changeReportNo !=''">
+        <if test="request != null and request.changeReportNo != null and request.changeReportNo !=''">
             and change_report_no like concat('%',#{request.changeReportNo},'%')
         </if>
-        <if test="request.changeReportName != null and request.changeReportName !=''">
+        <if test="request != null and request.changeReportName != null and request.changeReportName !=''">
             and change_report_name like concat('%',#{request.changeReportName},'%')
         </if>
-        <if test="request.changeType != null and request.changeType !=''">
+        <if test="request != null and request.changeType != null and request.changeType !=''">
             and change_type = #{request.changeType}
         </if>
-        <if test="request.createUserName != null and request.createUserName !=''">
+        <if test="request != null and request.createUserName != null and request.createUserName !=''">
             and create_user_name like concat('%',#{request.createUserName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificatePrintMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificatePrintMapper.xml
index b66cd99..49c0ac8 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificatePrintMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificatePrintMapper.xml
@@ -31,34 +31,34 @@
         LEFT JOIN biz_business_order_sample_relation bosr ON (bosr.order_id = bcr.order_id AND bosr.sample_id = bcr.sample_id)
         LEFT JOIN biz_business_order_info boi ON boi.id = bosr.order_id
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and bcp.approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.printStatus != null and request.printStatus !=''">
+        <if test="request != null and request.printStatus != null and request.printStatus !=''">
             and print_status = #{request.printStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and bcp.create_user_id = #{request.createUserId}
         </if>
-        <if test="request.certificateReportNo != null and request.certificateReportNo !=''">
+        <if test="request != null and request.certificateReportNo != null and request.certificateReportNo !=''">
             and bcr.certificate_report_no like concat('%',#{request.certificateReportNo},'%')
         </if>
-        <if test="request.certificateReportName != null and request.certificateReportName !=''">
+        <if test="request != null and request.certificateReportName != null and request.certificateReportName !=''">
             and bcr.certificate_report_name like concat('%',#{request.certificateReportName},'%')
         </if>
-        <if test="request.customerName != null and request.customerName !=''">
+        <if test="request != null and request.customerName != null and request.customerName !=''">
             and boi.customer_name like concat('%',#{request.customerName},'%')
         </if>
-        <if test="request.sampleNo != null and request.sampleNo !=''">
+        <if test="request != null and request.sampleNo != null and request.sampleNo !=''">
             and bosr.sample_no like concat('%',#{request.sampleNo},'%')
         </if>
-        <if test="request.sampleName != null and request.sampleName !=''">
+        <if test="request != null and request.sampleName != null and request.sampleName !=''">
             and bosr.sample_name like concat('%',#{request.sampleName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and bcp.create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and bcp.create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml
index b366034..767695d 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml
@@ -46,33 +46,37 @@
         SELECT bcr.*, bosr.sample_no, bosr.sample_name, bosr.sample_model, rsi.staff_name
         FROM biz_business_certificate_report bcr
         LEFT JOIN biz_business_order_sample_relation bosr ON (bosr.order_id = bcr.order_id AND bosr.sample_id = bcr.sample_id)
+        LEFT JOIN biz_business_order_info boi ON boi.id = bcr.order_id
         LEFT JOIN biz_resource_staff_info rsi ON rsi.id = bcr.measure_person_id
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and bcr.approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and bcr.create_user_id = #{request.createUserId}
         </if>
-        <if test="request.certificateReportNo != null and request.certificateReportNo !=''">
+        <if test="request != null and request.customerId != null and request.customerId !=''">
+            and boi.customer_id = #{request.customerId}
+        </if>
+        <if test="request != null and request.certificateReportNo != null and request.certificateReportNo !=''">
             and bcr.certificate_report_no like concat('%',#{request.certificateReportNo},'%')
         </if>
-        <if test="request.certificateReportName != null and request.certificateReportName !=''">
+        <if test="request != null and request.certificateReportName != null and request.certificateReportName !=''">
             and bcr.certificate_report_name like concat('%',#{request.certificateReportName},'%')
         </if>
-        <if test="request.sampleNo != null and request.sampleNo !=''">
+        <if test="request != null and request.sampleNo != null and request.sampleNo !=''">
             and bosr.sample_no like concat('%',#{request.sampleNo},'%')
         </if>
-        <if test="request.measureCategory != null and request.measureCategory !=''">
+        <if test="request != null and request.measureCategory != null and request.measureCategory !=''">
             and bcr.measure_category = #{request.measureCategory}
         </if>
-        <if test="request.measurePerson != null and request.measurePerson !=''">
+        <if test="request != null and request.measurePerson != null and request.measurePerson !=''">
             and rsi.staff_name like concat('%',#{request.measurePerson},'%')
         </if>
-        <if test="request.calibrationTimeStart != null and request.calibrationTimeStart !=''">
+        <if test="request != null and request.calibrationTimeStart != null and request.calibrationTimeStart !=''">
             and bcr.calibration_time &gt;= #{request.calibrationTimeStart}
         </if>
-        <if test="request.calibrationTimeEnd != null and request.calibrationTimeEnd !=''">
+        <if test="request != null and request.calibrationTimeEnd != null and request.calibrationTimeEnd !=''">
             and bcr.calibration_time &lt;= #{request.calibrationTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceAssessMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceAssessMapper.xml
index d0fcf8b..c22c101 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceAssessMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceAssessMapper.xml
@@ -7,6 +7,8 @@
         <id column="id" property="id" />
         <result column="project_no" property="projectNo" />
         <result column="project_name" property="projectName" />
+        <result column="lab_code" property="labCode" />
+        <result column="group_code" property="groupCode" />
         <result column="applicant_id" property="applicantId" />
         <result column="applicant_name" property="applicantName" />
         <result column="applicant_time" property="applicantTime" />
@@ -31,7 +33,45 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, project_no, project_name, applicant_id, applicant_name, applicant_time, minio_file_name, remark, create_user_id, create_user_name, outsourcer_id, pre_start_time, pre_end_time, outsource_reason, pre_cost, approval_status, process_id, approve_situation, traceability, test_method, technique_ability, create_time, update_time
+        id, project_no, project_name, lab_code, group_code, applicant_id, applicant_name, applicant_time, minio_file_name, remark, create_user_id, create_user_name, outsourcer_id, pre_start_time, pre_end_time, outsource_reason, pre_cost, approval_status, process_id, approve_situation, traceability, test_method, technique_ability, create_time, update_time
     </sql>
 
+    <select id="selectMaxProjectNo" resultType="java.lang.Long">
+        SELECT IFNULL(max(RIGHT(project_no, 3)), 0) from biz_business_outsource_assess
+    </select>
+
+    <select id="selectBatchForApprovalList" resultMap="BaseResultMap">
+        SELECT bboa.*, bboi.outsourcer_name, bboi.director
+        FROM biz_business_outsource_assess bboa
+        LEFT JOIN biz_business_outsourcer_info bboi ON bboa.outsourcer_id = bboi.id
+        WHERE 1=1
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
+            and bboa.approval_status = #{request.approvalStatus}
+        </if>
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
+            and bboa.create_user_id = #{request.createUserId}
+        </if>
+        <if test="request != null and request.projectNo != null and request.projectNo !=''">
+            and bboa.project_no like concat('%',#{request.projectNo},'%')
+        </if>
+        <if test="request != null and request.outsourcerName != null and request.outsourcerName !=''">
+            and bboi.outsourcer_name like concat('%',#{request.outsourcerName},'%')
+        </if>
+        <if test="request != null and request.applicantName != null and request.applicantName !=''">
+            and bboa.applicant_name like concat('%',#{request.applicantName},'%')
+        </if>
+        <if test="request != null and request.applicantTimeStart != null and request.applicantTimeStart !=''">
+            and bboa.applicant_time &gt;= #{request.applicantTimeStart}
+        </if>
+        <if test="request != null and request.applicantTimeEnd != null and request.applicantTimeEnd !=''">
+            and bboa.applicant_time &lt;= #{request.applicantTimeEnd}
+        </if>
+        <if test="businessKeys != null">
+            and bboa.id in
+            <foreach collection="businessKeys" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
+        ORDER BY bboa.create_time DESC
+    </select>
 </mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceProtocolMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceProtocolMapper.xml
new file mode 100644
index 0000000..b7b2149
--- /dev/null
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceProtocolMapper.xml
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.mapper.business.BizBusinessOutsourceProtocolMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.business.BizBusinessOutsourceProtocol">
+        <id column="id" property="id" />
+        <result column="protocol_no" property="protocolNo" />
+        <result column="project_name" property="projectName" />
+        <result column="lab_code" property="labCode" />
+        <result column="group_code" property="groupCode" />
+        <result column="outsourcer_id" property="outsourcerId" />
+        <result column="remark" property="remark" />
+        <result column="outsource_no" property="outsourceNo" />
+        <result column="outsource_name" property="outsourceName" />
+        <result column="contacts" property="contacts" />
+        <result column="mobile" property="mobile" />
+        <result column="address" property="address" />
+        <result column="require_date" property="requireDate" />
+        <result column="outsource_cost" property="outsourceCost" />
+        <result column="director" property="director" />
+        <result column="item" property="item" />
+        <result column="requires" property="requires" />
+        <result column="create_user_id" property="createUserId" />
+        <result column="create_user_name" property="createUserName" />
+        <result column="approval_status" property="approvalStatus" />
+        <result column="process_id" property="processId" />
+        <result column="create_time" property="createTime" />
+        <result column="update_time" property="updateTime" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, protocol_no, project_name, lab_code, group_code, outsourcer_id, remark, outsource_no, outsource_name, contacts, mobile, address, require_date, outsource_cost, director, item, requires, create_user_id, create_user_name, approval_status, process_id, create_time, update_time
+    </sql>
+
+    <select id="selectMaxProtocolNo" resultType="java.lang.Long">
+        SELECT IFNULL(max(RIGHT(protocol_no, 3)), 0) from biz_business_outsource_protocol
+    </select>
+
+    <select id="selectBatchForApprovalList" resultMap="BaseResultMap">
+        SELECT *
+        FROM biz_business_outsource_protocol
+        WHERE 1=1
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
+            and approval_status = #{request.approvalStatus}
+        </if>
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
+            and create_user_id = #{request.createUserId}
+        </if>
+        <if test="request != null and request.protocolNo != null and request.protocolNo !=''">
+            and protocol_no like concat('%',#{request.protocolNo},'%')
+        </if>
+        <if test="request != null and request.outsourcerName != null and request.outsourcerName !=''">
+            and outsourcer_name like concat('%',#{request.outsourcerName},'%')
+        </if>
+        <if test="request != null and request.applicantName != null and request.applicantName !=''">
+            and create_user_name like concat('%',#{request.applicantName},'%')
+        </if>
+        <if test="request != null and request.applicantTimeStart != null and request.applicantTimeStart !=''">
+            and create_time &gt;= #{request.applicantTimeStart}
+        </if>
+        <if test="request != null and request.applicantTimeEnd != null and request.applicantTimeEnd !=''">
+            and create_time &lt;= #{request.applicantTimeEnd}
+        </if>
+        <if test="businessKeys != null">
+            and id in
+            <foreach collection="businessKeys" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
+        ORDER BY create_time DESC
+    </select>
+</mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourcerInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourcerInfoMapper.xml
index 510a80b..3049b54 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourcerInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourcerInfoMapper.xml
@@ -7,6 +7,8 @@
         <id column="id" property="id" />
         <result column="outsourcer_no" property="outsourcerNo" />
         <result column="outsourcer_name" property="outsourcerName" />
+        <result column="lab_code" property="labCode" />
+        <result column="group_code" property="groupCode" />
         <result column="outsourcer_brief_name" property="outsourcerBriefName" />
         <result column="outsourcer_size" property="outsourcerSize" />
         <result column="business_size" property="businessSize" />
@@ -55,32 +57,32 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, outsourcer_no, outsourcer_name, outsourcer_brief_name, outsourcer_size, business_size, grade, evaluation, tax_number, bank_account, bank_name, bank_account_number, postal_code, director, phone, fax, mobile, email, website, address_country, address_province, address_city, address_area, full_address, address_country_name, address_province_name, address_city_name, address_area_name, invoice_country, invoice_province, invoice_city, invoice_area, invoice_full_address, invoice_country_name, invoice_province_name, invoice_city_name, invoice_area_name, business_scope, business_content, minio_file_name, approval_status, process_id, remark, create_user_id, create_user_name, create_time, update_time
+        id, outsourcer_no, outsourcer_name, lab_code, group_code, outsourcer_brief_name, outsourcer_size, business_size, grade, evaluation, tax_number, bank_account, bank_name, bank_account_number, postal_code, director, phone, fax, mobile, email, website, address_country, address_province, address_city, address_area, full_address, address_country_name, address_province_name, address_city_name, address_area_name, invoice_country, invoice_province, invoice_city, invoice_area, invoice_full_address, invoice_country_name, invoice_province_name, invoice_city_name, invoice_area_name, business_scope, business_content, minio_file_name, approval_status, process_id, remark, create_user_id, create_user_name, create_time, update_time
     </sql>
 
     <select id="selectBatchForApprovalList" resultMap="BaseResultMap">
         SELECT *
         FROM biz_business_outsourcer_info
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.outsourcerNo != null and request.outsourcerNo !=''">
+        <if test="request != null and request.outsourcerNo != null and request.outsourcerNo !=''">
             and outsourcer_no like concat('%',#{request.outsourcerNo},'%')
         </if>
-        <if test="request.outsourcerName != null and request.outsourcerName !=''">
+        <if test="request != null and request.outsourcerName != null and request.outsourcerName !=''">
             and outsourcer_name like concat('%',#{request.outsourcerName},'%')
         </if>
-        <if test="request.director != null and request.director !=''">
+        <if test="request != null and request.director != null and request.director !=''">
             and director like concat('%',#{request.director},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
@@ -93,6 +95,6 @@
     </select>
 
     <select id="selectMaxNo" resultType="java.lang.Long">
-        SELECT IFNULL(max(RIGHT(outsourcer_no, 12)), 0) from biz_business_outsourcer_info
+        SELECT IFNULL(max(RIGHT(outsourcer_no, 3)), 0) from biz_business_outsourcer_info
     </select>
 </mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessSiteExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessSiteExecutiveInfoMapper.xml
index 135c5d0..3c5ae79 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessSiteExecutiveInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessSiteExecutiveInfoMapper.xml
@@ -38,25 +38,25 @@
         FROM biz_business_site_executive_info bsei
         LEFT JOIN biz_resource_customer_info rci ON bsei.customer_id = rci.id
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and bsei.approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and bsei.create_user_id = #{request.createUserId}
         </if>
-        <if test="request.siteExecutiveNo != null and request.siteExecutiveNo !=''">
+        <if test="request != null and request.siteExecutiveNo != null and request.siteExecutiveNo !=''">
             and bsei.site_executive_no like concat('%',#{request.siteExecutiveNo},'%')
         </if>
-        <if test="request.customerName != null and request.customerName !=''">
+        <if test="request != null and request.customerName != null and request.customerName !=''">
             and rci.outsourcer_name like concat('%',#{request.customerName},'%')
         </if>
-        <if test="request.applyName != null and request.applyName !=''">
+        <if test="request != null and request.applyName != null and request.applyName !=''">
             and bsei.apply_name like concat('%',#{request.applyName},'%')
         </if>
-        <if test="request.applyTimeStart != null and request.applyTimeStart !=''">
+        <if test="request != null and request.applyTimeStart != null and request.applyTimeStart !=''">
             and bsei.apply_time &gt;= #{request.applyTimeStart}
         </if>
-        <if test="request.applyTimeEnd != null and request.applyTimeEnd !=''">
+        <if test="request != null and request.applyTimeEnd != null and request.applyTimeEnd !=''">
             and bsei.apply_time &lt;= #{request.applyTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml
index 84d9e2a..6bd38a9 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml
@@ -105,6 +105,12 @@
         <if test="request.isUrgent != null and request.isUrgent !=''">
             AND bo.is_urgent = #{request.isUrgent}
         </if>
+        <if test="request.ids != null">
+            and blei.id in
+            <foreach collection="request.ids" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
         ORDER BY blei.update_time DESC
     </select>
 
@@ -137,6 +143,12 @@
         <if test="request.isUrgent != null and request.isUrgent !=''">
             AND bo.is_urgent = #{request.isUrgent}
         </if>
+        <if test="request.ids != null">
+            and blei.id in
+            <foreach collection="request.ids" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
         ORDER BY blei.update_time DESC
     </select>
 
diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardInfoMapper.xml
index 1a5551b..2ed8d17 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardInfoMapper.xml
@@ -45,12 +45,6 @@
         FROM biz_equipment_standard_info besi
         LEFT JOIN biz_equipment_standard_technology_relation bestr ON besi.standard_no = bestr.standard_no
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
-            and besi.approval_status = #{request.approvalStatus}
-        </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
-            and besi.create_user_id = #{request.createUserId}
-        </if>
         <if test="request.standardName != null and request.standardName !=''">
             and besi.standard_name like concat('%',#{request.standardName},'%')
         </if>
diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardTechnologyRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardTechnologyRelationMapper.xml
index fc7e16c..cd03c8c 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardTechnologyRelationMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardTechnologyRelationMapper.xml
@@ -6,6 +6,7 @@
     <resultMap id="BaseResultMap" type="com.casic.missiles.model.equipment.BizEquipmentStandardTechnologyRelation">
         <id column="id" property="id" />
         <result column="technology_file_id" property="technologyFileId" />
+        <result column="technology_file_no" property="technologyFileNo" />
         <result column="technology_file_name" property="technologyFileName" />
         <result column="standard_id" property="standardId" />
         <result column="standard_no" property="standardNo" />
@@ -14,7 +15,7 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, technology_file_id, technology_file_name, standard_id, remark
+        id, technology_file_id, technology_file_no, technology_file_name, standard_id, remark
     </sql>
 
 </mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceAuthorizeOrderMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceAuthorizeOrderMapper.xml
index ac5176c..554fe65 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceAuthorizeOrderMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceAuthorizeOrderMapper.xml
@@ -32,22 +32,22 @@
         SELECT *
         FROM biz_resource_authorize_order
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.orderNo != null and request.orderNo !=''">
+        <if test="request != null and request.orderNo != null and request.orderNo !=''">
             and order_no like concat('%',#{request.orderNo},'%')
         </if>
-        <if test="request.createUserName != null and request.createUserName !=''">
+        <if test="request != null and request.createUserName != null and request.createUserName !=''">
             and create_user_name like concat('%',#{request.createUserName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerExamineFormMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerExamineFormMapper.xml
index ab242f6..af7f98f 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerExamineFormMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerExamineFormMapper.xml
@@ -41,28 +41,28 @@
         SELECT *
         FROM biz_resource_customer_examine_form
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.formNo != null and request.formNo !=''">
+        <if test="request != null and request.formNo != null and request.formNo !=''">
             and form_no like concat('%',#{request.formNo},'%')
         </if>
-        <if test="request.labCode != null and request.labCode !=''">
+        <if test="request != null and request.labCode != null and request.labCode !=''">
             and lab_code like concat('%',#{request.labCode},'%')
         </if>
-        <if test="request.groupCode != null and request.groupCode !=''">
+        <if test="request != null and request.groupCode != null and request.groupCode !=''">
             and group_code like concat('%',#{request.groupCode},'%')
         </if>
-        <if test="request.createUserName != null and request.createUserName !=''">
+        <if test="request != null and request.createUserName != null and request.createUserName !=''">
             and create_user_name like concat('%',#{request.createUserName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerInfoMapper.xml
index fa8ffbc..06a2798 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerInfoMapper.xml
@@ -33,25 +33,25 @@
         SELECT *
         FROM biz_resource_customer_info
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.customerNo != null and request.customerNo !=''">
+        <if test="request != null and request.customerNo != null and request.customerNo !=''">
             and customer_no like concat('%',#{request.customerNo},'%')
         </if>
-        <if test="request.customerName != null and request.customerName !=''">
+        <if test="request != null and request.customerName != null and request.customerName !=''">
             and customer_name like concat('%',#{request.customerName},'%')
         </if>
-        <if test="request.contacts != null and request.contacts !=''">
+        <if test="request != null and request.contacts != null and request.contacts !=''">
             and contacts like concat('%',#{request.contacts},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerSuggestFormMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerSuggestFormMapper.xml
index 28f5bb2..1806662 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerSuggestFormMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerSuggestFormMapper.xml
@@ -33,28 +33,28 @@
         SELECT *
         FROM biz_resource_customer_suggest_form
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.formNo != null and request.formNo !=''">
+        <if test="request != null and request.formNo != null and request.formNo !=''">
             and form_no like concat('%',#{request.formNo},'%')
         </if>
-        <if test="request.customerName != null and request.customerName !=''">
+        <if test="request != null and request.customerName != null and request.customerName !=''">
             and customer_name like concat('%',#{request.customerName},'%')
         </if>
-        <if test="request.customerDeptName != null and request.customerDeptName !=''">
+        <if test="request != null and request.customerDeptName != null and request.customerDeptName !=''">
             and customer_dept_name like concat('%',#{request.customerDeptName},'%')
         </if>
-        <if test="request.createUserName != null and request.createUserName !=''">
+        <if test="request != null and request.createUserName != null and request.createUserName !=''">
             and create_user_name like concat('%',#{request.createUserName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSealUseNoteMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSealUseNoteMapper.xml
index ab37bc1..b02bb33 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSealUseNoteMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSealUseNoteMapper.xml
@@ -29,32 +29,32 @@
     </sql>
 
     <select id="selectBatchForApprovalList" resultMap="BaseResultMap">
-        SELECT *
+        SELECT brsun.*, brsi.seal_name, brsi.seal_type, brsi.approver_name
         FROM biz_resource_seal_use_note brsun
         JOIN biz_resource_seal_info brsi ON brsun.seal_id = brsi.id
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and brsun.approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and brsun.create_user_id = #{request.createUserId}
         </if>
-        <if test="request.sealName != null and request.sealName !=''">
+        <if test="request != null and request.sealName != null and request.sealName !=''">
             and brsi.seal_name like concat('%',#{request.sealName},'%')
         </if>
-        <if test="request.sealType != null and request.sealType !=''">
+        <if test="request != null and request.sealType != null and request.sealType !=''">
             and brsi.seal_type = #{request.sealType}
         </if>
-        <if test="request.applyDeptName != null and request.applyDeptName !=''">
+        <if test="request != null and request.applyDeptName != null and request.applyDeptName !=''">
             and brsun.apply_dept_name like concat('%',#{request.applyDeptName},'%')
         </if>
-        <if test="request.applyUserName != null and request.applyUserName !=''">
+        <if test="request != null and request.applyUserName != null and request.applyUserName !=''">
             and brsun.apply_user_name like concat('%',#{request.applyUserName},'%')
         </if>
-        <if test="request.applyTimeStart != null and request.applyTimeStart !=''">
+        <if test="request != null and request.applyTimeStart != null and request.applyTimeStart !=''">
             and brsun.apply_time &gt;= #{request.applyTimeStart}
         </if>
-        <if test="request.applyTimeEnd != null and request.applyTimeEnd !=''">
+        <if test="request != null and request.applyTimeEnd != null and request.applyTimeEnd !=''">
             and brsun.apply_time &lt;= #{request.applyTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml
index 119bf7d..4f8392a 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml
@@ -31,6 +31,12 @@
         <if test="request.deptName != null and request.deptName !=''">
             and brsi.dept_name like concat('%',#{request.deptName},'%')
         </if>
+        <if test="request.ids != null">
+            and brsv.id in
+            <foreach collection="request.ids" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
         ORDER BY brsv.grant_date DESC
     </select>
 
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSupplierInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSupplierInfoMapper.xml
index fe8d399..e8ce7ef 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSupplierInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSupplierInfoMapper.xml
@@ -48,28 +48,28 @@
         SELECT *
         FROM biz_resource_supplier_info
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.supplierNo != null and request.supplierNo !=''">
+        <if test="request != null and request.supplierNo != null and request.supplierNo !=''">
             and supplier_no like concat('%',#{request.supplierNo},'%')
         </if>
-        <if test="request.supplierName != null and request.supplierName !=''">
+        <if test="request != null and request.supplierName != null and request.supplierName !=''">
             and supplier_name like concat('%',#{request.supplierName},'%')
         </if>
-        <if test="request.director != null and request.director !=''">
+        <if test="request != null and request.director != null and request.director !=''">
             and director like concat('%',#{request.director},'%')
         </if>
-        <if test="request.supplierType != null and request.supplierType !=''">
+        <if test="request != null and request.supplierType != null and request.supplierType !=''">
             and supplier_type = #{request.supplierType}
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/EnvLocationInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/EnvLocationInfoMapper.xml
new file mode 100644
index 0000000..68bcf10
--- /dev/null
+++ b/casic-metering-dao/src/main/resources/mapper/resource/EnvLocationInfoMapper.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.mapper.resource.EnvLocationInfoMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.resource.EnvLocationInfo">
+        <id column="id" property="id" />
+        <result column="location_no" property="locationNo" />
+        <result column="location_name" property="locationName" />
+        <result column="location_position" property="locationPosition" />
+        <result column="create_user_id" property="createUserId" />
+        <result column="create_user" property="createUser" />
+        <result column="create_time" property="createTime" />
+        <result column="update_time" property="updateTime" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, location_no, location_name, location_position, create_user_id, create_user, create_time, update_time
+    </sql>
+
+    <select id="selectLocationListPage" resultType="com.casic.missiles.dto.resource.environment.LocationListResponse">
+        SELECT *
+        FROM env_location_info
+        WHERE 1=1
+        <if test="request.locationNo != null and request.locationNo !=''">
+            AND location_no LIKE concat('%',#{request.locationNo},'%')
+        </if>
+        <if test="request.locationName != null and request.locationName !=''">
+            AND location_name LIKE concat('%',#{request.locationName},'%')
+        </if>
+        ORDER BY create_time DESC
+    </select>
+
+</mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml
index b28c18f..8854047 100644
--- a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml
@@ -11,7 +11,6 @@
         <result column="sign_desc" property="signDesc" />
         <result column="sign_director" property="signDirector" />
         <result column="sign_user_id" property="signUserId" />
-        <result column="sign_type" property="signType" />
         <result column="minio_file_name" property="minioFileName" />
         <result column="create_time" property="createTime" />
         <result column="update_time" property="updateTime" />
@@ -28,7 +27,6 @@
         <result column="sign_name" property="signName" />
         <result column="sign_desc" property="signDesc" />
         <result column="sign_director" property="signDirector" />
-        <result column="sign_type" property="signType" />
         <result column="sign_user_id" property="signUserId" />
         <result column="minio_file_name" property="minioFileName" />
         <result column="create_time" property="createTime" />
@@ -62,4 +60,58 @@
         JOIN system_sign_user_relation ssur ON ss.id = ssur.sign_id
         WHERE ssur.user_id = #{userId}
     </select>
+
+    <select id="selectSignListPage" resultMap="BaseResultMap">
+        SELECT ss.*, sd.SIMPLE_NAME AS deptName
+        FROM system_sign ss
+        LEFT JOIN sys_user su ON su.id = ss.sign_user_id
+        LEFT JOIN sys_dept sd ON sd.id = su.dept_id
+        WHERE 1=1
+        <if test="request.signNo != null and request.signNo !=''">
+            AND ss.sign_no LIKE concat('%',#{request.signNo},'%')
+        </if>
+        <if test="request.signName != null and request.signName !=''">
+            AND ss.sign_name LIKE concat('%',#{request.signName},'%')
+        </if>
+        <if test="request.signDirector != null and request.signDirector !=''">
+            AND ss.sign_director LIKE concat('%',#{request.signDirector},'%')
+        </if>
+        <if test="request.signUserId != null and request.signUserId !=''">
+            AND ss.sign_user_id = #{request.signUserId}
+        </if>
+        <if test="request.createStartTime != null and request.createStartTime !=''">
+            AND DATE_FORMAT(ss.create_time,'%Y-%m-%d') &gt;= DATE_FORMAT(#{request.createStartTime},'%Y-%m-%d')
+        </if>
+        <if test="request.createEndTime != null and request.createEndTime !=''">
+            AND DATE_FORMAT(ss.create_time,'%Y-%m-%d')  &lt;= DATE_FORMAT(#{request.createEndTime},'%Y-%m-%d')
+        </if>
+        ORDER BY ss.create_time DESC
+    </select>
+
+    <select id="selectSignList" resultMap="BaseResultMap">
+        SELECT ss.*, sd.SIMPLE_NAME AS deptName
+        FROM system_sign ss
+        LEFT JOIN sys_user su ON su.id = ss.sign_user_id
+        LEFT JOIN sys_dept sd ON sd.id = su.dept_id
+        WHERE 1=1
+        <if test="request.signNo != null and request.signNo !=''">
+            AND ss.sign_no LIKE concat('%',#{request.signNo},'%')
+        </if>
+        <if test="request.signName != null and request.signName !=''">
+            AND ss.sign_name LIKE concat('%',#{request.signName},'%')
+        </if>
+        <if test="request.signDirector != null and request.signDirector !=''">
+            AND ss.sign_director LIKE concat('%',#{request.signDirector},'%')
+        </if>
+        <if test="request.signUserId != null and request.signUserId !=''">
+            AND ss.sign_user_id = #{request.signUserId}
+        </if>
+        <if test="request.createStartTime != null and request.createStartTime !=''">
+            AND DATE_FORMAT(ss.create_time,'%Y-%m-%d') &gt;= DATE_FORMAT(#{request.createStartTime},'%Y-%m-%d')
+        </if>
+        <if test="request.createEndTime != null and request.createEndTime !=''">
+            AND DATE_FORMAT(ss.create_time,'%Y-%m-%d')  &lt;= DATE_FORMAT(#{request.createEndTime},'%Y-%m-%d')
+        </if>
+        ORDER BY ss.create_time DESC
+    </select>
 </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 515050a..60f530b 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
@@ -47,8 +47,8 @@
     String STORAGE_LOCATION = "bizStorageLocation";
     //计量专业
     String MEASURE_MAJOR = "bizMeasureMajor";
-    //管理状态
-    String MANAGER_STATE = "bizManagerState";
+    //标准装置管理状态
+    String STANDARD_MANAGER_STATE = "bizStandardManagerState";
 
     /**
      * 资源管理 字典code
@@ -95,8 +95,6 @@
     String MEASURE_STATUS = "measureStatus";
     //检定方式
     String MEASURE_TYPE = "measureType";
-    //标识打印标志类型
-    String IDENTIFY_PRINT_TYPE = "bizBusinessIdentify";
     //变更类型
     String REPORT_CHANGE_TYPE = "bizCertChangeType";
     //规模类型
@@ -111,19 +109,24 @@
     String MEASURE_CATEGORY = "measureCategory";
     //检定结果
     String MEASURE_RESULT = "measureResult";
+    //分包原因
+    String OUTSOURCE_REASON = "outsourceReason";
+
+    /**
+     * 系统管理
+     */
+    String TEMPLATE_TYPE = "templateType";
+
 
     /**
      * 标准装置 字典code
      */
     //类别
     String STANDARD_CATEGORY = "standardCategory";
-    //管理状态
-    String STANDARD_MANAGER_STATE = "standardManagerState";
     //标准等级
     String STANDARD_LEVEL = "standardLevel";
     //传递范围
     String STANDARD_TRANSMIT_RANGE = "transmitRange";
-
     //资本来源
     String CAPITAL_SOURCE = "capitalSource";
     //标准装置-申请类型
@@ -148,8 +151,6 @@
     String CERTIFICATE_CLASS = "certificationClass";
     //证书管理-检校专业
     String CALIBRATION_MAJOR = "calibrationMajor";
-    //分包原因
-    String OUTSOURCE_REASON = "outsourceReason";
 
     /**
      * 工作台
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/BaseApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/BaseApprovalListRequest.java
index 73c12c1..80d7424 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/BaseApprovalListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/BaseApprovalListRequest.java
@@ -6,6 +6,7 @@
 
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotEmpty;
+import java.util.List;
 
 /**
  * @Description:
@@ -19,14 +20,14 @@
      * 表单id
      */
     @NotBlank(message = "表单id不能为空")
-    @ApiModelProperty(value = "表单id（流程定义对应的表单id，等价于业务id）", dataType = "String")
+    @ApiModelProperty(value = "表单id（流程定义对应的表单id，等价于业务id），导出接口不用传", dataType = "String")
     private String formId;
 
     /**
      * 审批状态类型，对应ApprovalStatusEnum
      */
     @NotEmpty(message = "审批状态类型不能为空")
-    @ApiModelProperty(value = "审批状态类型code", dataType = "String")
+    @ApiModelProperty(value = "审批状态类型code，导出接口不用传", dataType = "String")
     private String approvalStatus;
 
     @ApiModelProperty(hidden = true)
@@ -34,4 +35,7 @@
 
     @ApiModelProperty(hidden = true)
     private Long createUserId;
+
+    @ApiModelProperty(value = "导出ids", dataType = "List")
+    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificatePrintApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificatePrintApprovalListRequest.java
index b93d1c9..3cc2f4e 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificatePrintApprovalListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificatePrintApprovalListRequest.java
@@ -5,8 +5,6 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import java.util.List;
-
 /**
  * @Description:
  * @Author: wangpeng
@@ -38,7 +36,4 @@
 
     @ApiModelProperty(value = "创建结束时间", dataType = "String")
     private String createTimeEnd;
-
-    @ApiModelProperty(value = "导出ids", dataType = "List")
-    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportApprovalListRequest.java
index 4f7a038..c115847 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportApprovalListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportApprovalListRequest.java
@@ -5,8 +5,6 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import java.util.List;
-
 /**
  * @Description:
  * @Author: wangpeng
@@ -15,6 +13,8 @@
 @ApiModel
 @Data
 public class CertificateReportApprovalListRequest extends BaseApprovalListRequest {
+    @ApiModelProperty(value = "委托方id", dataType = "String")
+    private Long customerId;
 
     @ApiModelProperty(value = "证书报告编号", dataType = "String")
     private String certificateReportNo;
@@ -37,6 +37,4 @@
     @ApiModelProperty(value = "检校结束时间", dataType = "String")
     private String calibrationTimeEnd;
 
-    @ApiModelProperty(value = "导出ids", dataType = "List")
-    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/identify/IdentifyListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/identify/IdentifyListRequest.java
index 1b87ae6..f019203 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/identify/IdentifyListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/identify/IdentifyListRequest.java
@@ -4,6 +4,8 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * @Description:
  * @Author: wangpeng
@@ -26,4 +28,7 @@
 
     @ApiModelProperty(value = "打印结束时间", dataType = "String")
     private String createTimeEnd;
+
+    @ApiModelProperty(value = "导出ids", dataType = "List")
+    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListRequest.java
index 1264883..62415fb 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListRequest.java
@@ -7,6 +7,7 @@
 import lombok.Data;
 
 import javax.validation.constraints.NotBlank;
+import java.util.List;
 
 @Data
 @ApiModel
@@ -37,4 +38,6 @@
     @ApiModelProperty(value = "是否加急（1是0否null全部）", dataType = "Integer")
     private String isUrgent;
 
+    @ApiModelProperty(value = "导出ids", dataType = "List")
+    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListRequest.java
index 5201d7b..499760a 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListRequest.java
@@ -17,6 +17,9 @@
     @ApiModelProperty(value = "任务单编号", dataType = "String")
     private String orderNo;
 
+    @ApiModelProperty(value = "委托方id", dataType = "Long")
+    private Long customerId;
+
     @ApiModelProperty(value = "委托方名称", dataType = "String")
     private String customerName;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OrderSampleDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OrderSampleDTO.java
new file mode 100644
index 0000000..796edc0
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OrderSampleDTO.java
@@ -0,0 +1,19 @@
+package com.casic.missiles.dto.business.outsource;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/8/24 11:38
+ */
+@ApiModel
+@Data
+public class OrderSampleDTO {
+    @ApiModelProperty(value = "任务单id", dataType = "Long")
+    private Long orderId;
+    @ApiModelProperty(value = "受检设备id", dataType = "Long")
+    private Long sampleId;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceAssessApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceAssessApprovalListRequest.java
new file mode 100644
index 0000000..9a930c3
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceAssessApprovalListRequest.java
@@ -0,0 +1,30 @@
+package com.casic.missiles.dto.business.outsource;
+
+import com.casic.missiles.dto.BaseApprovalListRequest;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/8/24 11:01
+ */
+@ApiModel
+@Data
+public class OutsourceAssessApprovalListRequest extends BaseApprovalListRequest {
+    @ApiModelProperty(value = "评审表编号", dataType = "String")
+    private String projectNo;
+
+    @ApiModelProperty(value = "分包机构名称", dataType = "String")
+    private String outsourcerName;
+
+    @ApiModelProperty(value = "申请人", dataType = "String")
+    private String applicantName;
+
+    @ApiModelProperty(value = "申请时间开始", dataType = "String")
+    private String applicantTimeStart;
+
+    @ApiModelProperty(value = "申请时间结束", dataType = "String")
+    private String applicantTimeEnd;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceAssessSaveResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceAssessSaveResponse.java
new file mode 100644
index 0000000..8bf9aad
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceAssessSaveResponse.java
@@ -0,0 +1,20 @@
+package com.casic.missiles.dto.business.outsource;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/8/14 16:17
+ */
+@ApiModel
+@Data
+public class OutsourceAssessSaveResponse {
+    @ApiModelProperty(value = "主键id", dataType = "Long")
+    private Long id;
+
+    @ApiModelProperty(value = "编号", dataType = "String")
+    private String projectNo;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProtocolApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProtocolApprovalListRequest.java
new file mode 100644
index 0000000..0f32331
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProtocolApprovalListRequest.java
@@ -0,0 +1,30 @@
+package com.casic.missiles.dto.business.outsource;
+
+import com.casic.missiles.dto.BaseApprovalListRequest;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/8/24 15:01
+ */
+@ApiModel
+@Data
+public class OutsourceProtocolApprovalListRequest extends BaseApprovalListRequest {
+    @ApiModelProperty(value = "协议书编号", dataType = "String")
+    private String protocolNo;
+
+    @ApiModelProperty(value = "分包方名称", dataType = "String")
+    private String outsourcerName;
+
+    @ApiModelProperty(value = "申请人", dataType = "String")
+    private String applicantName;
+
+    @ApiModelProperty(value = "申请时间开始", dataType = "String")
+    private String applicantTimeStart;
+
+    @ApiModelProperty(value = "申请时间结束", dataType = "String")
+    private String applicantTimeEnd;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProtocolSaveResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProtocolSaveResponse.java
new file mode 100644
index 0000000..e324967
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProtocolSaveResponse.java
@@ -0,0 +1,20 @@
+package com.casic.missiles.dto.business.outsource;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/8/14 16:17
+ */
+@ApiModel
+@Data
+public class OutsourceProtocolSaveResponse {
+    @ApiModelProperty(value = "主键id", dataType = "Long")
+    private Long id;
+
+    @ApiModelProperty(value = "编号", dataType = "String")
+    private String protocolNo;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveApprovalListRequest.java
index f29f4e4..7047c28 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveApprovalListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveApprovalListRequest.java
@@ -5,8 +5,6 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import java.util.List;
-
 /**
  * @Description: 现场检测审批列表请求实体
  * @Author: wangpeng
@@ -30,7 +28,4 @@
     @ApiModelProperty(value = "申请时间结束", dataType = "String")
     private String applyTimeEnd;
 
-    @ApiModelProperty(value = "导出ids", dataType = "List")
-    private List<Long> ids;
-
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveDetailResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveDetailResponse.java
index 1f28752..394c934 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveDetailResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveDetailResponse.java
@@ -12,6 +12,18 @@
     @ApiModelProperty(value = "id，更新/删除使用参数", dataType = "Long")
     private Long id;
 
+    @ApiModelProperty(value = "实验室代码(字典code)", dataType = "String")
+    private String labCode;
+
+    @ApiModelProperty(value = "实验室代码(字典value)", dataType = "String")
+    private String labCodeName;
+
+    @ApiModelProperty(value = "组别代码(字典code)", dataType = "String")
+    private String groupCode;
+
+    @ApiModelProperty(value = "组别代码(字典value)", dataType = "String")
+    private String groupCodeName;
+
     @ApiModelProperty(value = "审批编号", dataType = "String")
     private String siteExecutiveNo;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/environment/LocationListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/environment/LocationListRequest.java
new file mode 100644
index 0000000..13d03c3
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/environment/LocationListRequest.java
@@ -0,0 +1,20 @@
+package com.casic.missiles.dto.resource.environment;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/6/8 13:56
+ */
+@ApiModel
+@Data
+public class LocationListRequest {
+    @ApiModelProperty(value = "地点编号", dataType = "String")
+    private String locationNo;
+
+    @ApiModelProperty(value = "地点名称", dataType = "String")
+    private String locationName;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/environment/LocationListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/environment/LocationListResponse.java
new file mode 100644
index 0000000..4c531af
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/environment/LocationListResponse.java
@@ -0,0 +1,78 @@
+package com.casic.missiles.dto.resource.environment;
+
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
+import com.baomidou.mybatisplus.annotation.TableField;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description: 地点列表响应实体
+ * @Author: wangpeng
+ * @Date: 2023/6/8 13:53
+ */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
+@ApiModel
+@Data
+public class LocationListResponse {
+    @ApiModelProperty(value = "主键id", dataType = "Long")
+    private Long id;
+
+    /**
+     * 地点编号
+     */
+    @ExcelProperty("地点编号")
+    @ApiModelProperty(value = "地点编号", dataType = "String")
+    private String locationNo;
+
+    /**
+     * 地点名称
+     */
+    @ExcelProperty("地点名称")
+    @ApiModelProperty(value = "地点名称", dataType = "String")
+    private String locationName;
+
+    /**
+     * 地点位置
+     */
+    @ExcelProperty("地点位置")
+    @ApiModelProperty(value = "地点位置", dataType = "String")
+    private String locationPosition;
+
+    /**
+     * 创建人id
+     */
+    @ApiModelProperty(value = "创建人id", dataType = "Long")
+    private Long createUserId;
+
+    /**
+     * 创建人
+     */
+    @ExcelProperty("创建人")
+    @ApiModelProperty(value = "创建人", dataType = "String")
+    @TableField("create_user")
+    private String createUser;
+
+    /**
+     * 创建时间
+     */
+    @ExcelProperty("创建时间")
+    @ApiModelProperty(value = "创建时间", dataType = "String")
+    private String createTime;
+
+    /**
+     * 更新时间
+     */
+    @ApiModelProperty(value = "更新时间", dataType = "String")
+    private String updateTime;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertRequest.java
index 9a7f6c6..c827915 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertRequest.java
@@ -4,6 +4,8 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * @Description:
  * @Author: wangpeng
@@ -16,4 +18,7 @@
     private String name;
     @ApiModelProperty(value = "部门名", dataType = "String")
     private String deptName;
+
+    @ApiModelProperty(value = "导出ids", dataType = "List")
+    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertResponse.java
index f78b159..8f2f79e 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertResponse.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.dto.resource.staff;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.casic.missiles.annotation.DictCodeField;
 import com.casic.missiles.constants.MeterDictCode;
 import io.swagger.annotations.ApiModel;
@@ -13,12 +20,18 @@
  * @Author: wangpeng
  * @Date: 2023/7/27 15:13
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @ApiModel
 @Data
 public class StaffCertResponse {
     /**
      * 人员编号
      */
+    @ExcelProperty(value = "人员编号",order = 0)
     @NotEmpty(message = "人员编号不能为空")
     @ApiModelProperty(value = "人员编号", dataType = "String")
     private String staffNo;
@@ -26,6 +39,7 @@
     /**
      * 姓名
      */
+    @ExcelProperty(value = "姓名",order = 1)
     @ApiModelProperty(value = "姓名", dataType = "String")
     private String staffName;
 
@@ -54,6 +68,7 @@
     /**
      * 部门名字
      */
+    @ExcelProperty(value = "工作部门",order = 2)
     @ApiModelProperty(value = "部门名字", dataType = "String")
     private String deptName;
 
@@ -66,6 +81,7 @@
     /**
      * 计量专业
      */
+    @ExcelProperty(value = "计量专业",order = 3)
     @ApiModelProperty(value = "计量专业", dataType = "String")
     private String major;
 
@@ -110,6 +126,7 @@
     /**
      * 证书号
      */
+    @ExcelProperty(value = "证号",order = 4)
     @ApiModelProperty(value = "证书号", dataType = "String")
     private String certNo;
 
@@ -122,12 +139,14 @@
     /**
      * 有效日期
      */
+    @ExcelProperty(value = "证书有效期",order = 6)
     @ApiModelProperty(value = "有效日期", dataType = "String")
     private String effectiveDate;
 
     /**
      * 发放日期
      */
+    @ExcelProperty(value = "发证日期",order = 5)
     @ApiModelProperty(value = "发放日期", dataType = "String")
     private String grantDate;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffListRequest.java
index 7c4afb3..0a1194a 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffListRequest.java
@@ -4,6 +4,8 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * @Description:
  * @Author: wangpeng
@@ -18,4 +20,7 @@
     private String deptName;
     @ApiModelProperty(value = "部门id", dataType = "Long")
     private Long deptId;
+
+    @ApiModelProperty(value = "导出ids", dataType = "List")
+    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/TrainListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/TrainListRequest.java
index f68597b..6321f8b 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/TrainListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/TrainListRequest.java
@@ -14,6 +14,8 @@
 public class TrainListRequest {
     @ApiModelProperty(value = "训练登记表编号", dataType = "String")
     private String trainNo;
+    @ApiModelProperty(value = "值班领导", dataType = "String")
+    private String dutyLeader;
     @ApiModelProperty(value = "创建开始时间", dataType = "String")
     private String createTimeStart;
     @ApiModelProperty(value = "创建结束时间", dataType = "String")
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/SignAddRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/SignAddRequest.java
index 117be34..d71055c 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/SignAddRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/SignAddRequest.java
@@ -43,13 +43,6 @@
     private Long signUserId;
 
     /**
-     * 签章或签名-字典code
-     */
-    @NotBlank(message = "类型不能为空")
-    @ApiModelProperty(value = "签名/签章-字典code", dataType = "String", required = true)
-    private String signType;
-
-    /**
      * minio存储文件名
      */
     @ApiModelProperty(value = "上传文件返回名称", dataType = "String")
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateAddRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateAddRequest.java
index aff1265..6316648 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateAddRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateAddRequest.java
@@ -17,30 +17,28 @@
 @Data
 public class TemplateAddRequest extends BaseSystemRequest {
     /**
-     * 原始记录模板/证书报告模板名称
+     * 模板名称
      */
     @ApiModelProperty(value = "名称", dataType = "String", required = true)
     @NotBlank(message = "名称不能为空")
     private String templateName;
 
     /**
-     * 原始记录模板/证书报告模板描述
+     * 模板描述
      */
     @ApiModelProperty(value = "描述", dataType = "String")
     private String templateDesc;
 
     /**
-     * 原始记录模板/证书报告模板创建人
+     * 创建人
      */
     @ApiModelProperty(value = "创建人", dataType = "String", required = true)
     @NotBlank(message = "创建人不能为空")
     private String templateCreator;
 
-    /**
-     * 原始记录模板/证书报告模板-字典code
-     */
-    @NotBlank(message = "类型不能为空")
-    @ApiModelProperty(value = "原始记录模板/证书报告模板-字典code", dataType = "String", required = true)
+
+    @NotBlank(message = "模板类型不能为空")
+    @ApiModelProperty(value = "模板类型(字典code)", dataType = "String", required = true)
     private String templateType;
 
     /**
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateListRequest.java
index eec5a1e..6d17bbe 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateListRequest.java
@@ -1,11 +1,12 @@
 package com.casic.missiles.dto.system;
 
+import com.casic.missiles.annotation.DictCodeField;
+import com.casic.missiles.constants.MeterDictCode;
 import com.casic.missiles.dto.BaseSystemRequest;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import javax.validation.constraints.NotBlank;
 import java.util.List;
 
 /**
@@ -19,8 +20,8 @@
     /**
      * 类型
      */
-//    @ApiModelProperty(value = "类型-字典code", dataType = "String", required = true)
-    @NotBlank(message = "类型不能为空")
+    @DictCodeField(message = "模板类型不合法", cacheName = MeterDictCode.TEMPLATE_TYPE)
+    @ApiModelProperty(value = "模板类型(字典code)", dataType = "String")
     private String templateType;
 
     /**
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificateChangeApply.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificateChangeApply.java
index 9216308..36923fd 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificateChangeApply.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificateChangeApply.java
@@ -1,11 +1,19 @@
 package com.casic.missiles.model.business;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 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 com.casic.missiles.dto.BaseRequest;
+import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -20,6 +28,12 @@
  * @author wangpeng
  * @since 2023-08-15
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
+@ApiModel
 @Data
 @TableName("biz_business_certificate_change_apply")
 public class BizBusinessCertificateChangeApply extends BaseRequest implements Serializable {
@@ -33,6 +47,7 @@
     /**
      * 申请单编号
      */
+    @ExcelProperty(value = "申请单编号", order = 1)
     @ApiModelProperty(value = "申请单编号", dataType = "String")
     @TableField("change_apply_no")
     private String changeApplyNo;
@@ -40,6 +55,7 @@
     /**
      * 申请单名字
      */
+    @ExcelProperty(value = "申请单名称", order = 2)
     @ApiModelProperty(value = "申请单名字", dataType = "String")
     @TableField("change_apply_name")
     private String changeApplyName;
@@ -54,6 +70,7 @@
     /**
      * 更换证书编号
      */
+    @ExcelProperty(value = "更换证书编号", order = 3)
     @ApiModelProperty(value = "更换证书编号", dataType = "String")
     @TableField("change_report_no")
     private String changeReportNo;
@@ -61,7 +78,8 @@
     /**
      * 更换证书名字
      */
-    @ApiModelProperty(value = "更换证书名字", dataType = "String")
+    @ExcelProperty(value = "更换证书/报告名称", order = 4)
+    @ApiModelProperty(value = "更换证书/报告名称", dataType = "String")
     @TableField("change_report_name")
     private String changeReportName;
 
@@ -73,6 +91,7 @@
     @TableField("change_type")
     private String changeType;
 
+    @ExcelProperty(value = "变更类型", order = 5)
     @ApiModelProperty(value = "变更类型(字典value)", dataType = "String")
     @TableField(exist = false)
     private String changeTypeName;
@@ -142,13 +161,15 @@
     /**
      * 创建用户名字
      */
-    @ApiModelProperty(value = "创建用户名字", dataType = "String")
+    @ExcelProperty(value = "创建人", order = 6)
+    @ApiModelProperty(value = "创建人名字", dataType = "String")
     @TableField("create_user_name")
     private String createUserName;
 
     /**
      * 创建时间
      */
+    @ExcelProperty(value = "创建时间", order = 7)
     @ApiModelProperty(value = "创建时间", dataType = "String")
     @TableField("create_time")
     private String createTime;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificateReport.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificateReport.java
index f01db9e..db06018 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificateReport.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificateReport.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.model.business;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -22,6 +29,11 @@
  * @author wangpeng
  * @since 2023-08-14
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @ApiModel
 @Data
 @TableName("biz_business_certificate_report")
@@ -36,6 +48,7 @@
     /**
      * 证书报告编号
      */
+    @ExcelProperty(value = "证书报告编号", order = 1)
     @ApiModelProperty(value = "证书报告编号", dataType = "String")
     @TableField("certificate_report_no")
     private String certificateReportNo;
@@ -43,6 +56,7 @@
     /**
      * 证书报告名称
      */
+    @ExcelProperty(value = "证书报告名称", order = 2)
     @ApiModelProperty(value = "证书报告名称", dataType = "String")
     @TableField("certificate_report_name")
     private String certificateReportName;
@@ -62,6 +76,7 @@
     @TableField("measure_category")
     private String measureCategory;
 
+    @ExcelProperty(value = "检校类别", order = 6)
     @ApiModelProperty(value = "检校类别(字典value)", dataType = "String")
     @TableField(exist = false)
     private String measureCategoryName;
@@ -69,6 +84,7 @@
     /**
      * 检校时间
      */
+    @ExcelProperty(value = "检校时间", order = 8)
     @ApiModelProperty(value = "检校时间", dataType = "String")
     @TableField("calibration_time")
     private String calibrationTime;
@@ -267,18 +283,22 @@
     @TableField(exist = false)
     private Integer decisionItem;
 
-    @ApiModelProperty(value = "设备样品编号（列表返回参数）", dataType = "String")
+    @ExcelProperty(value = "被检设备统一编号", order = 3)
+    @ApiModelProperty(value = "被检设备统一编号（列表返回参数）", dataType = "String")
     @TableField(exist = false)
     private String sampleNo;
 
-    @ApiModelProperty(value = "设备样品名称（列表返回参数）", dataType = "String")
+    @ExcelProperty(value = "被检设备名称", order = 4)
+    @ApiModelProperty(value = "被检设备名称（列表返回参数）", dataType = "String")
     @TableField(exist = false)
     private String sampleName;
 
-    @ApiModelProperty(value = "设备样品规格型号（列表返回参数）", dataType = "String")
+    @ExcelProperty(value = "规格型号", order = 5)
+    @ApiModelProperty(value = "规格型号（列表返回参数）", dataType = "String")
     @TableField(exist = false)
     private String sampleModel;
 
+    @ExcelProperty(value = "检定员", order = 7)
     @ApiModelProperty(value = "检定员名字（列表返回参数）", dataType = "String")
     @TableField(exist = false)
     private String staffName;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessIdentifyInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessIdentifyInfo.java
index 46bfba5..f1a9bec 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessIdentifyInfo.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessIdentifyInfo.java
@@ -1,10 +1,15 @@
 package com.casic.missiles.model.business;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 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;
 
@@ -20,6 +25,11 @@
  * @author wangpeng
  * @since 2023-08-15
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @Data
 @TableName("biz_business_identify_info")
 public class BizBusinessIdentifyInfo implements Serializable {
@@ -33,6 +43,7 @@
     /**
      * 记录编号
      */
+    @ExcelProperty(value = "记录编号", order = 1)
     @ApiModelProperty(value = "记录编号", dataType = "String")
     @TableField("record_no")
     private String recordNo;
@@ -41,20 +52,15 @@
      * 标志类型(字典code)
      */
     @NotEmpty(message = "标志类型不能为空")
-    @ApiModelProperty(value = "标志类型(字典code)", dataType = "String")
-    @DictCodeField(message = "标志类型不合法", cacheName = MeterDictCode.IDENTIFY_PRINT_TYPE)
+    @ApiModelProperty(value = "标志类型(直接存计量标识/使用状态/校准状态的字典value)", dataType = "String")
     @TableField("identify_type")
     private String identifyType;
 
-    @ApiModelProperty(value = "标志类型(字典value)", dataType = "String")
-    @TableField(exist = false)
-    private String identifyTypeName;
-
     /**
      * 设备id(可以是受检设备/设备台账)
      */
     @NotNull(message = "设备id不能为空")
-    @ApiModelProperty(value = "设备id(可以是受检设备/设备台账)", dataType = "String")
+    @ApiModelProperty(value = "设备id(可以是受检设备/设备台账)", dataType = "Long")
     @TableField("device_id")
     private Long deviceId;
 
@@ -66,29 +72,32 @@
     @TableField("device_type")
     private String deviceType;
 
+    @ExcelProperty(value = "统一编号", order = 3)
     @NotEmpty(message = "设备编号不能为空")
-    @ApiModelProperty(value = "设备编号", dataType = "String")
+    @ApiModelProperty(value = "统一编号", dataType = "String")
     @TableField("device_no")
     private String deviceNo;
 
     /**
      * 设备名字
      */
-    @NotEmpty(message = "设备名字不能为空")
-    @ApiModelProperty(value = "设备名字", dataType = "String")
+    @ExcelProperty(value = "设备名称", order = 4)
+    @NotEmpty(message = "设备名称不能为空")
+    @ApiModelProperty(value = "设备名称", dataType = "String")
     @TableField("device_name")
     private String deviceName;
 
     /**
      * 检定员id
      */
-    @ApiModelProperty(value = "检定员id", dataType = "String")
+    @ApiModelProperty(value = "检定员id", dataType = "Long")
     @TableField("measure_person_id")
     private Long measurePersonId;
 
     /**
      * 检定员名字
      */
+    @ExcelProperty(value = "检定员", order = 5)
     @ApiModelProperty(value = "检定员名字", dataType = "String")
     @TableField("measure_person")
     private String measurePerson;
@@ -103,7 +112,8 @@
     /**
      * 更新时间
      */
-    @ApiModelProperty(value = "更新时间", dataType = "String")
+    @ExcelProperty(value = "打印时间", order = 6)
+    @ApiModelProperty(value = "打印时间", dataType = "String")
     @TableField("update_time")
     private String updateTime;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceAssess.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceAssess.java
index 659d9ca..6720b90 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceAssess.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceAssess.java
@@ -1,11 +1,26 @@
 package com.casic.missiles.model.business;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 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 com.casic.missiles.dto.BaseRequest;
+import com.casic.missiles.dto.business.outsource.OrderSampleDTO;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import javax.validation.constraints.NotEmpty;
 import java.io.Serializable;
+import java.util.List;
 
 /**
  * <p>
@@ -15,146 +30,231 @@
  * @author wangpeng
  * @since 2023-08-16
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
+@ApiModel
 @Data
 @TableName("biz_business_outsource_assess")
-public class BizBusinessOutsourceAssess implements Serializable {
+public class BizBusinessOutsourceAssess extends BaseRequest implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
+    @ApiModelProperty(value = "id，更新/删除使用参数", dataType = "Long")
     @TableId("id")
     private Long id;
 
     /**
      * 评审表编号
      */
+    @ExcelProperty(value = "评审表编号", order = 1)
+    @ApiModelProperty(value = "评审表编号(后台生成)", dataType = "String")
     @TableField("project_no")
     private String projectNo;
 
     /**
      * 评审表名称
      */
+    @ExcelProperty(value = "评审表名称", order = 2)
+    @ApiModelProperty(value = "评审表名称", dataType = "String")
     @TableField("project_name")
     private String projectName;
 
+    @NotEmpty(message = "实验室代码不能为空")
+    @DictCodeField(message = "实验室代码描述不合法", cacheName = MeterDictCode.LAB_CODE)
+    @ApiModelProperty(value = "实验室代码(字典code)", dataType = "String")
+    @TableField("lab_code")
+    private String labCode;
+
+    @ApiModelProperty(value = "实验室代码(字典value)", dataType = "String")
+    @TableField(exist = false)
+    private String labCodeName;
+
+    /**
+     * 组别代码
+     */
+    @NotEmpty(message = "组别代码不能为空")
+    @DictCodeField(message = "组别代码描述不合法", cacheName = MeterDictCode.GROUP_CODE)
+    @ApiModelProperty(value = "组别代码(字典code)", dataType = "String")
+    @TableField("group_code")
+    private String groupCode;
+
+    @ApiModelProperty(value = "组别代码(字典value)", dataType = "String")
+    @TableField(exist = false)
+    private String groupCodeName;
+
     /**
      * 申请人id
      */
+    @ApiModelProperty(value = "申请人id", dataType = "String")
     @TableField("applicant_id")
     private Long applicantId;
 
     /**
      * 申请人名字
      */
+    @ExcelProperty(value = "申请人", order = 5)
+    @ApiModelProperty(value = "申请人", dataType = "String")
     @TableField("applicant_name")
     private String applicantName;
 
     /**
      * 申请时间
      */
+    @ExcelProperty(value = "申请时间", order = 6)
+    @ApiModelProperty(value = "申请时间", dataType = "String")
     @TableField("applicant_time")
     private String applicantTime;
 
     /**
      * 附件(minio存储文件名)
      */
+    @ApiModelProperty(value = "附件(minio存储文件名)", dataType = "String")
     @TableField("minio_file_name")
     private String minioFileName;
 
     /**
      * 备注
      */
+    @ApiModelProperty(value = "备注", dataType = "String")
     @TableField("remark")
     private String remark;
 
     /**
      * 创建人id
      */
+    @ApiModelProperty(value = "创建人id", dataType = "String")
     @TableField("create_user_id")
     private Long createUserId;
 
     /**
      * 创建人名字
      */
+    @ApiModelProperty(value = "创建人名字", dataType = "String")
     @TableField("create_user_name")
     private String createUserName;
 
     /**
      * 分包方id
      */
+    @ApiModelProperty(value = "评审表编号", dataType = "String")
     @TableField("outsourcer_id")
     private Long outsourcerId;
 
     /**
      * 预计开始时间
      */
+    @ApiModelProperty(value = "预计开始时间", dataType = "String")
     @TableField("pre_start_time")
     private String preStartTime;
 
     /**
      * 预计结束时间
      */
+    @ApiModelProperty(value = "预计结束时间", dataType = "String")
     @TableField("pre_end_time")
     private String preEndTime;
 
     /**
      * 分包原因-字典
      */
+    @ApiModelProperty(value = "分包原因(字典code)", dataType = "String")
+    @DictCodeField(message = "分包原因描述不合法", cacheName = MeterDictCode.OUTSOURCE_REASON)
     @TableField("outsource_reason")
     private String outsourceReason;
 
+    @ApiModelProperty(value = "分包原因(字典value)", dataType = "String")
+    @TableField(exist = false)
+    private String outsourceReasonName;
+
     /**
      * 预计费用
      */
+    @ApiModelProperty(value = "预计费用", dataType = "String")
     @TableField("pre_cost")
     private String preCost;
 
     /**
      * 审批状态
      */
+    @ApiModelProperty(value = "审批状态", dataType = "String")
+    @DictCodeField(message = "审批状态描述不合法", cacheName = MeterDictCode.APPROVAL_STATUS)
     @TableField("approval_status")
     private String approvalStatus;
 
     /**
      * 流程实例id
      */
+    @ApiModelProperty(value = "流程实例id", dataType = "String")
     @TableField("process_id")
     private String processId;
 
     /**
      * 实验室认可情况
      */
+    @ApiModelProperty(value = "实验室认可情况", dataType = "String")
     @TableField("approve_situation")
     private String approveSituation;
 
     /**
      * 溯源性
      */
+    @ApiModelProperty(value = "溯源性", dataType = "String")
     @TableField("traceability")
     private String traceability;
 
     /**
      * 测试方法
      */
+    @ApiModelProperty(value = "测试方法", dataType = "String")
     @TableField("test_method")
     private String testMethod;
 
     /**
      * 技术能力
      */
+    @ApiModelProperty(value = "技术能力", dataType = "String")
     @TableField("technique_ability")
     private String techniqueAbility;
 
     /**
      * 创建时间
      */
+    @ApiModelProperty(hidden = true)
     @TableField("create_time")
     private String createTime;
 
     /**
      * 更新时间
      */
+    @ApiModelProperty(hidden = true)
     @TableField("update_time")
     private String updateTime;
 
+    @ApiModelProperty(value = "审批状态类型-字典value", dataType = "String")
+    @TableField(exist = false)
+    private String approvalStatusName;
 
+    @ApiModelProperty(value = "任务id（同意、驳回等操作使用）", dataType = "String")
+    @TableField(exist = false)
+    private String taskId;
+
+    @ApiModelProperty(value = "可选决策项（1同意驳回拒绝 2同意驳回 3同意拒绝，用于待审批列表同意/驳回/拒绝按钮展示）", dataType = "Integer")
+    @TableField(exist = false)
+    private Integer decisionItem;
+
+    @NotEmpty(message = "受检设备信息不能为空")
+    @ApiModelProperty(value = "受检设备id列表（新建使用参数）", dataType = "List")
+    @TableField(exist = false)
+    private List<OrderSampleDTO> orderSampleList;
+
+    @ExcelProperty(value = "分包机构名称", order = 3)
+    @ApiModelProperty(value = "分包机构名称（列表返回参数）", dataType = "String")
+    private String outsourcerName;
+
+    @ExcelProperty(value = "机构负责人", order = 4)
+    @ApiModelProperty(value = "机构负责人（列表返回参数）", dataType = "String")
+    private String director;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceProtocol.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceProtocol.java
new file mode 100644
index 0000000..38df697
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceProtocol.java
@@ -0,0 +1,225 @@
+package com.casic.missiles.model.business;
+
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
+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 com.casic.missiles.dto.BaseRequest;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotEmpty;
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 计量检定业务-分包管理-测试、校准或检定工作分包协议书
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-08-24
+ */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
+@Data
+@TableName("biz_business_outsource_protocol")
+public class BizBusinessOutsourceProtocol extends BaseRequest implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "id，更新/删除使用参数", dataType = "Long")
+    @TableId("id")
+    private Long id;
+
+    /**
+     * 协议书编号
+     */
+    @ExcelProperty(value = "协议书编号", order = 1)
+    @ApiModelProperty(value = "协议书编号(后台生成)", dataType = "String")
+    @TableField("protocol_no")
+    private String protocolNo;
+
+    /**
+     * 协议书名称
+     */
+    @ExcelProperty(value = "协议书名称", order = 2)
+    @ApiModelProperty(value = "协议书名称", dataType = "String")
+    @TableField("project_name")
+    private String projectName;
+
+    @NotEmpty(message = "实验室代码不能为空")
+    @DictCodeField(message = "实验室代码描述不合法", cacheName = MeterDictCode.LAB_CODE)
+    @ApiModelProperty(value = "实验室代码(字典code)", dataType = "String")
+    @TableField("lab_code")
+    private String labCode;
+
+    @ApiModelProperty(value = "实验室代码(字典value)", dataType = "String")
+    @TableField(exist = false)
+    private String labCodeName;
+
+    @NotEmpty(message = "组别代码不能为空")
+    @DictCodeField(message = "组别代码描述不合法", cacheName = MeterDictCode.GROUP_CODE)
+    @ApiModelProperty(value = "组别代码(字典code)", dataType = "String")
+    @TableField("group_code")
+    private String groupCode;
+
+    @ApiModelProperty(value = "组别代码(字典value)", dataType = "String")
+    @TableField(exist = false)
+    private String groupCodeName;
+
+    /**
+     * 分包方id
+     */
+    @ApiModelProperty(value = "分包方id", dataType = "Long")
+    @TableField("outsourcer_id")
+    private Long outsourcerId;
+
+    /**
+     * 其他
+     */
+    @ApiModelProperty(value = "其他", dataType = "String")
+    @TableField("remark")
+    private String remark;
+
+    /**
+     * 分包方编号
+     */
+    @ApiModelProperty(value = "分包方编号(新建不用传)", dataType = "String")
+    @TableField("outsource_no")
+    private String outsourceNo;
+
+    /**
+     * 分包方名称
+     */
+    @ExcelProperty(value = "分包方名称", order = 3)
+    @ApiModelProperty(value = "分包方名称(新建不用传)", dataType = "String")
+    @TableField("outsource_name")
+    private String outsourceName;
+
+    /**
+     * 联系人
+     */
+    @ExcelProperty(value = "联系人", order = 4)
+    @ApiModelProperty(value = "联系人", dataType = "String")
+    @TableField("contacts")
+    private String contacts;
+
+    /**
+     * 电话
+     */
+    @ApiModelProperty(value = "电话", dataType = "String")
+    @TableField("mobile")
+    private String mobile;
+
+    /**
+     * 地址
+     */
+    @ApiModelProperty(value = "地址", dataType = "String")
+    @TableField("address")
+    private String address;
+
+    /**
+     * 要求完成日期
+     */
+    @ApiModelProperty(value = "要求完成日期", dataType = "String")
+    @TableField("require_date")
+    private String requireDate;
+
+    /**
+     * 分包费用(元)
+     */
+    @ApiModelProperty(value = "分包费用(元)", dataType = "String")
+    @TableField("outsource_cost")
+    private Double outsourceCost;
+
+    /**
+     * 分包方负责人
+     */
+    @ApiModelProperty(value = "分包方负责人", dataType = "String")
+    @TableField("director")
+    private String director;
+
+    /**
+     * 分包项目
+     */
+    @ApiModelProperty(value = "分包项目", dataType = "String")
+    @TableField("item")
+    private String item;
+
+    /**
+     * 分包要求
+     */
+    @ApiModelProperty(value = "分包要求", dataType = "String")
+    @TableField("requires")
+    private String requires;
+
+    /**
+     * 创建人id
+     */
+    @ApiModelProperty(hidden = true)
+    @TableField("create_user_id")
+    private Long createUserId;
+
+    /**
+     * 创建人名字
+     */
+    @ExcelProperty(value = "申请人", order = 5)
+    @ApiModelProperty(value = "申请人", dataType = "String")
+    @TableField("create_user_name")
+    private String createUserName;
+
+    /**
+     * 审批状态
+     */
+    @ApiModelProperty(value = "审批状态", dataType = "String")
+    @DictCodeField(message = "审批状态描述不合法", cacheName = MeterDictCode.APPROVAL_STATUS)
+    @TableField("approval_status")
+    private String approvalStatus;
+
+    /**
+     * 流程实例id
+     */
+    @ApiModelProperty(value = "流程实例id", dataType = "String")
+    @TableField("process_id")
+    private String processId;
+
+    /**
+     * 创建时间
+     */
+    @ExcelProperty(value = "申请时间", order = 6)
+    @ApiModelProperty(value = "申请时间", dataType = "String")
+    @TableField("create_time")
+    private String createTime;
+
+    /**
+     * 更新时间
+     */
+    @ApiModelProperty(hidden = true)
+    @TableField("update_time")
+    private String updateTime;
+
+    @ApiModelProperty(value = "审批状态类型-字典value", dataType = "String")
+    @TableField(exist = false)
+    private String approvalStatusName;
+
+    @ApiModelProperty(value = "任务id（同意、驳回等操作使用）", dataType = "String")
+    @TableField(exist = false)
+    private String taskId;
+
+    @ApiModelProperty(value = "可选决策项（1同意驳回拒绝 2同意驳回 3同意拒绝，用于待审批列表同意/驳回/拒绝按钮展示）", dataType = "Integer")
+    @TableField(exist = false)
+    private Integer decisionItem;
+
+
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourcerInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourcerInfo.java
index ec4e997..f9aa69e 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourcerInfo.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourcerInfo.java
@@ -17,6 +17,7 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import javax.validation.constraints.NotEmpty;
 import java.io.Serializable;
 
 /**
@@ -59,6 +60,29 @@
     @TableField("outsourcer_name")
     private String outsourcerName;
 
+    @NotEmpty(message = "实验室代码不能为空")
+    @DictCodeField(message = "实验室代码描述不合法", cacheName = MeterDictCode.LAB_CODE)
+    @ApiModelProperty(value = "实验室代码(字典code)", dataType = "String")
+    @TableField("lab_code")
+    private String labCode;
+
+    @ApiModelProperty(value = "实验室代码(字典value)", dataType = "String")
+    @TableField(exist = false)
+    private String labCodeName;
+
+    /**
+     * 组别代码
+     */
+    @NotEmpty(message = "组别代码不能为空")
+    @DictCodeField(message = "组别代码描述不合法", cacheName = MeterDictCode.GROUP_CODE)
+    @ApiModelProperty(value = "组别代码(字典code)", dataType = "String")
+    @TableField("group_code")
+    private String groupCode;
+
+    @ApiModelProperty(value = "组别代码(字典value)", dataType = "String")
+    @TableField(exist = false)
+    private String groupCodeName;
+
     /**
      * 单位简称
      */
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardInfo.java
index c48eed7..dffdfdd 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardInfo.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardInfo.java
@@ -5,6 +5,7 @@
 import com.baomidou.mybatisplus.annotation.TableName;
 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;
 
@@ -18,6 +19,7 @@
  * @author wangpeng
  * @since 2023-08-04
  */
+@ApiModel
 @Data
 @TableName("biz_equipment_standard_info")
 public class BizEquipmentStandardInfo implements Serializable {
@@ -119,7 +121,7 @@
      * 管理状态(字典code)
      */
     @ApiModelProperty(value = "管理状态(字典code)", dataType = "String")
-    @DictCodeField(message = "管理状态不合法", cacheName = MeterDictCode.MANAGER_STATE)
+    @DictCodeField(message = "管理状态不合法", cacheName = MeterDictCode.STANDARD_MANAGER_STATE)
     @TableField("manage_status")
     private String manageStatus;
 
@@ -151,7 +153,7 @@
     /**
      * 温度(℃)
      */
-    @ApiModelProperty(value = "使用状态(字典code)", dataType = "String")
+    @ApiModelProperty(value = "温度(℃)", dataType = "String")
     @TableField("temperature")
     private Double temperature;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardInfoApproval.java b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardInfoApproval.java
index dbd86ab..9f58d83 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardInfoApproval.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardInfoApproval.java
@@ -150,7 +150,7 @@
      * 管理状态(字典code)
      */
     @ApiModelProperty(value = "管理状态(字典code)", dataType = "String")
-    @DictCodeField(message = "管理状态不合法", cacheName = MeterDictCode.MANAGER_STATE)
+    @DictCodeField(message = "管理状态不合法", cacheName = MeterDictCode.STANDARD_MANAGER_STATE)
     @TableField("manage_status")
     private String manageStatus;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardTechnologyRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardTechnologyRelation.java
index 0e612bd..751f26b 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardTechnologyRelation.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardTechnologyRelation.java
@@ -3,6 +3,7 @@
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -16,6 +17,7 @@
  * @author wangpeng
  * @since 2023-08-04
  */
+@ApiModel
 @Data
 @TableName("biz_equipment_standard_technology_relation")
 public class BizEquipmentStandardTechnologyRelation implements Serializable {
@@ -33,6 +35,10 @@
     @TableField("technology_file_id")
     private Long technologyFileId;
 
+    @ApiModelProperty(value = "依据的技术文件编号", dataType = "String")
+    @TableField("technology_file_no")
+    private String technologyFileNo;
+
     /**
      * 依据的技术文件名称(技术文件中现行测试校准检定方法表文件名字段)
      */
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerInfo.java
index d6e8bed..65cd6bc 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerInfo.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerInfo.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.model.resource;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -21,6 +28,11 @@
  * @author wangpeng
  * @since 2023-08-08
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @ApiModel
 @Data
 @TableName("biz_resource_customer_info")
@@ -35,6 +47,7 @@
     /**
      * 委托方编号
      */
+    @ExcelProperty(value = "委托方编号", order = 1)
     @ApiModelProperty(value = "委托方编号", dataType = "String")
     @TableField("customer_no")
     private String customerNo;
@@ -42,6 +55,7 @@
     /**
      * 委托方名称
      */
+    @ExcelProperty(value = "委托方名称", order = 2)
     @ApiModelProperty(value = "委托方名称(新建时为下拉选择一个受检单位组织的名字，传deptId字段，后端获取名称)", dataType = "String")
     @TableField("customer_name")
     private String customerName;
@@ -63,6 +77,7 @@
     /**
      * 联系人
      */
+    @ExcelProperty(value = "联系人", order = 3)
     @ApiModelProperty(value = "联系人", dataType = "String")
     @TableField("contacts")
     private String contacts;
@@ -70,6 +85,7 @@
     /**
      * 座机电话
      */
+    @ExcelProperty(value = "座机电话", order = 4)
     @ApiModelProperty(value = "座机电话", dataType = "String")
     @TableField("mobile")
     private String mobile;
@@ -77,6 +93,7 @@
     /**
      * 手机号码
      */
+    @ExcelProperty(value = "手机号码", order = 5)
     @ApiModelProperty(value = "手机号码", dataType = "String")
     @TableField("phone")
     private String phone;
@@ -91,6 +108,7 @@
     /**
      * 地址
      */
+    @ExcelProperty(value = "地址", order = 6)
     @ApiModelProperty(value = "地址", dataType = "String")
     @TableField("address")
     private String address;
@@ -141,6 +159,7 @@
     /**
      * 创建时间
      */
+    @ExcelProperty(value = "创建时间", order = 7)
     @ApiModelProperty(value = "创建时间", dataType = "String")
     @TableField("create_time")
     private String createTime;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerSuggestForm.java b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerSuggestForm.java
index 7201bbd..701bf8b 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerSuggestForm.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerSuggestForm.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.model.resource;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -22,6 +29,11 @@
  * @author wangpeng
  * @since 2023-08-08
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @ApiModel
 @Data
 @TableName("biz_resource_customer_suggest_form")
@@ -44,7 +56,8 @@
     /**
      * 委托方名称
      */
-    @ApiModelProperty(value = "委托方名称", dataType = "String")
+    @ExcelProperty(value = "意见反馈单位", order = 2)
+    @ApiModelProperty(value = "意见反馈单位", dataType = "String")
     @TableField("customer_name")
     private String customerName;
 
@@ -59,7 +72,8 @@
     /**
      * 委托方意见反馈部门名称
      */
-    @ApiModelProperty(value = "委托方意见反馈部门名称", dataType = "String")
+    @ExcelProperty(value = "委托方意见反馈部门", order = 3)
+    @ApiModelProperty(value = "委托方意见反馈部门", dataType = "String")
     @TableField("customer_dept_name")
     private String customerDeptName;
 
@@ -73,6 +87,7 @@
     /**
      * 表单编号
      */
+    @ExcelProperty(value = "表单编号", order = 1)
     @ApiModelProperty(value = "表单编号", dataType = "String")
     @TableField("form_no")
     private String formNo;
@@ -111,6 +126,7 @@
     /**
      * 创建人名字
      */
+    @ExcelProperty(value = "创建人", order = 4)
     @ApiModelProperty(value = "创建人名字", dataType = "String")
     @TableField("create_user_name")
     private String createUserName;
@@ -147,6 +163,7 @@
     /**
      * 创建时间
      */
+    @ExcelProperty(value = "创建时间", order = 5)
     @ApiModelProperty(value = "创建时间", dataType = "String")
     @TableField("create_time")
     private String createTime;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSealInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSealInfo.java
index cbf05d7..9bf389d 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSealInfo.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSealInfo.java
@@ -106,6 +106,10 @@
     @TableField("minio_file_name")
     private String minioFileName;
 
+    @ApiModelProperty(value = "minio存储文件url", dataType = "String")
+    @TableField(exist = false)
+    private String minioFileUrl;
+
     @ApiModelProperty(value = "创建时间", dataType = "String")
     @TableField("create_time")
     private String createTime;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSealUseNote.java b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSealUseNote.java
index 3f2d9e8..3ce16a8 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSealUseNote.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSealUseNote.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.model.resource;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -20,6 +27,11 @@
  * @author wangpeng
  * @since 2023-07-28
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @ApiModel
 @Data
 @TableName("biz_resource_seal_use_note")
@@ -34,6 +46,7 @@
     /**
      * 登记表编号
      */
+    @ExcelProperty(value = "申请单编号", order = 1)
     @ApiModelProperty(value = "登记表编号(自动生成)", dataType = "String")
     @TableField("note_form_no")
     private String noteFormNo;
@@ -55,6 +68,7 @@
     /**
      * 申请部门
      */
+    @ExcelProperty(value = "申请部门", order = 5)
     @ApiModelProperty(value = "申请部门", dataType = "String")
     @TableField("apply_dept_name")
     private String applyDeptName;
@@ -69,6 +83,7 @@
     /**
      * 申请人
      */
+    @ExcelProperty(value = "申请人", order = 6)
     @ApiModelProperty(value = "申请人", dataType = "String")
     @TableField("apply_user_name")
     private String applyUserName;
@@ -76,6 +91,7 @@
     /**
      * 申请时间
      */
+    @ExcelProperty(value = "申请时间", order = 7)
     @ApiModelProperty(value = "申请时间(新增自动获取当前时间)", dataType = "String")
     @TableField("apply_time")
     private String applyTime;
@@ -130,6 +146,26 @@
     @TableField("update_time")
     private String updateTime;
 
+    @ExcelProperty(value = "印章名称", order = 2)
+    @ApiModelProperty(value = "印章名称(列表返回参数)", dataType = "String")
+    @TableField(exist = false)
+    private String sealName;
+
+    @DictCodeField(message = "印章类型描述不合法", cacheName = MeterDictCode.SEAL_TYPE)
+    @ApiModelProperty(hidden = true)
+    @TableField(exist = false)
+    private String sealType;
+
+    @ExcelProperty(value = "印章类型", order = 3)
+    @ApiModelProperty(value = "印章类型(列表返回参数)", dataType = "String")
+    @TableField(exist = false)
+    private String sealTypeName;
+
+    @ExcelProperty(value = "批准人", order = 4)
+    @ApiModelProperty(value = "批准人(列表返回参数)", dataType = "String")
+    @TableField(exist = false)
+    private String approverName;
+
     @ApiModelProperty(value = "审批状态类型-字典value", dataType = "String")
     @TableField(exist = false)
     private String approvalStatusName;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceStaffInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceStaffInfo.java
index 5ef995b..41563a1 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceStaffInfo.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceStaffInfo.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.model.resource;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -20,6 +27,11 @@
  * @author wangpeng
  * @since 2023-07-25
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @ApiModel
 @Data
 @TableName("biz_resource_staff_info")
@@ -38,6 +50,7 @@
     /**
      * 人员编号
      */
+    @ExcelProperty(value = "人员编号",order = 0)
     @NotEmpty(message = "人员编号不能为空")
     @ApiModelProperty(value = "人员编号", dataType = "String")
     @TableField("staff_no")
@@ -46,6 +59,7 @@
     /**
      * 姓名
      */
+    @ExcelProperty(value = "姓名",order = 1)
     @ApiModelProperty(value = "姓名", dataType = "String")
     @TableField("staff_name")
     private String staffName;
@@ -152,13 +166,15 @@
     /**
      * 部门名字
      */
-    @ApiModelProperty(value = "部门名字", dataType = "String")
+    @ExcelProperty(value = "工作部门",order = 4)
+    @ApiModelProperty(value = "工作部门", dataType = "String")
     @TableField("dept_name")
     private String deptName;
 
     /**
      * 岗位
      */
+    @ExcelProperty(value = "岗位",order = 2)
     @ApiModelProperty(value = "岗位", dataType = "String")
     @TableField("station")
     private String station;
@@ -166,6 +182,7 @@
     /**
      * 计量专业
      */
+    @ExcelProperty(value = "计量专业",order = 5)
     @ApiModelProperty(value = "计量专业", dataType = "String")
     @TableField("major")
     private String major;
@@ -173,6 +190,7 @@
     /**
      * 证号
      */
+    @ExcelProperty(value = "证号",order = 3)
     @ApiModelProperty(value = "证号", dataType = "String")
     @TableField("certificate_number")
     private String certificateNumber;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSupplierInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSupplierInfo.java
index eb5ef01..a1e2697 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSupplierInfo.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSupplierInfo.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.model.resource;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -20,6 +27,11 @@
  * @author wangpeng
  * @since 2023-07-27
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @ApiModel
 @Data
 @TableName("biz_resource_supplier_info")
@@ -34,6 +46,7 @@
     /**
      * 供方编号
      */
+    @ExcelProperty(value = "供方编号", order = 1)
     @ApiModelProperty(value = "供方编号(自动生成)", dataType = "String")
     @TableField("supplier_no")
     private String supplierNo;
@@ -41,6 +54,7 @@
     /**
      * 供方名称
      */
+    @ExcelProperty(value = "供方名称", order = 2)
     @ApiModelProperty(value = "供方名称", dataType = "String")
     @TableField("supplier_name")
     private String supplierName;
@@ -60,6 +74,7 @@
     @TableField("supplier_type")
     private String supplierType;
 
+    @ExcelProperty(value = "供方类型", order = 3)
     @ApiModelProperty(value = "供方类型(字典value)", dataType = "String")
     @TableField(exist = false)
     private String supplierTypeName;
@@ -109,7 +124,8 @@
     /**
      * 电话
      */
-    @ApiModelProperty(value = "电话", dataType = "String")
+    @ExcelProperty(value = "联系电话", order = 4)
+    @ApiModelProperty(value = "联系电话", dataType = "String")
     @TableField("phone")
     private String phone;
 
@@ -158,6 +174,7 @@
     /**
      * 公司地址-省
      */
+    @ExcelProperty(value = "地址-省", order = 6)
     @ApiModelProperty(value = "公司地址-省", dataType = "String")
     @TableField("company_province_name")
     private String companyProvinceName;
@@ -172,6 +189,7 @@
     /**
      * 公司地址-市
      */
+    @ExcelProperty(value = "地址-市", order = 7)
     @ApiModelProperty(value = "公司地址-市", dataType = "String")
     @TableField("company_city_name")
     private String companyCityName;
@@ -186,6 +204,7 @@
     /**
      * 公司地址-区
      */
+    @ExcelProperty(value = "地址-区", order = 8)
     @ApiModelProperty(value = "公司地址-区", dataType = "String")
     @TableField("company_area_name")
     private String companyAreaName;
@@ -193,6 +212,7 @@
     /**
      * 公司地址-详细地址
      */
+    @ExcelProperty(value = "地址-详细地址", order = 9)
     @ApiModelProperty(value = "公司地址-详细地址", dataType = "String")
     @TableField("company_address")
     private String companyAddress;
@@ -200,6 +220,7 @@
     /**
      * 服务和供应的内容
      */
+    @ExcelProperty(value = "服务和供应的内容", order = 5)
     @ApiModelProperty(value = "服务和供应的内容", dataType = "String")
     @TableField("supplier_content")
     private String supplierContent;
@@ -250,6 +271,7 @@
     /**
      * 创建时间
      */
+    @ExcelProperty(value = "创建时间", order = 9)
     @ApiModelProperty(value = "创建时间", dataType = "String")
     @TableField("create_time")
     private String createTime;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/EnvLocationInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/EnvLocationInfo.java
new file mode 100644
index 0000000..d8e2d7b
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/EnvLocationInfo.java
@@ -0,0 +1,83 @@
+package com.casic.missiles.model.resource;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotEmpty;
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 实验室环境监控系统-设备表
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-06-07
+ */
+@ApiModel
+@Data
+@TableName("env_location_info")
+public class EnvLocationInfo implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "主键id", dataType = "Long")
+    @TableId("id")
+    private Long id;
+
+    /**
+     * 地点编号
+     */
+    @NotEmpty(message = "地点编号不能为空")
+    @ApiModelProperty(value = "地点编号", dataType = "String")
+    @TableField("location_no")
+    private String locationNo;
+
+    /**
+     * 地点名称
+     */
+    @ApiModelProperty(value = "地点名称", dataType = "String")
+    @TableField("location_name")
+    private String locationName;
+
+    /**
+     * 地点位置
+     */
+    @ApiModelProperty(value = "地点位置", dataType = "String")
+    @TableField("location_position")
+    private String locationPosition;
+
+    /**
+     * 创建人id
+     */
+    @ApiModelProperty(value = "创建人id", dataType = "Long")
+    @TableField("create_user_id")
+    private Long createUserId;
+
+    /**
+     * 创建人
+     */
+    @ApiModelProperty(value = "创建人", dataType = "String")
+    @TableField("create_user")
+    private String createUser;
+
+    /**
+     * 创建时间
+     */
+    @ApiModelProperty(value = "创建时间", dataType = "String")
+    @TableField("create_time")
+    private String createTime;
+
+    /**
+     * 更新时间
+     */
+    @ApiModelProperty(value = "更新时间", dataType = "String")
+    @TableField("update_time")
+    private String updateTime;
+
+
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemFileConfig.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemFileConfig.java
index 19e6845..86e569c 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemFileConfig.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemFileConfig.java
@@ -30,7 +30,7 @@
     @ApiModelProperty(value = "系统类别(1业务系统2受检系统3环境系统)", dataType = "Integer")
     @NotNull(message = "系统类别不能为空")
     @TableField("system_type")
-    private Integer systemType;
+    private Integer systemType = 1;
 
     @ApiModelProperty("下载编号")
     @TableField("download_no")
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemNotice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemNotice.java
index e94297d..06ec37d 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemNotice.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemNotice.java
@@ -34,7 +34,7 @@
     @ApiModelProperty(value = "系统类别(1业务系统2受检系统3环境系统)", dataType = "Integer")
     @NotNull(message = "系统类别不能为空")
     @TableField("system_type")
-    private Integer systemType;
+    private Integer systemType = 1;
 
     /**
      * 通知公告编号
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSign.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSign.java
index 6c0d7c9..954f4f8 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSign.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSign.java
@@ -51,7 +51,7 @@
     @ApiModelProperty(value = "系统类别(1业务系统2受检系统3环境系统)", dataType = "Integer")
     @NotNull(message = "系统类别不能为空")
     @TableField("system_type")
-    private Integer systemType;
+    private Integer systemType = 1;
 
     /**
      * 签名编号
@@ -130,4 +130,8 @@
     @TableField(exist = false)
     private List<Long> userIdList;
 
+    @ApiModelProperty(hidden = true)
+    @TableField(exist = false)
+    private String deptName;
+
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemTemplate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemTemplate.java
index 503a457..1d27ebe 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemTemplate.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemTemplate.java
@@ -47,7 +47,7 @@
     @ApiModelProperty(value = "系统类别(1业务系统2受检系统3环境系统)", dataType = "Integer")
     @NotNull(message = "系统类别不能为空")
     @TableField("system_type")
-    private Integer systemType;
+    private Integer systemType = 1;
 
     /**
      * 模板编号
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java
index 8c21cb0..f61e4a8 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java
@@ -32,4 +32,8 @@
     ReturnDTO approvalDelete(ApprovalDeleteRequest request);
 
     ReturnDTO failUpdate(T request);
+
+    List<O> listExport(R request);
+
+    List<O> listExportByIds(List<Long> ids);
 }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java
index 724166f..9bce15b 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java
@@ -157,6 +157,29 @@
         throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
     }
 
+    @Override
+    public List<O> listExport(R request) {
+        request.setCreateUserId(null);
+        request.setApprovalStatus(ApprovalStatusEnum.PASSED);
+        Page<O> page = PageFactory.defaultPage();
+        page.setCurrent(1);
+        page.setSearchCount(false);
+        page.setSize(Integer.MAX_VALUE);
+        Page<O> resultPage = this.baseMapper.selectBatchForApprovalList(page, request, null);
+        return resultPage.getRecords();
+    }
+
+    @Override
+    public List<O> listExportByIds(List<Long> ids) {
+        Page<O> page = PageFactory.defaultPage();
+        page.setCurrent(1);
+        page.setSearchCount(false);
+        page.setSize(Integer.MAX_VALUE);
+        List<String> businessKeys = ids.stream().map(String::valueOf).collect(Collectors.toList());
+        Page<O> resultPage = this.baseMapper.selectBatchForApprovalList(page, null, businessKeys);
+        return resultPage.getRecords();
+    }
+
     protected ReturnDTO updateApprovalStatus(Long id, String processId, String approvalStatus) {
         UpdateWrapper<T> updateWrapper = new UpdateWrapper<>();
         updateWrapper.eq("id", id);
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificatePrintServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificatePrintServiceImpl.java
index f6e4706..3228497 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificatePrintServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificatePrintServiceImpl.java
@@ -162,6 +162,30 @@
         return ReturnUtil.success(printLogMapper.selectList(wrapper));
     }
 
+    @Override
+    public List<CertificatePrintListResponse> listByIds(List<Long> ids) {
+        Page<CertificatePrintListResponse> page = PageFactory.defaultPage();
+        page.setCurrent(1);
+        page.setSearchCount(false);
+        page.setSize(Integer.MAX_VALUE);
+        List<String> businessKeys = ids.stream().map(String::valueOf).collect(Collectors.toList());
+        Page<CertificatePrintListResponse> resultPage = this.baseMapper.selectBatchForApprovalList(page, null, businessKeys);
+        return resultPage.getRecords();
+    }
+
+    @Override
+    public List<CertificatePrintListResponse> list(CertificatePrintApprovalListRequest request) {
+        request.setCreateUserId(null);
+        request.setApprovalStatus(null);
+        request.setPrintStatus(null);
+        Page<CertificatePrintListResponse> page = PageFactory.defaultPage();
+        page.setCurrent(1);
+        page.setSearchCount(false);
+        page.setSize(Integer.MAX_VALUE);
+        Page<CertificatePrintListResponse> resultPage = certificatePrintMapper.selectBatchForApprovalList(page, request, null);
+        return resultPage.getRecords();
+    }
+
     private void savePrintLog(Long id) {
         BizBusinessCertificatePrintLog printLog = new BizBusinessCertificatePrintLog();
         BizBusinessCertificatePrint certificatePrint = certificatePrintMapper.selectById(id);
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificateReportServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificateReportServiceImpl.java
index 457555f..24146be 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificateReportServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificateReportServiceImpl.java
@@ -158,8 +158,8 @@
         QueryWrapper<BizBusinessCertificateMeasureResultData> mWrapper = new QueryWrapper<>();
         mWrapper.eq("report_id", reportId);
         boolean mRemove = certificateMeasureResultDataService.remove(mWrapper);
-        Assert.isFalse(eRemove || mRemove, () -> {
+        if(!eRemove || !mRemove){
             throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
-        });
+        }
     }
 }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessIdentifyInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessIdentifyInfoServiceImpl.java
index 4c8e190..f7e63ca 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessIdentifyInfoServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessIdentifyInfoServiceImpl.java
@@ -1,8 +1,10 @@
 package com.casic.missiles.service.Impl.business;
 
+import cn.hutool.core.date.DateUtil;
 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.core.page.PageFactory;
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.business.identify.IdentifyListRequest;
@@ -14,11 +16,14 @@
 import com.casic.missiles.service.business.IBizBusinessIdentifyInfoService;
 import com.casic.missiles.utils.DictCodeUtils;
 import com.casic.missiles.utils.NumberGeneratorUtil;
+import com.casic.missiles.utils.QRCodeUtil;
 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.List;
+
 /**
  * <p>
  * 计量检定业务-任务计量管理-标识打印 服务实现类
@@ -35,9 +40,9 @@
     @Override
     public Page<BizBusinessIdentifyInfo> identifyListPage(Page<BizBusinessIdentifyInfo> page, IdentifyListRequest request) throws Exception {
         QueryWrapper<BizBusinessIdentifyInfo> wrapper = new QueryWrapper<>();
-        wrapper.eq("identify_type", request.getIdentifyType());
-        wrapper.like("device_no", request.getDeviceNo());
-        wrapper.like("device_name", request.getDeviceName());
+        wrapper.eq(StringUtils.isNotEmpty(request.getIdentifyType()), "identify_type", request.getIdentifyType());
+        wrapper.like(StringUtils.isNotEmpty(request.getDeviceNo()),"device_no", request.getDeviceNo());
+        wrapper.like(StringUtils.isNotEmpty(request.getDeviceName()), "device_name", request.getDeviceName());
         wrapper.apply(StringUtils.isNotBlank(request.getCreateTimeStart()),
                 "{0} <= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getCreateTimeStart().split(" ")[0]);
         wrapper.apply(StringUtils.isNotBlank(request.getCreateTimeEnd()),
@@ -64,8 +69,11 @@
     }
 
     @Override
-    public ReturnDTO updateIdentify(BizBusinessIdentifyInfo identifyInfo) {
-        if(identifyInfoMapper.updateById(identifyInfo) > 0){
+    public ReturnDTO updateIdentify(Long id) {
+        BizBusinessIdentifyInfo info = new BizBusinessIdentifyInfo();
+        info.setId(id);
+        info.setUpdateTime(DateUtil.now());
+        if(identifyInfoMapper.updateById(info) > 0){
             return ReturnUtil.success();
         }
         throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
@@ -79,4 +87,20 @@
         throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
     }
 
+    @Override
+    public List<BizBusinessIdentifyInfo> list(IdentifyListRequest request) throws Exception {
+        Page<BizBusinessIdentifyInfo> page = PageFactory.defaultPage();
+        page.setCurrent(1);
+        page.setSearchCount(false);
+        page.setSize(Integer.MAX_VALUE);
+        Page<BizBusinessIdentifyInfo> resultPage = this.identifyListPage(page, request);
+        return resultPage.getRecords();
+    }
+
+    @Override
+    public ReturnDTO<String> equipmentQrCode(Long id) {
+        String base64QRCode = QRCodeUtil.getBase64QRCode(String.valueOf(id));
+        return ReturnUtil.success(base64QRCode);
+    }
+
 }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOrderInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOrderInfoServiceImpl.java
index 82952ad..d8d2c6a 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOrderInfoServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOrderInfoServiceImpl.java
@@ -35,6 +35,7 @@
 import javax.servlet.http.HttpServletResponse;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 import java.util.stream.Collectors;
 
 /**
@@ -209,13 +210,16 @@
     private QueryWrapper<OrderListResponse> listParamWrapperBuilder(OrderListRequest request) {
         QueryWrapper<OrderListResponse> wrapper = new QueryWrapper<>();
         wrapper.like(StringUtils.isNotBlank(request.getOrderNo()), "order_no", request.getOrderNo());
+        wrapper.like(Objects.nonNull(request.getCustomerId()), "customer_id", request.getCustomerId());
         wrapper.like(StringUtils.isNotBlank(request.getCustomerName()), "customer_name", request.getCustomerName());
         wrapper.like(StringUtils.isNotBlank(request.getDeliverer()), "deliverer", request.getDeliverer());
         wrapper.like(StringUtils.isNotBlank(request.getCreateUserName()), "create_user_name", request.getCreateUserName());
-        wrapper.apply(StringUtils.isNotBlank(request.getCreateStartTime()),
-                "{0} <= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getCreateStartTime().split(" ")[0]);
-        wrapper.apply(StringUtils.isNotBlank(request.getCreateEndTime()),
-                "{0} >= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getCreateEndTime().split(" ")[0]);
+        if(StringUtils.isNotBlank(request.getCreateStartTime())){
+            wrapper.apply("{0} <= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getCreateStartTime().split(" ")[0]);
+        }
+        if(StringUtils.isNotBlank(request.getCreateEndTime())){
+            wrapper.apply("{0} >= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getCreateEndTime().split(" ")[0]);
+        }
         wrapper.orderByDesc("create_time");
         return wrapper;
     }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceAssessServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceAssessServiceImpl.java
index c6af980..ce40138 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceAssessServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceAssessServiceImpl.java
@@ -1,10 +1,33 @@
 package com.casic.missiles.service.Impl.business;
 
-import com.casic.missiles.model.business.BizBusinessOutsourceAssess;
+import cn.hutool.core.lang.Assert;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.casic.missiles.core.model.auth.AuthUser;
+import com.casic.missiles.core.shiro.ShiroKit;
+import com.casic.missiles.dto.BaseApprovalSubmitRequest;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.ReturnUtil;
+import com.casic.missiles.dto.business.outsource.OutsourceAssessApprovalListRequest;
+import com.casic.missiles.dto.business.outsource.OutsourceAssessSaveResponse;
+import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.NoGenerateFileCodeEnum;
+import com.casic.missiles.enums.NoGenerateRecordTypeCodeEnum;
+import com.casic.missiles.enums.system.ApprovalStatusEnum;
+import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.mapper.business.BizBusinessOutsourceAssessMapper;
+import com.casic.missiles.model.business.BizBusinessOutsourceAssess;
+import com.casic.missiles.model.business.BizBusinessOutsourceAssessSampleRelation;
+import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl;
+import com.casic.missiles.service.business.IBizBusinessOutsourceAssessSampleRelationService;
 import com.casic.missiles.service.business.IBizBusinessOutsourceAssessService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.casic.missiles.utils.NoGeneratorUtil;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Objects;
 
 /**
  * <p>
@@ -15,6 +38,103 @@
  * @since 2023-08-16
  */
 @Service
-public class BizBusinessOutsourceAssessServiceImpl extends ServiceImpl<BizBusinessOutsourceAssessMapper, BizBusinessOutsourceAssess> implements IBizBusinessOutsourceAssessService {
+public class BizBusinessOutsourceAssessServiceImpl extends GeneralApprovalServiceImpl<BizBusinessOutsourceAssessMapper, BizBusinessOutsourceAssess, BizBusinessOutsourceAssess, OutsourceAssessApprovalListRequest, BaseApprovalSubmitRequest> implements IBizBusinessOutsourceAssessService {
+    @Autowired
+    private IBizBusinessOutsourceAssessSampleRelationService outsourceAssessSampleRelationService;
 
+    @Override
+    public ReturnDTO<OutsourceAssessSaveResponse> saveOutsourceAssess(BizBusinessOutsourceAssess request) {
+        //生成编号
+        String labCode = request.getLabCode();
+        String groupCode = request.getGroupCode();
+        Long maxNo = this.baseMapper.selectMaxProjectNo();
+        String projectNo = NoGeneratorUtil.getCode(NoGenerateFileCodeEnum.D, labCode, NoGenerateRecordTypeCodeEnum.OUTSOURCE_ACCESS, groupCode, maxNo);
+        request.setCreateUserId(request.getUserId());
+        request.setCreateUserName(request.getUserName());
+        request.setApprovalStatus(ApprovalStatusEnum.DRAFT); //草稿箱状态
+        request.setProjectNo(projectNo);
+        int row = this.baseMapper.insert(request);
+        Assert.isFalse(row <= 0, () -> {
+            throw new BusinessException(BusinessExceptionEnum.OUTSOURCE_ACCESS_SAVE_FAILED);
+        });
+        //关联表
+        saveRelationData(request);
+        OutsourceAssessSaveResponse saveResponse = new OutsourceAssessSaveResponse();
+        saveResponse.setId(request.getId());
+        saveResponse.setProjectNo(projectNo);
+        return ReturnUtil.success(saveResponse);
+    }
+
+    @Override
+    @Transactional
+    public ReturnDTO draftUpdate(BizBusinessOutsourceAssess request) {
+        if (this.baseMapper.updateById(request) > 0) {
+            //关联表删除、增加
+            removeRelationData(request.getId());
+            saveRelationData(request);
+            return ReturnUtil.success();
+        }
+        throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
+    }
+
+    @Override
+    public ReturnDTO draftDelete(Long id) {
+        if (this.baseMapper.deleteById(id) > 0) {
+            //关联表删除
+            removeRelationData(id);
+            return ReturnUtil.success();
+        }
+        throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
+    }
+
+    @Override
+    public ReturnDTO draftBatchDelete(List<Long> ids) {
+        if (this.baseMapper.deleteBatchIds(ids) >= 0) {
+            ids.forEach(id -> removeRelationData(id));
+            return ReturnUtil.success();
+        }
+        throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
+    }
+
+    @Override
+    @Transactional
+    public ReturnDTO failUpdate(BizBusinessOutsourceAssess request) {
+        AuthUser user = ShiroKit.getUser();
+        Assert.isFalse(Objects.isNull(user), () -> {
+            throw new BusinessException(BusinessExceptionEnum.LOGIN_USER_ACQUIRE_FAILED);
+        });
+        request.setApprovalStatus(ApprovalStatusEnum.IN_APPROVED);
+        if (this.baseMapper.updateById(request) > 0) {
+            //关联表删除、增加
+            removeRelationData(request.getId());
+            saveRelationData(request);
+            baseApprovalService.failUpdate(request.getProcessId());
+            return ReturnUtil.success();
+        }
+        throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
+    }
+
+    private void saveRelationData(BizBusinessOutsourceAssess request) {
+        List<BizBusinessOutsourceAssessSampleRelation> sampleRelations = new ArrayList<>();
+        request.getOrderSampleList().forEach(dto -> {
+            BizBusinessOutsourceAssessSampleRelation relation = new BizBusinessOutsourceAssessSampleRelation();
+            relation.setOrderId(dto.getOrderId());
+            relation.setSampleId(dto.getSampleId());
+            relation.setAccessId(request.getId());
+            sampleRelations.add(relation);
+        });
+        if(outsourceAssessSampleRelationService.saveBatch(sampleRelations)){
+            return;
+        }
+        throw new BusinessException(BusinessExceptionEnum.OUTSOURCE_ACCESS_SAVE_FAILED);
+    }
+
+    private void removeRelationData(Long assessId) {
+        QueryWrapper<BizBusinessOutsourceAssessSampleRelation> wrapper = new QueryWrapper<>();
+        wrapper.eq("access_id", assessId);
+        if(outsourceAssessSampleRelationService.remove(wrapper)){
+            return;
+        }
+        throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
+    }
 }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceProtocolServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceProtocolServiceImpl.java
new file mode 100644
index 0000000..821e728
--- /dev/null
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceProtocolServiceImpl.java
@@ -0,0 +1,60 @@
+package com.casic.missiles.service.Impl.business;
+
+import cn.hutool.core.lang.Assert;
+import com.casic.missiles.dto.BaseApprovalSubmitRequest;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.ReturnUtil;
+import com.casic.missiles.dto.business.outsource.OutsourceProtocolApprovalListRequest;
+import com.casic.missiles.dto.business.outsource.OutsourceProtocolSaveResponse;
+import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.NoGenerateFileCodeEnum;
+import com.casic.missiles.enums.NoGenerateRecordTypeCodeEnum;
+import com.casic.missiles.enums.system.ApprovalStatusEnum;
+import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.mapper.business.BizBusinessOutsourceProtocolMapper;
+import com.casic.missiles.mapper.business.BizBusinessOutsourcerInfoMapper;
+import com.casic.missiles.model.business.BizBusinessOutsourceProtocol;
+import com.casic.missiles.model.business.BizBusinessOutsourcerInfo;
+import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl;
+import com.casic.missiles.service.business.IBizBusinessOutsourceProtocolService;
+import com.casic.missiles.utils.NoGeneratorUtil;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 计量检定业务-分包管理-测试、校准或检定工作分包协议书 服务实现类
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-08-24
+ */
+@Service
+public class BizBusinessOutsourceProtocolServiceImpl extends GeneralApprovalServiceImpl<BizBusinessOutsourceProtocolMapper, BizBusinessOutsourceProtocol, BizBusinessOutsourceProtocol, OutsourceProtocolApprovalListRequest, BaseApprovalSubmitRequest> implements IBizBusinessOutsourceProtocolService {
+    @Autowired
+    private BizBusinessOutsourcerInfoMapper outsourcerInfoMapper;
+
+    @Override
+    public ReturnDTO<OutsourceProtocolSaveResponse> saveOutsourceProtocol(BizBusinessOutsourceProtocol request) {
+        //生成编号
+        String labCode = request.getLabCode();
+        String groupCode = request.getGroupCode();
+        Long maxNo = this.baseMapper.selectMaxProtocolNo();
+        String protocolNo = NoGeneratorUtil.getCode(NoGenerateFileCodeEnum.D, labCode, NoGenerateRecordTypeCodeEnum.OUTSOURCE_PROTOCOL, groupCode, maxNo);
+        request.setCreateUserId(request.getUserId());
+        request.setCreateUserName(request.getUserName());
+        request.setApprovalStatus(ApprovalStatusEnum.DRAFT); //草稿箱状态
+        request.setProtocolNo(protocolNo);
+        BizBusinessOutsourcerInfo outsourcerInfo = outsourcerInfoMapper.selectById(request.getOutsourcerId());
+        request.setOutsourceNo(outsourcerInfo.getOutsourcerNo());
+        request.setOutsourceName(outsourcerInfo.getOutsourcerName());
+        int row = this.baseMapper.insert(request);
+        Assert.isFalse(row <= 0, () -> {
+            throw new BusinessException(BusinessExceptionEnum.OUTSOURCE_PROTOCOL_SAVE_FAILED);
+        });
+        OutsourceProtocolSaveResponse saveResponse = new OutsourceProtocolSaveResponse();
+        saveResponse.setId(request.getId());
+        saveResponse.setProtocolNo(protocolNo);
+        return ReturnUtil.success(saveResponse);
+    }
+}
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourcerInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourcerInfoServiceImpl.java
index 75f639d..8aadad7 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourcerInfoServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourcerInfoServiceImpl.java
@@ -3,12 +3,12 @@
 import cn.hutool.core.lang.Assert;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.dto.*;
 import com.casic.missiles.dto.business.outsource.OutsourcerInfoApprovalListRequest;
 import com.casic.missiles.dto.business.outsource.OutsourcerSaveResponse;
 import com.casic.missiles.enums.BusinessExceptionEnum;
-import com.casic.missiles.enums.PrefixCodeEnum;
+import com.casic.missiles.enums.NoGenerateFileCodeEnum;
+import com.casic.missiles.enums.NoGenerateRecordTypeCodeEnum;
 import com.casic.missiles.enums.system.ApprovalStatusEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.mapper.business.BizBusinessOutsourcerInfoMapper;
@@ -20,7 +20,7 @@
 import com.casic.missiles.service.business.IBizBusinessOutsourcerInfoService;
 import com.casic.missiles.service.business.IBizBusinessOutsourcerUserInfoService;
 import com.casic.missiles.utils.DictCodeUtils;
-import com.casic.missiles.utils.NumberGeneratorUtil;
+import com.casic.missiles.utils.NoGeneratorUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -42,22 +42,12 @@
     private IBizBusinessOutsourcerUserInfoService outsourcerUserInfoService;
 
     @Override
-    public List<BizBusinessOutsourcerInfo> list(OutsourcerInfoApprovalListRequest request) {
-        request.setCreateUserId(null);
-        request.setApprovalStatus(ApprovalStatusEnum.PASSED);
-        Page<BizBusinessOutsourcerInfo> page = PageFactory.defaultPage();
-        page.setCurrent(1);
-        page.setSearchCount(false);
-        page.setSize(Integer.MAX_VALUE);
-        Page<BizBusinessOutsourcerInfo> resultPage = this.baseMapper.selectBatchForApprovalList(page, request, null);
-        return resultPage.getRecords();
-    }
-
-    @Override
     public ReturnDTO<OutsourcerSaveResponse> saveOutsourcer(BizBusinessOutsourcerInfo request) {
         //生成编号
+        String labCode = request.getLabCode();
+        String groupCode = request.getGroupCode();
         Long maxNo = this.baseMapper.selectMaxNo();
-        String outsourcerNo = NumberGeneratorUtil.getContactNo(PrefixCodeEnum.OUTSOURCER_PREFIX, maxNo);
+        String outsourcerNo = NoGeneratorUtil.getCode(NoGenerateFileCodeEnum.D, labCode, NoGenerateRecordTypeCodeEnum.OUTSOURCE_INFO, groupCode, maxNo);
         request.setOutsourcerNo(outsourcerNo);
         request.setCreateUserId(request.getUserId());
         request.setCreateUserName(request.getUserName());
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessSiteExecutiveInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessSiteExecutiveInfoServiceImpl.java
index ebab3e6..6c6a129 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessSiteExecutiveInfoServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessSiteExecutiveInfoServiceImpl.java
@@ -189,9 +189,9 @@
         QueryWrapper<BizBusinessSiteExecutiveStaffRelation> mWrapper = new QueryWrapper<>();
         mWrapper.eq("site_executive_id", siteExecutiveId);
         boolean mRemove = siteExecutiveStaffRelationService.remove(mWrapper);
-        Assert.isFalse(eRemove || mRemove, () -> {
+        if(!eRemove || !mRemove){
             throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
-        });
+        }
     }
 
     private void doPopulateSiteExecutive(SiteExecutiveDetailResponse detailResponse) {
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessLabExecutiveInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessLabExecutiveInfoServiceImpl.java
index 50c5616..0242fcf 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessLabExecutiveInfoServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessLabExecutiveInfoServiceImpl.java
@@ -297,6 +297,29 @@
     }
 
     @Override
+    public List<SampleLabExecutiveListResponse> deptLabExecutiveList(SampleLabExecutiveListRequest request) throws Exception {
+        Page<SampleLabExecutiveListResponse> page = PageFactory.defaultPage();
+        page.setCurrent(1);
+        page.setSearchCount(false);
+        page.setSize(Integer.MAX_VALUE);
+        Page<SampleLabExecutiveListResponse> resultPage = this.deptLabExecutiveListPage(page, request);
+        return resultPage.getRecords();
+    }
+
+    @Override
+    public List<SampleLabExecutiveListResponse> deptLabExecutiveListByIds(String measureStatus, List<Long> ids) throws Exception {
+        Page<SampleLabExecutiveListResponse> page = PageFactory.defaultPage();
+        page.setCurrent(1);
+        page.setSearchCount(false);
+        page.setSize(Integer.MAX_VALUE);
+        SampleLabExecutiveListRequest request = new SampleLabExecutiveListRequest();
+        request.setIds(ids);
+        request.setMeasureStatus(measureStatus);
+        Page<SampleLabExecutiveListResponse> resultPage = this.deptLabExecutiveListPage(page, request);
+        return resultPage.getRecords();
+    }
+
+    @Override
     public Page<SampleLabExecutiveListResponse> myLabExecutiveListPage(Page<SampleLabExecutiveListResponse> page, SampleLabExecutiveListRequest labExecutiveListRequest) throws Exception{
         AuthUser user = ShiroKit.getUser();
         Assert.isFalse(Objects.isNull(user), () -> {
@@ -350,6 +373,29 @@
     }
 
     @Override
+    public List<SampleLabExecutiveListResponse> myLabExecutiveList(SampleLabExecutiveListRequest request) throws Exception {
+        Page<SampleLabExecutiveListResponse> page = PageFactory.defaultPage();
+        page.setCurrent(1);
+        page.setSearchCount(false);
+        page.setSize(Integer.MAX_VALUE);
+        Page<SampleLabExecutiveListResponse> resultPage = this.myLabExecutiveListPage(page, request);
+        return resultPage.getRecords();
+    }
+
+    @Override
+    public List<SampleLabExecutiveListResponse> myLabExecutiveListByIds(String measureStatus, List<Long> ids) throws Exception {
+        Page<SampleLabExecutiveListResponse> page = PageFactory.defaultPage();
+        page.setCurrent(1);
+        page.setSearchCount(false);
+        page.setSize(Integer.MAX_VALUE);
+        SampleLabExecutiveListRequest request = new SampleLabExecutiveListRequest();
+        request.setIds(ids);
+        request.setMeasureStatus(measureStatus);
+        Page<SampleLabExecutiveListResponse> resultPage = this.myLabExecutiveListPage(page, request);
+        return resultPage.getRecords();
+    }
+
+    @Override
     public List<SampleAmountResponse> myExecutiveAmount() {
         //登录用户id获取计量人员id，实验室检测信息中存储的是计量人员id
         AuthUser user = ShiroKit.getUser();
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentInfoServiceImpl.java
index 864b05e..db8cad4 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentInfoServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentInfoServiceImpl.java
@@ -35,7 +35,6 @@
 import com.casic.missiles.utils.ConvertUtils;
 import com.casic.missiles.utils.DictCodeUtils;
 import com.casic.missiles.utils.NumberGeneratorUtil;
-import org.flowable.engine.RuntimeService;
 import org.flowable.engine.runtime.ProcessInstance;
 import org.jetbrains.annotations.NotNull;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -43,7 +42,6 @@
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
 
-import javax.annotation.Resource;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
@@ -81,8 +79,6 @@
     private IBizEquipmentAttachmentService attachmentService;
     @Autowired
     private IBizEquipmentCheckpointService checkpointService;
-    @Resource
-    private RuntimeService runtimeService;
     @Autowired
     private ApprovalOperateService approvalOperateService;
 
@@ -235,18 +231,18 @@
     private void updateRelationInfo(EquipmentAddRequest request, BizEquipmentInfoApproval equipmentInfoApproval) {
         QueryWrapper<BizEquipmentTechnicalTarget> targetWrapper = new QueryWrapper<>();
         targetWrapper.eq("equipment_no", equipmentInfoApproval.getEquipmentNo());
-        boolean removeTargetFlag = technicalTargetService.remove(targetWrapper);
-        boolean saveTargetFlag = technicalTargetService.saveBatch(request.getTechnicalTargetList());
+        technicalTargetService.remove(targetWrapper);
+        technicalTargetService.saveBatch(request.getTechnicalTargetList());
 
         QueryWrapper<BizEquipmentAttachment> attachmentWrapper = new QueryWrapper<>();
         attachmentWrapper.eq("equipment_no", equipmentInfoApproval.getEquipmentNo());
-        boolean removeAttachmentFlag = attachmentService.remove(attachmentWrapper);
-        boolean saveAttachmentFlag = attachmentService.saveBatch(request.getAttachmentList());
+        attachmentService.remove(attachmentWrapper);
+        attachmentService.saveBatch(request.getAttachmentList());
 
         QueryWrapper<BizEquipmentCheckpoint> checkpointWrapper = new QueryWrapper<>();
         checkpointWrapper.eq("equipment_no", equipmentInfoApproval.getEquipmentNo());
-        boolean removeCheckpointFlag = checkpointService.remove(checkpointWrapper);
-        boolean saveCheckpointFlag = checkpointService.saveBatch(request.getCheckpointList());
+        checkpointService.remove(checkpointWrapper);
+        checkpointService.saveBatch(request.getCheckpointList());
     }
 
     @Override
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardInfoServiceImpl.java
index faff1ae..c50a5b3 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardInfoServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardInfoServiceImpl.java
@@ -22,7 +22,9 @@
 import com.casic.missiles.mapper.equipment.BizEquipmentStandardInfoMapper;
 import com.casic.missiles.mapper.equipment.BizEquipmentStandardTechnologyRelationMapper;
 import com.casic.missiles.mapper.resource.BizResourceStaffInfoMapper;
-import com.casic.missiles.model.equipment.*;
+import com.casic.missiles.model.equipment.BizEquipmentStandardInfo;
+import com.casic.missiles.model.equipment.BizEquipmentStandardInfoApproval;
+import com.casic.missiles.model.equipment.BizEquipmentStandardTechnologyRelation;
 import com.casic.missiles.model.resource.BizResourceStaffInfo;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.dao.DeptMapper;
@@ -33,14 +35,12 @@
 import com.casic.missiles.service.flowable.ApprovalOperateService;
 import com.casic.missiles.utils.ConvertUtils;
 import com.casic.missiles.utils.DictCodeUtils;
-import org.flowable.engine.RuntimeService;
 import org.flowable.engine.runtime.ProcessInstance;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
 
-import javax.annotation.Resource;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
@@ -62,8 +62,6 @@
     private BizResourceStaffInfoMapper staffInfoMapper;
     @Autowired
     private IBaseApprovalService baseApprovalService;
-    @Resource
-    private RuntimeService runtimeService;
     @Autowired
     private ApprovalOperateService approvalOperateService;
     @Autowired
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSealInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSealInfoServiceImpl.java
index 7c91fa2..00040d6 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSealInfoServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSealInfoServiceImpl.java
@@ -15,6 +15,7 @@
 import com.casic.missiles.modular.system.model.User;
 import com.casic.missiles.service.resource.IBizResourceSealInfoService;
 import com.casic.missiles.utils.DictCodeUtils;
+import com.casic.missiles.utils.MinioUtil;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -33,6 +34,8 @@
     private BizResourceSealInfoMapper sealInfoMapper;
     @Autowired
     private UserMapper userMapper;
+    @Autowired
+    private MinioUtil minioUtil;
 
     @Override
     public Page<BizResourceSealInfo> listPage(Page<BizResourceSealInfo> page, SealInfoListRequest request) throws Exception {
@@ -44,6 +47,7 @@
         Page<BizResourceSealInfo> sealInfoPage = sealInfoMapper.selectPage(page, wrapper);
         for (BizResourceSealInfo record : sealInfoPage.getRecords()) {
             DictCodeUtils.convertDictCodeToName(record);
+            record.setMinioFileUrl(minioUtil.getFileUrl(record.getMinioFileName()));
         }
         return sealInfoPage;
     }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceStaffInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceStaffInfoServiceImpl.java
index f058cf5..09203ac 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceStaffInfoServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceStaffInfoServiceImpl.java
@@ -3,6 +3,7 @@
 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.core.page.PageFactory;
 import com.casic.missiles.dto.IdDTO;
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
@@ -86,6 +87,13 @@
     }
 
     @Override
+    public List<BizResourceStaffInfo> list(StaffListRequest request) throws Exception {
+        Page<BizResourceStaffInfo> page = PageFactory.defaultPage();
+        Page<BizResourceStaffInfo> staffInfoPage = this.listPage(page, request);
+        return staffInfoPage.getRecords();
+    }
+
+    @Override
     @Transactional
     public ReturnDTO<IdDTO> staffBaseAdd(BizResourceStaffInfo staffInfo) {
         //登录账号查重
@@ -495,6 +503,28 @@
         return certResponsePage;
     }
 
+    @Override
+    public List<StaffCertResponse> certListByIds(List<Long> ids) throws Exception {
+        Page<StaffCertResponse> page = PageFactory.defaultPage();
+        page.setCurrent(1);
+        page.setSearchCount(false);
+        page.setSize(Integer.MAX_VALUE);
+        StaffCertRequest request = new StaffCertRequest();
+        request.setIds(ids);
+        Page<StaffCertResponse> resultPage = this.certListPage(page, request);
+        return resultPage.getRecords();
+    }
+
+    @Override
+    public List<StaffCertResponse> certList(StaffCertRequest request) throws Exception {
+        Page<StaffCertResponse> page = PageFactory.defaultPage();
+        page.setCurrent(1);
+        page.setSearchCount(false);
+        page.setSize(Integer.MAX_VALUE);
+        Page<StaffCertResponse> resultPage = this.certListPage(page, request);
+        return resultPage.getRecords();
+    }
+
     @Async
     public void deleteRelationInfo(Long staffId){
         QueryWrapper<BizResourceStaffEducation> educationWrapper = new QueryWrapper<>();
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceStaffVerifierServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceStaffVerifierServiceImpl.java
index 8ac7eee..b508d45 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceStaffVerifierServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceStaffVerifierServiceImpl.java
@@ -52,8 +52,8 @@
     private WebSocket webSocket;
 
     @Override
-    public ReturnDTO expirationReminder(IdDTO idDto) {
-        BizResourceStaffVerifier staffVerifier = verifierMapper.selectById(idDto.getId());
+    public ReturnDTO expirationReminder(IdDTO idDTO) {
+        BizResourceStaffVerifier staffVerifier = verifierMapper.selectById(idDTO.getId());
         BizResourceStaffInfo staffInfo = staffInfoMapper.selectById(staffVerifier.getStaffId());
         QueryWrapper<User> wrapper = new QueryWrapper<>();
         wrapper.eq("account", staffInfo.getAccount());
@@ -65,7 +65,7 @@
         Assert.isFalse(Objects.isNull(user), () -> {
             throw new BusinessException(BusinessExceptionEnum.LOGIN_USER_ACQUIRE_FAILED);
         });
-        WorkbenchRemindMessage remindMessage = new WorkbenchRemindMessage(userInfo.getId(), userInfo.getDeptId(), idDto.getId(), staffVerifier.getCertNo(), MessageTypeEnum.STAFF_CERT.getCode(), MessageSourceModuleEnum.RESOURCE.getCode(), MessageTypeEnum.STAFF_CERT.getValue(), MessageTypeEnum.STAFF_CERT.getValue(), staffVerifier.getCertName(),0, user.getId(), user.getName());
+        WorkbenchRemindMessage remindMessage = new WorkbenchRemindMessage(userInfo.getId(), userInfo.getDeptId(), idDTO.getId(), staffVerifier.getCertNo(), MessageTypeEnum.STAFF_CERT.getCode(), MessageSourceModuleEnum.RESOURCE.getCode(), MessageTypeEnum.STAFF_CERT.getValue(), MessageTypeEnum.STAFF_CERT.getValue(), staffVerifier.getCertName(),0, user.getId(), user.getName());
         if(messageMapper.insert(remindMessage) > 0){
             // 新增到消息列表后向用户推送消息
             webSocket.sendOneMessage(String.valueOf(userInfo.getId()), JSONObject.toJSONString(remindMessage));
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceTrainInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceTrainInfoServiceImpl.java
index c1d6308..3a533f2 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceTrainInfoServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceTrainInfoServiceImpl.java
@@ -44,11 +44,14 @@
     @Override
     public Page<BizResourceTrainInfo> listPage(Page<BizResourceTrainInfo> page, TrainListRequest request) throws Exception {
         QueryWrapper<BizResourceTrainInfo> wrapper = new QueryWrapper<>();
-        wrapper.like("train_no", request.getTrainNo());
-        wrapper.apply(StringUtils.isNotBlank(request.getCreateTimeStart()),//apply方法传入参数名不能为空
-                "{0} <= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getCreateTimeStart().split(" ")[0]);
-        wrapper.apply(StringUtils.isNotBlank(request.getCreateTimeEnd()),
-                "{0} >= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getCreateTimeEnd().split(" ")[0]);
+        wrapper.like(StringUtils.isNotEmpty(request.getTrainNo()), "train_no", request.getTrainNo());
+        wrapper.like(StringUtils.isNotEmpty(request.getDutyLeader()),"duty_leader", request.getDutyLeader());
+        if(StringUtils.isNotBlank(request.getCreateTimeStart())){
+            wrapper.apply("{0} <= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getCreateTimeStart().split(" ")[0]);
+        }
+        if(StringUtils.isNotBlank(request.getCreateTimeEnd())){
+            wrapper.apply("{0} >= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getCreateTimeEnd().split(" ")[0]);
+        }
         wrapper.orderByDesc("create_time");
         Page<BizResourceTrainInfo> trainInfoPage = trainInfoMapper.selectPage(page, wrapper);
         for (BizResourceTrainInfo record : trainInfoPage.getRecords()) {
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/EnvLocationInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/EnvLocationInfoServiceImpl.java
new file mode 100644
index 0000000..cdc5742
--- /dev/null
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/EnvLocationInfoServiceImpl.java
@@ -0,0 +1,31 @@
+package com.casic.missiles.service.Impl.resource;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.casic.missiles.dto.resource.environment.LocationListRequest;
+import com.casic.missiles.dto.resource.environment.LocationListResponse;
+import com.casic.missiles.mapper.resource.EnvLocationInfoMapper;
+import com.casic.missiles.model.resource.EnvLocationInfo;
+import com.casic.missiles.service.resource.IEnvLocationInfoService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 实验室环境监控系统-设备表 服务实现类
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-06-07
+ */
+@Service
+public class EnvLocationInfoServiceImpl extends ServiceImpl<EnvLocationInfoMapper, EnvLocationInfo> implements IEnvLocationInfoService {
+    @Autowired
+    private EnvLocationInfoMapper locationInfoMapper;
+
+    @Override
+    public Page<LocationListResponse> listPage(Page<LocationListResponse> page, LocationListRequest request) {
+        Page<LocationListResponse> resultPage = locationInfoMapper.selectLocationListPage(page, request);
+        return resultPage;
+    }
+}
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/DownloadCenterServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/DownloadCenterServiceImpl.java
index c956d24..d9f3282 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/DownloadCenterServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/DownloadCenterServiceImpl.java
@@ -131,10 +131,12 @@
         wrapper.like(StringUtils.isNotBlank(request.getModuleName()), "module_name", request.getModuleName());
         wrapper.like(StringUtils.isNotBlank(request.getFileName()), "file_name", request.getFileName());
         wrapper.like(StringUtils.isNotBlank(request.getFileType()), "file_type", request.getFileType());
-        wrapper.apply(StringUtils.isNotBlank(request.getStartTime()),
-                "{0} <= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getStartTime().split(" ")[0]);
-        wrapper.apply(StringUtils.isNotBlank(request.getEndTime()),
-                "{0} >= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getEndTime().split(" ")[0]);
+        if(StringUtils.isNotBlank(request.getStartTime())){
+            wrapper.apply("{0} <= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getStartTime().split(" ")[0]);
+        }
+        if(StringUtils.isNotBlank(request.getEndTime())){
+            wrapper.apply("{0} >= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getEndTime().split(" ")[0]);
+        }
         wrapper.orderByDesc("create_time");
         return wrapper;
     }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemSignServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemSignServiceImpl.java
index 41976bb..7e90a09 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemSignServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemSignServiceImpl.java
@@ -52,15 +52,14 @@
 
     @Override
     public Page<SystemSign> listPage(Page<SystemSign> page, SignListRequest request) {
-        QueryWrapper<SystemSign> wrapper = getWrapper(request);
-        Page<SystemSign> signPage = signMapper.selectPage(page, wrapper);
+        Page<SystemSign> signPage = signMapper.selectSignListPage(page, request);
         return signPage;
     }
 
     @Override
     public List<SystemSign> list(SignListRequest request) {
-        QueryWrapper<SystemSign> wrapper = getWrapper(request);
-        return signMapper.selectList(wrapper);
+        List<SystemSign> signList = signMapper.selectSignList(request);
+        return signList;
     }
 
     @Override
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessCertificatePrintService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessCertificatePrintService.java
index 03247ab..7d6db77 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessCertificatePrintService.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessCertificatePrintService.java
@@ -9,6 +9,8 @@
 import com.casic.missiles.model.business.BizBusinessCertificatePrintLog;
 import com.casic.missiles.model.business.BizBusinessCertificateReport;
 
+import java.util.List;
+
 /**
  * <p>
  * 计量检定业务-任务计量管理-证书管理 服务类
@@ -30,4 +32,9 @@
     ReturnDTO certificatePrintStatus(Long id, String printStatus);
 
     ReturnDTO<BizBusinessCertificatePrintLog> certificatePrintLog(Long id);
+
+    List<CertificatePrintListResponse> listByIds(List<Long> ids);
+
+    List<CertificatePrintListResponse> list(CertificatePrintApprovalListRequest request);
+
 }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessCertificateReportService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessCertificateReportService.java
index 305ac7f..b33ef22 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessCertificateReportService.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessCertificateReportService.java
@@ -21,6 +21,4 @@
     ReturnDTO<CertificateReportSaveResponse> saveCertificateReport(BizBusinessCertificateReport request);
 
     ReturnDTO<BizBusinessCertificateReport> detail(BaseDetailRequest request);
-
-
 }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessIdentifyInfoService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessIdentifyInfoService.java
index 53c49d0..6d2089f 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessIdentifyInfoService.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessIdentifyInfoService.java
@@ -6,6 +6,8 @@
 import com.casic.missiles.model.business.BizBusinessIdentifyInfo;
 import com.baomidou.mybatisplus.extension.service.IService;
 
+import java.util.List;
+
 /**
  * <p>
  * 计量检定业务-任务计量管理-标识打印 服务类
@@ -20,7 +22,11 @@
 
     ReturnDTO addIdentify(BizBusinessIdentifyInfo identifyInfo);
 
-    ReturnDTO updateIdentify(BizBusinessIdentifyInfo identifyInfo);
+    ReturnDTO updateIdentify(Long id);
 
     ReturnDTO deleteIdentify(Long id);
+
+    List<BizBusinessIdentifyInfo> list(IdentifyListRequest request) throws Exception;
+
+    ReturnDTO<String> equipmentQrCode(Long id);
 }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessOutsourceAssessService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessOutsourceAssessService.java
index 5e15bc8..bcdc791 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessOutsourceAssessService.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessOutsourceAssessService.java
@@ -1,7 +1,11 @@
 package com.casic.missiles.service.business;
 
+import com.casic.missiles.dto.BaseApprovalSubmitRequest;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.business.outsource.OutsourceAssessApprovalListRequest;
+import com.casic.missiles.dto.business.outsource.OutsourceAssessSaveResponse;
 import com.casic.missiles.model.business.BizBusinessOutsourceAssess;
-import com.baomidou.mybatisplus.extension.service.IService;
+import com.casic.missiles.service.IGeneralApprovalService;
 
 /**
  * <p>
@@ -11,6 +15,7 @@
  * @author wangpeng
  * @since 2023-08-16
  */
-public interface IBizBusinessOutsourceAssessService extends IService<BizBusinessOutsourceAssess> {
+public interface IBizBusinessOutsourceAssessService extends IGeneralApprovalService<BizBusinessOutsourceAssess, BizBusinessOutsourceAssess, OutsourceAssessApprovalListRequest, BaseApprovalSubmitRequest> {
 
+    ReturnDTO<OutsourceAssessSaveResponse> saveOutsourceAssess(BizBusinessOutsourceAssess request);
 }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessOutsourceProtocolService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessOutsourceProtocolService.java
new file mode 100644
index 0000000..7f3092b
--- /dev/null
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessOutsourceProtocolService.java
@@ -0,0 +1,21 @@
+package com.casic.missiles.service.business;
+
+import com.casic.missiles.dto.BaseApprovalSubmitRequest;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.business.outsource.OutsourceProtocolApprovalListRequest;
+import com.casic.missiles.dto.business.outsource.OutsourceProtocolSaveResponse;
+import com.casic.missiles.model.business.BizBusinessOutsourceProtocol;
+import com.casic.missiles.service.IGeneralApprovalService;
+
+/**
+ * <p>
+ * 计量检定业务-分包管理-测试、校准或检定工作分包协议书 服务类
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-08-24
+ */
+public interface IBizBusinessOutsourceProtocolService extends IGeneralApprovalService<BizBusinessOutsourceProtocol, BizBusinessOutsourceProtocol, OutsourceProtocolApprovalListRequest, BaseApprovalSubmitRequest> {
+
+    ReturnDTO<OutsourceProtocolSaveResponse> saveOutsourceProtocol(BizBusinessOutsourceProtocol request);
+}
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessOutsourcerInfoService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessOutsourcerInfoService.java
index 9ba656b..b199de4 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessOutsourcerInfoService.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessOutsourcerInfoService.java
@@ -24,8 +24,6 @@
  */
 public interface IBizBusinessOutsourcerInfoService extends IGeneralApprovalService<BizBusinessOutsourcerInfo, BizBusinessOutsourcerInfo, OutsourcerInfoApprovalListRequest, BaseApprovalSubmitRequest> {
 
-    List<BizBusinessOutsourcerInfo> list(OutsourcerInfoApprovalListRequest request);
-
     ReturnDTO<OutsourcerSaveResponse> saveOutsourcer(BizBusinessOutsourcerInfo request);
 
     BizBusinessOutsourcerInfo detail(Long id) throws Exception;
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessLabExecutiveInfoService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessLabExecutiveInfoService.java
index 278c674..f6ed490 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessLabExecutiveInfoService.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessLabExecutiveInfoService.java
@@ -30,8 +30,16 @@
 
     Page<SampleLabExecutiveListResponse> deptLabExecutiveListPage(Page<SampleLabExecutiveListResponse> page, SampleLabExecutiveListRequest labExecutiveListRequest) throws Exception;
 
+    List<SampleLabExecutiveListResponse> deptLabExecutiveList(SampleLabExecutiveListRequest request) throws Exception;
+
+    List<SampleLabExecutiveListResponse> deptLabExecutiveListByIds(String measureStatus, List<Long> ids) throws Exception;
+
     Page<SampleLabExecutiveListResponse> myLabExecutiveListPage(Page<SampleLabExecutiveListResponse> page, SampleLabExecutiveListRequest labExecutiveListRequest) throws Exception;
 
+    List<SampleLabExecutiveListResponse> myLabExecutiveList(SampleLabExecutiveListRequest request) throws Exception;
+
+    List<SampleLabExecutiveListResponse> myLabExecutiveListByIds(String measureStatus, List<Long> ids) throws Exception;
+
     List<SampleAmountResponse> myExecutiveAmount();
 
     ReturnDTO sampleReceive(List<SampleOperateRequest> requestList);
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/OutsourceAssessEventPostProcessor.java b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/OutsourceAssessEventPostProcessor.java
new file mode 100644
index 0000000..cda3086
--- /dev/null
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/OutsourceAssessEventPostProcessor.java
@@ -0,0 +1,46 @@
+package com.casic.missiles.service.listeners.processor;
+
+import cn.hutool.core.lang.Assert;
+import com.casic.missiles.dto.flowable.NotifyEventStatusDTO;
+import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.notifyevent.ActionStatusBeanEnum;
+import com.casic.missiles.enums.system.ApprovalStatusEnum;
+import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.mapper.business.BizBusinessOutsourceAssessMapper;
+import com.casic.missiles.model.business.BizBusinessOutsourceAssess;
+import com.casic.missiles.service.listeners.NotifyEventPostProcessor;
+import com.casic.missiles.utils.SpringContextUtil;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.Objects;
+
+/**
+ * @Description: 测试、校准或检定工作分包评审表审批通过后处理
+ * @Author: wangpeng
+ * @Date: 2023/8/21 13:20
+ */
+@Slf4j
+@Service(ActionStatusBeanEnum.OUTSOURCE_ASSESS_BEAN_NAME)
+public class OutsourceAssessEventPostProcessor implements NotifyEventPostProcessor {
+    @Override
+    @Transactional
+    public void doHandleNotifyEvent(NotifyEventStatusDTO notifyEventStatusDTO) {
+        Long id = Long.valueOf(notifyEventStatusDTO.getId());
+        Assert.isFalse(Objects.isNull(id), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        BizBusinessOutsourceAssessMapper outsourceAssessMapper = SpringContextUtil.getBean(BizBusinessOutsourceAssessMapper.class);
+
+        BizBusinessOutsourceAssess outsourceAssess = new BizBusinessOutsourceAssess();
+        outsourceAssess.setId(id);
+        outsourceAssess.setApprovalStatus(ApprovalStatusEnum.PASSED);
+        int updateFlag = outsourceAssessMapper.updateById(outsourceAssess);
+        if (updateFlag <= 0) {
+            log.error("测试、校准或检定工作分包评审表审批通过后处理失败");
+            throw new BusinessException(BusinessExceptionEnum.APPROVAL_PROCESSOR_HANDLE_FAILED);
+        }
+    }
+
+}
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/OutsourceProtocolEventPostProcessor.java b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/OutsourceProtocolEventPostProcessor.java
new file mode 100644
index 0000000..490c66e
--- /dev/null
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/OutsourceProtocolEventPostProcessor.java
@@ -0,0 +1,46 @@
+package com.casic.missiles.service.listeners.processor;
+
+import cn.hutool.core.lang.Assert;
+import com.casic.missiles.dto.flowable.NotifyEventStatusDTO;
+import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.notifyevent.ActionStatusBeanEnum;
+import com.casic.missiles.enums.system.ApprovalStatusEnum;
+import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.mapper.business.BizBusinessOutsourceProtocolMapper;
+import com.casic.missiles.model.business.BizBusinessOutsourceProtocol;
+import com.casic.missiles.service.listeners.NotifyEventPostProcessor;
+import com.casic.missiles.utils.SpringContextUtil;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.Objects;
+
+/**
+ * @Description: 测试、校准或检定工作分包协议书审批通过后处理
+ * @Author: wangpeng
+ * @Date: 2023/8/21 13:20
+ */
+@Slf4j
+@Service(ActionStatusBeanEnum.OUTSOURCE_PROTOCOL_BEAN_NAME)
+public class OutsourceProtocolEventPostProcessor implements NotifyEventPostProcessor {
+    @Override
+    @Transactional
+    public void doHandleNotifyEvent(NotifyEventStatusDTO notifyEventStatusDTO) {
+        Long id = Long.valueOf(notifyEventStatusDTO.getId());
+        Assert.isFalse(Objects.isNull(id), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        BizBusinessOutsourceProtocolMapper outsourceProtocolMapper = SpringContextUtil.getBean(BizBusinessOutsourceProtocolMapper.class);
+
+        BizBusinessOutsourceProtocol outsourceProtocol = new BizBusinessOutsourceProtocol();
+        outsourceProtocol.setId(id);
+        outsourceProtocol.setApprovalStatus(ApprovalStatusEnum.PASSED);
+        int updateFlag = outsourceProtocolMapper.updateById(outsourceProtocol);
+        if (updateFlag <= 0) {
+            log.error("测试、校准或检定工作分包协议书审批通过后处理失败");
+            throw new BusinessException(BusinessExceptionEnum.APPROVAL_PROCESSOR_HANDLE_FAILED);
+        }
+    }
+
+}
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/SiteExecutiveEventPostProcessor.java b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/SiteExecutiveEventPostProcessor.java
index 6a690d7..4d25ca4 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/SiteExecutiveEventPostProcessor.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/SiteExecutiveEventPostProcessor.java
@@ -38,7 +38,7 @@
         siteExecutiveInfo.setApprovalStatus(ApprovalStatusEnum.PASSED);
         int updateFlag = siteExecutiveInfoMapper.updateById(siteExecutiveInfo);
         if (updateFlag <= 0) {
-            log.error("现场测试、校准或检定审批审批通过后处理失败");
+            log.error("现场测试、校准或检定审批通过后处理失败");
             throw new BusinessException(BusinessExceptionEnum.APPROVAL_PROCESSOR_HANDLE_FAILED);
         }
     }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/resource/IBizResourceStaffInfoService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/resource/IBizResourceStaffInfoService.java
index 7adcf2b..31e7972 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/resource/IBizResourceStaffInfoService.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/resource/IBizResourceStaffInfoService.java
@@ -23,6 +23,8 @@
 
     Page<BizResourceStaffInfo> listPage(Page<BizResourceStaffInfo> page, StaffListRequest request) throws Exception;
 
+    List<BizResourceStaffInfo> list(StaffListRequest request) throws Exception;
+
     BizResourceStaffInfo detail(Long id);
 
     ReturnDTO<IdDTO> staffBaseAdd(BizResourceStaffInfo staffInfo);
@@ -116,4 +118,8 @@
     ReturnDTO verifierBatchDelete(List<Long> ids);
 
     Page<StaffCertResponse> certListPage(Page<StaffCertResponse> page, StaffCertRequest request) throws Exception;
+
+    List<StaffCertResponse> certListByIds(List<Long> ids) throws Exception;
+
+    List<StaffCertResponse> certList(StaffCertRequest request) throws Exception;
 }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/resource/IBizResourceStaffVerifierService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/resource/IBizResourceStaffVerifierService.java
index e2f0431..eb5c1fb 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/resource/IBizResourceStaffVerifierService.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/resource/IBizResourceStaffVerifierService.java
@@ -15,5 +15,5 @@
  */
 public interface IBizResourceStaffVerifierService extends IService<BizResourceStaffVerifier> {
 
-    ReturnDTO expirationReminder(IdDTO idDto);
+    ReturnDTO expirationReminder(IdDTO idDTO);
 }

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java
index bb0c50f..13a699b 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java
@@ -12,6 +12,7 @@
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.IGeneralApprovalService;
+import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
@@ -19,6 +20,7 @@
 import org.springframework.web.bind.annotation.RequestBody;
 
 import javax.validation.Valid;
+import java.util.List;
 import java.util.Objects;
 
 /**
@@ -117,4 +119,17 @@
         }
         return baseApprovalService.failUpdate(request);
     }
+
+    public List<O> exportList(@RequestBody @Valid R request) throws Exception {
+        List<O> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = baseApprovalService.listExportByIds(request.getIds());
+        } else {
+            list = baseApprovalService.listExport(request);
+        }
+        for (O record : list) {
+            DictCodeUtils.convertDictCodeToName(record);
+        }
+        return list;
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java
index 8a90961..d775831 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java
@@ -5,6 +5,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.business.certificate.CertificateChangeApplyApprovalListRequest;
 import com.casic.missiles.dto.business.certificate.CertificateChangeApplySaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessCertificateChangeApply;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
@@ -20,6 +21,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -48,4 +50,12 @@
         }
         return changeApplyService.saveChangeApply(request);
     }
+
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody CertificateChangeApplyApprovalListRequest request) throws Exception {
+        List<BizBusinessCertificateChangeApply> list = super.exportList(request);
+        super.exportExcel(BizBusinessCertificateChangeApply.class, list, ExportEnum.CERTIFICATE_CHANGE_APPLY.getSheetName());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java
index 5fc4b07..af8230e 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java
@@ -9,6 +9,7 @@
 import com.casic.missiles.dto.business.certificate.CertificatePrintApprovalListRequest;
 import com.casic.missiles.dto.business.certificate.CertificatePrintListResponse;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.enums.business.CertificatePrintStatusEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessCertificatePrintLog;
@@ -18,10 +19,16 @@
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.io.IOException;
+import java.util.List;
 import java.util.Objects;
 
 /**
@@ -98,4 +105,16 @@
         });
         return certificatePrintService.certificatePrintLog(idDTO.getId());
     }
+
+    @ApiOperation("证书打印审批导出")
+    @PostMapping("/listExport")
+    public void exportList(@RequestBody CertificatePrintApprovalListRequest request) throws IOException {
+        List<CertificatePrintListResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = certificatePrintService.listByIds(request.getIds());
+        } else {
+            list = certificatePrintService.list(request);
+        }
+        super.exportExcel(CertificatePrintListResponse.class, list, ExportEnum.CERTIFICATE_PRINT.getSheetName());
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java
index 63b06dc..6b2efd5 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java
@@ -6,6 +6,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.business.certificate.CertificateReportApprovalListRequest;
 import com.casic.missiles.dto.business.certificate.CertificateReportSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessCertificateReport;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
@@ -21,6 +22,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -50,7 +52,7 @@
         return certificateReportService.saveCertificateReport(request);
     }
 
-    @ApiOperation("证书审批详情（基本信息）")
+    @ApiOperation("详情（基本信息）")
     @PostMapping("/detail")
     public ReturnDTO<BizBusinessCertificateReport> detail(@RequestBody @Valid BaseDetailRequest request, BindingResult bindingResult) throws Exception {
         if(bindingResult.hasErrors()){
@@ -59,4 +61,11 @@
         return certificateReportService.detail(request);
     }
 
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody CertificateReportApprovalListRequest request) throws Exception {
+        List<BizBusinessCertificateReport> list = super.exportList(request);
+        super.exportExcel(BizBusinessCertificateReport.class, list, ExportEnum.CERTIFICATE_REPORT.getSheetName());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java
index 46b26bd..57c0809 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java
@@ -10,20 +10,21 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.business.identify.IdentifyListRequest;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BizBusinessIdentifyInfo;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.business.IBizBusinessIdentifyInfoService;
+import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import javax.validation.Valid;
+import java.util.List;
 import java.util.Objects;
 
 /**
@@ -57,16 +58,13 @@
         return identifyInfoService.addIdentify(identifyInfo);
     }
 
-    @ApiOperation("标识打印更新")
+    @ApiOperation("标识打印更新（更新打印时间）")
     @PostMapping("/update")
-    public ReturnDTO updateIdentify(@RequestBody @Valid BizBusinessIdentifyInfo identifyInfo, BindingResult bindingResult) {
-        Assert.isFalse(Objects.isNull(identifyInfo.getId()), () -> {
+    public ReturnDTO updateIdentify(@RequestBody @Valid IdDTO idDTO) {
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        Assert.isFalse(bindingResult.hasErrors(), () -> {
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        });
-        return identifyInfoService.updateIdentify(identifyInfo);
+        return identifyInfoService.updateIdentify(idDTO.getId());
     }
 
     @ApiOperation("标识打印删除")
@@ -77,4 +75,37 @@
         });
         return identifyInfoService.deleteIdentify(idDTO.getId());
     }
+
+    @ApiOperation("标识打印导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody @Valid IdentifyListRequest request, BindingResult bindingResult) throws Exception {
+        if (bindingResult.hasErrors()) {
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        List<BizBusinessIdentifyInfo> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = identifyInfoService.listByIds(request.getIds());
+        } else {
+            list = identifyInfoService.list(request);
+        }
+        for (BizBusinessIdentifyInfo record : list) {
+            DictCodeUtils.convertDictCodeToName(record);
+        }
+        super.exportExcel(BizBusinessIdentifyInfo.class, list, ExportEnum.IDENTIFY_EXPORT.getSheetName());
+    }
+
+
+    // TODO: 2023/8/23 查询设备信息，4个底部按钮查设备（按钮的作用就是前端用来调不同接口、用来区分中间即将展示的标识），前端弹窗选设备，在确定保存时前端根据底部按钮判断传入设备类型deviceType字典code
+    // TODO: 2023/8/23 接口：查受检设备（第1个按钮），查设备台账（后3个按钮同一接口），查询之后前端根据标志类型的不同加到中间页面时进行判断（按产品给的对应表）
+    // TODO: 2023/8/23 提供二维码接口，前端在加到中间页面时调用一下
+
+    @ApiOperation("设备二维码")
+    @PostMapping("/equipment/qrCode")
+    public ReturnDTO<String> equipmentQrCode(@RequestBody @Valid IdDTO idDTO) {
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return identifyInfoService.equipmentQrCode(idDTO.getId());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java
index 707be6e..7e0453d 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java
@@ -117,7 +117,7 @@
     }
 
     @ApiOperation("任务单导出")
-    @PostMapping("/export")
+    @PostMapping("/listExport")
     public void orderExport(@RequestBody @Valid OrderListRequest request, HttpServletResponse response) {
         businessOrderService.orderExport(request, response);
     }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java
index 529a6ce..51432be 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java
@@ -1,9 +1,28 @@
 package com.casic.missiles.controller.business;
 
+import com.casic.missiles.controller.GeneralApprovalController;
+import com.casic.missiles.dto.BaseApprovalSubmitRequest;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.business.outsource.OutsourceAssessApprovalListRequest;
+import com.casic.missiles.dto.business.outsource.OutsourceAssessSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
+import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.model.business.BizBusinessOutsourceAssess;
+import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
+import com.casic.missiles.service.IGeneralApprovalService;
+import com.casic.missiles.service.business.IBizBusinessOutsourceAssessService;
 import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.BindingResult;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.validation.Valid;
+import java.util.List;
+
 /**
  * <p>
  * 计量检定业务-分包管理-测试、校准或检定工作分包评审表 前端控制器
@@ -15,6 +34,27 @@
 @Api(tags = "分包管理-测试、校准或检定工作分包评审表")
 @RestController
 @RequestMapping("/business/outsource/assess")
-public class BizBusinessOutsourceAssessController {
+public class BizBusinessOutsourceAssessController extends GeneralApprovalController<BizBusinessOutsourceAssess, BizBusinessOutsourceAssess, OutsourceAssessApprovalListRequest, BaseApprovalSubmitRequest> {
+    @Autowired
+    private IBizBusinessOutsourceAssessService outsourceAssessService;
 
+    public BizBusinessOutsourceAssessController(IGeneralApprovalService<BizBusinessOutsourceAssess, BizBusinessOutsourceAssess, OutsourceAssessApprovalListRequest, BaseApprovalSubmitRequest> baseApprovalService) {
+        super(baseApprovalService);
+    }
+
+    @ApiOperation("草稿箱-保存")
+    @PostMapping("/save")
+    public ReturnDTO<OutsourceAssessSaveResponse> saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceAssess request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        return outsourceAssessService.saveOutsourceAssess(request);
+    }
+
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception {
+        List<BizBusinessOutsourceAssess> list = super.exportList(request);
+        super.exportExcel(BizBusinessOutsourceAssess.class, list, ExportEnum.OUTSOURCE_ASSESS.getSheetName());
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java
new file mode 100644
index 0000000..9adef18
--- /dev/null
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java
@@ -0,0 +1,60 @@
+package com.casic.missiles.controller.business;
+
+import com.casic.missiles.controller.GeneralApprovalController;
+import com.casic.missiles.dto.BaseApprovalSubmitRequest;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.business.outsource.OutsourceProtocolApprovalListRequest;
+import com.casic.missiles.dto.business.outsource.OutsourceProtocolSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
+import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.model.business.BizBusinessOutsourceProtocol;
+import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
+import com.casic.missiles.service.IGeneralApprovalService;
+import com.casic.missiles.service.business.IBizBusinessOutsourceProtocolService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.BindingResult;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.validation.Valid;
+import java.util.List;
+
+/**
+ * <p>
+ * 计量检定业务-分包管理-测试、校准或检定工作分包协议书 前端控制器
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-08-24
+ */
+@Api(tags = "分包管理-测试、校准或检定工作分包协议书")
+@RestController
+@RequestMapping("/business/outsource/protocol")
+public class BizBusinessOutsourceProtocolController extends GeneralApprovalController<BizBusinessOutsourceProtocol, BizBusinessOutsourceProtocol, OutsourceProtocolApprovalListRequest, BaseApprovalSubmitRequest> {
+    @Autowired
+    private IBizBusinessOutsourceProtocolService outsourceProtocolService;
+
+    public BizBusinessOutsourceProtocolController(IGeneralApprovalService<BizBusinessOutsourceProtocol, BizBusinessOutsourceProtocol, OutsourceProtocolApprovalListRequest, BaseApprovalSubmitRequest> baseApprovalService) {
+        super(baseApprovalService);
+    }
+
+    @ApiOperation("草稿箱-保存")
+    @PostMapping("/save")
+    public ReturnDTO<OutsourceProtocolSaveResponse> saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceProtocol request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        return outsourceProtocolService.saveOutsourceProtocol(request);
+    }
+
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody OutsourceProtocolApprovalListRequest request) throws Exception {
+        List<BizBusinessOutsourceProtocol> list = super.exportList(request);
+        super.exportExcel(BizBusinessOutsourceProtocol.class, list, ExportEnum.OUTSOURCE_PROTOCOL.getSheetName());
+    }
+}
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java
index 097f645..f0f0943 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java
@@ -17,7 +17,6 @@
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.IGeneralApprovalService;
 import com.casic.missiles.service.business.IBizBusinessOutsourcerInfoService;
-import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -71,19 +70,8 @@
 
     @ApiOperation("分包方导出")
     @PostMapping("/listExport")
-    public void export(@RequestBody @Valid OutsourcerInfoApprovalListRequest request, BindingResult bindingResult) throws Exception {
-        if (bindingResult.hasErrors()) {
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        }
-        List<BizBusinessOutsourcerInfo> list;
-        if (!CollectionUtils.isEmpty(request.getIds())) {
-            list = outsourcerInfoService.listByIds(request.getIds());
-        } else {
-            list = outsourcerInfoService.list(request);
-        }
-        for (BizBusinessOutsourcerInfo record : list) {
-            DictCodeUtils.convertDictCodeToName(record);
-        }
+    public void export(@RequestBody OutsourcerInfoApprovalListRequest request) throws Exception {
+        List<BizBusinessOutsourcerInfo> list = super.exportList(request);
         super.exportExcel(BizBusinessOutsourcerInfo.class, list, ExportEnum.OUTSOURCER_EXPORT.getSheetName());
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java
index c2cbf9f..0410918 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java
@@ -17,11 +17,9 @@
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.IGeneralApprovalService;
 import com.casic.missiles.service.business.IBizBusinessSiteExecutiveInfoService;
-import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -60,7 +58,7 @@
         return siteExecutiveInfoService.saveSiteExecutiveInfo(siteExecutiveInfo);
     }
 
-    @ApiOperation("现场检测详情")
+    @ApiOperation("详情")
     @PostMapping("/detail")
     public ReturnDTO<SiteExecutiveDetailResponse> siteExecutiveDetail(@RequestBody @Valid IdDTO idDTO) throws Exception {
         Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
@@ -69,21 +67,10 @@
         return ReturnUtil.success(siteExecutiveInfoService.detail(idDTO.getId()));
     }
 
-    @ApiOperation("现场检测导出")
+    @ApiOperation("导出")
     @PostMapping("/listExport")
-    public void export(@RequestBody @Valid SiteExecutiveApprovalListRequest request, BindingResult bindingResult) throws Exception {
-        if (bindingResult.hasErrors()) {
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        }
-        List<SiteExecutiveApprovalListResponse> list;
-        if (!CollectionUtils.isEmpty(request.getIds())) {
-            list = siteExecutiveInfoService.listInfoByIds(request.getIds());
-        } else {
-            list = siteExecutiveInfoService.listInfo(request);
-        }
-        for (SiteExecutiveApprovalListResponse record : list) {
-            DictCodeUtils.convertDictCodeToName(record);
-        }
+    public void export(@RequestBody SiteExecutiveApprovalListRequest request) throws Exception {
+        List<SiteExecutiveApprovalListResponse> list = super.exportList(request);
         super.exportExcel(SiteExecutiveApprovalListResponse.class, list, ExportEnum.SITE_EXECUTIVE_EXPORT.getSheetName());
     }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
index 7e793cd..a92e209 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
@@ -55,7 +55,7 @@
 
     @ApiOperation("设备收发列表导出")
     @PostMapping("/export")
-    public void exportList(@RequestBody @Valid SampleDispatchListRequest request) throws IOException {
+    public void exportList(@RequestBody SampleDispatchListRequest request) throws IOException {
         List<SampleDispatchListResponse> list;
         if (!CollectionUtils.isEmpty(request.getIds())) {
             list = dispatchService.listByIds(request.getIds());
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java
index cdc77fc..d120fd4 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java
@@ -7,6 +7,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.business.labExecutive.*;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.business.IBusinessLabExecutiveInfoService;
@@ -14,6 +15,7 @@
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.*;
 
@@ -32,7 +34,7 @@
     @Autowired
     private IBusinessLabExecutiveInfoService labExecutiveInfoService;
 
-    @ApiOperation("实验室检测-部门检测-查询各状态列表（待检测、检测中、检测完）")
+    @ApiOperation("实验室任务-查询各状态列表（待检测、检测中、检测完）")
     @PostMapping("/deptExecutive/List")
     public ReturnDTO<PageInfoBT<SampleLabExecutiveListResponse>> queryDeptExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
@@ -43,10 +45,19 @@
         return ReturnUtil.success(super.packForBT(labExecutiveInfoService.deptLabExecutiveListPage(page, labExecutiveListRequest)));
     }
 
-    /**
-     * 实验室检测-我的检测-查询各状态列表（待检测、检测中、检测完）
-     */
-    @ApiOperation("实验室检测-我的检测-查询各状态列表（待检测、检测中、检测完）")
+    @ApiOperation("实验室任务导出")
+    @PostMapping("/deptExecutive/export")
+    public void deptExportList(@RequestBody @Valid SampleLabExecutiveListRequest request) throws Exception {
+        List<SampleLabExecutiveListResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = labExecutiveInfoService.deptLabExecutiveListByIds(request.getMeasureStatus(), request.getIds());
+        } else {
+            list = labExecutiveInfoService.deptLabExecutiveList(request);
+        }
+        super.exportExcel(SampleLabExecutiveListResponse.class, list, ExportEnum.DEPT_EXECUTIVE_TASK.getSheetName());
+    }
+
+    @ApiOperation("我的任务-查询各状态列表（待检测、检测中、检测完）")
     @PostMapping("/myExecutive/list")
     public ReturnDTO<PageInfoBT<SampleLabExecutiveListResponse>> queryMyExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
@@ -57,19 +68,25 @@
         return ReturnUtil.success(super.packForBT(labExecutiveInfoService.myLabExecutiveListPage(page, labExecutiveListRequest)));
     }
 
-    /**
-     * 实验室检测-我的检测-查询各状态样品数量（待检测、检测中、检测完）
-     */
-    @ApiOperation("实验室检测-我的检测-查询各状态样品数量（待检测、检测中、检测完）")
+    @ApiOperation("我的任务导出")
+    @PostMapping("/myExecutive/export")
+    public void exportList(@RequestBody @Valid SampleLabExecutiveListRequest request) throws Exception {
+        List<SampleLabExecutiveListResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = labExecutiveInfoService.myLabExecutiveListByIds(request.getMeasureStatus(), request.getIds());
+        } else {
+            list = labExecutiveInfoService.myLabExecutiveList(request);
+        }
+        super.exportExcel(SampleLabExecutiveListResponse.class, list, ExportEnum.MY_EXECUTIVE_TASK.getSheetName());
+    }
+
+    @ApiOperation("我的任务-查询各状态样品数量（待检测、检测中、检测完）")
     @GetMapping("/myExecutive/amount")
     public ReturnDTO<List<SampleAmountResponse>> queryMyExecutiveAmount() {
         return ReturnUtil.success(labExecutiveInfoService.myExecutiveAmount());
     }
 
-    /**
-     * 实验室检测-部门检测-分配（分配给具体人员）
-     */
-    @ApiOperation("实验室检测-部门检测-分配按钮（分配给具体人员）")
+    @ApiOperation("实验室任务-分配按钮（分配给具体人员）")
     @PostMapping("/deptExecutive/allocate")
     public ReturnDTO allocateStaff(@RequestBody @Valid SampleAllocateRequest sampleAllocateRequest, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -78,10 +95,7 @@
         return labExecutiveInfoService.allocateStaff(sampleAllocateRequest);
     }
 
-    /**
-     * 实验室检测-我的检测-检定人扫描收入（待检测->检测中）
-     */
-    @ApiOperation("实验室检测-我的检测-检定人扫描收入（待检测->检测中）")
+    @ApiOperation("我的任务-检定人扫描收入（待检测->检测中）")
     @PostMapping("/myExecutive/receive")
     public ReturnDTO sampleReceive(@RequestBody @Valid List<SampleOperateRequest> requestList, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -90,10 +104,7 @@
         return labExecutiveInfoService.sampleReceive(requestList);
     }
 
-    /**
-     * 实验室检测-负责人/检定人扫描检完（检测中->检测完）
-     */
-    @ApiOperation("实验室检测-负责人/检定人扫描检完（检测中->检测完）")
+    @ApiOperation("实验室任务-负责人/检定人扫描检完（检测中->检测完）")
     @PostMapping("/myExecutive/complete")
     public ReturnDTO sampleExecutiveComplete(@RequestBody @Valid List<SampleOperateRequest> requestList, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -102,10 +113,7 @@
         return labExecutiveInfoService.sampleExecutiveComplete(requestList);
     }
 
-    /**
-     * 实验室检测-部门检测/我的检测 编辑（只能修改应出具证书）
-     */
-    @ApiOperation("实验室检测-部门检测/我的检测 编辑（只能修改应出具证书）")
+    @ApiOperation("实验室任务/我的任务 编辑（只能修改应出具证书）")
     @PostMapping("/executive/update")
     public ReturnDTO updateExecutive(@RequestBody @Valid UpdateExecutiveRequest request, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -114,10 +122,7 @@
         return labExecutiveInfoService.updateExecutive(request);
     }
 
-    /**
-     * 实验室检测-部门检测/我的检测 详情
-     */
-    @ApiOperation("实验室检测-部门检测/我的检测 详情")
+    @ApiOperation("实验室任务/我的任务 详情")
     @PostMapping("/executive/detail")
     public ReturnDTO<ExecutiveDetailResponse> executiveDetail(@RequestBody @Valid ExecutiveDetailRequest request, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
@@ -131,7 +136,7 @@
      * 退回后会将下一个要执行的实验室检测状态更新为待分配，将后面的实验室顺序变更为连续（都进行减1）
      * 最后一个检测的实验室退回，等分发员再增加实验室或设备收发中的已收入直接手动点击完成
      */
-    @ApiOperation("实验室检测-部门检测/我的检测 退回（待检测/检测中->退回）")
+    @ApiOperation("实验室任务/我的任务 退回（待检测/检测中->退回）")
     @PostMapping("/executive/sendBack")
     public ReturnDTO executiveSendBack(@RequestBody @Valid ExecutiveSendBackRequest request, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -140,9 +145,6 @@
         return labExecutiveInfoService.sampleExecutiveSendBack(request);
     }
 
-    /**
-     * 分发员编辑实验室检测列表
-     */
     @ApiOperation("分发员编辑实验室检测列表")
     @PostMapping("/handOut/updateList")
     public ReturnDTO updateExecutiveList(@RequestBody @Valid UpdateExecutiveListRequest request, BindingResult bindingResult) {
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java
index 48a67ed..0c04f31 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java
@@ -10,6 +10,7 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.resource.customer.CustomerApprovalListRequest;
 import com.casic.missiles.dto.resource.customer.CustomerSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceCustomerInfo;
@@ -26,6 +27,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -55,6 +57,13 @@
         return customerInfoService.saveCustomerInfo(request);
     }
 
+    @ApiOperation("委托方名录导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody CustomerApprovalListRequest request) throws Exception {
+        List<BizResourceCustomerInfo> list = super.exportList(request);
+        super.exportExcel(BizResourceCustomerInfo.class, list, ExportEnum.CUSTOMER_INFO.getSheetName());
+    }
+
     @ApiOperation("委托方人员列表（分页）")
     @PostMapping("/person/listPage")
     public ReturnDTO<PageInfoBT<BizResourceCustomerStaff>> personListPage(@RequestBody IdDTO idDto) {
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
index 972ed4b..6418ea5 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
@@ -5,6 +5,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.resource.customer.SuggestFormApprovalListRequest;
 import com.casic.missiles.dto.resource.customer.SuggestFormSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceCustomerSuggestForm;
@@ -20,6 +21,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -50,4 +52,11 @@
         return suggestFormService.saveSuggestForm(request);
     }
 
+    @ApiOperation("导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody SuggestFormApprovalListRequest request) throws Exception {
+        List<BizResourceCustomerSuggestForm> list = super.exportList(request);
+        super.exportExcel(BizResourceCustomerSuggestForm.class, list, ExportEnum.CUSTOMER_SUGGEST_FORM.getSheetName());
+    }
+
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java
index 1934d1a..9e07eab 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java
@@ -15,12 +15,16 @@
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.resource.IEnvEnvironmentRecordConfigService;
 import com.casic.missiles.service.resource.IEnvEnvironmentRecordDataService;
+import com.casic.missiles.service.resource.IEnvLocationInfoService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
 import java.util.List;
@@ -39,6 +43,8 @@
     private IEnvEnvironmentRecordDataService environmentRecordDataService;
     @Autowired
     private IEnvEnvironmentRecordConfigService environmentRecordConfigService;
+    @Autowired
+    private IEnvLocationInfoService locationInfoService;
 
     @ApiOperation("环境记录单数据列表/详情")
     @PostMapping("/data/listPage")
@@ -95,4 +101,11 @@
         });
         return environmentRecordConfigService.deleteEnvironmentRecordConfig(idDTO.getId());
     }
+
+    @ApiOperation("地点列表")
+    @PostMapping("/location/listPage")
+    public ReturnDTO<PageInfoBT<LocationListResponse>> locationListPage(@RequestBody @Valid LocationListRequest request) {
+        Page<LocationListResponse> page = PageFactory.defaultPage();
+        return ReturnUtil.success(super.packForBT(locationInfoService.listPage(page, request)));
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java
index 82efe3f..e9561fa 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java
@@ -10,6 +10,7 @@
 import com.casic.missiles.dto.resource.seal.SealLogListRequest;
 import com.casic.missiles.dto.resource.seal.SealNoteApprovalListRequest;
 import com.casic.missiles.dto.resource.seal.SealNoteSaveResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceSealUseLog;
@@ -27,6 +28,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -58,6 +60,13 @@
         return sealUseNoteService.saveSeal(request);
     }
 
+    @ApiOperation("印章使用登记导出（列表和导出中去掉经办人和监印人）")
+    @PostMapping("/listExport")
+    public void export(@RequestBody SealNoteApprovalListRequest request) throws Exception {
+        List<BizResourceSealUseNote> list = super.exportList(request);
+        super.exportExcel(BizResourceSealUseNote.class, list, ExportEnum.SEAL_NOTE.getSheetName());
+    }
+
     // TODO: 2023/7/28 印章使用日志：系统中使用印章时插入数据库
 
     @ApiOperation("印章使用日志列表（分页）")
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java
index 9b674fc..06b6521 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffCertController.java
@@ -9,16 +9,20 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.resource.staff.StaffCertRequest;
 import com.casic.missiles.dto.resource.staff.StaffCertResponse;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.service.resource.IBizResourceStaffInfoService;
 import com.casic.missiles.service.resource.IBizResourceStaffVerifierService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.List;
+
 /**
  * @Description:
  * @Author: wangpeng
@@ -41,9 +45,21 @@
         return ReturnUtil.success(super.packForBT(responsePage));
     }
 
+    @ApiOperation("证书逾期提醒导出")
+    @PostMapping("/listExport")
+    public void exportList(@RequestBody StaffCertRequest request) throws Exception {
+        List<StaffCertResponse> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = staffInfoService.certListByIds(request.getIds());
+        } else {
+            list = staffInfoService.certList(request);
+        }
+        super.exportExcel(StaffCertResponse.class, list, ExportEnum.STAFF_CERTIFICATE_EXPIRE.getSheetName());
+    }
+
     @ApiOperation("证书逾期提醒")
     @PostMapping("/expirationReminder")
-    public ReturnDTO expirationReminder(@RequestBody IdDTO idDto) {
-        return verifierService.expirationReminder(idDto);
+    public ReturnDTO expirationReminder(@RequestBody IdDTO idDTO) {
+        return verifierService.expirationReminder(idDTO);
     }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java
index 3b251ad..a6e7850 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java
@@ -12,6 +12,7 @@
 import com.casic.missiles.dto.resource.staff.StaffListRequest;
 import com.casic.missiles.dto.resource.staff.TrainListRequest;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.*;
@@ -22,7 +23,10 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
 import java.util.List;
@@ -52,8 +56,19 @@
             throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
         }
         Page<BizResourceStaffInfo> page = PageFactory.defaultPage();
-        Page<BizResourceStaffInfo> responsePage = staffInfoService.listPage(page, request);
-        return ReturnUtil.success(super.packForBT(responsePage));
+        return ReturnUtil.success(super.packForBT(staffInfoService.listPage(page, request)));
+    }
+
+    @ApiOperation("人员登记导出")
+    @PostMapping("/listExport")
+    public void exportList(@RequestBody StaffListRequest request) throws Exception {
+        List<BizResourceStaffInfo> list;
+        if (!CollectionUtils.isEmpty(request.getIds())) {
+            list = staffInfoService.listByIds(request.getIds());
+        } else {
+            list = staffInfoService.list(request);
+        }
+        super.exportExcel(BizResourceStaffInfo.class, list, ExportEnum.STAFF_INFO.getSheetName());
     }
 
     @ApiOperation("人员登记详情基础信息")
@@ -85,9 +100,9 @@
 
     @ApiOperation("科研教育列表（分页）")
     @PostMapping("/education/listPage")
-    public ReturnDTO<PageInfoBT<BizResourceStaffEducation>> educationListPage(@RequestBody IdDTO idDto) {
+    public ReturnDTO<PageInfoBT<BizResourceStaffEducation>> educationListPage(@RequestBody IdDTO idDTO) {
         Page<BizResourceStaffEducation> page = PageFactory.defaultPage();
-        Page<BizResourceStaffEducation> responsePage = staffInfoService.educationListPage(page, idDto);
+        Page<BizResourceStaffEducation> responsePage = staffInfoService.educationListPage(page, idDTO);
         return ReturnUtil.success(super.packForBT(responsePage));
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java
index af6aa86..d85d84a 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java
@@ -9,6 +9,7 @@
 import com.casic.missiles.dto.resource.outsideService.SupplierApprovalListRequest;
 import com.casic.missiles.dto.resource.outsideService.SupplierSaveResponse;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.resource.BizResourceSupplierAbility;
@@ -67,6 +68,13 @@
         return ReturnUtil.success(supplierInfoService.detail(idDTO.getId()));
     }
 
+    @ApiOperation("合格供方导出")
+    @PostMapping("/listExport")
+    public void export(@RequestBody SupplierApprovalListRequest request) throws Exception {
+        List<BizResourceSupplierInfo> list = super.exportList(request);
+        super.exportExcel(BizResourceSupplierInfo.class, list, ExportEnum.SUPPLIER_INFO.getSheetName());
+    }
+
     @ApiOperation("供方人员列表（分页）")
     @PostMapping("/person/listPage")
     public ReturnDTO<PageInfoBT<BizResourceSupplierPerson>> personListPage(@RequestBody IdDTO idDTO) {
diff --git a/casic-metering-api/src/main/resources/config/application.yml b/casic-metering-api/src/main/resources/config/application.yml
index 350db5f..ecff521 100644
--- a/casic-metering-api/src/main/resources/config/application.yml
+++ b/casic-metering-api/src/main/resources/config/application.yml
@@ -126,7 +126,7 @@
     #作者
     author: wangpeng
     #待生成对象表名
-    table-name: biz_equipment_technical_target_approval,biz_equipment_attachment_approval,biz_equipment_checkpoint_approval
+    table-name: biz_business_outsource_protocol
 
 reminder:
   #节点--common模块config包 ReminderNodeConfig配置
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
index 4a19e4e..d47d552 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
@@ -53,6 +53,7 @@
     SUGGEST_FORM_SAVE_FAILED(2509, "委托方意见登记表保存至草稿箱失败"),
     EXAMINE_FORM_SAVE_FAILED(2510, "要求、委托书及合同评审表保存至草稿箱失败"),
     CUSTOMER_EXIST_SAVE_FAILED(2511, "该委托方已存在，请重新选择"),
+    DUPLICATE_LOCATION_NO(2512, "地点编号已存在"),
 
     /**
      * 计量检定业务模块
@@ -68,6 +69,8 @@
     COMPLETE_SAMPLE_NOT_EXIST(2609, "检测中不存在扫描收入的样品"),
     CANNOT_CHANGE_MEASURE_INFO(2610, "无法更改非当前登录用户的检测信息"),
     NON_EXIST_ORDER_OR_SAMPLE(2611, "不存在该委托单或该委托单下的样品"),
+    OUTSOURCE_ACCESS_SAVE_FAILED(2612, "测试、校准或检定工作分包评审表保存至草稿箱失败"),
+    OUTSOURCE_PROTOCOL_SAVE_FAILED(2613, "测试、校准或检定工作分包协议书保存至草稿箱失败"),
 
     /**
      * 历史遗留备用
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
index 5089ad1..81a406b 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
@@ -10,54 +10,38 @@
     /**
      * 资源管理
      */
-    ENVIRONMENT_DATA_EXPORT("environmentData", "environmentData", "环境记录单数据"),
+    ENVIRONMENT_DATA_EXPORT("environmentData", "环境记录单数据", "环境记录单数据"),
+    STAFF_INFO("staffInfo", "人员登记", "人员登记"),
+    STAFF_CERTIFICATE_EXPIRE("certificateExpire", "证书逾期提醒", "证书逾期提醒"),
+    SUPPLIER_INFO("supplierInfo", "合格供方名录", "合格供方名录"),
+    CUSTOMER_INFO("customerInfo", "委托方名录", "委托方名录"),
+    CUSTOMER_SUGGEST_FORM("customerSuggestForm", "委托方意见登记表", "委托方意见登记表"),
+    SEAL_NOTE("sealNote", "印章使用登记", "印章使用登记"),
 
-    FILE_EXPORT("meterFileData", "meterFileData", "计量文件信息"),
-    TRAIN_PLAN_EXPORT("trainPlanData", "trainPlanData", "培训计划"),
-    TRAIN_LOG_EXPORT("trainLogData", "trainLogData", "培训记录"),
-    METER_ORGANIZE_EXPORT("meterOrganizeData", "meterOrganizeData", "计量组织"),
-    TRACE_SUPPLIER_EXPORT("traceSupplierData", "traceSupplierData", "溯源供方"),
-    SIGN_EXPORT("signData", "signData", "签名/签章"),
-    TEMPLATE_EXPORT("templateData", "templateData", "原始记录模板/证书报告模板"),
-    FIXED_ASSETS("meterFixedAssets", "meterFixedAssets", "固定资产"),
-    METER_EQUIPMENT("meterEquipment", "meterEquipment", "测量设备"),
-    CALIBRATION_TEST_EQUIPMENT("calibrationTestEquipment", "calibrationTestEquipment", "校准检定设备"),
-    MEASURE_ACCOUNT("measureAccount", "measureAccount", "测量工装"),
-    STANDARD_SUPPORT_EQUIPMENT("standardSupportEquipment", "standardSupportEquipment", "标准配套设备"),
-    STANDARD_EQUIPMENT("standardEquipment", "standardEquipment", "标准装置"),
-    FLOW_DEF_EXPORT("flowDefData", "flowDefData", "流程定义"),
-    STAFF_CERTIFICATE("certificate", "certificate", "计量人员证书"),
-    CHECK_INFO("checkInfo", "checkInfo", "设备管理点检测"),
-    EQUIPMENT_APPLY("equipmentApply", "equipmentApply", "设备借用"),
-    STANDARD_EQUIPMENT_REMIND("equipmentApplyRemind", "equipmentApplyRemind", "标准装置到期提醒"),
-    METER_PRICE("meterPrice", "meterPrice", "价格库"),
-    METER_STAFF("meterStaff", "meterStaff", "计量人员"),
-    STANDARD_EQUIPMENT_APPLY("standardEquipmentApply", "standardEquipmentApply", "标准装置申请"),
-    STATE_MANAGE_APPLY("stateManage", "stateManage", "状态管理"),
-    METER_ACCEPTANCE_CHECK("acceptanceCheck", "acceptanceCheck", "设备检修保养验收单"),
-    CUSTOMER_EXPORT("customerData", "customerData", "客户信息"),
-    ORDER_EXPORT("orderData", "orderData", "委托书信息"),
-    SAMPLE_EXPORT("sampleData", "sampleData", "样本信息"),
-    EXCHANGE_DATA("exchangeData", "exchangeData", "设备交接单"),
-    DISPATCH_DATA("dispatchData", "dispatchData", "设备收发"),
-    ENVIRONMENT_DATA("environmentData", "environmentData", "环境记录单"),
-    ORIGIN_DATA("originData", "originData", "原始记录"),
-    CERTIFICATE_REPORT("certificateReport", "certificateReport", "证书报告"),
-    ADVICE_EXPORT("adviceData", "adviceData", "客户反馈"),
-    HANDOUT_EXPORT("handoutData", "handoutData", "任务分发列表"),
-    OUTSOURCER_EXPORT("outsourcerData", "outsourcerData", "分包方"),
-    SITE_EXECUTIVE_EXPORT("siteExecutiveData", "siteExecutiveData", "现场测试、校准或检定"),
-    CERTIFICATE_PRINT_EXPORT("certificatePrintData", "certificatePrintData", "证书打印"),
-    DOWNLOAD_TEMPLATE("downloadTemplate", "downloadTemplate", "页面配置"),
-    OUTSOURCER_CERTIFICATE_EXPORT("outsourceCertificateData", "outsourceCertificateData", "分包证书"),
-    SETTLEMENT_INFO_EXPORT("settlementInfoData", "settlementInfoData", "业务结算"),
-    EQUIPMENT_REMIND("equipmentRemind", "equipmentRemind", "设备到期提醒"),
-    AGREEMENT_INFO_EXPORT("agreementInfoData", "agreementInfoData", "合同"),
-    WORK_STATISTICS_EXPORT("workStatisticsData", "workStatisticsData", "实时工作统计"),
-    DEPT_OUTPUT_EXPORT("deptOutputData", "deptOutputData", "部门产值分析"),
-    WORKLOAD_EXPORT("workloadData", "workloadData", "业务工作量分析"),
-    DEPT_COMPREHENSIVE_EXPORT("deptComprehensiveData", "deptComprehensiveData", "部门综合分析"),
-    ENVIRONMENTAL_RECORD("environmentalRecordData", "environmentalRecordData", "现场环境记录");
+    /**
+     * 计量检定业务
+     */
+    OUTSOURCER_EXPORT("outsourcerData", "分包方名录", "分包方名录"),
+    IDENTIFY_EXPORT("identifyData", "计量标识", "计量标识"),
+    ORDER_EXPORT("orderData", "任务单", "任务单"),
+    DISPATCH_DATA("dispatchData", "设备收发", "设备收发"),
+    HANDOUT_EXPORT("handoutData", "任务分发", "任务分发"),
+    SITE_EXECUTIVE_EXPORT("siteExecutiveData", "现场测试、校准或检定", "现场测试、校准或检定"),
+    CERTIFICATE_REPORT("certificateReport", "证书审批", "证书审批"),
+    CERTIFICATE_CHANGE_APPLY("certificateChangeApply", "证书报告补充或更换申请单", "证书报告补充或更换申请单"),
+    CERTIFICATE_PRINT("certificatePrintData", "证书打印审批", "证书打印审批"),
+    DEPT_EXECUTIVE_TASK("deptExecutiveTaskData", "实验室任务", "实验室任务"),
+    MY_EXECUTIVE_TASK("myExecutiveTaskData", "我的任务", "我的任务"),
+    OUTSOURCE_ASSESS("outsourceAssess", "测试、校准或检定工作分包评审表", "测试、校准或检定工作分包评审表"),
+    OUTSOURCE_PROTOCOL("outsourceProtocol", "测试、校准或检定工作分包协议书", "测试、校准或检定工作分包协议书"),
+
+    /**
+     * 系统管理
+     */
+    SIGN_EXPORT("signData", "签名", "签名"),
+    TEMPLATE_EXPORT("templateData", "文件模板", "文件模板"),
+    FLOW_DEF_EXPORT("flowDefData", "流程定义", "流程定义"),
+    DOWNLOAD_TEMPLATE("downloadTemplate", "流程定义", "页面配置");
 
     ExportEnum(String fileName, String sheetName, String description) {
         this.fileName = fileName;
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateRecordTypeCodeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateRecordTypeCodeEnum.java
index 31d913c..a963522 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateRecordTypeCodeEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateRecordTypeCodeEnum.java
@@ -46,4 +46,14 @@
     String SITE_EXECUTIVE_APPROVAL = "01";
     //《现场测试、校准或检定工作记录表》
     String SITE_EXECUTIVE_LOG = "02";
+
+    //测试、校准或检定工作分包协议书
+    String OUTSOURCE_PROTOCOL = "01";
+    //测试、校准或检定工作分包评审表
+    String OUTSOURCE_ACCESS = "02";
+    //测试、校准或检定工作分包通知书
+    String OUTSOURCE_NOTICE = "03";
+    //测试、校准或检定工作分包方名录
+    String OUTSOURCE_INFO = "04";
+
 }
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
index 24b8635..f78bd53 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
@@ -15,6 +15,10 @@
     String CERTIFICATE_CHANGE_APPLY_BEAN_NAME = "certificateChangeApplyBean";
     //现场测试、校准或检定
     String SITE_EXECUTIVE_BEAN_NAME = "siteExecutiveBean";
+    //测试、校准或检定工作分包评审表
+    String OUTSOURCE_ASSESS_BEAN_NAME = "outsourceAssessBean";
+    //测试、校准或检定工作分包协议书
+    String OUTSOURCE_PROTOCOL_BEAN_NAME = "outsourceProtocolBean";
 
     /*********************************设备与装置************************************/
     //设备台账
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 b21c661..6b86fd1 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
@@ -18,6 +18,8 @@
     OUTSOURCER_APPROVAL(OUTSOURCER_BEAN_NAME, ""),
     CERTIFICATE_CHANGE_APPROVAL(CERTIFICATE_CHANGE_APPLY_BEAN_NAME, ""),
     SITE_EXECUTIVE_APPROVAL(SITE_EXECUTIVE_BEAN_NAME, ""),
+    OUTSOURCE_ASSESS_APPROVAL(OUTSOURCE_ASSESS_BEAN_NAME, ""),
+    OUTSOURCE_PROTOCOL_APPROVAL(OUTSOURCE_PROTOCOL_BEAN_NAME, ""),
 
     ACTION_STATUS_MAP(new HashMap<String, AwareActionStatusEnum>() {
         {
@@ -47,6 +49,10 @@
             put(ApplyFromIdEnum.CERTIFICATE_CHANGE_APPROVAL.getCode(), CERTIFICATE_CHANGE_APPROVAL);
             //现场测试、校准或检定审批
             put(ApplyFromIdEnum.SITE_EXECUTIVE_APPROVAL.getCode(), SITE_EXECUTIVE_APPROVAL);
+            //测试、校准或检定工作分包评审表
+            put(ApplyFromIdEnum.OUTSOURCE_ASSESS_APPROVAL.getCode(), OUTSOURCE_ASSESS_APPROVAL);
+            //测试、校准或检定工作分包协议书
+            put(ApplyFromIdEnum.OUTSOURCE_PROTOCOL_APPROVAL.getCode(), OUTSOURCE_PROTOCOL_APPROVAL);
         }
     });
     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 934405e..c7410bd 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
@@ -9,6 +9,8 @@
     CERTIFICATE_CHANGE_APPROVAL("jljdywzsbchghsqd", MessageSourceModuleEnum.BUSINESS.getCode(), "证书/报告补充或更换申请单"),
     OUTSOURCER_APPROVAL("jljdywcsjzhgfbfml", MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定合格分包方名录"),
     SITE_EXECUTIVE_APPROVAL("jljdywxccsjzsp", MessageSourceModuleEnum.BUSINESS.getCode(), "现场测试、校准或检定审批"),
+    OUTSOURCE_ASSESS_APPROVAL("jljdywcsjzfbpsb", MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包评审表"),
+    OUTSOURCE_PROTOCOL_APPROVAL("jljdywcsjzfbxys", MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包协议书"),
 
 
     /*******************************************设备与装置*********************************************/
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/GeneralApprovalMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/GeneralApprovalMapper.java
index 4fb7344..0c9d6ae 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/GeneralApprovalMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/GeneralApprovalMapper.java
@@ -17,8 +17,4 @@
 
     Page<O> selectBatchForApprovalList(Page<O> page, @Param("request") R request, @Param("businessKeys") List<String> businessKeys);
 
-//    Page<O> selectListPage(Page<O> page, @Param("request") R request);
-
-//    Long selectMaxNo();
-
 }
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceAssessMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceAssessMapper.java
index 7867bb8..ba59009 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceAssessMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceAssessMapper.java
@@ -1,7 +1,12 @@
 package com.casic.missiles.mapper.business;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.business.outsource.OutsourceAssessApprovalListRequest;
+import com.casic.missiles.mapper.GeneralApprovalMapper;
 import com.casic.missiles.model.business.BizBusinessOutsourceAssess;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * <p>
@@ -11,6 +16,10 @@
  * @author wangpeng
  * @since 2023-08-16
  */
-public interface BizBusinessOutsourceAssessMapper extends BaseMapper<BizBusinessOutsourceAssess> {
+public interface BizBusinessOutsourceAssessMapper extends GeneralApprovalMapper<BizBusinessOutsourceAssess, BizBusinessOutsourceAssess, OutsourceAssessApprovalListRequest> {
+
+    Page<BizBusinessOutsourceAssess> selectBatchForApprovalList(Page<BizBusinessOutsourceAssess> page, @Param("request") OutsourceAssessApprovalListRequest request, @Param("businessKeys") List<String> businessKeys);
+
+    Long selectMaxProjectNo();
 
 }
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceProtocolMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceProtocolMapper.java
new file mode 100644
index 0000000..e6aba35
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceProtocolMapper.java
@@ -0,0 +1,24 @@
+package com.casic.missiles.mapper.business;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.business.outsource.OutsourceProtocolApprovalListRequest;
+import com.casic.missiles.mapper.GeneralApprovalMapper;
+import com.casic.missiles.model.business.BizBusinessOutsourceProtocol;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 计量检定业务-分包管理-测试、校准或检定工作分包协议书 Mapper 接口
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-08-24
+ */
+public interface BizBusinessOutsourceProtocolMapper extends GeneralApprovalMapper<BizBusinessOutsourceProtocol, BizBusinessOutsourceProtocol, OutsourceProtocolApprovalListRequest> {
+
+    Page<BizBusinessOutsourceProtocol> selectBatchForApprovalList(Page<BizBusinessOutsourceProtocol> page, @Param("request") OutsourceProtocolApprovalListRequest request, @Param("businessKeys") List<String> businessKeys);
+
+    Long selectMaxProtocolNo();
+}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/EnvLocationInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/EnvLocationInfoMapper.java
new file mode 100644
index 0000000..49eff87
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/EnvLocationInfoMapper.java
@@ -0,0 +1,21 @@
+package com.casic.missiles.mapper.resource;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.resource.environment.LocationListRequest;
+import com.casic.missiles.dto.resource.environment.LocationListResponse;
+import com.casic.missiles.model.resource.EnvLocationInfo;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * <p>
+ * 实验室环境监控系统-设备表 Mapper 接口
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-06-07
+ */
+public interface EnvLocationInfoMapper extends BaseMapper<EnvLocationInfo> {
+
+    Page<LocationListResponse> selectLocationListPage(Page<LocationListResponse> page, @Param("request") LocationListRequest request);
+}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java
index de124db..85ed0f7 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java
@@ -1,7 +1,9 @@
 package com.casic.missiles.mapper.system;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.dto.system.SignDetailResponse;
+import com.casic.missiles.dto.system.SignListRequest;
 import com.casic.missiles.model.system.SystemSign;
 import org.apache.ibatis.annotations.Param;
 
@@ -22,4 +24,8 @@
     SignDetailResponse selectSignDetailById(Long id);
 
     List<SystemSign> selectUsableSignList(@Param("userId") Long userId);
+
+    Page<SystemSign> selectSignListPage(Page<SystemSign> page, @Param("request") SignListRequest request);
+
+    List<SystemSign> selectSignList(@Param("request") SignListRequest request);
 }
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateChangeApplyMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateChangeApplyMapper.xml
index d798447..c496092 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateChangeApplyMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateChangeApplyMapper.xml
@@ -30,31 +30,31 @@
         SELECT *
         FROM biz_business_certificate_change_apply
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.changeApplyNo != null and request.changeApplyNo !=''">
+        <if test="request != null and request.changeApplyNo != null and request.changeApplyNo !=''">
             and change_apply_no like concat('%',#{request.changeApplyNo},'%')
         </if>
-        <if test="request.changeReportNo != null and request.changeReportNo !=''">
+        <if test="request != null and request.changeReportNo != null and request.changeReportNo !=''">
             and change_report_no like concat('%',#{request.changeReportNo},'%')
         </if>
-        <if test="request.changeReportName != null and request.changeReportName !=''">
+        <if test="request != null and request.changeReportName != null and request.changeReportName !=''">
             and change_report_name like concat('%',#{request.changeReportName},'%')
         </if>
-        <if test="request.changeType != null and request.changeType !=''">
+        <if test="request != null and request.changeType != null and request.changeType !=''">
             and change_type = #{request.changeType}
         </if>
-        <if test="request.createUserName != null and request.createUserName !=''">
+        <if test="request != null and request.createUserName != null and request.createUserName !=''">
             and create_user_name like concat('%',#{request.createUserName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificatePrintMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificatePrintMapper.xml
index b66cd99..49c0ac8 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificatePrintMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificatePrintMapper.xml
@@ -31,34 +31,34 @@
         LEFT JOIN biz_business_order_sample_relation bosr ON (bosr.order_id = bcr.order_id AND bosr.sample_id = bcr.sample_id)
         LEFT JOIN biz_business_order_info boi ON boi.id = bosr.order_id
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and bcp.approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.printStatus != null and request.printStatus !=''">
+        <if test="request != null and request.printStatus != null and request.printStatus !=''">
             and print_status = #{request.printStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and bcp.create_user_id = #{request.createUserId}
         </if>
-        <if test="request.certificateReportNo != null and request.certificateReportNo !=''">
+        <if test="request != null and request.certificateReportNo != null and request.certificateReportNo !=''">
             and bcr.certificate_report_no like concat('%',#{request.certificateReportNo},'%')
         </if>
-        <if test="request.certificateReportName != null and request.certificateReportName !=''">
+        <if test="request != null and request.certificateReportName != null and request.certificateReportName !=''">
             and bcr.certificate_report_name like concat('%',#{request.certificateReportName},'%')
         </if>
-        <if test="request.customerName != null and request.customerName !=''">
+        <if test="request != null and request.customerName != null and request.customerName !=''">
             and boi.customer_name like concat('%',#{request.customerName},'%')
         </if>
-        <if test="request.sampleNo != null and request.sampleNo !=''">
+        <if test="request != null and request.sampleNo != null and request.sampleNo !=''">
             and bosr.sample_no like concat('%',#{request.sampleNo},'%')
         </if>
-        <if test="request.sampleName != null and request.sampleName !=''">
+        <if test="request != null and request.sampleName != null and request.sampleName !=''">
             and bosr.sample_name like concat('%',#{request.sampleName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and bcp.create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and bcp.create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml
index b366034..767695d 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml
@@ -46,33 +46,37 @@
         SELECT bcr.*, bosr.sample_no, bosr.sample_name, bosr.sample_model, rsi.staff_name
         FROM biz_business_certificate_report bcr
         LEFT JOIN biz_business_order_sample_relation bosr ON (bosr.order_id = bcr.order_id AND bosr.sample_id = bcr.sample_id)
+        LEFT JOIN biz_business_order_info boi ON boi.id = bcr.order_id
         LEFT JOIN biz_resource_staff_info rsi ON rsi.id = bcr.measure_person_id
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and bcr.approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and bcr.create_user_id = #{request.createUserId}
         </if>
-        <if test="request.certificateReportNo != null and request.certificateReportNo !=''">
+        <if test="request != null and request.customerId != null and request.customerId !=''">
+            and boi.customer_id = #{request.customerId}
+        </if>
+        <if test="request != null and request.certificateReportNo != null and request.certificateReportNo !=''">
             and bcr.certificate_report_no like concat('%',#{request.certificateReportNo},'%')
         </if>
-        <if test="request.certificateReportName != null and request.certificateReportName !=''">
+        <if test="request != null and request.certificateReportName != null and request.certificateReportName !=''">
             and bcr.certificate_report_name like concat('%',#{request.certificateReportName},'%')
         </if>
-        <if test="request.sampleNo != null and request.sampleNo !=''">
+        <if test="request != null and request.sampleNo != null and request.sampleNo !=''">
             and bosr.sample_no like concat('%',#{request.sampleNo},'%')
         </if>
-        <if test="request.measureCategory != null and request.measureCategory !=''">
+        <if test="request != null and request.measureCategory != null and request.measureCategory !=''">
             and bcr.measure_category = #{request.measureCategory}
         </if>
-        <if test="request.measurePerson != null and request.measurePerson !=''">
+        <if test="request != null and request.measurePerson != null and request.measurePerson !=''">
             and rsi.staff_name like concat('%',#{request.measurePerson},'%')
         </if>
-        <if test="request.calibrationTimeStart != null and request.calibrationTimeStart !=''">
+        <if test="request != null and request.calibrationTimeStart != null and request.calibrationTimeStart !=''">
             and bcr.calibration_time &gt;= #{request.calibrationTimeStart}
         </if>
-        <if test="request.calibrationTimeEnd != null and request.calibrationTimeEnd !=''">
+        <if test="request != null and request.calibrationTimeEnd != null and request.calibrationTimeEnd !=''">
             and bcr.calibration_time &lt;= #{request.calibrationTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceAssessMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceAssessMapper.xml
index d0fcf8b..c22c101 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceAssessMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceAssessMapper.xml
@@ -7,6 +7,8 @@
         <id column="id" property="id" />
         <result column="project_no" property="projectNo" />
         <result column="project_name" property="projectName" />
+        <result column="lab_code" property="labCode" />
+        <result column="group_code" property="groupCode" />
         <result column="applicant_id" property="applicantId" />
         <result column="applicant_name" property="applicantName" />
         <result column="applicant_time" property="applicantTime" />
@@ -31,7 +33,45 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, project_no, project_name, applicant_id, applicant_name, applicant_time, minio_file_name, remark, create_user_id, create_user_name, outsourcer_id, pre_start_time, pre_end_time, outsource_reason, pre_cost, approval_status, process_id, approve_situation, traceability, test_method, technique_ability, create_time, update_time
+        id, project_no, project_name, lab_code, group_code, applicant_id, applicant_name, applicant_time, minio_file_name, remark, create_user_id, create_user_name, outsourcer_id, pre_start_time, pre_end_time, outsource_reason, pre_cost, approval_status, process_id, approve_situation, traceability, test_method, technique_ability, create_time, update_time
     </sql>
 
+    <select id="selectMaxProjectNo" resultType="java.lang.Long">
+        SELECT IFNULL(max(RIGHT(project_no, 3)), 0) from biz_business_outsource_assess
+    </select>
+
+    <select id="selectBatchForApprovalList" resultMap="BaseResultMap">
+        SELECT bboa.*, bboi.outsourcer_name, bboi.director
+        FROM biz_business_outsource_assess bboa
+        LEFT JOIN biz_business_outsourcer_info bboi ON bboa.outsourcer_id = bboi.id
+        WHERE 1=1
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
+            and bboa.approval_status = #{request.approvalStatus}
+        </if>
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
+            and bboa.create_user_id = #{request.createUserId}
+        </if>
+        <if test="request != null and request.projectNo != null and request.projectNo !=''">
+            and bboa.project_no like concat('%',#{request.projectNo},'%')
+        </if>
+        <if test="request != null and request.outsourcerName != null and request.outsourcerName !=''">
+            and bboi.outsourcer_name like concat('%',#{request.outsourcerName},'%')
+        </if>
+        <if test="request != null and request.applicantName != null and request.applicantName !=''">
+            and bboa.applicant_name like concat('%',#{request.applicantName},'%')
+        </if>
+        <if test="request != null and request.applicantTimeStart != null and request.applicantTimeStart !=''">
+            and bboa.applicant_time &gt;= #{request.applicantTimeStart}
+        </if>
+        <if test="request != null and request.applicantTimeEnd != null and request.applicantTimeEnd !=''">
+            and bboa.applicant_time &lt;= #{request.applicantTimeEnd}
+        </if>
+        <if test="businessKeys != null">
+            and bboa.id in
+            <foreach collection="businessKeys" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
+        ORDER BY bboa.create_time DESC
+    </select>
 </mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceProtocolMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceProtocolMapper.xml
new file mode 100644
index 0000000..b7b2149
--- /dev/null
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourceProtocolMapper.xml
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.mapper.business.BizBusinessOutsourceProtocolMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.business.BizBusinessOutsourceProtocol">
+        <id column="id" property="id" />
+        <result column="protocol_no" property="protocolNo" />
+        <result column="project_name" property="projectName" />
+        <result column="lab_code" property="labCode" />
+        <result column="group_code" property="groupCode" />
+        <result column="outsourcer_id" property="outsourcerId" />
+        <result column="remark" property="remark" />
+        <result column="outsource_no" property="outsourceNo" />
+        <result column="outsource_name" property="outsourceName" />
+        <result column="contacts" property="contacts" />
+        <result column="mobile" property="mobile" />
+        <result column="address" property="address" />
+        <result column="require_date" property="requireDate" />
+        <result column="outsource_cost" property="outsourceCost" />
+        <result column="director" property="director" />
+        <result column="item" property="item" />
+        <result column="requires" property="requires" />
+        <result column="create_user_id" property="createUserId" />
+        <result column="create_user_name" property="createUserName" />
+        <result column="approval_status" property="approvalStatus" />
+        <result column="process_id" property="processId" />
+        <result column="create_time" property="createTime" />
+        <result column="update_time" property="updateTime" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, protocol_no, project_name, lab_code, group_code, outsourcer_id, remark, outsource_no, outsource_name, contacts, mobile, address, require_date, outsource_cost, director, item, requires, create_user_id, create_user_name, approval_status, process_id, create_time, update_time
+    </sql>
+
+    <select id="selectMaxProtocolNo" resultType="java.lang.Long">
+        SELECT IFNULL(max(RIGHT(protocol_no, 3)), 0) from biz_business_outsource_protocol
+    </select>
+
+    <select id="selectBatchForApprovalList" resultMap="BaseResultMap">
+        SELECT *
+        FROM biz_business_outsource_protocol
+        WHERE 1=1
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
+            and approval_status = #{request.approvalStatus}
+        </if>
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
+            and create_user_id = #{request.createUserId}
+        </if>
+        <if test="request != null and request.protocolNo != null and request.protocolNo !=''">
+            and protocol_no like concat('%',#{request.protocolNo},'%')
+        </if>
+        <if test="request != null and request.outsourcerName != null and request.outsourcerName !=''">
+            and outsourcer_name like concat('%',#{request.outsourcerName},'%')
+        </if>
+        <if test="request != null and request.applicantName != null and request.applicantName !=''">
+            and create_user_name like concat('%',#{request.applicantName},'%')
+        </if>
+        <if test="request != null and request.applicantTimeStart != null and request.applicantTimeStart !=''">
+            and create_time &gt;= #{request.applicantTimeStart}
+        </if>
+        <if test="request != null and request.applicantTimeEnd != null and request.applicantTimeEnd !=''">
+            and create_time &lt;= #{request.applicantTimeEnd}
+        </if>
+        <if test="businessKeys != null">
+            and id in
+            <foreach collection="businessKeys" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
+        ORDER BY create_time DESC
+    </select>
+</mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourcerInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourcerInfoMapper.xml
index 510a80b..3049b54 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourcerInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourcerInfoMapper.xml
@@ -7,6 +7,8 @@
         <id column="id" property="id" />
         <result column="outsourcer_no" property="outsourcerNo" />
         <result column="outsourcer_name" property="outsourcerName" />
+        <result column="lab_code" property="labCode" />
+        <result column="group_code" property="groupCode" />
         <result column="outsourcer_brief_name" property="outsourcerBriefName" />
         <result column="outsourcer_size" property="outsourcerSize" />
         <result column="business_size" property="businessSize" />
@@ -55,32 +57,32 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, outsourcer_no, outsourcer_name, outsourcer_brief_name, outsourcer_size, business_size, grade, evaluation, tax_number, bank_account, bank_name, bank_account_number, postal_code, director, phone, fax, mobile, email, website, address_country, address_province, address_city, address_area, full_address, address_country_name, address_province_name, address_city_name, address_area_name, invoice_country, invoice_province, invoice_city, invoice_area, invoice_full_address, invoice_country_name, invoice_province_name, invoice_city_name, invoice_area_name, business_scope, business_content, minio_file_name, approval_status, process_id, remark, create_user_id, create_user_name, create_time, update_time
+        id, outsourcer_no, outsourcer_name, lab_code, group_code, outsourcer_brief_name, outsourcer_size, business_size, grade, evaluation, tax_number, bank_account, bank_name, bank_account_number, postal_code, director, phone, fax, mobile, email, website, address_country, address_province, address_city, address_area, full_address, address_country_name, address_province_name, address_city_name, address_area_name, invoice_country, invoice_province, invoice_city, invoice_area, invoice_full_address, invoice_country_name, invoice_province_name, invoice_city_name, invoice_area_name, business_scope, business_content, minio_file_name, approval_status, process_id, remark, create_user_id, create_user_name, create_time, update_time
     </sql>
 
     <select id="selectBatchForApprovalList" resultMap="BaseResultMap">
         SELECT *
         FROM biz_business_outsourcer_info
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.outsourcerNo != null and request.outsourcerNo !=''">
+        <if test="request != null and request.outsourcerNo != null and request.outsourcerNo !=''">
             and outsourcer_no like concat('%',#{request.outsourcerNo},'%')
         </if>
-        <if test="request.outsourcerName != null and request.outsourcerName !=''">
+        <if test="request != null and request.outsourcerName != null and request.outsourcerName !=''">
             and outsourcer_name like concat('%',#{request.outsourcerName},'%')
         </if>
-        <if test="request.director != null and request.director !=''">
+        <if test="request != null and request.director != null and request.director !=''">
             and director like concat('%',#{request.director},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
@@ -93,6 +95,6 @@
     </select>
 
     <select id="selectMaxNo" resultType="java.lang.Long">
-        SELECT IFNULL(max(RIGHT(outsourcer_no, 12)), 0) from biz_business_outsourcer_info
+        SELECT IFNULL(max(RIGHT(outsourcer_no, 3)), 0) from biz_business_outsourcer_info
     </select>
 </mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessSiteExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessSiteExecutiveInfoMapper.xml
index 135c5d0..3c5ae79 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessSiteExecutiveInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessSiteExecutiveInfoMapper.xml
@@ -38,25 +38,25 @@
         FROM biz_business_site_executive_info bsei
         LEFT JOIN biz_resource_customer_info rci ON bsei.customer_id = rci.id
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and bsei.approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and bsei.create_user_id = #{request.createUserId}
         </if>
-        <if test="request.siteExecutiveNo != null and request.siteExecutiveNo !=''">
+        <if test="request != null and request.siteExecutiveNo != null and request.siteExecutiveNo !=''">
             and bsei.site_executive_no like concat('%',#{request.siteExecutiveNo},'%')
         </if>
-        <if test="request.customerName != null and request.customerName !=''">
+        <if test="request != null and request.customerName != null and request.customerName !=''">
             and rci.outsourcer_name like concat('%',#{request.customerName},'%')
         </if>
-        <if test="request.applyName != null and request.applyName !=''">
+        <if test="request != null and request.applyName != null and request.applyName !=''">
             and bsei.apply_name like concat('%',#{request.applyName},'%')
         </if>
-        <if test="request.applyTimeStart != null and request.applyTimeStart !=''">
+        <if test="request != null and request.applyTimeStart != null and request.applyTimeStart !=''">
             and bsei.apply_time &gt;= #{request.applyTimeStart}
         </if>
-        <if test="request.applyTimeEnd != null and request.applyTimeEnd !=''">
+        <if test="request != null and request.applyTimeEnd != null and request.applyTimeEnd !=''">
             and bsei.apply_time &lt;= #{request.applyTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml
index 84d9e2a..6bd38a9 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml
@@ -105,6 +105,12 @@
         <if test="request.isUrgent != null and request.isUrgent !=''">
             AND bo.is_urgent = #{request.isUrgent}
         </if>
+        <if test="request.ids != null">
+            and blei.id in
+            <foreach collection="request.ids" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
         ORDER BY blei.update_time DESC
     </select>
 
@@ -137,6 +143,12 @@
         <if test="request.isUrgent != null and request.isUrgent !=''">
             AND bo.is_urgent = #{request.isUrgent}
         </if>
+        <if test="request.ids != null">
+            and blei.id in
+            <foreach collection="request.ids" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
         ORDER BY blei.update_time DESC
     </select>
 
diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardInfoMapper.xml
index 1a5551b..2ed8d17 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardInfoMapper.xml
@@ -45,12 +45,6 @@
         FROM biz_equipment_standard_info besi
         LEFT JOIN biz_equipment_standard_technology_relation bestr ON besi.standard_no = bestr.standard_no
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
-            and besi.approval_status = #{request.approvalStatus}
-        </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
-            and besi.create_user_id = #{request.createUserId}
-        </if>
         <if test="request.standardName != null and request.standardName !=''">
             and besi.standard_name like concat('%',#{request.standardName},'%')
         </if>
diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardTechnologyRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardTechnologyRelationMapper.xml
index fc7e16c..cd03c8c 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardTechnologyRelationMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardTechnologyRelationMapper.xml
@@ -6,6 +6,7 @@
     <resultMap id="BaseResultMap" type="com.casic.missiles.model.equipment.BizEquipmentStandardTechnologyRelation">
         <id column="id" property="id" />
         <result column="technology_file_id" property="technologyFileId" />
+        <result column="technology_file_no" property="technologyFileNo" />
         <result column="technology_file_name" property="technologyFileName" />
         <result column="standard_id" property="standardId" />
         <result column="standard_no" property="standardNo" />
@@ -14,7 +15,7 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, technology_file_id, technology_file_name, standard_id, remark
+        id, technology_file_id, technology_file_no, technology_file_name, standard_id, remark
     </sql>
 
 </mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceAuthorizeOrderMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceAuthorizeOrderMapper.xml
index ac5176c..554fe65 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceAuthorizeOrderMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceAuthorizeOrderMapper.xml
@@ -32,22 +32,22 @@
         SELECT *
         FROM biz_resource_authorize_order
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.orderNo != null and request.orderNo !=''">
+        <if test="request != null and request.orderNo != null and request.orderNo !=''">
             and order_no like concat('%',#{request.orderNo},'%')
         </if>
-        <if test="request.createUserName != null and request.createUserName !=''">
+        <if test="request != null and request.createUserName != null and request.createUserName !=''">
             and create_user_name like concat('%',#{request.createUserName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerExamineFormMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerExamineFormMapper.xml
index ab242f6..af7f98f 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerExamineFormMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerExamineFormMapper.xml
@@ -41,28 +41,28 @@
         SELECT *
         FROM biz_resource_customer_examine_form
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.formNo != null and request.formNo !=''">
+        <if test="request != null and request.formNo != null and request.formNo !=''">
             and form_no like concat('%',#{request.formNo},'%')
         </if>
-        <if test="request.labCode != null and request.labCode !=''">
+        <if test="request != null and request.labCode != null and request.labCode !=''">
             and lab_code like concat('%',#{request.labCode},'%')
         </if>
-        <if test="request.groupCode != null and request.groupCode !=''">
+        <if test="request != null and request.groupCode != null and request.groupCode !=''">
             and group_code like concat('%',#{request.groupCode},'%')
         </if>
-        <if test="request.createUserName != null and request.createUserName !=''">
+        <if test="request != null and request.createUserName != null and request.createUserName !=''">
             and create_user_name like concat('%',#{request.createUserName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerInfoMapper.xml
index fa8ffbc..06a2798 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerInfoMapper.xml
@@ -33,25 +33,25 @@
         SELECT *
         FROM biz_resource_customer_info
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.customerNo != null and request.customerNo !=''">
+        <if test="request != null and request.customerNo != null and request.customerNo !=''">
             and customer_no like concat('%',#{request.customerNo},'%')
         </if>
-        <if test="request.customerName != null and request.customerName !=''">
+        <if test="request != null and request.customerName != null and request.customerName !=''">
             and customer_name like concat('%',#{request.customerName},'%')
         </if>
-        <if test="request.contacts != null and request.contacts !=''">
+        <if test="request != null and request.contacts != null and request.contacts !=''">
             and contacts like concat('%',#{request.contacts},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerSuggestFormMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerSuggestFormMapper.xml
index 28f5bb2..1806662 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerSuggestFormMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerSuggestFormMapper.xml
@@ -33,28 +33,28 @@
         SELECT *
         FROM biz_resource_customer_suggest_form
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.formNo != null and request.formNo !=''">
+        <if test="request != null and request.formNo != null and request.formNo !=''">
             and form_no like concat('%',#{request.formNo},'%')
         </if>
-        <if test="request.customerName != null and request.customerName !=''">
+        <if test="request != null and request.customerName != null and request.customerName !=''">
             and customer_name like concat('%',#{request.customerName},'%')
         </if>
-        <if test="request.customerDeptName != null and request.customerDeptName !=''">
+        <if test="request != null and request.customerDeptName != null and request.customerDeptName !=''">
             and customer_dept_name like concat('%',#{request.customerDeptName},'%')
         </if>
-        <if test="request.createUserName != null and request.createUserName !=''">
+        <if test="request != null and request.createUserName != null and request.createUserName !=''">
             and create_user_name like concat('%',#{request.createUserName},'%')
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSealUseNoteMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSealUseNoteMapper.xml
index ab37bc1..b02bb33 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSealUseNoteMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSealUseNoteMapper.xml
@@ -29,32 +29,32 @@
     </sql>
 
     <select id="selectBatchForApprovalList" resultMap="BaseResultMap">
-        SELECT *
+        SELECT brsun.*, brsi.seal_name, brsi.seal_type, brsi.approver_name
         FROM biz_resource_seal_use_note brsun
         JOIN biz_resource_seal_info brsi ON brsun.seal_id = brsi.id
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and brsun.approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and brsun.create_user_id = #{request.createUserId}
         </if>
-        <if test="request.sealName != null and request.sealName !=''">
+        <if test="request != null and request.sealName != null and request.sealName !=''">
             and brsi.seal_name like concat('%',#{request.sealName},'%')
         </if>
-        <if test="request.sealType != null and request.sealType !=''">
+        <if test="request != null and request.sealType != null and request.sealType !=''">
             and brsi.seal_type = #{request.sealType}
         </if>
-        <if test="request.applyDeptName != null and request.applyDeptName !=''">
+        <if test="request != null and request.applyDeptName != null and request.applyDeptName !=''">
             and brsun.apply_dept_name like concat('%',#{request.applyDeptName},'%')
         </if>
-        <if test="request.applyUserName != null and request.applyUserName !=''">
+        <if test="request != null and request.applyUserName != null and request.applyUserName !=''">
             and brsun.apply_user_name like concat('%',#{request.applyUserName},'%')
         </if>
-        <if test="request.applyTimeStart != null and request.applyTimeStart !=''">
+        <if test="request != null and request.applyTimeStart != null and request.applyTimeStart !=''">
             and brsun.apply_time &gt;= #{request.applyTimeStart}
         </if>
-        <if test="request.applyTimeEnd != null and request.applyTimeEnd !=''">
+        <if test="request != null and request.applyTimeEnd != null and request.applyTimeEnd !=''">
             and brsun.apply_time &lt;= #{request.applyTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml
index 119bf7d..4f8392a 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceStaffVerifierMapper.xml
@@ -31,6 +31,12 @@
         <if test="request.deptName != null and request.deptName !=''">
             and brsi.dept_name like concat('%',#{request.deptName},'%')
         </if>
+        <if test="request.ids != null">
+            and brsv.id in
+            <foreach collection="request.ids" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
         ORDER BY brsv.grant_date DESC
     </select>
 
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSupplierInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSupplierInfoMapper.xml
index fe8d399..e8ce7ef 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSupplierInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSupplierInfoMapper.xml
@@ -48,28 +48,28 @@
         SELECT *
         FROM biz_resource_supplier_info
         WHERE 1=1
-        <if test="request.approvalStatus != null and request.approvalStatus !=''">
+        <if test="request != null and request.approvalStatus != null and request.approvalStatus !=''">
             and approval_status = #{request.approvalStatus}
         </if>
-        <if test="request.createUserId != null and request.createUserId !=''">
+        <if test="request != null and request.createUserId != null and request.createUserId !=''">
             and create_user_id = #{request.createUserId}
         </if>
-        <if test="request.supplierNo != null and request.supplierNo !=''">
+        <if test="request != null and request.supplierNo != null and request.supplierNo !=''">
             and supplier_no like concat('%',#{request.supplierNo},'%')
         </if>
-        <if test="request.supplierName != null and request.supplierName !=''">
+        <if test="request != null and request.supplierName != null and request.supplierName !=''">
             and supplier_name like concat('%',#{request.supplierName},'%')
         </if>
-        <if test="request.director != null and request.director !=''">
+        <if test="request != null and request.director != null and request.director !=''">
             and director like concat('%',#{request.director},'%')
         </if>
-        <if test="request.supplierType != null and request.supplierType !=''">
+        <if test="request != null and request.supplierType != null and request.supplierType !=''">
             and supplier_type = #{request.supplierType}
         </if>
-        <if test="request.createTimeStart != null and request.createTimeStart !=''">
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
             and create_time &gt;= #{request.createTimeStart}
         </if>
-        <if test="request.createTimeEnd != null and request.createTimeEnd !=''">
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
             and create_time &lt;= #{request.createTimeEnd}
         </if>
         <if test="businessKeys != null">
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/EnvLocationInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/EnvLocationInfoMapper.xml
new file mode 100644
index 0000000..68bcf10
--- /dev/null
+++ b/casic-metering-dao/src/main/resources/mapper/resource/EnvLocationInfoMapper.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.mapper.resource.EnvLocationInfoMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.resource.EnvLocationInfo">
+        <id column="id" property="id" />
+        <result column="location_no" property="locationNo" />
+        <result column="location_name" property="locationName" />
+        <result column="location_position" property="locationPosition" />
+        <result column="create_user_id" property="createUserId" />
+        <result column="create_user" property="createUser" />
+        <result column="create_time" property="createTime" />
+        <result column="update_time" property="updateTime" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, location_no, location_name, location_position, create_user_id, create_user, create_time, update_time
+    </sql>
+
+    <select id="selectLocationListPage" resultType="com.casic.missiles.dto.resource.environment.LocationListResponse">
+        SELECT *
+        FROM env_location_info
+        WHERE 1=1
+        <if test="request.locationNo != null and request.locationNo !=''">
+            AND location_no LIKE concat('%',#{request.locationNo},'%')
+        </if>
+        <if test="request.locationName != null and request.locationName !=''">
+            AND location_name LIKE concat('%',#{request.locationName},'%')
+        </if>
+        ORDER BY create_time DESC
+    </select>
+
+</mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml
index b28c18f..8854047 100644
--- a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml
@@ -11,7 +11,6 @@
         <result column="sign_desc" property="signDesc" />
         <result column="sign_director" property="signDirector" />
         <result column="sign_user_id" property="signUserId" />
-        <result column="sign_type" property="signType" />
         <result column="minio_file_name" property="minioFileName" />
         <result column="create_time" property="createTime" />
         <result column="update_time" property="updateTime" />
@@ -28,7 +27,6 @@
         <result column="sign_name" property="signName" />
         <result column="sign_desc" property="signDesc" />
         <result column="sign_director" property="signDirector" />
-        <result column="sign_type" property="signType" />
         <result column="sign_user_id" property="signUserId" />
         <result column="minio_file_name" property="minioFileName" />
         <result column="create_time" property="createTime" />
@@ -62,4 +60,58 @@
         JOIN system_sign_user_relation ssur ON ss.id = ssur.sign_id
         WHERE ssur.user_id = #{userId}
     </select>
+
+    <select id="selectSignListPage" resultMap="BaseResultMap">
+        SELECT ss.*, sd.SIMPLE_NAME AS deptName
+        FROM system_sign ss
+        LEFT JOIN sys_user su ON su.id = ss.sign_user_id
+        LEFT JOIN sys_dept sd ON sd.id = su.dept_id
+        WHERE 1=1
+        <if test="request.signNo != null and request.signNo !=''">
+            AND ss.sign_no LIKE concat('%',#{request.signNo},'%')
+        </if>
+        <if test="request.signName != null and request.signName !=''">
+            AND ss.sign_name LIKE concat('%',#{request.signName},'%')
+        </if>
+        <if test="request.signDirector != null and request.signDirector !=''">
+            AND ss.sign_director LIKE concat('%',#{request.signDirector},'%')
+        </if>
+        <if test="request.signUserId != null and request.signUserId !=''">
+            AND ss.sign_user_id = #{request.signUserId}
+        </if>
+        <if test="request.createStartTime != null and request.createStartTime !=''">
+            AND DATE_FORMAT(ss.create_time,'%Y-%m-%d') &gt;= DATE_FORMAT(#{request.createStartTime},'%Y-%m-%d')
+        </if>
+        <if test="request.createEndTime != null and request.createEndTime !=''">
+            AND DATE_FORMAT(ss.create_time,'%Y-%m-%d')  &lt;= DATE_FORMAT(#{request.createEndTime},'%Y-%m-%d')
+        </if>
+        ORDER BY ss.create_time DESC
+    </select>
+
+    <select id="selectSignList" resultMap="BaseResultMap">
+        SELECT ss.*, sd.SIMPLE_NAME AS deptName
+        FROM system_sign ss
+        LEFT JOIN sys_user su ON su.id = ss.sign_user_id
+        LEFT JOIN sys_dept sd ON sd.id = su.dept_id
+        WHERE 1=1
+        <if test="request.signNo != null and request.signNo !=''">
+            AND ss.sign_no LIKE concat('%',#{request.signNo},'%')
+        </if>
+        <if test="request.signName != null and request.signName !=''">
+            AND ss.sign_name LIKE concat('%',#{request.signName},'%')
+        </if>
+        <if test="request.signDirector != null and request.signDirector !=''">
+            AND ss.sign_director LIKE concat('%',#{request.signDirector},'%')
+        </if>
+        <if test="request.signUserId != null and request.signUserId !=''">
+            AND ss.sign_user_id = #{request.signUserId}
+        </if>
+        <if test="request.createStartTime != null and request.createStartTime !=''">
+            AND DATE_FORMAT(ss.create_time,'%Y-%m-%d') &gt;= DATE_FORMAT(#{request.createStartTime},'%Y-%m-%d')
+        </if>
+        <if test="request.createEndTime != null and request.createEndTime !=''">
+            AND DATE_FORMAT(ss.create_time,'%Y-%m-%d')  &lt;= DATE_FORMAT(#{request.createEndTime},'%Y-%m-%d')
+        </if>
+        ORDER BY ss.create_time DESC
+    </select>
 </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 515050a..60f530b 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
@@ -47,8 +47,8 @@
     String STORAGE_LOCATION = "bizStorageLocation";
     //计量专业
     String MEASURE_MAJOR = "bizMeasureMajor";
-    //管理状态
-    String MANAGER_STATE = "bizManagerState";
+    //标准装置管理状态
+    String STANDARD_MANAGER_STATE = "bizStandardManagerState";
 
     /**
      * 资源管理 字典code
@@ -95,8 +95,6 @@
     String MEASURE_STATUS = "measureStatus";
     //检定方式
     String MEASURE_TYPE = "measureType";
-    //标识打印标志类型
-    String IDENTIFY_PRINT_TYPE = "bizBusinessIdentify";
     //变更类型
     String REPORT_CHANGE_TYPE = "bizCertChangeType";
     //规模类型
@@ -111,19 +109,24 @@
     String MEASURE_CATEGORY = "measureCategory";
     //检定结果
     String MEASURE_RESULT = "measureResult";
+    //分包原因
+    String OUTSOURCE_REASON = "outsourceReason";
+
+    /**
+     * 系统管理
+     */
+    String TEMPLATE_TYPE = "templateType";
+
 
     /**
      * 标准装置 字典code
      */
     //类别
     String STANDARD_CATEGORY = "standardCategory";
-    //管理状态
-    String STANDARD_MANAGER_STATE = "standardManagerState";
     //标准等级
     String STANDARD_LEVEL = "standardLevel";
     //传递范围
     String STANDARD_TRANSMIT_RANGE = "transmitRange";
-
     //资本来源
     String CAPITAL_SOURCE = "capitalSource";
     //标准装置-申请类型
@@ -148,8 +151,6 @@
     String CERTIFICATE_CLASS = "certificationClass";
     //证书管理-检校专业
     String CALIBRATION_MAJOR = "calibrationMajor";
-    //分包原因
-    String OUTSOURCE_REASON = "outsourceReason";
 
     /**
      * 工作台
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/BaseApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/BaseApprovalListRequest.java
index 73c12c1..80d7424 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/BaseApprovalListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/BaseApprovalListRequest.java
@@ -6,6 +6,7 @@
 
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotEmpty;
+import java.util.List;
 
 /**
  * @Description:
@@ -19,14 +20,14 @@
      * 表单id
      */
     @NotBlank(message = "表单id不能为空")
-    @ApiModelProperty(value = "表单id（流程定义对应的表单id，等价于业务id）", dataType = "String")
+    @ApiModelProperty(value = "表单id（流程定义对应的表单id，等价于业务id），导出接口不用传", dataType = "String")
     private String formId;
 
     /**
      * 审批状态类型，对应ApprovalStatusEnum
      */
     @NotEmpty(message = "审批状态类型不能为空")
-    @ApiModelProperty(value = "审批状态类型code", dataType = "String")
+    @ApiModelProperty(value = "审批状态类型code，导出接口不用传", dataType = "String")
     private String approvalStatus;
 
     @ApiModelProperty(hidden = true)
@@ -34,4 +35,7 @@
 
     @ApiModelProperty(hidden = true)
     private Long createUserId;
+
+    @ApiModelProperty(value = "导出ids", dataType = "List")
+    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificatePrintApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificatePrintApprovalListRequest.java
index b93d1c9..3cc2f4e 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificatePrintApprovalListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificatePrintApprovalListRequest.java
@@ -5,8 +5,6 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import java.util.List;
-
 /**
  * @Description:
  * @Author: wangpeng
@@ -38,7 +36,4 @@
 
     @ApiModelProperty(value = "创建结束时间", dataType = "String")
     private String createTimeEnd;
-
-    @ApiModelProperty(value = "导出ids", dataType = "List")
-    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportApprovalListRequest.java
index 4f7a038..c115847 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportApprovalListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportApprovalListRequest.java
@@ -5,8 +5,6 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import java.util.List;
-
 /**
  * @Description:
  * @Author: wangpeng
@@ -15,6 +13,8 @@
 @ApiModel
 @Data
 public class CertificateReportApprovalListRequest extends BaseApprovalListRequest {
+    @ApiModelProperty(value = "委托方id", dataType = "String")
+    private Long customerId;
 
     @ApiModelProperty(value = "证书报告编号", dataType = "String")
     private String certificateReportNo;
@@ -37,6 +37,4 @@
     @ApiModelProperty(value = "检校结束时间", dataType = "String")
     private String calibrationTimeEnd;
 
-    @ApiModelProperty(value = "导出ids", dataType = "List")
-    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/identify/IdentifyListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/identify/IdentifyListRequest.java
index 1b87ae6..f019203 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/identify/IdentifyListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/identify/IdentifyListRequest.java
@@ -4,6 +4,8 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * @Description:
  * @Author: wangpeng
@@ -26,4 +28,7 @@
 
     @ApiModelProperty(value = "打印结束时间", dataType = "String")
     private String createTimeEnd;
+
+    @ApiModelProperty(value = "导出ids", dataType = "List")
+    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListRequest.java
index 1264883..62415fb 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListRequest.java
@@ -7,6 +7,7 @@
 import lombok.Data;
 
 import javax.validation.constraints.NotBlank;
+import java.util.List;
 
 @Data
 @ApiModel
@@ -37,4 +38,6 @@
     @ApiModelProperty(value = "是否加急（1是0否null全部）", dataType = "Integer")
     private String isUrgent;
 
+    @ApiModelProperty(value = "导出ids", dataType = "List")
+    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListRequest.java
index 5201d7b..499760a 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListRequest.java
@@ -17,6 +17,9 @@
     @ApiModelProperty(value = "任务单编号", dataType = "String")
     private String orderNo;
 
+    @ApiModelProperty(value = "委托方id", dataType = "Long")
+    private Long customerId;
+
     @ApiModelProperty(value = "委托方名称", dataType = "String")
     private String customerName;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OrderSampleDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OrderSampleDTO.java
new file mode 100644
index 0000000..796edc0
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OrderSampleDTO.java
@@ -0,0 +1,19 @@
+package com.casic.missiles.dto.business.outsource;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/8/24 11:38
+ */
+@ApiModel
+@Data
+public class OrderSampleDTO {
+    @ApiModelProperty(value = "任务单id", dataType = "Long")
+    private Long orderId;
+    @ApiModelProperty(value = "受检设备id", dataType = "Long")
+    private Long sampleId;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceAssessApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceAssessApprovalListRequest.java
new file mode 100644
index 0000000..9a930c3
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceAssessApprovalListRequest.java
@@ -0,0 +1,30 @@
+package com.casic.missiles.dto.business.outsource;
+
+import com.casic.missiles.dto.BaseApprovalListRequest;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/8/24 11:01
+ */
+@ApiModel
+@Data
+public class OutsourceAssessApprovalListRequest extends BaseApprovalListRequest {
+    @ApiModelProperty(value = "评审表编号", dataType = "String")
+    private String projectNo;
+
+    @ApiModelProperty(value = "分包机构名称", dataType = "String")
+    private String outsourcerName;
+
+    @ApiModelProperty(value = "申请人", dataType = "String")
+    private String applicantName;
+
+    @ApiModelProperty(value = "申请时间开始", dataType = "String")
+    private String applicantTimeStart;
+
+    @ApiModelProperty(value = "申请时间结束", dataType = "String")
+    private String applicantTimeEnd;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceAssessSaveResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceAssessSaveResponse.java
new file mode 100644
index 0000000..8bf9aad
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceAssessSaveResponse.java
@@ -0,0 +1,20 @@
+package com.casic.missiles.dto.business.outsource;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/8/14 16:17
+ */
+@ApiModel
+@Data
+public class OutsourceAssessSaveResponse {
+    @ApiModelProperty(value = "主键id", dataType = "Long")
+    private Long id;
+
+    @ApiModelProperty(value = "编号", dataType = "String")
+    private String projectNo;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProtocolApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProtocolApprovalListRequest.java
new file mode 100644
index 0000000..0f32331
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProtocolApprovalListRequest.java
@@ -0,0 +1,30 @@
+package com.casic.missiles.dto.business.outsource;
+
+import com.casic.missiles.dto.BaseApprovalListRequest;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/8/24 15:01
+ */
+@ApiModel
+@Data
+public class OutsourceProtocolApprovalListRequest extends BaseApprovalListRequest {
+    @ApiModelProperty(value = "协议书编号", dataType = "String")
+    private String protocolNo;
+
+    @ApiModelProperty(value = "分包方名称", dataType = "String")
+    private String outsourcerName;
+
+    @ApiModelProperty(value = "申请人", dataType = "String")
+    private String applicantName;
+
+    @ApiModelProperty(value = "申请时间开始", dataType = "String")
+    private String applicantTimeStart;
+
+    @ApiModelProperty(value = "申请时间结束", dataType = "String")
+    private String applicantTimeEnd;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProtocolSaveResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProtocolSaveResponse.java
new file mode 100644
index 0000000..e324967
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProtocolSaveResponse.java
@@ -0,0 +1,20 @@
+package com.casic.missiles.dto.business.outsource;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/8/14 16:17
+ */
+@ApiModel
+@Data
+public class OutsourceProtocolSaveResponse {
+    @ApiModelProperty(value = "主键id", dataType = "Long")
+    private Long id;
+
+    @ApiModelProperty(value = "编号", dataType = "String")
+    private String protocolNo;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveApprovalListRequest.java
index f29f4e4..7047c28 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveApprovalListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveApprovalListRequest.java
@@ -5,8 +5,6 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import java.util.List;
-
 /**
  * @Description: 现场检测审批列表请求实体
  * @Author: wangpeng
@@ -30,7 +28,4 @@
     @ApiModelProperty(value = "申请时间结束", dataType = "String")
     private String applyTimeEnd;
 
-    @ApiModelProperty(value = "导出ids", dataType = "List")
-    private List<Long> ids;
-
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveDetailResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveDetailResponse.java
index 1f28752..394c934 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveDetailResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveDetailResponse.java
@@ -12,6 +12,18 @@
     @ApiModelProperty(value = "id，更新/删除使用参数", dataType = "Long")
     private Long id;
 
+    @ApiModelProperty(value = "实验室代码(字典code)", dataType = "String")
+    private String labCode;
+
+    @ApiModelProperty(value = "实验室代码(字典value)", dataType = "String")
+    private String labCodeName;
+
+    @ApiModelProperty(value = "组别代码(字典code)", dataType = "String")
+    private String groupCode;
+
+    @ApiModelProperty(value = "组别代码(字典value)", dataType = "String")
+    private String groupCodeName;
+
     @ApiModelProperty(value = "审批编号", dataType = "String")
     private String siteExecutiveNo;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/environment/LocationListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/environment/LocationListRequest.java
new file mode 100644
index 0000000..13d03c3
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/environment/LocationListRequest.java
@@ -0,0 +1,20 @@
+package com.casic.missiles.dto.resource.environment;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/6/8 13:56
+ */
+@ApiModel
+@Data
+public class LocationListRequest {
+    @ApiModelProperty(value = "地点编号", dataType = "String")
+    private String locationNo;
+
+    @ApiModelProperty(value = "地点名称", dataType = "String")
+    private String locationName;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/environment/LocationListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/environment/LocationListResponse.java
new file mode 100644
index 0000000..4c531af
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/environment/LocationListResponse.java
@@ -0,0 +1,78 @@
+package com.casic.missiles.dto.resource.environment;
+
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
+import com.baomidou.mybatisplus.annotation.TableField;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description: 地点列表响应实体
+ * @Author: wangpeng
+ * @Date: 2023/6/8 13:53
+ */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
+@ApiModel
+@Data
+public class LocationListResponse {
+    @ApiModelProperty(value = "主键id", dataType = "Long")
+    private Long id;
+
+    /**
+     * 地点编号
+     */
+    @ExcelProperty("地点编号")
+    @ApiModelProperty(value = "地点编号", dataType = "String")
+    private String locationNo;
+
+    /**
+     * 地点名称
+     */
+    @ExcelProperty("地点名称")
+    @ApiModelProperty(value = "地点名称", dataType = "String")
+    private String locationName;
+
+    /**
+     * 地点位置
+     */
+    @ExcelProperty("地点位置")
+    @ApiModelProperty(value = "地点位置", dataType = "String")
+    private String locationPosition;
+
+    /**
+     * 创建人id
+     */
+    @ApiModelProperty(value = "创建人id", dataType = "Long")
+    private Long createUserId;
+
+    /**
+     * 创建人
+     */
+    @ExcelProperty("创建人")
+    @ApiModelProperty(value = "创建人", dataType = "String")
+    @TableField("create_user")
+    private String createUser;
+
+    /**
+     * 创建时间
+     */
+    @ExcelProperty("创建时间")
+    @ApiModelProperty(value = "创建时间", dataType = "String")
+    private String createTime;
+
+    /**
+     * 更新时间
+     */
+    @ApiModelProperty(value = "更新时间", dataType = "String")
+    private String updateTime;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertRequest.java
index 9a7f6c6..c827915 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertRequest.java
@@ -4,6 +4,8 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * @Description:
  * @Author: wangpeng
@@ -16,4 +18,7 @@
     private String name;
     @ApiModelProperty(value = "部门名", dataType = "String")
     private String deptName;
+
+    @ApiModelProperty(value = "导出ids", dataType = "List")
+    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertResponse.java
index f78b159..8f2f79e 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffCertResponse.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.dto.resource.staff;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.casic.missiles.annotation.DictCodeField;
 import com.casic.missiles.constants.MeterDictCode;
 import io.swagger.annotations.ApiModel;
@@ -13,12 +20,18 @@
  * @Author: wangpeng
  * @Date: 2023/7/27 15:13
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @ApiModel
 @Data
 public class StaffCertResponse {
     /**
      * 人员编号
      */
+    @ExcelProperty(value = "人员编号",order = 0)
     @NotEmpty(message = "人员编号不能为空")
     @ApiModelProperty(value = "人员编号", dataType = "String")
     private String staffNo;
@@ -26,6 +39,7 @@
     /**
      * 姓名
      */
+    @ExcelProperty(value = "姓名",order = 1)
     @ApiModelProperty(value = "姓名", dataType = "String")
     private String staffName;
 
@@ -54,6 +68,7 @@
     /**
      * 部门名字
      */
+    @ExcelProperty(value = "工作部门",order = 2)
     @ApiModelProperty(value = "部门名字", dataType = "String")
     private String deptName;
 
@@ -66,6 +81,7 @@
     /**
      * 计量专业
      */
+    @ExcelProperty(value = "计量专业",order = 3)
     @ApiModelProperty(value = "计量专业", dataType = "String")
     private String major;
 
@@ -110,6 +126,7 @@
     /**
      * 证书号
      */
+    @ExcelProperty(value = "证号",order = 4)
     @ApiModelProperty(value = "证书号", dataType = "String")
     private String certNo;
 
@@ -122,12 +139,14 @@
     /**
      * 有效日期
      */
+    @ExcelProperty(value = "证书有效期",order = 6)
     @ApiModelProperty(value = "有效日期", dataType = "String")
     private String effectiveDate;
 
     /**
      * 发放日期
      */
+    @ExcelProperty(value = "发证日期",order = 5)
     @ApiModelProperty(value = "发放日期", dataType = "String")
     private String grantDate;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffListRequest.java
index 7c4afb3..0a1194a 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/StaffListRequest.java
@@ -4,6 +4,8 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * @Description:
  * @Author: wangpeng
@@ -18,4 +20,7 @@
     private String deptName;
     @ApiModelProperty(value = "部门id", dataType = "Long")
     private Long deptId;
+
+    @ApiModelProperty(value = "导出ids", dataType = "List")
+    private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/TrainListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/TrainListRequest.java
index f68597b..6321f8b 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/TrainListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/staff/TrainListRequest.java
@@ -14,6 +14,8 @@
 public class TrainListRequest {
     @ApiModelProperty(value = "训练登记表编号", dataType = "String")
     private String trainNo;
+    @ApiModelProperty(value = "值班领导", dataType = "String")
+    private String dutyLeader;
     @ApiModelProperty(value = "创建开始时间", dataType = "String")
     private String createTimeStart;
     @ApiModelProperty(value = "创建结束时间", dataType = "String")
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/SignAddRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/SignAddRequest.java
index 117be34..d71055c 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/SignAddRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/SignAddRequest.java
@@ -43,13 +43,6 @@
     private Long signUserId;
 
     /**
-     * 签章或签名-字典code
-     */
-    @NotBlank(message = "类型不能为空")
-    @ApiModelProperty(value = "签名/签章-字典code", dataType = "String", required = true)
-    private String signType;
-
-    /**
      * minio存储文件名
      */
     @ApiModelProperty(value = "上传文件返回名称", dataType = "String")
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateAddRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateAddRequest.java
index aff1265..6316648 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateAddRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateAddRequest.java
@@ -17,30 +17,28 @@
 @Data
 public class TemplateAddRequest extends BaseSystemRequest {
     /**
-     * 原始记录模板/证书报告模板名称
+     * 模板名称
      */
     @ApiModelProperty(value = "名称", dataType = "String", required = true)
     @NotBlank(message = "名称不能为空")
     private String templateName;
 
     /**
-     * 原始记录模板/证书报告模板描述
+     * 模板描述
      */
     @ApiModelProperty(value = "描述", dataType = "String")
     private String templateDesc;
 
     /**
-     * 原始记录模板/证书报告模板创建人
+     * 创建人
      */
     @ApiModelProperty(value = "创建人", dataType = "String", required = true)
     @NotBlank(message = "创建人不能为空")
     private String templateCreator;
 
-    /**
-     * 原始记录模板/证书报告模板-字典code
-     */
-    @NotBlank(message = "类型不能为空")
-    @ApiModelProperty(value = "原始记录模板/证书报告模板-字典code", dataType = "String", required = true)
+
+    @NotBlank(message = "模板类型不能为空")
+    @ApiModelProperty(value = "模板类型(字典code)", dataType = "String", required = true)
     private String templateType;
 
     /**
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateListRequest.java
index eec5a1e..6d17bbe 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateListRequest.java
@@ -1,11 +1,12 @@
 package com.casic.missiles.dto.system;
 
+import com.casic.missiles.annotation.DictCodeField;
+import com.casic.missiles.constants.MeterDictCode;
 import com.casic.missiles.dto.BaseSystemRequest;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import javax.validation.constraints.NotBlank;
 import java.util.List;
 
 /**
@@ -19,8 +20,8 @@
     /**
      * 类型
      */
-//    @ApiModelProperty(value = "类型-字典code", dataType = "String", required = true)
-    @NotBlank(message = "类型不能为空")
+    @DictCodeField(message = "模板类型不合法", cacheName = MeterDictCode.TEMPLATE_TYPE)
+    @ApiModelProperty(value = "模板类型(字典code)", dataType = "String")
     private String templateType;
 
     /**
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificateChangeApply.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificateChangeApply.java
index 9216308..36923fd 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificateChangeApply.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificateChangeApply.java
@@ -1,11 +1,19 @@
 package com.casic.missiles.model.business;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 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 com.casic.missiles.dto.BaseRequest;
+import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -20,6 +28,12 @@
  * @author wangpeng
  * @since 2023-08-15
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
+@ApiModel
 @Data
 @TableName("biz_business_certificate_change_apply")
 public class BizBusinessCertificateChangeApply extends BaseRequest implements Serializable {
@@ -33,6 +47,7 @@
     /**
      * 申请单编号
      */
+    @ExcelProperty(value = "申请单编号", order = 1)
     @ApiModelProperty(value = "申请单编号", dataType = "String")
     @TableField("change_apply_no")
     private String changeApplyNo;
@@ -40,6 +55,7 @@
     /**
      * 申请单名字
      */
+    @ExcelProperty(value = "申请单名称", order = 2)
     @ApiModelProperty(value = "申请单名字", dataType = "String")
     @TableField("change_apply_name")
     private String changeApplyName;
@@ -54,6 +70,7 @@
     /**
      * 更换证书编号
      */
+    @ExcelProperty(value = "更换证书编号", order = 3)
     @ApiModelProperty(value = "更换证书编号", dataType = "String")
     @TableField("change_report_no")
     private String changeReportNo;
@@ -61,7 +78,8 @@
     /**
      * 更换证书名字
      */
-    @ApiModelProperty(value = "更换证书名字", dataType = "String")
+    @ExcelProperty(value = "更换证书/报告名称", order = 4)
+    @ApiModelProperty(value = "更换证书/报告名称", dataType = "String")
     @TableField("change_report_name")
     private String changeReportName;
 
@@ -73,6 +91,7 @@
     @TableField("change_type")
     private String changeType;
 
+    @ExcelProperty(value = "变更类型", order = 5)
     @ApiModelProperty(value = "变更类型(字典value)", dataType = "String")
     @TableField(exist = false)
     private String changeTypeName;
@@ -142,13 +161,15 @@
     /**
      * 创建用户名字
      */
-    @ApiModelProperty(value = "创建用户名字", dataType = "String")
+    @ExcelProperty(value = "创建人", order = 6)
+    @ApiModelProperty(value = "创建人名字", dataType = "String")
     @TableField("create_user_name")
     private String createUserName;
 
     /**
      * 创建时间
      */
+    @ExcelProperty(value = "创建时间", order = 7)
     @ApiModelProperty(value = "创建时间", dataType = "String")
     @TableField("create_time")
     private String createTime;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificateReport.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificateReport.java
index f01db9e..db06018 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificateReport.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificateReport.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.model.business;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -22,6 +29,11 @@
  * @author wangpeng
  * @since 2023-08-14
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @ApiModel
 @Data
 @TableName("biz_business_certificate_report")
@@ -36,6 +48,7 @@
     /**
      * 证书报告编号
      */
+    @ExcelProperty(value = "证书报告编号", order = 1)
     @ApiModelProperty(value = "证书报告编号", dataType = "String")
     @TableField("certificate_report_no")
     private String certificateReportNo;
@@ -43,6 +56,7 @@
     /**
      * 证书报告名称
      */
+    @ExcelProperty(value = "证书报告名称", order = 2)
     @ApiModelProperty(value = "证书报告名称", dataType = "String")
     @TableField("certificate_report_name")
     private String certificateReportName;
@@ -62,6 +76,7 @@
     @TableField("measure_category")
     private String measureCategory;
 
+    @ExcelProperty(value = "检校类别", order = 6)
     @ApiModelProperty(value = "检校类别(字典value)", dataType = "String")
     @TableField(exist = false)
     private String measureCategoryName;
@@ -69,6 +84,7 @@
     /**
      * 检校时间
      */
+    @ExcelProperty(value = "检校时间", order = 8)
     @ApiModelProperty(value = "检校时间", dataType = "String")
     @TableField("calibration_time")
     private String calibrationTime;
@@ -267,18 +283,22 @@
     @TableField(exist = false)
     private Integer decisionItem;
 
-    @ApiModelProperty(value = "设备样品编号（列表返回参数）", dataType = "String")
+    @ExcelProperty(value = "被检设备统一编号", order = 3)
+    @ApiModelProperty(value = "被检设备统一编号（列表返回参数）", dataType = "String")
     @TableField(exist = false)
     private String sampleNo;
 
-    @ApiModelProperty(value = "设备样品名称（列表返回参数）", dataType = "String")
+    @ExcelProperty(value = "被检设备名称", order = 4)
+    @ApiModelProperty(value = "被检设备名称（列表返回参数）", dataType = "String")
     @TableField(exist = false)
     private String sampleName;
 
-    @ApiModelProperty(value = "设备样品规格型号（列表返回参数）", dataType = "String")
+    @ExcelProperty(value = "规格型号", order = 5)
+    @ApiModelProperty(value = "规格型号（列表返回参数）", dataType = "String")
     @TableField(exist = false)
     private String sampleModel;
 
+    @ExcelProperty(value = "检定员", order = 7)
     @ApiModelProperty(value = "检定员名字（列表返回参数）", dataType = "String")
     @TableField(exist = false)
     private String staffName;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessIdentifyInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessIdentifyInfo.java
index 46bfba5..f1a9bec 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessIdentifyInfo.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessIdentifyInfo.java
@@ -1,10 +1,15 @@
 package com.casic.missiles.model.business;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 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;
 
@@ -20,6 +25,11 @@
  * @author wangpeng
  * @since 2023-08-15
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @Data
 @TableName("biz_business_identify_info")
 public class BizBusinessIdentifyInfo implements Serializable {
@@ -33,6 +43,7 @@
     /**
      * 记录编号
      */
+    @ExcelProperty(value = "记录编号", order = 1)
     @ApiModelProperty(value = "记录编号", dataType = "String")
     @TableField("record_no")
     private String recordNo;
@@ -41,20 +52,15 @@
      * 标志类型(字典code)
      */
     @NotEmpty(message = "标志类型不能为空")
-    @ApiModelProperty(value = "标志类型(字典code)", dataType = "String")
-    @DictCodeField(message = "标志类型不合法", cacheName = MeterDictCode.IDENTIFY_PRINT_TYPE)
+    @ApiModelProperty(value = "标志类型(直接存计量标识/使用状态/校准状态的字典value)", dataType = "String")
     @TableField("identify_type")
     private String identifyType;
 
-    @ApiModelProperty(value = "标志类型(字典value)", dataType = "String")
-    @TableField(exist = false)
-    private String identifyTypeName;
-
     /**
      * 设备id(可以是受检设备/设备台账)
      */
     @NotNull(message = "设备id不能为空")
-    @ApiModelProperty(value = "设备id(可以是受检设备/设备台账)", dataType = "String")
+    @ApiModelProperty(value = "设备id(可以是受检设备/设备台账)", dataType = "Long")
     @TableField("device_id")
     private Long deviceId;
 
@@ -66,29 +72,32 @@
     @TableField("device_type")
     private String deviceType;
 
+    @ExcelProperty(value = "统一编号", order = 3)
     @NotEmpty(message = "设备编号不能为空")
-    @ApiModelProperty(value = "设备编号", dataType = "String")
+    @ApiModelProperty(value = "统一编号", dataType = "String")
     @TableField("device_no")
     private String deviceNo;
 
     /**
      * 设备名字
      */
-    @NotEmpty(message = "设备名字不能为空")
-    @ApiModelProperty(value = "设备名字", dataType = "String")
+    @ExcelProperty(value = "设备名称", order = 4)
+    @NotEmpty(message = "设备名称不能为空")
+    @ApiModelProperty(value = "设备名称", dataType = "String")
     @TableField("device_name")
     private String deviceName;
 
     /**
      * 检定员id
      */
-    @ApiModelProperty(value = "检定员id", dataType = "String")
+    @ApiModelProperty(value = "检定员id", dataType = "Long")
     @TableField("measure_person_id")
     private Long measurePersonId;
 
     /**
      * 检定员名字
      */
+    @ExcelProperty(value = "检定员", order = 5)
     @ApiModelProperty(value = "检定员名字", dataType = "String")
     @TableField("measure_person")
     private String measurePerson;
@@ -103,7 +112,8 @@
     /**
      * 更新时间
      */
-    @ApiModelProperty(value = "更新时间", dataType = "String")
+    @ExcelProperty(value = "打印时间", order = 6)
+    @ApiModelProperty(value = "打印时间", dataType = "String")
     @TableField("update_time")
     private String updateTime;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceAssess.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceAssess.java
index 659d9ca..6720b90 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceAssess.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceAssess.java
@@ -1,11 +1,26 @@
 package com.casic.missiles.model.business;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 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 com.casic.missiles.dto.BaseRequest;
+import com.casic.missiles.dto.business.outsource.OrderSampleDTO;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import javax.validation.constraints.NotEmpty;
 import java.io.Serializable;
+import java.util.List;
 
 /**
  * <p>
@@ -15,146 +30,231 @@
  * @author wangpeng
  * @since 2023-08-16
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
+@ApiModel
 @Data
 @TableName("biz_business_outsource_assess")
-public class BizBusinessOutsourceAssess implements Serializable {
+public class BizBusinessOutsourceAssess extends BaseRequest implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
+    @ApiModelProperty(value = "id，更新/删除使用参数", dataType = "Long")
     @TableId("id")
     private Long id;
 
     /**
      * 评审表编号
      */
+    @ExcelProperty(value = "评审表编号", order = 1)
+    @ApiModelProperty(value = "评审表编号(后台生成)", dataType = "String")
     @TableField("project_no")
     private String projectNo;
 
     /**
      * 评审表名称
      */
+    @ExcelProperty(value = "评审表名称", order = 2)
+    @ApiModelProperty(value = "评审表名称", dataType = "String")
     @TableField("project_name")
     private String projectName;
 
+    @NotEmpty(message = "实验室代码不能为空")
+    @DictCodeField(message = "实验室代码描述不合法", cacheName = MeterDictCode.LAB_CODE)
+    @ApiModelProperty(value = "实验室代码(字典code)", dataType = "String")
+    @TableField("lab_code")
+    private String labCode;
+
+    @ApiModelProperty(value = "实验室代码(字典value)", dataType = "String")
+    @TableField(exist = false)
+    private String labCodeName;
+
+    /**
+     * 组别代码
+     */
+    @NotEmpty(message = "组别代码不能为空")
+    @DictCodeField(message = "组别代码描述不合法", cacheName = MeterDictCode.GROUP_CODE)
+    @ApiModelProperty(value = "组别代码(字典code)", dataType = "String")
+    @TableField("group_code")
+    private String groupCode;
+
+    @ApiModelProperty(value = "组别代码(字典value)", dataType = "String")
+    @TableField(exist = false)
+    private String groupCodeName;
+
     /**
      * 申请人id
      */
+    @ApiModelProperty(value = "申请人id", dataType = "String")
     @TableField("applicant_id")
     private Long applicantId;
 
     /**
      * 申请人名字
      */
+    @ExcelProperty(value = "申请人", order = 5)
+    @ApiModelProperty(value = "申请人", dataType = "String")
     @TableField("applicant_name")
     private String applicantName;
 
     /**
      * 申请时间
      */
+    @ExcelProperty(value = "申请时间", order = 6)
+    @ApiModelProperty(value = "申请时间", dataType = "String")
     @TableField("applicant_time")
     private String applicantTime;
 
     /**
      * 附件(minio存储文件名)
      */
+    @ApiModelProperty(value = "附件(minio存储文件名)", dataType = "String")
     @TableField("minio_file_name")
     private String minioFileName;
 
     /**
      * 备注
      */
+    @ApiModelProperty(value = "备注", dataType = "String")
     @TableField("remark")
     private String remark;
 
     /**
      * 创建人id
      */
+    @ApiModelProperty(value = "创建人id", dataType = "String")
     @TableField("create_user_id")
     private Long createUserId;
 
     /**
      * 创建人名字
      */
+    @ApiModelProperty(value = "创建人名字", dataType = "String")
     @TableField("create_user_name")
     private String createUserName;
 
     /**
      * 分包方id
      */
+    @ApiModelProperty(value = "评审表编号", dataType = "String")
     @TableField("outsourcer_id")
     private Long outsourcerId;
 
     /**
      * 预计开始时间
      */
+    @ApiModelProperty(value = "预计开始时间", dataType = "String")
     @TableField("pre_start_time")
     private String preStartTime;
 
     /**
      * 预计结束时间
      */
+    @ApiModelProperty(value = "预计结束时间", dataType = "String")
     @TableField("pre_end_time")
     private String preEndTime;
 
     /**
      * 分包原因-字典
      */
+    @ApiModelProperty(value = "分包原因(字典code)", dataType = "String")
+    @DictCodeField(message = "分包原因描述不合法", cacheName = MeterDictCode.OUTSOURCE_REASON)
     @TableField("outsource_reason")
     private String outsourceReason;
 
+    @ApiModelProperty(value = "分包原因(字典value)", dataType = "String")
+    @TableField(exist = false)
+    private String outsourceReasonName;
+
     /**
      * 预计费用
      */
+    @ApiModelProperty(value = "预计费用", dataType = "String")
     @TableField("pre_cost")
     private String preCost;
 
     /**
      * 审批状态
      */
+    @ApiModelProperty(value = "审批状态", dataType = "String")
+    @DictCodeField(message = "审批状态描述不合法", cacheName = MeterDictCode.APPROVAL_STATUS)
     @TableField("approval_status")
     private String approvalStatus;
 
     /**
      * 流程实例id
      */
+    @ApiModelProperty(value = "流程实例id", dataType = "String")
     @TableField("process_id")
     private String processId;
 
     /**
      * 实验室认可情况
      */
+    @ApiModelProperty(value = "实验室认可情况", dataType = "String")
     @TableField("approve_situation")
     private String approveSituation;
 
     /**
      * 溯源性
      */
+    @ApiModelProperty(value = "溯源性", dataType = "String")
     @TableField("traceability")
     private String traceability;
 
     /**
      * 测试方法
      */
+    @ApiModelProperty(value = "测试方法", dataType = "String")
     @TableField("test_method")
     private String testMethod;
 
     /**
      * 技术能力
      */
+    @ApiModelProperty(value = "技术能力", dataType = "String")
     @TableField("technique_ability")
     private String techniqueAbility;
 
     /**
      * 创建时间
      */
+    @ApiModelProperty(hidden = true)
     @TableField("create_time")
     private String createTime;
 
     /**
      * 更新时间
      */
+    @ApiModelProperty(hidden = true)
     @TableField("update_time")
     private String updateTime;
 
+    @ApiModelProperty(value = "审批状态类型-字典value", dataType = "String")
+    @TableField(exist = false)
+    private String approvalStatusName;
 
+    @ApiModelProperty(value = "任务id（同意、驳回等操作使用）", dataType = "String")
+    @TableField(exist = false)
+    private String taskId;
+
+    @ApiModelProperty(value = "可选决策项（1同意驳回拒绝 2同意驳回 3同意拒绝，用于待审批列表同意/驳回/拒绝按钮展示）", dataType = "Integer")
+    @TableField(exist = false)
+    private Integer decisionItem;
+
+    @NotEmpty(message = "受检设备信息不能为空")
+    @ApiModelProperty(value = "受检设备id列表（新建使用参数）", dataType = "List")
+    @TableField(exist = false)
+    private List<OrderSampleDTO> orderSampleList;
+
+    @ExcelProperty(value = "分包机构名称", order = 3)
+    @ApiModelProperty(value = "分包机构名称（列表返回参数）", dataType = "String")
+    private String outsourcerName;
+
+    @ExcelProperty(value = "机构负责人", order = 4)
+    @ApiModelProperty(value = "机构负责人（列表返回参数）", dataType = "String")
+    private String director;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceProtocol.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceProtocol.java
new file mode 100644
index 0000000..38df697
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceProtocol.java
@@ -0,0 +1,225 @@
+package com.casic.missiles.model.business;
+
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
+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 com.casic.missiles.dto.BaseRequest;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotEmpty;
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 计量检定业务-分包管理-测试、校准或检定工作分包协议书
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-08-24
+ */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
+@Data
+@TableName("biz_business_outsource_protocol")
+public class BizBusinessOutsourceProtocol extends BaseRequest implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "id，更新/删除使用参数", dataType = "Long")
+    @TableId("id")
+    private Long id;
+
+    /**
+     * 协议书编号
+     */
+    @ExcelProperty(value = "协议书编号", order = 1)
+    @ApiModelProperty(value = "协议书编号(后台生成)", dataType = "String")
+    @TableField("protocol_no")
+    private String protocolNo;
+
+    /**
+     * 协议书名称
+     */
+    @ExcelProperty(value = "协议书名称", order = 2)
+    @ApiModelProperty(value = "协议书名称", dataType = "String")
+    @TableField("project_name")
+    private String projectName;
+
+    @NotEmpty(message = "实验室代码不能为空")
+    @DictCodeField(message = "实验室代码描述不合法", cacheName = MeterDictCode.LAB_CODE)
+    @ApiModelProperty(value = "实验室代码(字典code)", dataType = "String")
+    @TableField("lab_code")
+    private String labCode;
+
+    @ApiModelProperty(value = "实验室代码(字典value)", dataType = "String")
+    @TableField(exist = false)
+    private String labCodeName;
+
+    @NotEmpty(message = "组别代码不能为空")
+    @DictCodeField(message = "组别代码描述不合法", cacheName = MeterDictCode.GROUP_CODE)
+    @ApiModelProperty(value = "组别代码(字典code)", dataType = "String")
+    @TableField("group_code")
+    private String groupCode;
+
+    @ApiModelProperty(value = "组别代码(字典value)", dataType = "String")
+    @TableField(exist = false)
+    private String groupCodeName;
+
+    /**
+     * 分包方id
+     */
+    @ApiModelProperty(value = "分包方id", dataType = "Long")
+    @TableField("outsourcer_id")
+    private Long outsourcerId;
+
+    /**
+     * 其他
+     */
+    @ApiModelProperty(value = "其他", dataType = "String")
+    @TableField("remark")
+    private String remark;
+
+    /**
+     * 分包方编号
+     */
+    @ApiModelProperty(value = "分包方编号(新建不用传)", dataType = "String")
+    @TableField("outsource_no")
+    private String outsourceNo;
+
+    /**
+     * 分包方名称
+     */
+    @ExcelProperty(value = "分包方名称", order = 3)
+    @ApiModelProperty(value = "分包方名称(新建不用传)", dataType = "String")
+    @TableField("outsource_name")
+    private String outsourceName;
+
+    /**
+     * 联系人
+     */
+    @ExcelProperty(value = "联系人", order = 4)
+    @ApiModelProperty(value = "联系人", dataType = "String")
+    @TableField("contacts")
+    private String contacts;
+
+    /**
+     * 电话
+     */
+    @ApiModelProperty(value = "电话", dataType = "String")
+    @TableField("mobile")
+    private String mobile;
+
+    /**
+     * 地址
+     */
+    @ApiModelProperty(value = "地址", dataType = "String")
+    @TableField("address")
+    private String address;
+
+    /**
+     * 要求完成日期
+     */
+    @ApiModelProperty(value = "要求完成日期", dataType = "String")
+    @TableField("require_date")
+    private String requireDate;
+
+    /**
+     * 分包费用(元)
+     */
+    @ApiModelProperty(value = "分包费用(元)", dataType = "String")
+    @TableField("outsource_cost")
+    private Double outsourceCost;
+
+    /**
+     * 分包方负责人
+     */
+    @ApiModelProperty(value = "分包方负责人", dataType = "String")
+    @TableField("director")
+    private String director;
+
+    /**
+     * 分包项目
+     */
+    @ApiModelProperty(value = "分包项目", dataType = "String")
+    @TableField("item")
+    private String item;
+
+    /**
+     * 分包要求
+     */
+    @ApiModelProperty(value = "分包要求", dataType = "String")
+    @TableField("requires")
+    private String requires;
+
+    /**
+     * 创建人id
+     */
+    @ApiModelProperty(hidden = true)
+    @TableField("create_user_id")
+    private Long createUserId;
+
+    /**
+     * 创建人名字
+     */
+    @ExcelProperty(value = "申请人", order = 5)
+    @ApiModelProperty(value = "申请人", dataType = "String")
+    @TableField("create_user_name")
+    private String createUserName;
+
+    /**
+     * 审批状态
+     */
+    @ApiModelProperty(value = "审批状态", dataType = "String")
+    @DictCodeField(message = "审批状态描述不合法", cacheName = MeterDictCode.APPROVAL_STATUS)
+    @TableField("approval_status")
+    private String approvalStatus;
+
+    /**
+     * 流程实例id
+     */
+    @ApiModelProperty(value = "流程实例id", dataType = "String")
+    @TableField("process_id")
+    private String processId;
+
+    /**
+     * 创建时间
+     */
+    @ExcelProperty(value = "申请时间", order = 6)
+    @ApiModelProperty(value = "申请时间", dataType = "String")
+    @TableField("create_time")
+    private String createTime;
+
+    /**
+     * 更新时间
+     */
+    @ApiModelProperty(hidden = true)
+    @TableField("update_time")
+    private String updateTime;
+
+    @ApiModelProperty(value = "审批状态类型-字典value", dataType = "String")
+    @TableField(exist = false)
+    private String approvalStatusName;
+
+    @ApiModelProperty(value = "任务id（同意、驳回等操作使用）", dataType = "String")
+    @TableField(exist = false)
+    private String taskId;
+
+    @ApiModelProperty(value = "可选决策项（1同意驳回拒绝 2同意驳回 3同意拒绝，用于待审批列表同意/驳回/拒绝按钮展示）", dataType = "Integer")
+    @TableField(exist = false)
+    private Integer decisionItem;
+
+
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourcerInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourcerInfo.java
index ec4e997..f9aa69e 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourcerInfo.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourcerInfo.java
@@ -17,6 +17,7 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import javax.validation.constraints.NotEmpty;
 import java.io.Serializable;
 
 /**
@@ -59,6 +60,29 @@
     @TableField("outsourcer_name")
     private String outsourcerName;
 
+    @NotEmpty(message = "实验室代码不能为空")
+    @DictCodeField(message = "实验室代码描述不合法", cacheName = MeterDictCode.LAB_CODE)
+    @ApiModelProperty(value = "实验室代码(字典code)", dataType = "String")
+    @TableField("lab_code")
+    private String labCode;
+
+    @ApiModelProperty(value = "实验室代码(字典value)", dataType = "String")
+    @TableField(exist = false)
+    private String labCodeName;
+
+    /**
+     * 组别代码
+     */
+    @NotEmpty(message = "组别代码不能为空")
+    @DictCodeField(message = "组别代码描述不合法", cacheName = MeterDictCode.GROUP_CODE)
+    @ApiModelProperty(value = "组别代码(字典code)", dataType = "String")
+    @TableField("group_code")
+    private String groupCode;
+
+    @ApiModelProperty(value = "组别代码(字典value)", dataType = "String")
+    @TableField(exist = false)
+    private String groupCodeName;
+
     /**
      * 单位简称
      */
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardInfo.java
index c48eed7..dffdfdd 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardInfo.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardInfo.java
@@ -5,6 +5,7 @@
 import com.baomidou.mybatisplus.annotation.TableName;
 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;
 
@@ -18,6 +19,7 @@
  * @author wangpeng
  * @since 2023-08-04
  */
+@ApiModel
 @Data
 @TableName("biz_equipment_standard_info")
 public class BizEquipmentStandardInfo implements Serializable {
@@ -119,7 +121,7 @@
      * 管理状态(字典code)
      */
     @ApiModelProperty(value = "管理状态(字典code)", dataType = "String")
-    @DictCodeField(message = "管理状态不合法", cacheName = MeterDictCode.MANAGER_STATE)
+    @DictCodeField(message = "管理状态不合法", cacheName = MeterDictCode.STANDARD_MANAGER_STATE)
     @TableField("manage_status")
     private String manageStatus;
 
@@ -151,7 +153,7 @@
     /**
      * 温度(℃)
      */
-    @ApiModelProperty(value = "使用状态(字典code)", dataType = "String")
+    @ApiModelProperty(value = "温度(℃)", dataType = "String")
     @TableField("temperature")
     private Double temperature;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardInfoApproval.java b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardInfoApproval.java
index dbd86ab..9f58d83 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardInfoApproval.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardInfoApproval.java
@@ -150,7 +150,7 @@
      * 管理状态(字典code)
      */
     @ApiModelProperty(value = "管理状态(字典code)", dataType = "String")
-    @DictCodeField(message = "管理状态不合法", cacheName = MeterDictCode.MANAGER_STATE)
+    @DictCodeField(message = "管理状态不合法", cacheName = MeterDictCode.STANDARD_MANAGER_STATE)
     @TableField("manage_status")
     private String manageStatus;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardTechnologyRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardTechnologyRelation.java
index 0e612bd..751f26b 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardTechnologyRelation.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardTechnologyRelation.java
@@ -3,6 +3,7 @@
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -16,6 +17,7 @@
  * @author wangpeng
  * @since 2023-08-04
  */
+@ApiModel
 @Data
 @TableName("biz_equipment_standard_technology_relation")
 public class BizEquipmentStandardTechnologyRelation implements Serializable {
@@ -33,6 +35,10 @@
     @TableField("technology_file_id")
     private Long technologyFileId;
 
+    @ApiModelProperty(value = "依据的技术文件编号", dataType = "String")
+    @TableField("technology_file_no")
+    private String technologyFileNo;
+
     /**
      * 依据的技术文件名称(技术文件中现行测试校准检定方法表文件名字段)
      */
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerInfo.java
index d6e8bed..65cd6bc 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerInfo.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerInfo.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.model.resource;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -21,6 +28,11 @@
  * @author wangpeng
  * @since 2023-08-08
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @ApiModel
 @Data
 @TableName("biz_resource_customer_info")
@@ -35,6 +47,7 @@
     /**
      * 委托方编号
      */
+    @ExcelProperty(value = "委托方编号", order = 1)
     @ApiModelProperty(value = "委托方编号", dataType = "String")
     @TableField("customer_no")
     private String customerNo;
@@ -42,6 +55,7 @@
     /**
      * 委托方名称
      */
+    @ExcelProperty(value = "委托方名称", order = 2)
     @ApiModelProperty(value = "委托方名称(新建时为下拉选择一个受检单位组织的名字，传deptId字段，后端获取名称)", dataType = "String")
     @TableField("customer_name")
     private String customerName;
@@ -63,6 +77,7 @@
     /**
      * 联系人
      */
+    @ExcelProperty(value = "联系人", order = 3)
     @ApiModelProperty(value = "联系人", dataType = "String")
     @TableField("contacts")
     private String contacts;
@@ -70,6 +85,7 @@
     /**
      * 座机电话
      */
+    @ExcelProperty(value = "座机电话", order = 4)
     @ApiModelProperty(value = "座机电话", dataType = "String")
     @TableField("mobile")
     private String mobile;
@@ -77,6 +93,7 @@
     /**
      * 手机号码
      */
+    @ExcelProperty(value = "手机号码", order = 5)
     @ApiModelProperty(value = "手机号码", dataType = "String")
     @TableField("phone")
     private String phone;
@@ -91,6 +108,7 @@
     /**
      * 地址
      */
+    @ExcelProperty(value = "地址", order = 6)
     @ApiModelProperty(value = "地址", dataType = "String")
     @TableField("address")
     private String address;
@@ -141,6 +159,7 @@
     /**
      * 创建时间
      */
+    @ExcelProperty(value = "创建时间", order = 7)
     @ApiModelProperty(value = "创建时间", dataType = "String")
     @TableField("create_time")
     private String createTime;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerSuggestForm.java b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerSuggestForm.java
index 7201bbd..701bf8b 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerSuggestForm.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerSuggestForm.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.model.resource;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -22,6 +29,11 @@
  * @author wangpeng
  * @since 2023-08-08
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @ApiModel
 @Data
 @TableName("biz_resource_customer_suggest_form")
@@ -44,7 +56,8 @@
     /**
      * 委托方名称
      */
-    @ApiModelProperty(value = "委托方名称", dataType = "String")
+    @ExcelProperty(value = "意见反馈单位", order = 2)
+    @ApiModelProperty(value = "意见反馈单位", dataType = "String")
     @TableField("customer_name")
     private String customerName;
 
@@ -59,7 +72,8 @@
     /**
      * 委托方意见反馈部门名称
      */
-    @ApiModelProperty(value = "委托方意见反馈部门名称", dataType = "String")
+    @ExcelProperty(value = "委托方意见反馈部门", order = 3)
+    @ApiModelProperty(value = "委托方意见反馈部门", dataType = "String")
     @TableField("customer_dept_name")
     private String customerDeptName;
 
@@ -73,6 +87,7 @@
     /**
      * 表单编号
      */
+    @ExcelProperty(value = "表单编号", order = 1)
     @ApiModelProperty(value = "表单编号", dataType = "String")
     @TableField("form_no")
     private String formNo;
@@ -111,6 +126,7 @@
     /**
      * 创建人名字
      */
+    @ExcelProperty(value = "创建人", order = 4)
     @ApiModelProperty(value = "创建人名字", dataType = "String")
     @TableField("create_user_name")
     private String createUserName;
@@ -147,6 +163,7 @@
     /**
      * 创建时间
      */
+    @ExcelProperty(value = "创建时间", order = 5)
     @ApiModelProperty(value = "创建时间", dataType = "String")
     @TableField("create_time")
     private String createTime;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSealInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSealInfo.java
index cbf05d7..9bf389d 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSealInfo.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSealInfo.java
@@ -106,6 +106,10 @@
     @TableField("minio_file_name")
     private String minioFileName;
 
+    @ApiModelProperty(value = "minio存储文件url", dataType = "String")
+    @TableField(exist = false)
+    private String minioFileUrl;
+
     @ApiModelProperty(value = "创建时间", dataType = "String")
     @TableField("create_time")
     private String createTime;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSealUseNote.java b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSealUseNote.java
index 3f2d9e8..3ce16a8 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSealUseNote.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSealUseNote.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.model.resource;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -20,6 +27,11 @@
  * @author wangpeng
  * @since 2023-07-28
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @ApiModel
 @Data
 @TableName("biz_resource_seal_use_note")
@@ -34,6 +46,7 @@
     /**
      * 登记表编号
      */
+    @ExcelProperty(value = "申请单编号", order = 1)
     @ApiModelProperty(value = "登记表编号(自动生成)", dataType = "String")
     @TableField("note_form_no")
     private String noteFormNo;
@@ -55,6 +68,7 @@
     /**
      * 申请部门
      */
+    @ExcelProperty(value = "申请部门", order = 5)
     @ApiModelProperty(value = "申请部门", dataType = "String")
     @TableField("apply_dept_name")
     private String applyDeptName;
@@ -69,6 +83,7 @@
     /**
      * 申请人
      */
+    @ExcelProperty(value = "申请人", order = 6)
     @ApiModelProperty(value = "申请人", dataType = "String")
     @TableField("apply_user_name")
     private String applyUserName;
@@ -76,6 +91,7 @@
     /**
      * 申请时间
      */
+    @ExcelProperty(value = "申请时间", order = 7)
     @ApiModelProperty(value = "申请时间(新增自动获取当前时间)", dataType = "String")
     @TableField("apply_time")
     private String applyTime;
@@ -130,6 +146,26 @@
     @TableField("update_time")
     private String updateTime;
 
+    @ExcelProperty(value = "印章名称", order = 2)
+    @ApiModelProperty(value = "印章名称(列表返回参数)", dataType = "String")
+    @TableField(exist = false)
+    private String sealName;
+
+    @DictCodeField(message = "印章类型描述不合法", cacheName = MeterDictCode.SEAL_TYPE)
+    @ApiModelProperty(hidden = true)
+    @TableField(exist = false)
+    private String sealType;
+
+    @ExcelProperty(value = "印章类型", order = 3)
+    @ApiModelProperty(value = "印章类型(列表返回参数)", dataType = "String")
+    @TableField(exist = false)
+    private String sealTypeName;
+
+    @ExcelProperty(value = "批准人", order = 4)
+    @ApiModelProperty(value = "批准人(列表返回参数)", dataType = "String")
+    @TableField(exist = false)
+    private String approverName;
+
     @ApiModelProperty(value = "审批状态类型-字典value", dataType = "String")
     @TableField(exist = false)
     private String approvalStatusName;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceStaffInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceStaffInfo.java
index 5ef995b..41563a1 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceStaffInfo.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceStaffInfo.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.model.resource;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -20,6 +27,11 @@
  * @author wangpeng
  * @since 2023-07-25
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @ApiModel
 @Data
 @TableName("biz_resource_staff_info")
@@ -38,6 +50,7 @@
     /**
      * 人员编号
      */
+    @ExcelProperty(value = "人员编号",order = 0)
     @NotEmpty(message = "人员编号不能为空")
     @ApiModelProperty(value = "人员编号", dataType = "String")
     @TableField("staff_no")
@@ -46,6 +59,7 @@
     /**
      * 姓名
      */
+    @ExcelProperty(value = "姓名",order = 1)
     @ApiModelProperty(value = "姓名", dataType = "String")
     @TableField("staff_name")
     private String staffName;
@@ -152,13 +166,15 @@
     /**
      * 部门名字
      */
-    @ApiModelProperty(value = "部门名字", dataType = "String")
+    @ExcelProperty(value = "工作部门",order = 4)
+    @ApiModelProperty(value = "工作部门", dataType = "String")
     @TableField("dept_name")
     private String deptName;
 
     /**
      * 岗位
      */
+    @ExcelProperty(value = "岗位",order = 2)
     @ApiModelProperty(value = "岗位", dataType = "String")
     @TableField("station")
     private String station;
@@ -166,6 +182,7 @@
     /**
      * 计量专业
      */
+    @ExcelProperty(value = "计量专业",order = 5)
     @ApiModelProperty(value = "计量专业", dataType = "String")
     @TableField("major")
     private String major;
@@ -173,6 +190,7 @@
     /**
      * 证号
      */
+    @ExcelProperty(value = "证号",order = 3)
     @ApiModelProperty(value = "证号", dataType = "String")
     @TableField("certificate_number")
     private String certificateNumber;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSupplierInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSupplierInfo.java
index eb5ef01..a1e2697 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSupplierInfo.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSupplierInfo.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.model.resource;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -20,6 +27,11 @@
  * @author wangpeng
  * @since 2023-07-27
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @ApiModel
 @Data
 @TableName("biz_resource_supplier_info")
@@ -34,6 +46,7 @@
     /**
      * 供方编号
      */
+    @ExcelProperty(value = "供方编号", order = 1)
     @ApiModelProperty(value = "供方编号(自动生成)", dataType = "String")
     @TableField("supplier_no")
     private String supplierNo;
@@ -41,6 +54,7 @@
     /**
      * 供方名称
      */
+    @ExcelProperty(value = "供方名称", order = 2)
     @ApiModelProperty(value = "供方名称", dataType = "String")
     @TableField("supplier_name")
     private String supplierName;
@@ -60,6 +74,7 @@
     @TableField("supplier_type")
     private String supplierType;
 
+    @ExcelProperty(value = "供方类型", order = 3)
     @ApiModelProperty(value = "供方类型(字典value)", dataType = "String")
     @TableField(exist = false)
     private String supplierTypeName;
@@ -109,7 +124,8 @@
     /**
      * 电话
      */
-    @ApiModelProperty(value = "电话", dataType = "String")
+    @ExcelProperty(value = "联系电话", order = 4)
+    @ApiModelProperty(value = "联系电话", dataType = "String")
     @TableField("phone")
     private String phone;
 
@@ -158,6 +174,7 @@
     /**
      * 公司地址-省
      */
+    @ExcelProperty(value = "地址-省", order = 6)
     @ApiModelProperty(value = "公司地址-省", dataType = "String")
     @TableField("company_province_name")
     private String companyProvinceName;
@@ -172,6 +189,7 @@
     /**
      * 公司地址-市
      */
+    @ExcelProperty(value = "地址-市", order = 7)
     @ApiModelProperty(value = "公司地址-市", dataType = "String")
     @TableField("company_city_name")
     private String companyCityName;
@@ -186,6 +204,7 @@
     /**
      * 公司地址-区
      */
+    @ExcelProperty(value = "地址-区", order = 8)
     @ApiModelProperty(value = "公司地址-区", dataType = "String")
     @TableField("company_area_name")
     private String companyAreaName;
@@ -193,6 +212,7 @@
     /**
      * 公司地址-详细地址
      */
+    @ExcelProperty(value = "地址-详细地址", order = 9)
     @ApiModelProperty(value = "公司地址-详细地址", dataType = "String")
     @TableField("company_address")
     private String companyAddress;
@@ -200,6 +220,7 @@
     /**
      * 服务和供应的内容
      */
+    @ExcelProperty(value = "服务和供应的内容", order = 5)
     @ApiModelProperty(value = "服务和供应的内容", dataType = "String")
     @TableField("supplier_content")
     private String supplierContent;
@@ -250,6 +271,7 @@
     /**
      * 创建时间
      */
+    @ExcelProperty(value = "创建时间", order = 9)
     @ApiModelProperty(value = "创建时间", dataType = "String")
     @TableField("create_time")
     private String createTime;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/EnvLocationInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/EnvLocationInfo.java
new file mode 100644
index 0000000..d8e2d7b
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/EnvLocationInfo.java
@@ -0,0 +1,83 @@
+package com.casic.missiles.model.resource;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotEmpty;
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 实验室环境监控系统-设备表
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-06-07
+ */
+@ApiModel
+@Data
+@TableName("env_location_info")
+public class EnvLocationInfo implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "主键id", dataType = "Long")
+    @TableId("id")
+    private Long id;
+
+    /**
+     * 地点编号
+     */
+    @NotEmpty(message = "地点编号不能为空")
+    @ApiModelProperty(value = "地点编号", dataType = "String")
+    @TableField("location_no")
+    private String locationNo;
+
+    /**
+     * 地点名称
+     */
+    @ApiModelProperty(value = "地点名称", dataType = "String")
+    @TableField("location_name")
+    private String locationName;
+
+    /**
+     * 地点位置
+     */
+    @ApiModelProperty(value = "地点位置", dataType = "String")
+    @TableField("location_position")
+    private String locationPosition;
+
+    /**
+     * 创建人id
+     */
+    @ApiModelProperty(value = "创建人id", dataType = "Long")
+    @TableField("create_user_id")
+    private Long createUserId;
+
+    /**
+     * 创建人
+     */
+    @ApiModelProperty(value = "创建人", dataType = "String")
+    @TableField("create_user")
+    private String createUser;
+
+    /**
+     * 创建时间
+     */
+    @ApiModelProperty(value = "创建时间", dataType = "String")
+    @TableField("create_time")
+    private String createTime;
+
+    /**
+     * 更新时间
+     */
+    @ApiModelProperty(value = "更新时间", dataType = "String")
+    @TableField("update_time")
+    private String updateTime;
+
+
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemFileConfig.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemFileConfig.java
index 19e6845..86e569c 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemFileConfig.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemFileConfig.java
@@ -30,7 +30,7 @@
     @ApiModelProperty(value = "系统类别(1业务系统2受检系统3环境系统)", dataType = "Integer")
     @NotNull(message = "系统类别不能为空")
     @TableField("system_type")
-    private Integer systemType;
+    private Integer systemType = 1;
 
     @ApiModelProperty("下载编号")
     @TableField("download_no")
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemNotice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemNotice.java
index e94297d..06ec37d 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemNotice.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemNotice.java
@@ -34,7 +34,7 @@
     @ApiModelProperty(value = "系统类别(1业务系统2受检系统3环境系统)", dataType = "Integer")
     @NotNull(message = "系统类别不能为空")
     @TableField("system_type")
-    private Integer systemType;
+    private Integer systemType = 1;
 
     /**
      * 通知公告编号
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSign.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSign.java
index 6c0d7c9..954f4f8 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSign.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSign.java
@@ -51,7 +51,7 @@
     @ApiModelProperty(value = "系统类别(1业务系统2受检系统3环境系统)", dataType = "Integer")
     @NotNull(message = "系统类别不能为空")
     @TableField("system_type")
-    private Integer systemType;
+    private Integer systemType = 1;
 
     /**
      * 签名编号
@@ -130,4 +130,8 @@
     @TableField(exist = false)
     private List<Long> userIdList;
 
+    @ApiModelProperty(hidden = true)
+    @TableField(exist = false)
+    private String deptName;
+
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemTemplate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemTemplate.java
index 503a457..1d27ebe 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemTemplate.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemTemplate.java
@@ -47,7 +47,7 @@
     @ApiModelProperty(value = "系统类别(1业务系统2受检系统3环境系统)", dataType = "Integer")
     @NotNull(message = "系统类别不能为空")
     @TableField("system_type")
-    private Integer systemType;
+    private Integer systemType = 1;
 
     /**
      * 模板编号
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java
index 8c21cb0..f61e4a8 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java
@@ -32,4 +32,8 @@
     ReturnDTO approvalDelete(ApprovalDeleteRequest request);
 
     ReturnDTO failUpdate(T request);
+
+    List<O> listExport(R request);
+
+    List<O> listExportByIds(List<Long> ids);
 }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java
index 724166f..9bce15b 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java
@@ -157,6 +157,29 @@
         throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
     }
 
+    @Override
+    public List<O> listExport(R request) {
+        request.setCreateUserId(null);
+        request.setApprovalStatus(ApprovalStatusEnum.PASSED);
+        Page<O> page = PageFactory.defaultPage();
+        page.setCurrent(1);
+        page.setSearchCount(false);
+        page.setSize(Integer.MAX_VALUE);
+        Page<O> resultPage = this.baseMapper.selectBatchForApprovalList(page, request, null);
+        return resultPage.getRecords();
+    }
+
+    @Override
+    public List<O> listExportByIds(List<Long> ids) {
+        Page<O> page = PageFactory.defaultPage();
+        page.setCurrent(1);
+        page.setSearchCount(false);
+        page.setSize(Integer.MAX_VALUE);
+        List<String> businessKeys = ids.stream().map(String::valueOf).collect(Collectors.toList());
+        Page<O> resultPage = this.baseMapper.selectBatchForApprovalList(page, null, businessKeys);
+        return resultPage.getRecords();
+    }
+
     protected ReturnDTO updateApprovalStatus(Long id, String processId, String approvalStatus) {
         UpdateWrapper<T> updateWrapper = new UpdateWrapper<>();
         updateWrapper.eq("id", id);
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificatePrintServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificatePrintServiceImpl.java
index f6e4706..3228497 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificatePrintServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificatePrintServiceImpl.java
@@ -162,6 +162,30 @@
         return ReturnUtil.success(printLogMapper.selectList(wrapper));
     }
 
+    @Override
+    public List<CertificatePrintListResponse> listByIds(List<Long> ids) {
+        Page<CertificatePrintListResponse> page = PageFactory.defaultPage();
+        page.setCurrent(1);
+        page.setSearchCount(false);
+        page.setSize(Integer.MAX_VALUE);
+        List<String> businessKeys = ids.stream().map(String::valueOf).collect(Collectors.toList());
+        Page<CertificatePrintListResponse> resultPage = this.baseMapper.selectBatchForApprovalList(page, null, businessKeys);
+        return resultPage.getRecords();
+    }
+
+    @Override
+    public List<CertificatePrintListResponse> list(CertificatePrintApprovalListRequest request) {
+        request.setCreateUserId(null);
+        request.setApprovalStatus(null);
+        request.setPrintStatus(null);
+        Page<CertificatePrintListResponse> page = PageFactory.defaultPage();
+        page.setCurrent(1);
+        page.setSearchCount(false);
+        page.setSize(Integer.MAX_VALUE);
+        Page<CertificatePrintListResponse> resultPage = certificatePrintMapper.selectBatchForApprovalList(page, request, null);
+        return resultPage.getRecords();
+    }
+
     private void savePrintLog(Long id) {
         BizBusinessCertificatePrintLog printLog = new BizBusinessCertificatePrintLog();
         BizBusinessCertificatePrint certificatePrint = certificatePrintMapper.selectById(id);
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificateReportServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificateReportServiceImpl.java
index 457555f..24146be 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificateReportServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificateReportServiceImpl.java
@@ -158,8 +158,8 @@
         QueryWrapper<BizBusinessCertificateMeasureResultData> mWrapper = new QueryWrapper<>();
         mWrapper.eq("report_id", reportId);
         boolean mRemove = certificateMeasureResultDataService.remove(mWrapper);
-        Assert.isFalse(eRemove || mRemove, () -> {
+        if(!eRemove || !mRemove){
             throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
-        });
+        }
     }
 }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessIdentifyInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessIdentifyInfoServiceImpl.java
index 4c8e190..f7e63ca 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessIdentifyInfoServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessIdentifyInfoServiceImpl.java
@@ -1,8 +1,10 @@
 package com.casic.missiles.service.Impl.business;
 
+import cn.hutool.core.date.DateUtil;
 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.core.page.PageFactory;
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.business.identify.IdentifyListRequest;
@@ -14,11 +16,14 @@
 import com.casic.missiles.service.business.IBizBusinessIdentifyInfoService;
 import com.casic.missiles.utils.DictCodeUtils;
 import com.casic.missiles.utils.NumberGeneratorUtil;
+import com.casic.missiles.utils.QRCodeUtil;
 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.List;
+
 /**
  * <p>
  * 计量检定业务-任务计量管理-标识打印 服务实现类
@@ -35,9 +40,9 @@
     @Override
     public Page<BizBusinessIdentifyInfo> identifyListPage(Page<BizBusinessIdentifyInfo> page, IdentifyListRequest request) throws Exception {
         QueryWrapper<BizBusinessIdentifyInfo> wrapper = new QueryWrapper<>();
-        wrapper.eq("identify_type", request.getIdentifyType());
-        wrapper.like("device_no", request.getDeviceNo());
-        wrapper.like("device_name", request.getDeviceName());
+        wrapper.eq(StringUtils.isNotEmpty(request.getIdentifyType()), "identify_type", request.getIdentifyType());
+        wrapper.like(StringUtils.isNotEmpty(request.getDeviceNo()),"device_no", request.getDeviceNo());
+        wrapper.like(StringUtils.isNotEmpty(request.getDeviceName()), "device_name", request.getDeviceName());
         wrapper.apply(StringUtils.isNotBlank(request.getCreateTimeStart()),
                 "{0} <= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getCreateTimeStart().split(" ")[0]);
         wrapper.apply(StringUtils.isNotBlank(request.getCreateTimeEnd()),
@@ -64,8 +69,11 @@
     }
 
     @Override
-    public ReturnDTO updateIdentify(BizBusinessIdentifyInfo identifyInfo) {
-        if(identifyInfoMapper.updateById(identifyInfo) > 0){
+    public ReturnDTO updateIdentify(Long id) {
+        BizBusinessIdentifyInfo info = new BizBusinessIdentifyInfo();
+        info.setId(id);
+        info.setUpdateTime(DateUtil.now());
+        if(identifyInfoMapper.updateById(info) > 0){
             return ReturnUtil.success();
         }
         throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
@@ -79,4 +87,20 @@
         throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
     }
 
+    @Override
+    public List<BizBusinessIdentifyInfo> list(IdentifyListRequest request) throws Exception {
+        Page<BizBusinessIdentifyInfo> page = PageFactory.defaultPage();
+        page.setCurrent(1);
+        page.setSearchCount(false);
+        page.setSize(Integer.MAX_VALUE);
+        Page<BizBusinessIdentifyInfo> resultPage = this.identifyListPage(page, request);
+        return resultPage.getRecords();
+    }
+
+    @Override
+    public ReturnDTO<String> equipmentQrCode(Long id) {
+        String base64QRCode = QRCodeUtil.getBase64QRCode(String.valueOf(id));
+        return ReturnUtil.success(base64QRCode);
+    }
+
 }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOrderInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOrderInfoServiceImpl.java
index 82952ad..d8d2c6a 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOrderInfoServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOrderInfoServiceImpl.java
@@ -35,6 +35,7 @@
 import javax.servlet.http.HttpServletResponse;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 import java.util.stream.Collectors;
 
 /**
@@ -209,13 +210,16 @@
     private QueryWrapper<OrderListResponse> listParamWrapperBuilder(OrderListRequest request) {
         QueryWrapper<OrderListResponse> wrapper = new QueryWrapper<>();
         wrapper.like(StringUtils.isNotBlank(request.getOrderNo()), "order_no", request.getOrderNo());
+        wrapper.like(Objects.nonNull(request.getCustomerId()), "customer_id", request.getCustomerId());
         wrapper.like(StringUtils.isNotBlank(request.getCustomerName()), "customer_name", request.getCustomerName());
         wrapper.like(StringUtils.isNotBlank(request.getDeliverer()), "deliverer", request.getDeliverer());
         wrapper.like(StringUtils.isNotBlank(request.getCreateUserName()), "create_user_name", request.getCreateUserName());
-        wrapper.apply(StringUtils.isNotBlank(request.getCreateStartTime()),
-                "{0} <= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getCreateStartTime().split(" ")[0]);
-        wrapper.apply(StringUtils.isNotBlank(request.getCreateEndTime()),
-                "{0} >= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getCreateEndTime().split(" ")[0]);
+        if(StringUtils.isNotBlank(request.getCreateStartTime())){
+            wrapper.apply("{0} <= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getCreateStartTime().split(" ")[0]);
+        }
+        if(StringUtils.isNotBlank(request.getCreateEndTime())){
+            wrapper.apply("{0} >= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getCreateEndTime().split(" ")[0]);
+        }
         wrapper.orderByDesc("create_time");
         return wrapper;
     }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceAssessServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceAssessServiceImpl.java
index c6af980..ce40138 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceAssessServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceAssessServiceImpl.java
@@ -1,10 +1,33 @@
 package com.casic.missiles.service.Impl.business;
 
-import com.casic.missiles.model.business.BizBusinessOutsourceAssess;
+import cn.hutool.core.lang.Assert;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.casic.missiles.core.model.auth.AuthUser;
+import com.casic.missiles.core.shiro.ShiroKit;
+import com.casic.missiles.dto.BaseApprovalSubmitRequest;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.ReturnUtil;
+import com.casic.missiles.dto.business.outsource.OutsourceAssessApprovalListRequest;
+import com.casic.missiles.dto.business.outsource.OutsourceAssessSaveResponse;
+import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.NoGenerateFileCodeEnum;
+import com.casic.missiles.enums.NoGenerateRecordTypeCodeEnum;
+import com.casic.missiles.enums.system.ApprovalStatusEnum;
+import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.mapper.business.BizBusinessOutsourceAssessMapper;
+import com.casic.missiles.model.business.BizBusinessOutsourceAssess;
+import com.casic.missiles.model.business.BizBusinessOutsourceAssessSampleRelation;
+import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl;
+import com.casic.missiles.service.business.IBizBusinessOutsourceAssessSampleRelationService;
 import com.casic.missiles.service.business.IBizBusinessOutsourceAssessService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.casic.missiles.utils.NoGeneratorUtil;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Objects;
 
 /**
  * <p>
@@ -15,6 +38,103 @@
  * @since 2023-08-16
  */
 @Service
-public class BizBusinessOutsourceAssessServiceImpl extends ServiceImpl<BizBusinessOutsourceAssessMapper, BizBusinessOutsourceAssess> implements IBizBusinessOutsourceAssessService {
+public class BizBusinessOutsourceAssessServiceImpl extends GeneralApprovalServiceImpl<BizBusinessOutsourceAssessMapper, BizBusinessOutsourceAssess, BizBusinessOutsourceAssess, OutsourceAssessApprovalListRequest, BaseApprovalSubmitRequest> implements IBizBusinessOutsourceAssessService {
+    @Autowired
+    private IBizBusinessOutsourceAssessSampleRelationService outsourceAssessSampleRelationService;
 
+    @Override
+    public ReturnDTO<OutsourceAssessSaveResponse> saveOutsourceAssess(BizBusinessOutsourceAssess request) {
+        //生成编号
+        String labCode = request.getLabCode();
+        String groupCode = request.getGroupCode();
+        Long maxNo = this.baseMapper.selectMaxProjectNo();
+        String projectNo = NoGeneratorUtil.getCode(NoGenerateFileCodeEnum.D, labCode, NoGenerateRecordTypeCodeEnum.OUTSOURCE_ACCESS, groupCode, maxNo);
+        request.setCreateUserId(request.getUserId());
+        request.setCreateUserName(request.getUserName());
+        request.setApprovalStatus(ApprovalStatusEnum.DRAFT); //草稿箱状态
+        request.setProjectNo(projectNo);
+        int row = this.baseMapper.insert(request);
+        Assert.isFalse(row <= 0, () -> {
+            throw new BusinessException(BusinessExceptionEnum.OUTSOURCE_ACCESS_SAVE_FAILED);
+        });
+        //关联表
+        saveRelationData(request);
+        OutsourceAssessSaveResponse saveResponse = new OutsourceAssessSaveResponse();
+        saveResponse.setId(request.getId());
+        saveResponse.setProjectNo(projectNo);
+        return ReturnUtil.success(saveResponse);
+    }
+
+    @Override
+    @Transactional
+    public ReturnDTO draftUpdate(BizBusinessOutsourceAssess request) {
+        if (this.baseMapper.updateById(request) > 0) {
+            //关联表删除、增加
+            removeRelationData(request.getId());
+            saveRelationData(request);
+            return ReturnUtil.success();
+        }
+        throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
+    }
+
+    @Override
+    public ReturnDTO draftDelete(Long id) {
+        if (this.baseMapper.deleteById(id) > 0) {
+            //关联表删除
+            removeRelationData(id);
+            return ReturnUtil.success();
+        }
+        throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
+    }
+
+    @Override
+    public ReturnDTO draftBatchDelete(List<Long> ids) {
+        if (this.baseMapper.deleteBatchIds(ids) >= 0) {
+            ids.forEach(id -> removeRelationData(id));
+            return ReturnUtil.success();
+        }
+        throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
+    }
+
+    @Override
+    @Transactional
+    public ReturnDTO failUpdate(BizBusinessOutsourceAssess request) {
+        AuthUser user = ShiroKit.getUser();
+        Assert.isFalse(Objects.isNull(user), () -> {
+            throw new BusinessException(BusinessExceptionEnum.LOGIN_USER_ACQUIRE_FAILED);
+        });
+        request.setApprovalStatus(ApprovalStatusEnum.IN_APPROVED);
+        if (this.baseMapper.updateById(request) > 0) {
+            //关联表删除、增加
+            removeRelationData(request.getId());
+            saveRelationData(request);
+            baseApprovalService.failUpdate(request.getProcessId());
+            return ReturnUtil.success();
+        }
+        throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
+    }
+
+    private void saveRelationData(BizBusinessOutsourceAssess request) {
+        List<BizBusinessOutsourceAssessSampleRelation> sampleRelations = new ArrayList<>();
+        request.getOrderSampleList().forEach(dto -> {
+            BizBusinessOutsourceAssessSampleRelation relation = new BizBusinessOutsourceAssessSampleRelation();
+            relation.setOrderId(dto.getOrderId());
+            relation.setSampleId(dto.getSampleId());
+            relation.setAccessId(request.getId());
+            sampleRelations.add(relation);
+        });
+        if(outsourceAssessSampleRelationService.saveBatch(sampleRelations)){
+            return;
+        }
+        throw new BusinessException(BusinessExceptionEnum.OUTSOURCE_ACCESS_SAVE_FAILED);
+    }
+
+    private void removeRelationData(Long assessId) {
+        QueryWrapper<BizBusinessOutsourceAssessSampleRelation> wrapper = new QueryWrapper<>();
+        wrapper.eq("access_id", assessId);
+        if(outsourceAssessSampleRelationService.remove(wrapper)){
+            return;
+        }
+        throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
+    }
 }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceProtocolServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceProtocolServiceImpl.java
new file mode 100644
index 0000000..821e728
--- /dev/null
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceProtocolServiceImpl.java
@@ -0,0 +1,60 @@
+package com.casic.missiles.service.Impl.business;
+
+import cn.hutool.core.lang.Assert;
+import com.casic.missiles.dto.BaseApprovalSubmitRequest;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.ReturnUtil;
+import com.casic.missiles.dto.business.outsource.OutsourceProtocolApprovalListRequest;
+import com.casic.missiles.dto.business.outsource.OutsourceProtocolSaveResponse;
+import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.NoGenerateFileCodeEnum;
+import com.casic.missiles.enums.NoGenerateRecordTypeCodeEnum;
+import com.casic.missiles.enums.system.ApprovalStatusEnum;
+import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.mapper.business.BizBusinessOutsourceProtocolMapper;
+import com.casic.missiles.mapper.business.BizBusinessOutsourcerInfoMapper;
+import com.casic.missiles.model.business.BizBusinessOutsourceProtocol;
+import com.casic.missiles.model.business.BizBusinessOutsourcerInfo;
+import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl;
+import com.casic.missiles.service.business.IBizBusinessOutsourceProtocolService;
+import com.casic.missiles.utils.NoGeneratorUtil;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 计量检定业务-分包管理-测试、校准或检定工作分包协议书 服务实现类
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-08-24
+ */
+@Service
+public class BizBusinessOutsourceProtocolServiceImpl extends GeneralApprovalServiceImpl<BizBusinessOutsourceProtocolMapper, BizBusinessOutsourceProtocol, BizBusinessOutsourceProtocol, OutsourceProtocolApprovalListRequest, BaseApprovalSubmitRequest> implements IBizBusinessOutsourceProtocolService {
+    @Autowired
+    private BizBusinessOutsourcerInfoMapper outsourcerInfoMapper;
+
+    @Override
+    public ReturnDTO<OutsourceProtocolSaveResponse> saveOutsourceProtocol(BizBusinessOutsourceProtocol request) {
+        //生成编号
+        String labCode = request.getLabCode();
+        String groupCode = request.getGroupCode();
+        Long maxNo = this.baseMapper.selectMaxProtocolNo();
+        String protocolNo = NoGeneratorUtil.getCode(NoGenerateFileCodeEnum.D, labCode, NoGenerateRecordTypeCodeEnum.OUTSOURCE_PROTOCOL, groupCode, maxNo);
+        request.setCreateUserId(request.getUserId());
+        request.setCreateUserName(request.getUserName());
+        request.setApprovalStatus(ApprovalStatusEnum.DRAFT); //草稿箱状态
+        request.setProtocolNo(protocolNo);
+        BizBusinessOutsourcerInfo outsourcerInfo = outsourcerInfoMapper.selectById(request.getOutsourcerId());
+        request.setOutsourceNo(outsourcerInfo.getOutsourcerNo());
+        request.setOutsourceName(outsourcerInfo.getOutsourcerName());
+        int row = this.baseMapper.insert(request);
+        Assert.isFalse(row <= 0, () -> {
+            throw new BusinessException(BusinessExceptionEnum.OUTSOURCE_PROTOCOL_SAVE_FAILED);
+        });
+        OutsourceProtocolSaveResponse saveResponse = new OutsourceProtocolSaveResponse();
+        saveResponse.setId(request.getId());
+        saveResponse.setProtocolNo(protocolNo);
+        return ReturnUtil.success(saveResponse);
+    }
+}
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourcerInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourcerInfoServiceImpl.java
index 75f639d..8aadad7 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourcerInfoServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourcerInfoServiceImpl.java
@@ -3,12 +3,12 @@
 import cn.hutool.core.lang.Assert;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.dto.*;
 import com.casic.missiles.dto.business.outsource.OutsourcerInfoApprovalListRequest;
 import com.casic.missiles.dto.business.outsource.OutsourcerSaveResponse;
 import com.casic.missiles.enums.BusinessExceptionEnum;
-import com.casic.missiles.enums.PrefixCodeEnum;
+import com.casic.missiles.enums.NoGenerateFileCodeEnum;
+import com.casic.missiles.enums.NoGenerateRecordTypeCodeEnum;
 import com.casic.missiles.enums.system.ApprovalStatusEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.mapper.business.BizBusinessOutsourcerInfoMapper;
@@ -20,7 +20,7 @@
 import com.casic.missiles.service.business.IBizBusinessOutsourcerInfoService;
 import com.casic.missiles.service.business.IBizBusinessOutsourcerUserInfoService;
 import com.casic.missiles.utils.DictCodeUtils;
-import com.casic.missiles.utils.NumberGeneratorUtil;
+import com.casic.missiles.utils.NoGeneratorUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -42,22 +42,12 @@
     private IBizBusinessOutsourcerUserInfoService outsourcerUserInfoService;
 
     @Override
-    public List<BizBusinessOutsourcerInfo> list(OutsourcerInfoApprovalListRequest request) {
-        request.setCreateUserId(null);
-        request.setApprovalStatus(ApprovalStatusEnum.PASSED);
-        Page<BizBusinessOutsourcerInfo> page = PageFactory.defaultPage();
-        page.setCurrent(1);
-        page.setSearchCount(false);
-        page.setSize(Integer.MAX_VALUE);
-        Page<BizBusinessOutsourcerInfo> resultPage = this.baseMapper.selectBatchForApprovalList(page, request, null);
-        return resultPage.getRecords();
-    }
-
-    @Override
     public ReturnDTO<OutsourcerSaveResponse> saveOutsourcer(BizBusinessOutsourcerInfo request) {
         //生成编号
+        String labCode = request.getLabCode();
+        String groupCode = request.getGroupCode();
         Long maxNo = this.baseMapper.selectMaxNo();
-        String outsourcerNo = NumberGeneratorUtil.getContactNo(PrefixCodeEnum.OUTSOURCER_PREFIX, maxNo);
+        String outsourcerNo = NoGeneratorUtil.getCode(NoGenerateFileCodeEnum.D, labCode, NoGenerateRecordTypeCodeEnum.OUTSOURCE_INFO, groupCode, maxNo);
         request.setOutsourcerNo(outsourcerNo);
         request.setCreateUserId(request.getUserId());
         request.setCreateUserName(request.getUserName());
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessSiteExecutiveInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessSiteExecutiveInfoServiceImpl.java
index ebab3e6..6c6a129 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessSiteExecutiveInfoServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessSiteExecutiveInfoServiceImpl.java
@@ -189,9 +189,9 @@
         QueryWrapper<BizBusinessSiteExecutiveStaffRelation> mWrapper = new QueryWrapper<>();
         mWrapper.eq("site_executive_id", siteExecutiveId);
         boolean mRemove = siteExecutiveStaffRelationService.remove(mWrapper);
-        Assert.isFalse(eRemove || mRemove, () -> {
+        if(!eRemove || !mRemove){
             throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
-        });
+        }
     }
 
     private void doPopulateSiteExecutive(SiteExecutiveDetailResponse detailResponse) {
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessLabExecutiveInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessLabExecutiveInfoServiceImpl.java
index 50c5616..0242fcf 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessLabExecutiveInfoServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessLabExecutiveInfoServiceImpl.java
@@ -297,6 +297,29 @@
     }
 
     @Override
+    public List<SampleLabExecutiveListResponse> deptLabExecutiveList(SampleLabExecutiveListRequest request) throws Exception {
+        Page<SampleLabExecutiveListResponse> page = PageFactory.defaultPage();
+        page.setCurrent(1);
+        page.setSearchCount(false);
+        page.setSize(Integer.MAX_VALUE);
+        Page<SampleLabExecutiveListResponse> resultPage = this.deptLabExecutiveListPage(page, request);
+        return resultPage.getRecords();
+    }
+
+    @Override
+    public List<SampleLabExecutiveListResponse> deptLabExecutiveListByIds(String measureStatus, List<Long> ids) throws Exception {
+        Page<SampleLabExecutiveListResponse> page = PageFactory.defaultPage();
+        page.setCurrent(1);
+        page.setSearchCount(false);
+        page.setSize(Integer.MAX_VALUE);
+        SampleLabExecutiveListRequest request = new SampleLabExecutiveListRequest();
+        request.setIds(ids);
+        request.setMeasureStatus(measureStatus);
+        Page<SampleLabExecutiveListResponse> resultPage = this.deptLabExecutiveListPage(page, request);
+        return resultPage.getRecords();
+    }
+
+    @Override
     public Page<SampleLabExecutiveListResponse> myLabExecutiveListPage(Page<SampleLabExecutiveListResponse> page, SampleLabExecutiveListRequest labExecutiveListRequest) throws Exception{
         AuthUser user = ShiroKit.getUser();
         Assert.isFalse(Objects.isNull(user), () -> {
@@ -350,6 +373,29 @@
     }
 
     @Override
+    public List<SampleLabExecutiveListResponse> myLabExecutiveList(SampleLabExecutiveListRequest request) throws Exception {
+        Page<SampleLabExecutiveListResponse> page = PageFactory.defaultPage();
+        page.setCurrent(1);
+        page.setSearchCount(false);
+        page.setSize(Integer.MAX_VALUE);
+        Page<SampleLabExecutiveListResponse> resultPage = this.myLabExecutiveListPage(page, request);
+        return resultPage.getRecords();
+    }
+
+    @Override
+    public List<SampleLabExecutiveListResponse> myLabExecutiveListByIds(String measureStatus, List<Long> ids) throws Exception {
+        Page<SampleLabExecutiveListResponse> page = PageFactory.defaultPage();
+        page.setCurrent(1);
+        page.setSearchCount(false);
+        page.setSize(Integer.MAX_VALUE);
+        SampleLabExecutiveListRequest request = new SampleLabExecutiveListRequest();
+        request.setIds(ids);
+        request.setMeasureStatus(measureStatus);
+        Page<SampleLabExecutiveListResponse> resultPage = this.myLabExecutiveListPage(page, request);
+        return resultPage.getRecords();
+    }
+
+    @Override
     public List<SampleAmountResponse> myExecutiveAmount() {
         //登录用户id获取计量人员id，实验室检测信息中存储的是计量人员id
         AuthUser user = ShiroKit.getUser();
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentInfoServiceImpl.java
index 864b05e..db8cad4 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentInfoServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentInfoServiceImpl.java
@@ -35,7 +35,6 @@
 import com.casic.missiles.utils.ConvertUtils;
 import com.casic.missiles.utils.DictCodeUtils;
 import com.casic.missiles.utils.NumberGeneratorUtil;
-import org.flowable.engine.RuntimeService;
 import org.flowable.engine.runtime.ProcessInstance;
 import org.jetbrains.annotations.NotNull;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -43,7 +42,6 @@
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
 
-import javax.annotation.Resource;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
@@ -81,8 +79,6 @@
     private IBizEquipmentAttachmentService attachmentService;
     @Autowired
     private IBizEquipmentCheckpointService checkpointService;
-    @Resource
-    private RuntimeService runtimeService;
     @Autowired
     private ApprovalOperateService approvalOperateService;
 
@@ -235,18 +231,18 @@
     private void updateRelationInfo(EquipmentAddRequest request, BizEquipmentInfoApproval equipmentInfoApproval) {
         QueryWrapper<BizEquipmentTechnicalTarget> targetWrapper = new QueryWrapper<>();
         targetWrapper.eq("equipment_no", equipmentInfoApproval.getEquipmentNo());
-        boolean removeTargetFlag = technicalTargetService.remove(targetWrapper);
-        boolean saveTargetFlag = technicalTargetService.saveBatch(request.getTechnicalTargetList());
+        technicalTargetService.remove(targetWrapper);
+        technicalTargetService.saveBatch(request.getTechnicalTargetList());
 
         QueryWrapper<BizEquipmentAttachment> attachmentWrapper = new QueryWrapper<>();
         attachmentWrapper.eq("equipment_no", equipmentInfoApproval.getEquipmentNo());
-        boolean removeAttachmentFlag = attachmentService.remove(attachmentWrapper);
-        boolean saveAttachmentFlag = attachmentService.saveBatch(request.getAttachmentList());
+        attachmentService.remove(attachmentWrapper);
+        attachmentService.saveBatch(request.getAttachmentList());
 
         QueryWrapper<BizEquipmentCheckpoint> checkpointWrapper = new QueryWrapper<>();
         checkpointWrapper.eq("equipment_no", equipmentInfoApproval.getEquipmentNo());
-        boolean removeCheckpointFlag = checkpointService.remove(checkpointWrapper);
-        boolean saveCheckpointFlag = checkpointService.saveBatch(request.getCheckpointList());
+        checkpointService.remove(checkpointWrapper);
+        checkpointService.saveBatch(request.getCheckpointList());
     }
 
     @Override
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardInfoServiceImpl.java
index faff1ae..c50a5b3 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardInfoServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardInfoServiceImpl.java
@@ -22,7 +22,9 @@
 import com.casic.missiles.mapper.equipment.BizEquipmentStandardInfoMapper;
 import com.casic.missiles.mapper.equipment.BizEquipmentStandardTechnologyRelationMapper;
 import com.casic.missiles.mapper.resource.BizResourceStaffInfoMapper;
-import com.casic.missiles.model.equipment.*;
+import com.casic.missiles.model.equipment.BizEquipmentStandardInfo;
+import com.casic.missiles.model.equipment.BizEquipmentStandardInfoApproval;
+import com.casic.missiles.model.equipment.BizEquipmentStandardTechnologyRelation;
 import com.casic.missiles.model.resource.BizResourceStaffInfo;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.dao.DeptMapper;
@@ -33,14 +35,12 @@
 import com.casic.missiles.service.flowable.ApprovalOperateService;
 import com.casic.missiles.utils.ConvertUtils;
 import com.casic.missiles.utils.DictCodeUtils;
-import org.flowable.engine.RuntimeService;
 import org.flowable.engine.runtime.ProcessInstance;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
 
-import javax.annotation.Resource;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
@@ -62,8 +62,6 @@
     private BizResourceStaffInfoMapper staffInfoMapper;
     @Autowired
     private IBaseApprovalService baseApprovalService;
-    @Resource
-    private RuntimeService runtimeService;
     @Autowired
     private ApprovalOperateService approvalOperateService;
     @Autowired
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSealInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSealInfoServiceImpl.java
index 7c91fa2..00040d6 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSealInfoServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSealInfoServiceImpl.java
@@ -15,6 +15,7 @@
 import com.casic.missiles.modular.system.model.User;
 import com.casic.missiles.service.resource.IBizResourceSealInfoService;
 import com.casic.missiles.utils.DictCodeUtils;
+import com.casic.missiles.utils.MinioUtil;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -33,6 +34,8 @@
     private BizResourceSealInfoMapper sealInfoMapper;
     @Autowired
     private UserMapper userMapper;
+    @Autowired
+    private MinioUtil minioUtil;
 
     @Override
     public Page<BizResourceSealInfo> listPage(Page<BizResourceSealInfo> page, SealInfoListRequest request) throws Exception {
@@ -44,6 +47,7 @@
         Page<BizResourceSealInfo> sealInfoPage = sealInfoMapper.selectPage(page, wrapper);
         for (BizResourceSealInfo record : sealInfoPage.getRecords()) {
             DictCodeUtils.convertDictCodeToName(record);
+            record.setMinioFileUrl(minioUtil.getFileUrl(record.getMinioFileName()));
         }
         return sealInfoPage;
     }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceStaffInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceStaffInfoServiceImpl.java
index f058cf5..09203ac 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceStaffInfoServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceStaffInfoServiceImpl.java
@@ -3,6 +3,7 @@
 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.core.page.PageFactory;
 import com.casic.missiles.dto.IdDTO;
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
@@ -86,6 +87,13 @@
     }
 
     @Override
+    public List<BizResourceStaffInfo> list(StaffListRequest request) throws Exception {
+        Page<BizResourceStaffInfo> page = PageFactory.defaultPage();
+        Page<BizResourceStaffInfo> staffInfoPage = this.listPage(page, request);
+        return staffInfoPage.getRecords();
+    }
+
+    @Override
     @Transactional
     public ReturnDTO<IdDTO> staffBaseAdd(BizResourceStaffInfo staffInfo) {
         //登录账号查重
@@ -495,6 +503,28 @@
         return certResponsePage;
     }
 
+    @Override
+    public List<StaffCertResponse> certListByIds(List<Long> ids) throws Exception {
+        Page<StaffCertResponse> page = PageFactory.defaultPage();
+        page.setCurrent(1);
+        page.setSearchCount(false);
+        page.setSize(Integer.MAX_VALUE);
+        StaffCertRequest request = new StaffCertRequest();
+        request.setIds(ids);
+        Page<StaffCertResponse> resultPage = this.certListPage(page, request);
+        return resultPage.getRecords();
+    }
+
+    @Override
+    public List<StaffCertResponse> certList(StaffCertRequest request) throws Exception {
+        Page<StaffCertResponse> page = PageFactory.defaultPage();
+        page.setCurrent(1);
+        page.setSearchCount(false);
+        page.setSize(Integer.MAX_VALUE);
+        Page<StaffCertResponse> resultPage = this.certListPage(page, request);
+        return resultPage.getRecords();
+    }
+
     @Async
     public void deleteRelationInfo(Long staffId){
         QueryWrapper<BizResourceStaffEducation> educationWrapper = new QueryWrapper<>();
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceStaffVerifierServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceStaffVerifierServiceImpl.java
index 8ac7eee..b508d45 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceStaffVerifierServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceStaffVerifierServiceImpl.java
@@ -52,8 +52,8 @@
     private WebSocket webSocket;
 
     @Override
-    public ReturnDTO expirationReminder(IdDTO idDto) {
-        BizResourceStaffVerifier staffVerifier = verifierMapper.selectById(idDto.getId());
+    public ReturnDTO expirationReminder(IdDTO idDTO) {
+        BizResourceStaffVerifier staffVerifier = verifierMapper.selectById(idDTO.getId());
         BizResourceStaffInfo staffInfo = staffInfoMapper.selectById(staffVerifier.getStaffId());
         QueryWrapper<User> wrapper = new QueryWrapper<>();
         wrapper.eq("account", staffInfo.getAccount());
@@ -65,7 +65,7 @@
         Assert.isFalse(Objects.isNull(user), () -> {
             throw new BusinessException(BusinessExceptionEnum.LOGIN_USER_ACQUIRE_FAILED);
         });
-        WorkbenchRemindMessage remindMessage = new WorkbenchRemindMessage(userInfo.getId(), userInfo.getDeptId(), idDto.getId(), staffVerifier.getCertNo(), MessageTypeEnum.STAFF_CERT.getCode(), MessageSourceModuleEnum.RESOURCE.getCode(), MessageTypeEnum.STAFF_CERT.getValue(), MessageTypeEnum.STAFF_CERT.getValue(), staffVerifier.getCertName(),0, user.getId(), user.getName());
+        WorkbenchRemindMessage remindMessage = new WorkbenchRemindMessage(userInfo.getId(), userInfo.getDeptId(), idDTO.getId(), staffVerifier.getCertNo(), MessageTypeEnum.STAFF_CERT.getCode(), MessageSourceModuleEnum.RESOURCE.getCode(), MessageTypeEnum.STAFF_CERT.getValue(), MessageTypeEnum.STAFF_CERT.getValue(), staffVerifier.getCertName(),0, user.getId(), user.getName());
         if(messageMapper.insert(remindMessage) > 0){
             // 新增到消息列表后向用户推送消息
             webSocket.sendOneMessage(String.valueOf(userInfo.getId()), JSONObject.toJSONString(remindMessage));
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceTrainInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceTrainInfoServiceImpl.java
index c1d6308..3a533f2 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceTrainInfoServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceTrainInfoServiceImpl.java
@@ -44,11 +44,14 @@
     @Override
     public Page<BizResourceTrainInfo> listPage(Page<BizResourceTrainInfo> page, TrainListRequest request) throws Exception {
         QueryWrapper<BizResourceTrainInfo> wrapper = new QueryWrapper<>();
-        wrapper.like("train_no", request.getTrainNo());
-        wrapper.apply(StringUtils.isNotBlank(request.getCreateTimeStart()),//apply方法传入参数名不能为空
-                "{0} <= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getCreateTimeStart().split(" ")[0]);
-        wrapper.apply(StringUtils.isNotBlank(request.getCreateTimeEnd()),
-                "{0} >= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getCreateTimeEnd().split(" ")[0]);
+        wrapper.like(StringUtils.isNotEmpty(request.getTrainNo()), "train_no", request.getTrainNo());
+        wrapper.like(StringUtils.isNotEmpty(request.getDutyLeader()),"duty_leader", request.getDutyLeader());
+        if(StringUtils.isNotBlank(request.getCreateTimeStart())){
+            wrapper.apply("{0} <= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getCreateTimeStart().split(" ")[0]);
+        }
+        if(StringUtils.isNotBlank(request.getCreateTimeEnd())){
+            wrapper.apply("{0} >= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getCreateTimeEnd().split(" ")[0]);
+        }
         wrapper.orderByDesc("create_time");
         Page<BizResourceTrainInfo> trainInfoPage = trainInfoMapper.selectPage(page, wrapper);
         for (BizResourceTrainInfo record : trainInfoPage.getRecords()) {
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/EnvLocationInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/EnvLocationInfoServiceImpl.java
new file mode 100644
index 0000000..cdc5742
--- /dev/null
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/EnvLocationInfoServiceImpl.java
@@ -0,0 +1,31 @@
+package com.casic.missiles.service.Impl.resource;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.casic.missiles.dto.resource.environment.LocationListRequest;
+import com.casic.missiles.dto.resource.environment.LocationListResponse;
+import com.casic.missiles.mapper.resource.EnvLocationInfoMapper;
+import com.casic.missiles.model.resource.EnvLocationInfo;
+import com.casic.missiles.service.resource.IEnvLocationInfoService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 实验室环境监控系统-设备表 服务实现类
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-06-07
+ */
+@Service
+public class EnvLocationInfoServiceImpl extends ServiceImpl<EnvLocationInfoMapper, EnvLocationInfo> implements IEnvLocationInfoService {
+    @Autowired
+    private EnvLocationInfoMapper locationInfoMapper;
+
+    @Override
+    public Page<LocationListResponse> listPage(Page<LocationListResponse> page, LocationListRequest request) {
+        Page<LocationListResponse> resultPage = locationInfoMapper.selectLocationListPage(page, request);
+        return resultPage;
+    }
+}
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/DownloadCenterServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/DownloadCenterServiceImpl.java
index c956d24..d9f3282 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/DownloadCenterServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/DownloadCenterServiceImpl.java
@@ -131,10 +131,12 @@
         wrapper.like(StringUtils.isNotBlank(request.getModuleName()), "module_name", request.getModuleName());
         wrapper.like(StringUtils.isNotBlank(request.getFileName()), "file_name", request.getFileName());
         wrapper.like(StringUtils.isNotBlank(request.getFileType()), "file_type", request.getFileType());
-        wrapper.apply(StringUtils.isNotBlank(request.getStartTime()),
-                "{0} <= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getStartTime().split(" ")[0]);
-        wrapper.apply(StringUtils.isNotBlank(request.getEndTime()),
-                "{0} >= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getEndTime().split(" ")[0]);
+        if(StringUtils.isNotBlank(request.getStartTime())){
+            wrapper.apply("{0} <= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getStartTime().split(" ")[0]);
+        }
+        if(StringUtils.isNotBlank(request.getEndTime())){
+            wrapper.apply("{0} >= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getEndTime().split(" ")[0]);
+        }
         wrapper.orderByDesc("create_time");
         return wrapper;
     }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemSignServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemSignServiceImpl.java
index 41976bb..7e90a09 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemSignServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemSignServiceImpl.java
@@ -52,15 +52,14 @@
 
     @Override
     public Page<SystemSign> listPage(Page<SystemSign> page, SignListRequest request) {
-        QueryWrapper<SystemSign> wrapper = getWrapper(request);
-        Page<SystemSign> signPage = signMapper.selectPage(page, wrapper);
+        Page<SystemSign> signPage = signMapper.selectSignListPage(page, request);
         return signPage;
     }
 
     @Override
     public List<SystemSign> list(SignListRequest request) {
-        QueryWrapper<SystemSign> wrapper = getWrapper(request);
-        return signMapper.selectList(wrapper);
+        List<SystemSign> signList = signMapper.selectSignList(request);
+        return signList;
     }
 
     @Override
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessCertificatePrintService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessCertificatePrintService.java
index 03247ab..7d6db77 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessCertificatePrintService.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessCertificatePrintService.java
@@ -9,6 +9,8 @@
 import com.casic.missiles.model.business.BizBusinessCertificatePrintLog;
 import com.casic.missiles.model.business.BizBusinessCertificateReport;
 
+import java.util.List;
+
 /**
  * <p>
  * 计量检定业务-任务计量管理-证书管理 服务类
@@ -30,4 +32,9 @@
     ReturnDTO certificatePrintStatus(Long id, String printStatus);
 
     ReturnDTO<BizBusinessCertificatePrintLog> certificatePrintLog(Long id);
+
+    List<CertificatePrintListResponse> listByIds(List<Long> ids);
+
+    List<CertificatePrintListResponse> list(CertificatePrintApprovalListRequest request);
+
 }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessCertificateReportService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessCertificateReportService.java
index 305ac7f..b33ef22 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessCertificateReportService.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessCertificateReportService.java
@@ -21,6 +21,4 @@
     ReturnDTO<CertificateReportSaveResponse> saveCertificateReport(BizBusinessCertificateReport request);
 
     ReturnDTO<BizBusinessCertificateReport> detail(BaseDetailRequest request);
-
-
 }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessIdentifyInfoService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessIdentifyInfoService.java
index 53c49d0..6d2089f 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessIdentifyInfoService.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessIdentifyInfoService.java
@@ -6,6 +6,8 @@
 import com.casic.missiles.model.business.BizBusinessIdentifyInfo;
 import com.baomidou.mybatisplus.extension.service.IService;
 
+import java.util.List;
+
 /**
  * <p>
  * 计量检定业务-任务计量管理-标识打印 服务类
@@ -20,7 +22,11 @@
 
     ReturnDTO addIdentify(BizBusinessIdentifyInfo identifyInfo);
 
-    ReturnDTO updateIdentify(BizBusinessIdentifyInfo identifyInfo);
+    ReturnDTO updateIdentify(Long id);
 
     ReturnDTO deleteIdentify(Long id);
+
+    List<BizBusinessIdentifyInfo> list(IdentifyListRequest request) throws Exception;
+
+    ReturnDTO<String> equipmentQrCode(Long id);
 }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessOutsourceAssessService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessOutsourceAssessService.java
index 5e15bc8..bcdc791 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessOutsourceAssessService.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessOutsourceAssessService.java
@@ -1,7 +1,11 @@
 package com.casic.missiles.service.business;
 
+import com.casic.missiles.dto.BaseApprovalSubmitRequest;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.business.outsource.OutsourceAssessApprovalListRequest;
+import com.casic.missiles.dto.business.outsource.OutsourceAssessSaveResponse;
 import com.casic.missiles.model.business.BizBusinessOutsourceAssess;
-import com.baomidou.mybatisplus.extension.service.IService;
+import com.casic.missiles.service.IGeneralApprovalService;
 
 /**
  * <p>
@@ -11,6 +15,7 @@
  * @author wangpeng
  * @since 2023-08-16
  */
-public interface IBizBusinessOutsourceAssessService extends IService<BizBusinessOutsourceAssess> {
+public interface IBizBusinessOutsourceAssessService extends IGeneralApprovalService<BizBusinessOutsourceAssess, BizBusinessOutsourceAssess, OutsourceAssessApprovalListRequest, BaseApprovalSubmitRequest> {
 
+    ReturnDTO<OutsourceAssessSaveResponse> saveOutsourceAssess(BizBusinessOutsourceAssess request);
 }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessOutsourceProtocolService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessOutsourceProtocolService.java
new file mode 100644
index 0000000..7f3092b
--- /dev/null
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessOutsourceProtocolService.java
@@ -0,0 +1,21 @@
+package com.casic.missiles.service.business;
+
+import com.casic.missiles.dto.BaseApprovalSubmitRequest;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.business.outsource.OutsourceProtocolApprovalListRequest;
+import com.casic.missiles.dto.business.outsource.OutsourceProtocolSaveResponse;
+import com.casic.missiles.model.business.BizBusinessOutsourceProtocol;
+import com.casic.missiles.service.IGeneralApprovalService;
+
+/**
+ * <p>
+ * 计量检定业务-分包管理-测试、校准或检定工作分包协议书 服务类
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-08-24
+ */
+public interface IBizBusinessOutsourceProtocolService extends IGeneralApprovalService<BizBusinessOutsourceProtocol, BizBusinessOutsourceProtocol, OutsourceProtocolApprovalListRequest, BaseApprovalSubmitRequest> {
+
+    ReturnDTO<OutsourceProtocolSaveResponse> saveOutsourceProtocol(BizBusinessOutsourceProtocol request);
+}
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessOutsourcerInfoService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessOutsourcerInfoService.java
index 9ba656b..b199de4 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessOutsourcerInfoService.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessOutsourcerInfoService.java
@@ -24,8 +24,6 @@
  */
 public interface IBizBusinessOutsourcerInfoService extends IGeneralApprovalService<BizBusinessOutsourcerInfo, BizBusinessOutsourcerInfo, OutsourcerInfoApprovalListRequest, BaseApprovalSubmitRequest> {
 
-    List<BizBusinessOutsourcerInfo> list(OutsourcerInfoApprovalListRequest request);
-
     ReturnDTO<OutsourcerSaveResponse> saveOutsourcer(BizBusinessOutsourcerInfo request);
 
     BizBusinessOutsourcerInfo detail(Long id) throws Exception;
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessLabExecutiveInfoService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessLabExecutiveInfoService.java
index 278c674..f6ed490 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessLabExecutiveInfoService.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessLabExecutiveInfoService.java
@@ -30,8 +30,16 @@
 
     Page<SampleLabExecutiveListResponse> deptLabExecutiveListPage(Page<SampleLabExecutiveListResponse> page, SampleLabExecutiveListRequest labExecutiveListRequest) throws Exception;
 
+    List<SampleLabExecutiveListResponse> deptLabExecutiveList(SampleLabExecutiveListRequest request) throws Exception;
+
+    List<SampleLabExecutiveListResponse> deptLabExecutiveListByIds(String measureStatus, List<Long> ids) throws Exception;
+
     Page<SampleLabExecutiveListResponse> myLabExecutiveListPage(Page<SampleLabExecutiveListResponse> page, SampleLabExecutiveListRequest labExecutiveListRequest) throws Exception;
 
+    List<SampleLabExecutiveListResponse> myLabExecutiveList(SampleLabExecutiveListRequest request) throws Exception;
+
+    List<SampleLabExecutiveListResponse> myLabExecutiveListByIds(String measureStatus, List<Long> ids) throws Exception;
+
     List<SampleAmountResponse> myExecutiveAmount();
 
     ReturnDTO sampleReceive(List<SampleOperateRequest> requestList);
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/OutsourceAssessEventPostProcessor.java b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/OutsourceAssessEventPostProcessor.java
new file mode 100644
index 0000000..cda3086
--- /dev/null
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/OutsourceAssessEventPostProcessor.java
@@ -0,0 +1,46 @@
+package com.casic.missiles.service.listeners.processor;
+
+import cn.hutool.core.lang.Assert;
+import com.casic.missiles.dto.flowable.NotifyEventStatusDTO;
+import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.notifyevent.ActionStatusBeanEnum;
+import com.casic.missiles.enums.system.ApprovalStatusEnum;
+import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.mapper.business.BizBusinessOutsourceAssessMapper;
+import com.casic.missiles.model.business.BizBusinessOutsourceAssess;
+import com.casic.missiles.service.listeners.NotifyEventPostProcessor;
+import com.casic.missiles.utils.SpringContextUtil;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.Objects;
+
+/**
+ * @Description: 测试、校准或检定工作分包评审表审批通过后处理
+ * @Author: wangpeng
+ * @Date: 2023/8/21 13:20
+ */
+@Slf4j
+@Service(ActionStatusBeanEnum.OUTSOURCE_ASSESS_BEAN_NAME)
+public class OutsourceAssessEventPostProcessor implements NotifyEventPostProcessor {
+    @Override
+    @Transactional
+    public void doHandleNotifyEvent(NotifyEventStatusDTO notifyEventStatusDTO) {
+        Long id = Long.valueOf(notifyEventStatusDTO.getId());
+        Assert.isFalse(Objects.isNull(id), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        BizBusinessOutsourceAssessMapper outsourceAssessMapper = SpringContextUtil.getBean(BizBusinessOutsourceAssessMapper.class);
+
+        BizBusinessOutsourceAssess outsourceAssess = new BizBusinessOutsourceAssess();
+        outsourceAssess.setId(id);
+        outsourceAssess.setApprovalStatus(ApprovalStatusEnum.PASSED);
+        int updateFlag = outsourceAssessMapper.updateById(outsourceAssess);
+        if (updateFlag <= 0) {
+            log.error("测试、校准或检定工作分包评审表审批通过后处理失败");
+            throw new BusinessException(BusinessExceptionEnum.APPROVAL_PROCESSOR_HANDLE_FAILED);
+        }
+    }
+
+}
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/OutsourceProtocolEventPostProcessor.java b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/OutsourceProtocolEventPostProcessor.java
new file mode 100644
index 0000000..490c66e
--- /dev/null
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/OutsourceProtocolEventPostProcessor.java
@@ -0,0 +1,46 @@
+package com.casic.missiles.service.listeners.processor;
+
+import cn.hutool.core.lang.Assert;
+import com.casic.missiles.dto.flowable.NotifyEventStatusDTO;
+import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.notifyevent.ActionStatusBeanEnum;
+import com.casic.missiles.enums.system.ApprovalStatusEnum;
+import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.mapper.business.BizBusinessOutsourceProtocolMapper;
+import com.casic.missiles.model.business.BizBusinessOutsourceProtocol;
+import com.casic.missiles.service.listeners.NotifyEventPostProcessor;
+import com.casic.missiles.utils.SpringContextUtil;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.Objects;
+
+/**
+ * @Description: 测试、校准或检定工作分包协议书审批通过后处理
+ * @Author: wangpeng
+ * @Date: 2023/8/21 13:20
+ */
+@Slf4j
+@Service(ActionStatusBeanEnum.OUTSOURCE_PROTOCOL_BEAN_NAME)
+public class OutsourceProtocolEventPostProcessor implements NotifyEventPostProcessor {
+    @Override
+    @Transactional
+    public void doHandleNotifyEvent(NotifyEventStatusDTO notifyEventStatusDTO) {
+        Long id = Long.valueOf(notifyEventStatusDTO.getId());
+        Assert.isFalse(Objects.isNull(id), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        BizBusinessOutsourceProtocolMapper outsourceProtocolMapper = SpringContextUtil.getBean(BizBusinessOutsourceProtocolMapper.class);
+
+        BizBusinessOutsourceProtocol outsourceProtocol = new BizBusinessOutsourceProtocol();
+        outsourceProtocol.setId(id);
+        outsourceProtocol.setApprovalStatus(ApprovalStatusEnum.PASSED);
+        int updateFlag = outsourceProtocolMapper.updateById(outsourceProtocol);
+        if (updateFlag <= 0) {
+            log.error("测试、校准或检定工作分包协议书审批通过后处理失败");
+            throw new BusinessException(BusinessExceptionEnum.APPROVAL_PROCESSOR_HANDLE_FAILED);
+        }
+    }
+
+}
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/SiteExecutiveEventPostProcessor.java b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/SiteExecutiveEventPostProcessor.java
index 6a690d7..4d25ca4 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/SiteExecutiveEventPostProcessor.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/SiteExecutiveEventPostProcessor.java
@@ -38,7 +38,7 @@
         siteExecutiveInfo.setApprovalStatus(ApprovalStatusEnum.PASSED);
         int updateFlag = siteExecutiveInfoMapper.updateById(siteExecutiveInfo);
         if (updateFlag <= 0) {
-            log.error("现场测试、校准或检定审批审批通过后处理失败");
+            log.error("现场测试、校准或检定审批通过后处理失败");
             throw new BusinessException(BusinessExceptionEnum.APPROVAL_PROCESSOR_HANDLE_FAILED);
         }
     }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/resource/IBizResourceStaffInfoService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/resource/IBizResourceStaffInfoService.java
index 7adcf2b..31e7972 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/resource/IBizResourceStaffInfoService.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/resource/IBizResourceStaffInfoService.java
@@ -23,6 +23,8 @@
 
     Page<BizResourceStaffInfo> listPage(Page<BizResourceStaffInfo> page, StaffListRequest request) throws Exception;
 
+    List<BizResourceStaffInfo> list(StaffListRequest request) throws Exception;
+
     BizResourceStaffInfo detail(Long id);
 
     ReturnDTO<IdDTO> staffBaseAdd(BizResourceStaffInfo staffInfo);
@@ -116,4 +118,8 @@
     ReturnDTO verifierBatchDelete(List<Long> ids);
 
     Page<StaffCertResponse> certListPage(Page<StaffCertResponse> page, StaffCertRequest request) throws Exception;
+
+    List<StaffCertResponse> certListByIds(List<Long> ids) throws Exception;
+
+    List<StaffCertResponse> certList(StaffCertRequest request) throws Exception;
 }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/resource/IBizResourceStaffVerifierService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/resource/IBizResourceStaffVerifierService.java
index e2f0431..eb5c1fb 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/resource/IBizResourceStaffVerifierService.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/resource/IBizResourceStaffVerifierService.java
@@ -15,5 +15,5 @@
  */
 public interface IBizResourceStaffVerifierService extends IService<BizResourceStaffVerifier> {
 
-    ReturnDTO expirationReminder(IdDTO idDto);
+    ReturnDTO expirationReminder(IdDTO idDTO);
 }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/resource/IEnvLocationInfoService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/resource/IEnvLocationInfoService.java
new file mode 100644
index 0000000..9d201cd
--- /dev/null
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/resource/IEnvLocationInfoService.java
@@ -0,0 +1,21 @@
+package com.casic.missiles.service.resource;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.casic.missiles.dto.resource.environment.LocationListRequest;
+import com.casic.missiles.dto.resource.environment.LocationListResponse;
+import com.casic.missiles.model.resource.EnvLocationInfo;
+
+/**
+ * <p>
+ * 实验室环境监控系统-设备表 服务类
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-06-07
+ */
+public interface IEnvLocationInfoService extends IService<EnvLocationInfo> {
+
+    Page<LocationListResponse> listPage(Page<LocationListResponse> page, LocationListRequest request);
+
+}